Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2019 11:12:31 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353547 - head/sys/ofed/drivers/infiniband/core
Message-ID:  <201910151112.x9FBCVb8093909@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Tue Oct 15 11:12:31 2019
New Revision: 353547
URL: https://svnweb.freebsd.org/changeset/base/353547

Log:
  Fix missing epochification of the ibcore code after r353292.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/ofed/drivers/infiniband/core/ib_addr.c

Modified: head/sys/ofed/drivers/infiniband/core/ib_addr.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ib_addr.c	Tue Oct 15 11:11:21 2019	(r353546)
+++ head/sys/ofed/drivers/infiniband/core/ib_addr.c	Tue Oct 15 11:12:31 2019	(r353547)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
  * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
- * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
+ * Copyright (c) 1999-2019, Mellanox Technologies, Inc. All rights reserved.
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -676,6 +676,7 @@ static int addr_resolve(struct sockaddr *src_in,
 			const struct sockaddr *dst_in,
 			struct rdma_dev_addr *addr)
 {
+	struct epoch_tracker et;
 	struct net_device *ndev = NULL;
 	u8 edst[MAX_ADDR_LEN];
 	int ret;
@@ -683,6 +684,7 @@ static int addr_resolve(struct sockaddr *src_in,
 	if (dst_in->sa_family != src_in->sa_family)
 		return -EINVAL;
 
+	NET_EPOCH_ENTER(et);
 	switch (src_in->sa_family) {
 	case AF_INET:
 		ret = addr4_resolve((struct sockaddr_in *)src_in,
@@ -698,6 +700,7 @@ static int addr_resolve(struct sockaddr *src_in,
 		ret = -EADDRNOTAVAIL;
 		break;
 	}
+	NET_EPOCH_EXIT(et);
 
 	/* check for error */
 	if (ret != 0)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910151112.x9FBCVb8093909>