From patchwork Wed May 28 08:13:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 892927 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp2079345wrz; Wed, 28 May 2025 01:15:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBxdQ1xtoo/h7Y1yf0YeKuSc7y/H5U5I5mE4dfP/EKcbnT3xRBX+a/RDuYLpdoGUsXnfcxhQ==@linaro.org X-Google-Smtp-Source: AGHT+IF5PKbvYIGy8cO14NRdW/rsDW/W+j6ZRzrPs7krVmDFVQDJP1OzLIgJkp0kVoN8C+JPS22x X-Received: by 2002:a05:620a:3198:b0:7c5:95b6:b40a with SMTP id af79cd13be357-7cf06db4eaamr514535685a.27.1748420092437; Wed, 28 May 2025 01:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748420092; cv=none; d=google.com; s=arc-20240605; b=URb2YHwmJvV4/I3k/NmBtMcEbDHkJxJFkYmUJ31x1l+VOwXbgBbFZURg/rc6jdwXMv Mq9MkxRcZuBY/jT92lU+TV8pDOCZXEGk7KI3ctuloQL2f14yvFbzXGkVeOtNVMaY3i/f pzzfujW7VS9Jag3h7pOzVTZd0o5C/QcGBywpIlD1JNlwpaRq70RdnPm0htzq2QazzPIA 8Zq2aNE39tDvAbE4p9Fb2DTUvwGtZEACv8/d2tMGeC8sRL/EiZustl5r6pybmO0Bkf+t OuzNtx6UAQ3lFB64HNjAyATF6euW6QNXIeR9Z1uRhjfioBGF0vu/BgcY2jnHpHXFKLTc xXTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2R0giq/C1Km848MTITSAVr0NKLywWDm7jQSIufkU8ao=; fh=bRIuNxSxk22GTGdVLAvpgA6TmsDmwn46OYQ17XWrahA=; b=Enu/lR2eIWIrYjg/5pgrw+0lS77fSuFwAIQilVcUHR64fZpV5HWPY0MvdTrJtVyyOQ 225dCXG4CDxbSeeeEvGkTDcixMZZThg/bR4fa8kCBNFs8cVltAgBiMD79gBJNBt8L3e2 iSr+691paTEgWieiHqMwoOr9r9hSG8AWA4ZIrNKK6WbJa0Wu3/gyI7dHH/uRq/rwgs2L 3F291Er7+HB8emsN2GWw59flzsi2UDZMqVeEAd6o2iT0IODeuPHic6SO66o46GnzFtxZ Q2i0LLPe2iFYdPEhqXVlhPvZssXFiW06rrWWm+2Dsp9p3svsBuWNd9Kmp3UCAjQb4/Z4 t7sw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JETGH+qr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cfc5f7593dsi79875185a.588.2025.05.28.01.14.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 May 2025 01:14:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JETGH+qr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKBvh-0007uZ-Fd; Wed, 28 May 2025 04:14:29 -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 1uKBva-0007tk-DX for qemu-devel@nongnu.org; Wed, 28 May 2025 04:14:22 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uKBvY-0005Cq-E5 for qemu-devel@nongnu.org; Wed, 28 May 2025 04:14:22 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-450cb2ddd46so853575e9.2 for ; Wed, 28 May 2025 01:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748420054; x=1749024854; 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=2R0giq/C1Km848MTITSAVr0NKLywWDm7jQSIufkU8ao=; b=JETGH+qr311FGoEq/iablvxe1OoVIPEYhrEqFBmoRQbLgCylhJ9U9iLc//x8EDD/kN +wDpKCzQCJmRg1dYg1iHNa4zSgkAhJbhvbFJH9nlIbGiT9ZokBIkgrrdQJ3Y79BTXqXY DrSubNImnNnK7Cgbp7PeGCTelIW8RkFVEhsfqjffhgbF2dD5Hw17bySx5KPxIt0xWj5I KXa8Un0hxrgXNzdjfxtUIP1OZKfJpQZoRZq75h0fYncmj58HGTb1fNBvelw+4p+fRQ2j Staq9zMkpjMgxl7oFEC35yg61A5CikXVTkFaqr9eDis+aD9A16pFQ2OUAeoree/fP5gy 9JRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748420054; x=1749024854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2R0giq/C1Km848MTITSAVr0NKLywWDm7jQSIufkU8ao=; b=NO/V0jY5SRuhnFeXAoVWz4ZOzl35YTrNN9dqSn8PvLqbNjrqPVOBsfHIvk/IdV5cxf 4RYydkGk5Q2/r+picRNE6PCc7T2SKbKc5A+5J4HcMx4HaKHiaHk7mnPrG4kXMgQ1u3E9 mnJ2kotS6GRxOvWhxaVAb9YkOQKWHZ1odKpG+CDHMxD3VHX3gRHA+/NRApf4ZZTtY7K8 PwFJYx9plNIAl4glS4KhLRIzohUzZyWUIpQu+yFknTLPpDVE8VmtJyldRroOBnxJYghr n8foXXMEQyd0mB8dSOHXMtASjeU9blY6C/9H0xc7UYWZ/cAYgGQGozY7VS9oc7lZaf5p 9mFA== X-Gm-Message-State: AOJu0YywFD2q9iyCltKHIXVioytST+8UK62vldXoS7vFhLGogb70fQ3z FfnI7bOmBnEVz3nzMKKt6L4IegYqpDEG1Jy4tsU9tBOdlZ8m2ffWcXuw0QoKlAzQW4loUJD5VyC nSmJ8mt6oug== X-Gm-Gg: ASbGnctqJONYd5qUuWAST4fwrMi0qt2K3GElK21FGzcAoXy4BYhvIaMRznghULkMjHZ zlBuQotvrBHpTLzevSTJBXfqXYQn2TiwZVJ5nYSDeewey+mSr1VrYZaV4HGQRy5/KNbWg5OXYHX +pInTUrcg5JPC6T4lnMNnOSi5DkFcoFW1MMkwt1IUiiG0XXJJbDlzIiH6tr+fGlQSJKl9vlFhKH GLI8oxlQ4OG312iY08bZYU4Gs8KTQFyr97+vNcMSel1vtAtPiZYWUnEOJ4vih6D8B0YXGboEOjv XcTdlWg7+g7F+HtVJmp/c4N8GhtDDI1fI/KWEZ1ZEHYrdBhTnK9s+HJQ X-Received: by 2002:a05:600c:46cb:b0:43d:94:2d1e with SMTP id 5b1f17b1804b1-44c919e16a8mr134045325e9.13.1748420054317; Wed, 28 May 2025 01:14:14 -0700 (PDT) Received: from stoup.. ([195.53.115.74]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4500e1d85b5sm13178645e9.32.2025.05.28.01.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 May 2025 01:14:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Jonathan Cameron , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 01/28] accel/tcg: Fix atomic_mmu_lookup vs TLB_FORCE_SLOW Date: Wed, 28 May 2025 09:13:43 +0100 Message-ID: <20250528081410.157251-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250528081410.157251-1-richard.henderson@linaro.org> References: <20250528081410.157251-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) 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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 slow flags") Reported-by: Jonathan Cameron Tested-by: Jonathan Cameron Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- 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; } - /* Collect tlb flags for read. */ + /* Finish collecting tlb flags for both read and write. */ + full = &cpu->neg.tlb.d[mmu_idx].fulltlb[index]; tlb_addr |= tlbe->addr_read; + tlb_addr &= TLB_FLAGS_MASK & ~TLB_FORCE_SLOW; + tlb_addr |= full->slow_flags[MMU_DATA_STORE]; + tlb_addr |= full->slow_flags[MMU_DATA_LOAD]; /* 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, } hostaddr = (void *)((uintptr_t)addr + tlbe->addend); - full = &cpu->neg.tlb.d[mmu_idx].fulltlb[index]; if (unlikely(tlb_addr & TLB_NOTDIRTY)) { notdirty_write(cpu, addr, size, full, retaddr); } - if (unlikely(tlb_addr & TLB_FORCE_SLOW)) { + if (unlikely(tlb_addr & TLB_WATCHPOINT)) { int wp_flags = 0; 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 |= 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); } return hostaddr;