From nobody Wed Sep 16 14:13:11 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 4hlLT33rk4z6rWt0 for ; Wed, 16 Sep 2026 14:13:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlLT323ZQz3MYr for ; Wed, 16 Sep 2026 14:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567991; 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=IERFUuiTaZe5jq5OQK8X7vZi4Z178k7DB0TsPNVkCpM=; b=XR/x0a0Kyvx2QP99W2h7oOaMj8uwR3LE2MklUlxTJD/FTM6dC58Y8cq/iyPvmrW6XO0Ef2 Siwp4l8U7sNkINsKE2hX/GY92iWf6k8bxSoQD4T/TbrowBOYuwmVaTgwAnt0s/YvDaa3Ik 6Vh2rZs8KqEcHKB7zpjOR6KDZA3vTY9rCwTXlUxMaGRnLWyZWsn3bVanN+V3ED4yf7oZS7 9BtWWSleITUtJdRXZRYX9vnVYTjgM+RdRrIgffAjBwhw2T8vhUkP5B9mBrPg7gog3/VH/Q BvPG5l4cTkevNWO1l2mtRTr+n9nuZaXZA1OdnbYjQP4Md061B9SQNvLumqeR1Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789567991; b=BauPw9iDNdehtZnjtu86Es5JxfExREflqeFQb4Q2PKmpuKn76teqB0ZNSttjKEjWj9CttC aU6wBAPQfb3uqaHPMhkaorei4u0h3X7B1sG61yuKx/x35ND3cSHim2n7B12OAue07BcvV7 IRAuHyvROffJa+/sKLBmX7OIY0nHCOTr++YBqMzVCUIG9hq37hRG1AP9EezJxt27+JbTRN tTUiSDkLvNaJdEYB/vQ10Bm+ragQJ0kq3otgB3HlbYpSoY2cT8tleICTfkxtUtfj8N2jDp qIfY9J3gjenHEcHUwndDQ21pX7rsktQx3icLPfmt9bBzKQnHQP5kC8mR5xQVEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789567991; 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=IERFUuiTaZe5jq5OQK8X7vZi4Z178k7DB0TsPNVkCpM=; b=YnI8eWYHC0f/OXK0m3Pbiszc9tbKlc5xMkrzK+hjAGqod7K5Uzp060cvr6f8P0XHJYrSnc RLDLssBvmggF5sBghKK6Vs/TMors9jNOwvN3NKQAXOxjY664FH3t5zqpf0MDuA+hHTftAm 3T48MvAU9W2O+NYiUf9riVH7fiOfLrOKSV55Yh2V1kUjbL8UDRsw0mpjSG2l0yVGB01zjD l1iIJ/EZlJ0ubEgneEyL4hm9AsA0CsSnJRxCPYphmJqUN3UrYyLhzLGnfLFks0+aBvYpSp K3gVQH2yHujtUhtxmlOMnb3nnCgOfpMPJ+wTfBFqCINwFKiqwRhE1V/ra2UGzg== 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 4hlLT312tQzqHL for ; Wed, 16 Sep 2026 14:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37196 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 14:13:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: e4bdc092db2f - main - fixup! libmlx5: Report if kernel allows using MPW in SQ 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: e4bdc092db2f318a80772a7f18d3055dd5170a88 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 14:13:11 +0000 Message-Id: <6aaaa3f7.37196.7d97e688@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e4bdc092db2f318a80772a7f18d3055dd5170a88 commit e4bdc092db2f318a80772a7f18d3055dd5170a88 Author: Ariel Ehrenberg AuthorDate: 2026-07-28 10:39:05 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-16 14:12:08 +0000 fixup! libmlx5: Report if kernel allows using MPW in SQ Interpret the kernel's raw multi_pkt_send_wqe value (0, 1 or 3) instead of masking it against a bitmask the kernel never emits, which silently disabled MPW. Sponsored by: NVidia networking MFC after: 1 month --- contrib/ofed/libmlx5/verbs.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/ofed/libmlx5/verbs.c b/contrib/ofed/libmlx5/verbs.c index ae09281931e7..95a90b253899 100644 --- a/contrib/ofed/libmlx5/verbs.c +++ b/contrib/ofed/libmlx5/verbs.c @@ -1992,10 +1992,17 @@ int mlx5_query_device_ex(struct ibv_context *context, attr->rss_caps.rx_hash_function = resp.rss_caps.rx_hash_function; attr->packet_pacing_caps = resp.packet_pacing_caps.caps; - if (resp.support_multi_pkt_send_wqe & MLX5_ALLOW_MPW) + /* + * The kernel reports the raw two-bit 'multi_pkt_send_wqe' HW + * capability (0 = unsupported, 1 = MPW allowed, 3 = enhanced MPW), + * not the MLX5_ALLOW_MPW / MLX5_SUPPORT_EMPW bitmask that upstream + * libmlx5 expects. Interpret the raw value so MPW is not silently + * disabled on kernels that report the legacy encoding. + */ + if (resp.support_multi_pkt_send_wqe) mctx->vendor_cap_flags |= MLX5_VENDOR_CAP_FLAGS_MPW_ALLOWED; - if (resp.support_multi_pkt_send_wqe & MLX5_SUPPORT_EMPW) + if (resp.support_multi_pkt_send_wqe == 3) mctx->vendor_cap_flags |= MLX5_VENDOR_CAP_FLAGS_ENHANCED_MPW; mctx->cqe_comp_caps = resp.cqe_comp_caps;