From patchwork Sun Sep 25 10:51:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 609135 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1271447pvb; Sun, 25 Sep 2022 04:05:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5OqFTJIRkEkFtqWDAx/vjJWb6FUHIGLFalPjg1AzsNjZdmqpNy6tdD+fzDsImE0j4i8tER X-Received: by 2002:a05:6214:2584:b0:4ac:7f6b:e258 with SMTP id fq4-20020a056214258400b004ac7f6be258mr13639606qvb.114.1664103946125; Sun, 25 Sep 2022 04:05:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664103946; cv=none; d=google.com; s=arc-20160816; b=wlOBq5Nj9hlDdsn8xxcVqdVxZw8KMTJ4lgt8XYo9j9uvxnM2+lI4s6A6WsqO25NINW kILCQve/fgBQ+1UnjgBLUVyTXCusR8pS/WgtnGNGYUKvwUVx3NKYZwQDDhi3kEDRGQzS IOS7eHVCGyo9GpSTO1ZGdJm5T2KwtEozsFho7z6Ysp+OPOAn+sXZLNlAtxotGY5zdvND v+hkunRDuLIhM8oU1XbGvGuwpVEbjit3veTmm2BSZRQlaVztuIeJhbLebp1IIwUljXZm kz7N1YiecPN4LIqNpmcsxVvENcOSJNCHEEGNpYHCEAQZTYo08uKxQA/u4ELrysqaLDmn WtfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Me0sYA03idIPAnR4K7d66qbwf2Tw0FB962wCcSsxCZU=; b=fElVU8chnZmJH/4kOqz6Nxsw3MBOr2N36punpfyhuW2fGKkfa9fEmcx9jmBLnPdjil jtteZyaGExAx3/p/3Xjwc7DrDJszEnoCnqGkS/VLTfuRO0Tr3u7y6lnvj3fvFWV702ji l64t6bOU23y85cSbDltua2Zvy89zMsUkJD6UfPBaMPBZ+TEXgFirq2kQTSxKepoiUi+Z sdq3XxDDjBBXF31k4oyetiryxr2P+J0TFLkqsq1S/UijQf4LR6b8x5yjExauTr7R4KY/ So/LWl4FwMXoOLel+QduroFnaTr/U6O5i9GDQMSIFklWfT0eyTysCRbZyFZYKaVwwz9X e/VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tXoexMk2; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w18-20020a05620a425200b006bb7171ecfbsi7686391qko.541.2022.09.25.04.05.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 25 Sep 2022 04:05:46 -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=tXoexMk2; 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 Received: from localhost ([::1]:40618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ocPSD-0005in-Kh for patch@linaro.org; Sun, 25 Sep 2022 07:05:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ocPF5-0003CC-Ln for qemu-devel@nongnu.org; Sun, 25 Sep 2022 06:52:11 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:35525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ocPF4-0000O7-3S for qemu-devel@nongnu.org; Sun, 25 Sep 2022 06:52:11 -0400 Received: by mail-qv1-xf35.google.com with SMTP id w4so2805969qvp.2 for ; Sun, 25 Sep 2022 03:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Me0sYA03idIPAnR4K7d66qbwf2Tw0FB962wCcSsxCZU=; b=tXoexMk2ws2eQD0hFajN5xNHKR/iDATF/eybMS/N66zQS6zWPXepNb/LY9mEWPVMUq 0WDx0ibwmDAhHPOJ0ns+9WyIKphVR3aTXFfSy+qxezVyDJHMybLnqAQSV/OiUIdNggr5 ESaHF4/vSlCfoTnNvlu+5Zy6LhsGELohte2u9ezF7qhHS3wVVGl/PUbiPwhZPdbH4yHi 2VotUZyodwZI/uZdGKXnu82WXLs3DDWrYSzUNLyfSi1oKAaNzTS6f5tEKGrcsLhTi1TB FdGmoJRt+8CEYHxXDdSnoUm0PSEZM7vMAulgs7jwf/nVsHz6paz0MtS7DraedhaKDdWa x9lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=Me0sYA03idIPAnR4K7d66qbwf2Tw0FB962wCcSsxCZU=; b=3MeATq4itughgxt0Gmjh4CKz8VZNL7XMvDtywLnrYU7vUKCnURSexF0EeNf1oPcHiu HRqsGkOX1iRD6U0/QwzUlASwrg9ZdL42m5RRKTdGNsFi5fzksiEFu41zqA/MGmGGAqAq xgjh+//tPfkB2972/D/zgn+Nl6Cv84gfr/gsnFQ/Yj8klEMyGTJp2PMLLUBJz8hCrReX m+MQFLjj3ohSw8+sXG5sMzdEHSOdG/iqVlq9tQcKZP7nsl1RJGtzPqdl+ZtTtuyo1wFW kVpsvKwmZDgvDfOnvuMRv5UIlTAdYr1wVbvRBkDtPrZSYx3EfetV1tgr00sH5wckMrUk fJPA== X-Gm-Message-State: ACrzQf1jKGxunbAEo+25jQIZ7e7/43AjVapCFogoXjTfhFYmcwkPwVxH YxRhRkwy5rZRDENkWJFaqP30jVgFo22BBQ== X-Received: by 2002:a05:6214:627:b0:4ac:adeb:58d9 with SMTP id a7-20020a056214062700b004acadeb58d9mr13275687qvx.128.1664103129256; Sun, 25 Sep 2022 03:52:09 -0700 (PDT) Received: from stoup.. ([2605:ef80:80a9:5c0e:1ec2:d482:4986:8538]) by smtp.gmail.com with ESMTPSA id u15-20020a05620a0c4f00b006cf19068261sm10061132qki.116.2022.09.25.03.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 03:52:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v5 12/17] accel/tcg: Use DisasContextBase in plugin_gen_tb_start Date: Sun, 25 Sep 2022 10:51:19 +0000 Message-Id: <20220925105124.82033-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220925105124.82033-1-richard.henderson@linaro.org> References: <20220925105124.82033-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f35; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf35.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" Use the pc coming from db->pc_first rather than the TB. Use the cached host_addr rather than re-computing for the first page. We still need a separate lookup for the second page because it won't be computed for DisasContextBase until the translator actually performs a read from the page. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/exec/plugin-gen.h | 7 ++++--- accel/tcg/plugin-gen.c | 22 +++++++++++----------- accel/tcg/translator.c | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h index f92f169739..5004728c61 100644 --- a/include/exec/plugin-gen.h +++ b/include/exec/plugin-gen.h @@ -19,7 +19,8 @@ struct DisasContextBase; #ifdef CONFIG_PLUGIN -bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool supress); +bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db, + bool supress); void plugin_gen_tb_end(CPUState *cpu); void plugin_gen_insn_start(CPUState *cpu, const struct DisasContextBase *db); void plugin_gen_insn_end(void); @@ -48,8 +49,8 @@ static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t size) #else /* !CONFIG_PLUGIN */ -static inline -bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool supress) +static inline bool +plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db, bool sup) { return false; } diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 3d0b101e34..80dff68934 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -852,7 +852,8 @@ static void plugin_gen_inject(const struct qemu_plugin_tb *plugin_tb) pr_ops(); } -bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_only) +bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, + bool mem_only) { bool ret = false; @@ -870,9 +871,9 @@ bool plugin_gen_tb_start(CPUState *cpu, const TranslationBlock *tb, bool mem_onl ret = true; - ptb->vaddr = tb->pc; + ptb->vaddr = db->pc_first; ptb->vaddr2 = -1; - get_page_addr_code_hostp(cpu->env_ptr, tb->pc, &ptb->haddr1); + ptb->haddr1 = db->host_addr[0]; ptb->haddr2 = NULL; ptb->mem_only = mem_only; @@ -898,16 +899,15 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) * Note that we skip this when haddr1 == NULL, e.g. when we're * fetching instructions from a region not backed by RAM. */ - if (likely(ptb->haddr1 != NULL && ptb->vaddr2 == -1) && - unlikely((db->pc_next & TARGET_PAGE_MASK) != - (db->pc_first & TARGET_PAGE_MASK))) { - get_page_addr_code_hostp(cpu->env_ptr, db->pc_next, - &ptb->haddr2); - ptb->vaddr2 = db->pc_next; - } - if (likely(ptb->vaddr2 == -1)) { + if (ptb->haddr1 == NULL) { + pinsn->haddr = NULL; + } else if (is_same_page(db, db->pc_next)) { pinsn->haddr = ptb->haddr1 + pinsn->vaddr - ptb->vaddr; } else { + if (ptb->vaddr2 == -1) { + ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first); + get_page_addr_code_hostp(cpu->env_ptr, ptb->vaddr2, &ptb->haddr2); + } pinsn->haddr = ptb->haddr2 + pinsn->vaddr - ptb->vaddr2; } } diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index ca8a5f2d83..8e78fd7a9c 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -75,7 +75,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int max_insns, ops->tb_start(db, cpu); tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ - plugin_enabled = plugin_gen_tb_start(cpu, tb, cflags & CF_MEMI_ONLY); + plugin_enabled = plugin_gen_tb_start(cpu, db, cflags & CF_MEMI_ONLY); while (true) { db->num_insns++;