Date: Mon, 1 Jun 2009 10:41:38 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/kern kern_poll.c src/sys/net netisr.c netisr.h rtsock.c src/sys/netatalk ddp_usrreq.c src/sys/netinet if_ether.c igmp.c ip_divert.c ip_input.c src/sys/netinet6 ip6_input.c vinet6.h src/sys/netipsec ipsec_input.c src/sys/netipx ipx_input.c ... Message-ID: <200906011044.n51AiTjP055813@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2009-06-01 10:41:38 UTC
FreeBSD src repository
Modified files:
sys/kern kern_poll.c
sys/net netisr.c netisr.h rtsock.c
sys/netatalk ddp_usrreq.c
sys/netinet if_ether.c igmp.c ip_divert.c ip_input.c
sys/netinet6 ip6_input.c vinet6.h
sys/netipsec ipsec_input.c
sys/netipx ipx_input.c
sys/netnatm natm_proto.c
sys/sys param.h pcpu.h
Log:
SVN rev 193219 on 2009-06-01 10:41:38Z by rwatson
Reimplement the netisr framework in order to support parallel netisr
threads:
- Support up to one netisr thread per CPU, each processings its own
workstream, or set of per-protocol queues. Threads may be bound
to specific CPUs, or allowed to migrate, based on a global policy.
In the future it would be desirable to support topology-centric
policies, such as "one netisr per package".
- Allow each protocol to advertise an ordering policy, which can
currently be one of:
NETISR_POLICY_SOURCE: packets must maintain ordering with respect to
an implicit or explicit source (such as an interface or socket).
NETISR_POLICY_FLOW: make use of mbuf flow identifiers to place work,
as well as allowing protocols to provide a flow generation function
for mbufs without flow identifers (m2flow). Falls back on
NETISR_POLICY_SOURCE if now flow ID is available.
NETISR_POLICY_CPU: allow protocols to inspect and assign a CPU for
each packet handled by netisr (m2cpuid).
- Provide utility functions for querying the number of workstreams
being used, as well as a mapping function from workstream to CPU ID,
which protocols may use in work placement decisions.
- Add explicit interfaces to get and set per-protocol queue limits, and
get and clear drop counters, which query data or apply changes across
all workstreams.
- Add a more extensible netisr registration interface, in which
protocols declare 'struct netisr_handler' structures for each
registered NETISR_ type. These include name, handler function,
optional mbuf to flow ID function, optional mbuf to CPU ID function,
queue limit, and ordering policy. Padding is present to allow these
to be expanded in the future. If no queue limit is declared, then
a default is used.
- Queue limits are now per-workstream, and raised from the previous
IFQ_MAXLEN default of 50 to 256.
- All protocols are updated to use the new registration interface, and
with the exception of netnatm, default queue limits. Most protocols
register as NETISR_POLICY_SOURCE, except IPv4 and IPv6, which use
NETISR_POLICY_FLOW, and will therefore take advantage of driver-
generated flow IDs if present.
- Formalize a non-packet based interface between interface polling and
the netisr, rather than having polling pretend to be two protocols.
Provide two explicit hooks in the netisr worker for start and end
events for runs: netisr_poll() and netisr_pollmore(), as well as a
function, netisr_sched_poll(), to allow the polling code to schedule
netisr execution. DEVICE_POLLING still embeds single-netisr
assumptions in its implementation, so for now if it is compiled into
the kernel, a single and un-bound netisr thread is enforced
regardless of tunable configuration.
In the default configuration, the new netisr implementation maintains
the same basic assumptions as the previous implementation: a single,
un-bound worker thread processes all deferred work, and direct dispatch
is enabled by default wherever possible.
Performance measurement shows a marginal performance improvement over
the old implementation due to the use of batched dequeue.
An rmlock is used to synchronize use and registration/unregistration
using the framework; currently, synchronized use is disabled
(replicating current netisr policy) due to a measurable 3%-6% hit in
ping-pong micro-benchmarking. It will be enabled once further rmlock
optimization has taken place. However, in practice, netisrs are
rarely registered or unregistered at runtime.
A new man page for netisr will follow, but since one doesn't currently
exist, it hasn't been updated.
This change is not appropriate for MFC, although the polling shutdown
handler should be merged to 7-STABLE.
Bump __FreeBSD_version.
Reviewed by: bz
Revision Changes Path
1.41 +36 -11 src/sys/kern/kern_poll.c
1.25 +1026 -154 src/sys/net/netisr.c
1.40 +102 -36 src/sys/net/netisr.h
1.173 +26 -8 src/sys/net/rtsock.c
1.58 +24 -11 src/sys/netatalk/ddp_usrreq.c
1.198 +8 -5 src/sys/netinet/if_ether.c
1.77 +9 -11 src/sys/netinet/igmp.c
1.148 +1 -1 src/sys/netinet/ip_divert.c
1.360 +45 -11 src/sys/netinet/ip_input.c
1.122 +8 -6 src/sys/netinet6/ip6_input.c
1.14 +0 -2 src/sys/netinet6/vinet6.h
1.26 +1 -1 src/sys/netipsec/ipsec_input.c
1.61 +12 -10 src/sys/netipx/ipx_input.c
1.22 +9 -6 src/sys/netnatm/natm_proto.c
1.416 +1 -1 src/sys/sys/param.h
1.30 +1 -0 src/sys/sys/pcpu.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906011044.n51AiTjP055813>