From patchwork Sat Nov 5 07:23:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13032959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 079A2C4332F for ; Sat, 5 Nov 2022 07:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=li0glghjBVcHqjgbQMlaUqvfgRn3MOLIq8IL+hCmwuQ=; b=nKy7PD7GPTIq6Z iyvtVe+1LiGx4pDo1OiuislyXkgHuJkodLtMBwd4353KeblBfPzw9VKUF0ovNCQ4S0lqRlXKwPtiS 30ob9fe4Y2eP4Df+6fRslkn0P7NFMsRKfRKtz78960PrRj7/BhuZRau4uCjerPBWLtjLcYhHfSiQ3 f0PPeOAemFw+BixfCFT4vo6D1siphpBKlNHagDe1U2pn3pmsdo0OrhcMoz4RXaNY7ccJKtifr1sG3 zHhMsxvwJV3s+/Dzkrci+4W0OmgR4s2Em31XpomSp9BQfrwUbRRNdpjlJk3JAgOjwiPlk+/V0iX0L 6n4r5c9Q7fjfecldvnlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orDWw-005zcz-33; Sat, 05 Nov 2022 07:23:50 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orDWo-005zb6-N9 for linux-arm-kernel@lists.infradead.org; Sat, 05 Nov 2022 07:23:44 +0000 Received: by mail-pj1-x1036.google.com with SMTP id q1-20020a17090a750100b002139ec1e999so6318722pjk.1 for ; Sat, 05 Nov 2022 00:23:42 -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 :message-id:reply-to; bh=Yq52tAH/MxGM65Yx9zGEKaWPTvFueeiBIyUIbXR0M9Q=; b=bFB2F0dOk+7RmyqlODQN6AV4el3iyfkqJDX87HRZQndWourFb9NRcH/jeGdUNWvhhQ 1Y3ToDkfdz0hTYXOxYzZo32ler1S0My6evWkO5zOa6+91gnb3qxnN7M30VMidZ7Y71v4 fv9mQDDqwX+6BLqZgt96OY8pLxHRks3jScJxhXvzetgjf4hT+lV7J6MbZK2n3SbUzCN6 UV80MP+Ij9HvNjBFttNcEo4irYujAbTkhW96yFlGTPGj3sWmVhvreoNbw/QF8V/xMzlR cmgP60deL5rIgHc0zXWnvRtIPsJTgLNYySxvzgzdts+vgbtK3Z7F8xnfCoZksNnav2dW hy3g== 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:message-id:reply-to; bh=Yq52tAH/MxGM65Yx9zGEKaWPTvFueeiBIyUIbXR0M9Q=; b=vk4bsE+EksTLJ3B018ifCPjHZPBJ4TlZ1vgfZ0WS+Jkpo3eApnWSp3zMb1XDd4bVTV w/56GONagp7pRzE8DfYULWR0trFLvKiWrwre8PFRlo95giUHM6EBEDv7y1PROQYxfwPz Kv/GoGom01Ngk09UuBT7H5oCsEI7mn/Vc3c+7TiqTkzOrLTIK2AZQ4qg2WmPOtJBWhPj 1Xjuex4e+fS0IwMCPVIjJGYcde3M50zcnlvqfrOpinM5FIAkgjE0GvPmBufz67Ldr31q 5QCjGqRcEfzQoPu6u92qHOxkPmaP+iz/0vdKOguhl/3+k2WGsDekL272TOwYtkZOXTeZ SN/w== X-Gm-Message-State: ACrzQf19U0I7BHXKBIKL21pszCGAu0LhM5hyaECHzTyxnCfkI1MRVQgm HWTt3lg8nsj1Ij1X3ZzhOSXN7w== X-Google-Smtp-Source: AMsMyM4LKijNmkyOB/EbOSqn/NWSN8cvycYETzVLpnbzyZIBhOtJ7jYzZjEQ2n+eOgZwOZPCi5+YAw== X-Received: by 2002:a17:90b:1c0d:b0:213:1a9c:5b1 with SMTP id oc13-20020a17090b1c0d00b002131a9c05b1mr55848573pjb.188.1667633022220; Sat, 05 Nov 2022 00:23:42 -0700 (PDT) Received: from leoy-huangpu.lan (211-75-219-201.hinet-ip.hinet.net. [211.75.219.201]) by smtp.gmail.com with ESMTPSA id w27-20020aa79a1b000000b00562ef28aac6sm698138pfj.185.2022.11.05.00.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 00:23:41 -0700 (PDT) From: Leo Yan To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , Catalin Marinas , Will Deacon , Arnaldo Carvalho de Melo , John Garry , James Clark , Mike Leach , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Leo Yan Subject: [PATCH v1 1/3] KVM: arm64: Dynamically register callback for tracepoints Date: Sat, 5 Nov 2022 07:23:09 +0000 Message-Id: <20221105072311.8214-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105072311.8214-1-leo.yan@linaro.org> References: <20221105072311.8214-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221105_002342_778055_48348069 X-CRM114-Status: GOOD ( 17.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This commit doesn't change any functionality but only refactoring. It registers callbacks for tracepoints dynamically, with this way, the existed trace events (in this case kvm_entry and kvm_exit) are kept. This is a preparation to add new trace events in later patch. Signed-off-by: Leo Yan --- arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arm.c | 4 ++-- arch/arm64/kvm/trace.c | 29 +++++++++++++++++++++++++++++ arch/arm64/kvm/trace_arm.h | 8 ++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/kvm/trace.c diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 5e33c2d4645a..4e641d2df7ad 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -14,7 +14,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ inject_fault.o va_layout.o handle_exit.o \ guest.o debug.o reset.o sys_regs.o stacktrace.o \ vgic-sys-reg-v3.o fpsimd.o pkvm.o \ - arch_timer.o trng.o vmid.o \ + arch_timer.o trng.o vmid.o trace.o \ vgic/vgic.o vgic/vgic-init.o \ vgic/vgic-irqfd.o vgic/vgic-v2.o \ vgic/vgic-v3.o vgic/vgic-v4.o \ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 94d33e296e10..03ed5f6c92bc 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -917,7 +917,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) /************************************************************** * Enter the guest */ - trace_kvm_entry(*vcpu_pc(vcpu)); + trace_kvm_entry_tp(vcpu); guest_timing_enter_irqoff(); ret = kvm_arm_vcpu_enter_exit(vcpu); @@ -974,7 +974,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) local_irq_enable(); - trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu)); + trace_kvm_exit_tp(ret, vcpu); /* Exit types that need handling before we can be preempted */ handle_exit_early(vcpu, ret); diff --git a/arch/arm64/kvm/trace.c b/arch/arm64/kvm/trace.c new file mode 100644 index 000000000000..d25a3db994e2 --- /dev/null +++ b/arch/arm64/kvm/trace.c @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +#include + +#include "trace_arm.h" + +static void kvm_entry_tp(void *data, struct kvm_vcpu *vcpu) +{ + if (trace_kvm_entry_enabled()) + trace_kvm_entry(*vcpu_pc(vcpu)); +} + +static void kvm_exit_tp(void *data, int ret, struct kvm_vcpu *vcpu) +{ + if (trace_kvm_exit_enabled()) + trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), + *vcpu_pc(vcpu)); +} + +static int __init kvm_tp_init(void) +{ + register_trace_kvm_entry_tp(kvm_entry_tp, NULL); + register_trace_kvm_exit_tp(kvm_exit_tp, NULL); + return 0; +} + +core_initcall(kvm_tp_init) diff --git a/arch/arm64/kvm/trace_arm.h b/arch/arm64/kvm/trace_arm.h index 33e4e7dd2719..ef02ae93b28b 100644 --- a/arch/arm64/kvm/trace_arm.h +++ b/arch/arm64/kvm/trace_arm.h @@ -11,6 +11,10 @@ /* * Tracepoints for entry/exit to guest */ +DECLARE_TRACE(kvm_entry_tp, + TP_PROTO(struct kvm_vcpu *vcpu), + TP_ARGS(vcpu)); + TRACE_EVENT(kvm_entry, TP_PROTO(unsigned long vcpu_pc), TP_ARGS(vcpu_pc), @@ -26,6 +30,10 @@ TRACE_EVENT(kvm_entry, TP_printk("PC: 0x%016lx", __entry->vcpu_pc) ); +DECLARE_TRACE(kvm_exit_tp, + TP_PROTO(int ret, struct kvm_vcpu *vcpu), + TP_ARGS(ret, vcpu)); + TRACE_EVENT(kvm_exit, TP_PROTO(int ret, unsigned int esr_ec, unsigned long vcpu_pc), TP_ARGS(ret, esr_ec, vcpu_pc),