From nobody Wed Jun 17 18:23:54 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 4ggXLL5c3Dz6hJQ7 for ; Wed, 17 Jun 2026 18:23:54 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ggXLL0ys8z3jnm for ; Wed, 17 Jun 2026 18:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781720634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbtaMezyxu0M0+yOBi/TPh0qYffnMxXUw59UNqI4x3w=; b=Py+mjkiAret4XDlw+r9ISCfx6S0PoeCF7b93Bqlmgo/J1jcGIlGtQ0TZaaIfZhXsUF5hwz rP5PLg89VGfc0m32telQT8ax4i6SH+KUTaQf7BUpbY9qJz4Lojq4RbXXFppTYKEuK9Eh4K 4al+fbb9BSPreAQqq0D1zVQAoEXP2f+QdMjlseDu0d4CcM6nj+/6DMr8mWe9g6as2t7+G5 Uk02OhTGEk7z76Yy3RQ1V75pzoOcJPD0qF9HruW5Bs1HXZUMRbuuzqwDj/qJZ1CWh/zPyZ Q8xLXQZBVWDO+C0QPv+Lh1TCtT1Nk8rP3SBiExIl/oyaUeLmbqehtGY2dccZNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781720634; a=rsa-sha256; cv=none; b=WE75VH6ijL35Ajs7+unDcrx70ZhdX0HO6pJHzQpslY1yfeQ2DUzoWaKyxm2JXhw/ETApZ6 pqqSUflyBBjGlHlTZaV5y/Nraeb4kxJCxCJyAayi3/hk8dXkEnxBAI1S03k/hFN2k7V2JH NXtp0G+bqX9Eb9UrPT+LsvYMRibW5RqVFGtZtxySHoWVAK1UmMpUOlN7c9Tr8WeZuT9+mO 03zZpCVnD0JO8HG0XMg1sAWBoQOp2P0PnMXnfHrDaa8ciAfdgrdqWFqYQ9QD/DPponmyoj Tbk8CPTaynnildwoEV9eSxOlxtwB5v7qWeH3h+apxXBU9THCdcEWpfRl5WH4Ow== 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=1781720634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbtaMezyxu0M0+yOBi/TPh0qYffnMxXUw59UNqI4x3w=; b=WOwNzZ0m93XHIGjhBnNH5O9Ryco/voKW8XsV2xJvG60t36ltSGHPm+zUK5qq8cI3d1IxNv zTnb4IeOkZORunyVZQEUst5e3aI36Xkilkvc/ql/JcJxPeKiGhnJkqDnWFdyzyZj1NItZD Otn8zzY8Q3oULJlkZF9w5QKpn51dZgIyKRH2zYk17px3hm99mKsGHB41eQqgpnPGKCvQCl bJrCPbSIYtE6zjMgFa0zL/Grka4H8qkAHB6xoq4RNqSuSpe/9ZKK4uaTVDovxLczZrw+cU o5kP6NwuCPRqPlTF8eETB9vSPSAgAa8191NnFyd5GwJBNvBrb0Y/vWvipUOILg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ggXLL0TyGz6pH for ; Wed, 17 Jun 2026 18:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 244a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 17 Jun 2026 18:23:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Slava Shwartsman From: Konstantin Belousov Subject: git: 0e2175cef502 - main - libmlx5: sync PCI device allowlist with mlx5_core_pci_table 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 List-Id: 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e2175cef5027728c0ca1ff98366cf6ecfbe2db3 Auto-Submitted: auto-generated Date: Wed, 17 Jun 2026 18:23:54 +0000 Message-Id: <6a32e63a.244a9.6331f0a6@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0e2175cef5027728c0ca1ff98366cf6ecfbe2db3 commit 0e2175cef5027728c0ca1ff98366cf6ecfbe2db3 Author: Slava Shwartsman AuthorDate: 2026-05-04 11:19:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-17 18:23:14 +0000 libmlx5: sync PCI device allowlist with mlx5_core_pci_table Userspace mlx5_driver_init() only attached when vendor/device matched hca_table, while the kernel already probed additional Mellanox PCI IDs That mismatch prevented libibverbs from loading the mlx5 provider on those HCAs. Extend hca_table to mirror mlx5_core_pci_table and add cross-references so future kernel ID additions are paired with a userspace update. Reviewed by: kib Tested by: Wafa Hamzah Sponsored by: Nvidia networking MFC after: 1 week --- contrib/ofed/libmlx5/mlx5.c | 19 +++++++++++++++++++ sys/dev/mlx5/mlx5_core/mlx5_main.c | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/contrib/ofed/libmlx5/mlx5.c b/contrib/ofed/libmlx5/mlx5.c index 6b1cb770ddd8..6fe6cf594c3b 100644 --- a/contrib/ofed/libmlx5/mlx5.c +++ b/contrib/ofed/libmlx5/mlx5.c @@ -67,6 +67,11 @@ static struct { unsigned vendor; unsigned device; } hca_table[] = { + /* + * PCI IDs must match mlx5_core_pci_table in + * sys/dev/mlx5/mlx5_core/mlx5_main.c so userspace loads for every + * mlx5 device the kernel probes. + */ HCA(MELLANOX, 4113), /* MT4113 Connect-IB */ HCA(MELLANOX, 4114), /* Connect-IB Virtual Function */ HCA(MELLANOX, 4115), /* ConnectX-4 */ @@ -82,9 +87,23 @@ static struct { HCA(MELLANOX, 4125), /* ConnectX-6 DX */ HCA(MELLANOX, 4126), /* ConnectX family mlx5Gen Virtual Function */ HCA(MELLANOX, 4127), /* ConnectX-6 LX */ + HCA(MELLANOX, 4128), HCA(MELLANOX, 4129), /* ConnectX-7 */ + HCA(MELLANOX, 4130), HCA(MELLANOX, 4131), /* ConnectX-8 */ + HCA(MELLANOX, 4132), HCA(MELLANOX, 4133), /* ConnectX-9 */ + HCA(MELLANOX, 4134), + HCA(MELLANOX, 4135), + HCA(MELLANOX, 4136), + HCA(MELLANOX, 4137), + HCA(MELLANOX, 4138), + HCA(MELLANOX, 4139), + HCA(MELLANOX, 4140), + HCA(MELLANOX, 4141), + HCA(MELLANOX, 4142), + HCA(MELLANOX, 4143), + HCA(MELLANOX, 4144), HCA(MELLANOX, 41682), /* BlueField integrated ConnectX-5 network controller */ HCA(MELLANOX, 41683), /* BlueField integrated ConnectX-5 network controller VF */ HCA(MELLANOX, 41686), /* BlueField-2 integrated ConnectX-6 Dx network controller */ diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 058085348a3f..184457b7d0b5 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -2105,6 +2105,10 @@ static void shutdown_one(struct pci_dev *pdev) mlx5_pci_disable_device(dev); } +/* + * When adding device IDs, also update hca_table in + * contrib/ofed/libmlx5/mlx5.c or libibverbs will reject the device. + */ static const struct pci_device_id mlx5_core_pci_table[] = { { PCI_VDEVICE(MELLANOX, 4113) }, /* Connect-IB */ { PCI_VDEVICE(MELLANOX, 4114) }, /* Connect-IB VF */