From patchwork Mon Mar 10 14:52:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010141 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8940522FE0F for ; Mon, 10 Mar 2025 14:52:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741618373; cv=none; b=XJ5QyUbCU5OGCViD0OXsog7o89hRFFgjAPHz4v0Tnb/8E6GZP5PdHOh7WRQunqvyhQmv1CvtxktZOSlb0ueyDhzXYfJRaa3Sf/qiFoJbN81TGFcZcDCAT7lkimd/JrPA0YQIzk2FSt1LzVGd5alfOx3OSkfxjk01WZ7ZgMu5JXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741618373; c=relaxed/simple; bh=VGYxjWQw4QYGSfT3AnAkedt5HRuw2tlx5dJCnKUawWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L2yBps/6vsqxAf4Kmf64tz7K7plzvyK24n6D7BWPsoMM7rZv9a840ZFZI8jOeubPgD1B0MBID9GlpREd02Zm80m2BlxlIqGcLO+vlMygY4IIr6ZX7Icn7TCbmfSQMTyCZj6zNLNgfXA1SPTAzt9lB2xsipzNfOF4gMT4FgHpt5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=oc1s/WCY; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="oc1s/WCY" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-22409077c06so10323335ad.1 for ; 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=vger.kernel.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=oc1s/WCYZRpnVyFozEO8JkLT7a/d9l53T015BjY4bGVFrZrfX7l0wLxzZeeBFrmEaN qLm2gSBxCbttdRqkiIg32bsbrOfwXAdXPhDKlTshunkV2KtrufBxbKTyWdPryJNUwHsU MFPhz4EZVX0KJfZ1ycLZ/SxkIEr7i9u6zrtd1c/V6a74x9lararexA/WTlNp7QZLTX9a c6ciXdtgNvSbH0v9PqKBaMy0KAEUkJXLK+nGpbQBIHtc+/qVZ6pHXlR4elVQArkSngp3 ODr8KoS0BzLiGxIroIlf5qDx9Bdzi8vZiUEbE8FQZf8GRqNMc3iE6iN9dSr+vzCf4tb1 nRlQ== 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=mCD3l2wgSLhf7wy86O0cePm3qRW32sl5dRfoJT5ok7piUfLP3hWtOCw4AoOuSDgn9Y 2ZfHWPvHTuyuIjI1HQ54UOfQM+wINiH2Z2oqYkHhv3rMSFSxl46IAhpd1OsCXAH4jVUX dWYgBpoaL8cMGCiMo9YMtD1qFLsrrvhLh5S5L0j59cj3/L3sQ8Fq8SBwOZuGXPKoQgKt oHyIaf8amoYolnZvkKbna/vWEPaS+ZsJxvWBz8APIA9fd3SBIUbdeTgtydegaNpdecu7 iKkg69bxIEDCDIvBfA+SOwPGrabkPMDz84beRqal3zBE06QgCaSb0ork7rptwmOoA2MH AZuw== X-Forwarded-Encrypted: i=1; AJvYcCUnucP/T0iWy+EbEqtkeQrqvhXBNv3FmdVFj1LWBbSn90gvQKKKK7HaRYgrQmYPAt2OAcPtMZefAmo0VUvrZTA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7HS3B1kcNW1PpVboUucRfZ09bP04en2cwK0SMpqswp6bbAhkR LgQtFggcHYNZG0VWh6s+o9+/3/9Ex4m0jyCEKH+fsZNk6MSKd6tD1HjuSY4h9to= X-Gm-Gg: ASbGncuPcSCKeS5Sael8J8dUHaSWmXpI1tgtSiO1ZhkRQbDfKaIf6khkzr3ndSTXbI8 TfpiMafbtbhmyFNvmZzVtup3czlPYctT0zYRFzPBNlCYFdTILFguQsoRycvAydJAZXHARb7MiEt Q1oU8F65oCYXPNF6RDIx/rNjoUIKPSu8+I/vyz8ofV1kOXMbT4ZyvdBv81QQkroxWBc0aqjesVR kHtVowK/jrgcrhHf93pi7MALK/bfqXBSACKwCMQjXyNzwQ9T8t7noMSHhkdyCxpcllkr44iMdfV CzrF8CpdW1RJ3ww7pMrHoaIlAQk0IBVx6fPvMRis6FGIuAce0vWvd7A= 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 Date: Mon, 10 Mar 2025 07:52:29 -0700 Subject: [PATCH v11 07/27] riscv mm: manufacture shadow stack pte Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 , 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 This patch implements creating shadow stack pte (on riscv). Creating shadow stack PTE on riscv means that clearing RWX and then setting W=1. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 10 ++++++++++ 1 file changed, 10 insertions(+) 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)));