lkml.org 
[lkml]   [2021]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5] KVM: nVMX: Rename vmcs_to_field_offset{,_table} to vmcs12_field_offset{,_table}
    Date
    vmcs_to_field_offset{,_table} may sound misleading as VMCS is an opaque
    blob which is not supposed to be accessed directly. In fact,
    vmcs_to_field_offset{,_table} are related to KVM defined VMCS12 structure.

    No functional change intended.

    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    ---
    arch/x86/kvm/vmx/nested.c | 6 +++---
    arch/x86/kvm/vmx/vmcs12.c | 4 ++--
    arch/x86/kvm/vmx/vmcs12.h | 6 +++---
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
    index 9c941535f78c..0b990a6914c1 100644
    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -5086,7 +5086,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
    /* Decode instruction info and find the field to read */
    field = kvm_register_read(vcpu, (((instr_info) >> 28) & 0xf));

    - offset = vmcs_field_to_offset(field);
    + offset = vmcs12_field_offset(field);
    if (offset < 0)
    return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);

    @@ -5189,7 +5189,7 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)

    field = kvm_register_read(vcpu, (((instr_info) >> 28) & 0xf));

    - offset = vmcs_field_to_offset(field);
    + offset = vmcs12_field_offset(field);
    if (offset < 0)
    return nested_vmx_fail(vcpu, VMXERR_UNSUPPORTED_VMCS_COMPONENT);

    @@ -6435,7 +6435,7 @@ static u64 nested_vmx_calc_vmcs_enum_msr(void)
    max_idx = 0;
    for (i = 0; i < nr_vmcs12_fields; i++) {
    /* The vmcs12 table is very, very sparsely populated. */
    - if (!vmcs_field_to_offset_table[i])
    + if (!vmcs12_field_offset_table[i])
    continue;

    idx = vmcs_field_index(VMCS12_IDX_TO_ENC(i));
    diff --git a/arch/x86/kvm/vmx/vmcs12.c b/arch/x86/kvm/vmx/vmcs12.c
    index cab6ba7a5005..61db9bc8842f 100644
    --- a/arch/x86/kvm/vmx/vmcs12.c
    +++ b/arch/x86/kvm/vmx/vmcs12.c
    @@ -8,7 +8,7 @@
    FIELD(number, name), \
    [ROL16(number##_HIGH, 6)] = VMCS12_OFFSET(name) + sizeof(u32)

    -const unsigned short vmcs_field_to_offset_table[] = {
    +const unsigned short vmcs12_field_offset_table[] = {
    FIELD(VIRTUAL_PROCESSOR_ID, virtual_processor_id),
    FIELD(POSTED_INTR_NV, posted_intr_nv),
    FIELD(GUEST_ES_SELECTOR, guest_es_selector),
    @@ -151,4 +151,4 @@ const unsigned short vmcs_field_to_offset_table[] = {
    FIELD(HOST_RSP, host_rsp),
    FIELD(HOST_RIP, host_rip),
    };
    -const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs_field_to_offset_table);
    +const unsigned int nr_vmcs12_fields = ARRAY_SIZE(vmcs12_field_offset_table);
    diff --git a/arch/x86/kvm/vmx/vmcs12.h b/arch/x86/kvm/vmx/vmcs12.h
    index 2a45f026ee11..13e2bd017538 100644
    --- a/arch/x86/kvm/vmx/vmcs12.h
    +++ b/arch/x86/kvm/vmx/vmcs12.h
    @@ -361,10 +361,10 @@ static inline void vmx_check_vmcs12_offsets(void)
    CHECK_OFFSET(guest_pml_index, 996);
    }

    -extern const unsigned short vmcs_field_to_offset_table[];
    +extern const unsigned short vmcs12_field_offset_table[];
    extern const unsigned int nr_vmcs12_fields;

    -static inline short vmcs_field_to_offset(unsigned long field)
    +static inline short vmcs12_field_offset(unsigned long field)
    {
    unsigned short offset;
    unsigned int index;
    @@ -377,7 +377,7 @@ static inline short vmcs_field_to_offset(unsigned long field)
    return -ENOENT;

    index = array_index_nospec(index, nr_vmcs12_fields);
    - offset = vmcs_field_to_offset_table[index];
    + offset = vmcs12_field_offset_table[index];
    if (offset == 0)
    return -ENOENT;
    return offset;
    --
    2.33.1
    \
     
     \ /
      Last update: 2021-12-14 15:40    [W:3.717 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site