From patchwork Thu Jan 25 06:21:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13530081 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 C586DC47258 for ; Thu, 25 Jan 2024 06:29:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 575826B009C; Thu, 25 Jan 2024 01:29:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 525626B009D; Thu, 25 Jan 2024 01:29:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 351016B009E; Thu, 25 Jan 2024 01:29:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1DDCA6B009C for ; Thu, 25 Jan 2024 01:29:38 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EB37A1C1651 for ; Thu, 25 Jan 2024 06:29:37 +0000 (UTC) X-FDA: 81716857194.22.FE04597 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf15.hostedemail.com (Postfix) with ESMTP id 4DD36A001B for ; Thu, 25 Jan 2024 06:29:36 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kPGYpQcP; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1706164176; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hEK0nLeeUyyEqPsucfbvDxvRRfgyRHV2ZwAZ0YdFTFk=; b=CkbmLwhNVl1mZFONTtnoUxmk4APMi9FV5LlBGCgldo2IiOpmZYYo/ilWX5RhZK5TeK0WQ5 7FE/7xQX3pp7lm0g92dkG5VaZDVNyEmKJpoDJtfR2/JioCpTH/hXwE/MFu3cGmUspV0rxN fgScPHRnxHy2MFe7gXkFRyUtu3DobfU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706164176; a=rsa-sha256; cv=none; b=qlcZW8ptQI0faeNqD4Uy2qSm9eMk7Qu7C7vPqfYU++Ifjv+cDyiVcY0J+4w+84kuAGahf6 000LhY1CDnhyk7qaVoqJUC9PWDfrD/1N3lH7I1PmDx3h1oz76VGGpxRdeUHU7e7LidJymp QB160WvGqNkpqfHlbcGs3ExTT2L/VJU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kPGYpQcP; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1d711d7a940so55945675ad.1 for ; Wed, 24 Jan 2024 22:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706164175; x=1706768975; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hEK0nLeeUyyEqPsucfbvDxvRRfgyRHV2ZwAZ0YdFTFk=; b=kPGYpQcPj1kF5+vUsJoSZki0qmhwIzZm5GSmar55nQTDRvPfakJEv59aede6ox5hNx zAuWovxfCqzRWIgm4oUAx+FKVg6PnSVTQWoUY34i+xieJD5YzIOTVYvnFcHJEaUzKdXq e0n5nRDaVg9smYXWHOX/Ej9K5RpoVJ5RGt0BYBGG99dR0b50CEEPBHvu9st+EgKHAYk5 mmPvYfw6muLjoRbGth0Og+lU+1LR+DeNCILUJTwo13+ybQ87vCwuq+b2Dp8xHbUQC6v+ ziVBqgqEJ17vrPTYtwrMrgk0lzzwLjmB+eNIjVx3wf1fry7BvQsT/Bz0qTzKcE4FRJWx htWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706164175; x=1706768975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hEK0nLeeUyyEqPsucfbvDxvRRfgyRHV2ZwAZ0YdFTFk=; b=HosiSS7LqVhRmfxgXboD9J80bmpopytPxL4Xs97eSATVseDHsXtRwDF5etWglSbaKX P8D6KTfCP0LC/Pl7mkgL4Yz5BGJYnHZFemkh6R01Aoh3VHXfGH2JdO8hkEFad3S6eIhQ QhP1WTp1S1EHzcbFc0bZIk9aZyZix9CAbmajPM0KHz33K5LvRZkwHFAWPhQXIW0XZC/8 iTq744cLeJVD3aJYgJqGMish8e5B9L9zxEbwdCTVpyygt2QuRKWL9RDwzHtsn5p462/2 XFE/d5tY3Vs0EiPzfByJe4s4aGxVUHm9ZM7ta2uQJJFM0OPIEaUyj+5s4S5Ka8h2alrq 69nQ== X-Gm-Message-State: AOJu0YyFzNxR92UB86/OOo5jaXKhrOtJ3VDcbabTXfMHos/Sg6yU5U8e qJW4OxYV5IB5nSYXfVw/ThM0wev80gT/98NE0fpyaAU08XwQtgMSpwO0RlUa+tE= X-Google-Smtp-Source: AGHT+IEuES+Nqzdr2BEz6j/Kl5wHqawKSI3UsPoKeKJE5bEvHyihgNT2hQgxZpIvSEF4VhLoqkQkuQ== X-Received: by 2002:a05:6a20:2d25:b0:199:a43f:db4 with SMTP id g37-20020a056a202d2500b00199a43f0db4mr942290pzl.80.1706164175121; Wed, 24 Jan 2024 22:29:35 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id t19-20020a056a00139300b006dd870b51b8sm3201139pfg.126.2024.01.24.22.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 22:29:34 -0800 (PST) From: debug@rivosinc.com To: rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com Cc: corbet@lwn.net, aou@eecs.berkeley.edu, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, guoren@kernel.org, samitolvanen@google.com, evan@rivosinc.com, xiao.w.wang@intel.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, waylingii@gmail.com, greentime.hu@sifive.com, heiko@sntech.de, jszhang@kernel.org, shikemeng@huaweicloud.com, david@redhat.com, charlie@rivosinc.com, panqinglin2020@iscas.ac.cn, willy@infradead.org, vincent.chen@sifive.com, andy.chiu@sifive.com, gerg@kernel.org, jeeheng.sia@starfivetech.com, mason.huo@starfivetech.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bhe@redhat.com, chenjiahao16@huawei.com, ruscur@russell.cc, bgray@linux.ibm.com, alx@kernel.org, baruch@tkos.co.il, zhangqing@loongson.cn, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, joey.gouly@arm.com, shr@devkernel.io, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC PATCH v1 11/28] riscv: Implementing "PROT_SHADOWSTACK" on riscv Date: Wed, 24 Jan 2024 22:21:36 -0800 Message-ID: <20240125062739.1339782-12-debug@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125062739.1339782-1-debug@rivosinc.com> References: <20240125062739.1339782-1-debug@rivosinc.com> MIME-Version: 1.0 X-Stat-Signature: gds1tyrc1hmnwfgd4t8qouqkmkspjt5z X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4DD36A001B X-Rspam-User: X-HE-Tag: 1706164176-56326 X-HE-Meta: U2FsdGVkX1/Tj4FizW7BAaNn3jysxFaQSf8fN44SD+5BCdI9Cp7xtC7Hm+3Kd4gull0Yi8TSGv/HBZ5Y8GY1z6qEBFfpKfEYWYw2A0Xeqe0g1pcJKFEa6L1+rNbl64YE0nFItoI1oQ3TGW+WAk+OE55YPXxmyylXF7yL2qJVKujwCnsVhzzGsJ/9dHJJ6cKF2qphU8t1NzSWkt65jd6hBVVb2X/iHxbN6N8CiEFpuvXdWoEbkG8xb9PgL0dO1RMvHpob8D2j7y2ATMTF8ExdEPhZSYL5Erg/fkhuaRcqtwNuPTPLMAf49STtyzJzsxBm2EBRYwJBZZwzlUrUisSle7JB654n+x8e+rOOQdAECht7bjxba7o2HmU8hYW4c3XyHMUUpkMgBzO75S9Phae6qkmuB/dQBdH+6RexRlGufQsbDPOYN744BBOQ9VvPARa4bcH0h+Cex+v1T6MnuhH61ss6z0e89CURqC+sCQojJpFLMrfPatmdMKKARMz1aLrm1P/31Wa1JtHJi3sbfU7p97wMC8iR1KRopPtz06HVN0KmXB8faFkY8h2jwBf3j7rBNSkW6dmeBwusHLRBQcoarkCH2Oo9yksK8SFFXtAJ2ENvKjj0HXGZ7/PQjiAdzVoigdBTOmyVJpe0b847lgkJJrMkjef9M9ZGWuPJkHuha5fG1DGSwgbTsnGD7NCRXIpLBg0HBAWbupqeM6XJcGMRUCoyKwf03AC9mB8zNMWXxfim/1aSsxeItfLOx1MHF+t04hWoPEr8GkCHV4DZCP9D/HQeRwLKiXPEOFUXBiN0FjXfFtVgPcYGylKZKqaUMCqX2m4P8l4xYX9OQirTRGd50Oabz9hmpC264N/rnKOyGjbfaKyD+W7Ecl/BCjueYE1F4z/AJkKXcvhNDMrUAC52uibN03mfVmNB1vxGlG3MBcOYlK4KlMUfBdXVXhBH/wDnOnNWf4CTg7IKxPddepi caCuvvCx DhxNqXRdD4iEjtPhPs0+uojHJ2IjnzaxL/1XhE20FpXTLjQJMZoT8N+cPyO/PtZyVyBfQOut9MMtAV6Pj07Cv4TsOXCW4BC9NXebWl5AlzP0Cu3ve3tM5zSLY284r0K+SqteqolcKoae8Ilvsl+GqQbfj12kBbW8M5bZ40hO43zR11kHCc9teiCYTLm/gp1xvdULqVY25pNX1ykXF1bZFzTxp0w== 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: From: Deepak Gupta This patch implements new risc-v specific protection flag `PROT_SHADOWSTACK` (only for kernel) on riscv. `PROT_SHADOWSTACK` protection flag is only limited to kernel and not exposed to userspace. Shadow stack is a security construct to prevent against ROP attacks. `map_shadow_stack` is a new syscall to manufacture shadow stack. In order to avoid multiple methods to create shadow stack, `PROT_SHADOWSTACK` is not allowed for user space `mmap` call. `mprotect` wouldn't allow because `arch_validate_prot` already takes care of this for risc-v. `arch_calc_vm_prot_bits` is implemented on risc-v to return VM_SHADOW_STACK (alias for VM_WRITE) if PROT_SHADOWSTACK is supplied (such as call to `do_mmap` will) and underlying CPU supports shadow stack. `PROT_WRITE` will be converted to `VM_READ | `VM_WRITE` so that existing case where `PROT_WRITE` is specified keep working but don't collide with `VM_WRITE` only encoding which now denotes a shadow stack. risc-v `mmap` wrapper enforces if PROT_WRITE is specified and PROT_READ is left out then PROT_READ is enforced. Earlier `protection_map[VM_WRITE]` used to pick read-write (and copy on write) PTE encodings. Now all non-shadow stack writeable mappings will pick `protection_map[VM_WRITE | VM_READ] PTE encodings. `protection[VM_WRITE]` are programmed to pick PAGE_SHADOWSTACK PTE encordings. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 17 +++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 19 +++++++++++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h index 4902d837e93c..bc09a9c0e81f 100644 --- a/arch/riscv/include/asm/mman.h +++ b/arch/riscv/include/asm/mman.h @@ -22,4 +22,21 @@ */ #define PROT_SHADOWSTACK 0x40 +static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, + unsigned long pkey __always_unused) +{ + unsigned long ret = 0; + + if (cpu_supports_shadow_stack()) + ret = (prot & PROT_SHADOWSTACK) ? VM_SHADOW_STACK : 0; + /* + * If PROT_WRITE was specified, force it to VM_READ | VM_WRITE. + * Only VM_WRITE means shadow stack. + */ + if (prot & PROT_WRITE) + ret = (VM_READ | VM_WRITE); + return ret; +} +#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) + #endif /* ! __ASM_MMAN_H__ */ diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 294044429e8e..54a8dde29504 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -184,6 +184,7 @@ extern struct pt_alloc_ops pt_ops __initdata; #define PAGE_READ_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_EXEC) #define PAGE_WRITE_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | \ _PAGE_EXEC | _PAGE_WRITE) +#define PAGE_SHADOWSTACK __pgprot(_PAGE_BASE | _PAGE_WRITE) #define PAGE_COPY PAGE_READ #define PAGE_COPY_EXEC PAGE_READ_EXEC diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index a2ca5b7756a5..2a7cf28a6fe0 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -16,6 +16,7 @@ #include #include #include +#include static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -25,6 +26,24 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + /* + * If only PROT_WRITE is specified then extend that to PROT_READ + * protection_map[VM_WRITE] is now going to select shadow stack encodings. + * So specifying PROT_WRITE actually should select protection_map [VM_WRITE | VM_READ] + * If user wants to create shadow stack then they should use `map_shadow_stack` syscall. + */ + if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ))) + prot |= PROT_READ; + + /* + * PROT_SHADOWSTACK is a kernel only protection flag on risc-v. + * mmap doesn't expect PROT_SHADOWSTACK to be set by user space. + * User space can rely on `map_shadow_stack` syscall to create + * shadow stack pages. + */ + if (unlikely(prot & PROT_SHADOWSTACK)) + return -EINVAL; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 2e011cbddf3a..f71c2d2c6cbf 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -296,7 +296,7 @@ pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); static const pgprot_t protection_map[16] = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READ, - [VM_WRITE] = PAGE_COPY, + [VM_WRITE] = PAGE_SHADOWSTACK, [VM_WRITE | VM_READ] = PAGE_COPY, [VM_EXEC] = PAGE_EXEC, [VM_EXEC | VM_READ] = PAGE_READ_EXEC,