Commit 519669cc authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini

KVM: VMX: Remove vmcs_config.order

The maximum size of a VMCS (or VMXON region) is 4096. By definition,
these are order 0 allocations.
Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Message-Id: <20220125004359.147600-1-jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d081a343
...@@ -54,7 +54,6 @@ struct nested_vmx_msrs { ...@@ -54,7 +54,6 @@ struct nested_vmx_msrs {
struct vmcs_config { struct vmcs_config {
int size; int size;
int order;
u32 basic_cap; u32 basic_cap;
u32 revision_id; u32 revision_id;
u32 pin_based_exec_ctrl; u32 pin_based_exec_ctrl;
......
...@@ -2603,7 +2603,6 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, ...@@ -2603,7 +2603,6 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf,
return -EIO; return -EIO;
vmcs_conf->size = vmx_msr_high & 0x1fff; vmcs_conf->size = vmx_msr_high & 0x1fff;
vmcs_conf->order = get_order(vmcs_conf->size);
vmcs_conf->basic_cap = vmx_msr_high & ~0x1fff; vmcs_conf->basic_cap = vmx_msr_high & ~0x1fff;
vmcs_conf->revision_id = vmx_msr_low; vmcs_conf->revision_id = vmx_msr_low;
...@@ -2628,7 +2627,7 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags) ...@@ -2628,7 +2627,7 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags)
struct page *pages; struct page *pages;
struct vmcs *vmcs; struct vmcs *vmcs;
pages = __alloc_pages_node(node, flags, vmcs_config.order); pages = __alloc_pages_node(node, flags, 0);
if (!pages) if (!pages)
return NULL; return NULL;
vmcs = page_address(pages); vmcs = page_address(pages);
...@@ -2647,7 +2646,7 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags) ...@@ -2647,7 +2646,7 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags)
void free_vmcs(struct vmcs *vmcs) void free_vmcs(struct vmcs *vmcs)
{ {
free_pages((unsigned long)vmcs, vmcs_config.order); free_page((unsigned long)vmcs);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment