d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for setting some obscure fields.

Browse Source 
Don't permit setting the exception bitmap or VMCS entry interrupt
information.  These are not generally useful to set.  If it is needed
in the future, dedicated pseudo registers can be added for these that
would be used with vm_set_register().

Discussed with:	grehan
MFC after:	1 week
This commit is contained in:
John Baldwin 2020-09-17 17:07:04 +00:00
parent 97458520cc
commit ff2cf94674
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365842
1 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
usr.sbin/bhyvectl/bhyvectl.c
View File

@ -313,11 +313,11 @@ static int get_vmcb_virq, get_avic_table;
*/ */
static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2; static int get_pinbased_ctls, get_procbased_ctls, get_procbased_ctls2;
static int get_eptp, get_io_bitmap, get_tsc_offset; static int get_eptp, get_io_bitmap, get_tsc_offset;
static int get_vmcs_entry_interruption_info, set_vmcs_entry_interruption_info; static int get_vmcs_entry_interruption_info;
static int get_vmcs_interruptibility; static int get_vmcs_interruptibility;
uint32_t vmcs_entry_interruption_info; uint32_t vmcs_entry_interruption_info;
static int get_vmcs_gpa, get_vmcs_gla; static int get_vmcs_gpa, get_vmcs_gla;
static int get_exception_bitmap, set_exception_bitmap, exception_bitmap; static int get_exception_bitmap, exception_bitmap;
static int get_cr0_mask, get_cr0_shadow; static int get_cr0_mask, get_cr0_shadow;
static int get_cr4_mask, get_cr4_shadow; static int get_cr4_mask, get_cr4_shadow;
static int get_cr3_targets; static int get_cr3_targets;
@ -541,13 +541,6 @@ vm_get_vmcs_field(struct vmctx *ctx, int vcpu, int field, uint64_t *ret_val)
return (vm_get_register(ctx, vcpu, VMCS_IDENT(field), ret_val)); return (vm_get_register(ctx, vcpu, VMCS_IDENT(field), ret_val));
} }
static int
vm_set_vmcs_field(struct vmctx *ctx, int vcpu, int field, uint64_t val)
{
return (vm_set_register(ctx, vcpu, VMCS_IDENT(field), val));
}
static int static int
vm_get_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes, vm_get_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes,
uint64_t *ret_val) uint64_t *ret_val)
@ -556,14 +549,6 @@ vm_get_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes,
return (vm_get_register(ctx, vcpu, VMCB_ACCESS(off, bytes), ret_val)); return (vm_get_register(ctx, vcpu, VMCB_ACCESS(off, bytes), ret_val));
} }
static int
vm_set_vmcb_field(struct vmctx *ctx, int vcpu, int off, int bytes,
uint64_t val)
{
return (vm_set_register(ctx, vcpu, VMCB_ACCESS(off, bytes), val));
}
enum { enum {
VMNAME = 1000, /* avoid collision with return values from getopt */ VMNAME = 1000, /* avoid collision with return values from getopt */
VCPU, VCPU,
@ -595,8 +580,6 @@ enum {
SET_TR, SET_TR,
SET_LDTR, SET_LDTR,
SET_X2APIC_STATE, SET_X2APIC_STATE,
SET_EXCEPTION_BITMAP,
SET_VMCS_ENTRY_INTERRUPTION_INFO,
SET_CAP, SET_CAP,
CAPNAME, CAPNAME,
UNASSIGN_PPTDEV, UNASSIGN_PPTDEV,
@ -1379,8 +1362,6 @@ setup_options(bool cpu_intel)
{ "set-tr", REQ_ARG, 0, SET_TR }, { "set-tr", REQ_ARG, 0, SET_TR },
{ "set-ldtr", REQ_ARG, 0, SET_LDTR }, { "set-ldtr", REQ_ARG, 0, SET_LDTR },
{ "set-x2apic-state",REQ_ARG, 0, SET_X2APIC_STATE }, { "set-x2apic-state",REQ_ARG, 0, SET_X2APIC_STATE },
{ "set-exception-bitmap",
REQ_ARG, 0, SET_EXCEPTION_BITMAP },
{ "capname", REQ_ARG, 0, CAPNAME }, { "capname", REQ_ARG, 0, CAPNAME },
{ "unassign-pptdev", REQ_ARG, 0, UNASSIGN_PPTDEV }, { "unassign-pptdev", REQ_ARG, 0, UNASSIGN_PPTDEV },
{ "setcap", REQ_ARG, 0, SET_CAP }, { "setcap", REQ_ARG, 0, SET_CAP },
@ -1514,8 +1495,6 @@ setup_options(bool cpu_intel)
{ "get-vmcs-host-pat", NO_ARG, &get_host_pat, 1 }, { "get-vmcs-host-pat", NO_ARG, &get_host_pat, 1 },
{ "get-vmcs-host-cr0", { "get-vmcs-host-cr0",
NO_ARG, &get_host_cr0, 1 }, NO_ARG, &get_host_cr0, 1 },
{ "set-vmcs-entry-interruption-info",
REQ_ARG, 0, SET_VMCS_ENTRY_INTERRUPTION_INFO },
{ "get-vmcs-exit-qualification", { "get-vmcs-exit-qualification",
NO_ARG, &get_vmcs_exit_qualification, 1 }, NO_ARG, &get_vmcs_exit_qualification, 1 },
{ "get-vmcs-exit-inst-length", { "get-vmcs-exit-inst-length",
@ -1923,14 +1902,6 @@ main(int argc, char *argv[])
x2apic_state = strtol(optarg, NULL, 0); x2apic_state = strtol(optarg, NULL, 0);
set_x2apic_state = 1; set_x2apic_state = 1;
break; break;
case SET_EXCEPTION_BITMAP:
exception_bitmap = strtoul(optarg, NULL, 0);
set_exception_bitmap = 1;
break;
case SET_VMCS_ENTRY_INTERRUPTION_INFO:
vmcs_entry_interruption_info = strtoul(optarg, NULL, 0);
set_vmcs_entry_interruption_info = 1;
break;
case SET_CAP: case SET_CAP:
capval = strtoul(optarg, NULL, 0); capval = strtoul(optarg, NULL, 0);
setcap = 1; setcap = 1;
@ -2124,22 +2095,6 @@ main(int argc, char *argv[])
if (!error && unassign_pptdev) if (!error && unassign_pptdev)
error = vm_unassign_pptdev(ctx, bus, slot, func); error = vm_unassign_pptdev(ctx, bus, slot, func);
if (!error && set_exception_bitmap) {
if (cpu_intel)
error = vm_set_vmcs_field(ctx, vcpu,
VMCS_EXCEPTION_BITMAP,
exception_bitmap);
else
error = vm_set_vmcb_field(ctx, vcpu,
VMCB_OFF_EXC_INTERCEPT,
4, exception_bitmap);
}
if (!error && cpu_intel && set_vmcs_entry_interruption_info) {
error = vm_set_vmcs_field(ctx, vcpu, VMCS_ENTRY_INTR_INFO,
vmcs_entry_interruption_info);
}
if (!error && inject_nmi) { if (!error && inject_nmi) {
error = vm_inject_nmi(ctx, vcpu); error = vm_inject_nmi(ctx, vcpu);
} }