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 9D019C369DC for ; Wed, 30 Apr 2025 00:25:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1F346B00AC; Tue, 29 Apr 2025 20:25:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA97C6B00AE; Tue, 29 Apr 2025 20:25:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 925CF6B00B0; Tue, 29 Apr 2025 20:25:02 -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 5A6D66B00AC for ; Tue, 29 Apr 2025 20:25:02 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 17367C1580 for ; Wed, 30 Apr 2025 00:17:04 +0000 (UTC) X-FDA: 83388795168.07.622BD3F Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 1D63A1C0003 for ; Wed, 30 Apr 2025 00:17:01 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DGtlWlXf; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745972222; 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=HZxLHlD3l8KQyqfBm0pNowD5Eu+jDmaJ7iNXDIvukjQ=; b=SZiJX8BcvXnNyrpYDfb1s3+KS5tiR/izOwLrPp3YQeDGNqe+sM/MSowVH1Zh/F6EP0enn/ 2cRMCaIAr+2yo86johjye68emAE9XfZOvdYf3bU1+QTiyMkpf5nqYoK8978v7Wcx3yxoK8 AU/Xsy892ULtd1kiAttTe/fynSFrvNU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DGtlWlXf; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972222; a=rsa-sha256; cv=none; b=iGc7jYf2v0sdBFUhzNpEahyrw8jXjA4cOwSus6hspdIlVK5Bei5siFuXkSe4ScGe3v6nyT bx2M72KRwXGeCG5STk0vLIXPOW+cjHygGuGp9Yas0Ib0fCkzNVwuxznXNxHWTJj0V9drCG 2m/9hUgPJWeu8Sy5EgqA9wqrWLgN1ik= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-227cf12df27so4226245ad.0 for ; Tue, 29 Apr 2025 17:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972221; x=1746577021; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HZxLHlD3l8KQyqfBm0pNowD5Eu+jDmaJ7iNXDIvukjQ=; b=DGtlWlXfDkElmgpfhNonAoCeo41ZPnBaVt+4a5y1KflmfX82Hwn1KCXAkLgM6yMLcy 6ZOuSXzTqp5Hb+opDIp99IglRq7oYe/K2ib8dvSERYbD+TGaZcR6sVx8h3bU/HWwP2BT tL63DwawqVMhFqHwc4Qyh6zGlaPYyW92QYY/sSJyE6g8vOwe0dV8kvOkyaqF4H9XejQP 5NyzifdmK7z31UQ9FDW80yXyhuUCgX4uEh1Ra9FdCMVF2fMHEDNhMHoaH+cMn94kkbnn vr8mvy6x/QsCyNBAc1OB/8YLt77GnFxYAOAJtwyPqnYpl5+Kyvok77um4JFue1Pvn6In yc+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972221; x=1746577021; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HZxLHlD3l8KQyqfBm0pNowD5Eu+jDmaJ7iNXDIvukjQ=; b=qgaDLPD7Th5dJIPwIlCdbG2VFVZPI68hdUxU5w1N+MhYhu8j6OV3Q8nSorhCk1WJij h179lVIJr9xtvAdmRMt68My9bxnSuPk7QfoVjUYHQ7kxJSkVc9Y2JQ3raREyU4WwPN0s vUTVOQ5bTPFKbJs+3vH9h+r22J/XRmuhypWw+iqiJI7Qn1nfF2i5dzrZcg2B+4Cuj2uz X8+uPazgVUku60p9OImBHeEl8HGLXllF2cPG1yAUVo4aLcjr15BFBv80pJA/VAlgUGum v4dNfTziLybBfeSZF7SJrqZl8ybQDj0QhQih9Ynnihs+0j3gtnp1ae0yGeuFQPzA+ALG VJSg== X-Forwarded-Encrypted: i=1; AJvYcCXUwjyJQm+JcSa72Ff4NIZxbdgqPC9+vfJ1XYC/Z2HWEgGohPPqGx3KBb/tgYw8E/aC40p+0WscUg==@kvack.org X-Gm-Message-State: AOJu0YxQzeQxTDS2mirVHahXNMvol5fGE2V+0mx4xMamL9IuD76v/Zy7 dyDLLMBJpTltZ1aP9E/16PtrMqCOBp0ovxw9DMnjwtTSerVqSMeR0xr664e+gUI= X-Gm-Gg: ASbGncts0Iax4irm3iBEJwsm8Pil68Zw6gulr5qPp+8qqzA8PWG5xWY/uYBedI2sprB arvTfyfXEo/zAKRmv2jS4uQA0zauRKD08sJ0uWanKMnxjMWWxhOFmlPvoTitoF07Mju+3Pz16zY zAcq8blzzNvlLF2+D9BmYK5nWaegR66E7uKIchi2MgczczBi0tYw/PHdqH/8oPz/cSTuZLeHtKP 4fexTAsvJmPSvgMbw5NOThPv4utGAszi38026AjLuPREib3HFZnuluqWogmnRBX0aRNPgWeX+/V ll/Wxn0UxuOqP3/8DEnxuQAH14L5onH2I/7gb9+R0+9VcnEU1jI= X-Google-Smtp-Source: AGHT+IFHUa1gkfbu4YATBNxYYRy+IpJ9BfKSEyfxBEJdg/REwdO6LsoaUDr+6BDe+fF4LnfflTj+RQ== X-Received: by 2002:a17:903:1a2c:b0:215:a303:24e9 with SMTP id d9443c01a7336-22df4748c43mr10916095ad.3.1745972220890; Tue, 29 Apr 2025 17:17:00 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:17:00 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:28 -0700 Subject: [PATCH v14 11/27] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250429-v5_user_cfi_series-v14-11-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> To: 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 , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: 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, rust-for-linux@vger.kernel.org, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Stat-Signature: 6zentw16ffghsndd8aw4gm1pkec9h6dh X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1D63A1C0003 X-Rspam-User: X-HE-Tag: 1745972221-162822 X-HE-Meta: U2FsdGVkX1+F7WUSnSRlA1IXiEzU/KeJ1mz+N7SzPPoDVEexy14xSiuK8IyrzqFNpMHBsaJIQuZni18iFF/imVmqOHzenCMNuhpWu+uUos3mlHCQx1RgkXiwbtxgU24B6rIvQCOxxva8xqyh2p25qqb9oumyS/8v++pfxVXmCyuv5RPMS62H7HK+zSFvXuWoFIfAIOb1/gX7O4fMLTPhkFU47HEyE7omFDg/aj/cRu+5S6yuhw88MO5QzmCTZ1pT3E6rZcmJk5iljEi7QCVwhxh3PZjxsxOOfrjrnC0IF3QAJ/TV6XOryd0aTDAguOeXI9d3iiraWhaNJkPZP3+uqiq0k5hKvJU4usaqw8SsAkP+R/idT0dqTaLNQKnnugCftyCsbD2NcsTG5G5IG8T4rvFuMjOSNG0aeXPm71/+b09Ju5zw8l+1ZmP71FrGPBDW5HzRbBanfMhTtMo4jmoQDes+behDQE/+V0F6MW+HHEAAWjm76cVl83HERMsfl+lU27rG2TKeNgIXnF/XyPdHU5Hkz7wJrRNLGfjiC+IErWDbD+st10io+FaEihQutzLPGV7KeRzwkAQdKvwufkC+3UqKdbHlU6pxgy7f5JXTRm2VJGu2tIur0iVqR4glQ8CTM8H35g8d/6zby5bY/lCmXZFCrF9b47tzoVBAQY7DAGjD6iPRXHOOMmbDWKKwf/JCGyxAJUOTO7alWf3G//NzUtnDrmBypE1TySzkQUkVz4OmuIXFhP9WkPptlC7rJtSI4a1V1jbiD+p7QNaIAOVyJbzY8PMSgl5x8OWTWCcnpf1ilG778CDUaq9VrQDRGs6yigvXquGknBDqh3QKfj6jAvKeP9LnqHZThU2Ag6tbaYMBnOO7bGvHUAshJmrTedGpfdX+GTgvvPupd31Vui3BBJjhFVTHnjMtzUwmHWCa/YFIqe4qERmYISlBYbdcCX0J3R4UuqkwGI6rjnTvQbK 0chtpTyI /rv7ITWJd6IQ7ZdU3m/VxTqBfL5hZgenVbqJ10z0te2RwDUuQjoPKvyFgviXt+xtJdh5v48YJIyD29A0lWmTD+pr+HH7Mxuw1Cn9leKbktw+apQnij7GsPXweAFOp/nqAUOGI2KvQEW2K4KAbjTG0inBhZGNOO9EwhsTn0PRywZKuHr5khh77aRAWV6lnqTxV4sOu94QQEwHNperaqRg+GK8iURpdNFc+jThEsmGZKmrLebfzIpMSOyoz1RxZBV8mAFzwRASbo/73e9qKpEw5CoMVugO1p2T+D6BzSLuC1kEVsTBchJXzoyKGOld605Hp0GrnpDJ4hHT9qPNcvTWRFN8IbdJDMlAfdztfAFPg8wH5SxvKwvx9644FgOaA9Taqh3ffsf332h4gySqljX2ZDPklNjVNTAB5FGgXwrjkga/R++e/Y/ZbYRgK6OjqKcg4ZCMYunf68+mWasltk7i4fXFA9HSXU7wzUmabAx6W9oATK2Vn9cLb2NDZ+IbYGe/Wt03t9xfxcLw3GYc= 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: 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 stack 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. Reviewed-by: Zong Li 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/asm/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_struct *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/usercfi.h index 94b214c295c0..0581587490c2 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_state { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ @@ -16,6 +19,28 @@ struct cfi_state { unsigned long shdw_stk_size; /* size of shadow stack */ }; +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args); +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 *size); +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 kernel_clone_args *args) unsigned long clone_flags = args->flags; unsigned long usp = args->stack; unsigned long tls = args->tls; + unsigned long ssp = 0; struct pt_regs *childregs = task_pt_regs(p); /* Ensure all threads in this mm have the same pointer masking mode. */ @@ -229,11 +231,18 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; } else { + /* allocate new shadow stack if needed. In case of CLONE_VM we have to */ + ssp = shstk_alloc_thread_stack(p, args); + if (IS_ERR_VALUE(ssp)) + return PTR_ERR((void *)ssp); + *childregs = *(current_pt_regs()); /* Turn off status.VS */ riscv_v_vstate_off(childregs); if (usp) /* User fork */ childregs->sp = usp; + /* if needed, set new ssp */ + ssp ? set_active_shstk(p, ssp) : 0; if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 0b3bbb41490a..ec3d78efd6f3 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; +} + +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) +{ + task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; + task->thread_info.user_cfi_state.shdw_stk_size = size; +} + +unsigned long get_shstk_base(struct task_struct *task, unsigned long *size) +{ + if (size) + *size = 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 = 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 @@ -141,3 +176,88 @@ SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, 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 specified 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 if 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 *args) +{ + 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 = 0 and size = 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 separate shadow + * stack is needed for new cloned thread. Note: below allocation is happening + * using current mm. + */ + size = calc_shstk_size(args->stack_size); + addr = 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 = 0, size = 0; + /* If shadow stack is not supported or not enabled, nothing to release */ + 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 share + * the same mm struct. Move forward only when they're same. + */ + if (!tsk->mm || tsk->mm != 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 = get_shstk_base(tsk, &size); + if (!base) + return; + + vm_munmap(base, size); + set_shstk_base(tsk, 0, 0); +} -- 2.43.0