From patchwork Tue Apr 22 19:26:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883042 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2587993wrs; Tue, 22 Apr 2025 12:38:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUehTb8yS0Mb+qCtQJkZ5g3aR9F2qDrZgbAKPBYjZUvVhNOesIQqUIxwg6h3x5zufLdTXXIxQ==@linaro.org X-Google-Smtp-Source: AGHT+IFXQmNymjBCtA9Va5gcR63729yHRclJJ6Q2RF7v1s6+7cay8AwGlvQ/aKSKjkdKhF7Pj611 X-Received: by 2002:a05:622a:148f:b0:476:fdf9:9707 with SMTP id d75a77b69052e-47aec3d07edmr235319681cf.31.1745350700223; Tue, 22 Apr 2025 12:38:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745350700; cv=none; d=google.com; s=arc-20240605; b=grgrzc2QhsajsUNZFtC1xWSFG+1fVtHnoFgwk1oRLDkPBcRRBqPHFFZRB8CGDiLmRr MMlRaaC5slmyo8r+SDvGHB9Yf31KAf808zVf3kEJNG5JoK+Ocu2UG1lTmLm0VfYl0+9u DNeZ02IhMBYFf2tY3orROULctG6Cei7AlAiZPTUQXg5VGPZZ9ouLUNbfUzcMV2cDTOhk r0IQeRm9ecRTiJc4ypWUnA0ECqVDllJ9H5UfdvcI4K6Q4WeVXS+X9Oy7V5vk3juvZ343 lBGGLAtZ3DKJERfCE8aH0+NzGZckfco/jl4qJ8PYpsrija5CMPY4fBadeNxgR22N02dU XaEA== 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:to:from :dkim-signature; bh=IIU1fG3v2ti6ddjpGI+Ep7ZP7ka1a1iDtVAhhJuSr6o=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=GE1KCDvJjmNHTe5EJcbeo/XGwE1GoTxRRE/zW1uFyAnbpSOxh1eCKjgkPg/8vGJ7X6 ikGQAadgF0ldroeJijELzvehEruMSgzcfixKAAzM1jO8lSf4+Xc7ZHQFlsiZQwTfxq9P 7ZaCaQQ40KRMqpwD1m4j68+583zmseHoczhfyPMcKKqWrcmQNcsy08Zm4F7tbql0EO7C 1t561VDi+wZFNwNYFo2/o/TcC2L7vDIR1HecckWaCVQCBWJ6UegdK274CVj8+JC7BCbU o5/78QWxvTQ9qtZK613GVxykdKh6iIFmeZWajnbUP6xrH/iW/H4YsOhO32HYL9rOetUF 3q+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Pgct6mzG; 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 d75a77b69052e-47ae9c2f284si123092631cf.155.2025.04.22.12.38.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:38:20 -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=Pgct6mzG; 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 1u7JOS-0003sp-5k; Tue, 22 Apr 2025 15:34:56 -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 1u7JLm-0000q8-68 for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:11 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JLh-0006eX-7U for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:09 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2243803b776so87046905ad.0 for ; Tue, 22 Apr 2025 12:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350323; x=1745955123; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IIU1fG3v2ti6ddjpGI+Ep7ZP7ka1a1iDtVAhhJuSr6o=; b=Pgct6mzGy7n4/vNCtUPaLEVVsX6V3iTGvIzoYfiXmX+6/oTiNA+skT4ev0KMOW6YdO EppwNM8uxz9fdQ/dz24Y2ydDIPf9CBrICjkgcv+tmYHk9jXbXMvTpJtGt3hwtOa/bMfc 5onf8PRWT6SZTfo/5pFmPC5cWXDygTgzl8f9eUcdwPuLwThIt/ehFYMRZawibGN40yMF rQuliQojlxvVIkJyFij7fnlZweFi+bQXMGU4IkCeED3+J+DViZnrT5et5Sq7qhGYQp8E IyzdSRKrkUAcmvEqP/4+4SZdRR/hTUludh8p7W89tRvhAegqCQRqreGlIOS6sscgVLhr /HGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350323; x=1745955123; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IIU1fG3v2ti6ddjpGI+Ep7ZP7ka1a1iDtVAhhJuSr6o=; b=m5xqeda00oa+fKRylUoSUmLX0NNv3W1kYzW95vtZscvxz+Kqm29FdNwGGdqGh7apKE vqO55xe+6HmPni5yprVBYYwnoMaBrRFS/+LkN/voMRFXZ7mIfU9eZPvVrCkPPJ3Tphce sJSi3st1EapHBtQRNdRijPmuKEID7OnFOuqpZDm+EQYGus4Bkt0jvnrAB0QRAVIA2HUm Vqamubvm3yJGHAdJS7YtkksNyc5seBldqI8CIyinzxujoKEstdd69BwQlyY3NE63au7H y5hDig2VyASPx4QUZ77zRHwJTjAjVUtoH/BOUpLqT1jNUO5MQHmgXdkIiIXIPoTTbLRD ARWA== X-Gm-Message-State: AOJu0YwUA73xk9Yf3sH6Vqkq8Nm3EcCiUe+S1w72q9X+6EyxIIhwaBrY mnbSVcyhX6PQcCWxiMRHjfw4rJLpMdgMxHfOdFNJwupYxZiRLpMYuC21eZ3cVVKzkDWXDyuWKrv x X-Gm-Gg: ASbGnctyHP6VLfElPivrqkFDYAm90jpeIK7EtgaOdOVWiZhBkoVnW+TKiO2wQxqjsDW VJGepzndqflvv0ZvZlOvfZxkEEq+kGAsDk8zrzSxm+ZTlapGgwPmPgPLU20csXpVIG8O9iBjZo1 oSuFXzsht1C2ARWXPB5cl7n8a0FTdxzW/2EXJ7swqUklWdyStK9qcRIBusnDS8gXL/S6OsOAFrb M/74+5drk75TQDf7Q8Q9nTre/FjKiqcWjBY1GQl40IXg8brBcKMJgT324lj6ZNxBSh5PcpAwFTK 6gSuxAMcBfWFwBk3R9Y5t820E4BA3pD3UTDechl69Zy4LBHttAX+FwvLoYPr+CarOtx0wXDBGws = X-Received: by 2002:a17:902:d4cd:b0:224:910:23f0 with SMTP id d9443c01a7336-22c53642323mr214658235ad.49.1745350323431; Tue, 22 Apr 2025 12:32:03 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50bdda3bsm89312635ad.27.2025.04.22.12.32.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:32:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 065/147] accel/tcg: Rebuild full flags in tlb_reset_dirty_range_locked Date: Tue, 22 Apr 2025 12:26:54 -0700 Message-ID: <20250422192819.302784-66-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Undo the split between inline and slow flags before masking. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/cputlb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 5df98d93d0..28c47d4872 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -886,9 +886,10 @@ static void tlb_reset_dirty_range_locked(CPUTLBEntryFull *full, CPUTLBEntry *ent uintptr_t start, uintptr_t length) { const uintptr_t addr = ent->addr_write; + int flags = addr | full->slow_flags[MMU_DATA_STORE]; - if ((addr & (TLB_INVALID_MASK | TLB_MMIO | - TLB_DISCARD_WRITE | TLB_NOTDIRTY)) == 0) { + flags &= TLB_INVALID_MASK | TLB_MMIO | TLB_DISCARD_WRITE | TLB_NOTDIRTY; + if (flags == 0) { uintptr_t host = (addr & TARGET_PAGE_MASK) + ent->addend; if ((host - start) < length) { qatomic_set(&ent->addr_write, addr | TLB_NOTDIRTY);