From patchwork Mon May 22 01:25:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Huang X-Patchwork-Id: 96953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1144616vqo; Sun, 21 May 2023 18:36:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7NNIRkvSDIOnVnlPLUMjBcIOgv2Ivc2xFeaHKcCvJyGSko6B5DbHg//Fs+U6zZJS7xdMOo X-Received: by 2002:a05:6a00:2d26:b0:64c:b45f:fc86 with SMTP id fa38-20020a056a002d2600b0064cb45ffc86mr11000519pfb.17.1684719369027; Sun, 21 May 2023 18:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684719369; cv=none; d=google.com; s=arc-20160816; b=ERxHoboM1a3VeXpjIeqFxPoL2Oi8cke5dveMFe3cqGI/SyX8Oo4zgfam9pJ7JyiK1g 0Ntf2jyaOe7bm2p0flgbgB6dqxfdWd3p8L+o9rBjmclkeDm1CTU3ZLekQdItrleyyEBn 0olTYw/BpVD7McZ39ReYt4QVJsHqwxlWXbFrn3Y5oXibSzn+8itzwkCn6smFslFeh9cC YtExcsz6z/BC5VHxox+hJwAvQdDtE0XG4zjK6xj4qauyDQ3cx7+HzOgayyfHUnbMxogq 72WQLWWBFb5iG39sF8xcWXAgFlLAmE8WhXvSWYr7IesGl/mspZBNpNOxmJl/29IeFy6G Z+zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=qaBxHnDrjoer/U7v4iX32rN9rt79/l60vBcA1l8XjXo=; b=RHKJ7nEbd5kgm7vIVGDH2f90CSgAru5wjZsUhzc25e5yXahv4RIquNX9/42baty8Uq ZLqe9w09VDcwulTLUYQvGnBCK50rnsL6Zm14zuVTI+1DKBPuP/gB+hHYQF55ikyqj4AZ GbB7wqMwQXSvUvVMOfc3r/Or8ko4YKEVzOJYvgMTG065nANZBdgwDBY6zu1v0O30Gs0x Ib3mwTtz757Ap5jFScgXvJbrbXLTZN4jKvrHAarmCZSln7t623DXKfuunPnhaj6pZk13 T1Ybd7/lWgeVockX67aNKT9iXM6u0eSdtKO0y1hZQzmyABWG3h1u52yR5rFzHAaiUfQy 6Lpg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 19-20020a631553000000b00534842ba605si3777591pgv.89.2023.05.21.18.35.56; Sun, 21 May 2023 18:36:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231197AbjEVB1M (ORCPT + 99 others); Sun, 21 May 2023 21:27:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229976AbjEVB1L (ORCPT ); Sun, 21 May 2023 21:27:11 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03189EB; Sun, 21 May 2023 18:27:07 -0700 (PDT) Received: from kwepemi500006.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QPfqZ4SpmzLpXM; Mon, 22 May 2023 09:24:10 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemi500006.china.huawei.com (7.221.188.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 22 May 2023 09:27:05 +0800 From: Junxian Huang To: , CC: , , , Subject: [PATCH for-next] RDMA/core: Get IB width and speed from netdev Date: Mon, 22 May 2023 09:25:02 +0800 Message-ID: <20230522012502.1529035-1-huangjunxian6@hisilicon.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500006.china.huawei.com (7.221.188.68) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766556296994021064?= X-GMAIL-MSGID: =?utf-8?q?1766556296994021064?= From: Haoyue Xu Logic of retrieving netdev lanes and speed from net_device and translating it to IB width and speed. Also, add a generic function to translating netdev speed to IB speed. Signed-off-by: Haoyue Xu Signed-off-by: Luoyouming Signed-off-by: Junxian Huang --- drivers/infiniband/core/verbs.c | 19 +++++++++++++++++-- include/rdma/ib_verbs.h | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index b99b3cc283b6..35f1b670600a 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -1880,11 +1880,19 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr, } EXPORT_SYMBOL(ib_modify_qp_with_udata); +static void ib_get_width_and_speed(u32 netdev_speed, u32 lanes, + u16 *speed, u8 *width) +{ + *width = ib_int_to_ib_width(lanes); + *speed = ib_eth_to_ib_speed(netdev_speed / lanes); +} + int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u16 *speed, u8 *width) { int rc; u32 netdev_speed; struct net_device *netdev; + bool cap_link_lanes_supported; struct ethtool_link_ksettings lksettings; if (rdma_port_get_link_layer(dev, port_num) != IB_LINK_LAYER_ETHERNET) @@ -1896,16 +1904,23 @@ int ib_get_eth_speed(struct ib_device *dev, u32 port_num, u16 *speed, u8 *width) rtnl_lock(); rc = __ethtool_get_link_ksettings(netdev, &lksettings); + cap_link_lanes_supported = netdev->ethtool_ops->cap_link_lanes_supported; rtnl_unlock(); dev_put(netdev); if (!rc && lksettings.base.speed != (u32)SPEED_UNKNOWN) { netdev_speed = lksettings.base.speed; + if (cap_link_lanes_supported && lksettings.lanes) { + ib_get_width_and_speed(netdev_speed, lksettings.lanes, + speed, width); + return 0; + } } else { netdev_speed = SPEED_1000; - pr_warn("%s speed is unknown, defaulting to %u\n", netdev->name, - netdev_speed); + if (rc) + pr_warn("%s speed is unknown, defaulting to %u\n", + netdev->name, netdev_speed); } if (netdev_speed <= SPEED_1000) { diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 1e7774ac808f..7dc926ec7fee 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -552,6 +552,18 @@ static inline int ib_width_enum_to_int(enum ib_port_width width) } } +static inline int ib_int_to_ib_width(u32 lanes) +{ + switch (lanes) { + case 1: return IB_WIDTH_1X; + case 2: return IB_WIDTH_2X; + case 4: return IB_WIDTH_4X; + case 8: return IB_WIDTH_8X; + case 12: return IB_WIDTH_12X; + default: return IB_WIDTH_1X; + } +} + enum ib_port_speed { IB_SPEED_SDR = 1, IB_SPEED_DDR = 2, @@ -563,6 +575,20 @@ enum ib_port_speed { IB_SPEED_NDR = 128, }; +static inline int ib_eth_to_ib_speed(u32 speed) +{ + switch (speed) { + case SPEED_2500: return IB_SPEED_SDR; + case SPEED_5000: return IB_SPEED_DDR; + case SPEED_10000: return IB_SPEED_FDR10; + case SPEED_14000: return IB_SPEED_FDR; + case SPEED_25000: return IB_SPEED_EDR; + case SPEED_50000: return IB_SPEED_HDR; + case SPEED_100000: return IB_SPEED_NDR; + default: return IB_SPEED_SDR; + } +} + enum ib_stat_flag { IB_STAT_FLAG_OPTIONAL = 1 << 0, };