mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
x86emul: allow ->write_msr() to distinguish origins of writes
Only explicit writes are subject to e.g. the checking of the MSR intercept
bitmap, which extends to VM-event's hvm_monitor_msr(). Indicate, by way of
a new boolean parameter, to the hook functions which variant it is.
Fixes: 6eb43fcf8a ("x86emul: support SWAPGS")
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
This commit is contained in:
1 parent
4082de6d43
commit
163e49e419
6 files changed
+18
-12
No files matched your search
@@ -569,7 +569,8 @@ static int fuzz_read_msr(
|
||||
static int fuzz_write_msr(
|
||||
unsigned int reg,
|
||||
uint64_t val,
|
||||
struct x86_emulate_ctxt *ctxt)
|
||||
struct x86_emulate_ctxt *ctxt,
|
||||
bool explicit)
|
||||
{
|
||||
struct fuzz_state *s = ctxt->data;
|
||||
struct fuzz_corpus *c = s->corpus;
|
||||
|
||||
@@ -1705,7 +1705,8 @@ static int cf_check hvmemul_write_io_discard(
|
||||
static int cf_check hvmemul_write_msr_discard(
|
||||
unsigned int reg,
|
||||
uint64_t val,
|
||||
struct x86_emulate_ctxt *ctxt)
|
||||
struct x86_emulate_ctxt *ctxt,
|
||||
bool explicit)
|
||||
{
|
||||
return X86EMUL_OKAY;
|
||||
}
|
||||
@@ -2427,9 +2428,10 @@ static int cf_check hvmemul_read_msr(
|
||||
static int cf_check hvmemul_write_msr(
|
||||
unsigned int reg,
|
||||
uint64_t val,
|
||||
struct x86_emulate_ctxt *ctxt)
|
||||
struct x86_emulate_ctxt *ctxt,
|
||||
bool explicit)
|
||||
{
|
||||
int rc = hvm_msr_write_intercept(reg, val, true);
|
||||
int rc = hvm_msr_write_intercept(reg, val, explicit);
|
||||
|
||||
if ( rc == X86EMUL_EXCEPTION )
|
||||
x86_emul_hw_exception(X86_EXC_GP, 0, ctxt);
|
||||
|
||||
@@ -1038,7 +1038,8 @@ static int cf_check read_msr(
|
||||
}
|
||||
|
||||
static int cf_check write_msr(
|
||||
unsigned int reg, uint64_t val, struct x86_emulate_ctxt *ctxt)
|
||||
unsigned int reg, uint64_t val, struct x86_emulate_ctxt *ctxt,
|
||||
bool explicit)
|
||||
{
|
||||
struct vcpu *curr = current;
|
||||
const struct domain *currd = curr->domain;
|
||||
|
||||
@@ -40,7 +40,7 @@ int x86emul_0f01(struct x86_emulate_state *s,
|
||||
fail_if(!ops->write_msr);
|
||||
rc = ops->write_msr(regs->ecx,
|
||||
((uint64_t)regs->r(dx) << 32) | regs->eax,
|
||||
ctxt);
|
||||
ctxt, true);
|
||||
goto done;
|
||||
}
|
||||
generate_exception(X86_EXC_UD);
|
||||
@@ -194,7 +194,7 @@ int x86emul_0f01(struct x86_emulate_state *s,
|
||||
(rc = ops->read_msr(MSR_SHADOW_GS_BASE, &msr_val,
|
||||
ctxt)) != X86EMUL_OKAY ||
|
||||
(rc = ops->write_msr(MSR_SHADOW_GS_BASE, sreg.base,
|
||||
ctxt)) != X86EMUL_OKAY )
|
||||
ctxt, false)) != X86EMUL_OKAY )
|
||||
goto done;
|
||||
sreg.base = msr_val;
|
||||
if ( (rc = ops->write_segment(x86_seg_gs, &sreg,
|
||||
@@ -202,7 +202,7 @@ int x86emul_0f01(struct x86_emulate_state *s,
|
||||
{
|
||||
/* Best effort unwind (i.e. no real error checking). */
|
||||
if ( ops->write_msr(MSR_SHADOW_GS_BASE, msr_val,
|
||||
ctxt) == X86EMUL_EXCEPTION )
|
||||
ctxt, false) == X86EMUL_EXCEPTION )
|
||||
x86_emul_reset_event(ctxt);
|
||||
goto done;
|
||||
}
|
||||
|
||||
@@ -3814,7 +3814,7 @@ x86_emulate(
|
||||
fail_if(ops->write_msr == NULL);
|
||||
if ( (rc = ops->write_msr(_regs.ecx,
|
||||
((uint64_t)_regs.r(dx) << 32) | _regs.eax,
|
||||
ctxt)) != 0 )
|
||||
ctxt, true)) != 0 )
|
||||
goto done;
|
||||
break;
|
||||
|
||||
|
||||
@@ -470,13 +470,15 @@ struct x86_emulate_ops
|
||||
struct x86_emulate_ctxt *ctxt);
|
||||
|
||||
/*
|
||||
* write_dr: Write to model-specific register.
|
||||
* @reg: [IN ] Register to write.
|
||||
* write_msr: Write to model-specific register.
|
||||
* @reg: [IN ] Register to write.
|
||||
* @explicit: [IN ] Whether this is an explicit WRMSR or alike.
|
||||
*/
|
||||
int (*write_msr)(
|
||||
unsigned int reg,
|
||||
uint64_t val,
|
||||
struct x86_emulate_ctxt *ctxt);
|
||||
struct x86_emulate_ctxt *ctxt,
|
||||
bool explicit);
|
||||
|
||||
/*
|
||||
* cache_op: Write-back and/or invalidate cache contents.
|
||||
|
||||