From nobody Sun Oct 5 00:12:26 2025 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51C4029BDBA for ; Mon, 11 Aug 2025 17:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754932893; cv=none; b=R3AoSDYquhi18aJYg5r+9qzamu3smR7AyDoIFRnaebQHXGoXqL2jvTG9+U5UQqg/BDQyFibcEckYfrEibBm+tfJWqcFvFEiGa5pUxq5vk4KGiTDaYFOR76OgvyIZYRDfLxiDb2itnmka1SodgbxX9obHI8wF13DmRHsKPlngJmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754932893; c=relaxed/simple; bh=eUg/NQbLQKznC4XMAHNYR9IvreWPbdosBLoCoX+38wE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iqaFG2he/RVUMmr1SqGq0l/XKgPkvy3yXRdOCfR7/R8h8/DF+f66qSCQAkdzaDSxNnNpdM6gKrEp4nf13tec4iXs4oVN2WAh4Wh84laC2/OR2k3kVTQGllbBh4fts4XCqBZb+sQqZpkQ5/pM2M1EE8BtTXnAex9GzqgR4F3wLEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K+bQhFVp; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K+bQhFVp" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-b4209a0d426so4617465a12.1 for ; Mon, 11 Aug 2025 10:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754932892; x=1755537692; darn=vger.kernel.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=I7dP24dMk2MxdJIZqIqscUPVY/qEbDzRaJ+4erSqRyE=; b=K+bQhFVplXI7jHD7gXfNtIJYrbsn1YDR4t4ciMun6kc741gaHc38Z9ru+glGyqzGcF fnZsijKBC6LK5p18EYNttXGIZpDkwsFgM4t/k+DNF8oyU1cknLQ3K5TzcpzpiBAkWhGu OZ2uRbaYBYNSYX2E/4PpOU6bzqpe1eQ9DebMxXpLYYkAjCiT8SdSvDJJLc0FL3YQUyp0 sPDZwJ1XP4OH2RER7zuoLnKyIbbCWnqTBjsXB8+XBlEXWDVeLxh4atzreCmD1oVcm9WJ ee+AYcoVlLQYgXQzgEPOtFh2fJ4sH9MTJfXOCDHomhJMsJsOpdqM5l0MPjDLbMBnhIp8 Jl1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932892; x=1755537692; 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=I7dP24dMk2MxdJIZqIqscUPVY/qEbDzRaJ+4erSqRyE=; b=CzgsOPbgjjOWetsHGNQQfsU6eVwO+GUZdNePMkhATLHrAn3V7e5OuIY3RVYWIn/Kq+ mHlpTNjGU57cjFVTxB3DsNurf6OeCedgpt5mKRHT5HqaPpYm2CrJEihKfRW5JikMrJ3y nN3VMNlCxtdxigrJ4TCJOpQOPQz7Yt4Qfv1T3+qlEEssZbMlZeTSqThnHegT5AzfaDs4 BBmgmKpe2qO0wZskEQrTvB0Ma014uYBFURlfUgjVpMsA/Ntr/s+qJGx6ajCsWIKRoby3 spsleOB3prLDf510hxSUkYQDywGJQh0bT0yPc92y/UHhqRpTkjGUj6xVRmCvD+hXdfKa smlw== X-Forwarded-Encrypted: i=1; AJvYcCVX9xrDni8jI+U+7po+v0SWQbC7mna+QitTyVx5xbTTxTrKZouTVhuHu/ynWSTIDpwFUon6xp5KWaGb0kw=@vger.kernel.org X-Gm-Message-State: AOJu0YzncO0PNRyKeLsLDXe9TPhjp0yqSnwGWEH2qEimmz4zA4mJ1CBZ PGyIgAFd/PXX4lUBGQoyYsK5moZOzOOqsX8OEfp6dDpgNIohxWEEVh8S X-Gm-Gg: ASbGnctISOLYm1chcygkUVHxNu/GBmOlNzCPSO3fCGZsgwSluzntqLMVbtQ1ooWbWHH /w9VW8rjOrOP5QT22f9pNIao4+2FT0Kdsi9vZ7bwkf2TqhD03+8N/nFZGjtVCsrrzDq9bt1spgf 5k6cCxY6LUK/H9sIwqCHcQCiYNLv+NTvogGnhfEgbVnuvc6Fbj57Rrg1/LPufsNJsS5glLiBxbg /rs4RPBSWPhEV34Fes9qHmuBaS1RMsWI+7BKjTPn1xW9QkxpMrCQRAr+P8Fd6l/PvCLFG+06IH5 RJQ77YhaJ8uVgRFoc+5u1iup2vY5J2kNnHmUvMxWZqaTfCNBgm1wMoflJ7Htkc8fSaqB9HTdZje FdIm4EyMF6aF9Hp+P02TdhcaO1vc= X-Google-Smtp-Source: AGHT+IFopuiQlwhkYcY6L9G8/wk66sE58pMCCXKa6Jg6gb+DGlh9Pfbxl9B/SDORPgDwthkus9CoGA== X-Received: by 2002:a17:902:c94d:b0:242:c66f:9f80 with SMTP id d9443c01a7336-242fc37288cmr4463315ad.53.1754932891475; Mon, 11 Aug 2025 10:21:31 -0700 (PDT) Received: from KASONG-MC4 ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e89769fasm276685055ad.107.2025.08.11.10.21.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:21:31 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pedro Falcato , Matthew Wilcox , Hugh Dickins , David Hildenbrand , Chris Li , Barry Song , Baoquan He , Nhat Pham , Kemeng Shi , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 1/2] mm/mincore, swap: consolidate swap cache checking for mincore Date: Tue, 12 Aug 2025 01:20:17 +0800 Message-ID: <20250811172018.48901-2-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250811172018.48901-1-ryncsn@gmail.com> References: <20250811172018.48901-1-ryncsn@gmail.com> Reply-To: Kairui Song Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kairui Song The filemap_get_incore_folio (previously find_get_incore_page) helper was introduced by commit 61ef18655704 ("mm: factor find_get_incore_page out of mincore_page") to be used by later commit f5df8635c5a3 ("mm: use find_get_incore_page in memcontrol"), so memory cgroup charge move code can be simplified. But commit 6b611388b626 ("memcg-v1: remove charge move code") removed that user completely, it's only used by mincore now. So this commit basically reverts commit 61ef18655704 ("mm: factor find_get_incore_page out of mincore_page"). Move it back to mincore side to simplify the code. Signed-off-by: Kairui Song Acked-by: Nhat Pham --- mm/mincore.c | 29 +++++++++++++++++++++++++++-- mm/swap.h | 10 ---------- mm/swap_state.c | 38 -------------------------------------- 3 files changed, 27 insertions(+), 50 deletions(-) diff --git a/mm/mincore.c b/mm/mincore.c index 10dabefc3acc..20fd0967d3cb 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -64,8 +64,33 @@ static unsigned char mincore_page(struct address_space *= mapping, pgoff_t index) * any other file mapping (ie. marked !present and faulted in with * tmpfs's .fault). So swapped out tmpfs mappings are tested here. */ - folio =3D filemap_get_incore_folio(mapping, index); - if (!IS_ERR(folio)) { + if (IS_ENABLED(CONFIG_SWAP) && shmem_mapping(mapping)) { + folio =3D filemap_get_entry(mapping, index); + /* + * shmem/tmpfs may return swap: account for swapcache + * page too. + */ + if (xa_is_value(folio)) { + struct swap_info_struct *si; + swp_entry_t swp =3D radix_to_swp_entry(folio); + /* There might be swapin error entries in shmem mapping. */ + if (non_swap_entry(swp)) + return 0; + /* Prevent swap device to being swapoff under us */ + si =3D get_swap_device(swp); + if (si) { + folio =3D filemap_get_folio(swap_address_space(swp), + swap_cache_index(swp)); + put_swap_device(si); + } else { + return 0; + } + } + } else { + folio =3D filemap_get_folio(mapping, index); + } + + if (!IS_ERR_OR_NULL(folio)) { present =3D folio_test_uptodate(folio); folio_put(folio); } diff --git a/mm/swap.h b/mm/swap.h index 911ad5ff0f89..1ae44d4193b1 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -64,9 +64,6 @@ void clear_shadow_from_swap_cache(int type, unsigned long= begin, void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry, int n= r); struct folio *swap_cache_get_folio(swp_entry_t entry, struct vm_area_struct *vma, unsigned long addr); -struct folio *filemap_get_incore_folio(struct address_space *mapping, - pgoff_t index); - struct folio *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, struct vm_area_struct *vma, unsigned long addr, struct swap_iocb **plug); @@ -178,13 +175,6 @@ static inline struct folio *swap_cache_get_folio(swp_e= ntry_t entry, return NULL; } =20 -static inline -struct folio *filemap_get_incore_folio(struct address_space *mapping, - pgoff_t index) -{ - return filemap_get_folio(mapping, index); -} - static inline void *get_shadow_from_swap_cache(swp_entry_t entry) { return NULL; diff --git a/mm/swap_state.c b/mm/swap_state.c index c354435a0923..99513b74b5d8 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -323,44 +323,6 @@ struct folio *swap_cache_get_folio(swp_entry_t entry, return folio; } =20 -/** - * filemap_get_incore_folio - Find and get a folio from the page or swap c= aches. - * @mapping: The address_space to search. - * @index: The page cache index. - * - * This differs from filemap_get_folio() in that it will also look for the - * folio in the swap cache. - * - * Return: The found folio or %NULL. - */ -struct folio *filemap_get_incore_folio(struct address_space *mapping, - pgoff_t index) -{ - swp_entry_t swp; - struct swap_info_struct *si; - struct folio *folio =3D filemap_get_entry(mapping, index); - - if (!folio) - return ERR_PTR(-ENOENT); - if (!xa_is_value(folio)) - return folio; - if (!shmem_mapping(mapping)) - return ERR_PTR(-ENOENT); - - swp =3D radix_to_swp_entry(folio); - /* There might be swapin error entries in shmem mapping. */ - if (non_swap_entry(swp)) - return ERR_PTR(-ENOENT); - /* Prevent swapoff from happening to us */ - si =3D get_swap_device(swp); - if (!si) - return ERR_PTR(-ENOENT); - index =3D swap_cache_index(swp); - folio =3D filemap_get_folio(swap_address_space(swp), index); - put_swap_device(si); - return folio; -} - struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, struct mempolicy *mpol, pgoff_t ilx, bool *new_page_allocated, bool skip_if_exists) --=20 2.50.1 From nobody Sun Oct 5 00:12:26 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F2B929BDBA for ; Mon, 11 Aug 2025 17:21:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754932900; cv=none; b=AADi0+2eZG+G3QOqv9bTMSHP3DvgOtsoY8Ee8hcLsbyBalDr4u/kW7Nh7crca8WPAYyzl+5EYQEOsq38Errku/iih0sJOlUAqiv27ywFUo+cRrWZ3+6XmwszssMDz7SdAYAWzfpIyg2HoiZhC/y2m2e+K8BBXstpUUhePeKbAtc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754932900; c=relaxed/simple; bh=SKB8ordcLALRuYf8Mps/USt4ZgL3B5JO5sNef62tirA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u5cXVCZUML1P27QzOGIK5njGci7NhxTvccUMA8yiFHfTDam8hFGEb9/Kjs0XPMneq1WzwwCybQzFOtojODGjujhl2eHl9xQRfN8Crq2bNOGEfPz2MpII1LtPxugT1hK8gJzwsf1EDWRyX7uzmLaLoQ2fBMNLK//6jXpOIRNDRE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PMTo4cTC; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PMTo4cTC" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-24099fade34so33042295ad.0 for ; Mon, 11 Aug 2025 10:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754932897; x=1755537697; darn=vger.kernel.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=HeE8CaQ2K5i+oPH7GVC2aPBcfIXmZD81doSr56qB3l4=; b=PMTo4cTCXuFfSjhVdJoW62da4frqWNp/iuCH3bT6forIHkK6DxhdxUhJFzWJlyODUn zfBFv6QgrgobbKcD+ePPOWSHGgpyuPI40v6LszowOY0raMbb0h2Ij8nSQBU1qar3eav/ ilWHspbHSwETlwcxOExwioAG/XFKwwcaBENNiGw2jBzf0OrZE7AVeXaCx1CB75JY4hFs jMMkCFga8Et7CObiV0vJsAY3J3Z+bqszZS1ngsTdLQeTxZ/itum/dDvsZtcXyPMPBt5A IyZd2M7CvhWH5vRK5RlK4jNLVfWKTtxJgB41pGbb6NDdvcrqZ71+FleglG+2t3iJShsF 3HRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754932897; x=1755537697; 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=HeE8CaQ2K5i+oPH7GVC2aPBcfIXmZD81doSr56qB3l4=; b=pivq3PEbdXqnqI4bULVujEKPb16nEKdzxgStsH5ISWK1WQ2FHQxk7AWrsU6r4iU1yN sPA08oMaLG+tH20CuD+QQxNNZ83cpz6RNKhwhIOILjRIqvzpDpva/lCtGY7kEByk2X25 EI4XsGFJpGPEvZ0A1HFS0gJfDi0Qh3FO//Lo/gNHIqWJN63BR3hcRKyU4EEoKCQhes8G Xax4p7VWH5cOST2/la82cqfOeOYDceGLfFL50WGwmFTc1ewZt+fOe/I+Cexjxybf+TwV 8wfIfsUwarM9cGGR4+II1e9Rp+PFN35+ZQp9MaBYQUc05Av0DT4GL65zZvcV6hhA8QkT N3cw== X-Forwarded-Encrypted: i=1; AJvYcCV6EaJRzk6VwbzdaMw4OKoWrQBOZqUTs1oIpQgO7icGZGjycOASa/h0CneEnOIQY2BT9IuDg/6UQL8YGLg=@vger.kernel.org X-Gm-Message-State: AOJu0YxOs3hHPwdP4oOUmsg5wKNutCKezWgrqfJV/wxjqFcntT2tx4E+ HSym+X5vN6jA21oZvOThDIDMBjff31BLTndQf/s0FLGhdktNbBQEV4Tp X-Gm-Gg: ASbGncvwLvtHDkf6nMyD975c7LWu3j0P59ub01BR10kdNpPladvLz1Nq2T9N2u8pTcF ICGRuuy7xCOVDvOjjfPlBiXrrteN1pM+/YYY0ACf3P5f682h6HDPW9PTT9Dk20hIXAAaCZvlYDb NiP3ERF7/us76pmDw7LwzC4zxaGDgieuNfdtkNbWcoEfM/fgmBUXBmJlWopwOPpQcbuptDWuHrr IgB9SnqkOoePITtUmV//3Uu7y+DCCCPC1Bky6BBWWxOipm2vgM7x1wPOtJ6cu1Nfh16x2am/6Fh jE7QxAtoHvzC2eDVZpSz09Al/rhf0mU3gDtgO+9TwiDmA307RqJKv/y2r0MBBaLqtPhrhE6gyK3 dZ17PXRQEWZcqpNbwrA41Zd6TldLWY1fIk2JGpA== X-Google-Smtp-Source: AGHT+IHTmczJxTiTIxYVNE4NIKjMSM7gIpUc+S8TfKU2hM8+fGSlcbq5rCYS33AqUl07gxT9R6woCA== X-Received: by 2002:a17:902:dad1:b0:240:9f9:46a0 with SMTP id d9443c01a7336-242fc340439mr4695835ad.38.1754932897189; Mon, 11 Aug 2025 10:21:37 -0700 (PDT) Received: from KASONG-MC4 ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e89769fasm276685055ad.107.2025.08.11.10.21.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 11 Aug 2025 10:21:36 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Pedro Falcato , Matthew Wilcox , Hugh Dickins , David Hildenbrand , Chris Li , Barry Song , Baoquan He , Nhat Pham , Kemeng Shi , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 2/2] mm/mincore: use a helper for checking the swap cache Date: Tue, 12 Aug 2025 01:20:18 +0800 Message-ID: <20250811172018.48901-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250811172018.48901-1-ryncsn@gmail.com> References: <20250811172018.48901-1-ryncsn@gmail.com> Reply-To: Kairui Song Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kairui Song Introduce a mincore_swap helper for checking swap entries. Move all swap related logic and sanity debug check into it, and separate them from page cache checking. The performance is better after this commit. mincore_page is never called on a swap cache space now, so the logic can be simpler. The sanity check also covers more potential cases now, previously the WARN_ON only catches potentially corrupted page table, now if shmem contains a swap entry with !CONFIG_SWAP, a WARN will be triggered. This changes the mincore value when the WARN is triggered, but this shouldn't matter. The WARN_ON means the data is already corrupted or something is very wrong, so it really should not happen. Before this series: mincore on a swaped out 16G anon mmap range: Took 488220 us mincore on 16G shmem mmap range: Took 530272 us. After this commit: mincore on a swaped out 16G anon mmap range: Took 446763 us mincore on 16G shmem mmap range: Took 460496 us. About ~10% faster. Signed-off-by: Kairui Song --- mm/mincore.c | 90 ++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/mm/mincore.c b/mm/mincore.c index 20fd0967d3cb..2f3e1816a30d 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -47,6 +47,48 @@ static int mincore_hugetlb(pte_t *pte, unsigned long hma= sk, unsigned long addr, return 0; } =20 +static unsigned char mincore_swap(swp_entry_t entry, bool shmem) +{ + struct swap_info_struct *si; + struct folio *folio =3D NULL; + unsigned char present =3D 0; + + if (!IS_ENABLED(CONFIG_SWAP)) { + WARN_ON(1); + return 0; + } + + /* + * Shmem mapping may contain swapin error entries, which are + * absent. Page table may contain migration or hwpoison + * entries which are always uptodate. + */ + if (non_swap_entry(entry)) + return !shmem; + + /* + * Shmem mapping lookup is lockless, so we need to grab the swap + * device. mincore page table walk locks the PTL, and the swap + * device is stable, avoid touching the si for better performance. + */ + if (shmem) { + si =3D get_swap_device(entry); + if (!si) + return 0; + } + folio =3D filemap_get_entry(swap_address_space(entry), + swap_cache_index(entry)); + if (shmem) + put_swap_device(si); + /* The swap cache space contains either folio, shadow or NULL */ + if (folio && !xa_is_value(folio)) { + present =3D folio_test_uptodate(folio); + folio_put(folio); + } + + return present; +} + /* * Later we can get more picky about what "in core" means precisely. * For now, simply check to see if the page is in the page cache, @@ -64,33 +106,15 @@ static unsigned char mincore_page(struct address_space= *mapping, pgoff_t index) * any other file mapping (ie. marked !present and faulted in with * tmpfs's .fault). So swapped out tmpfs mappings are tested here. */ - if (IS_ENABLED(CONFIG_SWAP) && shmem_mapping(mapping)) { - folio =3D filemap_get_entry(mapping, index); - /* - * shmem/tmpfs may return swap: account for swapcache - * page too. - */ + folio =3D filemap_get_entry(mapping, index); + if (folio) { if (xa_is_value(folio)) { - struct swap_info_struct *si; - swp_entry_t swp =3D radix_to_swp_entry(folio); - /* There might be swapin error entries in shmem mapping. */ - if (non_swap_entry(swp)) - return 0; - /* Prevent swap device to being swapoff under us */ - si =3D get_swap_device(swp); - if (si) { - folio =3D filemap_get_folio(swap_address_space(swp), - swap_cache_index(swp)); - put_swap_device(si); - } else { + if (shmem_mapping(mapping)) + return mincore_swap(radix_to_swp_entry(folio), + true); + else return 0; - } } - } else { - folio =3D filemap_get_folio(mapping, index); - } - - if (!IS_ERR_OR_NULL(folio)) { present =3D folio_test_uptodate(folio); folio_put(folio); } @@ -168,23 +192,7 @@ static int mincore_pte_range(pmd_t *pmd, unsigned long= addr, unsigned long end, for (i =3D 0; i < step; i++) vec[i] =3D 1; } else { /* pte is a swap entry */ - swp_entry_t entry =3D pte_to_swp_entry(pte); - - if (non_swap_entry(entry)) { - /* - * migration or hwpoison entries are always - * uptodate - */ - *vec =3D 1; - } else { -#ifdef CONFIG_SWAP - *vec =3D mincore_page(swap_address_space(entry), - swap_cache_index(entry)); -#else - WARN_ON(1); - *vec =3D 1; -#endif - } + *vec =3D mincore_swap(pte_to_swp_entry(pte), false); } vec +=3D step; } --=20 2.50.1