From patchwork Thu May 1 21:20:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886436 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp521787wrq; Thu, 1 May 2025 14:31:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+knGtgLDuTOLU0LTyGPfaVqBRz45xvyrXPr5HJrLRFTTBgJai7tWjZcdvbt2krjRzcZQ30A==@linaro.org X-Google-Smtp-Source: AGHT+IHniv/GA2UQzaiWW50CO7VduP/6pj34cgVezv1PWb8jJwORFHDkxQ8rdAr+jTiY9zw84LfD X-Received: by 2002:a05:622a:4012:b0:476:8e3e:2da3 with SMTP id d75a77b69052e-48c31a242c1mr9789641cf.30.1746135064419; Thu, 01 May 2025 14:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746135064; cv=none; d=google.com; s=arc-20240605; b=IvYyFEuLS1q/3DMDJuIPAWwb2mItVo/8zJR64qSmBW6L7TnHQrwDlz0oCRaF3BmtFe xnqFYtKqzkTiZhw1u/9N6ljUQydWOnVYEzKCVESb/AxhJ5AviqeNsa4sW/uSauGqjBfu UVeMKA0NPZXlkJ9VZSOXa8O7qq60fKrxk4owp+YX78GSALUXikdKmwf/0EMGdss13x6t X9kiLjf5DuhHutnJ+mrLmDoPmn6dRL55k4+helwSb90t0FsxQJGY4ijvHXX7zLEFt95X TI7WgCfWVN5U+9zNKbk8Vl53lazvihDDNbsoPhBiNVpEZNf/w/ZKMwzwd9Kr2kh0yGcS mqhg== 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=uWktBFOiwzYz1m9m1VKfbXX4KkdhBRM9kN+RtMXQVTs=; fh=i/pWNGcx7KiR3ewgypxpPkuORYlkCnVXLqKVm9/UgNc=; b=XtM/vXgGMF0gRALoF8Mjq+ZkSb3Ud0NgZ93AxqAcIG5TinnvLrQJatlOzK6GbSYBxC isM094U72nv6KFAAKK6VcNXvOIFlD5FUtVaEBS54BQiVroDsdQLnzqtk5C2rTpjOA1pE 2fKgzdxTMJ/++zCx0omcLvH+jJlro/xMwucuLj0HRV3rtbfnPjfWRsZ1BdKRa7gI2T7A /kw/vX1iCHKW2/d90ZYDNoGa5z6culBWgzriqh6J7Pc7vg2yX6lk71faav+P5oQAT3IK tJklwKIGMFcTHB355TMqdHgkHMLfMJJGk4XPlIEcun9GLH01qyhhPY33FKX/aRiRvhX0 arqQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=c8N5tkLg; 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-48b98246a98si13798021cf.336.2025.05.01.14.31.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:31:04 -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=c8N5tkLg; 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 1uAbLh-0000sr-6N; Thu, 01 May 2025 17:21:41 -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 1uAbLO-0000kv-F4 for qemu-devel@nongnu.org; Thu, 01 May 2025 17:21:23 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAbLM-0001R5-An for qemu-devel@nongnu.org; Thu, 01 May 2025 17:21:22 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2240b4de12bso23211015ad.2 for ; Thu, 01 May 2025 14:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746134478; x=1746739278; 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=uWktBFOiwzYz1m9m1VKfbXX4KkdhBRM9kN+RtMXQVTs=; b=c8N5tkLgoONZVBhnZ3XvGKc+Utm6ZCjmUwXTZM68BcuBGcb8pDhtDo7C6kvCNhWUw0 8fYDlxpfg7If1dxundVbYWGrIMbSAyJmt8rloI2lhZAMB59I+1Z/wmBRcyt1KNZcI5ME qrBzAiYZXHXovD5gjhRX3yGKS8pRPeeZ/EeRl53rT0o6WB06u6AvjZZyfMBcaAa8l/bg Xlh4wdb+DnvPBocDMCfnEFRaipRrjCzD0wsEt8uHwPnRkN2WtoIo4Ud7oP+zwvDvhGy8 dl65LK8GTQA6cwPa2S4AY4E8mI1z98bio/IzBFZVaHdCIPrvYKJrVQNiLJdhoC4fGwHk gBBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746134478; x=1746739278; 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=uWktBFOiwzYz1m9m1VKfbXX4KkdhBRM9kN+RtMXQVTs=; b=dT9HoVPvRLWkEV/bGFDPIzz+bpyUxL7jR0zbHzHJ2fWAqedWjtfzg+IZ3dTXLxBlrr jC3MtDdA93uSizAR54AXZpJhW4JsavrWTKY7bEr0CYCbdN2usiCLnKBrMb385wJomYwz UBozVozdGlVR7WF82u9e3ML6aSJyuOuUiMqdHn2vdZfi02/hNPZ6zqUpD2DUub/bwraq cXPH7ZfIqkdiC80vrXpySYFVYOHukJMpZa3BiCly9kYxURoMCliF97ceAzEmO1CjzeaH HWuD5/U8+FBzuELV2hTkr8v0ry8TJAZ1tprXtWAjnAvmA0UhiVh4cKWpqQthCcDHzMr8 QrGA== X-Gm-Message-State: AOJu0Yznfsq0CnamjU0ThOSIua5iJCG8oicFEE32MHlh707BbbZ+xH6Y hWqnchEO59YfQR+5QFR4C6t3ib4725l9kBz7qmOmE9wV05XI07jhqumISdxEVVU52NXNeHsUzaw g X-Gm-Gg: ASbGncuo2cRFbPrJNz8EPTteeUr+PE3qZE09gBEzQKYBA8Ks8anPeDyN26gV3bjd3C9 b+bNhxQoMOQeTGDJ6i8StvfxfFYf1lvO2DCwyexCMGEuQoCFcwhITJJQmc9WCRVWroKlnZb2QKO 11SGqk5lUbM1DvYKLKuuPnoVcxq/1OEmnRasAmw31+UGfGHitLAtsrS3m6J23dWb8e5xuyZrQA3 v6S8+w2GWEb/to/n0+8qYEJQi7ak3KyTglNdNUaUJt9vu1xUNdq9MvazkWaVEmi2FYi25yaggZQ G2GnWRqmFoMPPQKOzcjtXXoRa08hk4WSDiIGSqpp9gtUucKAiu6FToTdOaCrdCXq/zgYI5B2Rcc = X-Received: by 2002:a17:90a:d648:b0:2ff:53a4:74f0 with SMTP id 98e67ed59e1d1-30a4e6aa8d7mr852882a91.29.1746134478451; Thu, 01 May 2025 14:21:18 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a476267e0sm1384573a91.39.2025.05.01.14.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 14:21:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier Subject: [PULL 05/59] accel/tcg: Add CPUState arg to tb_invalidate_phys_range Date: Thu, 1 May 2025 14:20:19 -0700 Message-ID: <20250501212113.2961531-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250501212113.2961531-1-richard.henderson@linaro.org> References: <20250501212113.2961531-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 3 ++- accel/tcg/tb-maint.c | 10 ++++++---- accel/tcg/translate-all.c | 2 +- accel/tcg/user-exec.c | 4 ++-- system/physmem.c | 2 +- target/arm/helper.c | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 944b579d91..bee3416e7e 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -122,7 +122,8 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size, /* TranslationBlock invalidate API */ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); -void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t last); +void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, + tb_page_addr_t last); void tb_set_jmp_target(TranslationBlock *tb, int n, uintptr_t addr); #if !defined(CONFIG_USER_ONLY) diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index c893ea3073..c7600fc6ac 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -1012,7 +1012,8 @@ TranslationBlock *tb_link_page(TranslationBlock *tb) * Called with mmap_lock held for user-mode emulation. * NOTE: this function must not be called while a TB is running. */ -void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t last) +void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, + tb_page_addr_t last) { TranslationBlock *tb; PageForEachNext n; @@ -1035,7 +1036,7 @@ static void tb_invalidate_phys_page(tb_page_addr_t addr) start = addr & TARGET_PAGE_MASK; last = addr | ~TARGET_PAGE_MASK; - tb_invalidate_phys_range(start, last); + tb_invalidate_phys_range(NULL, start, last); } /* @@ -1178,7 +1179,8 @@ tb_invalidate_phys_page_range__locked(CPUState *cpu, * access: the virtual CPU will exit the current TB if code is modified inside * this TB. */ -void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t last) +void tb_invalidate_phys_range(CPUState *cpu, tb_page_addr_t start, + tb_page_addr_t last) { struct page_collection *pages; tb_page_addr_t index, index_last; @@ -1197,7 +1199,7 @@ void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t last) page_start = index << TARGET_PAGE_BITS; page_last = page_start | ~TARGET_PAGE_MASK; page_last = MIN(page_last, last); - tb_invalidate_phys_page_range__locked(NULL, pages, pd, + tb_invalidate_phys_page_range__locked(cpu, pages, pd, page_start, page_last, 0); } page_collection_unlock(pages); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c007b9a190..9bf8728064 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -599,7 +599,7 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr) cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); addr = get_page_addr_code(env, pc); if (addr != -1) { - tb_invalidate_phys_range(addr, addr); + tb_invalidate_phys_range(cpu, addr, addr); } } } diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 39b76d9654..2b12c077e9 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -529,7 +529,7 @@ void page_set_flags(target_ulong start, target_ulong last, int flags) ~(reset ? 0 : PAGE_STICKY)); } if (inval_tb) { - tb_invalidate_phys_range(start, last); + tb_invalidate_phys_range(NULL, start, last); } } @@ -1020,7 +1020,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr, * be under mmap_lock() in order to prevent the creation of * another TranslationBlock in between. */ - tb_invalidate_phys_range(addr, addr + l - 1); + tb_invalidate_phys_range(NULL, addr, addr + l - 1); written = pwrite(fd, buf, l, (off_t)(uintptr_t)g2h_untagged(addr)); if (written != l) { diff --git a/system/physmem.c b/system/physmem.c index 16cf557d1a..637f2d8532 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2830,7 +2830,7 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, } if (dirty_log_mask & (1 << DIRTY_MEMORY_CODE)) { assert(tcg_enabled()); - tb_invalidate_phys_range(addr, addr + length - 1); + tb_invalidate_phys_range(NULL, addr, addr + length - 1); dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE); } cpu_physical_memory_set_dirty_range(addr, length, dirty_log_mask); diff --git a/target/arm/helper.c b/target/arm/helper.c index 7fb6e88630..c6fd290012 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4987,7 +4987,7 @@ static void ic_ivau_write(CPUARMState *env, const ARMCPRegInfo *ri, mmap_lock(); - tb_invalidate_phys_range(start_address, end_address); + tb_invalidate_phys_range(env_cpu(env), start_address, end_address); mmap_unlock(); }