From patchwork Mon Feb 10 20:26:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968606 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 2CD28C021A4 for ; Mon, 10 Feb 2025 20:27:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42E3428001B; Mon, 10 Feb 2025 15:27:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B5AE280016; Mon, 10 Feb 2025 15:27:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2312428001B; Mon, 10 Feb 2025 15:27:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DFBC4280016 for ; Mon, 10 Feb 2025 15:27:11 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EDB2A120611 for ; Mon, 10 Feb 2025 20:26:59 +0000 (UTC) X-FDA: 83105168958.24.B2CA6F9 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf19.hostedemail.com (Postfix) with ESMTP id 0AAEC1A0006 for ; Mon, 10 Feb 2025 20:26:57 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wD0DrXYV; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219218; a=rsa-sha256; cv=none; b=POIAqQuPx9222frCQOeX5VVM1N4+np9eoMmNrgyrZYN/YnXHjEbqEs93S9Vci7crLDEnNM EMo+1Jo+eg6yZoDXn9Gvb60p/kysFOGAuC+/bsKLKbCXI9BaSV9AyXHzE97s+lGrRAcKED Lpyyi+RqD5gTXY7hGPwq0kGClTbxAxw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=wD0DrXYV; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1739219218; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=bdUJKQKLIVfTCwG6RtKyzfaIXzfHFp6oKXvWkdI7q9QnjicIaGz2emnIiDGc88eaIv1rtY MsPtp/oVfJyg/ks6KF8faMSVZWgMGXfdaRxbq4ze5dDV9ph+XhzJc0VwOdJuQMOmABmSFC ni3A1iaKh7XZemd//L840Om8aaO6ZLM= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-21f573ff39bso66562185ad.1 for ; Mon, 10 Feb 2025 12:26:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219217; x=1739824017; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=wD0DrXYVdxvr1+kmovLcjnNgaodcYZQNaeUt5Gw8SZxXFVMHc2nlVbWijaZikmNKBb op8UoUMu7vFvcTLLoGGl05vGq8E2ZVrXec/S0OuEZqQjonrDb4HSiI+AzPi7F5+Yn8Qr 45gil4GTpEQQOtkeipjLbKgZFTWjhyovBd0QWq1rrgjBqMnLBjaeLdJZuCEcyuvXAXnt QK9Qz3uakl+ai4frOmVY/34RscA+IV2sU+AF6Acw5m/Kfe/9qV2/mmUgBAJN+U/ykAbJ HCDMJgBdyS4QgKUeF8sHmQzwWCVXgCUff3AiUOHaQuFpaiouSHRLf6QHo4sUrMN1OcsT fM0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219217; x=1739824017; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=Aq8MRwfYovijQnxxmw/VYwtvxHNMkNVn3WFSuIOUWlU5sT9cTHcitj/e5gcIGaA1gz nuTpkQzjZqTVXsMCVUEyYd9DzKbNdE2/wlAdCOD9JU9/9nMOMpDRRYQ45IPivgSWusD1 kDIPYrDRt4c/Qzg4xWL4RMLLwN5dY43jctI02dCpMkod85uulvklGTY6l6fdeDJbV/AV aaNLlWDwXtut5l1vmAYBAUt+ZPqVh+A5vMBIfZCksGRCJVwFT05sBv2sRtU5sBbylEcA ddnPJUE2j7BgnhYMJDoEVRlpsGYtNeosE2546YhxOFjVnoaFqM+5fA6JEiAUBRKWiyt6 gIgQ== X-Forwarded-Encrypted: i=1; AJvYcCV7EfbNiANGqunqxW+PwkYFVeNrBugnfFwGmfpXouXbHsSJj0vjrl/bKw4EgFeHyktKSXK5AoJpvw==@kvack.org X-Gm-Message-State: AOJu0YwdWv38se7jgXzbsBSwh46VBnIzSoAZZ4pqN2RmQuzl1KP3tv4q kjfM9SpJwiOMMkWUDAQbpng93LPspYtwbAVTbJS+4hLG4YLHp/6EhvrOl3LIoCZ+LhXBQjMdvR2 j X-Gm-Gg: ASbGnctVJliYSRRk9Dr8YGLd0h48Oqli8M6APLAk0cc/yGN3WZg0mOpJosuRfbGkdsd E8/VOwtFzU2iIuiRgUZMydMPN+c1HbgZ49M7LabqJ7OP1SPVG/qKtX4DQTdpTtXkf5uIWFBo4bk RdVnmV8Q7NzsmUXH6HHIH0vxLqGCqfWM2wyXL+fK75wKteisZino7UHIPSD2+MUW8wsde5BSVF/ MqM6VF+L5wNxHEgY8OFiCbLCxGKy9jcnAE6f9rAmkoNCsHavKC/MKCdLRFKsvyVDYQXBwLweDZ4 WHglFBcrdavC96fKHiNQTap/dg== X-Google-Smtp-Source: AGHT+IF0tY5SNTXDToYW1J21Hspvgjxz/6jk5/bs6ru5UkSgBD9Y81K/9+zJgqpvYHP1/U94A96iNA== X-Received: by 2002:a17:903:234e:b0:21f:1549:a55a with SMTP id d9443c01a7336-21f4e1c8b5dmr268029605ad.1.1739219216953; Mon, 10 Feb 2025 12:26:56 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3687c187sm83711555ad.168.2025.02.10.12.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:56 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:39 -0800 Subject: [PATCH v10 06/27] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-6-163dcfa31c60@rivosinc.com> References: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@rivosinc.com> In-Reply-To: <20250210-v5_user_cfi_series-v10-0-163dcfa31c60@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 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-Stat-Signature: icq3g6f58nunpc7wxshj9jppwpwfy116 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 0AAEC1A0006 X-Rspam-User: X-HE-Tag: 1739219217-439438 X-HE-Meta: U2FsdGVkX18wlaq3Tj8LhMly9wZfMRCoERuy6/VjBBa9oPFq5I/FwRa4UXp/KKdvimb06bMMkRViXTgMLKbRSZe47hd+15yItZSnFMWv0i0htbo8M9Og/Bjpy8R935RnaDK7u3+p+jbU4ds7EIMhF0dOKDGeav+XBUoMy5N5tlYNuc7DNinzNvgL9tIOd1cH0Jv5L+YZDgN5C9eLYtYwnWFXIt8FODqMgbSSyUYYkfowbGeFSd1tyKrHEKm1wUL4U2HP37SFnabJ3YEbrS86aiGsUMyL82jq+Y40ygzKjNkb/87lyQnN5knJo4nSsIt8Jd4jtQhAauTzY0FsXad/ZXMz+bLhhvOD8VS0fdXxqgim029oVukwD+fw2HIDxgF2Iu5v2iNKI9wJaqPwIszJVj2wFjyTRHQyLwHqKqnNxzM3xjBtvgsuMBqxWXS/W2gGHPa+MNsdGb/v3IYSFNPw1NaEm+Id9hvPiR+eaE/lrXFtQW2f8JOqRuf+Bx8PvsNGSufA12wfy8r8fbsXTiYeVHPFUApYoY7XCsD2Sdkr4vvaAkSlrY02AIW0LHdnj+2IiAvB2glFjN16OtHJGDRK3q2t5lawEVQ6YP8j027nH88TqmYk9nuNkVBLYIhdvfoZZcaDwDiorHYhguHToP5WXdJpSDogtNVIr1/gna4HOg94Y8s9onNmoPMg+hdRB5XypS5LJ3NNB5GTEbQnd0iapPWiWU6ZiTcRpOQJ7kU9DNTMMRcOmVFuwEzEPt6xhS1DDSD1pw6/1LbZIXweHybbFRLUByK0zy6a50pS2e2a/p1LLd7hUFH01keFc4DCd5ztWbEKpJCGDHKjuQsST5LKIpz73ut7rX1k0i/f8laH14ZPtdsqaHg6YSMuxI4RIDH9r5lg8vueECIijsFfB3YtPi5d2AwbFzAmrXLkSgH3oFuKujrA9ieM3K2JEGKiaGe+YM28me7Kx/2O7QIaNKw NLj/fT/3 DSSwQHUM9HGErBCTacSojVlL1/SPdyMHo55nFEGBGUJSWpDnDbJGWzYg0oVnXECOKotqMbtJUtS/VqDWmlBKMrwtx9bg79sBe/jMEyKUNFvVyXQV8/4MfbBGT6+brXq0W98dxMrKayEOpLWt5jPnzOzZIZl/IbqgZTqsYSWq3C9R6h/ucjr8tO50kc6FYXWtg0BPsu5PpMA3PdkpHdxEr+dsJtck0m4mN4wn+Y0HHO1eDnfFowIN8+nIDADF+ds/Q2v2d819oM1DurVQgbik2uonT980rjbyeRNvnnxNY5rWXBl9Czxw0yCfygnCtsF3fFyGMq3ogQDtC9bQHMpadrXweVE8aF0wZYGzKZ/IIdeLDgRhz81TmXjhggKQvFDCiCqnjwsGp/d6DP1AoYKERtIuFWV1uUEN6Auup7x51rAwxDK5IDMhdkXKsA5KFxDPGb7zTnvICoe+Y+XqH/DkdyMl/NfVLGbJ2p2OU2EmxrERRSUP46odh5jde3KImeWR4muCJal+GXLidKGFo8oVSfliYIEszfBVJamBw 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. 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,