From patchwork Mon May 15 18:00:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13242010 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 25EE6C7EE24 for ; Mon, 15 May 2023 18:03:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7B7E900007; Mon, 15 May 2023 14:03:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96BB3900002; Mon, 15 May 2023 14:03:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8335C900007; Mon, 15 May 2023 14:03:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6A9DC900002 for ; Mon, 15 May 2023 14:03:50 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1E81B141424 for ; Mon, 15 May 2023 18:03:50 +0000 (UTC) X-FDA: 80793262620.29.ACE0892 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 3245718000A for ; Mon, 15 May 2023 18:03:47 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aXSRNsRV; spf=pass (imf24.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=1684173828; a=rsa-sha256; cv=none; b=NMY9gsg9vuXTccPnj5OCg7EEw5EF2BzKs6LshB1qSJfKJsqwqTrnDAPth32Zm6mWMZys3t gfK+YqjZNMhxRa6gijOY1nUb6MBUOsaI6J8vMMnyrvTDIcJLndGa0h8IRxjXyBn3ESoMuQ NVfdoqt1jtDAsoR+P3ytyWnz9ZQopQ8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aXSRNsRV; spf=pass (imf24.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=1684173828; 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=17wik0CX4Ctne5k/8Sx2ByUswspOZ54CsQaysWp8u+M=; b=NaVOV1OA9Z5YjVsRvlt3hCIJiWRwC+YYjILzzMrI5/g1/8ALjzia0xXaCUQWFy4+LaTnw2 0iuys+ZoeoPJGSgDxDEc4DiyOcsqUUtpa3ZLMq/y9cimExnuoHYDQWwDLEuwM60Cq9mn4h 1dCoT2t4UItR23haUUcelJIHDEFq0WI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684173827; 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=17wik0CX4Ctne5k/8Sx2ByUswspOZ54CsQaysWp8u+M=; b=aXSRNsRV/Pe7c167mA2DapEm91nJVlLw0DViLXfeFE9/yw/Nk6vanTebsnfwegq9unWfOe l2bU5VP/y8g0WXAHlXyUNLkztfh+iU8F+sYVVUCUiPtjm/k8lB/CnElsEuTZdVTic2Xz66 pS7RVml58IlDgpRGVg6ubW6aerXsdw8= 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-133-OxnDqdCGMg-hW8ImTw0DVg-1; Mon, 15 May 2023 14:03:42 -0400 X-MC-Unique: OxnDqdCGMg-hW8ImTw0DVg-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 6554286C60D; Mon, 15 May 2023 18:03:41 +0000 (UTC) Received: from tpad.localdomain (ovpn-112-4.gru2.redhat.com [10.97.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 047482026D16; Mon, 15 May 2023 18:03:41 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 74B2A4161E52C; Mon, 15 May 2023 15:02:17 -0300 (-03) Message-ID: <20230515180138.642582847@redhat.com> User-Agent: quilt/0.67 Date: Mon, 15 May 2023 15:00:24 -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 v8 09/13] vmstat: switch per-cpu vmstat counters to 32-bits References: <20230515180015.016409657@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3245718000A X-Stat-Signature: 5iwqqwso4pd9om1a1anx9s4x8m3qoyof X-HE-Tag: 1684173827-665201 X-HE-Meta: U2FsdGVkX18jG8XLYQe3FSrCXlIyEwDutJU8SCqtsmW0XJFQAxjauaLDKNcP8Sg7jTr7Luaea07wDAYEimiJWZFzH0mWWyDhNMvItxQmK9Z1i8sQFx+dmxpk1n+wrMFEPQ/okepr0XqBv3/NZafYZLij15uNIuk7Xx/jhnEdsrNvHS4NnfT3eOLIEAsyVcQq3QO37vFzjiIT1BU0xQ43nIC6I/AhxTKlPdT4vf1hfRvQVbZHOg5dyCSPty2jxeTR2h3PHFDcZu6yIsVo3eOaTCWLnyP9t3wcl98g5oYG402RICgrrdXYOdB6RI7zOeXVnSdGeWBtVdfG7QW6Q1NLFCqJ2cGM0ytSllvDSlK+pM74EUHfebIb7MEnnvYDnp1uQ/PtXCV6uPHzWoA+UIcwJiZZz7UKNWNhsUqN75Wl30XB7xOz6O4C1EkV13xLCjJyQYLNOfXP2AJV1MDTeAJPjOIWKSJFCOH9HOw8ul1IGrG0b7n4Pl6axtqb8VaywjMyPTlZUv9fUnniU2aD5wcs/dQN4nNg0zDDG1GqG4HIbUquwb0Tp97hmXkYMNbAHWxkMQxZghLKXpKQLhXlIuekdaZ5GH5qdscOsfghA63FgBqU/glKCMifOmal7Zg/MdwVgyF/w7WYfRZ4/1TqvOL5v5M7IhjZdw4F6siFR5L3UpRgV7QwEkAyTGrWIP76nnI+7+8QZjyGRsYou5dT9UR1+N0UQ9RsSfZZ8zBvcurJgLeyDfxxvH37oX6NlkyIAj4nVf7zk97umvroaHfPYXEkks0nwUB2kicLBrB6A5aB6q4kdx+qU0L/hwKK/eWcF7J4qbNQ07ABYa42R8kbZPM6ZCei+e3TX2nP17Wi/XnyjKVIvpEGAIUPWnh+SD7sFLto/yblNJ5ztjquDGAMvljpBI/fG//nwnMakRrnK64KkCJbI7Xf7j1ED7OL6Leoelr3YPs2QrjUJhOuOKNPxQZ 7T7tiTC0 QrMK4FsTs0H899I+XFfSL8Rz78OWt7lzuRbrfTv+tamrUlxYeu61T1b1i8WSo19C2KTj8f96fGWrubkRVwCMk0gTt1+HdRFL4jXrd4OGfZtBrqSxuU0If27YV22sqKDafz04HZjRxPiMgau972pCgyJSd6kU8YIwgB4782DG5jaa9pUiyRLbeUjgbQg== 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 @@ -675,8 +675,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 /* @@ -689,8 +689,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);