Introduce segmented addresses to the emulator

Currently we lose segment information associated with memory operands. This prevents us from doing proper segment checks.

This patchset prepares the way by remembering which segment is associated with a memory operand.

Avi Kivity (2):
KVM: x86 emulator: preserve an operand's segment identity
KVM: x86 emulator: do not perform address calculations on linear
addresses

 arch/x86/include/asm/kvm_emulate.h |    5 ++-
 arch/x86/kvm/emulate.c             |  103 ++++++++++++++++++------------------
 2 files changed, 55 insertions(+), 53 deletions(-)

1.7.3.1

Currently the x86 emulator converts the segment register associated with an operand into a segment base which is added into the operand address. This loss of information results in us not doing segment limit checks properly.

Replace struct operand's addr.mem field by a segmented_address structure which holds both the effetive address and segment. This will allow us to do the limit check at the point of access.

---
 arch/x86/include/asm/kvm_emulate.h |    5 ++-
 arch/x86/kvm/emulate.c             |  102 +++++++++++++++++------------------
 2 files changed, 54 insertions(+), 53 deletions(-)

index b36c6b3..b48c133 100644
@@ -159,7 +159,10 @@ struct operand {
 	};
 	union {
 		unsigned long *reg;
-		unsigned long mem;
+		struct segmented_address {
+			ulong ea;
+			unsigned seg;
+		} mem;
 	} addr;
 	union {
 		unsigned long val;

1.7.3.1

Linear addresses are supposed to already have segment checks performed on them; if we play with these addresses the checks become invalid.

---
 arch/x86/kvm/emulate.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index cd13def..0fdaeeb 100644
@@ -562,7 +562,8 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt,
 			   ctxt->vcpu, NULL);
 	if (rc != X86EMUL_CONTINUE)
 		return rc;
-	rc = ops->read_std(linear(ctxt, addr) + 2, address, op_bytes,
+	addr.ea += 2;
+	rc = ops->read_std(linear(ctxt, addr, address, op_bytes,
 			   ctxt->vcpu, NULL);
 	return rc;
 }

1.7.3.1

Applied, thanks.