From: Greg Kroah-Hartman Date: Tue, 4 May 2021 17:39:49 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.19.190~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e61de0e475821309111fbbac2a94532eec35467;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch --- diff --git a/queue-5.4/iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch b/queue-5.4/iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch new file mode 100644 index 00000000000..e28fc67e845 --- /dev/null +++ b/queue-5.4/iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch @@ -0,0 +1,61 @@ +From e7020bb068d8be50a92f48e36b236a1a1ef9282e Mon Sep 17 00:00:00 2001 +From: Jiri Kosina +Date: Sat, 17 Apr 2021 11:13:39 +0200 +Subject: iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd() + +From: Jiri Kosina + +commit e7020bb068d8be50a92f48e36b236a1a1ef9282e upstream. + +Analogically to what we did in 2800aadc18a6 ("iwlwifi: Fix softirq/hardirq +disabling in iwl_pcie_enqueue_hcmd()"), we must apply the same fix to +iwl_pcie_gen2_enqueue_hcmd(), as it's being called from exactly the same +contexts. + +Reported-by: Heiner Kallweit +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/nycvar.YFH.7.76.2104171112390.18270@cbobk.fhfr.pm +Signed-off-by: Jari Ruusu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +@@ -705,6 +705,7 @@ static int iwl_pcie_gen2_enqueue_hcmd(st + const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD]; + u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD]; + struct iwl_tfh_tfd *tfd; ++ unsigned long flags2; + + copy_size = sizeof(struct iwl_cmd_header_wide); + cmd_size = sizeof(struct iwl_cmd_header_wide); +@@ -773,14 +774,14 @@ static int iwl_pcie_gen2_enqueue_hcmd(st + goto free_dup_buf; + } + +- spin_lock_bh(&txq->lock); ++ spin_lock_irqsave(&txq->lock, flags2); + + idx = iwl_pcie_get_cmd_index(txq, txq->write_ptr); + tfd = iwl_pcie_get_tfd(trans, txq, txq->write_ptr); + memset(tfd, 0, sizeof(*tfd)); + + if (iwl_queue_space(trans, txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) { +- spin_unlock_bh(&txq->lock); ++ spin_unlock_irqrestore(&txq->lock, flags2); + + IWL_ERR(trans, "No space in command queue\n"); + iwl_op_mode_cmd_queue_full(trans->op_mode); +@@ -915,7 +916,7 @@ static int iwl_pcie_gen2_enqueue_hcmd(st + spin_unlock_irqrestore(&trans_pcie->reg_lock, flags); + + out: +- spin_unlock_bh(&txq->lock); ++ spin_unlock_irqrestore(&txq->lock, flags2); + free_dup_buf: + if (idx < 0) + kfree(dup_buf); diff --git a/queue-5.4/series b/queue-5.4/series index 8e08bfe8226..d60628df5a5 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -7,3 +7,4 @@ iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_enqueue_hcmd.patch bpf-fix-masking-negation-logic-upon-negative-dst-register.patch bpf-fix-leakage-of-uninitialized-bpf-stack-under-speculation.patch avoid-__memcat_p-link-failure.patch +iwlwifi-fix-softirq-hardirq-disabling-in-iwl_pcie_gen2_enqueue_hcmd.patch