From patchwork Mon Mar 10 14:52:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010196 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 3A954C282DE for ; Mon, 10 Mar 2025 14:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AA1928000C; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 636DD280001; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4372028000C; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) 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 1AEF0280001 for ; Mon, 10 Mar 2025 10:52:50 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5CB5E161101 for ; Mon, 10 Mar 2025 14:52:50 +0000 (UTC) X-FDA: 83205933300.17.2B54452 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf12.hostedemail.com (Postfix) with ESMTP id 59D7B4000E for ; Mon, 10 Mar 2025 14:52:48 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ev5id0sK; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741618368; 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=ECr57nSBvQ9H32BOlGG06RPAOw/lfdetcDGXuE6+IbIzq965WFFXQ+2NfGfWxbFDqzqrgT pLNhEJsA2GhcGjMSiuiWyM6QnAo7awk01e+EPg7BuMBq45RPitogNUOZ2XfhkbnIdiAQFl L1mLSY2aUuHKQjzSojeqxqCroHVyjkw= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ev5id0sK; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618368; a=rsa-sha256; cv=none; b=0+W0mJKpRxMVwpOyKTUAjWAJtuHTlhPCanhwB0eYqB7ZLTyq/Lu+zT9nJHGXhGP8rKz09Z pteyNQn1rHmjZpcw2DCdQF7HN+sC2mTlPH5ctskI++SvlzTiuCm65DXVDf06IGncCG6Zwk xb/Z8JsclEjBA89hpPLpDCKpRjf88lE= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22185cddbffso95162285ad.1 for ; Mon, 10 Mar 2025 07:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618367; x=1742223167; 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=ev5id0sKrVTmgcyLoDpoonm6ltNj2IWJpU+DEJA8imtVuJc8gqxt6qu9HckHR/no5N tTkpYxtMJV51Hxpk6laHPdFWQUdcDbN8crKFwhGxd9XM7/Ywr2jr28UDU9YBELlwfONO D994PIxvi1eNRqZIKeXgrSAgYYMv5ihTErSW8NonOChLcswKzpgcj6urCnYj0erCDwB0 Eyvg//eHEbUcck8LzBkkvGx8uPE/0fWwnmW+GiarBu07thM28wj6rCv3Wmla/Zq84rGW V6fvdHbFie1nZQw4s0A2UkjAMAlNAQMxos5azEojkpY57H9J0dE4YYTtN2Bv+Dp9SF2Y u+lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618367; x=1742223167; 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=bceFhl1A94XtbBbss/mqLiKc8itos5FtIwhG8FPm0dOb/cnzqEXCByyb1i0rnNyn2B 1xTCvgBPXPmwQyZxr2g3nLaKKW4zFN/lvzGZ/I9Guhd1+5DgpqcWZoYutiIX2amBO7pY DaBS/dQJKjaMZG8IG99DqBHT4OD8kVe1pd49tylrbBhE7J4NxpsJYGRsmzlEwaVBDAPl lHDZbW6LmygdOHn0ArmnXA1niSyV/DY4wnCcs3OMnyLjpJ3kL0jeM06Q2+hVvZFz9SSj obe9YmVT2dTdK4qRxnrIQp9o0K8edMKmDixim3ezMQh3ALGER89ySxZysHigz7OFV32s HH0Q== X-Forwarded-Encrypted: i=1; AJvYcCWyZHxThh8ADkT6in+L4VEfJgf8x3OoabbDzowekaL0beEl6pb3Hn8Rd8p53sM/z9gWWLc7c8aPKw==@kvack.org X-Gm-Message-State: AOJu0Yyw7eiwd4pglktG2PmOSUpzilYIVZ/xg3otowTObDay80KKAcl7 L/SCZIEwQ84Bqx42R/axaOxH1DNXW1ecRX52N1TThDlaKBxNabXEFazlXha8OXs= X-Gm-Gg: ASbGnctG8zw1wH8vCPd8Oor3WQgDeS9/q2Ia0YNv4nq87/fvrsUNLSPO3wqNlu3a+0I okxYsAYeK7OgiqccZmjqkY62OxRIibwvzu4mqLcBGg8YYbiwU3q9BK0J6ygx3CxL1EFjKvbIRi2 /KXf0sj/U8DbdPo9RH3VZjo7GyNV40ixKAwSAMtARcXwqSTZhThKZI+rAhFE9MhB56uua+7Rqh9 TYNAxFHbAJuyhxZP7GB2ZDtX+e3VTY4ExMSv3IDJaZSDZCHj9T9uM97tfyWbMwB4b36QBSzVOIH UQg/FGmSt4whKarTlkrResMWziaNJLaGM0UoTXa68V+ktTXZineyqO8= X-Google-Smtp-Source: AGHT+IGncZQFemH+Tqb/7Cg0gaGakZGYufPeZUJHTPz51xcsHifa9ayQ0v/V99iUl8be0Qgt8Ur5MQ== X-Received: by 2002:a05:6a00:8506:b0:727:39a4:30cc with SMTP id d2e1a72fcca58-736bbf433d9mr12618993b3a.1.1741618367246; Mon, 10 Mar 2025 07:52:47 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:46 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:28 -0700 Subject: [PATCH v11 06/27] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-6-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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-Rspam-User: X-Rspamd-Queue-Id: 59D7B4000E X-Stat-Signature: p4chyss5sucbyrtauzzxm5xyib6jbm5o X-Rspamd-Server: rspam09 X-HE-Tag: 1741618368-22356 X-HE-Meta: U2FsdGVkX18IT/gc3ebLXu+B41Eyi9pnTwyjvoF73J2QHGcCPz5Da0O99aTUnQ7lXWXvmsVZ4pMRIinG22XBP7UhLPBzs+ktrJuZhMF33e+DO2y3XdMIB+v7f8KqUueHxrR52ddMoDmsCRqaZDbwAxxoQ+c24IoBdStLw/VqPeGIaYoIuiiLIDC3gZpwBsCEEJAlabqPTDwB9i4EyfLhuhkAg+S4Isz7NhOEUPuZrzitLxnDyTBZpdprlAjrMnSaeynlgSrmKiRLoNvmOfad81jK28b1945vZ91ZG20ql+B4Rccrk+WNggCyyyczMfjXzNUVSTxCNKw8e9tHr3oytBz0KFEte3ekhvQ+lWyjlGlqDzv/WW0tryITokuICgo1Rpie5LorrxoXZeUrgKiEOxMs/fCYTGnMM+/N7U6uU3DgQ/ZnLz41sUbBAXFb9fR4y8NZFVzet4uVe6KbKwvmyje6dQPo9dscOJqZ8QbDECg/ItSchU+17qCrRXGtcptpRkPLT6oYGCf8e9p1KB50HTeuMBCOBX60tqgI1rEdzpVQhOPocuUDXZVAqf8gutDGdmOJsbziZaIsewwAIx33vbsHjRIbBY87aiu0lblRdUCD535wF02yPOHaPy3oiQLkluvg8kUsMWFNjrkCQO4KlHR79HbCmxT4NGSXM4MpbgRa7Mokc2kwdVjiK7j5Dn0zezUyI7buqkyzJMBq1ZLmBH+ToOOdb1uKzVfBaQwzMqgXSi4hzdW3ECFTNyxN6JjISQQc2uJbTynskWwrnlMCNwdpKYC2RnPHKk/bAUehuHO/YZ3Qqd0CegM3T5wz3UYHmC6uIDSW63s6FgST23KxTpGORhH1+napmhRIFxarmAiHl9Wbni+msM4XRy9IsTUkWV35T2+EGvxu4KnkYua2nKyKCAuIH91ly597wIYHus3ST6aTiNwzL61ijDp2KhcZYUVs7ENrKlNocYv3Azh aWqN+Ovi vfbMercJYr4Qvsjg91p6J9141uRwNn6MplnMkyd9Js2Gd6zue9+Dp9iFF2AYu9J+NecNz9Pg39IyHqejI1seFokk5eqs2Xe6uVJxBtaoTod0zFD8k7MKLHJ2ujS/y/ZpjKRE+YJ8KduNrOzUiHU9xcqg2usstEGfhIkJdudcEhwXzEmEGsxDMj0j6mlngqkGNY51B1Fseyp2swYFk33lSffWWHnA2BqWo4ruxvGi/scPjUevFI7x0KDmuOSpdWQMemzP+dLvG6MqFCpIYFANwpSu7SIIArdEglQrGEUkHr2i8okbScwp2dTuH0mSS35Y0DXS7SVfSSlp/uSJj/Vnl/yFwKfzKvAVn1728KX/NoZWoVf9MY5noncN+R2YYi5kJPVnt+4Ei1iSt0HXWdXg+E+edmdJ6/VDUu+I7PJR+ChVHXV8QpQ+BQeEch2xZp+w/jXVcCcKHPPKXRXb8BMd8e6G+WbRc0dSw+cyisap2fWtQSQQ9aPmTZCP2RuPeEuIEUARE+nciN5yWrpEkF2+XFHMztm4kiOPE09SD/SxjcbO/W5k= 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,