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 323B2C3ABAA for ; Fri, 2 May 2025 23:30:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9843B6B009D; Fri, 2 May 2025 19:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 932A96B009E; Fri, 2 May 2025 19:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 789716B00A1; Fri, 2 May 2025 19:30:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 578466B009D for ; Fri, 2 May 2025 19:30:55 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2F5C2120701 for ; Fri, 2 May 2025 23:30:56 +0000 (UTC) X-FDA: 83399565312.01.8190F84 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf23.hostedemail.com (Postfix) with ESMTP id 41EF3140010 for ; Fri, 2 May 2025 23:30:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ntNbL9/t"; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228654; a=rsa-sha256; cv=none; b=zSGQ1doGATdfXilcxH2qgdw94LkJVhHjUWOdiOiVOrQSFimOD61M8Zv+eeqIi0RiRbxQ00 3xavJhCAqRcFEGtrXu6dYniSvf1zAcTU+o38B0qF6kQPSPPCx7rtCyjRmc2Ne841o6s7k8 ffmJW39g8OJ1WImNXXmVMwb1Qs1Xvqc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ntNbL9/t"; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.170 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=1746228654; 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=oF8kVIk7n53sB1CGtMqRsGAQlZBNV4IXtcYES2kRIJb5/Zol7F6RJIr6h4X9hc9b9aFRBp 2LfU4GJvQKG1MYjLYp3hkblQa7j+ziIiCIRmADEgXwOdD5GNugPqEiG7T+hMjF8mdHuy0b raAaPV6E9XtrgBn8+5ZGEEqPPpqsDH4= Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-af52a624283so2423030a12.0 for ; Fri, 02 May 2025 16:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228653; x=1746833453; 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=ntNbL9/t/Q4hoN20wIxUlPMm4JuJCBjpK2u8hvRjMJc3pjQRyJ7gvB9pxdTG2jVkXJ 7L0WK5TAZIPloWFPXCNj00Z+C5W77VQ+fUmfGoiDB+fiC9TvWqsAGVIaBSGd907844iM Pbmzgm1CBY+pwocADu6BGnWO5YXlLD2un3jyQ96N7r3kblzk8XbXMWGV1lFC1UjpqVYO My2EtOfC8Tvx4zl/ro2XHR61aHEtkh1JT8uA1+QvnVCQyPLgCKFTRW08YkrM71EUrox2 2OEhuijX9WyWcdDHdMt7IEQkBgLQsRkiLQNgS1Z9Txun8mb6rZK71GQ45n4lp6YGcJqV jPvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228653; x=1746833453; 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=FkTp4bzxFjppzjdcbZXtlnm+TObq3etWLIOAOYVfCWiv44Lpq9L8yWxy50wvnYlquJ wPmQbHqIc7xCptcb9muCrLIFr0sDJOzKDK6STnKwCLcZNczFET1zwUo+NQ2VB2JDPi7F M3rTfE08QNKUu6PZ3me3VJUNIkfe3SpqRlqSCU0NLWyvSGyOWu6ZUp/+jdJv8ZZmebnP 4LAHoHwN03WaHlFof9XqTEodQRfZGloQfMlJ4KDt6ClaKnniIi0nneJRGZpenpRe63K9 Y7DgyrTHB7L4lfqNGXkHfGoMo70qOf3ZMpKJhsyFWEYMjI4DcdTw0g/qwC2oqzxV3hXH fQqA== X-Forwarded-Encrypted: i=1; AJvYcCURvIZC691qBM1yWHysd4gRWoxVShwbFYaK3Kk2pWBra8fPG5zmkPXKnmHAlAeyu7sTVMS9SayZVw==@kvack.org X-Gm-Message-State: AOJu0YzBcLu3eBOXJlNPLilM9lA7rXopaM0004Ejo1keBvy2Acrn6Iwi l8cUODqFCRtGikKolsGLfExsOeiT9Hlg0QgrEwFPpBZ6Jry1StI/vgmBxGllMkg= X-Gm-Gg: ASbGnct8fW9qXpFFLaSVLQXeDMwjDfI63XAT5FjxpM0INw4PSGrYNIj3DUw2827pk0g /mHQM4Bqn3lhku77FCvJKr1MiS5SZPf/6R2UNQJZFl+2JKW2d1RoQbRAsbeBmL2xZIgqeJxGBkY d8Bd9MKy+HvnrkpfN2nYE6pS+qeduLNPQFGCE7vbVIMj0aIO6Aakupyk9hZFmGHA4cACGrxC30i 5JU9S4marB0HJ/Fpy8U5E5kN3qew3OLZ3G8KuxUZ0bOrOq+1UrV1aeDQ2OWGRe6CtXxxFnpBFE4 tX4vyaNeugv1HsouXIdN5eDnbzahoBmFs5Dpd82DpoxLdFUiRfk= X-Google-Smtp-Source: AGHT+IGs0pVpUevLo2D3rqK2og/pTuqkSwWUPXTs5QiAGT/XEwvhGyWKmfpP4hXzuCuawzC/3i61QQ== X-Received: by 2002:a17:90b:5242:b0:2fb:fe21:4841 with SMTP id 98e67ed59e1d1-30a42e73ab8mr12121491a91.8.1746228652914; Fri, 02 May 2025 16:30:52 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:30:52 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:35 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-4-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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-Queue-Id: 41EF3140010 X-Stat-Signature: np4ud5dowuaab7r5z9c4i9dez3wjqwti X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1746228654-882156 X-HE-Meta: U2FsdGVkX1/gXjlmDigzk4LddOMoliIoBVejojRIbkbeStkmq5teuvQBJUwmJoH6XdCeG4nIr+TatwP+CVLSRZzgSnUajc7+zDsn51NPDvx3q4mUa3cHTfaRpPJbYsyvj7sjyTGmOJsrahq7FCqiUxbDavbQiDbtUlFRhd/C7xgr3jlYTiXWr6Q/3w1UeRyvWyvvgol+D9wFkKdmVhizGfElUmqM0WbhYJIQ7GP63ANv5PoYX6sXeTGBrTc+iJH1mhevlBtqF7h4NqmM7IT3397nSFKdpiEWghziNLEIfNCtKQy9O3PJDw2MaxbSOa7s4roihOawCpgD2bOpo4uHRJnOSGGvYgicGG8FLOZS9z6d+B6QE9vwKB7caUOQmgK1gbAaBI5fncO8IKhnB2pnslRQ4f2CM2PvGawU/tezlFoJZBBFMVaSJWEVv1PdO5zQcmct/1MwLhjl/kESzu57nb9ZCfUNxYe3YmRWsff3eUpRrYvgd3xv3U2ncvVdJOpPYVJ3jQGWqMRigZTMO74RtkHbuxpUGDhkEGXEl6LaI6pmZZEtY+vG1Pyep02JGtHUutreoRbTmUj5ueKns+cTHRyX56ck5jVfp0BLflV2zkCzsIPR5aimhcJ8GDUST4E/iqiNcgd2bl8q1TIhzTadg6khcDOGGWqyL+G2S4uXEEBb+XDg5a+Ca2IABtmLmrewxbMtsLPax+WrMlL/NDGAmcbvcSjgF+TrV5qwL56VhWmbxXsh90js8s3ZHKVE8k4xDAzt8/hR/w7itMhU5Kyd7el6ts7dnfgFgfTBd5jyHWZfq0gmh64IYLVGsjHwf95kPIHJN6gEg2JaJFyW+3+BRbkchPKZR6nc6m0sUXerocQscQB9nTOYQG7p0I8VhlhZRgghxjQHOD1CL9Oq4n9Qnfj3Gl0KonZwMpDXhvv3av3DOD1cYnhjeILz48CVmg2pm4tnhJBGqvhVKGXnlLX 13VPf1Ct z5FvZ3AR251L4mD4pQs7oC7ScX1XoA0IFNjSol64/1evFnrXZBtQrFySonWuvXVFZW+2SyNrKE9NGhrfL0BKwJYK4oPl3GTDM9o2MBENyprrag0M7y8oOWDov60eMh4+Uy9CAfxo3eByVZVjiOQkewYs6IQX397Q1dYtQHiVG5Rfvw1GPgS4RBLQWDfkZUuzuA+yxK3TIdu5Zx5jNDGgwXsqg/vY/KKIA1gDMqdBtm05nIL8Tv9EbrvIqTdglYoGbzvOmWIO7kjtoWarxgrHe8INy1TvAF+9ynRXftiEYCwOCh5H/nk9ymDeoKTvyU0pPdKIHnDMc9RE4tgi7if8tBApWTIp27r9MD7on+GExiPS2lutgFVpE5kMZo3FxekZVJFDXUtkMiEeJ9soS0ei/caD7eCBcMpAhuD3SNHQRcieIkaWFaovJC5z7HJxvXjDAgVrKasZP3cBVmzY= 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