Module Name: src
Committed By: ozaki-r
Date: Fri Feb 17 03:57:18 UTC 2017
Modified Files:
src/sys/net: if.c if.h
src/sys/netinet6: icmp6.c in6_src.c ip6_output.c
Log Message:
Rename if_acquire_NOMPSAFE to if_acquire
It can be used in MP-safe ways. So let's remove the confusing postfix.
If it's used in a unsafe way, warn NOMPSAFE in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 src/sys/net/if.c
cvs rdiff -u -r1.233 -r1.234 src/sys/net/if.h
cvs rdiff -u -r1.209 -r1.210 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.78 -r1.79 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.183 -r1.184 src/sys/netinet6/ip6_output.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.379 src/sys/net/if.c:1.380
--- src/sys/net/if.c:1.379 Thu Feb 16 08:13:43 2017
+++ src/sys/net/if.c Fri Feb 17 03:57:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.379 2017/02/16 08:13:43 knakahara Exp $ */
+/* $NetBSD: if.c,v 1.380 2017/02/17 03:57:17 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.379 2017/02/16 08:13:43 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.380 2017/02/17 03:57:17 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -2663,12 +2663,12 @@ if_get_byindex(u_int idx, struct psref *
}
/*
- * XXX it's safe only if the passed ifp is guaranteed to not be freed,
- * for example the ifp is already held or some other object is held which
- * guarantes the ifp to not be freed indirectly.
+ * Note that it's safe only if the passed ifp is guaranteed to not be freed,
+ * for example using pserialize or the ifp is already held or some other
+ * object is held which guarantes the ifp to not be freed indirectly.
*/
void
-if_acquire_NOMPSAFE(struct ifnet *ifp, struct psref *psref)
+if_acquire(struct ifnet *ifp, struct psref *psref)
{
KASSERT(ifp->if_index != 0);
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.233 src/sys/net/if.h:1.234
--- src/sys/net/if.h:1.233 Thu Dec 22 03:46:51 2016
+++ src/sys/net/if.h Fri Feb 17 03:57:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.233 2016/12/22 03:46:51 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.234 2017/02/17 03:57:17 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -971,7 +971,7 @@ struct ifnet *if_get(const char *, struc
ifnet_t *if_byindex(u_int);
ifnet_t *if_get_byindex(u_int, struct psref *);
void if_put(const struct ifnet *, struct psref *);
-void if_acquire_NOMPSAFE(struct ifnet *, struct psref *);
+void if_acquire(struct ifnet *, struct psref *);
static inline if_index_t
if_get_index(const struct ifnet *ifp)
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.209 src/sys/netinet6/icmp6.c:1.210
--- src/sys/netinet6/icmp6.c:1.209 Mon Feb 13 07:18:20 2017
+++ src/sys/netinet6/icmp6.c Fri Feb 17 03:57:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.209 2017/02/13 07:18:20 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.210 2017/02/17 03:57:17 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.209 2017/02/13 07:18:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.210 2017/02/17 03:57:17 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1793,7 +1793,7 @@ ni6_addrs(struct icmp6_nodeinfo *ni6, st
addrsofif++; /* count the address */
}
if (iffound) {
- if_acquire_NOMPSAFE(ifp, psref);
+ if_acquire(ifp, psref);
pserialize_read_exit(s);
*ifpp = ifp;
return (addrsofif);
Index: src/sys/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.78 src/sys/netinet6/in6_src.c:1.79
--- src/sys/netinet6/in6_src.c:1.78 Mon Jan 16 15:44:47 2017
+++ src/sys/netinet6/in6_src.c Fri Feb 17 03:57:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.78 2017/01/16 15:44:47 christos Exp $ */
+/* $NetBSD: in6_src.c,v 1.79 2017/02/17 03:57:17 ozaki-r Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.78 2017/01/16 15:44:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.79 2017/02/17 03:57:17 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -773,7 +773,7 @@ getroute:
!if_is_deactivated(rt->rt_ifa->ifa_ifp)) {
if_put(*retifp, psref);
*retifp = rt->rt_ifa->ifa_ifp;
- if_acquire_NOMPSAFE(*retifp, psref);
+ if_acquire(*retifp, psref);
}
out:
rtcache_unref(rt, ro);
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.183 src/sys/netinet6/ip6_output.c:1.184
--- src/sys/netinet6/ip6_output.c:1.183 Tue Feb 14 03:05:06 2017
+++ src/sys/netinet6/ip6_output.c Fri Feb 17 03:57:17 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.183 2017/02/14 03:05:06 ozaki-r Exp $ */
+/* $NetBSD: ip6_output.c,v 1.184 2017/02/17 03:57:17 ozaki-r Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.183 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.184 2017/02/17 03:57:17 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -582,7 +582,7 @@ ip6_output(
origifp = ia->ia_ifp;
if (if_is_deactivated(origifp))
goto bad;
- if_acquire_NOMPSAFE(origifp, &psref_ia);
+ if_acquire(origifp, &psref_ia);
release_psref_ia = true;
} else
origifp = ifp;
