June 2023 - Linux-stable-mirror

[PATCH] powerpc/boot: Disable power10 features after BOOTAFLAGS assignment

by Nathan Chancellor

When building the boot wrapper assembly files with clang after commit 648a1783fe25 ("powerpc/boot: Fix boot wrapper code generation with CONFIG_POWER10_CPU"), the following warnings appear for each file built: '-prefixed' is not a recognized feature for this target (ignoring feature) '-pcrel' is not a recognized feature for this target (ignoring feature) While it is questionable whether or not LLVM should be emitting a warning when passed negative versions of code generation flags when building assembly files (since it does not emit a warning for the altivec and vsx flags), it is easy enough to work around this by just moving the disabled flags to BOOTCFLAGS after the assignment of BOOTAFLAGS, so that they are not added when building assembly files. Do so to silence the warnings. Cc: stable(a)vger.kernel.org Fixes: 648a1783fe25 ("powerpc/boot: Fix boot wrapper code generation with CONFIG_POWER10_CPU") Link: https://github.com/ClangBuiltLinux/linux/issues/1839 Reviewed-by: Nicholas Piggin <npiggin(a)gmail.com> Signed-off-by: Nathan Chancellor <nathan(a)kernel.org> --- I do not think that 648a1783fe25 is truly to blame for this but the Fixes tag will help the stable team ensure that this change gets backported with 648a1783fe25. This is the minimal fix for the problem but the true fix is separating AFLAGS and CFLAGS, which should be done by this in-flight series by Nick: https://lore.kernel.org/20230426055848.402993-1-npiggin@gmail.com/ --- arch/powerpc/boot/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 85cde5bf04b7..771b79423bbc 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -34,8 +34,6 @@ endif BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \ - $(call cc-option,-mno-prefixed) $(call cc-option,-mno-pcrel) \ - $(call cc-option,-mno-mma) \ $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \ -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ $(LINUXINCLUDE) @@ -71,6 +69,10 @@ BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc BOOTARFLAGS := -crD +BOOTCFLAGS += $(call cc-option,-mno-prefixed) \ + $(call cc-option,-mno-pcrel) \ + $(call cc-option,-mno-mma) + ifdef CONFIG_CC_IS_CLANG BOOTCFLAGS += $(CLANG_FLAGS) BOOTAFLAGS += $(CLANG_FLAGS) --- base-commit: 169f8997968ab620d750d9a45e15c5288d498356 change-id: 20230427-remove-power10-args-from-boot-aflags-clang-268c43e8c1fc Best regards, -- Nathan Chancellor <nathan(a)kernel.org>

1 year, 5 months

2
1
0 0

[PATCH v2] powerpc/bpf: populate extable entries only during the last pass

by Hari Bathini

Since commit 85e031154c7c ("powerpc/bpf: Perform complete extra passes to update addresses"), two additional passes are performed to avoid space and CPU time wastage on powerpc. But these extra passes led to WARN_ON_ONCE() hits in bpf_add_extable_entry() as extable entries are populated again, during the extra pass, without resetting the index. Fix it by resetting entry index before repopulating extable entries, if and when there is an additional pass. Fixes: 85e031154c7c ("powerpc/bpf: Perform complete extra passes to update addresses") Cc: stable(a)vger.kernel.org Signed-off-by: Hari Bathini <hbathini(a)linux.ibm.com> --- arch/powerpc/net/bpf_jit_comp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index e93aefcfb83f..37043dfc1add 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -101,6 +101,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) bpf_hdr = jit_data->header; proglen = jit_data->proglen; extra_pass = true; + /* During extra pass, ensure index is reset before repopulating extable entries */ + cgctx.exentry_idx = 0; goto skip_init_ctx; } -- 2.40.0

1 year, 5 months

3
2
0 0

[PATCH 6.4 00/31] 6.4.1-rc3 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.4.1 release. There are 31 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:20:45 +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.4.1-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.4.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.4.1-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. 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() Hugh Dickins <hughd(a)google.com> mm/khugepaged: fix regression in collapse_file() Linus Torvalds <torvalds(a)linux-foundation.org> gup: add warning if some caller would seem to want stack expansion Jason Gerecke <jason.gerecke(a)wacom.com> HID: wacom: Use ktime_t rather than int when dealing with timestamps 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 Wyes Karny <wyes.karny(a)amd.com> cpufreq: amd-pstate: Make amd-pstate EPP driver name hyphenated 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 ------------- 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 | 47 ++--------- 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/cpufreq/amd-pstate.c | 2 +- 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/iommu-sva.c | 2 +- drivers/thermal/mediatek/auxadc_thermal.c | 14 +--- drivers/video/fbdev/core/sysimgblt.c | 2 +- fs/binfmt_elf.c | 6 +- fs/exec.c | 38 +++++---- include/linux/mm.h | 16 ++-- lib/maple_tree.c | 11 +-- mm/Kconfig | 4 + mm/gup.c | 14 +++- mm/khugepaged.c | 7 +- mm/memory.c | 127 ++++++++++++++++++++++++++++++ mm/mmap.c | 121 ++++++++++++++++++++++++---- mm/nommu.c | 17 ++-- net/can/isotp.c | 5 +- 66 files changed, 605 insertions(+), 531 deletions(-)

1 year, 5 months

6
5
0 0

[PATCH 6.3 00/32] 6.3.11-rc4 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.3.11 release. There are 32 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:08 +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.3.11-rc4… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.3.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.3.11-rc4 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> gup: add warning if some caller would seem to want stack expansion 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 Wyes Karny <wyes.karny(a)amd.com> cpufreq: amd-pstate: Make amd-pstate EPP driver name hyphenated 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 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/cpufreq/amd-pstate.c | 2 +- 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/iommu-sva.c | 2 +- drivers/thermal/mediatek/auxadc_thermal.c | 14 +-- drivers/video/fbdev/core/sysimgblt.c | 2 +- fs/binfmt_elf.c | 6 +- fs/exec.c | 38 ++++---- include/linux/mm.h | 16 ++-- lib/maple_tree.c | 11 ++- mm/Kconfig | 4 + mm/gup.c | 14 ++- mm/memory.c | 127 +++++++++++++++++++++++++ mm/mmap.c | 153 +++++++++++++++++++++++------- mm/nommu.c | 17 ++-- net/can/isotp.c | 5 +- 65 files changed, 616 insertions(+), 544 deletions(-)

1 year, 5 months

6
5
0 0

[PATCH 6.1 00/33] 6.1.37-rc3 review

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, 5 months

7
6
0 0

[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, 5 months

3
3
0 0

[PATCH] f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue

by Jaegeuk Kim

This reverts commit 27161f13e3c3 "f2fs: avoid race in between read xattr & write xattr". That introduced a deadlock case: Thread #1: [122554.641906][ T92] f2fs_getxattr+0xd4/0x5fc -> waiting for f2fs_down_read(&F2FS_I(inode)->i_xattr_sem); [122554.641927][ T92] __f2fs_get_acl+0x50/0x284 [122554.641948][ T92] f2fs_init_acl+0x84/0x54c [122554.641969][ T92] f2fs_init_inode_metadata+0x460/0x5f0 [122554.641990][ T92] f2fs_add_inline_entry+0x11c/0x350 -> Locked dir->inode_page by f2fs_get_node_page() [122554.642009][ T92] f2fs_do_add_link+0x100/0x1e4 [122554.642025][ T92] f2fs_create+0xf4/0x22c [122554.642047][ T92] vfs_create+0x130/0x1f4 Thread #2: [123996.386358][ T92] __get_node_page+0x8c/0x504 -> waiting for dir->inode_page lock [123996.386383][ T92] read_all_xattrs+0x11c/0x1f4 [123996.386405][ T92] __f2fs_setxattr+0xcc/0x528 [123996.386424][ T92] f2fs_setxattr+0x158/0x1f4 -> f2fs_down_write(&F2FS_I(inode)->i_xattr_sem); [123996.386443][ T92] __f2fs_set_acl+0x328/0x430 [123996.386618][ T92] f2fs_set_acl+0x38/0x50 [123996.386642][ T92] posix_acl_chmod+0xc8/0x1c8 [123996.386669][ T92] f2fs_setattr+0x5e0/0x6bc [123996.386689][ T92] notify_change+0x4d8/0x580 [123996.386717][ T92] chmod_common+0xd8/0x184 [123996.386748][ T92] do_fchmodat+0x60/0x124 [123996.386766][ T92] __arm64_sys_fchmodat+0x28/0x3c Let's take a look at the original issue back. Thread A: Thread B: -f2fs_getxattr -lookup_all_xattrs -xnid = F2FS_I(inode)->i_xattr_nid; -f2fs_setxattr -__f2fs_setxattr -write_all_xattrs -truncate_xattr_node ... ... -write_checkpoint ... ... -alloc_nid <- nid reuse -get_node_page -f2fs_bug_on <- nid != node_footer->nid I think we don't need to truncate xattr pages eagerly which introduces lots of data races without big benefits. Cc: <stable(a)vger.kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org> --- fs/f2fs/f2fs.h | 1 - fs/f2fs/super.c | 1 - fs/f2fs/xattr.c | 31 ++++++++----------------------- 3 files changed, 8 insertions(+), 25 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 3f5b161dd743..7b9af2d51656 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -838,7 +838,6 @@ struct f2fs_inode_info { /* avoid racing between foreground op and gc */ struct f2fs_rwsem i_gc_rwsem[2]; - struct f2fs_rwsem i_xattr_sem; /* avoid racing between reading and changing EAs */ int i_extra_isize; /* size of extra space located in i_addr */ kprojid_t i_projid; /* id for project quota */ diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1b2c788ed80d..c917fa771f0e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1418,7 +1418,6 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb) INIT_LIST_HEAD(&fi->gdirty_list); init_f2fs_rwsem(&fi->i_gc_rwsem[READ]); init_f2fs_rwsem(&fi->i_gc_rwsem[WRITE]); - init_f2fs_rwsem(&fi->i_xattr_sem); /* Will be used by directory only */ fi->i_dir_level = F2FS_SB(sb)->dir_level; diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 213805d3592c..bdc8a55085a2 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -433,7 +433,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); size_t inline_size = inline_xattr_size(inode); - struct page *in_page = NULL; + struct page *in_page = ipage; void *xattr_addr; void *inline_addr = NULL; struct page *xpage; @@ -446,29 +446,19 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, /* write to inline xattr */ if (inline_size) { - if (ipage) { - inline_addr = inline_xattr_addr(inode, ipage); - } else { + if (!in_page) { in_page = f2fs_get_node_page(sbi, inode->i_ino); if (IS_ERR(in_page)) { f2fs_alloc_nid_failed(sbi, new_nid); return PTR_ERR(in_page); } - inline_addr = inline_xattr_addr(inode, in_page); } + inline_addr = inline_xattr_addr(inode, in_page); - f2fs_wait_on_page_writeback(ipage ? ipage : in_page, - NODE, true, true); - /* no need to use xattr node block */ + f2fs_wait_on_page_writeback(in_page, NODE, true, true); if (hsize <= inline_size) { - err = f2fs_truncate_xattr_node(inode); - f2fs_alloc_nid_failed(sbi, new_nid); - if (err) { - f2fs_put_page(in_page, 1); - return err; - } memcpy(inline_addr, txattr_addr, inline_size); - set_page_dirty(ipage ? ipage : in_page); + set_page_dirty(in_page); goto in_page_out; } } @@ -502,12 +492,13 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize, memcpy(xattr_addr, txattr_addr + inline_size, VALID_XATTR_BLOCK_SIZE); if (inline_size) - set_page_dirty(ipage ? ipage : in_page); + set_page_dirty(in_page); set_page_dirty(xpage); f2fs_put_page(xpage, 1); in_page_out: - f2fs_put_page(in_page, 1); + if (in_page != ipage) + f2fs_put_page(in_page, 1); return err; } @@ -528,10 +519,8 @@ int f2fs_getxattr(struct inode *inode, int index, const char *name, if (len > F2FS_NAME_LEN) return -ERANGE; - f2fs_down_read(&F2FS_I(inode)->i_xattr_sem); error = lookup_all_xattrs(inode, ipage, index, len, name, &entry, &base_addr, &base_size, &is_inline); - f2fs_up_read(&F2FS_I(inode)->i_xattr_sem); if (error) return error; @@ -565,9 +554,7 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) int error; size_t rest = buffer_size; - f2fs_down_read(&F2FS_I(inode)->i_xattr_sem); error = read_all_xattrs(inode, NULL, &base_addr); - f2fs_up_read(&F2FS_I(inode)->i_xattr_sem); if (error) return error; @@ -794,9 +781,7 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name, f2fs_balance_fs(sbi, true); f2fs_lock_op(sbi); - f2fs_down_write(&F2FS_I(inode)->i_xattr_sem); err = __f2fs_setxattr(inode, index, name, value, size, ipage, flags); - f2fs_up_write(&F2FS_I(inode)->i_xattr_sem); f2fs_unlock_op(sbi); f2fs_update_time(sbi, REQ_TIME); -- 2.41.0.162.gfafddb0af9-goog

1 year, 5 months

3
11
0 0

[PATCH 1/4] pinctrl: amd: Only use special debounce behavior for GPIO 0

by Mario Limonciello

It's uncommon to use debounce on any other pin, but technically we should only set debounce to 0 when working off GPIO0. Cc: stable(a)vger.kernel.org Fixes: 968ab9261627f ("pinctrl: amd: Detect internal GPIO0 debounce handling") Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> --- drivers/pinctrl/pinctrl-amd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 7a4dd0c861abc..02d9f9f245707 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c @@ -127,9 +127,11 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset, raw_spin_lock_irqsave(&gpio_dev->lock, flags); /* Use special handling for Pin0 debounce */ - pin_reg = readl(gpio_dev->base + WAKE_INT_MASTER_REG); - if (pin_reg & INTERNAL_GPIO0_DEBOUNCE) - debounce = 0; + if (offset == 0) { + pin_reg = readl(gpio_dev->base + WAKE_INT_MASTER_REG); + if (pin_reg & INTERNAL_GPIO0_DEBOUNCE) + debounce = 0; + } pin_reg = readl(gpio_dev->base + offset * 4); -- 2.34.1

1 year, 5 months

1
0
0 0

[PATCH] ASoC: codecs: wcd938x: fix codec initialisation race

by Johan Hovold

Make sure to resume the codec and soundwire device before trying to read the codec variant and configure the device during component probe. This specifically avoids interpreting (a masked and shifted) -EBUSY errno as the variant: wcd938x_codec audio-codec: ASoC: error at soc_component_read_no_lock on audio-codec for register: [0x000034b0] -16 when the soundwire device happens to be suspended, which in turn prevents some headphone controls from being registered. Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver") Cc: stable(a)vger.kernel.org # 5.14 Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Reported-by: Steev Klimaszewski <steev(a)kali.org> Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- sound/soc/codecs/wcd938x.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index e7d6a02cdec0..e3ae4fb2c4db 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3085,6 +3085,10 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) snd_soc_component_init_regmap(component, wcd938x->regmap); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) + return ret; + wcd938x->variant = snd_soc_component_read_field(component, WCD938X_DIGITAL_EFUSE_REG_0, WCD938X_ID_MASK); @@ -3098,6 +3102,8 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) (WCD938X_DIGITAL_INTR_LEVEL_0 + i), 0); } + pm_runtime_put(dev); + wcd938x->hphr_pdm_wd_int = regmap_irq_get_virq(wcd938x->irq_chip, WCD938X_IRQ_HPHR_PDM_WD_INT); wcd938x->hphl_pdm_wd_int = regmap_irq_get_virq(wcd938x->irq_chip, -- 2.39.3

1 year, 5 months

2
1
0 0

Re: [PATCH 6.4 00/31] 6.4.1-rc3 review

by Ronald Warsow

Hi Greg 6.4.1-rc3 compiles, boots and runs here on x86_64 (Intel Rocket Lake, i5-11400) Thanks Tested-by: Ronald Warsow <rwarsow(a)gmx.de>

1 year, 5 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2023