From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 C4397313298 for ; Mon, 13 Apr 2026 16:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776099059; cv=none; b=SwYdY2Ld9ESdi/fIiolAwMEmNxTxarh/S8WlBdZnv8k+ljeICa0KWZNaxazsfT1os40GLVExzXLMuRCh1obhBrlUtl4r92Elqu1yccb+FK65LmiXShkprF/kukgtGuV6xc+pk1gVrFmoaavslbuyzI4MQmJWVjHIbJ2JQYtGO0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776099059; c=relaxed/simple; bh=CcxM066DSdPBZOTspIx7gKBLxzbCCrkO2eLSH4ma5iU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WRDZ/m4pCWeVmxcMGV0INLt8NzXjrOPRcBeXYlRM+YBSdIGVK8sXuXBrsRMGkb2ljKblECpj47ogErJh/s0LevzKAn42oU1UbOmUs1BM8BE9KNhGGCjsu+ej2q2xQqHW+8zUsZ75c4XfzqFXf97JCoNIcWPkGBmLrtv2KaY/Yx0= 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=Z7S3IPWJ; arc=none smtp.client-ip=209.85.214.178 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="Z7S3IPWJ" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ab08e6c553so4540275ad.3 for ; Mon, 13 Apr 2026 09:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776099058; x=1776703858; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+BLLR3j874rB7kfCtfS4+8D+5ngQlGoYnpCAW4pZzFA=; b=Z7S3IPWJDECBuUYDtk+CJfR2OsFq6V+LYVr5EX0GlGaCuKAxGN8mQqx9CSBJfQTKlT 2ctVx07uNlSRh/b8zKs25+lkckT6gqoYeOPRsP0SoDCSI12MPqHCruLpyevEk3trtToY CVkoEPmxJAPowFhCh48s05C43Sk3LMaryp2nP5YA6z3af67T27vgowQjk8goelog/W6T KXWut2g2psE8I25Hyl8BOeGIj3Po5gOf8QuUGo5HscaXA7s7ltq5yDjj+uiD2FXDngUM h3q8EOmvFytLei12mx7H2J+7gGa77Ke996jbvGXNZWvOLpanKoTA4pb0q0ryGRz9eqXm HOwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776099058; x=1776703858; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+BLLR3j874rB7kfCtfS4+8D+5ngQlGoYnpCAW4pZzFA=; b=E79WP2Gak2FRdRv+v+zt1+yx3Yaeb4FIp703LFKqJ/90QzVo1+PxTgwapedHwGxEoQ Ia0MlffOJi2aZ6Cpsqa0zmSZ7w+MHXcQjqUDAG2ukADuzprIB9ZinfWYzZys1iH56+R4 tHR0mLLoTx1s6vlFLndqkSZ8NrMBe+av8Z5Qqobxr3LFPfk5dLwjnvgy/LdxSFJDZN5Y 63QDSrAmk9oH9gRhmOewpY54LmG4GoGomJtJbMuKPxUD9C6tlcbWBIdzdlZA+ePr3TC2 q49xkgls6U4iS2j7e44RsA6JBzGzUrAgntBIhlNjNOjUr4RF7lt/JFjmb5faAFqcxce2 fsvA== X-Forwarded-Encrypted: i=1; AFNElJ+pB1sfK+tTqqiW+N1urUNGs0A0zi7r6BJ2L/seBpRjpkvrTJTSPlHcqSWmgDX5onapo/sJOAiHDXGN0Ho=@vger.kernel.org X-Gm-Message-State: AOJu0YwGNGvh2FddzqvbamVRur6kwbXds178lYQIheuvympM4+9Pc7Wv Y2n8AH4C86YCAHQjjfckt6cQFzrAGM91rg33BdA0pReJ5IzNrGMKiHKb X-Gm-Gg: AeBDietuc9DmGc+A1zPdXDM9S3XnKFWhNmKtKmxHrXsuuz/D/9WOuTknq/btqUSIiQU LwFojMoWMENvDY+WvyS1rtkGTqzW5QfX9AwtYrcIKpf9t7QGiea2qKIpuPvTQRdmpHPc8b0/ia9 b2doA9RG7XDUa0FA8RXHIUA3iUwIuuNkzjJ/IIGvkO11wVYuC1rtScqT1UUnXB3Iu0+17Iv3cr2 l79hhoihcZyQ3j3gbVmliHIuJOBl4N2SCF6PdnYet8Js+JpXdqaP1yIn5Xce702oznzhx1Gd4eS wp+yCr+VYtbH38RmUKOyBJFn4cGaMB555Lfw7KNw+nj/C0ny00fDmAj9+0QRVGVywbyzf8+FAoa eePv/0OHj86SuCU6FBuqP1kBzggeGR9s5BXCrVI6da1f3ifRJrgifPrD/NUgs13tWA49xeBC/32 mzdiGNaGzJnPmsI1R6NRUstsQwKIc= X-Received: by 2002:a17:903:3d54:b0:2b2:5857:5847 with SMTP id d9443c01a7336-2b2d5a6e90fmr60372575ad.5.1776099057890; Mon, 13 Apr 2026 09:50:57 -0700 (PDT) Received: from ser8.. ([221.156.231.192]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b463cb01afsm26172155ad.25.2026.04.13.09.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 09:50:57 -0700 (PDT) From: DaeMyung Kang To: pasha.tatashin@soleen.com, rppt@kernel.org, akpm@linux-foundation.org Cc: pratyush@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, DaeMyung Kang Subject: [PATCH] mm: memfd_luo: account restored large folios correctly Date: Tue, 14 Apr 2026 01:50:53 +0900 Message-ID: <20260413165053.164338-1-charsyam@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit memfd_luo_retrieve_folios() always passes 1 to shmem_inode_acct_blocks() and shmem_recalc_inode(), even when the restored folio spans multiple pages. That mismatches the normal shmem path: shmem_add_to_page_cache() accounts the folio in mapping->nrpages using folio_nr_pages(folio), and shmem_alloc_and_add_folio() passes the same page count to shmem_inode_acct_blocks() and shmem_recalc_inode(). As a result, restored large folios are under-accounted in shmem inode and block accounting. Use folio_nr_pages(folio) here as well. Fixes: b3749f174d68 ("mm: memfd_luo: allow preserving memfd") Signed-off-by: DaeMyung Kang --- mm/memfd_luo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/memfd_luo.c b/mm/memfd_luo.c index b8edb9f981d7..6dd0284b90c6 100644 --- a/mm/memfd_luo.c +++ b/mm/memfd_luo.c @@ -402,6 +402,7 @@ static int memfd_luo_retrieve_folios(struct file *file, const struct memfd_luo_folio_ser *pfolio = &folios_ser[i]; phys_addr_t phys; u64 index; + long pages; int flags; if (!pfolio->pfn) @@ -441,14 +442,16 @@ static int memfd_luo_retrieve_folios(struct file *file, if (flags & MEMFD_LUO_FOLIO_DIRTY) folio_mark_dirty(folio); - err = shmem_inode_acct_blocks(inode, 1); + pages = folio_nr_pages(folio); + + err = shmem_inode_acct_blocks(inode, pages); if (err) { pr_err("shmem: failed to account folio index %ld: %d\n", i, err); goto unlock_folio; } - shmem_recalc_inode(inode, 1, 0); + shmem_recalc_inode(inode, pages, 0); folio_add_lru(folio); folio_unlock(folio); folio_put(folio); -- 2.43.0