From: Sasha Levin Date: Sun, 17 Aug 2025 13:27:13 +0000 (-0400) Subject: Fixes for 6.1 X-Git-Tag: v6.12.43~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7fd491ed35c936886c82e2449e03cccb801bbb5;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/acpi-apei-ghes-add-taint_machine_check-on-ghes-panic.patch b/queue-6.1/acpi-apei-ghes-add-taint_machine_check-on-ghes-panic.patch new file mode 100644 index 0000000000..dbcca9376c --- /dev/null +++ b/queue-6.1/acpi-apei-ghes-add-taint_machine_check-on-ghes-panic.patch @@ -0,0 +1,43 @@ +From 58b8516633c517eeca237aaa2d481086fbdad113 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jul 2025 08:39:51 -0700 +Subject: ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path + +From: Breno Leitao + +[ Upstream commit 4734c8b46b901cff2feda8b82abc710b65dc31c1 ] + +When a GHES (Generic Hardware Error Source) triggers a panic, add the +TAINT_MACHINE_CHECK taint flag to the kernel. This explicitly marks the +kernel as tainted due to a machine check event, improving diagnostics +and post-mortem analysis. The taint is set with LOCKDEP_STILL_OK to +indicate lockdep remains valid. + +At large scale deployment, this helps to quickly determine panics that +are coming due to hardware failures. + +Signed-off-by: Breno Leitao +Reviewed-by: Tony Luck +Link: https://patch.msgid.link/20250702-add_tain-v1-1-9187b10914b9@debian.org +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/apei/ghes.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c +index 1f327ec4c30b..3c862acaa28a 100644 +--- a/drivers/acpi/apei/ghes.c ++++ b/drivers/acpi/apei/ghes.c +@@ -860,6 +860,8 @@ static void __ghes_panic(struct ghes *ghes, + + __ghes_print_estatus(KERN_EMERG, ghes->generic, estatus); + ++ add_taint(TAINT_MACHINE_CHECK, LOCKDEP_STILL_OK); ++ + ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx); + + if (!panic_timeout) +-- +2.39.5 + diff --git a/queue-6.1/acpi-prm-reduce-unnecessary-printing-to-avoid-user-c.patch b/queue-6.1/acpi-prm-reduce-unnecessary-printing-to-avoid-user-c.patch new file mode 100644 index 0000000000..9985c84631 --- /dev/null +++ b/queue-6.1/acpi-prm-reduce-unnecessary-printing-to-avoid-user-c.patch @@ -0,0 +1,83 @@ +From 94771102fbde1f8b505858876f438fc35bc3202f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Jul 2025 01:41:04 +0000 +Subject: ACPI: PRM: Reduce unnecessary printing to avoid user confusion + +From: Zhu Qiyu + +[ Upstream commit 3db5648c4d608b5483470efc1da9780b081242dd ] + +Commit 088984c8d54c ("ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM +handler and context") introduced non-essential printing "Failed to find +VA for GUID: xxxx, PA: 0x0" which may confuse users to think that +something wrong is going on while it is not the case. + +According to the PRM Spec Section 4.1.2 [1], both static data buffer +address and ACPI parameter buffer address may be NULL if they are not +needed, so there is no need to print out the "Failed to find VA ... " +in those cases. + +Link: https://uefi.org/sites/default/files/resources/Platform%20Runtime%20Mechanism%20-%20with%20legal%20notice.pdf # [1] +Signed-off-by: Zhu Qiyu +Link: https://patch.msgid.link/20250704014104.82524-1-qiyuzhu2@amd.com +[ rjw: Edits in new comments, subject and changelog ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/prmt.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c +index 7747ca4168ab..215ca8d60616 100644 +--- a/drivers/acpi/prmt.c ++++ b/drivers/acpi/prmt.c +@@ -85,8 +85,6 @@ static u64 efi_pa_va_lookup(efi_guid_t *guid, u64 pa) + } + } + +- pr_warn("Failed to find VA for GUID: %pUL, PA: 0x%llx", guid, pa); +- + return 0; + } + +@@ -154,13 +152,37 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end) + guid_copy(&th->guid, (guid_t *)handler_info->handler_guid); + th->handler_addr = + (void *)efi_pa_va_lookup(&th->guid, handler_info->handler_address); ++ /* ++ * Print a warning message if handler_addr is zero which is not expected to ++ * ever happen. ++ */ ++ if (unlikely(!th->handler_addr)) ++ pr_warn("Failed to find VA of handler for GUID: %pUL, PA: 0x%llx", ++ &th->guid, handler_info->handler_address); + + th->static_data_buffer_addr = + efi_pa_va_lookup(&th->guid, handler_info->static_data_buffer_address); ++ /* ++ * According to the PRM specification, static_data_buffer_address can be zero, ++ * so avoid printing a warning message in that case. Otherwise, if the ++ * return value of efi_pa_va_lookup() is zero, print the message. ++ */ ++ if (unlikely(!th->static_data_buffer_addr && handler_info->static_data_buffer_address)) ++ pr_warn("Failed to find VA of static data buffer for GUID: %pUL, PA: 0x%llx", ++ &th->guid, handler_info->static_data_buffer_address); + + th->acpi_param_buffer_addr = + efi_pa_va_lookup(&th->guid, handler_info->acpi_param_buffer_address); + ++ /* ++ * According to the PRM specification, acpi_param_buffer_address can be zero, ++ * so avoid printing a warning message in that case. Otherwise, if the ++ * return value of efi_pa_va_lookup() is zero, print the message. ++ */ ++ if (unlikely(!th->acpi_param_buffer_addr && handler_info->acpi_param_buffer_address)) ++ pr_warn("Failed to find VA of acpi param buffer for GUID: %pUL, PA: 0x%llx", ++ &th->guid, handler_info->acpi_param_buffer_address); ++ + } while (++cur_handler < tm->handler_count && (handler_info = get_next_handler(handler_info))); + + return 0; +-- +2.39.5 + diff --git a/queue-6.1/acpi-processor-fix-acpi_object-initialization.patch b/queue-6.1/acpi-processor-fix-acpi_object-initialization.patch new file mode 100644 index 0000000000..ee5020541e --- /dev/null +++ b/queue-6.1/acpi-processor-fix-acpi_object-initialization.patch @@ -0,0 +1,41 @@ +From c07ff764c3db8facdf92ce4dcc9b93681f212f21 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 14:42:15 +0200 +Subject: ACPI: processor: fix acpi_object initialization + +From: Sebastian Ott + +[ Upstream commit 13edf7539211d8f7d0068ce3ed143005f1da3547 ] + +Initialization of the local acpi_object in acpi_processor_get_info() +only sets the first 4 bytes to zero and is thus incomplete. This is +indicated by messages like: + acpi ACPI0007:be: Invalid PBLK length [166288104] + +Fix this by initializing all 16 bytes of the processor member of that +union. + +Signed-off-by: Sebastian Ott +Link: https://patch.msgid.link/20250703124215.12522-1-sebott@redhat.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/acpi_processor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c +index 8bd5c4fa91f2..cfa75b14caa2 100644 +--- a/drivers/acpi/acpi_processor.c ++++ b/drivers/acpi/acpi_processor.c +@@ -216,7 +216,7 @@ static inline int acpi_processor_hotadd_init(struct acpi_processor *pr) + + static int acpi_processor_get_info(struct acpi_device *device) + { +- union acpi_object object = { 0 }; ++ union acpi_object object = { .processor = { 0 } }; + struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; + struct acpi_processor *pr = acpi_driver_data(device); + int device_declaration = 0; +-- +2.39.5 + diff --git a/queue-6.1/alsa-hda-ca0132-fix-buffer-overflow-in-add_tuning_co.patch b/queue-6.1/alsa-hda-ca0132-fix-buffer-overflow-in-add_tuning_co.patch new file mode 100644 index 0000000000..fa1e1dd52c --- /dev/null +++ b/queue-6.1/alsa-hda-ca0132-fix-buffer-overflow-in-add_tuning_co.patch @@ -0,0 +1,41 @@ +From 509429f275cd70334f3daef06c21435613ed4167 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 19:50:12 +0200 +Subject: ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control + +From: Lucy Thrun + +[ Upstream commit a409c60111e6bb98fcabab2aeaa069daa9434ca0 ] + +The 'sprintf' call in 'add_tuning_control' may exceed the 44-byte +buffer if either string argument is too long. This triggers a compiler +warning. +Replaced 'sprintf' with 'snprintf' to limit string lengths to prevent +overflow. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202506100642.95jpuMY1-lkp@intel.com/ +Signed-off-by: Lucy Thrun +Link: https://patch.msgid.link/20250610175012.918-3-lucy.thrun@digital-rabbithole.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_ca0132.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c +index d825fcce05ee..45b267c02a98 100644 +--- a/sound/pci/hda/patch_ca0132.c ++++ b/sound/pci/hda/patch_ca0132.c +@@ -4399,7 +4399,7 @@ static int add_tuning_control(struct hda_codec *codec, + } + knew.private_value = + HDA_COMPOSE_AMP_VAL(nid, 1, 0, type); +- sprintf(namestr, "%s %s Volume", name, dirstr[dir]); ++ snprintf(namestr, sizeof(namestr), "%s %s Volume", name, dirstr[dir]); + return snd_hda_ctl_add(codec, nid, snd_ctl_new1(&knew, codec)); + } + +-- +2.39.5 + diff --git a/queue-6.1/alsa-hda-disable-jack-polling-at-shutdown.patch b/queue-6.1/alsa-hda-disable-jack-polling-at-shutdown.patch new file mode 100644 index 0000000000..cb12bc7800 --- /dev/null +++ b/queue-6.1/alsa-hda-disable-jack-polling-at-shutdown.patch @@ -0,0 +1,43 @@ +From 7ee14cfc533dcb746cc9d63abe5436755f41980c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Jun 2025 15:14:30 +0200 +Subject: ALSA: hda: Disable jack polling at shutdown + +From: Takashi Iwai + +[ Upstream commit 1adcbdf54f76e1004bdf71df4eb1888c26e7ad06 ] + +Although the jack polling is canceled at shutdown in +snd_hda_codec_shutdown(), it might be still re-triggered when the work +is being processed at cancel_delayed_work_sync() call. This may +result in the unexpected hardware access that should have been already +disabled. + +For assuring to stop the jack polling, clear codec->jackpoll_interval +at shutdown. + +Reported-by: Joakim Zhang +Closes: https://lore.kernel.org/20250619020844.2974160-4-joakim.zhang@cixtech.com +Tested-by: Joakim Zhang +Signed-off-by: Takashi Iwai +Link: https://patch.msgid.link/20250623131437.10670-2-tiwai@suse.de +Signed-off-by: Sasha Levin +--- + sound/pci/hda/hda_codec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index 94b3732e6cb2..aef60044cb8a 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -3040,6 +3040,7 @@ void snd_hda_codec_shutdown(struct hda_codec *codec) + if (!codec->core.registered) + return; + ++ codec->jackpoll_interval = 0; /* don't poll any longer */ + cancel_delayed_work_sync(&codec->jackpoll_work); + list_for_each_entry(cpcm, &codec->pcm_list_head, list) + snd_pcm_suspend_all(cpcm->pcm); +-- +2.39.5 + diff --git a/queue-6.1/alsa-hda-handle-the-jack-polling-always-via-a-work.patch b/queue-6.1/alsa-hda-handle-the-jack-polling-always-via-a-work.patch new file mode 100644 index 0000000000..5903f366d7 --- /dev/null +++ b/queue-6.1/alsa-hda-handle-the-jack-polling-always-via-a-work.patch @@ -0,0 +1,129 @@ +From 149b7504484e2722906a094ee639cd44828be407 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Jun 2025 15:14:32 +0200 +Subject: ALSA: hda: Handle the jack polling always via a work + +From: Takashi Iwai + +[ Upstream commit 5f7e54b23e4d253eff3b10b12d6fa92d28d7dddc ] + +We used to call directly hda_jackpoll_work() from a couple of places +for updating the jack and notify to user-space, but this makes rather +the code flow fragile. Namely, because of those direct calls, +hda_jackpoll_work() uses snd_hda_power_up_pm() and *_down_pm() calls +instead of the standard snd_hda_power_up() and *_down() calls. The +latter pair assures the runtime PM resume sync, so it can avoid the +race against the PM callbacks gracefully, while the former pair may +continue if called concurrently, hence it may race (by design). + +In this patch, we change the call pattern of hda_jackpoll_work(); now +all callers are replaced with the standard snd_hda_jack_report_sync() +and the additional schedule_delayed_work(). + +Since hda_jackpoll_work() is called only from the associated work, +it's always outside the PM code path, and we can safely use +snd_hda_power_up() and *_down() there instead. This allows us to +remove the racy check of power-state in hda_jackpoll_work(), as well +as the tricky cancel_delayed_work() and rescheduling at +hda_codec_runtime_suspend(). + +Reported-by: Joakim Zhang +Closes: https://lore.kernel.org/20250619020844.2974160-1-joakim.zhang@cixtech.com +Tested-by: Joakim Zhang +Signed-off-by: Takashi Iwai +Link: https://patch.msgid.link/20250623131437.10670-4-tiwai@suse.de +Signed-off-by: Sasha Levin +--- + sound/pci/hda/hda_codec.c | 41 +++++++++++++-------------------------- + 1 file changed, 14 insertions(+), 27 deletions(-) + +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index 9d7d99b584fe..94b3732e6cb2 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -641,24 +641,16 @@ static void hda_jackpoll_work(struct work_struct *work) + struct hda_codec *codec = + container_of(work, struct hda_codec, jackpoll_work.work); + +- /* for non-polling trigger: we need nothing if already powered on */ +- if (!codec->jackpoll_interval && snd_hdac_is_power_on(&codec->core)) ++ if (!codec->jackpoll_interval) + return; + + /* the power-up/down sequence triggers the runtime resume */ +- snd_hda_power_up_pm(codec); ++ snd_hda_power_up(codec); + /* update jacks manually if polling is required, too */ +- if (codec->jackpoll_interval) { +- snd_hda_jack_set_dirty_all(codec); +- snd_hda_jack_poll_all(codec); +- } +- snd_hda_power_down_pm(codec); +- +- if (!codec->jackpoll_interval) +- return; +- +- schedule_delayed_work(&codec->jackpoll_work, +- codec->jackpoll_interval); ++ snd_hda_jack_set_dirty_all(codec); ++ snd_hda_jack_poll_all(codec); ++ schedule_delayed_work(&codec->jackpoll_work, codec->jackpoll_interval); ++ snd_hda_power_down(codec); + } + + /* release all pincfg lists */ +@@ -2922,12 +2914,12 @@ static void hda_call_codec_resume(struct hda_codec *codec) + snd_hda_regmap_sync(codec); + } + +- if (codec->jackpoll_interval) +- hda_jackpoll_work(&codec->jackpoll_work.work); +- else +- snd_hda_jack_report_sync(codec); ++ snd_hda_jack_report_sync(codec); + codec->core.dev.power.power_state = PMSG_ON; + snd_hdac_leave_pm(&codec->core); ++ if (codec->jackpoll_interval) ++ schedule_delayed_work(&codec->jackpoll_work, ++ codec->jackpoll_interval); + } + + static int hda_codec_runtime_suspend(struct device *dev) +@@ -2939,8 +2931,6 @@ static int hda_codec_runtime_suspend(struct device *dev) + if (!codec->card) + return 0; + +- cancel_delayed_work_sync(&codec->jackpoll_work); +- + state = hda_call_codec_suspend(codec); + if (codec->link_down_at_suspend || + (codec_has_clkstop(codec) && codec_has_epss(codec) && +@@ -2948,10 +2938,6 @@ static int hda_codec_runtime_suspend(struct device *dev) + snd_hdac_codec_link_down(&codec->core); + snd_hda_codec_display_power(codec, false); + +- if (codec->bus->jackpoll_in_suspend && +- (dev->power.power_state.event != PM_EVENT_SUSPEND)) +- schedule_delayed_work(&codec->jackpoll_work, +- codec->jackpoll_interval); + return 0; + } + +@@ -3120,10 +3106,11 @@ int snd_hda_codec_build_controls(struct hda_codec *codec) + if (err < 0) + return err; + ++ snd_hda_jack_report_sync(codec); /* call at the last init point */ + if (codec->jackpoll_interval) +- hda_jackpoll_work(&codec->jackpoll_work.work); +- else +- snd_hda_jack_report_sync(codec); /* call at the last init point */ ++ schedule_delayed_work(&codec->jackpoll_work, ++ codec->jackpoll_interval); ++ + sync_power_up_states(codec); + return 0; + } +-- +2.39.5 + diff --git a/queue-6.1/alsa-intel8x0-fix-incorrect-codec-index-usage-in-mix.patch b/queue-6.1/alsa-intel8x0-fix-incorrect-codec-index-usage-in-mix.patch new file mode 100644 index 0000000000..6f304d5b87 --- /dev/null +++ b/queue-6.1/alsa-intel8x0-fix-incorrect-codec-index-usage-in-mix.patch @@ -0,0 +1,37 @@ +From 1b46e062b6e9dead6690d5b92973d4f86b8d2a5c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 21 Jun 2025 11:52:24 -0700 +Subject: ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4 + +From: Alok Tiwari + +[ Upstream commit 87aafc8580acf87fcaf1a7e30ed858d8c8d37d81 ] + +code mistakenly used a hardcoded index (codec[1]) instead of +iterating, over the codec array using the loop variable i. +Use codec[i] instead of codec[1] to match the loop iteration. + +Signed-off-by: Alok Tiwari +Link: https://patch.msgid.link/20250621185233.4081094-1-alok.a.tiwari@oracle.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/intel8x0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c +index ae285c0a629c..f3df6fe2b7f1 100644 +--- a/sound/pci/intel8x0.c ++++ b/sound/pci/intel8x0.c +@@ -2252,7 +2252,7 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, + tmp |= chip->ac97_sdin[0] << ICH_DI1L_SHIFT; + for (i = 1; i < 4; i++) { + if (pcm->r[0].codec[i]) { +- tmp |= chip->ac97_sdin[pcm->r[0].codec[1]->num] << ICH_DI2L_SHIFT; ++ tmp |= chip->ac97_sdin[pcm->r[0].codec[i]->num] << ICH_DI2L_SHIFT; + break; + } + } +-- +2.39.5 + diff --git a/queue-6.1/alsa-pcm-rewrite-recalculate_boundary-to-avoid-costl.patch b/queue-6.1/alsa-pcm-rewrite-recalculate_boundary-to-avoid-costl.patch new file mode 100644 index 0000000000..e99f4d0dcf --- /dev/null +++ b/queue-6.1/alsa-pcm-rewrite-recalculate_boundary-to-avoid-costl.patch @@ -0,0 +1,96 @@ +From 6ab4b59bf590b4ef4ea3741b8b1913f19d0ffdf9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 11:44:02 +0200 +Subject: ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop + +From: Christophe Leroy + +[ Upstream commit 92f59aeb13252265c20e7aef1379a8080c57e0a2 ] + +At the time being recalculate_boundary() is implemented with a +loop which shows up as costly in a perf profile, as depicted by +the annotate below: + + 0.00 : c057e934: 3d 40 7f ff lis r10,32767 + 0.03 : c057e938: 61 4a ff ff ori r10,r10,65535 + 0.21 : c057e93c: 7d 49 50 50 subf r10,r9,r10 + 5.39 : c057e940: 7d 3c 4b 78 mr r28,r9 + 2.11 : c057e944: 55 29 08 3c slwi r9,r9,1 + 3.04 : c057e948: 7c 09 50 40 cmplw r9,r10 + 2.47 : c057e94c: 40 81 ff f4 ble c057e940 + +Total: 13.2% on that simple loop. + +But what the loop does is to multiply the boundary by 2 until it is +over the wanted border. This can be avoided by using fls() to get the +boundary value order and shift it by the appropriate number of bits at +once. + +This change provides the following profile: + + 0.04 : c057f6e8: 3d 20 7f ff lis r9,32767 + 0.02 : c057f6ec: 61 29 ff ff ori r9,r9,65535 + 0.34 : c057f6f0: 7d 5a 48 50 subf r10,r26,r9 + 0.23 : c057f6f4: 7c 1a 50 40 cmplw r26,r10 + 0.02 : c057f6f8: 41 81 00 20 bgt c057f718 + 0.26 : c057f6fc: 7f 47 00 34 cntlzw r7,r26 + 0.09 : c057f700: 7d 48 00 34 cntlzw r8,r10 + 0.22 : c057f704: 7d 08 38 50 subf r8,r8,r7 + 0.04 : c057f708: 7f 5a 40 30 slw r26,r26,r8 + 0.35 : c057f70c: 7c 0a d0 40 cmplw r10,r26 + 0.13 : c057f710: 40 80 05 f8 bge c057fd08 + 0.00 : c057f714: 57 5a f8 7e srwi r26,r26,1 + +Total: 1.7% with that loopless alternative. + +Signed-off-by: Christophe Leroy +Link: https://patch.msgid.link/4836e2cde653eebaf2709ebe30eec736bb8c67fd.1749202237.git.christophe.leroy@csgroup.eu +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/core/pcm_native.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c +index bf752b188b05..900525df53f0 100644 +--- a/sound/core/pcm_native.c ++++ b/sound/core/pcm_native.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "pcm_local.h" + +@@ -3123,13 +3124,23 @@ struct snd_pcm_sync_ptr32 { + static snd_pcm_uframes_t recalculate_boundary(struct snd_pcm_runtime *runtime) + { + snd_pcm_uframes_t boundary; ++ snd_pcm_uframes_t border; ++ int order; + + if (! runtime->buffer_size) + return 0; +- boundary = runtime->buffer_size; +- while (boundary * 2 <= 0x7fffffffUL - runtime->buffer_size) +- boundary *= 2; +- return boundary; ++ ++ border = 0x7fffffffUL - runtime->buffer_size; ++ if (runtime->buffer_size > border) ++ return runtime->buffer_size; ++ ++ order = __fls(border) - __fls(runtime->buffer_size); ++ boundary = runtime->buffer_size << order; ++ ++ if (boundary <= border) ++ return boundary; ++ else ++ return boundary / 2; + } + + static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream, +-- +2.39.5 + diff --git a/queue-6.1/alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch b/queue-6.1/alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch new file mode 100644 index 0000000000..776fd4c660 --- /dev/null +++ b/queue-6.1/alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch @@ -0,0 +1,61 @@ +From 2d56b3c73f7c267de99e07a870474915a03abfd9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 May 2025 17:07:42 +0300 +Subject: ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros + +From: Cristian Ciocaltea + +[ Upstream commit fd3ab72e42e9871a9902b945a2bf8bb87b49c718 ] + +Fix all macro related issues identified by checkpatch.pl: + + CHECK: Macro argument 'x' may be better as '(x)' to avoid precedence issues + +Signed-off-by: Cristian Ciocaltea +Signed-off-by: Takashi Iwai +Link: https://patch.msgid.link/20250526-dualsense-alsa-jack-v1-3-1a821463b632@collabora.com +Signed-off-by: Sasha Levin +--- + sound/usb/mixer_quirks.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c +index be0b3c8ac705..f2cce15be4e2 100644 +--- a/sound/usb/mixer_quirks.c ++++ b/sound/usb/mixer_quirks.c +@@ -2150,15 +2150,15 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer) + #define SND_RME_CLK_FREQMUL_SHIFT 18 + #define SND_RME_CLK_FREQMUL_MASK 0x7 + #define SND_RME_CLK_SYSTEM(x) \ +- ((x >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK) ++ (((x) >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK) + #define SND_RME_CLK_AES(x) \ +- ((x >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) ++ (((x) >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) + #define SND_RME_CLK_SPDIF(x) \ +- ((x >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) ++ (((x) >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) + #define SND_RME_CLK_SYNC(x) \ +- ((x >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK) ++ (((x) >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK) + #define SND_RME_CLK_FREQMUL(x) \ +- ((x >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK) ++ (((x) >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK) + #define SND_RME_CLK_AES_LOCK 0x1 + #define SND_RME_CLK_AES_SYNC 0x4 + #define SND_RME_CLK_SPDIF_LOCK 0x2 +@@ -2167,9 +2167,9 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer) + #define SND_RME_SPDIF_FORMAT_SHIFT 5 + #define SND_RME_BINARY_MASK 0x1 + #define SND_RME_SPDIF_IF(x) \ +- ((x >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK) ++ (((x) >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK) + #define SND_RME_SPDIF_FORMAT(x) \ +- ((x >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK) ++ (((x) >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK) + + static const u32 snd_rme_rate_table[] = { + 32000, 44100, 48000, 50000, +-- +2.39.5 + diff --git a/queue-6.1/apparmor-use-the-condition-in-aa_bug_fmt-even-with-d.patch b/queue-6.1/apparmor-use-the-condition-in-aa_bug_fmt-even-with-d.patch new file mode 100644 index 0000000000..53226288be --- /dev/null +++ b/queue-6.1/apparmor-use-the-condition-in-aa_bug_fmt-even-with-d.patch @@ -0,0 +1,45 @@ +From 9e63d3b0ee760a3406fc9496e2a2d370e24dcfab Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jan 2025 21:54:04 +0100 +Subject: apparmor: use the condition in AA_BUG_FMT even with debug disabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mateusz Guzik + +[ Upstream commit 67e370aa7f968f6a4f3573ed61a77b36d1b26475 ] + +This follows the established practice and fixes a build failure for me: +security/apparmor/file.c: In function ‘__file_sock_perm’: +security/apparmor/file.c:544:24: error: unused variable ‘sock’ [-Werror=unused-variable] + 544 | struct socket *sock = (struct socket *) file->private_data; + | ^~~~ + +Signed-off-by: Mateusz Guzik +Signed-off-by: John Johansen +Signed-off-by: Sasha Levin +--- + security/apparmor/include/lib.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h +index d468c8b90298..fd57e9ffc139 100644 +--- a/security/apparmor/include/lib.h ++++ b/security/apparmor/include/lib.h +@@ -46,7 +46,11 @@ + #define AA_BUG_FMT(X, fmt, args...) \ + WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args) + #else +-#define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args) ++#define AA_BUG_FMT(X, fmt, args...) \ ++ do { \ ++ BUILD_BUG_ON_INVALID(X); \ ++ no_printk(fmt, ##args); \ ++ } while (0) + #endif + + #define AA_ERROR(fmt, args...) \ +-- +2.39.5 + diff --git a/queue-6.1/arm-rockchip-fix-kernel-hang-during-smp-initializati.patch b/queue-6.1/arm-rockchip-fix-kernel-hang-during-smp-initializati.patch new file mode 100644 index 0000000000..16cb1c1713 --- /dev/null +++ b/queue-6.1/arm-rockchip-fix-kernel-hang-during-smp-initializati.patch @@ -0,0 +1,70 @@ +From 778c82a20055e4da5f0e31092d6f5d6facc98126 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 17:04:53 +0300 +Subject: ARM: rockchip: fix kernel hang during smp initialization + +From: Alexander Kochetkov + +[ Upstream commit 7cdb433bb44cdc87dc5260cdf15bf03cc1cd1814 ] + +In order to bring up secondary CPUs main CPU write trampoline +code to SRAM. The trampoline code is written while secondary +CPUs are powered on (at least that true for RK3188 CPU). +Sometimes that leads to kernel hang. Probably because secondary +CPU execute trampoline code while kernel doesn't expect. + +The patch moves SRAM initialization step to the point where all +secondary CPUs are powered down. + +That fixes rarely hangs on RK3188: +[ 0.091568] CPU0: thread -1, cpu 0, socket 0, mpidr 80000000 +[ 0.091996] rockchip_smp_prepare_cpus: ncores 4 + +Signed-off-by: Alexander Kochetkov +Link: https://lore.kernel.org/r/20250703140453.1273027-1-al.kochet@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm/mach-rockchip/platsmp.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c +index 36915a073c23..f432d22bfed8 100644 +--- a/arch/arm/mach-rockchip/platsmp.c ++++ b/arch/arm/mach-rockchip/platsmp.c +@@ -279,11 +279,6 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) + } + + if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { +- if (rockchip_smp_prepare_sram(node)) { +- of_node_put(node); +- return; +- } +- + /* enable the SCU power domain */ + pmu_set_power_domain(PMU_PWRDN_SCU, true); + +@@ -316,11 +311,19 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) + asm ("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr)); + ncores = ((l2ctlr >> 24) & 0x3) + 1; + } +- of_node_put(node); + + /* Make sure that all cores except the first are really off */ + for (i = 1; i < ncores; i++) + pmu_set_power_domain(0 + i, false); ++ ++ if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) { ++ if (rockchip_smp_prepare_sram(node)) { ++ of_node_put(node); ++ return; ++ } ++ } ++ ++ of_node_put(node); + } + + static void __init rk3036_smp_prepare_cpus(unsigned int max_cpus) +-- +2.39.5 + diff --git a/queue-6.1/arm-tegra-use-i-o-memcpy-to-write-to-iram.patch b/queue-6.1/arm-tegra-use-i-o-memcpy-to-write-to-iram.patch new file mode 100644 index 0000000000..7ef4f79019 --- /dev/null +++ b/queue-6.1/arm-tegra-use-i-o-memcpy-to-write-to-iram.patch @@ -0,0 +1,36 @@ +From f67606a7bdb8d42bba0c4e95b01a6f9e6798874e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 May 2025 11:11:24 -0500 +Subject: ARM: tegra: Use I/O memcpy to write to IRAM + +From: Aaron Kling + +[ Upstream commit 398e67e0f5ae04b29bcc9cbf342e339fe9d3f6f1 ] + +Kasan crashes the kernel trying to check boundaries when using the +normal memcpy. + +Signed-off-by: Aaron Kling +Link: https://lore.kernel.org/r/20250522-mach-tegra-kasan-v1-1-419041b8addb@gmail.com +Signed-off-by: Thierry Reding +Signed-off-by: Sasha Levin +--- + arch/arm/mach-tegra/reset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c +index d5c805adf7a8..ea706fac6358 100644 +--- a/arch/arm/mach-tegra/reset.c ++++ b/arch/arm/mach-tegra/reset.c +@@ -63,7 +63,7 @@ static void __init tegra_cpu_reset_handler_enable(void) + BUG_ON(is_enabled); + BUG_ON(tegra_cpu_reset_handler_size > TEGRA_IRAM_RESET_HANDLER_SIZE); + +- memcpy(iram_base, (void *)__tegra_cpu_reset_handler_start, ++ memcpy_toio(iram_base, (void *)__tegra_cpu_reset_handler_start, + tegra_cpu_reset_handler_size); + + err = call_firmware_op(set_cpu_boot_addr, 0, reset_address); +-- +2.39.5 + diff --git a/queue-6.1/arm64-handle-kcov-__init-vs-inline-mismatches.patch b/queue-6.1/arm64-handle-kcov-__init-vs-inline-mismatches.patch new file mode 100644 index 0000000000..e11f72e7b3 --- /dev/null +++ b/queue-6.1/arm64-handle-kcov-__init-vs-inline-mismatches.patch @@ -0,0 +1,51 @@ +From 315ca7aeb0d86c841a852202526d21d2b43d720f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Jul 2025 22:50:25 -0700 +Subject: arm64: Handle KCOV __init vs inline mismatches + +From: Kees Cook + +[ Upstream commit 65c430906efffee9bd7551d474f01a6b1197df90 ] + +GCC appears to have kind of fragile inlining heuristics, in the +sense that it can change whether or not it inlines something based on +optimizations. It looks like the kcov instrumentation being added (or in +this case, removed) from a function changes the optimization results, +and some functions marked "inline" are _not_ inlined. In that case, +we end up with __init code calling a function not marked __init, and we +get the build warnings I'm trying to eliminate in the coming patch that +adds __no_sanitize_coverage to __init functions: + +WARNING: modpost: vmlinux: section mismatch in reference: acpi_get_enable_method+0x1c (section: .text.unlikely) -> acpi_psci_present (section: .init.text) + +This problem is somewhat fragile (though using either __always_inline +or __init will deterministically solve it), but we've tripped over +this before with GCC and the solution has usually been to just use +__always_inline and move on. + +For arm64 this requires forcing one ACPI function to be inlined with +__always_inline. + +Link: https://lore.kernel.org/r/20250724055029.3623499-1-kees@kernel.org +Signed-off-by: Kees Cook +Signed-off-by: Sasha Levin +--- + arch/arm64/include/asm/acpi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h +index 702587fda70c..8cbbd08cc8c5 100644 +--- a/arch/arm64/include/asm/acpi.h ++++ b/arch/arm64/include/asm/acpi.h +@@ -128,7 +128,7 @@ acpi_set_mailbox_entry(int cpu, struct acpi_madt_generic_interrupt *processor) + {} + #endif + +-static inline const char *acpi_get_enable_method(int cpu) ++static __always_inline const char *acpi_get_enable_method(int cpu) + { + if (acpi_psci_present()) + return "psci"; +-- +2.39.5 + diff --git a/queue-6.1/arm64-mark-kernel-as-tainted-on-sae-and-serror-panic.patch b/queue-6.1/arm64-mark-kernel-as-tainted-on-sae-and-serror-panic.patch new file mode 100644 index 0000000000..9ceeae0e55 --- /dev/null +++ b/queue-6.1/arm64-mark-kernel-as-tainted-on-sae-and-serror-panic.patch @@ -0,0 +1,55 @@ +From 95bed602b620250861e853fc7a8dabeceee7977d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jul 2025 02:42:01 -0700 +Subject: arm64: Mark kernel as tainted on SAE and SError panic + +From: Breno Leitao + +[ Upstream commit d7ce7e3a84642aadf7c4787f7ec4f58eb163d129 ] + +Set TAINT_MACHINE_CHECK when SError or Synchronous External Abort (SEA) +interrupts trigger a panic to flag potential hardware faults. This +tainting mechanism aids in debugging and enables correlation of +hardware-related crashes in large-scale deployments. + +This change aligns with similar patches[1] that mark machine check +events when the system crashes due to hardware errors. + +Link: https://lore.kernel.org/all/20250702-add_tain-v1-1-9187b10914b9@debian.org/ [1] +Signed-off-by: Breno Leitao +Acked-by: Mark Rutland +Link: https://lore.kernel.org/r/20250716-vmcore_hw_error-v2-1-f187f7d62aba@debian.org +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/kernel/traps.c | 1 + + arch/arm64/mm/fault.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c +index 23d281ed7621..09489e92ff94 100644 +--- a/arch/arm64/kernel/traps.c ++++ b/arch/arm64/kernel/traps.c +@@ -911,6 +911,7 @@ void panic_bad_stack(struct pt_regs *regs, unsigned long esr, unsigned long far) + + void __noreturn arm64_serror_panic(struct pt_regs *regs, unsigned long esr) + { ++ add_taint(TAINT_MACHINE_CHECK, LOCKDEP_STILL_OK); + console_verbose(); + + pr_crit("SError Interrupt on CPU%d, code 0x%016lx -- %s\n", +diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c +index 6b6b8a82f294..0776c98ad27f 100644 +--- a/arch/arm64/mm/fault.c ++++ b/arch/arm64/mm/fault.c +@@ -710,6 +710,7 @@ static int do_sea(unsigned long far, unsigned long esr, struct pt_regs *regs) + */ + siaddr = untagged_addr(far); + } ++ add_taint(TAINT_MACHINE_CHECK, LOCKDEP_STILL_OK); + arm64_notify_die(inf->name, regs, inf->sig, inf->code, siaddr, esr); + + return 0; +-- +2.39.5 + diff --git a/queue-6.1/asoc-codecs-rt5640-retry-device_id-verification.patch b/queue-6.1/asoc-codecs-rt5640-retry-device_id-verification.patch new file mode 100644 index 0000000000..eb2f9b7e1d --- /dev/null +++ b/queue-6.1/asoc-codecs-rt5640-retry-device_id-verification.patch @@ -0,0 +1,48 @@ +From f56a5544ab14a16b55f02cdb9e3eac373c3f3a8e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 30 May 2025 16:21:19 +0200 +Subject: ASoC: codecs: rt5640: Retry DEVICE_ID verification +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Xinxin Wan + +[ Upstream commit 19f971057b2d7b99c80530ec1052b45de236a8da ] + +To be more resilient to codec-detection failures when the hardware +powers on slowly, add retry mechanism to the device verification check. +Similar pattern is found throughout a number of Realtek codecs. Our +tests show that 60ms delay is sufficient to address readiness issues on +rt5640 chip. + +Reviewed-by: Amadeusz Sławiński +Reviewed-by: Cezary Rojewski +Signed-off-by: Xinxin Wan +Signed-off-by: Cezary Rojewski +Link: https://patch.msgid.link/20250530142120.2944095-3-cezary.rojewski@intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/rt5640.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c +index 37ea4d854cb5..3185bf13dc42 100644 +--- a/sound/soc/codecs/rt5640.c ++++ b/sound/soc/codecs/rt5640.c +@@ -3026,6 +3026,11 @@ static int rt5640_i2c_probe(struct i2c_client *i2c) + } + + regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val); ++ if (val != RT5640_DEVICE_ID) { ++ usleep_range(60000, 100000); ++ regmap_read(rt5640->regmap, RT5640_VENDOR_ID2, &val); ++ } ++ + if (val != RT5640_DEVICE_ID) { + dev_err(&i2c->dev, + "Device with ID register %#x is not rt5640/39\n", val); +-- +2.39.5 + diff --git a/queue-6.1/asoc-core-check-for-rtd-null-in-snd_soc_remove_pcm_r.patch b/queue-6.1/asoc-core-check-for-rtd-null-in-snd_soc_remove_pcm_r.patch new file mode 100644 index 0000000000..d5e6d931ce --- /dev/null +++ b/queue-6.1/asoc-core-check-for-rtd-null-in-snd_soc_remove_pcm_r.patch @@ -0,0 +1,46 @@ +From 5e3d2269645f96b65fc1d652539baa55a3afc918 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Jun 2025 11:42:20 +0300 +Subject: ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime() + +From: Peter Ujfalusi + +[ Upstream commit 2d91cb261cac6d885954b8f5da28b5c176c18131 ] + +snd_soc_remove_pcm_runtime() might be called with rtd == NULL which will +leads to null pointer dereference. +This was reproduced with topology loading and marking a link as ignore +due to missing hardware component on the system. +On module removal the soc_tplg_remove_link() would call +snd_soc_remove_pcm_runtime() with rtd == NULL since the link was ignored, +no runtime was created. + +Signed-off-by: Peter Ujfalusi +Reviewed-by: Bard Liao +Reviewed-by: Ranjani Sridharan +Reviewed-by: Liam Girdwood +Reviewed-by: Kai Vehmanen +Link: https://patch.msgid.link/20250619084222.559-3-peter.ujfalusi@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/soc-core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c +index b13370d2ec1d..1ff7a0b0a236 100644 +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -937,6 +937,9 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card, + void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, + struct snd_soc_pcm_runtime *rtd) + { ++ if (!rtd) ++ return; ++ + lockdep_assert_held(&client_mutex); + + /* release machine specific resources */ +-- +2.39.5 + diff --git a/queue-6.1/asoc-hdac_hdmi-rate-limit-logging-on-connection-and-.patch b/queue-6.1/asoc-hdac_hdmi-rate-limit-logging-on-connection-and-.patch new file mode 100644 index 0000000000..702a29f3a0 --- /dev/null +++ b/queue-6.1/asoc-hdac_hdmi-rate-limit-logging-on-connection-and-.patch @@ -0,0 +1,68 @@ +From 009954eb06a401aa7b522e499f6c9eda75044757 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 17:41:04 +0100 +Subject: ASoC: hdac_hdmi: Rate limit logging on connection and disconnection + +From: Mark Brown + +[ Upstream commit c4ca928a6db1593802cd945f075a7e21dd0430c1 ] + +We currently log parse failures for ELD data and some disconnection events +as errors without rate limiting. These log messages can be triggered very +frequently in some situations, especially ELD parsing when there is nothing +connected to a HDMI port which will generate: + +hdmi-audio-codec hdmi-audio-codec.1.auto: HDMI: Unknown ELD version 0 + +While there's doubtless work that could be done on reducing the number of +connection notification callbacks it's possible these may be legitimately +generated by poor quality physical connections so let's use rate limiting +to mitigate the log spam for the parse errors and lower the severity for +disconnect logging to debug level. + +Signed-off-by: Mark Brown +Link: https://patch.msgid.link/20250613-asoc-hdmi-eld-logging-v1-1-76d64154d969@kernel.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/hdac_hdmi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c +index d8e83150ea28..90baca4c2b4d 100644 +--- a/sound/soc/codecs/hdac_hdmi.c ++++ b/sound/soc/codecs/hdac_hdmi.c +@@ -1230,7 +1230,8 @@ static int hdac_hdmi_parse_eld(struct hdac_device *hdev, + >> DRM_ELD_VER_SHIFT; + + if (ver != ELD_VER_CEA_861D && ver != ELD_VER_PARTIAL) { +- dev_err(&hdev->dev, "HDMI: Unknown ELD version %d\n", ver); ++ dev_err_ratelimited(&hdev->dev, ++ "HDMI: Unknown ELD version %d\n", ver); + return -EINVAL; + } + +@@ -1238,7 +1239,8 @@ static int hdac_hdmi_parse_eld(struct hdac_device *hdev, + DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT; + + if (mnl > ELD_MAX_MNL) { +- dev_err(&hdev->dev, "HDMI: MNL Invalid %d\n", mnl); ++ dev_err_ratelimited(&hdev->dev, ++ "HDMI: MNL Invalid %d\n", mnl); + return -EINVAL; + } + +@@ -1297,8 +1299,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, + + if (!port->eld.monitor_present || !port->eld.eld_valid) { + +- dev_err(&hdev->dev, "%s: disconnect for pin:port %d:%d\n", +- __func__, pin->nid, port->id); ++ dev_dbg(&hdev->dev, "%s: disconnect for pin:port %d:%d\n", ++ __func__, pin->nid, port->id); + + /* + * PCMs are not registered during device probe, so don't +-- +2.39.5 + diff --git a/queue-6.1/asoc-intel-avs-fix-uninitialized-pointer-error-in-pr.patch b/queue-6.1/asoc-intel-avs-fix-uninitialized-pointer-error-in-pr.patch new file mode 100644 index 0000000000..2926a07452 --- /dev/null +++ b/queue-6.1/asoc-intel-avs-fix-uninitialized-pointer-error-in-pr.patch @@ -0,0 +1,48 @@ +From 8165d0b5c7873fd7f86e38289021764438b16a39 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Jul 2025 14:49:06 +0200 +Subject: ASoC: Intel: avs: Fix uninitialized pointer error in probe() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Cezary Rojewski + +[ Upstream commit 11f74f48c14c1f4fe16541900ea5944c42e30ccf ] + +If pcim_request_all_regions() fails, error path operates on +uninitialized 'bus' pointer. Found out by Coverity static analyzer. + +Reviewed-by: Amadeusz Sławiński +Signed-off-by: Cezary Rojewski +Link: https://patch.msgid.link/20250730124906.351798-1-cezary.rojewski@intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/avs/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c +index 5bb3eee2f783..04d0099adb8f 100644 +--- a/sound/soc/intel/avs/core.c ++++ b/sound/soc/intel/avs/core.c +@@ -410,6 +410,8 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) + adev = devm_kzalloc(dev, sizeof(*adev), GFP_KERNEL); + if (!adev) + return -ENOMEM; ++ bus = &adev->base.core; ++ + ret = avs_bus_init(adev, pci, id); + if (ret < 0) { + dev_err(dev, "failed to init avs bus: %d\n", ret); +@@ -420,7 +422,6 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) + if (ret < 0) + return ret; + +- bus = &adev->base.core; + bus->addr = pci_resource_start(pci, 0); + bus->remap_addr = pci_ioremap_bar(pci, 0); + if (!bus->remap_addr) { +-- +2.39.5 + diff --git a/queue-6.1/asoc-soc-dapm-set-bias_level-if-snd_soc_dapm_set_bia.patch b/queue-6.1/asoc-soc-dapm-set-bias_level-if-snd_soc_dapm_set_bia.patch new file mode 100644 index 0000000000..2f517bfc3a --- /dev/null +++ b/queue-6.1/asoc-soc-dapm-set-bias_level-if-snd_soc_dapm_set_bia.patch @@ -0,0 +1,73 @@ +From cab4578b4ed8adaccc15e08b7d2024d4901b6843 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Jul 2025 02:26:39 +0000 +Subject: ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was + successed + +From: Kuninori Morimoto + +[ Upstream commit f40ecc2743652c0b0f19935f81baf57c601eb7f0 ] + +ASoC has 2 functions to set bias level. + (A) snd_soc_dapm_force_bias_level() + (B) snd_soc_dapm_set_bias_level() + +snd_soc_dapm_force_bias_level() (A) will set dapm->bias_level (a) if +successed. + +(A) int snd_soc_dapm_force_bias_level(...) + { + ... + if (ret == 0) +(a) dapm->bias_level = level; + ... + } + +snd_soc_dapm_set_bias_level() (B) is also a function that sets bias_level. +It will call snd_soc_dapm_force_bias_level() (A) inside, but doesn't +set dapm->bias_level by itself. One note is that (A) might not be called. + +(B) static int snd_soc_dapm_set_bias_level(...) + { + ... + ret = snd_soc_card_set_bias_level(...); + ... + if (dapm != &card->dapm) +(A) ret = snd_soc_dapm_force_bias_level(...); + ... + ret = snd_soc_card_set_bias_level_post(...); + ... + } + +dapm->bias_level will be set if (A) was called, but might not be set +if (B) was called, even though it calles set_bias_level() function. + +We should set dapm->bias_level if we calls +snd_soc_dapm_set_bias_level() (B), too. + +Signed-off-by: Kuninori Morimoto +Link: https://patch.msgid.link/87qzyn4g4h.wl-kuninori.morimoto.gx@renesas.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/soc-dapm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c +index 4103443770b0..481e5dd593b6 100644 +--- a/sound/soc/soc-dapm.c ++++ b/sound/soc/soc-dapm.c +@@ -742,6 +742,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm, + out: + trace_snd_soc_bias_level_done(card, level); + ++ /* success */ ++ if (ret == 0) ++ snd_soc_dapm_init_bias_level(dapm, level); ++ + return ret; + } + +-- +2.39.5 + diff --git a/queue-6.1/ata-libata-sata-disallow-changing-lpm-state-if-not-s.patch b/queue-6.1/ata-libata-sata-disallow-changing-lpm-state-if-not-s.patch new file mode 100644 index 0000000000..bb66189b40 --- /dev/null +++ b/queue-6.1/ata-libata-sata-disallow-changing-lpm-state-if-not-s.patch @@ -0,0 +1,42 @@ +From 14d03024780d92ce0e9c3c7ed6011e44d4f40ec3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 21:53:16 +0900 +Subject: ata: libata-sata: Disallow changing LPM state if not supported + +From: Damien Le Moal + +[ Upstream commit 413e800cadbf67550d76c77c230b2ecd96bce83a ] + +Modify ata_scsi_lpm_store() to return an error if a user attempts to set +a link power management policy for a port that does not support LPM, +that is, ports flagged with ATA_FLAG_NO_LPM. + +Signed-off-by: Damien Le Moal +Reviewed-by: Niklas Cassel +Reviewed-by: Hannes Reinecke +Link: https://lore.kernel.org/r/20250701125321.69496-6-dlemoal@kernel.org +Signed-off-by: Niklas Cassel +Signed-off-by: Sasha Levin +--- + drivers/ata/libata-sata.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c +index 71a00842eb5e..b75999388bf0 100644 +--- a/drivers/ata/libata-sata.c ++++ b/drivers/ata/libata-sata.c +@@ -812,6 +812,11 @@ static ssize_t ata_scsi_lpm_store(struct device *device, + + spin_lock_irqsave(ap->lock, flags); + ++ if (ap->flags & ATA_FLAG_NO_LPM) { ++ count = -EOPNOTSUPP; ++ goto out_unlock; ++ } ++ + ata_for_each_link(link, ap, EDGE) { + ata_for_each_dev(dev, &ap->link, ENABLED) { + if (dev->horkage & ATA_HORKAGE_NOLPM) { +-- +2.39.5 + diff --git a/queue-6.1/be2net-use-correct-byte-order-and-format-string-for-.patch b/queue-6.1/be2net-use-correct-byte-order-and-format-string-for-.patch new file mode 100644 index 0000000000..9cc553b649 --- /dev/null +++ b/queue-6.1/be2net-use-correct-byte-order-and-format-string-for-.patch @@ -0,0 +1,53 @@ +From f6627a71ba7f21f724ffe61f8e849ce8d10fb8a9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 12:35:47 -0700 +Subject: be2net: Use correct byte order and format string for TCP seq and + ack_seq + +From: Alok Tiwari + +[ Upstream commit 4701ee5044fb3992f1c910630a9673c2dc600ce5 ] + +The TCP header fields seq and ack_seq are 32-bit values in network +byte order as (__be32). these fields were earlier printed using +ntohs(), which converts only 16-bit values and produces incorrect +results for 32-bit fields. This patch is changeing the conversion +to ntohl(), ensuring correct interpretation of these sequence numbers. + +Notably, the format specifier is updated from %d to %u to reflect the +unsigned nature of these fields. + +improves the accuracy of debug log messages for TCP sequence and +acknowledgment numbers during TX timeouts. + +Signed-off-by: Alok Tiwari +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250717193552.3648791-1-alok.a.tiwari@oracle.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/emulex/benet/be_main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c +index 173625a10886..7a3f7b4b859e 100644 +--- a/drivers/net/ethernet/emulex/benet/be_main.c ++++ b/drivers/net/ethernet/emulex/benet/be_main.c +@@ -1466,10 +1466,10 @@ static void be_tx_timeout(struct net_device *netdev, unsigned int txqueue) + ntohs(tcphdr->source)); + dev_info(dev, "TCP dest port %d\n", + ntohs(tcphdr->dest)); +- dev_info(dev, "TCP sequence num %d\n", +- ntohs(tcphdr->seq)); +- dev_info(dev, "TCP ack_seq %d\n", +- ntohs(tcphdr->ack_seq)); ++ dev_info(dev, "TCP sequence num %u\n", ++ ntohl(tcphdr->seq)); ++ dev_info(dev, "TCP ack_seq %u\n", ++ ntohl(tcphdr->ack_seq)); + } else if (ip_hdr(skb)->protocol == + IPPROTO_UDP) { + udphdr = udp_hdr(skb); +-- +2.39.5 + diff --git a/queue-6.1/better-lockdep-annotations-for-simple_recursive_remo.patch b/queue-6.1/better-lockdep-annotations-for-simple_recursive_remo.patch new file mode 100644 index 0000000000..2e67212bec --- /dev/null +++ b/queue-6.1/better-lockdep-annotations-for-simple_recursive_remo.patch @@ -0,0 +1,57 @@ +From 860ca6434db7cf83f72d32e55bac0ef77abd5f28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jul 2025 22:30:32 -0400 +Subject: better lockdep annotations for simple_recursive_removal() + +From: Al Viro + +[ Upstream commit 2a8061ee5e41034eb14170ec4517b5583dbeff9f ] + +We want a class that nests outside of I_MUTEX_NORMAL (for the sake of +callbacks that might want to lock the victim) and inside I_MUTEX_PARENT +(so that a variant of that could be used with parent of the victim +held locked by the caller). + +In reality, simple_recursive_removal() + * never holds two locks at once + * holds the lock on parent of dentry passed to callback + * is used only on the trees with fixed topology, so the depths +are not changing. + +So the locking order is actually fine. + +AFAICS, the best solution is to assign I_MUTEX_CHILD to the locks +grabbed by that thing. + +Reported-by: syzbot+169de184e9defe7fe709@syzkaller.appspotmail.com +Signed-off-by: Al Viro +Signed-off-by: Sasha Levin +--- + fs/libfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/libfs.c b/fs/libfs.c +index aada4e7c8713..cbd42d76fbd0 100644 +--- a/fs/libfs.c ++++ b/fs/libfs.c +@@ -274,7 +274,7 @@ void simple_recursive_removal(struct dentry *dentry, + struct dentry *victim = NULL, *child; + struct inode *inode = this->d_inode; + +- inode_lock(inode); ++ inode_lock_nested(inode, I_MUTEX_CHILD); + if (d_is_dir(this)) + inode->i_flags |= S_DEAD; + while ((child = find_next_child(this, victim)) == NULL) { +@@ -286,7 +286,7 @@ void simple_recursive_removal(struct dentry *dentry, + victim = this; + this = this->d_parent; + inode = this->d_inode; +- inode_lock(inode); ++ inode_lock_nested(inode, I_MUTEX_CHILD); + if (simple_positive(victim)) { + d_invalidate(victim); // avoid lost mounts + if (d_is_dir(victim)) +-- +2.39.5 + diff --git a/queue-6.1/block-avoid-possible-overflow-for-chunk_sectors-chec.patch b/queue-6.1/block-avoid-possible-overflow-for-chunk_sectors-chec.patch new file mode 100644 index 0000000000..22dfb98347 --- /dev/null +++ b/queue-6.1/block-avoid-possible-overflow-for-chunk_sectors-chec.patch @@ -0,0 +1,44 @@ +From 5557439d98559fa20a59a3565fab71213e45f3b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Jul 2025 09:14:47 +0000 +Subject: block: avoid possible overflow for chunk_sectors check in + blk_stack_limits() + +From: John Garry + +[ Upstream commit 448dfecc7ff807822ecd47a5c052acedca7d09e8 ] + +In blk_stack_limits(), we check that the t->chunk_sectors value is a +multiple of the t->physical_block_size value. + +However, by finding the chunk_sectors value in bytes, we may overflow +the unsigned int which holds chunk_sectors, so change the check to be +based on sectors. + +Reviewed-by: Hannes Reinecke +Reviewed-by: Martin K. Petersen +Signed-off-by: John Garry +Reviewed-by: Damien Le Moal +Link: https://lore.kernel.org/r/20250729091448.1691334-2-john.g.garry@oracle.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + block/blk-settings.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/block/blk-settings.c b/block/blk-settings.c +index c702f408bbc0..305b47a38429 100644 +--- a/block/blk-settings.c ++++ b/block/blk-settings.c +@@ -628,7 +628,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, + } + + /* chunk_sectors a multiple of the physical block size? */ +- if ((t->chunk_sectors << 9) & (t->physical_block_size - 1)) { ++ if (t->chunk_sectors % (t->physical_block_size >> SECTOR_SHIFT)) { + t->chunk_sectors = 0; + t->misaligned = 1; + ret = -1; +-- +2.39.5 + diff --git a/queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch b/queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch new file mode 100644 index 0000000000..1db433b948 --- /dev/null +++ b/queue-6.1/bootconfig-fix-unaligned-access-when-building-footer.patch @@ -0,0 +1,84 @@ +From a679b5ac076185b45bb86f248c93636685b44630 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Jul 2025 12:49:25 +0200 +Subject: bootconfig: Fix unaligned access when building footer + +From: Ben Hutchings + +[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ] + +Currently we add padding between the bootconfig text and footer to +ensure that the footer is aligned within the initramfs image. +However, because only the bootconfig data is held in memory, not the +full initramfs image, the footer may not be naturally aligned in +memory. + +This can result in an alignment fault (SIGBUS) when writing the footer +on some architectures, such as sparc. + +Build the footer in a struct on the stack before adding it to the +buffer. + +References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sparc64&ver=6.16%7Erc7-1%7Eexp1&stamp=1753209801&raw=0 +Link: https://lore.kernel.org/all/aIC-NTw-cdm9ZGFw@decadent.org.uk/ + +Signed-off-by: Ben Hutchings +Signed-off-by: Masami Hiramatsu (Google) +Signed-off-by: Sasha Levin +--- + tools/bootconfig/main.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c +index 8a48cc2536f5..dce2d6ffcca5 100644 +--- a/tools/bootconfig/main.c ++++ b/tools/bootconfig/main.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include + +@@ -359,7 +360,12 @@ static int delete_xbc(const char *path) + + static int apply_xbc(const char *path, const char *xbc_path) + { +- char *buf, *data, *p; ++ struct { ++ uint32_t size; ++ uint32_t csum; ++ char magic[BOOTCONFIG_MAGIC_LEN]; ++ } footer; ++ char *buf, *data; + size_t total_size; + struct stat stat; + const char *msg; +@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path) + size += pad; + + /* Add a footer */ +- p = data + size; +- *(uint32_t *)p = htole32(size); +- p += sizeof(uint32_t); ++ footer.size = htole32(size); ++ footer.csum = htole32(csum); ++ memcpy(footer.magic, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN); ++ static_assert(sizeof(footer) == BOOTCONFIG_FOOTER_SIZE); ++ memcpy(data + size, &footer, BOOTCONFIG_FOOTER_SIZE); + +- *(uint32_t *)p = htole32(csum); +- p += sizeof(uint32_t); +- +- memcpy(p, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN); +- p += BOOTCONFIG_MAGIC_LEN; +- +- total_size = p - data; ++ total_size = size + BOOTCONFIG_FOOTER_SIZE; + + ret = write(fd, data, total_size); + if (ret < total_size) { +-- +2.39.5 + diff --git a/queue-6.1/can-ti_hecc-fix-woverflow-compiler-warning.patch b/queue-6.1/can-ti_hecc-fix-woverflow-compiler-warning.patch new file mode 100644 index 0000000000..2a07d8df70 --- /dev/null +++ b/queue-6.1/can-ti_hecc-fix-woverflow-compiler-warning.patch @@ -0,0 +1,40 @@ +From b34877c2fa311c52fe303b244458c2c764bb1400 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 20:28:11 +0900 +Subject: can: ti_hecc: fix -Woverflow compiler warning + +From: Vincent Mailhol + +[ Upstream commit 7cae4d04717b002cffe41169da3f239c845a0723 ] + +Fix below default (W=0) warning: + + drivers/net/can/ti_hecc.c: In function 'ti_hecc_start': + drivers/net/can/ti_hecc.c:386:20: warning: conversion from 'long unsigned int' to 'u32' {aka 'unsigned int'} changes value from '18446744073709551599' to '4294967279' [-Woverflow] + 386 | mbx_mask = ~BIT(HECC_RX_LAST_MBOX); + | ^ + +Signed-off-by: Vincent Mailhol +Link: https://patch.msgid.link/20250715-can-compile-test-v2-1-f7fd566db86f@wanadoo.fr +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + drivers/net/can/ti_hecc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c +index 27700f72eac2..1b875236209e 100644 +--- a/drivers/net/can/ti_hecc.c ++++ b/drivers/net/can/ti_hecc.c +@@ -384,7 +384,7 @@ static void ti_hecc_start(struct net_device *ndev) + * overflows instead of the hardware silently dropping the + * messages. + */ +- mbx_mask = ~BIT(HECC_RX_LAST_MBOX); ++ mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX); + hecc_write(priv, HECC_CANOPC, mbx_mask); + + /* Enable interrupts */ +-- +2.39.5 + diff --git a/queue-6.1/cifs-fix-calling-cifsfindfirst-for-root-path-without.patch b/queue-6.1/cifs-fix-calling-cifsfindfirst-for-root-path-without.patch new file mode 100644 index 0000000000..41a6b739a3 --- /dev/null +++ b/queue-6.1/cifs-fix-calling-cifsfindfirst-for-root-path-without.patch @@ -0,0 +1,60 @@ +From 946f6644e70b66a1d64e30691cc8f56717617e55 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Dec 2024 20:54:11 +0100 +Subject: cifs: Fix calling CIFSFindFirst() for root path without msearch +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit b460249b9a1dab7a9f58483e5349d045ad6d585c ] + +To query root path (without msearch wildcard) it is needed to +send pattern '\' instead of '' (empty string). + +This allows to use CIFSFindFirst() to query information about root path +which is being used in followup changes. + +This change fixes the stat() syscall called on the root path on the mount. +It is because stat() syscall uses the cifs_query_path_info() function and +it can fallback to the CIFSFindFirst() usage with msearch=false. + +Signed-off-by: Pali Rohár +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/smb/client/cifssmb.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c +index 0c6ade196894..49d772683004 100644 +--- a/fs/smb/client/cifssmb.c ++++ b/fs/smb/client/cifssmb.c +@@ -3933,6 +3933,12 @@ CIFSFindFirst(const unsigned int xid, struct cifs_tcon *tcon, + pSMB->FileName[name_len] = 0; + pSMB->FileName[name_len+1] = 0; + name_len += 2; ++ } else if (!searchName[0]) { ++ pSMB->FileName[0] = CIFS_DIR_SEP(cifs_sb); ++ pSMB->FileName[1] = 0; ++ pSMB->FileName[2] = 0; ++ pSMB->FileName[3] = 0; ++ name_len = 4; + } + } else { + name_len = copy_path_name(pSMB->FileName, searchName); +@@ -3944,6 +3950,10 @@ CIFSFindFirst(const unsigned int xid, struct cifs_tcon *tcon, + pSMB->FileName[name_len] = '*'; + pSMB->FileName[name_len+1] = 0; + name_len += 2; ++ } else if (!searchName[0]) { ++ pSMB->FileName[0] = CIFS_DIR_SEP(cifs_sb); ++ pSMB->FileName[1] = 0; ++ name_len = 2; + } + } + +-- +2.39.5 + diff --git a/queue-6.1/cpufreq-cppc-mark-driver-with-need_update_limits-fla.patch b/queue-6.1/cpufreq-cppc-mark-driver-with-need_update_limits-fla.patch new file mode 100644 index 0000000000..b624e6a12d --- /dev/null +++ b/queue-6.1/cpufreq-cppc-mark-driver-with-need_update_limits-fla.patch @@ -0,0 +1,51 @@ +From 9471300fe9d237b2cf5e03e38a269c238d550917 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Jul 2025 05:55:40 +0000 +Subject: cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag + +From: Prashant Malani + +[ Upstream commit 0a1416a49e63c320f6e6c1c8d07e1b58c0d4a3f3 ] + +AMU counters on certain CPPC-based platforms tend to yield inaccurate +delivered performance measurements on systems that are idle/mostly idle. +This results in an inaccurate frequency being stored by cpufreq in its +policy structure when the CPU is brought online. [1] + +Consequently, if the userspace governor tries to set the frequency to a +new value, there is a possibility that it would be the erroneous value +stored earlier. In such a scenario, cpufreq would assume that the +requested frequency has already been set and return early, resulting in +the correct/new frequency request never making it to the hardware. + +Since the operating frequency is liable to this sort of inconsistency, +mark the CPPC driver with CPUFREQ_NEED_UPDATE_LIMITS so that it is always +invoked when a target frequency update is requested. + +Link: https://lore.kernel.org/linux-pm/20250619000925.415528-3-pmalani@google.com/ [1] +Suggested-by: Rafael J. Wysocki +Signed-off-by: Prashant Malani +Acked-by: Viresh Kumar +Link: https://patch.msgid.link/20250722055611.130574-2-pmalani@google.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/cpufreq/cppc_cpufreq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c +index cfa2e3f0e56b..d77e4aa209d9 100644 +--- a/drivers/cpufreq/cppc_cpufreq.c ++++ b/drivers/cpufreq/cppc_cpufreq.c +@@ -809,7 +809,7 @@ static struct freq_attr *cppc_cpufreq_attr[] = { + }; + + static struct cpufreq_driver cppc_cpufreq_driver = { +- .flags = CPUFREQ_CONST_LOOPS, ++ .flags = CPUFREQ_CONST_LOOPS | CPUFREQ_NEED_UPDATE_LIMITS, + .verify = cppc_verify_policy, + .target = cppc_cpufreq_set_target, + .get = cppc_cpufreq_get_rate, +-- +2.39.5 + diff --git a/queue-6.1/cpufreq-exit-governor-when-failed-to-start-old-gover.patch b/queue-6.1/cpufreq-exit-governor-when-failed-to-start-old-gover.patch new file mode 100644 index 0000000000..daa149941a --- /dev/null +++ b/queue-6.1/cpufreq-exit-governor-when-failed-to-start-old-gover.patch @@ -0,0 +1,43 @@ +From 750ec3684fc7f78836d564054d130e856417bbd7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Jul 2025 18:41:45 +0800 +Subject: cpufreq: Exit governor when failed to start old governor + +From: Lifeng Zheng + +[ Upstream commit 0ae204405095abfbc2d694ee0fbb49bcbbe55c57 ] + +Detect the result of starting old governor in cpufreq_set_policy(). If it +fails, exit the governor and clear policy->governor. + +Signed-off-by: Lifeng Zheng +Link: https://patch.msgid.link/20250709104145.2348017-5-zhenglifeng1@huawei.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/cpufreq/cpufreq.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c +index 805b4d26e9d2..90bdccab1dff 100644 +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c +@@ -2649,10 +2649,12 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, + pr_debug("starting governor %s failed\n", policy->governor->name); + if (old_gov) { + policy->governor = old_gov; +- if (cpufreq_init_governor(policy)) ++ if (cpufreq_init_governor(policy)) { + policy->governor = NULL; +- else +- cpufreq_start_governor(policy); ++ } else if (cpufreq_start_governor(policy)) { ++ cpufreq_exit_governor(policy); ++ policy->governor = NULL; ++ } + } + + return ret; +-- +2.39.5 + diff --git a/queue-6.1/crypto-hisilicon-hpre-fix-dma-unmap-sequence.patch b/queue-6.1/crypto-hisilicon-hpre-fix-dma-unmap-sequence.patch new file mode 100644 index 0000000000..91281db39e --- /dev/null +++ b/queue-6.1/crypto-hisilicon-hpre-fix-dma-unmap-sequence.patch @@ -0,0 +1,56 @@ +From 4b1735b9e39eafd8158c81daaf002c7ec5ded5ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jul 2025 18:05:01 +0800 +Subject: crypto: hisilicon/hpre - fix dma unmap sequence + +From: Zhiqi Song + +[ Upstream commit 982fd1a74de63c388c060e4fa6f7fbd088d6d02e ] + +Perform DMA unmapping operations before processing data. +Otherwise, there may be unsynchronized data accessed by +the CPU when the SWIOTLB is enabled. + +Signed-off-by: Zhiqi Song +Signed-off-by: Chenghai Huang +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c +index ef02dadd6217..541f5eb76b6e 100644 +--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c ++++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c +@@ -1461,11 +1461,13 @@ static void hpre_ecdh_cb(struct hpre_ctx *ctx, void *resp) + if (overtime_thrhld && hpre_is_bd_timeout(req, overtime_thrhld)) + atomic64_inc(&dfx[HPRE_OVER_THRHLD_CNT].value); + ++ /* Do unmap before data processing */ ++ hpre_ecdh_hw_data_clr_all(ctx, req, areq->dst, areq->src); ++ + p = sg_virt(areq->dst); + memmove(p, p + ctx->key_sz - curve_sz, curve_sz); + memmove(p + curve_sz, p + areq->dst_len - curve_sz, curve_sz); + +- hpre_ecdh_hw_data_clr_all(ctx, req, areq->dst, areq->src); + kpp_request_complete(areq, ret); + + atomic64_inc(&dfx[HPRE_RECV_CNT].value); +@@ -1769,9 +1771,11 @@ static void hpre_curve25519_cb(struct hpre_ctx *ctx, void *resp) + if (overtime_thrhld && hpre_is_bd_timeout(req, overtime_thrhld)) + atomic64_inc(&dfx[HPRE_OVER_THRHLD_CNT].value); + ++ /* Do unmap before data processing */ ++ hpre_curve25519_hw_data_clr_all(ctx, req, areq->dst, areq->src); ++ + hpre_key_to_big_end(sg_virt(areq->dst), CURVE25519_KEY_SIZE); + +- hpre_curve25519_hw_data_clr_all(ctx, req, areq->dst, areq->src); + kpp_request_complete(areq, ret); + + atomic64_inc(&dfx[HPRE_RECV_CNT].value); +-- +2.39.5 + diff --git a/queue-6.1/crypto-octeontx2-add-timeout-for-load_fvc-completion.patch b/queue-6.1/crypto-octeontx2-add-timeout-for-load_fvc-completion.patch new file mode 100644 index 0000000000..f3bed70d1a --- /dev/null +++ b/queue-6.1/crypto-octeontx2-add-timeout-for-load_fvc-completion.patch @@ -0,0 +1,65 @@ +From 9d4037e228e5fa7e20cf810c39fcacc661850b6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 May 2025 15:36:24 +0530 +Subject: crypto: octeontx2 - add timeout for load_fvc completion poll + +From: Bharat Bhushan + +[ Upstream commit 2157e50f65d2030f07ea27ef7ac4cfba772e98ac ] + +Adds timeout to exit from possible infinite loop, which polls +on CPT instruction(load_fvc) completion. + +Signed-off-by: Srujana Challa +Signed-off-by: Bharat Bhushan +Signed-off-by: Herbert Xu +Signed-off-by: Sasha Levin +--- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +index 1577986677f6..b73a13ae55c4 100644 +--- a/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c ++++ b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +@@ -1485,6 +1485,7 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf) + dma_addr_t rptr_baddr; + struct pci_dev *pdev; + u32 len, compl_rlen; ++ int timeout = 10000; + int ret, etype; + void *rptr; + +@@ -1549,16 +1550,27 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf) + etype); + otx2_cpt_fill_inst(&inst, &iq_cmd, rptr_baddr); + lfs->ops->send_cmd(&inst, 1, &cptpf->lfs.lf[0]); ++ timeout = 10000; + + while (lfs->ops->cpt_get_compcode(result) == +- OTX2_CPT_COMPLETION_CODE_INIT) ++ OTX2_CPT_COMPLETION_CODE_INIT) { + cpu_relax(); ++ udelay(1); ++ timeout--; ++ if (!timeout) { ++ ret = -ENODEV; ++ cptpf->is_eng_caps_discovered = false; ++ dev_warn(&pdev->dev, "Timeout on CPT load_fvc completion poll\n"); ++ goto error_no_response; ++ } ++ } + + cptpf->eng_caps[etype].u = be64_to_cpup(rptr); + } +- dma_unmap_single(&pdev->dev, rptr_baddr, len, DMA_BIDIRECTIONAL); + cptpf->is_eng_caps_discovered = true; + ++error_no_response: ++ dma_unmap_single(&pdev->dev, rptr_baddr, len, DMA_BIDIRECTIONAL); + free_result: + kfree(result); + lf_cleanup: +-- +2.39.5 + diff --git a/queue-6.1/dm-mpath-don-t-print-the-loaded-message-if-registeri.patch b/queue-6.1/dm-mpath-don-t-print-the-loaded-message-if-registeri.patch new file mode 100644 index 0000000000..7490ab906a --- /dev/null +++ b/queue-6.1/dm-mpath-don-t-print-the-loaded-message-if-registeri.patch @@ -0,0 +1,87 @@ +From 7cea18d1a5c7f12f55e0c9d831666236a8798435 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 15:24:22 +0200 +Subject: dm-mpath: don't print the "loaded" message if registering fails + +From: Mikulas Patocka + +[ Upstream commit 6e11952a6abc4641dc8ae63f01b318b31b44e8db ] + +If dm_register_path_selector, don't print the "version X loaded" message. + +Signed-off-by: Mikulas Patocka +Signed-off-by: Sasha Levin +--- + drivers/md/dm-ps-historical-service-time.c | 4 +++- + drivers/md/dm-ps-queue-length.c | 4 +++- + drivers/md/dm-ps-round-robin.c | 4 +++- + drivers/md/dm-ps-service-time.c | 4 +++- + 4 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/drivers/md/dm-ps-historical-service-time.c b/drivers/md/dm-ps-historical-service-time.c +index 1d82c95d323d..d0d1f97d21b6 100644 +--- a/drivers/md/dm-ps-historical-service-time.c ++++ b/drivers/md/dm-ps-historical-service-time.c +@@ -541,8 +541,10 @@ static int __init dm_hst_init(void) + { + int r = dm_register_path_selector(&hst_ps); + +- if (r < 0) ++ if (r < 0) { + DMERR("register failed %d", r); ++ return r; ++ } + + DMINFO("version " HST_VERSION " loaded"); + +diff --git a/drivers/md/dm-ps-queue-length.c b/drivers/md/dm-ps-queue-length.c +index 6fbec9fc242d..8e298570c8d2 100644 +--- a/drivers/md/dm-ps-queue-length.c ++++ b/drivers/md/dm-ps-queue-length.c +@@ -259,8 +259,10 @@ static int __init dm_ql_init(void) + { + int r = dm_register_path_selector(&ql_ps); + +- if (r < 0) ++ if (r < 0) { + DMERR("register failed %d", r); ++ return r; ++ } + + DMINFO("version " QL_VERSION " loaded"); + +diff --git a/drivers/md/dm-ps-round-robin.c b/drivers/md/dm-ps-round-robin.c +index 1d07392b5ed4..22c68ca81a24 100644 +--- a/drivers/md/dm-ps-round-robin.c ++++ b/drivers/md/dm-ps-round-robin.c +@@ -216,8 +216,10 @@ static int __init dm_rr_init(void) + { + int r = dm_register_path_selector(&rr_ps); + +- if (r < 0) ++ if (r < 0) { + DMERR("register failed %d", r); ++ return r; ++ } + + DMINFO("version " RR_VERSION " loaded"); + +diff --git a/drivers/md/dm-ps-service-time.c b/drivers/md/dm-ps-service-time.c +index eba2293be686..d1e77eefaf2b 100644 +--- a/drivers/md/dm-ps-service-time.c ++++ b/drivers/md/dm-ps-service-time.c +@@ -340,8 +340,10 @@ static int __init dm_st_init(void) + { + int r = dm_register_path_selector(&st_ps); + +- if (r < 0) ++ if (r < 0) { + DMERR("register failed %d", r); ++ return r; ++ } + + DMINFO("version " ST_VERSION " loaded"); + +-- +2.39.5 + diff --git a/queue-6.1/dm-table-fix-checking-for-rq-stackable-devices.patch b/queue-6.1/dm-table-fix-checking-for-rq-stackable-devices.patch new file mode 100644 index 0000000000..0cd426f125 --- /dev/null +++ b/queue-6.1/dm-table-fix-checking-for-rq-stackable-devices.patch @@ -0,0 +1,60 @@ +From 6c7df5a5a6bc7937952ee4148864dd8383b644d8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 19:08:52 -0400 +Subject: dm-table: fix checking for rq stackable devices + +From: Benjamin Marzinski + +[ Upstream commit 8ca719b81987be690f197e82fdb030580c0a07f3 ] + +Due to the semantics of iterate_devices(), the current code allows a +request-based dm table as long as it includes one request-stackable +device. It is supposed to only allow tables where there are no +non-request-stackable devices. + +Signed-off-by: Benjamin Marzinski +Reviewed-by: Mike Snitzer +Signed-off-by: Mikulas Patocka +Signed-off-by: Sasha Levin +--- + drivers/md/dm-table.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c +index 8b23b8bc5a03..f18e47a24454 100644 +--- a/drivers/md/dm-table.c ++++ b/drivers/md/dm-table.c +@@ -863,17 +863,17 @@ static bool dm_table_supports_dax(struct dm_table *t, + return true; + } + +-static int device_is_rq_stackable(struct dm_target *ti, struct dm_dev *dev, +- sector_t start, sector_t len, void *data) ++static int device_is_not_rq_stackable(struct dm_target *ti, struct dm_dev *dev, ++ sector_t start, sector_t len, void *data) + { + struct block_device *bdev = dev->bdev; + struct request_queue *q = bdev_get_queue(bdev); + + /* request-based cannot stack on partitions! */ + if (bdev_is_partition(bdev)) +- return false; ++ return true; + +- return queue_is_mq(q); ++ return !queue_is_mq(q); + } + + static int dm_table_determine_type(struct dm_table *t) +@@ -969,7 +969,7 @@ static int dm_table_determine_type(struct dm_table *t) + + /* Non-request-stackable devices can't be used for request-based dm */ + if (!ti->type->iterate_devices || +- !ti->type->iterate_devices(ti, device_is_rq_stackable, NULL)) { ++ ti->type->iterate_devices(ti, device_is_not_rq_stackable, NULL)) { + DMERR("table load rejected: including non-request-stackable devices"); + return -EINVAL; + } +-- +2.39.5 + diff --git a/queue-6.1/dmaengine-stm32-dma-configure-next-sg-only-if-there-.patch b/queue-6.1/dmaengine-stm32-dma-configure-next-sg-only-if-there-.patch new file mode 100644 index 0000000000..b0ccde12ad --- /dev/null +++ b/queue-6.1/dmaengine-stm32-dma-configure-next-sg-only-if-there-.patch @@ -0,0 +1,47 @@ +From eb928fc1f76d3619c7f912092118cfd59050a543 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Jun 2025 09:31:37 +0200 +Subject: dmaengine: stm32-dma: configure next sg only if there are more than 2 + sgs + +From: Amelie Delaunay + +[ Upstream commit e19bdbaa31082b43dab1d936e20efcebc30aa73d ] + +DMA operates in Double Buffer Mode (DBM) when the transfer is cyclic and +there are at least two periods. +When DBM is enabled, the DMA toggles between two memory targets (SxM0AR and +SxM1AR), indicated by the SxSCR.CT bit (Current Target). +There is no need to update the next memory address if two periods are +configured, as SxM0AR and SxM1AR are already properly set up before the +transfer begins in the stm32_dma_start_transfer() function. +This avoids unnecessary updates to SxM0AR/SxM1AR, thereby preventing +potential Transfer Errors. Specifically, when the channel is enabled, +SxM0AR and SxM1AR can only be written if SxSCR.CT=1 and SxSCR.CT=0, +respectively. Otherwise, a Transfer Error interrupt is triggered, and the +stream is automatically disabled. + +Signed-off-by: Amelie Delaunay +Link: https://lore.kernel.org/r/20250624-stm32_dma_dbm_fix-v1-1-337c40d6c93e@foss.st.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/dma/stm32-dma.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c +index 7abcd7f2848e..34a906e4b1ff 100644 +--- a/drivers/dma/stm32-dma.c ++++ b/drivers/dma/stm32-dma.c +@@ -745,7 +745,7 @@ static void stm32_dma_handle_chan_done(struct stm32_dma_chan *chan, u32 scr) + /* cyclic while CIRC/DBM disable => post resume reconfiguration needed */ + if (!(scr & (STM32_DMA_SCR_CIRC | STM32_DMA_SCR_DBM))) + stm32_dma_post_resume_reconfigure(chan); +- else if (scr & STM32_DMA_SCR_DBM) ++ else if (scr & STM32_DMA_SCR_DBM && chan->desc->num_sgs > 2) + stm32_dma_configure_next_sg(chan); + } else { + chan->busy = false; +-- +2.39.5 + diff --git a/queue-6.1/dpaa_eth-don-t-use-fixed_phy_change_carrier.patch b/queue-6.1/dpaa_eth-don-t-use-fixed_phy_change_carrier.patch new file mode 100644 index 0000000000..5ddc0a24b9 --- /dev/null +++ b/queue-6.1/dpaa_eth-don-t-use-fixed_phy_change_carrier.patch @@ -0,0 +1,46 @@ +From f81214cc78355e489b93c002df86246622fc3452 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 16 Jun 2025 23:24:05 +0200 +Subject: dpaa_eth: don't use fixed_phy_change_carrier + +From: Heiner Kallweit + +[ Upstream commit d8155c1df5c8b717052567b188455d41fa7a8908 ] + +This effectively reverts 6e8b0ff1ba4c ("dpaa_eth: Add change_carrier() +for Fixed PHYs"). Usage of fixed_phy_change_carrier() requires that +fixed_phy_register() has been called before, directly or indirectly. +And that's not the case in this driver. + +Signed-off-by: Heiner Kallweit +Reviewed-by: Jacob Keller +Link: https://patch.msgid.link/7eb189b3-d5fd-4be6-8517-a66671a4e4e3@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +index 6f5c22861dc9..5cf12c27553d 100644 +--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c ++++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -3179,7 +3178,6 @@ static const struct net_device_ops dpaa_ops = { + .ndo_stop = dpaa_eth_stop, + .ndo_tx_timeout = dpaa_tx_timeout, + .ndo_get_stats64 = dpaa_get_stats64, +- .ndo_change_carrier = fixed_phy_change_carrier, + .ndo_set_mac_address = dpaa_set_mac_address, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_rx_mode = dpaa_set_rx_mode, +-- +2.39.5 + diff --git a/queue-6.1/drbd-add-missing-kref_get-in-handle_write_conflicts.patch b/queue-6.1/drbd-add-missing-kref_get-in-handle_write_conflicts.patch new file mode 100644 index 0000000000..a7f9c0c8a8 --- /dev/null +++ b/queue-6.1/drbd-add-missing-kref_get-in-handle_write_conflicts.patch @@ -0,0 +1,65 @@ +From 0aa6c9524b03014c15101633a89ae204d8ee28ae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Jun 2025 11:57:28 +0200 +Subject: drbd: add missing kref_get in handle_write_conflicts +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sarah Newman + +[ Upstream commit 00c9c9628b49e368d140cfa61d7df9b8922ec2a8 ] + +With `two-primaries` enabled, DRBD tries to detect "concurrent" writes +and handle write conflicts, so that even if you write to the same sector +simultaneously on both nodes, they end up with the identical data once +the writes are completed. + +In handling "superseeded" writes, we forgot a kref_get, +resulting in a premature drbd_destroy_device and use after free, +and further to kernel crashes with symptoms. + +Relevance: No one should use DRBD as a random data generator, and apparently +all users of "two-primaries" handle concurrent writes correctly on layer up. +That is cluster file systems use some distributed lock manager, +and live migration in virtualization environments stops writes on one node +before starting writes on the other node. + +Which means that other than for "test cases", +this code path is never taken in real life. + +FYI, in DRBD 9, things are handled differently nowadays. We still detect +"write conflicts", but no longer try to be smart about them. +We decided to disconnect hard instead: upper layers must not submit concurrent +writes. If they do, that's their fault. + +Signed-off-by: Sarah Newman +Signed-off-by: Lars Ellenberg +Signed-off-by: Christoph Böhmwalder +Link: https://lore.kernel.org/r/20250627095728.800688-1-christoph.boehmwalder@linbit.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/drbd/drbd_receiver.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c +index 4ba09abbcaf6..acaa84fbe7f6 100644 +--- a/drivers/block/drbd/drbd_receiver.c ++++ b/drivers/block/drbd/drbd_receiver.c +@@ -2478,7 +2478,11 @@ static int handle_write_conflicts(struct drbd_device *device, + peer_req->w.cb = superseded ? e_send_superseded : + e_send_retry_write; + list_add_tail(&peer_req->w.list, &device->done_ee); +- queue_work(connection->ack_sender, &peer_req->peer_device->send_acks_work); ++ /* put is in drbd_send_acks_wf() */ ++ kref_get(&device->kref); ++ if (!queue_work(connection->ack_sender, ++ &peer_req->peer_device->send_acks_work)) ++ kref_put(&device->kref, drbd_destroy_device); + + err = -ENOENT; + goto out; +-- +2.39.5 + diff --git a/queue-6.1/drm-amd-allow-printing-vangogh-od-sclk-levels-withou.patch b/queue-6.1/drm-amd-allow-printing-vangogh-od-sclk-levels-withou.patch new file mode 100644 index 0000000000..8d835ed63c --- /dev/null +++ b/queue-6.1/drm-amd-allow-printing-vangogh-od-sclk-levels-withou.patch @@ -0,0 +1,88 @@ +From bf0ae0f16fae607b68168f61a91ddfa665897538 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 8 Jun 2025 22:12:26 -0500 +Subject: drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to + manual + +From: Mario Limonciello + +[ Upstream commit 2d1ec1e955414e8e8358178011c35afca1a1c0b1 ] + +Several other ASICs allow printing OD SCLK levels without setting DPM +control to manual. When OD is disabled it will show the range the +hardware supports. When OD is enabled it will show what values have +been programmed. Adjust VanGogh to work the same. + +Cc: Pierre-Loup A. Griffais +Reported-by: Vicki Pfau +Reviewed-by: Alex Deucher +Link: https://lore.kernel.org/r/20250609031227.479079-1-superm1@kernel.org +Signed-off-by: Mario Limonciello +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 ++++++++----------- + 1 file changed, 15 insertions(+), 22 deletions(-) + +diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +index c9c0aa6376e3..e2fa0ee0dc92 100644 +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +@@ -681,7 +681,6 @@ static int vangogh_print_clk_levels(struct smu_context *smu, + { + DpmClocks_t *clk_table = smu->smu_table.clocks_table; + SmuMetrics_t metrics; +- struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm); + int i, idx, size = 0, ret = 0; + uint32_t cur_value = 0, value = 0, count = 0; + bool cur_value_match_level = false; +@@ -697,31 +696,25 @@ static int vangogh_print_clk_levels(struct smu_context *smu, + + switch (clk_type) { + case SMU_OD_SCLK: +- if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) { +- size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK"); +- size += sysfs_emit_at(buf, size, "0: %10uMhz\n", +- (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); +- size += sysfs_emit_at(buf, size, "1: %10uMhz\n", +- (smu->gfx_actual_soft_max_freq > 0) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); +- } ++ size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK"); ++ size += sysfs_emit_at(buf, size, "0: %10uMhz\n", ++ (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); ++ size += sysfs_emit_at(buf, size, "1: %10uMhz\n", ++ (smu->gfx_actual_soft_max_freq > 0) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); + break; + case SMU_OD_CCLK: +- if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) { +- size += sysfs_emit_at(buf, size, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select); +- size += sysfs_emit_at(buf, size, "0: %10uMhz\n", +- (smu->cpu_actual_soft_min_freq > 0) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); +- size += sysfs_emit_at(buf, size, "1: %10uMhz\n", +- (smu->cpu_actual_soft_max_freq > 0) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq); +- } ++ size += sysfs_emit_at(buf, size, "CCLK_RANGE in Core%d:\n", smu->cpu_core_id_select); ++ size += sysfs_emit_at(buf, size, "0: %10uMhz\n", ++ (smu->cpu_actual_soft_min_freq > 0) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); ++ size += sysfs_emit_at(buf, size, "1: %10uMhz\n", ++ (smu->cpu_actual_soft_max_freq > 0) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq); + break; + case SMU_OD_RANGE: +- if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL) { +- size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE"); +- size += sysfs_emit_at(buf, size, "SCLK: %7uMhz %10uMhz\n", +- smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); +- size += sysfs_emit_at(buf, size, "CCLK: %7uMhz %10uMhz\n", +- smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq); +- } ++ size += sysfs_emit_at(buf, size, "%s:\n", "OD_RANGE"); ++ size += sysfs_emit_at(buf, size, "SCLK: %7uMhz %10uMhz\n", ++ smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); ++ size += sysfs_emit_at(buf, size, "CCLK: %7uMhz %10uMhz\n", ++ smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq); + break; + case SMU_SOCCLK: + /* the level 3 ~ 6 of socclk use the same frequency for vangogh */ +-- +2.39.5 + diff --git a/queue-6.1/drm-amd-display-fix-failed-to-blank-crtc.patch b/queue-6.1/drm-amd-display-fix-failed-to-blank-crtc.patch new file mode 100644 index 0000000000..18a2f081cc --- /dev/null +++ b/queue-6.1/drm-amd-display-fix-failed-to-blank-crtc.patch @@ -0,0 +1,48 @@ +From 1a08c882f0357e188da713e91c6ed52bfd2b8803 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Jun 2025 16:37:08 -0400 +Subject: drm/amd/display: Fix 'failed to blank crtc!' +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Wen Chen + +[ Upstream commit 01f60348d8fb6b3fbcdfc7bdde5d669f95b009a4 ] + +[why] +DCN35 is having “DC: failed to blank crtc!” when running HPO +test cases. It's caused by not having sufficient udelay time. + +[how] +Replace the old wait_for_blank_complete function with fsleep function to +sleep just until the next frame should come up. This way it doesn't poll +in case the pixel clock or other clock was bugged or until vactive and +the vblank are hit again. + +Reviewed-by: Nicholas Kazlauskas +Signed-off-by: Wen Chen +Signed-off-by: Fangzhi Zuo +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +index d8cf5f20ef3b..d252d10c8134 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +@@ -757,7 +757,7 @@ enum dc_status dcn20_enable_stream_timing( + return DC_ERROR_UNEXPECTED; + } + +- hws->funcs.wait_for_blank_complete(pipe_ctx->stream_res.opp); ++ fsleep(stream->timing.v_total * (stream->timing.h_total * 10000u / stream->timing.pix_clk_100hz)); + + params.vertical_total_min = stream->adjust.v_total_min; + params.vertical_total_max = stream->adjust.v_total_max; +-- +2.39.5 + diff --git a/queue-6.1/drm-amd-display-only-finalize-atomic_obj-if-it-was-i.patch b/queue-6.1/drm-amd-display-only-finalize-atomic_obj-if-it-was-i.patch new file mode 100644 index 0000000000..6d66f63ee3 --- /dev/null +++ b/queue-6.1/drm-amd-display-only-finalize-atomic_obj-if-it-was-i.patch @@ -0,0 +1,43 @@ +From 9a41e47a3e23e4f3eef4d37e27200fdc65ef1b95 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 14:41:46 -0500 +Subject: drm/amd/display: Only finalize atomic_obj if it was initialized + +From: Mario Limonciello + +[ Upstream commit b174084b3fe15ad1acc69530e673c1535d2e4f85 ] + +[Why] +If amdgpu_dm failed to initalize before amdgpu_dm_initialize_drm_device() +completed then freeing atomic_obj will lead to list corruption. + +[How] +Check if atomic_obj state is initialized before trying to free. + +Reviewed-by: Harry Wentland +Signed-off-by: Mario Limonciello +Signed-off-by: Ivan Lipski +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 64f626cc7913..8cd88b2aa54c 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -4638,7 +4638,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) + + static void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm) + { +- drm_atomic_private_obj_fini(&dm->atomic_obj); ++ if (dm->atomic_obj.state) ++ drm_atomic_private_obj_fini(&dm->atomic_obj); + } + + /****************************************************************************** +-- +2.39.5 + diff --git a/queue-6.1/drm-amd-display-separate-set_gsl-from-set_gsl_source.patch b/queue-6.1/drm-amd-display-separate-set_gsl-from-set_gsl_source.patch new file mode 100644 index 0000000000..af3dff48ac --- /dev/null +++ b/queue-6.1/drm-amd-display-separate-set_gsl-from-set_gsl_source.patch @@ -0,0 +1,49 @@ +From 02387c56f02fcc5822d6b0e9e533d15da477c05a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 13:07:14 -0400 +Subject: drm/amd/display: Separate set_gsl from set_gsl_source_select + +From: Ilya Bakoulin + +[ Upstream commit 660a467a5e7366cd6642de61f1aaeaf0d253ee68 ] + +[Why/How] +Separate the checks for set_gsl and set_gsl_source_select, since +source_select may not be implemented/necessary. + +Reviewed-by: Nevenko Stupar +Signed-off-by: Ilya Bakoulin +Signed-off-by: Ray Wu +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +index 81b1ab55338a..d8cf5f20ef3b 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +@@ -164,14 +164,13 @@ static void dcn20_setup_gsl_group_as_lock( + } + + /* at this point we want to program whether it's to enable or disable */ +- if (pipe_ctx->stream_res.tg->funcs->set_gsl != NULL && +- pipe_ctx->stream_res.tg->funcs->set_gsl_source_select != NULL) { ++ if (pipe_ctx->stream_res.tg->funcs->set_gsl != NULL) { + pipe_ctx->stream_res.tg->funcs->set_gsl( + pipe_ctx->stream_res.tg, + &gsl); +- +- pipe_ctx->stream_res.tg->funcs->set_gsl_source_select( +- pipe_ctx->stream_res.tg, group_idx, enable ? 4 : 0); ++ if (pipe_ctx->stream_res.tg->funcs->set_gsl_source_select != NULL) ++ pipe_ctx->stream_res.tg->funcs->set_gsl_source_select( ++ pipe_ctx->stream_res.tg, group_idx, enable ? 4 : 0); + } else + BREAK_TO_DEBUGGER(); + } +-- +2.39.5 + diff --git a/queue-6.1/drm-msm-use-trylock-for-debugfs.patch b/queue-6.1/drm-msm-use-trylock-for-debugfs.patch new file mode 100644 index 0000000000..30b32539a8 --- /dev/null +++ b/queue-6.1/drm-msm-use-trylock-for-debugfs.patch @@ -0,0 +1,65 @@ +From df317cc14fbbe58fc26d444c33347e195a4b32bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 29 Jun 2025 13:13:22 -0700 +Subject: drm/msm: use trylock for debugfs + +From: Rob Clark + +[ Upstream commit 0a1ff88ec5b60b41ba830c5bf08b6cd8f45ab411 ] + +This resolves a potential deadlock vs msm_gem_vm_close(). Otherwise for +_NO_SHARE buffers msm_gem_describe() could be trying to acquire the +shared vm resv, while already holding priv->obj_lock. But _vm_close() +might drop the last reference to a GEM obj while already holding the vm +resv, and msm_gem_free_object() needs to grab priv->obj_lock, a locking +inversion. + +OTOH this is only for debugfs and it isn't critical if we undercount by +skipping a locked obj. So just use trylock() and move along if we can't +get the lock. + +Signed-off-by: Rob Clark +Signed-off-by: Rob Clark +Tested-by: Antonino Maniscalco +Reviewed-by: Antonino Maniscalco +Patchwork: https://patchwork.freedesktop.org/patch/661525/ +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/msm_gem.c | 3 ++- + drivers/gpu/drm/msm/msm_gem.h | 6 ++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c +index 1dee0d18abbb..7116c2aac4cb 100644 +--- a/drivers/gpu/drm/msm/msm_gem.c ++++ b/drivers/gpu/drm/msm/msm_gem.c +@@ -874,7 +874,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, + uint64_t off = drm_vma_node_start(&obj->vma_node); + const char *madv; + +- msm_gem_lock(obj); ++ if (!msm_gem_trylock(obj)) ++ return; + + stats->all.count++; + stats->all.size += obj->size; +diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h +index c4844cf3a585..4c8e0a022c24 100644 +--- a/drivers/gpu/drm/msm/msm_gem.h ++++ b/drivers/gpu/drm/msm/msm_gem.h +@@ -185,6 +185,12 @@ msm_gem_lock(struct drm_gem_object *obj) + dma_resv_lock(obj->resv, NULL); + } + ++static inline bool __must_check ++msm_gem_trylock(struct drm_gem_object *obj) ++{ ++ return dma_resv_trylock(obj->resv); ++} ++ + static inline int + msm_gem_lock_interruptible(struct drm_gem_object *obj) + { +-- +2.39.5 + diff --git a/queue-6.1/drm-ttm-respect-the-shrinker-core-free-target.patch b/queue-6.1/drm-ttm-respect-the-shrinker-core-free-target.patch new file mode 100644 index 0000000000..f86b5ebf88 --- /dev/null +++ b/queue-6.1/drm-ttm-respect-the-shrinker-core-free-target.patch @@ -0,0 +1,76 @@ +From ffa21de1dc58529d5083a5d144513e8e1a50a3c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Jun 2025 12:27:49 +0100 +Subject: drm/ttm: Respect the shrinker core free target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Tvrtko Ursulin + +[ Upstream commit eac21f8ebeb4f84d703cf41dc3f81d16fa9dc00a ] + +Currently the TTM shrinker aborts shrinking as soon as it frees pages from +any of the page order pools and by doing so it can fail to respect the +freeing target which was configured by the shrinker core. + +We use the wording "can fail" because the number of freed pages will +depend on the presence of pages in the pools and the order of the pools on +the LRU list. For example if there are no free pages in the high order +pools the shrinker core may require multiple passes over the TTM shrinker +before it will free the default target of 128 pages (assuming there are +free pages in the low order pools). This inefficiency can be compounded by +the pool LRU where multiple further calls into the TTM shrinker are +required to end up looking at the pool with pages. + +Improve this by never freeing less than the shrinker core has requested. + +At the same time we start reporting the number of scanned pages (freed in +this case), which prevents the core shrinker from giving up on the TTM +shrinker too soon and moving on. + +v2: + * Simplify loop logic. (Christian) + * Improve commit message. + +Signed-off-by: Tvrtko Ursulin +Cc: Christian König +Cc: Thomas Hellström +Reviewed-by: Christian König +Signed-off-by: Tvrtko Ursulin +Link: https://lore.kernel.org/r/20250603112750.34997-2-tvrtko.ursulin@igalia.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/ttm/ttm_pool.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c +index 393b97b4a991..a223208b83e0 100644 +--- a/drivers/gpu/drm/ttm/ttm_pool.c ++++ b/drivers/gpu/drm/ttm/ttm_pool.c +@@ -592,7 +592,6 @@ void ttm_pool_fini(struct ttm_pool *pool) + synchronize_shrinkers(); + } + +-/* As long as pages are available make sure to release at least one */ + static unsigned long ttm_pool_shrinker_scan(struct shrinker *shrink, + struct shrink_control *sc) + { +@@ -600,9 +599,12 @@ static unsigned long ttm_pool_shrinker_scan(struct shrinker *shrink, + + do + num_freed += ttm_pool_shrink(); +- while (!num_freed && atomic_long_read(&allocated_pages)); ++ while (num_freed < sc->nr_to_scan && ++ atomic_long_read(&allocated_pages)); + +- return num_freed; ++ sc->nr_scanned = num_freed; ++ ++ return num_freed ?: SHRINK_STOP; + } + + /* Return the number of pages available or SHRINK_EMPTY if we have none */ +-- +2.39.5 + diff --git a/queue-6.1/drm-ttm-should-to-return-the-evict-error.patch b/queue-6.1/drm-ttm-should-to-return-the-evict-error.patch new file mode 100644 index 0000000000..5514ad83ed --- /dev/null +++ b/queue-6.1/drm-ttm-should-to-return-the-evict-error.patch @@ -0,0 +1,45 @@ +From 530ef8099a2114fa22b2cf3eb73881cc3119df52 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Jun 2025 17:11:54 +0800 +Subject: drm/ttm: Should to return the evict error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Emily Deng + +[ Upstream commit 4e16a9a00239db5d819197b9a00f70665951bf50 ] + +For the evict fail case, the evict error should be returned. + +v2: Consider ENOENT case. + +v3: Abort directly when the eviction failed for some reason (except for -ENOENT) + and not wait for the move to finish + +Signed-off-by: Emily Deng +Reviewed-by: Christian König +Signed-off-by: Christian König +Link: https://lore.kernel.org/r/20250603091154.3472646-1-Emily.Deng@amd.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/ttm/ttm_resource.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c +index 3287032a2f8e..ad3c398fc278 100644 +--- a/drivers/gpu/drm/ttm/ttm_resource.c ++++ b/drivers/gpu/drm/ttm/ttm_resource.c +@@ -437,6 +437,9 @@ int ttm_resource_manager_evict_all(struct ttm_device *bdev, + } + spin_unlock(&bdev->lru_lock); + ++ if (ret && ret != -ENOENT) ++ return ret; ++ + spin_lock(&man->move_lock); + fence = dma_fence_get(man->move); + spin_unlock(&man->move_lock); +-- +2.39.5 + diff --git a/queue-6.1/edac-synopsys-clear-the-ecc-counters-on-init.patch b/queue-6.1/edac-synopsys-clear-the-ecc-counters-on-init.patch new file mode 100644 index 0000000000..e247266917 --- /dev/null +++ b/queue-6.1/edac-synopsys-clear-the-ecc-counters-on-init.patch @@ -0,0 +1,202 @@ +From def52f2a979ed070b3b8f4ea5ef1b82fb5e46200 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 13 Jul 2025 10:37:53 +0530 +Subject: EDAC/synopsys: Clear the ECC counters on init + +From: Shubhrajyoti Datta + +[ Upstream commit b1dc7f097b78eb8d25b071ead2384b07a549692b ] + +Clear the ECC error and counter registers during initialization/probe to avoid +reporting stale errors that may have occurred before EDAC registration. + +For that, unify the Zynq and ZynqMP ECC state reading paths and simplify the +code. + + [ bp: Massage commit message. + Fix an -Wsometimes-uninitialized warning as reported by + Reported-by: kernel test robot + Closes: https://lore.kernel.org/oe-kbuild-all/202507141048.obUv3ZUm-lkp@intel.com ] + +Signed-off-by: Shubhrajyoti Datta +Signed-off-by: Borislav Petkov (AMD) +Link: https://lore.kernel.org/20250713050753.7042-1-shubhrajyoti.datta@amd.com +Signed-off-by: Sasha Levin +--- + drivers/edac/synopsys_edac.c | 97 +++++++++++++++++------------------- + 1 file changed, 46 insertions(+), 51 deletions(-) + +diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c +index e7c18bb61f81..c02ad4f984ad 100644 +--- a/drivers/edac/synopsys_edac.c ++++ b/drivers/edac/synopsys_edac.c +@@ -333,20 +333,26 @@ struct synps_edac_priv { + #endif + }; + ++enum synps_platform_type { ++ ZYNQ, ++ ZYNQMP, ++ SYNPS, ++}; ++ + /** + * struct synps_platform_data - synps platform data structure. ++ * @platform: Identifies the target hardware platform + * @get_error_info: Get EDAC error info. + * @get_mtype: Get mtype. + * @get_dtype: Get dtype. +- * @get_ecc_state: Get ECC state. + * @get_mem_info: Get EDAC memory info + * @quirks: To differentiate IPs. + */ + struct synps_platform_data { ++ enum synps_platform_type platform; + int (*get_error_info)(struct synps_edac_priv *priv); + enum mem_type (*get_mtype)(const void __iomem *base); + enum dev_type (*get_dtype)(const void __iomem *base); +- bool (*get_ecc_state)(void __iomem *base); + #ifdef CONFIG_EDAC_DEBUG + u64 (*get_mem_info)(struct synps_edac_priv *priv); + #endif +@@ -721,51 +727,38 @@ static enum dev_type zynqmp_get_dtype(const void __iomem *base) + return dt; + } + +-/** +- * zynq_get_ecc_state - Return the controller ECC enable/disable status. +- * @base: DDR memory controller base address. +- * +- * Get the ECC enable/disable status of the controller. +- * +- * Return: true if enabled, otherwise false. +- */ +-static bool zynq_get_ecc_state(void __iomem *base) ++static bool get_ecc_state(struct synps_edac_priv *priv) + { ++ u32 ecctype, clearval; + enum dev_type dt; +- u32 ecctype; +- +- dt = zynq_get_dtype(base); +- if (dt == DEV_UNKNOWN) +- return false; + +- ecctype = readl(base + SCRUB_OFST) & SCRUB_MODE_MASK; +- if ((ecctype == SCRUB_MODE_SECDED) && (dt == DEV_X2)) +- return true; +- +- return false; +-} +- +-/** +- * zynqmp_get_ecc_state - Return the controller ECC enable/disable status. +- * @base: DDR memory controller base address. +- * +- * Get the ECC enable/disable status for the controller. +- * +- * Return: a ECC status boolean i.e true/false - enabled/disabled. +- */ +-static bool zynqmp_get_ecc_state(void __iomem *base) +-{ +- enum dev_type dt; +- u32 ecctype; +- +- dt = zynqmp_get_dtype(base); +- if (dt == DEV_UNKNOWN) +- return false; +- +- ecctype = readl(base + ECC_CFG0_OFST) & SCRUB_MODE_MASK; +- if ((ecctype == SCRUB_MODE_SECDED) && +- ((dt == DEV_X2) || (dt == DEV_X4) || (dt == DEV_X8))) +- return true; ++ if (priv->p_data->platform == ZYNQ) { ++ dt = zynq_get_dtype(priv->baseaddr); ++ if (dt == DEV_UNKNOWN) ++ return false; ++ ++ ecctype = readl(priv->baseaddr + SCRUB_OFST) & SCRUB_MODE_MASK; ++ if (ecctype == SCRUB_MODE_SECDED && dt == DEV_X2) { ++ clearval = ECC_CTRL_CLR_CE_ERR | ECC_CTRL_CLR_UE_ERR; ++ writel(clearval, priv->baseaddr + ECC_CTRL_OFST); ++ writel(0x0, priv->baseaddr + ECC_CTRL_OFST); ++ return true; ++ } ++ } else { ++ dt = zynqmp_get_dtype(priv->baseaddr); ++ if (dt == DEV_UNKNOWN) ++ return false; ++ ++ ecctype = readl(priv->baseaddr + ECC_CFG0_OFST) & SCRUB_MODE_MASK; ++ if (ecctype == SCRUB_MODE_SECDED && ++ (dt == DEV_X2 || dt == DEV_X4 || dt == DEV_X8)) { ++ clearval = readl(priv->baseaddr + ECC_CLR_OFST) | ++ ECC_CTRL_CLR_CE_ERR | ECC_CTRL_CLR_CE_ERRCNT | ++ ECC_CTRL_CLR_UE_ERR | ECC_CTRL_CLR_UE_ERRCNT; ++ writel(clearval, priv->baseaddr + ECC_CLR_OFST); ++ return true; ++ } ++ } + + return false; + } +@@ -935,18 +928,18 @@ static int setup_irq(struct mem_ctl_info *mci, + } + + static const struct synps_platform_data zynq_edac_def = { ++ .platform = ZYNQ, + .get_error_info = zynq_get_error_info, + .get_mtype = zynq_get_mtype, + .get_dtype = zynq_get_dtype, +- .get_ecc_state = zynq_get_ecc_state, + .quirks = 0, + }; + + static const struct synps_platform_data zynqmp_edac_def = { ++ .platform = ZYNQMP, + .get_error_info = zynqmp_get_error_info, + .get_mtype = zynqmp_get_mtype, + .get_dtype = zynqmp_get_dtype, +- .get_ecc_state = zynqmp_get_ecc_state, + #ifdef CONFIG_EDAC_DEBUG + .get_mem_info = zynqmp_get_mem_info, + #endif +@@ -958,10 +951,10 @@ static const struct synps_platform_data zynqmp_edac_def = { + }; + + static const struct synps_platform_data synopsys_edac_def = { ++ .platform = SYNPS, + .get_error_info = zynqmp_get_error_info, + .get_mtype = zynqmp_get_mtype, + .get_dtype = zynqmp_get_dtype, +- .get_ecc_state = zynqmp_get_ecc_state, + .quirks = (DDR_ECC_INTR_SUPPORT | DDR_ECC_INTR_SELF_CLEAR + #ifdef CONFIG_EDAC_DEBUG + | DDR_ECC_DATA_POISON_SUPPORT +@@ -1393,10 +1386,6 @@ static int mc_probe(struct platform_device *pdev) + if (!p_data) + return -ENODEV; + +- if (!p_data->get_ecc_state(baseaddr)) { +- edac_printk(KERN_INFO, EDAC_MC, "ECC not enabled\n"); +- return -ENXIO; +- } + + layers[0].type = EDAC_MC_LAYER_CHIP_SELECT; + layers[0].size = SYNPS_EDAC_NR_CSROWS; +@@ -1416,6 +1405,12 @@ static int mc_probe(struct platform_device *pdev) + priv = mci->pvt_info; + priv->baseaddr = baseaddr; + priv->p_data = p_data; ++ if (!get_ecc_state(priv)) { ++ edac_printk(KERN_INFO, EDAC_MC, "ECC not enabled\n"); ++ rc = -ENODEV; ++ goto free_edac_mc; ++ } ++ + spin_lock_init(&priv->reglock); + + mc_init(mci, pdev); +-- +2.39.5 + diff --git a/queue-6.1/et131x-add-missing-check-after-dma-map.patch b/queue-6.1/et131x-add-missing-check-after-dma-map.patch new file mode 100644 index 0000000000..f0fcf02c30 --- /dev/null +++ b/queue-6.1/et131x-add-missing-check-after-dma-map.patch @@ -0,0 +1,100 @@ +From 55b8750d9cd8bd92afeccbd2ceddff0771ccdf74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jul 2025 11:47:30 +0200 +Subject: et131x: Add missing check after DMA map + +From: Thomas Fourier + +[ Upstream commit d61f6cb6f6ef3c70d2ccc0d9c85c508cb8017da9 ] + +The DMA map functions can fail and should be tested for errors. +If the mapping fails, unmap and return an error. + +Signed-off-by: Thomas Fourier +Acked-by: Mark Einon +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250716094733.28734-2-fourier.thomas@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/agere/et131x.c | 36 +++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c +index 5fab589b3ddf..03e7f8084965 100644 +--- a/drivers/net/ethernet/agere/et131x.c ++++ b/drivers/net/ethernet/agere/et131x.c +@@ -2459,6 +2459,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) + skb->data, + skb_headlen(skb), + DMA_TO_DEVICE); ++ if (dma_mapping_error(&adapter->pdev->dev, ++ dma_addr)) ++ return -ENOMEM; ++ + desc[frag].addr_lo = lower_32_bits(dma_addr); + desc[frag].addr_hi = upper_32_bits(dma_addr); + frag++; +@@ -2468,6 +2472,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) + skb->data, + skb_headlen(skb) / 2, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&adapter->pdev->dev, ++ dma_addr)) ++ return -ENOMEM; ++ + desc[frag].addr_lo = lower_32_bits(dma_addr); + desc[frag].addr_hi = upper_32_bits(dma_addr); + frag++; +@@ -2478,6 +2486,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) + skb_headlen(skb) / 2, + skb_headlen(skb) / 2, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&adapter->pdev->dev, ++ dma_addr)) ++ goto unmap_first_out; ++ + desc[frag].addr_lo = lower_32_bits(dma_addr); + desc[frag].addr_hi = upper_32_bits(dma_addr); + frag++; +@@ -2489,6 +2501,9 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) + 0, + desc[frag].len_vlan, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&adapter->pdev->dev, dma_addr)) ++ goto unmap_out; ++ + desc[frag].addr_lo = lower_32_bits(dma_addr); + desc[frag].addr_hi = upper_32_bits(dma_addr); + frag++; +@@ -2578,6 +2593,27 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) + &adapter->regs->global.watchdog_timer); + } + return 0; ++ ++unmap_out: ++ // Unmap the body of the packet with map_page ++ while (--i) { ++ frag--; ++ dma_addr = desc[frag].addr_lo; ++ dma_addr |= (u64)desc[frag].addr_hi << 32; ++ dma_unmap_page(&adapter->pdev->dev, dma_addr, ++ desc[frag].len_vlan, DMA_TO_DEVICE); ++ } ++ ++unmap_first_out: ++ // Unmap the header with map_single ++ while (frag--) { ++ dma_addr = desc[frag].addr_lo; ++ dma_addr |= (u64)desc[frag].addr_hi << 32; ++ dma_unmap_single(&adapter->pdev->dev, dma_addr, ++ desc[frag].len_vlan, DMA_TO_DEVICE); ++ } ++ ++ return -ENOMEM; + } + + static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter) +-- +2.39.5 + diff --git a/queue-6.1/ext2-handle-fiemap-on-empty-files-to-prevent-einval.patch b/queue-6.1/ext2-handle-fiemap-on-empty-files-to-prevent-einval.patch new file mode 100644 index 0000000000..9b262536db --- /dev/null +++ b/queue-6.1/ext2-handle-fiemap-on-empty-files-to-prevent-einval.patch @@ -0,0 +1,51 @@ +From 88ad21037a432016c652ae659c30629ea88bdd31 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 11:18:38 -0400 +Subject: ext2: Handle fiemap on empty files to prevent EINVAL + +From: Wei Gao + +[ Upstream commit a099b09a3342a0b28ea330e405501b5b4d0424b4 ] + +Previously, ext2_fiemap would unconditionally apply "len = min_t(u64, len, +i_size_read(inode));", When inode->i_size was 0 (for an empty file), this +would reduce the requested len to 0. Passing len = 0 to iomap_fiemap could +then result in an -EINVAL error, even for valid queries on empty files. + +Link: https://github.com/linux-test-project/ltp/issues/1246 +Signed-off-by: Wei Gao +Signed-off-by: Jan Kara +Link: https://patch.msgid.link/20250613152402.3432135-1-wegao@suse.com +Signed-off-by: Sasha Levin +--- + fs/ext2/inode.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c +index 5a32fcd55183..430ccd983491 100644 +--- a/fs/ext2/inode.c ++++ b/fs/ext2/inode.c +@@ -860,9 +860,19 @@ int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, + u64 start, u64 len) + { + int ret; ++ loff_t i_size; + + inode_lock(inode); +- len = min_t(u64, len, i_size_read(inode)); ++ i_size = i_size_read(inode); ++ /* ++ * iomap_fiemap() returns EINVAL for 0 length. Make sure we don't trim ++ * length to 0 but still trim the range as much as possible since ++ * ext2_get_blocks() iterates unmapped space block by block which is ++ * slow. ++ */ ++ if (i_size == 0) ++ i_size = 1; ++ len = min_t(u64, len, i_size); + ret = iomap_fiemap(inode, fieinfo, start, len, &ext2_iomap_ops); + inode_unlock(inode); + +-- +2.39.5 + diff --git a/queue-6.1/ext4-do-not-bug-when-inline_data_fl-lacks-system.dat.patch b/queue-6.1/ext4-do-not-bug-when-inline_data_fl-lacks-system.dat.patch new file mode 100644 index 0000000000..c3aba4bb2f --- /dev/null +++ b/queue-6.1/ext4-do-not-bug-when-inline_data_fl-lacks-system.dat.patch @@ -0,0 +1,73 @@ +From 900e87c9302cf6baf2d3a2d8cfcbe30ba578c2a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 10:54:34 -0400 +Subject: ext4: do not BUG when INLINE_DATA_FL lacks system.data xattr + +From: Theodore Ts'o + +[ Upstream commit 099b847ccc6c1ad2f805d13cfbcc83f5b6d4bc42 ] + +A syzbot fuzzed image triggered a BUG_ON in ext4_update_inline_data() +when an inode had the INLINE_DATA_FL flag set but was missing the +system.data extended attribute. + +Since this can happen due to a maiciouly fuzzed file system, we +shouldn't BUG, but rather, report it as a corrupted file system. + +Add similar replacements of BUG_ON with EXT4_ERROR_INODE() ii +ext4_create_inline_data() and ext4_inline_data_truncate(). + +Reported-by: syzbot+544248a761451c0df72f@syzkaller.appspotmail.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Sasha Levin +--- + fs/ext4/inline.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c +index 312be3d7cfb3..af2d6e92cb7f 100644 +--- a/fs/ext4/inline.c ++++ b/fs/ext4/inline.c +@@ -299,7 +299,11 @@ static int ext4_create_inline_data(handle_t *handle, + if (error) + goto out; + +- BUG_ON(!is.s.not_found); ++ if (!is.s.not_found) { ++ EXT4_ERROR_INODE(inode, "unexpected inline data xattr"); ++ error = -EFSCORRUPTED; ++ goto out; ++ } + + error = ext4_xattr_ibody_set(handle, inode, &i, &is); + if (error) { +@@ -350,7 +354,11 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode, + if (error) + goto out; + +- BUG_ON(is.s.not_found); ++ if (is.s.not_found) { ++ EXT4_ERROR_INODE(inode, "missing inline data xattr"); ++ error = -EFSCORRUPTED; ++ goto out; ++ } + + len -= EXT4_MIN_INLINE_DATA_SIZE; + value = kzalloc(len, GFP_NOFS); +@@ -2002,7 +2010,12 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline) + if ((err = ext4_xattr_ibody_find(inode, &i, &is)) != 0) + goto out_error; + +- BUG_ON(is.s.not_found); ++ if (is.s.not_found) { ++ EXT4_ERROR_INODE(inode, ++ "missing inline data xattr"); ++ err = -EFSCORRUPTED; ++ goto out_error; ++ } + + value_len = le32_to_cpu(is.s.here->e_value_size); + value = kmalloc(value_len, GFP_NOFS); +-- +2.39.5 + diff --git a/queue-6.1/fbdev-fix-potential-buffer-overflow-in-do_register_f.patch b/queue-6.1/fbdev-fix-potential-buffer-overflow-in-do_register_f.patch new file mode 100644 index 0000000000..a82f7e5e48 --- /dev/null +++ b/queue-6.1/fbdev-fix-potential-buffer-overflow-in-do_register_f.patch @@ -0,0 +1,40 @@ +From 80a46425e0637ee895447468881be2d65daa9cb8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 17:07:04 +0800 +Subject: fbdev: fix potential buffer overflow in do_register_framebuffer() + +From: Yongzhen Zhang + +[ Upstream commit 523b84dc7ccea9c4d79126d6ed1cf9033cf83b05 ] + +The current implementation may lead to buffer overflow when: +1. Unregistration creates NULL gaps in registered_fb[] +2. All array slots become occupied despite num_registered_fb < FB_MAX +3. The registration loop exceeds array bounds + +Add boundary check to prevent registered_fb[FB_MAX] access. + +Signed-off-by: Yongzhen Zhang +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/core/fbmem.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c +index f8c32c58b5b2..5128ffed6a23 100644 +--- a/drivers/video/fbdev/core/fbmem.c ++++ b/drivers/video/fbdev/core/fbmem.c +@@ -1549,6 +1549,9 @@ static int do_register_framebuffer(struct fb_info *fb_info) + if (!registered_fb[i]) + break; + ++ if (i >= FB_MAX) ++ return -ENXIO; ++ + if (!fb_info->modelist.prev || !fb_info->modelist.next) + INIT_LIST_HEAD(&fb_info->modelist); + +-- +2.39.5 + diff --git a/queue-6.1/fix-locking-in-efi_secret_unlink.patch b/queue-6.1/fix-locking-in-efi_secret_unlink.patch new file mode 100644 index 0000000000..4cb5fd08c0 --- /dev/null +++ b/queue-6.1/fix-locking-in-efi_secret_unlink.patch @@ -0,0 +1,46 @@ +From c9154c5cda900ef8bb390fe3d0a98dcd60389e91 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 May 2024 08:48:58 -0600 +Subject: fix locking in efi_secret_unlink() + +From: Al Viro + +[ Upstream commit 2c58d42de71f9c73e40afacc9d062892d2cc8862 ] + +We used to need securityfs_remove() to undo simple_pin_fs() done when +the file had been created and to drop the second extra reference +taken at the same time. Now that neither is needed (or done by +securityfs_remove()), we can simply call simple_unlink() and be done +with that - the broken games with locking had been there only for the +sake of securityfs_remove(). + +Signed-off-by: Al Viro +Signed-off-by: Sasha Levin +--- + drivers/virt/coco/efi_secret/efi_secret.c | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/drivers/virt/coco/efi_secret/efi_secret.c b/drivers/virt/coco/efi_secret/efi_secret.c +index e700a5ef7043..d996feb0509a 100644 +--- a/drivers/virt/coco/efi_secret/efi_secret.c ++++ b/drivers/virt/coco/efi_secret/efi_secret.c +@@ -136,15 +136,7 @@ static int efi_secret_unlink(struct inode *dir, struct dentry *dentry) + if (s->fs_files[i] == dentry) + s->fs_files[i] = NULL; + +- /* +- * securityfs_remove tries to lock the directory's inode, but we reach +- * the unlink callback when it's already locked +- */ +- inode_unlock(dir); +- securityfs_remove(dentry); +- inode_lock(dir); +- +- return 0; ++ return simple_unlink(inode, dentry); + } + + static const struct inode_operations efi_secret_dir_inode_operations = { +-- +2.39.5 + diff --git a/queue-6.1/fs-ntfs3-add-sanity-check-for-file-name.patch b/queue-6.1/fs-ntfs3-add-sanity-check-for-file-name.patch new file mode 100644 index 0000000000..c97e92d2b7 --- /dev/null +++ b/queue-6.1/fs-ntfs3-add-sanity-check-for-file-name.patch @@ -0,0 +1,37 @@ +From 0f1be3592e6cd49bffde5a999cca0da4c2e74457 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 13:16:16 +0800 +Subject: fs/ntfs3: Add sanity check for file name + +From: Lizhi Xu + +[ Upstream commit e841ecb139339602bc1853f5f09daa5d1ea920a2 ] + +The length of the file name should be smaller than the directory entry size. + +Reported-by: syzbot+598057afa0f49e62bd23@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=598057afa0f49e62bd23 +Signed-off-by: Lizhi Xu +Signed-off-by: Konstantin Komarov +Signed-off-by: Sasha Levin +--- + fs/ntfs3/dir.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/fs/ntfs3/dir.c b/fs/ntfs3/dir.c +index a4ab0164d150..c49e64ebbd0a 100644 +--- a/fs/ntfs3/dir.c ++++ b/fs/ntfs3/dir.c +@@ -304,6 +304,9 @@ static inline bool ntfs_dir_emit(struct ntfs_sb_info *sbi, + if (sbi->options->nohidden && (fname->dup.fa & FILE_ATTRIBUTE_HIDDEN)) + return true; + ++ if (fname->name_len + sizeof(struct NTFS_DE) > le16_to_cpu(e->size)) ++ return true; ++ + name_len = ntfs_utf16_to_nls(sbi, fname->name, fname->name_len, name, + PATH_MAX); + if (name_len <= 0) { +-- +2.39.5 + diff --git a/queue-6.1/fs-ntfs3-correctly-create-symlink-for-relative-path.patch b/queue-6.1/fs-ntfs3-correctly-create-symlink-for-relative-path.patch new file mode 100644 index 0000000000..1b2850208e --- /dev/null +++ b/queue-6.1/fs-ntfs3-correctly-create-symlink-for-relative-path.patch @@ -0,0 +1,100 @@ +From 22b918630f11874d52bb7e5d4f058896418d4a57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 7 May 2025 15:35:34 +0800 +Subject: fs/ntfs3: correctly create symlink for relative path + +From: Rong Zhang + +[ Upstream commit b1e9d89408f402858c00103f9831b25ffa0994d3 ] + +After applying this patch, could correctly create symlink: + +ln -s "relative/path/to/file" symlink + +Signed-off-by: Rong Zhang +[almaz.alexandrovich@paragon-software.com: added cpu_to_le32 macro to +rs->Flags assignment] +Signed-off-by: Konstantin Komarov +Signed-off-by: Sasha Levin +--- + fs/ntfs3/inode.c | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) + +diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c +index 5baf6a2b3d48..844113c3175c 100644 +--- a/fs/ntfs3/inode.c ++++ b/fs/ntfs3/inode.c +@@ -1114,10 +1114,10 @@ int inode_write_data(struct inode *inode, const void *data, size_t bytes) + * Number of bytes for REPARSE_DATA_BUFFER(IO_REPARSE_TAG_SYMLINK) + * for unicode string of @uni_len length. + */ +-static inline u32 ntfs_reparse_bytes(u32 uni_len) ++static inline u32 ntfs_reparse_bytes(u32 uni_len, bool is_absolute) + { + /* Header + unicode string + decorated unicode string. */ +- return sizeof(short) * (2 * uni_len + 4) + ++ return sizeof(short) * (2 * uni_len + (is_absolute ? 4 : 0)) + + offsetof(struct REPARSE_DATA_BUFFER, + SymbolicLinkReparseBuffer.PathBuffer); + } +@@ -1130,8 +1130,11 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, + struct REPARSE_DATA_BUFFER *rp; + __le16 *rp_name; + typeof(rp->SymbolicLinkReparseBuffer) *rs; ++ bool is_absolute; + +- rp = kzalloc(ntfs_reparse_bytes(2 * size + 2), GFP_NOFS); ++ is_absolute = (strlen(symname) > 1 && symname[1] == ':'); ++ ++ rp = kzalloc(ntfs_reparse_bytes(2 * size + 2, is_absolute), GFP_NOFS); + if (!rp) + return ERR_PTR(-ENOMEM); + +@@ -1146,7 +1149,7 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, + goto out; + + /* err = the length of unicode name of symlink. */ +- *nsize = ntfs_reparse_bytes(err); ++ *nsize = ntfs_reparse_bytes(err, is_absolute); + + if (*nsize > sbi->reparse.max_size) { + err = -EFBIG; +@@ -1166,7 +1169,7 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, + + /* PrintName + SubstituteName. */ + rs->SubstituteNameOffset = cpu_to_le16(sizeof(short) * err); +- rs->SubstituteNameLength = cpu_to_le16(sizeof(short) * err + 8); ++ rs->SubstituteNameLength = cpu_to_le16(sizeof(short) * err + (is_absolute ? 8 : 0)); + rs->PrintNameLength = rs->SubstituteNameOffset; + + /* +@@ -1174,16 +1177,18 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, + * parse this path. + * 0-absolute path 1- relative path (SYMLINK_FLAG_RELATIVE). + */ +- rs->Flags = 0; ++ rs->Flags = cpu_to_le32(is_absolute ? 0 : SYMLINK_FLAG_RELATIVE); + +- memmove(rp_name + err + 4, rp_name, sizeof(short) * err); ++ memmove(rp_name + err + (is_absolute ? 4 : 0), rp_name, sizeof(short) * err); + +- /* Decorate SubstituteName. */ +- rp_name += err; +- rp_name[0] = cpu_to_le16('\\'); +- rp_name[1] = cpu_to_le16('?'); +- rp_name[2] = cpu_to_le16('?'); +- rp_name[3] = cpu_to_le16('\\'); ++ if (is_absolute) { ++ /* Decorate SubstituteName. */ ++ rp_name += err; ++ rp_name[0] = cpu_to_le16('\\'); ++ rp_name[1] = cpu_to_le16('?'); ++ rp_name[2] = cpu_to_le16('?'); ++ rp_name[3] = cpu_to_le16('\\'); ++ } + + return rp; + out: +-- +2.39.5 + diff --git a/queue-6.1/fs-orangefs-use-snprintf-instead-of-sprintf.patch b/queue-6.1/fs-orangefs-use-snprintf-instead-of-sprintf.patch new file mode 100644 index 0000000000..43681d7da0 --- /dev/null +++ b/queue-6.1/fs-orangefs-use-snprintf-instead-of-sprintf.patch @@ -0,0 +1,47 @@ +From c15ec4a72fddb5110d335e42a21f812b61d78b92 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 8 Jun 2025 20:05:59 +0330 +Subject: fs/orangefs: use snprintf() instead of sprintf() + +From: Amir Mohammad Jahangirzad + +[ Upstream commit cdfa1304657d6f23be8fd2bb0516380a3c89034e ] + +sprintf() is discouraged for use with bounded destination buffers +as it does not prevent buffer overflows when the formatted output +exceeds the destination buffer size. snprintf() is a safer +alternative as it limits the number of bytes written and ensures +NUL-termination. + +Replace sprintf() with snprintf() for copying the debug string +into a temporary buffer, using ORANGEFS_MAX_DEBUG_STRING_LEN as +the maximum size to ensure safe formatting and prevent memory +corruption in edge cases. + +EDIT: After this patch sat on linux-next for a few days, Dan +Carpenter saw it and suggested that I use scnprintf instead of +snprintf. I made the change and retested. + +Signed-off-by: Amir Mohammad Jahangirzad +Signed-off-by: Mike Marshall +Signed-off-by: Sasha Levin +--- + fs/orangefs/orangefs-debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c +index b57140ebfad0..cd4bfd92ebd6 100644 +--- a/fs/orangefs/orangefs-debugfs.c ++++ b/fs/orangefs/orangefs-debugfs.c +@@ -354,7 +354,7 @@ static ssize_t orangefs_debug_read(struct file *file, + goto out; + + mutex_lock(&orangefs_debug_lock); +- sprintf_ret = sprintf(buf, "%s", (char *)file->private_data); ++ sprintf_ret = scnprintf(buf, ORANGEFS_MAX_DEBUG_STRING_LEN, "%s", (char *)file->private_data); + mutex_unlock(&orangefs_debug_lock); + + read_ret = simple_read_from_buffer(ubuf, count, ppos, buf, sprintf_ret); +-- +2.39.5 + diff --git a/queue-6.1/gpio-tps65912-check-the-return-value-of-regmap_updat.patch b/queue-6.1/gpio-tps65912-check-the-return-value-of-regmap_updat.patch new file mode 100644 index 0000000000..5a6b5f86cc --- /dev/null +++ b/queue-6.1/gpio-tps65912-check-the-return-value-of-regmap_updat.patch @@ -0,0 +1,42 @@ +From f39712889ed59c21a255f9aa3c674c53bd453d9b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Jul 2025 09:50:15 +0200 +Subject: gpio: tps65912: check the return value of regmap_update_bits() + +From: Bartosz Golaszewski + +[ Upstream commit a0b2a6bbff8c26aafdecd320f38f52c341d5cafa ] + +regmap_update_bits() can fail, check its return value like we do +elsewhere in the driver. + +Link: https://lore.kernel.org/r/20250707-gpiochip-set-rv-gpio-round4-v1-2-35668aaaf6d2@linaro.org +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-tps65912.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c +index fab771cb6a87..bac757c191c2 100644 +--- a/drivers/gpio/gpio-tps65912.c ++++ b/drivers/gpio/gpio-tps65912.c +@@ -49,10 +49,13 @@ static int tps65912_gpio_direction_output(struct gpio_chip *gc, + unsigned offset, int value) + { + struct tps65912_gpio *gpio = gpiochip_get_data(gc); ++ int ret; + + /* Set the initial value */ +- regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset, +- GPIO_SET_MASK, value ? GPIO_SET_MASK : 0); ++ ret = regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset, ++ GPIO_SET_MASK, value ? GPIO_SET_MASK : 0); ++ if (ret) ++ return ret; + + return regmap_update_bits(gpio->tps->regmap, TPS65912_GPIO1 + offset, + GPIO_CFG_MASK, GPIO_CFG_MASK); +-- +2.39.5 + diff --git a/queue-6.1/gpio-wcd934x-check-the-return-value-of-regmap_update.patch b/queue-6.1/gpio-wcd934x-check-the-return-value-of-regmap_update.patch new file mode 100644 index 0000000000..07f61f68b0 --- /dev/null +++ b/queue-6.1/gpio-wcd934x-check-the-return-value-of-regmap_update.patch @@ -0,0 +1,42 @@ +From e62f25718a5f4096a9d6b31921444bb86bbb7a40 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Jul 2025 08:41:39 +0200 +Subject: gpio: wcd934x: check the return value of regmap_update_bits() + +From: Bartosz Golaszewski + +[ Upstream commit ff0f0d7c6587e38c308be9905e36f86e98fb9c1f ] + +regmap_update_bits() can fail so check its return value in +wcd_gpio_direction_output() for consistency with the rest of the code +and propagate any errors. + +Link: https://lore.kernel.org/r/20250709-gpiochip-set-rv-gpio-remaining-v1-2-b8950f69618d@linaro.org +Signed-off-by: Bartosz Golaszewski +Signed-off-by: Sasha Levin +--- + drivers/gpio/gpio-wcd934x.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpio/gpio-wcd934x.c b/drivers/gpio/gpio-wcd934x.c +index 97e6caedf1f3..c00968ce7a56 100644 +--- a/drivers/gpio/gpio-wcd934x.c ++++ b/drivers/gpio/gpio-wcd934x.c +@@ -45,9 +45,12 @@ static int wcd_gpio_direction_output(struct gpio_chip *chip, unsigned int pin, + int val) + { + struct wcd_gpio_data *data = gpiochip_get_data(chip); ++ int ret; + +- regmap_update_bits(data->map, WCD_REG_DIR_CTL_OFFSET, +- WCD_PIN_MASK(pin), WCD_PIN_MASK(pin)); ++ ret = regmap_update_bits(data->map, WCD_REG_DIR_CTL_OFFSET, ++ WCD_PIN_MASK(pin), WCD_PIN_MASK(pin)); ++ if (ret) ++ return ret; + + return regmap_update_bits(data->map, WCD_REG_VAL_CTL_OFFSET, + WCD_PIN_MASK(pin), +-- +2.39.5 + diff --git a/queue-6.1/gve-return-error-for-unknown-admin-queue-command.patch b/queue-6.1/gve-return-error-for-unknown-admin-queue-command.patch new file mode 100644 index 0000000000..58495ff3e2 --- /dev/null +++ b/queue-6.1/gve-return-error-for-unknown-admin-queue-command.patch @@ -0,0 +1,41 @@ +From bfc58587e92d1eecf2b5385094e28babdcdc94f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 15 Jun 2025 22:45:01 -0700 +Subject: gve: Return error for unknown admin queue command + +From: Alok Tiwari + +[ Upstream commit b11344f63fdd9e8c5121148a6965b41079071dd2 ] + +In gve_adminq_issue_cmd(), return -EINVAL instead of 0 when an unknown +admin queue command opcode is encountered. + +This prevents the function from silently succeeding on invalid input +and prevents undefined behavior by ensuring the function fails gracefully +when an unrecognized opcode is provided. + +These changes improve error handling. + +Signed-off-by: Alok Tiwari +Link: https://patch.msgid.link/20250616054504.1644770-2-alok.a.tiwari@oracle.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/google/gve/gve_adminq.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c +index f7621ab672b9..32a9943432ac 100644 +--- a/drivers/net/ethernet/google/gve/gve_adminq.c ++++ b/drivers/net/ethernet/google/gve/gve_adminq.c +@@ -409,6 +409,7 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv, + break; + default: + dev_err(&priv->pdev->dev, "unknown AQ command opcode %d\n", opcode); ++ return -EINVAL; + } + + return 0; +-- +2.39.5 + diff --git a/queue-6.1/hfs-fix-not-erasing-deleted-b-tree-node-issue.patch b/queue-6.1/hfs-fix-not-erasing-deleted-b-tree-node-issue.patch new file mode 100644 index 0000000000..c1ef294a8f --- /dev/null +++ b/queue-6.1/hfs-fix-not-erasing-deleted-b-tree-node-issue.patch @@ -0,0 +1,105 @@ +From 7a4e8b1e2a194ae4f94c55a09080aa2b0937ad97 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Apr 2025 17:12:11 -0700 +Subject: hfs: fix not erasing deleted b-tree node issue + +From: Viacheslav Dubeyko + +[ Upstream commit d3ed6d6981f4756f145766753c872482bc3b28d3 ] + +The generic/001 test of xfstests suite fails and corrupts +the HFS volume: + +sudo ./check generic/001 +FSTYP -- hfs +PLATFORM -- Linux/x86_64 hfsplus-testing-0001 6.15.0-rc2+ #3 SMP PREEMPT_DYNAMIC Fri Apr 25 17:13:00 PDT 2> +MKFS_OPTIONS -- /dev/loop51 +MOUNT_OPTIONS -- /dev/loop51 /mnt/scratch + +generic/001 32s ... _check_generic_filesystem: filesystem on /dev/loop50 is inconsistent +(see /home/slavad/XFSTESTS-2/xfstests-dev/results//generic/001.full for details) + +Ran: generic/001 +Failures: generic/001 +Failed 1 of 1 tests + +fsck.hfs -d -n ./test-image.bin +** ./test-image.bin (NO WRITE) + Using cacheBlockSize=32K cacheTotalBlock=1024 cacheSize=32768K. + Executing fsck_hfs (version 540.1-Linux). +** Checking HFS volume. + The volume name is untitled +** Checking extents overflow file. +** Checking catalog file. + Unused node is not erased (node = 2) + Unused node is not erased (node = 4) + + Unused node is not erased (node = 253) + Unused node is not erased (node = 254) + Unused node is not erased (node = 255) + Unused node is not erased (node = 256) +** Checking catalog hierarchy. +** Checking volume bitmap. +** Checking volume information. + Verify Status: VIStat = 0x0000, ABTStat = 0x0000 EBTStat = 0x0000 + CBTStat = 0x0004 CatStat = 0x00000000 +** The volume untitled was found corrupt and needs to be repaired. + volume type is HFS + primary MDB is at block 2 0x02 + alternate MDB is at block 20971518 0x13ffffe + primary VHB is at block 0 0x00 + alternate VHB is at block 0 0x00 + sector size = 512 0x200 + VolumeObject flags = 0x19 + total sectors for volume = 20971520 0x1400000 + total sectors for embedded volume = 0 0x00 + +This patch adds logic of clearing the deleted b-tree node. + +sudo ./check generic/001 +FSTYP -- hfs +PLATFORM -- Linux/x86_64 hfsplus-testing-0001 6.15.0-rc2+ #3 SMP PREEMPT_DYNAMIC Fri Apr 25 17:13:00 PDT 2025 +MKFS_OPTIONS -- /dev/loop51 +MOUNT_OPTIONS -- /dev/loop51 /mnt/scratch + +generic/001 9s ... 32s +Ran: generic/001 +Passed all 1 tests + +fsck.hfs -d -n ./test-image.bin +** ./test-image.bin (NO WRITE) + Using cacheBlockSize=32K cacheTotalBlock=1024 cacheSize=32768K. + Executing fsck_hfs (version 540.1-Linux). +** Checking HFS volume. + The volume name is untitled +** Checking extents overflow file. +** Checking catalog file. +** Checking catalog hierarchy. +** Checking volume bitmap. +** Checking volume information. +** The volume untitled appears to be OK. + +Signed-off-by: Viacheslav Dubeyko +Reviewed-by: Johannes Thumshirn +Link: https://lore.kernel.org/r/20250430001211.1912533-1-slava@dubeyko.com +Signed-off-by: Viacheslav Dubeyko +Signed-off-by: Sasha Levin +--- + fs/hfs/bnode.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c +index 1dac5d9c055f..e8cd1a31f247 100644 +--- a/fs/hfs/bnode.c ++++ b/fs/hfs/bnode.c +@@ -574,6 +574,7 @@ void hfs_bnode_put(struct hfs_bnode *node) + if (test_bit(HFS_BNODE_DELETED, &node->flags)) { + hfs_bnode_unhash(node); + spin_unlock(&tree->hash_lock); ++ hfs_bnode_clear(node, 0, tree->node_size); + hfs_bmap_free(node); + hfs_bnode_free(node); + return; +-- +2.39.5 + diff --git a/queue-6.1/hfs-fix-slab-out-of-bounds-in-hfs_bnode_read.patch b/queue-6.1/hfs-fix-slab-out-of-bounds-in-hfs_bnode_read.patch new file mode 100644 index 0000000000..80da6d6269 --- /dev/null +++ b/queue-6.1/hfs-fix-slab-out-of-bounds-in-hfs_bnode_read.patch @@ -0,0 +1,166 @@ +From 69c4d51563874ec0c30292915a7fc80b992d26db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 14:49:12 -0700 +Subject: hfs: fix slab-out-of-bounds in hfs_bnode_read() + +From: Viacheslav Dubeyko + +[ Upstream commit a431930c9bac518bf99d6b1da526a7f37ddee8d8 ] + +This patch introduces is_bnode_offset_valid() method that checks +the requested offset value. Also, it introduces +check_and_correct_requested_length() method that checks and +correct the requested length (if it is necessary). These methods +are used in hfs_bnode_read(), hfs_bnode_write(), hfs_bnode_clear(), +hfs_bnode_copy(), and hfs_bnode_move() with the goal to prevent +the access out of allocated memory and triggering the crash. + +Signed-off-by: Viacheslav Dubeyko +Link: https://lore.kernel.org/r/20250703214912.244138-1-slava@dubeyko.com +Signed-off-by: Viacheslav Dubeyko +Signed-off-by: Sasha Levin +--- + fs/hfs/bnode.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c +index cb823a8a6ba9..1dac5d9c055f 100644 +--- a/fs/hfs/bnode.c ++++ b/fs/hfs/bnode.c +@@ -15,6 +15,48 @@ + + #include "btree.h" + ++static inline ++bool is_bnode_offset_valid(struct hfs_bnode *node, int off) ++{ ++ bool is_valid = off < node->tree->node_size; ++ ++ if (!is_valid) { ++ pr_err("requested invalid offset: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off); ++ } ++ ++ return is_valid; ++} ++ ++static inline ++int check_and_correct_requested_length(struct hfs_bnode *node, int off, int len) ++{ ++ unsigned int node_size; ++ ++ if (!is_bnode_offset_valid(node, off)) ++ return 0; ++ ++ node_size = node->tree->node_size; ++ ++ if ((off + len) > node_size) { ++ int new_len = (int)node_size - off; ++ ++ pr_err("requested length has been corrected: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, " ++ "requested_len %d, corrected_len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len, new_len); ++ ++ return new_len; ++ } ++ ++ return len; ++} ++ + void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) + { + struct page *page; +@@ -22,6 +64,20 @@ void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) + int bytes_read; + int bytes_to_read; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + pagenum = off >> PAGE_SHIFT; + off &= ~PAGE_MASK; /* compute page offset for the first page */ +@@ -80,6 +136,20 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len) + { + struct page *page; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + page = node->page[0]; + +@@ -104,6 +174,20 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len) + { + struct page *page; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + page = node->page[0]; + +@@ -119,6 +203,10 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst, + hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len); + if (!len) + return; ++ ++ len = check_and_correct_requested_length(src_node, src, len); ++ len = check_and_correct_requested_length(dst_node, dst, len); ++ + src += src_node->page_offset; + dst += dst_node->page_offset; + src_page = src_node->page[0]; +@@ -136,6 +224,10 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) + hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len); + if (!len) + return; ++ ++ len = check_and_correct_requested_length(node, src, len); ++ len = check_and_correct_requested_length(node, dst, len); ++ + src += node->page_offset; + dst += node->page_offset; + page = node->page[0]; +-- +2.39.5 + diff --git a/queue-6.1/hfsplus-don-t-use-bug_on-in-hfsplus_create_attribute.patch b/queue-6.1/hfsplus-don-t-use-bug_on-in-hfsplus_create_attribute.patch new file mode 100644 index 0000000000..dd663bec05 --- /dev/null +++ b/queue-6.1/hfsplus-don-t-use-bug_on-in-hfsplus_create_attribute.patch @@ -0,0 +1,46 @@ +From a2d1ee99ae8fa9f2cf7907d038ec8602c26b9997 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 14:17:56 +0900 +Subject: hfsplus: don't use BUG_ON() in hfsplus_create_attributes_file() + +From: Tetsuo Handa + +[ Upstream commit c7c6363ca186747ebc2df10c8a1a51e66e0e32d9 ] + +When the volume header contains erroneous values that do not reflect +the actual state of the filesystem, hfsplus_fill_super() assumes that +the attributes file is not yet created, which later results in hitting +BUG_ON() when hfsplus_create_attributes_file() is called. Replace this +BUG_ON() with -EIO error with a message to suggest running fsck tool. + +Reported-by: syzbot +Closes: https://syzkaller.appspot.com/bug?extid=1107451c16b9eb9d29e6 +Signed-off-by: Tetsuo Handa +Reviewed-by: Viacheslav Dubeyko +Link: https://lore.kernel.org/r/7b587d24-c8a1-4413-9b9a-00a33fbd849f@I-love.SAKURA.ne.jp +Signed-off-by: Viacheslav Dubeyko +Signed-off-by: Sasha Levin +--- + fs/hfsplus/xattr.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c +index 2b0e0ba58139..beedc1a2237a 100644 +--- a/fs/hfsplus/xattr.c ++++ b/fs/hfsplus/xattr.c +@@ -172,7 +172,11 @@ static int hfsplus_create_attributes_file(struct super_block *sb) + return PTR_ERR(attr_file); + } + +- BUG_ON(i_size_read(attr_file) != 0); ++ if (i_size_read(attr_file) != 0) { ++ err = -EIO; ++ pr_err("detected inconsistent attributes file, running fsck.hfsplus is recommended.\n"); ++ goto end_attr_file_creation; ++ } + + hip = HFSPLUS_I(attr_file); + +-- +2.39.5 + diff --git a/queue-6.1/hfsplus-fix-slab-out-of-bounds-in-hfsplus_bnode_read.patch b/queue-6.1/hfsplus-fix-slab-out-of-bounds-in-hfsplus_bnode_read.patch new file mode 100644 index 0000000000..d8ad9febe2 --- /dev/null +++ b/queue-6.1/hfsplus-fix-slab-out-of-bounds-in-hfsplus_bnode_read.patch @@ -0,0 +1,296 @@ +From f8942b79b968b77c63df3c4cf0b0d86cdf9ba732 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 14:48:04 -0700 +Subject: hfsplus: fix slab-out-of-bounds in hfsplus_bnode_read() + +From: Viacheslav Dubeyko + +[ Upstream commit c80aa2aaaa5e69d5219c6af8ef7e754114bd08d2 ] + +The hfsplus_bnode_read() method can trigger the issue: + +[ 174.852007][ T9784] ================================================================== +[ 174.852709][ T9784] BUG: KASAN: slab-out-of-bounds in hfsplus_bnode_read+0x2f4/0x360 +[ 174.853412][ T9784] Read of size 8 at addr ffff88810b5fc6c0 by task repro/9784 +[ 174.854059][ T9784] +[ 174.854272][ T9784] CPU: 1 UID: 0 PID: 9784 Comm: repro Not tainted 6.16.0-rc3 #7 PREEMPT(full) +[ 174.854281][ T9784] Hardware name: QEMU Ubuntu 24.04 PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 +[ 174.854286][ T9784] Call Trace: +[ 174.854289][ T9784] +[ 174.854292][ T9784] dump_stack_lvl+0x10e/0x1f0 +[ 174.854305][ T9784] print_report+0xd0/0x660 +[ 174.854315][ T9784] ? __virt_addr_valid+0x81/0x610 +[ 174.854323][ T9784] ? __phys_addr+0xe8/0x180 +[ 174.854330][ T9784] ? hfsplus_bnode_read+0x2f4/0x360 +[ 174.854337][ T9784] kasan_report+0xc6/0x100 +[ 174.854346][ T9784] ? hfsplus_bnode_read+0x2f4/0x360 +[ 174.854354][ T9784] hfsplus_bnode_read+0x2f4/0x360 +[ 174.854362][ T9784] hfsplus_bnode_dump+0x2ec/0x380 +[ 174.854370][ T9784] ? __pfx_hfsplus_bnode_dump+0x10/0x10 +[ 174.854377][ T9784] ? hfsplus_bnode_write_u16+0x83/0xb0 +[ 174.854385][ T9784] ? srcu_gp_start+0xd0/0x310 +[ 174.854393][ T9784] ? __mark_inode_dirty+0x29e/0xe40 +[ 174.854402][ T9784] hfsplus_brec_remove+0x3d2/0x4e0 +[ 174.854411][ T9784] __hfsplus_delete_attr+0x290/0x3a0 +[ 174.854419][ T9784] ? __pfx_hfs_find_1st_rec_by_cnid+0x10/0x10 +[ 174.854427][ T9784] ? __pfx___hfsplus_delete_attr+0x10/0x10 +[ 174.854436][ T9784] ? __asan_memset+0x23/0x50 +[ 174.854450][ T9784] hfsplus_delete_all_attrs+0x262/0x320 +[ 174.854459][ T9784] ? __pfx_hfsplus_delete_all_attrs+0x10/0x10 +[ 174.854469][ T9784] ? rcu_is_watching+0x12/0xc0 +[ 174.854476][ T9784] ? __mark_inode_dirty+0x29e/0xe40 +[ 174.854483][ T9784] hfsplus_delete_cat+0x845/0xde0 +[ 174.854493][ T9784] ? __pfx_hfsplus_delete_cat+0x10/0x10 +[ 174.854507][ T9784] hfsplus_unlink+0x1ca/0x7c0 +[ 174.854516][ T9784] ? __pfx_hfsplus_unlink+0x10/0x10 +[ 174.854525][ T9784] ? down_write+0x148/0x200 +[ 174.854532][ T9784] ? __pfx_down_write+0x10/0x10 +[ 174.854540][ T9784] vfs_unlink+0x2fe/0x9b0 +[ 174.854549][ T9784] do_unlinkat+0x490/0x670 +[ 174.854557][ T9784] ? __pfx_do_unlinkat+0x10/0x10 +[ 174.854565][ T9784] ? __might_fault+0xbc/0x130 +[ 174.854576][ T9784] ? getname_flags.part.0+0x1c5/0x550 +[ 174.854584][ T9784] __x64_sys_unlink+0xc5/0x110 +[ 174.854592][ T9784] do_syscall_64+0xc9/0x480 +[ 174.854600][ T9784] entry_SYSCALL_64_after_hwframe+0x77/0x7f +[ 174.854608][ T9784] RIP: 0033:0x7f6fdf4c3167 +[ 174.854614][ T9784] Code: f0 ff ff 73 01 c3 48 8b 0d 26 0d 0e 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 08 +[ 174.854622][ T9784] RSP: 002b:00007ffcb948bca8 EFLAGS: 00000206 ORIG_RAX: 0000000000000057 +[ 174.854630][ T9784] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f6fdf4c3167 +[ 174.854636][ T9784] RDX: 00007ffcb948bcc0 RSI: 00007ffcb948bcc0 RDI: 00007ffcb948bd50 +[ 174.854641][ T9784] RBP: 00007ffcb948cd90 R08: 0000000000000001 R09: 00007ffcb948bb40 +[ 174.854645][ T9784] R10: 00007f6fdf564fc0 R11: 0000000000000206 R12: 0000561e1bc9c2d0 +[ 174.854650][ T9784] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 +[ 174.854658][ T9784] +[ 174.854661][ T9784] +[ 174.879281][ T9784] Allocated by task 9784: +[ 174.879664][ T9784] kasan_save_stack+0x20/0x40 +[ 174.880082][ T9784] kasan_save_track+0x14/0x30 +[ 174.880500][ T9784] __kasan_kmalloc+0xaa/0xb0 +[ 174.880908][ T9784] __kmalloc_noprof+0x205/0x550 +[ 174.881337][ T9784] __hfs_bnode_create+0x107/0x890 +[ 174.881779][ T9784] hfsplus_bnode_find+0x2d0/0xd10 +[ 174.882222][ T9784] hfsplus_brec_find+0x2b0/0x520 +[ 174.882659][ T9784] hfsplus_delete_all_attrs+0x23b/0x320 +[ 174.883144][ T9784] hfsplus_delete_cat+0x845/0xde0 +[ 174.883595][ T9784] hfsplus_rmdir+0x106/0x1b0 +[ 174.884004][ T9784] vfs_rmdir+0x206/0x690 +[ 174.884379][ T9784] do_rmdir+0x2b7/0x390 +[ 174.884751][ T9784] __x64_sys_rmdir+0xc5/0x110 +[ 174.885167][ T9784] do_syscall_64+0xc9/0x480 +[ 174.885568][ T9784] entry_SYSCALL_64_after_hwframe+0x77/0x7f +[ 174.886083][ T9784] +[ 174.886293][ T9784] The buggy address belongs to the object at ffff88810b5fc600 +[ 174.886293][ T9784] which belongs to the cache kmalloc-192 of size 192 +[ 174.887507][ T9784] The buggy address is located 40 bytes to the right of +[ 174.887507][ T9784] allocated 152-byte region [ffff88810b5fc600, ffff88810b5fc698) +[ 174.888766][ T9784] +[ 174.888976][ T9784] The buggy address belongs to the physical page: +[ 174.889533][ T9784] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x10b5fc +[ 174.890295][ T9784] flags: 0x57ff00000000000(node=1|zone=2|lastcpupid=0x7ff) +[ 174.890927][ T9784] page_type: f5(slab) +[ 174.891284][ T9784] raw: 057ff00000000000 ffff88801b4423c0 ffffea000426dc80 dead000000000002 +[ 174.892032][ T9784] raw: 0000000000000000 0000000080100010 00000000f5000000 0000000000000000 +[ 174.892774][ T9784] page dumped because: kasan: bad access detected +[ 174.893327][ T9784] page_owner tracks the page as allocated +[ 174.893825][ T9784] page last allocated via order 0, migratetype Unmovable, gfp_mask 0x52c00(GFP_NOIO|__GFP_NOWARN|__GFP_NO1 +[ 174.895373][ T9784] post_alloc_hook+0x1c0/0x230 +[ 174.895801][ T9784] get_page_from_freelist+0xdeb/0x3b30 +[ 174.896284][ T9784] __alloc_frozen_pages_noprof+0x25c/0x2460 +[ 174.896810][ T9784] alloc_pages_mpol+0x1fb/0x550 +[ 174.897242][ T9784] new_slab+0x23b/0x340 +[ 174.897614][ T9784] ___slab_alloc+0xd81/0x1960 +[ 174.898028][ T9784] __slab_alloc.isra.0+0x56/0xb0 +[ 174.898468][ T9784] __kmalloc_noprof+0x2b0/0x550 +[ 174.898896][ T9784] usb_alloc_urb+0x73/0xa0 +[ 174.899289][ T9784] usb_control_msg+0x1cb/0x4a0 +[ 174.899718][ T9784] usb_get_string+0xab/0x1a0 +[ 174.900133][ T9784] usb_string_sub+0x107/0x3c0 +[ 174.900549][ T9784] usb_string+0x307/0x670 +[ 174.900933][ T9784] usb_cache_string+0x80/0x150 +[ 174.901355][ T9784] usb_new_device+0x1d0/0x19d0 +[ 174.901786][ T9784] register_root_hub+0x299/0x730 +[ 174.902231][ T9784] page last free pid 10 tgid 10 stack trace: +[ 174.902757][ T9784] __free_frozen_pages+0x80c/0x1250 +[ 174.903217][ T9784] vfree.part.0+0x12b/0xab0 +[ 174.903645][ T9784] delayed_vfree_work+0x93/0xd0 +[ 174.904073][ T9784] process_one_work+0x9b5/0x1b80 +[ 174.904519][ T9784] worker_thread+0x630/0xe60 +[ 174.904927][ T9784] kthread+0x3a8/0x770 +[ 174.905291][ T9784] ret_from_fork+0x517/0x6e0 +[ 174.905709][ T9784] ret_from_fork_asm+0x1a/0x30 +[ 174.906128][ T9784] +[ 174.906338][ T9784] Memory state around the buggy address: +[ 174.906828][ T9784] ffff88810b5fc580: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc +[ 174.907528][ T9784] ffff88810b5fc600: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[ 174.908222][ T9784] >ffff88810b5fc680: 00 00 00 fc fc fc fc fc fc fc fc fc fc fc fc fc +[ 174.908917][ T9784] ^ +[ 174.909481][ T9784] ffff88810b5fc700: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb +[ 174.910432][ T9784] ffff88810b5fc780: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc +[ 174.911401][ T9784] ================================================================== + +The reason of the issue that code doesn't check the correctness +of the requested offset and length. As a result, incorrect value +of offset or/and length could result in access out of allocated +memory. + +This patch introduces is_bnode_offset_valid() method that checks +the requested offset value. Also, it introduces +check_and_correct_requested_length() method that checks and +correct the requested length (if it is necessary). These methods +are used in hfsplus_bnode_read(), hfsplus_bnode_write(), +hfsplus_bnode_clear(), hfsplus_bnode_copy(), and hfsplus_bnode_move() +with the goal to prevent the access out of allocated memory +and triggering the crash. + +Reported-by: Kun Hu +Reported-by: Jiaji Qin +Reported-by: Shuoran Bai +Signed-off-by: Viacheslav Dubeyko +Link: https://lore.kernel.org/r/20250703214804.244077-1-slava@dubeyko.com +Signed-off-by: Viacheslav Dubeyko +Signed-off-by: Sasha Levin +--- + fs/hfsplus/bnode.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c +index 079ea80534f7..14f4995588ff 100644 +--- a/fs/hfsplus/bnode.c ++++ b/fs/hfsplus/bnode.c +@@ -18,12 +18,68 @@ + #include "hfsplus_fs.h" + #include "hfsplus_raw.h" + ++static inline ++bool is_bnode_offset_valid(struct hfs_bnode *node, int off) ++{ ++ bool is_valid = off < node->tree->node_size; ++ ++ if (!is_valid) { ++ pr_err("requested invalid offset: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off); ++ } ++ ++ return is_valid; ++} ++ ++static inline ++int check_and_correct_requested_length(struct hfs_bnode *node, int off, int len) ++{ ++ unsigned int node_size; ++ ++ if (!is_bnode_offset_valid(node, off)) ++ return 0; ++ ++ node_size = node->tree->node_size; ++ ++ if ((off + len) > node_size) { ++ int new_len = (int)node_size - off; ++ ++ pr_err("requested length has been corrected: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, " ++ "requested_len %d, corrected_len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len, new_len); ++ ++ return new_len; ++ } ++ ++ return len; ++} ++ + /* Copy a specified range of bytes from the raw data of a node */ + void hfs_bnode_read(struct hfs_bnode *node, void *buf, int off, int len) + { + struct page **pagep; + int l; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + pagep = node->page + (off >> PAGE_SHIFT); + off &= ~PAGE_MASK; +@@ -81,6 +137,20 @@ void hfs_bnode_write(struct hfs_bnode *node, void *buf, int off, int len) + struct page **pagep; + int l; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + pagep = node->page + (off >> PAGE_SHIFT); + off &= ~PAGE_MASK; +@@ -109,6 +179,20 @@ void hfs_bnode_clear(struct hfs_bnode *node, int off, int len) + struct page **pagep; + int l; + ++ if (!is_bnode_offset_valid(node, off)) ++ return; ++ ++ if (len == 0) { ++ pr_err("requested zero length: " ++ "NODE: id %u, type %#x, height %u, " ++ "node_size %u, offset %d, len %d\n", ++ node->this, node->type, node->height, ++ node->tree->node_size, off, len); ++ return; ++ } ++ ++ len = check_and_correct_requested_length(node, off, len); ++ + off += node->page_offset; + pagep = node->page + (off >> PAGE_SHIFT); + off &= ~PAGE_MASK; +@@ -133,6 +217,10 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst, + hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len); + if (!len) + return; ++ ++ len = check_and_correct_requested_length(src_node, src, len); ++ len = check_and_correct_requested_length(dst_node, dst, len); ++ + src += src_node->page_offset; + dst += dst_node->page_offset; + src_page = src_node->page + (src >> PAGE_SHIFT); +@@ -187,6 +275,10 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) + hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len); + if (!len) + return; ++ ++ len = check_and_correct_requested_length(node, src, len); ++ len = check_and_correct_requested_length(node, dst, len); ++ + src += node->page_offset; + dst += node->page_offset; + if (dst > src) { +-- +2.39.5 + diff --git a/queue-6.1/hfsplus-fix-slab-out-of-bounds-read-in-hfsplus_uni2a.patch b/queue-6.1/hfsplus-fix-slab-out-of-bounds-read-in-hfsplus_uni2a.patch new file mode 100644 index 0000000000..f17aef7baf --- /dev/null +++ b/queue-6.1/hfsplus-fix-slab-out-of-bounds-read-in-hfsplus_uni2a.patch @@ -0,0 +1,177 @@ +From 7341f0d43a037ec97db71e884b3a667528ded965 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 16:08:30 -0700 +Subject: hfsplus: fix slab-out-of-bounds read in hfsplus_uni2asc() + +From: Viacheslav Dubeyko + +[ Upstream commit 94458781aee6045bd3d0ad4b80b02886b9e2219b ] + +The hfsplus_readdir() method is capable to crash by calling +hfsplus_uni2asc(): + +[ 667.121659][ T9805] ================================================================== +[ 667.122651][ T9805] BUG: KASAN: slab-out-of-bounds in hfsplus_uni2asc+0x902/0xa10 +[ 667.123627][ T9805] Read of size 2 at addr ffff88802592f40c by task repro/9805 +[ 667.124578][ T9805] +[ 667.124876][ T9805] CPU: 3 UID: 0 PID: 9805 Comm: repro Not tainted 6.16.0-rc3 #1 PREEMPT(full) +[ 667.124886][ T9805] Hardware name: QEMU Ubuntu 24.04 PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 +[ 667.124890][ T9805] Call Trace: +[ 667.124893][ T9805] +[ 667.124896][ T9805] dump_stack_lvl+0x10e/0x1f0 +[ 667.124911][ T9805] print_report+0xd0/0x660 +[ 667.124920][ T9805] ? __virt_addr_valid+0x81/0x610 +[ 667.124928][ T9805] ? __phys_addr+0xe8/0x180 +[ 667.124934][ T9805] ? hfsplus_uni2asc+0x902/0xa10 +[ 667.124942][ T9805] kasan_report+0xc6/0x100 +[ 667.124950][ T9805] ? hfsplus_uni2asc+0x902/0xa10 +[ 667.124959][ T9805] hfsplus_uni2asc+0x902/0xa10 +[ 667.124966][ T9805] ? hfsplus_bnode_read+0x14b/0x360 +[ 667.124974][ T9805] hfsplus_readdir+0x845/0xfc0 +[ 667.124984][ T9805] ? __pfx_hfsplus_readdir+0x10/0x10 +[ 667.124994][ T9805] ? stack_trace_save+0x8e/0xc0 +[ 667.125008][ T9805] ? iterate_dir+0x18b/0xb20 +[ 667.125015][ T9805] ? trace_lock_acquire+0x85/0xd0 +[ 667.125022][ T9805] ? lock_acquire+0x30/0x80 +[ 667.125029][ T9805] ? iterate_dir+0x18b/0xb20 +[ 667.125037][ T9805] ? down_read_killable+0x1ed/0x4c0 +[ 667.125044][ T9805] ? putname+0x154/0x1a0 +[ 667.125051][ T9805] ? __pfx_down_read_killable+0x10/0x10 +[ 667.125058][ T9805] ? apparmor_file_permission+0x239/0x3e0 +[ 667.125069][ T9805] iterate_dir+0x296/0xb20 +[ 667.125076][ T9805] __x64_sys_getdents64+0x13c/0x2c0 +[ 667.125084][ T9805] ? __pfx___x64_sys_getdents64+0x10/0x10 +[ 667.125091][ T9805] ? __x64_sys_openat+0x141/0x200 +[ 667.125126][ T9805] ? __pfx_filldir64+0x10/0x10 +[ 667.125134][ T9805] ? do_user_addr_fault+0x7fe/0x12f0 +[ 667.125143][ T9805] do_syscall_64+0xc9/0x480 +[ 667.125151][ T9805] entry_SYSCALL_64_after_hwframe+0x77/0x7f +[ 667.125158][ T9805] RIP: 0033:0x7fa8753b2fc9 +[ 667.125164][ T9805] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 48 +[ 667.125172][ T9805] RSP: 002b:00007ffe96f8e0f8 EFLAGS: 00000217 ORIG_RAX: 00000000000000d9 +[ 667.125181][ T9805] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fa8753b2fc9 +[ 667.125185][ T9805] RDX: 0000000000000400 RSI: 00002000000063c0 RDI: 0000000000000004 +[ 667.125190][ T9805] RBP: 00007ffe96f8e110 R08: 00007ffe96f8e110 R09: 00007ffe96f8e110 +[ 667.125195][ T9805] R10: 0000000000000000 R11: 0000000000000217 R12: 0000556b1e3b4260 +[ 667.125199][ T9805] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 +[ 667.125207][ T9805] +[ 667.125210][ T9805] +[ 667.145632][ T9805] Allocated by task 9805: +[ 667.145991][ T9805] kasan_save_stack+0x20/0x40 +[ 667.146352][ T9805] kasan_save_track+0x14/0x30 +[ 667.146717][ T9805] __kasan_kmalloc+0xaa/0xb0 +[ 667.147065][ T9805] __kmalloc_noprof+0x205/0x550 +[ 667.147448][ T9805] hfsplus_find_init+0x95/0x1f0 +[ 667.147813][ T9805] hfsplus_readdir+0x220/0xfc0 +[ 667.148174][ T9805] iterate_dir+0x296/0xb20 +[ 667.148549][ T9805] __x64_sys_getdents64+0x13c/0x2c0 +[ 667.148937][ T9805] do_syscall_64+0xc9/0x480 +[ 667.149291][ T9805] entry_SYSCALL_64_after_hwframe+0x77/0x7f +[ 667.149809][ T9805] +[ 667.150030][ T9805] The buggy address belongs to the object at ffff88802592f000 +[ 667.150030][ T9805] which belongs to the cache kmalloc-2k of size 2048 +[ 667.151282][ T9805] The buggy address is located 0 bytes to the right of +[ 667.151282][ T9805] allocated 1036-byte region [ffff88802592f000, ffff88802592f40c) +[ 667.152580][ T9805] +[ 667.152798][ T9805] The buggy address belongs to the physical page: +[ 667.153373][ T9805] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x25928 +[ 667.154157][ T9805] head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 +[ 667.154916][ T9805] anon flags: 0xfff00000000040(head|node=0|zone=1|lastcpupid=0x7ff) +[ 667.155631][ T9805] page_type: f5(slab) +[ 667.155997][ T9805] raw: 00fff00000000040 ffff88801b442f00 0000000000000000 dead000000000001 +[ 667.156770][ T9805] raw: 0000000000000000 0000000080080008 00000000f5000000 0000000000000000 +[ 667.157536][ T9805] head: 00fff00000000040 ffff88801b442f00 0000000000000000 dead000000000001 +[ 667.158317][ T9805] head: 0000000000000000 0000000080080008 00000000f5000000 0000000000000000 +[ 667.159088][ T9805] head: 00fff00000000003 ffffea0000964a01 00000000ffffffff 00000000ffffffff +[ 667.159865][ T9805] head: ffffffffffffffff 0000000000000000 00000000ffffffff 0000000000000008 +[ 667.160643][ T9805] page dumped because: kasan: bad access detected +[ 667.161216][ T9805] page_owner tracks the page as allocated +[ 667.161732][ T9805] page last allocated via order 3, migratetype Unmovable, gfp_mask 0xd20c0(__GFP_IO|__GFP_FS|__GFP_NOWARN9 +[ 667.163566][ T9805] post_alloc_hook+0x1c0/0x230 +[ 667.164003][ T9805] get_page_from_freelist+0xdeb/0x3b30 +[ 667.164503][ T9805] __alloc_frozen_pages_noprof+0x25c/0x2460 +[ 667.165040][ T9805] alloc_pages_mpol+0x1fb/0x550 +[ 667.165489][ T9805] new_slab+0x23b/0x340 +[ 667.165872][ T9805] ___slab_alloc+0xd81/0x1960 +[ 667.166313][ T9805] __slab_alloc.isra.0+0x56/0xb0 +[ 667.166767][ T9805] __kmalloc_cache_noprof+0x255/0x3e0 +[ 667.167255][ T9805] psi_cgroup_alloc+0x52/0x2d0 +[ 667.167693][ T9805] cgroup_mkdir+0x694/0x1210 +[ 667.168118][ T9805] kernfs_iop_mkdir+0x111/0x190 +[ 667.168568][ T9805] vfs_mkdir+0x59b/0x8d0 +[ 667.168956][ T9805] do_mkdirat+0x2ed/0x3d0 +[ 667.169353][ T9805] __x64_sys_mkdir+0xef/0x140 +[ 667.169784][ T9805] do_syscall_64+0xc9/0x480 +[ 667.170195][ T9805] entry_SYSCALL_64_after_hwframe+0x77/0x7f +[ 667.170730][ T9805] page last free pid 1257 tgid 1257 stack trace: +[ 667.171304][ T9805] __free_frozen_pages+0x80c/0x1250 +[ 667.171770][ T9805] vfree.part.0+0x12b/0xab0 +[ 667.172182][ T9805] delayed_vfree_work+0x93/0xd0 +[ 667.172612][ T9805] process_one_work+0x9b5/0x1b80 +[ 667.173067][ T9805] worker_thread+0x630/0xe60 +[ 667.173486][ T9805] kthread+0x3a8/0x770 +[ 667.173857][ T9805] ret_from_fork+0x517/0x6e0 +[ 667.174278][ T9805] ret_from_fork_asm+0x1a/0x30 +[ 667.174703][ T9805] +[ 667.174917][ T9805] Memory state around the buggy address: +[ 667.175411][ T9805] ffff88802592f300: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[ 667.176114][ T9805] ffff88802592f380: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +[ 667.176830][ T9805] >ffff88802592f400: 00 04 fc fc fc fc fc fc fc fc fc fc fc fc fc fc +[ 667.177547][ T9805] ^ +[ 667.177933][ T9805] ffff88802592f480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc +[ 667.178640][ T9805] ffff88802592f500: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc +[ 667.179350][ T9805] ================================================================== + +The hfsplus_uni2asc() method operates by struct hfsplus_unistr: + +struct hfsplus_unistr { + __be16 length; + hfsplus_unichr unicode[HFSPLUS_MAX_STRLEN]; +} __packed; + +where HFSPLUS_MAX_STRLEN is 255 bytes. The issue happens if length +of the structure instance has value bigger than 255 (for example, +65283). In such case, pointer on unicode buffer is going beyond of +the allocated memory. + +The patch fixes the issue by checking the length value of +hfsplus_unistr instance and using 255 value in the case if length +value is bigger than HFSPLUS_MAX_STRLEN. Potential reason of such +situation could be a corruption of Catalog File b-tree's node. + +Reported-by: Wenzhi Wang +Signed-off-by: Liu Shixin +Signed-off-by: Viacheslav Dubeyko +cc: John Paul Adrian Glaubitz +cc: Yangtao Li +cc: linux-fsdevel@vger.kernel.org +Reviewed-by: Yangtao Li +Link: https://lore.kernel.org/r/20250710230830.110500-1-slava@dubeyko.com +Signed-off-by: Viacheslav Dubeyko +Signed-off-by: Sasha Levin +--- + fs/hfsplus/unicode.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c +index 73342c925a4b..36b6cf2a3abb 100644 +--- a/fs/hfsplus/unicode.c ++++ b/fs/hfsplus/unicode.c +@@ -132,7 +132,14 @@ int hfsplus_uni2asc(struct super_block *sb, + + op = astr; + ip = ustr->unicode; ++ + ustrlen = be16_to_cpu(ustr->length); ++ if (ustrlen > HFSPLUS_MAX_STRLEN) { ++ ustrlen = HFSPLUS_MAX_STRLEN; ++ pr_err("invalid length %u has been corrected to %d\n", ++ be16_to_cpu(ustr->length), ustrlen); ++ } ++ + len = *len_p; + ce1 = NULL; + compose = !test_bit(HFSPLUS_SB_NODECOMPOSE, &HFSPLUS_SB(sb)->flags); +-- +2.39.5 + diff --git a/queue-6.1/hwmon-emc2305-set-initial-pwm-minimum-value-during-p.patch b/queue-6.1/hwmon-emc2305-set-initial-pwm-minimum-value-during-p.patch new file mode 100644 index 0000000000..fc60613fce --- /dev/null +++ b/queue-6.1/hwmon-emc2305-set-initial-pwm-minimum-value-during-p.patch @@ -0,0 +1,56 @@ +From 65ed293a729de0061f1c31d4782f1b709033dfe3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Jun 2025 14:31:25 +0300 +Subject: hwmon: (emc2305) Set initial PWM minimum value during probe based on + thermal state + +From: Florin Leotescu + +[ Upstream commit 0429415a084a15466e87d504e8c2a502488184a5 ] + +Prevent the PWM value from being set to minimum when thermal zone +temperature exceeds any trip point during driver probe. Otherwise, the +PWM fan speed will remains at minimum speed and not respond to +temperature changes. + +Signed-off-by: Florin Leotescu +Link: https://lore.kernel.org/r/20250603113125.3175103-5-florin.leotescu@oss.nxp.com +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + drivers/hwmon/emc2305.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c +index e42ae43f3de4..286582e99c28 100644 +--- a/drivers/hwmon/emc2305.c ++++ b/drivers/hwmon/emc2305.c +@@ -301,6 +301,12 @@ static int emc2305_set_single_tz(struct device *dev, int idx) + dev_err(dev, "Failed to register cooling device %s\n", emc2305_fan_name[idx]); + return PTR_ERR(data->cdev_data[cdev_idx].cdev); + } ++ ++ if (data->cdev_data[cdev_idx].cur_state > 0) ++ /* Update pwm when temperature is above trips */ ++ pwm = EMC2305_PWM_STATE2DUTY(data->cdev_data[cdev_idx].cur_state, ++ data->max_state, EMC2305_FAN_MAX); ++ + /* Set minimal PWM speed. */ + if (data->pwm_separate) { + ret = emc2305_set_pwm(dev, pwm, cdev_idx); +@@ -314,10 +320,10 @@ static int emc2305_set_single_tz(struct device *dev, int idx) + } + } + data->cdev_data[cdev_idx].cur_state = +- EMC2305_PWM_DUTY2STATE(data->pwm_min[cdev_idx], data->max_state, ++ EMC2305_PWM_DUTY2STATE(pwm, data->max_state, + EMC2305_FAN_MAX); + data->cdev_data[cdev_idx].last_hwmon_state = +- EMC2305_PWM_DUTY2STATE(data->pwm_min[cdev_idx], data->max_state, ++ EMC2305_PWM_DUTY2STATE(pwm, data->max_state, + EMC2305_FAN_MAX); + return 0; + } +-- +2.39.5 + diff --git a/queue-6.1/i2c-force-dll0945-touchpad-i2c-freq-to-100khz.patch b/queue-6.1/i2c-force-dll0945-touchpad-i2c-freq-to-100khz.patch new file mode 100644 index 0000000000..6716bd267d --- /dev/null +++ b/queue-6.1/i2c-force-dll0945-touchpad-i2c-freq-to-100khz.patch @@ -0,0 +1,39 @@ +From 7e9d2ae4a38a42a0d8cafe6aded3b79abfc63da9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 3 Aug 2025 07:15:54 +0800 +Subject: i2c: Force DLL0945 touchpad i2c freq to 100khz + +From: fangzhong.zhou + +[ Upstream commit 0b7c9528facdb5a73ad78fea86d2e95a6c48dbc4 ] + +This patch fixes an issue where the touchpad cursor movement becomes +slow on the Dell Precision 5560. Force the touchpad freq to 100khz +as a workaround. + +Tested on Dell Precision 5560 with 6.14 to 6.14.6. Cursor movement +is now smooth and responsive. + +Signed-off-by: fangzhong.zhou +[wsa: kept sorting and removed unnecessary parts from commit msg] +Signed-off-by: Wolfram Sang +Signed-off-by: Sasha Levin +--- + drivers/i2c/i2c-core-acpi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c +index d2499f302b50..f43067f6797e 100644 +--- a/drivers/i2c/i2c-core-acpi.c ++++ b/drivers/i2c/i2c-core-acpi.c +@@ -370,6 +370,7 @@ static const struct acpi_device_id i2c_acpi_force_100khz_device_ids[] = { + * the device works without issues on Windows at what is expected to be + * a 400KHz frequency. The root cause of the issue is not known. + */ ++ { "DLL0945", 0 }, + { "ELAN06FA", 0 }, + {} + }; +-- +2.39.5 + diff --git a/queue-6.1/i3c-add-missing-include-to-internal-header.patch b/queue-6.1/i3c-add-missing-include-to-internal-header.patch new file mode 100644 index 0000000000..36432533d4 --- /dev/null +++ b/queue-6.1/i3c-add-missing-include-to-internal-header.patch @@ -0,0 +1,44 @@ +From 95fe9e6079e95f9c39c9ec1e62805b2cfa292127 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 14:00:47 +0200 +Subject: i3c: add missing include to internal header + +From: Wolfram Sang + +[ Upstream commit 3b661ca549b9e5bb11d0bc97ada6110aac3282d2 ] + +LKP found a random config which failed to build because IO accessors +were not defined: + + In file included from drivers/i3c/master.c:21: + drivers/i3c/internals.h: In function 'i3c_writel_fifo': +>> drivers/i3c/internals.h:35:9: error: implicit declaration of function 'writesl' [-Werror=implicit-function-declaration] + +Add the proper header to where the IO accessors are used. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202507150208.BZDzzJ5E-lkp@intel.com/ +Signed-off-by: Wolfram Sang +Reviewed-by: Frank Li +Link: https://lore.kernel.org/r/20250717120046.9022-2-wsa+renesas@sang-engineering.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/i3c/internals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/i3c/internals.h b/drivers/i3c/internals.h +index 86b7b44cfca2..1906c711f38a 100644 +--- a/drivers/i3c/internals.h ++++ b/drivers/i3c/internals.h +@@ -9,6 +9,7 @@ + #define I3C_INTERNALS_H + + #include ++#include + + extern struct bus_type i3c_bus_type; + +-- +2.39.5 + diff --git a/queue-6.1/i3c-don-t-fail-if-gethdrcap-is-unsupported.patch b/queue-6.1/i3c-don-t-fail-if-gethdrcap-is-unsupported.patch new file mode 100644 index 0000000000..74c96e5eb5 --- /dev/null +++ b/queue-6.1/i3c-don-t-fail-if-gethdrcap-is-unsupported.patch @@ -0,0 +1,43 @@ +From 79481401d72e054f4daf4abdc8dc89cab1708aa2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Jul 2025 22:44:32 +0200 +Subject: i3c: don't fail if GETHDRCAP is unsupported + +From: Wolfram Sang + +[ Upstream commit 447270cdb41b1c8c3621bb14b93a6749f942556e ] + +'I3C_BCR_HDR_CAP' is still spec v1.0 and has been renamed to 'advanced +capabilities' in v1.1 onwards. The ST pressure sensor LPS22DF does not +have HDR, but has the 'advanced cap' bit set. The core still wants to +get additional information using the CCC 'GETHDRCAP' (or GETCAPS in v1.1 +onwards). Not all controllers support this CCC and will notify the upper +layers about it. For instantiating the device, we can ignore this +unsupported CCC as standard communication will work. Without this patch, +the device will not be instantiated at all. + +Signed-off-by: Wolfram Sang +Reviewed-by: Frank Li +Link: https://lore.kernel.org/r/20250704204524.6124-1-wsa+renesas@sang-engineering.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/i3c/master.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c +index 18103c1e8d76..513c79e26d9a 100644 +--- a/drivers/i3c/master.c ++++ b/drivers/i3c/master.c +@@ -1386,7 +1386,7 @@ static int i3c_master_retrieve_dev_info(struct i3c_dev_desc *dev) + + if (dev->info.bcr & I3C_BCR_HDR_CAP) { + ret = i3c_master_gethdrcap_locked(master, &dev->info); +- if (ret) ++ if (ret && ret != -ENOTSUPP) + return ret; + } + +-- +2.39.5 + diff --git a/queue-6.1/i3c-master-initialize-ret-in-i3c_i2c_notifier_call.patch b/queue-6.1/i3c-master-initialize-ret-in-i3c_i2c_notifier_call.patch new file mode 100644 index 0000000000..9dba1f0b5d --- /dev/null +++ b/queue-6.1/i3c-master-initialize-ret-in-i3c_i2c_notifier_call.patch @@ -0,0 +1,37 @@ +From 727f9ba6f20e18e23a5bcdf5e633653d5f534ae0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 22 Jun 2025 12:11:07 +0200 +Subject: i3c: master: Initialize ret in i3c_i2c_notifier_call() + +From: Jorge Marques + +[ Upstream commit 290ce8b2d0745e45a3155268184523a8c75996f1 ] + +Set ret to -EINVAL if i3c_i2c_notifier_call() receives an invalid +action, resolving uninitialized warning. + +Signed-off-by: Jorge Marques +Reviewed-by: Frank Li +Link: https://lore.kernel.org/r/20250622-i3c-master-ret-uninitialized-v1-1-aabb5625c932@analog.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/i3c/master.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c +index 513c79e26d9a..019fd9bd928d 100644 +--- a/drivers/i3c/master.c ++++ b/drivers/i3c/master.c +@@ -2413,6 +2413,8 @@ static int i3c_i2c_notifier_call(struct notifier_block *nb, unsigned long action + case BUS_NOTIFY_DEL_DEVICE: + ret = i3c_master_i2c_detach(adap, client); + break; ++ default: ++ ret = -EINVAL; + } + i3c_bus_maintenance_unlock(&master->bus); + +-- +2.39.5 + diff --git a/queue-6.1/iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch b/queue-6.1/iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch new file mode 100644 index 0000000000..b44e8404d6 --- /dev/null +++ b/queue-6.1/iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch @@ -0,0 +1,70 @@ +From d670d2a9d558b7d4a2aa627a24c0b36c159746ef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jun 2025 16:35:21 -0300 +Subject: iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jonathan Santos + +[ Upstream commit 7e54d932873d91a55d1b89b7389876d78aeeab32 ] + +The SYNC_IN pulse width must be at least 1.5 x Tmclk, corresponding to +~2.5 µs at the lowest supported MCLK frequency. Add a 3 µs delay to +ensure reliable synchronization timing even for the worst-case scenario. + +Signed-off-by: Jonathan Santos +Reviewed-by: David Lechner +Reviewed-by: Andy Shevchenko +Link: https://patch.msgid.link/d3ee92a533cd1207cf5c5cc4d7bdbb5c6c267f68.1749063024.git.Jonathan.Santos@analog.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/ad7768-1.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c +index 967f06cd3f94..e147eaf1a3b1 100644 +--- a/drivers/iio/adc/ad7768-1.c ++++ b/drivers/iio/adc/ad7768-1.c +@@ -203,6 +203,24 @@ static int ad7768_spi_reg_write(struct ad7768_state *st, + return spi_write(st->spi, st->data.d8, 2); + } + ++static int ad7768_send_sync_pulse(struct ad7768_state *st) ++{ ++ /* ++ * The datasheet specifies a minimum SYNC_IN pulse width of 1.5 × Tmclk, ++ * where Tmclk is the MCLK period. The supported MCLK frequencies range ++ * from 0.6 MHz to 17 MHz, which corresponds to a minimum SYNC_IN pulse ++ * width of approximately 2.5 µs in the worst-case scenario (0.6 MHz). ++ * ++ * Add a delay to ensure the pulse width is always sufficient to ++ * trigger synchronization. ++ */ ++ gpiod_set_value_cansleep(st->gpio_sync_in, 1); ++ fsleep(3); ++ gpiod_set_value_cansleep(st->gpio_sync_in, 0); ++ ++ return 0; ++} ++ + static int ad7768_set_mode(struct ad7768_state *st, + enum ad7768_conv_mode mode) + { +@@ -288,10 +306,7 @@ static int ad7768_set_dig_fil(struct ad7768_state *st, + return ret; + + /* A sync-in pulse is required every time the filter dec rate changes */ +- gpiod_set_value(st->gpio_sync_in, 1); +- gpiod_set_value(st->gpio_sync_in, 0); +- +- return 0; ++ return ad7768_send_sync_pulse(st); + } + + static int ad7768_set_freq(struct ad7768_state *st, +-- +2.39.5 + diff --git a/queue-6.1/iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch b/queue-6.1/iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch new file mode 100644 index 0000000000..378748b85e --- /dev/null +++ b/queue-6.1/iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch @@ -0,0 +1,42 @@ +From 3095429a4c9a78af6e830c3e19511bb3b39b662a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 16:37:49 -0500 +Subject: iio: adc: ad_sigma_delta: don't overallocate scan buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: David Lechner + +[ Upstream commit 5a2f15c5a8e017d0951e6dc62aa7b5b634f56881 ] + +Fix overallocating the size of the scan buffer by converting bits to +bytes. The size is meant to be in bytes, so scanbits needs to be +divided by 8. + +Signed-off-by: David Lechner +Reviewed-by: Andy Shevchenko +Reviewed-by: Nuno Sá +Link: https://patch.msgid.link/20250701-iio-adc-ad7173-add-spi-offload-support-v3-1-42abb83e3dac@baylibre.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/adc/ad_sigma_delta.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c +index 533667eefe41..71e775a10a91 100644 +--- a/drivers/iio/adc/ad_sigma_delta.c ++++ b/drivers/iio/adc/ad_sigma_delta.c +@@ -378,7 +378,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev) + return ret; + } + +- samples_buf_size = ALIGN(slot * indio_dev->channels[0].scan_type.storagebits, 8); ++ samples_buf_size = ALIGN(slot * indio_dev->channels[0].scan_type.storagebits / 8, 8); + samples_buf_size += sizeof(int64_t); + samples_buf = devm_krealloc(&sigma_delta->spi->dev, sigma_delta->samples_buf, + samples_buf_size, GFP_KERNEL); +-- +2.39.5 + diff --git a/queue-6.1/ionic-clean-dbpage-in-de-init.patch b/queue-6.1/ionic-clean-dbpage-in-de-init.patch new file mode 100644 index 0000000000..7a3c927a62 --- /dev/null +++ b/queue-6.1/ionic-clean-dbpage-in-de-init.patch @@ -0,0 +1,55 @@ +From ec8c8055c86c20a766c68041df146438c84a1229 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 14:46:43 -0700 +Subject: ionic: clean dbpage in de-init + +From: Shannon Nelson + +[ Upstream commit c9080abea1e69b8b1408ec7dec0acdfdc577a3e2 ] + +Since the kern_dbpage gets set up in ionic_lif_init() and that +function's error path will clean it if needed, the kern_dbpage +on teardown should be cleaned in ionic_lif_deinit(), not in +ionic_lif_free(). As it is currently we get a double call +to iounmap() on kern_dbpage if the PCI ionic fails setting up +the lif. One example of this is when firmware isn't responding +to AdminQ requests and ionic's first AdminQ call fails to +setup the NotifyQ. + +Signed-off-by: Shannon Nelson +Reviewed-by: Simon Horman +Reviewed-by: Joe Damato +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +index b746944bcd2a..7ed77a8304e6 100644 +--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c ++++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c +@@ -3142,10 +3142,6 @@ void ionic_lif_free(struct ionic_lif *lif) + lif->info = NULL; + lif->info_pa = 0; + +- /* unmap doorbell page */ +- ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage); +- lif->kern_dbpage = NULL; +- + mutex_destroy(&lif->config_lock); + mutex_destroy(&lif->queue_lock); + +@@ -3171,6 +3167,9 @@ void ionic_lif_deinit(struct ionic_lif *lif) + ionic_lif_qcq_deinit(lif, lif->notifyqcq); + ionic_lif_qcq_deinit(lif, lif->adminqcq); + ++ ionic_bus_unmap_dbpage(lif->ionic, lif->kern_dbpage); ++ lif->kern_dbpage = NULL; ++ + ionic_lif_reset(lif); + } + +-- +2.39.5 + diff --git a/queue-6.1/ipmi-fix-strcpy-source-and-destination-the-same.patch b/queue-6.1/ipmi-fix-strcpy-source-and-destination-the-same.patch new file mode 100644 index 0000000000..32901e2a45 --- /dev/null +++ b/queue-6.1/ipmi-fix-strcpy-source-and-destination-the-same.patch @@ -0,0 +1,150 @@ +From 0238547cf821b7c9b9702f8c316feb241462ea9f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 19:06:26 -0500 +Subject: ipmi: Fix strcpy source and destination the same + +From: Corey Minyard + +[ Upstream commit 8ffcb7560b4a15faf821df95e3ab532b2b020f8c ] + +The source and destination of some strcpy operations was the same. +Split out the part of the operations that needed to be done for those +particular calls so the unnecessary copy wasn't done. + +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202506140756.EFXXvIP4-lkp@intel.com/ +Signed-off-by: Corey Minyard +Signed-off-by: Sasha Levin +--- + drivers/char/ipmi/ipmi_watchdog.c | 59 ++++++++++++++++++++++--------- + 1 file changed, 42 insertions(+), 17 deletions(-) + +diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c +index 5b4e677929ca..5eb614f954fd 100644 +--- a/drivers/char/ipmi/ipmi_watchdog.c ++++ b/drivers/char/ipmi/ipmi_watchdog.c +@@ -1190,14 +1190,8 @@ static struct ipmi_smi_watcher smi_watcher = { + .smi_gone = ipmi_smi_gone + }; + +-static int action_op(const char *inval, char *outval) ++static int action_op_set_val(const char *inval) + { +- if (outval) +- strcpy(outval, action); +- +- if (!inval) +- return 0; +- + if (strcmp(inval, "reset") == 0) + action_val = WDOG_TIMEOUT_RESET; + else if (strcmp(inval, "none") == 0) +@@ -1208,18 +1202,26 @@ static int action_op(const char *inval, char *outval) + action_val = WDOG_TIMEOUT_POWER_DOWN; + else + return -EINVAL; +- strcpy(action, inval); + return 0; + } + +-static int preaction_op(const char *inval, char *outval) ++static int action_op(const char *inval, char *outval) + { ++ int rv; ++ + if (outval) +- strcpy(outval, preaction); ++ strcpy(outval, action); + + if (!inval) + return 0; ++ rv = action_op_set_val(inval); ++ if (!rv) ++ strcpy(action, inval); ++ return rv; ++} + ++static int preaction_op_set_val(const char *inval) ++{ + if (strcmp(inval, "pre_none") == 0) + preaction_val = WDOG_PRETIMEOUT_NONE; + else if (strcmp(inval, "pre_smi") == 0) +@@ -1232,18 +1234,26 @@ static int preaction_op(const char *inval, char *outval) + preaction_val = WDOG_PRETIMEOUT_MSG_INT; + else + return -EINVAL; +- strcpy(preaction, inval); + return 0; + } + +-static int preop_op(const char *inval, char *outval) ++static int preaction_op(const char *inval, char *outval) + { ++ int rv; ++ + if (outval) +- strcpy(outval, preop); ++ strcpy(outval, preaction); + + if (!inval) + return 0; ++ rv = preaction_op_set_val(inval); ++ if (!rv) ++ strcpy(preaction, inval); ++ return 0; ++} + ++static int preop_op_set_val(const char *inval) ++{ + if (strcmp(inval, "preop_none") == 0) + preop_val = WDOG_PREOP_NONE; + else if (strcmp(inval, "preop_panic") == 0) +@@ -1252,7 +1262,22 @@ static int preop_op(const char *inval, char *outval) + preop_val = WDOG_PREOP_GIVE_DATA; + else + return -EINVAL; +- strcpy(preop, inval); ++ return 0; ++} ++ ++static int preop_op(const char *inval, char *outval) ++{ ++ int rv; ++ ++ if (outval) ++ strcpy(outval, preop); ++ ++ if (!inval) ++ return 0; ++ ++ rv = preop_op_set_val(inval); ++ if (!rv) ++ strcpy(preop, inval); + return 0; + } + +@@ -1289,18 +1314,18 @@ static int __init ipmi_wdog_init(void) + { + int rv; + +- if (action_op(action, NULL)) { ++ if (action_op_set_val(action)) { + action_op("reset", NULL); + pr_info("Unknown action '%s', defaulting to reset\n", action); + } + +- if (preaction_op(preaction, NULL)) { ++ if (preaction_op_set_val(preaction)) { + preaction_op("pre_none", NULL); + pr_info("Unknown preaction '%s', defaulting to none\n", + preaction); + } + +- if (preop_op(preop, NULL)) { ++ if (preop_op_set_val(preop)) { + preop_op("preop_none", NULL); + pr_info("Unknown preop '%s', defaulting to none\n", preop); + } +-- +2.39.5 + diff --git a/queue-6.1/ipmi-use-dev_warn_ratelimited-for-incorrect-message-.patch b/queue-6.1/ipmi-use-dev_warn_ratelimited-for-incorrect-message-.patch new file mode 100644 index 0000000000..fba9b2abdd --- /dev/null +++ b/queue-6.1/ipmi-use-dev_warn_ratelimited-for-incorrect-message-.patch @@ -0,0 +1,47 @@ +From ccacd39ae8d57eeadce3de4290e76335bc1ab9ca Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 05:57:26 -0700 +Subject: ipmi: Use dev_warn_ratelimited() for incorrect message warnings + +From: Breno Leitao + +[ Upstream commit ec50ec378e3fd83bde9b3d622ceac3509a60b6b5 ] + +During BMC firmware upgrades on live systems, the ipmi_msghandler +generates excessive "BMC returned incorrect response" warnings +while the BMC is temporarily offline. This can flood system logs +in large deployments. + +Replace dev_warn() with dev_warn_ratelimited() to throttle these +warnings and prevent log spam during BMC maintenance operations. + +Signed-off-by: Breno Leitao +Message-ID: <20250710-ipmi_ratelimit-v1-1-6d417015ebe9@debian.org> +Signed-off-by: Corey Minyard +Signed-off-by: Sasha Levin +--- + drivers/char/ipmi/ipmi_msghandler.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c +index e4ac38b39889..653e07171dc6 100644 +--- a/drivers/char/ipmi/ipmi_msghandler.c ++++ b/drivers/char/ipmi/ipmi_msghandler.c +@@ -4618,10 +4618,10 @@ static int handle_one_recv_msg(struct ipmi_smi *intf, + * The NetFN and Command in the response is not even + * marginally correct. + */ +- dev_warn(intf->si_dev, +- "BMC returned incorrect response, expected netfn %x cmd %x, got netfn %x cmd %x\n", +- (msg->data[0] >> 2) | 1, msg->data[1], +- msg->rsp[0] >> 2, msg->rsp[1]); ++ dev_warn_ratelimited(intf->si_dev, ++ "BMC returned incorrect response, expected netfn %x cmd %x, got netfn %x cmd %x\n", ++ (msg->data[0] >> 2) | 1, msg->data[1], ++ msg->rsp[0] >> 2, msg->rsp[1]); + + goto return_unspecified; + } +-- +2.39.5 + diff --git a/queue-6.1/ipv6-mcast-check-inet6_dev-dead-under-idev-mc_lock-i.patch b/queue-6.1/ipv6-mcast-check-inet6_dev-dead-under-idev-mc_lock-i.patch new file mode 100644 index 0000000000..22cd912602 --- /dev/null +++ b/queue-6.1/ipv6-mcast-check-inet6_dev-dead-under-idev-mc_lock-i.patch @@ -0,0 +1,118 @@ +From 63780990b77e3fb5d915ba7c16e823f1ce088a72 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jul 2025 16:01:20 -0700 +Subject: ipv6: mcast: Check inet6_dev->dead under idev->mc_lock in + __ipv6_dev_mc_inc(). + +From: Kuniyuki Iwashima + +[ Upstream commit dbd40f318cf2f59759bd170c401adc20ba360a3e ] + +Since commit 63ed8de4be81 ("mld: add mc_lock for protecting +per-interface mld data"), every multicast resource is protected +by inet6_dev->mc_lock. + +RTNL is unnecessary in terms of protection but still needed for +synchronisation between addrconf_ifdown() and __ipv6_dev_mc_inc(). + +Once we removed RTNL, there would be a race below, where we could +add a multicast address to a dead inet6_dev. + + CPU1 CPU2 + ==== ==== + addrconf_ifdown() __ipv6_dev_mc_inc() + if (idev->dead) <-- false + dead = true return -ENODEV; + ipv6_mc_destroy_dev() / ipv6_mc_down() + mutex_lock(&idev->mc_lock) + ... + mutex_unlock(&idev->mc_lock) + mutex_lock(&idev->mc_lock) + ... + mutex_unlock(&idev->mc_lock) + +The race window can be easily closed by checking inet6_dev->dead +under inet6_dev->mc_lock in __ipv6_dev_mc_inc() as addrconf_ifdown() +will acquire it after marking inet6_dev dead. + +Let's check inet6_dev->dead under mc_lock in __ipv6_dev_mc_inc(). + +Note that now __ipv6_dev_mc_inc() no longer depends on RTNL and +we can remove ASSERT_RTNL() there and the RTNL comment above +addrconf_join_solict(). + +Signed-off-by: Kuniyuki Iwashima +Reviewed-by: Eric Dumazet +Link: https://patch.msgid.link/20250702230210.3115355-4-kuni1840@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv6/addrconf.c | 7 +++---- + net/ipv6/mcast.c | 11 +++++------ + 2 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c +index 69915bb8b96d..cbdb510b40ea 100644 +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -2185,13 +2185,12 @@ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp) + in6_ifa_put(ifp); + } + +-/* Join to solicited addr multicast group. +- * caller must hold RTNL */ ++/* Join to solicited addr multicast group. */ + void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr) + { + struct in6_addr maddr; + +- if (dev->flags&(IFF_LOOPBACK|IFF_NOARP)) ++ if (READ_ONCE(dev->flags) & (IFF_LOOPBACK | IFF_NOARP)) + return; + + addrconf_addr_solict_mult(addr, &maddr); +@@ -3807,7 +3806,7 @@ static int addrconf_ifdown(struct net_device *dev, bool unregister) + * Do not dev_put! + */ + if (unregister) { +- idev->dead = 1; ++ WRITE_ONCE(idev->dead, 1); + + /* protected by rtnl_lock */ + RCU_INIT_POINTER(dev->ip6_ptr, NULL); +diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c +index e9e59a83ba9b..e7f569875e71 100644 +--- a/net/ipv6/mcast.c ++++ b/net/ipv6/mcast.c +@@ -906,23 +906,22 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev, + static int __ipv6_dev_mc_inc(struct net_device *dev, + const struct in6_addr *addr, unsigned int mode) + { +- struct ifmcaddr6 *mc; + struct inet6_dev *idev; +- +- ASSERT_RTNL(); ++ struct ifmcaddr6 *mc; + + /* we need to take a reference on idev */ + idev = in6_dev_get(dev); +- + if (!idev) + return -EINVAL; + +- if (idev->dead) { ++ mutex_lock(&idev->mc_lock); ++ ++ if (READ_ONCE(idev->dead)) { ++ mutex_unlock(&idev->mc_lock); + in6_dev_put(idev); + return -ENODEV; + } + +- mutex_lock(&idev->mc_lock); + for_each_mc_mclock(idev, mc) { + if (ipv6_addr_equal(&mc->mca_addr, addr)) { + mc->mca_users++; +-- +2.39.5 + diff --git a/queue-6.1/jfs-regular-file-corruption-check.patch b/queue-6.1/jfs-regular-file-corruption-check.patch new file mode 100644 index 0000000000..631ed94805 --- /dev/null +++ b/queue-6.1/jfs-regular-file-corruption-check.patch @@ -0,0 +1,39 @@ +From 86d541577c28305a43ed05b31b05b7779ada377f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jun 2025 14:48:43 +0800 +Subject: jfs: Regular file corruption check + +From: Edward Adam Davis + +[ Upstream commit 2d04df8116426b6c7b9f8b9b371250f666a2a2fb ] + +The reproducer builds a corrupted file on disk with a negative i_size value. +Add a check when opening this file to avoid subsequent operation failures. + +Reported-by: syzbot+630f6d40b3ccabc8e96e@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=630f6d40b3ccabc8e96e +Tested-by: syzbot+630f6d40b3ccabc8e96e@syzkaller.appspotmail.com +Signed-off-by: Edward Adam Davis +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/file.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/fs/jfs/file.c b/fs/jfs/file.c +index 332dc9ac47a9..ae8df3d11663 100644 +--- a/fs/jfs/file.c ++++ b/fs/jfs/file.c +@@ -44,6 +44,9 @@ static int jfs_open(struct inode *inode, struct file *file) + { + int rc; + ++ if (S_ISREG(inode->i_mode) && inode->i_size < 0) ++ return -EIO; ++ + if ((rc = dquot_file_open(inode, file))) + return rc; + +-- +2.39.5 + diff --git a/queue-6.1/jfs-truncate-good-inode-pages-when-hard-link-is-0.patch b/queue-6.1/jfs-truncate-good-inode-pages-when-hard-link-is-0.patch new file mode 100644 index 0000000000..4c4945c091 --- /dev/null +++ b/queue-6.1/jfs-truncate-good-inode-pages-when-hard-link-is-0.patch @@ -0,0 +1,41 @@ +From 86d5eb9cd1c0d63c2936501371c593075f652ef7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 11:05:34 +0800 +Subject: jfs: truncate good inode pages when hard link is 0 + +From: Lizhi Xu + +[ Upstream commit 2d91b3765cd05016335cd5df5e5c6a29708ec058 ] + +The fileset value of the inode copy from the disk by the reproducer is +AGGR_RESERVED_I. When executing evict, its hard link number is 0, so its +inode pages are not truncated. This causes the bugon to be triggered when +executing clear_inode() because nrpages is greater than 0. + +Reported-by: syzbot+6e516bb515d93230bc7b@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=6e516bb515d93230bc7b +Signed-off-by: Lizhi Xu +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c +index d1ec920aa030..d41891bb617a 100644 +--- a/fs/jfs/inode.c ++++ b/fs/jfs/inode.c +@@ -145,9 +145,9 @@ void jfs_evict_inode(struct inode *inode) + if (!inode->i_nlink && !is_bad_inode(inode)) { + dquot_initialize(inode); + ++ truncate_inode_pages_final(&inode->i_data); + if (JFS_IP(inode)->fileset == FILESYSTEM_I) { + struct inode *ipimap = JFS_SBI(inode->i_sb)->ipimap; +- truncate_inode_pages_final(&inode->i_data); + + if (test_cflag(COMMIT_Freewmap, inode)) + jfs_free_zero_link(inode); +-- +2.39.5 + diff --git a/queue-6.1/jfs-upper-bound-check-of-tree-index-in-dballocag.patch b/queue-6.1/jfs-upper-bound-check-of-tree-index-in-dballocag.patch new file mode 100644 index 0000000000..4887b5a7f5 --- /dev/null +++ b/queue-6.1/jfs-upper-bound-check-of-tree-index-in-dballocag.patch @@ -0,0 +1,44 @@ +From 3afd03005a4d59ccc41464fb4b6f689a5cf6e7c8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Apr 2025 00:13:51 +0200 +Subject: jfs: upper bound check of tree index in dbAllocAG + +From: Arnaud Lecomte + +[ Upstream commit c214006856ff52a8ff17ed8da52d50601d54f9ce ] + +When computing the tree index in dbAllocAG, we never check if we are +out of bounds realative to the size of the stree. +This could happen in a scenario where the filesystem metadata are +corrupted. + +Reported-by: syzbot+cffd18309153948f3c3e@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=cffd18309153948f3c3e +Tested-by: syzbot+cffd18309153948f3c3e@syzkaller.appspotmail.com +Signed-off-by: Arnaud Lecomte +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/jfs_dmap.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c +index c761291f59ac..277f3175477f 100644 +--- a/fs/jfs/jfs_dmap.c ++++ b/fs/jfs/jfs_dmap.c +@@ -1389,6 +1389,12 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) + (1 << (L2LPERCTL - (bmp->db_agheight << 1))) / bmp->db_agwidth; + ti = bmp->db_agstart + bmp->db_agwidth * (agno & (agperlev - 1)); + ++ if (ti < 0 || ti >= le32_to_cpu(dcp->nleafs)) { ++ jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n"); ++ release_metapage(mp); ++ return -EIO; ++ } ++ + /* dmap control page trees fan-out by 4 and a single allocation + * group may be described by 1 or 2 subtrees within the ag level + * dmap control page, depending upon the ag size. examine the ag's +-- +2.39.5 + diff --git a/queue-6.1/kconfig-gconf-avoid-hardcoding-model2-in-on_treeview.patch b/queue-6.1/kconfig-gconf-avoid-hardcoding-model2-in-on_treeview.patch new file mode 100644 index 0000000000..5a57b2fabd --- /dev/null +++ b/queue-6.1/kconfig-gconf-avoid-hardcoding-model2-in-on_treeview.patch @@ -0,0 +1,45 @@ +From 1bab89d505ac77ae9f140ef849fe46442ee121fa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Jun 2025 00:05:20 +0900 +Subject: kconfig: gconf: avoid hardcoding model2 in + on_treeview2_cursor_changed() + +From: Masahiro Yamada + +[ Upstream commit cae9cdbcd9af044810bcceeb43a87accca47c71d ] + +The on_treeview2_cursor_changed() handler is connected to both the left +and right tree views, but it hardcodes model2 (the GtkTreeModel of the +right tree view). This is incorrect. Get the associated model from the +view. + +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/kconfig/gconf.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c +index 5d1404178e48..87f8a4db5bc6 100644 +--- a/scripts/kconfig/gconf.c ++++ b/scripts/kconfig/gconf.c +@@ -977,13 +977,14 @@ on_treeview2_key_press_event(GtkWidget * widget, + void + on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data) + { ++ GtkTreeModel *model = gtk_tree_view_get_model(treeview); + GtkTreeSelection *selection; + GtkTreeIter iter; + struct menu *menu; + + selection = gtk_tree_view_get_selection(treeview); +- if (gtk_tree_selection_get_selected(selection, &model2, &iter)) { +- gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); ++ if (gtk_tree_selection_get_selected(selection, &model, &iter)) { ++ gtk_tree_model_get(model, &iter, COL_MENU, &menu, -1); + text_insert_help(menu); + } + } +-- +2.39.5 + diff --git a/queue-6.1/kconfig-gconf-fix-potential-memory-leak-in-renderer_.patch b/queue-6.1/kconfig-gconf-fix-potential-memory-leak-in-renderer_.patch new file mode 100644 index 0000000000..940a5d7b56 --- /dev/null +++ b/queue-6.1/kconfig-gconf-fix-potential-memory-leak-in-renderer_.patch @@ -0,0 +1,42 @@ +From 3470984373e62879275ec20e15dce99ee4f37494 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Jun 2025 00:04:55 +0900 +Subject: kconfig: gconf: fix potential memory leak in renderer_edited() + +From: Masahiro Yamada + +[ Upstream commit f72ed4c6a375e52a3f4b75615e4a89d29d8acea7 ] + +If gtk_tree_model_get_iter() fails, gtk_tree_path_free() is not called. + +Signed-off-by: Masahiro Yamada +Acked-by: Randy Dunlap +Signed-off-by: Sasha Levin +--- + scripts/kconfig/gconf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c +index 87f8a4db5bc6..3c726ead8f7e 100644 +--- a/scripts/kconfig/gconf.c ++++ b/scripts/kconfig/gconf.c +@@ -783,7 +783,7 @@ static void renderer_edited(GtkCellRendererText * cell, + struct symbol *sym; + + if (!gtk_tree_model_get_iter(model2, &iter, path)) +- return; ++ goto free; + + gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1); + sym = menu->sym; +@@ -795,6 +795,7 @@ static void renderer_edited(GtkCellRendererText * cell, + + update_tree(&rootmenu, NULL); + ++free: + gtk_tree_path_free(path); + } + +-- +2.39.5 + diff --git a/queue-6.1/kconfig-lxdialog-fix-space-to-de-select-options.patch b/queue-6.1/kconfig-lxdialog-fix-space-to-de-select-options.patch new file mode 100644 index 0000000000..d150623d33 --- /dev/null +++ b/queue-6.1/kconfig-lxdialog-fix-space-to-de-select-options.patch @@ -0,0 +1,49 @@ +From ad16a38441b6b15f170fcf1de2987275ed1f6766 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Nov 2013 00:53:32 +0100 +Subject: kconfig: lxdialog: fix 'space' to (de)select options + +From: Yann E. MORIN + +[ Upstream commit 694174f94ebeeb5ec5cc0e9de9b40c82057e1d95 ] + +In case a menu has comment without letters/numbers (eg. characters +matching the regexp '^[^[:alpha:][:digit:]]+$', for example - or *), +hitting space will cycle through those comments, rather than +selecting/deselecting the currently-highlighted option. + +This is the behaviour of hitting any letter/digit: jump to the next +option which prompt starts with that letter. The only letters that +do not behave as such are 'y' 'm' and 'n'. Prompts that start with +one of those three letters are instead matched on the first letter +that is not 'y', 'm' or 'n'. + +Fix that by treating 'space' as we treat y/m/n, ie. as an action key, +not as shortcut to jump to prompt. + +Signed-off-by: Yann E. MORIN +Signed-off-by: Peter Korsgaard +Signed-off-by: Cherniaev Andrei +[masahiro: took from Buildroot, adjusted the commit subject] +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/kconfig/lxdialog/menubox.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c +index 58c2f8afe59b..7e10e919fbdc 100644 +--- a/scripts/kconfig/lxdialog/menubox.c ++++ b/scripts/kconfig/lxdialog/menubox.c +@@ -272,7 +272,7 @@ int dialog_menu(const char *title, const char *prompt, + if (key < 256 && isalpha(key)) + key = tolower(key); + +- if (strchr("ynmh", key)) ++ if (strchr("ynmh ", key)) + i = max_choice; + else { + for (i = choice + 1; i < max_choice; i++) { +-- +2.39.5 + diff --git a/queue-6.1/kconfig-lxdialog-replace-strcpy-with-strncpy-in-inpu.patch b/queue-6.1/kconfig-lxdialog-replace-strcpy-with-strncpy-in-inpu.patch new file mode 100644 index 0000000000..f0e54d3a2c --- /dev/null +++ b/queue-6.1/kconfig-lxdialog-replace-strcpy-with-strncpy-in-inpu.patch @@ -0,0 +1,41 @@ +From 81f085d9e1054b13e2e31525b35ef371b850af57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 27 Jul 2025 22:14:33 +0530 +Subject: kconfig: lxdialog: replace strcpy() with strncpy() in inputbox.c + +From: Suchit Karunakaran + +[ Upstream commit 5ac726653a1029a2eccba93bbe59e01fc9725828 ] + +strcpy() performs no bounds checking and can lead to buffer overflows if +the input string exceeds the destination buffer size. This patch replaces +it with strncpy(), and null terminates the input string. + +Signed-off-by: Suchit Karunakaran +Reviewed-by: Nicolas Schier +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/kconfig/lxdialog/inputbox.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c +index 1dcfb288ee63..327b60cdb8da 100644 +--- a/scripts/kconfig/lxdialog/inputbox.c ++++ b/scripts/kconfig/lxdialog/inputbox.c +@@ -39,8 +39,10 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width + + if (!init) + instr[0] = '\0'; +- else +- strcpy(instr, init); ++ else { ++ strncpy(instr, init, sizeof(dialog_input_result) - 1); ++ instr[sizeof(dialog_input_result) - 1] = '\0'; ++ } + + do_resize: + if (getmaxy(stdscr) <= (height - INPUTBOX_HEIGTH_MIN)) +-- +2.39.5 + diff --git a/queue-6.1/kconfig-nconf-ensure-null-termination-where-strncpy-.patch b/queue-6.1/kconfig-nconf-ensure-null-termination-where-strncpy-.patch new file mode 100644 index 0000000000..baffdb9fb0 --- /dev/null +++ b/queue-6.1/kconfig-nconf-ensure-null-termination-where-strncpy-.patch @@ -0,0 +1,55 @@ +From 85d86da100d6fcdb10f696d9090e69cc9fd1c91e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Jun 2025 00:36:54 +0530 +Subject: kconfig: nconf: Ensure null termination where strncpy is used + +From: Shankari Anand + +[ Upstream commit f468992936894c9ce3b1659cf38c230d33b77a16 ] + +strncpy() does not guarantee null-termination if the source string is +longer than the destination buffer. + +Ensure the buffer is explicitly null-terminated to prevent potential +string overflows or undefined behavior. + +Signed-off-by: Shankari Anand +Signed-off-by: Masahiro Yamada +Acked-by: Randy Dunlap +Tested-by: Randy Dunlap +Tested-by: Nicolas Schier +Acked-by: Nicolas Schier +Signed-off-by: Sasha Levin +--- + scripts/kconfig/nconf.c | 2 ++ + scripts/kconfig/nconf.gui.c | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c +index 3ba8b1af390f..16a2db59432a 100644 +--- a/scripts/kconfig/nconf.c ++++ b/scripts/kconfig/nconf.c +@@ -585,6 +585,8 @@ static void item_add_str(const char *fmt, ...) + tmp_str, + sizeof(k_menu_items[index].str)); + ++ k_menu_items[index].str[sizeof(k_menu_items[index].str) - 1] = '\0'; ++ + free_item(curses_menu_items[index]); + curses_menu_items[index] = new_item( + k_menu_items[index].str, +diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c +index 9aedf40f1dc0..da06ea2afe08 100644 +--- a/scripts/kconfig/nconf.gui.c ++++ b/scripts/kconfig/nconf.gui.c +@@ -349,6 +349,7 @@ int dialog_inputbox(WINDOW *main_window, + x = (columns-win_cols)/2; + + strncpy(result, init, *result_len); ++ result[*result_len - 1] = '\0'; + + /* create the windows */ + win = newwin(win_lines, win_cols, y, x); +-- +2.39.5 + diff --git a/queue-6.1/kselftest-arm64-specify-sve-data-when-testing-vl-set.patch b/queue-6.1/kselftest-arm64-specify-sve-data-when-testing-vl-set.patch new file mode 100644 index 0000000000..963ab41e9c --- /dev/null +++ b/queue-6.1/kselftest-arm64-specify-sve-data-when-testing-vl-set.patch @@ -0,0 +1,49 @@ +From cd0be82d71419cfba1a33ceda5c35cdbb94c4d14 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 16:25:33 +0100 +Subject: kselftest/arm64: Specify SVE data when testing VL set in sve-ptrace + +From: Mark Brown + +[ Upstream commit 9e8ebfe677f9101bbfe1f75d548a5aec581e8213 ] + +Since f916dd32a943 ("arm64/fpsimd: ptrace: Mandate SVE payload for +streaming-mode state") we reject attempts to write to the streaming mode +regset even if there is no register data supplied, causing the tests for +setting vector lengths and setting SVE_VL_INHERIT in sve-ptrace to +spuriously fail. Set the flag to avoid the issue, we still support not +supplying register data. + +Acked-by: Mark Rutland +Signed-off-by: Mark Brown +Link: https://lore.kernel.org/r/20250609-kselftest-arm64-ssve-fixups-v2-3-998fcfa6f240@kernel.org +Signed-off-by: Catalin Marinas +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/arm64/fp/sve-ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/arm64/fp/sve-ptrace.c b/tools/testing/selftests/arm64/fp/sve-ptrace.c +index 91dd31629ffe..9f5461cd5b8f 100644 +--- a/tools/testing/selftests/arm64/fp/sve-ptrace.c ++++ b/tools/testing/selftests/arm64/fp/sve-ptrace.c +@@ -158,7 +158,7 @@ static void ptrace_set_get_inherit(pid_t child, const struct vec_type *type) + memset(&sve, 0, sizeof(sve)); + sve.size = sizeof(sve); + sve.vl = sve_vl_from_vq(SVE_VQ_MIN); +- sve.flags = SVE_PT_VL_INHERIT; ++ sve.flags = SVE_PT_VL_INHERIT | SVE_PT_REGS_SVE; + ret = set_sve(child, type, &sve); + if (ret != 0) { + ksft_test_result_fail("Failed to set %s SVE_PT_VL_INHERIT\n", +@@ -223,6 +223,7 @@ static void ptrace_set_get_vl(pid_t child, const struct vec_type *type, + /* Set the VL by doing a set with no register payload */ + memset(&sve, 0, sizeof(sve)); + sve.size = sizeof(sve); ++ sve.flags = SVE_PT_REGS_SVE; + sve.vl = vl; + ret = set_sve(child, type, &sve); + if (ret != 0) { +-- +2.39.5 + diff --git a/queue-6.1/ktest.pl-prevent-recursion-of-default-variable-optio.patch b/queue-6.1/ktest.pl-prevent-recursion-of-default-variable-optio.patch new file mode 100644 index 0000000000..a4c3e085a1 --- /dev/null +++ b/queue-6.1/ktest.pl-prevent-recursion-of-default-variable-optio.patch @@ -0,0 +1,62 @@ +From 7498949d956fe53804213f243896ccb3026a1cda Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jul 2025 16:18:44 -0400 +Subject: ktest.pl: Prevent recursion of default variable options + +From: Steven Rostedt + +[ Upstream commit 61f7e318e99d3b398670518dd3f4f8510d1800fc ] + +If a default variable contains itself, do not recurse on it. + +For example: + + ADD_CONFIG := ${CONFIG_DIR}/temp_config + DEFAULTS + ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG} + +The above works because the temp variable ADD_CONFIG (is a temp because it +is created with ":=") is already defined, it will be substituted in the +variable option. But if it gets commented out: + + # ADD_CONFIG := ${CONFIG_DIR}/temp_config + DEFAULTS + ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG} + +Then the above will go into a recursive loop where ${ADD_CONFIG} will +get replaced with the current definition of ADD_CONFIG which contains the +${ADD_CONFIG} and that will also try to get converted. ktest.pl will error +after 100 attempts of recursion and fail. + +When replacing a variable with the default variable, if the default +variable contains itself, do not replace it. + +Cc: "John Warthog9 Hawley" +Cc: Dhaval Giani +Cc: Greg KH +Link: https://lore.kernel.org/20250718202053.732189428@kernel.org +Signed-off-by: Steven Rostedt +Signed-off-by: Sasha Levin +--- + tools/testing/ktest/ktest.pl | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl +index 2109bd42c144..26544bba3f8f 100755 +--- a/tools/testing/ktest/ktest.pl ++++ b/tools/testing/ktest/ktest.pl +@@ -1351,7 +1351,10 @@ sub __eval_option { + # If a variable contains itself, use the default var + if (($var eq $name) && defined($opt{$var})) { + $o = $opt{$var}; +- $retval = "$retval$o"; ++ # Only append if the default doesn't contain itself ++ if ($o !~ m/\$\{$var\}/) { ++ $retval = "$retval$o"; ++ } + } elsif (defined($opt{$o})) { + $o = $opt{$o}; + $retval = "$retval$o"; +-- +2.39.5 + diff --git a/queue-6.1/leds-leds-lp50xx-handle-reg-to-get-correct-multi_ind.patch b/queue-6.1/leds-leds-lp50xx-handle-reg-to-get-correct-multi_ind.patch new file mode 100644 index 0000000000..fc9879c6a3 --- /dev/null +++ b/queue-6.1/leds-leds-lp50xx-handle-reg-to-get-correct-multi_ind.patch @@ -0,0 +1,68 @@ +From f3245cce0ad58a064d45ae8fe7e2c825607e7bce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jun 2025 12:23:54 +0200 +Subject: leds: leds-lp50xx: Handle reg to get correct multi_index + +From: Johan Adolfsson + +[ Upstream commit 2e84a5e5374232e6f356ce5c079a5658d7e4af2c ] + +mc_subled used for multi_index needs well defined array indexes, +to guarantee the desired result, use reg for that. + +If devicetree child nodes is processed in random or reverse order +you may end up with multi_index "blue green red" instead of the expected +"red green blue". +If user space apps uses multi_index to deduce how to control the leds +they would most likely be broken without this patch if devicetree +processing is reversed (which it appears to be). + +arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts has reg set +but I don't see how it can have worked without this change. + +If reg is not set, an error is returned, +If reg is out of range, an error is returned. +reg within led child nodes starts with 0, to map to the iout in each bank. + +Signed-off-by: Johan Adolfsson +Reviewed-by: Jacek Anaszewski +Link: https://lore.kernel.org/r/20250617-led-fix-v7-1-cdbe8efc88fa@axis.com +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +--- + drivers/leds/leds-lp50xx.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c +index 28d6b39fa72d..cda62e3d3a3a 100644 +--- a/drivers/leds/leds-lp50xx.c ++++ b/drivers/leds/leds-lp50xx.c +@@ -486,6 +486,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv) + } + + fwnode_for_each_child_node(child, led_node) { ++ int multi_index; + ret = fwnode_property_read_u32(led_node, "color", + &color_id); + if (ret) { +@@ -493,8 +494,16 @@ static int lp50xx_probe_dt(struct lp50xx *priv) + dev_err(priv->dev, "Cannot read color\n"); + goto child_out; + } ++ ret = fwnode_property_read_u32(led_node, "reg", &multi_index); ++ if (ret != 0) { ++ dev_err(priv->dev, "reg must be set\n"); ++ return -EINVAL; ++ } else if (multi_index >= LP50XX_LEDS_PER_MODULE) { ++ dev_err(priv->dev, "reg %i out of range\n", multi_index); ++ return -EINVAL; ++ } + +- mc_led_info[num_colors].color_index = color_id; ++ mc_led_info[multi_index].color_index = color_id; + num_colors++; + } + +-- +2.39.5 + diff --git a/queue-6.1/md-dm-zoned-target-initialize-return-variable-r-to-a.patch b/queue-6.1/md-dm-zoned-target-initialize-return-variable-r-to-a.patch new file mode 100644 index 0000000000..7e41995c78 --- /dev/null +++ b/queue-6.1/md-dm-zoned-target-initialize-return-variable-r-to-a.patch @@ -0,0 +1,45 @@ +From e54c21b1b023f7e521d49523d646e22da8d1bc64 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 13:11:57 +0530 +Subject: md: dm-zoned-target: Initialize return variable r to avoid + uninitialized use + +From: Purva Yeshi + +[ Upstream commit 487767bff572d46f7c37ad846c4078f6d6c9cc55 ] + +Fix Smatch-detected error: +drivers/md/dm-zoned-target.c:1073 dmz_iterate_devices() +error: uninitialized symbol 'r'. + +Smatch detects a possible use of the uninitialized variable 'r' in +dmz_iterate_devices() because if dmz->nr_ddevs is zero, the loop is +skipped and 'r' is returned without being set, leading to undefined +behavior. + +Initialize 'r' to 0 before the loop. This ensures that if there are no +devices to iterate over, the function still returns a defined value. + +Signed-off-by: Purva Yeshi +Signed-off-by: Mikulas Patocka +Signed-off-by: Sasha Levin +--- + drivers/md/dm-zoned-target.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c +index 4abe1e2f8ad8..cbcfadbdd51d 100644 +--- a/drivers/md/dm-zoned-target.c ++++ b/drivers/md/dm-zoned-target.c +@@ -1062,7 +1062,7 @@ static int dmz_iterate_devices(struct dm_target *ti, + struct dmz_target *dmz = ti->private; + unsigned int zone_nr_sectors = dmz_zone_nr_sectors(dmz->metadata); + sector_t capacity; +- int i, r; ++ int i, r = 0; + + for (i = 0; i < dmz->nr_ddevs; i++) { + capacity = dmz->dev[i].capacity & ~(zone_nr_sectors - 1); +-- +2.39.5 + diff --git a/queue-6.1/media-dvb-frontends-dib7090p-fix-null-ptr-deref-in-d.patch b/queue-6.1/media-dvb-frontends-dib7090p-fix-null-ptr-deref-in-d.patch new file mode 100644 index 0000000000..c31a6298c1 --- /dev/null +++ b/queue-6.1/media-dvb-frontends-dib7090p-fix-null-ptr-deref-in-d.patch @@ -0,0 +1,46 @@ +From 9c348ea3d28df83c79575b2dd59b65e45743051a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 15 Jun 2025 21:32:31 -0400 +Subject: media: dvb-frontends: dib7090p: fix null-ptr-deref in + dib7090p_rw_on_apb() + +From: Alex Guo + +[ Upstream commit ce5cac69b2edac3e3246fee03e8f4c2a1075238b ] + +In dib7090p_rw_on_apb, msg is controlled by user. When msg[0].buf is null and +msg[0].len is zero, former checks on msg[0].buf would be passed. If accessing +msg[0].buf[2] without sanity check, null pointer deref would happen. We add +check on msg[0].len to prevent crash. Similar issue occurs when access +msg[1].buf[0] and msg[1].buf[1]. + +Similar commit: commit 0ed554fd769a ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()") + +Signed-off-by: Alex Guo +Link: https://lore.kernel.org/r/20250616013231.730221-1-alexguo1023@gmail.com +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/dib7000p.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c +index d1e53de5206a..aae8335644f3 100644 +--- a/drivers/media/dvb-frontends/dib7000p.c ++++ b/drivers/media/dvb-frontends/dib7000p.c +@@ -2261,8 +2261,12 @@ static int dib7090p_rw_on_apb(struct i2c_adapter *i2c_adap, + u16 word; + + if (num == 1) { /* write */ ++ if (msg[0].len < 3) ++ return -EOPNOTSUPP; + dib7000p_write_word(state, apb_address, ((msg[0].buf[1] << 8) | (msg[0].buf[2]))); + } else { ++ if (msg[1].len < 2) ++ return -EOPNOTSUPP; + word = dib7000p_read_word(state, apb_address); + msg[1].buf[0] = (word >> 8) & 0xff; + msg[1].buf[1] = (word) & 0xff; +-- +2.39.5 + diff --git a/queue-6.1/media-dvb-frontends-w7090p-fix-null-ptr-deref-in-w70.patch b/queue-6.1/media-dvb-frontends-w7090p-fix-null-ptr-deref-in-w70.patch new file mode 100644 index 0000000000..d21bcfe69d --- /dev/null +++ b/queue-6.1/media-dvb-frontends-w7090p-fix-null-ptr-deref-in-w70.patch @@ -0,0 +1,48 @@ +From 93e7036215919f635eab15a2173e1e3282c0e89c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 15 Jun 2025 21:33:53 -0400 +Subject: media: dvb-frontends: w7090p: fix null-ptr-deref in + w7090p_tuner_write_serpar and w7090p_tuner_read_serpar + +From: Alex Guo + +[ Upstream commit ed0234c8458b3149f15e496b48a1c9874dd24a1b ] + +In w7090p_tuner_write_serpar, msg is controlled by user. When msg[0].buf is null and msg[0].len is zero, former checks on msg[0].buf would be passed. If accessing msg[0].buf[2] without sanity check, null pointer deref would happen. We add +check on msg[0].len to prevent crash. + +Similar commit: commit 0ed554fd769a ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()") + +Signed-off-by: Alex Guo +Link: https://lore.kernel.org/r/20250616013353.738790-1-alexguo1023@gmail.com +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Sasha Levin +--- + drivers/media/dvb-frontends/dib7000p.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c +index aae8335644f3..f40bc835649c 100644 +--- a/drivers/media/dvb-frontends/dib7000p.c ++++ b/drivers/media/dvb-frontends/dib7000p.c +@@ -2198,6 +2198,8 @@ static int w7090p_tuner_write_serpar(struct i2c_adapter *i2c_adap, struct i2c_ms + struct dib7000p_state *state = i2c_get_adapdata(i2c_adap); + u8 n_overflow = 1; + u16 i = 1000; ++ if (msg[0].len < 3) ++ return -EOPNOTSUPP; + u16 serpar_num = msg[0].buf[0]; + + while (n_overflow == 1 && i) { +@@ -2217,6 +2219,8 @@ static int w7090p_tuner_read_serpar(struct i2c_adapter *i2c_adap, struct i2c_msg + struct dib7000p_state *state = i2c_get_adapdata(i2c_adap); + u8 n_overflow = 1, n_empty = 1; + u16 i = 1000; ++ if (msg[0].len < 1 || msg[1].len < 2) ++ return -EOPNOTSUPP; + u16 serpar_num = msg[0].buf[0]; + u16 read_word; + +-- +2.39.5 + diff --git a/queue-6.1/media-tc358743-check-i2c-succeeded-during-probe.patch b/queue-6.1/media-tc358743-check-i2c-succeeded-during-probe.patch new file mode 100644 index 0000000000..e40858a737 --- /dev/null +++ b/queue-6.1/media-tc358743-check-i2c-succeeded-during-probe.patch @@ -0,0 +1,109 @@ +From c3941626d030f06f0bb23a48bc3f6cfbc54bd9b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 19:37:15 +0100 +Subject: media: tc358743: Check I2C succeeded during probe + +From: Dave Stevenson + +[ Upstream commit 303d81635e1d9c949b370215cc94526ed81f2e3d ] + +The probe for the TC358743 reads the CHIPID register from +the device and compares it to the expected value of 0. +If the I2C request fails then that also returns 0, so +the driver loads thinking that the device is there. + +Generally I2C communications are reliable so there is +limited need to check the return value on every transfer, +therefore only amend the one read during probe to check +for I2C errors. + +Signed-off-by: Dave Stevenson +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/tc358743.c | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c +index 2c8189e04a13..7251d25106d6 100644 +--- a/drivers/media/i2c/tc358743.c ++++ b/drivers/media/i2c/tc358743.c +@@ -110,7 +110,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd) + + /* --------------- I2C --------------- */ + +-static void i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) ++static int i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) + { + struct tc358743_state *state = to_state(sd); + struct i2c_client *client = state->i2c_client; +@@ -136,6 +136,7 @@ static void i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) + v4l2_err(sd, "%s: reading register 0x%x from 0x%x failed\n", + __func__, reg, client->addr); + } ++ return err != ARRAY_SIZE(msgs); + } + + static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) +@@ -192,15 +193,24 @@ static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) + } + } + +-static noinline u32 i2c_rdreg(struct v4l2_subdev *sd, u16 reg, u32 n) ++static noinline u32 i2c_rdreg_err(struct v4l2_subdev *sd, u16 reg, u32 n, ++ int *err) + { ++ int error; + __le32 val = 0; + +- i2c_rd(sd, reg, (u8 __force *)&val, n); ++ error = i2c_rd(sd, reg, (u8 __force *)&val, n); ++ if (err) ++ *err = error; + + return le32_to_cpu(val); + } + ++static inline u32 i2c_rdreg(struct v4l2_subdev *sd, u16 reg, u32 n) ++{ ++ return i2c_rdreg_err(sd, reg, n, NULL); ++} ++ + static noinline void i2c_wrreg(struct v4l2_subdev *sd, u16 reg, u32 val, u32 n) + { + __le32 raw = cpu_to_le32(val); +@@ -229,6 +239,13 @@ static u16 i2c_rd16(struct v4l2_subdev *sd, u16 reg) + return i2c_rdreg(sd, reg, 2); + } + ++static int i2c_rd16_err(struct v4l2_subdev *sd, u16 reg, u16 *value) ++{ ++ int err; ++ *value = i2c_rdreg_err(sd, reg, 2, &err); ++ return err; ++} ++ + static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val) + { + i2c_wrreg(sd, reg, val, 2); +@@ -2021,6 +2038,7 @@ static int tc358743_probe(struct i2c_client *client) + struct tc358743_platform_data *pdata = client->dev.platform_data; + struct v4l2_subdev *sd; + u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK; ++ u16 chipid; + int err; + + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) +@@ -2052,7 +2070,8 @@ static int tc358743_probe(struct i2c_client *client) + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; + + /* i2c access */ +- if ((i2c_rd16(sd, CHIPID) & MASK_CHIPID) != 0) { ++ if (i2c_rd16_err(sd, CHIPID, &chipid) || ++ (chipid & MASK_CHIPID) != 0) { + v4l2_info(sd, "not a TC358743 on address 0x%x\n", + client->addr << 1); + return -ENODEV; +-- +2.39.5 + diff --git a/queue-6.1/media-tc358743-increase-fifo-trigger-level-to-374.patch b/queue-6.1/media-tc358743-increase-fifo-trigger-level-to-374.patch new file mode 100644 index 0000000000..c2894872af --- /dev/null +++ b/queue-6.1/media-tc358743-increase-fifo-trigger-level-to-374.patch @@ -0,0 +1,58 @@ +From 16dcf9344521ec21299829049b19d4e2f8d2d16e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 19:37:14 +0100 +Subject: media: tc358743: Increase FIFO trigger level to 374 + +From: Dave Stevenson + +[ Upstream commit 86addd25314a1e77dbdcfddfeed0bab2f27da0e2 ] + +The existing fixed value of 16 worked for UYVY 720P60 over +2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888 +1080P60 needs 6 lanes at 594MHz). +It doesn't allow for lower resolutions to work as the FIFO +underflows. + +374 is required for 1080P24 or 1080P30 UYVY over 2 lanes @ +972Mbit/s, but >374 means that the FIFO underflows on 1080P50 +UYVY over 2 lanes @ 972Mbit/s. + +Whilst it would be nice to compute it, the required information +isn't published by Toshiba. + +Signed-off-by: Dave Stevenson +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/tc358743.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c +index 0f9fd9cb77b3..d13e8f19278f 100644 +--- a/drivers/media/i2c/tc358743.c ++++ b/drivers/media/i2c/tc358743.c +@@ -1939,8 +1939,19 @@ static int tc358743_probe_of(struct tc358743_state *state) + state->pdata.refclk_hz = clk_get_rate(refclk); + state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS; + state->pdata.enable_hdcp = false; +- /* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */ +- state->pdata.fifo_level = 16; ++ /* ++ * Ideally the FIFO trigger level should be set based on the input and ++ * output data rates, but the calculations required are buried in ++ * Toshiba's register settings spreadsheet. ++ * A value of 16 works with a 594Mbps data rate for 720p60 (using 2 ++ * lanes) and 1080p60 (using 4 lanes), but fails when the data rate ++ * is increased, or a lower pixel clock is used that result in CSI ++ * reading out faster than the data is arriving. ++ * ++ * A value of 374 works with both those modes at 594Mbps, and with most ++ * modes on 972Mbps. ++ */ ++ state->pdata.fifo_level = 374; + /* + * The PLL input clock is obtained by dividing refclk by pll_prd. + * It must be between 6 MHz and 40 MHz, lower frequency is better. +-- +2.39.5 + diff --git a/queue-6.1/media-tc358743-return-an-appropriate-colorspace-from.patch b/queue-6.1/media-tc358743-return-an-appropriate-colorspace-from.patch new file mode 100644 index 0000000000..3feedd92b3 --- /dev/null +++ b/queue-6.1/media-tc358743-return-an-appropriate-colorspace-from.patch @@ -0,0 +1,113 @@ +From 1e4a18b491d06e79a3697ecd1013d04fec8685d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 19:37:16 +0100 +Subject: media: tc358743: Return an appropriate colorspace from + tc358743_set_fmt + +From: Dave Stevenson + +[ Upstream commit 377cc006a364dfdab2f3f221cfad63a9265200b8 ] + +When calling tc358743_set_fmt, the code was calling tc358743_get_fmt +to choose a valid format. However that sets the colorspace +based on information read back from the chip, not the colour +format requested. + +The result was that if you called try or set format for UYVY +when the current format was RGB3 then you would get told SRGB, +and try RGB3 when current was UYVY and you would get told +SMPTE170M. + +The value programmed in the VI_REP register for the colorspace +is always set by this driver, therefore there is no need to read +back the value, and never set to REC709. +Return the colorspace based on the format set/tried instead. + +Signed-off-by: Dave Stevenson +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/i2c/tc358743.c | 44 ++++++++++++++---------------------- + 1 file changed, 17 insertions(+), 27 deletions(-) + +diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c +index 7251d25106d6..0f9fd9cb77b3 100644 +--- a/drivers/media/i2c/tc358743.c ++++ b/drivers/media/i2c/tc358743.c +@@ -1668,12 +1668,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd, + return 0; + } + ++static u32 tc358743_g_colorspace(u32 code) ++{ ++ switch (code) { ++ case MEDIA_BUS_FMT_RGB888_1X24: ++ return V4L2_COLORSPACE_SRGB; ++ case MEDIA_BUS_FMT_UYVY8_1X16: ++ return V4L2_COLORSPACE_SMPTE170M; ++ default: ++ return 0; ++ } ++} ++ + static int tc358743_get_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_state *sd_state, + struct v4l2_subdev_format *format) + { + struct tc358743_state *state = to_state(sd); +- u8 vi_rep = i2c_rd8(sd, VI_REP); + + if (format->pad != 0) + return -EINVAL; +@@ -1683,23 +1694,7 @@ static int tc358743_get_fmt(struct v4l2_subdev *sd, + format->format.height = state->timings.bt.height; + format->format.field = V4L2_FIELD_NONE; + +- switch (vi_rep & MASK_VOUT_COLOR_SEL) { +- case MASK_VOUT_COLOR_RGB_FULL: +- case MASK_VOUT_COLOR_RGB_LIMITED: +- format->format.colorspace = V4L2_COLORSPACE_SRGB; +- break; +- case MASK_VOUT_COLOR_601_YCBCR_LIMITED: +- case MASK_VOUT_COLOR_601_YCBCR_FULL: +- format->format.colorspace = V4L2_COLORSPACE_SMPTE170M; +- break; +- case MASK_VOUT_COLOR_709_YCBCR_FULL: +- case MASK_VOUT_COLOR_709_YCBCR_LIMITED: +- format->format.colorspace = V4L2_COLORSPACE_REC709; +- break; +- default: +- format->format.colorspace = 0; +- break; +- } ++ format->format.colorspace = tc358743_g_colorspace(format->format.code); + + return 0; + } +@@ -1713,19 +1708,14 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd, + u32 code = format->format.code; /* is overwritten by get_fmt */ + int ret = tc358743_get_fmt(sd, sd_state, format); + +- format->format.code = code; ++ if (code == MEDIA_BUS_FMT_RGB888_1X24 || ++ code == MEDIA_BUS_FMT_UYVY8_1X16) ++ format->format.code = code; ++ format->format.colorspace = tc358743_g_colorspace(format->format.code); + + if (ret) + return ret; + +- switch (code) { +- case MEDIA_BUS_FMT_RGB888_1X24: +- case MEDIA_BUS_FMT_UYVY8_1X16: +- break; +- default: +- return -EINVAL; +- } +- + if (format->which == V4L2_SUBDEV_FORMAT_TRY) + return 0; + +-- +2.39.5 + diff --git a/queue-6.1/media-usb-hdpvr-disable-zero-length-read-messages.patch b/queue-6.1/media-usb-hdpvr-disable-zero-length-read-messages.patch new file mode 100644 index 0000000000..3018f5a71c --- /dev/null +++ b/queue-6.1/media-usb-hdpvr-disable-zero-length-read-messages.patch @@ -0,0 +1,46 @@ +From e8200f1d755da044c3b37f813b8edffd98cc6c43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 May 2025 10:09:54 +0200 +Subject: media: usb: hdpvr: disable zero-length read messages + +From: Wolfram Sang + +[ Upstream commit b5ae5a79825ba8037b0be3ef677a24de8c063abf ] + +This driver passes the length of an i2c_msg directly to +usb_control_msg(). If the message is now a read and of length 0, it +violates the USB protocol and a warning will be printed. Enable the +I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length +read messages altogether. + +Signed-off-by: Wolfram Sang +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/media/usb/hdpvr/hdpvr-i2c.c b/drivers/media/usb/hdpvr/hdpvr-i2c.c +index 070559b01b01..54956a8ff15e 100644 +--- a/drivers/media/usb/hdpvr/hdpvr-i2c.c ++++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c +@@ -165,10 +165,16 @@ static const struct i2c_algorithm hdpvr_algo = { + .functionality = hdpvr_functionality, + }; + ++/* prevent invalid 0-length usb_control_msg */ ++static const struct i2c_adapter_quirks hdpvr_quirks = { ++ .flags = I2C_AQ_NO_ZERO_LEN_READ, ++}; ++ + static const struct i2c_adapter hdpvr_i2c_adapter_template = { + .name = "Hauppauge HD PVR I2C", + .owner = THIS_MODULE, + .algo = &hdpvr_algo, ++ .quirks = &hdpvr_quirks, + }; + + static int hdpvr_activate_ir(struct hdpvr_device *dev) +-- +2.39.5 + diff --git a/queue-6.1/media-uvcvideo-fix-bandwidth-issue-for-alcor-camera.patch b/queue-6.1/media-uvcvideo-fix-bandwidth-issue-for-alcor-camera.patch new file mode 100644 index 0000000000..bcb93e49c8 --- /dev/null +++ b/queue-6.1/media-uvcvideo-fix-bandwidth-issue-for-alcor-camera.patch @@ -0,0 +1,52 @@ +From 22b4d87df85d4f4522f81437f321624485de28e8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 10 May 2025 14:18:03 +0800 +Subject: media: uvcvideo: Fix bandwidth issue for Alcor camera + +From: chenchangcheng + +[ Upstream commit 9764401bf6f8a20eb11c2e78470f20fee91a9ea7 ] + +Some broken device return wrong dwMaxPayloadTransferSize fields as +follows: + +[ 218.632537] uvcvideo: Device requested 2752512 B/frame bandwidth. +[ 218.632598] uvcvideo: No fast enough alt setting for requested bandwidth. + +When dwMaxPayloadTransferSize is greater than maxpsize, it will prevent +the camera from starting. So use the bandwidth of maxpsize. + +Signed-off-by: chenchangcheng +Reviewed-by: Ricardo Ribalda +Reviewed-by: Laurent Pinchart +Link: https://lore.kernel.org/r/20250510061803.811433-1-ccc194101@163.com +Signed-off-by: Laurent Pinchart +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/usb/uvc/uvc_video.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c +index aa0a879a9c64..29efccd5aa09 100644 +--- a/drivers/media/usb/uvc/uvc_video.c ++++ b/drivers/media/usb/uvc/uvc_video.c +@@ -234,6 +234,15 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, + + ctrl->dwMaxPayloadTransferSize = bandwidth; + } ++ ++ if (stream->intf->num_altsetting > 1 && ++ ctrl->dwMaxPayloadTransferSize > stream->maxpsize) { ++ dev_warn_ratelimited(&stream->intf->dev, ++ "UVC non compliance: the max payload transmission size (%u) exceeds the size of the ep max packet (%u). Using the max size.\n", ++ ctrl->dwMaxPayloadTransferSize, ++ stream->maxpsize); ++ ctrl->dwMaxPayloadTransferSize = stream->maxpsize; ++ } + } + + static size_t uvc_video_ctrl_size(struct uvc_streaming *stream) +-- +2.39.5 + diff --git a/queue-6.1/media-v4l2-common-reduce-warnings-about-missing-v4l2.patch b/queue-6.1/media-v4l2-common-reduce-warnings-about-missing-v4l2.patch new file mode 100644 index 0000000000..32c22026b4 --- /dev/null +++ b/queue-6.1/media-v4l2-common-reduce-warnings-about-missing-v4l2.patch @@ -0,0 +1,47 @@ +From e576d7420c41940914b5f896378789c12a6065eb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 May 2025 10:37:45 +0200 +Subject: media: v4l2-common: Reduce warnings about missing V4L2_CID_LINK_FREQ + control +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Niklas Söderlund + +[ Upstream commit 5a0abb8909b9dcf347fce1d201ac6686ac33fd64 ] + +When operating a pipeline with a missing V4L2_CID_LINK_FREQ control this +two line warning is printed each time the pipeline is started. Reduce +this excessive logging by only warning once for the missing control. + +Signed-off-by: Niklas Söderlund +Signed-off-by: Sakari Ailus +Signed-off-by: Hans Verkuil +Signed-off-by: Sasha Levin +--- + drivers/media/v4l2-core/v4l2-common.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c +index 40f56e044640..1c8d36684809 100644 +--- a/drivers/media/v4l2-core/v4l2-common.c ++++ b/drivers/media/v4l2-core/v4l2-common.c +@@ -475,10 +475,10 @@ s64 v4l2_get_link_freq(struct v4l2_ctrl_handler *handler, unsigned int mul, + + freq = div_u64(v4l2_ctrl_g_ctrl_int64(ctrl) * mul, div); + +- pr_warn("%s: Link frequency estimated using pixel rate: result might be inaccurate\n", +- __func__); +- pr_warn("%s: Consider implementing support for V4L2_CID_LINK_FREQ in the transmitter driver\n", +- __func__); ++ pr_warn_once("%s: Link frequency estimated using pixel rate: result might be inaccurate\n", ++ __func__); ++ pr_warn_once("%s: Consider implementing support for V4L2_CID_LINK_FREQ in the transmitter driver\n", ++ __func__); + } + + return freq > 0 ? freq : -EINVAL; +-- +2.39.5 + diff --git a/queue-6.1/mei-bus-check-for-still-connected-devices-in-mei_cl_.patch b/queue-6.1/mei-bus-check-for-still-connected-devices-in-mei_cl_.patch new file mode 100644 index 0000000000..23b7c5b394 --- /dev/null +++ b/queue-6.1/mei-bus-check-for-still-connected-devices-in-mei_cl_.patch @@ -0,0 +1,56 @@ +From 7d847f706e10eb22ed36341d87ba75e388e64c51 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 23 Jun 2025 10:50:52 +0200 +Subject: mei: bus: Check for still connected devices in + mei_cl_bus_dev_release() + +From: Hans de Goede + +[ Upstream commit 35e8a426b16adbecae7a4e0e3c00fc8d0273db53 ] + +mei_cl_bus_dev_release() also frees the mei-client (struct mei_cl) +belonging to the device being released. + +If there are bugs like the just fixed bug in the ACE/CSI2 mei drivers, +the mei-client being freed might still be part of the mei_device's +file_list and iterating over this list after the freeing will then trigger +a use-afer-free bug. + +Add a check to mei_cl_bus_dev_release() to make sure that the to-be-freed +mei-client is not on the mei_device's file_list. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20250623085052.12347-11-hansg@kernel.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/misc/mei/bus.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c +index 7b7f4190cd02..19bc1e9eeb7f 100644 +--- a/drivers/misc/mei/bus.c ++++ b/drivers/misc/mei/bus.c +@@ -1113,6 +1113,8 @@ static void mei_dev_bus_put(struct mei_device *bus) + static void mei_cl_bus_dev_release(struct device *dev) + { + struct mei_cl_device *cldev = to_mei_cl_device(dev); ++ struct mei_device *mdev = cldev->cl->dev; ++ struct mei_cl *cl; + + if (!cldev) + return; +@@ -1120,6 +1122,10 @@ static void mei_cl_bus_dev_release(struct device *dev) + mei_cl_flush_queues(cldev->cl, NULL); + mei_me_cl_put(cldev->me_cl); + mei_dev_bus_put(cldev->bus); ++ ++ list_for_each_entry(cl, &mdev->file_list, link) ++ WARN_ON(cl == cldev->cl); ++ + kfree(cldev->cl); + kfree(cldev); + } +-- +2.39.5 + diff --git a/queue-6.1/mips-don-t-crash-in-stack_top-for-tasks-without-abi-.patch b/queue-6.1/mips-don-t-crash-in-stack_top-for-tasks-without-abi-.patch new file mode 100644 index 0000000000..c0b8a71887 --- /dev/null +++ b/queue-6.1/mips-don-t-crash-in-stack_top-for-tasks-without-abi-.patch @@ -0,0 +1,79 @@ +From acf52b5205b33f6e378784fd228746b977539060 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 13:28:26 +0200 +Subject: MIPS: Don't crash in stack_top() for tasks without ABI or vDSO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Weißschuh + +[ Upstream commit e9f4a6b3421e936c3ee9d74710243897d74dbaa2 ] + +Not all tasks have an ABI associated or vDSO mapped, +for example kthreads never do. +If such a task ever ends up calling stack_top(), it will derefence the +NULL ABI pointer and crash. + +This can for example happen when using kunit: + + mips_stack_top+0x28/0xc0 + arch_pick_mmap_layout+0x190/0x220 + kunit_vm_mmap_init+0xf8/0x138 + __kunit_add_resource+0x40/0xa8 + kunit_vm_mmap+0x88/0xd8 + usercopy_test_init+0xb8/0x240 + kunit_try_run_case+0x5c/0x1a8 + kunit_generic_run_threadfn_adapter+0x28/0x50 + kthread+0x118/0x240 + ret_from_kernel_thread+0x14/0x1c + +Only dereference the ABI point if it is set. + +The GIC page is also included as it is specific to the vDSO. +Also move the randomization adjustment into the same conditional. + +Signed-off-by: Thomas Weißschuh +Reviewed-by: David Gow +Reviewed-by: Huacai Chen +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/kernel/process.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c +index 17d80e2f2e4c..86deab01c578 100644 +--- a/arch/mips/kernel/process.c ++++ b/arch/mips/kernel/process.c +@@ -690,18 +690,20 @@ unsigned long mips_stack_top(void) + } + + /* Space for the VDSO, data page & GIC user page */ +- top -= PAGE_ALIGN(current->thread.abi->vdso->size); +- top -= PAGE_SIZE; +- top -= mips_gic_present() ? PAGE_SIZE : 0; ++ if (current->thread.abi) { ++ top -= PAGE_ALIGN(current->thread.abi->vdso->size); ++ top -= PAGE_SIZE; ++ top -= mips_gic_present() ? PAGE_SIZE : 0; ++ ++ /* Space to randomize the VDSO base */ ++ if (current->flags & PF_RANDOMIZE) ++ top -= VDSO_RANDOMIZE_SIZE; ++ } + + /* Space for cache colour alignment */ + if (cpu_has_dc_aliases) + top -= shm_align_mask + 1; + +- /* Space to randomize the VDSO base */ +- if (current->flags & PF_RANDOMIZE) +- top -= VDSO_RANDOMIZE_SIZE; +- + return top; + } + +-- +2.39.5 + diff --git a/queue-6.1/mips-lantiq-falcon-sysctrl-fix-request-memory-check-.patch b/queue-6.1/mips-lantiq-falcon-sysctrl-fix-request-memory-check-.patch new file mode 100644 index 0000000000..9992a50e9c --- /dev/null +++ b/queue-6.1/mips-lantiq-falcon-sysctrl-fix-request-memory-check-.patch @@ -0,0 +1,74 @@ +From 080c5a6da86843ee816adb298534e10f7f3dc557 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 22:53:23 +0800 +Subject: MIPS: lantiq: falcon: sysctrl: fix request memory check logic + +From: Shiji Yang + +[ Upstream commit 9c9a7ff9882fc6ba7d2f4050697e8bb80383e8dc ] + +request_mem_region() will return NULL instead of error code +when the memory request fails. Therefore, we should check if +the return value is non-zero instead of less than zero. In +this way, this patch also fixes the build warnings: + +arch/mips/lantiq/falcon/sysctrl.c:214:50: error: ordered comparison of pointer with integer zero [-Werror=extra] + 214 | res_status.name) < 0) || + | ^ +arch/mips/lantiq/falcon/sysctrl.c:216:47: error: ordered comparison of pointer with integer zero [-Werror=extra] + 216 | res_ebu.name) < 0) || + | ^ +arch/mips/lantiq/falcon/sysctrl.c:219:50: error: ordered comparison of pointer with integer zero [-Werror=extra] + 219 | res_sys[0].name) < 0) || + | ^ +arch/mips/lantiq/falcon/sysctrl.c:222:50: error: ordered comparison of pointer with integer zero [-Werror=extra] + 222 | res_sys[1].name) < 0) || + | ^ +arch/mips/lantiq/falcon/sysctrl.c:225:50: error: ordered comparison of pointer with integer zero [-Werror=extra] + 225 | res_sys[2].name) < 0)) + | + +Signed-off-by: Shiji Yang +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/lantiq/falcon/sysctrl.c | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c +index 1187729d8cbb..357543996ee6 100644 +--- a/arch/mips/lantiq/falcon/sysctrl.c ++++ b/arch/mips/lantiq/falcon/sysctrl.c +@@ -214,19 +214,16 @@ void __init ltq_soc_init(void) + of_node_put(np_syseth); + of_node_put(np_sysgpe); + +- if ((request_mem_region(res_status.start, resource_size(&res_status), +- res_status.name) < 0) || +- (request_mem_region(res_ebu.start, resource_size(&res_ebu), +- res_ebu.name) < 0) || +- (request_mem_region(res_sys[0].start, +- resource_size(&res_sys[0]), +- res_sys[0].name) < 0) || +- (request_mem_region(res_sys[1].start, +- resource_size(&res_sys[1]), +- res_sys[1].name) < 0) || +- (request_mem_region(res_sys[2].start, +- resource_size(&res_sys[2]), +- res_sys[2].name) < 0)) ++ if ((!request_mem_region(res_status.start, resource_size(&res_status), ++ res_status.name)) || ++ (!request_mem_region(res_ebu.start, resource_size(&res_ebu), ++ res_ebu.name)) || ++ (!request_mem_region(res_sys[0].start, resource_size(&res_sys[0]), ++ res_sys[0].name)) || ++ (!request_mem_region(res_sys[1].start, resource_size(&res_sys[1]), ++ res_sys[1].name)) || ++ (!request_mem_region(res_sys[2].start, resource_size(&res_sys[2]), ++ res_sys[2].name))) + pr_err("Failed to request core resources"); + + status_membase = ioremap(res_status.start, +-- +2.39.5 + diff --git a/queue-6.1/mips-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch b/queue-6.1/mips-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch new file mode 100644 index 0000000000..851ec6b50d --- /dev/null +++ b/queue-6.1/mips-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch @@ -0,0 +1,53 @@ +From a0241a690c3d498062d0834e67199c6ba29e8a0a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 21:06:32 +0800 +Subject: MIPS: vpe-mt: add missing prototypes for vpe_{alloc,start,stop,free} + +From: Shiji Yang + +[ Upstream commit 844615dd0f2d95c018ec66b943e08af22b62aff3 ] + +These functions are exported but their prototypes are not defined. +This patch adds the missing function prototypes to fix the following +compilation warnings: + +arch/mips/kernel/vpe-mt.c:180:7: error: no previous prototype for 'vpe_alloc' [-Werror=missing-prototypes] + 180 | void *vpe_alloc(void) + | ^~~~~~~~~ +arch/mips/kernel/vpe-mt.c:198:5: error: no previous prototype for 'vpe_start' [-Werror=missing-prototypes] + 198 | int vpe_start(void *vpe, unsigned long start) + | ^~~~~~~~~ +arch/mips/kernel/vpe-mt.c:208:5: error: no previous prototype for 'vpe_stop' [-Werror=missing-prototypes] + 208 | int vpe_stop(void *vpe) + | ^~~~~~~~ +arch/mips/kernel/vpe-mt.c:229:5: error: no previous prototype for 'vpe_free' [-Werror=missing-prototypes] + 229 | int vpe_free(void *vpe) + | ^~~~~~~~ + +Signed-off-by: Shiji Yang +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/include/asm/vpe.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h +index baa949a744cb..babbe8742b81 100644 +--- a/arch/mips/include/asm/vpe.h ++++ b/arch/mips/include/asm/vpe.h +@@ -124,4 +124,12 @@ void cleanup_tc(struct tc *tc); + + int __init vpe_module_init(void); + void __exit vpe_module_exit(void); ++ ++#ifdef CONFIG_MIPS_VPE_LOADER_MT ++void *vpe_alloc(void); ++int vpe_start(void *vpe, unsigned long start); ++int vpe_stop(void *vpe); ++int vpe_free(void *vpe); ++#endif /* CONFIG_MIPS_VPE_LOADER_MT */ ++ + #endif /* _ASM_VPE_H */ +-- +2.39.5 + diff --git a/queue-6.1/mmc-rtsx_usb_sdmmc-fix-error-path-in-sd_set_power_mo.patch b/queue-6.1/mmc-rtsx_usb_sdmmc-fix-error-path-in-sd_set_power_mo.patch new file mode 100644 index 0000000000..75967ae9ee --- /dev/null +++ b/queue-6.1/mmc-rtsx_usb_sdmmc-fix-error-path-in-sd_set_power_mo.patch @@ -0,0 +1,40 @@ +From 53d04049fc31122c7b7174a2913c0d7c2fbc4ef5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 13:16:23 +0200 +Subject: mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() + +From: Ulf Hansson + +[ Upstream commit 47a255f7d2eabee06cfbf5b1c2379749442fd01d ] + +In the error path of sd_set_power_mode() we don't update host->power_mode, +which could lead to an imbalance of the runtime PM usage count. Fix this by +always updating host->power_mode. + +Reviewed-by: Avri Altman +Signed-off-by: Ulf Hansson +Acked-by: Ricky Wu +Link: https://lore.kernel.org/r/20250610111633.504366-2-ulf.hansson@linaro.org +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/rtsx_usb_sdmmc.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c +index 2c650cd58693..c5a6bbc06953 100644 +--- a/drivers/mmc/host/rtsx_usb_sdmmc.c ++++ b/drivers/mmc/host/rtsx_usb_sdmmc.c +@@ -1032,9 +1032,7 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, + err = sd_power_on(host); + } + +- if (!err) +- host->power_mode = power_mode; +- ++ host->power_mode = power_mode; + return err; + } + +-- +2.39.5 + diff --git a/queue-6.1/mmc-sdhci-msm-ensure-sd-card-power-isn-t-on-when-car.patch b/queue-6.1/mmc-sdhci-msm-ensure-sd-card-power-isn-t-on-when-car.patch new file mode 100644 index 0000000000..64af574d0f --- /dev/null +++ b/queue-6.1/mmc-sdhci-msm-ensure-sd-card-power-isn-t-on-when-car.patch @@ -0,0 +1,71 @@ +From 828d23fcc4c6d9018de1282402ee4dda5ea3624a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 15:36:59 +0530 +Subject: mmc: sdhci-msm: Ensure SD card power isn't ON when card removed + +From: Sarthak Garg + +[ Upstream commit db58532188ebf51d52b1d7693d9e94c76b926e9f ] + +Many mobile phones feature multi-card tray designs, where the same +tray is used for both SD and SIM cards. If the SD card is placed +at the outermost location in the tray, the SIM card may come in +contact with SD card power-supply while removing the tray, possibly +resulting in SIM damage. + +To prevent that, make sure the SD card is really inserted by reading +the Card Detect pin state. If it's not, turn off the power in +sdhci_msm_check_power_status() and also set the BUS_FAIL power state +on the controller as part of pwr_irq handling for BUS_ON request. + +Signed-off-by: Sarthak Garg +Acked-by: Adrian Hunter +Link: https://lore.kernel.org/r/20250701100659.3310386-1-quic_sartgarg@quicinc.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/sdhci-msm.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c +index c8488b8e2073..f507fa491c58 100644 +--- a/drivers/mmc/host/sdhci-msm.c ++++ b/drivers/mmc/host/sdhci-msm.c +@@ -1560,6 +1560,7 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type) + { + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); ++ struct mmc_host *mmc = host->mmc; + bool done = false; + u32 val = SWITCHABLE_SIGNALING_VOLTAGE; + const struct sdhci_msm_offset *msm_offset = +@@ -1617,6 +1618,12 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type) + "%s: pwr_irq for req: (%d) timed out\n", + mmc_hostname(host->mmc), req_type); + } ++ ++ if ((req_type & REQ_BUS_ON) && mmc->card && !mmc->ops->get_cd(mmc)) { ++ sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); ++ host->pwr = 0; ++ } ++ + pr_debug("%s: %s: request %d done\n", mmc_hostname(host->mmc), + __func__, req_type); + } +@@ -1675,6 +1682,13 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) + udelay(10); + } + ++ if ((irq_status & CORE_PWRCTL_BUS_ON) && mmc->card && ++ !mmc->ops->get_cd(mmc)) { ++ msm_host_writel(msm_host, CORE_PWRCTL_BUS_FAIL, host, ++ msm_offset->core_pwrctl_ctl); ++ return; ++ } ++ + /* Handle BUS ON/OFF*/ + if (irq_status & CORE_PWRCTL_BUS_ON) { + pwr_state = REQ_BUS_ON; +-- +2.39.5 + diff --git a/queue-6.1/module-prevent-silent-truncation-of-module-name-in-d.patch b/queue-6.1/module-prevent-silent-truncation-of-module-name-in-d.patch new file mode 100644 index 0000000000..5a14a9958c --- /dev/null +++ b/queue-6.1/module-prevent-silent-truncation-of-module-name-in-d.patch @@ -0,0 +1,57 @@ +From 2eb11e08ea15d783bc92687816a35d1ab2648755 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 16:32:32 +0200 +Subject: module: Prevent silent truncation of module name in delete_module(2) + +From: Petr Pavlu + +[ Upstream commit a6323bd4e611567913e23df5b58f2d4e4da06789 ] + +Passing a module name longer than MODULE_NAME_LEN to the delete_module +syscall results in its silent truncation. This really isn't much of +a problem in practice, but it could theoretically lead to the removal of an +incorrect module. It is more sensible to return ENAMETOOLONG or ENOENT in +such a case. + +Update the syscall to return ENOENT, as documented in the delete_module(2) +man page to mean "No module by that name exists." This is appropriate +because a module with a name longer than MODULE_NAME_LEN cannot be loaded +in the first place. + +Signed-off-by: Petr Pavlu +Reviewed-by: Daniel Gomez +Link: https://lore.kernel.org/r/20250630143535.267745-2-petr.pavlu@suse.com +Signed-off-by: Daniel Gomez +Signed-off-by: Sasha Levin +--- + kernel/module/main.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/kernel/module/main.c b/kernel/module/main.c +index 554aba47ab68..3269f6c46814 100644 +--- a/kernel/module/main.c ++++ b/kernel/module/main.c +@@ -699,14 +699,16 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, + struct module *mod; + char name[MODULE_NAME_LEN]; + char buf[MODULE_FLAGS_BUF_SIZE]; +- int ret, forced = 0; ++ int ret, len, forced = 0; + + if (!capable(CAP_SYS_MODULE) || modules_disabled) + return -EPERM; + +- if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) +- return -EFAULT; +- name[MODULE_NAME_LEN-1] = '\0'; ++ len = strncpy_from_user(name, name_user, MODULE_NAME_LEN); ++ if (len == 0 || len == MODULE_NAME_LEN) ++ return -ENOENT; ++ if (len < 0) ++ return len; + + audit_log_kern_module(name); + +-- +2.39.5 + diff --git a/queue-6.1/neighbour-add-support-for-nud_permanent-proxy-entrie.patch b/queue-6.1/neighbour-add-support-for-nud_permanent-proxy-entrie.patch new file mode 100644 index 0000000000..165e8fd2df --- /dev/null +++ b/queue-6.1/neighbour-add-support-for-nud_permanent-proxy-entrie.patch @@ -0,0 +1,102 @@ +From 3320a191942d420de7ac798392101def8a4fdad3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jun 2025 16:13:34 +0200 +Subject: neighbour: add support for NUD_PERMANENT proxy entries + +From: Nicolas Escande + +[ Upstream commit c7d78566bbd30544a0618a6ffbc97bc0ddac7035 ] + +As discussesd before in [0] proxy entries (which are more configuration +than runtime data) should stay when the link (carrier) goes does down. +This is what happens for regular neighbour entries. + +So lets fix this by: + - storing in proxy entries the fact that it was added as NUD_PERMANENT + - not removing NUD_PERMANENT proxy entries when the carrier goes down + (same as how it's done in neigh_flush_dev() for regular neigh entries) + +[0]: https://lore.kernel.org/netdev/c584ef7e-6897-01f3-5b80-12b53f7b4bf4@kernel.org/ + +Signed-off-by: Nicolas Escande +Reviewed-by: Kuniyuki Iwashima +Link: https://patch.msgid.link/20250617141334.3724863-1-nico.escande@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/net/neighbour.h | 1 + + net/core/neighbour.c | 12 +++++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/include/net/neighbour.h b/include/net/neighbour.h +index ccc4a0f8b4ad..93aecfaa7628 100644 +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h +@@ -180,6 +180,7 @@ struct pneigh_entry { + netdevice_tracker dev_tracker; + u32 flags; + u8 protocol; ++ bool permanent; + u32 key[]; + }; + +diff --git a/net/core/neighbour.c b/net/core/neighbour.c +index bcc3950638b9..92dc1f1788de 100644 +--- a/net/core/neighbour.c ++++ b/net/core/neighbour.c +@@ -55,7 +55,8 @@ static void __neigh_notify(struct neighbour *n, int type, int flags, + u32 pid); + static void neigh_update_notify(struct neighbour *neigh, u32 nlmsg_pid); + static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, +- struct net_device *dev); ++ struct net_device *dev, ++ bool skip_perm); + + #ifdef CONFIG_PROC_FS + static const struct seq_operations neigh_stat_seq_ops; +@@ -444,7 +445,7 @@ static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev, + { + write_lock_bh(&tbl->lock); + neigh_flush_dev(tbl, dev, skip_perm); +- pneigh_ifdown_and_unlock(tbl, dev); ++ pneigh_ifdown_and_unlock(tbl, dev, skip_perm); + pneigh_queue_purge(&tbl->proxy_queue, dev ? dev_net(dev) : NULL, + tbl->family); + if (skb_queue_empty_lockless(&tbl->proxy_queue)) +@@ -845,7 +846,8 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey, + } + + static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, +- struct net_device *dev) ++ struct net_device *dev, ++ bool skip_perm) + { + struct pneigh_entry *n, **np, *freelist = NULL; + u32 h; +@@ -853,12 +855,15 @@ static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, + for (h = 0; h <= PNEIGH_HASHMASK; h++) { + np = &tbl->phash_buckets[h]; + while ((n = *np) != NULL) { ++ if (skip_perm && n->permanent) ++ goto skip; + if (!dev || n->dev == dev) { + *np = n->next; + n->next = freelist; + freelist = n; + continue; + } ++skip: + np = &n->next; + } + } +@@ -2023,6 +2028,7 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh, + pn = pneigh_lookup(tbl, net, dst, dev, 1); + if (pn) { + pn->flags = ndm_flags; ++ pn->permanent = !!(ndm->ndm_state & NUD_PERMANENT); + if (protocol) + pn->protocol = protocol; + err = 0; +-- +2.39.5 + diff --git a/queue-6.1/net-ag71xx-add-missing-check-after-dma-map.patch b/queue-6.1/net-ag71xx-add-missing-check-after-dma-map.patch new file mode 100644 index 0000000000..11c80955e9 --- /dev/null +++ b/queue-6.1/net-ag71xx-add-missing-check-after-dma-map.patch @@ -0,0 +1,50 @@ +From 0b28f16306f7eb9ce6f3e58a4a9c67e28a439ff3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jul 2025 11:57:25 +0200 +Subject: net: ag71xx: Add missing check after DMA map + +From: Thomas Fourier + +[ Upstream commit 96a1e15e60216b52da0e6da5336b6d7f5b0188b0 ] + +The DMA map functions can fail and should be tested for errors. + +Signed-off-by: Thomas Fourier +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250716095733.37452-3-fourier.thomas@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/atheros/ag71xx.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c +index 4a1efe9b37d0..ff93b00dcd61 100644 +--- a/drivers/net/ethernet/atheros/ag71xx.c ++++ b/drivers/net/ethernet/atheros/ag71xx.c +@@ -1234,6 +1234,11 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf, + buf->rx.rx_buf = data; + buf->rx.dma_addr = dma_map_single(&ag->pdev->dev, data, ag->rx_buf_size, + DMA_FROM_DEVICE); ++ if (dma_mapping_error(&ag->pdev->dev, buf->rx.dma_addr)) { ++ skb_free_frag(data); ++ buf->rx.rx_buf = NULL; ++ return false; ++ } + desc->data = (u32)buf->rx.dma_addr + offset; + return true; + } +@@ -1532,6 +1537,10 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, + + dma_addr = dma_map_single(&ag->pdev->dev, skb->data, skb->len, + DMA_TO_DEVICE); ++ if (dma_mapping_error(&ag->pdev->dev, dma_addr)) { ++ netif_dbg(ag, tx_err, ndev, "DMA mapping error\n"); ++ goto err_drop; ++ } + + i = ring->curr & ring_mask; + desc = ag71xx_ring_desc(ring, i); +-- +2.39.5 + diff --git a/queue-6.1/net-atlantic-add-set_power-to-fw_ops-for-atl2-to-fix.patch b/queue-6.1/net-atlantic-add-set_power-to-fw_ops-for-atl2-to-fix.patch new file mode 100644 index 0000000000..3725f6d3eb --- /dev/null +++ b/queue-6.1/net-atlantic-add-set_power-to-fw_ops-for-atl2-to-fix.patch @@ -0,0 +1,113 @@ +From fa57fac737d49c4b20f03551a78f3581a643ff76 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 28 Jun 2025 22:15:28 -0700 +Subject: net: atlantic: add set_power to fw_ops for atl2 to fix wol + +From: Eric Work + +[ Upstream commit fad9cf216597a71936ac87143d1618fbbcf97cbe ] + +Aquantia AQC113(C) using ATL2FW doesn't properly prepare the NIC for +enabling wake-on-lan. The FW operation `set_power` was only implemented +for `hw_atl` and not `hw_atl2`. Implement the `set_power` functionality +for `hw_atl2`. + +Tested with both AQC113 and AQC113C devices. Confirmed you can shutdown +the system and wake from S5 using magic packets. NIC was previously +powered off when entering S5. If the NIC was configured for WOL by the +Windows driver, loading the atlantic driver would disable WOL. + +Partially cherry-picks changes from commit, +https://github.com/Aquantia/AQtion/commit/37bd5cc + +Attributing original authors from Marvell for the referenced commit. + +Closes: https://github.com/Aquantia/AQtion/issues/70 +Co-developed-by: Igor Russkikh +Co-developed-by: Mark Starovoitov +Co-developed-by: Dmitry Bogdanov +Co-developed-by: Pavel Belous +Co-developed-by: Nikita Danilov +Signed-off-by: Eric Work +Reviewed-by: Igor Russkikh +Link: https://patch.msgid.link/20250629051535.5172-1-work.eric@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../net/ethernet/aquantia/atlantic/aq_hw.h | 2 + + .../atlantic/hw_atl2/hw_atl2_utils_fw.c | 39 +++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h +index dbd284660135..7f616abd3db2 100644 +--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h ++++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h +@@ -113,6 +113,8 @@ struct aq_stats_s { + #define AQ_HW_POWER_STATE_D0 0U + #define AQ_HW_POWER_STATE_D3 3U + ++#define AQ_FW_WAKE_ON_LINK_RTPM BIT(10) ++ + #define AQ_HW_FLAG_STARTED 0x00000004U + #define AQ_HW_FLAG_STOPPING 0x00000008U + #define AQ_HW_FLAG_RESETTING 0x00000010U +diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +index 58d426dda3ed..1c5c27a9f30d 100644 +--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c ++++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +@@ -462,6 +462,44 @@ static int aq_a2_fw_get_mac_temp(struct aq_hw_s *self, int *temp) + return aq_a2_fw_get_phy_temp(self, temp); + } + ++static int aq_a2_fw_set_wol_params(struct aq_hw_s *self, const u8 *mac, u32 wol) ++{ ++ struct mac_address_aligned_s mac_address; ++ struct link_control_s link_control; ++ struct wake_on_lan_s wake_on_lan; ++ ++ memcpy(mac_address.aligned.mac_address, mac, ETH_ALEN); ++ hw_atl2_shared_buffer_write(self, mac_address, mac_address); ++ ++ memset(&wake_on_lan, 0, sizeof(wake_on_lan)); ++ ++ if (wol & WAKE_MAGIC) ++ wake_on_lan.wake_on_magic_packet = 1U; ++ ++ if (wol & (WAKE_PHY | AQ_FW_WAKE_ON_LINK_RTPM)) ++ wake_on_lan.wake_on_link_up = 1U; ++ ++ hw_atl2_shared_buffer_write(self, sleep_proxy, wake_on_lan); ++ ++ hw_atl2_shared_buffer_get(self, link_control, link_control); ++ link_control.mode = AQ_HOST_MODE_SLEEP_PROXY; ++ hw_atl2_shared_buffer_write(self, link_control, link_control); ++ ++ return hw_atl2_shared_buffer_finish_ack(self); ++} ++ ++static int aq_a2_fw_set_power(struct aq_hw_s *self, unsigned int power_state, ++ const u8 *mac) ++{ ++ u32 wol = self->aq_nic_cfg->wol; ++ int err = 0; ++ ++ if (wol) ++ err = aq_a2_fw_set_wol_params(self, mac, wol); ++ ++ return err; ++} ++ + static int aq_a2_fw_set_eee_rate(struct aq_hw_s *self, u32 speed) + { + struct link_options_s link_options; +@@ -605,6 +643,7 @@ const struct aq_fw_ops aq_a2_fw_ops = { + .set_state = aq_a2_fw_set_state, + .update_link_status = aq_a2_fw_update_link_status, + .update_stats = aq_a2_fw_update_stats, ++ .set_power = aq_a2_fw_set_power, + .get_mac_temp = aq_a2_fw_get_mac_temp, + .get_phy_temp = aq_a2_fw_get_phy_temp, + .set_eee_rate = aq_a2_fw_set_eee_rate, +-- +2.39.5 + diff --git a/queue-6.1/net-dsa-b53-fix-b53_imp_vlan_setup-for-bcm5325.patch b/queue-6.1/net-dsa-b53-fix-b53_imp_vlan_setup-for-bcm5325.patch new file mode 100644 index 0000000000..1b3e1b832f --- /dev/null +++ b/queue-6.1/net-dsa-b53-fix-b53_imp_vlan_setup-for-bcm5325.patch @@ -0,0 +1,42 @@ +From 36f275c862cb006aefb875e005908fd0aa00f573 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Jun 2025 09:59:59 +0200 +Subject: net: dsa: b53: fix b53_imp_vlan_setup for BCM5325 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit c00df1018791185ea398f78af415a2a0aaa0c79c ] + +CPU port should be B53_CPU_PORT instead of B53_CPU_PORT_25 for +B53_PVLAN_PORT_MASK register. + +Reviewed-by: Florian Fainelli +Signed-off-by: Álvaro Fernández Rojas +Link: https://patch.msgid.link/20250614080000.1884236-14-noltari@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 1a23fcc0445c..ecc887b5c8c0 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -507,6 +507,10 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) + unsigned int i; + u16 pvlan; + ++ /* BCM5325 CPU port is at 8 */ ++ if ((is5325(dev) || is5365(dev)) && cpu_port == B53_CPU_PORT_25) ++ cpu_port = B53_CPU_PORT; ++ + /* Enable the IMP port to be in the same VLAN as the other ports + * on a per-port basis such that we only have Port i and IMP in + * the same VLAN. +-- +2.39.5 + diff --git a/queue-6.1/net-dsa-b53-fix-ip_multicast_ctrl-on-bcm5325.patch b/queue-6.1/net-dsa-b53-fix-ip_multicast_ctrl-on-bcm5325.patch new file mode 100644 index 0000000000..bf6a51bee5 --- /dev/null +++ b/queue-6.1/net-dsa-b53-fix-ip_multicast_ctrl-on-bcm5325.patch @@ -0,0 +1,69 @@ +From 1c58dca55901cdc10d3bd24ab6b48553c663c747 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Jun 2025 09:59:54 +0200 +Subject: net: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit 044d5ce2788b165798bfd173548e61bf7b6baf4d ] + +BCM5325 doesn't implement B53_UC_FWD_EN, B53_MC_FWD_EN or B53_IPMC_FWD_EN. + +Reviewed-by: Florian Fainelli +Signed-off-by: Álvaro Fernández Rojas +Link: https://patch.msgid.link/20250614080000.1884236-9-noltari@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 18 +++++++++++------- + drivers/net/dsa/b53/b53_regs.h | 1 + + 2 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 3a1266f535e2..b0e283bc3efb 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -344,14 +344,18 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) + b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt); + mgmt |= B53_MII_DUMB_FWDG_EN; + b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt); +- } + +- /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether +- * frames should be flooded or not. +- */ +- b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt); +- mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN | B53_IPMC_FWD_EN; +- b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt); ++ /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether ++ * frames should be flooded or not. ++ */ ++ b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt); ++ mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN | B53_IPMC_FWD_EN; ++ b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt); ++ } else { ++ b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &mgmt); ++ mgmt |= B53_IP_MCAST_25; ++ b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt); ++ } + } + + static void b53_enable_vlan(struct b53_device *dev, int port, bool enable, +diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h +index e5776545a8a0..77fb7ae660b8 100644 +--- a/drivers/net/dsa/b53/b53_regs.h ++++ b/drivers/net/dsa/b53/b53_regs.h +@@ -104,6 +104,7 @@ + + /* IP Multicast control (8 bit) */ + #define B53_IP_MULTICAST_CTRL 0x21 ++#define B53_IP_MCAST_25 BIT(0) + #define B53_IPMC_FWD_EN BIT(1) + #define B53_UC_FWD_EN BIT(6) + #define B53_MC_FWD_EN BIT(7) +-- +2.39.5 + diff --git a/queue-6.1/net-dsa-b53-prevent-dis_learning-access-on-bcm5325.patch b/queue-6.1/net-dsa-b53-prevent-dis_learning-access-on-bcm5325.patch new file mode 100644 index 0000000000..d0d639f1d4 --- /dev/null +++ b/queue-6.1/net-dsa-b53-prevent-dis_learning-access-on-bcm5325.patch @@ -0,0 +1,56 @@ +From 42ecf16d0d5cc8d91c122df90d5a1e59bf9a0974 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Jun 2025 09:59:55 +0200 +Subject: net: dsa: b53: prevent DIS_LEARNING access on BCM5325 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit 800728abd9f83bda4de62a30ce62a8b41c242020 ] + +BCM5325 doesn't implement DIS_LEARNING register so we should avoid reading +or writing it. + +Reviewed-by: Florian Fainelli +Signed-off-by: Álvaro Fernández Rojas +Link: https://patch.msgid.link/20250614080000.1884236-10-noltari@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 6bd7ed19ce28..5bf390707505 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -561,6 +561,9 @@ static void b53_port_set_learning(struct b53_device *dev, int port, + { + u16 reg; + ++ if (is5325(dev)) ++ return; ++ + b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, ®); + if (learning) + reg &= ~BIT(port); +@@ -2031,7 +2034,13 @@ int b53_br_flags_pre(struct dsa_switch *ds, int port, + struct switchdev_brport_flags flags, + struct netlink_ext_ack *extack) + { +- if (flags.mask & ~(BR_FLOOD | BR_MCAST_FLOOD | BR_LEARNING)) ++ struct b53_device *dev = ds->priv; ++ unsigned long mask = (BR_FLOOD | BR_MCAST_FLOOD); ++ ++ if (!is5325(dev)) ++ mask |= BR_LEARNING; ++ ++ if (flags.mask & ~mask) + return -EINVAL; + + return 0; +-- +2.39.5 + diff --git a/queue-6.1/net-dsa-b53-prevent-gmii_port_override_ctrl-access-o.patch b/queue-6.1/net-dsa-b53-prevent-gmii_port_override_ctrl-access-o.patch new file mode 100644 index 0000000000..9d60fdd14c --- /dev/null +++ b/queue-6.1/net-dsa-b53-prevent-gmii_port_override_ctrl-access-o.patch @@ -0,0 +1,88 @@ +From cf56abb52f4d7b675ada400d8d7426aea6491105 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Jun 2025 09:59:57 +0200 +Subject: net: dsa: b53: prevent GMII_PORT_OVERRIDE_CTRL access on BCM5325 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit 37883bbc45a8555d6eca88d3a9730504d2dac86c ] + +BCM5325 doesn't implement GMII_PORT_OVERRIDE_CTRL register so we should +avoid reading or writing it. +PORT_OVERRIDE_RX_FLOW and PORT_OVERRIDE_TX_FLOW aren't defined on BCM5325 +and we should use PORT_OVERRIDE_LP_FLOW_25 instead. + +Reviewed-by: Florian Fainelli +Signed-off-by: Álvaro Fernández Rojas +Link: https://patch.msgid.link/20250614080000.1884236-12-noltari@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 21 +++++++++++++++++---- + drivers/net/dsa/b53/b53_regs.h | 1 + + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index ecc887b5c8c0..6bd7ed19ce28 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -1167,6 +1167,8 @@ static void b53_force_link(struct b53_device *dev, int port, int link) + if (port == dev->imp_port) { + off = B53_PORT_OVERRIDE_CTRL; + val = PORT_OVERRIDE_EN; ++ } else if (is5325(dev)) { ++ return; + } else { + off = B53_GMII_PORT_OVERRIDE_CTRL(port); + val = GMII_PO_EN; +@@ -1191,6 +1193,8 @@ static void b53_force_port_config(struct b53_device *dev, int port, + if (port == dev->imp_port) { + off = B53_PORT_OVERRIDE_CTRL; + val = PORT_OVERRIDE_EN; ++ } else if (is5325(dev)) { ++ return; + } else { + off = B53_GMII_PORT_OVERRIDE_CTRL(port); + val = GMII_PO_EN; +@@ -1221,10 +1225,19 @@ static void b53_force_port_config(struct b53_device *dev, int port, + return; + } + +- if (rx_pause) +- reg |= PORT_OVERRIDE_RX_FLOW; +- if (tx_pause) +- reg |= PORT_OVERRIDE_TX_FLOW; ++ if (rx_pause) { ++ if (is5325(dev)) ++ reg |= PORT_OVERRIDE_LP_FLOW_25; ++ else ++ reg |= PORT_OVERRIDE_RX_FLOW; ++ } ++ ++ if (tx_pause) { ++ if (is5325(dev)) ++ reg |= PORT_OVERRIDE_LP_FLOW_25; ++ else ++ reg |= PORT_OVERRIDE_TX_FLOW; ++ } + + b53_write8(dev, B53_CTRL_PAGE, off, reg); + } +diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h +index b2c539a42154..e5776545a8a0 100644 +--- a/drivers/net/dsa/b53/b53_regs.h ++++ b/drivers/net/dsa/b53/b53_regs.h +@@ -92,6 +92,7 @@ + #define PORT_OVERRIDE_SPEED_10M (0 << PORT_OVERRIDE_SPEED_S) + #define PORT_OVERRIDE_SPEED_100M (1 << PORT_OVERRIDE_SPEED_S) + #define PORT_OVERRIDE_SPEED_1000M (2 << PORT_OVERRIDE_SPEED_S) ++#define PORT_OVERRIDE_LP_FLOW_25 BIT(3) /* BCM5325 only */ + #define PORT_OVERRIDE_RV_MII_25 BIT(4) /* BCM5325 only */ + #define PORT_OVERRIDE_RX_FLOW BIT(4) + #define PORT_OVERRIDE_TX_FLOW BIT(5) +-- +2.39.5 + diff --git a/queue-6.1/net-dsa-b53-prevent-switch_ctrl-access-on-bcm5325.patch b/queue-6.1/net-dsa-b53-prevent-switch_ctrl-access-on-bcm5325.patch new file mode 100644 index 0000000000..b4687636e0 --- /dev/null +++ b/queue-6.1/net-dsa-b53-prevent-switch_ctrl-access-on-bcm5325.patch @@ -0,0 +1,49 @@ +From 1d65c612e2df2909ddb261972566999c9df3fbbe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 14 Jun 2025 09:59:53 +0200 +Subject: net: dsa: b53: prevent SWITCH_CTRL access on BCM5325 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +[ Upstream commit 22ccaaca43440e90a3b68d2183045b42247dc4be ] + +BCM5325 doesn't implement SWITCH_CTRL register so we should avoid reading +or writing it. + +Reviewed-by: Florian Fainelli +Signed-off-by: Álvaro Fernández Rojas +Link: https://patch.msgid.link/20250614080000.1884236-8-noltari@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/dsa/b53/b53_common.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c +index 5bf390707505..3a1266f535e2 100644 +--- a/drivers/net/dsa/b53/b53_common.c ++++ b/drivers/net/dsa/b53/b53_common.c +@@ -339,11 +339,12 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) + + b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); + +- /* Include IMP port in dumb forwarding mode +- */ +- b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt); +- mgmt |= B53_MII_DUMB_FWDG_EN; +- b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt); ++ if (!is5325(dev)) { ++ /* Include IMP port in dumb forwarding mode */ ++ b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &mgmt); ++ mgmt |= B53_MII_DUMB_FWDG_EN; ++ b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt); ++ } + + /* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether + * frames should be flooded or not. +-- +2.39.5 + diff --git a/queue-6.1/net-fec-allow-disable-coalescing.patch b/queue-6.1/net-fec-allow-disable-coalescing.patch new file mode 100644 index 0000000000..3aa6c98706 --- /dev/null +++ b/queue-6.1/net-fec-allow-disable-coalescing.patch @@ -0,0 +1,80 @@ +From e81e20541dee3dacf04cde9d430115dbafbdf73d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Jun 2025 15:44:02 +0200 +Subject: net: fec: allow disable coalescing + +From: Jonas Rebmann + +[ Upstream commit b7ad21258f9e9a7f58b19595d5ceed2cde3bed68 ] + +In the current implementation, IP coalescing is always enabled and +cannot be disabled. + +As setting maximum frames to 0 or 1, or setting delay to zero implies +immediate delivery of single packets/IRQs, disable coalescing in +hardware in these cases. + +This also guarantees that coalescing is never enabled with ICFT or ICTT +set to zero, a configuration that could lead to unpredictable behaviour +according to i.MX8MP reference manual. + +Signed-off-by: Jonas Rebmann +Reviewed-by: Wei Fang +Link: https://patch.msgid.link/20250626-fec_deactivate_coalescing-v2-1-0b217f2e80da@pengutronix.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/freescale/fec_main.c | 34 +++++++++++------------ + 1 file changed, 16 insertions(+), 18 deletions(-) + +diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c +index 4a513dba8f53..d10db5d6d226 100644 +--- a/drivers/net/ethernet/freescale/fec_main.c ++++ b/drivers/net/ethernet/freescale/fec_main.c +@@ -2831,27 +2831,25 @@ static int fec_enet_us_to_itr_clock(struct net_device *ndev, int us) + static void fec_enet_itr_coal_set(struct net_device *ndev) + { + struct fec_enet_private *fep = netdev_priv(ndev); +- int rx_itr, tx_itr; ++ u32 rx_itr = 0, tx_itr = 0; ++ int rx_ictt, tx_ictt; + +- /* Must be greater than zero to avoid unpredictable behavior */ +- if (!fep->rx_time_itr || !fep->rx_pkts_itr || +- !fep->tx_time_itr || !fep->tx_pkts_itr) +- return; +- +- /* Select enet system clock as Interrupt Coalescing +- * timer Clock Source +- */ +- rx_itr = FEC_ITR_CLK_SEL; +- tx_itr = FEC_ITR_CLK_SEL; ++ rx_ictt = fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr); ++ tx_ictt = fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr); + +- /* set ICFT and ICTT */ +- rx_itr |= FEC_ITR_ICFT(fep->rx_pkts_itr); +- rx_itr |= FEC_ITR_ICTT(fec_enet_us_to_itr_clock(ndev, fep->rx_time_itr)); +- tx_itr |= FEC_ITR_ICFT(fep->tx_pkts_itr); +- tx_itr |= FEC_ITR_ICTT(fec_enet_us_to_itr_clock(ndev, fep->tx_time_itr)); ++ if (rx_ictt > 0 && fep->rx_pkts_itr > 1) { ++ /* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ ++ rx_itr = FEC_ITR_EN | FEC_ITR_CLK_SEL; ++ rx_itr |= FEC_ITR_ICFT(fep->rx_pkts_itr); ++ rx_itr |= FEC_ITR_ICTT(rx_ictt); ++ } + +- rx_itr |= FEC_ITR_EN; +- tx_itr |= FEC_ITR_EN; ++ if (tx_ictt > 0 && fep->tx_pkts_itr > 1) { ++ /* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ ++ tx_itr = FEC_ITR_EN | FEC_ITR_CLK_SEL; ++ tx_itr |= FEC_ITR_ICFT(fep->tx_pkts_itr); ++ tx_itr |= FEC_ITR_ICTT(tx_ictt); ++ } + + writel(tx_itr, fep->hwp + FEC_TXIC0); + writel(rx_itr, fep->hwp + FEC_RXIC0); +-- +2.39.5 + diff --git a/queue-6.1/net-ipv4-fix-incorrect-mtu-in-broadcast-routes.patch b/queue-6.1/net-ipv4-fix-incorrect-mtu-in-broadcast-routes.patch new file mode 100644 index 0000000000..782fd71e16 --- /dev/null +++ b/queue-6.1/net-ipv4-fix-incorrect-mtu-in-broadcast-routes.patch @@ -0,0 +1,51 @@ +From 2514cc16d7584c29c390bd4d5749f86c548f6937 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 16:27:13 +0200 +Subject: net: ipv4: fix incorrect MTU in broadcast routes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Oscar Maes + +[ Upstream commit 9e30ecf23b1b8f091f7d08b27968dea83aae7908 ] + +Currently, __mkroute_output overrules the MTU value configured for +broadcast routes. + +This buggy behaviour can be reproduced with: + +ip link set dev eth1 mtu 9000 +ip route del broadcast 192.168.0.255 dev eth1 proto kernel scope link src 192.168.0.2 +ip route add broadcast 192.168.0.255 dev eth1 proto kernel scope link src 192.168.0.2 mtu 1500 + +The maximum packet size should be 1500, but it is actually 8000: + +ping -b 192.168.0.255 -s 8000 + +Fix __mkroute_output to allow MTU values to be configured for +for broadcast routes (to support a mixed-MTU local-area-network). + +Signed-off-by: Oscar Maes +Link: https://patch.msgid.link/20250710142714.12986-1-oscmaes92@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/route.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/net/ipv4/route.c b/net/ipv4/route.c +index 870108101017..c57a1cee98e2 100644 +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -2562,7 +2562,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res, + do_cache = true; + if (type == RTN_BROADCAST) { + flags |= RTCF_BROADCAST | RTCF_LOCAL; +- fi = NULL; + } else if (type == RTN_MULTICAST) { + flags |= RTCF_MULTICAST | RTCF_LOCAL; + if (!ip_check_mc_rcu(in_dev, fl4->daddr, fl4->saddr, +-- +2.39.5 + diff --git a/queue-6.1/net-mctp-prevent-duplicate-binds.patch b/queue-6.1/net-mctp-prevent-duplicate-binds.patch new file mode 100644 index 0000000000..d4b1e4151e --- /dev/null +++ b/queue-6.1/net-mctp-prevent-duplicate-binds.patch @@ -0,0 +1,79 @@ +From e7035a7c52803ac4af6d16bc22a0eb748190ba60 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 16:55:55 +0800 +Subject: net: mctp: Prevent duplicate binds + +From: Matt Johnston + +[ Upstream commit 3954502377ec05a1b37e2dc9bef0bacd4bbd71b2 ] + +Disallow bind() calls that have the same arguments as existing bound +sockets. Previously multiple sockets could bind() to the same +type/local address, with an arbitrary socket receiving matched messages. + +This is only a partial fix, a future commit will define precedence order +for MCTP_ADDR_ANY versus specific EID bind(), which are allowed to exist +together. + +Signed-off-by: Matt Johnston +Link: https://patch.msgid.link/20250710-mctp-bind-v4-2-8ec2f6460c56@codeconstruct.com.au +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/mctp/af_mctp.c | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c +index 6a963eac1cc2..0f49b41570f5 100644 +--- a/net/mctp/af_mctp.c ++++ b/net/mctp/af_mctp.c +@@ -73,7 +73,6 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen) + + lock_sock(sk); + +- /* TODO: allow rebind */ + if (sk_hashed(sk)) { + rc = -EADDRINUSE; + goto out_release; +@@ -550,15 +549,36 @@ static void mctp_sk_close(struct sock *sk, long timeout) + static int mctp_sk_hash(struct sock *sk) + { + struct net *net = sock_net(sk); ++ struct sock *existing; ++ struct mctp_sock *msk; ++ int rc; ++ ++ msk = container_of(sk, struct mctp_sock, sk); + + /* Bind lookup runs under RCU, remain live during that. */ + sock_set_flag(sk, SOCK_RCU_FREE); + + mutex_lock(&net->mctp.bind_lock); ++ ++ /* Prevent duplicate binds. */ ++ sk_for_each(existing, &net->mctp.binds) { ++ struct mctp_sock *mex = ++ container_of(existing, struct mctp_sock, sk); ++ ++ if (mex->bind_type == msk->bind_type && ++ mex->bind_addr == msk->bind_addr && ++ mex->bind_net == msk->bind_net) { ++ rc = -EADDRINUSE; ++ goto out; ++ } ++ } ++ + sk_add_node_rcu(sk, &net->mctp.binds); +- mutex_unlock(&net->mctp.bind_lock); ++ rc = 0; + +- return 0; ++out: ++ mutex_unlock(&net->mctp.bind_lock); ++ return rc; + } + + static void mctp_sk_unhash(struct sock *sk) +-- +2.39.5 + diff --git a/queue-6.1/net-mlx5e-properly-access-rcu-protected-qdisc_sleepi.patch b/queue-6.1/net-mlx5e-properly-access-rcu-protected-qdisc_sleepi.patch new file mode 100644 index 0000000000..12a4419724 --- /dev/null +++ b/queue-6.1/net-mlx5e-properly-access-rcu-protected-qdisc_sleepi.patch @@ -0,0 +1,47 @@ +From 3fa0bb1af4f83819713051211ccd77bd84e03e86 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Jul 2025 17:17:49 +0300 +Subject: net/mlx5e: Properly access RCU protected qdisc_sleeping variable + +From: Leon Romanovsky + +[ Upstream commit 2a601b2d35623065d31ebaf697b07502d54878c9 ] + +qdisc_sleeping variable is declared as "struct Qdisc __rcu" and +as such needs proper annotation while accessing it. + +Without rtnl_dereference(), the following error is generated by sparse: + +drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning: + incorrect type in initializer (different address spaces) +drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected + struct Qdisc *qdisc +drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct + Qdisc [noderef] __rcu *qdisc_sleeping + +Signed-off-by: Leon Romanovsky +Signed-off-by: Tariq Toukan +Reviewed-by: Michal Swiatkowski +Link: https://patch.msgid.link/1752675472-201445-4-git-send-email-tariqt@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +index 1e887d640cff..c72ac4dbdb21 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +@@ -362,7 +362,7 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_que + void mlx5e_reset_qdisc(struct net_device *dev, u16 qid) + { + struct netdev_queue *dev_queue = netdev_get_tx_queue(dev, qid); +- struct Qdisc *qdisc = dev_queue->qdisc_sleeping; ++ struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc_sleeping); + + if (!qdisc) + return; +-- +2.39.5 + diff --git a/queue-6.1/net-ncsi-fix-buffer-overflow-in-fetching-version-id.patch b/queue-6.1/net-ncsi-fix-buffer-overflow-in-fetching-version-id.patch new file mode 100644 index 0000000000..54c2ba12eb --- /dev/null +++ b/queue-6.1/net-ncsi-fix-buffer-overflow-in-fetching-version-id.patch @@ -0,0 +1,52 @@ +From 33310c066f38b48bf3514c17e30224404e07d1b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 12:33:38 -0700 +Subject: net: ncsi: Fix buffer overflow in fetching version id + +From: Hari Kalavakunta + +[ Upstream commit 8e16170ae972c7fed132bc928914a2ffb94690fc ] + +In NC-SI spec v1.2 section 8.4.44.2, the firmware name doesn't +need to be null terminated while its size occupies the full size +of the field. Fix the buffer overflow issue by adding one +additional byte for null terminator. + +Signed-off-by: Hari Kalavakunta +Reviewed-by: Paul Fertser +Link: https://patch.msgid.link/20250610193338.1368-1-kalavakunta.hari.prasad@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ncsi/internal.h | 2 +- + net/ncsi/ncsi-rsp.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h +index 2c260f33b55c..ad1f671ffc37 100644 +--- a/net/ncsi/internal.h ++++ b/net/ncsi/internal.h +@@ -110,7 +110,7 @@ struct ncsi_channel_version { + u8 update; /* NCSI version update */ + char alpha1; /* NCSI version alpha1 */ + char alpha2; /* NCSI version alpha2 */ +- u8 fw_name[12]; /* Firmware name string */ ++ u8 fw_name[12 + 1]; /* Firmware name string */ + u32 fw_version; /* Firmware version */ + u16 pci_ids[4]; /* PCI identification */ + u32 mf_id; /* Manufacture ID */ +diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c +index 8668888c5a2f..d5ed80731e89 100644 +--- a/net/ncsi/ncsi-rsp.c ++++ b/net/ncsi/ncsi-rsp.c +@@ -775,6 +775,7 @@ static int ncsi_rsp_handler_gvi(struct ncsi_request *nr) + ncv->alpha1 = rsp->alpha1; + ncv->alpha2 = rsp->alpha2; + memcpy(ncv->fw_name, rsp->fw_name, 12); ++ ncv->fw_name[12] = '\0'; + ncv->fw_version = ntohl(rsp->fw_version); + for (i = 0; i < ARRAY_SIZE(ncv->pci_ids); i++) + ncv->pci_ids[i] = ntohs(rsp->pci_ids[i]); +-- +2.39.5 + diff --git a/queue-6.1/net-phy-smsc-add-proper-reset-flags-for-lan8710a.patch b/queue-6.1/net-phy-smsc-add-proper-reset-flags-for-lan8710a.patch new file mode 100644 index 0000000000..528998edc3 --- /dev/null +++ b/queue-6.1/net-phy-smsc-add-proper-reset-flags-for-lan8710a.patch @@ -0,0 +1,41 @@ +From 25b0c75a25e223f59007278ddae307d760bce6f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Jul 2025 17:29:16 +0200 +Subject: net: phy: smsc: add proper reset flags for LAN8710A +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Buday Csaba + +[ Upstream commit 57ec5a8735dc5dccd1ee68afdb1114956a3fce0d ] + +According to the LAN8710A datasheet (Rev. B, section 3.8.5.1), a hardware +reset is required after power-on, and the reference clock (REF_CLK) must be +established before asserting reset. + +Signed-off-by: Buday Csaba +Cc: Csókás Bence +Reviewed-by: Andrew Lunn +Link: https://patch.msgid.link/20250728152916.46249-2-csokas.bence@prolan.hu +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/phy/smsc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c +index 5186cc97c655..cf72aae88fbd 100644 +--- a/drivers/net/phy/smsc.c ++++ b/drivers/net/phy/smsc.c +@@ -424,6 +424,7 @@ static struct phy_driver smsc_phy_driver[] = { + + /* PHY_BASIC_FEATURES */ + ++ .flags = PHY_RST_AFTER_CLK_EN, + .probe = smsc_phy_probe, + + /* basic functions */ +-- +2.39.5 + diff --git a/queue-6.1/net-thunderbolt-enable-end-to-end-flow-control-also-.patch b/queue-6.1/net-thunderbolt-enable-end-to-end-flow-control-also-.patch new file mode 100644 index 0000000000..1e311ba80b --- /dev/null +++ b/queue-6.1/net-thunderbolt-enable-end-to-end-flow-control-also-.patch @@ -0,0 +1,59 @@ +From 305da4edc87c323a1561c35e13e56a986289da74 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 28 Jun 2025 17:38:13 +0800 +Subject: net: thunderbolt: Enable end-to-end flow control also in transmit + +From: zhangjianrong + +[ Upstream commit a8065af3346ebd7c76ebc113451fb3ba94cf7769 ] + +According to USB4 specification, if E2E flow control is disabled for +the Transmit Descriptor Ring, the Host Interface Adapter Layer shall +not require any credits to be available before transmitting a Tunneled +Packet from this Transmit Descriptor Ring, so e2e flow control should +be enabled in both directions. + +Acked-by: Mika Westerberg +Link: https://lore.kernel.org/20250624153805.GC2824380@black.fi.intel.com +Signed-off-by: zhangjianrong +Link: https://patch.msgid.link/20250628093813.647005-1-zhangjianrong5@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/thunderbolt.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c +index 5966e36875de..6b184f6b7273 100644 +--- a/drivers/net/thunderbolt.c ++++ b/drivers/net/thunderbolt.c +@@ -884,8 +884,12 @@ static int tbnet_open(struct net_device *dev) + + netif_carrier_off(dev); + +- ring = tb_ring_alloc_tx(xd->tb->nhi, -1, TBNET_RING_SIZE, +- RING_FLAG_FRAME); ++ flags = RING_FLAG_FRAME; ++ /* Only enable full E2E if the other end supports it too */ ++ if (tbnet_e2e && net->svc->prtcstns & TBNET_E2E) ++ flags |= RING_FLAG_E2E; ++ ++ ring = tb_ring_alloc_tx(xd->tb->nhi, -1, TBNET_RING_SIZE, flags); + if (!ring) { + netdev_err(dev, "failed to allocate Tx ring\n"); + return -ENOMEM; +@@ -904,11 +908,6 @@ static int tbnet_open(struct net_device *dev) + sof_mask = BIT(TBIP_PDF_FRAME_START); + eof_mask = BIT(TBIP_PDF_FRAME_END); + +- flags = RING_FLAG_FRAME; +- /* Only enable full E2E if the other end supports it too */ +- if (tbnet_e2e && net->svc->prtcstns & TBNET_E2E) +- flags |= RING_FLAG_E2E; +- + ring = tb_ring_alloc_rx(xd->tb->nhi, -1, TBNET_RING_SIZE, flags, + net->tx_ring.ring->hop, sof_mask, + eof_mask, tbnet_start_poll, net); +-- +2.39.5 + diff --git a/queue-6.1/net-thunderbolt-fix-the-parameter-passing-of-tb_xdom.patch b/queue-6.1/net-thunderbolt-fix-the-parameter-passing-of-tb_xdom.patch new file mode 100644 index 0000000000..32b24bc6f6 --- /dev/null +++ b/queue-6.1/net-thunderbolt-fix-the-parameter-passing-of-tb_xdom.patch @@ -0,0 +1,57 @@ +From 9a7404e9900eb8eeacd464abb8eef38281abdcc7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 28 Jun 2025 17:49:20 +0800 +Subject: net: thunderbolt: Fix the parameter passing of + tb_xdomain_enable_paths()/tb_xdomain_disable_paths() + +From: zhangjianrong + +[ Upstream commit 8ec31cb17cd355cea25cdb8496d9b3fbf1321647 ] + +According to the description of tb_xdomain_enable_paths(), the third +parameter represents the transmit ring and the fifth parameter represents +the receive ring. tb_xdomain_disable_paths() is the same case. + +[Jakub] Mika says: it works now because both rings ->hop is the same + +Acked-by: Mika Westerberg +Link: https://lore.kernel.org/20250625051149.GD2824380@black.fi.intel.com +Signed-off-by: zhangjianrong +Link: https://patch.msgid.link/20250628094920.656658-1-zhangjianrong5@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/thunderbolt.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c +index 6b184f6b7273..ef13aa36e55e 100644 +--- a/drivers/net/thunderbolt.c ++++ b/drivers/net/thunderbolt.c +@@ -386,9 +386,9 @@ static void tbnet_tear_down(struct tbnet *net, bool send_logout) + + ret = tb_xdomain_disable_paths(net->xd, + net->local_transmit_path, +- net->rx_ring.ring->hop, ++ net->tx_ring.ring->hop, + net->remote_transmit_path, +- net->tx_ring.ring->hop); ++ net->rx_ring.ring->hop); + if (ret) + netdev_warn(net->dev, "failed to disable DMA paths\n"); + +@@ -637,9 +637,9 @@ static void tbnet_connected_work(struct work_struct *work) + goto err_free_rx_buffers; + + ret = tb_xdomain_enable_paths(net->xd, net->local_transmit_path, +- net->rx_ring.ring->hop, ++ net->tx_ring.ring->hop, + net->remote_transmit_path, +- net->tx_ring.ring->hop); ++ net->rx_ring.ring->hop); + if (ret) { + netdev_err(net->dev, "failed to enable DMA paths\n"); + goto err_free_tx_buffers; +-- +2.39.5 + diff --git a/queue-6.1/net-thunderx-fix-format-truncation-warning-in-bgx_ac.patch b/queue-6.1/net-thunderx-fix-format-truncation-warning-in-bgx_ac.patch new file mode 100644 index 0000000000..d06bd25ec3 --- /dev/null +++ b/queue-6.1/net-thunderx-fix-format-truncation-warning-in-bgx_ac.patch @@ -0,0 +1,66 @@ +From bc32b301ae2fe444a4db9bfe8af483f4257de28a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Jul 2025 07:05:30 -0700 +Subject: net: thunderx: Fix format-truncation warning in bgx_acpi_match_id() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alok Tiwari + +[ Upstream commit 53d20606c40678d425cc03f0978c614dca51f25e ] + +The buffer bgx_sel used in snprintf() was too small to safely hold +the formatted string "BGX%d" for all valid bgx_id values. This caused +a -Wformat-truncation warning with `Werror` enabled during build. + +Increase the buffer size from 5 to 7 and use `sizeof(bgx_sel)` in +snprintf() to ensure safety and suppress the warning. + +Build warning: + CC drivers/net/ethernet/cavium/thunder/thunder_bgx.o + drivers/net/ethernet/cavium/thunder/thunder_bgx.c: In function +‘bgx_acpi_match_id’: + drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:27: error: ‘%d’ +directive output may be truncated writing between 1 and 3 bytes into a +region of size 2 [-Werror=format-truncation=] + snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id); + ^~ + drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:23: note: +directive argument in the range [0, 255] + snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id); + ^~~~~~~ + drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:2: note: +‘snprintf’ output between 5 and 7 bytes into a destination of size 5 + snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id); + +compiler warning due to insufficient snprintf buffer size. + +Signed-off-by: Alok Tiwari +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250711140532.2463602-1-alok.a.tiwari@oracle.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +index 7eb2ddbe9bad..8c955eefc7e4 100644 +--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c ++++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +@@ -1428,9 +1428,9 @@ static acpi_status bgx_acpi_match_id(acpi_handle handle, u32 lvl, + { + struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; + struct bgx *bgx = context; +- char bgx_sel[5]; ++ char bgx_sel[7]; + +- snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id); ++ snprintf(bgx_sel, sizeof(bgx_sel), "BGX%d", bgx->bgx_id); + if (ACPI_FAILURE(acpi_get_name(handle, ACPI_SINGLE_NAME, &string))) { + pr_warn("Invalid link device\n"); + return AE_OK; +-- +2.39.5 + diff --git a/queue-6.1/net-usb-cdc-ncm-check-for-filtering-capability.patch b/queue-6.1/net-usb-cdc-ncm-check-for-filtering-capability.patch new file mode 100644 index 0000000000..40b749ddf9 --- /dev/null +++ b/queue-6.1/net-usb-cdc-ncm-check-for-filtering-capability.patch @@ -0,0 +1,103 @@ +From 9ede22e42ff251d6775058f117184f204d089917 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 14:06:17 +0200 +Subject: net: usb: cdc-ncm: check for filtering capability + +From: Oliver Neukum + +[ Upstream commit 61c3e8940f2d8b5bfeaeec4bedc2f3e7d873abb3 ] + +If the decice does not support filtering, filtering +must not be used and all packets delivered for the +upper layers to sort. + +Signed-off-by: Oliver Neukum +Link: https://patch.msgid.link/20250717120649.2090929-1-oneukum@suse.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/cdc_ncm.c | 20 ++++++++++++++++---- + include/linux/usb/cdc_ncm.h | 1 + + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c +index 789e3647f979..9eb3c6b66a38 100644 +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -892,6 +892,10 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ + } + } + ++ if (ctx->func_desc) ++ ctx->filtering_supported = !!(ctx->func_desc->bmNetworkCapabilities ++ & USB_CDC_NCM_NCAP_ETH_FILTER); ++ + iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber; + + /* Device-specific flags */ +@@ -1897,6 +1901,14 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb) + } + } + ++static void cdc_ncm_update_filter(struct usbnet *dev) ++{ ++ struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0]; ++ ++ if (ctx->filtering_supported) ++ usbnet_cdc_update_filter(dev); ++} ++ + static const struct driver_info cdc_ncm_info = { + .description = "CDC NCM (NO ZLP)", + .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET +@@ -1907,7 +1919,7 @@ static const struct driver_info cdc_ncm_info = { + .status = cdc_ncm_status, + .rx_fixup = cdc_ncm_rx_fixup, + .tx_fixup = cdc_ncm_tx_fixup, +- .set_rx_mode = usbnet_cdc_update_filter, ++ .set_rx_mode = cdc_ncm_update_filter, + }; + + /* Same as cdc_ncm_info, but with FLAG_SEND_ZLP */ +@@ -1921,7 +1933,7 @@ static const struct driver_info cdc_ncm_zlp_info = { + .status = cdc_ncm_status, + .rx_fixup = cdc_ncm_rx_fixup, + .tx_fixup = cdc_ncm_tx_fixup, +- .set_rx_mode = usbnet_cdc_update_filter, ++ .set_rx_mode = cdc_ncm_update_filter, + }; + + /* Same as cdc_ncm_info, but with FLAG_WWAN */ +@@ -1935,7 +1947,7 @@ static const struct driver_info wwan_info = { + .status = cdc_ncm_status, + .rx_fixup = cdc_ncm_rx_fixup, + .tx_fixup = cdc_ncm_tx_fixup, +- .set_rx_mode = usbnet_cdc_update_filter, ++ .set_rx_mode = cdc_ncm_update_filter, + }; + + /* Same as wwan_info, but with FLAG_NOARP */ +@@ -1949,7 +1961,7 @@ static const struct driver_info wwan_noarp_info = { + .status = cdc_ncm_status, + .rx_fixup = cdc_ncm_rx_fixup, + .tx_fixup = cdc_ncm_tx_fixup, +- .set_rx_mode = usbnet_cdc_update_filter, ++ .set_rx_mode = cdc_ncm_update_filter, + }; + + static const struct usb_device_id cdc_devs[] = { +diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h +index 2d207cb4837d..4ac082a63173 100644 +--- a/include/linux/usb/cdc_ncm.h ++++ b/include/linux/usb/cdc_ncm.h +@@ -119,6 +119,7 @@ struct cdc_ncm_ctx { + u32 timer_interval; + u32 max_ndp_size; + u8 is_ndp16; ++ u8 filtering_supported; + union { + struct usb_cdc_ncm_ndp16 *delayed_ndp16; + struct usb_cdc_ncm_ndp32 *delayed_ndp32; +-- +2.39.5 + diff --git a/queue-6.1/net-vlan-replace-bug-with-warn_on_once-in-vlan_dev_-.patch b/queue-6.1/net-vlan-replace-bug-with-warn_on_once-in-vlan_dev_-.patch new file mode 100644 index 0000000000..8ebf12ee0e --- /dev/null +++ b/queue-6.1/net-vlan-replace-bug-with-warn_on_once-in-vlan_dev_-.patch @@ -0,0 +1,56 @@ +From 33df65300e30222abb52298c42443e0d6497a69a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 16 Jun 2025 16:26:25 +0300 +Subject: net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs + +From: Gal Pressman + +[ Upstream commit 60a8b1a5d0824afda869f18dc0ecfe72f8dfda42 ] + +When CONFIG_VLAN_8021Q=n, a set of stub helpers are used, three of these +helpers use BUG() unconditionally. + +This code should not be reached, as callers of these functions should +always check for is_vlan_dev() first, but the usage of BUG() is not +recommended, replace it with WARN_ON() instead. + +Reviewed-by: Alex Lazar +Reviewed-by: Dragos Tatulea +Signed-off-by: Gal Pressman +Link: https://patch.msgid.link/20250616132626.1749331-3-gal@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/linux/if_vlan.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h +index 9f7dbbb34094..f4eb8dd7308a 100644 +--- a/include/linux/if_vlan.h ++++ b/include/linux/if_vlan.h +@@ -253,19 +253,19 @@ vlan_for_each(struct net_device *dev, + + static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) + { +- BUG(); ++ WARN_ON_ONCE(1); + return NULL; + } + + static inline u16 vlan_dev_vlan_id(const struct net_device *dev) + { +- BUG(); ++ WARN_ON_ONCE(1); + return 0; + } + + static inline __be16 vlan_dev_vlan_proto(const struct net_device *dev) + { +- BUG(); ++ WARN_ON_ONCE(1); + return 0; + } + +-- +2.39.5 + diff --git a/queue-6.1/netmem-fix-skb_frag_address_safe-with-unreadable-skb.patch b/queue-6.1/netmem-fix-skb_frag_address_safe-with-unreadable-skb.patch new file mode 100644 index 0000000000..5ecb59253c --- /dev/null +++ b/queue-6.1/netmem-fix-skb_frag_address_safe-with-unreadable-skb.patch @@ -0,0 +1,45 @@ +From 33850957601e2960c041253f6b1826a0c47da96b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 19 Jun 2025 17:52:38 +0000 +Subject: netmem: fix skb_frag_address_safe with unreadable skbs + +From: Mina Almasry + +[ Upstream commit 4672aec56d2e8edabcb74c3e2320301d106a377e ] + +skb_frag_address_safe() needs a check that the +skb_frag_page exists check similar to skb_frag_address(). + +Cc: ap420073@gmail.com + +Signed-off-by: Mina Almasry +Acked-by: Stanislav Fomichev +Link: https://patch.msgid.link/20250619175239.3039329-1-almasrymina@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/linux/skbuff.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index 8014a335414e..9a04a188b9f8 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -3495,7 +3495,13 @@ static inline void *skb_frag_address(const skb_frag_t *frag) + */ + static inline void *skb_frag_address_safe(const skb_frag_t *frag) + { +- void *ptr = page_address(skb_frag_page(frag)); ++ struct page *page = skb_frag_page(frag); ++ void *ptr; ++ ++ if (!page) ++ return NULL; ++ ++ ptr = page_address(page); + if (unlikely(!ptr)) + return NULL; + +-- +2.39.5 + diff --git a/queue-6.1/pinctrl-stm32-manage-irq-affinity-settings.patch b/queue-6.1/pinctrl-stm32-manage-irq-affinity-settings.patch new file mode 100644 index 0000000000..4de1523e92 --- /dev/null +++ b/queue-6.1/pinctrl-stm32-manage-irq-affinity-settings.patch @@ -0,0 +1,39 @@ +From 9fb58a32e7a6261032baec357943b598ca2756b4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 16:30:39 +0200 +Subject: pinctrl: stm32: Manage irq affinity settings + +From: Cheick Traore + +[ Upstream commit 4c5cc2f65386e22166ce006efe515c667aa075e4 ] + +Trying to set the affinity of the interrupts associated to stm32 +pinctrl results in a write error. + +Fill struct irq_chip::irq_set_affinity to use the default helper +function. + +Signed-off-by: Cheick Traore +Signed-off-by: Antonio Borneo +Link: https://lore.kernel.org/20250610143042.295376-3-antonio.borneo@foss.st.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c +index 4a3f5f5b966d..661eb0c1f797 100644 +--- a/drivers/pinctrl/stm32/pinctrl-stm32.c ++++ b/drivers/pinctrl/stm32/pinctrl-stm32.c +@@ -417,6 +417,7 @@ static struct irq_chip stm32_gpio_irq_chip = { + .irq_set_wake = irq_chip_set_wake_parent, + .irq_request_resources = stm32_gpio_irq_request_resources, + .irq_release_resources = stm32_gpio_irq_release_resources, ++ .irq_set_affinity = IS_ENABLED(CONFIG_SMP) ? irq_chip_set_affinity_parent : NULL, + }; + + static int stm32_gpio_domain_translate(struct irq_domain *d, +-- +2.39.5 + diff --git a/queue-6.1/platform-chrome-cros_ec_typec-defer-probe-on-missing.patch b/queue-6.1/platform-chrome-cros_ec_typec-defer-probe-on-missing.patch new file mode 100644 index 0000000000..db02ceed2f --- /dev/null +++ b/queue-6.1/platform-chrome-cros_ec_typec-defer-probe-on-missing.patch @@ -0,0 +1,44 @@ +From f86cfd743920d84cdf69f329d16d5e6d0eac1859 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 17:37:47 +0200 +Subject: platform/chrome: cros_ec_typec: Defer probe on missing EC parent + +From: Tomasz Michalec + +[ Upstream commit 8866f4e557eba43e991f99711515217a95f62d2e ] + +If cros_typec_probe is called before EC device is registered, +cros_typec_probe will fail. It may happen when cros-ec-typec.ko is +loaded before EC bus layer module (e.g. cros_ec_lpcs.ko, +cros_ec_spi.ko). + +Return -EPROBE_DEFER when cros_typec_probe doesn't get EC device, so +the probe function can be called again after EC device is registered. + +Signed-off-by: Tomasz Michalec +Reviewed-by: Abhishek Pandit-Subedi +Link: https://lore.kernel.org/r/20250610153748.1858519-1-tmichalec@google.com +Signed-off-by: Tzung-Bi Shih +Signed-off-by: Sasha Levin +--- + drivers/platform/chrome/cros_ec_typec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c +index 51b98f6c7b39..748efa73378c 100644 +--- a/drivers/platform/chrome/cros_ec_typec.c ++++ b/drivers/platform/chrome/cros_ec_typec.c +@@ -1194,8 +1194,8 @@ static int cros_typec_probe(struct platform_device *pdev) + + typec->ec = dev_get_drvdata(pdev->dev.parent); + if (!typec->ec) { +- dev_err(dev, "couldn't find parent EC device\n"); +- return -ENODEV; ++ dev_warn(dev, "couldn't find parent EC device\n"); ++ return -EPROBE_DEFER; + } + + platform_set_drvdata(pdev, typec); +-- +2.39.5 + diff --git a/queue-6.1/platform-x86-thinkpad_acpi-handle-kcov-__init-vs-inl.patch b/queue-6.1/platform-x86-thinkpad_acpi-handle-kcov-__init-vs-inl.patch new file mode 100644 index 0000000000..2ed499379b --- /dev/null +++ b/queue-6.1/platform-x86-thinkpad_acpi-handle-kcov-__init-vs-inl.patch @@ -0,0 +1,50 @@ +From 5785ecb37d56e31fac08b47915b71224d0cace1a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 29 May 2025 11:18:37 -0700 +Subject: platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kees Cook + +[ Upstream commit 6418a8504187dc7f5b6f9d0649c03e362cb0664b ] + +When KCOV is enabled all functions get instrumented, unless the +__no_sanitize_coverage attribute is used. To prepare for +__no_sanitize_coverage being applied to __init functions[1], we have +to handle differences in how GCC's inline optimizations get resolved. +For thinkpad_acpi routines, this means forcing two functions to be +inline with __always_inline. + +Link: https://lore.kernel.org/lkml/20250523043935.2009972-11-kees@kernel.org/ [1] +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20250529181831.work.439-kees@kernel.org +Signed-off-by: Ilpo Järvinen +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/thinkpad_acpi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c +index 17d74434e604..c0977ffec96c 100644 +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -544,12 +544,12 @@ static unsigned long __init tpacpi_check_quirks( + return 0; + } + +-static inline bool __pure __init tpacpi_is_lenovo(void) ++static __always_inline bool __pure __init tpacpi_is_lenovo(void) + { + return thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO; + } + +-static inline bool __pure __init tpacpi_is_ibm(void) ++static __always_inline bool __pure __init tpacpi_is_ibm(void) + { + return thinkpad_id.vendor == PCI_VENDOR_ID_IBM; + } +-- +2.39.5 + diff --git a/queue-6.1/pm-cpupower-fix-the-snapshot-order-of-tsc-mperf-cloc.patch b/queue-6.1/pm-cpupower-fix-the-snapshot-order-of-tsc-mperf-cloc.patch new file mode 100644 index 0000000000..b822c970eb --- /dev/null +++ b/queue-6.1/pm-cpupower-fix-the-snapshot-order-of-tsc-mperf-cloc.patch @@ -0,0 +1,46 @@ +From ea470c8962bfd0ad63c980d820afc0e8f9e4eec2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Jun 2025 17:53:54 +0530 +Subject: pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in + mperf_stop() + +From: Gautham R. Shenoy + +[ Upstream commit cda7ac8ce7de84cf32a3871ba5f318aa3b79381e ] + +In the function mperf_start(), mperf_monitor snapshots the time, tsc +and finally the aperf,mperf MSRs. However, this order of snapshotting +in is reversed in mperf_stop(). As a result, the C0 residency (which +is computed as delta_mperf * 100 / delta_tsc) is under-reported on +CPUs that is 100% busy. + +Fix this by snapshotting time, tsc and then aperf,mperf in +mperf_stop() in the same order as in mperf_start(). + +Link: https://lore.kernel.org/r/20250612122355.19629-2-gautham.shenoy@amd.com +Signed-off-by: Gautham R. Shenoy +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +index 08a399b0be28..6ab9139f16af 100644 +--- a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c ++++ b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +@@ -240,9 +240,9 @@ static int mperf_stop(void) + int cpu; + + for (cpu = 0; cpu < cpu_count; cpu++) { +- mperf_measure_stats(cpu); +- mperf_get_tsc(&tsc_at_measure_end[cpu]); + clock_gettime(CLOCK_REALTIME, &time_end[cpu]); ++ mperf_get_tsc(&tsc_at_measure_end[cpu]); ++ mperf_measure_stats(cpu); + } + + return 0; +-- +2.39.5 + diff --git a/queue-6.1/pm-devfreq-governor-replace-sscanf-with-kstrtoul-in-.patch b/queue-6.1/pm-devfreq-governor-replace-sscanf-with-kstrtoul-in-.patch new file mode 100644 index 0000000000..9ca6af26e3 --- /dev/null +++ b/queue-6.1/pm-devfreq-governor-replace-sscanf-with-kstrtoul-in-.patch @@ -0,0 +1,51 @@ +From f05a73c72773697988cae6bc15382280a1f119c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Apr 2025 11:00:17 +0800 +Subject: PM / devfreq: governor: Replace sscanf() with kstrtoul() in + set_freq_store() + +From: Lifeng Zheng + +[ Upstream commit 914cc799b28f17d369d5b4db3b941957d18157e8 ] + +Replace sscanf() with kstrtoul() in set_freq_store() and check the result +to avoid invalid input. + +Signed-off-by: Lifeng Zheng +Link: https://lore.kernel.org/lkml/20250421030020.3108405-2-zhenglifeng1@huawei.com/ +Signed-off-by: Chanwoo Choi +Signed-off-by: Sasha Levin +--- + drivers/devfreq/governor_userspace.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c +index d69672ccacc4..8d057cea09d5 100644 +--- a/drivers/devfreq/governor_userspace.c ++++ b/drivers/devfreq/governor_userspace.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -39,10 +40,13 @@ static ssize_t set_freq_store(struct device *dev, struct device_attribute *attr, + unsigned long wanted; + int err = 0; + ++ err = kstrtoul(buf, 0, &wanted); ++ if (err) ++ return err; ++ + mutex_lock(&devfreq->lock); + data = devfreq->governor_data; + +- sscanf(buf, "%lu", &wanted); + data->user_frequency = wanted; + data->valid = true; + err = update_devfreq(devfreq); +-- +2.39.5 + diff --git a/queue-6.1/pm-runtime-clear-power.needs_force_resume-in-pm_runt.patch b/queue-6.1/pm-runtime-clear-power.needs_force_resume-in-pm_runt.patch new file mode 100644 index 0000000000..5341e577f5 --- /dev/null +++ b/queue-6.1/pm-runtime-clear-power.needs_force_resume-in-pm_runt.patch @@ -0,0 +1,41 @@ +From 61829179148a5d75e07baefe5c5e7a30291a6bba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Jun 2025 21:16:05 +0200 +Subject: PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit() + +From: Rafael J. Wysocki + +[ Upstream commit 89d9cec3b1e9c49bae9375a2db6dc49bc7468af0 ] + +Clear power.needs_force_resume in pm_runtime_reinit() in case it has +been set by pm_runtime_force_suspend() invoked from a driver remove +callback. + +Suggested-by: Ulf Hansson +Signed-off-by: Rafael J. Wysocki +Reviewed-by: Ulf Hansson +Link: https://patch.msgid.link/9495163.CDJkKcVGEf@rjwysocki.net +Signed-off-by: Sasha Levin +--- + drivers/base/power/runtime.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c +index 313ccb7e7764..61d8ebc2de59 100644 +--- a/drivers/base/power/runtime.c ++++ b/drivers/base/power/runtime.c +@@ -1753,6 +1753,11 @@ void pm_runtime_reinit(struct device *dev) + pm_runtime_put(dev->parent); + } + } ++ /* ++ * Clear power.needs_force_resume in case it has been set by ++ * pm_runtime_force_suspend() invoked from a driver remove callback. ++ */ ++ dev->power.needs_force_resume = false; + } + + /** +-- +2.39.5 + diff --git a/queue-6.1/pm-sleep-console-fix-the-black-screen-issue.patch b/queue-6.1/pm-sleep-console-fix-the-black-screen-issue.patch new file mode 100644 index 0000000000..8eb73300a4 --- /dev/null +++ b/queue-6.1/pm-sleep-console-fix-the-black-screen-issue.patch @@ -0,0 +1,77 @@ +From 8e8c4afe1e8af87c3f7277915b35ebc45d0c2d61 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:23:45 +0800 +Subject: PM: sleep: console: Fix the black screen issue + +From: tuhaowen + +[ Upstream commit 4266e8fa56d3d982bf451d382a410b9db432015c ] + +When the computer enters sleep status without a monitor +connected, the system switches the console to the virtual +terminal tty63(SUSPEND_CONSOLE). + +If a monitor is subsequently connected before waking up, +the system skips the required VT restoration process +during wake-up, leaving the console on tty63 instead of +switching back to tty1. + +To fix this issue, a global flag vt_switch_done is introduced +to record whether the system has successfully switched to +the suspend console via vt_move_to_console() during suspend. + +If the switch was completed, vt_switch_done is set to 1. +Later during resume, this flag is checked to ensure that +the original console is restored properly by calling +vt_move_to_console(orig_fgconsole, 0). + +This prevents scenarios where the resume logic skips console +restoration due to incorrect detection of the console state, +especially when a monitor is reconnected before waking up. + +Signed-off-by: tuhaowen +Link: https://patch.msgid.link/20250611032345.29962-1-tuhaowen@uniontech.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + kernel/power/console.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kernel/power/console.c b/kernel/power/console.c +index fcdf0e14a47d..19c48aa5355d 100644 +--- a/kernel/power/console.c ++++ b/kernel/power/console.c +@@ -16,6 +16,7 @@ + #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) + + static int orig_fgconsole, orig_kmsg; ++static bool vt_switch_done; + + static DEFINE_MUTEX(vt_switch_mutex); + +@@ -136,17 +137,21 @@ void pm_prepare_console(void) + if (orig_fgconsole < 0) + return; + ++ vt_switch_done = true; ++ + orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); + return; + } + + void pm_restore_console(void) + { +- if (!pm_vt_switch()) ++ if (!pm_vt_switch() && !vt_switch_done) + return; + + if (orig_fgconsole >= 0) { + vt_move_to_console(orig_fgconsole, 0); + vt_kmsg_redirect(orig_kmsg); + } ++ ++ vt_switch_done = false; + } +-- +2.39.5 + diff --git a/queue-6.1/pnfs-fix-disk-addr-range-check-in-block-scsi-layout.patch b/queue-6.1/pnfs-fix-disk-addr-range-check-in-block-scsi-layout.patch new file mode 100644 index 0000000000..6b8c730328 --- /dev/null +++ b/queue-6.1/pnfs-fix-disk-addr-range-check-in-block-scsi-layout.patch @@ -0,0 +1,41 @@ +From c8be9f52f6ac716385381aaedd2a093bcd7b2be2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Jul 2025 16:32:21 +0300 +Subject: pNFS: Fix disk addr range check in block/scsi layout + +From: Sergey Bashirov + +[ Upstream commit 7db6e66663681abda54f81d5916db3a3b8b1a13d ] + +At the end of the isect translation, disc_addr represents the physical +disk offset. Thus, end calculated from disk_addr is also a physical disk +offset. Therefore, range checking should be done using map->disk_offset, +not map->start. + +Signed-off-by: Sergey Bashirov +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20250702133226.212537-1-sergeybashirov@gmail.com +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/blocklayout/blocklayout.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c +index 6be13e0ec170..e498aade8c47 100644 +--- a/fs/nfs/blocklayout/blocklayout.c ++++ b/fs/nfs/blocklayout/blocklayout.c +@@ -149,8 +149,8 @@ do_add_page_to_bio(struct bio *bio, int npg, enum req_op op, sector_t isect, + + /* limit length to what the device mapping allows */ + end = disk_addr + *len; +- if (end >= map->start + map->len) +- *len = map->start + map->len - disk_addr; ++ if (end >= map->disk_offset + map->len) ++ *len = map->disk_offset + map->len - disk_addr; + + retry: + if (!bio) { +-- +2.39.5 + diff --git a/queue-6.1/pnfs-fix-stripe-mapping-in-block-scsi-layout.patch b/queue-6.1/pnfs-fix-stripe-mapping-in-block-scsi-layout.patch new file mode 100644 index 0000000000..d0f22680e9 --- /dev/null +++ b/queue-6.1/pnfs-fix-stripe-mapping-in-block-scsi-layout.patch @@ -0,0 +1,57 @@ +From 591f95013ba690f336421185c9d50b0fdd6a6426 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 15:21:48 +0300 +Subject: pNFS: Fix stripe mapping in block/scsi layout + +From: Sergey Bashirov + +[ Upstream commit 81438498a285759f31e843ac4800f82a5ce6521f ] + +Because of integer division, we need to carefully calculate the +disk offset. Consider the example below for a stripe of 6 volumes, +a chunk size of 4096, and an offset of 70000. + +chunk = div_u64(offset, dev->chunk_size) = 70000 / 4096 = 17 +offset = chunk * dev->chunk_size = 17 * 4096 = 69632 +disk_offset_wrong = div_u64(offset, dev->nr_children) = 69632 / 6 = 11605 +disk_chunk = div_u64(chunk, dev->nr_children) = 17 / 6 = 2 +disk_offset = disk_chunk * dev->chunk_size = 2 * 4096 = 8192 + +Signed-off-by: Sergey Bashirov +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20250701122341.199112-1-sergeybashirov@gmail.com +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/blocklayout/dev.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c +index ce2ea6239797..fc6413953600 100644 +--- a/fs/nfs/blocklayout/dev.c ++++ b/fs/nfs/blocklayout/dev.c +@@ -199,10 +199,11 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset, + struct pnfs_block_dev *child; + u64 chunk; + u32 chunk_idx; ++ u64 disk_chunk; + u64 disk_offset; + + chunk = div_u64(offset, dev->chunk_size); +- div_u64_rem(chunk, dev->nr_children, &chunk_idx); ++ disk_chunk = div_u64_rem(chunk, dev->nr_children, &chunk_idx); + + if (chunk_idx >= dev->nr_children) { + dprintk("%s: invalid chunk idx %d (%lld/%lld)\n", +@@ -215,7 +216,7 @@ static bool bl_map_stripe(struct pnfs_block_dev *dev, u64 offset, + offset = chunk * dev->chunk_size; + + /* disk offset of the stripe */ +- disk_offset = div_u64(offset, dev->nr_children); ++ disk_offset = disk_chunk * dev->chunk_size; + + child = &dev->children[chunk_idx]; + child->map(child, disk_offset, map); +-- +2.39.5 + diff --git a/queue-6.1/pnfs-fix-uninited-ptr-deref-in-block-scsi-layout.patch b/queue-6.1/pnfs-fix-uninited-ptr-deref-in-block-scsi-layout.patch new file mode 100644 index 0000000000..eb722e04f3 --- /dev/null +++ b/queue-6.1/pnfs-fix-uninited-ptr-deref-in-block-scsi-layout.patch @@ -0,0 +1,99 @@ +From 624a51154257c4e4f7da901c964d7fcd6453ce87 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 21:35:26 +0300 +Subject: pNFS: Fix uninited ptr deref in block/scsi layout + +From: Sergey Bashirov + +[ Upstream commit 9768797c219326699778fba9cd3b607b2f1e7950 ] + +The error occurs on the third attempt to encode extents. When function +ext_tree_prepare_commit() reallocates a larger buffer to retry encoding +extents, the "layoutupdate_pages" page array is initialized only after the +retry loop. But ext_tree_free_commitdata() is called on every iteration +and tries to put pages in the array, thus dereferencing uninitialized +pointers. + +An additional problem is that there is no limit on the maximum possible +buffer_size. When there are too many extents, the client may create a +layoutcommit that is larger than the maximum possible RPC size accepted +by the server. + +During testing, we observed two typical scenarios. First, one memory page +for extents is enough when we work with small files, append data to the +end of the file, or preallocate extents before writing. But when we fill +a new large file without preallocating, the number of extents can be huge, +and counting the number of written extents in ext_tree_encode_commit() +does not help much. Since this number increases even more between +unlocking and locking of ext_tree, the reallocated buffer may not be +large enough again and again. + +Co-developed-by: Konstantin Evtushenko +Signed-off-by: Konstantin Evtushenko +Signed-off-by: Sergey Bashirov +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20250630183537.196479-2-sergeybashirov@gmail.com +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/blocklayout/extent_tree.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/fs/nfs/blocklayout/extent_tree.c b/fs/nfs/blocklayout/extent_tree.c +index 8f7cff7a4293..0add0f329816 100644 +--- a/fs/nfs/blocklayout/extent_tree.c ++++ b/fs/nfs/blocklayout/extent_tree.c +@@ -552,6 +552,15 @@ static int ext_tree_encode_commit(struct pnfs_block_layout *bl, __be32 *p, + return ret; + } + ++/** ++ * ext_tree_prepare_commit - encode extents that need to be committed ++ * @arg: layout commit data ++ * ++ * Return values: ++ * %0: Success, all required extents are encoded ++ * %-ENOSPC: Some extents are encoded, but not all, due to RPC size limit ++ * %-ENOMEM: Out of memory, extents not encoded ++ */ + int + ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) + { +@@ -568,12 +577,12 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) + start_p = page_address(arg->layoutupdate_page); + arg->layoutupdate_pages = &arg->layoutupdate_page; + +-retry: +- ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, &count, &arg->lastbytewritten); ++ ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, ++ &count, &arg->lastbytewritten); + if (unlikely(ret)) { + ext_tree_free_commitdata(arg, buffer_size); + +- buffer_size = ext_tree_layoutupdate_size(bl, count); ++ buffer_size = NFS_SERVER(arg->inode)->wsize; + count = 0; + + arg->layoutupdate_pages = +@@ -588,7 +597,8 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) + return -ENOMEM; + } + +- goto retry; ++ ret = ext_tree_encode_commit(bl, start_p + 1, buffer_size, ++ &count, &arg->lastbytewritten); + } + + *start_p = cpu_to_be32(count); +@@ -608,7 +618,7 @@ ext_tree_prepare_commit(struct nfs4_layoutcommit_args *arg) + } + + dprintk("%s found %zu ranges\n", __func__, count); +- return 0; ++ return ret; + } + + void +-- +2.39.5 + diff --git a/queue-6.1/pnfs-handle-rpc-size-limit-for-layoutcommits.patch b/queue-6.1/pnfs-handle-rpc-size-limit-for-layoutcommits.patch new file mode 100644 index 0000000000..4039731092 --- /dev/null +++ b/queue-6.1/pnfs-handle-rpc-size-limit-for-layoutcommits.patch @@ -0,0 +1,67 @@ +From 74454627e0450c64c633d673c473377f61cfe169 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 21:35:29 +0300 +Subject: pNFS: Handle RPC size limit for layoutcommits + +From: Sergey Bashirov + +[ Upstream commit d897d81671bc4615c80f4f3bd5e6b218f59df50c ] + +When there are too many block extents for a layoutcommit, they may not +all fit into the maximum-sized RPC. This patch allows the generic pnfs +code to properly handle -ENOSPC returned by the block/scsi layout driver +and trigger additional layoutcommits if necessary. + +Co-developed-by: Konstantin Evtushenko +Signed-off-by: Konstantin Evtushenko +Signed-off-by: Sergey Bashirov +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20250630183537.196479-5-sergeybashirov@gmail.com +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/pnfs.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c +index 7f48e0d870bd..86f008241c56 100644 +--- a/fs/nfs/pnfs.c ++++ b/fs/nfs/pnfs.c +@@ -3216,6 +3216,7 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) + struct nfs_inode *nfsi = NFS_I(inode); + loff_t end_pos; + int status; ++ bool mark_as_dirty = false; + + if (!pnfs_layoutcommit_outstanding(inode)) + return 0; +@@ -3267,19 +3268,23 @@ pnfs_layoutcommit_inode(struct inode *inode, bool sync) + if (ld->prepare_layoutcommit) { + status = ld->prepare_layoutcommit(&data->args); + if (status) { +- put_cred(data->cred); ++ if (status != -ENOSPC) ++ put_cred(data->cred); + spin_lock(&inode->i_lock); + set_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags); + if (end_pos > nfsi->layout->plh_lwb) + nfsi->layout->plh_lwb = end_pos; +- goto out_unlock; ++ if (status != -ENOSPC) ++ goto out_unlock; ++ spin_unlock(&inode->i_lock); ++ mark_as_dirty = true; + } + } + + + status = nfs4_proc_layoutcommit(data, sync); + out: +- if (status) ++ if (status || mark_as_dirty) + mark_inode_dirty_sync(inode); + dprintk("<-- %s status %d\n", __func__, status); + return status; +-- +2.39.5 + diff --git a/queue-6.1/powerpc-512-fix-possible-dma_unmap_single-on-uniniti.patch b/queue-6.1/powerpc-512-fix-possible-dma_unmap_single-on-uniniti.patch new file mode 100644 index 0000000000..066bacd282 --- /dev/null +++ b/queue-6.1/powerpc-512-fix-possible-dma_unmap_single-on-uniniti.patch @@ -0,0 +1,43 @@ +From e8492908db529bd6820487dab996acc41ea999f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 16:29:11 +0200 +Subject: (powerpc/512) Fix possible `dma_unmap_single()` on uninitialized + pointer + +From: Thomas Fourier + +[ Upstream commit 760b9b4f6de9a33ca56a05f950cabe82138d25bd ] + +If the device configuration fails (if `dma_dev->device_config()`), +`sg_dma_address(&sg)` is not initialized and the jump to `err_dma_prep` +leads to calling `dma_unmap_single()` on `sg_dma_address(&sg)`. + +Signed-off-by: Thomas Fourier +Reviewed-by: Christophe Leroy +Signed-off-by: Madhavan Srinivasan +Link: https://patch.msgid.link/20250610142918.169540-2-fourier.thomas@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c +index 04bf6ecf7d55..85e0fa7d902b 100644 +--- a/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c ++++ b/arch/powerpc/platforms/512x/mpc512x_lpbfifo.c +@@ -240,10 +240,8 @@ static int mpc512x_lpbfifo_kick(void) + dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + + /* Make DMA channel work with LPB FIFO data register */ +- if (dma_dev->device_config(lpbfifo.chan, &dma_conf)) { +- ret = -EINVAL; +- goto err_dma_prep; +- } ++ if (dma_dev->device_config(lpbfifo.chan, &dma_conf)) ++ return -EINVAL; + + sg_init_table(&sg, 1); + +-- +2.39.5 + diff --git a/queue-6.1/powerpc-floppy-add-missing-checks-after-dma-map.patch b/queue-6.1/powerpc-floppy-add-missing-checks-after-dma-map.patch new file mode 100644 index 0000000000..19001fa18f --- /dev/null +++ b/queue-6.1/powerpc-floppy-add-missing-checks-after-dma-map.patch @@ -0,0 +1,41 @@ +From 65f4c1871824c12e615c970818efb33c40a0ee8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Jun 2025 09:55:55 +0200 +Subject: powerpc: floppy: Add missing checks after DMA map + +From: Thomas Fourier + +[ Upstream commit cf183c1730f2634245da35e9b5d53381b787d112 ] + +The DMA map functions can fail and should be tested for errors. + +Signed-off-by: Thomas Fourier +Reviewed-by: Christophe Leroy +Signed-off-by: Madhavan Srinivasan +Link: https://patch.msgid.link/20250620075602.12575-1-fourier.thomas@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/floppy.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/include/asm/floppy.h b/arch/powerpc/include/asm/floppy.h +index f8ce178b43b7..34abf8bea2cc 100644 +--- a/arch/powerpc/include/asm/floppy.h ++++ b/arch/powerpc/include/asm/floppy.h +@@ -144,9 +144,12 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) + bus_addr = 0; + } + +- if (!bus_addr) /* need to map it */ ++ if (!bus_addr) { /* need to map it */ + bus_addr = dma_map_single(&isa_bridge_pcidev->dev, addr, size, + dir); ++ if (dma_mapping_error(&isa_bridge_pcidev->dev, bus_addr)) ++ return -ENOMEM; ++ } + + /* remember this one as prev */ + prev_addr = addr; +-- +2.39.5 + diff --git a/queue-6.1/pps-clients-gpio-fix-interrupt-handling-order-in-rem.patch b/queue-6.1/pps-clients-gpio-fix-interrupt-handling-order-in-rem.patch new file mode 100644 index 0000000000..06cb30c5a8 --- /dev/null +++ b/queue-6.1/pps-clients-gpio-fix-interrupt-handling-order-in-rem.patch @@ -0,0 +1,58 @@ +From 9e37c05e97b165a1f60256873d7f2db5aeaeb35c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 27 May 2025 05:33:55 +0000 +Subject: pps: clients: gpio: fix interrupt handling order in remove path + +From: Eliav Farber + +[ Upstream commit 6bca1e955830808dc90e0506b2951b4256b81bbb ] + +The interrupt handler in pps_gpio_probe() is registered after calling +pps_register_source() using devm_request_irq(). However, in the +corresponding remove function, pps_unregister_source() is called before +the IRQ is freed, since devm-managed resources are released after the +remove function completes. + +This creates a potential race condition where an interrupt may occur +after the PPS source is unregistered but before the handler is removed, +possibly leading to a kernel panic. + +To prevent this, switch from devm-managed IRQ registration to manual +management by using request_irq() and calling free_irq() explicitly in +the remove path before unregistering the PPS source. This ensures the +interrupt handler is safely removed before deactivating the PPS source. + +Signed-off-by: Eliav Farber +Link: https://lore.kernel.org/r/20250527053355.37185-1-farbere@amazon.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/pps/clients/pps-gpio.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c +index bf3b6f1aa984..41e1fdbcda16 100644 +--- a/drivers/pps/clients/pps-gpio.c ++++ b/drivers/pps/clients/pps-gpio.c +@@ -206,8 +206,8 @@ static int pps_gpio_probe(struct platform_device *pdev) + } + + /* register IRQ interrupt handler */ +- ret = devm_request_irq(dev, data->irq, pps_gpio_irq_handler, +- get_irqf_trigger_flags(data), data->info.name, data); ++ ret = request_irq(data->irq, pps_gpio_irq_handler, ++ get_irqf_trigger_flags(data), data->info.name, data); + if (ret) { + pps_unregister_source(data->pps); + dev_err(dev, "failed to acquire IRQ %d\n", data->irq); +@@ -224,6 +224,7 @@ static int pps_gpio_remove(struct platform_device *pdev) + { + struct pps_gpio_device_data *data = platform_get_drvdata(pdev); + ++ free_irq(data->irq, data); + pps_unregister_source(data->pps); + del_timer_sync(&data->echo_timer); + /* reset echo pin in any case */ +-- +2.39.5 + diff --git a/queue-6.1/ptp-use-ratelimite-for-freerun-error-message.patch b/queue-6.1/ptp-use-ratelimite-for-freerun-error-message.patch new file mode 100644 index 0000000000..8e91d01d67 --- /dev/null +++ b/queue-6.1/ptp-use-ratelimite-for-freerun-error-message.patch @@ -0,0 +1,39 @@ +From 1d7f97d5e7e1ec3cfc0847c62aeeec4c9d72bf53 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 10:15:46 -0700 +Subject: ptp: Use ratelimite for freerun error message + +From: Breno Leitao + +[ Upstream commit e9a7795e75b78b56997fb0070c18d6e1057b6462 ] + +Replace pr_err() with pr_err_ratelimited() in ptp_clock_settime() to +prevent log flooding when the physical clock is free running, which +happens on some of my hosts. This ensures error messages are +rate-limited and improves kernel log readability. + +Signed-off-by: Breno Leitao +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20250613-ptp-v1-1-ee44260ce9e2@debian.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_clock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c +index 642c939d4523..e6bcccf87cd6 100644 +--- a/drivers/ptp/ptp_clock.c ++++ b/drivers/ptp/ptp_clock.c +@@ -79,7 +79,7 @@ static int ptp_clock_settime(struct posix_clock *pc, const struct timespec64 *tp + struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); + + if (ptp_clock_freerun(ptp)) { +- pr_err("ptp: physical clock is free running\n"); ++ pr_err_ratelimited("ptp: physical clock is free running\n"); + return -EBUSY; + } + +-- +2.39.5 + diff --git a/queue-6.1/rcu-protect-defer_qs_iw_pending-from-data-race.patch b/queue-6.1/rcu-protect-defer_qs_iw_pending-from-data-race.patch new file mode 100644 index 0000000000..4afeb104c5 --- /dev/null +++ b/queue-6.1/rcu-protect-defer_qs_iw_pending-from-data-race.patch @@ -0,0 +1,97 @@ +From dae1fdd7ae0ae9a2a1b8bf996c0fbad76fdaa97b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Apr 2025 16:49:53 -0700 +Subject: rcu: Protect ->defer_qs_iw_pending from data race + +From: Paul E. McKenney + +[ Upstream commit 90c09d57caeca94e6f3f87c49e96a91edd40cbfd ] + +On kernels built with CONFIG_IRQ_WORK=y, when rcu_read_unlock() is +invoked within an interrupts-disabled region of code [1], it will invoke +rcu_read_unlock_special(), which uses an irq-work handler to force the +system to notice when the RCU read-side critical section actually ends. +That end won't happen until interrupts are enabled at the soonest. + +In some kernels, such as those booted with rcutree.use_softirq=y, the +irq-work handler is used unconditionally. + +The per-CPU rcu_data structure's ->defer_qs_iw_pending field is +updated by the irq-work handler and is both read and updated by +rcu_read_unlock_special(). This resulted in the following KCSAN splat: + +------------------------------------------------------------------------ + +BUG: KCSAN: data-race in rcu_preempt_deferred_qs_handler / rcu_read_unlock_special + +read to 0xffff96b95f42d8d8 of 1 bytes by task 90 on cpu 8: + rcu_read_unlock_special+0x175/0x260 + __rcu_read_unlock+0x92/0xa0 + rt_spin_unlock+0x9b/0xc0 + __local_bh_enable+0x10d/0x170 + __local_bh_enable_ip+0xfb/0x150 + rcu_do_batch+0x595/0xc40 + rcu_cpu_kthread+0x4e9/0x830 + smpboot_thread_fn+0x24d/0x3b0 + kthread+0x3bd/0x410 + ret_from_fork+0x35/0x40 + ret_from_fork_asm+0x1a/0x30 + +write to 0xffff96b95f42d8d8 of 1 bytes by task 88 on cpu 8: + rcu_preempt_deferred_qs_handler+0x1e/0x30 + irq_work_single+0xaf/0x160 + run_irq_workd+0x91/0xc0 + smpboot_thread_fn+0x24d/0x3b0 + kthread+0x3bd/0x410 + ret_from_fork+0x35/0x40 + ret_from_fork_asm+0x1a/0x30 + +no locks held by irq_work/8/88. +irq event stamp: 200272 +hardirqs last enabled at (200272): [] finish_task_switch+0x131/0x320 +hardirqs last disabled at (200271): [] __schedule+0x129/0xd70 +softirqs last enabled at (0): [] copy_process+0x4df/0x1cc0 +softirqs last disabled at (0): [<0000000000000000>] 0x0 + +------------------------------------------------------------------------ + +The problem is that irq-work handlers run with interrupts enabled, which +means that rcu_preempt_deferred_qs_handler() could be interrupted, +and that interrupt handler might contain an RCU read-side critical +section, which might invoke rcu_read_unlock_special(). In the strict +KCSAN mode of operation used by RCU, this constitutes a data race on +the ->defer_qs_iw_pending field. + +This commit therefore disables interrupts across the portion of the +rcu_preempt_deferred_qs_handler() that updates the ->defer_qs_iw_pending +field. This suffices because this handler is not a fast path. + +Signed-off-by: Paul E. McKenney +Reviewed-by: Frederic Weisbecker +Signed-off-by: Neeraj Upadhyay (AMD) +Signed-off-by: Sasha Levin +--- + kernel/rcu/tree_plugin.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h +index 3929ef8148c1..6fc1ff14bfdf 100644 +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h +@@ -612,10 +612,13 @@ notrace void rcu_preempt_deferred_qs(struct task_struct *t) + */ + static void rcu_preempt_deferred_qs_handler(struct irq_work *iwp) + { ++ unsigned long flags; + struct rcu_data *rdp; + + rdp = container_of(iwp, struct rcu_data, defer_qs_iw); ++ local_irq_save(flags); + rdp->defer_qs_iw_pending = false; ++ local_irq_restore(flags); + } + + /* +-- +2.39.5 + diff --git a/queue-6.1/rdma-core-reduce-stack-using-in-nldev_stat_get_doit.patch b/queue-6.1/rdma-core-reduce-stack-using-in-nldev_stat_get_doit.patch new file mode 100644 index 0000000000..fd3832ac5f --- /dev/null +++ b/queue-6.1/rdma-core-reduce-stack-using-in-nldev_stat_get_doit.patch @@ -0,0 +1,77 @@ +From 4021c5d5bd7c186734aea2e7513c0c0b8d15dd28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Jun 2025 13:33:26 +0200 +Subject: RDMA/core: reduce stack using in nldev_stat_get_doit() + +From: Arnd Bergmann + +[ Upstream commit 43163f4c30f94d2103c948a247cdf2cda5068ca7 ] + +In the s390 defconfig, gcc-10 and earlier end up inlining three functions +into nldev_stat_get_doit(), and each of them uses some 600 bytes of stack. + +The result is a function with an overly large stack frame and a warning: + +drivers/infiniband/core/nldev.c:2466:1: error: the frame size of 1720 bytes is larger than 1280 bytes [-Werror=frame-larger-than=] + +Mark the three functions noinline_for_stack to prevent this, ensuring +that only one copy of the nlattr array is on the stack of each function. + +Signed-off-by: Arnd Bergmann +Link: https://patch.msgid.link/20250620113335.3776965-1-arnd@kernel.org +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/core/nldev.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c +index 1adf20198afd..7e08ce963125 100644 +--- a/drivers/infiniband/core/nldev.c ++++ b/drivers/infiniband/core/nldev.c +@@ -1400,10 +1400,11 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = { + + }; + +-static int res_get_common_doit(struct sk_buff *skb, struct nlmsghdr *nlh, +- struct netlink_ext_ack *extack, +- enum rdma_restrack_type res_type, +- res_fill_func_t fill_func) ++static noinline_for_stack int ++res_get_common_doit(struct sk_buff *skb, struct nlmsghdr *nlh, ++ struct netlink_ext_ack *extack, ++ enum rdma_restrack_type res_type, ++ res_fill_func_t fill_func) + { + const struct nldev_fill_res_entry *fe = &fill_entries[res_type]; + struct nlattr *tb[RDMA_NLDEV_ATTR_MAX]; +@@ -2129,10 +2130,10 @@ static int nldev_stat_del_doit(struct sk_buff *skb, struct nlmsghdr *nlh, + return ret; + } + +-static int stat_get_doit_default_counter(struct sk_buff *skb, +- struct nlmsghdr *nlh, +- struct netlink_ext_ack *extack, +- struct nlattr *tb[]) ++static noinline_for_stack int ++stat_get_doit_default_counter(struct sk_buff *skb, struct nlmsghdr *nlh, ++ struct netlink_ext_ack *extack, ++ struct nlattr *tb[]) + { + struct rdma_hw_stats *stats; + struct nlattr *table_attr; +@@ -2222,8 +2223,9 @@ static int stat_get_doit_default_counter(struct sk_buff *skb, + return ret; + } + +-static int stat_get_doit_qp(struct sk_buff *skb, struct nlmsghdr *nlh, +- struct netlink_ext_ack *extack, struct nlattr *tb[]) ++static noinline_for_stack int ++stat_get_doit_qp(struct sk_buff *skb, struct nlmsghdr *nlh, ++ struct netlink_ext_ack *extack, struct nlattr *tb[]) + + { + static enum rdma_nl_counter_mode mode; +-- +2.39.5 + diff --git a/queue-6.1/rdma-hfi1-fix-possible-divide-by-zero-in-find_hw_thr.patch b/queue-6.1/rdma-hfi1-fix-possible-divide-by-zero-in-find_hw_thr.patch new file mode 100644 index 0000000000..5c8a686587 --- /dev/null +++ b/queue-6.1/rdma-hfi1-fix-possible-divide-by-zero-in-find_hw_thr.patch @@ -0,0 +1,85 @@ +From 0476a3a1b6a6e2bef2a70de0807cf9e05193a0bd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jun 2025 15:39:38 -0400 +Subject: RDMA: hfi1: fix possible divide-by-zero in find_hw_thread_mask() + +From: Yury Norov [NVIDIA] + +[ Upstream commit 59f7d2138591ef8f0e4e4ab5f1ab674e8181ad3a ] + +The function divides number of online CPUs by num_core_siblings, and +later checks the divider by zero. This implies a possibility to get +and divide-by-zero runtime error. Fix it by moving the check prior to +division. This also helps to save one indentation level. + +Signed-off-by: Yury Norov [NVIDIA] +Link: https://patch.msgid.link/20250604193947.11834-3-yury.norov@gmail.com +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/hfi1/affinity.c | 44 +++++++++++++++------------ + 1 file changed, 24 insertions(+), 20 deletions(-) + +diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c +index 77ee77d4000f..7382b85c72a6 100644 +--- a/drivers/infiniband/hw/hfi1/affinity.c ++++ b/drivers/infiniband/hw/hfi1/affinity.c +@@ -966,31 +966,35 @@ static void find_hw_thread_mask(uint hw_thread_no, cpumask_var_t hw_thread_mask, + struct hfi1_affinity_node_list *affinity) + { + int possible, curr_cpu, i; +- uint num_cores_per_socket = node_affinity.num_online_cpus / ++ uint num_cores_per_socket; ++ ++ cpumask_copy(hw_thread_mask, &affinity->proc.mask); ++ ++ if (affinity->num_core_siblings == 0) ++ return; ++ ++ num_cores_per_socket = node_affinity.num_online_cpus / + affinity->num_core_siblings / + node_affinity.num_online_nodes; + +- cpumask_copy(hw_thread_mask, &affinity->proc.mask); +- if (affinity->num_core_siblings > 0) { +- /* Removing other siblings not needed for now */ +- possible = cpumask_weight(hw_thread_mask); +- curr_cpu = cpumask_first(hw_thread_mask); +- for (i = 0; +- i < num_cores_per_socket * node_affinity.num_online_nodes; +- i++) +- curr_cpu = cpumask_next(curr_cpu, hw_thread_mask); +- +- for (; i < possible; i++) { +- cpumask_clear_cpu(curr_cpu, hw_thread_mask); +- curr_cpu = cpumask_next(curr_cpu, hw_thread_mask); +- } ++ /* Removing other siblings not needed for now */ ++ possible = cpumask_weight(hw_thread_mask); ++ curr_cpu = cpumask_first(hw_thread_mask); ++ for (i = 0; ++ i < num_cores_per_socket * node_affinity.num_online_nodes; ++ i++) ++ curr_cpu = cpumask_next(curr_cpu, hw_thread_mask); + +- /* Identifying correct HW threads within physical cores */ +- cpumask_shift_left(hw_thread_mask, hw_thread_mask, +- num_cores_per_socket * +- node_affinity.num_online_nodes * +- hw_thread_no); ++ for (; i < possible; i++) { ++ cpumask_clear_cpu(curr_cpu, hw_thread_mask); ++ curr_cpu = cpumask_next(curr_cpu, hw_thread_mask); + } ++ ++ /* Identifying correct HW threads within physical cores */ ++ cpumask_shift_left(hw_thread_mask, hw_thread_mask, ++ num_cores_per_socket * ++ node_affinity.num_online_nodes * ++ hw_thread_no); + } + + int hfi1_get_proc_affinity(int node) +-- +2.39.5 + diff --git a/queue-6.1/remoteproc-imx_rproc-skip-clock-enable-when-m-core-i.patch b/queue-6.1/remoteproc-imx_rproc-skip-clock-enable-when-m-core-i.patch new file mode 100644 index 0000000000..0329354632 --- /dev/null +++ b/queue-6.1/remoteproc-imx_rproc-skip-clock-enable-when-m-core-i.patch @@ -0,0 +1,59 @@ +From 0b93b11717eab9cbfd27536127cb45f552b276d9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 29 Jun 2025 14:25:11 -0300 +Subject: remoteproc: imx_rproc: skip clock enable when M-core is managed by + the SCU + +From: Hiago De Franco + +[ Upstream commit 496deecb020d14ba89ba7084fbc3024f91687023 ] + +For the i.MX8X and i.MX8 family SoCs, when the Cortex-M core is powered +up and started by the Cortex-A core using the bootloader (e.g., via the +U-Boot bootaux command), both M-core and Linux run within the same SCFW +(System Controller Firmware) partition. With that, Linux has permission +to control the M-core. + +But once the M-core is started by the bootloader, the SCFW automatically +enables its clock and sets the clock rate. If Linux later attempts to +enable the same clock via clk_prepare_enable(), the SCFW returns a +'LOCKED' error, as the clock is already configured by the SCFW. This +causes the probe function in imx_rproc.c to fail, leading to the M-core +power domain being shut down while the core is still running. This +results in a fault from the SCU (System Controller Unit) and triggers a +system reset. + +To address this issue, ignore handling the clk for i.MX8X and i.MX8 +M-core, as SCFW already takes care of enabling and configuring the +clock. + +Suggested-by: Peng Fan +Reviewed-by: Ulf Hansson +Reviewed-by: Peng Fan +Signed-off-by: Hiago De Franco +Acked-by: Mathieu Poirier +Link: https://lore.kernel.org/r/20250629172512.14857-3-hiagofranco@gmail.com +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/remoteproc/imx_rproc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c +index bbaba453383d..ff7acc326f09 100644 +--- a/drivers/remoteproc/imx_rproc.c ++++ b/drivers/remoteproc/imx_rproc.c +@@ -750,8 +750,8 @@ static int imx_rproc_clk_enable(struct imx_rproc *priv) + struct device *dev = priv->dev; + int ret; + +- /* Remote core is not under control of Linux */ +- if (dcfg->method == IMX_RPROC_NONE) ++ /* Remote core is not under control of Linux or it is managed by SCU API */ ++ if (dcfg->method == IMX_RPROC_NONE || dcfg->method == IMX_RPROC_SCU_API) + return 0; + + priv->clk = devm_clk_get(dev, NULL); +-- +2.39.5 + diff --git a/queue-6.1/reset-brcmstb-enable-reset-drivers-for-arch_bcm2835.patch b/queue-6.1/reset-brcmstb-enable-reset-drivers-for-arch_bcm2835.patch new file mode 100644 index 0000000000..84aaf59952 --- /dev/null +++ b/queue-6.1/reset-brcmstb-enable-reset-drivers-for-arch_bcm2835.patch @@ -0,0 +1,59 @@ +From b9b56db5c2b4d7724f97d7507c93154467827a48 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 18:52:58 +0100 +Subject: reset: brcmstb: Enable reset drivers for ARCH_BCM2835 + +From: Peter Robinson + +[ Upstream commit 1d99f92f71b6b4b2eee776562c991428490f71ef ] + +The BRCMSTB and BRCMSTB_RESCAL reset drivers are also +used in the BCM2712, AKA the RPi5. The RPi platforms +have typically used the ARCH_BCM2835, and the PCIe +support for this SoC can use this config which depends +on these drivers so enable building them when just that +arch option is enabled to ensure the platform works as +expected. + +Signed-off-by: Peter Robinson +Acked-by: Florian Fainelli +Link: https://lore.kernel.org/r/20250630175301.846082-1-pbrobinson@gmail.com +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/reset/Kconfig | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig +index 2a52c990d4fe..c561a93af655 100644 +--- a/drivers/reset/Kconfig ++++ b/drivers/reset/Kconfig +@@ -51,8 +51,8 @@ config RESET_BERLIN + + config RESET_BRCMSTB + tristate "Broadcom STB reset controller" +- depends on ARCH_BRCMSTB || COMPILE_TEST +- default ARCH_BRCMSTB ++ depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST ++ default ARCH_BRCMSTB || ARCH_BCM2835 + help + This enables the reset controller driver for Broadcom STB SoCs using + a SUN_TOP_CTRL_SW_INIT style controller. +@@ -60,11 +60,11 @@ config RESET_BRCMSTB + config RESET_BRCMSTB_RESCAL + tristate "Broadcom STB RESCAL reset controller" + depends on HAS_IOMEM +- depends on ARCH_BRCMSTB || COMPILE_TEST +- default ARCH_BRCMSTB ++ depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST ++ default ARCH_BRCMSTB || ARCH_BCM2835 + help + This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on +- BCM7216. ++ BCM7216 or the BCM2712. + + config RESET_HSDK + bool "Synopsys HSDK Reset Driver" +-- +2.39.5 + diff --git a/queue-6.1/rtc-ds1307-handle-oscillator-stop-flag-osf-for-ds134.patch b/queue-6.1/rtc-ds1307-handle-oscillator-stop-flag-osf-for-ds134.patch new file mode 100644 index 0000000000..7b304e7fe7 --- /dev/null +++ b/queue-6.1/rtc-ds1307-handle-oscillator-stop-flag-osf-for-ds134.patch @@ -0,0 +1,63 @@ +From cbe0bf5b4082aa0765034a391a388362fdb53ffe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:14:16 -0700 +Subject: rtc: ds1307: handle oscillator stop flag (OSF) for ds1341 + +From: Meagan Lloyd + +[ Upstream commit 523923cfd5d622b8f4ba893fdaf29fa6adeb8c3e ] + +In using CONFIG_RTC_HCTOSYS, rtc_hctosys() will sync the RTC time to the +kernel time as long as rtc_read_time() succeeds. In some power loss +situations, our supercapacitor-backed DS1342 RTC comes up with either an +unpredictable future time or the default 01/01/00 from the datasheet. +The oscillator stop flag (OSF) is set in these scenarios due to the +power loss and can be used to determine the validity of the RTC data. + +This change expands the oscillator stop flag (OSF) handling that has +already been implemented for some chips to the ds1341 chip (DS1341 and +DS1342 share a datasheet). This handling manages the validity of the RTC +data in .read_time and .set_time based on the OSF. + +Signed-off-by: Meagan Lloyd +Reviewed-by: Tyler Hicks +Acked-by: Rodolfo Giometti +Link: https://lore.kernel.org/r/1749665656-30108-3-git-send-email-meaganlloyd@linux.microsoft.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-ds1307.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c +index 73f2dd3af4d4..530b9340db21 100644 +--- a/drivers/rtc/rtc-ds1307.c ++++ b/drivers/rtc/rtc-ds1307.c +@@ -273,6 +273,13 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) + if (tmp & DS1340_BIT_OSF) + return -EINVAL; + break; ++ case ds_1341: ++ ret = regmap_read(ds1307->regmap, DS1337_REG_STATUS, &tmp); ++ if (ret) ++ return ret; ++ if (tmp & DS1337_BIT_OSF) ++ return -EINVAL; ++ break; + case ds_1388: + ret = regmap_read(ds1307->regmap, DS1388_REG_FLAG, &tmp); + if (ret) +@@ -371,6 +378,10 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) + regmap_update_bits(ds1307->regmap, DS1340_REG_FLAG, + DS1340_BIT_OSF, 0); + break; ++ case ds_1341: ++ regmap_update_bits(ds1307->regmap, DS1337_REG_STATUS, ++ DS1337_BIT_OSF, 0); ++ break; + case ds_1388: + regmap_update_bits(ds1307->regmap, DS1388_REG_FLAG, + DS1388_BIT_OSF, 0); +-- +2.39.5 + diff --git a/queue-6.1/rtc-ds1307-remove-clear-of-oscillator-stop-flag-osf-.patch b/queue-6.1/rtc-ds1307-remove-clear-of-oscillator-stop-flag-osf-.patch new file mode 100644 index 0000000000..6077544264 --- /dev/null +++ b/queue-6.1/rtc-ds1307-remove-clear-of-oscillator-stop-flag-osf-.patch @@ -0,0 +1,52 @@ +From 1845089501dc777ff1d3ea392e1216985a31bf43 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:14:15 -0700 +Subject: rtc: ds1307: remove clear of oscillator stop flag (OSF) in probe + +From: Meagan Lloyd + +[ Upstream commit 48458654659c9c2e149c211d86637f1592470da5 ] + +In using CONFIG_RTC_HCTOSYS, rtc_hctosys() will sync the RTC time to the +kernel time as long as rtc_read_time() succeeds. In some power loss +situations, our supercapacitor-backed DS1342 RTC comes up with either an +unpredictable future time or the default 01/01/00 from the datasheet. +The oscillator stop flag (OSF) is set in these scenarios due to the +power loss and can be used to determine the validity of the RTC data. + +Some chip types in the ds1307 driver already have OSF handling to +determine whether .read_time provides valid RTC data or returns -EINVAL. + +This change removes the clear of the OSF in .probe as the OSF needs to +be preserved to expand the OSF handling to the ds1341 chip type (note +that DS1341 and DS1342 share a datasheet). + +Signed-off-by: Meagan Lloyd +Reviewed-by: Tyler Hicks +Acked-by: Rodolfo Giometti +Link: https://lore.kernel.org/r/1749665656-30108-2-git-send-email-meaganlloyd@linux.microsoft.com +Signed-off-by: Alexandre Belloni +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-ds1307.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c +index 530b9340db21..6d82fb45e9a8 100644 +--- a/drivers/rtc/rtc-ds1307.c ++++ b/drivers/rtc/rtc-ds1307.c +@@ -1819,10 +1819,8 @@ static int ds1307_probe(struct i2c_client *client, + regmap_write(ds1307->regmap, DS1337_REG_CONTROL, + regs[0]); + +- /* oscillator fault? clear flag, and warn */ ++ /* oscillator fault? warn */ + if (regs[1] & DS1337_BIT_OSF) { +- regmap_write(ds1307->regmap, DS1337_REG_STATUS, +- regs[1] & ~DS1337_BIT_OSF); + dev_warn(ds1307->dev, "SET TIME!\n"); + } + break; +-- +2.39.5 + diff --git a/queue-6.1/s390-stp-remove-udelay-from-stp_sync_clock.patch b/queue-6.1/s390-stp-remove-udelay-from-stp_sync_clock.patch new file mode 100644 index 0000000000..caaf017650 --- /dev/null +++ b/queue-6.1/s390-stp-remove-udelay-from-stp_sync_clock.patch @@ -0,0 +1,44 @@ +From c58958413f96f44a978421745d69a64b9192433a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 13:50:27 +0200 +Subject: s390/stp: Remove udelay from stp_sync_clock() + +From: Sven Schnelle + +[ Upstream commit b367017cdac21781a74eff4e208d3d38e1f38d3f ] + +When an stp sync check is handled on a system with multiple +cpus each cpu gets a machine check but only the first one +actually handles the sync operation. All other CPUs spin +waiting for the first one to finish with a short udelay(). +But udelay can't be used here as the first CPU modifies tod_clock_base +before performing the sync op. During this timeframe +get_tod_clock_monotonic() might return a non-monotonic time. + +The time spent waiting should be very short and udelay is a busy loop +anyways, therefore simply remove the udelay. + +Reviewed-by: Heiko Carstens +Signed-off-by: Sven Schnelle +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/kernel/time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c +index 6b7b6d5e3632..add2862e835b 100644 +--- a/arch/s390/kernel/time.c ++++ b/arch/s390/kernel/time.c +@@ -574,7 +574,7 @@ static int stp_sync_clock(void *data) + atomic_dec(&sync->cpus); + /* Wait for in_sync to be set. */ + while (READ_ONCE(sync->in_sync) == 0) +- __udelay(1); ++ ; + } + if (sync->in_sync != 1) + /* Didn't work. Clear per-cpu in sync bit again. */ +-- +2.39.5 + diff --git a/queue-6.1/s390-time-use-monotonic-clock-in-get_cycles.patch b/queue-6.1/s390-time-use-monotonic-clock-in-get_cycles.patch new file mode 100644 index 0000000000..3cd52df47f --- /dev/null +++ b/queue-6.1/s390-time-use-monotonic-clock-in-get_cycles.patch @@ -0,0 +1,54 @@ +From 62dd3bf4995478cef1dc3367e63d7837c9024fad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 09:42:29 +0200 +Subject: s390/time: Use monotonic clock in get_cycles() + +From: Sven Schnelle + +[ Upstream commit 09e7e29d2b49ba84bcefb3dc1657726d2de5bb24 ] + +Otherwise the code might not work correctly when the clock +is changed. + +Signed-off-by: Sven Schnelle +Reviewed-by: Heiko Carstens +Signed-off-by: Alexander Gordeev +Signed-off-by: Sasha Levin +--- + arch/s390/include/asm/timex.h | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h +index ce878e85b6e4..d0255aa5b36e 100644 +--- a/arch/s390/include/asm/timex.h ++++ b/arch/s390/include/asm/timex.h +@@ -192,13 +192,6 @@ static inline unsigned long get_tod_clock_fast(void) + asm volatile("stckf %0" : "=Q" (clk) : : "cc"); + return clk; + } +- +-static inline cycles_t get_cycles(void) +-{ +- return (cycles_t) get_tod_clock() >> 2; +-} +-#define get_cycles get_cycles +- + int get_phys_clock(unsigned long *clock); + void init_cpu_timer(void); + +@@ -221,6 +214,12 @@ static inline unsigned long get_tod_clock_monotonic(void) + return tod; + } + ++static inline cycles_t get_cycles(void) ++{ ++ return (cycles_t)get_tod_clock_monotonic() >> 2; ++} ++#define get_cycles get_cycles ++ + /** + * tod_to_ns - convert a TOD format value to nanoseconds + * @todval: to be converted TOD format value +-- +2.39.5 + diff --git a/queue-6.1/sched-fair-bump-sd-max_newidle_lb_cost-when-newidle-.patch b/queue-6.1/sched-fair-bump-sd-max_newidle_lb_cost-when-newidle-.patch new file mode 100644 index 0000000000..797b0c4c8d --- /dev/null +++ b/queue-6.1/sched-fair-bump-sd-max_newidle_lb_cost-when-newidle-.patch @@ -0,0 +1,90 @@ +From a9d627110326d98c0261a0213f5073df9869ea5d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 26 Jun 2025 07:39:10 -0700 +Subject: sched/fair: Bump sd->max_newidle_lb_cost when newidle balance fails + +From: Chris Mason + +[ Upstream commit 155213a2aed42c85361bf4f5c817f5cb68951c3b ] + +schbench (https://github.com/masoncl/schbench.git) is showing a +regression from previous production kernels that bisected down to: + +sched/fair: Remove sysctl_sched_migration_cost condition (c5b0a7eefc) + +The schbench command line was: + +schbench -L -m 4 -M auto -t 256 -n 0 -r 0 -s 0 + +This creates 4 message threads pinned to CPUs 0-3, and 256x4 worker +threads spread across the rest of the CPUs. Neither the worker threads +or the message threads do any work, they just wake each other up and go +back to sleep as soon as possible. + +The end result is the first 4 CPUs are pegged waking up those 1024 +workers, and the rest of the CPUs are constantly banging in and out of +idle. If I take a v6.9 Linus kernel and revert that one commit, +performance goes from 3.4M RPS to 5.4M RPS. + +schedstat shows there are ~100x more new idle balance operations, and +profiling shows the worker threads are spending ~20% of their CPU time +on new idle balance. schedstats also shows that almost all of these new +idle balance attemps are failing to find busy groups. + +The fix used here is to crank up the cost of the newidle balance whenever it +fails. Since we don't want sd->max_newidle_lb_cost to grow out of +control, this also changes update_newidle_cost() to use +sysctl_sched_migration_cost as the upper limit on max_newidle_lb_cost. + +Signed-off-by: Chris Mason +Signed-off-by: Peter Zijlstra (Intel) +Acked-by: Vincent Guittot +Link: https://lkml.kernel.org/r/20250626144017.1510594-2-clm@fb.com +Signed-off-by: Sasha Levin +--- + kernel/sched/fair.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c +index d30e0936cfec..2deb896883d3 100644 +--- a/kernel/sched/fair.c ++++ b/kernel/sched/fair.c +@@ -10941,8 +10941,14 @@ static inline bool update_newidle_cost(struct sched_domain *sd, u64 cost) + /* + * Track max cost of a domain to make sure to not delay the + * next wakeup on the CPU. ++ * ++ * sched_balance_newidle() bumps the cost whenever newidle ++ * balance fails, and we don't want things to grow out of ++ * control. Use the sysctl_sched_migration_cost as the upper ++ * limit, plus a litle extra to avoid off by ones. + */ +- sd->max_newidle_lb_cost = cost; ++ sd->max_newidle_lb_cost = ++ min(cost, sysctl_sched_migration_cost + 200); + sd->last_decay_max_lb_cost = jiffies; + } else if (time_after(jiffies, sd->last_decay_max_lb_cost + HZ)) { + /* +@@ -11624,10 +11630,17 @@ static int newidle_balance(struct rq *this_rq, struct rq_flags *rf) + + t1 = sched_clock_cpu(this_cpu); + domain_cost = t1 - t0; +- update_newidle_cost(sd, domain_cost); +- + curr_cost += domain_cost; + t0 = t1; ++ ++ /* ++ * Failing newidle means it is not effective; ++ * bump the cost so we end up doing less of it. ++ */ ++ if (!pulled_task) ++ domain_cost = (3 * sd->max_newidle_lb_cost) / 2; ++ ++ update_newidle_cost(sd, domain_cost); + } + + /* +-- +2.39.5 + diff --git a/queue-6.1/scsi-aacraid-stop-using-pci_irq_affinity.patch b/queue-6.1/scsi-aacraid-stop-using-pci_irq_affinity.patch new file mode 100644 index 0000000000..8d25a4d273 --- /dev/null +++ b/queue-6.1/scsi-aacraid-stop-using-pci_irq_affinity.patch @@ -0,0 +1,69 @@ +From f048ff1ffbadbbaaf961ffa42044bef675b3094e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 11:15:35 +0000 +Subject: scsi: aacraid: Stop using PCI_IRQ_AFFINITY + +From: John Garry + +[ Upstream commit dafeaf2c03e71255438ffe5a341d94d180e6c88e ] + +When PCI_IRQ_AFFINITY is set for calling pci_alloc_irq_vectors(), it +means interrupts are spread around the available CPUs. It also means that +the interrupts become managed, which means that an interrupt is shutdown +when all the CPUs in the interrupt affinity mask go offline. + +Using managed interrupts in this way means that we should ensure that +completions should not occur on HW queues where the associated interrupt +is shutdown. This is typically achieved by ensuring only CPUs which are +online can generate IO completion traffic to the HW queue which they are +mapped to (so that they can also serve completion interrupts for that HW +queue). + +The problem in the driver is that a CPU can generate completions to a HW +queue whose interrupt may be shutdown, as the CPUs in the HW queue +interrupt affinity mask may be offline. This can cause IOs to never +complete and hang the system. The driver maintains its own CPU <-> HW +queue mapping for submissions, see aac_fib_vector_assign(), but this does +not reflect the CPU <-> HW queue interrupt affinity mapping. + +Commit 9dc704dcc09e ("scsi: aacraid: Reply queue mapping to CPUs based on +IRQ affinity") tried to remedy this issue may mapping CPUs properly to HW +queue interrupts. However this was later reverted in commit c5becf57dd56 +("Revert "scsi: aacraid: Reply queue mapping to CPUs based on IRQ +affinity") - it seems that there were other reports of hangs. I guess +that this was due to some implementation issue in the original commit or +maybe a HW issue. + +Fix the very original hang by just not using managed interrupts by not +setting PCI_IRQ_AFFINITY. In this way, all CPUs will be in each HW queue +affinity mask, so should not create completion problems if any CPUs go +offline. + +Signed-off-by: John Garry +Link: https://lore.kernel.org/r/20250715111535.499853-1-john.g.garry@oracle.com +Closes: https://lore.kernel.org/linux-scsi/20250618192427.3845724-1-jmeneghi@redhat.com/ +Reviewed-by: John Meneghini +Tested-by: John Meneghini +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/aacraid/comminit.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c +index 0f64b0244303..31b95e6c96c5 100644 +--- a/drivers/scsi/aacraid/comminit.c ++++ b/drivers/scsi/aacraid/comminit.c +@@ -481,8 +481,7 @@ void aac_define_int_mode(struct aac_dev *dev) + pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) { + min_msix = 2; + i = pci_alloc_irq_vectors(dev->pdev, +- min_msix, msi_count, +- PCI_IRQ_MSIX | PCI_IRQ_AFFINITY); ++ min_msix, msi_count, PCI_IRQ_MSIX); + if (i > 0) { + dev->msi_enabled = 1; + msi_count = i; +-- +2.39.5 + diff --git a/queue-6.1/scsi-bfa-double-free-fix.patch b/queue-6.1/scsi-bfa-double-free-fix.patch new file mode 100644 index 0000000000..7643d88fd8 --- /dev/null +++ b/queue-6.1/scsi-bfa-double-free-fix.patch @@ -0,0 +1,42 @@ +From bf81451ce0a56ce993fb6787155718962d9a1721 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Jun 2025 19:58:24 +0800 +Subject: scsi: bfa: Double-free fix + +From: jackysliu <1972843537@qq.com> + +[ Upstream commit add4c4850363d7c1b72e8fce9ccb21fdd2cf5dc9 ] + +When the bfad_im_probe() function fails during initialization, the memory +pointed to by bfad->im is freed without setting bfad->im to NULL. + +Subsequently, during driver uninstallation, when the state machine enters +the bfad_sm_stopping state and calls the bfad_im_probe_undo() function, +it attempts to free the memory pointed to by bfad->im again, thereby +triggering a double-free vulnerability. + +Set bfad->im to NULL if probing fails. + +Signed-off-by: jackysliu <1972843537@qq.com> +Link: https://lore.kernel.org/r/tencent_3BB950D6D2D470976F55FC879206DE0B9A09@qq.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/bfa/bfad_im.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c +index c335f7a188d2..8f2bd0a6a08c 100644 +--- a/drivers/scsi/bfa/bfad_im.c ++++ b/drivers/scsi/bfa/bfad_im.c +@@ -706,6 +706,7 @@ bfad_im_probe(struct bfad_s *bfad) + + if (bfad_thread_workq(bfad) != BFA_STATUS_OK) { + kfree(im); ++ bfad->im = NULL; + return BFA_STATUS_FAILED; + } + +-- +2.39.5 + diff --git a/queue-6.1/scsi-fix-sas_user_scan-to-handle-wildcard-and-multi-.patch b/queue-6.1/scsi-fix-sas_user_scan-to-handle-wildcard-and-multi-.patch new file mode 100644 index 0000000000..68d8e068bb --- /dev/null +++ b/queue-6.1/scsi-fix-sas_user_scan-to-handle-wildcard-and-multi-.patch @@ -0,0 +1,136 @@ +From 459dc6019fc0ccc21dd7e3baa75878774508595a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 24 Jun 2025 11:46:49 +0530 +Subject: scsi: Fix sas_user_scan() to handle wildcard and multi-channel scans + +From: Ranjan Kumar + +[ Upstream commit 37c4e72b0651e7697eb338cd1fb09feef472cc1a ] + +sas_user_scan() did not fully process wildcard channel scans +(SCAN_WILD_CARD) when a transport-specific user_scan() callback was +present. Only channel 0 would be scanned via user_scan(), while the +remaining channels were skipped, potentially missing devices. + +user_scan() invokes updated sas_user_scan() for channel 0, and if +successful, iteratively scans remaining channels (1 to +shost->max_channel) via scsi_scan_host_selected(). This ensures complete +wildcard scanning without affecting transport-specific scanning behavior. + +Signed-off-by: Ranjan Kumar +Link: https://lore.kernel.org/r/20250624061649.17990-1-ranjan.kumar@broadcom.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 60 ++++++++++++++++++++++++------- + 2 files changed, 49 insertions(+), 13 deletions(-) + +diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c +index 69288303e600..6fb995153abd 100644 +--- a/drivers/scsi/scsi_scan.c ++++ b/drivers/scsi/scsi_scan.c +@@ -1842,7 +1842,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel, + + return 0; + } +- ++EXPORT_SYMBOL(scsi_scan_host_selected); + static void scsi_sysfs_add_devices(struct Scsi_Host *shost) + { + struct scsi_device *sdev; +diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c +index 6941d8cfb9ba..5a19de2c7006 100644 +--- a/drivers/scsi/scsi_transport_sas.c ++++ b/drivers/scsi/scsi_transport_sas.c +@@ -40,6 +40,8 @@ + #include + + #include "scsi_sas_internal.h" ++#include "scsi_priv.h" ++ + struct sas_host_attrs { + struct list_head rphy_list; + struct mutex lock; +@@ -1681,32 +1683,66 @@ int scsi_is_sas_rphy(const struct device *dev) + } + EXPORT_SYMBOL(scsi_is_sas_rphy); + +- +-/* +- * SCSI scan helper +- */ +- +-static int sas_user_scan(struct Scsi_Host *shost, uint channel, +- uint id, u64 lun) ++static void scan_channel_zero(struct Scsi_Host *shost, uint id, u64 lun) + { + struct sas_host_attrs *sas_host = to_sas_host_attrs(shost); + struct sas_rphy *rphy; + +- mutex_lock(&sas_host->lock); + list_for_each_entry(rphy, &sas_host->rphy_list, list) { + if (rphy->identify.device_type != SAS_END_DEVICE || + rphy->scsi_target_id == -1) + continue; + +- if ((channel == SCAN_WILD_CARD || channel == 0) && +- (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) { ++ if (id == SCAN_WILD_CARD || id == rphy->scsi_target_id) { + scsi_scan_target(&rphy->dev, 0, rphy->scsi_target_id, + lun, SCSI_SCAN_MANUAL); + } + } +- mutex_unlock(&sas_host->lock); ++} + +- return 0; ++/* ++ * SCSI scan helper ++ */ ++ ++static int sas_user_scan(struct Scsi_Host *shost, uint channel, ++ uint id, u64 lun) ++{ ++ struct sas_host_attrs *sas_host = to_sas_host_attrs(shost); ++ int res = 0; ++ int i; ++ ++ switch (channel) { ++ case 0: ++ mutex_lock(&sas_host->lock); ++ scan_channel_zero(shost, id, lun); ++ mutex_unlock(&sas_host->lock); ++ break; ++ ++ case SCAN_WILD_CARD: ++ mutex_lock(&sas_host->lock); ++ scan_channel_zero(shost, id, lun); ++ mutex_unlock(&sas_host->lock); ++ ++ for (i = 1; i <= shost->max_channel; i++) { ++ res = scsi_scan_host_selected(shost, i, id, lun, ++ SCSI_SCAN_MANUAL); ++ if (res) ++ goto exit_scan; ++ } ++ break; ++ ++ default: ++ if (channel < shost->max_channel) { ++ res = scsi_scan_host_selected(shost, channel, id, lun, ++ SCSI_SCAN_MANUAL); ++ } else { ++ res = -EINVAL; ++ } ++ break; ++ } ++ ++exit_scan: ++ return res; + } + + +-- +2.39.5 + diff --git a/queue-6.1/scsi-libiscsi-initialize-iscsi_conn-dd_data-only-if-.patch b/queue-6.1/scsi-libiscsi-initialize-iscsi_conn-dd_data-only-if-.patch new file mode 100644 index 0000000000..aba44fda66 --- /dev/null +++ b/queue-6.1/scsi-libiscsi-initialize-iscsi_conn-dd_data-only-if-.patch @@ -0,0 +1,63 @@ +From bacabd4d8ed916f96d306ffdbc371b3a89d70e06 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 27 Jun 2025 16:53:29 +0530 +Subject: scsi: libiscsi: Initialize iscsi_conn->dd_data only if memory is + allocated + +From: Showrya M N + +[ Upstream commit 3ea3a256ed81f95ab0f3281a0e234b01a9cae605 ] + +In case of an ib_fast_reg_mr allocation failure during iSER setup, the +machine hits a panic because iscsi_conn->dd_data is initialized +unconditionally, even when no memory is allocated (dd_size == 0). This +leads invalid pointer dereference during connection teardown. + +Fix by setting iscsi_conn->dd_data only if memory is actually allocated. + +Panic trace: +------------ + iser: iser_create_fastreg_desc: Failed to allocate ib_fast_reg_mr err=-12 + iser: iser_alloc_rx_descriptors: failed allocating rx descriptors / data buffers + BUG: unable to handle page fault for address: fffffffffffffff8 + RIP: 0010:swake_up_locked.part.5+0xa/0x40 + Call Trace: + complete+0x31/0x40 + iscsi_iser_conn_stop+0x88/0xb0 [ib_iser] + iscsi_stop_conn+0x66/0xc0 [scsi_transport_iscsi] + iscsi_if_stop_conn+0x14a/0x150 [scsi_transport_iscsi] + iscsi_if_rx+0x1135/0x1834 [scsi_transport_iscsi] + ? netlink_lookup+0x12f/0x1b0 + ? netlink_deliver_tap+0x2c/0x200 + netlink_unicast+0x1ab/0x280 + netlink_sendmsg+0x257/0x4f0 + ? _copy_from_user+0x29/0x60 + sock_sendmsg+0x5f/0x70 + +Signed-off-by: Showrya M N +Signed-off-by: Potnuri Bharat Teja +Link: https://lore.kernel.org/r/20250627112329.19763-1-showrya@chelsio.com +Reviewed-by: Chris Leech +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/libiscsi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c +index 6e811d753cb1..ee4e3feedd10 100644 +--- a/drivers/scsi/libiscsi.c ++++ b/drivers/scsi/libiscsi.c +@@ -3184,7 +3184,8 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size, + return NULL; + conn = cls_conn->dd_data; + +- conn->dd_data = cls_conn->dd_data + sizeof(*conn); ++ if (dd_size) ++ conn->dd_data = cls_conn->dd_data + sizeof(*conn); + conn->session = session; + conn->cls_conn = cls_conn; + conn->c_stage = ISCSI_CONN_INITIAL_STAGE; +-- +2.39.5 + diff --git a/queue-6.1/scsi-lpfc-check-for-hdwq-null-ptr-when-cleaning-up-l.patch b/queue-6.1/scsi-lpfc-check-for-hdwq-null-ptr-when-cleaning-up-l.patch new file mode 100644 index 0000000000..fd9e72d167 --- /dev/null +++ b/queue-6.1/scsi-lpfc-check-for-hdwq-null-ptr-when-cleaning-up-l.patch @@ -0,0 +1,44 @@ +From b84b1b2109e8bd9e5aa9b563a0eb3ea2e7956d8d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jun 2025 12:21:28 -0700 +Subject: scsi: lpfc: Check for hdwq null ptr when cleaning up lpfc_vport + structure + +From: Justin Tee + +[ Upstream commit 6698796282e828733cde3329c887b4ae9e5545e9 ] + +If a call to lpfc_sli4_read_rev() from lpfc_sli4_hba_setup() fails, the +resultant cleanup routine lpfc_sli4_vport_delete_fcp_xri_aborted() may +occur before sli4_hba.hdwqs are allocated. This may result in a null +pointer dereference when attempting to take the abts_io_buf_list_lock for +the first hardware queue. Fix by adding a null ptr check on +phba->sli4_hba.hdwq and early return because this situation means there +must have been an error during port initialization. + +Signed-off-by: Justin Tee +Link: https://lore.kernel.org/r/20250618192138.124116-4-justintee8345@gmail.com +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/lpfc/lpfc_scsi.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c +index ed32aa01c711..6d4777a5f3d4 100644 +--- a/drivers/scsi/lpfc/lpfc_scsi.c ++++ b/drivers/scsi/lpfc/lpfc_scsi.c +@@ -390,6 +390,10 @@ lpfc_sli4_vport_delete_fcp_xri_aborted(struct lpfc_vport *vport) + if (!(vport->cfg_enable_fc4_type & LPFC_ENABLE_FCP)) + return; + ++ /* may be called before queues established if hba_setup fails */ ++ if (!phba->sli4_hba.hdwq) ++ return; ++ + spin_lock_irqsave(&phba->hbalock, iflag); + for (idx = 0; idx < phba->cfg_hdw_queue; idx++) { + qp = &phba->sli4_hba.hdwq[idx]; +-- +2.39.5 + diff --git a/queue-6.1/scsi-mpi3mr-correctly-handle-ata-device-errors.patch b/queue-6.1/scsi-mpi3mr-correctly-handle-ata-device-errors.patch new file mode 100644 index 0000000000..ec2ce91f0e --- /dev/null +++ b/queue-6.1/scsi-mpi3mr-correctly-handle-ata-device-errors.patch @@ -0,0 +1,86 @@ +From af4991a44e14945d4d2e5e36bfdc7c511c6fa824 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 14:27:46 +0900 +Subject: scsi: mpi3mr: Correctly handle ATA device errors + +From: Damien Le Moal + +[ Upstream commit 04caad5a7ba86e830d04750417a15bad8ac2613c ] + +With the ATA error model, an NCQ command failure always triggers an abort +(termination) of all NCQ commands queued on the device. In such case, the +SAT or the host must handle the failed command according to the command +sense data and immediately retry all other NCQ commands that were aborted +due to the failed NCQ command. + +For SAS HBAs controlled by the mpi3mr driver, NCQ command aborts are not +handled by the HBA SAT and sent back to the host, with an ioc log +information equal to 0x31080000 (IOC_LOGINFO_PREFIX_PL with the PL code +PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR). The function +mpi3mr_process_op_reply_desc() always forces a retry of commands +terminated with the status MPI3_IOCSTATUS_SCSI_IOC_TERMINATED using the +SCSI result DID_SOFT_ERROR, regardless of the ioc_loginfo for the +command. This correctly forces the retry of collateral NCQ abort +commands, but with the retry counter for the command being incremented. +If a command to an ATA device is subject to too many retries due to other +NCQ commands failing (e.g. read commands trying to access unreadable +sectors), the collateral NCQ abort commands may be terminated with an +error as they run out of retries. This violates the SAT specification and +causes hard-to-debug command errors. + +Solve this issue by modifying the handling of the +MPI3_IOCSTATUS_SCSI_IOC_TERMINATED status to check if a command is for an +ATA device and if the command ioc_loginfo indicates an NCQ collateral +abort. If that is the case, force the command retry using the SCSI result +DID_IMM_RETRY to avoid incrementing the command retry count. + +Signed-off-by: Damien Le Moal +Link: https://lore.kernel.org/r/20250606052747.742998-2-dlemoal@kernel.org +Tested-by: Yafang Shao +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpi3mr/mpi3mr_os.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c +index 7bd24f71cc38..9dc14ed6567d 100644 +--- a/drivers/scsi/mpi3mr/mpi3mr_os.c ++++ b/drivers/scsi/mpi3mr/mpi3mr_os.c +@@ -42,6 +42,13 @@ static void mpi3mr_send_event_ack(struct mpi3mr_ioc *mrioc, u8 event, + + #define MPI3_EVENT_WAIT_FOR_DEVICES_TO_REFRESH (0xFFFE) + ++/* ++ * SAS Log info code for a NCQ collateral abort after an NCQ error: ++ * IOC_LOGINFO_PREFIX_PL | PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR ++ * See: drivers/message/fusion/lsi/mpi_log_sas.h ++ */ ++#define IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR 0x31080000 ++ + /** + * mpi3mr_host_tag_for_scmd - Get host tag for a scmd + * @mrioc: Adapter instance reference +@@ -3211,7 +3218,18 @@ void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc, + scmd->result = DID_NO_CONNECT << 16; + break; + case MPI3_IOCSTATUS_SCSI_IOC_TERMINATED: +- scmd->result = DID_SOFT_ERROR << 16; ++ if (ioc_loginfo == IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR) { ++ /* ++ * This is a ATA NCQ command aborted due to another NCQ ++ * command failure. We must retry this command ++ * immediately but without incrementing its retry ++ * counter. ++ */ ++ WARN_ON_ONCE(xfer_count != 0); ++ scmd->result = DID_IMM_RETRY << 16; ++ } else { ++ scmd->result = DID_SOFT_ERROR << 16; ++ } + break; + case MPI3_IOCSTATUS_SCSI_TASK_TERMINATED: + case MPI3_IOCSTATUS_SCSI_EXT_TERMINATED: +-- +2.39.5 + diff --git a/queue-6.1/scsi-mpt3sas-correctly-handle-ata-device-errors.patch b/queue-6.1/scsi-mpt3sas-correctly-handle-ata-device-errors.patch new file mode 100644 index 0000000000..f065b94059 --- /dev/null +++ b/queue-6.1/scsi-mpt3sas-correctly-handle-ata-device-errors.patch @@ -0,0 +1,85 @@ +From 921ad2d3cb7b5412363d095827999e1f702fc1bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 14:27:47 +0900 +Subject: scsi: mpt3sas: Correctly handle ATA device errors + +From: Damien Le Moal + +[ Upstream commit 15592a11d5a5c8411ac8494ec49736b658f6fbff ] + +With the ATA error model, an NCQ command failure always triggers an abort +(termination) of all NCQ commands queued on the device. In such case, the +SAT or the host must handle the failed command according to the command +sense data and immediately retry all other NCQ commands that were aborted +due to the failed NCQ command. + +For SAS HBAs controlled by the mpt3sas driver, NCQ command aborts are not +handled by the HBA SAT and sent back to the host, with an ioc log +information equal to 0x31080000 (IOC_LOGINFO_PREFIX_PL with the PL code +PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR). The function +_scsih_io_done() always forces a retry of commands terminated with the +status MPI2_IOCSTATUS_SCSI_IOC_TERMINATED using the SCSI result +DID_SOFT_ERROR, regardless of the log_info for the command. This +correctly forces the retry of collateral NCQ abort commands, but with the +retry counter for the command being incremented. If a command to an ATA +device is subject to too many retries due to other NCQ commands failing +(e.g. read commands trying to access unreadable sectors), the collateral +NCQ abort commands may be terminated with an error as they run out of +retries. This violates the SAT specification and causes hard-to-debug +command errors. + +Solve this issue by modifying the handling of the +MPI2_IOCSTATUS_SCSI_IOC_TERMINATED status to check if a command is for an +ATA device and if the command loginfo indicates an NCQ collateral +abort. If that is the case, force the command retry using the SCSI result +DID_IMM_RETRY to avoid incrementing the command retry count. + +Signed-off-by: Damien Le Moal +Link: https://lore.kernel.org/r/20250606052747.742998-3-dlemoal@kernel.org +Tested-by: Yafang Shao +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +index b5b77b82d69f..06c3ab0225d3 100644 +--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c ++++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +@@ -197,6 +197,14 @@ struct sense_info { + #define MPT3SAS_PORT_ENABLE_COMPLETE (0xFFFD) + #define MPT3SAS_ABRT_TASK_SET (0xFFFE) + #define MPT3SAS_REMOVE_UNRESPONDING_DEVICES (0xFFFF) ++ ++/* ++ * SAS Log info code for a NCQ collateral abort after an NCQ error: ++ * IOC_LOGINFO_PREFIX_PL | PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR ++ * See: drivers/message/fusion/lsi/mpi_log_sas.h ++ */ ++#define IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR 0x31080000 ++ + /** + * struct fw_event_work - firmware event struct + * @list: link list framework +@@ -5825,6 +5833,17 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) + scmd->result = DID_TRANSPORT_DISRUPTED << 16; + goto out; + } ++ if (log_info == IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR) { ++ /* ++ * This is a ATA NCQ command aborted due to another NCQ ++ * command failure. We must retry this command ++ * immediately but without incrementing its retry ++ * counter. ++ */ ++ WARN_ON_ONCE(xfer_cnt != 0); ++ scmd->result = DID_IMM_RETRY << 16; ++ break; ++ } + if (log_info == 0x31110630) { + if (scmd->retries > 2) { + scmd->result = DID_NO_CONNECT << 16; +-- +2.39.5 + diff --git a/queue-6.1/scsi-target-core-generate-correct-identifiers-for-pr.patch b/queue-6.1/scsi-target-core-generate-correct-identifiers-for-pr.patch new file mode 100644 index 0000000000..792d85303f --- /dev/null +++ b/queue-6.1/scsi-target-core-generate-correct-identifiers-for-pr.patch @@ -0,0 +1,237 @@ +From 4dc3502da435889c5fd4b826dd55ee5ff85e599f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Jul 2025 15:37:38 +0200 +Subject: scsi: target: core: Generate correct identifiers for PR OUT transport + IDs + +From: Maurizio Lombardi + +[ Upstream commit 6e0f6aa44b68335df404a2df955055f416b5f2aa ] + +Fix target_parse_pr_out_transport_id() to return a string representing +the transport ID in a human-readable format (e.g., naa.xxxxxxxx...) for +various SCSI protocol types (SAS, FCP, SRP, SBP). + +Previously, the function returned a pointer to the raw binary buffer, +which was incorrectly compared against human-readable strings, causing +comparisons to fail. Now, the function writes a properly formatted +string into a buffer provided by the caller. The output format depends +on the transport protocol: + +* SAS: 64-bit identifier, "naa." prefix. +* FCP: 64-bit identifier, colon separated values. +* SBP: 64-bit identifier, no prefix. +* SRP: 128-bit identifier, "0x" prefix. +* iSCSI: IQN string. + +Signed-off-by: Maurizio Lombardi +Link: https://lore.kernel.org/r/20250714133738.11054-1-mlombard@redhat.com +Reviewed-by: Dmitry Bogdanov +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_fabric_lib.c | 63 +++++++++++++++++++------ + drivers/target/target_core_internal.h | 4 +- + drivers/target/target_core_pr.c | 18 +++---- + 3 files changed, 60 insertions(+), 25 deletions(-) + +diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c +index 6600ae44f29d..d3ab251ba049 100644 +--- a/drivers/target/target_core_fabric_lib.c ++++ b/drivers/target/target_core_fabric_lib.c +@@ -257,11 +257,41 @@ static int iscsi_get_pr_transport_id_len( + return len; + } + +-static char *iscsi_parse_pr_out_transport_id( ++static void sas_parse_pr_out_transport_id(char *buf, char *i_str) ++{ ++ char hex[17] = {}; ++ ++ bin2hex(hex, buf + 4, 8); ++ snprintf(i_str, TRANSPORT_IQN_LEN, "naa.%s", hex); ++} ++ ++static void srp_parse_pr_out_transport_id(char *buf, char *i_str) ++{ ++ char hex[33] = {}; ++ ++ bin2hex(hex, buf + 8, 16); ++ snprintf(i_str, TRANSPORT_IQN_LEN, "0x%s", hex); ++} ++ ++static void fcp_parse_pr_out_transport_id(char *buf, char *i_str) ++{ ++ snprintf(i_str, TRANSPORT_IQN_LEN, "%8phC", buf + 8); ++} ++ ++static void sbp_parse_pr_out_transport_id(char *buf, char *i_str) ++{ ++ char hex[17] = {}; ++ ++ bin2hex(hex, buf + 8, 8); ++ snprintf(i_str, TRANSPORT_IQN_LEN, "%s", hex); ++} ++ ++static bool iscsi_parse_pr_out_transport_id( + struct se_portal_group *se_tpg, + char *buf, + u32 *out_tid_len, +- char **port_nexus_ptr) ++ char **port_nexus_ptr, ++ char *i_str) + { + char *p; + int i; +@@ -282,7 +312,7 @@ static char *iscsi_parse_pr_out_transport_id( + if ((format_code != 0x00) && (format_code != 0x40)) { + pr_err("Illegal format code: 0x%02x for iSCSI" + " Initiator Transport ID\n", format_code); +- return NULL; ++ return false; + } + /* + * If the caller wants the TransportID Length, we set that value for the +@@ -306,7 +336,7 @@ static char *iscsi_parse_pr_out_transport_id( + pr_err("Unable to locate \",i,0x\" separator" + " for Initiator port identifier: %s\n", + &buf[4]); +- return NULL; ++ return false; + } + *p = '\0'; /* Terminate iSCSI Name */ + p += 5; /* Skip over ",i,0x" separator */ +@@ -339,7 +369,8 @@ static char *iscsi_parse_pr_out_transport_id( + } else + *port_nexus_ptr = NULL; + +- return &buf[4]; ++ strscpy(i_str, &buf[4], TRANSPORT_IQN_LEN); ++ return true; + } + + int target_get_pr_transport_id_len(struct se_node_acl *nacl, +@@ -387,33 +418,35 @@ int target_get_pr_transport_id(struct se_node_acl *nacl, + } + } + +-const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg, +- char *buf, u32 *out_tid_len, char **port_nexus_ptr) ++bool target_parse_pr_out_transport_id(struct se_portal_group *tpg, ++ char *buf, u32 *out_tid_len, char **port_nexus_ptr, char *i_str) + { +- u32 offset; +- + switch (tpg->proto_id) { + case SCSI_PROTOCOL_SAS: + /* + * Assume the FORMAT CODE 00b from spc4r17, 7.5.4.7 TransportID + * for initiator ports using SCSI over SAS Serial SCSI Protocol. + */ +- offset = 4; ++ sas_parse_pr_out_transport_id(buf, i_str); + break; +- case SCSI_PROTOCOL_SBP: + case SCSI_PROTOCOL_SRP: ++ srp_parse_pr_out_transport_id(buf, i_str); ++ break; + case SCSI_PROTOCOL_FCP: +- offset = 8; ++ fcp_parse_pr_out_transport_id(buf, i_str); ++ break; ++ case SCSI_PROTOCOL_SBP: ++ sbp_parse_pr_out_transport_id(buf, i_str); + break; + case SCSI_PROTOCOL_ISCSI: + return iscsi_parse_pr_out_transport_id(tpg, buf, out_tid_len, +- port_nexus_ptr); ++ port_nexus_ptr, i_str); + default: + pr_err("Unknown proto_id: 0x%02x\n", tpg->proto_id); +- return NULL; ++ return false; + } + + *port_nexus_ptr = NULL; + *out_tid_len = 24; +- return buf + offset; ++ return true; + } +diff --git a/drivers/target/target_core_internal.h b/drivers/target/target_core_internal.h +index 85e35cf582e5..84a399a997d8 100644 +--- a/drivers/target/target_core_internal.h ++++ b/drivers/target/target_core_internal.h +@@ -104,8 +104,8 @@ int target_get_pr_transport_id_len(struct se_node_acl *nacl, + int target_get_pr_transport_id(struct se_node_acl *nacl, + struct t10_pr_registration *pr_reg, int *format_code, + unsigned char *buf); +-const char *target_parse_pr_out_transport_id(struct se_portal_group *tpg, +- char *buf, u32 *out_tid_len, char **port_nexus_ptr); ++bool target_parse_pr_out_transport_id(struct se_portal_group *tpg, ++ char *buf, u32 *out_tid_len, char **port_nexus_ptr, char *i_str); + + /* target_core_hba.c */ + struct se_hba *core_alloc_hba(const char *, u32, u32); +diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c +index a355661e8202..e0a6133bba98 100644 +--- a/drivers/target/target_core_pr.c ++++ b/drivers/target/target_core_pr.c +@@ -1477,11 +1477,12 @@ core_scsi3_decode_spec_i_port( + LIST_HEAD(tid_dest_list); + struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp; + unsigned char *buf, *ptr, proto_ident; +- const unsigned char *i_str = NULL; ++ unsigned char i_str[TRANSPORT_IQN_LEN]; + char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN]; + sense_reason_t ret; + u32 tpdl, tid_len = 0; + u32 dest_rtpi = 0; ++ bool tid_found; + + /* + * Allocate a struct pr_transport_id_holder and setup the +@@ -1570,9 +1571,9 @@ core_scsi3_decode_spec_i_port( + dest_rtpi = tmp_lun->lun_rtpi; + + iport_ptr = NULL; +- i_str = target_parse_pr_out_transport_id(tmp_tpg, +- ptr, &tid_len, &iport_ptr); +- if (!i_str) ++ tid_found = target_parse_pr_out_transport_id(tmp_tpg, ++ ptr, &tid_len, &iport_ptr, i_str); ++ if (!tid_found) + continue; + /* + * Determine if this SCSI device server requires that +@@ -3152,13 +3153,14 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, + struct t10_pr_registration *pr_reg, *pr_res_holder, *dest_pr_reg; + struct t10_reservation *pr_tmpl = &dev->t10_pr; + unsigned char *buf; +- const unsigned char *initiator_str; ++ unsigned char initiator_str[TRANSPORT_IQN_LEN]; + char *iport_ptr = NULL, i_buf[PR_REG_ISID_ID_LEN] = { }; + u32 tid_len, tmp_tid_len; + int new_reg = 0, type, scope, matching_iname; + sense_reason_t ret; + unsigned short rtpi; + unsigned char proto_ident; ++ bool tid_found; + + if (!se_sess || !se_lun) { + pr_err("SPC-3 PR: se_sess || struct se_lun is NULL!\n"); +@@ -3277,9 +3279,9 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, + ret = TCM_INVALID_PARAMETER_LIST; + goto out; + } +- initiator_str = target_parse_pr_out_transport_id(dest_se_tpg, +- &buf[24], &tmp_tid_len, &iport_ptr); +- if (!initiator_str) { ++ tid_found = target_parse_pr_out_transport_id(dest_se_tpg, ++ &buf[24], &tmp_tid_len, &iport_ptr, initiator_str); ++ if (!tid_found) { + pr_err("SPC-3 PR REGISTER_AND_MOVE: Unable to locate" + " initiator_str from Transport ID\n"); + ret = TCM_INVALID_PARAMETER_LIST; +-- +2.39.5 + diff --git a/queue-6.1/securityfs-don-t-pin-dentries-twice-once-is-enough.patch b/queue-6.1/securityfs-don-t-pin-dentries-twice-once-is-enough.patch new file mode 100644 index 0000000000..d952166977 --- /dev/null +++ b/queue-6.1/securityfs-don-t-pin-dentries-twice-once-is-enough.patch @@ -0,0 +1,44 @@ +From d54e69e4fe539fc06bb06924161c008bed463eec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 May 2025 23:38:01 -0400 +Subject: securityfs: don't pin dentries twice, once is enough... + +From: Al Viro + +[ Upstream commit 27cd1bf1240d482e4f02ca4f9812e748f3106e4f ] + +incidentally, securityfs_recursive_remove() is broken without that - +it leaks dentries, since simple_recursive_removal() does not expect +anything of that sort. It could be worked around by dput() in +remove_one() callback, but it's easier to just drop that double-get +stuff. + +Signed-off-by: Al Viro +Signed-off-by: Sasha Levin +--- + security/inode.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/security/inode.c b/security/inode.c +index 6c326939750d..e6e07787eec9 100644 +--- a/security/inode.c ++++ b/security/inode.c +@@ -159,7 +159,6 @@ static struct dentry *securityfs_create_dentry(const char *name, umode_t mode, + inode->i_fop = fops; + } + d_instantiate(dentry, inode); +- dget(dentry); + inode_unlock(dir); + return dentry; + +@@ -306,7 +305,6 @@ void securityfs_remove(struct dentry *dentry) + simple_rmdir(dir, dentry); + else + simple_unlink(dir, dentry); +- dput(dentry); + } + inode_unlock(dir); + simple_release_fs(&mount, &mount_count); +-- +2.39.5 + diff --git a/queue-6.1/selftests-bpf-fix-a-user_ringbuf-failure-with-arm64-.patch b/queue-6.1/selftests-bpf-fix-a-user_ringbuf-failure-with-arm64-.patch new file mode 100644 index 0000000000..e5c0e481b0 --- /dev/null +++ b/queue-6.1/selftests-bpf-fix-a-user_ringbuf-failure-with-arm64-.patch @@ -0,0 +1,59 @@ +From 138151c5d0c378aa43b7d5f15741e3cb8ed89332 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 18:36:26 -0700 +Subject: selftests/bpf: Fix a user_ringbuf failure with arm64 64KB page size + +From: Yonghong Song + +[ Upstream commit bbc7bd658ddc662083639b9e9a280b90225ecd9a ] + +The ringbuf max_entries must be PAGE_ALIGNED. See kernel function +ringbuf_map_alloc(). So for arm64 64KB page size, adjust max_entries +properly. + +Signed-off-by: Yonghong Song +Link: https://lore.kernel.org/r/20250607013626.1553001-1-yonghong.song@linux.dev +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/bpf/prog_tests/user_ringbuf.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c b/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c +index ca81d660eb96..5e88d37973c5 100644 +--- a/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c ++++ b/tools/testing/selftests/bpf/prog_tests/user_ringbuf.c +@@ -23,8 +23,7 @@ + static size_t log_buf_sz = 1 << 20; /* 1 MB */ + static char obj_log_buf[1048576]; + static const long c_sample_size = sizeof(struct sample) + BPF_RINGBUF_HDR_SZ; +-static const long c_ringbuf_size = 1 << 12; /* 1 small page */ +-static const long c_max_entries = c_ringbuf_size / c_sample_size; ++static long c_ringbuf_size, c_max_entries; + + static void drain_current_samples(void) + { +@@ -426,7 +425,9 @@ static void test_user_ringbuf_loop(void) + uint32_t remaining_samples = total_samples; + int err; + +- BUILD_BUG_ON(total_samples <= c_max_entries); ++ if (!ASSERT_LT(c_max_entries, total_samples, "compare_c_max_entries")) ++ return; ++ + err = load_skel_create_user_ringbuf(&skel, &ringbuf); + if (err) + return; +@@ -739,6 +740,9 @@ void test_user_ringbuf(void) + { + int i; + ++ c_ringbuf_size = getpagesize(); /* 1 page */ ++ c_max_entries = c_ringbuf_size / c_sample_size; ++ + for (i = 0; i < ARRAY_SIZE(success_tests); i++) { + if (!test__start_subtest(success_tests[i].test_name)) + continue; +-- +2.39.5 + diff --git a/queue-6.1/selftests-futex-define-sys_futex-on-32-bit-architect.patch b/queue-6.1/selftests-futex-define-sys_futex-on-32-bit-architect.patch new file mode 100644 index 0000000000..3d42b1d544 --- /dev/null +++ b/queue-6.1/selftests-futex-define-sys_futex-on-32-bit-architect.patch @@ -0,0 +1,52 @@ +From a557555a487c20352b99dc7439921ec0646ae62e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 18:36:30 +0800 +Subject: selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit + time_t + +From: Cynthia Huang + +[ Upstream commit 04850819c65c8242072818655d4341e70ae998b5 ] + +The kernel does not provide sys_futex() on 32-bit architectures that do not +support 32-bit time representations, such as riscv32. + +As a result, glibc cannot define SYS_futex, causing compilation failures in +tests that rely on this syscall. Define SYS_futex as SYS_futex_time64 in +such cases to ensure successful compilation and compatibility. + +Signed-off-by: Cynthia Huang +Signed-off-by: Ben Zong-You Xie +Signed-off-by: Thomas Gleixner +Reviewed-by: Muhammad Usama Anjum +Link: https://lore.kernel.org/all/20250710103630.3156130-1-ben717@andestech.com +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/futex/include/futextest.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h +index ddbcfc9b7bac..7a5fd1d5355e 100644 +--- a/tools/testing/selftests/futex/include/futextest.h ++++ b/tools/testing/selftests/futex/include/futextest.h +@@ -47,6 +47,17 @@ typedef volatile u_int32_t futex_t; + FUTEX_PRIVATE_FLAG) + #endif + ++/* ++ * SYS_futex is expected from system C library, in glibc some 32-bit ++ * architectures (e.g. RV32) are using 64-bit time_t, therefore it doesn't have ++ * SYS_futex defined but just SYS_futex_time64. Define SYS_futex as ++ * SYS_futex_time64 in this situation to ensure the compilation and the ++ * compatibility. ++ */ ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + /** + * futex() - SYS_futex syscall wrapper + * @uaddr: address of first futex +-- +2.39.5 + diff --git a/queue-6.1/selftests-tracing-use-mutex_unlock-for-testing-glob-.patch b/queue-6.1/selftests-tracing-use-mutex_unlock-for-testing-glob-.patch new file mode 100644 index 0000000000..410a3c962f --- /dev/null +++ b/queue-6.1/selftests-tracing-use-mutex_unlock-for-testing-glob-.patch @@ -0,0 +1,41 @@ +From 0d6596b4951e0569ef0a370b26edb9fa08ef0447 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Jul 2025 13:26:43 +0900 +Subject: selftests: tracing: Use mutex_unlock for testing glob filter + +From: Masami Hiramatsu (Google) + +[ Upstream commit a089bb2822a49b0c5777a8936f82c1f8629231fb ] + +Since commit c5b6ababd21a ("locking/mutex: implement +mutex_trylock_nested") makes mutex_trylock() as an inlined +function if CONFIG_DEBUG_LOCK_ALLOC=y, we can not use +mutex_trylock() for testing the glob filter of ftrace. + +Use mutex_unlock instead. + +Link: https://lore.kernel.org/r/175151680309.2149615.9795104805153538717.stgit@mhiramat.tok.corp.google.com +Signed-off-by: Masami Hiramatsu (Google) +Acked-by: Steven Rostedt (Google) +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + .../testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc +index 4b994b6df5ac..ed81eaf2afd6 100644 +--- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc ++++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc +@@ -29,7 +29,7 @@ ftrace_filter_check 'schedule*' '^schedule.*$' + ftrace_filter_check '*pin*lock' '.*pin.*lock$' + + # filter by start*mid* +-ftrace_filter_check 'mutex*try*' '^mutex.*try.*' ++ftrace_filter_check 'mutex*unl*' '^mutex.*unl.*' + + # Advanced full-glob matching feature is recently supported. + # Skip the tests if we are sure the kernel does not support it. +-- +2.39.5 + diff --git a/queue-6.1/series b/queue-6.1/series index c1c590bc03..8097adbf16 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -46,3 +46,194 @@ kvm-vmx-wrap-all-accesses-to-ia32_debugctl-with-gett.patch kvm-vmx-preserve-host-s-debugctlmsr_freeze_in_smm-wh.patch udp-also-consider-secpath-when-evaluating-ipsec-use-.patch netfilter-ctnetlink-fix-refcount-leak-on-table-dump.patch +hfs-fix-slab-out-of-bounds-in-hfs_bnode_read.patch +hfsplus-fix-slab-out-of-bounds-in-hfsplus_bnode_read.patch +hfsplus-fix-slab-out-of-bounds-read-in-hfsplus_uni2a.patch +hfsplus-don-t-use-bug_on-in-hfsplus_create_attribute.patch +arm64-handle-kcov-__init-vs-inline-mismatches.patch +smb-server-avoid-deadlock-when-linking-with-replacei.patch +udf-verify-partition-map-count.patch +drbd-add-missing-kref_get-in-handle_write_conflicts.patch +hfs-fix-not-erasing-deleted-b-tree-node-issue.patch +better-lockdep-annotations-for-simple_recursive_remo.patch +ata-libata-sata-disallow-changing-lpm-state-if-not-s.patch +fs-ntfs3-add-sanity-check-for-file-name.patch +fs-ntfs3-correctly-create-symlink-for-relative-path.patch +ext2-handle-fiemap-on-empty-files-to-prevent-einval.patch +fix-locking-in-efi_secret_unlink.patch +securityfs-don-t-pin-dentries-twice-once-is-enough.patch +usb-xhci-print-xhci-xhc_state-when-queue_command-fai.patch +cpufreq-cppc-mark-driver-with-need_update_limits-fla.patch +selftests-futex-define-sys_futex-on-32-bit-architect.patch +usb-typec-ucsi-psy-set-current-max-to-100ma-for-bc-1.patch +usb-xhci-avoid-showing-warnings-for-dying-controller.patch +usb-xhci-set-avg_trb_len-8-for-ep0-during-address-de.patch +usb-xhci-avoid-showing-errors-during-surprise-remova.patch +remoteproc-imx_rproc-skip-clock-enable-when-m-core-i.patch +gpio-wcd934x-check-the-return-value-of-regmap_update.patch +cpufreq-exit-governor-when-failed-to-start-old-gover.patch +arm-rockchip-fix-kernel-hang-during-smp-initializati.patch +pm-devfreq-governor-replace-sscanf-with-kstrtoul-in-.patch +edac-synopsys-clear-the-ecc-counters-on-init.patch +asoc-soc-dapm-set-bias_level-if-snd_soc_dapm_set_bia.patch +thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch +tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch +iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch +gpio-tps65912-check-the-return-value-of-regmap_updat.patch +arm-tegra-use-i-o-memcpy-to-write-to-iram.patch +tools-build-fix-s390-x-cross-compilation-with-clang.patch +selftests-tracing-use-mutex_unlock-for-testing-glob-.patch +acpi-prm-reduce-unnecessary-printing-to-avoid-user-c.patch +pm-runtime-clear-power.needs_force_resume-in-pm_runt.patch +thermal-sysfs-return-enodata-instead-of-eagain-for-r.patch +pm-sleep-console-fix-the-black-screen-issue.patch +acpi-processor-fix-acpi_object-initialization.patch +mmc-sdhci-msm-ensure-sd-card-power-isn-t-on-when-car.patch +acpi-apei-ghes-add-taint_machine_check-on-ghes-panic.patch +pps-clients-gpio-fix-interrupt-handling-order-in-rem.patch +reset-brcmstb-enable-reset-drivers-for-arch_bcm2835.patch +mei-bus-check-for-still-connected-devices-in-mei_cl_.patch +mmc-rtsx_usb_sdmmc-fix-error-path-in-sd_set_power_mo.patch +alsa-hda-handle-the-jack-polling-always-via-a-work.patch +alsa-hda-disable-jack-polling-at-shutdown.patch +x86-bugs-avoid-warning-when-overriding-return-thunk.patch +asoc-hdac_hdmi-rate-limit-logging-on-connection-and-.patch +alsa-intel8x0-fix-incorrect-codec-index-usage-in-mix.patch +asoc-core-check-for-rtd-null-in-snd_soc_remove_pcm_r.patch +usb-typec-intel_pmc_mux-defer-probe-if-scu-ipc-isn-t.patch +usb-core-usb_submit_urb-downgrade-type-check.patch +pm-cpupower-fix-the-snapshot-order-of-tsc-mperf-cloc.patch +platform-x86-thinkpad_acpi-handle-kcov-__init-vs-inl.patch +platform-chrome-cros_ec_typec-defer-probe-on-missing.patch +alsa-hda-ca0132-fix-buffer-overflow-in-add_tuning_co.patch +alsa-pcm-rewrite-recalculate_boundary-to-avoid-costl.patch +alsa-usb-audio-avoid-precedence-issues-in-mixer_quir.patch +iio-adc-ad7768-1-ensure-sync_in-pulse-minimum-timing.patch +asoc-codecs-rt5640-retry-device_id-verification.patch +bootconfig-fix-unaligned-access-when-building-footer.patch +xen-netfront-fix-tx-response-spurious-interrupts.patch +net-usb-cdc-ncm-check-for-filtering-capability.patch +ktest.pl-prevent-recursion-of-default-variable-optio.patch +wifi-cfg80211-reject-htc-bit-for-management-frames.patch +s390-time-use-monotonic-clock-in-get_cycles.patch +be2net-use-correct-byte-order-and-format-string-for-.patch +wifi-rtw89-lower-the-timeout-in-rtw89_fw_read_c2h_re.patch +et131x-add-missing-check-after-dma-map.patch +net-ag71xx-add-missing-check-after-dma-map.patch +net-mlx5e-properly-access-rcu-protected-qdisc_sleepi.patch +arm64-mark-kernel-as-tainted-on-sae-and-serror-panic.patch +rcu-protect-defer_qs_iw_pending-from-data-race.patch +can-ti_hecc-fix-woverflow-compiler-warning.patch +net-mctp-prevent-duplicate-binds.patch +wifi-cfg80211-fix-interface-type-validation.patch +net-ipv4-fix-incorrect-mtu-in-broadcast-routes.patch +net-thunderx-fix-format-truncation-warning-in-bgx_ac.patch +um-re-evaluate-thread-flags-repeatedly.patch +wifi-iwlwifi-mvm-fix-scan-request-validation.patch +s390-stp-remove-udelay-from-stp_sync_clock.patch +sched-fair-bump-sd-max_newidle_lb_cost-when-newidle-.patch +wifi-mac80211-don-t-complete-management-tx-on-sae-co.patch +powerpc-512-fix-possible-dma_unmap_single-on-uniniti.patch +ipv6-mcast-check-inet6_dev-dead-under-idev-mc_lock-i.patch +drm-msm-use-trylock-for-debugfs.patch +wifi-rtw89-fix-rtw89_mac_power_switch-for-usb.patch +wifi-rtw89-disable-deep-power-saving-for-usb-sdio.patch +kselftest-arm64-specify-sve-data-when-testing-vl-set.patch +net-thunderbolt-enable-end-to-end-flow-control-also-.patch +net-thunderbolt-fix-the-parameter-passing-of-tb_xdom.patch +net-atlantic-add-set_power-to-fw_ops-for-atl2-to-fix.patch +net-fec-allow-disable-coalescing.patch +drm-amd-display-separate-set_gsl-from-set_gsl_source.patch +wifi-iwlwifi-dvm-fix-potential-overflow-in-rs_fill_l.patch +wifi-iwlwifi-fw-fix-possible-memory-leak-in-iwl_fw_d.patch +drm-amd-display-fix-failed-to-blank-crtc.patch +wifi-mac80211-update-radar_required-in-channel-conte.patch +wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch +powerpc-floppy-add-missing-checks-after-dma-map.patch +netmem-fix-skb_frag_address_safe-with-unreadable-skb.patch +wifi-iwlegacy-check-rate_idx-range-after-addition.patch +neighbour-add-support-for-nud_permanent-proxy-entrie.patch +dpaa_eth-don-t-use-fixed_phy_change_carrier.patch +drm-amd-allow-printing-vangogh-od-sclk-levels-withou.patch +net-vlan-replace-bug-with-warn_on_once-in-vlan_dev_-.patch +gve-return-error-for-unknown-admin-queue-command.patch +net-dsa-b53-fix-b53_imp_vlan_setup-for-bcm5325.patch +net-dsa-b53-prevent-gmii_port_override_ctrl-access-o.patch +net-dsa-b53-prevent-dis_learning-access-on-bcm5325.patch +net-dsa-b53-prevent-switch_ctrl-access-on-bcm5325.patch +ptp-use-ratelimite-for-freerun-error-message.patch +wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch-21064 +ionic-clean-dbpage-in-de-init.patch +net-ncsi-fix-buffer-overflow-in-fetching-version-id.patch +drm-ttm-should-to-return-the-evict-error.patch +uapi-in6-restore-visibility-of-most-ipv6-socket-opti.patch +selftests-bpf-fix-a-user_ringbuf-failure-with-arm64-.patch +drm-ttm-respect-the-shrinker-core-free-target.patch +net-dsa-b53-fix-ip_multicast_ctrl-on-bcm5325.patch +vsock-virtio-resize-receive-buffers-so-that-each-skb.patch +vhost-fail-early-when-__vhost_add_used-fails.patch +drm-amd-display-only-finalize-atomic_obj-if-it-was-i.patch +watchdog-sbsa-adjust-keepalive-timeout-to-avoid-medi.patch +cifs-fix-calling-cifsfindfirst-for-root-path-without.patch +fbdev-fix-potential-buffer-overflow-in-do_register_f.patch +crypto-hisilicon-hpre-fix-dma-unmap-sequence.patch +ext4-do-not-bug-when-inline_data_fl-lacks-system.dat.patch +scsi-libiscsi-initialize-iscsi_conn-dd_data-only-if-.patch +fs-orangefs-use-snprintf-instead-of-sprintf.patch +watchdog-dw_wdt-fix-default-timeout.patch +hwmon-emc2305-set-initial-pwm-minimum-value-during-p.patch +mips-vpe-mt-add-missing-prototypes-for-vpe_-alloc-st.patch +watchdog-itco_wdt-report-error-if-timeout-configurat.patch +scsi-bfa-double-free-fix.patch +jfs-truncate-good-inode-pages-when-hard-link-is-0.patch +jfs-regular-file-corruption-check.patch +jfs-upper-bound-check-of-tree-index-in-dballocag.patch +mips-don-t-crash-in-stack_top-for-tasks-without-abi-.patch +mips-lantiq-falcon-sysctrl-fix-request-memory-check-.patch +media-v4l2-common-reduce-warnings-about-missing-v4l2.patch +leds-leds-lp50xx-handle-reg-to-get-correct-multi_ind.patch +dmaengine-stm32-dma-configure-next-sg-only-if-there-.patch +rdma-hfi1-fix-possible-divide-by-zero-in-find_hw_thr.patch +rdma-core-reduce-stack-using-in-nldev_stat_get_doit.patch +scsi-lpfc-check-for-hdwq-null-ptr-when-cleaning-up-l.patch +scsi-mpt3sas-correctly-handle-ata-device-errors.patch +scsi-mpi3mr-correctly-handle-ata-device-errors.patch +pinctrl-stm32-manage-irq-affinity-settings.patch +media-tc358743-check-i2c-succeeded-during-probe.patch +media-tc358743-return-an-appropriate-colorspace-from.patch +media-tc358743-increase-fifo-trigger-level-to-374.patch +media-usb-hdpvr-disable-zero-length-read-messages.patch +media-dvb-frontends-dib7090p-fix-null-ptr-deref-in-d.patch +media-dvb-frontends-w7090p-fix-null-ptr-deref-in-w70.patch +media-uvcvideo-fix-bandwidth-issue-for-alcor-camera.patch +crypto-octeontx2-add-timeout-for-load_fvc-completion.patch +md-dm-zoned-target-initialize-return-variable-r-to-a.patch +module-prevent-silent-truncation-of-module-name-in-d.patch +i3c-add-missing-include-to-internal-header.patch +rtc-ds1307-handle-oscillator-stop-flag-osf-for-ds134.patch +i3c-don-t-fail-if-gethdrcap-is-unsupported.patch +i3c-master-initialize-ret-in-i3c_i2c_notifier_call.patch +dm-mpath-don-t-print-the-loaded-message-if-registeri.patch +dm-table-fix-checking-for-rq-stackable-devices.patch +apparmor-use-the-condition-in-aa_bug_fmt-even-with-d.patch +i2c-force-dll0945-touchpad-i2c-freq-to-100khz.patch +kconfig-lxdialog-replace-strcpy-with-strncpy-in-inpu.patch +vfio-type1-conditional-rescheduling-while-pinning.patch +kconfig-nconf-ensure-null-termination-where-strncpy-.patch +scsi-fix-sas_user_scan-to-handle-wildcard-and-multi-.patch +scsi-target-core-generate-correct-identifiers-for-pr.patch +scsi-aacraid-stop-using-pci_irq_affinity.patch +vfio-mlx5-fix-possible-overflow-in-tracking-max-mess.patch +ipmi-use-dev_warn_ratelimited-for-incorrect-message-.patch +kconfig-gconf-avoid-hardcoding-model2-in-on_treeview.patch +kconfig-gconf-fix-potential-memory-leak-in-renderer_.patch +kconfig-lxdialog-fix-space-to-de-select-options.patch +ipmi-fix-strcpy-source-and-destination-the-same.patch +net-phy-smsc-add-proper-reset-flags-for-lan8710a.patch +asoc-intel-avs-fix-uninitialized-pointer-error-in-pr.patch +block-avoid-possible-overflow-for-chunk_sectors-chec.patch +pnfs-fix-stripe-mapping-in-block-scsi-layout.patch +pnfs-fix-disk-addr-range-check-in-block-scsi-layout.patch +pnfs-handle-rpc-size-limit-for-layoutcommits.patch +pnfs-fix-uninited-ptr-deref-in-block-scsi-layout.patch +rtc-ds1307-remove-clear-of-oscillator-stop-flag-osf-.patch diff --git a/queue-6.1/smb-server-avoid-deadlock-when-linking-with-replacei.patch b/queue-6.1/smb-server-avoid-deadlock-when-linking-with-replacei.patch new file mode 100644 index 0000000000..a950948965 --- /dev/null +++ b/queue-6.1/smb-server-avoid-deadlock-when-linking-with-replacei.patch @@ -0,0 +1,82 @@ +From 02ad5a2f2db51749241205a8b0842de09592707e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 09:35:09 +1000 +Subject: smb/server: avoid deadlock when linking with ReplaceIfExists + +From: NeilBrown + +[ Upstream commit d5fc1400a34b4ea5e8f2ce296ea12bf8c8421694 ] + +If smb2_create_link() is called with ReplaceIfExists set and the name +does exist then a deadlock will happen. + +ksmbd_vfs_kern_path_locked() will return with success and the parent +directory will be locked. ksmbd_vfs_remove_file() will then remove the +file. ksmbd_vfs_link() will then be called while the parent is still +locked. It will try to lock the same parent and will deadlock. + +This patch moves the ksmbd_vfs_kern_path_unlock() call to *before* +ksmbd_vfs_link() and then simplifies the code, removing the file_present +flag variable. + +Signed-off-by: NeilBrown +Acked-by: Namjae Jeon +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/smb/server/smb2pdu.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c +index 3e2cd22fb2bd..7943b2ee2a76 100644 +--- a/fs/smb/server/smb2pdu.c ++++ b/fs/smb/server/smb2pdu.c +@@ -5648,7 +5648,6 @@ static int smb2_create_link(struct ksmbd_work *work, + { + char *link_name = NULL, *target_name = NULL, *pathname = NULL; + struct path path, parent_path; +- bool file_present = false; + int rc; + + if (buf_len < (u64)sizeof(struct smb2_file_link_info) + +@@ -5681,11 +5680,8 @@ static int smb2_create_link(struct ksmbd_work *work, + if (rc) { + if (rc != -ENOENT) + goto out; +- } else +- file_present = true; +- +- if (file_info->ReplaceIfExists) { +- if (file_present) { ++ } else { ++ if (file_info->ReplaceIfExists) { + rc = ksmbd_vfs_remove_file(work, &path); + if (rc) { + rc = -EINVAL; +@@ -5693,21 +5689,17 @@ static int smb2_create_link(struct ksmbd_work *work, + link_name); + goto out; + } +- } +- } else { +- if (file_present) { ++ } else { + rc = -EEXIST; + ksmbd_debug(SMB, "link already exists\n"); + goto out; + } ++ ksmbd_vfs_kern_path_unlock(&parent_path, &path); + } +- + rc = ksmbd_vfs_link(work, target_name, link_name); + if (rc) + rc = -EINVAL; + out: +- if (file_present) +- ksmbd_vfs_kern_path_unlock(&parent_path, &path); + + if (!IS_ERR(link_name)) + kfree(link_name); +-- +2.39.5 + diff --git a/queue-6.1/thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch b/queue-6.1/thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch new file mode 100644 index 0000000000..a514278ba8 --- /dev/null +++ b/queue-6.1/thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch @@ -0,0 +1,156 @@ +From cae7d5be1fad7ab2dfc3065d7ca54061a3f15f0e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Jul 2025 15:45:51 -0700 +Subject: thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when + required + +From: David Collins + +[ Upstream commit f8e157ff2df46ddabd930815d196895976227831 ] + +Certain TEMP_ALARM GEN2 PMIC peripherals need over-temperature stage 2 +automatic PMIC partial shutdown. This will ensure that in the event of +reaching the hotter stage 3 over-temperature threshold, repeated faults +will be avoided during the automatic PMIC hardware full shutdown. +Modify the stage 2 shutdown control logic to ensure that stage 2 +shutdown is enabled on all affected PMICs. Read the digital major +and minor revision registers to identify these PMICs. + +Signed-off-by: David Collins +Signed-off-by: Anjelique Melendez +Link: https://lore.kernel.org/r/20250710224555.3047790-2-anjelique.melendez@oss.qualcomm.com +Signed-off-by: Daniel Lezcano +Signed-off-by: Sasha Levin +--- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 43 ++++++++++++++++----- + 1 file changed, 34 insertions(+), 9 deletions(-) + +diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +index ad84978109e6..ccd082bf6fdc 100644 +--- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c ++++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c +@@ -1,6 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-only + /* + * Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights reserved. ++ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + + #include +@@ -18,6 +19,7 @@ + #include "../thermal_core.h" + #include "../thermal_hwmon.h" + ++#define QPNP_TM_REG_DIG_MINOR 0x00 + #define QPNP_TM_REG_DIG_MAJOR 0x01 + #define QPNP_TM_REG_TYPE 0x04 + #define QPNP_TM_REG_SUBTYPE 0x05 +@@ -33,7 +35,7 @@ + #define STATUS_GEN2_STATE_MASK GENMASK(6, 4) + #define STATUS_GEN2_STATE_SHIFT 4 + +-#define SHUTDOWN_CTRL1_OVERRIDE_S2 BIT(6) ++#define SHUTDOWN_CTRL1_OVERRIDE_STAGE2 BIT(6) + #define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0) + + #define SHUTDOWN_CTRL1_RATE_25HZ BIT(3) +@@ -81,6 +83,7 @@ struct qpnp_tm_chip { + /* protects .thresh, .stage and chip registers */ + struct mutex lock; + bool initialized; ++ bool require_stage2_shutdown; + + struct iio_channel *adc; + const long (*temp_map)[THRESH_COUNT][STAGE_COUNT]; +@@ -223,13 +226,13 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, + { + long stage2_threshold_min = (*chip->temp_map)[THRESH_MIN][1]; + long stage2_threshold_max = (*chip->temp_map)[THRESH_MAX][1]; +- bool disable_s2_shutdown = false; ++ bool disable_stage2_shutdown = false; + u8 reg; + + WARN_ON(!mutex_is_locked(&chip->lock)); + + /* +- * Default: S2 and S3 shutdown enabled, thresholds at ++ * Default: Stage 2 and Stage 3 shutdown enabled, thresholds at + * lowest threshold set, monitoring at 25Hz + */ + reg = SHUTDOWN_CTRL1_RATE_25HZ; +@@ -244,12 +247,12 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, + chip->thresh = THRESH_MAX - + ((stage2_threshold_max - temp) / + TEMP_THRESH_STEP); +- disable_s2_shutdown = true; ++ disable_stage2_shutdown = true; + } else { + chip->thresh = THRESH_MAX; + + if (chip->adc) +- disable_s2_shutdown = true; ++ disable_stage2_shutdown = true; + else + dev_warn(chip->dev, + "No ADC is configured and critical temperature %d mC is above the maximum stage 2 threshold of %ld mC! Configuring stage 2 shutdown at %ld mC.\n", +@@ -258,8 +261,8 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, + + skip: + reg |= chip->thresh; +- if (disable_s2_shutdown) +- reg |= SHUTDOWN_CTRL1_OVERRIDE_S2; ++ if (disable_stage2_shutdown && !chip->require_stage2_shutdown) ++ reg |= SHUTDOWN_CTRL1_OVERRIDE_STAGE2; + + return qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg); + } +@@ -373,8 +376,8 @@ static int qpnp_tm_probe(struct platform_device *pdev) + { + struct qpnp_tm_chip *chip; + struct device_node *node; +- u8 type, subtype, dig_major; +- u32 res; ++ u8 type, subtype, dig_major, dig_minor; ++ u32 res, dig_revision; + int ret, irq; + + node = pdev->dev.of_node; +@@ -429,6 +432,11 @@ static int qpnp_tm_probe(struct platform_device *pdev) + return ret; + } + ++ ret = qpnp_tm_read(chip, QPNP_TM_REG_DIG_MINOR, &dig_minor); ++ if (ret < 0) ++ return dev_err_probe(&pdev->dev, ret, ++ "could not read dig_minor\n"); ++ + if (type != QPNP_TM_TYPE || (subtype != QPNP_TM_SUBTYPE_GEN1 + && subtype != QPNP_TM_SUBTYPE_GEN2)) { + dev_err(&pdev->dev, "invalid type 0x%02x or subtype 0x%02x\n", +@@ -442,6 +450,23 @@ static int qpnp_tm_probe(struct platform_device *pdev) + else + chip->temp_map = &temp_map_gen1; + ++ if (chip->subtype == QPNP_TM_SUBTYPE_GEN2) { ++ dig_revision = (dig_major << 8) | dig_minor; ++ /* ++ * Check if stage 2 automatic partial shutdown must remain ++ * enabled to avoid potential repeated faults upon reaching ++ * over-temperature stage 3. ++ */ ++ switch (dig_revision) { ++ case 0x0001: ++ case 0x0002: ++ case 0x0100: ++ case 0x0101: ++ chip->require_stage2_shutdown = true; ++ break; ++ } ++ } ++ + /* + * Register the sensor before initializing the hardware to be able to + * read the trip points. get_temp() returns the default temperature +-- +2.39.5 + diff --git a/queue-6.1/thermal-sysfs-return-enodata-instead-of-eagain-for-r.patch b/queue-6.1/thermal-sysfs-return-enodata-instead-of-eagain-for-r.patch new file mode 100644 index 0000000000..f9c868a892 --- /dev/null +++ b/queue-6.1/thermal-sysfs-return-enodata-instead-of-eagain-for-r.patch @@ -0,0 +1,53 @@ +From 4ccf90333de689ff4b850b9ac335a123d95ad9a9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Jun 2025 10:41:43 +0000 +Subject: thermal: sysfs: Return ENODATA instead of EAGAIN for reads + +From: Hsin-Te Yuan + +[ Upstream commit 1a4aabc27e95674837f2e25f4ef340c0469e6203 ] + +According to POSIX spec, EAGAIN returned by read with O_NONBLOCK set +means the read would block. Hence, the common implementation in +nonblocking model will poll the file when the nonblocking read returns +EAGAIN. However, when the target file is thermal zone, this mechanism +will totally malfunction because thermal zone doesn't implement sysfs +notification and thus the poll will never return. + +For example, the read in Golang implemnts such method and sometimes +hangs at reading some thermal zones via sysfs. + +Change to return -ENODATA instead of -EAGAIN to userspace. + +Signed-off-by: Hsin-Te Yuan +Link: https://patch.msgid.link/20250620-temp-v3-1-6becc6aeb66c@chromium.org +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/thermal/thermal_sysfs.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c +index bd7596125461..7ee89e99acbf 100644 +--- a/drivers/thermal/thermal_sysfs.c ++++ b/drivers/thermal/thermal_sysfs.c +@@ -39,10 +39,13 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf) + + ret = thermal_zone_get_temp(tz, &temperature); + +- if (ret) +- return ret; ++ if (!ret) ++ return sprintf(buf, "%d\n", temperature); + +- return sprintf(buf, "%d\n", temperature); ++ if (ret == -EAGAIN) ++ return -ENODATA; ++ ++ return ret; + } + + static ssize_t +-- +2.39.5 + diff --git a/queue-6.1/tools-build-fix-s390-x-cross-compilation-with-clang.patch b/queue-6.1/tools-build-fix-s390-x-cross-compilation-with-clang.patch new file mode 100644 index 0000000000..c65bd03313 --- /dev/null +++ b/queue-6.1/tools-build-fix-s390-x-cross-compilation-with-clang.patch @@ -0,0 +1,44 @@ +From cfbd29840ea92fe4d9932926cbb272266f6af9de Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Jun 2025 13:00:27 +0200 +Subject: tools/build: Fix s390(x) cross-compilation with clang +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Weißschuh + +[ Upstream commit a40f0cdce78be8a559ee8a85c908049c65a410b2 ] + +The heuristic to derive a clang target triple from a GCC one does not work +for s390. GCC uses "s390-linux" while clang expects "s390x-linux" or +"powerz-linux". + +Add an explicit override. + +Signed-off-by: Thomas Weißschuh +Link: https://lore.kernel.org/r/20250620-tools-cross-s390-v2-1-ecda886e00e5@linutronix.de +Signed-off-by: Thomas Weißschuh +Signed-off-by: Sasha Levin +--- + tools/scripts/Makefile.include | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include +index 0efb8f2b33ce..5607e2405a72 100644 +--- a/tools/scripts/Makefile.include ++++ b/tools/scripts/Makefile.include +@@ -98,7 +98,9 @@ else ifneq ($(CROSS_COMPILE),) + # Allow userspace to override CLANG_CROSS_FLAGS to specify their own + # sysroots and flags or to avoid the GCC call in pure Clang builds. + ifeq ($(CLANG_CROSS_FLAGS),) +-CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) ++CLANG_TARGET := $(notdir $(CROSS_COMPILE:%-=%)) ++CLANG_TARGET := $(subst s390-linux,s390x-linux,$(CLANG_TARGET)) ++CLANG_CROSS_FLAGS := --target=$(CLANG_TARGET) + GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null)) + ifneq ($(GCC_TOOLCHAIN_DIR),) + CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) +-- +2.39.5 + diff --git a/queue-6.1/tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch b/queue-6.1/tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch new file mode 100644 index 0000000000..ecb809691f --- /dev/null +++ b/queue-6.1/tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch @@ -0,0 +1,54 @@ +From a69438a1d7bdf211e88a3da9deb0d6f3939acb36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 12 Jul 2025 11:00:55 +0200 +Subject: tools/nolibc: define time_t in terms of __kernel_old_time_t +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Weißschuh + +[ Upstream commit d5094bcb5bfdfea2cf0de8aaf77cc65db56cbdb5 ] + +Nolibc assumes that the kernel ABI is using a time values that are as +large as a long integer. For most ABIs this holds true. +But for x32 this is not correct, as it uses 32bit longs but 64bit times. + +Also the 'struct stat' implementation of nolibc relies on timespec::tv_sec +and time_t being the same type. While timespec::tv_sec comes from the +kernel and is of type __kernel_old_time_t, time_t is defined within nolibc. + +Switch to the __kernel_old_time_t to always get the correct type. + +Signed-off-by: Thomas Weißschuh +Link: https://lore.kernel.org/r/20250712-nolibc-x32-v1-1-6d81cb798710@weissschuh.net +Acked-by: Willy Tarreau +Signed-off-by: Sasha Levin +--- + tools/include/nolibc/std.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h +index 1747ae125392..a0ea830e1ba1 100644 +--- a/tools/include/nolibc/std.h ++++ b/tools/include/nolibc/std.h +@@ -33,6 +33,8 @@ typedef unsigned long uintptr_t; + typedef signed long intptr_t; + typedef signed long ptrdiff_t; + ++#include ++ + /* those are commonly provided by sys/types.h */ + typedef unsigned int dev_t; + typedef unsigned long ino_t; +@@ -44,6 +46,6 @@ typedef unsigned long nlink_t; + typedef signed long off_t; + typedef signed long blksize_t; + typedef signed long blkcnt_t; +-typedef signed long time_t; ++typedef __kernel_old_time_t time_t; + + #endif /* _NOLIBC_STD_H */ +-- +2.39.5 + diff --git a/queue-6.1/uapi-in6-restore-visibility-of-most-ipv6-socket-opti.patch b/queue-6.1/uapi-in6-restore-visibility-of-most-ipv6-socket-opti.patch new file mode 100644 index 0000000000..b4864cedf8 --- /dev/null +++ b/queue-6.1/uapi-in6-restore-visibility-of-most-ipv6-socket-opti.patch @@ -0,0 +1,102 @@ +From 2940f3947ece862a5d21a32189120dbe178cecb4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 07:39:33 -0700 +Subject: uapi: in6: restore visibility of most IPv6 socket options +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jakub Kicinski + +[ Upstream commit 31557b3487b349464daf42bc4366153743c1e727 ] + +A decade ago commit 6d08acd2d32e ("in6: fix conflict with glibc") +hid the definitions of IPV6 options, because GCC was complaining +about duplicates. The commit did not list the warnings seen, but +trying to recreate them now I think they are (building iproute2): + +In file included from ./include/uapi/rdma/rdma_user_cm.h:39, + from rdma.h:16, + from res.h:9, + from res-ctx.c:7: +../include/uapi/linux/in6.h:171:9: warning: ‘IPV6_ADD_MEMBERSHIP’ redefined + 171 | #define IPV6_ADD_MEMBERSHIP 20 + | ^~~~~~~~~~~~~~~~~~~ +In file included from /usr/include/netinet/in.h:37, + from rdma.h:13: +/usr/include/bits/in.h:233:10: note: this is the location of the previous definition + 233 | # define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP + | ^~~~~~~~~~~~~~~~~~~ +../include/uapi/linux/in6.h:172:9: warning: ‘IPV6_DROP_MEMBERSHIP’ redefined + 172 | #define IPV6_DROP_MEMBERSHIP 21 + | ^~~~~~~~~~~~~~~~~~~~ +/usr/include/bits/in.h:234:10: note: this is the location of the previous definition + 234 | # define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP + | ^~~~~~~~~~~~~~~~~~~~ + +Compilers don't complain about redefinition if the defines +are identical, but here we have the kernel using the literal +value, and glibc using an indirection (defining to a name +of another define, with the same numerical value). + +Problem is, the commit in question hid all the IPV6 socket +options, and glibc has a pretty sparse list. For instance +it lacks Flow Label related options. Willem called this out +in commit 3fb321fde22d ("selftests/net: ipv6 flowlabel"): + + /* uapi/glibc weirdness may leave this undefined */ + #ifndef IPV6_FLOWINFO + #define IPV6_FLOWINFO 11 + #endif + +More interestingly some applications (socat) use +a #ifdef IPV6_FLOWINFO to gate compilation of thier +rudimentary flow label support. (For added confusion +socat misspells it as IPV4_FLOWINFO in some places.) + +Hide only the two defines we know glibc has a problem +with. If we discover more warnings we can hide more +but we should avoid covering the entire block of +defines for "IPV6 socket options". + +Link: https://patch.msgid.link/20250609143933.1654417-1-kuba@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/uapi/linux/in6.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h +index ff8d21f9e95b..5a47339ef7d7 100644 +--- a/include/uapi/linux/in6.h ++++ b/include/uapi/linux/in6.h +@@ -152,7 +152,6 @@ struct in6_flowlabel_req { + /* + * IPV6 socket options + */ +-#if __UAPI_DEF_IPV6_OPTIONS + #define IPV6_ADDRFORM 1 + #define IPV6_2292PKTINFO 2 + #define IPV6_2292HOPOPTS 3 +@@ -169,8 +168,10 @@ struct in6_flowlabel_req { + #define IPV6_MULTICAST_IF 17 + #define IPV6_MULTICAST_HOPS 18 + #define IPV6_MULTICAST_LOOP 19 ++#if __UAPI_DEF_IPV6_OPTIONS + #define IPV6_ADD_MEMBERSHIP 20 + #define IPV6_DROP_MEMBERSHIP 21 ++#endif + #define IPV6_ROUTER_ALERT 22 + #define IPV6_MTU_DISCOVER 23 + #define IPV6_MTU 24 +@@ -203,7 +204,6 @@ struct in6_flowlabel_req { + #define IPV6_IPSEC_POLICY 34 + #define IPV6_XFRM_POLICY 35 + #define IPV6_HDRINCL 36 +-#endif + + /* + * Multicast: +-- +2.39.5 + diff --git a/queue-6.1/udf-verify-partition-map-count.patch b/queue-6.1/udf-verify-partition-map-count.patch new file mode 100644 index 0000000000..58fe8c1c85 --- /dev/null +++ b/queue-6.1/udf-verify-partition-map-count.patch @@ -0,0 +1,54 @@ +From 88b434b46684dd690d35b5e64403465c5b78db44 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Jul 2025 19:01:20 +0200 +Subject: udf: Verify partition map count + +From: Jan Kara + +[ Upstream commit 1a11201668e8635602577dcf06f2e96c591d8819 ] + +Verify that number of partition maps isn't insanely high which can lead +to large allocation in udf_sb_alloc_partition_maps(). All partition maps +have to fit in the LVD which is in a single block. + +Reported-by: syzbot+478f2c1a6f0f447a46bb@syzkaller.appspotmail.com +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/udf/super.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/fs/udf/super.c b/fs/udf/super.c +index fa790be4f19f..a186d2418b50 100644 +--- a/fs/udf/super.c ++++ b/fs/udf/super.c +@@ -1410,7 +1410,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, + struct genericPartitionMap *gpm; + uint16_t ident; + struct buffer_head *bh; +- unsigned int table_len; ++ unsigned int table_len, part_map_count; + int ret; + + bh = udf_read_tagged(sb, block, block, &ident); +@@ -1431,7 +1431,16 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, + "logical volume"); + if (ret) + goto out_bh; +- ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps)); ++ ++ part_map_count = le32_to_cpu(lvd->numPartitionMaps); ++ if (part_map_count > table_len / sizeof(struct genericPartitionMap1)) { ++ udf_err(sb, "error loading logical volume descriptor: " ++ "Too many partition maps (%u > %u)\n", part_map_count, ++ table_len / (unsigned)sizeof(struct genericPartitionMap1)); ++ ret = -EIO; ++ goto out_bh; ++ } ++ ret = udf_sb_alloc_partition_maps(sb, part_map_count); + if (ret) + goto out_bh; + +-- +2.39.5 + diff --git a/queue-6.1/um-re-evaluate-thread-flags-repeatedly.patch b/queue-6.1/um-re-evaluate-thread-flags-repeatedly.patch new file mode 100644 index 0000000000..15ac28a33d --- /dev/null +++ b/queue-6.1/um-re-evaluate-thread-flags-repeatedly.patch @@ -0,0 +1,78 @@ +From 3d4862d20d35daca79c34c15d22f413844687255 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Jul 2025 14:34:47 +0200 +Subject: um: Re-evaluate thread flags repeatedly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Thomas Weißschuh + +[ Upstream commit b9e2f2246eb2b5617d53af7b5e4e1b8c916f26a8 ] + +The thread flags may change during their processing. +For example a task_work can queue a new signal to be sent. +This signal should be delivered before returning to usespace again. + +Evaluate the flags repeatedly similar to other architectures. + +Signed-off-by: Thomas Weißschuh +Reviewed-by: Nam Cao +Link: https://patch.msgid.link/20250704-uml-thread_flags-v1-1-0e293fd8d627@linutronix.de +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + arch/um/include/asm/thread_info.h | 4 ++++ + arch/um/kernel/process.c | 20 ++++++++++++-------- + 2 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h +index c7b4b49826a2..40d823f36c09 100644 +--- a/arch/um/include/asm/thread_info.h ++++ b/arch/um/include/asm/thread_info.h +@@ -68,7 +68,11 @@ static inline struct thread_info *current_thread_info(void) + #define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL) + #define _TIF_MEMDIE (1 << TIF_MEMDIE) + #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) ++#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) + #define _TIF_SECCOMP (1 << TIF_SECCOMP) + #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) + ++#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL | \ ++ _TIF_NOTIFY_RESUME) ++ + #endif +diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c +index c5281ce31685..d8c274d99390 100644 +--- a/arch/um/kernel/process.c ++++ b/arch/um/kernel/process.c +@@ -97,14 +97,18 @@ void *__switch_to(struct task_struct *from, struct task_struct *to) + void interrupt_end(void) + { + struct pt_regs *regs = ¤t->thread.regs; +- +- if (need_resched()) +- schedule(); +- if (test_thread_flag(TIF_SIGPENDING) || +- test_thread_flag(TIF_NOTIFY_SIGNAL)) +- do_signal(regs); +- if (test_thread_flag(TIF_NOTIFY_RESUME)) +- resume_user_mode_work(regs); ++ unsigned long thread_flags; ++ ++ thread_flags = read_thread_flags(); ++ while (thread_flags & _TIF_WORK_MASK) { ++ if (thread_flags & _TIF_NEED_RESCHED) ++ schedule(); ++ if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) ++ do_signal(regs); ++ if (thread_flags & _TIF_NOTIFY_RESUME) ++ resume_user_mode_work(regs); ++ thread_flags = read_thread_flags(); ++ } + } + + int get_current_pid(void) +-- +2.39.5 + diff --git a/queue-6.1/usb-core-usb_submit_urb-downgrade-type-check.patch b/queue-6.1/usb-core-usb_submit_urb-downgrade-type-check.patch new file mode 100644 index 0000000000..7a40dcd696 --- /dev/null +++ b/queue-6.1/usb-core-usb_submit_urb-downgrade-type-check.patch @@ -0,0 +1,40 @@ +From 226d082287283b2471dc4195d36032dec09fea88 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 12 Jun 2025 14:20:25 +0200 +Subject: usb: core: usb_submit_urb: downgrade type check + +From: Oliver Neukum + +[ Upstream commit 503bbde34cc3dd2acd231f277ba70c3f9ed22e59 ] + +Checking for the endpoint type is no reason for a WARN, as that can +cause a reboot. A driver not checking the endpoint type must not cause a +reboot, as there is just no point in this. We cannot prevent a device +from doing something incorrect as a reaction to a transfer. Hence +warning for a mere assumption being wrong is not sensible. + +Signed-off-by: Oliver Neukum +Acked-by: Alan Stern +Link: https://lore.kernel.org/r/20250612122149.2559724-1-oneukum@suse.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/core/urb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c +index 9f3c54032556..64f6592b27ce 100644 +--- a/drivers/usb/core/urb.c ++++ b/drivers/usb/core/urb.c +@@ -501,7 +501,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) + + /* Check that the pipe's type matches the endpoint's type */ + if (usb_pipe_type_check(urb->dev, urb->pipe)) +- dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n", ++ dev_warn_once(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n", + usb_pipetype(urb->pipe), pipetypes[xfertype]); + + /* Check against a simple/standard policy */ +-- +2.39.5 + diff --git a/queue-6.1/usb-typec-intel_pmc_mux-defer-probe-if-scu-ipc-isn-t.patch b/queue-6.1/usb-typec-intel_pmc_mux-defer-probe-if-scu-ipc-isn-t.patch new file mode 100644 index 0000000000..bacce8fc40 --- /dev/null +++ b/queue-6.1/usb-typec-intel_pmc_mux-defer-probe-if-scu-ipc-isn-t.patch @@ -0,0 +1,40 @@ +From d9bffee3d9a37dcf1426a67055d8d389dab20f71 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 17:40:58 +0200 +Subject: usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present + +From: Tomasz Michalec + +[ Upstream commit df9a825f330e76c72d1985bc9bdc4b8981e3d15f ] + +If pmc_usb_probe is called before SCU IPC is registered, pmc_usb_probe +will fail. + +Return -EPROBE_DEFER when pmc_usb_probe doesn't get SCU IPC device, so +the probe function can be called again after SCU IPC is initialized. + +Signed-off-by: Tomasz Michalec +Reviewed-by: Heikki Krogerus +Link: https://lore.kernel.org/r/20250610154058.1859812-1-tmichalec@google.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/typec/mux/intel_pmc_mux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c +index 87e2c9130607..a6936fc59d1e 100644 +--- a/drivers/usb/typec/mux/intel_pmc_mux.c ++++ b/drivers/usb/typec/mux/intel_pmc_mux.c +@@ -667,7 +667,7 @@ static int pmc_usb_probe(struct platform_device *pdev) + + pmc->ipc = devm_intel_scu_ipc_dev_get(&pdev->dev); + if (!pmc->ipc) +- return -ENODEV; ++ return -EPROBE_DEFER; + + pmc->dev = &pdev->dev; + +-- +2.39.5 + diff --git a/queue-6.1/usb-typec-ucsi-psy-set-current-max-to-100ma-for-bc-1.patch b/queue-6.1/usb-typec-ucsi-psy-set-current-max-to-100ma-for-bc-1.patch new file mode 100644 index 0000000000..f3ac1f4b10 --- /dev/null +++ b/queue-6.1/usb-typec-ucsi-psy-set-current-max-to-100ma-for-bc-1.patch @@ -0,0 +1,68 @@ +From ab2214e309242ed6287942e645a8ac033b080a6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 20:08:05 +0000 +Subject: usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and + Default + +From: Benson Leung + +[ Upstream commit af833e7f7db3cf4c82f063668e1b52297a30ec18 ] + +ucsi_psy_get_current_max would return 0mA as the maximum current if +UCSI detected a BC or a Default USB Power sporce. + +The comment in this function is true that we can't tell the difference +between DCP/CDP or SDP chargers, but we can guarantee that at least 1-unit +of USB 1.1/2.0 power is available, which is 100mA, which is a better +fallback value than 0, which causes some userspaces, including the ChromeOS +power manager, to regard this as a power source that is not providing +any power. + +In reality, 100mA is guaranteed from all sources in these classes. + +Signed-off-by: Benson Leung +Reviewed-by: Jameson Thies +Reviewed-by: Heikki Krogerus +Reviewed-by: Sebastian Reichel +Link: https://lore.kernel.org/r/20250717200805.3710473-1-bleung@chromium.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/typec/ucsi/psy.c | 2 +- + drivers/usb/typec/ucsi/ucsi.h | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c +index b35c6e07911e..9b0157063df0 100644 +--- a/drivers/usb/typec/ucsi/psy.c ++++ b/drivers/usb/typec/ucsi/psy.c +@@ -163,7 +163,7 @@ static int ucsi_psy_get_current_max(struct ucsi_connector *con, + case UCSI_CONSTAT_PWR_OPMODE_DEFAULT: + /* UCSI can't tell b/w DCP/CDP or USB2/3x1/3x2 SDP chargers */ + default: +- val->intval = 0; ++ val->intval = UCSI_TYPEC_DEFAULT_CURRENT * 1000; + break; + } + return 0; +diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h +index 793a8307dded..0167239cdcd4 100644 +--- a/drivers/usb/typec/ucsi/ucsi.h ++++ b/drivers/usb/typec/ucsi/ucsi.h +@@ -313,9 +313,10 @@ struct ucsi { + #define UCSI_MAX_SVID 5 + #define UCSI_MAX_ALTMODES (UCSI_MAX_SVID * 6) + +-#define UCSI_TYPEC_VSAFE5V 5000 +-#define UCSI_TYPEC_1_5_CURRENT 1500 +-#define UCSI_TYPEC_3_0_CURRENT 3000 ++#define UCSI_TYPEC_VSAFE5V 5000 ++#define UCSI_TYPEC_DEFAULT_CURRENT 100 ++#define UCSI_TYPEC_1_5_CURRENT 1500 ++#define UCSI_TYPEC_3_0_CURRENT 3000 + + struct ucsi_connector { + int num; +-- +2.39.5 + diff --git a/queue-6.1/usb-xhci-avoid-showing-errors-during-surprise-remova.patch b/queue-6.1/usb-xhci-avoid-showing-errors-during-surprise-remova.patch new file mode 100644 index 0000000000..45f228fc5f --- /dev/null +++ b/queue-6.1/usb-xhci-avoid-showing-errors-during-surprise-remova.patch @@ -0,0 +1,60 @@ +From 52200a94d69075f41d8cbc080f8b2a2f7e3aa884 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 10:31:05 +0300 +Subject: usb: xhci: Avoid showing errors during surprise removal + +From: Mario Limonciello + +[ Upstream commit 4b9c60e440525b729ac5f071e00bcee12e0a7e84 ] + +When a USB4 dock is unplugged from a system it won't respond to ring +events. The PCI core handles the surprise removal event and notifies +all PCI drivers. The XHCI PCI driver sets a flag that the device is +being removed as well. + +When that flag is set don't show messages in the cleanup path for +marking the controller dead. + +Signed-off-by: Mario Limonciello +Signed-off-by: Mathias Nyman +Acked-by: Mathias Nyman +Link: https://lore.kernel.org/r/20250717073107.488599-2-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-ring.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index c4880b22f359..c8e1ead0c09e 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -1289,12 +1289,15 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci, + */ + void xhci_hc_died(struct xhci_hcd *xhci) + { ++ bool notify; + int i, j; + + if (xhci->xhc_state & XHCI_STATE_DYING) + return; + +- xhci_err(xhci, "xHCI host controller not responding, assume dead\n"); ++ notify = !(xhci->xhc_state & XHCI_STATE_REMOVING); ++ if (notify) ++ xhci_err(xhci, "xHCI host controller not responding, assume dead\n"); + xhci->xhc_state |= XHCI_STATE_DYING; + + xhci_cleanup_command_queue(xhci); +@@ -1308,7 +1311,7 @@ void xhci_hc_died(struct xhci_hcd *xhci) + } + + /* inform usb core hc died if PCI remove isn't already handling it */ +- if (!(xhci->xhc_state & XHCI_STATE_REMOVING)) ++ if (notify) + usb_hc_died(xhci_to_hcd(xhci)); + } + +-- +2.39.5 + diff --git a/queue-6.1/usb-xhci-avoid-showing-warnings-for-dying-controller.patch b/queue-6.1/usb-xhci-avoid-showing-warnings-for-dying-controller.patch new file mode 100644 index 0000000000..c212658399 --- /dev/null +++ b/queue-6.1/usb-xhci-avoid-showing-warnings-for-dying-controller.patch @@ -0,0 +1,55 @@ +From daa2ee088235a9edf7ed2ac42909915b7e38d50c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 10:31:06 +0300 +Subject: usb: xhci: Avoid showing warnings for dying controller + +From: Mario Limonciello + +[ Upstream commit 65fc0fc137b5da3ee1f4ca4f61050fcb203d7582 ] + +When a USB4 dock is unplugged from a system it won't respond to ring +events. The PCI core handles the surprise removal event and notifies +all PCI drivers. The XHCI PCI driver sets a flag that the device is +being removed, and when the device stops responding a flag is also +added to indicate it's dying. + +When that flag is set don't bother to show warnings about a missing +controller. + +Signed-off-by: Mario Limonciello +Signed-off-by: Mathias Nyman +Acked-by: Mathias Nyman +Link: https://lore.kernel.org/r/20250717073107.488599-3-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c +index e726c5edee03..a5ce544860b8 100644 +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -119,7 +119,8 @@ int xhci_halt(struct xhci_hcd *xhci) + ret = xhci_handshake(&xhci->op_regs->status, + STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC); + if (ret) { +- xhci_warn(xhci, "Host halt failed, %d\n", ret); ++ if (!(xhci->xhc_state & XHCI_STATE_DYING)) ++ xhci_warn(xhci, "Host halt failed, %d\n", ret); + return ret; + } + +@@ -178,7 +179,8 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us) + state = readl(&xhci->op_regs->status); + + if (state == ~(u32)0) { +- xhci_warn(xhci, "Host not accessible, reset failed.\n"); ++ if (!(xhci->xhc_state & XHCI_STATE_DYING)) ++ xhci_warn(xhci, "Host not accessible, reset failed.\n"); + return -ENODEV; + } + +-- +2.39.5 + diff --git a/queue-6.1/usb-xhci-print-xhci-xhc_state-when-queue_command-fai.patch b/queue-6.1/usb-xhci-print-xhci-xhc_state-when-queue_command-fai.patch new file mode 100644 index 0000000000..78cf5dbacb --- /dev/null +++ b/queue-6.1/usb-xhci-print-xhci-xhc_state-when-queue_command-fai.patch @@ -0,0 +1,42 @@ +From ad6adcc42275a5990d85dd62616eaa94ff220c2d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Jul 2025 14:01:18 +0800 +Subject: usb: xhci: print xhci->xhc_state when queue_command failed + +From: Su Hui + +[ Upstream commit 7919407eca2ef562fa6c98c41cfdf6f6cdd69d92 ] + +When encounters some errors like these: +xhci_hcd 0000:4a:00.2: xHCI dying or halted, can't queue_command +xhci_hcd 0000:4a:00.2: FIXME: allocate a command ring segment +usb usb5-port6: couldn't allocate usb_device + +It's hard to know whether xhc_state is dying or halted. So it's better +to print xhc_state's value which can help locate the resaon of the bug. + +Signed-off-by: Su Hui +Link: https://lore.kernel.org/r/20250725060117.1773770-1-suhui@nfschina.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-ring.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index 0862fdd3e568..c4880b22f359 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -4421,7 +4421,8 @@ static int queue_command(struct xhci_hcd *xhci, struct xhci_command *cmd, + + if ((xhci->xhc_state & XHCI_STATE_DYING) || + (xhci->xhc_state & XHCI_STATE_HALTED)) { +- xhci_dbg(xhci, "xHCI dying or halted, can't queue_command\n"); ++ xhci_dbg(xhci, "xHCI dying or halted, can't queue_command. state: 0x%x\n", ++ xhci->xhc_state); + return -ESHUTDOWN; + } + +-- +2.39.5 + diff --git a/queue-6.1/usb-xhci-set-avg_trb_len-8-for-ep0-during-address-de.patch b/queue-6.1/usb-xhci-set-avg_trb_len-8-for-ep0-during-address-de.patch new file mode 100644 index 0000000000..d66400b282 --- /dev/null +++ b/queue-6.1/usb-xhci-set-avg_trb_len-8-for-ep0-during-address-de.patch @@ -0,0 +1,61 @@ +From b73a93cc940fb5c665e61b93fe1e1debff12d0f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 10:31:07 +0300 +Subject: usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command + +From: Jay Chen + +[ Upstream commit f72b9aa821a2bfe4b6dfec4be19f264d0673b008 ] + +There is a subtle contradiction between sections of the xHCI 1.2 spec +regarding the initialization of Input Endpoint Context fields. Section +4.8.2 ("Endpoint Context Initialization") states that all fields should +be initialized to 0. However, Section 6.2.3 ("Endpoint Context", p.453) +specifies that the Average TRB Length (avg_trb_len) field shall be +greater than 0, and explicitly notes (p.454): "Software shall set +Average TRB Length to '8' for control endpoints." + +Strictly setting all fields to 0 during initialization conflicts with +the specific recommendation for control endpoints. In practice, setting +avg_trb_len = 0 is not meaningful for the hardware/firmware, as the +value is used for bandwidth calculation. + +Motivation: Our company is developing a custom Virtual xHC hardware +platform that strictly follows the xHCI spec and its recommendations. +During validation, we observed that enumeration fails and a parameter +error (TRB Completion Code = 5) is reported if avg_trb_len for EP0 is +not set to 8 as recommended by Section 6.2.3. This demonstrates the +importance of assigning a meaningful, non-zero value to avg_trb_len, +even in virtualized or emulated environments. + +This patch explicitly sets avg_trb_len to 8 for EP0 in +xhci_setup_addressable_virt_dev(), as recommended in Section 6.2.3, to +prevent potential issues with xHCI host controllers that enforce the +spec strictly. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=220033 +Signed-off-by: Jay Chen +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20250717073107.488599-4-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-mem.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c +index 537a0bc0f5e1..57f739f93321 100644 +--- a/drivers/usb/host/xhci-mem.c ++++ b/drivers/usb/host/xhci-mem.c +@@ -1200,6 +1200,8 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud + ep0_ctx->deq = cpu_to_le64(dev->eps[0].ring->first_seg->dma | + dev->eps[0].ring->cycle_state); + ++ ep0_ctx->tx_info = cpu_to_le32(EP_AVG_TRB_LENGTH(8)); ++ + trace_xhci_setup_addressable_virt_device(dev); + + /* Steps 7 and 8 were done in xhci_alloc_virt_device() */ +-- +2.39.5 + diff --git a/queue-6.1/vfio-mlx5-fix-possible-overflow-in-tracking-max-mess.patch b/queue-6.1/vfio-mlx5-fix-possible-overflow-in-tracking-max-mess.patch new file mode 100644 index 0000000000..54050bb595 --- /dev/null +++ b/queue-6.1/vfio-mlx5-fix-possible-overflow-in-tracking-max-mess.patch @@ -0,0 +1,46 @@ +From aea96c66364a617eeb5357d86cd60a202e304ea4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Jul 2025 14:40:17 +0000 +Subject: vfio/mlx5: fix possible overflow in tracking max message size + +From: Artem Sadovnikov + +[ Upstream commit b3060198483bac43ec113c62ae3837076f61f5de ] + +MLX cap pg_track_log_max_msg_size consists of 5 bits, value of which is +used as power of 2 for max_msg_size. This can lead to multiplication +overflow between max_msg_size (u32) and integer constant, and afterwards +incorrect value is being written to rq_size. + +Fix this issue by extending integer constant to u64 type. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Suggested-by: Alex Williamson +Signed-off-by: Artem Sadovnikov +Reviewed-by: Yishai Hadas +Link: https://lore.kernel.org/r/20250701144017.2410-2-a.sadovnikov@ispras.ru +Signed-off-by: Alex Williamson +Signed-off-by: Sasha Levin +--- + drivers/vfio/pci/mlx5/cmd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/vfio/pci/mlx5/cmd.c b/drivers/vfio/pci/mlx5/cmd.c +index 3f93b5c3f099..06794c48170c 100644 +--- a/drivers/vfio/pci/mlx5/cmd.c ++++ b/drivers/vfio/pci/mlx5/cmd.c +@@ -1127,8 +1127,8 @@ int mlx5vf_start_page_tracker(struct vfio_device *vdev, + log_max_msg_size = MLX5_CAP_ADV_VIRTUALIZATION(mdev, pg_track_log_max_msg_size); + max_msg_size = (1ULL << log_max_msg_size); + /* The RQ must hold at least 4 WQEs/messages for successful QP creation */ +- if (rq_size < 4 * max_msg_size) +- rq_size = 4 * max_msg_size; ++ if (rq_size < 4ULL * max_msg_size) ++ rq_size = 4ULL * max_msg_size; + + memset(tracker, 0, sizeof(*tracker)); + tracker->uar = mlx5_get_uars_page(mdev); +-- +2.39.5 + diff --git a/queue-6.1/vfio-type1-conditional-rescheduling-while-pinning.patch b/queue-6.1/vfio-type1-conditional-rescheduling-while-pinning.patch new file mode 100644 index 0000000000..507b5eced6 --- /dev/null +++ b/queue-6.1/vfio-type1-conditional-rescheduling-while-pinning.patch @@ -0,0 +1,74 @@ +From b691063a748acca601ce4406be571da1afbc63e2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 11:46:22 -0700 +Subject: vfio/type1: conditional rescheduling while pinning + +From: Keith Busch + +[ Upstream commit b1779e4f209c7ff7e32f3c79d69bca4e3a3a68b6 ] + +A large DMA mapping request can loop through dma address pinning for +many pages. In cases where THP can not be used, the repeated vmf_insert_pfn can +be costly, so let the task reschedule as need to prevent CPU stalls. Failure to +do so has potential harmful side effects, like increased memory pressure +as unrelated rcu tasks are unable to make their reclaim callbacks and +result in OOM conditions. + + rcu: INFO: rcu_sched self-detected stall on CPU + rcu: 36-....: (20999 ticks this GP) idle=b01c/1/0x4000000000000000 softirq=35839/35839 fqs=3538 + rcu: hardirqs softirqs csw/system + rcu: number: 0 107 0 + rcu: cputime: 50 0 10446 ==> 10556(ms) + rcu: (t=21075 jiffies g=377761 q=204059 ncpus=384) +... + + ? asm_sysvec_apic_timer_interrupt+0x16/0x20 + ? walk_system_ram_range+0x63/0x120 + ? walk_system_ram_range+0x46/0x120 + ? pgprot_writethrough+0x20/0x20 + lookup_memtype+0x67/0xf0 + track_pfn_insert+0x20/0x40 + vmf_insert_pfn_prot+0x88/0x140 + vfio_pci_mmap_huge_fault+0xf9/0x1b0 [vfio_pci_core] + __do_fault+0x28/0x1b0 + handle_mm_fault+0xef1/0x2560 + fixup_user_fault+0xf5/0x270 + vaddr_get_pfns+0x169/0x2f0 [vfio_iommu_type1] + vfio_pin_pages_remote+0x162/0x8e0 [vfio_iommu_type1] + vfio_iommu_type1_ioctl+0x1121/0x1810 [vfio_iommu_type1] + ? futex_wake+0x1c1/0x260 + x64_sys_call+0x234/0x17a0 + do_syscall_64+0x63/0x130 + ? exc_page_fault+0x63/0x130 + entry_SYSCALL_64_after_hwframe+0x4b/0x53 + +Signed-off-by: Keith Busch +Reviewed-by: Paul E. McKenney +Link: https://lore.kernel.org/r/20250715184622.3561598-1-kbusch@meta.com +Signed-off-by: Alex Williamson +Signed-off-by: Sasha Levin +--- + drivers/vfio/vfio_iommu_type1.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c +index 26fac124231f..888f7eeb3d6a 100644 +--- a/drivers/vfio/vfio_iommu_type1.c ++++ b/drivers/vfio/vfio_iommu_type1.c +@@ -692,6 +692,13 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr, + + while (npage) { + if (!batch->size) { ++ /* ++ * Large mappings may take a while to repeatedly refill ++ * the batch, so conditionally relinquish the CPU when ++ * needed to avoid stalls. ++ */ ++ cond_resched(); ++ + /* Empty batch, so refill it. */ + long req_pages = min_t(long, npage, batch->capacity); + +-- +2.39.5 + diff --git a/queue-6.1/vhost-fail-early-when-__vhost_add_used-fails.patch b/queue-6.1/vhost-fail-early-when-__vhost_add_used-fails.patch new file mode 100644 index 0000000000..0c5cb531dd --- /dev/null +++ b/queue-6.1/vhost-fail-early-when-__vhost_add_used-fails.patch @@ -0,0 +1,43 @@ +From 67c8fba0ecb096a8c25ad69e0947a2ac4ffe89f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Jul 2025 16:47:53 +0800 +Subject: vhost: fail early when __vhost_add_used() fails +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jason Wang + +[ Upstream commit b4ba1207d45adaafa2982c035898b36af2d3e518 ] + +This patch fails vhost_add_used_n() early when __vhost_add_used() +fails to make sure used idx is not updated with stale used ring +information. + +Reported-by: Eugenio Pérez +Signed-off-by: Jason Wang +Message-Id: <20250714084755.11921-2-jasowang@redhat.com> +Signed-off-by: Michael S. Tsirkin +Tested-by: Lei Yang +Signed-off-by: Sasha Levin +--- + drivers/vhost/vhost.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c +index 1b00ed5ef1cf..0db46b016004 100644 +--- a/drivers/vhost/vhost.c ++++ b/drivers/vhost/vhost.c +@@ -2426,6 +2426,9 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, + } + r = __vhost_add_used_n(vq, heads, count); + ++ if (r < 0) ++ return r; ++ + /* Make sure buffer is written before we update index. */ + smp_wmb(); + if (vhost_put_used_idx(vq)) { +-- +2.39.5 + diff --git a/queue-6.1/vsock-virtio-resize-receive-buffers-so-that-each-skb.patch b/queue-6.1/vsock-virtio-resize-receive-buffers-so-that-each-skb.patch new file mode 100644 index 0000000000..1f16d148f0 --- /dev/null +++ b/queue-6.1/vsock-virtio-resize-receive-buffers-so-that-each-skb.patch @@ -0,0 +1,66 @@ +From 3bbdf4c515b984930c6f1d8e81f4b87f568b2ef8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 10:01:11 +0100 +Subject: vsock/virtio: Resize receive buffers so that each SKB fits in a 4K + page + +From: Will Deacon + +[ Upstream commit 03a92f036a04fed2b00d69f5f46f1a486e70dc5c ] + +When allocating receive buffers for the vsock virtio RX virtqueue, an +SKB is allocated with a 4140 data payload (the 44-byte packet header + +VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE). Even when factoring in the SKB +overhead, the resulting 8KiB allocation thanks to the rounding in +kmalloc_reserve() is wasteful (~3700 unusable bytes) and results in a +higher-order page allocation on systems with 4KiB pages just for the +sake of a few hundred bytes of packet data. + +Limit the vsock virtio RX buffers to 4KiB per SKB, resulting in much +better memory utilisation and removing the need to allocate higher-order +pages entirely. + +Reviewed-by: Stefano Garzarella +Signed-off-by: Will Deacon +Message-Id: <20250717090116.11987-5-will@kernel.org> +Signed-off-by: Michael S. Tsirkin +Signed-off-by: Sasha Levin +--- + include/linux/virtio_vsock.h | 7 ++++++- + net/vmw_vsock/virtio_transport.c | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h +index 3f9c16611306..689e9fc50e1b 100644 +--- a/include/linux/virtio_vsock.h ++++ b/include/linux/virtio_vsock.h +@@ -110,7 +110,12 @@ static inline size_t virtio_vsock_skb_len(struct sk_buff *skb) + return (size_t)(skb_end_pointer(skb) - skb->head); + } + +-#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE (1024 * 4) ++/* Dimension the RX SKB so that the entire thing fits exactly into ++ * a single 4KiB page. This avoids wasting memory due to alloc_skb() ++ * rounding up to the next page order and also means that we ++ * don't leave higher-order pages sitting around in the RX queue. ++ */ ++#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE SKB_WITH_OVERHEAD(1024 * 4) + #define VIRTIO_VSOCK_MAX_BUF_SIZE 0xFFFFFFFFUL + #define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE (1024 * 64) + +diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c +index 5434c9f11d28..e2cd69c127f9 100644 +--- a/net/vmw_vsock/virtio_transport.c ++++ b/net/vmw_vsock/virtio_transport.c +@@ -221,7 +221,7 @@ virtio_transport_cancel_pkt(struct vsock_sock *vsk) + + static void virtio_vsock_rx_fill(struct virtio_vsock *vsock) + { +- int total_len = VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE + VIRTIO_VSOCK_SKB_HEADROOM; ++ int total_len = VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE; + struct scatterlist pkt, *p; + struct virtqueue *vq; + struct sk_buff *skb; +-- +2.39.5 + diff --git a/queue-6.1/watchdog-dw_wdt-fix-default-timeout.patch b/queue-6.1/watchdog-dw_wdt-fix-default-timeout.patch new file mode 100644 index 0000000000..d62cd4a06a --- /dev/null +++ b/queue-6.1/watchdog-dw_wdt-fix-default-timeout.patch @@ -0,0 +1,43 @@ +From 7938b3c2f23e4a1fb3ac41beda6db22c53f1361c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Jul 2025 18:55:02 +0200 +Subject: watchdog: dw_wdt: Fix default timeout + +From: Sebastian Reichel + +[ Upstream commit ac3dbb91e0167d017f44701dd51c1efe30d0c256 ] + +The Synopsys Watchdog driver sets the default timeout to 30 seconds, +but on some devices this is not a valid timeout. E.g. on RK3588 the +actual timeout being used is 44 seconds instead. + +Once the watchdog is started the value is updated accordingly, but +it would be better to expose a sensible timeout to userspace without +the need to first start the watchdog. + +Signed-off-by: Sebastian Reichel +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20250717-dw-wdt-fix-initial-timeout-v1-1-86dc864d48dd@kernel.org +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/dw_wdt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c +index 61af5d1332ac..e3e09dc38c65 100644 +--- a/drivers/watchdog/dw_wdt.c ++++ b/drivers/watchdog/dw_wdt.c +@@ -658,6 +658,8 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) + } else { + wdd->timeout = DW_WDT_DEFAULT_SECONDS; + watchdog_init_timeout(wdd, 0, dev); ++ /* Limit timeout value to hardware constraints. */ ++ dw_wdt_set_timeout(wdd, wdd->timeout); + } + + platform_set_drvdata(pdev, dw_wdt); +-- +2.39.5 + diff --git a/queue-6.1/watchdog-itco_wdt-report-error-if-timeout-configurat.patch b/queue-6.1/watchdog-itco_wdt-report-error-if-timeout-configurat.patch new file mode 100644 index 0000000000..1fe770e41a --- /dev/null +++ b/queue-6.1/watchdog-itco_wdt-report-error-if-timeout-configurat.patch @@ -0,0 +1,54 @@ +From c4a8303c3eef7ed2ea75400afd90d9970bdbb022 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Jul 2025 15:35:18 +0800 +Subject: watchdog: iTCO_wdt: Report error if timeout configuration fails + +From: Ziyan Fu + +[ Upstream commit 40efc43eb7ffb5a4e2f998c13b8cfb555e671b92 ] + +The driver probes with the invalid timeout value when +'iTCO_wdt_set_timeout()' fails, as its return value is not checked. In +this case, when executing "wdctl", we may get: + +Device: /dev/watchdog0 +Timeout: 30 seconds +Timeleft: 613 seconds + +The timeout value is the value of "heartbeat" or "WATCHDOG_TIMEOUT", and +the timeleft value is calculated from the register value we actually read +(0xffff) by masking with 0x3ff and converting ticks to seconds (* 6 / 10). + +Add error handling to return the failure code if 'iTCO_wdt_set_timeout()' +fails, ensuring the driver probe fails and prevents invalid operation. + +Signed-off-by: Ziyan Fu +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20250704073518.7838-1-13281011316@163.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/iTCO_wdt.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c +index 35ae40b35f55..75fb7cf7325b 100644 +--- a/drivers/watchdog/iTCO_wdt.c ++++ b/drivers/watchdog/iTCO_wdt.c +@@ -601,7 +601,11 @@ static int iTCO_wdt_probe(struct platform_device *pdev) + /* Check that the heartbeat value is within it's range; + if not reset to the default */ + if (iTCO_wdt_set_timeout(&p->wddev, heartbeat)) { +- iTCO_wdt_set_timeout(&p->wddev, WATCHDOG_TIMEOUT); ++ ret = iTCO_wdt_set_timeout(&p->wddev, WATCHDOG_TIMEOUT); ++ if (ret != 0) { ++ dev_err(dev, "Failed to set watchdog timeout (%d)\n", WATCHDOG_TIMEOUT); ++ return ret; ++ } + dev_info(dev, "timeout value out of range, using %d\n", + WATCHDOG_TIMEOUT); + } +-- +2.39.5 + diff --git a/queue-6.1/watchdog-sbsa-adjust-keepalive-timeout-to-avoid-medi.patch b/queue-6.1/watchdog-sbsa-adjust-keepalive-timeout-to-avoid-medi.patch new file mode 100644 index 0000000000..86947be522 --- /dev/null +++ b/queue-6.1/watchdog-sbsa-adjust-keepalive-timeout-to-avoid-medi.patch @@ -0,0 +1,129 @@ +From 4d7b9afc8b4b06314be6adb46ba8cf438157c772 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jul 2025 16:06:39 -0700 +Subject: watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race + condition + +From: Aaron Plattner + +[ Upstream commit 48defdf6b083f74a44e1f742db284960d3444aec ] + +The MediaTek implementation of the sbsa_gwdt watchdog has a race +condition where a write to SBSA_GWDT_WRR is ignored if it occurs while +the hardware is processing a timeout refresh that asserts WS0. + +Detect this based on the hardware implementer and adjust +wdd->min_hw_heartbeat_ms to avoid the race by forcing the keepalive ping +to be one second later. + +Signed-off-by: Aaron Plattner +Acked-by: Timur Tabi +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20250721230640.2244915-1-aplattner@nvidia.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/sbsa_gwdt.c | 50 +++++++++++++++++++++++++++++++++--- + 1 file changed, 47 insertions(+), 3 deletions(-) + +diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c +index 7bf28545b47a..f07ffc7b8312 100644 +--- a/drivers/watchdog/sbsa_gwdt.c ++++ b/drivers/watchdog/sbsa_gwdt.c +@@ -76,11 +76,17 @@ + #define SBSA_GWDT_VERSION_MASK 0xF + #define SBSA_GWDT_VERSION_SHIFT 16 + ++#define SBSA_GWDT_IMPL_MASK 0x7FF ++#define SBSA_GWDT_IMPL_SHIFT 0 ++#define SBSA_GWDT_IMPL_MEDIATEK 0x426 ++ + /** + * struct sbsa_gwdt - Internal representation of the SBSA GWDT + * @wdd: kernel watchdog_device structure + * @clk: store the System Counter clock frequency, in Hz. + * @version: store the architecture version ++ * @need_ws0_race_workaround: ++ * indicate whether to adjust wdd->timeout to avoid a race with WS0 + * @refresh_base: Virtual address of the watchdog refresh frame + * @control_base: Virtual address of the watchdog control frame + */ +@@ -88,6 +94,7 @@ struct sbsa_gwdt { + struct watchdog_device wdd; + u32 clk; + int version; ++ bool need_ws0_race_workaround; + void __iomem *refresh_base; + void __iomem *control_base; + }; +@@ -162,6 +169,31 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd, + */ + sbsa_gwdt_reg_write(((u64)gwdt->clk / 2) * timeout, gwdt); + ++ /* ++ * Some watchdog hardware has a race condition where it will ignore ++ * sbsa_gwdt_keepalive() if it is called at the exact moment that a ++ * timeout occurs and WS0 is being asserted. Unfortunately, the default ++ * behavior of the watchdog core is very likely to trigger this race ++ * when action=0 because it programs WOR to be half of the desired ++ * timeout, and watchdog_next_keepalive() chooses the exact same time to ++ * send keepalive pings. ++ * ++ * This triggers a race where sbsa_gwdt_keepalive() can be called right ++ * as WS0 is being asserted, and affected hardware will ignore that ++ * write and continue to assert WS0. After another (timeout / 2) ++ * seconds, the same race happens again. If the driver wins then the ++ * explicit refresh will reset WS0 to false but if the hardware wins, ++ * then WS1 is asserted and the system resets. ++ * ++ * Avoid the problem by scheduling keepalive heartbeats one second later ++ * than the WOR timeout. ++ * ++ * This workaround might not be needed in a future revision of the ++ * hardware. ++ */ ++ if (gwdt->need_ws0_race_workaround) ++ wdd->min_hw_heartbeat_ms = timeout * 500 + 1000; ++ + return 0; + } + +@@ -203,12 +235,15 @@ static int sbsa_gwdt_keepalive(struct watchdog_device *wdd) + static void sbsa_gwdt_get_version(struct watchdog_device *wdd) + { + struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); +- int ver; ++ int iidr, ver, impl; + +- ver = readl(gwdt->control_base + SBSA_GWDT_W_IIDR); +- ver = (ver >> SBSA_GWDT_VERSION_SHIFT) & SBSA_GWDT_VERSION_MASK; ++ iidr = readl(gwdt->control_base + SBSA_GWDT_W_IIDR); ++ ver = (iidr >> SBSA_GWDT_VERSION_SHIFT) & SBSA_GWDT_VERSION_MASK; ++ impl = (iidr >> SBSA_GWDT_IMPL_SHIFT) & SBSA_GWDT_IMPL_MASK; + + gwdt->version = ver; ++ gwdt->need_ws0_race_workaround = ++ !action && (impl == SBSA_GWDT_IMPL_MEDIATEK); + } + + static int sbsa_gwdt_start(struct watchdog_device *wdd) +@@ -300,6 +335,15 @@ static int sbsa_gwdt_probe(struct platform_device *pdev) + else + wdd->max_hw_heartbeat_ms = GENMASK_ULL(47, 0) / gwdt->clk * 1000; + ++ if (gwdt->need_ws0_race_workaround) { ++ /* ++ * A timeout of 3 seconds means that WOR will be set to 1.5 ++ * seconds and the heartbeat will be scheduled every 2.5 ++ * seconds. ++ */ ++ wdd->min_timeout = 3; ++ } ++ + status = readl(cf_base + SBSA_GWDT_WCS); + if (status & SBSA_GWDT_WCS_WS1) { + dev_warn(dev, "System reset by WDT.\n"); +-- +2.39.5 + diff --git a/queue-6.1/wifi-cfg80211-fix-interface-type-validation.patch b/queue-6.1/wifi-cfg80211-fix-interface-type-validation.patch new file mode 100644 index 0000000000..57b4f42eed --- /dev/null +++ b/queue-6.1/wifi-cfg80211-fix-interface-type-validation.patch @@ -0,0 +1,36 @@ +From 507dddd740f2d96a2d7580f450e0e4faf80648cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Jul 2025 23:37:55 +0300 +Subject: wifi: cfg80211: Fix interface type validation + +From: Ilan Peer + +[ Upstream commit 14450be2332a49445106403492a367412b8c23f4 ] + +Fix a condition that verified valid values of interface types. + +Signed-off-by: Ilan Peer +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250709233537.7ad199ca5939.I0ac1ff74798bf59a87a57f2e18f2153c308b119b@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + include/net/cfg80211.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h +index 2a0fc4a64af1..e35bc5c35732 100644 +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -559,7 +559,7 @@ ieee80211_get_sband_iftype_data(const struct ieee80211_supported_band *sband, + { + int i; + +- if (WARN_ON(iftype >= NL80211_IFTYPE_MAX)) ++ if (WARN_ON(iftype >= NUM_NL80211_IFTYPES)) + return NULL; + + if (iftype == NL80211_IFTYPE_AP_VLAN) +-- +2.39.5 + diff --git a/queue-6.1/wifi-cfg80211-reject-htc-bit-for-management-frames.patch b/queue-6.1/wifi-cfg80211-reject-htc-bit-for-management-frames.patch new file mode 100644 index 0000000000..837a361cf0 --- /dev/null +++ b/queue-6.1/wifi-cfg80211-reject-htc-bit-for-management-frames.patch @@ -0,0 +1,38 @@ +From 5c42b2e2bbed5fa6cc509a423f59c9d997a14f84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Jul 2025 20:23:06 +0200 +Subject: wifi: cfg80211: reject HTC bit for management frames + +From: Johannes Berg + +[ Upstream commit be06a8c7313943109fa870715356503c4c709cbc ] + +Management frames sent by userspace should never have the +order/HTC bit set, reject that. It could also cause some +confusion with the length of the buffer and the header so +the validation might end up wrong. + +Link: https://patch.msgid.link/20250718202307.97a0455f0f35.I1805355c7e331352df16611839bc8198c855a33f@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/wireless/mlme.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c +index e7fa0608341d..e0246ed9f66f 100644 +--- a/net/wireless/mlme.c ++++ b/net/wireless/mlme.c +@@ -700,7 +700,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, + + mgmt = (const struct ieee80211_mgmt *)params->buf; + +- if (!ieee80211_is_mgmt(mgmt->frame_control)) ++ if (!ieee80211_is_mgmt(mgmt->frame_control) || ++ ieee80211_has_order(mgmt->frame_control)) + return -EINVAL; + + stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE; +-- +2.39.5 + diff --git a/queue-6.1/wifi-iwlegacy-check-rate_idx-range-after-addition.patch b/queue-6.1/wifi-iwlegacy-check-rate_idx-range-after-addition.patch new file mode 100644 index 0000000000..8db8d2da2d --- /dev/null +++ b/queue-6.1/wifi-iwlegacy-check-rate_idx-range-after-addition.patch @@ -0,0 +1,43 @@ +From 0cb16757d693d927ba4979a9cd0fa5295f3ed8c2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 May 2025 16:45:24 +0200 +Subject: wifi: iwlegacy: Check rate_idx range after addition + +From: Stanislaw Gruszka + +[ Upstream commit 0de19d5ae0b2c5b18b88c5c7f0442f707a207409 ] + +Limit rate_idx to IL_LAST_OFDM_RATE for 5GHz band for thinkable case +the index is incorrect. + +Reported-by: Fedor Pchelkin +Reported-by: Alexei Safin +Signed-off-by: Stanislaw Gruszka +Reviewed-by: Fedor Pchelkin +Link: https://patch.msgid.link/20250525144524.GA172583@wp.pl +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c +index 78dee8ccfebf..1c22a29d20d6 100644 +--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c ++++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c +@@ -1575,8 +1575,11 @@ il4965_tx_cmd_build_rate(struct il_priv *il, + || rate_idx > RATE_COUNT_LEGACY) + rate_idx = rate_lowest_index(&il->bands[info->band], sta); + /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ +- if (info->band == NL80211_BAND_5GHZ) ++ if (info->band == NL80211_BAND_5GHZ) { + rate_idx += IL_FIRST_OFDM_RATE; ++ if (rate_idx > IL_LAST_OFDM_RATE) ++ rate_idx = IL_LAST_OFDM_RATE; ++ } + /* Get PLCP rate for tx_cmd->rate_n_flags */ + rate_plcp = il_rates[rate_idx].plcp; + /* Zero out flags for this packet */ +-- +2.39.5 + diff --git a/queue-6.1/wifi-iwlwifi-dvm-fix-potential-overflow-in-rs_fill_l.patch b/queue-6.1/wifi-iwlwifi-dvm-fix-potential-overflow-in-rs_fill_l.patch new file mode 100644 index 0000000000..5954bb4371 --- /dev/null +++ b/queue-6.1/wifi-iwlwifi-dvm-fix-potential-overflow-in-rs_fill_l.patch @@ -0,0 +1,44 @@ +From 19958382ff866516c4ba467cc9d839b8c2af00ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Mar 2024 13:17:55 +0300 +Subject: wifi: iwlwifi: dvm: fix potential overflow in rs_fill_link_cmd() + +From: Rand Deeb + +[ Upstream commit e3ad987e9dc7d1e12e3f2f1e623f0e174cd0ca78 ] + +The 'index' variable in the rs_fill_link_cmd() function can reach +LINK_QUAL_MAX_RETRY_NUM during the execution of the inner loop. This +variable is used as an index for the lq_cmd->rs_table array, which has a +size of LINK_QUAL_MAX_RETRY_NUM, without proper validation. + +Modify the condition of the inner loop to ensure that the 'index' variable +does not exceed LINK_QUAL_MAX_RETRY_NUM - 1, thereby preventing any +potential overflow issues. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Signed-off-by: Rand Deeb +Link: https://patch.msgid.link/20240313101755.269209-1-rand.sec96@gmail.com +Signed-off-by: Miri Korenblit +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c +index 4b1f006c105b..2df93078cffe 100644 +--- a/drivers/net/wireless/intel/iwlwifi/dvm/rs.c ++++ b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c +@@ -2921,7 +2921,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv, + /* Repeat initial/next rate. + * For legacy IWL_NUMBER_TRY == 1, this loop will not execute. + * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */ +- while (repeat_rate > 0 && (index < LINK_QUAL_MAX_RETRY_NUM)) { ++ while (repeat_rate > 0 && index < (LINK_QUAL_MAX_RETRY_NUM - 1)) { + if (is_legacy(tbl_type.lq_type)) { + if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE) + ant_toggle_cnt++; +-- +2.39.5 + diff --git a/queue-6.1/wifi-iwlwifi-fw-fix-possible-memory-leak-in-iwl_fw_d.patch b/queue-6.1/wifi-iwlwifi-fw-fix-possible-memory-leak-in-iwl_fw_d.patch new file mode 100644 index 0000000000..44085f0dac --- /dev/null +++ b/queue-6.1/wifi-iwlwifi-fw-fix-possible-memory-leak-in-iwl_fw_d.patch @@ -0,0 +1,47 @@ +From dd96932590ea9af7ebe6a951df0cc4ec98b6cc57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 22:26:23 +0300 +Subject: wifi: iwlwifi: fw: Fix possible memory leak in iwl_fw_dbg_collect + +From: Pagadala Yesu Anjaneyulu + +[ Upstream commit cc8d9cbf269dab363c768bfa9312265bc807fca5 ] + +Ensure descriptor is freed on error to avoid memory leak. + +Signed-off-by: Pagadala Yesu Anjaneyulu +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250611222325.8158d15ec866.Ifa3e422c302397111f20a16da7509e6574bc19e3@changeid +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +index 4c5dbd8248e7..20db79f34163 100644 +--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c ++++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +@@ -2786,6 +2786,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, + struct iwl_fw_dump_desc *desc; + unsigned int delay = 0; + bool monitor_only = false; ++ int ret; + + if (trigger) { + u16 occurrences = le16_to_cpu(trigger->occurrences) - 1; +@@ -2816,7 +2817,11 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, + desc->trig_desc.type = cpu_to_le32(trig); + memcpy(desc->trig_desc.data, str, len); + +- return iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay); ++ ret = iwl_fw_dbg_collect_desc(fwrt, desc, monitor_only, delay); ++ if (ret) ++ kfree(desc); ++ ++ return ret; + } + IWL_EXPORT_SYMBOL(iwl_fw_dbg_collect); + +-- +2.39.5 + diff --git a/queue-6.1/wifi-iwlwifi-mvm-fix-scan-request-validation.patch b/queue-6.1/wifi-iwlwifi-mvm-fix-scan-request-validation.patch new file mode 100644 index 0000000000..92aaf113f1 --- /dev/null +++ b/queue-6.1/wifi-iwlwifi-mvm-fix-scan-request-validation.patch @@ -0,0 +1,37 @@ +From c44ea9fca9355c0e5f7bf0051fdd0de601051970 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Jul 2025 23:05:43 +0300 +Subject: wifi: iwlwifi: mvm: fix scan request validation + +From: Avraham Stern + +[ Upstream commit 7c2f3ec7707188d8d5269ae2dce97d7be3e9f261 ] + +The scan request validation function uses bitwise and instead +of logical and. Fix it. + +Signed-off-by: Avraham Stern +Reviewed-by: Ilan Peer +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250709230308.3fbc1f27871b.I7a8ee91f463c1a2d9d8561c8232e196885d02c43@changeid +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +index 2a4c59c71448..1d9798775f8a 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +@@ -822,7 +822,7 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids, + int n_channels) + { + return ((n_ssids <= PROBE_OPTION_MAX) && +- (n_channels <= mvm->fw->ucode_capa.n_scan_channels) & ++ (n_channels <= mvm->fw->ucode_capa.n_scan_channels) && + (ies->common_ie_len + + ies->len[NL80211_BAND_2GHZ] + ies->len[NL80211_BAND_5GHZ] + + ies->len[NL80211_BAND_6GHZ] <= +-- +2.39.5 + diff --git a/queue-6.1/wifi-mac80211-don-t-complete-management-tx-on-sae-co.patch b/queue-6.1/wifi-mac80211-don-t-complete-management-tx-on-sae-co.patch new file mode 100644 index 0000000000..5cfce78ea4 --- /dev/null +++ b/queue-6.1/wifi-mac80211-don-t-complete-management-tx-on-sae-co.patch @@ -0,0 +1,99 @@ +From a797fbcfd2b51f89e56317871969f1f8c1abd3fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 21:35:27 +0300 +Subject: wifi: mac80211: don't complete management TX on SAE commit + +From: Johannes Berg + +[ Upstream commit 6b04716cdcac37bdbacde34def08bc6fdb5fc4e2 ] + +When SAE commit is sent and received in response, there's no +ordering for the SAE confirm messages. As such, don't call +drivers to stop listening on the channel when the confirm +message is still expected. + +This fixes an issue if the local confirm is transmitted later +than the AP's confirm, for iwlwifi (and possibly mt76) the +AP's confirm would then get lost since the device isn't on +the channel at the time the AP transmit the confirm. + +For iwlwifi at least, this also improves the overall timing +of the authentication handshake (by about 15ms according to +the report), likely since the session protection won't be +aborted and rescheduled. + +Note that even before this, mgd_complete_tx() wasn't always +called for each call to mgd_prepare_tx() (e.g. in the case +of WEP key shared authentication), and the current drivers +that have the complete callback don't seem to mind. Document +this as well though. + +Reported-by: Jan Hendrik Farr +Closes: https://lore.kernel.org/all/aB30Ea2kRG24LINR@archlinux/ +Signed-off-by: Johannes Berg +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250609213232.12691580e140.I3f1d3127acabcd58348a110ab11044213cf147d3@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + include/net/mac80211.h | 2 ++ + net/mac80211/mlme.c | 9 ++++++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/include/net/mac80211.h b/include/net/mac80211.h +index 6ef8348b5e93..28a9b9c00e6b 100644 +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -4011,6 +4011,8 @@ struct ieee80211_prep_tx_info { + * @mgd_complete_tx: Notify the driver that the response frame for a previously + * transmitted frame announced with @mgd_prepare_tx was received, the data + * is filled similarly to @mgd_prepare_tx though the duration is not used. ++ * Note that this isn't always called for each mgd_prepare_tx() call, for ++ * example for SAE the 'confirm' messages can be on the air in any order. + * + * @mgd_protect_tdls_discover: Protect a TDLS discovery session. After sending + * a TDLS discovery-request, we expect a reply to arrive on the AP's +diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c +index b300972c3150..cc47d6b88f04 100644 +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -3595,6 +3595,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, + struct ieee80211_prep_tx_info info = { + .subtype = IEEE80211_STYPE_AUTH, + }; ++ bool sae_need_confirm = false; + + sdata_assert_lock(sdata); + +@@ -3638,6 +3639,8 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, + jiffies + IEEE80211_AUTH_WAIT_SAE_RETRY; + ifmgd->auth_data->timeout_started = true; + run_again(sdata, ifmgd->auth_data->timeout); ++ if (auth_transaction == 1) ++ sae_need_confirm = true; + goto notify_driver; + } + +@@ -3680,6 +3683,9 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, + ifmgd->auth_data->expected_transaction == 2)) { + if (!ieee80211_mark_sta_auth(sdata)) + return; /* ignore frame -- wait for timeout */ ++ } else if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE && ++ auth_transaction == 1) { ++ sae_need_confirm = true; + } else if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE && + auth_transaction == 2) { + sdata_info(sdata, "SAE peer confirmed\n"); +@@ -3688,7 +3694,8 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, + + cfg80211_rx_mlme_mgmt(sdata->dev, (u8 *)mgmt, len); + notify_driver: +- drv_mgd_complete_tx(sdata->local, sdata, &info); ++ if (!sae_need_confirm) ++ drv_mgd_complete_tx(sdata->local, sdata, &info); + } + + #define case_WLAN(type) \ +-- +2.39.5 + diff --git a/queue-6.1/wifi-mac80211-update-radar_required-in-channel-conte.patch b/queue-6.1/wifi-mac80211-update-radar_required-in-channel-conte.patch new file mode 100644 index 0000000000..f75ee302d4 --- /dev/null +++ b/queue-6.1/wifi-mac80211-update-radar_required-in-channel-conte.patch @@ -0,0 +1,49 @@ +From 01eedc021fe36d9723fe7eb6dee730e2f0460af5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 8 Jun 2025 19:33:24 +0530 +Subject: wifi: mac80211: update radar_required in channel context after + channel switch + +From: Ramya Gnanasekar + +[ Upstream commit 140c6a61d83cbd85adba769b5ef8d61acfa5b392 ] + +Currently, when a non-DFS channel is brought up and the bandwidth is +expanded from 80 MHz to 160 MHz, where the primary 80 MHz is non-DFS +and the secondary 80 MHz consists of DFS channels, radar detection +fails if radar occurs in the secondary 80 MHz. + +When the channel is switched from 80 MHz to 160 MHz, with the primary +80 MHz being non-DFS and the secondary 80 MHz consisting of DFS +channels, the radar required flag in the channel switch parameters +is set to true. However, when using a reserved channel context, +it is not updated in sdata, which disables radar detection in the +secondary 80 MHz DFS channels. + +Update the radar required flag in sdata to fix this issue when using +a reserved channel context. + +Signed-off-by: Ramya Gnanasekar +Signed-off-by: Ramasamy Kaliappan +Link: https://patch.msgid.link/20250608140324.1687117-1-ramasamy.kaliappan@oss.qualcomm.com +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/chan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c +index f07e34bed8f3..648af67b8ec8 100644 +--- a/net/mac80211/chan.c ++++ b/net/mac80211/chan.c +@@ -1308,6 +1308,7 @@ ieee80211_link_use_reserved_reassign(struct ieee80211_link_data *link) + goto out; + } + ++ link->radar_required = link->reserved_radar_required; + list_move(&link->assigned_chanctx_list, &new_ctx->assigned_links); + rcu_assign_pointer(link_conf->chanctx_conf, &new_ctx->conf); + +-- +2.39.5 + diff --git a/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch b/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch new file mode 100644 index 0000000000..d13cc5949c --- /dev/null +++ b/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch @@ -0,0 +1,58 @@ +From bad06637dc6ed515dbcfd0a541a81cfe1aa648f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 16 Jun 2025 12:56:30 +0200 +Subject: wifi: rtlwifi: fix possible skb memory leak in + `_rtl_pci_rx_interrupt()`. + +From: Thomas Fourier + +[ Upstream commit 44c0e191004f0e3aa1bdee3be248be14dbe5b020 ] + +The function `_rtl_pci_init_one_rxdesc()` can fail even when the new +`skb` is passed because of a DMA mapping error. If it fails, the `skb` +is not saved in the rx ringbuffer and thus lost. + +Compile tested only + +Signed-off-by: Thomas Fourier +Acked-by: Ping-Ke Shih +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/20250616105631.444309-4-fourier.thomas@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtlwifi/pci.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c +index b423caea2c58..f796b16eac53 100644 +--- a/drivers/net/wireless/realtek/rtlwifi/pci.c ++++ b/drivers/net/wireless/realtek/rtlwifi/pci.c +@@ -803,13 +803,19 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) + skb = new_skb; + no_new: + if (rtlpriv->use_new_trx_flow) { +- _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)buffer_desc, +- rxring_idx, +- rtlpci->rx_ring[rxring_idx].idx); ++ if (!_rtl_pci_init_one_rxdesc(hw, skb, (u8 *)buffer_desc, ++ rxring_idx, ++ rtlpci->rx_ring[rxring_idx].idx)) { ++ if (new_skb) ++ dev_kfree_skb_any(skb); ++ } + } else { +- _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)pdesc, +- rxring_idx, +- rtlpci->rx_ring[rxring_idx].idx); ++ if (!_rtl_pci_init_one_rxdesc(hw, skb, (u8 *)pdesc, ++ rxring_idx, ++ rtlpci->rx_ring[rxring_idx].idx)) { ++ if (new_skb) ++ dev_kfree_skb_any(skb); ++ } + if (rtlpci->rx_ring[rxring_idx].idx == + rtlpci->rxringcount - 1) + rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc, +-- +2.39.5 + diff --git a/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch-21064 b/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch-21064 new file mode 100644 index 0000000000..0445fd4bbc --- /dev/null +++ b/queue-6.1/wifi-rtlwifi-fix-possible-skb-memory-leak-in-_rtl_pc.patch-21064 @@ -0,0 +1,43 @@ +From fa65f47e32a070d0838e56c3eaf777646787a878 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Jun 2025 09:38:36 +0200 +Subject: wifi: rtlwifi: fix possible skb memory leak in + _rtl_pci_init_one_rxdesc() + +From: Thomas Fourier + +[ Upstream commit 76b3e5078d76f0eeadb7aacf9845399f8473da0d ] + +When `dma_mapping_error()` is true, if a new `skb` has been allocated, +then it must be de-allocated. + +Compile tested only + +Signed-off-by: Thomas Fourier +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/20250613074014.69856-2-fourier.thomas@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtlwifi/pci.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c +index f796b16eac53..4029e4e590fa 100644 +--- a/drivers/net/wireless/realtek/rtlwifi/pci.c ++++ b/drivers/net/wireless/realtek/rtlwifi/pci.c +@@ -573,8 +573,11 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw, + dma_map_single(&rtlpci->pdev->dev, skb_tail_pointer(skb), + rtlpci->rxbuffersize, DMA_FROM_DEVICE); + bufferaddress = *((dma_addr_t *)skb->cb); +- if (dma_mapping_error(&rtlpci->pdev->dev, bufferaddress)) ++ if (dma_mapping_error(&rtlpci->pdev->dev, bufferaddress)) { ++ if (!new_skb) ++ kfree_skb(skb); + return 0; ++ } + rtlpci->rx_ring[rxring_idx].rx_buf[desc_idx] = skb; + if (rtlpriv->use_new_trx_flow) { + /* skb->cb may be 64 bit address */ +-- +2.39.5 + diff --git a/queue-6.1/wifi-rtw89-disable-deep-power-saving-for-usb-sdio.patch b/queue-6.1/wifi-rtw89-disable-deep-power-saving-for-usb-sdio.patch new file mode 100644 index 0000000000..34180e8aa2 --- /dev/null +++ b/queue-6.1/wifi-rtw89-disable-deep-power-saving-for-usb-sdio.patch @@ -0,0 +1,39 @@ +From dd1c33f4fe014823ef785d0e3218d18c5cbd6ccd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 23:43:25 +0300 +Subject: wifi: rtw89: Disable deep power saving for USB/SDIO + +From: Bitterblue Smith + +[ Upstream commit a3b871a0f7c083c2a632a31da8bc3de554ae8550 ] + +Disable deep power saving for USB and SDIO because rtw89_mac_send_rpwm() +is called in atomic context and accessing hardware registers results in +"scheduling while atomic" errors. + +Signed-off-by: Bitterblue Smith +Acked-by: Ping-Ke Shih +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/0f49eceb-0de0-47e2-ba36-3c6a0dddd17d@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw89/core.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c +index 9e4a02a322ff..ff3a31bf3a87 100644 +--- a/drivers/net/wireless/realtek/rtw89/core.c ++++ b/drivers/net/wireless/realtek/rtw89/core.c +@@ -1721,6 +1721,9 @@ static enum rtw89_ps_mode rtw89_update_ps_mode(struct rtw89_dev *rtwdev) + { + const struct rtw89_chip_info *chip = rtwdev->chip; + ++ if (rtwdev->hci.type != RTW89_HCI_TYPE_PCIE) ++ return RTW89_PS_MODE_NONE; ++ + if (rtw89_disable_ps_mode || !chip->ps_mode_supported || + RTW89_CHK_FW_FEATURE(NO_DEEP_PS, &rtwdev->fw)) + return RTW89_PS_MODE_NONE; +-- +2.39.5 + diff --git a/queue-6.1/wifi-rtw89-fix-rtw89_mac_power_switch-for-usb.patch b/queue-6.1/wifi-rtw89-fix-rtw89_mac_power_switch-for-usb.patch new file mode 100644 index 0000000000..3410bebb52 --- /dev/null +++ b/queue-6.1/wifi-rtw89-fix-rtw89_mac_power_switch-for-usb.patch @@ -0,0 +1,77 @@ +From bb16cd4a3ea0e712bc29f994f6d01ee466298ea2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 30 Jun 2025 23:45:55 +0300 +Subject: wifi: rtw89: Fix rtw89_mac_power_switch() for USB + +From: Bitterblue Smith + +[ Upstream commit e2b71603333a9dd73ee88347d8894fffc3456ac1 ] + +Clear some bits in some registers in order to allow RTL8851BU to power +on. This is done both when powering on and when powering off because +that's what the vendor driver does. + +Also tested with RTL8832BU and RTL8832CU. + +Signed-off-by: Bitterblue Smith +Acked-by: Ping-Ke Shih +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/a39da939-d640-4486-ad38-f658f220afc8@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw89/mac.c | 19 +++++++++++++++++++ + drivers/net/wireless/realtek/rtw89/reg.h | 1 + + 2 files changed, 20 insertions(+) + +diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c +index 4a1c9e18c530..f15a2c6874cb 100644 +--- a/drivers/net/wireless/realtek/rtw89/mac.c ++++ b/drivers/net/wireless/realtek/rtw89/mac.c +@@ -1093,6 +1093,23 @@ void rtw89_mac_notify_wake(struct rtw89_dev *rtwdev) + rtw89_mac_send_rpwm(rtwdev, state, true); + } + ++static void rtw89_mac_power_switch_boot_mode(struct rtw89_dev *rtwdev) ++{ ++ u32 boot_mode; ++ ++ if (rtwdev->hci.type != RTW89_HCI_TYPE_USB) ++ return; ++ ++ boot_mode = rtw89_read32_mask(rtwdev, R_AX_GPIO_MUXCFG, B_AX_BOOT_MODE); ++ if (!boot_mode) ++ return; ++ ++ rtw89_write32_clr(rtwdev, R_AX_SYS_PW_CTRL, B_AX_APFN_ONMAC); ++ rtw89_write32_clr(rtwdev, R_AX_SYS_STATUS1, B_AX_AUTO_WLPON); ++ rtw89_write32_clr(rtwdev, R_AX_GPIO_MUXCFG, B_AX_BOOT_MODE); ++ rtw89_write32_clr(rtwdev, R_AX_RSV_CTRL, B_AX_R_DIS_PRST); ++} ++ + static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on) + { + #define PWR_ACT 1 +@@ -1102,6 +1119,8 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on) + int ret; + u8 val; + ++ rtw89_mac_power_switch_boot_mode(rtwdev); ++ + if (on) { + cfg_seq = chip->pwr_on_seq; + cfg_func = chip->ops->pwr_on_func; +diff --git a/drivers/net/wireless/realtek/rtw89/reg.h b/drivers/net/wireless/realtek/rtw89/reg.h +index 0291aff94016..52dd24a6216d 100644 +--- a/drivers/net/wireless/realtek/rtw89/reg.h ++++ b/drivers/net/wireless/realtek/rtw89/reg.h +@@ -157,6 +157,7 @@ + + #define R_AX_SYS_STATUS1 0x00F4 + #define B_AX_SEL_0XC0_MASK GENMASK(17, 16) ++#define B_AX_AUTO_WLPON BIT(10) + #define B_AX_PAD_HCI_SEL_V2_MASK GENMASK(5, 3) + #define MAC_AX_HCI_SEL_SDIO_UART 0 + #define MAC_AX_HCI_SEL_MULTI_USB 1 +-- +2.39.5 + diff --git a/queue-6.1/wifi-rtw89-lower-the-timeout-in-rtw89_fw_read_c2h_re.patch b/queue-6.1/wifi-rtw89-lower-the-timeout-in-rtw89_fw_read_c2h_re.patch new file mode 100644 index 0000000000..3834c78d14 --- /dev/null +++ b/queue-6.1/wifi-rtw89-lower-the-timeout-in-rtw89_fw_read_c2h_re.patch @@ -0,0 +1,73 @@ +From d32000f24190595a1c60b5e751cb9f3a356053f2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jul 2025 22:44:47 +0300 +Subject: wifi: rtw89: Lower the timeout in rtw89_fw_read_c2h_reg() for USB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Bitterblue Smith + +[ Upstream commit 671be46afd1f03de9dc6e4679c88e1a7a81cdff6 ] + +This read_poll_timeout_atomic() with a delay of 1 µs and a timeout of +1000000 µs can take ~250 seconds in the worst case because sending a +USB control message takes ~250 µs. + +Lower the timeout to 4000 for USB in order to reduce the maximum polling +time to ~1 second. + +This problem was observed with RTL8851BU while suspending to RAM with +WOWLAN enabled. The computer sat for 4 minutes with a black screen +before suspending. + +Signed-off-by: Bitterblue Smith +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/09313da6-c865-4e91-b758-4cb38a878796@gmail.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/realtek/rtw89/fw.c | 9 +++++++-- + drivers/net/wireless/realtek/rtw89/fw.h | 2 ++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c +index 0f022a5192ac..977aadfdf997 100644 +--- a/drivers/net/wireless/realtek/rtw89/fw.c ++++ b/drivers/net/wireless/realtek/rtw89/fw.c +@@ -2397,13 +2397,18 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev, + { + const struct rtw89_chip_info *chip = rtwdev->chip; + const u32 *c2h_reg = chip->c2h_regs; +- u32 ret; ++ u32 ret, timeout; + u8 i, val; + + info->id = RTW89_FWCMD_C2HREG_FUNC_NULL; + ++ if (rtwdev->hci.type == RTW89_HCI_TYPE_USB) ++ timeout = RTW89_C2H_TIMEOUT_USB; ++ else ++ timeout = RTW89_C2H_TIMEOUT; ++ + ret = read_poll_timeout_atomic(rtw89_read8, val, val, 1, +- RTW89_C2H_TIMEOUT, false, rtwdev, ++ timeout, false, rtwdev, + chip->c2h_ctrl_reg); + if (ret) { + rtw89_warn(rtwdev, "c2h reg timeout\n"); +diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h +index 0047d5d0e9b1..d0f2c5b22513 100644 +--- a/drivers/net/wireless/realtek/rtw89/fw.h ++++ b/drivers/net/wireless/realtek/rtw89/fw.h +@@ -33,6 +33,8 @@ enum rtw89_fw_dl_status { + #define RTW89_C2HREG_HDR_LEN 2 + #define RTW89_H2CREG_HDR_LEN 2 + #define RTW89_C2H_TIMEOUT 1000000 ++#define RTW89_C2H_TIMEOUT_USB 4000 ++ + struct rtw89_mac_c2h_info { + u8 id; + u8 content_len; +-- +2.39.5 + diff --git a/queue-6.1/x86-bugs-avoid-warning-when-overriding-return-thunk.patch b/queue-6.1/x86-bugs-avoid-warning-when-overriding-return-thunk.patch new file mode 100644 index 0000000000..48dbfa3a1d --- /dev/null +++ b/queue-6.1/x86-bugs-avoid-warning-when-overriding-return-thunk.patch @@ -0,0 +1,46 @@ +From 2ae74ffca3944f3b9a63ac8792f4cd57c2a09ddb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 10:29:31 -0700 +Subject: x86/bugs: Avoid warning when overriding return thunk + +From: Pawan Gupta + +[ Upstream commit 9f85fdb9fc5a1bd308a10a0a7d7e34f2712ba58b ] + +The purpose of the warning is to prevent an unexpected change to the return +thunk mitigation. However, there are legitimate cases where the return +thunk is intentionally set more than once. For example, ITS and SRSO both +can set the return thunk after retbleed has set it. In both the cases +retbleed is still mitigated. + +Replace the warning with an info about the active return thunk. + +Suggested-by: Borislav Petkov +Signed-off-by: Pawan Gupta +Signed-off-by: Borislav Petkov (AMD) +Link: https://lore.kernel.org/20250611-eibrs-fix-v4-3-5ff86cac6c61@linux.intel.com +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/bugs.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c +index dba5262e1509..4fbb5b15ab75 100644 +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -70,10 +70,9 @@ void (*x86_return_thunk)(void) __ro_after_init = &__x86_return_thunk; + + static void __init set_return_thunk(void *thunk) + { +- if (x86_return_thunk != __x86_return_thunk) +- pr_warn("x86/bugs: return thunk changed\n"); +- + x86_return_thunk = thunk; ++ ++ pr_info("active return thunk: %ps\n", thunk); + } + + /* Update SPEC_CTRL MSR and its cached copy unconditionally */ +-- +2.39.5 + diff --git a/queue-6.1/xen-netfront-fix-tx-response-spurious-interrupts.patch b/queue-6.1/xen-netfront-fix-tx-response-spurious-interrupts.patch new file mode 100644 index 0000000000..3cbbccdfe2 --- /dev/null +++ b/queue-6.1/xen-netfront-fix-tx-response-spurious-interrupts.patch @@ -0,0 +1,108 @@ +From e4b3efc06c0b1942ce9616a1fcbebfc5eaac99d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jul 2025 09:34:54 +0000 +Subject: xen/netfront: Fix TX response spurious interrupts + +From: Anthoine Bourgeois + +[ Upstream commit 114a2de6fa86d99ed9546cc9113a3cad58beef79 ] + +We found at Vates that there are lot of spurious interrupts when +benchmarking the xen-net PV driver frontend. This issue appeared with a +patch that addresses security issue XSA-391 (b27d47950e48 "xen/netfront: +harden netfront against event channel storms"). On an iperf benchmark, +spurious interrupts can represent up to 50% of the interrupts. + +Spurious interrupts are interrupts that are rised for nothing, there is +no work to do. This appends because the function that handles the +interrupts ("xennet_tx_buf_gc") is also called at the end of the request +path to garbage collect the responses received during the transmission +load. + +The request path is doing the work that the interrupt handler should +have done otherwise. This is particurary true when there is more than +one vcpu and get worse linearly with the number of vcpu/queue. + +Moreover, this problem is amplifyed by the penalty imposed by a spurious +interrupt. When an interrupt is found spurious the interrupt chip will +delay the EOI to slowdown the backend. This delay will allow more +responses to be handled by the request path and then there will be more +chance the next interrupt will not find any work to do, creating a new +spurious interrupt. + +This causes performance issue. The solution here is to remove the calls +from the request path and let the interrupt handler do the processing of +the responses. This approch removes most of the spurious interrupts +(<0.05%) and also has the benefit of freeing up cycles in the request +path, allowing it to process more work, which improves performance +compared to masking the spurious interrupt one way or another. + +This optimization changes a part of the code that is present since the +net frontend driver was upstreamed. There is no similar pattern in the +other xen PV drivers. Since the first commit of xen-netfront is a blob +that doesn't explain all the design choices I can only guess why this +specific mecanism was here. This could have been introduce to compensate +a slow backend at the time (maybe the backend was fixed or optimize +later) or a small queue. In 18 years, both frontend and backend gain lot +of features and optimizations that could have obsolete the feature of +reaping completions from the TX path. + +Some vif throughput performance figures from a 8 vCPUs, 4GB of RAM HVM +guest(s): + +Without this patch on the : +vm -> dom0: 4.5Gb/s +vm -> vm: 7.0Gb/s + +Without XSA-391 patch (revert of b27d47950e48): +vm -> dom0: 8.3Gb/s +vm -> vm: 8.7Gb/s + +With XSA-391 and this patch: +vm -> dom0: 11.5Gb/s +vm -> vm: 12.6Gb/s + +v2: +- add revewed and tested by tags +- resend with the maintainers in the recipients list + +v3: +- remove Fixes tag but keep the commit ref in the explanation +- add a paragraph on why this code was here + +Signed-off-by: Anthoine Bourgeois +Reviewed-by: Juergen Gross +Tested-by: Elliott Mitchell +Signed-off-by: Juergen Gross +Message-ID: <20250721093316.23560-1-anthoine.bourgeois@vates.tech> +Signed-off-by: Sasha Levin +--- + drivers/net/xen-netfront.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c +index 69ef50fb2e1b..74925e166462 100644 +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -637,8 +637,6 @@ static int xennet_xdp_xmit_one(struct net_device *dev, + tx_stats->packets++; + u64_stats_update_end(&tx_stats->syncp); + +- xennet_tx_buf_gc(queue); +- + return 0; + } + +@@ -848,9 +846,6 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev + tx_stats->packets++; + u64_stats_update_end(&tx_stats->syncp); + +- /* Note: It is not safe to access skb after xennet_tx_buf_gc()! */ +- xennet_tx_buf_gc(queue); +- + if (!netfront_tx_slot_available(queue)) + netif_tx_stop_queue(netdev_get_tx_queue(dev, queue->id)); + +-- +2.39.5 +