Module Name: src
Committed By: riastradh
Date: Mon Aug 31 20:26:21 UTC 2020
Modified Files:
src/sys/net: if_wg.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/net/if_wg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_wg.c
diff -u src/sys/net/if_wg.c:1.41 src/sys/net/if_wg.c:1.42
--- src/sys/net/if_wg.c:1.41 Mon Aug 31 20:25:33 2020
+++ src/sys/net/if_wg.c Mon Aug 31 20:26:21 2020
@@ -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.ry...@gmail.com>
@@ -41,7 +41,7 @@
*/
#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
#include "opt_inet.h"
@@ -1389,11 +1389,13 @@ wg_handle_msg_init(struct wg_softc *wg,
wgs = wg_lock_unstable_session(wgp);
if (wgs->wgs_state == WGS_STATE_DESTROYING) {
/*
- * We can assume that the peer doesn't have an established
- * session, so clear it now.
+ * We can assume that the peer doesn't have an
+ * 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");
- callout_halt(&wgp->wgp_session_dtor_timer, NULL);
+ callout_stop(&wgp->wgp_session_dtor_timer);
wg_clear_states(wgs);
wgs->wgs_state = WGS_STATE_UNKNOWN;
}
