From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 832ABC3A5A9 for ; Mon, 4 May 2020 05:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DBF82075B for ; Mon, 4 May 2020 05:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588569593; bh=IughnuWgk7vyxiL1NsJ6relHN90Xw0tc8mA37mo+0No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WGZ5al7iTsp+npKaFmHNiH3Gz/H7Nc19GrVdwNAykv5UyQSz65HlKsDh+8hqyQefc Fyyp7yti/VEY3VEgQ16FOQSPsHdDZHAUqF/npWtYXmH/yCsu4FcC93WDoO0YyMUpEv ZdnxCaDebvlfimqCXOleXS+PQ8KVmiho/lIHd+XI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727094AbgEDFTw (ORCPT ); Mon, 4 May 2020 01:19:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:56730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726509AbgEDFTw (ORCPT ); Mon, 4 May 2020 01:19:52 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FF3220746; Mon, 4 May 2020 05:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588569591; bh=IughnuWgk7vyxiL1NsJ6relHN90Xw0tc8mA37mo+0No=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x8CzmnbLIBCsL9PzqjCpKU24QuzH1ZzK2kiy9Uvn7XDaGdmfTNFHum1WXHf58h5ip cXr4VqauVZTBKwpO+jjwuLZCbWx2s07fU+DcdiXmwpobTCr/3zRRsNAS4OuckiGCIW fEdEH5rAtDzQldgvVBqeMNjt+40I7+fb/Dw/mc3Y= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Mark Zhang , linux-rdma@vger.kernel.org, Maor Gottlieb Subject: [PATCH rdma-next v3 4/5] RDMA/cma: Initialize the flow label of CM's route path record Date: Mon, 4 May 2020 08:19:34 +0300 Message-Id: <20200504051935.269708-5-leon@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504051935.269708-1-leon@kernel.org> References: <20200504051935.269708-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Mark Zhang If flow label is not set by the user or it's not IPv4, initialize it with the cma src/dst based on the "Kernighan and Ritchie's hash function". Signed-off-by: Mark Zhang Reviewed-by: Maor Gottlieb Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cma.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 6406a597dfb6..e74c2ba82e7b 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -2909,6 +2909,24 @@ static int iboe_tos_to_sl(struct net_device *ndev, int tos) return 0; } +static __be32 cma_get_roce_udp_flow_label(struct rdma_id_private *id_priv) +{ + struct sockaddr_in6 *addr6; + u16 dport, sport; + u32 hash, fl; + + addr6 = (struct sockaddr_in6 *)cma_src_addr(id_priv); + fl = be32_to_cpu(addr6->sin6_flowinfo) & IB_GRH_FLOWLABEL_MASK; + if ((cma_family(id_priv) != AF_INET6) || !fl) { + dport = be16_to_cpu(cma_port(cma_dst_addr(id_priv))); + sport = be16_to_cpu(cma_port(cma_src_addr(id_priv))); + hash = (u32)sport * 31 + dport; + fl = hash & IB_GRH_FLOWLABEL_MASK; + } + + return cpu_to_be32(fl); +} + static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) { struct rdma_route *route = &id_priv->id.route; @@ -2975,6 +2993,11 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) goto err2; } + if (rdma_protocol_roce_udp_encap(id_priv->id.device, + id_priv->id.port_num)) + route->path_rec->flow_label = + cma_get_roce_udp_flow_label(id_priv); + cma_init_resolve_route_work(work, id_priv); queue_work(cma_wq, &work->work); -- 2.26.2