From nobody Fri Feb 6 15:39:29 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 4f6yv56XlMz6RLmM for ; Fri, 06 Feb 2026 15:39:29 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6yv54ncHz3w4J for ; Fri, 06 Feb 2026 15:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770392369; 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=+W+WZZ2/l3Jr0iDYkWuXkMIUcSLJdEr0nkIW8+JKg2M=; b=v2sfp6r4RWN9sPKnyAMxcV2184XuaGZRnBQKEbHQg1+gJ3vInnj9Qeg3KdyZw4Chw7KybQ 1oZwwyXjzcMXFrbX5ecCBFFaxf8hhXCpePCBec6w8mG8uGJZ9MDIjNAyAv1hjcU/icqUlv xZThYCZirlhm6oKTTag6nnYWQvH8PkCSqxDpqa6/OUlp0oComb1NA8ekgGQC4WdDBqhfNd B/I7w36BoVxBNLQMtwJmPnyMpAZaabuBG8FWdyiBBhKETj3tB1Y/4VgIR0EeG12RxOzRJN 61HvAaM8SYSqDbeEfakYM+R+X6w7mBKsHL7pWiInAZaCwHyGlyEKnomcanbfYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770392369; a=rsa-sha256; cv=none; b=No8sruAuVMH/mtSO7UFNp+eD3Dcw8b9UXAmD0+Vy74R5L2mG95r01Al3abxbK/vo7BEvMA ibF3pWK+2OQE3YJUCx8l0NOCojV3I/UuUaS504ZqqIHPd/bYu63rJtdAAFFYB9SeMAY5o6 K710ggk2HCqvap3UM/t49/JmGrfsBlUHhlKCpV/N4QXAjYRFxG0QdSgmsC/xmMZOY+eivQ JEx0xS2KZqxwp5tseNGMVwN/K6N7A9HhkACktKt5OG+FikOWKDTMnBa343a3E7mTq2XQXZ TEPEz4EhX/WhH8PidXd6ec69xjoT0YvMY/UqqYJvxjG0PrcW8km7EK3EZO9orw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770392369; 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=+W+WZZ2/l3Jr0iDYkWuXkMIUcSLJdEr0nkIW8+JKg2M=; b=P/v79LXPHIipY8Q+3kLlXnkBWobnxvur+2Q3dJquVfQ60qla2CT99a12aIZynotOE+joNV MMDnnXfrpBCaFEaqaosFDruCja2Yl2F3TnB0lUzjHvl0JRpjrK45MQssOnd0ZTv0NcjsLi bM2cnAXT0AnS1LXH9MAcGeoUZBUXOIV3qr1HNwL60Q4jS28tBE9ehqHtx8fCAhZZMEFHx8 uOQURDME4JBqcTjhIpUYE4rSEdxN9CPr2RxtX4aWtHOec6Uh7tCDQajbuGR7vOx8EPpH8u Uc2bisERmgs/neLE/1URtbBFjX1JAvhTxIoR8AIQP89bu6/jggzONcTFV9nONg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6yv54Cb4z5m9 for ; Fri, 06 Feb 2026 15:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f8c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 15:39:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 86150ed98b79 - main - bhyve: Simplify passthru_msix_addr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86150ed98b7903feaba942f01619e74894cd23c4 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 15:39:29 +0000 Message-Id: <69860b31.3f8c9.5a7bead4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=86150ed98b7903feaba942f01619e74894cd23c4 commit 86150ed98b7903feaba942f01619e74894cd23c4 Author: Mark Johnston AuthorDate: 2026-02-06 15:30:56 +0000 Commit: Mark Johnston CommitDate: 2026-02-06 15:38:51 +0000 bhyve: Simplify passthru_msix_addr() It can use the passthru_mmio_map() helper function. Make that change, and also make passthru_mmio_map() use EPRINTLN to fix formatting when the guest console is stdio. Reviewed by: corvink, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55067 --- usr.sbin/bhyve/pci_passthru.c | 80 ++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 8ddcd8bd56e8..662390413dbc 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -1310,58 +1310,6 @@ passthru_read(struct pci_devinst *pi, int baridx, uint64_t offset, int size) return (val); } -static void -passthru_msix_addr(struct pci_devinst *pi, int baridx, int enabled, - uint64_t address) -{ - struct passthru_softc *sc; - size_t remaining; - uint32_t table_size, table_offset; - - sc = pi->pi_arg; - table_offset = rounddown2(pi->pi_msix.table_offset, 4096); - if (table_offset > 0) { - if (!enabled) { - if (vm_unmap_pptdev_mmio(pi->pi_vmctx, - sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - table_offset) != 0) - warnx("pci_passthru: unmap_pptdev_mmio failed"); - } else { - if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - table_offset, - sc->psc_bar[baridx].addr) != 0) - warnx("pci_passthru: map_pptdev_mmio failed"); - } - } - table_size = pi->pi_msix.table_offset - table_offset; - table_size += pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE; - table_size = roundup2(table_size, 4096); - remaining = pi->pi_bar[baridx].size - table_offset - table_size; - if (remaining > 0) { - address += table_offset + table_size; - if (!enabled) { - if (vm_unmap_pptdev_mmio(pi->pi_vmctx, - sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - remaining) != 0) - warnx("pci_passthru: unmap_pptdev_mmio failed"); - } else { - if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, - sc->psc_sel.pc_dev, - sc->psc_sel.pc_func, address, - remaining, - sc->psc_bar[baridx].addr + - table_offset + table_size) != 0) - warnx("pci_passthru: map_pptdev_mmio failed"); - } - } -} - static int passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, uint64_t address, uint64_t off, uint64_t size) @@ -1373,14 +1321,16 @@ passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, if (vm_unmap_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, address + off, size) != 0) { - warnx("pci_passthru: unmap_pptdev_mmio failed"); + EPRINTLN("pci_passthru: unmap_pptdev_mmio failed: %s", + strerror(errno)); return (-1); } } else { if (vm_map_pptdev_mmio(pi->pi_vmctx, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, address + off, size, sc->psc_bar[baridx].addr + off) != 0) { - warnx("pci_passthru: map_pptdev_mmio failed"); + EPRINTLN("pci_passthru: map_pptdev_mmio failed: %s", + strerror(errno)); return (-1); } } @@ -1388,6 +1338,28 @@ passthru_mmio_map(struct pci_devinst *pi, int baridx, int enabled, return (0); } +static void +passthru_msix_addr(struct pci_devinst *pi, int baridx, int enabled, + uint64_t address) +{ + size_t remaining; + uint32_t table_size, table_offset; + + table_offset = rounddown2(pi->pi_msix.table_offset, 4096); + if (table_offset > 0) { + (void)passthru_mmio_map(pi, baridx, enabled, address, 0, + table_offset); + } + table_size = pi->pi_msix.table_offset - table_offset; + table_size += pi->pi_msix.table_count * MSIX_TABLE_ENTRY_SIZE; + table_size = roundup2(table_size, 4096); + remaining = pi->pi_bar[baridx].size - table_offset - table_size; + if (remaining > 0) { + (void)passthru_mmio_map(pi, baridx, enabled, address, + table_offset + table_size, remaining); + } +} + static void passthru_mmio_addr(struct pci_devinst *pi, int baridx, int enabled, uint64_t address)