From: Sasha Levin Date: Sun, 15 Jun 2025 13:01:11 +0000 (-0400) Subject: Fixes for 6.6 X-Git-Tag: v6.6.94~63 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ad27d55d7864843369f1d472f0ee4e60bba50f8;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.6 Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/acpi-cppc-fix-null-pointer-dereference-when-nosmp-is.patch b/queue-6.6/acpi-cppc-fix-null-pointer-dereference-when-nosmp-is.patch new file mode 100644 index 0000000000..9f10ab0df5 --- /dev/null +++ b/queue-6.6/acpi-cppc-fix-null-pointer-dereference-when-nosmp-is.patch @@ -0,0 +1,48 @@ +From 7f18e809ef8c7e5fc9ea80951abf49620fdbfc65 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 4 Jun 2025 10:30:36 +0800 +Subject: ACPI: CPPC: Fix NULL pointer dereference when nosmp is used + +From: Yunhui Cui + +[ Upstream commit 15eece6c5b05e5f9db0711978c3e3b7f1a2cfe12 ] + +With nosmp in cmdline, other CPUs are not brought up, leaving +their cpc_desc_ptr NULL. CPU0's iteration via for_each_possible_cpu() +dereferences these NULL pointers, causing panic. + +Panic backtrace: + +[ 0.401123] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000b8 +... +[ 0.403255] [] cppc_allow_fast_switch+0x6a/0xd4 +... +Kernel panic - not syncing: Attempted to kill init! + +Fixes: 3cc30dd00a58 ("cpufreq: CPPC: Enable fast_switch") +Reported-by: Xu Lu +Signed-off-by: Yunhui Cui +Link: https://patch.msgid.link/20250604023036.99553-1-cuiyunhui@bytedance.com +[ rjw: New subject ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/acpi/cppc_acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c +index ed02a2a9970aa..10d531427ba77 100644 +--- a/drivers/acpi/cppc_acpi.c ++++ b/drivers/acpi/cppc_acpi.c +@@ -461,7 +461,7 @@ bool cppc_allow_fast_switch(void) + struct cpc_desc *cpc_ptr; + int cpu; + +- for_each_possible_cpu(cpu) { ++ for_each_present_cpu(cpu) { + cpc_ptr = per_cpu(cpc_desc_ptr, cpu); + desired_reg = &cpc_ptr->cpc_regs[DESIRED_PERF]; + if (!CPC_IN_SYSTEM_MEMORY(desired_reg) && +-- +2.39.5 + diff --git a/queue-6.6/ath10k-snoc-fix-unbalanced-irq-enable-in-crash-recov.patch b/queue-6.6/ath10k-snoc-fix-unbalanced-irq-enable-in-crash-recov.patch new file mode 100644 index 0000000000..8754e0abad --- /dev/null +++ b/queue-6.6/ath10k-snoc-fix-unbalanced-irq-enable-in-crash-recov.patch @@ -0,0 +1,49 @@ +From bd2f21dbd7e3848f8b0e35b7f2ea1a05b2dca893 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 18 Mar 2025 20:50:27 +0000 +Subject: ath10k: snoc: fix unbalanced IRQ enable in crash recovery + +From: Caleb Connolly + +[ Upstream commit 1650d32b92b01db03a1a95d69ee74fcbc34d4b00 ] + +In ath10k_snoc_hif_stop() we skip disabling the IRQs in the crash +recovery flow, but we still unconditionally call enable again in +ath10k_snoc_hif_start(). + +We can't check the ATH10K_FLAG_CRASH_FLUSH bit since it is cleared +before hif_start() is called, so instead check the +ATH10K_SNOC_FLAG_RECOVERY flag and skip enabling the IRQs during crash +recovery. + +This fixes unbalanced IRQ enable splats that happen after recovering from +a crash. + +Fixes: 0e622f67e041 ("ath10k: add support for WCN3990 firmware crash recovery") +Signed-off-by: Caleb Connolly +Tested-by: Loic Poulain +Link: https://patch.msgid.link/20250318205043.1043148-1-caleb.connolly@linaro.org +Signed-off-by: Jeff Johnson +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath10k/snoc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c +index 2c39bad7ebfb9..1d06d4125992d 100644 +--- a/drivers/net/wireless/ath/ath10k/snoc.c ++++ b/drivers/net/wireless/ath/ath10k/snoc.c +@@ -937,7 +937,9 @@ static int ath10k_snoc_hif_start(struct ath10k *ar) + + dev_set_threaded(&ar->napi_dev, true); + ath10k_core_napi_enable(ar); +- ath10k_snoc_irq_enable(ar); ++ /* IRQs are left enabled when we restart due to a firmware crash */ ++ if (!test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags)) ++ ath10k_snoc_irq_enable(ar); + ath10k_snoc_rx_post(ar); + + clear_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags); +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-fix-null-pointer-deference-on-eir_get_serv.patch b/queue-6.6/bluetooth-fix-null-pointer-deference-on-eir_get_serv.patch new file mode 100644 index 0000000000..6836261c11 --- /dev/null +++ b/queue-6.6/bluetooth-fix-null-pointer-deference-on-eir_get_serv.patch @@ -0,0 +1,50 @@ +From 0da71265901551779cd07635dd35d3cc8925655b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 Jun 2025 11:14:25 -0400 +Subject: Bluetooth: Fix NULL pointer deference on eir_get_service_data + +From: Luiz Augusto von Dentz + +[ Upstream commit 20a2aa01f5aeb6daad9aeaa7c33dd512c58d81eb ] + +The len parameter is considered optional so it can be NULL so it cannot +be used for skipping to next entry of EIR_SERVICE_DATA. + +Fixes: 8f9ae5b3ae80 ("Bluetooth: eir: Add helpers for managing service data") +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/eir.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/net/bluetooth/eir.c b/net/bluetooth/eir.c +index 1bc51e2b05a34..3e1713673ecc9 100644 +--- a/net/bluetooth/eir.c ++++ b/net/bluetooth/eir.c +@@ -366,17 +366,19 @@ u8 eir_create_scan_rsp(struct hci_dev *hdev, u8 instance, u8 *ptr) + + void *eir_get_service_data(u8 *eir, size_t eir_len, u16 uuid, size_t *len) + { +- while ((eir = eir_get_data(eir, eir_len, EIR_SERVICE_DATA, len))) { ++ size_t dlen; ++ ++ while ((eir = eir_get_data(eir, eir_len, EIR_SERVICE_DATA, &dlen))) { + u16 value = get_unaligned_le16(eir); + + if (uuid == value) { + if (len) +- *len -= 2; ++ *len = dlen - 2; + return &eir[2]; + } + +- eir += *len; +- eir_len -= *len; ++ eir += dlen; ++ eir_len -= dlen; + } + + return NULL; +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-hci_core-fix-list_for_each_entry_rcu-usage.patch b/queue-6.6/bluetooth-hci_core-fix-list_for_each_entry_rcu-usage.patch new file mode 100644 index 0000000000..df2ff1e64c --- /dev/null +++ b/queue-6.6/bluetooth-hci_core-fix-list_for_each_entry_rcu-usage.patch @@ -0,0 +1,57 @@ +From 2b383966c2235824b897127b9f325c272d6d4775 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 31 May 2025 18:24:58 +0300 +Subject: Bluetooth: hci_core: fix list_for_each_entry_rcu usage + +From: Pauli Virtanen + +[ Upstream commit 308a3a8ce8ea41b26c46169f3263e50f5997c28e ] + +Releasing + re-acquiring RCU lock inside list_for_each_entry_rcu() loop +body is not correct. + +Fix by taking the update-side hdev->lock instead. + +Fixes: c7eaf80bfb0c ("Bluetooth: Fix hci_link_tx_to RCU lock usage") +Signed-off-by: Pauli Virtanen +Reviewed-by: Paul Menzel +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_core.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c +index 30519d47e8a69..febfd389ecf43 100644 +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -3380,23 +3380,18 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type) + + bt_dev_err(hdev, "link tx timeout"); + +- rcu_read_lock(); ++ hci_dev_lock(hdev); + + /* Kill stalled connections */ +- list_for_each_entry_rcu(c, &h->list, list) { ++ list_for_each_entry(c, &h->list, list) { + if (c->type == type && c->sent) { + bt_dev_err(hdev, "killing stalled connection %pMR", + &c->dst); +- /* hci_disconnect might sleep, so, we have to release +- * the RCU read lock before calling it. +- */ +- rcu_read_unlock(); + hci_disconnect(c, HCI_ERROR_REMOTE_USER_TERM); +- rcu_read_lock(); + } + } + +- rcu_read_unlock(); ++ hci_dev_unlock(hdev); + } + + static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type, +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-hci_sync-fix-broadcast-pa-when-using-an-ex.patch b/queue-6.6/bluetooth-hci_sync-fix-broadcast-pa-when-using-an-ex.patch new file mode 100644 index 0000000000..78c02bc591 --- /dev/null +++ b/queue-6.6/bluetooth-hci_sync-fix-broadcast-pa-when-using-an-ex.patch @@ -0,0 +1,105 @@ +From 1525af964144c76f9767b5b20b7b8a7620d6e186 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 5 Jun 2025 11:15:16 -0400 +Subject: Bluetooth: hci_sync: Fix broadcast/PA when using an existing instance + +From: Luiz Augusto von Dentz + +[ Upstream commit 5725bc608252050ed8a4d47d59225b7dd73474c8 ] + +When using and existing adv_info instance for broadcast source it +needs to be updated to periodic first before it can be reused, also in +case the existing instance already have data hci_set_adv_instance_data +cannot be used directly since it would overwrite the existing data so +this reappend the original data after the Broadcast ID, if one was +generated. + +Example: + +bluetoothctl># Add PBP to EA so it can be later referenced as the BIS ID +bluetoothctl> advertise.service 0x1856 0x00 0x00 +bluetoothctl> advertise on +... +< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 13 + Handle: 0x01 + Operation: Complete extended advertising data (0x03) + Fragment preference: Minimize fragmentation (0x01) + Data length: 0x09 + Service Data: Public Broadcast Announcement (0x1856) + Data[2]: 0000 + Flags: 0x06 + LE General Discoverable Mode + BR/EDR Not Supported +... +bluetoothctl># Attempt to acquire Broadcast Source transport +bluetoothctl>transport.acquire /org/bluez/hci0/pac_bcast0/fd0 +... +< HCI Command: LE Set Extended Advertising Data (0x08|0x0037) plen 255 + Handle: 0x01 + Operation: Complete extended advertising data (0x03) + Fragment preference: Minimize fragmentation (0x01) + Data length: 0x0e + Service Data: Broadcast Audio Announcement (0x1852) + Broadcast ID: 11371620 (0xad8464) + Service Data: Public Broadcast Announcement (0x1856) + Data[2]: 0000 + Flags: 0x06 + LE General Discoverable Mode + BR/EDR Not Supported + +Link: https://github.com/bluez/bluez/issues/1117 +Fixes: eca0ae4aea66 ("Bluetooth: Add initial implementation of BIS connections") +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_sync.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c +index d6f40806ee512..e92bc4ceb5add 100644 +--- a/net/bluetooth/hci_sync.c ++++ b/net/bluetooth/hci_sync.c +@@ -1586,7 +1586,8 @@ static int hci_enable_per_advertising_sync(struct hci_dev *hdev, u8 instance) + static int hci_adv_bcast_annoucement(struct hci_dev *hdev, struct adv_info *adv) + { + u8 bid[3]; +- u8 ad[4 + 3]; ++ u8 ad[HCI_MAX_EXT_AD_LENGTH]; ++ u8 len; + + /* Skip if NULL adv as instance 0x00 is used for general purpose + * advertising so it cannot used for the likes of Broadcast Announcement +@@ -1612,8 +1613,10 @@ static int hci_adv_bcast_annoucement(struct hci_dev *hdev, struct adv_info *adv) + + /* Generate Broadcast ID */ + get_random_bytes(bid, sizeof(bid)); +- eir_append_service_data(ad, 0, 0x1852, bid, sizeof(bid)); +- hci_set_adv_instance_data(hdev, adv->instance, sizeof(ad), ad, 0, NULL); ++ len = eir_append_service_data(ad, 0, 0x1852, bid, sizeof(bid)); ++ memcpy(ad + len, adv->adv_data, adv->adv_data_len); ++ hci_set_adv_instance_data(hdev, adv->instance, len + adv->adv_data_len, ++ ad, 0, NULL); + + return hci_update_adv_data_sync(hdev, adv->instance); + } +@@ -1630,8 +1633,15 @@ int hci_start_per_adv_sync(struct hci_dev *hdev, u8 instance, u8 data_len, + + if (instance) { + adv = hci_find_adv_instance(hdev, instance); +- /* Create an instance if that could not be found */ +- if (!adv) { ++ if (adv) { ++ /* Turn it into periodic advertising */ ++ adv->periodic = true; ++ adv->per_adv_data_len = data_len; ++ if (data) ++ memcpy(adv->per_adv_data, data, data_len); ++ adv->flags = flags; ++ } else if (!adv) { ++ /* Create an instance if that could not be found */ + adv = hci_add_per_instance(hdev, instance, flags, + data_len, data, + sync_interval, +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-mgmt-fix-sparse-errors.patch b/queue-6.6/bluetooth-mgmt-fix-sparse-errors.patch new file mode 100644 index 0000000000..f6f4dac385 --- /dev/null +++ b/queue-6.6/bluetooth-mgmt-fix-sparse-errors.patch @@ -0,0 +1,47 @@ +From a473eb5ed57e9d7d118e02cc814cc83bb26741ea Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 16:36:27 -0400 +Subject: Bluetooth: MGMT: Fix sparse errors + +From: Luiz Augusto von Dentz + +[ Upstream commit 7dd38ba4acbea9875b4ee061e20a26413e39d9f4 ] + +This fixes the following errors: + +net/bluetooth/mgmt.c:5400:59: sparse: sparse: incorrect type in argument 3 +(different base types) @@ expected unsigned short [usertype] handle @@ +got restricted __le16 [usertype] monitor_handle @@ +net/bluetooth/mgmt.c:5400:59: sparse: expected unsigned short [usertype] handle +net/bluetooth/mgmt.c:5400:59: sparse: got restricted __le16 [usertype] monitor_handle + +Fixes: e6ed54e86aae ("Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202506060347.ux2O1p7L-lkp@intel.com/ +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/mgmt.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c +index 44174f59b31e6..853d217cabc91 100644 +--- a/net/bluetooth/mgmt.c ++++ b/net/bluetooth/mgmt.c +@@ -5159,11 +5159,11 @@ static void mgmt_adv_monitor_added(struct sock *sk, struct hci_dev *hdev, + } + + static void mgmt_adv_monitor_removed(struct sock *sk, struct hci_dev *hdev, +- u16 handle) ++ __le16 handle) + { + struct mgmt_ev_adv_monitor_removed ev; + +- ev.monitor_handle = cpu_to_le16(handle); ++ ev.monitor_handle = handle; + + mgmt_event(MGMT_EV_ADV_MONITOR_REMOVED, hdev, &ev, sizeof(ev), sk); + } +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-mgmt-fix-uaf-on-mgmt_remove_adv_monitor_co.patch b/queue-6.6/bluetooth-mgmt-fix-uaf-on-mgmt_remove_adv_monitor_co.patch new file mode 100644 index 0000000000..fae1858b3c --- /dev/null +++ b/queue-6.6/bluetooth-mgmt-fix-uaf-on-mgmt_remove_adv_monitor_co.patch @@ -0,0 +1,229 @@ +From 1abb7454324cb05f3e3051343f6a232e66555625 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Jun 2025 16:12:39 -0400 +Subject: Bluetooth: MGMT: Fix UAF on mgmt_remove_adv_monitor_complete + +From: Luiz Augusto von Dentz + +[ Upstream commit e6ed54e86aae9e4f7286ce8d5c73780f91b48d1c ] + +This reworks MGMT_OP_REMOVE_ADV_MONITOR to not use mgmt_pending_add to +avoid crashes like bellow: + +================================================================== +BUG: KASAN: slab-use-after-free in mgmt_remove_adv_monitor_complete+0xe5/0x540 net/bluetooth/mgmt.c:5406 +Read of size 8 at addr ffff88801c53f318 by task kworker/u5:5/5341 + +CPU: 0 UID: 0 PID: 5341 Comm: kworker/u5:5 Not tainted 6.15.0-syzkaller-10402-g4cb6c8af8591 #0 PREEMPT(full) +Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 +Workqueue: hci0 hci_cmd_sync_work +Call Trace: + + dump_stack_lvl+0x189/0x250 lib/dump_stack.c:120 + print_address_description mm/kasan/report.c:408 [inline] + print_report+0xd2/0x2b0 mm/kasan/report.c:521 + kasan_report+0x118/0x150 mm/kasan/report.c:634 + mgmt_remove_adv_monitor_complete+0xe5/0x540 net/bluetooth/mgmt.c:5406 + hci_cmd_sync_work+0x261/0x3a0 net/bluetooth/hci_sync.c:334 + process_one_work kernel/workqueue.c:3238 [inline] + process_scheduled_works+0xade/0x17b0 kernel/workqueue.c:3321 + worker_thread+0x8a0/0xda0 kernel/workqueue.c:3402 + kthread+0x711/0x8a0 kernel/kthread.c:464 + ret_from_fork+0x3fc/0x770 arch/x86/kernel/process.c:148 + ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 + + +Allocated by task 5987: + kasan_save_stack mm/kasan/common.c:47 [inline] + kasan_save_track+0x3e/0x80 mm/kasan/common.c:68 + poison_kmalloc_redzone mm/kasan/common.c:377 [inline] + __kasan_kmalloc+0x93/0xb0 mm/kasan/common.c:394 + kasan_kmalloc include/linux/kasan.h:260 [inline] + __kmalloc_cache_noprof+0x230/0x3d0 mm/slub.c:4358 + kmalloc_noprof include/linux/slab.h:905 [inline] + kzalloc_noprof include/linux/slab.h:1039 [inline] + mgmt_pending_new+0x65/0x240 net/bluetooth/mgmt_util.c:252 + mgmt_pending_add+0x34/0x120 net/bluetooth/mgmt_util.c:279 + remove_adv_monitor+0x103/0x1b0 net/bluetooth/mgmt.c:5454 + hci_mgmt_cmd+0x9c9/0xef0 net/bluetooth/hci_sock.c:1719 + hci_sock_sendmsg+0x6ca/0xef0 net/bluetooth/hci_sock.c:1839 + sock_sendmsg_nosec net/socket.c:712 [inline] + __sock_sendmsg+0x219/0x270 net/socket.c:727 + sock_write_iter+0x258/0x330 net/socket.c:1131 + new_sync_write fs/read_write.c:593 [inline] + vfs_write+0x548/0xa90 fs/read_write.c:686 + ksys_write+0x145/0x250 fs/read_write.c:738 + do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] + do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + +Freed by task 5989: + kasan_save_stack mm/kasan/common.c:47 [inline] + kasan_save_track+0x3e/0x80 mm/kasan/common.c:68 + kasan_save_free_info+0x46/0x50 mm/kasan/generic.c:576 + poison_slab_object mm/kasan/common.c:247 [inline] + __kasan_slab_free+0x62/0x70 mm/kasan/common.c:264 + kasan_slab_free include/linux/kasan.h:233 [inline] + slab_free_hook mm/slub.c:2380 [inline] + slab_free mm/slub.c:4642 [inline] + kfree+0x18e/0x440 mm/slub.c:4841 + mgmt_pending_foreach+0xc9/0x120 net/bluetooth/mgmt_util.c:242 + mgmt_index_removed+0x10d/0x2f0 net/bluetooth/mgmt.c:9366 + hci_sock_bind+0xbe9/0x1000 net/bluetooth/hci_sock.c:1314 + __sys_bind_socket net/socket.c:1810 [inline] + __sys_bind+0x2c3/0x3e0 net/socket.c:1841 + __do_sys_bind net/socket.c:1846 [inline] + __se_sys_bind net/socket.c:1844 [inline] + __x64_sys_bind+0x7a/0x90 net/socket.c:1844 + do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] + do_syscall_64+0xfa/0x3b0 arch/x86/entry/syscall_64.c:94 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + +Fixes: 66bd095ab5d4 ("Bluetooth: advmon offload MSFT remove monitor") +Closes: https://syzkaller.appspot.com/bug?extid=feb0dc579bbe30a13190 +Reported-by: syzbot+feb0dc579bbe30a13190@syzkaller.appspotmail.com +Tested-by: syzbot+feb0dc579bbe30a13190@syzkaller.appspotmail.com +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + include/net/bluetooth/hci_core.h | 1 - + net/bluetooth/hci_core.c | 4 +--- + net/bluetooth/mgmt.c | 37 ++++++++++---------------------- + 3 files changed, 12 insertions(+), 30 deletions(-) + +diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h +index e9214ccfde2d7..1304877813137 100644 +--- a/include/net/bluetooth/hci_core.h ++++ b/include/net/bluetooth/hci_core.h +@@ -2305,7 +2305,6 @@ void mgmt_advertising_added(struct sock *sk, struct hci_dev *hdev, + u8 instance); + void mgmt_advertising_removed(struct sock *sk, struct hci_dev *hdev, + u8 instance); +-void mgmt_adv_monitor_removed(struct hci_dev *hdev, u16 handle); + int mgmt_phy_configuration_changed(struct hci_dev *hdev, struct sock *skip); + void mgmt_adv_monitor_device_lost(struct hci_dev *hdev, u16 handle, + bdaddr_t *bdaddr, u8 addr_type); +diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c +index febfd389ecf43..023ad47a385bf 100644 +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -1862,10 +1862,8 @@ void hci_free_adv_monitor(struct hci_dev *hdev, struct adv_monitor *monitor) + if (monitor->handle) + idr_remove(&hdev->adv_monitors_idr, monitor->handle); + +- if (monitor->state != ADV_MONITOR_STATE_NOT_REGISTERED) { ++ if (monitor->state != ADV_MONITOR_STATE_NOT_REGISTERED) + hdev->adv_monitors_cnt--; +- mgmt_adv_monitor_removed(hdev, monitor->handle); +- } + + kfree(monitor); + } +diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c +index 589c3a481e4c1..fda492bf0cd47 100644 +--- a/net/bluetooth/mgmt.c ++++ b/net/bluetooth/mgmt.c +@@ -5165,24 +5165,14 @@ static void mgmt_adv_monitor_added(struct sock *sk, struct hci_dev *hdev, + mgmt_event(MGMT_EV_ADV_MONITOR_ADDED, hdev, &ev, sizeof(ev), sk); + } + +-void mgmt_adv_monitor_removed(struct hci_dev *hdev, u16 handle) ++static void mgmt_adv_monitor_removed(struct sock *sk, struct hci_dev *hdev, ++ u16 handle) + { + struct mgmt_ev_adv_monitor_removed ev; +- struct mgmt_pending_cmd *cmd; +- struct sock *sk_skip = NULL; +- struct mgmt_cp_remove_adv_monitor *cp; +- +- cmd = pending_find(MGMT_OP_REMOVE_ADV_MONITOR, hdev); +- if (cmd) { +- cp = cmd->param; +- +- if (cp->monitor_handle) +- sk_skip = cmd->sk; +- } + + ev.monitor_handle = cpu_to_le16(handle); + +- mgmt_event(MGMT_EV_ADV_MONITOR_REMOVED, hdev, &ev, sizeof(ev), sk_skip); ++ mgmt_event(MGMT_EV_ADV_MONITOR_REMOVED, hdev, &ev, sizeof(ev), sk); + } + + static int read_adv_mon_features(struct sock *sk, struct hci_dev *hdev, +@@ -5284,8 +5274,7 @@ static int __add_adv_patterns_monitor(struct sock *sk, struct hci_dev *hdev, + + if (pending_find(MGMT_OP_SET_LE, hdev) || + pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR, hdev) || +- pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev) || +- pending_find(MGMT_OP_REMOVE_ADV_MONITOR, hdev)) { ++ pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev)) { + status = MGMT_STATUS_BUSY; + goto unlock; + } +@@ -5455,8 +5444,7 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, + struct mgmt_pending_cmd *cmd = data; + struct mgmt_cp_remove_adv_monitor *cp; + +- if (status == -ECANCELED || +- cmd != pending_find(MGMT_OP_REMOVE_ADV_MONITOR, hdev)) ++ if (status == -ECANCELED) + return; + + hci_dev_lock(hdev); +@@ -5465,12 +5453,14 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, + + rp.monitor_handle = cp->monitor_handle; + +- if (!status) ++ if (!status) { ++ mgmt_adv_monitor_removed(cmd->sk, hdev, cp->monitor_handle); + hci_update_passive_scan(hdev); ++ } + + mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, + mgmt_status(status), &rp, sizeof(rp)); +- mgmt_pending_remove(cmd); ++ mgmt_pending_free(cmd); + + hci_dev_unlock(hdev); + bt_dev_dbg(hdev, "remove monitor %d complete, status %d", +@@ -5480,10 +5470,6 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, + static int mgmt_remove_adv_monitor_sync(struct hci_dev *hdev, void *data) + { + struct mgmt_pending_cmd *cmd = data; +- +- if (cmd != pending_find(MGMT_OP_REMOVE_ADV_MONITOR, hdev)) +- return -ECANCELED; +- + struct mgmt_cp_remove_adv_monitor *cp = cmd->param; + u16 handle = __le16_to_cpu(cp->monitor_handle); + +@@ -5502,14 +5488,13 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, + hci_dev_lock(hdev); + + if (pending_find(MGMT_OP_SET_LE, hdev) || +- pending_find(MGMT_OP_REMOVE_ADV_MONITOR, hdev) || + pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR, hdev) || + pending_find(MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, hdev)) { + status = MGMT_STATUS_BUSY; + goto unlock; + } + +- cmd = mgmt_pending_add(sk, MGMT_OP_REMOVE_ADV_MONITOR, hdev, data, len); ++ cmd = mgmt_pending_new(sk, MGMT_OP_REMOVE_ADV_MONITOR, hdev, data, len); + if (!cmd) { + status = MGMT_STATUS_NO_RESOURCES; + goto unlock; +@@ -5519,7 +5504,7 @@ static int remove_adv_monitor(struct sock *sk, struct hci_dev *hdev, + mgmt_remove_adv_monitor_complete); + + if (err) { +- mgmt_pending_remove(cmd); ++ mgmt_pending_free(cmd); + + if (err == -ENOMEM) + status = MGMT_STATUS_NO_RESOURCES; +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-mgmt-protect-mgmt_pending-list-with-its-ow.patch b/queue-6.6/bluetooth-mgmt-protect-mgmt_pending-list-with-its-ow.patch new file mode 100644 index 0000000000..14c765f0bd --- /dev/null +++ b/queue-6.6/bluetooth-mgmt-protect-mgmt_pending-list-with-its-ow.patch @@ -0,0 +1,626 @@ +From fd363020d7c65a132aa1776e8d0d549687b6c21e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 May 2025 15:42:21 -0400 +Subject: Bluetooth: MGMT: Protect mgmt_pending list with its own lock + +From: Luiz Augusto von Dentz + +[ Upstream commit 6fe26f694c824b8a4dbf50c635bee1302e3f099c ] + +This uses a mutex to protect from concurrent access of mgmt_pending +list which can cause crashes like: + +================================================================== +BUG: KASAN: slab-use-after-free in hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 +Read of size 2 at addr ffff0000c48885b2 by task syz.4.334/7318 + +CPU: 0 UID: 0 PID: 7318 Comm: syz.4.334 Not tainted 6.15.0-rc7-syzkaller-g187899f4124a #0 PREEMPT +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 +Call trace: + show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:466 (C) + __dump_stack+0x30/0x40 lib/dump_stack.c:94 + dump_stack_lvl+0xd8/0x12c lib/dump_stack.c:120 + print_address_description+0xa8/0x254 mm/kasan/report.c:408 + print_report+0x68/0x84 mm/kasan/report.c:521 + kasan_report+0xb0/0x110 mm/kasan/report.c:634 + __asan_report_load2_noabort+0x20/0x2c mm/kasan/report_generic.c:379 + hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 + mgmt_pending_find+0x7c/0x140 net/bluetooth/mgmt_util.c:223 + pending_find net/bluetooth/mgmt.c:947 [inline] + remove_adv_monitor+0x44/0x1a4 net/bluetooth/mgmt.c:5445 + hci_mgmt_cmd+0x780/0xc00 net/bluetooth/hci_sock.c:1712 + hci_sock_sendmsg+0x544/0xbb0 net/bluetooth/hci_sock.c:1832 + sock_sendmsg_nosec net/socket.c:712 [inline] + __sock_sendmsg net/socket.c:727 [inline] + sock_write_iter+0x25c/0x378 net/socket.c:1131 + new_sync_write fs/read_write.c:591 [inline] + vfs_write+0x62c/0x97c fs/read_write.c:684 + ksys_write+0x120/0x210 fs/read_write.c:736 + __do_sys_write fs/read_write.c:747 [inline] + __se_sys_write fs/read_write.c:744 [inline] + __arm64_sys_write+0x7c/0x90 fs/read_write.c:744 + __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] + invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 + el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 + do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 + el0_svc+0x58/0x17c arch/arm64/kernel/entry-common.c:767 + el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 + el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 + +Allocated by task 7037: + kasan_save_stack mm/kasan/common.c:47 [inline] + kasan_save_track+0x40/0x78 mm/kasan/common.c:68 + kasan_save_alloc_info+0x44/0x54 mm/kasan/generic.c:562 + poison_kmalloc_redzone mm/kasan/common.c:377 [inline] + __kasan_kmalloc+0x9c/0xb4 mm/kasan/common.c:394 + kasan_kmalloc include/linux/kasan.h:260 [inline] + __do_kmalloc_node mm/slub.c:4327 [inline] + __kmalloc_noprof+0x2fc/0x4c8 mm/slub.c:4339 + kmalloc_noprof include/linux/slab.h:909 [inline] + sk_prot_alloc+0xc4/0x1f0 net/core/sock.c:2198 + sk_alloc+0x44/0x3ac net/core/sock.c:2254 + bt_sock_alloc+0x4c/0x300 net/bluetooth/af_bluetooth.c:148 + hci_sock_create+0xa8/0x194 net/bluetooth/hci_sock.c:2202 + bt_sock_create+0x14c/0x24c net/bluetooth/af_bluetooth.c:132 + __sock_create+0x43c/0x91c net/socket.c:1541 + sock_create net/socket.c:1599 [inline] + __sys_socket_create net/socket.c:1636 [inline] + __sys_socket+0xd4/0x1c0 net/socket.c:1683 + __do_sys_socket net/socket.c:1697 [inline] + __se_sys_socket net/socket.c:1695 [inline] + __arm64_sys_socket+0x7c/0x94 net/socket.c:1695 + __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] + invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 + el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 + do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 + el0_svc+0x58/0x17c arch/arm64/kernel/entry-common.c:767 + el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 + el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 + +Freed by task 6607: + kasan_save_stack mm/kasan/common.c:47 [inline] + kasan_save_track+0x40/0x78 mm/kasan/common.c:68 + kasan_save_free_info+0x58/0x70 mm/kasan/generic.c:576 + poison_slab_object mm/kasan/common.c:247 [inline] + __kasan_slab_free+0x68/0x88 mm/kasan/common.c:264 + kasan_slab_free include/linux/kasan.h:233 [inline] + slab_free_hook mm/slub.c:2380 [inline] + slab_free mm/slub.c:4642 [inline] + kfree+0x17c/0x474 mm/slub.c:4841 + sk_prot_free net/core/sock.c:2237 [inline] + __sk_destruct+0x4f4/0x760 net/core/sock.c:2332 + sk_destruct net/core/sock.c:2360 [inline] + __sk_free+0x320/0x430 net/core/sock.c:2371 + sk_free+0x60/0xc8 net/core/sock.c:2382 + sock_put include/net/sock.h:1944 [inline] + mgmt_pending_free+0x88/0x118 net/bluetooth/mgmt_util.c:290 + mgmt_pending_remove+0xec/0x104 net/bluetooth/mgmt_util.c:298 + mgmt_set_powered_complete+0x418/0x5cc net/bluetooth/mgmt.c:1355 + hci_cmd_sync_work+0x204/0x33c net/bluetooth/hci_sync.c:334 + process_one_work+0x7e8/0x156c kernel/workqueue.c:3238 + process_scheduled_works kernel/workqueue.c:3319 [inline] + worker_thread+0x958/0xed8 kernel/workqueue.c:3400 + kthread+0x5fc/0x75c kernel/kthread.c:464 + ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:847 + +Fixes: a380b6cff1a2 ("Bluetooth: Add generic mgmt helper API") +Closes: https://syzkaller.appspot.com/bug?extid=0a7039d5d9986ff4ecec +Closes: https://syzkaller.appspot.com/bug?extid=cc0cc52e7f43dc9e6df1 +Reported-by: syzbot+0a7039d5d9986ff4ecec@syzkaller.appspotmail.com +Tested-by: syzbot+0a7039d5d9986ff4ecec@syzkaller.appspotmail.com +Tested-by: syzbot+cc0cc52e7f43dc9e6df1@syzkaller.appspotmail.com +Signed-off-by: Dmitry Antipov +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + include/net/bluetooth/hci_core.h | 1 + + net/bluetooth/hci_core.c | 1 + + net/bluetooth/mgmt.c | 101 +++++++++++++++---------------- + net/bluetooth/mgmt_util.c | 32 ++++++++-- + net/bluetooth/mgmt_util.h | 4 +- + 5 files changed, 80 insertions(+), 59 deletions(-) + +diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h +index 1304877813137..d63af08c6cdc2 100644 +--- a/include/net/bluetooth/hci_core.h ++++ b/include/net/bluetooth/hci_core.h +@@ -542,6 +542,7 @@ struct hci_dev { + struct hci_conn_hash conn_hash; + + struct list_head mesh_pending; ++ struct mutex mgmt_pending_lock; + struct list_head mgmt_pending; + struct list_head reject_list; + struct list_head accept_list; +diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c +index 023ad47a385bf..32f7bd0e89168 100644 +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -2490,6 +2490,7 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv) + + mutex_init(&hdev->lock); + mutex_init(&hdev->req_lock); ++ mutex_init(&hdev->mgmt_pending_lock); + + ida_init(&hdev->unset_handle_ida); + +diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c +index fda492bf0cd47..44174f59b31e6 100644 +--- a/net/bluetooth/mgmt.c ++++ b/net/bluetooth/mgmt.c +@@ -1433,22 +1433,17 @@ static void settings_rsp(struct mgmt_pending_cmd *cmd, void *data) + + send_settings_rsp(cmd->sk, cmd->opcode, match->hdev); + +- list_del(&cmd->list); +- + if (match->sk == NULL) { + match->sk = cmd->sk; + sock_hold(match->sk); + } +- +- mgmt_pending_free(cmd); + } + + static void cmd_status_rsp(struct mgmt_pending_cmd *cmd, void *data) + { + u8 *status = data; + +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, *status); +- mgmt_pending_remove(cmd); ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, *status); + } + + static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data) +@@ -1462,8 +1457,6 @@ static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data) + + if (cmd->cmd_complete) { + cmd->cmd_complete(cmd, match->mgmt_status); +- mgmt_pending_remove(cmd); +- + return; + } + +@@ -1472,13 +1465,13 @@ static void cmd_complete_rsp(struct mgmt_pending_cmd *cmd, void *data) + + static int generic_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status) + { +- return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, ++ return mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, status, + cmd->param, cmd->param_len); + } + + static int addr_cmd_complete(struct mgmt_pending_cmd *cmd, u8 status) + { +- return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, ++ return mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, status, + cmd->param, sizeof(struct mgmt_addr_info)); + } + +@@ -1518,7 +1511,7 @@ static void mgmt_set_discoverable_complete(struct hci_dev *hdev, void *data, + + if (err) { + u8 mgmt_err = mgmt_status(err); +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err); ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_err); + hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE); + goto done; + } +@@ -1693,7 +1686,7 @@ static void mgmt_set_connectable_complete(struct hci_dev *hdev, void *data, + + if (err) { + u8 mgmt_err = mgmt_status(err); +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err); ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_err); + goto done; + } + +@@ -1930,8 +1923,8 @@ static void set_ssp_complete(struct hci_dev *hdev, void *data, int err) + new_settings(hdev, NULL); + } + +- mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, cmd_status_rsp, +- &mgmt_err); ++ mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, true, ++ cmd_status_rsp, &mgmt_err); + return; + } + +@@ -1941,7 +1934,7 @@ static void set_ssp_complete(struct hci_dev *hdev, void *data, int err) + changed = hci_dev_test_and_clear_flag(hdev, HCI_SSP_ENABLED); + } + +- mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &match); ++ mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, true, settings_rsp, &match); + + if (changed) + new_settings(hdev, match.sk); +@@ -2061,12 +2054,12 @@ static void set_le_complete(struct hci_dev *hdev, void *data, int err) + bt_dev_dbg(hdev, "err %d", err); + + if (status) { +- mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, cmd_status_rsp, +- &status); ++ mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, true, cmd_status_rsp, ++ &status); + return; + } + +- mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, settings_rsp, &match); ++ mgmt_pending_foreach(MGMT_OP_SET_LE, hdev, true, settings_rsp, &match); + + new_settings(hdev, match.sk); + +@@ -2125,7 +2118,7 @@ static void set_mesh_complete(struct hci_dev *hdev, void *data, int err) + struct sock *sk = cmd->sk; + + if (status) { +- mgmt_pending_foreach(MGMT_OP_SET_MESH_RECEIVER, hdev, ++ mgmt_pending_foreach(MGMT_OP_SET_MESH_RECEIVER, hdev, true, + cmd_status_rsp, &status); + return; + } +@@ -2566,7 +2559,7 @@ static void mgmt_class_complete(struct hci_dev *hdev, void *data, int err) + + bt_dev_dbg(hdev, "err %d", err); + +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err), hdev->dev_class, 3); + + mgmt_pending_free(cmd); +@@ -3354,7 +3347,7 @@ static int pairing_complete(struct mgmt_pending_cmd *cmd, u8 status) + bacpy(&rp.addr.bdaddr, &conn->dst); + rp.addr.type = link_to_bdaddr(conn->type, conn->dst_type); + +- err = mgmt_cmd_complete(cmd->sk, cmd->index, MGMT_OP_PAIR_DEVICE, ++ err = mgmt_cmd_complete(cmd->sk, cmd->hdev->id, MGMT_OP_PAIR_DEVICE, + status, &rp, sizeof(rp)); + + /* So we don't get further callbacks for this connection */ +@@ -5243,7 +5236,7 @@ static void mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev, + hci_update_passive_scan(hdev); + } + +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(status), &rp, sizeof(rp)); + mgmt_pending_remove(cmd); + +@@ -5458,7 +5451,7 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, + hci_update_passive_scan(hdev); + } + +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(status), &rp, sizeof(rp)); + mgmt_pending_free(cmd); + +@@ -5857,7 +5850,7 @@ static void start_discovery_complete(struct hci_dev *hdev, void *data, int err) + cmd != pending_find(MGMT_OP_START_SERVICE_DISCOVERY, hdev)) + return; + +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(err), ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_status(err), + cmd->param, 1); + mgmt_pending_remove(cmd); + +@@ -6095,7 +6088,7 @@ static void stop_discovery_complete(struct hci_dev *hdev, void *data, int err) + + bt_dev_dbg(hdev, "err %d", err); + +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(err), ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_status(err), + cmd->param, 1); + mgmt_pending_remove(cmd); + +@@ -6320,7 +6313,7 @@ static void set_advertising_complete(struct hci_dev *hdev, void *data, int err) + u8 status = mgmt_status(err); + + if (status) { +- mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, ++ mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, true, + cmd_status_rsp, &status); + return; + } +@@ -6330,7 +6323,7 @@ static void set_advertising_complete(struct hci_dev *hdev, void *data, int err) + else + hci_dev_clear_flag(hdev, HCI_ADVERTISING); + +- mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, settings_rsp, ++ mgmt_pending_foreach(MGMT_OP_SET_ADVERTISING, hdev, true, settings_rsp, + &match); + + new_settings(hdev, match.sk); +@@ -6674,7 +6667,7 @@ static void set_bredr_complete(struct hci_dev *hdev, void *data, int err) + */ + hci_dev_clear_flag(hdev, HCI_BREDR_ENABLED); + +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err); ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_err); + } else { + send_settings_rsp(cmd->sk, MGMT_OP_SET_BREDR, hdev); + new_settings(hdev, cmd->sk); +@@ -6811,7 +6804,7 @@ static void set_secure_conn_complete(struct hci_dev *hdev, void *data, int err) + if (err) { + u8 mgmt_err = mgmt_status(err); + +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, mgmt_err); ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, mgmt_err); + goto done; + } + +@@ -7258,7 +7251,7 @@ static void get_conn_info_complete(struct hci_dev *hdev, void *data, int err) + rp.max_tx_power = HCI_TX_POWER_INVALID; + } + +- mgmt_cmd_complete(cmd->sk, cmd->index, MGMT_OP_GET_CONN_INFO, status, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, MGMT_OP_GET_CONN_INFO, status, + &rp, sizeof(rp)); + + mgmt_pending_free(cmd); +@@ -7418,7 +7411,7 @@ static void get_clock_info_complete(struct hci_dev *hdev, void *data, int err) + } + + complete: +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, &rp, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, status, &rp, + sizeof(rp)); + + mgmt_pending_free(cmd); +@@ -8622,10 +8615,10 @@ static void add_advertising_complete(struct hci_dev *hdev, void *data, int err) + rp.instance = cp->instance; + + if (err) +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err)); + else +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err), &rp, sizeof(rp)); + + add_adv_complete(hdev, cmd->sk, cp->instance, err); +@@ -8813,10 +8806,10 @@ static void add_ext_adv_params_complete(struct hci_dev *hdev, void *data, + + hci_remove_adv_instance(hdev, cp->instance); + +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err)); + } else { +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err), &rp, sizeof(rp)); + } + +@@ -8964,10 +8957,10 @@ static void add_ext_adv_data_complete(struct hci_dev *hdev, void *data, int err) + rp.instance = cp->instance; + + if (err) +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err)); + else +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err), &rp, sizeof(rp)); + + mgmt_pending_free(cmd); +@@ -9126,10 +9119,10 @@ static void remove_advertising_complete(struct hci_dev *hdev, void *data, + rp.instance = cp->instance; + + if (err) +- mgmt_cmd_status(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_status(cmd->sk, cmd->hdev->id, cmd->opcode, + mgmt_status(err)); + else +- mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, ++ mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode, + MGMT_STATUS_SUCCESS, &rp, sizeof(rp)); + + mgmt_pending_free(cmd); +@@ -9400,7 +9393,7 @@ void mgmt_index_removed(struct hci_dev *hdev) + if (test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks)) + return; + +- mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match); ++ mgmt_pending_foreach(0, hdev, true, cmd_complete_rsp, &match); + + if (hci_dev_test_flag(hdev, HCI_UNCONFIGURED)) { + mgmt_index_event(MGMT_EV_UNCONF_INDEX_REMOVED, hdev, NULL, 0, +@@ -9438,7 +9431,8 @@ void mgmt_power_on(struct hci_dev *hdev, int err) + hci_update_passive_scan(hdev); + } + +- mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match); ++ mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, true, settings_rsp, ++ &match); + + new_settings(hdev, match.sk); + +@@ -9453,7 +9447,8 @@ void __mgmt_power_off(struct hci_dev *hdev) + struct cmd_lookup match = { NULL, hdev }; + u8 zero_cod[] = { 0, 0, 0 }; + +- mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match); ++ mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, true, settings_rsp, ++ &match); + + /* If the power off is because of hdev unregistration let + * use the appropriate INVALID_INDEX status. Otherwise use +@@ -9467,7 +9462,7 @@ void __mgmt_power_off(struct hci_dev *hdev) + else + match.mgmt_status = MGMT_STATUS_NOT_POWERED; + +- mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &match); ++ mgmt_pending_foreach(0, hdev, true, cmd_complete_rsp, &match); + + if (memcmp(hdev->dev_class, zero_cod, sizeof(zero_cod)) != 0) { + mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev, +@@ -9708,7 +9703,6 @@ static void unpair_device_rsp(struct mgmt_pending_cmd *cmd, void *data) + device_unpaired(hdev, &cp->addr.bdaddr, cp->addr.type, cmd->sk); + + cmd->cmd_complete(cmd, 0); +- mgmt_pending_remove(cmd); + } + + bool mgmt_powering_down(struct hci_dev *hdev) +@@ -9761,8 +9755,8 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, + struct mgmt_cp_disconnect *cp; + struct mgmt_pending_cmd *cmd; + +- mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, unpair_device_rsp, +- hdev); ++ mgmt_pending_foreach(MGMT_OP_UNPAIR_DEVICE, hdev, true, ++ unpair_device_rsp, hdev); + + cmd = pending_find(MGMT_OP_DISCONNECT, hdev); + if (!cmd) +@@ -9955,7 +9949,7 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) + + if (status) { + u8 mgmt_err = mgmt_status(status); +- mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, ++ mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, true, + cmd_status_rsp, &mgmt_err); + return; + } +@@ -9965,8 +9959,8 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status) + else + changed = hci_dev_test_and_clear_flag(hdev, HCI_LINK_SECURITY); + +- mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp, +- &match); ++ mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, true, ++ settings_rsp, &match); + + if (changed) + new_settings(hdev, match.sk); +@@ -9990,9 +9984,12 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, + { + struct cmd_lookup match = { NULL, hdev, mgmt_status(status) }; + +- mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, sk_lookup, &match); +- mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, sk_lookup, &match); +- mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &match); ++ mgmt_pending_foreach(MGMT_OP_SET_DEV_CLASS, hdev, false, sk_lookup, ++ &match); ++ mgmt_pending_foreach(MGMT_OP_ADD_UUID, hdev, false, sk_lookup, ++ &match); ++ mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, false, sk_lookup, ++ &match); + + if (!status) { + mgmt_limited_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev, dev_class, +diff --git a/net/bluetooth/mgmt_util.c b/net/bluetooth/mgmt_util.c +index dba6a0d66500f..4ba500c377a4c 100644 +--- a/net/bluetooth/mgmt_util.c ++++ b/net/bluetooth/mgmt_util.c +@@ -217,30 +217,47 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status, + struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode, + struct hci_dev *hdev) + { +- struct mgmt_pending_cmd *cmd; ++ struct mgmt_pending_cmd *cmd, *tmp; ++ ++ mutex_lock(&hdev->mgmt_pending_lock); + +- list_for_each_entry(cmd, &hdev->mgmt_pending, list) { ++ list_for_each_entry_safe(cmd, tmp, &hdev->mgmt_pending, list) { + if (hci_sock_get_channel(cmd->sk) != channel) + continue; +- if (cmd->opcode == opcode) ++ ++ if (cmd->opcode == opcode) { ++ mutex_unlock(&hdev->mgmt_pending_lock); + return cmd; ++ } + } + ++ mutex_unlock(&hdev->mgmt_pending_lock); ++ + return NULL; + } + +-void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, ++void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, bool remove, + void (*cb)(struct mgmt_pending_cmd *cmd, void *data), + void *data) + { + struct mgmt_pending_cmd *cmd, *tmp; + ++ mutex_lock(&hdev->mgmt_pending_lock); ++ + list_for_each_entry_safe(cmd, tmp, &hdev->mgmt_pending, list) { + if (opcode > 0 && cmd->opcode != opcode) + continue; + ++ if (remove) ++ list_del(&cmd->list); ++ + cb(cmd, data); ++ ++ if (remove) ++ mgmt_pending_free(cmd); + } ++ ++ mutex_unlock(&hdev->mgmt_pending_lock); + } + + struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode, +@@ -254,7 +271,7 @@ struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode, + return NULL; + + cmd->opcode = opcode; +- cmd->index = hdev->id; ++ cmd->hdev = hdev; + + cmd->param = kmemdup(data, len, GFP_KERNEL); + if (!cmd->param) { +@@ -280,7 +297,9 @@ struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode, + if (!cmd) + return NULL; + ++ mutex_lock(&hdev->mgmt_pending_lock); + list_add_tail(&cmd->list, &hdev->mgmt_pending); ++ mutex_unlock(&hdev->mgmt_pending_lock); + + return cmd; + } +@@ -294,7 +313,10 @@ void mgmt_pending_free(struct mgmt_pending_cmd *cmd) + + void mgmt_pending_remove(struct mgmt_pending_cmd *cmd) + { ++ mutex_lock(&cmd->hdev->mgmt_pending_lock); + list_del(&cmd->list); ++ mutex_unlock(&cmd->hdev->mgmt_pending_lock); ++ + mgmt_pending_free(cmd); + } + +diff --git a/net/bluetooth/mgmt_util.h b/net/bluetooth/mgmt_util.h +index f2ba994ab1d84..024e51dd69375 100644 +--- a/net/bluetooth/mgmt_util.h ++++ b/net/bluetooth/mgmt_util.h +@@ -33,7 +33,7 @@ struct mgmt_mesh_tx { + struct mgmt_pending_cmd { + struct list_head list; + u16 opcode; +- int index; ++ struct hci_dev *hdev; + void *param; + size_t param_len; + struct sock *sk; +@@ -54,7 +54,7 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status, + + struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode, + struct hci_dev *hdev); +-void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, ++void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, bool remove, + void (*cb)(struct mgmt_pending_cmd *cmd, void *data), + void *data); + struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode, +-- +2.39.5 + diff --git a/queue-6.6/bluetooth-mgmt-remove-unused-mgmt_pending_find_data.patch b/queue-6.6/bluetooth-mgmt-remove-unused-mgmt_pending_find_data.patch new file mode 100644 index 0000000000..875ad1637c --- /dev/null +++ b/queue-6.6/bluetooth-mgmt-remove-unused-mgmt_pending_find_data.patch @@ -0,0 +1,70 @@ +From af31788b431f56d9b304d32701f1f9143aae8f95 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jan 2025 21:37:15 +0000 +Subject: Bluetooth: MGMT: Remove unused mgmt_pending_find_data + +From: Dr. David Alan Gilbert + +[ Upstream commit 276af34d82f13bda0b2a4d9786c90b8bbf1cd064 ] + +mgmt_pending_find_data() last use was removed in 2021 by +commit 5a7501374664 ("Bluetooth: hci_sync: Convert MGMT_OP_GET_CLOCK_INFO") + +Remove it. + +Signed-off-by: Dr. David Alan Gilbert +Reviewed-by: Simon Horman +Signed-off-by: Luiz Augusto von Dentz +Stable-dep-of: 6fe26f694c82 ("Bluetooth: MGMT: Protect mgmt_pending list with its own lock") +Signed-off-by: Sasha Levin +--- + net/bluetooth/mgmt_util.c | 17 ----------------- + net/bluetooth/mgmt_util.h | 4 ---- + 2 files changed, 21 deletions(-) + +diff --git a/net/bluetooth/mgmt_util.c b/net/bluetooth/mgmt_util.c +index 17e32605d9b00..dba6a0d66500f 100644 +--- a/net/bluetooth/mgmt_util.c ++++ b/net/bluetooth/mgmt_util.c +@@ -229,23 +229,6 @@ struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode, + return NULL; + } + +-struct mgmt_pending_cmd *mgmt_pending_find_data(unsigned short channel, +- u16 opcode, +- struct hci_dev *hdev, +- const void *data) +-{ +- struct mgmt_pending_cmd *cmd; +- +- list_for_each_entry(cmd, &hdev->mgmt_pending, list) { +- if (cmd->user_data != data) +- continue; +- if (cmd->opcode == opcode) +- return cmd; +- } +- +- return NULL; +-} +- + void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, + void (*cb)(struct mgmt_pending_cmd *cmd, void *data), + void *data) +diff --git a/net/bluetooth/mgmt_util.h b/net/bluetooth/mgmt_util.h +index bdf978605d5a8..f2ba994ab1d84 100644 +--- a/net/bluetooth/mgmt_util.h ++++ b/net/bluetooth/mgmt_util.h +@@ -54,10 +54,6 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status, + + struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode, + struct hci_dev *hdev); +-struct mgmt_pending_cmd *mgmt_pending_find_data(unsigned short channel, +- u16 opcode, +- struct hci_dev *hdev, +- const void *data); + void mgmt_pending_foreach(u16 opcode, struct hci_dev *hdev, + void (*cb)(struct mgmt_pending_cmd *cmd, void *data), + void *data); +-- +2.39.5 + diff --git a/queue-6.6/drm-meson-fix-debug-log-statement-when-setting-the-h.patch b/queue-6.6/drm-meson-fix-debug-log-statement-when-setting-the-h.patch new file mode 100644 index 0000000000..c19161f797 --- /dev/null +++ b/queue-6.6/drm-meson-fix-debug-log-statement-when-setting-the-h.patch @@ -0,0 +1,39 @@ +From 99862feaa895c8c08f522f1a2ba1013fd9e52f3b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 22:37:29 +0200 +Subject: drm/meson: fix debug log statement when setting the HDMI clocks + +From: Martin Blumenstingl + +[ Upstream commit d17e61ab63fb7747b340d6a66bf1408cd5c6562b ] + +The "phy" and "vclk" frequency labels were swapped, making it more +difficult to debug driver errors. Swap the label order to make them +match with the actual frequencies printed to correct this. + +Fixes: e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup") +Signed-off-by: Martin Blumenstingl +Reviewed-by: Neil Armstrong +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20250606203729.3311592-1-martin.blumenstingl@googlemail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c +index cd0e9e2d59ee7..73ec7ae48510a 100644 +--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c ++++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c +@@ -108,7 +108,7 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, + venc_freq /= 2; + + dev_dbg(priv->dev, +- "vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n", ++ "phy:%lluHz vclk=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n", + phy_freq, vclk_freq, venc_freq, hdmi_freq, + priv->venc.hdmi_use_enci); + +-- +2.39.5 + diff --git a/queue-6.6/drm-meson-fix-more-rounding-issues-with-59.94hz-mode.patch b/queue-6.6/drm-meson-fix-more-rounding-issues-with-59.94hz-mode.patch new file mode 100644 index 0000000000..8c35726e5b --- /dev/null +++ b/queue-6.6/drm-meson-fix-more-rounding-issues-with-59.94hz-mode.patch @@ -0,0 +1,134 @@ +From 8554f2e95e0a0483044b8ad349b7e520c879a144 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 22:27:51 +0200 +Subject: drm/meson: fix more rounding issues with 59.94Hz modes + +From: Martin Blumenstingl + +[ Upstream commit 0cee6c4d3518b2e757aedae78771f17149f57653 ] + +Commit 1017560164b6 ("drm/meson: use unsigned long long / Hz for +frequency types") attempts to resolve video playback using 59.94Hz. + using YUV420 by changing the clock calculation to use +Hz instead of kHz (thus yielding more precision). + +The basic calculation itself is correct, however the comparisions in +meson_vclk_vic_supported_freq() and meson_vclk_setup() don't work +anymore for 59.94Hz modes (using the freq * 1000 / 1001 logic). For +example, drm/edid specifies a 593407kHz clock for 3840x2160@59.94Hz. +With the mentioend commit we convert this to Hz. Then meson_vclk +tries to find a matchig "params" entry (as the clock setup code +currently only supports specific frequencies) by taking the venc_freq +from the params and calculating the "alt frequency" (used for the +59.94Hz modes) from it, which is: + (594000000Hz * 1000) / 1001 = 593406593Hz + +Similar calculation is applied to the phy_freq (TMDS clock), which is 10 +times the pixel clock. + +Implement a new meson_vclk_freqs_are_matching_param() function whose +purpose is to compare if the requested and calculated frequencies. They +may not match exactly (for the reasons mentioned above). Allow the +clocks to deviate slightly to make the 59.94Hz modes again. + +Fixes: 1017560164b6 ("drm/meson: use unsigned long long / Hz for frequency types") +Reported-by: Christian Hewitt +Signed-off-by: Martin Blumenstingl +Reviewed-by: Neil Armstrong +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20250609202751.962208-1-martin.blumenstingl@googlemail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/meson/meson_vclk.c | 55 ++++++++++++++++++------------ + 1 file changed, 34 insertions(+), 21 deletions(-) + +diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c +index c4123bb958e4c..dfe0c28a0f054 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.c ++++ b/drivers/gpu/drm/meson/meson_vclk.c +@@ -110,10 +110,7 @@ + #define HDMI_PLL_LOCK BIT(31) + #define HDMI_PLL_LOCK_G12A (3 << 30) + +-#define PIXEL_FREQ_1000_1001(_freq) \ +- DIV_ROUND_CLOSEST_ULL((_freq) * 1000ULL, 1001ULL) +-#define PHY_FREQ_1000_1001(_freq) \ +- (PIXEL_FREQ_1000_1001(DIV_ROUND_DOWN_ULL(_freq, 10ULL)) * 10) ++#define FREQ_1000_1001(_freq) DIV_ROUND_CLOSEST_ULL((_freq) * 1000ULL, 1001ULL) + + /* VID PLL Dividers */ + enum { +@@ -772,6 +769,36 @@ static void meson_hdmi_pll_generic_set(struct meson_drm *priv, + pll_freq); + } + ++static bool meson_vclk_freqs_are_matching_param(unsigned int idx, ++ unsigned long long phy_freq, ++ unsigned long long vclk_freq) ++{ ++ DRM_DEBUG_DRIVER("i = %d vclk_freq = %lluHz alt = %lluHz\n", ++ idx, params[idx].vclk_freq, ++ FREQ_1000_1001(params[idx].vclk_freq)); ++ DRM_DEBUG_DRIVER("i = %d phy_freq = %lluHz alt = %lluHz\n", ++ idx, params[idx].phy_freq, ++ FREQ_1000_1001(params[idx].phy_freq)); ++ ++ /* Match strict frequency */ ++ if (phy_freq == params[idx].phy_freq && ++ vclk_freq == params[idx].vclk_freq) ++ return true; ++ ++ /* Match 1000/1001 variant: vclk deviation has to be less than 1kHz ++ * (drm EDID is defined in 1kHz steps, so everything smaller must be ++ * rounding error) and the PHY freq deviation has to be less than ++ * 10kHz (as the TMDS clock is 10 times the pixel clock, so anything ++ * smaller must be rounding error as well). ++ */ ++ if (abs(vclk_freq - FREQ_1000_1001(params[idx].vclk_freq)) < 1000 && ++ abs(phy_freq - FREQ_1000_1001(params[idx].phy_freq)) < 10000) ++ return true; ++ ++ /* no match */ ++ return false; ++} ++ + enum drm_mode_status + meson_vclk_vic_supported_freq(struct meson_drm *priv, + unsigned long long phy_freq, +@@ -790,19 +817,7 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, + } + + for (i = 0 ; params[i].pixel_freq ; ++i) { +- DRM_DEBUG_DRIVER("i = %d vclk_freq = %lluHz alt = %lluHz\n", +- i, params[i].vclk_freq, +- PIXEL_FREQ_1000_1001(params[i].vclk_freq)); +- DRM_DEBUG_DRIVER("i = %d phy_freq = %lluHz alt = %lluHz\n", +- i, params[i].phy_freq, +- PHY_FREQ_1000_1001(params[i].phy_freq)); +- /* Match strict frequency */ +- if (phy_freq == params[i].phy_freq && +- vclk_freq == params[i].vclk_freq) +- return MODE_OK; +- /* Match 1000/1001 variant */ +- if (phy_freq == PHY_FREQ_1000_1001(params[i].phy_freq) && +- vclk_freq == PIXEL_FREQ_1000_1001(params[i].vclk_freq)) ++ if (meson_vclk_freqs_are_matching_param(i, phy_freq, vclk_freq)) + return MODE_OK; + } + +@@ -1075,10 +1090,8 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target, + } + + for (freq = 0 ; params[freq].pixel_freq ; ++freq) { +- if ((phy_freq == params[freq].phy_freq || +- phy_freq == PHY_FREQ_1000_1001(params[freq].phy_freq)) && +- (vclk_freq == params[freq].vclk_freq || +- vclk_freq == PIXEL_FREQ_1000_1001(params[freq].vclk_freq))) { ++ if (meson_vclk_freqs_are_matching_param(freq, phy_freq, ++ vclk_freq)) { + if (vclk_freq != params[freq].vclk_freq) + vic_alternate_clock = true; + else +-- +2.39.5 + diff --git a/queue-6.6/drm-meson-use-unsigned-long-long-hz-for-frequency-ty.patch b/queue-6.6/drm-meson-use-unsigned-long-long-hz-for-frequency-ty.patch new file mode 100644 index 0000000000..566b15facb --- /dev/null +++ b/queue-6.6/drm-meson-use-unsigned-long-long-hz-for-frequency-ty.patch @@ -0,0 +1,650 @@ +From fb55628f5664b7adfa12f2bc20d3d0f86cf39dfb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Apr 2025 22:13:00 +0200 +Subject: drm/meson: use unsigned long long / Hz for frequency types + +From: Martin Blumenstingl + +[ Upstream commit 1017560164b6bbcbc93579266926e6e96675262a ] + +Christian reports that 4K output using YUV420 encoding fails with the +following error: + Fatal Error, invalid HDMI vclk freq 593406 + +Modetest shows the following: + 3840x2160 59.94 3840 4016 4104 4400 2160 2168 2178 2250 593407 flags: xxxx, xxxx, + drm calculated value -------------------------------------^ + +This indicates that there's a (1kHz) mismatch between the clock +calculated by the drm framework and the meson driver. + +Relevant function call stack: +(drm framework) + -> meson_encoder_hdmi_atomic_enable() + -> meson_encoder_hdmi_set_vclk() + -> meson_vclk_setup() + +The video clock requested by the drm framework is 593407kHz. This is +passed by meson_encoder_hdmi_atomic_enable() to +meson_encoder_hdmi_set_vclk() and the following formula is applied: +- the frequency is halved (which would be 296703.5kHz) and rounded down + to the next full integer, which is 296703kHz +- TMDS clock is calculated (296703kHz * 10) +- video encoder clock is calculated - this needs to match a table from + meson_vclk.c and so it doubles the previously halved value again + (resulting in 593406kHz) +- meson_vclk_setup() can't find (either directly, or by deriving it from + 594000kHz * 1000 / 1001 and rounding to the closest integer value - + which is 593407kHz as originally requested by the drm framework) a + matching clock in it's internal table and errors out with "invalid + HDMI vclk freq" + +Fix the division precision by switching the whole meson driver to use +unsigned long long (64-bit) Hz values for clock frequencies instead of +unsigned int (32-bit) kHz to fix the rouding error. + +Fixes: e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup") +Reported-by: Christian Hewitt +Signed-off-by: Martin Blumenstingl +Reviewed-by: Neil Armstrong +Link: https://lore.kernel.org/r/20250421201300.778955-3-martin.blumenstingl@googlemail.com +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20250421201300.778955-3-martin.blumenstingl@googlemail.com +Stable-dep-of: d17e61ab63fb ("drm/meson: fix debug log statement when setting the HDMI clocks") +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/meson/meson_drv.c | 2 +- + drivers/gpu/drm/meson/meson_drv.h | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 29 +-- + drivers/gpu/drm/meson/meson_vclk.c | 195 +++++++++++---------- + drivers/gpu/drm/meson/meson_vclk.h | 13 +- + 5 files changed, 126 insertions(+), 115 deletions(-) + +diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c +index 095f634ff7c79..27441e5716300 100644 +--- a/drivers/gpu/drm/meson/meson_drv.c ++++ b/drivers/gpu/drm/meson/meson_drv.c +@@ -168,7 +168,7 @@ static const struct meson_drm_soc_attr meson_drm_soc_attrs[] = { + /* S805X/S805Y HDMI PLL won't lock for HDMI PHY freq > 1,65GHz */ + { + .limits = { +- .max_hdmi_phy_freq = 1650000, ++ .max_hdmi_phy_freq = 1650000000, + }, + .attrs = (const struct soc_device_attribute []) { + { .soc_id = "GXL (S805*)", }, +diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h +index 3f9345c14f31c..be4b0e4df6e13 100644 +--- a/drivers/gpu/drm/meson/meson_drv.h ++++ b/drivers/gpu/drm/meson/meson_drv.h +@@ -37,7 +37,7 @@ struct meson_drm_match_data { + }; + + struct meson_drm_soc_limits { +- unsigned int max_hdmi_phy_freq; ++ unsigned long long max_hdmi_phy_freq; + }; + + struct meson_drm { +diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c +index c4686568c9ca5..cd0e9e2d59ee7 100644 +--- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c ++++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c +@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, + { + struct meson_drm *priv = encoder_hdmi->priv; + int vic = drm_match_cea_mode(mode); +- unsigned int phy_freq; +- unsigned int vclk_freq; +- unsigned int venc_freq; +- unsigned int hdmi_freq; ++ unsigned long long phy_freq; ++ unsigned long long vclk_freq; ++ unsigned long long venc_freq; ++ unsigned long long hdmi_freq; + +- vclk_freq = mode->clock; ++ vclk_freq = mode->clock * 1000; + + /* For 420, pixel clock is half unlike venc clock */ + if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYYVYY8_0_5X24) +@@ -107,7 +107,8 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, + if (mode->flags & DRM_MODE_FLAG_DBLCLK) + venc_freq /= 2; + +- dev_dbg(priv->dev, "vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n", ++ dev_dbg(priv->dev, ++ "vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n", + phy_freq, vclk_freq, venc_freq, hdmi_freq, + priv->venc.hdmi_use_enci); + +@@ -122,10 +123,11 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri + struct meson_encoder_hdmi *encoder_hdmi = bridge_to_meson_encoder_hdmi(bridge); + struct meson_drm *priv = encoder_hdmi->priv; + bool is_hdmi2_sink = display_info->hdmi.scdc.supported; +- unsigned int phy_freq; +- unsigned int vclk_freq; +- unsigned int venc_freq; +- unsigned int hdmi_freq; ++ unsigned long long clock = mode->clock * 1000; ++ unsigned long long phy_freq; ++ unsigned long long vclk_freq; ++ unsigned long long venc_freq; ++ unsigned long long hdmi_freq; + int vic = drm_match_cea_mode(mode); + enum drm_mode_status status; + +@@ -144,12 +146,12 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri + if (status != MODE_OK) + return status; + +- return meson_vclk_dmt_supported_freq(priv, mode->clock); ++ return meson_vclk_dmt_supported_freq(priv, clock); + /* Check against supported VIC modes */ + } else if (!meson_venc_hdmi_supported_vic(vic)) + return MODE_BAD; + +- vclk_freq = mode->clock; ++ vclk_freq = clock; + + /* For 420, pixel clock is half unlike venc clock */ + if (drm_mode_is_420_only(display_info, mode) || +@@ -179,7 +181,8 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bri + if (mode->flags & DRM_MODE_FLAG_DBLCLK) + venc_freq /= 2; + +- dev_dbg(priv->dev, "%s: vclk:%d phy=%d venc=%d hdmi=%d\n", ++ dev_dbg(priv->dev, ++ "%s: vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz\n", + __func__, phy_freq, vclk_freq, venc_freq, hdmi_freq); + + return meson_vclk_vic_supported_freq(priv, phy_freq, vclk_freq); +diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c +index 2a82119eb58ed..3325580d885d0 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.c ++++ b/drivers/gpu/drm/meson/meson_vclk.c +@@ -110,7 +110,10 @@ + #define HDMI_PLL_LOCK BIT(31) + #define HDMI_PLL_LOCK_G12A (3 << 30) + +-#define FREQ_1000_1001(_freq) DIV_ROUND_CLOSEST(_freq * 1000, 1001) ++#define PIXEL_FREQ_1000_1001(_freq) \ ++ DIV_ROUND_CLOSEST_ULL((_freq) * 1000ULL, 1001ULL) ++#define PHY_FREQ_1000_1001(_freq) \ ++ (PIXEL_FREQ_1000_1001(DIV_ROUND_DOWN_ULL(_freq, 10ULL)) * 10) + + /* VID PLL Dividers */ + enum { +@@ -360,11 +363,11 @@ enum { + }; + + struct meson_vclk_params { +- unsigned int pll_freq; +- unsigned int phy_freq; +- unsigned int vclk_freq; +- unsigned int venc_freq; +- unsigned int pixel_freq; ++ unsigned long long pll_freq; ++ unsigned long long phy_freq; ++ unsigned long long vclk_freq; ++ unsigned long long venc_freq; ++ unsigned long long pixel_freq; + unsigned int pll_od1; + unsigned int pll_od2; + unsigned int pll_od3; +@@ -372,11 +375,11 @@ struct meson_vclk_params { + unsigned int vclk_div; + } params[] = { + [MESON_VCLK_HDMI_ENCI_54000] = { +- .pll_freq = 4320000, +- .phy_freq = 270000, +- .vclk_freq = 54000, +- .venc_freq = 54000, +- .pixel_freq = 54000, ++ .pll_freq = 4320000000, ++ .phy_freq = 270000000, ++ .vclk_freq = 54000000, ++ .venc_freq = 54000000, ++ .pixel_freq = 54000000, + .pll_od1 = 4, + .pll_od2 = 4, + .pll_od3 = 1, +@@ -384,11 +387,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_DDR_54000] = { +- .pll_freq = 4320000, +- .phy_freq = 270000, +- .vclk_freq = 54000, +- .venc_freq = 54000, +- .pixel_freq = 27000, ++ .pll_freq = 4320000000, ++ .phy_freq = 270000000, ++ .vclk_freq = 54000000, ++ .venc_freq = 54000000, ++ .pixel_freq = 27000000, + .pll_od1 = 4, + .pll_od2 = 4, + .pll_od3 = 1, +@@ -396,11 +399,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_DDR_148500] = { +- .pll_freq = 2970000, +- .phy_freq = 742500, +- .vclk_freq = 148500, +- .venc_freq = 148500, +- .pixel_freq = 74250, ++ .pll_freq = 2970000000, ++ .phy_freq = 742500000, ++ .vclk_freq = 148500000, ++ .venc_freq = 148500000, ++ .pixel_freq = 74250000, + .pll_od1 = 4, + .pll_od2 = 1, + .pll_od3 = 1, +@@ -408,11 +411,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_74250] = { +- .pll_freq = 2970000, +- .phy_freq = 742500, +- .vclk_freq = 74250, +- .venc_freq = 74250, +- .pixel_freq = 74250, ++ .pll_freq = 2970000000, ++ .phy_freq = 742500000, ++ .vclk_freq = 74250000, ++ .venc_freq = 74250000, ++ .pixel_freq = 74250000, + .pll_od1 = 2, + .pll_od2 = 2, + .pll_od3 = 2, +@@ -420,11 +423,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_148500] = { +- .pll_freq = 2970000, +- .phy_freq = 1485000, +- .vclk_freq = 148500, +- .venc_freq = 148500, +- .pixel_freq = 148500, ++ .pll_freq = 2970000000, ++ .phy_freq = 1485000000, ++ .vclk_freq = 148500000, ++ .venc_freq = 148500000, ++ .pixel_freq = 148500000, + .pll_od1 = 1, + .pll_od2 = 2, + .pll_od3 = 2, +@@ -432,11 +435,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_297000] = { +- .pll_freq = 5940000, +- .phy_freq = 2970000, +- .venc_freq = 297000, +- .vclk_freq = 297000, +- .pixel_freq = 297000, ++ .pll_freq = 5940000000, ++ .phy_freq = 2970000000, ++ .venc_freq = 297000000, ++ .vclk_freq = 297000000, ++ .pixel_freq = 297000000, + .pll_od1 = 2, + .pll_od2 = 1, + .pll_od3 = 1, +@@ -444,11 +447,11 @@ struct meson_vclk_params { + .vclk_div = 2, + }, + [MESON_VCLK_HDMI_594000] = { +- .pll_freq = 5940000, +- .phy_freq = 5940000, +- .venc_freq = 594000, +- .vclk_freq = 594000, +- .pixel_freq = 594000, ++ .pll_freq = 5940000000, ++ .phy_freq = 5940000000, ++ .venc_freq = 594000000, ++ .vclk_freq = 594000000, ++ .pixel_freq = 594000000, + .pll_od1 = 1, + .pll_od2 = 1, + .pll_od3 = 2, +@@ -456,11 +459,11 @@ struct meson_vclk_params { + .vclk_div = 1, + }, + [MESON_VCLK_HDMI_594000_YUV420] = { +- .pll_freq = 5940000, +- .phy_freq = 2970000, +- .venc_freq = 594000, +- .vclk_freq = 594000, +- .pixel_freq = 297000, ++ .pll_freq = 5940000000, ++ .phy_freq = 2970000000, ++ .venc_freq = 594000000, ++ .vclk_freq = 594000000, ++ .pixel_freq = 297000000, + .pll_od1 = 2, + .pll_od2 = 1, + .pll_od3 = 1, +@@ -617,16 +620,16 @@ static void meson_hdmi_pll_set_params(struct meson_drm *priv, unsigned int m, + 3 << 20, pll_od_to_reg(od3) << 20); + } + +-#define XTAL_FREQ 24000 ++#define XTAL_FREQ (24 * 1000 * 1000) + + static unsigned int meson_hdmi_pll_get_m(struct meson_drm *priv, +- unsigned int pll_freq) ++ unsigned long long pll_freq) + { + /* The GXBB PLL has a /2 pre-multiplier */ + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB)) +- pll_freq /= 2; ++ pll_freq = DIV_ROUND_DOWN_ULL(pll_freq, 2); + +- return pll_freq / XTAL_FREQ; ++ return DIV_ROUND_DOWN_ULL(pll_freq, XTAL_FREQ); + } + + #define HDMI_FRAC_MAX_GXBB 4096 +@@ -635,12 +638,13 @@ static unsigned int meson_hdmi_pll_get_m(struct meson_drm *priv, + + static unsigned int meson_hdmi_pll_get_frac(struct meson_drm *priv, + unsigned int m, +- unsigned int pll_freq) ++ unsigned long long pll_freq) + { +- unsigned int parent_freq = XTAL_FREQ; ++ unsigned long long parent_freq = XTAL_FREQ; + unsigned int frac_max = HDMI_FRAC_MAX_GXL; + unsigned int frac_m; + unsigned int frac; ++ u32 remainder; + + /* The GXBB PLL has a /2 pre-multiplier and a larger FRAC width */ + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB)) { +@@ -652,11 +656,11 @@ static unsigned int meson_hdmi_pll_get_frac(struct meson_drm *priv, + frac_max = HDMI_FRAC_MAX_G12A; + + /* We can have a perfect match !*/ +- if (pll_freq / m == parent_freq && +- pll_freq % m == 0) ++ if (div_u64_rem(pll_freq, m, &remainder) == parent_freq && ++ remainder == 0) + return 0; + +- frac = div_u64((u64)pll_freq * (u64)frac_max, parent_freq); ++ frac = mul_u64_u64_div_u64(pll_freq, frac_max, parent_freq); + frac_m = m * frac_max; + if (frac_m > frac) + return frac_max; +@@ -666,7 +670,7 @@ static unsigned int meson_hdmi_pll_get_frac(struct meson_drm *priv, + } + + static bool meson_hdmi_pll_validate_params(struct meson_drm *priv, +- unsigned int m, ++ unsigned long long m, + unsigned int frac) + { + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB)) { +@@ -694,7 +698,7 @@ static bool meson_hdmi_pll_validate_params(struct meson_drm *priv, + } + + static bool meson_hdmi_pll_find_params(struct meson_drm *priv, +- unsigned int freq, ++ unsigned long long freq, + unsigned int *m, + unsigned int *frac, + unsigned int *od) +@@ -706,7 +710,7 @@ static bool meson_hdmi_pll_find_params(struct meson_drm *priv, + continue; + *frac = meson_hdmi_pll_get_frac(priv, *m, freq * *od); + +- DRM_DEBUG_DRIVER("PLL params for %dkHz: m=%x frac=%x od=%d\n", ++ DRM_DEBUG_DRIVER("PLL params for %lluHz: m=%x frac=%x od=%d\n", + freq, *m, *frac, *od); + + if (meson_hdmi_pll_validate_params(priv, *m, *frac)) +@@ -718,7 +722,7 @@ static bool meson_hdmi_pll_find_params(struct meson_drm *priv, + + /* pll_freq is the frequency after the OD dividers */ + enum drm_mode_status +-meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned int freq) ++meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned long long freq) + { + unsigned int od, m, frac; + +@@ -741,7 +745,7 @@ EXPORT_SYMBOL_GPL(meson_vclk_dmt_supported_freq); + + /* pll_freq is the frequency after the OD dividers */ + static void meson_hdmi_pll_generic_set(struct meson_drm *priv, +- unsigned int pll_freq) ++ unsigned long long pll_freq) + { + unsigned int od, m, frac, od1, od2, od3; + +@@ -756,7 +760,7 @@ static void meson_hdmi_pll_generic_set(struct meson_drm *priv, + od1 = od / od2; + } + +- DRM_DEBUG_DRIVER("PLL params for %dkHz: m=%x frac=%x od=%d/%d/%d\n", ++ DRM_DEBUG_DRIVER("PLL params for %lluHz: m=%x frac=%x od=%d/%d/%d\n", + pll_freq, m, frac, od1, od2, od3); + + meson_hdmi_pll_set_params(priv, m, frac, od1, od2, od3); +@@ -764,17 +768,18 @@ static void meson_hdmi_pll_generic_set(struct meson_drm *priv, + return; + } + +- DRM_ERROR("Fatal, unable to find parameters for PLL freq %d\n", ++ DRM_ERROR("Fatal, unable to find parameters for PLL freq %lluHz\n", + pll_freq); + } + + enum drm_mode_status +-meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, +- unsigned int vclk_freq) ++meson_vclk_vic_supported_freq(struct meson_drm *priv, ++ unsigned long long phy_freq, ++ unsigned long long vclk_freq) + { + int i; + +- DRM_DEBUG_DRIVER("phy_freq = %d vclk_freq = %d\n", ++ DRM_DEBUG_DRIVER("phy_freq = %lluHz vclk_freq = %lluHz\n", + phy_freq, vclk_freq); + + /* Check against soc revision/package limits */ +@@ -785,19 +790,19 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, + } + + for (i = 0 ; params[i].pixel_freq ; ++i) { +- DRM_DEBUG_DRIVER("i = %d pixel_freq = %d alt = %d\n", ++ DRM_DEBUG_DRIVER("i = %d pixel_freq = %lluHz alt = %lluHz\n", + i, params[i].pixel_freq, +- FREQ_1000_1001(params[i].pixel_freq)); +- DRM_DEBUG_DRIVER("i = %d phy_freq = %d alt = %d\n", ++ PIXEL_FREQ_1000_1001(params[i].pixel_freq)); ++ DRM_DEBUG_DRIVER("i = %d phy_freq = %lluHz alt = %lluHz\n", + i, params[i].phy_freq, +- FREQ_1000_1001(params[i].phy_freq/10)*10); ++ PHY_FREQ_1000_1001(params[i].phy_freq)); + /* Match strict frequency */ + if (phy_freq == params[i].phy_freq && + vclk_freq == params[i].vclk_freq) + return MODE_OK; + /* Match 1000/1001 variant */ +- if (phy_freq == (FREQ_1000_1001(params[i].phy_freq/10)*10) && +- vclk_freq == FREQ_1000_1001(params[i].vclk_freq)) ++ if (phy_freq == PHY_FREQ_1000_1001(params[i].phy_freq) && ++ vclk_freq == PIXEL_FREQ_1000_1001(params[i].vclk_freq)) + return MODE_OK; + } + +@@ -805,8 +810,9 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, + } + EXPORT_SYMBOL_GPL(meson_vclk_vic_supported_freq); + +-static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, +- unsigned int od1, unsigned int od2, unsigned int od3, ++static void meson_vclk_set(struct meson_drm *priv, ++ unsigned long long pll_base_freq, unsigned int od1, ++ unsigned int od2, unsigned int od3, + unsigned int vid_pll_div, unsigned int vclk_div, + unsigned int hdmi_tx_div, unsigned int venc_div, + bool hdmi_use_enci, bool vic_alternate_clock) +@@ -826,15 +832,15 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, + meson_hdmi_pll_generic_set(priv, pll_base_freq); + } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB)) { + switch (pll_base_freq) { +- case 2970000: ++ case 2970000000: + m = 0x3d; + frac = vic_alternate_clock ? 0xd02 : 0xe00; + break; +- case 4320000: ++ case 4320000000: + m = vic_alternate_clock ? 0x59 : 0x5a; + frac = vic_alternate_clock ? 0xe8f : 0; + break; +- case 5940000: ++ case 5940000000: + m = 0x7b; + frac = vic_alternate_clock ? 0xa05 : 0xc00; + break; +@@ -844,15 +850,15 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, + } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) || + meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL)) { + switch (pll_base_freq) { +- case 2970000: ++ case 2970000000: + m = 0x7b; + frac = vic_alternate_clock ? 0x281 : 0x300; + break; +- case 4320000: ++ case 4320000000: + m = vic_alternate_clock ? 0xb3 : 0xb4; + frac = vic_alternate_clock ? 0x347 : 0; + break; +- case 5940000: ++ case 5940000000: + m = 0xf7; + frac = vic_alternate_clock ? 0x102 : 0x200; + break; +@@ -861,15 +867,15 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, + meson_hdmi_pll_set_params(priv, m, frac, od1, od2, od3); + } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + switch (pll_base_freq) { +- case 2970000: ++ case 2970000000: + m = 0x7b; + frac = vic_alternate_clock ? 0x140b4 : 0x18000; + break; +- case 4320000: ++ case 4320000000: + m = vic_alternate_clock ? 0xb3 : 0xb4; + frac = vic_alternate_clock ? 0x1a3ee : 0; + break; +- case 5940000: ++ case 5940000000: + m = 0xf7; + frac = vic_alternate_clock ? 0x8148 : 0x10000; + break; +@@ -1025,14 +1031,14 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq, + } + + void meson_vclk_setup(struct meson_drm *priv, unsigned int target, +- unsigned int phy_freq, unsigned int vclk_freq, +- unsigned int venc_freq, unsigned int dac_freq, ++ unsigned long long phy_freq, unsigned long long vclk_freq, ++ unsigned long long venc_freq, unsigned long long dac_freq, + bool hdmi_use_enci) + { + bool vic_alternate_clock = false; +- unsigned int freq; +- unsigned int hdmi_tx_div; +- unsigned int venc_div; ++ unsigned long long freq; ++ unsigned long long hdmi_tx_div; ++ unsigned long long venc_div; + + if (target == MESON_VCLK_TARGET_CVBS) { + meson_venci_cvbs_clock_config(priv); +@@ -1052,27 +1058,27 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target, + return; + } + +- hdmi_tx_div = vclk_freq / dac_freq; ++ hdmi_tx_div = DIV_ROUND_DOWN_ULL(vclk_freq, dac_freq); + + if (hdmi_tx_div == 0) { +- pr_err("Fatal Error, invalid HDMI-TX freq %d\n", ++ pr_err("Fatal Error, invalid HDMI-TX freq %lluHz\n", + dac_freq); + return; + } + +- venc_div = vclk_freq / venc_freq; ++ venc_div = DIV_ROUND_DOWN_ULL(vclk_freq, venc_freq); + + if (venc_div == 0) { +- pr_err("Fatal Error, invalid HDMI venc freq %d\n", ++ pr_err("Fatal Error, invalid HDMI venc freq %lluHz\n", + venc_freq); + return; + } + + for (freq = 0 ; params[freq].pixel_freq ; ++freq) { + if ((phy_freq == params[freq].phy_freq || +- phy_freq == FREQ_1000_1001(params[freq].phy_freq/10)*10) && ++ phy_freq == PHY_FREQ_1000_1001(params[freq].phy_freq)) && + (vclk_freq == params[freq].vclk_freq || +- vclk_freq == FREQ_1000_1001(params[freq].vclk_freq))) { ++ vclk_freq == PIXEL_FREQ_1000_1001(params[freq].vclk_freq))) { + if (vclk_freq != params[freq].vclk_freq) + vic_alternate_clock = true; + else +@@ -1098,7 +1104,8 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target, + } + + if (!params[freq].pixel_freq) { +- pr_err("Fatal Error, invalid HDMI vclk freq %d\n", vclk_freq); ++ pr_err("Fatal Error, invalid HDMI vclk freq %lluHz\n", ++ vclk_freq); + return; + } + +diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h +index 60617aaf18dd1..7ac55744e5749 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.h ++++ b/drivers/gpu/drm/meson/meson_vclk.h +@@ -20,17 +20,18 @@ enum { + }; + + /* 27MHz is the CVBS Pixel Clock */ +-#define MESON_VCLK_CVBS 27000 ++#define MESON_VCLK_CVBS (27 * 1000 * 1000) + + enum drm_mode_status +-meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned int freq); ++meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned long long freq); + enum drm_mode_status +-meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, +- unsigned int vclk_freq); ++meson_vclk_vic_supported_freq(struct meson_drm *priv, ++ unsigned long long phy_freq, ++ unsigned long long vclk_freq); + + void meson_vclk_setup(struct meson_drm *priv, unsigned int target, +- unsigned int phy_freq, unsigned int vclk_freq, +- unsigned int venc_freq, unsigned int dac_freq, ++ unsigned long long phy_freq, unsigned long long vclk_freq, ++ unsigned long long venc_freq, unsigned long long dac_freq, + bool hdmi_use_enci); + + #endif /* __MESON_VCLK_H */ +-- +2.39.5 + diff --git a/queue-6.6/drm-meson-use-vclk_freq-instead-of-pixel_freq-in-deb.patch b/queue-6.6/drm-meson-use-vclk_freq-instead-of-pixel_freq-in-deb.patch new file mode 100644 index 0000000000..35718f13a5 --- /dev/null +++ b/queue-6.6/drm-meson-use-vclk_freq-instead-of-pixel_freq-in-deb.patch @@ -0,0 +1,46 @@ +From 8fc0ba95087b37282f32941e46cef615272b392c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 7 Jun 2025 00:10:31 +0200 +Subject: drm/meson: use vclk_freq instead of pixel_freq in debug print + +From: Martin Blumenstingl + +[ Upstream commit faf2f8382088e8c74bd6eeb236c8c9190e61615e ] + +meson_vclk_vic_supported_freq() has a debug print which includes the +pixel freq. However, within the whole function the pixel freq is +irrelevant, other than checking the end of the params array. Switch to +printing the vclk_freq which is being compared / matched against the +inputs to the function to avoid confusion when analyzing error reports +from users. + +Fixes: e5fab2ec9ca4 ("drm/meson: vclk: add support for YUV420 setup") +Signed-off-by: Martin Blumenstingl +Reviewed-by: Neil Armstrong +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20250606221031.3419353-1-martin.blumenstingl@googlemail.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c +index 3325580d885d0..c4123bb958e4c 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.c ++++ b/drivers/gpu/drm/meson/meson_vclk.c +@@ -790,9 +790,9 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, + } + + for (i = 0 ; params[i].pixel_freq ; ++i) { +- DRM_DEBUG_DRIVER("i = %d pixel_freq = %lluHz alt = %lluHz\n", +- i, params[i].pixel_freq, +- PIXEL_FREQ_1000_1001(params[i].pixel_freq)); ++ DRM_DEBUG_DRIVER("i = %d vclk_freq = %lluHz alt = %lluHz\n", ++ i, params[i].vclk_freq, ++ PIXEL_FREQ_1000_1001(params[i].vclk_freq)); + DRM_DEBUG_DRIVER("i = %d phy_freq = %lluHz alt = %lluHz\n", + i, params[i].phy_freq, + PHY_FREQ_1000_1001(params[i].phy_freq)); +-- +2.39.5 + diff --git a/queue-6.6/i40e-retry-vflr-handling-if-there-is-ongoing-vf-rese.patch b/queue-6.6/i40e-retry-vflr-handling-if-there-is-ongoing-vf-rese.patch new file mode 100644 index 0000000000..ccbf222604 --- /dev/null +++ b/queue-6.6/i40e-retry-vflr-handling-if-there-is-ongoing-vf-rese.patch @@ -0,0 +1,44 @@ +From e9b8024fa6dfeac6e015a6c4f3d1cbed2c71d521 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 May 2025 10:31:52 +0200 +Subject: i40e: retry VFLR handling if there is ongoing VF reset + +From: Robert Malz + +[ Upstream commit fb4e9239e029954a37a00818b21e837cebf2aa10 ] + +When a VFLR interrupt is received during a VF reset initiated from a +different source, the VFLR may be not fully handled. This can +leave the VF in an undefined state. +To address this, set the I40E_VFLR_EVENT_PENDING bit again during VFLR +handling if the reset is not yet complete. This ensures the driver +will properly complete the VF reset in such scenarios. + +Fixes: 52424f974bc5 ("i40e: Fix VF hang when reset is triggered on another VF") +Signed-off-by: Robert Malz +Tested-by: Rafal Romanowski +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +index 348869f05020f..80036942dc764 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -4332,7 +4332,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf) + reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx)); + if (reg & BIT(bit_idx)) + /* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */ +- i40e_reset_vf(vf, true); ++ if (!i40e_reset_vf(vf, true)) { ++ /* At least one VF did not finish resetting, retry next time */ ++ set_bit(__I40E_VFLR_EVENT_PENDING, pf->state); ++ } + } + + return 0; +-- +2.39.5 + diff --git a/queue-6.6/i40e-return-false-from-i40e_reset_vf-if-reset-is-in-.patch b/queue-6.6/i40e-return-false-from-i40e_reset_vf-if-reset-is-in-.patch new file mode 100644 index 0000000000..19c7f56e77 --- /dev/null +++ b/queue-6.6/i40e-return-false-from-i40e_reset_vf-if-reset-is-in-.patch @@ -0,0 +1,55 @@ +From d3e29778cc6d628fc5b7ff52b6691f38fd4c6a89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 20 May 2025 10:31:51 +0200 +Subject: i40e: return false from i40e_reset_vf if reset is in progress + +From: Robert Malz + +[ Upstream commit a2c90d63b71223d69a813333c1abf4fdacddbbe5 ] + +The function i40e_vc_reset_vf attempts, up to 20 times, to handle a +VF reset request, using the return value of i40e_reset_vf as an indicator +of whether the reset was successfully triggered. Currently, i40e_reset_vf +always returns true, which causes new reset requests to be ignored if a +different VF reset is already in progress. + +This patch updates the return value of i40e_reset_vf to reflect when +another VF reset is in progress, allowing the caller to properly use +the retry mechanism. + +Fixes: 52424f974bc5 ("i40e: Fix VF hang when reset is triggered on another VF") +Signed-off-by: Robert Malz +Tested-by: Rafal Romanowski +Signed-off-by: Tony Nguyen +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +index d5509bc16d0d5..348869f05020f 100644 +--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +@@ -1552,8 +1552,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf) + * @vf: pointer to the VF structure + * @flr: VFLR was issued or not + * +- * Returns true if the VF is in reset, resets successfully, or resets +- * are disabled and false otherwise. ++ * Return: True if reset was performed successfully or if resets are disabled. ++ * False if reset is already in progress. + **/ + bool i40e_reset_vf(struct i40e_vf *vf, bool flr) + { +@@ -1572,7 +1572,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) + + /* If VF is being reset already we don't need to continue. */ + if (test_and_set_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) +- return true; ++ return false; + + i40e_trigger_vf_reset(vf, flr); + +-- +2.39.5 + diff --git a/queue-6.6/macsec-macsec-sci-assignment-for-es-0.patch b/queue-6.6/macsec-macsec-sci-assignment-for-es-0.patch new file mode 100644 index 0000000000..7ff13c1584 --- /dev/null +++ b/queue-6.6/macsec-macsec-sci-assignment-for-es-0.patch @@ -0,0 +1,128 @@ +From c0bfeb20a0d87170c72c72b97b1f80472f582d3a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 09:26:26 +0200 +Subject: macsec: MACsec SCI assignment for ES = 0 + +From: Carlos Fernandez + +[ Upstream commit d9816ec74e6d6aa29219d010bba3f780ba1d9d75 ] + +According to 802.1AE standard, when ES and SC flags in TCI are zero, +used SCI should be the current active SC_RX. Current code uses the +header MAC address. Without this patch, when ES flag is 0 (using a +bridge or switch), header MAC will not fit the SCI and MACSec frames +will be discarted. + +In order to test this issue, MACsec link should be stablished between +two interfaces, setting SC and ES flags to zero and a port identifier +different than one. For example, using ip macsec tools: + +ip link add link $ETH0 macsec0 type macsec port 11 send_sci off +end_station off +ip macsec add macsec0 tx sa 0 pn 2 on key 01 $ETH1_KEY +ip macsec add macsec0 rx port 11 address $ETH1_MAC +ip macsec add macsec0 rx port 11 address $ETH1_MAC sa 0 pn 2 on key 02 +ip link set dev macsec0 up + +ip link add link $ETH1 macsec1 type macsec port 11 send_sci off +end_station off +ip macsec add macsec1 tx sa 0 pn 2 on key 01 $ETH0_KEY +ip macsec add macsec1 rx port 11 address $ETH0_MAC +ip macsec add macsec1 rx port 11 address $ETH0_MAC sa 0 pn 2 on key 02 +ip link set dev macsec1 up + +Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") +Co-developed-by: Andreu Montiel +Signed-off-by: Andreu Montiel +Signed-off-by: Carlos Fernandez +Reviewed-by: Subbaraya Sundeep +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/macsec.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c +index 7c96493a367bf..767053d6c6b6f 100644 +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -243,15 +243,39 @@ static sci_t make_sci(const u8 *addr, __be16 port) + return sci; + } + +-static sci_t macsec_frame_sci(struct macsec_eth_header *hdr, bool sci_present) ++static sci_t macsec_active_sci(struct macsec_secy *secy) + { +- sci_t sci; ++ struct macsec_rx_sc *rx_sc = rcu_dereference_bh(secy->rx_sc); ++ ++ /* Case single RX SC */ ++ if (rx_sc && !rcu_dereference_bh(rx_sc->next)) ++ return (rx_sc->active) ? rx_sc->sci : 0; ++ /* Case no RX SC or multiple */ ++ else ++ return 0; ++} ++ ++static sci_t macsec_frame_sci(struct macsec_eth_header *hdr, bool sci_present, ++ struct macsec_rxh_data *rxd) ++{ ++ struct macsec_dev *macsec; ++ sci_t sci = 0; + +- if (sci_present) ++ /* SC = 1 */ ++ if (sci_present) { + memcpy(&sci, hdr->secure_channel_id, + sizeof(hdr->secure_channel_id)); +- else ++ /* SC = 0; ES = 0 */ ++ } else if ((!(hdr->tci_an & (MACSEC_TCI_ES | MACSEC_TCI_SC))) && ++ (list_is_singular(&rxd->secys))) { ++ /* Only one SECY should exist on this scenario */ ++ macsec = list_first_or_null_rcu(&rxd->secys, struct macsec_dev, ++ secys); ++ if (macsec) ++ return macsec_active_sci(&macsec->secy); ++ } else { + sci = make_sci(hdr->eth.h_source, MACSEC_PORT_ES); ++ } + + return sci; + } +@@ -1105,7 +1129,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) + struct macsec_rxh_data *rxd; + struct macsec_dev *macsec; + unsigned int len; +- sci_t sci; ++ sci_t sci = 0; + u32 hdr_pn; + bool cbit; + struct pcpu_rx_sc_stats *rxsc_stats; +@@ -1152,11 +1176,14 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) + + macsec_skb_cb(skb)->has_sci = !!(hdr->tci_an & MACSEC_TCI_SC); + macsec_skb_cb(skb)->assoc_num = hdr->tci_an & MACSEC_AN_MASK; +- sci = macsec_frame_sci(hdr, macsec_skb_cb(skb)->has_sci); + + rcu_read_lock(); + rxd = macsec_data_rcu(skb->dev); + ++ sci = macsec_frame_sci(hdr, macsec_skb_cb(skb)->has_sci, rxd); ++ if (!sci) ++ goto drop_nosc; ++ + list_for_each_entry_rcu(macsec, &rxd->secys, secys) { + struct macsec_rx_sc *sc = find_rx_sc(&macsec->secy, sci); + +@@ -1279,6 +1306,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) + macsec_rxsa_put(rx_sa); + drop_nosa: + macsec_rxsc_put(rx_sc); ++drop_nosc: + rcu_read_unlock(); + drop_direct: + kfree_skb(skb); +-- +2.39.5 + diff --git a/queue-6.6/net-fix-toctou-issue-in-sk_is_readable.patch b/queue-6.6/net-fix-toctou-issue-in-sk_is_readable.patch new file mode 100644 index 0000000000..1375044c98 --- /dev/null +++ b/queue-6.6/net-fix-toctou-issue-in-sk_is_readable.patch @@ -0,0 +1,52 @@ +From 494618523d8a7183bd08970f1edc3a16b4a43574 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 19:08:03 +0200 +Subject: net: Fix TOCTOU issue in sk_is_readable() + +From: Michal Luczaj + +[ Upstream commit 2660a544fdc0940bba15f70508a46cf9a6491230 ] + +sk->sk_prot->sock_is_readable is a valid function pointer when sk resides +in a sockmap. After the last sk_psock_put() (which usually happens when +socket is removed from sockmap), sk->sk_prot gets restored and +sk->sk_prot->sock_is_readable becomes NULL. + +This makes sk_is_readable() racy, if the value of sk->sk_prot is reloaded +after the initial check. Which in turn may lead to a null pointer +dereference. + +Ensure the function pointer does not turn NULL after the check. + +Fixes: 8934ce2fd081 ("bpf: sockmap redirect ingress support") +Suggested-by: Jakub Sitnicki +Signed-off-by: Michal Luczaj +Reviewed-by: Willem de Bruijn +Link: https://patch.msgid.link/20250609-skisreadable-toctou-v1-1-d0dfb2d62c37@rbox.co +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/net/sock.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/net/sock.h b/include/net/sock.h +index dc625f94ee37b..e15bea43b2ecd 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -3043,8 +3043,11 @@ int sock_ioctl_inout(struct sock *sk, unsigned int cmd, + int sk_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); + static inline bool sk_is_readable(struct sock *sk) + { +- if (sk->sk_prot->sock_is_readable) +- return sk->sk_prot->sock_is_readable(sk); ++ const struct proto *prot = READ_ONCE(sk->sk_prot); ++ ++ if (prot->sock_is_readable) ++ return prot->sock_is_readable(sk); ++ + return false; + } + #endif /* _SOCK_H */ +-- +2.39.5 + diff --git a/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-clause-45-re.patch b/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-clause-45-re.patch new file mode 100644 index 0000000000..0fb1fd31ec --- /dev/null +++ b/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-clause-45-re.patch @@ -0,0 +1,59 @@ +From 6d41fa10f0aaef5717094920295fad68746f7bcd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 17:31:47 +0200 +Subject: net/mdiobus: Fix potential out-of-bounds clause 45 read/write access + +From: Jakub Raczynski + +[ Upstream commit 260388f79e94fb3026c419a208ece8358bb7b555 ] + +When using publicly available tools like 'mdio-tools' to read/write data +from/to network interface and its PHY via C45 (clause 45) mdiobus, +there is no verification of parameters passed to the ioctl and +it accepts any mdio address. +Currently there is support for 32 addresses in kernel via PHY_MAX_ADDR define, +but it is possible to pass higher value than that via ioctl. +While read/write operation should generally fail in this case, +mdiobus provides stats array, where wrong address may allow out-of-bounds +read/write. + +Fix that by adding address verification before C45 read/write operation. +While this excludes this access from any statistics, it improves security of +read/write operation. + +Fixes: 4e4aafcddbbf ("net: mdio: Add dedicated C45 API to MDIO bus drivers") +Signed-off-by: Jakub Raczynski +Reported-by: Wenjing Shan +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/phy/mdio_bus.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c +index 103998969d44c..e02706b7cc1ed 100644 +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -946,6 +946,9 @@ int __mdiobus_c45_read(struct mii_bus *bus, int addr, int devad, u32 regnum) + + lockdep_assert_held_once(&bus->mdio_lock); + ++ if (addr >= PHY_MAX_ADDR) ++ return -ENXIO; ++ + if (bus->read_c45) + retval = bus->read_c45(bus, addr, devad, regnum); + else +@@ -977,6 +980,9 @@ int __mdiobus_c45_write(struct mii_bus *bus, int addr, int devad, u32 regnum, + + lockdep_assert_held_once(&bus->mdio_lock); + ++ if (addr >= PHY_MAX_ADDR) ++ return -ENXIO; ++ + if (bus->write_c45) + err = bus->write_c45(bus, addr, devad, regnum, val); + else +-- +2.39.5 + diff --git a/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-read-write-a.patch b/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-read-write-a.patch new file mode 100644 index 0000000000..661a98c8bc --- /dev/null +++ b/queue-6.6/net-mdiobus-fix-potential-out-of-bounds-read-write-a.patch @@ -0,0 +1,58 @@ +From 9fa50c1024553654ee5add3ebbc464d9d2d9ee89 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 9 Jun 2025 17:31:46 +0200 +Subject: net/mdiobus: Fix potential out-of-bounds read/write access + +From: Jakub Raczynski + +[ Upstream commit 0e629694126ca388916f059453a1c36adde219c4 ] + +When using publicly available tools like 'mdio-tools' to read/write data +from/to network interface and its PHY via mdiobus, there is no verification of +parameters passed to the ioctl and it accepts any mdio address. +Currently there is support for 32 addresses in kernel via PHY_MAX_ADDR define, +but it is possible to pass higher value than that via ioctl. +While read/write operation should generally fail in this case, +mdiobus provides stats array, where wrong address may allow out-of-bounds +read/write. + +Fix that by adding address verification before read/write operation. +While this excludes this access from any statistics, it improves security of +read/write operation. + +Fixes: 080bb352fad00 ("net: phy: Maintain MDIO device and bus statistics") +Signed-off-by: Jakub Raczynski +Reported-by: Wenjing Shan +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/phy/mdio_bus.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c +index 25dcaa49ab8be..103998969d44c 100644 +--- a/drivers/net/phy/mdio_bus.c ++++ b/drivers/net/phy/mdio_bus.c +@@ -850,6 +850,9 @@ int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum) + + lockdep_assert_held_once(&bus->mdio_lock); + ++ if (addr >= PHY_MAX_ADDR) ++ return -ENXIO; ++ + if (bus->read) + retval = bus->read(bus, addr, regnum); + else +@@ -879,6 +882,9 @@ int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val) + + lockdep_assert_held_once(&bus->mdio_lock); + ++ if (addr >= PHY_MAX_ADDR) ++ return -ENXIO; ++ + if (bus->write) + err = bus->write(bus, addr, regnum, val); + else +-- +2.39.5 + diff --git a/queue-6.6/net-mlx5-ensure-fw-pages-are-always-allocated-on-sam.patch b/queue-6.6/net-mlx5-ensure-fw-pages-are-always-allocated-on-sam.patch new file mode 100644 index 0000000000..e8500d8155 --- /dev/null +++ b/queue-6.6/net-mlx5-ensure-fw-pages-are-always-allocated-on-sam.patch @@ -0,0 +1,43 @@ +From 4e47b5d6b9c3986831352384eae78d47518b1722 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 18:15:06 +0300 +Subject: net/mlx5: Ensure fw pages are always allocated on same NUMA + +From: Moshe Shemesh + +[ Upstream commit f37258133c1e95e61db532e14067e28b4881bf24 ] + +When firmware asks the driver to allocate more pages, using event of +give_pages, the driver should always allocate it from same NUMA, the +original device NUMA. Current code uses dev_to_node() which can result +in different NUMA as it is changed by other driver flows, such as +mlx5_dma_zalloc_coherent_node(). Instead, use saved numa node for +allocating firmware pages. + +Fixes: 311c7c71c9bb ("net/mlx5e: Allocate DMA coherent memory on reader NUMA node") +Signed-off-by: Moshe Shemesh +Reviewed-by: Tariq Toukan +Signed-off-by: Mark Bloch +Link: https://patch.msgid.link/20250610151514.1094735-2-mbloch@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +index dcf58efac159c..e0581c6f9cecd 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +@@ -291,7 +291,7 @@ static void free_4k(struct mlx5_core_dev *dev, u64 addr, u32 function) + static int alloc_system_page(struct mlx5_core_dev *dev, u32 function) + { + struct device *device = mlx5_core_dma_dev(dev); +- int nid = dev_to_node(device); ++ int nid = dev->priv.numa_node; + struct page *page; + u64 zero_addr = 1; + u64 addr; +-- +2.39.5 + diff --git a/queue-6.6/net-mlx5-fix-ecvf-vports-unload-on-shutdown-flow.patch b/queue-6.6/net-mlx5-fix-ecvf-vports-unload-on-shutdown-flow.patch new file mode 100644 index 0000000000..fdc42464d0 --- /dev/null +++ b/queue-6.6/net-mlx5-fix-ecvf-vports-unload-on-shutdown-flow.patch @@ -0,0 +1,106 @@ +From 75be15befdc90ae111add248efd138d251cd8e19 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 18:15:07 +0300 +Subject: net/mlx5: Fix ECVF vports unload on shutdown flow + +From: Amir Tzin + +[ Upstream commit 687560d8a9a2d654829ad0da1ec24242f1de711d ] + +Fix shutdown flow UAF when a virtual function is created on the embedded +chip (ECVF) of a BlueField device. In such case the vport acl ingress +table is not properly destroyed. + +ECVF functionality is independent of ecpf_vport_exists capability and +thus functions mlx5_eswitch_(enable|disable)_pf_vf_vports() should not +test it when enabling/disabling ECVF vports. + +kernel log: +[] refcount_t: underflow; use-after-free. +[] WARNING: CPU: 3 PID: 1 at lib/refcount.c:28 + refcount_warn_saturate+0x124/0x220 +---------------- +[] Call trace: +[] refcount_warn_saturate+0x124/0x220 +[] tree_put_node+0x164/0x1e0 [mlx5_core] +[] mlx5_destroy_flow_table+0x98/0x2c0 [mlx5_core] +[] esw_acl_ingress_table_destroy+0x28/0x40 [mlx5_core] +[] esw_acl_ingress_lgcy_cleanup+0x80/0xf4 [mlx5_core] +[] esw_legacy_vport_acl_cleanup+0x44/0x60 [mlx5_core] +[] esw_vport_cleanup+0x64/0x90 [mlx5_core] +[] mlx5_esw_vport_disable+0xc0/0x1d0 [mlx5_core] +[] mlx5_eswitch_unload_ec_vf_vports+0xcc/0x150 [mlx5_core] +[] mlx5_eswitch_disable_sriov+0x198/0x2a0 [mlx5_core] +[] mlx5_device_disable_sriov+0xb8/0x1e0 [mlx5_core] +[] mlx5_sriov_detach+0x40/0x50 [mlx5_core] +[] mlx5_unload+0x40/0xc4 [mlx5_core] +[] mlx5_unload_one_devl_locked+0x6c/0xe4 [mlx5_core] +[] mlx5_unload_one+0x3c/0x60 [mlx5_core] +[] shutdown+0x7c/0xa4 [mlx5_core] +[] pci_device_shutdown+0x3c/0xa0 +[] device_shutdown+0x170/0x340 +[] __do_sys_reboot+0x1f4/0x2a0 +[] __arm64_sys_reboot+0x2c/0x40 +[] invoke_syscall+0x78/0x100 +[] el0_svc_common.constprop.0+0x54/0x184 +[] do_el0_svc+0x30/0xac +[] el0_svc+0x48/0x160 +[] el0t_64_sync_handler+0xa4/0x12c +[] el0t_64_sync+0x1a4/0x1a8 +[] --[ end trace 9c4601d68c70030e ]--- + +Fixes: a7719b29a821 ("net/mlx5: Add management of EC VF vports") +Reviewed-by: Daniel Jurgens +Reviewed-by: Moshe Shemesh +Signed-off-by: Amir Tzin +Signed-off-by: Mark Bloch +Link: https://patch.msgid.link/20250610151514.1094735-3-mbloch@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + .../net/ethernet/mellanox/mlx5/core/eswitch.c | 21 ++++++++++++------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +index f6022c135ec02..914b380fd3eeb 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +@@ -1295,12 +1295,15 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw, + ret = mlx5_eswitch_load_pf_vf_vport(esw, MLX5_VPORT_ECPF, enabled_events); + if (ret) + goto ecpf_err; +- if (mlx5_core_ec_sriov_enabled(esw->dev)) { +- ret = mlx5_eswitch_load_ec_vf_vports(esw, esw->esw_funcs.num_ec_vfs, +- enabled_events); +- if (ret) +- goto ec_vf_err; +- } ++ } ++ ++ /* Enable ECVF vports */ ++ if (mlx5_core_ec_sriov_enabled(esw->dev)) { ++ ret = mlx5_eswitch_load_ec_vf_vports(esw, ++ esw->esw_funcs.num_ec_vfs, ++ enabled_events); ++ if (ret) ++ goto ec_vf_err; + } + + /* Enable VF vports */ +@@ -1331,9 +1334,11 @@ void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw) + { + mlx5_eswitch_unload_vf_vports(esw, esw->esw_funcs.num_vfs); + ++ if (mlx5_core_ec_sriov_enabled(esw->dev)) ++ mlx5_eswitch_unload_ec_vf_vports(esw, ++ esw->esw_funcs.num_ec_vfs); ++ + if (mlx5_ecpf_vport_exists(esw->dev)) { +- if (mlx5_core_ec_sriov_enabled(esw->dev)) +- mlx5_eswitch_unload_ec_vf_vports(esw, esw->esw_funcs.num_vfs); + mlx5_eswitch_unload_pf_vf_vport(esw, MLX5_VPORT_ECPF); + } + +-- +2.39.5 + diff --git a/queue-6.6/net-mlx5-fix-return-value-when-searching-for-existin.patch b/queue-6.6/net-mlx5-fix-return-value-when-searching-for-existin.patch new file mode 100644 index 0000000000..fc18138c01 --- /dev/null +++ b/queue-6.6/net-mlx5-fix-return-value-when-searching-for-existin.patch @@ -0,0 +1,61 @@ +From ccdabd4464ce217f0fc16d81d43ac58876da5674 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 18:15:08 +0300 +Subject: net/mlx5: Fix return value when searching for existing flow group + +From: Patrisious Haddad + +[ Upstream commit 8ec40e3f1f72bf8f8accf18020d487caa99f46a4 ] + +When attempting to add a rule to an existing flow group, if a matching +flow group exists but is not active, the error code returned should be +EAGAIN, so that the rule can be added to the matching flow group once +it is active, rather than ENOENT, which indicates that no matching +flow group was found. + +Fixes: bd71b08ec2ee ("net/mlx5: Support multiple updates of steering rules in parallel") +Signed-off-by: Gavi Teitz +Signed-off-by: Roi Dayan +Signed-off-by: Patrisious Haddad +Reviewed-by: Tariq Toukan +Signed-off-by: Mark Bloch +Link: https://patch.msgid.link/20250610151514.1094735-4-mbloch@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +index d2dc375f5e49c..5f35a6fc03054 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +@@ -1984,6 +1984,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, + struct mlx5_flow_handle *rule; + struct match_list *iter; + bool take_write = false; ++ bool try_again = false; + struct fs_fte *fte; + u64 version = 0; + int err; +@@ -2043,6 +2044,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, + nested_down_write_ref_node(&g->node, FS_LOCK_PARENT); + + if (!g->node.active) { ++ try_again = true; + up_write_ref_node(&g->node, false); + continue; + } +@@ -2064,7 +2066,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, + tree_put_node(&fte->node, false); + return rule; + } +- rule = ERR_PTR(-ENOENT); ++ err = try_again ? -EAGAIN : -ENOENT; ++ rule = ERR_PTR(err); + out: + kmem_cache_free(steering->ftes_cache, fte); + return rule; +-- +2.39.5 + diff --git a/queue-6.6/net-mlx5e-fix-leak-of-geneve-tlv-option-object.patch b/queue-6.6/net-mlx5e-fix-leak-of-geneve-tlv-option-object.patch new file mode 100644 index 0000000000..1125245d14 --- /dev/null +++ b/queue-6.6/net-mlx5e-fix-leak-of-geneve-tlv-option-object.patch @@ -0,0 +1,79 @@ +From 9a23a20e2d4e3b79da4165d3b158442e7df3e32e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 18:15:13 +0300 +Subject: net/mlx5e: Fix leak of Geneve TLV option object + +From: Jianbo Liu + +[ Upstream commit aa9c44b842096c553871bc68a8cebc7861fa192b ] + +Previously, a unique tunnel id was added for the matching on TC +non-zero chains, to support inner header rewrite with goto action. +Later, it was used to support VF tunnel offload for vxlan, then for +Geneve and GRE. To support VF tunnel, a temporary mlx5_flow_spec is +used to parse tunnel options. For Geneve, if there is TLV option, a +object is created, or refcnt is added if already exists. But the +temporary mlx5_flow_spec is directly freed after parsing, which causes +the leak because no information regarding the object is saved in +flow's mlx5_flow_spec, which is used to free the object when deleting +the flow. + +To fix the leak, call mlx5_geneve_tlv_option_del() before free the +temporary spec if it has TLV object. + +Fixes: 521933cdc4aa ("net/mlx5e: Support Geneve and GRE with VF tunnel offload") +Signed-off-by: Jianbo Liu +Reviewed-by: Tariq Toukan +Reviewed-by: Alex Lazar +Signed-off-by: Mark Bloch +Link: https://patch.msgid.link/20250610151514.1094735-9-mbloch@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +index dc9b157a44993..2be9c69daad5f 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +@@ -1915,9 +1915,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, + return err; + } + +-static bool mlx5_flow_has_geneve_opt(struct mlx5e_tc_flow *flow) ++static bool mlx5_flow_has_geneve_opt(struct mlx5_flow_spec *spec) + { +- struct mlx5_flow_spec *spec = &flow->attr->parse_attr->spec; + void *headers_v = MLX5_ADDR_OF(fte_match_param, + spec->match_value, + misc_parameters_3); +@@ -1956,7 +1955,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv, + } + complete_all(&flow->del_hw_done); + +- if (mlx5_flow_has_geneve_opt(flow)) ++ if (mlx5_flow_has_geneve_opt(&attr->parse_attr->spec)) + mlx5_geneve_tlv_option_del(priv->mdev->geneve); + + if (flow->decap_route) +@@ -2456,12 +2455,13 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, + + err = mlx5e_tc_tun_parse(filter_dev, priv, tmp_spec, f, match_level); + if (err) { +- kvfree(tmp_spec); + NL_SET_ERR_MSG_MOD(extack, "Failed to parse tunnel attributes"); + netdev_warn(priv->netdev, "Failed to parse tunnel attributes"); +- return err; ++ } else { ++ err = mlx5e_tc_set_attr_rx_tun(flow, tmp_spec); + } +- err = mlx5e_tc_set_attr_rx_tun(flow, tmp_spec); ++ if (mlx5_flow_has_geneve_opt(tmp_spec)) ++ mlx5_geneve_tlv_option_del(priv->mdev->geneve); + kvfree(tmp_spec); + if (err) + return err; +-- +2.39.5 + diff --git a/queue-6.6/net_sched-ets-fix-a-race-in-ets_qdisc_change.patch b/queue-6.6/net_sched-ets-fix-a-race-in-ets_qdisc_change.patch new file mode 100644 index 0000000000..b50fd4c54c --- /dev/null +++ b/queue-6.6/net_sched-ets-fix-a-race-in-ets_qdisc_change.patch @@ -0,0 +1,58 @@ +From ab938636006370949c4b174ac8546e6114b77a90 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:15:14 +0000 +Subject: net_sched: ets: fix a race in ets_qdisc_change() + +From: Eric Dumazet + +[ Upstream commit d92adacdd8c2960be856e0b82acc5b7c5395fddb ] + +Gerrard Tai reported a race condition in ETS, whenever SFQ perturb timer +fires at the wrong time. + +The race is as follows: + +CPU 0 CPU 1 +[1]: lock root +[2]: qdisc_tree_flush_backlog() +[3]: unlock root + | + | [5]: lock root + | [6]: rehash + | [7]: qdisc_tree_reduce_backlog() + | +[4]: qdisc_put() + +This can be abused to underflow a parent's qlen. + +Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() +should fix the race, because all packets will be purged from the qdisc +before releasing the lock. + +Fixes: b05972f01e7d ("net: sched: tbf: don't call qdisc_put() while holding tree lock") +Reported-by: Gerrard Tai +Suggested-by: Gerrard Tai +Signed-off-by: Eric Dumazet +Link: https://patch.msgid.link/20250611111515.1983366-5-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_ets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/sch_ets.c b/net/sched/sch_ets.c +index 9da86db4d2c2f..3ee46f6e005da 100644 +--- a/net/sched/sch_ets.c ++++ b/net/sched/sch_ets.c +@@ -661,7 +661,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt, + for (i = q->nbands; i < oldbands; i++) { + if (i >= q->nstrict && q->classes[i].qdisc->q.qlen) + list_del_init(&q->classes[i].alist); +- qdisc_tree_flush_backlog(q->classes[i].qdisc); ++ qdisc_purge_queue(q->classes[i].qdisc); + } + q->nstrict = nstrict; + memcpy(q->prio2band, priomap, sizeof(priomap)); +-- +2.39.5 + diff --git a/queue-6.6/net_sched-prio-fix-a-race-in-prio_tune.patch b/queue-6.6/net_sched-prio-fix-a-race-in-prio_tune.patch new file mode 100644 index 0000000000..7679b26619 --- /dev/null +++ b/queue-6.6/net_sched-prio-fix-a-race-in-prio_tune.patch @@ -0,0 +1,58 @@ +From f06708cee2e3146b58ca7bccad38045630ec2f07 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:15:11 +0000 +Subject: net_sched: prio: fix a race in prio_tune() + +From: Eric Dumazet + +[ Upstream commit d35acc1be3480505b5931f17e4ea9b7617fea4d3 ] + +Gerrard Tai reported a race condition in PRIO, whenever SFQ perturb timer +fires at the wrong time. + +The race is as follows: + +CPU 0 CPU 1 +[1]: lock root +[2]: qdisc_tree_flush_backlog() +[3]: unlock root + | + | [5]: lock root + | [6]: rehash + | [7]: qdisc_tree_reduce_backlog() + | +[4]: qdisc_put() + +This can be abused to underflow a parent's qlen. + +Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() +should fix the race, because all packets will be purged from the qdisc +before releasing the lock. + +Fixes: 7b8e0b6e6599 ("net: sched: prio: delay destroying child qdiscs on change") +Reported-by: Gerrard Tai +Suggested-by: Gerrard Tai +Signed-off-by: Eric Dumazet +Link: https://patch.msgid.link/20250611111515.1983366-2-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_prio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c +index fdc5ef52c3ee9..fdd9caa41e80f 100644 +--- a/net/sched/sch_prio.c ++++ b/net/sched/sch_prio.c +@@ -211,7 +211,7 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt, + memcpy(q->prio2band, qopt->priomap, TC_PRIO_MAX+1); + + for (i = q->bands; i < oldbands; i++) +- qdisc_tree_flush_backlog(q->queues[i]); ++ qdisc_purge_queue(q->queues[i]); + + for (i = oldbands; i < q->bands; i++) { + q->queues[i] = queues[i]; +-- +2.39.5 + diff --git a/queue-6.6/net_sched-red-fix-a-race-in-__red_change.patch b/queue-6.6/net_sched-red-fix-a-race-in-__red_change.patch new file mode 100644 index 0000000000..4760b74f98 --- /dev/null +++ b/queue-6.6/net_sched-red-fix-a-race-in-__red_change.patch @@ -0,0 +1,58 @@ +From be2718c54e33cfa41a3e3857836887223bb517bf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:15:12 +0000 +Subject: net_sched: red: fix a race in __red_change() + +From: Eric Dumazet + +[ Upstream commit 85a3e0ede38450ea3053b8c45d28cf55208409b8 ] + +Gerrard Tai reported a race condition in RED, whenever SFQ perturb timer +fires at the wrong time. + +The race is as follows: + +CPU 0 CPU 1 +[1]: lock root +[2]: qdisc_tree_flush_backlog() +[3]: unlock root + | + | [5]: lock root + | [6]: rehash + | [7]: qdisc_tree_reduce_backlog() + | +[4]: qdisc_put() + +This can be abused to underflow a parent's qlen. + +Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() +should fix the race, because all packets will be purged from the qdisc +before releasing the lock. + +Fixes: 0c8d13ac9607 ("net: sched: red: delay destroying child qdisc on replace") +Reported-by: Gerrard Tai +Suggested-by: Gerrard Tai +Signed-off-by: Eric Dumazet +Link: https://patch.msgid.link/20250611111515.1983366-3-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_red.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c +index 16277b6a0238d..3c6b4460cf2c0 100644 +--- a/net/sched/sch_red.c ++++ b/net/sched/sch_red.c +@@ -283,7 +283,7 @@ static int __red_change(struct Qdisc *sch, struct nlattr **tb, + q->userbits = userbits; + q->limit = ctl->limit; + if (child) { +- qdisc_tree_flush_backlog(q->qdisc); ++ qdisc_purge_queue(q->qdisc); + old_child = q->qdisc; + q->qdisc = child; + } +-- +2.39.5 + diff --git a/queue-6.6/net_sched-sch_sfq-fix-a-potential-crash-on-gso_skb-h.patch b/queue-6.6/net_sched-sch_sfq-fix-a-potential-crash-on-gso_skb-h.patch new file mode 100644 index 0000000000..ebab4adf7c --- /dev/null +++ b/queue-6.6/net_sched-sch_sfq-fix-a-potential-crash-on-gso_skb-h.patch @@ -0,0 +1,70 @@ +From 40de16219b5f89d5bb9d543b6eebb9ad9d97cfbc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 6 Jun 2025 16:51:27 +0000 +Subject: net_sched: sch_sfq: fix a potential crash on gso_skb handling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Eric Dumazet + +[ Upstream commit 82ffbe7776d0ac084031f114167712269bf3d832 ] + +SFQ has an assumption of always being able to queue at least one packet. + +However, after the blamed commit, sch->q.len can be inflated by packets +in sch->gso_skb, and an enqueue() on an empty SFQ qdisc can be followed +by an immediate drop. + +Fix sfq_drop() to properly clear q->tail in this situation. + +Tested: + +ip netns add lb +ip link add dev to-lb type veth peer name in-lb netns lb +ethtool -K to-lb tso off # force qdisc to requeue gso_skb +ip netns exec lb ethtool -K in-lb gro on # enable NAPI +ip link set dev to-lb up +ip -netns lb link set dev in-lb up +ip addr add dev to-lb 192.168.20.1/24 +ip -netns lb addr add dev in-lb 192.168.20.2/24 +tc qdisc replace dev to-lb root sfq limit 100 + +ip netns exec lb netserver + +netperf -H 192.168.20.2 -l 100 & +netperf -H 192.168.20.2 -l 100 & +netperf -H 192.168.20.2 -l 100 & +netperf -H 192.168.20.2 -l 100 & + +Fixes: a53851e2c321 ("net: sched: explicit locking in gso_cpu fallback") +Reported-by: Marcus Wichelmann +Closes: https://lore.kernel.org/netdev/9da42688-bfaa-4364-8797-e9271f3bdaef@hetzner-cloud.de/ +Signed-off-by: Eric Dumazet +Reviewed-by: Toke Høiland-Jørgensen +Link: https://patch.msgid.link/20250606165127.3629486-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_sfq.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c +index 002941d35b643..d564675a8be4d 100644 +--- a/net/sched/sch_sfq.c ++++ b/net/sched/sch_sfq.c +@@ -310,7 +310,10 @@ static unsigned int sfq_drop(struct Qdisc *sch, struct sk_buff **to_free) + /* It is difficult to believe, but ALL THE SLOTS HAVE LENGTH 1. */ + x = q->tail->next; + slot = &q->slots[x]; +- q->tail->next = slot->next; ++ if (slot->next == x) ++ q->tail = NULL; /* no more active slots */ ++ else ++ q->tail->next = slot->next; + q->ht[slot->hash] = SFQ_EMPTY_SLOT; + goto drop; + } +-- +2.39.5 + diff --git a/queue-6.6/net_sched-tbf-fix-a-race-in-tbf_change.patch b/queue-6.6/net_sched-tbf-fix-a-race-in-tbf_change.patch new file mode 100644 index 0000000000..6d0ec4817f --- /dev/null +++ b/queue-6.6/net_sched-tbf-fix-a-race-in-tbf_change.patch @@ -0,0 +1,59 @@ +From fb832e4be45ce1115e70a3bb412f6db48ce28e98 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Jun 2025 11:15:13 +0000 +Subject: net_sched: tbf: fix a race in tbf_change() + +From: Eric Dumazet + +[ Upstream commit 43eb466041216d25dedaef1c383ad7bd89929cbc ] + +Gerrard Tai reported a race condition in TBF, whenever SFQ perturb timer +fires at the wrong time. + +The race is as follows: + +CPU 0 CPU 1 +[1]: lock root +[2]: qdisc_tree_flush_backlog() +[3]: unlock root + | + | [5]: lock root + | [6]: rehash + | [7]: qdisc_tree_reduce_backlog() + | +[4]: qdisc_put() + +This can be abused to underflow a parent's qlen. + +Calling qdisc_purge_queue() instead of qdisc_tree_flush_backlog() +should fix the race, because all packets will be purged from the qdisc +before releasing the lock. + +Fixes: b05972f01e7d ("net: sched: tbf: don't call qdisc_put() while holding tree lock") +Reported-by: Gerrard Tai +Suggested-by: Gerrard Tai +Signed-off-by: Eric Dumazet +Cc: Zhengchao Shao +Link: https://patch.msgid.link/20250611111515.1983366-4-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/sched/sch_tbf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c +index f92174008499b..61dd5c8f23101 100644 +--- a/net/sched/sch_tbf.c ++++ b/net/sched/sch_tbf.c +@@ -452,7 +452,7 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt, + + sch_tree_lock(sch); + if (child) { +- qdisc_tree_flush_backlog(q->qdisc); ++ qdisc_purge_queue(q->qdisc); + old = q->qdisc; + q->qdisc = child; + } +-- +2.39.5 + diff --git a/queue-6.6/pinctrl-qcom-pinctrl-qcm2290-add-missing-pins.patch b/queue-6.6/pinctrl-qcom-pinctrl-qcm2290-add-missing-pins.patch new file mode 100644 index 0000000000..541a3561b1 --- /dev/null +++ b/queue-6.6/pinctrl-qcom-pinctrl-qcm2290-add-missing-pins.patch @@ -0,0 +1,57 @@ +From c506186017e64509cbdc9ef97132b84b8f933c80 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 May 2025 12:14:37 +0200 +Subject: pinctrl: qcom: pinctrl-qcm2290: Add missing pins + +From: Wojciech Slenska + +[ Upstream commit 315345610faee8a0568b522dba9e35067d1732ab ] + +Added the missing pins to the qcm2290_pins table. + +Signed-off-by: Wojciech Slenska +Fixes: 48e049ef1238 ("pinctrl: qcom: Add QCM2290 pinctrl driver") +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/20250523101437.59092-1-wojciech.slenska@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/pinctrl/qcom/pinctrl-qcm2290.c b/drivers/pinctrl/qcom/pinctrl-qcm2290.c +index f5c1c427b44e9..61b7c22e963c2 100644 +--- a/drivers/pinctrl/qcom/pinctrl-qcm2290.c ++++ b/drivers/pinctrl/qcom/pinctrl-qcm2290.c +@@ -165,6 +165,10 @@ static const struct pinctrl_pin_desc qcm2290_pins[] = { + PINCTRL_PIN(62, "GPIO_62"), + PINCTRL_PIN(63, "GPIO_63"), + PINCTRL_PIN(64, "GPIO_64"), ++ PINCTRL_PIN(65, "GPIO_65"), ++ PINCTRL_PIN(66, "GPIO_66"), ++ PINCTRL_PIN(67, "GPIO_67"), ++ PINCTRL_PIN(68, "GPIO_68"), + PINCTRL_PIN(69, "GPIO_69"), + PINCTRL_PIN(70, "GPIO_70"), + PINCTRL_PIN(71, "GPIO_71"), +@@ -179,12 +183,17 @@ static const struct pinctrl_pin_desc qcm2290_pins[] = { + PINCTRL_PIN(80, "GPIO_80"), + PINCTRL_PIN(81, "GPIO_81"), + PINCTRL_PIN(82, "GPIO_82"), ++ PINCTRL_PIN(83, "GPIO_83"), ++ PINCTRL_PIN(84, "GPIO_84"), ++ PINCTRL_PIN(85, "GPIO_85"), + PINCTRL_PIN(86, "GPIO_86"), + PINCTRL_PIN(87, "GPIO_87"), + PINCTRL_PIN(88, "GPIO_88"), + PINCTRL_PIN(89, "GPIO_89"), + PINCTRL_PIN(90, "GPIO_90"), + PINCTRL_PIN(91, "GPIO_91"), ++ PINCTRL_PIN(92, "GPIO_92"), ++ PINCTRL_PIN(93, "GPIO_93"), + PINCTRL_PIN(94, "GPIO_94"), + PINCTRL_PIN(95, "GPIO_95"), + PINCTRL_PIN(96, "GPIO_96"), +-- +2.39.5 + diff --git a/queue-6.6/powerpc-powernv-memtrace-fix-out-of-bounds-issue-in-.patch b/queue-6.6/powerpc-powernv-memtrace-fix-out-of-bounds-issue-in-.patch new file mode 100644 index 0000000000..acec921904 --- /dev/null +++ b/queue-6.6/powerpc-powernv-memtrace-fix-out-of-bounds-issue-in-.patch @@ -0,0 +1,48 @@ +From 11ebb5813841272e2b23d0bcf80c2a93b66c7bbf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 07:42:26 +0530 +Subject: powerpc/powernv/memtrace: Fix out of bounds issue in memtrace mmap + +From: Ritesh Harjani (IBM) + +[ Upstream commit cd097df4596f3a1e9d75eb8520162de1eb8485b2 ] + +memtrace mmap issue has an out of bounds issue. This patch fixes the by +checking that the requested mapping region size should stay within the +allocated region size. + +Reported-by: Jonathan Greental +Fixes: 08a022ad3dfa ("powerpc/powernv/memtrace: Allow mmaping trace buffers") +Signed-off-by: Ritesh Harjani (IBM) +Signed-off-by: Madhavan Srinivasan +Link: https://patch.msgid.link/20250610021227.361980-1-maddy@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/powernv/memtrace.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/platforms/powernv/memtrace.c b/arch/powerpc/platforms/powernv/memtrace.c +index 877720c645151..35471b679638a 100644 +--- a/arch/powerpc/platforms/powernv/memtrace.c ++++ b/arch/powerpc/platforms/powernv/memtrace.c +@@ -48,11 +48,15 @@ static ssize_t memtrace_read(struct file *filp, char __user *ubuf, + static int memtrace_mmap(struct file *filp, struct vm_area_struct *vma) + { + struct memtrace_entry *ent = filp->private_data; ++ unsigned long ent_nrpages = ent->size >> PAGE_SHIFT; ++ unsigned long vma_nrpages = vma_pages(vma); + +- if (ent->size < vma->vm_end - vma->vm_start) ++ /* The requested page offset should be within object's page count */ ++ if (vma->vm_pgoff >= ent_nrpages) + return -EINVAL; + +- if (vma->vm_pgoff << PAGE_SHIFT >= ent->size) ++ /* The requested mapping range should remain within the bounds */ ++ if (vma_nrpages > ent_nrpages - vma->vm_pgoff) + return -EINVAL; + + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +-- +2.39.5 + diff --git a/queue-6.6/powerpc-vas-return-einval-if-the-offset-is-non-zero-.patch b/queue-6.6/powerpc-vas-return-einval-if-the-offset-is-non-zero-.patch new file mode 100644 index 0000000000..a70158debd --- /dev/null +++ b/queue-6.6/powerpc-vas-return-einval-if-the-offset-is-non-zero-.patch @@ -0,0 +1,52 @@ +From 40e5677b7c0d817f17ad605427954c46e201d0bc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Jun 2025 07:42:27 +0530 +Subject: powerpc/vas: Return -EINVAL if the offset is non-zero in mmap() + +From: Haren Myneni + +[ Upstream commit 0d67f0dee6c9176bc09a5482dd7346e3a0f14d0b ] + +The user space calls mmap() to map VAS window paste address +and the kernel returns the complete mapped page for each +window. So return -EINVAL if non-zero is passed for offset +parameter to mmap(). + +See Documentation/arch/powerpc/vas-api.rst for mmap() +restrictions. + +Co-developed-by: Jonathan Greental +Signed-off-by: Jonathan Greental +Reported-by: Jonathan Greental +Fixes: dda44eb29c23 ("powerpc/vas: Add VAS user space API") +Signed-off-by: Haren Myneni +Signed-off-by: Madhavan Srinivasan +Link: https://patch.msgid.link/20250610021227.361980-2-maddy@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/book3s/vas-api.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/powerpc/platforms/book3s/vas-api.c b/arch/powerpc/platforms/book3s/vas-api.c +index 0b6365d85d117..dc6f75d3ac6ef 100644 +--- a/arch/powerpc/platforms/book3s/vas-api.c ++++ b/arch/powerpc/platforms/book3s/vas-api.c +@@ -521,6 +521,15 @@ static int coproc_mmap(struct file *fp, struct vm_area_struct *vma) + return -EINVAL; + } + ++ /* ++ * Map complete page to the paste address. So the user ++ * space should pass 0ULL to the offset parameter. ++ */ ++ if (vma->vm_pgoff) { ++ pr_debug("Page offset unsupported to map paste address\n"); ++ return -EINVAL; ++ } ++ + /* Ensure instance has an open send window */ + if (!txwin) { + pr_err("No send window open?\n"); +-- +2.39.5 + diff --git a/queue-6.6/ptp-remove-ptp-n_vclocks-check-logic-in-ptp_vclock_i.patch b/queue-6.6/ptp-remove-ptp-n_vclocks-check-logic-in-ptp_vclock_i.patch new file mode 100644 index 0000000000..f13b1a9457 --- /dev/null +++ b/queue-6.6/ptp-remove-ptp-n_vclocks-check-logic-in-ptp_vclock_i.patch @@ -0,0 +1,90 @@ +From 5284716234e7248f00822ac9f78d0613bec501ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 May 2025 01:07:17 +0900 +Subject: ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use() + +From: Jeongjun Park + +[ Upstream commit 87f7ce260a3c838b49e1dc1ceedf1006795157a2 ] + +There is no disagreement that we should check both ptp->is_virtual_clock +and ptp->n_vclocks to check if the ptp virtual clock is in use. + +However, when we acquire ptp->n_vclocks_mux to read ptp->n_vclocks in +ptp_vclock_in_use(), we observe a recursive lock in the call trace +starting from n_vclocks_store(). + +============================================ +WARNING: possible recursive locking detected +6.15.0-rc6 #1 Not tainted +-------------------------------------------- +syz.0.1540/13807 is trying to acquire lock: +ffff888035a24868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at: + ptp_vclock_in_use drivers/ptp/ptp_private.h:103 [inline] +ffff888035a24868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at: + ptp_clock_unregister+0x21/0x250 drivers/ptp/ptp_clock.c:415 + +but task is already holding lock: +ffff888030704868 (&ptp->n_vclocks_mux){+.+.}-{4:4}, at: + n_vclocks_store+0xf1/0x6d0 drivers/ptp/ptp_sysfs.c:215 + +other info that might help us debug this: + Possible unsafe locking scenario: + + CPU0 + ---- + lock(&ptp->n_vclocks_mux); + lock(&ptp->n_vclocks_mux); + + *** DEADLOCK *** +.... +============================================ + +The best way to solve this is to remove the logic that checks +ptp->n_vclocks in ptp_vclock_in_use(). + +The reason why this is appropriate is that any path that uses +ptp->n_vclocks must unconditionally check if ptp->n_vclocks is greater +than 0 before unregistering vclocks, and all functions are already +written this way. And in the function that uses ptp->n_vclocks, we +already get ptp->n_vclocks_mux before unregistering vclocks. + +Therefore, we need to remove the redundant check for ptp->n_vclocks in +ptp_vclock_in_use() to prevent recursive locking. + +Fixes: 73f37068d540 ("ptp: support ptp physical/virtual clocks conversion") +Signed-off-by: Jeongjun Park +Acked-by: Richard Cochran +Link: https://patch.msgid.link/20250520160717.7350-1-aha310510@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_private.h | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h +index b8d4f61f14be4..d0eb4555720eb 100644 +--- a/drivers/ptp/ptp_private.h ++++ b/drivers/ptp/ptp_private.h +@@ -89,17 +89,7 @@ static inline int queue_cnt(const struct timestamp_event_queue *q) + /* Check if ptp virtual clock is in use */ + static inline bool ptp_vclock_in_use(struct ptp_clock *ptp) + { +- bool in_use = false; +- +- if (mutex_lock_interruptible(&ptp->n_vclocks_mux)) +- return true; +- +- if (!ptp->is_virtual_clock && ptp->n_vclocks) +- in_use = true; +- +- mutex_unlock(&ptp->n_vclocks_mux); +- +- return in_use; ++ return !ptp->is_virtual_clock; + } + + /* Check if ptp clock shall be free running */ +-- +2.39.5 + diff --git a/queue-6.6/regulator-max20086-fix-refcount-leak-in-max20086_par.patch b/queue-6.6/regulator-max20086-fix-refcount-leak-in-max20086_par.patch new file mode 100644 index 0000000000..871bc064eb --- /dev/null +++ b/queue-6.6/regulator-max20086-fix-refcount-leak-in-max20086_par.patch @@ -0,0 +1,61 @@ +From a4b6c10b40407ff8973a20462c9137b672be9bc9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 27 May 2025 08:44:14 +0300 +Subject: regulator: max20086: Fix refcount leak in + max20086_parse_regulators_dt() + +From: Dan Carpenter + +[ Upstream commit 06118ae36855b7d3d22688298e74a766ccf0cb7a ] + +There is a missing call to of_node_put() if devm_kcalloc() fails. +Fix this by changing the code to use cleanup.h magic to drop the +refcount. + +Fixes: 6b0cd72757c6 ("regulator: max20086: fix invalid memory access") +Signed-off-by: Dan Carpenter +Link: https://patch.msgid.link/aDVRLqgJWMxYU03G@stanley.mountain +Reviewed-by: Laurent Pinchart +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/regulator/max20086-regulator.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/regulator/max20086-regulator.c b/drivers/regulator/max20086-regulator.c +index ebfbcadbca529..1cf04d1efb331 100644 +--- a/drivers/regulator/max20086-regulator.c ++++ b/drivers/regulator/max20086-regulator.c +@@ -5,6 +5,7 @@ + // Copyright (C) 2022 Laurent Pinchart + // Copyright (C) 2018 Avnet, Inc. + ++#include + #include + #include + #include +@@ -133,11 +134,11 @@ static int max20086_regulators_register(struct max20086 *chip) + static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) + { + struct of_regulator_match *matches; +- struct device_node *node; + unsigned int i; + int ret; + +- node = of_get_child_by_name(chip->dev->of_node, "regulators"); ++ struct device_node *node __free(device_node) = ++ of_get_child_by_name(chip->dev->of_node, "regulators"); + if (!node) { + dev_err(chip->dev, "regulators node not found\n"); + return -ENODEV; +@@ -153,7 +154,6 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) + + ret = of_regulator_match(chip->dev, node, matches, + chip->info->num_outputs); +- of_node_put(node); + if (ret < 0) { + dev_err(chip->dev, "Failed to match regulators\n"); + return -EINVAL; +-- +2.39.5 + diff --git a/queue-6.6/scsi-core-ufs-fix-a-hang-in-the-error-handler.patch b/queue-6.6/scsi-core-ufs-fix-a-hang-in-the-error-handler.patch new file mode 100644 index 0000000000..a744c16f13 --- /dev/null +++ b/queue-6.6/scsi-core-ufs-fix-a-hang-in-the-error-handler.patch @@ -0,0 +1,73 @@ +From 3d8d75d6bdc940211753f180ffe6be6bb660b58f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 May 2025 13:14:01 -0700 +Subject: scsi: core: ufs: Fix a hang in the error handler + +From: Sanjeev Yadav + +[ Upstream commit 8a3514d348de87a9d5e2ac00fbac4faae0b97996 ] + +ufshcd_err_handling_prepare() calls ufshcd_rpm_get_sync(). The latter +function can only succeed if UFSHCD_EH_IN_PROGRESS is not set because +resuming involves submitting a SCSI command and ufshcd_queuecommand() +returns SCSI_MLQUEUE_HOST_BUSY if UFSHCD_EH_IN_PROGRESS is set. Fix this +hang by setting UFSHCD_EH_IN_PROGRESS after ufshcd_rpm_get_sync() has +been called instead of before. + +Backtrace: +__switch_to+0x174/0x338 +__schedule+0x600/0x9e4 +schedule+0x7c/0xe8 +schedule_timeout+0xa4/0x1c8 +io_schedule_timeout+0x48/0x70 +wait_for_common_io+0xa8/0x160 //waiting on START_STOP +wait_for_completion_io_timeout+0x10/0x20 +blk_execute_rq+0xe4/0x1e4 +scsi_execute_cmd+0x108/0x244 +ufshcd_set_dev_pwr_mode+0xe8/0x250 +__ufshcd_wl_resume+0x94/0x354 +ufshcd_wl_runtime_resume+0x3c/0x174 +scsi_runtime_resume+0x64/0xa4 +rpm_resume+0x15c/0xa1c +__pm_runtime_resume+0x4c/0x90 // Runtime resume ongoing +ufshcd_err_handler+0x1a0/0xd08 +process_one_work+0x174/0x808 +worker_thread+0x15c/0x490 +kthread+0xf4/0x1ec +ret_from_fork+0x10/0x20 + +Signed-off-by: Sanjeev Yadav +[ bvanassche: rewrote patch description ] +Fixes: 62694735ca95 ("[SCSI] ufs: Add runtime PM support for UFS host controller driver") +Signed-off-by: Bart Van Assche +Link: https://lore.kernel.org/r/20250523201409.1676055-1-bvanassche@acm.org +Reviewed-by: Peter Wang +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/ufs/core/ufshcd.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c +index 2346a1fc72b56..9dabc03675b00 100644 +--- a/drivers/ufs/core/ufshcd.c ++++ b/drivers/ufs/core/ufshcd.c +@@ -6500,9 +6500,14 @@ static void ufshcd_err_handler(struct work_struct *work) + up(&hba->host_sem); + return; + } +- ufshcd_set_eh_in_progress(hba); + spin_unlock_irqrestore(hba->host->host_lock, flags); ++ + ufshcd_err_handling_prepare(hba); ++ ++ spin_lock_irqsave(hba->host->host_lock, flags); ++ ufshcd_set_eh_in_progress(hba); ++ spin_unlock_irqrestore(hba->host->host_lock, flags); ++ + /* Complete requests that have door-bell cleared by h/w */ + ufshcd_complete_requests(hba, false); + spin_lock_irqsave(hba->host->host_lock, flags); +-- +2.39.5 + diff --git a/queue-6.6/scsi-iscsi-fix-incorrect-error-path-labels-for-flash.patch b/queue-6.6/scsi-iscsi-fix-incorrect-error-path-labels-for-flash.patch new file mode 100644 index 0000000000..3e2677a16b --- /dev/null +++ b/queue-6.6/scsi-iscsi-fix-incorrect-error-path-labels-for-flash.patch @@ -0,0 +1,99 @@ +From a584e8a8bcbeff299d57ca4ccfdaea8267b4f30e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 30 May 2025 12:29:35 -0700 +Subject: scsi: iscsi: Fix incorrect error path labels for flashnode operations + +From: Alok Tiwari + +[ Upstream commit 9b17621366d210ffee83262a8754086ebbde5e55 ] + +Correct the error handling goto labels used when host lookup fails in +various flashnode-related event handlers: + + - iscsi_new_flashnode() + - iscsi_del_flashnode() + - iscsi_login_flashnode() + - iscsi_logout_flashnode() + - iscsi_logout_flashnode_sid() + +scsi_host_put() is not required when shost is NULL, so jumping to the +correct label avoids unnecessary operations. These functions previously +jumped to the wrong goto label (put_host), which did not match the +intended cleanup logic. + +Use the correct exit labels (exit_new_fnode, exit_del_fnode, etc.) to +ensure proper error handling. Also remove the unused put_host label +under iscsi_new_flashnode() as it is no longer needed. + +No functional changes beyond accurate error path correction. + +Fixes: c6a4bb2ef596 ("[SCSI] scsi_transport_iscsi: Add flash node mgmt support") +Signed-off-by: Alok Tiwari +Link: https://lore.kernel.org/r/20250530193012.3312911-1-alok.a.tiwari@oracle.com +Reviewed-by: Mike Christie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/scsi_transport_iscsi.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c +index 0c30fec555475..f2c31e74d8ed0 100644 +--- a/drivers/scsi/scsi_transport_iscsi.c ++++ b/drivers/scsi/scsi_transport_iscsi.c +@@ -3525,7 +3525,7 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport, + pr_err("%s could not find host no %u\n", + __func__, ev->u.new_flashnode.host_no); + err = -ENODEV; +- goto put_host; ++ goto exit_new_fnode; + } + + index = transport->new_flashnode(shost, data, len); +@@ -3535,7 +3535,6 @@ static int iscsi_new_flashnode(struct iscsi_transport *transport, + else + err = -EIO; + +-put_host: + scsi_host_put(shost); + + exit_new_fnode: +@@ -3560,7 +3559,7 @@ static int iscsi_del_flashnode(struct iscsi_transport *transport, + pr_err("%s could not find host no %u\n", + __func__, ev->u.del_flashnode.host_no); + err = -ENODEV; +- goto put_host; ++ goto exit_del_fnode; + } + + idx = ev->u.del_flashnode.flashnode_idx; +@@ -3602,7 +3601,7 @@ static int iscsi_login_flashnode(struct iscsi_transport *transport, + pr_err("%s could not find host no %u\n", + __func__, ev->u.login_flashnode.host_no); + err = -ENODEV; +- goto put_host; ++ goto exit_login_fnode; + } + + idx = ev->u.login_flashnode.flashnode_idx; +@@ -3654,7 +3653,7 @@ static int iscsi_logout_flashnode(struct iscsi_transport *transport, + pr_err("%s could not find host no %u\n", + __func__, ev->u.logout_flashnode.host_no); + err = -ENODEV; +- goto put_host; ++ goto exit_logout_fnode; + } + + idx = ev->u.logout_flashnode.flashnode_idx; +@@ -3704,7 +3703,7 @@ static int iscsi_logout_flashnode_sid(struct iscsi_transport *transport, + pr_err("%s could not find host no %u\n", + __func__, ev->u.logout_flashnode.host_no); + err = -ENODEV; +- goto put_host; ++ goto exit_logout_sid; + } + + session = iscsi_session_lookup(ev->u.logout_flashnode_sid.sid); +-- +2.39.5 + diff --git a/queue-6.6/series b/queue-6.6/series index a5d4ad11a6..005e884134 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -289,3 +289,44 @@ serial-sh-sci-check-if-tx-data-was-written-to-device.patch serial-sh-sci-move-runtime-pm-enable-to-sci_probe_si.patch serial-sh-sci-clean-sci_ports-0-after-at-earlycon-ex.patch serial-sh-sci-increment-the-runtime-usage-counter-fo.patch +scsi-core-ufs-fix-a-hang-in-the-error-handler.patch +bluetooth-hci_core-fix-list_for_each_entry_rcu-usage.patch +bluetooth-mgmt-fix-uaf-on-mgmt_remove_adv_monitor_co.patch +bluetooth-mgmt-remove-unused-mgmt_pending_find_data.patch +bluetooth-mgmt-protect-mgmt_pending-list-with-its-ow.patch +ptp-remove-ptp-n_vclocks-check-logic-in-ptp_vclock_i.patch +ath10k-snoc-fix-unbalanced-irq-enable-in-crash-recov.patch +wifi-ath11k-fix-soc_dp_stats-debugfs-file-permission.patch +wifi-ath11k-convert-timeouts-to-secs_to_jiffies.patch +wifi-ath11k-avoid-burning-cpu-in-ath11k_debugfs_fw_s.patch +wifi-ath11k-don-t-use-static-variables-in-ath11k_deb.patch +wifi-ath11k-don-t-wait-when-there-is-no-vdev-started.patch +wifi-ath11k-validate-ath11k_crypto_mode-on-top-of-at.patch +regulator-max20086-fix-refcount-leak-in-max20086_par.patch +pinctrl-qcom-pinctrl-qcm2290-add-missing-pins.patch +scsi-iscsi-fix-incorrect-error-path-labels-for-flash.patch +net_sched-sch_sfq-fix-a-potential-crash-on-gso_skb-h.patch +powerpc-powernv-memtrace-fix-out-of-bounds-issue-in-.patch +powerpc-vas-return-einval-if-the-offset-is-non-zero-.patch +drm-meson-use-unsigned-long-long-hz-for-frequency-ty.patch +drm-meson-fix-debug-log-statement-when-setting-the-h.patch +drm-meson-use-vclk_freq-instead-of-pixel_freq-in-deb.patch +drm-meson-fix-more-rounding-issues-with-59.94hz-mode.patch +i40e-return-false-from-i40e_reset_vf-if-reset-is-in-.patch +i40e-retry-vflr-handling-if-there-is-ongoing-vf-rese.patch +acpi-cppc-fix-null-pointer-dereference-when-nosmp-is.patch +net-fix-toctou-issue-in-sk_is_readable.patch +macsec-macsec-sci-assignment-for-es-0.patch +net-mdiobus-fix-potential-out-of-bounds-read-write-a.patch +net-mdiobus-fix-potential-out-of-bounds-clause-45-re.patch +bluetooth-fix-null-pointer-deference-on-eir_get_serv.patch +bluetooth-hci_sync-fix-broadcast-pa-when-using-an-ex.patch +bluetooth-mgmt-fix-sparse-errors.patch +net-mlx5-ensure-fw-pages-are-always-allocated-on-sam.patch +net-mlx5-fix-ecvf-vports-unload-on-shutdown-flow.patch +net-mlx5-fix-return-value-when-searching-for-existin.patch +net-mlx5e-fix-leak-of-geneve-tlv-option-object.patch +net_sched-prio-fix-a-race-in-prio_tune.patch +net_sched-red-fix-a-race-in-__red_change.patch +net_sched-tbf-fix-a-race-in-tbf_change.patch +net_sched-ets-fix-a-race-in-ets_qdisc_change.patch diff --git a/queue-6.6/wifi-ath11k-avoid-burning-cpu-in-ath11k_debugfs_fw_s.patch b/queue-6.6/wifi-ath11k-avoid-burning-cpu-in-ath11k_debugfs_fw_s.patch new file mode 100644 index 0000000000..d27b80ae50 --- /dev/null +++ b/queue-6.6/wifi-ath11k-avoid-burning-cpu-in-ath11k_debugfs_fw_s.patch @@ -0,0 +1,231 @@ +From 40d055fa661faa67494f8f5b10fd851443b34cef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Feb 2025 16:24:42 +0800 +Subject: wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request() + +From: Baochen Qiang + +[ Upstream commit 9f6e82d11bb9692a90d20b10f87345598945c803 ] + +We get report [1] that CPU is running a hot loop in +ath11k_debugfs_fw_stats_request(): + +94.60% 0.00% i3status [kernel.kallsyms] [k] do_syscall_64 + | + --94.60%--do_syscall_64 + | + --94.55%--__sys_sendmsg + ___sys_sendmsg + ____sys_sendmsg + netlink_sendmsg + netlink_unicast + genl_rcv + netlink_rcv_skb + genl_rcv_msg + | + --94.55%--genl_family_rcv_msg_dumpit + __netlink_dump_start + netlink_dump + genl_dumpit + nl80211_dump_station + | + --94.55%--ieee80211_dump_station + sta_set_sinfo + | + --94.55%--ath11k_mac_op_sta_statistics + ath11k_debugfs_get_fw_stats + | + --94.55%--ath11k_debugfs_fw_stats_request + | + |--41.73%--_raw_spin_lock_bh + | + |--22.74%--__local_bh_enable_ip + | + |--9.22%--_raw_spin_unlock_bh + | + --6.66%--srso_alias_safe_ret + +This is because, if for whatever reason ar->fw_stats_done is not set by +ath11k_update_stats_event(), ath11k_debugfs_fw_stats_request() won't yield +CPU before an up to 3s timeout. + +Change to completion mechanism to avoid CPU burning. + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37 + +Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") +Reported-by: Yury Vostrikov +Closes: https://lore.kernel.org/all/7324ac7a-8b7a-42a5-aa19-de52138ff638@app.fastmail.com/ # [1] +Signed-off-by: Baochen Qiang +Reviewed-by: Vasanthakumar Thiagarajan +Link: https://patch.msgid.link/20250220082448.31039-2-quic_bqiang@quicinc.com +Signed-off-by: Jeff Johnson +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/core.c | 1 + + drivers/net/wireless/ath/ath11k/core.h | 2 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 38 +++++++++-------------- + drivers/net/wireless/ath/ath11k/mac.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- + 5 files changed, 18 insertions(+), 27 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c +index f9870ba651d8f..12c5f50f61f90 100644 +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -748,6 +748,7 @@ void ath11k_fw_stats_init(struct ath11k *ar) + INIT_LIST_HEAD(&ar->fw_stats.bcn); + + init_completion(&ar->fw_stats_complete); ++ init_completion(&ar->fw_stats_done); + } + + void ath11k_fw_stats_free(struct ath11k_fw_stats *stats) +diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h +index b044477624837..41ccf59a4fd93 100644 +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -732,7 +732,7 @@ struct ath11k { + u8 alpha2[REG_ALPHA2_LEN + 1]; + struct ath11k_fw_stats fw_stats; + struct completion fw_stats_complete; +- bool fw_stats_done; ++ struct completion fw_stats_done; + + /* protected by conf_mutex */ + bool ps_state_enable; +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index a8bd944f76d92..a5791155fe065 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: BSD-3-Clause-Clear + /* + * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. +- * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. + */ + + #include +@@ -96,7 +96,6 @@ void ath11k_debugfs_add_dbring_entry(struct ath11k *ar, + static void ath11k_debugfs_fw_stats_reset(struct ath11k *ar) + { + spin_lock_bh(&ar->data_lock); +- ar->fw_stats_done = false; + ath11k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); + ath11k_fw_stats_vdevs_free(&ar->fw_stats.vdevs); + spin_unlock_bh(&ar->data_lock); +@@ -114,7 +113,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + /* WMI_REQUEST_PDEV_STAT request has been already processed */ + + if (stats->stats_id == WMI_REQUEST_RSSI_PER_CHAIN_STAT) { +- ar->fw_stats_done = true; ++ complete(&ar->fw_stats_done); + return; + } + +@@ -138,7 +137,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + &ar->fw_stats.vdevs); + + if (is_end) { +- ar->fw_stats_done = true; ++ complete(&ar->fw_stats_done); + num_vdev = 0; + } + return; +@@ -158,7 +157,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + &ar->fw_stats.bcn); + + if (is_end) { +- ar->fw_stats_done = true; ++ complete(&ar->fw_stats_done); + num_bcn = 0; + } + } +@@ -168,21 +167,15 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, + struct stats_request_params *req_param) + { + struct ath11k_base *ab = ar->ab; +- unsigned long timeout, time_left; ++ unsigned long time_left; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + +- /* FW stats can get split when exceeding the stats data buffer limit. +- * In that case, since there is no end marking for the back-to-back +- * received 'update stats' event, we keep a 3 seconds timeout in case, +- * fw_stats_done is not marked yet +- */ +- timeout = jiffies + secs_to_jiffies(3); +- + ath11k_debugfs_fw_stats_reset(ar); + + reinit_completion(&ar->fw_stats_complete); ++ reinit_completion(&ar->fw_stats_done); + + ret = ath11k_wmi_send_stats_request_cmd(ar, req_param); + +@@ -193,21 +186,18 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, + } + + time_left = wait_for_completion_timeout(&ar->fw_stats_complete, 1 * HZ); +- + if (!time_left) + return -ETIMEDOUT; + +- for (;;) { +- if (time_after(jiffies, timeout)) +- break; ++ /* FW stats can get split when exceeding the stats data buffer limit. ++ * In that case, since there is no end marking for the back-to-back ++ * received 'update stats' event, we keep a 3 seconds timeout in case, ++ * fw_stats_done is not marked yet ++ */ ++ time_left = wait_for_completion_timeout(&ar->fw_stats_done, 3 * HZ); ++ if (!time_left) ++ return -ETIMEDOUT; + +- spin_lock_bh(&ar->data_lock); +- if (ar->fw_stats_done) { +- spin_unlock_bh(&ar->data_lock); +- break; +- } +- spin_unlock_bh(&ar->data_lock); +- } + return 0; + } + +diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c +index 4247c0f840a48..c3bfbc40273d0 100644 +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9010,11 +9010,11 @@ static int ath11k_fw_stats_request(struct ath11k *ar, + lockdep_assert_held(&ar->conf_mutex); + + spin_lock_bh(&ar->data_lock); +- ar->fw_stats_done = false; + ath11k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); + spin_unlock_bh(&ar->data_lock); + + reinit_completion(&ar->fw_stats_complete); ++ reinit_completion(&ar->fw_stats_done); + + ret = ath11k_wmi_send_stats_request_cmd(ar, req_param); + if (ret) { +diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c +index 2cc13e60f422f..9a829b8282420 100644 +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -8183,7 +8183,7 @@ static void ath11k_update_stats_event(struct ath11k_base *ab, struct sk_buff *sk + */ + if (stats.stats_id == WMI_REQUEST_PDEV_STAT) { + list_splice_tail_init(&stats.pdevs, &ar->fw_stats.pdevs); +- ar->fw_stats_done = true; ++ complete(&ar->fw_stats_done); + goto complete; + } + +-- +2.39.5 + diff --git a/queue-6.6/wifi-ath11k-convert-timeouts-to-secs_to_jiffies.patch b/queue-6.6/wifi-ath11k-convert-timeouts-to-secs_to_jiffies.patch new file mode 100644 index 0000000000..493dcf7d3d --- /dev/null +++ b/queue-6.6/wifi-ath11k-convert-timeouts-to-secs_to_jiffies.patch @@ -0,0 +1,120 @@ +From acf1517133de08b9a8c797d0bd8539a22ce833b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Dec 2024 22:02:45 +0000 +Subject: wifi: ath11k: convert timeouts to secs_to_jiffies() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Easwar Hariharan + +[ Upstream commit b29425972c5234a59b6fb634125420ed74266377 ] + +Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced +secs_to_jiffies(). As the value here is a multiple of 1000, use +secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. + +This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with +the following Coccinelle rules: + +@@ constant C; @@ + +- msecs_to_jiffies(C * 1000) ++ secs_to_jiffies(C) + +@@ constant C; @@ + +- msecs_to_jiffies(C * MSEC_PER_SEC) ++ secs_to_jiffies(C) + +Link: https://lkml.kernel.org/r/20241210-converge-secs-to-jiffies-v3-14-ddfefd7e9f2a@linux.microsoft.com +Acked-by: Jeff Johnson +Signed-off-by: Easwar Hariharan +Cc: Alexander Gordeev +Cc: Andrew Lunn +Cc: Anna-Maria Behnsen +Cc: Catalin Marinas +Cc: Christian Borntraeger +Cc: Christophe Leroy +Cc: Daniel Mack +Cc: David Airlie +Cc: David S. Miller +Cc: Dick Kennedy +Cc: Eric Dumazet +Cc: Florian Fainelli +Cc: Greg Kroah-Hartman +Cc: Haojian Zhuang +Cc: Heiko Carstens +Cc: Ilya Dryomov +Cc: Jack Wang +Cc: Jakub Kicinski +Cc: James Bottomley +Cc: James Smart +Cc: Jaroslav Kysela +Cc: Jeff Johnson +Cc: Jens Axboe +Cc: Jeroen de Borst +Cc: Jiri Kosina +Cc: Joe Lawrence +Cc: Johan Hedberg +Cc: Josh Poimboeuf +Cc: Jozsef Kadlecsik +Cc: Julia Lawall +Cc: Kalle Valo +Cc: Louis Peens +Cc: Lucas De Marchi +Cc: Luiz Augusto von Dentz +Cc: Maarten Lankhorst +Cc: Madhavan Srinivasan +Cc: Marcel Holtmann +Cc: Martin K. Petersen +Cc: Maxime Ripard +Cc: Michael Ellerman +Cc: Miroslav Benes +Cc: Naveen N Rao +Cc: Nicholas Piggin +Cc: Nicolas Palix +Cc: Oded Gabbay +Cc: Ofir Bitton +Cc: Pablo Neira Ayuso +Cc: Paolo Abeni +Cc: Petr Mladek +Cc: Praveen Kaligineedi +Cc: Ray Jui +Cc: Robert Jarzmik +Cc: Rodrigo Vivi +Cc: Roger Pau Monné +Cc: Russell King +Cc: Scott Branden +Cc: Shailend Chand +Cc: Simona Vetter +Cc: Simon Horman +Cc: Sven Schnelle +Cc: Takashi Iwai +Cc: Thomas Hellström +Cc: Thomas Zimmermann +Cc: Vasily Gorbik +Cc: Xiubo Li +Signed-off-by: Andrew Morton +Stable-dep-of: 9f6e82d11bb9 ("wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()") +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index 34aa04d27a1d7..a8bd944f76d92 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -178,7 +178,7 @@ static int ath11k_debugfs_fw_stats_request(struct ath11k *ar, + * received 'update stats' event, we keep a 3 seconds timeout in case, + * fw_stats_done is not marked yet + */ +- timeout = jiffies + msecs_to_jiffies(3 * 1000); ++ timeout = jiffies + secs_to_jiffies(3); + + ath11k_debugfs_fw_stats_reset(ar); + +-- +2.39.5 + diff --git a/queue-6.6/wifi-ath11k-don-t-use-static-variables-in-ath11k_deb.patch b/queue-6.6/wifi-ath11k-don-t-use-static-variables-in-ath11k_deb.patch new file mode 100644 index 0000000000..e22fb3657e --- /dev/null +++ b/queue-6.6/wifi-ath11k-don-t-use-static-variables-in-ath11k_deb.patch @@ -0,0 +1,129 @@ +From 549d9768386f1254bbbd12d1cf26c8380d60869d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Feb 2025 16:24:43 +0800 +Subject: wifi: ath11k: don't use static variables in + ath11k_debugfs_fw_stats_process() + +From: Baochen Qiang + +[ Upstream commit 2bcf73b2612dda7432f2c2eaad6679bd291791f2 ] + +Currently ath11k_debugfs_fw_stats_process() is using static variables to count +firmware stat events. Taking num_vdev as an example, if for whatever reason ( +say ar->num_started_vdevs is 0 or firmware bug etc.) the following condition + + (++num_vdev) == total_vdevs_started + +is not met, is_end is not set thus num_vdev won't be cleared. Next time when +firmware stats is requested again, even if everything is working fine, we will +fail due to the condition above will never be satisfied. + +The same applies to num_bcn as well. + +Change to use non-static counters so that we have a chance to clear them each +time firmware stats is requested. Currently only ath11k_fw_stats_request() and +ath11k_debugfs_fw_stats_request() are requesting firmware stats, so clear +counters there. + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37 + +Fixes: da3a9d3c1576 ("ath11k: refactor debugfs code into debugfs.c") +Signed-off-by: Baochen Qiang +Acked-by: Kalle Valo +Reviewed-by: Vasanthakumar Thiagarajan +Link: https://patch.msgid.link/20250220082448.31039-3-quic_bqiang@quicinc.com +Signed-off-by: Jeff Johnson +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/core.h | 2 ++ + drivers/net/wireless/ath/ath11k/debugfs.c | 16 +++++++--------- + drivers/net/wireless/ath/ath11k/mac.c | 2 ++ + 3 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h +index 41ccf59a4fd93..555deafd8399a 100644 +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -550,6 +550,8 @@ struct ath11k_fw_stats { + struct list_head pdevs; + struct list_head vdevs; + struct list_head bcn; ++ u32 num_vdev_recvd; ++ u32 num_bcn_recvd; + }; + + struct ath11k_dbg_htt_stats { +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index a5791155fe065..5a375d6680594 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -98,6 +98,8 @@ static void ath11k_debugfs_fw_stats_reset(struct ath11k *ar) + spin_lock_bh(&ar->data_lock); + ath11k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); + ath11k_fw_stats_vdevs_free(&ar->fw_stats.vdevs); ++ ar->fw_stats.num_vdev_recvd = 0; ++ ar->fw_stats.num_bcn_recvd = 0; + spin_unlock_bh(&ar->data_lock); + } + +@@ -106,7 +108,6 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + struct ath11k_base *ab = ar->ab; + struct ath11k_pdev *pdev; + bool is_end; +- static unsigned int num_vdev, num_bcn; + size_t total_vdevs_started = 0; + int i; + +@@ -131,15 +132,14 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + total_vdevs_started += ar->num_started_vdevs; + } + +- is_end = ((++num_vdev) == total_vdevs_started); ++ is_end = ((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started); + + list_splice_tail_init(&stats->vdevs, + &ar->fw_stats.vdevs); + +- if (is_end) { ++ if (is_end) + complete(&ar->fw_stats_done); +- num_vdev = 0; +- } ++ + return; + } + +@@ -151,15 +151,13 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + /* Mark end until we reached the count of all started VDEVs + * within the PDEV + */ +- is_end = ((++num_bcn) == ar->num_started_vdevs); ++ is_end = ((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs); + + list_splice_tail_init(&stats->bcn, + &ar->fw_stats.bcn); + +- if (is_end) { ++ if (is_end) + complete(&ar->fw_stats_done); +- num_bcn = 0; +- } + } + } + +diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c +index c3bfbc40273d0..9df3f6449f768 100644 +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9011,6 +9011,8 @@ static int ath11k_fw_stats_request(struct ath11k *ar, + + spin_lock_bh(&ar->data_lock); + ath11k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); ++ ar->fw_stats.num_vdev_recvd = 0; ++ ar->fw_stats.num_bcn_recvd = 0; + spin_unlock_bh(&ar->data_lock); + + reinit_completion(&ar->fw_stats_complete); +-- +2.39.5 + diff --git a/queue-6.6/wifi-ath11k-don-t-wait-when-there-is-no-vdev-started.patch b/queue-6.6/wifi-ath11k-don-t-wait-when-there-is-no-vdev-started.patch new file mode 100644 index 0000000000..1e5d2984e1 --- /dev/null +++ b/queue-6.6/wifi-ath11k-don-t-wait-when-there-is-no-vdev-started.patch @@ -0,0 +1,76 @@ +From be5933e5a97ad129c1622e2c4eefe8e4ed88f264 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Feb 2025 16:24:44 +0800 +Subject: wifi: ath11k: don't wait when there is no vdev started + +From: Baochen Qiang + +[ Upstream commit 3b6d00fa883075dcaf49221538230e038a9c0b43 ] + +For WMI_REQUEST_VDEV_STAT request, firmware might split response into +multiple events dut to buffer limit, hence currently in +ath11k_debugfs_fw_stats_process() we wait until all events received. +In case there is no vdev started, this results in that below condition +would never get satisfied + + ((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started) + +finally the requestor would be blocked until wait time out. + +The same applies to WMI_REQUEST_BCN_STAT request as well due to: + + ((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs) + +Change to check the number of started vdev first: if it is zero, finish +wait directly; if not, follow the old way. + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.37 + +Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") +Signed-off-by: Baochen Qiang +Reviewed-by: Vasanthakumar Thiagarajan +Link: https://patch.msgid.link/20250220082448.31039-4-quic_bqiang@quicinc.com +Signed-off-by: Jeff Johnson +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/debugfs.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index 5a375d6680594..50bc17127e68a 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -107,7 +107,7 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + { + struct ath11k_base *ab = ar->ab; + struct ath11k_pdev *pdev; +- bool is_end; ++ bool is_end = true; + size_t total_vdevs_started = 0; + int i; + +@@ -132,7 +132,9 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + total_vdevs_started += ar->num_started_vdevs; + } + +- is_end = ((++ar->fw_stats.num_vdev_recvd) == total_vdevs_started); ++ if (total_vdevs_started) ++ is_end = ((++ar->fw_stats.num_vdev_recvd) == ++ total_vdevs_started); + + list_splice_tail_init(&stats->vdevs, + &ar->fw_stats.vdevs); +@@ -151,7 +153,9 @@ void ath11k_debugfs_fw_stats_process(struct ath11k *ar, struct ath11k_fw_stats * + /* Mark end until we reached the count of all started VDEVs + * within the PDEV + */ +- is_end = ((++ar->fw_stats.num_bcn_recvd) == ar->num_started_vdevs); ++ if (ar->num_started_vdevs) ++ is_end = ((++ar->fw_stats.num_bcn_recvd) == ++ ar->num_started_vdevs); + + list_splice_tail_init(&stats->bcn, + &ar->fw_stats.bcn); +-- +2.39.5 + diff --git a/queue-6.6/wifi-ath11k-fix-soc_dp_stats-debugfs-file-permission.patch b/queue-6.6/wifi-ath11k-fix-soc_dp_stats-debugfs-file-permission.patch new file mode 100644 index 0000000000..9125b0c353 --- /dev/null +++ b/queue-6.6/wifi-ath11k-fix-soc_dp_stats-debugfs-file-permission.patch @@ -0,0 +1,59 @@ +From da9fa57c0fd76941975dcabad87d523c720ad2a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Mar 2024 07:14:00 -0800 +Subject: wifi: ath11k: fix soc_dp_stats debugfs file permission + +From: Jeff Johnson + +[ Upstream commit fa645e663165d69f05f95a0c3aa3b3d08f4fdeda ] + +Currently the soc_dp_stats debugfs file has the following permissions: + +# ls -l /sys/kernel/debug/ath11k/pci-0000:03:00.0/soc_dp_stats +-rw------- 1 root root 0 Mar 4 15:04 /sys/kernel/debug/ath11k/pci-0000:03:00.0/soc_dp_stats + +However this file does not actually support write operations -- no .write() +method is registered. Therefore use the correct permissions when creating +the file. + +After the change: + +# ls -l /sys/kernel/debug/ath11k/pci-0000:03:00.0/soc_dp_stats +-r-------- 1 root root 0 Mar 4 15:15 /sys/kernel/debug/ath11k/pci-0000:03:00.0/soc_dp_stats + +Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30 + +Signed-off-by: Jeff Johnson +Signed-off-by: Kalle Valo +Link: https://msgid.link/20240305-fix-soc_dp_stats-permission-v1-1-2ec10b42f755@quicinc.com +Stable-dep-of: 9f6e82d11bb9 ("wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()") +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index 8cda73b78ebf4..34aa04d27a1d7 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: BSD-3-Clause-Clear + /* + * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved. +- * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. ++ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + + #include +@@ -980,7 +980,7 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab) + debugfs_create_file("simulate_fw_crash", 0600, ab->debugfs_soc, ab, + &fops_simulate_fw_crash); + +- debugfs_create_file("soc_dp_stats", 0600, ab->debugfs_soc, ab, ++ debugfs_create_file("soc_dp_stats", 0400, ab->debugfs_soc, ab, + &fops_soc_dp_stats); + + if (ab->hw_params.sram_dump.start != 0) +-- +2.39.5 + diff --git a/queue-6.6/wifi-ath11k-validate-ath11k_crypto_mode-on-top-of-at.patch b/queue-6.6/wifi-ath11k-validate-ath11k_crypto_mode-on-top-of-at.patch new file mode 100644 index 0000000000..1f51ef9be7 --- /dev/null +++ b/queue-6.6/wifi-ath11k-validate-ath11k_crypto_mode-on-top-of-at.patch @@ -0,0 +1,80 @@ +From 8cd877a20fa4777c7f1eff4f5b70a474eaf1e92f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 May 2025 17:01:12 -0300 +Subject: wifi: ath11k: validate ath11k_crypto_mode on top of + ath11k_core_qmi_firmware_ready + +From: Rodrigo Gobbi + +[ Upstream commit b0d226a60856a1b765bb9a3848c7b2322fd08c47 ] + +if ath11k_crypto_mode is invalid (not ATH11K_CRYPT_MODE_SW/ATH11K_CRYPT_MODE_HW), +ath11k_core_qmi_firmware_ready() will not undo some actions that was previously +started/configured. Do the validation as soon as possible in order to avoid +undoing actions in that case and also to fix the following smatch warning: + +drivers/net/wireless/ath/ath11k/core.c:2166 ath11k_core_qmi_firmware_ready() +warn: missing unwind goto? + +Signed-off-by: Rodrigo Gobbi +Reported-by: kernel test robot +Reported-by: Dan Carpenter +Closes: https://lore.kernel.org/r/202304151955.oqAetVFd-lkp@intel.com/ +Fixes: aa2092a9bab3 ("ath11k: add raw mode and software crypto support") +Reviewed-by: Baochen Qiang +Link: https://patch.msgid.link/20250522200519.16858-1-rodrigo.gobbi.7@gmail.com +Signed-off-by: Jeff Johnson +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/core.c | 28 +++++++++++++------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c +index 12c5f50f61f90..609d8387c41f3 100644 +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -1638,6 +1638,20 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) + { + int ret; + ++ switch (ath11k_crypto_mode) { ++ case ATH11K_CRYPT_MODE_SW: ++ set_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags); ++ set_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags); ++ break; ++ case ATH11K_CRYPT_MODE_HW: ++ clear_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags); ++ clear_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags); ++ break; ++ default: ++ ath11k_info(ab, "invalid crypto_mode: %d\n", ath11k_crypto_mode); ++ return -EINVAL; ++ } ++ + ret = ath11k_core_start_firmware(ab, ab->fw_mode); + if (ret) { + ath11k_err(ab, "failed to start firmware: %d\n", ret); +@@ -1656,20 +1670,6 @@ int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) + goto err_firmware_stop; + } + +- switch (ath11k_crypto_mode) { +- case ATH11K_CRYPT_MODE_SW: +- set_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags); +- set_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags); +- break; +- case ATH11K_CRYPT_MODE_HW: +- clear_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags); +- clear_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags); +- break; +- default: +- ath11k_info(ab, "invalid crypto_mode: %d\n", ath11k_crypto_mode); +- return -EINVAL; +- } +- + if (ath11k_frame_mode == ATH11K_HW_TXRX_RAW) + set_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags); + +-- +2.39.5 +