From owner-svn-src-all@freebsd.org Wed Oct 16 08:56:08 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 244AB15FB13; Wed, 16 Oct 2019 08:56:08 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46tR3X09pQz4Svb; Wed, 16 Oct 2019 08:56:08 +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 DEB8749AF; Wed, 16 Oct 2019 08:56:07 +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 x9G8u7i7065579; Wed, 16 Oct 2019 08:56:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9G8u7Sg065578; Wed, 16 Oct 2019 08:56:07 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201910160856.x9G8u7Sg065578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 16 Oct 2019 08:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353633 - head/sys/ofed/include/rdma X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/sys/ofed/include/rdma X-SVN-Commit-Revision: 353633 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.29 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: Wed, 16 Oct 2019 08:56:08 -0000 Author: hselasky Date: Wed Oct 16 08:56:07 2019 New Revision: 353633 URL: https://svnweb.freebsd.org/changeset/base/353633 Log: VLAN_TRUNKDEV() requires epochification in ibcore after r353292. Sponsored by: Mellanox Technologies Modified: head/sys/ofed/include/rdma/ib_addr.h Modified: head/sys/ofed/include/rdma/ib_addr.h ============================================================================== --- head/sys/ofed/include/rdma/ib_addr.h Wed Oct 16 08:55:29 2019 (r353632) +++ head/sys/ofed/include/rdma/ib_addr.h Wed Oct 16 08:56:07 2019 (r353633) @@ -354,9 +354,13 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid) static inline struct net_device *rdma_vlan_dev_real_dev(struct net_device *dev) { - if (dev->if_type == IFT_ETHER && dev->if_pcp != IFNET_PCP_NONE) - return dev; /* prio-tagged traffic */ - return VLAN_TRUNKDEV(__DECONST(struct ifnet *, dev)); + struct epoch_tracker et; + + NET_EPOCH_ENTER(et); + if (dev->if_type != IFT_ETHER || dev->if_pcp == IFNET_PCP_NONE) + dev = VLAN_TRUNKDEV(dev); /* non prio-tagged traffic */ + NET_EPOCH_EXIT(et); + return (dev); } #endif /* IB_ADDR_H */