lkml.org 
[lkml]   [2022]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/sev] KVM: SVM: Define sev_features and VMPL field in the VMSA
    The following commit has been merged into the x86/sev branch of tip:

    Commit-ID: 046f773be106ec8eb92b13414c90f8e279deffe0
    Gitweb: https://git.kernel.org/tip/046f773be106ec8eb92b13414c90f8e279deffe0
    Author: Brijesh Singh <brijesh.singh@amd.com>
    AuthorDate: Mon, 07 Mar 2022 15:33:11 -06:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Tue, 05 Apr 2022 19:09:27 +02:00

    KVM: SVM: Define sev_features and VMPL field in the VMSA

    The hypervisor uses the sev_features field (offset 3B0h) in the Save State
    Area to control the SEV-SNP guest features such as SNPActive, vTOM,
    ReflectVC etc. An SEV-SNP guest can read the sev_features field through
    the SEV_STATUS MSR.

    While at it, update dump_vmcb() to log the VMPL level.

    See APM2 Table 15-34 and B-4 for more details.

    Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Venu Busireddy <venu.busireddy@oracle.com>
    Link: https://lore.kernel.org/r/20220307213356.2797205-2-brijesh.singh@amd.com
    ---
    arch/x86/include/asm/svm.h | 6 ++++--
    arch/x86/kvm/svm/svm.c | 4 ++--
    2 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
    index f70a510..f2d01f3 100644
    --- a/arch/x86/include/asm/svm.h
    +++ b/arch/x86/include/asm/svm.h
    @@ -282,7 +282,8 @@ struct vmcb_save_area {
    struct vmcb_seg ldtr;
    struct vmcb_seg idtr;
    struct vmcb_seg tr;
    - u8 reserved_1[43];
    + u8 reserved_1[42];
    + u8 vmpl;
    u8 cpl;
    u8 reserved_2[4];
    u64 efer;
    @@ -347,7 +348,8 @@ struct vmcb_save_area {
    u64 sw_exit_info_1;
    u64 sw_exit_info_2;
    u64 sw_scratch;
    - u8 reserved_11[56];
    + u64 sev_features;
    + u8 reserved_11[48];
    u64 xcr0;
    u8 valid_bitmap[16];
    u64 x87_state_gpa;
    diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
    index bd4c64b..81cb518 100644
    --- a/arch/x86/kvm/svm/svm.c
    +++ b/arch/x86/kvm/svm/svm.c
    @@ -3117,8 +3117,8 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)
    "tr:",
    save01->tr.selector, save01->tr.attrib,
    save01->tr.limit, save01->tr.base);
    - pr_err("cpl: %d efer: %016llx\n",
    - save->cpl, save->efer);
    + pr_err("vmpl: %d cpl: %d efer: %016llx\n",
    + save->vmpl, save->cpl, save->efer);
    pr_err("%-15s %016llx %-13s %016llx\n",
    "cr0:", save->cr0, "cr2:", save->cr2);
    pr_err("%-15s %016llx %-13s %016llx\n",
    \
     
     \ /
      Last update: 2022-04-08 11:24    [W:4.084 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site