From patchwork Fri Feb 2 15:06:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Taranov X-Patchwork-Id: 195901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp503653dyc; Fri, 2 Feb 2024 07:27:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IF51MPaOXSC0CBBBMR6o8PkZeAvkug9rMeMrQ2kpF0oR/DPqdtrOdnJRaBov+Z79LYp2jce X-Received: by 2002:a05:6a20:a622:b0:19c:60e7:a984 with SMTP id bb34-20020a056a20a62200b0019c60e7a984mr7228641pzb.27.1706887660816; Fri, 02 Feb 2024 07:27:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706887660; cv=pass; d=google.com; s=arc-20160816; b=FAQrmpOroTEfSDYOtnemmMSsx0GZxXreaKD1+9yAE1rFeSZxcckB2yOcmQYBgj9slS PwNyVG2J/EH00Bwj5hpY/QYhyQinbevKFZDPpLJePWi2XzmVzyrS9s6EwDzApekyjmpE DulMdlo02xbKEj1fkgCREEDwx3YX+YHb/B0+EfvqHuF5a/JCIttsACKBi7pxEMJ/lllg DS7pfVflYaAIsP6VWw5nWhSDVDTT6r+q+JZ7ZFrimiJdgDe/xY2goPsDW7BlejIYDSfn dmIExcXGK5f5op1ttlKMN22/UApzybvdcG3BETcDa5Gp4eNX4t5JWHFo66jSpVN7y7YX NUKQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :dkim-filter; bh=tbOBGmywCw1yErcHhceCuwXOroc2dZSPwsDCR0qMCyY=; fh=ZJeiJVmo+pSwNhzUhR6QCdI8QduT/Yu+7go1sxxTxaY=; b=qxcrP5I3BiXCV7a5aAEih00KNcpryybtyXUCdK84Bno1Q7UH9PuJy5p0iFqwfuW91G jyIhPq8xS8HlX+QZkGYCP+OrqMweZimrCy2gEMiq47t5+JvA2OsQyeOz6TOB3cqhm2OM HuveEaapxRbZDfWwL6mk7Y0qvcnK1Xbo+E00StxOVvFpC9AQ7pfalVh15xafJD8N0Bep HSLbM7P/h5IyAsYB6lXzi/ySA72WM4AJEKYCH5uDxmBN29OxpcLENUzS2GUptkPJ0svp GuGY3AboiReTIG+MoqskJs+GpXzT49phWIeCPjNXG2LdtKSkJEkpthn16dOHynEOFbFt LuWg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=L9d5b9x0; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-49988-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49988-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com X-Forwarded-Encrypted: i=1; AJvYcCWmT/ox29Rca1KR/37uEAIH8W6l22bok62ha4FYJh7+87WGyt9DBKs+BqsFDMbpLJIbI9B4Cn9jSKh7DGzSCJw5JPTaqw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id y19-20020a62b513000000b006dbbae74070si1693820pfe.184.2024.02.02.07.27.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 07:27:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-49988-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=L9d5b9x0; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-49988-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-49988-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id E82F2B2B36A for ; Fri, 2 Feb 2024 15:08:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F0A171474BF; Fri, 2 Feb 2024 15:06:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="L9d5b9x0" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8BE13145341; Fri, 2 Feb 2024 15:06:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706886413; cv=none; b=gyFGmRGkwA7jDklzCByPdf14flw277O315aB+qO4w8fmUTQEqeFJCAO+hWMJaUInvY4XX+h2XDlfyMew0hXW18HO6YWr313ZvVkqW3eC9VAKnhncApOmyDijGrnj+CuvmvenPpd2EJPTzPYtRnxKjTkXa4GHrL8syM6NeoNhsJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706886413; c=relaxed/simple; bh=xIgDQeQggRzU0YUbTvsi5ADzqvMrctEjnbNPqcT5orI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Vt62EdGECu97VUMiPV+cmUF60hMpw5M8FazOdRvOdYiVQu5kU2pjmmUJbKLVLmVFa35IFT3faQPtE77zbbN34hLvFDsNV7a01d+UE1eUW1XLdwnG8hSPHv+7YJoIejW3EGOhA6Mm6e12/V28jpgbfEJ5qWspJrRfG0iLTPFlQCw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=L9d5b9x0; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 9CAFF20B2004; Fri, 2 Feb 2024 07:06:45 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9CAFF20B2004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1706886405; bh=tbOBGmywCw1yErcHhceCuwXOroc2dZSPwsDCR0qMCyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9d5b9x09yTEVlhqzmyDmgdBpcsfrZGnqOCy+kbh+bYb2ZKG8k/3CnwyuCrCJOOlX Mso9fdUN3BuWhJUuPOEvWa30dJ6YD/xgA9Ao7mXREHJNZY0nj2jX665hYRO7TjvhyH HS9nC6DExliRmNyLfA8f1u/QBzgLoo0x7s0j1Nx0= From: Konstantin Taranov To: kotaranov@microsoft.com, sharmaajay@microsoft.com, longli@microsoft.com, jgg@ziepe.ca, leon@kernel.org Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next v2 4/5] RDMA/mana_ib: Enable RoCE on port 1 Date: Fri, 2 Feb 2024 07:06:36 -0800 Message-Id: <1706886397-16600-5-git-send-email-kotaranov@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1706886397-16600-1-git-send-email-kotaranov@linux.microsoft.com> References: <1706886397-16600-1-git-send-email-kotaranov@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789801435795821764 X-GMAIL-MSGID: 1789801435795821764 Set netdev and RoCEv2 flag to be used in GID population. We need GIDs of the master netdev and mc->ports stores slave devices. Signed-off-by: Konstantin Taranov --- drivers/infiniband/hw/mana/device.c | 15 +++++++++++++++ drivers/infiniband/hw/mana/main.c | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c index 11b0410..2b362f5 100644 --- a/drivers/infiniband/hw/mana/device.c +++ b/drivers/infiniband/hw/mana/device.c @@ -53,6 +53,7 @@ static int mana_ib_probe(struct auxiliary_device *adev, { struct mana_adev *madev = container_of(adev, struct mana_adev, adev); struct gdma_dev *mdev = madev->mdev; + struct net_device *upper_ndev; struct mana_context *mc; struct mana_ib_dev *dev; int ret; @@ -79,6 +80,20 @@ static int mana_ib_probe(struct auxiliary_device *adev, dev->ib_dev.num_comp_vectors = 1; dev->ib_dev.dev.parent = mdev->gdma_context->dev; + rcu_read_lock(); /* required to get upper dev */ + upper_ndev = netdev_master_upper_dev_get_rcu(mc->ports[0]); + if (!upper_ndev) { + rcu_read_unlock(); + ibdev_err(&dev->ib_dev, "Failed to get master netdev"); + goto free_ib_device; + } + ret = ib_device_set_netdev(&dev->ib_dev, upper_ndev, 1); + rcu_read_unlock(); + if (ret) { + ibdev_err(&dev->ib_dev, "Failed to set ib netdev, ret %d", ret); + goto free_ib_device; + } + ret = mana_gd_register_device(&mdev->gdma_context->mana_ib); if (ret) { ibdev_err(&dev->ib_dev, "Failed to register device, ret %d", diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index 3e05a62..645abf3 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -462,11 +462,19 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma) int mana_ib_get_port_immutable(struct ib_device *ibdev, u32 port_num, struct ib_port_immutable *immutable) { - /* - * This version only support RAW_PACKET - * other values need to be filled for other types - */ + struct mana_ib_dev *mdev = container_of(ibdev, struct mana_ib_dev, ib_dev); + struct ib_port_attr attr; + int err; + + err = ib_query_port(ibdev, port_num, &attr); + if (err) + return err; + + immutable->pkey_tbl_len = attr.pkey_tbl_len; + immutable->gid_tbl_len = attr.gid_tbl_len; immutable->core_cap_flags = RDMA_CORE_PORT_RAW_PACKET; + if (port_num == 1 && rnic_is_enabled(mdev)) + immutable->core_cap_flags |= RDMA_CORE_PORT_IBA_ROCE_UDP_ENCAP; return 0; }