[src/trunk]: src/sys/dev Hold the intr_lock when broadcasting/waiting on sc_[...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b81b509755ae
branches:  trunk
changeset: 821980:b81b509755ae
user:      nat <nat%NetBSD.org@localhost>
date:      Thu Feb 23 23:19:04 2017 +0000

description:
Hold the intr_lock when broadcasting/waiting on sc_[rec]condvar.

diffstat:

 sys/dev/audio.c |  31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diffs (86 lines):

diff -r 052acf847b1a -r b81b509755ae sys/dev/audio.c
--- a/sys/dev/audio.c   Thu Feb 23 23:13:27 2017 +0000
+++ b/sys/dev/audio.c   Thu Feb 23 23:19:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.307 2017/02/21 20:23:37 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.308 2017/02/23 23:19:04 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.307 2017/02/21 20:23:37 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.308 2017/02/23 23:19:04 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -908,8 +908,9 @@
        case DVACT_DEACTIVATE:
                mutex_enter(sc->sc_lock);
                sc->sc_dying = true;
+               mutex_enter(sc->sc_intr_lock);
                cv_broadcast(&sc->sc_condvar);
-               mutex_exit(sc->sc_lock);
+               mutex_exit(sc->sc_intr_lock);
                return 0;
        default:
                return EOPNOTSUPP;
@@ -933,8 +934,10 @@
        sc->sc_dying = true;
        cv_broadcast(&sc->sc_wchan);
        cv_broadcast(&sc->sc_rchan);
+       mutex_enter(sc->sc_intr_lock);
        cv_broadcast(&sc->sc_condvar);
        cv_broadcast(&sc->sc_rcondvar);
+       mutex_exit(sc->sc_intr_lock);
        mutex_exit(sc->sc_lock);
        kthread_join(sc->sc_playthread);
        kthread_join(sc->sc_recthread);
@@ -6007,15 +6010,18 @@
        
        sc = (struct audio_softc *)v;
 
-       mutex_enter(sc->sc_lock);
        for (;;) {
-               cv_wait_sig(&sc->sc_condvar, sc->sc_lock);
+               mutex_enter(sc->sc_intr_lock);
+               cv_wait_sig(&sc->sc_condvar, sc->sc_intr_lock);
                if (sc->sc_dying) {
-                       mutex_exit(sc->sc_lock);
+                       mutex_exit(sc->sc_intr_lock);
                        kthread_exit(0);
                }
-
+               mutex_exit(sc->sc_intr_lock);
+
+               mutex_enter(sc->sc_lock);
                audio_mix(sc);
+               mutex_exit(sc->sc_lock);
        }
 }
 
@@ -6026,15 +6032,18 @@
        
        sc = (struct audio_softc *)v;
 
-       mutex_enter(sc->sc_lock);
        for (;;) {
-               cv_wait_sig(&sc->sc_rcondvar, sc->sc_lock);
+               mutex_enter(sc->sc_intr_lock);
+               cv_wait_sig(&sc->sc_rcondvar, sc->sc_intr_lock);
                if (sc->sc_dying) {
-                       mutex_exit(sc->sc_lock);
+                       mutex_exit(sc->sc_intr_lock);
                        kthread_exit(0);
                }
-
+               mutex_exit(sc->sc_intr_lock);
+
+               mutex_enter(sc->sc_lock);
                audio_upmix(sc);
+               mutex_exit(sc->sc_lock);
        }
 
 }