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 400E2C369D9 for ; Wed, 30 Apr 2025 18:11:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D3776B00AC; Wed, 30 Apr 2025 14:11:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0588E6B00B1; Wed, 30 Apr 2025 14:11:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC65A6B00B3; Wed, 30 Apr 2025 14:11:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B0ED36B00AC for ; Wed, 30 Apr 2025 14:11:05 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8ACB35B83C for ; Wed, 30 Apr 2025 18:11:06 +0000 (UTC) X-FDA: 83391501732.15.0F0D880 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf26.hostedemail.com (Postfix) with ESMTP id A107114000D for ; Wed, 30 Apr 2025 18:11:04 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RRw96U6O; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746036664; a=rsa-sha256; cv=none; b=MxHNh37eJYqSH7pnH9V0Hi0fPjeM8UwQXMGhH2LJG/Mrf/rx/UyVyYIiMoi2CN81yZrGwf Aio3W4/84ZAFVBeaoC/K7k38nR32OgrmPtoK0EcfS6sOC0t6LxkWAMB6ip0dwZ9Wka/VXU zUjm1GGF9eR4KuAVzX+v5qa1tfJ+Stg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746036664; 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:references:dkim-signature; bh=BFR7AoJacqW7HaZwiZ98V1thSCcTnJzoeJlhOpgrdoc=; b=1hq34LmGgGnqH92JuZUjH8fsmikATi4z9EZvanTWONG1IhyIDH28Dvhi6ctFRnr2SNS5d8 LViXx/facDrRWCK8D9QHWMvr8F5vinKIhFVT6ZUTzg+IpUU68YwdbecqG45VIABO+sRU8J NLSbpmC8Bqe51EdSsFj/gq0V8aLlCqY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RRw96U6O; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-736c277331eso1328949b3a.1 for ; Wed, 30 Apr 2025 11:11:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746036663; x=1746641463; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=BFR7AoJacqW7HaZwiZ98V1thSCcTnJzoeJlhOpgrdoc=; b=RRw96U6Ow4bDjhbR9SHzQ0huu1i9Ce1UD90uPEnzuXLx+NfNTsycpmurS21H0eMLAC atbaXW5ePdsHnVrHwOdYSCFV/LWlPwKfxa13wy8S1RbE+R+6lPDY64dUdjl98Dy7khst lMMj0ZDbLel/dea8S77gnd0ghSTUqqClPcnrsfLVH6mTWrZXAyqmgEC09+ax4I8SFk1+ 8ZFFS3ZpK4VogjO7cyGWWbhQ/87Noi2s4jc5jwuLf7kUGxqhvpDI23kEZtBU9ufP0hQ7 2LOMpBzwQOErwabrKotJFEr5bPJ58z7eOQOBh53gm2YwdGa0u62zsKqi8Q2stgyWlud9 dGDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746036663; x=1746641463; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BFR7AoJacqW7HaZwiZ98V1thSCcTnJzoeJlhOpgrdoc=; b=JPU0YdG4+sSYVXTIvSPzoZz6HQvpUZysb23+3x67JrfFCYvokv7hV3ZeFKqtbeJ6KX Bkc59501QuZ02rJDF0HgDZ+ci58T41Qrp7zNPHW0DON/iRL/GyoJcZ+YdBf/npiMYe3H dkGukipkojRjQFNAjaWODrjsTvu/C5ZgjMyP9Rt4PfAn2bPa1Rz75bcewQ4i7avFZWBX ubOMas++siPWMotIKOXbrwhh/uotmmB1lisJjz8kM2lPEyyddldlQHHoO3bLO3BxPyUO +XbWtabEVkWtmwmBsMOPDYX2mEBPFHFmpCrch2/ELpVfbh54KhbMQQMa59U7Y4jaV5r2 kL3g== X-Gm-Message-State: AOJu0YyMVj7MhRxwxObWyjCluQ5GZ1Ytba1AXv+lnTcZaiXjcmoae/nT 9h6Wxq3LSdJmBOv7PhFCozIi//p3ps2ZVxANnkhBVdZ8IRfJfCSqHxgeSzT8 X-Gm-Gg: ASbGnctRPt8NX2z6+KCw4dWxqlUpF4vaDVjEK9SLdID2EiS/7+woYxB2dsLm77g7CrA 0cP1Sf86ClUb6TwzhB+RAC+jtGBUjU30UkryM1dQn5h5KJFO/xCdStp1Rw21vZkKJ9H36aSk3z8 01F7CNki5MFX8lhKwgMXGVq5nWk3ULZ4RYyXjX17ko/JmWscRp2U2GskjasyVKSF9rtKMgztMhz fe7E8oRretoESufXDoPVhnnCbwT0eM/xghFhF9gREGaMDBdrvlivfeTZVRxeGEBRJf4l/n8JqJP BGEtEO8B2jlzT97eiOfCB6JtVjZ/iaJ7vGTEdI9LMPSur3nLcz65pkJrys8LZg== X-Google-Smtp-Source: AGHT+IGNWoQRjjYwV+5Fgmq5l0irQkbd37wxK1tufot32watwCeXNfCMZBa34D0poHbU92Yq+iX/3g== X-Received: by 2002:a05:6a21:6da5:b0:1f3:3864:bbe0 with SMTP id adf61e73a8af0-20b9734f2d1mr559643637.8.1746036662637; Wed, 30 Apr 2025 11:11:02 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([106.37.122.198]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039947976sm1983822b3a.84.2025.04.30.11.10.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 11:11:02 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Matthew Wilcox , Hugh Dickins , Chris Li , David Hildenbrand , Yosry Ahmed , "Huang, Ying" , Nhat Pham , Johannes Weiner , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 0/6] mm, swap: clean up swap cache mapping helper Date: Thu, 1 May 2025 02:10:46 +0800 Message-ID: <20250430181052.55698-1-ryncsn@gmail.com> X-Mailer: git-send-email 2.49.0 Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A107114000D X-Stat-Signature: xizyzhqfssx651taqq99c79gnr7949ch X-Rspam-User: X-HE-Tag: 1746036664-197468 X-HE-Meta: U2FsdGVkX1/bwXQwtm9mf7EERFcXEEuC8US8SM7Tx2Yv5OesrGNJXJSfpjlKrUQZcoU7sYF2ASDfullzeLFVZPQEv5eu3p5cdB0kR99vVX/hyxDteFxZyvctKGhY6T131QIgUhfZMsiBkKc93Sb/643jRLQXjfkxHVXwyDAUteqEMpvkZlgt2zIbPfmZOrm0MBpnxEeQCq0JOylv1CANEmC0l7h8W3oYp0W/hqSdK8FVzItlE9XPTKuxvdBKpmH5zazq4OR5GFNP2rkciwaeTN/G2kaX5Yky/io/Tu7N42Wrt7uxDh8O8Ws0dRuI62pcPWsH+YmLy5t6AuA7lk8US0Uvr9Fe8uOhi3bV0+HEszG4fEQH2QKpJGt8Hrfb0OLBrDsVrsvrAbeecAWpR+GsS1gOxWTqh153ttlvvkO00Z7fmib9Wt/yfvrP4X9ZhZ3GiH8+wrQYvvLZrRWcvPGafC1bUd7XWt2AHnYTxhu2cULlFjcypgzRdJu5qOx/v9gySWnLUbjz2NNnSh020dP9UjKhCp9T8LtXy9p7x1haSfjmR1m5FILZe1EsW9PSAYFaFHQWIE3jMNr2pmY1NC/ubqlX+G4qW6eknQBdxgBrUyAoA3O+t1tAaQRtYzIbD3PpxbOMGt+KXoWz1duhnJjNSG3ldPqQbPO7EU7FVezMphxV6D9OTAZlU+2gk/Rt1BA37qA0Tnh4dyQT3iLRV6N8nbPtGl39/WRGtkL+PX+5myjdQ+k867J9RO7rYlHkzUHEI0C4VMwlzB0tPcB3MJ9Z6YVXimAaAzv5/EcN95y1bgQJYlV5scIF7afM3rZO6AkngWRxqKt+5AXFfl2gFi+cJRAhwi6LHkUlJMvsbHvtBHjx4lA5cXVaUJrCvcd3W+pC5TDcpLYlb2erzeVjhqpMt059ablpN6ePZTh5XRlbmZX75GbIBYLZw2Iig2m/EtVKTSpOPG08UwyBGTMaGIB VBZemc28 SEQ9bYLDLbW4mQtcG97x4KP5ryFEqZP0aMAzie8O0h3slMnwJEXxELpCQILQd8vHW6KAB7lNTJmsxqjjFszXw8ByOboLLCAXPc9coIp6i+hj21E7Iuv5dx/cZuPZfVtWTc3tRkzHGTJEvvYCAo87l8N2gFZOa1yu/j++SVdztK+k+cS6ESIMk6l5ICiZ2J6T3mN/pFDaFwsLvIOXMpcM1LeIERjki9n6sleeFBMdd41PxcfgXqsRA9H6NvMuCoPt/g3bdQ/fxA5H4FyDlsQtCqP3yCre3+nVeGpQpmXt0TId4t2s1i7d40j8FR2swI+jlrwFnXc374kVj5kgycyMVs9p7+4vcI5V7z1ulKc1rCpXMnJcpZH36IlKTgPxIabb2gkOiYPPcFgfYjJs0t8i9TiKkjDtLmlpBT58t6tZgy6PW4ab9YHSeXszRjmQ17iSaq/9HUI3X4ITjilngcMEyDd+9dPIXeZ5WUbhnF7QL8Bb7Zq5JNFIb0c9oOhk8MW8oznGPzw8pla8lemP61iOxd8pq8DC3NiAyL6ESIBm8P724nqdeUr4cm7tXVpeiXuUdDScr6pltGtq1RPfNEzKA1HZ/GFWdR2PWrAfp5GUSj+IKenw= 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 This series removes usage of folio_index usage in fs/, and remove swap cache checking in folio_contains. Currently, the swap cache is already no longer directly exposed to fs, and swap cache will be more different from page cache. Clean up the helpers first to simplify the code and eliminate the helpers used for resolving circular header dependency issue between filemap and swap headers, and prepare for further changes. --- V1: https://lore.kernel.org/linux-mm/20250427185908.90450-1-ryncsn@gmail.com/ Changes: - Collect Reviewed-by. - Fix a build bot error. - Slightly update commit messages to cover a few review concerns. V2: https://lore.kernel.org/linux-mm/20250429114949.41124-1-ryncsn@gmail.com/ Changes: - Collect Acked-by. - VM_BUG_ON to VM_WARN_ON and minor code style update. Kairui Song (6): fuse: drop usage of folio_index btrfs: drop usage of folio_index f2fs: drop usage of folio_index filemap: do not use folio_contains for swap cache folios mm: move folio_index to mm/swap.h and remove no longer needed helper mm, swap: remove no longer used swap mapping helper fs/btrfs/extent_io.c | 2 +- fs/f2fs/data.c | 4 ++-- fs/f2fs/inline.c | 4 ++-- fs/f2fs/super.c | 2 +- fs/fuse/file.c | 4 ++-- include/linux/pagemap.h | 29 ++++------------------------- mm/gup.c | 1 + mm/memfd.c | 1 + mm/migrate.c | 1 + mm/page-writeback.c | 1 + mm/swap.h | 18 ++++++++++++++++++ mm/swapfile.c | 15 --------------- 12 files changed, 34 insertions(+), 48 deletions(-) -- 2.49.0