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=ham 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 3F39DC48BCF for ; Wed, 9 Jun 2021 18:57:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2562A61364 for ; Wed, 9 Jun 2021 18:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229976AbhFIS66 (ORCPT ); Wed, 9 Jun 2021 14:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229797AbhFIS64 (ORCPT ); Wed, 9 Jun 2021 14:58:56 -0400 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2ED5CC061574 for ; Wed, 9 Jun 2021 11:56:47 -0700 (PDT) Received: by mail-qv1-xf4a.google.com with SMTP id ea18-20020ad458b20000b0290215c367b5d3so15135711qvb.3 for ; Wed, 09 Jun 2021 11:56:47 -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=syv2uotrlz6j8ocXZwF6/evBsYdXY7BIpcJqGgzmlYQ=; b=R3bhLc1/AI31GEEIJcUspnCcKt6wAF0P58h1hrkmb07Ma/932rYsNhyf16l4YQ61+d A/oQFDU1xtoJPkFHR3Ehcuceak0vx1SgLFwmdL/u/VkdWGE4nxGuNEZxEsGOWikQTEXz CSxbhONDYkaaAjV2amQgMhpXTJu9thMm8106pJqaE/Ck+lCQemfEHE/+WSkHElpl/z7N 21dmlELezbF04si3RtTUrK4XexD/YHeKLw70feq7Yyd7naditzo4n4Lscpg6yy9i/CCT Ub/r5jDII/GimoJGNQWU2Bd1Mno5LfbufcVGjIFABZii3YWyLcYR6BUJULDEzOvGG/4S z8sQ== 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=syv2uotrlz6j8ocXZwF6/evBsYdXY7BIpcJqGgzmlYQ=; b=TG6f7s+ZWdHyQOZXSTA8FJD+BkrIwdJ3jIHSdpvWQ/PVhimj2Abp//dk7z1d1TBbXO 7F/HAYNbPUG7YlotpJTKguJg1Zo5QdcPUobrx3HdVokE5jUtzKI8rDitdt/chkITVkS3 9Q8EAcBluhdyy+AytNLPnA3+5M4SxPcg2n/iFigJ2KXm4ipGj9RzUutHbrDb8sGqdeed gO5uhGe3kJ62YBIlQzJpWCeBTVN2629TPtG8Gblcue4qmb11/tbZB1KR4s+pXCB7k4QR OdA7bKhtS0FPCqFTN8Bkq/yYdoBkT53MmFLi/O7lqsdI52djznt5vYcJLXtrtRKosqdz mHFQ== X-Gm-Message-State: AOAM530ePLz+OBfU48EFO3T59SvQ1VWI4ypRQRDxkqUt7I/WB56PUM7m xY3o8NFg3vWcjWFnmYm3QX37+TL4Mm0= X-Google-Smtp-Source: ABdhPJwbyEuyuu8WeEWukyDUN4qmkTcVk3K2f53i5rschpAigH8kd54OLDHf/5fGrShotZGaFXRzluEr5Lo= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:bfdc:c2e5:77b1:8ef3]) (user=seanjc job=sendgmr) by 2002:a0c:fe6c:: with SMTP id b12mr1363449qvv.32.1623265006316; Wed, 09 Jun 2021 11:56:46 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 9 Jun 2021 11:56:17 -0700 In-Reply-To: <20210609185619.992058-1-seanjc@google.com> Message-Id: <20210609185619.992058-8-seanjc@google.com> Mime-Version: 1.0 References: <20210609185619.992058-1-seanjc@google.com> X-Mailer: git-send-email 2.32.0.rc1.229.g3e70b5a671-goog Subject: [PATCH 7/9] KVM: x86: Rename SMM tracepoint to make it reflect reality From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, syzbot+fb0b6a7e8713aeb0319c@syzkaller.appspotmail.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Rename the SMM tracepoint, which handles both entering and exiting SMM, from kvm_enter_smm to kvm_smm_transition. Signed-off-by: Sean Christopherson --- arch/x86/kvm/trace.h | 2 +- arch/x86/kvm/x86.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index 4f839148948b..b484141ea15b 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -997,7 +997,7 @@ TRACE_EVENT(kvm_wait_lapic_expire, __entry->delta < 0 ? "early" : "late") ); -TRACE_EVENT(kvm_enter_smm, +TRACE_EVENT(kvm_smm_transition, TP_PROTO(unsigned int vcpu_id, u64 smbase, bool entering), TP_ARGS(vcpu_id, smbase, entering), diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 11ea81c8cb82..06f3be2d170b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7434,7 +7434,7 @@ static int complete_emulated_pio(struct kvm_vcpu *vcpu); static void kvm_smm_changed(struct kvm_vcpu *vcpu, bool entering_smm) { - trace_kvm_enter_smm(vcpu->vcpu_id, vcpu->arch.smbase, entering_smm); + trace_kvm_smm_transition(vcpu->vcpu_id, vcpu->arch.smbase, entering_smm); if (entering_smm) { vcpu->arch.hflags |= HF_SMM_MASK; -- 2.32.0.rc1.229.g3e70b5a671-goog