Module Name: src
Committed By: ozaki-r
Date: Fri Nov 21 09:40:11 UTC 2014
Modified Files:
src/sys/dev/usb: ohci.c
src/sys/kern: kern_ktrace.c
Log Message:
Replace callout_stop with callout_halt
In order to call callout_destroy for a callout safely, we have to ensure
the function of the callout is not running and pending. To do so, we should
use callout_halt, not callout_stop.
In this case, we need to pass an interlock to callout_halt to wait for
the callout complete.
Reviewed by riastradh@.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/kern_ktrace.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/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.253 src/sys/dev/usb/ohci.c:1.254
--- src/sys/dev/usb/ohci.c:1.253 Tue Aug 5 10:33:46 2014
+++ src/sys/dev/usb/ohci.c Fri Nov 21 09:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254 2014/11/21 09:40:10 ozaki-r Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254 2014/11/21 09:40:10 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -350,7 +350,7 @@ ohci_detach(struct ohci_softc *sc, int f
if (rv != 0)
return (rv);
- callout_stop(&sc->sc_tmo_rhsc);
+ callout_halt(&sc->sc_tmo_rhsc, &sc->sc_lock);
usb_delay_ms(&sc->sc_bus, 300); /* XXX let stray task complete */
callout_destroy(&sc->sc_tmo_rhsc);
Index: src/sys/kern/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.165 src/sys/kern/kern_ktrace.c:1.166
--- src/sys/kern/kern_ktrace.c:1.165 Sun Sep 21 17:17:15 2014
+++ src/sys/kern/kern_ktrace.c Fri Nov 21 09:40:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.165 2014/09/21 17:17:15 christos Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.166 2014/11/21 09:40:10 ozaki-r Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.165 2014/09/21 17:17:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.166 2014/11/21 09:40:10 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1402,6 +1402,9 @@ ktrace_thread(void *arg)
}
TAILQ_REMOVE(&ktdq, ktd, ktd_list);
+
+ callout_halt(&ktd->ktd_wakch, &ktrace_lock);
+ callout_destroy(&ktd->ktd_wakch);
mutex_exit(&ktrace_lock);
/*
@@ -1415,8 +1418,6 @@ ktrace_thread(void *arg)
cv_destroy(&ktd->ktd_sync_cv);
cv_destroy(&ktd->ktd_cv);
- callout_stop(&ktd->ktd_wakch);
- callout_destroy(&ktd->ktd_wakch);
kmem_free(ktd, sizeof(*ktd));
kthread_exit(0);
