From owner-freebsd-wireless@FreeBSD.ORG Fri Nov 14 05:24:14 2014 Return-Path: Delivered-To: freebsd-wireless@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 412C8EA6 for ; Fri, 14 Nov 2014 05:24:14 +0000 (UTC) Received: from mail-wi0-x22b.google.com (mail-wi0-x22b.google.com [IPv6:2a00:1450:400c:c05::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF9BAE4F for ; Fri, 14 Nov 2014 05:24:13 +0000 (UTC) Received: by mail-wi0-f171.google.com with SMTP id r20so1567070wiv.10 for ; Thu, 13 Nov 2014 21:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:content-type; bh=gXbY6DPXea5LC1WbPfgzzpus6gujuel1tW0szzNz1tU=; b=nLlaSXLCjHUQgMrZTkQwquZvPkt7C8AKd/pdhQ867ZdOE0NuApPPhIW50uJ2oynuMr 1viV4xhCYSXh8ILrkuPVT+++Z4vPOzepSfi6Y+840XUn2B5Fs/KCX02ploaxk4XNSNzl YaE9rna7VY6IIJ+D/HZpp5USYl1bWbZHGpwDpDygsGRwdylgRVGjxgYnz6OWIlJb+neP Kll6svJHNpttaFaODQ+jnF3hA91QqA43CT8NWYpicwmsiQfbfmg/dxcUq/L+W27UYkJi VtXBJaAf0KgBG3m5679AiiECgsqqFtHPbSkfEHaWVO5prozNFr4fV+Q8JsbeB1PTQE5d IlXA== MIME-Version: 1.0 X-Received: by 10.194.47.226 with SMTP id g2mr10249158wjn.68.1415942651178; Thu, 13 Nov 2014 21:24:11 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.216.106.136 with HTTP; Thu, 13 Nov 2014 21:24:11 -0800 (PST) In-Reply-To: <201411140426.sAE4QQYN085796@svn.freebsd.org> References: <201411140426.sAE4QQYN085796@svn.freebsd.org> Date: Thu, 13 Nov 2014 21:24:11 -0800 X-Google-Sender-Auth: c81054VoTxei4OvKeh4bu2kQX60 Message-ID: Subject: Fwd: svn commit: r274493 - head/sys/dev/ath From: Adrian Chadd To: "freebsd-wireless@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-wireless@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "Discussions of 802.11 stack, tools device driver development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 05:24:14 -0000 .. would people please try this on hostap/ap/etc modes with the atheros driver on -HEAD? I'd really like to make sure I haven't broken things. :( It does fix panics for me, but I'm worried I've broken other things. Thanks! -adrian ---------- Forwarded message ---------- From: Adrian Chadd Date: 13 November 2014 20:26 Subject: svn commit: r274493 - head/sys/dev/ath To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Author: adrian Date: Fri Nov 14 04:26:26 2014 New Revision: 274493 URL: https://svnweb.freebsd.org/changeset/base/274493 Log: Migrate the callouts from using mutex locks to being mpsafe with the locks being held by the callers. Kill callout_drain() and use callout_stop(). Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Fri Nov 14 00:25:10 2014 (r274492) +++ head/sys/dev/ath/if_ath.c Fri Nov 14 04:26:26 2014 (r274493) @@ -669,8 +669,8 @@ ath_attach(u_int16_t devid, struct ath_s goto bad; } - callout_init_mtx(&sc->sc_cal_ch, &sc->sc_mtx, 0); - callout_init_mtx(&sc->sc_wd_ch, &sc->sc_mtx, 0); + callout_init(&sc->sc_cal_ch, 1); /* MPSAFE */ + callout_init(&sc->sc_wd_ch, 1); /* MPSAFE */ ATH_TXBUF_LOCK_INIT(sc); @@ -1812,7 +1812,10 @@ ath_suspend(struct ath_softc *sc) */ ath_hal_intrset(sc->sc_ah, 0); taskqueue_block(sc->sc_tq); - callout_drain(&sc->sc_cal_ch); + + ATH_LOCK(sc); + callout_stop(&sc->sc_cal_ch); + ATH_UNLOCK(sc); /* * XXX ensure sc_invalid is 1 @@ -5599,6 +5602,10 @@ ath_calibrate(void *arg) HAL_BOOL aniCal, shortCal = AH_FALSE; int nextcal; + ATH_UNLOCK_ASSERT(sc); + + ATH_LOCK(sc); + /* * Force the hardware awake for ANI work. */ @@ -5638,6 +5645,7 @@ ath_calibrate(void *arg) taskqueue_enqueue(sc->sc_tq, &sc->sc_resettask); callout_reset(&sc->sc_cal_ch, 1, ath_calibrate, sc); ath_power_restore_power_state(sc); + ATH_UNLOCK(sc); return; } /* @@ -5713,6 +5721,7 @@ restart: * Restore power state now that we're done. */ ath_power_restore_power_state(sc); + ATH_UNLOCK(sc); } static void @@ -5888,12 +5897,17 @@ ath_newstate(struct ieee80211vap *vap, e * Now, wake the thing up. */ ath_power_set_power_state(sc, HAL_PM_AWAKE); + + /* + * And stop the calibration callout whilst we have + * ATH_LOCK held. + */ + callout_stop(&sc->sc_cal_ch); ATH_UNLOCK(sc); if (ostate == IEEE80211_S_CSA && nstate == IEEE80211_S_RUN) csa_run_transition = 1; - callout_drain(&sc->sc_cal_ch); ath_hal_setledstate(ah, leds[nstate]); /* set LED */ if (nstate == IEEE80211_S_SCAN) { @@ -6084,7 +6098,6 @@ ath_newstate(struct ieee80211vap *vap, e ATH_LOCK(sc); ath_power_setselfgen(sc, HAL_PM_AWAKE); ath_power_setpower(sc, HAL_PM_AWAKE); - ATH_UNLOCK(sc); /* * Finally, start any timers and the task q thread @@ -6097,6 +6110,7 @@ ath_newstate(struct ieee80211vap *vap, e DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: calibration disabled\n", __func__); } + ATH_UNLOCK(sc); taskqueue_unblock(sc->sc_tq); } else if (nstate == IEEE80211_S_INIT) { @@ -6457,13 +6471,13 @@ ath_watchdog(void *arg) struct ath_softc *sc = arg; int do_reset = 0; + ATH_LOCK(sc); + if (sc->sc_wd_timer != 0 && --sc->sc_wd_timer == 0) { struct ifnet *ifp = sc->sc_ifp; uint32_t hangs; - ATH_LOCK(sc); ath_power_set_power_state(sc, HAL_PM_AWAKE); - ATH_UNLOCK(sc); if (ath_hal_gethangstate(sc->sc_ah, 0xffff, &hangs) && hangs != 0) { @@ -6475,9 +6489,7 @@ ath_watchdog(void *arg) if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); sc->sc_stats.ast_watchdog++; - ATH_LOCK(sc); ath_power_restore_power_state(sc); - ATH_UNLOCK(sc); } /* @@ -6491,6 +6503,8 @@ ath_watchdog(void *arg) } callout_schedule(&sc->sc_wd_ch, hz); + + ATH_UNLOCK(sc); } /*