5.10.10-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.10.10-rc1 review
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +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/v5.x/stable-review/patch-5.10.10-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.10-rc1
Michael Hennerich <[email protected]>
spi: cadence: cache reference clock rate during probe
Christophe Leroy <[email protected]>
spi: fsl: Fix driver breakage when SPI_CS_HIGH is not set in spi->mode
Ayush Sawal <[email protected]>
cxgb4/chtls: Fix tid stuck due to wrong update of qid
Vladimir Oltean <[email protected]>
net: dsa: unbind all switches from tree when DSA master unbinds
Lorenzo Bianconi <[email protected]>
mac80211: check if atf has been disabled in __ieee80211_schedule_txq
Felix Fietkau <[email protected]>
mac80211: do not drop tx nulldata packets on encrypted links
Antonio Borneo <[email protected]>
drm/panel: otm8009a: allow using non-continuous dsi clock
Qinglang Miao <[email protected]>
can: mcp251xfd: mcp251xfd_handle_rxif_one(): fix wrong NULL pointer check
Seb Laveze <[email protected]>
net: stmmac: use __napi_schedule() for PREEMPT_RT
David Howells <[email protected]>
rxrpc: Fix handling of an unsupported token type in rxrpc_read()
Vladimir Oltean <[email protected]>
net: dsa: clear devlink port type before unregistering slave netdevs
Marco Felsch <[email protected]>
net: phy: smsc: fix clk error handling
Geert Uytterhoeven <[email protected]>
dt-bindings: net: renesas,etheravb: RZ/G2H needs tx-internal-delay-ps
Eric Dumazet <[email protected]>
net: avoid 32 x truesize under-estimation for tiny skbs
Yannick Vignon <[email protected]>
net: stmmac: fix taprio configuration when base_time is in the past
Yannick Vignon <[email protected]>
net: stmmac: fix taprio schedule configuration
Jakub Kicinski <[email protected]>
net: sit: unregister_netdevice on newlink's error path
David Wu <[email protected]>
net: stmmac: Fixed mtu channged by cache aligned
Cristian Dumitrescu <[email protected]>
i40e: fix potential NULL pointer dereferencing
Baptiste Lepers <[email protected]>
rxrpc: Call state should be read with READ_ONCE() under some circumstances
Petr Machata <[email protected]>
net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
Petr Machata <[email protected]>
net: dcb: Validate netlink message in DCB handler
Willem de Bruijn <[email protected]>
esp: avoid unneeded kmap_atomic call
Andrey Zhizhikin <[email protected]>
rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
Stefan Chulski <[email protected]>
net: mvpp2: Remove Pause and Asym_Pause support
Vadim Pasternak <[email protected]>
mlxsw: core: Increase critical threshold for ASIC thermal zone
Vadim Pasternak <[email protected]>
mlxsw: core: Add validation of transceiver temperature thresholds
Hoang Le <[email protected]>
tipc: fix NULL deref in tipc_link_xmit()
Aya Levin <[email protected]>
net: ipv6: Validate GSO SKB before finish IPv6 processing
Manish Chopra <[email protected]>
netxen_nic: fix MSI/MSI-x interrupts
Baptiste Lepers <[email protected]>
udp: Prevent reuseport_select_sock from reading uninitialized socks
Dongseok Yi <[email protected]>
net: fix use-after-free when UDP GRO with shared fraglist
Stephan Gerhold <[email protected]>
net: ipa: modem: add missing SET_NETDEV_DEV() for proper sysfs links
Mircea Cirjaliu <[email protected]>
bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback
Gilad Reti <[email protected]>
bpf: Support PTR_TO_MEM{,_OR_NULL} register spilling
Stanislav Fomichev <[email protected]>
bpf: Don't leak memory in bpf getsockopt when optlen == 0
J. Bruce Fields <[email protected]>
nfsd4: readdirplus shouldn't return parent of export
Tianjia Zhang <[email protected]>
X.509: Fix crash caused by NULL pointer
Daniel Borkmann <[email protected]>
bpf: Fix signed_{sub,add32}_overflows type handling
Alex Deucher <[email protected]>
drm/amdgpu/display: drop DCN support for aarch64
Dexuan Cui <[email protected]>
x86/hyperv: Initialize clockevents after LAPIC is initialized
Andrei Matei <[email protected]>
bpf: Fix selftest compilation on clang 11
Greg Kroah-Hartman <[email protected]>
Revert "kconfig: remove 'kvmconfig' and 'xenconfig' shorthands"
-------------
Diffstat:
.../devicetree/bindings/net/renesas,etheravb.yaml | 1 + Makefile | 4 +- arch/x86/hyperv/hv_init.c | 29 +++++++- crypto/asymmetric_keys/public_key.c | 3 +- drivers/gpu/drm/amd/display/Kconfig | 2 +- drivers/gpu/drm/amd/display/dc/calcs/Makefile | 7 -- drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 7 -- drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 -- .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 81 +++++++++------------- drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 -- drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 -- drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 ---- drivers/gpu/drm/amd/display/dc/dsc/Makefile | 5 -- drivers/gpu/drm/amd/display/dc/os_types.h | 4 -- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 7 ++ .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 4 ++ .../chelsio/inline_crypto/chtls/chtls_cm.c | 32 ++++++++- .../chelsio/inline_crypto/chtls/chtls_hw.c | 41 +++++++++++ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 - drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 13 ++-- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 7 +- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 52 ++------------ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 20 +++++- drivers/net/ipa/ipa_modem.c | 1 + drivers/net/phy/smsc.c | 3 +- drivers/net/usb/rndis_host.c | 2 +- drivers/spi/spi-cadence.c | 6 +- drivers/spi/spi-fsl-spi.c | 5 +- fs/nfsd/nfs3xdr.c | 7 +- kernel/bpf/cgroup.c | 5 +- kernel/bpf/helpers.c | 2 +- kernel/bpf/verifier.c | 8 ++- net/core/skbuff.c | 29 +++++++- net/core/sock_reuseport.c | 2 +- net/dcb/dcbnl.c | 2 + net/dsa/dsa2.c | 4 ++ net/dsa/master.c | 10 +++ net/ipv4/esp4.c | 7 +- net/ipv6/esp6.c | 7 +- net/ipv6/ip6_output.c | 41 ++++++++++- net/ipv6/sit.c | 5 +- net/mac80211/tx.c | 4 +- net/rxrpc/input.c | 2 +- net/rxrpc/key.c | 6 +- net/tipc/link.c | 9 ++- scripts/kconfig/Makefile | 10 +++ tools/testing/selftests/bpf/progs/profiler.inc.h | 2 + 51 files changed, 323 insertions(+), 218 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/43 Revert "kconfig: remove kvmconfig and xenconfig shorthands"
From: Greg Kroah-Hartman <[email protected]>
This reverts commit 17a08680ab6a6c057949cb48c352933e09ea377a which is commit 9bba03d4473df0b707224d4d2067b62d1e1e2a77 upstream.
As Pavel says at Link: https://lore.kernel.org/r/[email protected]
I don't believe this is suitable for stable.
And he's right. It is "after" 5.10.0, but we want to keep these targets for all of the 5.10.y series.
--- scripts/kconfig/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+)
scripts/kconfig/Makefile +10 -0
@@ -94,6 +94,16 @@ configfiles=$(wildcard $(srctree)/kernel $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig +PHONY += kvmconfig +kvmconfig: kvm_guest.config + @echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10" + @echo >&2 " Please use 'make $<' instead." + +PHONY += xenconfig +xenconfig: xen.config + @echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10" + @echo >&2 " Please use 'make $<' instead." + PHONY += tinyconfig tinyconfig: $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
Greg Kroah-Hartman
maintainerPATCH 2/43 bpf: Fix selftest compilation on clang 11
In reply to Greg Kroah-HartmanFrom: Andrei Matei <[email protected]>
commit fb3558127cb62ba2dea9e3d0efa1bb1d7e5eee2a upstream.
Before this patch, profiler.inc.h wouldn't compile with clang-11 (before the __builtin_preserve_enum_value LLVM builtin was introduced in
https://reviews.llvm.org/D83242).
Another test that uses this builtin (test_core_enumval) is conditionally skipped if the compiler is too old. In that spirit, this patch inhibits part of populate_cgroup_info(), which needs this CO-RE builtin. The selftests build again on clang-11.
The affected test (the profiler test) doesn't pass on clang-11 because it's missing https://reviews.llvm.org/D85570, but at least the test suite as a whole compiles. The test's expected failure is already called out in the README.
--- tools/testing/selftests/bpf/progs/profiler.inc.h | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/progs/profiler.inc.h +2 -0
@@ -256,6 +256,7 @@ static INLINE void* populate_cgroup_infoBPF_CORE_READ (task, nsproxy, cgroup_ns, root_cset, dfl_cgrp, kn);struct kernfs_node * proc_kernfs =BPF_CORE_READ (task, cgroups, dfl_cgrp, kn); +#if __has_builtin (__builtin_preserve_enum_value)if (ENABLE_CGROUP_V1_RESOLVER &&CONFIG_CGROUP_PIDS ) { int cgrp_id = bpf_core_enum_value(enum cgroup_subsys_id___local, pids_cgrp_id___local);
@@ -275,6 +276,7 @@ static INLINE void* populate_cgroup_info } } } +#endif cgroup_data->cgroup_root_inode =get_inode_from_kernfs (root_kernfs); cgroup_data->cgroup_proc_inode =get_inode_from_kernfs (proc_kernfs);
Greg Kroah-Hartman
maintainerPATCH 3/43 x86/hyperv: Initialize clockevents after LAPIC is initialized
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit fff7b5e6ee63c5d20406a131b260c619cdd24fd1 ]
With commit 4df4cb9e99f8, the Hyper-V direct-mode STIMER is actually initialized before LAPIC is initialized: see
apic_intr_mode_init()
x86_platform.apic_post_init()
hyperv_init()
hv_stimer_alloc()
apic_bsp_setup()
setup_local_APIC()setup_local_APIC() temporarily disables LAPIC, initializes it and re-eanble it. The direct-mode STIMER depends on LAPIC, and when it's registered, it can be programmed immediately and the timer can fire very soon:
hv_stimer_init
clockevents_config_and_register
clockevents_register_device
tick_check_new_device
tick_setup_device
tick_setup_periodic(), tick_setup_oneshot()
clockevents_program_event
When the timer fires in the hypervisor, if the LAPIC is in the disabled state, new versions of Hyper-V ignore the event and don't inject the timer interrupt into the VM, and hence the VM hangs when it boots.
Note: when the VM starts/reboots, the LAPIC is pre-enabled by the firmware, so the window of LAPIC being temporarily disabled is pretty small, and the issue can only happen once out of 100~200 reboots for a 40-vCPU VM on one dev host, and on another host the issue doesn't reproduce after 2000 reboots.
The issue is more noticeable for kdump/kexec, because the LAPIC is disabled by the first kernel, and stays disabled until the kdump/kexec kernel enables it. This is especially an issue to a Generation-2 VM (for which Hyper-V doesn't emulate the PIT timer) when CONFIG_HZ=1000 (rather than CONFIG_HZ=250) is used.
Fix the issue by moving hv_stimer_alloc() to a later place where the LAPIC timer is initialized.
--- arch/x86/hyperv/hv_init.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
arch/x86/hyperv/hv_init.c +26 -3
@@ -312,6 +312,25 @@ static struct syscore_ops hv_syscore_ops .resume = hv_resume, }; +static void (*__initdata old_setup_percpu_clockev)(void ); + +static void __init hv_stimer_setup_percpu_clockev (void ) +{ +/* +* Ignore any errors in setting up stimer clockevents +* as we can run with the LAPIC timer as a fallback. +*/ + (void )hv_stimer_alloc (); + +/* +* Still register the LAPIC timer, because the direct-mode STIMER is +* not supported by old versions of Hyper-V. This also allows users +* to switch to LAPIC timer via /sys, if they want to. +*/ +if (old_setup_percpu_clockev) +old_setup_percpu_clockev (); +} +/* * This function is to be invoked early in the boot sequence after the * hypervisor has been detected.
@@ -390,10 +409,14 @@ void __init hyperv_init(void)wrmsrl (HV_X64_MSR_HYPERCALL , hypercall_msr.as_uint64);/* -* Ignore any errors in setting up stimer clockevents -* as we can run with the LAPIC timer as a fallback. +* hyperv_init() is called before LAPIC is initialized: see +* apic_intr_mode_init() -> x86_platform.apic_post_init() and +* apic_bsp_setup() -> setup_local_APIC(). The direct-mode STIMER +* depends on LAPIC, so hv_stimer_alloc() should be called from +* x86_init.timers.setup_percpu_clockev. */ - (void )hv_stimer_alloc (); + old_setup_percpu_clockev = x86_init.timers.setup_percpu_clockev; + x86_init.timers.setup_percpu_clockev = hv_stimer_setup_percpu_clockev;hv_apic_init ();
Greg Kroah-Hartman
maintainerPATCH 4/43 drm/amdgpu/display: drop DCN support for aarch64
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit c241ed2f0ea549c18cff62a3708b43846b84dae3 upstream.
Quoted 1 line
From Ard:
"Simply disabling -mgeneral-regs-only left and right is risky, given that the standard AArch64 ABI permits the use of FP/SIMD registers anywhere, and GCC is known to use SIMD registers for spilling, and may invent other uses of the FP/SIMD register file that have nothing to do with the floating point code in question. Note that putting kernel_neon_begin() and kernel_neon_end() around the code that does use FP is not sufficient here, the problem is in all the other code that may be emitted with references to SIMD registers in it.
So the only way to do this properly is to put all floating point code in a separate compilation unit, and only compile that unit with -mgeneral-regs-only."
Disable support until the code can be properly refactored to support this properly on aarch64.
--- drivers/gpu/drm/amd/display/Kconfig | 2 drivers/gpu/drm/amd/display/dc/calcs/Makefile | 7 - drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 7 - drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 7 - drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 81 ++++++------------ drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 4 drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 4 drivers/gpu/drm/amd/display/dc/dml/Makefile | 13 -- drivers/gpu/drm/amd/display/dc/dsc/Makefile | 5 - drivers/gpu/drm/amd/display/dc/os_types.h | 4 10 files changed, 32 insertions(+), 102 deletions(-)
drivers/gpu/drm/amd/display/Kconfig +1 -1
@@ -6,7 +6,7 @@ config DRM_AMD_DC bool "AMD DC - Enable new display engine" default y select SND_HDA_COMPONENT if SND_HDA_CORE - select DRM_AMD_DC_DCN if (X86 || PPC64 || (ARM64 && KERNEL_MODE_NEON)) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) + select DRM_AMD_DC_DCN if (X86 || PPC64) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and
drivers/gpu/drm/amd/display/dc/calcs/Makefile +0 -7
@@ -33,10 +33,6 @@ ifdef CONFIG_PPC64 calcs_ccflags := -mhard-float -maltivec endif -ifdef CONFIG_ARM64 -calcs_rcflags := -mgeneral-regs-only -endif - ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1
@@ -57,9 +53,6 @@ endif CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calcs.o := $(calcs_ccflags) CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o := $(calcs_ccflags) CFLAGS_$(AMDDALPATH)/dc/calcs/dcn_calc_math.o := $(calcs_ccflags) -Wno-tautological-compare -CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calcs.o := $(calcs_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calc_auto.o := $(calcs_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/calcs/dcn_calc_math.o := $(calcs_rcflags) BW_CALCS = dce_calcs.o bw_fixed.o custom_float.o
drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile +0 -7
@@ -104,13 +104,6 @@ ifdef CONFIG_PPC64 CFLAGS_$(AMDDALPATH)/dc/clk_mgr/dcn21/rn_clk_mgr.o := $(call cc-option,-mno-gnu-attribute) endif -# prevent build errors: -# ...: '-mgeneral-regs-only' is incompatible with the use of floating-point types -# this file is unused on arm64, just like on ppc64 -ifdef CONFIG_ARM64 -CFLAGS_REMOVE_$(AMDDALPATH)/dc/clk_mgr/dcn21/rn_clk_mgr.o := -mgeneral-regs-only -endif - AMD_DAL_CLK_MGR_DCN21 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn21/,$(CLK_MGR_DCN21)) AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN21)
drivers/gpu/drm/amd/display/dc/dcn10/Makefile +0 -7
@@ -31,11 +31,4 @@ DCN10 = dcn10_init.o dcn10_resource.o dc AMD_DAL_DCN10 = $(addprefix $(AMDDALPATH)/dc/dcn10/,$(DCN10)) -# fix: -# ...: '-mgeneral-regs-only' is incompatible with the use of floating-point types -# aarch64 does not support soft-float, so use hard-float and handle this in code -ifdef CONFIG_ARM64 -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn10/dcn10_resource.o := -mgeneral-regs-only -endif - AMD_DISPLAY_FILES += $(AMD_DAL_DCN10)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +31 -50
93 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn20/Makefile +0 -4
@@ -17,10 +17,6 @@ ifdef CONFIG_PPC64 CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -maltivec endif -ifdef CONFIG_ARM64 -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mgeneral-regs-only -endif - ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1
drivers/gpu/drm/amd/display/dc/dcn21/Makefile +0 -4
@@ -13,10 +13,6 @@ ifdef CONFIG_PPC64 CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -maltivec endif -ifdef CONFIG_ARM64 -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mgeneral-regs-only -endif - ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1
drivers/gpu/drm/amd/display/dc/dml/Makefile +0 -13
@@ -33,10 +33,6 @@ ifdef CONFIG_PPC64 dml_ccflags := -mhard-float -maltivec endif -ifdef CONFIG_ARM64 -dml_rcflags := -mgeneral-regs-only -endif - ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1
@@ -64,13 +60,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/displa CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_rcflags) endif ifdef CONFIG_DRM_AMD_DC_DCN3_0 CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048
@@ -78,8 +67,6 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/displa endif CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_rcflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_rcflags) DML = display_mode_lib.o display_rq_dlg_helpers.o dml1_display_rq_dlg_calc.o \
drivers/gpu/drm/amd/display/dc/dsc/Makefile +0 -5
@@ -10,10 +10,6 @@ ifdef CONFIG_PPC64 dsc_ccflags := -mhard-float -maltivec endif -ifdef CONFIG_ARM64 -dsc_rcflags := -mgeneral-regs-only -endif - ifdef CONFIG_CC_IS_GCC ifeq ($(call cc-ifversion, -lt, 0701, y), y) IS_OLD_GCC = 1
@@ -32,7 +28,6 @@ endif endif CFLAGS_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_ccflags) -CFLAGS_REMOVE_$(AMDDALPATH)/dc/dsc/rc_calc.o := $(dsc_rcflags) DSC = dc_dsc.o rc_calc.o rc_calc_dpi.o
drivers/gpu/drm/amd/display/dc/os_types.h +0 -4
@@ -55,10 +55,6 @@#include <asm/fpu/api.h> #define DC_FP_START () kernel_fpu_begin()#define DC_FP_END () kernel_fpu_end() -#elif defined(CONFIG_ARM64 ) -#include <asm/neon.h> -#define DC_FP_START () kernel_neon_begin() -#define DC_FP_END () kernel_neon_end()#elif defined(CONFIG_PPC64 )#include <asm/switch_to.h> #include <asm/cputable.h>
Greg Kroah-Hartman
maintainerPATCH 5/43 bpf: Fix signed_{sub,add32}_overflows type handling
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
commit bc895e8b2a64e502fbba72748d59618272052a8b upstream.
Fix incorrect signed_{sub,add32}_overflows() input types (and a related buggy comment). It looks like this might have slipped in via copy/paste issue, also given prior to 3f50f132d840 ("bpf: Verifier, do explicit ALU32 bounds tracking") the signature of signed_sub_overflows() had s64 a and s64 b as its input args whereas now they are truncated to s32. Thus restore proper types. Also, the case of signed_add32_overflows() is not consistent to signed_sub32_overflows(). Both have s32 as inputs, therefore align the former.
--- kernel/bpf/verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +3 -3
@@ -5255,7 +5255,7 @@ static bool signed_add_overflows(s64 a,return res < a; } -static bool signed_add32_overflows (s64 a,s64 b) +static bool signed_add32_overflows (s32 a,s32 b) {/* Do the add in u32, where overflow is well-defined */ s32 res = (s32)((u32 )a + (u32 )b);
@@ -5265,7 +5265,7 @@ static bool signed_add32_overflows(s64 areturn res < a; } -static bool signed_sub_overflows (s32 a,s32 b) +static bool signed_sub_overflows (s64 a,s64 b) {/* Do the sub in u64, where overflow is well-defined */ s64 res = (s64)((u64 )a - (u64 )b);
@@ -5277,7 +5277,7 @@ static bool signed_sub_overflows(s32 a,static bool signed_sub32_overflows (s32 a,s32 b) { -/* Do the sub in u64, where overflow is well-defined */ +/* Do the sub in u32, where overflow is well-defined */ s32 res = (s32)((u32 )a - (u32 )b);if (b <0 )
Greg Kroah-Hartman
maintainerPATCH 6/43 X.509: Fix crash caused by NULL pointer
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
commit 7178a107f5ea7bdb1cc23073234f0ded0ef90ec7 upstream.
On the following call path, sig->pkey_algo is not assigned in asymmetric_key_verify_signature(), which causes runtime crash in public_key_verify_signature().
keyctl_pkey_verify
asymmetric_key_verify_signature
verify_signature
public_key_verify_signature
This patch simply check this situation and fixes the crash caused by NULL pointer.
--- crypto/asymmetric_keys/public_key.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
crypto/asymmetric_keys/public_key.c +2 -1
@@ -356,7 +356,8 @@ int public_key_verify_signature(const stif (ret) goto error_free_key; -if (strcmp (sig->pkey_algo,"sm2" ) ==0 && sig->data_size) { +if (sig->pkey_algo &&strcmp (sig->pkey_algo,"sm2" ) ==0 && + sig->data_size) { ret =cert_sig_digest_update (sig, tfm);if (ret) goto error_free_key;
Greg Kroah-Hartman
maintainerPATCH 7/43 nfsd4: readdirplus shouldnt return parent of export
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
commit 51b2ee7d006a736a9126e8111d1f24e4fd0afaa6 upstream.
If you export a subdirectory of a filesystem, a READDIRPLUS on the root of that export will return the filehandle of the parent with the ".." entry.
The filehandle is optional, so let's just not return the filehandle for ".." if we're at the root of an export.
Note that once the client learns one filehandle outside of the export, they can trivially access the rest of the export using further lookups.
However, it is also not very difficult to guess filehandles outside of the export. So exporting a subdirectory of a filesystem should considered equivalent to providing access to the entire filesystem. To avoid confusion, we recommend only exporting entire filesystems.
--- fs/nfsd/nfs3xdr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/nfsd/nfs3xdr.c +6 -1
@@ -863,9 +863,14 @@ compose_entry_fh(struct nfsd3_readdirresif (isdotent (name, namlen)) {if (namlen ==2 ) { dchild =dget_parent (dparent); -/* filesystem root - cannot return filehandle for ".." */ +/* +* Don't return filehandle for ".." if we're at +* the filesystem or export root: +*/ if (dchild == dparent) goto out; +if (dparent == exp->ex_path.dentry) + goto out; }else dchild =dget (dparent); }else
Greg Kroah-Hartman
maintainerPATCH 8/43 bpf: Dont leak memory in bpf getsockopt when optlen == 0
In reply to Greg Kroah-HartmanFrom: Stanislav Fomichev <[email protected]>
commit 4be34f3d0731b38a1b24566b37fbb39500aaf3a2 upstream.
optlen == 0 indicates that the kernel should ignore BPF buffer and use the original one from the user. We, however, forget to free the temporary buffer that we've allocated for BPF.
--- kernel/bpf/cgroup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/cgroup.c +3 -2
@@ -1391,12 +1391,13 @@ int __cgroup_bpf_run_filter_setsockopt(sif (ctx.optlen !=0 ) { *optlen = ctx.optlen; *kernel_optval = ctx.optval; +/* export and don't free sockopt buf */ +return 0 ; } } out: -if (ret) -sockopt_free_buf (&ctx); +sockopt_free_buf (&ctx);return ret; }
Greg Kroah-Hartman
maintainerPATCH 9/43 bpf: Support PTR_TO_MEM{,_OR_NULL} register spilling
In reply to Greg Kroah-HartmanFrom: Gilad Reti <[email protected]>
commit 744ea4e3885eccb6d332a06fae9eb7420a622c0f upstream.
Add support for pointer to mem register spilling, to allow the verifier to track pointers to valid memory addresses. Such pointers are returned for example by a successful call of the bpf_ringbuf_reserve helper.
The patch was partially contributed by CyberArk Software, Inc.
--- kernel/bpf/verifier.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/bpf/verifier.c +2 -0
@@ -2214,6 +2214,8 @@ static bool is_spillable_regtype(enum bpcase PTR_TO_RDWR_BUF :case PTR_TO_RDWR_BUF_OR_NULL :case PTR_TO_PERCPU_BTF_ID : +case PTR_TO_MEM : +case PTR_TO_MEM_OR_NULL :return true;default :return false;
Greg Kroah-Hartman
maintainerPATCH 10/43 bpf: Fix helper bpf_map_peek_elem_proto pointing to wrong callback
In reply to Greg Kroah-HartmanFrom: Mircea Cirjaliu <[email protected]>
commit 301a33d51880619d0c5a581b5a48d3a5248fa84b upstream.
I assume this was obtained by copy/paste. Point it to bpf_map_peek_elem() instead of bpf_map_pop_elem(). In practice it may have been less likely hit when under JIT given shielded via 84430d4232c3 ("bpf, verifier: avoid retpoline for map push/pop/peek operation").
--- kernel/bpf/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/helpers.c +1 -1
@@ -108,7 +108,7 @@ BPF_CALL_2(bpf_map_peek_elem, struct bpf }const struct bpf_func_proto bpf_map_peek_elem_proto = { - .func = bpf_map_pop_elem, + .func = bpf_map_peek_elem, .gpl_only = false, .ret_type =RET_INTEGER , .arg1_type =ARG_CONST_MAP_PTR ,
Greg Kroah-Hartman
maintainerPATCH 11/43 net: ipa: modem: add missing SET_NETDEV_DEV() for proper sysfs links
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit afba9dc1f3a5390475006061c0bdc5ad4915878e ]
At the moment it is quite hard to identify the network interface provided by IPA in userspace components: The network interface is created as virtual device, without any link to the IPA device. The interface name ("rmnet_ipa%d") is the only indication that the network interface belongs to IPA, but this is not very reliable.
Add SET_NETDEV_DEV() to associate the network interface with the IPA parent device. This allows userspace services like ModemManager to properly identify that this network interface is provided by IPA and belongs to the modem.
--- drivers/net/ipa/ipa_modem.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ipa/ipa_modem.c +1 -0
@@ -216,6 +216,7 @@ int ipa_modem_start(struct ipa *ipa) ipa->name_map[IPA_ENDPOINT_AP_MODEM_TX ]->netdev = netdev; ipa->name_map[IPA_ENDPOINT_AP_MODEM_RX ]->netdev = netdev; +SET_NETDEV_DEV (netdev, &ipa->pdev->dev); priv =netdev_priv (netdev); priv->ipa = ipa;
Greg Kroah-Hartman
maintainerPATCH 12/43 net: fix use-after-free when UDP GRO with shared fraglist
In reply to Greg Kroah-HartmanFrom: Dongseok Yi <[email protected]>
[ Upstream commit 53475c5dd856212e91538a9501162e821cc1f791 ]
skbs in fraglist could be shared by a BPF filter loaded at TC. If TC writes, it will call skb_ensure_writable -> pskb_expand_head to create a private linear section for the head_skb. And then call skb_clone_fraglist -> skb_get on each skb in the fraglist.
skb_segment_list overwrites part of the skb linear section of each fragment itself. Even after skb_clone, the frag_skbs share their linear section with their clone in PF_PACKET.
Both sk_receive_queue of PF_PACKET and PF_INET (or PF_INET6) can have a link for the same frag_skbs chain. If a new skb (not frags) is queued to one of the sk_receive_queue, multiple ptypes can see and release this. It causes use-after-free.
[ 4443.426215] ------------[ cut here ]------------ [ 4443.426222] refcount_t: underflow; use-after-free. [ 4443.426291] WARNING: CPU: 7 PID: 28161 at lib/refcount.c:190 refcount_dec_and_test_checked+0xa4/0xc8 [ 4443.426726] pstate: 60400005 (nZCv daif +PAN -UAO) [ 4443.426732] pc : refcount_dec_and_test_checked+0xa4/0xc8 [ 4443.426737] lr : refcount_dec_and_test_checked+0xa0/0xc8 [ 4443.426808] Call trace: [ 4443.426813] refcount_dec_and_test_checked+0xa4/0xc8 [ 4443.426823] skb_release_data+0x144/0x264 [ 4443.426828] kfree_skb+0x58/0xc4 [ 4443.426832] skb_queue_purge+0x64/0x9c [ 4443.426844] packet_set_ring+0x5f0/0x820 [ 4443.426849] packet_setsockopt+0x5a4/0xcd0 [ 4443.426853] __sys_setsockopt+0x188/0x278 [ 4443.426858] __arm64_sys_setsockopt+0x28/0x38 [ 4443.426869] el0_svc_common+0xf0/0x1d0 [ 4443.426873] el0_svc_handler+0x74/0x98 [ 4443.426880] el0_svc+0x8/0xc
--- net/core/skbuff.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
net/core/skbuff.c +19 -1
@@ -3648,7 +3648,8 @@ struct sk_buff *skb_segment_list(structunsigned int delta_truesize =0 ;unsigned int delta_len =0 ;struct sk_buff *tail =NULL ; -struct sk_buff *nskb; +struct sk_buff *nskb, *tmp; +int err;skb_push (skb, -skb_network_offset (skb) + offset);
@@ -3658,11 +3659,28 @@ struct sk_buff *skb_segment_list(struct nskb = list_skb; list_skb = list_skb->next; + err =0 ; +if (skb_shared (nskb)) { + tmp =skb_clone (nskb,GFP_ATOMIC ); +if (tmp) { +consume_skb (nskb); + nskb = tmp; + err =skb_unclone (nskb,GFP_ATOMIC ); + }else { + err = -ENOMEM ; + } + } +if (!tail) skb->next = nskb;else tail->next = nskb; +if (unlikely (err)) { + nskb->next = list_skb; + goto err_linearize; + } + tail = nskb; delta_len += nskb->len;
Greg Kroah-Hartman
maintainerPATCH 13/43 udp: Prevent reuseport_select_sock from reading uninitialized socks
In reply to Greg Kroah-HartmanFrom: Baptiste Lepers <[email protected]>
[ Upstream commit fd2ddef043592e7de80af53f47fa46fd3573086e ]
reuse->socks[] is modified concurrently by reuseport_add_sock. To prevent reading values that have not been fully initialized, only read the array up until the last known safe index instead of incorrectly re-reading the last index of the array.
--- net/core/sock_reuseport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/sock_reuseport.c +1 -1
@@ -293,7 +293,7 @@ select_by_hash: i = j =reciprocal_scale (hash, socks);while (reuse->socks[i]->sk_state ==TCP_ESTABLISHED ) { i++; -if (i >= reuse->num_socks) +if (i >= socks) i =0 ;if (i == j) goto out;
Greg Kroah-Hartman
maintainerPATCH 14/43 netxen_nic: fix MSI/MSI-x interrupts
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
[ Upstream commit a2bc221b972db91e4be1970e776e98f16aa87904 ]
For all PCI functions on the netxen_nic adapter, interrupt mode (INTx or MSI) configuration is dependent on what has been configured by the PCI function zero in the shared interrupt register, as these adapters do not support mixed mode interrupts among the functions of a given adapter.
Logic for setting MSI/MSI-x interrupt mode in the shared interrupt register based on PCI function id zero check is not appropriate for all family of netxen adapters, as for some of the netxen family adapters PCI function zero is not really meant to be probed/loaded in the host but rather just act as a management function on the device, which caused all the other PCI functions on the adapter to always use legacy interrupt (INTx) mode instead of choosing MSI/MSI-x interrupt mode.
This patch replaces that check with port number so that for all type of adapters driver attempts for MSI/MSI-x interrupt modes.
--- drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +1 -6
@@ -564,11 +564,6 @@ static const struct net_device_ops netxe .ndo_set_features = netxen_set_features, }; -static inline bool netxen_function_zero (struct pci_dev *pdev) -{ -return (PCI_FUNC (pdev->devfn) ==0 ) ? true : false; -} -static inline void netxen_set_interrupt_mode (struct netxen_adapter *adapter,u32 mode) {
@@ -664,7 +659,7 @@ static int netxen_setup_intr(struct netxnetxen_initialize_interrupt_registers (adapter);netxen_set_msix_bit (pdev,0 ); -if (netxen_function_zero (pdev)) { +if (adapter->portnum ==0 ) {if (!netxen_setup_msi_interrupts (adapter, num_msix))netxen_set_interrupt_mode (adapter,NETXEN_MSI_MODE );else
Greg Kroah-Hartman
maintainerPATCH 15/43 net: ipv6: Validate GSO SKB before finish IPv6 processing
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit b210de4f8c97d57de051e805686248ec4c6cfc52 ]
There are cases where GSO segment's length exceeds the egress MTU:
- Forwarding of a TCP GRO skb, when DF flag is not set.
- Forwarding of an skb that arrived on a virtualisation interface (virtio-net/vhost/tap) with TSO/GSO size set by other network stack.
- Local GSO skb transmitted on an NETIF_F_TSO tunnel stacked over an interface with a smaller MTU.
- Arriving GRO skb (or GSO skb in a virtualised environment) that is bridged to a NETIF_F_TSO tunnel stacked over an interface with an insufficient MTU.
If so:
- Consume the SKB and its segments.
- Issue an ICMP packet with 'Packet Too Big' message containing the MTU, allowing the source host to reduce its Path MTU appropriately.
Note: These cases are handled in the same manner in IPv4 output finish. This patch aligns the behavior of IPv6 and the one of IPv4.
--- net/ipv6/ip6_output.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-)
net/ipv6/ip6_output.c +40 -1
@@ -125,8 +125,43 @@ static int ip6_finish_output2(struct netreturn -EINVAL ; } +static int +ip6_finish_output_gso_slowpath_drop (struct net *net,struct sock *sk, +struct sk_buff *skb,unsigned int mtu) +{ +struct sk_buff *segs, *nskb; +netdev_features_t features; +int ret =0 ; + +/* Please see corresponding comment in ip_finish_output_gso +* describing the cases where GSO segment length exceeds the +* egress MTU. +*/ + features =netif_skb_features (skb); + segs =skb_gso_segment (skb, features & ~NETIF_F_GSO_MASK ); +if (IS_ERR_OR_NULL (segs)) { +kfree_skb (skb); +return -ENOMEM ; + } + +consume_skb (skb); + + skb_list_walk_safe(segs, segs, nskb) { +int err; + +skb_mark_not_on_list (segs); + err =ip6_fragment (net, sk, segs, ip6_finish_output2); +if (err && ret ==0 ) + ret = err; + } + +return ret; +} +static int __ip6_finish_output (struct net *net,struct sock *sk,struct sk_buff *skb) { +unsigned int mtu; +#if defined(CONFIG_NETFILTER ) && defined(CONFIG_XFRM )/* Policy lookup after SNAT yielded a new policy */ if (skb_dst (skb)->xfrm) {
@@ -135,7 +170,11 @@ static int __ip6_finish_output(struct ne }#endif -if ((skb->len >ip6_skb_dst_mtu (skb) && !skb_is_gso (skb)) || + mtu =ip6_skb_dst_mtu (skb); +if (skb_is_gso (skb) && !skb_gso_validate_network_len (skb, mtu)) +return ip6_finish_output_gso_slowpath_drop (net, sk, skb, mtu); + +if ((skb->len > mtu && !skb_is_gso (skb)) ||dst_allfrag (skb_dst (skb)) || (IP6CB (skb)->frag_max_size && skb->len >IP6CB (skb)->frag_max_size))return ip6_fragment (net, sk, skb, ip6_finish_output2);
Greg Kroah-Hartman
maintainerPATCH 16/43 tipc: fix NULL deref in tipc_link_xmit()
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
[ Upstream commit b77413446408fdd256599daf00d5be72b5f3e7c6 ]
The buffer list can have zero skb as following path:
tipc_named_node_up()->tipc_node_xmit()->tipc_link_xmit(), so we need to check the list before casting an &sk_buff.
Fault report:
[] tipc: Bulk publication failure
[] general protection fault, probably for non-canonical [#1] PREEMPT [...] [] KASAN: null-ptr-deref in range [0x00000000000000c8-0x00000000000000cf] [] CPU: 0 PID: 0 Comm: swapper/0 Kdump: loaded Not tainted 5.10.0-rc4+ #2 [] Hardware name: Bochs ..., BIOS Bochs 01/01/2011
[] RIP: 0010:tipc_link_xmit+0xc1/0x2180
[] Code: 24 b8 00 00 00 00 4d 39 ec 4c 0f 44 e8 e8 d7 0a 10 f9 48 [...] [] RSP: 0018:ffffc90000006ea0 EFLAGS: 00010202
[] RAX: dffffc0000000000 RBX: ffff8880224da000 RCX: 1ffff11003d3cc0d [] RDX: 0000000000000019 RSI: ffffffff886007b9 RDI: 00000000000000c8 [] RBP: ffffc90000007018 R08: 0000000000000001 R09: fffff52000000ded [] R10: 0000000000000003 R11: fffff52000000dec R12: ffffc90000007148 [] R13: 0000000000000000 R14: 0000000000000000 R15: ffffc90000007018 [] FS: 0000000000000000(0000) GS:ffff888037400000(0000) knlGS:000[...] [] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[] CR2: 00007fffd2db5000 CR3: 000000002b08f000 CR4: 00000000000006f0
--- net/tipc/link.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/tipc/link.c +7 -2
@@ -996,7 +996,6 @@ void tipc_link_reset(struct tipc_link *lint tipc_link_xmit (struct tipc_link *l,struct sk_buff_head *list,struct sk_buff_head *xmitq) { -struct tipc_msg *hdr =buf_msg (skb_peek (list));struct sk_buff_head *backlogq = &l->backlogq;struct sk_buff_head *transmq = &l->transmq;struct sk_buff *skb, *_skb;
@@ -1004,13 +1003,18 @@ int tipc_link_xmit(struct tipc_link *l,u16 ack = l->rcv_nxt -1 ;u16 seqno = l->snd_nxt;int pkt_cnt =skb_queue_len (list); -int imp =msg_importance (hdr);unsigned int mss =tipc_link_mss (l);unsigned int cwin = l->window;unsigned int mtu = l->mtu; +struct tipc_msg *hdr;bool new_bundle;int rc =0 ; +int imp; +if (pkt_cnt <=0 ) +return 0 ; + + hdr =buf_msg (skb_peek (list));if (unlikely (msg_size (hdr) > mtu)) { pr_warn("Too large msg, purging xmit list %d %d %d %d %d!\n", skb_queue_len(list), msg_user(hdr),
@@ -1019,6 +1023,7 @@ int tipc_link_xmit(struct tipc_link *l,return -EMSGSIZE ; } + imp =msg_importance (hdr);/* Allow oversubscription of one data msg per source at congestion */ if (unlikely (l->backlog[imp].len >= l->backlog[imp].limit)) {if (imp ==TIPC_SYSTEM_IMPORTANCE ) {
Greg Kroah-Hartman
maintainerPATCH 17/43 mlxsw: core: Add validation of transceiver temperature thresholds
In reply to Greg Kroah-HartmanFrom: Vadim Pasternak <[email protected]>
[ Upstream commit 57726ebe2733891c9f59105eff028735f73d05fb ]
Validate thresholds to avoid a single failure due to some transceiver unreliability. Ignore the last readouts in case warning temperature is above alarm temperature, since it can cause unexpected thermal shutdown. Stay with the previous values and refresh threshold within the next iteration.
This is a rare scenario, but it was observed at a customer site.
--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +7 -4
@@ -176,6 +176,12 @@ mlxsw_thermal_module_trips_update(structif (err)return err; +if (crit_temp > emerg_temp) { +dev_warn (dev,"%s : Critical threshold %d is above emergency threshold %d\n" , + tz->tzdev->type, crit_temp, emerg_temp); +return 0 ; + } +/* According to the system thermal requirements, the thermal zones are * defined with four trip points. The critical and emergency * temperature thresholds, provided by QSFP module are set as "active"
@@ -190,11 +196,8 @@ mlxsw_thermal_module_trips_update(struct tz->trips[MLXSW_THERMAL_TEMP_TRIP_NORM ].temp = crit_temp; tz->trips[MLXSW_THERMAL_TEMP_TRIP_HIGH ].temp = crit_temp; tz->trips[MLXSW_THERMAL_TEMP_TRIP_HOT ].temp = emerg_temp; -if (emerg_temp > crit_temp) - tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT ].temp = emerg_temp + + tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT ].temp = emerg_temp +MLXSW_THERMAL_MODULE_TEMP_SHIFT ; -else - tz->trips[MLXSW_THERMAL_TEMP_TRIP_CRIT ].temp = emerg_temp;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 18/43 mlxsw: core: Increase critical threshold for ASIC thermal zone
In reply to Greg Kroah-HartmanFrom: Vadim Pasternak <[email protected]>
[ Upstream commit b06ca3d5a43ca2dd806f7688a17e8e7e0619a80a ]
Increase critical threshold for ASIC thermal zone from 110C to 140C according to the system hardware requirements. All the supported ASICs (Spectrum-1, Spectrum-2, Spectrum-3) could be still operational with ASIC temperature below 140C. With the old critical threshold value system can perform unjustified shutdown.
All the systems equipped with the above ASICs implement thermal protection mechanism at firmware level and firmware could decide to perform system thermal shutdown in case the temperature is below 140C. So with the new threshold system will not meltdown, while thermal operating range will be aligned with hardware abilities.
--- drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c +1 -1
@@ -19,7 +19,7 @@#define MLXSW_THERMAL_ASIC_TEMP_NORM 75000/* 75C */ #define MLXSW_THERMAL_ASIC_TEMP_HIGH 85000/* 85C */ #define MLXSW_THERMAL_ASIC_TEMP_HOT 105000/* 105C */ -#define MLXSW_THERMAL_ASIC_TEMP_CRIT 110000/* 110C */ +#define MLXSW_THERMAL_ASIC_TEMP_CRIT 140000/* 140C */ #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000/* 5C */ #define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2)#define MLXSW_THERMAL_ZONE_MAX_NAME 16
Greg Kroah-Hartman
maintainerPATCH 19/43 net: mvpp2: Remove Pause and Asym_Pause support
In reply to Greg Kroah-HartmanFrom: Stefan Chulski <[email protected]>
[ Upstream commit 6f83802a1a06e74eafbdbc9b52c05516d3083d02 ]
Packet Processor hardware not connected to MAC flow control unit and cannot support TX flow control.
This patch disable flow control support.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +0 -2
@@ -5874,8 +5874,6 @@ static void mvpp2_phylink_validate(strucphylink_set (mask, Autoneg);phylink_set_port_modes (mask); -phylink_set (mask, Pause); -phylink_set (mask, Asym_Pause);switch (state->interface) {case PHY_INTERFACE_MODE_10GBASER :
Greg Kroah-Hartman
maintainerPATCH 20/43 rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
In reply to Greg Kroah-HartmanFrom: Andrey Zhizhikin <[email protected]>
[ Upstream commit e56b3d94d939f52d46209b9e1b6700c5bfff3123 ]
MSFT ActiveSync implementation requires that the size of the response for incoming query is to be provided in the request input length. Failure to set the input size proper results in failed request transfer, where the ActiveSync counterpart reports the NDIS_STATUS_INVALID_LENGTH (0xC0010014L) error.
Set the input size for OID_GEN_PHYSICAL_MEDIUM query to the expected size of the response in order for the ActiveSync to properly respond to the request.
--- drivers/net/usb/rndis_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/rndis_host.c +1 -1
@@ -387,7 +387,7 @@ generic_rndis_bind(struct usbnet *dev, s reply_len =sizeof *phym; retval =rndis_query (dev, intf, u.buf,RNDIS_OID_GEN_PHYSICAL_MEDIUM , -0 , (void **) &phym, &reply_len); + reply_len, (void **)&phym, &reply_len);if (retval !=0 || !phym) {/* OID is optional so don't fail here. */ phym_unspec =cpu_to_le32 (RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED );
Greg Kroah-Hartman
maintainerPATCH 21/43 esp: avoid unneeded kmap_atomic call
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
[ Upstream commit 9bd6b629c39e3fa9e14243a6d8820492be1a5b2e ]
esp(6)_output_head uses skb_page_frag_refill to allocate a buffer for the esp trailer.
It accesses the page with kmap_atomic to handle highmem. But skb_page_frag_refill can return compound pages, of which kmap_atomic only maps the first underlying page.
skb_page_frag_refill does not return highmem, because flag __GFP_HIGHMEM is not set. ESP uses it in the same manner as TCP. That also does not call kmap_atomic, but directly uses page_address, in skb_copy_to_page_nocache. Do the same for ESP.
This issue has become easier to trigger with recent kmap local debugging feature CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP.
--- net/ipv4/esp4.c | 7 +------ net/ipv6/esp6.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-)
net/ipv4/esp4.c +1 -6
@@ -443,7 +443,6 @@ static int esp_output_encap(struct xfrm_int esp_output_head (struct xfrm_state *x,struct sk_buff *skb,struct esp_info *esp) {u8 *tail; -u8 *vaddr;int nfrags;int esph_offset;struct page *page;
@@ -485,14 +484,10 @@ int esp_output_head(struct xfrm_state *x page = pfrag->page;get_page (page); - vaddr =kmap_atomic (page); - - tail = vaddr + pfrag->offset; + tail =page_address (page) + pfrag->offset;esp_output_fill_trailer (tail, esp->tfclen, esp->plen, esp->proto); -kunmap_atomic (vaddr); - nfrags =skb_shinfo (skb)->nr_frags; __skb_fill_page_desc(skb, nfrags, page, pfrag->offset,
net/ipv6/esp6.c +1 -6
@@ -478,7 +478,6 @@ static int esp6_output_encap(struct xfrmint esp6_output_head (struct xfrm_state *x,struct sk_buff *skb,struct esp_info *esp) {u8 *tail; -u8 *vaddr;int nfrags;int esph_offset;struct page *page;
@@ -519,14 +518,10 @@ int esp6_output_head(struct xfrm_state * page = pfrag->page;get_page (page); - vaddr =kmap_atomic (page); - - tail = vaddr + pfrag->offset; + tail =page_address (page) + pfrag->offset;esp_output_fill_trailer (tail, esp->tfclen, esp->plen, esp->proto); -kunmap_atomic (vaddr); - nfrags =skb_shinfo (skb)->nr_frags; __skb_fill_page_desc(skb, nfrags, page, pfrag->offset,
Greg Kroah-Hartman
maintainerPATCH 22/43 net: dcb: Validate netlink message in DCB handler
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 826f328e2b7e8854dd42ea44e6519cd75018e7b1 ]
DCB uses the same handler function for both RTM_GETDCB and RTM_SETDCB messages. dcb_doit() bounces RTM_SETDCB mesasges if the user does not have the CAP_NET_ADMIN capability.
However, the operation to be performed is not decided from the DCB message type, but from the DCB command. Thus DCB_CMD_*_GET commands are used for reading DCB objects, the corresponding SET and DEL commands are used for manipulation.
The assumption is that set-like commands will be sent via an RTM_SETDCB message, and get-like ones via RTM_GETDCB. However, this assumption is not enforced.
It is therefore possible to manipulate DCB objects without CAP_NET_ADMIN capability by sending the corresponding command in an RTM_GETDCB message. That is a bug. Fix it by validating the type of the request message against the type used for the response.
--- net/dcb/dcbnl.c | 2 ++ 1 file changed, 2 insertions(+)
net/dcb/dcbnl.c +2 -0
@@ -1765,6 +1765,8 @@ static int dcb_doit(struct sk_buff *skb, fn = &reply_funcs[dcb->cmd];if (!fn->cb)return -EOPNOTSUPP ; +if (fn->type != nlh->nlmsg_type) +return -EPERM ;if (!tb[DCB_ATTR_IFNAME ])return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 23/43 net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit df85bc140a4d6cbaa78d8e9c35154e1a2f0622c7 ]
In commit 826f328e2b7e ("net: dcb: Validate netlink message in DCB handler"), Linux started rejecting RTM_GETDCB netlink messages if they contained a set-like DCB_CMD_ command.
The reason was that privileges were only verified for RTM_SETDCB messages, but the value that determined the action to be taken is the command, not the message type. And validation of message type against the DCB command was the obvious missing piece.
Unfortunately it turns out that mlnx_qos, a somewhat widely deployed tool for configuration of DCB, accesses the DCB set-like APIs through RTM_GETDCB.
Therefore do not bounce the discrepancy between message type and command. Instead, in addition to validating privileges based on the actual message type, validate them also based on the expected message type. This closes the loophole of allowing DCB configuration on non-admin accounts, while maintaining backward compatibility.
--- net/dcb/dcbnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dcb/dcbnl.c +1 -1
@@ -1765,7 +1765,7 @@ static int dcb_doit(struct sk_buff *skb, fn = &reply_funcs[dcb->cmd];if (!fn->cb)return -EOPNOTSUPP ; -if (fn->type != nlh->nlmsg_type) +if (fn->type ==RTM_SETDCB && !netlink_capable (skb,CAP_NET_ADMIN ))return -EPERM ;if (!tb[DCB_ATTR_IFNAME ])
Greg Kroah-Hartman
maintainerPATCH 24/43 rxrpc: Call state should be read with READ_ONCE() under some circumstances
In reply to Greg Kroah-HartmanFrom: Baptiste Lepers <[email protected]>
[ Upstream commit a95d25dd7b94a5ba18246da09b4218f132fed60e ]
The call state may be changed at any time by the data-ready routine in response to received packets, so if the call state is to be read and acted upon several times in a function, READ_ONCE() must be used unless the call state lock is held.
As it happens, we used READ_ONCE() to read the state a few lines above the unmarked read in rxrpc_input_data(), so use that value rather than re-reading it.
--- net/rxrpc/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/input.c +1 -1
@@ -430,7 +430,7 @@ static void rxrpc_input_data(struct rxrpreturn ; } -if (call->state ==RXRPC_CALL_SERVER_RECV_REQUEST ) { +if (state ==RXRPC_CALL_SERVER_RECV_REQUEST ) {unsigned long timo =READ_ONCE (call->next_req_timo);unsigned long now, expect_req_by;
Greg Kroah-Hartman
maintainerPATCH 25/43 i40e: fix potential NULL pointer dereferencing
In reply to Greg Kroah-HartmanFrom: Cristian Dumitrescu <[email protected]>
[ Upstream commit 7128c834d30e6b2cf649f14d8fc274941786d0e1 ]
Currently, the function i40e_construct_skb_zc only frees the input xdp buffer when the output skb is successfully built. On error, the function i40e_clean_rx_irq_zc does not commit anything for the current packet descriptor and simply exits the packet descriptor processing loop, with the plan to restart the processing of this descriptor on the next invocation. Therefore, on error the ring next-to-clean pointer should not advance, the xdp i.e. *bi buffer should not be freed and the current buffer info should not be invalidated by setting *bi to NULL. Therefore, the *bi should only be set to NULL when the function i40e_construct_skb_zc is successful, otherwise a NULL *bi will be dereferenced when the work for the current descriptor is eventually restarted.
--- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_xsk.c +1 -1
@@ -348,12 +348,12 @@ int i40e_clean_rx_irq_zc(struct i40e_rin* SBP is *not* set in PRT_SBPVSI (default not set). */ skb =i40e_construct_skb_zc (rx_ring, *bi); - *bi =NULL ;if (!skb) { rx_ring->rx_stats.alloc_buff_failed++;break ; } + *bi =NULL ; cleaned_count++;i40e_inc_ntc (rx_ring);
Greg Kroah-Hartman
maintainerPATCH 26/43 net: stmmac: Fixed mtu channged by cache aligned
In reply to Greg Kroah-HartmanFrom: David Wu <[email protected]>
[ Upstream commit 5b55299eed78538cc4746e50ee97103a1643249c ]
Since the original mtu is not used when the mtu is updated, the mtu is aligned with cache, this will get an incorrect. For example, if you want to configure the mtu to be 1500, but mtu 1536 is configured in fact.
Fixed: eaf4fac478077 ("net: stmmac: Do not accept invalid MTU values")
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -1
@@ -3996,6 +3996,7 @@ static int stmmac_change_mtu(struct net_ {struct stmmac_priv *priv =netdev_priv (dev);int txfifosz = priv->plat->tx_fifo_size; +const int mtu = new_mtu;if (txfifosz ==0 ) txfifosz = priv->dma_cap.tx_fifo_size;
@@ -4013,7 +4014,7 @@ static int stmmac_change_mtu(struct net_if ((txfifosz < new_mtu) || (new_mtu > BUF_SIZE_16KiB))return -EINVAL ; - dev->mtu = new_mtu; + dev->mtu = mtu;netdev_update_features (dev);
Greg Kroah-Hartman
maintainerPATCH 27/43 net: sit: unregister_netdevice on newlinks error path
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 47e4bb147a96f1c9b4e7691e7e994e53838bfff8 ]
We need to unregister the netdevice if config failed. .ndo_uninit takes care of most of the heavy lifting.
This was uncovered by recent commit c269a24ce057 ("net: make free_netdev() more lenient with unregistering devices"). Previously the partially-initialized device would be left in the system.
--- net/ipv6/sit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv6/sit.c +4 -1
@@ -1645,8 +1645,11 @@ static int ipip6_newlink(struct net *src }#ifdef CONFIG_IPV6_SIT_6RD -if (ipip6_netlink_6rd_parms (data, &ip6rd)) +if (ipip6_netlink_6rd_parms (data, &ip6rd)) { err =ipip6_tunnel_update_6rd (nt, &ip6rd); +if (err <0 ) +unregister_netdevice_queue (dev,NULL ); + }#endif return err;
Greg Kroah-Hartman
maintainerPATCH 28/43 net: stmmac: fix taprio schedule configuration
In reply to Greg Kroah-HartmanFrom: Yannick Vignon <[email protected]>
[ Upstream commit b76889ff51bfee318bea15891420e5aefd2833a0 ]
When configuring a 802.1Qbv schedule through the tc taprio qdisc on an NXP i.MX8MPlus device, the effective cycle time differed from the requested one by N*96ns, with N number of entries in the Qbv Gate Control List. This is because the driver was adding a 96ns margin to each interval of the GCL, apparently to account for the IPG. The problem was observed on NXP i.MX8MPlus devices but likely affected all devices relying on the same configuration callback (dwmac 4.00, 4.10, 5.10 variants).
Fix the issue by removing the margins, and simply setup the MAC with the provided cycle time value. This is the behavior expected by the user-space API, as altering the Qbv schedule timings would break standards conformance. This is also the behavior of several other Ethernet MAC implementations supporting taprio, including the dwxgmac variant of stmmac.
--- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 52 ++------------------------- 1 file changed, 4 insertions(+), 48 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac5.c +4 -48
@@ -572,68 +572,24 @@ static int dwmac5_est_write(void __iomemint dwmac5_est_configure (void __iomem *ioaddr,struct stmmac_est *cfg,unsigned int ptp_rate) { -u32 speed, total_offset, offset, ctrl, ctr_low; -u32 extcfg =readl (ioaddr +GMAC_EXT_CONFIG ); -u32 mac_cfg =readl (ioaddr +GMAC_CONFIG );int i, ret =0x0 ; -u64 total_ctr; - -if (extcfg &GMAC_CONFIG_EIPG_EN ) { - offset = (extcfg &GMAC_CONFIG_EIPG ) >>GMAC_CONFIG_EIPG_SHIFT ; - offset =104 + (offset *8 ); - }else { - offset = (mac_cfg &GMAC_CONFIG_IPG ) >>GMAC_CONFIG_IPG_SHIFT ; - offset =96 - (offset *8 ); - } - - speed = mac_cfg & (GMAC_CONFIG_PS |GMAC_CONFIG_FES ); - speed = speed >>GMAC_CONFIG_FES_SHIFT ; - -switch (speed) { -case 0x0 : - offset = offset *1000 ;/* 1G */ -break ; -case 0x1 : - offset = offset *400 ;/* 2.5G */ -break ; -case 0x2 : - offset = offset *100000 ;/* 10M */ -break ; -case 0x3 : - offset = offset *10000 ;/* 100M */ -break ; -default : -return -EINVAL ; - } - - offset = offset /1000 ; +u32 ctrl; ret |=dwmac5_est_write (ioaddr,BTR_LOW , cfg->btr[0 ], false); ret |=dwmac5_est_write (ioaddr,BTR_HIGH , cfg->btr[1 ], false); ret |=dwmac5_est_write (ioaddr,TER , cfg->ter, false); ret |=dwmac5_est_write (ioaddr,LLR , cfg->gcl_size, false); + ret |=dwmac5_est_write (ioaddr,CTR_LOW , cfg->ctr[0 ], false); + ret |=dwmac5_est_write (ioaddr,CTR_HIGH , cfg->ctr[1 ], false);if (ret)return ret; - total_offset =0 ;for (i =0 ; i < cfg->gcl_size; i++) { - ret =dwmac5_est_write (ioaddr, i, cfg->gcl[i] + offset, true); + ret =dwmac5_est_write (ioaddr, i, cfg->gcl[i], true);if (ret)return ret; - - total_offset += offset; } - total_ctr = cfg->ctr[0 ] + cfg->ctr[1 ] *1000000000ULL ; - total_ctr += total_offset; - - ctr_low =do_div (total_ctr,1000000000 ); - - ret |=dwmac5_est_write (ioaddr,CTR_LOW , ctr_low, false); - ret |=dwmac5_est_write (ioaddr,CTR_HIGH , total_ctr, false); -if (ret) -return ret; - ctrl =readl (ioaddr +MTL_EST_CONTROL ); ctrl &= ~PTOV ; ctrl |= ((1000000000 / ptp_rate) *6 ) <<PTOV_SHIFT ;
Greg Kroah-Hartman
maintainerPATCH 29/43 net: stmmac: fix taprio configuration when base_time is in the past
In reply to Greg Kroah-HartmanFrom: Yannick Vignon <[email protected]>
[ Upstream commit fe28c53ed71d463e187748b6b10e1130dd72ceeb ]
The Synopsys TSN MAC supports Qbv base times in the past, but only up to a certain limit. As a result, a taprio qdisc configuration with a small base time (for example when treating the base time as a simple phase offset) is not applied by the hardware and silently ignored.
This was observed on an NXP i.MX8MPlus device, but likely affects all TSN-variants of the MAC.
Fix the issue by making sure the base time is in the future, pushing it by an integer amount of cycle times if needed. (a similar check is already done in several other taprio implementations, see for example drivers/net/ethernet/intel/igc/igc_tsn.c#L116 or drivers/net/dsa/sja1105/sja1105_ptp.h#L39).
--- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +18 -2
@@ -605,7 +605,8 @@ static int tc_setup_taprio(struct stmmac {u32 size, wid = priv->dma_cap.estwid, dep = priv->dma_cap.estdep;struct plat_stmmacenet_data *plat = priv->plat; -struct timespec64 time; +struct timespec64 time, current_time; +ktime_t current_time_ns;bool fpe = false;int i, ret =0 ;u64 ctr;
@@ -700,7 +701,22 @@ static int tc_setup_taprio(struct stmmac }/* Adjust for real system time */ - time =ktime_to_timespec64 (qopt->base_time); + priv->ptp_clock_ops.gettime64 (&priv->ptp_clock_ops, ¤t_time); + current_time_ns =timespec64_to_ktime (current_time); +if (ktime_after (qopt->base_time, current_time_ns)) { + time =ktime_to_timespec64 (qopt->base_time); + }else { +ktime_t base_time; +s64 n; + + n =div64_s64 (ktime_sub_ns (current_time_ns, qopt->base_time), + qopt->cycle_time); + base_time =ktime_add_ns (qopt->base_time, + (n +1 ) * qopt->cycle_time); + + time =ktime_to_timespec64 (base_time); + } + priv->plat->est->btr[0 ] = (u32 )time.tv_nsec; priv->plat->est->btr[1 ] = (u32 )time.tv_sec;
Greg Kroah-Hartman
maintainerPATCH 30/43 net: avoid 32 x truesize under-estimation for tiny skbs
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 3226b158e67cfaa677fd180152bfb28989cb2fac ]
Both virtio net and napi_get_frags() allocate skbs with a very small skb->head
While using page fragments instead of a kmalloc backed skb->head might give a small performance improvement in some cases, there is a huge risk of under estimating memory usage.
For both GOOD_COPY_LEN and GRO_MAX_HEAD, we can fit at least 32 allocations per page (order-3 page in x86), or even 64 on PowerPC
We have been tracking OOM issues on GKE hosts hitting tcp_mem limits but consuming far more memory for TCP buffers than instructed in tcp_mem[2]
Even if we force napi_alloc_skb() to only use order-0 pages, the issue would still be there on arches with PAGE_SIZE >= 32768
This patch makes sure that small skb head are kmalloc backed, so that other objects in the slab page can be reused instead of being held as long as skbs are sitting in socket queues.
Note that we might in the future use the sk_buff napi cache, instead of going through a more expensive __alloc_skb()
Another idea would be to use separate page sizes depending on the allocated length (to never have more than 4 frags per page)
I would like to thank Greg Thelen for his precious help on this matter, analysing crash dumps is always a time consuming task.
--- net/core/skbuff.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/core/skbuff.c +7 -2
@@ -496,13 +496,17 @@ EXPORT_SYMBOL(__netdev_alloc_skb);struct sk_buff *__napi_alloc_skb (struct napi_struct *napi,unsigned int len,gfp_t gfp_mask) { -struct napi_alloc_cache *nc =this_cpu_ptr (&napi_alloc_cache); +struct napi_alloc_cache *nc;struct sk_buff *skb;void *data; len +=NET_SKB_PAD +NET_IP_ALIGN ; -if ((len >SKB_WITH_OVERHEAD (PAGE_SIZE )) || +/* If requested length is either too small or too big, +* we use kmalloc() for skb->head allocation. +*/ +if (len <=SKB_WITH_OVERHEAD (1024 ) || + len >SKB_WITH_OVERHEAD (PAGE_SIZE ) || (gfp_mask & (__GFP_DIRECT_RECLAIM |GFP_DMA ))) { skb =__alloc_skb (len, gfp_mask,SKB_ALLOC_RX ,NUMA_NO_NODE );if (!skb)
@@ -510,6 +514,7 @@ struct sk_buff *__napi_alloc_skb(struct goto skb_success; } + nc =this_cpu_ptr (&napi_alloc_cache); len +=SKB_DATA_ALIGN (sizeof (struct skb_shared_info )); len =SKB_DATA_ALIGN (len);
Greg Kroah-Hartman
maintainerPATCH 31/43 dt-bindings: net: renesas,etheravb: RZ/G2H needs tx-internal-delay-ps
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit f97844f9c518172f813b7ece18a9956b1f70c1bb ]
The merge resolution of the interaction of commits 307eea32b202864c ("dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC") and d7adf6331189cbe9 ("dt-bindings: net: renesas,etheravb: Convert to json-schema") missed that "tx-internal-delay-ps" should be a required property on RZ/G2H.
--- Documentation/devicetree/bindings/net/renesas,etheravb.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/renesas,etheravb.yaml +1 -0
@@ -163,6 +163,7 @@ allOf: enum: - renesas,etheravb-r8a774a1 - renesas,etheravb-r8a774b1 + - renesas,etheravb-r8a774e1 - renesas,etheravb-r8a7795 - renesas,etheravb-r8a7796 - renesas,etheravb-r8a77961
Greg Kroah-Hartman
maintainerPATCH 32/43 net: phy: smsc: fix clk error handling
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
[ Upstream commit a18caa97b1bda0a3d126a7be165ddcfc56c2dde6 ]
Commit bedd8d78aba3 ("net: phy: smsc: LAN8710/20: add phy refclk in support") added the phy clk support. The commit already checks if clk_get_optional() throw an error but instead of returning the error it ignores it.
--- drivers/net/phy/smsc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/phy/smsc.c +2 -1
@@ -284,7 +284,8 @@ static int smsc_phy_probe(struct phy_dev/* Make clk optional to keep DTB backward compatibility. */ priv->refclk =clk_get_optional (dev,NULL );if (IS_ERR (priv->refclk)) -dev_err_probe (dev,PTR_ERR (priv->refclk),"Failed to request clock\n" ); +return dev_err_probe (dev,PTR_ERR (priv->refclk), +"Failed to request clock\n" ); ret =clk_prepare_enable (priv->refclk);if (ret)
Greg Kroah-Hartman
maintainerPATCH 33/43 net: dsa: clear devlink port type before unregistering slave netdevs
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 91158e1680b164c8d101144ca916a3dca10c3e17 ]
Florian reported a use-after-free bug in devlink_nl_port_fill found with KASAN:
(devlink_nl_port_fill)
(devlink_port_notify)
(devlink_port_unregister)
(dsa_switch_teardown.part.3)
(dsa_tree_teardown_switches)
(dsa_unregister_switch)
(bcm_sf2_sw_remove)
(platform_remove)
(device_release_driver_internal)
(device_links_unbind_consumers)
(device_release_driver_internal)
(device_driver_detach)
(unbind_store)
Allocated by task 31: alloc_netdev_mqs+0x5c/0x50c dsa_slave_create+0x110/0x9c8 dsa_register_switch+0xdb0/0x13a4 b53_switch_register+0x47c/0x6dc bcm_sf2_sw_probe+0xaa4/0xc98 platform_probe+0x90/0xf4 really_probe+0x184/0x728 driver_probe_device+0xa4/0x278 __device_attach_driver+0xe8/0x148 bus_for_each_drv+0x108/0x158 Freed by task 249: free_netdev+0x170/0x194 dsa_slave_destroy+0xac/0xb0 dsa_port_teardown.part.2+0xa0/0xb4 dsa_tree_teardown_switches+0x50/0xc4 dsa_unregister_switch+0x124/0x250 bcm_sf2_sw_remove+0x98/0x13c platform_remove+0x44/0x5c device_release_driver_internal+0x150/0x254 device_links_unbind_consumers+0xf8/0x12c device_release_driver_internal+0x84/0x254 device_driver_detach+0x30/0x34 unbind_store+0x90/0x134
What happens is that devlink_port_unregister emits a netlink DEVLINK_CMD_PORT_DEL message which associates the devlink port that is getting unregistered with the ifindex of its corresponding net_device. Only trouble is, the net_device has already been unregistered.
It looks like we can stub out the search for a corresponding net_device if we clear the devlink_port's type. This looks like a bit of a hack, but also seems to be the reason why the devlink_port_type_clear function exists in the first place.
--- net/dsa/dsa2.c | 4 ++++ 1 file changed, 4 insertions(+)
net/dsa/dsa2.c +4 -0
@@ -353,9 +353,13 @@ static int dsa_port_devlink_setup(structstatic void dsa_port_teardown (struct dsa_port *dp) { +struct devlink_port *dlp = &dp->devlink_port; +if (!dp->setup)return ; +devlink_port_type_clear (dlp); +switch (dp->type) {case DSA_PORT_TYPE_UNUSED :break ;
Greg Kroah-Hartman
maintainerPATCH 34/43 rxrpc: Fix handling of an unsupported token type in rxrpc_read()
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit d52e419ac8b50c8bef41b398ed13528e75d7ad48 ]
Clang static analysis reports the following:
net/rxrpc/key.c:657:11: warning: Assigned value is garbage or undefined
toksize = toksizes[tok++];
^ ~~~~~~~~~~~~~~~rxrpc_read() contains two consecutive loops. The first loop calculates the token sizes and stores the results in toksizes[] and the second one uses the array. When there is an error in identifying the token in the first loop, the token is skipped, no change is made to the toksizes[] array. When the same error happens in the second loop, the token is not skipped. This will cause the toksizes[] array to be out of step and will overrun past the calculated sizes.
Fix this by making both loops log a message and return an error in this case. This should only happen if a new token type is incompletely implemented, so it should normally be impossible to trigger this.
--- net/rxrpc/key.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/rxrpc/key.c +4 -2
@@ -1109,7 +1109,7 @@ static long rxrpc_read(const struct keydefault :/* we have a ticket we can't encode */ pr_err ("Unsupported key token type (%u)\n" , token->security_index); -continue ; +return -ENOPKG ; }_debug ("token[%u]: toksize=%u" , ntoks, toksize);
@@ -1224,7 +1224,9 @@ static long rxrpc_read(const struct keybreak ;default : -break ; +pr_err ("Unsupported key token type (%u)\n" , + token->security_index); +return -ENOPKG ; } ASSERTCMP((unsigned long)xdr - (unsigned long)oldxdr, ==,
Greg Kroah-Hartman
maintainerPATCH 35/43 net: stmmac: use __napi_schedule() for PREEMPT_RT
In reply to Greg Kroah-HartmanFrom: Seb Laveze <[email protected]>
[ Upstream commit 1f02efd1bb35bee95feed6aab46d1217f29d555b ]
Use of __napi_schedule_irqoff() is not safe with PREEMPT_RT in which hard interrupts are not disabled while running the threaded interrupt.
Using __napi_schedule() works for both PREEMPT_RT and mainline Linux, just at the cost of an additional check if interrupts are disabled for mainline (since they are already disabled).
Similar to the fix done for enetc commit 215602a8d212 ("enetc: use napi_schedule to be compatible with PREEMPT_RT")
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -2
@@ -2158,7 +2158,7 @@ static int stmmac_napi_check(struct stmmspin_lock_irqsave (&ch->lock, flags);stmmac_disable_dma_irq (priv, priv->ioaddr, chan,1 ,0 );spin_unlock_irqrestore (&ch->lock, flags); -__napi_schedule_irqoff (&ch->rx_napi); +__napi_schedule (&ch->rx_napi); } }
@@ -2167,7 +2167,7 @@ static int stmmac_napi_check(struct stmmspin_lock_irqsave (&ch->lock, flags);stmmac_disable_dma_irq (priv, priv->ioaddr, chan,0 ,1 );spin_unlock_irqrestore (&ch->lock, flags); -__napi_schedule_irqoff (&ch->tx_napi); +__napi_schedule (&ch->tx_napi); } }
Greg Kroah-Hartman
maintainerPATCH 36/43 can: mcp251xfd: mcp251xfd_handle_rxif_one(): fix wrong NULL pointer check
In reply to Greg Kroah-HartmanFrom: Qinglang Miao <[email protected]>
[ Upstream commit ca4c6ebeeb50112f5178f14bfb6d9e8ddf148545 ]
If alloc_canfd_skb() returns NULL, 'cfg' is an uninitialized variable, so we should check 'skb' rather than 'cfd' after calling alloc_canfd_skb(priv->ndev, &cfd).
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +1 -1
@@ -1432,7 +1432,7 @@ mcp251xfd_handle_rxif_one(struct mcp251xelse skb =alloc_can_skb (priv->ndev, (struct can_frame **)&cfd); -if (!cfd) { +if (!skb) { stats->rx_dropped++;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 37/43 drm/panel: otm8009a: allow using non-continuous dsi clock
In reply to Greg Kroah-HartmanFrom: Antonio Borneo <[email protected]>
commit 880ee3b7615e7cc087f659cb80ce22f5db56f9a2 upstream.
The panel is able to work when dsi clock is non-continuous, thus the system power consumption can be reduced using such feature.
Add MIPI_DSI_CLOCK_NON_CONTINUOUS to panel's mode_flags.
Changes in v2:
- Added my signed-off
--- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +1 -1
@@ -452,7 +452,7 @@ static int otm8009a_probe(struct mipi_ds dsi->lanes =2 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST | -MIPI_DSI_MODE_LPM ; +MIPI_DSI_MODE_LPM |MIPI_DSI_CLOCK_NON_CONTINUOUS ;drm_panel_init (&ctx->panel, dev, &otm8009a_drm_funcs,DRM_MODE_CONNECTOR_DSI );
Greg Kroah-Hartman
maintainerPATCH 38/43 mac80211: do not drop tx nulldata packets on encrypted links
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit 2463ec86cd0338a2c2edbfb0b9d50c52ff76ff43 upstream.
ieee80211_tx_h_select_key drops any non-mgmt packets without a key when encryption is used. This is wrong for nulldata packets that can't be encrypted and are sent out for probing clients and indicating 4-address mode.
--- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/tx.c +1 -1
@@ -662,7 +662,7 @@ ieee80211_tx_h_select_key(struct ieee802if (!skip_hw && tx->key && tx->key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE ) info->control.hw_key = &tx->key->conf; - }else if (!ieee80211_is_mgmt (hdr->frame_control) && tx->sta && + }else if (ieee80211_is_data_present (hdr->frame_control) && tx->sta &&test_sta_flag (tx->sta,WLAN_STA_USES_ENCRYPTION )) {return TX_DROP ; }
Greg Kroah-Hartman
maintainerPATCH 39/43 mac80211: check if atf has been disabled in __ieee80211_schedule_txq
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
commit c13cf5c159660451c8fbdc37efb998b198e1d305 upstream.
Check if atf has been disabled in __ieee80211_schedule_txq() in order to avoid a given sta is always put to the beginning of the active_txqs list and never moved to the end since deficit is not decremented in ieee80211_sta_register_airtime()
--- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/tx.c +1 -1
@@ -3836,7 +3836,7 @@ void __ieee80211_schedule_txq(struct iee* get immediately moved to the back of the list on the next * call to ieee80211_next_txq(). */ -if (txqi->txq.sta && +if (txqi->txq.sta && local->airtime_flags &&wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AIRTIME_FAIRNESS )) list_add(&txqi->schedule_order,
Greg Kroah-Hartman
maintainerPATCH 40/43 net: dsa: unbind all switches from tree when DSA master unbinds
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit 07b90056cb15ff9877dca0d8f1b6583d1051f724 upstream.
Currently the following happens when a DSA master driver unbinds while there are DSA switches attached to it:
$ echo 0000:00:00.5 > /sys/bus/pci/drivers/mscc_felix/unbind ------------[ cut here ]------------ WARNING: CPU: 0 PID: 392 at net/core/dev.c:9507 Call trace: rollback_registered_many+0x5fc/0x688 unregister_netdevice_queue+0x98/0x120 dsa_slave_destroy+0x4c/0x88 dsa_port_teardown.part.16+0x78/0xb0 dsa_tree_teardown_switches+0x58/0xc0 dsa_unregister_switch+0x104/0x1b8 felix_pci_remove+0x24/0x48 pci_device_remove+0x48/0xf0 device_release_driver_internal+0x118/0x1e8 device_driver_detach+0x28/0x38 unbind_store+0xd0/0x100
Located at the above location is this WARN_ON:
/* Notifier chain MUST detach us all upper devices. */ WARN_ON(netdev_has_any_upper_dev(dev));
Other stacked interfaces, like VLAN, do indeed listen for NETDEV_UNREGISTER on the real_dev and also unregister themselves at that time, which is clearly the behavior that rollback_registered_many expects. But DSA interfaces are not VLAN. They have backing hardware (platform devices, PCI devices, MDIO, SPI etc) which have a life cycle of their own and we can't just trigger an unregister from the DSA framework when we receive a netdev notifier that the master unregisters.
Luckily, there is something we can do, and that is to inform the driver core that we have a runtime dependency to the DSA master interface's device, and create a device link where that is the supplier and we are the consumer. Having this device link will make the DSA switch unbind before the DSA master unbinds, which is enough to avoid the WARN_ON from rollback_registered_many.
Note that even before the blamed commit, DSA did nothing intelligent when the master interface got unregistered either. See the discussion here:
https://lore.kernel.org/netdev/[email protected]/
But this time, at least the WARN_ON is loud enough that the upper_dev_link commit can be blamed.
The advantage with this approach vs dev_hold(master) in the attached link is that the latter is not meant for long term reference counting. With dev_hold, the only thing that will happen is that when the user attempts an unbind of the DSA master, netdev_wait_allrefs will keep waiting and waiting, due to DSA keeping the refcount forever. DSA would not access freed memory corresponding to the master interface, but the unbind would still result in a freeze. Whereas with device links, graceful teardown is ensured. It even works with cascaded DSA trees.
$ echo 0000:00:00.2 > /sys/bus/pci/drivers/fsl_enetc/unbind [ 1818.797546] device swp0 left promiscuous mode [ 1819.301112] sja1105 spi2.0: Link is Down [ 1819.307981] DSA: tree 1 torn down [ 1819.312408] device eno2 left promiscuous mode [ 1819.656803] mscc_felix 0000:00:00.5: Link is Down [ 1819.667194] DSA: tree 0 torn down [ 1819.711557] fsl_enetc 0000:00:00.2 eno2: Link is Down
This approach allows us to keep the DSA framework absolutely unchanged, and the driver core will just know to unbind us first when the master goes away - as opposed to the large (and probably impossible) rework required if attempting to listen for NETDEV_UNREGISTER.
As per the documentation at Documentation/driver-api/device_link.rst, specifying the DL_FLAG_AUTOREMOVE_CONSUMER flag causes the device link to be automatically purged when the consumer fails to probe or later unbinds. So we don't need to keep the consumer_link variable in struct dsa_switch.
--- net/dsa/master.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/dsa/master.c +10 -0
@@ -308,8 +308,18 @@ static struct lock_class_key dsa_master_int dsa_master_setup (struct net_device *dev,struct dsa_port *cpu_dp) { +struct dsa_switch *ds = cpu_dp->ds; +struct device_link *consumer_link;int ret; +/* The DSA master must use SET_NETDEV_DEV for this to work. */ + consumer_link =device_link_add (ds->dev, dev->dev.parent, +DL_FLAG_AUTOREMOVE_CONSUMER ); +if (!consumer_link) +netdev_err (dev, +"Failed to create a device link to DSA switch %s\n" , +dev_name (ds->dev)); +rtnl_lock (); ret =dev_set_mtu (dev,ETH_DATA_LEN + cpu_dp->tag_ops->overhead);rtnl_unlock ();
Greg Kroah-Hartman
maintainerPATCH 41/43 cxgb4/chtls: Fix tid stuck due to wrong update of qid
In reply to Greg Kroah-HartmanFrom: Ayush Sawal <[email protected]>
commit 8ad2a970d2010add3963e7219eb50367ab3fa4eb upstream.
TID stuck is seen when there is a race in CPL_PASS_ACCEPT_RPL/CPL_ABORT_REQ and abort is arriving before the accept reply, which sets the queue number. In this case HW ends up sending CPL_ABORT_RPL_RSS to an incorrect ingress queue.
V1->V2:
- Removed the unused variable len in chtls_set_quiesce_ctrl().
V2->V3:
- As kfree_skb() has a check for null skb, so removed this check before calling kfree_skb() in func chtls_send_reset().
--- drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h | 7 ++ drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h | 4 + drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c | 32 ++++++++- drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c | 41 ++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h +7 -0
@@ -40,6 +40,13 @@#define TCB_L2T_IX_M 0xfffULL#define TCB_L2T_IX_V (x) ((x) << TCB_L2T_IX_S) +#define TCB_T_FLAGS_W 1 +#define TCB_T_FLAGS_S 0 +#define TCB_T_FLAGS_M 0xffffffffffffffffULL +#define TCB_T_FLAGS_V (x) ((__u64)(x) << TCB_T_FLAGS_S) + +#define TCB_FIELD_COOKIE_TFLAG 1 +#define TCB_SMAC_SEL_W 0#define TCB_SMAC_SEL_S 24#define TCB_SMAC_SEL_M 0xffULL
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h +4 -0
@@ -573,7 +573,11 @@ int send_tx_flowc_wr(struct sock *sk, invoid chtls_tcp_push (struct sock *sk,int flags);int chtls_push_frames (struct chtls_sock *csk,int comp);int chtls_set_tcb_tflag (struct sock *sk,unsigned int bit_pos,int val); +void chtls_set_tcb_field_rpl_skb (struct sock *sk,u16 word, +u64 mask,u64 val,u8 cookie, +int through_l2t);int chtls_setkey (struct chtls_sock *csk,u32 keylen,u32 mode,int cipher_type); +void chtls_set_quiesce_ctrl (struct sock *sk,int val);void skb_entail (struct sock *sk,struct sk_buff *skb,int flags);unsigned int keyid_to_addr (int start_addr,int keyid);void free_tls_keyid (struct sock *sk);
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +30 -2
@@ -32,6 +32,7 @@#include "chtls.h" #include "chtls_cm.h" #include "clip_tbl.h" +#include "t4_tcb.h" /* * State transitions and actions for close. Note that if we are in SYN_SENT
@@ -267,7 +268,9 @@ static void chtls_send_reset(struct sockif (sk->sk_state !=TCP_SYN_RECV )chtls_send_abort (sk, mode, skb);else - goto out; +chtls_set_tcb_field_rpl_skb (sk,TCB_T_FLAGS_W , +TCB_T_FLAGS_V (TCB_T_FLAGS_M ),0 , +TCB_FIELD_COOKIE_TFLAG ,1 );return ; out:
@@ -1948,6 +1951,8 @@ static void chtls_close_con_rpl(struct selse if (tcp_sk (sk)->linger2 <0 && !csk_flag_nochk (csk,CSK_ABORT_SHUTDOWN ))chtls_abort_conn (sk, skb); +else if (csk_flag_nochk (csk,CSK_TX_DATA_SENT )) +chtls_set_quiesce_ctrl (sk,0 );break ;default :pr_info ("close_con_rpl in bad state %d\n" , sk->sk_state);
@@ -2291,6 +2296,28 @@ static int chtls_wr_ack(struct chtls_devreturn 0 ; } +static int chtls_set_tcb_rpl (struct chtls_dev *cdev,struct sk_buff *skb) +{ +struct cpl_set_tcb_rpl *rpl =cplhdr (skb) +RSS_HDR ; +unsigned int hwtid =GET_TID (rpl); +struct sock *sk; + + sk =lookup_tid (cdev->tids, hwtid); + +/* return EINVAL if socket doesn't exist */ +if (!sk) +return -EINVAL ; + +/* Reusing the skb as size of cpl_set_tcb_field structure +* is greater than cpl_abort_req +*/ +if (TCB_COOKIE_G (rpl->cookie) ==TCB_FIELD_COOKIE_TFLAG ) +chtls_send_abort (sk,CPL_ABORT_SEND_RST ,NULL ); + +kfree_skb (skb); +return 0 ; +} +chtls_handler_func chtls_handlers[NUM_CPL_CMDS ] = { [CPL_PASS_OPEN_RPL ] = chtls_pass_open_rpl, [CPL_CLOSE_LISTSRV_RPL ] = chtls_close_listsrv_rpl,
@@ -2303,5 +2330,6 @@ chtls_handler_func chtls_handlers[NUM_CP [CPL_CLOSE_CON_RPL] = chtls_conn_cpl, [CPL_ABORT_REQ_RSS] = chtls_conn_cpl, [CPL_ABORT_RPL_RSS] = chtls_conn_cpl, - [CPL_FW4_ACK] = chtls_wr_ack, + [CPL_FW4_ACK] = chtls_wr_ack, + [CPL_SET_TCB_RPL] = chtls_set_tcb_rpl, };
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c +41 -0
53 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 42/43 spi: fsl: Fix driver breakage when SPI_CS_HIGH is not set in spi->mode
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 7a2da5d7960a64ee923fe3e31f01a1101052c66f upstream.
Commit 766c6b63aa04 ("spi: fix client driver breakages when using GPIO descriptors") broke fsl spi driver.
As now we fully rely on gpiolib for handling the polarity of chip selects, the driver shall not alter the GPIO value anymore when SPI_CS_HIGH is not set in spi->mode.
--- drivers/spi/spi-fsl-spi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/spi/spi-fsl-spi.c +2 -3
@@ -115,14 +115,13 @@ static void fsl_spi_chipselect(struct sp {struct mpc8xxx_spi *mpc8xxx_spi =spi_master_get_devdata (spi->master);struct fsl_spi_platform_data *pdata; -bool pol = spi->mode &SPI_CS_HIGH ;struct spi_mpc8xxx_cs *cs = spi->controller_state; pdata = spi->dev.parent->parent->platform_data;if (value ==BITBANG_CS_INACTIVE ) {if (pdata->cs_control) - pdata->cs_control (spi, !pol); + pdata->cs_control (spi, false); }if (value ==BITBANG_CS_ACTIVE ) {
@@ -134,7 +133,7 @@ static void fsl_spi_chipselect(struct spfsl_spi_change_mode (spi);if (pdata->cs_control) - pdata->cs_control (spi, pol); + pdata->cs_control (spi, true); } }
Greg Kroah-Hartman
maintainerPATCH 43/43 spi: cadence: cache reference clock rate during probe
In reply to Greg Kroah-HartmanFrom: Michael Hennerich <[email protected]>
commit 4d163ad79b155c71bf30366dc38f8d2502f78844 upstream.
The issue is that using SPI from a callback under the CCF lock will deadlock, since this code uses clk_get_rate().
--- drivers/spi/spi-cadence.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/spi/spi-cadence.c +4 -2
@@ -115,6 +115,7 @@ struct cdns_spi {void __iomem *regs;struct clk *ref_clk;struct clk *pclk; +unsigned int clk_rate;u32 speed_hz;const u8 *txbuf;u8 *rxbuf;
@@ -250,7 +251,7 @@ static void cdns_spi_config_clock_freq(su32 ctrl_reg, baud_rate_val;unsigned long frequency; - frequency =clk_get_rate (xspi->ref_clk); + frequency = xspi->clk_rate; ctrl_reg =cdns_spi_read (xspi,CDNS_SPI_CR );
@@ -558,8 +559,9 @@ static int cdns_spi_probe(struct platfor master->auto_runtime_pm = true; master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; + xspi->clk_rate =clk_get_rate (xspi->ref_clk);/* Set to default valid value */ - master->max_speed_hz =clk_get_rate (xspi->ref_clk) /4 ; + master->max_speed_hz = xspi->clk_rate /4 ; xspi->speed_hz = master->max_speed_hz; master->bits_per_word_mask =SPI_BPW_MASK (8 );
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · Shuah Khan
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +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/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Quoted 8 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Tested-by Shuah Khan <[email protected]>
Thanks for testing these and letting me know.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.10.10-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.10.y
git commit: 402284178c914c87fd7b41bc9bd93f2772c43904
git describe: v5.10.9-44-g402284178c91
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.9-44-g402284178c91
No regressions (compared to build v5.10.9)
No fixes (compared to build v5.10.9)
Ran 55124 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- nxp-ls2088
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-i386-clang
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* igt-gpu-tools
* install-android-platform-tools-r2600
* libhugetlbfs
* linux-log-parser
* ltp-commands-tests
* ltp-containers-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-tracing-tests
* fwts
* kselftest
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* network-basic-tests
* perf
* ltp-controllers-tests
* ltp-open-posix-tests
* v4l2-compliance
* kvm-unit-tests
* kunit
* rcutorture
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Naresh Kamboju
Tested-by Linux Kernel Functional TestingQuoted 18 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +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/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Quoted 92 lines
Summary
------------------------------------------------------------------------kernel: 5.10.10-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.10.y
git commit:402284178c914c87fd7b41bc9bd93f2772c43904
git describe: v5.10.9-44-g402284178c91
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.9-44-g402284178c91No regressions (compared to build v5.10.9)
No fixes (compared to build v5.10.9)
Ran 55124 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- nxp-ls2088
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-i386-clang
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
-qemu_arm
-qemu_arm64
- qemu_arm64-compat
-qemu_i386
-qemu_x86_64
- qemu_x86_64-compat
- x15
- x86
- x86-kasanTest Suites
-----------
* build
* igt-gpu-tools
* install-android-platform-tools-r2600
* libhugetlbfs
* linux-log-parser
* ltp-commands-tests
* ltp-containers-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-sched-tests
* ltp-tracing-tests
* fwts
* kselftest
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* network-basic-tests
* perf
* ltp-controllers-tests
* ltp-open-posix-tests
* v4l2-compliance
* kvm-unit-tests
* kunit
* rcutorture
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 19 lines · Naresh Kamboju
Quoted 18 lines · Naresh Kamboju
Quoted 15 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +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/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Thanks for testing them all and letting me know.
greg k-h
Hi!
Quoted 7 lines
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerQuoted 7 lines · Pavel Machek
Hi!
Quoted 5 lines
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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.
Quoted 8 lines
Quoted 2 lines
Responses should be made by Sun, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Tested-by Pavel Machek (CIP) <[email protected]>
Thanks for testing some of these and letting me know.
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
Quoted 6 lines
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0Tested-by Guenter Roeck <[email protected]>
Thanks for testing them all and letting me know.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
12 builds: 12 pass, 0 fail
26 boots: 26 pass, 0 fail
64 tests: 64 pass, 0 failLinux version: 5.10.10-rc1-g402284178c91
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Greg Kroah-Hartman
maintainerQuoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.10 release. There are 43 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, 24 Jan 2021 13:57:23 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
12 builds: 12 pass, 0 fail 26 boots: 26 pass, 0 fail 64 tests: 64 pass, 0 fail
Quoted 7 lines
Linux version: 5.10.10-rc1-g402284178c91
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Tested-by Jon Hunter <[email protected]>
Thanks for testing all of these and letting me know.
greg k-h