From nobody Mon Jul 6 01:42:58 2026 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 4gtnDg1rd5z6kBPD for ; Mon, 06 Jul 2026 01:42:59 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gtnDf6Fjlz3Xfk for ; Mon, 06 Jul 2026 01:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783302178; 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=Wpn6VHzESCZVV2wHZhAdK4kwxfj+uUlRMXjS5rJ+nJI=; b=NS5XU1fd076o1A8Jb3qbpADoWcBaCk0a6jIsOYw/PWLfx8jcR4QXDJtvf6qZSD97q2uXbJ zgWq7yoyMBVT+3+FNpPGpQcFhUupdfOmA0ra2fRXJPOgou1Hdqzs1vl1Nh/E1RyQVpmirj G+g1BMOI8E3dE54N3ikNfUuR+RwjOeRL5txyRFNK/kaf3nG/z6JUvZUSsvfii/5OGRdxNd jlxnxe++/N0+UpGn1pkQt3brBpUKncsJ9V2rclrtsLR8jK+SU/rMT7hXBZiMNO2OYokR1g Jd3/IalcHcvCb9CIyH9KVGpPxn+Jul5VbvXrNOBMsEVwKTBr8GX6AmOEalBvQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783302178; a=rsa-sha256; cv=none; b=gYgHj3mIxAB1ibgwzxq/cEJKQDix0A2kEXRj+CrPZclaLr4AJYeR5nMAMSR+lIUnD2mW2r wmJtxuvep5Uoce2AgJQdKmtHTMdlzIuyhM2al6g2rksvo/4SUEnibfiOsSD2iY3GgV55tA Ynqo0TIz+lQ3mrx26tLAL333iI4Nn6TNT9wz+5sl/+8kqXIfnNLx9Q90tZTkiFlHXN5CAg BDYfnKkzIjm9130YDoNSw9Y12cf4KUFjV80pwSEuH8cU0AeF7+Wmo0y5X94dKj6SEIy89K etp8cQQnhkcUQZCecGuvh4AaJbJsNz3lFzbP6eqDW9vDoeOvoc3d6Ab78XNLVg== 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=1783302178; 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=Wpn6VHzESCZVV2wHZhAdK4kwxfj+uUlRMXjS5rJ+nJI=; b=HUy1PfCiGtmM/y1EWdrKNq7f4oFedSceilmrwBAnswxBATDiRtRo64u79zjYtNorechJHi cUL4CsyJX9B/QUM/2hEgGUbW/CV8pIitc68vyi85/JnnOOgiqc+OFdIdLS9lpW17I/Sntu JB8X0oMV2ccejD5rGfN48nVtswgER2AhY5nZzRAVm7fdKPqcA8bfFDXoFMrNvfBsXR8wk4 XVJhWSvbYwlLBlKCps2qg7OMv1kLbV81aFsBhCH1lKk6ydehyY3NtK46tIf31j7qKPZoWq KFTSj813aoxlmFEgLOrBf0pHmTp8PCadQdHJrFe0ObrmdgcmDv9dxenxWX9big== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtnDf50y6zkmR for ; Mon, 06 Jul 2026 01:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e46a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 01:42:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Slava Shwartsman From: Konstantin Belousov Subject: git: 5d044e4b9f33 - stable/15 - RDMA: Fix link active_speed size 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5d044e4b9f33e2bdc8fa9ce071f3f735e1d531aa Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 01:42:58 +0000 Message-Id: <6a4b0822.3e46a.187951ba@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5d044e4b9f33e2bdc8fa9ce071f3f735e1d531aa commit 5d044e4b9f33e2bdc8fa9ce071f3f735e1d531aa Author: Slava Shwartsman AuthorDate: 2026-05-13 14:54:51 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-06 01:35:49 +0000 RDMA: Fix link active_speed size (cherry picked from commit e5d8b775bbf6f378a591211e373859ec44f74149) --- sys/dev/bnxt/bnxt_re/ib_verbs.c | 5 +++-- sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c | 6 +++--- sys/dev/qlnx/qlnxr/qlnxr_verbs.c | 2 +- sys/ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c | 3 ++- sys/ofed/include/rdma/ib_verbs.h | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/dev/bnxt/bnxt_re/ib_verbs.c b/sys/dev/bnxt/bnxt_re/ib_verbs.c index 32899abab9ff..9e6887a7c6e1 100644 --- a/sys/dev/bnxt/bnxt_re/ib_verbs.c +++ b/sys/dev/bnxt/bnxt_re/ib_verbs.c @@ -241,7 +241,7 @@ int bnxt_re_modify_device(struct ib_device *ibdev, return 0; } -static void __to_ib_speed_width(u32 espeed, u8 lanes, u8 *speed, u8 *width) +static void __to_ib_speed_width(u32 espeed, u8 lanes, u16 *speed, u8 *width) { if (!lanes) { switch (espeed) { @@ -342,7 +342,8 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num, { struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev); struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr; - u8 active_speed = 0, active_width = 0; + u16 active_speed = 0; + u8 active_width = 0; dev_dbg(rdev_to_dev(rdev), "QUERY PORT with port_num 0x%x\n", port_num); memset(port_attr, 0, sizeof(*port_attr)); diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c index 5825cee87d9b..6ff4e55630d7 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -155,7 +155,7 @@ static if_t mlx5_ib_get_netdev(struct ib_device *device, return ndev; } -static int translate_eth_proto_oper(u32 eth_proto_oper, u8 *active_speed, +static int translate_eth_proto_oper(u32 eth_proto_oper, u16 *active_speed, u8 *active_width) { switch (eth_proto_oper) { @@ -216,7 +216,7 @@ static int translate_eth_proto_oper(u32 eth_proto_oper, u8 *active_speed, return 0; } -static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u8 *active_speed, +static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed, u8 *active_width) { switch (eth_proto_oper) { @@ -969,7 +969,7 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, if (err) goto out; - props->active_speed = (u8)ptys->ib_proto_oper; + props->active_speed = (u16)ptys->ib_proto_oper; pmtu->local_port = port; err = mlx5_core_access_pmtu(mdev, pmtu, 0); diff --git a/sys/dev/qlnx/qlnxr/qlnxr_verbs.c b/sys/dev/qlnx/qlnxr/qlnxr_verbs.c index d74f51831da7..f3a054c707c3 100644 --- a/sys/dev/qlnx/qlnxr/qlnxr_verbs.c +++ b/sys/dev/qlnx/qlnxr/qlnxr_verbs.c @@ -546,7 +546,7 @@ qlnxr_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, } static inline void -get_link_speed_and_width(int speed, uint8_t *ib_speed, uint8_t *ib_width) +get_link_speed_and_width(int speed, uint16_t *ib_speed, uint8_t *ib_width) { switch (speed) { case 1000: diff --git a/sys/ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c b/sys/ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c index 5d45a22eb9fe..a245cbdd440e 100644 --- a/sys/ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c +++ b/sys/ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c @@ -153,7 +153,8 @@ void copy_port_attr_to_resp(struct ib_port_attr *attr, resp->subnet_timeout = attr->subnet_timeout; resp->init_type_reply = attr->init_type_reply; resp->active_width = attr->active_width; - resp->active_speed = attr->active_speed; + /* This ABI needs to be extended to provide any speed more than IB_SPEED_NDR */ + resp->active_speed = min_t(u16, attr->active_speed, IB_SPEED_NDR); resp->phys_state = attr->phys_state; resp->link_layer = rdma_port_get_link_layer(ib_dev, port_num); } diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 0c40a6f18f7c..0908c106f513 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -609,7 +609,7 @@ struct ib_port_attr { u8 subnet_timeout; u8 init_type_reply; u8 active_width; - u8 active_speed; + u16 active_speed; u8 phys_state; bool grh_required; };