From patchwork Fri Aug 30 16:47:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13785368 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB17ACA0EDC for ; Fri, 30 Aug 2024 16:51:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sk4nR-0001CP-Lm; Fri, 30 Aug 2024 12:48:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sk4nQ-00017k-9V for qemu-devel@nongnu.org; Fri, 30 Aug 2024 12:48:24 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sk4nO-0006zk-Ec for qemu-devel@nongnu.org; Fri, 30 Aug 2024 12:48:24 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2d87a0bfaa7so510297a91.2 for ; Fri, 30 Aug 2024 09:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1725036501; x=1725641301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fwLabWf3LKMabPEAKV8KgLdpJm6gFONSoo1Kj/4Dbkw=; b=aWwYjAGufcw8MccKDlGQN38TZgLwiiG5HqJH/hBjmlNhjrp970y4aq8HAajZiINXIv 1uuxc88NQ5h69xE25lh3YaCANZ19IFPdSg8gnfymugujRmb/Nh9Bg2KyD3eFx/feGQ9W R6YrErW3oZxdObgVuXo29ebjFAu088pfAT3bi2fApw/Rh0cSd1L2+yJzk14lMuiD30DF ETpfo+FBGIp0W4uaE349k1+rlKTm4rydFh8WOdx+ykInHJvm/j7O6dBJMo3ATspCoI/I guXl5TLH0Caf0glvck72s40VANTHyHJNkjuJ4ms6lW8pFXSHyRTg5do7/G+WB72YGBtv OhTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725036501; x=1725641301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fwLabWf3LKMabPEAKV8KgLdpJm6gFONSoo1Kj/4Dbkw=; b=GMDzYoCwAOG7tT0aWBhSVjJPB6pB51s0FiJ5RnrLDPajQK1x64uPJ/7AYhd0uoHf43 TpfTJNeNZxxcKI7M6bq6kvucjChnRwb7iTDeNs1/qFZLVKRk2wu8z2gAEEQm4YDF8YcE EFSaajGpboniNK/JL//wIpF1tltsouTljs91xvOyKrZfjdrbq0aeUQYleuRnAD/jm9pG mKZygWhT2wDKmP803gRUg2SKg447NtM+yVLbtM3SAlHbUZls+YsxTTkg8CfSpVAjqIyL sxfMfzE4ZGm5tpJmzDkeFYM13HCH0EvOtrTblAuvVddDZ/zPxpVbeQ94jS/Q0KtreeOt CaqQ== X-Forwarded-Encrypted: i=1; AJvYcCU63I3MUGQRLHB3QaaCsFQNC3galN9ZmsT5013n8Il3UFtsZp+2lWVHeMkId8GDY9/3K6rZCKyRm+ja@nongnu.org X-Gm-Message-State: AOJu0Yyy7s6jmS2lKK2J+dVZ3aXe3d9eotBRQo3GgQeWJobid2m6kVi6 /CTqXa7SZ0kYpFe/ShEmr+Vu9KmRbLl4Ug+60pvm3T5GqdBX6WwL8IPRATQP8nY= X-Google-Smtp-Source: AGHT+IHrb4dKLPTjE3BCtB1S0kDkwZb2NQb9/UpHWhGDV2VQbYS6k5UYQcA0WTQcKm0Y5DgpIG9twQ== X-Received: by 2002:a17:90b:f98:b0:2d8:7182:8704 with SMTP id 98e67ed59e1d1-2d88e3de5damr321222a91.31.1725036500917; Fri, 30 Aug 2024 09:48:20 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d8445e813dsm6591257a91.17.2024.08.30.09.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 09:48:20 -0700 (PDT) From: Deepak Gupta To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: palmer@dabbelt.com, Alistair.Francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, jim.shu@sifive.com, andy.chiu@sifive.com, kito.cheng@sifive.com, Deepak Gupta , Richard Henderson , Alistair Francis Subject: [PATCH v13 12/20] target/riscv: tb flag for shadow stack instructions Date: Fri, 30 Aug 2024 09:47:48 -0700 Message-ID: <20240830164756.1154517-13-debug@rivosinc.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240830164756.1154517-1-debug@rivosinc.com> References: <20240830164756.1154517-1-debug@rivosinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=debug@rivosinc.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Shadow stack instructions can be decoded as zimop / zcmop or shadow stack instructions depending on whether shadow stack are enabled at current privilege. This requires a TB flag so that correct TB generation and correct TB lookup happens. `DisasContext` gets a field indicating whether bcfi is enabled or not. Signed-off-by: Deepak Gupta Co-developed-by: Jim Shu Co-developed-by: Andy Chiu Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 4 ++++ target/riscv/translate.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 4ace54a2eb..e758f4497e 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -612,6 +612,8 @@ FIELD(TB_FLAGS, AXL, 26, 2) /* zicfilp needs a TB flag to track indirect branches */ FIELD(TB_FLAGS, FCFI_ENABLED, 28, 1) FIELD(TB_FLAGS, FCFI_LP_EXPECTED, 29, 1) +/* zicfiss needs a TB flag so that correct TB is located based on tb flags */ +FIELD(TB_FLAGS, BCFI_ENABLED, 30, 1) #ifdef TARGET_RISCV32 #define riscv_cpu_mxl(env) ((void)(env), MXL_RV32) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 460b471387..9a1fc1b3a6 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -171,6 +171,10 @@ void cpu_get_tb_cpu_state(CPURISCVState *env, vaddr *pc, flags = FIELD_DP32(flags, TB_FLAGS, FCFI_ENABLED, 1); } + if (cpu_get_bcfien(env)) { + flags = FIELD_DP32(flags, TB_FLAGS, BCFI_ENABLED, 1); + } + #ifdef CONFIG_USER_ONLY fs = EXT_STATUS_DIRTY; vs = EXT_STATUS_DIRTY; diff --git a/target/riscv/translate.c b/target/riscv/translate.c index b5c0511b4b..afa2ed4e3a 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -119,6 +119,8 @@ typedef struct DisasContext { /* zicfilp extension. fcfi_enabled, lp expected or not */ bool fcfi_enabled; bool fcfi_lp_expected; + /* zicfiss extension, if shadow stack was enabled during TB gen */ + bool bcfi_enabled; } DisasContext; static inline bool has_ext(DisasContext *ctx, uint32_t ext) @@ -1241,6 +1243,7 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->pm_base_enabled = FIELD_EX32(tb_flags, TB_FLAGS, PM_BASE_ENABLED); ctx->ztso = cpu->cfg.ext_ztso; ctx->itrigger = FIELD_EX32(tb_flags, TB_FLAGS, ITRIGGER); + ctx->bcfi_enabled = FIELD_EX32(tb_flags, TB_FLAGS, BCFI_ENABLED); ctx->fcfi_lp_expected = FIELD_EX32(tb_flags, TB_FLAGS, FCFI_LP_EXPECTED); ctx->fcfi_enabled = FIELD_EX32(tb_flags, TB_FLAGS, FCFI_ENABLED); ctx->zero = tcg_constant_tl(0);