From nobody Sat Mar 22 00:28:27 2025 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 4ZKKt43v5Jz5qwfd; Sat, 22 Mar 2025 00:28:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKKt41Hrvz3DCy; Sat, 22 Mar 2025 00:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742603308; 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=Nt4p0JKAO/k9XxRiY2vwQ7U+stseAl0kutiDtax436Q=; b=s2PinIuk7NSKwTfWQ8q6RPpWCTYO1v6T80nTtd06wZW5It4x1g7Rub2kp5+ahNgMzgcfEt CU57ogSbbMCOixPSKmQRkKCvPTaMR9v5G/FNZoXR36gjgSQp1Jw287set0j2rU8ncTO4AU P3NNM2+HszFBXfZN3kKDelT5bHXMwGiBgYZGM7m95EWMo7tw8ocuP9Y9bigS18N9pfC6bn nu4llQXBwYZfIj/gIynFXADM5c4jRv5tDNGgM6xR+q2Fk7HZEc3Ca3BAmaiTiGTMZaHedp ntleH2d93tjCf8IgM+QG+423A8NtENzoePcEbAgXwC12Z0NpjliF1WX9fcs9+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742603308; a=rsa-sha256; cv=none; b=XneMPg9ttm0TRefGXNs2CEvkKxubMH9m5likZCHdBXoelHUKec3GWG3uZU9YKSpDhuZ/Ws aqta7KNgZwhMWJGylgon6V2SH03ZcPTTmFZjO391RlQGzjKFbfnRci5hiCEZnrRZlPq2f7 Ev8l9XkOCm3tXycXit06hlpKh4gYrbqjSHcoJjw9M1BBjqYOA3vl6AWq1aga3dyQ/gtg5f nykb7os0YOT1TJ+uEfJdn81fFwF+CBSLyBfUdWz/3WwseSuwseih5VGdM2a8kjA6rILlq9 gYUKY/r5CihCwQeTC3ujwv/JLiPnz6DgK9b1Pu4n4K3RyOoAAQEFc6Ayd+0epA== 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=1742603308; 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=Nt4p0JKAO/k9XxRiY2vwQ7U+stseAl0kutiDtax436Q=; b=bqwJIejKh3Oc7mO6ijsB3eiWwOVyEQE/hvySDW/fCOjUdThX2hiK2qQ7kwwwrUv8Zn7/86 p69DEgR1MQ5xhLhF0NTXVG7CMEXl3J/M7TXMoF7yNmiHjRnQnHMcwOHZuDjG4fUFBOCWep p8OXcQtpdYABuM+TorAJ4bkF0aZWWdbOxCMwtvFM6YM2szJHuO4qntEnQPEZlaTWr4BLb1 PEXnhaZSY7rBl2e1nzBpay6HSAtkbmWDNZtwmITmAkWssYCjmjKRo2+oICKnQVvyo3GvH7 u7goLCthejDJvCGgW5SSe+X36BHiJlIBdTnZ+EhrF55XtAieqEi8Le67GzUF3Q== 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 4ZKKt40ZV2zyRY; Sat, 22 Mar 2025 00:28:28 +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 52M0SRXN063140; Sat, 22 Mar 2025 00:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52M0SRpI063137; Sat, 22 Mar 2025 00:28:27 GMT (envelope-from git) Date: Sat, 22 Mar 2025 00:28:27 GMT Message-Id: <202503220028.52M0SRpI063137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e39ee9b9ef3c - stable/14 - libibverbs: Extend support of NDR rates 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 commit e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 Author: Slava Shwartsman AuthorDate: 2025-03-12 08:49:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-22 00:27:55 +0000 libibverbs: Extend support of NDR rates PR: 285305 (cherry picked from commit 5963423232e869b8dbe8e9a65134e92735dfb521) --- contrib/ofed/libibverbs/examples/devinfo.c | 1 + contrib/ofed/libibverbs/verbs.c | 8 ++++++++ contrib/ofed/libibverbs/verbs.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/contrib/ofed/libibverbs/examples/devinfo.c b/contrib/ofed/libibverbs/examples/devinfo.c index 7693cb30739d..866d82718f7d 100644 --- a/contrib/ofed/libibverbs/examples/devinfo.c +++ b/contrib/ofed/libibverbs/examples/devinfo.c @@ -145,6 +145,7 @@ static const char *speed_str(uint8_t speed) case 16: return "14.0 Gbps"; case 32: return "25.0 Gbps"; case 64: return "50.0 Gbps"; + case 128: return "100.0 Gbps"; default: return "invalid speed"; } } diff --git a/contrib/ofed/libibverbs/verbs.c b/contrib/ofed/libibverbs/verbs.c index aec8706fd0cc..9c7e3b403f92 100644 --- a/contrib/ofed/libibverbs/verbs.c +++ b/contrib/ofed/libibverbs/verbs.c @@ -115,6 +115,8 @@ int __attribute__((const)) ibv_rate_to_mult(enum ibv_rate rate) case IBV_RATE_50_GBPS: return 20; case IBV_RATE_400_GBPS: return 160; case IBV_RATE_600_GBPS: return 240; + case IBV_RATE_800_GBPS: return 320; + case IBV_RATE_1200_GBPS: return 480; default: return -1; } } @@ -135,6 +137,8 @@ enum ibv_rate __attribute__((const)) mult_to_ibv_rate(int mult) case 20: return IBV_RATE_50_GBPS; case 160: return IBV_RATE_400_GBPS; case 240: return IBV_RATE_600_GBPS; + case 320: return IBV_RATE_800_GBPS; + case 480: return IBV_RATE_1200_GBPS; default: return IBV_RATE_MAX; } } @@ -163,6 +167,8 @@ int __attribute__((const)) ibv_rate_to_mbps(enum ibv_rate rate) case IBV_RATE_50_GBPS: return 53125; case IBV_RATE_400_GBPS: return 425000; case IBV_RATE_600_GBPS: return 637500; + case IBV_RATE_800_GBPS: return 850000; + case IBV_RATE_1200_GBPS: return 1275000; default: return -1; } } @@ -191,6 +197,8 @@ enum ibv_rate __attribute__((const)) mbps_to_ibv_rate(int mbps) case 53125: return IBV_RATE_50_GBPS; case 425000: return IBV_RATE_400_GBPS; case 637500: return IBV_RATE_600_GBPS; + case 850000: return IBV_RATE_800_GBPS; + case 1275000: return IBV_RATE_1200_GBPS; default: return IBV_RATE_MAX; } } diff --git a/contrib/ofed/libibverbs/verbs.h b/contrib/ofed/libibverbs/verbs.h index 498275561280..8a76dfdf7fd5 100644 --- a/contrib/ofed/libibverbs/verbs.h +++ b/contrib/ofed/libibverbs/verbs.h @@ -595,6 +595,8 @@ enum ibv_rate { IBV_RATE_50_GBPS = 20, IBV_RATE_400_GBPS = 21, IBV_RATE_600_GBPS = 22, + IBV_RATE_800_GBPS = 23, + IBV_RATE_1200_GBPS = 24, }; /**