Date: Mon, 15 Sep 2008 20:46:16 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149824 for review Message-ID: <200809152046.m8FKkGsC038151@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149824 Change 149824 by thompsa@thompsa_burger on 2008/09/15 20:46:13 Wait for the tty to be torn down before freeing the mtx and softc. Suggested by: hps Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#14 (text+ko) ==== @@ -87,6 +87,7 @@ #include <dev/usb2/core/usb2_config_td.h> #include <dev/usb2/core/usb2_request.h> #include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb2/core/usb2_util.h> #include <dev/usb2/serial/usb2_serial.h> @@ -337,6 +338,7 @@ sc->sc_tty = tp; DPRINTF("ttycreate: %s\n", buf); + usb2_cv_init(&sc->sc_cv, "usb2_com"); done: return (error); @@ -364,6 +366,9 @@ tty_rel_gone(tp); mtx_lock(sc->sc_parent_mtx); + /* Wait for the callback after the TTY is torn down */ + while (sc->sc_ttyfreed == 0) + usb2_cv_wait(&sc->sc_cv, sc->sc_parent_mtx); /* * make sure that read and write transfers are stopped */ @@ -375,6 +380,7 @@ } mtx_unlock(sc->sc_parent_mtx); } + usb2_cv_destroy(&sc->sc_cv); return; } @@ -815,6 +821,8 @@ sc = cc->cc_softc; tp = sc->sc_tty; + mtx_assert(sc->sc_parent_mtx, MA_OWNED); + if (!(sc->sc_flag & UCOM_FLAG_LL_READY)) { return; } @@ -1093,13 +1101,12 @@ } static void -usb2_com_free(void *sc) +usb2_com_free(void *xsc) { - /* - * Our softc gets deallocated earlier on. - * - * XXX: we should make sure the TTY device name doesn't get - * recycled before we end up here! - */ - return; + struct usb2_com_softc *sc = xsc; + + mtx_lock(sc->sc_parent_mtx); + sc->sc_ttyfreed = 1; + usb2_cv_signal(&sc->sc_cv); + mtx_unlock(sc->sc_parent_mtx); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809152046.m8FKkGsC038151>