From nobody Sat Apr 11 19:32:52 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 8A948C3F6B0 for ; Mon, 8 Aug 2022 00:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234631AbiHHAgT (ORCPT ); Sun, 7 Aug 2022 20:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230357AbiHHAgM (ORCPT ); Sun, 7 Aug 2022 20:36:12 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD4463EB for ; Sun, 7 Aug 2022 17:36:11 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id by13-20020a056a00400d00b0052ec5a1cd4dso2644171pfb.21 for ; Sun, 07 Aug 2022 17:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:from:to:cc; bh=asDbFP4JFb0e7xA7oblyxbYFEsRwuDE3XnS3dP45ers=; b=LPofzHp+QejVs7YORkGjTw0QzbKv6neHoKdc1Kn+bCR9ask7qi7J6yXD4Ru3ua4A8x LH5FpGl3wy8hfJZlzucaU+VpuxwY+1EbOFPV33yOWEHlEejKqPyb1d2csrHvfFoRXKiL mVJbBno//jGY6tUY7SqBSMGAlrFfzF4Ls/ra5q7zb7gZsn9+IGcuRQd4eVbASi5gK6Zw 4/GND6X2SMSiyIOKes/BrDeUtjgfZU9Oh9+s+UMXR9C4237pBJDkSKVsM+dVPE1y/BqW OVeeh/FGpz/0yXL84AG4I2E1G4Wb9j/1JavzYSZLI6n9bfmvyBU9Z90WK2dEs6elR7K+ tGNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=asDbFP4JFb0e7xA7oblyxbYFEsRwuDE3XnS3dP45ers=; b=ltMpn6nnHOjisRSxQtrIgr35psbagK+fpN0YecVOkbL9jNao507AloCPpbAaaVOzjb SkE+rltrLRF24MiQlzIdQLkY5LRqpzyC+xsx4Qc8qnG7H3bQx92mjzeRrq5OJpW5FH/e 9DbE15mDPlrWwPt0C/A+y93iO4xnmOJgJaqljtB0GPIRTmgI9qeaFsQGe75OvSrvHm4+ Ap/UTt6W/GPAjvTGV50KbRVSbSF0zGFuvHi4i7xUOVkFGnkvwSS+HRZ80PXpFPJXW4kb upxPr8wDKfkUJqNdgVZRSnYcNohekV9VkEj0M5QWcdKi4slg4Jdv/hdqM8CSWHaH7hLr mLPg== X-Gm-Message-State: ACgBeo3HAoKEKBIv/GZL3wSp4sLn/LxkMUr2qbgP9yzqFqEaN2IcL4lH 6VfWZLUr3tCxSn9Uc6Ts5TiDpZ0b/CVn X-Google-Smtp-Source: AA6agR6fsNI1kDM+j+yiPgAkODdBZ5nkVNdQ+2RFnfzoIbQbkcztGnkSv3+NNlbmmX3iiKTbeBpl9f0UcnIk X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a17:902:cec6:b0:16e:ec03:ff1 with SMTP id d6-20020a170902cec600b0016eec030ff1mr16704649plg.96.1659918970839; Sun, 07 Aug 2022 17:36:10 -0700 (PDT) Reply-To: Mingwei Zhang Date: Mon, 8 Aug 2022 00:36:04 +0000 In-Reply-To: <20220808003606.424212-1-mizhang@google.com> Message-Id: <20220808003606.424212-2-mizhang@google.com> Mime-Version: 1.0 References: <20220808003606.424212-1-mizhang@google.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog Subject: [PATCH v3 1/3] KVM: x86: Update trace function for nested VM entry to support VMX From: Mingwei Zhang To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , 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 ba7cd26f438f..0a148a352c3a 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -724,11 +724,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 de4762517569..3ef29c7e4f69 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -578,10 +578,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 ) @@ -589,7 +590,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( @@ -598,14 +600,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 1910e1e78b15..52f6351dc15b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13084,7 +13084,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.1.559.g78731f0fdb-goog From nobody Sat Apr 11 19:32:52 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 A6ECCC19F2A for ; Mon, 8 Aug 2022 00:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234658AbiHHAgW (ORCPT ); Sun, 7 Aug 2022 20:36:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233053AbiHHAgN (ORCPT ); Sun, 7 Aug 2022 20:36:13 -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 B07EC63E0 for ; Sun, 7 Aug 2022 17:36:12 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id b8-20020a170903228800b0016f2420ddedso5261644plh.19 for ; Sun, 07 Aug 2022 17:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:from:to:cc; bh=3S4dHkc0MTdRqLv4SAcUqz1B/UVYMX8Vb8XOweGx+Xk=; b=k8SwtQYdUwGzi6BjV82WmRUu3DSH9ZVvRp5BHjYQ0ttSH3NMLZ5yodStvp++/TX/eP 8THi5ka3yqv2QLjH4JIMbu+Jlxr7q4m7O0yPCIzgw7eqGrsDfGIAl929jiy6S6z87DRf rEYijg4j862bIxPlK9ZCpQJkrm2vijrNY/WpxPhGT1DYTdytdXs/HNfp1cv88KfSrFda UustYvpcO99RK9VnQpW3+NuYd0hxBi8dZDFL8N73VfXFK2ufmWRbViBg83vaL7iffpeu jMtTgY14NnGD0l2kooD92aLuvNjdMLYa2OlrqzcVSaaZTVZJk4ys6s3oW5ImfgKLSvcP PiCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=3S4dHkc0MTdRqLv4SAcUqz1B/UVYMX8Vb8XOweGx+Xk=; b=QsSbYxEbsFaIn/MTRnWdVEKOZnCKoYqJ/MK22qIcZomJYpA6tRt1hADHdZs/obv4gL PNRwnJQj46Tyy9vNMvuT3m86Bef7zg30swDLYlYeksrzgXoK7X9L2djNmeZeBOrCf4N6 1NzXeVUR5l55VcwADX3CGIBI2ZuhJecPaiCIC0SyFIp3vgOi2thM6Bz1KwF7w/j9JfE8 2Rb6BzaTKyPWo80CWVl8gq2N8UPNnpjEsTjTM+J1z4lSeBfyD4yNGTtQjmR3UPnhxoJi /VCbOYl+QBNNXxlL+UXaFlO3eXsPRX8QOMYqh3IGTBbV9tRE88fM3QSmE9+RxkiQn0ER 0LxA== X-Gm-Message-State: ACgBeo2lcuTy1OaIxDkPuijVkayOa5+AGOTqoW7V3pS/Ym12DbPCz1pA hVXsI5BXzKMzmFcqF2wTpp+5YVAC3Bal X-Google-Smtp-Source: AA6agR4fgv7b0+tDrH4/mToceWv+CaztaivGulIYYwVgW7bZ2kFq/RW0sNCa09fwKUBGlzNHdRKC/tglv46P X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a05:6a00:a93:b0:528:77d6:f660 with SMTP id b19-20020a056a000a9300b0052877d6f660mr16354359pfl.50.1659918972247; Sun, 07 Aug 2022 17:36:12 -0700 (PDT) Reply-To: Mingwei Zhang Date: Mon, 8 Aug 2022 00:36:05 +0000 In-Reply-To: <20220808003606.424212-1-mizhang@google.com> Message-Id: <20220808003606.424212-3-mizhang@google.com> Mime-Version: 1.0 References: <20220808003606.424212-1-mizhang@google.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog Subject: [PATCH v3 2/3] KVM: nVMX: Add tracepoint for nested vmenter From: Mingwei Zhang To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , 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 f5cb18e00e78..a65477295ec0 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3367,6 +3367,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.1.559.g78731f0fdb-goog From nobody Sat Apr 11 19:32:52 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 A906FC19F2A for ; Mon, 8 Aug 2022 00:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234914AbiHHAg1 (ORCPT ); Sun, 7 Aug 2022 20:36:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233467AbiHHAgQ (ORCPT ); Sun, 7 Aug 2022 20:36:16 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DCF963EE for ; Sun, 7 Aug 2022 17:36:15 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id x3-20020a17090ab00300b001f731f28b82so2321525pjq.3 for ; Sun, 07 Aug 2022 17:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:from:to:cc; bh=np/zKDyUVwS1W7aYDEH7LbBLlTsAcwXA4VI1/IKlP2I=; b=FiUQRaBiLsY9KBwqRfBuiGVnyDu61TCCITxCv0dgSH3rP9NopCi+2wiG0KH3QgXIjL vTWeCSIrOotf0pGOgTg/d+Z6FTb5wHqCMqGl3Acur2NHX9QJaSpDb6Bf16HZj985cNax OiYGHZo+PEE9K+iORNib2snUIlpSGMm2d9Rw68fvBY3AwcxXA5SbJoc1h70O2Wwq7Kme Gg90Q3I8eegCZa3Ssf5LjfkwxvUn+PuKA90T65rIcNApcB9eTIEaCVhVKlJLytT70whW P2uPbynkuIo6aAjClE6f7nQwiPicsjTEJdRMhySrvbOBniNwv+zc5qQZpcBn10tFTdIs 5DaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc; bh=np/zKDyUVwS1W7aYDEH7LbBLlTsAcwXA4VI1/IKlP2I=; b=avw+XbGcHhviiniMniqNRULceMoz6ran0iK9qqnEguf8XTb6CzB/KrkoKhHt5blaHW +Pin5RFIIwdxTxObyWALrLAouTy4B+ARjxXLTGXHOqC8vY+dMGDz3bxkc0q3RBzGH6Gh CYuQJU5bXCZmmssclvw7nwe3zoZNVkN/jg/2zACODxiXlNYAA2v2bbL+oAuuQ2pJjF4A VwmkANuARCRFw4IDx6/0AdGYMLtlmh0f9ZX+85mpPMX8Wn/RzhU4i7/646QV6kIRlxSf 20rI5CvvVg9VUJ1EQCkClLHKXdk02+cZA+b8qndTL11qxtrQQ8PhoXEMZ8t7MrG/1DDU DJ4A== X-Gm-Message-State: ACgBeo0C8kZyuX7lFfRrNtyXveV36FOV4mTFPhRlkFMdogjE5aZbDeEI TngxU+Wdboq7oP5DMnfdkmmEkgQKZN0M X-Google-Smtp-Source: AA6agR4pvER6blwvdq6OmwHugcEqd/AycIb8NeErTtQnYC9hrjM1qbO+O8FI6VrlcogkC7dvkdqBl172wxDY X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a17:90a:249:b0:1e0:a8a3:3c6c with SMTP id t9-20020a17090a024900b001e0a8a33c6cmr1201360pje.0.1659918973913; Sun, 07 Aug 2022 17:36:13 -0700 (PDT) Reply-To: Mingwei Zhang Date: Mon, 8 Aug 2022 00:36:06 +0000 In-Reply-To: <20220808003606.424212-1-mizhang@google.com> Message-Id: <20220808003606.424212-4-mizhang@google.com> Mime-Version: 1.0 References: <20220808003606.424212-1-mizhang@google.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog Subject: [PATCH v3 3/3] KVM: x86: Print guest pgd in kvm_nested_vmenter() From: Mingwei Zhang To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , 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 0a148a352c3a..0b91a82a3755 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -730,6 +730,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 3ef29c7e4f69..821b3d254bb9 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -580,9 +580,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 ) @@ -591,6 +592,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 @@ -601,11 +603,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, @@ -613,7 +617,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 a65477295ec0..4237b415e0f7 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3373,6 +3373,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.1.559.g78731f0fdb-goog