Message ID | 20250310-v5_user_cfi_series-v11-7-86b36cbfb910@rivosinc.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 4FF95C282DE for <linux-mm@archiver.kernel.org>; Mon, 10 Mar 2025 14:53:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4E57280012; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BFF76280011; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2A7A280012; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 81360280011 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 10:53:05 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BBBF114114A for <linux-mm@kvack.org>; Mon, 10 Mar 2025 14:53:05 +0000 (UTC) X-FDA: 83205933930.10.B7620E9 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf15.hostedemail.com (Postfix) with ESMTP id CAAF5A001A for <linux-mm@kvack.org>; Mon, 10 Mar 2025 14:52:50 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Dc+CXAyY; dmarc=none; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618370; a=rsa-sha256; cv=none; b=GsU735VXpvqFcQ2yMUuU5/d5EQSzXK18tCkSXtBpft9kiOSl8gS/yIi4f50eqoib03cwgE +J1x8DPu91vu/ITuv/hCCXNkWQjINGEUa9XD1YDdlaMYK10/0UtJi6B2svMErQYnZ+vdlZ cvZbf9mh5bYfnzPHmKC5qt4WZdbzStM= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Dc+CXAyY; dmarc=none; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 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=1741618370; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=XJIfxBbdjHF2QBU/43IezKw29RoWfdDuinC9I0GbX5ZkYw9B76iEMpBoUFq4hK8IbzybRq uLDZEpABh7vGBBwqAzkE0NXrexo6z+imcP7N+4P9EPE4ni1BryxS2rMFL7wCPYlopnp85A KsA+78aZRrDFvHdlps81Fj1K2hzr/cE= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22548a28d0cso11715495ad.3 for <linux-mm@kvack.org>; Mon, 10 Mar 2025 07:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618370; x=1742223170; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=Dc+CXAyYBnfsai/DRJNh25aYy7e6j/A+Z9VgXVboro20tg4fIvM5JFZxlgY2LQmKze XvC63MIuSpn8uHnz3u3gBpikEmmmrw3XN7WLmY+6Fat8i8Tp8H0yNDXYa3ZVm/Zrsm39 urUBfVp8EYO7O18qSIMRO8n7UCyG8tShgRiIrZ1WKX4eaMLwPB08XpBLjwNnB7pgVUmh BAToSWYEYeIMdHnhRYTp99aZvOfQ+JrTZxwkFJu1PF7y3C+7np2Lhf7tU40GIsiyumlx cUYM21LsHQFt2ztfHAX13HVytaTquAVsErrVcgUp4M4H2COhporJ0fReVXySwyeQZUUN t1Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618370; x=1742223170; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=NzEo5kDTqwXezGB2Da4LV/iDDkyDtzAGjc+sETDlY6CbQohRwXm8ZdPhOol9NkIqat F8xFfG0zq6qEh993vduZOV1XyPfxQECxnFcR50bAGH0k32lWu9TgiSpp0Xr0P3apKYDb +4R8BVrenhodquDgOpYRnCZPVd+W6miX2Ka9iUmAkXrKdIlefZsO1uI5+ZT7TQ7EuuZE Y0ghQk4Pw2ngkLBU9GsbuwZg7LV2gACs7Ng52N7MrMrtkCf2BgRhgGyRtaIbPHWXP2Hj 2/wkBPCRRxgQaAOVYZTFcNyLeesojMO/8hwNDg2MkeRn0lZkSgHVMVnaXgRClmiCgCm/ ErmQ== X-Forwarded-Encrypted: i=1; AJvYcCU/oG+PvdW4wL2km1OA4u8ULzlBEr6q5W70TNAWIW9beeLPjmPxTVEP20i+3mvcsqjSNLlVN5ktEw==@kvack.org X-Gm-Message-State: AOJu0YxxFYtgEluMaLlmp7lxXQ6ewxwcOCvkp2BYdOiebCcA/T+rVPsR VSg3nNtHdeAjgNwr+qLV77fsS+33j0R7BqrLIpih6HlvnT3eM5CkaV+vmhl25Zo= X-Gm-Gg: ASbGncuuAykObW2xhDJwqYjicRj5vCYuucxCFUcWv39VQ44cuz0pzvsRJVDRhfiQP0m i3QKXj0YPUJUh8DVKV6WyXd88BKh+2F8J3oWcGeIb6ECCEGp7uwokzfqF403YvBbpXgy1mzAPDa rJ2+9uql7n/HZUIiIU8haWXl70icn8WoaKGpvK1FKqW/yEbkjuhWzn0ec23u29GNdqdRE8IAcLT KvPeKHgblSUFRG+L5z3Nw38KGihm4B2bGOMZBcgqgH7D7Cu58r1SP30BrUKim9QvOC3R2uHOM+S RTn9ogEI3cUP9wIguBcQvYShrovqxb/A7KyfyioGGxw1yesFe2g48ug= X-Google-Smtp-Source: AGHT+IHIjPCK5/0EhbZcTRnURyZw0NTj2K+W71g/3+djiMGOR5iYaRFLtirQywnmf6SGr6Tob6ydqg== X-Received: by 2002:a05:6a00:218c:b0:736:562b:9a9c with SMTP id d2e1a72fcca58-736aaadf10emr17282132b3a.18.1741618369717; Mon, 10 Mar 2025 07:52:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:49 -0700 (PDT) From: Deepak Gupta <debug@rivosinc.com> Date: Mon, 10 Mar 2025 07:52:29 -0700 Subject: [PATCH v11 07/27] riscv mm: manufacture shadow stack pte MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250310-v5_user_cfi_series-v11-7-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 <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, Andrew Morton <akpm@linux-foundation.org>, "Liam R. Howlett" <Liam.Howlett@oracle.com>, Vlastimil Babka <vbabka@suse.cz>, Lorenzo Stoakes <lorenzo.stoakes@oracle.com>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Conor Dooley <conor@kernel.org>, Rob Herring <robh@kernel.org>, Krzysztof Kozlowski <krzk+dt@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Christian Brauner <brauner@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Oleg Nesterov <oleg@redhat.com>, Eric Biederman <ebiederm@xmission.com>, Kees Cook <kees@kernel.org>, Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>, Jann Horn <jannh@google.com>, Conor Dooley <conor+dt@kernel.org> 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 <debug@rivosinc.com> X-Mailer: b4 0.14.0 X-Rspamd-Queue-Id: CAAF5A001A X-Rspamd-Server: rspam11 X-Stat-Signature: dcmfuzqhm66ofdam1ahcqo1gg1d9xtmd X-Rspam-User: X-HE-Tag: 1741618370-989931 X-HE-Meta: U2FsdGVkX1/nXcoK6jcz5NBbX8csqoFt1Up7eRA63wVSKyIK0nZh/5+PAoM//w1Z6gKkOTSRZXHR+adykqOIiLkk9yfyVfRd508EVextZwIUZjYgDmElJ1Onl8S+SvvwRxgw01UcUhB9DGwNDLCZewlRcsfj/E1SVPW5Xs8grI1GyfwvgIbKqPK5dJINrIgIa521pMEfFmZejhFFDRw+qsM0AP0wY4dyi4ZAQVeYI014LegXN3YbyyzEqqqmJOkfCYiGtH5n7fbJj9kUWbOEmG31Vnbi0m2hjIl1BOD2fblhdmbRYZS6wFd17EWtIAQQ/+fE9++yIqWI1vfvQeWeUSrXaVVIuPYEPsg2AqI5pJGYiJRKcfR3IoQeAl/BrawSEjT3ZPda18IW9KNzVi4swRmSCRiBDCK4S/Emmhz78vUNl00K60BbzgmfzjZAlWfspSKjxbdsarfwsFtnlWhbkVHz1jcmeLYQHszLhlAVzZgUWdXedbYP+lzXJS3AeaCCzbyu8iVA27iHxgq3mmDLxNtS2nkEJanEjM5ShL5zCszpMKEHwFiR1SBOMwdkMaGJ+xNXCEhvMjCgpPnPF0YCMMenHGAHOElMB5zKs1OmYsZ/Jf91Mbn/9CWIk68ZCWnL1uh0eezmHgD0/ebO/UfK0EhWc873p7LuDXqB5obwBqTrCBe9bfTXPnoNGU3bffxIPq3OqvCbfI1pZMkXuVVAwlXEJX3864Ve+UdnfkRWDr4eX3OxwVWrQf1GyUz2PynWCnsHKRnJcHBT5ttq9dHiX7wjXEpveNVde9mk8n4QKwA+mQl9g+Qh9DzY0UrAQC2fE2iEemRYlWKhzjdLEoHSW+gEilOzsNNXQ6+AFpoAglNf8piTmjJgSi9NoHhtAQrI73jSOgyxC5bTQr+gdJGi9Xlcx6nf+UTIsSkU3ZAn9ewPdfRAcbnd8u7fzyBlVUljtNe8Ye4UZOC69frm5YI BpYEmxc7 Tq1q+Nbq6z3w2hL0eQFXMQkjlbphjuEo/bQL0JNZjz0umjjoqQao76dRo/kI+xh4K049ohdsSuhOx8cFZsELq39w4WnKAAsPUk39yiDwsJftLipvQizV+WAIMut4ICFM0uUpA1cQfdYk9ghJCfq09CRqY+rMDHAbOJOUGSQh+L7wjyJ75W9Iw/44fXPUmZpW621f6w7qR93XrJvNOHXUOjEZVX+Ki2hb/eEi0nvMmt4ree33PCgK7VANFxorc77S7Qaix81nOy+OrylIKO+PiA2jlMq4WbmSCYwk+gvzJNgoizBFBXYeticzXkgjP1zngXgiK7s1iJCkWVZiGsPhViEtzMlaBCMRqQAzmyVtVwyfdh8AKn3/BM9wBz2DCDaAcdKKGw0A7gKHaVK+K+EiVs3EPhED03DGUBn7llAyTQ+8WdMmKoB3bDdx7PkGP0gL7ZttxPuvJN0I7anQ= 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
riscv control-flow integrity for usermode
|
expand
|
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 8c528cd7347a..ede43185ffdf 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -421,6 +421,11 @@ static inline pte_t pte_mkwrite_novma(pte_t pte) return __pte(pte_val(pte) | _PAGE_WRITE); } +static inline pte_t pte_mkwrite_shstk(pte_t pte) +{ + return __pte((pte_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + /* static inline pte_t pte_mkexec(pte_t pte) */ static inline pte_t pte_mkdirty(pte_t pte) @@ -749,6 +754,11 @@ static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); } +static inline pmd_t pmd_mkwrite_shstk(pmd_t pte) +{ + return __pmd((pmd_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + static inline pmd_t pmd_wrprotect(pmd_t pmd) { return pte_pmd(pte_wrprotect(pmd_pte(pmd)));