From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8C81CA0ED3 for ; Wed, 4 Sep 2024 04:14:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20ED18D0220; Wed, 4 Sep 2024 00:14:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BEBC8D018A; Wed, 4 Sep 2024 00:14:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 087C98D0220; Wed, 4 Sep 2024 00:14:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D8DF78D018A for ; Wed, 4 Sep 2024 00:14:03 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 34575A09A0 for ; Wed, 4 Sep 2024 04:14:03 +0000 (UTC) X-FDA: 82525737966.22.2611535 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by imf03.hostedemail.com (Postfix) with ESMTP id C6F4B20007 for ; Wed, 4 Sep 2024 04:14:00 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=Atgw5p+o; spf=pass (imf03.hostedemail.com: domain of mpe@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=mpe@ellerman.id.au; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725423147; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eMgOBDwTX8trwBbhMUy1qHUpMDhdRlVDIssPJb8Gsmo=; b=s61qtMHBJTjT4HomCjIGR10odDcqI4W4shixVboemJ9Vhun3TIOH2FVGklThFyR4sI71M7 QoWczeNo5h2XGLzSTtGu+sz6U+onjfyMiRWXl5VQ3vBb17bJsZo1/qqscWGdrunp5uZPZR Gwu6hLvhWnbzIqip9HkMhsI8rbSN+cw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725423147; a=rsa-sha256; cv=none; b=HbYyD4SKM6oobvGm5NpPbPidQCppwzLr1E2wcx4I1qWZ5KZqYNJnW3IVnHrS4HCxAovy48 5dMNvZjs/cy9qxZW65u5nv7KuXUrtbhh/cR0oYughmRPqYNgLW527GmIY9hEIoAOXQdmxz JVss6k7OhCND87+jmZWX8ppjIVyUBIc= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=ellerman.id.au header.s=201909 header.b=Atgw5p+o; spf=pass (imf03.hostedemail.com: domain of mpe@ellerman.id.au designates 150.107.74.76 as permitted sender) smtp.mailfrom=mpe@ellerman.id.au; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1725423237; bh=eMgOBDwTX8trwBbhMUy1qHUpMDhdRlVDIssPJb8Gsmo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=Atgw5p+ous8ponaujRBR9zeHm87YGXlWFJw/APeKvwTJfN+vDA+MA/XCf729+PnVA yIoWrvR8Tg01Q4kTrqjbf+6l9UmkC2+E2eKeM0lpnBzHzQLZr6WfUF+RwlGDv9na7Y VJ6SDLZrN5hF4Pw9qE+168Zj3QWww8gocoC1nJ966vxltqaxwrFOfSbul6kyFfi2d0 JlXz4kSSwijD4hHUrXsf8IlpvudZE3CIHAEjc3DtzlAKa/tvrIdpfiNxgF0xas/YL4 mHLB2qUie8SKPjqF5MpzhdViqlVcFcXog5f66aL4m0C5o/rSTOnJ5fJzWnRTdDtt9J XaxynAPBdZR7w== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Wz8Hv4YYPz4wb7; Wed, 4 Sep 2024 14:13:47 +1000 (AEST) From: Michael Ellerman To: Mark Brown , Richard Henderson , Ivan Kokshaysky , Matt Turner , Vineet Gupta , Russell King , Guo Ren , Huacai Chen , WANG Xuerui , "James E.J. Bottomley" , Helge Deller , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Andreas Larsson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chris Zankel , Max Filippov , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes Cc: Catalin Marinas , Will Deacon , Deepak Gupta , 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 Subject: Re: [PATCH 2/3] mm: Pass vm_flags to generic_get_unmapped_area() In-Reply-To: <20240902-mm-generic-shadow-stack-guard-v1-2-9acda38b3dd3@kernel.org> References: <20240902-mm-generic-shadow-stack-guard-v1-0-9acda38b3dd3@kernel.org> <20240902-mm-generic-shadow-stack-guard-v1-2-9acda38b3dd3@kernel.org> Date: Wed, 04 Sep 2024 14:13:47 +1000 Message-ID: <87plpk5a4k.fsf@mail.lhotse> MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: C6F4B20007 X-Stat-Signature: trdkh8fuf1ffegzuzjoq6ezx1r8kmiph X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1725423240-780363 X-HE-Meta: U2FsdGVkX19Xmh+2NF9zAM8bDfeXwaZZRZGM1OyEjweXzD7LeAWkJKGUqvkfOBQSv53M/OwMRCPWIzt9gUhdglnN9+xn8QJ+bBl33+B0pvc1JnbS4ZscZ3elPuNjDOVLQxg4G3k5dioBgZEJEDmNJtW8xvfq3jxFl8aK9HRnIFHk+uvJmkyoHr34Ufwl8J3emjNYJz7PME1FodTSWl1ota7LotVqYXPfr/O5kHizBH0gJqB7R8KgyOn9XpKkZSBdcmTKxDm7K1hlAp/64c+kezOG75RLBts09VA6DFFcy/OH6ypSP8PUKI+lsj3sgQN/chK/ByrJkTnR6MBWzyp2efHopP+sS5CWzJIeqjnFeZMaUaVKyjZ/9iV8687vwQuykCG8T9biim518ZeYUj7wDdqVUEZO3wq2ZZFZ9HwnqlyEPtola68yfDCVr39nwq01iCBjjXRLSM4FTh3KVOHwrztYAPRhqrmyAYnUXt/gpoZj2Ae7qVDykb1x2U4twITKAT9L1g+9Skg8FP1oIHAgxjEFpmZuST/ND3DHvWY+2Eo+1e/feHKkMG/VbxKxfxpHIO4c4lNQJZ0oU9Yv8UEQhDhg58MtsD3zOX66ZHrtXliwCGl8PgXkCARV8H1w3RBT9xiP7xX39JOSdOgn1xyc5/9Lu9SB7ZX7O+wxWEPE9wyX0zirLvZKwgDJfahdVeJ1pT8PErHrI6jD0ZpXGVB8gk2fbJaYQGw8BuSyyqfltBKrtHjbCdCPiOl6EL3gNPdlt3pQH7LQpJVL3DqlLNVmnN2TX0z8BHswZ9aOFokeUiS8AvhJzNasD/BsArnOSNxF0D6g2pV1NNh8+NqzXQ3GuXbTaa8Sif7Tr56YvNKw6Zwvt0HHYeoiD65NuDiXMfeQZcZ/kpgsCTDUr8K5pjZwdW8ogVSIxbmTyEPnRBgUGnEaWh2VojQFBkVO8K+kVuwiPWxVCpE1aUnICXXAY8p MsU2R0MU WqNKDj/L9YIO/wg7lmRMvOCLILboHjaZCpdvXzjVxFq58QHB1qfUwhxg9GCCkY0q+CbIpq+jICY4j62waODnJt9D5VJEdeDg9Nas7urkNYA3uWVqrcso0s4gbx/pmZysHqVtbTsdrJaeSvL/fxWr0+n39So/EhNKFqWs6KYkDD2xByniIa4aEUlRReZkiU1jpWARIe8HPmWap2U8JXatmofazY7iP+Q6gLsUedDehLQ5Sr10qik3iObNQ/t3LnntoIV9Jb/vbmoAe13M= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Mark Brown writes: > 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 > --- > arch/powerpc/mm/book3s64/slice.c | 4 ++-- > include/linux/sched/mm.h | 4 ++-- > mm/mmap.c | 10 ++++++---- > 3 files changed, 10 insertions(+), 8 deletions(-) Acked-by: Michael Ellerman (powerpc) cheers > 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