From: Oliver Hartkopp <socketcan@hartkopp.net>
To: "Berg, Johannes" <johannes.berg@intel.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Cc: Linux Netdev List <netdev@vger.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>,
"'johannes@sipsolutions.net'" <johannes@sipsolutions.net>
Subject: Re: latest net-next: iwlwifi: reproducible SOFTIRQ-unsafe lock order detected
Date: Tue, 27 May 2014 20:38:12 +0200 [thread overview]
Message-ID: <5384DB94.9050303@hartkopp.net> (raw)
In-Reply-To: <1DC40B07CD6EC041A66726C271A73AE61B79892E@IRSMSX102.ger.corp.intel.com>
Yep! That fixed it.
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Btw. this issue is in net-next.
Regards,
Oliver
On 27.05.2014 20:03, Berg, Johannes wrote:
>> 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@intel.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.
>
> johannes
>
next prev parent reply other threads:[~2014-05-27 18:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-25 18:13 latest net-next: iwlwifi: reproducible SOFTIRQ-unsafe lock order detected Oliver Hartkopp
2014-05-27 18:01 ` Eric Dumazet
2014-05-27 18:03 ` Berg, Johannes
2014-05-27 18:38 ` Oliver Hartkopp [this message]
2014-05-27 19:09 ` John W. Linville
2014-05-27 18:42 ` Grumbach, Emmanuel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5384DB94.9050303@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=emmanuel.grumbach@intel.com \
--cc=eric.dumazet@gmail.com \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).