From nobody Fri Dec 09 18:31:41 2022 X-Original-To: dev-commits-src-all@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 4NTKNt0X1gz4jxBy; Fri, 9 Dec 2022 18:31:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NTKNs6tcXz3Lpb; Fri, 9 Dec 2022 18:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610702; 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=aURrL2cyTrZOm9J0i4dCrsnLwPYn/AB36oFF6QORTjc=; b=el71PFlKjPApZt8W3aayOf+Owh6oMZhToYo+5frWhMGl26GW8RU9XeM1f2PdNZmENVGzZg Hpxl6ZFZ5tdL0Ke3uzyOsgCbL1Xo8gsDIv2lYTJeqP4JRs6VXeI813+Jb/hPUg6ZS6O7HJ 2rPiArhHC6cEPMAkU/Oyje3wdEma17SQRuYIr7PeXuojeC2M2SSMub8J+rdTavqmVbOrYv 8WjwOxDj8HwmHBUsy0WlwKVuvB1rRtKxb8z4CPkZKhdev+2Ruf8yXWVQTVSFhj2YO1QC4D 9SMULr1uVP4yLUuqh4t+XNnp+xbNvja79vvDwGtp4YqQ0xCvVMFvEd9iqQ1qog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670610702; 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=aURrL2cyTrZOm9J0i4dCrsnLwPYn/AB36oFF6QORTjc=; b=B6RTiQRf02pAvKHghUqE1+Z8Gl8fn6mGg25tijor3/50vO7/Kh6B+aJO64HDvN37VE8+7L g0u17XVyxmTR5jGSh424p0Q9QJj/9kqrtChTgGbCdoLlAeXm+NJQRQrtrVI4DSbNPQz1/q elvSxI++XEA8fTjtJe1g/v7MDyEmHo12XswA0LwGR4DoUK2BO/lQPW65NEyEGV/mxSzenZ xM/iC8VCuaITu0yS4uB7Ub/rh2WkXmFOOSEbQegZekaQj4TpUqf5qCeZRYew21obvY3GWl 3DPI9z9qRSnM2YaKAUNHXJkMdEzQDkH1ie0stu0cc+8OI1G1cYy3MmZtpg9Ggg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670610702; a=rsa-sha256; cv=none; b=lN5SzS6IMiXlNwgWadLYpHzzGeww3eKJUIIlBlkH405IgVnI+4vvNA3qK6GQQGt3Ahw/k/ JsRNpEliclFcOrhOTmyk7OwPuhR+z9Hu1tJwvOTh2M7z263ityfm4agPEhKzPJunkKdpi2 +g3xQb19w2lrVbNP2qI0KlJ3o3QJI+AS+iYKCamH9scO6N9HUP2HaO5rsh2PzvHrf61fGY df9HepisjVy5kRuLJhlR0wwSzcPTm55sxEudYmaY7f098edxrz/YtNZ09j+5jdCC2ac/gR FwlVq/xM2zON10Ia0nx5Ijkoo5inw9v7kxZkSReNu3ujBYA9Dfe6MgqfM7oIbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NTKNs5tyyzm1Y; Fri, 9 Dec 2022 18:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B9IVftE024179; Fri, 9 Dec 2022 18:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9IVfbj024178; Fri, 9 Dec 2022 18:31:41 GMT (envelope-from git) Date: Fri, 9 Dec 2022 18:31:41 GMT Message-Id: <202212091831.2B9IVfbj024178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0857e5555d77 - main - bhyve: Pass a vCPU ID of 0 to vm_setup_pptdev_msi*. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0857e5555d77357e34ea6d70b28ead6335e41d33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0857e5555d77357e34ea6d70b28ead6335e41d33 commit 0857e5555d77357e34ea6d70b28ead6335e41d33 Author: John Baldwin AuthorDate: 2022-12-09 18:28:11 +0000 Commit: John Baldwin CommitDate: 2022-12-09 18:31:17 +0000 bhyve: Pass a vCPU ID of 0 to vm_setup_pptdev_msi*. These ioctls are not vCPU-specific and the ioctl now ignores the vCPU ID. 0 is used instead of -1 to provide limited forwards compatibility. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37651 --- usr.sbin/bhyve/pci_passthru.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index b4a8b623eca9..3a16e7bce0ae 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -386,7 +386,7 @@ msix_table_read(struct passthru_softc *sc, uint64_t offset, int size) } static void -msix_table_write(struct vmctx *ctx, int vcpu, struct passthru_softc *sc, +msix_table_write(struct vmctx *ctx, struct passthru_softc *sc, uint64_t offset, int size, uint64_t data) { struct pci_devinst *pi; @@ -445,7 +445,7 @@ msix_table_write(struct vmctx *ctx, int vcpu, struct passthru_softc *sc, /* If the entry is masked, don't set it up */ if ((entry->vector_control & PCIM_MSIX_VCTRL_MASK) == 0 || (vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { - (void)vm_setup_pptdev_msix(ctx, vcpu, + (void)vm_setup_pptdev_msix(ctx, 0, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, index, entry->addr, entry->msg_data, entry->vector_control); @@ -948,7 +948,7 @@ passthru_cfgread(struct vmctx *ctx __unused, int vcpu __unused, } static int -passthru_cfgwrite(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, +passthru_cfgwrite(struct vmctx *ctx, int vcpu __unused, struct pci_devinst *pi, int coff, int bytes, uint32_t val) { int error, msix_table_entries, i; @@ -969,7 +969,7 @@ passthru_cfgwrite(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, if (msicap_access(sc, coff)) { pci_emul_capwrite(pi, coff, bytes, val, sc->psc_msi.capoff, PCIY_MSI); - error = vm_setup_pptdev_msi(ctx, vcpu, sc->psc_sel.pc_bus, + error = vm_setup_pptdev_msi(ctx, 0, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, pi->pi_msi.addr, pi->pi_msi.msg_data, pi->pi_msi.maxmsgnum); @@ -984,7 +984,7 @@ passthru_cfgwrite(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, if (pi->pi_msix.enabled) { msix_table_entries = pi->pi_msix.table_count; for (i = 0; i < msix_table_entries; i++) { - error = vm_setup_pptdev_msix(ctx, vcpu, + error = vm_setup_pptdev_msix(ctx, 0, sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, i, pi->pi_msix.table[i].addr, @@ -1029,8 +1029,8 @@ passthru_cfgwrite(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, } static void -passthru_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, int baridx, - uint64_t offset, int size, uint64_t value) +passthru_write(struct vmctx *ctx, int vcpu __unused, struct pci_devinst *pi, + int baridx, uint64_t offset, int size, uint64_t value) { struct passthru_softc *sc; struct pci_bar_ioreq pio; @@ -1038,7 +1038,7 @@ passthru_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, int baridx, sc = pi->pi_arg; if (baridx == pci_msix_table_bar(pi)) { - msix_table_write(ctx, vcpu, sc, offset, size, value); + msix_table_write(ctx, sc, offset, size, value); } else { assert(pi->pi_bar[baridx].type == PCIBAR_IO); assert(size == 1 || size == 2 || size == 4);