From 78cec59034fcef3e15a60554f1861890e6d562a7 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 17 Jul 2022 10:52:37 -0400 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- ...re-bhb-avoid-pr_info-every-time-a-cp.patch | 58 +++++++ ...-the-fdt_fixed-sections-as-shareable.patch | 153 ++++++++++++++++++ ...s-at91-sama5d2-fix-typo-in-i2s1-node.patch | 40 +++++ ...6qdl-ts7970-fix-ngpio-typo-and-count.patch | 39 +++++ ...x-spi-nor-campatible-on-orange-pi-ze.patch | 40 +++++ ...ke-correct-the-handling-of-fmt_confi.patch | 133 +++++++++++++++ ...ke-correct-the-ssp-rate-discovery-in.patch | 48 ++++++ ...gtl5000-fix-noise-on-shutdown-remove.patch | 79 +++++++++ .../asoc-tas2764-add-post-reset-delays.patch | 69 ++++++++ ...as2764-correct-playback-volume-range.patch | 43 +++++ ...fix-amp-gain-register-offset-default.patch | 52 ++++++ ...x-and-extend-fsync-polarity-handling.patch | 135 ++++++++++++++++ .../cipso-fix-data-races-around-sysctl.patch | 95 +++++++++++ ...ossible-refcount-leak-in-intel_dp_ad.patch | 44 +++++ ...alize-tlb-invalidates-with-gt-resets.patch | 76 +++++++++ ...ts-fix-a-couple-is_err-vs-null-tests.patch | 53 ++++++ ...ta-race-around-sysctl_icmp_ratelimit.patch | 37 +++++ ...ata-race-around-sysctl_icmp_ratemask.patch | 36 +++++ .../icmp-fix-data-races-around-sysctl.patch | 42 +++++ ...ial-integer-overflow-in-ima_appraise.patch | 37 +++++ ...ntial-memory-leak-in-ima_init_crypto.patch | 36 +++++ ...ure-verification-when-config_kexec_s.patch | 87 ++++++++++ ...netpeer-fix-data-races-around-sysctl.patch | 52 ++++++ ...data-race-around-sysctl_fib_sync_mem.patch | 36 +++++ ...-data-races-around-sysctl_ip_dynaddr.patch | 59 +++++++ ...itialize-struct-kvm_lapic_irq-in-kvm.patch | 60 +++++++ ...ssing-numa_stat-when-config_hugetlb_.patch | 66 ++++++++ ...tic-remove-aq_nic_deinit-when-resume.patch | 61 +++++++ ...ove-deep-parameter-on-suspend-resume.patch | 101 ++++++++++++ ...net-fix-data-races-around-sysctl_mem.patch | 36 +++++ ...ld-reference-returned-by-of_get_chil.patch | 57 +++++++ ...pability-check-for-updating-vnic-env.patch | 42 +++++ ...s-fix-build-time-constant-test-in-rx.patch | 38 +++++ ...s-fix-build-time-constant-test-in-tx.patch | 38 +++++ ...os-disable-split-header-for-tegra194.patch | 47 ++++++ ...-check-for-errors-in-tls_device_init.patch | 83 ++++++++++ ...ata-races-around-nexthop_compat_mode.patch | 74 +++++++++ ...race-around-sysctl_raw_l3mdev_accept.patch | 36 +++++ ...-skb-checksum-in-bpf_push_seg6_encap.patch | 44 +++++ ...cksum-evaluation-in-srh-encapsulatio.patch | 73 +++++++++ ...cksum-in-srv6-end.b6-and-end.b6.enca.patch | 51 ++++++ queue-5.10/series | 52 ++++++ ...fc-fix-kernel-panic-when-creating-vf.patch | 71 ++++++++ ...-use-after-free-when-disabling-sriov.patch | 113 +++++++++++++ ...-limit-max-transfer-and-message-size.patch | 70 ++++++++ ...sctl-fix-data-races-in-proc_dointvec.patch | 51 ++++++ ...-data-races-in-proc_dointvec_jiffies.patch | 48 ++++++ ...x-data-races-in-proc_dointvec_minmax.patch | 42 +++++ ...ta-races-in-proc_dointvec_ms_jiffies.patch | 56 +++++++ ...ctl-fix-data-races-in-proc_douintvec.patch | 45 ++++++ ...-data-races-in-proc_douintvec_minmax.patch | 42 +++++ ...data-races-in-proc_doulongvec_minmax.patch | 45 ++++++ ...a-race-around-sysctl_tcp_max_orphans.patch | 37 +++++ 53 files changed, 3158 insertions(+) create mode 100644 queue-5.10/arm-9209-1-spectre-bhb-avoid-pr_info-every-time-a-cp.patch create mode 100644 queue-5.10/arm-9210-1-mark-the-fdt_fixed-sections-as-shareable.patch create mode 100644 queue-5.10/arm-dts-at91-sama5d2-fix-typo-in-i2s1-node.patch create mode 100644 queue-5.10/arm-dts-imx6qdl-ts7970-fix-ngpio-typo-and-count.patch create mode 100644 queue-5.10/arm-dts-sunxi-fix-spi-nor-campatible-on-orange-pi-ze.patch create mode 100644 queue-5.10/asoc-intel-skylake-correct-the-handling-of-fmt_confi.patch create mode 100644 queue-5.10/asoc-intel-skylake-correct-the-ssp-rate-discovery-in.patch create mode 100644 queue-5.10/asoc-sgtl5000-fix-noise-on-shutdown-remove.patch create mode 100644 queue-5.10/asoc-tas2764-add-post-reset-delays.patch create mode 100644 queue-5.10/asoc-tas2764-correct-playback-volume-range.patch create mode 100644 queue-5.10/asoc-tas2764-fix-amp-gain-register-offset-default.patch create mode 100644 queue-5.10/asoc-tas2764-fix-and-extend-fsync-polarity-handling.patch create mode 100644 queue-5.10/cipso-fix-data-races-around-sysctl.patch create mode 100644 queue-5.10/drm-i915-fix-a-possible-refcount-leak-in-intel_dp_ad.patch create mode 100644 queue-5.10/drm-i915-gt-serialize-tlb-invalidates-with-gt-resets.patch create mode 100644 queue-5.10/drm-i915-selftests-fix-a-couple-is_err-vs-null-tests.patch create mode 100644 queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratelimit.patch create mode 100644 queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratemask.patch create mode 100644 queue-5.10/icmp-fix-data-races-around-sysctl.patch create mode 100644 queue-5.10/ima-fix-a-potential-integer-overflow-in-ima_appraise.patch create mode 100644 queue-5.10/ima-fix-potential-memory-leak-in-ima_init_crypto.patch create mode 100644 queue-5.10/ima-force-signature-verification-when-config_kexec_s.patch create mode 100644 queue-5.10/inetpeer-fix-data-races-around-sysctl.patch create mode 100644 queue-5.10/ipv4-fix-a-data-race-around-sysctl_fib_sync_mem.patch create mode 100644 queue-5.10/ipv4-fix-data-races-around-sysctl_ip_dynaddr.patch create mode 100644 queue-5.10/kvm-x86-fully-initialize-struct-kvm_lapic_irq-in-kvm.patch create mode 100644 queue-5.10/mm-sysctl-fix-missing-numa_stat-when-config_hugetlb_.patch create mode 100644 queue-5.10/net-atlantic-remove-aq_nic_deinit-when-resume.patch create mode 100644 queue-5.10/net-atlantic-remove-deep-parameter-on-suspend-resume.patch create mode 100644 queue-5.10/net-fix-data-races-around-sysctl_mem.patch create mode 100644 queue-5.10/net-ftgmac100-hold-reference-returned-by-of_get_chil.patch create mode 100644 queue-5.10/net-mlx5e-fix-capability-check-for-updating-vnic-env.patch create mode 100644 queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-rx.patch create mode 100644 queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-tx.patch create mode 100644 queue-5.10/net-stmmac-dwc-qos-disable-split-header-for-tegra194.patch create mode 100644 queue-5.10/net-tls-check-for-errors-in-tls_device_init.patch create mode 100644 queue-5.10/nexthop-fix-data-races-around-nexthop_compat_mode.patch create mode 100644 queue-5.10/raw-fix-a-data-race-around-sysctl_raw_l3mdev_accept.patch create mode 100644 queue-5.10/seg6-bpf-fix-skb-checksum-in-bpf_push_seg6_encap.patch create mode 100644 queue-5.10/seg6-fix-skb-checksum-evaluation-in-srh-encapsulatio.patch create mode 100644 queue-5.10/seg6-fix-skb-checksum-in-srv6-end.b6-and-end.b6.enca.patch create mode 100644 queue-5.10/sfc-fix-kernel-panic-when-creating-vf.patch create mode 100644 queue-5.10/sfc-fix-use-after-free-when-disabling-sriov.patch create mode 100644 queue-5.10/spi-amd-limit-max-transfer-and-message-size.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_dointvec.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_dointvec_jiffies.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_dointvec_minmax.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_dointvec_ms_jiffies.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_douintvec.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_douintvec_minmax.patch create mode 100644 queue-5.10/sysctl-fix-data-races-in-proc_doulongvec_minmax.patch create mode 100644 queue-5.10/tcp-fix-a-data-race-around-sysctl_tcp_max_orphans.patch diff --git a/queue-5.10/arm-9209-1-spectre-bhb-avoid-pr_info-every-time-a-cp.patch b/queue-5.10/arm-9209-1-spectre-bhb-avoid-pr_info-every-time-a-cp.patch new file mode 100644 index 00000000000..16d8780776f --- /dev/null +++ b/queue-5.10/arm-9209-1-spectre-bhb-avoid-pr_info-every-time-a-cp.patch @@ -0,0 +1,58 @@ +From d83f46927b15ec7aefb15cf1fc9405b247cbbd25 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 31 May 2022 09:53:42 +0100 +Subject: ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out + of idle + +From: Ard Biesheuvel + +[ Upstream commit 0609e200246bfd3b7516091c491bec4308349055 ] + +Jon reports that the Spectre-BHB init code is filling up the kernel log +with spurious notifications about which mitigation has been enabled, +every time any CPU comes out of a low power state. + +Given that Spectre-BHB mitigations are system wide, only a single +mitigation can be enabled, and we already print an error if two types of +CPUs coexist in a single system that require different Spectre-BHB +mitigations. + +This means that the pr_info() that describes the selected mitigation +does not need to be emitted for each CPU anyway, and so we can simply +emit it only once. + +In order to clarify the above in the log message, update it to describe +that the selected mitigation will be enabled on all CPUs, including ones +that are unaffected. If another CPU comes up later that is affected and +requires a different mitigation, we report an error as before. + +Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") +Tested-by: Jon Hunter +Signed-off-by: Ard Biesheuvel +Signed-off-by: Russell King (Oracle) +Signed-off-by: Sasha Levin +--- + arch/arm/mm/proc-v7-bugs.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c +index f9730eba0632..8bc7a2d6d6c7 100644 +--- a/arch/arm/mm/proc-v7-bugs.c ++++ b/arch/arm/mm/proc-v7-bugs.c +@@ -208,10 +208,10 @@ static int spectre_bhb_install_workaround(int method) + return SPECTRE_VULNERABLE; + + spectre_bhb_method = method; +- } + +- pr_info("CPU%u: Spectre BHB: using %s workaround\n", +- smp_processor_id(), spectre_bhb_method_name(method)); ++ pr_info("CPU%u: Spectre BHB: enabling %s workaround for all CPUs\n", ++ smp_processor_id(), spectre_bhb_method_name(method)); ++ } + + return SPECTRE_MITIGATED; + } +-- +2.35.1 + diff --git a/queue-5.10/arm-9210-1-mark-the-fdt_fixed-sections-as-shareable.patch b/queue-5.10/arm-9210-1-mark-the-fdt_fixed-sections-as-shareable.patch new file mode 100644 index 00000000000..7c2d9c03521 --- /dev/null +++ b/queue-5.10/arm-9210-1-mark-the-fdt_fixed-sections-as-shareable.patch @@ -0,0 +1,153 @@ +From fbe9740a6df7e581a1f80b2d5c735db064d003e7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Jun 2022 15:05:41 +0100 +Subject: ARM: 9210/1: Mark the FDT_FIXED sections as shareable + +From: Zhen Lei + +[ Upstream commit 598f0a99fa8a35be44b27106b43ddc66417af3b1 ] + +commit 7a1be318f579 ("ARM: 9012/1: move device tree mapping out of linear +region") use FDT_FIXED_BASE to map the whole FDT_FIXED_SIZE memory area +which contains fdt. But it only reserves the exact physical memory that +fdt occupied. Unfortunately, this mapping is non-shareable. An illegal or +speculative read access can bring the RAM content from non-fdt zone into +cache, PIPT makes it to be hit by subsequently read access through +shareable mapping(such as linear mapping), and the cache consistency +between cores is lost due to non-shareable property. + +|<---------FDT_FIXED_SIZE------>| +| | + ------------------------------- +| | | | + ------------------------------- + +1. CoreA read through MT_ROM mapping, the old data is loaded + into the cache. +2. CoreB write to update data through linear mapping. CoreA + received the notification to invalid the corresponding cachelines, but + the property non-shareable makes it to be ignored. +3. CoreA read through linear mapping, cache hit, the old data + is read. + +To eliminate this risk, add a new memory type MT_MEMORY_RO. Compared to +MT_ROM, it is shareable and non-executable. + +Here's an example: + list_del corruption. prev->next should be c0ecbf74, but was c08410dc + kernel BUG at lib/list_debug.c:53! + ... ... + PC is at __list_del_entry_valid+0x58/0x98 + LR is at __list_del_entry_valid+0x58/0x98 + psr: 60000093 + sp : c0ecbf30 ip : 00000000 fp : 00000001 + r10: c08410d0 r9 : 00000001 r8 : c0825e0c + r7 : 20000013 r6 : c08410d0 r5 : c0ecbf74 r4 : c0ecbf74 + r3 : c0825d08 r2 : 00000000 r1 : df7ce6f4 r0 : 00000044 + ... ... + Stack: (0xc0ecbf30 to 0xc0ecc000) + bf20: c0ecbf74 c0164fd0 c0ecbf70 c0165170 + bf40: c0eca000 c0840c00 c0840c00 c0824500 c0825e0c c0189bbc c088f404 60000013 + bf60: 60000013 c0e85100 000004ec 00000000 c0ebcdc0 c0ecbf74 c0ecbf74 c0825d08 + ... ... < next prev > + (__list_del_entry_valid) from (__list_del_entry+0xc/0x20) + (__list_del_entry) from (finish_swait+0x60/0x7c) + (finish_swait) from (rcu_gp_kthread+0x560/0xa20) + (rcu_gp_kthread) from (kthread+0x14c/0x15c) + (kthread) from (ret_from_fork+0x14/0x24) + +The faulty list node to be deleted is a local variable, its address is +c0ecbf74. The dumped stack shows that 'prev' = c0ecbf74, but its value +before lib/list_debug.c:53 is c08410dc. A large amount of printing results +in swapping out the cacheline containing the old data(MT_ROM mapping is +read only, so the cacheline cannot be dirty), and the subsequent dump +operation obtains new data from the DDR. + +Fixes: 7a1be318f579 ("ARM: 9012/1: move device tree mapping out of linear region") +Suggested-by: Ard Biesheuvel +Signed-off-by: Zhen Lei +Reviewed-by: Ard Biesheuvel +Reviewed-by: Kefeng Wang +Signed-off-by: Russell King (Oracle) +Signed-off-by: Sasha Levin +--- + arch/arm/include/asm/mach/map.h | 1 + + arch/arm/mm/mmu.c | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h +index 92282558caf7..2b8970d8e5a2 100644 +--- a/arch/arm/include/asm/mach/map.h ++++ b/arch/arm/include/asm/mach/map.h +@@ -27,6 +27,7 @@ enum { + MT_HIGH_VECTORS, + MT_MEMORY_RWX, + MT_MEMORY_RW, ++ MT_MEMORY_RO, + MT_ROM, + MT_MEMORY_RWX_NONCACHED, + MT_MEMORY_RW_DTCM, +diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c +index 3e3001998460..86f213f1b44b 100644 +--- a/arch/arm/mm/mmu.c ++++ b/arch/arm/mm/mmu.c +@@ -296,6 +296,13 @@ static struct mem_type mem_types[] __ro_after_init = { + .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, + .domain = DOMAIN_KERNEL, + }, ++ [MT_MEMORY_RO] = { ++ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | ++ L_PTE_XN | L_PTE_RDONLY, ++ .prot_l1 = PMD_TYPE_TABLE, ++ .prot_sect = PMD_TYPE_SECT, ++ .domain = DOMAIN_KERNEL, ++ }, + [MT_ROM] = { + .prot_sect = PMD_TYPE_SECT, + .domain = DOMAIN_KERNEL, +@@ -490,6 +497,7 @@ static void __init build_mem_type_table(void) + + /* Also setup NX memory mapping */ + mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN; ++ mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_XN; + } + if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) { + /* +@@ -569,6 +577,7 @@ static void __init build_mem_type_table(void) + mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE; + mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE; + mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE; ++ mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE; + #endif + + /* +@@ -588,6 +597,8 @@ static void __init build_mem_type_table(void) + mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED; + mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S; + mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED; ++ mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_S; ++ mem_types[MT_MEMORY_RO].prot_pte |= L_PTE_SHARED; + mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED; + mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S; + mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED; +@@ -648,6 +659,8 @@ static void __init build_mem_type_table(void) + mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot; + mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd; + mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot; ++ mem_types[MT_MEMORY_RO].prot_sect |= ecc_mask | cp->pmd; ++ mem_types[MT_MEMORY_RO].prot_pte |= kern_pgprot; + mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot; + mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask; + mem_types[MT_ROM].prot_sect |= cp->pmd; +@@ -1342,7 +1355,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc) + map.pfn = __phys_to_pfn(__atags_pointer & SECTION_MASK); + map.virtual = FDT_FIXED_BASE; + map.length = FDT_FIXED_SIZE; +- map.type = MT_ROM; ++ map.type = MT_MEMORY_RO; + create_mapping(&map); + } + +-- +2.35.1 + diff --git a/queue-5.10/arm-dts-at91-sama5d2-fix-typo-in-i2s1-node.patch b/queue-5.10/arm-dts-at91-sama5d2-fix-typo-in-i2s1-node.patch new file mode 100644 index 00000000000..352d99f1bef --- /dev/null +++ b/queue-5.10/arm-dts-at91-sama5d2-fix-typo-in-i2s1-node.patch @@ -0,0 +1,40 @@ +From de86cff6e577360fafb5c58da51a6d0d51aebffb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Jul 2022 14:58:12 -0700 +Subject: ARM: dts: at91: sama5d2: Fix typo in i2s1 node + +From: Ryan Wanner + +[ Upstream commit 2fdf15b50a46e366740df4cccbe2343269b4ff55 ] + +Fix typo in i2s1 causing errors in dt binding validation. +Change assigned-parrents to assigned-clock-parents +to match i2s0 node formatting. + +Fixes: 1ca81883c557 ("ARM: dts: at91: sama5d2: add nodes for I2S controllers") +Signed-off-by: Ryan Wanner +[claudiu.beznea: use imperative addressing in commit description, remove + blank line after fixes tag, fix typo in commit message] +Signed-off-by: Claudiu Beznea +Link: https://lore.kernel.org/r/20220707215812.193008-1-Ryan.Wanner@microchip.com +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi +index 12f57278ba4a..33f76d14341e 100644 +--- a/arch/arm/boot/dts/sama5d2.dtsi ++++ b/arch/arm/boot/dts/sama5d2.dtsi +@@ -1125,7 +1125,7 @@ AT91_XDMAC_DT_PERID(33))>, + clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>; + clock-names = "pclk", "gclk"; + assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>; +- assigned-parrents = <&pmc PMC_TYPE_GCK 55>; ++ assigned-clock-parents = <&pmc PMC_TYPE_GCK 55>; + status = "disabled"; + }; + +-- +2.35.1 + diff --git a/queue-5.10/arm-dts-imx6qdl-ts7970-fix-ngpio-typo-and-count.patch b/queue-5.10/arm-dts-imx6qdl-ts7970-fix-ngpio-typo-and-count.patch new file mode 100644 index 00000000000..19bb3f37e87 --- /dev/null +++ b/queue-5.10/arm-dts-imx6qdl-ts7970-fix-ngpio-typo-and-count.patch @@ -0,0 +1,39 @@ +From 4c0a5226a3d898794b15237c935d21bc837fbd59 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 14:03:27 -0700 +Subject: ARM: dts: imx6qdl-ts7970: Fix ngpio typo and count + +From: Kris Bahnsen + +[ Upstream commit e95ea0f687e679fcb0a3a67d0755b81ee7d60db0 ] + +Device-tree incorrectly used "ngpio" which caused the driver to +fallback to 32 ngpios. + +This platform has 62 GPIO registers. + +Fixes: 9ff8e9fccef9 ("ARM: dts: TS-7970: add basic device tree") +Signed-off-by: Kris Bahnsen +Reviewed-by: Fabio Estevam +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi +index e6aa0c33754d..966038ecc5bf 100644 +--- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi +@@ -226,7 +226,7 @@ gpio8: gpio@28 { + reg = <0x28>; + #gpio-cells = <2>; + gpio-controller; +- ngpio = <32>; ++ ngpios = <62>; + }; + + sgtl5000: codec@a { +-- +2.35.1 + diff --git a/queue-5.10/arm-dts-sunxi-fix-spi-nor-campatible-on-orange-pi-ze.patch b/queue-5.10/arm-dts-sunxi-fix-spi-nor-campatible-on-orange-pi-ze.patch new file mode 100644 index 00000000000..17dc491ed0b --- /dev/null +++ b/queue-5.10/arm-dts-sunxi-fix-spi-nor-campatible-on-orange-pi-ze.patch @@ -0,0 +1,40 @@ +From 292432333c3cb9a23289d4402c234ce85f5fa754 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Jul 2022 19:45:29 +0200 +Subject: ARM: dts: sunxi: Fix SPI NOR campatible on Orange Pi Zero + +From: Michal Suchanek + +[ Upstream commit 884b66976a7279ee889ba885fe364244d50b79e7 ] + +The device tree should include generic "jedec,spi-nor" compatible, and a +manufacturer-specific one. +The macronix part is what is shipped on the boards that come with a +flash chip. + +Fixes: 45857ae95478 ("ARM: dts: orange-pi-zero: add node for SPI NOR") +Signed-off-by: Michal Suchanek +Acked-by: Jernej Skrabec +Signed-off-by: Jernej Skrabec +Link: https://lore.kernel.org/r/20220708174529.3360-1-msuchanek@suse.de +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +index f19ed981da9d..3706216ffb40 100644 +--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts +@@ -169,7 +169,7 @@ &spi0 { + flash@0 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "mxicy,mx25l1606e", "winbond,w25q128"; ++ compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + }; +-- +2.35.1 + diff --git a/queue-5.10/asoc-intel-skylake-correct-the-handling-of-fmt_confi.patch b/queue-5.10/asoc-intel-skylake-correct-the-handling-of-fmt_confi.patch new file mode 100644 index 00000000000..7c5de481a61 --- /dev/null +++ b/queue-5.10/asoc-intel-skylake-correct-the-handling-of-fmt_confi.patch @@ -0,0 +1,133 @@ +From 70ad7353ae7221a14b4631c15a203ba073ce60e3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:56:38 +0300 +Subject: ASoC: Intel: Skylake: Correct the handling of fmt_config flexible + array + +From: Peter Ujfalusi + +[ Upstream commit fc976f5629afb4160ee77798b14a693eac903ffd ] + +The struct nhlt_format's fmt_config is a flexible array, it must not be +used as normal array. +When moving to the next nhlt_fmt_cfg we need to take into account the data +behind the ->config.caps (indicated by ->config.size). + +The logic of the code also changed: it is no longer saves the _last_ +fmt_cfg for all found rates. + +Fixes: bc2bd45b1f7f3 ("ASoC: Intel: Skylake: Parse nhlt and register clock device") +Signed-off-by: Peter Ujfalusi +Reviewed-by: Cezary Rojewski +Link: https://lore.kernel.org/r/20220630065638.11183-3-peter.ujfalusi@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/skylake/skl-nhlt.c | 37 ++++++++++++++++++++---------- + 1 file changed, 25 insertions(+), 12 deletions(-) + +diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c +index c668e10baade..3b3868df9f67 100644 +--- a/sound/soc/intel/skylake/skl-nhlt.c ++++ b/sound/soc/intel/skylake/skl-nhlt.c +@@ -213,11 +213,12 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + if (fmt->fmt_count == 0) + return; + ++ fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config; + for (i = 0; i < fmt->fmt_count; i++) { ++ struct nhlt_fmt_cfg *saved_fmt_cfg = fmt_cfg; + bool present = false; + +- fmt_cfg = &fmt->fmt_config[i]; +- wav_fmt = &fmt_cfg->fmt_ext; ++ wav_fmt = &saved_fmt_cfg->fmt_ext; + + channels = wav_fmt->fmt.channels; + bps = wav_fmt->fmt.bits_per_sample; +@@ -235,12 +236,18 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + * derive the rate. + */ + for (j = i; j < fmt->fmt_count; j++) { +- fmt_cfg = &fmt->fmt_config[j]; +- wav_fmt = &fmt_cfg->fmt_ext; ++ struct nhlt_fmt_cfg *tmp_fmt_cfg = fmt_cfg; ++ ++ wav_fmt = &tmp_fmt_cfg->fmt_ext; + if ((fs == wav_fmt->fmt.samples_per_sec) && +- (bps == wav_fmt->fmt.bits_per_sample)) ++ (bps == wav_fmt->fmt.bits_per_sample)) { + channels = max_t(u16, channels, + wav_fmt->fmt.channels); ++ saved_fmt_cfg = tmp_fmt_cfg; ++ } ++ /* Move to the next nhlt_fmt_cfg */ ++ tmp_fmt_cfg = (struct nhlt_fmt_cfg *)(tmp_fmt_cfg->config.caps + ++ tmp_fmt_cfg->config.size); + } + + rate = channels * bps * fs; +@@ -256,8 +263,11 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + + /* Fill rate and parent for sclk/sclkfs */ + if (!present) { ++ struct nhlt_fmt_cfg *first_fmt_cfg; ++ ++ first_fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config; + i2s_config_ext = (struct skl_i2s_config_blob_ext *) +- fmt->fmt_config[0].config.caps; ++ first_fmt_cfg->config.caps; + + /* MCLK Divider Source Select */ + if (is_legacy_blob(i2s_config_ext->hdr.sig)) { +@@ -271,6 +281,9 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + + parent = skl_get_parent_clk(clk_src); + ++ /* Move to the next nhlt_fmt_cfg */ ++ fmt_cfg = (struct nhlt_fmt_cfg *)(fmt_cfg->config.caps + ++ fmt_cfg->config.size); + /* + * Do not copy the config data if there is no parent + * clock available for this clock source select +@@ -279,9 +292,9 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + continue; + + sclk[id].rate_cfg[rate_index].rate = rate; +- sclk[id].rate_cfg[rate_index].config = fmt_cfg; ++ sclk[id].rate_cfg[rate_index].config = saved_fmt_cfg; + sclkfs[id].rate_cfg[rate_index].rate = rate; +- sclkfs[id].rate_cfg[rate_index].config = fmt_cfg; ++ sclkfs[id].rate_cfg[rate_index].config = saved_fmt_cfg; + sclk[id].parent_name = parent->name; + sclkfs[id].parent_name = parent->name; + +@@ -295,13 +308,13 @@ static void skl_get_mclk(struct skl_dev *skl, struct skl_ssp_clk *mclk, + { + struct skl_i2s_config_blob_ext *i2s_config_ext; + struct skl_i2s_config_blob_legacy *i2s_config; +- struct nhlt_specific_cfg *fmt_cfg; ++ struct nhlt_fmt_cfg *fmt_cfg; + struct skl_clk_parent_src *parent; + u32 clkdiv, div_ratio; + u8 clk_src; + +- fmt_cfg = &fmt->fmt_config[0].config; +- i2s_config_ext = (struct skl_i2s_config_blob_ext *)fmt_cfg->caps; ++ fmt_cfg = (struct nhlt_fmt_cfg *)fmt->fmt_config; ++ i2s_config_ext = (struct skl_i2s_config_blob_ext *)fmt_cfg->config.caps; + + /* MCLK Divider Source Select and divider */ + if (is_legacy_blob(i2s_config_ext->hdr.sig)) { +@@ -330,7 +343,7 @@ static void skl_get_mclk(struct skl_dev *skl, struct skl_ssp_clk *mclk, + return; + + mclk[id].rate_cfg[0].rate = parent->rate/div_ratio; +- mclk[id].rate_cfg[0].config = &fmt->fmt_config[0]; ++ mclk[id].rate_cfg[0].config = fmt_cfg; + mclk[id].parent_name = parent->name; + } + +-- +2.35.1 + diff --git a/queue-5.10/asoc-intel-skylake-correct-the-ssp-rate-discovery-in.patch b/queue-5.10/asoc-intel-skylake-correct-the-ssp-rate-discovery-in.patch new file mode 100644 index 00000000000..048824537a2 --- /dev/null +++ b/queue-5.10/asoc-intel-skylake-correct-the-ssp-rate-discovery-in.patch @@ -0,0 +1,48 @@ +From a4a890618877d356b122e5d498215648721383a6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:56:37 +0300 +Subject: ASoC: Intel: Skylake: Correct the ssp rate discovery in + skl_get_ssp_clks() + +From: Peter Ujfalusi + +[ Upstream commit 219af251bd1694bce1f627d238347d2eaf13de61 ] + +The present flag is only set once when one rate has been found to be saved. +This will effectively going to ignore any rate discovered at later time and +based on the code, this is not the intention. + +Fixes: bc2bd45b1f7f3 ("ASoC: Intel: Skylake: Parse nhlt and register clock device") +Signed-off-by: Peter Ujfalusi +Reviewed-by: Cezary Rojewski +Link: https://lore.kernel.org/r/20220630065638.11183-2-peter.ujfalusi@linux.intel.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/skylake/skl-nhlt.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c +index 87c891c46291..c668e10baade 100644 +--- a/sound/soc/intel/skylake/skl-nhlt.c ++++ b/sound/soc/intel/skylake/skl-nhlt.c +@@ -201,7 +201,6 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + struct nhlt_fmt_cfg *fmt_cfg; + struct wav_fmt_ext *wav_fmt; + unsigned long rate; +- bool present = false; + int rate_index = 0; + u16 channels, bps; + u8 clk_src; +@@ -215,6 +214,8 @@ static void skl_get_ssp_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks, + return; + + for (i = 0; i < fmt->fmt_count; i++) { ++ bool present = false; ++ + fmt_cfg = &fmt->fmt_config[i]; + wav_fmt = &fmt_cfg->fmt_ext; + +-- +2.35.1 + diff --git a/queue-5.10/asoc-sgtl5000-fix-noise-on-shutdown-remove.patch b/queue-5.10/asoc-sgtl5000-fix-noise-on-shutdown-remove.patch new file mode 100644 index 00000000000..57c19089bfe --- /dev/null +++ b/queue-5.10/asoc-sgtl5000-fix-noise-on-shutdown-remove.patch @@ -0,0 +1,79 @@ +From dcb0d93e9d97541050919a2d72227543b8fcee14 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jun 2022 12:13:01 +0200 +Subject: ASoC: sgtl5000: Fix noise on shutdown/remove + +From: Francesco Dolcini + +[ Upstream commit 040e3360af3736348112d29425bf5d0be5b93115 ] + +Put the SGTL5000 in a silent/safe state on shutdown/remove, this is +required since the SGTL5000 produces a constant noise on its output +after it is configured and its clock is removed. Without this change +this is happening every time the module is unbound/removed or from +reboot till the clock is enabled again. + +The issue was experienced on both a Toradex Colibri/Apalis iMX6, but can +be easily reproduced everywhere just playing something on the codec and +after that removing/unbinding the driver. + +Fixes: 9b34e6cc3bc2 ("ASoC: Add Freescale SGTL5000 codec support") +Signed-off-by: Francesco Dolcini +Reviewed-by: Fabio Estevam +Link: https://lore.kernel.org/r/20220624101301.441314-1-francesco.dolcini@toradex.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/sgtl5000.c | 9 +++++++++ + sound/soc/codecs/sgtl5000.h | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c +index 4c0e87e22b97..f066e016a874 100644 +--- a/sound/soc/codecs/sgtl5000.c ++++ b/sound/soc/codecs/sgtl5000.c +@@ -1797,6 +1797,9 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) + { + struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); + ++ regmap_write(sgtl5000->regmap, SGTL5000_CHIP_DIG_POWER, SGTL5000_DIG_POWER_DEFAULT); ++ regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, SGTL5000_ANA_POWER_DEFAULT); ++ + clk_disable_unprepare(sgtl5000->mclk); + regulator_bulk_disable(sgtl5000->num_supplies, sgtl5000->supplies); + regulator_bulk_free(sgtl5000->num_supplies, sgtl5000->supplies); +@@ -1804,6 +1807,11 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) + return 0; + } + ++static void sgtl5000_i2c_shutdown(struct i2c_client *client) ++{ ++ sgtl5000_i2c_remove(client); ++} ++ + static const struct i2c_device_id sgtl5000_id[] = { + {"sgtl5000", 0}, + {}, +@@ -1824,6 +1832,7 @@ static struct i2c_driver sgtl5000_i2c_driver = { + }, + .probe = sgtl5000_i2c_probe, + .remove = sgtl5000_i2c_remove, ++ .shutdown = sgtl5000_i2c_shutdown, + .id_table = sgtl5000_id, + }; + +diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h +index 56ec5863f250..3a808c762299 100644 +--- a/sound/soc/codecs/sgtl5000.h ++++ b/sound/soc/codecs/sgtl5000.h +@@ -80,6 +80,7 @@ + /* + * SGTL5000_CHIP_DIG_POWER + */ ++#define SGTL5000_DIG_POWER_DEFAULT 0x0000 + #define SGTL5000_ADC_EN 0x0040 + #define SGTL5000_DAC_EN 0x0020 + #define SGTL5000_DAP_POWERUP 0x0010 +-- +2.35.1 + diff --git a/queue-5.10/asoc-tas2764-add-post-reset-delays.patch b/queue-5.10/asoc-tas2764-add-post-reset-delays.patch new file mode 100644 index 00000000000..f002ae4583e --- /dev/null +++ b/queue-5.10/asoc-tas2764-add-post-reset-delays.patch @@ -0,0 +1,69 @@ +From c76d88f303e8e230de0b58c5b4c87113b1be8fc4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:51:32 +0200 +Subject: ASoC: tas2764: Add post reset delays +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Martin Povišer + +[ Upstream commit cd10bb89b0d57bca98eb75e0444854a1c129a14e ] + +Make sure there is at least 1 ms delay from reset to first command as +is specified in the datasheet. This is a fix similar to commit +307f31452078 ("ASoC: tas2770: Insert post reset delay"). + +Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") +Signed-off-by: Martin Povišer +Link: https://lore.kernel.org/r/20220630075135.2221-1-povik+lin@cutebit.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tas2764.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c +index 14a193e48dc7..d8e79cc2cd1d 100644 +--- a/sound/soc/codecs/tas2764.c ++++ b/sound/soc/codecs/tas2764.c +@@ -42,10 +42,12 @@ static void tas2764_reset(struct tas2764_priv *tas2764) + gpiod_set_value_cansleep(tas2764->reset_gpio, 0); + msleep(20); + gpiod_set_value_cansleep(tas2764->reset_gpio, 1); ++ usleep_range(1000, 2000); + } + + snd_soc_component_write(tas2764->component, TAS2764_SW_RST, + TAS2764_RST); ++ usleep_range(1000, 2000); + } + + static int tas2764_set_bias_level(struct snd_soc_component *component, +@@ -107,8 +109,10 @@ static int tas2764_codec_resume(struct snd_soc_component *component) + struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component); + int ret; + +- if (tas2764->sdz_gpio) ++ if (tas2764->sdz_gpio) { + gpiod_set_value_cansleep(tas2764->sdz_gpio, 1); ++ usleep_range(1000, 2000); ++ } + + ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, + TAS2764_PWR_CTRL_MASK, +@@ -501,8 +505,10 @@ static int tas2764_codec_probe(struct snd_soc_component *component) + + tas2764->component = component; + +- if (tas2764->sdz_gpio) ++ if (tas2764->sdz_gpio) { + gpiod_set_value_cansleep(tas2764->sdz_gpio, 1); ++ usleep_range(1000, 2000); ++ } + + tas2764_reset(tas2764); + +-- +2.35.1 + diff --git a/queue-5.10/asoc-tas2764-correct-playback-volume-range.patch b/queue-5.10/asoc-tas2764-correct-playback-volume-range.patch new file mode 100644 index 00000000000..218690c4e10 --- /dev/null +++ b/queue-5.10/asoc-tas2764-correct-playback-volume-range.patch @@ -0,0 +1,43 @@ +From 7f570881c97bb10adfed7af7b56830dec8cb4916 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:51:34 +0200 +Subject: ASoC: tas2764: Correct playback volume range +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Hector Martin + +[ Upstream commit 3e99e5697e1f7120b5abc755e8a560b22612d6ed ] + +DVC value 0xc8 is -100dB and 0xc9 is mute; this needs to map to +-100.5dB as far as the dB scale is concerned. Fix that and enable +the mute flag, so alsamixer correctly shows the control as +<0 dB .. -100 dB, mute>. + +Signed-off-by: Hector Martin +Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") +Signed-off-by: Martin Povišer +Link: https://lore.kernel.org/r/20220630075135.2221-3-povik+lin@cutebit.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tas2764.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c +index b93e593788f2..33d7ce78aced 100644 +--- a/sound/soc/codecs/tas2764.c ++++ b/sound/soc/codecs/tas2764.c +@@ -536,7 +536,7 @@ static int tas2764_codec_probe(struct snd_soc_component *component) + } + + static DECLARE_TLV_DB_SCALE(tas2764_digital_tlv, 1100, 50, 0); +-static DECLARE_TLV_DB_SCALE(tas2764_playback_volume, -10000, 50, 0); ++static DECLARE_TLV_DB_SCALE(tas2764_playback_volume, -10050, 50, 1); + + static const struct snd_kcontrol_new tas2764_snd_controls[] = { + SOC_SINGLE_TLV("Speaker Volume", TAS2764_DVC, 0, +-- +2.35.1 + diff --git a/queue-5.10/asoc-tas2764-fix-amp-gain-register-offset-default.patch b/queue-5.10/asoc-tas2764-fix-amp-gain-register-offset-default.patch new file mode 100644 index 00000000000..9d4106bb9b5 --- /dev/null +++ b/queue-5.10/asoc-tas2764-fix-amp-gain-register-offset-default.patch @@ -0,0 +1,52 @@ +From e0111dea5c5e6fa0214a77931ce4de4b8fda88b9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:51:35 +0200 +Subject: ASoC: tas2764: Fix amp gain register offset & default +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Hector Martin + +[ Upstream commit 1c4f29ec878bbf1cc0a1eb54ae7da5ff98e19641 ] + +The register default is 0x28 per the datasheet, and the amp gain field +is supposed to be shifted left by one. With the wrong default, the ALSA +controls lie about the power-up state. With the wrong shift, we get only +half the gain we expect. + +Signed-off-by: Hector Martin +Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") +Signed-off-by: Martin Povišer +Link: https://lore.kernel.org/r/20220630075135.2221-4-povik+lin@cutebit.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tas2764.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c +index 33d7ce78aced..37588804a6b5 100644 +--- a/sound/soc/codecs/tas2764.c ++++ b/sound/soc/codecs/tas2764.c +@@ -541,7 +541,7 @@ static DECLARE_TLV_DB_SCALE(tas2764_playback_volume, -10050, 50, 1); + static const struct snd_kcontrol_new tas2764_snd_controls[] = { + SOC_SINGLE_TLV("Speaker Volume", TAS2764_DVC, 0, + TAS2764_DVC_MAX, 1, tas2764_playback_volume), +- SOC_SINGLE_TLV("Amp Gain Volume", TAS2764_CHNL_0, 0, 0x14, 0, ++ SOC_SINGLE_TLV("Amp Gain Volume", TAS2764_CHNL_0, 1, 0x14, 0, + tas2764_digital_tlv), + }; + +@@ -566,7 +566,7 @@ static const struct reg_default tas2764_reg_defaults[] = { + { TAS2764_SW_RST, 0x00 }, + { TAS2764_PWR_CTRL, 0x1a }, + { TAS2764_DVC, 0x00 }, +- { TAS2764_CHNL_0, 0x00 }, ++ { TAS2764_CHNL_0, 0x28 }, + { TAS2764_TDM_CFG0, 0x09 }, + { TAS2764_TDM_CFG1, 0x02 }, + { TAS2764_TDM_CFG2, 0x0a }, +-- +2.35.1 + diff --git a/queue-5.10/asoc-tas2764-fix-and-extend-fsync-polarity-handling.patch b/queue-5.10/asoc-tas2764-fix-and-extend-fsync-polarity-handling.patch new file mode 100644 index 00000000000..b87cde9459d --- /dev/null +++ b/queue-5.10/asoc-tas2764-fix-and-extend-fsync-polarity-handling.patch @@ -0,0 +1,135 @@ +From a42a6b24a6a9e5f30b9ffaee2b74cd9e2652172f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 30 Jun 2022 09:51:33 +0200 +Subject: ASoC: tas2764: Fix and extend FSYNC polarity handling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Martin Povišer + +[ Upstream commit d1a10f1b48202e2d183cce144c218a211e98d906 ] + +Fix setting of FSYNC polarity in case of LEFT_J and DSP_A/B formats. +Do NOT set the SCFG field as was previously done, because that is not +correct and is also in conflict with the "ASI1 Source" control which +sets the same SCFG field! + +Also add support for explicit polarity inversion. + +Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") +Signed-off-by: Martin Povišer +Link: https://lore.kernel.org/r/20220630075135.2221-2-povik+lin@cutebit.org +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tas2764.c | 30 +++++++++++++++++------------- + sound/soc/codecs/tas2764.h | 6 ++---- + 2 files changed, 19 insertions(+), 17 deletions(-) + +diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c +index d8e79cc2cd1d..b93e593788f2 100644 +--- a/sound/soc/codecs/tas2764.c ++++ b/sound/soc/codecs/tas2764.c +@@ -135,7 +135,8 @@ static const char * const tas2764_ASI1_src[] = { + }; + + static SOC_ENUM_SINGLE_DECL( +- tas2764_ASI1_src_enum, TAS2764_TDM_CFG2, 4, tas2764_ASI1_src); ++ tas2764_ASI1_src_enum, TAS2764_TDM_CFG2, TAS2764_TDM_CFG2_SCFG_SHIFT, ++ tas2764_ASI1_src); + + static const struct snd_kcontrol_new tas2764_asi1_mux = + SOC_DAPM_ENUM("ASI1 Source", tas2764_ASI1_src_enum); +@@ -333,20 +334,22 @@ static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) + { + struct snd_soc_component *component = dai->component; + struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component); +- u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0; +- int iface; ++ u8 tdm_rx_start_slot = 0, asi_cfg_0 = 0, asi_cfg_1 = 0; + int ret; + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { ++ case SND_SOC_DAIFMT_NB_IF: ++ asi_cfg_0 ^= TAS2764_TDM_CFG0_FRAME_START; ++ fallthrough; + case SND_SOC_DAIFMT_NB_NF: + asi_cfg_1 = TAS2764_TDM_CFG1_RX_RISING; + break; ++ case SND_SOC_DAIFMT_IB_IF: ++ asi_cfg_0 ^= TAS2764_TDM_CFG0_FRAME_START; ++ fallthrough; + case SND_SOC_DAIFMT_IB_NF: + asi_cfg_1 = TAS2764_TDM_CFG1_RX_FALLING; + break; +- default: +- dev_err(tas2764->dev, "ASI format Inverse is not found\n"); +- return -EINVAL; + } + + ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG1, +@@ -357,13 +360,13 @@ static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: ++ asi_cfg_0 ^= TAS2764_TDM_CFG0_FRAME_START; ++ fallthrough; + case SND_SOC_DAIFMT_DSP_A: +- iface = TAS2764_TDM_CFG2_SCFG_I2S; + tdm_rx_start_slot = 1; + break; + case SND_SOC_DAIFMT_DSP_B: + case SND_SOC_DAIFMT_LEFT_J: +- iface = TAS2764_TDM_CFG2_SCFG_LEFT_J; + tdm_rx_start_slot = 0; + break; + default: +@@ -372,14 +375,15 @@ static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) + return -EINVAL; + } + +- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG1, +- TAS2764_TDM_CFG1_MASK, +- (tdm_rx_start_slot << TAS2764_TDM_CFG1_51_SHIFT)); ++ ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG0, ++ TAS2764_TDM_CFG0_FRAME_START, ++ asi_cfg_0); + if (ret < 0) + return ret; + +- ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG2, +- TAS2764_TDM_CFG2_SCFG_MASK, iface); ++ ret = snd_soc_component_update_bits(component, TAS2764_TDM_CFG1, ++ TAS2764_TDM_CFG1_MASK, ++ (tdm_rx_start_slot << TAS2764_TDM_CFG1_51_SHIFT)); + if (ret < 0) + return ret; + +diff --git a/sound/soc/codecs/tas2764.h b/sound/soc/codecs/tas2764.h +index 67d6fd903c42..f015f22a083b 100644 +--- a/sound/soc/codecs/tas2764.h ++++ b/sound/soc/codecs/tas2764.h +@@ -47,6 +47,7 @@ + #define TAS2764_TDM_CFG0_MASK GENMASK(3, 1) + #define TAS2764_TDM_CFG0_44_1_48KHZ BIT(3) + #define TAS2764_TDM_CFG0_88_2_96KHZ (BIT(3) | BIT(1)) ++#define TAS2764_TDM_CFG0_FRAME_START BIT(0) + + /* TDM Configuration Reg1 */ + #define TAS2764_TDM_CFG1 TAS2764_REG(0X0, 0x09) +@@ -66,10 +67,7 @@ + #define TAS2764_TDM_CFG2_RXS_16BITS 0x0 + #define TAS2764_TDM_CFG2_RXS_24BITS BIT(0) + #define TAS2764_TDM_CFG2_RXS_32BITS BIT(1) +-#define TAS2764_TDM_CFG2_SCFG_MASK GENMASK(5, 4) +-#define TAS2764_TDM_CFG2_SCFG_I2S 0x0 +-#define TAS2764_TDM_CFG2_SCFG_LEFT_J BIT(4) +-#define TAS2764_TDM_CFG2_SCFG_RIGHT_J BIT(5) ++#define TAS2764_TDM_CFG2_SCFG_SHIFT 4 + + /* TDM Configuration Reg3 */ + #define TAS2764_TDM_CFG3 TAS2764_REG(0X0, 0x0c) +-- +2.35.1 + diff --git a/queue-5.10/cipso-fix-data-races-around-sysctl.patch b/queue-5.10/cipso-fix-data-races-around-sysctl.patch new file mode 100644 index 00000000000..f6f7ba77143 --- /dev/null +++ b/queue-5.10/cipso-fix-data-races-around-sysctl.patch @@ -0,0 +1,95 @@ +From 9c9c8c9a8e9c2dfa856bb681dfeaf024259022f7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:40:01 -0700 +Subject: cipso: Fix data-races around sysctl. + +From: Kuniyuki Iwashima + +[ Upstream commit dd44f04b9214adb68ef5684ae87a81ba03632250 ] + +While reading cipso sysctl variables, they can be changed concurrently. +So, we need to add READ_ONCE() to avoid data-races. + +Fixes: 446fda4f2682 ("[NetLabel]: CIPSOv4 engine") +Signed-off-by: Kuniyuki Iwashima +Acked-by: Paul Moore +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + Documentation/networking/ip-sysctl.rst | 2 +- + net/ipv4/cipso_ipv4.c | 12 +++++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst +index 4822a058a81d..73de75906b24 100644 +--- a/Documentation/networking/ip-sysctl.rst ++++ b/Documentation/networking/ip-sysctl.rst +@@ -988,7 +988,7 @@ cipso_cache_enable - BOOLEAN + cipso_cache_bucket_size - INTEGER + The CIPSO label cache consists of a fixed size hash table with each + hash bucket containing a number of cache entries. This variable limits +- the number of entries in each hash bucket; the larger the value the ++ the number of entries in each hash bucket; the larger the value is, the + more CIPSO label mappings that can be cached. When the number of + entries in a given hash bucket reaches this limit adding new entries + causes the oldest entry in the bucket to be removed to make room. +diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c +index ca217a6f488f..d4a4160159a9 100644 +--- a/net/ipv4/cipso_ipv4.c ++++ b/net/ipv4/cipso_ipv4.c +@@ -240,7 +240,7 @@ static int cipso_v4_cache_check(const unsigned char *key, + struct cipso_v4_map_cache_entry *prev_entry = NULL; + u32 hash; + +- if (!cipso_v4_cache_enabled) ++ if (!READ_ONCE(cipso_v4_cache_enabled)) + return -ENOENT; + + hash = cipso_v4_map_cache_hash(key, key_len); +@@ -297,13 +297,14 @@ static int cipso_v4_cache_check(const unsigned char *key, + int cipso_v4_cache_add(const unsigned char *cipso_ptr, + const struct netlbl_lsm_secattr *secattr) + { ++ int bkt_size = READ_ONCE(cipso_v4_cache_bucketsize); + int ret_val = -EPERM; + u32 bkt; + struct cipso_v4_map_cache_entry *entry = NULL; + struct cipso_v4_map_cache_entry *old_entry = NULL; + u32 cipso_ptr_len; + +- if (!cipso_v4_cache_enabled || cipso_v4_cache_bucketsize <= 0) ++ if (!READ_ONCE(cipso_v4_cache_enabled) || bkt_size <= 0) + return 0; + + cipso_ptr_len = cipso_ptr[1]; +@@ -323,7 +324,7 @@ int cipso_v4_cache_add(const unsigned char *cipso_ptr, + + bkt = entry->hash & (CIPSO_V4_CACHE_BUCKETS - 1); + spin_lock_bh(&cipso_v4_cache[bkt].lock); +- if (cipso_v4_cache[bkt].size < cipso_v4_cache_bucketsize) { ++ if (cipso_v4_cache[bkt].size < bkt_size) { + list_add(&entry->list, &cipso_v4_cache[bkt].list); + cipso_v4_cache[bkt].size += 1; + } else { +@@ -1200,7 +1201,8 @@ static int cipso_v4_gentag_rbm(const struct cipso_v4_doi *doi_def, + /* This will send packets using the "optimized" format when + * possible as specified in section 3.4.2.6 of the + * CIPSO draft. */ +- if (cipso_v4_rbm_optfmt && ret_val > 0 && ret_val <= 10) ++ if (READ_ONCE(cipso_v4_rbm_optfmt) && ret_val > 0 && ++ ret_val <= 10) + tag_len = 14; + else + tag_len = 4 + ret_val; +@@ -1604,7 +1606,7 @@ int cipso_v4_validate(const struct sk_buff *skb, unsigned char **option) + * all the CIPSO validations here but it doesn't + * really specify _exactly_ what we need to validate + * ... so, just make it a sysctl tunable. */ +- if (cipso_v4_rbm_strictvalid) { ++ if (READ_ONCE(cipso_v4_rbm_strictvalid)) { + if (cipso_v4_map_lvl_valid(doi_def, + tag[3]) < 0) { + err_offset = opt_iter + 3; +-- +2.35.1 + diff --git a/queue-5.10/drm-i915-fix-a-possible-refcount-leak-in-intel_dp_ad.patch b/queue-5.10/drm-i915-fix-a-possible-refcount-leak-in-intel_dp_ad.patch new file mode 100644 index 00000000000..3a9d848ed22 --- /dev/null +++ b/queue-5.10/drm-i915-fix-a-possible-refcount-leak-in-intel_dp_ad.patch @@ -0,0 +1,44 @@ +From 0226356fe76a6e3bf94bd25640413674ee45ee17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Jun 2022 06:04:06 -0700 +Subject: drm/i915: fix a possible refcount leak in + intel_dp_add_mst_connector() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Hangyu Hua + +[ Upstream commit 85144df9ff4652816448369de76897c57cbb1b93 ] + +If drm_connector_init fails, intel_connector_free will be called to take +care of proper free. So it is necessary to drop the refcount of port +before intel_connector_free. + +Fixes: 091a4f91942a ("drm/i915: Handle drm-layer errors in intel_dp_add_mst_connector") +Signed-off-by: Hangyu Hua +Reviewed-by: José Roberto de Souza +Link: https://patchwork.freedesktop.org/patch/msgid/20220624130406.17996-1-jose.souza@intel.com +Signed-off-by: José Roberto de Souza +(cherry picked from commit cea9ed611e85d36a05db52b6457bf584b7d969e2) +Signed-off-by: Rodrigo Vivi +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c +index ecaa538b2d35..ef7878193491 100644 +--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c ++++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c +@@ -790,6 +790,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo + ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret) { ++ drm_dp_mst_put_port_malloc(port); + intel_connector_free(intel_connector); + return NULL; + } +-- +2.35.1 + diff --git a/queue-5.10/drm-i915-gt-serialize-tlb-invalidates-with-gt-resets.patch b/queue-5.10/drm-i915-gt-serialize-tlb-invalidates-with-gt-resets.patch new file mode 100644 index 00000000000..af9b217274f --- /dev/null +++ b/queue-5.10/drm-i915-gt-serialize-tlb-invalidates-with-gt-resets.patch @@ -0,0 +1,76 @@ +From c3a4e3b3144a4fa84c566a4207777812e337e6bc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 16:21:33 +0100 +Subject: drm/i915/gt: Serialize TLB invalidates with GT resets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Chris Wilson + +[ Upstream commit a1c5a7bf79c1faa5633b918b5c0666545e84c4d1 ] + +Avoid trying to invalidate the TLB in the middle of performing an +engine reset, as this may result in the reset timing out. Currently, +the TLB invalidate is only serialised by its own mutex, forgoing the +uncore lock, but we can take the uncore->lock as well to serialise +the mmio access, thereby serialising with the GDRST. + +Tested on a NUC5i7RYB, BIOS RYBDWi35.86A.0380.2019.0517.1530 with +i915 selftest/hangcheck. + +Cc: stable@vger.kernel.org # v4.4 and upper +Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store") +Reported-by: Mauro Carvalho Chehab +Tested-by: Mauro Carvalho Chehab +Reviewed-by: Mauro Carvalho Chehab +Signed-off-by: Chris Wilson +Cc: Tvrtko Ursulin +Reviewed-by: Andi Shyti +Acked-by: Thomas Hellström +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Rodrigo Vivi +Link: https://patchwork.freedesktop.org/patch/msgid/1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org +(cherry picked from commit 33da97894758737895e90c909f16786052680ef4) +Signed-off-by: Rodrigo Vivi +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/gt/intel_gt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c +index 6615eb5147e2..a33887f2464f 100644 +--- a/drivers/gpu/drm/i915/gt/intel_gt.c ++++ b/drivers/gpu/drm/i915/gt/intel_gt.c +@@ -736,6 +736,20 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt) + mutex_lock(>->tlb_invalidate_lock); + intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL); + ++ spin_lock_irq(&uncore->lock); /* serialise invalidate with GT reset */ ++ ++ for_each_engine(engine, gt, id) { ++ struct reg_and_bit rb; ++ ++ rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num); ++ if (!i915_mmio_reg_offset(rb.reg)) ++ continue; ++ ++ intel_uncore_write_fw(uncore, rb.reg, rb.bit); ++ } ++ ++ spin_unlock_irq(&uncore->lock); ++ + for_each_engine(engine, gt, id) { + /* + * HW architecture suggest typical invalidation time at 40us, +@@ -750,7 +764,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt) + if (!i915_mmio_reg_offset(rb.reg)) + continue; + +- intel_uncore_write_fw(uncore, rb.reg, rb.bit); + if (__intel_wait_for_register_fw(uncore, + rb.reg, rb.bit, 0, + timeout_us, timeout_ms, +-- +2.35.1 + diff --git a/queue-5.10/drm-i915-selftests-fix-a-couple-is_err-vs-null-tests.patch b/queue-5.10/drm-i915-selftests-fix-a-couple-is_err-vs-null-tests.patch new file mode 100644 index 00000000000..2e1d44615af --- /dev/null +++ b/queue-5.10/drm-i915-selftests-fix-a-couple-is_err-vs-null-tests.patch @@ -0,0 +1,53 @@ +From 2fce94817339da147e47860f9b2d14fe76edf4a9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Jul 2022 12:41:04 +0300 +Subject: drm/i915/selftests: fix a couple IS_ERR() vs NULL tests + +From: Dan Carpenter + +[ Upstream commit 896dcabd1f8f613c533d948df17408c41f8929f5 ] + +The shmem_pin_map() function doesn't return error pointers, it returns +NULL. + +Fixes: be1cb55a07bf ("drm/i915/gt: Keep a no-frills swappable copy of the default context state") +Signed-off-by: Dan Carpenter +Reviewed-by: Matthew Auld +Signed-off-by: Matthew Auld +Link: https://patchwork.freedesktop.org/patch/msgid/20220708094104.GL2316@kadam +(cherry picked from commit d50f5a109cf4ed50c5b575c1bb5fc3bd17b23308) +Signed-off-by: Rodrigo Vivi +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c +index 95d41c01d0e0..35d55f98a06f 100644 +--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c ++++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c +@@ -4788,8 +4788,8 @@ static int live_lrc_layout(void *arg) + continue; + + hw = shmem_pin_map(engine->default_state); +- if (IS_ERR(hw)) { +- err = PTR_ERR(hw); ++ if (!hw) { ++ err = -ENOMEM; + break; + } + hw += LRC_STATE_OFFSET / sizeof(*hw); +@@ -4965,8 +4965,8 @@ static int live_lrc_fixed(void *arg) + continue; + + hw = shmem_pin_map(engine->default_state); +- if (IS_ERR(hw)) { +- err = PTR_ERR(hw); ++ if (!hw) { ++ err = -ENOMEM; + break; + } + hw += LRC_STATE_OFFSET / sizeof(*hw); +-- +2.35.1 + diff --git a/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratelimit.patch b/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratelimit.patch new file mode 100644 index 00000000000..0b7aa0da2f8 --- /dev/null +++ b/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratelimit.patch @@ -0,0 +1,37 @@ +From 96550daa8aa535e2764b2abf71edf3991dc408ac Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:27 -0700 +Subject: icmp: Fix a data-race around sysctl_icmp_ratelimit. + +From: Kuniyuki Iwashima + +[ Upstream commit 2a4eb714841f288cf51c7d942d98af6a8c6e4b01 ] + +While reading sysctl_icmp_ratelimit, it can be changed concurrently. +Thus, we need to add READ_ONCE() to its reader. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/icmp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c +index f22c0d55f479..9483c2a16b78 100644 +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c +@@ -328,7 +328,8 @@ static bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, + + vif = l3mdev_master_ifindex(dst->dev); + peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, vif, 1); +- rc = inet_peer_xrlim_allow(peer, net->ipv4.sysctl_icmp_ratelimit); ++ rc = inet_peer_xrlim_allow(peer, ++ READ_ONCE(net->ipv4.sysctl_icmp_ratelimit)); + if (peer) + inet_putpeer(peer); + out: +-- +2.35.1 + diff --git a/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratemask.patch b/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratemask.patch new file mode 100644 index 00000000000..30b1951eda0 --- /dev/null +++ b/queue-5.10/icmp-fix-a-data-race-around-sysctl_icmp_ratemask.patch @@ -0,0 +1,36 @@ +From c62e60f72a20f6051d005a7e210ef1bd7becc4bd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:28 -0700 +Subject: icmp: Fix a data-race around sysctl_icmp_ratemask. + +From: Kuniyuki Iwashima + +[ Upstream commit 1ebcb25ad6fc3d50fca87350acf451b9a66dd31e ] + +While reading sysctl_icmp_ratemask, it can be changed concurrently. +Thus, we need to add READ_ONCE() to its reader. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/icmp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c +index 9483c2a16b78..0fa0da1d71f5 100644 +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c +@@ -290,7 +290,7 @@ static bool icmpv4_mask_allow(struct net *net, int type, int code) + return true; + + /* Limit if icmp type is enabled in ratemask. */ +- if (!((1 << type) & net->ipv4.sysctl_icmp_ratemask)) ++ if (!((1 << type) & READ_ONCE(net->ipv4.sysctl_icmp_ratemask))) + return true; + + return false; +-- +2.35.1 + diff --git a/queue-5.10/icmp-fix-data-races-around-sysctl.patch b/queue-5.10/icmp-fix-data-races-around-sysctl.patch new file mode 100644 index 00000000000..8fd605ad457 --- /dev/null +++ b/queue-5.10/icmp-fix-data-races-around-sysctl.patch @@ -0,0 +1,42 @@ +From 24b5d4fcfb8acaf6b41e8051a96c8533ba060565 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:40:02 -0700 +Subject: icmp: Fix data-races around sysctl. + +From: Kuniyuki Iwashima + +[ Upstream commit 48d7ee321ea5182c6a70782aa186422a70e67e22 ] + +While reading icmp sysctl variables, they can be changed concurrently. +So, we need to add READ_ONCE() to avoid data-races. + +Fixes: 4cdf507d5452 ("icmp: add a global rate limitation") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/icmp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c +index cd65d3146c30..f22c0d55f479 100644 +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c +@@ -261,11 +261,12 @@ bool icmp_global_allow(void) + spin_lock(&icmp_global.lock); + delta = min_t(u32, now - icmp_global.stamp, HZ); + if (delta >= HZ / 50) { +- incr = sysctl_icmp_msgs_per_sec * delta / HZ ; ++ incr = READ_ONCE(sysctl_icmp_msgs_per_sec) * delta / HZ; + if (incr) + WRITE_ONCE(icmp_global.stamp, now); + } +- credit = min_t(u32, icmp_global.credit + incr, sysctl_icmp_msgs_burst); ++ credit = min_t(u32, icmp_global.credit + incr, ++ READ_ONCE(sysctl_icmp_msgs_burst)); + if (credit) { + /* We want to use a credit of one in average, but need to randomize + * it for security reasons. +-- +2.35.1 + diff --git a/queue-5.10/ima-fix-a-potential-integer-overflow-in-ima_appraise.patch b/queue-5.10/ima-fix-a-potential-integer-overflow-in-ima_appraise.patch new file mode 100644 index 00000000000..73a7313a3e2 --- /dev/null +++ b/queue-5.10/ima-fix-a-potential-integer-overflow-in-ima_appraise.patch @@ -0,0 +1,37 @@ +From b78f6293b8155cb7fac6574f58cfde5a58595ec8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 5 Jul 2022 13:14:17 +0800 +Subject: ima: Fix a potential integer overflow in ima_appraise_measurement + +From: Huaxin Lu + +[ Upstream commit d2ee2cfc4aa85ff6a2a3b198a3a524ec54e3d999 ] + +When the ima-modsig is enabled, the rc passed to evm_verifyxattr() may be +negative, which may cause the integer overflow problem. + +Fixes: 39b07096364a ("ima: Implement support for module-style appended signatures") +Signed-off-by: Huaxin Lu +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +--- + security/integrity/ima/ima_appraise.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c +index 3dd8c2e4314e..7122a359a268 100644 +--- a/security/integrity/ima/ima_appraise.c ++++ b/security/integrity/ima/ima_appraise.c +@@ -396,7 +396,8 @@ int ima_appraise_measurement(enum ima_hooks func, + goto out; + } + +- status = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, rc, iint); ++ status = evm_verifyxattr(dentry, XATTR_NAME_IMA, xattr_value, ++ rc < 0 ? 0 : rc, iint); + switch (status) { + case INTEGRITY_PASS: + case INTEGRITY_PASS_IMMUTABLE: +-- +2.35.1 + diff --git a/queue-5.10/ima-fix-potential-memory-leak-in-ima_init_crypto.patch b/queue-5.10/ima-fix-potential-memory-leak-in-ima_init_crypto.patch new file mode 100644 index 00000000000..cc08c3809e3 --- /dev/null +++ b/queue-5.10/ima-fix-potential-memory-leak-in-ima_init_crypto.patch @@ -0,0 +1,36 @@ +From a1b3a681cab88e7d08c46c1b6ea3fa1bbe482f7a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 09:10:37 +0800 +Subject: ima: Fix potential memory leak in ima_init_crypto() + +From: Jianglei Nie + +[ Upstream commit 067d2521874135267e681c19d42761c601d503d6 ] + +On failure to allocate the SHA1 tfm, IMA fails to initialize and exits +without freeing the ima_algo_array. Add the missing kfree() for +ima_algo_array to avoid the potential memory leak. + +Signed-off-by: Jianglei Nie +Fixes: 6d94809af6b0 ("ima: Allocate and initialize tfm for each PCR bank") +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +--- + security/integrity/ima/ima_crypto.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c +index f6a7e9643b54..b1e5e7749e41 100644 +--- a/security/integrity/ima/ima_crypto.c ++++ b/security/integrity/ima/ima_crypto.c +@@ -205,6 +205,7 @@ int __init ima_init_crypto(void) + + crypto_free_shash(ima_algo_array[i].tfm); + } ++ kfree(ima_algo_array); + out: + crypto_free_shash(ima_shash_tfm); + return rc; +-- +2.35.1 + diff --git a/queue-5.10/ima-force-signature-verification-when-config_kexec_s.patch b/queue-5.10/ima-force-signature-verification-when-config_kexec_s.patch new file mode 100644 index 00000000000..d881bfc041b --- /dev/null +++ b/queue-5.10/ima-force-signature-verification-when-config_kexec_s.patch @@ -0,0 +1,87 @@ +From 78de8d84d2c376e09f8cd4223d141c91fc6075db Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Jul 2022 15:21:11 +0800 +Subject: ima: force signature verification when CONFIG_KEXEC_SIG is configured + +From: Coiby Xu + +[ Upstream commit af16df54b89dee72df253abc5e7b5e8a6d16c11c ] + +Currently, an unsigned kernel could be kexec'ed when IMA arch specific +policy is configured unless lockdown is enabled. Enforce kernel +signature verification check in the kexec_file_load syscall when IMA +arch specific policy is configured. + +Fixes: 99d5cadfde2b ("kexec_file: split KEXEC_VERIFY_SIG into KEXEC_SIG and KEXEC_SIG_FORCE") +Reported-and-suggested-by: Mimi Zohar +Signed-off-by: Coiby Xu +Signed-off-by: Mimi Zohar +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/ima_arch.c | 2 ++ + include/linux/kexec.h | 6 ++++++ + kernel/kexec_file.c | 11 ++++++++++- + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/kernel/ima_arch.c b/arch/x86/kernel/ima_arch.c +index 7dfb1e808928..bd218470d145 100644 +--- a/arch/x86/kernel/ima_arch.c ++++ b/arch/x86/kernel/ima_arch.c +@@ -88,6 +88,8 @@ const char * const *arch_get_ima_policy(void) + if (IS_ENABLED(CONFIG_IMA_ARCH_POLICY) && arch_ima_get_secureboot()) { + if (IS_ENABLED(CONFIG_MODULE_SIG)) + set_module_sig_enforced(); ++ if (IS_ENABLED(CONFIG_KEXEC_SIG)) ++ set_kexec_sig_enforced(); + return sb_arch_rules; + } + return NULL; +diff --git a/include/linux/kexec.h b/include/linux/kexec.h +index 037192c3a46f..a1f12e959bba 100644 +--- a/include/linux/kexec.h ++++ b/include/linux/kexec.h +@@ -442,6 +442,12 @@ static inline int kexec_crash_loaded(void) { return 0; } + #define kexec_in_progress false + #endif /* CONFIG_KEXEC_CORE */ + ++#ifdef CONFIG_KEXEC_SIG ++void set_kexec_sig_enforced(void); ++#else ++static inline void set_kexec_sig_enforced(void) {} ++#endif ++ + #endif /* !defined(__ASSEBMLY__) */ + + #endif /* LINUX_KEXEC_H */ +diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c +index 2e0f0b3fb9ab..fff11916aba3 100644 +--- a/kernel/kexec_file.c ++++ b/kernel/kexec_file.c +@@ -29,6 +29,15 @@ + #include + #include "kexec_internal.h" + ++#ifdef CONFIG_KEXEC_SIG ++static bool sig_enforce = IS_ENABLED(CONFIG_KEXEC_SIG_FORCE); ++ ++void set_kexec_sig_enforced(void) ++{ ++ sig_enforce = true; ++} ++#endif ++ + static int kexec_calculate_store_digests(struct kimage *image); + + /* +@@ -159,7 +168,7 @@ kimage_validate_signature(struct kimage *image) + image->kernel_buf_len); + if (ret) { + +- if (IS_ENABLED(CONFIG_KEXEC_SIG_FORCE)) { ++ if (sig_enforce) { + pr_notice("Enforced kernel signature verification failed (%d).\n", ret); + return ret; + } +-- +2.35.1 + diff --git a/queue-5.10/inetpeer-fix-data-races-around-sysctl.patch b/queue-5.10/inetpeer-fix-data-races-around-sysctl.patch new file mode 100644 index 00000000000..51cb4fcd1a9 --- /dev/null +++ b/queue-5.10/inetpeer-fix-data-races-around-sysctl.patch @@ -0,0 +1,52 @@ +From e526e904cc6c44a8dea6a978133293f3f79cde9c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:59 -0700 +Subject: inetpeer: Fix data-races around sysctl. + +From: Kuniyuki Iwashima + +[ Upstream commit 3d32edf1f3c38d3301f6434e56316f293466d7fb ] + +While reading inetpeer sysctl variables, they can be changed +concurrently. So, we need to add READ_ONCE() to avoid data-races. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/inetpeer.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c +index ff327a62c9ce..a18668552d33 100644 +--- a/net/ipv4/inetpeer.c ++++ b/net/ipv4/inetpeer.c +@@ -148,16 +148,20 @@ static void inet_peer_gc(struct inet_peer_base *base, + struct inet_peer *gc_stack[], + unsigned int gc_cnt) + { ++ int peer_threshold, peer_maxttl, peer_minttl; + struct inet_peer *p; + __u32 delta, ttl; + int i; + +- if (base->total >= inet_peer_threshold) ++ peer_threshold = READ_ONCE(inet_peer_threshold); ++ peer_maxttl = READ_ONCE(inet_peer_maxttl); ++ peer_minttl = READ_ONCE(inet_peer_minttl); ++ ++ if (base->total >= peer_threshold) + ttl = 0; /* be aggressive */ + else +- ttl = inet_peer_maxttl +- - (inet_peer_maxttl - inet_peer_minttl) / HZ * +- base->total / inet_peer_threshold * HZ; ++ ttl = peer_maxttl - (peer_maxttl - peer_minttl) / HZ * ++ base->total / peer_threshold * HZ; + for (i = 0; i < gc_cnt; i++) { + p = gc_stack[i]; + +-- +2.35.1 + diff --git a/queue-5.10/ipv4-fix-a-data-race-around-sysctl_fib_sync_mem.patch b/queue-5.10/ipv4-fix-a-data-race-around-sysctl_fib_sync_mem.patch new file mode 100644 index 00000000000..e7c7a209566 --- /dev/null +++ b/queue-5.10/ipv4-fix-a-data-race-around-sysctl_fib_sync_mem.patch @@ -0,0 +1,36 @@ +From 1e1b3265c198f981b4c1a465aaebae3264d3bd71 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:40:03 -0700 +Subject: ipv4: Fix a data-race around sysctl_fib_sync_mem. + +From: Kuniyuki Iwashima + +[ Upstream commit 73318c4b7dbd0e781aaababff17376b2894745c0 ] + +While reading sysctl_fib_sync_mem, it can be changed concurrently. +So, we need to add READ_ONCE() to avoid a data-race. + +Fixes: 9ab948a91b2c ("ipv4: Allow amount of dirty memory from fib resizing to be controllable") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/fib_trie.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c +index ffc5332f1390..a28f525e2c47 100644 +--- a/net/ipv4/fib_trie.c ++++ b/net/ipv4/fib_trie.c +@@ -497,7 +497,7 @@ static void tnode_free(struct key_vector *tn) + tn = container_of(head, struct tnode, rcu)->kv; + } + +- if (tnode_free_size >= sysctl_fib_sync_mem) { ++ if (tnode_free_size >= READ_ONCE(sysctl_fib_sync_mem)) { + tnode_free_size = 0; + synchronize_rcu(); + } +-- +2.35.1 + diff --git a/queue-5.10/ipv4-fix-data-races-around-sysctl_ip_dynaddr.patch b/queue-5.10/ipv4-fix-data-races-around-sysctl_ip_dynaddr.patch new file mode 100644 index 00000000000..6065dc9e8d4 --- /dev/null +++ b/queue-5.10/ipv4-fix-data-races-around-sysctl_ip_dynaddr.patch @@ -0,0 +1,59 @@ +From 34fcbd6b5436db70e5bac56b0291dbb4fe9596ad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:32 -0700 +Subject: ipv4: Fix data-races around sysctl_ip_dynaddr. + +From: Kuniyuki Iwashima + +[ Upstream commit e49e4aff7ec19b2d0d0957ee30e93dade57dab9e ] + +While reading sysctl_ip_dynaddr, it can be changed concurrently. +Thus, we need to add READ_ONCE() to its readers. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + Documentation/networking/ip-sysctl.rst | 2 +- + net/ipv4/af_inet.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst +index 73de75906b24..0b1f3235aa77 100644 +--- a/Documentation/networking/ip-sysctl.rst ++++ b/Documentation/networking/ip-sysctl.rst +@@ -1080,7 +1080,7 @@ ip_autobind_reuse - BOOLEAN + option should only be set by experts. + Default: 0 + +-ip_dynaddr - BOOLEAN ++ip_dynaddr - INTEGER + If set non-zero, enables support for dynamic addresses. + If set to a non-zero value larger than 1, a kernel log + message will be printed when dynamic address rewriting +diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c +index 742218594741..e77283069c7b 100644 +--- a/net/ipv4/af_inet.c ++++ b/net/ipv4/af_inet.c +@@ -1245,7 +1245,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) + if (new_saddr == old_saddr) + return 0; + +- if (sock_net(sk)->ipv4.sysctl_ip_dynaddr > 1) { ++ if (READ_ONCE(sock_net(sk)->ipv4.sysctl_ip_dynaddr) > 1) { + pr_info("%s(): shifting inet->saddr from %pI4 to %pI4\n", + __func__, &old_saddr, &new_saddr); + } +@@ -1300,7 +1300,7 @@ int inet_sk_rebuild_header(struct sock *sk) + * Other protocols have to map its equivalent state to TCP_SYN_SENT. + * DCCP maps its DCCP_REQUESTING state to TCP_SYN_SENT. -acme + */ +- if (!sock_net(sk)->ipv4.sysctl_ip_dynaddr || ++ if (!READ_ONCE(sock_net(sk)->ipv4.sysctl_ip_dynaddr) || + sk->sk_state != TCP_SYN_SENT || + (sk->sk_userlocks & SOCK_BINDADDR_LOCK) || + (err = inet_sk_reselect_saddr(sk)) != 0) +-- +2.35.1 + diff --git a/queue-5.10/kvm-x86-fully-initialize-struct-kvm_lapic_irq-in-kvm.patch b/queue-5.10/kvm-x86-fully-initialize-struct-kvm_lapic_irq-in-kvm.patch new file mode 100644 index 00000000000..c1825a042b2 --- /dev/null +++ b/queue-5.10/kvm-x86-fully-initialize-struct-kvm_lapic_irq-in-kvm.patch @@ -0,0 +1,60 @@ +From a8a6252ddaa304eb2914c06a95e4fff48866960d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Jul 2022 14:51:47 +0200 +Subject: KVM: x86: Fully initialize 'struct kvm_lapic_irq' in + kvm_pv_kick_cpu_op() + +From: Vitaly Kuznetsov + +[ Upstream commit 8a414f943f8b5f94bbaafdec863d6f3dbef33f8a ] + +'vector' and 'trig_mode' fields of 'struct kvm_lapic_irq' are left +uninitialized in kvm_pv_kick_cpu_op(). While these fields are normally +not needed for APIC_DM_REMRD, they're still referenced by +__apic_accept_irq() for trace_kvm_apic_accept_irq(). Fully initialize +the structure to avoid consuming random stack memory. + +Fixes: a183b638b61c ("KVM: x86: make apic_accept_irq tracepoint more generic") +Reported-by: syzbot+d6caa905917d353f0d07@syzkaller.appspotmail.com +Signed-off-by: Vitaly Kuznetsov +Reviewed-by: Sean Christopherson +Message-Id: <20220708125147.593975-1-vkuznets@redhat.com> +Signed-off-by: Paolo Bonzini +Signed-off-by: Sasha Levin +--- + arch/x86/kvm/x86.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c +index da547752580a..c71f702c037d 100644 +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -8142,15 +8142,17 @@ static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr, + */ + static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid) + { +- struct kvm_lapic_irq lapic_irq; +- +- lapic_irq.shorthand = APIC_DEST_NOSHORT; +- lapic_irq.dest_mode = APIC_DEST_PHYSICAL; +- lapic_irq.level = 0; +- lapic_irq.dest_id = apicid; +- lapic_irq.msi_redir_hint = false; ++ /* ++ * All other fields are unused for APIC_DM_REMRD, but may be consumed by ++ * common code, e.g. for tracing. Defer initialization to the compiler. ++ */ ++ struct kvm_lapic_irq lapic_irq = { ++ .delivery_mode = APIC_DM_REMRD, ++ .dest_mode = APIC_DEST_PHYSICAL, ++ .shorthand = APIC_DEST_NOSHORT, ++ .dest_id = apicid, ++ }; + +- lapic_irq.delivery_mode = APIC_DM_REMRD; + kvm_irq_delivery_to_apic(kvm, NULL, &lapic_irq, NULL); + } + +-- +2.35.1 + diff --git a/queue-5.10/mm-sysctl-fix-missing-numa_stat-when-config_hugetlb_.patch b/queue-5.10/mm-sysctl-fix-missing-numa_stat-when-config_hugetlb_.patch new file mode 100644 index 00000000000..8eaab6e23bd --- /dev/null +++ b/queue-5.10/mm-sysctl-fix-missing-numa_stat-when-config_hugetlb_.patch @@ -0,0 +1,66 @@ +From 612da62e25a5705200c4189ee50a1ad3b9684881 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 Jun 2022 18:40:32 +0800 +Subject: mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE + +From: Muchun Song + +[ Upstream commit 43b5240ca6b33108998810593248186b1e3ae34a ] + +"numa_stat" should not be included in the scope of CONFIG_HUGETLB_PAGE, if +CONFIG_HUGETLB_PAGE is not configured even if CONFIG_NUMA is configured, +"numa_stat" is missed form /proc. Move it out of CONFIG_HUGETLB_PAGE to +fix it. + +Fixes: 4518085e127d ("mm, sysctl: make NUMA stats configurable") +Signed-off-by: Muchun Song +Cc: +Acked-by: Michal Hocko +Acked-by: Mel Gorman +Signed-off-by: Luis Chamberlain +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 642dc51b6503..f0dd1a3b66eb 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -2814,6 +2814,17 @@ static struct ctl_table vm_table[] = { + .extra1 = SYSCTL_ZERO, + .extra2 = &two_hundred, + }, ++#ifdef CONFIG_NUMA ++ { ++ .procname = "numa_stat", ++ .data = &sysctl_vm_numa_stat, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = sysctl_vm_numa_stat_handler, ++ .extra1 = SYSCTL_ZERO, ++ .extra2 = SYSCTL_ONE, ++ }, ++#endif + #ifdef CONFIG_HUGETLB_PAGE + { + .procname = "nr_hugepages", +@@ -2830,15 +2841,6 @@ static struct ctl_table vm_table[] = { + .mode = 0644, + .proc_handler = &hugetlb_mempolicy_sysctl_handler, + }, +- { +- .procname = "numa_stat", +- .data = &sysctl_vm_numa_stat, +- .maxlen = sizeof(int), +- .mode = 0644, +- .proc_handler = sysctl_vm_numa_stat_handler, +- .extra1 = SYSCTL_ZERO, +- .extra2 = SYSCTL_ONE, +- }, + #endif + { + .procname = "hugetlb_shm_group", +-- +2.35.1 + diff --git a/queue-5.10/net-atlantic-remove-aq_nic_deinit-when-resume.patch b/queue-5.10/net-atlantic-remove-aq_nic_deinit-when-resume.patch new file mode 100644 index 00000000000..54ba486d1b6 --- /dev/null +++ b/queue-5.10/net-atlantic-remove-aq_nic_deinit-when-resume.patch @@ -0,0 +1,61 @@ +From 119c5f5de5887b46e71350b4b07e5876c6cf529f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Jul 2022 19:12:24 +0800 +Subject: net: atlantic: remove aq_nic_deinit() when resume + +From: Chia-Lin Kao (AceLan) + +[ Upstream commit 2e15c51fefaffaf9f72255eaef4fada05055e4c5 ] + +aq_nic_deinit() has been called while suspending, so we don't have to call +it again on resume. +Actually, call it again leads to another hang issue when resuming from +S3. + +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992345] Call Trace: +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992346] +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992348] aq_nic_deinit+0xb4/0xd0 [atlantic] +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992356] aq_pm_thaw+0x7f/0x100 [atlantic] +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992362] pci_pm_resume+0x5c/0x90 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992366] ? pci_pm_thaw+0x80/0x80 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992368] dpm_run_callback+0x4e/0x120 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992371] device_resume+0xad/0x200 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992373] async_resume+0x1e/0x40 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992374] async_run_entry_fn+0x33/0x120 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992377] process_one_work+0x220/0x3c0 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992380] worker_thread+0x4d/0x3f0 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992382] ? process_one_work+0x3c0/0x3c0 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992384] kthread+0x12a/0x150 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992386] ? set_kthread_struct+0x40/0x40 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992387] ret_from_fork+0x22/0x30 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992391] +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992392] ---[ end trace 1ec8c79604ed5e0d ]--- +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992394] PM: dpm_run_callback(): pci_pm_resume+0x0/0x90 returns -110 +Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992397] atlantic 0000:02:00.0: PM: failed to resume async: error -110 + +Fixes: 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression") +Signed-off-by: Chia-Lin Kao (AceLan) +Link: https://lore.kernel.org/r/20220713111224.1535938-2-acelan.kao@canonical.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +index 8c05b2b79339..a0ce213c473b 100644 +--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c ++++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +@@ -419,9 +419,6 @@ static int atl_resume_common(struct device *dev) + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + +- /* Reinitialize Nic/Vecs objects */ +- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol); +- + if (netif_running(nic->ndev)) { + ret = aq_nic_init(nic); + if (ret) +-- +2.35.1 + diff --git a/queue-5.10/net-atlantic-remove-deep-parameter-on-suspend-resume.patch b/queue-5.10/net-atlantic-remove-deep-parameter-on-suspend-resume.patch new file mode 100644 index 00000000000..8e717009ed9 --- /dev/null +++ b/queue-5.10/net-atlantic-remove-deep-parameter-on-suspend-resume.patch @@ -0,0 +1,101 @@ +From 0b2bdb503c85134513222ab6e210121ad1aaa632 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Jul 2022 19:12:23 +0800 +Subject: net: atlantic: remove deep parameter on suspend/resume functions + +From: Chia-Lin Kao (AceLan) + +[ Upstream commit 0f33250760384e05c36466b0a2f92f3c6007ba92 ] + +Below commit claims that atlantic NIC requires to reset the device on pm +op, and had set the deep to true for all suspend/resume functions. +commit 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression") +So, we could remove deep parameter on suspend/resume functions without +any functional change. + +Fixes: 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression") +Signed-off-by: Chia-Lin Kao (AceLan) +Link: https://lore.kernel.org/r/20220713111224.1535938-1-acelan.kao@canonical.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + .../ethernet/aquantia/atlantic/aq_pci_func.c | 24 ++++++++----------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +index fc5ea434a27c..8c05b2b79339 100644 +--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c ++++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +@@ -385,7 +385,7 @@ static void aq_pci_shutdown(struct pci_dev *pdev) + } + } + +-static int aq_suspend_common(struct device *dev, bool deep) ++static int aq_suspend_common(struct device *dev) + { + struct aq_nic_s *nic = pci_get_drvdata(to_pci_dev(dev)); + +@@ -398,17 +398,15 @@ static int aq_suspend_common(struct device *dev, bool deep) + if (netif_running(nic->ndev)) + aq_nic_stop(nic); + +- if (deep) { +- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol); +- aq_nic_set_power(nic); +- } ++ aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol); ++ aq_nic_set_power(nic); + + rtnl_unlock(); + + return 0; + } + +-static int atl_resume_common(struct device *dev, bool deep) ++static int atl_resume_common(struct device *dev) + { + struct pci_dev *pdev = to_pci_dev(dev); + struct aq_nic_s *nic; +@@ -421,10 +419,8 @@ static int atl_resume_common(struct device *dev, bool deep) + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + +- if (deep) { +- /* Reinitialize Nic/Vecs objects */ +- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol); +- } ++ /* Reinitialize Nic/Vecs objects */ ++ aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol); + + if (netif_running(nic->ndev)) { + ret = aq_nic_init(nic); +@@ -450,22 +446,22 @@ static int atl_resume_common(struct device *dev, bool deep) + + static int aq_pm_freeze(struct device *dev) + { +- return aq_suspend_common(dev, true); ++ return aq_suspend_common(dev); + } + + static int aq_pm_suspend_poweroff(struct device *dev) + { +- return aq_suspend_common(dev, true); ++ return aq_suspend_common(dev); + } + + static int aq_pm_thaw(struct device *dev) + { +- return atl_resume_common(dev, true); ++ return atl_resume_common(dev); + } + + static int aq_pm_resume_restore(struct device *dev) + { +- return atl_resume_common(dev, true); ++ return atl_resume_common(dev); + } + + static const struct dev_pm_ops aq_pm_ops = { +-- +2.35.1 + diff --git a/queue-5.10/net-fix-data-races-around-sysctl_mem.patch b/queue-5.10/net-fix-data-races-around-sysctl_mem.patch new file mode 100644 index 00000000000..586ff40697a --- /dev/null +++ b/queue-5.10/net-fix-data-races-around-sysctl_mem.patch @@ -0,0 +1,36 @@ +From ca4f08fc356b5e97a6071b2d630d016296050121 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:40:00 -0700 +Subject: net: Fix data-races around sysctl_mem. + +From: Kuniyuki Iwashima + +[ Upstream commit 310731e2f1611d1d13aae237abcf8e66d33345d5 ] + +While reading .sysctl_mem, it can be changed concurrently. +So, we need to add READ_ONCE() to avoid data-races. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/sock.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/net/sock.h b/include/net/sock.h +index 2c11eb4abdd2..83854cec4a47 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -1445,7 +1445,7 @@ void __sk_mem_reclaim(struct sock *sk, int amount); + /* sysctl_mem values are in pages, we convert them in SK_MEM_QUANTUM units */ + static inline long sk_prot_mem_limits(const struct sock *sk, int index) + { +- long val = sk->sk_prot->sysctl_mem[index]; ++ long val = READ_ONCE(sk->sk_prot->sysctl_mem[index]); + + #if PAGE_SIZE > SK_MEM_QUANTUM + val <<= PAGE_SHIFT - SK_MEM_QUANTUM_SHIFT; +-- +2.35.1 + diff --git a/queue-5.10/net-ftgmac100-hold-reference-returned-by-of_get_chil.patch b/queue-5.10/net-ftgmac100-hold-reference-returned-by-of_get_chil.patch new file mode 100644 index 00000000000..3d09a6559a0 --- /dev/null +++ b/queue-5.10/net-ftgmac100-hold-reference-returned-by-of_get_chil.patch @@ -0,0 +1,57 @@ +From d99dbeb282945f4893fdc63d8aaf1c15da689294 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 14:14:17 +0800 +Subject: net: ftgmac100: Hold reference returned by of_get_child_by_name() + +From: Liang He + +[ Upstream commit 49b9f431ff0d845a36be0b3ede35ec324f2e5fee ] + +In ftgmac100_probe(), we should hold the refernece returned by +of_get_child_by_name() and use it to call of_node_put() for +reference balance. + +Fixes: 39bfab8844a0 ("net: ftgmac100: Add support for DT phy-handle property") +Signed-off-by: Liang He +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/faraday/ftgmac100.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c +index eea4bd3116e8..969af4dd6405 100644 +--- a/drivers/net/ethernet/faraday/ftgmac100.c ++++ b/drivers/net/ethernet/faraday/ftgmac100.c +@@ -1747,6 +1747,19 @@ static int ftgmac100_setup_clk(struct ftgmac100 *priv) + return rc; + } + ++static bool ftgmac100_has_child_node(struct device_node *np, const char *name) ++{ ++ struct device_node *child_np = of_get_child_by_name(np, name); ++ bool ret = false; ++ ++ if (child_np) { ++ ret = true; ++ of_node_put(child_np); ++ } ++ ++ return ret; ++} ++ + static int ftgmac100_probe(struct platform_device *pdev) + { + struct resource *res; +@@ -1860,7 +1873,7 @@ static int ftgmac100_probe(struct platform_device *pdev) + + /* Display what we found */ + phy_attached_info(phy); +- } else if (np && !of_get_child_by_name(np, "mdio")) { ++ } else if (np && !ftgmac100_has_child_node(np, "mdio")) { + /* Support legacy ASPEED devicetree descriptions that decribe a + * MAC with an embedded MDIO controller but have no "mdio" + * child node. Automatically scan the MDIO bus for available +-- +2.35.1 + diff --git a/queue-5.10/net-mlx5e-fix-capability-check-for-updating-vnic-env.patch b/queue-5.10/net-mlx5e-fix-capability-check-for-updating-vnic-env.patch new file mode 100644 index 00000000000..5d601572f61 --- /dev/null +++ b/queue-5.10/net-mlx5e-fix-capability-check-for-updating-vnic-env.patch @@ -0,0 +1,42 @@ +From 75855d91ed704bd48f6d8dd1b3f5eaea10299e17 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 27 Jun 2022 15:05:53 +0300 +Subject: net/mlx5e: Fix capability check for updating vnic env counters + +From: Gal Pressman + +[ Upstream commit 452133dd580811f184e76b1402983182ee425298 ] + +The existing capability check for vnic env counters only checks for +receive steering discards, although we need the counters update for the +exposed internal queue oob counter as well. This could result in the +latter counter not being updated correctly when the receive steering +discards counter is not supported. +Fix that by checking whether any counter is supported instead of only +the steering counter capability. + +Fixes: 0cfafd4b4ddf ("net/mlx5e: Add device out of buffer counter") +Signed-off-by: Gal Pressman +Reviewed-by: Tariq Toukan +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +index 78f6a6f0a7e0..ff4f10d0f090 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +@@ -536,7 +536,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vnic_env) + u32 in[MLX5_ST_SZ_DW(query_vnic_env_in)] = {}; + struct mlx5_core_dev *mdev = priv->mdev; + +- if (!MLX5_CAP_GEN(priv->mdev, nic_receive_steering_discard)) ++ if (!mlx5e_stats_grp_vnic_env_num_stats(priv)) + return; + + MLX5_SET(query_vnic_env_in, in, opcode, MLX5_CMD_OP_QUERY_VNIC_ENV); +-- +2.35.1 + diff --git a/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-rx.patch b/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-rx.patch new file mode 100644 index 00000000000..4fd1170f9ef --- /dev/null +++ b/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-rx.patch @@ -0,0 +1,38 @@ +From e87bf3cd642d87e8d679e1687d44a8f13279207a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Jun 2022 21:21:10 +0300 +Subject: net/mlx5e: kTLS, Fix build time constant test in RX + +From: Tariq Toukan + +[ Upstream commit 2ec6cf9b742a5c18982861322fa5de6510f8f57e ] + +Use the correct constant (TLS_DRIVER_STATE_SIZE_RX) in the comparison +against the size of the private RX TLS driver context. + +Fixes: 1182f3659357 ("net/mlx5e: kTLS, Add kTLS RX HW offload support") +Signed-off-by: Tariq Toukan +Reviewed-by: Maxim Mikityanskiy +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c +index d06532d0baa4..634777fd7db9 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c +@@ -231,8 +231,7 @@ mlx5e_set_ktls_rx_priv_ctx(struct tls_context *tls_ctx, + struct mlx5e_ktls_offload_context_rx **ctx = + __tls_driver_ctx(tls_ctx, TLS_OFFLOAD_CTX_DIR_RX); + +- BUILD_BUG_ON(sizeof(struct mlx5e_ktls_offload_context_rx *) > +- TLS_OFFLOAD_CONTEXT_SIZE_RX); ++ BUILD_BUG_ON(sizeof(priv_rx) > TLS_DRIVER_STATE_SIZE_RX); + + *ctx = priv_rx; + } +-- +2.35.1 + diff --git a/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-tx.patch b/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-tx.patch new file mode 100644 index 00000000000..be606e31355 --- /dev/null +++ b/queue-5.10/net-mlx5e-ktls-fix-build-time-constant-test-in-tx.patch @@ -0,0 +1,38 @@ +From c57c395066a2d4764671f56aeb259b7ab6b35863 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Jun 2022 21:20:29 +0300 +Subject: net/mlx5e: kTLS, Fix build time constant test in TX + +From: Tariq Toukan + +[ Upstream commit 6cc2714e85754a621219693ea8aa3077d6fca0cb ] + +Use the correct constant (TLS_DRIVER_STATE_SIZE_TX) in the comparison +against the size of the private TX TLS driver context. + +Fixes: df8d866770f9 ("net/mlx5e: kTLS, Use kernel API to extract private offload context") +Signed-off-by: Tariq Toukan +Reviewed-by: Maxim Mikityanskiy +Signed-off-by: Saeed Mahameed +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +index b140e13fdcc8..679747db3110 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +@@ -63,8 +63,7 @@ mlx5e_set_ktls_tx_priv_ctx(struct tls_context *tls_ctx, + struct mlx5e_ktls_offload_context_tx **ctx = + __tls_driver_ctx(tls_ctx, TLS_OFFLOAD_CTX_DIR_TX); + +- BUILD_BUG_ON(sizeof(struct mlx5e_ktls_offload_context_tx *) > +- TLS_OFFLOAD_CONTEXT_SIZE_TX); ++ BUILD_BUG_ON(sizeof(priv_tx) > TLS_DRIVER_STATE_SIZE_TX); + + *ctx = priv_tx; + } +-- +2.35.1 + diff --git a/queue-5.10/net-stmmac-dwc-qos-disable-split-header-for-tegra194.patch b/queue-5.10/net-stmmac-dwc-qos-disable-split-header-for-tegra194.patch new file mode 100644 index 00000000000..c3d4b4720e4 --- /dev/null +++ b/queue-5.10/net-stmmac-dwc-qos-disable-split-header-for-tegra194.patch @@ -0,0 +1,47 @@ +From 21925b78423d1313072c41a6d6184983200cf75e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 09:39:13 +0100 +Subject: net: stmmac: dwc-qos: Disable split header for Tegra194 + +From: Jon Hunter + +[ Upstream commit 029c1c2059e9c4b38f97a06204cdecd10cfbeb8a ] + +There is a long-standing issue with the Synopsys DWC Ethernet driver +for Tegra194 where random system crashes have been observed [0]. The +problem occurs when the split header feature is enabled in the stmmac +driver. In the bad case, a larger than expected buffer length is +received and causes the calculation of the total buffer length to +overflow. This results in a very large buffer length that causes the +kernel to crash. Why this larger buffer length is received is not clear, +however, the feedback from the NVIDIA design team is that the split +header feature is not supported for Tegra194. Therefore, disable split +header support for Tegra194 to prevent these random crashes from +occurring. + +[0] https://lore.kernel.org/linux-tegra/b0b17697-f23e-8fa5-3757-604a86f3a095@nvidia.com/ + +Fixes: 67afd6d1cfdf ("net: stmmac: Add Split Header support and enable it in XGMAC cores") +Signed-off-by: Jon Hunter +Link: https://lore.kernel.org/r/20220706083913.13750-1-jonathanh@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +index 2342d497348e..fd1b0cc6b5fa 100644 +--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c ++++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c +@@ -363,6 +363,7 @@ static void *tegra_eqos_probe(struct platform_device *pdev, + data->fix_mac_speed = tegra_eqos_fix_speed; + data->init = tegra_eqos_init; + data->bsp_priv = eqos; ++ data->sph_disable = 1; + + err = tegra_eqos_init(pdev, eqos); + if (err < 0) +-- +2.35.1 + diff --git a/queue-5.10/net-tls-check-for-errors-in-tls_device_init.patch b/queue-5.10/net-tls-check-for-errors-in-tls_device_init.patch new file mode 100644 index 00000000000..079804dcb0a --- /dev/null +++ b/queue-5.10/net-tls-check-for-errors-in-tls_device_init.patch @@ -0,0 +1,83 @@ +From c92c9a78d28b6eae66dfb1489dfb23889120cdde Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Jul 2022 10:07:54 +0300 +Subject: net/tls: Check for errors in tls_device_init + +From: Tariq Toukan + +[ Upstream commit 3d8c51b25a235e283e37750943bbf356ef187230 ] + +Add missing error checks in tls_device_init. + +Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure") +Reported-by: Jakub Kicinski +Reviewed-by: Maxim Mikityanskiy +Signed-off-by: Tariq Toukan +Link: https://lore.kernel.org/r/20220714070754.1428-1-tariqt@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + include/net/tls.h | 4 ++-- + net/tls/tls_device.c | 4 ++-- + net/tls/tls_main.c | 7 ++++++- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/include/net/tls.h b/include/net/tls.h +index 745b3bc6ce91..d9cb597cab46 100644 +--- a/include/net/tls.h ++++ b/include/net/tls.h +@@ -707,7 +707,7 @@ int tls_sw_fallback_init(struct sock *sk, + struct tls_crypto_info *crypto_info); + + #ifdef CONFIG_TLS_DEVICE +-void tls_device_init(void); ++int tls_device_init(void); + void tls_device_cleanup(void); + void tls_device_sk_destruct(struct sock *sk); + int tls_set_device_offload(struct sock *sk, struct tls_context *ctx); +@@ -727,7 +727,7 @@ static inline bool tls_is_sk_rx_device_offloaded(struct sock *sk) + return tls_get_ctx(sk)->rx_conf == TLS_HW; + } + #else +-static inline void tls_device_init(void) {} ++static inline int tls_device_init(void) { return 0; } + static inline void tls_device_cleanup(void) {} + + static inline int +diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c +index 3c82286e5bcc..6ae2ce411b4b 100644 +--- a/net/tls/tls_device.c ++++ b/net/tls/tls_device.c +@@ -1390,9 +1390,9 @@ static struct notifier_block tls_dev_notifier = { + .notifier_call = tls_dev_event, + }; + +-void __init tls_device_init(void) ++int __init tls_device_init(void) + { +- register_netdevice_notifier(&tls_dev_notifier); ++ return register_netdevice_notifier(&tls_dev_notifier); + } + + void __exit tls_device_cleanup(void) +diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c +index 58d22d6b86ae..e537085b184f 100644 +--- a/net/tls/tls_main.c ++++ b/net/tls/tls_main.c +@@ -905,7 +905,12 @@ static int __init tls_register(void) + if (err) + return err; + +- tls_device_init(); ++ err = tls_device_init(); ++ if (err) { ++ unregister_pernet_subsys(&tls_proc_ops); ++ return err; ++ } ++ + tcp_register_ulp(&tcp_tls_ulp_ops); + + return 0; +-- +2.35.1 + diff --git a/queue-5.10/nexthop-fix-data-races-around-nexthop_compat_mode.patch b/queue-5.10/nexthop-fix-data-races-around-nexthop_compat_mode.patch new file mode 100644 index 00000000000..9ae19467f9d --- /dev/null +++ b/queue-5.10/nexthop-fix-data-races-around-nexthop_compat_mode.patch @@ -0,0 +1,74 @@ +From e6a42add7621db1f0e4417ac162048af91d004bd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:33 -0700 +Subject: nexthop: Fix data-races around nexthop_compat_mode. + +From: Kuniyuki Iwashima + +[ Upstream commit bdf00bf24bef9be1ca641a6390fd5487873e0d2e ] + +While reading nexthop_compat_mode, it can be changed concurrently. +Thus, we need to add READ_ONCE() to its readers. + +Fixes: 4f80116d3df3 ("net: ipv4: add sysctl for nexthop api compatibility mode") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/nexthop.c | 5 +++-- + net/ipv6/route.c | 2 +- + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c +index 845adb92ef70..70c866308abe 100644 +--- a/net/ipv4/fib_semantics.c ++++ b/net/ipv4/fib_semantics.c +@@ -1831,7 +1831,7 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, + goto nla_put_failure; + if (nexthop_is_blackhole(fi->nh)) + rtm->rtm_type = RTN_BLACKHOLE; +- if (!fi->fib_net->ipv4.sysctl_nexthop_compat_mode) ++ if (!READ_ONCE(fi->fib_net->ipv4.sysctl_nexthop_compat_mode)) + goto offload; + } + +diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c +index 8bd3f5e3c0e7..2a17dc9413ae 100644 +--- a/net/ipv4/nexthop.c ++++ b/net/ipv4/nexthop.c +@@ -882,7 +882,7 @@ static void __remove_nexthop_fib(struct net *net, struct nexthop *nh) + /* __ip6_del_rt does a release, so do a hold here */ + fib6_info_hold(f6i); + ipv6_stub->ip6_del_rt(net, f6i, +- !net->ipv4.sysctl_nexthop_compat_mode); ++ !READ_ONCE(net->ipv4.sysctl_nexthop_compat_mode)); + } + } + +@@ -1194,7 +1194,8 @@ static int insert_nexthop(struct net *net, struct nexthop *new_nh, + if (!rc) { + nh_base_seq_inc(net); + nexthop_notify(RTM_NEWNEXTHOP, new_nh, &cfg->nlinfo); +- if (replace_notify && net->ipv4.sysctl_nexthop_compat_mode) ++ if (replace_notify && ++ READ_ONCE(net->ipv4.sysctl_nexthop_compat_mode)) + nexthop_replace_notify(net, new_nh, &cfg->nlinfo); + } + +diff --git a/net/ipv6/route.c b/net/ipv6/route.c +index e67505c6d856..cdf215442d37 100644 +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -5641,7 +5641,7 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb, + if (nexthop_is_blackhole(rt->nh)) + rtm->rtm_type = RTN_BLACKHOLE; + +- if (net->ipv4.sysctl_nexthop_compat_mode && ++ if (READ_ONCE(net->ipv4.sysctl_nexthop_compat_mode) && + rt6_fill_node_nexthop(skb, rt->nh, &nh_flags) < 0) + goto nla_put_failure; + +-- +2.35.1 + diff --git a/queue-5.10/raw-fix-a-data-race-around-sysctl_raw_l3mdev_accept.patch b/queue-5.10/raw-fix-a-data-race-around-sysctl_raw_l3mdev_accept.patch new file mode 100644 index 00000000000..e7de927b369 --- /dev/null +++ b/queue-5.10/raw-fix-a-data-race-around-sysctl_raw_l3mdev_accept.patch @@ -0,0 +1,36 @@ +From 27c1f4d04476ff3da6ecfc251cd2a79e6cc528a0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:29 -0700 +Subject: raw: Fix a data-race around sysctl_raw_l3mdev_accept. + +From: Kuniyuki Iwashima + +[ Upstream commit 1dace014928e6e385363032d359a04dee9158af0 ] + +While reading sysctl_raw_l3mdev_accept, it can be changed concurrently. +Thus, we need to add READ_ONCE() to its reader. + +Fixes: 6897445fb194 ("net: provide a sysctl raw_l3mdev_accept for raw socket lookup with VRFs") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + include/net/raw.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/net/raw.h b/include/net/raw.h +index 8ad8df594853..c51a635671a7 100644 +--- a/include/net/raw.h ++++ b/include/net/raw.h +@@ -75,7 +75,7 @@ static inline bool raw_sk_bound_dev_eq(struct net *net, int bound_dev_if, + int dif, int sdif) + { + #if IS_ENABLED(CONFIG_NET_L3_MASTER_DEV) +- return inet_bound_dev_eq(!!net->ipv4.sysctl_raw_l3mdev_accept, ++ return inet_bound_dev_eq(READ_ONCE(net->ipv4.sysctl_raw_l3mdev_accept), + bound_dev_if, dif, sdif); + #else + return inet_bound_dev_eq(true, bound_dev_if, dif, sdif); +-- +2.35.1 + diff --git a/queue-5.10/seg6-bpf-fix-skb-checksum-in-bpf_push_seg6_encap.patch b/queue-5.10/seg6-bpf-fix-skb-checksum-in-bpf_push_seg6_encap.patch new file mode 100644 index 00000000000..06247256603 --- /dev/null +++ b/queue-5.10/seg6-bpf-fix-skb-checksum-in-bpf_push_seg6_encap.patch @@ -0,0 +1,44 @@ +From d04172170c4d19051b2bfff8b122c7d9f6e4967a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 19:58:37 +0200 +Subject: seg6: bpf: fix skb checksum in bpf_push_seg6_encap() + +From: Andrea Mayer + +[ Upstream commit 4889fbd98deaf243c3baadc54e296d71c6af1eb0 ] + +Both helper functions bpf_lwt_seg6_action() and bpf_lwt_push_encap() use +the bpf_push_seg6_encap() to encapsulate the packet in an IPv6 with Segment +Routing Header (SRH) or insert an SRH between the IPv6 header and the +payload. +To achieve this result, such helper functions rely on bpf_push_seg6_encap() +which, in turn, leverages seg6_do_srh_{encap,inline}() to perform the +required operation (i.e. encap/inline). + +This patch removes the initialization of the IPv6 header payload length +from bpf_push_seg6_encap(), as it is now handled properly by +seg6_do_srh_{encap,inline}() to prevent corruption of the skb checksum. + +Fixes: fe94cc290f53 ("bpf: Add IPv6 Segment Routing helpers") +Signed-off-by: Andrea Mayer +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/core/filter.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/net/core/filter.c b/net/core/filter.c +index 246947fbc958..34ae30503ac4 100644 +--- a/net/core/filter.c ++++ b/net/core/filter.c +@@ -5624,7 +5624,6 @@ static int bpf_push_seg6_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len + if (err) + return err; + +- ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); + + return seg6_lookup_nexthop(skb, NULL, 0); +-- +2.35.1 + diff --git a/queue-5.10/seg6-fix-skb-checksum-evaluation-in-srh-encapsulatio.patch b/queue-5.10/seg6-fix-skb-checksum-evaluation-in-srh-encapsulatio.patch new file mode 100644 index 00000000000..0a8202dbc24 --- /dev/null +++ b/queue-5.10/seg6-fix-skb-checksum-evaluation-in-srh-encapsulatio.patch @@ -0,0 +1,73 @@ +From 9c84cdeee694567937d5f814b9a9e42f63d3a9cb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 19:58:35 +0200 +Subject: seg6: fix skb checksum evaluation in SRH encapsulation/insertion + +From: Andrea Mayer + +[ Upstream commit df8386d13ea280d55beee1b95f61a59234a3798b ] + +Support for SRH encapsulation and insertion was introduced with +commit 6c8702c60b88 ("ipv6: sr: add support for SRH encapsulation and +injection with lwtunnels"), through the seg6_do_srh_encap() and +seg6_do_srh_inline() functions, respectively. +The former encapsulates the packet in an outer IPv6 header along with +the SRH, while the latter inserts the SRH between the IPv6 header and +the payload. Then, the headers are initialized/updated according to the +operating mode (i.e., encap/inline). +Finally, the skb checksum is calculated to reflect the changes applied +to the headers. + +The IPv6 payload length ('payload_len') is not initialized +within seg6_do_srh_{inline,encap}() but is deferred in seg6_do_srh(), i.e. +the caller of seg6_do_srh_{inline,encap}(). +However, this operation invalidates the skb checksum, since the +'payload_len' is updated only after the checksum is evaluated. + +To solve this issue, the initialization of the IPv6 payload length is +moved from seg6_do_srh() directly into the seg6_do_srh_{inline,encap}() +functions and before the skb checksum update takes place. + +Fixes: 6c8702c60b88 ("ipv6: sr: add support for SRH encapsulation and injection with lwtunnels") +Reported-by: Paolo Abeni +Link: https://lore.kernel.org/all/20220705190727.69d532417be7438b15404ee1@uniroma2.it +Signed-off-by: Andrea Mayer +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/ipv6/seg6_iptunnel.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c +index 4d4399c5c5ea..40ac23242c37 100644 +--- a/net/ipv6/seg6_iptunnel.c ++++ b/net/ipv6/seg6_iptunnel.c +@@ -188,6 +188,8 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto) + } + #endif + ++ hdr->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); ++ + skb_postpush_rcsum(skb, hdr, tot_len); + + return 0; +@@ -240,6 +242,8 @@ int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh) + } + #endif + ++ hdr->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); ++ + skb_postpush_rcsum(skb, hdr, sizeof(struct ipv6hdr) + hdrlen); + + return 0; +@@ -301,7 +305,6 @@ static int seg6_do_srh(struct sk_buff *skb) + break; + } + +- ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); + + return 0; +-- +2.35.1 + diff --git a/queue-5.10/seg6-fix-skb-checksum-in-srv6-end.b6-and-end.b6.enca.patch b/queue-5.10/seg6-fix-skb-checksum-in-srv6-end.b6-and-end.b6.enca.patch new file mode 100644 index 00000000000..2c15d828d3b --- /dev/null +++ b/queue-5.10/seg6-fix-skb-checksum-in-srv6-end.b6-and-end.b6.enca.patch @@ -0,0 +1,51 @@ +From eb733a51a92f12b25e49862dfa7e166b96a2fad5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 19:58:36 +0200 +Subject: seg6: fix skb checksum in SRv6 End.B6 and End.B6.Encaps behaviors + +From: Andrea Mayer + +[ Upstream commit f048880fc77058d864aff5c674af7918b30f312a ] + +The SRv6 End.B6 and End.B6.Encaps behaviors rely on functions +seg6_do_srh_{encap,inline}() to, respectively: i) encapsulate the +packet within an outer IPv6 header with the specified Segment Routing +Header (SRH); ii) insert the specified SRH directly after the IPv6 +header of the packet. + +This patch removes the initialization of the IPv6 header payload length +from the input_action_end_b6{_encap}() functions, as it is now handled +properly by seg6_do_srh_{encap,inline}() to avoid corruption of the skb +checksum. + +Fixes: 140f04c33bbc ("ipv6: sr: implement several seg6local actions") +Signed-off-by: Andrea Mayer +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + net/ipv6/seg6_local.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c +index eba23279912d..11f7da4139f6 100644 +--- a/net/ipv6/seg6_local.c ++++ b/net/ipv6/seg6_local.c +@@ -435,7 +435,6 @@ static int input_action_end_b6(struct sk_buff *skb, struct seg6_local_lwt *slwt) + if (err) + goto drop; + +- ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); + + seg6_lookup_nexthop(skb, NULL, 0); +@@ -467,7 +466,6 @@ static int input_action_end_b6_encap(struct sk_buff *skb, + if (err) + goto drop; + +- ipv6_hdr(skb)->payload_len = htons(skb->len - sizeof(struct ipv6hdr)); + skb_set_transport_header(skb, sizeof(struct ipv6hdr)); + + seg6_lookup_nexthop(skb, NULL, 0); +-- +2.35.1 + diff --git a/queue-5.10/series b/queue-5.10/series index 8ad4ec8f3e7..9b63b134613 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -22,3 +22,55 @@ nilfs2-fix-incorrect-masking-of-permission-flags-for-symlinks.patch sh-convert-nommu-io-re-un-map-to-static-inline-functions.patch revert-evm-fix-memleak-in-init_desc.patch ext4-fix-race-condition-between-ext4_write-and-ext4_convert_inline_data.patch +arm-dts-imx6qdl-ts7970-fix-ngpio-typo-and-count.patch +spi-amd-limit-max-transfer-and-message-size.patch +arm-9209-1-spectre-bhb-avoid-pr_info-every-time-a-cp.patch +arm-9210-1-mark-the-fdt_fixed-sections-as-shareable.patch +net-mlx5e-ktls-fix-build-time-constant-test-in-tx.patch +net-mlx5e-ktls-fix-build-time-constant-test-in-rx.patch +net-mlx5e-fix-capability-check-for-updating-vnic-env.patch +drm-i915-fix-a-possible-refcount-leak-in-intel_dp_ad.patch +ima-fix-a-potential-integer-overflow-in-ima_appraise.patch +asoc-sgtl5000-fix-noise-on-shutdown-remove.patch +asoc-tas2764-add-post-reset-delays.patch +asoc-tas2764-fix-and-extend-fsync-polarity-handling.patch +asoc-tas2764-correct-playback-volume-range.patch +asoc-tas2764-fix-amp-gain-register-offset-default.patch +asoc-intel-skylake-correct-the-ssp-rate-discovery-in.patch +asoc-intel-skylake-correct-the-handling-of-fmt_confi.patch +net-stmmac-dwc-qos-disable-split-header-for-tegra194.patch +sysctl-fix-data-races-in-proc_dointvec.patch +sysctl-fix-data-races-in-proc_douintvec.patch +sysctl-fix-data-races-in-proc_dointvec_minmax.patch +sysctl-fix-data-races-in-proc_douintvec_minmax.patch +sysctl-fix-data-races-in-proc_doulongvec_minmax.patch +sysctl-fix-data-races-in-proc_dointvec_jiffies.patch +tcp-fix-a-data-race-around-sysctl_tcp_max_orphans.patch +inetpeer-fix-data-races-around-sysctl.patch +net-fix-data-races-around-sysctl_mem.patch +cipso-fix-data-races-around-sysctl.patch +icmp-fix-data-races-around-sysctl.patch +ipv4-fix-a-data-race-around-sysctl_fib_sync_mem.patch +arm-dts-at91-sama5d2-fix-typo-in-i2s1-node.patch +arm-dts-sunxi-fix-spi-nor-campatible-on-orange-pi-ze.patch +drm-i915-selftests-fix-a-couple-is_err-vs-null-tests.patch +drm-i915-gt-serialize-tlb-invalidates-with-gt-resets.patch +sysctl-fix-data-races-in-proc_dointvec_ms_jiffies.patch +icmp-fix-a-data-race-around-sysctl_icmp_ratelimit.patch +icmp-fix-a-data-race-around-sysctl_icmp_ratemask.patch +raw-fix-a-data-race-around-sysctl_raw_l3mdev_accept.patch +ipv4-fix-data-races-around-sysctl_ip_dynaddr.patch +nexthop-fix-data-races-around-nexthop_compat_mode.patch +net-ftgmac100-hold-reference-returned-by-of_get_chil.patch +ima-force-signature-verification-when-config_kexec_s.patch +ima-fix-potential-memory-leak-in-ima_init_crypto.patch +sfc-fix-use-after-free-when-disabling-sriov.patch +seg6-fix-skb-checksum-evaluation-in-srh-encapsulatio.patch +seg6-fix-skb-checksum-in-srv6-end.b6-and-end.b6.enca.patch +seg6-bpf-fix-skb-checksum-in-bpf_push_seg6_encap.patch +sfc-fix-kernel-panic-when-creating-vf.patch +net-atlantic-remove-deep-parameter-on-suspend-resume.patch +net-atlantic-remove-aq_nic_deinit-when-resume.patch +kvm-x86-fully-initialize-struct-kvm_lapic_irq-in-kvm.patch +net-tls-check-for-errors-in-tls_device_init.patch +mm-sysctl-fix-missing-numa_stat-when-config_hugetlb_.patch diff --git a/queue-5.10/sfc-fix-kernel-panic-when-creating-vf.patch b/queue-5.10/sfc-fix-kernel-panic-when-creating-vf.patch new file mode 100644 index 00000000000..4f1a4e0a6f3 --- /dev/null +++ b/queue-5.10/sfc-fix-kernel-panic-when-creating-vf.patch @@ -0,0 +1,71 @@ +From 89d70dda2a23ba3695d285ac73f160c5b2adbf8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Jul 2022 11:21:16 +0200 +Subject: sfc: fix kernel panic when creating VF +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Íñigo Huguet + +[ Upstream commit ada74c5539eba06cf8b47d068f92e0b3963a9a6e ] + +When creating VFs a kernel panic can happen when calling to +efx_ef10_try_update_nic_stats_vf. + +When releasing a DMA coherent buffer, sometimes, I don't know in what +specific circumstances, it has to unmap memory with vunmap. It is +disallowed to do that in IRQ context or with BH disabled. Otherwise, we +hit this line in vunmap, causing the crash: + BUG_ON(in_interrupt()); + +This patch reenables BH to release the buffer. + +Log messages when the bug is hit: + kernel BUG at mm/vmalloc.c:2727! + invalid opcode: 0000 [#1] PREEMPT SMP NOPTI + CPU: 6 PID: 1462 Comm: NetworkManager Kdump: loaded Tainted: G I --------- --- 5.14.0-119.el9.x86_64 #1 + Hardware name: Dell Inc. PowerEdge R740/06WXJT, BIOS 2.8.2 08/27/2020 + RIP: 0010:vunmap+0x2e/0x30 + ...skip... + Call Trace: + __iommu_dma_free+0x96/0x100 + efx_nic_free_buffer+0x2b/0x40 [sfc] + efx_ef10_try_update_nic_stats_vf+0x14a/0x1c0 [sfc] + efx_ef10_update_stats_vf+0x18/0x40 [sfc] + efx_start_all+0x15e/0x1d0 [sfc] + efx_net_open+0x5a/0xe0 [sfc] + __dev_open+0xe7/0x1a0 + __dev_change_flags+0x1d7/0x240 + dev_change_flags+0x21/0x60 + ...skip... + +Fixes: d778819609a2 ("sfc: DMA the VF stats only when requested") +Reported-by: Ma Yuying +Signed-off-by: Íñigo Huguet +Acked-by: Edward Cree +Link: https://lore.kernel.org/r/20220713092116.21238-1-ihuguet@redhat.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/sfc/ef10.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c +index fa1a872c4bc8..5b7413305be6 100644 +--- a/drivers/net/ethernet/sfc/ef10.c ++++ b/drivers/net/ethernet/sfc/ef10.c +@@ -1916,7 +1916,10 @@ static int efx_ef10_try_update_nic_stats_vf(struct efx_nic *efx) + + efx_update_sw_stats(efx, stats); + out: ++ /* releasing a DMA coherent buffer with BH disabled can panic */ ++ spin_unlock_bh(&efx->stats_lock); + efx_nic_free_buffer(efx, &stats_buf); ++ spin_lock_bh(&efx->stats_lock); + return rc; + } + +-- +2.35.1 + diff --git a/queue-5.10/sfc-fix-use-after-free-when-disabling-sriov.patch b/queue-5.10/sfc-fix-use-after-free-when-disabling-sriov.patch new file mode 100644 index 00000000000..c93e317a1ca --- /dev/null +++ b/queue-5.10/sfc-fix-use-after-free-when-disabling-sriov.patch @@ -0,0 +1,113 @@ +From 7c10c0c3145b6cc726ad3835cd6e7d2292966bcb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 12 Jul 2022 08:26:42 +0200 +Subject: sfc: fix use after free when disabling sriov +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Íñigo Huguet + +[ Upstream commit ebe41da5d47ac0fff877e57bd14c54dccf168827 ] + +Use after free is detected by kfence when disabling sriov. What was read +after being freed was vf->pci_dev: it was freed from pci_disable_sriov +and later read in efx_ef10_sriov_free_vf_vports, called from +efx_ef10_sriov_free_vf_vswitching. + +Set the pointer to NULL at release time to not trying to read it later. + +Reproducer and dmesg log (note that kfence doesn't detect it every time): +$ echo 1 > /sys/class/net/enp65s0f0np0/device/sriov_numvfs +$ echo 0 > /sys/class/net/enp65s0f0np0/device/sriov_numvfs + + BUG: KFENCE: use-after-free read in efx_ef10_sriov_free_vf_vswitching+0x82/0x170 [sfc] + + Use-after-free read at 0x00000000ff3c1ba5 (in kfence-#224): + efx_ef10_sriov_free_vf_vswitching+0x82/0x170 [sfc] + efx_ef10_pci_sriov_disable+0x38/0x70 [sfc] + efx_pci_sriov_configure+0x24/0x40 [sfc] + sriov_numvfs_store+0xfe/0x140 + kernfs_fop_write_iter+0x11c/0x1b0 + new_sync_write+0x11f/0x1b0 + vfs_write+0x1eb/0x280 + ksys_write+0x5f/0xe0 + do_syscall_64+0x5c/0x80 + entry_SYSCALL_64_after_hwframe+0x44/0xae + + kfence-#224: 0x00000000edb8ef95-0x00000000671f5ce1, size=2792, cache=kmalloc-4k + + allocated by task 6771 on cpu 10 at 3137.860196s: + pci_alloc_dev+0x21/0x60 + pci_iov_add_virtfn+0x2a2/0x320 + sriov_enable+0x212/0x3e0 + efx_ef10_sriov_configure+0x67/0x80 [sfc] + efx_pci_sriov_configure+0x24/0x40 [sfc] + sriov_numvfs_store+0xba/0x140 + kernfs_fop_write_iter+0x11c/0x1b0 + new_sync_write+0x11f/0x1b0 + vfs_write+0x1eb/0x280 + ksys_write+0x5f/0xe0 + do_syscall_64+0x5c/0x80 + entry_SYSCALL_64_after_hwframe+0x44/0xae + + freed by task 6771 on cpu 12 at 3170.991309s: + device_release+0x34/0x90 + kobject_cleanup+0x3a/0x130 + pci_iov_remove_virtfn+0xd9/0x120 + sriov_disable+0x30/0xe0 + efx_ef10_pci_sriov_disable+0x57/0x70 [sfc] + efx_pci_sriov_configure+0x24/0x40 [sfc] + sriov_numvfs_store+0xfe/0x140 + kernfs_fop_write_iter+0x11c/0x1b0 + new_sync_write+0x11f/0x1b0 + vfs_write+0x1eb/0x280 + ksys_write+0x5f/0xe0 + do_syscall_64+0x5c/0x80 + entry_SYSCALL_64_after_hwframe+0x44/0xae + +Fixes: 3c5eb87605e85 ("sfc: create vports for VFs and assign random MAC addresses") +Reported-by: Yanghang Liu +Signed-off-by: Íñigo Huguet +Acked-by: Martin Habets +Link: https://lore.kernel.org/r/20220712062642.6915-1-ihuguet@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/sfc/ef10_sriov.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c +index 84041cd587d7..b44acb6e3953 100644 +--- a/drivers/net/ethernet/sfc/ef10_sriov.c ++++ b/drivers/net/ethernet/sfc/ef10_sriov.c +@@ -411,8 +411,9 @@ static int efx_ef10_pci_sriov_enable(struct efx_nic *efx, int num_vfs) + static int efx_ef10_pci_sriov_disable(struct efx_nic *efx, bool force) + { + struct pci_dev *dev = efx->pci_dev; ++ struct efx_ef10_nic_data *nic_data = efx->nic_data; + unsigned int vfs_assigned = pci_vfs_assigned(dev); +- int rc = 0; ++ int i, rc = 0; + + if (vfs_assigned && !force) { + netif_info(efx, drv, efx->net_dev, "VFs are assigned to guests; " +@@ -420,10 +421,13 @@ static int efx_ef10_pci_sriov_disable(struct efx_nic *efx, bool force) + return -EBUSY; + } + +- if (!vfs_assigned) ++ if (!vfs_assigned) { ++ for (i = 0; i < efx->vf_count; i++) ++ nic_data->vf[i].pci_dev = NULL; + pci_disable_sriov(dev); +- else ++ } else { + rc = -EBUSY; ++ } + + efx_ef10_sriov_free_vf_vswitching(efx); + efx->vf_count = 0; +-- +2.35.1 + diff --git a/queue-5.10/spi-amd-limit-max-transfer-and-message-size.patch b/queue-5.10/spi-amd-limit-max-transfer-and-message-size.patch new file mode 100644 index 00000000000..9750e3b71de --- /dev/null +++ b/queue-5.10/spi-amd-limit-max-transfer-and-message-size.patch @@ -0,0 +1,70 @@ +From 926a7b1ea97b097442d7e27da875584fef717e91 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 13:06:22 +0300 +Subject: spi: amd: Limit max transfer and message size + +From: Cristian Ciocaltea + +[ Upstream commit 6ece49c56965544262523dae4a071ace3db63507 ] + +Enabling the SPI CS35L41 audio codec driver for Steam Deck [1] +revealed a problem with the current AMD SPI controller driver +implementation, consisting of an unrecoverable system hang. + +The issue can be prevented if we ensure the max transfer size +and the max message size do not exceed the FIFO buffer size. + +According to the implementation of the downstream driver, the +AMD SPI controller is not able to handle more than 70 bytes per +transfer, which corresponds to the size of the FIFO buffer. + +Hence, let's fix this by setting the SPI limits mentioned above. + +[1] https://lore.kernel.org/r/20220621213819.262537-1-cristian.ciocaltea@collabora.com + +Reported-by: Anastasios Vacharakis +Fixes: bbb336f39efc ("spi: spi-amd: Add AMD SPI controller driver support") +Signed-off-by: Cristian Ciocaltea +Link: https://lore.kernel.org/r/20220706100626.1234731-2-cristian.ciocaltea@collabora.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-amd.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c +index 7f629544060d..a027cfd49df8 100644 +--- a/drivers/spi/spi-amd.c ++++ b/drivers/spi/spi-amd.c +@@ -28,6 +28,7 @@ + #define AMD_SPI_RX_COUNT_REG 0x4B + #define AMD_SPI_STATUS_REG 0x4C + ++#define AMD_SPI_FIFO_SIZE 70 + #define AMD_SPI_MEM_SIZE 200 + + /* M_CMD OP codes for SPI */ +@@ -245,6 +246,11 @@ static int amd_spi_master_transfer(struct spi_master *master, + return 0; + } + ++static size_t amd_spi_max_transfer_size(struct spi_device *spi) ++{ ++ return AMD_SPI_FIFO_SIZE; ++} ++ + static int amd_spi_probe(struct platform_device *pdev) + { + struct device *dev = &pdev->dev; +@@ -278,6 +284,8 @@ static int amd_spi_probe(struct platform_device *pdev) + master->flags = SPI_MASTER_HALF_DUPLEX; + master->setup = amd_spi_master_setup; + master->transfer_one_message = amd_spi_master_transfer; ++ master->max_transfer_size = amd_spi_max_transfer_size; ++ master->max_message_size = amd_spi_max_transfer_size; + + /* Register the controller with SPI framework */ + err = devm_spi_register_master(dev, master); +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_dointvec.patch b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec.patch new file mode 100644 index 00000000000..264d4b7112e --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec.patch @@ -0,0 +1,51 @@ +From a4cdd05d79bedec625d94c0c8963231882c2d9b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:52 -0700 +Subject: sysctl: Fix data races in proc_dointvec(). + +From: Kuniyuki Iwashima + +[ Upstream commit 1f1be04b4d48a2475ea1aab46a99221bfc5c0968 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_dointvec() to use READ_ONCE() and WRITE_ONCE() +internally to fix data-races on the sysctl side. For now, proc_dointvec() +itself is tolerant to a data-race, but we still need to add annotations on +the other subsystem's side. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 8832440a4938..81657b13bd53 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -557,14 +557,14 @@ static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp, + if (*negp) { + if (*lvalp > (unsigned long) INT_MAX + 1) + return -EINVAL; +- *valp = -*lvalp; ++ WRITE_ONCE(*valp, -*lvalp); + } else { + if (*lvalp > (unsigned long) INT_MAX) + return -EINVAL; +- *valp = *lvalp; ++ WRITE_ONCE(*valp, *lvalp); + } + } else { +- int val = *valp; ++ int val = READ_ONCE(*valp); + if (val < 0) { + *negp = true; + *lvalp = -(unsigned long)val; +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_jiffies.patch b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_jiffies.patch new file mode 100644 index 00000000000..35340855b4a --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_jiffies.patch @@ -0,0 +1,48 @@ +From 2967c03a87fabd7a23c44179b153d25c69bed0c6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:57 -0700 +Subject: sysctl: Fix data races in proc_dointvec_jiffies(). + +From: Kuniyuki Iwashima + +[ Upstream commit e877820877663fbae8cb9582ea597a7230b94df3 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_dointvec_jiffies() to use READ_ONCE() and +WRITE_ONCE() internally to fix data-races on the sysctl side. For now, +proc_dointvec_jiffies() itself is tolerant to a data-race, but we still +need to add annotations on the other subsystem's side. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index e7409788db64..83241a56539b 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -1276,9 +1276,12 @@ static int do_proc_dointvec_jiffies_conv(bool *negp, unsigned long *lvalp, + if (write) { + if (*lvalp > INT_MAX / HZ) + return 1; +- *valp = *negp ? -(*lvalp*HZ) : (*lvalp*HZ); ++ if (*negp) ++ WRITE_ONCE(*valp, -*lvalp * HZ); ++ else ++ WRITE_ONCE(*valp, *lvalp * HZ); + } else { +- int val = *valp; ++ int val = READ_ONCE(*valp); + unsigned long lval; + if (val < 0) { + *negp = true; +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_minmax.patch b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_minmax.patch new file mode 100644 index 00000000000..52905febaa7 --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_minmax.patch @@ -0,0 +1,42 @@ +From d35978c14844f6ecca5d08bbbcd5779331a3faec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:54 -0700 +Subject: sysctl: Fix data races in proc_dointvec_minmax(). + +From: Kuniyuki Iwashima + +[ Upstream commit f613d86d014b6375a4085901de39406598121e35 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_dointvec_minmax() to use READ_ONCE() and +WRITE_ONCE() internally to fix data-races on the sysctl side. For now, +proc_dointvec_minmax() itself is tolerant to a data-race, but we still +need to add annotations on the other subsystem's side. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 30681afbdb70..1800907da60c 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -959,7 +959,7 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp, + if ((param->min && *param->min > tmp) || + (param->max && *param->max < tmp)) + return -EINVAL; +- *valp = tmp; ++ WRITE_ONCE(*valp, tmp); + } + + return 0; +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_ms_jiffies.patch b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_ms_jiffies.patch new file mode 100644 index 00000000000..0a1a86216ef --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_dointvec_ms_jiffies.patch @@ -0,0 +1,56 @@ +From 376aba7265d60057c28fc41a4581d6ee5b8c0e8f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Jul 2022 17:15:20 -0700 +Subject: sysctl: Fix data-races in proc_dointvec_ms_jiffies(). + +From: Kuniyuki Iwashima + +[ Upstream commit 7d1025e559782b58824b36cb8ad547a69f2e4b31 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_dointvec_ms_jiffies() to use READ_ONCE() and +WRITE_ONCE() internally to fix data-races on the sysctl side. For now, +proc_dointvec_ms_jiffies() itself is tolerant to a data-race, but we still +need to add annotations on the other subsystem's side. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 83241a56539b..642dc51b6503 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -1327,9 +1327,9 @@ static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp, + + if (jif > INT_MAX) + return 1; +- *valp = (int)jif; ++ WRITE_ONCE(*valp, (int)jif); + } else { +- int val = *valp; ++ int val = READ_ONCE(*valp); + unsigned long lval; + if (val < 0) { + *negp = true; +@@ -1397,8 +1397,8 @@ int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write, + * @ppos: the current position in the file + * + * Reads/writes up to table->maxlen/sizeof(unsigned int) integer +- * values from/to the user buffer, treated as an ASCII string. +- * The values read are assumed to be in 1/1000 seconds, and ++ * values from/to the user buffer, treated as an ASCII string. ++ * The values read are assumed to be in 1/1000 seconds, and + * are converted into jiffies. + * + * Returns 0 on success. +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_douintvec.patch b/queue-5.10/sysctl-fix-data-races-in-proc_douintvec.patch new file mode 100644 index 00000000000..19c702a6972 --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_douintvec.patch @@ -0,0 +1,45 @@ +From 5920e2ab7b952d27b84ca34993c3767aef791812 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:53 -0700 +Subject: sysctl: Fix data races in proc_douintvec(). + +From: Kuniyuki Iwashima + +[ Upstream commit 4762b532ec9539755aab61445d5da6e1926ccb99 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_douintvec() to use READ_ONCE() and WRITE_ONCE() +internally to fix data-races on the sysctl side. For now, proc_douintvec() +itself is tolerant to a data-race, but we still need to add annotations on +the other subsystem's side. + +Fixes: e7d316a02f68 ("sysctl: handle error writing UINT_MAX to u32 fields") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 81657b13bd53..30681afbdb70 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -583,9 +583,9 @@ static int do_proc_douintvec_conv(unsigned long *lvalp, + if (write) { + if (*lvalp > UINT_MAX) + return -EINVAL; +- *valp = *lvalp; ++ WRITE_ONCE(*valp, *lvalp); + } else { +- unsigned int val = *valp; ++ unsigned int val = READ_ONCE(*valp); + *lvalp = (unsigned long)val; + } + return 0; +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_douintvec_minmax.patch b/queue-5.10/sysctl-fix-data-races-in-proc_douintvec_minmax.patch new file mode 100644 index 00000000000..d71c58aad93 --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_douintvec_minmax.patch @@ -0,0 +1,42 @@ +From 64f28e6c8fdf0752cb3710867dbbfb110809adae Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:55 -0700 +Subject: sysctl: Fix data races in proc_douintvec_minmax(). + +From: Kuniyuki Iwashima + +[ Upstream commit 2d3b559df3ed39258737789aae2ae7973d205bc1 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_douintvec_minmax() to use READ_ONCE() and +WRITE_ONCE() internally to fix data-races on the sysctl side. For now, +proc_douintvec_minmax() itself is tolerant to a data-race, but we still +need to add annotations on the other subsystem's side. + +Fixes: 61d9b56a8920 ("sysctl: add unsigned int range support") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 1800907da60c..df6090ba1d0b 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -1025,7 +1025,7 @@ static int do_proc_douintvec_minmax_conv(unsigned long *lvalp, + (param->max && *param->max < tmp)) + return -ERANGE; + +- *valp = tmp; ++ WRITE_ONCE(*valp, tmp); + } + + return 0; +-- +2.35.1 + diff --git a/queue-5.10/sysctl-fix-data-races-in-proc_doulongvec_minmax.patch b/queue-5.10/sysctl-fix-data-races-in-proc_doulongvec_minmax.patch new file mode 100644 index 00000000000..2c993a5516f --- /dev/null +++ b/queue-5.10/sysctl-fix-data-races-in-proc_doulongvec_minmax.patch @@ -0,0 +1,45 @@ +From afa64aee5e9acb9a176c29c507ea47df50082e36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:56 -0700 +Subject: sysctl: Fix data races in proc_doulongvec_minmax(). + +From: Kuniyuki Iwashima + +[ Upstream commit c31bcc8fb89fc2812663900589c6325ba35d9a65 ] + +A sysctl variable is accessed concurrently, and there is always a chance +of data-race. So, all readers and writers need some basic protection to +avoid load/store-tearing. + +This patch changes proc_doulongvec_minmax() to use READ_ONCE() and +WRITE_ONCE() internally to fix data-races on the sysctl side. For now, +proc_doulongvec_minmax() itself is tolerant to a data-race, but we still +need to add annotations on the other subsystem's side. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + kernel/sysctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index df6090ba1d0b..e7409788db64 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -1193,9 +1193,9 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, + err = -EINVAL; + break; + } +- *i = val; ++ WRITE_ONCE(*i, val); + } else { +- val = convdiv * (*i) / convmul; ++ val = convdiv * READ_ONCE(*i) / convmul; + if (!first) + proc_put_char(&buffer, &left, '\t'); + proc_put_long(&buffer, &left, val, false); +-- +2.35.1 + diff --git a/queue-5.10/tcp-fix-a-data-race-around-sysctl_tcp_max_orphans.patch b/queue-5.10/tcp-fix-a-data-race-around-sysctl_tcp_max_orphans.patch new file mode 100644 index 00000000000..70687c6c569 --- /dev/null +++ b/queue-5.10/tcp-fix-a-data-race-around-sysctl_tcp_max_orphans.patch @@ -0,0 +1,37 @@ +From d59dd1c06c0cc76436ea0a6b88a5ab4fcd5b0120 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Jul 2022 16:39:58 -0700 +Subject: tcp: Fix a data-race around sysctl_tcp_max_orphans. + +From: Kuniyuki Iwashima + +[ Upstream commit 47e6ab24e8c6e3ca10ceb5835413f401f90de4bf ] + +While reading sysctl_tcp_max_orphans, it can be changed concurrently. +So, we need to add READ_ONCE() to avoid a data-race. + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Kuniyuki Iwashima +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + net/ipv4/tcp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c +index a3ec2a08027b..19c13ad5c121 100644 +--- a/net/ipv4/tcp.c ++++ b/net/ipv4/tcp.c +@@ -2490,7 +2490,8 @@ static void tcp_orphan_update(struct timer_list *unused) + + static bool tcp_too_many_orphans(int shift) + { +- return READ_ONCE(tcp_orphan_cache) << shift > sysctl_tcp_max_orphans; ++ return READ_ONCE(tcp_orphan_cache) << shift > ++ READ_ONCE(sysctl_tcp_max_orphans); + } + + bool tcp_check_oom(struct sock *sk, int shift) +-- +2.35.1 + -- 2.47.3