Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp4975147lfb; Tue, 31 Aug 2021 05:18:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDmLn4K5XNA66Enn5w4VfuiMz1GXcAmyOR1OXG0vVKMGgmZiMiqMT7CmrYiHa6Ht4lISvR X-Received: by 2002:a17:907:78cf:: with SMTP id kv15mr25496898ejc.422.1630412305936; Tue, 31 Aug 2021 05:18:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630412305; cv=none; d=google.com; s=arc-20160816; b=ZwCFH00ZDoOtBHkyius1IypzGV+0uRGxQ502CuUKiW3n3hTABLXN8pj0kXTk4+B6dk N65FWvcHce803V7t+kofwq+m5O/k+qWM8sZigRJvXaKk52xL5ShappX2PSOG6PliSCWt WoBv3426thopKn8orWiJO7pxU6ShjKeknOEbBps2eF9b6TZGAuw5EjYo7hXAQsbK8PZ2 XXyYdgunyhu7FXzXlC67ZRXB7ixOeKb0skT4KNhcZEZJB2L26c4DCVh6pw49WKAgGbOw BIWazJYEwicOS28dTyL9GNH0D5F/Gvdf6Fr1/Az450yFNzHA6sGXMFwx/xI7k90bMwne 5pfg== 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=osPQ4bLKsDhnqdn8uaDB3ZlP3+Rdgg45jSXidZEEElc=; b=rtzSoSM5Edn9NafiJ2pALVp3Beji6SrAGuE778dN9X+XF2k7LD0Ex+xTSmi3vtNXmT k+pd3VL8TjbBeZjJp4jcGBnaZI9uTcFpg7Lb+M35GLOeX/Hs+taVVQpsyvILmM8DB86T Md8y/GxlBcvp82y4NyO3JOZZbwZv4XB6zxg2WkQGvGZvmxJba5nFQIY95by3Cw0M0FW3 6PckevsJ1HnXHkHtDY+xclv14egNnjhPVNEmnLkUnS2B7ZRer3xbCSDsSJM2DyRN4EfR 9H+/b0Kn+ph+KS2Rt6n8ppch/PThyc4k+xL6uw8rOX3jYRgGpgPWT4amxWnMyrJgGNuP ovzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=S0tmB8cB; 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 gs15si2640604ejc.351.2021.08.31.05.18.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Aug 2021 05:18:25 -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=S0tmB8cB; 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=1630412304; 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=osPQ4bLKsDhnqdn8uaDB3ZlP3+Rdgg45jSXidZEEElc=; b=S0tmB8cBBvwsmq5gsBDK5mp6bBfGAJ+FNFedxe/Lw2Pf4J0B8HjaAxEPranCM5yC6Ht20w jKQmhpkx5zHJWG1Ht2ZvET1lh4L8m+PqJP9psvhzm+hMbRq/+1b2kwej1u0xrke3cMvwi/ Fwt7SggZgrXqip/rTc/HYZrtokl8IeA= 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-105-MPsc-aRfOl62WacDB5Ddsw-1; Tue, 31 Aug 2021 08:18:23 -0400 X-MC-Unique: MPsc-aRfOl62WacDB5Ddsw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C589218C8C3D; Tue, 31 Aug 2021 12:18:18 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06E0860E1C; Tue, 31 Aug 2021 12:18:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7426E18009DD; Tue, 31 Aug 2021 14:15:46 +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 19/29] tcg_funcs: Add tb_check_watchpoint to TCGModuleOps Date: Tue, 31 Aug 2021 14:15:35 +0200 Message-Id: <20210831121545.2874233-20-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.12 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: ruKyIGj6W98x Signed-off-by: Gerd Hoffmann --- include/exec/translate-all.h | 1 - include/tcg/tcg-module.h | 2 +- accel/tcg/tcg-module.c | 5 +++++ accel/tcg/translate-all.c | 3 ++- softmmu/physmem.c | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/exec/translate-all.h b/include/exec/translate-all.h index f313542cdae1..fa9cebd56c60 100644 --- a/include/exec/translate-all.h +++ b/include/exec/translate-all.h @@ -29,7 +29,6 @@ void page_collection_unlock(struct page_collection *set); void tb_invalidate_phys_page_fast(struct page_collection *pages, tb_page_addr_t start, int len, uintptr_t retaddr); -void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr); #ifdef CONFIG_USER_ONLY int page_unprotect(target_ulong address, uintptr_t pc); diff --git a/include/tcg/tcg-module.h b/include/tcg/tcg-module.h index 6069b056f91f..645e8eb39e71 100644 --- a/include/tcg/tcg-module.h +++ b/include/tcg/tcg-module.h @@ -15,7 +15,7 @@ struct TCGModuleOps { void (*tcg_exec_realizefn)(CPUState *cpu, Error **errp); void (*tb_flush)(CPUState *cpu); void (*tb_invalidate_phys_range)(tb_page_addr_t start, tb_page_addr_t end); - + void (*tb_check_watchpoint)(CPUState *cpu, uintptr_t retaddr); }; extern struct TCGModuleOps tcg; diff --git a/accel/tcg/tcg-module.c b/accel/tcg/tcg-module.c index dfd7d3bbc2e0..ea0c2a160a97 100644 --- a/accel/tcg/tcg-module.c +++ b/accel/tcg/tcg-module.c @@ -29,6 +29,10 @@ static void tb_invalidate_phys_range_stub(tb_page_addr_t start, tb_page_addr_t e { } +static void tb_check_watchpoint_stub(CPUState *cpu, uintptr_t retaddr) +{ +} + struct TCGModuleOps tcg = { .tlb_flush = update_cpu_stub, .tlb_flush_page = tlb_flush_page_stub, @@ -40,4 +44,5 @@ struct TCGModuleOps tcg = { .tcg_exec_unrealizefn = update_cpu_stub, .tb_flush = update_cpu_stub, .tb_invalidate_phys_range = tb_invalidate_phys_range_stub, + .tb_check_watchpoint = tb_check_watchpoint_stub, }; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index e71e58aff9e7..57129bbeb791 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1910,7 +1910,7 @@ static bool tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc) #endif /* user-mode: call with mmap_lock held */ -void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr) +static void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr) { TranslationBlock *tb; @@ -2439,6 +2439,7 @@ static void tcg_module_ops_tb(void) { tcg.tb_flush = tb_flush; tcg.tb_invalidate_phys_range = tb_invalidate_phys_range; + tcg.tb_check_watchpoint = tb_check_watchpoint; } type_init(tcg_module_ops_tb); diff --git a/softmmu/physmem.c b/softmmu/physmem.c index f2301f4445cc..634500fd3b7b 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -937,7 +937,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, cpu->watchpoint_hit = wp; mmap_lock(); - tb_check_watchpoint(cpu, ra); + tcg.tb_check_watchpoint(cpu, ra); if (wp->flags & BP_STOP_BEFORE_ACCESS) { cpu->exception_index = EXCP_DEBUG; mmap_unlock(); -- 2.31.1