From nobody Mon Nov 02 21:39:27 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jJQ8J069Vz6ybdF for ; Mon, 02 Nov 2026 21:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJQ8H6brBz50bY for ; Mon, 02 Nov 2026 21:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793655567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3SkHpz/ZrB2cCAl50d72I909N4421awOFoDxbFI/VWY=; b=wYkN9cxzYznWitNGZ2nBu5spMTDWJSgE3J21xKVPPFizZQfDlDLsmihQWZ3khoBd3v96Wn Nl3Kduip730HHxYX3PfuCphVdlZTGnJPmPgNDUPf16SjuQPQddWH49XAVSORRKO9swT2Dx 0YJ4mfj4IyAoRZwtJMX/fZlkdcqi4E1VHFhjk1oFcN6dGaUQ/T4M3b8rnQx3eRaU9NO/ya Pwf1yfvT9c6ZZWfXV7hGWTRAsPCNKAnnBttJUzoVKxc89Rhpr4GIxUezOHlIrJsEfrho2S +UP9EoC0dhwmw55uAQt//oUfc8EU8w9uOPGVJ7vaQ9se6k400I54dsXpXtJ7MA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793655567; b=pAlMXsWiumkWhy/TEzLVOJ5w3OAmtpK0kyP0X5OjpYRqOW38Ihg3kAXx0cOIODpUOg2K/M TEj/uuVadHss4+5GquCMXSdI1k52LAksbkgb3SWolSZIZfPYXffEPVSQlU7fTySO5GhIAr qrPqIhrqIe/klm3FpXDavaUtu88RbPWnqa0TTN3Z2+6aC5EhnXsDIQn7t3xT4DyQPceL2W syu7xyhA3UZbfPX/Siq9xbBqDfdDII8Ree49LSThVm46+LZKPpWdljtOAOtkpPZ1+Smmtr aoz+Rnt49fY1bKFrFBi58ols5AdzGFHGPi9YOKxdU0JoAwcev7R58LGk4pL+Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793655567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3SkHpz/ZrB2cCAl50d72I909N4421awOFoDxbFI/VWY=; b=FLHskUt76hSOHmdyvnaDXcsvrD/MiQ09kdKUzv75hKuzidCR0C5TQZITfqMjcLgximC0Cg xWnCntyl0ZU3I9z1BZXMVfxBGeYAONAzDN1Ccg+vxHJb+iRnD6c0DRTKzF9yF6eO8GGWj9 ENUvlG7yLx+LZKRPg8wqwkS04fVkLJjpslp8qWidsFNa+BvPpzw4wcWOSwBAYHUEUdR3VX 3vvqvVEx7yU3vGLCJDfDcSAR/CzAwKVexe2EUdvyaZUGpuUwMkvMQ0lELG+I0v6UZiM4gc ch5JVCA713JEpxrix8zWV9YiSjPlRQSmNgUGJ67fRc3SRhIWAIolfRWexPu8Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJQ8H5yVhz13TC for ; Mon, 02 Nov 2026 21:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 21:39:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 89d52f02bf37 - main - Revert "bhyve/riscv: correctly handle empty masks and broadcast in SBI IPI/RFNC" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89d52f02bf37ed3d9fdb464f38f0714aa979eb41 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 21:39:27 +0000 Message-Id: <6ae9030f.40f6e.7980e15c@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=89d52f02bf37ed3d9fdb464f38f0714aa979eb41 commit 89d52f02bf37ed3d9fdb464f38f0714aa979eb41 Author: Ruslan Bukin AuthorDate: 2026-11-02 21:33:57 +0000 Commit: Ruslan Bukin CommitDate: 2026-11-02 21:38:04 +0000 Revert "bhyve/riscv: correctly handle empty masks and broadcast in SBI IPI/RFNC" This reverts commit ada1f577cc291336cbb69782075dbbf9fe746872. --- sys/riscv/riscv/sbi_ipi.c | 2 -- sys/riscv/vmm/vmm_riscv.c | 2 -- sys/riscv/vmm/vmm_sbi.c | 71 +++++++++++++++++++---------------------------- 3 files changed, 28 insertions(+), 47 deletions(-) diff --git a/sys/riscv/riscv/sbi_ipi.c b/sys/riscv/riscv/sbi_ipi.c index af1df948880b..fac5c0c39b99 100644 --- a/sys/riscv/riscv/sbi_ipi.c +++ b/sys/riscv/riscv/sbi_ipi.c @@ -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); } diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c index 3798ab8b0ec8..fe2ca5c07789 100644 --- a/sys/riscv/vmm/vmm_riscv.c +++ b/sys/riscv/vmm/vmm_riscv.c @@ -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)); } diff --git a/sys/riscv/vmm/vmm_sbi.c b/sys/riscv/vmm/vmm_sbi.c index 85e336847916..c1e6022097e3 100644 --- a/sys/riscv/vmm/vmm_sbi.c +++ b/sys/riscv/vmm/vmm_sbi.c @@ -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);