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 4EC63C369AB for ; Thu, 24 Apr 2025 07:20:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1C7D6B0023; Thu, 24 Apr 2025 03:20:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DCD906B0024; Thu, 24 Apr 2025 03:20:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1BFE6B0025; Thu, 24 Apr 2025 03:20:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9FF526B0023 for ; Thu, 24 Apr 2025 03:20:42 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 20F2012078D for ; Thu, 24 Apr 2025 07:20:44 +0000 (UTC) X-FDA: 83368090008.09.8906DCF Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf18.hostedemail.com (Postfix) with ESMTP id 3B0601C0004 for ; Thu, 24 Apr 2025 07:20:42 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=d2gTX4At; dmarc=none; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745479242; a=rsa-sha256; cv=none; b=pykKa1CBdJekuzH6UHXag2bcitFCUOfwZj9KQR6rRM+V1uzXg7nM/zAsQlL70bZOgGZuLC XAnjF5WbC9KZVb7Ky5kDKZIo15K3rp+NATUfy7eUGAnfdxPe6hw40ApFL0h0Lp7vFdGj2P 2uqWBIeODpKuTkeT1cZYkGXA/KXAL8c= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=d2gTX4At; dmarc=none; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1745479242; 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=G/Goa1EjRMhMYP+WkV66b5KUJsmmP9tsarYQyV6WOf4=; b=sVDGx9BZ2d1DL7N0DH4w76G8B+4MkDUZ0THkkhr/e5JT/tM2OZCd5cP1KW33tp4j85hZ3P riiH+l+xFUhxseFdoWvGfnRiaA5IVNGBTxD4VTCxvVUzwfTkGA99OZFw4/zg+5e6chUMx7 eD2HQaemee/J3SmDzLnQX0KfJgkByCY= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-225477548e1so7567935ad.0 for ; Thu, 24 Apr 2025 00:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479241; x=1746084041; 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=G/Goa1EjRMhMYP+WkV66b5KUJsmmP9tsarYQyV6WOf4=; b=d2gTX4AterWl2zWFEslF1WxWId6mmUclRYRNslZYr6D81rLNI0RaD3DIwyPinKh5Cl n8VPR3auHC4oZ65r/Sc9qq3QnQMFIUUIMwIp60C8vUSZY6kvujH+yXVs+z8dW/ZfdTR7 C/umfnUqGRE4+fwLLn5tNuLcqB0O/tkmPpRQVa7qK4F2bfrtv3gDhNbkChx5WQsUmhNJ RJWUethYT789lDPuXrIlrIt+DXIU3JvT3RuukdkY3/oTbwvLW53GfGW33Ejr3P1vKlWt ROgVZPuiB/UM5UbOi3lKANuoh8cfyW1Fvtgmzi/xqu6dpKm800+6NLCzxoryWS3Jf9Ue 4bBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479241; x=1746084041; 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=G/Goa1EjRMhMYP+WkV66b5KUJsmmP9tsarYQyV6WOf4=; b=XmZzW413o0r/VCHFqeV1Cwgq9Nh6JtPXqWwBJdrcLQQ0pwHSUIYb8ihDq9SoDfUciH h/khS26CK/8MkfpbsbmrvTqAw5L1xuG5E1pMVQ/Bu7hsevFNAgZzI+NJuTS62llzCZJS zB09Pns+UmFV3B6VXH7CK9OeDhInfXO/zRQ1tEvmWi0YoC+cJUNkh57oloZ6LObbbOQx OMkIb6fLfkP6YM9rMSr5ocqFuBfcqJI8g3b3aJWjU6amcw554Mw+pyyt2DGh8v3wcvWW 4cSOedgahgxXyr5IdBK2vOm3GllRa64yN1d3w/0QOiHE7oDJmI6skd3nR1A4tjpxTZMs nPdA== X-Forwarded-Encrypted: i=1; AJvYcCW42goOSNhcM4iYukvqUGAOGtcd9c3RCSBW+kNOxPdnf8jehJI9JWdCCmAALqgnp+VUU2Dw2BVQ+g==@kvack.org X-Gm-Message-State: AOJu0YyiK1wi+G+AhQFxEMiU5ZQhFO+jQullOJ8+pe/og/TXmd6mVjdB OGGUq4eQpspvkG1+bzDUhU89RMpyt07ShZcTHe2A9m5J3vkgWEn4xtJ+cyTnymc= X-Gm-Gg: ASbGnct2Wrry40IbYwT7GcIPj1qDZWG5t3U0tXqDY76vOgivD9cNEfBlqPj+chhk7gW RoBABzA3VR/6n9+iZlQUa+PgmDdrhXlkcsqhXdYdymbkqgsKRAw0JNDeS7P7AMqlMCVTrGW4pca xO6+Qr0sdPxB+XpJb8jjRc1mMZ6pLhBZxQ8sWFxobsckjx0k6kEGTb2JU6WGAmeHcGK3N0HG0mq 2PXmW0VXMQu3XIvkJA1P9Lj2ny9nytl5yrhXwAs8zhz7VpDs5oV0VmhvGOMmNuZOUdr6m0cu7/H RzEAJHvGS8N8FW6h/fAFNuFttnblW2GCaOeKuGpm/evYLCpnyCM= X-Google-Smtp-Source: AGHT+IHGQONeYwe6rCGGDvdBBnxZb56XcTy30LZCFqBZdzOtbasMw4+9bklUieVmjk2kF6VOl9nyTQ== X-Received: by 2002:a17:902:cccf:b0:22c:35c5:e30a with SMTP id d9443c01a7336-22db3bf1a0bmr21191755ad.16.1745479241085; Thu, 24 Apr 2025 00:20:41 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db52163d6sm6240765ad.214.2025.04.24.00.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:20:40 -0700 (PDT) From: Deepak Gupta Date: Thu, 24 Apr 2025 00:20:21 -0700 Subject: [PATCH v13 06/28] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250424-v5_user_cfi_series-v13-6-971437de586a@rivosinc.com> References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> In-Reply-To: <20250424-v5_user_cfi_series-v13-0-971437de586a@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-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 3B0601C0004 X-Stat-Signature: cqkeexw1f8oj7uj7qarg96651whdq5qf X-Rspam-User: X-HE-Tag: 1745479242-228181 X-HE-Meta: U2FsdGVkX1/Wyrl6paapduJn0LvhGH2STKrpsqEcYVvIJRqCOAnc7xlmS4xQQS5MH2eztnNdZtzTRqum15YIBsqu87cqD4laKQPys17UHtbcxEFUQFMvauZRKbcAuxPYpZP3q4ePtPQuS3KJbzg27BE3fO0D5nwfeoNa8BNhnNoxXbG7vn+VtBP8QTPqiCao4W6A1jseAjVz5aEDoMjCgAiZYM5b/TvVsawVldXCbBHTbhV6ZhCTGqUBmPc3gKWe+LX5XMQ+r1wAjBoOoGv+UhIcR8TtbhpXhqJYe/k2Wte/UIwwtdPnWpz2ogvwpFixdALF4myPVNeWbvDxoeD9wllNt37pcyoozpqdMzkjJCfs6XNGL+ulRkWCjI+rr50sTnCpUT4zc5jMP2l3HbpRffqNIFXxY/l/p/+y+TG1A53MKdUgNv8ewvU0IKw+EHQKpm/OP/aOphxTpEmgME8WqRern9PmyAIngj6HTbcSyzoxwDADFgmeTFlFnvO5rZDwCvzrMgWTiGYc/rZIclQLqPgEX1eeWEQ/IAAqFolFnf38Rn+OJ2DL8wb96NOQWvwyFAt64OGMmimgloxK4GALyFDaF2ed2QNo4sZNpfDlBhcSbHZVRhrT6GTWO8yp+uRA7J6StGkDXF9s2DhatiHE7iDJrjZkccRjsRZGbNPuCDUGzIhWXcViOKXi1Pzx4q4V2VO1Veb0nIHCfG9NYIW28BT0elPqog2PzuHYtuSwVL7szUXuiI6y0iLX6ucYG3H1pYDNV5EBJaujaNJk49ElUZRMQM5eKZw9ilEvIo2aM6A9qpfZ5iGHXBGOUBVDI+ngmUEvv7hRYs+TZRTkTXO5owrN+pZVuVxOTsDFDW56yZPOEIAaSomXTaFn4uglGGdhJ0vldNiE+4Soy9py9pQdnB3BNZHPA/TX8MaXHG2L4nsLdYiaVAmDX1rPIfQc9YNi8PA4knRiIhTsOyfP7Zj ElDG3DWf lGhCl5JGECz8rsliXNbFIHSP92ADmtkBn3/azcaKAcEg3kPN9B7RXHV/a3SAtOUAHP67d5pmUU2KjSRppsvWLc9PEkPfJjq2ZDjwiZEF1LILUCM6anqgHSy5mPo6qFZfeMCD02qRbRYPaXHAxivlWMo9ViDnEx3c3qMeCyiXqpg3Ld+bIumki0haz8nbqLVpa/moEotF8HiHeGh1n5ffRUTFnaThQHe+NDhQ//H0QpNt+xYZ3yfNYUktErqqTFbkbH0OnTgeaMjvM8sbS5YpVz/9RAbzsvX+kA/VcWbGdfNFzo2id77URTdld7vWHrZponpR49ARBn8AuyGJHaYcA/pwtMNv5oJC5wMmOmBGCsnY4oHVLK0GMmyVZo4f/RT4AIh1SmwZXQZ8wotiDE4rqUzDf2WwK97DcNyVRQjCoYN0IKHbG7UVjyG76e6/OY8rxSTlSLIdj/q29GULImAsYv0nlFtTWv9uSQ2NXUyStkhIMJk7uKyeah5MsftkA3ZJ/ecN8tmGebMotkL8Ae3U1tXxKFxQ+5IWxVGe5VBt9UZotimuoDnY1HLkytLcKs3PwKc3c 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: `arch_calc_vm_prot_bits` is implemented on risc-v to return VM_READ | VM_WRITE if PROT_WRITE is specified. Similarly `riscv_sys_mmap` is updated to convert all incoming PROT_WRITE to (PROT_WRITE | PROT_READ). This is to make sure that any existing apps using PROT_WRITE still work. Earlier `protection_map[VM_WRITE]` used to pick read-write PTE encodings. Now `protection_map[VM_WRITE]` will always pick PAGE_SHADOWSTACK PTE encodings for shadow stack. Above changes ensure that existing apps continue to work because underneath kernel will be picking `protection_map[VM_WRITE|VM_READ]` PTE encodings. Reviewed-by: Zong Li Reviewed-by: Alexandre Ghiti Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 10 ++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h new file mode 100644 index 000000000000..392c9c2d2e78 --- /dev/null +++ b/arch/riscv/include/asm/mman.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#include +#include + +static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, + unsigned long pkey __always_unused) +{ + unsigned long ret = 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 050fdc49b5ad..8c528cd7347a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -178,6 +178,7 @@ extern struct pt_alloc_ops pt_ops __meminitdata; #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 d77afe05578f..43a448bf254b 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -7,6 +7,7 @@ #include #include +#include static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -16,6 +17,15 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + /* + * If 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; + 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 15b2eda4c364..9d6661638d0b 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -342,7 +342,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, -- 2.43.0