From nobody Sat Nov 15 19:07:33 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=1748097681; cv=none; d=zohomail.com; s=zohoarc; b=ZZo22S/v6QYauLTqxVDH6th654xMMWkS+uIy22XDMI7vWDps7PWsNbjcnY9hjUeX9Y0r61elRQbCKSO8XDBHl+CM96E7coqguzEeH1BQBwbl7mi83U0DQ5sfRMzvHnGUfDcLEqGUflXm1yzlM0uYT5Mgir7IpEOF4kL194LQSZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748097681; 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=Kjmi0hZCzV/Fx+nP0mjfHBg3/IPtSl05rTWpGvdIScc=; b=UztDBnJ3HR0d4uC3qEdIfBJfkTe0j2q+hhkhIfM17Zj92ePFXFWAcZ/NE6smSDpFa9YMNCb8GiFXcccBl1b/XdCVFaRA3rXaOSblMIJqOKVV7TCF/iRx/EZj4tqTcEyAExXJkR1X3ji5fkeVGBEUaSwFOYd8u26Jal1fLQHZsak= 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 1748097681587506.65387585054157; Sat, 24 May 2025 07:41:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIq3E-00042q-KC; Sat, 24 May 2025 10:40:40 -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 1uIq3C-00042O-87 for qemu-devel@nongnu.org; Sat, 24 May 2025 10:40:38 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uIq3A-0007t3-5g for qemu-devel@nongnu.org; Sat, 24 May 2025 10:40:37 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-443a787bd14so12825555e9.1 for ; Sat, 24 May 2025 07:40:35 -0700 (PDT) Received: from stoup.. ([195.53.115.74]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f7bae3b9sm176246915e9.33.2025.05.24.07.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 07:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748097634; x=1748702434; 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=Kjmi0hZCzV/Fx+nP0mjfHBg3/IPtSl05rTWpGvdIScc=; b=VHUJ99jL5p9gGtpJMLc5Q7Pj8wQ56QJTbOzifdw/H3I9t0fefbc3Vz0Zvpg71XJet+ Kv0tvO+Dun03/IJds8UN1uv/9UgWk6MJ3hcxVKHlVAmlAAsOgmow+T5nyCuL/yaTLk3z SLSefddKTVVgw0n7mede1dHe28++ahUdXep0Ruc+YmEtPQ/HX1h7Ej9a5Fko8OhtpmCq nhAtsa3FV95mDatuzT0lJrLbWctM+LY3sihRfaUuoVxlNKU28Fn+Be44F3jWYhuSLGDV iRAj11dCE3+Laf2P/ZQHwNi7QyFLxcxZQ9kD8BgUatuB4pvdw2FaSGKUgAbxvxR1u6fx 49Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748097634; x=1748702434; 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=Kjmi0hZCzV/Fx+nP0mjfHBg3/IPtSl05rTWpGvdIScc=; b=ShTOFEpYviKOKegz2UkQZMVSI0sLmtp7/nwLO+jU0XlN3f2sNT1DttJ0JoTTUl/Dhx JWn+W33WX+79Nlv057KLJSejGEUuyReYMD6/sQILVRUGpTGG3E419x05FyDuIF+CteLt 7OS+PS81vekQvD/g3nBPyt/k3IXmpg5TTzS950Q32xVrWp95Pq4w2hc59Kf7mh9d3JuD IiLL5Ot5330M0TK9Al3EYSGM4mKH9HLHivCQKgWTk7cnywdhQaILaZBddrNmzje5t45F 170YxBgnYsGZuJMKDvL3uuRire0Ror43fmskdOlEzTvGsJOPiiaKg6N2FDPoXpc5GMkG wnjA== X-Gm-Message-State: AOJu0YyAcXs1+pWe0uEMA2L67BDvdbratouUpAiuv7F9StNt8guJnhxN PquOFypixbe72oRX8l3Vd+ifqOSIvm22+2TpJx7g79ZeX4NHd5+0mGpC5kDng55Ekj+KO8F5+EG MBAXrIUleRQ== X-Gm-Gg: ASbGncuZfzscKousJcNxTBRIXc6wudEcuvQ0L62wjPEpurT4+/0Q3z9ASo0BImskM8q l2Wm8QSkTb3IlcStUsvNCEB02BzDKz8/w6TXk7Iz4UuO89DbJ0C+Q+YV2zqiMTooYZJL3FDnL38 SVdYPPmCCdUdj91kltec7LLM/9b6eBmjGaxVbnkWO8BOYGDjm+PNxlgeX3ihc4xzUAo6BaPhKFq Lh3hXJS/fFL130ZTJcpX1uyNMh49HoqN+8C8l8JaQ1jifbgEkISQU0A0W4S7a+XRaZ6mLU96s3/ Cb1If++brb2VEGqLeK2Xv2INyO2/5AneNd2u04DFlXP0BwQU9TANT60a X-Google-Smtp-Source: AGHT+IHIskrE17tecLd4CbdGzvqZkzSTqGEEbg/1Uuwo9slp4GD5WLsGjwuFnDnKm7GC9AJldV3NRg== X-Received: by 2002:a05:600c:3b12:b0:43b:c857:e9d7 with SMTP id 5b1f17b1804b1-44c7aa383d7mr29666025e9.5.1748097633846; Sat, 24 May 2025 07:40:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Jonathan Cameron Subject: [PATCH] accel/tcg: Fix atomic_mmu_lookup vs TLB_FORCE_SLOW Date: Sat, 24 May 2025 15:40:31 +0100 Message-ID: <20250524144031.49810-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=2a00:1450:4864:20::333; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x333.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: 1748097691765116600 Content-Type: text/plain; charset="utf-8" When we moved TLB_MMIO and TLB_DISCARD_WRITE to TLB_SLOW_FLAGS_MASK, we failed to update atomic_mmu_lookup to properly reconstruct flags. Fixes: 24b5e0fdb543 ("include/exec: Move TLB_MMIO, TLB_DISCARD_WRITE to slo= w flags") Reported-by: Jonathan Cameron Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Tested-by: Jonathan Cameron --- accel/tcg/cputlb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5f6d7c601c..86d0deb08c 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1871,8 +1871,12 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr = addr, MemOpIdx oi, goto stop_the_world; } =20 - /* Collect tlb flags for read. */ + /* Finish collecting tlb flags for both read and write. */ + full =3D &cpu->neg.tlb.d[mmu_idx].fulltlb[index]; tlb_addr |=3D tlbe->addr_read; + tlb_addr &=3D TLB_FLAGS_MASK & ~TLB_FORCE_SLOW; + tlb_addr |=3D full->slow_flags[MMU_DATA_STORE]; + tlb_addr |=3D full->slow_flags[MMU_DATA_LOAD]; =20 /* Notice an IO access or a needs-MMU-lookup access */ if (unlikely(tlb_addr & (TLB_MMIO | TLB_DISCARD_WRITE))) { @@ -1882,13 +1886,12 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr= addr, MemOpIdx oi, } =20 hostaddr =3D (void *)((uintptr_t)addr + tlbe->addend); - full =3D &cpu->neg.tlb.d[mmu_idx].fulltlb[index]; =20 if (unlikely(tlb_addr & TLB_NOTDIRTY)) { notdirty_write(cpu, addr, size, full, retaddr); } =20 - if (unlikely(tlb_addr & TLB_FORCE_SLOW)) { + if (unlikely(tlb_addr & TLB_WATCHPOINT)) { int wp_flags =3D 0; =20 if (full->slow_flags[MMU_DATA_STORE] & TLB_WATCHPOINT) { @@ -1897,10 +1900,8 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr = addr, MemOpIdx oi, if (full->slow_flags[MMU_DATA_LOAD] & TLB_WATCHPOINT) { wp_flags |=3D BP_MEM_READ; } - if (wp_flags) { - cpu_check_watchpoint(cpu, addr, size, - full->attrs, wp_flags, retaddr); - } + cpu_check_watchpoint(cpu, addr, size, + full->attrs, wp_flags, retaddr); } =20 return hostaddr; --=20 2.43.0