Module Name: src
Committed By: knakahara
Date: Mon Jun 27 08:58:50 UTC 2016
Modified Files:
src/sys/net: if.c if.h
Log Message:
reduce link state changing softint if it is not required
ok by ozaki-r@n.o
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/net/if.c
cvs rdiff -u -r1.215 -r1.216 src/sys/net/if.h
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.345 src/sys/net/if.c:1.346
--- src/sys/net/if.c:1.345 Wed Jun 22 10:44:32 2016
+++ src/sys/net/if.c Mon Jun 27 08:58:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.345 2016/06/22 10:44:32 knakahara Exp $ */
+/* $NetBSD: if.c,v 1.346 2016/06/27 08:58:50 knakahara 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.345 2016/06/22 10:44:32 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.346 2016/06/27 08:58:50 knakahara Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -640,9 +640,12 @@ if_initialize(ifnet_t *ifp)
IF_AFDATA_LOCK_INIT(ifp);
- ifp->if_link_si = softint_establish(SOFTINT_NET, if_link_state_change_si, ifp);
- if (ifp->if_link_si == NULL)
- panic("%s: softint_establish() failed", __func__);
+ if (if_is_link_state_chageable(ifp)) {
+ ifp->if_link_si = softint_establish(SOFTINT_NET,
+ if_link_state_change_si, ifp);
+ if (ifp->if_link_si == NULL)
+ panic("%s: softint_establish() failed", __func__);
+ }
PSLIST_ENTRY_INIT(ifp, if_pslist_entry);
psref_target_init(&ifp->if_psref, ifnet_psref_class);
@@ -1192,8 +1195,10 @@ again:
IF_AFDATA_LOCK_DESTROY(ifp);
- softint_disestablish(ifp->if_link_si);
- ifp->if_link_si = NULL;
+ if (if_is_link_state_chageable(ifp)) {
+ softint_disestablish(ifp->if_link_si);
+ ifp->if_link_si = NULL;
+ }
/*
* remove packets that came from ifp, from software interrupt queues.
@@ -1781,6 +1786,10 @@ if_link_state_change(struct ifnet *ifp,
{
int s, idx;
+ KASSERTMSG(if_is_link_state_chageable(ifp),
+ "%s: IFEF_NO_LINK_STATE_CHANGE must not be set, but if_extflags=0x%x",
+ ifp->if_xname, ifp->if_extflags);
+
/* Ensure change is to a valid state */
switch (link_state) {
case LINK_STATE_UNKNOWN: /* FALLTHROUGH */
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.215 src/sys/net/if.h:1.216
--- src/sys/net/if.h:1.215 Wed Jun 22 10:44:32 2016
+++ src/sys/net/if.h Mon Jun 27 08:58:50 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.215 2016/06/22 10:44:32 knakahara Exp $ */
+/* $NetBSD: if.h,v 1.216 2016/06/27 08:58:50 knakahara Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -381,8 +381,9 @@ typedef struct ifnet {
#define IFF_LINK2 0x4000 /* per link layer defined bit */
#define IFF_MULTICAST 0x8000 /* supports multicast */
-#define IFEF_OUTPUT_MPSAFE 0x0001 /* if_output() can run parallel */
-#define IFEF_START_MPSAFE 0x0002 /* if_start() can run parallel */
+#define IFEF_OUTPUT_MPSAFE __BIT(0) /* if_output() can run parallel */
+#define IFEF_START_MPSAFE __BIT(1) /* if_start() can run parallel */
+#define IFEF_NO_LINK_STATE_CHANGE __BIT(2) /* doesn't use link state interrupts */
#ifdef _KERNEL
static inline bool
@@ -428,6 +429,13 @@ if_start_lock(struct ifnet *ifp)
KERNEL_UNLOCK_ONE(NULL);
}
}
+
+static inline bool
+if_is_link_state_chageable(struct ifnet *ifp)
+{
+
+ return ((ifp->if_extflags & IFEF_NO_LINK_STATE_CHANGE) == 0);
+}
#endif /* _KERNEL */
#define IFFBITS \
