From: Sasha Levin Date: Sun, 10 Apr 2022 02:06:26 +0000 (-0400) Subject: Fixes for 5.15 X-Git-Tag: v4.9.310~112 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b225b40c90895a48528439b7b99c53410cdd0c68;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/ath11k-fix-kernel-panic-during-unload-load-ath11k-mo.patch b/queue-5.15/ath11k-fix-kernel-panic-during-unload-load-ath11k-mo.patch new file mode 100644 index 00000000000..3971e9a1194 --- /dev/null +++ b/queue-5.15/ath11k-fix-kernel-panic-during-unload-load-ath11k-mo.patch @@ -0,0 +1,65 @@ +From 50af31998f7ac6231109895a62768f4b5cf6dfda Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Jan 2022 14:49:33 +0530 +Subject: ath11k: fix kernel panic during unload/load ath11k modules + +From: Venkateswara Naralasetty + +[ Upstream commit 22b59cb965f79ee1accf83172441c9ca0ecb632a ] + +Call netif_napi_del() from ath11k_ahb_free_ext_irq() to fix +the following kernel panic when unload/load ath11k modules +for few iterations. + +[ 971.201365] Unable to handle kernel paging request at virtual address 6d97a208 +[ 971.204227] pgd = 594c2919 +[ 971.211478] [6d97a208] *pgd=00000000 +[ 971.214120] Internal error: Oops: 5 [#1] PREEMPT SMP ARM +[ 971.412024] CPU: 2 PID: 4435 Comm: insmod Not tainted 5.4.89 #0 +[ 971.434256] Hardware name: Generic DT based system +[ 971.440165] PC is at napi_by_id+0x10/0x40 +[ 971.445019] LR is at netif_napi_add+0x160/0x1dc + +[ 971.743127] (napi_by_id) from [<807d89a0>] (netif_napi_add+0x160/0x1dc) +[ 971.751295] (netif_napi_add) from [<7f1209ac>] (ath11k_ahb_config_irq+0xf8/0x414 [ath11k_ahb]) +[ 971.759164] (ath11k_ahb_config_irq [ath11k_ahb]) from [<7f12135c>] (ath11k_ahb_probe+0x40c/0x51c [ath11k_ahb]) +[ 971.768567] (ath11k_ahb_probe [ath11k_ahb]) from [<80666864>] (platform_drv_probe+0x48/0x94) +[ 971.779670] (platform_drv_probe) from [<80664718>] (really_probe+0x1c8/0x450) +[ 971.789389] (really_probe) from [<80664cc4>] (driver_probe_device+0x15c/0x1b8) +[ 971.797547] (driver_probe_device) from [<80664f60>] (device_driver_attach+0x44/0x60) +[ 971.805795] (device_driver_attach) from [<806650a0>] (__driver_attach+0x124/0x140) +[ 971.814822] (__driver_attach) from [<80662adc>] (bus_for_each_dev+0x58/0xa4) +[ 971.823328] (bus_for_each_dev) from [<80663a2c>] (bus_add_driver+0xf0/0x1e8) +[ 971.831662] (bus_add_driver) from [<806658a4>] (driver_register+0xa8/0xf0) +[ 971.839822] (driver_register) from [<8030269c>] (do_one_initcall+0x78/0x1ac) +[ 971.847638] (do_one_initcall) from [<80392524>] (do_init_module+0x54/0x200) +[ 971.855968] (do_init_module) from [<803945b0>] (load_module+0x1e30/0x1ffc) +[ 971.864126] (load_module) from [<803948b0>] (sys_init_module+0x134/0x17c) +[ 971.871852] (sys_init_module) from [<80301000>] (ret_fast_syscall+0x0/0x50) + +Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.6.0.1-00760-QCAHKSWPL_SILICONZ-1 + +Signed-off-by: Venkateswara Naralasetty +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/1642583973-21599-1-git-send-email-quic_vnaralas@quicinc.com +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/ahb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c +index 3fb0aa000825..24bd0520926b 100644 +--- a/drivers/net/wireless/ath/ath11k/ahb.c ++++ b/drivers/net/wireless/ath/ath11k/ahb.c +@@ -391,6 +391,8 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab) + + for (j = 0; j < irq_grp->num_irq; j++) + free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); ++ ++ netif_napi_del(&irq_grp->napi); + } + } + +-- +2.35.1 + diff --git a/queue-5.15/ath11k-mhi-use-mhi_sync_power_up.patch b/queue-5.15/ath11k-mhi-use-mhi_sync_power_up.patch new file mode 100644 index 00000000000..ebff353040f --- /dev/null +++ b/queue-5.15/ath11k-mhi-use-mhi_sync_power_up.patch @@ -0,0 +1,87 @@ +From b8a5e8addb07d8b8c8587b2db4ded47fdaadb8ff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 11:01:17 +0200 +Subject: ath11k: mhi: use mhi_sync_power_up() + +From: Kalle Valo + +[ Upstream commit 3df6d74aedfdca919cca475d15dfdbc8b05c9e5d ] + +If amss.bin was missing ath11k would crash during 'rmmod ath11k_pci'. The +reason for that was that we were using mhi_async_power_up() which does not +check any errors. But mhi_sync_power_up() on the other hand does check for +errors so let's use that to fix the crash. + +I was not able to find a reason why an async version was used. +ath11k_mhi_start() (which enables state ATH11K_MHI_POWER_ON) is called from +ath11k_hif_power_up(), which can sleep. So sync version should be safe to use +here. + +[ 145.569731] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN PTI +[ 145.569789] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] +[ 145.569843] CPU: 2 PID: 1628 Comm: rmmod Kdump: loaded Tainted: G W 5.16.0-wt-ath+ #567 +[ 145.569898] Hardware name: Intel(R) Client Systems NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0067.2021.0528.1339 05/28/2021 +[ 145.569956] RIP: 0010:ath11k_hal_srng_access_begin+0xb5/0x2b0 [ath11k] +[ 145.570028] Code: df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 ec 01 00 00 48 8b ab a8 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 ea 48 c1 ea 03 <0f> b6 14 02 48 89 e8 83 e0 07 83 c0 03 45 85 ed 75 48 38 d0 7c 08 +[ 145.570089] RSP: 0018:ffffc900025d7ac0 EFLAGS: 00010246 +[ 145.570144] RAX: dffffc0000000000 RBX: ffff88814fca2dd8 RCX: 1ffffffff50cb455 +[ 145.570196] RDX: 0000000000000000 RSI: ffff88814fca2dd8 RDI: ffff88814fca2e80 +[ 145.570252] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffffa8659497 +[ 145.570329] R10: fffffbfff50cb292 R11: 0000000000000001 R12: ffff88814fca0000 +[ 145.570410] R13: 0000000000000000 R14: ffff88814fca2798 R15: ffff88814fca2dd8 +[ 145.570465] FS: 00007fa399988540(0000) GS:ffff888233e00000(0000) knlGS:0000000000000000 +[ 145.570519] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 145.570571] CR2: 00007fa399b51421 CR3: 0000000137898002 CR4: 00000000003706e0 +[ 145.570623] Call Trace: +[ 145.570675] +[ 145.570727] ? ath11k_ce_tx_process_cb+0x34b/0x860 [ath11k] +[ 145.570797] ath11k_ce_tx_process_cb+0x356/0x860 [ath11k] +[ 145.570864] ? tasklet_init+0x150/0x150 +[ 145.570919] ? ath11k_ce_alloc_pipes+0x280/0x280 [ath11k] +[ 145.570986] ? tasklet_clear_sched+0x42/0xe0 +[ 145.571042] ? tasklet_kill+0xe9/0x1b0 +[ 145.571095] ? tasklet_clear_sched+0xe0/0xe0 +[ 145.571148] ? irq_has_action+0x120/0x120 +[ 145.571202] ath11k_ce_cleanup_pipes+0x45a/0x580 [ath11k] +[ 145.571270] ? ath11k_pci_stop+0x10e/0x170 [ath11k_pci] +[ 145.571345] ath11k_core_stop+0x8a/0xc0 [ath11k] +[ 145.571434] ath11k_core_deinit+0x9e/0x150 [ath11k] +[ 145.571499] ath11k_pci_remove+0xd2/0x260 [ath11k_pci] +[ 145.571553] pci_device_remove+0x9a/0x1c0 +[ 145.571605] __device_release_driver+0x332/0x660 +[ 145.571659] driver_detach+0x1e7/0x2c0 +[ 145.571712] bus_remove_driver+0xe2/0x2d0 +[ 145.571772] pci_unregister_driver+0x21/0x250 +[ 145.571826] __do_sys_delete_module+0x30a/0x4b0 +[ 145.571879] ? free_module+0xac0/0xac0 +[ 145.571933] ? lockdep_hardirqs_on_prepare.part.0+0x18c/0x370 +[ 145.571986] ? syscall_enter_from_user_mode+0x1d/0x50 +[ 145.572039] ? lockdep_hardirqs_on+0x79/0x100 +[ 145.572097] do_syscall_64+0x3b/0x90 +[ 145.572153] entry_SYSCALL_64_after_hwframe+0x44/0xae + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2 + +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20220127090117.2024-2-kvalo@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/mhi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c +index 49c0b1ad40a0..f2149241fb13 100644 +--- a/drivers/net/wireless/ath/ath11k/mhi.c ++++ b/drivers/net/wireless/ath/ath11k/mhi.c +@@ -519,7 +519,7 @@ static int ath11k_mhi_set_state(struct ath11k_pci *ab_pci, + ret = 0; + break; + case ATH11K_MHI_POWER_ON: +- ret = mhi_async_power_up(ab_pci->mhi_ctrl); ++ ret = mhi_sync_power_up(ab_pci->mhi_ctrl); + break; + case ATH11K_MHI_POWER_OFF: + mhi_power_down(ab_pci->mhi_ctrl, true); +-- +2.35.1 + diff --git a/queue-5.15/ath11k-pci-fix-crash-on-suspend-if-board-file-is-not.patch b/queue-5.15/ath11k-pci-fix-crash-on-suspend-if-board-file-is-not.patch new file mode 100644 index 00000000000..b429b82af67 --- /dev/null +++ b/queue-5.15/ath11k-pci-fix-crash-on-suspend-if-board-file-is-not.patch @@ -0,0 +1,94 @@ +From fdf30ad6fc9dc026883b9ca2ab02f7c50643287c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 11:01:16 +0200 +Subject: ath11k: pci: fix crash on suspend if board file is not found + +From: Kalle Valo + +[ Upstream commit b4f4c56459a5c744f7f066b9fc2b54ea995030c5 ] + +Mario reported that the kernel was crashing on suspend if ath11k was not able +to find a board file: + +[ 473.693286] PM: Suspending system (s2idle) +[ 473.693291] printk: Suspending console(s) (use no_console_suspend to debug) +[ 474.407787] BUG: unable to handle page fault for address: 0000000000002070 +[ 474.407791] #PF: supervisor read access in kernel mode +[ 474.407794] #PF: error_code(0x0000) - not-present page +[ 474.407798] PGD 0 P4D 0 +[ 474.407801] Oops: 0000 [#1] PREEMPT SMP NOPTI +[ 474.407805] CPU: 2 PID: 2350 Comm: kworker/u32:14 Tainted: G W 5.16.0 #248 +[...] +[ 474.407868] Call Trace: +[ 474.407870] +[ 474.407874] ? _raw_spin_lock_irqsave+0x2a/0x60 +[ 474.407882] ? lock_timer_base+0x72/0xa0 +[ 474.407889] ? _raw_spin_unlock_irqrestore+0x29/0x3d +[ 474.407892] ? try_to_del_timer_sync+0x54/0x80 +[ 474.407896] ath11k_dp_rx_pktlog_stop+0x49/0xc0 [ath11k] +[ 474.407912] ath11k_core_suspend+0x34/0x130 [ath11k] +[ 474.407923] ath11k_pci_pm_suspend+0x1b/0x50 [ath11k_pci] +[ 474.407928] pci_pm_suspend+0x7e/0x170 +[ 474.407935] ? pci_pm_freeze+0xc0/0xc0 +[ 474.407939] dpm_run_callback+0x4e/0x150 +[ 474.407947] __device_suspend+0x148/0x4c0 +[ 474.407951] async_suspend+0x20/0x90 +dmesg-efi-164255130401001: +Oops#1 Part1 +[ 474.407955] async_run_entry_fn+0x33/0x120 +[ 474.407959] process_one_work+0x220/0x3f0 +[ 474.407966] worker_thread+0x4a/0x3d0 +[ 474.407971] kthread+0x17a/0x1a0 +[ 474.407975] ? process_one_work+0x3f0/0x3f0 +[ 474.407979] ? set_kthread_struct+0x40/0x40 +[ 474.407983] ret_from_fork+0x22/0x30 +[ 474.407991] + +The issue here is that board file loading happens after ath11k_pci_probe() +succesfully returns (ath11k initialisation happends asynchronously) and the +suspend handler is still enabled, of course failing as ath11k is not properly +initialised. Fix this by checking ATH11K_FLAG_QMI_FAIL during both suspend and +resume. + +Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2 + +Reported-by: Mario Limonciello +Link: https://bugzilla.kernel.org/show_bug.cgi?id=215504 +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20220127090117.2024-1-kvalo@kernel.org +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c +index 54ce08f1c6e0..353a2d669fcd 100644 +--- a/drivers/net/wireless/ath/ath11k/pci.c ++++ b/drivers/net/wireless/ath/ath11k/pci.c +@@ -1382,6 +1382,11 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev) + struct ath11k_base *ab = dev_get_drvdata(dev); + int ret; + ++ if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { ++ ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci suspend as qmi is not initialised\n"); ++ return 0; ++ } ++ + ret = ath11k_core_suspend(ab); + if (ret) + ath11k_warn(ab, "failed to suspend core: %d\n", ret); +@@ -1394,6 +1399,11 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev) + struct ath11k_base *ab = dev_get_drvdata(dev); + int ret; + ++ if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { ++ ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot skipping pci resume as qmi is not initialised\n"); ++ return 0; ++ } ++ + ret = ath11k_core_resume(ab); + if (ret) + ath11k_warn(ab, "failed to resume core: %d\n", ret); +-- +2.35.1 + diff --git a/queue-5.15/ath5k-fix-oob-in-ath5k_eeprom_read_pcal_info_5111.patch b/queue-5.15/ath5k-fix-oob-in-ath5k_eeprom_read_pcal_info_5111.patch new file mode 100644 index 00000000000..edcc185c7d2 --- /dev/null +++ b/queue-5.15/ath5k-fix-oob-in-ath5k_eeprom_read_pcal_info_5111.patch @@ -0,0 +1,87 @@ +From 2dab6b85d5e7c66f8019458517facd70e2d9fedf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 26 Dec 2021 22:12:13 -0500 +Subject: ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111 + +From: Zekun Shen + +[ Upstream commit 564d4eceb97eaf381dd6ef6470b06377bb50c95a ] + +The bug was found during fuzzing. Stacktrace locates it in +ath5k_eeprom_convert_pcal_info_5111. +When none of the curve is selected in the loop, idx can go +up to AR5K_EEPROM_N_PD_CURVES. The line makes pd out of bound. +pd = &chinfo[pier].pd_curves[idx]; + +There are many OOB writes using pd later in the code. So I +added a sanity check for idx. Checks for other loops involving +AR5K_EEPROM_N_PD_CURVES are not needed as the loop index is not +used outside the loops. + +The patch is NOT tested with real device. + +The following is the fuzzing report + +BUG: KASAN: slab-out-of-bounds in ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] +Write of size 1 at addr ffff8880174a4d60 by task modprobe/214 + +CPU: 0 PID: 214 Comm: modprobe Not tainted 5.6.0 #1 +Call Trace: + dump_stack+0x76/0xa0 + print_address_description.constprop.0+0x16/0x200 + ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] + ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] + __kasan_report.cold+0x37/0x7c + ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] + kasan_report+0xe/0x20 + ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] + ? apic_timer_interrupt+0xa/0x20 + ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] + ? ath5k_pci_eeprom_read+0x228/0x3c0 [ath5k] + ath5k_eeprom_init+0x2513/0x6290 [ath5k] + ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] + ? usleep_range+0xb8/0x100 + ? apic_timer_interrupt+0xa/0x20 + ? ath5k_eeprom_read_pcal_info_2413+0x2f20/0x2f20 [ath5k] + ath5k_hw_init+0xb60/0x1970 [ath5k] + ath5k_init_ah+0x6fe/0x2530 [ath5k] + ? kasprintf+0xa6/0xe0 + ? ath5k_stop+0x140/0x140 [ath5k] + ? _dev_notice+0xf6/0xf6 + ? apic_timer_interrupt+0xa/0x20 + ath5k_pci_probe.cold+0x29a/0x3d6 [ath5k] + ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] + ? mutex_lock+0x89/0xd0 + ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] + local_pci_probe+0xd3/0x160 + pci_device_probe+0x23f/0x3e0 + ? pci_device_remove+0x280/0x280 + ? pci_device_remove+0x280/0x280 + really_probe+0x209/0x5d0 + +Reported-by: Brendan Dolan-Gavitt +Signed-off-by: Zekun Shen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/YckvDdj3mtCkDRIt@a-10-27-26-18.dynapool.vpn.nyu.edu +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/ath/ath5k/eeprom.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c +index 1fbc2c19848f..d444b3d70ba2 100644 +--- a/drivers/net/wireless/ath/ath5k/eeprom.c ++++ b/drivers/net/wireless/ath/ath5k/eeprom.c +@@ -746,6 +746,9 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode, + } + } + ++ if (idx == AR5K_EEPROM_N_PD_CURVES) ++ goto err_out; ++ + ee->ee_pd_gains[mode] = 1; + + pd = &chinfo[pier].pd_curves[idx]; +-- +2.35.1 + diff --git a/queue-5.15/bluetooth-fix-not-checking-for-valid-hdev-on-bt_dev_.patch b/queue-5.15/bluetooth-fix-not-checking-for-valid-hdev-on-bt_dev_.patch new file mode 100644 index 00000000000..304c8234903 --- /dev/null +++ b/queue-5.15/bluetooth-fix-not-checking-for-valid-hdev-on-bt_dev_.patch @@ -0,0 +1,57 @@ +From e78be7439545500f04c0896d5628f13935ed1cc5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Mar 2022 13:11:57 -0800 +Subject: Bluetooth: Fix not checking for valid hdev on + bt_dev_{info,warn,err,dbg} + +From: Luiz Augusto von Dentz + +[ Upstream commit 9b392e0e0b6d026da5a62bb79a08f32e27af858e ] + +This fixes attemting to print hdev->name directly which causes them to +print an error: + +kernel: read_version:367: (efault): sock 000000006a3008f2 + +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + include/net/bluetooth/bluetooth.h | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h +index 9125effbf448..3fecc4a411a1 100644 +--- a/include/net/bluetooth/bluetooth.h ++++ b/include/net/bluetooth/bluetooth.h +@@ -180,19 +180,21 @@ void bt_err_ratelimited(const char *fmt, ...); + #define BT_DBG(fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__) + #endif + ++#define bt_dev_name(hdev) ((hdev) ? (hdev)->name : "null") ++ + #define bt_dev_info(hdev, fmt, ...) \ +- BT_INFO("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ BT_INFO("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + #define bt_dev_warn(hdev, fmt, ...) \ +- BT_WARN("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ BT_WARN("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + #define bt_dev_err(hdev, fmt, ...) \ +- BT_ERR("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ BT_ERR("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + #define bt_dev_dbg(hdev, fmt, ...) \ +- BT_DBG("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ BT_DBG("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + + #define bt_dev_warn_ratelimited(hdev, fmt, ...) \ +- bt_warn_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ bt_warn_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + #define bt_dev_err_ratelimited(hdev, fmt, ...) \ +- bt_err_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) ++ bt_err_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__) + + /* Connection and socket states */ + enum { +-- +2.35.1 + diff --git a/queue-5.15/bluetooth-fix-use-after-free-in-hci_send_acl.patch b/queue-5.15/bluetooth-fix-use-after-free-in-hci_send_acl.patch new file mode 100644 index 00000000000..81d2d44658d --- /dev/null +++ b/queue-5.15/bluetooth-fix-use-after-free-in-hci_send_acl.patch @@ -0,0 +1,134 @@ +From b3df72785e2dfbec99ad9c8e8ff00954fb90529b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Mar 2022 13:19:33 -0800 +Subject: Bluetooth: Fix use after free in hci_send_acl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Luiz Augusto von Dentz + +[ Upstream commit f63d24baff787e13b723d86fe036f84bdbc35045 ] + +This fixes the following trace caused by receiving +HCI_EV_DISCONN_PHY_LINK_COMPLETE which does call hci_conn_del without +first checking if conn->type is in fact AMP_LINK and in case it is +do properly cleanup upper layers with hci_disconn_cfm: + + ================================================================== + BUG: KASAN: use-after-free in hci_send_acl+0xaba/0xc50 + Read of size 8 at addr ffff88800e404818 by task bluetoothd/142 + + CPU: 0 PID: 142 Comm: bluetoothd Not tainted + 5.17.0-rc5-00006-gda4022eeac1a #7 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS + rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 + Call Trace: + + dump_stack_lvl+0x45/0x59 + print_address_description.constprop.0+0x1f/0x150 + kasan_report.cold+0x7f/0x11b + hci_send_acl+0xaba/0xc50 + l2cap_do_send+0x23f/0x3d0 + l2cap_chan_send+0xc06/0x2cc0 + l2cap_sock_sendmsg+0x201/0x2b0 + sock_sendmsg+0xdc/0x110 + sock_write_iter+0x20f/0x370 + do_iter_readv_writev+0x343/0x690 + do_iter_write+0x132/0x640 + vfs_writev+0x198/0x570 + do_writev+0x202/0x280 + do_syscall_64+0x38/0x90 + entry_SYSCALL_64_after_hwframe+0x44/0xae + RSP: 002b:00007ffce8a099b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000014 + Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3 + 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 14 00 00 00 0f 05 + <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 + RDX: 0000000000000001 RSI: 00007ffce8a099e0 RDI: 0000000000000015 + RAX: ffffffffffffffda RBX: 00007ffce8a099e0 RCX: 00007f788fc3cf77 + R10: 00007ffce8af7080 R11: 0000000000000246 R12: 000055e4ccf75580 + RBP: 0000000000000015 R08: 0000000000000002 R09: 0000000000000001 + + R13: 000055e4ccf754a0 R14: 000055e4ccf75cd0 R15: 000055e4ccf4a6b0 + + Allocated by task 45: + kasan_save_stack+0x1e/0x40 + __kasan_kmalloc+0x81/0xa0 + hci_chan_create+0x9a/0x2f0 + l2cap_conn_add.part.0+0x1a/0xdc0 + l2cap_connect_cfm+0x236/0x1000 + le_conn_complete_evt+0x15a7/0x1db0 + hci_le_conn_complete_evt+0x226/0x2c0 + hci_le_meta_evt+0x247/0x450 + hci_event_packet+0x61b/0xe90 + hci_rx_work+0x4d5/0xc50 + process_one_work+0x8fb/0x15a0 + worker_thread+0x576/0x1240 + kthread+0x29d/0x340 + ret_from_fork+0x1f/0x30 + + Freed by task 45: + kasan_save_stack+0x1e/0x40 + kasan_set_track+0x21/0x30 + kasan_set_free_info+0x20/0x30 + __kasan_slab_free+0xfb/0x130 + kfree+0xac/0x350 + hci_conn_cleanup+0x101/0x6a0 + hci_conn_del+0x27e/0x6c0 + hci_disconn_phylink_complete_evt+0xe0/0x120 + hci_event_packet+0x812/0xe90 + hci_rx_work+0x4d5/0xc50 + process_one_work+0x8fb/0x15a0 + worker_thread+0x576/0x1240 + kthread+0x29d/0x340 + ret_from_fork+0x1f/0x30 + + The buggy address belongs to the object at ffff88800c0f0500 + The buggy address is located 24 bytes inside of + which belongs to the cache kmalloc-128 of size 128 + The buggy address belongs to the page: + 128-byte region [ffff88800c0f0500, ffff88800c0f0580) + flags: 0x100000000000200(slab|node=0|zone=1) + page:00000000fe45cd86 refcount:1 mapcount:0 + mapping:0000000000000000 index:0x0 pfn:0xc0f0 + raw: 0000000000000000 0000000080100010 00000001ffffffff + 0000000000000000 + raw: 0100000000000200 ffffea00003a2c80 dead000000000004 + ffff8880078418c0 + page dumped because: kasan: bad access detected + ffff88800c0f0400: 00 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc + Memory state around the buggy address: + >ffff88800c0f0500: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + ffff88800c0f0480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ffff88800c0f0580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc + ^ + ================================================================== + ffff88800c0f0600: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb + +Reported-by: Sönke Huster +Tested-by: Sönke Huster +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/hci_event.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c +index 868a22df3285..e984a8b4b914 100644 +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -5153,8 +5153,9 @@ static void hci_disconn_phylink_complete_evt(struct hci_dev *hdev, + hci_dev_lock(hdev); + + hcon = hci_conn_hash_lookup_handle(hdev, ev->phy_handle); +- if (hcon) { ++ if (hcon && hcon->type == AMP_LINK) { + hcon->state = BT_CLOSED; ++ hci_disconn_cfm(hcon, ev->reason); + hci_conn_del(hcon); + } + +-- +2.35.1 + diff --git a/queue-5.15/bluetooth-use-memset-avoid-memory-leaks.patch b/queue-5.15/bluetooth-use-memset-avoid-memory-leaks.patch new file mode 100644 index 00000000000..92cb0c6f2e7 --- /dev/null +++ b/queue-5.15/bluetooth-use-memset-avoid-memory-leaks.patch @@ -0,0 +1,35 @@ +From 52d4261efe5cd57002c75c85d39e40d6f24cf81b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Feb 2022 07:41:52 +0000 +Subject: Bluetooth: use memset avoid memory leaks + +From: Minghao Chi (CGEL ZTE) + +[ Upstream commit d3715b2333e9a21692ba16ef8645eda584a9515d ] + +Use memset to initialize structs to prevent memory leaks +in l2cap_ecred_connect + +Reported-by: Zeal Robot +Signed-off-by: Minghao Chi (CGEL ZTE) +Signed-off-by: Marcel Holtmann +Signed-off-by: Sasha Levin +--- + net/bluetooth/l2cap_core.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c +index 77ba68209dbd..c57a45df7a26 100644 +--- a/net/bluetooth/l2cap_core.c ++++ b/net/bluetooth/l2cap_core.c +@@ -1436,6 +1436,7 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan) + + l2cap_ecred_init(chan, 0); + ++ memset(&data, 0, sizeof(data)); + data.pdu.req.psm = chan->psm; + data.pdu.req.mtu = cpu_to_le16(chan->imtu); + data.pdu.req.mps = cpu_to_le16(chan->mps); +-- +2.35.1 + diff --git a/queue-5.15/bnxt_en-eliminate-unintended-link-toggle-during-fw-r.patch b/queue-5.15/bnxt_en-eliminate-unintended-link-toggle-during-fw-r.patch new file mode 100644 index 00000000000..04d977bef36 --- /dev/null +++ b/queue-5.15/bnxt_en-eliminate-unintended-link-toggle-during-fw-r.patch @@ -0,0 +1,47 @@ +From bb1476711d4cd012389cf31a31926d6778346ac2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 5 Mar 2022 03:54:39 -0500 +Subject: bnxt_en: Eliminate unintended link toggle during FW reset + +From: Michael Chan + +[ Upstream commit 7c492a2530c1f05441da541307c2534230dfd59b ] + +If the flow control settings have been changed, a subsequent FW reset +may cause the ethernet link to toggle unnecessarily. This link toggle +will increase the down time by a few seconds. + +The problem is caused by bnxt_update_phy_setting() detecting a false +mismatch in the flow control settings between the stored software +settings and the current FW settings after the FW reset. This mismatch +is caused by the AUTONEG bit added to link_info->req_flow_ctrl in an +inconsistent way in bnxt_set_pauseparam() in autoneg mode. The AUTONEG +bit should not be added to link_info->req_flow_ctrl. + +Reviewed-by: Colin Winegarden +Reviewed-by: Pavan Chebbi +Signed-off-by: Michael Chan +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +index af7de9ee66cf..0f276ce2d1eb 100644 +--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c ++++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +@@ -2074,9 +2074,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, + } + + link_info->autoneg |= BNXT_AUTONEG_FLOW_CTRL; +- if (bp->hwrm_spec_code >= 0x10201) +- link_info->req_flow_ctrl = +- PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE; ++ link_info->req_flow_ctrl = 0; + } else { + /* when transition from auto pause to force pause, + * force a link change +-- +2.35.1 + diff --git a/queue-5.15/bpf-make-dst_port-field-in-struct-bpf_sock-16-bit-wi.patch b/queue-5.15/bpf-make-dst_port-field-in-struct-bpf_sock-16-bit-wi.patch new file mode 100644 index 00000000000..2312752c1b3 --- /dev/null +++ b/queue-5.15/bpf-make-dst_port-field-in-struct-bpf_sock-16-bit-wi.patch @@ -0,0 +1,94 @@ +From 92c8a8b64abff41a015b19739da93ec74803223e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 30 Jan 2022 12:55:17 +0100 +Subject: bpf: Make dst_port field in struct bpf_sock 16-bit wide + +From: Jakub Sitnicki + +[ Upstream commit 4421a582718ab81608d8486734c18083b822390d ] + +Menglong Dong reports that the documentation for the dst_port field in +struct bpf_sock is inaccurate and confusing. From the BPF program PoV, the +field is a zero-padded 16-bit integer in network byte order. The value +appears to the BPF user as if laid out in memory as so: + + offsetof(struct bpf_sock, dst_port) + 0 + + 8 + +16 0x00 + +24 0x00 + +32-, 16-, and 8-bit wide loads from the field are all allowed, but only if +the offset into the field is 0. + +32-bit wide loads from dst_port are especially confusing. The loaded value, +after converting to host byte order with bpf_ntohl(dst_port), contains the +port number in the upper 16-bits. + +Remove the confusion by splitting the field into two 16-bit fields. For +backward compatibility, allow 32-bit wide loads from offsetof(struct +bpf_sock, dst_port). + +While at it, allow loads 8-bit loads at offset [0] and [1] from dst_port. + +Reported-by: Menglong Dong +Signed-off-by: Jakub Sitnicki +Link: https://lore.kernel.org/r/20220130115518.213259-2-jakub@cloudflare.com +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + include/uapi/linux/bpf.h | 3 ++- + net/core/filter.c | 10 +++++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index e3fb5e520511..2136e45656ab 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -5347,7 +5347,8 @@ struct bpf_sock { + __u32 src_ip4; + __u32 src_ip6[4]; + __u32 src_port; /* host byte order */ +- __u32 dst_port; /* network byte order */ ++ __be16 dst_port; /* network byte order */ ++ __u16 :16; /* zero padding */ + __u32 dst_ip4; + __u32 dst_ip6[4]; + __u32 state; +diff --git a/net/core/filter.c b/net/core/filter.c +index 76e406965b6f..a65de7ac60aa 100644 +--- a/net/core/filter.c ++++ b/net/core/filter.c +@@ -7966,6 +7966,7 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, + struct bpf_insn_access_aux *info) + { + const int size_default = sizeof(__u32); ++ int field_size; + + if (off < 0 || off >= sizeof(struct bpf_sock)) + return false; +@@ -7977,7 +7978,6 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, + case offsetof(struct bpf_sock, family): + case offsetof(struct bpf_sock, type): + case offsetof(struct bpf_sock, protocol): +- case offsetof(struct bpf_sock, dst_port): + case offsetof(struct bpf_sock, src_port): + case offsetof(struct bpf_sock, rx_queue_mapping): + case bpf_ctx_range(struct bpf_sock, src_ip4): +@@ -7986,6 +7986,14 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, + case bpf_ctx_range_till(struct bpf_sock, dst_ip6[0], dst_ip6[3]): + bpf_ctx_record_field_size(info, size_default); + return bpf_ctx_narrow_access_ok(off, size, size_default); ++ case bpf_ctx_range(struct bpf_sock, dst_port): ++ field_size = size == size_default ? ++ size_default : sizeof_field(struct bpf_sock, dst_port); ++ bpf_ctx_record_field_size(info, field_size); ++ return bpf_ctx_narrow_access_ok(off, size, field_size); ++ case offsetofend(struct bpf_sock, dst_port) ... ++ offsetof(struct bpf_sock, dst_ip4) - 1: ++ return false; + } + + return size == size_default; +-- +2.35.1 + diff --git a/queue-5.15/can-etas_es58x-es58x_fd_rx_event_msg-initialize-rx_e.patch b/queue-5.15/can-etas_es58x-es58x_fd_rx_event_msg-initialize-rx_e.patch new file mode 100644 index 00000000000..767d93b325d --- /dev/null +++ b/queue-5.15/can-etas_es58x-es58x_fd_rx_event_msg-initialize-rx_e.patch @@ -0,0 +1,64 @@ +From 2da771d4a4a0d6310c0e63f280e2903a7089c738 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 6 Mar 2022 19:13:02 +0900 +Subject: can: etas_es58x: es58x_fd_rx_event_msg(): initialize rx_event_msg + before calling es58x_check_msg_len() + +From: Vincent Mailhol + +[ Upstream commit 7a8cd7c0ee823a1cc893ab3feaa23e4b602bfb9a ] + +Function es58x_fd_rx_event() invokes the es58x_check_msg_len() macro: + +| ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); + +While doing so, it dereferences an uninitialized +variable: *rx_event_msg. + +This is actually harmless because es58x_check_msg_len() only uses +preprocessor macros (sizeof() and __stringify()) on +*rx_event_msg. c.f. [1]. + +Nonetheless, this pattern is confusing so the lines are reordered to +make sure that rx_event_msg is correctly initialized. + +This patch also fixes a false positive warning reported by cppcheck: + +| cppcheck possible warnings: (new ones prefixed by >>, may not be real problems) +| +| In file included from drivers/net/can/usb/etas_es58x/es58x_fd.c: +| >> drivers/net/can/usb/etas_es58x/es58x_fd.c:174:8: warning: Uninitialized variable: rx_event_msg [uninitvar] +| ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); +| ^ + +[1] https://elixir.bootlin.com/linux/v5.16/source/drivers/net/can/usb/etas_es58x/es58x_core.h#L467 + +Link: https://lore.kernel.org/all/20220306101302.708783-1-mailhol.vincent@wanadoo.fr +Signed-off-by: Vincent Mailhol +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/can/usb/etas_es58x/es58x_fd.c b/drivers/net/can/usb/etas_es58x/es58x_fd.c +index af042aa55f59..26bf4775e884 100644 +--- a/drivers/net/can/usb/etas_es58x/es58x_fd.c ++++ b/drivers/net/can/usb/etas_es58x/es58x_fd.c +@@ -171,12 +171,11 @@ static int es58x_fd_rx_event_msg(struct net_device *netdev, + const struct es58x_fd_rx_event_msg *rx_event_msg; + int ret; + ++ rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; + ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); + if (ret) + return ret; + +- rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; +- + return es58x_rx_err_msg(netdev, rx_event_msg->error_code, + rx_event_msg->event_code, + get_unaligned_le64(&rx_event_msg->timestamp)); +-- +2.35.1 + diff --git a/queue-5.15/can-isotp-set-default-value-for-n_as-to-50-micro-sec.patch b/queue-5.15/can-isotp-set-default-value-for-n_as-to-50-micro-sec.patch new file mode 100644 index 00000000000..6886cf6b3e9 --- /dev/null +++ b/queue-5.15/can-isotp-set-default-value-for-n_as-to-50-micro-sec.patch @@ -0,0 +1,138 @@ +From feb49236fae93bc59fc06279c0b5f0997888334b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Mar 2022 13:04:13 +0100 +Subject: can: isotp: set default value for N_As to 50 micro seconds + +From: Oliver Hartkopp + +[ Upstream commit 530e0d46c61314c59ecfdb8d3bcb87edbc0f85d3 ] + +The N_As value describes the time a CAN frame needs on the wire when +transmitted by the CAN controller. Even very short CAN FD frames need +arround 100 usecs (bitrate 1Mbit/s, data bitrate 8Mbit/s). + +Having N_As to be zero (the former default) leads to 'no CAN frame +separation' when STmin is set to zero by the receiving node. This 'burst +mode' should not be enabled by default as it could potentially dump a high +number of CAN frames into the netdev queue from the soft hrtimer context. +This does not affect the system stability but is just not nice and +cooperative. + +With this N_As/frame_txtime value the 'burst mode' is disabled by default. + +As user space applications usually do not set the frame_txtime element +of struct can_isotp_options the new in-kernel default is very likely +overwritten with zero when the sockopt() CAN_ISOTP_OPTS is invoked. +To make sure that a N_As value of zero is only set intentional the +value '0' is now interpreted as 'do not change the current value'. +When a frame_txtime of zero is required for testing purposes this +CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime. + +Link: https://lore.kernel.org/all/20220309120416.83514-2-socketcan@hartkopp.net +Signed-off-by: Oliver Hartkopp +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Sasha Levin +--- + include/uapi/linux/can/isotp.h | 28 ++++++++++++++++++++++------ + net/can/isotp.c | 12 +++++++++++- + 2 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/include/uapi/linux/can/isotp.h b/include/uapi/linux/can/isotp.h +index c55935b64ccc..590f8aea2b6d 100644 +--- a/include/uapi/linux/can/isotp.h ++++ b/include/uapi/linux/can/isotp.h +@@ -137,20 +137,16 @@ struct can_isotp_ll_options { + #define CAN_ISOTP_WAIT_TX_DONE 0x400 /* wait for tx completion */ + #define CAN_ISOTP_SF_BROADCAST 0x800 /* 1-to-N functional addressing */ + +-/* default values */ ++/* protocol machine default values */ + + #define CAN_ISOTP_DEFAULT_FLAGS 0 + #define CAN_ISOTP_DEFAULT_EXT_ADDRESS 0x00 + #define CAN_ISOTP_DEFAULT_PAD_CONTENT 0xCC /* prevent bit-stuffing */ +-#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 0 ++#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 50000 /* 50 micro seconds */ + #define CAN_ISOTP_DEFAULT_RECV_BS 0 + #define CAN_ISOTP_DEFAULT_RECV_STMIN 0x00 + #define CAN_ISOTP_DEFAULT_RECV_WFTMAX 0 + +-#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU +-#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN +-#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 +- + /* + * Remark on CAN_ISOTP_DEFAULT_RECV_* values: + * +@@ -162,4 +158,24 @@ struct can_isotp_ll_options { + * consistency and copied directly into the flow control (FC) frame. + */ + ++/* link layer default values => make use of Classical CAN frames */ ++ ++#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU ++#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN ++#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 ++ ++/* ++ * The CAN_ISOTP_DEFAULT_FRAME_TXTIME has become a non-zero value as ++ * it only makes sense for isotp implementation tests to run without ++ * a N_As value. As user space applications usually do not set the ++ * frame_txtime element of struct can_isotp_options the new in-kernel ++ * default is very likely overwritten with zero when the sockopt() ++ * CAN_ISOTP_OPTS is invoked. ++ * To make sure that a N_As value of zero is only set intentional the ++ * value '0' is now interpreted as 'do not change the current value'. ++ * When a frame_txtime of zero is required for testing purposes this ++ * CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime. ++ */ ++#define CAN_ISOTP_FRAME_TXTIME_ZERO 0xFFFFFFFF ++ + #endif /* !_UAPI_CAN_ISOTP_H */ +diff --git a/net/can/isotp.c b/net/can/isotp.c +index a95d171b3a64..5bce7c66c121 100644 +--- a/net/can/isotp.c ++++ b/net/can/isotp.c +@@ -141,6 +141,7 @@ struct isotp_sock { + struct can_isotp_options opt; + struct can_isotp_fc_options rxfc, txfc; + struct can_isotp_ll_options ll; ++ u32 frame_txtime; + u32 force_tx_stmin; + u32 force_rx_stmin; + struct tpcon rx, tx; +@@ -360,7 +361,7 @@ static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae) + + so->tx_gap = ktime_set(0, 0); + /* add transmission time for CAN frame N_As */ +- so->tx_gap = ktime_add_ns(so->tx_gap, so->opt.frame_txtime); ++ so->tx_gap = ktime_add_ns(so->tx_gap, so->frame_txtime); + /* add waiting time for consecutive frames N_Cs */ + if (so->opt.flags & CAN_ISOTP_FORCE_TXSTMIN) + so->tx_gap = ktime_add_ns(so->tx_gap, +@@ -1247,6 +1248,14 @@ static int isotp_setsockopt_locked(struct socket *sock, int level, int optname, + /* no separate rx_ext_address is given => use ext_address */ + if (!(so->opt.flags & CAN_ISOTP_RX_EXT_ADDR)) + so->opt.rx_ext_address = so->opt.ext_address; ++ ++ /* check for frame_txtime changes (0 => no changes) */ ++ if (so->opt.frame_txtime) { ++ if (so->opt.frame_txtime == CAN_ISOTP_FRAME_TXTIME_ZERO) ++ so->frame_txtime = 0; ++ else ++ so->frame_txtime = so->opt.frame_txtime; ++ } + break; + + case CAN_ISOTP_RECV_FC: +@@ -1448,6 +1457,7 @@ static int isotp_init(struct sock *sk) + so->opt.rxpad_content = CAN_ISOTP_DEFAULT_PAD_CONTENT; + so->opt.txpad_content = CAN_ISOTP_DEFAULT_PAD_CONTENT; + so->opt.frame_txtime = CAN_ISOTP_DEFAULT_FRAME_TXTIME; ++ so->frame_txtime = CAN_ISOTP_DEFAULT_FRAME_TXTIME; + so->rxfc.bs = CAN_ISOTP_DEFAULT_RECV_BS; + so->rxfc.stmin = CAN_ISOTP_DEFAULT_RECV_STMIN; + so->rxfc.wftmax = CAN_ISOTP_DEFAULT_RECV_WFTMAX; +-- +2.35.1 + diff --git a/queue-5.15/ceph-fix-inode-reference-leakage-in-ceph_get_snapdir.patch b/queue-5.15/ceph-fix-inode-reference-leakage-in-ceph_get_snapdir.patch new file mode 100644 index 00000000000..b1736931e4b --- /dev/null +++ b/queue-5.15/ceph-fix-inode-reference-leakage-in-ceph_get_snapdir.patch @@ -0,0 +1,59 @@ +From 02ff067cf7581f852744528af887edc1b0a3c6df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Mar 2022 14:51:53 +0800 +Subject: ceph: fix inode reference leakage in ceph_get_snapdir() + +From: Xiubo Li + +[ Upstream commit 322794d3355c33adcc4feace0045d85a8e4ed813 ] + +The ceph_get_inode() will search for or insert a new inode into the +hash for the given vino, and return a reference to it. If new is +non-NULL, its reference is consumed. + +We should release the reference when in error handing cases. + +Signed-off-by: Xiubo Li +Reviewed-by: Jeff Layton +Signed-off-by: Ilya Dryomov +Signed-off-by: Sasha Levin +--- + fs/ceph/inode.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c +index 1c7574105478..42e449d3f18b 100644 +--- a/fs/ceph/inode.c ++++ b/fs/ceph/inode.c +@@ -87,13 +87,13 @@ struct inode *ceph_get_snapdir(struct inode *parent) + if (!S_ISDIR(parent->i_mode)) { + pr_warn_once("bad snapdir parent type (mode=0%o)\n", + parent->i_mode); +- return ERR_PTR(-ENOTDIR); ++ goto err; + } + + if (!(inode->i_state & I_NEW) && !S_ISDIR(inode->i_mode)) { + pr_warn_once("bad snapdir inode type (mode=0%o)\n", + inode->i_mode); +- return ERR_PTR(-ENOTDIR); ++ goto err; + } + + inode->i_mode = parent->i_mode; +@@ -113,6 +113,12 @@ struct inode *ceph_get_snapdir(struct inode *parent) + } + + return inode; ++err: ++ if ((inode->i_state & I_NEW)) ++ discard_new_inode(inode); ++ else ++ iput(inode); ++ return ERR_PTR(-ENOTDIR); + } + + const struct inode_operations ceph_file_iops = { +-- +2.35.1 + diff --git a/queue-5.15/ceph-fix-memory-leak-in-ceph_readdir-when-note_last_.patch b/queue-5.15/ceph-fix-memory-leak-in-ceph_readdir-when-note_last_.patch new file mode 100644 index 00000000000..8c87240aa0f --- /dev/null +++ b/queue-5.15/ceph-fix-memory-leak-in-ceph_readdir-when-note_last_.patch @@ -0,0 +1,54 @@ +From 85c84553e07b893d56fdc2fef045db9e4c6bbfa6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 5 Mar 2022 19:52:59 +0800 +Subject: ceph: fix memory leak in ceph_readdir when note_last_dentry returns + error + +From: Xiubo Li + +[ Upstream commit f639d9867eea647005dc824e0e24f39ffc50d4e4 ] + +Reset the last_readdir at the same time, and add a comment explaining +why we don't free last_readdir when dir_emit returns false. + +Signed-off-by: Xiubo Li +Reviewed-by: Jeff Layton +Signed-off-by: Ilya Dryomov +Signed-off-by: Sasha Levin +--- + fs/ceph/dir.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c +index 133dbd9338e7..d91fa53e12b3 100644 +--- a/fs/ceph/dir.c ++++ b/fs/ceph/dir.c +@@ -478,8 +478,11 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) + 2 : (fpos_off(rde->offset) + 1); + err = note_last_dentry(dfi, rde->name, rde->name_len, + next_offset); +- if (err) ++ if (err) { ++ ceph_mdsc_put_request(dfi->last_readdir); ++ dfi->last_readdir = NULL; + return err; ++ } + } else if (req->r_reply_info.dir_end) { + dfi->next_offset = 2; + /* keep last name */ +@@ -520,6 +523,12 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) + if (!dir_emit(ctx, rde->name, rde->name_len, + ceph_present_ino(inode->i_sb, le64_to_cpu(rde->inode.in->ino)), + le32_to_cpu(rde->inode.in->mode) >> 12)) { ++ /* ++ * NOTE: Here no need to put the 'dfi->last_readdir', ++ * because when dir_emit stops us it's most likely ++ * doesn't have enough memory, etc. So for next readdir ++ * it will continue. ++ */ + dout("filldir stopping us...\n"); + return 0; + } +-- +2.35.1 + diff --git a/queue-5.15/cfg80211-don-t-add-non-transmitted-bss-to-6ghz-scann.patch b/queue-5.15/cfg80211-don-t-add-non-transmitted-bss-to-6ghz-scann.patch new file mode 100644 index 00000000000..54c68fd9392 --- /dev/null +++ b/queue-5.15/cfg80211-don-t-add-non-transmitted-bss-to-6ghz-scann.patch @@ -0,0 +1,54 @@ +From f20cb55a15198323daba71af7625c7aadf63b41e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Feb 2022 10:49:37 +0200 +Subject: cfg80211: don't add non transmitted BSS to 6GHz scanned channels + +From: Avraham Stern + +[ Upstream commit 5666ee154f4696c011dfa8544aaf5591b6b87515 ] + +When adding 6GHz channels to scan request based on reported +co-located APs, don't add channels that have only APs with +"non-transmitted" BSSes if they only match the wildcard SSID since +they will be found by probing the "transmitted" BSS. + +Signed-off-by: Avraham Stern +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/iwlwifi.20220202104617.f6ddf099f934.I231e55885d3644f292d00dfe0f42653269f2559e@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/wireless/scan.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/net/wireless/scan.c b/net/wireless/scan.c +index adc0d14cfd86..8e1e578d64bc 100644 +--- a/net/wireless/scan.c ++++ b/net/wireless/scan.c +@@ -702,8 +702,12 @@ static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap, + + for (i = 0; i < request->n_ssids; i++) { + /* wildcard ssid in the scan request */ +- if (!request->ssids[i].ssid_len) ++ if (!request->ssids[i].ssid_len) { ++ if (ap->multi_bss && !ap->transmitted_bssid) ++ continue; ++ + return true; ++ } + + if (ap->ssid_len && + ap->ssid_len == request->ssids[i].ssid_len) { +@@ -829,6 +833,9 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) + !cfg80211_find_ssid_match(ap, request)) + continue; + ++ if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) ++ continue; ++ + cfg80211_scan_req_add_chan(request, chan, true); + memcpy(scan_6ghz_params->bssid, ap->bssid, ETH_ALEN); + scan_6ghz_params->short_ssid = ap->short_ssid; +-- +2.35.1 + diff --git a/queue-5.15/clk-enforce-that-disjoints-limits-are-invalid.patch b/queue-5.15/clk-enforce-that-disjoints-limits-are-invalid.patch new file mode 100644 index 00000000000..cfe81244a0b --- /dev/null +++ b/queue-5.15/clk-enforce-that-disjoints-limits-are-invalid.patch @@ -0,0 +1,103 @@ +From f3fe05b1baf6541d2474632c2643420994e17fde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 25 Feb 2022 15:35:25 +0100 +Subject: clk: Enforce that disjoints limits are invalid + +From: Maxime Ripard + +[ Upstream commit 10c46f2ea914202482d19cf80dcc9c321c9ff59b ] + +If we were to have two users of the same clock, doing something like: + +clk_set_rate_range(user1, 1000, 2000); +clk_set_rate_range(user2, 3000, 4000); + +The second call would fail with -EINVAL, preventing from getting in a +situation where we end up with impossible limits. + +However, this is never explicitly checked against and enforced, and +works by relying on an undocumented behaviour of clk_set_rate(). + +Indeed, on the first clk_set_rate_range will make sure the current clock +rate is within the new range, so it will be between 1000 and 2000Hz. On +the second clk_set_rate_range(), it will consider (rightfully), that our +current clock is outside of the 3000-4000Hz range, and will call +clk_core_set_rate_nolock() to set it to 3000Hz. + +clk_core_set_rate_nolock() will then call clk_calc_new_rates() that will +eventually check that our rate 3000Hz rate is outside the min 3000Hz max +2000Hz range, will bail out, the error will propagate and we'll +eventually return -EINVAL. + +This solely relies on the fact that clk_calc_new_rates(), and in +particular clk_core_determine_round_nolock(), won't modify the new rate +allowing the error to be reported. That assumption won't be true for all +drivers, and most importantly we'll break that assumption in a later +patch. + +It can also be argued that we shouldn't even reach the point where we're +calling clk_core_set_rate_nolock(). + +Let's make an explicit check for disjoints range before we're doing +anything. + +Signed-off-by: Maxime Ripard +Link: https://lore.kernel.org/r/20220225143534.405820-4-maxime@cerno.tech +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/clk.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c +index 5cef73a85901..d6dc58bd07b3 100644 +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -631,6 +631,24 @@ static void clk_core_get_boundaries(struct clk_core *core, + *max_rate = min(*max_rate, clk_user->max_rate); + } + ++static bool clk_core_check_boundaries(struct clk_core *core, ++ unsigned long min_rate, ++ unsigned long max_rate) ++{ ++ struct clk *user; ++ ++ lockdep_assert_held(&prepare_lock); ++ ++ if (min_rate > core->max_rate || max_rate < core->min_rate) ++ return false; ++ ++ hlist_for_each_entry(user, &core->clks, clks_node) ++ if (min_rate > user->max_rate || max_rate < user->min_rate) ++ return false; ++ ++ return true; ++} ++ + void clk_hw_set_rate_range(struct clk_hw *hw, unsigned long min_rate, + unsigned long max_rate) + { +@@ -2347,6 +2365,11 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) + clk->min_rate = min; + clk->max_rate = max; + ++ if (!clk_core_check_boundaries(clk->core, min, max)) { ++ ret = -EINVAL; ++ goto out; ++ } ++ + rate = clk_core_get_rate_nolock(clk->core); + if (rate < min || rate > max) { + /* +@@ -2375,6 +2398,7 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) + } + } + ++out: + if (clk->exclusive_count) + clk_core_rate_protect(clk->core); + +-- +2.35.1 + diff --git a/queue-5.15/clk-rockchip-drop-clk_set_rate_parent-from-dclk_vop-.patch b/queue-5.15/clk-rockchip-drop-clk_set_rate_parent-from-dclk_vop-.patch new file mode 100644 index 00000000000..3ce788d57c2 --- /dev/null +++ b/queue-5.15/clk-rockchip-drop-clk_set_rate_parent-from-dclk_vop-.patch @@ -0,0 +1,49 @@ +From 037ac880b1c4bbaa6859a3d61a322d03ac5037c3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Jan 2022 15:55:46 +0100 +Subject: clk: rockchip: drop CLK_SET_RATE_PARENT from dclk_vop* on rk3568 + +From: Sascha Hauer + +[ Upstream commit ff3187eabb5ce478d15b6ed62eb286756adefac3 ] + +The pixel clocks dclk_vop[012] can be clocked from hpll, vpll, gpll or +cpll. gpll and cpll also drive many other clocks, so changing the +dclk_vop[012] clocks could change these other clocks as well. Drop +CLK_SET_RATE_PARENT to fix that. With this change the VOP2 driver can +only adjust the pixel clocks with the divider between the PLL and the +dclk_vop[012] which means the user may have to adjust the PLL clock to a +suitable rate using the assigned-clock-rate device tree property. + +Signed-off-by: Sascha Hauer +Link: https://lore.kernel.org/r/20220126145549.617165-25-s.hauer@pengutronix.de +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + drivers/clk/rockchip/clk-rk3568.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/clk/rockchip/clk-rk3568.c b/drivers/clk/rockchip/clk-rk3568.c +index 75ca855e720d..6e5440841d1e 100644 +--- a/drivers/clk/rockchip/clk-rk3568.c ++++ b/drivers/clk/rockchip/clk-rk3568.c +@@ -1038,13 +1038,13 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = { + RK3568_CLKGATE_CON(20), 8, GFLAGS), + GATE(HCLK_VOP, "hclk_vop", "hclk_vo", 0, + RK3568_CLKGATE_CON(20), 9, GFLAGS), +- COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(39), 10, 2, MFLAGS, 0, 8, DFLAGS, + RK3568_CLKGATE_CON(20), 10, GFLAGS), +- COMPOSITE(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, ++ COMPOSITE(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(40), 10, 2, MFLAGS, 0, 8, DFLAGS, + RK3568_CLKGATE_CON(20), 11, GFLAGS), +- COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, 0, ++ COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, CLK_SET_RATE_NO_REPARENT, + RK3568_CLKSEL_CON(41), 10, 2, MFLAGS, 0, 8, DFLAGS, + RK3568_CLKGATE_CON(20), 12, GFLAGS), + GATE(CLK_VOP_PWM, "clk_vop_pwm", "xin24m", 0, +-- +2.35.1 + diff --git a/queue-5.15/clk-si5341-fix-reported-clk_rate-when-output-divider.patch b/queue-5.15/clk-si5341-fix-reported-clk_rate-when-output-divider.patch new file mode 100644 index 00000000000..5fa09d9e0b6 --- /dev/null +++ b/queue-5.15/clk-si5341-fix-reported-clk_rate-when-output-divider.patch @@ -0,0 +1,62 @@ +From 9bcf2f9beb739c6953e6671ff1c48aac50e8f644 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 3 Dec 2021 14:12:07 +0000 +Subject: clk: si5341: fix reported clk_rate when output divider is 2 + +From: Adam Wujek + +[ Upstream commit 2a8b539433e111c4de364237627ef219d2f6350a ] + +SI5341_OUT_CFG_RDIV_FORCE2 shall be checked first to distinguish whether +a divider for a given output is set to 2 (SI5341_OUT_CFG_RDIV_FORCE2 +is set) or the output is disabled (SI5341_OUT_CFG_RDIV_FORCE2 not set, +SI5341_OUT_R_REG is set 0). +Before the change, divider set to 2 (SI5341_OUT_R_REG set to 0) was +interpreted as output is disabled. + +Signed-off-by: Adam Wujek +Link: https://lore.kernel.org/r/20211203141125.2447520-1-dev_public@wujek.eu +Reviewed-by: Robert Hancock +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/clk-si5341.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c +index f7b41366666e..4de098b6b0d4 100644 +--- a/drivers/clk/clk-si5341.c ++++ b/drivers/clk/clk-si5341.c +@@ -798,6 +798,15 @@ static unsigned long si5341_output_clk_recalc_rate(struct clk_hw *hw, + u32 r_divider; + u8 r[3]; + ++ err = regmap_read(output->data->regmap, ++ SI5341_OUT_CONFIG(output), &val); ++ if (err < 0) ++ return err; ++ ++ /* If SI5341_OUT_CFG_RDIV_FORCE2 is set, r_divider is 2 */ ++ if (val & SI5341_OUT_CFG_RDIV_FORCE2) ++ return parent_rate / 2; ++ + err = regmap_bulk_read(output->data->regmap, + SI5341_OUT_R_REG(output), r, 3); + if (err < 0) +@@ -814,13 +823,6 @@ static unsigned long si5341_output_clk_recalc_rate(struct clk_hw *hw, + r_divider += 1; + r_divider <<= 1; + +- err = regmap_read(output->data->regmap, +- SI5341_OUT_CONFIG(output), &val); +- if (err < 0) +- return err; +- +- if (val & SI5341_OUT_CFG_RDIV_FORCE2) +- r_divider = 2; + + return parent_rate / r_divider; + } +-- +2.35.1 + diff --git a/queue-5.15/clk-ti-preserve-node-in-ti_dt_clocks_register.patch b/queue-5.15/clk-ti-preserve-node-in-ti_dt_clocks_register.patch new file mode 100644 index 00000000000..9f8a17e645e --- /dev/null +++ b/queue-5.15/clk-ti-preserve-node-in-ti_dt_clocks_register.patch @@ -0,0 +1,56 @@ +From efa9198e2b377456af4c10ca841815be8bf97e3f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 09:14:43 +0200 +Subject: clk: ti: Preserve node in ti_dt_clocks_register() + +From: Tony Lindgren + +[ Upstream commit 80864594ff2ad002e2755daf97d46ff0c86faf1f ] + +In preparation for making use of the clock-output-names, we want to +keep node around in ti_dt_clocks_register(). + +This change should not needed as a fix currently. + +Signed-off-by: Tony Lindgren +Link: https://lore.kernel.org/r/20220204071449.16762-3-tony@atomide.com +Signed-off-by: Stephen Boyd +Signed-off-by: Sasha Levin +--- + drivers/clk/ti/clk.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c +index 3da33c786d77..29eafab4353e 100644 +--- a/drivers/clk/ti/clk.c ++++ b/drivers/clk/ti/clk.c +@@ -131,7 +131,7 @@ int ti_clk_setup_ll_ops(struct ti_clk_ll_ops *ops) + void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) + { + struct ti_dt_clk *c; +- struct device_node *node, *parent; ++ struct device_node *node, *parent, *child; + struct clk *clk; + struct of_phandle_args clkspec; + char buf[64]; +@@ -171,10 +171,13 @@ void __init ti_dt_clocks_register(struct ti_dt_clk oclks[]) + node = of_find_node_by_name(NULL, buf); + if (num_args && compat_mode) { + parent = node; +- node = of_get_child_by_name(parent, "clock"); +- if (!node) +- node = of_get_child_by_name(parent, "clk"); +- of_node_put(parent); ++ child = of_get_child_by_name(parent, "clock"); ++ if (!child) ++ child = of_get_child_by_name(parent, "clk"); ++ if (child) { ++ of_node_put(parent); ++ node = child; ++ } + } + + clkspec.np = node; +-- +2.35.1 + diff --git a/queue-5.15/cpufreq-cppc-fix-performance-frequency-conversion.patch b/queue-5.15/cpufreq-cppc-fix-performance-frequency-conversion.patch new file mode 100644 index 00000000000..953c01c40ac --- /dev/null +++ b/queue-5.15/cpufreq-cppc-fix-performance-frequency-conversion.patch @@ -0,0 +1,135 @@ +From cdd528a62cd955bf21c9b50712dda08bc99f79bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Feb 2022 09:01:09 +0100 +Subject: cpufreq: CPPC: Fix performance/frequency conversion + +From: Pierre Gondois + +[ Upstream commit ec1c7ad47664f964c1101fe555b6fde0cb124b38 ] + +CPUfreq governors request CPU frequencies using information +on current CPU usage. The CPPC driver converts them to +performance requests. Frequency targets are computed as: + target_freq = (util / cpu_capacity) * max_freq +target_freq is then clamped between [policy->min, policy->max]. + +The CPPC driver converts performance values to frequencies +(and vice-versa) using cppc_cpufreq_perf_to_khz() and +cppc_cpufreq_khz_to_perf(). These functions both use two different +factors depending on the range of the input value. For +cppc_cpufreq_khz_to_perf(): +- (NOMINAL_PERF / NOMINAL_FREQ) or +- (LOWEST_PERF / LOWEST_FREQ) +and for cppc_cpufreq_perf_to_khz(): +- (NOMINAL_FREQ / NOMINAL_PERF) or +- ((NOMINAL_PERF - LOWEST_FREQ) / (NOMINAL_PERF - LOWEST_PERF)) + +This means: +1- the functions are not inverse for some values: + (perf_to_khz(khz_to_perf(x)) != x) +2- cppc_cpufreq_perf_to_khz(LOWEST_PERF) can sometimes give + a different value from LOWEST_FREQ due to integer approximation +3- it is implied that performance and frequency are proportional + (NOMINAL_FREQ / NOMINAL_PERF) == (LOWEST_PERF / LOWEST_FREQ) + +This patch changes the conversion functions to an affine function. +This fixes the 3 points above. + +Suggested-by: Lukasz Luba +Suggested-by: Morten Rasmussen +Signed-off-by: Pierre Gondois +Signed-off-by: Viresh Kumar +Signed-off-by: Sasha Levin +--- + drivers/cpufreq/cppc_cpufreq.c | 43 +++++++++++++++++----------------- + 1 file changed, 21 insertions(+), 22 deletions(-) + +diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c +index d4c27022b9c9..e0ff09d66c96 100644 +--- a/drivers/cpufreq/cppc_cpufreq.c ++++ b/drivers/cpufreq/cppc_cpufreq.c +@@ -303,52 +303,48 @@ static u64 cppc_get_dmi_max_khz(void) + + /* + * If CPPC lowest_freq and nominal_freq registers are exposed then we can +- * use them to convert perf to freq and vice versa +- * +- * If the perf/freq point lies between Nominal and Lowest, we can treat +- * (Low perf, Low freq) and (Nom Perf, Nom freq) as 2D co-ordinates of a line +- * and extrapolate the rest +- * For perf/freq > Nominal, we use the ratio perf:freq at Nominal for conversion ++ * use them to convert perf to freq and vice versa. The conversion is ++ * extrapolated as an affine function passing by the 2 points: ++ * - (Low perf, Low freq) ++ * - (Nominal perf, Nominal perf) + */ + static unsigned int cppc_cpufreq_perf_to_khz(struct cppc_cpudata *cpu_data, + unsigned int perf) + { + struct cppc_perf_caps *caps = &cpu_data->perf_caps; ++ s64 retval, offset = 0; + static u64 max_khz; + u64 mul, div; + + if (caps->lowest_freq && caps->nominal_freq) { +- if (perf >= caps->nominal_perf) { +- mul = caps->nominal_freq; +- div = caps->nominal_perf; +- } else { +- mul = caps->nominal_freq - caps->lowest_freq; +- div = caps->nominal_perf - caps->lowest_perf; +- } ++ mul = caps->nominal_freq - caps->lowest_freq; ++ div = caps->nominal_perf - caps->lowest_perf; ++ offset = caps->nominal_freq - div64_u64(caps->nominal_perf * mul, div); + } else { + if (!max_khz) + max_khz = cppc_get_dmi_max_khz(); + mul = max_khz; + div = caps->highest_perf; + } +- return (u64)perf * mul / div; ++ ++ retval = offset + div64_u64(perf * mul, div); ++ if (retval >= 0) ++ return retval; ++ return 0; + } + + static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data, + unsigned int freq) + { + struct cppc_perf_caps *caps = &cpu_data->perf_caps; ++ s64 retval, offset = 0; + static u64 max_khz; + u64 mul, div; + + if (caps->lowest_freq && caps->nominal_freq) { +- if (freq >= caps->nominal_freq) { +- mul = caps->nominal_perf; +- div = caps->nominal_freq; +- } else { +- mul = caps->lowest_perf; +- div = caps->lowest_freq; +- } ++ mul = caps->nominal_perf - caps->lowest_perf; ++ div = caps->nominal_freq - caps->lowest_freq; ++ offset = caps->nominal_perf - div64_u64(caps->nominal_freq * mul, div); + } else { + if (!max_khz) + max_khz = cppc_get_dmi_max_khz(); +@@ -356,7 +352,10 @@ static unsigned int cppc_cpufreq_khz_to_perf(struct cppc_cpudata *cpu_data, + div = max_khz; + } + +- return (u64)freq * mul / div; ++ retval = offset + div64_u64(freq * mul, div); ++ if (retval >= 0) ++ return retval; ++ return 0; + } + + static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, +-- +2.35.1 + diff --git a/queue-5.15/dm-ioctl-prevent-potential-spectre-v1-gadget.patch b/queue-5.15/dm-ioctl-prevent-potential-spectre-v1-gadget.patch new file mode 100644 index 00000000000..360f1414036 --- /dev/null +++ b/queue-5.15/dm-ioctl-prevent-potential-spectre-v1-gadget.patch @@ -0,0 +1,44 @@ +From bd582f0724018b9569c0114c42d83d678ab801cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 Jan 2022 15:58:39 +0100 +Subject: dm ioctl: prevent potential spectre v1 gadget + +From: Jordy Zomer + +[ Upstream commit cd9c88da171a62c4b0f1c70e50c75845969fbc18 ] + +It appears like cmd could be a Spectre v1 gadget as it's supplied by a +user and used as an array index. Prevent the contents of kernel memory +from being leaked to userspace via speculative execution by using +array_index_nospec. + +Signed-off-by: Jordy Zomer +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + drivers/md/dm-ioctl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c +index 21fe8652b095..901abd6dea41 100644 +--- a/drivers/md/dm-ioctl.c ++++ b/drivers/md/dm-ioctl.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -1788,6 +1789,7 @@ static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags) + if (unlikely(cmd >= ARRAY_SIZE(_ioctls))) + return NULL; + ++ cmd = array_index_nospec(cmd, ARRAY_SIZE(_ioctls)); + *ioctl_flags = _ioctls[cmd].flags; + return _ioctls[cmd].fn; + } +-- +2.35.1 + diff --git a/queue-5.15/dm-requeue-io-if-mapping-table-not-yet-available.patch b/queue-5.15/dm-requeue-io-if-mapping-table-not-yet-available.patch new file mode 100644 index 00000000000..aa9979c8b8f --- /dev/null +++ b/queue-5.15/dm-requeue-io-if-mapping-table-not-yet-available.patch @@ -0,0 +1,70 @@ +From 2453401f663a14f796b6297823bab9037e2efe6d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Feb 2022 13:28:12 -0500 +Subject: dm: requeue IO if mapping table not yet available + +From: Mike Snitzer + +[ Upstream commit fa247089de9936a46e290d4724cb5f0b845600f5 ] + +Update both bio-based and request-based DM to requeue IO if the +mapping table not available. + +This race of IO being submitted before the DM device ready is so +narrow, yet possible for initial table load given that the DM device's +request_queue is created prior, that it best to requeue IO to handle +this unlikely case. + +Reported-by: Zhang Yi +Signed-off-by: Mike Snitzer +Signed-off-by: Sasha Levin +--- + drivers/md/dm-rq.c | 7 ++++++- + drivers/md/dm.c | 11 +++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c +index a896dea9750e..53a9b16c7b2e 100644 +--- a/drivers/md/dm-rq.c ++++ b/drivers/md/dm-rq.c +@@ -500,8 +500,13 @@ static blk_status_t dm_mq_queue_rq(struct blk_mq_hw_ctx *hctx, + + if (unlikely(!ti)) { + int srcu_idx; +- struct dm_table *map = dm_get_live_table(md, &srcu_idx); ++ struct dm_table *map; + ++ map = dm_get_live_table(md, &srcu_idx); ++ if (unlikely(!map)) { ++ dm_put_live_table(md, srcu_idx); ++ return BLK_STS_RESOURCE; ++ } + ti = dm_table_find_target(map, 0); + dm_put_live_table(md, srcu_idx); + } +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index 443478a08857..36449422e7e0 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -1594,15 +1594,10 @@ static blk_qc_t dm_submit_bio(struct bio *bio) + struct dm_table *map; + + map = dm_get_live_table(md, &srcu_idx); +- if (unlikely(!map)) { +- DMERR_LIMIT("%s: mapping table unavailable, erroring io", +- dm_device_name(md)); +- bio_io_error(bio); +- goto out; +- } + +- /* If suspended, queue this IO for later */ +- if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags))) { ++ /* If suspended, or map not yet available, queue this IO for later */ ++ if (unlikely(test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) || ++ unlikely(!map)) { + if (bio->bi_opf & REQ_NOWAIT) + bio_wouldblock_error(bio); + else if (bio->bi_opf & REQ_RAHEAD) +-- +2.35.1 + diff --git a/queue-5.15/drm-add-orientation-quirk-for-gpd-win-max.patch b/queue-5.15/drm-add-orientation-quirk-for-gpd-win-max.patch new file mode 100644 index 00000000000..05493ac6566 --- /dev/null +++ b/queue-5.15/drm-add-orientation-quirk-for-gpd-win-max.patch @@ -0,0 +1,40 @@ +From c78f1740fa1eaa9015877ef43f53c8f37c78e015 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 29 Dec 2021 23:22:00 +0100 +Subject: drm: Add orientation quirk for GPD Win Max + +From: Anisse Astier + +[ Upstream commit 0b464ca3e0dd3cec65f28bc6d396d82f19080f69 ] + +Panel is 800x1280, but mounted on a laptop form factor, sideways. + +Signed-off-by: Anisse Astier +Reviewed-by: Hans de Goede +Signed-off-by: Jani Nikula +Link: https://patchwork.freedesktop.org/patch/msgid/20211229222200.53128-3-anisse@astier.eu +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c +index 448c2f2d803a..f5ab891731d0 100644 +--- a/drivers/gpu/drm/drm_panel_orientation_quirks.c ++++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c +@@ -166,6 +166,12 @@ static const struct dmi_system_id orientation_data[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MicroPC"), + }, + .driver_data = (void *)&lcd720x1280_rightside_up, ++ }, { /* GPD Win Max */ ++ .matches = { ++ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "GPD"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "G1619-01"), ++ }, ++ .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* + * GPD Pocket, note that the the DMI data is less generic then + * it seems, devices with a board-vendor of "AMI Corporation" +-- +2.35.1 + diff --git a/queue-5.15/drm-amd-amdgpu-amdgpu_cs-fix-refcount-leak-of-a-dma_.patch b/queue-5.15/drm-amd-amdgpu-amdgpu_cs-fix-refcount-leak-of-a-dma_.patch new file mode 100644 index 00000000000..f1e5198f24e --- /dev/null +++ b/queue-5.15/drm-amd-amdgpu-amdgpu_cs-fix-refcount-leak-of-a-dma_.patch @@ -0,0 +1,46 @@ +From e5cd17dd55c3208c4540edda5d1c7629d3e36f97 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jan 2022 15:46:23 -0500 +Subject: drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Xin Xiong + +[ Upstream commit dfced44f122c500004a48ecc8db516bb6a295a1b ] + +This issue takes place in an error path in +amdgpu_cs_fence_to_handle_ioctl(). When `info->in.what` falls into +default case, the function simply returns -EINVAL, forgetting to +decrement the reference count of a dma_fence obj, which is bumped +earlier by amdgpu_cs_get_fence(). This may result in reference count +leaks. + +Fix it by decreasing the refcount of specific object before returning +the error code. + +Reviewed-by: Christian König +Signed-off-by: Xin Xiong +Signed-off-by: Xin Tan +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +index 913f9eaa9cd6..aa823f154199 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +@@ -1508,6 +1508,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data, + return 0; + + default: ++ dma_fence_put(fence); + return -EINVAL; + } + } +-- +2.35.1 + diff --git a/queue-5.15/drm-amd-display-add-signal-type-check-when-verify-st.patch b/queue-5.15/drm-amd-display-add-signal-type-check-when-verify-st.patch new file mode 100644 index 00000000000..1be33a860a2 --- /dev/null +++ b/queue-5.15/drm-amd-display-add-signal-type-check-when-verify-st.patch @@ -0,0 +1,47 @@ +From 14b3ec79d1e4a106ecaec104853b21b388cb26ad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 28 Dec 2021 16:50:28 +0800 +Subject: drm/amd/display: Add signal type check when verify stream backends + same + +From: Dale Zhao + +[ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ] + +[Why] +For allow eDP hot-plug feature, the stream signal may change to VIRTUAL +when plug-out and back to eDP when plug-in. OS will still setPathMode +with same timing for each plugging, but eDP gets no stream update as we +don't check signal type changing back as keeping it VIRTUAL. It's also +unsafe for future cases that stream signal is switched with same timing. + +[How] +Check stream signal type change include previous HDMI signal case. + +Reviewed-by: Aric Cyr +Acked-by: Wayne Lin +Signed-off-by: Dale Zhao +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index 7ae409f7dcf8..108f3854cd2a 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -1599,6 +1599,9 @@ static bool are_stream_backends_same( + if (is_timing_changed(stream_a, stream_b)) + return false; + ++ if (stream_a->signal != stream_b->signal) ++ return false; ++ + if (stream_a->dpms_off != stream_b->dpms_off) + return false; + +-- +2.35.1 + diff --git a/queue-5.15/drm-amd-display-fix-memory-leak.patch b/queue-5.15/drm-amd-display-fix-memory-leak.patch new file mode 100644 index 00000000000..02368ae9515 --- /dev/null +++ b/queue-5.15/drm-amd-display-fix-memory-leak.patch @@ -0,0 +1,271 @@ +From 24d57b183463142d06142052ff9e07e811a330da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jan 2022 11:26:13 +0000 +Subject: drm/amd/display: Fix memory leak + +From: Yongzhi Liu + +[ Upstream commit 5d5c6dba2b43e28845d7d7ed32a36802329a5f52 ] + +[why] +Resource release is needed on the error handling path +to prevent memory leak. + +[how] +Fix this by adding kfree on the error handling path. + +Reviewed-by: Harry Wentland +Signed-off-by: Yongzhi Liu +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 80 ++++++++++++++----- + 1 file changed, 60 insertions(+), 20 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +index e94ddd5e7b63..5c9f5214bc4e 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +@@ -229,8 +229,10 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -388,8 +390,10 @@ static ssize_t dp_phy_settings_read(struct file *f, char __user *buf, + break; + + r = put_user((*(rd_buf + result)), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -1316,8 +1320,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -1333,8 +1339,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -1503,8 +1511,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -1520,8 +1530,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -1688,8 +1700,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -1705,8 +1719,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -1869,8 +1885,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -1886,8 +1904,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -2045,8 +2065,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -2062,8 +2084,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -2102,8 +2126,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -2119,8 +2145,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -2174,8 +2202,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -2191,8 +2221,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -2246,8 +2278,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf, + break; + } + +- if (!pipe_ctx) ++ if (!pipe_ctx) { ++ kfree(rd_buf); + return -ENXIO; ++ } + + dsc = pipe_ctx->stream_res.dsc; + if (dsc) +@@ -2263,8 +2297,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf, + break; + + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + + buf += 1; + size -= 1; +@@ -3254,8 +3290,10 @@ static ssize_t dcc_en_bits_read( + dc->hwss.get_dcc_en_bits(dc, dcc_en_bits); + + rd_buf = kcalloc(rd_buf_size, sizeof(char), GFP_KERNEL); +- if (!rd_buf) ++ if (!rd_buf) { ++ kfree(dcc_en_bits); + return -ENOMEM; ++ } + + for (i = 0; i < num_pipes; i++) + offset += snprintf(rd_buf + offset, rd_buf_size - offset, +@@ -3268,8 +3306,10 @@ static ssize_t dcc_en_bits_read( + if (*pos >= rd_buf_size) + break; + r = put_user(*(rd_buf + result), buf); +- if (r) ++ if (r) { ++ kfree(rd_buf); + return r; /* r = -EFAULT */ ++ } + buf += 1; + size -= 1; + *pos += 1; +-- +2.35.1 + diff --git a/queue-5.15/drm-amd-display-use-psr-version-selected-during-set_.patch b/queue-5.15/drm-amd-display-use-psr-version-selected-during-set_.patch new file mode 100644 index 00000000000..ab3b5d2c496 --- /dev/null +++ b/queue-5.15/drm-amd-display-use-psr-version-selected-during-set_.patch @@ -0,0 +1,51 @@ +From 0a5e7a32ed0b55b99d0beaba2922ccf868563627 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jan 2022 13:20:04 -0500 +Subject: drm/amd/display: Use PSR version selected during set_psr_caps + +From: Nicholas Kazlauskas + +[ Upstream commit b80ddeb29d9df449f875f0b6f5de08d7537c02b8 ] + +[Why] +If the DPCD caps specifies a PSR version newer than PSR_VERSION_1 then +we fallback to using PSR_VERSION_1 in amdgpu_dm_set_psr_caps. + +This gets overriden with the raw DPCD value in amdgpu_dm_link_setup_psr, +which can result in DMCUB hanging if we pass in an unsupported PSR +version number. + +[How] +Fix the hang by using link->psr_settings.psr_version directly during +amdgpu_dm_link_setup_psr. + +Tested-by: Daniel Wheeler +Reviewed-by: Anthony Koo +Acked-by: Rodrigo Siqueira +Signed-off-by: Nicholas Kazlauskas +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +index 70a554f1e725..7072fb2ec07f 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +@@ -74,10 +74,8 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) + + link = stream->link; + +- psr_config.psr_version = link->dpcd_caps.psr_caps.psr_version; +- +- if (psr_config.psr_version > 0) { +- psr_config.psr_exit_link_training_required = 0x1; ++ if (link->psr_settings.psr_version != DC_PSR_VERSION_UNSUPPORTED) { ++ psr_config.psr_version = link->psr_settings.psr_version; + psr_config.psr_frame_capture_indication_req = 0; + psr_config.psr_rfb_setup_time = 0x37; + psr_config.psr_sdp_transmit_line_num_deadline = 0x20; +-- +2.35.1 + diff --git a/queue-5.15/drm-amdgpu-fix-recursive-locking-warning.patch b/queue-5.15/drm-amdgpu-fix-recursive-locking-warning.patch new file mode 100644 index 00000000000..c694ef89362 --- /dev/null +++ b/queue-5.15/drm-amdgpu-fix-recursive-locking-warning.patch @@ -0,0 +1,141 @@ +From a9ca33a1c2e145d34396e08ffc0a242760844a60 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Feb 2022 21:18:21 -0500 +Subject: drm/amdgpu: Fix recursive locking warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rajneesh Bhardwaj + +[ Upstream commit 447c7997b62a5115ba4da846dcdee4fc12298a6a ] + +Noticed the below warning while running a pytorch workload on vega10 +GPUs. Change to trylock to avoid conflicts with already held reservation +locks. + +[ +0.000003] WARNING: possible recursive locking detected +[ +0.000003] 5.13.0-kfd-rajneesh #1030 Not tainted +[ +0.000004] -------------------------------------------- +[ +0.000002] python/4822 is trying to acquire lock: +[ +0.000004] ffff932cd9a259f8 (reservation_ww_class_mutex){+.+.}-{3:3}, +at: amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000203] + but task is already holding lock: +[ +0.000003] ffff932cbb7181f8 (reservation_ww_class_mutex){+.+.}-{3:3}, +at: ttm_eu_reserve_buffers+0x270/0x470 [ttm] +[ +0.000017] + other info that might help us debug this: +[ +0.000002] Possible unsafe locking scenario: + +[ +0.000003] CPU0 +[ +0.000002] ---- +[ +0.000002] lock(reservation_ww_class_mutex); +[ +0.000004] lock(reservation_ww_class_mutex); +[ +0.000003] + *** DEADLOCK *** + +[ +0.000002] May be due to missing lock nesting notation + +[ +0.000003] 7 locks held by python/4822: +[ +0.000003] #0: ffff932c4ac028d0 (&process->mutex){+.+.}-{3:3}, at: +kfd_ioctl_map_memory_to_gpu+0x10b/0x320 [amdgpu] +[ +0.000232] #1: ffff932c55e830a8 (&info->lock#2){+.+.}-{3:3}, at: +amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x64/0xf60 [amdgpu] +[ +0.000241] #2: ffff932cc45b5e68 (&(*mem)->lock){+.+.}-{3:3}, at: +amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0xdf/0xf60 [amdgpu] +[ +0.000236] #3: ffffb2b35606fd28 +(reservation_ww_class_acquire){+.+.}-{0:0}, at: +amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x232/0xf60 [amdgpu] +[ +0.000235] #4: ffff932cbb7181f8 +(reservation_ww_class_mutex){+.+.}-{3:3}, at: +ttm_eu_reserve_buffers+0x270/0x470 [ttm] +[ +0.000015] #5: ffffffffc045f700 (*(sspp++)){....}-{0:0}, at: +drm_dev_enter+0x5/0xa0 [drm] +[ +0.000038] #6: ffff932c52da7078 (&vm->eviction_lock){+.+.}-{3:3}, +at: amdgpu_vm_bo_update_mapping+0xd5/0x4f0 [amdgpu] +[ +0.000195] + stack backtrace: +[ +0.000003] CPU: 11 PID: 4822 Comm: python Not tainted +5.13.0-kfd-rajneesh #1030 +[ +0.000005] Hardware name: GIGABYTE MZ01-CE0-00/MZ01-CE0-00, BIOS F02 +08/29/2018 +[ +0.000003] Call Trace: +[ +0.000003] dump_stack+0x6d/0x89 +[ +0.000010] __lock_acquire+0xb93/0x1a90 +[ +0.000009] lock_acquire+0x25d/0x2d0 +[ +0.000005] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000184] ? lock_is_held_type+0xa2/0x110 +[ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000184] __ww_mutex_lock.constprop.17+0xca/0x1060 +[ +0.000007] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000183] ? lock_release+0x13f/0x270 +[ +0.000005] ? lock_is_held_type+0xa2/0x110 +[ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000183] amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] +[ +0.000185] ttm_bo_release+0x4c6/0x580 [ttm] +[ +0.000010] amdgpu_bo_unref+0x1a/0x30 [amdgpu] +[ +0.000183] amdgpu_vm_free_table+0x76/0xa0 [amdgpu] +[ +0.000189] amdgpu_vm_free_pts+0xb8/0xf0 [amdgpu] +[ +0.000189] amdgpu_vm_update_ptes+0x411/0x770 [amdgpu] +[ +0.000191] amdgpu_vm_bo_update_mapping+0x324/0x4f0 [amdgpu] +[ +0.000191] amdgpu_vm_bo_update+0x251/0x610 [amdgpu] +[ +0.000191] update_gpuvm_pte+0xcc/0x290 [amdgpu] +[ +0.000229] ? amdgpu_vm_bo_map+0xd7/0x130 [amdgpu] +[ +0.000190] amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x912/0xf60 +[amdgpu] +[ +0.000234] kfd_ioctl_map_memory_to_gpu+0x182/0x320 [amdgpu] +[ +0.000218] kfd_ioctl+0x2b9/0x600 [amdgpu] +[ +0.000216] ? kfd_ioctl_unmap_memory_from_gpu+0x270/0x270 [amdgpu] +[ +0.000216] ? lock_release+0x13f/0x270 +[ +0.000006] ? __fget_files+0x107/0x1e0 +[ +0.000007] __x64_sys_ioctl+0x8b/0xd0 +[ +0.000007] do_syscall_64+0x36/0x70 +[ +0.000004] entry_SYSCALL_64_after_hwframe+0x44/0xae +[ +0.000007] RIP: 0033:0x7fbff90a7317 +[ +0.000004] Code: b3 66 90 48 8b 05 71 4b 2d 00 64 c7 00 26 00 00 00 +48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f +05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 41 4b 2d 00 f7 d8 64 89 01 48 +[ +0.000005] RSP: 002b:00007fbe301fe648 EFLAGS: 00000246 ORIG_RAX: +0000000000000010 +[ +0.000006] RAX: ffffffffffffffda RBX: 00007fbcc402d820 RCX: +00007fbff90a7317 +[ +0.000003] RDX: 00007fbe301fe690 RSI: 00000000c0184b18 RDI: +0000000000000004 +[ +0.000003] RBP: 00007fbe301fe690 R08: 0000000000000000 R09: +00007fbcc402d880 +[ +0.000003] R10: 0000000002001000 R11: 0000000000000246 R12: +00000000c0184b18 +[ +0.000003] R13: 0000000000000004 R14: 00007fbf689593a0 R15: +00007fbcc402d820 + +Cc: Christian König +Cc: Felix Kuehling +Cc: Alex Deucher + +Reviewed-by: Christian König +Reviewed-by: Felix Kuehling +Signed-off-by: Rajneesh Bhardwaj +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +index 01a78c786536..d62b770cc9dc 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +@@ -1343,7 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) + !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) + return; + +- dma_resv_lock(bo->base.resv, NULL); ++ if (WARN_ON_ONCE(!dma_resv_trylock(bo->base.resv))) ++ return; + + r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence); + if (!WARN_ON(r)) { +-- +2.35.1 + diff --git a/queue-5.15/drm-amdkfd-don-t-take-process-mutex-for-svm-ioctls.patch b/queue-5.15/drm-amdkfd-don-t-take-process-mutex-for-svm-ioctls.patch new file mode 100644 index 00000000000..68593a2bfaa --- /dev/null +++ b/queue-5.15/drm-amdkfd-don-t-take-process-mutex-for-svm-ioctls.patch @@ -0,0 +1,55 @@ +From 22a5916f24e4c42bb87fcdb09c1067a95641c1fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Jan 2022 16:40:44 -0500 +Subject: drm/amdkfd: Don't take process mutex for svm ioctls + +From: Philip Yang + +[ Upstream commit ac7c48c0cce00d03b3c95fddcccb0a45257e33e3 ] + +SVM ioctls take proper svms->lock to handle race conditions, don't need +take process mutex to serialize ioctls. This also fixes circular locking +warning: + +WARNING: possible circular locking dependency detected + + Possible unsafe locking scenario: + + CPU0 CPU1 + ---- ---- + lock((work_completion)(&svms->deferred_list_work)); + lock(&process->mutex); + lock((work_completion)(&svms->deferred_list_work)); + lock(&process->mutex); + + *** DEADLOCK *** + +Signed-off-by: Philip Yang +Reviewed-by: Felix Kuehling +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +index 86afd37b098d..6688129df240 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +@@ -1807,13 +1807,9 @@ static int kfd_ioctl_svm(struct file *filep, struct kfd_process *p, void *data) + if (!args->start_addr || !args->size) + return -EINVAL; + +- mutex_lock(&p->mutex); +- + r = svm_ioctl(p, args->op, args->start_addr, args->size, args->nattr, + args->attrs); + +- mutex_unlock(&p->mutex); +- + return r; + } + #else +-- +2.35.1 + diff --git a/queue-5.15/drm-amdkfd-make-crat-table-missing-message-informati.patch b/queue-5.15/drm-amdkfd-make-crat-table-missing-message-informati.patch new file mode 100644 index 00000000000..6ca0113c0cd --- /dev/null +++ b/queue-5.15/drm-amdkfd-make-crat-table-missing-message-informati.patch @@ -0,0 +1,38 @@ +From f48308212bdf6c35c41166ecaa2eec62cc968295 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Feb 2022 15:40:12 -0500 +Subject: drm/amdkfd: make CRAT table missing message informational only + +From: Alex Deucher + +[ Upstream commit 9dff13f9edf755a15f6507874185a3290c1ae8bb ] + +The driver has a fallback so make the message informational +rather than a warning. The driver has a fallback if the +Component Resource Association Table (CRAT) is missing, so +make this informational now. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1906 +Reviewed-by: Felix Kuehling +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +index c33d689f29e8..e574aa32a111 100644 +--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +@@ -1563,7 +1563,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size) + /* Fetch the CRAT table from ACPI */ + status = acpi_get_table(CRAT_SIGNATURE, 0, &crat_table); + if (status == AE_NOT_FOUND) { +- pr_warn("CRAT table not found\n"); ++ pr_info("CRAT table not found\n"); + return -ENODATA; + } else if (ACPI_FAILURE(status)) { + const char *err = acpi_format_exception(status); +-- +2.35.1 + diff --git a/queue-5.15/drm-bridge-add-missing-pm_runtime_put_sync.patch b/queue-5.15/drm-bridge-add-missing-pm_runtime_put_sync.patch new file mode 100644 index 00000000000..f690077eda6 --- /dev/null +++ b/queue-5.15/drm-bridge-add-missing-pm_runtime_put_sync.patch @@ -0,0 +1,77 @@ +From a4bf4384b6d3a3a298fc7ee0eb6c6db3845ff0d7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jan 2022 23:20:35 -0800 +Subject: drm/bridge: Add missing pm_runtime_put_sync + +From: Yongzhi Liu + +[ Upstream commit 46f47807738441e354873546dde0b000106c068a ] + +pm_runtime_get_sync() will increase the rumtime PM counter +even when it returns an error. Thus a pairing decrement is needed +to prevent refcount leak. Fix this by replacing this API with +pm_runtime_resume_and_get(), which will not change the runtime +PM counter on error. Besides, a matching decrement is needed +on the error handling path to keep the counter balanced. + +Signed-off-by: Yongzhi Liu +Reviewed-by: Laurent Pinchart +Signed-off-by: Robert Foss +Link: https://patchwork.freedesktop.org/patch/msgid/1643008835-73961-1-git-send-email-lyz_cs@pku.edu.cn +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bridge/nwl-dsi.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c +index 6e484d836cfe..691039aba87f 100644 +--- a/drivers/gpu/drm/bridge/nwl-dsi.c ++++ b/drivers/gpu/drm/bridge/nwl-dsi.c +@@ -861,18 +861,19 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, + memcpy(&dsi->mode, adjusted_mode, sizeof(dsi->mode)); + drm_mode_debug_printmodeline(adjusted_mode); + +- pm_runtime_get_sync(dev); ++ if (pm_runtime_resume_and_get(dev) < 0) ++ return; + + if (clk_prepare_enable(dsi->lcdif_clk) < 0) +- return; ++ goto runtime_put; + if (clk_prepare_enable(dsi->core_clk) < 0) +- return; ++ goto runtime_put; + + /* Step 1 from DSI reset-out instructions */ + ret = reset_control_deassert(dsi->rst_pclk); + if (ret < 0) { + DRM_DEV_ERROR(dev, "Failed to deassert PCLK: %d\n", ret); +- return; ++ goto runtime_put; + } + + /* Step 2 from DSI reset-out instructions */ +@@ -882,13 +883,18 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, + ret = reset_control_deassert(dsi->rst_esc); + if (ret < 0) { + DRM_DEV_ERROR(dev, "Failed to deassert ESC: %d\n", ret); +- return; ++ goto runtime_put; + } + ret = reset_control_deassert(dsi->rst_byte); + if (ret < 0) { + DRM_DEV_ERROR(dev, "Failed to deassert BYTE: %d\n", ret); +- return; ++ goto runtime_put; + } ++ ++ return; ++ ++runtime_put: ++ pm_runtime_put_sync(dev); + } + + static void +-- +2.35.1 + diff --git a/queue-5.15/drm-msm-dsi-remove-spurious-irqf_oneshot-flag.patch b/queue-5.15/drm-msm-dsi-remove-spurious-irqf_oneshot-flag.patch new file mode 100644 index 00000000000..d5fc531dd82 --- /dev/null +++ b/queue-5.15/drm-msm-dsi-remove-spurious-irqf_oneshot-flag.patch @@ -0,0 +1,49 @@ +From f5ef37a4cb3907c420973f55d5f356fc79a3701c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Feb 2022 17:47:32 +0000 +Subject: drm/msm/dsi: Remove spurious IRQF_ONESHOT flag + +From: Daniel Thompson + +[ Upstream commit 24b176d8827d167ac3b379317f60c0985f6e95aa ] + +Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts +which need to keep the irq line disabled until the threaded handler has +been run.". When applied to an interrupt that doesn't request a threaded +irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, +which it to disable the forced threading of irqs (and for "normal" kernels +it is a nop). In this case I can find no evidence that suppressing forced +threading is intentional. Had it been intentional then a driver must adopt +the raw_spinlock API in order to avoid deadlocks on PREEMPT_RT kernels +(and avoid calling any kernel API that uses regular spinlocks). + +Fix this by removing the spurious additional flag. + +This change is required for my Snapdragon 7cx Gen2 tablet to boot-to-GUI +with PREEMPT_RT enabled. + +Signed-off-by: Daniel Thompson +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20220201174734.196718-2-daniel.thompson@linaro.org +Signed-off-by: Dmitry Baryshkov +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c +index dc85974c7897..eea679a52e86 100644 +--- a/drivers/gpu/drm/msm/dsi/dsi_host.c ++++ b/drivers/gpu/drm/msm/dsi/dsi_host.c +@@ -1909,7 +1909,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) + + /* do not autoenable, will be enabled later */ + ret = devm_request_irq(&pdev->dev, msm_host->irq, dsi_host_irq, +- IRQF_TRIGGER_HIGH | IRQF_ONESHOT | IRQF_NO_AUTOEN, ++ IRQF_TRIGGER_HIGH | IRQF_NO_AUTOEN, + "dsi_isr", msm_host); + if (ret < 0) { + dev_err(&pdev->dev, "failed to request IRQ%u: %d\n", +-- +2.35.1 + diff --git a/queue-5.15/drm-v3d-fix-missing-unlock.patch b/queue-5.15/drm-v3d-fix-missing-unlock.patch new file mode 100644 index 00000000000..b91cf683ff1 --- /dev/null +++ b/queue-5.15/drm-v3d-fix-missing-unlock.patch @@ -0,0 +1,68 @@ +From 9d0a8fb49c55c8aa3010a6368411683375ec1920 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 28 Jan 2022 05:41:02 -0800 +Subject: drm/v3d: fix missing unlock + +From: Yongzhi Liu + +[ Upstream commit e57c1a3bd5e8e0c7181f65ae55581f0236a8f284 ] + +[why] +Unlock is needed on the error handling path to prevent dead lock. +v3d_submit_cl_ioctl and v3d_submit_csd_ioctl is missing unlock. + +[how] +Fix this by changing goto target on the error handling path. So +changing the goto to target an error handling path +that includes drm_gem_unlock reservations. + +Signed-off-by: Yongzhi Liu +Reviewed-by: Melissa Wen +Signed-off-by: Melissa Wen +Link: https://patchwork.freedesktop.org/patch/msgid/1643377262-109975-1-git-send-email-lyz_cs@pku.edu.cn +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/v3d/v3d_gem.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c +index 772b5831bcc6..805d6f6cba0e 100644 +--- a/drivers/gpu/drm/v3d/v3d_gem.c ++++ b/drivers/gpu/drm/v3d/v3d_gem.c +@@ -625,7 +625,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, + + if (!render->base.perfmon) { + ret = -ENOENT; +- goto fail; ++ goto fail_perfmon; + } + } + +@@ -678,6 +678,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, + + fail_unreserve: + mutex_unlock(&v3d->sched_lock); ++fail_perfmon: + drm_gem_unlock_reservations(last_job->bo, + last_job->bo_count, &acquire_ctx); + fail: +@@ -854,7 +855,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, + args->perfmon_id); + if (!job->base.perfmon) { + ret = -ENOENT; +- goto fail; ++ goto fail_perfmon; + } + } + +@@ -886,6 +887,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, + + fail_unreserve: + mutex_unlock(&v3d->sched_lock); ++fail_perfmon: + drm_gem_unlock_reservations(clean_job->bo, clean_job->bo_count, + &acquire_ctx); + fail: +-- +2.35.1 + diff --git a/queue-5.15/habanalabs-fix-possible-memory-leak-in-mmu-dr-fini.patch b/queue-5.15/habanalabs-fix-possible-memory-leak-in-mmu-dr-fini.patch new file mode 100644 index 00000000000..41b60f97125 --- /dev/null +++ b/queue-5.15/habanalabs-fix-possible-memory-leak-in-mmu-dr-fini.patch @@ -0,0 +1,38 @@ +From 80192389b1a688af76dfb995de576c642d9ccd28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Jan 2022 09:48:27 +0200 +Subject: habanalabs: fix possible memory leak in MMU DR fini + +From: Ohad Sharabi + +[ Upstream commit eb85eec858c1a5c11d3a0bff403f6440b05b40dc ] + +This patch fixes what seems to be copy paste error. + +We will have a memory leak if the host-resident shadow is NULL (which +will likely happen as the DR and HR are not dependent). + +Signed-off-by: Ohad Sharabi +Reviewed-by: Oded Gabbay +Signed-off-by: Oded Gabbay +Signed-off-by: Sasha Levin +--- + drivers/misc/habanalabs/common/mmu/mmu_v1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/misc/habanalabs/common/mmu/mmu_v1.c b/drivers/misc/habanalabs/common/mmu/mmu_v1.c +index 0f536f79dd9c..e68e9f71c546 100644 +--- a/drivers/misc/habanalabs/common/mmu/mmu_v1.c ++++ b/drivers/misc/habanalabs/common/mmu/mmu_v1.c +@@ -467,7 +467,7 @@ static void hl_mmu_v1_fini(struct hl_device *hdev) + { + /* MMU H/W fini was already done in device hw_fini() */ + +- if (!ZERO_OR_NULL_PTR(hdev->mmu_priv.hr.mmu_shadow_hop0)) { ++ if (!ZERO_OR_NULL_PTR(hdev->mmu_priv.dr.mmu_shadow_hop0)) { + kvfree(hdev->mmu_priv.dr.mmu_shadow_hop0); + gen_pool_destroy(hdev->mmu_priv.dr.mmu_pgt_pool); + +-- +2.35.1 + diff --git a/queue-5.15/init-main.c-return-1-from-handled-__setup-functions.patch b/queue-5.15/init-main.c-return-1-from-handled-__setup-functions.patch new file mode 100644 index 00000000000..a5dc5007e53 --- /dev/null +++ b/queue-5.15/init-main.c-return-1-from-handled-__setup-functions.patch @@ -0,0 +1,57 @@ +From 7abb9c34bbabf6443a85c4fe38764a334ea8668c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Mar 2022 16:06:14 -0700 +Subject: init/main.c: return 1 from handled __setup() functions + +From: Randy Dunlap + +[ Upstream commit f9a40b0890658330c83c95511f9d6b396610defc ] + +initcall_blacklist() should return 1 to indicate that it handled its +cmdline arguments. + +set_debug_rodata() should return 1 to indicate that it handled its +cmdline arguments. Print a warning if the option string is invalid. + +This prevents these strings from being added to the 'init' program's +environment as they are not init arguments/parameters. + +Link: https://lkml.kernel.org/r/20220221050901.23985-1-rdunlap@infradead.org +Signed-off-by: Randy Dunlap +Reported-by: Igor Zhbanov +Cc: Ingo Molnar +Cc: Greg Kroah-Hartman +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + init/main.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/init/main.c b/init/main.c +index b340d990d77c..06b98350ebd2 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -1198,7 +1198,7 @@ static int __init initcall_blacklist(char *str) + } + } while (str_entry); + +- return 0; ++ return 1; + } + + static bool __init_or_module initcall_blacklisted(initcall_t fn) +@@ -1460,7 +1460,9 @@ static noinline void __init kernel_init_freeable(void); + bool rodata_enabled __ro_after_init = true; + static int __init set_debug_rodata(char *str) + { +- return strtobool(str, &rodata_enabled); ++ if (strtobool(str, &rodata_enabled)) ++ pr_warn("Invalid option string for rodata: '%s'\n", str); ++ return 1; + } + __setup("rodata=", set_debug_rodata); + #endif +-- +2.35.1 + diff --git a/queue-5.15/iommu-arm-smmu-v3-fix-event-handling-soft-lockup.patch b/queue-5.15/iommu-arm-smmu-v3-fix-event-handling-soft-lockup.patch new file mode 100644 index 00000000000..e053d85a475 --- /dev/null +++ b/queue-5.15/iommu-arm-smmu-v3-fix-event-handling-soft-lockup.patch @@ -0,0 +1,55 @@ +From 4454968334831b5869794f7b57ca0c3036b76935 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 19 Jan 2022 07:07:54 +0000 +Subject: iommu/arm-smmu-v3: fix event handling soft lockup + +From: Zhou Guanghui + +[ Upstream commit 30de2b541af98179780054836b48825fcfba4408 ] + +During event processing, events are read from the event queue one +by one until the queue is empty.If the master device continuously +requests address access at the same time and the SMMU generates +events, the cyclic processing of the event takes a long time and +softlockup warnings may be reported. + +arm-smmu-v3 arm-smmu-v3.34.auto: event 0x0a received: +arm-smmu-v3 arm-smmu-v3.34.auto: 0x00007f220000280a +arm-smmu-v3 arm-smmu-v3.34.auto: 0x000010000000007e +arm-smmu-v3 arm-smmu-v3.34.auto: 0x00000000034e8670 +watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [irq/268-arm-smm:247] +Call trace: + _dev_info+0x7c/0xa0 + arm_smmu_evtq_thread+0x1c0/0x230 + irq_thread_fn+0x30/0x80 + irq_thread+0x128/0x210 + kthread+0x134/0x138 + ret_from_fork+0x10/0x1c +Kernel panic - not syncing: softlockup: hung tasks + +Fix this by calling cond_resched() after the event information is +printed. + +Signed-off-by: Zhou Guanghui +Link: https://lore.kernel.org/r/20220119070754.26528-1-zhouguanghui1@huawei.com +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +index a388e318f86e..430315135cff 100644 +--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c ++++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +@@ -1552,6 +1552,7 @@ static irqreturn_t arm_smmu_evtq_thread(int irq, void *dev) + dev_info(smmu->dev, "\t0x%016llx\n", + (unsigned long long)evt[i]); + ++ cond_resched(); + } + + /* +-- +2.35.1 + diff --git a/queue-5.15/ipv4-invalidate-neighbour-for-broadcast-address-upon.patch b/queue-5.15/ipv4-invalidate-neighbour-for-broadcast-address-upon.patch new file mode 100644 index 00000000000..825c919c487 --- /dev/null +++ b/queue-5.15/ipv4-invalidate-neighbour-for-broadcast-address-upon.patch @@ -0,0 +1,118 @@ +From a009c0b329c770190bcc6de5fc9abef62b83e133 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 19 Feb 2022 17:45:19 +0200 +Subject: ipv4: Invalidate neighbour for broadcast address upon address + addition + +From: Ido Schimmel + +[ Upstream commit 0c51e12e218f20b7d976158fdc18019627326f7a ] + +In case user space sends a packet destined to a broadcast address when a +matching broadcast route is not configured, the kernel will create a +unicast neighbour entry that will never be resolved [1]. + +When the broadcast route is configured, the unicast neighbour entry will +not be invalidated and continue to linger, resulting in packets being +dropped. + +Solve this by invalidating unresolved neighbour entries for broadcast +addresses after routes for these addresses are internally configured by +the kernel. This allows the kernel to create a broadcast neighbour entry +following the next route lookup. + +Another possible solution that is more generic but also more complex is +to have the ARP code register a listener to the FIB notification chain +and invalidate matching neighbour entries upon the addition of broadcast +routes. + +It is also possible to wave off the issue as a user space problem, but +it seems a bit excessive to expect user space to be that intimately +familiar with the inner workings of the FIB/neighbour kernel code. + +[1] https://lore.kernel.org/netdev/55a04a8f-56f3-f73c-2aea-2195923f09d1@huawei.com/ + +Reported-by: Wang Hai +Signed-off-by: Ido Schimmel +Tested-by: Wang Hai +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/arp.h | 1 + + net/ipv4/arp.c | 9 +++++++-- + net/ipv4/fib_frontend.c | 5 ++++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/include/net/arp.h b/include/net/arp.h +index 4950191f6b2b..4a23a97195f3 100644 +--- a/include/net/arp.h ++++ b/include/net/arp.h +@@ -71,6 +71,7 @@ void arp_send(int type, int ptype, __be32 dest_ip, + const unsigned char *src_hw, const unsigned char *th); + int arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir); + void arp_ifdown(struct net_device *dev); ++int arp_invalidate(struct net_device *dev, __be32 ip, bool force); + + struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, + struct net_device *dev, __be32 src_ip, +diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c +index 922dd73e5740..83a47998c4b1 100644 +--- a/net/ipv4/arp.c ++++ b/net/ipv4/arp.c +@@ -1116,13 +1116,18 @@ static int arp_req_get(struct arpreq *r, struct net_device *dev) + return err; + } + +-static int arp_invalidate(struct net_device *dev, __be32 ip) ++int arp_invalidate(struct net_device *dev, __be32 ip, bool force) + { + struct neighbour *neigh = neigh_lookup(&arp_tbl, &ip, dev); + int err = -ENXIO; + struct neigh_table *tbl = &arp_tbl; + + if (neigh) { ++ if ((neigh->nud_state & NUD_VALID) && !force) { ++ neigh_release(neigh); ++ return 0; ++ } ++ + if (neigh->nud_state & ~NUD_NOARP) + err = neigh_update(neigh, NULL, NUD_FAILED, + NEIGH_UPDATE_F_OVERRIDE| +@@ -1169,7 +1174,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r, + if (!dev) + return -EINVAL; + } +- return arp_invalidate(dev, ip); ++ return arp_invalidate(dev, ip, true); + } + + /* +diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c +index 4d61ddd8a0ec..1eb7795edb9d 100644 +--- a/net/ipv4/fib_frontend.c ++++ b/net/ipv4/fib_frontend.c +@@ -1112,9 +1112,11 @@ void fib_add_ifaddr(struct in_ifaddr *ifa) + return; + + /* Add broadcast address, if it is explicitly assigned. */ +- if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF)) ++ if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF)) { + fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, + prim, 0); ++ arp_invalidate(dev, ifa->ifa_broadcast, false); ++ } + + if (!ipv4_is_zeronet(prefix) && !(ifa->ifa_flags & IFA_F_SECONDARY) && + (prefix != addr || ifa->ifa_prefixlen < 32)) { +@@ -1128,6 +1130,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa) + if (ifa->ifa_prefixlen < 31) { + fib_magic(RTM_NEWROUTE, RTN_BROADCAST, prefix | ~mask, + 32, prim, 0); ++ arp_invalidate(dev, prefix | ~mask, false); + } + } + } +-- +2.35.1 + diff --git a/queue-5.15/ipv6-make-mc_forwarding-atomic.patch b/queue-5.15/ipv6-make-mc_forwarding-atomic.patch new file mode 100644 index 00000000000..d0607c5884f --- /dev/null +++ b/queue-5.15/ipv6-make-mc_forwarding-atomic.patch @@ -0,0 +1,127 @@ +From d5c3f134cd172e508ae95b9757c7e7bbfbf74227 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 12:15:45 -0800 +Subject: ipv6: make mc_forwarding atomic + +From: Eric Dumazet + +[ Upstream commit 145c7a793838add5e004e7d49a67654dc7eba147 ] + +This fixes minor data-races in ip6_mc_input() and +batadv_mcast_mla_rtr_flags_softif_get_ipv6() + +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/linux/ipv6.h | 2 +- + net/batman-adv/multicast.c | 2 +- + net/ipv6/addrconf.c | 4 ++-- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6mr.c | 8 ++++---- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h +index 07cba0b3496d..d1f386430795 100644 +--- a/include/linux/ipv6.h ++++ b/include/linux/ipv6.h +@@ -51,7 +51,7 @@ struct ipv6_devconf { + __s32 use_optimistic; + #endif + #ifdef CONFIG_IPV6_MROUTE +- __s32 mc_forwarding; ++ atomic_t mc_forwarding; + #endif + __s32 disable_ipv6; + __s32 drop_unicast_in_l2_multicast; +diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c +index 6e3419beca09..2853634a3979 100644 +--- a/net/batman-adv/multicast.c ++++ b/net/batman-adv/multicast.c +@@ -134,7 +134,7 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get_ipv6(struct net_device *dev) + { + struct inet6_dev *in6_dev = __in6_dev_get(dev); + +- if (in6_dev && in6_dev->cnf.mc_forwarding) ++ if (in6_dev && atomic_read(&in6_dev->cnf.mc_forwarding)) + return BATADV_NO_FLAGS; + else + return BATADV_MCAST_WANT_NO_RTR6; +diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c +index 1fe27807e471..3a8838b79bb6 100644 +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -552,7 +552,7 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex, + #ifdef CONFIG_IPV6_MROUTE + if ((all || type == NETCONFA_MC_FORWARDING) && + nla_put_s32(skb, NETCONFA_MC_FORWARDING, +- devconf->mc_forwarding) < 0) ++ atomic_read(&devconf->mc_forwarding)) < 0) + goto nla_put_failure; + #endif + if ((all || type == NETCONFA_PROXY_NEIGH) && +@@ -5537,7 +5537,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, + array[DEVCONF_USE_OPTIMISTIC] = cnf->use_optimistic; + #endif + #ifdef CONFIG_IPV6_MROUTE +- array[DEVCONF_MC_FORWARDING] = cnf->mc_forwarding; ++ array[DEVCONF_MC_FORWARDING] = atomic_read(&cnf->mc_forwarding); + #endif + array[DEVCONF_DISABLE_IPV6] = cnf->disable_ipv6; + array[DEVCONF_ACCEPT_DAD] = cnf->accept_dad; +diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c +index 80256717868e..d4b1e2c5aa76 100644 +--- a/net/ipv6/ip6_input.c ++++ b/net/ipv6/ip6_input.c +@@ -508,7 +508,7 @@ int ip6_mc_input(struct sk_buff *skb) + /* + * IPv6 multicast router mode is now supported ;) + */ +- if (dev_net(skb->dev)->ipv6.devconf_all->mc_forwarding && ++ if (atomic_read(&dev_net(skb->dev)->ipv6.devconf_all->mc_forwarding) && + !(ipv6_addr_type(&hdr->daddr) & + (IPV6_ADDR_LOOPBACK|IPV6_ADDR_LINKLOCAL)) && + likely(!(IP6CB(skb)->flags & IP6SKB_FORWARDED))) { +diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c +index 6a4065d81aa9..91f1c5f56d5f 100644 +--- a/net/ipv6/ip6mr.c ++++ b/net/ipv6/ip6mr.c +@@ -739,7 +739,7 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify, + + in6_dev = __in6_dev_get(dev); + if (in6_dev) { +- in6_dev->cnf.mc_forwarding--; ++ atomic_dec(&in6_dev->cnf.mc_forwarding); + inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF, + NETCONFA_MC_FORWARDING, + dev->ifindex, &in6_dev->cnf); +@@ -907,7 +907,7 @@ static int mif6_add(struct net *net, struct mr_table *mrt, + + in6_dev = __in6_dev_get(dev); + if (in6_dev) { +- in6_dev->cnf.mc_forwarding++; ++ atomic_inc(&in6_dev->cnf.mc_forwarding); + inet6_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF, + NETCONFA_MC_FORWARDING, + dev->ifindex, &in6_dev->cnf); +@@ -1557,7 +1557,7 @@ static int ip6mr_sk_init(struct mr_table *mrt, struct sock *sk) + } else { + rcu_assign_pointer(mrt->mroute_sk, sk); + sock_set_flag(sk, SOCK_RCU_FREE); +- net->ipv6.devconf_all->mc_forwarding++; ++ atomic_inc(&net->ipv6.devconf_all->mc_forwarding); + } + write_unlock_bh(&mrt_lock); + +@@ -1590,7 +1590,7 @@ int ip6mr_sk_done(struct sock *sk) + * so the RCU grace period before sk freeing + * is guaranteed by sk_destruct() + */ +- net->ipv6.devconf_all->mc_forwarding--; ++ atomic_dec(&net->ipv6.devconf_all->mc_forwarding); + write_unlock_bh(&mrt_lock); + inet6_netconf_notify_devconf(net, RTM_NEWNETCONF, + NETCONFA_MC_FORWARDING, +-- +2.35.1 + diff --git a/queue-5.15/iwlwifi-mvm-correctly-set-fragmented-ebs.patch b/queue-5.15/iwlwifi-mvm-correctly-set-fragmented-ebs.patch new file mode 100644 index 00000000000..a189a00ccd6 --- /dev/null +++ b/queue-5.15/iwlwifi-mvm-correctly-set-fragmented-ebs.patch @@ -0,0 +1,42 @@ +From 63dadcba2e32ab8475991ac472ae5c2deb398aae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 12:25:00 +0200 +Subject: iwlwifi: mvm: Correctly set fragmented EBS + +From: Ilan Peer + +[ Upstream commit d8d4dd26b9e0469baf5017f0544d852fd4e3fb6d ] + +Currently, fragmented EBS was set for a channel only if the 'hb_type' +was set to fragmented or balanced scan. However, 'hb_type' is set only +in case of CDB, and thus fragmented EBS is never set for a channel for +non-CDB devices. Fix it. + +Signed-off-by: Ilan Peer +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/iwlwifi.20220204122220.a6165ac9b9d5.I654eafa62fd647030ae6d4f07f32c96c3171decb@changeid +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +index 5461bf399959..65e382756de6 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +@@ -1890,7 +1890,10 @@ static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm, + IWL_SCAN_CHANNEL_FLAG_CACHE_ADD; + + /* set fragmented ebs for fragmented scan on HB channels */ +- if (iwl_mvm_is_scan_fragmented(params->hb_type)) ++ if ((!iwl_mvm_is_cdb_supported(mvm) && ++ iwl_mvm_is_scan_fragmented(params->type)) || ++ (iwl_mvm_is_cdb_supported(mvm) && ++ iwl_mvm_is_scan_fragmented(params->hb_type))) + flags |= IWL_SCAN_CHANNEL_FLAG_EBS_FRAG; + + return flags; +-- +2.35.1 + diff --git a/queue-5.15/iwlwifi-mvm-move-only-to-an-enabled-channel.patch b/queue-5.15/iwlwifi-mvm-move-only-to-an-enabled-channel.patch new file mode 100644 index 00000000000..0ad7a27e5b2 --- /dev/null +++ b/queue-5.15/iwlwifi-mvm-move-only-to-an-enabled-channel.patch @@ -0,0 +1,80 @@ +From 05d5dafd4e6f97e0e829bb3a6f652bb1a1ee0ab2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Feb 2022 18:22:33 +0200 +Subject: iwlwifi: mvm: move only to an enabled channel + +From: Miri Korenblit + +[ Upstream commit e04135c07755d001b5cde61048c69a7cc84bb94b ] + +During disassociation we're decreasing the phy's ref count. +If the ref count becomes 0, we're configuring the phy ctxt +to the default channel (the lowest channel which the device +can operate on). Currently we're not checking whether the +the default channel is enabled or not. Fix it by configuring +the phy ctxt to the lowest channel which is enabled. + +Signed-off-by: Miri Korenblit +Signed-off-by: Luca Coelho +Link: https://lore.kernel.org/r/iwlwifi.20220210181930.03f281b6a6bc.I5b63d43ec41996d599e6f37ec3f32e878b3e405e@changeid +Signed-off-by: Luca Coelho +Signed-off-by: Sasha Levin +--- + .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 31 +++++++++++++------ + 1 file changed, 22 insertions(+), 9 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +index 035336a9e755..6d82725cb87d 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + /* +- * Copyright (C) 2012-2014, 2018-2021 Intel Corporation ++ * Copyright (C) 2012-2014, 2018-2022 Intel Corporation + * Copyright (C) 2013-2014 Intel Mobile Communications GmbH + * Copyright (C) 2017 Intel Deutschland GmbH + */ +@@ -295,18 +295,31 @@ void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt) + * otherwise we might not be able to reuse this phy. + */ + if (ctxt->ref == 0) { +- struct ieee80211_channel *chan; ++ struct ieee80211_channel *chan = NULL; + struct cfg80211_chan_def chandef; +- struct ieee80211_supported_band *sband = NULL; +- enum nl80211_band band = NL80211_BAND_2GHZ; ++ struct ieee80211_supported_band *sband; ++ enum nl80211_band band; ++ int channel; + +- while (!sband && band < NUM_NL80211_BANDS) +- sband = mvm->hw->wiphy->bands[band++]; ++ for (band = NL80211_BAND_2GHZ; band < NUM_NL80211_BANDS; band++) { ++ sband = mvm->hw->wiphy->bands[band]; + +- if (WARN_ON(!sband)) +- return; ++ if (!sband) ++ continue; ++ ++ for (channel = 0; channel < sband->n_channels; channel++) ++ if (!(sband->channels[channel].flags & ++ IEEE80211_CHAN_DISABLED)) { ++ chan = &sband->channels[channel]; ++ break; ++ } + +- chan = &sband->channels[0]; ++ if (chan) ++ break; ++ } ++ ++ if (WARN_ON(!chan)) ++ return; + + cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_NO_HT); + iwl_mvm_phy_ctxt_changed(mvm, ctxt, &chandef, 1, 1); +-- +2.35.1 + diff --git a/queue-5.15/jfs-prevent-null-deref-in-difree.patch b/queue-5.15/jfs-prevent-null-deref-in-difree.patch new file mode 100644 index 00000000000..70f7ffddc34 --- /dev/null +++ b/queue-5.15/jfs-prevent-null-deref-in-difree.patch @@ -0,0 +1,48 @@ +From 0c4565838eb44de5ea00b30551fcbce1ebba26d5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Mar 2022 21:59:17 +0800 +Subject: jfs: prevent NULL deref in diFree + +From: Haimin Zhang + +[ Upstream commit a53046291020ec41e09181396c1e829287b48d47 ] + +Add validation check for JFS_IP(ipimap)->i_imap to prevent a NULL deref +in diFree since diFree uses it without do any validations. +When function jfs_mount calls diMount to initialize fileset inode +allocation map, it can fail and JFS_IP(ipimap)->i_imap won't be +initialized. Then it calls diFreeSpecial to close fileset inode allocation +map inode and it will flow into jfs_evict_inode. Function jfs_evict_inode +just validates JFS_SBI(inode->i_sb)->ipimap, then calls diFree. diFree use +JFS_IP(ipimap)->i_imap directly, then it will cause a NULL deref. + +Reported-by: TCS Robot +Signed-off-by: Haimin Zhang +Signed-off-by: Dave Kleikamp +Signed-off-by: Sasha Levin +--- + fs/jfs/inode.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c +index 57ab424c05ff..072821b50ab9 100644 +--- a/fs/jfs/inode.c ++++ b/fs/jfs/inode.c +@@ -146,12 +146,13 @@ void jfs_evict_inode(struct inode *inode) + dquot_initialize(inode); + + if (JFS_IP(inode)->fileset == FILESYSTEM_I) { ++ struct inode *ipimap = JFS_SBI(inode->i_sb)->ipimap; + truncate_inode_pages_final(&inode->i_data); + + if (test_cflag(COMMIT_Freewmap, inode)) + jfs_free_zero_link(inode); + +- if (JFS_SBI(inode->i_sb)->ipimap) ++ if (ipimap && JFS_IP(ipimap)->i_imap) + diFree(inode); + + /* +-- +2.35.1 + diff --git a/queue-5.15/kfence-count-unexpectedly-skipped-allocations.patch b/queue-5.15/kfence-count-unexpectedly-skipped-allocations.patch new file mode 100644 index 00000000000..7c27c173b11 --- /dev/null +++ b/queue-5.15/kfence-count-unexpectedly-skipped-allocations.patch @@ -0,0 +1,90 @@ +From ee9b56369b5c2690480061c47dc697b0ee7fe632 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 13:45:28 -0700 +Subject: kfence: count unexpectedly skipped allocations + +From: Marco Elver + +[ Upstream commit 9a19aeb5665068c3e2727230588684aae2cab7ef ] + +Maintain a counter to count allocations that are skipped due to being +incompatible (oversized, incompatible gfp flags) or no capacity. + +This is to compute the fraction of allocations that could not be +serviced by KFENCE, which we expect to be rare. + +Link: https://lkml.kernel.org/r/20210923104803.2620285-2-elver@google.com +Signed-off-by: Marco Elver +Reviewed-by: Dmitry Vyukov +Acked-by: Alexander Potapenko +Cc: Aleksandr Nogikh +Cc: Jann Horn +Cc: Taras Madan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + mm/kfence/core.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/mm/kfence/core.c b/mm/kfence/core.c +index 84555b8233ef..f26f55850ad7 100644 +--- a/mm/kfence/core.c ++++ b/mm/kfence/core.c +@@ -113,6 +113,8 @@ enum kfence_counter_id { + KFENCE_COUNTER_FREES, + KFENCE_COUNTER_ZOMBIES, + KFENCE_COUNTER_BUGS, ++ KFENCE_COUNTER_SKIP_INCOMPAT, ++ KFENCE_COUNTER_SKIP_CAPACITY, + KFENCE_COUNTER_COUNT, + }; + static atomic_long_t counters[KFENCE_COUNTER_COUNT]; +@@ -122,6 +124,8 @@ static const char *const counter_names[] = { + [KFENCE_COUNTER_FREES] = "total frees", + [KFENCE_COUNTER_ZOMBIES] = "zombie allocations", + [KFENCE_COUNTER_BUGS] = "total bugs", ++ [KFENCE_COUNTER_SKIP_INCOMPAT] = "skipped allocations (incompatible)", ++ [KFENCE_COUNTER_SKIP_CAPACITY] = "skipped allocations (capacity)", + }; + static_assert(ARRAY_SIZE(counter_names) == KFENCE_COUNTER_COUNT); + +@@ -272,8 +276,10 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g + list_del_init(&meta->list); + } + raw_spin_unlock_irqrestore(&kfence_freelist_lock, flags); +- if (!meta) ++ if (!meta) { ++ atomic_long_inc(&counters[KFENCE_COUNTER_SKIP_CAPACITY]); + return NULL; ++ } + + if (unlikely(!raw_spin_trylock_irqsave(&meta->lock, flags))) { + /* +@@ -744,8 +750,10 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + * Perform size check before switching kfence_allocation_gate, so that + * we don't disable KFENCE without making an allocation. + */ +- if (size > PAGE_SIZE) ++ if (size > PAGE_SIZE) { ++ atomic_long_inc(&counters[KFENCE_COUNTER_SKIP_INCOMPAT]); + return NULL; ++ } + + /* + * Skip allocations from non-default zones, including DMA. We cannot +@@ -753,8 +761,10 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + * properties (e.g. reside in DMAable memory). + */ + if ((flags & GFP_ZONEMASK) || +- (s->flags & (SLAB_CACHE_DMA | SLAB_CACHE_DMA32))) ++ (s->flags & (SLAB_CACHE_DMA | SLAB_CACHE_DMA32))) { ++ atomic_long_inc(&counters[KFENCE_COUNTER_SKIP_INCOMPAT]); + return NULL; ++ } + + if (atomic_inc_return(&kfence_allocation_gate) > 1) + return NULL; +-- +2.35.1 + diff --git a/queue-5.15/kfence-limit-currently-covered-allocations-when-pool.patch b/queue-5.15/kfence-limit-currently-covered-allocations-when-pool.patch new file mode 100644 index 00000000000..e37cb89142d --- /dev/null +++ b/queue-5.15/kfence-limit-currently-covered-allocations-when-pool.patch @@ -0,0 +1,290 @@ +From c9fabcbd58153d135a2efe48c6eb3d132abbc622 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 13:45:34 -0700 +Subject: kfence: limit currently covered allocations when pool nearly full + +From: Marco Elver + +[ Upstream commit 08f6b10630f284755087f58aa393402e15b92977 ] + +One of KFENCE's main design principles is that with increasing uptime, +allocation coverage increases sufficiently to detect previously +undetected bugs. + +We have observed that frequent long-lived allocations of the same source +(e.g. pagecache) tend to permanently fill up the KFENCE pool with +increasing system uptime, thus breaking the above requirement. The +workaround thus far had been increasing the sample interval and/or +increasing the KFENCE pool size, but is no reliable solution. + +To ensure diverse coverage of allocations, limit currently covered +allocations of the same source once pool utilization reaches 75% +(configurable via `kfence.skip_covered_thresh`) or above. The effect is +retaining reasonable allocation coverage when the pool is close to full. + +A side-effect is that this also limits frequent long-lived allocations +of the same source filling up the pool permanently. + +Uniqueness of an allocation for coverage purposes is based on its +(partial) allocation stack trace (the source). A Counting Bloom filter +is used to check if an allocation is covered; if the allocation is +currently covered, the allocation is skipped by KFENCE. + +Testing was done using: + + (a) a synthetic workload that performs frequent long-lived + allocations (default config values; sample_interval=1; + num_objects=63), and + + (b) normal desktop workloads on an otherwise idle machine where + the problem was first reported after a few days of uptime + (default config values). + +In both test cases the sampled allocation rate no longer drops to zero +at any point. In the case of (b) we observe (after 2 days uptime) 15% +unique allocations in the pool, 77% pool utilization, with 20% "skipped +allocations (covered)". + +[elver@google.com: simplify and just use hash_32(), use more random stack_hash_seed] + Link: https://lkml.kernel.org/r/YU3MRGaCaJiYht5g@elver.google.com +[elver@google.com: fix 32 bit] + +Link: https://lkml.kernel.org/r/20210923104803.2620285-4-elver@google.com +Signed-off-by: Marco Elver +Reviewed-by: Dmitry Vyukov +Acked-by: Alexander Potapenko +Cc: Aleksandr Nogikh +Cc: Jann Horn +Cc: Taras Madan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + mm/kfence/core.c | 109 ++++++++++++++++++++++++++++++++++++++++++++- + mm/kfence/kfence.h | 2 + + 2 files changed, 109 insertions(+), 2 deletions(-) + +diff --git a/mm/kfence/core.c b/mm/kfence/core.c +index 4eec0c5d32b5..51ea9193cecb 100644 +--- a/mm/kfence/core.c ++++ b/mm/kfence/core.c +@@ -10,12 +10,15 @@ + #include + #include + #include ++#include + #include ++#include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +@@ -82,6 +85,10 @@ static const struct kernel_param_ops sample_interval_param_ops = { + }; + module_param_cb(sample_interval, &sample_interval_param_ops, &kfence_sample_interval, 0600); + ++/* Pool usage% threshold when currently covered allocations are skipped. */ ++static unsigned long kfence_skip_covered_thresh __read_mostly = 75; ++module_param_named(skip_covered_thresh, kfence_skip_covered_thresh, ulong, 0644); ++ + /* The pool of pages used for guard pages and objects. */ + char *__kfence_pool __ro_after_init; + EXPORT_SYMBOL(__kfence_pool); /* Export for test modules. */ +@@ -106,6 +113,32 @@ DEFINE_STATIC_KEY_FALSE(kfence_allocation_key); + /* Gates the allocation, ensuring only one succeeds in a given period. */ + atomic_t kfence_allocation_gate = ATOMIC_INIT(1); + ++/* ++ * A Counting Bloom filter of allocation coverage: limits currently covered ++ * allocations of the same source filling up the pool. ++ * ++ * Assuming a range of 15%-85% unique allocations in the pool at any point in ++ * time, the below parameters provide a probablity of 0.02-0.33 for false ++ * positive hits respectively: ++ * ++ * P(alloc_traces) = (1 - e^(-HNUM * (alloc_traces / SIZE)) ^ HNUM ++ */ ++#define ALLOC_COVERED_HNUM 2 ++#define ALLOC_COVERED_ORDER (const_ilog2(CONFIG_KFENCE_NUM_OBJECTS) + 2) ++#define ALLOC_COVERED_SIZE (1 << ALLOC_COVERED_ORDER) ++#define ALLOC_COVERED_HNEXT(h) hash_32(h, ALLOC_COVERED_ORDER) ++#define ALLOC_COVERED_MASK (ALLOC_COVERED_SIZE - 1) ++static atomic_t alloc_covered[ALLOC_COVERED_SIZE]; ++ ++/* Stack depth used to determine uniqueness of an allocation. */ ++#define UNIQUE_ALLOC_STACK_DEPTH ((size_t)8) ++ ++/* ++ * Randomness for stack hashes, making the same collisions across reboots and ++ * different machines less likely. ++ */ ++static u32 stack_hash_seed __ro_after_init; ++ + /* Statistics counters for debugfs. */ + enum kfence_counter_id { + KFENCE_COUNTER_ALLOCATED, +@@ -115,6 +148,7 @@ enum kfence_counter_id { + KFENCE_COUNTER_BUGS, + KFENCE_COUNTER_SKIP_INCOMPAT, + KFENCE_COUNTER_SKIP_CAPACITY, ++ KFENCE_COUNTER_SKIP_COVERED, + KFENCE_COUNTER_COUNT, + }; + static atomic_long_t counters[KFENCE_COUNTER_COUNT]; +@@ -126,11 +160,57 @@ static const char *const counter_names[] = { + [KFENCE_COUNTER_BUGS] = "total bugs", + [KFENCE_COUNTER_SKIP_INCOMPAT] = "skipped allocations (incompatible)", + [KFENCE_COUNTER_SKIP_CAPACITY] = "skipped allocations (capacity)", ++ [KFENCE_COUNTER_SKIP_COVERED] = "skipped allocations (covered)", + }; + static_assert(ARRAY_SIZE(counter_names) == KFENCE_COUNTER_COUNT); + + /* === Internals ============================================================ */ + ++static inline bool should_skip_covered(void) ++{ ++ unsigned long thresh = (CONFIG_KFENCE_NUM_OBJECTS * kfence_skip_covered_thresh) / 100; ++ ++ return atomic_long_read(&counters[KFENCE_COUNTER_ALLOCATED]) > thresh; ++} ++ ++static u32 get_alloc_stack_hash(unsigned long *stack_entries, size_t num_entries) ++{ ++ num_entries = min(num_entries, UNIQUE_ALLOC_STACK_DEPTH); ++ num_entries = filter_irq_stacks(stack_entries, num_entries); ++ return jhash(stack_entries, num_entries * sizeof(stack_entries[0]), stack_hash_seed); ++} ++ ++/* ++ * Adds (or subtracts) count @val for allocation stack trace hash ++ * @alloc_stack_hash from Counting Bloom filter. ++ */ ++static void alloc_covered_add(u32 alloc_stack_hash, int val) ++{ ++ int i; ++ ++ for (i = 0; i < ALLOC_COVERED_HNUM; i++) { ++ atomic_add(val, &alloc_covered[alloc_stack_hash & ALLOC_COVERED_MASK]); ++ alloc_stack_hash = ALLOC_COVERED_HNEXT(alloc_stack_hash); ++ } ++} ++ ++/* ++ * Returns true if the allocation stack trace hash @alloc_stack_hash is ++ * currently contained (non-zero count) in Counting Bloom filter. ++ */ ++static bool alloc_covered_contains(u32 alloc_stack_hash) ++{ ++ int i; ++ ++ for (i = 0; i < ALLOC_COVERED_HNUM; i++) { ++ if (!atomic_read(&alloc_covered[alloc_stack_hash & ALLOC_COVERED_MASK])) ++ return false; ++ alloc_stack_hash = ALLOC_COVERED_HNEXT(alloc_stack_hash); ++ } ++ ++ return true; ++} ++ + static bool kfence_protect(unsigned long addr) + { + return !KFENCE_WARN_ON(!kfence_protect_page(ALIGN_DOWN(addr, PAGE_SIZE), true)); +@@ -270,7 +350,8 @@ static __always_inline void for_each_canary(const struct kfence_metadata *meta, + } + + static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t gfp, +- unsigned long *stack_entries, size_t num_stack_entries) ++ unsigned long *stack_entries, size_t num_stack_entries, ++ u32 alloc_stack_hash) + { + struct kfence_metadata *meta = NULL; + unsigned long flags; +@@ -333,6 +414,8 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g + /* Pairs with READ_ONCE() in kfence_shutdown_cache(). */ + WRITE_ONCE(meta->cache, cache); + meta->size = size; ++ meta->alloc_stack_hash = alloc_stack_hash; ++ + for_each_canary(meta, set_canary_byte); + + /* Set required struct page fields. */ +@@ -345,6 +428,8 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g + + raw_spin_unlock_irqrestore(&meta->lock, flags); + ++ alloc_covered_add(alloc_stack_hash, 1); ++ + /* Memory initialization. */ + + /* +@@ -413,6 +498,8 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z + + raw_spin_unlock_irqrestore(&meta->lock, flags); + ++ alloc_covered_add(meta->alloc_stack_hash, -1); ++ + /* Protect to detect use-after-frees. */ + kfence_protect((unsigned long)addr); + +@@ -679,6 +766,7 @@ void __init kfence_init(void) + if (!kfence_sample_interval) + return; + ++ stack_hash_seed = (u32)random_get_entropy(); + if (!kfence_init_pool()) { + pr_err("%s failed\n", __func__); + return; +@@ -756,6 +844,7 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + { + unsigned long stack_entries[KFENCE_STACK_DEPTH]; + size_t num_stack_entries; ++ u32 alloc_stack_hash; + + /* + * Perform size check before switching kfence_allocation_gate, so that +@@ -798,7 +887,23 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + + num_stack_entries = stack_trace_save(stack_entries, KFENCE_STACK_DEPTH, 0); + +- return kfence_guarded_alloc(s, size, flags, stack_entries, num_stack_entries); ++ /* ++ * Do expensive check for coverage of allocation in slow-path after ++ * allocation_gate has already become non-zero, even though it might ++ * mean not making any allocation within a given sample interval. ++ * ++ * This ensures reasonable allocation coverage when the pool is almost ++ * full, including avoiding long-lived allocations of the same source ++ * filling up the pool (e.g. pagecache allocations). ++ */ ++ alloc_stack_hash = get_alloc_stack_hash(stack_entries, num_stack_entries); ++ if (should_skip_covered() && alloc_covered_contains(alloc_stack_hash)) { ++ atomic_long_inc(&counters[KFENCE_COUNTER_SKIP_COVERED]); ++ return NULL; ++ } ++ ++ return kfence_guarded_alloc(s, size, flags, stack_entries, num_stack_entries, ++ alloc_stack_hash); + } + + size_t kfence_ksize(const void *addr) +diff --git a/mm/kfence/kfence.h b/mm/kfence/kfence.h +index c1f23c61e5f9..2a2d5de9d379 100644 +--- a/mm/kfence/kfence.h ++++ b/mm/kfence/kfence.h +@@ -87,6 +87,8 @@ struct kfence_metadata { + /* Allocation and free stack information. */ + struct kfence_track alloc_track; + struct kfence_track free_track; ++ /* For updating alloc_covered on frees. */ ++ u32 alloc_stack_hash; + }; + + extern struct kfence_metadata kfence_metadata[CONFIG_KFENCE_NUM_OBJECTS]; +-- +2.35.1 + diff --git a/queue-5.15/kfence-move-saving-stack-trace-of-allocations-into-_.patch b/queue-5.15/kfence-move-saving-stack-trace-of-allocations-into-_.patch new file mode 100644 index 00000000000..804c27914af --- /dev/null +++ b/queue-5.15/kfence-move-saving-stack-trace-of-allocations-into-_.patch @@ -0,0 +1,118 @@ +From e1589c2e99b057b5ebe474a03f5fbb98dfdf2409 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 5 Nov 2021 13:45:31 -0700 +Subject: kfence: move saving stack trace of allocations into __kfence_alloc() + +From: Marco Elver + +[ Upstream commit a9ab52bbcb52df49ec4b30e6741e120588989455 ] + +Move the saving of the stack trace of allocations into __kfence_alloc(), +so that the stack entries array can be used outside of +kfence_guarded_alloc() and we avoid potentially unwinding the stack +multiple times. + +Link: https://lkml.kernel.org/r/20210923104803.2620285-3-elver@google.com +Signed-off-by: Marco Elver +Reviewed-by: Dmitry Vyukov +Acked-by: Alexander Potapenko +Cc: Aleksandr Nogikh +Cc: Jann Horn +Cc: Taras Madan +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + mm/kfence/core.c | 35 ++++++++++++++++++++++++----------- + 1 file changed, 24 insertions(+), 11 deletions(-) + +diff --git a/mm/kfence/core.c b/mm/kfence/core.c +index f26f55850ad7..4eec0c5d32b5 100644 +--- a/mm/kfence/core.c ++++ b/mm/kfence/core.c +@@ -188,19 +188,26 @@ static inline unsigned long metadata_to_pageaddr(const struct kfence_metadata *m + * Update the object's metadata state, including updating the alloc/free stacks + * depending on the state transition. + */ +-static noinline void metadata_update_state(struct kfence_metadata *meta, +- enum kfence_object_state next) ++static noinline void ++metadata_update_state(struct kfence_metadata *meta, enum kfence_object_state next, ++ unsigned long *stack_entries, size_t num_stack_entries) + { + struct kfence_track *track = + next == KFENCE_OBJECT_FREED ? &meta->free_track : &meta->alloc_track; + + lockdep_assert_held(&meta->lock); + +- /* +- * Skip over 1 (this) functions; noinline ensures we do not accidentally +- * skip over the caller by never inlining. +- */ +- track->num_stack_entries = stack_trace_save(track->stack_entries, KFENCE_STACK_DEPTH, 1); ++ if (stack_entries) { ++ memcpy(track->stack_entries, stack_entries, ++ num_stack_entries * sizeof(stack_entries[0])); ++ } else { ++ /* ++ * Skip over 1 (this) functions; noinline ensures we do not ++ * accidentally skip over the caller by never inlining. ++ */ ++ num_stack_entries = stack_trace_save(track->stack_entries, KFENCE_STACK_DEPTH, 1); ++ } ++ track->num_stack_entries = num_stack_entries; + track->pid = task_pid_nr(current); + track->cpu = raw_smp_processor_id(); + track->ts_nsec = local_clock(); /* Same source as printk timestamps. */ +@@ -262,7 +269,8 @@ static __always_inline void for_each_canary(const struct kfence_metadata *meta, + } + } + +-static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t gfp) ++static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t gfp, ++ unsigned long *stack_entries, size_t num_stack_entries) + { + struct kfence_metadata *meta = NULL; + unsigned long flags; +@@ -321,7 +329,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g + addr = (void *)meta->addr; + + /* Update remaining metadata. */ +- metadata_update_state(meta, KFENCE_OBJECT_ALLOCATED); ++ metadata_update_state(meta, KFENCE_OBJECT_ALLOCATED, stack_entries, num_stack_entries); + /* Pairs with READ_ONCE() in kfence_shutdown_cache(). */ + WRITE_ONCE(meta->cache, cache); + meta->size = size; +@@ -401,7 +409,7 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z + memzero_explicit(addr, meta->size); + + /* Mark the object as freed. */ +- metadata_update_state(meta, KFENCE_OBJECT_FREED); ++ metadata_update_state(meta, KFENCE_OBJECT_FREED, NULL, 0); + + raw_spin_unlock_irqrestore(&meta->lock, flags); + +@@ -746,6 +754,9 @@ void kfence_shutdown_cache(struct kmem_cache *s) + + void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + { ++ unsigned long stack_entries[KFENCE_STACK_DEPTH]; ++ size_t num_stack_entries; ++ + /* + * Perform size check before switching kfence_allocation_gate, so that + * we don't disable KFENCE without making an allocation. +@@ -785,7 +796,9 @@ void *__kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) + if (!READ_ONCE(kfence_enabled)) + return NULL; + +- return kfence_guarded_alloc(s, size, flags); ++ num_stack_entries = stack_trace_save(stack_entries, KFENCE_STACK_DEPTH, 0); ++ ++ return kfence_guarded_alloc(s, size, flags, stack_entries, num_stack_entries); + } + + size_t kfence_ksize(const void *addr) +-- +2.35.1 + diff --git a/queue-5.15/kvm-svm-fix-kvm_cache_regs.h-inclusions-for-is_guest.patch b/queue-5.15/kvm-svm-fix-kvm_cache_regs.h-inclusions-for-is_guest.patch new file mode 100644 index 00000000000..0f3089ad7d4 --- /dev/null +++ b/queue-5.15/kvm-svm-fix-kvm_cache_regs.h-inclusions-for-is_guest.patch @@ -0,0 +1,56 @@ +From 0c6b7a25177cf7d31a482020d8718a56feb3871a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Mar 2022 08:10:32 -0800 +Subject: KVM: SVM: Fix kvm_cache_regs.h inclusions for is_guest_mode() + +From: Peter Gonda + +[ Upstream commit 4a9e7b9ea252842bc8b14d495706ac6317fafd5d ] + +Include kvm_cache_regs.h to pick up the definition of is_guest_mode(), +which is referenced by nested_svm_virtualize_tpr() in svm.h. Remove +include from svm_onhpyerv.c which was done only because of lack of +include in svm.h. + +Fixes: 883b0a91f41ab ("KVM: SVM: Move Nested SVM Implementation to nested.c") +Cc: Paolo Bonzini +Cc: Sean Christopherson +Cc: kvm@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Signed-off-by: Peter Gonda +Message-Id: <20220304161032.2270688-1-pgonda@google.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/svm/svm.h | 2 ++ + arch/x86/kvm/svm/svm_onhyperv.c | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h +index ff0855c03c91..a4c13e517487 100644 +--- a/arch/x86/kvm/svm/svm.h ++++ b/arch/x86/kvm/svm/svm.h +@@ -22,6 +22,8 @@ + #include + #include + ++#include "kvm_cache_regs.h" ++ + #define __sme_page_pa(x) __sme_set(page_to_pfn(x) << PAGE_SHIFT) + + #define IOPM_SIZE PAGE_SIZE * 3 +diff --git a/arch/x86/kvm/svm/svm_onhyperv.c b/arch/x86/kvm/svm/svm_onhyperv.c +index 98aa981c04ec..8cdc62c74a96 100644 +--- a/arch/x86/kvm/svm/svm_onhyperv.c ++++ b/arch/x86/kvm/svm/svm_onhyperv.c +@@ -4,7 +4,6 @@ + */ + + #include +-#include "kvm_cache_regs.h" + + #include + +-- +2.35.1 + diff --git a/queue-5.15/kvm-x86-emulator-emulate-rdpid-only-if-it-is-enabled.patch b/queue-5.15/kvm-x86-emulator-emulate-rdpid-only-if-it-is-enabled.patch new file mode 100644 index 00000000000..184ab899626 --- /dev/null +++ b/queue-5.15/kvm-x86-emulator-emulate-rdpid-only-if-it-is-enabled.patch @@ -0,0 +1,81 @@ +From 15f0101e02aee26d3494f723d503f243b486dae3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Mar 2022 21:15:14 +0800 +Subject: KVM: x86/emulator: Emulate RDPID only if it is enabled in guest + +From: Hou Wenlong + +[ Upstream commit a836839cbfe60dc434c5476a7429cf2bae36415d ] + +When RDTSCP is supported but RDPID is not supported in host, +RDPID emulation is available. However, __kvm_get_msr() would +only fail when RDTSCP/RDPID both are disabled in guest, so +the emulator wouldn't inject a #UD when RDPID is disabled but +RDTSCP is enabled in guest. + +Fixes: fb6d4d340e05 ("KVM: x86: emulate RDPID") +Signed-off-by: Hou Wenlong +Message-Id: <1dfd46ae5b76d3ed87bde3154d51c64ea64c99c1.1646226788.git.houwenlong.hwl@antgroup.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/emulate.c | 4 +++- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/x86.c | 6 ++++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c +index 4cf0938a876b..3747a754a8e8 100644 +--- a/arch/x86/kvm/emulate.c ++++ b/arch/x86/kvm/emulate.c +@@ -3514,8 +3514,10 @@ static int em_rdpid(struct x86_emulate_ctxt *ctxt) + { + u64 tsc_aux = 0; + +- if (ctxt->ops->get_msr(ctxt, MSR_TSC_AUX, &tsc_aux)) ++ if (!ctxt->ops->guest_has_rdpid(ctxt)) + return emulate_ud(ctxt); ++ ++ ctxt->ops->get_msr(ctxt, MSR_TSC_AUX, &tsc_aux); + ctxt->dst.val = tsc_aux; + return X86EMUL_CONTINUE; + } +diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h +index 68b420289d7e..fb09cd22cb7f 100644 +--- a/arch/x86/kvm/kvm_emulate.h ++++ b/arch/x86/kvm/kvm_emulate.h +@@ -226,6 +226,7 @@ struct x86_emulate_ops { + bool (*guest_has_long_mode)(struct x86_emulate_ctxt *ctxt); + bool (*guest_has_movbe)(struct x86_emulate_ctxt *ctxt); + bool (*guest_has_fxsr)(struct x86_emulate_ctxt *ctxt); ++ bool (*guest_has_rdpid)(struct x86_emulate_ctxt *ctxt); + + void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked); + +diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c +index 3e606a6940dc..5e2983959f23 100644 +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -7393,6 +7393,11 @@ static bool emulator_guest_has_fxsr(struct x86_emulate_ctxt *ctxt) + return guest_cpuid_has(emul_to_vcpu(ctxt), X86_FEATURE_FXSR); + } + ++static bool emulator_guest_has_rdpid(struct x86_emulate_ctxt *ctxt) ++{ ++ return guest_cpuid_has(emul_to_vcpu(ctxt), X86_FEATURE_RDPID); ++} ++ + static ulong emulator_read_gpr(struct x86_emulate_ctxt *ctxt, unsigned reg) + { + return kvm_register_read_raw(emul_to_vcpu(ctxt), reg); +@@ -7475,6 +7480,7 @@ static const struct x86_emulate_ops emulate_ops = { + .guest_has_long_mode = emulator_guest_has_long_mode, + .guest_has_movbe = emulator_guest_has_movbe, + .guest_has_fxsr = emulator_guest_has_fxsr, ++ .guest_has_rdpid = emulator_guest_has_rdpid, + .set_nmi_mask = emulator_set_nmi_mask, + .get_hflags = emulator_get_hflags, + .exiting_smm = emulator_exiting_smm, +-- +2.35.1 + diff --git a/queue-5.15/kvm-x86-pmu-fix-and-isolate-tsx-specific-performance.patch b/queue-5.15/kvm-x86-pmu-fix-and-isolate-tsx-specific-performance.patch new file mode 100644 index 00000000000..165a803a1d2 --- /dev/null +++ b/queue-5.15/kvm-x86-pmu-fix-and-isolate-tsx-specific-performance.patch @@ -0,0 +1,131 @@ +From 4c9a766d40fc49a78cc511ec9fc36457bd02edce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Mar 2022 16:42:57 +0800 +Subject: KVM: x86/pmu: Fix and isolate TSX-specific performance event logic + +From: Like Xu + +[ Upstream commit e644896f5106aa3f6d7e8c7adf2e4dc0fce53555 ] + +HSW_IN_TX* bits are used in generic code which are not supported on +AMD. Worse, these bits overlap with AMD EventSelect[11:8] and hence +using HSW_IN_TX* bits unconditionally in generic code is resulting in +unintentional pmu behavior on AMD. For example, if EventSelect[11:8] +is 0x2, pmc_reprogram_counter() wrongly assumes that +HSW_IN_TX_CHECKPOINTED is set and thus forces sampling period to be 0. + +Also per the SDM, both bits 32 and 33 "may only be set if the processor +supports HLE or RTM" and for "IN_TXCP (bit 33): this bit may only be set +for IA32_PERFEVTSEL2." + +Opportunistically eliminate code redundancy, because if the HSW_IN_TX* +bit is set in pmc->eventsel, it is already set in attr.config. + +Reported-by: Ravi Bangoria +Reported-by: Jim Mattson +Fixes: 103af0a98788 ("perf, kvm: Support the in_tx/in_tx_cp modifiers in KVM arch perfmon emulation v5") +Co-developed-by: Ravi Bangoria +Signed-off-by: Ravi Bangoria +Signed-off-by: Like Xu +Message-Id: <20220309084257.88931-1-likexu@tencent.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/pmu.c | 15 +++++---------- + arch/x86/kvm/vmx/pmu_intel.c | 13 ++++++++++--- + 2 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c +index 44a5ab91a99d..62333f9756a3 100644 +--- a/arch/x86/kvm/pmu.c ++++ b/arch/x86/kvm/pmu.c +@@ -96,8 +96,7 @@ static void kvm_perf_overflow_intr(struct perf_event *perf_event, + + static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, + u64 config, bool exclude_user, +- bool exclude_kernel, bool intr, +- bool in_tx, bool in_tx_cp) ++ bool exclude_kernel, bool intr) + { + struct perf_event *event; + struct perf_event_attr attr = { +@@ -113,16 +112,14 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, + + attr.sample_period = get_sample_period(pmc, pmc->counter); + +- if (in_tx) +- attr.config |= HSW_IN_TX; +- if (in_tx_cp) { ++ if ((attr.config & HSW_IN_TX_CHECKPOINTED) && ++ guest_cpuid_is_intel(pmc->vcpu)) { + /* + * HSW_IN_TX_CHECKPOINTED is not supported with nonzero + * period. Just clear the sample period so at least + * allocating the counter doesn't fail. + */ + attr.sample_period = 0; +- attr.config |= HSW_IN_TX_CHECKPOINTED; + } + + event = perf_event_create_kernel_counter(&attr, -1, current, +@@ -229,9 +226,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) + pmc_reprogram_counter(pmc, type, config, + !(eventsel & ARCH_PERFMON_EVENTSEL_USR), + !(eventsel & ARCH_PERFMON_EVENTSEL_OS), +- eventsel & ARCH_PERFMON_EVENTSEL_INT, +- (eventsel & HSW_IN_TX), +- (eventsel & HSW_IN_TX_CHECKPOINTED)); ++ eventsel & ARCH_PERFMON_EVENTSEL_INT); + } + EXPORT_SYMBOL_GPL(reprogram_gp_counter); + +@@ -267,7 +262,7 @@ void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int idx) + kvm_x86_ops.pmu_ops->find_fixed_event(idx), + !(en_field & 0x2), /* exclude user */ + !(en_field & 0x1), /* exclude kernel */ +- pmi, false, false); ++ pmi); + } + EXPORT_SYMBOL_GPL(reprogram_fixed_counter); + +diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c +index db1b88445acb..7abe77c8b5d0 100644 +--- a/arch/x86/kvm/vmx/pmu_intel.c ++++ b/arch/x86/kvm/vmx/pmu_intel.c +@@ -396,6 +396,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) + struct kvm_pmc *pmc; + u32 msr = msr_info->index; + u64 data = msr_info->data; ++ u64 reserved_bits; + + switch (msr) { + case MSR_CORE_PERF_FIXED_CTR_CTRL: +@@ -451,7 +452,11 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) + } else if ((pmc = get_gp_pmc(pmu, msr, MSR_P6_EVNTSEL0))) { + if (data == pmc->eventsel) + return 0; +- if (!(data & pmu->reserved_bits)) { ++ reserved_bits = pmu->reserved_bits; ++ if ((pmc->idx == 2) && ++ (pmu->raw_event_mask & HSW_IN_TX_CHECKPOINTED)) ++ reserved_bits ^= HSW_IN_TX_CHECKPOINTED; ++ if (!(data & reserved_bits)) { + reprogram_gp_counter(pmc, data); + return 0; + } +@@ -525,8 +530,10 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) + entry = kvm_find_cpuid_entry(vcpu, 7, 0); + if (entry && + (boot_cpu_has(X86_FEATURE_HLE) || boot_cpu_has(X86_FEATURE_RTM)) && +- (entry->ebx & (X86_FEATURE_HLE|X86_FEATURE_RTM))) +- pmu->reserved_bits ^= HSW_IN_TX|HSW_IN_TX_CHECKPOINTED; ++ (entry->ebx & (X86_FEATURE_HLE|X86_FEATURE_RTM))) { ++ pmu->reserved_bits ^= HSW_IN_TX; ++ pmu->raw_event_mask |= (HSW_IN_TX|HSW_IN_TX_CHECKPOINTED); ++ } + + bitmap_set(pmu->all_valid_pmc_idx, + 0, pmu->nr_arch_gp_counters); +-- +2.35.1 + diff --git a/queue-5.15/kvm-x86-pmu-use-different-raw-event-masks-for-amd-an.patch b/queue-5.15/kvm-x86-pmu-use-different-raw-event-masks-for-amd-an.patch new file mode 100644 index 00000000000..a454937e8eb --- /dev/null +++ b/queue-5.15/kvm-x86-pmu-use-different-raw-event-masks-for-amd-an.patch @@ -0,0 +1,89 @@ +From a68ae8f86f2484951b82db7584815d98e7c3286b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 17:24:52 -0800 +Subject: KVM: x86/pmu: Use different raw event masks for AMD and Intel + +From: Jim Mattson + +[ Upstream commit 95b065bf5c431c06c68056a03a5853b660640ecc ] + +The third nybble of AMD's event select overlaps with Intel's IN_TX and +IN_TXCP bits. Therefore, we can't use AMD64_RAW_EVENT_MASK on Intel +platforms that support TSX. + +Declare a raw_event_mask in the kvm_pmu structure, initialize it in +the vendor-specific pmu_refresh() functions, and use that mask for +PERF_TYPE_RAW configurations in reprogram_gp_counter(). + +Fixes: 710c47651431 ("KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW") +Signed-off-by: Jim Mattson +Message-Id: <20220308012452.3468611-1-jmattson@google.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/kvm/pmu.c | 3 ++- + arch/x86/kvm/svm/pmu.c | 1 + + arch/x86/kvm/vmx/pmu_intel.c | 1 + + 4 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h +index 01759199d723..d9bb5cdb5db2 100644 +--- a/arch/x86/include/asm/kvm_host.h ++++ b/arch/x86/include/asm/kvm_host.h +@@ -505,6 +505,7 @@ struct kvm_pmu { + u64 global_ctrl_mask; + u64 global_ovf_ctrl_mask; + u64 reserved_bits; ++ u64 raw_event_mask; + u8 version; + struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC]; + struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED]; +diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c +index f256f01056bd..44a5ab91a99d 100644 +--- a/arch/x86/kvm/pmu.c ++++ b/arch/x86/kvm/pmu.c +@@ -178,6 +178,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) + struct kvm *kvm = pmc->vcpu->kvm; + struct kvm_pmu_event_filter *filter; + int i; ++ struct kvm_pmu *pmu = vcpu_to_pmu(pmc->vcpu); + bool allow_event = true; + + if (eventsel & ARCH_PERFMON_EVENTSEL_PIN_CONTROL) +@@ -217,7 +218,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) + } + + if (type == PERF_TYPE_RAW) +- config = eventsel & AMD64_RAW_EVENT_MASK; ++ config = eventsel & pmu->raw_event_mask; + + if (pmc->current_config == eventsel && pmc_resume_counter(pmc)) + return; +diff --git a/arch/x86/kvm/svm/pmu.c b/arch/x86/kvm/svm/pmu.c +index 06f8034f62e4..369164368819 100644 +--- a/arch/x86/kvm/svm/pmu.c ++++ b/arch/x86/kvm/svm/pmu.c +@@ -283,6 +283,7 @@ static void amd_pmu_refresh(struct kvm_vcpu *vcpu) + + pmu->counter_bitmask[KVM_PMC_GP] = ((u64)1 << 48) - 1; + pmu->reserved_bits = 0xfffffff000280000ull; ++ pmu->raw_event_mask = AMD64_RAW_EVENT_MASK; + pmu->version = 1; + /* not applicable to AMD; but clean them to prevent any fall out */ + pmu->counter_bitmask[KVM_PMC_FIXED] = 0; +diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c +index 6427d95de01c..db1b88445acb 100644 +--- a/arch/x86/kvm/vmx/pmu_intel.c ++++ b/arch/x86/kvm/vmx/pmu_intel.c +@@ -478,6 +478,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) + pmu->counter_bitmask[KVM_PMC_FIXED] = 0; + pmu->version = 0; + pmu->reserved_bits = 0xffffffff00200000ull; ++ pmu->raw_event_mask = X86_RAW_EVENT_MASK; + + entry = kvm_find_cpuid_entry(vcpu, 0xa, 0); + if (!entry) +-- +2.35.1 + diff --git a/queue-5.15/kvm-x86-svm-clear-reserved-bits-written-to-perfevtse.patch b/queue-5.15/kvm-x86-svm-clear-reserved-bits-written-to-perfevtse.patch new file mode 100644 index 00000000000..cb323ae605b --- /dev/null +++ b/queue-5.15/kvm-x86-svm-clear-reserved-bits-written-to-perfevtse.patch @@ -0,0 +1,74 @@ +From 80d87dcd9de61caf20596d192a604aea4e132fb9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 26 Feb 2022 15:41:31 -0800 +Subject: KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs + +From: Jim Mattson + +[ Upstream commit 9b026073db2f1ad0e4d8b61c83316c8497981037 ] + +AMD EPYC CPUs never raise a #GP for a WRMSR to a PerfEvtSeln MSR. Some +reserved bits are cleared, and some are not. Specifically, on +Zen3/Milan, bits 19 and 42 are not cleared. + +When emulating such a WRMSR, KVM should not synthesize a #GP, +regardless of which bits are set. However, undocumented bits should +not be passed through to the hardware MSR. So, rather than checking +for reserved bits and synthesizing a #GP, just clear the reserved +bits. + +This may seem pedantic, but since KVM currently does not support the +"Host/Guest Only" bits (41:40), it is necessary to clear these bits +rather than synthesizing #GP, because some popular guests (e.g Linux) +will set the "Host Only" bit even on CPUs that don't support +EFER.SVME, and they don't expect a #GP. + +For example, + +root@Ubuntu1804:~# perf stat -e r26 -a sleep 1 + + Performance counter stats for 'system wide': + + 0 r26 + + 1.001070977 seconds time elapsed + +Feb 23 03:59:58 Ubuntu1804 kernel: [ 405.379957] unchecked MSR access error: WRMSR to 0xc0010200 (tried to write 0x0000020000130026) at rIP: 0xffffffff9b276a28 (native_write_msr+0x8/0x30) +Feb 23 03:59:58 Ubuntu1804 kernel: [ 405.379958] Call Trace: +Feb 23 03:59:58 Ubuntu1804 kernel: [ 405.379963] amd_pmu_disable_event+0x27/0x90 + +Fixes: ca724305a2b0 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM") +Reported-by: Lotus Fenn +Signed-off-by: Jim Mattson +Reviewed-by: Like Xu +Reviewed-by: David Dunn +Message-Id: <20220226234131.2167175-1-jmattson@google.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/svm/pmu.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/arch/x86/kvm/svm/pmu.c b/arch/x86/kvm/svm/pmu.c +index 369164368819..3faf1d9c6c91 100644 +--- a/arch/x86/kvm/svm/pmu.c ++++ b/arch/x86/kvm/svm/pmu.c +@@ -261,12 +261,10 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) + /* MSR_EVNTSELn */ + pmc = get_gp_pmc_amd(pmu, msr, PMU_TYPE_EVNTSEL); + if (pmc) { +- if (data == pmc->eventsel) +- return 0; +- if (!(data & pmu->reserved_bits)) { ++ data &= ~pmu->reserved_bits; ++ if (data != pmc->eventsel) + reprogram_gp_counter(pmc, data); +- return 0; +- } ++ return 0; + } + + return 1; +-- +2.35.1 + diff --git a/queue-5.15/lib-kconfig.debug-add-arch-dependency-for-function_a.patch b/queue-5.15/lib-kconfig.debug-add-arch-dependency-for-function_a.patch new file mode 100644 index 00000000000..7e998f4401d --- /dev/null +++ b/queue-5.15/lib-kconfig.debug-add-arch-dependency-for-function_a.patch @@ -0,0 +1,52 @@ +From 93344673aa95d7b46146ffcdb06b7c42c641c932 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Mar 2022 16:05:50 -0700 +Subject: lib/Kconfig.debug: add ARCH dependency for FUNCTION_ALIGN option + +From: Feng Tang + +[ Upstream commit 1bf18da62106225dbc47aab41efee2aeb99caccd ] + +0Day robots reported there is compiling issue for 'csky' ARCH when +CONFIG_DEBUG_FORCE_DATA_SECTION_ALIGNED is enabled [1]: + +All errors (new ones prefixed by >>): + + {standard input}: Assembler messages: +>> {standard input}:2277: Error: pcrel offset for branch to .LS000B too far (0x3c) + +Which was discussed in [2]. And as there is no solution for csky yet, add +some dependency for this config to limit it to several ARCHs which have no +compiling issue so far. + +[1]. https://lore.kernel.org/lkml/202202271612.W32UJAj2-lkp@intel.com/ +[2]. https://www.spinics.net/lists/linux-kbuild/msg30298.html + +Link: https://lkml.kernel.org/r/20220304021100.GN4548@shbuild999.sh.intel.com +Reported-by: kernel test robot +Signed-off-by: Feng Tang +Cc: Guo Ren +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + lib/Kconfig.debug | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug +index 2a9b6dcdac4f..55e89b237b6f 100644 +--- a/lib/Kconfig.debug ++++ b/lib/Kconfig.debug +@@ -414,7 +414,8 @@ config SECTION_MISMATCH_WARN_ONLY + If unsure, say Y. + + config DEBUG_FORCE_FUNCTION_ALIGN_64B +- bool "Force all function address 64B aligned" if EXPERT ++ bool "Force all function address 64B aligned" ++ depends on EXPERT && (X86_64 || ARM64 || PPC32 || PPC64 || ARC) + help + There are cases that a commit from one domain changes the function + address alignment of other domains, and cause magic performance +-- +2.35.1 + diff --git a/queue-5.15/lib-logic_iomem-correct-fallback-config-references.patch b/queue-5.15/lib-logic_iomem-correct-fallback-config-references.patch new file mode 100644 index 00000000000..1fa60e3a3f0 --- /dev/null +++ b/queue-5.15/lib-logic_iomem-correct-fallback-config-references.patch @@ -0,0 +1,66 @@ +From 99bba3e2d456d331f6dce1544cefc5bde4f16a84 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 Jan 2022 16:40:15 +0100 +Subject: lib/logic_iomem: correct fallback config references + +From: Johannes Berg + +[ Upstream commit 2a6852cb8ff0c8c1363cac648d68489343813212 ] + +Due to some renaming, we ended up with the "indirect iomem" +naming in Kconfig, following INDIRECT_PIO. However, clearly +I missed following through on that in the ifdefs, but so far +INDIRECT_IOMEM_FALLBACK isn't used by any architecture. + +Reported-by: Lukas Bulwahn +Fixes: ca2e334232b6 ("lib: add iomem emulation (logic_iomem)") +Signed-off-by: Johannes Berg +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + lib/logic_iomem.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c +index 549b22d4bcde..e7ea9b28d8db 100644 +--- a/lib/logic_iomem.c ++++ b/lib/logic_iomem.c +@@ -68,7 +68,7 @@ int logic_iomem_add_region(struct resource *resource, + } + EXPORT_SYMBOL(logic_iomem_add_region); + +-#ifndef CONFIG_LOGIC_IOMEM_FALLBACK ++#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK + static void __iomem *real_ioremap(phys_addr_t offset, size_t size) + { + WARN(1, "invalid ioremap(0x%llx, 0x%zx)\n", +@@ -81,7 +81,7 @@ static void real_iounmap(void __iomem *addr) + WARN(1, "invalid iounmap for addr 0x%llx\n", + (unsigned long long)(uintptr_t __force)addr); + } +-#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ ++#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ + + void __iomem *ioremap(phys_addr_t offset, size_t size) + { +@@ -168,7 +168,7 @@ void iounmap(void __iomem *addr) + } + EXPORT_SYMBOL(iounmap); + +-#ifndef CONFIG_LOGIC_IOMEM_FALLBACK ++#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK + #define MAKE_FALLBACK(op, sz) \ + static u##sz real_raw_read ## op(const volatile void __iomem *addr) \ + { \ +@@ -213,7 +213,7 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer, + WARN(1, "Invalid memcpy_toio at address 0x%llx\n", + (unsigned long long)(uintptr_t __force)addr); + } +-#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ ++#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ + + #define MAKE_OP(op, sz) \ + u##sz __raw_read ## op(const volatile void __iomem *addr) \ +-- +2.35.1 + diff --git a/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch b/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch new file mode 100644 index 00000000000..53ad0aebecf --- /dev/null +++ b/queue-5.15/libbpf-fix-build-issue-with-llvm-readelf.patch @@ -0,0 +1,97 @@ +From 36373ab1193f2ee020155981b8f0b39dcfb022ff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 13:43:55 -0800 +Subject: libbpf: Fix build issue with llvm-readelf + +From: Yonghong Song + +[ Upstream commit 0908a66ad1124c1634c33847ac662106f7f2c198 ] + +There are cases where clang compiler is packaged in a way +readelf is a symbolic link to llvm-readelf. In such cases, +llvm-readelf will be used instead of default binutils readelf, +and the following error will appear during libbpf build: + + Warning: Num of global symbols in + /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) + does NOT match with num of versioned symbols in + /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). + Please make sure all LIBBPF_API symbols are versioned in libbpf.map. + --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... + +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... + @@ -324,6 +324,22 @@ + btf__str_by_offset + btf__type_by_id + btf__type_cnt + +LIBBPF_0.0.1 + +LIBBPF_0.0.2 + +LIBBPF_0.0.3 + +LIBBPF_0.0.4 + +LIBBPF_0.0.5 + +LIBBPF_0.0.6 + +LIBBPF_0.0.7 + +LIBBPF_0.0.8 + +LIBBPF_0.0.9 + +LIBBPF_0.1.0 + +LIBBPF_0.2.0 + +LIBBPF_0.3.0 + +LIBBPF_0.4.0 + +LIBBPF_0.5.0 + +LIBBPF_0.6.0 + +LIBBPF_0.7.0 + libbpf_attach_type_by_name + libbpf_find_kernel_btf + libbpf_find_vmlinux_btf_id + make[2]: *** [Makefile:184: check_abi] Error 1 + make[1]: *** [Makefile:140: all] Error 2 + +The above failure is due to different printouts for some ABS +versioned symbols. For example, with the same libbpf.so, + $ /bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS + 134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0 + 202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0 + ... + $ /opt/llvm/bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS + 134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0@@LIBBPF_0.5.0 + 202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0@@LIBBPF_0.6.0 + ... +The binutils readelf doesn't print out the symbol LIBBPF_* version and llvm-readelf does. +Such a difference caused libbpf build failure with llvm-readelf. + +The proposed fix filters out all ABS symbols as they are not part of the comparison. +This works for both binutils readelf and llvm-readelf. + +Reported-by: Delyan Kratunov +Signed-off-by: Yonghong Song +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20220204214355.502108-1-yhs@fb.com +Signed-off-by: Sasha Levin +--- + tools/lib/bpf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile +index 74c3b73a5fbe..089b73b3cb37 100644 +--- a/tools/lib/bpf/Makefile ++++ b/tools/lib/bpf/Makefile +@@ -126,7 +126,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ + sort -u | wc -l) + VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ + sed 's/\[.*\]//' | \ +- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ ++ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ + grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) + + CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) +@@ -195,7 +195,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) + sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ + readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ + sed 's/\[.*\]//' | \ +- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ ++ awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}'| \ + grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ + sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ + diff -u $(OUTPUT)libbpf_global_syms.tmp \ +-- +2.35.1 + diff --git a/queue-5.15/macvtap-advertise-link-netns-via-netlink.patch b/queue-5.15/macvtap-advertise-link-netns-via-netlink.patch new file mode 100644 index 00000000000..6818729932c --- /dev/null +++ b/queue-5.15/macvtap-advertise-link-netns-via-netlink.patch @@ -0,0 +1,68 @@ +From 1e96f30f536db99334b675b27fdc68e22c7d3534 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Feb 2022 01:32:40 +0100 +Subject: macvtap: advertise link netns via netlink +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Sven Eckelmann + +[ Upstream commit a02192151b7dbf855084c38dca380d77c7658353 ] + +Assign rtnl_link_ops->get_link_net() callback so that IFLA_LINK_NETNSID is +added to rtnetlink messages. This fixes iproute2 which otherwise resolved +the link interface to an interface in the wrong namespace. + +Test commands: + + ip netns add nst + ip link add dummy0 type dummy + ip link add link macvtap0 link dummy0 type macvtap + ip link set macvtap0 netns nst + ip -netns nst link show macvtap0 + +Before: + + 10: macvtap0@gre0: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500 + link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff + +After: + + 10: macvtap0@if2: mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500 + link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff link-netnsid 0 + +Reported-by: Leonardo Mörlein +Signed-off-by: Sven Eckelmann +Link: https://lore.kernel.org/r/20220228003240.1337426-1-sven@narfation.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/macvtap.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c +index 694e2f5dbbe5..39801c31e507 100644 +--- a/drivers/net/macvtap.c ++++ b/drivers/net/macvtap.c +@@ -133,11 +133,17 @@ static void macvtap_setup(struct net_device *dev) + dev->tx_queue_len = TUN_READQ_SIZE; + } + ++static struct net *macvtap_link_net(const struct net_device *dev) ++{ ++ return dev_net(macvlan_dev_real_dev(dev)); ++} ++ + static struct rtnl_link_ops macvtap_link_ops __read_mostly = { + .kind = "macvtap", + .setup = macvtap_setup, + .newlink = macvtap_newlink, + .dellink = macvtap_dellink, ++ .get_link_net = macvtap_link_net, + .priv_size = sizeof(struct macvtap_dev), + }; + +-- +2.35.1 + diff --git a/queue-5.15/minix-fix-bug-when-opening-a-file-with-o_direct.patch b/queue-5.15/minix-fix-bug-when-opening-a-file-with-o_direct.patch new file mode 100644 index 00000000000..235bea9d7c7 --- /dev/null +++ b/queue-5.15/minix-fix-bug-when-opening-a-file-with-o_direct.patch @@ -0,0 +1,48 @@ +From 627773c39ff53afb376fc880ee63bd37495a2caf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Mar 2022 16:06:23 -0700 +Subject: minix: fix bug when opening a file with O_DIRECT + +From: Qinghua Jin + +[ Upstream commit 9ce3c0d26c42d279b6c378a03cd6a61d828f19ca ] + +Testcase: +1. create a minix file system and mount it +2. open a file on the file system with O_RDWR|O_CREAT|O_TRUNC|O_DIRECT +3. open fails with -EINVAL but leaves an empty file behind. All other + open() failures don't leave the failed open files behind. + +It is hard to check the direct_IO op before creating the inode. Just as +ext4 and btrfs do, this patch will resolve the issue by allowing to +create the file with O_DIRECT but returning error when writing the file. + +Link: https://lkml.kernel.org/r/20220107133626.413379-1-qhjin.dev@gmail.com +Signed-off-by: Qinghua Jin +Reported-by: Colin Ian King +Reviewed-by: Jan Kara +Acked-by: Christian Brauner +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/minix/inode.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/minix/inode.c b/fs/minix/inode.c +index a71f1cf894b9..d4bd94234ef7 100644 +--- a/fs/minix/inode.c ++++ b/fs/minix/inode.c +@@ -447,7 +447,8 @@ static const struct address_space_operations minix_aops = { + .writepage = minix_writepage, + .write_begin = minix_write_begin, + .write_end = generic_write_end, +- .bmap = minix_bmap ++ .bmap = minix_bmap, ++ .direct_IO = noop_direct_IO + }; + + static const struct inode_operations minix_symlink_inode_operations = { +-- +2.35.1 + diff --git a/queue-5.15/mips-fix-fortify-panic-when-copying-asm-exception-ha.patch b/queue-5.15/mips-fix-fortify-panic-when-copying-asm-exception-ha.patch new file mode 100644 index 00000000000..c5f9fc717fe --- /dev/null +++ b/queue-5.15/mips-fix-fortify-panic-when-copying-asm-exception-ha.patch @@ -0,0 +1,99 @@ +From 8bfb028614055bad3ef5fa312645d5be11182bde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Feb 2022 01:30:23 +0000 +Subject: MIPS: fix fortify panic when copying asm exception handlers + +From: Alexander Lobakin + +[ Upstream commit d17b66417308996e7e64b270a3c7f3c1fbd4cfc8 ] + +With KCFLAGS="-O3", I was able to trigger a fortify-source +memcpy() overflow panic on set_vi_srs_handler(). +Although O3 level is not supported in the mainline, under some +conditions that may've happened with any optimization settings, +it's just a matter of inlining luck. The panic itself is correct, +more precisely, 50/50 false-positive and not at the same time. +From the one side, no real overflow happens. Exception handler +defined in asm just gets copied to some reserved places in the +memory. +But the reason behind is that C code refers to that exception +handler declares it as `char`, i.e. something of 1 byte length. +It's obvious that the asm function itself is way more than 1 byte, +so fortify logics thought we are going to past the symbol declared. +The standard way to refer to asm symbols from C code which is not +supposed to be called from C is to declare them as +`extern const u8[]`. This is fully correct from any point of view, +as any code itself is just a bunch of bytes (including 0 as it is +for syms like _stext/_etext/etc.), and the exact size is not known +at the moment of compilation. +Adjust the type of the except_vec_vi_*() and related variables. +Make set_handler() take `const` as a second argument to avoid +cast-away warnings and give a little more room for optimization. + +Signed-off-by: Alexander Lobakin +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/include/asm/setup.h | 2 +- + arch/mips/kernel/traps.c | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h +index bb36a400203d..8c56b862fd9c 100644 +--- a/arch/mips/include/asm/setup.h ++++ b/arch/mips/include/asm/setup.h +@@ -16,7 +16,7 @@ static inline void setup_8250_early_printk_port(unsigned long base, + unsigned int reg_shift, unsigned int timeout) {} + #endif + +-extern void set_handler(unsigned long offset, void *addr, unsigned long len); ++void set_handler(unsigned long offset, const void *addr, unsigned long len); + extern void set_uncached_handler(unsigned long offset, void *addr, unsigned long len); + + typedef void (*vi_handler_t)(void); +diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c +index 6f07362de5ce..edd93430b954 100644 +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -2085,19 +2085,19 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs) + * If no shadow set is selected then use the default handler + * that does normal register saving and standard interrupt exit + */ +- extern char except_vec_vi, except_vec_vi_lui; +- extern char except_vec_vi_ori, except_vec_vi_end; +- extern char rollback_except_vec_vi; +- char *vec_start = using_rollback_handler() ? +- &rollback_except_vec_vi : &except_vec_vi; ++ extern const u8 except_vec_vi[], except_vec_vi_lui[]; ++ extern const u8 except_vec_vi_ori[], except_vec_vi_end[]; ++ extern const u8 rollback_except_vec_vi[]; ++ const u8 *vec_start = using_rollback_handler() ? ++ rollback_except_vec_vi : except_vec_vi; + #if defined(CONFIG_CPU_MICROMIPS) || defined(CONFIG_CPU_BIG_ENDIAN) +- const int lui_offset = &except_vec_vi_lui - vec_start + 2; +- const int ori_offset = &except_vec_vi_ori - vec_start + 2; ++ const int lui_offset = except_vec_vi_lui - vec_start + 2; ++ const int ori_offset = except_vec_vi_ori - vec_start + 2; + #else +- const int lui_offset = &except_vec_vi_lui - vec_start; +- const int ori_offset = &except_vec_vi_ori - vec_start; ++ const int lui_offset = except_vec_vi_lui - vec_start; ++ const int ori_offset = except_vec_vi_ori - vec_start; + #endif +- const int handler_len = &except_vec_vi_end - vec_start; ++ const int handler_len = except_vec_vi_end - vec_start; + + if (handler_len > VECTORSPACING) { + /* +@@ -2305,7 +2305,7 @@ void per_cpu_trap_init(bool is_boot_cpu) + } + + /* Install CPU exception handler */ +-void set_handler(unsigned long offset, void *addr, unsigned long size) ++void set_handler(unsigned long offset, const void *addr, unsigned long size) + { + #ifdef CONFIG_CPU_MICROMIPS + memcpy((void *)(ebase + offset), ((unsigned char *)addr - 1), size); +-- +2.35.1 + diff --git a/queue-5.15/mips-ingenic-correct-unit-node-address.patch b/queue-5.15/mips-ingenic-correct-unit-node-address.patch new file mode 100644 index 00000000000..d2e34c635d2 --- /dev/null +++ b/queue-5.15/mips-ingenic-correct-unit-node-address.patch @@ -0,0 +1,37 @@ +From 1f986463d302618d9bff28dadd33b69e9f5a34a7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Mar 2022 12:52:59 +0100 +Subject: MIPS: ingenic: correct unit node address + +From: Krzysztof Kozlowski + +[ Upstream commit 8931ddd8d6a55fcefb20f44a38ba42bb746f0b62 ] + +Unit node addresses should not have leading 0x: + + Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x" + +Signed-off-by: Krzysztof Kozlowski +Reviewed-by: Paul Cercueil +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi +index 9e34f433b9b5..efbbddaf0fde 100644 +--- a/arch/mips/boot/dts/ingenic/jz4780.dtsi ++++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi +@@ -450,7 +450,7 @@ + #address-cells = <1>; + #size-cells = <1>; + +- eth0_addr: eth-mac-addr@0x22 { ++ eth0_addr: eth-mac-addr@22 { + reg = <0x22 0x6>; + }; + }; +-- +2.35.1 + diff --git a/queue-5.15/mips-ralink-fix-a-refcount-leak-in-ill_acc_of_setup.patch b/queue-5.15/mips-ralink-fix-a-refcount-leak-in-ill_acc_of_setup.patch new file mode 100644 index 00000000000..9814bc7fde6 --- /dev/null +++ b/queue-5.15/mips-ralink-fix-a-refcount-leak-in-ill_acc_of_setup.patch @@ -0,0 +1,33 @@ +From a0223240830494cfa9c1765add4e60dfffef33f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Feb 2022 15:35:37 +0800 +Subject: mips: ralink: fix a refcount leak in ill_acc_of_setup() + +From: Hangyu Hua + +[ Upstream commit 4a0a1436053b17e50b7c88858fb0824326641793 ] + +of_node_put(np) needs to be called when pdev == NULL. + +Signed-off-by: Hangyu Hua +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Sasha Levin +--- + arch/mips/ralink/ill_acc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c +index bdf53807d7c2..bea857c9da8b 100644 +--- a/arch/mips/ralink/ill_acc.c ++++ b/arch/mips/ralink/ill_acc.c +@@ -61,6 +61,7 @@ static int __init ill_acc_of_setup(void) + pdev = of_find_device_by_node(np); + if (!pdev) { + pr_err("%pOFn: failed to lookup pdev\n", np); ++ of_node_put(np); + return -EINVAL; + } + +-- +2.35.1 + diff --git a/queue-5.15/mm-fix-race-between-madv_free-reclaim-and-blkdev-dir.patch b/queue-5.15/mm-fix-race-between-madv_free-reclaim-and-blkdev-dir.patch new file mode 100644 index 00000000000..60840cf6558 --- /dev/null +++ b/queue-5.15/mm-fix-race-between-madv_free-reclaim-and-blkdev-dir.patch @@ -0,0 +1,463 @@ +From c5d23be62f0e449c337df154f9e046711e29452e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Apr 2022 16:14:27 -0300 +Subject: mm: fix race between MADV_FREE reclaim and blkdev direct IO read + +From: Mauricio Faria de Oliveira + +commit 6c8e2a256915a223f6289f651d6b926cd7135c9e upstream. + +Problem: +======= + +Userspace might read the zero-page instead of actual data from a direct IO +read on a block device if the buffers have been called madvise(MADV_FREE) +on earlier (this is discussed below) due to a race between page reclaim on +MADV_FREE and blkdev direct IO read. + +- Race condition: + ============== + +During page reclaim, the MADV_FREE page check in try_to_unmap_one() checks +if the page is not dirty, then discards its rmap PTE(s) (vs. remap back +if the page is dirty). + +However, after try_to_unmap_one() returns to shrink_page_list(), it might +keep the page _anyway_ if page_ref_freeze() fails (it expects exactly +_one_ page reference, from the isolation for page reclaim). + +Well, blkdev_direct_IO() gets references for all pages, and on READ +operations it only sets them dirty _later_. + +So, if MADV_FREE'd pages (i.e., not dirty) are used as buffers for direct +IO read from block devices, and page reclaim happens during +__blkdev_direct_IO[_simple]() exactly AFTER bio_iov_iter_get_pages() +returns, but BEFORE the pages are set dirty, the situation happens. + +The direct IO read eventually completes. Now, when userspace reads the +buffers, the PTE is no longer there and the page fault handler +do_anonymous_page() services that with the zero-page, NOT the data! + +A synthetic reproducer is provided. + +- Page faults: + =========== + +If page reclaim happens BEFORE bio_iov_iter_get_pages() the issue doesn't +happen, because that faults-in all pages as writeable, so +do_anonymous_page() sets up a new page/rmap/PTE, and that is used by +direct IO. The userspace reads don't fault as the PTE is there (thus +zero-page is not used/setup). + +But if page reclaim happens AFTER it / BEFORE setting pages dirty, the PTE +is no longer there; the subsequent page faults can't help: + +The data-read from the block device probably won't generate faults due to +DMA (no MMU) but even in the case it wouldn't use DMA, that happens on +different virtual addresses (not user-mapped addresses) because `struct +bio_vec` stores `struct page` to figure addresses out (which are different +from user-mapped addresses) for the read. + +Thus userspace reads (to user-mapped addresses) still fault, then +do_anonymous_page() gets another `struct page` that would address/ map to +other memory than the `struct page` used by `struct bio_vec` for the read. +(The original `struct page` is not available, since it wasn't freed, as +page_ref_freeze() failed due to more page refs. And even if it were +available, its data cannot be trusted anymore.) + +Solution: +======== + +One solution is to check for the expected page reference count in +try_to_unmap_one(). + +There should be one reference from the isolation (that is also checked in +shrink_page_list() with page_ref_freeze()) plus one or more references +from page mapping(s) (put in discard: label). Further references mean +that rmap/PTE cannot be unmapped/nuked. + +(Note: there might be more than one reference from mapping due to +fork()/clone() without CLONE_VM, which use the same `struct page` for +references, until the copy-on-write page gets copied.) + +So, additional page references (e.g., from direct IO read) now prevent the +rmap/PTE from being unmapped/dropped; similarly to the page is not freed +per shrink_page_list()/page_ref_freeze()). + +- Races and Barriers: + ================== + +The new check in try_to_unmap_one() should be safe in races with +bio_iov_iter_get_pages() in get_user_pages() fast and slow paths, as it's +done under the PTE lock. + +The fast path doesn't take the lock, but it checks if the PTE has changed +and if so, it drops the reference and leaves the page for the slow path +(which does take that lock). + +The fast path requires synchronization w/ full memory barrier: it writes +the page reference count first then it reads the PTE later, while +try_to_unmap() writes PTE first then it reads page refcount. + +And a second barrier is needed, as the page dirty flag should not be read +before the page reference count (as in __remove_mapping()). (This can be +a load memory barrier only; no writes are involved.) + +Call stack/comments: + +- try_to_unmap_one() + - page_vma_mapped_walk() + - map_pte() # see pte_offset_map_lock(): + pte_offset_map() + spin_lock() + + - ptep_get_and_clear() # write PTE + - smp_mb() # (new barrier) GUP fast path + - page_ref_count() # (new check) read refcount + + - page_vma_mapped_walk_done() # see pte_unmap_unlock(): + pte_unmap() + spin_unlock() + +- bio_iov_iter_get_pages() + - __bio_iov_iter_get_pages() + - iov_iter_get_pages() + - get_user_pages_fast() + - internal_get_user_pages_fast() + + # fast path + - lockless_pages_from_mm() + - gup_{pgd,p4d,pud,pmd,pte}_range() + ptep = pte_offset_map() # not _lock() + pte = ptep_get_lockless(ptep) + + page = pte_page(pte) + try_grab_compound_head(page) # inc refcount + # (RMW/barrier + # on success) + + if (pte_val(pte) != pte_val(*ptep)) # read PTE + put_compound_head(page) # dec refcount + # go slow path + + # slow path + - __gup_longterm_unlocked() + - get_user_pages_unlocked() + - __get_user_pages_locked() + - __get_user_pages() + - follow_{page,p4d,pud,pmd}_mask() + - follow_page_pte() + ptep = pte_offset_map_lock() + pte = *ptep + page = vm_normal_page(pte) + try_grab_page(page) # inc refcount + pte_unmap_unlock() + +- Huge Pages: + ========== + +Regarding transparent hugepages, that logic shouldn't change, as MADV_FREE +(aka lazyfree) pages are PageAnon() && !PageSwapBacked() +(madvise_free_pte_range() -> mark_page_lazyfree() -> lru_lazyfree_fn()) +thus should reach shrink_page_list() -> split_huge_page_to_list() before +try_to_unmap[_one](), so it deals with normal pages only. + +(And in case unlikely/TTU_SPLIT_HUGE_PMD/split_huge_pmd_address() happens, +which should not or be rare, the page refcount should be greater than +mapcount: the head page is referenced by tail pages. That also prevents +checking the head `page` then incorrectly call page_remove_rmap(subpage) +for a tail page, that isn't even in the shrink_page_list()'s page_list (an +effect of split huge pmd/pmvw), as it might happen today in this unlikely +scenario.) + +MADV_FREE'd buffers: +=================== + +So, back to the "if MADV_FREE pages are used as buffers" note. The case +is arguable, and subject to multiple interpretations. + +The madvise(2) manual page on the MADV_FREE advice value says: + +1) 'After a successful MADV_FREE ... data will be lost when + the kernel frees the pages.' +2) 'the free operation will be canceled if the caller writes + into the page' / 'subsequent writes ... will succeed and + then [the] kernel cannot free those dirtied pages' +3) 'If there is no subsequent write, the kernel can free the + pages at any time.' + +Thoughts, questions, considerations... respectively: + +1) Since the kernel didn't actually free the page (page_ref_freeze() + failed), should the data not have been lost? (on userspace read.) +2) Should writes performed by the direct IO read be able to cancel + the free operation? + - Should the direct IO read be considered as 'the caller' too, + as it's been requested by 'the caller'? + - Should the bio technique to dirty pages on return to userspace + (bio_check_pages_dirty() is called/used by __blkdev_direct_IO()) + be considered in another/special way here? +3) Should an upcoming write from a previously requested direct IO + read be considered as a subsequent write, so the kernel should + not free the pages? (as it's known at the time of page reclaim.) + +And lastly: + +Technically, the last point would seem a reasonable consideration and +balance, as the madvise(2) manual page apparently (and fairly) seem to +assume that 'writes' are memory access from the userspace process (not +explicitly considering writes from the kernel or its corner cases; again, +fairly).. plus the kernel fix implementation for the corner case of the +largely 'non-atomic write' encompassed by a direct IO read operation, is +relatively simple; and it helps. + +Reproducer: +========== + +@ test.c (simplified, but works) + + #define _GNU_SOURCE + #include + #include + #include + #include + + int main() { + int fd, i; + char *buf; + + fd = open(DEV, O_RDONLY | O_DIRECT); + + buf = mmap(NULL, BUF_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + + for (i = 0; i < BUF_SIZE; i += PAGE_SIZE) + buf[i] = 1; // init to non-zero + + madvise(buf, BUF_SIZE, MADV_FREE); + + read(fd, buf, BUF_SIZE); + + for (i = 0; i < BUF_SIZE; i += PAGE_SIZE) + printf("%p: 0x%x\n", &buf[i], buf[i]); + + return 0; + } + +@ block/fops.c (formerly fs/block_dev.c) + + +#include + ... + ... __blkdev_direct_IO[_simple](...) + { + ... + + if (!strcmp(current->comm, "good")) + + shrink_all_memory(ULONG_MAX); + + + ret = bio_iov_iter_get_pages(...); + + + + if (!strcmp(current->comm, "bad")) + + shrink_all_memory(ULONG_MAX); + ... + } + +@ shell + + # NUM_PAGES=4 + # PAGE_SIZE=$(getconf PAGE_SIZE) + + # yes | dd of=test.img bs=${PAGE_SIZE} count=${NUM_PAGES} + # DEV=$(losetup -f --show test.img) + + # gcc -DDEV=\"$DEV\" \ + -DBUF_SIZE=$((PAGE_SIZE * NUM_PAGES)) \ + -DPAGE_SIZE=${PAGE_SIZE} \ + test.c -o test + + # od -tx1 $DEV + 0000000 79 0a 79 0a 79 0a 79 0a 79 0a 79 0a 79 0a 79 0a + * + 0040000 + + # mv test good + # ./good + 0x7f7c10418000: 0x79 + 0x7f7c10419000: 0x79 + 0x7f7c1041a000: 0x79 + 0x7f7c1041b000: 0x79 + + # mv good bad + # ./bad + 0x7fa1b8050000: 0x0 + 0x7fa1b8051000: 0x0 + 0x7fa1b8052000: 0x0 + 0x7fa1b8053000: 0x0 + +Note: the issue is consistent on v5.17-rc3, but it's intermittent with the +support of MADV_FREE on v4.5 (60%-70% error; needs swap). [wrap +do_direct_IO() in do_blockdev_direct_IO() @ fs/direct-io.c]. + +- v5.17-rc3: + + # for i in {1..1000}; do ./good; done \ + | cut -d: -f2 | sort | uniq -c + 4000 0x79 + + # mv good bad + # for i in {1..1000}; do ./bad; done \ + | cut -d: -f2 | sort | uniq -c + 4000 0x0 + + # free | grep Swap + Swap: 0 0 0 + +- v4.5: + + # for i in {1..1000}; do ./good; done \ + | cut -d: -f2 | sort | uniq -c + 4000 0x79 + + # mv good bad + # for i in {1..1000}; do ./bad; done \ + | cut -d: -f2 | sort | uniq -c + 2702 0x0 + 1298 0x79 + + # swapoff -av + swapoff /swap + + # for i in {1..1000}; do ./bad; done \ + | cut -d: -f2 | sort | uniq -c + 4000 0x79 + +Ceph/TCMalloc: +============= + +For documentation purposes, the use case driving the analysis/fix is Ceph +on Ubuntu 18.04, as the TCMalloc library there still uses MADV_FREE to +release unused memory to the system from the mmap'ed page heap (might be +committed back/used again; it's not munmap'ed.) - PageHeap::DecommitSpan() +-> TCMalloc_SystemRelease() -> madvise() - PageHeap::CommitSpan() -> +TCMalloc_SystemCommit() -> do nothing. + +Note: TCMalloc switched back to MADV_DONTNEED a few commits after the +release in Ubuntu 18.04 (google-perftools/gperftools 2.5), so the issue +just 'disappeared' on Ceph on later Ubuntu releases but is still present +in the kernel, and can be hit by other use cases. + +The observed issue seems to be the old Ceph bug #22464 [1], where checksum +mismatches are observed (and instrumentation with buffer dumps shows +zero-pages read from mmap'ed/MADV_FREE'd page ranges). + +The issue in Ceph was reasonably deemed a kernel bug (comment #50) and +mostly worked around with a retry mechanism, but other parts of Ceph could +still hit that (rocksdb). Anyway, it's less likely to be hit again as +TCMalloc switched out of MADV_FREE by default. + +(Some kernel versions/reports from the Ceph bug, and relation with +the MADV_FREE introduction/changes; TCMalloc versions not checked.) +- 4.4 good +- 4.5 (madv_free: introduction) +- 4.9 bad +- 4.10 good? maybe a swapless system +- 4.12 (madv_free: no longer free instantly on swapless systems) +- 4.13 bad + +[1] https://tracker.ceph.com/issues/22464 + +Thanks: +====== + +Several people contributed to analysis/discussions/tests/reproducers in +the first stages when drilling down on ceph/tcmalloc/linux kernel: + +- Dan Hill +- Dan Streetman +- Dongdong Tao +- Gavin Guo +- Gerald Yang +- Heitor Alves de Siqueira +- Ioanna Alifieraki +- Jay Vosburgh +- Matthew Ruffell +- Ponnuvel Palaniyappan + +Reviews, suggestions, corrections, comments: + +- Minchan Kim +- Yu Zhao +- Huang, Ying +- John Hubbard +- Christoph Hellwig + +[mfo@canonical.com: v4] + Link: https://lkml.kernel.org/r/20220209202659.183418-1-mfo@canonical.comLink: https://lkml.kernel.org/r/20220131230255.789059-1-mfo@canonical.com + +Fixes: 802a3a92ad7a ("mm: reclaim MADV_FREE pages") +Signed-off-by: Mauricio Faria de Oliveira +Reviewed-by: "Huang, Ying" +Cc: Minchan Kim +Cc: Yu Zhao +Cc: Yang Shi +Cc: Miaohe Lin +Cc: Dan Hill +Cc: Dan Streetman +Cc: Dongdong Tao +Cc: Gavin Guo +Cc: Gerald Yang +Cc: Heitor Alves de Siqueira +Cc: Ioanna Alifieraki +Cc: Jay Vosburgh +Cc: Matthew Ruffell +Cc: Ponnuvel Palaniyappan +Cc: +Cc: Christoph Hellwig +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +[mfo: backport: replace folio/test_flag with page/flag equivalents; + real Fixes: 854e9ed09ded ("mm: support madvise(MADV_FREE)") in v4.] +Signed-off-by: Mauricio Faria de Oliveira +Signed-off-by: Sasha Levin +--- + mm/rmap.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/mm/rmap.c b/mm/rmap.c +index 6aebd1747251..3e340ee380cb 100644 +--- a/mm/rmap.c ++++ b/mm/rmap.c +@@ -1570,7 +1570,30 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, + + /* MADV_FREE page check */ + if (!PageSwapBacked(page)) { +- if (!PageDirty(page)) { ++ int ref_count, map_count; ++ ++ /* ++ * Synchronize with gup_pte_range(): ++ * - clear PTE; barrier; read refcount ++ * - inc refcount; barrier; read PTE ++ */ ++ smp_mb(); ++ ++ ref_count = page_ref_count(page); ++ map_count = page_mapcount(page); ++ ++ /* ++ * Order reads for page refcount and dirty flag ++ * (see comments in __remove_mapping()). ++ */ ++ smp_rmb(); ++ ++ /* ++ * The only page refs must be one from isolation ++ * plus the rmap(s) (dropped by discard:). ++ */ ++ if (ref_count == 1 + map_count && ++ !PageDirty(page)) { + /* Invalidate as we cleared the pte */ + mmu_notifier_invalidate_range(mm, + address, address + PAGE_SIZE); +-- +2.35.1 + diff --git a/queue-5.15/mt76-dma-initialize-skip_unmap-in-mt76_dma_rx_fill.patch b/queue-5.15/mt76-dma-initialize-skip_unmap-in-mt76_dma_rx_fill.patch new file mode 100644 index 00000000000..90ed863a1d1 --- /dev/null +++ b/queue-5.15/mt76-dma-initialize-skip_unmap-in-mt76_dma_rx_fill.patch @@ -0,0 +1,89 @@ +From 7f0fc5b7a894f2f301885fdf7f99bb556282cc51 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Feb 2022 12:29:55 +0100 +Subject: mt76: dma: initialize skip_unmap in mt76_dma_rx_fill + +From: Lorenzo Bianconi + +[ Upstream commit 577298ec55dfc8b9aece54520f0258c3f93a6573 ] + +Even if it is only a false-positive since skip_buf0/skip_buf1 are only +used in mt76_dma_tx_cleanup_idx routine, initialize skip_unmap in +mt76_dma_rx_fill in order to fix the following UBSAN report: + +[ 13.924906] UBSAN: invalid-load in linux-5.15.0/drivers/net/wireless/mediatek/mt76/dma.c:162:13 +[ 13.924909] load of value 225 is not a valid value for type '_Bool' +[ 13.924912] CPU: 9 PID: 672 Comm: systemd-udevd Not tainted 5.15.0-18-generic #18-Ubuntu +[ 13.924914] Hardware name: LENOVO 21A0000CMX/21A0000CMX, BIOS R1MET43W (1.13 ) 11/05/2021 +[ 13.924915] Call Trace: +[ 13.924917] +[ 13.924920] show_stack+0x52/0x58 +[ 13.924925] dump_stack_lvl+0x4a/0x5f +[ 13.924931] dump_stack+0x10/0x12 +[ 13.924932] ubsan_epilogue+0x9/0x45 +[ 13.924934] __ubsan_handle_load_invalid_value.cold+0x44/0x49 +[ 13.924935] ? __iommu_dma_map+0x84/0xf0 +[ 13.924939] mt76_dma_add_buf.constprop.0.cold+0x23/0x85 [mt76] +[ 13.924949] mt76_dma_rx_fill.isra.0+0x102/0x1f0 [mt76] +[ 13.924954] mt76_dma_init+0xc9/0x150 [mt76] +[ 13.924959] ? mt7921_dma_enable+0x110/0x110 [mt7921e] +[ 13.924966] mt7921_dma_init+0x1e3/0x260 [mt7921e] +[ 13.924970] mt7921_register_device+0x29d/0x510 [mt7921e] +[ 13.924975] mt7921_pci_probe.part.0+0x17f/0x1b0 [mt7921e] +[ 13.924980] mt7921_pci_probe+0x43/0x60 [mt7921e] +[ 13.924984] local_pci_probe+0x4b/0x90 +[ 13.924987] pci_device_probe+0x115/0x1f0 +[ 13.924989] really_probe+0x21e/0x420 +[ 13.924992] __driver_probe_device+0x115/0x190 +[ 13.924994] driver_probe_device+0x23/0xc0 +[ 13.924996] __driver_attach+0xbd/0x1d0 +[ 13.924998] ? __device_attach_driver+0x110/0x110 +[ 13.924999] bus_for_each_dev+0x7e/0xc0 +[ 13.925001] driver_attach+0x1e/0x20 +[ 13.925003] bus_add_driver+0x135/0x200 +[ 13.925005] driver_register+0x95/0xf0 +[ 13.925008] ? 0xffffffffc0766000 +[ 13.925010] __pci_register_driver+0x68/0x70 +[ 13.925011] mt7921_pci_driver_init+0x23/0x1000 [mt7921e] +[ 13.925015] do_one_initcall+0x48/0x1d0 +[ 13.925019] ? kmem_cache_alloc_trace+0x19e/0x2e0 +[ 13.925022] do_init_module+0x62/0x280 +[ 13.925025] load_module+0xac9/0xbb0 +[ 13.925027] __do_sys_finit_module+0xbf/0x120 +[ 13.925029] __x64_sys_finit_module+0x18/0x20 +[ 13.925030] do_syscall_64+0x5c/0xc0 +[ 13.925033] ? do_syscall_64+0x69/0xc0 +[ 13.925034] ? sysvec_reschedule_ipi+0x78/0xe0 +[ 13.925036] ? asm_sysvec_reschedule_ipi+0xa/0x20 +[ 13.925039] entry_SYSCALL_64_after_hwframe+0x44/0xae +[ 13.925040] RIP: 0033:0x7fbf2b90f94d +[ 13.925045] RSP: 002b:00007ffe2ec7e5d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 +[ 13.925047] RAX: ffffffffffffffda RBX: 000056106b0634e0 RCX: 00007fbf2b90f94d +[ 13.925048] RDX: 0000000000000000 RSI: 00007fbf2baa3441 RDI: 0000000000000013 +[ 13.925049] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000002 +[ 13.925050] R10: 0000000000000013 R11: 0000000000000246 R12: 00007fbf2baa3441 +[ 13.925051] R13: 000056106b062620 R14: 000056106b0610c0 R15: 000056106b0640d0 +[ 13.925053] + +Signed-off-by: Lorenzo Bianconi +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/dma.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c +index 5e1c1506a4c6..7aecde35cb9a 100644 +--- a/drivers/net/wireless/mediatek/mt76/dma.c ++++ b/drivers/net/wireless/mediatek/mt76/dma.c +@@ -465,6 +465,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) + + qbuf.addr = addr + offset; + qbuf.len = len - offset; ++ qbuf.skip_unmap = false; + mt76_dma_add_buf(dev, q, &qbuf, 1, 0, buf, NULL); + frames++; + } +-- +2.35.1 + diff --git a/queue-5.15/mt76-fix-monitor-mode-crash-with-sdio-driver.patch b/queue-5.15/mt76-fix-monitor-mode-crash-with-sdio-driver.patch new file mode 100644 index 00000000000..fc520deba17 --- /dev/null +++ b/queue-5.15/mt76-fix-monitor-mode-crash-with-sdio-driver.patch @@ -0,0 +1,55 @@ +From 7b7207cc7c98dc5a6e0b849e6dc7fa917c5b0a02 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Mar 2022 22:54:05 +0800 +Subject: mt76: fix monitor mode crash with sdio driver + +From: Deren Wu + +[ Upstream commit 123bc712b1de0805f9d683687e17b1ec2aba0b68 ] + +mt7921s driver may receive frames with fragment buffers. If there is a +CTS packet received in monitor mode, the payload is 10 bytes only and +need 6 bytes header padding after RXD buffer. However, only RXD in the +first linear buffer, if we pull buffer size RXD-size+6 bytes with +skb_pull(), that would trigger "BUG_ON(skb->len < skb->data_len)" in +__skb_pull(). + +To avoid the nonlinear buffer issue, enlarge the RXD size from 128 to +256 to make sure all MCU operation in linear buffer. + +[ 52.007562] kernel BUG at include/linux/skbuff.h:2313! +[ 52.007578] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP +[ 52.007987] pc : skb_pull+0x48/0x4c +[ 52.008015] lr : mt7921_queue_rx_skb+0x494/0x890 [mt7921_common] +[ 52.008361] Call trace: +[ 52.008377] skb_pull+0x48/0x4c +[ 52.008400] mt76s_net_worker+0x134/0x1b0 [mt76_sdio 35339a92c6eb7d4bbcc806a1d22f56365565135c] +[ 52.008431] __mt76_worker_fn+0xe8/0x170 [mt76 ef716597d11a77150bc07e3fdd68eeb0f9b56917] +[ 52.008449] kthread+0x148/0x3ac +[ 52.008466] ret_from_fork+0x10/0x30 + +Signed-off-by: Lorenzo Bianconi +Signed-off-by: Sean Wang +Signed-off-by: Deren Wu +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h +index 4d01fd85283d..6e4d69715927 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt76.h ++++ b/drivers/net/wireless/mediatek/mt76/mt76.h +@@ -19,7 +19,7 @@ + + #define MT_MCU_RING_SIZE 32 + #define MT_RX_BUF_SIZE 2048 +-#define MT_SKB_HEAD_LEN 128 ++#define MT_SKB_HEAD_LEN 256 + + #define MT_MAX_NON_AQL_PKT 16 + #define MT_TXQ_FREE_THR 32 +-- +2.35.1 + diff --git a/queue-5.15/mt76-mt7615-fix-assigning-negative-values-to-unsigne.patch b/queue-5.15/mt76-mt7615-fix-assigning-negative-values-to-unsigne.patch new file mode 100644 index 00000000000..f5cc0f894cc --- /dev/null +++ b/queue-5.15/mt76-mt7615-fix-assigning-negative-values-to-unsigne.patch @@ -0,0 +1,41 @@ +From b3f14e41398b5585c46a7f0052245b0061f9f37c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Feb 2022 09:58:21 +0800 +Subject: mt76: mt7615: Fix assigning negative values to unsigned variable + +From: Yang Li + +[ Upstream commit 9273ffcc9a11942bd586bb42584337ef3962b692 ] + +Smatch reports the following: +drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 +mt7615_mac_adjust_sensitivity() warn: assigning (-110) to unsigned +variable 'def_th' +drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 +mt7615_mac_adjust_sensitivity() warn: assigning (-98) to unsigned +variable 'def_th' + +Reported-by: Abaci Robot +Signed-off-by: Yang Li +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +index eb7bda91f2b3..8f4a5d4929e0 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +@@ -1732,7 +1732,7 @@ mt7615_mac_adjust_sensitivity(struct mt7615_phy *phy, + struct mt7615_dev *dev = phy->dev; + int false_cca = ofdm ? phy->false_cca_ofdm : phy->false_cca_cck; + bool ext_phy = phy != &dev->phy; +- u16 def_th = ofdm ? -98 : -110; ++ s16 def_th = ofdm ? -98 : -110; + bool update = false; + s8 *sensitivity; + int signal; +-- +2.35.1 + diff --git a/queue-5.15/mt76-mt7915-fix-injected-mpdu-transmission-to-not-us.patch b/queue-5.15/mt76-mt7915-fix-injected-mpdu-transmission-to-not-us.patch new file mode 100644 index 00000000000..7d03b69dd62 --- /dev/null +++ b/queue-5.15/mt76-mt7915-fix-injected-mpdu-transmission-to-not-us.patch @@ -0,0 +1,48 @@ +From ecb9395440348c45c4be1e59a26bc0cf143a3314 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 16:47:30 +0100 +Subject: mt76: mt7915: fix injected MPDU transmission to not use HW A-MSDU + +From: Johan Almbladh + +[ Upstream commit 28225a6ef80ebf46c46e5fbd5b1ee231a0b2b5b7 ] + +Before, the hardware would be allowed to transmit injected 802.11 MPDUs +as A-MSDU. This resulted in corrupted frames being transmitted. Now, +injected MPDUs are transmitted as-is, without A-MSDU. + +The fix was verified with frame injection on MT7915 hardware, both with +and without the injected frame being encrypted. + +If the hardware cannot do A-MSDU aggregation on MPDUs, this problem +would also be present in the TX path where mac80211 does the 802.11 +encapsulation. However, I have not observed any such problem when +disabling IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD to force that mode. +Therefore this fix is isolated to injected frames only. + +The same A-MSDU logic is also present in the mt7921 driver, so it is +likely that this fix should be applied there too. I do not have access +to mt7921 hardware so I have not been able to test that. + +Signed-off-by: Johan Almbladh +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +index ff613d705611..7691292526e0 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +@@ -899,6 +899,7 @@ mt7915_mac_write_txwi_80211(struct mt7915_dev *dev, __le32 *txwi, + val = MT_TXD3_SN_VALID | + FIELD_PREP(MT_TXD3_SEQ, IEEE80211_SEQ_TO_SN(seqno)); + txwi[3] |= cpu_to_le32(val); ++ txwi[7] &= ~cpu_to_le32(MT_TXD7_HW_AMSDU); + } + + val = FIELD_PREP(MT_TXD7_TYPE, fc_type) | +-- +2.35.1 + diff --git a/queue-5.15/mt76-mt7921-fix-crash-when-startup-fails.patch b/queue-5.15/mt76-mt7921-fix-crash-when-startup-fails.patch new file mode 100644 index 00000000000..7869826dfdd --- /dev/null +++ b/queue-5.15/mt76-mt7921-fix-crash-when-startup-fails.patch @@ -0,0 +1,41 @@ +From 5ae918533e8ee3d5c11d5d5370c327dd43ebf3a3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 8 Jan 2022 11:08:14 -0800 +Subject: mt76: mt7921: fix crash when startup fails. + +From: Ben Greear + +[ Upstream commit 827e7799c61b978fbc2cc9dac66cb62401b2b3f0 ] + +If the nic fails to start, it is possible that the +reset_work has already been scheduled. Ensure the +work item is canceled so we do not have use-after-free +crash in case cleanup is called before the work item +is executed. + +This fixes crash on my x86_64 apu2 when mt7921k radio +fails to work. Radio still fails, but OS does not +crash. + +Signed-off-by: Ben Greear +Signed-off-by: Felix Fietkau +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c +index 9eb90e6f0103..30252f408ddc 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c +@@ -224,6 +224,7 @@ static void mt7921_stop(struct ieee80211_hw *hw) + + cancel_delayed_work_sync(&dev->pm.ps_work); + cancel_work_sync(&dev->pm.wake_work); ++ cancel_work_sync(&dev->reset_work); + mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); + + mt7921_mutex_acquire(dev); +-- +2.35.1 + diff --git a/queue-5.15/nbd-add-error-handling-support-for-add_disk.patch b/queue-5.15/nbd-add-error-handling-support-for-add_disk.patch new file mode 100644 index 00000000000..21162ea734a --- /dev/null +++ b/queue-5.15/nbd-add-error-handling-support-for-add_disk.patch @@ -0,0 +1,49 @@ +From 96000b12aeb2e0969783d891a3f7d96a5f42283a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Sep 2021 14:59:58 -0700 +Subject: nbd: add error handling support for add_disk() + +From: Luis Chamberlain + +[ Upstream commit e1654f413fe08ffbc3292d8d2b8958b2cc5cb5e8 ] + +We never checked for errors on add_disk() as this function +returned void. Now that this is fixed, use the shiny new +error handling. + +Reviewed-by: Christoph Hellwig +Reviewed-by: Hannes Reinecke +Signed-off-by: Luis Chamberlain +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/nbd.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c +index 577c7dba5d78..946fdc1734f4 100644 +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -1762,7 +1762,9 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + disk->fops = &nbd_fops; + disk->private_data = nbd; + sprintf(disk->disk_name, "nbd%d", index); +- add_disk(disk); ++ err = add_disk(disk); ++ if (err) ++ goto out_err_disk; + + /* + * Now publish the device. +@@ -1771,6 +1773,8 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + nbd_total_devices++; + return nbd; + ++out_err_disk: ++ blk_cleanup_disk(disk); + out_free_idr: + mutex_lock(&nbd_index_mutex); + idr_remove(&nbd_index_idr, index); +-- +2.35.1 + diff --git a/queue-5.15/nbd-fix-hungtask-when-nbd_config_put.patch b/queue-5.15/nbd-fix-hungtask-when-nbd_config_put.patch new file mode 100644 index 00000000000..16fb3bde42a --- /dev/null +++ b/queue-5.15/nbd-fix-hungtask-when-nbd_config_put.patch @@ -0,0 +1,175 @@ +From b6dcb0eff7f39d91eadc39e8f941520ce96449ed Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Nov 2021 09:52:37 +0800 +Subject: nbd: Fix hungtask when nbd_config_put + +From: Ye Bin + +[ Upstream commit e2daec488c57069a4a431d5b752f50294c4bf273 ] + +I got follow issue: +[ 247.381177] INFO: task kworker/u10:0:47 blocked for more than 120 seconds. +[ 247.382644] Not tainted 4.19.90-dirty #140 +[ 247.383502] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +[ 247.385027] Call Trace: +[ 247.388384] schedule+0xb8/0x3c0 +[ 247.388966] schedule_timeout+0x2b4/0x380 +[ 247.392815] wait_for_completion+0x367/0x510 +[ 247.397713] flush_workqueue+0x32b/0x1340 +[ 247.402700] drain_workqueue+0xda/0x3c0 +[ 247.403442] destroy_workqueue+0x7b/0x690 +[ 247.405014] nbd_config_put.cold+0x2f9/0x5b6 +[ 247.405823] recv_work+0x1fd/0x2b0 +[ 247.406485] process_one_work+0x70b/0x1610 +[ 247.407262] worker_thread+0x5a9/0x1060 +[ 247.408699] kthread+0x35e/0x430 +[ 247.410918] ret_from_fork+0x1f/0x30 + +We can reproduce issue as follows: +1. Inject memory fault in nbd_start_device +-1244,10 +1248,18 @@ static int nbd_start_device(struct nbd_device *nbd) + nbd_dev_dbg_init(nbd); + for (i = 0; i < num_connections; i++) { + struct recv_thread_args *args; +- +- args = kzalloc(sizeof(*args), GFP_KERNEL); ++ ++ if (i == 1) { ++ args = NULL; ++ printk("%s: inject malloc error\n", __func__); ++ } ++ else ++ args = kzalloc(sizeof(*args), GFP_KERNEL); +2. Inject delay in recv_work +-757,6 +760,8 @@ static void recv_work(struct work_struct *work) + + blk_mq_complete_request(blk_mq_rq_from_pdu(cmd)); + } ++ printk("%s: comm=%s pid=%d\n", __func__, current->comm, current->pid); ++ mdelay(5 * 1000); + nbd_config_put(nbd); + atomic_dec(&config->recv_threads); + wake_up(&config->recv_wq); +3. Create nbd server +nbd-server 8000 /tmp/disk +4. Create nbd client +nbd-client localhost 8000 /dev/nbd1 +Then will trigger above issue. + +Reason is when add delay in recv_work, lead to release the last reference +of 'nbd->config_refs'. nbd_config_put will call flush_workqueue to make +all work finish. Obviously, it will lead to deadloop. +To solve this issue, according to Josef's suggestion move 'recv_work' +init from start device to nbd_dev_add, then destroy 'recv_work'when +nbd device teardown. + +Signed-off-by: Ye Bin +Reviewed-by: Josef Bacik +Link: https://lore.kernel.org/r/20211102015237.2309763-5-yebin10@huawei.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/nbd.c | 36 ++++++++++++++++-------------------- + 1 file changed, 16 insertions(+), 20 deletions(-) + +diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c +index 4ae6c221b36d..582b23befb5c 100644 +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -254,7 +254,7 @@ static void nbd_dev_remove(struct nbd_device *nbd) + mutex_lock(&nbd_index_mutex); + idr_remove(&nbd_index_idr, nbd->index); + mutex_unlock(&nbd_index_mutex); +- ++ destroy_workqueue(nbd->recv_workq); + kfree(nbd); + } + +@@ -1260,10 +1260,6 @@ static void nbd_config_put(struct nbd_device *nbd) + kfree(nbd->config); + nbd->config = NULL; + +- if (nbd->recv_workq) +- destroy_workqueue(nbd->recv_workq); +- nbd->recv_workq = NULL; +- + nbd->tag_set.timeout = 0; + nbd->disk->queue->limits.discard_granularity = 0; + nbd->disk->queue->limits.discard_alignment = 0; +@@ -1292,14 +1288,6 @@ static int nbd_start_device(struct nbd_device *nbd) + return -EINVAL; + } + +- nbd->recv_workq = alloc_workqueue("knbd%d-recv", +- WQ_MEM_RECLAIM | WQ_HIGHPRI | +- WQ_UNBOUND, 0, nbd->index); +- if (!nbd->recv_workq) { +- dev_err(disk_to_dev(nbd->disk), "Could not allocate knbd recv work queue.\n"); +- return -ENOMEM; +- } +- + blk_mq_update_nr_hw_queues(&nbd->tag_set, config->num_connections); + nbd->pid = task_pid_nr(current); + +@@ -1725,6 +1713,15 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + } + nbd->disk = disk; + ++ nbd->recv_workq = alloc_workqueue("nbd%d-recv", ++ WQ_MEM_RECLAIM | WQ_HIGHPRI | ++ WQ_UNBOUND, 0, nbd->index); ++ if (!nbd->recv_workq) { ++ dev_err(disk_to_dev(nbd->disk), "Could not allocate knbd recv work queue.\n"); ++ err = -ENOMEM; ++ goto out_err_disk; ++ } ++ + /* + * Tell the block layer that we are not a rotational device + */ +@@ -1755,7 +1752,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + disk->first_minor = index << part_shift; + if (disk->first_minor < index || disk->first_minor > MINORMASK) { + err = -EINVAL; +- goto out_err_disk; ++ goto out_free_work; + } + + disk->minors = 1 << part_shift; +@@ -1764,7 +1761,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + sprintf(disk->disk_name, "nbd%d", index); + err = add_disk(disk); + if (err) +- goto out_err_disk; ++ goto out_free_work; + + /* + * Now publish the device. +@@ -1773,6 +1770,8 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + nbd_total_devices++; + return nbd; + ++out_free_work: ++ destroy_workqueue(nbd->recv_workq); + out_err_disk: + blk_cleanup_disk(disk); + out_free_idr: +@@ -2028,13 +2027,10 @@ static void nbd_disconnect_and_put(struct nbd_device *nbd) + nbd_disconnect(nbd); + sock_shutdown(nbd); + /* +- * Make sure recv thread has finished, so it does not drop the last +- * config ref and try to destroy the workqueue from inside the work +- * queue. And this also ensure that we can safely call nbd_clear_que() ++ * Make sure recv thread has finished, we can safely call nbd_clear_que() + * to cancel the inflight I/Os. + */ +- if (nbd->recv_workq) +- flush_workqueue(nbd->recv_workq); ++ flush_workqueue(nbd->recv_workq); + nbd_clear_que(nbd); + nbd->task_setup = NULL; + mutex_unlock(&nbd->config_lock); +-- +2.35.1 + diff --git a/queue-5.15/nbd-fix-incorrect-error-handle-when-first_minor-is-i.patch b/queue-5.15/nbd-fix-incorrect-error-handle-when-first_minor-is-i.patch new file mode 100644 index 00000000000..1e72452f8e4 --- /dev/null +++ b/queue-5.15/nbd-fix-incorrect-error-handle-when-first_minor-is-i.patch @@ -0,0 +1,39 @@ +From a40fe830a75e911e7e21733b4e6256a61d3f61b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 2 Nov 2021 09:52:36 +0800 +Subject: nbd: Fix incorrect error handle when first_minor is illegal in + nbd_dev_add + +From: Ye Bin + +[ Upstream commit 69beb62ff0d1723a750eebe1c4d01da573d7cd19 ] + +If first_minor is illegal will goto out_free_idr label, this will miss +cleanup disk. + +Fixes: b1a811633f73 ("block: nbd: add sanity check for first_minor") +Signed-off-by: Ye Bin +Reviewed-by: Josef Bacik +Link: https://lore.kernel.org/r/20211102015237.2309763-4-yebin10@huawei.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/nbd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c +index 946fdc1734f4..4ae6c221b36d 100644 +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -1755,7 +1755,7 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + disk->first_minor = index << part_shift; + if (disk->first_minor < index || disk->first_minor > MINORMASK) { + err = -EINVAL; +- goto out_free_idr; ++ goto out_err_disk; + } + + disk->minors = 1 << part_shift; +-- +2.35.1 + diff --git a/queue-5.15/nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_.patch b/queue-5.15/nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_.patch new file mode 100644 index 00000000000..c0ec38f202e --- /dev/null +++ b/queue-5.15/nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_.patch @@ -0,0 +1,72 @@ +From 538fe1a9983059ea9e7cf6ca67053191fe2ed09d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Mar 2022 17:32:24 +0800 +Subject: nbd: fix possible overflow on 'first_minor' in nbd_dev_add() + +From: Zhang Wensheng + +[ Upstream commit 6d35d04a9e18990040e87d2bbf72689252669d54 ] + +When 'index' is a big numbers, it may become negative which forced +to 'int'. then 'index << part_shift' might overflow to a positive +value that is not greater than '0xfffff', then sysfs might complains +about duplicate creation. Because of this, move the 'index' judgment +to the front will fix it and be better. + +Fixes: b0d9111a2d53 ("nbd: use an idr to keep track of nbd devices") +Fixes: 940c264984fd ("nbd: fix possible overflow for 'first_minor' in nbd_dev_add()") +Signed-off-by: Zhang Wensheng +Reviewed-by: Josef Bacik +Link: https://lore.kernel.org/r/20220310093224.4002895-1-zhangwensheng5@huawei.com +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/nbd.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c +index 582b23befb5c..1c62262304be 100644 +--- a/drivers/block/nbd.c ++++ b/drivers/block/nbd.c +@@ -1744,17 +1744,6 @@ static struct nbd_device *nbd_dev_add(int index, unsigned int refs) + refcount_set(&nbd->refs, 0); + INIT_LIST_HEAD(&nbd->list); + disk->major = NBD_MAJOR; +- +- /* Too big first_minor can cause duplicate creation of +- * sysfs files/links, since index << part_shift might overflow, or +- * MKDEV() expect that the max bits of first_minor is 20. +- */ +- disk->first_minor = index << part_shift; +- if (disk->first_minor < index || disk->first_minor > MINORMASK) { +- err = -EINVAL; +- goto out_free_work; +- } +- + disk->minors = 1 << part_shift; + disk->fops = &nbd_fops; + disk->private_data = nbd; +@@ -1859,8 +1848,19 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) + if (!netlink_capable(skb, CAP_SYS_ADMIN)) + return -EPERM; + +- if (info->attrs[NBD_ATTR_INDEX]) ++ if (info->attrs[NBD_ATTR_INDEX]) { + index = nla_get_u32(info->attrs[NBD_ATTR_INDEX]); ++ ++ /* ++ * Too big first_minor can cause duplicate creation of ++ * sysfs files/links, since index << part_shift might overflow, or ++ * MKDEV() expect that the max bits of first_minor is 20. ++ */ ++ if (index < 0 || index > MINORMASK >> part_shift) { ++ printk(KERN_ERR "nbd: illegal input index %d\n", index); ++ return -EINVAL; ++ } ++ } + if (!info->attrs[NBD_ATTR_SOCKETS]) { + printk(KERN_ERR "nbd: must specify at least one socket\n"); + return -EINVAL; +-- +2.35.1 + diff --git a/queue-5.15/net-account-alternate-interface-name-memory.patch b/queue-5.15/net-account-alternate-interface-name-memory.patch new file mode 100644 index 00000000000..7567e2f3264 --- /dev/null +++ b/queue-5.15/net-account-alternate-interface-name-memory.patch @@ -0,0 +1,35 @@ +From ee1d2f9fcf6b45b18097eada1e86724096d3cc2c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Mar 2022 10:29:13 -0800 +Subject: net: account alternate interface name memory + +From: Jakub Kicinski + +[ Upstream commit 5d26cff5bdbebdf98ba48217c078ff102536f134 ] + +George reports that altnames can eat up kernel memory. +We should charge that memory appropriately. + +Reported-by: George Shuklin +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/core/rtnetlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c +index 91d7a5a5a08d..a8c319dc224a 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -3637,7 +3637,7 @@ static int rtnl_alt_ifname(int cmd, struct net_device *dev, struct nlattr *attr, + if (err) + return err; + +- alt_ifname = nla_strdup(attr, GFP_KERNEL); ++ alt_ifname = nla_strdup(attr, GFP_KERNEL_ACCOUNT); + if (!alt_ifname) + return -ENOMEM; + +-- +2.35.1 + diff --git a/queue-5.15/net-initialize-init_net-earlier.patch b/queue-5.15/net-initialize-init_net-earlier.patch new file mode 100644 index 00000000000..4f03aa3e305 --- /dev/null +++ b/queue-5.15/net-initialize-init_net-earlier.patch @@ -0,0 +1,152 @@ +From 0cc0baf673477334482eb09f62dd5c8c211c95df Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 5 Feb 2022 09:01:25 -0800 +Subject: net: initialize init_net earlier + +From: Eric Dumazet + +[ Upstream commit 9c1be1935fb68b2413796cdc03d019b8cf35ab51 ] + +While testing a patch that will follow later +("net: add netns refcount tracker to struct nsproxy") +I found that devtmpfs_init() was called before init_net +was initialized. + +This is a bug, because devtmpfs_setup() calls +ksys_unshare(CLONE_NEWNS); + +This has the effect of increasing init_net refcount, +which will be later overwritten to 1, as part of setup_net(&init_net) + +We had too many prior patches [1] trying to work around the root cause. + +Really, make sure init_net is in BSS section, and that net_ns_init() +is called earlier at boot time. + +Note that another patch ("vfs: add netns refcount tracker +to struct fs_context") also will need net_ns_init() being called +before vfs_caches_init() + +As a bonus, this patch saves around 4KB in .data section. + +[1] + +f8c46cb39079 ("netns: do not call pernet ops for not yet set up init_net namespace") +b5082df8019a ("net: Initialise init_net.count to 1") +734b65417b24 ("net: Statically initialize init_net.dev_base_head") + +v2: fixed a build error reported by kernel build bots (CONFIG_NET=n) + +Signed-off-by: Eric Dumazet +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/net_namespace.h | 6 ++++++ + init/main.c | 2 ++ + net/core/dev.c | 3 +-- + net/core/net_namespace.c | 17 +++++------------ + 4 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h +index bb5fa5914032..2ba326f9e004 100644 +--- a/include/net/net_namespace.h ++++ b/include/net/net_namespace.h +@@ -479,4 +479,10 @@ static inline void fnhe_genid_bump(struct net *net) + atomic_inc(&net->fnhe_genid); + } + ++#ifdef CONFIG_NET ++void net_ns_init(void); ++#else ++static inline void net_ns_init(void) {} ++#endif ++ + #endif /* __NET_NET_NAMESPACE_H */ +diff --git a/init/main.c b/init/main.c +index bcd132d4e7bd..b340d990d77c 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -100,6 +100,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -1122,6 +1123,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) + key_init(); + security_init(); + dbg_late_init(); ++ net_ns_init(); + vfs_caches_init(); + pagecache_init(); + signals_init(); +diff --git a/net/core/dev.c b/net/core/dev.c +index 33dc2a3ff7d7..804aba2228c2 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -11378,8 +11378,7 @@ static int __net_init netdev_init(struct net *net) + BUILD_BUG_ON(GRO_HASH_BUCKETS > + 8 * sizeof_field(struct napi_struct, gro_bitmask)); + +- if (net != &init_net) +- INIT_LIST_HEAD(&net->dev_base_head); ++ INIT_LIST_HEAD(&net->dev_base_head); + + net->dev_name_head = netdev_create_hash(); + if (net->dev_name_head == NULL) +diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c +index 9702d2b0d920..9745cb6fdf51 100644 +--- a/net/core/net_namespace.c ++++ b/net/core/net_namespace.c +@@ -44,13 +44,7 @@ EXPORT_SYMBOL_GPL(net_rwsem); + static struct key_tag init_net_key_domain = { .usage = REFCOUNT_INIT(1) }; + #endif + +-struct net init_net = { +- .ns.count = REFCOUNT_INIT(1), +- .dev_base_head = LIST_HEAD_INIT(init_net.dev_base_head), +-#ifdef CONFIG_KEYS +- .key_domain = &init_net_key_domain, +-#endif +-}; ++struct net init_net; + EXPORT_SYMBOL(init_net); + + static bool init_net_initialized; +@@ -1081,7 +1075,7 @@ static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid, + rtnl_set_sk_err(net, RTNLGRP_NSID, err); + } + +-static int __init net_ns_init(void) ++void __init net_ns_init(void) + { + struct net_generic *ng; + +@@ -1102,6 +1096,9 @@ static int __init net_ns_init(void) + + rcu_assign_pointer(init_net.gen, ng); + ++#ifdef CONFIG_KEYS ++ init_net.key_domain = &init_net_key_domain; ++#endif + down_write(&pernet_ops_rwsem); + if (setup_net(&init_net, &init_user_ns)) + panic("Could not setup the initial network namespace"); +@@ -1116,12 +1113,8 @@ static int __init net_ns_init(void) + RTNL_FLAG_DOIT_UNLOCKED); + rtnl_register(PF_UNSPEC, RTM_GETNSID, rtnl_net_getid, rtnl_net_dumpid, + RTNL_FLAG_DOIT_UNLOCKED); +- +- return 0; + } + +-pure_initcall(net_ns_init); +- + static void free_exit_list(struct pernet_operations *ops, struct list_head *net_exit_list) + { + ops_pre_exit_list(ops, net_exit_list); +-- +2.35.1 + diff --git a/queue-5.15/net-limit-altnames-to-64k-total.patch b/queue-5.15/net-limit-altnames-to-64k-total.patch new file mode 100644 index 00000000000..14b0f48cc2a --- /dev/null +++ b/queue-5.15/net-limit-altnames-to-64k-total.patch @@ -0,0 +1,57 @@ +From 012775fad5ad378eb8ed1eba86fa2d8438a6ce0d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Mar 2022 10:29:14 -0800 +Subject: net: limit altnames to 64k total + +From: Jakub Kicinski + +[ Upstream commit 155fb43b70b5fce341347a77d1af2765d1e8fbb8 ] + +Property list (altname is a link "property") is wrapped +in a nlattr. nlattrs length is 16bit so practically +speaking the list of properties can't be longer than +that, otherwise user space would have to interpret +broken netlink messages. + +Prevent the problem from occurring by checking the length +of the property list before adding new entries. + +Reported-by: George Shuklin +Reviewed-by: David Ahern +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/core/rtnetlink.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c +index a8c319dc224a..9c0e8ccf9bc5 100644 +--- a/net/core/rtnetlink.c ++++ b/net/core/rtnetlink.c +@@ -3631,12 +3631,23 @@ static int rtnl_alt_ifname(int cmd, struct net_device *dev, struct nlattr *attr, + bool *changed, struct netlink_ext_ack *extack) + { + char *alt_ifname; ++ size_t size; + int err; + + err = nla_validate(attr, attr->nla_len, IFLA_MAX, ifla_policy, extack); + if (err) + return err; + ++ if (cmd == RTM_NEWLINKPROP) { ++ size = rtnl_prop_list_size(dev); ++ size += nla_total_size(ALTIFNAMSIZ); ++ if (size >= U16_MAX) { ++ NL_SET_ERR_MSG(extack, ++ "effective property list too long"); ++ return -EINVAL; ++ } ++ } ++ + alt_ifname = nla_strdup(attr, GFP_KERNEL_ACCOUNT); + if (!alt_ifname) + return -ENOMEM; +-- +2.35.1 + diff --git a/queue-5.15/net-mlx5e-disable-tx-queues-before-registering-the-n.patch b/queue-5.15/net-mlx5e-disable-tx-queues-before-registering-the-n.patch new file mode 100644 index 00000000000..c8f8c7d73d9 --- /dev/null +++ b/queue-5.15/net-mlx5e-disable-tx-queues-before-registering-the-n.patch @@ -0,0 +1,38 @@ +From 15b4529164e87d05baec9442fc01018ea37a1b85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 Jan 2022 12:52:48 +0200 +Subject: net/mlx5e: Disable TX queues before registering the netdev + +From: Maxim Mikityanskiy + +[ Upstream commit d08c6e2a4d0308a7922d7ef3b1b3af45d4096aad ] + +Normally, the queues are disabled when the channels are deactivated, and +enabled when the channels are activated. However, on register, the +channels are not active, but the queues are enabled by default. This +change fixes it, preventing mlx5e_xmit from running when the channels +are deactivated in the beginning. + +Signed-off-by: Maxim Mikityanskiy +Reviewed-by: Tariq Toukan +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +index f075bb8ccd00..01301bee420c 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +@@ -4914,6 +4914,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof + } + + netif_carrier_off(netdev); ++ netif_tx_disable(netdev); + dev_net_set(netdev, mlx5_core_net(mdev)); + + return netdev; +-- +2.35.1 + diff --git a/queue-5.15/net-mlx5e-remove-overzealous-validations-in-netlink-.patch b/queue-5.15/net-mlx5e-remove-overzealous-validations-in-netlink-.patch new file mode 100644 index 00000000000..1e7b167681b --- /dev/null +++ b/queue-5.15/net-mlx5e-remove-overzealous-validations-in-netlink-.patch @@ -0,0 +1,68 @@ +From b780c3b32cb442058d474c0411d610a3d6abff80 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 Jan 2022 16:28:23 +0200 +Subject: net/mlx5e: Remove overzealous validations in netlink EEPROM query + +From: Gal Pressman + +[ Upstream commit 970adfb76095fa719778d70a6b86030d2feb88dd ] + +Unlike the legacy EEPROM callbacks, when using the netlink EEPROM query +(get_module_eeprom_by_page) the driver should not try to validate the +query parameters, but just perform the read requested by the userspace. + +Recent discussion in the mailing list: +https://lore.kernel.org/netdev/20220120093051.70845141@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net/ + +Signed-off-by: Gal Pressman +Reviewed-by: Ido Schimmel +Reviewed-by: Maxim Mikityanskiy +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + .../net/ethernet/mellanox/mlx5/core/port.c | 23 ------------------- + 1 file changed, 23 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c +index 7b16a1188aab..fd79860de723 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/port.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c +@@ -433,35 +433,12 @@ int mlx5_query_module_eeprom_by_page(struct mlx5_core_dev *dev, + struct mlx5_module_eeprom_query_params *params, + u8 *data) + { +- u8 module_id; + int err; + + err = mlx5_query_module_num(dev, ¶ms->module_number); + if (err) + return err; + +- err = mlx5_query_module_id(dev, params->module_number, &module_id); +- if (err) +- return err; +- +- switch (module_id) { +- case MLX5_MODULE_ID_SFP: +- if (params->page > 0) +- return -EINVAL; +- break; +- case MLX5_MODULE_ID_QSFP: +- case MLX5_MODULE_ID_QSFP28: +- case MLX5_MODULE_ID_QSFP_PLUS: +- if (params->page > 3) +- return -EINVAL; +- break; +- case MLX5_MODULE_ID_DSFP: +- break; +- default: +- mlx5_core_err(dev, "Module ID not recognized: 0x%x\n", module_id); +- return -EINVAL; +- } +- + if (params->i2c_address != MLX5_I2C_ADDR_HIGH && + params->i2c_address != MLX5_I2C_ADDR_LOW) { + mlx5_core_err(dev, "I2C address not recognized: 0x%x\n", params->i2c_address); +-- +2.35.1 + diff --git a/queue-5.15/net-sfp-add-2500base-x-quirk-for-lantech-sfp-module.patch b/queue-5.15/net-sfp-add-2500base-x-quirk-for-lantech-sfp-module.patch new file mode 100644 index 00000000000..3b96c3504ba --- /dev/null +++ b/queue-5.15/net-sfp-add-2500base-x-quirk-for-lantech-sfp-module.patch @@ -0,0 +1,53 @@ +From 693ebfab0f6e2e4d882d97bdb654e3bc19c1c6fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 12 Mar 2022 21:50:14 +0100 +Subject: net: sfp: add 2500base-X quirk for Lantech SFP module + +From: Michael Walle + +[ Upstream commit 00eec9fe4f3b9588b4bfa8ef9dd0aae96407d5d7 ] + +The Lantech 8330-262D-E module is 2500base-X capable, but it reports the +nominal bitrate as 2500MBd instead of 3125MBd. Add a quirk for the +module. + +The following in an EEPROM dump of such a SFP with the serial number +redacted: + +00: 03 04 07 00 00 00 01 20 40 0c 05 01 19 00 00 00 ???...? @????... +10: 1e 0f 00 00 4c 61 6e 74 65 63 68 20 20 20 20 20 ??..Lantech +20: 20 20 20 20 00 00 00 00 38 33 33 30 2d 32 36 32 ....8330-262 +30: 44 2d 45 20 20 20 20 20 56 31 2e 30 03 52 00 cb D-E V1.0?R.? +40: 00 1a 00 00 46 43 XX XX XX XX XX XX XX XX XX XX .?..FCXXXXXXXXXX +50: 20 20 20 20 32 32 30 32 31 34 20 20 68 b0 01 98 220214 h??? +60: 45 58 54 52 45 4d 45 4c 59 20 43 4f 4d 50 41 54 EXTREMELY COMPAT +70: 49 42 4c 45 20 20 20 20 20 20 20 20 20 20 20 20 IBLE + +Signed-off-by: Michael Walle +Link: https://lore.kernel.org/r/20220312205014.4154907-1-michael@walle.cc +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/phy/sfp-bus.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c +index ef2c6a09eb0f..4369d6249e7b 100644 +--- a/drivers/net/phy/sfp-bus.c ++++ b/drivers/net/phy/sfp-bus.c +@@ -74,6 +74,12 @@ static const struct sfp_quirk sfp_quirks[] = { + .vendor = "HUAWEI", + .part = "MA5671A", + .modes = sfp_quirk_2500basex, ++ }, { ++ // Lantech 8330-262D-E can operate at 2500base-X, but ++ // incorrectly report 2500MBd NRZ in their EEPROM ++ .vendor = "Lantech", ++ .part = "8330-262D-E", ++ .modes = sfp_quirk_2500basex, + }, { + .vendor = "UBNT", + .part = "UF-INSTANT", +-- +2.35.1 + diff --git a/queue-5.15/net-smc-correct-settings-of-rmb-window-update-limit.patch b/queue-5.15/net-smc-correct-settings-of-rmb-window-update-limit.patch new file mode 100644 index 00000000000..1162aa53bd3 --- /dev/null +++ b/queue-5.15/net-smc-correct-settings-of-rmb-window-update-limit.patch @@ -0,0 +1,52 @@ +From ccc6b31960b79a46e55b3af6be4ee4a88caa4d04 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Mar 2022 17:44:00 +0800 +Subject: net/smc: correct settings of RMB window update limit + +From: Dust Li + +[ Upstream commit 6bf536eb5c8ca011d1ff57b5c5f7c57ceac06a37 ] + +rmbe_update_limit is used to limit announcing receive +window updating too frequently. RFC7609 request a minimal +increase in the window size of 10% of the receive buffer +space. But current implementation used: + + min_t(int, rmbe_size / 10, SOCK_MIN_SNDBUF / 2) + +and SOCK_MIN_SNDBUF / 2 == 2304 Bytes, which is almost +always less then 10% of the receive buffer space. + +This causes the receiver always sending CDC message to +update its consumer cursor when it consumes more then 2K +of data. And as a result, we may encounter something like +"TCP silly window syndrome" when sending 2.5~8K message. + +This patch fixes this using max(rmbe_size / 10, SOCK_MIN_SNDBUF / 2). + +With this patch and SMC autocorking enabled, qperf 2K/4K/8K +tcp_bw test shows 45%/75%/40% increase in throughput respectively. + +Signed-off-by: Dust Li +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/smc/smc_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c +index dee336eef6d2..7401ec67ebcf 100644 +--- a/net/smc/smc_core.c ++++ b/net/smc/smc_core.c +@@ -1822,7 +1822,7 @@ static struct smc_buf_desc *smc_buf_get_slot(int compressed_bufsize, + */ + static inline int smc_rmb_wnd_update_limit(int rmbe_size) + { +- return min_t(int, rmbe_size / 10, SOCK_MIN_SNDBUF / 2); ++ return max_t(int, rmbe_size / 10, SOCK_MIN_SNDBUF / 2); + } + + /* map an rmb buf to a link */ +-- +2.35.1 + diff --git a/queue-5.15/net-smc-send-directly-when-tcp_cork-is-cleared.patch b/queue-5.15/net-smc-send-directly-when-tcp_cork-is-cleared.patch new file mode 100644 index 00000000000..d68b3d1a153 --- /dev/null +++ b/queue-5.15/net-smc-send-directly-when-tcp_cork-is-cleared.patch @@ -0,0 +1,111 @@ +From 512b4e13bb2926a25d75002892db5f49d5e6712e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 31 Jan 2022 02:02:55 +0800 +Subject: net/smc: Send directly when TCP_CORK is cleared + +From: Tony Lu + +[ Upstream commit ea785a1a573b390a150010b3c5b81e1ccd8c98a8 ] + +According to the man page of TCP_CORK [1], if set, don't send out +partial frames. All queued partial frames are sent when option is +cleared again. + +When applications call setsockopt to disable TCP_CORK, this call is +protected by lock_sock(), and tries to mod_delayed_work() to 0, in order +to send pending data right now. However, the delayed work smc_tx_work is +also protected by lock_sock(). There introduces lock contention for +sending data. + +To fix it, send pending data directly which acts like TCP, without +lock_sock() protected in the context of setsockopt (already lock_sock()ed), +and cancel unnecessary dealyed work, which is protected by lock. + +[1] https://linux.die.net/man/7/tcp + +Signed-off-by: Tony Lu +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/smc/af_smc.c | 4 ++-- + net/smc/smc_tx.c | 25 +++++++++++++++---------- + net/smc/smc_tx.h | 1 + + 3 files changed, 18 insertions(+), 12 deletions(-) + +diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c +index 5c4c0320e822..183b122807b6 100644 +--- a/net/smc/af_smc.c ++++ b/net/smc/af_smc.c +@@ -2430,8 +2430,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, + sk->sk_state != SMC_CLOSED) { + if (!val) { + SMC_STAT_INC(smc, cork_cnt); +- mod_delayed_work(smc->conn.lgr->tx_wq, +- &smc->conn.tx_work, 0); ++ smc_tx_pending(&smc->conn); ++ cancel_delayed_work(&smc->conn.tx_work); + } + } + break; +diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c +index 738a4a99c827..31ee76131a79 100644 +--- a/net/smc/smc_tx.c ++++ b/net/smc/smc_tx.c +@@ -594,27 +594,32 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn) + return rc; + } + +-/* Wakeup sndbuf consumers from process context +- * since there is more data to transmit +- */ +-void smc_tx_work(struct work_struct *work) ++void smc_tx_pending(struct smc_connection *conn) + { +- struct smc_connection *conn = container_of(to_delayed_work(work), +- struct smc_connection, +- tx_work); + struct smc_sock *smc = container_of(conn, struct smc_sock, conn); + int rc; + +- lock_sock(&smc->sk); + if (smc->sk.sk_err) +- goto out; ++ return; + + rc = smc_tx_sndbuf_nonempty(conn); + if (!rc && conn->local_rx_ctrl.prod_flags.write_blocked && + !atomic_read(&conn->bytes_to_rcv)) + conn->local_rx_ctrl.prod_flags.write_blocked = 0; ++} ++ ++/* Wakeup sndbuf consumers from process context ++ * since there is more data to transmit ++ */ ++void smc_tx_work(struct work_struct *work) ++{ ++ struct smc_connection *conn = container_of(to_delayed_work(work), ++ struct smc_connection, ++ tx_work); ++ struct smc_sock *smc = container_of(conn, struct smc_sock, conn); + +-out: ++ lock_sock(&smc->sk); ++ smc_tx_pending(conn); + release_sock(&smc->sk); + } + +diff --git a/net/smc/smc_tx.h b/net/smc/smc_tx.h +index 07e6ad76224a..a59f370b8b43 100644 +--- a/net/smc/smc_tx.h ++++ b/net/smc/smc_tx.h +@@ -27,6 +27,7 @@ static inline int smc_tx_prepared_sends(struct smc_connection *conn) + return smc_curs_diff(conn->sndbuf_desc->len, &sent, &prep); + } + ++void smc_tx_pending(struct smc_connection *conn); + void smc_tx_work(struct work_struct *work); + void smc_tx_init(struct smc_sock *smc); + int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len); +-- +2.35.1 + diff --git a/queue-5.15/netfilter-conntrack-revisit-gc-autotuning.patch b/queue-5.15/netfilter-conntrack-revisit-gc-autotuning.patch new file mode 100644 index 00000000000..fe85bb03eb4 --- /dev/null +++ b/queue-5.15/netfilter-conntrack-revisit-gc-autotuning.patch @@ -0,0 +1,208 @@ +From 211dac4e17e029395b2c1f6acfb5d7a3c692cfe3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Feb 2022 16:43:05 +0100 +Subject: netfilter: conntrack: revisit gc autotuning + +From: Florian Westphal + +[ Upstream commit 2cfadb761d3d0219412fd8150faea60c7e863833 ] + +as of commit 4608fdfc07e1 +("netfilter: conntrack: collect all entries in one cycle") +conntrack gc was changed to run every 2 minutes. + +On systems where conntrack hash table is set to large value, most evictions +happen from gc worker rather than the packet path due to hash table +distribution. + +This causes netlink event overflows when events are collected. + +This change collects average expiry of scanned entries and +reschedules to the average remaining value, within 1 to 60 second interval. + +To avoid event overflows, reschedule after each bucket and add a +limit for both run time and number of evictions per run. + +If more entries have to be evicted, reschedule and restart 1 jiffy +into the future. + +Reported-by: Karel Rericha +Cc: Shmulik Ladkani +Cc: Eyal Birger +Signed-off-by: Florian Westphal +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Sasha Levin +--- + net/netfilter/nf_conntrack_core.c | 85 ++++++++++++++++++++++++------- + 1 file changed, 68 insertions(+), 17 deletions(-) + +diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c +index 917e708a4561..3a98a1316307 100644 +--- a/net/netfilter/nf_conntrack_core.c ++++ b/net/netfilter/nf_conntrack_core.c +@@ -66,6 +66,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_hash); + struct conntrack_gc_work { + struct delayed_work dwork; + u32 next_bucket; ++ u32 avg_timeout; ++ u32 start_time; + bool exiting; + bool early_drop; + }; +@@ -77,8 +79,19 @@ static __read_mostly bool nf_conntrack_locks_all; + /* serialize hash resizes and nf_ct_iterate_cleanup */ + static DEFINE_MUTEX(nf_conntrack_mutex); + +-#define GC_SCAN_INTERVAL (120u * HZ) ++#define GC_SCAN_INTERVAL_MAX (60ul * HZ) ++#define GC_SCAN_INTERVAL_MIN (1ul * HZ) ++ ++/* clamp timeouts to this value (TCP unacked) */ ++#define GC_SCAN_INTERVAL_CLAMP (300ul * HZ) ++ ++/* large initial bias so that we don't scan often just because we have ++ * three entries with a 1s timeout. ++ */ ++#define GC_SCAN_INTERVAL_INIT INT_MAX ++ + #define GC_SCAN_MAX_DURATION msecs_to_jiffies(10) ++#define GC_SCAN_EXPIRED_MAX (64000u / HZ) + + #define MIN_CHAINLEN 8u + #define MAX_CHAINLEN (32u - MIN_CHAINLEN) +@@ -1420,16 +1433,28 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct) + + static void gc_worker(struct work_struct *work) + { +- unsigned long end_time = jiffies + GC_SCAN_MAX_DURATION; + unsigned int i, hashsz, nf_conntrack_max95 = 0; +- unsigned long next_run = GC_SCAN_INTERVAL; ++ u32 end_time, start_time = nfct_time_stamp; + struct conntrack_gc_work *gc_work; ++ unsigned int expired_count = 0; ++ unsigned long next_run; ++ s32 delta_time; ++ + gc_work = container_of(work, struct conntrack_gc_work, dwork.work); + + i = gc_work->next_bucket; + if (gc_work->early_drop) + nf_conntrack_max95 = nf_conntrack_max / 100u * 95u; + ++ if (i == 0) { ++ gc_work->avg_timeout = GC_SCAN_INTERVAL_INIT; ++ gc_work->start_time = start_time; ++ } ++ ++ next_run = gc_work->avg_timeout; ++ ++ end_time = start_time + GC_SCAN_MAX_DURATION; ++ + do { + struct nf_conntrack_tuple_hash *h; + struct hlist_nulls_head *ct_hash; +@@ -1446,6 +1471,7 @@ static void gc_worker(struct work_struct *work) + + hlist_nulls_for_each_entry_rcu(h, n, &ct_hash[i], hnnode) { + struct nf_conntrack_net *cnet; ++ unsigned long expires; + struct net *net; + + tmp = nf_ct_tuplehash_to_ctrack(h); +@@ -1455,11 +1481,29 @@ static void gc_worker(struct work_struct *work) + continue; + } + ++ if (expired_count > GC_SCAN_EXPIRED_MAX) { ++ rcu_read_unlock(); ++ ++ gc_work->next_bucket = i; ++ gc_work->avg_timeout = next_run; ++ ++ delta_time = nfct_time_stamp - gc_work->start_time; ++ ++ /* re-sched immediately if total cycle time is exceeded */ ++ next_run = delta_time < (s32)GC_SCAN_INTERVAL_MAX; ++ goto early_exit; ++ } ++ + if (nf_ct_is_expired(tmp)) { + nf_ct_gc_expired(tmp); ++ expired_count++; + continue; + } + ++ expires = clamp(nf_ct_expires(tmp), GC_SCAN_INTERVAL_MIN, GC_SCAN_INTERVAL_CLAMP); ++ next_run += expires; ++ next_run /= 2u; ++ + if (nf_conntrack_max95 == 0 || gc_worker_skip_ct(tmp)) + continue; + +@@ -1477,8 +1521,10 @@ static void gc_worker(struct work_struct *work) + continue; + } + +- if (gc_worker_can_early_drop(tmp)) ++ if (gc_worker_can_early_drop(tmp)) { + nf_ct_kill(tmp); ++ expired_count++; ++ } + + nf_ct_put(tmp); + } +@@ -1491,33 +1537,38 @@ static void gc_worker(struct work_struct *work) + cond_resched(); + i++; + +- if (time_after(jiffies, end_time) && i < hashsz) { ++ delta_time = nfct_time_stamp - end_time; ++ if (delta_time > 0 && i < hashsz) { ++ gc_work->avg_timeout = next_run; + gc_work->next_bucket = i; + next_run = 0; +- break; ++ goto early_exit; + } + } while (i < hashsz); + ++ gc_work->next_bucket = 0; ++ ++ next_run = clamp(next_run, GC_SCAN_INTERVAL_MIN, GC_SCAN_INTERVAL_MAX); ++ ++ delta_time = max_t(s32, nfct_time_stamp - gc_work->start_time, 1); ++ if (next_run > (unsigned long)delta_time) ++ next_run -= delta_time; ++ else ++ next_run = 1; ++ ++early_exit: + if (gc_work->exiting) + return; + +- /* +- * Eviction will normally happen from the packet path, and not +- * from this gc worker. +- * +- * This worker is only here to reap expired entries when system went +- * idle after a busy period. +- */ +- if (next_run) { ++ if (next_run) + gc_work->early_drop = false; +- gc_work->next_bucket = 0; +- } ++ + queue_delayed_work(system_power_efficient_wq, &gc_work->dwork, next_run); + } + + static void conntrack_gc_work_init(struct conntrack_gc_work *gc_work) + { +- INIT_DEFERRABLE_WORK(&gc_work->dwork, gc_worker); ++ INIT_DELAYED_WORK(&gc_work->dwork, gc_worker); + gc_work->exiting = false; + } + +-- +2.35.1 + diff --git a/queue-5.15/netlabel-fix-out-of-bounds-memory-accesses.patch b/queue-5.15/netlabel-fix-out-of-bounds-memory-accesses.patch new file mode 100644 index 00000000000..7268fd76d0d --- /dev/null +++ b/queue-5.15/netlabel-fix-out-of-bounds-memory-accesses.patch @@ -0,0 +1,70 @@ +From 8e1cfe5bc3cef7bde2a37ca42a6313ac36f831c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Mar 2022 14:35:08 +0800 +Subject: netlabel: fix out-of-bounds memory accesses + +From: Wang Yufen + +[ Upstream commit f22881de730ebd472e15bcc2c0d1d46e36a87b9c ] + +In calipso_map_cat_ntoh(), in the for loop, if the return value of +netlbl_bitmap_walk() is equal to (net_clen_bits - 1), when +netlbl_bitmap_walk() is called next time, out-of-bounds memory accesses +of bitmap[byte_offset] occurs. + +The bug was found during fuzzing. The following is the fuzzing report + BUG: KASAN: slab-out-of-bounds in netlbl_bitmap_walk+0x3c/0xd0 + Read of size 1 at addr ffffff8107bf6f70 by task err_OH/252 + + CPU: 7 PID: 252 Comm: err_OH Not tainted 5.17.0-rc7+ #17 + Hardware name: linux,dummy-virt (DT) + Call trace: + dump_backtrace+0x21c/0x230 + show_stack+0x1c/0x60 + dump_stack_lvl+0x64/0x7c + print_address_description.constprop.0+0x70/0x2d0 + __kasan_report+0x158/0x16c + kasan_report+0x74/0x120 + __asan_load1+0x80/0xa0 + netlbl_bitmap_walk+0x3c/0xd0 + calipso_opt_getattr+0x1a8/0x230 + calipso_sock_getattr+0x218/0x340 + calipso_sock_getattr+0x44/0x60 + netlbl_sock_getattr+0x44/0x80 + selinux_netlbl_socket_setsockopt+0x138/0x170 + selinux_socket_setsockopt+0x4c/0x60 + security_socket_setsockopt+0x4c/0x90 + __sys_setsockopt+0xbc/0x2b0 + __arm64_sys_setsockopt+0x6c/0x84 + invoke_syscall+0x64/0x190 + el0_svc_common.constprop.0+0x88/0x200 + do_el0_svc+0x88/0xa0 + el0_svc+0x128/0x1b0 + el0t_64_sync_handler+0x9c/0x120 + el0t_64_sync+0x16c/0x170 + +Reported-by: Hulk Robot +Signed-off-by: Wang Yufen +Acked-by: Paul Moore +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/netlabel/netlabel_kapi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c +index beb0e573266d..54c083003947 100644 +--- a/net/netlabel/netlabel_kapi.c ++++ b/net/netlabel/netlabel_kapi.c +@@ -885,6 +885,8 @@ int netlbl_bitmap_walk(const unsigned char *bitmap, u32 bitmap_len, + unsigned char bitmask; + unsigned char byte; + ++ if (offset >= bitmap_len) ++ return -1; + byte_offset = offset / 8; + byte = bitmap[byte_offset]; + bit_spot = offset; +-- +2.35.1 + diff --git a/queue-5.15/nfs-avoid-writeback-threads-getting-stuck-in-mempool.patch b/queue-5.15/nfs-avoid-writeback-threads-getting-stuck-in-mempool.patch new file mode 100644 index 00000000000..057ba181bdf --- /dev/null +++ b/queue-5.15/nfs-avoid-writeback-threads-getting-stuck-in-mempool.patch @@ -0,0 +1,80 @@ +From 264282d038459c14e8cd8537515bdc2721f56668 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Mar 2022 13:48:36 -0400 +Subject: NFS: Avoid writeback threads getting stuck in mempool_alloc() + +From: Trond Myklebust + +[ Upstream commit 0bae835b63c53f86cdc524f5962e39409585b22c ] + +In a low memory situation, allow the NFS writeback code to fail without +getting stuck in infinite loops in mempool_alloc(). + +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/pagelist.c | 10 +++++----- + fs/nfs/write.c | 10 ++++++++-- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c +index b1130dc200d2..f2fe23e6c51f 100644 +--- a/fs/nfs/pagelist.c ++++ b/fs/nfs/pagelist.c +@@ -90,10 +90,10 @@ void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos) + } + } + +-static inline struct nfs_page * +-nfs_page_alloc(void) ++static inline struct nfs_page *nfs_page_alloc(void) + { +- struct nfs_page *p = kmem_cache_zalloc(nfs_page_cachep, GFP_KERNEL); ++ struct nfs_page *p = ++ kmem_cache_zalloc(nfs_page_cachep, nfs_io_gfp_mask()); + if (p) + INIT_LIST_HEAD(&p->wb_list); + return p; +@@ -901,7 +901,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, + struct nfs_commit_info cinfo; + struct nfs_page_array *pg_array = &hdr->page_array; + unsigned int pagecount, pageused; +- gfp_t gfp_flags = GFP_KERNEL; ++ gfp_t gfp_flags = nfs_io_gfp_mask(); + + pagecount = nfs_page_array_len(mirror->pg_base, mirror->pg_count); + pg_array->npages = pagecount; +@@ -988,7 +988,7 @@ nfs_pageio_alloc_mirrors(struct nfs_pageio_descriptor *desc, + desc->pg_mirrors_dynamic = NULL; + if (mirror_count == 1) + return desc->pg_mirrors_static; +- ret = kmalloc_array(mirror_count, sizeof(*ret), GFP_KERNEL); ++ ret = kmalloc_array(mirror_count, sizeof(*ret), nfs_io_gfp_mask()); + if (ret != NULL) { + for (i = 0; i < mirror_count; i++) + nfs_pageio_mirror_init(&ret[i], desc->pg_bsize); +diff --git a/fs/nfs/write.c b/fs/nfs/write.c +index a296e504e4aa..d21b25511499 100644 +--- a/fs/nfs/write.c ++++ b/fs/nfs/write.c +@@ -94,9 +94,15 @@ EXPORT_SYMBOL_GPL(nfs_commit_free); + + static struct nfs_pgio_header *nfs_writehdr_alloc(void) + { +- struct nfs_pgio_header *p = mempool_alloc(nfs_wdata_mempool, GFP_KERNEL); ++ struct nfs_pgio_header *p; + +- memset(p, 0, sizeof(*p)); ++ p = kmem_cache_zalloc(nfs_wdata_cachep, nfs_io_gfp_mask()); ++ if (!p) { ++ p = mempool_alloc(nfs_wdata_mempool, GFP_NOWAIT); ++ if (!p) ++ return NULL; ++ memset(p, 0, sizeof(*p)); ++ } + p->rw_mode = FMODE_WRITE; + return p; + } +-- +2.35.1 + diff --git a/queue-5.15/nfs-nfsiod-should-not-block-forever-in-mempool_alloc.patch b/queue-5.15/nfs-nfsiod-should-not-block-forever-in-mempool_alloc.patch new file mode 100644 index 00000000000..ccbff8aa48a --- /dev/null +++ b/queue-5.15/nfs-nfsiod-should-not-block-forever-in-mempool_alloc.patch @@ -0,0 +1,135 @@ +From e74e9f6cab5367242087f28e154bdc74caab77a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Mar 2022 12:34:19 -0400 +Subject: NFS: nfsiod should not block forever in mempool_alloc() + +From: Trond Myklebust + +[ Upstream commit 515dcdcd48736576c6f5c197814da6f81c60a21e ] + +The concern is that since nfsiod is sometimes required to kick off a +commit, it can get locked up waiting forever in mempool_alloc() instead +of failing gracefully and leaving the commit until later. + +Try to allocate from the slab first, with GFP_KERNEL | __GFP_NORETRY, +then fall back to a non-blocking attempt to allocate from the memory +pool. + +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/internal.h | 7 +++++++ + fs/nfs/pnfs_nfs.c | 8 ++++++-- + fs/nfs/write.c | 24 +++++++++--------------- + include/linux/nfs_fs.h | 2 +- + 4 files changed, 23 insertions(+), 18 deletions(-) + +diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h +index 66fc936834f2..7239118d98a3 100644 +--- a/fs/nfs/internal.h ++++ b/fs/nfs/internal.h +@@ -580,6 +580,13 @@ nfs_write_match_verf(const struct nfs_writeverf *verf, + !nfs_write_verifier_cmp(&req->wb_verf, &verf->verifier); + } + ++static inline gfp_t nfs_io_gfp_mask(void) ++{ ++ if (current->flags & PF_WQ_WORKER) ++ return GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; ++ return GFP_KERNEL; ++} ++ + /* unlink.c */ + extern struct rpc_task * + nfs_async_rename(struct inode *old_dir, struct inode *new_dir, +diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c +index 316f68f96e57..657c242a18ff 100644 +--- a/fs/nfs/pnfs_nfs.c ++++ b/fs/nfs/pnfs_nfs.c +@@ -419,7 +419,7 @@ static struct nfs_commit_data * + pnfs_bucket_fetch_commitdata(struct pnfs_commit_bucket *bucket, + struct nfs_commit_info *cinfo) + { +- struct nfs_commit_data *data = nfs_commitdata_alloc(false); ++ struct nfs_commit_data *data = nfs_commitdata_alloc(); + + if (!data) + return NULL; +@@ -515,7 +515,11 @@ pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages, + unsigned int nreq = 0; + + if (!list_empty(mds_pages)) { +- data = nfs_commitdata_alloc(true); ++ data = nfs_commitdata_alloc(); ++ if (!data) { ++ nfs_retry_commit(mds_pages, NULL, cinfo, -1); ++ return -ENOMEM; ++ } + data->ds_commit_index = -1; + list_splice_init(mds_pages, &data->pages); + list_add_tail(&data->list, &list); +diff --git a/fs/nfs/write.c b/fs/nfs/write.c +index 0691b0b02147..a296e504e4aa 100644 +--- a/fs/nfs/write.c ++++ b/fs/nfs/write.c +@@ -70,27 +70,17 @@ static mempool_t *nfs_wdata_mempool; + static struct kmem_cache *nfs_cdata_cachep; + static mempool_t *nfs_commit_mempool; + +-struct nfs_commit_data *nfs_commitdata_alloc(bool never_fail) ++struct nfs_commit_data *nfs_commitdata_alloc(void) + { + struct nfs_commit_data *p; + +- if (never_fail) +- p = mempool_alloc(nfs_commit_mempool, GFP_NOIO); +- else { +- /* It is OK to do some reclaim, not no safe to wait +- * for anything to be returned to the pool. +- * mempool_alloc() cannot handle that particular combination, +- * so we need two separate attempts. +- */ ++ p = kmem_cache_zalloc(nfs_cdata_cachep, nfs_io_gfp_mask()); ++ if (!p) { + p = mempool_alloc(nfs_commit_mempool, GFP_NOWAIT); +- if (!p) +- p = kmem_cache_alloc(nfs_cdata_cachep, GFP_NOIO | +- __GFP_NOWARN | __GFP_NORETRY); + if (!p) + return NULL; ++ memset(p, 0, sizeof(*p)); + } +- +- memset(p, 0, sizeof(*p)); + INIT_LIST_HEAD(&p->pages); + return p; + } +@@ -1809,7 +1799,11 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, + if (list_empty(head)) + return 0; + +- data = nfs_commitdata_alloc(true); ++ data = nfs_commitdata_alloc(); ++ if (!data) { ++ nfs_retry_commit(head, NULL, cinfo, -1); ++ return -ENOMEM; ++ } + + /* Set up the argument struct */ + nfs_init_commit(data, head, NULL, cinfo); +diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h +index 41102e03512f..5ffcde9ac413 100644 +--- a/include/linux/nfs_fs.h ++++ b/include/linux/nfs_fs.h +@@ -567,7 +567,7 @@ extern int nfs_wb_all(struct inode *inode); + extern int nfs_wb_page(struct inode *inode, struct page *page); + extern int nfs_wb_page_cancel(struct inode *inode, struct page* page); + extern int nfs_commit_inode(struct inode *, int); +-extern struct nfs_commit_data *nfs_commitdata_alloc(bool never_fail); ++extern struct nfs_commit_data *nfs_commitdata_alloc(void); + extern void nfs_commit_free(struct nfs_commit_data *data); + bool nfs_commit_end(struct nfs_mds_commit_info *cinfo); + +-- +2.35.1 + diff --git a/queue-5.15/nfs-swap-io-handling-is-slightly-different-for-o_dir.patch b/queue-5.15/nfs-swap-io-handling-is-slightly-different-for-o_dir.patch new file mode 100644 index 00000000000..53cce1b1788 --- /dev/null +++ b/queue-5.15/nfs-swap-io-handling-is-slightly-different-for-o_dir.patch @@ -0,0 +1,183 @@ +From 737b54d88ed9c8785449396ed42ec52b475a2250 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 10:41:44 +1100 +Subject: NFS: swap IO handling is slightly different for O_DIRECT IO + +From: NeilBrown + +[ Upstream commit 64158668ac8b31626a8ce48db4cad08496eb8340 ] + +1/ Taking the i_rwsem for swap IO triggers lockdep warnings regarding + possible deadlocks with "fs_reclaim". These deadlocks could, I believe, + eventuate if a buffered read on the swapfile was attempted. + + We don't need coherence with the page cache for a swap file, and + buffered writes are forbidden anyway. There is no other need for + i_rwsem during direct IO. So never take it for swap_rw() + +2/ generic_write_checks() explicitly forbids writes to swap, and + performs checks that are not needed for swap. So bypass it + for swap_rw(). + +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/direct.c | 42 ++++++++++++++++++++++++++++-------------- + fs/nfs/file.c | 4 ++-- + include/linux/nfs_fs.h | 8 ++++---- + 3 files changed, 34 insertions(+), 20 deletions(-) + +diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c +index 3c0335c15a73..28afc315ec0c 100644 +--- a/fs/nfs/direct.c ++++ b/fs/nfs/direct.c +@@ -172,8 +172,8 @@ ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) + VM_BUG_ON(iov_iter_count(iter) != PAGE_SIZE); + + if (iov_iter_rw(iter) == READ) +- return nfs_file_direct_read(iocb, iter); +- return nfs_file_direct_write(iocb, iter); ++ return nfs_file_direct_read(iocb, iter, true); ++ return nfs_file_direct_write(iocb, iter, true); + } + + static void nfs_direct_release_pages(struct page **pages, unsigned int npages) +@@ -424,6 +424,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, + * nfs_file_direct_read - file direct read operation for NFS files + * @iocb: target I/O control block + * @iter: vector of user buffers into which to read data ++ * @swap: flag indicating this is swap IO, not O_DIRECT IO + * + * We use this function for direct reads instead of calling + * generic_file_aio_read() in order to avoid gfar's check to see if +@@ -439,7 +440,8 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, + * client must read the updated atime from the server back into its + * cache. + */ +-ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter) ++ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter, ++ bool swap) + { + struct file *file = iocb->ki_filp; + struct address_space *mapping = file->f_mapping; +@@ -481,12 +483,14 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter) + if (iter_is_iovec(iter)) + dreq->flags = NFS_ODIRECT_SHOULD_DIRTY; + +- nfs_start_io_direct(inode); ++ if (!swap) ++ nfs_start_io_direct(inode); + + NFS_I(inode)->read_io += count; + requested = nfs_direct_read_schedule_iovec(dreq, iter, iocb->ki_pos); + +- nfs_end_io_direct(inode); ++ if (!swap) ++ nfs_end_io_direct(inode); + + if (requested > 0) { + result = nfs_direct_wait(dreq); +@@ -875,6 +879,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, + * nfs_file_direct_write - file direct write operation for NFS files + * @iocb: target I/O control block + * @iter: vector of user buffers from which to write data ++ * @swap: flag indicating this is swap IO, not O_DIRECT IO + * + * We use this function for direct writes instead of calling + * generic_file_aio_write() in order to avoid taking the inode +@@ -891,7 +896,8 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, + * Note that O_APPEND is not supported for NFS direct writes, as there + * is no atomic O_APPEND write facility in the NFS protocol. + */ +-ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) ++ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter, ++ bool swap) + { + ssize_t result, requested; + size_t count; +@@ -905,7 +911,11 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) + dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n", + file, iov_iter_count(iter), (long long) iocb->ki_pos); + +- result = generic_write_checks(iocb, iter); ++ if (swap) ++ /* bypass generic checks */ ++ result = iov_iter_count(iter); ++ else ++ result = generic_write_checks(iocb, iter); + if (result <= 0) + return result; + count = result; +@@ -936,16 +946,20 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) + dreq->iocb = iocb; + pnfs_init_ds_commit_info_ops(&dreq->ds_cinfo, inode); + +- nfs_start_io_direct(inode); ++ if (swap) { ++ requested = nfs_direct_write_schedule_iovec(dreq, iter, pos); ++ } else { ++ nfs_start_io_direct(inode); + +- requested = nfs_direct_write_schedule_iovec(dreq, iter, pos); ++ requested = nfs_direct_write_schedule_iovec(dreq, iter, pos); + +- if (mapping->nrpages) { +- invalidate_inode_pages2_range(mapping, +- pos >> PAGE_SHIFT, end); +- } ++ if (mapping->nrpages) { ++ invalidate_inode_pages2_range(mapping, ++ pos >> PAGE_SHIFT, end); ++ } + +- nfs_end_io_direct(inode); ++ nfs_end_io_direct(inode); ++ } + + if (requested > 0) { + result = nfs_direct_wait(dreq); +diff --git a/fs/nfs/file.c b/fs/nfs/file.c +index aa353fd58240..42a16993913a 100644 +--- a/fs/nfs/file.c ++++ b/fs/nfs/file.c +@@ -161,7 +161,7 @@ nfs_file_read(struct kiocb *iocb, struct iov_iter *to) + ssize_t result; + + if (iocb->ki_flags & IOCB_DIRECT) +- return nfs_file_direct_read(iocb, to); ++ return nfs_file_direct_read(iocb, to, false); + + dprintk("NFS: read(%pD2, %zu@%lu)\n", + iocb->ki_filp, +@@ -616,7 +616,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) + return result; + + if (iocb->ki_flags & IOCB_DIRECT) +- return nfs_file_direct_write(iocb, from); ++ return nfs_file_direct_write(iocb, from, false); + + dprintk("NFS: write(%pD2, %zu@%Ld)\n", + file, iov_iter_count(from), (long long) iocb->ki_pos); +diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h +index 4a733f140939..41102e03512f 100644 +--- a/include/linux/nfs_fs.h ++++ b/include/linux/nfs_fs.h +@@ -494,10 +494,10 @@ static inline const struct cred *nfs_file_cred(struct file *file) + * linux/fs/nfs/direct.c + */ + extern ssize_t nfs_direct_IO(struct kiocb *, struct iov_iter *); +-extern ssize_t nfs_file_direct_read(struct kiocb *iocb, +- struct iov_iter *iter); +-extern ssize_t nfs_file_direct_write(struct kiocb *iocb, +- struct iov_iter *iter); ++ssize_t nfs_file_direct_read(struct kiocb *iocb, ++ struct iov_iter *iter, bool swap); ++ssize_t nfs_file_direct_write(struct kiocb *iocb, ++ struct iov_iter *iter, bool swap); + + /* + * linux/fs/nfs/dir.c +-- +2.35.1 + diff --git a/queue-5.15/nfs-swap-out-must-always-use-stable-writes.patch b/queue-5.15/nfs-swap-out-must-always-use-stable-writes.patch new file mode 100644 index 00000000000..b741854b298 --- /dev/null +++ b/queue-5.15/nfs-swap-out-must-always-use-stable-writes.patch @@ -0,0 +1,71 @@ +From fc260f0e312191164d4fd18562c93b3aa7bd0b50 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 10:41:44 +1100 +Subject: NFS: swap-out must always use STABLE writes. + +From: NeilBrown + +[ Upstream commit c265de257f558a05c1859ee9e3fed04883b9ec0e ] + +The commit handling code is not safe against memory-pressure deadlocks +when writing to swap. In particular, nfs_commitdata_alloc() blocks +indefinitely waiting for memory, and this can consume all available +workqueue threads. + +swap-out most likely uses STABLE writes anyway as COND_STABLE indicates +that a stable write should be used if the write fits in a single +request, and it normally does. However if we ever swap with a small +wsize, or gather unusually large numbers of pages for a single write, +this might change. + +For safety, make it explicit in the code that direct writes used for swap +must always use FLUSH_STABLE. + +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/direct.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c +index 28afc315ec0c..c220810c61d1 100644 +--- a/fs/nfs/direct.c ++++ b/fs/nfs/direct.c +@@ -793,7 +793,7 @@ static const struct nfs_pgio_completion_ops nfs_direct_write_completion_ops = { + */ + static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, + struct iov_iter *iter, +- loff_t pos) ++ loff_t pos, int ioflags) + { + struct nfs_pageio_descriptor desc; + struct inode *inode = dreq->inode; +@@ -801,7 +801,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, + size_t requested_bytes = 0; + size_t wsize = max_t(size_t, NFS_SERVER(inode)->wsize, PAGE_SIZE); + +- nfs_pageio_init_write(&desc, inode, FLUSH_COND_STABLE, false, ++ nfs_pageio_init_write(&desc, inode, ioflags, false, + &nfs_direct_write_completion_ops); + desc.pg_dreq = dreq; + get_dreq(dreq); +@@ -947,11 +947,13 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter, + pnfs_init_ds_commit_info_ops(&dreq->ds_cinfo, inode); + + if (swap) { +- requested = nfs_direct_write_schedule_iovec(dreq, iter, pos); ++ requested = nfs_direct_write_schedule_iovec(dreq, iter, pos, ++ FLUSH_STABLE); + } else { + nfs_start_io_direct(inode); + +- requested = nfs_direct_write_schedule_iovec(dreq, iter, pos); ++ requested = nfs_direct_write_schedule_iovec(dreq, iter, pos, ++ FLUSH_COND_STABLE); + + if (mapping->nrpages) { + invalidate_inode_pages2_range(mapping, +-- +2.35.1 + diff --git a/queue-5.15/nfsv4-protect-the-state-recovery-thread-against-dire.patch b/queue-5.15/nfsv4-protect-the-state-recovery-thread-against-dire.patch new file mode 100644 index 00000000000..c3b5d839ba2 --- /dev/null +++ b/queue-5.15/nfsv4-protect-the-state-recovery-thread-against-dire.patch @@ -0,0 +1,76 @@ +From 2c06a675b170d833daa9d9813ac9197028e54266 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 29 Jan 2022 13:32:45 -0500 +Subject: NFSv4: Protect the state recovery thread against direct reclaim + +From: Trond Myklebust + +[ Upstream commit 3e17898aca293a24dae757a440a50aa63ca29671 ] + +If memory allocation triggers a direct reclaim from the state recovery +thread, then we can deadlock. Use memalloc_nofs_save/restore to ensure +that doesn't happen. + +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs4state.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 51f5cb41e87a..57ea63e2cdb4 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + #include + +@@ -2559,9 +2560,17 @@ static void nfs4_layoutreturn_any_run(struct nfs_client *clp) + + static void nfs4_state_manager(struct nfs_client *clp) + { ++ unsigned int memflags; + int status = 0; + const char *section = "", *section_sep = ""; + ++ /* ++ * State recovery can deadlock if the direct reclaim code tries ++ * start NFS writeback. So ensure memory allocations are all ++ * GFP_NOFS. ++ */ ++ memflags = memalloc_nofs_save(); ++ + /* Ensure exclusive access to NFSv4 state */ + do { + trace_nfs4_state_mgr(clp); +@@ -2656,6 +2665,7 @@ static void nfs4_state_manager(struct nfs_client *clp) + clear_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state); + } + ++ memalloc_nofs_restore(memflags); + nfs4_end_drain_session(clp); + nfs4_clear_state_manager_bit(clp); + +@@ -2673,6 +2683,7 @@ static void nfs4_state_manager(struct nfs_client *clp) + return; + if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0) + return; ++ memflags = memalloc_nofs_save(); + } while (refcount_read(&clp->cl_count) > 1 && !signalled()); + goto out_drain; + +@@ -2685,6 +2696,7 @@ static void nfs4_state_manager(struct nfs_client *clp) + clp->cl_hostname, -status); + ssleep(1); + out_drain: ++ memalloc_nofs_restore(memflags); + nfs4_end_drain_session(clp); + nfs4_clear_state_manager_bit(clp); + } +-- +2.35.1 + diff --git a/queue-5.15/nfsv4.2-fix-reference-count-leaks-in-_nfs42_proc_cop.patch b/queue-5.15/nfsv4.2-fix-reference-count-leaks-in-_nfs42_proc_cop.patch new file mode 100644 index 00000000000..8c66ea20c85 --- /dev/null +++ b/queue-5.15/nfsv4.2-fix-reference-count-leaks-in-_nfs42_proc_cop.patch @@ -0,0 +1,66 @@ +From 677fab8bf3b009505abd406af6c3fff5a4e6d1b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 Jan 2022 21:10:45 +0800 +Subject: NFSv4.2: fix reference count leaks in _nfs42_proc_copy_notify() + +From: Xin Xiong + +[ Upstream commit b7f114edd54326f730a754547e7cfb197b5bc132 ] + +[You don't often get email from xiongx18@fudan.edu.cn. Learn why this is important at http://aka.ms/LearnAboutSenderIdentification.] + +The reference counting issue happens in two error paths in the +function _nfs42_proc_copy_notify(). In both error paths, the function +simply returns the error code and forgets to balance the refcount of +object `ctx`, bumped by get_nfs_open_context() earlier, which may +cause refcount leaks. + +Fix it by balancing refcount of the `ctx` object before the function +returns in both error paths. + +Signed-off-by: Xin Xiong +Signed-off-by: Xiyu Yang +Signed-off-by: Xin Tan +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + fs/nfs/nfs42proc.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c +index 9865b5c37d88..93f4d8257525 100644 +--- a/fs/nfs/nfs42proc.c ++++ b/fs/nfs/nfs42proc.c +@@ -586,8 +586,10 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst, + + ctx = get_nfs_open_context(nfs_file_open_context(src)); + l_ctx = nfs_get_lock_context(ctx); +- if (IS_ERR(l_ctx)) +- return PTR_ERR(l_ctx); ++ if (IS_ERR(l_ctx)) { ++ status = PTR_ERR(l_ctx); ++ goto out; ++ } + + status = nfs4_set_rw_stateid(&args->cna_src_stateid, ctx, l_ctx, + FMODE_READ); +@@ -595,7 +597,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst, + if (status) { + if (status == -EAGAIN) + status = -NFS4ERR_BAD_STATEID; +- return status; ++ goto out; + } + + status = nfs4_call_sync(src_server->client, src_server, &msg, +@@ -603,6 +605,7 @@ static int _nfs42_proc_copy_notify(struct file *src, struct file *dst, + if (status == -ENOTSUPP) + src_server->caps &= ~NFS_CAP_COPY_NOTIFY; + ++out: + put_nfs_open_context(nfs_file_open_context(src)); + return status; + } +-- +2.35.1 + diff --git a/queue-5.15/opp-expose-of-node-s-name-in-debugfs.patch b/queue-5.15/opp-expose-of-node-s-name-in-debugfs.patch new file mode 100644 index 00000000000..04689e09791 --- /dev/null +++ b/queue-5.15/opp-expose-of-node-s-name-in-debugfs.patch @@ -0,0 +1,67 @@ +From 5b93dda1b572f4fd843413b8ec516abfeff0d81d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Feb 2022 14:37:53 +0530 +Subject: opp: Expose of-node's name in debugfs + +From: Viresh Kumar + +[ Upstream commit 021dbecabc93b1610b5db989d52a94e0c6671136 ] + +It is difficult to find which OPPs are active at the moment, specially +if there are multiple OPPs with same frequency available in the device +tree (controlled by supported hardware feature). + +Expose name of the DT node to find out the exact OPP. + +While at it, also expose level field. + +Reported-by: Leo Yan +Tested-by: Leo Yan +Signed-off-by: Viresh Kumar +Signed-off-by: Sasha Levin +--- + drivers/opp/debugfs.c | 5 +++++ + drivers/opp/opp.h | 1 + + 2 files changed, 6 insertions(+) + +diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c +index 596c185b5dda..b5f2f9f39392 100644 +--- a/drivers/opp/debugfs.c ++++ b/drivers/opp/debugfs.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -131,9 +132,13 @@ void opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table) + debugfs_create_bool("suspend", S_IRUGO, d, &opp->suspend); + debugfs_create_u32("performance_state", S_IRUGO, d, &opp->pstate); + debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate); ++ debugfs_create_u32("level", S_IRUGO, d, &opp->level); + debugfs_create_ulong("clock_latency_ns", S_IRUGO, d, + &opp->clock_latency_ns); + ++ opp->of_name = of_node_full_name(opp->np); ++ debugfs_create_str("of_name", S_IRUGO, d, (char **)&opp->of_name); ++ + opp_debug_create_supplies(opp, opp_table, d); + opp_debug_create_bw(opp, opp_table, d); + +diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h +index 407c3bfe51d9..45e3a55239a1 100644 +--- a/drivers/opp/opp.h ++++ b/drivers/opp/opp.h +@@ -96,6 +96,7 @@ struct dev_pm_opp { + + #ifdef CONFIG_DEBUG_FS + struct dentry *dentry; ++ const char *of_name; + #endif + }; + +-- +2.35.1 + diff --git a/queue-5.15/parisc-fix-cpu-affinity-for-lasi-wax-and-dino-chips.patch b/queue-5.15/parisc-fix-cpu-affinity-for-lasi-wax-and-dino-chips.patch new file mode 100644 index 00000000000..9045f661ee0 --- /dev/null +++ b/queue-5.15/parisc-fix-cpu-affinity-for-lasi-wax-and-dino-chips.patch @@ -0,0 +1,232 @@ +From fa40af9e62b21456b1232871b98ba8104f780e8c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 27 Mar 2022 15:46:26 +0200 +Subject: parisc: Fix CPU affinity for Lasi, WAX and Dino chips + +From: Helge Deller + +[ Upstream commit 939fc856676c266c3bc347c1c1661872a3725c0f ] + +Add the missing logic to allow Lasi, WAX and Dino to set the +CPU affinity. This fixes IRQ migration to other CPUs when a +CPU is shutdown which currently holds the IRQs for one of those +chips. + +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/parisc/dino.c | 41 +++++++++++++++++++++++++++++++++-------- + drivers/parisc/gsc.c | 31 +++++++++++++++++++++++++++++++ + drivers/parisc/gsc.h | 1 + + drivers/parisc/lasi.c | 7 +++---- + drivers/parisc/wax.c | 7 +++---- + 5 files changed, 71 insertions(+), 16 deletions(-) + +diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c +index 952a92504df6..e33036281327 100644 +--- a/drivers/parisc/dino.c ++++ b/drivers/parisc/dino.c +@@ -142,9 +142,8 @@ struct dino_device + { + struct pci_hba_data hba; /* 'C' inheritance - must be first */ + spinlock_t dinosaur_pen; +- unsigned long txn_addr; /* EIR addr to generate interrupt */ +- u32 txn_data; /* EIR data assign to each dino */ + u32 imr; /* IRQ's which are enabled */ ++ struct gsc_irq gsc_irq; + int global_irq[DINO_LOCAL_IRQS]; /* map IMR bit to global irq */ + #ifdef DINO_DEBUG + unsigned int dino_irr0; /* save most recent IRQ line stat */ +@@ -339,14 +338,43 @@ static void dino_unmask_irq(struct irq_data *d) + if (tmp & DINO_MASK_IRQ(local_irq)) { + DBG(KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n", + __func__, tmp); +- gsc_writel(dino_dev->txn_data, dino_dev->txn_addr); ++ gsc_writel(dino_dev->gsc_irq.txn_data, dino_dev->gsc_irq.txn_addr); + } + } + ++#ifdef CONFIG_SMP ++static int dino_set_affinity_irq(struct irq_data *d, const struct cpumask *dest, ++ bool force) ++{ ++ struct dino_device *dino_dev = irq_data_get_irq_chip_data(d); ++ struct cpumask tmask; ++ int cpu_irq; ++ u32 eim; ++ ++ if (!cpumask_and(&tmask, dest, cpu_online_mask)) ++ return -EINVAL; ++ ++ cpu_irq = cpu_check_affinity(d, &tmask); ++ if (cpu_irq < 0) ++ return cpu_irq; ++ ++ dino_dev->gsc_irq.txn_addr = txn_affinity_addr(d->irq, cpu_irq); ++ eim = ((u32) dino_dev->gsc_irq.txn_addr) | dino_dev->gsc_irq.txn_data; ++ __raw_writel(eim, dino_dev->hba.base_addr+DINO_IAR0); ++ ++ irq_data_update_effective_affinity(d, &tmask); ++ ++ return IRQ_SET_MASK_OK; ++} ++#endif ++ + static struct irq_chip dino_interrupt_type = { + .name = "GSC-PCI", + .irq_unmask = dino_unmask_irq, + .irq_mask = dino_mask_irq, ++#ifdef CONFIG_SMP ++ .irq_set_affinity = dino_set_affinity_irq, ++#endif + }; + + +@@ -806,7 +834,6 @@ static int __init dino_common_init(struct parisc_device *dev, + { + int status; + u32 eim; +- struct gsc_irq gsc_irq; + struct resource *res; + + pcibios_register_hba(&dino_dev->hba); +@@ -821,10 +848,8 @@ static int __init dino_common_init(struct parisc_device *dev, + ** still only has 11 IRQ input lines - just map some of them + ** to a different processor. + */ +- dev->irq = gsc_alloc_irq(&gsc_irq); +- dino_dev->txn_addr = gsc_irq.txn_addr; +- dino_dev->txn_data = gsc_irq.txn_data; +- eim = ((u32) gsc_irq.txn_addr) | gsc_irq.txn_data; ++ dev->irq = gsc_alloc_irq(&dino_dev->gsc_irq); ++ eim = ((u32) dino_dev->gsc_irq.txn_addr) | dino_dev->gsc_irq.txn_data; + + /* + ** Dino needs a PA "IRQ" to get a processor's attention. +diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c +index ed9371acf37e..ec175ae99873 100644 +--- a/drivers/parisc/gsc.c ++++ b/drivers/parisc/gsc.c +@@ -135,10 +135,41 @@ static void gsc_asic_unmask_irq(struct irq_data *d) + */ + } + ++#ifdef CONFIG_SMP ++static int gsc_set_affinity_irq(struct irq_data *d, const struct cpumask *dest, ++ bool force) ++{ ++ struct gsc_asic *gsc_dev = irq_data_get_irq_chip_data(d); ++ struct cpumask tmask; ++ int cpu_irq; ++ ++ if (!cpumask_and(&tmask, dest, cpu_online_mask)) ++ return -EINVAL; ++ ++ cpu_irq = cpu_check_affinity(d, &tmask); ++ if (cpu_irq < 0) ++ return cpu_irq; ++ ++ gsc_dev->gsc_irq.txn_addr = txn_affinity_addr(d->irq, cpu_irq); ++ gsc_dev->eim = ((u32) gsc_dev->gsc_irq.txn_addr) | gsc_dev->gsc_irq.txn_data; ++ ++ /* switch IRQ's for devices below LASI/WAX to other CPU */ ++ gsc_writel(gsc_dev->eim, gsc_dev->hpa + OFFSET_IAR); ++ ++ irq_data_update_effective_affinity(d, &tmask); ++ ++ return IRQ_SET_MASK_OK; ++} ++#endif ++ ++ + static struct irq_chip gsc_asic_interrupt_type = { + .name = "GSC-ASIC", + .irq_unmask = gsc_asic_unmask_irq, + .irq_mask = gsc_asic_mask_irq, ++#ifdef CONFIG_SMP ++ .irq_set_affinity = gsc_set_affinity_irq, ++#endif + }; + + int gsc_assign_irq(struct irq_chip *type, void *data) +diff --git a/drivers/parisc/gsc.h b/drivers/parisc/gsc.h +index 86abad3fa215..73cbd0bb1975 100644 +--- a/drivers/parisc/gsc.h ++++ b/drivers/parisc/gsc.h +@@ -31,6 +31,7 @@ struct gsc_asic { + int version; + int type; + int eim; ++ struct gsc_irq gsc_irq; + int global_irq[32]; + }; + +diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c +index 4e4fd12c2112..6ef621adb63a 100644 +--- a/drivers/parisc/lasi.c ++++ b/drivers/parisc/lasi.c +@@ -163,7 +163,6 @@ static int __init lasi_init_chip(struct parisc_device *dev) + { + extern void (*chassis_power_off)(void); + struct gsc_asic *lasi; +- struct gsc_irq gsc_irq; + int ret; + + lasi = kzalloc(sizeof(*lasi), GFP_KERNEL); +@@ -185,7 +184,7 @@ static int __init lasi_init_chip(struct parisc_device *dev) + lasi_init_irq(lasi); + + /* the IRQ lasi should use */ +- dev->irq = gsc_alloc_irq(&gsc_irq); ++ dev->irq = gsc_alloc_irq(&lasi->gsc_irq); + if (dev->irq < 0) { + printk(KERN_ERR "%s(): cannot get GSC irq\n", + __func__); +@@ -193,9 +192,9 @@ static int __init lasi_init_chip(struct parisc_device *dev) + return -EBUSY; + } + +- lasi->eim = ((u32) gsc_irq.txn_addr) | gsc_irq.txn_data; ++ lasi->eim = ((u32) lasi->gsc_irq.txn_addr) | lasi->gsc_irq.txn_data; + +- ret = request_irq(gsc_irq.irq, gsc_asic_intr, 0, "lasi", lasi); ++ ret = request_irq(lasi->gsc_irq.irq, gsc_asic_intr, 0, "lasi", lasi); + if (ret < 0) { + kfree(lasi); + return ret; +diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c +index 5b6df1516235..73a2b01f8d9c 100644 +--- a/drivers/parisc/wax.c ++++ b/drivers/parisc/wax.c +@@ -68,7 +68,6 @@ static int __init wax_init_chip(struct parisc_device *dev) + { + struct gsc_asic *wax; + struct parisc_device *parent; +- struct gsc_irq gsc_irq; + int ret; + + wax = kzalloc(sizeof(*wax), GFP_KERNEL); +@@ -85,7 +84,7 @@ static int __init wax_init_chip(struct parisc_device *dev) + wax_init_irq(wax); + + /* the IRQ wax should use */ +- dev->irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ); ++ dev->irq = gsc_claim_irq(&wax->gsc_irq, WAX_GSC_IRQ); + if (dev->irq < 0) { + printk(KERN_ERR "%s(): cannot get GSC irq\n", + __func__); +@@ -93,9 +92,9 @@ static int __init wax_init_chip(struct parisc_device *dev) + return -EBUSY; + } + +- wax->eim = ((u32) gsc_irq.txn_addr) | gsc_irq.txn_data; ++ wax->eim = ((u32) wax->gsc_irq.txn_addr) | wax->gsc_irq.txn_data; + +- ret = request_irq(gsc_irq.irq, gsc_asic_intr, 0, "wax", wax); ++ ret = request_irq(wax->gsc_irq.irq, gsc_asic_intr, 0, "wax", wax); + if (ret < 0) { + kfree(wax); + return ret; +-- +2.35.1 + diff --git a/queue-5.15/parisc-fix-patch-code-locking-and-flushing.patch b/queue-5.15/parisc-fix-patch-code-locking-and-flushing.patch new file mode 100644 index 00000000000..96835b34f18 --- /dev/null +++ b/queue-5.15/parisc-fix-patch-code-locking-and-flushing.patch @@ -0,0 +1,97 @@ +From 5bf53c6ec0f4dc09ad892ecd7cc714ebb9491796 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Mar 2022 18:54:36 +0000 +Subject: parisc: Fix patch code locking and flushing + +From: John David Anglin + +[ Upstream commit a9fe7fa7d874a536e0540469f314772c054a0323 ] + +This change fixes the following: + +1) The flags variable is not initialized. Always use raw_spin_lock_irqsave +and raw_spin_unlock_irqrestore to serialize patching. + +2) flush_kernel_vmap_range is primarily intended for DMA flushes. Since +__patch_text_multiple is often called with interrupts disabled, it is +better to directly call flush_kernel_dcache_range_asm and +flush_kernel_icache_range_asm. This avoids an extra call. + +3) The final call to flush_icache_range is unnecessary. + +Signed-off-by: John David Anglin +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + arch/parisc/kernel/patch.c | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +diff --git a/arch/parisc/kernel/patch.c b/arch/parisc/kernel/patch.c +index 80a0ab372802..e59574f65e64 100644 +--- a/arch/parisc/kernel/patch.c ++++ b/arch/parisc/kernel/patch.c +@@ -40,10 +40,7 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags, + + *need_unmap = 1; + set_fixmap(fixmap, page_to_phys(page)); +- if (flags) +- raw_spin_lock_irqsave(&patch_lock, *flags); +- else +- __acquire(&patch_lock); ++ raw_spin_lock_irqsave(&patch_lock, *flags); + + return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK)); + } +@@ -52,10 +49,7 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags) + { + clear_fixmap(fixmap); + +- if (flags) +- raw_spin_unlock_irqrestore(&patch_lock, *flags); +- else +- __release(&patch_lock); ++ raw_spin_unlock_irqrestore(&patch_lock, *flags); + } + + void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) +@@ -67,8 +61,9 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) + int mapped; + + /* Make sure we don't have any aliases in cache */ +- flush_kernel_vmap_range(addr, len); +- flush_icache_range(start, end); ++ flush_kernel_dcache_range_asm(start, end); ++ flush_kernel_icache_range_asm(start, end); ++ flush_tlb_kernel_range(start, end); + + p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, &mapped); + +@@ -81,8 +76,10 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) + * We're crossing a page boundary, so + * need to remap + */ +- flush_kernel_vmap_range((void *)fixmap, +- (p-fixmap) * sizeof(*p)); ++ flush_kernel_dcache_range_asm((unsigned long)fixmap, ++ (unsigned long)p); ++ flush_tlb_kernel_range((unsigned long)fixmap, ++ (unsigned long)p); + if (mapped) + patch_unmap(FIX_TEXT_POKE0, &flags); + p = fixmap = patch_map(addr, FIX_TEXT_POKE0, &flags, +@@ -90,10 +87,10 @@ void __kprobes __patch_text_multiple(void *addr, u32 *insn, unsigned int len) + } + } + +- flush_kernel_vmap_range((void *)fixmap, (p-fixmap) * sizeof(*p)); ++ flush_kernel_dcache_range_asm((unsigned long)fixmap, (unsigned long)p); ++ flush_tlb_kernel_range((unsigned long)fixmap, (unsigned long)p); + if (mapped) + patch_unmap(FIX_TEXT_POKE0, &flags); +- flush_icache_range(start, end); + } + + void __kprobes __patch_text(void *addr, u32 insn) +-- +2.35.1 + diff --git a/queue-5.15/pci-aardvark-fix-support-for-msi-interrupts.patch b/queue-5.15/pci-aardvark-fix-support-for-msi-interrupts.patch new file mode 100644 index 00000000000..d4cd99168f0 --- /dev/null +++ b/queue-5.15/pci-aardvark-fix-support-for-msi-interrupts.patch @@ -0,0 +1,84 @@ +From 99c2cacbc860c6f8e721b7110b43dc2ff8e5d2f5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 10 Jan 2022 02:49:58 +0100 +Subject: PCI: aardvark: Fix support for MSI interrupts +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Pali Rohár + +[ Upstream commit b0b0b8b897f8e12b2368e868bd7cdc5742d5c5a9 ] + +Aardvark hardware supports Multi-MSI and MSI_FLAG_MULTI_PCI_MSI is already +set for the MSI chip. But when allocating MSI interrupt numbers for +Multi-MSI, the numbers need to be properly aligned, otherwise endpoint +devices send MSI interrupt with incorrect numbers. + +Fix this issue by using function bitmap_find_free_region() instead of +bitmap_find_next_zero_area(). + +To ensure that aligned MSI interrupt numbers are used by endpoint devices, +we cannot use Linux virtual irq numbers (as they are random and not +properly aligned). Instead we need to use the aligned hwirq numbers. + +This change fixes receiving MSI interrupts on Armada 3720 boards and +allows using NVMe disks which use Multi-MSI feature with 3 interrupts. + +Without this NVMe disks freeze booting as linux nvme-core.c is waiting +60s for an interrupt. + +Link: https://lore.kernel.org/r/20220110015018.26359-4-kabel@kernel.org +Signed-off-by: Pali Rohár +Signed-off-by: Marek Behún +Signed-off-by: Lorenzo Pieralisi +Signed-off-by: Sasha Levin +--- + drivers/pci/controller/pci-aardvark.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c +index a924564fdbbc..6277b3f3031a 100644 +--- a/drivers/pci/controller/pci-aardvark.c ++++ b/drivers/pci/controller/pci-aardvark.c +@@ -1179,7 +1179,7 @@ static void advk_msi_irq_compose_msi_msg(struct irq_data *data, + + msg->address_lo = lower_32_bits(msi_msg); + msg->address_hi = upper_32_bits(msi_msg); +- msg->data = data->irq; ++ msg->data = data->hwirq; + } + + static int advk_msi_set_affinity(struct irq_data *irq_data, +@@ -1196,15 +1196,11 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain, + int hwirq, i; + + mutex_lock(&pcie->msi_used_lock); +- hwirq = bitmap_find_next_zero_area(pcie->msi_used, MSI_IRQ_NUM, +- 0, nr_irqs, 0); +- if (hwirq >= MSI_IRQ_NUM) { +- mutex_unlock(&pcie->msi_used_lock); +- return -ENOSPC; +- } +- +- bitmap_set(pcie->msi_used, hwirq, nr_irqs); ++ hwirq = bitmap_find_free_region(pcie->msi_used, MSI_IRQ_NUM, ++ order_base_2(nr_irqs)); + mutex_unlock(&pcie->msi_used_lock); ++ if (hwirq < 0) ++ return -ENOSPC; + + for (i = 0; i < nr_irqs; i++) + irq_domain_set_info(domain, virq + i, hwirq + i, +@@ -1222,7 +1218,7 @@ static void advk_msi_irq_domain_free(struct irq_domain *domain, + struct advk_pcie *pcie = domain->host_data; + + mutex_lock(&pcie->msi_used_lock); +- bitmap_clear(pcie->msi_used, d->hwirq, nr_irqs); ++ bitmap_release_region(pcie->msi_used, d->hwirq, order_base_2(nr_irqs)); + mutex_unlock(&pcie->msi_used_lock); + } + +-- +2.35.1 + diff --git a/queue-5.15/pci-endpoint-fix-alignment-fault-error-in-copy-tests.patch b/queue-5.15/pci-endpoint-fix-alignment-fault-error-in-copy-tests.patch new file mode 100644 index 00000000000..c2d214e93a8 --- /dev/null +++ b/queue-5.15/pci-endpoint-fix-alignment-fault-error-in-copy-tests.patch @@ -0,0 +1,92 @@ +From d34daa7507ce5dea898a055bc4630ff2bf19328f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Dec 2021 17:47:08 +0800 +Subject: PCI: endpoint: Fix alignment fault error in copy tests + +From: Hou Zhiqiang + +[ Upstream commit 829cc0e2ea2d61fb6c54bc3f8a17f86c56e11864 ] + +The copy test uses the memcpy() to copy data between IO memory spaces. +This can trigger an alignment fault error (pasted the error logs below) +because memcpy() may use unaligned accesses on a mapped memory that is +just IO, which does not support unaligned memory accesses. + +Fix it by using the correct memcpy API to copy from/to IO memory. + +Alignment fault error logs: + Unable to handle kernel paging request at virtual address ffff8000101cd3c1 + Mem abort info: + ESR = 0x96000021 + EC = 0x25: DABT (current EL), IL = 32 bits + SET = 0, FnV = 0 + EA = 0, S1PTW = 0 + FSC = 0x21: alignment fault + Data abort info: + ISV = 0, ISS = 0x00000021 + CM = 0, WnR = 0 + swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000081773000 + [ffff8000101cd3c1] pgd=1000000082410003, p4d=1000000082410003, pud=1000000082411003, pmd=1000000082412003, pte=0068004000001f13 + Internal error: Oops: 96000021 [#1] PREEMPT SMP + Modules linked in: + CPU: 0 PID: 6 Comm: kworker/0:0H Not tainted 5.15.0-rc1-next-20210914-dirty #2 + Hardware name: LS1012A RDB Board (DT) + Workqueue: kpcitest pci_epf_test_cmd_handler + pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) + pc : __memcpy+0x168/0x230 + lr : pci_epf_test_cmd_handler+0x6f0/0xa68 + sp : ffff80001003bce0 + x29: ffff80001003bce0 x28: ffff800010135000 x27: ffff8000101e5000 + x26: ffff8000101cd000 x25: ffff6cda941cf6c8 x24: 0000000000000000 + x23: ffff6cda863f2000 x22: ffff6cda9096c800 x21: ffff800010135000 + x20: ffff6cda941cf680 x19: ffffaf39fd999000 x18: 0000000000000000 + x17: 0000000000000000 x16: 0000000000000000 x15: ffffaf39fd2b6000 + x14: 0000000000000000 x13: 15f5c8fa2f984d57 x12: 604d132b60275454 + x11: 065cee5e5fb428b6 x10: aae662eb17d0cf3e x9 : 1d97c9a1b4ddef37 + x8 : 7541b65edebf928c x7 : e71937c4fc595de0 x6 : b8a0e09562430d1c + x5 : ffff8000101e5401 x4 : ffff8000101cd401 x3 : ffff8000101e5380 + x2 : fffffffffffffff1 x1 : ffff8000101cd3c0 x0 : ffff8000101e5000 + Call trace: + __memcpy+0x168/0x230 + process_one_work+0x1ec/0x370 + worker_thread+0x44/0x478 + kthread+0x154/0x160 + ret_from_fork+0x10/0x20 + Code: a984346c a9c4342c f1010042 54fffee8 (a97c3c8e) + ---[ end trace 568c28c7b6336335 ]--- + +Link: https://lore.kernel.org/r/20211217094708.28678-1-Zhiqiang.Hou@nxp.com +Signed-off-by: Hou Zhiqiang +Signed-off-by: Lorenzo Pieralisi +Reviewed-by: Kishon Vijay Abraham I +Signed-off-by: Sasha Levin +--- + drivers/pci/endpoint/functions/pci-epf-test.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c +index 90d84d3bc868..c7e45633beaf 100644 +--- a/drivers/pci/endpoint/functions/pci-epf-test.c ++++ b/drivers/pci/endpoint/functions/pci-epf-test.c +@@ -285,7 +285,17 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test) + if (ret) + dev_err(dev, "Data transfer failed\n"); + } else { +- memcpy(dst_addr, src_addr, reg->size); ++ void *buf; ++ ++ buf = kzalloc(reg->size, GFP_KERNEL); ++ if (!buf) { ++ ret = -ENOMEM; ++ goto err_map_addr; ++ } ++ ++ memcpy_fromio(buf, src_addr, reg->size); ++ memcpy_toio(dst_addr, buf, reg->size); ++ kfree(buf); + } + ktime_get_ts64(&end); + pci_epf_test_print_rate("COPY", reg->size, &start, &end, use_dma); +-- +2.35.1 + diff --git a/queue-5.15/pci-endpoint-fix-misused-goto-label.patch b/queue-5.15/pci-endpoint-fix-misused-goto-label.patch new file mode 100644 index 00000000000..afc32cb8bf9 --- /dev/null +++ b/queue-5.15/pci-endpoint-fix-misused-goto-label.patch @@ -0,0 +1,36 @@ +From 87a4fa61d755c81e8fc65d6cd5bd4dd7e7dce0ce Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 Jan 2022 15:48:23 +0800 +Subject: PCI: endpoint: Fix misused goto label + +From: Li Chen + +[ Upstream commit bf8d87c076f55b8b4dfdb6bc6c6b6dc0c2ccb487 ] + +Fix a misused goto label jump since that can result in a memory leak. + +Link: https://lore.kernel.org/r/17e7b9b9ee6.c6d9c6a02564.4545388417402742326@zohomail.com +Signed-off-by: Li Chen +Signed-off-by: Lorenzo Pieralisi +Acked-by: Kishon Vijay Abraham I +Signed-off-by: Sasha Levin +--- + drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c +index c7e45633beaf..5b833f00e980 100644 +--- a/drivers/pci/endpoint/functions/pci-epf-test.c ++++ b/drivers/pci/endpoint/functions/pci-epf-test.c +@@ -451,7 +451,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test) + if (!epf_test->dma_supported) { + dev_err(dev, "Cannot transfer data using DMA\n"); + ret = -EINVAL; +- goto err_map_addr; ++ goto err_dma_map; + } + + src_phys_addr = dma_map_single(dma_dev, buf, reg->size, +-- +2.35.1 + diff --git a/queue-5.15/pci-pciehp-add-qualcomm-quirk-for-command-completed-.patch b/queue-5.15/pci-pciehp-add-qualcomm-quirk-for-command-completed-.patch new file mode 100644 index 00000000000..f3369ea31d8 --- /dev/null +++ b/queue-5.15/pci-pciehp-add-qualcomm-quirk-for-command-completed-.patch @@ -0,0 +1,44 @@ +From 8249c816808b9b9056dc48e2b0123a117df4c95c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Feb 2022 20:20:03 +0530 +Subject: PCI: pciehp: Add Qualcomm quirk for Command Completed erratum + +From: Manivannan Sadhasivam + +[ Upstream commit 9f72d4757cbe4d1ed669192f6d23817c9e437c4b ] + +The Qualcomm PCI bridge device (Device ID 0x0110) found in chipsets such as +SM8450 does not set the Command Completed bit unless writes to the Slot +Command register change "Control" bits. + +This results in timeouts like below: + + pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago) + +Add the device to the Command Completed quirk to mark commands "completed" +immediately unless they change the "Control" bits. + +Link: https://lore.kernel.org/r/20220210145003.135907-1-manivannan.sadhasivam@linaro.org +Signed-off-by: Manivannan Sadhasivam +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/hotplug/pciehp_hpc.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c +index c0985316649d..8bedbc77fe95 100644 +--- a/drivers/pci/hotplug/pciehp_hpc.c ++++ b/drivers/pci/hotplug/pciehp_hpc.c +@@ -1060,6 +1060,8 @@ static void quirk_cmd_compl(struct pci_dev *pdev) + } + DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, + PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl); ++DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0110, ++ PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl); + DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0400, + PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl); + DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0401, +-- +2.35.1 + diff --git a/queue-5.15/phy-amlogic-meson8b-usb2-fix-shared-reset-control-us.patch b/queue-5.15/phy-amlogic-meson8b-usb2-fix-shared-reset-control-us.patch new file mode 100644 index 00000000000..cefea345eae --- /dev/null +++ b/queue-5.15/phy-amlogic-meson8b-usb2-fix-shared-reset-control-us.patch @@ -0,0 +1,68 @@ +From 8ffc4c6cec95bbee41e74fc15147465dc6983b69 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Jan 2022 10:52:55 +0100 +Subject: phy: amlogic: meson8b-usb2: fix shared reset control use + +From: Amjad Ouled-Ameur + +[ Upstream commit 6f1dedf089ab1a4f03ea7aadc3c4a99885b4b4a0 ] + +Use reset_control_rearm() call if an error occurs in case +phy_meson8b_usb2_power_on() fails after reset() has been called, or in +case phy_meson8b_usb2_power_off() is called i.e the resource is no longer +used and the reset line may be triggered again by other devices. + +reset_control_rearm() keeps use of triggered_count sane in the reset +framework, use of reset_control_reset() on shared reset line should +be balanced with reset_control_rearm(). + +Signed-off-by: Amjad Ouled-Ameur +Reported-by: Jerome Brunet +Reviewed-by: Martin Blumenstingl +Acked-by: Neil Armstrong +Link: https://lore.kernel.org/r/20220111095255.176141-4-aouledameur@baylibre.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/amlogic/phy-meson8b-usb2.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c +index 77e7e9b1428c..dd96763911b8 100644 +--- a/drivers/phy/amlogic/phy-meson8b-usb2.c ++++ b/drivers/phy/amlogic/phy-meson8b-usb2.c +@@ -154,6 +154,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) + ret = clk_prepare_enable(priv->clk_usb_general); + if (ret) { + dev_err(&phy->dev, "Failed to enable USB general clock\n"); ++ reset_control_rearm(priv->reset); + return ret; + } + +@@ -161,6 +162,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) + if (ret) { + dev_err(&phy->dev, "Failed to enable USB DDR clock\n"); + clk_disable_unprepare(priv->clk_usb_general); ++ reset_control_rearm(priv->reset); + return ret; + } + +@@ -199,6 +201,7 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) + dev_warn(&phy->dev, "USB ID detect failed!\n"); + clk_disable_unprepare(priv->clk_usb); + clk_disable_unprepare(priv->clk_usb_general); ++ reset_control_rearm(priv->reset); + return -EINVAL; + } + } +@@ -218,6 +221,7 @@ static int phy_meson8b_usb2_power_off(struct phy *phy) + + clk_disable_unprepare(priv->clk_usb); + clk_disable_unprepare(priv->clk_usb_general); ++ reset_control_rearm(priv->reset); + + /* power off the PHY by putting it into reset mode */ + regmap_update_bits(priv->regmap, REG_CTRL, REG_CTRL_POWER_ON_RESET, +-- +2.35.1 + diff --git a/queue-5.15/phy-amlogic-meson8b-usb2-use-dev_err_probe.patch b/queue-5.15/phy-amlogic-meson8b-usb2-use-dev_err_probe.patch new file mode 100644 index 00000000000..feae459cc25 --- /dev/null +++ b/queue-5.15/phy-amlogic-meson8b-usb2-use-dev_err_probe.patch @@ -0,0 +1,42 @@ +From 7dee6f3524c72278db010335f77feae3e7e5f4d3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Jan 2022 10:52:54 +0100 +Subject: phy: amlogic: meson8b-usb2: Use dev_err_probe() + +From: Amjad Ouled-Ameur + +[ Upstream commit 6466ba1898d415b527e1013bd8551a6fdfece94c ] + +Use the existing dev_err_probe() helper instead of open-coding the same +operation. + +Signed-off-by: Amjad Ouled-Ameur +Reported-by: Martin Blumenstingl +Reviewed-by: Martin Blumenstingl +Acked-by: Neil Armstrong +Link: https://lore.kernel.org/r/20220111095255.176141-3-aouledameur@baylibre.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/amlogic/phy-meson8b-usb2.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c +index cf10bed40528..77e7e9b1428c 100644 +--- a/drivers/phy/amlogic/phy-meson8b-usb2.c ++++ b/drivers/phy/amlogic/phy-meson8b-usb2.c +@@ -265,8 +265,9 @@ static int phy_meson8b_usb2_probe(struct platform_device *pdev) + return PTR_ERR(priv->clk_usb); + + priv->reset = devm_reset_control_get_optional_shared(&pdev->dev, NULL); +- if (PTR_ERR(priv->reset) == -EPROBE_DEFER) +- return PTR_ERR(priv->reset); ++ if (IS_ERR(priv->reset)) ++ return dev_err_probe(&pdev->dev, PTR_ERR(priv->reset), ++ "Failed to get the reset line"); + + priv->dr_mode = of_usb_get_dr_mode_by_phy(pdev->dev.of_node, -1); + if (priv->dr_mode == USB_DR_MODE_UNKNOWN) { +-- +2.35.1 + diff --git a/queue-5.15/phy-amlogic-phy-meson-gxl-usb2-fix-shared-reset-cont.patch b/queue-5.15/phy-amlogic-phy-meson-gxl-usb2-fix-shared-reset-cont.patch new file mode 100644 index 00000000000..4ec2c416350 --- /dev/null +++ b/queue-5.15/phy-amlogic-phy-meson-gxl-usb2-fix-shared-reset-cont.patch @@ -0,0 +1,57 @@ +From 288919fd6850dc97bead4ba735ee91ad60f9cdc6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Jan 2022 10:52:53 +0100 +Subject: phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use + +From: Amjad Ouled-Ameur + +[ Upstream commit 2f87727130ce17ffefecd0895eeebf22d5a36f6f ] + +Use reset_control_rearm() call if an error occurs in case +phy_meson_gxl_usb2_init() fails after reset() has been called ; or in case +phy_meson_gxl_usb2_exit() is called i.e the resource is no longer used +and the reset line may be triggered again by other devices. + +reset_control_rearm() keeps use of triggered_count sane in the reset +framework. Therefore, use of reset_control_reset() on shared reset line +should be balanced with reset_control_rearm(). + +Signed-off-by: Amjad Ouled-Ameur +Reported-by: Jerome Brunet +Reviewed-by: Martin Blumenstingl +Reviewed-by: Philipp Zabel +Acked-by: Neil Armstrong +Link: https://lore.kernel.org/r/20220111095255.176141-2-aouledameur@baylibre.com +Signed-off-by: Vinod Koul +Signed-off-by: Sasha Levin +--- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/phy/amlogic/phy-meson-gxl-usb2.c b/drivers/phy/amlogic/phy-meson-gxl-usb2.c +index 2b3c0d730f20..db17c3448bfe 100644 +--- a/drivers/phy/amlogic/phy-meson-gxl-usb2.c ++++ b/drivers/phy/amlogic/phy-meson-gxl-usb2.c +@@ -114,8 +114,10 @@ static int phy_meson_gxl_usb2_init(struct phy *phy) + return ret; + + ret = clk_prepare_enable(priv->clk); +- if (ret) ++ if (ret) { ++ reset_control_rearm(priv->reset); + return ret; ++ } + + return 0; + } +@@ -125,6 +127,7 @@ static int phy_meson_gxl_usb2_exit(struct phy *phy) + struct phy_meson_gxl_usb2_priv *priv = phy_get_drvdata(phy); + + clk_disable_unprepare(priv->clk); ++ reset_control_rearm(priv->reset); + + return 0; + } +-- +2.35.1 + diff --git a/queue-5.15/power-supply-axp20x_battery-properly-report-current-.patch b/queue-5.15/power-supply-axp20x_battery-properly-report-current-.patch new file mode 100644 index 00000000000..29009d85169 --- /dev/null +++ b/queue-5.15/power-supply-axp20x_battery-properly-report-current-.patch @@ -0,0 +1,63 @@ +From f36165ab98c212256b97d6a372942ba1ed0e1a98 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 Jan 2022 11:47:27 +0300 +Subject: power: supply: axp20x_battery: properly report current when + discharging + +From: Evgeny Boger + +[ Upstream commit d4f408cdcd26921c1268cb8dcbe8ffb6faf837f3 ] + +As stated in [1], negative current values are used for discharging +batteries. + +AXP PMICs internally have two different ADC channels for shunt current +measurement: one used during charging and one during discharging. +The values reported by these ADCs are unsigned. +While the driver properly selects ADC channel to get the data from, +it doesn't apply negative sign when reporting discharging current. + +[1] Documentation/ABI/testing/sysfs-class-power + +Signed-off-by: Evgeny Boger +Acked-by: Chen-Yu Tsai +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/power/supply/axp20x_battery.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c +index 18a9db0df4b1..335e12cc5e2f 100644 +--- a/drivers/power/supply/axp20x_battery.c ++++ b/drivers/power/supply/axp20x_battery.c +@@ -186,7 +186,6 @@ static int axp20x_battery_get_prop(struct power_supply *psy, + union power_supply_propval *val) + { + struct axp20x_batt_ps *axp20x_batt = power_supply_get_drvdata(psy); +- struct iio_channel *chan; + int ret = 0, reg, val1; + + switch (psp) { +@@ -266,12 +265,12 @@ static int axp20x_battery_get_prop(struct power_supply *psy, + if (ret) + return ret; + +- if (reg & AXP20X_PWR_STATUS_BAT_CHARGING) +- chan = axp20x_batt->batt_chrg_i; +- else +- chan = axp20x_batt->batt_dischrg_i; +- +- ret = iio_read_channel_processed(chan, &val->intval); ++ if (reg & AXP20X_PWR_STATUS_BAT_CHARGING) { ++ ret = iio_read_channel_processed(axp20x_batt->batt_chrg_i, &val->intval); ++ } else { ++ ret = iio_read_channel_processed(axp20x_batt->batt_dischrg_i, &val1); ++ val->intval = -val1; ++ } + if (ret) + return ret; + +-- +2.35.1 + diff --git a/queue-5.15/power-supply-axp288-charger-set-vhold-to-4.4v.patch b/queue-5.15/power-supply-axp288-charger-set-vhold-to-4.4v.patch new file mode 100644 index 00000000000..a9bee0f4f6a --- /dev/null +++ b/queue-5.15/power-supply-axp288-charger-set-vhold-to-4.4v.patch @@ -0,0 +1,85 @@ +From b902e59383025613d1e929689724b1405dd29261 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Feb 2022 13:51:47 +0100 +Subject: power: supply: axp288-charger: Set Vhold to 4.4V + +From: Hans de Goede + +[ Upstream commit 5ac121b81b4051e7fc83d5b3456a5e499d5bd147 ] + +The AXP288's recommended and factory default Vhold value (minimum +input voltage below which the input current draw will be reduced) +is 4.4V. This lines up with other charger IC's such as the TI +bq2419x/bq2429x series which use 4.36V or 4.44V. + +For some reason some BIOS-es initialize Vhold to 4.6V or even 4.7V +which combined with the typical voltage drop over typically low +wire gauge micro-USB cables leads to the input-current getting +capped below 1A (with a 2A capable dedicated charger) based on Vhold. + +This leads to slow charging, or even to the device slowly discharging +if the device is in heavy use. + +As the Linux AXP288 drivers use the builtin BC1.2 charger detection +and send the input-current-limit according to the detected charger +there really is no reason not to use the recommended 4.4V Vhold. + +Set Vhold to 4.4V to fix the slow charging issue on various devices. + +There is one exception, the special-case of the HP X2 2-in-1s which +combine this BC1.2 capable PMIC with a Type-C port and a 5V/3A factory +provided charger with a Type-C plug which does not do BC1.2. These +have their input-current-limit hardcoded to 3A (like under Windows) +and use a higher Vhold on purpose to limit the current when used +with other chargers. To avoid touching Vhold on these HP X2 laptops +the code setting Vhold is added to an else branch of the if checking +for these models. + +Note this also fixes the sofar unused VBUS_ISPOUT_VHOLD_SET_MASK +define, which was wrong. + +Signed-off-by: Hans de Goede +Signed-off-by: Sebastian Reichel +Signed-off-by: Sasha Levin +--- + drivers/power/supply/axp288_charger.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c +index b9553be9bed5..fb9db7f43895 100644 +--- a/drivers/power/supply/axp288_charger.c ++++ b/drivers/power/supply/axp288_charger.c +@@ -41,11 +41,11 @@ + #define VBUS_ISPOUT_CUR_LIM_1500MA 0x1 /* 1500mA */ + #define VBUS_ISPOUT_CUR_LIM_2000MA 0x2 /* 2000mA */ + #define VBUS_ISPOUT_CUR_NO_LIM 0x3 /* 2500mA */ +-#define VBUS_ISPOUT_VHOLD_SET_MASK 0x31 ++#define VBUS_ISPOUT_VHOLD_SET_MASK 0x38 + #define VBUS_ISPOUT_VHOLD_SET_BIT_POS 0x3 + #define VBUS_ISPOUT_VHOLD_SET_OFFSET 4000 /* 4000mV */ + #define VBUS_ISPOUT_VHOLD_SET_LSB_RES 100 /* 100mV */ +-#define VBUS_ISPOUT_VHOLD_SET_4300MV 0x3 /* 4300mV */ ++#define VBUS_ISPOUT_VHOLD_SET_4400MV 0x4 /* 4400mV */ + #define VBUS_ISPOUT_VBUS_PATH_DIS BIT(7) + + #define CHRG_CCCV_CC_MASK 0xf /* 4 bits */ +@@ -744,6 +744,16 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) + ret = axp288_charger_vbus_path_select(info, true); + if (ret < 0) + return ret; ++ } else { ++ /* Set Vhold to the factory default / recommended 4.4V */ ++ val = VBUS_ISPOUT_VHOLD_SET_4400MV << VBUS_ISPOUT_VHOLD_SET_BIT_POS; ++ ret = regmap_update_bits(info->regmap, AXP20X_VBUS_IPSOUT_MGMT, ++ VBUS_ISPOUT_VHOLD_SET_MASK, val); ++ if (ret < 0) { ++ dev_err(&info->pdev->dev, "register(%x) write error(%d)\n", ++ AXP20X_VBUS_IPSOUT_MGMT, ret); ++ return ret; ++ } + } + + /* Read current charge voltage and current limit */ +-- +2.35.1 + diff --git a/queue-5.15/powerpc-64e-tie-ppc_book3e_64-to-ppc_fsl_book3e.patch b/queue-5.15/powerpc-64e-tie-ppc_book3e_64-to-ppc_fsl_book3e.patch new file mode 100644 index 00000000000..a521b9583da --- /dev/null +++ b/queue-5.15/powerpc-64e-tie-ppc_book3e_64-to-ppc_fsl_book3e.patch @@ -0,0 +1,60 @@ +From 16565ce3e8731b30085dc470386428f755ad1d2c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Mar 2022 17:12:22 +1100 +Subject: powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E + +From: Michael Ellerman + +[ Upstream commit 1a76e520ee1831a81dabf8a9a58c6453f700026e ] + +Since the IBM A2 CPU support was removed, see commit +fb5a515704d7 ("powerpc: Remove platforms/wsp and associated pieces"), +the only 64-bit Book3E CPUs we support are Freescale (NXP) ones. + +However our Kconfig still allows configurating a kernel that has 64-bit +Book3E support, but no Freescale CPU support enabled. Such a kernel +would never boot, it doesn't know about any CPUs. + +It also causes build errors, as reported by lkp, because +PPC_BARRIER_NOSPEC is not enabled in such a configuration: + + powerpc64-linux-ld: arch/powerpc/net/bpf_jit_comp64.o:(.toc+0x0): + undefined reference to `powerpc_security_features' + +To fix this, force PPC_FSL_BOOK3E to be selected whenever we are +building a 64-bit Book3E kernel. + +Reported-by: kernel test robot +Reported-by: Naveen N. Rao +Suggested-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220304061222.2478720-1-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/platforms/Kconfig.cputype | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype +index a208997ade88..87a95cbff2f3 100644 +--- a/arch/powerpc/platforms/Kconfig.cputype ++++ b/arch/powerpc/platforms/Kconfig.cputype +@@ -111,6 +111,7 @@ config PPC_BOOK3S_64 + + config PPC_BOOK3E_64 + bool "Embedded processors" ++ select PPC_FSL_BOOK3E + select PPC_FPU # Make it a choice ? + select PPC_SMP_MUXED_IPI + select PPC_DOORBELL +@@ -287,7 +288,7 @@ config FSL_BOOKE + config PPC_FSL_BOOK3E + bool + select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64 +- select FSL_EMB_PERFMON ++ imply FSL_EMB_PERFMON + select PPC_SMP_MUXED_IPI + select PPC_DOORBELL + default y if FSL_BOOKE +-- +2.35.1 + diff --git a/queue-5.15/powerpc-64s-hash-make-hash-faults-work-in-nmi-contex.patch b/queue-5.15/powerpc-64s-hash-make-hash-faults-work-in-nmi-contex.patch new file mode 100644 index 00000000000..7ac6815ab51 --- /dev/null +++ b/queue-5.15/powerpc-64s-hash-make-hash-faults-work-in-nmi-contex.patch @@ -0,0 +1,231 @@ +From 421333d7eae2326444c7be8deb4e95ad5c899f63 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 13:53:48 +1000 +Subject: powerpc/64s/hash: Make hash faults work in NMI context + +From: Nicholas Piggin + +[ Upstream commit 8b91cee5eadd2021f55e6775f2d50bd56d00c217 ] + +Hash faults are not resoved in NMI context, instead causing the access +to fail. This is done because perf interrupts can get backtraces +including walking the user stack, and taking a hash fault on those could +deadlock on the HPTE lock if the perf interrupt hits while the same HPTE +lock is being held by the hash fault code. The user-access for the stack +walking will notice the access failed and deal with that in the perf +code. + +The reason to allow perf interrupts in is to better profile hash faults. + +The problem with this is any hash fault on a kernel access that happens +in NMI context will crash, because kernel accesses must not fail. + +Hard lockups, system reset, machine checks that access vmalloc space +including modules and including stack backtracing and symbol lookup in +modules, per-cpu data, etc could all run into this problem. + +Fix this by disallowing perf interrupts in the hash fault code (the +direct hash fault is covered by MSR[EE]=0 so the PMI disable just needs +to extend to the preload case). This simplifies the tricky logic in hash +faults and perf, at the cost of reduced profiling of hash faults. + +perf can still latch addresses when interrupts are disabled, it just +won't get the stack trace at that point, so it would still find hot +spots, just sometimes with confusing stack chains. + +An alternative could be to allow perf interrupts here but always do the +slowpath stack walk if we are in nmi context, but that slows down all +perf interrupt stack walking on hash though and it does not remove as +much tricky code. + +Reported-by: Laurent Dufour +Signed-off-by: Nicholas Piggin +Tested-by: Laurent Dufour +Reviewed-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220204035348.545435-1-npiggin@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/interrupt.h | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 54 ++++----------------------- + arch/powerpc/perf/callchain.h | 9 +---- + arch/powerpc/perf/callchain_64.c | 27 -------------- + 4 files changed, 10 insertions(+), 82 deletions(-) + +diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h +index a1d238255f07..a07960066b5f 100644 +--- a/arch/powerpc/include/asm/interrupt.h ++++ b/arch/powerpc/include/asm/interrupt.h +@@ -567,7 +567,7 @@ DECLARE_INTERRUPT_HANDLER_RAW(do_slb_fault); + DECLARE_INTERRUPT_HANDLER(do_bad_slb_fault); + + /* hash_utils.c */ +-DECLARE_INTERRUPT_HANDLER_RAW(do_hash_fault); ++DECLARE_INTERRUPT_HANDLER(do_hash_fault); + + /* fault.c */ + DECLARE_INTERRUPT_HANDLER(do_page_fault); +diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c +index c145776d3ae5..7bfd88c4b547 100644 +--- a/arch/powerpc/mm/book3s64/hash_utils.c ++++ b/arch/powerpc/mm/book3s64/hash_utils.c +@@ -1522,8 +1522,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap, + } + EXPORT_SYMBOL_GPL(hash_page); + +-DECLARE_INTERRUPT_HANDLER(__do_hash_fault); +-DEFINE_INTERRUPT_HANDLER(__do_hash_fault) ++DEFINE_INTERRUPT_HANDLER(do_hash_fault) + { + unsigned long ea = regs->dar; + unsigned long dsisr = regs->dsisr; +@@ -1582,35 +1581,6 @@ DEFINE_INTERRUPT_HANDLER(__do_hash_fault) + } + } + +-/* +- * The _RAW interrupt entry checks for the in_nmi() case before +- * running the full handler. +- */ +-DEFINE_INTERRUPT_HANDLER_RAW(do_hash_fault) +-{ +- /* +- * If we are in an "NMI" (e.g., an interrupt when soft-disabled), then +- * don't call hash_page, just fail the fault. This is required to +- * prevent re-entrancy problems in the hash code, namely perf +- * interrupts hitting while something holds H_PAGE_BUSY, and taking a +- * hash fault. See the comment in hash_preload(). +- * +- * We come here as a result of a DSI at a point where we don't want +- * to call hash_page, such as when we are accessing memory (possibly +- * user memory) inside a PMU interrupt that occurred while interrupts +- * were soft-disabled. We want to invoke the exception handler for +- * the access, or panic if there isn't a handler. +- */ +- if (unlikely(in_nmi())) { +- do_bad_page_fault_segv(regs); +- return 0; +- } +- +- __do_hash_fault(regs); +- +- return 0; +-} +- + #ifdef CONFIG_PPC_MM_SLICES + static bool should_hash_preload(struct mm_struct *mm, unsigned long ea) + { +@@ -1677,26 +1647,18 @@ static void hash_preload(struct mm_struct *mm, pte_t *ptep, unsigned long ea, + #endif /* CONFIG_PPC_64K_PAGES */ + + /* +- * __hash_page_* must run with interrupts off, as it sets the +- * H_PAGE_BUSY bit. It's possible for perf interrupts to hit at any +- * time and may take a hash fault reading the user stack, see +- * read_user_stack_slow() in the powerpc/perf code. +- * +- * If that takes a hash fault on the same page as we lock here, it +- * will bail out when seeing H_PAGE_BUSY set, and retry the access +- * leading to an infinite loop. ++ * __hash_page_* must run with interrupts off, including PMI interrupts ++ * off, as it sets the H_PAGE_BUSY bit. + * +- * Disabling interrupts here does not prevent perf interrupts, but it +- * will prevent them taking hash faults (see the NMI test in +- * do_hash_page), then read_user_stack's copy_from_user_nofault will +- * fail and perf will fall back to read_user_stack_slow(), which +- * walks the Linux page tables. ++ * It's otherwise possible for perf interrupts to hit at any time and ++ * may take a hash fault reading the user stack, which could take a ++ * hash miss and deadlock on the same H_PAGE_BUSY bit. + * + * Interrupts must also be off for the duration of the + * mm_is_thread_local test and update, to prevent preempt running the + * mm on another CPU (XXX: this may be racy vs kthread_use_mm). + */ +- local_irq_save(flags); ++ powerpc_local_irq_pmu_save(flags); + + /* Is that local to this CPU ? */ + if (mm_is_thread_local(mm)) +@@ -1721,7 +1683,7 @@ static void hash_preload(struct mm_struct *mm, pte_t *ptep, unsigned long ea, + mm_ctx_user_psize(&mm->context), + pte_val(*ptep)); + +- local_irq_restore(flags); ++ powerpc_local_irq_pmu_restore(flags); + } + + /* +diff --git a/arch/powerpc/perf/callchain.h b/arch/powerpc/perf/callchain.h +index d6fa6e25234f..19a8d051ddf1 100644 +--- a/arch/powerpc/perf/callchain.h ++++ b/arch/powerpc/perf/callchain.h +@@ -2,7 +2,6 @@ + #ifndef _POWERPC_PERF_CALLCHAIN_H + #define _POWERPC_PERF_CALLCHAIN_H + +-int read_user_stack_slow(const void __user *ptr, void *buf, int nb); + void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, + struct pt_regs *regs); + void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, +@@ -26,17 +25,11 @@ static inline int __read_user_stack(const void __user *ptr, void *ret, + size_t size) + { + unsigned long addr = (unsigned long)ptr; +- int rc; + + if (addr > TASK_SIZE - size || (addr & (size - 1))) + return -EFAULT; + +- rc = copy_from_user_nofault(ret, ptr, size); +- +- if (IS_ENABLED(CONFIG_PPC64) && !radix_enabled() && rc) +- return read_user_stack_slow(ptr, ret, size); +- +- return rc; ++ return copy_from_user_nofault(ret, ptr, size); + } + + #endif /* _POWERPC_PERF_CALLCHAIN_H */ +diff --git a/arch/powerpc/perf/callchain_64.c b/arch/powerpc/perf/callchain_64.c +index 8d0df4226328..488e8a21a11e 100644 +--- a/arch/powerpc/perf/callchain_64.c ++++ b/arch/powerpc/perf/callchain_64.c +@@ -18,33 +18,6 @@ + + #include "callchain.h" + +-/* +- * On 64-bit we don't want to invoke hash_page on user addresses from +- * interrupt context, so if the access faults, we read the page tables +- * to find which page (if any) is mapped and access it directly. Radix +- * has no need for this so it doesn't use read_user_stack_slow. +- */ +-int read_user_stack_slow(const void __user *ptr, void *buf, int nb) +-{ +- +- unsigned long addr = (unsigned long) ptr; +- unsigned long offset; +- struct page *page; +- void *kaddr; +- +- if (get_user_page_fast_only(addr, FOLL_WRITE, &page)) { +- kaddr = page_address(page); +- +- /* align address to page boundary */ +- offset = addr & ~PAGE_MASK; +- +- memcpy(buf, kaddr + offset, nb); +- put_page(page); +- return 0; +- } +- return -EFAULT; +-} +- + static int read_user_stack_64(const unsigned long __user *ptr, unsigned long *ret) + { + return __read_user_stack(ptr, ret, sizeof(*ret)); +-- +2.35.1 + diff --git a/queue-5.15/powerpc-code-patching-pre-map-patch-area.patch b/queue-5.15/powerpc-code-patching-pre-map-patch-area.patch new file mode 100644 index 00000000000..458473bdd73 --- /dev/null +++ b/queue-5.15/powerpc-code-patching-pre-map-patch-area.patch @@ -0,0 +1,99 @@ +From faaa9ec3a40b620ce8e34013f95cfca26587c8c8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Feb 2022 12:58:21 +1100 +Subject: powerpc/code-patching: Pre-map patch area + +From: Michael Ellerman + +[ Upstream commit 591b4b268435f00d2f0b81f786c2c7bd5ef66416 ] + +Paul reported a warning with DEBUG_ATOMIC_SLEEP=y: + + BUG: sleeping function called from invalid context at include/linux/sched/mm.h:256 + in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0 + preempt_count: 0, expected: 0 + ... + Call Trace: + dump_stack_lvl+0xa0/0xec (unreliable) + __might_resched+0x2f4/0x310 + kmem_cache_alloc+0x220/0x4b0 + __pud_alloc+0x74/0x1d0 + hash__map_kernel_page+0x2cc/0x390 + do_patch_instruction+0x134/0x4a0 + arch_jump_label_transform+0x64/0x78 + __jump_label_update+0x148/0x180 + static_key_enable_cpuslocked+0xd0/0x120 + static_key_enable+0x30/0x50 + check_kvm_guest+0x60/0x88 + pSeries_smp_probe+0x54/0xb0 + smp_prepare_cpus+0x3e0/0x430 + kernel_init_freeable+0x20c/0x43c + kernel_init+0x30/0x1a0 + ret_from_kernel_thread+0x5c/0x64 + +Peter pointed out that this is because do_patch_instruction() has +disabled interrupts, but then map_patch_area() calls map_kernel_page() +then hash__map_kernel_page() which does a sleeping memory allocation. + +We only see the warning in KVM guests with SMT enabled, which is not +particularly common, or on other platforms if CONFIG_KPROBES is +disabled, also not common. The reason we don't see it in most +configurations is that another path that happens to have interrupts +enabled has allocated the required page tables for us, eg. there's a +path in kprobes init that does that. That's just pure luck though. + +As Christophe suggested, the simplest solution is to do a dummy +map/unmap when we initialise the patching, so that any required page +table levels are pre-allocated before the first call to +do_patch_instruction(). This works because the unmap doesn't free any +page tables that were allocated by the map, it just clears the PTE, +leaving the page table levels there for the next map. + +Reported-by: Paul Menzel +Debugged-by: Peter Zijlstra +Suggested-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220223015821.473097-1-mpe@ellerman.id.au +Signed-off-by: Sasha Levin +--- + arch/powerpc/lib/code-patching.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c +index c5ed98823835..b76b31196be1 100644 +--- a/arch/powerpc/lib/code-patching.c ++++ b/arch/powerpc/lib/code-patching.c +@@ -47,9 +47,14 @@ int raw_patch_instruction(u32 *addr, struct ppc_inst instr) + #ifdef CONFIG_STRICT_KERNEL_RWX + static DEFINE_PER_CPU(struct vm_struct *, text_poke_area); + ++static int map_patch_area(void *addr, unsigned long text_poke_addr); ++static void unmap_patch_area(unsigned long addr); ++ + static int text_area_cpu_up(unsigned int cpu) + { + struct vm_struct *area; ++ unsigned long addr; ++ int err; + + area = get_vm_area(PAGE_SIZE, VM_ALLOC); + if (!area) { +@@ -57,6 +62,15 @@ static int text_area_cpu_up(unsigned int cpu) + cpu); + return -1; + } ++ ++ // Map/unmap the area to ensure all page tables are pre-allocated ++ addr = (unsigned long)area->addr; ++ err = map_patch_area(empty_zero_page, addr); ++ if (err) ++ return err; ++ ++ unmap_patch_area(addr); ++ + this_cpu_write(text_poke_area, area); + + return 0; +-- +2.35.1 + diff --git a/queue-5.15/powerpc-dts-t104xrdb-fix-phy-type-for-fman-4-5.patch b/queue-5.15/powerpc-dts-t104xrdb-fix-phy-type-for-fman-4-5.patch new file mode 100644 index 00000000000..e62be96dac1 --- /dev/null +++ b/queue-5.15/powerpc-dts-t104xrdb-fix-phy-type-for-fman-4-5.patch @@ -0,0 +1,47 @@ +From f79ed6066c00d170bac19a75efc4d5c2c9077949 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Dec 2021 18:11:21 +0300 +Subject: powerpc: dts: t104xrdb: fix phy type for FMAN 4/5 + +From: Maxim Kiselev + +[ Upstream commit 17846485dff91acce1ad47b508b633dffc32e838 ] + +T1040RDB has two RTL8211E-VB phys which requires setting +of internal delays for correct work. + +Changing the phy-connection-type property to `rgmii-id` +will fix this issue. + +Signed-off-by: Maxim Kiselev +Reviewed-by: Maxim Kochetkov +Reviewed-by: Vladimir Oltean +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20211230151123.1258321-1-bigunclemax@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi +index 099a598c74c0..bfe1ed5be337 100644 +--- a/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi ++++ b/arch/powerpc/boot/dts/fsl/t104xrdb.dtsi +@@ -139,12 +139,12 @@ + fman@400000 { + ethernet@e6000 { + phy-handle = <&phy_rgmii_0>; +- phy-connection-type = "rgmii"; ++ phy-connection-type = "rgmii-id"; + }; + + ethernet@e8000 { + phy-handle = <&phy_rgmii_1>; +- phy-connection-type = "rgmii"; ++ phy-connection-type = "rgmii-id"; + }; + + mdio0: mdio@fc000 { +-- +2.35.1 + diff --git a/queue-5.15/powerpc-secvar-fix-refcount-leak-in-format_show.patch b/queue-5.15/powerpc-secvar-fix-refcount-leak-in-format_show.patch new file mode 100644 index 00000000000..838521d26c8 --- /dev/null +++ b/queue-5.15/powerpc-secvar-fix-refcount-leak-in-format_show.patch @@ -0,0 +1,49 @@ +From a0ddbd36e3c9c7f0c2680e786fa7129c20b702d0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Mar 2022 10:19:59 +0800 +Subject: powerpc/secvar: fix refcount leak in format_show() + +From: Hangyu Hua + +[ Upstream commit d601fd24e6964967f115f036a840f4f28488f63f ] + +Refcount leak will happen when format_show returns failure in multiple +cases. Unified management of of_node_put can fix this problem. + +Signed-off-by: Hangyu Hua +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220302021959.10959-1-hbh25y@gmail.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/secvar-sysfs.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c +index a0a78aba2083..1ee4640a2641 100644 +--- a/arch/powerpc/kernel/secvar-sysfs.c ++++ b/arch/powerpc/kernel/secvar-sysfs.c +@@ -26,15 +26,18 @@ static ssize_t format_show(struct kobject *kobj, struct kobj_attribute *attr, + const char *format; + + node = of_find_compatible_node(NULL, NULL, "ibm,secvar-backend"); +- if (!of_device_is_available(node)) +- return -ENODEV; ++ if (!of_device_is_available(node)) { ++ rc = -ENODEV; ++ goto out; ++ } + + rc = of_property_read_string(node, "format", &format); + if (rc) +- return rc; ++ goto out; + + rc = sprintf(buf, "%s\n", format); + ++out: + of_node_put(node); + + return rc; +-- +2.35.1 + diff --git a/queue-5.15/powerpc-set-crashkernel-offset-to-mid-of-rma-region.patch b/queue-5.15/powerpc-set-crashkernel-offset-to-mid-of-rma-region.patch new file mode 100644 index 00000000000..e54fa5a3852 --- /dev/null +++ b/queue-5.15/powerpc-set-crashkernel-offset-to-mid-of-rma-region.patch @@ -0,0 +1,90 @@ +From 69bca210d362d92a407064b3c1920f6af20ba514 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Feb 2022 14:26:01 +0530 +Subject: powerpc: Set crashkernel offset to mid of RMA region + +From: Sourabh Jain + +[ Upstream commit 7c5ed82b800d8615cdda00729e7b62e5899f0b13 ] + +On large config LPARs (having 192 and more cores), Linux fails to boot +due to insufficient memory in the first memblock. It is due to the +memory reservation for the crash kernel which starts at 128MB offset of +the first memblock. This memory reservation for the crash kernel doesn't +leave enough space in the first memblock to accommodate other essential +system resources. + +The crash kernel start address was set to 128MB offset by default to +ensure that the crash kernel get some memory below the RMA region which +is used to be of size 256MB. But given that the RMA region size can be +512MB or more, setting the crash kernel offset to mid of RMA size will +leave enough space for the kernel to allocate memory for other system +resources. + +Since the above crash kernel offset change is only applicable to the LPAR +platform, the LPAR feature detection is pushed before the crash kernel +reservation. The rest of LPAR specific initialization will still +be done during pseries_probe_fw_features as usual. + +This patch is dependent on changes to paca allocation for boot CPU. It +expect boot CPU to discover 1T segment support which is introduced by +the patch posted here: +https://lists.ozlabs.org/pipermail/linuxppc-dev/2022-January/239175.html + +Reported-by: Abdul haleem +Signed-off-by: Sourabh Jain +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220204085601.107257-1-sourabhjain@linux.ibm.com +Signed-off-by: Sasha Levin +--- + arch/powerpc/kernel/rtas.c | 6 ++++++ + arch/powerpc/kexec/core.c | 15 +++++++++++---- + 2 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c +index ff80bbad22a5..e18a725a8e5d 100644 +--- a/arch/powerpc/kernel/rtas.c ++++ b/arch/powerpc/kernel/rtas.c +@@ -1235,6 +1235,12 @@ int __init early_init_dt_scan_rtas(unsigned long node, + entryp = of_get_flat_dt_prop(node, "linux,rtas-entry", NULL); + sizep = of_get_flat_dt_prop(node, "rtas-size", NULL); + ++#ifdef CONFIG_PPC64 ++ /* need this feature to decide the crashkernel offset */ ++ if (of_get_flat_dt_prop(node, "ibm,hypertas-functions", NULL)) ++ powerpc_firmware_features |= FW_FEATURE_LPAR; ++#endif ++ + if (basep && entryp && sizep) { + rtas.base = *basep; + rtas.entry = *entryp; +diff --git a/arch/powerpc/kexec/core.c b/arch/powerpc/kexec/core.c +index 48525e8b5730..71b1bfdadd76 100644 +--- a/arch/powerpc/kexec/core.c ++++ b/arch/powerpc/kexec/core.c +@@ -147,11 +147,18 @@ void __init reserve_crashkernel(void) + if (!crashk_res.start) { + #ifdef CONFIG_PPC64 + /* +- * On 64bit we split the RMO in half but cap it at half of +- * a small SLB (128MB) since the crash kernel needs to place +- * itself and some stacks to be in the first segment. ++ * On the LPAR platform place the crash kernel to mid of ++ * RMA size (512MB or more) to ensure the crash kernel ++ * gets enough space to place itself and some stack to be ++ * in the first segment. At the same time normal kernel ++ * also get enough space to allocate memory for essential ++ * system resource in the first segment. Keep the crash ++ * kernel starts at 128MB offset on other platforms. + */ +- crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2)); ++ if (firmware_has_feature(FW_FEATURE_LPAR)) ++ crashk_res.start = ppc64_rma_size / 2; ++ else ++ crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2)); + #else + crashk_res.start = KDUMP_KERNELBASE; + #endif +-- +2.35.1 + diff --git a/queue-5.15/powerpc-set_memory-avoid-spinlock-recursion-in-chang.patch b/queue-5.15/powerpc-set_memory-avoid-spinlock-recursion-in-chang.patch new file mode 100644 index 00000000000..16ee99e55bd --- /dev/null +++ b/queue-5.15/powerpc-set_memory-avoid-spinlock-recursion-in-chang.patch @@ -0,0 +1,139 @@ +From aeda3e70401a66c460c9f04200bb3f5a907b537e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Dec 2021 11:07:33 +0000 +Subject: powerpc/set_memory: Avoid spinlock recursion in change_page_attr() + +From: Christophe Leroy + +[ Upstream commit a4c182ecf33584b9b2d1aa9dad073014a504c01f ] + +Commit 1f9ad21c3b38 ("powerpc/mm: Implement set_memory() routines") +included a spin_lock() to change_page_attr() in order to +safely perform the three step operations. But then +commit 9f7853d7609d ("powerpc/mm: Fix set_memory_*() against +concurrent accesses") modify it to use pte_update() and do +the operation safely against concurrent access. + +In the meantime, Maxime reported some spinlock recursion. + +[ 15.351649] BUG: spinlock recursion on CPU#0, kworker/0:2/217 +[ 15.357540] lock: init_mm+0x3c/0x420, .magic: dead4ead, .owner: kworker/0:2/217, .owner_cpu: 0 +[ 15.366563] CPU: 0 PID: 217 Comm: kworker/0:2 Not tainted 5.15.0+ #523 +[ 15.373350] Workqueue: events do_free_init +[ 15.377615] Call Trace: +[ 15.380232] [e4105ac0] [800946a4] do_raw_spin_lock+0xf8/0x120 (unreliable) +[ 15.387340] [e4105ae0] [8001f4ec] change_page_attr+0x40/0x1d4 +[ 15.393413] [e4105b10] [801424e0] __apply_to_page_range+0x164/0x310 +[ 15.400009] [e4105b60] [80169620] free_pcp_prepare+0x1e4/0x4a0 +[ 15.406045] [e4105ba0] [8016c5a0] free_unref_page+0x40/0x2b8 +[ 15.411979] [e4105be0] [8018724c] kasan_depopulate_vmalloc_pte+0x6c/0x94 +[ 15.418989] [e4105c00] [801424e0] __apply_to_page_range+0x164/0x310 +[ 15.425451] [e4105c50] [80187834] kasan_release_vmalloc+0xbc/0x134 +[ 15.431898] [e4105c70] [8015f7a8] __purge_vmap_area_lazy+0x4e4/0xdd8 +[ 15.438560] [e4105d30] [80160d10] _vm_unmap_aliases.part.0+0x17c/0x24c +[ 15.445283] [e4105d60] [801642d0] __vunmap+0x2f0/0x5c8 +[ 15.450684] [e4105db0] [800e32d0] do_free_init+0x68/0x94 +[ 15.456181] [e4105dd0] [8005d094] process_one_work+0x4bc/0x7b8 +[ 15.462283] [e4105e90] [8005d614] worker_thread+0x284/0x6e8 +[ 15.468227] [e4105f00] [8006aaec] kthread+0x1f0/0x210 +[ 15.473489] [e4105f40] [80017148] ret_from_kernel_thread+0x14/0x1c + +Remove the read / modify / write sequence to make the operation atomic +and remove the spin_lock() in change_page_attr(). + +To do the operation atomically, we can't use pte modification helpers +anymore. Because all platforms have different combination of bits, it +is not easy to use those bits directly. But all have the +_PAGE_KERNEL_{RO/ROX/RW/RWX} set of flags. All we need it to compare +two sets to know which bits are set or cleared. + +For instance, by comparing _PAGE_KERNEL_ROX and _PAGE_KERNEL_RO you +know which bit gets cleared and which bit get set when changing exec +permission. + +Reported-by: Maxime Bizon +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/all/20211212112152.GA27070@sakura/ +Link: https://lore.kernel.org/r/43c3c76a1175ae6dc1a3d3b5c3f7ecb48f683eea.1640344012.git.christophe.leroy@csgroup.eu +Signed-off-by: Sasha Levin +--- + arch/powerpc/mm/pageattr.c | 32 +++++++++++++------------------- + 1 file changed, 13 insertions(+), 19 deletions(-) + +diff --git a/arch/powerpc/mm/pageattr.c b/arch/powerpc/mm/pageattr.c +index 3bb9d168e3b3..85753e32a4de 100644 +--- a/arch/powerpc/mm/pageattr.c ++++ b/arch/powerpc/mm/pageattr.c +@@ -15,12 +15,14 @@ + #include + + ++static pte_basic_t pte_update_delta(pte_t *ptep, unsigned long addr, ++ unsigned long old, unsigned long new) ++{ ++ return pte_update(&init_mm, addr, ptep, old & ~new, new & ~old, 0); ++} ++ + /* +- * Updates the attributes of a page in three steps: +- * +- * 1. take the page_table_lock +- * 2. install the new entry with the updated attributes +- * 3. flush the TLB ++ * Updates the attributes of a page atomically. + * + * This sequence is safe against concurrent updates, and also allows updating the + * attributes of a page currently being executed or accessed. +@@ -28,25 +30,21 @@ + static int change_page_attr(pte_t *ptep, unsigned long addr, void *data) + { + long action = (long)data; +- pte_t pte; + +- spin_lock(&init_mm.page_table_lock); +- +- pte = ptep_get(ptep); +- +- /* modify the PTE bits as desired, then apply */ ++ /* modify the PTE bits as desired */ + switch (action) { + case SET_MEMORY_RO: +- pte = pte_wrprotect(pte); ++ /* Don't clear DIRTY bit */ ++ pte_update_delta(ptep, addr, _PAGE_KERNEL_RW & ~_PAGE_DIRTY, _PAGE_KERNEL_RO); + break; + case SET_MEMORY_RW: +- pte = pte_mkwrite(pte_mkdirty(pte)); ++ pte_update_delta(ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_RW); + break; + case SET_MEMORY_NX: +- pte = pte_exprotect(pte); ++ pte_update_delta(ptep, addr, _PAGE_KERNEL_ROX, _PAGE_KERNEL_RO); + break; + case SET_MEMORY_X: +- pte = pte_mkexec(pte); ++ pte_update_delta(ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_ROX); + break; + case SET_MEMORY_NP: + pte_update(&init_mm, addr, ptep, _PAGE_PRESENT, 0, 0); +@@ -59,16 +57,12 @@ static int change_page_attr(pte_t *ptep, unsigned long addr, void *data) + break; + } + +- pte_update(&init_mm, addr, ptep, ~0UL, pte_val(pte), 0); +- + /* See ptesync comment in radix__set_pte_at() */ + if (radix_enabled()) + asm volatile("ptesync": : :"memory"); + + flush_tlb_kernel_range(addr, addr + PAGE_SIZE); + +- spin_unlock(&init_mm.page_table_lock); +- + return 0; + } + +-- +2.35.1 + diff --git a/queue-5.15/ptp-replace-snprintf-with-sysfs_emit.patch b/queue-5.15/ptp-replace-snprintf-with-sysfs_emit.patch new file mode 100644 index 00000000000..404b29efc0f --- /dev/null +++ b/queue-5.15/ptp-replace-snprintf-with-sysfs_emit.patch @@ -0,0 +1,52 @@ +From d96ab041e91db1ba0f7237044b339016c0100b39 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 08:02:36 +0800 +Subject: ptp: replace snprintf with sysfs_emit + +From: Yang Guang + +[ Upstream commit e2cf07654efb0fd7bbcb475c6f74be7b5755a8fd ] + +coccinelle report: +./drivers/ptp/ptp_sysfs.c:17:8-16: +WARNING: use scnprintf or sprintf +./drivers/ptp/ptp_sysfs.c:390:8-16: +WARNING: use scnprintf or sprintf + +Use sysfs_emit instead of scnprintf or sprintf makes more sense. + +Reported-by: Zeal Robot +Signed-off-by: Yang Guang +Signed-off-by: David Yang +Acked-by: Richard Cochran +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/ptp/ptp_sysfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c +index 41b92dc2f011..9233bfedeb17 100644 +--- a/drivers/ptp/ptp_sysfs.c ++++ b/drivers/ptp/ptp_sysfs.c +@@ -14,7 +14,7 @@ static ssize_t clock_name_show(struct device *dev, + struct device_attribute *attr, char *page) + { + struct ptp_clock *ptp = dev_get_drvdata(dev); +- return snprintf(page, PAGE_SIZE-1, "%s\n", ptp->info->name); ++ return sysfs_emit(page, "%s\n", ptp->info->name); + } + static DEVICE_ATTR_RO(clock_name); + +@@ -387,7 +387,7 @@ static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr, + + mutex_unlock(&ptp->pincfg_mux); + +- return snprintf(page, PAGE_SIZE, "%u %u\n", func, chan); ++ return sysfs_emit(page, "%u %u\n", func, chan); + } + + static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr, +-- +2.35.1 + diff --git a/queue-5.15/riscv-fixed-misaligned-memory-access.-fixed-pointer-.patch b/queue-5.15/riscv-fixed-misaligned-memory-access.-fixed-pointer-.patch new file mode 100644 index 00000000000..7cbc4282f05 --- /dev/null +++ b/queue-5.15/riscv-fixed-misaligned-memory-access.-fixed-pointer-.patch @@ -0,0 +1,421 @@ +From 01167756f4e186a8add566806207bf6fdedd59f1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 20:03:21 -0500 +Subject: riscv: Fixed misaligned memory access. Fixed pointer comparison. + +From: Michael T. Kloos + +[ Upstream commit 9d1f0ec9f71780e69ceb9d91697600c747d6e02e ] + +Rewrote the RISC-V memmove() assembly implementation. The +previous implementation did not check memory alignment and it +compared 2 pointers with a signed comparison. The misaligned +memory access would cause the kernel to crash on systems that +did not emulate it in firmware and did not support it in hardware. +Firmware emulation is slow and may not exist. The RISC-V spec +does not guarantee that support for misaligned memory accesses +will exist. It should not be depended on. + +This patch now checks for XLEN granularity of co-alignment between +the pointers. Failing that, copying is done by loading from the 2 +contiguous and naturally aligned XLEN memory locations containing +the overlapping XLEN sized data to be copied. The data is shifted +into the correct place and binary or'ed together on each +iteration. The result is then stored into the corresponding +naturally aligned XLEN sized location in the destination. For +unaligned data at the terminations of the regions to be copied +or for copies less than (2 * XLEN) in size, byte copy is used. + +This patch also now uses unsigned comparison for the pointers and +migrates to the newer assembler annotations from the now deprecated +ones. + +Signed-off-by: Michael T. Kloos +Signed-off-by: Palmer Dabbelt +Signed-off-by: Sasha Levin +--- + arch/riscv/lib/memmove.S | 368 +++++++++++++++++++++++++++++++++------ + 1 file changed, 310 insertions(+), 58 deletions(-) + +diff --git a/arch/riscv/lib/memmove.S b/arch/riscv/lib/memmove.S +index 07d1d2152ba5..e0609e1f0864 100644 +--- a/arch/riscv/lib/memmove.S ++++ b/arch/riscv/lib/memmove.S +@@ -1,64 +1,316 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ ++/* SPDX-License-Identifier: GPL-2.0-only */ ++/* ++ * Copyright (C) 2022 Michael T. Kloos ++ */ + + #include + #include + +-ENTRY(__memmove) +-WEAK(memmove) +- move t0, a0 +- move t1, a1 +- +- beq a0, a1, exit_memcpy +- beqz a2, exit_memcpy +- srli t2, a2, 0x2 +- +- slt t3, a0, a1 +- beqz t3, do_reverse +- +- andi a2, a2, 0x3 +- li t4, 1 +- beqz t2, byte_copy +- +-word_copy: +- lw t3, 0(a1) +- addi t2, t2, -1 +- addi a1, a1, 4 +- sw t3, 0(a0) +- addi a0, a0, 4 +- bnez t2, word_copy +- beqz a2, exit_memcpy +- j byte_copy +- +-do_reverse: +- add a0, a0, a2 +- add a1, a1, a2 +- andi a2, a2, 0x3 +- li t4, -1 +- beqz t2, reverse_byte_copy +- +-reverse_word_copy: +- addi a1, a1, -4 +- addi t2, t2, -1 +- lw t3, 0(a1) +- addi a0, a0, -4 +- sw t3, 0(a0) +- bnez t2, reverse_word_copy +- beqz a2, exit_memcpy +- +-reverse_byte_copy: +- addi a0, a0, -1 +- addi a1, a1, -1 ++SYM_FUNC_START(__memmove) ++SYM_FUNC_START_WEAK(memmove) ++ /* ++ * Returns ++ * a0 - dest ++ * ++ * Parameters ++ * a0 - Inclusive first byte of dest ++ * a1 - Inclusive first byte of src ++ * a2 - Length of copy n ++ * ++ * Because the return matches the parameter register a0, ++ * we will not clobber or modify that register. ++ * ++ * Note: This currently only works on little-endian. ++ * To port to big-endian, reverse the direction of shifts ++ * in the 2 misaligned fixup copy loops. ++ */ + ++ /* Return if nothing to do */ ++ beq a0, a1, return_from_memmove ++ beqz a2, return_from_memmove ++ ++ /* ++ * Register Uses ++ * Forward Copy: a1 - Index counter of src ++ * Reverse Copy: a4 - Index counter of src ++ * Forward Copy: t3 - Index counter of dest ++ * Reverse Copy: t4 - Index counter of dest ++ * Both Copy Modes: t5 - Inclusive first multibyte/aligned of dest ++ * Both Copy Modes: t6 - Non-Inclusive last multibyte/aligned of dest ++ * Both Copy Modes: t0 - Link / Temporary for load-store ++ * Both Copy Modes: t1 - Temporary for load-store ++ * Both Copy Modes: t2 - Temporary for load-store ++ * Both Copy Modes: a5 - dest to src alignment offset ++ * Both Copy Modes: a6 - Shift ammount ++ * Both Copy Modes: a7 - Inverse Shift ammount ++ * Both Copy Modes: a2 - Alternate breakpoint for unrolled loops ++ */ ++ ++ /* ++ * Solve for some register values now. ++ * Byte copy does not need t5 or t6. ++ */ ++ mv t3, a0 ++ add t4, a0, a2 ++ add a4, a1, a2 ++ ++ /* ++ * Byte copy if copying less than (2 * SZREG) bytes. This can ++ * cause problems with the bulk copy implementation and is ++ * small enough not to bother. ++ */ ++ andi t0, a2, -(2 * SZREG) ++ beqz t0, byte_copy ++ ++ /* ++ * Now solve for t5 and t6. ++ */ ++ andi t5, t3, -SZREG ++ andi t6, t4, -SZREG ++ /* ++ * If dest(Register t3) rounded down to the nearest naturally ++ * aligned SZREG address, does not equal dest, then add SZREG ++ * to find the low-bound of SZREG alignment in the dest memory ++ * region. Note that this could overshoot the dest memory ++ * region if n is less than SZREG. This is one reason why ++ * we always byte copy if n is less than SZREG. ++ * Otherwise, dest is already naturally aligned to SZREG. ++ */ ++ beq t5, t3, 1f ++ addi t5, t5, SZREG ++ 1: ++ ++ /* ++ * If the dest and src are co-aligned to SZREG, then there is ++ * no need for the full rigmarole of a full misaligned fixup copy. ++ * Instead, do a simpler co-aligned copy. ++ */ ++ xor t0, a0, a1 ++ andi t1, t0, (SZREG - 1) ++ beqz t1, coaligned_copy ++ /* Fall through to misaligned fixup copy */ ++ ++misaligned_fixup_copy: ++ bltu a1, a0, misaligned_fixup_copy_reverse ++ ++misaligned_fixup_copy_forward: ++ jal t0, byte_copy_until_aligned_forward ++ ++ andi a5, a1, (SZREG - 1) /* Find the alignment offset of src (a1) */ ++ slli a6, a5, 3 /* Multiply by 8 to convert that to bits to shift */ ++ sub a5, a1, t3 /* Find the difference between src and dest */ ++ andi a1, a1, -SZREG /* Align the src pointer */ ++ addi a2, t6, SZREG /* The other breakpoint for the unrolled loop*/ ++ ++ /* ++ * Compute The Inverse Shift ++ * a7 = XLEN - a6 = XLEN + -a6 ++ * 2s complement negation to find the negative: -a6 = ~a6 + 1 ++ * Add that to XLEN. XLEN = SZREG * 8. ++ */ ++ not a7, a6 ++ addi a7, a7, (SZREG * 8 + 1) ++ ++ /* ++ * Fix Misalignment Copy Loop - Forward ++ * load_val0 = load_ptr[0]; ++ * do { ++ * load_val1 = load_ptr[1]; ++ * store_ptr += 2; ++ * store_ptr[0 - 2] = (load_val0 >> {a6}) | (load_val1 << {a7}); ++ * ++ * if (store_ptr == {a2}) ++ * break; ++ * ++ * load_val0 = load_ptr[2]; ++ * load_ptr += 2; ++ * store_ptr[1 - 2] = (load_val1 >> {a6}) | (load_val0 << {a7}); ++ * ++ * } while (store_ptr != store_ptr_end); ++ * store_ptr = store_ptr_end; ++ */ ++ ++ REG_L t0, (0 * SZREG)(a1) ++ 1: ++ REG_L t1, (1 * SZREG)(a1) ++ addi t3, t3, (2 * SZREG) ++ srl t0, t0, a6 ++ sll t2, t1, a7 ++ or t2, t0, t2 ++ REG_S t2, ((0 * SZREG) - (2 * SZREG))(t3) ++ ++ beq t3, a2, 2f ++ ++ REG_L t0, (2 * SZREG)(a1) ++ addi a1, a1, (2 * SZREG) ++ srl t1, t1, a6 ++ sll t2, t0, a7 ++ or t2, t1, t2 ++ REG_S t2, ((1 * SZREG) - (2 * SZREG))(t3) ++ ++ bne t3, t6, 1b ++ 2: ++ mv t3, t6 /* Fix the dest pointer in case the loop was broken */ ++ ++ add a1, t3, a5 /* Restore the src pointer */ ++ j byte_copy_forward /* Copy any remaining bytes */ ++ ++misaligned_fixup_copy_reverse: ++ jal t0, byte_copy_until_aligned_reverse ++ ++ andi a5, a4, (SZREG - 1) /* Find the alignment offset of src (a4) */ ++ slli a6, a5, 3 /* Multiply by 8 to convert that to bits to shift */ ++ sub a5, a4, t4 /* Find the difference between src and dest */ ++ andi a4, a4, -SZREG /* Align the src pointer */ ++ addi a2, t5, -SZREG /* The other breakpoint for the unrolled loop*/ ++ ++ /* ++ * Compute The Inverse Shift ++ * a7 = XLEN - a6 = XLEN + -a6 ++ * 2s complement negation to find the negative: -a6 = ~a6 + 1 ++ * Add that to XLEN. XLEN = SZREG * 8. ++ */ ++ not a7, a6 ++ addi a7, a7, (SZREG * 8 + 1) ++ ++ /* ++ * Fix Misalignment Copy Loop - Reverse ++ * load_val1 = load_ptr[0]; ++ * do { ++ * load_val0 = load_ptr[-1]; ++ * store_ptr -= 2; ++ * store_ptr[1] = (load_val0 >> {a6}) | (load_val1 << {a7}); ++ * ++ * if (store_ptr == {a2}) ++ * break; ++ * ++ * load_val1 = load_ptr[-2]; ++ * load_ptr -= 2; ++ * store_ptr[0] = (load_val1 >> {a6}) | (load_val0 << {a7}); ++ * ++ * } while (store_ptr != store_ptr_end); ++ * store_ptr = store_ptr_end; ++ */ ++ ++ REG_L t1, ( 0 * SZREG)(a4) ++ 1: ++ REG_L t0, (-1 * SZREG)(a4) ++ addi t4, t4, (-2 * SZREG) ++ sll t1, t1, a7 ++ srl t2, t0, a6 ++ or t2, t1, t2 ++ REG_S t2, ( 1 * SZREG)(t4) ++ ++ beq t4, a2, 2f ++ ++ REG_L t1, (-2 * SZREG)(a4) ++ addi a4, a4, (-2 * SZREG) ++ sll t0, t0, a7 ++ srl t2, t1, a6 ++ or t2, t0, t2 ++ REG_S t2, ( 0 * SZREG)(t4) ++ ++ bne t4, t5, 1b ++ 2: ++ mv t4, t5 /* Fix the dest pointer in case the loop was broken */ ++ ++ add a4, t4, a5 /* Restore the src pointer */ ++ j byte_copy_reverse /* Copy any remaining bytes */ ++ ++/* ++ * Simple copy loops for SZREG co-aligned memory locations. ++ * These also make calls to do byte copies for any unaligned ++ * data at their terminations. ++ */ ++coaligned_copy: ++ bltu a1, a0, coaligned_copy_reverse ++ ++coaligned_copy_forward: ++ jal t0, byte_copy_until_aligned_forward ++ ++ 1: ++ REG_L t1, ( 0 * SZREG)(a1) ++ addi a1, a1, SZREG ++ addi t3, t3, SZREG ++ REG_S t1, (-1 * SZREG)(t3) ++ bne t3, t6, 1b ++ ++ j byte_copy_forward /* Copy any remaining bytes */ ++ ++coaligned_copy_reverse: ++ jal t0, byte_copy_until_aligned_reverse ++ ++ 1: ++ REG_L t1, (-1 * SZREG)(a4) ++ addi a4, a4, -SZREG ++ addi t4, t4, -SZREG ++ REG_S t1, ( 0 * SZREG)(t4) ++ bne t4, t5, 1b ++ ++ j byte_copy_reverse /* Copy any remaining bytes */ ++ ++/* ++ * These are basically sub-functions within the function. They ++ * are used to byte copy until the dest pointer is in alignment. ++ * At which point, a bulk copy method can be used by the ++ * calling code. These work on the same registers as the bulk ++ * copy loops. Therefore, the register values can be picked ++ * up from where they were left and we avoid code duplication ++ * without any overhead except the call in and return jumps. ++ */ ++byte_copy_until_aligned_forward: ++ beq t3, t5, 2f ++ 1: ++ lb t1, 0(a1) ++ addi a1, a1, 1 ++ addi t3, t3, 1 ++ sb t1, -1(t3) ++ bne t3, t5, 1b ++ 2: ++ jalr zero, 0x0(t0) /* Return to multibyte copy loop */ ++ ++byte_copy_until_aligned_reverse: ++ beq t4, t6, 2f ++ 1: ++ lb t1, -1(a4) ++ addi a4, a4, -1 ++ addi t4, t4, -1 ++ sb t1, 0(t4) ++ bne t4, t6, 1b ++ 2: ++ jalr zero, 0x0(t0) /* Return to multibyte copy loop */ ++ ++/* ++ * Simple byte copy loops. ++ * These will byte copy until they reach the end of data to copy. ++ * At that point, they will call to return from memmove. ++ */ + byte_copy: +- lb t3, 0(a1) +- addi a2, a2, -1 +- sb t3, 0(a0) +- add a1, a1, t4 +- add a0, a0, t4 +- bnez a2, byte_copy +- +-exit_memcpy: +- move a0, t0 +- move a1, t1 +- ret +-END(__memmove) ++ bltu a1, a0, byte_copy_reverse ++ ++byte_copy_forward: ++ beq t3, t4, 2f ++ 1: ++ lb t1, 0(a1) ++ addi a1, a1, 1 ++ addi t3, t3, 1 ++ sb t1, -1(t3) ++ bne t3, t4, 1b ++ 2: ++ ret ++ ++byte_copy_reverse: ++ beq t4, t3, 2f ++ 1: ++ lb t1, -1(a4) ++ addi a4, a4, -1 ++ addi t4, t4, -1 ++ sb t1, 0(t4) ++ bne t4, t3, 1b ++ 2: ++ ++return_from_memmove: ++ ret ++ ++SYM_FUNC_END(memmove) ++SYM_FUNC_END(__memmove) +-- +2.35.1 + diff --git a/queue-5.15/rtc-check-return-value-from-mc146818_get_time.patch b/queue-5.15/rtc-check-return-value-from-mc146818_get_time.patch new file mode 100644 index 00000000000..c91f8442447 --- /dev/null +++ b/queue-5.15/rtc-check-return-value-from-mc146818_get_time.patch @@ -0,0 +1,158 @@ +From 29d661a65a22ba1358958748f1156fddec8e271c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 21:01:25 +0100 +Subject: rtc: Check return value from mc146818_get_time() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mateusz Jończyk + +[ Upstream commit 0dd8d6cb9eddfe637bcd821bbfd40ebd5a0737b9 ] + +There are 4 users of mc146818_get_time() and none of them was checking +the return value from this function. Change this. + +Print the appropriate warnings in callers of mc146818_get_time() instead +of in the function mc146818_get_time() itself, in order not to add +strings to rtc-mc146818-lib.c, which is kind of a library. + +The callers of alpha_rtc_read_time() and cmos_read_time() may use the +contents of (struct rtc_time *) even when the functions return a failure +code. Therefore, set the contents of (struct rtc_time *) to 0x00, +which looks more sensible then 0xff and aligns with the (possibly +stale?) comment in cmos_read_time: + + /* + * If pm_trace abused the RTC for storage, set the timespec to 0, + * which tells the caller that this RTC value is unusable. + */ + +For consistency, do this in mc146818_get_time(). + +Note: hpet_rtc_interrupt() may call mc146818_get_time() many times a +second. It is very unlikely, though, that the RTC suddenly stops +working and mc146818_get_time() would consistently fail. + +Only compile-tested on alpha. + +Signed-off-by: Mateusz Jończyk +Cc: Richard Henderson +Cc: Ivan Kokshaysky +Cc: Matt Turner +Cc: Thomas Gleixner +Cc: Ingo Molnar +Cc: Borislav Petkov +Cc: Dave Hansen +Cc: Alessandro Zummo +Cc: Alexandre Belloni +Cc: linux-alpha@vger.kernel.org +Cc: x86@kernel.org +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20211210200131.153887-4-mat.jonczyk@o2.pl +Signed-off-by: Sasha Levin +--- + arch/alpha/kernel/rtc.c | 7 ++++++- + arch/x86/kernel/hpet.c | 8 ++++++-- + drivers/base/power/trace.c | 6 +++++- + drivers/rtc/rtc-cmos.c | 9 ++++++++- + drivers/rtc/rtc-mc146818-lib.c | 2 +- + 5 files changed, 26 insertions(+), 6 deletions(-) + +diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c +index ce3077946e1d..fb3025396ac9 100644 +--- a/arch/alpha/kernel/rtc.c ++++ b/arch/alpha/kernel/rtc.c +@@ -80,7 +80,12 @@ init_rtc_epoch(void) + static int + alpha_rtc_read_time(struct device *dev, struct rtc_time *tm) + { +- mc146818_get_time(tm); ++ int ret = mc146818_get_time(tm); ++ ++ if (ret < 0) { ++ dev_err_ratelimited(dev, "unable to read current time\n"); ++ return ret; ++ } + + /* Adjust for non-default epochs. It's easier to depend on the + generic __get_rtc_time and adjust the epoch here than create +diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c +index 882213df3713..71f336425e58 100644 +--- a/arch/x86/kernel/hpet.c ++++ b/arch/x86/kernel/hpet.c +@@ -1435,8 +1435,12 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) + hpet_rtc_timer_reinit(); + memset(&curr_time, 0, sizeof(struct rtc_time)); + +- if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) +- mc146818_get_time(&curr_time); ++ if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) { ++ if (unlikely(mc146818_get_time(&curr_time) < 0)) { ++ pr_err_ratelimited("unable to read current time from RTC\n"); ++ return IRQ_HANDLED; ++ } ++ } + + if (hpet_rtc_flags & RTC_UIE && + curr_time.tm_sec != hpet_prev_update_sec) { +diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c +index 94665037f4a3..72b7a92337b1 100644 +--- a/drivers/base/power/trace.c ++++ b/drivers/base/power/trace.c +@@ -120,7 +120,11 @@ static unsigned int read_magic_time(void) + struct rtc_time time; + unsigned int val; + +- mc146818_get_time(&time); ++ if (mc146818_get_time(&time) < 0) { ++ pr_err("Unable to read current time from RTC\n"); ++ return 0; ++ } ++ + pr_info("RTC time: %ptRt, date: %ptRd\n", &time, &time); + val = time.tm_year; /* 100 years */ + if (val > 100) +diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c +index dc3f8b0dde98..d0f58cca5c20 100644 +--- a/drivers/rtc/rtc-cmos.c ++++ b/drivers/rtc/rtc-cmos.c +@@ -222,6 +222,8 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr) + + static int cmos_read_time(struct device *dev, struct rtc_time *t) + { ++ int ret; ++ + /* + * If pm_trace abused the RTC for storage, set the timespec to 0, + * which tells the caller that this RTC value is unusable. +@@ -229,7 +231,12 @@ static int cmos_read_time(struct device *dev, struct rtc_time *t) + if (!pm_trace_rtc_valid()) + return -EIO; + +- mc146818_get_time(t); ++ ret = mc146818_get_time(t); ++ if (ret < 0) { ++ dev_err_ratelimited(dev, "unable to read current time\n"); ++ return ret; ++ } ++ + return 0; + } + +diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c +index bd48cee3027e..97e3cebb4da9 100644 +--- a/drivers/rtc/rtc-mc146818-lib.c ++++ b/drivers/rtc/rtc-mc146818-lib.c +@@ -24,7 +24,7 @@ unsigned int mc146818_get_time(struct rtc_time *time) + /* Ensure that the RTC is accessible. Bit 6 must be 0! */ + if (WARN_ON_ONCE((CMOS_READ(RTC_VALID) & 0x40) != 0)) { + spin_unlock_irqrestore(&rtc_lock, flags); +- memset(time, 0xff, sizeof(*time)); ++ memset(time, 0, sizeof(*time)); + return -EIO; + } + +-- +2.35.1 + diff --git a/queue-5.15/rtc-mc146818-lib-change-return-values-of-mc146818_ge.patch b/queue-5.15/rtc-mc146818-lib-change-return-values-of-mc146818_ge.patch new file mode 100644 index 00000000000..01017310525 --- /dev/null +++ b/queue-5.15/rtc-mc146818-lib-change-return-values-of-mc146818_ge.patch @@ -0,0 +1,50 @@ +From 669a20c5c0b3ab57987fc11f9dc0a63f72a95303 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 21:01:24 +0100 +Subject: rtc: mc146818-lib: change return values of mc146818_get_time() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mateusz Jończyk + +[ Upstream commit d35786b3a28dee20b12962ae2dd365892a99ed1a ] + +No function is checking mc146818_get_time() return values yet, so +correct them to make them more customary. + +Signed-off-by: Mateusz Jończyk +Cc: Alessandro Zummo +Cc: Alexandre Belloni +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20211210200131.153887-3-mat.jonczyk@o2.pl +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-mc146818-lib.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c +index 04b05e3b68cb..bd48cee3027e 100644 +--- a/drivers/rtc/rtc-mc146818-lib.c ++++ b/drivers/rtc/rtc-mc146818-lib.c +@@ -25,7 +25,7 @@ unsigned int mc146818_get_time(struct rtc_time *time) + if (WARN_ON_ONCE((CMOS_READ(RTC_VALID) & 0x40) != 0)) { + spin_unlock_irqrestore(&rtc_lock, flags); + memset(time, 0xff, sizeof(*time)); +- return 0; ++ return -EIO; + } + + /* +@@ -116,7 +116,7 @@ unsigned int mc146818_get_time(struct rtc_time *time) + + time->tm_mon--; + +- return RTC_24H; ++ return 0; + } + EXPORT_SYMBOL_GPL(mc146818_get_time); + +-- +2.35.1 + diff --git a/queue-5.15/rtc-mc146818-lib-fix-rtc-presence-check.patch b/queue-5.15/rtc-mc146818-lib-fix-rtc-presence-check.patch new file mode 100644 index 00000000000..c100c4a387b --- /dev/null +++ b/queue-5.15/rtc-mc146818-lib-fix-rtc-presence-check.patch @@ -0,0 +1,167 @@ +From 19536655db26474190049d055db3f0a7b254253e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 10 Dec 2021 21:01:26 +0100 +Subject: rtc: mc146818-lib: fix RTC presence check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mateusz Jończyk + +[ Upstream commit ea6fa4961aab8f90a8aa03575a98b4bda368d4b6 ] + +To prevent an infinite loop in mc146818_get_time(), +commit 211e5db19d15 ("rtc: mc146818: Detect and handle broken RTCs") +added a check for RTC availability. Together with a later fix, it +checked if bit 6 in register 0x0d is cleared. + +This, however, caused a false negative on a motherboard with an AMD +SB710 southbridge; according to the specification [1], bit 6 of register +0x0d of this chipset is a scratchbit. This caused a regression in Linux +5.11 - the RTC was determined broken by the kernel and not used by +rtc-cmos.c [3]. This problem was also reported in Fedora [4]. + +As a better alternative, check whether the UIP ("Update-in-progress") +bit is set for longer then 10ms. If that is the case, then apparently +the RTC is either absent (and all register reads return 0xff) or broken. +Also limit the number of loop iterations in mc146818_get_time() to 10 to +prevent an infinite loop there. + +The functions mc146818_get_time() and mc146818_does_rtc_work() will be +refactored later in this patch series, in order to fix a separate +problem with reading / setting the RTC alarm time. This is done so to +avoid a confusion about what is being fixed when. + +In a previous approach to this problem, I implemented a check whether +the RTC_HOURS register contains a value <= 24. This, however, sometimes +did not work correctly on my Intel Kaby Lake laptop. According to +Intel's documentation [2], "the time and date RAM locations (0-9) are +disconnected from the external bus" during the update cycle so reading +this register without checking the UIP bit is incorrect. + +[1] AMD SB700/710/750 Register Reference Guide, page 308, +https://developer.amd.com/wordpress/media/2012/10/43009_sb7xx_rrg_pub_1.00.pdf + +[2] 7th Generation Intel ® Processor Family I/O for U/Y Platforms [...] Datasheet +Volume 1 of 2, page 209 +Intel's Document Number: 334658-006, +https://www.intel.com/content/dam/www/public/us/en/documents/datasheets/7th-and-8th-gen-core-family-mobile-u-y-processor-lines-i-o-datasheet-vol-1.pdf + +[3] Functions in arch/x86/kernel/rtc.c apparently were using it. + +[4] https://bugzilla.redhat.com/show_bug.cgi?id=1936688 + +Fixes: 211e5db19d15 ("rtc: mc146818: Detect and handle broken RTCs") +Fixes: ebb22a059436 ("rtc: mc146818: Dont test for bit 0-5 in Register D") +Signed-off-by: Mateusz Jończyk +Cc: Thomas Gleixner +Cc: Alessandro Zummo +Cc: Alexandre Belloni +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20211210200131.153887-5-mat.jonczyk@o2.pl +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-cmos.c | 10 ++++------ + drivers/rtc/rtc-mc146818-lib.c | 34 ++++++++++++++++++++++++++++++---- + include/linux/mc146818rtc.h | 1 + + 3 files changed, 35 insertions(+), 10 deletions(-) + +diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c +index d0f58cca5c20..b90a603d6b12 100644 +--- a/drivers/rtc/rtc-cmos.c ++++ b/drivers/rtc/rtc-cmos.c +@@ -800,16 +800,14 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) + + rename_region(ports, dev_name(&cmos_rtc.rtc->dev)); + +- spin_lock_irq(&rtc_lock); +- +- /* Ensure that the RTC is accessible. Bit 6 must be 0! */ +- if ((CMOS_READ(RTC_VALID) & 0x40) != 0) { +- spin_unlock_irq(&rtc_lock); +- dev_warn(dev, "not accessible\n"); ++ if (!mc146818_does_rtc_work()) { ++ dev_warn(dev, "broken or not accessible\n"); + retval = -ENXIO; + goto cleanup1; + } + ++ spin_lock_irq(&rtc_lock); ++ + if (!(flags & CMOS_RTC_FLAGS_NOFREQ)) { + /* force periodic irq to CMOS reset default of 1024Hz; + * +diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c +index 97e3cebb4da9..70137566981e 100644 +--- a/drivers/rtc/rtc-mc146818-lib.c ++++ b/drivers/rtc/rtc-mc146818-lib.c +@@ -8,10 +8,36 @@ + #include + #endif + ++/* ++ * If the UIP (Update-in-progress) bit of the RTC is set for more then ++ * 10ms, the RTC is apparently broken or not present. ++ */ ++bool mc146818_does_rtc_work(void) ++{ ++ int i; ++ unsigned char val; ++ unsigned long flags; ++ ++ for (i = 0; i < 10; i++) { ++ spin_lock_irqsave(&rtc_lock, flags); ++ val = CMOS_READ(RTC_FREQ_SELECT); ++ spin_unlock_irqrestore(&rtc_lock, flags); ++ ++ if ((val & RTC_UIP) == 0) ++ return true; ++ ++ mdelay(1); ++ } ++ ++ return false; ++} ++EXPORT_SYMBOL_GPL(mc146818_does_rtc_work); ++ + unsigned int mc146818_get_time(struct rtc_time *time) + { + unsigned char ctrl; + unsigned long flags; ++ unsigned int iter_count = 0; + unsigned char century = 0; + bool retry; + +@@ -20,13 +46,13 @@ unsigned int mc146818_get_time(struct rtc_time *time) + #endif + + again: +- spin_lock_irqsave(&rtc_lock, flags); +- /* Ensure that the RTC is accessible. Bit 6 must be 0! */ +- if (WARN_ON_ONCE((CMOS_READ(RTC_VALID) & 0x40) != 0)) { +- spin_unlock_irqrestore(&rtc_lock, flags); ++ if (iter_count > 10) { + memset(time, 0, sizeof(*time)); + return -EIO; + } ++ iter_count++; ++ ++ spin_lock_irqsave(&rtc_lock, flags); + + /* + * Check whether there is an update in progress during which the +diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h +index 0661af17a758..69c80c4325bf 100644 +--- a/include/linux/mc146818rtc.h ++++ b/include/linux/mc146818rtc.h +@@ -123,6 +123,7 @@ struct cmos_rtc_board_info { + #define RTC_IO_EXTENT_USED RTC_IO_EXTENT + #endif /* ARCH_RTC_LOCATION */ + ++bool mc146818_does_rtc_work(void); + unsigned int mc146818_get_time(struct rtc_time *time); + int mc146818_set_time(struct rtc_time *time); + +-- +2.35.1 + diff --git a/queue-5.15/rtc-wm8350-handle-error-for-wm8350_register_irq.patch b/queue-5.15/rtc-wm8350-handle-error-for-wm8350_register_irq.patch new file mode 100644 index 00000000000..12596afb39f --- /dev/null +++ b/queue-5.15/rtc-wm8350-handle-error-for-wm8350_register_irq.patch @@ -0,0 +1,55 @@ +From ec4907ae3354cb6f2a548f7f851cb8ec60c23e25 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Mar 2022 16:50:30 +0800 +Subject: rtc: wm8350: Handle error for wm8350_register_irq + +From: Jiasheng Jiang + +[ Upstream commit 43f0269b6b89c1eec4ef83c48035608f4dcdd886 ] + +As the potential failure of the wm8350_register_irq(), +it should be better to check it and return error if fails. +Also, it need not free 'wm_rtc->rtc' since it will be freed +automatically. + +Fixes: 077eaf5b40ec ("rtc: rtc-wm8350: add support for WM8350 RTC") +Signed-off-by: Jiasheng Jiang +Acked-by: Charles Keepax +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20220303085030.291793-1-jiasheng@iscas.ac.cn +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-wm8350.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c +index 2018614f258f..6eaa9321c074 100644 +--- a/drivers/rtc/rtc-wm8350.c ++++ b/drivers/rtc/rtc-wm8350.c +@@ -432,14 +432,21 @@ static int wm8350_rtc_probe(struct platform_device *pdev) + return ret; + } + +- wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC, ++ ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC, + wm8350_rtc_update_handler, 0, + "RTC Seconds", wm8350); ++ if (ret) ++ return ret; ++ + wm8350_mask_irq(wm8350, WM8350_IRQ_RTC_SEC); + +- wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM, ++ ret = wm8350_register_irq(wm8350, WM8350_IRQ_RTC_ALM, + wm8350_rtc_alarm_handler, 0, + "RTC Alarm", wm8350); ++ if (ret) { ++ wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350); ++ return ret; ++ } + + return 0; + } +-- +2.35.1 + diff --git a/queue-5.15/scsi-aha152x-fix-aha152x_setup-__setup-handler-retur.patch b/queue-5.15/scsi-aha152x-fix-aha152x_setup-__setup-handler-retur.patch new file mode 100644 index 00000000000..ea6632163a3 --- /dev/null +++ b/queue-5.15/scsi-aha152x-fix-aha152x_setup-__setup-handler-retur.patch @@ -0,0 +1,52 @@ +From e45fe8e6161169d4b29fa510607b08e6d5c61628 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 22 Feb 2022 16:06:23 -0800 +Subject: scsi: aha152x: Fix aha152x_setup() __setup handler return value + +From: Randy Dunlap + +[ Upstream commit cc8294ec4738d25e2bb2d71f7d82a9bf7f4a157b ] + +__setup() handlers should return 1 if the command line option is handled +and 0 if not (or maybe never return 0; doing so just pollutes init's +environment with strings that are not init arguments/parameters). + +Return 1 from aha152x_setup() to indicate that the boot option has been +handled. + +Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru +Link: https://lore.kernel.org/r/20220223000623.5920-1-rdunlap@infradead.org +Cc: "Juergen E. Fischer" +Cc: "James E.J. Bottomley" +Cc: "Martin K. Petersen" +Reported-by: Igor Zhbanov +Signed-off-by: Randy Dunlap +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/aha152x.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c +index b13b5c85f3de..75a5a4765f42 100644 +--- a/drivers/scsi/aha152x.c ++++ b/drivers/scsi/aha152x.c +@@ -3370,13 +3370,11 @@ static int __init aha152x_setup(char *str) + setup[setup_count].synchronous = ints[0] >= 6 ? ints[6] : 1; + setup[setup_count].delay = ints[0] >= 7 ? ints[7] : DELAY_DEFAULT; + setup[setup_count].ext_trans = ints[0] >= 8 ? ints[8] : 0; +- if (ints[0] > 8) { /*}*/ ++ if (ints[0] > 8) + printk(KERN_NOTICE "aha152x: usage: aha152x=[,[," + "[,[,[,[,[,]]]]]]]\n"); +- } else { ++ else + setup_count++; +- return 0; +- } + + return 1; + } +-- +2.35.1 + diff --git a/queue-5.15/scsi-bfa-replace-snprintf-with-sysfs_emit.patch b/queue-5.15/scsi-bfa-replace-snprintf-with-sysfs_emit.patch new file mode 100644 index 00000000000..64dd5a2e91e --- /dev/null +++ b/queue-5.15/scsi-bfa-replace-snprintf-with-sysfs_emit.patch @@ -0,0 +1,169 @@ +From f7072e36963c3deb6d8c7adad05152202bb93fef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 08:03:46 +0800 +Subject: scsi: bfa: Replace snprintf() with sysfs_emit() + +From: Yang Guang + +[ Upstream commit 2245ea91fd3a04cafbe2f54911432a8657528c3b ] + +coccinelle report: +./drivers/scsi/bfa/bfad_attr.c:908:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:860:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:888:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:853:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:808:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:728:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:822:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:927:9-17: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:900:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:874:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:714:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/bfa/bfad_attr.c:839:8-16: +WARNING: use scnprintf or sprintf + +Use sysfs_emit() instead of scnprintf() or sprintf(). + +Link: https://lore.kernel.org/r/def83ff75faec64ba592b867a8499b1367bae303.1643181468.git.yang.guang5@zte.com.cn +Reported-by: Zeal Robot +Signed-off-by: Yang Guang +Signed-off-by: David Yang +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/bfa/bfad_attr.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c +index 5ae1e3f78910..e049cdb3c286 100644 +--- a/drivers/scsi/bfa/bfad_attr.c ++++ b/drivers/scsi/bfa/bfad_attr.c +@@ -711,7 +711,7 @@ bfad_im_serial_num_show(struct device *dev, struct device_attribute *attr, + char serial_num[BFA_ADAPTER_SERIAL_NUM_LEN]; + + bfa_get_adapter_serial_num(&bfad->bfa, serial_num); +- return snprintf(buf, PAGE_SIZE, "%s\n", serial_num); ++ return sysfs_emit(buf, "%s\n", serial_num); + } + + static ssize_t +@@ -725,7 +725,7 @@ bfad_im_model_show(struct device *dev, struct device_attribute *attr, + char model[BFA_ADAPTER_MODEL_NAME_LEN]; + + bfa_get_adapter_model(&bfad->bfa, model); +- return snprintf(buf, PAGE_SIZE, "%s\n", model); ++ return sysfs_emit(buf, "%s\n", model); + } + + static ssize_t +@@ -805,7 +805,7 @@ bfad_im_model_desc_show(struct device *dev, struct device_attribute *attr, + snprintf(model_descr, BFA_ADAPTER_MODEL_DESCR_LEN, + "Invalid Model"); + +- return snprintf(buf, PAGE_SIZE, "%s\n", model_descr); ++ return sysfs_emit(buf, "%s\n", model_descr); + } + + static ssize_t +@@ -819,7 +819,7 @@ bfad_im_node_name_show(struct device *dev, struct device_attribute *attr, + u64 nwwn; + + nwwn = bfa_fcs_lport_get_nwwn(port->fcs_port); +- return snprintf(buf, PAGE_SIZE, "0x%llx\n", cpu_to_be64(nwwn)); ++ return sysfs_emit(buf, "0x%llx\n", cpu_to_be64(nwwn)); + } + + static ssize_t +@@ -836,7 +836,7 @@ bfad_im_symbolic_name_show(struct device *dev, struct device_attribute *attr, + bfa_fcs_lport_get_attr(&bfad->bfa_fcs.fabric.bport, &port_attr); + strlcpy(symname, port_attr.port_cfg.sym_name.symname, + BFA_SYMNAME_MAXLEN); +- return snprintf(buf, PAGE_SIZE, "%s\n", symname); ++ return sysfs_emit(buf, "%s\n", symname); + } + + static ssize_t +@@ -850,14 +850,14 @@ bfad_im_hw_version_show(struct device *dev, struct device_attribute *attr, + char hw_ver[BFA_VERSION_LEN]; + + bfa_get_pci_chip_rev(&bfad->bfa, hw_ver); +- return snprintf(buf, PAGE_SIZE, "%s\n", hw_ver); ++ return sysfs_emit(buf, "%s\n", hw_ver); + } + + static ssize_t + bfad_im_drv_version_show(struct device *dev, struct device_attribute *attr, + char *buf) + { +- return snprintf(buf, PAGE_SIZE, "%s\n", BFAD_DRIVER_VERSION); ++ return sysfs_emit(buf, "%s\n", BFAD_DRIVER_VERSION); + } + + static ssize_t +@@ -871,7 +871,7 @@ bfad_im_optionrom_version_show(struct device *dev, + char optrom_ver[BFA_VERSION_LEN]; + + bfa_get_adapter_optrom_ver(&bfad->bfa, optrom_ver); +- return snprintf(buf, PAGE_SIZE, "%s\n", optrom_ver); ++ return sysfs_emit(buf, "%s\n", optrom_ver); + } + + static ssize_t +@@ -885,7 +885,7 @@ bfad_im_fw_version_show(struct device *dev, struct device_attribute *attr, + char fw_ver[BFA_VERSION_LEN]; + + bfa_get_adapter_fw_ver(&bfad->bfa, fw_ver); +- return snprintf(buf, PAGE_SIZE, "%s\n", fw_ver); ++ return sysfs_emit(buf, "%s\n", fw_ver); + } + + static ssize_t +@@ -897,7 +897,7 @@ bfad_im_num_of_ports_show(struct device *dev, struct device_attribute *attr, + (struct bfad_im_port_s *) shost->hostdata[0]; + struct bfad_s *bfad = im_port->bfad; + +- return snprintf(buf, PAGE_SIZE, "%d\n", ++ return sysfs_emit(buf, "%d\n", + bfa_get_nports(&bfad->bfa)); + } + +@@ -905,7 +905,7 @@ static ssize_t + bfad_im_drv_name_show(struct device *dev, struct device_attribute *attr, + char *buf) + { +- return snprintf(buf, PAGE_SIZE, "%s\n", BFAD_DRIVER_NAME); ++ return sysfs_emit(buf, "%s\n", BFAD_DRIVER_NAME); + } + + static ssize_t +@@ -924,14 +924,14 @@ bfad_im_num_of_discovered_ports_show(struct device *dev, + rports = kcalloc(nrports, sizeof(struct bfa_rport_qualifier_s), + GFP_ATOMIC); + if (rports == NULL) +- return snprintf(buf, PAGE_SIZE, "Failed\n"); ++ return sysfs_emit(buf, "Failed\n"); + + spin_lock_irqsave(&bfad->bfad_lock, flags); + bfa_fcs_lport_get_rport_quals(port->fcs_port, rports, &nrports); + spin_unlock_irqrestore(&bfad->bfad_lock, flags); + kfree(rports); + +- return snprintf(buf, PAGE_SIZE, "%d\n", nrports); ++ return sysfs_emit(buf, "%d\n", nrports); + } + + static DEVICE_ATTR(serial_number, S_IRUGO, +-- +2.35.1 + diff --git a/queue-5.15/scsi-hisi_sas-free-irq-vectors-in-order-for-v3-hw.patch b/queue-5.15/scsi-hisi_sas-free-irq-vectors-in-order-for-v3-hw.patch new file mode 100644 index 00000000000..61dcb55aa15 --- /dev/null +++ b/queue-5.15/scsi-hisi_sas-free-irq-vectors-in-order-for-v3-hw.patch @@ -0,0 +1,109 @@ +From a45c4c4d39cdd906caab148e7145327ccbe235bc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Feb 2022 19:51:26 +0800 +Subject: scsi: hisi_sas: Free irq vectors in order for v3 HW + +From: Qi Liu + +[ Upstream commit 554fb72ee34f4732c7f694f56c3c6e67790352a0 ] + +If the driver probe fails to request the channel IRQ or fatal IRQ, the +driver will free the IRQ vectors before freeing the IRQs in free_irq(), +and this will cause a kernel BUG like this: + +------------[ cut here ]------------ +kernel BUG at drivers/pci/msi.c:369! +Internal error: Oops - BUG: 0 [#1] PREEMPT SMP +Call trace: + free_msi_irqs+0x118/0x13c + pci_disable_msi+0xfc/0x120 + pci_free_irq_vectors+0x24/0x3c + hisi_sas_v3_probe+0x360/0x9d0 [hisi_sas_v3_hw] + local_pci_probe+0x44/0xb0 + work_for_cpu_fn+0x20/0x34 + process_one_work+0x1d0/0x340 + worker_thread+0x2e0/0x460 + kthread+0x180/0x190 + ret_from_fork+0x10/0x20 +---[ end trace b88990335b610c11 ]--- + +So we use devm_add_action() to control the order in which we free the +vectors. + +Link: https://lore.kernel.org/r/1645703489-87194-4-git-send-email-john.garry@huawei.com +Signed-off-by: Qi Liu +Signed-off-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +index 1942970f9eb7..6010acae4cf3 100644 +--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c ++++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +@@ -2392,17 +2392,25 @@ static irqreturn_t cq_interrupt_v3_hw(int irq_no, void *p) + return IRQ_WAKE_THREAD; + } + ++static void hisi_sas_v3_free_vectors(void *data) ++{ ++ struct pci_dev *pdev = data; ++ ++ pci_free_irq_vectors(pdev); ++} ++ + static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) + { + int vectors; + int max_msi = HISI_SAS_MSI_COUNT_V3_HW, min_msi; + struct Scsi_Host *shost = hisi_hba->shost; ++ struct pci_dev *pdev = hisi_hba->pci_dev; + struct irq_affinity desc = { + .pre_vectors = BASE_VECTORS_V3_HW, + }; + + min_msi = MIN_AFFINE_VECTORS_V3_HW; +- vectors = pci_alloc_irq_vectors_affinity(hisi_hba->pci_dev, ++ vectors = pci_alloc_irq_vectors_affinity(pdev, + min_msi, max_msi, + PCI_IRQ_MSI | + PCI_IRQ_AFFINITY, +@@ -2414,6 +2422,7 @@ static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) + hisi_hba->cq_nvecs = vectors - BASE_VECTORS_V3_HW; + shost->nr_hw_queues = hisi_hba->cq_nvecs; + ++ devm_add_action(&pdev->dev, hisi_sas_v3_free_vectors, pdev); + return 0; + } + +@@ -4763,7 +4772,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) + dev_err(dev, "%d hw queues\n", shost->nr_hw_queues); + rc = scsi_add_host(shost, dev); + if (rc) +- goto err_out_free_irq_vectors; ++ goto err_out_debugfs; + + rc = sas_register_ha(sha); + if (rc) +@@ -4792,8 +4801,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) + sas_unregister_ha(sha); + err_out_register_ha: + scsi_remove_host(shost); +-err_out_free_irq_vectors: +- pci_free_irq_vectors(pdev); + err_out_debugfs: + debugfs_exit_v3_hw(hisi_hba); + err_out_ha: +@@ -4821,7 +4828,6 @@ hisi_sas_v3_destroy_irqs(struct pci_dev *pdev, struct hisi_hba *hisi_hba) + + devm_free_irq(&pdev->dev, pci_irq_vector(pdev, nr), cq); + } +- pci_free_irq_vectors(pdev); + } + + static void hisi_sas_v3_remove(struct pci_dev *pdev) +-- +2.35.1 + diff --git a/queue-5.15/scsi-hisi_sas-limit-users-changing-debugfs-bist-coun.patch b/queue-5.15/scsi-hisi_sas-limit-users-changing-debugfs-bist-coun.patch new file mode 100644 index 00000000000..24da6197e02 --- /dev/null +++ b/queue-5.15/scsi-hisi_sas-limit-users-changing-debugfs-bist-coun.patch @@ -0,0 +1,95 @@ +From 47741b3d2b78aaae0a7bb950cbab1b1b0f8179b1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Feb 2022 19:51:28 +0800 +Subject: scsi: hisi_sas: Limit users changing debugfs BIST count value + +From: Xiang Chen + +[ Upstream commit 286ce4c65fbdf5eb9d4d5f4e4997c4e32bf1b073 ] + +Add a file operation for "cnt" file under bist directory, so users can only +read "cnt" or clear "cnt" to zero, but cannot randomly modify. + +Link: https://lore.kernel.org/r/1645703489-87194-6-git-send-email-john.garry@huawei.com +Signed-off-by: Xiang Chen +Signed-off-by: Qi Liu +Signed-off-by: John Garry +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 52 +++++++++++++++++++++++++- + 1 file changed, 50 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +index 6010acae4cf3..1f5e0688c0c8 100644 +--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c ++++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +@@ -3968,6 +3968,54 @@ static const struct file_operations debugfs_bist_phy_v3_hw_fops = { + .owner = THIS_MODULE, + }; + ++static ssize_t debugfs_bist_cnt_v3_hw_write(struct file *filp, ++ const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct seq_file *m = filp->private_data; ++ struct hisi_hba *hisi_hba = m->private; ++ unsigned int cnt; ++ int val; ++ ++ if (hisi_hba->debugfs_bist_enable) ++ return -EPERM; ++ ++ val = kstrtouint_from_user(buf, count, 0, &cnt); ++ if (val) ++ return val; ++ ++ if (cnt) ++ return -EINVAL; ++ ++ hisi_hba->debugfs_bist_cnt = 0; ++ return count; ++} ++ ++static int debugfs_bist_cnt_v3_hw_show(struct seq_file *s, void *p) ++{ ++ struct hisi_hba *hisi_hba = s->private; ++ ++ seq_printf(s, "%u\n", hisi_hba->debugfs_bist_cnt); ++ ++ return 0; ++} ++ ++static int debugfs_bist_cnt_v3_hw_open(struct inode *inode, ++ struct file *filp) ++{ ++ return single_open(filp, debugfs_bist_cnt_v3_hw_show, ++ inode->i_private); ++} ++ ++static const struct file_operations debugfs_bist_cnt_v3_hw_ops = { ++ .open = debugfs_bist_cnt_v3_hw_open, ++ .read = seq_read, ++ .write = debugfs_bist_cnt_v3_hw_write, ++ .llseek = seq_lseek, ++ .release = single_release, ++ .owner = THIS_MODULE, ++}; ++ + static const struct { + int value; + char *name; +@@ -4605,8 +4653,8 @@ static void debugfs_bist_init_v3_hw(struct hisi_hba *hisi_hba) + debugfs_create_file("phy_id", 0600, hisi_hba->debugfs_bist_dentry, + hisi_hba, &debugfs_bist_phy_v3_hw_fops); + +- debugfs_create_u32("cnt", 0600, hisi_hba->debugfs_bist_dentry, +- &hisi_hba->debugfs_bist_cnt); ++ debugfs_create_file("cnt", 0600, hisi_hba->debugfs_bist_dentry, ++ hisi_hba, &debugfs_bist_cnt_v3_hw_ops); + + debugfs_create_file("loopback_mode", 0600, + hisi_hba->debugfs_bist_dentry, +-- +2.35.1 + diff --git a/queue-5.15/scsi-libfc-fix-use-after-free-in-fc_exch_abts_resp.patch b/queue-5.15/scsi-libfc-fix-use-after-free-in-fc_exch_abts_resp.patch new file mode 100644 index 00000000000..bff0bf84c3a --- /dev/null +++ b/queue-5.15/scsi-libfc-fix-use-after-free-in-fc_exch_abts_resp.patch @@ -0,0 +1,39 @@ +From 0d077abf9f41e00ba8372927f4a9d3aafae6f451 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Mar 2022 09:51:15 +0800 +Subject: scsi: libfc: Fix use after free in fc_exch_abts_resp() + +From: Jianglei Nie + +[ Upstream commit 271add11994ba1a334859069367e04d2be2ebdd4 ] + +fc_exch_release(ep) will decrease the ep's reference count. When the +reference count reaches zero, it is freed. But ep is still used in the +following code, which will lead to a use after free. + +Return after the fc_exch_release() call to avoid use after free. + +Link: https://lore.kernel.org/r/20220303015115.459778-1-niejianglei2021@163.com +Reviewed-by: Hannes Reinecke +Signed-off-by: Jianglei Nie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/libfc/fc_exch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c +index 841000445b9a..aa223db4cf53 100644 +--- a/drivers/scsi/libfc/fc_exch.c ++++ b/drivers/scsi/libfc/fc_exch.c +@@ -1701,6 +1701,7 @@ static void fc_exch_abts_resp(struct fc_exch *ep, struct fc_frame *fp) + if (cancel_delayed_work_sync(&ep->timeout_work)) { + FC_EXCH_DBG(ep, "Exchange timer canceled due to ABTS response\n"); + fc_exch_release(ep); /* release from pending timer hold */ ++ return; + } + + spin_lock_bh(&ep->ex_lock); +-- +2.35.1 + diff --git a/queue-5.15/scsi-mpi3mr-fix-memory-leaks.patch b/queue-5.15/scsi-mpi3mr-fix-memory-leaks.patch new file mode 100644 index 00000000000..8fb1f180ba9 --- /dev/null +++ b/queue-5.15/scsi-mpi3mr-fix-memory-leaks.patch @@ -0,0 +1,36 @@ +From ff064162fcc83a6bdfd95801c83b4e422d016dd1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Feb 2022 15:28:16 +0530 +Subject: scsi: mpi3mr: Fix memory leaks + +From: Sreekanth Reddy + +[ Upstream commit d44b5fefb22e139408ae12b864da1ecb9ad9d1d2 ] + +Fix memory leaks related to operational reply queue's memory segments which +are not getting freed while unloading the driver. + +Link: https://lore.kernel.org/r/20220210095817.22828-9-sreekanth.reddy@broadcom.com +Signed-off-by: Sreekanth Reddy +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c +index 5af36c54cb59..3ef6b6edef46 100644 +--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c ++++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c +@@ -1275,7 +1275,7 @@ static void mpi3mr_free_op_req_q_segments(struct mpi3mr_ioc *mrioc, u16 q_idx) + MPI3MR_MAX_SEG_LIST_SIZE, + mrioc->req_qinfo[q_idx].q_segment_list, + mrioc->req_qinfo[q_idx].q_segment_list_dma); +- mrioc->op_reply_qinfo[q_idx].q_segment_list = NULL; ++ mrioc->req_qinfo[q_idx].q_segment_list = NULL; + } + } else + size = mrioc->req_qinfo[q_idx].segment_qd * +-- +2.35.1 + diff --git a/queue-5.15/scsi-mpi3mr-fix-reporting-of-actual-data-transfer-si.patch b/queue-5.15/scsi-mpi3mr-fix-reporting-of-actual-data-transfer-si.patch new file mode 100644 index 00000000000..fe51a148a69 --- /dev/null +++ b/queue-5.15/scsi-mpi3mr-fix-reporting-of-actual-data-transfer-si.patch @@ -0,0 +1,37 @@ +From e8f228262a281120c59791de88e892bc7954902f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Feb 2022 15:28:14 +0530 +Subject: scsi: mpi3mr: Fix reporting of actual data transfer size + +From: Sreekanth Reddy + +[ Upstream commit 9992246127246a27cc7184f05cce6f62ac48f84e ] + +The driver is missing to set the residual size while completing an +I/O. Ensure proper data transfer size is reported to the kernel on I/O +completion based on the transfer length reported by the firmware. + +Link: https://lore.kernel.org/r/20220210095817.22828-7-sreekanth.reddy@broadcom.com +Signed-off-by: Sreekanth Reddy +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mpi3mr/mpi3mr_os.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c +index 3cae8803383b..b2c650542bac 100644 +--- a/drivers/scsi/mpi3mr/mpi3mr_os.c ++++ b/drivers/scsi/mpi3mr/mpi3mr_os.c +@@ -2204,6 +2204,8 @@ void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc, + scmd->result = DID_OK << 16; + goto out_success; + } ++ ++ scsi_set_resid(scmd, scsi_bufflen(scmd) - xfer_count); + if (ioc_status == MPI3_IOCSTATUS_SCSI_DATA_UNDERRUN && + xfer_count == 0 && (scsi_status == MPI3_SCSI_STATUS_BUSY || + scsi_status == MPI3_SCSI_STATUS_RESERVATION_CONFLICT || +-- +2.35.1 + diff --git a/queue-5.15/scsi-mvsas-replace-snprintf-with-sysfs_emit.patch b/queue-5.15/scsi-mvsas-replace-snprintf-with-sysfs_emit.patch new file mode 100644 index 00000000000..dff7904953e --- /dev/null +++ b/queue-5.15/scsi-mvsas-replace-snprintf-with-sysfs_emit.patch @@ -0,0 +1,52 @@ +From 753e953bc7fa1e4dd015288509f35cbc0a392c03 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 27 Jan 2022 08:00:59 +0800 +Subject: scsi: mvsas: Replace snprintf() with sysfs_emit() + +From: Yang Guang + +[ Upstream commit 0ad3867b0f13e45cfee5a1298bfd40eef096116c ] + +coccinelle report: +./drivers/scsi/mvsas/mv_init.c:699:8-16: +WARNING: use scnprintf or sprintf +./drivers/scsi/mvsas/mv_init.c:747:8-16: +WARNING: use scnprintf or sprintf + +Use sysfs_emit() instead of scnprintf() or sprintf(). + +Link: https://lore.kernel.org/r/c1711f7cf251730a8ceb5bdfc313bf85662b3395.1643182948.git.yang.guang5@zte.com.cn +Reported-by: Zeal Robot +Signed-off-by: Yang Guang +Signed-off-by: David Yang +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/mvsas/mv_init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c +index f18dd9703595..787cf439ba57 100644 +--- a/drivers/scsi/mvsas/mv_init.c ++++ b/drivers/scsi/mvsas/mv_init.c +@@ -696,7 +696,7 @@ static struct pci_driver mvs_pci_driver = { + static ssize_t driver_version_show(struct device *cdev, + struct device_attribute *attr, char *buffer) + { +- return snprintf(buffer, PAGE_SIZE, "%s\n", DRV_VERSION); ++ return sysfs_emit(buffer, "%s\n", DRV_VERSION); + } + + static DEVICE_ATTR_RO(driver_version); +@@ -744,7 +744,7 @@ static ssize_t interrupt_coalescing_store(struct device *cdev, + static ssize_t interrupt_coalescing_show(struct device *cdev, + struct device_attribute *attr, char *buffer) + { +- return snprintf(buffer, PAGE_SIZE, "%d\n", interrupt_coalescing); ++ return sysfs_emit(buffer, "%d\n", interrupt_coalescing); + } + + static DEVICE_ATTR_RW(interrupt_coalescing); +-- +2.35.1 + diff --git a/queue-5.15/scsi-pm8001-fix-memory-leak-in-pm8001_chip_fw_flash_.patch b/queue-5.15/scsi-pm8001-fix-memory-leak-in-pm8001_chip_fw_flash_.patch new file mode 100644 index 00000000000..b20a1bf0b14 --- /dev/null +++ b/queue-5.15/scsi-pm8001-fix-memory-leak-in-pm8001_chip_fw_flash_.patch @@ -0,0 +1,41 @@ +From 3cf2b347016ab7bb1091a6501c3200d2d99ce147 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Feb 2022 12:18:01 +0900 +Subject: scsi: pm8001: Fix memory leak in pm8001_chip_fw_flash_update_req() + +From: Damien Le Moal + +[ Upstream commit f792a3629f4c4aa4c3703d66b43ce1edcc3ec09a ] + +In pm8001_chip_fw_flash_update_build(), if +pm8001_chip_fw_flash_update_build() fails, the struct fw_control_ex +allocated must be freed. + +Link: https://lore.kernel.org/r/20220220031810.738362-23-damien.lemoal@opensource.wdc.com +Reviewed-by: Jack Wang +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm8001_hwi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c +index 619fbcf37933..32fc450bf84b 100644 +--- a/drivers/scsi/pm8001/pm8001_hwi.c ++++ b/drivers/scsi/pm8001/pm8001_hwi.c +@@ -4903,8 +4903,10 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, + ccb->ccb_tag = tag; + rc = pm8001_chip_fw_flash_update_build(pm8001_ha, &flash_update_info, + tag); +- if (rc) ++ if (rc) { ++ kfree(fw_control_context); + pm8001_tag_free(pm8001_ha, tag); ++ } + + return rc; + } +-- +2.35.1 + diff --git a/queue-5.15/scsi-pm8001-fix-pm8001_mpi_task_abort_resp.patch b/queue-5.15/scsi-pm8001-fix-pm8001_mpi_task_abort_resp.patch new file mode 100644 index 00000000000..3a92f7e258e --- /dev/null +++ b/queue-5.15/scsi-pm8001-fix-pm8001_mpi_task_abort_resp.patch @@ -0,0 +1,46 @@ +From 7e576799c76df062189c30859012b7001b4f61bb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Feb 2022 12:17:57 +0900 +Subject: scsi: pm8001: Fix pm8001_mpi_task_abort_resp() + +From: Damien Le Moal + +[ Upstream commit 7e6b7e740addcea450041b5be8e42f0a4ceece0f ] + +The call to pm8001_ccb_task_free() at the end of +pm8001_mpi_task_abort_resp() already frees the ccb tag. So when the device +NCQ_ABORT_ALL_FLAG is set, the tag should not be freed again. Also change +the hardcoded 0xBFFFFFFF value to ~NCQ_ABORT_ALL_FLAG as it ought to be. + +Link: https://lore.kernel.org/r/20220220031810.738362-19-damien.lemoal@opensource.wdc.com +Reviewed-by: Jack Wang +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm8001_hwi.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c +index bed06ed0f1cb..9e6ffc37d6b0 100644 +--- a/drivers/scsi/pm8001/pm8001_hwi.c ++++ b/drivers/scsi/pm8001/pm8001_hwi.c +@@ -3713,12 +3713,11 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) + mb(); + + if (pm8001_dev->id & NCQ_ABORT_ALL_FLAG) { +- pm8001_tag_free(pm8001_ha, tag); + sas_free_task(t); +- /* clear the flag */ +- pm8001_dev->id &= 0xBFFFFFFF; +- } else ++ pm8001_dev->id &= ~NCQ_ABORT_ALL_FLAG; ++ } else { + t->task_done(t); ++ } + + return 0; + } +-- +2.35.1 + diff --git a/queue-5.15/scsi-pm8001-fix-pm80xx_pci_mem_copy-interface.patch b/queue-5.15/scsi-pm8001-fix-pm80xx_pci_mem_copy-interface.patch new file mode 100644 index 00000000000..3a1e49182ef --- /dev/null +++ b/queue-5.15/scsi-pm8001-fix-pm80xx_pci_mem_copy-interface.patch @@ -0,0 +1,61 @@ +From 3d6887405a61fde40f124a52c59aa332e200441b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Feb 2022 12:17:44 +0900 +Subject: scsi: pm8001: Fix pm80xx_pci_mem_copy() interface + +From: Damien Le Moal + +[ Upstream commit 3762d8f6edcdb03994c919f9487fd6d336c06561 ] + +The declaration of the local variable destination1 in pm80xx_pci_mem_copy() +as a pointer to a u32 results in the sparse warning: + +warning: incorrect type in assignment (different base types) + expected unsigned int [usertype] + got restricted __le32 [usertype] + +Furthermore, the destination" argument of pm80xx_pci_mem_copy() is wrongly +declared with the const attribute. + +Fix both problems by changing the type of the "destination" argument to +"__le32 *" and use this argument directly inside the pm80xx_pci_mem_copy() +function, thus removing the need for the destination1 local variable. + +Link: https://lore.kernel.org/r/20220220031810.738362-6-damien.lemoal@opensource.wdc.com +Reviewed-by: Jack Wang +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c +index b0a108e1a3d9..df140eca341f 100644 +--- a/drivers/scsi/pm8001/pm80xx_hwi.c ++++ b/drivers/scsi/pm8001/pm80xx_hwi.c +@@ -66,18 +66,16 @@ int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) + } + + static void pm80xx_pci_mem_copy(struct pm8001_hba_info *pm8001_ha, u32 soffset, +- const void *destination, ++ __le32 *destination, + u32 dw_count, u32 bus_base_number) + { + u32 index, value, offset; +- u32 *destination1; +- destination1 = (u32 *)destination; + +- for (index = 0; index < dw_count; index += 4, destination1++) { ++ for (index = 0; index < dw_count; index += 4, destination++) { + offset = (soffset + index); + if (offset < (64 * 1024)) { + value = pm8001_cr32(pm8001_ha, bus_base_number, offset); +- *destination1 = cpu_to_le32(value); ++ *destination = cpu_to_le32(value); + } + } + return; +-- +2.35.1 + diff --git a/queue-5.15/scsi-pm8001-fix-tag-leaks-on-error.patch b/queue-5.15/scsi-pm8001-fix-tag-leaks-on-error.patch new file mode 100644 index 00000000000..30a0c1e99a7 --- /dev/null +++ b/queue-5.15/scsi-pm8001-fix-tag-leaks-on-error.patch @@ -0,0 +1,102 @@ +From 8c500045b737a0cd6daaaa1adf5dae1d9a56a7db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Feb 2022 12:18:00 +0900 +Subject: scsi: pm8001: Fix tag leaks on error + +From: Damien Le Moal + +[ Upstream commit 4c8f04b1905cd4b776d0b720463c091545478ef7 ] + +In pm8001_chip_set_dev_state_req(), pm8001_chip_fw_flash_update_req(), +pm80xx_chip_phy_ctl_req() and pm8001_chip_reg_dev_req() add missing calls +to pm8001_tag_free() to free the allocated tag when pm8001_mpi_build_cmd() +fails. + +Similarly, in pm8001_exec_internal_task_abort(), if the chip ->task_abort +method fails, the tag allocated for the abort request task must be +freed. Add the missing call to pm8001_tag_free(). + +Link: https://lore.kernel.org/r/20220220031810.738362-22-damien.lemoal@opensource.wdc.com +Reviewed-by: John Garry +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm8001_hwi.c | 9 +++++++++ + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 9 +++++++-- + 3 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c +index 2adf1435a187..619fbcf37933 100644 +--- a/drivers/scsi/pm8001/pm8001_hwi.c ++++ b/drivers/scsi/pm8001/pm8001_hwi.c +@@ -4488,6 +4488,9 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, + SAS_ADDR_SIZE); + rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, + sizeof(payload), 0); ++ if (rc) ++ pm8001_tag_free(pm8001_ha, tag); ++ + return rc; + } + +@@ -4900,6 +4903,9 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, + ccb->ccb_tag = tag; + rc = pm8001_chip_fw_flash_update_build(pm8001_ha, &flash_update_info, + tag); ++ if (rc) ++ pm8001_tag_free(pm8001_ha, tag); ++ + return rc; + } + +@@ -5004,6 +5010,9 @@ pm8001_chip_set_dev_state_req(struct pm8001_hba_info *pm8001_ha, + payload.nds = cpu_to_le32(state); + rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, + sizeof(payload), 0); ++ if (rc) ++ pm8001_tag_free(pm8001_ha, tag); ++ + return rc; + + } +diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c +index 491cecbbe1aa..5fb08acbc0e5 100644 +--- a/drivers/scsi/pm8001/pm8001_sas.c ++++ b/drivers/scsi/pm8001/pm8001_sas.c +@@ -831,10 +831,10 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, + + res = PM8001_CHIP_DISP->task_abort(pm8001_ha, + pm8001_dev, flag, task_tag, ccb_tag); +- + if (res) { + del_timer(&task->slow_task->timer); + pm8001_dbg(pm8001_ha, FAIL, "Executing internal task failed\n"); ++ pm8001_tag_free(pm8001_ha, ccb_tag); + goto ex_err; + } + wait_for_completion(&task->slow_task->completion); +diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c +index df140eca341f..5561057109de 100644 +--- a/drivers/scsi/pm8001/pm80xx_hwi.c ++++ b/drivers/scsi/pm8001/pm80xx_hwi.c +@@ -4920,8 +4920,13 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, + payload.tag = cpu_to_le32(tag); + payload.phyop_phyid = + cpu_to_le32(((phy_op & 0xFF) << 8) | (phyId & 0xFF)); +- return pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, +- sizeof(payload), 0); ++ ++ rc = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &payload, ++ sizeof(payload), 0); ++ if (rc) ++ pm8001_tag_free(pm8001_ha, tag); ++ ++ return rc; + } + + static u32 pm80xx_chip_is_our_interrupt(struct pm8001_hba_info *pm8001_ha) +-- +2.35.1 + diff --git a/queue-5.15/scsi-pm8001-fix-task-leak-in-pm8001_send_abort_all.patch b/queue-5.15/scsi-pm8001-fix-task-leak-in-pm8001_send_abort_all.patch new file mode 100644 index 00000000000..c9a6d479f23 --- /dev/null +++ b/queue-5.15/scsi-pm8001-fix-task-leak-in-pm8001_send_abort_all.patch @@ -0,0 +1,60 @@ +From f3c3e0087c68b2b7e7685bdc51538d2102051b4b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 20 Feb 2022 12:17:59 +0900 +Subject: scsi: pm8001: Fix task leak in pm8001_send_abort_all() + +From: Damien Le Moal + +[ Upstream commit f90a74892f3acf0cdec5844e90fc8686ca13e7d7 ] + +In pm8001_send_abort_all(), make sure to free the allocated sas task +if pm8001_tag_alloc() or pm8001_mpi_build_cmd() fail. + +Link: https://lore.kernel.org/r/20220220031810.738362-21-damien.lemoal@opensource.wdc.com +Reviewed-by: John Garry +Signed-off-by: Damien Le Moal +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/pm8001/pm8001_hwi.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c +index 9e6ffc37d6b0..2adf1435a187 100644 +--- a/drivers/scsi/pm8001/pm8001_hwi.c ++++ b/drivers/scsi/pm8001/pm8001_hwi.c +@@ -1767,7 +1767,6 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, + } + + task = sas_alloc_slow_task(GFP_ATOMIC); +- + if (!task) { + pm8001_dbg(pm8001_ha, FAIL, "cannot allocate task\n"); + return; +@@ -1776,8 +1775,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, + task->task_done = pm8001_task_done; + + res = pm8001_tag_alloc(pm8001_ha, &ccb_tag); +- if (res) ++ if (res) { ++ sas_free_task(task); + return; ++ } + + ccb = &pm8001_ha->ccb_info[ccb_tag]; + ccb->device = pm8001_ha_dev; +@@ -1794,8 +1795,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, + + ret = pm8001_mpi_build_cmd(pm8001_ha, circularQ, opc, &task_abort, + sizeof(task_abort), 0); +- if (ret) ++ if (ret) { ++ sas_free_task(task); + pm8001_tag_free(pm8001_ha, ccb_tag); ++ } + + } + +-- +2.35.1 + diff --git a/queue-5.15/scsi-smartpqi-fix-kdump-issue-when-controller-is-loc.patch b/queue-5.15/scsi-smartpqi-fix-kdump-issue-when-controller-is-loc.patch new file mode 100644 index 00000000000..c6fb85b50ad --- /dev/null +++ b/queue-5.15/scsi-smartpqi-fix-kdump-issue-when-controller-is-loc.patch @@ -0,0 +1,100 @@ +From c7e84c81d0cace75539d6bcd256f97e00056639d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Feb 2022 15:48:43 -0600 +Subject: scsi: smartpqi: Fix kdump issue when controller is locked up + +From: Mahesh Rajashekhara + +[ Upstream commit 3ada501d602abf02353445c03bb3258146445d90 ] + +Avoid dropping into shell if the controller is in locked up state. + +Driver issues SIS soft reset to bring back the controller to SIS mode while +OS boots into kdump mode. + +If the controller is in lockup state, SIS soft reset does not work. + +Since the controller lockup code has not been cleared, driver considers the +firmware is no longer up and running. Driver returns back an error code to +OS and the kdump fails. + +Link: https://lore.kernel.org/r/164375212337.440833.11955356190354940369.stgit@brunhilda.pdev.net +Reviewed-by: Kevin Barnett +Reviewed-by: Scott Benesh +Reviewed-by: Scott Teel +Signed-off-by: Mahesh Rajashekhara +Signed-off-by: Don Brace +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/smartpqi/smartpqi_init.c | 39 ++++++++++++++++----------- + 1 file changed, 23 insertions(+), 16 deletions(-) + +diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c +index a5453f5e87c3..2e690d8a3444 100644 +--- a/drivers/scsi/smartpqi/smartpqi_init.c ++++ b/drivers/scsi/smartpqi/smartpqi_init.c +@@ -7653,6 +7653,21 @@ static int pqi_force_sis_mode(struct pqi_ctrl_info *ctrl_info) + return pqi_revert_to_sis_mode(ctrl_info); + } + ++static void pqi_perform_lockup_action(void) ++{ ++ switch (pqi_lockup_action) { ++ case PANIC: ++ panic("FATAL: Smart Family Controller lockup detected"); ++ break; ++ case REBOOT: ++ emergency_restart(); ++ break; ++ case NONE: ++ default: ++ break; ++ } ++} ++ + static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) + { + int rc; +@@ -7677,8 +7692,15 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) + * commands. + */ + rc = sis_wait_for_ctrl_ready(ctrl_info); +- if (rc) ++ if (rc) { ++ if (reset_devices) { ++ dev_err(&ctrl_info->pci_dev->dev, ++ "kdump init failed with error %d\n", rc); ++ pqi_lockup_action = REBOOT; ++ pqi_perform_lockup_action(); ++ } + return rc; ++ } + + /* + * Get the controller properties. This allows us to determine +@@ -8402,21 +8424,6 @@ static int pqi_ofa_ctrl_restart(struct pqi_ctrl_info *ctrl_info, unsigned int de + return pqi_ctrl_init_resume(ctrl_info); + } + +-static void pqi_perform_lockup_action(void) +-{ +- switch (pqi_lockup_action) { +- case PANIC: +- panic("FATAL: Smart Family Controller lockup detected"); +- break; +- case REBOOT: +- emergency_restart(); +- break; +- case NONE: +- default: +- break; +- } +-} +- + static struct pqi_raid_error_info pqi_ctrl_offline_raid_error_info = { + .data_out_result = PQI_DATA_IN_OUT_HARDWARE_ERROR, + .status = SAM_STAT_CHECK_CONDITION, +-- +2.35.1 + diff --git a/queue-5.15/selftests-net-add-tls-config-dependency-for-tls-self.patch b/queue-5.15/selftests-net-add-tls-config-dependency-for-tls-self.patch new file mode 100644 index 00000000000..a1f9356f37a --- /dev/null +++ b/queue-5.15/selftests-net-add-tls-config-dependency-for-tls-self.patch @@ -0,0 +1,34 @@ +From 39a64eb77ef819839c8e07f76cb5da72886a8ef2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Mar 2022 19:16:50 +0530 +Subject: selftests: net: Add tls config dependency for tls selftests + +From: Naresh Kamboju + +[ Upstream commit d9142e1cf3bbdaf21337767114ecab26fe702d47 ] + +selftest net tls test cases need TLS=m without this the test hangs. +Enabling config TLS solves this problem and runs to complete. + - CONFIG_TLS=m + +Reported-by: Linux Kernel Functional Testing +Signed-off-by: Naresh Kamboju +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/net/config | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config +index 86ab429fe7f3..29fadd7512f7 100644 +--- a/tools/testing/selftests/net/config ++++ b/tools/testing/selftests/net/config +@@ -43,4 +43,5 @@ CONFIG_NET_ACT_TUNNEL_KEY=m + CONFIG_NET_ACT_MIRRED=m + CONFIG_BAREUDP=m + CONFIG_IPV6_IOAM6_LWTUNNEL=y ++CONFIG_TLS=m + CONFIG_CRYPTO_SM4=y +-- +2.35.1 + diff --git a/queue-5.15/serial-samsung_tty-do-not-unlock-port-lock-for-uart_.patch b/queue-5.15/serial-samsung_tty-do-not-unlock-port-lock-for-uart_.patch new file mode 100644 index 00000000000..9b8318dc6ed --- /dev/null +++ b/queue-5.15/serial-samsung_tty-do-not-unlock-port-lock-for-uart_.patch @@ -0,0 +1,53 @@ +From 86ea343852ccee36f0012c5da4dcd447c6017814 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Mar 2022 12:51:53 +0100 +Subject: serial: samsung_tty: do not unlock port->lock for uart_write_wakeup() + +From: Jiri Slaby + +[ Upstream commit 988c7c00691008ea1daaa1235680a0da49dab4e8 ] + +The commit c15c3747ee32 (serial: samsung: fix potential soft lockup +during uart write) added an unlock of port->lock before +uart_write_wakeup() and a lock after it. It was always problematic to +write data from tty_ldisc_ops::write_wakeup and it was even documented +that way. We fixed the line disciplines to conform to this recently. +So if there is still a missed one, we should fix them instead of this +workaround. + +On the top of that, s3c24xx_serial_tx_dma_complete() in this driver +still holds the port->lock while calling uart_write_wakeup(). + +So revert the wrap added by the commit above. + +Cc: Thomas Abraham +Cc: Kyungmin Park +Cc: Hyeonkook Kim +Signed-off-by: Jiri Slaby +Link: https://lore.kernel.org/r/20220308115153.4225-1-jslaby@suse.cz +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/samsung_tty.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c +index e2f49863e9c2..319533b3c32a 100644 +--- a/drivers/tty/serial/samsung_tty.c ++++ b/drivers/tty/serial/samsung_tty.c +@@ -922,11 +922,8 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport) + return; + } + +- if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) { +- spin_unlock(&port->lock); ++ if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) + uart_write_wakeup(port); +- spin_lock(&port->lock); +- } + + if (uart_circ_empty(xmit)) + s3c24xx_serial_stop_tx(port); +-- +2.35.1 + diff --git a/queue-5.15/series b/queue-5.15/series new file mode 100644 index 00000000000..4784454f57d --- /dev/null +++ b/queue-5.15/series @@ -0,0 +1,146 @@ +lib-logic_iomem-correct-fallback-config-references.patch +um-fix-and-optimize-xor-select-template-for-config64.patch +rtc-wm8350-handle-error-for-wm8350_register_irq.patch +nbd-add-error-handling-support-for-add_disk.patch +nbd-fix-incorrect-error-handle-when-first_minor-is-i.patch +nbd-fix-hungtask-when-nbd_config_put.patch +nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_.patch +kfence-count-unexpectedly-skipped-allocations.patch +kfence-move-saving-stack-trace-of-allocations-into-_.patch +kfence-limit-currently-covered-allocations-when-pool.patch +kvm-x86-pmu-use-different-raw-event-masks-for-amd-an.patch +kvm-svm-fix-kvm_cache_regs.h-inclusions-for-is_guest.patch +kvm-x86-svm-clear-reserved-bits-written-to-perfevtse.patch +kvm-x86-pmu-fix-and-isolate-tsx-specific-performance.patch +kvm-x86-emulator-emulate-rdpid-only-if-it-is-enabled.patch +drm-add-orientation-quirk-for-gpd-win-max.patch +ath5k-fix-oob-in-ath5k_eeprom_read_pcal_info_5111.patch +drm-amd-display-add-signal-type-check-when-verify-st.patch +drm-amd-amdgpu-amdgpu_cs-fix-refcount-leak-of-a-dma_.patch +drm-amd-display-fix-memory-leak.patch +drm-amd-display-use-psr-version-selected-during-set_.patch +usb-gadget-tegra-xudc-do-not-program-sparam.patch +usb-gadget-tegra-xudc-fix-control-endpoint-s-definit.patch +usb-cdnsp-fix-cdnsp_decode_trb-function-to-properly-.patch +ptp-replace-snprintf-with-sysfs_emit.patch +drm-amdkfd-don-t-take-process-mutex-for-svm-ioctls.patch +powerpc-dts-t104xrdb-fix-phy-type-for-fman-4-5.patch +ath11k-fix-kernel-panic-during-unload-load-ath11k-mo.patch +ath11k-pci-fix-crash-on-suspend-if-board-file-is-not.patch +ath11k-mhi-use-mhi_sync_power_up.patch +net-smc-send-directly-when-tcp_cork-is-cleared.patch +drm-bridge-add-missing-pm_runtime_put_sync.patch +bpf-make-dst_port-field-in-struct-bpf_sock-16-bit-wi.patch +scsi-mvsas-replace-snprintf-with-sysfs_emit.patch +scsi-bfa-replace-snprintf-with-sysfs_emit.patch +drm-v3d-fix-missing-unlock.patch +power-supply-axp20x_battery-properly-report-current-.patch +mt76-mt7921-fix-crash-when-startup-fails.patch +mt76-dma-initialize-skip_unmap-in-mt76_dma_rx_fill.patch +cfg80211-don-t-add-non-transmitted-bss-to-6ghz-scann.patch +libbpf-fix-build-issue-with-llvm-readelf.patch +ipv6-make-mc_forwarding-atomic.patch +net-initialize-init_net-earlier.patch +powerpc-set-crashkernel-offset-to-mid-of-rma-region.patch +drm-amdgpu-fix-recursive-locking-warning.patch +scsi-smartpqi-fix-kdump-issue-when-controller-is-loc.patch +pci-aardvark-fix-support-for-msi-interrupts.patch +iommu-arm-smmu-v3-fix-event-handling-soft-lockup.patch +usb-ehci-add-pci-device-support-for-aspeed-platforms.patch +pci-endpoint-fix-alignment-fault-error-in-copy-tests.patch +tcp-don-t-acquire-inet_listen_hashbucket-lock-with-d.patch +pci-pciehp-add-qualcomm-quirk-for-command-completed-.patch +scsi-mpi3mr-fix-reporting-of-actual-data-transfer-si.patch +scsi-mpi3mr-fix-memory-leaks.patch +powerpc-set_memory-avoid-spinlock-recursion-in-chang.patch +power-supply-axp288-charger-set-vhold-to-4.4v.patch +net-mlx5e-disable-tx-queues-before-registering-the-n.patch +usb-dwc3-pci-set-the-swnode-from-inside-dwc3_pci_qui.patch +iwlwifi-mvm-correctly-set-fragmented-ebs.patch +iwlwifi-mvm-move-only-to-an-enabled-channel.patch +drm-msm-dsi-remove-spurious-irqf_oneshot-flag.patch +ipv4-invalidate-neighbour-for-broadcast-address-upon.patch +dm-ioctl-prevent-potential-spectre-v1-gadget.patch +dm-requeue-io-if-mapping-table-not-yet-available.patch +drm-amdkfd-make-crat-table-missing-message-informati.patch +vfio-pci-stub-vfio_pci_vga_rw-when-config_vfio_pci_v.patch +scsi-pm8001-fix-pm80xx_pci_mem_copy-interface.patch +scsi-pm8001-fix-pm8001_mpi_task_abort_resp.patch +scsi-pm8001-fix-task-leak-in-pm8001_send_abort_all.patch +scsi-pm8001-fix-tag-leaks-on-error.patch +scsi-pm8001-fix-memory-leak-in-pm8001_chip_fw_flash_.patch +mt76-mt7915-fix-injected-mpdu-transmission-to-not-us.patch +powerpc-64s-hash-make-hash-faults-work-in-nmi-contex.patch +mt76-mt7615-fix-assigning-negative-values-to-unsigne.patch +scsi-aha152x-fix-aha152x_setup-__setup-handler-retur.patch +scsi-hisi_sas-free-irq-vectors-in-order-for-v3-hw.patch +scsi-hisi_sas-limit-users-changing-debugfs-bist-coun.patch +net-smc-correct-settings-of-rmb-window-update-limit.patch +mips-ralink-fix-a-refcount-leak-in-ill_acc_of_setup.patch +macvtap-advertise-link-netns-via-netlink.patch +tuntap-add-sanity-checks-about-msg_controllen-in-sen.patch +bluetooth-fix-not-checking-for-valid-hdev-on-bt_dev_.patch +bluetooth-use-memset-avoid-memory-leaks.patch +bnxt_en-eliminate-unintended-link-toggle-during-fw-r.patch +pci-endpoint-fix-misused-goto-label.patch +mips-fix-fortify-panic-when-copying-asm-exception-ha.patch +powerpc-code-patching-pre-map-patch-area.patch +powerpc-64e-tie-ppc_book3e_64-to-ppc_fsl_book3e.patch +powerpc-secvar-fix-refcount-leak-in-format_show.patch +scsi-libfc-fix-use-after-free-in-fc_exch_abts_resp.patch +can-isotp-set-default-value-for-n_as-to-50-micro-sec.patch +can-etas_es58x-es58x_fd_rx_event_msg-initialize-rx_e.patch +riscv-fixed-misaligned-memory-access.-fixed-pointer-.patch +net-account-alternate-interface-name-memory.patch +net-limit-altnames-to-64k-total.patch +net-mlx5e-remove-overzealous-validations-in-netlink-.patch +net-sfp-add-2500base-x-quirk-for-lantech-sfp-module.patch +usb-dwc3-omap-fix-unbalanced-disables-for-smps10_out.patch +mt76-fix-monitor-mode-crash-with-sdio-driver.patch +xtensa-fix-dtc-warning-unit_address_format.patch +mips-ingenic-correct-unit-node-address.patch +bluetooth-fix-use-after-free-in-hci_send_acl.patch +netfilter-conntrack-revisit-gc-autotuning.patch +netlabel-fix-out-of-bounds-memory-accesses.patch +ceph-fix-inode-reference-leakage-in-ceph_get_snapdir.patch +ceph-fix-memory-leak-in-ceph_readdir-when-note_last_.patch +lib-kconfig.debug-add-arch-dependency-for-function_a.patch +init-main.c-return-1-from-handled-__setup-functions.patch +minix-fix-bug-when-opening-a-file-with-o_direct.patch +clk-si5341-fix-reported-clk_rate-when-output-divider.patch +staging-vchiq_arm-avoid-null-ptr-deref-in-vchiq_dump.patch +staging-vchiq_core-handle-null-result-of-find_servic.patch +phy-amlogic-phy-meson-gxl-usb2-fix-shared-reset-cont.patch +phy-amlogic-meson8b-usb2-use-dev_err_probe.patch +phy-amlogic-meson8b-usb2-fix-shared-reset-control-us.patch +clk-rockchip-drop-clk_set_rate_parent-from-dclk_vop-.patch +cpufreq-cppc-fix-performance-frequency-conversion.patch +opp-expose-of-node-s-name-in-debugfs.patch +staging-wfx-fix-an-error-handling-in-wfx_init_common.patch +w1-w1_therm-fixes-w1_seq-for-ds28ea00-sensors.patch +nfsv4.2-fix-reference-count-leaks-in-_nfs42_proc_cop.patch +nfsv4-protect-the-state-recovery-thread-against-dire.patch +habanalabs-fix-possible-memory-leak-in-mmu-dr-fini.patch +xen-delay-xen_hvm_init_time_ops-if-kdump-is-boot-on-.patch +clk-ti-preserve-node-in-ti_dt_clocks_register.patch +clk-enforce-that-disjoints-limits-are-invalid.patch +sunrpc-call_alloc-async-tasks-mustn-t-block-waiting-.patch +sunrpc-xprt-async-tasks-mustn-t-block-waiting-for-me.patch +sunrpc-remove-scheduling-boost-for-swapper-tasks.patch +nfs-swap-io-handling-is-slightly-different-for-o_dir.patch +nfs-swap-out-must-always-use-stable-writes.patch +x86-annotate-call_on_stack.patch +x86-kconfig-do-not-allow-config_x86_x32_abi-y-with-l.patch +serial-samsung_tty-do-not-unlock-port-lock-for-uart_.patch +virtio_console-eliminate-anonymous-module_init-modul.patch +jfs-prevent-null-deref-in-difree.patch +sunrpc-fix-socket-waits-for-write-buffer-space.patch +nfs-nfsiod-should-not-block-forever-in-mempool_alloc.patch +nfs-avoid-writeback-threads-getting-stuck-in-mempool.patch +selftests-net-add-tls-config-dependency-for-tls-self.patch +parisc-fix-cpu-affinity-for-lasi-wax-and-dino-chips.patch +parisc-fix-patch-code-locking-and-flushing.patch +mm-fix-race-between-madv_free-reclaim-and-blkdev-dir.patch +rtc-mc146818-lib-change-return-values-of-mc146818_ge.patch +rtc-check-return-value-from-mc146818_get_time.patch +rtc-mc146818-lib-fix-rtc-presence-check.patch diff --git a/queue-5.15/staging-vchiq_arm-avoid-null-ptr-deref-in-vchiq_dump.patch b/queue-5.15/staging-vchiq_arm-avoid-null-ptr-deref-in-vchiq_dump.patch new file mode 100644 index 00000000000..38cd13331fb --- /dev/null +++ b/queue-5.15/staging-vchiq_arm-avoid-null-ptr-deref-in-vchiq_dump.patch @@ -0,0 +1,39 @@ +From 67dfef717e0acfb3b48aa3bc545ec9453338d81e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jan 2022 21:02:21 +0100 +Subject: staging: vchiq_arm: Avoid NULL ptr deref in + vchiq_dump_platform_instances + +From: Stefan Wahren + +[ Upstream commit aa899e686d442c63d50f4d369cc02dbbf0941cb0 ] + +vchiq_get_state() can return a NULL pointer. So handle this cases and +avoid a NULL pointer derefence in vchiq_dump_platform_instances. + +Reviewed-by: Nicolas Saenz Julienne +Signed-off-by: Stefan Wahren +Link: https://lore.kernel.org/r/1642968143-19281-17-git-send-email-stefan.wahren@i2se.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +index ea9a53bdb417..099359fc0115 100644 +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +@@ -1189,6 +1189,9 @@ int vchiq_dump_platform_instances(void *dump_context) + int len; + int i; + ++ if (!state) ++ return -ENOTCONN; ++ + /* + * There is no list of instances, so instead scan all services, + * marking those that have been dumped. +-- +2.35.1 + diff --git a/queue-5.15/staging-vchiq_core-handle-null-result-of-find_servic.patch b/queue-5.15/staging-vchiq_core-handle-null-result-of-find_servic.patch new file mode 100644 index 00000000000..37e9f3c3b25 --- /dev/null +++ b/queue-5.15/staging-vchiq_core-handle-null-result-of-find_servic.patch @@ -0,0 +1,48 @@ +From 02dce3430fa8caae0fc06b42104da569545d89f2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 23 Jan 2022 21:02:22 +0100 +Subject: staging: vchiq_core: handle NULL result of find_service_by_handle + +From: Stefan Wahren + +[ Upstream commit ca225857faf237234d2fffe5d1919467dfadd822 ] + +In case of an invalid handle the function find_servive_by_handle +returns NULL. So take care of this and avoid a NULL pointer dereference. + +Reviewed-by: Nicolas Saenz Julienne +Signed-off-by: Stefan Wahren +Link: https://lore.kernel.org/r/1642968143-19281-18-git-send-email-stefan.wahren@i2se.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +index 9429b8a642fb..630ed0dc24c3 100644 +--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c ++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +@@ -2421,6 +2421,9 @@ void vchiq_msg_queue_push(unsigned int handle, struct vchiq_header *header) + struct vchiq_service *service = find_service_by_handle(handle); + int pos; + ++ if (!service) ++ return; ++ + while (service->msg_queue_write == service->msg_queue_read + + VCHIQ_MAX_SLOTS) { + if (wait_for_completion_interruptible(&service->msg_queue_pop)) +@@ -2441,6 +2444,9 @@ struct vchiq_header *vchiq_msg_hold(unsigned int handle) + struct vchiq_header *header; + int pos; + ++ if (!service) ++ return NULL; ++ + if (service->msg_queue_write == service->msg_queue_read) + return NULL; + +-- +2.35.1 + diff --git a/queue-5.15/staging-wfx-fix-an-error-handling-in-wfx_init_common.patch b/queue-5.15/staging-wfx-fix-an-error-handling-in-wfx_init_common.patch new file mode 100644 index 00000000000..f71d6d70721 --- /dev/null +++ b/queue-5.15/staging-wfx-fix-an-error-handling-in-wfx_init_common.patch @@ -0,0 +1,56 @@ +From 9c6aeead9db4f863de0eb749f5fe0487099f3568 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 18 Feb 2022 21:59:45 +0800 +Subject: staging: wfx: fix an error handling in wfx_init_common() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Xiaoke Wang + +[ Upstream commit 60f1d3c92dc1ef1026e5b917a329a7fa947da036 ] + +One error handler of wfx_init_common() return without calling +ieee80211_free_hw(hw), which may result in memory leak. And I add +one err label to unify the error handler, which is useful for the +subsequent changes. + +Suggested-by: Jérôme Pouiller +Reviewed-by: Dan Carpenter +Reviewed-by: Jérôme Pouiller +Signed-off-by: Xiaoke Wang +Link: https://lore.kernel.org/r/tencent_24A24A3EFF61206ECCC4B94B1C5C1454E108@qq.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/staging/wfx/main.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c +index 4b9fdf99981b..9ff69c5e0ae9 100644 +--- a/drivers/staging/wfx/main.c ++++ b/drivers/staging/wfx/main.c +@@ -309,7 +309,8 @@ struct wfx_dev *wfx_init_common(struct device *dev, + wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup", + GPIOD_OUT_LOW); + if (IS_ERR(wdev->pdata.gpio_wakeup)) +- return NULL; ++ goto err; ++ + if (wdev->pdata.gpio_wakeup) + gpiod_set_consumer_name(wdev->pdata.gpio_wakeup, "wfx wakeup"); + +@@ -328,6 +329,10 @@ struct wfx_dev *wfx_init_common(struct device *dev, + return NULL; + + return wdev; ++ ++err: ++ ieee80211_free_hw(hw); ++ return NULL; + } + + int wfx_probe(struct wfx_dev *wdev) +-- +2.35.1 + diff --git a/queue-5.15/sunrpc-call_alloc-async-tasks-mustn-t-block-waiting-.patch b/queue-5.15/sunrpc-call_alloc-async-tasks-mustn-t-block-waiting-.patch new file mode 100644 index 00000000000..cf2c6b69632 --- /dev/null +++ b/queue-5.15/sunrpc-call_alloc-async-tasks-mustn-t-block-waiting-.patch @@ -0,0 +1,65 @@ +From 60f8341845e5f3b899abda2bf4d69fe62f3ca725 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 10:41:44 +1100 +Subject: SUNRPC/call_alloc: async tasks mustn't block waiting for memory + +From: NeilBrown + +[ Upstream commit c487216bec83b0c5a8803e5c61433d33ad7b104d ] + +When memory is short, new worker threads cannot be created and we depend +on the minimum one rpciod thread to be able to handle everything. +So it must not block waiting for memory. + +mempools are particularly a problem as memory can only be released back +to the mempool by an async rpc task running. If all available +workqueue threads are waiting on the mempool, no thread is available to +return anything. + +rpc_malloc() can block, and this might cause deadlocks. +So check RPC_IS_ASYNC(), rather than RPC_IS_SWAPPER() to determine if +blocking is acceptable. + +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/sched.c | 4 +++- + net/sunrpc/xprtrdma/transport.c | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c +index c045f63d11fa..6e4d476c6324 100644 +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -1012,8 +1012,10 @@ int rpc_malloc(struct rpc_task *task) + struct rpc_buffer *buf; + gfp_t gfp = GFP_NOFS; + ++ if (RPC_IS_ASYNC(task)) ++ gfp = GFP_NOWAIT | __GFP_NOWARN; + if (RPC_IS_SWAPPER(task)) +- gfp = __GFP_MEMALLOC | GFP_NOWAIT | __GFP_NOWARN; ++ gfp |= __GFP_MEMALLOC; + + size += sizeof(struct rpc_buffer); + if (size <= RPC_BUFFER_MAXSIZE) +diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c +index 16e5696314a4..a52277115500 100644 +--- a/net/sunrpc/xprtrdma/transport.c ++++ b/net/sunrpc/xprtrdma/transport.c +@@ -574,8 +574,10 @@ xprt_rdma_allocate(struct rpc_task *task) + gfp_t flags; + + flags = RPCRDMA_DEF_GFP; ++ if (RPC_IS_ASYNC(task)) ++ flags = GFP_NOWAIT | __GFP_NOWARN; + if (RPC_IS_SWAPPER(task)) +- flags = __GFP_MEMALLOC | GFP_NOWAIT | __GFP_NOWARN; ++ flags |= __GFP_MEMALLOC; + + if (!rpcrdma_check_regbuf(r_xprt, req->rl_sendbuf, rqst->rq_callsize, + flags)) +-- +2.35.1 + diff --git a/queue-5.15/sunrpc-fix-socket-waits-for-write-buffer-space.patch b/queue-5.15/sunrpc-fix-socket-waits-for-write-buffer-space.patch new file mode 100644 index 00000000000..26136b3ca75 --- /dev/null +++ b/queue-5.15/sunrpc-fix-socket-waits-for-write-buffer-space.patch @@ -0,0 +1,128 @@ +From 0a53a3eb45f211168408c6b60fd0a92071fef252 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Mar 2022 21:02:10 -0400 +Subject: SUNRPC: Fix socket waits for write buffer space + +From: Trond Myklebust + +[ Upstream commit 7496b59f588dd52886fdbac7633608097543a0a5 ] + +The socket layer requires that we use the socket lock to protect changes +to the sock->sk_write_pending field and others. + +Reported-by: Chuck Lever +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/xprtsock.c | 54 +++++++++++++++++++++++++++++++------------ + 1 file changed, 39 insertions(+), 15 deletions(-) + +diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c +index 04f1b78bcbca..2096b26adde5 100644 +--- a/net/sunrpc/xprtsock.c ++++ b/net/sunrpc/xprtsock.c +@@ -763,12 +763,12 @@ xs_stream_start_connect(struct sock_xprt *transport) + /** + * xs_nospace - handle transmit was incomplete + * @req: pointer to RPC request ++ * @transport: pointer to struct sock_xprt + * + */ +-static int xs_nospace(struct rpc_rqst *req) ++static int xs_nospace(struct rpc_rqst *req, struct sock_xprt *transport) + { +- struct rpc_xprt *xprt = req->rq_xprt; +- struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); ++ struct rpc_xprt *xprt = &transport->xprt; + struct sock *sk = transport->inet; + int ret = -EAGAIN; + +@@ -779,25 +779,49 @@ static int xs_nospace(struct rpc_rqst *req) + + /* Don't race with disconnect */ + if (xprt_connected(xprt)) { ++ struct socket_wq *wq; ++ ++ rcu_read_lock(); ++ wq = rcu_dereference(sk->sk_wq); ++ set_bit(SOCKWQ_ASYNC_NOSPACE, &wq->flags); ++ rcu_read_unlock(); ++ + /* wait for more buffer space */ ++ set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); + sk->sk_write_pending++; + xprt_wait_for_buffer_space(xprt); + } else + ret = -ENOTCONN; + + spin_unlock(&xprt->transport_lock); ++ return ret; ++} + +- /* Race breaker in case memory is freed before above code is called */ +- if (ret == -EAGAIN) { +- struct socket_wq *wq; ++static int xs_sock_nospace(struct rpc_rqst *req) ++{ ++ struct sock_xprt *transport = ++ container_of(req->rq_xprt, struct sock_xprt, xprt); ++ struct sock *sk = transport->inet; ++ int ret = -EAGAIN; + +- rcu_read_lock(); +- wq = rcu_dereference(sk->sk_wq); +- set_bit(SOCKWQ_ASYNC_NOSPACE, &wq->flags); +- rcu_read_unlock(); ++ lock_sock(sk); ++ if (!sock_writeable(sk)) ++ ret = xs_nospace(req, transport); ++ release_sock(sk); ++ return ret; ++} + +- sk->sk_write_space(sk); +- } ++static int xs_stream_nospace(struct rpc_rqst *req) ++{ ++ struct sock_xprt *transport = ++ container_of(req->rq_xprt, struct sock_xprt, xprt); ++ struct sock *sk = transport->inet; ++ int ret = -EAGAIN; ++ ++ lock_sock(sk); ++ if (!sk_stream_memory_free(sk)) ++ ret = xs_nospace(req, transport); ++ release_sock(sk); + return ret; + } + +@@ -887,7 +911,7 @@ static int xs_local_send_request(struct rpc_rqst *req) + case -ENOBUFS: + break; + case -EAGAIN: +- status = xs_nospace(req); ++ status = xs_stream_nospace(req); + break; + default: + dprintk("RPC: sendmsg returned unrecognized error %d\n", +@@ -963,7 +987,7 @@ static int xs_udp_send_request(struct rpc_rqst *req) + /* Should we call xs_close() here? */ + break; + case -EAGAIN: +- status = xs_nospace(req); ++ status = xs_sock_nospace(req); + break; + case -ENETUNREACH: + case -ENOBUFS: +@@ -1083,7 +1107,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) + /* Should we call xs_close() here? */ + break; + case -EAGAIN: +- status = xs_nospace(req); ++ status = xs_stream_nospace(req); + break; + case -ECONNRESET: + case -ECONNREFUSED: +-- +2.35.1 + diff --git a/queue-5.15/sunrpc-remove-scheduling-boost-for-swapper-tasks.patch b/queue-5.15/sunrpc-remove-scheduling-boost-for-swapper-tasks.patch new file mode 100644 index 00000000000..178efe41490 --- /dev/null +++ b/queue-5.15/sunrpc-remove-scheduling-boost-for-swapper-tasks.patch @@ -0,0 +1,79 @@ +From a735cee30c89a53d2627a96ba087c44943ca455c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 10:41:44 +1100 +Subject: SUNRPC: remove scheduling boost for "SWAPPER" tasks. + +From: NeilBrown + +[ Upstream commit a80a8461868905823609be97f91776a26befe839 ] + +Currently, tasks marked as "swapper" tasks get put to the front of +non-priority rpc_queues, and are sorted earlier than non-swapper tasks on +the transport's ->xmit_queue. + +This is pointless as currently *all* tasks for a mount that has swap +enabled on *any* file are marked as "swapper" tasks. So the net result +is that the non-priority rpc_queues are reverse-ordered (LIFO). + +This scheduling boost is not necessary to avoid deadlocks, and hurts +fairness, so remove it. If there were a need to expedite some requests, +the tk_priority mechanism is a more appropriate tool. + +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/sched.c | 7 ------- + net/sunrpc/xprt.c | 11 ----------- + 2 files changed, 18 deletions(-) + +diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c +index 6e4d476c6324..f0f55fbd1375 100644 +--- a/net/sunrpc/sched.c ++++ b/net/sunrpc/sched.c +@@ -186,11 +186,6 @@ static void __rpc_add_wait_queue_priority(struct rpc_wait_queue *queue, + + /* + * Add new request to wait queue. +- * +- * Swapper tasks always get inserted at the head of the queue. +- * This should avoid many nasty memory deadlocks and hopefully +- * improve overall performance. +- * Everyone else gets appended to the queue to ensure proper FIFO behavior. + */ + static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, + struct rpc_task *task, +@@ -199,8 +194,6 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, + INIT_LIST_HEAD(&task->u.tk_wait.timer_list); + if (RPC_IS_PRIORITY(queue)) + __rpc_add_wait_queue_priority(queue, task, queue_priority); +- else if (RPC_IS_SWAPPER(task)) +- list_add(&task->u.tk_wait.list, &queue->tasks[0]); + else + list_add_tail(&task->u.tk_wait.list, &queue->tasks[0]); + task->tk_waitqueue = queue; +diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c +index 61603c2664a6..f5dff09154da 100644 +--- a/net/sunrpc/xprt.c ++++ b/net/sunrpc/xprt.c +@@ -1353,17 +1353,6 @@ xprt_request_enqueue_transmit(struct rpc_task *task) + INIT_LIST_HEAD(&req->rq_xmit2); + goto out; + } +- } else if (RPC_IS_SWAPPER(task)) { +- list_for_each_entry(pos, &xprt->xmit_queue, rq_xmit) { +- if (pos->rq_cong || pos->rq_bytes_sent) +- continue; +- if (RPC_IS_SWAPPER(pos->rq_task)) +- continue; +- /* Note: req is added _before_ pos */ +- list_add_tail(&req->rq_xmit, &pos->rq_xmit); +- INIT_LIST_HEAD(&req->rq_xmit2); +- goto out; +- } + } else if (!req->rq_seqno) { + list_for_each_entry(pos, &xprt->xmit_queue, rq_xmit) { + if (pos->rq_task->tk_owner != task->tk_owner) +-- +2.35.1 + diff --git a/queue-5.15/sunrpc-xprt-async-tasks-mustn-t-block-waiting-for-me.patch b/queue-5.15/sunrpc-xprt-async-tasks-mustn-t-block-waiting-for-me.patch new file mode 100644 index 00000000000..401e453733b --- /dev/null +++ b/queue-5.15/sunrpc-xprt-async-tasks-mustn-t-block-waiting-for-me.patch @@ -0,0 +1,67 @@ +From cb4fd1067e888bd2c8bd9d22021266007b91760a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Mar 2022 10:41:44 +1100 +Subject: SUNRPC/xprt: async tasks mustn't block waiting for memory + +From: NeilBrown + +[ Upstream commit a721035477fb5fb8abc738fbe410b07c12af3dc5 ] + +When memory is short, new worker threads cannot be created and we depend +on the minimum one rpciod thread to be able to handle everything. So it +must not block waiting for memory. + +xprt_dynamic_alloc_slot can block indefinitely. This can tie up all +workqueue threads and NFS can deadlock. So when called from a +workqueue, set __GFP_NORETRY. + +The rdma alloc_slot already does not block. However it sets the error +to -EAGAIN suggesting this will trigger a sleep. It does not. As we +can see in call_reserveresult(), only -ENOMEM causes a sleep. -EAGAIN +causes immediate retry. + +Signed-off-by: NeilBrown +Signed-off-by: Trond Myklebust +Signed-off-by: Sasha Levin +--- + net/sunrpc/xprt.c | 5 ++++- + net/sunrpc/xprtrdma/transport.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c +index d95426c0bd3a..61603c2664a6 100644 +--- a/net/sunrpc/xprt.c ++++ b/net/sunrpc/xprt.c +@@ -1686,12 +1686,15 @@ static bool xprt_throttle_congested(struct rpc_xprt *xprt, struct rpc_task *task + static struct rpc_rqst *xprt_dynamic_alloc_slot(struct rpc_xprt *xprt) + { + struct rpc_rqst *req = ERR_PTR(-EAGAIN); ++ gfp_t gfp_mask = GFP_KERNEL; + + if (xprt->num_reqs >= xprt->max_reqs) + goto out; + ++xprt->num_reqs; + spin_unlock(&xprt->reserve_lock); +- req = kzalloc(sizeof(struct rpc_rqst), GFP_NOFS); ++ if (current->flags & PF_WQ_WORKER) ++ gfp_mask |= __GFP_NORETRY | __GFP_NOWARN; ++ req = kzalloc(sizeof(*req), gfp_mask); + spin_lock(&xprt->reserve_lock); + if (req != NULL) + goto out; +diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c +index a52277115500..32df23796747 100644 +--- a/net/sunrpc/xprtrdma/transport.c ++++ b/net/sunrpc/xprtrdma/transport.c +@@ -521,7 +521,7 @@ xprt_rdma_alloc_slot(struct rpc_xprt *xprt, struct rpc_task *task) + return; + + out_sleep: +- task->tk_status = -EAGAIN; ++ task->tk_status = -ENOMEM; + xprt_add_backlog(xprt, task); + } + +-- +2.35.1 + diff --git a/queue-5.15/tcp-don-t-acquire-inet_listen_hashbucket-lock-with-d.patch b/queue-5.15/tcp-don-t-acquire-inet_listen_hashbucket-lock-with-d.patch new file mode 100644 index 00000000000..f6b77736136 --- /dev/null +++ b/queue-5.15/tcp-don-t-acquire-inet_listen_hashbucket-lock-with-d.patch @@ -0,0 +1,173 @@ +From 357526ed9bf6902a9f109451b4b2bdf1c82d1e49 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Feb 2022 19:56:57 +0100 +Subject: tcp: Don't acquire inet_listen_hashbucket::lock with disabled BH. + +From: Sebastian Andrzej Siewior + +[ Upstream commit 4f9bf2a2f5aacf988e6d5e56b961ba45c5a25248 ] + +Commit + 9652dc2eb9e40 ("tcp: relax listening_hash operations") + +removed the need to disable bottom half while acquiring +listening_hash.lock. There are still two callers left which disable +bottom half before the lock is acquired. + +On PREEMPT_RT the softirqs are preemptible and local_bh_disable() acts +as a lock to ensure that resources, that are protected by disabling +bottom halves, remain protected. +This leads to a circular locking dependency if the lock acquired with +disabled bottom halves is also acquired with enabled bottom halves +followed by disabling bottom halves. This is the reverse locking order. +It has been observed with inet_listen_hashbucket::lock: + +local_bh_disable() + spin_lock(&ilb->lock): + inet_listen() + inet_csk_listen_start() + sk->sk_prot->hash() := inet_hash() + local_bh_disable() + __inet_hash() + spin_lock(&ilb->lock); + acquire(&ilb->lock); + +Reverse order: spin_lock(&ilb2->lock) + local_bh_disable(): + tcp_seq_next() + listening_get_next() + spin_lock(&ilb2->lock); + acquire(&ilb2->lock); + + tcp4_seq_show() + get_tcp4_sock() + sock_i_ino() + read_lock_bh(&sk->sk_callback_lock); + acquire(softirq_ctrl) // <---- whoops + acquire(&sk->sk_callback_lock) + +Drop local_bh_disable() around __inet_hash() which acquires +listening_hash->lock. Split inet_unhash() and acquire the +listen_hashbucket lock without disabling bottom halves; the inet_ehash +lock with disabled bottom halves. + +Reported-by: Mike Galbraith +Signed-off-by: Sebastian Andrzej Siewior +Link: https://lkml.kernel.org/r/12d6f9879a97cd56c09fb53dee343cbb14f7f1f7.camel@gmx.de +Link: https://lkml.kernel.org/r/X9CheYjuXWc75Spa@hirez.programming.kicks-ass.net +Link: https://lore.kernel.org/r/YgQOebeZ10eNx1W6@linutronix.de +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/inet_hashtables.c | 53 ++++++++++++++++++++++--------------- + net/ipv6/inet6_hashtables.c | 5 +--- + 2 files changed, 33 insertions(+), 25 deletions(-) + +diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c +index 75737267746f..7bd1e10086f0 100644 +--- a/net/ipv4/inet_hashtables.c ++++ b/net/ipv4/inet_hashtables.c +@@ -637,7 +637,9 @@ int __inet_hash(struct sock *sk, struct sock *osk) + int err = 0; + + if (sk->sk_state != TCP_LISTEN) { ++ local_bh_disable(); + inet_ehash_nolisten(sk, osk, NULL); ++ local_bh_enable(); + return 0; + } + WARN_ON(!sk_unhashed(sk)); +@@ -669,45 +671,54 @@ int inet_hash(struct sock *sk) + { + int err = 0; + +- if (sk->sk_state != TCP_CLOSE) { +- local_bh_disable(); ++ if (sk->sk_state != TCP_CLOSE) + err = __inet_hash(sk, NULL); +- local_bh_enable(); +- } + + return err; + } + EXPORT_SYMBOL_GPL(inet_hash); + +-void inet_unhash(struct sock *sk) ++static void __inet_unhash(struct sock *sk, struct inet_listen_hashbucket *ilb) + { +- struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; +- struct inet_listen_hashbucket *ilb = NULL; +- spinlock_t *lock; +- + if (sk_unhashed(sk)) + return; + +- if (sk->sk_state == TCP_LISTEN) { +- ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)]; +- lock = &ilb->lock; +- } else { +- lock = inet_ehash_lockp(hashinfo, sk->sk_hash); +- } +- spin_lock_bh(lock); +- if (sk_unhashed(sk)) +- goto unlock; +- + if (rcu_access_pointer(sk->sk_reuseport_cb)) + reuseport_stop_listen_sock(sk); + if (ilb) { ++ struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; ++ + inet_unhash2(hashinfo, sk); + ilb->count--; + } + __sk_nulls_del_node_init_rcu(sk); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); +-unlock: +- spin_unlock_bh(lock); ++} ++ ++void inet_unhash(struct sock *sk) ++{ ++ struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; ++ ++ if (sk_unhashed(sk)) ++ return; ++ ++ if (sk->sk_state == TCP_LISTEN) { ++ struct inet_listen_hashbucket *ilb; ++ ++ ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)]; ++ /* Don't disable bottom halves while acquiring the lock to ++ * avoid circular locking dependency on PREEMPT_RT. ++ */ ++ spin_lock(&ilb->lock); ++ __inet_unhash(sk, ilb); ++ spin_unlock(&ilb->lock); ++ } else { ++ spinlock_t *lock = inet_ehash_lockp(hashinfo, sk->sk_hash); ++ ++ spin_lock_bh(lock); ++ __inet_unhash(sk, NULL); ++ spin_unlock_bh(lock); ++ } + } + EXPORT_SYMBOL_GPL(inet_unhash); + +diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c +index 67c9114835c8..0a2e7f228391 100644 +--- a/net/ipv6/inet6_hashtables.c ++++ b/net/ipv6/inet6_hashtables.c +@@ -333,11 +333,8 @@ int inet6_hash(struct sock *sk) + { + int err = 0; + +- if (sk->sk_state != TCP_CLOSE) { +- local_bh_disable(); ++ if (sk->sk_state != TCP_CLOSE) + err = __inet_hash(sk, NULL); +- local_bh_enable(); +- } + + return err; + } +-- +2.35.1 + diff --git a/queue-5.15/tuntap-add-sanity-checks-about-msg_controllen-in-sen.patch b/queue-5.15/tuntap-add-sanity-checks-about-msg_controllen-in-sen.patch new file mode 100644 index 00000000000..f950ce298c6 --- /dev/null +++ b/queue-5.15/tuntap-add-sanity-checks-about-msg_controllen-in-sen.patch @@ -0,0 +1,71 @@ +From 46ca14140fef9b7fed29057c92d883922ad4e5fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 3 Mar 2022 10:24:40 +0800 +Subject: tuntap: add sanity checks about msg_controllen in sendmsg + +From: Harold Huang + +[ Upstream commit 74a335a07a17d131b9263bfdbdcb5e40673ca9ca ] + +In patch [1], tun_msg_ctl was added to allow pass batched xdp buffers to +tun_sendmsg. Although we donot use msg_controllen in this path, we should +check msg_controllen to make sure the caller pass a valid msg_ctl. + +[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fe8dd45bb7556246c6b76277b1ba4296c91c2505 + +Reported-by: Eric Dumazet +Suggested-by: Jason Wang +Signed-off-by: Harold Huang +Acked-by: Jason Wang +Link: https://lore.kernel.org/r/20220303022441.383865-1-baymaxhuang@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/tap.c | 3 ++- + drivers/net/tun.c | 3 ++- + drivers/vhost/net.c | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/tap.c b/drivers/net/tap.c +index 8e3a28ba6b28..ba2ef5437e16 100644 +--- a/drivers/net/tap.c ++++ b/drivers/net/tap.c +@@ -1198,7 +1198,8 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, + struct xdp_buff *xdp; + int i; + +- if (ctl && (ctl->type == TUN_MSG_PTR)) { ++ if (m->msg_controllen == sizeof(struct tun_msg_ctl) && ++ ctl && ctl->type == TUN_MSG_PTR) { + for (i = 0; i < ctl->num; i++) { + xdp = &((struct xdp_buff *)ctl->ptr)[i]; + tap_get_user_xdp(q, xdp); +diff --git a/drivers/net/tun.c b/drivers/net/tun.c +index 45a67e72a02c..02de8d998bfa 100644 +--- a/drivers/net/tun.c ++++ b/drivers/net/tun.c +@@ -2489,7 +2489,8 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) + if (!tun) + return -EBADFD; + +- if (ctl && (ctl->type == TUN_MSG_PTR)) { ++ if (m->msg_controllen == sizeof(struct tun_msg_ctl) && ++ ctl && ctl->type == TUN_MSG_PTR) { + struct tun_page tpage; + int n = ctl->num; + int flush = 0; +diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c +index 28ef323882fb..792ab5f23647 100644 +--- a/drivers/vhost/net.c ++++ b/drivers/vhost/net.c +@@ -473,6 +473,7 @@ static void vhost_tx_batch(struct vhost_net *net, + goto signal_used; + + msghdr->msg_control = &ctl; ++ msghdr->msg_controllen = sizeof(ctl); + err = sock->ops->sendmsg(sock, msghdr, 0); + if (unlikely(err < 0)) { + vq_err(&nvq->vq, "Fail to batch sending packets\n"); +-- +2.35.1 + diff --git a/queue-5.15/um-fix-and-optimize-xor-select-template-for-config64.patch b/queue-5.15/um-fix-and-optimize-xor-select-template-for-config64.patch new file mode 100644 index 00000000000..5dae86fb3ba --- /dev/null +++ b/queue-5.15/um-fix-and-optimize-xor-select-template-for-config64.patch @@ -0,0 +1,56 @@ +From 9ae016606f45be61b1344fe6154bc962f7a215cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 11 Jan 2022 20:05:06 +0000 +Subject: um: fix and optimize xor select template for CONFIG64 and timetravel + mode + +From: Benjamin Beichler + +[ Upstream commit e3a33af812c611d99756e2ec61e9d7068d466bdf ] + +Due to dropped inclusion of asm-generic/xor.h, xor_block_8regs symbol is +missing with CONFIG64 and break compilation, as the asm/xor_64.h also did +not include it. The patch recreate the logic from arch/x86, which check +whether AVX is available and add fallbacks for 32bit and 64bit config of +um. + +A very minor additional "fix" is, the return of the macro parameter +instead of NULL, as this is the original intent of the macro, but +this does not change the actual behavior. + +Fixes: c0ecca6604b8 ("um: enable the use of optimized xor routines in UML") +Signed-off-by: Benjamin Beichler +Acked-By: Anton Ivanov +Signed-off-by: Richard Weinberger +Signed-off-by: Sasha Levin +--- + arch/um/include/asm/xor.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h +index f512704a9ec7..22b39de73c24 100644 +--- a/arch/um/include/asm/xor.h ++++ b/arch/um/include/asm/xor.h +@@ -4,8 +4,10 @@ + + #ifdef CONFIG_64BIT + #undef CONFIG_X86_32 ++#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64)) + #else + #define CONFIG_X86_32 1 ++#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs)) + #endif + + #include +@@ -16,7 +18,7 @@ + #undef XOR_SELECT_TEMPLATE + /* pick an arbitrary one - measuring isn't possible with inf-cpu */ + #define XOR_SELECT_TEMPLATE(x) \ +- (time_travel_mode == TT_MODE_INFCPU ? &xor_block_8regs : NULL) ++ (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) + #endif + + #endif +-- +2.35.1 + diff --git a/queue-5.15/usb-cdnsp-fix-cdnsp_decode_trb-function-to-properly-.patch b/queue-5.15/usb-cdnsp-fix-cdnsp_decode_trb-function-to-properly-.patch new file mode 100644 index 00000000000..412a378ee95 --- /dev/null +++ b/queue-5.15/usb-cdnsp-fix-cdnsp_decode_trb-function-to-properly-.patch @@ -0,0 +1,393 @@ +From 28a77e3972399cf495eb80feea7987acb2dc3894 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 12 Jan 2022 06:32:37 +0100 +Subject: usb: cdnsp: fix cdnsp_decode_trb function to properly handle ret + value + +From: Pawel Laszczak + +[ Upstream commit 03db9289b5ab59437e42a111a34545a7cedb5190 ] + +Variable ret in function cdnsp_decode_trb is initialized but not +used. To fix this compiler warning patch adds checking whether the +data buffer has not been overflowed. + +Reported-by: kernel test robot +Signed-off-by: Pawel Laszczak +Link: https://lore.kernel.org/r/20220112053237.14309-1-pawell@gli-login.cadence.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/cdns3/cdnsp-debug.h | 305 ++++++++++++++++---------------- + 1 file changed, 154 insertions(+), 151 deletions(-) + +diff --git a/drivers/usb/cdns3/cdnsp-debug.h b/drivers/usb/cdns3/cdnsp-debug.h +index a8776df2d4e0..f0ca865cce2a 100644 +--- a/drivers/usb/cdns3/cdnsp-debug.h ++++ b/drivers/usb/cdns3/cdnsp-debug.h +@@ -182,208 +182,211 @@ static inline const char *cdnsp_decode_trb(char *str, size_t size, u32 field0, + int ep_id = TRB_TO_EP_INDEX(field3) - 1; + int type = TRB_FIELD_TO_TYPE(field3); + unsigned int ep_num; +- int ret = 0; ++ int ret; + u32 temp; + + ep_num = DIV_ROUND_UP(ep_id, 2); + + switch (type) { + case TRB_LINK: +- ret += snprintf(str, size, +- "LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c", +- field1, field0, GET_INTR_TARGET(field2), +- cdnsp_trb_type_string(type), +- field3 & TRB_IOC ? 'I' : 'i', +- field3 & TRB_CHAIN ? 'C' : 'c', +- field3 & TRB_TC ? 'T' : 't', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c", ++ field1, field0, GET_INTR_TARGET(field2), ++ cdnsp_trb_type_string(type), ++ field3 & TRB_IOC ? 'I' : 'i', ++ field3 & TRB_CHAIN ? 'C' : 'c', ++ field3 & TRB_TC ? 'T' : 't', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_TRANSFER: + case TRB_COMPLETION: + case TRB_PORT_STATUS: + case TRB_HC_EVENT: +- ret += snprintf(str, size, +- "ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" +- " len %ld slot %ld flags %c:%c", +- ep_num, ep_id % 2 ? "out" : "in", +- TRB_TO_EP_INDEX(field3), +- cdnsp_trb_type_string(type), field1, field0, +- cdnsp_trb_comp_code_string(GET_COMP_CODE(field2)), +- EVENT_TRB_LEN(field2), TRB_TO_SLOT_ID(field3), +- field3 & EVENT_DATA ? 'E' : 'e', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" ++ " len %ld slot %ld flags %c:%c", ++ ep_num, ep_id % 2 ? "out" : "in", ++ TRB_TO_EP_INDEX(field3), ++ cdnsp_trb_type_string(type), field1, field0, ++ cdnsp_trb_comp_code_string(GET_COMP_CODE(field2)), ++ EVENT_TRB_LEN(field2), TRB_TO_SLOT_ID(field3), ++ field3 & EVENT_DATA ? 'E' : 'e', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_MFINDEX_WRAP: +- ret += snprintf(str, size, "%s: flags %c", +- cdnsp_trb_type_string(type), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, "%s: flags %c", ++ cdnsp_trb_type_string(type), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_SETUP: +- ret += snprintf(str, size, +- "type '%s' bRequestType %02x bRequest %02x " +- "wValue %02x%02x wIndex %02x%02x wLength %d " +- "length %ld TD size %ld intr %ld Setup ID %ld " +- "flags %c:%c:%c", +- cdnsp_trb_type_string(type), +- field0 & 0xff, +- (field0 & 0xff00) >> 8, +- (field0 & 0xff000000) >> 24, +- (field0 & 0xff0000) >> 16, +- (field1 & 0xff00) >> 8, +- field1 & 0xff, +- (field1 & 0xff000000) >> 16 | +- (field1 & 0xff0000) >> 16, +- TRB_LEN(field2), GET_TD_SIZE(field2), +- GET_INTR_TARGET(field2), +- TRB_SETUPID_TO_TYPE(field3), +- field3 & TRB_IDT ? 'D' : 'd', +- field3 & TRB_IOC ? 'I' : 'i', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "type '%s' bRequestType %02x bRequest %02x " ++ "wValue %02x%02x wIndex %02x%02x wLength %d " ++ "length %ld TD size %ld intr %ld Setup ID %ld " ++ "flags %c:%c:%c", ++ cdnsp_trb_type_string(type), ++ field0 & 0xff, ++ (field0 & 0xff00) >> 8, ++ (field0 & 0xff000000) >> 24, ++ (field0 & 0xff0000) >> 16, ++ (field1 & 0xff00) >> 8, ++ field1 & 0xff, ++ (field1 & 0xff000000) >> 16 | ++ (field1 & 0xff0000) >> 16, ++ TRB_LEN(field2), GET_TD_SIZE(field2), ++ GET_INTR_TARGET(field2), ++ TRB_SETUPID_TO_TYPE(field3), ++ field3 & TRB_IDT ? 'D' : 'd', ++ field3 & TRB_IOC ? 'I' : 'i', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_DATA: +- ret += snprintf(str, size, +- "type '%s' Buffer %08x%08x length %ld TD size %ld " +- "intr %ld flags %c:%c:%c:%c:%c:%c:%c", +- cdnsp_trb_type_string(type), +- field1, field0, TRB_LEN(field2), +- GET_TD_SIZE(field2), +- GET_INTR_TARGET(field2), +- field3 & TRB_IDT ? 'D' : 'i', +- field3 & TRB_IOC ? 'I' : 'i', +- field3 & TRB_CHAIN ? 'C' : 'c', +- field3 & TRB_NO_SNOOP ? 'S' : 's', +- field3 & TRB_ISP ? 'I' : 'i', +- field3 & TRB_ENT ? 'E' : 'e', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "type '%s' Buffer %08x%08x length %ld TD size %ld " ++ "intr %ld flags %c:%c:%c:%c:%c:%c:%c", ++ cdnsp_trb_type_string(type), ++ field1, field0, TRB_LEN(field2), ++ GET_TD_SIZE(field2), ++ GET_INTR_TARGET(field2), ++ field3 & TRB_IDT ? 'D' : 'i', ++ field3 & TRB_IOC ? 'I' : 'i', ++ field3 & TRB_CHAIN ? 'C' : 'c', ++ field3 & TRB_NO_SNOOP ? 'S' : 's', ++ field3 & TRB_ISP ? 'I' : 'i', ++ field3 & TRB_ENT ? 'E' : 'e', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_STATUS: +- ret += snprintf(str, size, +- "Buffer %08x%08x length %ld TD size %ld intr" +- "%ld type '%s' flags %c:%c:%c:%c", +- field1, field0, TRB_LEN(field2), +- GET_TD_SIZE(field2), +- GET_INTR_TARGET(field2), +- cdnsp_trb_type_string(type), +- field3 & TRB_IOC ? 'I' : 'i', +- field3 & TRB_CHAIN ? 'C' : 'c', +- field3 & TRB_ENT ? 'E' : 'e', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "Buffer %08x%08x length %ld TD size %ld intr" ++ "%ld type '%s' flags %c:%c:%c:%c", ++ field1, field0, TRB_LEN(field2), ++ GET_TD_SIZE(field2), ++ GET_INTR_TARGET(field2), ++ cdnsp_trb_type_string(type), ++ field3 & TRB_IOC ? 'I' : 'i', ++ field3 & TRB_CHAIN ? 'C' : 'c', ++ field3 & TRB_ENT ? 'E' : 'e', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_NORMAL: + case TRB_ISOC: + case TRB_EVENT_DATA: + case TRB_TR_NOOP: +- ret += snprintf(str, size, +- "type '%s' Buffer %08x%08x length %ld " +- "TD size %ld intr %ld " +- "flags %c:%c:%c:%c:%c:%c:%c:%c:%c", +- cdnsp_trb_type_string(type), +- field1, field0, TRB_LEN(field2), +- GET_TD_SIZE(field2), +- GET_INTR_TARGET(field2), +- field3 & TRB_BEI ? 'B' : 'b', +- field3 & TRB_IDT ? 'T' : 't', +- field3 & TRB_IOC ? 'I' : 'i', +- field3 & TRB_CHAIN ? 'C' : 'c', +- field3 & TRB_NO_SNOOP ? 'S' : 's', +- field3 & TRB_ISP ? 'I' : 'i', +- field3 & TRB_ENT ? 'E' : 'e', +- field3 & TRB_CYCLE ? 'C' : 'c', +- !(field3 & TRB_EVENT_INVALIDATE) ? 'V' : 'v'); ++ ret = snprintf(str, size, ++ "type '%s' Buffer %08x%08x length %ld " ++ "TD size %ld intr %ld " ++ "flags %c:%c:%c:%c:%c:%c:%c:%c:%c", ++ cdnsp_trb_type_string(type), ++ field1, field0, TRB_LEN(field2), ++ GET_TD_SIZE(field2), ++ GET_INTR_TARGET(field2), ++ field3 & TRB_BEI ? 'B' : 'b', ++ field3 & TRB_IDT ? 'T' : 't', ++ field3 & TRB_IOC ? 'I' : 'i', ++ field3 & TRB_CHAIN ? 'C' : 'c', ++ field3 & TRB_NO_SNOOP ? 'S' : 's', ++ field3 & TRB_ISP ? 'I' : 'i', ++ field3 & TRB_ENT ? 'E' : 'e', ++ field3 & TRB_CYCLE ? 'C' : 'c', ++ !(field3 & TRB_EVENT_INVALIDATE) ? 'V' : 'v'); + break; + case TRB_CMD_NOOP: + case TRB_ENABLE_SLOT: +- ret += snprintf(str, size, "%s: flags %c", +- cdnsp_trb_type_string(type), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, "%s: flags %c", ++ cdnsp_trb_type_string(type), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_DISABLE_SLOT: +- ret += snprintf(str, size, "%s: slot %ld flags %c", +- cdnsp_trb_type_string(type), +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, "%s: slot %ld flags %c", ++ cdnsp_trb_type_string(type), ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_ADDR_DEV: +- ret += snprintf(str, size, +- "%s: ctx %08x%08x slot %ld flags %c:%c", +- cdnsp_trb_type_string(type), field1, field0, +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_BSR ? 'B' : 'b', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ctx %08x%08x slot %ld flags %c:%c", ++ cdnsp_trb_type_string(type), field1, field0, ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_BSR ? 'B' : 'b', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_CONFIG_EP: +- ret += snprintf(str, size, +- "%s: ctx %08x%08x slot %ld flags %c:%c", +- cdnsp_trb_type_string(type), field1, field0, +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_DC ? 'D' : 'd', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ctx %08x%08x slot %ld flags %c:%c", ++ cdnsp_trb_type_string(type), field1, field0, ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_DC ? 'D' : 'd', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_EVAL_CONTEXT: +- ret += snprintf(str, size, +- "%s: ctx %08x%08x slot %ld flags %c", +- cdnsp_trb_type_string(type), field1, field0, +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ctx %08x%08x slot %ld flags %c", ++ cdnsp_trb_type_string(type), field1, field0, ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_RESET_EP: + case TRB_HALT_ENDPOINT: + case TRB_FLUSH_ENDPOINT: +- ret += snprintf(str, size, +- "%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c", +- cdnsp_trb_type_string(type), +- ep_num, ep_id % 2 ? "out" : "in", +- TRB_TO_EP_INDEX(field3), field1, field0, +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c", ++ cdnsp_trb_type_string(type), ++ ep_num, ep_id % 2 ? "out" : "in", ++ TRB_TO_EP_INDEX(field3), field1, field0, ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_STOP_RING: +- ret += snprintf(str, size, +- "%s: ep%d%s(%d) slot %ld sp %d flags %c", +- cdnsp_trb_type_string(type), +- ep_num, ep_id % 2 ? "out" : "in", +- TRB_TO_EP_INDEX(field3), +- TRB_TO_SLOT_ID(field3), +- TRB_TO_SUSPEND_PORT(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ep%d%s(%d) slot %ld sp %d flags %c", ++ cdnsp_trb_type_string(type), ++ ep_num, ep_id % 2 ? "out" : "in", ++ TRB_TO_EP_INDEX(field3), ++ TRB_TO_SLOT_ID(field3), ++ TRB_TO_SUSPEND_PORT(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_SET_DEQ: +- ret += snprintf(str, size, +- "%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c", +- cdnsp_trb_type_string(type), +- ep_num, ep_id % 2 ? "out" : "in", +- TRB_TO_EP_INDEX(field3), field1, field0, +- TRB_TO_STREAM_ID(field2), +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, ++ "%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c", ++ cdnsp_trb_type_string(type), ++ ep_num, ep_id % 2 ? "out" : "in", ++ TRB_TO_EP_INDEX(field3), field1, field0, ++ TRB_TO_STREAM_ID(field2), ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_RESET_DEV: +- ret += snprintf(str, size, "%s: slot %ld flags %c", +- cdnsp_trb_type_string(type), +- TRB_TO_SLOT_ID(field3), +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ ret = snprintf(str, size, "%s: slot %ld flags %c", ++ cdnsp_trb_type_string(type), ++ TRB_TO_SLOT_ID(field3), ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + case TRB_ENDPOINT_NRDY: +- temp = TRB_TO_HOST_STREAM(field2); +- +- ret += snprintf(str, size, +- "%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c", +- cdnsp_trb_type_string(type), +- ep_num, ep_id % 2 ? "out" : "in", +- TRB_TO_EP_INDEX(field3), temp, +- temp == STREAM_PRIME_ACK ? "(PRIME)" : "", +- temp == STREAM_REJECTED ? "(REJECTED)" : "", +- TRB_TO_DEV_STREAM(field0), +- field3 & TRB_STAT ? 'S' : 's', +- field3 & TRB_CYCLE ? 'C' : 'c'); ++ temp = TRB_TO_HOST_STREAM(field2); ++ ++ ret = snprintf(str, size, ++ "%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c", ++ cdnsp_trb_type_string(type), ++ ep_num, ep_id % 2 ? "out" : "in", ++ TRB_TO_EP_INDEX(field3), temp, ++ temp == STREAM_PRIME_ACK ? "(PRIME)" : "", ++ temp == STREAM_REJECTED ? "(REJECTED)" : "", ++ TRB_TO_DEV_STREAM(field0), ++ field3 & TRB_STAT ? 'S' : 's', ++ field3 & TRB_CYCLE ? 'C' : 'c'); + break; + default: +- ret += snprintf(str, size, +- "type '%s' -> raw %08x %08x %08x %08x", +- cdnsp_trb_type_string(type), +- field0, field1, field2, field3); ++ ret = snprintf(str, size, ++ "type '%s' -> raw %08x %08x %08x %08x", ++ cdnsp_trb_type_string(type), ++ field0, field1, field2, field3); + } + ++ if (ret >= size) ++ pr_info("CDNSP: buffer overflowed.\n"); ++ + return str; + } + +-- +2.35.1 + diff --git a/queue-5.15/usb-dwc3-omap-fix-unbalanced-disables-for-smps10_out.patch b/queue-5.15/usb-dwc3-omap-fix-unbalanced-disables-for-smps10_out.patch new file mode 100644 index 00000000000..7fca4bec058 --- /dev/null +++ b/queue-5.15/usb-dwc3-omap-fix-unbalanced-disables-for-smps10_out.patch @@ -0,0 +1,75 @@ +From 340e1c6edd0e8bf8b2b2beb30f578f0c44678a98 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Mar 2022 14:03:37 +0100 +Subject: usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on + omap5evm + +From: H. Nikolaus Schaller + +[ Upstream commit ac01df343e5a6c6bcead2ed421af1fde30f73e7e ] + +Usually, the vbus_regulator (smps10 on omap5evm) boots up disabled. + +Hence calling regulator_disable() indirectly through dwc3_omap_set_mailbox() +during probe leads to: + +[ 10.332764] WARNING: CPU: 0 PID: 1628 at drivers/regulator/core.c:2853 _regulator_disable+0x40/0x164 +[ 10.351919] unbalanced disables for smps10_out1 +[ 10.361298] Modules linked in: dwc3_omap(+) clk_twl6040 at24 gpio_twl6040 palmas_gpadc palmas_pwrbutton +industrialio snd_soc_omap_mcbsp(+) snd_soc_ti_sdma display_connector ti_tpd12s015 drm leds_gpio +drm_panel_orientation_quirks ip_tables x_tables ipv6 autofs4 +[ 10.387818] CPU: 0 PID: 1628 Comm: systemd-udevd Not tainted 5.17.0-rc1-letux-lpae+ #8139 +[ 10.405129] Hardware name: Generic OMAP5 (Flattened Device Tree) +[ 10.411455] unwind_backtrace from show_stack+0x10/0x14 +[ 10.416970] show_stack from dump_stack_lvl+0x40/0x4c +[ 10.422313] dump_stack_lvl from __warn+0xb8/0x170 +[ 10.427377] __warn from warn_slowpath_fmt+0x70/0x9c +[ 10.432595] warn_slowpath_fmt from _regulator_disable+0x40/0x164 +[ 10.439037] _regulator_disable from regulator_disable+0x30/0x64 +[ 10.445382] regulator_disable from dwc3_omap_set_mailbox+0x8c/0xf0 [dwc3_omap] +[ 10.453116] dwc3_omap_set_mailbox [dwc3_omap] from dwc3_omap_probe+0x2b8/0x394 [dwc3_omap] +[ 10.467021] dwc3_omap_probe [dwc3_omap] from platform_probe+0x58/0xa8 +[ 10.481762] platform_probe from really_probe+0x168/0x2fc +[ 10.481782] really_probe from __driver_probe_device+0xc4/0xd8 +[ 10.481782] __driver_probe_device from driver_probe_device+0x24/0xa4 +[ 10.503762] driver_probe_device from __driver_attach+0xc4/0xd8 +[ 10.510018] __driver_attach from bus_for_each_dev+0x64/0xa0 +[ 10.516001] bus_for_each_dev from bus_add_driver+0x148/0x1a4 +[ 10.524880] bus_add_driver from driver_register+0xb4/0xf8 +[ 10.530678] driver_register from do_one_initcall+0x90/0x1c4 +[ 10.536661] do_one_initcall from do_init_module+0x4c/0x200 +[ 10.536683] do_init_module from load_module+0x13dc/0x1910 +[ 10.551159] load_module from sys_finit_module+0xc8/0xd8 +[ 10.561319] sys_finit_module from __sys_trace_return+0x0/0x18 +[ 10.561336] Exception stack(0xc344bfa8 to 0xc344bff0) +[ 10.561341] bfa0: b6fb5778 b6fab8d8 00000007 b6ecfbb8 00000000 b6ed0398 +[ 10.561341] bfc0: b6fb5778 b6fab8d8 855c0500 0000017b 00020000 b6f9a3cc 00000000 b6fb5778 +[ 10.595500] bfe0: bede18f8 bede18e8 b6ec9aeb b6dda1c2 +[ 10.601345] ---[ end trace 0000000000000000 ]--- + +Fix this unnecessary warning by checking if the regulator is enabled. + +Signed-off-by: H. Nikolaus Schaller +Link: https://lore.kernel.org/r/af3b750dc2265d875deaabcf5f80098c9645da45.1646744616.git.hns@goldelico.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/dwc3-omap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c +index e196673f5c64..efaf0db595f4 100644 +--- a/drivers/usb/dwc3/dwc3-omap.c ++++ b/drivers/usb/dwc3/dwc3-omap.c +@@ -242,7 +242,7 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, + break; + + case OMAP_DWC3_ID_FLOAT: +- if (omap->vbus_reg) ++ if (omap->vbus_reg && regulator_is_enabled(omap->vbus_reg)) + regulator_disable(omap->vbus_reg); + val = dwc3_omap_read_utmi_ctrl(omap); + val |= USBOTGSS_UTMI_OTG_CTRL_IDDIG; +-- +2.35.1 + diff --git a/queue-5.15/usb-dwc3-pci-set-the-swnode-from-inside-dwc3_pci_qui.patch b/queue-5.15/usb-dwc3-pci-set-the-swnode-from-inside-dwc3_pci_qui.patch new file mode 100644 index 00000000000..aa5502f0e85 --- /dev/null +++ b/queue-5.15/usb-dwc3-pci-set-the-swnode-from-inside-dwc3_pci_qui.patch @@ -0,0 +1,61 @@ +From cb7d82bec132f8d63dd0c6fae45d619e2899ae0c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 13 Feb 2022 14:05:18 +0100 +Subject: usb: dwc3: pci: Set the swnode from inside dwc3_pci_quirks() + +From: Hans de Goede + +[ Upstream commit e285cb403994419e997749c9a52b9370884ae0c8 ] + +The quirk handling may need to set some different properties +which means using a different swnode, move the setting of the swnode +to inside dwc3_pci_quirks() so that the quirk handling can choose +a different swnode. + +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20220213130524.18748-4-hdegoede@redhat.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/dwc3-pci.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c +index 06d0e88ec8af..4d9608cc55f7 100644 +--- a/drivers/usb/dwc3/dwc3-pci.c ++++ b/drivers/usb/dwc3/dwc3-pci.c +@@ -185,7 +185,8 @@ static const struct software_node dwc3_pci_amd_mr_swnode = { + .properties = dwc3_pci_mr_properties, + }; + +-static int dwc3_pci_quirks(struct dwc3_pci *dwc) ++static int dwc3_pci_quirks(struct dwc3_pci *dwc, ++ const struct software_node *swnode) + { + struct pci_dev *pdev = dwc->pci; + +@@ -242,7 +243,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) + } + } + +- return 0; ++ return device_add_software_node(&dwc->dwc3->dev, swnode); + } + + #ifdef CONFIG_PM +@@ -307,11 +308,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) + dwc->dwc3->dev.parent = dev; + ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev)); + +- ret = device_add_software_node(&dwc->dwc3->dev, (void *)id->driver_data); +- if (ret < 0) +- goto err; +- +- ret = dwc3_pci_quirks(dwc); ++ ret = dwc3_pci_quirks(dwc, (void *)id->driver_data); + if (ret) + goto err; + +-- +2.35.1 + diff --git a/queue-5.15/usb-ehci-add-pci-device-support-for-aspeed-platforms.patch b/queue-5.15/usb-ehci-add-pci-device-support-for-aspeed-platforms.patch new file mode 100644 index 00000000000..107b046bad7 --- /dev/null +++ b/queue-5.15/usb-ehci-add-pci-device-support-for-aspeed-platforms.patch @@ -0,0 +1,52 @@ +From fae9549b5b8a581d16d293d537589d788884a724 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Feb 2022 18:16:57 +0800 +Subject: usb: ehci: add pci device support for Aspeed platforms + +From: Neal Liu + +[ Upstream commit c3c9cee592828528fd228b01d312c7526c584a42 ] + +Enable Aspeed quirks in commit 7f2d73788d90 ("usb: ehci: +handshake CMD_RUN instead of STS_HALT") to support Aspeed +ehci-pci device. + +Acked-by: Alan Stern +Signed-off-by: Neal Liu +Link: https://lore.kernel.org/r/20220208101657.76459-1-neal_liu@aspeedtech.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/ehci-pci.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c +index e87cf3a00fa4..638f03b89739 100644 +--- a/drivers/usb/host/ehci-pci.c ++++ b/drivers/usb/host/ehci-pci.c +@@ -21,6 +21,9 @@ static const char hcd_name[] = "ehci-pci"; + /* defined here to avoid adding to pci_ids.h for single instance use */ + #define PCI_DEVICE_ID_INTEL_CE4100_USB 0x2e70 + ++#define PCI_VENDOR_ID_ASPEED 0x1a03 ++#define PCI_DEVICE_ID_ASPEED_EHCI 0x2603 ++ + /*-------------------------------------------------------------------------*/ + #define PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC 0x0939 + static inline bool is_intel_quark_x1000(struct pci_dev *pdev) +@@ -222,6 +225,12 @@ static int ehci_pci_setup(struct usb_hcd *hcd) + ehci->has_synopsys_hc_bug = 1; + } + break; ++ case PCI_VENDOR_ID_ASPEED: ++ if (pdev->device == PCI_DEVICE_ID_ASPEED_EHCI) { ++ ehci_info(ehci, "applying Aspeed HC workaround\n"); ++ ehci->is_aspeed = 1; ++ } ++ break; + } + + /* optional debug port, normally in the first BAR */ +-- +2.35.1 + diff --git a/queue-5.15/usb-gadget-tegra-xudc-do-not-program-sparam.patch b/queue-5.15/usb-gadget-tegra-xudc-do-not-program-sparam.patch new file mode 100644 index 00000000000..aa216e66e5d --- /dev/null +++ b/queue-5.15/usb-gadget-tegra-xudc-do-not-program-sparam.patch @@ -0,0 +1,52 @@ +From 2639e1598cc6d7507ed3bbf43d951743aafed874 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Jan 2022 17:04:43 +0800 +Subject: usb: gadget: tegra-xudc: Do not program SPARAM + +From: Wayne Chang + +[ Upstream commit 62fb61580eb48fc890b7bc9fb5fd263367baeca8 ] + +According to the Tegra Technical Reference Manual, SPARAM +is a read-only register and should not be programmed in +the driver. + +The change removes the wrong SPARAM usage. + +Signed-off-by: Wayne Chang +Link: https://lore.kernel.org/r/20220107090443.149021-1-waynec@nvidia.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/tegra-xudc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c +index 43f1b0d461c1..716d9ab2d2ff 100644 +--- a/drivers/usb/gadget/udc/tegra-xudc.c ++++ b/drivers/usb/gadget/udc/tegra-xudc.c +@@ -32,9 +32,6 @@ + #include + + /* XUSB_DEV registers */ +-#define SPARAM 0x000 +-#define SPARAM_ERSTMAX_MASK GENMASK(20, 16) +-#define SPARAM_ERSTMAX(x) (((x) << 16) & SPARAM_ERSTMAX_MASK) + #define DB 0x004 + #define DB_TARGET_MASK GENMASK(15, 8) + #define DB_TARGET(x) (((x) << 8) & DB_TARGET_MASK) +@@ -3295,11 +3292,6 @@ static void tegra_xudc_init_event_ring(struct tegra_xudc *xudc) + unsigned int i; + u32 val; + +- val = xudc_readl(xudc, SPARAM); +- val &= ~(SPARAM_ERSTMAX_MASK); +- val |= SPARAM_ERSTMAX(XUDC_NR_EVENT_RINGS); +- xudc_writel(xudc, val, SPARAM); +- + for (i = 0; i < ARRAY_SIZE(xudc->event_ring); i++) { + memset(xudc->event_ring[i], 0, XUDC_EVENT_RING_SIZE * + sizeof(*xudc->event_ring[i])); +-- +2.35.1 + diff --git a/queue-5.15/usb-gadget-tegra-xudc-fix-control-endpoint-s-definit.patch b/queue-5.15/usb-gadget-tegra-xudc-fix-control-endpoint-s-definit.patch new file mode 100644 index 00000000000..6fcd24b27d2 --- /dev/null +++ b/queue-5.15/usb-gadget-tegra-xudc-fix-control-endpoint-s-definit.patch @@ -0,0 +1,64 @@ +From 228250cbd489d8218f744257d2e5d07c273b283c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 7 Jan 2022 17:13:49 +0800 +Subject: usb: gadget: tegra-xudc: Fix control endpoint's definitions + +From: Wayne Chang + +[ Upstream commit 7bd42fb95eb4f98495ccadf467ad15124208ec49 ] + +According to the Tegra Technical Reference Manual, the seq_num +field of control endpoint is not [31:24] but [31:27]. Bit 24 +is reserved and bit 26 is splitxstate. + +The change fixes the wrong control endpoint's definitions. + +Signed-off-by: Wayne Chang +Link: https://lore.kernel.org/r/20220107091349.149798-1-waynec@nvidia.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/udc/tegra-xudc.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc/tegra-xudc.c +index 716d9ab2d2ff..be76f891b9c5 100644 +--- a/drivers/usb/gadget/udc/tegra-xudc.c ++++ b/drivers/usb/gadget/udc/tegra-xudc.c +@@ -272,8 +272,10 @@ BUILD_EP_CONTEXT_RW(deq_hi, deq_hi, 0, 0xffffffff) + BUILD_EP_CONTEXT_RW(avg_trb_len, tx_info, 0, 0xffff) + BUILD_EP_CONTEXT_RW(max_esit_payload, tx_info, 16, 0xffff) + BUILD_EP_CONTEXT_RW(edtla, rsvd[0], 0, 0xffffff) +-BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 24, 0xff) ++BUILD_EP_CONTEXT_RW(rsvd, rsvd[0], 24, 0x1) + BUILD_EP_CONTEXT_RW(partial_td, rsvd[0], 25, 0x1) ++BUILD_EP_CONTEXT_RW(splitxstate, rsvd[0], 26, 0x1) ++BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 27, 0x1f) + BUILD_EP_CONTEXT_RW(cerrcnt, rsvd[1], 18, 0x3) + BUILD_EP_CONTEXT_RW(data_offset, rsvd[2], 0, 0x1ffff) + BUILD_EP_CONTEXT_RW(numtrbs, rsvd[2], 22, 0x1f) +@@ -1554,6 +1556,9 @@ static int __tegra_xudc_ep_set_halt(struct tegra_xudc_ep *ep, bool halt) + ep_reload(xudc, ep->index); + + ep_ctx_write_state(ep->context, EP_STATE_RUNNING); ++ ep_ctx_write_rsvd(ep->context, 0); ++ ep_ctx_write_partial_td(ep->context, 0); ++ ep_ctx_write_splitxstate(ep->context, 0); + ep_ctx_write_seq_num(ep->context, 0); + + ep_reload(xudc, ep->index); +@@ -2809,7 +2814,10 @@ static void tegra_xudc_reset(struct tegra_xudc *xudc) + xudc->setup_seq_num = 0; + xudc->queued_setup_packet = false; + +- ep_ctx_write_seq_num(ep0->context, xudc->setup_seq_num); ++ ep_ctx_write_rsvd(ep0->context, 0); ++ ep_ctx_write_partial_td(ep0->context, 0); ++ ep_ctx_write_splitxstate(ep0->context, 0); ++ ep_ctx_write_seq_num(ep0->context, 0); + + deq_ptr = trb_virt_to_phys(ep0, &ep0->transfer_ring[ep0->deq_ptr]); + +-- +2.35.1 + diff --git a/queue-5.15/vfio-pci-stub-vfio_pci_vga_rw-when-config_vfio_pci_v.patch b/queue-5.15/vfio-pci-stub-vfio_pci_vga_rw-when-config_vfio_pci_v.patch new file mode 100644 index 00000000000..b5cda1f37ea --- /dev/null +++ b/queue-5.15/vfio-pci-stub-vfio_pci_vga_rw-when-config_vfio_pci_v.patch @@ -0,0 +1,69 @@ +From 40842b2db452cf9edfbd1f076d5d87df711a33ad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 24 Jan 2022 16:11:37 -0700 +Subject: vfio/pci: Stub vfio_pci_vga_rw when !CONFIG_VFIO_PCI_VGA + +From: Alex Williamson + +[ Upstream commit 6e031ec0e5a2dda53e12e0d2a7e9b15b47a3c502 ] + +Resolve build errors reported against UML build for undefined +ioport_map() and ioport_unmap() functions. Without this config +option a device cannot have vfio_pci_core_device.has_vga set, +so the existing function would always return -EINVAL anyway. + +Reported-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20220123125737.2658758-1-geert@linux-m68k.org +Link: https://lore.kernel.org/r/164306582968.3758255.15192949639574660648.stgit@omen +Signed-off-by: Alex Williamson +Signed-off-by: Sasha Levin +--- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 ++ + include/linux/vfio_pci_core.h | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c +index 57d3b2cbbd8e..82ac1569deb0 100644 +--- a/drivers/vfio/pci/vfio_pci_rdwr.c ++++ b/drivers/vfio/pci/vfio_pci_rdwr.c +@@ -288,6 +288,7 @@ ssize_t vfio_pci_bar_rw(struct vfio_pci_core_device *vdev, char __user *buf, + return done; + } + ++#ifdef CONFIG_VFIO_PCI_VGA + ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, char __user *buf, + size_t count, loff_t *ppos, bool iswrite) + { +@@ -355,6 +356,7 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, char __user *buf, + + return done; + } ++#endif + + static void vfio_pci_ioeventfd_do_write(struct vfio_pci_ioeventfd *ioeventfd, + bool test_mem) +diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h +index ef9a44b6cf5d..ae6f4838ab75 100644 +--- a/include/linux/vfio_pci_core.h ++++ b/include/linux/vfio_pci_core.h +@@ -159,8 +159,17 @@ extern ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev, + extern ssize_t vfio_pci_bar_rw(struct vfio_pci_core_device *vdev, char __user *buf, + size_t count, loff_t *ppos, bool iswrite); + ++#ifdef CONFIG_VFIO_PCI_VGA + extern ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, char __user *buf, + size_t count, loff_t *ppos, bool iswrite); ++#else ++static inline ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, ++ char __user *buf, size_t count, ++ loff_t *ppos, bool iswrite) ++{ ++ return -EINVAL; ++} ++#endif + + extern long vfio_pci_ioeventfd(struct vfio_pci_core_device *vdev, loff_t offset, + uint64_t data, int count, int fd); +-- +2.35.1 + diff --git a/queue-5.15/virtio_console-eliminate-anonymous-module_init-modul.patch b/queue-5.15/virtio_console-eliminate-anonymous-module_init-modul.patch new file mode 100644 index 00000000000..1b2a3d1b8af --- /dev/null +++ b/queue-5.15/virtio_console-eliminate-anonymous-module_init-modul.patch @@ -0,0 +1,76 @@ +From 9f5efe9d59dafd06782909b527ed946c5e26c1e9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Mar 2022 12:20:03 -0700 +Subject: virtio_console: eliminate anonymous module_init & module_exit + +From: Randy Dunlap + +[ Upstream commit fefb8a2a941338d871e2d83fbd65fbfa068857bd ] + +Eliminate anonymous module_init() and module_exit(), which can lead to +confusion or ambiguity when reading System.map, crashes/oops/bugs, +or an initcall_debug log. + +Give each of these init and exit functions unique driver-specific +names to eliminate the anonymous names. + +Example 1: (System.map) + ffffffff832fc78c t init + ffffffff832fc79e t init + ffffffff832fc8f8 t init + +Example 2: (initcall_debug log) + calling init+0x0/0x12 @ 1 + initcall init+0x0/0x12 returned 0 after 15 usecs + calling init+0x0/0x60 @ 1 + initcall init+0x0/0x60 returned 0 after 2 usecs + calling init+0x0/0x9a @ 1 + initcall init+0x0/0x9a returned 0 after 74 usecs + +Signed-off-by: Randy Dunlap +Reviewed-by: Amit Shah +Cc: virtualization@lists.linux-foundation.org +Cc: Arnd Bergmann +Link: https://lore.kernel.org/r/20220316192010.19001-3-rdunlap@infradead.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/char/virtio_console.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c +index 3adf04766e98..77bc993d7513 100644 +--- a/drivers/char/virtio_console.c ++++ b/drivers/char/virtio_console.c +@@ -2236,7 +2236,7 @@ static struct virtio_driver virtio_rproc_serial = { + .remove = virtcons_remove, + }; + +-static int __init init(void) ++static int __init virtio_console_init(void) + { + int err; + +@@ -2271,7 +2271,7 @@ static int __init init(void) + return err; + } + +-static void __exit fini(void) ++static void __exit virtio_console_fini(void) + { + reclaim_dma_bufs(); + +@@ -2281,8 +2281,8 @@ static void __exit fini(void) + class_destroy(pdrvdata.class); + debugfs_remove_recursive(pdrvdata.debugfs_dir); + } +-module_init(init); +-module_exit(fini); ++module_init(virtio_console_init); ++module_exit(virtio_console_fini); + + MODULE_DESCRIPTION("Virtio console driver"); + MODULE_LICENSE("GPL"); +-- +2.35.1 + diff --git a/queue-5.15/w1-w1_therm-fixes-w1_seq-for-ds28ea00-sensors.patch b/queue-5.15/w1-w1_therm-fixes-w1_seq-for-ds28ea00-sensors.patch new file mode 100644 index 00000000000..f120890851c --- /dev/null +++ b/queue-5.15/w1-w1_therm-fixes-w1_seq-for-ds28ea00-sensors.patch @@ -0,0 +1,52 @@ +From 4895819441dfe744f9392c5b9a520b1e9952b12f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Feb 2022 11:35:55 +0000 +Subject: w1: w1_therm: fixes w1_seq for ds28ea00 sensors + +From: Lucas Denefle + +[ Upstream commit 41a92a89eee819298f805c40187ad8b02bb53426 ] + +w1_seq was failing due to several devices responding to the +CHAIN_DONE at the same time. Now properly selects the current +device in the chain with MATCH_ROM. Also acknowledgment was +read twice. + +Signed-off-by: Lucas Denefle +Link: https://lore.kernel.org/r/20220223113558.232750-1-lucas.denefle@converge.io +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/w1/slaves/w1_therm.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c +index ca70c5f03206..9cbeeb4923ec 100644 +--- a/drivers/w1/slaves/w1_therm.c ++++ b/drivers/w1/slaves/w1_therm.c +@@ -2090,16 +2090,20 @@ static ssize_t w1_seq_show(struct device *device, + if (sl->reg_num.id == reg_num->id) + seq = i; + ++ if (w1_reset_bus(sl->master)) ++ goto error; ++ ++ /* Put the device into chain DONE state */ ++ w1_write_8(sl->master, W1_MATCH_ROM); ++ w1_write_block(sl->master, (u8 *)&rn, 8); + w1_write_8(sl->master, W1_42_CHAIN); + w1_write_8(sl->master, W1_42_CHAIN_DONE); + w1_write_8(sl->master, W1_42_CHAIN_DONE_INV); +- w1_read_block(sl->master, &ack, sizeof(ack)); + + /* check for acknowledgment */ + ack = w1_read_8(sl->master); + if (ack != W1_42_SUCCESS_CONFIRM_BYTE) + goto error; +- + } + + /* Exit from CHAIN state */ +-- +2.35.1 + diff --git a/queue-5.15/x86-annotate-call_on_stack.patch b/queue-5.15/x86-annotate-call_on_stack.patch new file mode 100644 index 00000000000..3cedce88e3d --- /dev/null +++ b/queue-5.15/x86-annotate-call_on_stack.patch @@ -0,0 +1,63 @@ +From fe67d74c5efb5243f98fcf904209e38e38366789 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Mar 2022 16:30:50 +0100 +Subject: x86: Annotate call_on_stack() + +From: Peter Zijlstra + +[ Upstream commit be0075951fde739f14ee2b659e2fd6e2499c46c0 ] + +vmlinux.o: warning: objtool: page_fault_oops()+0x13c: unreachable instruction + +0000 000000000005b460 : +... +0128 5b588: 49 89 23 mov %rsp,(%r11) +012b 5b58b: 4c 89 dc mov %r11,%rsp +012e 5b58e: 4c 89 f2 mov %r14,%rdx +0131 5b591: 48 89 ee mov %rbp,%rsi +0134 5b594: 4c 89 e7 mov %r12,%rdi +0137 5b597: e8 00 00 00 00 call 5b59c 5b598: R_X86_64_PLT32 handle_stack_overflow-0x4 +013c 5b59c: 5c pop %rsp + +vmlinux.o: warning: objtool: sysvec_reboot()+0x6d: unreachable instruction + +0000 00000000000033f0 : +... +005d 344d: 4c 89 dc mov %r11,%rsp +0060 3450: e8 00 00 00 00 call 3455 3451: R_X86_64_PLT32 irq_enter_rcu-0x4 +0065 3455: 48 89 ef mov %rbp,%rdi +0068 3458: e8 00 00 00 00 call 345d 3459: R_X86_64_PC32 .text+0x47d0c +006d 345d: e8 00 00 00 00 call 3462 345e: R_X86_64_PLT32 irq_exit_rcu-0x4 +0072 3462: 5c pop %rsp + +Both cases are due to a call_on_stack() calling a __noreturn function. +Since that's an inline asm, GCC can't do anything about the +instructions after the CALL. Therefore put in an explicit +ASM_REACHABLE annotation to make sure objtool and gcc are consistently +confused about control flow. + +Signed-off-by: Peter Zijlstra (Intel) +Acked-by: Josh Poimboeuf +Link: https://lore.kernel.org/r/20220308154319.468805622@infradead.org +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/irq_stack.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.h +index 8d55bd11848c..e087cd7837c3 100644 +--- a/arch/x86/include/asm/irq_stack.h ++++ b/arch/x86/include/asm/irq_stack.h +@@ -99,7 +99,8 @@ + } + + #define ASM_CALL_ARG0 \ +- "call %P[__func] \n" ++ "call %P[__func] \n" \ ++ ASM_REACHABLE + + #define ASM_CALL_ARG1 \ + "movq %[arg1], %%rdi \n" \ +-- +2.35.1 + diff --git a/queue-5.15/x86-kconfig-do-not-allow-config_x86_x32_abi-y-with-l.patch b/queue-5.15/x86-kconfig-do-not-allow-config_x86_x32_abi-y-with-l.patch new file mode 100644 index 00000000000..aa6724ffe06 --- /dev/null +++ b/queue-5.15/x86-kconfig-do-not-allow-config_x86_x32_abi-y-with-l.patch @@ -0,0 +1,61 @@ +From c9fbe7de86b2bdadfb84d77c5f0fbab13e3637b0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Mar 2022 12:48:42 -0700 +Subject: x86/Kconfig: Do not allow CONFIG_X86_X32_ABI=y with llvm-objcopy + +From: Nathan Chancellor + +[ Upstream commit aaeed6ecc1253ce1463fa1aca0b70a4ccbc9fa75 ] + +There are two outstanding issues with CONFIG_X86_X32_ABI and +llvm-objcopy, with similar root causes: + +1. llvm-objcopy does not properly convert .note.gnu.property when going + from x86_64 to x86_x32, resulting in a corrupted section when + linking: + + https://github.com/ClangBuiltLinux/linux/issues/1141 + +2. llvm-objcopy produces corrupted compressed debug sections when going + from x86_64 to x86_x32, also resulting in an error when linking: + + https://github.com/ClangBuiltLinux/linux/issues/514 + +After commit 41c5ef31ad71 ("x86/ibt: Base IBT bits"), the +.note.gnu.property section is always generated when +CONFIG_X86_KERNEL_IBT is enabled, which causes the first issue to become +visible with an allmodconfig build: + + ld.lld: error: arch/x86/entry/vdso/vclock_gettime-x32.o:(.note.gnu.property+0x1c): program property is too short + +To avoid this error, do not allow CONFIG_X86_X32_ABI to be selected when +using llvm-objcopy. If the two issues ever get fixed in llvm-objcopy, +this can be turned into a feature check. + +Signed-off-by: Nathan Chancellor +Signed-off-by: Peter Zijlstra (Intel) +Link: https://lore.kernel.org/r/20220314194842.3452-3-nathan@kernel.org +Signed-off-by: Sasha Levin +--- + arch/x86/Kconfig | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 1f96809606ac..819f8c2e2c67 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -2798,6 +2798,11 @@ config IA32_AOUT + config X86_X32 + bool "x32 ABI for 64-bit mode" + depends on X86_64 ++ # llvm-objcopy does not convert x86_64 .note.gnu.property or ++ # compressed debug sections to x86_x32 properly: ++ # https://github.com/ClangBuiltLinux/linux/issues/514 ++ # https://github.com/ClangBuiltLinux/linux/issues/1141 ++ depends on $(success,$(OBJCOPY) --version | head -n1 | grep -qv llvm) + help + Include code to run binaries for the x32 native 32-bit ABI + for 64-bit processors. An x32 process gets access to the +-- +2.35.1 + diff --git a/queue-5.15/xen-delay-xen_hvm_init_time_ops-if-kdump-is-boot-on-.patch b/queue-5.15/xen-delay-xen_hvm_init_time_ops-if-kdump-is-boot-on-.patch new file mode 100644 index 00000000000..27ac1dbfffb --- /dev/null +++ b/queue-5.15/xen-delay-xen_hvm_init_time_ops-if-kdump-is-boot-on-.patch @@ -0,0 +1,124 @@ +From 820e0a8e26899d289a79c5ac379ecfed446bae8c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Mar 2022 08:40:32 -0800 +Subject: xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32 + +From: Dongli Zhang + +[ Upstream commit eed05744322da07dd7e419432dcedf3c2e017179 ] + +The sched_clock() can be used very early since commit 857baa87b642 +("sched/clock: Enable sched clock early"). In addition, with commit +38669ba205d1 ("x86/xen/time: Output xen sched_clock time from 0"), kdump +kernel in Xen HVM guest may panic at very early stage when accessing +&__this_cpu_read(xen_vcpu)->time as in below: + +setup_arch() + -> init_hypervisor_platform() + -> x86_init.hyper.init_platform = xen_hvm_guest_init() + -> xen_hvm_init_time_ops() + -> xen_clocksource_read() + -> src = &__this_cpu_read(xen_vcpu)->time; + +This is because Xen HVM supports at most MAX_VIRT_CPUS=32 'vcpu_info' +embedded inside 'shared_info' during early stage until xen_vcpu_setup() is +used to allocate/relocate 'vcpu_info' for boot cpu at arbitrary address. + +However, when Xen HVM guest panic on vcpu >= 32, since +xen_vcpu_info_reset(0) would set per_cpu(xen_vcpu, cpu) = NULL when +vcpu >= 32, xen_clocksource_read() on vcpu >= 32 would panic. + +This patch calls xen_hvm_init_time_ops() again later in +xen_hvm_smp_prepare_boot_cpu() after the 'vcpu_info' for boot vcpu is +registered when the boot vcpu is >= 32. + +This issue can be reproduced on purpose via below command at the guest +side when kdump/kexec is enabled: + +"taskset -c 33 echo c > /proc/sysrq-trigger" + +The bugfix for PVM is not implemented due to the lack of testing +environment. + +[boris: xen_hvm_init_time_ops() returns on errors instead of jumping to end] + +Cc: Joe Jin +Signed-off-by: Dongli Zhang +Reviewed-by: Boris Ostrovsky +Link: https://lore.kernel.org/r/20220302164032.14569-3-dongli.zhang@oracle.com +Signed-off-by: Boris Ostrovsky +Signed-off-by: Sasha Levin +--- + arch/x86/xen/smp_hvm.c | 6 ++++++ + arch/x86/xen/time.c | 24 +++++++++++++++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/xen/smp_hvm.c b/arch/x86/xen/smp_hvm.c +index 6ff3c887e0b9..b70afdff419c 100644 +--- a/arch/x86/xen/smp_hvm.c ++++ b/arch/x86/xen/smp_hvm.c +@@ -19,6 +19,12 @@ static void __init xen_hvm_smp_prepare_boot_cpu(void) + */ + xen_vcpu_setup(0); + ++ /* ++ * Called again in case the kernel boots on vcpu >= MAX_VIRT_CPUS. ++ * Refer to comments in xen_hvm_init_time_ops(). ++ */ ++ xen_hvm_init_time_ops(); ++ + /* + * The alternative logic (which patches the unlock/lock) runs before + * the smp bootup up code is activated. Hence we need to set this up +diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c +index d9c945ee1100..9ef0a5cca96e 100644 +--- a/arch/x86/xen/time.c ++++ b/arch/x86/xen/time.c +@@ -558,6 +558,11 @@ static void xen_hvm_setup_cpu_clockevents(void) + + void __init xen_hvm_init_time_ops(void) + { ++ static bool hvm_time_initialized; ++ ++ if (hvm_time_initialized) ++ return; ++ + /* + * vector callback is needed otherwise we cannot receive interrupts + * on cpu > 0 and at this point we don't know how many cpus are +@@ -567,7 +572,22 @@ void __init xen_hvm_init_time_ops(void) + return; + + if (!xen_feature(XENFEAT_hvm_safe_pvclock)) { +- pr_info("Xen doesn't support pvclock on HVM, disable pv timer"); ++ pr_info_once("Xen doesn't support pvclock on HVM, disable pv timer"); ++ return; ++ } ++ ++ /* ++ * Only MAX_VIRT_CPUS 'vcpu_info' are embedded inside 'shared_info'. ++ * The __this_cpu_read(xen_vcpu) is still NULL when Xen HVM guest ++ * boots on vcpu >= MAX_VIRT_CPUS (e.g., kexec), To access ++ * __this_cpu_read(xen_vcpu) via xen_clocksource_read() will panic. ++ * ++ * The xen_hvm_init_time_ops() should be called again later after ++ * __this_cpu_read(xen_vcpu) is available. ++ */ ++ if (!__this_cpu_read(xen_vcpu)) { ++ pr_info("Delay xen_init_time_common() as kernel is running on vcpu=%d\n", ++ xen_vcpu_nr(0)); + return; + } + +@@ -577,6 +597,8 @@ void __init xen_hvm_init_time_ops(void) + x86_cpuinit.setup_percpu_clockev = xen_hvm_setup_cpu_clockevents; + + x86_platform.set_wallclock = xen_set_wallclock; ++ ++ hvm_time_initialized = true; + } + #endif + +-- +2.35.1 + diff --git a/queue-5.15/xtensa-fix-dtc-warning-unit_address_format.patch b/queue-5.15/xtensa-fix-dtc-warning-unit_address_format.patch new file mode 100644 index 00000000000..6ff9cea8757 --- /dev/null +++ b/queue-5.15/xtensa-fix-dtc-warning-unit_address_format.patch @@ -0,0 +1,103 @@ +From 63c09ff6470b59fdf93dec117de068bcde38d858 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Mar 2022 02:49:41 -0700 +Subject: xtensa: fix DTC warning unit_address_format + +From: Max Filippov + +[ Upstream commit e85d29ba4b24f68e7a78cb85c55e754362eeb2de ] + +DTC issues the following warnings when building xtfpga device trees: + + /soc/flash@00000000/partition@0x0: unit name should not have leading "0x" + /soc/flash@00000000/partition@0x6000000: unit name should not have leading "0x" + /soc/flash@00000000/partition@0x6800000: unit name should not have leading "0x" + /soc/flash@00000000/partition@0x7fe0000: unit name should not have leading "0x" + +Drop leading 0x from flash partition unit names. + +Signed-off-by: Max Filippov +Signed-off-by: Sasha Levin +--- + arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 ++++---- + arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 ++++---- + arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 ++-- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi +index 9bf8bad1dd18..c33932568aa7 100644 +--- a/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi ++++ b/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi +@@ -8,19 +8,19 @@ + reg = <0x00000000 0x08000000>; + bank-width = <2>; + device-width = <2>; +- partition@0x0 { ++ partition@0 { + label = "data"; + reg = <0x00000000 0x06000000>; + }; +- partition@0x6000000 { ++ partition@6000000 { + label = "boot loader area"; + reg = <0x06000000 0x00800000>; + }; +- partition@0x6800000 { ++ partition@6800000 { + label = "kernel image"; + reg = <0x06800000 0x017e0000>; + }; +- partition@0x7fe0000 { ++ partition@7fe0000 { + label = "boot environment"; + reg = <0x07fe0000 0x00020000>; + }; +diff --git a/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi +index 40c2f81f7cb6..7bde2ab2d6fb 100644 +--- a/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi ++++ b/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi +@@ -8,19 +8,19 @@ + reg = <0x08000000 0x01000000>; + bank-width = <2>; + device-width = <2>; +- partition@0x0 { ++ partition@0 { + label = "boot loader area"; + reg = <0x00000000 0x00400000>; + }; +- partition@0x400000 { ++ partition@400000 { + label = "kernel image"; + reg = <0x00400000 0x00600000>; + }; +- partition@0xa00000 { ++ partition@a00000 { + label = "data"; + reg = <0x00a00000 0x005e0000>; + }; +- partition@0xfe0000 { ++ partition@fe0000 { + label = "boot environment"; + reg = <0x00fe0000 0x00020000>; + }; +diff --git a/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi +index fb8d3a9f33c2..0655b868749a 100644 +--- a/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi ++++ b/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi +@@ -8,11 +8,11 @@ + reg = <0x08000000 0x00400000>; + bank-width = <2>; + device-width = <2>; +- partition@0x0 { ++ partition@0 { + label = "boot loader area"; + reg = <0x00000000 0x003f0000>; + }; +- partition@0x3f0000 { ++ partition@3f0000 { + label = "boot environment"; + reg = <0x003f0000 0x00010000>; + }; +-- +2.35.1 +