From patchwork Mon Mar 13 16:25:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13172853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8724C61DA4 for ; Mon, 13 Mar 2023 16:27:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DA8616B0081; Mon, 13 Mar 2023 12:27:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D35596B0083; Mon, 13 Mar 2023 12:27:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B325F6B0085; Mon, 13 Mar 2023 12:27:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9D1AD6B0082 for ; Mon, 13 Mar 2023 12:27:49 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 57B2080769 for ; Mon, 13 Mar 2023 16:27:49 +0000 (UTC) X-FDA: 80564406258.15.16CE234 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 9315A180008 for ; Mon, 13 Mar 2023 16:27:47 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MqP5YR+e; spf=pass (imf06.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678724867; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=eQHLLQ5PDSU2xDgYL5oReXWI8s5CvUHAEWJjGfc5xCc=; b=U8/iUEYWkDc73SeEy67CxC2ms6MQ8xR83d9C+MuA0dXhe5Krs6BLTizXe3EXMefKuYYljo lpn4EZjeIJ2yx7KBtxAuMEyJPFubd8y++LXA7jHFfW9L7VvsC+aYtWnnYlEbZJfq2bQDS4 VSvhSopt+OgubwhtDUfbTOYS4MoBIYM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MqP5YR+e; spf=pass (imf06.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678724867; a=rsa-sha256; cv=none; b=woAE1sQ5BY6sOgI12cgjxCxpzEOcYNqFX1Y/OlALLjUEPsdyIDEg/kkbubXbweyRxTlXYr u/zbR0FrvXWsIxr8Vi9Zo33giG2qsBpicadxDzUKJmRPBMgZIv974T3RJrDrtUuWCyIr3I 62UYDh/QJbryHTGTkB2kxah+0wLejtE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678724866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=eQHLLQ5PDSU2xDgYL5oReXWI8s5CvUHAEWJjGfc5xCc=; b=MqP5YR+eW+rbc6qGvs2sJS7Q/OhgMxFwoAWG8kKMIsiAttq1YqF6+2wwdSbejVd7adIjmF uIcHR+lqYbWcPEbdOoMRn194u6MD3IKcBkW/ifUW08Uj7c2irM3t7kQuIhVBG7CZE70i1O vAttIkeQaYmuvDG4smOK9mq+grIDLLY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-fKD2GMTTMDiEEVthat5a4Q-1; Mon, 13 Mar 2023 12:27:43 -0400 X-MC-Unique: fKD2GMTTMDiEEVthat5a4Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2294D811E6E; Mon, 13 Mar 2023 16:27:42 +0000 (UTC) Received: from tpad.localdomain (ovpn-112-2.gru2.redhat.com [10.97.112.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B775E202701E; Mon, 13 Mar 2023 16:27:41 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 305264038A1FF; Mon, 13 Mar 2023 13:26:44 -0300 (-03) Message-ID: <20230313162634.458451052@redhat.com> User-Agent: quilt/0.67 Date: Mon, 13 Mar 2023 13:25:15 -0300 From: Marcelo Tosatti To: Christoph Lameter Cc: Aaron Tomlin , Frederic Weisbecker , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Russell King , Huacai Chen , Heiko Carstens , x86@kernel.org, Vlastimil Babka , Marcelo Tosatti Subject: [PATCH v5 08/12] vmstat: switch per-cpu vmstat counters to 32-bits References: <20230313162507.032200398@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Stat-Signature: grmsyhds7trhztta641s6eiyost8exam X-Rspam-User: X-Rspamd-Queue-Id: 9315A180008 X-Rspamd-Server: rspam06 X-HE-Tag: 1678724867-554504 X-HE-Meta: U2FsdGVkX19kECQQT4mSlUDw/qDwti01iWmtez30iilL00x8LZ5nmfjtmcpcppbBUjZYiViWX/DmnkkG1Bd2vDuSfV615FGRn1Lt/sk92mipptUd9dW0HHnnFrwvRaArw6VZFkbjaZttxJhmUHGJxy8Ln7nBT/kWHZxbSYHL+fzGDbq6c53rCNORA9PaWuKQhpVMzZlzR4MrUvRE74nLrsRNpCJaoeZ8irWln5OYVXXUjfLi3F6DLQviIGivMZW9uh/Rc2KX4CMQRqB5Jb5tTjr5vxCgHfrfTd/s5YIG4mUPWrk5OaxWKKJzBblaznbxLvgOLdWTeJma4aUF2kZUDitUUJE6LXDsh3rIAMw9424ypB2jOPen4jyYJkOB+Y7NzSzEI+98qPaKkcegztNMmA5V6mdXG9Bt3pJsOnH0NxssTgrNJ1Im+pzdRMc7d3LjH/e1YF417uPIuZtxg4l0Lh+05ZGa3fACIuemIwAl/8Pi9TdeZqSQcX7JKfmtm0D7+MfIywQ6HE07nRCB0YBc3iLKYvdqDf2mrpd6SOaXcSe0B0bOTx/UDOC8vKeDnmKiWa3GMs+BzeR7bGa+5VTRCIz32eBdpG+87e7WDpqf7Jo9oLvIaPkjL3qBdyP29HZ+Q45uj6x1M82ZTlHO4yuqQNkPEsB4N5mFCKTWBCcuuccUK4XuxuKWmBOfRkII+Lh211gr35ty51yoBF/jBIfdABUwlpQIVnKeebDSZV1aFwzAGSIJmkdLROl19Wqr6dngZM4CjHnnbKlVamrv4EIiEPMFzuHmBiVJA54E+ESMgRAPLOfCB7CrMUWvPKl0Vs3AyNLzv4/OWRPloK6P9fO/qIbLoccFUOdeBDkLsa7bnBJDUBOWbuYYAMpRVvKIRxM18bV47lT2Js2+OpRphuVqu2j+QjDZVXCDyWVxTCu/JJwI54EGpdwY52UlMaAvlxhTr7XX+NQfxef/WJn70z/ vsz6Vo33 uYPEnkq+nHpzeIuql4kKjMrQMM2mblkS7aADWGNW5xx4dVwNHNeNIzHY7B0TIl1MZL+osyJP9xc/wt8izno3atnMIbtCfTmXOWFxG6r6r2WWzPbVCwRD1O5Ud4BNpGM1QtfYypgNntn9gKEKI0IJKzK808qDQyfeEfjOeTUwqMjFSuQEg6ktyRlWaJON8fzfhpVunga4y6gQs8Q4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Some architectures only provide xchg/cmpxchg in 32/64-bit quantities. Since the next patch is about to use xchg on per-CPU vmstat counters, switch them to s32. Signed-off-by: Marcelo Tosatti Index: linux-vmstat-remote/include/linux/mmzone.h =================================================================== --- linux-vmstat-remote.orig/include/linux/mmzone.h +++ linux-vmstat-remote/include/linux/mmzone.h @@ -689,8 +689,8 @@ struct per_cpu_pages { struct per_cpu_zonestat { #ifdef CONFIG_SMP - s8 vm_stat_diff[NR_VM_ZONE_STAT_ITEMS]; - s8 stat_threshold; + s32 vm_stat_diff[NR_VM_ZONE_STAT_ITEMS]; + s32 stat_threshold; #endif #ifdef CONFIG_NUMA /* @@ -703,8 +703,8 @@ struct per_cpu_zonestat { }; struct per_cpu_nodestat { - s8 stat_threshold; - s8 vm_node_stat_diff[NR_VM_NODE_STAT_ITEMS]; + s32 stat_threshold; + s32 vm_node_stat_diff[NR_VM_NODE_STAT_ITEMS]; }; #endif /* !__GENERATING_BOUNDS.H */ Index: linux-vmstat-remote/mm/vmstat.c =================================================================== --- linux-vmstat-remote.orig/mm/vmstat.c +++ linux-vmstat-remote/mm/vmstat.c @@ -351,7 +351,7 @@ static inline void mod_zone_state(struct long delta, int overstep_mode) { struct per_cpu_zonestat __percpu *pcp = zone->per_cpu_zonestats; - s8 __percpu *p = pcp->vm_stat_diff + item; + s32 __percpu *p = pcp->vm_stat_diff + item; long o, n, t, z; do { @@ -428,7 +428,7 @@ static inline void mod_node_state(struct int delta, int overstep_mode) { struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats; - s8 __percpu *p = pcp->vm_node_stat_diff + item; + s32 __percpu *p = pcp->vm_node_stat_diff + item; long o, n, t, z; if (vmstat_item_in_bytes(item)) { @@ -525,7 +525,7 @@ void __mod_zone_page_state(struct zone * long delta) { struct per_cpu_zonestat __percpu *pcp = zone->per_cpu_zonestats; - s8 __percpu *p = pcp->vm_stat_diff + item; + s32 __percpu *p = pcp->vm_stat_diff + item; long x; long t; @@ -556,7 +556,7 @@ void __mod_node_page_state(struct pglist long delta) { struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats; - s8 __percpu *p = pcp->vm_node_stat_diff + item; + s32 __percpu *p = pcp->vm_node_stat_diff + item; long x; long t; @@ -614,8 +614,8 @@ EXPORT_SYMBOL(__mod_node_page_state); void __inc_zone_state(struct zone *zone, enum zone_stat_item item) { struct per_cpu_zonestat __percpu *pcp = zone->per_cpu_zonestats; - s8 __percpu *p = pcp->vm_stat_diff + item; - s8 v, t; + s32 __percpu *p = pcp->vm_stat_diff + item; + s32 v, t; /* See __mod_node_page_state */ preempt_disable_nested(); @@ -623,7 +623,7 @@ void __inc_zone_state(struct zone *zone, v = __this_cpu_inc_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v > t)) { - s8 overstep = t >> 1; + s32 overstep = t >> 1; zone_page_state_add(v + overstep, zone, item); __this_cpu_write(*p, -overstep); @@ -635,8 +635,8 @@ void __inc_zone_state(struct zone *zone, void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item) { struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats; - s8 __percpu *p = pcp->vm_node_stat_diff + item; - s8 v, t; + s32 __percpu *p = pcp->vm_node_stat_diff + item; + s32 v, t; VM_WARN_ON_ONCE(vmstat_item_in_bytes(item)); @@ -646,7 +646,7 @@ void __inc_node_state(struct pglist_data v = __this_cpu_inc_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v > t)) { - s8 overstep = t >> 1; + s32 overstep = t >> 1; node_page_state_add(v + overstep, pgdat, item); __this_cpu_write(*p, -overstep); @@ -670,8 +670,8 @@ EXPORT_SYMBOL(__inc_node_page_state); void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { struct per_cpu_zonestat __percpu *pcp = zone->per_cpu_zonestats; - s8 __percpu *p = pcp->vm_stat_diff + item; - s8 v, t; + s32 __percpu *p = pcp->vm_stat_diff + item; + s32 v, t; /* See __mod_node_page_state */ preempt_disable_nested(); @@ -679,7 +679,7 @@ void __dec_zone_state(struct zone *zone, v = __this_cpu_dec_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v < - t)) { - s8 overstep = t >> 1; + s32 overstep = t >> 1; zone_page_state_add(v - overstep, zone, item); __this_cpu_write(*p, overstep); @@ -691,8 +691,8 @@ void __dec_zone_state(struct zone *zone, void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item) { struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats; - s8 __percpu *p = pcp->vm_node_stat_diff + item; - s8 v, t; + s32 __percpu *p = pcp->vm_node_stat_diff + item; + s32 v, t; VM_WARN_ON_ONCE(vmstat_item_in_bytes(item)); @@ -702,7 +702,7 @@ void __dec_node_state(struct pglist_data v = __this_cpu_dec_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v < - t)) { - s8 overstep = t >> 1; + s32 overstep = t >> 1; node_page_state_add(v - overstep, pgdat, item); __this_cpu_write(*p, overstep);