d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmm: Fix AP startup compatibility for old bhyve executables

Browse Source 
These changes unbreak AP startup when using a 13.1-RELEASE bhyve
executable with a newer kernel:
- Correct the destination mask for the VM_EXITCODE_IPI message generated
  by an INIT or STARTUP IPI in vlapic_icrlo_write_handler().
- Only initialize vlapics on active vCPUs.  13.1-RELEASE bhyve activates
  AP vCPUs only after the BSP starts them with an IPI, and vmm now
  allocates vcpu structures lazily, so the STARTUP handling in
  vm_handle_ipi() could trigger a page fault.
- Fix an off-by-one setting the vcpuid in a VM_EXITCODE_SPINUP_AP
  message.

Fixes:	7c326ab5bb ("vmm: don't lock a mtx in the icr_low write handler")
Reviewed by:	jhb, corvink
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D38446
This commit is contained in:
Mark Johnston 2023-02-09 15:52:35 -05:00
parent ba34de1b3b
commit b265a2e0d7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/amd64/vmm/io/vlapic.c
View File

@ -1144,7 +1144,7 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu)
vmexit->exitcode = VM_EXITCODE_IPI;
vmexit->u.ipi.mode = mode;
vmexit->u.ipi.vector = vec;
vmexit->u.ipi.dmask = dmask;
vmexit->u.ipi.dmask = ipimask;
*retu = true;
}
@ -1169,16 +1169,22 @@ vm_handle_ipi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu)
*retu = true;
switch (vme->u.ipi.mode) {
case APIC_DELMODE_INIT:
vm_smp_rendezvous(vcpu, *dmask, vlapic_handle_init,
NULL);
case APIC_DELMODE_INIT: {
cpuset_t active, reinit;
active = vm_active_cpus(vcpu_vm(vcpu));
CPU_AND(&reinit, &active, dmask);
if (!CPU_EMPTY(&reinit)) {
vm_smp_rendezvous(vcpu, reinit, vlapic_handle_init,
NULL);
}
vm_await_start(vcpu_vm(vcpu), dmask);
if (!vlapic->ipi_exit) {
if (!vlapic->ipi_exit)
*retu = false;
}
break;
}
case APIC_DELMODE_STARTUP:
/*
* Ignore SIPIs in any state other than wait-for-SIPI
@ -1196,13 +1202,13 @@ vm_handle_ipi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu)
*/
if (!vlapic->ipi_exit) {
vme->exitcode = VM_EXITCODE_SPINUP_AP;
vme->u.spinup_ap.vcpu = CPU_FFS(dmask);
vme->u.spinup_ap.vcpu = CPU_FFS(dmask) - 1;
vme->u.spinup_ap.rip = vec << PAGE_SHIFT;
}
break;
default:
return (1);
__assert_unreachable();
}
return (0);