freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 12:48:33 -10:00
Code Issues Packages Projects Releases Wiki Activity

Revert "bhyve/riscv: correctly handle empty masks and broadcast in SBI IPI/RFNC"

Browse Source 
This reverts commit ada1f577cc.
This commit is contained in:
Ruslan Bukin committed 2026-11-02 21:38:04 +00:00
1 parent f9f4abe8c9
commit 89d52f02bf
3 files changed
+28 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sys/riscv/riscv/sbi_ipi.c
-2
View File
@@ -74,8 +74,6 @@ sbi_ipi_pic_ipi_send(device_t dev, struct intr_irqsrc *isrc, cpuset_t cpus,
mask |= (1ul << pc->pc_hart);
}
}
if (mask == 0)
return;
sbi_send_ipi(&mask);
}
sys/riscv/vmm/vmm_riscv.c
-2
View File
@@ -548,8 +548,6 @@ riscv_send_ipi(struct hyp *hyp, cpuset_t *cpus)
if (!CPU_ISSET(i, cpus))
continue;
hypctx = hyp->ctx[i];
if (hypctx == NULL)
continue;
atomic_set_32(&hypctx->ipi_pending, 1);
vcpu_notify_event(vm_vcpu(vm, i));
}
sys/riscv/vmm/vmm_sbi.c
+28 -43
View File
@@ -52,7 +52,7 @@ vmm_sbi_handle_rfnc(struct vcpu *vcpu, struct hypctx *hypctx)
struct hyp *hyp;
uint16_t maxcpus;
cpuset_t cpus;
u_int i;
int i;
func_id = hypctx->guest_regs.hyp_a[6];
hart_mask = hypctx->guest_regs.hyp_a[0];
@@ -83,29 +83,27 @@ vmm_sbi_handle_rfnc(struct vcpu *vcpu, struct hypctx *hypctx)
hyp = hypctx->hyp;
active_cpus = vm_active_cpus(hyp->vm);
maxcpus = vm_get_maxcpus(hyp->vm);
if (hart_mask_base == (uint64_t)-1) {
CPU_COPY(&active_cpus, &cpus);
} else {
if (hart_mask == 0)
return (SBI_SUCCESS);
if (hart_mask_base >= maxcpus)
return (SBI_ERR_INVALID_PARAM);
while (hart_mask != 0) {
i = ffsl(hart_mask) - 1;
hart_mask &= ~(1UL << i);
if (hart_mask_base + i >= maxcpus)
return (SBI_ERR_INVALID_PARAM);
if (!CPU_ISSET(hart_mask_base + i, &active_cpus))
return (SBI_ERR_INVALID_PARAM);
CPU_SET(hart_mask_base + i, &cpus);
for (i = 0; i < maxcpus; i++) {
vcpu = vm_vcpu(hyp->vm, i);
if (vcpu == NULL)
continue;
if (hart_mask_base != -1UL) {
if (i < hart_mask_base)
continue;
if (!(hart_mask & (1UL << (i - hart_mask_base))))
continue;
}
/*
* If either hart_mask_base or at least one hartid from
* hart_mask is not valid, then return error.
*/
if (!CPU_ISSET(i, &active_cpus))
return (SBI_ERR_INVALID_PARAM);
CPU_SET(i, &cpus);
}
if (CPU_EMPTY(&cpus))
return (SBI_SUCCESS);
return (SBI_ERR_INVALID_PARAM);
vmm_fence_add(hyp->vm, &cpus, &fence);
@@ -140,9 +138,9 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx)
uint64_t hart_mask;
uint64_t hart_mask_base;
uint64_t func_id;
uint16_t maxcpus;
cpuset_t cpus;
u_int i;
int hart_id;
int bit;
func_id = hypctx->guest_regs.hyp_a[6];
hart_mask = hypctx->guest_regs.hyp_a[0];
@@ -153,30 +151,18 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx)
hyp = hypctx->hyp;
active_cpus = vm_active_cpus(hyp->vm);
maxcpus = vm_get_maxcpus(hyp->vm);
CPU_ZERO(&cpus);
switch (func_id) {
case SBI_IPI_SEND_IPI:
if (hart_mask_base == (uint64_t)-1) {
CPU_COPY(&active_cpus, &cpus);
} else {
if (hart_mask == 0)
return (SBI_SUCCESS);
if (hart_mask_base >= maxcpus)
while ((bit = ffs(hart_mask))) {
hart_id = (bit - 1);
hart_mask &= ~(1u << hart_id);
if (hart_mask_base != -1)
hart_id += hart_mask_base;
if (!CPU_ISSET(hart_id, &active_cpus))
return (SBI_ERR_INVALID_PARAM);
while (hart_mask != 0) {
i = ffsl(hart_mask) - 1;
hart_mask &= ~(1UL << i);
if (hart_mask_base + i >= maxcpus)
return (SBI_ERR_INVALID_PARAM);
if (!CPU_ISSET(hart_mask_base + i,
&active_cpus))
return (SBI_ERR_INVALID_PARAM);
CPU_SET(hart_mask_base + i, &cpus);
}
CPU_SET(hart_id, &cpus);
}
break;
default:
@@ -185,7 +171,7 @@ vmm_sbi_handle_ipi(struct vcpu *vcpu, struct hypctx *hypctx)
}
if (CPU_EMPTY(&cpus))
return (SBI_SUCCESS);
return (SBI_ERR_INVALID_PARAM);
riscv_send_ipi(hyp, &cpus);
@@ -228,7 +214,6 @@ vmm_sbi_ecall(struct vcpu *vcpu)
}
hypctx->guest_regs.hyp_a[0] = error;
hypctx->guest_regs.hyp_a[1] = 0;
/* Request is handled in kernel mode. */
return (true);