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 5EC3DC28B2F for ; Fri, 14 Mar 2025 08:30:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A33D928000A; Fri, 14 Mar 2025 04:30:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B9B5280001; Fri, 14 Mar 2025 04:30:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80C8228000A; Fri, 14 Mar 2025 04:30:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5EF8A280001 for ; Fri, 14 Mar 2025 04:30:50 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1C4F01A0C9D for ; Fri, 14 Mar 2025 08:30:50 +0000 (UTC) X-FDA: 83219485860.10.FFE0E4F Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by imf18.hostedemail.com (Postfix) with ESMTP id 201821C0016 for ; Fri, 14 Mar 2025 08:30:47 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=sifive.com header.s=google header.b=Eemrg6nE; spf=pass (imf18.hostedemail.com: domain of zong.li@sifive.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=zong.li@sifive.com; dmarc=pass (policy=reject) header.from=sifive.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741941048; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pVkgjLCnCUI9ioEXp+7869JJX5vgmb7aKbpLKYY91VM=; b=n4Tk4B7mkVRIGUjnlfmhy8D7CBBbng24RGVqeH2tyg8GPK0X1oMPV5BpiakY5nQi3M3LBx o3WvlhtNX3uYAneShl/DPXhpuNF4QUTqStMHOITNyi+msMPMqPBHBgzU+j5HFLTmJ79g9Y aqFoggp/ug1sBo+5Ca03T3O/6Q/6zJw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=sifive.com header.s=google header.b=Eemrg6nE; spf=pass (imf18.hostedemail.com: domain of zong.li@sifive.com designates 209.85.166.48 as permitted sender) smtp.mailfrom=zong.li@sifive.com; dmarc=pass (policy=reject) header.from=sifive.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741941048; a=rsa-sha256; cv=none; b=0RgTW1/jqfHh71xEtBh0DD4w8kcXNGspCpATbN6kUB4/1Y592SOwL8lpratoOC45aGR51o MSrpwJpW5rVglRJRuKyMBV5jOUanqEO6llG2GHO8M4t0oB1pf2fTTjJY7w+4WT1wh9xWjU 8C+g1S8NAGQhLhYyM2j13GtRWXCr1as= Received: by mail-io1-f48.google.com with SMTP id ca18e2360f4ac-85db872dd80so40513739f.0 for ; Fri, 14 Mar 2025 01:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1741941047; x=1742545847; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=pVkgjLCnCUI9ioEXp+7869JJX5vgmb7aKbpLKYY91VM=; b=Eemrg6nEKkBOpLAI2ToxR0A9QSrz84AfjkeIU/iKIIqIwbtUy+d2/14dnoEU1JGjQW RkNAfQ0qFDS87ZBDkXluF1ckVA/+uqGOJimC3OiUXBDx7hMmAHvvwmA0K0Y7He14Q14J LId3oaj7yjylXrMAv9w6mftCxSrBFUaaIhQ8vIoA6Ij8/j6RchKy4evMcg0hw5E6Djan 5IXc4JlEU7lJQPFgst2tDr+E/FqGAJRebg2O/zpzA9R96IBe1XyH8e1++w8R933Upjot as2CvEo5FV62cHzaEPUp5CiIaZ8no4wNz2fOekQ2yD6gfWvqI76rMiQ69xRUA5XEoQrR lElQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741941047; x=1742545847; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pVkgjLCnCUI9ioEXp+7869JJX5vgmb7aKbpLKYY91VM=; b=LsKGFTiaQSLzgv1Du5Wqs9g0sJ50C7HgumhSXvuqovsy4dF8xU+AZuHaPjtv4EyVY1 yUEhyc1AHKiAwAE8fmMItroh3/R3e4pBo0xNgnD9+a33V8NxuTpouV+eYslRiiANR4Cq cCzQUd/BdeWcp2whylPJ/8ur8AP7WnrHFzCCjDxHnjffHMagUziH2yUEhXj4/xRuZ16t 65lZJyKyA18/BapiyrNBPGJQmcbeamyViB7C8a6MTP5knSClfkFjPYlKzlm9JDaqNpRk gAawsglmm+wpXQQeUJmyDTsdNHCxVTzDHclbho59Lyv4udGYzeCRYCmcvR9IaGPq1aQt wfMg== X-Forwarded-Encrypted: i=1; AJvYcCVWE8NLaEyNUiHyBrzb1h8hFi6kTPbJGT3YDMc+7VpDwTyHsE6aFguPTFg5iIqIli+MKdqzmAfv7A==@kvack.org X-Gm-Message-State: AOJu0YymcUDwYVhTBqhXcFkMGpMBtxl9TZomPYl8mofV4g4i2F/JyzM/ 3gR0WjKWhsvfMtiaUzpm1j2PQ6yGb5ryW1QXq0QWxGGiSn1zdp/9NfBoyLzT4QOZNqWbl2xynkF osWhk9YQ+l/jlUB6RD0ztfQT/vWJKrb4g7vu/XA== X-Gm-Gg: ASbGncuNBuM9jcxn1XwaBsnR7uj9lA29aHPim5Jp7xsGSJovLNKHIUkvggYOrhmPO/+ /Us9qFSPqmaNA3LCT5FBA4G8Ie+ij2ZJ4pEN73M98qC1/8H0g6Le/rc9IHtiZskigDXEiooLfHf 23RUIEwcEPcbz+oU/Go1iC3fQ8mv8= X-Google-Smtp-Source: AGHT+IFWp0so50j/pj0q80+N5pNVDDJV0PKTkFCKEUgPJqbURfJzftDPMl2yQe8jE+KIcC0bOMvyNNoalps1kuAhEuc= X-Received: by 2002:a05:6602:4c0b:b0:85b:6118:db67 with SMTP id ca18e2360f4ac-85dc47c5578mr150925139f.2.1741941047135; Fri, 14 Mar 2025 01:30:47 -0700 (PDT) MIME-Version: 1.0 References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> <20250310-v5_user_cfi_series-v11-11-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-11-86b36cbfb910@rivosinc.com> From: Zong Li Date: Fri, 14 Mar 2025 16:30:35 +0800 X-Gm-Features: AQ5f1Jru716EmtibEWxuiBHJ0hbbelGrNS70UuKCfZm5CBH2LXMI4b2SkG1AS6M Message-ID: Subject: Re: [PATCH v11 11/27] riscv/shstk: If needed allocate a new shadow stack on clone To: Deepak Gupta Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: tx57be9hq5eepjhzjnifzrzf97p4qo1g X-Rspamd-Queue-Id: 201821C0016 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741941047-816670 X-HE-Meta: U2FsdGVkX1+Re7Nl2ZBWjvnz50Cq0NIoMg0KlYDRQv6ZEWGGTQgV2qVxk9xlpY7Pw8tErIiEl2ixzC+UbHhLTSB6trds5kLwRQHCspTn9QZCKPWpvpy30reVG0wHUJWaYtFTWh/bEHz5pahYY6yJB2pjx/LJNG0cXMbv1lnJymxfVBQ94DS9uVIByXsT5tKN7sY8bf5wI1CujTEUSFjUwhkgbdjMeVB1Sa2s/Kxcjb/ccamdMGJLhrBl19Ocw2b+p1hNXsX9RYpO+n1q1hCIJLHJCzyqSeB7+lhvXLvke77kNbKFEy6LZAhBSNlNabrYViJceYQRRKMu3N8O4oo1KBpHX0HiRHLWhEgwpFUD9fyWf4Y959GmR7jN90R+fGg2ARluRPuetJPoRJyQI5C3swFXDANoVDuMGOrksjYP1dRj/FSzb3ao1TfinF2keUh6DDCbI+Z8MPddzV1efIIM8HwQiDqnvchOMmmyEN+LpybTlQDTEdqto5dz2RT937azRW+ehwTMiawybUaagcNtq/NrwRkqcEEo0ebzP8xnu620CpvoYtL+oovPjb2uWXLr7o2Yjws2jf9/cgfZKeFBnjxeUH6mZcaFRaYHe9HBUFbKDSq7+6t1zbNhLoPpwof3zxN8DOCyVOzpSFtk082R38JqzWi3M7S/g9PVPlnlYtLPlHE2RHTvw21ZrFT7dRvnzPOGWyIgyA5WEplsnBIJeM6I4EcFE7jkyt1OHtmlm0/jaWB6hn2bkqwyUvjwqsXYw7qeAWtKTYX15aHEne9DkQWafqj+hjWdvXf03JcLenahUYEOgRUmhwMmHdETDWEOwQiAR/phgV0krshw1I3r6eG87xqfwvTwHnO8fOnlYxoamf3nsRw2pzECXhA1fwH4w1VfnTtOwa5nAj0ZjEhCtdgVpcZHPtvGJitRqEjIOC+wUwr4Od6xadCkVHdmoHG1tuSUVXHlF11ZbRSxwr/ WUwkgu4M Ebw/+/Xx7MnwOpc6CnTO5ewsay7K0mMsZ82BRdVNOjpuII1OENw2ij8kIY3ranBWtSFlZ/4WpQ6v5gtdUJn+A8vuEBWPDTqCw6U3CDfcJN8VKvDCn1dcmv7Hz6nF0sCq9rH/++OQBUL3ccU3bxJvhzSejIb+7tOhSk8S5Kh/oxEZ7AClc1cAGuCUk+3zaxy0KseJa782lqJAUl2/egrmNT5iuuGvb/n3d+wt2b7Wv9SbbhNdgiUddb9PGMKRcKp9JFmIHax4/1HQ29YNU5ORvR8FGVMo5CPPVoSAV9GE5/WGhS4jHGHMlfwaifI4R89VKNa+aAk719vJ8u5gv3L6aUYrz9i5b0Lxt/kybVkO/FM1iSgJC8N2Icmz30+2j6hxJRoEtrxCibidh9zF2Mesdvp/3XozCcHiMxS6x4HRTQQRYXt9iMCQo+rvu/THEMvmIzxZU 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: On Mon, Mar 10, 2025 at 11:42=E2=80=AFPM Deepak Gupta = wrote: > > Userspace specifies CLONE_VM to share address space and spawn new thread. > `clone` allow userspace to specify a new stack for new thread. However > there is no way to specify new shadow stack base address without changing > API. This patch allocates a new shadow stack whenever CLONE_VM is given. > > In case of CLONE_VFORK, parent is suspended until child finishes and thus > can child use parent shadow stack. In case of !CLONE_VM, COW kicks in > because entire address space is copied from parent to child. > > `clone3` is extensible and can provide mechanisms using which shadow stac= k > as an input parameter can be provided. This is not settled yet and being > extensively discussed on mailing list. Once that's settled, this commit > will adapt to that. > > Signed-off-by: Deepak Gupta > --- > arch/riscv/include/asm/mmu_context.h | 7 ++ > arch/riscv/include/asm/usercfi.h | 25 ++++++++ > arch/riscv/kernel/process.c | 9 +++ > arch/riscv/kernel/usercfi.c | 120 +++++++++++++++++++++++++++++= ++++++ > 4 files changed, 161 insertions(+) > > diff --git a/arch/riscv/include/asm/mmu_context.h b/arch/riscv/include/as= m/mmu_context.h > index 8c4bc49a3a0f..dbf27a78df6c 100644 > --- a/arch/riscv/include/asm/mmu_context.h > +++ b/arch/riscv/include/asm/mmu_context.h > @@ -48,6 +48,13 @@ static inline unsigned long mm_untag_mask(struct mm_st= ruct *mm) > } > #endif > > +#define deactivate_mm deactivate_mm > +static inline void deactivate_mm(struct task_struct *tsk, > + struct mm_struct *mm) > +{ > + shstk_release(tsk); > +} > + > #include > > #endif /* _ASM_RISCV_MMU_CONTEXT_H */ > diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/us= ercfi.h > index 5f2027c51917..82d28ac98d76 100644 > --- a/arch/riscv/include/asm/usercfi.h > +++ b/arch/riscv/include/asm/usercfi.h > @@ -8,6 +8,9 @@ > #ifndef __ASSEMBLY__ > #include > > +struct task_struct; > +struct kernel_clone_args; > + > #ifdef CONFIG_RISCV_USER_CFI > struct cfi_status { > unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ > @@ -17,6 +20,28 @@ struct cfi_status { > unsigned long shdw_stk_size; /* size of shadow stack */ > }; > > +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, > + const struct kernel_clone_args *ar= gs); > +void shstk_release(struct task_struct *tsk); > +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, = unsigned long size); > +unsigned long get_shstk_base(struct task_struct *task, unsigned long *si= ze); > +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr= ); > +bool is_shstk_enabled(struct task_struct *task); > + > +#else > + > +#define shstk_alloc_thread_stack(tsk, args) 0 > + > +#define shstk_release(tsk) > + > +#define get_shstk_base(task, size) 0UL > + > +#define set_shstk_base(task, shstk_addr, size) > + > +#define set_active_shstk(task, shstk_addr) > + > +#define is_shstk_enabled(task) false > + > #endif /* CONFIG_RISCV_USER_CFI */ > > #endif /* __ASSEMBLY__ */ > diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c > index 7c244de77180..99acb6342a37 100644 > --- a/arch/riscv/kernel/process.c > +++ b/arch/riscv/kernel/process.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER= _TASK) > #include > @@ -211,6 +212,7 @@ int copy_thread(struct task_struct *p, const struct k= ernel_clone_args *args) > unsigned long clone_flags =3D args->flags; > unsigned long usp =3D args->stack; > unsigned long tls =3D args->tls; > + unsigned long ssp =3D 0; > struct pt_regs *childregs =3D task_pt_regs(p); > > /* Ensure all threads in this mm have the same pointer masking mo= de. */ > @@ -229,11 +231,18 @@ int copy_thread(struct task_struct *p, const struct= kernel_clone_args *args) > p->thread.s[0] =3D (unsigned long)args->fn; > p->thread.s[1] =3D (unsigned long)args->fn_arg; > } else { > + /* allocate new shadow stack if needed. In case of CLONE_= VM we have to */ > + ssp =3D shstk_alloc_thread_stack(p, args); > + if (IS_ERR_VALUE(ssp)) > + return PTR_ERR((void *)ssp); > + > *childregs =3D *(current_pt_regs()); > /* Turn off status.VS */ > riscv_v_vstate_off(childregs); > if (usp) /* User fork */ > childregs->sp =3D usp; > + /* if needed, set new ssp */ > + ssp ? set_active_shstk(p, ssp) : 0; > if (clone_flags & CLONE_SETTLS) > childregs->tp =3D tls; > childregs->a0 =3D 0; /* Return value of fork() */ > diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c > index 24022809a7b5..73cf87dab186 100644 > --- a/arch/riscv/kernel/usercfi.c > +++ b/arch/riscv/kernel/usercfi.c > @@ -19,6 +19,41 @@ > > #define SHSTK_ENTRY_SIZE sizeof(void *) > > +bool is_shstk_enabled(struct task_struct *task) > +{ > + return task->thread_info.user_cfi_state.ubcfi_en ? true : false; > +} > + > +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, = unsigned long size) > +{ > + task->thread_info.user_cfi_state.shdw_stk_base =3D shstk_addr; > + task->thread_info.user_cfi_state.shdw_stk_size =3D size; > +} > + > +unsigned long get_shstk_base(struct task_struct *task, unsigned long *si= ze) > +{ > + if (size) > + *size =3D task->thread_info.user_cfi_state.shdw_stk_size; > + return task->thread_info.user_cfi_state.shdw_stk_base; > +} > + > +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr= ) > +{ > + task->thread_info.user_cfi_state.user_shdw_stk =3D shstk_addr; > +} > + > +/* > + * If size is 0, then to be compatible with regular stack we want it to = be as big as > + * regular stack. Else PAGE_ALIGN it and return back > + */ > +static unsigned long calc_shstk_size(unsigned long size) > +{ > + if (size) > + return PAGE_ALIGN(size); > + > + return PAGE_ALIGN(min_t(unsigned long long, rlimit(RLIMIT_STACK),= SZ_4G)); > +} > + > /* > * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush= ` can happen > * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap`= takes pointer to > @@ -142,3 +177,88 @@ SYSCALL_DEFINE3(map_shadow_stack, unsigned long, add= r, unsigned long, size, unsi > > return allocate_shadow_stack(addr, aligned_size, size, set_tok); > } > + > +/* > + * This gets called during clone/clone3/fork. And is needed to allocate = a shadow stack for > + * cases where CLONE_VM is specified and thus a different stack is speci= fied by user. We > + * thus need a separate shadow stack too. How does separate shadow stack= is specified by > + * user is still being debated. Once that's settled, remove this part of= the comment. > + * This function simply returns 0 if shadow stack are not supported or i= f separate shadow > + * stack allocation is not needed (like in case of !CLONE_VM) > + */ > +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, > + const struct kernel_clone_args *ar= gs) > +{ > + unsigned long addr, size; > + > + /* If shadow stack is not supported, return 0 */ > + if (!cpu_supports_shadow_stack()) > + return 0; > + > + /* > + * If shadow stack is not enabled on the new thread, skip any > + * switch to a new shadow stack. > + */ > + if (!is_shstk_enabled(tsk)) > + return 0; > + > + /* > + * For CLONE_VFORK the child will share the parents shadow stack. > + * Set base =3D 0 and size =3D 0, this is special means to track = this state > + * so the freeing logic run for child knows to leave it alone. > + */ > + if (args->flags & CLONE_VFORK) { > + set_shstk_base(tsk, 0, 0); > + return 0; > + } > + > + /* > + * For !CLONE_VM the child will use a copy of the parents shadow > + * stack. > + */ > + if (!(args->flags & CLONE_VM)) > + return 0; > + > + /* > + * reaching here means, CLONE_VM was specified and thus a separat= e shadow > + * stack is needed for new cloned thread. Note: below allocation = is happening > + * using current mm. > + */ > + size =3D calc_shstk_size(args->stack_size); > + addr =3D allocate_shadow_stack(0, size, 0, false); > + if (IS_ERR_VALUE(addr)) > + return addr; > + > + set_shstk_base(tsk, addr, size); > + > + return addr + size; > +} > + > +void shstk_release(struct task_struct *tsk) > +{ > + unsigned long base =3D 0, size =3D 0; > + /* If shadow stack is not supported or not enabled, nothing to re= lease */ > + if (!cpu_supports_shadow_stack() || !is_shstk_enabled(tsk)) > + return; > + > + /* > + * When fork() with CLONE_VM fails, the child (tsk) already has a > + * shadow stack allocated, and exit_thread() calls this function = to > + * free it. In this case the parent (current) and the child shar= e > + * the same mm struct. Move forward only when they're same. > + */ > + if (!tsk->mm || tsk->mm !=3D current->mm) > + return; > + > + /* > + * We know shadow stack is enabled but if base is NULL, then > + * this task is not managing its own shadow stack (CLONE_VFORK). = So > + * skip freeing it. > + */ > + base =3D get_shstk_base(tsk, &size); > + if (!base) > + return; > + > + vm_munmap(base, size); > + set_shstk_base(tsk, 0, 0); > +} > LGTM. Reviewed-by: Zong Li > -- > 2.34.1 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv