d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire netisr.netisr_direct and netisr.netisr_direct_force sysctls.

Browse Source 
These were used to control/export dispatch policy but they're not anymore.
This commit cannot be MFC'ed to 9 because old netstat(9) binary relies
on such sysctl to work. On the other hand, there's no real reason to
keep'em around in 10.
This commit is contained in:
Davide Italiano 2013-09-06 21:02:43 +00:00
parent 7253197882
commit 933e681d93
1 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/net/netisr.c
View File

@ -153,19 +153,6 @@ SYSCTL_PROC(_net_isr, OID_AUTO, dispatch, CTLTYPE_STRING | CTLFLAG_RW |
CTLFLAG_TUN, 0, 0, sysctl_netisr_dispatch_policy, "A", CTLFLAG_TUN, 0, 0, sysctl_netisr_dispatch_policy, "A",
"netisr dispatch policy"); "netisr dispatch policy");
/*
* These sysctls were used in previous versions to control and export
* dispatch policy state. Now, we provide read-only export via them so that
* older netstat binaries work. At some point they can be garbage collected.
*/
static int netisr_direct_force;
SYSCTL_INT(_net_isr, OID_AUTO, direct_force, CTLFLAG_RD,
&netisr_direct_force, 0, "compat: force direct dispatch");
static int netisr_direct;
SYSCTL_INT(_net_isr, OID_AUTO, direct, CTLFLAG_RD, &netisr_direct, 0,
"compat: enable direct dispatch");
/* /*
* Allow the administrator to limit the number of threads (CPUs) to use for * Allow the administrator to limit the number of threads (CPUs) to use for
* netisr. We don't check netisr_maxthreads before creating the thread for * netisr. We don't check netisr_maxthreads before creating the thread for
@ -338,32 +325,6 @@ netisr_dispatch_policy_from_str(const char *str, u_int *dispatch_policyp)
return (EINVAL); return (EINVAL);
} }
static void
netisr_dispatch_policy_compat(void)
{
switch (netisr_dispatch_policy) {
case NETISR_DISPATCH_DEFERRED:
netisr_direct_force = 0;
netisr_direct = 0;
break;
case NETISR_DISPATCH_HYBRID:
netisr_direct_force = 0;
netisr_direct = 1;
break;
case NETISR_DISPATCH_DIRECT:
netisr_direct_force = 1;
netisr_direct = 1;
break;
default:
panic("%s: unknown policy %u", __func__,
netisr_dispatch_policy);
}
}
static int static int
sysctl_netisr_dispatch_policy(SYSCTL_HANDLER_ARGS) sysctl_netisr_dispatch_policy(SYSCTL_HANDLER_ARGS)
{ {
@ -379,10 +340,8 @@ sysctl_netisr_dispatch_policy(SYSCTL_HANDLER_ARGS)
&dispatch_policy); &dispatch_policy);
if (error == 0 && dispatch_policy == NETISR_DISPATCH_DEFAULT) if (error == 0 && dispatch_policy == NETISR_DISPATCH_DEFAULT)
error = EINVAL; error = EINVAL;
if (error == 0) { if (error == 0)
netisr_dispatch_policy = dispatch_policy; netisr_dispatch_policy = dispatch_policy;
netisr_dispatch_policy_compat();
}
} }
return (error); return (error);
} }
@ -1199,10 +1158,9 @@ netisr_init(void *arg)
&dispatch_policy); &dispatch_policy);
if (error == 0 && dispatch_policy == NETISR_DISPATCH_DEFAULT) if (error == 0 && dispatch_policy == NETISR_DISPATCH_DEFAULT)
error = EINVAL; error = EINVAL;
if (error == 0) { if (error == 0)
netisr_dispatch_policy = dispatch_policy; netisr_dispatch_policy = dispatch_policy;
netisr_dispatch_policy_compat(); else
} else
printf( printf(
"%s: invalid dispatch policy %s, using default\n", "%s: invalid dispatch policy %s, using default\n",
__func__, tmp); __func__, tmp);