From owner-svn-src-all@freebsd.org Mon Mar 5 11:52:40 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 425EFF25BC8; Mon, 5 Mar 2018 11:52:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E6FA674D00; Mon, 5 Mar 2018 11:52:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1F5A2382E; Mon, 5 Mar 2018 11:52:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w25BqdBY024130; Mon, 5 Mar 2018 11:52:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w25Bqd0H024129; Mon, 5 Mar 2018 11:52:39 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803051152.w25Bqd0H024129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 5 Mar 2018 11:52:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330491 - head/sys/ofed/drivers/infiniband/core X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/ofed/drivers/infiniband/core X-SVN-Commit-Revision: 330491 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Mar 2018 11:52:40 -0000 Author: hselasky Date: Mon Mar 5 11:52:39 2018 New Revision: 330491 URL: https://svnweb.freebsd.org/changeset/base/330491 Log: Do not add RoCEv2 default GID in ibcore when IPv6 is disabled to honor the networking stack's IPv6 disabled setting. Else the offload HCA can start using IPv6 packets for QPs. MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/ofed/drivers/infiniband/core/ib_cache.c Modified: head/sys/ofed/drivers/infiniband/core/ib_cache.c ============================================================================== --- head/sys/ofed/drivers/infiniband/core/ib_cache.c Mon Mar 5 11:49:45 2018 (r330490) +++ head/sys/ofed/drivers/infiniband/core/ib_cache.c Mon Mar 5 11:52:39 2018 (r330491) @@ -42,6 +42,7 @@ #include #include #include +#include #include @@ -702,6 +703,16 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib make_default_gid(ndev, &gid); memset(&gid_attr, 0, sizeof(gid_attr)); gid_attr.ndev = ndev; + + /* Default GID is created using unique GUID and local subnet prefix, + * as described in section 4.1.1 and 3.5.10 in IB spec 1.3. + * Therefore don't create RoCEv2 default GID based on it that + * resembles as IPv6 GID based on link local address when IPv6 is + * disabled in kernel. + */ +#ifndef INET6 + gid_type_mask &= ~BIT(IB_GID_TYPE_ROCE_UDP_ENCAP); +#endif for (gid_type = 0; gid_type < IB_GID_TYPE_SIZE; ++gid_type) { int ix;