From nobody Sun Mar 22 14:09:26 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=1774104458; cv=none; d=zohomail.com; s=zohoarc; b=LJ5otM6NedJTSVrLsnbxVuxmsp/5/agLSvSR+Cs9+WZuOpquD297IKj/GVpp6lwLcAgqjvvAXHGK6wQDlz4B4jSDMMuHZ9WVOwAm77CVxpUcUNVI2K3YXSLe3S6tOcV8Y+gu3uZicCS6E2I+E2EdhRyDwvwI7WA6Zwi0AgIVv/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774104458; h=Content-Type: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=FQ5sh+/RM/yM/7FBlkEi36m4uOP235gtc22IzTz9aDE=; b=Jmr42Ds8ZXBtY4ryG72Hvadu6efCMaGxY+GyEihw3wYBbD3iYE/H2X9HkOeiu4VEKljlffCBD8OkRkyFow2MF01Q2uuV2IXczfWD8wKwVcAVRIAsQIZGRBOtpM62QuQBMPtEmvqndW060pkoR0fKsMYXAZHZgwsdHgUZeLN71WQ= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17741044589051002.6011216181056; Sat, 21 Mar 2026 07:47:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3xap-0006zQ-Ju; Sat, 21 Mar 2026 10:46:23 -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 1w3xao-0006yn-0E for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:22 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3xam-00013k-9J for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:21 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-35a04d6aeb0so1144574a91.0 for ; Sat, 21 Mar 2026 07:46:19 -0700 (PDT) Received: from lima-default (103.95.112.190.qld.leaptel.network. [103.95.112.190]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bd24f1b9csm2283060a91.0.2026.03.21.07.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 07:46:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774104379; x=1774709179; 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=FQ5sh+/RM/yM/7FBlkEi36m4uOP235gtc22IzTz9aDE=; b=e1lRwBD2MuFw9wscjgJT8VRoapcx+u7lBW4UCuZt62/wcuHuQybBBTnVlQNM4pXBCe g4aPPLaGUH4H6zXjhoTcbHekxuteAk0zPGKLzca0rJEvjo1xCSfJzKX9ni02ENKr9nAv zvz9id6M0xd4nVENNmV6mugRcJ6S8jeygiM8jmir3rhmepvJtk/SwqffoE2tegs/6LYp JA0TId/E29BkW38hNuND3R1+m+vIyPO7oKnrxIyhi3Repm7IsCpMP5DpWZAuUdyR4dSa 9A67fe/CCGoZHu7NKnH6Zgq9up/uUD3ouQCBe5My+bA1UD/LuEJY2Xmp5mxWvkrMXprf bnRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774104379; x=1774709179; 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; bh=FQ5sh+/RM/yM/7FBlkEi36m4uOP235gtc22IzTz9aDE=; b=iMKufmunduaJcwYlTfSSA6J7XrV1hX3MxzdcKM8/2ZSoEaHkL2FXGrDPP81MLpKkFD igqYRvra7vGmQfePvaWchVsimdYsln2T59VR1vFGz2DpdTDfOd1LKLTWdgYTa3IU7+P8 MDljuU6HADcILRSp7cr7zCfr3Zzs8xRogyoUhoc6hDmV5eVi48cgMqwoL5G8S9HCosKc oaso74OjxdPMZQJvX1zNoP41vODKwwIlQ9Bc5R2ek5KULqKFeFg14OWJ6ZIG1s4DvC8V qX3zpBaQfRAY4f0gu/71BVbG8IsS8Hw6n9Ze2KLLjgD58orbZ4DMZrPqsFWacyQrzkFf NVSA== X-Forwarded-Encrypted: i=1; AJvYcCU0C6fq380CFrNXiBwoJuAU9ZVsRZTLVS5xtM/gYoXFvPwnUGQSoPNLH1vI2da6mLbhkWc8X2QvIAS1@nongnu.org X-Gm-Message-State: AOJu0YxVQm8fcOZxfG/HD7oGyM5d88VQP276F1PCKEPpNmbe+LuYj7Ae hEs9uLtPbH+ojjmf6r2ODpxmnC8jP/27ufkQoFS6wQ1qAlUwW3avjt8R X-Gm-Gg: ATEYQzzRKjaxr1Ef48Pif9mMO+4wWIkDYjOx3Aiwi/UffnRuuD+T0B4KHVblknzSPqO vWc0oTjHZ5FOc/xmy+UIQ2zm4wMTmr6kBNuHnXA8Sz9otQEUK20VCiZEFWQWnG1dOiKGSnpjTEh oFnPWdJjjhxsgllu2fmhiMCOK8E5/Z4HyTAXrFh/RyhXeu2aDYM+Rl4f/0GCNgAThbT7i0EodcH KHE16FVr2+/aTwaKIZfpbohWuZeHGd31OWsqfPDgCQbhPjo+6vUlLwA8ar7MI14BoW6w8sZUqIz /r7GtRgCiRuijkFHPN6dY3hcBvDvY6NBpsriESyUwKp5a3gmab9NNEhN3J2WNebRT+UG/JbQ6Wx nMXNPllRZSdoLO525Xn5NS5Dm7sLswmxHYyZ3qJ0L8QlC6XIarILCgDdGUD5OPh8UYnuAt2ot2M gbYNfR4LasbS48Z2ccA8RkTxb8Rf/X7ogtwlmFOPkpiP1vD349Z0eUY974gvOCXUPhUXos X-Received: by 2002:a17:90b:4c0f:b0:34c:904a:d92 with SMTP id 98e67ed59e1d1-35bd2d6007cmr5343809a91.26.1774104378793; Sat, 21 Mar 2026 07:46:18 -0700 (PDT) From: Nicholas Piggin To: qemu-riscv@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-devel@nongnu.org, Joel Stanley , Nicholas Joaquin , Ganesh Valliappan Subject: [PATCH v3 1/3] target/riscv: Fix IALIGN check in misa write Date: Sun, 22 Mar 2026 00:45:52 +1000 Message-ID: <20260321144554.606417-2-npiggin@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260321144554.606417-1-npiggin@gmail.com> References: <20260321144554.606417-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::102d; envelope-from=npiggin@gmail.com; helo=mail-pj1-x102d.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: 1774104460449154100 The instruction alignment check for the C extension was inverted. The new value should be checked for C bit clear (thus increasing IALIGN). If IALIGN is incompatible, then the write to misa should be suppressed, not just ignoring the update to the C bit. From the ISA: Writing misa may increase IALIGN, e.g., by disabling the "C" extension. If an instruction that would write misa increases IALIGN, and the subsequent instruction=E2=80=99s address is not IALIGN-bit aligne= d, the write to misa is suppressed, leaving misa unchanged. This was found with a verification test generator based on RiESCUE. Reported-by: Nicholas Joaquin Reported-by: Ganesh Valliappan Signed-off-by: Nicholas Piggin --- target/riscv/csr.c | 16 ++++- tests/tcg/riscv64/Makefile.softmmu-target | 5 ++ tests/tcg/riscv64/misa-ialign.S | 88 +++++++++++++++++++++++ 3 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 tests/tcg/riscv64/misa-ialign.S diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 5064483917..91421a2dd8 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -2129,9 +2129,19 @@ static RISCVException write_misa(CPURISCVState *env,= int csrno, /* Mask extensions that are not supported by this hart */ val &=3D env->misa_ext_mask; =20 - /* Suppress 'C' if next instruction is not aligned. */ - if ((val & RVC) && (get_next_pc(env, ra) & 3) !=3D 0) { - val &=3D ~RVC; + /* + * misa writes that increase IALIGN beyond alignment of the next + * instruction cause the write to misa to be suppressed. Clearing + * "C" extension increases IALIGN. + */ + if (!(val & RVC) && (get_next_pc(env, ra) & 3) !=3D 0) { + /* + * If the next instruction is unaligned mod 4 then "C" must be + * set or this instruction could not be executing, so we know + * this is is clearing "C" (and not just keeping it clear). + */ + g_assert(env->misa_ext & RVC); + return RISCV_EXCP_NONE; } =20 /* Disable RVG if any of its dependencies are disabled */ diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/= Makefile.softmmu-target index eb1ce6504a..f176f87ed0 100644 --- a/tests/tcg/riscv64/Makefile.softmmu-target +++ b/tests/tcg/riscv64/Makefile.softmmu-target @@ -36,5 +36,10 @@ run-plugin-interruptedmemory: interruptedmemory $(QEMU) -plugin ../plugins/libdiscons.so -d plugin -D $<.pout \ $(QEMU_OPTS)$<) =20 +EXTRA_RUNS +=3D run-misa-ialign +run-misa-ialign: QEMU_OPTS :=3D -cpu rv64,c=3Dtrue,v=3Dtrue,x-misa-w=3Don = $(QEMU_OPTS) +run-misa-ialign: misa-ialign + $(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<) + # We don't currently support the multiarch system tests undefine MULTIARCH_TESTS diff --git a/tests/tcg/riscv64/misa-ialign.S b/tests/tcg/riscv64/misa-ialig= n.S new file mode 100644 index 0000000000..7f1eb30023 --- /dev/null +++ b/tests/tcg/riscv64/misa-ialign.S @@ -0,0 +1,88 @@ +/* + * Test for MISA changing C and related IALIGN alignment cases + * + * This test verifies that the "C" extension can be cleared and set in MIS= A, + * that a branch to 2-byte aligned instructions can be executed when "C" is + * enabled, and that a write to MISA which would increase IALIGN and cause + * the next instruction to be unaligned is ignored. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#define RVC (1 << ('C'-'A')) +#define RVV (1 << ('V'-'A')) + +.option norvc + .text + .global _start +_start: + lla t0, trap + csrw mtvec, t0 + + csrr t0, misa + li t1, RVC + not t1, t1 + and t0, t0, t1 + csrw misa, t0 + csrr t1, misa + li a0, 2 # fail code + bne t0, t1, _exit # Could not clear RVC in MISA + + li t1, RVC + or t0, t0, t1 + csrw misa, t0 + csrr t1, misa + li a0, 3 # fail code + bne t0, t1, _exit # Could not set RVC in MISA + + j unalign +. =3D . + 2 +unalign: + + li t1, RVC + not t1, t1 + and t0, t0, t1 + csrw misa, t0 + csrr t1, misa + li a0, 4 # fail code + beq t0, t1, _exit # Was able to clear RVC in MISA + + li t0, (RVC|RVV) + not t0, t0 + and t0, t0, t1 + csrw misa, t0 + csrr t0, misa + li a0, 5 # fail code + bne t0, t1, _exit # MISA write was not ignored (RVV was cleared) + + j realign +. =3D . + 2 +realign: + + # Success! + li a0, 0 + j _exit + +trap: + # Any trap is a fail code 1 + li a0, 1 + +# 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.51.0 From nobody Sun Mar 22 14:09:26 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=1774104433; cv=none; d=zohomail.com; s=zohoarc; b=iEGKPJA1EWsG6tftvQ2YYdDr/SWVDJYfGezFwEnCu9eYjR29quzosAd7HzbAvZ4Xqh7nSn3zloCWz4wE5hq6R2mUgGJHW7vIYcii7k9yc2zBm3Rn1NS9IOcwDa8PehdSvybBNW1GmCWoJnMacO/849EQ90Ab3bAEvHn653TPWZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774104433; 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=pNzWLO6D7NdGE2f+sWqVLcKxyJ48nyjmrOFUgZ82abo=; b=IUEPWqk4gOn662TpaYVPU8mwK5wBcf9VD8o5fU2BMWPhpXRP2WxC/5OmfueiazvGnU0pqBfTS+vdYoW5JJN5C6qeFCN3KpDcy8J9aEEIP92h78GTcB8jzCTj3g7ToWmbSpcRQQnDMf9YD1eoqWLgg/Nm3DLou/IHlhQ02+9GmcU= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774104433473508.6528484780646; Sat, 21 Mar 2026 07:47:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3xb9-000712-1X; Sat, 21 Mar 2026 10:46:44 -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 1w3xav-00070J-VD for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:30 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3xas-000147-Cg for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:28 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-35b97ed057cso900592a91.1 for ; Sat, 21 Mar 2026 07:46:26 -0700 (PDT) Received: from lima-default (103.95.112.190.qld.leaptel.network. [103.95.112.190]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bd24f1b9csm2283060a91.0.2026.03.21.07.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 07:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774104385; x=1774709185; 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=pNzWLO6D7NdGE2f+sWqVLcKxyJ48nyjmrOFUgZ82abo=; b=Mis7wZEY/3ZiRTY0ppYaDROZVBkKrrCeJkUINz7/mhnC5aZVzrp6RNTWGfhwy+JJud tOox7CIykJee8oPxQsdl64934pw4eoPiIHlONuYoNN3EQ10Z0UBpMoCPTyJsrWq2yQg9 1QCv5bTJGAvEmPVaPWG4v+aqTPszXhUtaRKFyqjriQ7a4LAlDjdChOE0209dYS2BkeK+ FBgzZnK2g3dNiIieQzxfnroNGkRFeAT6vOqaeiJMW18VL2UTPRlp51z7HZlOJ8ebI8Uu Ii83/DXoroKOdO9j7SMlkt6+0no4euz5dP/v76K0N56gD6wy5Vv7OetXSNmqKxZvz6w/ KhCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774104385; x=1774709185; 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; bh=pNzWLO6D7NdGE2f+sWqVLcKxyJ48nyjmrOFUgZ82abo=; b=k8cKQztVFYDq+F0gNhm/7Z9S+bwAmHMk8gIsb91NT/N32bmWA/fJzu10wUBFDEZf6g atuav56+KfjVC3cQldEWhqIKZK/vuQ4RFL6cQd1rKQTEr6a6ImDnLOcLT7YL54pv6t/T tmu3Ha4yBdXPbLb/0Tu+QdO7JbyGumjeZHiaFlsnqJ+KQUYlVL+Xg7R1HhXyn5S4gKb9 p3fCnOznZRQW3BfPpAm40dV952p7CwMNjQgmfLyKikBRvCw8Hhv+YQCwtgij7M74rTKM ec7VR7A62pEig91Bsh74T/oPFyFm1Twat6xEUQy8OZLJfcBFTz01LLgcx6tOE9tUrYbL 9rFg== X-Forwarded-Encrypted: i=1; AJvYcCWwDjAjNPxiSoIuHUzFQq0U8gu51UiHaiFsb7y4Pj99wKKR5ZVa1XaU8AmssQCPVK3r0DKaY4w80dbo@nongnu.org X-Gm-Message-State: AOJu0Yy2XTD6wcNyYjRPc9CjpqPLjRk2r7qzUh77Mbi6yZzgAxcg82fD Woz8jPpLS+Pi3ShUMDiu7gAzpkRlrWPzCGD6qVoeWtoyN9LtbjNsp3rK X-Gm-Gg: ATEYQzw4NUyqK2Xh2akSif7BLOzSQHqkChc5ulyk2Ke3vv7e3ZjktAD7/QGA6qgOosC E7mq3DUuae02vIzV1yjIf/I9VlrzkpaGAWFJEfrq4HvcTOJrwlRLWycFESSkFUgWj4VGhPthRp7 IhXA6x93u0f5KY9aI7yAbPQwL4pog9YqRWRMiJxJvvla5XjkUNGJ/yUEo1ZWGL8OnZg4ywt/4fa 2RvEer68ob8xGY7vJVbr8TzXA6YicOUfisqn4XT4b0Xd6IPo1EH9sU7OmRMflIwSjeErFNWTlQD kiwPleDhtyhtjRIRa5GgZqorHVHuhmOE19NliyzrMtcedLwFICxymziO6nsPz89CwyJLUhGrBwj J2YK/PUUO9kZPueE43FCqMljuH9gwGjM2Z4Y/YhOqy+xG9hevfrpGepOuPDS6YM3xdgZOXVBlJy y9Wn3IDpOn7ch+COXBJDu9pVFXbsxs9A1JB/BvVVyq47vGz+q5KWlDTiXl2Qdk+yrOaUC0 X-Received: by 2002:a17:90a:1648:b0:35b:e4d7:53f0 with SMTP id 98e67ed59e1d1-35be4d7960fmr453499a91.32.1774104384973; Sat, 21 Mar 2026 07:46:24 -0700 (PDT) From: Nicholas Piggin To: qemu-riscv@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-devel@nongnu.org, Joel Stanley , Nicholas Joaquin , Ganesh Valliappan Subject: [PATCH v3 2/3] target/riscv: Fix vector whole ldst vstart check Date: Sun, 22 Mar 2026 00:45:53 +1000 Message-ID: <20260321144554.606417-3-npiggin@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260321144554.606417-1-npiggin@gmail.com> References: <20260321144554.606417-1-npiggin@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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=npiggin@gmail.com; helo=mail-pj1-x1030.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: 1774104435422158501 Content-Type: text/plain; charset="utf-8" The whole vector ldst instructions do not include a vstart check, so an overflowed vstart can result in an underflowed memory address offset and crash: accel/tcg/cputlb.c:1465:probe_access_flags: assertion failed: (-(addr | TARGET_PAGE_MASK) >=3D size) Add the VSTART_CHECK_EARLY_EXIT() check for these helpers. This was found with a verification test generator based on RiESCUE. Reported-by: Nicholas Joaquin Reported-by: Ganesh Valliappan Signed-off-by: Nicholas Piggin --- target/riscv/vector_helper.c | 2 + tests/tcg/riscv64/Makefile.target | 5 ++ tests/tcg/riscv64/test-vstart-overflow.c | 78 ++++++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 tests/tcg/riscv64/test-vstart-overflow.c diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index caa8dd9c12..4126447d11 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -825,6 +825,8 @@ vext_ldst_whole(void *vd, target_ulong base, CPURISCVSt= ate *env, uint32_t desc, uint32_t esz =3D 1 << log2_esz; int mmu_index =3D riscv_env_mmu_index(env, false); =20 + VSTART_CHECK_EARLY_EXIT(env, evl); + /* Calculate the page range of first page */ addr =3D base + (env->vstart << log2_esz); page_split =3D -(addr | TARGET_PAGE_MASK); diff --git a/tests/tcg/riscv64/Makefile.target b/tests/tcg/riscv64/Makefile= .target index 4da5b9a3b3..19a49b6467 100644 --- a/tests/tcg/riscv64/Makefile.target +++ b/tests/tcg/riscv64/Makefile.target @@ -18,3 +18,8 @@ TESTS +=3D test-fcvtmod test-fcvtmod: CFLAGS +=3D -march=3Drv64imafdc test-fcvtmod: LDFLAGS +=3D -static run-test-fcvtmod: QEMU_OPTS +=3D -cpu rv64,d=3Dtrue,zfa=3Dtrue + +# Test for vstart >=3D vl +TESTS +=3D test-vstart-overflow +test-vstart-overflow: CFLAGS +=3D -march=3Drv64gcv +run-test-vstart-overflow: QEMU_OPTS +=3D -cpu rv64,v=3Don diff --git a/tests/tcg/riscv64/test-vstart-overflow.c b/tests/tcg/riscv64/t= est-vstart-overflow.c new file mode 100644 index 0000000000..6c904ab309 --- /dev/null +++ b/tests/tcg/riscv64/test-vstart-overflow.c @@ -0,0 +1,78 @@ +/* + * Test for VSTART set to overflow VL + * + * TCG vector instructions should call VSTART_CHECK_EARLY_EXIT() to check + * this case, otherwise memory addresses can underflow and misbehave or + * crash QEMU. + * + * TODO: Add stores and other instructions. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include + +#define VSTART_OVERFLOW_TEST(insn) \ +({ \ + uint8_t vmem[64] =3D { 0 }; \ + uint64_t vstart; \ + asm volatile(" \r\n \ + # Set VL=3D52 and VSTART=3D56 \r\n \ + li t0, 52 \r\n \ + vsetvli x0, t0, e8, m4, ta, ma \r\n \ + li t0, 56 \r\n \ + csrrw x0, vstart, t0 \r\n \ + li t1, 64 \r\n \ + " insn " \r\n \ + csrr %0, vstart \r\n \ + " : "=3Dr"(vstart), "+A"(vmem) :: "t0", "t1", "v24", "memory"); \ + vstart; \ +}) + +int run_vstart_overflow_tests() +{ + /* + * An implementation is permitted to raise an illegal instruction + * exception when executing a vector instruction if vstart is set to a + * value that could not be produced by the execution of that instructi= on + * with the same vtype. If TCG is changed to do this, then this test + * could be updated to handle the SIGILL. + */ + if (VSTART_OVERFLOW_TEST("vl1re16.v v24, %1")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vs1r.v v24, %1")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vle16.v v24, %1")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vse16.v v24, %1")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vluxei8.v v24, %1, v20")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vloxei8.v v24, %1, v20")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vlse16.v v24, %1, t1")) { + return 1; + } + + if (VSTART_OVERFLOW_TEST("vlseg2e8.v v24, %1")) { + return 1; + } + + return 0; +} + +int main() +{ + return run_vstart_overflow_tests(); +} --=20 2.51.0 From nobody Sun Mar 22 14:09:26 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=1774104442; cv=none; d=zohomail.com; s=zohoarc; b=AyimqOPrI+VPImadf4Xv+XM2NISRmjtj9+X+STDjPy1Esl4SKusKHu8I89Vn7UfBWAYoxstINuPDRtIw8MszlnFSCJ1yOBhQQonpLtf6bIy6/rP2RFU8DUzQi51IP/MQ7enW72q9UYRIz+a0Sm+pqj7fOzz5w6SetK1hXkhEuik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774104442; 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=4FxZI4z3rOz6H+RHO7jTyWTYOkyCV4lSQuIwbzBbor8=; b=eMw2J1rZfn5QGkr/LznPqfMDmzUfAAWvzOxBEhTWbnz6PWJFD/b9urERDgzg9c8q6dzZjax0TexioC61DbuINxnCYfOh0vPxlpxVSBUQXeJqwOK0CSrV4WisW4N6wMjfu5OkAvO+nkeuAcVx5l/e+N30PI2e29qrjHyL+XW1+8k= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774104442186730.0617595232845; Sat, 21 Mar 2026 07:47:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3xbE-00072m-Ts; Sat, 21 Mar 2026 10:46:48 -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 1w3xb0-000717-27 for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:34 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3xax-00014s-Ov for qemu-devel@nongnu.org; Sat, 21 Mar 2026 10:46:33 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-35b95a7444bso878473a91.1 for ; Sat, 21 Mar 2026 07:46:31 -0700 (PDT) Received: from lima-default (103.95.112.190.qld.leaptel.network. [103.95.112.190]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bd24f1b9csm2283060a91.0.2026.03.21.07.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2026 07:46:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774104390; x=1774709190; 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=4FxZI4z3rOz6H+RHO7jTyWTYOkyCV4lSQuIwbzBbor8=; b=eDGENyMYpAqFuouKlhWHoEt5pz1KFOsWG3JANPzFON6fXdYupP6s8EUUUTPi4lirUN M0jCDmI6+d4M3etf7CEvXdxmzZ7IVcGta+5iN6VA12SeXQ95Y9KgYstSEAfOdN1rOUKF XhPvw0JpcD1GBTLZ663MIurC8uvlMXd6Up2SeXwaQFAt3ar8riE+4S8qhTqhRCxxTUSt Vv0oWPMvLCjZIGSamjj/i5S28nFciOQ0kztDrFeEk+c2maBon9bApn9e6s6+J0EkAQt5 +gygNu9a25E9MTrdod7k8irwv68tCfSe909lg7UAj4nSaK6hzI+8AP+dcZcbdhK7mxq7 YMyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774104390; x=1774709190; 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; bh=4FxZI4z3rOz6H+RHO7jTyWTYOkyCV4lSQuIwbzBbor8=; b=a88WNYHJKxUWI9N9pveARTjvJUU0oAdVuiMZicDqIpH37eJvaqfmi8L04EYmkbpsuH C/g3/gbq6oaBZXHK3tM1RWZqyl+P3xXWbBE/QAOyIqIEw/BZ8v7Gko/PsNwDvP9/tCKU 4K5758A/GYOXEHeEfKqkWK27aTTRRUniM7WwJ1x5GaXQdvB8LjLt+lF7XFFHlFon+ZGE 4h/ObtOr9bRwzwRPDhP9GvJZsfradwbY362TX0W/B7iXbwVK3SWTtLz+MzQlhLPx/kah 6NMA7iWYd+byFf7vuw5ebS4wR5tMfPWCARbmNW5duK+KAAuJTqi5wcX2QlxDCvfcfADG UU4w== X-Forwarded-Encrypted: i=1; AJvYcCXiLBUNQBrrnWj26zSe+HpFd/dVdl0MDcz0ZigP7ZW+FpPLz/p3VJOx1I4E7C2Vm6p+1cshNIbMABRS@nongnu.org X-Gm-Message-State: AOJu0Yx1G+3QS7G2Hof4Hv5gYioFmkY9vMtXyAlE1LmLfSNLnsAcyL45 Faq9FmxKj555p2gAYbV/uq1y5reSAYIPCOostjn1pJ7JBPgDqRWf6mIF X-Gm-Gg: ATEYQzyZjPKvmFcn5EqHY+YMacDBhitKjBe8dDjA+xwmvUJghPt0glT3nqQqb/qpUMd taAgUzK/S8cFpNA6lxsc3L8zrUxHDGVtIzyWmQODqoZGb7BDF22n1zznEDLolHAK6mAmJLyCgO6 CVwnA1XDPTjSLIJ+uSVuX5z8yciGqAhPdpbJBw++RVwktZCLlcDcDe3KHU/cV8wkcb90eIcPC+P Pg+lUZ5KRy3f00Ht0YJUP7sefvoIBfS2jzhFxrH/bGJBsXs55oUp3AmLRREcWWN++gBJVeCUoK5 qY8VYHHmwzQHFmVYhleB0SfZu+XonqEhpILbK0YgOwLN2PSNqzFp43TBwZkAC9hIGZcbB70kZ9j VX8KMYYek/toX0BFUc2kErtngFmA/EB5CWhQISKBbIcMh9AiSC3BYWq625xQpWljU5hJ9Js/Wox ZKiZlPDik1BiRAyVU/3/W5drfN0wxMnw3Q7zf7efBtABtZj3iUcccARZJzjWgoAdcbBEWB X-Received: by 2002:a17:90b:3d48:b0:359:fecd:1cd3 with SMTP id 98e67ed59e1d1-35bd2d1cf08mr5074721a91.23.1774104390319; Sat, 21 Mar 2026 07:46:30 -0700 (PDT) From: Nicholas Piggin To: qemu-riscv@nongnu.org Cc: Nicholas Piggin , Laurent Vivier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-devel@nongnu.org, Joel Stanley Subject: [PATCH v3 3/3] tests/tcg: Add riscv test for interrupted vector ops Date: Sun, 22 Mar 2026 00:45:54 +1000 Message-ID: <20260321144554.606417-4-npiggin@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260321144554.606417-1-npiggin@gmail.com> References: <20260321144554.606417-1-npiggin@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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=npiggin@gmail.com; helo=mail-pj1-x1031.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: 1774104443199158500 Content-Type: text/plain; charset="utf-8" riscv vector instructions can be interrupted with a trap, and partial completion is recorded in the vstart register. Some causes are implementation dependent, for example an asynchronous interrupt (which I don't think TCG allows). Others are architectural, typically memory access faults on vector load/store instructions. Add some TCG tests for interrupting vector load instructions and resuming partially completed ones. This would have caught a recent (now reverted) regression in vector stride load implementation, commit 28c12c1f2f50d ("Generate strided vector loads/stores with tcg nodes.") Signed-off-by: Nicholas Piggin --- tests/tcg/riscv64/Makefile.target | 11 + tests/tcg/riscv64/test-interrupted-v.c | 329 +++++++++++++++++++++++++ 2 files changed, 340 insertions(+) create mode 100644 tests/tcg/riscv64/test-interrupted-v.c diff --git a/tests/tcg/riscv64/Makefile.target b/tests/tcg/riscv64/Makefile= .target index 19a49b6467..b2b2325843 100644 --- a/tests/tcg/riscv64/Makefile.target +++ b/tests/tcg/riscv64/Makefile.target @@ -1,6 +1,10 @@ # -*- Mode: makefile -*- # RISC-V specific tweaks =20 +# Not all environments have compilers with vector intrinsics yet. +HAVE_RISCV_VECTOR_INTRINSICS :=3D $(shell echo '#ifndef __riscv_v_intrinsi= c\n#error\n#endif' | \ + $(CC) -march=3Drv64gcv -E -x c - >/dev/n= ull 2>&1 && echo y) + VPATH +=3D $(SRC_PATH)/tests/tcg/riscv64 TESTS +=3D test-div TESTS +=3D noexec @@ -23,3 +27,10 @@ run-test-fcvtmod: QEMU_OPTS +=3D -cpu rv64,d=3Dtrue,zfa= =3Dtrue TESTS +=3D test-vstart-overflow test-vstart-overflow: CFLAGS +=3D -march=3Drv64gcv run-test-vstart-overflow: QEMU_OPTS +=3D -cpu rv64,v=3Don + +ifeq ($(HAVE_RISCV_VECTOR_INTRINSICS),y) +# Test for interrupted vector instructions +TESTS +=3D test-interrupted-v +test-interrupted-v: CFLAGS +=3D -march=3Drv64gcv +run-test-interrupted-v: QEMU_OPTS +=3D -cpu rv64,v=3Don +endif diff --git a/tests/tcg/riscv64/test-interrupted-v.c b/tests/tcg/riscv64/tes= t-interrupted-v.c new file mode 100644 index 0000000000..3d0d21b49b --- /dev/null +++ b/tests/tcg/riscv64/test-interrupted-v.c @@ -0,0 +1,329 @@ +/* + * Test for interrupted vector operations. + * + * Some vector instructions can be interrupted partially complete, vstart = will + * be set to where the operation has progressed to, and the instruction ca= n be + * re-executed with vstart !=3D 0. It is implementation dependent as to wh= at + * instructions can be interrupted and what vstart values are permitted wh= en + * executing them. Vector memory operations can typically be interrupted + * (as they can take page faults), so these are easy to test. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static unsigned long page_size; + +static volatile int nr_segv; +static volatile unsigned long fault_start, fault_end; +static volatile bool fault_write; + +/* + * Careful: qemu-user does not save/restore vector state in + * signals yet, so any library or compiler autovec code will + * corrupt our test. + * + * Do only minimal work in the signal handler. + */ +static void SEGV_handler(int signo, siginfo_t *info, void *context) +{ + unsigned long page =3D (unsigned long)info->si_addr & + ~(unsigned long)(page_size - 1); + + assert((unsigned long)info->si_addr >=3D fault_start); + assert((unsigned long)info->si_addr < fault_end); + if (fault_write) { + mprotect((void *)page, page_size, PROT_READ | PROT_WRITE); + } else { + mprotect((void *)page, page_size, PROT_READ); + } + nr_segv++; +} + +/* Use noinline to make generated code easier to inspect */ +static __attribute__((noinline)) +uint8_t unit_load(uint8_t *mem, size_t nr, bool ff) +{ + size_t vl; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + if (ff) { + vec =3D __riscv_vle8ff_v_u8m1(mem, &vl, vl); + } else { + vec =3D __riscv_vle8_v_u8m1(mem, vl); + } + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t seg2_load(uint8_t *mem, size_t nr, bool ff) +{ + size_t vl; + vuint8m1x2_t segvec; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + if (ff) { + segvec =3D __riscv_vlseg2e8ff_v_u8m1x2(mem, &vl, vl); + } else { + segvec =3D __riscv_vlseg2e8_v_u8m1x2(mem, vl); + } + vec =3D __riscv_vadd_vv_u8m1(__riscv_vget_v_u8m1x2_u8m1(segvec, 0), + __riscv_vget_v_u8m1x2_u8m1(segvec, 1), vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t strided_load(uint8_t *mem, size_t nr, size_t stride) +{ + size_t vl; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + vec =3D __riscv_vlse8_v_u8m1(mem, stride, vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +static __attribute__((noinline)) +uint8_t indexed_load(uint8_t *mem, size_t nr, uint32_t *indices) +{ + size_t vl; + vuint32m4_t idx; + vuint8m1_t vec, redvec, sum; + + vl =3D __riscv_vsetvl_e8m1(nr); + idx =3D __riscv_vle32_v_u32m4(indices, vl); + vec =3D __riscv_vloxei32_v_u8m1(mem, idx, vl); + redvec =3D __riscv_vmv_v_x_u8m1(0, vl); + sum =3D __riscv_vredsum_vs_u8m1_u8m1(vec, redvec, vl); + return __riscv_vmv_x_s_u8m1_u8(sum); +} + +/* New store functions */ +static __attribute__((noinline)) +void unit_store(uint8_t *mem, size_t nr, vuint8m1_t vec) +{ + size_t vl; + + vl =3D __riscv_vsetvl_e8m1(nr); + __riscv_vse8_v_u8m1(mem, vec, vl); +} + +static __attribute__((noinline)) +void seg2_store(uint8_t *mem, size_t nr, vuint8m1x2_t segvec) +{ + size_t vl; + + vl =3D __riscv_vsetvl_e8m1(nr); + __riscv_vsseg2e8_v_u8m1x2(mem, segvec, vl); +} + +static __attribute__((noinline)) +void strided_store(uint8_t *mem, size_t nr, size_t stride, vuint8m1_t vec) +{ + size_t vl; + + vl =3D __riscv_vsetvl_e8m1(nr); + __riscv_vsse8_v_u8m1(mem, stride, vec, vl); +} + +static __attribute__((noinline)) +void indexed_store(uint8_t *mem, size_t nr, uint32_t *indices, vuint8m1_t = vec) +{ + size_t vl; + vuint32m4_t idx; + + vl =3D __riscv_vsetvl_e8m1(nr); + idx =3D __riscv_vle32_v_u32m4(indices, vl); + __riscv_vsoxei32_v_u8m1(mem, idx, vec, vl); +} + +/* Use e8 elements, 128-bit vectors */ +#define NR_ELEMS 16 + +static int run_interrupted_v_tests(void) +{ + struct sigaction act =3D { 0 }; + uint8_t *mem; + uint32_t indices[NR_ELEMS]; + int i; + + page_size =3D sysconf(_SC_PAGESIZE); + + act.sa_flags =3D SA_SIGINFO; + act.sa_sigaction =3D &SEGV_handler; + if (sigaction(SIGSEGV, &act, NULL) =3D=3D -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } + + mem =3D mmap(NULL, NR_ELEMS * page_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + assert(mem !=3D MAP_FAILED); + madvise(mem, NR_ELEMS * page_size, MADV_NOHUGEPAGE); + + /*** Load tests ***/ + fault_write =3D false; + + /* Unit-stride tests load memory crossing a page boundary */ + memset(mem, 0, NR_ELEMS * page_size); + for (i =3D 0; i < NR_ELEMS; i++) { + mem[page_size - NR_ELEMS + i] =3D 3; + } + for (i =3D 0; i < NR_ELEMS; i++) { + mem[page_size + i] =3D 5; + } + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - (NR_ELEMS / 2)]; + fault_end =3D fault_start + NR_ELEMS; + mprotect(mem, page_size * 2, PROT_NONE); + assert(unit_load(&mem[page_size - (NR_ELEMS / 2)], NR_ELEMS, false) + =3D=3D 8 * NR_ELEMS / 2); + assert(nr_segv =3D=3D 2); + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - NR_ELEMS]; + fault_end =3D fault_start + NR_ELEMS * 2; + mprotect(mem, page_size * 2, PROT_NONE); + assert(seg2_load(&mem[page_size - NR_ELEMS], NR_ELEMS, false) + =3D=3D 8 * NR_ELEMS); + assert(nr_segv =3D=3D 2); + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - (NR_ELEMS / 2)]; + fault_end =3D fault_start + (NR_ELEMS / 2); + mprotect(mem, page_size * 2, PROT_NONE); + assert(unit_load(&mem[page_size - (NR_ELEMS / 2)], NR_ELEMS, true) + =3D=3D 3 * NR_ELEMS / 2); + assert(nr_segv =3D=3D 1); /* fault-first does not fault the second pag= e */ + + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - NR_ELEMS]; + fault_end =3D fault_start + NR_ELEMS; + mprotect(mem, page_size * 2, PROT_NONE); + assert(seg2_load(&mem[page_size - NR_ELEMS], NR_ELEMS * 2, true) + =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D 1); /* fault-first does not fault the second pag= e */ + + /* Following tests load one element from first byte of each page */ + mprotect(mem, page_size * 2, PROT_READ | PROT_WRITE); + memset(mem, 0, NR_ELEMS * page_size); + for (i =3D 0; i < NR_ELEMS; i++) { + mem[i * page_size] =3D 3; + indices[i] =3D i * page_size; + } + + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + assert(strided_load(mem, NR_ELEMS, page_size) =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D NR_ELEMS); + + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + assert(indexed_load(mem, NR_ELEMS, indices) =3D=3D 3 * NR_ELEMS); + assert(nr_segv =3D=3D NR_ELEMS); + + /*** Store tests ***/ + fault_write =3D true; + + uint8_t store_data[NR_ELEMS]; + uint8_t store_data_seg0[NR_ELEMS]; + uint8_t store_data_seg1[NR_ELEMS]; + vuint8m1_t vec; + vuint8m1x2_t segvec; + size_t vl =3D __riscv_vsetvl_e8m1(NR_ELEMS); + + /* Create some data to store */ + for (i =3D 0; i < NR_ELEMS; i++) { + store_data[i] =3D i * 3; + store_data_seg0[i] =3D i * 5; + store_data_seg1[i] =3D i * 7; + } + vec =3D __riscv_vle8_v_u8m1(store_data, vl); + segvec =3D __riscv_vcreate_v_u8m1x2( + __riscv_vle8_v_u8m1(store_data_seg0, vl), + __riscv_vle8_v_u8m1(store_data_seg1, vl)); + + /* Unit-stride store test crossing a page boundary */ + mprotect(mem, page_size * 2, PROT_READ | PROT_WRITE); + memset(mem, 0, page_size * 2); + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - (NR_ELEMS / 2)]; + fault_end =3D fault_start + NR_ELEMS; + mprotect(mem, page_size * 2, PROT_NONE); + unit_store(&mem[page_size - (NR_ELEMS / 2)], NR_ELEMS, vec); + assert(nr_segv =3D=3D 2); + for (i =3D 0; i < NR_ELEMS; i++) { + assert(mem[page_size - (NR_ELEMS / 2) + i] =3D=3D store_data[i]); + } + + /* Segmented store test crossing a page boundary */ + mprotect(mem, page_size * 2, PROT_READ | PROT_WRITE); + memset(mem, 0, page_size * 2); + nr_segv =3D 0; + fault_start =3D (unsigned long)&mem[page_size - NR_ELEMS]; + fault_end =3D fault_start + NR_ELEMS * 2; + mprotect(mem, page_size * 2, PROT_NONE); + seg2_store(&mem[page_size - NR_ELEMS], NR_ELEMS, segvec); + assert(nr_segv =3D=3D 2); + for (i =3D 0; i < NR_ELEMS; i++) { + assert(mem[page_size - NR_ELEMS + i * 2] =3D=3D store_data_seg0[i]= ); + assert(mem[page_size - NR_ELEMS + i * 2 + 1] =3D=3D store_data_seg= 1[i]); + } + + /* Strided store test to one element on each page */ + mprotect(mem, NR_ELEMS * page_size, PROT_READ | PROT_WRITE); + memset(mem, 0, NR_ELEMS * page_size); + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + strided_store(mem, NR_ELEMS, page_size, vec); + assert(nr_segv =3D=3D NR_ELEMS); + for (i =3D 0; i < NR_ELEMS; i++) { + assert(mem[i * page_size] =3D=3D store_data[i]); + } + + /* Indexed store test to one element on each page */ + mprotect(mem, NR_ELEMS * page_size, PROT_READ | PROT_WRITE); + memset(mem, 0, NR_ELEMS * page_size); + nr_segv =3D 0; + fault_start =3D (unsigned long)mem; + fault_end =3D fault_start + NR_ELEMS * page_size; + mprotect(mem, NR_ELEMS * page_size, PROT_NONE); + indexed_store(mem, NR_ELEMS, indices, vec); + assert(nr_segv =3D=3D NR_ELEMS); + for (i =3D 0; i < NR_ELEMS; i++) { + assert(mem[indices[i]] =3D=3D store_data[i]); + } + + munmap(mem, NR_ELEMS * page_size); + + return 0; +} + +int main(void) +{ + return run_interrupted_v_tests(); +} --=20 2.51.0