From patchwork Mon Apr 29 19:11:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13647564 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 91FD4C4345F for ; Mon, 29 Apr 2024 19:13:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 138F86B00A2; Mon, 29 Apr 2024 15:13:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E83D6B00A3; Mon, 29 Apr 2024 15:13:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA5AB6B00A4; Mon, 29 Apr 2024 15:13:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CA6C66B00A2 for ; Mon, 29 Apr 2024 15:13:30 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0625F16023E for ; Mon, 29 Apr 2024 19:13:29 +0000 (UTC) X-FDA: 82063518138.30.94CF666 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf08.hostedemail.com (Postfix) with ESMTP id D0A9C160005 for ; Mon, 29 Apr 2024 19:13:26 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ug92qe8h; spf=pass (imf08.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714418006; h=from:from:sender:reply-to: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=8QazdPBRgLGfXIr1HFTGvtxzzbA+7izgwNyqAiebQ+Y=; b=sTF/mWtiI+ZPm+qojlUNMkEIr6gM2whzLQZDpWQEvBxXGDoP8f45xesjanvZdQJ49i4wov Iz8x/JSoLvr/gDxym4wBu9bxwsFKxDxgqE8uH/EM+7lLg1oUCyHcPpouqai5NnAXGTKBAy b8fUaRoVlyuyZuS8ssrZq3FsRE3gKCs= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ug92qe8h; spf=pass (imf08.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714418006; a=rsa-sha256; cv=none; b=wKifPr24UT3XSaFusNn7zh4GfSMT/OI3vQ4howKNP+elXZPiKA3Qkq/ZK8WnDt7swfuYIz q9bfj0QOioHaf4ufwkKZSC1KObQeZfqvK4p6bHP8vfwAcVqeLgupJM+H5hkXs+z/r5OCFo 7fBfnGSP2kJbqJCyWLNAw92CBjs1VXs= Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6f28bb6d747so4144687b3a.3 for ; Mon, 29 Apr 2024 12:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714418005; x=1715022805; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=8QazdPBRgLGfXIr1HFTGvtxzzbA+7izgwNyqAiebQ+Y=; b=Ug92qe8h7VnDkN34uLk2vx6Hkc3TbWzbI+Cgkxz3sR2Xd22fXU0+kGvukQd87Z4dm+ PMZdMBJgZ+4+EpHtt9x7xtlEe7TAoeTU3LjZDIQfo6yDr7V2vR7iCrmnCGuk+aqxqpk/ /VMvz/oWObeLg5eJNZOY85sYpobwC4Nk6lf71OXPl9u/elBmkuN8+XwmZvl+tlzSM0rZ r6tkeICinDt8bxvVUVS/hk6joV/qe/3N5UyhEjzq+Xk3l+jlymenMsHBtUeMZgB8qRmD jGuFDWK8Rgh3oui60NYn2kkL21E3CSDM57pefy7ckGUEXwbw2AhLimuCpSMOevyk6H3K mEJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714418005; x=1715022805; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8QazdPBRgLGfXIr1HFTGvtxzzbA+7izgwNyqAiebQ+Y=; b=BwHyQ+LQhbG/M5I/J8kX1Ne4eU74SKpQyF/ThqErIf2Dz8FLfSzqD6stWMSkbX75Id D0VSLugmuQRnUObmo2WZInBbFgcngEnEyJ43nqXvR/8iWGNBqOnd6OqFeMnL8SrJxSnq kO+O5IhFcisDTmRmJptjykd5QhlKxxDDGfO+2R3wv1BAYj+U1NfLSihdYeuY2B6NRewc NTc1Up9/NnrrZjv1GcPgvpHhoFSuWO2rgtx5ukoeHxqrG0U78rzjtFkrEiOFVgBx1q7Q Ho0NEdJdYqoIcUz9T88/aRip21Z4kb1aKhToZZpPOPtaqqYA+N13408aLVA1UVRjpAKo RZEw== X-Gm-Message-State: AOJu0YzySWFbyqyT7kgfS/S74HhU16EAtN05CyXEmfF+X3xRewQL/jMT UTjdq/VT9P4APPdB2ZfXD/jDez5YDdJcnyRaKmwyxFqlhoTWv/Gjo8ss0mtqnmI= X-Google-Smtp-Source: AGHT+IFPOFbp9pmt2653zFt0UEbOTrCGtp/cEwxyT9UheEYNDjImTX/zaDPWA1WmxxbAEpNdjTgHPw== X-Received: by 2002:a05:6a00:21cc:b0:6e8:3d5b:f3b1 with SMTP id t12-20020a056a0021cc00b006e83d5bf3b1mr11062453pfj.22.1714418005131; Mon, 29 Apr 2024 12:13:25 -0700 (PDT) Received: from KASONG-MB2.tencent.com ([1.203.116.31]) by smtp.gmail.com with ESMTPSA id e10-20020aa7980a000000b006ed38291aebsm20307988pfl.178.2024.04.29.12.13.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Apr 2024 12:13:24 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Huang, Ying" , Matthew Wilcox , Chris Li , Barry Song , Ryan Roberts , Neil Brown , Minchan Kim , Hugh Dickins , David Hildenbrand , Yosry Ahmed , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 11/12] mm: drop page_index and convert folio_index to use folio Date: Tue, 30 Apr 2024 03:11:37 +0800 Message-ID: <20240429191138.34123-4-ryncsn@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240429190500.30979-1-ryncsn@gmail.com> References: <20240429190500.30979-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 X-Rspamd-Queue-Id: D0A9C160005 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 5rkwogagid5r16e7g81416wqzn5twndq X-HE-Tag: 1714418006-985101 X-HE-Meta: U2FsdGVkX1+fIlaMxwiJiguidWRt9aTDKJMiQW0wacRUU8l60PoY1wVhvr7PoNqCRA9OUphdHMXe4+ZEb+vkOpFYUoZA5XvNohFccexfL1QpTlYiMzOoSGRSU4C4FU8z/EBKai7cuMvr7JaZPTe1ugKbA++D3MxewP4twSyNs8uwQ2hvyh93VgQdODLgYiH4IPghExre+Ts/3BFPMQPAB6ur73HvRa8m2bvbwOPkQZT31Eb8U1Tiekp7RteQLoC817kjNhqB7zDOhQQSnzAPuHNvXvEoGL4/RysTjXr/HLgJ58IQxiZGdcIN/51YM9Q9fuLmsOneh/1MKLWqebJBvHra74dVHrQU/SZXkIstVzEU+sq3PSJ/MYohS6FVhi3pQqZybdPIok/o6xuBkK5OmUkuZhGKtNpCh4ScLkcLLpbam0H8QPxOLhXcy8qIjrFhWSg0rNrur5tq52r06HyubLssQAoHcLGS/t/7fbqzHCzhcHBx9S9SJcAGJKDwyb09m9NqkYy7pdy9jmqa6jVTmIKpBEv8ljAkbkWj6mdZIbCiqGx3H/x9kcwQA1R8beCyNZjQfZhHO3egEezGQVpJFWwgNBsfjl5qj1XuhPcan1OKAel1ldh7TROhY0jD7ThYm8BoeZ6H4fcWIDOjkxu/Q5bFxvSblAWW2akjEfa6PF7aKR+H5/HHFjDIcLkU1Nu2Au9T+jad7qTjbwhhNyJoLF+UlqXT3CydRKCiPs1Hm8cnEGEd6l1IFkZ/1mg4PgaW8DFtDWK81zND+g1HIT0eFlQ6QDUja6j7EY2GemwB9dtB3/+/6PyAx3U3U2u9AddlNY0LiAS/izpVWV+sOeHs1RDDnYIsK+O03eO6pOpnL4Vl4SrXipTvlY2Bl7isauAehcBFMavNKNcjr6ofNEOUa5gAJpNGaNaqmTr12owqtl9bXI1g/+K5D1ASdhiMp+GNnnUzN2dydY0ixbR9fyZ 1xGhVXRZ K71FDJyc7m8flhKyUG7Vcf4jNBh0lSQp3zaO30lkl9em+Pk1dbgNT6gYiHZ8GVk33R2bhnpZJZ0MbofwlWoQBibQmaZCiy2JpFI0E6FrnjLUU8qwfC7xxFEStqoG46WUML+/4PZw0qKXkBzhrifRX91ho4e8qJ9LOsFVpWIhL3Y5AaqXTofngquF1Hnlar8BDioXCDlijqJ1kX4LMfPAU+6LElkUdc62L2urWHuydpisuWWDpOVAsMup1ndUdnBtZKb1rAGsBl2nClHmw8fxUUraQFkc4YazEEYb6olFdgJ/wb7RHZCv4l6uTu4wh/GDvvUBh5fXSfsSvdf1Gm703unrtUvYQiSW/K90X2NvmbXY+fnH5QYStswi82ufwxa1i2Awy0tpyKGIDb/V4Mc78bpVpGsSSvGwkMo7WbteAAX7lLK9h87RdmNaN/iQcSATGjLTbzi4sIR7BH36F/8YEuwq12RXjMnyrVlYbc0wb4geCnwc/URp+RIyGHoveXzECXqzIzEkU6fwTivlVY7vfn5Atf9drXngwMkbHxSLGuY90++aFEEYhwn4PAy11EI73u7sZY5W1xkU0T/KilX3H70nysevMzKn8w3sJGo6Zg/HN6TLEFhhiRbj1AW6gHUD3jD2YGPZPmmP2+OIEIKk9cHoXPY00vNYPrCJhY5Tw+ikKI3o4Q2DG8F/f0BlzsE4NmarvRmdVEHEZsLIP6BVNLSqzI04H6uDnXYAF 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: From: Kairui Song There are two helpers for retrieving the index within address space for mixed usage of swap cache and page cache: - page_index - folio_index (wrapper of page_index) This commit drops page_index, as we have eliminated all users, and converts folio_index to use folio internally. Signed-off-by: Kairui Song --- include/linux/mm.h | 13 ------------- include/linux/pagemap.h | 8 ++++---- mm/swapfile.c | 7 +++---- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9849dfda44d4..e2718cac0fda 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2290,19 +2290,6 @@ static inline void *folio_address(const struct folio *folio) return page_address(&folio->page); } -extern pgoff_t __page_file_index(struct page *page); - -/* - * Return the pagecache index of the passed page. Regular pagecache pages - * use ->index whereas swapcache pages use swp_offset(->private) - */ -static inline pgoff_t page_index(struct page *page) -{ - if (unlikely(PageSwapCache(page))) - return __page_file_index(page); - return page->index; -} - /* * Return true only if the page has been allocated with * ALLOC_NO_WATERMARKS and the low watermark was not diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 91474dcc6cce..47171bf20b53 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -777,7 +777,7 @@ static inline struct page *grab_cache_page_nowait(struct address_space *mapping, mapping_gfp_mask(mapping)); } -#define swapcache_index(folio) __page_file_index(&(folio)->page) +extern pgoff_t __folio_swap_cache_index(struct folio *folio); /** * folio_index - File index of a folio. @@ -792,9 +792,9 @@ static inline struct page *grab_cache_page_nowait(struct address_space *mapping, */ static inline pgoff_t folio_index(struct folio *folio) { - if (unlikely(folio_test_swapcache(folio))) - return swapcache_index(folio); - return folio->index; + if (unlikely(folio_test_swapcache(folio))) + return __folio_swap_cache_index(folio); + return folio->index; } /** diff --git a/mm/swapfile.c b/mm/swapfile.c index 96606580ee09..6f028262898b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3474,12 +3474,11 @@ struct address_space *swapcache_mapping(struct folio *folio) } EXPORT_SYMBOL_GPL(swapcache_mapping); -pgoff_t __page_file_index(struct page *page) +pgoff_t __folio_swap_cache_index(struct folio *folio) { - swp_entry_t swap = page_swap_entry(page); - return swp_offset(swap); + return swp_offset(folio->swap); } -EXPORT_SYMBOL_GPL(__page_file_index); +EXPORT_SYMBOL_GPL(__folio_swap_cache_index); /* * add_swap_count_continuation - called when a swap count is duplicated