2023-12-07 22:31:20

by Miri Korenblit

Subject: [PATCH 13/13 v2] wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock

From: Johannes Berg <[email protected]>

Hi,
I Added the 'wifi' prefix

Thanks,
Miri

Evidently I had only looked at all the ones in rx.c, and missed this.
Add bh-disable to this use of the rxq->lock as well.

Fixes: 25edc8f259c7 ("iwlwifi: pcie: properly implement NAPI")
Reported-by: Brian Norris <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Miri Korenblit <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index f39c436f0b6d..fc64e1e7f5ee 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3092,7 +3092,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,
struct iwl_rxq *rxq = &trans_pcie->rxq[0];
u32 i, r, j, rb_len = 0;

- spin_lock(&rxq->lock);
+ spin_lock_bh(&rxq->lock);

r = iwl_get_closed_rb_stts(trans, rxq);

@@ -3116,7 +3116,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,
*data = iwl_fw_error_next_data(*data);
}

- spin_unlock(&rxq->lock);
+ spin_unlock_bh(&rxq->lock);

return rb_len;
}
--
2.34.1

2023-12-08 00:56:26

by Jeff Johnson

Subject: Re: [PATCH 13/13 v2] wifi: iwlwifi: pcie: add another missing bh-disable for rxq->lock

On 12/8/2023 8:32 AM, Miri Korenblit wrote:
> From: Johannes Berg <[email protected]>
>
> Hi,
> I Added the 'wifi' prefix
>
> Thanks,
> Miri

you don't want the above to be part of the git history

>
> Evidently I had only looked at all the ones in rx.c, and missed this.
> Add bh-disable to this use of the rxq->lock as well.
>
> Fixes: 25edc8f259c7 ("iwlwifi: pcie: properly implement NAPI")
> Reported-by: Brian Norris <[email protected]>
> Signed-off-by: Johannes Berg <[email protected]>
> Signed-off-by: Miri Korenblit <[email protected]>
> ---

instead you should have added the v2 change log here, "after the cut"

> drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> index f39c436f0b6d..fc64e1e7f5ee 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> @@ -3092,7 +3092,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,
> struct iwl_rxq *rxq = &trans_pcie->rxq[0];
> u32 i, r, j, rb_len = 0;
>
> - spin_lock(&rxq->lock);
> + spin_lock_bh(&rxq->lock);
>
> r = iwl_get_closed_rb_stts(trans, rxq);
>
> @@ -3116,7 +3116,7 @@ static u32 iwl_trans_pcie_dump_rbs(struct iwl_trans *trans,
> *data = iwl_fw_error_next_data(*data);
> }
>
> - spin_unlock(&rxq->lock);
> + spin_unlock_bh(&rxq->lock);
>
> return rb_len;
> }