From mboxrd@z Thu Jan 1 00:00:00 1970 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 EB182C4345F for ; Wed, 1 May 2024 17:26:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 983BE6B009C; Wed, 1 May 2024 13:26:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92F926B009D; Wed, 1 May 2024 13:26:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D1EE6B009E; Wed, 1 May 2024 13:26:48 -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 59E2A6B009C for ; Wed, 1 May 2024 13:26:48 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 229B2140CAB for ; Wed, 1 May 2024 17:26:48 +0000 (UTC) X-FDA: 82070506896.24.6CCDBF9 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) by imf26.hostedemail.com (Postfix) with ESMTP id 6227D140007 for ; Wed, 1 May 2024 17:26:46 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YllzTqli; spf=pass (imf26.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.189 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714584406; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=y9l4h9rie3ivYcnawsodk45GJOrF/TCVwGQRSWBbU5Y=; b=pLlEf0lJ04h2J2d5qXqSvNPgdneyR1Y/9iTEsr6Hb75kSjWIe8MwCB/2iM0k950ShiZpo5 TuzoUh0toEzRc6M8yuF4tpQMFqnPIemRm8wWucPppQP/muwNv7JajQEpLxRzJIp7/YbWge uR/5F9q/DxtaX9VD0ZUZyftoH/kJ4Z8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714584406; a=rsa-sha256; cv=none; b=a0g5UsJi1FS4Nn2D9w3GH16YVUAr24crAkSgqFrapvBAlFW7ZyNXj03WY2mviMRnBe+ZFZ Ao54b7PEXtnXoFImZbPXOHfGAZxI/xZgWhuNjqU96P4gdtcpCM1HlpGtmBAmGTHUevSPpD G3Z+pXv8GyDzV95qvNIeCdkP0j0m5Hk= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=YllzTqli; spf=pass (imf26.hostedemail.com: domain of shakeel.butt@linux.dev designates 91.218.175.189 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1714584405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y9l4h9rie3ivYcnawsodk45GJOrF/TCVwGQRSWBbU5Y=; b=YllzTqliiBcI+Aeoe8N7nlIwm57TMV4GBbDUW7Gs09N6g0ncTSgttX6g5AuD2XQq1L1kKx wwfv4dy2Hbq8pAeX2MHK9w6Z6P0ndH05+Ncdg1vb5QCnTHF9BevviekazDKX8/0cJw5QhC b+SnksRmtYa+1xk4xF+paE+q/1cuoI8= From: Shakeel Butt To: Andrew Morton , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , Yosry Ahmed , "T . J . Mercier" Cc: kernel-team@meta.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 6/8] mm: cleanup WORKINGSET_NODES in workingset Date: Wed, 1 May 2024 10:26:15 -0700 Message-ID: <20240501172617.678560-7-shakeel.butt@linux.dev> In-Reply-To: <20240501172617.678560-1-shakeel.butt@linux.dev> References: <20240501172617.678560-1-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: bzrgqzcxiznn4ds4e418xa61rghfryf1 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6227D140007 X-HE-Tag: 1714584406-32268 X-HE-Meta: U2FsdGVkX1+eJ+I5lb9RSymsMtZSLOdjm0NWrFVUtw5v1yuv0kf2rlEIEONQmwCHL295DbxK/YzkgFbncCE2cQ0Q3wUX+JLB+ZjiR69dmBvE/pC1DKu7j6TQfLFzvenBH83eePOPJX0NNp5IBf4dJlSFXmoX6x7dVh6iXl/qK5XZRbOnPsvruggnjnLF1KCEJGxhytWWxsoWf+Oyqw0PrSNJpZKo9q0dD/4rzMW9bqvLt2k8hcB+CiK+xaORBMoRx7O8Q3cxYm854k4l3TPmdoSVFEOnI/M4C+vUyJ0aRJ0SIkktwXsoTuVNJ+OtcnuSAsUW3n7cL0EClBe6AqN/AeaV7g87MW31EWTAG1HYLEcuPT0KEWovd54RtylTLg99MJlr+Gr5GPXmopx8/TTCVJlZD4udunIhZdkF6QYawl+rTefiv9/gDGBPktzgvIFYet32Qa5Dq2VsEKCT1cOKOaOGC4KFEIyKgXsvz4cHvhIkv99iJtu6Qh7nekY/rrt4ZDdBhB9A+Mg1s128EDaEhAW019ecWikU9NPo7FGscvA55PYxnzNDtUP6AEZwkgsWqFhAwZ6rkG0VPtMM1eFo1wNUZttsr6WDGiWu5QxrsSgsanCQi0QJr/cfak4OMDk2B4VgVMUlbWj5kztc2hi9324eUKlNUWLUvhgBUbOmkQl+PBZnLR9IHJ4/5C3JF7TxdF99FjF0JQFgU7oBronGJAZIImG3Jh3wckulO5q8HH5OPKaox+0KgLIs+rYuaR9qNpnGK7MbubeZQHUc+RPhQcv5Gn7EAhOkBhnoF/yL/XGSLQGhoaKlQPZ8iY2WnecTNOS6SJ9bpp/BaJoQSllPMdbORiZAk3DalxgVFVdWokyHTGfpS/4oTUp+jR2aNaca7+tlgvLBkDhQNYhs8KiOOngtqwl5CE+buPc1qqMKg30lJ25TWTAO4PqlGZoXvG0jsTQWi/+iFKakPbWGUIX 8EGIj/jH YX+Tu3GCWZxD/xMinJmbNFQPx/2cAcINodH6B+6YcYYN5SMkJnpz7DXeX308r/xfmwOjJsTDhWaFCPoBzszP6r/F3CKYG77fTnCI19Kamsb5e5FQaPq3orvVtpBaXXaad6ZsoN4thWgpsixluFfJrq3mPWw== 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: List-Subscribe: List-Unsubscribe: WORKINGSET_NODES is not exposed in the memcg stats and thus there is no need to use the memcg specific stat update functions for it. In future if we decide to expose WORKINGSET_NODES in the memcg stats, we can revert this patch. Signed-off-by: Shakeel Butt Reviewed-by: Roman Gushchin Reviewed-by: T.J. Mercier --- Changes since v3: - N/A mm/workingset.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/workingset.c b/mm/workingset.c index f2a0ecaf708d..c22adb93622a 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -618,6 +618,7 @@ struct list_lru shadow_nodes; void workingset_update_node(struct xa_node *node) { struct address_space *mapping; + struct page *page = virt_to_page(node); /* * Track non-empty nodes that contain only shadow entries; @@ -633,12 +634,12 @@ void workingset_update_node(struct xa_node *node) if (node->count && node->count == node->nr_values) { if (list_empty(&node->private_list)) { list_lru_add_obj(&shadow_nodes, &node->private_list); - __inc_lruvec_kmem_state(node, WORKINGSET_NODES); + __inc_node_page_state(page, WORKINGSET_NODES); } } else { if (!list_empty(&node->private_list)) { list_lru_del_obj(&shadow_nodes, &node->private_list); - __dec_lruvec_kmem_state(node, WORKINGSET_NODES); + __dec_node_page_state(page, WORKINGSET_NODES); } } } @@ -742,7 +743,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, } list_lru_isolate(lru, item); - __dec_lruvec_kmem_state(node, WORKINGSET_NODES); + __dec_node_page_state(virt_to_page(node), WORKINGSET_NODES); spin_unlock(lru_lock); -- 2.43.0