From: Chenghao Duan <duanchenghao@kylinos.cn>
To: pasha.tatashin@soleen.com, rppt@kernel.org, pratyush@kernel.org,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org
Cc: jianghaoran@kylinos.cn, duanchenghao@kylinos.cn
Subject: [PATCH v3 6/7] mm/memfd_luo: remove folio from page cache when accounting fails
Date: Thu, 26 Mar 2026 16:47:26 +0800 [thread overview]
Message-ID: <20260326084727.118437-7-duanchenghao@kylinos.cn> (raw)
In-Reply-To: <20260326084727.118437-1-duanchenghao@kylinos.cn>
In memfd_luo_retrieve_folios(), when shmem_inode_acct_blocks() fails
after successfully adding the folio to the page cache, the code jumps
to unlock_folio without removing the folio from the page cache.
This leaves the folio permanently abandoned in the page cache:
- The folio was added via shmem_add_to_page_cache() which set up
mapping, index, and incremented nrpages/shmem stats.
- folio_unlock() and folio_put() do not remove it from the cache.
- folio_add_lru() was never called, so it cannot be reclaimed.
Fix by adding a remove_from_cache label that calls filemap_remove_folio()
before unlocking, matching the error handling pattern in
shmem_alloc_and_add_folio().
This issue was identified by the AI review.
https://sashiko.dev/#/patchset/20260323110747.193569-1-duanchenghao@kylinos.cn
Signed-off-by: Chenghao Duan <duanchenghao@kylinos.cn>
---
mm/memfd_luo.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c
index b4cea3670689..f8e8f99b1848 100644
--- a/mm/memfd_luo.c
+++ b/mm/memfd_luo.c
@@ -446,7 +446,7 @@ static int memfd_luo_retrieve_folios(struct file *file,
if (err) {
pr_err("shmem: failed to account folio index %ld(%ld pages): %d\n",
i, npages, err);
- goto unlock_folio;
+ goto remove_from_cache;
}
nr_added_pages += npages;
@@ -459,6 +459,8 @@ static int memfd_luo_retrieve_folios(struct file *file,
return 0;
+remove_from_cache:
+ filemap_remove_folio(folio);
unlock_folio:
folio_unlock(folio);
folio_put(folio);
--
2.25.1
next prev parent reply other threads:[~2026-03-26 8:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-26 8:47 [PATCH v3 0/7] Modify memfd_luo code Chenghao Duan
2026-03-26 8:47 ` [PATCH v3 1/7] mm/memfd: use folio_nr_pages() for shmem inode accounting Chenghao Duan
2026-04-02 1:23 ` Pasha Tatashin
2026-04-02 10:59 ` Pratyush Yadav
2026-03-26 8:47 ` [PATCH v3 2/7] mm/memfd_luo: optimize shmem_recalc_inode calls in retrieve path Chenghao Duan
2026-04-02 11:02 ` Pratyush Yadav
2026-03-26 8:47 ` [PATCH v3 3/7] mm/memfd_luo: remove unnecessary memset in zero-size memfd path Chenghao Duan
2026-03-26 8:47 ` [PATCH v3 4/7] mm/memfd_luo: use i_size_write() to set inode size during retrieve Chenghao Duan
2026-03-26 8:47 ` [PATCH v3 5/7] mm/memfd_luo: fix physical address conversion in put_folios cleanup Chenghao Duan
2026-04-02 1:30 ` Pasha Tatashin
2026-04-02 11:06 ` Pratyush Yadav
2026-04-02 17:43 ` Andrew Morton
2026-03-26 8:47 ` Chenghao Duan [this message]
2026-04-02 1:32 ` [PATCH v3 6/7] mm/memfd_luo: remove folio from page cache when accounting fails Pasha Tatashin
2026-04-02 11:52 ` Pratyush Yadav
2026-04-02 17:54 ` Andrew Morton
2026-04-03 9:07 ` Pratyush Yadav
2026-03-26 8:47 ` [PATCH v3 7/7] mm/memfd_luo: fix integer overflow in memfd_luo_preserve_folios Chenghao Duan
2026-04-02 1:39 ` Pasha Tatashin
2026-04-02 12:06 ` Pratyush Yadav
2026-04-02 17:58 ` Andrew Morton
2026-04-03 9:06 ` Pratyush Yadav
2026-03-26 23:36 ` [PATCH v3 0/7] Modify memfd_luo code Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260326084727.118437-7-duanchenghao@kylinos.cn \
--to=duanchenghao@kylinos.cn \
--cc=akpm@linux-foundation.org \
--cc=jianghaoran@kylinos.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=pasha.tatashin@soleen.com \
--cc=pratyush@kernel.org \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox