From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CE6DC432BE for ; Mon, 23 Aug 2021 19:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 164AE613D0 for ; Mon, 23 Aug 2021 19:37:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232101AbhHWTiL (ORCPT ); Mon, 23 Aug 2021 15:38:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231982AbhHWTiI (ORCPT ); Mon, 23 Aug 2021 15:38:08 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7E01C061757 for ; Mon, 23 Aug 2021 12:37:25 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id z2-20020a5b0b02000000b005982be23a34so10939879ybp.19 for ; Mon, 23 Aug 2021 12:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=nveAaHVBnxnUKFG18sU+pbtyM6YzqpNesv6ZkGb2ois=; b=FESYWZLplFRiwGN7ZdpF8Zt3Em90s6rELCzxVhSuao3d4FHG4O/BO1naEpOYe382vy DfLssZIIfld5lOwYekPdJ/pzAdsi134TnJIbfzHq30gcAh7KuqhR+MwXbrvLmzulssji jdGpP9DrZr4cvn3CSB0+Su/X0Kh3S9s6xFXVNBOILP5PrrnQrhXqgwNdYErN7TLqBDQw EdQb+z0ssxUFDDrUYAXK6QjjUl6P4u66PcZ8lks5VKF/qoPFqIxskLw24VmFdbfkLHfA IfMOZ6vCVh50YFl9PSBKFuV9Ve2R2iagixzuFnQWdgt+LMknP39ti9+Z+IjlzVBAPyBb 2azw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=nveAaHVBnxnUKFG18sU+pbtyM6YzqpNesv6ZkGb2ois=; b=lU/K1CmXMKREXnIeTJ0LgtYj2b6jUkr2mQAIzbJX0w4HR/hKqA1YieAw8D07gFDLDf 4pV8F/MLTa/U/1G4xx1kUPEw95IfHSCPIM5hnIIdKbgmsxhlSvpvRZJ8r5/WYRy86cga CScdTrCXZsc0nNSU1vTCCQLTndaBqhE6p/G4aCgwsdb0kxXEns8HMn/oHL7l23nG8EJ5 glfHggnPg9wk8bHt3Wn17c7Q+FcfX6/rJMoFBykzCi1rz5fX1OE7BaGwULMd3pHmunM6 LxhHwu5qPwPsIyhPGTkQHyN6Mxmn09HHichuO34UaCPB4FYGySSVvuqh2z5cORqaq1l9 pBOA== X-Gm-Message-State: AOAM531MTA5JPkpqOIgKeG/BJW4bsoAlBIV/GfyL9SoqBmJur6UEbG/6 /jBupLBEb5clFUEybbRCU87aAtH7b1k= X-Google-Smtp-Source: ABdhPJxvZl6SBIhaEOMBBZQbGAROAi1buHgHmkkQbX8vm8I8czB32i+RxswGTkU2VMdtvEVQSiWDz8nDpy8= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:90:200:109c:7eb8:d5ed:2e59]) (user=seanjc job=sendgmr) by 2002:a25:7bc5:: with SMTP id w188mr47700735ybc.285.1629747445204; Mon, 23 Aug 2021 12:37:25 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 23 Aug 2021 12:37:07 -0700 In-Reply-To: <20210823193709.55886-1-seanjc@google.com> Message-Id: <20210823193709.55886-2-seanjc@google.com> Mime-Version: 1.0 References: <20210823193709.55886-1-seanjc@google.com> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog Subject: [PATCH 1/3] KVM: x86: Register perf callbacks after calling vendor's hardware_setup() From: Sean Christopherson To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Paolo Bonzini Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Artem Kashkanov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wait to register perf callbacks until after doing vendor hardaware setup. VMX's hardware_setup() configures Intel Processor Trace (PT) mode, and a future fix to register the Intel PT guest interrupt hook if and only if Intel PT is exposed to the guest will consume the configured PT mode. Delaying registration to hardware setup is effectively a nop as KVM's perf hooks all pivot on the per-CPU current_vcpu, which is non-NULL only when KVM is handling an IRQ/NMI in a VM-Exit path. I.e. current_vcpu will be NULL throughout both kvm_arch_init() and kvm_arch_hardware_setup(). Cc: Alexander Shishkin Cc: Artem Kashkanov Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 86539c1686fa..fb6015f97f9e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8426,8 +8426,6 @@ int kvm_arch_init(void *opaque) kvm_timer_init(); - perf_register_guest_info_callbacks(&kvm_guest_cbs); - if (boot_cpu_has(X86_FEATURE_XSAVE)) { host_xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK); supported_xcr0 = host_xcr0 & KVM_SUPPORTED_XCR0; @@ -8461,7 +8459,6 @@ void kvm_arch_exit(void) clear_hv_tscchange_cb(); #endif kvm_lapic_exit(); - perf_unregister_guest_info_callbacks(&kvm_guest_cbs); if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block, @@ -11064,6 +11061,8 @@ int kvm_arch_hardware_setup(void *opaque) memcpy(&kvm_x86_ops, ops->runtime_ops, sizeof(kvm_x86_ops)); kvm_ops_static_call_update(); + perf_register_guest_info_callbacks(&kvm_guest_cbs); + if (!kvm_cpu_cap_has(X86_FEATURE_XSAVES)) supported_xss = 0; @@ -11091,6 +11090,8 @@ int kvm_arch_hardware_setup(void *opaque) void kvm_arch_hardware_unsetup(void) { + perf_unregister_guest_info_callbacks(&kvm_guest_cbs); + static_call(kvm_x86_hardware_unsetup)(); } -- 2.33.0.rc2.250.ged5fa647cd-goog