From patchwork Tue Apr 22 19:26:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883061 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2590876wrs; Tue, 22 Apr 2025 12:45:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVigg3J5vEUhoezThFbN/n0n47IJpgmiiZBq5wPShLz8pWjLPKkFfdQ2FLNYr3DbutADYw+sw==@linaro.org X-Google-Smtp-Source: AGHT+IHBKdSgJJ0U2vVDsHaPnU6B412lFXCMn7JoVw4FIgWYqj3GEgGB+ryOCf9nFhrAG0ejaYx8 X-Received: by 2002:ac8:5916:0:b0:477:1ee1:23d9 with SMTP id d75a77b69052e-47aec3a7331mr318410361cf.20.1745351101394; Tue, 22 Apr 2025 12:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745351101; cv=none; d=google.com; s=arc-20240605; b=Jvi0nFgvoWPT1I67jRUk4FXszxzdYstWOL6osH7hmei9rSaeyrDLlb7xoZLT8i+GpN D2wci8xWEe9GvTKTkim8lVZpH3bD3D+F/OUoGNp5UHEp3ALgYZgbRMSL9F/LVsqon+XD 4QBIv/Pk+u0rfkzls83ZGiShG7j1a5yDcGkBSlj8fi9LnijS+FjsW0SX7K10xqLs+M1U zc7r6tEGF4zPwD5wM6JVblo8n6exWFzw5KRI4eEZuwz20bH0s657yFSAHxQepBXD/gNW j64KQMsg19cWTabxvyHC6f/h7IXmSvV01EC1T4D2TXoVExADAILAdaMCDvETsYbBgs5c +YZA== 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=xgU73YOfMEflbLqLNoDMX+RVctfg0fSpdUj7bFm7Lqc=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=k+U2KOsG6PcJ6kxrdmTANkluytrJnLM6pUCg8ua4TW18kTxudPK237i7cqJHhb2Ane OBczf1dq6L3tHfRtV9bLdBH4/ac2wcyq8CHLhcYKME4V+54EnGM0yPlfKUp7KJVoxTAU /49avOgVLYGvfAxwLDZw/gbRo2o/a9tqCmLFIhHZ8qLHqpSgTWclBAP6p0ilIUsyNL2K mcw5Mjv4jdnrI/6x9eRJkAV9jm7SnDI8IqvY73td8cR2YTThxs4huwNIpF7X6wZtV8C7 G98eJ/23N84Z+Z1adedJNvG1+DKB9WyCSNcUfTqnNZT5eoMVKq80USA/5xNTvnSCn2nW Yrng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gYrU+NJj; 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-47ae9cd44absi117829791cf.522.2025.04.22.12.45.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:45:01 -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=gYrU+NJj; 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 1u7JPR-0006ND-Ti; Tue, 22 Apr 2025 15:35:59 -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 1u7JLk-0000lu-1l for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:09 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JLf-0006e6-JW for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:32:05 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-224171d6826so79613015ad.3 for ; Tue, 22 Apr 2025 12:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350322; x=1745955122; 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=xgU73YOfMEflbLqLNoDMX+RVctfg0fSpdUj7bFm7Lqc=; b=gYrU+NJjTwRm+rPXDBwaEjSQbuEpz5jAhRjaEfZMjgHa9e9x7D6XGTACI3r1UFTAIU ti0cm6Zi1nVR/COE0egnSlHtDiiIKmBumiOHBkN1Ba7IvrfnSz9/uhyzJQImb1viuir7 cN8jnN+8vV1XOpZUP/pPyQuvyvM9R/H1ZJAeFE1+2BXJt0KcCCokxnNElsbYSzKUs9IR m8dlnFFGx/yH+8dMV6uC7oij6Ve8D+m+G8XBvugzU8sS0iXKVO4Bk0Wsa9fuDNEX2GoN EEfaNfe2+ZQjdoDcso+LsM7wgVS/KrR4vYWI7V3SkUkAvPeKZ8I3kmZteTpOBBAn9Mjc 9hWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350322; x=1745955122; 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=xgU73YOfMEflbLqLNoDMX+RVctfg0fSpdUj7bFm7Lqc=; b=mhXmfL3gxBIfj1bzLUZiu5zRKr9McLKecTQCXdyJ20EW+XRKbs/wrvPqMQfwaTB9Zh SzvisuxZ4Z/4x6pXfPpygZYlE2KOBRhpdG+Sf5X7uhQom2gL/jrloiHAUL5mHSvZNhwq uSoRtaj/U1QouSDJDPLtqmqjdpYOl0mvqCyQEn8pmIlK+ypsJBkQFdRXIbuGXwm5+u1G 2UYMoeZcXhuz0g3md17us7dq4SY+xwOydevLZKNvC/JkVjMfC3KkrM/dL4Su6LF0WMQi xJPJ2/kz7meq+tWwHcDKwkzVzSzRCD/BSzr4NmIk+46Vj+8vmtAXzsZW1BqBhLt/AcQf ve6A== X-Gm-Message-State: AOJu0YytsCLJw3yHEiu5ubfPIfYyZYir9NJcHe6qqgg/eEivsz78P134 S817djPPncLqEu+ncyN6sPmz4Th2hQGdOhHaSggHIkaiPy67wWUnBnSl71Lnlu7MYsBDi7sPPD6 B X-Gm-Gg: ASbGnct5+41RW812gEyWVlvKQtOVJQBP1EaoTKQIHMhYTzv3/4U+4JWahaJi4MVpiUG Otn4apEPhhPtuwvHYFQnbg/7ZNIpuI8Jyc04dIKoIL/08hiDLhYZsZLOsIXYLhxtLb26XpU/ihc n2MHTrcvMb4x+bvSvtvZgBGuDVfKYRB/1b4Xw5dvJQceJ837ARlFUWLROpsTVdN0TotX1sC9afC 7RvLUDTbUvIhU7U/DYwqAzwxQ0NgKJetomylSge5Cu4hEPHqEkVAi6VLjRbVmEMFX0kTdqdECa0 2Dv/mMxQYlHBfFNQa6qmWkmmX1VDFz/ePWYxb46MNWwGu+HZ46FA8XVoKr1zboEKfKIXiXeIXpA = X-Received: by 2002:a17:903:2983:b0:224:1781:a947 with SMTP id d9443c01a7336-22c53580c35mr263978735ad.21.1745350322148; Tue, 22 Apr 2025 12:32:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:32:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 063/147] accel/tcg: Fix argument types of tlb_reset_dirty Date: Tue, 22 Apr 2025 12:26:52 -0700 Message-ID: <20250422192819.302784-64-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::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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 The arguments to tlb_reset_dirty are host pointers. The conversion from ram_addr_t was done in the sole caller, tlb_reset_dirty_range_all. Fixes: e554861766d ("exec: prepare for splitting") Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- include/exec/cputlb.h | 2 +- accel/tcg/cputlb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index 8125f6809c..03ed7e2165 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -31,7 +31,7 @@ void tlb_unprotect_code(ram_addr_t ram_addr); #endif #ifndef CONFIG_USER_ONLY -void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length); +void tlb_reset_dirty(CPUState *cpu, uintptr_t start, uintptr_t length); void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t length); #endif diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index b2db49e305..10090067f7 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -912,7 +912,7 @@ static inline void copy_tlb_helper_locked(CPUTLBEntry *d, const CPUTLBEntry *s) * We must take tlb_c.lock to avoid racing with another vCPU update. The only * thing actually updated is the target TLB entry ->addr_write flags. */ -void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length) +void tlb_reset_dirty(CPUState *cpu, uintptr_t start, uintptr_t length) { int mmu_idx; @@ -923,12 +923,12 @@ void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length) for (i = 0; i < n; i++) { tlb_reset_dirty_range_locked(&cpu->neg.tlb.f[mmu_idx].table[i], - start1, length); + start, length); } for (i = 0; i < CPU_VTLB_SIZE; i++) { tlb_reset_dirty_range_locked(&cpu->neg.tlb.d[mmu_idx].vtable[i], - start1, length); + start, length); } } qemu_spin_unlock(&cpu->neg.tlb.c.lock);