From mboxrd@z Thu Jan 1 00:00:00 1970 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 7A4F3C5B543 for ; Wed, 4 Jun 2025 17:16:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 145138D0032; Wed, 4 Jun 2025 13:16:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 082558D0007; Wed, 4 Jun 2025 13:16:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E63258D0032; Wed, 4 Jun 2025 13:16:28 -0400 (EDT) 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 C08D18D0007 for ; Wed, 4 Jun 2025 13:16:28 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6CE2EC02C4 for ; Wed, 4 Jun 2025 17:16:28 +0000 (UTC) X-FDA: 83518372056.12.AB9619F Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 6503F20011 for ; Wed, 4 Jun 2025 17:16:26 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=vjicUquQ; dmarc=none; spf=pass (imf03.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=1749057386; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=OXlf5tp/h/95mv9FhUe0QDa2fxbfiTberrOVdM9rYwA0D9/HLiIcqho6gwUB8axYjAF5wU aKVUtn5vbgLJGDW1llMCd7Mk1jXi5FCz4SptZbklo0tTXLP3hoG8OzLbuyD35ixrE1VhQi 87vj2/6gLLasMk/1jGaW4NkcSnMul/k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057386; a=rsa-sha256; cv=none; b=aIulfbWuoIkOWFAZFIynbx5VMYG6kqiZ1plocuHxxSg9/gGSt/iZYEVuBA5yST5DNZxrCz YvTXm9yoIEnzkcO4T4dYFsTEfmtimPknI+JkZPoXQCYeOQLM6cFFwmESQc915zaJPTbhtz 8P1ek2vEjZoxPOCaTLE8K255SlQY1yQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=vjicUquQ; dmarc=none; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22c33677183so705525ad.2 for ; Wed, 04 Jun 2025 10:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057385; x=1749662185; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=vjicUquQ8nV5ny+OBQGToMdiSEsgmV8ag+0lzEXMnORxNmhTEczKVeu78qtzUIkU3T /BPpAGYMz56TZDhNwKy/V/CpEszmVfBGbg1/6xvDJqaCOsbv2Bvt3HJU54WfG6NCVYMj ZdZSJc7ESrg5UZPdMQJ6wwOuIMoqV+J7Ql8trfVRdN1tmg0ySZYPe9bpq3ar7LKVA6ys lt7GcpFIDVa+kKMKZPjlniNQQExDQv1qa0mOm3DbYxen2BIV9A81MF/EjD1rcyUf4jyi yAD7TsExBLIqqZPHJean5R4G0qOElZBPPqtETf+LzswUNMwNjWSpiwWtfAwQgHv1Idv/ WsvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057385; x=1749662185; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=NF8C3soRvBMFsfdH62IopDHmGvdLaU1kLSMJBDVLSz0wQigGw6wrmEpNjcEdahzh2t o2oR6eShPbgV5RPoeTjGa9Y9gQwwQwCCH5D2jCWAKd/KzUAIX/4tbfkt2oJ0/AvWcVfJ Yg37xybXdWzF4a9TmmFPWBd3rzse2XlaBtn6XW958+c1fj6B6g2V221de8VcfwOp+HoQ uOZUHR7KjclCbo2Bs2mSi5Ss+B1yMNhGfEAbGGIPcT+N0ZUyeVSqmAPp3KZyKy0sNyvO 5wlbsoWbQyzhIcbuZTpLIqQeZyiUNMJ9CZF9E2PVqorEkXHVLSS4buyUYUvA3Yd+1znU G/yg== X-Forwarded-Encrypted: i=1; AJvYcCV3Zbj0PEIRakkIgcr/MmkT3lMURy2kwBwQGDbDfNKjKBkhxmgdFZV2CN1mONBmHQ0naJxLn/5pTw==@kvack.org X-Gm-Message-State: AOJu0YyMo6NOpC/aqBLob65CkVuRuhBO6ymRHscdeWe7S+VAcnNVUOYE h7NiyZnVRLF5kLYCs6qVNpri6yZiKa1j+1xbdAwkzUADxfQCJC4qKZUtNNBzrJmBDg4= X-Gm-Gg: ASbGncsGsXhLFMi3uxSMqYpXmWY1kvXGqz02fnfm452tKK4NvWqD+5vs4xo245vRrOZ WG0CBOoCHFkdHgxpg/kyZJ7/AHEf8hKlcuiSQnvOAtF2aSPw9yfkb8vXYnW0dB7E4vVUAgyl40p /jexmaKekDWXtHe9RdbbK/U2JsJYHIP/RwM2FrtL91TPsZYl/hDgcRYf+ASA2Y7rn7MGw4dy4QW 2s0652aWyBfRoPqG8GqNZ0L5zhr5do/W8xdZX4qzrys3x0MvX3zU3WdkuWy/t1gPNNduX1zlcKY rGy7fFYUTRvce8zW/7UTi4aZZi+lpszBdPIb3Mt0oY05Lxn9KaM/BFmiz6sYzSxBGLD5Mopm X-Google-Smtp-Source: AGHT+IHOq7jdfe1QXesVQTTYh9pdMzuQq9fifPPejLKBYzrKsJ2+M42lgYFnihYLRnJ8kIRxucrJ3w== X-Received: by 2002:a17:903:1b45:b0:234:d292:be84 with SMTP id d9443c01a7336-235e110dc8dmr60521145ad.10.1749057385225; Wed, 04 Jun 2025 10:16:25 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:24 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:28 -0700 Subject: [PATCH v17 04/27] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250604-v5_user_cfi_series-v17-4-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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 , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross 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, rust-for-linux@vger.kernel.org, Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6503F20011 X-Stat-Signature: w6zxwbgsac6ftbsr59ra6wfpwudfu7k4 X-Rspam-User: X-HE-Tag: 1749057386-124001 X-HE-Meta: U2FsdGVkX1/ZnMq4N90khPJOxuLPyorUJP07ns1Uo29TJcJY0EDrX6+gcrs7CzSIUfimq83oBsRQxWJKgGcLpq9ETwfYdaV/uamGpiGTN/ZB2zyVWgalOPjStgS3n/HVpUukfNH2jduDfi1Q+Z2gseExnzuGl0L7ESjPPH/5Z3U4umXbRCgr7qgUBhYMit54KdqDoBlY+pS3bnSoGR9aagYLd2lmpHWDcdUkZrBx2ip5Guqwhu0SHWUOUhkIp3E842zyQRq6i0otF6RpkDnuVoWnmD0HsKfLzki1p7kZ40VsS++8qg/mpM5CmJOIdKFrk2CLL89oFJe1xSIVy/ztG0t9Qnp5hQlYaKLdsRcav6tfFBM0jot9GkiMe47bELIv+TF1R6erafNqorr1EC92q7z3oKpAelfgzEfDPBAXKk437vH476BjWS1UFLgfEi8OxMnjyGNgn50B5rF9dtubP0ZOhQORPld/R7HxgSt6SPFJVXmnze//g9N7UKhSFK1lh9RelPg9igd29/qZWv2zu+ZncpzrNwOsx8pvayCv+YD4lzlGfDauz2xUB1T4kqIH/U//xnA/W/y02LrhQ3OxETg6ZttVfCMEXAgYNw+7+fWbkvqD+jptrfoUDVnEMiX5cXf43RGL0cZWq+xsnH13Wg5o7TzhtqD7+2VI7AieuPov4IDGrUhlhW8J+Ld4Ly1e283CyjYk8cC5UW29yqd2k+9++ZhyecacNDeMvSJUQqTYTVl0kHnMW+kRF09a1rL5mrq1WmaokRVkGjZi+2WD85YWET5pfXPLeW61hAlqDZSdzOg3XYJr+b2d4WfsgvVtCldPTKYSvPUmTDUoBAfzKZJm8VDh5rkMH27yxNBVFkIe4CoJGwouEivpYrw5vgAxQ8B+NXHcA5Y59sP3Xj9kd0ELHJVoVS0BilKAvzOvhYbKC9fJ5KAse/N95qjmkzu5T84BCoyN8mwK79uYMxM qDZqLKeh 3o2cRX8gDmfttpx93O1WS8rlddst8in34dyZertnfJb22bt5wD0XblysOJKA/V8PRRYWjZyA/ERyDBpbUhMEJeVpZyDlWDvzLvgETPdlfv8wlIDF0TcAvXgcEsGxI20OfosUwTUfELm6HZFOHImGZ0jVpYaBD0d/+Ss68kdamccn9iQT/HjS92CfXjRGPM3locs5taYYUC1oJHh/HfE/g38fMghcTltF8Db6I5rceTq0/JdaZc4ecpvQ7oH6qlL133ebwFgC/LtV4aylkHBuptjio4DFQQX8GVqnYN9WIETs9924FifG4kbytxCJVssBUvRjdaKEW2IcBWqP7HyPDyW9yXkSQXgZKqhAGoHLIPcF0ahq2z3idPw4g3lQS2OWTKfDW4OEXF7oEMtHcYOD6qL3NoJfoSpjOZbCWtIufzOQdQxWVGANGcHEWOIrk9m2zNqa8KTXiW4f6o7w= 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 -- 2.43.0