From nobody Sun Mar 22 15:46:46 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=1773962834; cv=none; d=zohomail.com; s=zohoarc; b=CWySMkFNGQIOCoT3MmjjeyEfVLaipk+vwBlBj34gDCog+ywlmF1a9N9pcACsaAL5wQwfiKhfkopxtP/6Vz/s9JNsmpn5gd7+VNZGV8luTWsGqxSyoCM9GSB026+8dFnacRlI+sRoHOsAwx4CbG512SZ8puyn+s8W+coPwxGFj9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773962834; 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=5tJUDngHbr1KPsf6/Ca4HvKW/nIzxeybSJmdbm3AcVc=; b=j/sucgms7OREDCXvzbyXfIzaczhv1DYaro2VyywqBjPdJ5SoMPIhvR2IlfQV4zhxP/hGXz6i7nUStUSUxnJOW5xs1tzl1SO9uwaHnM7etOCMbZ0PuqD5ZLyZKwo+1/2e9a0N7+4p3Vqn7lGUBZAXoXRzHTOE3Vtrw+xpPso4hHo= 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 1773962834443460.0363630028751; Thu, 19 Mar 2026 16:27:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3MlQ-0001fY-Vk; Thu, 19 Mar 2026 19:26:55 -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 1w3MlC-0001Qp-Pk for qemu-devel@nongnu.org; Thu, 19 Mar 2026 19:26:38 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3MlA-0007j9-T7 for qemu-devel@nongnu.org; Thu, 19 Mar 2026 19:26:38 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2aecefc7503so8911175ad.1 for ; Thu, 19 Mar 2026 16:26:31 -0700 (PDT) Received: from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b083516ae1sm2979165ad.13.2026.03.19.16.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 16:26:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773962790; x=1774567590; 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=5tJUDngHbr1KPsf6/Ca4HvKW/nIzxeybSJmdbm3AcVc=; b=b2EOjBXyIBkr/HYMQTyJ0xHXPrw2nlW3NoEpbtDEROw3m0Rci8J+V1H2E3w/OpgJHx n/UmMlUEzPY8XHv0Xy7jaAtzvdM5OzsQPDo7NoDtyjv4tQEiLwjf9VpllzdOiqmKANZi si2aeN0SLAzZwl5hF9nWE4Pwmru4pQIzaIU5tkbX88BfGyHG3grYtiFavXW6TQEbhCRA ZY+G6UQOt1rxuFOEEdS34/mMMwCJO0Xd7iuArqxeLjSxWkJKm12drxHlMaXp4RtCcQtd 4KuetWrfmZtcs5qtt5s61Dai7gMs3bzXJCjC7srCdC6PrCkwj5FiMWRfLU2osRaGujY2 461A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773962790; x=1774567590; 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=5tJUDngHbr1KPsf6/Ca4HvKW/nIzxeybSJmdbm3AcVc=; b=bHmLINHKC86uUxt3F3PcGBPLTNF3+5ITSRnqL9+HJR9Hl0GyuzuTvS7l+yohY9ZI/R k/Rlovr0e4pqG2EzKHi0Pd8ljQNhodwL7OPq8ZOtlYPsb4uyqpTk9RLXbGelnMML5TMZ gYa8ycS4H4wBR60sUnt11q8CPBVdvZF+fKBKxCF+A0ol+/3LiPkolnLoG+bd7F+rwmXs 9LWLRPiq8oBub/ulByGPfzgM865pOquI0dvuwEut1XY+RGb1YBZCxLSZXb1MQPFnCY9/ X/FUfTLwBo/iOtpFzUu0vk01HSGCAyGPk70BDIWk1IRIbxdVFWVC5sQDP2na+vPsfSCZ FicA== X-Gm-Message-State: AOJu0YytM8PRf9pMxikI/I9Fci9qQDwFaHRsyEvPJvDOil8eaD/lKbI+ rbZv1Op9ES4bwDGAXy14TCeJhXLhD1bZsP404UCdt98rfMecRpLtHEXZpv+m1Q== X-Gm-Gg: ATEYQzyBzEQdo6PyLT8ojtEJ4qZXmhuzgpm9jhmllt497ELK+4GjvkR9t5HDB8m577W Wdqun6a3n4q8G2HxhkZ2zeuvL1ERHm1C5tJsYuyH4NIv0P/twOEBCwZ+vZUXcXH3yw5lQB8CEgo rdHYbEnPR2d0TdNNuAuEVU7nbA8MwpND6hLScZQV+4XnNKAu/D50KxrQYmg4TWuIScdyAlVQcas B5CF+y4SjI/gqSUZPfVLmAe44xaJvVCBky3Bla+XTKSY5Bq++vDkLo4ZlvYwAVZ6PcImcDMdCm3 JAplspgpuesPFCSZWjoS++4VtoN//V0KGmL8QoMcIC+rXjOk3Y1ij/CNiJAiTamaXVSdGpzOW0V uXqGeJQnJ/7Wk4rgTNe5IQ5z5bzpmdQeWqMr7dc3lOuRHakusegOB8vugOxpB3d+gmmittjl/uW raqbkWEdCWeRLtu28ZvA86BXy18+Szc2/76ysvIjsu8w== X-Received: by 2002:a17:902:e883:b0:2ae:5eab:132e with SMTP id d9443c01a7336-2b0826dd612mr7362785ad.12.1773962790185; Thu, 19 Mar 2026 16:26:30 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Max Chou , Alistair Francis Subject: [PULL 16/17] target/riscv: rvv: Fix page probe issues in vext_ldff Date: Fri, 20 Mar 2026 09:25:21 +1000 Message-ID: <20260319232522.1867400-17-alistair.francis@wdc.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319232522.1867400-1-alistair.francis@wdc.com> References: <20260319232522.1867400-1-alistair.francis@wdc.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::631; envelope-from=alistair23@gmail.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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: 1773962836143154100 Content-Type: text/plain; charset="utf-8" From: Max Chou Commit 17288e38bebf ("optimize the memory probing for vector fault-only-first loads") introduced an optimization that moved from per-element probing to a fast-path broad probe. Unfortunately it introduced following bugs in cross-page handling: - Wrong condition for second page probing: checked "env->vl > elems" instead of "env->vl > elems + env->vstart", failing to account for the vstart offset. - Incorrect second page address calculation: used "addr + (elems << log2_esz)" instead of "addr + page_split". For segment loads (nf > 1), this would probe the wrong address,not at the page boundary. - Wrong second page probe size: used "elems * msize" (the first page size) instead of calculating the remaining size as "(env->vl - env->vstart) * msize - page_split". This would probe too little memory and could miss faults. This commit fixes these bugs by leveraging the probe_pages helper which automatically handles cross-page memory accesses correctly. Fixes: 17288e38bebf ("optimize the memory probing for vector fault-only-fir= st loads.") Signed-off-by: Max Chou Acked-by: Alistair Francis Message-ID: <20260318013805.1920377-3-max.chou@sifive.com> Signed-off-by: Alistair Francis --- target/riscv/vector_helper.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index e60248d6d3..83dd26314d 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -658,9 +658,9 @@ vext_ldff(void *vd, void *v0, target_ulong base, CPURIS= CVState *env, uint32_t esz =3D 1 << log2_esz; uint32_t msize =3D nf * esz; uint32_t vma =3D vext_vma(desc); - target_ulong addr, addr_probe, addr_i, offset, remain, page_split, ele= ms; + target_ulong addr, addr_i, offset, remain, page_split, elems; int mmu_index =3D riscv_env_mmu_index(env, false); - int flags, probe_flags; + int flags; void *host; =20 VSTART_CHECK_EARLY_EXIT(env, env->vl); @@ -674,16 +674,8 @@ vext_ldff(void *vd, void *v0, target_ulong base, CPURI= SCVState *env, } =20 /* Check page permission/pmp/watchpoint/etc. */ - probe_pages(env, addr, elems * msize, ra, MMU_DATA_LOAD, mmu_index, &h= ost, - &flags, true); - - /* If we are crossing a page check also the second page. */ - if (env->vl > elems) { - addr_probe =3D addr + (elems << log2_esz); - probe_pages(env, addr_probe, elems * msize, ra, MMU_DATA_LOAD, - mmu_index, &host, &probe_flags, true); - flags |=3D probe_flags; - } + probe_pages(env, addr, (env->vl - env->vstart) * msize, ra, MMU_DATA_L= OAD, + mmu_index, &host, &flags, true); =20 if (flags & ~TLB_WATCHPOINT) { /* probe every access */ --=20 2.53.0