[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <0BA3FCBA62E2DC44AF3030971E174FB303E1330E@HASMSX103.ger.corp.intel.com>
Date: Tue, 27 May 2014 18:42:43 +0000
From: "Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>
To: "Berg, Johannes" <johannes.berg@...el.com>,
Eric Dumazet <eric.dumazet@...il.com>,
Oliver Hartkopp <socketcan@...tkopp.net>
CC: Linux Netdev List <netdev@...r.kernel.org>,
"'johannes@...solutions.net'" <johannes@...solutions.net>
Subject: RE: latest net-next: iwlwifi: reproducible SOFTIRQ-unsafe lock
order detected
>
> > Bug added in commit ea68f46070c7bae608c619ae048f0ad995db74c3
> > ("iwlwifi: pcie: clarify TX queue need_update handling")
> >
> > Please try :
> >
> > diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c
> > b/drivers/net/wireless/iwlwifi/pcie/tx.c
> > index dde6031f4257..309a13caddcd 100644
> > --- a/drivers/net/wireless/iwlwifi/pcie/tx.c
> > +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
> > @@ -338,12 +338,12 @@ void iwl_pcie_txq_check_wrptrs(struct iwl_trans
> > *trans)
> > for (i = 0; i < trans->cfg->base_params->num_of_queues; i++) {
> > struct iwl_txq *txq = &trans_pcie->txq[i];
> >
> > - spin_lock(&txq->lock);
> > + spin_lock_bh(&txq->lock);
>
> Yeah, we have the same commit in the tree:
>
> commit d090f878b0084344812dc7bb086e98cd24572e58
> Author: Emmanuel Grumbach <emmanuel.grumbach@...el.com>
> Date: Tue May 13 08:10:51 2014 +0300
>
> iwlwifi: pcie: disable BHs in iwl_pcie_txq_check_wrptrs
>
> I'm not sure why it hasn't hit net.git, I no longer maintain iwlwifi.git.
Because it doesn't need to hit net.git:
git tag --contains ea68f46070c7bae608c619ae048f0ad995db74c3
master-2014-04-22
master-2014-04-24
master-2014-04-25
master-2014-05-05
master-2014-05-07
master-2014-05-13
master-2014-05-16
master-2014-05-19
master-2014-05-20
master-2014-05-20-1
The bug has been introduced in wireless-next.git and apparently, the fix isn't in net-next yet (it is in wireless-next.git though).
The wireless-next code in net-next is very old. It seems that John needs to send a (big) pull request.
Powered by blists - more mailing lists