This is a note to let you know that I've just added the patch titled
wifi: iwlwifi: Use request_module_nowait
to the 6.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-iwlwifi-use-request_module_nowait.patch
and it can be found in the queue-6.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3d913719df14c28c4d3819e7e6d150760222bda4 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Date: Tue, 30 Apr 2024 16:42:12 -0700
Subject: wifi: iwlwifi: Use request_module_nowait
From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
commit 3d913719df14c28c4d3819e7e6d150760222bda4 upstream.
This appears to work around a deadlock regression that came in
with the LED merge in 6.9.
The deadlock happens on my system with 24 iwlwifi radios, so maybe
it something like all worker threads are busy and some work that needs
to complete cannot complete.
Link: https://lore.kernel.org/linux-kernel/20240411070718.GD6194@xxxxxxxxxx/
Fixes: f5c31bcf604d ("Merge tag 'leds-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds")
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Link: https://msgid.link/20240430234212.2132958-1-greearb@xxxxxxxxxxxxxxx
[also remove unnecessary "load_module" var and now-wrong comment]
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1484,7 +1484,6 @@ static void iwl_req_fw_callback(const st
size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];
u32 api_ver;
int i;
- bool load_module = false;
bool usniffer_images = false;
bool failure = true;
@@ -1732,19 +1731,12 @@ static void iwl_req_fw_callback(const st
goto out_unbind;
}
} else {
- load_module = true;
+ request_module_nowait("%s", op->name);
}
mutex_unlock(&iwlwifi_opmode_table_mtx);
complete(&drv->request_firmware_complete);
- /*
- * Load the module last so we don't block anything
- * else from proceeding if the module fails to load
- * or hangs loading.
- */
- if (load_module)
- request_module("%s", op->name);
failure = false;
goto free;
Patches currently in stable-queue which might be from greearb@xxxxxxxxxxxxxxx are
queue-6.9/wifi-iwlwifi-use-request_module_nowait.patch
