add support for XCHG instruction accessing APIC
PATCH 1/1 add support for XCHG instruction accessing APIC
32-bit SMP Linux uses xchg instruction to access APIC (see apic_write_atomic()). Attached is patch that adds support for this instruction.
The patch also fixes missed dependencies (in xen/Rules.mk) on header files in include/asm-x86/hvm.
-boris
#
# Add support for XCHG instruction accessing APIC
#
xen/Rules.mk +3 -0
@@ -31,6 +31,9 @@ HDRS += $(wildcard $(BASEDIR)/include HDRS += $(wildcard $(BASEDIR)/include/public/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/svm/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/vmx/*.h) # Do not depend on auto-generated header files. HDRS := $(subst $(BASEDIR)/include/asm-$(TARGET_ARCH)/asm-offsets.h,,$(HDRS)) HDRS := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
xen/arch/x86/hvm/hvm.c +1 -0
@@ -201,6 +201,7 @@ void hvm_setup_platform(struct domain* dif (hvm_apic_support (d) ) {spin_lock_init (&d->arch.hvm_domain.round_robin_lock); + d->arch.hvm_domain.apic_rwlock =RW_LOCK_UNLOCKED ;hvm_vioapic_init (d); } }
xen/arch/x86/hvm/intercept.c +18 -1
@@ -58,6 +58,12 @@ static inline void hvm_mmio_access(struc } req = &vio->vp_ioreq; + +/* We may need to execute atomic instruction (e.g. XCHG) */ +if (req->dir ==IOREQ_WRITE ) +write_lock (&v->domain->arch.hvm_domain.apic_rwlock); +else +read_lock (&v->domain->arch.hvm_domain.apic_rwlock);switch (req->type) {case IOREQ_TYPE_COPY :
@@ -123,11 +129,22 @@ static inline void hvm_mmio_access(struc req->u.data = tmp1;break ; +case IOREQ_TYPE_XCHG : + tmp1 =read_handler (v, req->addr, req->size); +write_handler (v, req->addr, req->size, (unsigned long ) req->u.data); + req->u.data = tmp1; +break ; +default :printk ("error ioreq type for local APIC %x\n" , req->type);domain_crash_synchronous ();break ; } + +if (req->dir ==IOREQ_WRITE ) +write_unlock (&v->domain->arch.hvm_domain.apic_rwlock); +else +read_unlock (&v->domain->arch.hvm_domain.apic_rwlock); }int hvm_mmio_intercept (ioreq_t *p)
@@ -143,7 +160,7 @@ int hvm_mmio_intercept(ioreq_t *p)if ( hvm_mmio_handlers[i]->check_handler (v, p->addr) ) {hvm_mmio_access (v, p, hvm_mmio_handlers[i]->read_handler, - hvm_mmio_handlers[i]->write_handler); + hvm_mmio_handlers[i]->write_handler);return 1 ; } }
xen/arch/x86/hvm/platform.c +19 -0
@@ -439,6 +439,14 @@ static int hvm_decode(int realmode, unsiGET_OP_SIZE_FOR_BYTE (size_reg);return mem_reg (size_reg, opcode, instr, rex); +case 0x87 :/* xchg {r/m16|r/m32}, {m/r16|m/r32} */ + instr->instr =INSTR_XCHG ; +GET_OP_SIZE_FOR_NONEBYTE (instr->op_size); +if (((*(opcode+1 )) &0xc7 ) ==5 ) +return reg_mem (instr->op_size, opcode, instr, rex); +else +return mem_reg (instr->op_size, opcode, instr, rex); +case 0x88 :/* mov r8, m8 */ instr->instr =INSTR_MOV ; instr->op_size =BYTE ;
@@ -936,6 +944,17 @@ void handle_mmio(unsigned long va, unsigbreak ; } +case INSTR_XCHG : + mmio_opp->flags = mmio_inst.flags; + mmio_opp->instr = mmio_inst.instr; + mmio_opp->operand[0 ] = mmio_inst.operand[0 ];/* source */ + mmio_opp->operand[1 ] = mmio_inst.operand[1 ];/* destination */ + +/* send the request and wait for the value */ +send_mmio_req (IOREQ_TYPE_XCHG , gpa,1 , + mmio_inst.op_size,0 ,IOREQ_WRITE ,0 ); +break ; +default :printf ("Unhandled MMIO instruction\n" );domain_crash_synchronous ();
xen/include/asm-x86/hvm/domain.h +2 -0
@@ -42,6 +42,8 @@ struct hvm_domain {struct hvm_vioapic vioapic;struct hvm_io_handler io_handler; +rwlock_t apic_rwlock; +unsigned char round_info[256 ];spinlock_t round_robin_lock;int interrupt_request;
xen/include/asm-x86/hvm/io.h +1 -0
@@ -66,6 +66,7 @@#define INSTR_STOS 10#define INSTR_TEST 11#define INSTR_BT 12 +#define INSTR_XCHG 13struct instruction {__s8 instr;/* instruction type */
xen/include/public/hvm/ioreq.h +1 -0
@@ -34,6 +34,7 @@#define IOREQ_TYPE_AND 2#define IOREQ_TYPE_OR 3#define IOREQ_TYPE_XOR 4 +#define IOREQ_TYPE_XCHG 5/* * VMExit dispatcher should cooperate with instruction decoder to
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 6 lines · Boris Ostrovsky
32-bit SMP Linux uses xchg instruction to access APIC (see
apic_write_atomic()). Attached is patch that adds support for this instruction.The patch also fixes missed dependencies (in
xen/Rules.mk) on header files ininclude/asm-x86/hvm.
I wonder if it is worth adding the locking? xchg is only used to write to broken APICs -- the OS does not care about the returned value. The APIC is implemented entirely in Xen, so the lock isn't held across an ioreq round-trip to qemu-dm, right?
-- Keir
Quoted 8 lines · Keir Fraser
Quoted 6 lines
32-bit SMP Linux uses xchg instruction to access APIC (see
apic_write_atomic()). Attached is patch that adds support for this instruction.The patch also fixes missed dependencies (in
xen/Rules.mk) on header files ininclude/asm-x86/hvm.I wonder if it is worth adding the locking? xchg is only used to write to broken APICs -- the OS does not care about the returned value. The APIC is implemented entirely in Xen, so the lock isn't held across an ioreq round-trip to qemu-dm, right?
In fact I'm pretty sure the locking is not needed even if we did care about atomicity. You're only protecting guest accesses from other guest accesses, and each VCPU has its own local APIC model, so there cannot be multiple simultaneous guest accesses to a single local APIC.
-- Keir
Quoted 7 lines · Keir Fraser
Quoted 4 lines · Keir Fraser
Quoted 4 lines
32-bit SMP Linux uses xchg instruction to access APIC (see
apic_write_atomic()). Attached is patch that adds support for this instruction.
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
The patch also fixes missed dependencies (in
xen/Rules.mk) on header files ininclude/asm-x86/hvm.I wonder if it is worth adding the locking? xchg is only used to write to broken APICs -- the OS does not care about the returned value. The APIC is implemented entirely in Xen, so the lock isn't held across an ioreq round-trip to qemu-dm, right?
Yes, that's right --- we never leave Xen to handle APIC access.
Quoted 1 line
In fact I'm pretty sure the locking is not needed even if we did care about atomicity. You're only protecting guest accesses from other guest accesses, and each VCPU has its own local APIC model, so there cannot be multiple simultaneous guest accesses to a single local APIC.
My only argument in favor of using the lock would be for completeness of the emulation. You are absolutely right in that for Linux there seems to be no need to hold the lock. My concern is that other OSs may treat this differently. And if we don't have sources, it may be somewhat difficult to figure out that the atomicity (or lack of it) was the cause of a problem.
If, however, there is a strong feeling that we don't need the lock, I am happy to drop it. I guess you are mostly unhappy about adding a new field to hvm_domain, not about performance impact?
-boris
Quoted 11 lines · Boris Ostrovsky
Quoted 1 line
In fact I'm pretty sure the locking is not needed even if we did care about atomicity. You're only protecting guest accesses from other guest accesses, and each VCPU has its own local APIC model, so there cannot be multiple simultaneous guest accesses to a single local APIC.
My only argument in favor of using the lock would be for completeness of the emulation. You are absolutely right in that for Linux there seems to be no need to hold the lock. My concern is that other OSs may treat this differently. And if we don't have sources, it may be somewhat difficult to figure out that the atomicity (or lack of it) was the cause of a problem.
If, however, there is a strong feeling that we don't need the lock, I am happy to drop it. I guess you are mostly unhappy about adding a new field to
hvm_domain, not about performance impact?
Yes, also my second argument was that there is *no way* for two VCPUs to conflict on a local APIC access, since LAPIC accesses are always to the VCPU's own LAPIC. So there is no potential concurrency that needs to be serialised, regardless of the guest OS.
-- Keir
Quoted 6 lines · Keir Fraser
Quoted 6 lines
My only argument in favor of using the lock would be for completeness of the emulation. You are absolutely right in that for Linux there seems to be no need to hold the lock. My concern is that other OSs may treat this differently. And if we don't have sources, it may be somewhat difficult to figure out that the atomicity (or lack of it) was the cause of a problem.
Quoted 6 lines
Quoted 3 lines
If, however, there is a strong feeling that we don't need the lock, I am happy to drop it. I guess you are mostly unhappy about adding a new field to
hvm_domain, not about performance impact?Yes, also my second argument was that there is *no way* for two VCPUs to conflict on a local APIC access, since LAPIC accesses are always to the VCPU's own LAPIC. So there is no potential concurrency that needs to be serialised, regardless of the guest OS.
OK, that's fair. Here is updated patch with lock removed.
I don't think I then understand why Linux is using atomic accesses to local APICs. It's interesting though that 64-bit code doesn't do it --- they use vanilla apic_write().
-boris
#
# Add support for XCHG instruction accessing APIC
#
xen/Rules.mk +3 -0
@@ -31,6 +31,9 @@ HDRS += $(wildcard $(BASEDIR)/include HDRS += $(wildcard $(BASEDIR)/include/public/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h) HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/svm/*.h) +HDRS += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/hvm/vmx/*.h) # Do not depend on auto-generated header files. HDRS := $(subst $(BASEDIR)/include/asm-$(TARGET_ARCH)/asm-offsets.h,,$(HDRS)) HDRS := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
xen/arch/x86/hvm/intercept.c +11 -1
@@ -123,6 +123,16 @@ static inline void hvm_mmio_access(struc req->u.data = tmp1;break ; +case IOREQ_TYPE_XCHG : +/* +* Note that we don't need to be atomic here since VCPU is accessing +* its own local APIC. +*/ + tmp1 =read_handler (v, req->addr, req->size); +write_handler (v, req->addr, req->size, (unsigned long ) req->u.data); + req->u.data = tmp1; +break ; +default :printk ("error ioreq type for local APIC %x\n" , req->type);domain_crash_synchronous ();
@@ -143,7 +153,7 @@ int hvm_mmio_intercept(ioreq_t *p)if ( hvm_mmio_handlers[i]->check_handler (v, p->addr) ) {hvm_mmio_access (v, p, hvm_mmio_handlers[i]->read_handler, - hvm_mmio_handlers[i]->write_handler); + hvm_mmio_handlers[i]->write_handler);return 1 ; } }
xen/arch/x86/hvm/platform.c +19 -0
@@ -439,6 +439,14 @@ static int hvm_decode(int realmode, unsiGET_OP_SIZE_FOR_BYTE (size_reg);return mem_reg (size_reg, opcode, instr, rex); +case 0x87 :/* xchg {r/m16|r/m32}, {m/r16|m/r32} */ + instr->instr =INSTR_XCHG ; +GET_OP_SIZE_FOR_NONEBYTE (instr->op_size); +if (((*(opcode+1 )) &0xc7 ) ==5 ) +return reg_mem (instr->op_size, opcode, instr, rex); +else +return mem_reg (instr->op_size, opcode, instr, rex); +case 0x88 :/* mov r8, m8 */ instr->instr =INSTR_MOV ; instr->op_size =BYTE ;
@@ -936,6 +944,17 @@ void handle_mmio(unsigned long va, unsigbreak ; } +case INSTR_XCHG : + mmio_opp->flags = mmio_inst.flags; + mmio_opp->instr = mmio_inst.instr; + mmio_opp->operand[0 ] = mmio_inst.operand[0 ];/* source */ + mmio_opp->operand[1 ] = mmio_inst.operand[1 ];/* destination */ + +/* send the request and wait for the value */ +send_mmio_req (IOREQ_TYPE_XCHG , gpa,1 , + mmio_inst.op_size,0 ,IOREQ_WRITE ,0 ); +break ; +default :printf ("Unhandled MMIO instruction\n" );domain_crash_synchronous ();
xen/include/asm-x86/hvm/io.h +1 -0
@@ -66,6 +66,7 @@#define INSTR_STOS 10#define INSTR_TEST 11#define INSTR_BT 12 +#define INSTR_XCHG 13struct instruction {__s8 instr;/* instruction type */
xen/include/public/hvm/ioreq.h +1 -0
@@ -34,6 +34,7 @@#define IOREQ_TYPE_AND 2#define IOREQ_TYPE_OR 3#define IOREQ_TYPE_XOR 4 +#define IOREQ_TYPE_XCHG 5/* * VMExit dispatcher should cooperate with instruction decoder to
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 1 line · Boris Ostrovsky
OK, that's fair. Here is updated patch with lock removed.
Thanks.
Quoted 3 lines
I don't think I then understand why Linux is using atomic accesses to local APICs. It's interesting though that 64-bit code doesn't do it --- they use vanilla
apic_write().
The atomic accesses are to work around APIC bugs in the original Pentium processors, where an APIC write in some cases needs to be preceded by a read for the write to work correctly.
The XCHG trick isn't needed on x86_64 because only modern processors support 64-bit mode and none of them have a buggy LAPIC.
-- Keir