From patchwork Tue Nov 22 19:38:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dasaratharaman Chandramouli X-Patchwork-Id: 9442029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 52A45605EE for ; Tue, 22 Nov 2016 19:42:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EC551FF0B for ; Tue, 22 Nov 2016 19:42:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 334C41FF15; Tue, 22 Nov 2016 19:42:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3D031FF0B for ; Tue, 22 Nov 2016 19:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933958AbcKVTmq (ORCPT ); Tue, 22 Nov 2016 14:42:46 -0500 Received: from mga06.intel.com ([134.134.136.31]:62859 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933969AbcKVTmp (ORCPT ); Tue, 22 Nov 2016 14:42:45 -0500 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP; 22 Nov 2016 11:42:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,682,1473145200"; d="scan'208";a="33543032" Received: from phwtpriv01.ph.intel.com ([10.228.208.76]) by orsmga004.jf.intel.com with ESMTP; 22 Nov 2016 11:42:43 -0800 From: Dasaratharaman Chandramouli To: Dasaratharaman Chandramouli , Ira Weiny , Don Hiatt , linux-rdma , Doug Ledford Subject: [PATCH v2 10/11] IB/IPoIB: Modify ipoib_get_net_dev_by_params to lookup gid table Date: Tue, 22 Nov 2016 14:38:51 -0500 Message-Id: <1479843532-47496-11-git-send-email-dasaratharaman.chandramouli@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1479843532-47496-1-git-send-email-dasaratharaman.chandramouli@intel.com> References: <1479843532-47496-1-git-send-email-dasaratharaman.chandramouli@intel.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ipoib_get_net_dev_by_params compares incoming gid with local_gid which is gid at index 0 of the gid table. OPA devices using larger LIDs may have a different GID format than whats setup in the local_gid field. Do a search of the gid table in those cases. Reviewed-by: Ira Weiny Signed-off-by: Dasaratharaman Chandramouli Signed-off-by: Don Hiatt --- drivers/infiniband/ulp/ipoib/ipoib_main.c | 37 +++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 474c3bf..3e135df 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -328,6 +328,40 @@ static struct net_device *ipoib_get_net_dev_match_addr( return result; } +/* retuns true if the incoming gid is assigned to the IPoIB + * netdev interface + * + * OPA devices may have the incoming GID in the OPA GID + * format which might not necessarily be assigned to the + * netdev interface. This necessitates searching the GID + * table to match this OPA GID. + */ +static bool ipoib_check_gid(struct ipoib_dev_priv *priv, + const union ib_gid *gid) +{ + bool is_local_gid; + struct ib_port_attr attr; + union ib_gid port_gid; + int i; + + if (!gid) + return true; + + is_local_gid = !memcmp(gid, &priv->local_gid, sizeof(*gid)); + + if (!rdma_cap_opa_ah(priv->ca, priv->port) || is_local_gid) + return is_local_gid; + + if (ib_query_port(priv->ca, priv->port, &attr)) + return false; + for (i = 1; i < attr.gid_tbl_len; i++) { + if (ib_query_gid(priv->ca, priv->port, i, &port_gid, NULL)) + return false; + if (!memcmp(gid, &port_gid, sizeof(*gid))) + return true; + } + return false; +} /* returns the number of IPoIB netdevs on top a given ipoib device matching a * pkey_index and address, if one exists. * @@ -344,8 +378,7 @@ static int ipoib_match_gid_pkey_addr(struct ipoib_dev_priv *priv, struct net_device *net_dev = NULL; int matches = 0; - if (priv->pkey_index == pkey_index && - (!gid || !memcmp(gid, &priv->local_gid, sizeof(*gid)))) { + if (priv->pkey_index == pkey_index && ipoib_check_gid(priv, gid)) { if (!addr) { net_dev = ipoib_get_master_net_dev(priv->dev); } else {