Received: by 2002:a19:c144:0:0:0:0:0 with SMTP id r65csp3529836lff; Wed, 4 Aug 2021 07:39:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI6cw3CQOqVmQYJlDk9GVjLoIsAfn5xnkl3xLYS3TAIwtatuX0CHECzIFVyY0iboRMaKnt X-Received: by 2002:aa7:d84c:: with SMTP id f12mr217eds.375.1628087949996; Wed, 04 Aug 2021 07:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628087949; cv=none; d=google.com; s=arc-20160816; b=U00LI6UrlBdUvalGyxKedqEZMywAnKBaySvfKKxD7faLShGbx04BesZ9KSzPuAyHvW wWZQ2+4VllXwpbNC/xMJJgJ0MSz9z4xrmY7KQmmCnSneXWL0OXIinzUYuuJPdd3HIDcM a2ooSIzL3P1UQrGXAExrd1HPSZtpgi4AMzPxAMKtEKqT+t62z4y5jOCyipytiA1mKeWI glHI3Pz+X5OmxOdB82B1QPefKnQX5zaUx542tLbI6MRBWjCg15kVUROWrLC1Bx1608qr h+yO22WW2Q6VWeZDpOD7cA9To7naIDjPLQrOzbkGKyNI6le+bQCz89Ap2uxUB3Lq9y1t zMqw== 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=R6cgfPGC1Q7hET/NndgwW3RREa4+kZ9Bk4qC2KpBy1E=; b=DNreBa7C82M3AkedWcjKXDMoQrho1DmBwlzhDNiUyR0QURHUbOMWwe1aZpvpF/wBY2 6z+bFLkM50R8F6JibhQ2FSgowfv0v1IJJNS/EQ4PmYY7hJ+y4ZV3xaa6zvkU3BULywm6 dpVSey2zQUag7a9X1vt3M0uQrSMbXSUXHOZ2s0fuNMhnfsB7PdNHBW5422tp0cL/ckJG dCCgz78sl2r1BxHOGoHpVIVD+S0UJrcIyT1yrqNZPtyq4t9u9I+FS53kYYs7NAxwAjPL T8YrbpirgS4bzFw7BTrHXb3sJp/72u5zwB55KoxcS1asML5FsTj4QqcAsUeW25pNwMWb bz3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Rthcnwh+; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.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. [216.205.24.124]) by mx.google.com with ESMTPS id k10si2333938ejk.439.2021.08.04.07.39.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Aug 2021 07:39:09 -0700 (PDT) Received-SPF: pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Rthcnwh+; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.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=1628087949; 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=R6cgfPGC1Q7hET/NndgwW3RREa4+kZ9Bk4qC2KpBy1E=; b=Rthcnwh+Z0DD54uzIoGcTbuWHtpxyKhigz4454wGUtXAJR5YD72nn2sB/+au/Mr12FtwvK a2ZXcOctDRx1eT5phsd5EH48QPP8sHQ91hM8A910J/xjSuiLXIbCxfdGjDIzuEsXNc0epk nKncXsPu45tYKjsfdnkBQXZNPfkyMKw= 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-299-f9Ry4tSiNIeYQFOKttzkWQ-1; Wed, 04 Aug 2021 10:39:07 -0400 X-MC-Unique: f9Ry4tSiNIeYQFOKttzkWQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43E201940922; Wed, 4 Aug 2021 14:39:05 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.193.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19D811036D05; Wed, 4 Aug 2021 14:39:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A1365180098C; Wed, 4 Aug 2021 16:38:26 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Xu , qemu-s390x@nongnu.org, Richard Henderson , Huacai Chen , Mahmoud Mandour , Eduardo Habkost , Christian Borntraeger , David Hildenbrand , Aleksandar Rikalo , Alexandre Iooss , Laurent Vivier , Jiaxun Yang , Thomas Huth , qemu-arm@nongnu.org, Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Halil Pasic , Peter Maydell , Paolo Bonzini , Marcel Apfelbaum , Gerd Hoffmann Subject: [PATCH 6/7] tcg/module: Add tlb_flush_page to TCGModuleOps Date: Wed, 4 Aug 2021 16:38:25 +0200 Message-Id: <20210804143826.3402872-7-kraxel@redhat.com> In-Reply-To: <20210804143826.3402872-1-kraxel@redhat.com> References: <20210804143826.3402872-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: EX7t6C/5v97+ Move stub from exec-all.h to tcg-module.c. 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 d99b4ce55d8f..845b9e99e819 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 e0848f9bcea8..047d4360b65f 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