upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

TCP timers are executed in callout context, so they need to enter network

Browse source 
epoch to look into PCB lists.  Mechanically convert INP_INFO_RLOCK() to
NET_EPOCH_ENTER().  No functional change here.
This commit is contained in:
Gleb Smirnoff 2019-11-07 00:27:23 +00:00
parent 97a95ee134
commit 58d94bd0d9
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/netinet/tcp_timer.c
View file

@ -339,9 +339,9 @@ tcp_timer_2msl(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_close(tp);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
} else {
@ -353,9 +353,9 @@ tcp_timer_2msl(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_close(tp);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@ -478,7 +478,7 @@ dropit:
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
#ifdef TCPDEBUG
@ -487,7 +487,7 @@ dropit:
PRU_SLOWTIMO);
#endif
TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
out:
CURVNET_RESTORE();
@ -542,9 +542,9 @@ tcp_timer_persist(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@ -559,9 +559,9 @@ tcp_timer_persist(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@ -628,9 +628,9 @@ tcp_timer_rexmt(void * xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
INP_INFO_RLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}