Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wg: Switch to callout_stop for session destructor timer. 

Can't release the lock here, and can't sleep waiting for the callout
while we hold it without risking deadlock.  But not waiting is fine;
after we transition out of WGS_STATE_UNKNOWN the timer has no effect.
This commit is contained in:
riastradh 2020-08-31 20:26:21 +00:00
parent 01e85b3e6c
commit f0e0eb88b7
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/if_wg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wg.c,v 1.41 2020/08/31 20:25:33 riastradh Exp $ */ /* $NetBSD: if_wg.c,v 1.42 2020/08/31 20:26:21 riastradh Exp $ */
/* /*
* Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com> * Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
@ -41,7 +41,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.41 2020/08/31 20:25:33 riastradh Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.42 2020/08/31 20:26:21 riastradh Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_inet.h" #include "opt_inet.h"
@ -1389,11 +1389,13 @@ wg_handle_msg_init(struct wg_softc *wg, const struct wg_msg_init *wgmi,
wgs = wg_lock_unstable_session(wgp); wgs = wg_lock_unstable_session(wgp);
if (wgs->wgs_state == WGS_STATE_DESTROYING) { if (wgs->wgs_state == WGS_STATE_DESTROYING) {
/* /*
* We can assume that the peer doesn't have an established * We can assume that the peer doesn't have an
* session, so clear it now. * established session, so clear it now. If the timer
* fired, tough -- it won't have any effect unless we
* manage to transition back to WGS_STATE_DESTROYING.
*/ */
WG_TRACE("Session destroying, but force to clear"); WG_TRACE("Session destroying, but force to clear");
callout_halt(&wgp->wgp_session_dtor_timer, NULL); callout_stop(&wgp->wgp_session_dtor_timer);
wg_clear_states(wgs); wg_clear_states(wgs);
wgs->wgs_state = WGS_STATE_UNKNOWN; wgs->wgs_state = WGS_STATE_UNKNOWN;
} }