5.4.44-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.4.44-rc1 review
This is the start of the stable review cycle for the 5.4.44 release. There are 142 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 Wed, 03 Jun 2020 17:38:19 +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.4.44-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.44-rc1
Changbin Du <[email protected]>
perf: Make perf able to build with latest libbfd
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build
Nathan Chancellor <[email protected]>
netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update
Pablo Neira Ayuso <[email protected]>
netfilter: conntrack: comparison of unsigned in cthelper confirmation
Dmitry Torokhov <[email protected]>
Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
Qiushi Wu <[email protected]>
bonding: Fix reference count leak in bond_sysfs_slave_add.
Vladimir Oltean <[email protected]>
net: dsa: declare lockless TX feature for slave ports
David Ahern <[email protected]>
ipv4: nexthop version of fib_info_nh_uses_dev
David Ahern <[email protected]>
nexthop: Expand nexthop_is_multipath in a few places
Nikolay Aleksandrov <[email protected]>
nexthops: don't modify published nexthop groups
David Ahern <[email protected]>
nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry
Eric Dumazet <[email protected]>
crypto: chelsio/chtls: properly set tp->lsndtime
Qiushi Wu <[email protected]>
qlcnic: fix missing release in qlcnic_83xx_interrupt_test.
Björn Töpel <[email protected]>
xsk: Add overflow check for u64 division, stored into u32
Pradeep Kumar Chitrapu <[email protected]>
ieee80211: Fix incorrect mask for default PE duration
Michael Chan <[email protected]>
bnxt_en: Fix accumulation of bp->net_stats_prev.
Xin Long <[email protected]>
esp6: get the right proto for transport mode in esp6_gso_encap
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code
Pablo Neira Ayuso <[email protected]>
netfilter: nfnetlink_cthelper: unbreak userspace helper support
Pablo Neira Ayuso <[email protected]>
netfilter: conntrack: make conntrack userspace helpers work again
Phil Sutter <[email protected]>
netfilter: ipset: Fix subcounter update skip
Michael Braun <[email protected]>
netfilter: nft_reject_bridge: enable reject with bridge vlan
Xin Long <[email protected]>
ip_vti: receive ipip packet by calling ip_tunnel_rcv
Antony Antony <[email protected]>
xfrm: fix error in comment
Xin Long <[email protected]>
xfrm: fix a NULL-ptr deref in xfrm_local_error
Xin Long <[email protected]>
xfrm: fix a warning in xfrm_policy_insert_list
Nicolas Dichtel <[email protected]>
xfrm interface: fix oops when deleting a x-netns interface
Xin Long <[email protected]>
xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output
Xin Long <[email protected]>
xfrm: remove the xfrm_state_put call becofe going to out_reset
Xin Long <[email protected]>
xfrm: do pskb_pull properly in __xfrm_transport_prep
Xin Long <[email protected]>
xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input
Al Viro <[email protected]>
copy_xstate_to_kernel(): don't leave parts of destination uninitialized
Alexander Dahl <[email protected]>
x86/dma: Fix max PFN arithmetic overflow on 32 bit systems
Linus Lüssing <[email protected]>
mac80211: mesh: fix discovery timer re-arming issue / crash
Andy Lutomirski <[email protected]>
x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long"
Johannes Berg <[email protected]>
cfg80211: fix debugfs rename crash
Helge Deller <[email protected]>
parisc: Fix kernel panic in mem_init()
Qiushi Wu <[email protected]>
iommu: Fix reference count leak in iommu_group_alloc.
Linus Walleij <[email protected]>
gpio: fix locking open drain IRQ lines
Jens Axboe <[email protected]>
Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Arnd Bergmann <[email protected]>
include/asm-generic/topology.h: guard cpumask_of_node() macro argument
Alexander Potapenko <[email protected]>
fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info()
Konstantin Khlebnikov <[email protected]>
mm: remove VM_BUG_ON(PageSlab()) from page_mapcount()
Hugh Dickins <[email protected]>
mm,thp: stop leaking unreleased file pages
Valentine Fatiev <[email protected]>
IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode
Simon Ser <[email protected]>
drm/amd/display: drop cursor position check in atomic test
Jason Gunthorpe <[email protected]>
RDMA/core: Fix double destruction of uobject
Jeff Layton <[email protected]>
ceph: flush release queue when handling caps for unknown inode
Jerry Lee <[email protected]>
libceph: ignore pool overlay and cache logic on redirects
Kailang Yang <[email protected]>
ALSA: hda/realtek - Add new codec supported for ALC287
Takashi Iwai <[email protected]>
ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio
Vinod Koul <[email protected]>
clk: qcom: gcc: Fix parent for gpll0_out_even
Eric W. Biederman <[email protected]>
exec: Always set cap_ambient in cap_bprm_set_creds
Chris Chiu <[email protected]>
ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround
Changming Liu <[email protected]>
ALSA: hwdep: fix a left shifting 1 by 31 UB bug
Qiushi Wu <[email protected]>
RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe()
Tiezhu Yang <[email protected]>
gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()
Tiezhu Yang <[email protected]>
gpio: pxa: Fix return value of pxa_gpio_probe()
Peng Hao <[email protected]>
mmc: block: Fix use-after-free issue for rpmb
Hamish Martin <[email protected]>
ARM: dts: bcm: HR2: Fix PPI interrupt types
Vincent Stehlé <[email protected]>
ARM: dts: bcm2835-rpi-zero-w: Fix led polarity
Robert Beckett <[email protected]>
ARM: dts/imx6q-bx50v3: Set display interface clock parents
Kaike Wan <[email protected]>
IB/qib: Call kobject_put() when kobject_init_and_add() fails
Paul Cercueil <[email protected]>
gpu/drm: Ingenic: Fix opaque pointer casted to wrong type
Dennis YC Hsieh <[email protected]>
soc: mediatek: cmdq: return send msg error code
Hsin-Yi Wang <[email protected]>
arm64: dts: mt8173: fix vcodec-enc clock
Takashi Iwai <[email protected]>
gpio: exar: Fix bad handling for ida_simple_get error path
Russell King <[email protected]>
ARM: uaccess: fix DACR mismatch with nested exceptions
Russell King <[email protected]>
ARM: uaccess: integrate uaccess_save and uaccess_restore
Russell King <[email protected]>
ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h
Łukasz Stelmach <[email protected]>
ARM: 8970/1: decompressor: increase tag size
Wei Yongjun <[email protected]>
Input: synaptics-rmi4 - fix error return code in rmi_driver_probe()
Evan Green <[email protected]>
Input: synaptics-rmi4 - really fix attn_data use-after-free
Kevin Locke <[email protected]>
Input: i8042 - add ThinkPad S230u to i8042 reset list
Christophe JAILLET <[email protected]>
Input: dlink-dir685-touchkeys - fix a typo in driver name
Łukasz Patron <[email protected]>
Input: xpad - add custom init packet for Xbox One S controllers
Brendan Shanks <[email protected]>
Input: evdev - call input_flush_device() on release(), not flush()
Kevin Locke <[email protected]>
Input: i8042 - add ThinkPad S230u to i8042 nomux list
James Hilliard <[email protected]>
Input: usbtouchscreen - add support for BonXeon TP
Madhuparna Bhowmik <[email protected]>
drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c
Matteo Croce <[email protected]>
samples: bpf: Fix build error
Al Viro <[email protected]>
csky: Fixup raw_copy_from_user()
Steve French <[email protected]>
cifs: Fix null pointer check in cifs_read
Amy Shih <[email protected]>
hwmon: (nct7904) Fix incorrect range of temperature limit registers
Liu Yibin <[email protected]>
csky: Fixup remove duplicate irq_disable
Mao Han <[email protected]>
csky: Fixup perf callchain unwind
Liu Yibin <[email protected]>
csky: Fixup msa highest 3 bits mask
Tero Kristo <[email protected]>
clk: ti: am33xx: fix RTC clock parent
Kefeng Wang <[email protected]>
riscv: stacktrace: Fix undefined reference to `walk_stackframe'
Denis V. Lunev <[email protected]>
IB/i40iw: Remove bogus call to netdev_master_upper_dev_get()
Arnd Bergmann <[email protected]>
net: freescale: select CONFIG_FIXED_PHY where needed
Masahiro Yamada <[email protected]>
usb: gadget: legacy: fix redundant initialization warnings
Christophe JAILLET <[email protected]>
usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()'
Andy Shevchenko <[email protected]>
usb: dwc3: pci: Enable extcon driver for Intel Merrifield
Lei Xue <[email protected]>
cachefiles: Fix race between read_waiter and read_copier involving op->to_do
Felix Kuehling <[email protected]>
drm/amdgpu: Use GEM obj reference for KFD BOs
Evan Quan <[email protected]>
drm/amd/powerplay: perform PG ungate prior to CG ungate
Evan Quan <[email protected]>
drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate
Andreas Gruenbacher <[email protected]>
gfs2: Grab glock reference sooner in gfs2_add_revoke
Bob Peterson <[email protected]>
gfs2: don't call quota_unhold if quotas are not locked
Bob Peterson <[email protected]>
gfs2: move privileged user check to gfs2_quota_lock_check
Chuhong Yuan <[email protected]>
net: microchip: encx24j600: add missed kthread_stop
Andrew Oakley <[email protected]>
ALSA: usb-audio: add mapping for ASRock TRX40 Creator
Stephen Warren <[email protected]>
gpio: tegra: mask GPIO IRQs during IRQ shutdown
Johan Jonker <[email protected]>
ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi
Johan Jonker <[email protected]>
ARM: dts: rockchip: swap clock-names of gpu nodes
Johan Jonker <[email protected]>
arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node
Johan Jonker <[email protected]>
arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts
Johan Jonker <[email protected]>
ARM: dts: rockchip: fix phy nodename for rk3229-xms6
Johan Jonker <[email protected]>
ARM: dts: rockchip: fix phy nodename for rk3228-evb
Jiri Pirko <[email protected]>
mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails
Qiushi Wu <[email protected]>
net/mlx4_core: fix a memory leak bug.
Qiushi Wu <[email protected]>
net: sun: fix missing release regions in cas_init_one().
Vadim Fedorenko <[email protected]>
net/tls: free record only on encryption error
Vadim Fedorenko <[email protected]>
net/tls: fix encryption error checking
Roi Dayan <[email protected]>
net/mlx5: Annotate mutex destroy for root ns
Shay Drory <[email protected]>
net/mlx5: Fix error flow in case of function_setup failure
Moshe Shemesh <[email protected]>
net/mlx5e: Update netdev txq on completions during closure
Moshe Shemesh <[email protected]>
net/mlx5: Fix memory leak in mlx5_events_init
Roi Dayan <[email protected]>
net/mlx5e: Fix inner tirs handling
Tariq Toukan <[email protected]>
net/mlx5e: kTLS, Destroy key object after destroying the TIS
Eric Dumazet <[email protected]>
tipc: block BH before using dst_cache
Jere Leppänen <[email protected]>
sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed
Neil Horman <[email protected]>
sctp: Don't add the shutdown timer if its already been added
Marc Payne <[email protected]>
r8152: support additional Microsoft Surface Ethernet Adapter variant
David Ahern <[email protected]>
nexthop: Fix attribute checking for groups
Vinay Kumar Yadav <[email protected]>
net/tls: fix race condition causing kernel panic
Roman Mashak <[email protected]>
net sched: fix reporting the first-time use timestamp
Yuqi Jin <[email protected]>
net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()"
Manivannan Sadhasivam <[email protected]>
net: qrtr: Fix passing invalid reference to qrtr_local_enqueue()
Stephen Worley <[email protected]>
net: nlmsg_cancel() if put fails for nhmsg
Russell King <[email protected]>
net: mvpp2: fix RX hashing for non-10G ports
Moshe Shemesh <[email protected]>
net/mlx5: Add command entry handling completion
Vadim Fedorenko <[email protected]>
net: ipip: fix wrong address family in init error path
Martin KaFai Lau <[email protected]>
net: inet_csk: Fix so_reuseport bind-address cache in tb->fast*
Boris Sukholitko <[email protected]>
__netif_receive_skb_core: pass skb by reference
Grygorii Strashko <[email protected]>
net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
DENG Qingfang <[email protected]>
net: dsa: mt7530: fix roaming from DSA user ports
Sabrina Dubroca <[email protected]>
net: don't return invalid table id error when we fall back to PF_UNSPEC
Vladimir Oltean <[email protected]>
dpaa_eth: fix usage as DSA master, try 3
Eric Dumazet <[email protected]>
ax25: fix setsockopt(SO_BINDTODEVICE)
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/compressed/vmlinux.lds.S | 2 +- arch/arm/boot/dts/bcm-hr2.dtsi | 6 +- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- arch/arm/boot/dts/imx6q-b450v3.dts | 7 -- arch/arm/boot/dts/imx6q-b650v3.dts | 7 -- arch/arm/boot/dts/imx6q-b850v3.dts | 11 -- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 15 +++ arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3228-evb.dts | 2 +- arch/arm/boot/dts/rk3229-xms6.dts | 2 +- arch/arm/boot/dts/rk322x.dtsi | 6 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm/include/asm/assembler.h | 75 +------------ arch/arm/include/asm/uaccess-asm.h | 117 +++++++++++++++++++++ arch/arm/kernel/entry-armv.S | 11 +- arch/arm/kernel/entry-header.S | 9 +- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- arch/csky/abiv1/inc/abi/entry.h | 4 +- arch/csky/abiv2/inc/abi/entry.h | 4 +- arch/csky/include/asm/uaccess.h | 49 +++++---- arch/csky/kernel/entry.S | 2 - arch/csky/kernel/perf_callchain.c | 9 +- arch/csky/lib/usercopy.c | 8 +- arch/parisc/mm/init.c | 2 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/x86/include/asm/dma.h | 2 +- arch/x86/include/uapi/asm/unistd.h | 11 +- arch/x86/kernel/fpu/xstate.c | 86 ++++++++------- block/blk-core.c | 11 +- drivers/clk/qcom/gcc-sm8150.c | 3 +- drivers/clk/ti/clk-33xx.c | 2 +- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- drivers/gpio/gpio-bcm-kona.c | 2 +- drivers/gpio/gpio-exar.c | 7 +- drivers/gpio/gpio-pxa.c | 4 +- drivers/gpio/gpio-tegra.c | 1 + drivers/gpio/gpiolib.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 -- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- drivers/hwmon/nct7904.c | 4 +- drivers/infiniband/core/rdma_core.c | 20 ++-- drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 -- drivers/infiniband/hw/qib/qib_sysfs.c | 9 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib.h | 4 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 +- drivers/input/evdev.c | 19 +--- drivers/input/joystick/xpad.c | 12 +++ drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- drivers/input/rmi4/rmi_driver.c | 5 +- drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/input/touchscreen/usbtouchscreen.c | 1 + drivers/iommu/iommu.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/net/bonding/bond_sysfs_slave.c | 4 +- drivers/net/dsa/mt7530.c | 9 +- drivers/net/dsa/mt7530.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 2 + drivers/net/ethernet/freescale/dpaa/Kconfig | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 ++- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 ++ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 ++- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 8 ++ drivers/net/ethernet/microchip/encx24j600.c | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- drivers/net/ethernet/sun/cassini.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 4 + drivers/net/hamradio/bpqether.c | 3 +- drivers/net/usb/cdc_ether.c | 11 +- drivers/net/usb/r8152.c | 1 + drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 1 + drivers/usb/gadget/legacy/inode.c | 3 +- drivers/usb/phy/phy-twl6030-usb.c | 12 ++- fs/binfmt_elf.c | 2 +- fs/cachefiles/rdwr.c | 2 +- fs/ceph/caps.c | 2 +- fs/cifs/file.c | 2 +- fs/gfs2/log.c | 6 +- fs/gfs2/quota.c | 6 +- fs/gfs2/quota.h | 3 +- include/asm-generic/topology.h | 2 +- include/linux/ieee80211.h | 2 +- include/linux/mlx5/driver.h | 1 + include/linux/mm.h | 15 ++- include/linux/netfilter/nf_conntrack_pptp.h | 2 +- include/net/act_api.h | 3 +- include/net/ip_fib.h | 11 +- include/net/nexthop.h | 67 +++++++++--- include/net/tls.h | 4 + include/rdma/uverbs_std_types.h | 2 +- include/uapi/linux/xfrm.h | 2 +- mm/khugepaged.c | 1 + net/ax25/af_ax25.c | 6 +- net/bridge/netfilter/nft_reject_bridge.c | 6 ++ net/ceph/osd_client.c | 4 +- net/core/dev.c | 20 +++- net/dsa/slave.c | 1 + net/dsa/tag_mtk.c | 15 +++ net/ipv4/esp4_offload.c | 4 +- net/ipv4/fib_frontend.c | 22 ++-- net/ipv4/inet_connection_sock.c | 43 ++++---- net/ipv4/ip_vti.c | 23 +++- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 7 +- net/ipv4/nexthop.c | 105 +++++++++++------- net/ipv4/route.c | 14 ++- net/ipv6/esp6_offload.c | 13 ++- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6mr.c | 2 +- net/mac80211/mesh_hwmp.c | 7 ++ net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/nf_conntrack_core.c | 80 ++++++++++++-- net/netfilter/nf_conntrack_pptp.c | 62 ++++++----- net/netfilter/nfnetlink_cthelper.c | 3 +- net/qrtr/qrtr.c | 2 +- net/sctp/sm_sideeffect.c | 14 ++- net/sctp/sm_statefuns.c | 9 +- net/tipc/udp_media.c | 6 +- net/tls/tls_sw.c | 50 ++++++--- net/wireless/core.c | 2 +- net/xdp/xdp_umem.c | 8 +- net/xfrm/xfrm_device.c | 8 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_interface.c | 21 ++++ net/xfrm/xfrm_output.c | 15 +-- net/xfrm/xfrm_policy.c | 7 +- samples/bpf/lwt_len_hist_user.c | 2 - security/commoncap.c | 1 + sound/core/hwdep.c | 4 +- sound/pci/hda/patch_realtek.c | 39 +++++-- sound/usb/mixer.c | 8 ++ sound/usb/mixer_maps.c | 24 +++++ sound/usb/quirks-table.h | 26 +++++ tools/arch/x86/include/uapi/asm/unistd.h | 2 +- tools/perf/util/srcline.c | 16 ++- 159 files changed, 1101 insertions(+), 594 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/142 ax25: fix setsockopt(SO_BINDTODEVICE)
From: Eric Dumazet <[email protected]>
[ Upstream commit 687775cec056b38a4c8f3291e0dd7a9145f7b667 ]
syzbot was able to trigger this trace [1], probably by using a zero optlen.
While we are at it, cap optlen to IFNAMSIZ - 1 instead of IFNAMSIZ.
[1]
BUG: KMSAN: uninit-value in strnlen+0xf9/0x170 lib/string.c:569 CPU: 0 PID: 8807 Comm: syz-executor483 Not tainted 5.7.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:121 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 strnlen+0xf9/0x170 lib/string.c:569 dev_name_hash net/core/dev.c:207 [inline] netdev_name_node_lookup net/core/dev.c:277 [inline] __dev_get_by_name+0x75/0x2b0 net/core/dev.c:778 ax25_setsockopt+0xfa3/0x1170 net/ax25/af_ax25.c:654 __compat_sys_setsockopt+0x4ed/0x910 net/compat.c:403 __do_compat_sys_setsockopt net/compat.c:413 [inline] __se_compat_sys_setsockopt+0xdd/0x100 net/compat.c:410 __ia32_compat_sys_setsockopt+0x62/0x80 net/compat.c:410 do_syscall_32_irqs_on arch/x86/entry/common.c:339 [inline] do_fast_syscall_32+0x3bf/0x6d0 arch/x86/entry/common.c:398 entry_SYSENTER_compat+0x68/0x77 arch/x86/entry/entry_64_compat.S:139 RIP: 0023:0xf7f57dd9 Code: 90 e8 0b 00 00 00 f3 90 0f ae e8 eb f9 8d 74 26 00 89 3c 24 c3 90 90 90 90 90 90 90 90 90 90 90 90 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 eb 0d 90 90 90 90 90 90 90 90 90 90 90 90 RSP: 002b:00000000ffae8c1c EFLAGS: 00000217 ORIG_RAX: 000000000000016e RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000000101 RDX: 0000000000000019 RSI: 0000000020000000 RDI: 0000000000000004 RBP: 0000000000000012 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
Local variable ----devname@ax25_setsockopt created at:
ax25_setsockopt+0xe6/0x1170 net/ax25/af_ax25.c:536 ax25_setsockopt+0xe6/0x1170 net/ax25/af_ax25.c:536
--- net/ax25/af_ax25.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/ax25/af_ax25.c +4 -2
@@ -635,8 +635,10 @@ static int ax25_setsockopt(struct socketbreak ;case SO_BINDTODEVICE : -if (optlen >IFNAMSIZ ) - optlen =IFNAMSIZ ; +if (optlen >IFNAMSIZ -1 ) + optlen =IFNAMSIZ -1 ; + +memset (devname,0 ,sizeof (devname));if (copy_from_user (devname, optval, optlen)) { res = -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 2/142 dpaa_eth: fix usage as DSA master, try 3
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 5d14c304bfc14b4fd052dc83d5224376b48f52f0 ]
The dpaa-eth driver probes on compatible string for the MAC node, and the fman/mac.c driver allocates a dpaa-ethernet platform device that triggers the probing of the dpaa-eth net device driver.
All of this is fine, but the problem is that the struct device of the dpaa_eth net_device is 2 parents away from the MAC which can be referenced via of_node. So of_find_net_device_by_node can't find it, and DSA switches won't be able to probe on top of FMan ports.
It would be a bit silly to modify a core function (of_find_net_device_by_node) to look for dev->parent->parent->of_node just for one driver. We're just 1 step away from implementing full recursion.
Actually there have already been at least 2 previous attempts to make this work:
- Commit a1a50c8e4c24 ("fsl/man: Inherit parent device and of_node")
- One or more of the patches in "[v3,0/6] adapt DPAA drivers for DSA":
https://patchwork.ozlabs.org/project/netdev/cover/[email protected]/
(I couldn't really figure out which one was supposed to solve the problem and how).
Point being, it looks like this is still pretty much a problem today. On T1040, the /sys/class/net/eth0 symlink currently points to
../../devices/platform/ffe000000.soc/ffe400000.fman/ffe4e6000.ethernet/dpaa-ethernet.0/net/eth0
which pretty much illustrates the problem. The closest of_node we've got is the "fsl,fman-memac" at /soc@ffe000000/fman@400000/ethernet@e6000, which is what we'd like to be able to reference from DSA as host port.
For of_find_net_device_by_node to find the eth0 port, we would need the parent of the eth0 net_device to not be the "dpaa-ethernet" platform device, but to point 1 level higher, aka the "fsl,fman-memac" node directly. The new sysfs path would look like this:
../../devices/platform/ffe000000.soc/ffe400000.fman/ffe4e6000.ethernet/net/eth0
And this is exactly what SET_NETDEV_DEV does. It sets the parent of the net_device. The new parent has an of_node associated with it, and of_dev_node_match already checks for the of_node of the device or of its parent.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1 -1
@@ -2802,7 +2802,7 @@ static int dpaa_eth_probe(struct platfor }/* Do this here, so we can be verbose early */ -SET_NETDEV_DEV (net_dev, dev); +SET_NETDEV_DEV (net_dev, dev->parent);dev_set_drvdata (dev, net_dev); priv =netdev_priv (net_dev);
Greg Kroah-Hartman
maintainerPATCH 3/142 net: dont return invalid table id error when we fall back to PF_UNSPEC
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 41b4bd986f86331efc599b9a3f5fb86ad92e9af9 ]
In case we can't find a ->dumpit callback for the requested (family,type) pair, we fall back to (PF_UNSPEC,type). In effect, we're in the same situation as if userspace had requested a PF_UNSPEC dump. For RTM_GETROUTE, that handler is rtnl_dump_all, which calls all the registered RTM_GETROUTE handlers.
The requested table id may or may not exist for all of those families. commit ae677bbb4441 ("net: Don't return invalid table id error when dumping all families") fixed the problem when userspace explicitly requests a PF_UNSPEC dump, but missed the fallback case.
For example, when we pass ipv6.disable=1 to a kernel with CONFIG_IP_MROUTE=y and CONFIG_IP_MROUTE_MULTIPLE_TABLES=y, the (PF_INET6, RTM_GETROUTE) handler isn't registered, so we end up in rtnl_dump_all, and listing IPv6 routes will unexpectedly print:
# ip -6 r Error: ipv4: MR table does not exist. Dump terminated
commit ae677bbb4441 introduced the dump_all_families variable, which gets set when userspace requests a PF_UNSPEC dump. However, we can't simply set the family to PF_UNSPEC in rtnetlink_rcv_msg in the fallback case to get dump_all_families == true, because some messages types (for example RTM_GETRULE and RTM_GETNEIGH) only register the PF_UNSPEC handler and use the family to filter in the kernel what is dumped to userspace. We would then export more entries, that userspace would have to filter. iproute does that, but other programs may not.
Instead, this patch removes dump_all_families and updates the RTM_GETROUTE handlers to check if the family that is being dumped is their own. When it's not, which covers both the intentional PF_UNSPEC dumps (as dump_all_families did) and the fallback case, ignore the missing table id error.
--- include/net/ip_fib.h | 1 - net/ipv4/fib_frontend.c | 3 +-- net/ipv4/ipmr.c | 2 +- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6mr.c | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-)
include/net/ip_fib.h +0 -1
@@ -244,7 +244,6 @@ struct fib_dump_filter {u32 table_id;/* filter_set is an optimization that an entry is set */ bool filter_set; -bool dump_all_families;bool dump_routes;bool dump_exceptions;unsigned char protocol;
net/ipv4/fib_frontend.c +1 -2
@@ -928,7 +928,6 @@ int ip_valid_fib_dump_req(struct net *neelse filter->dump_exceptions = false; - filter->dump_all_families = (rtm->rtm_family ==AF_UNSPEC ); filter->flags = rtm->rtm_flags; filter->protocol = rtm->rtm_protocol; filter->rt_type = rtm->rtm_type;
@@ -1000,7 +999,7 @@ static int inet_dump_fib(struct sk_buffif (filter.table_id) { tb =fib_get_table (net, filter.table_id);if (!tb) { -if (filter.dump_all_families) +if (rtnl_msg_family (cb->nlh) !=PF_INET )return skb->len;NL_SET_ERR_MSG (cb->extack,"ipv4: FIB table does not exist" );
net/ipv4/ipmr.c +1 -1
@@ -2609,7 +2609,7 @@ static int ipmr_rtm_dumproute(struct sk_ mrt =ipmr_get_table (sock_net (skb->sk), filter.table_id);if (!mrt) { -if (filter.dump_all_families) +if (rtnl_msg_family (cb->nlh) !=RTNL_FAMILY_IPMR )return skb->len;NL_SET_ERR_MSG (cb->extack,"ipv4: MR table does not exist" );
net/ipv6/ip6_fib.c +1 -1
@@ -613,7 +613,7 @@ static int inet6_dump_fib(struct sk_buffif (arg.filter.table_id) { tb =fib6_get_table (net, arg.filter.table_id);if (!tb) { -if (arg.filter.dump_all_families) +if (rtnl_msg_family (cb->nlh) !=PF_INET6 ) goto out;NL_SET_ERR_MSG_MOD (cb->extack,"FIB table does not exist" );
net/ipv6/ip6mr.c +1 -1
@@ -2498,7 +2498,7 @@ static int ip6mr_rtm_dumproute(struct sk mrt =ip6mr_get_table (sock_net (skb->sk), filter.table_id);if (!mrt) { -if (filter.dump_all_families) +if (rtnl_msg_family (cb->nlh) !=RTNL_FAMILY_IP6MR )return skb->len;NL_SET_ERR_MSG_MOD (cb->extack,"MR table does not exist" );
Greg Kroah-Hartman
maintainerPATCH 4/142 net: dsa: mt7530: fix roaming from DSA user ports
In reply to Greg Kroah-HartmanFrom: DENG Qingfang <[email protected]>
[ Upstream commit 5e5502e012b8129e11be616acb0f9c34bc8f8adb ]
When a client moves from a DSA user port to a software port in a bridge, it cannot reach any other clients that connected to the DSA user ports. That is because SA learning on the CPU port is disabled, so the switch ignores the client's frames from the CPU port and still thinks it is at the user port.
Fix it by enabling SA learning on the CPU port.
To prevent the switch from learning from flooding frames from the CPU port, set skb->offload_fwd_mark to 1 for unicast and broadcast frames, and let the switch flood them instead of trapping to the CPU port. Multicast frames still need to be trapped to the CPU port for snooping, so set the SA_DIS bit of the MTK tag to 1 when transmitting those frames to disable SA learning.
--- drivers/net/dsa/mt7530.c | 9 ++------- drivers/net/dsa/mt7530.h | 1 + net/dsa/tag_mtk.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-)
drivers/net/dsa/mt7530.c +2 -7
@@ -639,11 +639,8 @@ mt7530_cpu_port_enable(struct mt7530_primt7530_write (priv,MT7530_PVC_P (port),PORT_SPEC_TAG ); -/* Disable auto learning on the cpu port */ -mt7530_set (priv,MT7530_PSC_P (port),SA_DIS ); - -/* Unknown unicast frame fordwarding to the cpu port */ -mt7530_set (priv,MT7530_MFC ,UNU_FFP (BIT (port))); +/* Unknown multicast frame forwarding to the cpu port */ +mt7530_rmw (priv,MT7530_MFC ,UNM_FFP_MASK ,UNM_FFP (BIT (port)));/* Set CPU port number */ if (priv->id ==ID_MT7621 )
@@ -1246,8 +1243,6 @@ mt7530_setup(struct dsa_switch *ds)/* Enable and reset MIB counters */ mt7530_mib_reset (ds); -mt7530_clear (priv,MT7530_MFC ,UNU_FFP_MASK ); -for (i =0 ; i <MT7530_NUM_PORTS ; i++) {/* Disable forwarding by default on all ports */ mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,
drivers/net/dsa/mt7530.h +1 -0
@@ -31,6 +31,7 @@ enum {#define MT7530_MFC 0x10#define BC_FFP (x) (((x) & 0xff) << 24)#define UNM_FFP (x) (((x) & 0xff) << 16) +#define UNM_FFP_MASK UNM_FFP(~0)#define UNU_FFP (x) (((x) & 0xff) << 8)#define UNU_FFP_MASK UNU_FFP(~0)#define CPU_EN BIT(7)
net/dsa/tag_mtk.c +15 -0
@@ -15,6 +15,7 @@#define MTK_HDR_XMIT_TAGGED_TPID_8100 1#define MTK_HDR_RECV_SOURCE_PORT_MASK GENMASK(2, 0)#define MTK_HDR_XMIT_DP_BIT_MASK GENMASK(5, 0) +#define MTK_HDR_XMIT_SA_DIS BIT(6)static struct sk_buff *mtk_tag_xmit (struct sk_buff *skb,struct net_device *dev)
@@ -22,6 +23,9 @@ static struct sk_buff *mtk_tag_xmit(strustruct dsa_port *dp =dsa_slave_to_port (dev);u8 *mtk_tag;bool is_vlan_skb = true; +unsigned char *dest =eth_hdr (skb)->h_dest; +bool is_multicast_skb =is_multicast_ether_addr (dest) && + !is_broadcast_ether_addr (dest);/* Build the special tag after the MAC Source Address. If VLAN header * is present, it's required that VLAN header and special tag is
@@ -47,6 +51,10 @@ static struct sk_buff *mtk_tag_xmit(struMTK_HDR_XMIT_UNTAGGED ; mtk_tag[1 ] = (1 << dp->index) &MTK_HDR_XMIT_DP_BIT_MASK ; +/* Disable SA learning for multicast frames */ +if (unlikely (is_multicast_skb)) + mtk_tag[1 ] |=MTK_HDR_XMIT_SA_DIS ; +/* Tag control information is kept for 802.1Q */ if (!is_vlan_skb) { mtk_tag[2 ] =0 ;
@@ -61,6 +69,9 @@ static struct sk_buff *mtk_tag_rcv(struc {int port;__be16 *phdr, hdr; +unsigned char *dest =eth_hdr (skb)->h_dest; +bool is_multicast_skb =is_multicast_ether_addr (dest) && + !is_broadcast_ether_addr (dest);if (unlikely (!pskb_may_pull (skb,MTK_HDR_LEN )))return NULL ;
@@ -86,6 +97,10 @@ static struct sk_buff *mtk_tag_rcv(strucif (!skb->dev)return NULL ; +/* Only unicast or broadcast frames are offloaded */ +if (likely (!is_multicast_skb)) + skb->offload_fwd_mark =1 ; +return skb; }
Greg Kroah-Hartman
maintainerPATCH 5/142 net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 4c64b83d03f4aafcdf710caad994cbc855802e74 ]
vlan_for_each() are required to be called with rtnl_lock taken, otherwise ASSERT_RTNL() warning will be triggered - which happens now during System resume from suspend:
cpsw_suspend()
|- cpsw_ndo_stop()
|- __hw_addr_ref_unsync_dev()
|- cpsw_purge_all_mc()
|- vlan_for_each()
|- ASSERT_RTNL();Hence, fix it by surrounding cpsw_ndo_stop() by rtnl_lock/unlock() calls.
--- drivers/net/ethernet/ti/cpsw.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/ti/cpsw.c +4 -0
@@ -2999,11 +2999,15 @@ static int cpsw_suspend(struct device *dstruct cpsw_common *cpsw =dev_get_drvdata (dev);int i; +rtnl_lock (); +for (i =0 ; i < cpsw->data.slaves; i++)if (cpsw->slaves[i].ndev)if (netif_running (cpsw->slaves[i].ndev))cpsw_ndo_stop (cpsw->slaves[i].ndev); +rtnl_unlock (); +/* Select sleep pin state */ pinctrl_pm_select_sleep_state (dev);
Greg Kroah-Hartman
maintainerPATCH 6/142 __netif_receive_skb_core: pass skb by reference
In reply to Greg Kroah-HartmanFrom: Boris Sukholitko <[email protected]>
[ Upstream commit c0bbbdc32febd4f034ecbf3ea17865785b2c0652 ]
__netif_receive_skb_core may change the skb pointer passed into it (e.g. in rx_handler). The original skb may be freed as a result of this operation.
The callers of __netif_receive_skb_core may further process original skb by using pt_prev pointer returned by __netif_receive_skb_core thus leading to unpleasant effects.
The solution is to pass skb by reference into __netif_receive_skb_core.
v2: Added Fixes tag and comment regarding ppt_prev and skb invariant.
--- net/core/dev.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/core/dev.c +15 -5
@@ -4713,11 +4713,12 @@ static inline int nf_ingress(struct sk_breturn 0 ; } -static int __netif_receive_skb_core (struct sk_buff *skb,bool pfmemalloc, +static int __netif_receive_skb_core (struct sk_buff **pskb,bool pfmemalloc,struct packet_type **ppt_prev) {struct packet_type *ptype, *pt_prev;rx_handler_func_t *rx_handler; +struct sk_buff *skb = *pskb;struct net_device *orig_dev;bool deliver_exact = false;int ret =NET_RX_DROP ;
@@ -4748,8 +4749,10 @@ another_round: ret2 =do_xdp_generic (rcu_dereference (skb->dev->xdp_prog), skb);preempt_enable (); -if (ret2 !=XDP_PASS ) -return NET_RX_DROP ; +if (ret2 !=XDP_PASS ) { + ret =NET_RX_DROP ; + goto out; + }skb_reset_mac_len (skb); }
@@ -4899,6 +4902,13 @@ drop: } out: +/* The invariant here is that if *ppt_prev is not NULL +* then skb should also be non-NULL. +* +* Apparently *ppt_prev assignment above holds this invariant due to +* skb dereferencing near it. +*/ + *pskb = skb;return ret; }
@@ -4908,7 +4918,7 @@ static int __netif_receive_skb_one_core(struct packet_type *pt_prev =NULL ;int ret; - ret =__netif_receive_skb_core (skb, pfmemalloc, &pt_prev); + ret =__netif_receive_skb_core (&skb, pfmemalloc, &pt_prev);if (pt_prev) ret =INDIRECT_CALL_INET (pt_prev->func, ipv6_rcv, ip_rcv, skb, skb->dev, pt_prev, orig_dev);
@@ -4986,7 +4996,7 @@ static void __netif_receive_skb_list_corstruct packet_type *pt_prev =NULL ;skb_list_del_init (skb); -__netif_receive_skb_core (skb, pfmemalloc, &pt_prev); +__netif_receive_skb_core (&skb, pfmemalloc, &pt_prev);if (!pt_prev)continue ;if (pt_curr != pt_prev || od_curr != orig_dev) {
Greg Kroah-Hartman
maintainerPATCH 7/142 net: inet_csk: Fix so_reuseport bind-address cache in tb->fast*
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit 88d7fcfa3b1fe670f0412b95be785aafca63352b ]
The commit 637bc8bbe6c0 ("inet: reset tb->fastreuseport when adding a reuseport sk") added a bind-address cache in tb->fast*. The tb->fast* caches the address of a sk which has successfully been binded with SO_REUSEPORT ON. The idea is to avoid the expensive conflict search in inet_csk_bind_conflict().
There is an issue with wildcard matching where sk_reuseport_match() should have returned false but it is currently returning true. It ends up hiding bind conflict. For example,
bind("[::1]:443"); /* without SO_REUSEPORT. Succeed. */bind("[::2]:443"); /* with SO_REUSEPORT. Succeed. */bind("[::]:443"); /* with SO_REUSEPORT. Still Succeed where it shouldn't */
The last bind("[::]:443") with SO_REUSEPORT on should have failed because it should have a conflict with the very first bind("[::1]:443") which has SO_REUSEPORT off. However, the address "[::2]" is cached in tb->fast* in the second bind. In the last bind, the sk_reuseport_match() returns true because the binding sk's wildcard addr "[::]" matches with the "[::2]" cached in tb->fast*.
The correct bind conflict is reported by removing the second bind such that tb->fast* cache is not involved and forces the bind("[::]:443") to go through the inet_csk_bind_conflict():
bind("[::1]:443"); /* without SO_REUSEPORT. Succeed. */bind("[::]:443"); /* with SO_REUSEPORT. -EADDRINUSE */
The expected behavior for sk_reuseport_match() is, it should only allow the "cached" tb->fast* address to be used as a wildcard match but not the address of the binding sk. To do that, the current "bool match_wildcard" arg is split into
"bool match_sk1_wildcard" and "bool match_sk2_wildcard".
This change only affects the sk_reuseport_match() which is only used by inet_csk (e.g. TCP).
The other use cases are calling inet_rcv_saddr_equal() and this patch makes it pass the same "match_wildcard" arg twice to the "ipv[46]_rcv_saddr_equal(..., match_wildcard, match_wildcard)".
--- net/ipv4/inet_connection_sock.c | 43 ++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 19 deletions(-)
net/ipv4/inet_connection_sock.c +24 -19
@@ -24,17 +24,19 @@#include <net/addrconf.h> #if IS_ENABLED (CONFIG_IPV6 ) -/* match_wildcard == true: IPV6_ADDR_ANY equals to any IPv6 addresses if IPv6 -* only, and any IPv4 addresses if not IPv6 only -* match_wildcard == false: addresses must be exactly the same, i.e. -* IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY, -* and 0.0.0.0 equals to 0.0.0.0 only +/* match_sk*_wildcard == true: IPV6_ADDR_ANY equals to any IPv6 addresses +* if IPv6 only, and any IPv4 addresses +* if not IPv6 only +* match_sk*_wildcard == false: addresses must be exactly the same, i.e. +* IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY, +* and 0.0.0.0 equals to 0.0.0.0 only */ static bool ipv6_rcv_saddr_equal (const struct in6_addr *sk1_rcv_saddr6,const struct in6_addr *sk2_rcv_saddr6,__be32 sk1_rcv_saddr,__be32 sk2_rcv_saddr,bool sk1_ipv6only,bool sk2_ipv6only, -bool match_wildcard) +bool match_sk1_wildcard, +bool match_sk2_wildcard) {int addr_type =ipv6_addr_type (sk1_rcv_saddr6);int addr_type2 = sk2_rcv_saddr6 ?ipv6_addr_type (sk2_rcv_saddr6) :IPV6_ADDR_MAPPED ;
@@ -44,8 +46,8 @@ static bool ipv6_rcv_saddr_equal(const sif (!sk2_ipv6only) {if (sk1_rcv_saddr == sk2_rcv_saddr)return true; -if (!sk1_rcv_saddr || !sk2_rcv_saddr) -return match_wildcard; +return (match_sk1_wildcard && !sk1_rcv_saddr) || + (match_sk2_wildcard && !sk2_rcv_saddr); }return false; }
@@ -53,11 +55,11 @@ static bool ipv6_rcv_saddr_equal(const sif (addr_type ==IPV6_ADDR_ANY && addr_type2 ==IPV6_ADDR_ANY )return true; -if (addr_type2 ==IPV6_ADDR_ANY && match_wildcard && +if (addr_type2 ==IPV6_ADDR_ANY && match_sk2_wildcard && !(sk2_ipv6only && addr_type ==IPV6_ADDR_MAPPED ))return true; -if (addr_type ==IPV6_ADDR_ANY && match_wildcard && +if (addr_type ==IPV6_ADDR_ANY && match_sk1_wildcard && !(sk1_ipv6only && addr_type2 ==IPV6_ADDR_MAPPED ))return true;
@@ -69,18 +71,19 @@ static bool ipv6_rcv_saddr_equal(const s }#endif -/* match_wildcard == true: 0.0.0.0 equals to any IPv4 addresses -* match_wildcard == false: addresses must be exactly the same, i.e. -* 0.0.0.0 only equals to 0.0.0.0 +/* match_sk*_wildcard == true: 0.0.0.0 equals to any IPv4 addresses +* match_sk*_wildcard == false: addresses must be exactly the same, i.e. +* 0.0.0.0 only equals to 0.0.0.0 */ static bool ipv4_rcv_saddr_equal (__be32 sk1_rcv_saddr,__be32 sk2_rcv_saddr, -bool sk2_ipv6only,bool match_wildcard) +bool sk2_ipv6only,bool match_sk1_wildcard, +bool match_sk2_wildcard) {if (!sk2_ipv6only) {if (sk1_rcv_saddr == sk2_rcv_saddr)return true; -if (!sk1_rcv_saddr || !sk2_rcv_saddr) -return match_wildcard; +return (match_sk1_wildcard && !sk1_rcv_saddr) || + (match_sk2_wildcard && !sk2_rcv_saddr); }return false; }
@@ -96,10 +99,12 @@ bool inet_rcv_saddr_equal(const struct s sk2->sk_rcv_saddr,ipv6_only_sock (sk),ipv6_only_sock (sk2), + match_wildcard, match_wildcard);#endif return ipv4_rcv_saddr_equal (sk->sk_rcv_saddr, sk2->sk_rcv_saddr, -ipv6_only_sock (sk2), match_wildcard); +ipv6_only_sock (sk2), match_wildcard, + match_wildcard); }EXPORT_SYMBOL (inet_rcv_saddr_equal);
@@ -273,10 +278,10 @@ static inline int sk_reuseport_match(str tb->fast_rcv_saddr, sk->sk_rcv_saddr, tb->fast_ipv6_only, - ipv6_only_sock(sk), true); + ipv6_only_sock(sk), true, false);#endif return ipv4_rcv_saddr_equal (tb->fast_rcv_saddr, sk->sk_rcv_saddr, -ipv6_only_sock (sk), true); +ipv6_only_sock (sk), true, false); }/* Obtain a reference to a local port for the given sock,
Greg Kroah-Hartman
maintainerPATCH 8/142 net: ipip: fix wrong address family in init error path
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
[ Upstream commit 57ebc8f08504f176eb0f25b3e0fde517dec61a4f ]
In case of error with MPLS support the code is misusing AF_INET instead of AF_MPLS.
--- net/ipv4/ipip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ipip.c +1 -1
@@ -698,7 +698,7 @@ out: rtnl_link_failed:#if IS_ENABLED (CONFIG_MPLS ) -xfrm4_tunnel_deregister (&mplsip_handler,AF_INET ); +xfrm4_tunnel_deregister (&mplsip_handler,AF_MPLS ); xfrm_tunnel_mplsip_failed:#endif
Greg Kroah-Hartman
maintainerPATCH 9/142 net/mlx5: Add command entry handling completion
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit 17d00e839d3b592da9659c1977d45f85b77f986a ]
When FW response to commands is very slow and all command entries in use are waiting for completion we can have a race where commands can get timeout before they get out of the queue and handled. Timeout completion on uninitialized command will cause releasing command's buffers before accessing it for initialization and then we will get NULL pointer exception while trying access it. It may also cause releasing buffers of another command since we may have timeout completion before even allocating entry index for this command.
Add entry handling completion to avoid this race.
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 ++++++++++++++ include/linux/mlx5/driver.h | 1 + 2 files changed, 15 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +14 -0
@@ -861,6 +861,7 @@ static void cmd_work_handler(struct workint alloc_ret;int cmd_mode; +complete (&ent->handling); sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;down (sem);if (!ent->page_queue) {
@@ -978,6 +979,11 @@ static int wait_func(struct mlx5_core_destruct mlx5_cmd *cmd = &dev->cmd;int err; +if (!wait_for_completion_timeout (&ent->handling, timeout) && +cancel_work_sync (&ent->work)) { + ent->ret = -ECANCELED ; + goto out_err; + }if (cmd->mode ==CMD_MODE_POLLING || ent->polling) {wait_for_completion (&ent->done); }else if (!wait_for_completion_timeout (&ent->done, timeout)) {
@@ -985,12 +991,17 @@ static int wait_func(struct mlx5_core_demlx5_cmd_comp_handler (dev,1UL << ent->idx, true); } +out_err: err = ent->ret;if (err == -ETIMEDOUT ) {mlx5_core_warn (dev,"%s(0x%x) timeout. Will cause a leak of a command resource\n" ,mlx5_command_str (msg_to_opcode (ent->in)),msg_to_opcode (ent->in)); + }else if (err == -ECANCELED ) { +mlx5_core_warn (dev,"%s(0x%x) canceled on out of queue timeout.\n" , +mlx5_command_str (msg_to_opcode (ent->in)), +msg_to_opcode (ent->in)); }mlx5_core_dbg (dev,"err %d, delivery status %s(%d)\n" , err,deliv_status_to_str (ent->status), ent->status);
@@ -1026,6 +1037,7 @@ static int mlx5_cmd_invoke(struct mlx5_c ent->token = token; ent->polling = force_polling; +init_completion (&ent->handling);if (!callback)init_completion (&ent->done);
@@ -1045,6 +1057,8 @@ static int mlx5_cmd_invoke(struct mlx5_c err =wait_func (dev, ent);if (err == -ETIMEDOUT ) goto out; +if (err == -ECANCELED ) + goto out_free; ds = ent->ts2 - ent->ts1; op =MLX5_GET (mbox_in, in->first.data, opcode);
include/linux/mlx5/driver.h +1 -0
@@ -756,6 +756,7 @@ struct mlx5_cmd_work_ent {struct delayed_work cb_timeout_work;void *context;int idx; +struct completion handling;struct completion done;struct mlx5_cmd *cmd;struct work_struct work;
Greg Kroah-Hartman
maintainerPATCH 10/142 net: mvpp2: fix RX hashing for non-10G ports
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 3138a07ce219acde4c0d7ea0b6d54ba64153328b ]
When rxhash is enabled on any ethernet port except the first in each CP block, traffic flow is prevented. The analysis is below:
I've been investigating this afternoon, and what I've found, comparing a kernel without 895586d5dc32 and with 895586d5dc32 applied is:
- The table programmed into the hardware via mvpp22_rss_fill_table() appears to be identical with or without the commit.
- When rxhash is enabled on eth2, mvpp2_rss_port_c2_enable() reports that c2.attr[0] and c2.attr[2] are written back containing:
- with 895586d5dc32, failing: 00200000 40000000
- without 895586d5dc32, working: 04000000 40000000
- When disabling rxhash, c2.attr[0] and c2.attr[2] are written back as:
04000000 00000000
The second value represents the MVPP22_CLS_C2_ATTR2_RSS_EN bit, the first value is the queue number, which comprises two fields. The high 5 bits are 24:29 and the low three are 21:23 inclusive. This comes from:
c2.attr[0] = MVPP22_CLS_C2_ATTR0_QHIGH(qh) |
MVPP22_CLS_C2_ATTR0_QLOW(ql);So, the working case gives eth2 a queue id of 4.0, or 32 as per port->first_rxq, and the non-working case a queue id of 0.1, or 1. The allocation of queue IDs seems to be in mvpp2_port_probe():
if (priv->hw_version == MVPP21)
port->first_rxq = port->id * port->nrxqs;
else
port->first_rxq = port->id * priv->max_port_rxqs;Where:
if (priv->hw_version == MVPP21)
priv->max_port_rxqs = 8;
else
priv->max_port_rxqs = 32;Making the port 0 (eth0 / eth1) have port->first_rxq = 0, and port 1 (eth2) be 32. It seems the idea is that the first 32 queues belong to port 0, the second 32 queues belong to port 1, etc.
mvpp2_rss_port_c2_enable() gets the queue number from it's parameter, 'ctx', which comes from mvpp22_rss_ctx(port, 0). This returns port->rss_ctx[0].
mvpp22_rss_context_create() is responsible for allocating that, which it does by looking for an unallocated priv->rss_tables[] pointer. This table is shared amongst all ports on the CP silicon.
When we write the tables in mvpp22_rss_fill_table(), the RSS table entry is defined by:
u32 sel = MVPP22_RSS_INDEX_TABLE(rss_ctx) |
MVPP22_RSS_INDEX_TABLE_ENTRY(i);where rss_ctx is the context ID (queue number) and i is the index in the table.
If we look at what is written:
- The first table to be written has "sel" values of 00000000..0000001f, containing values 0..3. This appears to be for eth1. This is table 0, RX queue number 0.
- The second table has "sel" values of 00000100..0000011f, and appears to be for eth2. These contain values 0x20..0x23. This is table 1, RX queue number 0.
- The third table has "sel" values of 00000200..0000021f, and appears to be for eth3. These contain values 0x40..0x43. This is table 2, RX queue number 0.
How do queue numbers translate to the RSS table? There is another table - the RXQ2RSS table, indexed by the MVPP22_RSS_INDEX_QUEUE field of MVPP22_RSS_INDEX and accessed through the MVPP22_RXQ2RSS_TABLE register. Before 895586d5dc32, it was:
mvpp2_write(priv, MVPP22_RSS_INDEX,
MVPP22_RSS_INDEX_QUEUE(port->first_rxq));
mvpp2_write(priv, MVPP22_RXQ2RSS_TABLE,
MVPP22_RSS_TABLE_POINTER(port->id));and after:
mvpp2_write(priv, MVPP22_RSS_INDEX, MVPP22_RSS_INDEX_QUEUE(ctx));
mvpp2_write(priv, MVPP22_RXQ2RSS_TABLE, MVPP22_RSS_TABLE_POINTER(ctx));Before the commit, for eth2, that would've contained '32' for the index and '1' for the table pointer - mapping queue 32 to table 1. Remember that this is queue-high.queue-low of 4.0.
After the commit, we appear to map queue 1 to table 1. That again looks fine on the face of it.
Section 9.3.1 of the A8040 manual seems indicate the reason that the queue number is separated. queue-low seems to always come from the classifier, whereas queue-high can be from the ingress physical port number or the classifier depending on the MVPP2_CLS_SWFWD_PCTRL_REG.
We set the port bit in MVPP2_CLS_SWFWD_PCTRL_REG, meaning that queue-high comes from the MVPP2_CLS_SWFWD_P2HQ_REG() register... and this seems to be where our bug comes from.
mvpp2_cls_oversize_rxq_set() sets this up as:
mvpp2_write(port->priv, MVPP2_CLS_SWFWD_P2HQ_REG(port->id),
(port->first_rxq >> MVPP2_CLS_OVERSIZE_RXQ_LOW_BITS));
val = mvpp2_read(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG);
val |= MVPP2_CLS_SWFWD_PCTRL_MASK(port->id);
mvpp2_write(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);Setting the MVPP2_CLS_SWFWD_PCTRL_MASK bit means that the queue-high for eth2 is _always_ 4, so only queues 32 through 39 inclusive are available to eth2. Yet, we're trying to tell the classifier to set queue-high, which will be ignored, to zero. Hence, the queue-high field (MVPP22_CLS_C2_ATTR0_QHIGH()) from the classifier will be ignored.
This means we end up directing traffic from eth2 not to queue 1, but to queue 33, and then we tell it to look up queue 33 in the RSS table. However, RSS table has not been programmed for queue 33, and so it ends up (presumably) dropping the packets.
It seems that mvpp22_rss_context_create() doesn't take account of the fact that the upper 5 bits of the queue ID can't actually be changed due to the settings in mvpp2_cls_oversize_rxq_set(), _or_ it seems that mvpp2_cls_oversize_rxq_set() has been missed in this commit. Either way, these two functions mutually disagree with what queue number should be used.
Looking deeper into what mvpp2_cls_oversize_rxq_set() and the MTU validation is doing, it seems that MVPP2_CLS_SWFWD_P2HQ_REG() is used for over-sized packets attempting to egress through this port. With the classifier having had RSS enabled and directing eth2 traffic to queue 1, we may still have packets appearing on queue 32 for this port.
However, the only way we may end up with over-sized packets attempting to egress through eth2 - is if the A8040 forwards frames between its ports. From what I can see, we don't support that feature, and the kernel restricts the egress packet size to the MTU. In any case, if we were to attempt to transmit an oversized packet, we have no support in the kernel to deal with that appearing in the port's receive queue.
So, this patch attempts to solve the issue by clearing the MVPP2_CLS_SWFWD_PCTRL_MASK() bit, allowing MVPP22_CLS_C2_ATTR0_QHIGH() from the classifier to define the queue-high field of the queue number.
My testing seems to confirm my findings above - clearing this bit means that if I enable rxhash on eth2, the interface can then pass traffic, as we are now directing traffic to RX queue 1 rather than queue 33. Traffic still seems to work with rxhash off as well.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c +1 -1
@@ -1070,7 +1070,7 @@ void mvpp2_cls_oversize_rxq_set(struct m (port->first_rxq >> MVPP2_CLS_OVERSIZE_RXQ_LOW_BITS)); val =mvpp2_read (port->priv,MVPP2_CLS_SWFWD_PCTRL_REG ); - val |=MVPP2_CLS_SWFWD_PCTRL_MASK (port->id); + val &= ~MVPP2_CLS_SWFWD_PCTRL_MASK (port->id);mvpp2_write (port->priv,MVPP2_CLS_SWFWD_PCTRL_REG , val); }
Greg Kroah-Hartman
maintainerPATCH 11/142 net: nlmsg_cancel() if put fails for nhmsg
In reply to Greg Kroah-HartmanFrom: Stephen Worley <[email protected]>
[ Upstream commit d69100b8eee27c2d60ee52df76e0b80a8d492d34 ]
Fixes data remnant seen when we fail to reserve space for a nexthop group during a larger dump.
If we fail the reservation, we goto nla_put_failure and cancel the message.
Reproduce with the following iproute2 commands:
=====================
ip link add dummy1 type dummy
ip link add dummy2 type dummy
ip link add dummy3 type dummy
ip link add dummy4 type dummy
ip link add dummy5 type dummy
ip link add dummy6 type dummy
ip link add dummy7 type dummy
ip link add dummy8 type dummy
ip link add dummy9 type dummy
ip link add dummy10 type dummy
ip link add dummy11 type dummy
ip link add dummy12 type dummy
ip link add dummy13 type dummy
ip link add dummy14 type dummy
ip link add dummy15 type dummy
ip link add dummy16 type dummy
ip link add dummy17 type dummy
ip link add dummy18 type dummy
ip link add dummy19 type dummy
ip link add dummy20 type dummy
ip link add dummy21 type dummy
ip link add dummy22 type dummy
ip link add dummy23 type dummy
ip link add dummy24 type dummy
ip link add dummy25 type dummy
ip link add dummy26 type dummy
ip link add dummy27 type dummy
ip link add dummy28 type dummy
ip link add dummy29 type dummy
ip link add dummy30 type dummy
ip link add dummy31 type dummy
ip link add dummy32 type dummy
ip link set dummy1 up
ip link set dummy2 up
ip link set dummy3 up
ip link set dummy4 up
ip link set dummy5 up
ip link set dummy6 up
ip link set dummy7 up
ip link set dummy8 up
ip link set dummy9 up
ip link set dummy10 up
ip link set dummy11 up
ip link set dummy12 up
ip link set dummy13 up
ip link set dummy14 up
ip link set dummy15 up
ip link set dummy16 up
ip link set dummy17 up
ip link set dummy18 up
ip link set dummy19 up
ip link set dummy20 up
ip link set dummy21 up
ip link set dummy22 up
ip link set dummy23 up
ip link set dummy24 up
ip link set dummy25 up
ip link set dummy26 up
ip link set dummy27 up
ip link set dummy28 up
ip link set dummy29 up
ip link set dummy30 up
ip link set dummy31 up
ip link set dummy32 up
ip link set dummy33 up
ip link set dummy34 up
ip link set vrf-red up
ip link set vrf-blue up
ip link set dummyVRFred up
ip link set dummyVRFblue up
ip ro add 1.1.1.1/32 dev dummy1
ip ro add 1.1.1.2/32 dev dummy2
ip ro add 1.1.1.3/32 dev dummy3
ip ro add 1.1.1.4/32 dev dummy4
ip ro add 1.1.1.5/32 dev dummy5
ip ro add 1.1.1.6/32 dev dummy6
ip ro add 1.1.1.7/32 dev dummy7
ip ro add 1.1.1.8/32 dev dummy8
ip ro add 1.1.1.9/32 dev dummy9
ip ro add 1.1.1.10/32 dev dummy10 ip ro add 1.1.1.11/32 dev dummy11 ip ro add 1.1.1.12/32 dev dummy12 ip ro add 1.1.1.13/32 dev dummy13 ip ro add 1.1.1.14/32 dev dummy14 ip ro add 1.1.1.15/32 dev dummy15 ip ro add 1.1.1.16/32 dev dummy16 ip ro add 1.1.1.17/32 dev dummy17 ip ro add 1.1.1.18/32 dev dummy18 ip ro add 1.1.1.19/32 dev dummy19 ip ro add 1.1.1.20/32 dev dummy20 ip ro add 1.1.1.21/32 dev dummy21 ip ro add 1.1.1.22/32 dev dummy22 ip ro add 1.1.1.23/32 dev dummy23 ip ro add 1.1.1.24/32 dev dummy24 ip ro add 1.1.1.25/32 dev dummy25 ip ro add 1.1.1.26/32 dev dummy26 ip ro add 1.1.1.27/32 dev dummy27 ip ro add 1.1.1.28/32 dev dummy28 ip ro add 1.1.1.29/32 dev dummy29 ip ro add 1.1.1.30/32 dev dummy30 ip ro add 1.1.1.31/32 dev dummy31 ip ro add 1.1.1.32/32 dev dummy32
ip next add id 1 via 1.1.1.1 dev dummy1 ip next add id 2 via 1.1.1.2 dev dummy2 ip next add id 3 via 1.1.1.3 dev dummy3 ip next add id 4 via 1.1.1.4 dev dummy4 ip next add id 5 via 1.1.1.5 dev dummy5 ip next add id 6 via 1.1.1.6 dev dummy6 ip next add id 7 via 1.1.1.7 dev dummy7 ip next add id 8 via 1.1.1.8 dev dummy8 ip next add id 9 via 1.1.1.9 dev dummy9 ip next add id 10 via 1.1.1.10 dev dummy10 ip next add id 11 via 1.1.1.11 dev dummy11 ip next add id 12 via 1.1.1.12 dev dummy12 ip next add id 13 via 1.1.1.13 dev dummy13 ip next add id 14 via 1.1.1.14 dev dummy14 ip next add id 15 via 1.1.1.15 dev dummy15 ip next add id 16 via 1.1.1.16 dev dummy16 ip next add id 17 via 1.1.1.17 dev dummy17 ip next add id 18 via 1.1.1.18 dev dummy18 ip next add id 19 via 1.1.1.19 dev dummy19 ip next add id 20 via 1.1.1.20 dev dummy20 ip next add id 21 via 1.1.1.21 dev dummy21 ip next add id 22 via 1.1.1.22 dev dummy22 ip next add id 23 via 1.1.1.23 dev dummy23 ip next add id 24 via 1.1.1.24 dev dummy24 ip next add id 25 via 1.1.1.25 dev dummy25 ip next add id 26 via 1.1.1.26 dev dummy26 ip next add id 27 via 1.1.1.27 dev dummy27 ip next add id 28 via 1.1.1.28 dev dummy28 ip next add id 29 via 1.1.1.29 dev dummy29 ip next add id 30 via 1.1.1.30 dev dummy30 ip next add id 31 via 1.1.1.31 dev dummy31 ip next add id 32 via 1.1.1.32 dev dummy32
i=100
while [ $i -le 200 ]
do
ip next add id $i group 1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19
echo $i ((i++))
done
ip next add id 999 group 1/2/3/4/5/6
ip next ls
========================
--- net/ipv4/nexthop.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/nexthop.c +1 -0
@@ -277,6 +277,7 @@ out:return 0 ; nla_put_failure: +nlmsg_cancel (skb, nlh);return -EMSGSIZE ; }
Greg Kroah-Hartman
maintainerPATCH 12/142 net: qrtr: Fix passing invalid reference to qrtr_local_enqueue()
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit d28ea1fbbf437054ef339afec241019f2c4e2bb6 ]
Once the traversal of the list is completed with list_for_each_entry(), the iterator (node) will point to an invalid object. So passing this to qrtr_local_enqueue() which is outside of the iterator block is erroneous eventhough the object is not used.
So fix this by passing NULL to qrtr_local_enqueue().
--- net/qrtr/qrtr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/qrtr/qrtr.c +1 -1
@@ -711,7 +711,7 @@ static int qrtr_bcast_enqueue(struct qrt }mutex_unlock (&qrtr_node_lock); -qrtr_local_enqueue (node, skb, type, from, to); +qrtr_local_enqueue (NULL , skb, type, from, to);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 13/142 net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()"
In reply to Greg Kroah-HartmanFrom: Yuqi Jin <[email protected]>
[ Upstream commit a6211caa634da39d861a47437ffcda8b38ef421b ]
Commit adb03115f459 ("net: get rid of an signed integer overflow in ip_idents_reserve()") used atomic_cmpxchg to replace "atomic_add_return" inside the function "ip_idents_reserve". The reason was to avoid UBSAN warning.
However, this change has caused performance degrade and in GCC-8, fno-strict-overflow is now mapped to -fwrapv -fwrapv-pointer
and signed integer overflow is now undefined by default at all
optimization levels[1]. Moreover, it was a bug in UBSAN vs -fwrapv /-fno-strict-overflow, so Let's revert it safely.
[1] https://gcc.gnu.org/gcc-8/changes.html
--- net/ipv4/route.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/ipv4/route.c +6 -8
@@ -490,18 +490,16 @@ u32 ip_idents_reserve(u32 hash, int segsatomic_t *p_id = ip_idents + hash %IP_IDENTS_SZ ;u32 old =READ_ONCE (*p_tstamp);u32 now = (u32 )jiffies; -u32 new, delta =0 ; +u32 delta =0 ;if (old != now &&cmpxchg (p_tstamp, old, now) == old) delta =prandom_u32_max (now - old); -/* Do not use atomic_add_return() as it makes UBSAN unhappy */ -do { - old = (u32 )atomic_read (p_id); - new = old + delta + segs; - }while (atomic_cmpxchg (p_id, old, new) != old); - -return new - segs; +/* If UBSAN reports an error there, please make sure your compiler +* supports -fno-strict-overflow before reporting it that was a bug +* in UBSAN, and it has been fixed in GCC-8. +*/ +return atomic_add_return (segs + delta, p_id) - segs; }EXPORT_SYMBOL (ip_idents_reserve);
Greg Kroah-Hartman
maintainerPATCH 14/142 net sched: fix reporting the first-time use timestamp
In reply to Greg Kroah-HartmanFrom: Roman Mashak <[email protected]>
[ Upstream commit b15e62631c5f19fea9895f7632dae9c1b27fe0cd ]
When a new action is installed, firstuse field of 'tcf_t' is explicitly set to 0. Value of zero means "new action, not yet used"; as a packet hits the action, 'firstuse' is stamped with the current jiffies value.
tcf_tm_dump() should return 0 for firstuse if action has not yet been hit.
--- include/net/act_api.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/net/act_api.h +2 -1
@@ -69,7 +69,8 @@ static inline void tcf_tm_dump(struct tc { dtm->install =jiffies_to_clock_t (jiffies - stm->install); dtm->lastuse =jiffies_to_clock_t (jiffies - stm->lastuse); - dtm->firstuse =jiffies_to_clock_t (jiffies - stm->firstuse); + dtm->firstuse = stm->firstuse ? +jiffies_to_clock_t (jiffies - stm->firstuse) :0 ; dtm->expires =jiffies_to_clock_t (stm->expires); }
Greg Kroah-Hartman
maintainerPATCH 15/142 net/tls: fix race condition causing kernel panic
In reply to Greg Kroah-HartmanFrom: Vinay Kumar Yadav <[email protected]>
[ Upstream commit 0cada33241d9de205522e3858b18e506ca5cce2c ]
tls_sw_recvmsg() and tls_decrypt_done() can be run concurrently. // tls_sw_recvmsg()
if (atomic_read(&ctx->decrypt_pending)) crypto_wait_req(-EINPROGRESS, &ctx->async_wait); else reinit_completion(&ctx->async_wait.completion);
//tls_decrypt_done()
pending = atomic_dec_return(&ctx->decrypt_pending);
if (!pending && READ_ONCE(ctx->async_notify)) complete(&ctx->async_wait.completion);
Consider the scenario tls_decrypt_done() is about to run complete()
if (!pending && READ_ONCE(ctx->async_notify))
and tls_sw_recvmsg() reads decrypt_pending == 0, does reinit_completion(), then tls_decrypt_done() runs complete(). This sequence of execution results in wrong completion. Consequently, for next decrypt request, it will not wait for completion, eventually on connection close, crypto resources freed, there is no way to handle pending decrypt response.
This race condition can be avoided by having atomic_read() mutually exclusive with atomic_dec_return(),complete().Intoduced spin lock to ensure the mutual exclution.
Addressed similar problem in tx direction.
v1->v2:
- More readable commit message.
- Corrected the lock to fix new race scenario.
- Removed barrier which is not needed now.
--- include/net/tls.h | 4 ++++ net/tls/tls_sw.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-)
include/net/tls.h +4 -0
@@ -157,6 +157,8 @@ struct tls_sw_context_tx {struct tls_rec *open_rec;struct list_head tx_list;atomic_t encrypt_pending; +/* protect crypto_wait with encrypt_pending */ +spinlock_t encrypt_compl_lock;int async_notify;int async_capable;
@@ -177,6 +179,8 @@ struct tls_sw_context_rx {int async_capable;bool decrypted;atomic_t decrypt_pending; +/* protect crypto_wait with decrypt_pending*/ +spinlock_t decrypt_compl_lock;bool async_notify; };
net/tls/tls_sw.c +27 -6
@@ -203,10 +203,12 @@ static void tls_decrypt_done(struct crypkfree (aead_req); +spin_lock_bh (&ctx->decrypt_compl_lock); pending =atomic_dec_return (&ctx->decrypt_pending); -if (!pending &&READ_ONCE (ctx->async_notify)) +if (!pending && ctx->async_notify)complete (&ctx->async_wait.completion); +spin_unlock_bh (&ctx->decrypt_compl_lock); } static int tls_do_decryption(struct sock *sk,
@@ -464,10 +466,12 @@ static void tls_encrypt_done(struct cryp ready = true; } +spin_lock_bh (&ctx->encrypt_compl_lock); pending =atomic_dec_return (&ctx->encrypt_pending); -if (!pending &&READ_ONCE (ctx->async_notify)) +if (!pending && ctx->async_notify)complete (&ctx->async_wait.completion); +spin_unlock_bh (&ctx->encrypt_compl_lock);if (!ready)return ;
@@ -923,6 +927,7 @@ int tls_sw_sendmsg(struct sock *sk, struint num_zc =0 ;int orig_size;int ret =0 ; +int pending;if (msg->msg_flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL ))return -EOPNOTSUPP ;
@@ -1089,13 +1094,19 @@ trim_sgl: goto send_end; }else if (num_zc) {/* Wait for pending encryptions to get completed */ -smp_store_mb (ctx->async_notify, true); +spin_lock_bh (&ctx->encrypt_compl_lock); + ctx->async_notify = true; -if (atomic_read (&ctx->encrypt_pending)) + pending =atomic_read (&ctx->encrypt_pending); +spin_unlock_bh (&ctx->encrypt_compl_lock); +if (pending)crypto_wait_req (-EINPROGRESS , &ctx->async_wait);else reinit_completion (&ctx->async_wait.completion); +/* There can be no concurrent accesses, since we have no +* pending encrypt operations +*/ WRITE_ONCE (ctx->async_notify, false);if (ctx->async_wait.err) {
@@ -1724,6 +1735,7 @@ int tls_sw_recvmsg(struct sock *sk,bool is_kvec =iov_iter_is_kvec (&msg->msg_iter);bool is_peek = flags &MSG_PEEK ;int num_async =0 ; +int pending; flags |= nonblock;
@@ -1886,8 +1898,11 @@ pick_next_record: recv_end:if (num_async) {/* Wait for all previously submitted records to be decrypted */ -smp_store_mb (ctx->async_notify, true); -if (atomic_read (&ctx->decrypt_pending)) { +spin_lock_bh (&ctx->decrypt_compl_lock); + ctx->async_notify = true; + pending =atomic_read (&ctx->decrypt_pending); +spin_unlock_bh (&ctx->decrypt_compl_lock); +if (pending) { err =crypto_wait_req (-EINPROGRESS , &ctx->async_wait);if (err) {/* one of async decrypt failed */
@@ -1899,6 +1914,10 @@ recv_end: }else {reinit_completion (&ctx->async_wait.completion); } + +/* There can be no concurrent accesses, since we have no +* pending decrypt operations +*/ WRITE_ONCE (ctx->async_notify, false);/* Drain records from the rx_list & copy if required */
@@ -2285,6 +2304,7 @@ int tls_set_sw_offload(struct sock *sk,if (tx) {crypto_init_wait (&sw_ctx_tx->async_wait); +spin_lock_init (&sw_ctx_tx->encrypt_compl_lock); crypto_info = &ctx->crypto_send.info; cctx = &ctx->tx; aead = &sw_ctx_tx->aead_send;
@@ -2293,6 +2313,7 @@ int tls_set_sw_offload(struct sock *sk, sw_ctx_tx->tx_work.sk = sk; }else {crypto_init_wait (&sw_ctx_rx->async_wait); +spin_lock_init (&sw_ctx_rx->decrypt_compl_lock); crypto_info = &ctx->crypto_recv.info; cctx = &ctx->rx;skb_queue_head_init (&sw_ctx_rx->rx_list);
Greg Kroah-Hartman
maintainerPATCH 16/142 nexthop: Fix attribute checking for groups
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit 84be69b869a5a496a6cfde9b3c29509207a1f1fa ]
For nexthop groups, attributes after NHA_GROUP_TYPE are invalid, but nh_check_attr_group starts checking at NHA_GROUP. The group type defaults to multipath and the NHA_GROUP_TYPE is currently optional so this has slipped through so far. Fix the attribute checking to handle support of new group types.
--- net/ipv4/nexthop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/nexthop.c +1 -1
@@ -435,7 +435,7 @@ static int nh_check_attr_group(struct neif (!valid_group_nh (nh, len, extack))return -EINVAL ; } -for (i =NHA_GROUP +1 ; i < __NHA_MAX; ++i) { +for (i =NHA_GROUP_TYPE +1 ; i < __NHA_MAX; ++i) {if (!tb[i])continue ;
Greg Kroah-Hartman
maintainerPATCH 17/142 r8152: support additional Microsoft Surface Ethernet Adapter variant
In reply to Greg Kroah-HartmanFrom: Marc Payne <[email protected]>
[ Upstream commit c27a204383616efba5a4194075e90819961ff66a ]
Device id 0927 is the RTL8153B-based component of the 'Surface USB-C to Ethernet and USB Adapter' and may be used as a component of other devices in future. Tested and working with the r8152 driver.
Update the cdc_ether blacklist due to the RTL8153 'network jam on suspend' issue which this device will cause (personally confirmed).
--- drivers/net/usb/cdc_ether.c | 11 +++++++++-- drivers/net/usb/r8152.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/usb/cdc_ether.c +9 -2
@@ -808,14 +808,21 @@ static const struct usb_device_id produc .driver_info = 0, }, -/* Microsoft Surface 3 dock (based on Realtek RTL8153) */ +/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153) */ {USB_DEVICE_AND_INTERFACE_INFO (MICROSOFT_VENDOR_ID ,0x07c6 ,USB_CLASS_COMM , USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info =0 , }, - /* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ +/* Microsoft Surface Ethernet Adapter (based on Realtek RTL8153B) */ +{ +USB_DEVICE_AND_INTERFACE_INFO (MICROSOFT_VENDOR_ID ,0x0927 ,USB_CLASS_COMM , +USB_CDC_SUBCLASS_ETHERNET ,USB_CDC_PROTO_NONE ), + .driver_info = 0, +}, + +/* TP-LINK UE300 USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ {USB_DEVICE_AND_INTERFACE_INFO (TPLINK_VENDOR_ID ,0x0601 ,USB_CLASS_COMM , USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
drivers/net/usb/r8152.c +1 -0
@@ -5837,6 +5837,7 @@ static const struct usb_device_id rtl815 {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)}, {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)}, {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)}, + {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)}, {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
Greg Kroah-Hartman
maintainerPATCH 18/142 sctp: Dont add the shutdown timer if its already been added
In reply to Greg Kroah-HartmanFrom: Neil Horman <[email protected]>
[ Upstream commit 20a785aa52c82246055a089e55df9dac47d67da1 ]
This BUG halt was reported a while back, but the patch somehow got missed:
PID: 2879 TASK: c16adaa0 CPU: 1 COMMAND: "sctpn"
#0 [f418dd28] crash_kexec at c04a7d8c
#1 [f418dd7c] oops_end at c0863e02
#2 [f418dd90] do_invalid_op at c040aaca
#3 [f418de28] error_code (via invalid_op) at c08631a5
EAX: f34baac0 EBX: 00000090 ECX: f418deb0 EDX: f5542950 EBP: 00000000
DS: 007b ESI: f34ba800 ES: 007b EDI: f418dea0 GS: 00e0
CS: 0060 EIP: c046fa5e ERR: ffffffff EFLAGS: 00010286
#4 [f418de5c] add_timer at c046fa5e
#5 [f418de68] sctp_do_sm at f8db8c77 [sctp]
#6 [f418df30] sctp_primitive_SHUTDOWN at f8dcc1b5 [sctp]
#7 [f418df48] inet_shutdown at c080baf9
#8 [f418df5c] sys_shutdown at c079eedf
#9 [f418df70] sys_socketcall at c079fe88
EAX: ffffffda EBX: 0000000d ECX: bfceea90 EDX: 0937af98
DS: 007b ESI: 0000000c ES: 007b EDI: b7150ae4
SS: 007b ESP: bfceea7c EBP: bfceeaa8 GS: 0033
CS: 0073 EIP: b775c424 ERR: 00000066 EFLAGS: 00000282It appears that the side effect that starts the shutdown timer was processed multiple times, which can happen as multiple paths can trigger it. This of course leads to the BUG halt in add_timer getting called.
Fix seems pretty straightforward, just check before the timer is added if its already been started. If it has mod the timer instead to min(current expiration, new expiration)
Its been tested but not confirmed to fix the problem, as the issue has only occured in production environments where test kernels are enjoined from being installed. It appears to be a sane fix to me though. Also, recentely, Jere found a reproducer posted on list to confirm that this resolves the issues
--- net/sctp/sm_sideeffect.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
net/sctp/sm_sideeffect.c +11 -3
@@ -1522,9 +1522,17 @@ static int sctp_cmd_interpreter(enum sct timeout = asoc->timeouts[cmd->obj.to];BUG_ON (!timeout); - timer->expires = jiffies + timeout; -sctp_association_hold (asoc); -add_timer (timer); +/* +* SCTP has a hard time with timer starts. Because we process +* timer starts as side effects, it can be hard to tell if we +* have already started a timer or not, which leads to BUG +* halts when we call add_timer. So here, instead of just starting +* a timer, if the timer is already started, and just mod +* the timer with the shorter of the two expiration times +*/ +if (!timer_pending (timer)) +sctp_association_hold (asoc); +timer_reduce (timer, jiffies + timeout);break ;case SCTP_CMD_TIMER_RESTART :
Greg Kroah-Hartman
maintainerPATCH 19/142 sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed
In reply to Greg Kroah-HartmanFrom: "Jere Lepp�nen" <[email protected]>
[ Upstream commit d3e8e4c11870413789f029a71e72ae6e971fe678 ]
Commit bdf6fa52f01b ("sctp: handle association restarts when the socket is closed.") starts shutdown when an association is restarted, if in SHUTDOWN-PENDING state and the socket is closed. However, the rationale stated in that commit applies also when in SHUTDOWN-SENT state - we don't want to move an association to ESTABLISHED state when the socket has been closed, because that results in an association that is unreachable from user space.
The problem scenario:
1. Client crashes and/or restarts.
2. Server (using one-to-one socket) calls close(). SHUTDOWN is lost.
3. Client reconnects using the same addresses and ports.
4. Server's association is restarted. The association and the socket move to ESTABLISHED state, even though the server process has closed its descriptor.
Also, after step 4 when the server process exits, some resources are leaked in an attempt to release the underlying inet sock structure in ESTABLISHED state:
IPv4: Attempt to release TCP socket in state 1 00000000377288c7
Fix by acting the same way as in SHUTDOWN-PENDING state. That is, if an association is restarted in SHUTDOWN-SENT state and the socket is closed, then start shutdown and don't move the association or the socket to ESTABLISHED state.
--- net/sctp/sm_statefuns.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/sctp/sm_statefuns.c +5 -4
@@ -1856,12 +1856,13 @@ static enum sctp_disposition sctp_sf_do_/* Update the content of current association. */ sctp_add_cmd_sf (commands,SCTP_CMD_UPDATE_ASSOC ,SCTP_ASOC (new_asoc));sctp_add_cmd_sf (commands,SCTP_CMD_EVENT_ULP ,SCTP_ULPEVENT (ev)); -if (sctp_state (asoc,SHUTDOWN_PENDING ) && +if ((sctp_state (asoc,SHUTDOWN_PENDING ) || +sctp_state (asoc,SHUTDOWN_SENT )) && (sctp_sstate (asoc->base.sk,CLOSING ) ||sock_flag (asoc->base.sk,SOCK_DEAD ))) { -/* if were currently in SHUTDOWN_PENDING, but the socket -* has been closed by user, don't transition to ESTABLISHED. -* Instead trigger SHUTDOWN bundled with COOKIE_ACK. +/* If the socket has been closed by user, don't +* transition to ESTABLISHED. Instead trigger SHUTDOWN +* bundled with COOKIE_ACK. */ sctp_add_cmd_sf (commands,SCTP_CMD_REPLY ,SCTP_CHUNK (repl)); return sctp_sf_do_9_2_start_shutdown(net, ep, asoc,
Greg Kroah-Hartman
maintainerPATCH 20/142 tipc: block BH before using dst_cache
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 1378817486d6860f6a927f573491afe65287abf1 ]
dst_cache_get() documents it must be used with BH disabled.
sysbot reported :
BUG: using smp_processor_id() in preemptible [00000000] code: /21697 caller is dst_cache_get+0x3a/0xb0 net/core/dst_cache.c:68 CPU: 0 PID: 21697 Comm: Not tainted 5.7.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x188/0x20d lib/dump_stack.c:118 check_preemption_disabled lib/smp_processor_id.c:47 [inline] debug_smp_processor_id.cold+0x88/0x9b lib/smp_processor_id.c:57 dst_cache_get+0x3a/0xb0 net/core/dst_cache.c:68 tipc_udp_xmit.isra.0+0xb9/0xad0 net/tipc/udp_media.c:164 tipc_udp_send_msg+0x3e6/0x490 net/tipc/udp_media.c:244 tipc_bearer_xmit_skb+0x1de/0x3f0 net/tipc/bearer.c:526 tipc_enable_bearer+0xb2f/0xd60 net/tipc/bearer.c:331 __tipc_nl_bearer_enable+0x2bf/0x390 net/tipc/bearer.c:995 tipc_nl_bearer_enable+0x1e/0x30 net/tipc/bearer.c:1003 genl_family_rcv_msg_doit net/netlink/genetlink.c:673 [inline] genl_family_rcv_msg net/netlink/genetlink.c:718 [inline] genl_rcv_msg+0x627/0xdf0 net/netlink/genetlink.c:735 netlink_rcv_skb+0x15a/0x410 net/netlink/af_netlink.c:2469 genl_rcv+0x24/0x40 net/netlink/genetlink.c:746 netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline] netlink_unicast+0x537/0x740 net/netlink/af_netlink.c:1329 netlink_sendmsg+0x882/0xe10 net/netlink/af_netlink.c:1918 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:672 ____sys_sendmsg+0x6bf/0x7e0 net/socket.c:2362 ___sys_sendmsg+0x100/0x170 net/socket.c:2416 __sys_sendmsg+0xec/0x1b0 net/socket.c:2449 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 RIP: 0033:0x45ca29
--- net/tipc/udp_media.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/tipc/udp_media.c +5 -1
@@ -161,9 +161,11 @@ static int tipc_udp_xmit(struct net *net struct udp_bearer *ub, struct udp_media_addr *src, struct udp_media_addr *dst, struct dst_cache *cache) { - struct dst_entry *ndst = dst_cache_get(cache); + struct dst_entry *ndst;int ttl, err =0 ; +local_bh_disable (); + ndst =dst_cache_get (cache);if (dst->proto ==htons (ETH_P_IP )) {struct rtable *rt = (struct rtable *)ndst;
@@ -210,9 +212,11 @@ static int tipc_udp_xmit(struct net *net src->port, dst->port, false);#endif } +local_bh_enable ();return err; tx_error: +local_bh_enable ();kfree_skb (skb);return err; }
Re: [PATCH 5.4 020/142] tipc: block BH before using dst_cache
Quoted 8 lines · Greg Kroah-Hartman
From: Eric Dumazet <[email protected]>
[ Upstream commit
1378817486d6860f6a927f573491afe65287abf1]
dst_cache_get()documents it must be used with BH disabled.sysbot reported :
syzbot?
Quoted 78 lines
BUG: using smp_processor_id() in preemptible [00000000] code: /21697 caller is dst_cache_get+0x3a/0xb0 net/core/dst_cache.c:68 CPU: 0 PID: 21697 Comm: Not tainted 5.7.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x188/0x20d lib/dump_stack.c:118 check_preemption_disabled lib/smp_processor_id.c:47 [inline] debug_smp_processor_id.cold+0x88/0x9b lib/smp_processor_id.c:57 dst_cache_get+0x3a/0xb0 net/core/dst_cache.c:68 tipc_udp_xmit.isra.0+0xb9/0xad0 net/tipc/udp_media.c:164 tipc_udp_send_msg+0x3e6/0x490 net/tipc/udp_media.c:244 tipc_bearer_xmit_skb+0x1de/0x3f0 net/tipc/bearer.c:526 tipc_enable_bearer+0xb2f/0xd60 net/tipc/bearer.c:331 __tipc_nl_bearer_enable+0x2bf/0x390 net/tipc/bearer.c:995 tipc_nl_bearer_enable+0x1e/0x30 net/tipc/bearer.c:1003 genl_family_rcv_msg_doit net/netlink/genetlink.c:673 [inline] genl_family_rcv_msg net/netlink/genetlink.c:718 [inline] genl_rcv_msg+0x627/0xdf0 net/netlink/genetlink.c:735 netlink_rcv_skb+0x15a/0x410 net/netlink/af_netlink.c:2469 genl_rcv+0x24/0x40 net/netlink/genetlink.c:746 netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline] netlink_unicast+0x537/0x740 net/netlink/af_netlink.c:1329 netlink_sendmsg+0x882/0xe10 net/netlink/af_netlink.c:1918 sock_sendmsg_nosec net/socket.c:652 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:672 ____sys_sendmsg+0x6bf/0x7e0 net/socket.c:2362 ___sys_sendmsg+0x100/0x170 net/socket.c:2416 __sys_sendmsg+0xec/0x1b0 net/socket.c:2449 do_syscall_64+0xf6/0x7d0 arch/x86/entry/common.c:295 entry_SYSCALL_64_after_hwframe+0x49/0xb3 RIP: 0033:0x45ca29Fixes e9c1a793210f ("tipc: add dst_cache support for udp media")Cc Xin Long <[email protected]>Cc Jon Maloy <[email protected]>Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- net/tipc/udp_media.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)net/tipc/udp_media.c +5
-2@@ -161,9 +161,11 @@ static int tipc_udp_xmit(struct net *net struct udp_bearer *ub, struct udp_media_addr *src, struct udp_media_addr *dst, struct dst_cache *cache) { - struct dst_entry *ndst = dst_cache_get(cache); + struct dst_entry *ndst;int ttl, err =0 ; +local_bh_disable (); + ndst =dst_cache_get (cache);if (dst->proto ==htons (ETH_P_IP )) {struct rtable *rt = (struct rtable *)ndst;@@ -210,9 +212,11 @@ static int tipc_udp_xmit(struct net *net src->port, dst->port, false);#endif } +local_bh_enable ();return err; tx_error: +local_bh_enable ();kfree_skb (skb);return err; } --You received this message because you are subscribed to the Google Groups "syzkaller" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/syzkaller/20200601174039.942780034%40linuxfoundation.org.
Greg Kroah-Hartman
maintainerPATCH 21/142 net/mlx5e: kTLS, Destroy key object after destroying the TIS
In reply to Greg Kroah-HartmanFrom: Tariq Toukan <[email protected]>
[ Upstream commit 16736e11f43b80a38f98f6add54fab3b8c297df3 ]
The TLS TIS object contains the dek/key ID.
By destroying the key first, the TIS would contain an invalid non-existing key ID.
Reverse the destroy order, this also acheives the desired assymetry between the destroy and the create flows.
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c +1 -1
@@ -69,8 +69,8 @@ static void mlx5e_ktls_del(struct net_destruct mlx5e_ktls_offload_context_tx *tx_priv =mlx5e_get_ktls_tx_priv_ctx (tls_ctx); -mlx5_ktls_destroy_key (priv->mdev, tx_priv->key_id);mlx5e_destroy_tis (priv->mdev, tx_priv->tisn); +mlx5_ktls_destroy_key (priv->mdev, tx_priv->key_id);kvfree (tx_priv); }
Greg Kroah-Hartman
maintainerPATCH 22/142 net/mlx5e: Fix inner tirs handling
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit a16b8e0dcf7043bee46174bed0553cc9e36b63a5 ]
In the cited commit inner_tirs argument was added to create and destroy inner tirs, and no indication was added to mlx5e_modify_tirs_hash() function. In order to have a consistent handling, use inner_indir_tir[0].tirn in tirs destroy/modify function as an indication to whether inner tirs are created.
Inner tirs are not created for representors and before this commit, a call to mlx5e_modify_tirs_hash() was sending HW commands to modify non-existent inner tirs.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 +++++++----- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -1
@@ -1103,7 +1103,7 @@ void mlx5e_close_drop_rq(struct mlx5e_rqint mlx5e_create_indirect_rqt (struct mlx5e_priv *priv);int mlx5e_create_indirect_tirs (struct mlx5e_priv *priv,bool inner_ttc); -void mlx5e_destroy_indirect_tirs (struct mlx5e_priv *priv,bool inner_ttc); +void mlx5e_destroy_indirect_tirs (struct mlx5e_priv *priv);int mlx5e_create_direct_rqts (struct mlx5e_priv *priv,struct mlx5e_tir *tirs);void mlx5e_destroy_direct_rqts (struct mlx5e_priv *priv,struct mlx5e_tir *tirs);
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +7 -5
@@ -2758,7 +2758,8 @@ void mlx5e_modify_tirs_hash(struct mlx5emlx5_core_modify_tir (mdev, priv->indir_tir[tt].tirn, in, inlen); } -if (!mlx5e_tunnel_inner_ft_supported (priv->mdev)) +/* Verify inner tirs resources allocated */ +if (!priv->inner_indir_tir[0 ].tirn)return ;for (tt =0 ; tt <MLX5E_NUM_INDIR_TIRS ; tt++) {
@@ -3405,14 +3406,15 @@ out:return err; } -void mlx5e_destroy_indirect_tirs (struct mlx5e_priv *priv,bool inner_ttc) +void mlx5e_destroy_indirect_tirs (struct mlx5e_priv *priv) {int i;for (i =0 ; i <MLX5E_NUM_INDIR_TIRS ; i++)mlx5e_destroy_tir (priv->mdev, &priv->indir_tir[i]); -if (!inner_ttc || !mlx5e_tunnel_inner_ft_supported (priv->mdev)) +/* Verify inner tirs resources allocated */ +if (!priv->inner_indir_tir[0 ].tirn)return ;for (i =0 ; i <MLX5E_NUM_INDIR_TIRS ; i++)
@@ -5119,7 +5121,7 @@ err_destroy_xsk_rqts: err_destroy_direct_tirs:mlx5e_destroy_direct_tirs (priv, priv->direct_tir); err_destroy_indirect_tirs: -mlx5e_destroy_indirect_tirs (priv, true); +mlx5e_destroy_indirect_tirs (priv); err_destroy_direct_rqts:mlx5e_destroy_direct_rqts (priv, priv->direct_tir); err_destroy_indirect_rqts:
@@ -5138,7 +5140,7 @@ static void mlx5e_cleanup_nic_rx(structmlx5e_destroy_direct_tirs (priv, priv->xsk_tir);mlx5e_destroy_direct_rqts (priv, priv->xsk_tir);mlx5e_destroy_direct_tirs (priv, priv->direct_tir); -mlx5e_destroy_indirect_tirs (priv, true); +mlx5e_destroy_indirect_tirs (priv);mlx5e_destroy_direct_rqts (priv, priv->direct_tir);mlx5e_destroy_rqt (priv, &priv->indir_rqt);mlx5e_close_drop_rq (&priv->drop_rq);
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -2
@@ -1597,7 +1597,7 @@ err_destroy_ttc_table: err_destroy_direct_tirs:mlx5e_destroy_direct_tirs (priv, priv->direct_tir); err_destroy_indirect_tirs: -mlx5e_destroy_indirect_tirs (priv, false); +mlx5e_destroy_indirect_tirs (priv); err_destroy_direct_rqts:mlx5e_destroy_direct_rqts (priv, priv->direct_tir); err_destroy_indirect_rqts:
@@ -1614,7 +1614,7 @@ static void mlx5e_cleanup_rep_rx(structmlx5_del_flow_rules (rpriv->vport_rx_rule);mlx5e_destroy_ttc_table (priv, &priv->fs.ttc);mlx5e_destroy_direct_tirs (priv, priv->direct_tir); -mlx5e_destroy_indirect_tirs (priv, false); +mlx5e_destroy_indirect_tirs (priv);mlx5e_destroy_direct_rqts (priv, priv->direct_tir);mlx5e_destroy_rqt (priv, &priv->indir_rqt);mlx5e_close_drop_rq (&priv->drop_rq);
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +2 -2
@@ -396,7 +396,7 @@ static int mlx5i_init_rx(struct mlx5e_pr err_destroy_direct_tirs:mlx5e_destroy_direct_tirs (priv, priv->direct_tir); err_destroy_indirect_tirs: -mlx5e_destroy_indirect_tirs (priv, true); +mlx5e_destroy_indirect_tirs (priv); err_destroy_direct_rqts:mlx5e_destroy_direct_rqts (priv, priv->direct_tir); err_destroy_indirect_rqts:
@@ -412,7 +412,7 @@ static void mlx5i_cleanup_rx(struct mlx5 {mlx5i_destroy_flow_steering (priv);mlx5e_destroy_direct_tirs (priv, priv->direct_tir); -mlx5e_destroy_indirect_tirs (priv, true); +mlx5e_destroy_indirect_tirs (priv);mlx5e_destroy_direct_rqts (priv, priv->direct_tir);mlx5e_destroy_rqt (priv, &priv->indir_rqt);mlx5e_close_drop_rq (&priv->drop_rq);
Greg Kroah-Hartman
maintainerPATCH 23/142 net/mlx5: Fix memory leak in mlx5_events_init
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit df14ad1eccb04a4a28c90389214dbacab085b244 ]
Fix memory leak in mlx5_events_init(), in casecreate_single_thread_workqueue() fails, events
struct should be freed.
--- drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/events.c +3 -1
@@ -346,8 +346,10 @@ int mlx5_events_init(struct mlx5_core_de events->dev = dev; dev->priv.events = events; events->wq =create_singlethread_workqueue ("mlx5_events" ); -if (!events->wq) +if (!events->wq) { +kfree (events);return -ENOMEM ; + }INIT_WORK (&events->pcie_core_work, mlx5_pcie_event);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 24/142 net/mlx5e: Update netdev txq on completions during closure
In reply to Greg Kroah-HartmanFrom: Moshe Shemesh <[email protected]>
[ Upstream commit 5e911e2c06bd8c17df29147a5e2d4b17fafda024 ]
On sq closure when we free its descriptors, we should also update netdev txq on completions which would not arrive. Otherwise if we reopen sqs and attach them back, for example on fw fatal recovery flow, we may get tx timeout.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +6 -3
@@ -537,10 +537,9 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cvoid mlx5e_free_txqsq_descs (struct mlx5e_txqsq *sq) {struct mlx5e_tx_wqe_info *wi; +u32 dma_fifo_cc, nbytes =0 ; +u16 ci, sqcc, npkts =0 ;struct sk_buff *skb; -u32 dma_fifo_cc; -u16 sqcc; -u16 ci;int i; sqcc = sq->cc;
@@ -565,11 +564,15 @@ void mlx5e_free_txqsq_descs(struct mlx5e }dev_kfree_skb_any (skb); + npkts++; + nbytes += wi->num_bytes; sqcc += wi->num_wqebbs; } sq->dma_fifo_cc = dma_fifo_cc; sq->cc = sqcc; + +netdev_tx_completed_queue (sq->txq, npkts, nbytes); }#ifdef CONFIG_MLX5_CORE_IPOIB
Greg Kroah-Hartman
maintainerPATCH 25/142 net/mlx5: Fix error flow in case of function_setup failure
In reply to Greg Kroah-HartmanFrom: Shay Drory <[email protected]>
[ Upstream commit 4f7400d5cbaef676e00cdffb0565bf731c6bb09e ]
Currently, if an error occurred during mlx5_function_setup(), we keep dev->state as DEVICE_STATE_UP.
Fixing it by adding a goto label.
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +2 -1
@@ -1183,7 +1183,7 @@ static int mlx5_load_one(struct mlx5_cor err =mlx5_function_setup (dev, boot);if (err) - goto out; + goto err_function;if (boot) { err =mlx5_init_once (dev);
@@ -1229,6 +1229,7 @@ err_load:mlx5_cleanup_once (dev); function_teardown:mlx5_function_teardown (dev, boot); +err_function: dev->state =MLX5_DEVICE_STATE_INTERNAL_ERROR ;mutex_unlock (&dev->intf_state_mutex);
Greg Kroah-Hartman
maintainerPATCH 26/142 net/mlx5: Annotate mutex destroy for root ns
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
commit 9ca415399dae133b00273a4283ef31d003a6818d upstream.
Invoke mutex_destroy() to catch any errors.
--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +6 -0
@@ -417,6 +417,12 @@ static void del_sw_ns(struct fs_node *nostatic void del_sw_prio (struct fs_node *node) { +struct mlx5_flow_root_namespace *root_ns; +struct mlx5_flow_namespace *ns; + +fs_get_obj (ns, node); + root_ns = container_of(ns, struct mlx5_flow_root_namespace, ns); +mutex_destroy (&root_ns->chain_lock);kfree (node); }
Greg Kroah-Hartman
maintainerPATCH 27/142 net/tls: fix encryption error checking
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
commit a7bff11f6f9afa87c25711db8050c9b5324db0e2 upstream.
bpf_exec_tx_verdict() can return negative value for copied variable. In that case this value will be pushed back to caller and the real error code will be lost. Fix it using signed type and checking for positive value.
--- net/tls/tls_sw.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/tls/tls_sw.c +6 -5
@@ -781,7 +781,7 @@ static int tls_push_record(struct sock *static int bpf_exec_tx_verdict (struct sk_msg *msg,struct sock *sk,bool full_record,u8 record_type, -size_t *copied,int flags) +ssize_t *copied,int flags) {struct tls_context *tls_ctx =tls_get_ctx (sk);struct tls_sw_context_tx *ctx =tls_sw_ctx_tx (tls_ctx);
@@ -917,7 +917,8 @@ int tls_sw_sendmsg(struct sock *sk, struunsigned char record_type =TLS_RECORD_TYPE_DATA ;bool is_kvec =iov_iter_is_kvec (&msg->msg_iter);bool eor = !(msg->msg_flags &MSG_MORE ); -size_t try_to_copy, copied =0 ; +size_t try_to_copy; +ssize_t copied =0 ;struct sk_msg *msg_pl, *msg_en;struct tls_rec *rec;int required_size;
@@ -1126,7 +1127,7 @@ send_end:release_sock (sk);mutex_unlock (&tls_ctx->tx_lock); -return copied ? copied : ret; +return copied >0 ? copied : ret; } static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
@@ -1140,7 +1141,7 @@ static int tls_sw_do_sendpage(struct socstruct sk_msg *msg_pl;struct tls_rec *rec;int num_async =0 ; -size_t copied =0 ; +ssize_t copied =0 ;bool full_record;int record_room;int ret =0 ;
@@ -1242,7 +1243,7 @@ wait_for_memory: } sendpage_end: ret =sk_stream_error (sk, flags, ret); -return copied ? copied : ret; +return copied >0 ? copied : ret; } int tls_sw_sendpage_locked(struct sock *sk, struct page *page,
Greg Kroah-Hartman
maintainerPATCH 28/142 net/tls: free record only on encryption error
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
commit 635d9398178659d8ddba79dd061f9451cec0b4d1 upstream.
We cannot free record on any transient error because it leads to losing previos data. Check socket error to know whether record must be freed or not.
--- net/tls/tls_sw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/tls/tls_sw.c +4 -2
@@ -797,9 +797,10 @@ static int bpf_exec_tx_verdict(struct sk psock =sk_psock_get (sk);if (!psock || !policy) { err =tls_push_record (sk, flags, record_type); -if (err && err != -EINPROGRESS ) { +if (err && sk->sk_err ==EBADMSG ) { *copied -=sk_msg_free (sk, msg);tls_free_open_rec (sk); + err = -sk->sk_err; }if (psock)sk_psock_put (sk, psock);
@@ -825,9 +826,10 @@ more_data:switch (psock->eval) {case __SK_PASS: err =tls_push_record (sk, flags, record_type); -if (err && err != -EINPROGRESS ) { +if (err && sk->sk_err ==EBADMSG ) { *copied -=sk_msg_free (sk, msg);tls_free_open_rec (sk); + err = -sk->sk_err; goto out_err; }break ;
Greg Kroah-Hartman
maintainerPATCH 29/142 net: sun: fix missing release regions in cas_init_one().
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
commit 5a730153984dd13f82ffae93d7170d76eba204e9 upstream.
In cas_init_one(), "pdev" is requested by "pci_request_regions", but it was not released after a call of the function “pci_write_config_byte” failed. Thus replace the jump target “err_write_cacheline” by "err_out_free_res".
--- drivers/net/ethernet/sun/cassini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/sun/cassini.c +1 -2
@@ -4971,7 +4971,7 @@ static int cas_init_one(struct pci_dev * cas_cacheline_size)) {dev_err (&pdev->dev,"Could not set PCI cache " "line size\n" ); - goto err_write_cacheline; + goto err_out_free_res; } }#endif
@@ -5144,7 +5144,6 @@ err_out_iounmap: err_out_free_res:pci_release_regions (pdev); -err_write_cacheline:/* Try to restore it in case the error occurred after we * set it. */
Greg Kroah-Hartman
maintainerPATCH 30/142 net/mlx4_core: fix a memory leak bug.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
commit febfd9d3c7f74063e8e630b15413ca91b567f963 upstream.
In function mlx4_opreq_action(), pointer "mailbox" is not released, when mlx4_cmd_box() return and error, causing a memory leak bug. Fix this issue by going to "out" label, mlx4_free_cmd_mailbox() can free this pointer.
--- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/fw.c +1 -1
@@ -2734,7 +2734,7 @@ void mlx4_opreq_action(struct work_strucif (err) {mlx4_err (dev,"Failed to retrieve required operation: %d\n" , err); -return ; + goto out; }MLX4_GET (modifier, outbox,GET_OP_REQ_MODIFIER_OFFSET );MLX4_GET (token, outbox,GET_OP_REQ_TOKEN_OFFSET );
Greg Kroah-Hartman
maintainerPATCH 31/142 mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails
In reply to Greg Kroah-HartmanFrom: Jiri Pirko <[email protected]>
commit 4340f42f207eacb81e7a6b6bb1e3b6afad9a2e26 upstream.
In case of reload fail, the mlxsw_sp->ports contains a pointer to a freed memory (either by reload_down() or reload_up() error path). Fix this by initializing the pointer to NULL and checking it before dereferencing in split/unsplit/type_set callpaths.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 ++++++++++++-- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +12 -2
@@ -3932,6 +3932,7 @@ static void mlxsw_sp_ports_remove(structmlxsw_sp_cpu_port_remove (mlxsw_sp);kfree (mlxsw_sp->port_to_module);kfree (mlxsw_sp->ports); + mlxsw_sp->ports =NULL ; }static int mlxsw_sp_ports_create (struct mlxsw_sp *mlxsw_sp)
@@ -3986,6 +3987,7 @@ err_cpu_port_create:kfree (mlxsw_sp->port_to_module); err_port_to_module_alloc:kfree (mlxsw_sp->ports); + mlxsw_sp->ports =NULL ;return err; }
@@ -4040,6 +4042,14 @@ static void mlxsw_sp_port_unsplit_create } } +static struct mlxsw_sp_port * +mlxsw_sp_port_get_by_local_port (struct mlxsw_sp *mlxsw_sp,u8 local_port) +{ +if (mlxsw_sp->ports && mlxsw_sp->ports[local_port]) +return mlxsw_sp->ports[local_port]; +return NULL ; +} +static int mlxsw_sp_port_split (struct mlxsw_core *mlxsw_core,u8 local_port,unsigned int count,struct netlink_ext_ack *extack)
@@ -4058,7 +4068,7 @@ static int mlxsw_sp_port_split(struct ml local_ports_in_1x =MLXSW_CORE_RES_GET (mlxsw_core,LOCAL_PORTS_IN_1X ); local_ports_in_2x =MLXSW_CORE_RES_GET (mlxsw_core,LOCAL_PORTS_IN_2X ); - mlxsw_sp_port = mlxsw_sp->ports[local_port]; + mlxsw_sp_port =mlxsw_sp_port_get_by_local_port (mlxsw_sp, local_port);if (!mlxsw_sp_port) {dev_err (mlxsw_sp->bus_info->dev,"Port number \"%d\" does not exist\n" , local_port);
@@ -4136,7 +4146,7 @@ static int mlxsw_sp_port_unsplit(struct local_ports_in_1x =MLXSW_CORE_RES_GET (mlxsw_core,LOCAL_PORTS_IN_1X ); local_ports_in_2x =MLXSW_CORE_RES_GET (mlxsw_core,LOCAL_PORTS_IN_2X ); - mlxsw_sp_port = mlxsw_sp->ports[local_port]; + mlxsw_sp_port =mlxsw_sp_port_get_by_local_port (mlxsw_sp, local_port);if (!mlxsw_sp_port) {dev_err (mlxsw_sp->bus_info->dev,"Port number \"%d\" does not exist\n" , local_port);
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +8 -0
@@ -1258,6 +1258,7 @@ static void mlxsw_sx_ports_remove(structif (mlxsw_sx_port_created (mlxsw_sx, i))mlxsw_sx_port_remove (mlxsw_sx, i);kfree (mlxsw_sx->ports); + mlxsw_sx->ports =NULL ; }static int mlxsw_sx_ports_create (struct mlxsw_sx *mlxsw_sx)
@@ -1292,6 +1293,7 @@ err_port_module_info_get:if (mlxsw_sx_port_created (mlxsw_sx, i))mlxsw_sx_port_remove (mlxsw_sx, i);kfree (mlxsw_sx->ports); + mlxsw_sx->ports =NULL ;return err; }
@@ -1375,6 +1377,12 @@ static int mlxsw_sx_port_type_set(structu8 module, width;int err; +if (!mlxsw_sx->ports || !mlxsw_sx->ports[local_port]) { +dev_err (mlxsw_sx->bus_info->dev,"Port number \"%d\" does not exist\n" , + local_port); +return -EINVAL ; + } +if (new_type ==DEVLINK_PORT_TYPE_AUTO )return -EOPNOTSUPP ;
Greg Kroah-Hartman
maintainerPATCH 32/142 ARM: dts: rockchip: fix phy nodename for rk3228-evb
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit 287e0d538fcec2f6e8eb1e565bf0749f3b90186d ]
A test with the command below gives for example this error:
arch/arm/boot/dts/rk3228-evb.dt.yaml: phy@0:
'#phy-cells' is a required property
The phy nodename is normally used by a phy-handle. This node is however compatible with "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22" which is just been added to 'ethernet-phy.yaml'. So change nodename to 'ethernet-phy' for which '#phy-cells' is not a required property
make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ phy/phy-provider.yaml
--- arch/arm/boot/dts/rk3228-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3228-evb.dts +1 -1
@@ -46,7 +46,7 @@ #address-cells = <1>; #size-cells = <0>; - phy: phy@0 { + phy: ethernet-phy@0 { compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22"; reg = <0>; clocks = <&cru SCLK_MAC_PHY>;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 33/142 ARM: dts: rockchip: fix phy nodename for rk3229-xms6
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit 621c8d0c233e260232278a4cfd3380caa3c1da29 ]
A test with the command below gives for example this error:
arch/arm/boot/dts/rk3229-xms6.dt.yaml: phy@0:
'#phy-cells' is a required property
The phy nodename is normally used by a phy-handle. This node is however compatible with "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22" which is just been added to 'ethernet-phy.yaml'. So change nodename to 'ethernet-phy' for which '#phy-cells' is not a required property
make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/schemas/ phy/phy-provider.yaml
--- arch/arm/boot/dts/rk3229-xms6.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk3229-xms6.dts +1 -1
@@ -150,7 +150,7 @@ #address-cells = <1>; #size-cells = <0>; - phy: phy@0 { + phy: ethernet-phy@0 { compatible = "ethernet-phy-id1234.d400", "ethernet-phy-ieee802.3-c22"; reg = <0>;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 34/142 arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit c617ed88502d0b05149e7f32f3b3fd8a0663f7e2 ]
The status was removed of the '&gmac2phy' node with the apply of a patch long time ago, so fix status for '&gmac2phy' in 'rk3328-evb.dts'.
--- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328-evb.dts +1 -1
@@ -86,7 +86,7 @@ assigned-clock-rate = <50000000>; assigned-clocks = <&cru SCLK_MAC2PHY>; assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>; - + status = "okay"; }; &i2c1 {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 35/142 arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit c604fd810bda667bdc20b2c041917baa7803e0fb ]
Dts files with Rockchip rk3399 'gpu' nodes were manually verified. In order to automate this process arm,mali-midgard.txt has been converted to yaml. In the new setup dtbs_check with arm,mali-midgard.yaml expects interrupts and interrupt-names values in the same order. Fix this for rk3399.
make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/gpu/ arm,mali-midgard.yaml
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +4 -4
@@ -1881,10 +1881,10 @@ gpu: gpu@ff9a0000 { compatible = "rockchip,rk3399-mali", "arm,mali-t860"; reg = <0x0 0xff9a0000 0x0 0x10000>; - interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>, - <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>; - interrupt-names = "gpu", "job", "mmu"; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH 0>, + <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH 0>, + <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH 0>; + interrupt-names = "job", "mmu", "gpu"; clocks = <&cru ACLK_GPU>; power-domains = <&power RK3399_PD_GPU>; status = "disabled";
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 36/142 ARM: dts: rockchip: swap clock-names of gpu nodes
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit b14f3898d2c25a9b47a61fb879d0b1f3af92c59b ]
Dts files with Rockchip 'gpu' nodes were manually verified. In order to automate this process arm,mali-utgard.txt has been converted to yaml. In the new setup dtbs_check with arm,mali-utgard.yaml expects clock-names values
in the same order, so fix that.
--- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk322x.dtsi | 2 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
@@ -128,7 +128,7 @@ assigned-clocks = <&cru SCLK_GPU>; assigned-clock-rates = <100000000>; clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; resets = <&cru SRST_GPU>; status = "disabled"; };
arch/arm/boot/dts/rk322x.dtsi +1 -1
@@ -561,7 +561,7 @@ "pp1", "ppmmu1"; clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; resets = <&cru SRST_GPU_A>; status = "disabled"; };
arch/arm/boot/dts/rk3xxx.dtsi +1 -1
@@ -84,7 +84,7 @@ compatible = "arm,mali-400"; reg = <0x10090000 0x10000>; clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; assigned-clocks = <&cru ACLK_GPU>; assigned-clock-rates = <100000000>; resets = <&cru SRST_GPU>;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/142 ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi
In reply to Greg Kroah-HartmanFrom: Johan Jonker <[email protected]>
[ Upstream commit 855bdca1781c79eb661f89c8944c4a719ce720e8 ]
A test with the command below gives these errors:
arch/arm/boot/dts/rk3229-evb.dt.yaml: spi-0:
'#address-cells' is a required property arch/arm/boot/dts/rk3229-evb.dt.yaml: spi-1:
'#address-cells' is a required property arch/arm/boot/dts/rk3229-xms6.dt.yaml: spi-0:
'#address-cells' is a required property arch/arm/boot/dts/rk3229-xms6.dt.yaml: spi-1:
'#address-cells' is a required property
The $nodename pattern for spi nodes is "^spi(@.*|-[0-9a-f])*$". To prevent warnings rename 'spi-0' and 'spi-1' pinctrl sub nodenames to 'spi0' and 'spi1' in 'rk322x.dtsi'.
make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/spi/spi-controller.yaml
--- arch/arm/boot/dts/rk322x.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk322x.dtsi +2 -2
@@ -1033,7 +1033,7 @@ }; }; - spi-0 { + spi0 { spi0_clk: spi0-clk { rockchip,pins = <0 RK_PB1 2 &pcfg_pull_up>; };
@@ -1051,7 +1051,7 @@ }; }; - spi-1 { + spi1 { spi1_clk: spi1-clk { rockchip,pins = <0 RK_PC7 2 &pcfg_pull_up>; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/142 gpio: tegra: mask GPIO IRQs during IRQ shutdown
In reply to Greg Kroah-HartmanFrom: Stephen Warren <[email protected]>
[ Upstream commit 0cf253eed5d2bdf7bb3152457b38f39b012955f7 ]
The driver currently leaves GPIO IRQs unmasked even when the GPIO IRQ client has released the GPIO IRQ. This allows the HW to raise IRQs, and SW to process them, after shutdown. Fix this by masking the IRQ when it's shut down. This is usually taken care of by the irqchip core, but since this driver has a custom irq_shutdown implementation, it must do this explicitly itself.
--- drivers/gpio/gpio-tegra.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-tegra.c +1 -0
@@ -365,6 +365,7 @@ static void tegra_gpio_irq_shutdown(struct irq_data *d)struct tegra_gpio_info *tgi = bank->tgi;unsigned int gpio = d->hwirq; +tegra_gpio_irq_mask (d);gpiochip_unlock_as_irq (&tgi->gc, gpio); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 39/142 ALSA: usb-audio: add mapping for ASRock TRX40 Creator
In reply to Greg Kroah-HartmanFrom: Andrew Oakley <[email protected]>
[ Upstream commit da7a8f1a8fc3e14c6dcc52b4098bddb8f20390be ]
This is another TRX40 based motherboard with ALC1220-VB USB-audio that requires a static mapping table.
This motherboard also has a PCI device which advertises no codecs. The PCI ID is 1022:1487 and PCI SSID is 1022:d102. As this is using the AMD vendor ID, don't blacklist for now in case other boards have a working audio device with the same ssid.
alsa-info.sh report for this board:
http://alsa-project.org/db/?f=0a742f89066527497b77ce16bca486daccf8a70c
--- sound/usb/mixer_maps.c | 5 +++++ sound/usb/quirks-table.h | 1 + 2 files changed, 6 insertions(+)
sound/usb/mixer_maps.c +5 -0
@@ -529,6 +529,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .map = trx40_mobo_map, .connector_map = trx40_mobo_connector_map, }, + {/* Asrock TRX40 Creator */ + .id = USB_ID(0x26ce, 0x0a01), + .map = trx40_mobo_map, + .connector_map = trx40_mobo_connector_map, + }, { 0 } /* terminator */ };
sound/usb/quirks-table.h +1 -0
@@ -3647,6 +3647,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),ALC1220_VB_DESKTOP (0x0414 ,0xa002 ),/* Gigabyte TRX40 Aorus Pro WiFi */ ALC1220_VB_DESKTOP (0x0db0 ,0x0d64 ),/* MSI TRX40 Creator */ ALC1220_VB_DESKTOP (0x0db0 ,0x543d ),/* MSI TRX40 */ +ALC1220_VB_DESKTOP (0x26ce ,0x0a01 ),/* Asrock TRX40 Creator */ #undef ALC1220_VB_DESKTOP #undef USB_DEVICE_VENDOR_SPEC
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 40/142 net: microchip: encx24j600: add missed kthread_stop
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit ff8ce319e9c25e920d994cc35236f0bb32dfc8f3 ]
This driver calls kthread_run() in probe, but forgets to call kthread_stop() in probe failure and remove.
Add the missed kthread_stop() to fix it.
--- drivers/net/ethernet/microchip/encx24j600.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/microchip/encx24j600.c +4 -1
@@ -1070,7 +1070,7 @@ static int encx24j600_spi_probe(struct spi_device *spi)if (unlikely (ret)) {netif_err (priv, probe, ndev,"Error %d initializing card encx24j600 card\n" , ret); - goto out_free; + goto out_stop; } eidled =encx24j600_read_reg (priv,EIDLED );
@@ -1088,6 +1088,8 @@ static int encx24j600_spi_probe(struct spi_device *spi) out_unregister:unregister_netdev (priv->ndev); +out_stop: +kthread_stop (priv->kworker_task); out_free:free_netdev (ndev);
@@ -1100,6 +1102,7 @@ static int encx24j600_spi_remove(struct spi_device *spi)struct encx24j600_priv *priv =dev_get_drvdata (&spi->dev);unregister_netdev (priv->ndev); +kthread_stop (priv->kworker_task);free_netdev (priv->ndev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 41/142 gfs2: move privileged user check to gfs2_quota_lock_check
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit 4ed0c30811cb4d30ef89850b787a53a84d5d2bcb ]
Before this patch, function gfs2_quota_lock checked if it was called from a privileged user, and if so, it bypassed the quota check:
superuser can operate outside the quotas.
That's the wrong place for the check because the lock/unlock functions are separate from the lock_check function, and you can do lock and unlock without actually checking the quotas.
This patch moves the check to gfs2_quota_lock_check.
--- fs/gfs2/quota.c | 3 +-- fs/gfs2/quota.h | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-)
fs/gfs2/quota.c +1 -2
@@ -1040,8 +1040,7 @@ int gfs2_quota_lock(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)u32 x;int error =0 ; -if (capable (CAP_SYS_RESOURCE ) || - sdp->sd_args.ar_quota !=GFS2_QUOTA_ON ) +if (sdp->sd_args.ar_quota !=GFS2_QUOTA_ON )return 0 ; error =gfs2_quota_hold (ip, uid, gid);
fs/gfs2/quota.h +2 -1
@@ -44,7 +44,8 @@ static inline int gfs2_quota_lock_check(struct gfs2_inode *ip,int ret; ap->allowed =UINT_MAX ;/* Assume we are permitted a whole lot */ -if (sdp->sd_args.ar_quota ==GFS2_QUOTA_OFF ) +if (capable (CAP_SYS_RESOURCE ) || + sdp->sd_args.ar_quota ==GFS2_QUOTA_OFF )return 0 ; ret =gfs2_quota_lock (ip,NO_UID_QUOTA_CHANGE ,NO_GID_QUOTA_CHANGE );if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 42/142 gfs2: dont call quota_unhold if quotas are not locked
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ]
Before this patch, function gfs2_quota_unlock checked if quotas are turned off, and if so, it branched to label out, which called gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we no longer want to call gfs2_quota_unhold or we won't balance our gets and puts.
--- fs/gfs2/quota.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/gfs2/quota.c +1 -2
@@ -1113,7 +1113,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)int found;if (!test_and_clear_bit (GIF_QD_LOCKED , &ip->i_flags)) - goto out; +return ;for (x =0 ; x < ip->i_qadata->qa_qd_num; x++) {struct gfs2_quota_data *qd;
@@ -1150,7 +1150,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)qd_unlock (qda[x]); } -out:gfs2_quota_unhold (ip); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/142 gfs2: Grab glock reference sooner in gfs2_add_revoke
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
[ Upstream commit f4e2f5e1a527ce58fc9f85145b03704779a3123e ]
This patch rearranges gfs2_add_revoke so that the extra glock reference is added earlier on in the function to avoid races in which the glock is freed before the new reference is taken.
--- fs/gfs2/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/gfs2/log.c +3 -3
@@ -598,13 +598,13 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)struct buffer_head *bh = bd->bd_bh;struct gfs2_glock *gl = bd->bd_gl; + sdp->sd_log_num_revoke++; +if (atomic_inc_return (&gl->gl_revokes) ==1 ) +gfs2_glock_hold (gl); bh->b_private =NULL ; bd->bd_blkno = bh->b_blocknr;gfs2_remove_from_ail (bd);/* drops ref on bh */ bd->bd_bh =NULL ; - sdp->sd_log_num_revoke++; -if (atomic_inc_return (&gl->gl_revokes) ==1 ) -gfs2_glock_hold (gl);set_bit (GLF_LFLUSH , &gl->gl_flags);list_add (&bd->bd_list, &sdp->sd_log_revokes); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 44/142 drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 1fe48ec08d9f2e26d893a6c05bd6c99a3490f9ef ]
As this is already properly handled in amdgpu_gfx_off_ctrl(). In fact, this unnecessary cancel_delayed_work_sync may leave a small time window for race condition and is dangerous.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +----- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -5
@@ -4290,11 +4290,7 @@ static int gfx_v10_0_set_powergating_state(void *handle,switch (adev->asic_type) {case CHIP_NAVI10 :case CHIP_NAVI14 : -if (!enable) { -amdgpu_gfx_off_ctrl (adev, false); -cancel_delayed_work_sync (&adev->gfx.gfx_off_delay_work); - }else -amdgpu_gfx_off_ctrl (adev, true); +amdgpu_gfx_off_ctrl (adev, enable);break ;default :break ;
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +3 -9
@@ -4839,10 +4839,9 @@ static int gfx_v9_0_set_powergating_state(void *handle,switch (adev->asic_type) {case CHIP_RAVEN :case CHIP_RENOIR : -if (!enable) { +if (!enable)amdgpu_gfx_off_ctrl (adev, false); -cancel_delayed_work_sync (&adev->gfx.gfx_off_delay_work); - } +if (adev->pg_flags &AMD_PG_SUPPORT_RLC_SMU_HS ) {gfx_v9_0_enable_sck_slow_down_on_power_up (adev, true);gfx_v9_0_enable_sck_slow_down_on_power_down (adev, true);
@@ -4868,12 +4867,7 @@ static int gfx_v9_0_set_powergating_state(void *handle,amdgpu_gfx_off_ctrl (adev, true);break ;case CHIP_VEGA12 : -if (!enable) { -amdgpu_gfx_off_ctrl (adev, false); -cancel_delayed_work_sync (&adev->gfx.gfx_off_delay_work); - }else { -amdgpu_gfx_off_ctrl (adev, true); - } +amdgpu_gfx_off_ctrl (adev, enable);break ;default :break ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 45/142 drm/amd/powerplay: perform PG ungate prior to CG ungate
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit f4fcfa4282c1a1bf51475ebb0ffda623eebf1191 ]
Since gfxoff should be disabled first before trying to access those GC registers.
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +++--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +3 -3
@@ -320,12 +320,12 @@ static void pp_dpm_en_umd_pstate(struct pp_hwmgr *hwmgr,if (*level & profile_mode_mask) { hwmgr->saved_dpm_level = hwmgr->dpm_level; hwmgr->en_umd_pstate = true; -amdgpu_device_ip_set_clockgating_state (hwmgr->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE );amdgpu_device_ip_set_powergating_state (hwmgr->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_PG_STATE_UNGATE ); +amdgpu_device_ip_set_clockgating_state (hwmgr->adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); } }else {/* exit umd pstate, restore level, enable gfx cg*/
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3 -3
@@ -1541,12 +1541,12 @@ static int smu_enable_umd_pstate(void *handle,if (*level & profile_mode_mask) { smu_dpm_ctx->saved_dpm_level = smu_dpm_ctx->dpm_level; smu_dpm_ctx->enable_umd_pstate = true; -amdgpu_device_ip_set_clockgating_state (smu->adev, -AMD_IP_BLOCK_TYPE_GFX , -AMD_CG_STATE_UNGATE );amdgpu_device_ip_set_powergating_state (smu->adev,AMD_IP_BLOCK_TYPE_GFX ,AMD_PG_STATE_UNGATE ); +amdgpu_device_ip_set_clockgating_state (smu->adev, +AMD_IP_BLOCK_TYPE_GFX , +AMD_CG_STATE_UNGATE ); } }else {/* exit umd pstate, restore level, enable gfx cg*/
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 46/142 drm/amdgpu: Use GEM obj reference for KFD BOs
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
[ Upstream commit 39b3128d7ffd44e400e581e6f49e88cb42bef9a1 ]
Releasing the AMDGPU BO ref directly leads to problems when BOs were exported as DMA bufs. Releasing the GEM reference makes sure that the AMDGPU/TTM BO is not freed too early.
Also take a GEM reference when importing BOs from DMABufs to keep references to imported BOs balances properly.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3 -2
@@ -1288,7 +1288,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }/* Free the BO*/ -amdgpu_bo_unref (&mem->bo); +drm_gem_object_put_unlocked (&mem->bo->tbo.base);mutex_destroy (&mem->lock);kfree (mem);
@@ -1630,7 +1630,8 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd,AMDGPU_VM_PAGE_READABLE |AMDGPU_VM_PAGE_WRITEABLE |AMDGPU_VM_PAGE_EXECUTABLE |AMDGPU_VM_MTYPE_NC ; - (*mem)->bo =amdgpu_bo_ref (bo); +drm_gem_object_get (&bo->tbo.base); + (*mem)->bo = bo; (*mem)->va = va; (*mem)->domain = (bo->preferred_domains &AMDGPU_GEM_DOMAIN_VRAM ) ?AMDGPU_GEM_DOMAIN_VRAM :AMDGPU_GEM_DOMAIN_GTT ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 47/142 cachefiles: Fix race between read_waiter and read_copier involving op->to_do
In reply to Greg Kroah-HartmanFrom: Lei Xue <[email protected]>
[ Upstream commit 7bb0c5338436dae953622470d52689265867f032 ]
There is a potential race in fscache operation enqueuing for reading and copying multiple pages from cachefiles to netfs. The problem can be seen easily on a heavy loaded system (for example many processes reading files continually on an NFS share covered by fscache triggered this problem within a few minutes).
The race is due to cachefiles_read_waiter() adding the op to the monitor to_do list and then then drop the object->work_lock spinlock before completing fscache_enqueue_operation(). Once the lock is dropped, cachefiles_read_copier() grabs the op, completes processing it, and makes it through fscache_retrieval_complete() which sets the op->state to the final state of FSCACHE_OP_ST_COMPLETE(4). When cachefiles_read_waiter() finally gets through the remainder of fscache_enqueue_operation() it sees the invalid state, and hits the ASSERTCMP and the following oops is seen:
[ 2259.612361] FS-Cache: [ 2259.614785] FS-Cache: Assertion failed [ 2259.618639] FS-Cache: 4 == 5 is false [ 2259.622456] ------------[ cut here ]------------ [ 2259.627190] kernel BUG at fs/fscache/operation.c:70! ... [ 2259.791675] RIP: 0010:[<ffffffffc061b4cf>] [<ffffffffc061b4cf>] fscache_enqueue_operation+0xff/0x170 [fscache] [ 2259.802059] RSP: 0000:ffffa0263d543be0 EFLAGS: 00010046 [ 2259.807521] RAX: 0000000000000019 RBX: ffffa01a4d390480 RCX: 0000000000000006 [ 2259.814847] RDX: 0000000000000000 RSI: 0000000000000046 RDI: ffffa0263d553890 [ 2259.822176] RBP: ffffa0263d543be8 R08: 0000000000000000 R09: ffffa0263c2d8708 [ 2259.829502] R10: 0000000000001e7f R11: 0000000000000000 R12: ffffa01a4d390480 [ 2259.844483] R13: ffff9fa9546c5920 R14: ffffa0263d543c80 R15: ffffa0293ff9bf10 [ 2259.859554] FS: 00007f4b6efbd700(0000) GS:ffffa0263d540000(0000) knlGS:0000000000000000 [ 2259.875571] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 2259.889117] CR2: 00007f49e1624ff0 CR3: 0000012b38b38000 CR4: 00000000007607e0 [ 2259.904015] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 2259.918764] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 2259.933449] PKRU: 55555554 [ 2259.943654] Call Trace: [ 2259.953592] <IRQ> [ 2259.955577] [<ffffffffc03a7c12>] cachefiles_read_waiter+0x92/0xf0 [cachefiles] [ 2259.978039] [<ffffffffa34d3942>] __wake_up_common+0x82/0x120 [ 2259.991392] [<ffffffffa34d3a63>] __wake_up_common_lock+0x83/0xc0 [ 2260.004930] [<ffffffffa34d3510>] ? task_rq_unlock+0x20/0x20 [ 2260.017863] [<ffffffffa34d3ab3>] __wake_up+0x13/0x20 [ 2260.030230] [<ffffffffa34c72a0>] __wake_up_bit+0x50/0x70 [ 2260.042535] [<ffffffffa35bdcdb>] unlock_page+0x2b/0x30 [ 2260.054495] [<ffffffffa35bdd09>] page_endio+0x29/0x90 [ 2260.066184] [<ffffffffa368fc81>] mpage_end_io+0x51/0x80
CPU1cachefiles_read_waiter()
20 static int cachefiles_read_waiter(wait_queue_entry_t *wait, unsigned mode,
21 int sync, void *_key)
22 {
...
61 spin_lock(&object->work_lock); 62 list_add_tail(&monitor->op_link, &op->to_do); 63 spin_unlock(&object->work_lock);
<begin race window>
64
65 fscache_enqueue_retrieval(op);
182 static inline void fscache_enqueue_retrieval(struct fscache_retrieval *op) 183 {
184 fscache_enqueue_operation(&op->op);
185 }
58 void fscache_enqueue_operation(struct fscache_operation *op) 59 {
60 struct fscache_cookie *cookie = op->object->cookie;
61
62 _enter("{OBJ%x OP%x,%u}",
63 op->object->debug_id, op->debug_id, atomic_read(&op->usage));
64
65 ASSERT(list_empty(&op->pend_link)); 66 ASSERT(op->processor != NULL); 67 ASSERT(fscache_object_is_available(op->object)); 68 ASSERTCMP(atomic_read(&op->usage), >, 0);
<end race window>
CPU2cachefiles_read_copier()
168 while (!list_empty(&op->to_do)) {
...
202 fscache_end_io(op, monitor->netfs_page, error); 203 put_page(monitor->netfs_page); 204 fscache_retrieval_complete(op, 1);
CPU1
58 void fscache_enqueue_operation(struct fscache_operation *op) 59 {
...
69 ASSERTIFCMP(op->state != FSCACHE_OP_ST_IN_PROGRESS,
70 op->state, ==, FSCACHE_OP_ST_CANCELLED);
--- fs/cachefiles/rdwr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cachefiles/rdwr.c +1 -1
@@ -60,9 +60,9 @@ static int cachefiles_read_waiter(wait_queue_entry_t *wait, unsigned mode, object = container_of(op->op.object, struct cachefiles_object, fscache);spin_lock (&object->work_lock);list_add_tail (&monitor->op_link, &op->to_do); +fscache_enqueue_retrieval (op);spin_unlock (&object->work_lock); -fscache_enqueue_retrieval (op);fscache_put_retrieval (op);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/142 usb: dwc3: pci: Enable extcon driver for Intel Merrifield
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 066c09593454e89bc605ffdff1c9810061f9b1e1 ]
Intel Merrifield provides a DR support via PMIC which has its own extcon driver.
Add a property string to link to that driver.
--- drivers/usb/dwc3/dwc3-pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/dwc3-pci.c +1 -0
@@ -114,6 +114,7 @@ static const struct property_entry dwc3_pci_intel_properties[] = {static const struct property_entry dwc3_pci_mrfld_properties[] = {PROPERTY_ENTRY_STRING ("dr_mode" ,"otg" ), +PROPERTY_ENTRY_STRING ("linux,extcon-name" ,"mrfld_bcove_pwrsrc" ),PROPERTY_ENTRY_BOOL ("linux,sysdev_is_parent" ), {} };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 49/142 usb: phy: twl6030-usb: Fix a resource leak in an error handling path in twl6030_usb_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit f058764d19000d98aef72010468db1f69faf9fa0 ]
A call to 'regulator_get()' is hidden in 'twl6030_usb_ldo_init()'. A corresponding put must be performed in the error handling path, as already done in the remove function.
While at it, also move a 'free_irq()' call in the error handling path in order to be consistent.
--- drivers/usb/phy/phy-twl6030-usb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/usb/phy/phy-twl6030-usb.c +9 -3
@@ -377,7 +377,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)if (status <0 ) {dev_err (&pdev->dev,"can't get IRQ %d, err %d\n" , twl->irq1, status); -return status; + goto err_put_regulator; } status = request_threaded_irq(twl->irq2, NULL, twl6030_usb_irq,
@@ -386,8 +386,7 @@ static int twl6030_usb_probe(struct platform_device *pdev)if (status <0 ) {dev_err (&pdev->dev,"can't get IRQ %d, err %d\n" , twl->irq2, status); -free_irq (twl->irq1, twl); -return status; + goto err_free_irq1; } twl->asleep =0 ;
@@ -396,6 +395,13 @@ static int twl6030_usb_probe(struct platform_device *pdev)dev_info (&pdev->dev,"Initialized TWL6030 USB module\n" );return 0 ; + +err_free_irq1: +free_irq (twl->irq1, twl); +err_put_regulator: +regulator_put (twl->usb3v3); + +return status; }static int twl6030_usb_remove (struct platform_device *pdev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/142 usb: gadget: legacy: fix redundant initialization warnings
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit d13cce757954fa663c69845611957396843ed87a ]
Fix the following cppcheck warnings:
drivers/usb/gadget/legacy/inode.c:1364:8: style: Redundant initialization for 'value'. The initialized value is overwritten$
value = -EOPNOTSUPP;
^
drivers/usb/gadget/legacy/inode.c:1331:15: note: value is initialized
int value = -EOPNOTSUPP;
^
drivers/usb/gadget/legacy/inode.c:1364:8: note: value is overwritten
value = -EOPNOTSUPP;
^
drivers/usb/gadget/legacy/inode.c:1817:8: style: Redundant initialization for 'value'. The initialized value is overwritten$
value = -EINVAL;
^
drivers/usb/gadget/legacy/inode.c:1787:18: note: value is initialized
ssize_t value = len, length = len;
^
drivers/usb/gadget/legacy/inode.c:1817:8: note: value is overwritten
value = -EINVAL;
^--- drivers/usb/gadget/legacy/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/gadget/legacy/inode.c +1 -2
@@ -1361,7 +1361,6 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) req->buf = dev->rbuf; req->context =NULL ; - value = -EOPNOTSUPP ;switch (ctrl->bRequest) {case USB_REQ_GET_DESCRIPTOR :
@@ -1784,7 +1783,7 @@ static ssize_t dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) { struct dev_data *dev = fd->private_data; -ssize_t value = len, length = len; +ssize_t value, length = len;unsigned total;u32 tag;char *kbuf;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/142 net: freescale: select CONFIG_FIXED_PHY where needed
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 99352c79af3e5f2e4724abf37fa5a2a3299b1c81 ]
I ran into a randconfig build failure with CONFIG_FIXED_PHY=m and CONFIG_GIANFAR=y:
x86_64-linux-ld: drivers/net/ethernet/freescale/gianfar.o:(.rodata+0x418): undefined reference to `fixed_phy_change_carrier'
It seems the same thing can happen with dpaa and ucc_geth, so change all three to do an explicit 'select FIXED_PHY'.
The fixed-phy driver actually has an alternative stub function that theoretically allows building network drivers when fixed-phy is disabled, but I don't see how that would help here, as the drivers presumably would not work then.
--- drivers/net/ethernet/freescale/Kconfig | 2 ++ drivers/net/ethernet/freescale/dpaa/Kconfig | 1 + 2 files changed, 3 insertions(+)
drivers/net/ethernet/freescale/Kconfig +2 -0
@@ -77,6 +77,7 @@ config UCC_GETH depends on QUICC_ENGINE select FSL_PQ_MDIO select PHYLIB + select FIXED_PHY ---help--- This driver supports the Gigabit Ethernet mode of the QUICC Engine, which is available on some Freescale SOCs.
@@ -90,6 +91,7 @@ config GIANFAR depends on HAS_DMA select FSL_PQ_MDIO select PHYLIB + select FIXED_PHY select CRC32 ---help--- This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
drivers/net/ethernet/freescale/dpaa/Kconfig +1 -0
@@ -3,6 +3,7 @@ menuconfig FSL_DPAA_ETH tristate "DPAA Ethernet" depends on FSL_DPAA && FSL_FMAN select PHYLIB + select FIXED_PHY select FSL_FMAN_MAC ---help--- Data Path Acceleration Architecture Ethernet driver,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/142 IB/i40iw: Remove bogus call to netdev_master_upper_dev_get()
In reply to Greg Kroah-HartmanFrom: Denis V. Lunev <[email protected]>
[ Upstream commit 856ec7f64688387b100b7083cdf480ce3ac41227 ]
Local variable netdev is not used in these calls.
It should be noted, that this change is required to work in bonded mode. Otherwise we would get the following assert:
"RTNL: assertion failed at net/core/dev.c (5665)"
With the calltrace as follows:
dump_stack+0x19/0x1b netdev_master_upper_dev_get+0x61/0x70 i40iw_addr_resolve_neigh+0x1e8/0x220 i40iw_make_cm_node+0x296/0x700 ? i40iw_find_listener.isra.10+0xcc/0x110 i40iw_receive_ilq+0x3d4/0x810 i40iw_puda_poll_completion+0x341/0x420 i40iw_process_ceq+0xa5/0x280 i40iw_ceq_dpc+0x1e/0x40 tasklet_action+0x83/0x140 __do_softirq+0x125/0x2bb call_softirq+0x1c/0x30 do_softirq+0x65/0xa0 irq_exit+0x105/0x110 do_IRQ+0x56/0xf0 common_interrupt+0x16a/0x16a ? cpuidle_enter_state+0x57/0xd0 cpuidle_idle_call+0xde/0x230 arch_cpu_idle+0xe/0xc0 cpu_startup_entry+0x14a/0x1e0 start_secondary+0x1f7/0x270 start_cpu+0x5/0x14
--- drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/infiniband/hw/i40iw/i40iw_cm.c +0 -8
@@ -1987,7 +1987,6 @@ static int i40iw_addr_resolve_neigh(struct i40iw_device *iwdev,struct rtable *rt;struct neighbour *neigh;int rc = arpindex; -struct net_device *netdev = iwdev->netdev;__be32 dst_ipaddr =htonl (dst_ip);__be32 src_ipaddr =htonl (src_ip);
@@ -1997,9 +1996,6 @@ static int i40iw_addr_resolve_neigh(struct i40iw_device *iwdev,return rc; } -if (netif_is_bond_slave (netdev)) - netdev =netdev_master_upper_dev_get (netdev); - neigh =dst_neigh_lookup (&rt->dst, &dst_ipaddr);rcu_read_lock ();
@@ -2065,7 +2061,6 @@ static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev, {struct neighbour *neigh;int rc = arpindex; -struct net_device *netdev = iwdev->netdev;struct dst_entry *dst;struct sockaddr_in6 dst_addr;struct sockaddr_in6 src_addr;
@@ -2086,9 +2081,6 @@ static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev,return rc; } -if (netif_is_bond_slave (netdev)) - netdev =netdev_master_upper_dev_get (netdev); - neigh =dst_neigh_lookup (dst, dst_addr.sin6_addr.in6_u.u6_addr32);rcu_read_lock ();
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/142 riscv: stacktrace: Fix undefined reference to `walk_stackframe
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
[ Upstream commit 0502bee37cdef755d63eee60236562e5605e2480 ]
Drop static declaration to fix following build error if FRAME_POINTER disabled,
riscv64-linux-ld: arch/riscv/kernel/perf_callchain.o: in function `.L0':
perf_callchain.c:(.text+0x2b8): undefined reference to `walk_stackframe'
--- arch/riscv/kernel/stacktrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/stacktrace.c +1 -1
@@ -63,7 +63,7 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,#else /* !CONFIG_FRAME_POINTER */ -static void notrace walk_stackframe(struct task_struct *task, +void notrace walk_stackframe(struct task_struct *task,struct pt_regs *regs,bool (*fn)(unsigned long ,void *),void *arg) {unsigned long sp, pc;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/142 clk: ti: am33xx: fix RTC clock parent
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
[ Upstream commit dc6dbd51009fc412729c307161f442c0a08618f4 ]
Right now, trying to use RTC purely with the ti-sysc / clkctrl framework fails to enable the RTC module properly. Based on experimentation, this appears to be because RTC is sourced from the clkdiv32k optional clock. TRM is not very clear on this topic, but fix the RTC to use the proper source clock nevertheless.
--- drivers/clk/ti/clk-33xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/clk-33xx.c +1 -1
@@ -212,7 +212,7 @@ static const struct omap_clkctrl_reg_data am3_mpu_clkctrl_regs[] __initconst = { };static const struct omap_clkctrl_reg_data am3_l4_rtc_clkctrl_regs[]__initconst = { - {AM3_L4_RTC_RTC_CLKCTRL ,NULL ,CLKF_SW_SUP ,"clk_32768_ck" }, + {AM3_L4_RTC_RTC_CLKCTRL ,NULL ,CLKF_SW_SUP ,"clk-24mhz-clkctrl:0000:0" }, {0 }, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/142 csky: Fixup msa highest 3 bits mask
In reply to Greg Kroah-HartmanFrom: Liu Yibin <[email protected]>
[ Upstream commit 165f2d2858013253042809df082b8df7e34e86d7 ]
Just as comment mentioned, the msa format:
cr<30/31, 15> MSA register format:
31 - 29 | 28 - 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0
BA Reserved SH WA B SO SEC C D V
So we should shift 29 bits not 28 bits for mask
--- arch/csky/abiv1/inc/abi/entry.h | 4 ++-- arch/csky/abiv2/inc/abi/entry.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/csky/abiv1/inc/abi/entry.h +2 -2
@@ -167,8 +167,8 @@* BA Reserved C D V */ cprcr r6, cpcr30 - lsri r6, 28 - lsli r6, 28 + lsri r6, 29 + lsli r6, 29 addi r6, 0xe cpwcr r6, cpcr30
arch/csky/abiv2/inc/abi/entry.h +2 -2
@@ -225,8 +225,8 @@*/ mfcr r6, cr<30, 15> /* Get MSA0 */ 2: - lsri r6, 28 - lsli r6, 28 + lsri r6, 29 + lsli r6, 29 addi r6, 0x1ce mtcr r6, cr<30, 15> /* Set MSA0 */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/142 csky: Fixup perf callchain unwind
In reply to Greg Kroah-HartmanFrom: Mao Han <[email protected]>
[ Upstream commit 229a0ddee1108a3f82a873e6cbbe35c92c540444 ]
[ 5221.974084] Unable to handle kernel paging request at virtual address 0xfffff000, pc: 0x8002c18e [ 5221.985929] Oops: 00000000 [ 5221.989488] [ 5221.989488] CURRENT PROCESS: [ 5221.989488] [ 5221.992877] COMM=callchain_test PID=11962 [ 5221.995213] TEXT=00008000-000087e0 DATA=00009f1c-0000a018 BSS=0000a018-0000b000 [ 5221.999037] USER-STACK=7fc18e20 KERNEL-STACK=be204680 [ 5221.999037] [ 5222.003292] PC: 0x8002c18e (perf_callchain_kernel+0x3e/0xd4) [ 5222.007957] LR: 0x8002c198 (perf_callchain_kernel+0x48/0xd4) [ 5222.074873] Call Trace: [ 5222.074873] [<800a248e>] get_perf_callchain+0x20a/0x29c [ 5222.074873] [<8009d964>] perf_callchain+0x64/0x80 [ 5222.074873] [<8009dc1c>] perf_prepare_sample+0x29c/0x4b8 [ 5222.074873] [<8009de6e>] perf_event_output_forward+0x36/0x98 [ 5222.074873] [<800497e0>] search_exception_tables+0x20/0x44 [ 5222.074873] [<8002cbb6>] do_page_fault+0x92/0x378 [ 5222.074873] [<80098608>] __perf_event_overflow+0x54/0xdc [ 5222.074873] [<80098778>] perf_swevent_hrtimer+0xe8/0x164 [ 5222.074873] [<8002ddd0>] update_mmu_cache+0x0/0xd8 [ 5222.074873] [<8002c014>] user_backtrace+0x58/0xc4 [ 5222.074873] [<8002c0b4>] perf_callchain_user+0x34/0xd0 [ 5222.074873] [<800a2442>] get_perf_callchain+0x1be/0x29c [ 5222.074873] [<8009d964>] perf_callchain+0x64/0x80 [ 5222.074873] [<8009d834>] perf_output_sample+0x78c/0x858 [ 5222.074873] [<8009dc1c>] perf_prepare_sample+0x29c/0x4b8 [ 5222.074873] [<8009de94>] perf_event_output_forward+0x5c/0x98 [ 5222.097846] [ 5222.097846] [<800a0300>] perf_event_exit_task+0x58/0x43c [ 5222.097846] [<8006c874>] hrtimer_interrupt+0x104/0x2ec [ 5222.097846] [<800a0300>] perf_event_exit_task+0x58/0x43c [ 5222.097846] [<80437bb6>] dw_apb_clockevent_irq+0x2a/0x4c [ 5222.097846] [<8006c770>] hrtimer_interrupt+0x0/0x2ec [ 5222.097846] [<8005f2e4>] __handle_irq_event_percpu+0xac/0x19c [ 5222.097846] [<80437bb6>] dw_apb_clockevent_irq+0x2a/0x4c [ 5222.097846] [<8005f408>] handle_irq_event_percpu+0x34/0x88 [ 5222.097846] [<8005f480>] handle_irq_event+0x24/0x64 [ 5222.097846] [<8006218c>] handle_level_irq+0x68/0xdc [ 5222.097846] [<8005ec76>] __handle_domain_irq+0x56/0xa8 [ 5222.097846] [<80450e90>] ck_irq_handler+0xac/0xe4 [ 5222.097846] [<80029012>] csky_do_IRQ+0x12/0x24 [ 5222.097846] [<8002a3a0>] csky_irq+0x70/0x80 [ 5222.097846] [<800ca612>] alloc_set_pte+0xd2/0x238 [ 5222.097846] [<8002ddd0>] update_mmu_cache+0x0/0xd8 [ 5222.097846] [<800a0340>] perf_event_exit_task+0x98/0x43c
The original fp check doesn't base on the real kernal stack region. Invalid fp address may cause kernel panic.
--- arch/csky/kernel/perf_callchain.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/csky/kernel/perf_callchain.c +7 -2
@@ -12,12 +12,17 @@ struct stackframe {static int unwind_frame_kernel (struct stackframe *frame) { -if (kstack_end ((void *)frame->fp)) +unsigned long low = (unsigned long )task_stack_page (current); +unsigned long high = low +THREAD_SIZE ; + +if (unlikely (frame->fp < low || frame->fp > high))return -EPERM ; -if (frame->fp &0x3 || frame->fp <TASK_SIZE ) + +if (kstack_end ((void *)frame->fp) || frame->fp &0x3 )return -EPERM ; *frame = *(struct stackframe *)frame->fp; +if (__kernel_text_address (frame->lr)) {int graph =0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 57/142 csky: Fixup remove duplicate irq_disable
In reply to Greg Kroah-HartmanFrom: Liu Yibin <[email protected]>
[ Upstream commit 6633a5aa8eb6bda70eb3a9837efd28a67ccc6e0a ]
Interrupt has been disabled in __schedule() with local_irq_disable() and enabled in finish_task_switch->finish_lock_switch() with local_irq_enabled(), So needn't to disable irq here.
--- arch/csky/kernel/entry.S | 2 -- 1 file changed, 2 deletions(-)
arch/csky/kernel/entry.S +0 -2
@@ -318,8 +318,6 @@ ENTRY(__switch_to) mfcr a2, psr /* Save PSR value */ stw a2, (a3, THREAD_SR) /* Save PSR in task struct */ - bclri a2, 6 /* Disable interrupts */ - mtcr a2, psr SAVE_SWITCH_STACK
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/142 hwmon: (nct7904) Fix incorrect range of temperature limit registers
In reply to Greg Kroah-HartmanFrom: Amy Shih <[email protected]>
[ Upstream commit 7b2fd270af27edaf02acb41a7babe805a9441914 ]
The format of temperature limitation registers are 8-bit 2's complement and the range is -128~127.
Converts the reading value to signed char to fix the incorrect range of temperature limitation registers.
--- drivers/hwmon/nct7904.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hwmon/nct7904.c +3 -1
@@ -356,6 +356,7 @@ static int nct7904_read_temp(struct device *dev, u32 attr, int channel,struct nct7904_data *data =dev_get_drvdata (dev);int ret, temp;unsigned int reg1, reg2, reg3; +s8 temps;switch (attr) {case hwmon_temp_input:
@@ -461,7 +462,8 @@ static int nct7904_read_temp(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; - *val = ret *1000 ; + temps = ret; + *val = temps *1000 ;return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/142 cifs: Fix null pointer check in cifs_read
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
[ Upstream commit 9bd21d4b1a767c3abebec203342f3820dcb84662 ]
Coverity scan noted a redundant null check
Coverity-id: 728517
--- fs/cifs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/file.c +1 -1
@@ -3997,7 +3997,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)* than it negotiated since it will refuse the read * then. */ -if ((tcon->ses) && !(tcon->ses->capabilities & +if (!(tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files)) { current_read_size =min_t (uint, current_read_size, CIFSMaxBufSize);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/142 csky: Fixup raw_copy_from_user()
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 51bb38cb78363fdad1f89e87357b7bc73e39ba88 ]
If raw_copy_from_user(to, from, N) returns K, callers expect the first N - K bytes starting at to to have been replaced with the contents of corresponding area starting at from and the last K bytes of destination *left* *unmodified*.
What arch/sky/lib/usercopy.c is doing is broken - it can lead to e.g. data corruption on write(2).
raw_copy_to_user() is inaccurate about return value, which is a bug, but consequences are less drastic than for raw_copy_from_user(). And just what are those access_ok() doing in there? I mean, look into linux/uaccess.h; that's where we do that check (as well as zero tail on failure in the callers that need zeroing).
AFAICS, all of that shouldn't be hard to fix; something like a patch below might make a useful starting point.
I would suggest moving these macros into usercopy.c (they are never used anywhere else) and possibly expanding them there; if you leave them alive, please at least rename __copy_user_zeroing(). Again, it must not zero anything on failed read.
Said that, I'm not sure we won't be better off simply turning usercopy.c into usercopy.S - all that is left there is a couple of functions, each consisting only of inline asm.
Guo Ren reply:
Yes, raw_copy_from_user is wrong, it's no need zeroing code.
unsigned long _copy_from_user(void *to, const void __user *from, unsigned long n)
{
unsigned long res = n;
might_fault();
if (likely(access_ok(from, n))) {
kasan_check_write(to, n);
res = raw_copy_from_user(to, from, n);
}
if (unlikely(res))
memset(to + (n - res), 0, res);
return res;
}EXPORT_SYMBOL(_copy_from_user);
You are right and access_ok() should be removed.
but, how about:
do {
...
"2: stw %3, (%1, 0) \n" \
+ " subi %0, 4 \n" \
"9: stw %4, (%1, 4) \n" \
+ " subi %0, 4 \n" \
"10: stw %5, (%1, 8) \n" \
+ " subi %0, 4 \n" \
"11: stw %6, (%1, 12) \n" \
+ " subi %0, 4 \n" \
" addi %2, 16 \n" \
" addi %1, 16 \n" \Don't expand __ex_table
AI Viro reply:
Hey, I've no idea about the instruction scheduling on csky - if that doesn't slow the things down, all the better. It's just that copy_to_user() and friends are on fairly hot codepaths, and in quite a few situations they will dominate the speed of e.g. read(2). So I tried to keep the fast path unchanged. Up to the architecture maintainers, obviously. Which would be you...
As for the fixups size increase (__ex_table size is unchanged)... You have each of those macros expanded exactly once.
So the size is not a serious argument, IMO - useless complexity would be, if it is, in fact, useless; the size... not really, especially since those extra subi will at least offset it.
Again, up to you - asm optimizations of (essentially) memcpy()-style loops are tricky and can depend upon the fairly subtle details of architecture. So even on something I know reasonably well I would resort to direct experiments if I can't pass the buck to architecture maintainers.
It *is* worth optimizing - this is where read() from a file that is already in page cache spends most of the time, etc.
Guo Ren reply:
Thx, after fixup some typo “sub %0, 4”, apply the patch.
TODO:
- user copy/from codes are still need optimizing.
--- arch/csky/include/asm/uaccess.h | 49 +++++++++++++++++---------------- arch/csky/lib/usercopy.c | 8 ++---- 2 files changed, 28 insertions(+), 29 deletions(-)
arch/csky/include/asm/uaccess.h +26 -23
@@ -254,7 +254,7 @@ do { \extern int __get_user_bad (void ); -#define __copy_user (to, from, n) \ +#define ___copy_to_user (to, from, n) \ do { \ int w0, w1, w2, w3; \ asm volatile( \
@@ -289,31 +289,34 @@ do { \ " subi %0, 4 \n" \ " br 3b \n" \ "5: cmpnei %0, 0 \n" /* 1B */ \ - " bf 8f \n" \ + " bf 13f \n" \ " ldb %3, (%2, 0) \n" \ "6: stb %3, (%1, 0) \n" \ " addi %2, 1 \n" \ " addi %1, 1 \n" \ " subi %0, 1 \n" \ " br 5b \n" \ - "7: br 8f \n" \ + "7: subi %0, 4 \n" \ + "8: subi %0, 4 \n" \ + "12: subi %0, 4 \n" \ + " br 13f \n" \ ".section __ex_table, \"a\" \n" \ ".align 2 \n" \ - ".long 2b, 7b \n" \ - ".long 9b, 7b \n" \ - ".long 10b, 7b \n" \ + ".long 2b, 13f \n" \ + ".long 4b, 13f \n" \ + ".long 6b, 13f \n" \ + ".long 9b, 12b \n" \ + ".long 10b, 8b \n" \ ".long 11b, 7b \n" \ - ".long 4b, 7b \n" \ - ".long 6b, 7b \n" \ ".previous \n" \ - "8: \n" \ + "13: \n" \ : "=r"(n), "=r"(to), "=r"(from), "=r"(w0), \ "=r"(w1), "=r"(w2), "=r"(w3) \ : "0"(n), "1"(to), "2"(from) \ : "memory"); \ } while (0) -#define __copy_user_zeroing (to, from, n) \ +#define ___copy_from_user (to, from, n) \ do { \ int tmp; \ int nsave; \
@@ -356,22 +359,22 @@ do { \" addi %1, 1 \n" \" subi %0, 1 \n" \" br 5b \n" \ -"8: mov %3, %0 \n" \ -" movi %4, 0 \n" \ -"9: stb %4, (%1, 0) \n" \ -" addi %1, 1 \n" \ -" subi %3, 1 \n" \ -" cmpnei %3, 0 \n" \ -" bt 9b \n" \ -" br 7f \n" \ +"8: stw %3, (%1, 0) \n" \ +" subi %0, 4 \n" \ +" bf 7f \n" \ +"9: subi %0, 8 \n" \ +" bf 7f \n" \ +"13: stw %3, (%1, 8) \n" \ +" subi %0, 12 \n" \ +" bf 7f \n" \".section __ex_table, \"a\" \n" \".align 2 \n" \ -".long 2b, 8b \n" \ +".long 2b, 7f \n" \ +".long 4b, 7f \n" \ +".long 6b, 7f \n" \".long 10b, 8b \n" \ -".long 11b, 8b \n" \ -".long 12b, 8b \n" \ -".long 4b, 8b \n" \ -".long 6b, 8b \n" \ +".long 11b, 9b \n" \ +".long 12b,13b \n" \".previous \n" \"7: \n" \ : "=r"(n), "=r"(to), "=r"(from), "=r"(nsave), \
arch/csky/lib/usercopy.c +2 -6
@@ -7,10 +7,7 @@unsigned long raw_copy_from_user (void *to,const void *from,unsigned long n) { -if (access_ok (from, n)) -__copy_user_zeroing (to, from, n); -else -memset (to,0 , n); +___copy_from_user (to, from, n);return n; }EXPORT_SYMBOL (raw_copy_from_user);
@@ -18,8 +15,7 @@ EXPORT_SYMBOL(raw_copy_from_user);unsigned long raw_copy_to_user (void *to,const void *from,unsigned long n) { -if (access_ok (to, n)) -__copy_user (to, from, n); +___copy_to_user (to, from, n);return n; }EXPORT_SYMBOL (raw_copy_to_user);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/142 samples: bpf: Fix build error
In reply to Greg Kroah-HartmanFrom: Matteo Croce <[email protected]>
[ Upstream commit 23ad04669f81f958e9a4121b0266228d2eb3c357 ]
GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains a symbol which clashes with libbpf:
/usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
collect2: error: ld returned 1 exit status
bpf_log_buf here seems to be a leftover, so removing it.
--- samples/bpf/lwt_len_hist_user.c | 2 -- 1 file changed, 2 deletions(-)
samples/bpf/lwt_len_hist_user.c +0 -2
@@ -15,8 +15,6 @@#define MAX_INDEX 64#define MAX_STARS 38 -char bpf_log_buf[BPF_LOG_BUF_SIZE ]; -static void stars (char *str,long val,long max,int width) {int i;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/142 drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c
In reply to Greg Kroah-HartmanFrom: Madhuparna Bhowmik <[email protected]>
[ Upstream commit 95f59bf88bb75281cc626e283ecefdd5d5641427 ]
This patch fixes the following warning:
=============================
WARNING: suspicious RCU usage
5.7.0-rc5-next-20200514-syzkaller #0 Not tainted
-----------------------------drivers/net/hamradio/bpqether.c:149 RCU-list traversed in non-reader section!!
Since rtnl lock is held, pass this cond in list_for_each_entry_rcu().
--- drivers/net/hamradio/bpqether.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/hamradio/bpqether.c +2 -1
@@ -127,7 +127,8 @@ static inline struct net_device *bpq_get_ax25_dev(struct net_device *dev) {struct bpqdev *bpq; -list_for_each_entry_rcu (bpq, &bpq_devices, bpq_list) { +list_for_each_entry_rcu (bpq, &bpq_devices, bpq_list, +lockdep_rtnl_is_held ()) {if (bpq->ethdev == dev)return bpq->axdev; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/142 Input: usbtouchscreen - add support for BonXeon TP
In reply to Greg Kroah-HartmanFrom: James Hilliard <[email protected]>
[ Upstream commit e3b4f94ef52ae1592cbe199bd38dbdc0d58b2217 ]
Based on available information this uses the singletouch irtouch protocol. This is tested and confirmed to be fully functional on the BonXeon TP hardware I have.
--- drivers/input/touchscreen/usbtouchscreen.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/touchscreen/usbtouchscreen.c +1 -0
@@ -182,6 +182,7 @@ static const struct usb_device_id usbtouch_devices[] = {#endif #ifdef CONFIG_TOUCHSCREEN_USB_IRTOUCH + {USB_DEVICE(0x255e, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x595a, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x6615, 0x0001), .driver_info = DEVTYPE_IRTOUCH}, {USB_DEVICE(0x6615, 0x0012), .driver_info = DEVTYPE_IRTOUCH_HIRES},
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/142 Input: i8042 - add ThinkPad S230u to i8042 nomux list
In reply to Greg Kroah-HartmanFrom: Kevin Locke <[email protected]>
[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ]
On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version "GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode the keyboard, Synaptics TouchPad, and TrackPoint either do not function or stop functioning a few minutes after boot. This problem has been noted before, perhaps only occurring on BIOS 1.57 and later.[1][2][3][4][5]
This model does not have an external PS/2 port, so mux does not appear to be useful.
Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago and although the [BIOS changelog] notes "Fixed an issue of UEFI touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be insufficient.
Adding 33474HU to the nomux list avoids the issue on my system.
[1]: https://bugs.launchpad.net/bugs/1210748
[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425
[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200
[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115
[5]: https://forums.lenovo.com/topic/findpost/27/1337119
[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt
--- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -541,6 +541,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), }, }, + { + /* Lenovo ThinkPad Twist S230u */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), + }, + }, { } };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/142 Input: evdev - call input_flush_device() on release(), not flush()
In reply to Greg Kroah-HartmanFrom: Brendan Shanks <[email protected]>
[ Upstream commit 09264098ff153f60866039d60b31d39b66f55a31 ]
input_flush_device() should only be called once the struct file is being released and no open descriptors remain, but evdev_flush() was calling it whenever a file descriptor was closed.
This caused uploaded force-feedback effects to be erased when a process did a dup()/close() on the event FD, called system(), etc.
Call input_flush_device() from evdev_release() instead.
--- drivers/input/evdev.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/input/evdev.c +4 -15
@@ -326,20 +326,6 @@ static int evdev_fasync(int fd, struct file *file, int on)return fasync_helper (fd, file, on, &client->fasync); } -static int evdev_flush (struct file *file,fl_owner_t id) -{ -struct evdev_client *client = file->private_data; -struct evdev *evdev = client->evdev; - -mutex_lock (&evdev->mutex); - -if (evdev->exist && !client->revoked) -input_flush_device (&evdev->handle, file); - -mutex_unlock (&evdev->mutex); -return 0 ; -} -static void evdev_free (struct device *dev) { struct evdev *evdev = container_of(dev, struct evdev, dev);
@@ -453,6 +439,10 @@ static int evdev_release(struct inode *inode, struct file *file)unsigned int i;mutex_lock (&evdev->mutex); + +if (evdev->exist && !client->revoked) +input_flush_device (&evdev->handle, file); +evdev_ungrab (evdev, client);mutex_unlock (&evdev->mutex);
@@ -1310,7 +1300,6 @@ static const struct file_operations evdev_fops = { .compat_ioctl = evdev_ioctl_compat, #endif .fasync = evdev_fasync, - .flush = evdev_flush, .llseek = no_llseek, };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/142 Input: xpad - add custom init packet for Xbox One S controllers
In reply to Greg Kroah-HartmanFrom: Łukasz Patron <[email protected]>
[ Upstream commit 764f7f911bf72450c51eb74cbb262ad9933741d8 ]
Sending [ 0x05, 0x20, 0x00, 0x0f, 0x06 ] packet for Xbox One S controllers fixes an issue where controller is stuck in Bluetooth mode and not sending any inputs.
--- drivers/input/joystick/xpad.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/input/joystick/xpad.c +12 -0
@@ -458,6 +458,16 @@ static const u8 xboxone_fw2015_init[] = { 0x05, 0x20, 0x00, 0x01, 0x00 }; +/* +* This packet is required for Xbox One S (0x045e:0x02ea) +* and Xbox One Elite Series 2 (0x045e:0x0b00) pads to +* initialize the controller that was previously used in +* Bluetooth mode. +*/ +static const u8 xboxone_s_init[] = { +0x05 ,0x20 ,0x00 ,0x0f ,0x06 +}; +/* * This packet is required for the Titanfall 2 Xbox One pads * (0x0e6f:0x0165) to finish initialization and for Hori pads
@@ -516,6 +526,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {XBOXONE_INIT_PKT (0x0e6f ,0x0165 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0f0d ,0x0067 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0000 ,0x0000 , xboxone_fw2015_init), +XBOXONE_INIT_PKT (0x045e ,0x02ea , xboxone_s_init), +XBOXONE_INIT_PKT (0x045e ,0x0b00 , xboxone_s_init),XBOXONE_INIT_PKT (0x0e6f ,0x0000 , xboxone_pdp_init1),XBOXONE_INIT_PKT (0x0e6f ,0x0000 , xboxone_pdp_init2), XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/142 Input: dlink-dir685-touchkeys - fix a typo in driver name
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 38347374ae3f1ec4df56dd688bd603a64e79a0ed ]
According to the file name and Kconfig, a 'k' is missing in this driver name. It should be "dlink-dir685-touchkeys".
--- drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/keyboard/dlink-dir685-touchkeys.c +1 -1
@@ -143,7 +143,7 @@ MODULE_DEVICE_TABLE(of, dir685_tk_of_match);static struct i2c_driver dir685_tk_i2c_driver = { .driver = { - .name ="dlin-dir685-touchkeys" , + .name ="dlink-dir685-touchkeys" , .of_match_table =of_match_ptr (dir685_tk_of_match), }, .probe = dir685_tk_probe,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/142 Input: i8042 - add ThinkPad S230u to i8042 reset list
In reply to Greg Kroah-HartmanFrom: Kevin Locke <[email protected]>
[ Upstream commit 2712c91a54a1058d55c284152b4d93c979b67be6 ]
On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version "GDETC1WW (1.81 ) 06/27/2019", the keyboard, Synaptics TouchPad, and TrackPoint either do not function or stop functioning a few minutes after boot. This problem has been noted before, perhaps only occurring with BIOS 1.57 and later.[1][2][3][4][5]
Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago and although the [BIOS changelog] notes "Fixed an issue of UEFI touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be insufficient.
Setting i8042.reset=1 or adding 33474HU to the reset list avoids the issue on my system from either warm or cold boot.
[1]: https://bugs.launchpad.net/bugs/1210748
[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425
[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200
[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115
[5]: https://forums.lenovo.com/topic/findpost/27/1337119
[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt
--- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -669,6 +669,13 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"), }, }, + { + /* Lenovo ThinkPad Twist S230u */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), + }, + }, { } };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 69/142 Input: synaptics-rmi4 - really fix attn_data use-after-free
In reply to Greg Kroah-HartmanFrom: Evan Green <[email protected]>
[ Upstream commit d5a5e5b5fa7b86c05bf073acc0ba98fa280174ec ]
Fix a use-after-free noticed by running with KASAN enabled. If rmi_irq_fn() is run twice in a row, then rmi_f11_attention() (among others) will end up reading from drvdata->attn_data.data, which was freed and left dangling in rmi_irq_fn().
Commit 55edde9fff1a ("Input: synaptics-rmi4 - prevent UAF reported by KASAN") correctly identified and analyzed this bug. However the attempted fix only NULLed out a local variable, missing the fact that drvdata->attn_data is a struct, not a pointer.
NULL out the correct pointer in the driver data to prevent the attention functions from copying from it.
--- drivers/input/rmi4/rmi_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/rmi4/rmi_driver.c +1 -1
@@ -205,7 +205,7 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id)if (count) {kfree (attn_data.data); - attn_data.data =NULL ; + drvdata->attn_data.data =NULL ; }if (!kfifo_is_empty (&drvdata->attn_fifo))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 70/142 Input: synaptics-rmi4 - fix error return code in rmi_driver_probe()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit 5caab2da63207d6d631007f592f5219459e3454d ]
Fix to return a negative error code from the input_register_device() error handling case instead of 0, as done elsewhere in this function.
--- drivers/input/rmi4/rmi_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/rmi4/rmi_driver.c +2 -1
@@ -1210,7 +1210,8 @@ static int rmi_driver_probe(struct device *dev)if (data->input) {rmi_driver_set_input_name (rmi_dev, data->input);if (!rmi_dev->xport->input) { -if (input_register_device (data->input)) { + retval =input_register_device (data->input); +if (retval) {dev_err (dev,"%s: Failed to register input device.\n" , __func__); goto err_destroy_functions;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 71/142 ARM: 8970/1: decompressor: increase tag size
In reply to Greg Kroah-HartmanFrom: Łukasz Stelmach <[email protected]>
[ Upstream commit 2c962369d72f286659e6446919f88d69b943cb4d ]
The size field of the tag header structure is supposed to be set to the size of a tag structure including the header.
--- arch/arm/boot/compressed/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/compressed/vmlinux.lds.S +1 -1
@@ -43,7 +43,7 @@ SECTIONS } .table : ALIGN(4) { _table_start = .; - LONG(ZIMAGE_MAGIC(2)) + LONG(ZIMAGE_MAGIC(4)) LONG(ZIMAGE_MAGIC(0x5a534c4b)) LONG(ZIMAGE_MAGIC(__piggy_size_addr - _start)) LONG(ZIMAGE_MAGIC(_kernel_bss_size))
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 72/142 ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 747ffc2fcf969eff9309d7f2d1d61cb8b9e1bb40 ]
Consolidate the user access assembly code to asm/uaccess-asm.h. This moves the csdb, check_uaccess, uaccess_mask_range_ptr, uaccess_enable, uaccess_disable, uaccess_save, uaccess_restore macros, and creates two new ones for exception entry and exit - uaccess_entry and uaccess_exit.
This makes the uaccess_save and uaccess_restore macros private to asm/uaccess-asm.h.
--- arch/arm/include/asm/assembler.h | 75 +------------------- arch/arm/include/asm/uaccess-asm.h | 106 +++++++++++++++++++++++++++++ arch/arm/kernel/entry-armv.S | 11 +-- arch/arm/kernel/entry-header.S | 9 +-- 4 files changed, 112 insertions(+), 89 deletions(-) create mode 100644 arch/arm/include/asm/uaccess-asm.h
arch/arm/include/asm/assembler.h +1 -74
@@ -18,11 +18,11 @@#endif #include <asm/ptrace.h> -#include <asm/domain.h> #include <asm/opcodes-virt.h> #include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/thread_info.h> +#include <asm/uaccess-asm.h> #define IOMEM (x) (x)
@@ -446,79 +446,6 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) .size \name , . - \name .endm - .macro csdb -#ifdef CONFIG_THUMB2_KERNEL - .inst.w 0xf3af8014 -#else - .inst 0xe320f014 -#endif - .endm - - .macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req -#ifndef CONFIG_CPU_USE_DOMAINS - adds \tmp, \addr, #\size - 1 - sbcscc \tmp, \tmp, \limit - bcs \bad -#ifdef CONFIG_CPU_SPECTRE - movcs \addr, #0 - csdb -#endif -#endif - .endm - - .macro uaccess_mask_range_ptr, addr:req, size:req, limit:req, tmp:req -#ifdef CONFIG_CPU_SPECTRE - sub \tmp, \limit, #1 - subs \tmp, \tmp, \addr @ tmp = limit - 1 - addr - addhs \tmp, \tmp, #1 @ if (tmp >= 0) { - subshs \tmp, \tmp, \size @ tmp = limit - (addr + size) } - movlo \addr, #0 @ if (tmp < 0) addr = NULL - csdb -#endif - .endm - - .macro uaccess_disable, tmp, isb=1 -#ifdef CONFIG_CPU_SW_DOMAIN_PAN - /* - * Whenever we re-enter userspace, the domains should always be - * set appropriately. - */ - mov \tmp, #DACR_UACCESS_DISABLE - mcr p15, 0, \tmp, c3, c0, 0 @ Set domain register - .if \isb - instr_sync - .endif -#endif - .endm - - .macro uaccess_enable, tmp, isb=1 -#ifdef CONFIG_CPU_SW_DOMAIN_PAN - /* - * Whenever we re-enter userspace, the domains should always be - * set appropriately. - */ - mov \tmp, #DACR_UACCESS_ENABLE - mcr p15, 0, \tmp, c3, c0, 0 - .if \isb - instr_sync - .endif -#endif - .endm - - .macro uaccess_save, tmp -#ifdef CONFIG_CPU_SW_DOMAIN_PAN - mrc p15, 0, \tmp, c3, c0, 0 - str \tmp, [sp, #SVC_DACR] -#endif - .endm - - .macro uaccess_restore -#ifdef CONFIG_CPU_SW_DOMAIN_PAN - ldr r0, [sp, #SVC_DACR] - mcr p15, 0, r0, c3, c0, 0 -#endif - .endm - .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo .macro ret\c, reg #if __LINUX_ARM_ARCH__ < 6
arch/arm/include/asm/uaccess-asm.h new file +106 -0
106 lines not on this page · raw message
arch/arm/kernel/entry-armv.S +2 -9
@@ -27,6 +27,7 @@ #include <asm/unistd.h> #include <asm/tls.h> #include <asm/system_info.h> +#include <asm/uaccess-asm.h> #include "entry-header.S" #include <asm/entry-macro-multi.S>
@@ -179,15 +180,7 @@ ENDPROC(__und_invalid) stmia r7, {r2 - r6} get_thread_info tsk - ldr r0, [tsk, #TI_ADDR_LIMIT] - mov r1, #TASK_SIZE - str r1, [tsk, #TI_ADDR_LIMIT] - str r0, [sp, #SVC_ADDR_LIMIT] - - uaccess_save r0 - .if \uaccess - uaccess_disable r0 - .endif + uaccess_entry tsk, r0, r1, r2, \uaccess .if \trace #ifdef CONFIG_TRACE_IRQFLAGS
arch/arm/kernel/entry-header.S +3 -6
@@ -6,6 +6,7 @@ #include <asm/asm-offsets.h> #include <asm/errno.h> #include <asm/thread_info.h> +#include <asm/uaccess-asm.h> #include <asm/v7m.h> @ Bad Abort numbers
@@ -217,9 +218,7 @@ blne trace_hardirqs_off #endif .endif - ldr r1, [sp, #SVC_ADDR_LIMIT] - uaccess_restore - str r1, [tsk, #TI_ADDR_LIMIT] + uaccess_exit tsk, r0, r1 #ifndef CONFIG_THUMB2_KERNEL @ ARM mode SVC restore
@@ -263,9 +262,7 @@ @ on the stack remains correct). @ .macro svc_exit_via_fiq - ldr r1, [sp, #SVC_ADDR_LIMIT] - uaccess_restore - str r1, [tsk, #TI_ADDR_LIMIT] + uaccess_exit tsk, r0, r1 #ifndef CONFIG_THUMB2_KERNEL @ ARM mode restore mov r0, sp
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 73/142 ARM: uaccess: integrate uaccess_save and uaccess_restore
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 8ede890b0bcebe8c760aacfe20e934d98c3dc6aa ]
Integrate uaccess_save / uaccess_restore macros into the new uaccess_entry / uaccess_exit macros respectively.
--- arch/arm/include/asm/uaccess-asm.h | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
arch/arm/include/asm/uaccess-asm.h +13 -17
@@ -67,30 +67,23 @@#endif .endm - .macro uaccess_save, tmp#ifdef CONFIG_CPU_SW_DOMAIN_PAN - mrc p15, 0, \tmp, c3, c0, 0 - str \tmp, [sp, #SVC_DACR] -#endif - .endm - - .macro uaccess_restore -#ifdef CONFIG_CPU_SW_DOMAIN_PAN - ldr r0, [sp, #SVC_DACR] - mcr p15, 0, r0, c3, c0, 0 +#define DACR(x...) x +#else +#define DACR(x...)#endif - .endm/* * Save the address limit on entry to a privileged exception and * if using PAN, save and disable usermode access. */ .macro uaccess_entry, tsk, tmp0, tmp1, tmp2, disable - ldr \tmp0, [\tsk, #TI_ADDR_LIMIT] - mov \tmp1, #TASK_SIZE - str \tmp1, [\tsk, #TI_ADDR_LIMIT] - str \tmp0, [sp, #SVC_ADDR_LIMIT] - uaccess_save \tmp0 + ldr \tmp1, [\tsk, #TI_ADDR_LIMIT] + mov \tmp2, #TASK_SIZE + str \tmp2, [\tsk, #TI_ADDR_LIMIT] + DACR( mrc p15, 0, \tmp0, c3, c0, 0) + DACR( str \tmp0, [sp, #SVC_DACR]) + str \tmp1, [sp, #SVC_ADDR_LIMIT] .if \disable uaccess_disable \tmp0 .endif
@@ -99,8 +92,11 @@/* Restore the user access state previously saved by uaccess_entry */ .macro uaccess_exit, tsk, tmp0, tmp1 ldr \tmp1, [sp, #SVC_ADDR_LIMIT] - uaccess_restore + DACR( ldr \tmp0, [sp, #SVC_DACR]) str \tmp1, [\tsk, #TI_ADDR_LIMIT] + DACR( mcr p15, 0, \tmp0, c3, c0, 0) .endm +#undef DACR + #endif /* __ASM_UACCESS_ASM_H__ */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 74/142 ARM: uaccess: fix DACR mismatch with nested exceptions
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 71f8af1110101facfad68989ff91f88f8e2c3e22 ]
Tomas Paukrt reports that his SAM9X60 based system (ARM926, ARMv5TJ) fails to fix up alignment faults, eventually resulting in a kernel oops.
The problem occurs when using CONFIG_CPU_USE_DOMAINS with commit e6978e4bf181 ("ARM: save and reset the address limit when entering an exception"). This is because the address limit is set back to TASK_SIZE on exception entry, and, although it is restored on exception exit, the domain register is not.
Hence, this sequence can occur:
interrupt
pt_regs->addr_limit = addr_limit // USER_DS
addr_limit = USER_DS
alignment exception
__probe_kernel_read()
old_fs = get_fs() // USER_DS
set_fs(KERNEL_DS)
addr_limit = KERNEL_DS
dacr.kernel = DOMAIN_MANAGER
interrupt
pt_regs->addr_limit = addr_limit // KERNEL_DS
addr_limit = USER_DS
alignment exception
__probe_kernel_read()
old_fs = get_fs() // USER_DS
set_fs(KERNEL_DS)
addr_limit = KERNEL_DS
dacr.kernel = DOMAIN_MANAGER
...
set_fs(old_fs)
addr_limit = USER_DS
dacr.kernel = DOMAIN_CLIENT
...
addr_limit = pt_regs->addr_limit // KERNEL_DS
interrupt returnsAt this point, addr_limit is correctly restored to KERNEL_DS for __probe_kernel_read() to continue execution, but dacr.kernel is not, it has been reset by the set_fs(old_fs) to DOMAIN_CLIENT.
This would not have happened prior to the mentioned commit, because addr_limit would remain KERNEL_DS, so get_fs() would have returned KERNEL_DS, and so would correctly nest.
This commit fixes the problem by also saving the DACR on exception entry if either CONFIG_CPU_SW_DOMAIN_PAN or CONFIG_CPU_USE_DOMAINS are enabled, and resetting the DACR appropriately on exception entry to match addr_limit and PAN settings.
--- arch/arm/include/asm/uaccess-asm.h | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
arch/arm/include/asm/uaccess-asm.h +20 -5
@@ -67,15 +67,21 @@#endif .endm -#ifdef CONFIG_CPU_SW_DOMAIN_PAN +#if defined(CONFIG_CPU_SW_DOMAIN_PAN ) || defined(CONFIG_CPU_USE_DOMAINS ) #define DACR(x...) x#else #define DACR(x...)#endif /* -* Save the address limit on entry to a privileged exception and -* if using PAN, save and disable usermode access. +* Save the address limit on entry to a privileged exception. +* +* If we are using the DACR for kernel access by the user accessors +* (CONFIG_CPU_USE_DOMAINS=y), always reset the DACR kernel domain +* back to client mode, whether or not \disable is set. +* +* If we are using SW PAN, set the DACR user domain to no access +* if \disable is set. */ .macro uaccess_entry, tsk, tmp0, tmp1, tmp2, disable ldr \tmp1, [\tsk, #TI_ADDR_LIMIT]
@@ -84,8 +90,17 @@ DACR( mrc p15, 0, \tmp0, c3, c0, 0) DACR( str \tmp0, [sp, #SVC_DACR]) str \tmp1, [sp, #SVC_ADDR_LIMIT] - .if \disable - uaccess_disable \tmp0 + .if \disable && IS_ENABLED(CONFIG_CPU_SW_DOMAIN_PAN) + /* kernel=client, user=no access */ + mov \tmp2, #DACR_UACCESS_DISABLE + mcr p15, 0, \tmp2, c3, c0, 0 + instr_sync + .elseif IS_ENABLED(CONFIG_CPU_USE_DOMAINS) + /* kernel=client */ + bic \tmp2, \tmp0, #domain_mask(DOMAIN_KERNEL) + orr \tmp2, \tmp2, #domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT) + mcr p15, 0, \tmp2, c3, c0, 0 + instr_sync .endif .endm
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 75/142 gpio: exar: Fix bad handling for ida_simple_get error path
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 333830aa149a87cabeb5d30fbcf12eecc8040d2c ]
The commit 7ecced0934e5 ("gpio: exar: add a check for the return value of ida_simple_get fails") added a goto jump to the common error handler for ida_simple_get() error, but this is wrong in two ways:
it doesn't set the proper return code and, more badly, it invokes ida_simple_remove() with a negative index that shall lead to a kernel panic via BUG_ON().
This patch addresses those two issues.
--- drivers/gpio/gpio-exar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpio/gpio-exar.c +5 -2
@@ -145,8 +145,10 @@ static int gpio_exar_probe(struct platform_device *pdev)mutex_init (&exar_gpio->lock); index =ida_simple_get (&ida_index,0 ,0 ,GFP_KERNEL ); -if (index <0 ) - goto err_destroy; +if (index <0 ) { + ret = index; + goto err_mutex_destroy; + }sprintf (exar_gpio->name,"exar_gpio%d" , index); exar_gpio->gpio_chip.label = exar_gpio->name;
@@ -173,6 +175,7 @@ static int gpio_exar_probe(struct platform_device *pdev) err_destroy:ida_simple_remove (&ida_index, index); +err_mutex_destroy:mutex_destroy (&exar_gpio->lock);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/142 arm64: dts: mt8173: fix vcodec-enc clock
In reply to Greg Kroah-HartmanFrom: Hsin-Yi Wang <[email protected]>
[ Upstream commit 3b1f6c5e4dfaf767f6f2f120cd93b347b5a9f1aa ]
Fix the assigned-clock-parents to higher frequency clock to avoid h264 encode timeout:
[ 134.763465] mtk_vpu 10020000.vpu: vpu ipi 4 ack time out ! [ 134.769008] [MTK_VCODEC][ERROR][18]: vpu_enc_send_msg() vpu_ipi_send msg_id c002 len 32 fail -5 [ 134.777707] [MTK_VCODEC][ERROR][18]: vpu_enc_encode() AP_IPIMSG_ENC_ENCODE 0 fail
venc_sel is the clock used by h264 encoder, and venclt_sel is the clock used by vp8 encoder. Assign venc_sel to vcodecpll_ck and venclt_sel to vcodecpll_370p5.
vcodecpll 1482000000
vcodecpll_ck 494000000
venc_sel 494000000
...
vcodecpll_370p5 370500000
venclt_sel 370500000--- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8173.dtsi +2 -2
@@ -1397,8 +1397,8 @@ "venc_lt_sel"; assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>, <&topckgen CLK_TOP_VENC_LT_SEL>; - assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>, - <&topckgen CLK_TOP_UNIVPLL1_D2>; + assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>, + <&topckgen CLK_TOP_VCODECPLL_370P5>; }; vencltsys: clock-controller@19000000 {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 77/142 soc: mediatek: cmdq: return send msg error code
In reply to Greg Kroah-HartmanFrom: Dennis YC Hsieh <[email protected]>
[ Upstream commit 34c4e4072603ff5c174df73b973896abb76cbb51 ]
Return error code to client if send message fail,
so that client has chance to error handling.
--- drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/soc/mediatek/mtk-cmdq-helper.c +3 -1
@@ -258,7 +258,9 @@ int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb,spin_unlock_irqrestore (&client->lock, flags); } -mbox_send_message (client->chan, pkt); + err =mbox_send_message (client->chan, pkt); +if (err <0 ) +return err;/* We can send next packet immediately, so just call txdone. */ mbox_client_txdone (client->chan,0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/142 gpu/drm: Ingenic: Fix opaque pointer casted to wrong type
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit abf56fadf0e208abfb13ad1ac0094416058da0ad ]
The opaque pointer passed to the IRQ handler is a pointer to the drm_device, not a pointer to our ingenic_drm structure.
It still worked, because our ingenic_drm structure contains the drm_device as its first field, so the pointer received had the same value, but this was not semantically correct.
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -1
@@ -467,7 +467,7 @@ static int ingenic_drm_encoder_atomic_check(struct drm_encoder *encoder,static irqreturn_t ingenic_drm_irq_handler (int irq,void *arg) { -struct ingenic_drm *priv = arg; +struct ingenic_drm *priv =drm_device_get_priv (arg);unsigned int state;regmap_read (priv->map,JZ_REG_LCD_STATE , &state);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/142 IB/qib: Call kobject_put() when kobject_init_and_add() fails
In reply to Greg Kroah-HartmanFrom: Kaike Wan <[email protected]>
[ Upstream commit a35cd6447effd5c239b564c80fa109d05ff3d114 ]
When kobject_init_and_add() returns an error in the function qib_create_port_files(), the function kobject_put() is not called for the corresponding kobject, which potentially leads to memory leak.
This patch fixes the issue by calling kobject_put() even if kobject_init_and_add() fails. In addition, the ppd->diagc_kobj is released along with other kobjects when the sysfs is unregistered.
--- drivers/infiniband/hw/qib/qib_sysfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/infiniband/hw/qib/qib_sysfs.c +5 -4
@@ -760,7 +760,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num,qib_dev_err (dd,"Skipping linkcontrol sysfs info, (err %d) port %u\n" , ret, port_num); - goto bail; + goto bail_link; }kobject_uevent (&ppd->pport_kobj,KOBJ_ADD );
@@ -770,7 +770,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num,qib_dev_err (dd,"Skipping sl2vl sysfs info, (err %d) port %u\n" , ret, port_num); - goto bail_link; + goto bail_sl; }kobject_uevent (&ppd->sl2vl_kobj,KOBJ_ADD );
@@ -780,7 +780,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num,qib_dev_err (dd,"Skipping diag_counters sysfs info, (err %d) port %u\n" , ret, port_num); - goto bail_sl; + goto bail_diagc; }kobject_uevent (&ppd->diagc_kobj,KOBJ_ADD );
@@ -793,7 +793,7 @@ int qib_create_port_files(struct ib_device *ibdev, u8 port_num,qib_dev_err (dd,"Skipping Congestion Control sysfs info, (err %d) port %u\n" , ret, port_num); - goto bail_diagc; + goto bail_cc; }kobject_uevent (&ppd->pport_cc_kobj,KOBJ_ADD );
@@ -854,6 +854,7 @@ void qib_verbs_unregister_sysfs(struct qib_devdata *dd) &cc_table_bin_attr);kobject_put (&ppd->pport_cc_kobj); } +kobject_put (&ppd->diagc_kobj);kobject_put (&ppd->sl2vl_kobj);kobject_put (&ppd->pport_kobj); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/142 ARM: dts/imx6q-bx50v3: Set display interface clock parents
In reply to Greg Kroah-HartmanFrom: Robert Beckett <[email protected]>
[ Upstream commit 665e7c73a7724a393b4ec92d1ae1e029925ef2b7 ]
Avoid LDB and IPU DI clocks both using the same parent. LDB requires pasthrough clock to avoid breaking timing while IPU DI does not.
Force IPU DI clocks to use IMX6QDL_CLK_PLL2_PFD0_352M as parent and LDB to use IMX6QDL_CLK_PLL5_VIDEO_DIV.
This fixes an issue where attempting atomic modeset while using HDMI and display port at the same time causes LDB clock programming to destroy the programming of HDMI that was done during the same modeset.
[Use IMX6QDL_CLK_PLL2_PFD0_352M instead of IMX6QDL_CLK_PLL2_PFD2_396M
originally chosen by Robert Beckett to avoid affecting eMMC clock by DRM atomic updates]
[Squash Robert's and Ian's commits for bisectability, update patch
description and add stable tag]
--- arch/arm/boot/dts/imx6q-b450v3.dts | 7 ------- arch/arm/boot/dts/imx6q-b650v3.dts | 7 ------- arch/arm/boot/dts/imx6q-b850v3.dts | 11 ----------- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 15 +++++++++++++++ 4 files changed, 15 insertions(+), 25 deletions(-)
arch/arm/boot/dts/imx6q-b450v3.dts +0 -7
@@ -65,13 +65,6 @@ }; }; -&clks { - assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, - <&clks IMX6QDL_CLK_LDB_DI1_SEL>; - assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, - <&clks IMX6QDL_CLK_PLL3_USB_OTG>; -}; - &ldb { status = "okay";
arch/arm/boot/dts/imx6q-b650v3.dts +0 -7
@@ -65,13 +65,6 @@ }; }; -&clks { - assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, - <&clks IMX6QDL_CLK_LDB_DI1_SEL>; - assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, - <&clks IMX6QDL_CLK_PLL3_USB_OTG>; -}; - &ldb { status = "okay";
arch/arm/boot/dts/imx6q-b850v3.dts +0 -11
@@ -53,17 +53,6 @@ }; }; -&clks { - assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, - <&clks IMX6QDL_CLK_LDB_DI1_SEL>, - <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>, - <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>; - assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, - <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, - <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, - <&clks IMX6QDL_CLK_PLL2_PFD2_396M>; -}; - &ldb { fsl,dual-channel; status = "okay";
arch/arm/boot/dts/imx6q-bx50v3.dtsi +15 -0
@@ -377,3 +377,18 @@ #interrupt-cells = <1>; }; }; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>, + <&clks IMX6QDL_CLK_IPU1_DI0_PRE_SEL>, + <&clks IMX6QDL_CLK_IPU1_DI1_PRE_SEL>, + <&clks IMX6QDL_CLK_IPU2_DI0_PRE_SEL>, + <&clks IMX6QDL_CLK_IPU2_DI1_PRE_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, + <&clks IMX6QDL_CLK_PLL5_VIDEO_DIV>, + <&clks IMX6QDL_CLK_PLL2_PFD0_352M>, + <&clks IMX6QDL_CLK_PLL2_PFD0_352M>, + <&clks IMX6QDL_CLK_PLL2_PFD0_352M>, + <&clks IMX6QDL_CLK_PLL2_PFD0_352M>; +};
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 81/142 ARM: dts: bcm2835-rpi-zero-w: Fix led polarity
In reply to Greg Kroah-HartmanFrom: Vincent Stehlé <[email protected]>
[ Upstream commit 58bb90ab415562eededb932455046924e65df342 ]
The status "ACT" led on the Raspberry Pi Zero W is on when GPIO 47 is low.
This has been verified on a board and somewhat confirmed by both the GPIO name ("STATUS_LED_N") and the reduced schematics [1].
--- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +1 -1
@@ -24,7 +24,7 @@ leds { act { - gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 82/142 ARM: dts: bcm: HR2: Fix PPI interrupt types
In reply to Greg Kroah-HartmanFrom: Hamish Martin <[email protected]>
[ Upstream commit be0ec060b54f0481fb95d59086c1484a949c903c ]
These error messages are output when booting on a BCM HR2 system:
GIC: PPI11 is secure or misconfigured
GIC: PPI13 is secure or misconfigured
Per ARM documentation these interrupts are triggered on a rising edge. See ARM Cortex A-9 MPCore Technical Reference Manual, Revision r4p1, Section 3.3.8 Interrupt Configuration Registers.
The same issue was resolved for NSP systems in commit 5f1aa51c7a1e ("ARM: dts: NSP: Fix PPI interrupt types").
--- arch/arm/boot/dts/bcm-hr2.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm-hr2.dtsi +3 -3
@@ -75,7 +75,7 @@ timer@20200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x20200 0x100>; - interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>; clocks = <&periph_clk>; };
@@ -83,7 +83,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x20600 0x20>; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | - IRQ_TYPE_LEVEL_HIGH)>; + IRQ_TYPE_EDGE_RISING)>; clocks = <&periph_clk>; };
@@ -91,7 +91,7 @@ compatible = "arm,cortex-a9-twd-wdt"; reg = <0x20620 0x20>; interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | - IRQ_TYPE_LEVEL_HIGH)>; + IRQ_TYPE_EDGE_RISING)>; clocks = <&periph_clk>; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 83/142 mmc: block: Fix use-after-free issue for rpmb
In reply to Greg Kroah-HartmanFrom: Peng Hao <[email protected]>
[ Upstream commit 202500d21654874aa03243e91f96de153ec61860 ]
The data structure member “rpmb->md” was passed to a call of the function “mmc_blk_put” after a call of the function “put_device”. Reorder these function calls to keep the data accesses consistent.
--- drivers/mmc/core/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/block.c +1 -1
@@ -2475,8 +2475,8 @@ static int mmc_rpmb_chrdev_release(struct inode *inode, struct file *filp)struct mmc_rpmb_data *rpmb =container_of (inode->i_cdev, struct mmc_rpmb_data, chrdev); -put_device (&rpmb->dev);mmc_blk_put (rpmb->md); +put_device (&rpmb->dev);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 84/142 gpio: pxa: Fix return value of pxa_gpio_probe()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 558ab2e8155e5f42ca0a6407957cd4173dc166cc ]
When call function devm_platform_ioremap_resource(), we should use IS_ERR() to check the return value and return PTR_ERR() if failed.
--- drivers/gpio/gpio-pxa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-pxa.c +2 -2
@@ -663,8 +663,8 @@ static int pxa_gpio_probe(struct platform_device *pdev) pchip->irq1 = irq1; gpio_reg_base =devm_platform_ioremap_resource (pdev,0 ); -if (!gpio_reg_base) -return -EINVAL ; +if (IS_ERR (gpio_reg_base)) +return PTR_ERR (gpio_reg_base); clk =clk_get (&pdev->dev,NULL );if (IS_ERR (clk)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 85/142 gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe()
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 98f7d1b15e87c84488b30ecc4ec753b0690b9dbf ]
Propagate the error code returned by devm_platform_ioremap_resource() out of probe() instead of overwriting it.
--- drivers/gpio/gpio-bcm-kona.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-bcm-kona.c +1 -1
@@ -619,7 +619,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev) kona_gpio->reg_base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (kona_gpio->reg_base)) { - ret = -ENXIO ; + ret =PTR_ERR (kona_gpio->reg_base); goto err_irq_domain; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 86/142 RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe()
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit db857e6ae548f0f4f4a0f63fffeeedf3cca21f9d ]
In function pvrdma_pci_probe(), pdev was not disabled in one error path. Thus replace the jump target “err_free_device” by "err_disable_pdev".
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +1 -1
@@ -829,7 +829,7 @@ static int pvrdma_pci_probe(struct pci_dev *pdev, !(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {dev_err (&pdev->dev,"PCI BAR region not MMIO\n" ); ret = -ENOMEM ; - goto err_free_device; + goto err_disable_pdev; } ret =pci_request_regions (pdev,DRV_NAME );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 87/142 ALSA: hwdep: fix a left shifting 1 by 31 UB bug
In reply to Greg Kroah-HartmanFrom: Changming Liu <[email protected]>
[ Upstream commit fb8cd6481ffd126f35e9e146a0dcf0c4e8899f2e ]
The "info.index" variable can be 31 in "1 << info.index". This might trigger an undefined behavior since 1 is signed.
Fix this by casting 1 to 1u just to be sure "1u << 31" is defined.
--- sound/core/hwdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/hwdep.c +2 -2
@@ -216,12 +216,12 @@ static int snd_hwdep_dsp_load(struct snd_hwdep *hw,if (info.index >=32 )return -EINVAL ;/* check whether the dsp was already loaded */ -if (hw->dsp_loaded & (1 << info.index)) +if (hw->dsp_loaded & (1u << info.index))return -EBUSY ; err = hw->ops.dsp_load (hw, &info);if (err <0 )return err; - hw->dsp_loaded |= (1 << info.index); + hw->dsp_loaded |= (1u << info.index);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 88/142 ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 399c01aa49e548c82d40f8161915a5941dd3c60e ]
We fixed the regression of the speaker volume for some Thinkpad models (e.g. T570) by the commit 54947cd64c1b ("ALSA: hda/realtek - Fix speaker output regression on Thinkpad T570"). Essentially it fixes the DAC / pin pairing by a static table. It was confirmed and merged to stable kernel later.
Now, interestingly, we got another regression report for the very same model (T570) about the similar problem, and the commit above was the culprit. That is, by some reason, there are devices that prefer the DAC1, and another device DAC2!
Unfortunately those have the same ID and we have no idea what can differentiate, in this patch, a new fixup model "tpt470-dock-fix" is provided, so that users with such a machine can apply it manually. When model=tpt470-dock-fix option is passed to snd-hda-intel module, it avoids the fixed DAC pairing and the DAC1 is assigned to the speaker like the earlier versions.
--- sound/pci/hda/patch_realtek.c | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
sound/pci/hda/patch_realtek.c +26 -10
@@ -5484,18 +5484,9 @@ static void alc_fixup_tpt470_dock(struct hda_codec *codec, { 0x19, 0x21a11010 }, /* dock mic */ { } }; -/* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise -* the speaker output becomes too low by some reason on Thinkpads with -* ALC298 codec -*/ -static const hda_nid_t preferred_pairs[] = { -0x14 ,0x03 ,0x17 ,0x02 ,0x21 ,0x02 , -0 - };struct alc_spec *spec = codec->spec;if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { - spec->gen.preferred_dacs = preferred_pairs; spec->parse_flags =HDA_PINCFG_NO_HP_FIXUP ;snd_hda_apply_pincfgs (codec, pincfgs); }else if (action ==HDA_FIXUP_ACT_INIT ) {
@@ -5508,6 +5499,23 @@ static void alc_fixup_tpt470_dock(struct hda_codec *codec, } } +static void alc_fixup_tpt470_dacs (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +/* Assure the speaker pin to be coupled with DAC NID 0x03; otherwise +* the speaker output becomes too low by some reason on Thinkpads with +* ALC298 codec +*/ +static const hda_nid_t preferred_pairs[] = { +0x14 ,0x03 ,0x17 ,0x02 ,0x21 ,0x02 , +0 + }; +struct alc_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) + spec->gen.preferred_dacs = preferred_pairs; +} +static void alc_shutup_dell_xps13 (struct hda_codec *codec) {struct alc_spec *spec = codec->spec;
@@ -6063,6 +6071,7 @@ enum {ALC700_FIXUP_INTEL_REFERENCE ,ALC274_FIXUP_DELL_BIND_DACS ,ALC274_FIXUP_DELL_AIO_LINEOUT_VERB , +ALC298_FIXUP_TPT470_DOCK_FIX ,ALC298_FIXUP_TPT470_DOCK ,ALC255_FIXUP_DUMMY_LINEOUT_VERB , ALC255_FIXUP_DELL_HEADSET_MIC,
@@ -6994,12 +7003,18 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id =ALC274_FIXUP_DELL_BIND_DACS }, - [ALC298_FIXUP_TPT470_DOCK] = { + [ALC298_FIXUP_TPT470_DOCK_FIX] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_tpt470_dock, .chained = true, .chain_id =ALC293_FIXUP_LENOVO_SPK_NOISE }, + [ALC298_FIXUP_TPT470_DOCK] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_tpt470_dacs, + .chained = true, + .chain_id =ALC298_FIXUP_TPT470_DOCK_FIX + }, [ALC255_FIXUP_DUMMY_LINEOUT_VERB] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl []) {
@@ -7638,6 +7653,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC292_FIXUP_TPT440_DOCK, .name = "tpt440-dock"}, {.id = ALC292_FIXUP_TPT440, .name = "tpt440"}, {.id = ALC292_FIXUP_TPT460, .name = "tpt460"}, + {.id = ALC298_FIXUP_TPT470_DOCK_FIX, .name = "tpt470-dock-fix"}, {.id = ALC298_FIXUP_TPT470_DOCK, .name = "tpt470-dock"}, {.id = ALC233_FIXUP_LENOVO_MULTI_CODECS, .name = "dual-codecs"}, {.id = ALC700_FIXUP_INTEL_REFERENCE, .name = "alc700-ref"},
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/142 ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC
In reply to Greg Kroah-HartmanFrom: Chris Chiu <[email protected]>
[ Upstream commit 4020d1ccbe55bdf67b31d718d2400506eaf4b43f ]
The Asus USB DAC is a USB type-C audio dongle for connecting to the headset and headphone. The volume minimum value -23040 which is 0xa600 in hexadecimal with the resolution value 1 indicates this should be endianness issue caused by the firmware bug. Add a volume quirk to fix the volume control problem.
Also fixes this warning:
Warning! Unlikely big volume range (=23040), cval->res is probably wrong.
[5] FU [Headset Capture Volume] ch = 1, val = -23040/0/1 Warning! Unlikely big volume range (=23040), cval->res is probably wrong.
[7] FU [Headset Playback Volume] ch = 1, val = -23040/0/1
--- sound/usb/mixer.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/usb/mixer.c +8 -0
@@ -1171,6 +1171,14 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, cval->res =384 ; }break ; +case USB_ID (0x0495 ,0x3042 ):/* ESS Technology Asus USB DAC */ +if ((strstr (kctl->id.name,"Playback Volume" ) !=NULL ) || +strstr (kctl->id.name,"Capture Volume" ) !=NULL ) { + cval->min >>=8 ; + cval->max =0 ; + cval->res =1 ; + } +break ; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/142 exec: Always set cap_ambient in cap_bprm_set_creds
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
[ Upstream commit a4ae32c71fe90794127b32d26d7ad795813b502e ]
An invariant of cap_bprm_set_creds is that every field in the new cred structure that cap_bprm_set_creds might set, needs to be set every time to ensure the fields does not get a stale value.
The field cap_ambient is not set every time cap_bprm_set_creds is called, which means that if there is a suid or sgid script with an interpreter that has neither the suid nor the sgid bits set the interpreter should be able to accept ambient credentials. Unfortuantely because cap_ambient is not reset to it's original value the interpreter can not accept ambient credentials.
Given that the ambient capability set is expected to be controlled by the caller, I don't think this is particularly serious. But it is definitely worth fixing so the code works correctly.
I have tested to verify my reading of the code is correct and the interpreter of a sgid can receive ambient capabilities with this change and cannot receive ambient capabilities without this change.
--- security/commoncap.c | 1 + 1 file changed, 1 insertion(+)
security/commoncap.c +1 -0
@@ -812,6 +812,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)int ret;kuid_t root_uid; + new->cap_ambient = old->cap_ambient;if (WARN_ON (!cap_ambient_invariant_ok (old)))return -EPERM ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/142 clk: qcom: gcc: Fix parent for gpll0_out_even
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
[ Upstream commit a76f274182f054481182c81cd62bb8794a5450a6 ]
Documentation says that gpll0 is parent of gpll0_out_even, somehow driver coded that as bi_tcxo, so fix it
--- drivers/clk/qcom/gcc-sm8150.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/qcom/gcc-sm8150.c +1 -2
@@ -75,8 +75,7 @@ static struct clk_alpha_pll_postdiv gpll0_out_even = { .clkr.hw.init = &(struct clk_init_data){ .name ="gpll0_out_even" , .parent_data = &(const struct clk_parent_data ){ - .fw_name ="bi_tcxo" , - .name ="bi_tcxo" , + .hw = &gpll0.clkr.hw, }, .num_parents =1 , .ops = &clk_trion_pll_postdiv_ops,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 92/142 ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7f5ad9c9003425175f46c94df380e8c9e558cfb5 ]
Gigabyte TRX40 Aorus Master is equipped with two USB-audio devices, a Realtek ALC1220-VB codec (USB ID 0414:a001) and an ESS SABRE9218 DAC (USB ID 0414:a000). The latter serves solely for the headphone output on the front panel while the former serves for the rest I/Os (mostly for the I/Os in the rear panel but also including the front mic).
Both chips do work more or less with the unmodified USB-audio driver, but there are a few glitches. The ALC1220-VB returns an error for an inquiry to some jacks, as already seen on other TRX40-based mobos. However this machine has a slightly incompatible configuration, hence the existing mapping cannot be used as is.
Meanwhile the ESS chip seems working without any quirk. But since both audio devices don't provide any specific names, both cards appear as "USB-Audio", and it's quite confusing for users.
This patch is an attempt to overcome those issues:
- The specific mapping table for ALC1220-VB is provided, reducing the non-working nodes and renaming the badly chosen controls. The connector map isn't needed here unlike other TRX40 quirks.
- For both USB IDs (0414:a000 and 0414:a001), provide specific card name strings, so that user-space can identify more easily; and more importantly, UCM profile can be applied to each.
--- sound/usb/mixer_maps.c | 19 +++++++++++++++++++ sound/usb/quirks-table.h | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+)
sound/usb/mixer_maps.c +19 -0
@@ -387,6 +387,21 @@ static const struct usbmix_connector_map trx40_mobo_connector_map[] = { {} }; +/* Rear panel + front mic on Gigabyte TRX40 Aorus Master with ALC1220-VB */ +static const struct usbmix_name_map aorus_master_alc1220vb_map[] = { + {17 ,NULL },/* OT, IEC958?, disabled */ + {19 ,NULL ,12 },/* FU, Input Gain Pad - broken response, disabled */ + {16 ,"Line Out" },/* OT */ + {22 ,"Line Out Playback" },/* FU */ + {7 ,"Line" },/* IT */ + {19 ,"Line Capture" },/* FU */ + {8 ,"Mic" },/* IT */ + {20 ,"Mic Capture" },/* FU */ + {9 ,"Front Mic" },/* IT */ + {21 ,"Front Mic Capture" },/* FU */ + {} +}; +/* * Control map entries */
@@ -506,6 +521,10 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x05a7, 0x1020), .map = bose_companion5_map, }, + {/* Gigabyte TRX40 Aorus Master (rear panel + front mic) */ + .id = USB_ID(0x0414, 0xa001), + .map = aorus_master_alc1220vb_map, + }, {/* Gigabyte TRX40 Aorus Pro WiFi */ .id = USB_ID(0x0414, 0xa002), .map = trx40_mobo_map,
sound/usb/quirks-table.h +25 -0
@@ -3650,4 +3650,29 @@ ALC1220_VB_DESKTOP(0x0db0, 0x543d), /* MSI TRX40 */ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */#undef ALC1220_VB_DESKTOP +/* Two entries for Gigabyte TRX40 Aorus Master: +* TRX40 Aorus Master has two USB-audio devices, one for the front headphone +* with ESS SABRE9218 DAC chip, while another for the rest I/O (the rear +* panel and the front mic) with Realtek ALC1220-VB. +* Here we provide two distinct names for making UCM profiles easier. +*/ +{ + USB_DEVICE(0x0414, 0xa000), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { + .vendor_name ="Gigabyte" , + .product_name ="Aorus Master Front Headphone" , + .profile_name ="Gigabyte-Aorus-Master-Front-Headphone" , + .ifnum =QUIRK_NO_INTERFACE + } +}, +{ + USB_DEVICE(0x0414, 0xa001), + .driver_info = (unsigned long ) & (const struct snd_usb_audio_quirk ) { + .vendor_name ="Gigabyte" , + .product_name ="Aorus Master Main Audio" , + .profile_name ="Gigabyte-Aorus-Master-Main-Audio" , + .ifnum =QUIRK_NO_INTERFACE + } +}, + #undef USB_DEVICE_VENDOR_SPEC
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 93/142 ALSA: hda/realtek - Add new codec supported for ALC287
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
[ Upstream commit 630e36126e420e1756378b3427b42711ce0b9ddd ]
Enable new codec supported for ALC287.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -384,6 +384,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)case 0x10ec0282 :case 0x10ec0283 :case 0x10ec0286 : +case 0x10ec0287 :case 0x10ec0288 :case 0x10ec0285 :case 0x10ec0298 :
@@ -8321,6 +8322,7 @@ static int patch_alc269(struct hda_codec *codec)case 0x10ec0215 :case 0x10ec0245 :case 0x10ec0285 : +case 0x10ec0287 :case 0x10ec0289 : spec->codec_variant =ALC269_TYPE_ALC215 ; spec->shutup = alc225_shutup;
@@ -9599,6 +9601,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = {HDA_CODEC_ENTRY (0x10ec0284 ,"ALC284" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0285 ,"ALC285" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0286 ,"ALC286" , patch_alc269), +HDA_CODEC_ENTRY (0x10ec0287 ,"ALC287" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0288 ,"ALC288" , patch_alc269),HDA_CODEC_ENTRY (0x10ec0289 ,"ALC289" , patch_alc269), HDA_CODEC_ENTRY(0x10ec0290, "ALC290", patch_alc269),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/142 libceph: ignore pool overlay and cache logic on redirects
In reply to Greg Kroah-HartmanFrom: Jerry Lee <[email protected]>
[ Upstream commit 890bd0f8997ae6ac0a367dd5146154a3963306dd ]
OSD client should ignore cache/overlay flag if got redirect reply. Otherwise, the client hangs when the cache tier is in forward mode.
[ idryomov: Redirects are effectively deprecated and no longer
used or tested. The original tiering modes based on redirects are inherently flawed because redirects can race and reorder, potentially resulting in data corruption. The new proxy and readproxy tiering modes should be used instead of forward and readforward. Still marking for stable as obviously correct, though. ]
Cc: [email protected]
URL: https://tracker.ceph.com/issues/23296
URL: https://tracker.ceph.com/issues/36406
--- net/ceph/osd_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ceph/osd_client.c +3 -1
@@ -3652,7 +3652,9 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg)* supported. */ req->r_t.target_oloc.pool = m.redirect.oloc.pool; - req->r_flags |=CEPH_OSD_FLAG_REDIRECTED ; + req->r_flags |=CEPH_OSD_FLAG_REDIRECTED | +CEPH_OSD_FLAG_IGNORE_OVERLAY | +CEPH_OSD_FLAG_IGNORE_CACHE ; req->r_tid =0 ;__submit_request (req, false); goto out_unlock_osdc;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/142 ceph: flush release queue when handling caps for unknown inode
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
[ Upstream commit fb33c114d3ed5bdac230716f5b0a93b56b92a90d ]
It's possible for the VFS to completely forget about an inode, but for it to still be sitting on the cap release queue. If the MDS sends the client a cap message for such an inode, it just ignores it today, which can lead to a stall of up to 5s until the cap release queue is flushed.
If we get a cap message for an inode that can't be located, then go ahead and flush the cap release queue.
Cc: [email protected]
URL: https://tracker.ceph.com/issues/45532
--- fs/ceph/caps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/caps.c +1 -1
@@ -3938,7 +3938,7 @@ void ceph_handle_caps(struct ceph_mds_session *session,__ceph_queue_cap_release (session, cap);spin_unlock (&session->s_cap_lock); } - goto done; + goto flush_cap_releases; }/* these will work even if we don't have a cap yet */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 96/142 RDMA/core: Fix double destruction of uobject
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit c85f4abe66bea0b5db8d28d55da760c4fe0a0301 ]
Fix use after free when user user space request uobject concurrently for the same object, within the RCU grace period.
In that case, remove_handle_idr_uobject() is called twice and we will have an extra put on the uobject which cause use after free. Fix it by leaving the uobject write locked after it was removed from the idr.
Call to rdma_lookup_put_uobject with UVERBS_LOOKUP_DESTROY instead of UVERBS_LOOKUP_WRITE will do the work.
refcount_t: underflow; use-after-free.
WARNING: CPU: 0 PID: 1381 at lib/refcount.c:28 refcount_warn_saturate+0xfe/0x1a0
Kernel panic - not syncing: panic_on_warn set ...
CPU: 0 PID: 1381 Comm: syz-executor.0 Not tainted 5.5.0-rc3 #8
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014
Call Trace:
dump_stack+0x94/0xce
panic+0x234/0x56f
__warn+0x1cc/0x1e1
report_bug+0x200/0x310
fixup_bug.part.11+0x32/0x80
do_error_trap+0xd3/0x100
do_invalid_op+0x31/0x40
invalid_op+0x1e/0x30
RIP: 0010:refcount_warn_saturate+0xfe/0x1a0
Code: 0f 0b eb 9b e8 23 f6 6d ff 80 3d 6c d4 19 03 00 75 8d e8 15 f6 6d ff 48 c7 c7 c0 02 55 bd c6 05 57 d4 19 03 01 e8 a2 58 49 ff <0f> 0b e9 6e ff ff ff e8 f6 f5 6d ff 80 3d 42 d4 19 03 00 0f 85 5c
RSP: 0018:ffffc90002df7b98 EFLAGS: 00010282
RAX: 0000000000000000 RBX: ffff88810f6a193c RCX: ffffffffba649009
RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff88811b0283cc
RBP: 0000000000000003 R08: ffffed10236060e3 R09: ffffed10236060e3
R10: 0000000000000001 R11: ffffed10236060e2 R12: ffff88810f6a193c
R13: ffffc90002df7d60 R14: 0000000000000000 R15: ffff888116ae6a08
uverbs_uobject_put+0xfd/0x140
__uobj_perform_destroy+0x3d/0x60
ib_uverbs_close_xrcd+0x148/0x170
ib_uverbs_write+0xaa5/0xdf0
__vfs_write+0x7c/0x100
vfs_write+0x168/0x4a0
ksys_write+0xc8/0x200
do_syscall_64+0x9c/0x390
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x465b49
Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f759d122c58 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 000000000073bfa8 RCX: 0000000000465b49
RDX: 000000000000000c RSI: 0000000020000080 RDI: 0000000000000003
RBP: 0000000000000003 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f759d1236bc
R13: 00000000004ca27c R14: 000000000070de40 R15: 00000000ffffffff
Dumping ftrace buffer:
(ftrace buffer empty)
Kernel Offset: 0x39400000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff)--- drivers/infiniband/core/rdma_core.c | 20 +++++++++++++------- include/rdma/uverbs_std_types.h | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/infiniband/core/rdma_core.c +13 -7
@@ -160,9 +160,9 @@ static int uverbs_destroy_uobject(struct ib_uobject *uobj, uobj->context =NULL ;/* -* For DESTROY the usecnt is held write locked, the caller is expected -* to put it unlock and put the object when done with it. Only DESTROY -* can remove the IDR handle. +* For DESTROY the usecnt is not changed, the caller is expected to +* manage it via uobj_put_destroy(). Only DESTROY can remove the IDR +* handle. */ if (reason !=RDMA_REMOVE_DESTROY )atomic_set (&uobj->usecnt,0 );
@@ -194,7 +194,7 @@ static int uverbs_destroy_uobject(struct ib_uobject *uobj,/* * This calls uverbs_destroy_uobject() using the RDMA_REMOVE_DESTROY * sequence. It should only be used from command callbacks. On success the -* caller must pair this with rdma_lookup_put_uobject(LOOKUP_WRITE). This +* caller must pair this with uobj_put_destroy(). This * version requires the caller to have already obtained an * LOOKUP_DESTROY uobject kref. */
@@ -205,6 +205,13 @@ int uobj_destroy(struct ib_uobject *uobj, struct uverbs_attr_bundle *attrs)down_read (&ufile->hw_destroy_rwsem); +/* +* Once the uobject is destroyed by RDMA_REMOVE_DESTROY then it is left +* write locked as the callers put it back with UVERBS_LOOKUP_DESTROY. +* This is because any other concurrent thread can still see the object +* in the xarray due to RCU. Leaving it locked ensures nothing else will +* touch it. +*/ ret =uverbs_try_lock_object (uobj,UVERBS_LOOKUP_WRITE );if (ret) goto out_unlock;
@@ -223,7 +230,7 @@ out_unlock:/* * uobj_get_destroy destroys the HW object and returns a handle to the uobj * with a NULL object pointer. The caller must pair this with -* uverbs_put_destroy. +* uobj_put_destroy(). */ struct ib_uobject *__uobj_get_destroy (const struct uverbs_api_object *obj,u32 id,struct uverbs_attr_bundle *attrs)
@@ -257,8 +264,7 @@ int __uobj_perform_destroy(const struct uverbs_api_object *obj, u32 id, uobj =__uobj_get_destroy (obj, id, attrs);if (IS_ERR (uobj))return PTR_ERR (uobj); - -rdma_lookup_put_uobject (uobj,UVERBS_LOOKUP_WRITE ); +uobj_put_destroy (uobj);return 0 ; }
include/rdma/uverbs_std_types.h +1 -1
@@ -88,7 +88,7 @@ struct ib_uobject *__uobj_get_destroy(const struct uverbs_api_object *obj,static inline void uobj_put_destroy (struct ib_uobject *uobj) { -rdma_lookup_put_uobject (uobj,UVERBS_LOOKUP_WRITE ); +rdma_lookup_put_uobject (uobj,UVERBS_LOOKUP_DESTROY ); }static inline void uobj_put_read (struct ib_uobject *uobj)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/142 drm/amd/display: drop cursor position check in atomic test
In reply to Greg Kroah-HartmanFrom: Simon Ser <[email protected]>
[ Upstream commit f7d5991b92ff824798693ddf231cf814c9d5a88b ]
get_cursor_position already handles the case where the cursor has negative off-screen coordinates by not setting dc_cursor_position.enabled.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -7
@@ -6951,13 +6951,6 @@ static int dm_update_plane_state(struct dc *dc,return -EINVAL ; } -if (new_plane_state->crtc_x <= -new_acrtc->max_cursor_width || - new_plane_state->crtc_y <= -new_acrtc->max_cursor_height) { -DRM_DEBUG_ATOMIC ("Bad cursor position %d, %d\n" , - new_plane_state->crtc_x, new_plane_state->crtc_y); -return -EINVAL ; - } -return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 98/142 IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode
In reply to Greg Kroah-HartmanFrom: Valentine Fatiev <[email protected]>
[ Upstream commit 1acba6a817852d4aa7916d5c4f2c82f702ee9224 ]
When connected mode is set, and we have connected and datagram traffic in parallel, ipoib might crash with double free of datagram skb.
The current mechanism assumes that the order in the completion queue is the same as the order of sent packets for all QPs. Order is kept only for specific QP, in case of mixed UD and CM traffic we have few QPs (one UD and few CM's) in parallel.
The problem:
----------------------------------------------------------
Transmit queue:
-----------------
UD skb pointer kept in queue itself, CM skb kept in spearate queue and uses transmit queue as a placeholder to count the number of total transmitted packets.
0 1 2 3 4 5 6 7 8 9 10 11 12 13 .........127
------------------------------------------------------------
NL ud1 UD2 CM1 ud3 cm2 cm3 ud4 cm4 ud5 NL NL NL ...........
------------------------------------------------------------
^ ^
tail head
Completion queue (problematic scenario) - the order not the same as in the transmit queue:
1 2 3 4 5 6 7 8 9
------------------------------------
ud1 CM1 UD2 ud3 cm2 cm3 ud4 cm4 ud5
------------------------------------
1. CM1 'wc' processing
- skb freed in cm separate ring.
- tx_tail of transmit queue increased although UD2 is not freed. Now driver assumes UD2 index is already freed and it could be used for new transmitted skb.
0 1 2 3 4 5 6 7 8 9 10 11 12 13 .........127
------------------------------------------------------------
NL NL UD2 CM1 ud3 cm2 cm3 ud4 cm4 ud5 NL NL NL ...........
------------------------------------------------------------
^ ^ ^
(Bad)tail head
(Bad - Could be used for new SKB)
In this case (due to heavy load) UD2 skb pointer could be replaced by new transmitted packet UD_NEW, as the driver assumes its free. At this point we will have to process two 'wc' with same index but we have only one pointer to free.
During second attempt to free the same skb we will have NULL pointer exception.
2. UD2 'wc' processing
- skb freed according the index we got from 'wc', but it was already overwritten by mistake. So actually the skb that was released is the skb of the new transmitted packet and not the original one.
3. UD_NEW 'wc' processing
- attempt to free already freed skb. NUll pointer exception.
The fix:
-----------------------------------------------------------------------
The fix is to stop using the UD ring as a placeholder for CM packets, the cyclic ring variables tx_head and tx_tail will manage the UD tx_ring, a new cyclic variables global_tx_head and global_tx_tail are introduced for managing and counting the overall outstanding sent packets, then the send queue will be stopped and waken based on these variables only.
Note that no locking is needed since global_tx_head is updated in the xmit flow and global_tx_tail is updated in the NAPI flow only. A previous attempt tried to use one variable to count the outstanding sent packets, but it did not work since xmit and NAPI flows can run at the same time and the counter will be updated wrongly. Thus, we use the same simple cyclic head and tail scheme that we have today for the UD tx_ring.
--- drivers/infiniband/ulp/ipoib/ipoib.h | 4 ++++ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +++++++++------ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +++++++-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 ++++++---- 4 files changed, 26 insertions(+), 12 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib.h +4 -0
@@ -377,8 +377,12 @@ struct ipoib_dev_priv {struct ipoib_rx_buf *rx_ring;struct ipoib_tx_buf *tx_ring; +/* cyclic ring variables for managing tx_ring, for UD only */ unsigned int tx_head;unsigned int tx_tail; +/* cyclic ring variables for counting overall outstanding send WRs */ +unsigned int global_tx_head; +unsigned int global_tx_tail;struct ib_sge tx_sge[MAX_SKB_FRAGS +1 ];struct ib_ud_wr tx_wr;struct ib_wc send_wc[MAX_SEND_CQE ];
drivers/infiniband/ulp/ipoib/ipoib_cm.c +9 -6
@@ -756,7 +756,8 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_return ; } -if ((priv->tx_head - priv->tx_tail) == ipoib_sendq_size -1 ) { +if ((priv->global_tx_head - priv->global_tx_tail) == + ipoib_sendq_size -1 ) {ipoib_dbg (priv,"TX ring 0x%x full, stopping kernel net queue\n" , tx->qp->qp_num);netif_stop_queue (dev);
@@ -786,7 +787,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_ }else {netif_trans_update (dev); ++tx->tx_head; - ++priv->tx_head; + ++priv->global_tx_head; } }
@@ -820,10 +821,11 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)netif_tx_lock (dev); ++tx->tx_tail; - ++priv->tx_tail; + ++priv->global_tx_tail;if (unlikely (netif_queue_stopped (dev) && - (priv->tx_head - priv->tx_tail) <= ipoib_sendq_size >>1 && + ((priv->global_tx_head - priv->global_tx_tail) <= + ipoib_sendq_size >>1 ) &&test_bit (IPOIB_FLAG_ADMIN_UP , &priv->flags)))netif_wake_queue (dev);
@@ -1232,8 +1234,9 @@ timeout:dev_kfree_skb_any (tx_req->skb);netif_tx_lock_bh (p->dev); ++p->tx_tail; - ++priv->tx_tail; -if (unlikely (priv->tx_head - priv->tx_tail == ipoib_sendq_size >>1 ) && + ++priv->global_tx_tail; +if (unlikely ((priv->global_tx_head - priv->global_tx_tail) <= + ipoib_sendq_size >>1 ) &&netif_queue_stopped (p->dev) &&test_bit (IPOIB_FLAG_ADMIN_UP , &priv->flags))netif_wake_queue (p->dev);
drivers/infiniband/ulp/ipoib/ipoib_ib.c +7 -2
@@ -407,9 +407,11 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)dev_kfree_skb_any (tx_req->skb); ++priv->tx_tail; + ++priv->global_tx_tail;if (unlikely (netif_queue_stopped (dev) && - ((priv->tx_head - priv->tx_tail) <= ipoib_sendq_size >>1 ) && + ((priv->global_tx_head - priv->global_tx_tail) <= + ipoib_sendq_size >>1 ) &&test_bit (IPOIB_FLAG_ADMIN_UP , &priv->flags)))netif_wake_queue (dev);
@@ -634,7 +636,8 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb,else priv->tx_wr.wr.send_flags &= ~IB_SEND_IP_CSUM ;/* increase the tx_head after send success, but use it for queue state */ -if (priv->tx_head - priv->tx_tail == ipoib_sendq_size -1 ) { +if ((priv->global_tx_head - priv->global_tx_tail) == + ipoib_sendq_size -1 ) {ipoib_dbg (priv,"TX ring full, stopping kernel net queue\n" );netif_stop_queue (dev); }
@@ -662,6 +665,7 @@ int ipoib_send(struct net_device *dev, struct sk_buff *skb, rc = priv->tx_head; ++priv->tx_head; + ++priv->global_tx_head; }return rc; }
@@ -807,6 +811,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev)ipoib_dma_unmap_tx (priv, tx_req);dev_kfree_skb_any (tx_req->skb); ++priv->tx_tail; + ++priv->global_tx_tail; }for (i =0 ; i < ipoib_recvq_size; ++i) {
drivers/infiniband/ulp/ipoib/ipoib_main.c +6 -4
@@ -1188,9 +1188,11 @@ static void ipoib_timeout(struct net_device *dev)ipoib_warn (priv,"transmit timeout: latency %d msecs\n" ,jiffies_to_msecs (jiffies -dev_trans_start (dev))); -ipoib_warn (priv,"queue stopped %d, tx_head %u, tx_tail %u\n" , -netif_queue_stopped (dev), - priv->tx_head, priv->tx_tail); +ipoib_warn (priv, +"queue stopped %d, tx_head %u, tx_tail %u, global_tx_head %u, global_tx_tail %u\n" , +netif_queue_stopped (dev), priv->tx_head, priv->tx_tail, + priv->global_tx_head, priv->global_tx_tail); +/* XXX reset QP, etc. */ }
@@ -1705,7 +1707,7 @@ static int ipoib_dev_init_default(struct net_device *dev) goto out_rx_ring_cleanup; } -/* priv->tx_head, tx_tail & tx_outstanding are already 0 */ +/* priv->tx_head, tx_tail and global_tx_tail/head are already 0 */ if (ipoib_transport_dev_init (dev, priv->ca)) { pr_warn("%s: ipoib_transport_dev_init failed\n",
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/142 mm,thp: stop leaking unreleased file pages
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
[ Upstream commit 2f33a706027c94cd4f70fcd3e3f4a17c1ce4ea4b ]
When collapse_file() calls try_to_release_page(), it has already isolated the page: so if releasing buffers happens to fail (as it sometimes does), remember to putback_lru_page(): otherwise that page is left unreclaimable and unfreeable, and the file extent uncollapsible.
--- mm/khugepaged.c | 1 + 1 file changed, 1 insertion(+)
mm/khugepaged.c +1 -0
@@ -1655,6 +1655,7 @@ static void collapse_file(struct mm_struct *mm,if (page_has_private (page) && !try_to_release_page (page,GFP_KERNEL )) { result =SCAN_PAGE_HAS_PRIVATE ; +putback_lru_page (page); goto out_unlock; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 100/142 mm: remove VM_BUG_ON(PageSlab()) from page_mapcount()
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
[ Upstream commit 6988f31d558aa8c744464a7f6d91d34ada48ad12 ]
Replace superfluous VM_BUG_ON() with comment about correct usage.
Technically reverts commit 1d148e218a0d ("mm: add VM_BUG_ON_PAGE() to page_mapcount()"), but context lines have changed.
Function isolate_migratepages_block() runs some checks out of lru_lock when choose pages for migration. After checking PageLRU() it checks extra page references by comparing page_count() and page_mapcount(). Between these two checks page could be removed from lru, freed and taken by slab.
As a result this race triggers VM_BUG_ON(PageSlab()) in page_mapcount(). Race window is tiny. For certain workload this happens around once a year.
page:ffffea0105ca9380 count:1 mapcount:0 mapping:ffff88ff7712c180 index:0x0 compound_mapcount: 0
flags: 0x500000000008100(slab|head)
raw: 0500000000008100 dead000000000100 dead000000000200 ffff88ff7712c180
raw: 0000000000000000 0000000080200020 00000001ffffffff 0000000000000000
page dumped because: VM_BUG_ON_PAGE(PageSlab(page))
------------[ cut here ]------------
kernel BUG at ./include/linux/mm.h:628!
invalid opcode: 0000 [#1] SMP NOPTI
CPU: 77 PID: 504 Comm: kcompactd1 Tainted: G W 4.19.109-27 #1
Hardware name: Yandex T175-N41-Y3N/MY81-EX0-Y3N, BIOS R05 06/20/2019
RIP: 0010:isolate_migratepages_block+0x986/0x9b0The code in isolate_migratepages_block() was added in commit 119d6d59dcc0 ("mm, compaction: avoid isolating pinned pages") before adding VM_BUG_ON into page_mapcount().
This race has been predicted in 2015 by Vlastimil Babka (see link below).
--- include/linux/mm.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
include/linux/mm.h +13 -2
@@ -695,6 +695,11 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)extern void kvfree (const void *addr); +/* +* Mapcount of compound page as a whole, does not include mapped sub-pages. +* +* Must be called only for compound pages or any their tail sub-pages. +*/ static inline int compound_mapcount (struct page *page) {VM_BUG_ON_PAGE (!PageCompound (page), page);
@@ -714,10 +719,16 @@ static inline void page_mapcount_reset(struct page *page)int __page_mapcount (struct page *page); +/* +* Mapcount of 0-order page; when compound sub-page, includes +* compound_mapcount(). +* +* Result is undefined for pages which cannot be mapped into userspace. +* For example SLAB or special types of pages. See function page_has_type(). +* They use this place in struct page differently. +*/ static inline int page_mapcount (struct page *page) { -VM_BUG_ON_PAGE (PageSlab (page), page); -if (unlikely (PageCompound (page)))return __page_mapcount (page);return atomic_read (&page->_mapcount) +1 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/142 fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info()
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
[ Upstream commit 1d605416fb7175e1adf094251466caa52093b413 ]
KMSAN reported uninitialized data being written to disk when dumping core. As a result, several kilobytes of kmalloc memory may be written to the core file and then read by a non-privileged user.
--- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/binfmt_elf.c +1 -1
@@ -1731,7 +1731,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, (!regset->active || regset->active(t->task, regset) > 0)) {int ret;size_t size =regset_size (t->task, regset); -void *data =kmalloc (size,GFP_KERNEL ); +void *data =kzalloc (size,GFP_KERNEL );if (unlikely (!data))return 0 ; ret = regset->get(t->task, regset,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/142 include/asm-generic/topology.h: guard cpumask_of_node() macro argument
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 4377748c7b5187c3342a60fa2ceb60c8a57a8488 ]
drivers/hwmon/amd_energy.c:195:15: error: invalid operands to binary expression ('void' and 'int')
(channel - data->nr_cpus));
~~~~~~~~~^~~~~~~~~~~~~~~~~
include/asm-generic/topology.h:51:42: note: expanded from macro 'cpumask_of_node'
#define cpumask_of_node(node) ((void)node, cpu_online_mask)
^~~~
include/linux/cpumask.h:618:72: note: expanded from macro 'cpumask_first_and'
#define cpumask_first_and(src1p, src2p) cpumask_next_and(-1, (src1p), (src2p))
^~~~~--- include/asm-generic/topology.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/topology.h +1 -1
@@ -48,7 +48,7 @@#ifdef CONFIG_NEED_MULTIPLE_NODES #define cpumask_of_node (node) ((node) == 0 ? cpu_online_mask : cpu_none_mask)#else -#define cpumask_of_node (node) ((void)node, cpu_online_mask) +#define cpumask_of_node (node) ((void)(node), cpu_online_mask)#endif #endif #ifndef pcibus_to_node
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 103/142 Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e ]
This reverts commit c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uring does do the right thing for this case, and we're still returning -EAGAIN to userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.
--- block/blk-core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
block/blk-core.c +4 -7
@@ -886,14 +886,11 @@ generic_make_request_checks(struct bio *bio) }/* -* Non-mq queues do not honor REQ_NOWAIT, so complete a bio -* with BLK_STS_AGAIN status in order to catch -EAGAIN and -* to give a chance to the caller to repeat request gracefully. +* For a REQ_NOWAIT based request, return -EOPNOTSUPP +* if queue is not a request based queue. */ -if ((bio->bi_opf &REQ_NOWAIT ) && !queue_is_mq (q)) { - status =BLK_STS_AGAIN ; - goto end_io; - } +if ((bio->bi_opf &REQ_NOWAIT ) && !queue_is_mq (q)) + goto not_supported;if (should_fail_bio (bio)) goto end_io;
Signature · 1 line
2.25.1
Re: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Jens Axboe <[email protected]>
[ Upstream commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e]This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.
Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- block/blk-core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
This broke io_uring direct-io on ext4 over md.
fallocate -l $((1024*1024*1024)) /srv/part1
fallocate -l $((1024*1024*1024)) /srv/part2
losetup -f /srv/part1
losetup -f /srv/part2
losetup -a # assuming these were loop0/1
mdadm --create -n2 -l stripe -N fast-striped /dev/md/fast-striped /dev/loop0 /dev/loop1 mkfs.ext4 /dev/md/fast-striped
mount /dev/md/fast-striped /mnt/t2
fio --directory=/mnt/t2 --ioengine io_uring --rw write --filesize 1MB --overwrite=1 --name=test --direct=1 --bs=4k
On v5.4.43-101-gbba91cdba612 this fails with
fio: io_u error on file /mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output error
whereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit 4503b7676a2e0abe69c2f2c0d8b03aec53f2f048
Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch -EIO from buffered issue request failure
-EIO bubbles up like -EAGAIN if we fail to allocate a request at the lower level. Play it safe and treat it like -EAGAIN in terms of sync retry, to avoid passing back an errant -EIO.
Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
which isn't in stable/linux-5.4.y
Greetings,
Andres Freund
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Quoted 60 lines · Andres Freund
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Jens Axboe <[email protected]>
[ Upstream commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e]This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- block/blk-core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)This broke
io_uringdirect-io on ext4 over md.fallocate -l $((1024*1024*1024))
/srv/part1
fallocate -l $((1024*1024*1024))/srv/part2
losetup -f/srv/part1
losetup -f/srv/part2
losetup -a # assuming these were loop0/1
mdadm --create -n2 -l stripe -N fast-striped/dev/md/fast-striped/dev/loop0/dev/loop1mkfs.ext4/dev/md/fast-striped
mount/dev/md/fast-striped/mnt/t2
fio --directory=/mnt/t2 --ioengineio_uring--rw write --filesize 1MB --overwrite=1 --name=test --direct=1 --bs=4kOn v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
thanks,
greg k-h
Re: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Hi,
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e was concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.
commit b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e (tag: block-5.7-2020-05-29, linux-block/block-5.7)
Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600
Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
This reverts commit c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uring does do the right thing for this case, and we're still returning -EAGAIN to userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.
I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting bba91cdba612fbce4f8575c5d94d2b146fb83ea3 would be the right fix, not backporting 4503b7676a2e0abe69c2f2c0d8b03aec53f2f048 et al.
Greetings,
Andres Freund
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Quoted 54 lines · Andres Freund
Hi,
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76ewas concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e(tag: block-5.7-2020-05-29, linux-block/block-5.7)Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600Revert "block: end bio with
BLK_STS_AGAINin case of non-mq devs andREQ_NOWAIT"This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.
Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting
bba91cdba612fbce4f8575c5d94d2b146fb83ea3would be the right fix, not backporting4503b7676a2e0abe69c2f2c0d8b03aec53f2f048et al.
Ok, can you send a revert patch for this?
But it would be good to get Jens to weigh in on this...
thanks,
greg k-h
Jens Axboe
maintainerRe: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Quoted 59 lines · Greg Kroah-Hartman
Quoted 58 lines · Andres Freund
Hi,
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76ewas concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e(tag: block-5.7-2020-05-29, linux-block/block-5.7)Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600Revert "block: end bio with
BLK_STS_AGAINin case of non-mq devs andREQ_NOWAIT"This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>
Quoted 8 lines
Quoted 4 lines
I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting
bba91cdba612fbce4f8575c5d94d2b146fb83ea3would be the right fix, not backporting4503b7676a2e0abe69c2f2c0d8b03aec53f2f048et al.Ok, can you send a revert patch for this?
But it would be good to get Jens to weigh in on this...
I'll take a look at this.
Signature · 1 line
Jens Axboe
Re: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Hi,
Quoted 54 lines · Jens Axboe
Quoted 53 lines · Greg Kroah-Hartman
Quoted 52 lines · Andres Freund
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76ewas concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e(tag: block-5.7-2020-05-29, linux-block/block-5.7)Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600Revert "block: end bio with
BLK_STS_AGAINin case of non-mq devs andREQ_NOWAIT"This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting
bba91cdba612fbce4f8575c5d94d2b146fb83ea3would be the right fix, not backporting4503b7676a2e0abe69c2f2c0d8b03aec53f2f048et al.
Having looked a bit more through the history, I suspect that the reason 5.6 doesn't need c58c1f83436b501d45d4050fd1296d71a9760bcb - which I have confirmed - is that ext4 was converted to the iomap infrastructure in 5.5, but not in 5.4.
I've confirmed that the repro I shared upthread triggers in 378f32bab3714f04c4e0c3aee4129f6703805550^ but not in 378f32bab3714f04c4e0c3aee4129f6703805550.
Quoted 5 lines
Quoted 3 lines
Ok, can you send a revert patch for this?
But it would be good to get Jens to weigh in on this...
I'll take a look at this.
Thanks.
Greetings,
Andres Freund
Jens Axboe
maintainerRe: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Quoted 66 lines · Andres Freund
Hi,
Quoted 54 lines · Jens Axboe
Quoted 53 lines · Greg Kroah-Hartman
Quoted 52 lines · Andres Freund
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76ewas concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e(tag: block-5.7-2020-05-29, linux-block/block-5.7)Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600Revert "block: end bio with
BLK_STS_AGAINin case of non-mq devs andREQ_NOWAIT"This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting
bba91cdba612fbce4f8575c5d94d2b146fb83ea3would be the right fix, not backporting4503b7676a2e0abe69c2f2c0d8b03aec53f2f048et al.
Quoted 8 lines
Having looked a bit more through the history, I suspect that the reason 5.6 doesn't need
c58c1f83436b501d45d4050fd1296d71a9760bcb- which I have confirmed - is that ext4 was converted to the iomap infrastructure in 5.5, but not in 5.4.I've confirmed that the repro I shared upthread triggers in 378f32bab3714f04c4e0c3aee4129f6703805550^ but not in
378f32bab3714f04c4e0c3aee4129f6703805550.
I checked up on this, and I do see the issue as well. As far as io_uring is concerned, we don't need that revert in 5.4. So I think the right solution here would be to... revert the revert :-)
Signature · 1 line
Jens Axboe
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 103/142] Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
Quoted 72 lines · Jens Axboe
Quoted 71 lines · Andres Freund
Hi,
Quoted 54 lines · Jens Axboe
Quoted 53 lines · Greg Kroah-Hartman
Quoted 52 lines · Andres Freund
Quoted 26 lines · Greg Kroah-Hartman
Quoted 26 lines
On v5.4.43-101-gbba91cdba612 this fails with
fio:io_uerror on file/mnt/t2/test.0.0: Input/output error: write offset=0, buflen=4096
fio: pid=734, err=5/file:io_u.c:1834, func=io_u error, error=Input/output errorwhereas previously it worked. libaio still works...
I haven't checked which major kernel version fixed this again, but I did verify that it's still broken in 5.4.94 and that 5.10.9 works.
I would suspect it's
commit
4503b7676a2e0abe69c2f2c0d8b03aec53f2f048Author: Jens Axboe <[email protected]> Date: 2020-06-01 10:00:27 -0600
io_uring: catch-EIOfrom buffered issue request failure
-EIObubbles up like-EAGAINif we fail to allocate a request at the lower level. Play it safe and treat it like-EAGAINin terms of sync retry, to avoid passing back an errant-EIO.Catch some of these early for block based file, as non-mq devices generally do not support NOWAIT. That saves us some overhead by not first trying, then retrying from async context. We can go straight to async punt instead.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Jens Axboe <[email protected]>which isn't in stable/linux-5.4.y
Can you test that if the above commit is added, all works well again?
It doesn't apply cleanly, I'll try to resolve the conflict. However, I assume that the revert was for a concrete reason - but I can't quite figure out what
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76ewas concretely solving, and whether reverting the revert in 5.4 would re-introduce a different problem.commit
b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e(tag: block-5.7-2020-05-29, linux-block/block-5.7)Author: Jens Axboe <[email protected]> Date: 2020-05-28 13:19:29 -0600Revert "block: end bio with
BLK_STS_AGAINin case of non-mq devs andREQ_NOWAIT"This reverts commit
c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uringdoes do the right thing for this case, and we're still returning-EAGAINto userspace for the cases we don't support. Revert this change to avoid doing endless spins of resubmits.Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Cc [email protected] # v5.6Reported-by Bijan Mottahedeh <[email protected]>Signed-off-by Jens Axboe <[email protected]>I suspect it just wasn't aimed at 5.4, and that's that, but I'm not sure. In which case presumably reverting
bba91cdba612fbce4f8575c5d94d2b146fb83ea3would be the right fix, not backporting4503b7676a2e0abe69c2f2c0d8b03aec53f2f048et al.Having looked a bit more through the history, I suspect that the reason 5.6 doesn't need
c58c1f83436b501d45d4050fd1296d71a9760bcb- which I have confirmed - is that ext4 was converted to the iomap infrastructure in 5.5, but not in 5.4.
Quoted 7 lines
Quoted 3 lines
I've confirmed that the repro I shared upthread triggers in 378f32bab3714f04c4e0c3aee4129f6703805550^ but not in
378f32bab3714f04c4e0c3aee4129f6703805550.I checked up on this, and I do see the issue as well. As far as
io_uringis concerned, we don't need that revert in 5.4. So I think the right solution here would be to... revert the revert :-)
Thanks for looking at this, I'll go revert the revert now.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 104/142 gpio: fix locking open drain IRQ lines
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit e9bdf7e655b9ee81ee912fae1d59df48ce7311b6 ]
We provided the right semantics on open drain lines being by definition output but incidentally the irq set up function would only allow IRQs on lines that were "not output".
Fix the semantics to allow output open drain lines to be used for IRQs.
--- drivers/gpio/gpiolib.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib.c +9 -2
@@ -3894,7 +3894,9 @@ int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset) } } -if (test_bit (FLAG_IS_OUT , &desc->flags)) { +/* To be valid for IRQ the line needs to be input or open drain */ +if (test_bit (FLAG_IS_OUT , &desc->flags) && + !test_bit (FLAG_OPEN_DRAIN , &desc->flags)) {chip_err (chip,"%s: tried to flag a GPIO set as output for IRQ\n" , __func__);
@@ -3957,7 +3959,12 @@ void gpiochip_enable_irq(struct gpio_chip *chip, unsigned int offset)if (!IS_ERR (desc) && !WARN_ON (!test_bit (FLAG_USED_AS_IRQ , &desc->flags))) { -WARN_ON (test_bit (FLAG_IS_OUT , &desc->flags)); +/* +* We must not be output when using IRQ UNLESS we are +* open drain. +*/ +WARN_ON (test_bit (FLAG_IS_OUT , &desc->flags) && + !test_bit (FLAG_OPEN_DRAIN , &desc->flags));set_bit (FLAG_IRQ_IS_ENABLED , &desc->flags); } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 105/142 iommu: Fix reference count leak in iommu_group_alloc.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 7cc31613734c4870ae32f5265d576ef296621343 ]
kobject_init_and_add() takes reference even when it fails. Thus, when kobject_init_and_add() returns an error, kobject_put() must be called to properly clean up the kobject.
--- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommu.c +1 -1
@@ -492,7 +492,7 @@ struct iommu_group *iommu_group_alloc(void) NULL, "%d", group->id);if (ret) {ida_simple_remove (&iommu_group_ida, group->id); -kfree (group); +kobject_put (&group->kobj);return ERR_PTR (ret); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 106/142 parisc: Fix kernel panic in mem_init()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit bf71bc16e02162388808949b179d59d0b571b965 ]
The Debian kernel v5.6 triggers this kernel panic:
Kernel panic - not syncing: Bad Address (null pointer deref?) Bad Address (null pointer deref?): Code=26 (Data memory access rights trap) at addr 0000000000000000 CPU: 0 PID: 0 Comm: swapper Not tainted 5.6.0-2-parisc64 #1 Debian 5.6.14-1 IAOQ[0]: mem_init+0xb0/0x150 IAOQ[1]: mem_init+0xb4/0x150 RP(r2): start_kernel+0x6c8/0x1190 Backtrace: [<0000000040101ab4>] start_kernel+0x6c8/0x1190 [<0000000040108574>] start_parisc+0x158/0x1b8
on a HP-PARISC rp3440 machine with this memory layout:
Memory Ranges:
0) Start 0x0000000000000000 End 0x000000003fffffff Size 1024 MB
1) Start 0x0000004040000000 End 0x00000040ffdfffff Size 3070 MB
Fix the crash by avoiding virt_to_page() and similar functions in mem_init() until the memory zones have been fully set up.
--- arch/parisc/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/mm/init.c +1 -1
@@ -588,7 +588,7 @@ void __init mem_init(void) > BITS_PER_LONG); high_memory =__va ((max_pfn <<PAGE_SHIFT )); -set_max_mapnr (page_to_pfn (virt_to_page (high_memory -1 )) +1 ); +set_max_mapnr (max_low_pfn);memblock_free_all ();#ifdef CONFIG_PA11
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 107/142 cfg80211: fix debugfs rename crash
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 0bbab5f0301587cad4e923ccc49bb910db86162c upstream.
Removing the "if (IS_ERR(dir)) dir = NULL;" check only works if we adjust the remaining code to not rely on it being NULL. Check IS_ERR_OR_NULL() before attempting to dereference it.
I'm not actually entirely sure this fixes the syzbot crash as the kernel config indicates that they do have DEBUG_FS in the kernel, but this is what I found when looking there.
--- net/wireless/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/core.c +1 -1
@@ -142,7 +142,7 @@ int cfg80211_dev_rename(struct cfg80211_if (result)return result; -if (rdev->wiphy.debugfsdir) +if (!IS_ERR_OR_NULL (rdev->wiphy.debugfsdir))debugfs_rename (rdev->wiphy.debugfsdir->d_parent, rdev->wiphy.debugfsdir, rdev->wiphy.debugfsdir->d_parent, newname);
Greg Kroah-Hartman
maintainerPATCH 108/142 x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long"
In reply to Greg Kroah-HartmanFrom: Andy Lutomirski <[email protected]>
commit 700d3a5a664df267f01ec8887fd2d8ff98f67e7f upstream.
Revert
45e29d119e99 ("x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long")
and add a comment to discourage someone else from making the same mistake again.
It turns out that some user code fails to compile if __X32_SYSCALL_BIT is unsigned long. See, for example [1] below.
[ bp: Massage and do the same thing in the respective tools/ header. ]
--- arch/x86/include/uapi/asm/unistd.h | 11 +++++++++-- tools/arch/x86/include/uapi/asm/unistd.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
arch/x86/include/uapi/asm/unistd.h +9 -2
@@ -2,8 +2,15 @@#ifndef _UAPI_ASM_X86_UNISTD_H#define _UAPI_ASM_X86_UNISTD_H -/* x32 syscall flag bit */ -#define __X32_SYSCALL_BIT 0x40000000UL +/* +* x32 syscall flag bit. Some user programs expect syscall NR macros +* and __X32_SYSCALL_BIT to have type int, even though syscall numbers +* are, for practical purposes, unsigned long. +* +* Fortunately, expressions like (nr & ~__X32_SYSCALL_BIT) do the right +* thing regardless. +*/ +#define __X32_SYSCALL_BIT 0x40000000#ifndef __KERNEL__# ifdef __i386__
tools/arch/x86/include/uapi/asm/unistd.h +1 -1
@@ -3,7 +3,7 @@#define _UAPI_ASM_X86_UNISTD_H/* x32 syscall flag bit */ -#define __X32_SYSCALL_BIT 0x40000000UL +#define __X32_SYSCALL_BIT 0x40000000#ifndef __KERNEL__# ifdef __i386__
Greg Kroah-Hartman
maintainerPATCH 109/142 mac80211: mesh: fix discovery timer re-arming issue / crash
In reply to Greg Kroah-HartmanFrom: Linus Lüssing <[email protected]>
commit e2d4a80f93fcfaf72e2e20daf6a28e39c3b90677 upstream.
On a non-forwarding 802.11s link between two fairly busy neighboring nodes (iperf with -P 16 at ~850MBit/s TCP; 1733.3 MBit/s VHT-MCS 9 80MHz short GI VHT-NSS 4), so with frequent PREQ retries, usually after around 30-40 seconds the following crash would occur:
[ 1110.822428] Unable to handle kernel read from unreadable memory at virtual address 00000000 [ 1110.830786] Mem abort info: [ 1110.833573] Exception class = IABT (current EL), IL = 32 bits [ 1110.839494] SET = 0, FnV = 0 [ 1110.842546] EA = 0, S1PTW = 0 [ 1110.845678] user pgtable: 4k pages, 48-bit VAs, pgd = ffff800076386000 [ 1110.852204] [0000000000000000] *pgd=00000000f6322003, *pud=00000000f62de003, *pmd=0000000000000000 [ 1110.861167] Internal error: Oops: 86000004 [#1] PREEMPT SMP [ 1110.866730] Modules linked in: pppoe ppp_async batman_adv ath10k_pci ath10k_core ath pppox ppp_generic nf_conntrack_ipv6 mac80211 iptable_nat ipt_REJECT ipt_MASQUERADE cfg80211 xt_time xt_tcpudp xt_state xt_nat xt_multiport xt_mark xt_mac xt_limit xt_conntrack xt_comment xt_TCPMSS xt_REDIRECT xt_LOG xt_FLOWOFFLOAD slhc nf_reject_ipv4 nf_nat_redirect nf_nat_masquerade_ipv4 nf_conntrack_ipv4 nf_nat_ipv4 nf_nat nf_log_ipv4 nf_flow_table_hw nf_flow_table nf_defrag_ipv6 nf_defrag_ipv4 nf_conntrack_rtcache nf_conntrack iptable_mangle iptable_filter ip_tables crc_ccitt compat nf_log_ipv6 nf_log_common ip6table_mangle ip6table_filter ip6_tables ip6t_REJECT x_tables nf_reject_ipv6 usb_storage xhci_plat_hcd xhci_pci xhci_hcd dwc3 usbcore usb_common [ 1110.932190] Process swapper/3 (pid: 0, stack limit = 0xffff0000090c8000) [ 1110.938884] CPU: 3 PID: 0 Comm: swapper/3 Not tainted 4.14.162 #0 [ 1110.944965] Hardware name: LS1043A RGW Board (DT) [ 1110.949658] task: ffff8000787a81c0 task.stack: ffff0000090c8000 [ 1110.955568] PC is at 0x0 [ 1110.958097] LR is at call_timer_fn.isra.27+0x24/0x78 [ 1110.963055] pc : [<0000000000000000>] lr : [<ffff0000080ff29c>] pstate: 00400145 [ 1110.970440] sp : ffff00000801be10 [ 1110.973744] x29: ffff00000801be10 x28: ffff000008bf7018 [ 1110.979047] x27: ffff000008bf87c8 x26: ffff000008c160c0 [ 1110.984352] x25: 0000000000000000 x24: 0000000000000000 [ 1110.989657] x23: dead000000000200 x22: 0000000000000000 [ 1110.994959] x21: 0000000000000000 x20: 0000000000000101 [ 1111.000262] x19: ffff8000787a81c0 x18: 0000000000000000 [ 1111.005565] x17: ffff0000089167b0 x16: 0000000000000058 [ 1111.010868] x15: ffff0000089167b0 x14: 0000000000000000 [ 1111.016172] x13: ffff000008916788 x12: 0000000000000040 [ 1111.021475] x11: ffff80007fda9af0 x10: 0000000000000001 [ 1111.026777] x9 : ffff00000801bea0 x8 : 0000000000000004 [ 1111.032080] x7 : 0000000000000000 x6 : ffff80007fda9aa8 [ 1111.037383] x5 : ffff00000801bea0 x4 : 0000000000000010 [ 1111.042685] x3 : ffff00000801be98 x2 : 0000000000000614 [ 1111.047988] x1 : 0000000000000000 x0 : 0000000000000000 [ 1111.053290] Call trace: [ 1111.055728] Exception stack(0xffff00000801bcd0 to 0xffff00000801be10) [ 1111.062158] bcc0: 0000000000000000 0000000000000000 [ 1111.069978] bce0: 0000000000000614 ffff00000801be98 0000000000000010 ffff00000801bea0 [ 1111.077798] bd00: ffff80007fda9aa8 0000000000000000 0000000000000004 ffff00000801bea0 [ 1111.085618] bd20: 0000000000000001 ffff80007fda9af0 0000000000000040 ffff000008916788 [ 1111.093437] bd40: 0000000000000000 ffff0000089167b0 0000000000000058 ffff0000089167b0 [ 1111.101256] bd60: 0000000000000000 ffff8000787a81c0 0000000000000101 0000000000000000 [ 1111.109075] bd80: 0000000000000000 dead000000000200 0000000000000000 0000000000000000 [ 1111.116895] bda0: ffff000008c160c0 ffff000008bf87c8 ffff000008bf7018 ffff00000801be10 [ 1111.124715] bdc0: ffff0000080ff29c ffff00000801be10 0000000000000000 0000000000400145 [ 1111.132534] bde0: ffff8000787a81c0 ffff00000801bde8 0000ffffffffffff 000001029eb19be8 [ 1111.140353] be00: ffff00000801be10 0000000000000000 [ 1111.145220] [< (null)>] (null) [ 1111.149917] [<ffff0000080ff77c>] run_timer_softirq+0x184/0x398 [ 1111.155741] [<ffff000008081938>] __do_softirq+0x100/0x1fc [ 1111.161130] [<ffff0000080a2e28>] irq_exit+0x80/0xd8 [ 1111.166002] [<ffff0000080ea708>] __handle_domain_irq+0x88/0xb0 [ 1111.171825] [<ffff000008081678>] gic_handle_irq+0x68/0xb0 [ 1111.177213] Exception stack(0xffff0000090cbe30 to 0xffff0000090cbf70) [ 1111.183642] be20: 0000000000000020 0000000000000000 [ 1111.191461] be40: 0000000000000001 0000000000000000 00008000771af000 0000000000000000 [ 1111.199281] be60: ffff000008c95180 0000000000000000 ffff000008c19360 ffff0000090cbef0 [ 1111.207101] be80: 0000000000000810 0000000000000400 0000000000000098 ffff000000000000 [ 1111.214920] bea0: 0000000000000001 ffff0000089167b0 0000000000000000 ffff0000089167b0 [ 1111.222740] bec0: 0000000000000000 ffff000008c198e8 ffff000008bf7018 ffff000008c19000 [ 1111.230559] bee0: 0000000000000000 0000000000000000 ffff8000787a81c0 ffff000008018000 [ 1111.238380] bf00: ffff00000801c000 ffff00000913ba34 ffff8000787a81c0 ffff0000090cbf70 [ 1111.246199] bf20: ffff0000080857cc ffff0000090cbf70 ffff0000080857d0 0000000000400145 [ 1111.254020] bf40: ffff000008018000 ffff00000801c000 ffffffffffffffff ffff0000080fa574 [ 1111.261838] bf60: ffff0000090cbf70 ffff0000080857d0 [ 1111.266706] [<ffff0000080832e8>] el1_irq+0xe8/0x18c [ 1111.271576] [<ffff0000080857d0>] arch_cpu_idle+0x10/0x18 [ 1111.276880] [<ffff0000080d7de4>] do_idle+0xec/0x1b8 [ 1111.281748] [<ffff0000080d8020>] cpu_startup_entry+0x20/0x28 [ 1111.287399] [<ffff00000808f81c>] secondary_start_kernel+0x104/0x110 [ 1111.293662] Code: bad PC value [ 1111.296710] ---[ end trace 555b6ca4363c3edd ]--- [ 1111.301318] Kernel panic - not syncing: Fatal exception in interrupt [ 1111.307661] SMP: stopping secondary CPUs [ 1111.311574] Kernel Offset: disabled [ 1111.315053] CPU features: 0x0002000 [ 1111.318530] Memory Limit: none [ 1111.321575] Rebooting in 3 seconds..
With some added debug output / delays we were able to push the crash from the timer callback runner into the callback function and by that shedding some light on which object holding the timer gets corrupted:
[ 401.720899] Unable to handle kernel read from unreadable memory at virtual address 00000868 [...] [ 402.335836] [<ffff0000088fafa4>] _raw_spin_lock_bh+0x14/0x48 [ 402.341548] [<ffff000000dbe684>] mesh_path_timer+0x10c/0x248 [mac80211] [ 402.348154] [<ffff0000080ff29c>] call_timer_fn.isra.27+0x24/0x78 [ 402.354150] [<ffff0000080ff77c>] run_timer_softirq+0x184/0x398 [ 402.359974] [<ffff000008081938>] __do_softirq+0x100/0x1fc [ 402.365362] [<ffff0000080a2e28>] irq_exit+0x80/0xd8 [ 402.370231] [<ffff0000080ea708>] __handle_domain_irq+0x88/0xb0 [ 402.376053] [<ffff000008081678>] gic_handle_irq+0x68/0xb0
The issue happens due to the following sequence of events:
1) mesh_path_start_discovery():
-> spin_unlock_bh(&mpath->state_lock) before mesh_path_sel_frame_tx()
2) mesh_path_free_rcu()
-> del_timer_sync(&mpath->timer)
[...]
-> kfree_rcu(mpath)
3) mesh_path_start_discovery():
-> mod_timer(&mpath->timer, ...)
[...]
-> rcu_read_unlock()
4) mesh_path_free_rcu()'s kfree_rcu():
-> kfree(mpath)
5) mesh_path_timer() starts after timeout, using freed mpath object
So a use-after-free issue due to a timer re-arming bug caused by an early spin-unlocking.
This patch fixes this issue by re-checking if mpath is about to be free'd and if so bails out of re-arming the timer.
--- net/mac80211/mesh_hwmp.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/mac80211/mesh_hwmp.c +7 -0
@@ -1103,7 +1103,14 @@ void mesh_path_start_discovery(struct iemesh_path_sel_frame_tx (MPATH_PREQ ,0 , sdata->vif.addr, ifmsh->sn, target_flags, mpath->dst, mpath->sn, da,0 , ttl, lifetime,0 , ifmsh->preq_id++, sdata); + +spin_lock_bh (&mpath->state_lock); +if (mpath->flags &MESH_PATH_DELETED ) { +spin_unlock_bh (&mpath->state_lock); + goto enddiscovery; + }mod_timer (&mpath->timer, jiffies + mpath->discovery_timeout); +spin_unlock_bh (&mpath->state_lock); enddiscovery:rcu_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 110/142 x86/dma: Fix max PFN arithmetic overflow on 32 bit systems
In reply to Greg Kroah-HartmanFrom: Alexander Dahl <[email protected]>
commit 88743470668ef5eb6b7ba9e0f99888e5999bf172 upstream.
The intermediate result of the old term (4UL * 1024 * 1024 * 1024) is 4 294 967 296 or 0x100000000 which is no problem on 64 bit systems. The patch does not change the later overall result of 0x100000 for MAX_DMA32_PFN (after it has been shifted by PAGE_SHIFT). The new calculation yields the same result, but does not require 64 bit arithmetic.
On 32 bit systems the old calculation suffers from an arithmetic overflow in that intermediate term in braces: 4UL aka unsigned long int is 4 byte wide and an arithmetic overflow happens (the 0x100000000 does not fit in 4 bytes), the in braces result is truncated to zero, the following right shift does not alter that, so MAX_DMA32_PFN evaluates to 0 on 32 bit systems.
That wrong value is a problem in a comparision against MAX_DMA32_PFN in the init code for swiotlb in pci_swiotlb_detect_4gb() to decide if swiotlb should be active. That comparison yields the opposite result, when compiling on 32 bit systems.
This was not possible before
1b7e03ef7570 ("x86, NUMA: Enable emulation on 32bit too")
when that MAX_DMA32_PFN was first made visible to x86_32 (and which landed in v3.0).
In practice this wasn't a problem, unless CONFIG_SWIOTLB is active on x86-32.
However if one has set CONFIG_IOMMU_INTEL, since
c5a5dc4cbbf4 ("iommu/vt-d: Don't switch off swiotlb if bounce page is used")
there's a dependency on CONFIG_SWIOTLB, which was not necessarily active before. That landed in v5.4, where we noticed it in the fli4l Linux distribution. We have CONFIG_IOMMU_INTEL active on both 32 and 64 bit kernel configs there (I could not find out why, so let's just say historical reasons).
The effect is at boot time 64 MiB (default size) were allocated for bounce buffers now, which is a noticeable amount of memory on small systems like pcengines ALIX 2D3 with 256 MiB memory, which are still frequently used as home routers.
We noticed this effect when migrating from kernel v4.19 (LTS) to v5.4 (LTS) in fli4l and got that kernel messages for example:
Linux version 5.4.22 (buildroot@buildroot) (gcc version 7.3.0 (Buildroot 2018.02.8)) #1 SMP Mon Nov 26 23:40:00 CET 2018
…
Memory: 183484K/261756K available (4594K kernel code, 393K rwdata, 1660K rodata, 536K init, 456K bss , 78272K reserved, 0K cma-reserved, 0K highmem) …
PCI-DMA: Using software bounce buffering for IO (SWIOTLB)
software IO TLB: mapped [mem 0x0bb78000-0x0fb78000] (64MB)
The initial analysis and the suggested fix was done by user 'sourcejedi' at stackoverflow and explicitly marked as GPLv2 for inclusion in the Linux kernel:
https://unix.stackexchange.com/a/520525/50007
The new calculation, which does not suffer from that overflow, is the same as for arch/mips now as suggested by Robin Murphy.
The fix was tested by fli4l users on round about two dozen different systems, including both 32 and 64 bit archs, bare metal and virtualized machines.
[ bp: Massage commit message. ]
--- arch/x86/include/asm/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/dma.h +1 -1
@@ -74,7 +74,7 @@#define MAX_DMA_PFN ((16UL * 1024 * 1024) >> PAGE_SHIFT)/* 4GB broken PCI/AGP hardware bus master zone */ -#define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT) +#define MAX_DMA32_PFN (1UL << (32 - PAGE_SHIFT))#ifdef CONFIG_X86_32 /* The maximum address that we can perform a DMA transfer to on this platform */
Greg Kroah-Hartman
maintainerPATCH 111/142 copy_xstate_to_kernel(): dont leave parts of destination uninitialized
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 9e4636545933131de15e1ecd06733538ae939b2f upstream.
copy the corresponding pieces of init_fpstate into the gaps instead.
--- arch/x86/kernel/fpu/xstate.c | 86 ++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 38 deletions(-)
arch/x86/kernel/fpu/xstate.c +48 -38
@@ -952,18 +952,31 @@ static inline bool xfeatures_mxcsr_quirkreturn true; } -/* -* This is similar to user_regset_copyout(), but will not add offset to -* the source data pointer or increment pos, count, kbuf, and ubuf. -*/ -static inline void -__copy_xstate_to_kernel (void *kbuf,const void *data, -unsigned int offset,unsigned int size,unsigned int size_total) +static void fill_gap (unsigned to,void **kbuf,unsigned *pos,unsigned *count) { -if (offset < size_total) { -unsigned int copy =min (size, size_total - offset); +if (*pos < to) { +unsigned size = to - *pos; + +if (size > *count) + size = *count; +memcpy (*kbuf, (void *)&init_fpstate.xsave + *pos, size); + *kbuf += size; + *pos += size; + *count -= size; + } +} -memcpy (kbuf + offset, data, copy); +static void copy_part (unsigned offset,unsigned size,void *from, +void **kbuf,unsigned *pos,unsigned *count) +{ +fill_gap (offset, kbuf, pos, count); +if (size > *count) + size = *count; +if (size) { +memcpy (*kbuf, from, size); + *kbuf += size; + *pos += size; + *count -= size; } }
@@ -976,8 +989,9 @@ __copy_xstate_to_kernel(void *kbuf, cons*/ int copy_xstate_to_kernel (void *kbuf,struct xregs_state *xsave,unsigned int offset_start,unsigned int size_total) { -unsigned int offset, size;struct xstate_header header; +const unsigned off_mxcsr = offsetof(struct fxregs_state , mxcsr); +unsigned count = size_total;int i;/*
@@ -993,46 +1007,42 @@ int copy_xstate_to_kernel(void *kbuf, st header.xfeatures = xsave->header.xfeatures; header.xfeatures &= ~XFEATURE_MASK_SUPERVISOR ; +if (header.xfeatures &XFEATURE_MASK_FP ) +copy_part (0 , off_mxcsr, + &xsave->i387, &kbuf, &offset_start, &count); +if (header.xfeatures & (XFEATURE_MASK_SSE |XFEATURE_MASK_YMM )) +copy_part (off_mxcsr,MXCSR_AND_FLAGS_SIZE , + &xsave->i387.mxcsr, &kbuf, &offset_start, &count); +if (header.xfeatures &XFEATURE_MASK_FP ) +copy_part (offsetof(struct fxregs_state , st_space),128 , + &xsave->i387.st_space, &kbuf, &offset_start, &count); +if (header.xfeatures &XFEATURE_MASK_SSE ) +copy_part (xstate_offsets[XFEATURE_MASK_SSE ],256 , + &xsave->i387.xmm_space, &kbuf, &offset_start, &count); +/* +* Fill xsave->i387.sw_reserved value for ptrace frame: +*/ +copy_part (offsetof(struct fxregs_state , sw_reserved),48 , + xstate_fx_sw_bytes, &kbuf, &offset_start, &count);/* * Copy xregs_state->header: */ - offset = offsetof(struct xregs_state , header); - size =sizeof (header); - -__copy_xstate_to_kernel (kbuf, &header, offset, size, size_total); +copy_part (offsetof(struct xregs_state , header),sizeof (header), + &header, &kbuf, &offset_start, &count); -for (i =0 ; i <XFEATURE_MAX ; i++) { +for (i =FIRST_EXTENDED_XFEATURE ; i <XFEATURE_MAX ; i++) {/* * Copy only in-use xstates: */ if ((header.xfeatures >> i) &1 ) {void *src =__raw_xsave_addr (xsave, i); - offset = xstate_offsets[i]; - size = xstate_sizes[i]; - -/* The next component has to fit fully into the output buffer: */ -if (offset + size > size_total) -break ; - -__copy_xstate_to_kernel (kbuf, src, offset, size, size_total); +copy_part (xstate_offsets[i], xstate_sizes[i], + src, &kbuf, &offset_start, &count); } } - -if (xfeatures_mxcsr_quirk (header.xfeatures)) { - offset = offsetof(struct fxregs_state , mxcsr); - size =MXCSR_AND_FLAGS_SIZE ; -__copy_xstate_to_kernel (kbuf, &xsave->i387.mxcsr, offset, size, size_total); - } - -/* -* Fill xsave->i387.sw_reserved value for ptrace frame: -*/ - offset = offsetof(struct fxregs_state , sw_reserved); - size =sizeof (xstate_fx_sw_bytes); - -__copy_xstate_to_kernel (kbuf, xstate_fx_sw_bytes, offset, size, size_total); +fill_gap (size_total, &kbuf, &offset_start, &count);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 112/142 xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit afcaf61be9d1dbdee5ec186d1dcc67b6b692180f upstream.
For beet mode, when it's ipv6 inner address with nexthdrs set, the packet format might be:
----------------------------------------------------
| outer | | dest | | | ESP | ESP |
| IP hdr | ESP | opts.| TCP | Data | Trailer | ICV |
----------------------------------------------------
The nexthdr from ESP could be NEXTHDR_HOP(0), so it should continue processing the packet when nexthdr returns 0 in xfrm_input(). Otherwise, when ipv6 nexthdr is set, the packet will be dropped.
I don't see any error cases that nexthdr may return 0. So fix it by removing the check for nexthdr == 0.
--- net/xfrm/xfrm_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xfrm/xfrm_input.c +1 -1
@@ -643,7 +643,7 @@ resume:dev_put (skb->dev);spin_lock (&x->lock); -if (nexthdr <=0 ) { +if (nexthdr <0 ) {if (nexthdr == -EBADMSG ) {xfrm_audit_state_icvfail (x, skb, x->type->proto);
Greg Kroah-Hartman
maintainerPATCH 113/142 xfrm: do pskb_pull properly in __xfrm_transport_prep
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 06a0afcfe2f551ff755849ea2549b0d8409fd9a0 upstream.
For transport mode, when ipv6 nexthdr is set, the packet format might be like:
----------------------------------------------------
| | dest | | | | ESP | ESP |
| IP6 hdr| opts.| ESP | TCP | Data | Trailer | ICV |
----------------------------------------------------
and in __xfrm_transport_prep():
pskb_pull(skb, skb->mac_len + sizeof(ip6hdr) + x->props.header_len);
it will pull the data pointer to the wrong position, as it missed the nexthdrs/dest opts.
This patch is to fix it by using:
pskb_pull(skb, skb_transport_offset(skb) + x->props.header_len);
as we can be sure transport_header points to ESP header at that moment.
It also fixes a panic when packets with ipv6 nexthdr are sent over esp6 transport mode:
[ 100.473845] kernel BUG at net/core/skbuff.c:4325! [ 100.478517] RIP: 0010:__skb_to_sgvec+0x252/0x260 [ 100.494355] Call Trace: [ 100.494829] skb_to_sgvec+0x11/0x40 [ 100.495492] esp6_output_tail+0x12e/0x550 [esp6] [ 100.496358] esp6_xmit+0x1d5/0x260 [esp6_offload] [ 100.498029] validate_xmit_xfrm+0x22f/0x2e0 [ 100.499604] __dev_queue_xmit+0x589/0x910 [ 100.502928] ip6_finish_output2+0x2a5/0x5a0 [ 100.503718] ip6_output+0x6c/0x120 [ 100.505198] xfrm_output_resume+0x4bf/0x530 [ 100.508683] xfrm6_output+0x3a/0xc0 [ 100.513446] inet6_csk_xmit+0xa1/0xf0 [ 100.517335] tcp_sendmsg+0x27/0x40 [ 100.517977] sock_sendmsg+0x3e/0x60 [ 100.518648] __sys_sendto+0xee/0x160
--- net/xfrm/xfrm_device.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/xfrm/xfrm_device.c +3 -5
@@ -25,12 +25,10 @@ static void __xfrm_transport_prep(structstruct xfrm_offload *xo =xfrm_offload (skb);skb_reset_mac_len (skb); -pskb_pull (skb, skb->mac_len + hsize + x->props.header_len); - -if (xo->flags &XFRM_GSO_SEGMENT ) { -skb_reset_transport_header (skb); +if (xo->flags &XFRM_GSO_SEGMENT ) skb->transport_header -= x->props.header_len; - } + +pskb_pull (skb,skb_transport_offset (skb) + x->props.header_len); } static void __xfrm_mode_tunnel_prep(struct xfrm_state *x, struct sk_buff *skb,
Greg Kroah-Hartman
maintainerPATCH 114/142 xfrm: remove the xfrm_state_put call becofe going to out_reset
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit db87668ad1e4917cfe04e217307ba6ed9390716e upstream.
This xfrm_state_put call in esp4/6_gro_receive() will cause double put for state, as in out_reset path secpath_reset() will put all states set in skb sec_path.
So fix it by simply remove the xfrm_state_put call.
--- net/ipv4/esp4_offload.c | 4 +--- net/ipv6/esp6_offload.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
net/ipv4/esp4_offload.c +1 -3
@@ -63,10 +63,8 @@ static struct sk_buff *esp4_gro_receive( sp->olen++; xo =xfrm_offload (skb); -if (!xo) { -xfrm_state_put (x); +if (!xo) goto out_reset; - } } xo->flags |=XFRM_GRO ;
net/ipv6/esp6_offload.c +1 -3
@@ -85,10 +85,8 @@ static struct sk_buff *esp6_gro_receive( sp->olen++; xo =xfrm_offload (skb); -if (!xo) { -xfrm_state_put (x); +if (!xo) goto out_reset; - } } xo->flags |=XFRM_GRO ;
Greg Kroah-Hartman
maintainerPATCH 115/142 xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit a204aef9fd77dce1efd9066ca4e44eede99cd858 upstream.
An use-after-free crash can be triggered when sending big packets over vxlan over esp with esp offload enabled:
[] BUG: KASAN: use-after-free in ipv6_gso_pull_exthdrs.part.8+0x32c/0x4e0 [] Call Trace:
[] dump_stack+0x75/0xa0 [] kasan_report+0x37/0x50 [] ipv6_gso_pull_exthdrs.part.8+0x32c/0x4e0 [] ipv6_gso_segment+0x2c8/0x13c0 [] skb_mac_gso_segment+0x1cb/0x420 [] skb_udp_tunnel_segment+0x6b5/0x1c90 [] inet_gso_segment+0x440/0x1380 [] skb_mac_gso_segment+0x1cb/0x420 [] esp4_gso_segment+0xae8/0x1709 [esp4_offload] [] inet_gso_segment+0x440/0x1380 [] skb_mac_gso_segment+0x1cb/0x420 [] __skb_gso_segment+0x2d7/0x5f0 [] validate_xmit_skb+0x527/0xb10 [] __dev_queue_xmit+0x10f8/0x2320 <--- [] ip_finish_output2+0xa2e/0x1b50 [] ip_output+0x1a8/0x2f0 [] xfrm_output_resume+0x110e/0x15f0 [] __xfrm4_output+0xe1/0x1b0 [] xfrm4_output+0xa0/0x200 [] iptunnel_xmit+0x5a7/0x920 [] vxlan_xmit_one+0x1658/0x37a0 [vxlan] [] vxlan_xmit+0x5e4/0x3ec8 [vxlan] [] dev_hard_start_xmit+0x125/0x540 [] __dev_queue_xmit+0x17bd/0x2320 <--- [] ip6_finish_output2+0xb20/0x1b80 [] ip6_output+0x1b3/0x390 [] ip6_xmit+0xb82/0x17e0 [] inet6_csk_xmit+0x225/0x3d0 [] __tcp_transmit_skb+0x1763/0x3520 [] tcp_write_xmit+0xd64/0x5fe0 [] __tcp_push_pending_frames+0x8c/0x320 [] tcp_sendmsg_locked+0x2245/0x3500 [] tcp_sendmsg+0x27/0x40
As on the tx path of vxlan over esp, skb->inner_network_header would be set on vxlan_xmit() and xfrm4_tunnel_encap_add(), and the later one can overwrite the former one. It causes skb_udp_tunnel_segment() to use a wrong skb->inner_network_header, then the issue occurs.
This patch is to fix it by calling xfrm_output_gso() instead when the inner_protocol is set, in which gso_segment of inner_protocol will be done first.
While at it, also improve some code around.
--- net/xfrm/xfrm_output.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/xfrm/xfrm_output.c +7 -5
@@ -586,18 +586,20 @@ int xfrm_output(struct sock *sk, structxfrm_state_hold (x);if (skb_is_gso (skb)) { -skb_shinfo (skb)->gso_type |=SKB_GSO_ESP ; +if (skb->inner_protocol) +return xfrm_output_gso (net, sk, skb); -return xfrm_output2 (net, sk, skb); +skb_shinfo (skb)->gso_type |=SKB_GSO_ESP ; + goto out; }if (x->xso.dev && x->xso.dev->features &NETIF_F_HW_ESP_TX_CSUM ) goto out; + }else { +if (skb_is_gso (skb)) +return xfrm_output_gso (net, sk, skb); } -if (skb_is_gso (skb)) -return xfrm_output_gso (net, sk, skb); -if (skb->ip_summed ==CHECKSUM_PARTIAL ) { err =skb_checksum_help (skb);if (err) {
Greg Kroah-Hartman
maintainerPATCH 116/142 xfrm interface: fix oops when deleting a x-netns interface
In reply to Greg Kroah-HartmanFrom: Nicolas Dichtel <[email protected]>
commit c95c5f58b35ef995f66cb55547eee6093ab5fcb8 upstream.
Here is the steps to reproduce the problem:
ip netns add foo
ip netns add bar
ip -n foo link add xfrmi0 type xfrm dev lo if_id 42 ip -n foo link set xfrmi0 netns bar
ip netns del foo
ip netns del bar
Which results to:
[ 186.686395] general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b6bd3: 0000 [#1] SMP PTI [ 186.687665] CPU: 7 PID: 232 Comm: kworker/u16:2 Not tainted 5.6.0+ #1 [ 186.688430] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 [ 186.689420] Workqueue: netns cleanup_net [ 186.689903] RIP: 0010:xfrmi_dev_uninit+0x1b/0x4b [xfrm_interface] [ 186.690657] Code: 44 f6 ff ff 31 c0 5b 5d 41 5c 41 5d 41 5e c3 48 8d 8f c0 08 00 00 8b 05 ce 14 00 00 48 8b 97 d0 08 00 00 48 8b 92 c0 0e 00 00 <48> 8b 14 c2 48 8b 02 48 85 c0 74 19 48 39 c1 75 0c 48 8b 87 c0 08 [ 186.692838] RSP: 0018:ffffc900003b7d68 EFLAGS: 00010286 [ 186.693435] RAX: 000000000000000d RBX: ffff8881b0f31000 RCX: ffff8881b0f318c0 [ 186.694334] RDX: 6b6b6b6b6b6b6b6b RSI: 0000000000000246 RDI: ffff8881b0f31000 [ 186.695190] RBP: ffffc900003b7df0 R08: ffff888236c07740 R09: 0000000000000040 [ 186.696024] R10: ffffffff81fce1b8 R11: 0000000000000002 R12: ffffc900003b7d80 [ 186.696859] R13: ffff8881edcc6a40 R14: ffff8881a1b6e780 R15: ffffffff81ed47c8 [ 186.697738] FS: 0000000000000000(0000) GS:ffff888237dc0000(0000) knlGS:0000000000000000 [ 186.698705] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 186.699408] CR2: 00007f2129e93148 CR3: 0000000001e0a000 CR4: 00000000000006e0 [ 186.700221] Call Trace: [ 186.700508] rollback_registered_many+0x32b/0x3fd [ 186.701058] ? __rtnl_unlock+0x20/0x3d [ 186.701494] ? arch_local_irq_save+0x11/0x17 [ 186.702012] unregister_netdevice_many+0x12/0x55 [ 186.702594] default_device_exit_batch+0x12b/0x150 [ 186.703160] ? prepare_to_wait_exclusive+0x60/0x60 [ 186.703719] cleanup_net+0x17d/0x234 [ 186.704138] process_one_work+0x196/0x2e8 [ 186.704652] worker_thread+0x1a4/0x249 [ 186.705087] ? cancel_delayed_work+0x92/0x92 [ 186.705620] kthread+0x105/0x10f [ 186.706000] ? __kthread_bind_mask+0x57/0x57 [ 186.706501] ret_from_fork+0x35/0x40 [ 186.706978] Modules linked in: xfrm_interface nfsv3 nfs_acl auth_rpcgss nfsv4 nfs lockd grace fscache sunrpc button parport_pc parport serio_raw evdev pcspkr loop ext4 crc16 mbcache jbd2 crc32c_generic 8139too ide_cd_mod cdrom ide_gd_mod ata_generic ata_piix libata scsi_mod piix psmouse i2c_piix4 ide_core 8139cp i2c_core mii floppy [ 186.710423] ---[ end trace 463bba18105537e5 ]---
The problem is that x-netns xfrm interface are not removed when the link netns is removed. This causes later this oops when thoses interfaces are removed.
Let's add a handler to remove all interfaces related to a netns when this netns is removed.
--- net/xfrm/xfrm_interface.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
net/xfrm/xfrm_interface.c +21 -0
@@ -772,7 +772,28 @@ static void __net_exit xfrmi_exit_net(strtnl_unlock (); } +static void __net_exit xfrmi_exit_batch_net(struct list_head *net_exit_list) +{ +struct net *net; +LIST_HEAD (list); + +rtnl_lock (); +list_for_each_entry (net, net_exit_list, exit_list) { +struct xfrmi_net *xfrmn =net_generic (net, xfrmi_net_id); +struct xfrm_if __rcu **xip; +struct xfrm_if *xi; + +for (xip = &xfrmn->xfrmi[0 ]; + (xi =rtnl_dereference (*xip)) !=NULL ; + xip = &xi->next) +unregister_netdevice_queue (xi->dev, &list); + } +unregister_netdevice_many (&list); +rtnl_unlock (); +} +static struct pernet_operations xfrmi_net_ops = { + .exit_batch = xfrmi_exit_batch_net, .exit = xfrmi_exit_net, .id = &xfrmi_net_id, .size =sizeof (struct xfrmi_net ),
Greg Kroah-Hartman
maintainerPATCH 117/142 xfrm: fix a warning in xfrm_policy_insert_list
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit ed17b8d377eaf6b4a01d46942b4c647378a79bdd upstream.
This waring can be triggered simply by:
# ip xfrm policy update src 192.168.1.1/24 dst 192.168.1.2/24 dir in \
priority 1 mark 0 mask 0x10 #[1]
# ip xfrm policy update src 192.168.1.1/24 dst 192.168.1.2/24 dir in \
priority 2 mark 0 mask 0x1 #[2]
# ip xfrm policy update src 192.168.1.1/24 dst 192.168.1.2/24 dir in \
priority 2 mark 0 mask 0x10 #[3]Then dmesg shows:
[ ] WARNING: CPU: 1 PID: 7265 at net/xfrm/xfrm_policy.c:1548 [ ] RIP: 0010:xfrm_policy_insert_list+0x2f2/0x1030 [ ] Call Trace:
[ ] xfrm_policy_inexact_insert+0x85/0xe50 [ ] xfrm_policy_insert+0x4ba/0x680 [ ] xfrm_add_policy+0x246/0x4d0 [ ] xfrm_user_rcv_msg+0x331/0x5c0 [ ] netlink_rcv_skb+0x121/0x350 [ ] xfrm_netlink_rcv+0x66/0x80 [ ] netlink_unicast+0x439/0x630 [ ] netlink_sendmsg+0x714/0xbf0 [ ] sock_sendmsg+0xe2/0x110
The issue was introduced by Commit 7cb8a93968e3 ("xfrm: Allow inserting policies with matching mark and different priorities"). After that, the policies [1] and [2] would be able to be added with different priorities.
However, policy [3] will actually match both [1] and [2]. Policy [1] was matched due to the 1st 'return true' in xfrm_policy_mark_match(), and policy [2] was matched due to the 2nd 'return true' in there. It caused WARN_ON() in xfrm_policy_insert_list().
This patch is to fix it by only (the same value and priority) as the same policy in xfrm_policy_mark_match().
Thanks to Yuehaibing, we could make this fix better.
v1->v2:
- check policy->mark.v == pol->mark.v only without mask.
--- net/xfrm/xfrm_policy.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
net/xfrm/xfrm_policy.c +1 -6
@@ -1433,12 +1433,7 @@ static void xfrm_policy_requeue(struct xstatic bool xfrm_policy_mark_match (struct xfrm_policy *policy,struct xfrm_policy *pol) { -u32 mark = policy->mark.v & policy->mark.m; - -if (policy->mark.v == pol->mark.v && policy->mark.m == pol->mark.m) -return true; - -if ((mark & pol->mark.m) == pol->mark.v && +if (policy->mark.v == pol->mark.v && policy->priority == pol->priority)return true;
Greg Kroah-Hartman
maintainerPATCH 118/142 xfrm: fix a NULL-ptr deref in xfrm_local_error
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit f6a23d85d078c2ffde79c66ca81d0a1dde451649 upstream.
This patch is to fix a crash:
[ ] kasan: GPF could be caused by NULL-ptr deref or user memory access [ ] general protection fault: 0000 [#1] SMP KASAN PTI
[ ] RIP: 0010:ipv6_local_error+0xac/0x7a0
[ ] Call Trace:
[ ] xfrm6_local_error+0x1eb/0x300 [ ] xfrm_local_error+0x95/0x130 [ ] __xfrm6_output+0x65f/0xb50 [ ] xfrm6_output+0x106/0x46f [ ] udp_tunnel6_xmit_skb+0x618/0xbf0 [ip6_udp_tunnel] [ ] vxlan_xmit_one+0xbc6/0x2c60 [vxlan] [ ] vxlan_xmit+0x6a0/0x4276 [vxlan] [ ] dev_hard_start_xmit+0x165/0x820 [ ] __dev_queue_xmit+0x1ff0/0x2b90 [ ] ip_finish_output2+0xd3e/0x1480 [ ] ip_do_fragment+0x182d/0x2210 [ ] ip_output+0x1d0/0x510 [ ] ip_send_skb+0x37/0xa0 [ ] raw_sendmsg+0x1b4c/0x2b80 [ ] sock_sendmsg+0xc0/0x110
This occurred when sending a v4 skb over vxlan6 over ipsec, in which case skb->protocol == htons(ETH_P_IPV6) while skb->sk->sk_family == AF_INET in xfrm_local_error(). Then it will go to xfrm6_local_error() where it tries to get ipv6 info from a ipv4 sk.
This issue was actually fixed by Commit 628e341f319f ("xfrm: make local error reporting more robust"), but brought back by Commit 844d48746e4b ("xfrm: choose protocol family by skb protocol").
So to fix it, we should call xfrm6_local_error() only when skb->protocol is htons(ETH_P_IPV6) and skb->sk->sk_family is AF_INET6.
--- net/xfrm/xfrm_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/xfrm/xfrm_output.c +2 -1
@@ -645,7 +645,8 @@ void xfrm_local_error(struct sk_buff *skif (skb->protocol ==htons (ETH_P_IP )) proto =AF_INET ; -else if (skb->protocol ==htons (ETH_P_IPV6 )) +else if (skb->protocol ==htons (ETH_P_IPV6 ) && + skb->sk->sk_family ==AF_INET6 ) proto =AF_INET6 ;else return ;
Greg Kroah-Hartman
maintainerPATCH 119/142 xfrm: fix error in comment
In reply to Greg Kroah-HartmanFrom: Antony Antony <[email protected]>
commit 29e4276667e24ee6b91d9f91064d8fda9a210ea1 upstream.
s/xfrm_state_offload/xfrm_user_offload/
--- include/uapi/linux/xfrm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/xfrm.h +1 -1
@@ -304,7 +304,7 @@ enum xfrm_attr_type_t {XFRMA_PROTO ,/* __u8 */ XFRMA_ADDRESS_FILTER ,/* struct xfrm_address_filter */ XFRMA_PAD , -XFRMA_OFFLOAD_DEV ,/* struct xfrm_state_offload */ +XFRMA_OFFLOAD_DEV ,/* struct xfrm_user_offload */ XFRMA_SET_MARK ,/* __u32 */ XFRMA_SET_MARK_MASK ,/* __u32 */ XFRMA_IF_ID, /* __u32 */
Greg Kroah-Hartman
maintainerPATCH 120/142 ip_vti: receive ipip packet by calling ip_tunnel_rcv
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 976eba8ab596bab94b9714cd46d38d5c6a2c660d upstream.
In Commit dd9ee3444014 ("vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel"), it tries to receive IPIP packets in vti by calling xfrm_input(). This case happens when a small packet or frag sent by peer is too small to get compressed.
However, xfrm_input() will still get to the IPCOMP path where skb sec_path is set, but never dropped while it should have been done in vti_ipcomp4_protocol.cb_handler(vti_rcv_cb), as it's not an ipcomp4 packet. This will cause that the packet can never pass xfrm4_policy_check() in the upper protocol rcv functions.
So this patch is to call ip_tunnel_rcv() to process IPIP packets instead.
--- net/ipv4/ip_vti.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
net/ipv4/ip_vti.c +22 -1
@@ -93,7 +93,28 @@ static int vti_rcv_proto(struct sk_buffstatic int vti_rcv_tunnel (struct sk_buff *skb) { -return vti_rcv (skb,ip_hdr (skb)->saddr, true); +struct ip_tunnel_net *itn =net_generic (dev_net (skb->dev), vti_net_id); +const struct iphdr *iph =ip_hdr (skb); +struct ip_tunnel *tunnel; + + tunnel =ip_tunnel_lookup (itn, skb->dev->ifindex,TUNNEL_NO_KEY , + iph->saddr, iph->daddr,0 ); +if (tunnel) { +struct tnl_ptk_info tpi = { + .proto =htons (ETH_P_IP ), + }; + +if (!xfrm4_policy_check (NULL ,XFRM_POLICY_IN , skb)) + goto drop; +if (iptunnel_pull_header (skb,0 , tpi.proto, false)) + goto drop; +return ip_tunnel_rcv (tunnel, skb, &tpi,NULL , false); + } + +return -EINVAL ; +drop: +kfree_skb (skb); +return 0 ; }static int vti_rcv_cb (struct sk_buff *skb,int err)
Greg Kroah-Hartman
maintainerPATCH 121/142 netfilter: nft_reject_bridge: enable reject with bridge vlan
In reply to Greg Kroah-HartmanFrom: Michael Braun <[email protected]>
commit e9c284ec4b41c827f4369973d2792992849e4fa5 upstream.
Currently, using the bridge reject target with tagged packets results in untagged packets being sent back.
Fix this by mirroring the vlan id as well.
--- net/bridge/netfilter/nft_reject_bridge.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bridge/netfilter/nft_reject_bridge.c +6 -0
@@ -31,6 +31,12 @@ static void nft_reject_br_push_etherhdr(ether_addr_copy (eth->h_dest,eth_hdr (oldskb)->h_source); eth->h_proto =eth_hdr (oldskb)->h_proto;skb_pull (nskb,ETH_HLEN ); + +if (skb_vlan_tag_present (oldskb)) { +u16 vid =skb_vlan_tag_get (oldskb); + +__vlan_hwaccel_put_tag (nskb, oldskb->vlan_proto, vid); + } }static int nft_bridge_iphdr_validate (struct sk_buff *skb)
Greg Kroah-Hartman
maintainerPATCH 122/142 netfilter: ipset: Fix subcounter update skip
In reply to Greg Kroah-HartmanFrom: Phil Sutter <[email protected]>
commit a164b95ad6055c50612795882f35e0efda1f1390 upstream.
If IPSET_FLAG_SKIP_SUBCOUNTER_UPDATE is set, user requested to not update counters in sub sets. Therefore IPSET_FLAG_SKIP_COUNTER_UPDATE must be set, not unset.
--- net/netfilter/ipset/ip_set_list_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_list_set.c +1 -1
@@ -59,7 +59,7 @@ list_set_ktest(struct ip_set *set, const/* Don't lookup sub-counters at all */ opt->cmdflags &= ~IPSET_FLAG_MATCH_COUNTERS ;if (opt->cmdflags &IPSET_FLAG_SKIP_SUBCOUNTER_UPDATE ) - opt->cmdflags &= ~IPSET_FLAG_SKIP_COUNTER_UPDATE ; + opt->cmdflags |=IPSET_FLAG_SKIP_COUNTER_UPDATE ;list_for_each_entry_rcu (e, &map->members, list) { ret =ip_set_test (e->id, skb, par, opt);if (ret <=0 )
Greg Kroah-Hartman
maintainerPATCH 123/142 netfilter: conntrack: make conntrack userspace helpers work again
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit ee04805ff54a63ffd90bc6749ebfe73473734ddb upstream.
Florian Westphal says:
"Problem is that after the helper hook was merged back into the confirm one, the queueing itself occurs from the confirm hook, i.e. we queue from the last netfilter callback in the hook-list.
Therefore, on return, the packet bypasses the confirm action and the connection is never committed to the main conntrack table.
To fix this there are several ways:
1. revert the 'Fixes' commit and have a extra helper hook again. Works, but has the drawback of adding another indirect call for everyone.
2. Special case this: split the hooks only when userspace helper gets added, so queueing occurs at a lower priority again, and normal enqueue reinject would eventually call the last hook.
3. Extend the existing nf_queue ct update hook to allow a forced confirmation (plus run the seqadj code).
This goes for 3)."
--- net/netfilter/nf_conntrack_core.c | 78 +++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 6 deletions(-)
net/netfilter/nf_conntrack_core.c +72 -6
@@ -1879,22 +1879,18 @@ static void nf_conntrack_attach(struct snf_conntrack_get (skb_nfct (nskb)); } -static int nf_conntrack_update (struct net *net,struct sk_buff *skb) +static int __nf_conntrack_update (struct net *net,struct sk_buff *skb, +struct nf_conn *ct) {struct nf_conntrack_tuple_hash *h;struct nf_conntrack_tuple tuple;enum ip_conntrack_info ctinfo;struct nf_nat_hook *nat_hook;unsigned int status; -struct nf_conn *ct;int dataoff;u16 l3num;u8 l4num; - ct =nf_ct_get (skb, &ctinfo); -if (!ct ||nf_ct_is_confirmed (ct)) -return 0 ; - l3num =nf_ct_l3num (ct); dataoff =get_l4proto (skb,skb_network_offset (skb), l3num, &l4num);
@@ -1951,6 +1947,76 @@ static int nf_conntrack_update(struct nereturn 0 ; } +/* This packet is coming from userspace via nf_queue, complete the packet +* processing after the helper invocation in nf_confirm(). +*/ +static int nf_confirm_cthelper (struct sk_buff *skb,struct nf_conn *ct, +enum ip_conntrack_info ctinfo) +{ +const struct nf_conntrack_helper *helper; +const struct nf_conn_help *help; +unsigned int protoff; + + help =nfct_help (ct); +if (!help) +return 0 ; + + helper =rcu_dereference (help->helper); +if (!(helper->flags &NF_CT_HELPER_F_USERSPACE )) +return 0 ; + +switch (nf_ct_l3num (ct)) { +case NFPROTO_IPV4 : + protoff =skb_network_offset (skb) +ip_hdrlen (skb); +break ; +#if IS_ENABLED (CONFIG_IPV6 ) +case NFPROTO_IPV6 : { +__be16 frag_off; +u8 pnum; + + pnum =ipv6_hdr (skb)->nexthdr; + protoff =ipv6_skip_exthdr (skb,sizeof (struct ipv6hdr ), &pnum, + &frag_off); +if (protoff <0 || (frag_off &htons (~0x7 )) !=0 ) +return 0 ; +break ; + } +#endif +default : +return 0 ; + } + +if (test_bit (IPS_SEQ_ADJUST_BIT , &ct->status) && + !nf_is_loopback_packet (skb)) { +if (!nf_ct_seq_adjust (skb, ct, ctinfo, protoff)) { +NF_CT_STAT_INC_ATOMIC (nf_ct_net (ct), drop); +return -1 ; + } + } + +/* We've seen it coming out the other side: confirm it */ +return nf_conntrack_confirm (skb) ==NF_DROP ? -1 :0 ; +} + +static int nf_conntrack_update (struct net *net,struct sk_buff *skb) +{ +enum ip_conntrack_info ctinfo; +struct nf_conn *ct; +int err; + + ct =nf_ct_get (skb, &ctinfo); +if (!ct) +return 0 ; + +if (!nf_ct_is_confirmed (ct)) { + err =__nf_conntrack_update (net, skb, ct); +if (err <0 ) +return err; + } + +return nf_confirm_cthelper (skb, ct, ctinfo); +} +static bool nf_conntrack_get_tuple_skb (struct nf_conntrack_tuple *dst_tuple,const struct sk_buff *skb) {
Greg Kroah-Hartman
maintainerPATCH 124/142 netfilter: nfnetlink_cthelper: unbreak userspace helper support
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 703acd70f2496537457186211c2f03e792409e68 upstream.
Restore helper data size initialization and fix memcopy of the helper data size.
--- net/netfilter/nfnetlink_cthelper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink_cthelper.c +2 -1
@@ -103,7 +103,7 @@ nfnl_cthelper_from_nlattr(struct nlattrif (help->helper->data_len ==0 )return -EINVAL ; -nla_memcpy (help->data,nla_data (attr),sizeof (help->data)); +nla_memcpy (help->data, attr,sizeof (help->data));return 0 ; }
@@ -240,6 +240,7 @@ nfnl_cthelper_create(const struct nlattr ret = -ENOMEM ; goto err2; } + helper->data_len = size; helper->flags |=NF_CT_HELPER_F_USERSPACE ;memcpy (&helper->tuple, tuple,sizeof (struct nf_conntrack_tuple ));
Greg Kroah-Hartman
maintainerPATCH 125/142 netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 4c559f15efcc43b996f4da528cd7f9483aaca36d upstream.
Dan Carpenter says: "Smatch complains that the value for "cmd" comes from the network and can't be trusted."
Add pptp_msg_name() helper function that checks for the array boundary.
--- include/linux/netfilter/nf_conntrack_pptp.h | 2 net/ipv4/netfilter/nf_nat_pptp.c | 7 --- net/netfilter/nf_conntrack_pptp.c | 62 +++++++++++++++------------- 3 files changed, 38 insertions(+), 33 deletions(-)
include/linux/netfilter/nf_conntrack_pptp.h +1 -1
@@ -10,7 +10,7 @@#include <net/netfilter/nf_conntrack_expect.h> #include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> -extern const char *const pptp_msg_name[]; +extern const char *const pptp_msg_name (u_int16_t msg);/* state of the control session */ enum pptp_ctrlsess_state {
net/ipv4/netfilter/nf_nat_pptp.c +2 -5
@@ -166,8 +166,7 @@ pptp_outbound_pkt(struct sk_buff *skb,break ;default :pr_debug ("unknown outbound packet 0x%04x:%s\n" , msg, - msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : - pptp_msg_name[0 ]); +pptp_msg_name (msg));/* fall through */ case PPTP_SET_LINK_INFO :/* only need to NAT in case PAC is behind NAT box */
@@ -268,9 +267,7 @@ pptp_inbound_pkt(struct sk_buff *skb, pcid_off = offsetof(union pptp_ctrl_union, setlink.peersCallID);break ;default : -pr_debug ("unknown inbound packet %s\n" , - msg <=PPTP_MSG_MAX ? pptp_msg_name[msg] : - pptp_msg_name[0 ]); +pr_debug ("unknown inbound packet %s\n" ,pptp_msg_name (msg));/* fall through */ case PPTP_START_SESSION_REQUEST :case PPTP_START_SESSION_REPLY :
net/netfilter/nf_conntrack_pptp.c +35 -27
129 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 126/142 esp6: get the right proto for transport mode in esp6_gso_encap
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 3c96ec56828922e3fe5477f75eb3fc02f98f98b5 upstream.
For transport mode, when ipv6 nexthdr is set, the packet format might be like:
----------------------------------------------------
| | dest | | | | ESP | ESP |
| IP6 hdr| opts.| ESP | TCP | Data | Trailer | ICV |
----------------------------------------------------
What it wants to get for x-proto in esp6_gso_encap() is the proto that will be set in ESP nexthdr. So it should skip all ipv6 nexthdrs and get the real transport protocol. Othersize, the wrong proto number will be set into ESP nexthdr.
This patch is to skip all ipv6 nexthdrs by calling ipv6_skip_exthdr() in esp6_gso_encap().
--- net/ipv6/esp6_offload.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/ipv6/esp6_offload.c +8 -1
@@ -121,9 +121,16 @@ static void esp6_gso_encap(struct xfrm_sstruct ip_esp_hdr *esph;struct ipv6hdr *iph =ipv6_hdr (skb);struct xfrm_offload *xo =xfrm_offload (skb); -int proto = iph->nexthdr; +u8 proto = iph->nexthdr;skb_push (skb, -skb_network_offset (skb)); + +if (x->outer_mode.encap ==XFRM_MODE_TRANSPORT ) { +__be16 frag; + +ipv6_skip_exthdr (skb,sizeof (struct ipv6hdr ), &proto, &frag); + } + esph =ip_esp_hdr (skb); *skb_mac_header (skb) =IPPROTO_ESP ;
Greg Kroah-Hartman
maintainerPATCH 127/142 bnxt_en: Fix accumulation of bp->net_stats_prev.
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
commit b8056e8434b037fdab08158fea99ed7bc8ef3a74 upstream.
We have logic to maintain network counters across resets by storing the counters in bp->net_stats_prev before reset. But not all resets will clear the counters. Certain resets that don't need to change the number of rings do not clear the counters. The current logic accumulates the counters before all resets, causing big jumps in the counters after some resets, such as ethtool -G.
Fix it by only accumulating the counters during reset if the irq_re_init parameter is set. The parameter signifies that all rings and interrupts will be reset and that means that the counters will also be reset.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -9285,7 +9285,7 @@ static void __bnxt_close_nic(struct bnxtbnxt_free_skbs (bp);/* Save ring stats before shutdown */ -if (bp->bnapi) +if (bp->bnapi && irq_re_init)bnxt_get_ring_stats (bp, &bp->net_stats_prev);if (irq_re_init) {bnxt_free_irq (bp);
Greg Kroah-Hartman
maintainerPATCH 128/142 ieee80211: Fix incorrect mask for default PE duration
In reply to Greg Kroah-HartmanFrom: Pradeep Kumar Chitrapu <[email protected]>
commit d031781bdabe1027858a3220f868866586bf6e7c upstream.
Fixes bitmask for HE opration's default PE duration.
--- include/linux/ieee80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ieee80211.h +1 -1
@@ -2047,7 +2047,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, }/* HE Operation defines */ -#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000003 +#define IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK 0x00000007#define IEEE80211_HE_OPERATION_TWT_REQUIRED 0x00000008#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK 0x00003ff0#define IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET 4
Greg Kroah-Hartman
maintainerPATCH 129/142 xsk: Add overflow check for u64 division, stored into u32
In reply to Greg Kroah-HartmanFrom: Björn Töpel <[email protected]>
commit b16a87d0aef7a6be766f6618976dc5ff2c689291 upstream.
The npgs member of struct xdp_umem is an u32 entity, and stores the number of pages the UMEM consumes. The calculation of npgs
npgs = size / PAGE_SIZE
can overflow.
To avoid overflow scenarios, the division is now first stored in a u64, and the result is verified to fit into 32b.
An alternative would be storing the npgs as a u64, however, this wastes memory and is an unrealisticly large packet area.
--- net/xdp/xdp_umem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/xdp/xdp_umem.c +6 -2
@@ -341,8 +341,8 @@ static int xdp_umem_reg(struct xdp_umem {bool unaligned_chunks = mr->flags &XDP_UMEM_UNALIGNED_CHUNK_FLAG ;u32 chunk_size = mr->chunk_size, headroom = mr->headroom; +u64 npgs, addr = mr->addr, size = mr->len;unsigned int chunks, chunks_per_page; -u64 addr = mr->addr, size = mr->len;int err;if (chunk_size <XDP_UMEM_MIN_CHUNK_SIZE || chunk_size >PAGE_SIZE ) {
@@ -372,6 +372,10 @@ static int xdp_umem_reg(struct xdp_umemif ((addr + size) < addr)return -EINVAL ; + npgs =div_u64 (size,PAGE_SIZE ); +if (npgs >U32_MAX ) +return -EINVAL ; + chunks = (unsigned int )div_u64 (size, chunk_size);if (chunks ==0 )return -EINVAL ;
@@ -391,7 +395,7 @@ static int xdp_umem_reg(struct xdp_umem umem->size = size; umem->headroom = headroom; umem->chunk_size_nohr = chunk_size - headroom; - umem->npgs = size /PAGE_SIZE ; + umem->npgs = (u32 )npgs; umem->pgs =NULL ; umem->user =NULL ; umem->flags = mr->flags;
Greg Kroah-Hartman
maintainerPATCH 130/142 qlcnic: fix missing release in qlcnic_83xx_interrupt_test.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
commit 15c973858903009e995b2037683de29dfe968621 upstream.
In function qlcnic_83xx_interrupt_test(), function qlcnic_83xx_diag_alloc_res() is not handled by function qlcnic_83xx_diag_free_res() after a call of the function qlcnic_alloc_mbx_args() failed. Fix this issue by adding a jump target "fail_mbx_args", and jump to this new target when qlcnic_alloc_mbx_args() failed.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +3 -1
@@ -3651,7 +3651,7 @@ int qlcnic_83xx_interrupt_test(struct ne ahw->diag_cnt =0 ; ret =qlcnic_alloc_mbx_args (&cmd, adapter,QLCNIC_CMD_INTRPT_TEST );if (ret) - goto fail_diag_irq; + goto fail_mbx_args;if (adapter->flags &QLCNIC_MSIX_ENABLED ) intrpt_id = ahw->intr_tbl[0 ].id;
@@ -3681,6 +3681,8 @@ int qlcnic_83xx_interrupt_test(struct ne done:qlcnic_free_mbx_args (&cmd); + +fail_mbx_args:qlcnic_83xx_diag_free_res (netdev, drv_sds_rings); fail_diag_irq:
Greg Kroah-Hartman
maintainerPATCH 131/142 crypto: chelsio/chtls: properly set tp->lsndtime
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit a4976a3ef844c510ae9120290b23e9f3f47d6bce upstream.
TCP tp->lsndtime unit/base is tcp_jiffies32, not tcp_time_stamp()
--- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/chelsio/chtls/chtls_io.c +1 -1
@@ -682,7 +682,7 @@ int chtls_push_frames(struct chtls_sockmake_tx_data_wr (sk, skb, immdlen, len, credits_needed, completion); tp->snd_nxt += len; - tp->lsndtime =tcp_time_stamp (tp); + tp->lsndtime = tcp_jiffies32;if (completion)ULP_SKB_CB (skb)->flags &= ~ULPCB_FLAG_NEED_HDR ; }else {
Greg Kroah-Hartman
maintainerPATCH 132/142 nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
commit ac21753a5c2c9a6a2019997481a2ac12bbde48c8 upstream.
Move nh_grp dereference and check for removing nexthop group due to all members gone into remove_nh_grp_entry.
--- net/ipv4/nexthop.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
net/ipv4/nexthop.c +13 -14
@@ -695,17 +695,21 @@ static void nh_group_rebalance(struct nh } } -static void remove_nh_grp_entry (struct nh_grp_entry *nhge, -struct nh_group *nhg, +static void remove_nh_grp_entry (struct net *net,struct nh_grp_entry *nhge,struct nl_info *nlinfo) { +struct nexthop *nhp = nhge->nh_parent;struct nexthop *nh = nhge->nh;struct nh_grp_entry *nhges; +struct nh_group *nhg;bool found = false;int i;WARN_ON (!nh); +list_del (&nhge->nh_list); + + nhg =rtnl_dereference (nhp->nh_grp); nhges = nhg->nh_entries;for (i =0 ; i < nhg->num_nh; ++i) {if (found) {
@@ -729,7 +733,11 @@ static void remove_nh_grp_entry(struct nnexthop_put (nh);if (nlinfo) -nexthop_notify (RTM_NEWNEXTHOP , nhge->nh_parent, nlinfo); +nexthop_notify (RTM_NEWNEXTHOP , nhp, nlinfo); + +/* if this group has no more entries then remove it */ +if (!nhg->num_nh) +remove_nexthop (net, nhp, nlinfo); } static void remove_nexthop_from_groups(struct net *net, struct nexthop *nh,
@@ -737,17 +745,8 @@ static void remove_nexthop_from_groups(s {struct nh_grp_entry *nhge, *tmp; -list_for_each_entry_safe (nhge, tmp, &nh->grp_list, nh_list) { -struct nh_group *nhg; - -list_del (&nhge->nh_list); - nhg =rtnl_dereference (nhge->nh_parent->nh_grp); -remove_nh_grp_entry (nhge, nhg, nlinfo); - -/* if this group has no more entries then remove it */ -if (!nhg->num_nh) -remove_nexthop (net, nhge->nh_parent, nlinfo); - } +list_for_each_entry_safe (nhge, tmp, &nh->grp_list, nh_list) +remove_nh_grp_entry (net, nhge, nlinfo); }static void remove_nexthop_group (struct nexthop *nh,struct nl_info *nlinfo)
Greg Kroah-Hartman
maintainerPATCH 133/142 nexthops: dont modify published nexthop groups
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
commit 90f33bffa382598a32cc82abfeb20adc92d041b6 upstream.
We must avoid modifying published nexthop groups while they might be in use, otherwise we might see NULL ptr dereferences. In order to do that we allocate 2 nexthoup group structures upon nexthop creation and swap between them when we have to delete an entry. The reason is that we can't fail nexthop group removal, so we can't handle allocation failure thus we move the extra allocation on creation where we can safely fail and return ENOMEM.
--- include/net/nexthop.h | 1 net/ipv4/nexthop.c | 91 +++++++++++++++++++++++++++++++------------------- 2 files changed, 59 insertions(+), 33 deletions(-)
include/net/nexthop.h +1 -0
@@ -70,6 +70,7 @@ struct nh_grp_entry { };struct nh_group { +struct nh_group *spare;/* spare group for removals */ u16 num_nh;bool mpath;bool has_v4;
net/ipv4/nexthop.c +58 -33
153 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 134/142 nexthop: Expand nexthop_is_multipath in a few places
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
commit 0b5e2e39739e861fa5fc84ab27a35dbe62a15330 upstream.
I got too fancy consolidating checks on multipath type. The result is that path lookups can access 2 different nh_grp structs as exposed by Nik's torture tests. Expand nexthop_is_multipath within nexthop.h to avoid multiple, nh_grp dereferences and make decisions based on the consistent struct.
Only 2 places left using nexthop_is_multipath are within IPv6, both only check that the nexthop is a multipath for a branching decision which are acceptable.
--- include/net/nexthop.h | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-)
include/net/nexthop.h +25 -16
@@ -137,21 +137,20 @@ static inline unsigned int nexthop_num_p {unsigned int rc =1 ; -if (nexthop_is_multipath (nh)) { +if (nh->is_group) {struct nh_group *nh_grp; nh_grp =rcu_dereference_rtnl (nh->nh_grp); - rc = nh_grp->num_nh; +if (nh_grp->mpath) + rc = nh_grp->num_nh; }return rc; }static inline -struct nexthop *nexthop_mpath_select (const struct nexthop *nh,int nhsel) +struct nexthop *nexthop_mpath_select (const struct nh_group *nhg,int nhsel) { -const struct nh_group *nhg =rcu_dereference_rtnl (nh->nh_grp); -/* for_nexthops macros in fib_semantics.c grabs a pointer to * the nexthop before checking nhsel */
@@ -186,12 +185,14 @@ static inline bool nexthop_is_blackhole( {const struct nh_info *nhi; -if (nexthop_is_multipath (nh)) { -if (nexthop_num_path (nh) >1 ) -return false; - nh =nexthop_mpath_select (nh,0 ); -if (!nh) +if (nh->is_group) { +struct nh_group *nh_grp; + + nh_grp =rcu_dereference_rtnl (nh->nh_grp); +if (nh_grp->num_nh >1 )return false; + + nh = nh_grp->nh_entries[0 ].nh; } nhi =rcu_dereference_rtnl (nh->nh_info);
@@ -217,10 +218,15 @@ struct fib_nh_common *nexthop_fib_nhc(stBUILD_BUG_ON (offsetof(struct fib_nh , nh_common) !=0 );BUILD_BUG_ON (offsetof(struct fib6_nh , nh_common) !=0 ); -if (nexthop_is_multipath (nh)) { - nh =nexthop_mpath_select (nh, nhsel); -if (!nh) -return NULL ; +if (nh->is_group) { +struct nh_group *nh_grp; + + nh_grp =rcu_dereference_rtnl (nh->nh_grp); +if (nh_grp->mpath) { + nh =nexthop_mpath_select (nh_grp, nhsel); +if (!nh) +return NULL ; + } } nhi =rcu_dereference_rtnl (nh->nh_info);
@@ -264,8 +270,11 @@ static inline struct fib6_nh *nexthop_fi {struct nh_info *nhi; -if (nexthop_is_multipath (nh)) { - nh =nexthop_mpath_select (nh,0 ); +if (nh->is_group) { +struct nh_group *nh_grp; + + nh_grp =rcu_dereference_rtnl (nh->nh_grp); + nh =nexthop_mpath_select (nh_grp,0 );if (!nh)return NULL ; }
Greg Kroah-Hartman
maintainerPATCH 135/142 ipv4: nexthop version of fib_info_nh_uses_dev
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
commit 1fd1c768f3624a5e66766e7b4ddb9b607cd834a5 upstream.
Similar to the last path, need to fix fib_info_nh_uses_dev for external nexthops to avoid referencing multiple nh_grp structs. Move the device check in fib_info_nh_uses_dev to a helper and create a nexthop version that is called if the fib_info uses an external nexthop.
--- include/net/ip_fib.h | 10 ++++++++++ include/net/nexthop.h | 25 +++++++++++++++++++++++++ net/ipv4/fib_frontend.c | 19 ++++++++++--------- 3 files changed, 45 insertions(+), 9 deletions(-)
include/net/ip_fib.h +10 -0
@@ -422,6 +422,16 @@ static inline int fib_num_tclassid_users#endif int fib_unmerge (struct net *net); +static inline bool nhc_l3mdev_matches_dev (const struct fib_nh_common *nhc, +const struct net_device *dev) +{ +if (nhc->nhc_dev == dev || +l3mdev_master_ifindex_rcu (nhc->nhc_dev) == dev->ifindex) +return true; + +return false; +} +/* Exported by fib_semantics.c */ int ip_fib_check_default (__be32 gw,struct net_device *dev);int fib_sync_down_dev (struct net_device *dev,unsigned long event,bool force);
include/net/nexthop.h +25 -0
@@ -233,6 +233,31 @@ struct fib_nh_common *nexthop_fib_nhc(streturn &nhi->fib_nhc; } +static inline bool nexthop_uses_dev (const struct nexthop *nh, +const struct net_device *dev) +{ +struct nh_info *nhi; + +if (nh->is_group) { +struct nh_group *nhg =rcu_dereference (nh->nh_grp); +int i; + +for (i =0 ; i < nhg->num_nh; i++) { +struct nexthop *nhe = nhg->nh_entries[i].nh; + + nhi =rcu_dereference (nhe->nh_info); +if (nhc_l3mdev_matches_dev (&nhi->fib_nhc, dev)) +return true; + } + }else { + nhi =rcu_dereference (nh->nh_info); +if (nhc_l3mdev_matches_dev (&nhi->fib_nhc, dev)) +return true; + } + +return false; +} +static inline unsigned int fib_info_num_path (const struct fib_info *fi) {if (unlikely (fi->nh))
net/ipv4/fib_frontend.c +10 -9
@@ -319,17 +319,18 @@ bool fib_info_nh_uses_dev(struct fib_inf {bool dev_match = false;#ifdef CONFIG_IP_ROUTE_MULTIPATH -int ret; +if (unlikely (fi->nh)) { + dev_match =nexthop_uses_dev (fi->nh, dev); + }else { +int ret; -for (ret =0 ; ret <fib_info_num_path (fi); ret++) { -const struct fib_nh_common *nhc =fib_info_nhc (fi, ret); +for (ret =0 ; ret <fib_info_num_path (fi); ret++) { +const struct fib_nh_common *nhc =fib_info_nhc (fi, ret); -if (nhc->nhc_dev == dev) { - dev_match = true; -break ; - }else if (l3mdev_master_ifindex_rcu (nhc->nhc_dev) == dev->ifindex) { - dev_match = true; -break ; +if (nhc_l3mdev_matches_dev (nhc, dev)) { + dev_match = true; +break ; + } } }#else
Greg Kroah-Hartman
maintainerPATCH 136/142 net: dsa: declare lockless TX feature for slave ports
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit 2b86cb8299765688c5119fd18d5f436716c81010 upstream.
Be there a platform with the following layout:
Regular NIC
|
+----> DSA master for switch port
|
+----> DSA master for another switch portAfter changing DSA back to static lockdep class keys in commit 1a33e10e4a95 ("net: partially revert dynamic lockdep key changes"), this kernel splat can be seen:
[ 13.361198] ============================================
[ 13.366524] WARNING: possible recursive locking detected
[ 13.371851] 5.7.0-rc4-02121-gc32a05ecd7af-dirty #988 Not tainted
[ 13.377874] --------------------------------------------
[ 13.383201] swapper/0/0 is trying to acquire lock:
[ 13.388004] ffff0000668ff298 (&dsa_slave_netdev_xmit_lock_key){+.-.}-{2:2}, at: __dev_queue_xmit+0x84c/0xbe0
[ 13.397879]
[ 13.397879] but task is already holding lock:
[ 13.403727] ffff0000661a1698 (&dsa_slave_netdev_xmit_lock_key){+.-.}-{2:2}, at: __dev_queue_xmit+0x84c/0xbe0
[ 13.413593]
[ 13.413593] other info that might help us debug this:
[ 13.420140] Possible unsafe locking scenario:
[ 13.420140]
[ 13.426075] CPU0
[ 13.428523] ----
[ 13.430969] lock(&dsa_slave_netdev_xmit_lock_key);
[ 13.435946] lock(&dsa_slave_netdev_xmit_lock_key);
[ 13.440924]
[ 13.440924] *** DEADLOCK ***
[ 13.440924]
[ 13.446860] May be due to missing lock nesting notation
[ 13.446860]
[ 13.453668] 6 locks held by swapper/0/0:
[ 13.457598] #0: ffff800010003de0 ((&idev->mc_ifc_timer)){+.-.}-{0:0}, at: call_timer_fn+0x0/0x400
[ 13.466593] #1: ffffd4d3fb478700 (rcu_read_lock){....}-{1:2}, at: mld_sendpack+0x0/0x560
[ 13.474803] #2: ffffd4d3fb478728 (rcu_read_lock_bh){....}-{1:2}, at: ip6_finish_output2+0x64/0xb10
[ 13.483886] #3: ffffd4d3fb478728 (rcu_read_lock_bh){....}-{1:2}, at: __dev_queue_xmit+0x6c/0xbe0
[ 13.492793] #4: ffff0000661a1698 (&dsa_slave_netdev_xmit_lock_key){+.-.}-{2:2}, at: __dev_queue_xmit+0x84c/0xbe0
[ 13.503094] #5: ffffd4d3fb478728 (rcu_read_lock_bh){....}-{1:2}, at: __dev_queue_xmit+0x6c/0xbe0
[ 13.512000]
[ 13.512000] stack backtrace:
[ 13.516369] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.7.0-rc4-02121-gc32a05ecd7af-dirty #988
[ 13.530421] Call trace:
[ 13.532871] dump_backtrace+0x0/0x1d8
[ 13.536539] show_stack+0x24/0x30
[ 13.539862] dump_stack+0xe8/0x150
[ 13.543271] __lock_acquire+0x1030/0x1678
[ 13.547290] lock_acquire+0xf8/0x458
[ 13.550873] _raw_spin_lock+0x44/0x58
[ 13.554543] __dev_queue_xmit+0x84c/0xbe0
[ 13.558562] dev_queue_xmit+0x24/0x30
[ 13.562232] dsa_slave_xmit+0xe0/0x128
[ 13.565988] dev_hard_start_xmit+0xf4/0x448
[ 13.570182] __dev_queue_xmit+0x808/0xbe0
[ 13.574200] dev_queue_xmit+0x24/0x30
[ 13.577869] neigh_resolve_output+0x15c/0x220
[ 13.582237] ip6_finish_output2+0x244/0xb10
[ 13.586430] __ip6_finish_output+0x1dc/0x298
[ 13.590709] ip6_output+0x84/0x358
[ 13.594116] mld_sendpack+0x2bc/0x560
[ 13.597786] mld_ifc_timer_expire+0x210/0x390
[ 13.602153] call_timer_fn+0xcc/0x400
[ 13.605822] run_timer_softirq+0x588/0x6e0
[ 13.609927] __do_softirq+0x118/0x590
[ 13.613597] irq_exit+0x13c/0x148
[ 13.616918] __handle_domain_irq+0x6c/0xc0
[ 13.621023] gic_handle_irq+0x6c/0x160
[ 13.624779] el1_irq+0xbc/0x180
[ 13.627927] cpuidle_enter_state+0xb4/0x4d0
[ 13.632120] cpuidle_enter+0x3c/0x50
[ 13.635703] call_cpuidle+0x44/0x78
[ 13.639199] do_idle+0x228/0x2c8
[ 13.642433] cpu_startup_entry+0x2c/0x48
[ 13.646363] rest_init+0x1ac/0x280
[ 13.649773] arch_call_rest_init+0x14/0x1c
[ 13.653878] start_kernel+0x490/0x4bcLockdep keys themselves were added in commit ab92d68fc22f ("net: core:
add generic lockdep keys"), and it's very likely that this splat existed since then, but I have no real way to check, since this stacked platform wasn't supported by mainline back then.
Quoted 1 line
From Taehee's own words:
This patch was considered that all stackable devices have LLTX flag. But the dsa doesn't have LLTX, so this splat happened. After this patch, dsa shares the same lockdep class key. On the nested dsa interface architecture, which you illustrated, the same lockdep class key will be used in __dev_queue_xmit() because dsa doesn't have LLTX.
So that lockdep detects deadlock because the same lockdep class key is used recursively although actually the different locks are used. There are some ways to fix this problem.
1. using NETIF_F_LLTX flag.
If possible, using the LLTX flag is a very clear way for it. But I'm so sorry I don't know whether the dsa could have LLTX or not.
2. using dynamic lockdep again.
It means that each interface uses a separate lockdep class key. So, lockdep will not detect recursive locking.
But this way has a problem that it could consume lockdep class key too many.
Currently, lockdep can have 8192 lockdep class keys.
- you can see this number with the following command.
cat /proc/lockdep_stats
lock-classes: 1251 [max: 8192]
...
The [max: 8192] means that the maximum number of lockdep class keys.
If too many lockdep class keys are registered, lockdep stops to work. So, using a dynamic(separated) lockdep class key should be considered carefully.
In addition, updating lockdep class key routine might have to be existing. (lockdep_register_key(), lockdep_set_class(), lockdep_unregister_key())
3. Using lockdep subclass.
A lockdep class key could have 8 subclasses.
The different subclass is considered different locks by lockdep infrastructure.
But "lock-classes" is not counted by subclasses.
So, it could avoid stopping lockdep infrastructure by an overflow of lockdep class keys.
This approach should also have an updating lockdep class key routine. (lockdep_set_subclass())
4. Using nonvalidate lockdep class key.
The lockdep infrastructure supports nonvalidate lockdep class key type. It means this lockdep is not validated by lockdep infrastructure. So, the splat will not happen but lockdep couldn't detect real deadlock case because lockdep really doesn't validate it.
I think this should be used for really special cases. (lockdep_set_novalidate_class())
Further discussion here:
https://patchwork.ozlabs.org/project/netdev/patch/[email protected]/
There appears to be no negative side-effect to declaring lockless TX for the DSA virtual interfaces, which means they handle their own locking. So that's what we do to make the splat go away.
Patch tested in a wide variety of cases: unicast, multicast, PTP, etc.
--- net/dsa/slave.c | 1 + 1 file changed, 1 insertion(+)
net/dsa/slave.c +1 -0
@@ -1409,6 +1409,7 @@ int dsa_slave_create(struct dsa_port *poif (ds->ops->port_vlan_add && ds->ops->port_vlan_del) slave_dev->features |=NETIF_F_HW_VLAN_CTAG_FILTER ; slave_dev->hw_features |=NETIF_F_HW_TC ; + slave_dev->features |=NETIF_F_LLTX ; slave_dev->ethtool_ops = &dsa_slave_ethtool_ops;if (!IS_ERR_OR_NULL (port->mac))ether_addr_copy (slave_dev->dev_addr, port->mac);
Greg Kroah-Hartman
maintainerPATCH 137/142 bonding: Fix reference count leak in bond_sysfs_slave_add.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
commit a068aab42258e25094bc2c159948d263ed7d7a77 upstream.
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Previous commit "b8eb718348b8" fixed a similar problem.
--- drivers/net/bonding/bond_sysfs_slave.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_sysfs_slave.c +3 -1
@@ -149,8 +149,10 @@ int bond_sysfs_slave_add(struct slave *s err =kobject_init_and_add (&slave->kobj, &slave_ktype, &(slave->dev->dev.kobj),"bonding_slave" ); -if (err) +if (err) { +kobject_put (&slave->kobj);return err; + }for (a = slave_attrs; *a; ++a) { err =sysfs_create_file (&slave->kobj, &((*a)->attr));
Greg Kroah-Hartman
maintainerPATCH 138/142 Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin Locke:
"... nomux only appeared to fix the issue because the controller continued working after warm reboots. After more thorough testing from both warm and cold start, I now believe the entry should be added to i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1 alone is sufficient to avoid the issue from both states while i8042.nomux is not."
--- drivers/input/serio/i8042-x86ia64io.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/input/serio/i8042-x86ia64io.h +0 -7
@@ -541,13 +541,6 @@ static const struct dmi_system_id __init DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), }, }, - { - /* Lenovo ThinkPad Twist S230u */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), - }, - }, { } };
Greg Kroah-Hartman
maintainerPATCH 139/142 netfilter: conntrack: comparison of unsigned in cthelper confirmation
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 94945ad2b330207cded0fd8d4abebde43a776dfb upstream.
net/netfilter/nf_conntrack_core.c: In function nf_confirm_cthelper:net/netfilter/nf_conntrack_core.c:2117:15: warning: comparison of unsigned expression in < 0 is always false [-Wtype-limits]
2117 | if (protoff < 0 || (frag_off & htons(~0x7)) != 0)
| ^
ipv6_skip_exthdr() returns a signed integer.
--- net/netfilter/nf_conntrack_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_core.c +1 -1
@@ -1955,7 +1955,7 @@ static int nf_confirm_cthelper(struct sk {const struct nf_conntrack_helper *helper;const struct nf_conn_help *help; -unsigned int protoff; +int protoff; help =nfct_help (ct);if (!help)
Greg Kroah-Hartman
maintainerPATCH 140/142 netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 46c1e0621a72e0469ec4edfdb6ed4d387ec34f8a upstream.
Clang warns:
net/netfilter/nf_conntrack_core.c:2068:21: warning: variable 'ctinfo' is uninitialized when used here [-Wuninitialized]
nf_ct_set(skb, ct, ctinfo);
^~~~~~
net/netfilter/nf_conntrack_core.c:2024:2: note: variable 'ctinfo' is
declared here
enum ip_conntrack_info ctinfo;
^1 warning generated.
nf_conntrack_update was split up into nf_conntrack_update and __nf_conntrack_update, where the assignment of ctinfo is in nf_conntrack_update but it is used in __nf_conntrack_update.
Pass the value of ctinfo from nf_conntrack_update to __nf_conntrack_update so that uninitialized memory is not used and everything works properly.
--- net/netfilter/nf_conntrack_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_core.c +3 -3
@@ -1880,11 +1880,11 @@ static void nf_conntrack_attach(struct s }static int __nf_conntrack_update (struct net *net,struct sk_buff *skb, -struct nf_conn *ct) +struct nf_conn *ct, +enum ip_conntrack_info ctinfo) {struct nf_conntrack_tuple_hash *h;struct nf_conntrack_tuple tuple; -enum ip_conntrack_info ctinfo;struct nf_nat_hook *nat_hook;unsigned int status;int dataoff;
@@ -2009,7 +2009,7 @@ static int nf_conntrack_update(struct nereturn 0 ;if (!nf_ct_is_confirmed (ct)) { - err =__nf_conntrack_update (net, skb, ct); + err =__nf_conntrack_update (net, skb, ct, ctinfo);if (err <0 )return err; }
Greg Kroah-Hartman
maintainerPATCH 141/142 netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 4946ea5c1237036155c3b3a24f049fd5f849f8f6 upstream.
Quoted 1 line
Quoted 1 line
include/linux/netfilter/nf_conntrack_pptp.h:13:20: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
extern const char *const pptp_msg_name(u_int16_t msg); ^~~~~~
--- include/linux/netfilter/nf_conntrack_pptp.h | 2 +- net/netfilter/nf_conntrack_pptp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/netfilter/nf_conntrack_pptp.h +1 -1
@@ -10,7 +10,7 @@#include <net/netfilter/nf_conntrack_expect.h> #include <uapi/linux/netfilter/nf_conntrack_tuple_common.h> -extern const char *const pptp_msg_name (u_int16_t msg); +const char *pptp_msg_name (u_int16_t msg);/* state of the control session */ enum pptp_ctrlsess_state {
net/netfilter/nf_conntrack_pptp.c +1 -1
@@ -91,7 +91,7 @@ static const char *const pptp_msg_name_a [PPTP_SET_LINK_INFO] = "SET_LINK_INFO" }; -const char *const pptp_msg_name (u_int16_t msg) +const char *pptp_msg_name (u_int16_t msg) {if (msg >PPTP_MSG_MAX )return pptp_msg_name_array[0 ];
Greg Kroah-Hartman
maintainerPATCH 142/142 perf: Make perf able to build with latest libbfd
In reply to Greg Kroah-HartmanFrom: Changbin Du <[email protected]>
commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream.
libbfd has changed the bfd_section_* macros to inline functions bfd_section_<field> since 2019-09-18. See below two commits:
o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html
This fix make perf able to build with both old and new libbfd.
--- tools/perf/util/srcline.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
tools/perf/util/srcline.c +15 -1
@@ -193,16 +193,30 @@ static void find_address_in_section(bfdbfd_vma pc, vma;bfd_size_type size;struct a2l_data *a2l = data; +flagword flags;if (a2l->found)return ; -if ((bfd_get_section_flags (abfd, section) &SEC_ALLOC ) ==0 ) +#ifdef bfd_get_section_flags + flags =bfd_get_section_flags (abfd, section); +#else + flags =bfd_section_flags (section); +#endif +if ((flags &SEC_ALLOC ) ==0 )return ; pc = a2l->addr; +#ifdef bfd_get_section_vma vma =bfd_get_section_vma (abfd, section); +#else + vma =bfd_section_vma (section); +#endif +#ifdef bfd_get_section_size size =bfd_get_section_size (section); +#else + size =bfd_section_size (section); +#endif if (pc < vma || pc >= vma + size)return ;
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.44 release. There are 142 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 Wed, 03 Jun 2020 17:38:19 +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.4.44-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.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.4.44-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.4.y
git commit: 1fd4226c4fe1a358bb8277e25ebb03950180443a
git describe: v5.4.43-143-g1fd4226c4fe1
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.4-oe/build/v5.4.43-143-g1fd4226c4fe1
No regressions (compared to build v5.4.43)
No fixes (compared to build v5.4.43)
Ran 31360 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
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* install-android-platform-tools-r2800
* kselftest
* kselftest/drivers
* kselftest/filesystems
* kselftest/net
* kselftest/networking
* libgpiod
* linux-log-parser
* ltp-commands-tests
* ltp-containers-tests
* ltp-dio-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* perf
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* network-basic-tests
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-native/drivers
* kselftest-vsyscall-mode-native/filesystems
* kselftest-vsyscall-mode-native/net
* kselftest-vsyscall-mode-native/networking
* kselftest-vsyscall-mode-none
* kselftest-vsyscall-mode-none/drivers
* kselftest-vsyscall-mode-none/filesystems
* kselftest-vsyscall-mode-none/net
* kselftest-vsyscall-mode-none/networking
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org