diff options
| author | gibbs <gibbs@FreeBSD.org> | 2013-10-05 23:11:01 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2013-10-05 23:11:01 +0000 |
| commit | 9c8c76f921175f7cebcd3cd61d9086c333b96e35 (patch) | |
| tree | c4b59481817d15ea30e15e04f5ceb28ea7ae41a1 /sys/amd64/include | |
| parent | aed205d5cd3901acd2a0cf583e44ec166d99191a (diff) | |
| download | FreeBSD-src-9c8c76f921175f7cebcd3cd61d9086c333b96e35.zip FreeBSD-src-9c8c76f921175f7cebcd3cd61d9086c333b96e35.tar.gz | |
Formalize the concept of virtual CPU ids by adding a per-cpu vcpu_id
field. Perform vcpu enumeration for Xen PV and HVM environments
and convert all Xen drivers to use vcpu_id instead of a hard coded
assumption of the mapping algorithm (acpi or apic ID) in use.
Submitted by: Roger Pau Monné
Sponsored by: Citrix Systems R&D
Reviewed by: gibbs
Approved by: re (blanket Xen)
amd64/include/pcpu.h:
i386/include/pcpu.h:
Add vcpu_id to the amd64 and i386 pcpu structures.
dev/xen/timer/timer.c
x86/xen/xen_intr.c
Use new vcpu_id instead of assuming acpi_id == vcpu_id.
i386/xen/mp_machdep.c:
i386/xen/mptable.c
x86/xen/hvm.c:
Perform Xen HVM and Xen full PV vcpu_id mapping.
x86/xen/hvm.c:
x86/acpica/madt.c
Change SYSINIT ordering of acpi CPU enumeration so that it
is guaranteed to be available at the time of Xen HVM vcpu
id mapping.
Diffstat (limited to 'sys/amd64/include')
| -rw-r--r-- | sys/amd64/include/pcpu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h index 3d51512..fe898e9 100644 --- a/sys/amd64/include/pcpu.h +++ b/sys/amd64/include/pcpu.h @@ -62,7 +62,8 @@ u_int pc_cmci_mask; /* MCx banks for CMCI */ \ uint64_t pc_dbreg[16]; /* ddb debugging regs */ \ int pc_dbreg_cmd; /* ddb debugging reg cmd */ \ - char __pad[161] /* be divisor of PAGE_SIZE \ + u_int pc_vcpu_id; /* Xen vCPU ID */ \ + char __pad[157] /* be divisor of PAGE_SIZE \ after cache alignment */ #define PC_DBREG_CMD_NONE 0 |
