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 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 E50DDC021A9 for ; Tue, 18 Feb 2025 02:55:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkDlG-00046P-Lf; Mon, 17 Feb 2025 21:55:03 -0500 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 1tkDlC-00045Q-Un for qemu-riscv@nongnu.org; Mon, 17 Feb 2025 21:54:59 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tkDl9-0000VC-17 for qemu-riscv@nongnu.org; Mon, 17 Feb 2025 21:54:57 -0500 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2211cd4463cso34396145ad.2 for ; Mon, 17 Feb 2025 18:54:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739847293; x=1740452093; 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=7ansaoQj2VIkNZSxiwgYKiw4k0MHlhOwmkCCrsFy9sk=; b=hkFr5jsSKhCFa5HkzXquPxsboxAOqItVgnnpV+qtl28XttV/+RC46iCB5vvUjlJad6 p1JW6dNQ/oWe3zk4HLE6M7mX9S/nqvTltgpbRACQ77q29EYSoNq47I4zf4VP+uMUd9fg IFce5aHS95xWFb3DGXkyR7Wu6w1pde2fVmgXSSkzkjb5n7AQoxyhMhcZRfjHX+X5+ysr LCMkXanOwTUbnLIbfkTYpDt5kPvpjOrkeCcfMq5rw5WYSy0UXrXRzMwulsVqQwUQPx6T 0KP1lh5tM5SgE5kx82CyvYHLrPnHGwYP89OcKRcWOkE4qgmrYS5lhlI0TK04X1SFhTZ7 Q+WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739847293; x=1740452093; 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=7ansaoQj2VIkNZSxiwgYKiw4k0MHlhOwmkCCrsFy9sk=; b=tKdVwJBGhIk4Z/9a6edcXmCmBcGosjt6OifeyGLBnNoPK5LEyZaquVObBU/Ju7v8en AvccmYem6X+7K/3g0so5E2NDcnd/kpaoRI2sQm/W/JKW94n5h4Vf+FC6wX6DO4fq0DlG PcUoWTq7O8bwPHz54BcPXYAHsmem0firDQf/PYbWqi1Y94Y+joson4YlrBRYzE/Yu9Ij aSvqEnWOOj9LC3ytXRlI7cEM5gF+hUTGrltoyptxCOzXFf8Zhw/OnmMTxzK93R079lgt DeGBPG0Gfzv9lumNUP/EXRUlWqyktKL9FfM+q/7n/2FbMZt5tO9JWewf24/XLO0q9HdQ ju8w== X-Gm-Message-State: AOJu0YzDUz9e+2DOyv9S8OSVD+V60LFCHi5KK0CM9hNu5suhEBskgrij V0z+6oDwGkSZxWZcBQc8JyP3UXbQC5i70NW+H8gNhvaRnPWlueQq5Nie+tqc7dFhjFke7THgW3i q X-Gm-Gg: ASbGncv/vTkezEG5S9vUTwnOkYC6V+RAYsa8Xs/dTSpzkglQAcZbL7fOrliV47WWBU2 jbRi9iws7imPD7eQtNWODKOrhIpk2Z/d9K8+8uEOse6mAuIiMgnM5AC8Eg6zEbhDc7gVYLC1zQa y9v/IWF9ecDbTt/rkbKeFU1m51cZ3g864qHGB+IRVnnJM4ACaoaQtGuz7sTwzbs3p0CEpW/fvFt Yz20Q0XpjToshFACFR2vFhpHvEWyoelWSyMy9E4qm0iqPCpfNXaY0wYHtpNWq3PeltUtv79027B cr22hDOSmH4D+Ou618zBz7vh2A== X-Google-Smtp-Source: AGHT+IHx5PshsvLEAlI4zKHqHquOxs/xHzGaDPJb6I+3G83+tZ08pz6of8sx0EYU4p2zNg+4LzfUwA== X-Received: by 2002:a17:903:41c3:b0:21f:7821:55b6 with SMTP id d9443c01a7336-22104030832mr188581915ad.13.1739847293079; Mon, 17 Feb 2025 18:54:53 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d556d473sm78293595ad.166.2025.02.17.18.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 18:54:52 -0800 (PST) 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, Deepak Gupta , Ved Shanbhogue Subject: [PATCH 2/2] target/riscv: fixes a bug against `ssamoswap` behavior in M-mode Date: Mon, 17 Feb 2025 18:54:46 -0800 Message-Id: <20250218025446.2452254-2-debug@rivosinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218025446.2452254-1-debug@rivosinc.com> References: <20250218025446.2452254-1-debug@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=debug@rivosinc.com; helo=mail-pl1-x629.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Commit f06bfe3dc38c ("target/riscv: implement zicfiss instructions") adds `ssamoswap` instruction. `ssamoswap` takes the code-point from existing reserved encoding (and not a zimop like other shadow stack instructions). If shadow stack is not enabled (via xenvcfg.SSE), then `ssamoswap` must result in an illegal instruction exception. However there is a slightly modified behavior for M-mode. Shadow stack are not available in M-mode and all shadow stack instructions in M-mode exhibit zimop behavior. However, `ssamoswap` can still succeed if MPRV=1 and MPP is non-zero (see section 2.7 of zicfiss specification). This patch corrects that behavior for `ssamoswap`. Fixes: f06bfe3dc38c ("target/riscv: implement zicfiss instructions") Reported-by: Ved Shanbhogue Signed-off-by: Deepak Gupta --- target/riscv/insn_trans/trans_rvzicfiss.c.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvzicfiss.c.inc b/target/riscv/insn_trans/trans_rvzicfiss.c.inc index e3ebc4977c..ec016cd70f 100644 --- a/target/riscv/insn_trans/trans_rvzicfiss.c.inc +++ b/target/riscv/insn_trans/trans_rvzicfiss.c.inc @@ -15,6 +15,13 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ + + #define REQUIRE_ZICFISS(ctx) do { \ + if (!ctx->cfg_ptr->ext_zicfiss) { \ + return false; \ + } \ +} while (0) + static bool trans_sspopchk(DisasContext *ctx, arg_sspopchk *a) { if (!ctx->bcfi_enabled) { @@ -77,7 +84,8 @@ static bool trans_ssrdp(DisasContext *ctx, arg_ssrdp *a) static bool trans_ssamoswap_w(DisasContext *ctx, arg_amoswap_w *a) { REQUIRE_A_OR_ZAAMO(ctx); - if (!ctx->bcfi_enabled) { + REQUIRE_ZICFISS(ctx); + if ((ctx->priv != PRV_M) && !ctx->bcfi_enabled) { return false; } @@ -97,7 +105,8 @@ static bool trans_ssamoswap_d(DisasContext *ctx, arg_amoswap_w *a) { REQUIRE_64BIT(ctx); REQUIRE_A_OR_ZAAMO(ctx); - if (!ctx->bcfi_enabled) { + REQUIRE_ZICFISS(ctx); + if ((ctx->priv != PRV_M) && !ctx->bcfi_enabled) { return false; } -- 2.34.1