From nobody Sat Apr 11 21:03:26 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 363BBECAAD4 for ; Thu, 25 Aug 2022 22:58:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244510AbiHYW6Q (ORCPT ); Thu, 25 Aug 2022 18:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244461AbiHYW6J (ORCPT ); Thu, 25 Aug 2022 18:58:09 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3630C2EAB for ; Thu, 25 Aug 2022 15:58:07 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-335420c7bfeso365222457b3.16 for ; Thu, 25 Aug 2022 15:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc; bh=wX6f3Odvjz4F7Hal7LKKrZsLMNpsU/ZOr3kUt12Hrdw=; b=ePwiA86IU6ajvcecOukINsd4ZYf3xHEn+2u/MCnJRdfZUS1t3ztKHdF1gwvJoRaID3 7CiNU9yRu4e1BypxkFLwI8TzId2PumYz88L0QBaKibm3sJofU8k0ELV4LbKfrc0CUWsa LLywnJPoAC7LNchySzg2X0llHiy5guITKiygTVSUdm+WSNG1L++mUFG+HHhWo/KpRFXg z3+LaNq26/kzU0Tbdp9napC9eQugcnu5ev858qEROWO2LLC/Q9hCBlDgvuq8X4Q6Ez+4 Ito0I8yLAFdSNLj4/Pl3IE6toeRA11DzIkh/37onOdKW7kAO5FH1aAF6MkTxoDzxbGKR c7ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=wX6f3Odvjz4F7Hal7LKKrZsLMNpsU/ZOr3kUt12Hrdw=; b=hx2+Pw+nURmA4j79u1J+6K/f1aiWDd/fPcIgNReKThzf4RPwPcmmlCzsQH1aV9xVvW XsmZkkAVR3YS/FbUH93JEg6jbTlW6ArhPm7bhpAqdIPmSGdgGPG5Gjw/f7QH0kR1xtvG H0hguQ17S/ZRJw43R39+fme1v6eAx008lHH08NXmMnewnfDZ5W+Eu9wD8M+Z9BqBfU1O kYyJNGq3zSfRQ2iB1tI/AXjcgfZCjRKev8PF+DaioRGXeU2lesmCQRfnV+ej8KMRRfcC U65oeydDgrHZmBW/B0tm49C+fImDU9qx8ZjSTbwNE2TraMI1cyuu+L5b5jdQLjK6u85Y TSYw== X-Gm-Message-State: ACgBeo2a1BXSSNm06bAnnZ8Fq3xrJVTKLYb+i7z+mIp55bAUH4a0RKrv 7OpF6zNkS6pvyF0CsfUybaWZXj/19yD7 X-Google-Smtp-Source: AA6agR5GbnSy3kehJOFUmZlLAOaVnM/d5MemD/wEjTt6QgrkUsj1gYxbzrLeiTfyILaQX/gzlCfBqv5X99UH X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a25:6601:0:b0:693:caac:2d8b with SMTP id a1-20020a256601000000b00693caac2d8bmr5169050ybc.579.1661468286604; Thu, 25 Aug 2022 15:58:06 -0700 (PDT) Reply-To: Mingwei Zhang Date: Thu, 25 Aug 2022 22:57:53 +0000 In-Reply-To: <20220825225755.907001-1-mizhang@google.com> Mime-Version: 1.0 References: <20220825225755.907001-1-mizhang@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220825225755.907001-2-mizhang@google.com> Subject: [PATCH v4 1/3] KVM: x86: Update trace function for nested VM entry to support VMX From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , David Matlack Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update trace function for nested VM entry to support VMX. Existing trace function only supports nested VMX and the information printed out is AMD specific. So, update trace_kvm_nested_vmrun() to trace_kvm_nested_vmenter(), since 'vmenter' is generic. Add a new field 'isa' to recognize Intel and AMD; Update the output to print out VMX/SVM related naming respectively, eg., vmcb vs. vmcs; npt vs. ept. Opportunistically update the call site of trace_kvm_nested_vmenter() to make one line per parameter. Signed-off-by: Mingwei Zhang --- arch/x86/kvm/svm/nested.c | 6 ++++-- arch/x86/kvm/trace.h | 28 ++++++++++++++++++---------- arch/x86/kvm/x86.c | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 76dcc8a3e849..835c508eed8e 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -781,11 +781,13 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 v= mcb12_gpa, struct vcpu_svm *svm =3D to_svm(vcpu); int ret; =20 - trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb12_gpa, + trace_kvm_nested_vmenter(svm->vmcb->save.rip, + vmcb12_gpa, vmcb12->save.rip, vmcb12->control.int_ctl, vmcb12->control.event_inj, - vmcb12->control.nested_ctl); + vmcb12->control.nested_ctl, + KVM_ISA_SVM); =20 trace_kvm_nested_intercepts(vmcb12->control.intercepts[INTERCEPT_CR] & 0x= ffff, vmcb12->control.intercepts[INTERCEPT_CR] >> 16, diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index 2120d7c060a9..e7f0da9474f0 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -589,10 +589,11 @@ TRACE_EVENT(kvm_pv_eoi, /* * Tracepoint for nested VMRUN */ -TRACE_EVENT(kvm_nested_vmrun, +TRACE_EVENT(kvm_nested_vmenter, TP_PROTO(__u64 rip, __u64 vmcb, __u64 nested_rip, __u32 int_ctl, - __u32 event_inj, bool npt), - TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, npt), + __u32 event_inj, bool tdp_enabled, __u32 isa), + TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, tdp_enabled, + isa), =20 TP_STRUCT__entry( __field( __u64, rip ) @@ -600,7 +601,8 @@ TRACE_EVENT(kvm_nested_vmrun, __field( __u64, nested_rip ) __field( __u32, int_ctl ) __field( __u32, event_inj ) - __field( bool, npt ) + __field( bool, tdp_enabled ) + __field( __u32, isa ) ), =20 TP_fast_assign( @@ -609,14 +611,20 @@ TRACE_EVENT(kvm_nested_vmrun, __entry->nested_rip =3D nested_rip; __entry->int_ctl =3D int_ctl; __entry->event_inj =3D event_inj; - __entry->npt =3D npt; + __entry->tdp_enabled =3D tdp_enabled; + __entry->isa =3D isa; ), =20 - TP_printk("rip: 0x%016llx vmcb: 0x%016llx nrip: 0x%016llx int_ctl: 0x%08x= " - "event_inj: 0x%08x npt: %s", - __entry->rip, __entry->vmcb, __entry->nested_rip, - __entry->int_ctl, __entry->event_inj, - __entry->npt ? "on" : "off") + TP_printk("rip: 0x%016llx %s: 0x%016llx nested_rip: 0x%016llx " + "int_ctl: 0x%08x event_inj: 0x%08x nested_%s: %s", + __entry->rip, + __entry->isa =3D=3D KVM_ISA_VMX ? "vmcs" : "vmcb", + __entry->vmcb, + __entry->nested_rip, + __entry->int_ctl, + __entry->event_inj, + __entry->isa =3D=3D KVM_ISA_VMX ? "ept" : "npt", + __entry->tdp_enabled ? "on" : "off") ); =20 TRACE_EVENT(kvm_nested_intercepts, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index d7374d768296..0c36528ab345 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13375,7 +13375,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_page_fault); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_msr); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_cr); -EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_vmrun); +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_vmenter); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_vmexit); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_vmexit_inject); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_intr_vmexit); --=20 2.37.2.672.g94769d06f0-goog From nobody Sat Apr 11 21:03:26 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1824ECAAA3 for ; Thu, 25 Aug 2022 22:58:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244206AbiHYW6W (ORCPT ); Thu, 25 Aug 2022 18:58:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244481AbiHYW6K (ORCPT ); Thu, 25 Aug 2022 18:58:10 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5611C6EA3 for ; Thu, 25 Aug 2022 15:58:08 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id a13-20020a170902eccd00b001730da9d40fso53066plh.10 for ; Thu, 25 Aug 2022 15:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc; bh=wadlRfkfh/eCNxZlBFG/ZMtLROgMWIvNN1fkY84o1Bw=; b=tXzIQz4kyQAPXHYs8XCgoemSHhQnDjonD9baMgjHt7S4fTWbkmK+lYHCx3cT/vNZZL w5uQT0L1p2FXY4jJLxvg49CM8s4E/LroaEsOaLU9PK3Pas+zu3GfSivERw4ro0pC50eh oo0xu2qmXAre/GO8gA2tSMUgT/piBlHUZZFbN/HxHg7tKLOfoWeOG0aKPN4Ncmki0Pj9 lUHaUtd/gGLZfIO2lRJFYLHTMlLfnfGZRyA3QNaB1eTXEbf0j7f8XBuerWExzYOGAoW8 Bz2du9VQwY9yAaW2XW1IMFsYdzGoO00ymM3KIPkSyS31tqE80pNE+SmzsOXLauybsRiN iZIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=wadlRfkfh/eCNxZlBFG/ZMtLROgMWIvNN1fkY84o1Bw=; b=CXuzX2DY2LfrdEZZnC74vhiCWUG7iQz8ACOh15EQ2CujgaRjhLarvwdvCHsOR8JC4i jIt61/7QvBsNrggn1Q7oRQfEiniRGzjQVXDgQvJbqZE/FFjHs3h1fkMAqXGMbLciyjAa rj/zHyUMRYUn1riniGdbF+YkKxjzPFBzJ00N00HlL8J7LxCZg2V2B2arHkj/eNNRSr2h mI1Fp7foxedpXfdH82FT+9DlHb/uUt6ByOoU4yFvl+81VVWsO0DY8z54HJIg/JmCmkCb cRgDYl2QQH8gN/9EsLRHpjvm9+HZxlk74mzHrzIkiWvto5W8nWOQnlhgikESXHzyc+4/ 1cDw== X-Gm-Message-State: ACgBeo1knKlCw6vIQj2x9Kh1nievxdqenE9sKtKGfBJ0BOHSc6gYMa/5 YNr9J8xtebGa6aY3m+Satly3K+lLDQ4S X-Google-Smtp-Source: AA6agR7A1fQHCwdLbya8oJ+6CW1VKfW6iKzzKprH1HJNVLv4rMRrwquEItfY6dBX9SsOVznkjavasyluYv5x X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a05:6a00:ad1:b0:530:2cb7:84de with SMTP id c17-20020a056a000ad100b005302cb784demr1257715pfl.3.1661468288259; Thu, 25 Aug 2022 15:58:08 -0700 (PDT) Reply-To: Mingwei Zhang Date: Thu, 25 Aug 2022 22:57:54 +0000 In-Reply-To: <20220825225755.907001-1-mizhang@google.com> Mime-Version: 1.0 References: <20220825225755.907001-1-mizhang@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220825225755.907001-3-mizhang@google.com> Subject: [PATCH v4 2/3] KVM: nVMX: Add tracepoint for nested vmenter From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , David Matlack Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Matlack Call trace_kvm_nested_vmenter() during nested VMLAUNCH/VMRESUME to bring parity with nSVM's usage of the tracepoint during nested VMRUN. Attempt to use analagous VMCS fields to the VMCB fields that are reported in the SVM case: "int_ctl": 32-bit field of the VMCB that the CPU uses to deliver virtual interrupts. The analagous VMCS field is the 16-bit "guest interrupt status". "event_inj": 32-bit field of VMCB that is used to inject events (exceptions and interrupts) into the guest. The analagous VMCS field is the "VM-entry interruption-information field". "npt_enabled": 1 when the VCPU has enabled nested paging. The analagous VMCS field is the enable-EPT execution control. "npt_addr": 64-bit field when the VCPU has enabled nested paging. The analagous VMCS field is the ept_pointer. Signed-off-by: David Matlack [move the code into the nested_vmx_enter_non_root_mode().] Signed-off-by: Mingwei Zhang --- arch/x86/kvm/vmx/nested.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index ddd4367d4826..f72fe9452391 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3364,6 +3364,14 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_m= ode(struct kvm_vcpu *vcpu, }; u32 failed_index; =20 + trace_kvm_nested_vmenter(kvm_rip_read(vcpu), + vmx->nested.current_vmptr, + vmcs12->guest_rip, + vmcs12->guest_intr_status, + vmcs12->vm_entry_intr_info_field, + vmcs12->secondary_vm_exec_control & SECONDARY_EXEC_ENABLE_EPT, + KVM_ISA_VMX); + kvm_service_local_tlb_flush_requests(vcpu); =20 evaluate_pending_interrupts =3D exec_controls_get(vmx) & --=20 2.37.2.672.g94769d06f0-goog From nobody Sat Apr 11 21:03:26 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7A0CECAAA3 for ; Thu, 25 Aug 2022 22:58:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244507AbiHYW60 (ORCPT ); Thu, 25 Aug 2022 18:58:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244312AbiHYW6M (ORCPT ); Thu, 25 Aug 2022 18:58:12 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7A54C6EA6 for ; Thu, 25 Aug 2022 15:58:10 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-33daeaa6b8eso73393467b3.7 for ; Thu, 25 Aug 2022 15:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc; bh=FD82s3MMzYB8GBAJIpK/z/0Hk3ArgyOBmCxF7AYV4Cw=; b=ZQhMXb9SCtgugfP2YGQ8gvz7CKQhTwhyoZC4VMPZHBCSmXHYO030MCNd3v3RgyMOy4 HfDu3XCP8ZLM9/2iaQzIjq5h+5WyVcqAwWVJvpexrPuhKzO0J2bPEkA4KX9BFrB3nVaR V6bSWzS2bJLU+9zwJnsoiMt4Gg+2ir4kh+SrvFOi0qXsEEE1K6Wx+fuhqR7yDUi3S8nU U+XVhuhk+RBX9NvremewdIM8xAWrJ3z5VPJmfxSq7zMRw+0Mi9naHNo/3vSjaZY1iWaX rytGD8qTy74x7wqSEiwqKZabtnX+/+Z+qTq6gD4dUtMwsixPxlnfASYlV46FmTV2D6cb T6CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=FD82s3MMzYB8GBAJIpK/z/0Hk3ArgyOBmCxF7AYV4Cw=; b=rSXmQuo4//ttQN4aGjZ4sY5TcvQqWqHsmPsgFPkrJH5G2L7jcgEM5xpIsabessQLtS ubBT+ikjpSYlGkzMTfc2+G2bfcHRhLQeHMtcrF786FiuOaCnZCyKL7ma8B0JoCRDPfRS fdG5SBiKfWJQsN7pr4o+sFQBg9d8UuVxEAL+n4TH7VwPfzBf9G75E8Dp3shFBr+Te847 zOxsmBCiJzIecxciB6oQ8deu3noNHBH1u0fhwYRXbrLHL2XAZiG/xuN7qdc8Sip4t88G QkMYPZSdvbH58PGQ9WDe9AHB35BJ2quBuZ4A9yGpaIT1RVzhU/JThRwGVit0/jFrfUmx E7+Q== X-Gm-Message-State: ACgBeo2jrHjyGbcexfKBFyVnC7ta+HJgqXT/zN2vuKBBxsBECRdu9arP jWFggh9tMsbd8figrqfiNdLU25OSFHWj X-Google-Smtp-Source: AA6agR6aWBJdKui7yBrmJ2lo0BpaVF02BfZ3BGPvA+/LtdtBaRS2qe9gMialtqsarsKsgczy3mWWisqFHQXQ X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a25:bb44:0:b0:677:24c:308f with SMTP id b4-20020a25bb44000000b00677024c308fmr5394791ybk.433.1661468290101; Thu, 25 Aug 2022 15:58:10 -0700 (PDT) Reply-To: Mingwei Zhang Date: Thu, 25 Aug 2022 22:57:55 +0000 In-Reply-To: <20220825225755.907001-1-mizhang@google.com> Mime-Version: 1.0 References: <20220825225755.907001-1-mizhang@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220825225755.907001-4-mizhang@google.com> Subject: [PATCH v4 3/3] KVM: x86: Print guest pgd in kvm_nested_vmenter() From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , David Matlack Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Print guest pgd in kvm_nested_vmenter() to enrich the information for tracing. When tdp is enabled, print the value of tdp page table (EPT/NPT); when tdp is disabled, print the value of non-nested CR3. Suggested-by: Sean Christopherson Signed-off-by: Mingwei Zhang --- arch/x86/kvm/svm/nested.c | 2 ++ arch/x86/kvm/trace.h | 13 +++++++++---- arch/x86/kvm/vmx/nested.c | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 835c508eed8e..05b7994244c5 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -787,6 +787,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmc= b12_gpa, vmcb12->control.int_ctl, vmcb12->control.event_inj, vmcb12->control.nested_ctl, + vmcb12->control.nested_cr3, + vmcb12->save.cr3, KVM_ISA_SVM); =20 trace_kvm_nested_intercepts(vmcb12->control.intercepts[INTERCEPT_CR] & 0x= ffff, diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index e7f0da9474f0..b2be0348bb14 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -591,9 +591,10 @@ TRACE_EVENT(kvm_pv_eoi, */ TRACE_EVENT(kvm_nested_vmenter, TP_PROTO(__u64 rip, __u64 vmcb, __u64 nested_rip, __u32 int_ctl, - __u32 event_inj, bool tdp_enabled, __u32 isa), + __u32 event_inj, bool tdp_enabled, __u64 guest_tdp, + __u64 guest_cr3, __u32 isa), TP_ARGS(rip, vmcb, nested_rip, int_ctl, event_inj, tdp_enabled, - isa), + guest_tdp, guest_cr3, isa), =20 TP_STRUCT__entry( __field( __u64, rip ) @@ -602,6 +603,7 @@ TRACE_EVENT(kvm_nested_vmenter, __field( __u32, int_ctl ) __field( __u32, event_inj ) __field( bool, tdp_enabled ) + __field( __u64, guest_pgd ) __field( __u32, isa ) ), =20 @@ -612,11 +614,13 @@ TRACE_EVENT(kvm_nested_vmenter, __entry->int_ctl =3D int_ctl; __entry->event_inj =3D event_inj; __entry->tdp_enabled =3D tdp_enabled; + __entry->guest_pgd =3D tdp_enabled ? guest_tdp : guest_cr3; __entry->isa =3D isa; ), =20 TP_printk("rip: 0x%016llx %s: 0x%016llx nested_rip: 0x%016llx " - "int_ctl: 0x%08x event_inj: 0x%08x nested_%s: %s", + "int_ctl: 0x%08x event_inj: 0x%08x nested_%s: %s, " + "guest_pgd: 0x%016llx", __entry->rip, __entry->isa =3D=3D KVM_ISA_VMX ? "vmcs" : "vmcb", __entry->vmcb, @@ -624,7 +628,8 @@ TRACE_EVENT(kvm_nested_vmenter, __entry->int_ctl, __entry->event_inj, __entry->isa =3D=3D KVM_ISA_VMX ? "ept" : "npt", - __entry->tdp_enabled ? "on" : "off") + __entry->tdp_enabled ? "on" : "off", + __entry->guest_pgd) ); =20 TRACE_EVENT(kvm_nested_intercepts, diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index f72fe9452391..f963e5ce0a28 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3370,6 +3370,8 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mo= de(struct kvm_vcpu *vcpu, vmcs12->guest_intr_status, vmcs12->vm_entry_intr_info_field, vmcs12->secondary_vm_exec_control & SECONDARY_EXEC_ENABLE_EPT, + vmcs12->ept_pointer, + vmcs12->guest_cr3, KVM_ISA_VMX); =20 kvm_service_local_tlb_flush_requests(vcpu); --=20 2.37.2.672.g94769d06f0-goog