From patchwork Mon Mar 20 18:03:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13181698 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 7C433C6FD1D for ; Mon, 20 Mar 2023 18:12:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0949F6B0078; Mon, 20 Mar 2023 14:12:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0441C6B007D; Mon, 20 Mar 2023 14:12:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4E3E6B007E; Mon, 20 Mar 2023 14:12:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D22736B0078 for ; Mon, 20 Mar 2023 14:12:52 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A4C8AA0E08 for ; Mon, 20 Mar 2023 18:12:52 +0000 (UTC) X-FDA: 80590072584.18.C1F5DED Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id AF71180025 for ; Mon, 20 Mar 2023 18:12:50 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gTubR6DW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679335970; 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=ZUaishK9kOHZ/QZsdg2n57rQlJ8J1fXXfaJxo7fVhG4=; b=loIeA1fJsiLQBp4lFguk0k45Id1TM5phCI1FB3MGFNyqgnVXoVo4Rgqky0NYz11vDbJDWu 6+8qtqe1SdurMOuYuXdmW0NMqEl/XC4WTDvLxN7VSU1AhFNqLQUR/FyNwEeooGFc5atbMX hSpYopqvmD7gsTXLaRONz9vYLbOYfVw= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gTubR6DW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679335970; a=rsa-sha256; cv=none; b=DvIyF6Xll80GOgcN7RAuSnkvFCC9SV7VWx8qaGoLS2xsvqJP0Zk4VkA70EE/2kkIhQVC0l ENenw6nV3I9M7dZ9lnAeuSZxwKkh3ftRMwG5DkBC6JiaD9RBZrOOWvgcgo5iJuS+h2qDGm KClrBlzOR4ZjBtaVKzGY69QdCRLCWZw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679335969; 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=ZUaishK9kOHZ/QZsdg2n57rQlJ8J1fXXfaJxo7fVhG4=; b=gTubR6DWffMN3aLEyp/g8lTbi8ZOJ9Idj4UU/uXGLrM30n3eZUyaXdk+3MFbFuXgOBfwGs W2F8rD+IZQXbZ3V4NCxQd12G/H1DfpPZ5WcsHjMDv3ujMDcR8LfDoqLKwxg4zBIeUSWPPc ask8G4lM9mvsYmg/vvihC63YRBAkA0I= 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-494-WBTr80T6M62Z_oUDSgv-RA-1; Mon, 20 Mar 2023 14:12:29 -0400 X-MC-Unique: WBTr80T6M62Z_oUDSgv-RA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AFFC3800045; Mon, 20 Mar 2023 18:12:08 +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 A9D091121315; Mon, 20 Mar 2023 18:12:07 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id F12CE403BCD80; Mon, 20 Mar 2023 15:08:02 -0300 (-03) Message-ID: <20230320180745.758267946@redhat.com> User-Agent: quilt/0.67 Date: Mon, 20 Mar 2023 15:03:41 -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 , Michal Hocko , Marcelo Tosatti Subject: [PATCH v7 09/13] vmstat: switch per-cpu vmstat counters to 32-bits References: <20230320180332.102837832@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: AF71180025 X-Stat-Signature: k3m3csguw3fhzat1nrcb4huthxrwdbkq X-HE-Tag: 1679335970-963833 X-HE-Meta: U2FsdGVkX19KoYKOIT9C8PJ0f8mbFm2Tj59g0WcQVEW57PCgU4/KeDonA97mOEfXMmbNF2qWcTcjLkoAO1ElSBADrr6y+9oqdbLsxp0RQluAPGPmdCcfilm1DtoP6ZdnUEe5vWsx/sOTSnTZqB67pE7n4OvlUDA0Oi1HXt65rso8Br5Ak6JrHjeGdaK7ZWQWI/Exhqo88/XcS1On4hDdxAfF/JOKzSXQCLY0q89fstWq3kLhf2V/LHSVnE8lCuLvTLBmtYnonbTUiiNaUO9l9QBy/Y173n7c/c0+oPbOqa/8xH7BVT8ivfX85IxqV3mj03QVZjtvOhAlyZnl0z+QbF85BV09RYT3lIehQSML5prIk6oxqwvUkKmE00Qo/iOeWx1AoKChRPXJ0SRg8TxI6D2+io3ZshCIQUN5rAoGrPUVT6494W5vrm15GfxldccIYTNXHW10c1DFIo8X9SUXD7Y/eJyFpE5e8od9Albd02LOH796pmGHYRWoNvq4DnUfCzFZIFE5tHt7UV5h6RWkDbI5lCq1Av+5i2jsJa7QiHHKc5YyUG03rOcR0/rhkJzp5Y/mns7pP8Vf8ziIu9iB7ki06aOAXnCUi6PmibomhrsFIoFQ9YsoO4weU59r+MSHp1R9nAmrts9+UJ6SEDPgmXW3maYlsZtSOxkiIULMyENHzwHJz1qOoGyMtxe+3eOLmsBIPOvUhnBCsoF7zJoCC3hv7fUtf+SaL2agxvo30+xogyLrN/Z3uqT+5IZEBvw4kSxvieFOpqVsFPA52UAUAd/167viioFXLkCOkSgXyPmiw21hDJeywYN+rr2Wl78c2Kiy1WfXISHEqbizrC3U55iYSfnGSMf+l8KV8iqce7YFAzaqQlLCzx2S3RLDu5owff1qgQsy+o1ia3wRBTe1WQEKd8+u/0udrZ8mn3E0Oc325ekTV35w+eYPYEwx/exjHmNXp/RsrKAZ/10inUK 9IBl+0o+ j8bll4XBLuYj9rCUEIccjAtcs3bs4ZlF+OQ6nwJPgfjzHSKfzWgi2ldryLWSr0Sx1h5SGCLxhf6YcpFG0rU9TdVc1bLk/16ETQfWMeYreNcYZqYUlTzOTWwTeTR8J7JbNsyf5BBhtc9QiBCwOnUS4HPX7XhtUHXbnueMJn2Kw6XY+nstxZMT/lzXfVa0Jx+M7KIDvTNcvIQhl1C8= 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);