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 6761BC369DC for ; Tue, 29 Apr 2025 11:50:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD0816B0007; Tue, 29 Apr 2025 07:50:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A7E676B0008; Tue, 29 Apr 2025 07:50:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F8436B000A; Tue, 29 Apr 2025 07:50:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 699156B0007 for ; Tue, 29 Apr 2025 07:50:21 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3827D14017C for ; Tue, 29 Apr 2025 11:50:22 +0000 (UTC) X-FDA: 83386913484.26.9CB39B2 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by imf02.hostedemail.com (Postfix) with ESMTP id 64C898000E for ; Tue, 29 Apr 2025 11:50:20 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ApyHtYQL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.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=1745927420; a=rsa-sha256; cv=none; b=hwFh5cEdsVugXDPDtdl/kqw3fBUBhx1fN/3HlC/iKwleEruJQrNIH3eD3FFidERupZF/4/ RzwcBujsWvhUYEx9jl3DX6FzQ6UWUlj0jBsqEm3K6cNocCTpYgLOBmkIH+3CQag+xE2j7C 5NP6zyAovTyWxiWgPR74Q9agmPPdx7s= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ApyHtYQL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.181 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745927420; 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=Wsj4hi9619RQ9t5bKRVTi+rGBF68ko75f647eC3ZpB0=; b=dxNGN7tSzJAvxIo921bTtlLS/aoRUIyrJkxCN0lbKobxNTf0i/yiIRZj2ibwakVE3kKMbc UrTMALmjm+Q2El344hhKLQqmDpilfVC+yCLLAHd6AJntfSH+QHrDPCygyS/M+7kbhkplON AEfPNEpax9bTgvUrZHzI/O/2g0C1mLY= Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7369ce5d323so4863642b3a.1 for ; Tue, 29 Apr 2025 04:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745927419; x=1746532219; 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=Wsj4hi9619RQ9t5bKRVTi+rGBF68ko75f647eC3ZpB0=; b=ApyHtYQLpsce0/KUKAZPIlrdVAJcHEkbyzG4ZCdDpH1w8tmdqOgVzM/MH9CJlc15fl ATrifpmK7Sj5S086PS4SDiy101BxeJnxYe7uztEIJXHaUzSmK/cfglC8SdWBkaX8pCG7 8Ow4Dxye7ubkuDcBSpe/3mkbZ1rMOsdap0q2xInwXp7bninKkDjSB1oFvbWXyBqMcMFf iSLdj+/7yjjkDN7wYrSOddRxCdCyDzvFICBIo4Lzd5a6gRVAUl8pe6PfHjm7tVEVZZR9 +QROV45jVars7C/2dDKTWqt8kIFwBXmfCRQjXs3VlZ3Vg9h+w/NpJrpscrd9R2fokf0p cHFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745927419; x=1746532219; 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=Wsj4hi9619RQ9t5bKRVTi+rGBF68ko75f647eC3ZpB0=; b=PU1E9fTwoFLDg2H5GJ15zPavgaP0w0h9YZpzWd3gkbzHp3XrTwEV/2sqhACXkeMeKa RNDsFiio/ZV3m3r3b+JDjpQT5ziJl2AQXMWYtbGTuaOJH3wmVc2uqyUcScijf9etKWoh xc95zSO+TkETJZmbEaIUClMKAPLUuvhMi0PikbtNDco+D8kADRMCH8ssSaZNV2opi1yJ 4nRS/vTkWRix68y2nrizOReEXQ4qMI7AYbthHDDVXqg9aQTnQPPzrbrlEH1Is85i4Q04 CkAH5iC8b0Bg2rdBBXvbu5U5GyRDr5HlGkPZfsNe++YWF71X2FwFqDC7iHX8ZsWYX5fC osPw== X-Gm-Message-State: AOJu0YyNCFSDaf8G55ByJrDR9uSV/TeHZr6Z3TjvY9DP2C8lFV/LQjbL CvPQP5qlmhw84zlCEkRwDvu9aYb1gcicIJ/lyGBBoSXHYMWKrtgNYl5dz+bd X-Gm-Gg: ASbGnctJSlyoX44PeUZnwMTuvRfqYXSjB/OtwyKay1p0Wbe/jUUzX1x5rb+jqEa6rV2 ryjTJrleiVK2pUANB9uk+zQn+ndy6+k2MxCx3HVQ7d3x5LUsES+19XIvZUfUdjQc2gvUF0jx/4V qZJ9xyZycr0vLafVmiMo0tZEGiEA1wA521aeO13WTM+5kwA5pGDvrS0SOCbV9z6DxSrZebBg9rn vSJsn4eCDSM1dDt7w+qk3Xf6tuKvij+qn+op5zxvbgGntUiSCt2yWkDZYXWMqEaRb8BBxJKHvNe 4SxWKrMcPCnn3UZTLxiZQs50Nm75ymxkhxUOIoKuhjmpyFmHIkSQ3kovEuogdG+GOUgMBuRJ6J4 WAePqlw== X-Google-Smtp-Source: AGHT+IEBKGzjRAgyYhqZHkS8VGKf2bda+UTUCImpQQEPYMOmURnLEikBc5EZGu29niEcrPvQ8QZgfQ== X-Received: by 2002:a05:6a20:d49b:b0:1f5:884a:7549 with SMTP id adf61e73a8af0-2093e623fecmr4516897637.41.1745927417938; Tue, 29 Apr 2025 04:50:17 -0700 (PDT) Received: from KASONG-MC4.tencent.com ([43.132.141.24]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25aca62csm9661644b3a.167.2025.04.29.04.50.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 04:50:17 -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 v2 0/6] mm, swap: clean up swap cache mapping helper Date: Tue, 29 Apr 2025 19:49:43 +0800 Message-ID: <20250429114949.41124-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: rspam03 X-Rspamd-Queue-Id: 64C898000E X-Stat-Signature: x5czp3kco9qwg3371d9uxhf36uin9q5d X-Rspam-User: X-HE-Tag: 1745927420-186677 X-HE-Meta: U2FsdGVkX1/NP/F72053uXpycIi8mxIKZPk3hxafK8NkoNJA27Qwp1E/Ie5qLXrSYn7sDt2wdtt3AoywAfim3RUJwM/JZdDeLF9pxqz7UHiVeSW6Xv+HZfQ6dKJBXvSADGnuH2uR1gFDAPvEJPMa0ZzVKCGvBl80W4Xv5C/Olo25BRB2bRsuTP5KQ3F1GwfCiR2o8Cw8Bdja2L9s8WVUiQUNMOlO4nf1CKx/cvoGR9xmgAuTK7kr+q1UGiDBVUL6ToGd6K3j4Yk3WSVw/OYhuNqLiXw4mxPvINlkFlAcCHp9hgE5o1RoMb6Evs8JXbWFK1ONSM8HSL4vNowabRX76U5wv3t+h0HhY7YK7GdU8cPRQ+GQIIvyJM/QAi6f+qDrEQRO/IpYnIqdO/OsMsZRblPynfXJITTZeJC2TCk+y902qM/vW7LcizM59UN5w6vUoKlzw3PMOLyftmG9sRaakZ1I86afQ81jA/+4oQwiGHcGYDnxFLGotdf74dTnXCnzIBRD94BI+I23VSFe8PfZI4wpqS+Wu9ki/RLA3bD1gwTaEfi9WBdZvPS/CwxJjeuYoY5cYyBrMnD5IXNdIfmUEV1lb8/oE7JXmvxdiab8q/Ovr9q4ketEz9qLS66t+J8ojUHZKHd/Weg7JmtvlSsjqXX2v8HjZ+hSrKSqT4sLRunmceD1lTg9KdK3QFfnA6T+tHrWXCG+NtMNTY7b6gCfjp96V65+3uQT8VoxxschDKzBMpQ0nc/X+Wbn/0QaAXbtVfYBxVnXek8WRRi2C76ZbGWvlmUk8I0FRtXR8+I5XDrxI2qj2i81QsXzPrvNSBUkoliOf9ZDzujuE9IdMJ85bfiRMvdaNpBzMCRE6w3Y1ADKYW4pQcOgm9SWA/Q60am8iSdRK43i4bjwYkuZKhwKqZA+aXvs9DiTH2JF+M42wSWq8pTpZKGezouJSM/DkJDtQ5dsFbVcysN0sAmjqaX EP80wv6W 9/zJ2/nG8yDqlIF08/SA6S/kWtrjYQZKmcrf50vYgqhMtMn9VCS677WfldQK5fjQ5ZAtkLIdwplwShBth0EkDa6fDhkRe1cr8SSzqi7/NBnR2zR3LwBYJZWB9jpXslFiejgGIZ+7hQ/K+3mjdICcREH4cParnM6K2p8+N9qS7m3I4a7gUIfYKWkCb9q8MnBBwy8ZRIhW6Zy0BilNWUZt62giQfDEseGKmIvMuL39+PNcU99Y4Kk7EoHsFkIOkPA0yCqu8YqHTvxSRV89tFn6vAUMhiEitK8Rg9j7M3Z/YETPOn93dM61AkkiLAw2xSfKJr/tEBLfdqadbvdpqfbvEYR0fcW83Ix36eL2h8xd1MzRjga/2qLwzZKrdeSWeM65sxpWA94UymsqM37/xR41HzLTWt8xuhrzETwoRaOxDSEZa9t29GvvSblWKU3zU0XZOXNlotk3EpHBSXhw5Ayd7hjhpZN+wD6+YzbW0VJ+sclfp5Zo8AYcDTI71CMWBIKHXFiGsgF4YiWzGdBuG29aHpv4UVFNc3dhno52WWJ2/2863uobIVqk/Mnp5hpewa3b7G5CcOa7RZ5uNB1ylFpAURpxzqQW0OHfATu/JZGgzEnq4XIc= 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 Review-by. - Fix a build bot error. - Slightly update commit messages to cover a few review concerns. 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/memfd.c | 1 + mm/migrate.c | 1 + mm/swap.h | 23 +++++++++++++++++++++++ mm/swapfile.c | 15 --------------- 10 files changed, 37 insertions(+), 48 deletions(-) -- 2.49.0