Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   David Edmondson <david.edmondson@oracle.com>
To:     linux-kernel@vger.kernel.org
Cc:     "H. Peter Anvin" <hpa@zytor.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>, x86@kernel.org,
        Joerg Roedel <joro@8bytes.org>, Ingo Molnar <mingo@redhat.com>,
        kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
        Jim Mattson <jmattson@google.com>,
        Borislav Petkov <bp@alien8.de>,
        Sean Christopherson <seanjc@google.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Wanpeng Li <wanpengli@tencent.com>,
        David Matlack <dmatlack@google.com>,
        David Edmondson <david.edmondson@oracle.com>
Subject: [PATCH v6 2/4] KVM: x86: Get exit_reason as part of kvm_x86_ops.get_exit_info
Date:   Mon, 20 Sep 2021 11:37:35 +0100
Message-Id: <20210920103737.2696756-3-david.edmondson@oracle.com>
In-Reply-To: <20210920103737.2696756-1-david.edmondson@oracle.com>
References: <20210920103737.2696756-1-david.edmondson@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P9cf1i8HkJt2fPLl0yZFYS0SnSZZaUBbGLU2yRx4VgvxuAOSfCLNZVeKmG7X?=
 =?us-ascii?Q?6pg1ZEuZ/d6umrxwhavnTrZTmFfsTD6fbAStI9YjIfNgQMq/ipPUbw817v+W?=
 =?us-ascii?Q?JZgxYKzUCJalDehU3CeWaML9UxiOhmP/61u/wqQVzk4bBaxxNiCseWNf8JWB?=
 =?us-ascii?Q?lxTblIhykJniozuTlYDWLGr3KAyCRgdsr8PWCE1/zunaSTrXkqB5Grmc8MRL?=
 =?us-ascii?Q?1zLF/ZHomFs79tFsf3rN27yhu8Rc5D2HGGKZVCgw9S47SSh6TCuDgFYYWTBN?=
 =?us-ascii?Q?rWf8mTqgnsaS0gZ1t79B5oOuH4DF9etwidkmAEqZR0GHb10VTR3RuvIzf4Fr?=
 =?us-ascii?Q?/rgp7VQkNtee4rLtpDeI4DyPp1ABt5YwgCzhB473RqOx3b9ncuDpEu0GPfC2?=
 =?us-ascii?Q?m6wekf6ZjjW5lQiQm3WD+LqXnfVQfxFLcWWGXhRyU1Lr24hNQDrqWZqpvC+t?=
 =?us-ascii?Q?pqvqCRP6swHIfXsRyHZYpuuYavd4xXhTKNfbJr0MljB0Inq4+z7YswcI7dnc?=
 =?us-ascii?Q?iH2k2zoG/MBFe7EW0lVqk2V8VaDBVcqTqfgooQzrYnX5NZFlkf/tJu2fj6AI?=
 =?us-ascii?Q?TzQs8Elb19OSZfTNCZFjUlmyn79WvK863q8GiRQZMK0hkfVFMcFnPr2DCzg+?=
 =?us-ascii?Q?sqSsM07zBgMRS1/6XuhmK97Rpy+Sy0TLH6HNdKduHL74848Wnnb6FntO0KXs?=
 =?us-ascii?Q?fleE4Zffd1RmvyHGSviGyEKP9MbGHJDia0HZWfHfFdli/50VeE70q8Ca1wks?=
 =?us-ascii?Q?b7/FCqMp7kGBf0Jln4PM3R57UzzdlivHF2Zug5+0NUQ6lHrK8DQA77dcybnB?=
 =?us-ascii?Q?vw1c6lwv+mL4M/RtpjeUEFdLVSNObV737qRJwAk4sDa5ZnhzkJSFTyj8/kQD?=
 =?us-ascii?Q?ktmGiEqqTH4AfEEWvquQrhGCuLsDnS1sXIPiHF4O7vkFDwcGpgQH0gNczWrS?=
 =?us-ascii?Q?Qf8YV0kzQMiB4IIBwzIHCdiEH9UxThVaRlXdYh8qikwq4/lc55amSvMjlJnj?=
 =?us-ascii?Q?aPoC9K9oGqen04LxAPqncnd5WXgeoGN9+zG+tnBFCdiJdNFwXSzxIE13m0U+?=
 =?us-ascii?Q?r3AnHO1uQ5bRK7D/PTntW9WYyXzbwdMXrCk/Nv3UcA5rdQVCDb++YwUZQwQz?=
 =?us-ascii?Q?IVp6EQzQIqZDJu2NLS53++oPgRM/pfEvNfAf4vwNxdswzHWv/4CcBiAoPF+m?=
 =?us-ascii?Q?8oK35xyD11oVT6ddRZmQvtFg/WkdWSYjv86dozIw4y7EihTk6PnoUbNPMQf0?=
 =?us-ascii?Q?wH218ZFE8uMhEHJ+sPsmJOmOn+gfIQCj58S1SSF9bR36O87xmS28qcLIEOD9?=
 =?us-ascii?Q?6tgtsvDd9jcuYFo1o8QJmg4wGNBoa4AAP3Sa6+F++aAvEA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 91a5a7e6-a665-4d79-e601-08d97c22afb2
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3148.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 10:37:46.9344
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: v2QB62Gyz1HEf8Xn1IPzMxuIHsP9V/9kga6fhrbckg+EXQOr9Hx3eCNCE666UqJtWZWDbDC5/OD0+kg/cZs/NwnjbwacRO7rYRYwZrxeNEA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3308
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10112 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 spamscore=0
 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001
 definitions=main-2109200064
X-Proofpoint-GUID: 8mP0FWU29PPAm1HfgFKy2qLwjCoUgIlI
X-Proofpoint-ORIG-GUID: 8mP0FWU29PPAm1HfgFKy2qLwjCoUgIlI
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Extend the get_exit_info static call to provide the reason for the VM
exit. Modify relevant trace points to use this rather than extracting
the reason in the caller.

Signed-off-by: David Edmondson <david.edmondson@oracle.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/include/asm/kvm_host.h | 7 ++++---
 arch/x86/kvm/svm/svm.c          | 8 +++++---
 arch/x86/kvm/trace.h            | 9 +++++----
 arch/x86/kvm/vmx/nested.c       | 2 +-
 arch/x86/kvm/vmx/vmx.c          | 6 ++++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f8f48a7ec577..d22bbeb48f66 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1405,10 +1405,11 @@ struct kvm_x86_ops {
 	void (*write_tsc_multiplier)(struct kvm_vcpu *vcpu, u64 multiplier);
 
 	/*
-	 * Retrieve somewhat arbitrary exit information.  Intended to be used
-	 * only from within tracepoints to avoid VMREADs when tracing is off.
+	 * Retrieve somewhat arbitrary exit information.  Intended to
+	 * be used only from within tracepoints or error paths.
 	 */
-	void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2,
+	void (*get_exit_info)(struct kvm_vcpu *vcpu, u32 *reason,
+			      u64 *info1, u64 *info2,
 			      u32 *exit_int_info, u32 *exit_int_info_err_code);
 
 	int (*check_intercept)(struct kvm_vcpu *vcpu,
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 05e8d4d27969..a902a767f722 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3272,11 +3272,13 @@ int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code)
 	return svm_exit_handlers[exit_code](vcpu);
 }
 
-static void svm_get_exit_info(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2,
+static void svm_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason,
+			      u64 *info1, u64 *info2,
 			      u32 *intr_info, u32 *error_code)
 {
 	struct vmcb_control_area *control = &to_svm(vcpu)->vmcb->control;
 
+	*reason = control->exit_code;
 	*info1 = control->exit_info_1;
 	*info2 = control->exit_info_2;
 	*intr_info = control->exit_int_info;
@@ -3293,7 +3295,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
 	struct kvm_run *kvm_run = vcpu->run;
 	u32 exit_code = svm->vmcb->control.exit_code;
 
-	trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);
+	trace_kvm_exit(vcpu, KVM_ISA_SVM);
 
 	/* SEV-ES guests must use the CR write traps to track CR registers. */
 	if (!sev_es_guest(vcpu->kvm)) {
@@ -3306,7 +3308,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
 	if (is_guest_mode(vcpu)) {
 		int vmexit;
 
-		trace_kvm_nested_vmexit(exit_code, vcpu, KVM_ISA_SVM);
+		trace_kvm_nested_vmexit(vcpu, KVM_ISA_SVM);
 
 		vmexit = nested_svm_exit_special(svm);
 
diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 03ebe368333e..953b0fcb21ee 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -288,8 +288,8 @@ TRACE_EVENT(kvm_apic,
 
 #define TRACE_EVENT_KVM_EXIT(name)					     \
 TRACE_EVENT(name,							     \
-	TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu, u32 isa),  \
-	TP_ARGS(exit_reason, vcpu, isa),				     \
+	TP_PROTO(struct kvm_vcpu *vcpu, u32 isa),			     \
+	TP_ARGS(vcpu, isa),						     \
 									     \
 	TP_STRUCT__entry(						     \
 		__field(	unsigned int,	exit_reason	)	     \
@@ -303,11 +303,12 @@ TRACE_EVENT(name,							     \
 	),								     \
 									     \
 	TP_fast_assign(							     \
-		__entry->exit_reason	= exit_reason;			     \
 		__entry->guest_rip	= kvm_rip_read(vcpu);		     \
 		__entry->isa            = isa;				     \
 		__entry->vcpu_id        = vcpu->vcpu_id;		     \
-		static_call(kvm_x86_get_exit_info)(vcpu, &__entry->info1,    \
+		static_call(kvm_x86_get_exit_info)(vcpu,		     \
+					  &__entry->exit_reason,	     \
+					  &__entry->info1,		     \
 					  &__entry->info2,		     \
 					  &__entry->intr_info,		     \
 					  &__entry->error_code);	     \
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index ccb03d69546c..43ea97b3f8e6 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -6059,7 +6059,7 @@ bool nested_vmx_reflect_vmexit(struct kvm_vcpu *vcpu)
 		goto reflect_vmexit;
 	}
 
-	trace_kvm_nested_vmexit(exit_reason.full, vcpu, KVM_ISA_VMX);
+	trace_kvm_nested_vmexit(vcpu, KVM_ISA_VMX);
 
 	/* If L0 (KVM) wants the exit, it trumps L1's desires. */
 	if (nested_vmx_l0_wants_exit(vcpu, exit_reason))
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 0c2c0d5ae873..99f8f7c4a510 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -5628,11 +5628,13 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
 static const int kvm_vmx_max_exit_handlers =
 	ARRAY_SIZE(kvm_vmx_exit_handlers);
 
-static void vmx_get_exit_info(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2,
+static void vmx_get_exit_info(struct kvm_vcpu *vcpu, u32 *reason,
+			      u64 *info1, u64 *info2,
 			      u32 *intr_info, u32 *error_code)
 {
 	struct vcpu_vmx *vmx = to_vmx(vcpu);
 
+	*reason = vmx->exit_reason.full;
 	*info1 = vmx_get_exit_qual(vcpu);
 	if (!(vmx->exit_reason.failed_vmentry)) {
 		*info2 = vmx->idt_vectoring_info;
@@ -6769,7 +6771,7 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)
 	if (likely(!vmx->exit_reason.failed_vmentry))
 		vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
 
-	trace_kvm_exit(vmx->exit_reason.full, vcpu, KVM_ISA_VMX);
+	trace_kvm_exit(vcpu, KVM_ISA_VMX);
 
 	if (unlikely(vmx->exit_reason.failed_vmentry))
 		return EXIT_FASTPATH_NONE;
-- 
2.33.0