From nobody Mon Sep 28 02:07:45 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=1785141809; cv=none; d=zohomail.com; s=zohoarc; b=GAlc3LQKRl7652rfEMue7AJ2gy4qiYF3Lzl9oOOPxipc9aN0QrW2BkgsVlxAU40H0MAj/N6JsIjL9HXdZeSS518Ra56atl0Q6vKzR7+ITIMVhswlC8RZQrfJK8ga0GeQF+F6QCXvksWRE14HPHUgsWUF4NXAcxLFw4tx7tMV4N8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785141809; 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=7JHbtJerH3/rQGbPisECyh5JnAIvKEhV7En67m13MGo=; b=IlznwPoj901ZOLtWiJDFj9XoYgxB91Pu+pphV+9+UZfGzOgoIthqtHUvsFB3p6alkWmzYv0Hz63tcvoKI5mUbjvNVz/2QBknu12uoqutdFkWOwU8FHihGgg3wiY8Qdp4gaWOyU1187d7+e1q0SUjOrPcM1+N3esdWO1TLNi5GF4= 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 17851418090154.806567436281057; Mon, 27 Jul 2026 01:43:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woGv0-0002KR-8Z; Mon, 27 Jul 2026 04:42:38 -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 1woGuy-0002K2-QD for qemu-devel@nongnu.org; Mon, 27 Jul 2026 04:42:36 -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 1woGuw-0005dg-V7 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 04:42:36 -0400 Received: by mail-pj2-x01.google.com with SMTP id d9443c01a7336-2ca4f02483cso2504335ad.1 for ; Mon, 27 Jul 2026 01:42:34 -0700 (PDT) Received: from Dell-WorkStation.localdomain ([139.59.245.192]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfde59bc68sm30767175ad.2.2026.07.27.01.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 01:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785141753; x=1785746553; 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:content-type; bh=7JHbtJerH3/rQGbPisECyh5JnAIvKEhV7En67m13MGo=; b=nWRlwCpNtpAhRZyNG6YJwiUdEuKcw4Iih20w6gNowzkr3hIXG7FOh1L2QvJ2wuI/55 QPJ6baJQFWjydRQbnHw9MVFR7tcE4Ou3O42vDRbuK5qW7SfvVzPwNshR1xPRZXDTnm0q hiQYl6M9yqeBtjtv2p73vd/TwbxUP8XS6kfVePKbTJJCzTA7kIQ1hZinb9f18jLZj1sb wU7Ecd9OGOaL4XeoZpfkT3WyVv/gZ8wHmXZHJKaPwWqXVIqbQ/p7aKR68mKA2l1+qcgm kqN/SQf8oY/8vsA6Q1IAHyMAYp0YNRQ4kVh07hnrpbnIGdgeWKb5+j+UqpZCmw4g2hEy hlhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785141753; x=1785746553; h=content-transfer-encoding:mime-version:references:in-reply-to :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=7JHbtJerH3/rQGbPisECyh5JnAIvKEhV7En67m13MGo=; b=hgzgOMG/yoTUnWbe3mOSJjPni//QmnB6X6wZqsRvKGsVMFPSGXYJgt/E8uDTBmcTYU lIIA0mgNZdq2A7ZbGe1HieEymta4te5XNbykzs9l1Do40aJHWCLdojXaIH7x8heDVmRV pJ55q4YciFHvfCdoDAgn8vyC02DdGmtBvds7VOwU5jjhhjpPYljY4shM62Xx0Uv3nlnG AW2I2/udjelGAzQgu+8uNDH1tYBRH6kAYsn9LBGR2SR9sqEelfg9E8Lx6TmqOUKryBid vFyza83J8IEOGBg6qlK5rdPYTgvAb5kfn1qhyQwb3+B+g/4p1+tX3zMdT9vtQ3jYt1wI wB0g== X-Gm-Message-State: AOJu0YxC/PyUwuZlTOaTRIJu7zuX9zOm0uia7vsU6xGJ1CeI4HpbH/Z4 f4NOQQca0SHtcY2A7YbKrqsEqLCEVoUlOnsyMhu5iGNoPL0I0AIJYRqM8TtuTrkLGmE= X-Gm-Gg: AR+sD10awEFahtuRbaXhHpi9oLs/YBre3Ro2ygzHxbtqFHhLbwIo62lLC5SkfuvE24T AWe6uPPoDxS4gdgbI+1GLFweW59RXw53IwZkFFNOXscrLyDFgrK3rPRmQR8FmfDY1RPyrxO3IhY AoGcEZGMvKevMOcUwJL0QJjffDf1eBs1MIZkuVYx2WkOcebhC8rE2b3In9VZ92qaoGY/PMjga4c ci0vFlZGotb4o796n/LZlAwrzQ9PiCxPEnqSFkKK34heDwQ2nivUckYY16nIWGYM0fa++QaGpcE rcOObijUYCihv+8DKGbPvZyLBj/bmFVEYwRgh0jI+gxIB4JG+HlLId6CDlIMdEWI0lTIvlKLBC5 6l4xFCzjL2WG8usczPm1E+8GkPfdzwN8Ht9HRM6hSLvu83qF/J61kYP21GDYeD+nTZxcUYZQ8R0 VOs5HLDoaOssc/VHCPIYPQbKjmPl9TNgk= X-Received: by 2002:a17:902:e803:b0:2bf:13af:b077 with SMTP id d9443c01a7336-2cfdf3f056amr64493725ad.14.1785141752522; Mon, 27 Jul 2026 01:42:32 -0700 (PDT) From: Zephyr Li To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, chao.liu@processmission.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, Zephyr Li Subject: [PATCH v2] target/riscv: preserve vl on element-zero fault Date: Mon, 27 Jul 2026 16:42:03 +0800 Message-ID: <20260727084203.881580-1-fritchleybohrer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260724030145.14778-1-fritchleybohrer@gmail.com> References: <20260724030145.14778-1-fritchleybohrer@gmail.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=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=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: 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: 1785141811527158500 Content-Type: text/plain; charset="utf-8" A unit-stride fault-only-first load must leave vl unchanged when element zero raises a synchronous exception. Keep the shortened value in a local bound until all loads complete, and only then update the architectural vl. Add a bare-metal RVV regression test which faults vle32ff.v on element zero and checks that vl remains unchanged in the trap handler. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3544 Reviewed-by: Chao Liu Signed-off-by: Zephyr Li Reviewed-by still applies. --- Changes in v2: - Fix commit message formatting. - Enable vector state in the bare-metal test. - Use an aligned unmapped address and compare against the vsetvli result. - Express the mstatus.VS setting as a field shift. target/riscv/tcg/vector_helper.c | 23 +++++---- tests/tcg/riscv64/Makefile.softmmu-target | 5 ++ tests/tcg/riscv64/test-vle32ff.S | 57 +++++++++++++++++++++++ 3 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 tests/tcg/riscv64/test-vle32ff.S diff --git a/target/riscv/tcg/vector_helper.c b/target/riscv/tcg/vector_hel= per.c index e321ca2616..5a310822b7 100644 --- a/target/riscv/tcg/vector_helper.c +++ b/target/riscv/tcg/vector_helper.c @@ -686,7 +686,7 @@ vext_ldff(void *vd, void *v0, target_ulong base, CPURIS= CVState *env, uint32_t desc, vext_ldst_elem_fn_tlb *ldst_tlb, vext_ldst_elem_fn_host *ldst_host, uint32_t log2_esz, uintptr_t = ra) { - uint32_t i, k, vl =3D 0; + uint32_t i, k, vl =3D 0, load_vl; uint32_t nf =3D vext_nf(desc); uint32_t vm =3D vext_vm(desc); uint32_t max_elems =3D vext_max_elems(desc, log2_esz); @@ -752,22 +752,24 @@ vext_ldff(void *vd, void *v0, target_ulong base, CPUR= ISCVState *env, } } ProbeSuccess: - /* load bytes from guest memory */ - if (vl !=3D 0) { - env->vl =3D vl; - } + /* + * Keep a shortened vl local until all loads complete. In particular, + * an exception from element zero must leave the architectural vl alon= e. + */ + load_vl =3D vl ? vl : env->vl; =20 - if (env->vstart < env->vl) { + if (env->vstart < load_vl) { if (vm) { /* Load/store elements in the first page */ if (likely(elems)) { + elems =3D MIN(elems, load_vl - env->vstart); vext_page_ldst_us(env, vd, addr, elems, nf, max_elems, log2_esz, true, mmu_index, ldst_tlb, ldst_host, ra); } =20 /* Load/store elements in the second page */ - if (unlikely(env->vstart < env->vl)) { + if (unlikely(env->vstart < load_vl)) { /* Cross page element */ if (unlikely(page_split % msize)) { for (k =3D 0; k < nf; k++) { @@ -780,7 +782,7 @@ ProbeSuccess: =20 addr =3D base + ((env->vstart * nf) << log2_esz); /* Get number of elements of second page */ - elems =3D env->vl - env->vstart; + elems =3D load_vl - env->vstart; =20 /* Load/store elements in the second page */ vext_page_ldst_us(env, vd, addr, elems, nf, max_elems, @@ -788,7 +790,7 @@ ProbeSuccess: ldst_host, ra); } } else { - for (i =3D env->vstart; i < env->vl; i++) { + for (i =3D env->vstart; i < load_vl; i++) { k =3D 0; while (k < nf) { if (!vext_elem_mask(v0, i)) { @@ -806,6 +808,9 @@ ProbeSuccess: } } } + if (vl !=3D 0) { + env->vl =3D vl; + } env->vstart =3D 0; =20 vext_set_tail_elems_1s(env->vl, vd, desc, nf, esz, max_elems); diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/= Makefile.softmmu-target index 82be8a2c91..7ae225bd73 100644 --- a/tests/tcg/riscv64/Makefile.softmmu-target +++ b/tests/tcg/riscv64/Makefile.softmmu-target @@ -41,5 +41,10 @@ comma:=3D , run-test-crc32: test-crc32 $(call run-test, $<, $(QEMU) -cpu rv64$(comma)xlrbr=3Dtrue $(QEMU_OPTS)$<) =20 +EXTRA_RUNS +=3D run-test-vle32ff +run-test-vle32ff: test-vle32ff + $(call run-test, $<, $(QEMU) -cpu rv64$(comma)v=3Dtrue $(QEMU_OPTS)$<) +test-vle32ff: CFLAGS +=3D -march=3Drv64gcv + # We don't currently support the multiarch system tests undefine MULTIARCH_TESTS diff --git a/tests/tcg/riscv64/test-vle32ff.S b/tests/tcg/riscv64/test-vle3= 2ff.S new file mode 100644 index 0000000000..f510960c05 --- /dev/null +++ b/tests/tcg/riscv64/test-vle32ff.S @@ -0,0 +1,57 @@ +/* + * Verify that a fault-only-first load keeps vl unchanged when element zero + * raises a synchronous exception. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + .option norvc + + .text + .globl _start +_start: + lla t0, trap + csrw mtvec, t0 + + li t0, (1 << 9) /* Set mstatus.VS to Initial. */ + csrs mstatus, t0 + li t1, 4 + vsetvli t2, t1, e32, m1, ta, ma + li t0, 0x18000000 /* Unmapped gap in the virt memory map. */ + vle32ff.v v1, (t0) + + /* Element zero did not trap. */ + li a0, 1 + j _exit + +trap: + csrr t0, mcause + li t1, 5 /* Load access fault. */ + bne t0, t1, trap_fail + + csrr t0, vl + bne t0, t2, trap_fail + + li a0, 0 + j _exit + +trap_fail: + li a0, 1 + +_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 */ + + .balign 16 + slli zero, zero, 0x1f + ebreak + srai zero, zero, 0x7 + j . + + .data + .balign 8 +semiargs: + .space 16