From nobody Sun Feb 8 19:39:56 2026 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (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 08D66343D8C for ; Mon, 10 Nov 2025 23:27:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762817249; cv=none; b=szWirUQpsUuUzQcRbvvIQjyV05z2lrnRJUFRfVP9OlVfmA1WaIc9ybAZc6DD19Rau8mDYL6pK5C84tc3ZXCBPMCaqbfD4ang8XiRoWKq3OSG3Y9cFL0rp6qGnbOoqBf5mtAvpEsTIqdju/rGfCcOlZwI/BQOHSo1GYfgAcL+uOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762817249; c=relaxed/simple; bh=1nnldSyEvUMxdV3DKPZB9q5uBddTFGvYWQ+A5Gk4ElM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lyc3Sky4W5LOD0lNgt4X7lRGA72n6iP7601qGgGF+crsrn5RQ76bOM3kQzhcy+rw0iN3DygWolDOt9l6FNoegOzEnEw5g2myk2vfHSknj9r10EPoD/dI8v8E0I62mK9MuIChX7K6pXeMZRXM3JFIrrUSigytzSJqSQW4+w7xFWw= 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=BwWIMQVa; arc=none smtp.client-ip=91.218.175.185 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="BwWIMQVa" 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=1762817245; 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=3vRe2/SJRKLIb78m7r5C5J3c6BhgOIpUIxQ+bEHV9RQ=; b=BwWIMQVaAl13BoMv9/NJv+GhfuwUnn53OtluxqiPKy/xZVYaz+kcjuibSOhBmIewv4ha/6 ePzp2J1uFwPxYgauZZB0McSZofHSDHBpOFy3mSs/5Gq+U/qPXEr2yq6oUyOw3s/cufKUxG NNC4GbQlmwkD9yqNTZjTg5HAWC9RTGw= From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , Kevin Cheng , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH v3 14/14] x86/svm: Rename VMCB fields to match KVM Date: Mon, 10 Nov 2025 23:26:42 +0000 Message-ID: <20251110232642.633672-15-yosry.ahmed@linux.dev> In-Reply-To: <20251110232642.633672-1-yosry.ahmed@linux.dev> References: <20251110232642.633672-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: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Rename nested_ctl and virt_ext to misc_ctl and misc_ctl2, respectively, to match new names in KVM code. Signed-off-by: Yosry Ahmed --- x86/svm.c | 2 +- x86/svm.h | 6 +++--- x86/svm_tests.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x86/svm.c b/x86/svm.c index de9eb19443caa..c40ef154bcacd 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -200,7 +200,7 @@ void vmcb_ident(struct vmcb *vmcb) ctrl->msrpm_base_pa =3D virt_to_phys(msr_bitmap); =20 if (npt_supported()) { - ctrl->nested_ctl =3D 1; + ctrl->misc_ctl =3D 1; ctrl->nested_cr3 =3D (u64)pml4e; ctrl->tlb_ctl =3D TLB_CONTROL_FLUSH_ALL_ASID; } diff --git a/x86/svm.h b/x86/svm.h index 264583a6547ef..00d28199f65f5 100644 --- a/x86/svm.h +++ b/x86/svm.h @@ -94,12 +94,12 @@ struct __attribute__ ((__packed__)) vmcb_control_area { u64 exit_info_2; u32 exit_int_info; u32 exit_int_info_err; - u64 nested_ctl; + u64 misc_ctl; u8 reserved_4[16]; u32 event_inj; u32 event_inj_err; u64 nested_cr3; - u64 virt_ext; + u64 misc_ctl2; u32 clean; u32 reserved_5; u64 next_rip; @@ -370,7 +370,7 @@ struct __attribute__ ((__packed__)) vmcb { =20 #define MSR_BITMAP_SIZE 8192 =20 -#define LBR_CTL_ENABLE_MASK BIT_ULL(0) +#define SVM_MISC_CTL2_LBR_CTL_ENABLE BIT_ULL(0) =20 struct svm_test { const char *name; diff --git a/x86/svm_tests.c b/x86/svm_tests.c index 47a2edfbb6c9b..49b5906965b7e 100644 --- a/x86/svm_tests.c +++ b/x86/svm_tests.c @@ -3139,7 +3139,7 @@ static void svm_lbrv_test1(void) u64 from_ip, to_ip; =20 svm_setup_vmrun((u64)svm_lbrv_test_guest1); - vmcb->control.virt_ext =3D 0; + vmcb->control.misc_ctl2 =3D 0; =20 wrmsr(MSR_IA32_DEBUGCTLMSR, DEBUGCTLMSR_LBR); DO_BRANCH(host_branch1); @@ -3160,7 +3160,7 @@ static void svm_lbrv_test2(void) u64 from_ip, to_ip; =20 svm_setup_vmrun((u64)svm_lbrv_test_guest2); - vmcb->control.virt_ext =3D 0; + vmcb->control.misc_ctl2 =3D 0; =20 wrmsr(MSR_IA32_DEBUGCTLMSR, DEBUGCTLMSR_LBR); DO_BRANCH(host_branch2); @@ -3185,7 +3185,7 @@ static void svm_lbrv_test3(void) u64 from_ip, to_ip; =20 svm_setup_vmrun((u64)svm_lbrv_test_guest3); - vmcb->control.virt_ext =3D 0; + vmcb->control.misc_ctl2 =3D 0; =20 wrmsr(MSR_IA32_DEBUGCTLMSR, DEBUGCTLMSR_LBR); DO_BRANCH(host_branch5); @@ -3214,7 +3214,7 @@ static void svm_lbrv_nested_test1(void) } =20 svm_setup_vmrun((u64)svm_lbrv_test_guest1); - vmcb->control.virt_ext =3D LBR_CTL_ENABLE_MASK; + vmcb->control.misc_ctl2 =3D SVM_MISC_CTL2_LBR_CTL_ENABLE; vmcb->save.dbgctl =3D DEBUGCTLMSR_LBR; =20 wrmsr(MSR_IA32_DEBUGCTLMSR, DEBUGCTLMSR_LBR); @@ -3244,7 +3244,7 @@ static void svm_lbrv_nested_test2(void) } =20 svm_setup_vmrun((u64)svm_lbrv_test_guest2); - vmcb->control.virt_ext =3D LBR_CTL_ENABLE_MASK; + vmcb->control.misc_ctl2 =3D SVM_MISC_CTL2_LBR_CTL_ENABLE; =20 vmcb->save.dbgctl =3D 0; vmcb->save.br_from =3D (u64)&host_branch2_from; @@ -3278,7 +3278,7 @@ static void svm_lbrv_nested_test3(void) } =20 svm_setup_vmrun((u64)svm_lbrv_test_guest3); - vmcb->control.virt_ext =3D LBR_CTL_ENABLE_MASK; + vmcb->control.misc_ctl2 =3D SVM_MISC_CTL2_LBR_CTL_ENABLE; vmcb->save.dbgctl =3D 0; =20 wrmsr(MSR_IA32_DEBUGCTLMSR, DEBUGCTLMSR_LBR); --=20 2.51.2.1041.gc1ab5b90ca-goog