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 9F46EC54EBE for ; Fri, 13 Jan 2023 09:37:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16BBE8E0002; Fri, 13 Jan 2023 04:37:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11B998E0001; Fri, 13 Jan 2023 04:37:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F264C8E0002; Fri, 13 Jan 2023 04:37:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E45518E0001 for ; Fri, 13 Jan 2023 04:37:08 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C1D91AB231 for ; Fri, 13 Jan 2023 09:37:08 +0000 (UTC) X-FDA: 80349272136.03.3CA8174 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by imf23.hostedemail.com (Postfix) with ESMTP id 1B43814000B for ; Fri, 13 Jan 2023 09:37:02 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf23.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 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=1673602623; 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=SvIndsnt0jtfYStMBEpz23oIREKi+RG2jqH/B38946Q=; b=B6l6dRQitkqlf5juGB6RxyyfK623un4nSYY93+efp41BXoR12047FmhDT5ByU+eq6Iyors 5PzpxEUtehq5Ka7mClI5lxNpicSk8KlITFqPq4QgaOzprnFwVYShoD5Tc8TIQ9mPO2pDIh j7u1hmUWPaZ3nScWXCG/99Tv9qcb4r0= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf23.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.40 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673602623; a=rsa-sha256; cv=none; b=1pE+vgq/JuTtdpGJN0saVG6JKtR701UIBA/sPEOvxXIizSNk0RXADPDv6wpK2GFP4pEaKM OiSzyx1hqJjcHYYaWj/0OB2pWhA8HgUA2o3g0z43Bbg150UfQTux/yLH3X+5VQLiGGsw+w cesEmhB7k+jShDYKo0EG/uN9cNjHv/Q= Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (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 4Ntbsj6HXgz8RTZH; Fri, 13 Jan 2023 17:36:57 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl2.zte.com.cn with SMTP id 30D9agSE049932; Fri, 13 Jan 2023 17:36:42 +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 17:36:45 +0800 (CST) Date: Fri, 13 Jan 2023 17:36:45 +0800 (CST) X-Zmail-TransId: 2b0363c1262d2bddc3a3 X-Mailer: Zmail v1.0 Message-ID: <202301131736452546903@zte.com.cn> Mime-Version: 1.0 From: To: , , , Cc: , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHQgdjNdIHN3YXBfc3RhdGU6IHVwZGF0ZSBzaGFkb3dfbm9kZXMgZm9yIGFub255bW91cyBwYWdl?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 30D9agSE049932 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.137.novalocal with ID 63C12639.000 by FangMail milter! X-FangMail-Envelope: 1673602617/4Ntbsj6HXgz8RTZH/63C12639.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63C12639.000/4Ntbsj6HXgz8RTZH X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1B43814000B X-Stat-Signature: 5ja9j1j3aseuwrfrxikofkp6r9awdxz4 X-Rspam-User: X-HE-Tag: 1673602622-108043 X-HE-Meta: U2FsdGVkX19s5nt+kYCBx+ikRQ5o+v8RfGVQsi5oY0EzhE8/vGCBzDK8frtBS9KdX+sjZ0Nm/Qb643w+m1Ur3yJhTXK+xMyQoXlUuvU3/E7lcHP5CrwQuwFMF7GVxc7VKsBndCRsaoZd2i67wgYA/BGDFWvewf1ARAPv8l2KpA1nvknHnDsiCdcvUMcRUjDjN1fya8ZU4wBrBHxNNEpf4KY07evIX+uFjbP0/etkSfUxnKl1edrSaYVWtVR3/UbXz6dx+nc4QufldzsyHiyPJk0u7GvXCUdKCHDdmx94d/uioVFQSor1mKkx3oY63kikd7vIfnm2rXx21bGbEvo8Ww+9UWJqIl3XlswrDOVlrzUv18qWoXxLH9AFrfOLMpggrlgIZ288HQeQEyApPNZrrhCyo2qmR6d8sMrMIt7GQ7tDi0VyBb1SkoS0nWJXo4qXvS8+G94vFXMygP1/3K6gv6ZicKJgS3rtvhCk/BR9FD8k1yXIoU7o1DZFYoMzpxbjR6DMcFrsiyh+NRH1caebnxCE9wTaIRjkUBQ6HT5p4iA5TGVCbWfrGky8dtSVqvrFE99ZO3CJEsPoqZOhorOqfcOFQ7suTg+pQUzmNbY9g2ZywLgKW578qIqbPm2GBvGew0gplvMRSTbbqCyg3/m1A9XWfM5JUxMxWJdEgDD521+ZNw6sz2AcSNsKdAe8K3la93qOcm/JeJtgs4eOUbjODi1bRIjC+NoKAK1ovbJPuE1PB+Lu1Xic20/mJqU2hih2ewKrjPWAPNJ2hXYD0Qc7e2DXU7DiXw0U9WqL7DZ85hpbx0TnjkcQNot5awrdDodTCOQ2Wj/gH8vqmfl8CyZWB8DwVqK6cdT46ZkbKyowwQCBqae5KXNR6mi+gv261oX+5lV7MfmaySw= 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. So update shadow_nodes of anonymous page when swap cache is add or delete by calling xas_set_update(..workingset_update_node). Fixes: aae466b0052e ("mm/swap: implement workingset detection for anonymous LRU") Signed-off-by: Yang Yang Reviewed-by: Ran Xiaokai --- change for v3 - Modify git log of explain of this patch do in imperative mood. Thanks to Bagas Sanjaya. 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)) -- 2.15.2