From nobody Sun Sep 28 15:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1758700227; cv=none; d=zohomail.com; s=zohoarc; b=a61CnO7pWVGl11Ip6ZdkoUrdhdoGzsl6KfTbj+/YN/5ryj0b+8NwAAckSz/KrWb8tn0A3wc/YvMRS/Ck73r0opSgzYH+VSvS2LTdarDw3g/gEUr0UM8VhTT7n9Ih7ObkgB/9WhHu9u4tTDMv8Y4xMgcrS1BB8k83sWCoOKgb8xI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758700227; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=J9PBLxL4kxcNju7dbINalVw2U5btg+Mjs9TmtxCLKY5BNq95JvXaHYIgCGzpGYpZqLhfnWKxql4pBH6PcEe0ECEz8ZaANP3YbiAd0ZF2/Q71z0E+b6cghfcwSEIaknYixTij36ZEz3fHPgzX4hXGLLUSJCOh1Y4FsDzzVH5/VnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758700227543449.17936780321565; Wed, 24 Sep 2025 00:50:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1KFI-0000tW-Sw; Wed, 24 Sep 2025 03:49:02 -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 1v1KFA-0000rd-QB for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:53 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v1KF6-0007dL-5X for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:52 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-77f605f22easo1160131b3a.2 for ; Wed, 24 Sep 2025 00:48:45 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b5541f0374csm8778502a12.49.2025.09.24.00.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 00:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1758700122; x=1759304922; 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=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=dnb1YioTTi76PUWMtgkpy806ZQ1Ct3eViwO2kUaZ/3cDD88PC7O/TO6swYc0LcEhEH m2XuwBZvCQbTJE2kYpilz6A4E4IeIVEmBwT40ArC8QpbiInCUifLHLl7JUxfjIC8wjiS DvpN2wSZTa4HrpuwiaDbKbxUa9/FRQQQ9azos/CwaOg/NZ5ohrnMwtFNZYysoisi1T/G 1dMdD58Rw+rV9XF4WREs5J/1OkDUJRHvrmvEc7jTvq0q4wQaTpKTKasjvtJDuXTt7410 QVXBTZuIR8PxbUuCiTTPMX6qhOrY/I3PIuUX/4tB4MuEYduQR/W8W3VdZ6gZHaSiLR9r fqMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758700122; x=1759304922; 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=KB38NnEtT9B3jB0+dFkrRyRsrLIOQtL/A8YIF8wY9qo=; b=HmLOd75hWcbK1WPQUgeS7w94UELmx7YB1LyHygpX/zxl5rB/pIVhqZRUo3BsvrWJln EwkuzXFeg8i600o8/BpCpv7nDFbU0+S4+F8FLfAdWXN3f0xAkbLlTJ4Vrnf4kCke1dIJ i4v6m9Ri5FfeOGyCrpG6nLz8Jz7WaKbsejc6mpae60pDrGAkxo3T5r4YAj3icNAbt+qB PHaBOI39PpSvuskzSSnmSmWbLtXSH00PTqBP/Eai2bgjNu3x7ao15swcofBqap9+gQE4 GWPsMRsvnTnOXpgozARP+IceGIbYLqQA276nDW2P91ipR1rPL2Xt4TnyVFfNfa7GZLge 8npA== X-Gm-Message-State: AOJu0YwfGPQ4q/rmvK4yTbSFaQFvmkqH4O0qP8PeIMwCVZMzPi5psoxQ xIz5xrh6NGAbCbY0DzW/d7PMVYqxZNaaPy7qFAG04vsL5nhf9tCbNYNocemlBAcEjCr6uFI5v5Y +6HNrCVX43OgjjOp/qRUKMgbEid69u2pCiA/bvxtB3ccDc053G4+IdewpEaPnBEOW58KyQFlpZ5 J5G5HXUZ4TQOabMj1nuSGYXWHDyS9DnD1c7CskTg== X-Gm-Gg: ASbGncsqDQRmkIbCHqSWW47t+tsFzf6KkAZMvwG5XQ0dlPeqDDFMJxqO41qakeY5VTz 2ajvyUO/pKFfN8HF7Uj9pPMWy+S3Fz0O29VplySonfoaYj2IyfMwFYmsv57+DEWwlYrz5l5JmmF GSSJcUTQwgnwDqmcsGYwUy4Q+M0KHwc5d+ITWWmjtaqRCM2djo4RUwYOlE9P4kLX2+YAUaZljSE 6lVH6ORYzgqH5YzebROgEX0IMzLTxCcKUXhXsdbDKDrnU8g+VrVyr67n8eUAkdZZFKNb8eFt204 diOUawveJjLbFAfzqxg4banEXPduM2c1wBRS4YDrOC49tDWpfg/taP0MhCW9QY/ktnU4ItDztXL lqbfUPhtmvRGzFbfIjbMSICFRuzBp1HKU2rw4g/sgEzpmZ/W4oWDPaeY= X-Google-Smtp-Source: AGHT+IFXI3WzGp2hjeRy8sgxLFhWiU3qxsCqDdU6XJvdOsip9rH89UUsmInCapi4Lhmh805ImBC34Q== X-Received: by 2002:a05:6a20:6a22:b0:2bd:2798:7ae7 with SMTP id adf61e73a8af0-2cfe9410fe3mr8110708637.31.1758700122014; Wed, 24 Sep 2025 00:48:42 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v1 1/3] target/riscv: Fix the mepc when sspopchk triggers the exception Date: Wed, 24 Sep 2025 15:48:16 +0800 Message-ID: <20250924074818.230010-2-jim.shu@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250924074818.230010-1-jim.shu@sifive.com> References: <20250924074818.230010-1-jim.shu@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=jim.shu@sifive.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1758700230041116600 Content-Type: text/plain; charset="utf-8" When sspopchk is in the middle of TB and triggers the SW check exception, it should update PC from gen_update_pc(). If not, RISC-V mepc CSR will get wrong PC address which is still at the start of TB. Signed-off-by: Jim Shu --- target/riscv/insn_trans/trans_rvzicfiss.c.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/insn_trans/trans_rvzicfiss.c.inc b/target/riscv/i= nsn_trans/trans_rvzicfiss.c.inc index b0096adcd0..45686af4d6 100644 --- a/target/riscv/insn_trans/trans_rvzicfiss.c.inc +++ b/target/riscv/insn_trans/trans_rvzicfiss.c.inc @@ -40,6 +40,7 @@ static bool trans_sspopchk(DisasContext *ctx, arg_sspopch= k *a) tcg_gen_brcond_tl(TCG_COND_EQ, data, rs1, skip); tcg_gen_st_tl(tcg_constant_tl(RISCV_EXCP_SW_CHECK_BCFI_TVAL), tcg_env, offsetof(CPURISCVState, sw_check_code)); + gen_update_pc(ctx, 0); gen_helper_raise_exception(tcg_env, tcg_constant_i32(RISCV_EXCP_SW_CHECK)); gen_set_label(skip); --=20 2.43.0 From nobody Sun Sep 28 15:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1758700214; cv=none; d=zohomail.com; s=zohoarc; b=UJOwiqTJkJNZJpNFY9bC+/Tts1MzliuUTSzM62W8U4rvgEmlZw8sF+iW7BzwKx0FTthuAMkfgqrYqyPP0/O/UCWCFYTHBIHoIRngs0BJAZ5IdTKcaL13AAY5fHACuX3qSeoYKWqqZuRMe9saUL9v73zfh2o3bn+BG3XwlJsGGe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758700214; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eb55lICRRwyizrb+ynSF6MmTdD+9/2j2YC45GQfIco0=; b=MaJycsZG7votuojTmyJI9Nn/iATZ8xEO55K/iEA2ynoJ9qzjZM8CS4SkPbX8X0RJw4iKXp/tilj98ozkXXD74K9Zhg5YWlZP7WVheb+Cwqhd+pUbRjRB8W2imuRAzeBznXkUQ24OSE+BsBTo7YU/82358Gbp8VPbgWl5fvdK5fs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175870021455938.06636273178583; Wed, 24 Sep 2025 00:50:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1KFM-0000tf-4C; Wed, 24 Sep 2025 03:49:05 -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 1v1KFA-0000rW-9k for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:52 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v1KF6-0007de-8n for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:48:50 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-77716518125so3452453b3a.3 for ; Wed, 24 Sep 2025 00:48:47 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b5541f0374csm8778502a12.49.2025.09.24.00.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 00:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1758700124; x=1759304924; 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=eb55lICRRwyizrb+ynSF6MmTdD+9/2j2YC45GQfIco0=; b=huT9JV1QfeZhIWjl6bqyT8tBWy4bHFacDBuh6mEHZrUQxlC56Th2J0QR2wztsuC3HK jm/SaDU4sumzH8HNV2ECk0GRK2kghhkw9+Dy3EAwXBRL2XXRInobP1yFfhOFs+c8k9MW kwRDvUgPdDZn0Gc5Dd2EKebVy+B83yBweGIErJ/7LmbMqx6UJrNNfQTlf93UU9FdC2t/ o9cYRvnnVU/jY/k+McwSaRq22NbsKYOQid5VDrtjuDZmjpYQKdnNAdKEUcwp3tqc3sZv OG0ZxYff3wUeSvNSV5qkYGI6jjssz4Dg861VYt+ojLkTtHDuJbUga8UF5tmFndkAidBo XEfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758700124; x=1759304924; 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=eb55lICRRwyizrb+ynSF6MmTdD+9/2j2YC45GQfIco0=; b=B/EwdvxYDcKM7KlNlnTVVdBKKeAVYCWsaT4ej1AY3iLIIXxMzTKRjOdcf06oKRsC34 ZfFAqJAorlaVOpCqlufCCMWOUTGIEeCnzGNPyrWjY8gcbEQ4MtkPqXTsj6xHXzuvzkmQ FUjoPjbEWpGauY35cv5wt6AlZavSMWPf1nzkZ7S9c8l9HMvjGCT/e05pz11vt+dggyYl Q7+SnTaTYbRZM/Pwk3Ojsr1L30230cNs7jyMITIoA/flcUwlgwu3EP74jST2/ZBOSoVg 8Tt9F+jId4k1jYyeajnK5KLBzlg4zGuO/5L1/bOTVOSQFYH/FhOLHsb91cRGhsDEO08o UaYg== X-Gm-Message-State: AOJu0Yw2NbvYC3gb/T/YxSw1C2ZLlAuRoFRoREMcuVlSdYbTOi3Ru32O PtWkYHdc/+E0aOVR9ulMjkNU6gfbov3JTrSOelMLTaOMvun13uodEQZ9erS4OwQN95cP6ntai84 VvQQwT6GYCiW5MtIhc/TtUKzbob/E5WZiIU751epCPU/VTn+31PBo7MP8aDH9kK63uwTix/t6zE kG4G0m0o0RUG61CemT6TCibB8KvUKA7cdEFMWGJw== X-Gm-Gg: ASbGncspEfiDTlFD9Cv9AGSoMbhEoQFQAJYdtMrXY2qowzpznXEBJoURJ97KPf3vOc5 +NvkaBj/FZkAe4KqJsHCXFFuOoLQsf2Pxw04pdi085AnpwM9vkJVgRFCcyc8rpQIo//E3eQjUSg EBCW2xt4Sa6y+Vx2WzTlR2FhM0fLAbYqTdBFv8ffsxOfipZGN+TUSLPtKB/vy0jUW4Z63uLc7m1 NlDJM8xIAnLF/ELaltAzFVA0YeD7DOfxAnN4l59omPGvtNvfqAB7wYTsUkhNOfumaJIqYeuDWQ2 9IxSPMihtO+2TFKu3+CDQFYY0FggBkM99jUb9Nc84sTZ+W2yL0rzeTN4k45Uy9nOoq9ZHHo/omI 2Lr81Gax/pJlpHjfzt2kA9ka6SgxnxEGOs9kKUyFaTLJ+ X-Google-Smtp-Source: AGHT+IGnzKxU10AMbfLST1qfylj0DTrLsvoSmcBWAaqYshPA2yR88f2r00biVnO8c4F2wOrEmYATtA== X-Received: by 2002:a05:6a20:3d24:b0:262:c083:bb41 with SMTP id adf61e73a8af0-2cfde03e8b8mr6921745637.3.1758700124330; Wed, 24 Sep 2025 00:48:44 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v1 2/3] target/riscv: Fix SSP CSR error handling in VU/VS mode Date: Wed, 24 Sep 2025 15:48:17 +0800 Message-ID: <20250924074818.230010-3-jim.shu@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250924074818.230010-1-jim.shu@sifive.com> References: <20250924074818.230010-1-jim.shu@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=jim.shu@sifive.com; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1758700215701116600 Content-Type: text/plain; charset="utf-8" In VU/VS mode, accessing $ssp CSR will trigger the virtual instruction exception instead of illegal instruction exception if SSE is disabled via xenvcfg CSRs. This is from RISC-V CFI v1.0 spec ch2.2.4. Shadow Stack Pointer Signed-off-by: Jim Shu --- target/riscv/csr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 8842e07a73..0299a214ef 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -204,6 +204,8 @@ static RISCVException cfi_ss(CPURISCVState *env, int cs= rno) #if !defined(CONFIG_USER_ONLY) if (env->debugger) { return RISCV_EXCP_NONE; + } else if (env->virt_enabled) { + return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; } #endif return RISCV_EXCP_ILLEGAL_INST; --=20 2.43.0 From nobody Sun Sep 28 15:28:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1758700232; cv=none; d=zohomail.com; s=zohoarc; b=DkRvmnhV92VbVW6dbaPBQHOK9zL07FVCMogE1H5RuPQV08l+JWNXFhd9Po5OYTWpHEYlbC8ZlA7J0N8TDMWMEp0UoWvtgaaoxu+XOqx/mT5E8Bq8ZFpxF6z+qykT7UXgB/+JtWkh76Z3iyd7iGtO/mWjlmXE0lPI4CznVSzWViU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758700232; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ojdUEYl9Lbk4rUbClRXCfBPwqK3RCWoKxJJxNd/cr2s=; b=KlPrvuLi88pXykD210NoQuFzrwYnHM1y0BBZKoNnA5AzHbhJp2v9IAAoGKKdtugJ/76JOF/FLZN0vNuoIePmlZCps2tU7S7YkLUaK+AlYd7KiYvQDQGM7SO+2hieXpMl8PWkcsiUHi3Ii0t6a4hZ4X6jmaByRk7e8c1yiAqTHLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758700232326903.8566788658987; Wed, 24 Sep 2025 00:50:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v1KFO-0000uu-DX; Wed, 24 Sep 2025 03:49:06 -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 1v1KFJ-0000tZ-J1 for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:49:02 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v1KFC-0007dz-6h for qemu-devel@nongnu.org; Wed, 24 Sep 2025 03:49:01 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-2698d47e776so48064215ad.1 for ; Wed, 24 Sep 2025 00:48:49 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b5541f0374csm8778502a12.49.2025.09.24.00.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 00:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1758700127; x=1759304927; 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=ojdUEYl9Lbk4rUbClRXCfBPwqK3RCWoKxJJxNd/cr2s=; b=PBR5+1aE/dZF03ocNTuTAOs0w9KXqQp5Sr8CcrDO7muT7jGzzLRwhsAYXQWyPKuP3r 0nbDi0HFVn3QdmIXt4uvXT5LQFhFSGEl07+90T7IRQA1RjDZXJUA80Row5EIDFSQXx3w gRvdUTHRRaMF1W1A718DqzwcRcFIkmgFxBMWOzFjHcaa53T1DPwFvNDcVw1ZeoT3sC7E auxThna8GqWkWJGH3ljy5vDJ24KDAxkXjZpFi73+xWdPXtCc6nGAcOlckpuy9fgpAt0h Bd2GOPMYr8L0IHbEtRrtTF7soXTXcR8tVBQ2esu2KnKwquFX14Ywwxz/seT83Kh4pttN nqaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758700127; x=1759304927; 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=ojdUEYl9Lbk4rUbClRXCfBPwqK3RCWoKxJJxNd/cr2s=; b=iIl4qLxBDUHTaw8hVbdUDs7tiKz0vfQYbmhlSA+M+nVICjbSFWjsBb7jDFWDKblhpk hq8Fe34KHufePL/b5r1xZ3F81QgqIzftKvNTHLBX2ET/4zOPBprV5tJ2twI+nKmTEzh0 ZeRplO2rcsF/WCQlqSJK1jxe3/JpvdtwWMrDDybPckCVMKpto9Z0vzQOh5YRwBHPQQfx uqgACfc+HPVqa599fcQ45YuhR5ErMVU68fZYwKbuQONjmBCcilVIXNOem6Dwvxo5EBwG iCwfBDXjtpYV4aT70Cfd3bvuOXyG8kMzQQSnd7bcGDfPLsLtM+IqGBxBy9iEvnp4gkg0 KC5g== X-Gm-Message-State: AOJu0YzgyB+HE4SUuz4CXEtwNQL9aZ7LE5uwJ4P2B2oxUQ+zk4wHXloi dbpMtFcO6BhMRblh+QQlP/YlyhszZPTja1McBsp+CFFo+a6UNrVeK5/onXxGUE41iaIJjadnC2p zzdeaTNycpC1Ob0eBdnj6pfYXOx3msLDDlef9C4N5PPikH2mQOKjiJBAlEfeR8xhR3T//sgB54U LL3fZFH0DD/oGHtSgEMyCdYzolwuPMGGR1pC7gmA== X-Gm-Gg: ASbGncv5lIctRAANiOOBynH89+jrS/BVsBUAfz4EATGblqZVl7prDTPTeRW6PMOXZkG WXbJ/wj5ujtfIr+GLxegVO6h5ha8opsxtwbmCKzPCuDCf2DiHrt/w1+4uoROS0XSGdHuyOuHyx7 QzVg++NafWYvhC/edXoIjlBKOl/M6NLfmfR2XkYTqUBzsF5fmdoXjRDZ2iUhl6XpYeAgHdxOpH6 XKEWVd91WDa1Hx/57C4EdfaV2cIvPzJloJkBiJTrXzA/rTstxioWHL+w5l88owZtKO11DmJM7SS sOpMR08JNByoJx0I6YwtsRhAgdKB2VSnjtLMfKhZD1lSnyN+mnIeh4WmGqKvEpBOawwvdJuAiKC xhtvGLk6zRmCligktvcQTLAHEhECTyUVElHunSMzzmZvm X-Google-Smtp-Source: AGHT+IH/1pYoQAma4pPmBTo3WalDFbmbrpkTdz+H3LWfkBXZsc4ls0A7feq/6dzkiQ51t16jgFUe1Q== X-Received: by 2002:a17:903:32c8:b0:24c:7b94:2f87 with SMTP id d9443c01a7336-27cc156e18dmr69369035ad.14.1758700126617; Wed, 24 Sep 2025 00:48:46 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu Subject: [PATCH v1 3/3] target/riscv: Fix ssamoswap error handling Date: Wed, 24 Sep 2025 15:48:18 +0800 Message-ID: <20250924074818.230010-4-jim.shu@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250924074818.230010-1-jim.shu@sifive.com> References: <20250924074818.230010-1-jim.shu@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=jim.shu@sifive.com; helo=mail-pl1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1758700233836116600 Content-Type: text/plain; charset="utf-8" Follow the RISC-V CFI v1.0 spec [1] to fix the exception type when ssamoswap is disabled by xSSE. [1] RISC-V CFI spec v1.0, ch2.7 Atomic Swap from a Shadow Stack Location Signed-off-by: Jim Shu --- target/riscv/helper.h | 5 ++ target/riscv/insn_trans/trans_rvzicfiss.c.inc | 8 +++ target/riscv/op_helper.c | 49 +++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index f712b1c368..c82bacdc39 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -1284,3 +1284,8 @@ DEF_HELPER_4(vgmul_vv, void, ptr, ptr, env, i32) DEF_HELPER_5(vsm4k_vi, void, ptr, ptr, i32, env, i32) DEF_HELPER_4(vsm4r_vv, void, ptr, ptr, env, i32) DEF_HELPER_4(vsm4r_vs, void, ptr, ptr, env, i32) + +/* CFI (zicfiss) helpers */ +#ifndef CONFIG_USER_ONLY +DEF_HELPER_1(ssamoswap_disabled, void, env) +#endif diff --git a/target/riscv/insn_trans/trans_rvzicfiss.c.inc b/target/riscv/i= nsn_trans/trans_rvzicfiss.c.inc index 45686af4d6..f4a1c12ca0 100644 --- a/target/riscv/insn_trans/trans_rvzicfiss.c.inc +++ b/target/riscv/insn_trans/trans_rvzicfiss.c.inc @@ -91,7 +91,11 @@ static bool trans_ssamoswap_w(DisasContext *ctx, arg_amo= swap_w *a) } =20 if (!ctx->bcfi_enabled) { +#ifndef CONFIG_USER_ONLY + gen_helper_ssamoswap_disabled(tcg_env); +#else return false; +#endif } =20 TCGv dest =3D dest_gpr(ctx, a->rd); @@ -116,7 +120,11 @@ static bool trans_ssamoswap_d(DisasContext *ctx, arg_a= moswap_w *a) } =20 if (!ctx->bcfi_enabled) { +#ifndef CONFIG_USER_ONLY + gen_helper_ssamoswap_disabled(tcg_env); +#else return false; +#endif } =20 TCGv dest =3D dest_gpr(ctx, a->rd); diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 110292e84d..8382aa94cb 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -717,4 +717,53 @@ target_ulong helper_hyp_hlvx_wu(CPURISCVState *env, ta= rget_ulong addr) return cpu_ldl_code_mmu(env, addr, oi, ra); } =20 +void helper_ssamoswap_disabled(CPURISCVState *env) +{ + int exception =3D RISCV_EXCP_ILLEGAL_INST; + + /* + * Here we follow the RISC-V CFI spec [1] to implement the exception t= ype + * of ssamoswap* instruction. + * + * [1] RISC-V CFI spec v1.0, ch2.7 Atomic Swap from a Shadow Stack Loc= ation + * + * Note: We have already checked some conditions in trans_* functions: + * 1. The effective priv mode is not M-mode. + * 2. The xSSE specific to the effictive priv mode is disabled. + */ + if (!get_field(env->menvcfg, MENVCFG_SSE)) { + /* + * Disabled M-mode SSE always trigger illegal instruction when + * current priv mode is not M-mode. + */ + exception =3D RISCV_EXCP_ILLEGAL_INST; + goto done; + } + + if (!riscv_has_ext(env, RVS)) { + /* S-mode is not implemented */ + exception =3D RISCV_EXCP_ILLEGAL_INST; + goto done; + } else if (env->virt_enabled) { + /* + * VU/VS-mode with disabled xSSE will trigger the virtual instruct= ion + * exception. + */ + exception =3D RISCV_EXCP_VIRT_INSTRUCTION_FAULT; + goto done; + } else { + /* + * U-mode with disabled S-mode SSE will trigger the illegal instru= ction + * exception. + * + * Note: S-mode is already handled in the disabled M-mode SSE case. + */ + exception =3D RISCV_EXCP_ILLEGAL_INST; + goto done; + } + +done: + riscv_raise_exception(env, exception, GETPC()); +} + #endif /* !CONFIG_USER_ONLY */ --=20 2.43.0