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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 806DAC433EF for ; Mon, 18 Jul 2022 17:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235625AbiGRRNw (ORCPT ); Mon, 18 Jul 2022 13:13:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234592AbiGRRNk (ORCPT ); Mon, 18 Jul 2022 13:13:40 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 009322C10E for ; Mon, 18 Jul 2022 10:13:39 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id s129-20020a632c87000000b00411564fe1feso5866935pgs.7 for ; Mon, 18 Jul 2022 10:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=T789rHVyM0EXnBz1s4xRom+47Pt99vhuH1gFXMufNBM=; b=lUCY63XCcnTUmmbN+2RPcnFjRSJ8Sfm/6HX/0m66JTA1bkq5V2Cy7qXkNOVlD+O9p6 t3eUdZWsFDMfRYvIBTI01Mh4VZcl+Uzy2MNRljKAt88WIBPSD0cLeewVVk+sZepqWKq8 XRh5A9vzt69+AbrzXpvUfSsOhNuxMSxC1XAKR/qk9/MXTtlPfjCVklm08est7K/SRs8S TjbXiNSzYEfZYm2ko/HxHdPMrbprvT7xIb60h7WnbhqKXYs/GJzmTfnAXEJb7jQFgd32 65TX2LBN6bcvOF3ciPmITGYrZpw/AVuTCKni18RUN5NwY1azbmFDMsdZXmiAfAiU+z+B Vx5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=T789rHVyM0EXnBz1s4xRom+47Pt99vhuH1gFXMufNBM=; b=s3yTQXyWmP9lHn/K77xMoC0rhuzHufQkLkiEAZ3zTx4oW8FL5RJzgQeh2MVGcEp3GB mQKESNEZdkLLPJa3VFHXAwZuqncK6zzo78UyjRu5dIdP/5eeo8wZ+nrqF0xLIjDUOwqy 5zZztpdtbmoDc5r96KERT82XjkaaGKJtgkQMUxr1hfqI1Tv414Uv6ikeOQeK57gHp95M UkVZDVIqA+9eNFpg6tPEkYp4Hsfrlx0M5FhmCF6tpeO8zi1jYAYmrTEXIrj5n9OBcdGn TGw1aMq0kuqKd3ZdUNRfdeGO5lQsus1EV7fSqJBzLMKWSOFh5iGnz7KUwX6ijP8xPp0o HB3w== X-Gm-Message-State: AJIora+EymLbrvniuaD7bp4YMN+gumQSSJPGTKg+N8Fb7q7iyblcuZxr JfRezVuNhZo0FFgrKEYbAjcDO1LGQs90 X-Google-Smtp-Source: AGRyM1va7P2ztYevG3XekdBbVXxvteBJ+UuQ0nFr6oDlNIJ5SGcdXE8wK4eAZhIprsSbJdWw5p1sec3y4FFW X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a05:6a00:188e:b0:52a:b545:559f with SMTP id x14-20020a056a00188e00b0052ab545559fmr29158357pfh.18.1658164419189; Mon, 18 Jul 2022 10:13:39 -0700 (PDT) Reply-To: Mingwei Zhang Date: Mon, 18 Jul 2022 17:13:32 +0000 In-Reply-To: <20220718171333.1321831-1-mizhang@google.com> Message-Id: <20220718171333.1321831-3-mizhang@google.com> Mime-Version: 1.0 References: <20220718171333.1321831-1-mizhang@google.com> X-Mailer: git-send-email 2.37.0.170.g444d1eabd0-goog Subject: [PATCH v2 2/2] kvm: nVMX: add tracepoint for kvm:kvm_nested_vmrun 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Matlack This tracepoint is called by nested SVM during emulated VMRUN. Call also during emulated VMLAUNCH and VMRESUME in nested VMX. 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 [Add several parameters and move the code into the nested_vmx_enter_non_root_mode().] Signed-off-by: Mingwei Zhang --- arch/x86/kvm/vmx/nested.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index f5cb18e00e78..825f7102daee 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3367,6 +3367,15 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, }; u32 failed_index; + trace_kvm_nested_vmrun(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, + vmcs12->ept_pointer, + KVM_ISA_VMX); + kvm_service_local_tlb_flush_requests(vcpu); evaluate_pending_interrupts = exec_controls_get(vmx) & -- 2.37.0.170.g444d1eabd0-goog