From: Mark Brown <broonie@kernel•org>
To: Richard Henderson <richard.henderson@linaro•org>,
Ivan Kokshaysky <ink@jurassic•park.msu.ru>,
Matt Turner <mattst88@gmail•com>,
Vineet Gupta <vgupta@kernel•org>,
Russell King <linux@armlinux•org.uk>,
Guo Ren <guoren@kernel•org>, Huacai Chen <chenhuacai@kernel•org>,
WANG Xuerui <kernel@xen0n•name>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership•com>,
Helge Deller <deller@gmx•de>,
Michael Ellerman <mpe@ellerman•id.au>,
Nicholas Piggin <npiggin@gmail•com>,
Christophe Leroy <christophe.leroy@csgroup•eu>,
Naveen N Rao <naveen@kernel•org>,
Alexander Gordeev <agordeev@linux•ibm.com>,
Gerald Schaefer <gerald.schaefer@linux•ibm.com>,
Heiko Carstens <hca@linux•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@linux•ibm.com>,
Sven Schnelle <svens@linux•ibm.com>,
Yoshinori Sato <ysato@users•sourceforge.jp>,
Rich Felker <dalias@libc•org>,
John Paul Adrian Glaubitz <glaubitz@physik•fu-berlin.de>,
"David S. Miller" <davem@davemloft•net>,
Andreas Larsson <andreas@gaisler•com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, Borislav Petkov <bp@alien8•de>,
Dave Hansen <dave.hansen@linux•intel.com>,
x86@kernel•org, "H. Peter Anvin" <hpa@zytor•com>,
Chris Zankel <chris@zankel•net>,
Max Filippov <jcmvbkbc@gmail•com>,
Andrew Morton <akpm@linux-foundation•org>,
"Liam R. Howlett" <Liam.Howlett@oracle•com>,
Vlastimil Babka <vbabka@suse•cz>,
Lorenzo Stoakes <lorenzo.stoakes@oracle•com>
Cc: Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>, Deepak Gupta <debug@rivosinc•com>,
linux-arm-kernel@lists•infradead.org,
linux-alpha@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-snps-arc@lists•infradead.org,
linux-arm-kernel@lists•infradead.org,
linux-csky@vger•kernel.org, loongarch@lists•linux.dev,
linux-parisc@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
linux-s390@vger•kernel.org, linux-sh@vger•kernel.org,
sparclinux@vger•kernel.org, linux-mm@kvack•org,
Mark Brown <broonie@kernel•org>
Subject: [PATCH 2/3] mm: Pass vm_flags to generic_get_unmapped_area()
Date: Mon, 02 Sep 2024 20:08:14 +0100 [thread overview]
Message-ID: <20240902-mm-generic-shadow-stack-guard-v1-2-9acda38b3dd3@kernel.org> (raw)
In-Reply-To: <20240902-mm-generic-shadow-stack-guard-v1-0-9acda38b3dd3@kernel.org>
In preparation for using vm_flags to ensure guard pages for shadow stacks
supply them as an argument to generic_get_unmapped_area(). The only user
outside of the core code is the PowerPC book3s64 implementation which is
trivially wrapping the generic implementation in the radix_enabled() case.
Signed-off-by: Mark Brown <broonie@kernel•org>
---
arch/powerpc/mm/book3s64/slice.c | 4 ++--
include/linux/sched/mm.h | 4 ++--
mm/mmap.c | 10 ++++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/mm/book3s64/slice.c b/arch/powerpc/mm/book3s64/slice.c
index ada6bf896ef8..87307d0fc3b8 100644
--- a/arch/powerpc/mm/book3s64/slice.c
+++ b/arch/powerpc/mm/book3s64/slice.c
@@ -641,7 +641,7 @@ unsigned long arch_get_unmapped_area(struct file *filp,
vm_flags_t vm_flags)
{
if (radix_enabled())
- return generic_get_unmapped_area(filp, addr, len, pgoff, flags);
+ return generic_get_unmapped_area(filp, addr, len, pgoff, flags, vm_flags);
return slice_get_unmapped_area(addr, len, flags,
mm_ctx_user_psize(¤t->mm->context), 0);
@@ -655,7 +655,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp,
vm_flags_t vm_flags)
{
if (radix_enabled())
- return generic_get_unmapped_area_topdown(filp, addr0, len, pgoff, flags);
+ return generic_get_unmapped_area_topdown(filp, addr0, len, pgoff, flags, vm_flags);
return slice_get_unmapped_area(addr0, len, flags,
mm_ctx_user_psize(¤t->mm->context), 1);
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
index c4d34abc45d4..07bb8d4181d7 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -204,11 +204,11 @@ unsigned long mm_get_unmapped_area_vmflags(struct mm_struct *mm,
unsigned long
generic_get_unmapped_area(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
- unsigned long flags);
+ unsigned long flags, vm_flags_t vm_flags);
unsigned long
generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
- unsigned long flags);
+ unsigned long flags, vm_flags_t vm_flags);
#else
static inline void arch_pick_mmap_layout(struct mm_struct *mm,
struct rlimit *rlim_stack) {}
diff --git a/mm/mmap.c b/mm/mmap.c
index 7528146f886f..b06ba847c96e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1789,7 +1789,7 @@ unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info)
unsigned long
generic_get_unmapped_area(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
- unsigned long flags)
+ unsigned long flags, vm_flags_t vm_flags)
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma, *prev;
@@ -1823,7 +1823,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
unsigned long flags, vm_flags_t vm_flags)
{
- return generic_get_unmapped_area(filp, addr, len, pgoff, flags);
+ return generic_get_unmapped_area(filp, addr, len, pgoff, flags,
+ vm_flags);
}
#endif
@@ -1834,7 +1835,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
unsigned long
generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
- unsigned long flags)
+ unsigned long flags, vm_flags_t vm_flags)
{
struct vm_area_struct *vma, *prev;
struct mm_struct *mm = current->mm;
@@ -1887,7 +1888,8 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
unsigned long len, unsigned long pgoff,
unsigned long flags, vm_flags_t vm_flags)
{
- return generic_get_unmapped_area_topdown(filp, addr, len, pgoff, flags);
+ return generic_get_unmapped_area_topdown(filp, addr, len, pgoff, flags,
+ vm_flags);
}
#endif
--
2.39.2
next prev parent reply other threads:[~2024-09-02 19:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 19:08 [PATCH 0/3] mm: Care about shadow stack guard gap when getting an unmapped area Mark Brown
2024-09-02 19:08 ` [PATCH 1/3] mm: Make arch_get_unmapped_area() take vm_flags by default Mark Brown
2024-09-03 17:43 ` Lorenzo Stoakes
2024-09-03 19:35 ` Liam R. Howlett
2024-09-03 19:50 ` Helge Deller
2024-09-02 19:08 ` Mark Brown [this message]
2024-09-03 17:44 ` [PATCH 2/3] mm: Pass vm_flags to generic_get_unmapped_area() Lorenzo Stoakes
2024-09-03 19:37 ` Liam R. Howlett
2024-09-04 4:13 ` Michael Ellerman
2024-09-04 18:53 ` Deepak Gupta
2024-09-02 19:08 ` [PATCH 3/3] mm: Care about shadow stack guard gap when getting an unmapped area Mark Brown
2024-09-03 17:49 ` Lorenzo Stoakes
2024-09-03 18:20 ` Mark Brown
2024-09-03 19:24 ` Lorenzo Stoakes
2024-09-03 19:41 ` Liam R. Howlett
2024-09-03 19:57 ` Mark Brown
2024-09-04 19:07 ` Deepak Gupta
2024-09-04 18:51 ` Deepak Gupta
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=20240902-mm-generic-shadow-stack-guard-v1-2-9acda38b3dd3@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=Liam.Howlett@oracle$(echo .)com \
--cc=agordeev@linux$(echo .)ibm.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=borntraeger@linux$(echo .)ibm.com \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=chris@zankel$(echo .)net \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=dalias@libc$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=davem@davemloft$(echo .)net \
--cc=debug@rivosinc$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=gerald.schaefer@linux$(echo .)ibm.com \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=gor@linux$(echo .)ibm.com \
--cc=guoren@kernel$(echo .)org \
--cc=hca@linux$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=ink@jurassic$(echo .)park.msu.ru \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=kernel@xen0n$(echo .)name \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=lorenzo.stoakes@oracle$(echo .)com \
--cc=mattst88@gmail$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=naveen@kernel$(echo .)org \
--cc=npiggin@gmail$(echo .)com \
--cc=richard.henderson@linaro$(echo .)org \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=svens@linux$(echo .)ibm.com \
--cc=tglx@linutronix$(echo .)de \
--cc=vbabka@suse$(echo .)cz \
--cc=vgupta@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
--cc=ysato@users$(echo .)sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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