From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9700E337BAB for ; Mon, 15 Dec 2025 19:28:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765826918; cv=none; b=i0pym63Ul0MpUE+mLskrSJnidlKT8cOTt3lKx/6QyxVitfPfxJC8/OtdcNYoJMvB18XD/WKrqP0a8L6G8w1CcHJE8IA+JDrHBSLydXSdsWGOenkvpvraJoqJLTUgvdZhM3jYJXr/GoHg9q91ZOLRmT6ZdOZNjtzoDtgijxKcFvo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765826918; c=relaxed/simple; bh=BUvQyWXuYEEYhxKhefZQGhzXIOloUBGKjN1sz2Ri48I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B32BFAYBOOAMegJznDqDKGExc6av3PYXjD++LRD90Wn+77kOT5VQpZr4KWf/nf+3DU2ui/kgD6KbhOf0TysmYZxRETQPDzsHHgkC9sX5ubN+zPbljqtRINaMKEsA1F1FW2mgKpivJkVb9zhnI5bBlNQlJKvNS5P/99TLu1iGI94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=wyqkGlid; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="wyqkGlid" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1765826909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3cf8RFQ2S/w9aMyAhPvTtFAPK8oi2Ex0gGpKSV/SAR4=; b=wyqkGlidVqfFRsFfg8F4Uh442B740IxEQZmmTRUVJ2PHksMrkI4HB0Gt7HiVVfzGKYvEHM ZX6GQj+lV7b0e/9aAQibKvlsNjNpwasl6WG/YvFgR+EnIJl81EWmOTNkQCYRtQzUZSd0td RR+BgKcBccd1rorYSp+uk4aLJyjaL6Q= From: Yosry Ahmed To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , stable@vger.kernel.org Subject: [PATCH v3 08/26] KVM: nSVM: Call enter_guest_mode() before switching to VMCB02 Date: Mon, 15 Dec 2025 19:27:03 +0000 Message-ID: <20251215192722.3654335-10-yosry.ahmed@linux.dev> In-Reply-To: <20251215192722.3654335-1-yosry.ahmed@linux.dev> References: <20251215192722.3654335-1-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT In preparation for moving more changes that rely on is_guest_mode() before switching to VMCB02, move entering guest mode a bit earlier. Nothing between the new callsite(s) and the old ones rely on is_guest_mode(), so this should be safe. No functional change intended. Cc: stable@vger.kernel.org Signed-off-by: Yosry Ahmed --- arch/x86/kvm/svm/nested.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 512e377cfdec..384352365310 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -709,9 +709,6 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, nested_svm_transition_tlb_flush(vcpu); - /* Enter Guest-Mode */ - enter_guest_mode(vcpu); - /* * Filled at exit: exit_code, exit_code_hi, exit_info_1, exit_info_2, * exit_int_info, exit_int_info_err, next_rip, insn_len, insn_bytes. @@ -899,6 +896,8 @@ int enter_svm_guest_mode(struct kvm_vcpu *vcpu, u64 vmcb12_gpa, WARN_ON(svm->vmcb == svm->nested.vmcb02.ptr); + enter_guest_mode(vcpu); + nested_svm_copy_common_state(svm->vmcb01.ptr, svm->nested.vmcb02.ptr); svm_switch_vmcb(svm, &svm->nested.vmcb02); @@ -1846,6 +1845,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, svm_copy_vmrun_state(&svm->vmcb01.ptr->save, save); nested_copy_vmcb_control_to_cache(svm, ctl); + enter_guest_mode(vcpu); svm_switch_vmcb(svm, &svm->nested.vmcb02); nested_vmcb02_prepare_control(svm, svm->vmcb->save.rip, svm->vmcb->save.cs.base); -- 2.52.0.239.gd5f0c6e74e-goog