From: Alexander Gordeev <agordeev@linux.ibm.com>
To: Kevin Brodsky <kevin.brodsky@arm.com>,
Qi Zheng <zhengqi.arch@bytedance.com>,
Gerald Schaefer <gerald.schaefer@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>
Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] s390/mm: Add missing ctor/dtor on page table upgrade
Date: Thu, 23 Jan 2025 17:03:49 +0100 [thread overview]
Message-ID: <20250123160349.200154-1-agordeev@linux.ibm.com> (raw)
Commit 78966b550289 ("s390: pgtable: add statistics for PUD and P4D
level page table") misses the call to pagetable_p4d_ctor() against
a newly allocated P4D table in crst_table_upgrade();
Commit 68c601de75d8 ("mm: introduce ctor/dtor at PGD level") misses
the call to pagetable_pgd_ctor() against a newly allocated PGD and
the call to pagetable_dtor() against a newly allocated P4D that is
about to be freed on crst_table_upgrade() PGD upgrade fail path.
The missed constructors and destructor break (at least) the page
table accounting when a process memory space is upgraded.
Reported-by: Heiko Carstens <hca@linux.ibm.com>
Closes: https://lore.kernel.org/all/20250122074954.8685-A-hca@linux.ibm.com/
Suggested-by: Heiko Carstens <hca@linux.ibm.com>
Fixes: 78966b550289 ("s390: pgtable: add statistics for PUD and P4D level page table")
Fixes: 68c601de75d8 ("mm: introduce ctor/dtor at PGD level")
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
---
The patch is against:
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git next-20250123
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable
---
arch/s390/mm/pgalloc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index a4e761902093..d33f55b7ee98 100644
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -88,12 +88,14 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end)
if (unlikely(!p4d))
goto err_p4d;
crst_table_init(p4d, _REGION2_ENTRY_EMPTY);
+ pagetable_p4d_ctor(virt_to_ptdesc(p4d));
}
if (end > _REGION1_SIZE) {
pgd = crst_table_alloc(mm);
if (unlikely(!pgd))
goto err_pgd;
crst_table_init(pgd, _REGION1_ENTRY_EMPTY);
+ pagetable_pgd_ctor(virt_to_ptdesc(pgd));
}
spin_lock_bh(&mm->page_table_lock);
@@ -130,6 +132,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end)
return 0;
err_pgd:
+ pagetable_dtor(virt_to_ptdesc(p4d));
crst_table_free(mm, p4d);
err_p4d:
return -ENOMEM;
--
2.45.2
next reply other threads:[~2025-01-23 16:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 16:03 Alexander Gordeev [this message]
2025-01-23 16:51 ` [PATCH] s390/mm: Add missing ctor/dtor on page table upgrade Gerald Schaefer
2025-01-24 2:43 ` Qi Zheng
2025-01-24 7:58 ` Kevin Brodsky
2025-01-24 8:24 ` Alexander Gordeev
2025-01-24 12:30 ` Kevin Brodsky
2025-01-24 9:29 ` Heiko Carstens
2025-01-24 9:39 ` Heiko Carstens
2025-01-24 12:39 ` Kevin Brodsky
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=20250123160349.200154-1-agordeev@linux.ibm.com \
--to=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=gerald.schaefer@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=kevin.brodsky@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=zhengqi.arch@bytedance.com \
/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