From patchwork Fri Jan 13 09:36: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: 43124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp178171wrt; Fri, 13 Jan 2023 01:50:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5QfyuNdl9eRqHDh3Qm6QXzfCLp5TWHRsmlgp4eAGiLx0a7C+kg4RA7M3vcvQtrNRg2u0a X-Received: by 2002:a05:6402:3818:b0:49c:1fe4:9efc with SMTP id es24-20020a056402381800b0049c1fe49efcmr1885441edb.40.1673603453191; Fri, 13 Jan 2023 01:50:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673603453; cv=none; d=google.com; s=arc-20160816; b=OPnPwfgP1GtHl++3WuolMI6X7VSEMJ1WyBxTuz9youmB2KRr0DJ2yccWSZ1ZxwTYf2 YTwrLVERvHjdxJEkerdtmdJ5uPyzE+MWtC9d24vi8tipQ5YY4MoMfQRkFUro+DUL8iEU pV04PrHLnLe1Rmy7kxUcQxaDEBUHUALSMvVOZmoBPsEaqFVT0EUBaGlLOu6tA1uJ0H7G nAnaOc43rPPatuf1R8BIke/ELwwB3TRUTjtPvqAC9LpSZC1jVPL8RB3mTbwqDHR1dr21 4WF6Wxp9t5tKBsbmKVOJjoLVk7xmo5/aV9/QidPmG32tFQfOEmOSe73uU1n38oWytCU4 Gc1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=SvIndsnt0jtfYStMBEpz23oIREKi+RG2jqH/B38946Q=; b=lzaTGxymUNw9l01qP7St69e5R52f9M/sEXdt2TC1knFxMB3zzxDG8hHSjdCEdGgRt6 sOOYXLAeKWzLrihPcuKtjaonp2T77wpvr6/abWqm78+CdYsP/G8eILg+xLsMOjF2QZ4n OGy8u0zqLlIr1ckU3TwvtdJC43MEIUws0bGRbUjqqXzGUfm6wym4PycACyGuV8cugQ4m oRjQqUmy0I8RgUTprZdqriifyD1/+euvOmgIxLgxTIdBdC0z2Mnu+02iQutS5gw10tio AG1MNXhJkNXn6t35+yAt/TafyZAZ7QQMP+8FCYZlhHlriHHAonvuRDPPu9JEFkSnWlvq MZWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a05640242c900b0048ee2e45defsi26099587edc.288.2023.01.13.01.50.28; Fri, 13 Jan 2023 01:50:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234479AbjAMJs1 (ORCPT + 99 others); Fri, 13 Jan 2023 04:48:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240722AbjAMJrf (ORCPT ); Fri, 13 Jan 2023 04:47:35 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAE6A6B1BF; Fri, 13 Jan 2023 01:36:59 -0800 (PST) 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?q?=5BPATCH_linux-next_v3=5D_swap=5Fstate=3A_update_shadow?= =?utf-8?q?=5Fnodes_for_anonymous_page?= 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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754900414352881116?= X-GMAIL-MSGID: =?utf-8?q?1754900414352881116?= 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))