From patchwork Mon Jan 29 14:34:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13535759 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 CA352C47422 for ; Mon, 29 Jan 2024 14:35:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 594AA6B0071; Mon, 29 Jan 2024 09:35:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F4BB6B00A1; Mon, 29 Jan 2024 09:35:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 284046B00A2; Mon, 29 Jan 2024 09:35:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0D8036B0071 for ; Mon, 29 Jan 2024 09:35:16 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CDC6DC0A17 for ; Mon, 29 Jan 2024 14:35:15 +0000 (UTC) X-FDA: 81732596190.22.5D1A1EE Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf23.hostedemail.com (Postfix) with ESMTP id E2476140011 for ; Mon, 29 Jan 2024 14:35:13 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=3Fs5POjt; dmarc=none; spf=none (imf23.hostedemail.com: domain of BATV+95c35c30fd22f84c25d9+7463+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+95c35c30fd22f84c25d9+7463+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706538913; 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=IGlT4PlWbZpkcMxkrjhe0P1uDfgYrW+CfMT58/K5QjU=; b=mWGIndQBYbTYzJ1zWxZhPpWnP1RTiea7ICAt07iw6WfQDiLvttxZASb23Rq+9A7GbwlkfC OJkbwdF8c3kM4GfXKuip9rQDHI1U2wcb2vZjlwBwMyT83q46BH4/QPJrIYeLTSxaC1zsG7 9acEt0KOUDx6oPLjUcIbghqK10D3th8= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=3Fs5POjt; dmarc=none; spf=none (imf23.hostedemail.com: domain of BATV+95c35c30fd22f84c25d9+7463+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+95c35c30fd22f84c25d9+7463+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706538913; a=rsa-sha256; cv=none; b=WMhCi+GfEaNfDFf6VjHTjjtzNrS851Bh/Q0I2FnD3S5mgziaQMkWHfkafLHvHLH4v9HS9E bwLlZC8gEOkFVAR1qgIryhVpPrjSed5E3c6x1aLyJxTzBiJIQcwqQRFvDZvuS/KGzJtESq 8eb0h1xIGzdxMZnW0v9PdzkzH2mY5iI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=IGlT4PlWbZpkcMxkrjhe0P1uDfgYrW+CfMT58/K5QjU=; b=3Fs5POjtAGkn+BqEHVp6xhQSfs baUrqJRNT9czpEH3taWzhf88/yg6idYiKhFhOm8gFtid320eB1hJIy8Njote4Affe9rP6YdmKqHzM mDkWf9pHvNSBVkfCwsKEDHsNm9dtmftn7VgP3X4b93DYvF2w0smw5wHY5X+UaL8CN/y/G1eiZtb0p 2aqZZOwCQ3PqCiQiKb71uunekh3OZZm4GyYvCC5ANjO8Ta6CYe9mLpDPRdrRIibr7pJxr6qxdrKVR sim3xdYpq/GpVVlUXhyOIr9QY+5+KJTdlejzcSe+LSoJ+hqIqCEEyEh/50Q5XTPJLxpih+rneGGSS Ewq7XqmA==; Received: from [2001:4bb8:182:6550:c70:4a89:bc61:3] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rUSj7-0000000D64G-25E1; Mon, 29 Jan 2024 14:35:10 +0000 From: Christoph Hellwig To: Chandan Babu R , "Darrick J. Wong" , Hugh Dickins , Andrew Morton Cc: linux-xfs@vger.kernel.org, linux-mm@kvack.org, Matthew Wilcox Subject: [PATCH 01/20] mm: move mapping_set_update out of Date: Mon, 29 Jan 2024 15:34:43 +0100 Message-Id: <20240129143502.189370-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240129143502.189370-1-hch@lst.de> References: <20240129143502.189370-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspam-User: X-Stat-Signature: hjmn6bothk4rrxdy1fxidyzts39ur93q X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E2476140011 X-HE-Tag: 1706538913-541483 X-HE-Meta: U2FsdGVkX1/qJevk0H7mM+AMb2jSGgSYK6eJ+R1fLaXbIaFYmqaTH/us0dxpu77vbkwfWxZvl72J/9baEUUyzIrKl6/v1j7mAk+lwihKOGSC9xEt7MiC49hhLjnFViAANsihvD90voUSVxAnbRm4BCeqQdrWlI/1XLj0lNOO1GhFxglKsNU+w3SO6/UCJhEbE5kruAqy1mzVlq5+ybHjPjsS6e9ICdl+GFpV9C/5wuK2rj4Y2UMFCR4w0pYUWXJaR0FAIqdfjgbnDtBSx2nLA1PvjwdYPDLDhAOee/fNvdeWCo44rfV+t/hQQZk3OkyjdzcA/LQSPRvxPGauxWtqs24sMUDAHnadG5MQfsgW1m+BhJBVNsJ+U6Eq8rL7jh5Ymvmtc4FByi004YgvzlndQ7FKrzSxh2WBSHPmc1xqhQC0BZ1f0dsT9khx97IhCdLk5KUtxTOCHBpfjBjNZz9vC/Cy3Yo4kxfBveYV+ulc82+jrdpKKh6NcXrxxtMm6axI21KQppWG8+xBRmjQZZE344xCDcbIrosVjmYORvkwbmFbCs63ZIRUwjExB5knpX0F9nustteF4TqckZ3oL0myf6MPr7k9FGmojaIvNxMI5u4z/sPaXeWaP/voq7bhqtv9hXOMkmJWt48qGP0wEh+nZ+YMPgrxToFXB15ZISAml1C83qcsTMCp+MMdFMaGYjVesen2Q5rOLmOm2h66615D/3KpPdYHYlAzz1ZwSMEvmYzLhpwkhGYtvrfk92GEAqzNNnQIH2HRdHkufjCnV0HdEhoe7sTYjiOctLU6lbvEi6QP0oNacU73k4d+C63bFps+a7crOTKhDFj1rn/mlCZrQhwerm/orHrFma9dsHFLiSIPC9Hm25mNaNqJtiUduQ0x+mOhVfREF0+xFn3L/2uATqpWt3Asj/MVCu3fnjCNVvN7VQR6pekYEOS6A2H/3vXmjJn6Gl0j+PgZYMb3Vv3 UTr0EhG4 Oelc+LApwt/4TZ3eWnDyf7QX3iW4+8nCNKvqXefToUAaSjgvYF75tu3wSTs5dkmFnfSe3IcshTSRul1RE1jUNxfNmda3TycJo3eX0841jXtmBTJCrnGChhOQSHzB1Nxh/TWo6bD75KdstKndFyaz+Rr79zvP1Dlrz/BVjPkHiGJ7JWTrdRmcYy9H7p/9bUnk/ow1UprXqCcdGqCuT5vvPBImxx0mDPDO2Xia7ft+bvHCzTNoh1e1Ked5aFYb9dfthZgCzRDS5UO75fI1m4EF+ST4m17w/KgD01Ku9IYx00i3F733fLQF6J+RR9sZiXZJMLoPOd72Qd9wa1DvhqTZYh99N9gicIXIrDRsWSwALUWH97G8nS+MVHt9wTgaEn4brf4MsWNqkUu9NM4O1irxRffEBmGfkhWe2rVs0D7sdaUrKo+EeMMEqHvPobkazRVOfNH5ekrajmjWwCnV6/Zn3V0PRelnahzxnjTyXB40203VPZOSUxLzuofJAJehjeI4pVMpjUfrZpoQriAk= 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: mapping_set_update is only used inside mm/. Move mapping_set_update to mm/internal.h and turn it into an inline function instead of a macro. Signed-off-by: Christoph Hellwig Reviewed-by: Matthew Wilcox (Oracle) --- include/linux/swap.h | 10 ---------- mm/filemap.c | 9 +++++++++ mm/internal.h | 4 ++++ mm/workingset.c | 1 + 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 4db00ddad26169..755fc64ba48ded 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -350,16 +350,6 @@ void *workingset_eviction(struct folio *folio, struct mem_cgroup *target_memcg); void workingset_refault(struct folio *folio, void *shadow); void workingset_activation(struct folio *folio); -/* Only track the nodes of mappings with shadow entries */ -void workingset_update_node(struct xa_node *node); -extern struct list_lru shadow_nodes; -#define mapping_set_update(xas, mapping) do { \ - if (!dax_mapping(mapping) && !shmem_mapping(mapping)) { \ - xas_set_update(xas, workingset_update_node); \ - xas_set_lru(xas, &shadow_nodes); \ - } \ -} while (0) - /* linux/mm/page_alloc.c */ extern unsigned long totalreserve_pages; diff --git a/mm/filemap.c b/mm/filemap.c index 750e779c23db74..6c8b089f00d26a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -124,6 +124,15 @@ * ->private_lock (zap_pte_range->block_dirty_folio) */ +static void mapping_set_update(struct xa_state *xas, + struct address_space *mapping) +{ + if (dax_mapping(mapping) || shmem_mapping(mapping)) + return; + xas_set_update(xas, workingset_update_node); + xas_set_lru(xas, &shadow_nodes); +} + static void page_cache_delete(struct address_space *mapping, struct folio *folio, void *shadow) { diff --git a/mm/internal.h b/mm/internal.h index f309a010d50fb6..4398f572485f00 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1266,4 +1266,8 @@ static inline void shrinker_debugfs_remove(struct dentry *debugfs_entry, } #endif /* CONFIG_SHRINKER_DEBUG */ +/* Only track the nodes of mappings with shadow entries */ +void workingset_update_node(struct xa_node *node); +extern struct list_lru shadow_nodes; + #endif /* __MM_INTERNAL_H */ diff --git a/mm/workingset.c b/mm/workingset.c index 2260129743282d..f2a0ecaf708d76 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -16,6 +16,7 @@ #include #include #include +#include "internal.h" /* * Double CLOCK lists