From patchwork Mon Nov 11 20:53:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13871349 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 60705D3ABF6 for ; Mon, 11 Nov 2024 20:54:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC7DC6B00C5; Mon, 11 Nov 2024 15:54:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E50A56B00C7; Mon, 11 Nov 2024 15:54:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C546E6B00C6; Mon, 11 Nov 2024 15:54:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 9B00A6B00C4 for ; Mon, 11 Nov 2024 15:54:30 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 53A7B1C77AE for ; Mon, 11 Nov 2024 20:54:30 +0000 (UTC) X-FDA: 82775016324.12.9D85BA2 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf18.hostedemail.com (Postfix) with ESMTP id 3A0F91C0010 for ; Mon, 11 Nov 2024 20:54:10 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mtmA7miy; dmarc=none; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731358340; a=rsa-sha256; cv=none; b=6wsi6fbkQHrfPALJLECTr8cRiLBZDX3CmS9fcwSo40F/okLKUdr+9zk1oO7iQ27QxUqibm PusppucZpYXrEod2ldU+ARcEb0cirxKaBlbGs8Nd179cu10GK0KbiWLPTDT7jupAXCOx8U YxyQYjfqHbbOPBQZpCkAuE5QbqPQhME= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mtmA7miy; dmarc=none; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731358340; 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=RH5rxiNwtFqdQzt6ugWkK3TScTNeIYF9L+FeOjwkDo4=; b=1y/Cv/qoDg34DxphKj58WVkMxy4YZHHwNa7u2WrZ/ECrMxlDprobW6RlmqdZvNrhFoh2SU Ty0f+2AzM6aEQo5uRXdhsp6PsLC60WrBnFVHWiQBBR1tE0iGkNk4mIbl7yVaC95bwtZlGH Pztrx9ki7w9pOAz1ZCz31ihh3yrqIcQ= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2e2eba31d3aso3708833a91.2 for ; Mon, 11 Nov 2024 12:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1731358467; x=1731963267; 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=RH5rxiNwtFqdQzt6ugWkK3TScTNeIYF9L+FeOjwkDo4=; b=mtmA7miy0Rq9dCdTzAcse4e3SXeHRCp58E+m3LKM4w+LMiIR1idyLQ4RZj7rWkkwEt A3kD4VlsfokyUeYzR0HcML/PhhFTqsT6D3NgI/r3t37S+56Nue942N/0QW3d71HPszVN CXgQgvqrtt4tcxSDWLUraCg0JikXtvjHxB3ro2UWWntXIQL9QmhepmNGomDRK7hXjq0+ tnXbsnS4PxOpIOo/lGEAX4Y8GxdvQOz6BprqjPR++VSGyutLYFwPpaICmlRrWy3y2MBA asHo3R9miSV6hZD986DvAatmy7PRd+c4Mm6pJvcVmjTBjYKwDn+hY5q+uuTBJVSCAaGS NXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731358467; x=1731963267; 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=RH5rxiNwtFqdQzt6ugWkK3TScTNeIYF9L+FeOjwkDo4=; b=wsrDcJRWITyRsvlZrTxEsLoB+2t5ibahDu40Pu84QzWiVqUTCnvss8+bEcVOIef8z/ T3kGLSeMXOCtE967T2u3IqAfQIhyhMvZ56ZbfTUh+35kgN2mBueTRm3k628BCm5fBGBi Yp1WlWTmXj42YkMQndajat5C2kLGMfdM1EQca8ak8lIZyt9L7u4+BIC37/+WMNUY1MQ9 zVK2FS/DPmn/ZsjXvx4YvFd9qmGFi+U64gbIFZEATx/DNRM64+bSKGPliA1tSej6jZvZ gFTI8ACLDTB5lynVzUUroddwv3V7G4ey1bZmLd5UgUAzlPQwPGt5m3OC0mB8bfbRVBbl LNVQ== X-Forwarded-Encrypted: i=1; AJvYcCUTraGpLZq1mtvSQCRri+XF2zd/ycY5shlGQ2yFU2pLQ20cwCWDijHSYpm24sW8aXEF8RG4mmYiBg==@kvack.org X-Gm-Message-State: AOJu0YxRy47hQ26scP3RPnA2xRA5LGtnfWmo2zyzEMu9A8tLOTV0+/we eiGREdCR/UO/94ZgjMfYtl2ABubSHWAjfe0ANpE4EUMDhzxOuz9iQNn74okNQ60= X-Google-Smtp-Source: AGHT+IEtP8frhYbRTRuF1KOavXy8aPf0itxkB4eaPzAkU1V40SKdq3DPh12v7ey506ueuvFbyGlpcA== X-Received: by 2002:a17:90b:4b4f:b0:2e1:e19f:609b with SMTP id 98e67ed59e1d1-2e9b177fc81mr18945649a91.24.1731358466840; Mon, 11 Nov 2024 12:54:26 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e9a5fd1534sm9059974a91.42.2024.11.11.12.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 12:54:26 -0800 (PST) From: Deepak Gupta Date: Mon, 11 Nov 2024 12:53:57 -0800 Subject: [PATCH v8 12/29] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Message-Id: <20241111-v5_user_cfi_series-v8-12-dce14aa30207@rivosinc.com> References: <20241111-v5_user_cfi_series-v8-0-dce14aa30207@rivosinc.com> In-Reply-To: <20241111-v5_user_cfi_series-v8-0-dce14aa30207@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 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspamd-Queue-Id: 3A0F91C0010 X-Stat-Signature: uc3866ysrkagxgr7r89cndny9p7qx9a8 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1731358450-328614 X-HE-Meta: U2FsdGVkX1/LtJFuZdwf2f+/UgT7mJD8yaw2c5LVCYAyWTojOzoiPjgbJvkb0WPf905OyCMWojlopDnOm4ue825Ej38VLfy9l3vN12+CwiLc0TUbZxVALGxUUsJ21OrO3jVQOjS0xOLDYXm6X4aHNnwra5uhxv2GGNJ7X50d3ypPmLhNngd2DTZm6L7CmRXlucQotaU7aeSXNX0+N1Eb/kHALLuffc3DqCwv68qur6Ba+NnAIOiOaaGMDIRMLK+fBoXX7mR0yAHSz7YiSI0WcKJISQz0KZoxr5lVlAS3VceP0uea/+ZNRwDluMvc0700B2xbSifkUL7cKbYWVEGAirGeoVsP+ix49VACJsu0IJz/ib7867d3dni9L42728H35Gn7fsM6GhmUpyD0/AySy62ql+fGMlFBHscUNcA+rWY6Nmp5HEA9LAUpB1asKfdnjzdk1vFpmJRlDoywwI14cSl/Fmn24+00Lvd+c37os+0Uo2VHVwjy9gG+Qdp2naS2tVBXAMo7ujITjZrbXhQm2rgye+HTTeEchWaq2Sz4XbofK4MfGB11jhkdXAy/zoxqhmGCAAoa9bPkZ+FnMdbUl1bejkhdkIk767t2dK1VQfd6meRDY0Xq+HEWYa9UCoxcRpfh9qdpNJNePzZSNFjxvCSC3NL4Sc0M4ek7AtyKJje/F8YhSS7/pgUFJFe8aFogTt/EYgEpNpiSrPhaXJMbyae+N+LQNZLnzaFcoUlM0zPNchHpqnxO17t1yz89UFYnmQ1uaitJIaMXFanwszZ4PJAU2ssoS6nssw3xmffCIajzUgu0eH18RB5vkeGcJbrp0mIQvVB8THNn8YVbM3QMXhuXIVbA7aK6/cwNwNcgpCWyyuMyuMlHJLsRMUyBnFIpHUHYsErU8wPyetEEp3YZDr6EANse+jfYIMaXmnMbjCmAbjAxjBZmZBEfwIiMe/VxW5PLsA7kvGrDsLj29Mq Xur+zOIV nmgT7SVlyl6tJnhjb3m8/rA84EVW8Kv2zgHe0YnAWCiOueDl1KUrMq0jvzRLhl5ljzfGICES8+q4oeHL0iQtDwhdKFUEbWOH1Ae/T5is9oGUBx1zHUfqbXFY8YnJM1NI/vJMAzuOEyxYeWSP5X2s5ffFmrVgx82PK/GYlyyE7Z1Yhe82bud3ZpkvQHz+qB5a194nKkYLWoH8nSyTSPocIugJLr0fmwsZPA+mMztXGXuSvyXa6run8qp4WlDYEi/Kl8WMnnYuleLF0lBBD6ekKjz0f2GoV98HdrRgqk8HFDt4nSLOzoKVnDCUOVNukcUWoql6Ty1fbSdZuHwGz/qVRrQ2yUtU2GjnVayCBBAyUasdBObQk+4DZAqkf1mrtbdHgzoK83mBbYgmLwl/eaa/JXCqsvj14fyjxxQzMkk+hXWCYT2+sl5uIYSNhgUu53goKbXjpJZ+Ca1dLgIo= 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. 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 | 121 +++++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) diff --git a/arch/riscv/include/asm/mmu_context.h b/arch/riscv/include/asm/mmu_context.h index 8c4bc49a3a0f..44d3843e8c14 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 4fa201b4fc4e..4da9cbc8f9b5 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 *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 58b6482c2bf6..2e8bd30a2b49 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 96bb324abafb..6cd166b73316 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 = 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 @@ -143,3 +178,89 @@ 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); +}