Module Name: src
Committed By: ozaki-r
Date: Mon Dec 11 03:25:46 UTC 2017
Modified Files:
src/sys/net: if.c if.h
src/sys/net/npf: npf_ifaddr.c npf_os.c
Log Message:
Rename IFNET_LOCK to IFNET_GLOBAL_LOCK
IFNET_LOCK will be used in another lock, if_ioctl_lock (might be renamed then).
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/sys/net/if.c
cvs rdiff -u -r1.251 -r1.252 src/sys/net/if.h
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/npf_ifaddr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/net/npf/npf_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.411 src/sys/net/if.c:1.412
--- src/sys/net/if.c:1.411 Fri Dec 8 05:22:23 2017
+++ src/sys/net/if.c Mon Dec 11 03:25:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.411 2017/12/08 05:22:23 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.412 2017/12/11 03:25:45 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.411 2017/12/08 05:22:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.412 2017/12/11 03:25:45 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -732,9 +732,9 @@ if_initialize(ifnet_t *ifp)
ifp->if_ioctl_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
LIST_INIT(&ifp->if_multiaddrs);
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
if_getindex(ifp);
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
return 0;
@@ -781,10 +781,10 @@ if_register(ifnet_t *ifp)
if (ifp->if_transmit == NULL || ifp->if_transmit == if_nulltransmit)
ifp->if_transmit = if_transmit;
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
TAILQ_INSERT_TAIL(&ifnet_list, ifp, if_list);
IFNET_WRITER_INSERT_TAIL(ifp);
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
}
/*
@@ -1317,12 +1317,12 @@ if_detach(struct ifnet *ifp)
if_deactivate(ifp);
mutex_exit(ifp->if_ioctl_lock);
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
ifindex2ifnet[ifp->if_index] = NULL;
TAILQ_REMOVE(&ifnet_list, ifp, if_list);
IFNET_WRITER_REMOVE(ifp);
pserialize_perform(ifnet_psz);
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
/* Wait for all readers to drain before freeing. */
psref_target_destroy(&ifp->if_psref, ifnet_psref_class);
@@ -1793,11 +1793,11 @@ ifa_insert(struct ifnet *ifp, struct ifa
ifa->ifa_ifp = ifp;
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
TAILQ_INSERT_TAIL(&ifp->if_addrlist, ifa, ifa_list);
IFADDR_ENTRY_INIT(ifa);
IFADDR_WRITER_INSERT_TAIL(ifp, ifa);
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
ifaref(ifa);
}
@@ -1808,13 +1808,13 @@ ifa_remove(struct ifnet *ifp, struct ifa
KASSERT(ifa->ifa_ifp == ifp);
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
TAILQ_REMOVE(&ifp->if_addrlist, ifa, ifa_list);
IFADDR_WRITER_REMOVE(ifa);
#ifdef NET_MPSAFE
pserialize_perform(ifnet_psz);
#endif
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
#ifdef NET_MPSAFE
psref_target_destroy(&ifa->ifa_psref, ifa_psref_class);
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.251 src/sys/net/if.h:1.252
--- src/sys/net/if.h:1.251 Fri Dec 8 05:22:23 2017
+++ src/sys/net/if.h Mon Dec 11 03:25:45 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.251 2017/12/08 05:22:23 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.252 2017/12/11 03:25:45 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -1185,9 +1185,9 @@ __END_DECLS
} \
} while (0)
-#define IFNET_LOCK() mutex_enter(&ifnet_mtx)
-#define IFNET_UNLOCK() mutex_exit(&ifnet_mtx)
-#define IFNET_LOCKED() mutex_owned(&ifnet_mtx)
+#define IFNET_GLOBAL_LOCK() mutex_enter(&ifnet_mtx)
+#define IFNET_GLOBAL_UNLOCK() mutex_exit(&ifnet_mtx)
+#define IFNET_GLOBAL_LOCKED() mutex_owned(&ifnet_mtx)
#define IFNET_READER_EMPTY() \
(PSLIST_READER_FIRST(&ifnet_pslist, struct ifnet, if_pslist_entry) == NULL)
Index: src/sys/net/npf/npf_ifaddr.c
diff -u src/sys/net/npf/npf_ifaddr.c:1.2 src/sys/net/npf/npf_ifaddr.c:1.3
--- src/sys/net/npf/npf_ifaddr.c:1.2 Tue Jan 3 00:58:05 2017
+++ src/sys/net/npf/npf_ifaddr.c Mon Dec 11 03:25:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $ */
+/* $NetBSD: npf_ifaddr.c,v 1.3 2017/12/11 03:25:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.2 2017/01/03 00:58:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ifaddr.c,v 1.3 2017/12/11 03:25:46 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -170,11 +170,11 @@ npf_ifaddr_syncall(npf_t *npf)
ifnet_t *ifp;
KERNEL_LOCK(1, NULL);
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
IFNET_WRITER_FOREACH(ifp) {
npf_ifaddr_sync(npf, ifp);
}
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
KERNEL_UNLOCK_ONE(NULL);
}
Index: src/sys/net/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.8 src/sys/net/npf/npf_os.c:1.9
--- src/sys/net/npf/npf_os.c:1.8 Fri Nov 17 07:37:12 2017
+++ src/sys/net/npf/npf_os.c Mon Dec 11 03:25:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_os.c,v 1.8 2017/11/17 07:37:12 ozaki-r Exp $ */
+/* $NetBSD: npf_os.c,v 1.9 2017/12/11 03:25:46 ozaki-r Exp $ */
/*-
* Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.8 2017/11/17 07:37:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.9 2017/12/11 03:25:46 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "pf.h"
@@ -313,11 +313,11 @@ npf_ifop_flush(void *arg)
ifnet_t *ifp;
KERNEL_LOCK(1, NULL);
- IFNET_LOCK();
+ IFNET_GLOBAL_LOCK();
IFNET_WRITER_FOREACH(ifp) {
ifp->if_pf_kif = arg;
}
- IFNET_UNLOCK();
+ IFNET_GLOBAL_UNLOCK();
KERNEL_UNLOCK_ONE(NULL);
}
