From 2ae971f99a20a9502fc3b43835ab452574072289 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 7 Oct 2023 14:36:42 +0200 Subject: [PATCH] 6.1-stable patches added patches: arm64-add-cortex-a520-cpu-part-definition.patch arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch btrfs-reject-unknown-mount-options-early.patch drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch mptcp-userspace-pm-allow-creating-id-0-subflow.patch net-ethernet-mediatek-disable-irq-before-schedule-napi.patch net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch pci-qcom-fix-ipq8074-enumeration.patch qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch wifi-mwifiex-fix-tlv_buf_left-calculation.patch --- ...-add-cortex-a520-cpu-part-definition.patch | 38 ++++++ ...ulative-unprivileged-load-workaround.patch | 124 ++++++++++++++++++ ...-fix-leaking-content-of-local_codecs.patch | 72 ++++++++++ ...of-hci_quirk_strict_duplicate_filter.patch | 59 +++++++++ ...s-reject-unknown-mount-options-early.patch | 55 ++++++++ ...ection-of-_pr3-on-the-pcie-root-port.patch | 41 ++++++ ...ienna_cichlid_update_pcie_parameters.patch | 91 +++++++++++++ ...d-memory-allocation-in-iommu_suspend.patch | 120 +++++++++++++++++ ...fore-waiting-for-another-stripe_head.patch | 46 +++++++ ...space-pm-allow-creating-id-0-subflow.patch | 45 +++++++ ...tek-disable-irq-before-schedule-napi.patch | 59 +++++++++ ...-rewrite-of-msg_name-in-sock_sendmsg.patch | 105 +++++++++++++++ ...sock-ops-connect-with-kernel_connect.patch | 52 ++++++++ .../pci-qcom-fix-ipq8074-enumeration.patch | 54 ++++++++ ...-behavior-bug-in-struct-qed_ll2_info.patch | 116 ++++++++++++++++ ...ix-a-double-put-in-zfcp_port_enqueue.patch | 63 +++++++++ queue-6.1/series | 18 +++ ...ingh_kiov_advance-in-vringh_iov_xfer.patch | 52 ++++++++ ...mwifiex-fix-tlv_buf_left-calculation.patch | 103 +++++++++++++++ 19 files changed, 1313 insertions(+) create mode 100644 queue-6.1/arm64-add-cortex-a520-cpu-part-definition.patch create mode 100644 queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch create mode 100644 queue-6.1/bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch create mode 100644 queue-6.1/bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch create mode 100644 queue-6.1/btrfs-reject-unknown-mount-options-early.patch create mode 100644 queue-6.1/drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch create mode 100644 queue-6.1/drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch create mode 100644 queue-6.1/iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch create mode 100644 queue-6.1/md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch create mode 100644 queue-6.1/mptcp-userspace-pm-allow-creating-id-0-subflow.patch create mode 100644 queue-6.1/net-ethernet-mediatek-disable-irq-before-schedule-napi.patch create mode 100644 queue-6.1/net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch create mode 100644 queue-6.1/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch create mode 100644 queue-6.1/pci-qcom-fix-ipq8074-enumeration.patch create mode 100644 queue-6.1/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch create mode 100644 queue-6.1/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch create mode 100644 queue-6.1/vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch create mode 100644 queue-6.1/wifi-mwifiex-fix-tlv_buf_left-calculation.patch diff --git a/queue-6.1/arm64-add-cortex-a520-cpu-part-definition.patch b/queue-6.1/arm64-add-cortex-a520-cpu-part-definition.patch new file mode 100644 index 00000000000..f137cf308f6 --- /dev/null +++ b/queue-6.1/arm64-add-cortex-a520-cpu-part-definition.patch @@ -0,0 +1,38 @@ +From a654a69b9f9c06b2e56387d0b99f0e3e6b0ff4ef Mon Sep 17 00:00:00 2001 +From: Rob Herring +Date: Thu, 21 Sep 2023 14:41:51 -0500 +Subject: arm64: Add Cortex-A520 CPU part definition + +From: Rob Herring + +commit a654a69b9f9c06b2e56387d0b99f0e3e6b0ff4ef upstream. + +Add the CPU Part number for the new Arm design. + +Cc: stable@vger.kernel.org +Signed-off-by: Rob Herring +Link: https://lore.kernel.org/r/20230921194156.1050055-1-robh@kernel.org +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/include/asm/cputype.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm64/include/asm/cputype.h ++++ b/arch/arm64/include/asm/cputype.h +@@ -79,6 +79,7 @@ + #define ARM_CPU_PART_CORTEX_A78AE 0xD42 + #define ARM_CPU_PART_CORTEX_X1 0xD44 + #define ARM_CPU_PART_CORTEX_A510 0xD46 ++#define ARM_CPU_PART_CORTEX_A520 0xD80 + #define ARM_CPU_PART_CORTEX_A710 0xD47 + #define ARM_CPU_PART_CORTEX_X2 0xD48 + #define ARM_CPU_PART_NEOVERSE_N2 0xD49 +@@ -141,6 +142,7 @@ + #define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE) + #define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1) + #define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) ++#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520) + #define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710) + #define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2) + #define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2) diff --git a/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch b/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch new file mode 100644 index 00000000000..ad5be9feca5 --- /dev/null +++ b/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch @@ -0,0 +1,124 @@ +From 471470bc7052d28ce125901877dd10e4c048e513 Mon Sep 17 00:00:00 2001 +From: Rob Herring +Date: Thu, 21 Sep 2023 14:41:52 -0500 +Subject: arm64: errata: Add Cortex-A520 speculative unprivileged load workaround + +From: Rob Herring + +commit 471470bc7052d28ce125901877dd10e4c048e513 upstream. + +Implement the workaround for ARM Cortex-A520 erratum 2966298. On an +affected Cortex-A520 core, a speculatively executed unprivileged load +might leak data from a privileged load via a cache side channel. The +issue only exists for loads within a translation regime with the same +translation (e.g. same ASID and VMID). Therefore, the issue only affects +the return to EL0. + +The workaround is to execute a TLBI before returning to EL0 after all +loads of privileged data. A non-shareable TLBI to any address is +sufficient. + +The workaround isn't necessary if page table isolation (KPTI) is +enabled, but for simplicity it will be. Page table isolation should +normally be disabled for Cortex-A520 as it supports the CSV3 feature +and the E0PD feature (used when KASLR is enabled). + +Cc: stable@vger.kernel.org +Signed-off-by: Rob Herring +Link: https://lore.kernel.org/r/20230921194156.1050055-2-robh@kernel.org +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/arch/arm64/silicon-errata.rst | 2 ++ + arch/arm64/Kconfig | 13 +++++++++++++ + arch/arm64/kernel/cpu_errata.c | 8 ++++++++ + arch/arm64/kernel/entry.S | 4 ++++ + arch/arm64/tools/cpucaps | 1 + + 5 files changed, 28 insertions(+) + +diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst +index e96f057ea2a0..f47f63bcf67c 100644 +--- a/Documentation/arch/arm64/silicon-errata.rst ++++ b/Documentation/arch/arm64/silicon-errata.rst +@@ -71,6 +71,8 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A510 | #2658417 | ARM64_ERRATUM_2658417 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A520 | #2966298 | ARM64_ERRATUM_2966298 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 | +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index b10515c0200b..78f20e632712 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -1037,6 +1037,19 @@ config ARM64_ERRATUM_2645198 + + If unsure, say Y. + ++config ARM64_ERRATUM_2966298 ++ bool "Cortex-A520: 2966298: workaround for speculatively executed unprivileged load" ++ default y ++ help ++ This option adds the workaround for ARM Cortex-A520 erratum 2966298. ++ ++ On an affected Cortex-A520 core, a speculatively executed unprivileged ++ load might leak data from a privileged level via a cache side channel. ++ ++ Work around this problem by executing a TLBI before returning to EL0. ++ ++ If unsure, say Y. ++ + config CAVIUM_ERRATUM_22375 + bool "Cavium erratum 22375, 24313" + default y +diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c +index be66e94a21bd..5706e74c5578 100644 +--- a/arch/arm64/kernel/cpu_errata.c ++++ b/arch/arm64/kernel/cpu_errata.c +@@ -730,6 +730,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { + .cpu_enable = cpu_clear_bf16_from_user_emulation, + }, + #endif ++#ifdef CONFIG_ARM64_ERRATUM_2966298 ++ { ++ .desc = "ARM erratum 2966298", ++ .capability = ARM64_WORKAROUND_2966298, ++ /* Cortex-A520 r0p0 - r0p1 */ ++ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A520, 0, 0, 1), ++ }, ++#endif + #ifdef CONFIG_AMPERE_ERRATUM_AC03_CPU_38 + { + .desc = "AmpereOne erratum AC03_CPU_38", +diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S +index 6ad61de03d0a..a6030913cd58 100644 +--- a/arch/arm64/kernel/entry.S ++++ b/arch/arm64/kernel/entry.S +@@ -428,6 +428,10 @@ alternative_else_nop_endif + ldp x28, x29, [sp, #16 * 14] + + .if \el == 0 ++alternative_if ARM64_WORKAROUND_2966298 ++ tlbi vale1, xzr ++ dsb nsh ++alternative_else_nop_endif + alternative_if_not ARM64_UNMAP_KERNEL_AT_EL0 + ldr lr, [sp, #S_LR] + add sp, sp, #PT_REGS_SIZE // restore sp +diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps +index c3f06fdef609..dea3dc89234b 100644 +--- a/arch/arm64/tools/cpucaps ++++ b/arch/arm64/tools/cpucaps +@@ -84,6 +84,7 @@ WORKAROUND_2077057 + WORKAROUND_2457168 + WORKAROUND_2645198 + WORKAROUND_2658417 ++WORKAROUND_2966298 + WORKAROUND_AMPERE_AC03_CPU_38 + WORKAROUND_TRBE_OVERWRITE_FILL_MODE + WORKAROUND_TSB_FLUSH_FAILURE +-- +2.42.0 + diff --git a/queue-6.1/bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch b/queue-6.1/bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch new file mode 100644 index 00000000000..cfc81bee972 --- /dev/null +++ b/queue-6.1/bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch @@ -0,0 +1,72 @@ +From b938790e70540bf4f2e653dcd74b232494d06c8f Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Fri, 15 Sep 2023 13:24:47 -0700 +Subject: Bluetooth: hci_codec: Fix leaking content of local_codecs + +From: Luiz Augusto von Dentz + +commit b938790e70540bf4f2e653dcd74b232494d06c8f upstream. + +The following memory leak can be observed when the controller supports +codecs which are stored in local_codecs list but the elements are never +freed: + +unreferenced object 0xffff88800221d840 (size 32): + comm "kworker/u3:0", pid 36, jiffies 4294898739 (age 127.060s) + hex dump (first 32 bytes): + f8 d3 02 03 80 88 ff ff 80 d8 21 02 80 88 ff ff ..........!..... + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + backtrace: + [] __kmalloc+0x47/0x120 + [] hci_codec_list_add.isra.0+0x2d/0x160 + [] hci_read_codec_capabilities+0x183/0x270 + [] hci_read_supported_codecs+0x1bb/0x2d0 + [] hci_read_local_codecs_sync+0x3e/0x60 + [] hci_dev_open_sync+0x943/0x11e0 + [] hci_power_on+0x10d/0x3f0 + [] process_one_work+0x404/0x800 + [] worker_thread+0x374/0x670 + [] kthread+0x188/0x1c0 + [] ret_from_fork+0x2b/0x50 + [] ret_from_fork_asm+0x1a/0x30 + +Cc: stable@vger.kernel.org +Fixes: 8961987f3f5f ("Bluetooth: Enumerate local supported codec and cache details") +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 1 + + net/bluetooth/hci_sync.c | 1 + + 3 files changed, 3 insertions(+) + +--- a/net/bluetooth/hci_core.c ++++ b/net/bluetooth/hci_core.c +@@ -2783,6 +2783,7 @@ void hci_release_dev(struct hci_dev *hde + hci_conn_params_clear_all(hdev); + hci_discovery_filter_clear(hdev); + hci_blocked_keys_clear(hdev); ++ hci_codec_list_clear(&hdev->local_codecs); + hci_dev_unlock(hdev); + + ida_simple_remove(&hci_index_ida, hdev->id); +--- a/net/bluetooth/hci_event.c ++++ b/net/bluetooth/hci_event.c +@@ -32,6 +32,7 @@ + + #include "hci_request.h" + #include "hci_debugfs.h" ++#include "hci_codec.h" + #include "a2mp.h" + #include "amp.h" + #include "smp.h" +--- a/net/bluetooth/hci_sync.c ++++ b/net/bluetooth/hci_sync.c +@@ -5033,6 +5033,7 @@ int hci_dev_close_sync(struct hci_dev *h + memset(hdev->eir, 0, sizeof(hdev->eir)); + memset(hdev->dev_class, 0, sizeof(hdev->dev_class)); + bacpy(&hdev->random_addr, BDADDR_ANY); ++ hci_codec_list_clear(&hdev->local_codecs); + + hci_dev_put(hdev); + return err; diff --git a/queue-6.1/bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch b/queue-6.1/bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch new file mode 100644 index 00000000000..ab52581a074 --- /dev/null +++ b/queue-6.1/bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch @@ -0,0 +1,59 @@ +From 941c998b42f5c90384f49da89a6e11233de567cf Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Tue, 29 Aug 2023 13:50:06 -0700 +Subject: Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER + +From: Luiz Augusto von Dentz + +commit 941c998b42f5c90384f49da89a6e11233de567cf upstream. + +When HCI_QUIRK_STRICT_DUPLICATE_FILTER is set LE scanning requires +periodic restarts of the scanning procedure as the controller would +consider device previously found as duplicated despite of RSSI changes, +but in order to set the scan timeout properly set le_scan_restart needs +to be synchronous so it shall not use hci_cmd_sync_queue which defers +the command processing to cmd_sync_work. + +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/linux-bluetooth/578e6d7afd676129decafba846a933f5@agner.ch/#t +Fixes: 27d54b778ad1 ("Bluetooth: Rework le_scan_restart for hci_sync") +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + net/bluetooth/hci_sync.c | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +--- a/net/bluetooth/hci_sync.c ++++ b/net/bluetooth/hci_sync.c +@@ -412,11 +412,6 @@ static int hci_le_scan_restart_sync(stru + LE_SCAN_FILTER_DUP_ENABLE); + } + +-static int le_scan_restart_sync(struct hci_dev *hdev, void *data) +-{ +- return hci_le_scan_restart_sync(hdev); +-} +- + static void le_scan_restart(struct work_struct *work) + { + struct hci_dev *hdev = container_of(work, struct hci_dev, +@@ -426,15 +421,15 @@ static void le_scan_restart(struct work_ + + bt_dev_dbg(hdev, ""); + +- hci_dev_lock(hdev); +- +- status = hci_cmd_sync_queue(hdev, le_scan_restart_sync, NULL, NULL); ++ status = hci_le_scan_restart_sync(hdev); + if (status) { + bt_dev_err(hdev, "failed to restart LE scan: status %d", + status); +- goto unlock; ++ return; + } + ++ hci_dev_lock(hdev); ++ + if (!test_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks) || + !hdev->discovery.scan_start) + goto unlock; diff --git a/queue-6.1/btrfs-reject-unknown-mount-options-early.patch b/queue-6.1/btrfs-reject-unknown-mount-options-early.patch new file mode 100644 index 00000000000..61ab3e4c4e4 --- /dev/null +++ b/queue-6.1/btrfs-reject-unknown-mount-options-early.patch @@ -0,0 +1,55 @@ +From 5f521494cc73520ffac18ede0758883b9aedd018 Mon Sep 17 00:00:00 2001 +From: Qu Wenruo +Date: Wed, 27 Sep 2023 10:43:15 +0930 +Subject: btrfs: reject unknown mount options early + +From: Qu Wenruo + +commit 5f521494cc73520ffac18ede0758883b9aedd018 upstream. + +[BUG] +The following script would allow invalid mount options to be specified +(although such invalid options would just be ignored): + + # mkfs.btrfs -f $dev + # mount $dev $mnt1 <<< Successful mount expected + # mount $dev $mnt2 -o junk <<< Failed mount expected + # echo $? + 0 + +[CAUSE] +For the 2nd mount, since the fs is already mounted, we won't go through +open_ctree() thus no btrfs_parse_options(), but only through +btrfs_parse_subvol_options(). + +However we do not treat unrecognized options from valid but irrelevant +options, thus those invalid options would just be ignored by +btrfs_parse_subvol_options(). + +[FIX] +Add the handling for Opt_err to handle invalid options and error out, +while still ignore other valid options inside btrfs_parse_subvol_options(). + +Reported-by: Anand Jain +CC: stable@vger.kernel.org # 4.14+ +Signed-off-by: Qu Wenruo +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/super.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/fs/btrfs/super.c ++++ b/fs/btrfs/super.c +@@ -1260,6 +1260,10 @@ static int btrfs_parse_subvol_options(co + + *subvol_objectid = subvolid; + break; ++ case Opt_err: ++ btrfs_err(NULL, "unrecognized mount option '%s'", p); ++ error = -EINVAL; ++ goto out; + default: + break; + } diff --git a/queue-6.1/drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch b/queue-6.1/drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch new file mode 100644 index 00000000000..babed6c745c --- /dev/null +++ b/queue-6.1/drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch @@ -0,0 +1,41 @@ +From 134b8c5d8674e7cde380f82e9aedfd46dcdd16f7 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Tue, 26 Sep 2023 17:59:53 -0500 +Subject: drm/amd: Fix detection of _PR3 on the PCIe root port + +From: Mario Limonciello + +commit 134b8c5d8674e7cde380f82e9aedfd46dcdd16f7 upstream. + +On some systems with Navi3x dGPU will attempt to use BACO for runtime +PM but fails to resume properly. This is because on these systems +the root port goes into D3cold which is incompatible with BACO. + +This happens because in this case dGPU is connected to a bridge between +root port which causes BOCO detection logic to fail. Fix the intent of +the logic by looking at root port, not the immediate upstream bridge for +_PR3. + +Cc: stable@vger.kernel.org +Suggested-by: Jun Ma +Tested-by: David Perry +Fixes: b10c1c5b3a4e ("drm/amdgpu: add check for ACPI power resources") +Signed-off-by: Mario Limonciello +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2179,7 +2179,7 @@ static int amdgpu_device_ip_early_init(s + adev->flags |= AMD_IS_PX; + + if (!(adev->flags & AMD_IS_APU)) { +- parent = pci_upstream_bridge(adev->pdev); ++ parent = pcie_find_root_port(adev->pdev); + adev->has_pr3 = parent ? pci_pr3_present(parent) : false; + } + diff --git a/queue-6.1/drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch b/queue-6.1/drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch new file mode 100644 index 00000000000..bb1907ec1d0 --- /dev/null +++ b/queue-6.1/drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch @@ -0,0 +1,91 @@ +From 2a1fe39a5be785e962e387146aed34fa9a829f3f Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Tue, 26 Sep 2023 21:07:43 -0500 +Subject: drm/amd: Fix logic error in sienna_cichlid_update_pcie_parameters() + +From: Mario Limonciello + +commit 2a1fe39a5be785e962e387146aed34fa9a829f3f upstream. + +While aligning SMU11 with SMU13 implementation an assumption was made that +`dpm_context->dpm_tables.pcie_table` was populated in dpm table initialization +like in SMU13 but it isn't. + +So restore some of the original logic and instead just check for +amdgpu_device_pcie_dynamic_switching_supported() to decide whether to hardcode +values; erring on the side of performance. + +Cc: stable@vger.kernel.org # 6.1+ +Reported-and-tested-by: Umio Yasuno +Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/1447#note_2101382 +Fixes: e701156ccc6c ("drm/amd: Align SMU11 SMU_MSG_OverridePcieParameters implementation with SMU13") +Signed-off-by: Mario Limonciello +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 41 ++++++++-------- + 1 file changed, 23 insertions(+), 18 deletions(-) + +--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c ++++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +@@ -2081,36 +2081,41 @@ static int sienna_cichlid_display_disabl + return ret; + } + ++#define MAX(a, b) ((a) > (b) ? (a) : (b)) ++ + static int sienna_cichlid_update_pcie_parameters(struct smu_context *smu, + uint32_t pcie_gen_cap, + uint32_t pcie_width_cap) + { + struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context; + struct smu_11_0_pcie_table *pcie_table = &dpm_context->dpm_tables.pcie_table; +- u32 smu_pcie_arg; ++ uint8_t *table_member1, *table_member2; ++ uint32_t min_gen_speed, max_gen_speed; ++ uint32_t min_lane_width, max_lane_width; ++ uint32_t smu_pcie_arg; + int ret, i; + +- /* PCIE gen speed and lane width override */ +- if (!amdgpu_device_pcie_dynamic_switching_supported()) { +- if (pcie_table->pcie_gen[NUM_LINK_LEVELS - 1] < pcie_gen_cap) +- pcie_gen_cap = pcie_table->pcie_gen[NUM_LINK_LEVELS - 1]; ++ GET_PPTABLE_MEMBER(PcieGenSpeed, &table_member1); ++ GET_PPTABLE_MEMBER(PcieLaneCount, &table_member2); + +- if (pcie_table->pcie_lane[NUM_LINK_LEVELS - 1] < pcie_width_cap) +- pcie_width_cap = pcie_table->pcie_lane[NUM_LINK_LEVELS - 1]; ++ min_gen_speed = MAX(0, table_member1[0]); ++ max_gen_speed = MIN(pcie_gen_cap, table_member1[1]); ++ min_gen_speed = min_gen_speed > max_gen_speed ? ++ max_gen_speed : min_gen_speed; ++ min_lane_width = MAX(1, table_member2[0]); ++ max_lane_width = MIN(pcie_width_cap, table_member2[1]); ++ min_lane_width = min_lane_width > max_lane_width ? ++ max_lane_width : min_lane_width; + +- /* Force all levels to use the same settings */ +- for (i = 0; i < NUM_LINK_LEVELS; i++) { +- pcie_table->pcie_gen[i] = pcie_gen_cap; +- pcie_table->pcie_lane[i] = pcie_width_cap; +- } ++ if (!amdgpu_device_pcie_dynamic_switching_supported()) { ++ pcie_table->pcie_gen[0] = max_gen_speed; ++ pcie_table->pcie_lane[0] = max_lane_width; + } else { +- for (i = 0; i < NUM_LINK_LEVELS; i++) { +- if (pcie_table->pcie_gen[i] > pcie_gen_cap) +- pcie_table->pcie_gen[i] = pcie_gen_cap; +- if (pcie_table->pcie_lane[i] > pcie_width_cap) +- pcie_table->pcie_lane[i] = pcie_width_cap; +- } ++ pcie_table->pcie_gen[0] = min_gen_speed; ++ pcie_table->pcie_lane[0] = min_lane_width; + } ++ pcie_table->pcie_gen[1] = max_gen_speed; ++ pcie_table->pcie_lane[1] = max_lane_width; + + for (i = 0; i < NUM_LINK_LEVELS; i++) { + smu_pcie_arg = (i << 16 | diff --git a/queue-6.1/iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch b/queue-6.1/iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch new file mode 100644 index 00000000000..d7a96f51ce6 --- /dev/null +++ b/queue-6.1/iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch @@ -0,0 +1,120 @@ +From 59df44bfb0ca4c3ee1f1c3c5d0ee8e314844799e Mon Sep 17 00:00:00 2001 +From: Zhang Rui +Date: Mon, 25 Sep 2023 20:04:17 +0800 +Subject: iommu/vt-d: Avoid memory allocation in iommu_suspend() + +From: Zhang Rui + +commit 59df44bfb0ca4c3ee1f1c3c5d0ee8e314844799e upstream. + +The iommu_suspend() syscore suspend callback is invoked with IRQ disabled. +Allocating memory with the GFP_KERNEL flag may re-enable IRQs during +the suspend callback, which can cause intermittent suspend/hibernation +problems with the following kernel traces: + +Calling iommu_suspend+0x0/0x1d0 +------------[ cut here ]------------ +WARNING: CPU: 0 PID: 15 at kernel/time/timekeeping.c:868 ktime_get+0x9b/0xb0 +... +CPU: 0 PID: 15 Comm: rcu_preempt Tainted: G U E 6.3-intel #r1 +RIP: 0010:ktime_get+0x9b/0xb0 +... +Call Trace: + + tick_sched_timer+0x22/0x90 + ? __pfx_tick_sched_timer+0x10/0x10 + __hrtimer_run_queues+0x111/0x2b0 + hrtimer_interrupt+0xfa/0x230 + __sysvec_apic_timer_interrupt+0x63/0x140 + sysvec_apic_timer_interrupt+0x7b/0xa0 + + + asm_sysvec_apic_timer_interrupt+0x1f/0x30 +... +------------[ cut here ]------------ +Interrupts enabled after iommu_suspend+0x0/0x1d0 +WARNING: CPU: 0 PID: 27420 at drivers/base/syscore.c:68 syscore_suspend+0x147/0x270 +CPU: 0 PID: 27420 Comm: rtcwake Tainted: G U W E 6.3-intel #r1 +RIP: 0010:syscore_suspend+0x147/0x270 +... +Call Trace: + + hibernation_snapshot+0x25b/0x670 + hibernate+0xcd/0x390 + state_store+0xcf/0xe0 + kobj_attr_store+0x13/0x30 + sysfs_kf_write+0x3f/0x50 + kernfs_fop_write_iter+0x128/0x200 + vfs_write+0x1fd/0x3c0 + ksys_write+0x6f/0xf0 + __x64_sys_write+0x1d/0x30 + do_syscall_64+0x3b/0x90 + entry_SYSCALL_64_after_hwframe+0x72/0xdc + +Given that only 4 words memory is needed, avoid the memory allocation in +iommu_suspend(). + +CC: stable@kernel.org +Fixes: 33e07157105e ("iommu/vt-d: Avoid GFP_ATOMIC where it is not needed") +Signed-off-by: Zhang Rui +Tested-by: Ooi, Chin Hao +Link: https://lore.kernel.org/r/20230921093956.234692-1-rui.zhang@intel.com +Signed-off-by: Lu Baolu +Link: https://lore.kernel.org/r/20230925120417.55977-2-baolu.lu@linux.intel.com +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iommu/intel/iommu.c | 16 ---------------- + drivers/iommu/intel/iommu.h | 2 +- + 2 files changed, 1 insertion(+), 17 deletions(-) + +--- a/drivers/iommu/intel/iommu.c ++++ b/drivers/iommu/intel/iommu.c +@@ -3163,13 +3163,6 @@ static int iommu_suspend(void) + struct intel_iommu *iommu = NULL; + unsigned long flag; + +- for_each_active_iommu(iommu, drhd) { +- iommu->iommu_state = kcalloc(MAX_SR_DMAR_REGS, sizeof(u32), +- GFP_KERNEL); +- if (!iommu->iommu_state) +- goto nomem; +- } +- + iommu_flush_all(); + + for_each_active_iommu(iommu, drhd) { +@@ -3189,12 +3182,6 @@ static int iommu_suspend(void) + raw_spin_unlock_irqrestore(&iommu->register_lock, flag); + } + return 0; +- +-nomem: +- for_each_active_iommu(iommu, drhd) +- kfree(iommu->iommu_state); +- +- return -ENOMEM; + } + + static void iommu_resume(void) +@@ -3226,9 +3213,6 @@ static void iommu_resume(void) + + raw_spin_unlock_irqrestore(&iommu->register_lock, flag); + } +- +- for_each_active_iommu(iommu, drhd) +- kfree(iommu->iommu_state); + } + + static struct syscore_ops iommu_syscore_ops = { +--- a/drivers/iommu/intel/iommu.h ++++ b/drivers/iommu/intel/iommu.h +@@ -595,7 +595,7 @@ struct intel_iommu { + struct iopf_queue *iopf_queue; + unsigned char iopfq_name[16]; + struct q_inval *qi; /* Queued invalidation info */ +- u32 *iommu_state; /* Store iommu states between suspend and resume.*/ ++ u32 iommu_state[MAX_SR_DMAR_REGS]; /* Store iommu states between suspend and resume.*/ + + #ifdef CONFIG_IRQ_REMAP + struct ir_table *ir_table; /* Interrupt remapping info */ diff --git a/queue-6.1/md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch b/queue-6.1/md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch new file mode 100644 index 00000000000..8116ca9332d --- /dev/null +++ b/queue-6.1/md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch @@ -0,0 +1,46 @@ +From 2fd7b0f6d5ad655b1d947d3acdd82f687c31465e Mon Sep 17 00:00:00 2001 +From: David Jeffery +Date: Mon, 2 Oct 2023 14:32:29 -0400 +Subject: md/raid5: release batch_last before waiting for another stripe_head + +From: David Jeffery + +commit 2fd7b0f6d5ad655b1d947d3acdd82f687c31465e upstream. + +When raid5_get_active_stripe is called with a ctx containing a stripe_head in +its batch_last pointer, it can cause a deadlock if the task sleeps waiting on +another stripe_head to become available. The stripe_head held by batch_last +can be blocking the advancement of other stripe_heads, leading to no +stripe_heads being released so raid5_get_active_stripe waits forever. + +Like with the quiesce state handling earlier in the function, batch_last +needs to be released by raid5_get_active_stripe before it waits for another +stripe_head. + +Fixes: 3312e6c887fe ("md/raid5: Keep a reference to last stripe_head for batch") +Cc: stable@vger.kernel.org # v6.0+ +Signed-off-by: David Jeffery +Reviewed-by: Logan Gunthorpe +Signed-off-by: Song Liu +Link: https://lore.kernel.org/r/20231002183422.13047-1-djeffery@redhat.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/md/raid5.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -854,6 +854,13 @@ struct stripe_head *raid5_get_active_str + + set_bit(R5_INACTIVE_BLOCKED, &conf->cache_state); + r5l_wake_reclaim(conf->log, 0); ++ ++ /* release batch_last before wait to avoid risk of deadlock */ ++ if (ctx && ctx->batch_last) { ++ raid5_release_stripe(ctx->batch_last); ++ ctx->batch_last = NULL; ++ } ++ + wait_event_lock_irq(conf->wait_for_stripe, + is_inactive_blocked(conf, hash), + *(conf->hash_locks + hash)); diff --git a/queue-6.1/mptcp-userspace-pm-allow-creating-id-0-subflow.patch b/queue-6.1/mptcp-userspace-pm-allow-creating-id-0-subflow.patch new file mode 100644 index 00000000000..6a888fb4a5e --- /dev/null +++ b/queue-6.1/mptcp-userspace-pm-allow-creating-id-0-subflow.patch @@ -0,0 +1,45 @@ +From e5ed101a602873d65d2d64edaba93e8c73ec1b0f Mon Sep 17 00:00:00 2001 +From: Geliang Tang +Date: Wed, 4 Oct 2023 13:38:12 -0700 +Subject: mptcp: userspace pm allow creating id 0 subflow + +From: Geliang Tang + +commit e5ed101a602873d65d2d64edaba93e8c73ec1b0f upstream. + +This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow +creating additional subflows with the local addr ID 0. + +There is no reason not to allow additional subflows from this local +address: we should be able to create new subflows from the initial +endpoint. This limitation was breaking fullmesh support from userspace. + +Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establishment") +Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/391 +Cc: stable@vger.kernel.org +Suggested-by: Matthieu Baerts +Reviewed-by: Matthieu Baerts +Signed-off-by: Geliang Tang +Signed-off-by: Mat Martineau +Link: https://lore.kernel.org/r/20231004-send-net-20231004-v1-2-28de4ac663ae@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/mptcp/pm_userspace.c | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/net/mptcp/pm_userspace.c ++++ b/net/mptcp/pm_userspace.c +@@ -309,12 +309,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buf + goto create_err; + } + +- if (addr_l.id == 0) { +- NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); +- err = -EINVAL; +- goto create_err; +- } +- + err = mptcp_pm_parse_addr(raddr, info, &addr_r); + if (err < 0) { + NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr"); diff --git a/queue-6.1/net-ethernet-mediatek-disable-irq-before-schedule-napi.patch b/queue-6.1/net-ethernet-mediatek-disable-irq-before-schedule-napi.patch new file mode 100644 index 00000000000..51a75fea6fd --- /dev/null +++ b/queue-6.1/net-ethernet-mediatek-disable-irq-before-schedule-napi.patch @@ -0,0 +1,59 @@ +From fcdfc462881d8acf9db77f483b2c821e286ca97b Mon Sep 17 00:00:00 2001 +From: Christian Marangi +Date: Mon, 2 Oct 2023 16:08:05 +0200 +Subject: net: ethernet: mediatek: disable irq before schedule napi + +From: Christian Marangi + +commit fcdfc462881d8acf9db77f483b2c821e286ca97b upstream. + +While searching for possible refactor of napi_schedule_prep and +__napi_schedule it was notice that the mtk eth driver disable the +interrupt for rx and tx AFTER napi is scheduled. + +While this is a very hard to repro case it might happen to have +situation where the interrupt is disabled and never enabled again as the +napi completes and the interrupt is enabled before. + +This is caused by the fact that a napi driven by interrupt expect a +logic with: +1. interrupt received. napi prepared -> interrupt disabled -> napi + scheduled +2. napi triggered. ring cleared -> interrupt enabled -> wait for new + interrupt + +To prevent this case, disable the interrupt BEFORE the napi is +scheduled. + +Fixes: 656e705243fd ("net-next: mediatek: add support for MT7623 ethernet") +Cc: stable@vger.kernel.org +Signed-off-by: Christian Marangi +Link: https://lore.kernel.org/r/20231002140805.568-1-ansuelsmth@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c ++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c +@@ -2862,8 +2862,8 @@ static irqreturn_t mtk_handle_irq_rx(int + + eth->rx_events++; + if (likely(napi_schedule_prep(ð->rx_napi))) { +- __napi_schedule(ð->rx_napi); + mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask); ++ __napi_schedule(ð->rx_napi); + } + + return IRQ_HANDLED; +@@ -2875,8 +2875,8 @@ static irqreturn_t mtk_handle_irq_tx(int + + eth->tx_events++; + if (likely(napi_schedule_prep(ð->tx_napi))) { +- __napi_schedule(ð->tx_napi); + mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); ++ __napi_schedule(ð->tx_napi); + } + + return IRQ_HANDLED; diff --git a/queue-6.1/net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch b/queue-6.1/net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch new file mode 100644 index 00000000000..f4fedd73be1 --- /dev/null +++ b/queue-6.1/net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch @@ -0,0 +1,105 @@ +From 86a7e0b69bd5b812e48a20c66c2161744f3caa16 Mon Sep 17 00:00:00 2001 +From: Jordan Rife +Date: Thu, 21 Sep 2023 18:46:41 -0500 +Subject: net: prevent rewrite of msg_name in sock_sendmsg() + +From: Jordan Rife + +commit 86a7e0b69bd5b812e48a20c66c2161744f3caa16 upstream. + +Callers of sock_sendmsg(), and similarly kernel_sendmsg(), in kernel +space may observe their value of msg_name change in cases where BPF +sendmsg hooks rewrite the send address. This has been confirmed to break +NFS mounts running in UDP mode and has the potential to break other +systems. + +This patch: + +1) Creates a new function called __sock_sendmsg() with same logic as the + old sock_sendmsg() function. +2) Replaces calls to sock_sendmsg() made by __sys_sendto() and + __sys_sendmsg() with __sock_sendmsg() to avoid an unnecessary copy, + as these system calls are already protected. +3) Modifies sock_sendmsg() so that it makes a copy of msg_name if + present before passing it down the stack to insulate callers from + changes to the send address. + +Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/ +Fixes: 1cedee13d25a ("bpf: Hooks for sys_sendmsg") +Cc: stable@vger.kernel.org +Reviewed-by: Willem de Bruijn +Signed-off-by: Jordan Rife +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/socket.c | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) + +--- a/net/socket.c ++++ b/net/socket.c +@@ -720,6 +720,14 @@ static inline int sock_sendmsg_nosec(str + return ret; + } + ++static int __sock_sendmsg(struct socket *sock, struct msghdr *msg) ++{ ++ int err = security_socket_sendmsg(sock, msg, ++ msg_data_left(msg)); ++ ++ return err ?: sock_sendmsg_nosec(sock, msg); ++} ++ + /** + * sock_sendmsg - send a message through @sock + * @sock: socket +@@ -730,10 +738,19 @@ static inline int sock_sendmsg_nosec(str + */ + int sock_sendmsg(struct socket *sock, struct msghdr *msg) + { +- int err = security_socket_sendmsg(sock, msg, +- msg_data_left(msg)); ++ struct sockaddr_storage *save_addr = (struct sockaddr_storage *)msg->msg_name; ++ struct sockaddr_storage address; ++ int ret; + +- return err ?: sock_sendmsg_nosec(sock, msg); ++ if (msg->msg_name) { ++ memcpy(&address, msg->msg_name, msg->msg_namelen); ++ msg->msg_name = &address; ++ } ++ ++ ret = __sock_sendmsg(sock, msg); ++ msg->msg_name = save_addr; ++ ++ return ret; + } + EXPORT_SYMBOL(sock_sendmsg); + +@@ -1110,7 +1127,7 @@ static ssize_t sock_write_iter(struct ki + if (sock->type == SOCK_SEQPACKET) + msg.msg_flags |= MSG_EOR; + +- res = sock_sendmsg(sock, &msg); ++ res = __sock_sendmsg(sock, &msg); + *from = msg.msg_iter; + return res; + } +@@ -2114,7 +2131,7 @@ int __sys_sendto(int fd, void __user *bu + if (sock->file->f_flags & O_NONBLOCK) + flags |= MSG_DONTWAIT; + msg.msg_flags = flags; +- err = sock_sendmsg(sock, &msg); ++ err = __sock_sendmsg(sock, &msg); + + out_put: + fput_light(sock->file, fput_needed); +@@ -2479,7 +2496,7 @@ static int ____sys_sendmsg(struct socket + err = sock_sendmsg_nosec(sock, msg_sys); + goto out_freectl; + } +- err = sock_sendmsg(sock, msg_sys); ++ err = __sock_sendmsg(sock, msg_sys); + /* + * If this is sendmmsg() and sending to current destination address was + * successful, remember it. diff --git a/queue-6.1/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch b/queue-6.1/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch new file mode 100644 index 00000000000..b10162e7008 --- /dev/null +++ b/queue-6.1/net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch @@ -0,0 +1,52 @@ +From 26297b4ce1ce4ea40bc9a48ec99f45da3f64d2e2 Mon Sep 17 00:00:00 2001 +From: Jordan Rife +Date: Thu, 21 Sep 2023 18:46:40 -0500 +Subject: net: replace calls to sock->ops->connect() with kernel_connect() + +From: Jordan Rife + +commit 26297b4ce1ce4ea40bc9a48ec99f45da3f64d2e2 upstream. + +commit 0bdf399342c5 ("net: Avoid address overwrite in kernel_connect") +ensured that kernel_connect() will not overwrite the address parameter +in cases where BPF connect hooks perform an address rewrite. This change +replaces direct calls to sock->ops->connect() in net with kernel_connect() +to make these call safe. + +Link: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/ +Fixes: d74bad4e74ee ("bpf: Hooks for sys_connect") +Cc: stable@vger.kernel.org +Reviewed-by: Willem de Bruijn +Signed-off-by: Jordan Rife +Reviewed-by: Simon Horman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- + net/rds/tcp_connect.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/net/netfilter/ipvs/ip_vs_sync.c ++++ b/net/netfilter/ipvs/ip_vs_sync.c +@@ -1507,8 +1507,8 @@ static int make_send_sock(struct netns_i + } + + get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id); +- result = sock->ops->connect(sock, (struct sockaddr *) &mcast_addr, +- salen, 0); ++ result = kernel_connect(sock, (struct sockaddr *)&mcast_addr, ++ salen, 0); + if (result < 0) { + pr_err("Error connecting to the multicast addr\n"); + goto error; +--- a/net/rds/tcp_connect.c ++++ b/net/rds/tcp_connect.c +@@ -173,7 +173,7 @@ int rds_tcp_conn_path_connect(struct rds + * own the socket + */ + rds_tcp_set_callbacks(sock, cp); +- ret = sock->ops->connect(sock, addr, addrlen, O_NONBLOCK); ++ ret = kernel_connect(sock, addr, addrlen, O_NONBLOCK); + + rdsdebug("connect to address %pI6c returned %d\n", &conn->c_faddr, ret); + if (ret == -EINPROGRESS) diff --git a/queue-6.1/pci-qcom-fix-ipq8074-enumeration.patch b/queue-6.1/pci-qcom-fix-ipq8074-enumeration.patch new file mode 100644 index 00000000000..51c813692af --- /dev/null +++ b/queue-6.1/pci-qcom-fix-ipq8074-enumeration.patch @@ -0,0 +1,54 @@ +From 6a878a54d0053ef21f3b829dc267487c2302b012 Mon Sep 17 00:00:00 2001 +From: Sricharan Ramabadhran +Date: Tue, 19 Sep 2023 15:59:48 +0530 +Subject: PCI: qcom: Fix IPQ8074 enumeration + +From: Sricharan Ramabadhran + +commit 6a878a54d0053ef21f3b829dc267487c2302b012 upstream. + +PARF_SLV_ADDR_SPACE_SIZE_2_3_3 is used by qcom_pcie_post_init_2_3_3(). +This PCIe slave address space size register offset is 0x358 but was +incorrectly changed to 0x16c by 39171b33f652 ("PCI: qcom: Remove PCIE20_ +prefix from register definitions"). + +This prevented access to slave address space registers like iATU, etc., +so the IPQ8074 PCIe controller was not enumerated. + +Revert back to the correct 0x358 offset and remove the unused +PARF_SLV_ADDR_SPACE_SIZE_2_3_3. + +Fixes: 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions") +Link: https://lore.kernel.org/r/20230919102948.1844909-1-quic_srichara@quicinc.com +Tested-by: Robert Marko +Signed-off-by: Sricharan Ramabadhran +[bhelgaas: commit log] +Signed-off-by: Bjorn Helgaas +Reviewed-by: Manivannan Sadhasivam +Reviewed-by: Konrad Dybcio +Cc: stable@vger.kernel.org # v6.4+ +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pci/controller/dwc/pcie-qcom.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/drivers/pci/controller/dwc/pcie-qcom.c ++++ b/drivers/pci/controller/dwc/pcie-qcom.c +@@ -40,7 +40,6 @@ + #define PARF_PHY_REFCLK 0x4c + #define PARF_CONFIG_BITS 0x50 + #define PARF_DBI_BASE_ADDR 0x168 +-#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */ + #define PARF_MHI_CLOCK_RESET_CTRL 0x174 + #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178 + #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8 +@@ -1148,8 +1147,7 @@ static int qcom_pcie_post_init_2_3_3(str + u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); + u32 val; + +- writel(SLV_ADDR_SPACE_SZ, +- pcie->parf + PARF_SLV_ADDR_SPACE_SIZE_2_3_3); ++ writel(SLV_ADDR_SPACE_SZ, pcie->parf + PARF_SLV_ADDR_SPACE_SIZE); + + val = readl(pcie->parf + PARF_PHY_CTRL); + val &= ~BIT(0); diff --git a/queue-6.1/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch b/queue-6.1/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch new file mode 100644 index 00000000000..fe43a9f7ae6 --- /dev/null +++ b/queue-6.1/qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch @@ -0,0 +1,116 @@ +From eea03d18af9c44235865a4bc9bec4d780ef6cf21 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Sat, 23 Sep 2023 19:15:59 -0600 +Subject: qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info + +From: Gustavo A. R. Silva + +commit eea03d18af9c44235865a4bc9bec4d780ef6cf21 upstream. + +The flexible structure (a structure that contains a flexible-array member +at the end) `qed_ll2_tx_packet` is nested within the second layer of +`struct qed_ll2_info`: + +struct qed_ll2_tx_packet { + ... + /* Flexible Array of bds_set determined by max_bds_per_packet */ + struct { + struct core_tx_bd *txq_bd; + dma_addr_t tx_frag; + u16 frag_len; + } bds_set[]; +}; + +struct qed_ll2_tx_queue { + ... + struct qed_ll2_tx_packet cur_completing_packet; +}; + +struct qed_ll2_info { + ... + struct qed_ll2_tx_queue tx_queue; + struct qed_ll2_cbs cbs; +}; + +The problem is that member `cbs` in `struct qed_ll2_info` is placed just +after an object of type `struct qed_ll2_tx_queue`, which is in itself +an implicit flexible structure, which by definition ends in a flexible +array member, in this case `bds_set`. This causes an undefined behavior +bug at run-time when dynamic memory is allocated for `bds_set`, which +could lead to a serious issue if `cbs` in `struct qed_ll2_info` is +overwritten by the contents of `bds_set`. Notice that the type of `cbs` +is a structure full of function pointers (and a cookie :) ): + +include/linux/qed/qed_ll2_if.h: +107 typedef +108 void (*qed_ll2_complete_rx_packet_cb)(void *cxt, +109 struct qed_ll2_comp_rx_data *data); +110 +111 typedef +112 void (*qed_ll2_release_rx_packet_cb)(void *cxt, +113 u8 connection_handle, +114 void *cookie, +115 dma_addr_t rx_buf_addr, +116 bool b_last_packet); +117 +118 typedef +119 void (*qed_ll2_complete_tx_packet_cb)(void *cxt, +120 u8 connection_handle, +121 void *cookie, +122 dma_addr_t first_frag_addr, +123 bool b_last_fragment, +124 bool b_last_packet); +125 +126 typedef +127 void (*qed_ll2_release_tx_packet_cb)(void *cxt, +128 u8 connection_handle, +129 void *cookie, +130 dma_addr_t first_frag_addr, +131 bool b_last_fragment, bool b_last_packet); +132 +133 typedef +134 void (*qed_ll2_slowpath_cb)(void *cxt, u8 connection_handle, +135 u32 opaque_data_0, u32 opaque_data_1); +136 +137 struct qed_ll2_cbs { +138 qed_ll2_complete_rx_packet_cb rx_comp_cb; +139 qed_ll2_release_rx_packet_cb rx_release_cb; +140 qed_ll2_complete_tx_packet_cb tx_comp_cb; +141 qed_ll2_release_tx_packet_cb tx_release_cb; +142 qed_ll2_slowpath_cb slowpath_cb; +143 void *cookie; +144 }; + +Fix this by moving the declaration of `cbs` to the middle of its +containing structure `qed_ll2_info`, preventing it from being +overwritten by the contents of `bds_set` at run-time. + +This bug was introduced in 2017, when `bds_set` was converted to a +one-element array, and started to be used as a Variable Length Object +(VLO) at run-time. + +Fixes: f5823fe6897c ("qed: Add ll2 option to limit the number of bds per packet") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Reviewed-by: Simon Horman +Link: https://lore.kernel.org/r/ZQ+Nz8DfPg56pIzr@work +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.h ++++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.h +@@ -110,9 +110,9 @@ struct qed_ll2_info { + enum core_tx_dest tx_dest; + u8 tx_stats_en; + bool main_func_queue; ++ struct qed_ll2_cbs cbs; + struct qed_ll2_rx_queue rx_queue; + struct qed_ll2_tx_queue tx_queue; +- struct qed_ll2_cbs cbs; + }; + + extern const struct qed_ll2_ops qed_ll2_ops_pass; diff --git a/queue-6.1/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch b/queue-6.1/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch new file mode 100644 index 00000000000..603f6d91b94 --- /dev/null +++ b/queue-6.1/scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch @@ -0,0 +1,63 @@ +From b481f644d9174670b385c3a699617052cd2a79d3 Mon Sep 17 00:00:00 2001 +From: Dinghao Liu +Date: Sat, 23 Sep 2023 18:37:23 +0800 +Subject: scsi: zfcp: Fix a double put in zfcp_port_enqueue() + +From: Dinghao Liu + +commit b481f644d9174670b385c3a699617052cd2a79d3 upstream. + +When device_register() fails, zfcp_port_release() will be called after +put_device(). As a result, zfcp_ccw_adapter_put() will be called twice: one +in zfcp_port_release() and one in the error path after device_register(). +So the reference on the adapter object is doubly put, which may lead to a +premature free. Fix this by adjusting the error tag after +device_register(). + +Fixes: f3450c7b9172 ("[SCSI] zfcp: Replace local reference counting with common kref") +Signed-off-by: Dinghao Liu +Link: https://lore.kernel.org/r/20230923103723.10320-1-dinghao.liu@zju.edu.cn +Acked-by: Benjamin Block +Cc: stable@vger.kernel.org # v2.6.33+ +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/s390/scsi/zfcp_aux.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/s390/scsi/zfcp_aux.c ++++ b/drivers/s390/scsi/zfcp_aux.c +@@ -518,12 +518,12 @@ struct zfcp_port *zfcp_port_enqueue(stru + if (port) { + put_device(&port->dev); + retval = -EEXIST; +- goto err_out; ++ goto err_put; + } + + port = kzalloc(sizeof(struct zfcp_port), GFP_KERNEL); + if (!port) +- goto err_out; ++ goto err_put; + + rwlock_init(&port->unit_list_lock); + INIT_LIST_HEAD(&port->unit_list); +@@ -546,7 +546,7 @@ struct zfcp_port *zfcp_port_enqueue(stru + + if (dev_set_name(&port->dev, "0x%016llx", (unsigned long long)wwpn)) { + kfree(port); +- goto err_out; ++ goto err_put; + } + retval = -EINVAL; + +@@ -563,7 +563,8 @@ struct zfcp_port *zfcp_port_enqueue(stru + + return port; + +-err_out: ++err_put: + zfcp_ccw_adapter_put(adapter); ++err_out: + return ERR_PTR(retval); + } diff --git a/queue-6.1/series b/queue-6.1/series index de781467fb0..344ed8f6fea 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -54,3 +54,21 @@ block-fix-use-after-free-of-q-q_usage_counter.patch hwmon-nzxt-smart2-add-device-id.patch hwmon-nzxt-smart2-add-another-usb-id.patch i40e-fix-the-wrong-ptp-frequency-calculation.patch +scsi-zfcp-fix-a-double-put-in-zfcp_port_enqueue.patch +iommu-vt-d-avoid-memory-allocation-in-iommu_suspend.patch +vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch +net-ethernet-mediatek-disable-irq-before-schedule-napi.patch +mptcp-userspace-pm-allow-creating-id-0-subflow.patch +qed-red_ll2-fix-undefined-behavior-bug-in-struct-qed_ll2_info.patch +bluetooth-hci_codec-fix-leaking-content-of-local_codecs.patch +bluetooth-hci_sync-fix-handling-of-hci_quirk_strict_duplicate_filter.patch +wifi-mwifiex-fix-tlv_buf_left-calculation.patch +md-raid5-release-batch_last-before-waiting-for-another-stripe_head.patch +pci-qcom-fix-ipq8074-enumeration.patch +net-replace-calls-to-sock-ops-connect-with-kernel_connect.patch +btrfs-reject-unknown-mount-options-early.patch +net-prevent-rewrite-of-msg_name-in-sock_sendmsg.patch +drm-amd-fix-detection-of-_pr3-on-the-pcie-root-port.patch +drm-amd-fix-logic-error-in-sienna_cichlid_update_pcie_parameters.patch +arm64-add-cortex-a520-cpu-part-definition.patch +arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch diff --git a/queue-6.1/vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch b/queue-6.1/vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch new file mode 100644 index 00000000000..396c64283af --- /dev/null +++ b/queue-6.1/vringh-don-t-use-vringh_kiov_advance-in-vringh_iov_xfer.patch @@ -0,0 +1,52 @@ +From 7aed44babc7f97e82b38e9a68515e699692cc100 Mon Sep 17 00:00:00 2001 +From: Stefano Garzarella +Date: Mon, 25 Sep 2023 12:30:57 +0200 +Subject: vringh: don't use vringh_kiov_advance() in vringh_iov_xfer() + +From: Stefano Garzarella + +commit 7aed44babc7f97e82b38e9a68515e699692cc100 upstream. + +In the while loop of vringh_iov_xfer(), `partlen` could be 0 if one of +the `iov` has 0 lenght. +In this case, we should skip the iov and go to the next one. +But calling vringh_kiov_advance() with 0 lenght does not cause the +advancement, since it returns immediately if asked to advance by 0 bytes. + +Let's restore the code that was there before commit b8c06ad4d67d +("vringh: implement vringh_kiov_advance()"), avoiding using +vringh_kiov_advance(). + +Fixes: b8c06ad4d67d ("vringh: implement vringh_kiov_advance()") +Cc: stable@vger.kernel.org +Reported-by: Jason Wang +Signed-off-by: Stefano Garzarella +Acked-by: Jason Wang +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/vhost/vringh.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +--- a/drivers/vhost/vringh.c ++++ b/drivers/vhost/vringh.c +@@ -123,8 +123,18 @@ static inline ssize_t vringh_iov_xfer(st + done += partlen; + len -= partlen; + ptr += partlen; ++ iov->consumed += partlen; ++ iov->iov[iov->i].iov_len -= partlen; ++ iov->iov[iov->i].iov_base += partlen; + +- vringh_kiov_advance(iov, partlen); ++ if (!iov->iov[iov->i].iov_len) { ++ /* Fix up old iov element then increment. */ ++ iov->iov[iov->i].iov_len = iov->consumed; ++ iov->iov[iov->i].iov_base -= iov->consumed; ++ ++ iov->consumed = 0; ++ iov->i++; ++ } + } + return done; + } diff --git a/queue-6.1/wifi-mwifiex-fix-tlv_buf_left-calculation.patch b/queue-6.1/wifi-mwifiex-fix-tlv_buf_left-calculation.patch new file mode 100644 index 00000000000..8c16d3c8a87 --- /dev/null +++ b/queue-6.1/wifi-mwifiex-fix-tlv_buf_left-calculation.patch @@ -0,0 +1,103 @@ +From eec679e4ac5f47507774956fb3479c206e761af7 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Thu, 24 Aug 2023 21:06:51 -0600 +Subject: wifi: mwifiex: Fix tlv_buf_left calculation + +From: Gustavo A. R. Silva + +commit eec679e4ac5f47507774956fb3479c206e761af7 upstream. + +In a TLV encoding scheme, the Length part represents the length after +the header containing the values for type and length. In this case, +`tlv_len` should be: + +tlv_len == (sizeof(*tlv_rxba) - 1) - sizeof(tlv_rxba->header) + tlv_bitmap_len + +Notice that the `- 1` accounts for the one-element array `bitmap`, which +1-byte size is already included in `sizeof(*tlv_rxba)`. + +So, if the above is correct, there is a double-counting of some members +in `struct mwifiex_ie_types_rxba_sync`, when `tlv_buf_left` and `tmp` +are calculated: + +968 tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len); +969 tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba); + +in specific, members: + +drivers/net/wireless/marvell/mwifiex/fw.h:777 + 777 u8 mac[ETH_ALEN]; + 778 u8 tid; + 779 u8 reserved; + 780 __le16 seq_num; + 781 __le16 bitmap_len; + +This is clearly wrong, and affects the subsequent decoding of data in +`event_buf` through `tlv_rxba`: + +970 tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp; + +Fix this by using `sizeof(tlv_rxba->header)` instead of `sizeof(*tlv_rxba)` +in the calculation of `tlv_buf_left` and `tmp`. + +This results in the following binary differences before/after changes: + +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o +| @@ -4698,11 +4698,11 @@ +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:968 +| tlv_buf_left -= (sizeof(tlv_rxba->header) + tlv_len); +| - 1da7: lea -0x11(%rbx),%edx +| + 1da7: lea -0x4(%rbx),%edx +| 1daa: movzwl %bp,%eax +| drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c:969 +| tmp = (u8 *)tlv_rxba + sizeof(tlv_rxba->header) + tlv_len; +| - 1dad: lea 0x11(%r15,%rbp,1),%r15 +| + 1dad: lea 0x4(%r15,%rbp,1),%r15 + +The above reflects the desired change: avoid counting 13 too many bytes; +which is the total size of the double-counted members in +`struct mwifiex_ie_types_rxba_sync`: + +$ pahole -C mwifiex_ie_types_rxba_sync drivers/net/wireless/marvell/mwifiex/11n_rxreorder.o +struct mwifiex_ie_types_rxba_sync { + struct mwifiex_ie_types_header header; /* 0 4 */ + + |----------------------------------------------------------------------- + | u8 mac[6]; /* 4 6 */ | + | u8 tid; /* 10 1 */ | + | u8 reserved; /* 11 1 */ | + | __le16 seq_num; /* 12 2 */ | + | __le16 bitmap_len; /* 14 2 */ | + | u8 bitmap[1]; /* 16 1 */ | + |----------------------------------------------------------------------| + | 13 bytes| + ----------- + + /* size: 17, cachelines: 1, members: 7 */ + /* last cacheline: 17 bytes */ +} __attribute__((__packed__)); + +Fixes: 99ffe72cdae4 ("mwifiex: process rxba_sync event") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Reviewed-by: Kees Cook +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/06668edd68e7a26bbfeebd1201ae077a2a7a8bce.1692931954.git.gustavoars@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c ++++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +@@ -965,8 +965,8 @@ void mwifiex_11n_rxba_sync_event(struct + } + } + +- tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len); +- tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba); ++ tlv_buf_left -= (sizeof(tlv_rxba->header) + tlv_len); ++ tmp = (u8 *)tlv_rxba + sizeof(tlv_rxba->header) + tlv_len; + tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp; + } + } -- 2.47.3