From nobody Tue Jun 3 16:41:41 2025 X-Original-To: dev-commits-src-branches@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 4bBc1K5lyJz5xrvv; Tue, 03 Jun 2025 16:41:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBc1K51Txz3dbm; Tue, 03 Jun 2025 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748968901; 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=9d7K+vDIZ3krsiiiHovryCrFbhiYSv3e4dnCoVMODXQ=; b=tW7Yip/+mbnNAMmfa7okNdksF29ukd9d7tv21oKn2YhFOIRn+A6LKKFIdlS4zZ77ciojag yh5I9DN8GCAJDKK+qkYMw0hDiVbV2WI7JpkvRXKmnr1nA6TruNK6qG1vEGYf45kgH2MWk4 1sabXU6itGxkG3aa7rW+79K0g26sDVdW2PmAzIEvlnEf6zyzB7sYwTHI3rlY5Sh48ofTxP sHCK0jioH7qfBbiSfkSblhgRDWBVJPDBFc4x1QsA9+euPzCRatCRLTTvwRdy9v6UqNRbV6 sGXu7KN1IDvqqLTsgBEGp6TvhMz59CVZX+WzOzoDljF2unNm/ANjGF8B8dvVAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748968901; 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=9d7K+vDIZ3krsiiiHovryCrFbhiYSv3e4dnCoVMODXQ=; b=CJEhRUayST2QqNSQOqzMsRUaYoz4jO0onP1KxqkaKOtrBrnub/oTVFowqnijSjYmoZoI3v pFNEzwlAsVMvHQ33ooQtXxWAUsk+FQFYjkHAM58uMcsaQyzQ6BRbvQcBe+2YaGgmeiNseL eeBm/sfjrq5YnkoZBDU1X0LrRQHcJ8W0uy1xHHxFVIZpNUOaWRSc64BkRPplv/0drPhp3g Ll8kZyoc3JV+iwUFRuPMWbg+g4P7ftb+ZH+PVideNzidmAUUbvAhD5ZzB65GXBXRrVK9Qb vAufaSuRitZ4N7jdy7rPlO23qc65zrjRfY2PNvnHzQ4NzedDotPvuSbHUW/4Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748968901; a=rsa-sha256; cv=none; b=HoA1P2c9AiWEQJsTC44P3A7s5abYHLGar8jK8TMgxxIuQa2UaoWINw/rdxKZNv/YDBd6is vZX1+RLbAXUE6o1cz7NsbxbMiG9ttbIGO5FpjxRdxJaqrDpnlm3WyQ0tb9LB+6PWrY+IyS e/UXB7RuLEtuZlB3ZS4QL84WZpBf3ibg8CsFYIqzZFh9S1TipNs1sGzXS3W3HgQrHCY0gq az/pdFEYS3hSZs3yZncGrMY1wZucT3t3s7g1cA/2tLnPxfAyuuHazdHiJnw9fkjta1VF7m EkqObc5SgTO3eaPx9joWfmul+lk9riiKJfFbXymVHcr1nP5AsoAxP+E5IzpsAg== 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 4bBc1K4RRjzmSs; Tue, 03 Jun 2025 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553Gffoo087988; Tue, 3 Jun 2025 16:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553GffU9087985; Tue, 3 Jun 2025 16:41:41 GMT (envelope-from git) Date: Tue, 3 Jun 2025 16:41:41 GMT Message-Id: <202506031641.553GffU9087985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: ae08f9366346 - stable/14 - ppt: Fix panic when configuring unavailable MSI-X vector List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae08f93663462b4b557806bda8c5446d39a0345f Auto-Submitted: auto-generated The branch stable/14 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=ae08f93663462b4b557806bda8c5446d39a0345f commit ae08f93663462b4b557806bda8c5446d39a0345f Author: Krzysztof Galazka AuthorDate: 2025-05-16 11:29:08 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-03 16:41:17 +0000 ppt: Fix panic when configuring unavailable MSI-X vector In some cases VM may have different idea about number of available MSI-X vectors then PPT driver. Return an error when VM requests setup for more vectors than expected. It was observed while using SR-IOV on an Intel E810 Ethernet adapter. VF driver in a VM sees a correct number of available MSI-X vectors, which depends on num-queues assigned in iovctl.conf, while pci_msix_count in the PPT driver always returns 1. Signed-off-by: Krzysztof Galazka Reviewed By: #bhyve, jhb Approved by: erj (mentor), kbowling (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D48812 (cherry picked from commit 413197cef9ccbf22831eb914c2ef469880468d97) --- sys/amd64/vmm/io/ppt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 7643ba0c2973..2db400cf0492 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -736,6 +736,9 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, } } + if (idx >= ppt->msix.num_msgs) + return (EINVAL); + if ((vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { /* Tear down the IRQ if it's already set up */ ppt_teardown_msix_intr(ppt, idx);