From nobody Fri Nov 14 22:21:21 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759605945; cv=none; d=zohomail.com; s=zohoarc; b=TlX8DtqHtGENHkCQowOPzk/3/5pZTQOi+709B6/SRiFotJ0dHSWXSwXHlcmvW44nzrbNm3ZVVtB1QuKMB7rap4xBD9O356Wsp19est2VittM8SoEVb2LlNnB8p4/I1asSMRQ1myuOQsgd9n39BNcv/CCBaGeiRsTbfcq+9u34oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759605945; 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=lt9CXeINDO1davLN3ff4kfwC4euBhUKckNctzpEobVQ=; b=g60aZLizduycFgrSbqRsrEPJITpAhh4Tc0smFS84y5X0pZPdL2UjfHpPDh9Fg+9aZpbGR0zxoe+XC2WOvQPSoSuvbQ19vutCdmlmKzDWESa+RgyfCIWCbOSP+pNFxxpTbGahgTxgMCUs7zkR2OUipNeDCxmUDWh7fg2XdfNOwZc= 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 1759605945411572.5399868146075; Sat, 4 Oct 2025 12:25:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v57ri-0002jr-Pd; Sat, 04 Oct 2025 15:24:22 -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 1v57rg-0002j3-Ti for qemu-devel@nongnu.org; Sat, 04 Oct 2025 15:24:20 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v57re-0001xw-Bm for qemu-devel@nongnu.org; Sat, 04 Oct 2025 15:24:20 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-78f3bfe3f69so137530b3a.2 for ; Sat, 04 Oct 2025 12:24:17 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b6099f3b041sm7878362a12.24.2025.10.04.12.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Oct 2025 12:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759605856; x=1760210656; 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; bh=lt9CXeINDO1davLN3ff4kfwC4euBhUKckNctzpEobVQ=; b=oBt5MTPldvbXngUe5D7pC9/CjsKZYAIl1k+igAAXX5rM/SGTaAafS5NL0+cfsEvrfW 1yr/xULYcayA9ACmfRawfpepgutwk47EJ55CVhRdyAakk06wnEWqHjMcAzWzBdkE/5iX R/vNnVYb36AFG9nzUspk+tYILgAUs+4dsQU1DJVPzl7rSYMrlGZcjkzl4nyWGao4e1cC cQWqdGrKCQWmzC1XY3HXz1SAH4Zl3fD8kMJARnz/WkYQe7FxHjgEnZwceQ9AhQOZwI6e HyWjeuZ3QqfuXaQFGq4GWaRCd2hAe7kc1FkRp3R+AXbQ6Reb5ZYygjqZqCDpRok2fjOp mjPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759605856; x=1760210656; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lt9CXeINDO1davLN3ff4kfwC4euBhUKckNctzpEobVQ=; b=mpSQ8T011vymCx4NqA5iArqarxOHWEpu37sQy5tH82EyTxy/n8X2TXU+90KDUydgKa GejM8hVLLbLb7pcq6Gd8iqLgjYdY40K2OPfPHVzMFCwcSs9FLq8GqBni8ufuzk9x/DA7 YgksPQ6ZR7G/NPcBv+l3v7jO9f6IbigDGmxwaXE9QLhZ772s3Ksgbv35YBT9vMxNibMd oZCM7H9E9RkQnpycnBOo6ZEt4yrCx9xlUpkNDUZvYX/69PimPLlksvxouDJtg4gYYCj9 kY4EE3CZtfQNOOQoqGmNGsbhNfzWHX2BBHA3IrDyalDMllqv1kP7aVwOy7Q2XvMQkUEq 6fZQ== X-Gm-Message-State: AOJu0YwP9uORIgZvuTLk+ArKcILbpP+wEo5oaHeb4GhpcBrj0X9JdNy5 y308GlkvO3dVlLMrmSU4akcvIXSz8u+W7KsyDH+jijEbT/DRETanq3bHYRpZdDm/LCVbR9NLxjK GmftVvng= X-Gm-Gg: ASbGncsYNVbrsXMSrSpjdW4Zac+tlw1rHji8Fhl+i6a2b+JJ5Zsl0hvpNTo+c2VAgu6 wM0XrZtw3Tz13T4N18k1+ReXMcehj6i/OZTSa0XBU5n+IMNBNN8zwAEZULDA2r+/WRsyCoSIMtO WBbbxnhPB3/3CeKmj9FM5rGaIOUZZwytYSfgjcQ2bP9L9PEOMmwGWjw7tPc2WTXkuedOwbkDw++ nZxHPqAAnPKXTvGv4m1zHPz7Bx17498e/1gMcDkZkSPM7VN4XoKHTDjcGMDDYYKPMv7QpDtRYO2 mpyCOYt1nkW3qwNRtJij35rPBBLCKtJn3uqpyrxr1VxSD6EQwlTtpQNJOM4rpmAIxObCXxGTyaH /DR60F6vz5pVEurpFidTRfyszxXh4DykCpQ+6Vr5jvjiT+sts22TifUQF X-Google-Smtp-Source: AGHT+IHxTaqDULHJxiNZHU7KXbFzddvnuI0D+i0Rz70D+pGzwlT8Imz171YBCAntb6L1sq+/HObhWA== X-Received: by 2002:a05:6a21:33a5:b0:319:b5a9:1601 with SMTP id adf61e73a8af0-32b61e6b530mr9343646637.19.1759605855796; Sat, 04 Oct 2025 12:24:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mjt@tls.msk.ru, qemu-stable@nongnu.org Subject: [PATCH] accel/tcg: Hoist first page lookup above pointer_wrap Date: Sat, 4 Oct 2025 12:24:14 -0700 Message-ID: <20251004192414.1404950-1-richard.henderson@linaro.org> 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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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 @linaro.org) X-ZM-MESSAGEID: 1759605956522116600 Content-Type: text/plain; charset="utf-8" For strict alignment targets we registered cpu_pointer_wrap_notreached, but generic code used it before recognizing the alignment exception. Hoist the first page lookup, so that the alignment exception happens first. Cc: qemu-stable@nongnu.org Buglink: https://bugs.debian.org/1112285 Fixes: a4027ed7d4be ("target: Use cpu_pointer_wrap_notreached for strict al= ign targets") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cputlb.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 2a6aa01c57..a09c2ed857 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1744,6 +1744,7 @@ static bool mmu_lookup(CPUState *cpu, vaddr addr, Mem= OpIdx oi, uintptr_t ra, MMUAccessType type, MMULookupLocals *= l) { bool crosspage; + vaddr last; int flags; =20 l->memop =3D get_memop(oi); @@ -1753,13 +1754,15 @@ static bool mmu_lookup(CPUState *cpu, vaddr addr, M= emOpIdx oi, =20 l->page[0].addr =3D addr; l->page[0].size =3D memop_size(l->memop); - l->page[1].addr =3D (addr + l->page[0].size - 1) & TARGET_PAGE_MASK; + l->page[1].addr =3D 0; l->page[1].size =3D 0; - crosspage =3D (addr ^ l->page[1].addr) & TARGET_PAGE_MASK; =20 + /* Lookup and recognize exceptions from the first page. */ + mmu_lookup1(cpu, &l->page[0], l->memop, l->mmu_idx, type, ra); + + last =3D addr + l->page[0].size - 1; + crosspage =3D (addr ^ last) & TARGET_PAGE_MASK; if (likely(!crosspage)) { - mmu_lookup1(cpu, &l->page[0], l->memop, l->mmu_idx, type, ra); - flags =3D l->page[0].flags; if (unlikely(flags & (TLB_WATCHPOINT | TLB_NOTDIRTY))) { mmu_watch_or_dirty(cpu, &l->page[0], type, ra); @@ -1769,18 +1772,18 @@ static bool mmu_lookup(CPUState *cpu, vaddr addr, M= emOpIdx oi, } } else { /* Finish compute of page crossing. */ - int size0 =3D l->page[1].addr - addr; + vaddr addr1 =3D last & TARGET_PAGE_MASK; + int size0 =3D addr1 - addr; l->page[1].size =3D l->page[0].size - size0; l->page[0].size =3D size0; - l->page[1].addr =3D cpu->cc->tcg_ops->pointer_wrap(cpu, l->mmu_idx, - l->page[1].addr, = addr); + addr1, addr); =20 /* - * Lookup both pages, recognizing exceptions from either. If the - * second lookup potentially resized, refresh first CPUTLBEntryFul= l. + * Lookup and recognize exceptions from the second page. + * If the lookup potentially resized the table, refresh the + * first CPUTLBEntryFull pointer. */ - mmu_lookup1(cpu, &l->page[0], l->memop, l->mmu_idx, type, ra); if (mmu_lookup1(cpu, &l->page[1], 0, l->mmu_idx, type, ra)) { uintptr_t index =3D tlb_index(cpu, l->mmu_idx, addr); l->page[0].full =3D &cpu->neg.tlb.d[l->mmu_idx].fulltlb[index]; --=20 2.43.0