From patchwork Fri Jan 13 07:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 13100205 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 6CDFDC54EBE for ; Fri, 13 Jan 2023 07:51:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C18A8E0002; Fri, 13 Jan 2023 02:51:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 870908E0001; Fri, 13 Jan 2023 02:51:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7387F8E0002; Fri, 13 Jan 2023 02:51:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6359F8E0001 for ; Fri, 13 Jan 2023 02:51:02 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 17C2A160464 for ; Fri, 13 Jan 2023 07:51:02 +0000 (UTC) X-FDA: 80349004764.02.C09E7DF Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by imf02.hostedemail.com (Postfix) with ESMTP id B8B9380004 for ; Fri, 13 Jan 2023 07:50:58 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf02.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.35 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673596259; 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; bh=0W2UT7XekmPW2Ch/Mfx+ufxNEaWobtcBJn2NfrwjzuQ=; b=eC+dert5bQcJCbcbxPF0LAH559bufjI0rutM/A3dgmJoQna4CQwnsV340R9VDFvbawYzPu qvy7pMqIpMk7T50ZfcsvLXAnkqCkcuoEE0k27ck1u0dmFHfWSaAJviPcnPHF3b+DnfqX3J fb4W8ZfkPPW8Bealt2BDUY8CTUQxB44= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf02.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.35 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673596259; a=rsa-sha256; cv=none; b=RWX4wWp/rngRHEn7t5ega0BjvQD08ZZQK/mCG/631aii7tE7LvfmCR4zHaQU60ZKRYM0Jr TtntK/5BdrM/I+ObpZmqRg0HVouworHtmRNzEOs28drng8cIkhO3HzCRiXoCUgU1abTHkD 0GTZ+qi6TpxRCy+xF0eu6eyx4vFE1pA= Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NtYWL1bQDz6FK2T; Fri, 13 Jan 2023 15:50:54 +0800 (CST) Received: from szxlzmapp06.zte.com.cn ([10.5.230.252]) by mse-fl1.zte.com.cn with SMTP id 30D7ohY7091613; Fri, 13 Jan 2023 15:50:43 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Fri, 13 Jan 2023 15:50:45 +0800 (CST) Date: Fri, 13 Jan 2023 15:50:45 +0800 (CST) X-Zmail-TransId: 2b0363c10d55ffffffffcfca5f18 X-Mailer: Zmail v1.0 Message-ID: <202301131550455361823@zte.com.cn> Mime-Version: 1.0 From: To: , , Cc: , , , , , Subject: =?utf-8?q?=5BPATCH_linux-next_v2=5D_swap=5Fstate=3A_update_shadow?= =?utf-8?q?=5Fnodes_for_anonymous_page?= X-MAIL: mse-fl1.zte.com.cn 30D7ohY7091613 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63C10D5E.000 by FangMail milter! X-FangMail-Envelope: 1673596254/4NtYWL1bQDz6FK2T/63C10D5E.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63C10D5E.000/4NtYWL1bQDz6FK2T X-Rspamd-Queue-Id: B8B9380004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: x54o6oe4e859kdjt348rhfs18778mj13 X-HE-Tag: 1673596258-151133 X-HE-Meta: U2FsdGVkX1/Gd3WBT7dsy/oq1qb15aMMiC9bAQr6iEMJFg+yc5jUBr1rTMUQDY1kzPKeeGUlwfbXmJ3mOd3WOkVN8yMm23MdLg7F5cCbBjS6uKYXVlDbi9JMfg6aQY/ktanEEDKdjh6YgiJyJi7xXgK2OR2/QhtxqJC7NG4g9tYlQm0EFSC4y6KPXq7EzwGyteUTFW/y3Rzn9gVnNDtiapBSmwnMKusjabwxinztHS748gC65e4w5DxSEewGjXfJMaCbHv7tOXaQMTenACJf2kx+/50EI97ucUKr/hVCHEvoebENDyI3a6Xpz7J7xK4x2WUlue3W2Xba/0yw5oYJ/cc/8AUSClbv29xc68dUbHsBUtvEY7GBSAxtc7WmtB9srpqj2rULzl45+KgI0/Rg//38af9sSqxu/eZgdYSV22u4HcbUKtA+BnalEoJtuP5GwfuQlf+Ho+z8hhMRM16As09jj/r/fstMe7cqQPI6+06gwfIk3hgvHJ9QAIkveaIYSmcnfNFRs8sXrEn7zYCl7fBYWrB8Q5znO2rLYp7ZissqhekvZ4VO2HK815OGm0+ZoJgTvhTDLKW9XSdZ0ClqguEbcVQZmSvPc7ABOq/2FLnXca3UROu/ZZkSeP3/nrahY8fB2S5PjAXA2u5KJs48VS5pX4GUYV9ReK12O1TtZ2Rj+0mrgvF4P16/kPAZNAdz+/x02GXX9kqwVdqIr/ugfU2LdTEgFZmjltmh7M/DjNwGGIok8ubBaedj24f5oESdS0L0AdaV3tjHHuo55KQ1BRPJM9WynpjqTzMf9ARun/jcWU4oCsguPXBiAb4X0cHnnpAokwCW1SuP0SGH4nS2krPNqrkaehiP3l9TpjOhxWp/hjUODR2Y0NblY2A/HSs3jVMs1bN92Wc= 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: From: Yang Yang Shadow_nodes is for shadow nodes reclaiming of workingset handling, it is updated when page cache add or delete since long time ago workingset only supported page cache. But when workingset supports anonymous page detection, we missied updating shadow nodes for it. This caused that shadow nodes of anonymous page will never be reclaimd by scan_shadow_nodes() even they use much memory and system memory is tense. This patch updates shadow_nodes of anonymous page when swap cache is add or delete. Fixes: aae466b0052e ("mm/swap: implement workingset detection for anonymous LRU") Signed-off-by: Yang Yang Reviewed-by: Ran Xiaokai --- change for v2 - Include a description of the user-visible effect. Add fixes tag. Modify comments. Also call workingset_update_node() in clear_shadow_from_swap_cache(). Thanks to Matthew Wilcox. --- include/linux/xarray.h | 3 ++- mm/swap_state.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/xarray.h b/include/linux/xarray.h index 44dd6d6e01bc..5cc1f718fec9 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -1643,7 +1643,8 @@ static inline void xas_set_order(struct xa_state *xas, unsigned long index, * @update: Function to call when updating a node. * * The XArray can notify a caller after it has updated an xa_node. - * This is advanced functionality and is only needed by the page cache. + * This is advanced functionality and is only needed by the page cache + * and swap cache. */ static inline void xas_set_update(struct xa_state *xas, xa_update_node_t update) { diff --git a/mm/swap_state.c b/mm/swap_state.c index cb9aaa00951d..7a003d8abb37 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -94,6 +94,8 @@ int add_to_swap_cache(struct folio *folio, swp_entry_t entry, unsigned long i, nr = folio_nr_pages(folio); void *old; + xas_set_update(&xas, workingset_update_node); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio); VM_BUG_ON_FOLIO(!folio_test_swapbacked(folio), folio); @@ -145,6 +147,8 @@ void __delete_from_swap_cache(struct folio *folio, pgoff_t idx = swp_offset(entry); XA_STATE(xas, &address_space->i_pages, idx); + xas_set_update(&xas, workingset_update_node); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(!folio_test_swapcache(folio), folio); VM_BUG_ON_FOLIO(folio_test_writeback(folio), folio); @@ -252,6 +256,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, struct address_space *address_space = swap_address_space(entry); XA_STATE(xas, &address_space->i_pages, curr); + xas_set_update(&xas, workingset_update_node); + xa_lock_irq(&address_space->i_pages); xas_for_each(&xas, old, end) { if (!xa_is_value(old))