Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp4974380lfb; Tue, 31 Aug 2021 05:17:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxduXDedL0Q57HP9wxR4DNgz4JamBFqCQ7BTepmwjXvND72iTeCn5ABn8/6gh7GHWFqfd4M X-Received: by 2002:a17:906:9708:: with SMTP id k8mr30627093ejx.399.1630412249625; Tue, 31 Aug 2021 05:17:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630412249; cv=none; d=google.com; s=arc-20160816; b=QPFFLnXF324XwszIx3f37rjwO4Czg9ysrUWlm6YARlbxGpm+RXjgA22NtB/7WlXIOb GNsBMe9rrtyYlrswDfKPa8Ydaxe+14Poiy5ONU43wqbyP9lMJF3hneo5t4k5bPJ2tHKQ tn0K+YM08cqu5vnr3NMPfaPoTDM+FJIGn5VnN6m1kWYz9W0RzssiNIfjXqBV0RFyw2Yz 28NAmaeFzmVs0aekkkCfltuzDUPICQ4knPRALLEKTocUAhp80qFS2Z34O/1LtV9PqK2C 17spZ3WthAM1KDz1XaeJelwlKJ+aBSuyiRp8GZrHIcqZbUirvRkVskPpwFyYhLBXTwwt aW/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=u8gQuk7Fsh4A8/jNqxyM7TcDlDRogwWS1f9ob5Kg95g=; b=dEQxasdor352LmtBrxBuLhAvrRDvsNWS2+iHAAfPr+aaCY/I3/QZDQtciBDKoUfu6H vY/NBcIeZtsOOStd/vFwMLV8ye/it/iA5O1M7gdw4kUfqgJbo7nix5wAmdRugIxujH+w X8C+EvDp5KR6XF3iwUH4ir/8gdpaxQgpgQ9pPxx2MiilJIyt07qrmn075ojX0Ez/2XPO TVIxqNmIOi/kMRtdeHwTd5C87bkoi9/ByIwInZ0iP+civx6taLSul3/s5yIUGu5Rmt/Z XxJltEoaIT4aOzvpXAS2dTRetm2G1OELYCMYuRkwzM34RtWzoJVawtJFOaSBEu5/o+Ci 8f8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OX7llnh4; spf=pass (google.com: domain of kraxel@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id gs12si6264822ejc.7.2021.08.31.05.17.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Aug 2021 05:17:29 -0700 (PDT) Received-SPF: pass (google.com: domain of kraxel@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=OX7llnh4; spf=pass (google.com: domain of kraxel@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630412248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u8gQuk7Fsh4A8/jNqxyM7TcDlDRogwWS1f9ob5Kg95g=; b=OX7llnh4P5jZj2omtybcH8fde6qsRwPFO3/Ip00ZatKfQ43at1OrAZK0evJtnUmrqAnJna tl/Cm8NUDRqDhQh8Ub2hjkwOboAWxgHYDhlDIFibSJ67djFq03UAkYKegwZmJnCuVkv5x9 rG2r6G4FZxet8ElEK5wegc+FbHIXSEg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-DI9j00UwNqaHj1X1ViOXig-1; Tue, 31 Aug 2021 08:17:27 -0400 X-MC-Unique: DI9j00UwNqaHj1X1ViOXig-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82DEB8799F6; Tue, 31 Aug 2021 12:17:24 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C66B6E0B0; Tue, 31 Aug 2021 12:17:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BFDB91800996; Tue, 31 Aug 2021 14:15:45 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Laurent Vivier , Peter Xu , Peter Maydell , Marcel Apfelbaum , Cornelia Huck , qemu-ppc@nongnu.org, Bastian Koppelmann , Thomas Huth , Eduardo Habkost , qemu-riscv@nongnu.org, David Gibson , Aleksandar Rikalo , Stafford Horne , Huacai Chen , Halil Pasic , Palmer Dabbelt , Bin Meng , Mahmoud Mandour , Max Filippov , Alexandre Iooss , Greg Kurz , "Edgar E. Iglesias" , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Paolo Bonzini , Alistair Francis , qemu-s390x@nongnu.org, Christian Borntraeger , Jiaxun Yang , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH 11/29] tcg_funcs: Add tlb_flush_page to TCGModuleOps Date: Tue, 31 Aug 2021 14:15:27 +0200 Message-Id: <20210831121545.2874233-12-kraxel@redhat.com> In-Reply-To: <20210831121545.2874233-1-kraxel@redhat.com> References: <20210831121545.2874233-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-TUID: paej8/UOAqJq Signed-off-by: Gerd Hoffmann --- include/exec/exec-all.h | 3 --- include/tcg/tcg-module.h | 3 +++ accel/tcg/cputlb.c | 1 + accel/tcg/tcg-module.c | 5 +++++ softmmu/physmem.c | 4 ++-- target/arm/helper.c | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index ddb1ab797978..43d89699e989 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -328,9 +328,6 @@ static inline void tlb_init(CPUState *cpu) static inline void tlb_destroy(CPUState *cpu) { } -static inline void tlb_flush_page(CPUState *cpu, target_ulong addr) -{ -} static inline void tlb_flush_page_all_cpus(CPUState *src, target_ulong addr) { } diff --git a/include/tcg/tcg-module.h b/include/tcg/tcg-module.h index b94bfdd362ed..a903e3ee62c0 100644 --- a/include/tcg/tcg-module.h +++ b/include/tcg/tcg-module.h @@ -1,8 +1,11 @@ #ifndef TCG_MODULE_H #define TCG_MODULE_H +#include "exec/exec-all.h" + struct TCGModuleOps { void (*tlb_flush)(CPUState *cpu); + void (*tlb_flush_page)(CPUState *cpu, target_ulong addr); }; extern struct TCGModuleOps tcg; diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 40c3d1b65ac5..1fcdb71a10a0 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2771,6 +2771,7 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) static void tcg_module_ops_tlb(void) { tcg.tlb_flush = tlb_flush; + tcg.tlb_flush_page = tlb_flush_page; } type_init(tcg_module_ops_tlb); diff --git a/accel/tcg/tcg-module.c b/accel/tcg/tcg-module.c index a1e5728c8c1b..4d62160628bd 100644 --- a/accel/tcg/tcg-module.c +++ b/accel/tcg/tcg-module.c @@ -5,6 +5,11 @@ static void update_cpu_stub(CPUState *cpu) { } +static void tlb_flush_page_stub(CPUState *cpu, target_ulong addr) +{ +} + struct TCGModuleOps tcg = { .tlb_flush = update_cpu_stub, + .tlb_flush_page = tlb_flush_page_stub, }; diff --git a/softmmu/physmem.c b/softmmu/physmem.c index dd17f80120dc..8fa5376de1c9 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -794,7 +794,7 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, in_page = -(addr | TARGET_PAGE_MASK); if (len <= in_page) { - tlb_flush_page(cpu, addr); + tcg.tlb_flush_page(cpu, addr); } else { tcg.tlb_flush(cpu); } @@ -825,7 +825,7 @@ void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint) { QTAILQ_REMOVE(&cpu->watchpoints, watchpoint, entry); - tlb_flush_page(cpu, watchpoint->vaddr); + tcg.tlb_flush_page(cpu, watchpoint->vaddr); g_free(watchpoint); } diff --git a/target/arm/helper.c b/target/arm/helper.c index 0da65edd78cd..6aa38cde15fe 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -772,7 +772,7 @@ static void tlbimva_write(CPUARMState *env, const ARMCPRegInfo *ri, if (tlb_force_broadcast(env)) { tlb_flush_page_all_cpus_synced(cs, value); } else { - tlb_flush_page(cs, value); + tcg.tlb_flush_page(cs, value); } } @@ -799,7 +799,7 @@ static void tlbimvaa_write(CPUARMState *env, const ARMCPRegInfo *ri, if (tlb_force_broadcast(env)) { tlb_flush_page_all_cpus_synced(cs, value); } else { - tlb_flush_page(cs, value); + tcg.tlb_flush_page(cs, value); } } -- 2.31.1