From patchwork Wed Jan 31 10:55:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Taranov X-Patchwork-Id: 194666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1804919dyb; Wed, 31 Jan 2024 02:58:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJmvQa/Hldh6YsF/wesZValsVtuNa3+mIPOTeDNAoC1SqI/O4fDZRFaKFYQ12EgflfTKdv X-Received: by 2002:a17:906:4c54:b0:a31:7c5a:bf5b with SMTP id d20-20020a1709064c5400b00a317c5abf5bmr890428ejw.5.1706698692432; Wed, 31 Jan 2024 02:58:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706698692; cv=pass; d=google.com; s=arc-20160816; b=QdIZCTwD+ZRimtTBtCnPS5vIGsWZ0iKu8AAAubXc3rqEns5y+nm1bBcK3eMyfd+yg7 F/VVCUrzW7DFL/e/WKR4HxbFR364dcyFS1lDlKFfswJ+rypc0ZOO0qMcMWFKS376f1TC BaIRIO30XVf0UDARu88HYX50IC/U/eUiItt48E9SDqEbggcV4Ez018EaVjRK4Hd4fZP9 oXAPNhU7i5jkDHQjCBoodCWUK1Lf9TuJh9+XJdWQecK3Q5IglNxfWxEA5gNy5ZMoTDAC VmRnT93N9EBVQG4zyO05mjzZLpf5rhHxu23QoBYhOlsp0s5by4RTjtlk7i/45DBj5QOb X1Zw== 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=MsUo2v+//cFlf6nJMuZ1DMVlU3JLOjmKGXGXkSEimVc=; fh=8cSdD2SqmPcUE0CahARU+BdvX89R4Uu2s29jd8JN50I=; b=avV+XRpcRxaQPnwaZCZYB8YavUU+GmHCzbsEc5hREszJZOVpsoX3saF9NVh39vehOD JLAEx3lidg2GIjctobQ7LBWMbTTI4dQB51WBl7HNwuLx0DQVHOi9Nd0/xFjc9mjgbHPj BVC/Kp2YG68fvfBODFbcwk1qOplmax1ScjOVPg8czBaB5gQcIkrKXsbTL3db9ivBikSA ZHNZ4JLefyiutF6qUvkgEnWnkRPP1LJ/bQoauTAXJQZjWu+CkMxrIqXI1t42AehWOx/Q 6LvlfKA2Rj8mO//QDywWWlyBfcG7FVYNZh3VjonhyXYLsOSWflR6gWLmgGxl0edyxEc9 QcGQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=L7xBFSUO; 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-46279-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46279-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com X-Forwarded-Encrypted: i=1; AJvYcCVzWnWUtyJNmfdqprXvsvpmOsCoDVNt/i1LMkK2HTL0FkPrRTffKl0jYwEJRWpf2J1hufBM7ajrivK2P68LkXNviExxtA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id kg27-20020a17090776fb00b00a332e92241csi5355205ejc.307.2024.01.31.02.58.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 02:58:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46279-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=L7xBFSUO; 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-46279-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46279-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 81D761F2190A for ; Wed, 31 Jan 2024 10:58:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0046C79DAE; Wed, 31 Jan 2024 10:56:06 +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="L7xBFSUO" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AADA26EB6E; Wed, 31 Jan 2024 10:55:59 +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=1706698562; cv=none; b=rqiMAmIWyl1rbYzFsiC5qw69D0kNVdLFegsSsr6hKblcGL3Ome+Slfoe25qR9QKQpkedXFsjUto45t195K8C/A3uXqJPxB5MKP7Of3lMbKd2LfeTGojgP9HKijSPh1cmUTodm9zDP/b+8HSI7XObST4HdiwEi9vs9r8b3OExf3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698562; c=relaxed/simple; bh=LHBIj/8uoDBRrS1dlZPeCz2qf0GZ0mc5vqMb8Dcyy6U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=sSfJqTRaFhIlREW0cMpPSoS3WWTve1HRpfs/X/LuJhQgILvlJcGvq5E+W20HYvaLNJ4+iO2SktQrlmAnxWQozpv+tEGgHCqG9pmncRgiYPB9j12SsC+fa6uDcN8jAnrqt1fmXUQcVFFQbkAwHplkZwhvQtoW6wsNLOlVgRhKM9s= 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=L7xBFSUO; 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 1859020B2005; Wed, 31 Jan 2024 02:55:58 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1859020B2005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1706698558; bh=MsUo2v+//cFlf6nJMuZ1DMVlU3JLOjmKGXGXkSEimVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7xBFSUON0y+jHp0RHicnx4GOcP3xCMFb6wyib2qcVkrCV4YXENV/EBgdnPq/AW1T t6fjax+zreYGHyrT/FTObwgcTI2XXzPsHWPiSMa5jFGT72oV3Ng9dnZiazoqVyWkX1 Rd8KPyE++IipAvl46yMwOVL88ODVAnYR0pVsveXY= 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 v1 5/5] RDMA/mana_ib: Adding and deleting GIDs Date: Wed, 31 Jan 2024 02:55:52 -0800 Message-Id: <1706698552-25383-6-git-send-email-kotaranov@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1706698552-25383-1-git-send-email-kotaranov@linux.microsoft.com> References: <1706698552-25383-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: 1789603288201511785 X-GMAIL-MSGID: 1789603288201511785 Implement add_gid and del_gid for RNIC. We support ipv4 and ipv6 addresses. Signed-off-by: Konstantin Taranov --- drivers/infiniband/hw/mana/device.c | 2 ++ drivers/infiniband/hw/mana/main.c | 66 ++++++++++++++++++++++++++++++++++++ drivers/infiniband/hw/mana/mana_ib.h | 37 ++++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c index b9ff3fd..9655307 100644 --- a/drivers/infiniband/hw/mana/device.c +++ b/drivers/infiniband/hw/mana/device.c @@ -15,6 +15,7 @@ .driver_id = RDMA_DRIVER_MANA, .uverbs_abi_ver = MANA_IB_UVERBS_ABI_VERSION, + .add_gid = mana_ib_gd_add_gid, .alloc_pd = mana_ib_alloc_pd, .alloc_ucontext = mana_ib_alloc_ucontext, .create_cq = mana_ib_create_cq, @@ -23,6 +24,7 @@ .create_wq = mana_ib_create_wq, .dealloc_pd = mana_ib_dealloc_pd, .dealloc_ucontext = mana_ib_dealloc_ucontext, + .del_gid = mana_ib_gd_del_gid, .dereg_mr = mana_ib_dereg_mr, .destroy_cq = mana_ib_destroy_cq, .destroy_qp = mana_ib_destroy_qp, diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index 645abf3..282c024 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -675,3 +675,69 @@ void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev) mdev->adapter_handle = INVALID_MANA_HANDLE; mana_ib_destroy_eqs(mdev); } + +int mana_ib_gd_add_gid(const struct ib_gid_attr *attr, void **context) +{ + struct mana_ib_dev *mdev = container_of(attr->device, struct mana_ib_dev, ib_dev); + enum rdma_network_type ntype = rdma_gid_attr_network_type(attr); + struct mana_rnic_config_addr_resp resp = {}; + struct gdma_context *gc = mdev_to_gc(mdev); + struct mana_rnic_config_addr_req req = {}; + int err; + + if (!rnic_is_enabled(mdev)) + return -EINVAL; + + if (ntype != RDMA_NETWORK_IPV4 && ntype != RDMA_NETWORK_IPV6) { + ibdev_dbg(&mdev->ib_dev, "Unsupported rdma network type %d", ntype); + return -EINVAL; + } + + mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR, sizeof(req), sizeof(resp)); + req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.op = ADDR_OP_ADD; + req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 : SGID_TYPE_IPV4; + copy_in_reverse(req.ip_addr, attr->gid.raw, sizeof(union ib_gid)); + + err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp); + if (err) { + ibdev_err(&mdev->ib_dev, "Failed to config IP addr err %d\n", err); + return err; + } + + return 0; +} + +int mana_ib_gd_del_gid(const struct ib_gid_attr *attr, void **context) +{ + struct mana_ib_dev *mdev = container_of(attr->device, struct mana_ib_dev, ib_dev); + enum rdma_network_type ntype = rdma_gid_attr_network_type(attr); + struct mana_rnic_config_addr_resp resp = {}; + struct gdma_context *gc = mdev_to_gc(mdev); + struct mana_rnic_config_addr_req req = {}; + int err; + + if (!rnic_is_enabled(mdev)) + return -EINVAL; + + if (ntype != RDMA_NETWORK_IPV4 && ntype != RDMA_NETWORK_IPV6) { + ibdev_dbg(&mdev->ib_dev, "Unsupported rdma network type %d", ntype); + return -EINVAL; + } + + mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR, sizeof(req), sizeof(resp)); + req.hdr.dev_id = gc->mana_ib.dev_id; + req.adapter = mdev->adapter_handle; + req.op = ADDR_OP_REMOVE; + req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 : SGID_TYPE_IPV4; + copy_in_reverse(req.ip_addr, attr->gid.raw, sizeof(union ib_gid)); + + err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp); + if (err) { + ibdev_err(&mdev->ib_dev, "Failed to config IP addr err %d\n", err); + return err; + } + + return 0; +} diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 196f3c8..2a3e3b0 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -118,6 +118,7 @@ enum mana_ib_command_code { MANA_IB_GET_ADAPTER_CAP = 0x30001, MANA_IB_CREATE_ADAPTER = 0x30002, MANA_IB_DESTROY_ADAPTER = 0x30003, + MANA_IB_CONFIG_IP_ADDR = 0x30004, }; struct mana_ib_query_adapter_caps_req { @@ -167,6 +168,30 @@ struct mana_rnic_destroy_adapter_resp { struct gdma_resp_hdr hdr; }; /* HW Data */ +enum mana_ib_addr_op { + ADDR_OP_ADD = 1, + ADDR_OP_REMOVE, +}; + +enum sgid_entry_type { + SGID_TYPE_INVALID = 0, + SGID_TYPE_IPV4 = 1, + SGID_TYPE_IPV6 = 2, + SGID_TYPE_HYBRID = 3 +}; + +struct mana_rnic_config_addr_req { + struct gdma_req_hdr hdr; + mana_handle_t adapter; + enum mana_ib_addr_op op; + enum sgid_entry_type sgid_type; + u8 ip_addr[16]; +}; /* HW Data */ + +struct mana_rnic_config_addr_resp { + struct gdma_resp_hdr hdr; +}; /* HW Data */ + static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) { return mdev->adapter_handle != INVALID_MANA_HANDLE; @@ -188,6 +213,14 @@ static inline struct net_device *mana_ib_get_netdev(struct ib_device *ibdev, u32 return mc->ports[port - 1]; } +static inline void copy_in_reverse(u8 *dst, const u8 *src, u32 size) +{ + u32 i; + + for (i = 0; i < size; i++) + dst[size - 1 - i] = src[i]; +} + int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq); int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, @@ -266,4 +299,8 @@ int mana_ib_query_gid(struct ib_device *ibdev, u32 port, int index, int mana_ib_query_pkey(struct ib_device *ibdev, u32 port, u16 index, u16 *pkey); enum rdma_link_layer mana_ib_get_link_layer(struct ib_device *device, u32 port_num); + +int mana_ib_gd_add_gid(const struct ib_gid_attr *attr, void **context); + +int mana_ib_gd_del_gid(const struct ib_gid_attr *attr, void **context); #endif