diff options
| author | Jose Luis Duran <jlduran@FreeBSD.org> | 2024-11-12 21:08:50 +0000 |
|---|---|---|
| committer | Jose Luis Duran <jlduran@FreeBSD.org> | 2024-11-12 21:31:24 +0000 |
| commit | 650900cc2f607458d32d333bd7ab0aa10be13ba4 (patch) | |
| tree | ded4db736dd218baa4fa4e20712955c25e876754 | |
| parent | 2d9ff965b554840cfc0791f96623f6cf5795d40d (diff) | |
| download | src-650900cc2f607458d32d333bd7ab0aa10be13ba4.tar.gz src-650900cc2f607458d32d333bd7ab0aa10be13ba4.zip | |
ipfilter: Avoid holding a lock while stopping
Avoid calling _callout_stop_safe with a non-sleepable lock held when
detaching by initializing callout_init_rw() with CALLOUT_SHAREDLOCK, and
avoiding re-initialization inside the timer function.
PR: 282478
Reviewed by: cy, emaste, jhb, markj
Tested by: cy
Approved by: emaste (mentor)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D47530
| -rw-r--r-- | sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 84fac0205ffc..3d3601ede00f 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -172,18 +172,15 @@ ipf_timer_func(void *arg) SPL_INT(s); SPL_NET(s); - READ_ENTER(&softc->ipf_global); if (softc->ipf_running > 0) ipf_slowtimer(softc); if (softc->ipf_running == -1 || softc->ipf_running == 1) { - callout_init(&softc->ipf_slow_ch, 1); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); } - RWLOCK_EXIT(&softc->ipf_global); SPL_X(s); } @@ -218,7 +215,7 @@ ipfattach(ipf_main_softc_t *softc) softc->ipf_slow_ch = timeout(ipf_timer_func, softc, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT); #endif - callout_init(&softc->ipf_slow_ch, 1); + callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); return (0); |