Author: hselasky
Date: Fri Jan 31 10:51:13 2020
New Revision: 357328
URL: https://svnweb.freebsd.org/changeset/base/357328
Log:
Revert r357293.
The netisr uses rm_ locks not rms_ locks as noted by jeff@ .
Sponsored by: Mellanox Technologies
Modified:
head/sys/net/netisr.c
Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c Fri Jan 31 10:41:47 2020 (r357327)
+++ head/sys/net/netisr.c Fri Jan 31 10:51:13 2020 (r357328)
@@ -920,7 +920,6 @@ netisr_process_workstream_proto(struct netisr_workstre
static void
swi_net(void *arg)
{
- struct epoch_tracker et;
#ifdef NETISR_LOCKING
struct rm_priotracker tracker;
#endif
@@ -932,9 +931,7 @@ swi_net(void *arg)
#ifdef DEVICE_POLLING
KASSERT(nws_count == 1,
("%s: device_polling but nws_count != 1", __func__));
- NET_EPOCH_ENTER(et);
netisr_poll();
- NET_EPOCH_EXIT(et);
#endif
#ifdef NETISR_LOCKING
NETISR_RLOCK(&tracker);
@@ -943,7 +940,6 @@ swi_net(void *arg)
KASSERT(!(nwsp->nws_flags & NWS_RUNNING), ("swi_net: running"));
if (nwsp->nws_flags & NWS_DISPATCHING)
goto out;
- NET_EPOCH_ENTER(et);
nwsp->nws_flags |= NWS_RUNNING;
nwsp->nws_flags &= ~NWS_SCHEDULED;
while ((bits = nwsp->nws_pendingbits) != 0) {
@@ -954,7 +950,6 @@ swi_net(void *arg)
}
}
nwsp->nws_flags &= ~NWS_RUNNING;
- NET_EPOCH_EXIT(et);
out:
NWS_UNLOCK(nwsp);
#ifdef NETISR_LOCKING
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
