From patchwork Mon Feb 10 20:26:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13968600 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 F2B10C021A3 for ; Mon, 10 Feb 2025 20:26:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87416280015; Mon, 10 Feb 2025 15:26:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FCB728000B; Mon, 10 Feb 2025 15:26:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 67785280015; Mon, 10 Feb 2025 15:26:55 -0500 (EST) 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 3FF9F28000B for ; Mon, 10 Feb 2025 15:26:55 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E38D1805BC for ; Mon, 10 Feb 2025 20:26:54 +0000 (UTC) X-FDA: 83105168748.27.40C0E03 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf29.hostedemail.com (Postfix) with ESMTP id 02B2D120019 for ; Mon, 10 Feb 2025 20:26:52 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TvHx3Qso; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 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=1739219213; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=KvnZECdNx29rPHHWBfoqubAAYJn4vomYkrIiuKdiWogVp6Xg9UzugQgt+xMxpDwQlTnWVU /pArx23RfT7DcPtFgty9LXzCkYNdnMwleWJcoEKBQumQqHQcLTsg+qfEqlfxGh8yLcpe7R z5bmX5c6b45HgiLXrPpLEJp05tJl0no= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=TvHx3Qso; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739219213; a=rsa-sha256; cv=none; b=hhuXLfqtjHsvE071dWd77Ukh4xW157mHmke751C+JEWReLpbX30xFXms/mAIIPg5GO0Hi5 RYSe0pNyf0TArkR+wVftcCSqm+XsF54nWy9ZboE3Wz27n/iNAoVVPRjgmbvL+5636VRcMy GPBWD0VLs4f6oTvpxGvKYB9M+2szC8s= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f55fbb72bso56897035ad.2 for ; Mon, 10 Feb 2025 12:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739219212; x=1739824012; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=TvHx3QsorScwsQTs5XCY4vfsf1qGFXDgSins/QAOTmDUpL4pNNb0ueATUZVhzotwLY 9ymZE7DftqWZthHEtQxhEdV1fOwNKz9nz9/9zNcr1Ty+Rgg/LJHRHIwx+BPw0rQuJfC7 Ffc+6XkeFxWHfrF0+L3rcFyyBjB3wUlyiHRr/0bILv+5leEkb4eTX9ryWZY6t1glImnJ izLpTrCUi9VzU0fGlgyKA6VZYZKsBeXKiQGCsl7nEQA0yYTHcEGO0p5vE+3fBnY3mKqV 8Ix0Zegeveep1GG985wSpHfZz+73x/8YoBBqcbCl61y3DT1KGIUjypgXTI9OTFzmvW2o IR2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739219212; x=1739824012; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=dbEaS+5UGmshfyx4qhWc/s8ODQCHPEqGO7/5vEsS29aoXNmBlgPARpET8n9Xw6ONGS LrvFB/I1gjkZz4FdCrauz6UZ9+b4zFDtYjnPHIoRkUbcdcl1be9wvbipHaNqHFMRDMTx MPNB/HGtImokMZ7rCiYlRFO1CQCC/Yb0f27eZ+9TqOer2g2+InIOkgDJ86z4GziLwQUg bOMPXg8v+3K3UB36j0DQpKfLwokadZNt9El1RPflIEfbtmsmrKEmhWXIa6h4GmpOkcoP iPEGHVjr2anYVnaru+btDAc8ZOtZjhBWMVRDTpmtlq0mnnGcc0xEMiL5QdBqfDGOS3m2 fr2w== X-Forwarded-Encrypted: i=1; AJvYcCWVMeQ92EsB9QYXeHpcBAQJeO26sB2bP96rAGjMo/ieiKrbdeAEJUcwSDRizccKHqq99UDI3UFgfQ==@kvack.org X-Gm-Message-State: AOJu0YwqD4/ZiYCW7cGC1PBl3+RT11rvh+/llHrtJzmxDy/0/X3yHfXF rNJDrJ3ME3GUjOh/phmpvjo31Sqhu8zosNocfcyh9XoX6nRk4zSTCEDqQ0UPVPA= X-Gm-Gg: ASbGnctxva+Paialt38IWOqUFPfNa4w6yHOczztqL7nkHQqkq68Qzh3xMLF++5GNZLe DzdTnGtDDztRic92p09VVyXfSEcSPtkMHTtDiRDGXuns0koBZ3och0FM7JAuZz9JF8Z3uVNIPWu uB8nN+iP7YpXVRtgP44fhxAsE28JDNtLZtjymzJPWrf1Vklyu47lddZsdGknNB0aAeoCaoTcMCZ x4ReTJqeSxn0KX6FMX5jihjduyQ/y8IF3J6hej0TR79vle7cBTGUCXq5LRjrdK7z9MZLlIgDf8q phtA08FkMrhUgoMctjfUvaUGIg== X-Google-Smtp-Source: AGHT+IGtT2BfpGC+pxbWvm2Qtn55Phvbe3Ks/NAXxmbZaEXtXhWUE3SuxobC1K+zZICcAG0d87INng== X-Received: by 2002:a17:903:32cb:b0:21f:dd1:8359 with SMTP id d9443c01a7336-21f4e6d2642mr247925115ad.29.1739219211966; Mon, 10 Feb 2025 12:26:51 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 12:26:51 -0800 (PST) From: Deepak Gupta Date: Mon, 10 Feb 2025 12:26:37 -0800 Subject: [PATCH v10 04/27] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Message-Id: <20250210-v5_user_cfi_series-v10-4-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-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 02B2D120019 X-Stat-Signature: sztd6cd53c5839ai5p3sdp95z5wuxkp6 X-HE-Tag: 1739219212-357800 X-HE-Meta: U2FsdGVkX1/yrMtVUbvomcOet4ZgU4vyp1JuMDUpehZ0gupNm+4mmgZbcpdgPMR8DSmHizvZLoWzAnJr2ZZDgx36uv1JACa68MS5a2iFPdTr0cBST4sV1bJyqeS1OK6kdQ8s36a2KlGyqg90TeDLKsJxSnXbMX1mklQbxAA0E9gbt6BUZteZhx+torpkXDvRAG5x9ljXtaWZx2d6d8b9E/QoNFbxva/6ACEy01PMAS8q4nt1j9I2LyVYWNn0zkK03HiI2OAH1EX6nQ8Oj7iAe4E9ddoGcD+O/W//wMIO8E8wttQpo6EI+sXDbAe0yWEwriedEqaexM+DqTQtv1W7jsjWoQc1O6aIv9a7LGwaglaynef1zyyBO4u86O9kMx+9Jj/qI/4617Rs8zMG+gKR4sY6InO196Ym4GFp4bl8pRQP5DmV1+FEjZkdLpsFTnO0yl+Jme09GUjOxDA0tFTALV0rv1WrHX7llPk9SWRt/Z9CohbxNc9Nro52FU3kGkLP2maLb90qApKkp8thXJ5i/kjOLZHXzx1xNF671kVleWBnsH5Ex6+2MTgR+ykdeSqKlfusJH+JtV+zkn7SdYZY1y34L1STriM616CSypwKBQ8arZQAjfOPuD/yYhx4Zs/m/fRaFuTtM4lR+IqyRo/kr9aDR5GjETzULO8PKsT+rPIuksghQkwqTtnuB7xyBLymVtIeWQZ6Ru8l9TqF4bZ6fqKYDz5iuOpGG/x7Ujkx94ZEqK1CXNmMMreBFc2VBbREXRme+Fxi4JrZL0Y/dRpVnL/KobvY+uo0QYxQb3JkhLo1ViD4/l/oFD7FZ9HiSsWJWe1c0u9tCiFMK/BBG+drfJXutAZ8CH78nX5d7MNmoPOHYGoiSYTjNdxfyMrqBjjyT7tIXk6ENOdMHOAepNpLIxDNUORZdWtURDCANUhhZYZnG3O3v1yRF6qOm9t3z/kUBIC0YPxsqMWEErGGDIy fB02tl1D YjA+3zDvaJHbB0ciGvMUbQ2J9Un7KDzFTt5JEJWTI4kx8E0BaXtyvJJf0gBd/eLyWLUxAezixvrrOTUt8ytnr0fn3zW1K4SGWLkyixPQ6PQUkRb8HEaWcU1FL9Pw11kuJSAib8yiGjMqhrhnCkiOna4RQfRSY8aOtF+Vqd+4aAeT7efsRMTHuJ7Z+CuluM2I4Qxv1qwTE3BSF6YgA8aF02OcxU6a5o+S2BcURhHRnIb9/VvLDao4WOUWCsV+BeWWzGplZkWP+8NCMTYwcwu1VYk0KIxovQRgNfdlffyQvvtFoLcH8xsx0sVrcZz3ZtDU1gw+eKKHrQNPgrcbGKnzi7H8LwZFg8nBZa7hxM+ePkOagt+qauweuuboiZoUj8edeLc6e3N/VJmrwFkui2kl11EFrcc31Jl00VqmMhNIJa/8i147SSatKRLYl6ZehJuNtj2piKva6vKipWv0gvlgmepDl1g== 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: zicfiss and zicfilp extension gets enabled via b3 and b2 in *envcfg CSR. menvcfg controls enabling for S/HS mode. henvcfg control enabling for VS while senvcfg controls enabling for U/VU mode. zicfilp extension extends *status CSR to hold `expected landing pad` bit. A trap or interrupt can occur between an indirect jmp/call and target instr. `expected landing pad` bit from CPU is recorded into xstatus CSR so that when supervisor performs xret, `expected landing pad` state of CPU can be restored. zicfiss adds one new CSR - CSR_SSP: CSR_SSP contains current shadow stack pointer. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/csr.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 6fed42e37705..2f49b9663640 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -18,6 +18,15 @@ #define SR_MPP _AC(0x00001800, UL) /* Previously Machine */ #define SR_SUM _AC(0x00040000, UL) /* Supervisor User Memory Access */ +/* zicfilp landing pad status bit */ +#define SR_SPELP _AC(0x00800000, UL) +#define SR_MPELP _AC(0x020000000000, UL) +#ifdef CONFIG_RISCV_M_MODE +#define SR_ELP SR_MPELP +#else +#define SR_ELP SR_SPELP +#endif + #define SR_FS _AC(0x00006000, UL) /* Floating-point Status */ #define SR_FS_OFF _AC(0x00000000, UL) #define SR_FS_INITIAL _AC(0x00002000, UL) @@ -212,6 +221,8 @@ #define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) +#define ENVCFG_LPE (_AC(1, UL) << 2) +#define ENVCFG_SSE (_AC(1, UL) << 3) #define ENVCFG_CBIE_SHIFT 4 #define ENVCFG_CBIE (_AC(0x3, UL) << ENVCFG_CBIE_SHIFT) #define ENVCFG_CBIE_ILL _AC(0x0, UL) @@ -230,6 +241,11 @@ #define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 #define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +/* + * zicfiss user mode csr + * CSR_SSP holds current shadow stack pointer. + */ +#define CSR_SSP 0x011 /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM