From nobody Mon Sep 28 00:09:43 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1789440654; cv=none; d=zohomail.com; s=zohoarc; b=Ngw2ueo+sB6rJgX5szwPl42P781q5nYAPr+b3ka83AIz/A9+eznerDQJVeYrvWEgKT5ZMQFd5UMCs1ugoUAKJ5Hal5aIFt6m+hyslbEEbfVDZNwK+B9N74vZdOtzoIwpDpJUZ7zkFcBK8WabR+/OwozU2e42QNM6I37DZ2BlO0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789440654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zIfRCXrwFq9A0MguHCRXRlhKTnM48nvriB1y/d3i2Gc=; b=SAvTdc4Lqb9/obifa6QDxC3kRSd/PhqMUHnARBhT8rozOP0ud6d3bZmFCq+yQR/+bCreVSRhWALSjrEPG6OWAJo75RVe2B8c8HTcoE1MC6N4Bse7y/hDmUXFGUcnBlYUXrDutmGM26jurEKVTNEwrp7EcIgF55CFB2RmgYoQOuI= 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=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789440654664952.4562317950025; Mon, 14 Sep 2026 19:50:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6JFR-0001nO-1e; Mon, 14 Sep 2026 22:50:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6JFO-0001mr-Vv for qemu-devel@nongnu.org; Mon, 14 Sep 2026 22:50:15 -0400 Received: from mail-pj2-x01.google.com ([2607:f8b0:4864:39::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6JFM-0004ae-UK for qemu-devel@nongnu.org; Mon, 14 Sep 2026 22:50:14 -0400 Received: by mail-pj2-x01.google.com with SMTP id d9443c01a7336-2dae660f31bso28238415ad.1 for ; Mon, 14 Sep 2026 19:50:11 -0700 (PDT) Received: from Dell-WorkStation.localdomain ([103.190.179.27]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2dd2cfce707sm58445935ad.55.2026.09.14.19.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2026 19:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789440610; x=1790045410; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=zIfRCXrwFq9A0MguHCRXRlhKTnM48nvriB1y/d3i2Gc=; b=mjLtnDr3RQCmv8SeOICrpq1VggJWq/8gl02KZXvZ664fSE1X2wi17BdttRjzdbJtbM KKjZzBz9HQ4hBB01bXLsXe8FSQohi+1o598WEftHgQ7q4EVQphgBjt46cDVaUSWLmT8d pUqo2TH8Y8ur5L94DBOWvRvwka9jqm3Uez27dUuJo5D/Nfp0v4DC7uOc8bHOCewFU8v4 ixSuorMoKubqdCM9I8O7qD6oIAZxf1Ytxadat5HbpAuvjLjGJHc8rVnGW7sRGdrQ3755 wzAoF07Ebmwhvc2HCrIq9OFyhrR8zUsHwoaK0nu78hMUsOAkFeHLQoXVnMGCtM04MM56 hPiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789440610; x=1790045410; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zIfRCXrwFq9A0MguHCRXRlhKTnM48nvriB1y/d3i2Gc=; b=vJ3TGgG6oIK3cYiQMqqk+Zv8NGTp8HRYDwuMqGocsqEro+HNoHYvuBOvZZKnfHezvO iOSakwNEKx8vyXjelDxxVruC7yayOTuL0klIsS7u1eL23uPCSOF3z9n7f4/s6UaeZqIr hmNijDfqXdu2Y048+/ZmbPh/Ck/ug1u/fNvqaAnZzX9eTVCFIBjAKZNTWpRpRI8OZoNR ZyNJiDOx0co9NlSSVR2CFx3tcLPhuM2lcZeZkLQAEjbW3PT7oRKhWOcWTLWejgqbExGx w0NC5QYis0HsSwPG54qrwu+UJckIlee3JzXr7RQPAcv02JihzYsliV3Byy9vsS/Wha1X i98A== X-Gm-Message-State: AFuF++m8rN7Xu6aVpjosgin3H4rsToTZu/Jh5eo8EYgrrklwa/F245I6 itnJK3ivFzWRAL7k6DvKryja6UHitZSBhEfZFJgESjUz05rNm1X79FKRwfytQXtg X-Gm-Gg: AYBFou0Upudy4UbDCoBqZzU5nv8Fw9bcVx3yNdyed2OXICWSvyY0nvVwQG3YNxGSckh zrW7S4lRLsQOhN0pVn6drnnLaJDsgn0GeHCUvKzBka4/0ZfJPKK09oy+u8bHvS4Gi+TQA34jmtd RhjoE45cd5CrhMWUwmUjB8H2FA2Yym7lacoLwWDpelI8hbqLnKAbbcj9dqTdldcPXiPrWrKkd5Y h6OpnwTQCnb32r9Z7T1IYfFzqdXcay9yv7F8Jn44T+23tG3tkxuRy9Xgs9NlJbZ8cy8yHhNRjsi Mc+bU/zAw5dEwKkvNNn4Tz8VX5UFUKRuVr2VcWRRMAel/I+e1GJvfFrpjnFKfrW93MI6WivJJBx EbioCOLMcwGZ/cwEKvHfa/cSgx9IH09BuRUl/zsHA9P6YMjWRoAjyPbvafLU29kXxUNAMgtS70J FCViP7pznqZSH4krpIL5l7kQKJ87XAcyaOig9DR80BWBqMAgNDCte21Ycola6dNPdNbAz763gQR 3GVHJAnbvta25I+jKZ9KN7ZNHUtH37I+ZEeLKY= X-Received: by 2002:a17:903:3805:b0:2d0:cc92:f7a3 with SMTP id d9443c01a7336-2dd6c5bfba0mr113696665ad.2.1789440609784; Mon, 14 Sep 2026 19:50:09 -0700 (PDT) From: Zephyr Li To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu@processmission.com, Zephyr Li Subject: [PATCH] target/riscv: mask vsepc according to IALIGN Date: Tue, 15 Sep 2026 10:49:44 +0800 Message-ID: <20260915024945.32329-1-fritchleybohrer@gmail.com> X-Mailer: git-send-email 2.43.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:39::1; envelope-from=fritchleybohrer@gmail.com; helo=mail-pj2-x01.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, FREEMAIL_FROM=0.001, 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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1789440658157158500 Content-Type: text/plain; charset="utf-8" vsepc is the VS-mode counterpart of sepc and is a WARL register, but unlike mepc and sepc its accessors do not mask the low address bits according to IALIGN. As a result, values with invalid low bits can be observed through vsepc. Apply get_xepc_mask() to both vsepc reads and writes, matching the existing mepc/sepc handling. Add a TCG regression test covering both IALIGN=3D16 and IALIGN=3D32. Fixes: 8747c9eeb2aa ("target/riscv: Add Hypervisor virtual CSRs accesses") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4420 Signed-off-by: Zephyr Li Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/csr.c | 4 +- tests/tcg/riscv64/system/meson.build | 11 ++++++ tests/tcg/riscv64/test-vsepc-masking.S | 54 ++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/riscv64/test-vsepc-masking.S diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c index bd4b6dc114..274c5cfbf4 100644 --- a/target/riscv/tcg/csr.c +++ b/target/riscv/tcg/csr.c @@ -5299,14 +5299,14 @@ static RISCVException write_vsscratch(CPURISCVState= *env, int csrno, static RISCVException read_vsepc(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->vsepc; + *val =3D env->vsepc & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 static RISCVException write_vsepc(CPURISCVState *env, int csrno, target_ulong val, uintptr_t ra) { - env->vsepc =3D val; + env->vsepc =3D val & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 diff --git a/tests/tcg/riscv64/system/meson.build b/tests/tcg/riscv64/syste= m/meson.build index 8604c2a45a..5d633a266a 100644 --- a/tests/tcg/riscv64/system/meson.build +++ b/tests/tcg/riscv64/system/meson.build @@ -24,6 +24,17 @@ tests +=3D { 'test-crc32.S': setup + {'qemu_args': ['-cpu', 'rv64,xlrbr=3Dtrue', qemu= _args]}, 'test-minstret-ecall.S': setup + {'qemu_args': ['-icount', 'shift=3D1', = qemu_args]}, 'test-misa-w.S': setup + {'qemu_args': ['-cpu', 'rv64,x-misa-w=3Dtrue,c= =3Dtrue,v=3Dtrue', qemu_args]}, + 'test-vsepc-masking.S': setup + { + 'test_name': 'test-vsepc-masking-c', + 'qemu_args': ['-cpu', 'rv64,h=3Dtrue,c=3Dtrue', qemu_args], + }, +} + +tests +=3D { + 'test-vsepc-masking.S': { + 'test_name': 'test-vsepc-masking-no-c', + 'qemu_args': ['-cpu', 'rv64,h=3Dtrue,c=3Dfalse,zca=3Dfalse', qemu_args= ], + }, } =20 tests +=3D { diff --git a/tests/tcg/riscv64/test-vsepc-masking.S b/tests/tcg/riscv64/tes= t-vsepc-masking.S new file mode 100644 index 0000000000..e5460f8aee --- /dev/null +++ b/tests/tcg/riscv64/test-vsepc-masking.S @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#define MISA_C (1 << 2) + + .option norvc + .text + .global _start +_start: + csrr s0, misa + andi s0, s0, MISA_C + + lla s1, test_addr + ori t0, s1, 3 + csrw vsepc, t0 + csrr t1, vsepc + + beqz s0, ialign32 + addi t2, s1, 2 /* IALIGN=3D16: bit 0 reads as zero. */ + j check + +ialign32: + /* IALIGN=3D32: bits [1:0] read as zero. */ + mv t2, s1 + +check: + li a0, 2 + bne t1, t2, _exit + + li a0, 0 + j _exit + + .balign 4 +test_addr: + nop + +/* Exit code in a0. */ +_exit: + lla a1, semiargs + li t0, 0x20026 /* ADP_Stopped_ApplicationExit */ + sd t0, 0(a1) + sd a0, 8(a1) + li a0, 0x20 /* TARGET_SYS_EXIT_EXTENDED */ + + /* Semihosting call sequence. */ + .balign 16 + slli zero, zero, 0x1f + ebreak + srai zero, zero, 0x7 + j . + + .data + .balign 16 +semiargs: + .space 16 --=20 2.43.0