lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: x86 emulator: pass access size and read/write intent to linearize()

Browse Source 
Needed for segment read/write checks.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity
2011-04-03 11:31:19 +03:00
parent 9fa088f4d2
commit 83b8795a29
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kvm/emulate.c
View File

@@ -491,6 +491,7 @@ static unsigned seg_override(struct x86_emulate_ctxt *ctxt,
static int linearize(struct x86_emulate_ctxt *ctxt, static int linearize(struct x86_emulate_ctxt *ctxt,
struct segmented_address addr, struct segmented_address addr,
unsigned size, bool write,
ulong *linear) ulong *linear)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
@@ -550,7 +551,7 @@ static int segmented_read_std(struct x86_emulate_ctxt *ctxt,
int rc; int rc;
ulong linear; ulong linear;
rc = linearize(ctxt, addr, &linear); rc = linearize(ctxt, addr, size, false, &linear);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
return ctxt->ops->read_std(linear, data, size, ctxt->vcpu, return ctxt->ops->read_std(linear, data, size, ctxt->vcpu,
@@ -973,7 +974,7 @@ static int segmented_read(struct x86_emulate_ctxt *ctxt,
int rc; int rc;
ulong linear; ulong linear;
rc = linearize(ctxt, addr, &linear); rc = linearize(ctxt, addr, size, false, &linear);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
return read_emulated(ctxt, ctxt->ops, linear, data, size); return read_emulated(ctxt, ctxt->ops, linear, data, size);
@@ -987,7 +988,7 @@ static int segmented_write(struct x86_emulate_ctxt *ctxt,
int rc; int rc;
ulong linear; ulong linear;
rc = linearize(ctxt, addr, &linear); rc = linearize(ctxt, addr, size, true, &linear);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
return ctxt->ops->write_emulated(linear, data, size, return ctxt->ops->write_emulated(linear, data, size,
@@ -1002,7 +1003,7 @@ static int segmented_cmpxchg(struct x86_emulate_ctxt *ctxt,
int rc; int rc;
ulong linear; ulong linear;
rc = linearize(ctxt, addr, &linear); rc = linearize(ctxt, addr, size, true, &linear);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
return rc; return rc;
return ctxt->ops->cmpxchg_emulated(linear, orig_data, data, return ctxt->ops->cmpxchg_emulated(linear, orig_data, data,
@@ -2509,7 +2510,7 @@ static int em_invlpg(struct x86_emulate_ctxt *ctxt)
int rc; int rc;
ulong linear; ulong linear;
rc = linearize(ctxt, c->src.addr.mem, &linear); rc = linearize(ctxt, c->src.addr.mem, 1, false, &linear);
if (rc == X86EMUL_CONTINUE) if (rc == X86EMUL_CONTINUE)
emulate_invlpg(ctxt->vcpu, linear); emulate_invlpg(ctxt->vcpu, linear);
/* Disable writeback. */ /* Disable writeback. */