Linux-stable-mirror July 2023

linux-stable-mirror@lists.linaro.org

431 participants
1282 discussions

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.37 release. There are 33 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 02 Jul 2023 07:21:12 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.37-rc3… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.1.37-rc3 Linus Torvalds <torvalds(a)linux-foundation.org> csky: fix up lock_mm_and_find_vma() conversion Linus Torvalds <torvalds(a)linux-foundation.org> parisc: fix expand_stack() conversion Linus Torvalds <torvalds(a)linux-foundation.org> sparc32: fix lock_mm_and_find_vma() conversion Ricardo Cañuelo <ricardo.canuelo(a)collabora.com> Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe" Mike Hommey <mh(a)glandium.org> HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651. Jason Gerecke <jason.gerecke(a)wacom.com> HID: wacom: Use ktime_t rather than int when dealing with timestamps Ludvig Michaelsson <ludvig.michaelsson(a)yubico.com> HID: hidraw: fix data race on device refcount Zhang Shurong <zhang_shurong(a)foxmail.com> fbdev: fix potential OOB read in fast_imageblit() Linus Torvalds <torvalds(a)linux-foundation.org> mm: always expand the stack with the mmap write lock held Linus Torvalds <torvalds(a)linux-foundation.org> execve: expand new process stack manually ahead of time Liam R. Howlett <Liam.Howlett(a)oracle.com> mm: make find_extend_vma() fail if write lock not held Linus Torvalds <torvalds(a)linux-foundation.org> powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma() Linus Torvalds <torvalds(a)linux-foundation.org> mm/fault: convert remaining simple cases to lock_mm_and_find_vma() Ben Hutchings <ben(a)decadent.org.uk> arm/mm: Convert to using lock_mm_and_find_vma() Ben Hutchings <ben(a)decadent.org.uk> riscv/mm: Convert to using lock_mm_and_find_vma() Ben Hutchings <ben(a)decadent.org.uk> mips/mm: Convert to using lock_mm_and_find_vma() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/mm: Convert to using lock_mm_and_find_vma() Linus Torvalds <torvalds(a)linux-foundation.org> arm64/mm: Convert to using lock_mm_and_find_vma() Linus Torvalds <torvalds(a)linux-foundation.org> mm: make the page fault mmap locking killable Linus Torvalds <torvalds(a)linux-foundation.org> mm: introduce new 'lock_mm_and_find_vma()' page fault helper Peng Zhang <zhangpeng.00(a)bytedance.com> maple_tree: fix potential out-of-bounds access in mas_wr_end_piv() Oliver Hartkopp <socketcan(a)hartkopp.net> can: isotp: isotp_sendmsg(): fix return error fix on TX path Thomas Gleixner <tglx(a)linutronix.de> x86/smp: Cure kexec() vs. mwait_play_dead() breakage Thomas Gleixner <tglx(a)linutronix.de> x86/smp: Use dedicated cache-line for mwait_play_dead() Thomas Gleixner <tglx(a)linutronix.de> x86/smp: Remove pointless wmb()s from native_stop_other_cpus() Tony Battersby <tonyb(a)cybernetics.com> x86/smp: Dont access non-existing CPUID leaf Thomas Gleixner <tglx(a)linutronix.de> x86/smp: Make stop_other_cpus() more robust Borislav Petkov (AMD) <bp(a)alien8.de> x86/microcode/AMD: Load late on both threads too Tony Luck <tony.luck(a)intel.com> mm, hwpoison: when copy-on-write hits poison, take page offline Tony Luck <tony.luck(a)intel.com> mm, hwpoison: try to recover from copy-on write faults Paolo Abeni <pabeni(a)redhat.com> mptcp: ensure listener is unhashed before updating the sk status David Woodhouse <dwmw(a)amazon.co.uk> mm/mmap: Fix error return in do_vmi_align_munmap() Liam R. Howlett <Liam.Howlett(a)oracle.com> mm/mmap: Fix error path in do_vmi_align_munmap() ------------- Diffstat: Makefile | 4 +- arch/alpha/Kconfig | 1 + arch/alpha/mm/fault.c | 13 +-- arch/arc/Kconfig | 1 + arch/arc/mm/fault.c | 11 +-- arch/arm/Kconfig | 1 + arch/arm/mm/fault.c | 63 +++----------- arch/arm64/Kconfig | 1 + arch/arm64/mm/fault.c | 46 ++-------- arch/csky/Kconfig | 1 + arch/csky/mm/fault.c | 22 ++--- arch/hexagon/Kconfig | 1 + arch/hexagon/mm/vm_fault.c | 18 +--- arch/ia64/mm/fault.c | 36 ++------ arch/loongarch/Kconfig | 1 + arch/loongarch/mm/fault.c | 16 ++-- arch/m68k/mm/fault.c | 9 +- arch/microblaze/mm/fault.c | 5 +- arch/mips/Kconfig | 1 + arch/mips/mm/fault.c | 12 +-- arch/nios2/Kconfig | 1 + arch/nios2/mm/fault.c | 17 +--- arch/openrisc/mm/fault.c | 5 +- arch/parisc/mm/fault.c | 23 +++-- arch/powerpc/Kconfig | 1 + arch/powerpc/mm/copro_fault.c | 14 +-- arch/powerpc/mm/fault.c | 39 +-------- arch/riscv/Kconfig | 1 + arch/riscv/mm/fault.c | 31 +++---- arch/s390/mm/fault.c | 5 +- arch/sh/Kconfig | 1 + arch/sh/mm/fault.c | 17 +--- arch/sparc/Kconfig | 1 + arch/sparc/mm/fault_32.c | 32 ++----- arch/sparc/mm/fault_64.c | 8 +- arch/um/kernel/trap.c | 11 +-- arch/x86/Kconfig | 1 + arch/x86/include/asm/cpu.h | 2 + arch/x86/include/asm/smp.h | 2 + arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/process.c | 28 +++++- arch/x86/kernel/smp.c | 73 ++++++++++------ arch/x86/kernel/smpboot.c | 81 ++++++++++++++++-- arch/x86/mm/fault.c | 52 +----------- arch/xtensa/Kconfig | 1 + arch/xtensa/mm/fault.c | 14 +-- drivers/hid/hid-logitech-hidpp.c | 2 +- drivers/hid/hidraw.c | 9 +- drivers/hid/wacom_wac.c | 6 +- drivers/hid/wacom_wac.h | 2 +- drivers/iommu/amd/iommu_v2.c | 4 +- drivers/iommu/io-pgfault.c | 2 +- drivers/thermal/mtk_thermal.c | 14 +-- drivers/video/fbdev/core/sysimgblt.c | 2 +- fs/binfmt_elf.c | 6 +- fs/exec.c | 38 +++++---- include/linux/highmem.h | 26 ++++++ include/linux/mm.h | 21 ++--- lib/maple_tree.c | 11 +-- mm/Kconfig | 4 + mm/gup.c | 6 +- mm/memory.c | 159 ++++++++++++++++++++++++++++++++--- mm/mmap.c | 154 +++++++++++++++++++++++++-------- mm/nommu.c | 17 ++-- net/can/isotp.c | 5 +- net/mptcp/pm_netlink.c | 1 + net/mptcp/protocol.c | 26 ++++-- 67 files changed, 682 insertions(+), 559 deletions(-)

1 year, 2 months

[PATCH net] net/ipv6: Reduce chance of collisions in inet6_hashfn()

by Samuel Mendoza-Jonas

From: Stewart Smith <trawets(a)amazon.com> For both IPv4 and IPv6 incoming TCP connections are tracked in a hash table with a hash over the source & destination addresses and ports. However, the IPv6 hash is insufficient and can lead to a high rate of collisions. The IPv6 hash used an XOR to fit everything into the 96 bits for the fast jenkins hash, meaning it is possible for an external entity to ensure the hash collides, thus falling back to a linear search in the bucket, which is slow. We take the approach of hash half the data; hash the other half; and then hash them together. We do this with 3x jenkins hashes rather than 2x to calculate the hashing value for the connection covering the full length of the addresses and ports. While this may look like it adds overhead, the reality of modern CPUs means that this is unmeasurable in real world scenarios. In simulating with llvm-mca, the increase in cycles for the hashing code was ~5 cycles on Skylake (from a base of ~50), and an extra ~9 on Nehalem (base of ~62). In commit dd6d2910c5e0 ("netfilter: conntrack: switch to siphash") netfilter switched from a jenkins hash to a siphash, but even the faster hsiphash is a more significant overhead (~20-30%) in some preliminary testing. So, in this patch, we keep to the more conservative approach to ensure we don't add much overhead per SYN. In testing, this results in a consistently even spread across the connection buckets. In both testing and real-world scenarios, we have not found any measurable performance impact. Cc: stable(a)vger.kernel.org Fixes: 08dcdbf6a7b9 ("ipv6: use a stronger hash for tcp") Fixes: b3da2cf37c5c ("[INET]: Use jhash + random secret for ehash.") Signed-off-by: Stewart Smith <trawets(a)amazon.com> Signed-off-by: Samuel Mendoza-Jonas <samjonas(a)amazon.com> --- include/net/ipv6.h | 4 +--- net/ipv6/inet6_hashtables.c | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 7332296eca44..f9bb54869d82 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -752,9 +752,7 @@ static inline u32 ipv6_addr_hash(const struct in6_addr *a) /* more secured version of ipv6_addr_hash() */ static inline u32 __ipv6_addr_jhash(const struct in6_addr *a, const u32 initval) { - u32 v = (__force u32)a->s6_addr32[0] ^ (__force u32)a->s6_addr32[1]; - - return jhash_3words(v, + return jhash_3words((__force u32)a->s6_addr32[1], (__force u32)a->s6_addr32[2], (__force u32)a->s6_addr32[3], initval); diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index b64b49012655..bb7198081974 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -33,7 +33,10 @@ u32 inet6_ehashfn(const struct net *net, net_get_random_once(&inet6_ehash_secret, sizeof(inet6_ehash_secret)); net_get_random_once(&ipv6_hash_secret, sizeof(ipv6_hash_secret)); - lhash = (__force u32)laddr->s6_addr32[3]; + lhash = jhash_3words((__force u32)laddr->s6_addr32[3], + (((u32)lport) << 16) | (__force u32)fport, + (__force u32)faddr->s6_addr32[0], + ipv6_hash_secret); fhash = __ipv6_addr_jhash(faddr, ipv6_hash_secret); return __inet6_ehashfn(lhash, lport, fhash, fport, -- 2.25.1

1 year, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2023