5.7.13-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.7.13-rc1 review
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +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.7.13-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.7.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.7.13-rc1
Thomas Gleixner <[email protected]>
x86/i8259: Use printk_deferred() to prevent deadlock
Wanpeng Li <[email protected]>
KVM: SVM: Fix disable pause loop exit/pause filtering capability on SVM
Wanpeng Li <[email protected]>
KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled
Will Deacon <[email protected]>
KVM: arm64: Don't inherit exec permission across page-table levels
Atish Patra <[email protected]>
riscv: Parse all memory blocks to remove unusable memory
Xie He <[email protected]>
drivers/net/wan: lapb: Corrected the usage of skb_cow
Atish Patra <[email protected]>
RISC-V: Set maximum number of mapped pages correctly
Andrea Righi <[email protected]>
xen-netfront: fix potential deadlock in xennet_remove()
Navid Emamdoost <[email protected]>
cxgb4: add missing release on skb in uld_send()
Josh Poimboeuf <[email protected]>
x86/stacktrace: Fix reliable check for empty user task stacks
Josh Poimboeuf <[email protected]>
x86/unwind/orc: Fix ORC for newly forked tasks
Raviteja Narayanam <[email protected]>
i2c: cadence: Clear HOLD bit at correct time in Rx path
Raviteja Narayanam <[email protected]>
Revert "i2c: cadence: Fix the hold bit setting"
Paolo Pisati <[email protected]>
selftest: txtimestamp: fix net ns entry logic
Yoshihiro Shimoda <[email protected]>
net: ethernet: ravb: exit if re-initialization fails in tx timeout
Liam Beguin <[email protected]>
parisc: add support for cmpxchg on u8 pointers
Vincent Chen <[email protected]>
riscv: kasan: use local_tlb_flush_all() to avoid uninitialized __sbi_rfence
Ming Lei <[email protected]>
scsi: core: Run queue in case of I/O resource contention failure
Navid Emamdoost <[email protected]>
nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame
Oded Gabbay <[email protected]>
habanalabs: prevent possible out-of-bounds array access
Daniele Albano <[email protected]>
io_uring: always allow drain/link/hardlink/async sqe flags
Paolo Pisati <[email protected]>
selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support
Laurence Oberman <[email protected]>
qed: Disable "MFW indication via attention" SPAM every 5 minutes
Paolo Pisati <[email protected]>
selftests: fib_nexthop_multiprefix: fix cleanup() netns deletion
Geert Uytterhoeven <[email protected]>
usb: hso: Fix debug compile warning on sparc32
Jiri Slaby <[email protected]>
iwlwifi: fix crash in iwl_dbg_tlv_alloc_trigger
Lorenzo Bianconi <[email protected]>
mt76: mt7615: fix lmac queue debugsfs entry
Taehee Yoo <[email protected]>
vxlan: fix memleak of fdb
Wei Li <[email protected]>
perf tools: Fix record failure when mixed with ARM SPE event
Xin Xiong <[email protected]>
net/mlx5e: fix bpf_prog reference count leaks in mlx5e_alloc_rq
Jianbo Liu <[email protected]>
net/mlx5e: E-Switch, Add misc bit when misc fields changed for mirroring
Wang Hai <[email protected]>
net: gemini: Fix missing clk_disable_unprepare() in error path of gemini_ethernet_port_probe()
Shannon Nelson <[email protected]>
ionic: unlock queue mutex in error path
Landen Chao <[email protected]>
net: ethernet: mtk_eth_soc: fix MTU warnings
Lu Wei <[email protected]>
net: nixge: fix potential memory leak in nixge_probe()
Hangbin Liu <[email protected]>
selftests/bpf: fix netdevsim trap_flow_action_cookie read
Alain Michaud <[email protected]>
Bluetooth: fix kernel oops in store_pending_adv_report
Robin Murphy <[email protected]>
arm64: csum: Fix handling of bad packets
Sami Tolvanen <[email protected]>
arm64/alternatives: move length validation inside the subsection
Leon Romanovsky <[email protected]>
RDMA/core: Free DIM memory in error unwind
Leon Romanovsky <[email protected]>
RDMA/core: Stop DIM before destroying CQ
Remi Pommarel <[email protected]>
mac80211: mesh: Free pending skb when destroying a mpath
Remi Pommarel <[email protected]>
mac80211: mesh: Free ie data when leaving mesh
Sabrina Dubroca <[email protected]>
espintcp: handle short messages instead of breaking the encap socket
Andrii Nakryiko <[email protected]>
bpf: Fix map leak in HASH_OF_MAPS map
Thomas Falcon <[email protected]>
ibmvnic: Fix IRQ mapping disposal in error path
Amit Cohen <[email protected]>
selftests: ethtool: Fix test when only two speeds are supported
Ido Schimmel <[email protected]>
mlxsw: spectrum_router: Fix use-after-free in router init / de-init
Ido Schimmel <[email protected]>
mlxsw: core: Free EMAD transactions using kfree_rcu()
Ido Schimmel <[email protected]>
mlxsw: core: Increase scope of RCU read-side critical section
Christoph Hellwig <[email protected]>
nvme: add a Identify Namespace Identification Descriptor list quirk
Guillaume Nault <[email protected]>
bareudp: forbid mixing IP and MPLS in multiproto mode
Subbaraya Sundeep <[email protected]>
octeontx2-pf: Unregister netdev at driver remove
Subbaraya Sundeep <[email protected]>
octeontx2-pf: cancel reset_task work
Subbaraya Sundeep <[email protected]>
octeontx2-pf: Fix reset_task bugs
Jakub Kicinski <[email protected]>
mlx4: disable device on shutdown
Herbert Xu <[email protected]>
rhashtable: Fix unprotected RCU dereference in __rht_ptr
Johan Hovold <[email protected]>
net: lan78xx: fix transfer-buffer memory leak
Johan Hovold <[email protected]>
net: lan78xx: add missing endpoint sanity check
Alaa Hleihel <[email protected]>
net/mlx5e: Fix kernel crash when setting vf VLANID on a VF dev
Ron Diskin <[email protected]>
net/mlx5e: Modify uplink state on interface up/down
Eran Ben Elisha <[email protected]>
net/mlx5: Query PPS pin operational status before registering it
Eran Ben Elisha <[email protected]>
net/mlx5: Verify Hardware supports requested ptp function on a given pin
Eran Ben Elisha <[email protected]>
net/mlx5: Fix a bug of using ptp channel index as pin index
Aya Levin <[email protected]>
net/mlx5e: Fix error path of device attach
Parav Pandit <[email protected]>
net/mlx5: E-switch, Destroy TSAR after reload interface
Parav Pandit <[email protected]>
net/mlx5: E-switch, Destroy TSAR when fail to enable the mode
Guojia Liao <[email protected]>
net: hns3: fix for VLAN config when reset failed
Guojia Liao <[email protected]>
net: hns3: fix aRFS FD rules leftover after add a user FD rule
Jian Shen <[email protected]>
net: hns3: add reset check for VF updating port based VLAN
Yonglong Liu <[email protected]>
net: hns3: fix a TX timeout issue
Yunsheng Lin <[email protected]>
net: hns3: fix desc filling bug when skb is expanded or lineared
Michael Karcher <[email protected]>
sh: Fix validation of system call number
Peter Zijlstra <[email protected]>
sh/tlb: Fix PGTABLE_LEVELS > 2
Tanner Love <[email protected]>
selftests/net: tcp_mmap: fix clang warning for target arch PowerPC
Tanner Love <[email protected]>
selftests/net: so_txtime: fix clang issues for target arch PowerPC
Tanner Love <[email protected]>
selftests/net: psock_fanout: fix clang issues for target arch PowerPC
Tanner Love <[email protected]>
selftests/net: rxtimestamp: fix clang issues for target arch PowerPC
Sagi Grimberg <[email protected]>
nvme-tcp: fix possible hang waiting for icresp response
Russell King <[email protected]>
ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
Steffen Klassert <[email protected]>
xfrm: Fix crash when the hold queue is used.
Sabrina Dubroca <[email protected]>
espintcp: recv() should return 0 when the peer socket is closed
Douglas Anderson <[email protected]>
pinctrl: qcom: Handle broken/missing PDC dual edge IRQs on sc7180
Maxime Ripard <[email protected]>
ARM: dts sunxi: Relax a bit the CMA pool allocation range
Xin Long <[email protected]>
xfrm: policy: match with both mark and mask on user interfaces
YueHaibing <[email protected]>
net/x25: Fix null-ptr-deref in x25_disconnect
Xiyu Yang <[email protected]>
net/x25: Fix x25_neigh refcnt leak when x25 disconnect
Ben Hutchings <[email protected]>
libtraceevent: Fix build with binutils 2.35
Peilin Ye <[email protected]>
rds: Prevent kernel-infoleak in rds_notify_queue_get()
Linus Torvalds <[email protected]>
random32: remove net_rand_state from the latent entropy gcc plugin
Willy Tarreau <[email protected]>
random: fix circular include dependency on arm64 after addition of percpu.h
Biju Das <[email protected]>
drm: of: Fix double-free bug
Steve Cohen <[email protected]>
drm: hold gem reference until object is no longer accessed
Linus Walleij <[email protected]>
drm/mcde: Fix stability issue
Paul Cercueil <[email protected]>
drm/dbi: Fix SPI Type 1 (9-bit) transfer
Peilin Ye <[email protected]>
drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl()
Mazin Rezk <[email protected]>
drm/amd/display: Clear dm_state for fast updates
Alex Deucher <[email protected]>
Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"
Grygorii Strashko <[email protected]>
ARM: percpu.h: fix build error
Willy Tarreau <[email protected]>
random32: update the net random state on interrupt and activity
Michael S. Tsirkin <[email protected]>
virtio_balloon: fix up endian-ness for free cmd id
Michael Trimarchi <[email protected]>
ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect
Fabio Estevam <[email protected]>
ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2
Fabio Estevam <[email protected]>
ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2
Jaedon Shin <[email protected]>
ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
Will Deacon <[email protected]>
ARM: 8986/1: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints
Paul Moore <[email protected]>
revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present")
Wang Hai <[email protected]>
9p/trans_fd: Fix concurrency del of req_list in p9_fd_cancelled/p9_read_work
Michael S. Tsirkin <[email protected]>
vhost/scsi: fix up req type endian-ness
Mike Marciniszyn <[email protected]>
IB/rdmavt: Fix RQ counting issues causing use of an invalid RWQE
Jason Gunthorpe <[email protected]>
RDMA/mlx5: Fix prefetch memory leak if get_prefetchable_mr fails
Takashi Iwai <[email protected]>
ALSA: hda/hdmi: Fix keep_power assignment for non-component devices
Takashi Iwai <[email protected]>
ALSA: hda: Workaround for spurious wakeups on some Intel platforms
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed HP right speaker no sound
PeiSen Hou <[email protected]>
ALSA: hda/realtek: Fix add a "ultra_low_power" function for intel reference board (alc256)
Armas Spann <[email protected]>
ALSA: hda/realtek: typo_fix: enable headset mic of ASUS ROG Zephyrus G14(GA401) series with ALC289
Armas Spann <[email protected]>
ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus G15(GA502) series with ALC289
Laurence Tratt <[email protected]>
ALSA: usb-audio: Add implicit feedback quirk for SSL2
Robert Hancock <[email protected]>
PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge
NeilBrown <[email protected]>
sunrpc: check that domain table is empty at module unload.
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/armada-38x.dtsi | 3 +- arch/arm/boot/dts/imx6qdl-icore.dtsi | 3 +- arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- arch/arm/include/asm/percpu.h | 2 + arch/arm/kernel/hw_breakpoint.c | 27 ++++++-- arch/arm/kernel/vdso.c | 1 + arch/arm64/include/asm/alternative.h | 4 +- arch/arm64/include/asm/checksum.h | 5 +- arch/parisc/include/asm/cmpxchg.h | 2 + arch/parisc/lib/bitops.c | 12 ++++ arch/riscv/mm/init.c | 33 ++++----- arch/riscv/mm/kasan_init.c | 4 +- arch/sh/include/asm/pgalloc.h | 10 +-- arch/sh/kernel/entry-common.S | 6 +- arch/x86/kernel/i8259.c | 2 +- arch/x86/kernel/stacktrace.c | 5 -- arch/x86/kernel/unwind_orc.c | 8 ++- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/svm/svm.c | 9 ++- drivers/char/random.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 +++++++--- drivers/gpu/drm/drm_gem.c | 10 ++- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- drivers/gpu/drm/drm_of.c | 4 +- drivers/gpu/drm/mcde/mcde_display.c | 11 ++- drivers/i2c/busses/i2c-cadence.c | 28 ++++---- drivers/infiniband/core/cq.c | 14 +++- drivers/infiniband/hw/mlx5/odp.c | 5 +- drivers/infiniband/sw/rdmavt/qp.c | 33 ++------- drivers/infiniband/sw/rdmavt/rc.c | 4 +- drivers/misc/habanalabs/command_submission.c | 14 +++- drivers/net/bareudp.c | 29 ++++++-- drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 + drivers/net/ethernet/cortina/gemini.c | 5 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 18 ++--- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 35 +++++----- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 38 +++++++---- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 + drivers/net/ethernet/mellanox/mlx4/main.c | 2 + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 2 + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 2 + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 31 +++++++-- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +++++--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 78 ++++++++++++++++++---- drivers/net/ethernet/mellanox/mlxsw/core.c | 8 ++- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 50 +++++++------- drivers/net/ethernet/ni/nixge.c | 8 ++- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 3 +- drivers/net/ethernet/renesas/ravb_main.c | 26 +++++++- drivers/net/usb/hso.c | 5 +- drivers/net/usb/lan78xx.c | 6 ++ drivers/net/vxlan.c | 6 +- drivers/net/wan/hdlc_x25.c | 4 +- drivers/net/wan/lapbether.c | 8 ++- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 16 ++++- .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 9 +-- drivers/net/xen-netfront.c | 64 ++++++++++++------ drivers/nfc/s3fwrn5/core.c | 1 + drivers/nvme/host/core.c | 15 +---- drivers/nvme/host/nvme.h | 7 ++ drivers/nvme/host/pci.c | 2 + drivers/nvme/host/tcp.c | 3 + drivers/pci/quirks.c | 13 ++++ drivers/pinctrl/qcom/Kconfig | 2 + drivers/pinctrl/qcom/pinctrl-msm.c | 74 +++++++++++++++++++- drivers/pinctrl/qcom/pinctrl-msm.h | 4 ++ drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 + drivers/scsi/scsi_lib.c | 16 +++-- drivers/vhost/scsi.c | 2 +- drivers/virtio/virtio_balloon.c | 6 +- fs/io_uring.c | 13 ++-- include/linux/mlx5/mlx5_ifc.h | 1 + include/linux/random.h | 3 + include/linux/rhashtable.h | 25 +++---- include/net/xfrm.h | 15 +++-- include/rdma/rdmavt_qp.h | 19 ++++++ kernel/audit.c | 1 - kernel/audit.h | 8 --- kernel/auditsc.c | 3 + kernel/bpf/hashtab.c | 12 +++- kernel/time/timer.c | 8 +++ lib/random32.c | 2 +- net/9p/trans_fd.c | 15 ++++- net/bluetooth/hci_event.c | 26 ++++++-- net/key/af_key.c | 4 +- net/mac80211/cfg.c | 1 + net/mac80211/mesh_pathtbl.c | 1 + net/rds/recv.c | 3 +- net/sunrpc/sunrpc.h | 1 + net/sunrpc/sunrpc_syms.c | 2 + net/sunrpc/svcauth.c | 25 +++++++ net/x25/x25_subr.c | 6 ++ net/xfrm/espintcp.c | 30 ++++++++- net/xfrm/xfrm_policy.c | 39 +++++------ net/xfrm/xfrm_user.c | 18 +++-- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 17 ++++- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/hda/patch_realtek.c | 36 ++++++++-- sound/usb/pcm.c | 1 + tools/lib/traceevent/plugins/Makefile | 2 +- tools/perf/arch/arm/util/auxtrace.c | 8 +-- tools/testing/selftests/bpf/test_offload.py | 3 + .../selftests/net/fib_nexthop_multiprefix.sh | 2 +- tools/testing/selftests/net/forwarding/ethtool.sh | 2 - tools/testing/selftests/net/ip_defrag.sh | 2 + tools/testing/selftests/net/psock_fanout.c | 3 +- tools/testing/selftests/net/rxtimestamp.c | 3 +- tools/testing/selftests/net/so_txtime.c | 2 +- tools/testing/selftests/net/tcp_mmap.c | 6 +- tools/testing/selftests/net/txtimestamp.sh | 2 +- virt/kvm/arm/mmu.c | 11 +-- 128 files changed, 942 insertions(+), 422 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/120 sunrpc: check that domain table is empty at module unload.
From: NeilBrown <[email protected]>
[ Upstream commit f45db2b909c7e76f35850e78f017221f30282b8e ]
The domain table should be empty at module unload. If it isn't there is a bug somewhere. So check and report.
--- net/sunrpc/sunrpc.h | 1 + net/sunrpc/sunrpc_syms.c | 2 ++ net/sunrpc/svcauth.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+)
net/sunrpc/sunrpc.h +1 -0
@@ -52,4 +52,5 @@ static inline int sock_is_loopback(struct sock *sk)int rpc_clients_notifier_register (void );void rpc_clients_notifier_unregister (void ); +void auth_domain_cleanup (void );#endif /* _NET_SUNRPC_SUNRPC_H */
net/sunrpc/sunrpc_syms.c +2 -0
@@ -23,6 +23,7 @@#include <linux/sunrpc/rpc_pipe_fs.h> #include <linux/sunrpc/xprtsock.h> +#include "sunrpc.h" #include "netns.h" unsigned int sunrpc_net_id;
@@ -131,6 +132,7 @@ cleanup_sunrpc(void)unregister_rpc_pipefs ();rpc_destroy_mempool ();unregister_pernet_subsys (&sunrpc_net_ops); +auth_domain_cleanup ();#if IS_ENABLED (CONFIG_SUNRPC_DEBUG )rpc_unregister_sysctl ();#endif
net/sunrpc/svcauth.c +25 -0
@@ -21,6 +21,8 @@#include <trace/events/sunrpc.h> +#include "sunrpc.h" +#define RPCDBG_FACILITY RPCDBG_AUTH
@@ -205,3 +207,26 @@ struct auth_domain *auth_domain_find(char *name)return NULL ; }EXPORT_SYMBOL_GPL (auth_domain_find); + +/** +* auth_domain_cleanup - check that the auth_domain table is empty +* +* On module unload the auth_domain_table must be empty. To make it +* easier to catch bugs which don't clean up domains properly, we +* warn if anything remains in the table at cleanup time. +* +* Note that we cannot proactively remove the domains at this stage. +* The ->release() function might be in a module that has already been +* unloaded. +*/ + +void auth_domain_cleanup (void ) +{ +int h; +struct auth_domain *hp; + +for (h =0 ; h <DN_HASHMAX ; h++) +hlist_for_each_entry (hp, &auth_domain_table[h], hash) +pr_warn ("svc: domain %s still present at module unload.\n" , + hp->name); +}
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 2/120 PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
commit b361663c5a40c8bc758b7f7f2239f7a192180e7c upstream.
Recently ASPM handling was changed to allow ASPM on PCIe-to-PCI/PCI-X bridges. Unfortunately the ASMedia ASM1083/1085 PCIe to PCI bridge device doesn't seem to function properly with ASPM enabled. On an Asus PRIME H270-PRO motherboard, it causes errors like these:
pcieport 0000:00:1c.0: AER: PCIe Bus Error: severity=Corrected, type=Data Link Layer, (Transmitter ID)
pcieport 0000:00:1c.0: AER: device [8086:a292] error status/mask=00003000/00002000
pcieport 0000:00:1c.0: AER: [12] Timeout
pcieport 0000:00:1c.0: AER: Corrected error received: 0000:00:1c.0
pcieport 0000:00:1c.0: AER: can't find device of ID00e0
In addition to flooding the kernel log, this also causes the machine to wake up immediately after suspend is initiated.
The device advertises ASPM L0s and L1 support in the Link Capabilities register, but the ASMedia web page for ASM1083 [1] claims "No PCIe ASPM support".
Windows 10 (build 2004) enables L0s, but it also logs correctable PCIe errors.
Add a quirk to disable ASPM for this device.
[1] https://www.asmedia.com.tw/eng/e_show_products.php?cate_index=169&item=114
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=208667
--- drivers/pci/quirks.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/pci/quirks.c +13 -0
@@ -2330,6 +2330,19 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x10f4 , quirk_disable_aspm_l0s);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x1508 , quirk_disable_aspm_l0s); +static void quirk_disable_aspm_l0s_l1 (struct pci_dev *dev) +{ +pci_info (dev,"Disabling ASPM L0s/L1\n" ); +pci_disable_link_state (dev,PCIE_LINK_STATE_L0S |PCIE_LINK_STATE_L1 ); +} + +/* +* ASM1083/1085 PCIe-PCI bridge devices cause AER timeout errors on the +* upstream PCIe root port when ASPM is enabled. At least L0s mode is affected; +* disable both L0s and L1 for now to be safe. +*/ +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ASMEDIA ,0x1080 , quirk_disable_aspm_l0s_l1); +/* * Some Pericom PCIe-to-PCI bridges in reverse mode need the PCIe Retrain * Link bit cleared after starting the link retrain process to allow this
Greg Kroah-Hartman
maintainerPATCH 3/120 ALSA: usb-audio: Add implicit feedback quirk for SSL2
In reply to Greg Kroah-HartmanFrom: Laurence Tratt <[email protected]>
commit 3da87ec67a491b9633a82045896c076b794bf938 upstream.
As expected, this requires the same quirk as the SSL2+ in order for the clock to sync. This was suggested by, and tested on an SSL2, by Dmitry.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -367,6 +367,7 @@ static int set_sync_ep_implicit_fb_quirk ifnum =0 ; goto add_sync_ep_from_ifnum;case USB_ID (0x07fd ,0x0008 ):/* MOTU M Series */ +case USB_ID (0x31e9 ,0x0001 ):/* Solid State Logic SSL2 */ case USB_ID (0x31e9 ,0x0002 ):/* Solid State Logic SSL2+ */ case USB_ID (0x0d9a ,0x00df ):/* RTX6001 */ ep =0x81 ;
Greg Kroah-Hartman
maintainerPATCH 4/120 ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus G15(GA502) series with ALC289
In reply to Greg Kroah-HartmanFrom: Armas Spann <[email protected]>
commit 4b43d05a1978a93a19374c6e6b817c9c1ff4ba4b upstream.
This patch adds support for headset mic to the ASUS ROG Zephyrus G15(GA502) notebook series by adding the corresponding vendor/pci_device id, as well as adding a new fixup for the used realtek ALC289. The fixup stets the correct pin to get the headset mic correctly recognized on audio-jack.
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -6118,6 +6118,7 @@ enum {ALC269VC_FIXUP_ACER_HEADSET_MIC ,ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE ,ALC289_FIXUP_ASUS_G401 , +ALC289_FIXUP_ASUS_GA502 , ALC256_FIXUP_ACER_MIC_NO_PRESENCE, };
@@ -7335,6 +7336,13 @@ static const struct hda_fixup alc269_fix { } }, }, + [ALC289_FIXUP_ASUS_GA502] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x03a11020 }, /* headset mic with jack detect */ + { } + }, + }, [ALC256_FIXUP_ACER_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) {
@@ -7526,6 +7534,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1bbd ,"ASUS Z550MA" ,ALC255_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1c23 ,"Asus X55U" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x1043 ,0x1ccd ,"ASUS X555UB" ,ALC256_FIXUP_ASUS_MIC ), +SND_PCI_QUIRK (0x1043 ,0x1e11 ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA502 ),SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_G401 ),SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
Greg Kroah-Hartman
maintainerPATCH 5/120 ALSA: hda/realtek: typo_fix: enable headset mic of ASUS ROG Zephyrus G14(GA401) series with ALC289
In reply to Greg Kroah-HartmanFrom: Armas Spann <[email protected]>
commit 293a92c1d9913248b9987b68f3a5d6d2f0aae62b upstream.
This patch fixes a small typo I accidently submitted with the initial patch. The board should be named GA401 not G401.
--- sound/pci/hda/patch_realtek.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/pci/hda/patch_realtek.c +3 -3
@@ -6117,7 +6117,7 @@ enum {ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS ,ALC269VC_FIXUP_ACER_HEADSET_MIC ,ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE , -ALC289_FIXUP_ASUS_G401 , +ALC289_FIXUP_ASUS_GA401 ,ALC289_FIXUP_ASUS_GA502 , ALC256_FIXUP_ACER_MIC_NO_PRESENCE, };
@@ -7329,7 +7329,7 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id =ALC269_FIXUP_HEADSET_MIC }, - [ALC289_FIXUP_ASUS_G401] = { + [ALC289_FIXUP_ASUS_GA401] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl []) { { 0x19, 0x03a11020 }, /* headset mic with jack detect */
@@ -7535,7 +7535,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1c23 ,"Asus X55U" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x1043 ,0x1ccd ,"ASUS X555UB" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x1e11 ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA502 ), -SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_G401 ), +SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ),SND_PCI_QUIRK (0x1043 ,0x831a ,"ASUS P901" ,ALC269_FIXUP_STEREO_DMIC ), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
Greg Kroah-Hartman
maintainerPATCH 6/120 ALSA: hda/realtek: Fix add a "ultra_low_power" function for intel reference board (alc256)
In reply to Greg Kroah-HartmanFrom: PeiSen Hou <[email protected]>
commit 6fa38ef1534e7e9320aa15e329eb1404ab2f70ac upstream.
Intel requires to enable power saving mode for intel reference board (alc256)
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +1 -1
@@ -7555,7 +7555,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x10cf ,0x1629 ,"Lifebook U7x7" , ALC255_FIXUP_LIFEBOOK_U7x7_HEADSET_MIC),SND_PCI_QUIRK (0x10cf ,0x1845 ,"Lifebook U904" ,ALC269_FIXUP_LIFEBOOK_EXTMIC ),SND_PCI_QUIRK (0x10ec ,0x10f2 ,"Intel Reference board" ,ALC700_FIXUP_INTEL_REFERENCE ), -SND_PCI_QUIRK (0x10ec ,0x1230 ,"Intel Reference board" ,ALC225_FIXUP_HEADSET_JACK ), +SND_PCI_QUIRK (0x10ec ,0x1230 ,"Intel Reference board" ,ALC295_FIXUP_CHROME_BOOK ),SND_PCI_QUIRK (0x10f7 ,0x8338 ,"Panasonic CF-SZ6" ,ALC269_FIXUP_HEADSET_MODE ),SND_PCI_QUIRK (0x144d ,0xc109 ,"Samsung Ativ book 9 (NP900X3G)" ,ALC269_FIXUP_INV_DMIC ), SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET),
Greg Kroah-Hartman
maintainerPATCH 7/120 ALSA: hda/realtek - Fixed HP right speaker no sound
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit 5649625344fe1f4695eace7c37d011e317bf66d5 upstream.
HP NB right speaker had no sound output.
This platform was connected to I2S Amp for speaker out.(None Realtek I2S Amp IC) EC need to check codec GPIO1 pin to initial I2S Amp.
--- sound/pci/hda/patch_realtek.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +18 -1
@@ -5940,6 +5940,16 @@ static void alc_fixup_disable_mic_vref(ssnd_hda_codec_set_pin_target (codec,0x19 ,PIN_VREFHIZ ); } +static void alc285_fixup_hp_gpio_amp_init (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +if (action !=HDA_FIXUP_ACT_INIT ) +return ; + +msleep (100 ); +alc_write_coef_idx (codec,0x65 ,0x0 ); +} +/* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c"
@@ -6120,6 +6130,7 @@ enum {ALC289_FIXUP_ASUS_GA401 ,ALC289_FIXUP_ASUS_GA502 ,ALC256_FIXUP_ACER_MIC_NO_PRESENCE , + ALC285_FIXUP_HP_GPIO_AMP_INIT, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7352,6 +7363,12 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id =ALC256_FIXUP_ASUS_HEADSET_MODE }, + [ALC285_FIXUP_HP_GPIO_AMP_INIT] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_hp_gpio_amp_init, + .chained = true, + .chain_id =ALC285_FIXUP_HP_GPIO_LED + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7502,7 +7519,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x84e7 ,"HP Pavilion 15" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x869d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ), -SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x877a ,"HP" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x877d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED ), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
Greg Kroah-Hartman
maintainerPATCH 8/120 ALSA: hda: Workaround for spurious wakeups on some Intel platforms
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit a6630529aecb5a3e84370c376ed658e892e6261e upstream.
We've received a regression report on Intel HD-audio controller that wakes up immediately after S3 suspend. The bisection leads to the commit c4c8dd6ef807 ("ALSA: hda: Skip controller resume if not needed"). This commit replaces the system-suspend to use pm_runtime_force_suspend() instead of the direct call of __azx_runtime_suspend(). However, by some really mysterious reason, pm_runtime_force_suspend() causes a spurious wakeup (although it calls the same __azx_runtime_suspend() internally).
As an ugly workaround for now, revert the behavior to call __azx_runtime_suspend() and __azx_runtime_resume() for those old Intel platforms that may exhibit such a problem, while keeping the new standard pm_runtime_force_suspend() and pm_runtime_force_resume() pair for the remaining chips.
--- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-)
sound/pci/hda/hda_controller.h +1 -1
@@ -41,7 +41,7 @@/* 24 unused */ #define AZX_DCAPS_COUNT_LPIB_DELAY (1 << 25)/* Take LPIB as delay */ #define AZX_DCAPS_PM_RUNTIME (1 << 26)/* runtime PM support */ -/* 27 unused */ +#define AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP (1 << 27)/* Workaround for spurious wakeups after suspend */ #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28)/* CORBRP clears itself after reset */ #define AZX_DCAPS_NO_MSI64 (1 << 29)/* Stick to 32-bit MSIs */ #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30)/* capture and playback use separate stream tag */
sound/pci/hda/hda_intel.c +14 -3
@@ -298,7 +298,8 @@ enum {/* PCH for HSW/BDW; with runtime PM */ /* no i915 binding for this as HSW/BDW has another controller for HDMI */ #define AZX_DCAPS_INTEL_PCH \ - (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME) + (AZX_DCAPS_INTEL_PCH_BASE | AZX_DCAPS_PM_RUNTIME |\ + AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP)/* HSW HDMI */ #define AZX_DCAPS_INTEL_HASWELL \
@@ -1028,7 +1029,14 @@ static int azx_suspend(struct device *de chip = card->private_data; bus =azx_bus (chip);snd_power_change_state (card, SNDRV_CTL_POWER_D3hot); -pm_runtime_force_suspend (dev); +/* An ugly workaround: direct call of __azx_runtime_suspend() and +* __azx_runtime_resume() for old Intel platforms that suffer from +* spurious wakeups after S3 suspend +*/ +if (chip->driver_caps &AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP ) +__azx_runtime_suspend (chip); +else +pm_runtime_force_suspend (dev);if (bus->irq >=0 ) {free_irq (bus->irq, chip); bus->irq =-1 ;
@@ -1057,7 +1065,10 @@ static int azx_resume(struct device *devif (azx_acquire_irq (chip,1 ) <0 )return -EIO ; -pm_runtime_force_resume (dev); +if (chip->driver_caps &AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP ) +__azx_runtime_resume (chip, false); +else +pm_runtime_force_resume (dev);snd_power_change_state (card,SNDRV_CTL_POWER_D0 );trace_azx_resume (chip);
Greg Kroah-Hartman
maintainerPATCH 9/120 ALSA: hda/hdmi: Fix keep_power assignment for non-component devices
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c2c3657f0aedb8736a0fb7b2b1985adfb86e7802 upstream.
It's been reported that, when neither nouveau nor Nvidia graphics driver is used, the screen starts flickering. And, after comparing between the working case (stable 4.4.x) and the broken case, it turned out that the problem comes from the audio component binding. The Nvidia and AMD audio binding code clears the bus->keep_power flag whenever snd_hdac_acomp_init() succeeds. But this doesn't mean that the component is actually bound, but it merely indicates that it's ready for binding. So, when both nouveau and Nvidia are blacklisted or not ready, the driver keeps running without the audio component but also with bus->keep_power = false. This made the driver runtime PM kicked in and powering down when unused, which results in flickering in the graphics side, as it seems.
For fixing the bug, this patch moves the bus->keep_power flag change into generic_acomp_notifier_set() that is the function called from the master_bind callback of component ops; i.e. it's guaranteed that the binding succeeded.
--- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +1 -1
@@ -2439,6 +2439,7 @@ static void generic_acomp_notifier_set(smutex_lock (&spec->bind_lock); spec->use_acomp_notifier = use_acomp; spec->codec->relaxed_resume = use_acomp; + spec->codec->bus->keep_power =0 ;/* reprogram each jack detection logic depending on the notifier */ for (i =0 ; i < spec->num_pins; i++) reprogram_jack_detect(spec->codec,
@@ -2533,7 +2534,6 @@ static void generic_acomp_init(struct hdif (!snd_hdac_acomp_init (&codec->bus->core, &spec->drm_audio_ops, match_bound_vga,0 )) { spec->acomp_registered = true; - codec->bus->keep_power =0 ; } }
Greg Kroah-Hartman
maintainerPATCH 10/120 RDMA/mlx5: Fix prefetch memory leak if get_prefetchable_mr fails
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
commit 5351a56b1a4ceafd7a17ebfdf3cda430cdfd365d upstream.
destroy_prefetch_work() must always be called if the work is not going to be queued. The num_sge also should have been set to i, not i-1 which avoids the condition where it shouldn't have been called in the first place.
--- drivers/infiniband/hw/mlx5/odp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/infiniband/hw/mlx5/odp.c +2 -3
@@ -1798,9 +1798,7 @@ static bool init_prefetch_work(struct ib work->frags[i].mr =get_prefetchable_mr (pd, advice, sg_list[i].lkey);if (!work->frags[i].mr) { - work->num_sge = i -1 ; -if (i) -destroy_prefetch_work (work); + work->num_sge = i;return false; }
@@ -1866,6 +1864,7 @@ int mlx5_ib_advise_mr_prefetch(struct ib srcu_key =srcu_read_lock (&dev->odp_srcu);if (!init_prefetch_work (pd, advice, pf_flags, work, sg_list, num_sge)) {srcu_read_unlock (&dev->odp_srcu, srcu_key); +destroy_prefetch_work (work);return -EINVAL ; }queue_work (system_unbound_wq, &work->work);
Greg Kroah-Hartman
maintainerPATCH 11/120 IB/rdmavt: Fix RQ counting issues causing use of an invalid RWQE
In reply to Greg Kroah-HartmanFrom: Mike Marciniszyn <[email protected]>
commit 54a485e9ec084da1a4b32dcf7749c7d760ed8aa5 upstream.
The lookaside count is improperly initialized to the size of the Receive Queue with the additional +1. In the traces below, the RQ size is 384, so the count was set to 385.
The lookaside count is then rarely refreshed. Note the high and incorrect count in the trace below:
rvt_get_rwqe: [hfi1_0] wqe ffffc900078e9008 wr_id 55c7206d75a0 qpn c
qpt 2 pid 3018 num_sge 1 head 1 tail 0, count 385
rvt_get_rwqe: (hfi1_rc_rcv+0x4eb/0x1480 [hfi1] <- rvt_get_rwqe) ret=0x1
The head,tail indicate there is only one RWQE posted although the count says 385 and we correctly return the element 0.
The next call to rvt_get_rwqe with the decremented count:
rvt_get_rwqe: [hfi1_0] wqe ffffc900078e9058 wr_id 0 qpn c
qpt 2 pid 3018 num_sge 0 head 1 tail 1, count 384
rvt_get_rwqe: (hfi1_rc_rcv+0x4eb/0x1480 [hfi1] <- rvt_get_rwqe) ret=0x1
Note that the RQ is empty (head == tail) yet we return the RWQE at tail 1, which is not valid because of the bogus high count.
Best case, the RWQE has never been posted and the rc logic sees an RWQE that is too small (all zeros) and puts the QP into an error state.
In the worst case, a server slow at posting receive buffers might fool rvt_get_rwqe() into fetching an old RWQE and corrupt memory.
Fix by deleting the faulty initialization code and creating an inline to fetch the posted count and convert all callers to use new inline.
--- drivers/infiniband/sw/rdmavt/qp.c | 33 ++++----------------------------- drivers/infiniband/sw/rdmavt/rc.c | 4 +--- include/rdma/rdmavt_qp.h | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 32 deletions(-)
drivers/infiniband/sw/rdmavt/qp.c +4 -29
@@ -898,8 +898,6 @@ static void rvt_init_qp(struct rvt_dev_i qp->s_tail_ack_queue =0 ; qp->s_acked_ack_queue =0 ; qp->s_num_rd_atomic =0 ; -if (qp->r_rq.kwq) - qp->r_rq.kwq->count = qp->r_rq.size; qp->r_sge.num_sge =0 ;atomic_set (&qp->s_reserved_used,0 ); }
@@ -2353,31 +2351,6 @@ bad_lkey: }/** -* get_count - count numbers of request work queue entries -* in circular buffer -* @rq: data structure for request queue entry -* @tail: tail indices of the circular buffer -* @head: head indices of the circular buffer -* -* Return - total number of entries in the circular buffer -*/ -static u32 get_count (struct rvt_rq *rq,u32 tail,u32 head) -{ -u32 count; - - count = head; - -if (count >= rq->size) - count =0 ; -if (count < tail) - count += rq->size - tail; -else - count -= tail; - -return count; -} - -/** * get_rvt_head - get head indices of the circular buffer * @rq: data structure for request queue entry * @ip: the QP
@@ -2451,7 +2424,7 @@ int rvt_get_rwqe(struct rvt_qp *qp, boolif (kwq->count <RVT_RWQ_COUNT_THRESHOLD ) { head =get_rvt_head (rq, ip); - kwq->count =get_count (rq, tail, head); + kwq->count =rvt_get_rq_count (rq, head, tail); }if (unlikely (kwq->count ==0 )) { ret =0 ;
@@ -2486,7 +2459,9 @@ int rvt_get_rwqe(struct rvt_qp *qp, bool* the number of remaining WQEs. */ if (kwq->count < srq->limit) { - kwq->count =get_count (rq, tail,get_rvt_head (rq, ip)); + kwq->count = +rvt_get_rq_count (rq, +get_rvt_head (rq, ip), tail);if (kwq->count < srq->limit) {struct ib_event ev;
drivers/infiniband/sw/rdmavt/rc.c +1 -3
@@ -127,9 +127,7 @@ __be32 rvt_compute_aeth(struct rvt_qp *q* not atomic, which is OK, since the fuzziness is * resolved as further ACKs go out. */ - credits = head - tail; -if ((int )credits <0 ) - credits += qp->r_rq.size; + credits =rvt_get_rq_count (&qp->r_rq, head, tail); }/* * Binary search the credit table to find the code to
include/rdma/rdmavt_qp.h +19 -0
@@ -278,6 +278,25 @@ struct rvt_rq {spinlock_t lock____cacheline_aligned_in_smp ; }; +/** +* rvt_get_rq_count - count numbers of request work queue entries +* in circular buffer +* @rq: data structure for request queue entry +* @head: head indices of the circular buffer +* @tail: tail indices of the circular buffer +* +* Return - total number of entries in the Receive Queue +*/ + +static inline u32 rvt_get_rq_count (struct rvt_rq *rq,u32 head,u32 tail) +{ +u32 count = head - tail; + +if ((s32 )count <0 ) + count += rq->size; +return count; +} +/* * This structure holds the information that the send tasklet needs * to send a RDMA read response or atomic operation.
Greg Kroah-Hartman
maintainerPATCH 12/120 vhost/scsi: fix up req type endian-ness
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
commit 295c1b9852d000580786375304a9800bd9634d15 upstream.
vhost/scsi doesn't handle type conversion correctly for request type when using virtio 1.0 and up for BE, or cross-endian platforms.
Fix it up using vhost_32_to_cpu.
--- drivers/vhost/scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/scsi.c +1 -1
@@ -1215,7 +1215,7 @@ vhost_scsi_ctl_handle_vq(struct vhost_sccontinue ; } -switch (v_req.type) { +switch (vhost32_to_cpu (vq, v_req.type)) {case VIRTIO_SCSI_T_TMF : vc.req = &v_req.tmf; vc.req_size =sizeof (struct virtio_scsi_ctrl_tmf_req );
Greg Kroah-Hartman
maintainerPATCH 13/120 9p/trans_fd: Fix concurrency del of req_list in p9_fd_cancelled/p9_read_work
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
commit 74d6a5d5662975aed7f25952f62efbb6f6dadd29 upstream.
p9_read_work and p9_fd_cancelled may be called concurrently. In some cases, req->req_list may be deleted by both p9_read_work and p9_fd_cancelled.
We can fix it by ignoring replies associated with a cancelled request and ignoring cancelled request if message has been received before lock.
--- net/9p/trans_fd.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/9p/trans_fd.c +14 -1
@@ -362,6 +362,10 @@ static void p9_read_work(struct work_strif (m->rreq->status ==REQ_STATUS_SENT ) {list_del (&m->rreq->req_list);p9_client_cb (m->client, m->rreq,REQ_STATUS_RCVD ); + }else if (m->rreq->status ==REQ_STATUS_FLSHD ) { +/* Ignore replies associated with a cancelled request. */ +p9_debug (P9_DEBUG_TRANS , +"Ignore replies associated with a cancelled request\n" ); }else {spin_unlock (&m->client->lock); p9_debug(P9_DEBUG_ERROR,
@@ -703,11 +707,20 @@ static int p9_fd_cancelled(struct p9_cli {p9_debug (P9_DEBUG_TRANS ,"client %p req %p\n" , client, req); +spin_lock (&client->lock); +/* Ignore cancelled request if message has been received +* before lock. +*/ +if (req->status ==REQ_STATUS_RCVD ) { +spin_unlock (&client->lock); +return 0 ; + } +/* we haven't received a response for oldreq, * remove it from the list. */ -spin_lock (&client->lock);list_del (&req->req_list); + req->status =REQ_STATUS_FLSHD ;spin_unlock (&client->lock);p9_req_put (req);
Greg Kroah-Hartman
maintainerPATCH 14/120 revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present")
In reply to Greg Kroah-HartmanFrom: Paul Moore <[email protected]>
commit 8ac68dc455d9d18241d44b96800d73229029ed34 upstream.
Unfortunately the commit listed in the subject line above failed to ensure that the task's audit_context was properly initialized/set before enabling the "accompanying records". Depending on the situation, the resulting audit_context could have invalid values in some of it's fields which could cause a kernel panic/oops when the task/syscall exists and the audit records are generated.
We will revisit the original patch, with the necessary fixes, in a future kernel but right now we just want to fix the kernel panic with the least amount of added risk.
--- kernel/audit.c | 1 - kernel/audit.h | 8 -------- kernel/auditsc.c | 3 +++ 3 files changed, 3 insertions(+), 9 deletions(-)
kernel/audit.c +0 -1
@@ -1811,7 +1811,6 @@ struct audit_buffer *audit_log_start(str }audit_get_stamp (ab->ctx, &t, &serial); -audit_clear_dummy (ab->ctx);audit_log_format (ab,"audit(%llu.%03lu:%u): " , (unsigned long long )t.tv_sec, t.tv_nsec/1000000 , serial);
kernel/audit.h +0 -8
@@ -290,13 +290,6 @@ extern int audit_signal_info_syscall(strextern void audit_filter_inodes (struct task_struct *tsk,struct audit_context *ctx);extern struct list_head *audit_killed_trees (void ); - -static inline void audit_clear_dummy (struct audit_context *ctx) -{ -if (ctx) - ctx->dummy =0 ; -} -#else /* CONFIG_AUDITSYSCALL */ #define auditsc_get_stamp (c, t, s) 0#define audit_put_watch (w) {}
@@ -330,7 +323,6 @@ static inline int audit_signal_info_sysc }#define audit_filter_inodes (t, c) AUDIT_DISABLED -#define audit_clear_dummy (c) {}#endif /* CONFIG_AUDITSYSCALL */ extern char *audit_unpack_string (void **bufp,size_t *remain,size_t len);
kernel/auditsc.c +3 -0
@@ -1406,6 +1406,9 @@ static void audit_log_proctitle(void)struct audit_context *context =audit_context ();struct audit_buffer *ab; +if (!context || context->dummy) +return ; + ab =audit_log_start (context,GFP_KERNEL ,AUDIT_PROCTITLE );if (!ab)return ;/* audit_panic or being filtered */
Greg Kroah-Hartman
maintainerPATCH 15/120 ARM: 8986/1: hw_breakpoint: Dont invoke overflow handler on uaccess watchpoints
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit eec13b42d41b0f3339dcf0c4da43734427c68620 upstream.
Unprivileged memory accesses generated by the so-called "translated" instructions (e.g. LDRT) in kernel mode can cause user watchpoints to fire unexpectedly. In such cases, the hw_breakpoint logic will invoke the user overflow handler which will typically raise a SIGTRAP back to the current task. This is futile when returning back to the kernel because (a) the signal won't have been delivered and (b) userspace can't handle the thing anyway.
Avoid invoking the user overflow handler for watchpoints triggered by kernel uaccess routines, and instead single-step over the faulting instruction as we would if no overflow handler had been installed.
--- arch/arm/kernel/hw_breakpoint.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
arch/arm/kernel/hw_breakpoint.c +22 -5
@@ -683,6 +683,12 @@ static void disable_single_step(struct parch_install_hw_breakpoint (bp); } +static int watchpoint_fault_on_uaccess (struct pt_regs *regs, +struct arch_hw_breakpoint *info) +{ +return !user_mode (regs) && info->ctrl.privilege ==ARM_BREAKPOINT_USER ; +} +static void watchpoint_handler (unsigned long addr,unsigned int fsr,struct pt_regs *regs) {
@@ -742,16 +748,27 @@ static void watchpoint_handler(unsigned }pr_debug ("watchpoint fired: address = 0x%x\n" , info->trigger); + +/* +* If we triggered a user watchpoint from a uaccess routine, +* then handle the stepping ourselves since userspace really +* can't help us with this. +*/ +if (watchpoint_fault_on_uaccess (regs, info)) + goto step; +perf_bp_event (wp, regs);/* -* If no overflow handler is present, insert a temporary -* mismatch breakpoint so we can single-step over the -* watchpoint trigger. +* Defer stepping to the overflow handler if one is installed. +* Otherwise, insert a temporary mismatch breakpoint so that +* we can single-step over the watchpoint trigger. */ -if (is_default_overflow_handler (wp)) -enable_single_step (wp,instruction_pointer (regs)); +if (!is_default_overflow_handler (wp)) + goto unlock; +step: +enable_single_step (wp,instruction_pointer (regs)); unlock:rcu_read_unlock (); }
Greg Kroah-Hartman
maintainerPATCH 16/120 ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
In reply to Greg Kroah-HartmanFrom: Jaedon Shin <[email protected]>
commit 4405bdf3c57ec28d606bdf5325f1167505bfdcd4 upstream.
__vdso_*() should be removed and fallback used if CNTCVT is not available by cntvct_functional(). __vdso_clock_gettime64 when added previous commit is using the incorrect CNTCVT value in that state. __vdso_clock_gettime64 is also added to remove it's symbol.
--- arch/arm/kernel/vdso.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/kernel/vdso.c +1 -0
@@ -184,6 +184,7 @@ static void __init patch_vdso(void *ehdrif (!cntvct_ok) {vdso_nullpatch_one (&einfo,"__vdso_gettimeofday" );vdso_nullpatch_one (&einfo,"__vdso_clock_gettime" ); +vdso_nullpatch_one (&einfo,"__vdso_clock_gettime64" ); } }
Greg Kroah-Hartman
maintainerPATCH 17/120 ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
commit d36f260718d83928e6012247a7e1b9791cdb12ff upstream.
Commit 0672d22a1924 ("ARM: dts: imx: Fix the AR803X phy-mode") fixed the phy-mode for fec1, but missed to fix it for the fec2 node.
Fix fec2 to also use "rgmii-id" as the phy-mode.
--- arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6sx-sabreauto.dts +1 -1
@@ -99,7 +99,7 @@ &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy0>; fsl,magic-packet; status = "okay";
Greg Kroah-Hartman
maintainerPATCH 18/120 ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
commit c696afd331be1acb39206aba53048f2386b781fc upstream.
Commit 0672d22a1924 ("ARM: dts: imx: Fix the AR803X phy-mode") fixed the phy-mode for fec1, but missed to fix it for the fec2 node.
Fix fec2 to also use "rgmii-id" as the phy-mode.
--- arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx6sx-sdb.dtsi +1 -1
@@ -213,7 +213,7 @@ &fec2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet2>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy2>; status = "okay"; };
Greg Kroah-Hartman
maintainerPATCH 19/120 ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect
In reply to Greg Kroah-HartmanFrom: Michael Trimarchi <[email protected]>
commit 4a601da92c2a782e5c022680d476104586b74994 upstream.
The current pin muxing scheme muxes GPIO_1 pad for USB_OTG_ID because of which when card is inserted, usb otg is enumerated and the card is never detected.
[ 64.492645] cfg80211: failed to load regulatory.db [ 64.492657] imx-sdma 20ec000.sdma: external firmware not found, using ROM firmware [ 76.343711] ci_hdrc ci_hdrc.0: EHCI Host Controller [ 76.349742] ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 2 [ 76.388862] ci_hdrc ci_hdrc.0: USB 2.0 started, EHCI 1.00 [ 76.396650] usb usb2: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.08 [ 76.405412] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 [ 76.412763] usb usb2: Product: EHCI Host Controller [ 76.417666] usb usb2: Manufacturer: Linux 5.8.0-rc1-next-20200618 ehci_hcd [ 76.424623] usb usb2: SerialNumber: ci_hdrc.0 [ 76.431755] hub 2-0:1.0: USB hub found [ 76.435862] hub 2-0:1.0: 1 port detected
The TRM mentions GPIO_1 pad should be muxed/assigned for card detect and ENET_RX_ER pad for USB_OTG_ID for proper operation.
This patch fixes pin muxing as per TRM and is tested on a i.Core 1.5 MX6 DL SOM.
[ 22.449165] mmc0: host does not support reading read-only switch, assuming write-enable [ 22.459992] mmc0: new high speed SDHC card at address 0001 [ 22.469725] mmcblk0: mmc0:0001 EB1QT 29.8 GiB [ 22.478856] mmcblk0: p1 p2
--- arch/arm/boot/dts/imx6qdl-icore.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6qdl-icore.dtsi +2 -1
@@ -397,7 +397,7 @@ pinctrl_usbotg: usbotggrp { fsl,pins = < - MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 >; };
@@ -409,6 +409,7 @@ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070 MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070 MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070 + MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x1b0b0 >; };
Greg Kroah-Hartman
maintainerPATCH 20/120 virtio_balloon: fix up endian-ness for free cmd id
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
commit 168c358af2f8c5a37f8b5f877ba2cc93995606ee upstream.
free cmd id is read using virtio endian, spec says all fields in balloon are LE. Fix it up.
--- drivers/virtio/virtio_balloon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/virtio/virtio_balloon.c +5 -1
@@ -578,10 +578,14 @@ static int init_vqs(struct virtio_balloostatic u32 virtio_balloon_cmd_id_received (struct virtio_balloon *vb) {if (test_and_clear_bit (VIRTIO_BALLOON_CONFIG_READ_CMD_ID , - &vb->config_read_bitmap)) + &vb->config_read_bitmap)) { virtio_cread(vb->vdev, struct virtio_balloon_config, free_page_hint_cmd_id, &vb->cmd_id_received_cache); +/* Legacy balloon config space is LE, unlike all other devices. */ +if (!virtio_has_feature (vb->vdev,VIRTIO_F_VERSION_1 )) + vb->cmd_id_received_cache =le32_to_cpu ((__force __le32 )vb->cmd_id_received_cache); + }return vb->cmd_id_received_cache; }
Greg Kroah-Hartman
maintainerPATCH 21/120 random32: update the net random state on interrupt and activity
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit f227e3ec3b5cad859ad15666874405e8c1bbc1d4 upstream.
This modifies the first 32 bits out of the 128 bits of a random CPU's net_rand_state on interrupt or CPU activity to complicate remote observations that could lead to guessing the network RNG's internal state.
Note that depending on some network devices' interrupt rate moderation or binding, this re-seeding might happen on every packet or even almost never.
In addition, with NOHZ some CPUs might not even get timer interrupts, leaving their local state rarely updated, while they are running networked processes making use of the random state. For this reason, we also perform this update in update_process_times() in order to at least update the state when there is user or system activity, since it's the only case we care about.
--- drivers/char/random.c | 1 + include/linux/random.h | 3 +++ kernel/time/timer.c | 8 ++++++++ lib/random32.c | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-)
drivers/char/random.c +1 -0
@@ -1277,6 +1277,7 @@ void add_interrupt_randomness(int irq, ifast_mix (fast_pool);add_interrupt_bench (cycles); +this_cpu_add (net_rand_state.s1, fast_pool->pool[cycles &3 ]);if (unlikely (crng_init ==0 )) { if ((fast_pool->count >= 64) &&
include/linux/random.h +3 -0
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/list.h> #include <linux/once.h> +#include <linux/percpu.h> #include <uapi/linux/random.h>
@@ -119,6 +120,8 @@ struct rnd_state {__u32 s1, s2, s3, s4; }; +DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +u32 prandom_u32_state (struct rnd_state *state);void prandom_bytes_state (struct rnd_state *state,void *buf,size_t nbytes);void prandom_seed_full_state (struct rnd_state __percpu *pcpu_state);
kernel/time/timer.c +8 -0
@@ -43,6 +43,7 @@#include <linux/sched/debug.h> #include <linux/slab.h> #include <linux/compat.h> +#include <linux/random.h> #include <linux/uaccess.h> #include <asm/unistd.h>
@@ -1743,6 +1744,13 @@ void update_process_times(int user_tick)scheduler_tick ();if (IS_ENABLED (CONFIG_POSIX_TIMERS ))run_posix_cpu_timers (); + +/* The current CPU might make use of net randoms without receiving IRQs +* to renew them often enough. Let's update the net_rand_state from a +* non-constant value that's not affine to the number of calls to make +* sure it's updated when there's some activity (we don't care in idle). +*/ +this_cpu_add (net_rand_state.s1,rol32 (jiffies,24 ) + user_tick); }/**
lib/random32.c +1 -1
@@ -48,7 +48,7 @@ static inline void prandom_state_selftes }#endif -static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;/** * prandom_u32_state - seeded pseudo-random number generator.
Re: [PATCH 5.7 021/120] random32: update the net random state on interrupt and activity
Hi Greg,
Quoted 8 lines · Greg Kroah-Hartman
From: Willy Tarreau <[email protected]>
commit
f227e3ec3b5cad859ad15666874405e8c1bbc1d4upstream.This modifies the first 32 bits out of the 128 bits of a random CPU's
net_rand_stateon interrupt or CPU activity to complicate remote observations that could lead to guessing the network RNG's internal state.
(...)
Stephen reported at least one powerpc build breakage with this one, and Michael suggested a yet unmerged fix. Thus I'm wondering if we shouldn't postpone inclusion of these 3 random32 backports to stable to give some time to stabilize them and avoid breaking setups.
Just my two cents,
Willy
Greg Kroah-Hartman
maintainerPATCH 22/120 ARM: percpu.h: fix build error
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
commit aa54ea903abb02303bf55855fb51e3fcee135d70 upstream.
Fix build error for the case:
defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6)
config: keystone_defconfig
CC arch/arm/kernel/signal.o
In file included from ../include/linux/random.h:14,
from ../arch/arm/kernel/signal.c:8:
../arch/arm/include/asm/percpu.h: In function ‘__my_cpu_offset’:
../arch/arm/include/asm/percpu.h:29:34: error: ‘current_stack_pointer’ undeclared (first use in this function); did you mean ‘user_stack_pointer’?
: "Q" (*(const unsigned long *)current_stack_pointer));
^~~~~~~~~~~~~~~~~~~~~
user_stack_pointer--- arch/arm/include/asm/percpu.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/include/asm/percpu.h +2 -0
@@ -5,6 +5,8 @@#ifndef _ASM_ARM_PERCPU_H_#define _ASM_ARM_PERCPU_H_ +#include <asm/thread_info.h> +/* * Same as asm-generic/percpu.h, except that we store the per cpu offset * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7
Greg Kroah-Hartman
maintainerPATCH 23/120 Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit 87004abfbc27261edd15716515d89ab42198b405 upstream.
This regressed some working configurations so revert it. Will fix this properly for 5.9 and backport then.
This reverts commit 38e0c89a19fd13f28d2b4721035160a3e66e270b.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +6 -3
@@ -775,7 +775,8 @@ static ssize_t amdgpu_set_pp_od_clk_volt tmp_str++;while (isspace (*++tmp_str)); -while ((sub_str =strsep (&tmp_str, delimiter)) !=NULL ) { +while (tmp_str[0 ]) { + sub_str =strsep (&tmp_str, delimiter); ret =kstrtol (sub_str,0 , ¶meter[parameter_size]);if (ret)return -EINVAL ;
@@ -1035,7 +1036,8 @@ static ssize_t amdgpu_read_mask(const chmemcpy (buf_cpy, buf, bytes); buf_cpy[bytes] ='\0' ; tmp = buf_cpy; -while ((sub_str =strsep (&tmp, delimiter)) !=NULL ) { +while (tmp[0 ]) { + sub_str =strsep (&tmp, delimiter);if (strlen (sub_str)) { ret =kstrtol (sub_str,0 , &level);if (ret)
@@ -1632,7 +1634,8 @@ static ssize_t amdgpu_set_pp_power_profi i++;memcpy (buf_cpy, buf, count-i); tmp_str = buf_cpy; -while ((sub_str =strsep (&tmp_str, delimiter)) !=NULL ) { +while (tmp_str[0 ]) { + sub_str =strsep (&tmp_str, delimiter); ret =kstrtol (sub_str,0 , ¶meter[parameter_size]);if (ret)return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 24/120 drm/amd/display: Clear dm_state for fast updates
In reply to Greg Kroah-HartmanFrom: Mazin Rezk <[email protected]>
commit fde9f39ac7f1ffd799a96ffa1e06b2051f0898f1 upstream.
This patch fixes a race condition that causes a use-after-free during amdgpu_dm_atomic_commit_tail. This can occur when 2 non-blocking commits are requested and the second one finishes before the first. Essentially, this bug occurs when the following sequence of events happens:
1. Non-blocking commit #1 is requested w/ a new dm_state #1 and is deferred to the workqueue.
2. Non-blocking commit #2 is requested w/ a new dm_state #2 and is deferred to the workqueue.
3. Commit #2 starts before commit #1, dm_state #1 is used in the commit_tail and commit #2 completes, freeing dm_state #1.
4. Commit #1 starts after commit #2 completes, uses the freed dm_state 1 and dereferences a freelist pointer while setting the context.
Since this bug has only been spotted with fast commits, this patch fixes the bug by clearing the dm_state instead of using the old dc_state for fast updates. In addition, since dm_state is only used for its dc_state and amdgpu_dm_atomic_commit_tail will retain the dc_state if none is found, removing the dm_state should not have any consequences in fast updates.
This use-after-free bug has existed for a while now, but only caused a noticeable issue starting from 5.7-rc1 due to 3202fa62f ("slub: relocate freelist pointer to middle of object") moving the freelist pointer from dm_state->base (which was unused) to dm_state->context (which is dereferenced).
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207383
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 ++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +27 -9
@@ -8489,20 +8489,38 @@ static int amdgpu_dm_atomic_check(struct* the same resource. If we have a new DC context as part of * the DM atomic state from validation we need to free it and * retain the existing one instead. +* +* Furthermore, since the DM atomic state only contains the DC +* context and can safely be annulled, we can free the state +* and clear the associated private object now to free +* some memory and avoid a possible use-after-free later. */ -struct dm_atomic_state *new_dm_state, *old_dm_state; - new_dm_state =dm_atomic_get_new_state (state); - old_dm_state =dm_atomic_get_old_state (state); +for (i =0 ; i < state->num_private_objs; i++) { +struct drm_private_obj *obj = state->private_objs[i].ptr; -if (new_dm_state && old_dm_state) { -if (new_dm_state->context) -dc_release_state (new_dm_state->context); +if (obj->funcs == adev->dm.atomic_obj.funcs) { +int j = state->num_private_objs-1 ; - new_dm_state->context = old_dm_state->context; +dm_atomic_destroy_state (obj, + state->private_objs[i].state); -if (old_dm_state->context) -dc_retain_state (old_dm_state->context); +/* If i is not at the end of the array then the +* last element needs to be moved to where i was +* before the array can safely be truncated. +*/ +if (i != j) + state->private_objs[i] = + state->private_objs[j]; + + state->private_objs[j].ptr =NULL ; + state->private_objs[j].state =NULL ; + state->private_objs[j].old_state =NULL ; + state->private_objs[j].new_state =NULL ; + + state->num_private_objs = j; +break ; + } } }
Greg Kroah-Hartman
maintainerPATCH 25/120 drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit 543e8669ed9bfb30545fd52bc0e047ca4df7fb31 upstream.
Compiler leaves a 4-byte hole near the end of dev_info, causing amdgpu_info_ioctl() to copy uninitialized kernel stack memory to userspace when size is greater than 356.
In 2015 we tried to fix this issue by doing = {}; on dev_info, which unfortunately does not initialize that 4-byte hole. Fix it by using memset() instead.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -1
@@ -692,9 +692,10 @@ static int amdgpu_info_ioctl(struct drm_return n ? -EFAULT :0 ; }case AMDGPU_INFO_DEV_INFO : { -struct drm_amdgpu_info_device dev_info = {}; +struct drm_amdgpu_info_device dev_info;uint64_t vm_size; +memset (&dev_info,0 ,sizeof (dev_info)); dev_info.device_id = dev->pdev->device; dev_info.chip_rev = adev->rev_id; dev_info.external_rev = adev->external_rev_id;
Greg Kroah-Hartman
maintainerPATCH 26/120 drm/dbi: Fix SPI Type 1 (9-bit) transfer
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 900ab59e2621053b009f707f80b2c19ce0af5dee upstream.
The function mipi_dbi_spi1_transfer() will transfer its payload as 9-bit data, the 9th (MSB) bit being the data/command bit. In order to do that, it unpacks the 8-bit values into 16-bit values, then sets the 9th bit if the byte corresponds to data, clears it otherwise. The 7 MSB are padding. The array of now 16-bit values is then passed to the SPI core for transfer.
This function was broken since its introduction, as the length of the SPI transfer was set to the payload size before its conversion, but the payload doubled in size due to the 8-bit -> 16-bit conversion.
--- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_mipi_dbi.c +1 -1
@@ -938,7 +938,7 @@ static int mipi_dbi_spi1_transfer(struct } } - tr.len = chunk; + tr.len = chunk *2 ; len -= chunk; ret =spi_sync (spi, &m);
Greg Kroah-Hartman
maintainerPATCH 27/120 drm/mcde: Fix stability issue
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit aa7bf898d4bf921f61fab078040e8baec3f28126 upstream.
Whenever a display update was sent, apart from updating the memory base address, we called mcde_display_send_one_frame() which also sent a command to the display requesting the TE IRQ and enabling the FIFO.
When continuous updates are running this is wrong: we need to only send this to start the flow to the display on the very first update. This lead to the display pipeline locking up and crashing.
Check if the flow is already running and in that case do not call mcde_display_send_one_frame().
This fixes crashes on the Samsung GT-S7710 (Skomer).
--- drivers/gpu/drm/mcde/mcde_display.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/mcde/mcde_display.c +8 -3
@@ -1060,9 +1060,14 @@ static void mcde_display_update(struct d*/ if (fb) {mcde_set_extsrc (mcde,drm_fb_cma_get_gem_addr (fb, pstate,0 )); -if (!mcde->video_mode) -/* Send a single frame using software sync */ -mcde_display_send_one_frame (mcde); +if (!mcde->video_mode) { +/* +* Send a single frame using software sync if the flow +* is not active yet. +*/ +if (mcde->flow_active ==0 ) +mcde_display_send_one_frame (mcde); + }dev_info_once (mcde->dev,"sent first display update\n" ); }else {/*
Greg Kroah-Hartman
maintainerPATCH 28/120 drm: hold gem reference until object is no longer accessed
In reply to Greg Kroah-HartmanFrom: Steve Cohen <[email protected]>
commit 8490d6a7e0a0a6fab5c2d82d57a3937306660864 upstream.
A use-after-free in drm_gem_open_ioctl can happen if the GEM object handle is closed between the idr lookup and retrieving the size from said object since a local reference is not being held at that point. Hold the local reference while the object can still be accessed to fix this and plug the potential security hole.
--- drivers/gpu/drm/drm_gem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_gem.c +4 -6
@@ -872,9 +872,6 @@ err:* @file_priv: drm file-private structure * * Open an object using the global name, returning a handle and the size. -* -* This handle (of course) holds a reference to the object, so the object -* will not go away until the handle is deleted. */ int drm_gem_open_ioctl(struct drm_device *dev, void *data,
@@ -899,14 +896,15 @@ drm_gem_open_ioctl(struct drm_device *de/* drm_gem_handle_create_tail unlocks dev->object_name_lock. */ ret =drm_gem_handle_create_tail (file_priv, obj, &handle); -drm_gem_object_put_unlocked (obj);if (ret) -return ret; + goto err; args->handle = handle; args->size = obj->size; -return 0 ; +err: +drm_gem_object_put_unlocked (obj); +return ret; }/**
Greg Kroah-Hartman
maintainerPATCH 29/120 drm: of: Fix double-free bug
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
commit 4ee48cc5586bf519df19894273002aa8ef7b70ad upstream.
Fix double-free bug in the error path.
--- drivers/gpu/drm/drm_of.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/drm_of.c +1 -3
@@ -322,10 +322,8 @@ static int drm_of_lvds_get_remote_pixels* configurations by passing the endpoints explicitly to * drm_of_lvds_get_dual_link_pixel_order(). */ -if (!current_pt || pixels_type != current_pt) { -of_node_put (remote_port); +if (!current_pt || pixels_type != current_pt)return -EINVAL ; - } }return pixels_type;
Greg Kroah-Hartman
maintainerPATCH 30/120 random: fix circular include dependency on arm64 after addition of percpu.h
In reply to Greg Kroah-HartmanFrom: Willy Tarreau <[email protected]>
commit 1c9df907da83812e4f33b59d3d142c864d9da57f upstream.
Daniel Díaz and Kees Cook independently reported that commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity") broke arm64 due to a circular dependency on include files since the addition of percpu.h in random.h.
The correct fix would definitely be to move all the prandom32 stuff out of random.h but for backporting, a smaller solution is preferred.
This one replaces linux/percpu.h with asm/percpu.h, and this fixes the problem on x86_64, arm64, arm, and mips. Note that moving percpu.h around didn't change anything and that removing it entirely broke differently. When backporting, such options might still be considered if this patch fails to help.
[ It turns out that an alternate fix seems to be to just remove the
troublesome <asm/pointer_auth.h> remove from the arm64 <asm/smp.h> that causes the circular dependency.
But we might as well do the whole belt-and-suspenders thing, and minimize inclusion in <linux/random.h> too. Either will fix the
problem, and both are good changes. - Linus ]
--- include/linux/random.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/random.h +1 -1
@@ -11,7 +11,7 @@#include <linux/kernel.h> #include <linux/list.h> #include <linux/once.h> -#include <linux/percpu.h> +#include <asm/percpu.h> #include <uapi/linux/random.h>
Greg Kroah-Hartman
maintainerPATCH 31/120 random32: remove net_rand_state from the latent entropy gcc plugin
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit 83bdc7275e6206f560d247be856bceba3e1ed8f2 upstream.
It turns out that the plugin right now ends up being really unhappy about the change from 'static' to 'extern' storage that happened in commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity").
This is probably a trivial fix for the latent_entropy plugin, but for now, just remove net_rand_state from the list of things the plugin worries about.
--- include/linux/random.h | 2 +- lib/random32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/random.h +1 -1
@@ -120,7 +120,7 @@ struct rnd_state {__u32 s1, s2, s3, s4; }; -DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +DECLARE_PER_CPU(struct rnd_state, net_rand_state);u32 prandom_u32_state (struct rnd_state *state);void prandom_bytes_state (struct rnd_state *state,void *buf,size_t nbytes);
lib/random32.c +1 -1
@@ -48,7 +48,7 @@ static inline void prandom_state_selftes }#endif -DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +DEFINE_PER_CPU(struct rnd_state, net_rand_state);/** * prandom_u32_state - seeded pseudo-random number generator.
Greg Kroah-Hartman
maintainerPATCH 32/120 rds: Prevent kernel-infoleak in rds_notify_queue_get()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
commit bbc8a99e952226c585ac17477a85ef1194501762 upstream.
rds_notify_queue_get() is potentially copying uninitialized kernel stack memory to userspace since the compiler may leave a 4-byte hole at the end of cmsg.
In 2016 we tried to fix this issue by doing = { 0 }; on cmsg, which unfortunately does not always initialize that 4-byte hole. Fix it by using memset() instead.
--- net/rds/recv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/rds/recv.c +2 -1
@@ -450,12 +450,13 @@ static int rds_still_queued(struct rds_sint rds_notify_queue_get (struct rds_sock *rs,struct msghdr *msghdr) {struct rds_notifier *notifier; -struct rds_rdma_notify cmsg = {0 };/* fill holes with zero */ +struct rds_rdma_notify cmsg;unsigned int count =0 , max_messages = ~0U ;unsigned long flags;LIST_HEAD (copy);int err =0 ; +memset (&cmsg,0 ,sizeof (cmsg));/* fill holes with zero */ /* put_cmsg copies to user space and thus may sleep. We can't do this * with rs_lock held, so first grab as many notifications as we can stuff
Greg Kroah-Hartman
maintainerPATCH 33/120 libtraceevent: Fix build with binutils 2.35
In reply to Greg Kroah-HartmanFrom: Ben Hutchings <[email protected]>
commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71 upstream.
In binutils 2.35, 'nm -D' changed to show symbol versions along with symbol names, with the usual @@ separator. When generating libtraceevent-dynamic-list we need just the names, so strip off the version suffix if present.
--- tools/lib/traceevent/plugins/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/traceevent/plugins/Makefile +1 -1
@@ -197,7 +197,7 @@ define do_generate_dynamic_list_file xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ if [ "$$symbol_type" = "U W" ];then \ (echo '{'; \ - $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ + $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\ echo '};'; \ ) > $2; \ else \
Greg Kroah-Hartman
maintainerPATCH 34/120 net/x25: Fix x25_neigh refcnt leak when x25 disconnect
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
commit 4becb7ee5b3d2829ed7b9261a245a77d5b7de902 upstream.
x25_connect() invokes x25_get_neigh(), which returns a reference of the specified x25_neigh object to "x25->neighbour" with increased refcnt.
When x25 connect success and returns, the reference still be hold by "x25->neighbour", so the refcount should be decreased in x25_disconnect() to keep refcount balanced.
The reference counting issue happens in x25_disconnect(), which forgets to decrease the refcnt increased by x25_get_neigh() in x25_connect(), causing a refcnt leak.
Fix this issue by calling x25_neigh_put() before x25_disconnect() returns.
--- net/x25/x25_subr.c | 4 ++++ 1 file changed, 4 insertions(+)
net/x25/x25_subr.c +4 -0
@@ -363,6 +363,10 @@ void x25_disconnect(struct sock *sk, int x25->neighbour =NULL ;read_unlock_bh (&x25_list_lock); } +read_lock_bh (&x25_list_lock); +x25_neigh_put (x25->neighbour); + x25->neighbour =NULL ; +read_unlock_bh (&x25_list_lock); }/*
Greg Kroah-Hartman
maintainerPATCH 35/120 net/x25: Fix null-ptr-deref in x25_disconnect
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 8999dc89497ab1c80d0718828e838c7cd5f6bffe upstream.
We should check null before do x25_neigh_put in x25_disconnect, otherwise may cause null-ptr-deref like this:
#include <sys/socket.h>
#include <linux/x25.h>
int main() {
int sck_x25;
sck_x25 = socket(AF_X25, SOCK_SEQPACKET, 0);
close(sck_x25);
return 0;}
BUG: kernel NULL pointer dereference, address: 00000000000000d8 CPU: 0 PID: 4817 Comm: t2 Not tainted 5.7.0-rc3+ #159 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3- RIP: 0010:x25_disconnect+0x91/0xe0 Call Trace: x25_release+0x18a/0x1b0 __sock_release+0x3d/0xc0 sock_close+0x13/0x20 __fput+0x107/0x270 ____fput+0x9/0x10 task_work_run+0x6d/0xb0 exit_to_usermode_loop+0x102/0x110 do_syscall_64+0x23c/0x260 entry_SYSCALL_64_after_hwframe+0x49/0xb3
--- net/x25/x25_subr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/x25/x25_subr.c +6 -4
@@ -363,10 +363,12 @@ void x25_disconnect(struct sock *sk, int x25->neighbour =NULL ;read_unlock_bh (&x25_list_lock); } -read_lock_bh (&x25_list_lock); -x25_neigh_put (x25->neighbour); - x25->neighbour =NULL ; -read_unlock_bh (&x25_list_lock); +if (x25->neighbour) { +read_lock_bh (&x25_list_lock); +x25_neigh_put (x25->neighbour); + x25->neighbour =NULL ; +read_unlock_bh (&x25_list_lock); + } }/*
Greg Kroah-Hartman
maintainerPATCH 36/120 xfrm: policy: match with both mark and mask on user interfaces
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 4f47e8ab6ab796b5380f74866fa5287aca4dcc58 ]
In commit ed17b8d377ea ("xfrm: fix a warning in xfrm_policy_insert_list"), it would take 'priority' to make a policy unique, and allow duplicated policies with different 'priority' to be added, which is not expected by userland, as Tobias reported in strongswan.
To fix this duplicated policies issue, and also fix the issue in commit ed17b8d377ea ("xfrm: fix a warning in xfrm_policy_insert_list"), when doing add/del/get/update on user interfaces, this patch is to change to look up a policy with both mark and mask by doing:
mark.v == pol->mark.v && mark.m == pol->mark.m
and leave the check:
(mark & pol->mark.m) == pol->mark.v
for tx/rx path only.
As the userland expects an exact mark and mask match to manage policies.
v1->v2:
- make xfrm_policy_mark_match inline and fix the changelog as Tobias suggested.
--- include/net/xfrm.h | 11 +++++++---- net/key/af_key.c | 4 ++-- net/xfrm/xfrm_policy.c | 39 ++++++++++++++++----------------------- net/xfrm/xfrm_user.c | 18 +++++++++++------- 4 files changed, 36 insertions(+), 36 deletions(-)
include/net/xfrm.h +7 -4
@@ -1633,13 +1633,16 @@ int xfrm_policy_walk(struct net *net, struct xfrm_policy_walk *walk, void *);void xfrm_policy_walk_done (struct xfrm_policy_walk *walk,struct net *net);int xfrm_policy_insert (int dir,struct xfrm_policy *policy,int excl); -struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net,u32 mark,u32 if_id, -u8 type,int dir, +struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net, +const struct xfrm_mark *mark, +u32 if_id,u8 type,int dir,struct xfrm_selector *sel,struct xfrm_sec_ctx *ctx,int delete,int *err); -struct xfrm_policy *xfrm_policy_byid (struct net *net,u32 mark,u32 if_id,u8 , -int dir,u32 id,int delete,int *err); +struct xfrm_policy *xfrm_policy_byid (struct net *net, +const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,u32 id,int delete, +int *err);int xfrm_policy_flush (struct net *net,u8 type,bool task_valid);void xfrm_policy_hash_rebuild (struct net *net);u32 xfrm_get_acqseq (void );
net/key/af_key.c +2 -2
@@ -2400,7 +2400,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, const struct sareturn err; } - xp =xfrm_policy_bysel_ctx (net,DUMMY_MARK ,0 ,XFRM_POLICY_TYPE_MAIN , + xp =xfrm_policy_bysel_ctx (net, &dummy_mark,0 ,XFRM_POLICY_TYPE_MAIN , pol->sadb_x_policy_dir -1 , &sel, pol_ctx,1 , &err);security_xfrm_policy_free (pol_ctx);
@@ -2651,7 +2651,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, const struct sadb_return -EINVAL ; delete = (hdr->sadb_msg_type ==SADB_X_SPDDELETE2 ); - xp =xfrm_policy_byid (net,DUMMY_MARK ,0 ,XFRM_POLICY_TYPE_MAIN , + xp =xfrm_policy_byid (net, &dummy_mark,0 ,XFRM_POLICY_TYPE_MAIN , dir, pol->sadb_x_policy_id, delete, &err);if (xp ==NULL )return -ENOENT ;
net/xfrm/xfrm_policy.c +16 -23
@@ -1433,14 +1433,10 @@ static void xfrm_policy_requeue(struct xfrm_policy *old,spin_unlock_bh (&pq->hold_queue.lock); } -static bool xfrm_policy_mark_match (struct xfrm_policy *policy, -struct xfrm_policy *pol) +static inline bool xfrm_policy_mark_match (const struct xfrm_mark *mark, +struct xfrm_policy *pol) { -if (policy->mark.v == pol->mark.v && - policy->priority == pol->priority) -return true; - -return false; +return mark->v == pol->mark.v && mark->m == pol->mark.m; }static u32 xfrm_pol_bin_key (const void *data,u32 len,u32 seed)
@@ -1503,7 +1499,7 @@ static void xfrm_policy_insert_inexact_list(struct hlist_head *chain,if (pol->type == policy->type && pol->if_id == policy->if_id && !selector_cmp (&pol->selector, &policy->selector) && -xfrm_policy_mark_match (policy, pol) && +xfrm_policy_mark_match (&policy->mark, pol) &&xfrm_sec_ctx_match (pol->security, policy->security) && !WARN_ON (delpol)) { delpol = pol;
@@ -1538,7 +1534,7 @@ static struct xfrm_policy *xfrm_policy_insert_list(struct hlist_head *chain,if (pol->type == policy->type && pol->if_id == policy->if_id && !selector_cmp (&pol->selector, &policy->selector) && -xfrm_policy_mark_match (policy, pol) && +xfrm_policy_mark_match (&policy->mark, pol) &&xfrm_sec_ctx_match (pol->security, policy->security) && !WARN_ON (delpol)) {if (excl)
@@ -1610,9 +1606,8 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)EXPORT_SYMBOL (xfrm_policy_insert);static struct xfrm_policy * -__xfrm_policy_bysel_ctx (struct hlist_head *chain,u32 mark,u32 if_id, -u8 type,int dir, -struct xfrm_selector *sel, +__xfrm_policy_bysel_ctx (struct hlist_head *chain,const struct xfrm_mark *mark, +u32 if_id,u8 type,int dir,struct xfrm_selector *sel,struct xfrm_sec_ctx *ctx) {struct xfrm_policy *pol;
@@ -1623,7 +1618,7 @@ __xfrm_policy_bysel_ctx(struct hlist_head *chain, u32 mark, u32 if_id,hlist_for_each_entry (pol, chain, bydst) {if (pol->type == type && pol->if_id == if_id && - (mark & pol->mark.m) == pol->mark.v && +xfrm_policy_mark_match (mark, pol) && !selector_cmp (sel, &pol->selector) &&xfrm_sec_ctx_match (ctx, pol->security))return pol;
@@ -1632,11 +1627,10 @@ __xfrm_policy_bysel_ctx(struct hlist_head *chain, u32 mark, u32 if_id,return NULL ; } -struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net,u32 mark,u32 if_id, -u8 type,int dir, -struct xfrm_selector *sel, -struct xfrm_sec_ctx *ctx,int delete, -int *err) +struct xfrm_policy * +xfrm_policy_bysel_ctx (struct net *net,const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,struct xfrm_selector *sel, +struct xfrm_sec_ctx *ctx,int delete,int *err) {struct xfrm_pol_inexact_bin *bin =NULL ;struct xfrm_policy *pol, *ret =NULL ;
@@ -1703,9 +1697,9 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u32 if_id, }EXPORT_SYMBOL (xfrm_policy_bysel_ctx); -struct xfrm_policy *xfrm_policy_byid (struct net *net,u32 mark,u32 if_id, -u8 type,int dir,u32 id,int delete, -int *err) +struct xfrm_policy * +xfrm_policy_byid (struct net *net,const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,u32 id,int delete,int *err) {struct xfrm_policy *pol, *ret;struct hlist_head *chain;
@@ -1720,8 +1714,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u32 if_id, ret =NULL ;hlist_for_each_entry (pol, chain, byidx) {if (pol->type == type && pol->index == id && - pol->if_id == if_id && - (mark & pol->mark.m) == pol->mark.v) { + pol->if_id == if_id &&xfrm_policy_mark_match (mark, pol)) {xfrm_pol_hold (pol);if (delete) { *err = security_xfrm_policy_delete(
net/xfrm/xfrm_user.c +11 -7
@@ -1863,7 +1863,6 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,struct km_event c;int delete;struct xfrm_mark m; -u32 mark =xfrm_mark_get (attrs, &m);u32 if_id =0 ; p =nlmsg_data (nlh);
@@ -1880,8 +1879,11 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,if (attrs[XFRMA_IF_ID ]) if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +xfrm_mark_get (attrs, &m); +if (p->index) - xp =xfrm_policy_byid (net, mark, if_id, type, p->dir, p->index, delete, &err); + xp =xfrm_policy_byid (net, &m, if_id, type, p->dir, + p->index, delete, &err);else {struct nlattr *rt = attrs[XFRMA_SEC_CTX ];struct xfrm_sec_ctx *ctx;
@@ -1898,8 +1900,8 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,if (err)return err; } - xp =xfrm_policy_bysel_ctx (net, mark, if_id, type, p->dir, &p->sel, - ctx, delete, &err); + xp =xfrm_policy_bysel_ctx (net, &m, if_id, type, p->dir, + &p->sel, ctx, delete, &err);security_xfrm_policy_free (ctx); }if (xp ==NULL )
@@ -2166,7 +2168,6 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,u8 type =XFRM_POLICY_TYPE_MAIN ;int err = -ENOENT ;struct xfrm_mark m; -u32 mark =xfrm_mark_get (attrs, &m);u32 if_id =0 ; err =copy_from_user_policy_type (&type, attrs);
@@ -2180,8 +2181,11 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,if (attrs[XFRMA_IF_ID ]) if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +xfrm_mark_get (attrs, &m); +if (p->index) - xp =xfrm_policy_byid (net, mark, if_id, type, p->dir, p->index,0 , &err); + xp =xfrm_policy_byid (net, &m, if_id, type, p->dir, p->index, +0 , &err);else {struct nlattr *rt = attrs[XFRMA_SEC_CTX ];struct xfrm_sec_ctx *ctx;
@@ -2198,7 +2202,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,if (err)return err; } - xp =xfrm_policy_bysel_ctx (net, mark, if_id, type, p->dir, + xp =xfrm_policy_bysel_ctx (net, &m, if_id, type, p->dir, &p->sel, ctx,0 , &err);security_xfrm_policy_free (ctx); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/120 ARM: dts sunxi: Relax a bit the CMA pool allocation range
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 92025b90f18d45e26b7f17d68756b1abd771b9d3 ]
The hardware codec on the A10, A10s, A13 and A20 needs buffer in the first 256MB of RAM. This was solved by setting the CMA pool at a fixed address in that range.
However, in recent kernels there's something else that comes in and reserve some range that end up conflicting with our default pool requirement, and thus makes its reservation fail.
The video codec will then use buffers from the usual default pool, outside of the range it can access, and will fail to decode anything.
Since we're only concerned about that 256MB, we can however relax the allocation to just specify the range that's allowed, and not try to enforce a specific address.
--- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +1 -1
@@ -198,7 +198,7 @@ default-pool { compatible = "shared-dma-pool"; size = <0x6000000>; - alloc-ranges = <0x4a000000 0x6000000>; + alloc-ranges = <0x40000000 0x10000000>; reusable; linux,cma-default; };
arch/arm/boot/dts/sun5i.dtsi +1 -1
@@ -117,7 +117,7 @@ default-pool { compatible = "shared-dma-pool"; size = <0x6000000>; - alloc-ranges = <0x4a000000 0x6000000>; + alloc-ranges = <0x40000000 0x10000000>; reusable; linux,cma-default; };
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -181,7 +181,7 @@ default-pool { compatible = "shared-dma-pool"; size = <0x6000000>; - alloc-ranges = <0x4a000000 0x6000000>; + alloc-ranges = <0x40000000 0x10000000>; reusable; linux,cma-default; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/120 pinctrl: qcom: Handle broken/missing PDC dual edge IRQs on sc7180
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit c3c0c2e18d943ec4a84162ac679970b592555a4a ]
Depending on how you look at it, you can either say that:
a) There is a PDC hardware issue (with the specific IP rev that exists on sc7180) that causes the PDC not to work properly when configured to handle dual edges.
b) The dual edge feature of the PDC hardware was only added in later HW revisions and thus isn't in all hardware.
Regardless of how you look at it, let's work around the lack of dual edge support by only ever letting our parent see requests for single edge interrupts on affected hardware.
NOTE: it's possible that a driver requesting a dual edge interrupt might get several edges coalesced into a single IRQ. For instance if a line starts low and then goes high and low again, the driver that requested the IRQ is not guaranteed to be called twice. However, it is guaranteed that once the driver's interrupt handler starts running its first instruction that any new edges coming in will cause the interrupt to fire again. This is relatively commonplace for dual-edge gpio interrupts (many gpio controllers require software to emulate dual edge with single edge) so client drivers should be setup to handle it.
--- drivers/pinctrl/qcom/Kconfig | 2 + drivers/pinctrl/qcom/pinctrl-msm.c | 74 ++++++++++++++++++++++++++- drivers/pinctrl/qcom/pinctrl-msm.h | 4 ++ drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 + 4 files changed, 79 insertions(+), 2 deletions(-)
drivers/pinctrl/qcom/Kconfig +2 -0
@@ -7,6 +7,8 @@ config PINCTRL_MSM select PINCONF select GENERIC_PINCONF select GPIOLIB_IRQCHIP + select IRQ_DOMAIN_HIERARCHY + select IRQ_FASTEOI_HIERARCHY_HANDLERS config PINCTRL_APQ8064 tristate "Qualcomm APQ8064 pin controller driver"
drivers/pinctrl/qcom/pinctrl-msm.c +72 -2
103 lines not on this page · raw message
drivers/pinctrl/qcom/pinctrl-msm.h +4 -0
@@ -113,6 +113,9 @@ struct msm_gpio_wakeirq_map {* @pull_no_keeper: The SoC does not support keeper bias. * @wakeirq_map: The map of wakeup capable GPIOs and the pin at PDC/MPM * @nwakeirq_map: The number of entries in @wakeirq_map +* @wakeirq_dual_edge_errata: If true then GPIOs using the wakeirq_map need +* to be aware that their parent can't handle dual +* edge interrupts. */ struct msm_pinctrl_soc_data {const struct pinctrl_pin_desc *pins;
@@ -128,6 +131,7 @@ struct msm_pinctrl_soc_data {const int *reserved_gpios;const struct msm_gpio_wakeirq_map *wakeirq_map;unsigned int nwakeirq_map; +bool wakeirq_dual_edge_errata; };extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;
drivers/pinctrl/qcom/pinctrl-sc7180.c +1 -0
@@ -1147,6 +1147,7 @@ static const struct msm_pinctrl_soc_data sc7180_pinctrl = { .ntiles = ARRAY_SIZE(sc7180_tiles), .wakeirq_map = sc7180_pdc_map, .nwakeirq_map = ARRAY_SIZE(sc7180_pdc_map), + .wakeirq_dual_edge_errata = true, };static int sc7180_pinctrl_probe (struct platform_device *pdev)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 39/120 espintcp: recv() should return 0 when the peer socket is closed
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit e229c877cde141a4c46cb603a341ce8c909e9a98 ]
man 2 recv says:
RETURN VALUE
When a stream socket peer has performed an orderly shutdown, the return value will be 0 (the traditional "end-of-file" return).
Currently, this works for blocking reads, but non-blocking reads will return -EAGAIN. This patch overwrites that return value when the peer won't send us any more data.
--- net/xfrm/espintcp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/xfrm/espintcp.c +4 -1
@@ -101,8 +101,11 @@ static int espintcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, flags |= nonblock ?MSG_DONTWAIT :0 ; skb =__skb_recv_datagram (sk, &ctx->ike_queue, flags, &off, &err); -if (!skb) +if (!skb) { +if (err == -EAGAIN && sk->sk_shutdown &RCV_SHUTDOWN ) +return 0 ;return err; + } copied = len;if (copied > skb->len)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 40/120 xfrm: Fix crash when the hold queue is used.
In reply to Greg Kroah-HartmanFrom: Steffen Klassert <[email protected]>
[ Upstream commit 101dde4207f1daa1fda57d714814a03835dccc3f ]
The commits "xfrm: Move dst->path into struct xfrm_dst" and "net: Create and use new helper xfrm_dst_child()." changed xfrm bundle handling under the assumption that xdst->path and dst->child are not a NULL pointer only if dst->xfrm is not a NULL pointer. That is true with one exception. If the xfrm hold queue is used to wait until a SA is installed by the key manager, we create a dummy bundle without a valid dst->xfrm pointer. The current xfrm bundle handling crashes in that case. Fix this by extending the NULL check of dst->xfrm with a test of the DST_XFRM_QUEUE flag.
--- include/net/xfrm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/xfrm.h +2 -2
@@ -946,7 +946,7 @@ struct xfrm_dst {static inline struct dst_entry *xfrm_dst_path (const struct dst_entry *dst) {#ifdef CONFIG_XFRM -if (dst->xfrm) { +if (dst->xfrm || (dst->flags &DST_XFRM_QUEUE )) {const struct xfrm_dst *xdst = (const struct xfrm_dst *) dst;return xdst->path;
@@ -958,7 +958,7 @@ static inline struct dst_entry *xfrm_dst_path(const struct dst_entry *dst)static inline struct dst_entry *xfrm_dst_child (const struct dst_entry *dst) {#ifdef CONFIG_XFRM -if (dst->xfrm) { +if (dst->xfrm || (dst->flags &DST_XFRM_QUEUE )) {struct xfrm_dst *xdst = (struct xfrm_dst *) dst;return xdst->child; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 41/120 ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 09781ba0395c46b1c844f47e405e3ce7856f5989 ]
To support the change in "phy: armada-38x: fix NETA lockup when repeatedly switching speeds" we need to update the DT with the additional register.
--- arch/arm/boot/dts/armada-38x.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/armada-38x.dtsi +2 -1
@@ -344,7 +344,8 @@ comphy: phy@18300 { compatible = "marvell,armada-380-comphy"; - reg = <0x18300 0x100>; + reg-names = "comphy", "conf"; + reg = <0x18300 0x100>, <0x18460 4>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 42/120 nvme-tcp: fix possible hang waiting for icresp response
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit adc99fd378398f4c58798a1c57889872967d56a6 ]
If the controller died exactly when we are receiving icresp we hang because icresp may never return. Make sure to set a high finite limit.
--- drivers/nvme/host/tcp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/host/tcp.c +3 -0
@@ -1392,6 +1392,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, } } +/* Set 10 seconds timeout for icresp recvmsg */ + queue->sock->sk->sk_rcvtimeo =10 *HZ ; + queue->sock->sk->sk_allocation =GFP_ATOMIC ;nvme_tcp_set_queue_io_cpu (queue); queue->request =NULL ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/120 selftests/net: rxtimestamp: fix clang issues for target arch PowerPC
In reply to Greg Kroah-HartmanFrom: Tanner Love <[email protected]>
[ Upstream commit 955cbe91bcf782c09afe369c95a20f0a4b6dcc3c ]
The signedness of char is implementation-dependent. Some systems (including PowerPC and ARM) use unsigned char. Clang 9 threw:
warning: result of comparison of constant -1 with expression of type \
'char' is always true [-Wtautological-constant-out-of-range-compare]
&arg_index)) != -1) {Tested: make -C tools/testing/selftests TARGETS="net" run_tests
--- tools/testing/selftests/net/rxtimestamp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/net/rxtimestamp.c +1 -2
@@ -329,8 +329,7 @@ int main(int argc, char **argv)bool all_tests = true;int arg_index =0 ;int failures =0 ; -int s, t; -char opt; +int s, t, opt;while ((opt =getopt_long (argc, argv,"" , long_options, &arg_index)) !=-1 ) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 44/120 selftests/net: psock_fanout: fix clang issues for target arch PowerPC
In reply to Greg Kroah-HartmanFrom: Tanner Love <[email protected]>
[ Upstream commit 64f9ede2274980076423583683d44480909b7a40 ]
Clang 9 threw:
warning: format specifies type 'unsigned short' but the argument has \
type 'int' [-Wformat]
typeflags, PORT_BASE, PORT_BASE + port_off);
Tested: make -C tools/testing/selftests TARGETS="net" run_tests
--- tools/testing/selftests/net/psock_fanout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/net/psock_fanout.c +2 -1
@@ -350,7 +350,8 @@ static int test_datapath(uint16_t typeflags, int port_off,int fds[2 ], fds_udp[2 ][2 ], ret;fprintf (stderr,"\ntest: datapath 0x%hx ports %hu,%hu\n" , - typeflags,PORT_BASE ,PORT_BASE + port_off); + typeflags, (uint16_t )PORT_BASE , + (uint16_t )(PORT_BASE + port_off)); fds[0 ] =sock_fanout_open (typeflags,0 ); fds[1 ] =sock_fanout_open (typeflags,0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 45/120 selftests/net: so_txtime: fix clang issues for target arch PowerPC
In reply to Greg Kroah-HartmanFrom: Tanner Love <[email protected]>
[ Upstream commit b4da96ffd30bd4a305045ba5c9b0de5d4aa20dc7 ]
On powerpcle, int64_t maps to long long. Clang 9 threw:
warning: absolute value function 'labs' given an argument of type \
'long long' but has parameter of type 'long' which may cause \
truncation of value [-Wabsolute-value]
if (labs(tstop - texpect) > cfg_variance_us)
Tested: make -C tools/testing/selftests TARGETS="net" run_tests
--- tools/testing/selftests/net/so_txtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/so_txtime.c +1 -1
@@ -121,7 +121,7 @@ static bool do_recv_one(int fdr, struct timed_send *ts)if (rbuf[0 ] != ts->data)error (1 ,0 ,"payload mismatch. expected %c" , ts->data); -if (labs (tstop - texpect) > cfg_variance_us) +if (llabs (tstop - texpect) > cfg_variance_us)error (1 ,0 ,"exceeds variance (%d us)" , cfg_variance_us);return false;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 46/120 selftests/net: tcp_mmap: fix clang warning for target arch PowerPC
In reply to Greg Kroah-HartmanFrom: Tanner Love <[email protected]>
[ Upstream commit 94b6c13be57cdedb7cf4d33dbcd066fad133f22b ]
When size_t maps to unsigned int (e.g. on 32-bit powerpc), then the comparison with 1<<35 is always true. Clang 9 threw:
warning: result of comparison of constant 34359738368 with \
expression of type 'size_t' (aka 'unsigned int') is always true \
[-Wtautological-constant-out-of-range-compare]
while (total < FILE_SZ) {Tested: make -C tools/testing/selftests TARGETS="net" run_tests
--- tools/testing/selftests/net/tcp_mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/net/tcp_mmap.c +3 -3
@@ -344,7 +344,7 @@ int main(int argc, char *argv[]) {struct sockaddr_storage listenaddr, addr;unsigned int max_pacing_rate =0 ; -size_t total =0 ; +uint64_t total =0 ;char *host =NULL ;int fd, c, on =1 ;char *buffer;
@@ -473,12 +473,12 @@ int main(int argc, char *argv[]) zflg =0 ; }while (total <FILE_SZ ) { -ssize_t wr =FILE_SZ - total; +int64_t wr =FILE_SZ - total;if (wr > chunk_size) wr = chunk_size;/* Note : we just want to fill the pipe with 0 bytes */ - wr =send (fd, buffer, wr, zflg ?MSG_ZEROCOPY :0 ); + wr =send (fd, buffer, (size_t )wr, zflg ?MSG_ZEROCOPY :0 );if (wr <=0 )break ; total += wr;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 47/120 sh/tlb: Fix PGTABLE_LEVELS > 2
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit c7bcbc8ab9cb20536b8f50c62a48cebda965fdba ]
Geert reported that his SH7722-based Migo-R board failed to boot after commit:
c5b27a889da9 ("sh/tlb: Convert SH to generic mmu_gather")
That commit fell victim to copying the wrong pattern -- __pmd_free_tlb() used to be implemented with pmd_free().
--- arch/sh/include/asm/pgalloc.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
arch/sh/include/asm/pgalloc.h +1 -9
@@ -12,6 +12,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);extern void pud_populate (struct mm_struct *mm,pud_t *pudp,pmd_t *pmd);extern pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long address);extern void pmd_free (struct mm_struct *mm,pmd_t *pmd); +#define __pmd_free_tlb (tlb, pmdp, addr) pmd_free((tlb)->mm, (pmdp))#endif static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
@@ -33,13 +34,4 @@ do { \tlb_remove_page ((tlb), (pte)); \ } while (0) -#if CONFIG_PGTABLE_LEVELS >2 -#define __pmd_free_tlb (tlb, pmdp, addr) \ -do { \ - struct page *page = virt_to_page(pmdp); \ - pgtable_pmd_page_dtor(page); \ - tlb_remove_page((tlb), page); \ -} while (0); -#endif -#endif /* __ASM_SH_PGALLOC_H */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/120 sh: Fix validation of system call number
In reply to Greg Kroah-HartmanFrom: Michael Karcher <[email protected]>
[ Upstream commit 04a8a3d0a73f51c7c2da84f494db7ec1df230e69 ]
The slow path for traced system call entries accessed a wrong memory location to get the number of the maximum allowed system call number. Renumber the numbered "local" label for the correct location to avoid collisions with actual local labels.
--- arch/sh/kernel/entry-common.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/sh/kernel/entry-common.S +3 -3
@@ -199,7 +199,7 @@ syscall_trace_entry: mov.l @(OFF_R7,r15), r7 ! arg3 mov.l @(OFF_R3,r15), r3 ! syscall_nr ! - mov.l 2f, r10 ! Number of syscalls + mov.l 6f, r10 ! Number of syscalls cmp/hs r10, r3 bf syscall_call mov #-ENOSYS, r0
@@ -353,7 +353,7 @@ ENTRY(system_call) tst r9, r8 bf syscall_trace_entry ! - mov.l 2f, r8 ! Number of syscalls + mov.l 6f, r8 ! Number of syscalls cmp/hs r8, r3 bt syscall_badsys !
@@ -392,7 +392,7 @@ syscall_exit: #if !defined(CONFIG_CPU_SH2) 1: .long TRA #endif -2: .long NR_syscalls +6: .long NR_syscalls 3: .long sys_call_table 7: .long do_syscall_trace_enter 8: .long do_syscall_trace_leave
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 49/120 net: hns3: fix desc filling bug when skb is expanded or lineared
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit cfdaeba5ddc98b303639a3265c2031ac5db249d6 ]
The linear and frag data part may be changed when the skb is expanded or lineared in skb_cow_head() or skb_checksum_help(), which is called by hns3_fill_skb_desc(), so the linear len return by skb_headlen() before the calling of hns3_fill_skb_desc() is unreliable.
Move hns3_fill_skb_desc() before the calling of skb_headlen() to fix this bug.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +6 -10
@@ -1098,16 +1098,8 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, void *priv,int k, sizeoflast;dma_addr_t dma; -if (type ==DESC_TYPE_SKB ) { -struct sk_buff *skb = (struct sk_buff *)priv; -int ret; - - ret =hns3_fill_skb_desc (ring, skb, desc); -if (unlikely (ret <0 )) -return ret; - - dma =dma_map_single (dev, skb->data, size,DMA_TO_DEVICE ); - }else if (type ==DESC_TYPE_FRAGLIST_SKB ) { +if (type ==DESC_TYPE_FRAGLIST_SKB || + type ==DESC_TYPE_SKB ) {struct sk_buff *skb = (struct sk_buff *)priv; dma =dma_map_single (dev, skb->data, size,DMA_TO_DEVICE );
@@ -1452,6 +1444,10 @@ netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev) next_to_use_head = ring->next_to_use; + ret =hns3_fill_skb_desc (ring, skb, &ring->desc[ring->next_to_use]); +if (unlikely (ret <0 )) + goto fill_err; + ret =hns3_fill_skb_to_desc (ring, skb,DESC_TYPE_SKB );if (unlikely (ret <0 )) goto fill_err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/120 net: hns3: fix a TX timeout issue
In reply to Greg Kroah-HartmanFrom: Yonglong Liu <[email protected]>
[ Upstream commit a7e90ee5965fafc53d36e8b3205f08c88d7bc11f ]
When the queue depth and queue parameters are modified, there is a low probability that TX timeout occurs. The two operations cause the link to be down or up when the watchdog is still working. All queues are stopped when the link is down. After the carrier is on, all queues are woken up. If the watchdog detects the link between the carrier on and wakeup queues, a false TX timeout occurs.
So fix this issue by modifying the sequence of carrier on and queue wakeup, which is symmetrical to the link down action.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -4170,8 +4170,8 @@ static void hns3_link_status_change(struct hnae3_handle *handle, bool linkup)return ;if (linkup) { -netif_carrier_on (netdev);netif_tx_wake_all_queues (netdev); +netif_carrier_on (netdev);if (netif_msg_link (handle))netdev_info (netdev,"link up\n" ); }else {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/120 net: hns3: add reset check for VF updating port based VLAN
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit a6f7bfdc78ddd8d719d108fef973b4e4a5a6ac6b ]
Currently hclgevf_update_port_base_vlan_info() may be called when VF is resetting, which may cause hns3_nic_net_open() being called twice unexpectedly.
So fix it by adding a reset check for it, and extend critical region for rntl_lock in hclgevf_update_port_base_vlan_info().
--- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +21 -9
@@ -3142,23 +3142,35 @@ void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state, {struct hnae3_handle *nic = &hdev->nic;struct hclge_vf_to_pf_msg send_msg; +int ret;rtnl_lock (); -hclgevf_notify_client (hdev,HNAE3_DOWN_CLIENT ); -rtnl_unlock (); + +if (test_bit (HCLGEVF_STATE_RST_HANDLING , &hdev->state)) { +dev_warn (&hdev->pdev->dev, +"is resetting when updating port based vlan info\n" ); +rtnl_unlock (); +return ; + } + + ret =hclgevf_notify_client (hdev,HNAE3_DOWN_CLIENT ); +if (ret) { +rtnl_unlock (); +return ; + }/* send msg to PF and wait update port based vlan info */ hclgevf_build_send_msg (&send_msg,HCLGE_MBX_SET_VLAN ,HCLGE_MBX_PORT_BASE_VLAN_CFG );memcpy (send_msg.data, port_base_vlan_info, data_size); -hclgevf_send_mbx_msg (hdev, &send_msg, false,NULL ,0 ); - -if (state ==HNAE3_PORT_BASE_VLAN_DISABLE ) - nic->port_base_vlan_state =HNAE3_PORT_BASE_VLAN_DISABLE ; -else - nic->port_base_vlan_state =HNAE3_PORT_BASE_VLAN_ENABLE ; + ret =hclgevf_send_mbx_msg (hdev, &send_msg, false,NULL ,0 ); +if (!ret) { +if (state ==HNAE3_PORT_BASE_VLAN_DISABLE ) + nic->port_base_vlan_state = state; +else + nic->port_base_vlan_state =HNAE3_PORT_BASE_VLAN_ENABLE ; + } -rtnl_lock ();hclgevf_notify_client (hdev,HNAE3_UP_CLIENT );rtnl_unlock (); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/120 net: hns3: fix aRFS FD rules leftover after add a user FD rule
In reply to Greg Kroah-HartmanFrom: Guojia Liao <[email protected]>
[ Upstream commit efe3fa45f770f1d66e2734ee7a3523c75694ff04 ]
When user had created a FD rule, all the aRFS rules should be clear up. HNS3 process flow as below:
1.get spin lock of fd_ruls_list
2.clear up all aRFS rules
3.release lock
4.get spin lock of fd_ruls_list
5.creat a rules
6.release lock;
There is a short period of time between step 3 and step 4, which would creatting some new aRFS FD rules if driver was receiving packet. So refactor the fd_rule_lock to fix it.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +15 -13
@@ -5737,9 +5737,9 @@ static int hclge_add_fd_entry(struct hnae3_handle *handle,/* to avoid rule conflict, when user configure rule by ethtool, * we need to clear all arfs rules */ +spin_lock_bh (&hdev->fd_rule_lock);hclge_clear_arfs_rules (handle); -spin_lock_bh (&hdev->fd_rule_lock); ret =hclge_fd_config_rule (hdev, rule);spin_unlock_bh (&hdev->fd_rule_lock);
@@ -5782,6 +5782,7 @@ static int hclge_del_fd_entry(struct hnae3_handle *handle,return ret; } +/* make sure being called after lock up with fd_rule_lock */ static void hclge_del_all_fd_entries (struct hnae3_handle *handle,bool clear_list) {
@@ -5794,7 +5795,6 @@ static void hclge_del_all_fd_entries(struct hnae3_handle *handle,if (!hnae3_dev_fd_supported (hdev))return ; -spin_lock_bh (&hdev->fd_rule_lock);for_each_set_bit (location, hdev->fd_bmap, hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1 ]) hclge_fd_tcam_config(hdev, HCLGE_FD_STAGE_1, true, location,
@@ -5811,8 +5811,6 @@ static void hclge_del_all_fd_entries(struct hnae3_handle *handle,bitmap_zero (hdev->fd_bmap, hdev->fd_cfg.rule_num[HCLGE_FD_STAGE_1 ]); } - -spin_unlock_bh (&hdev->fd_rule_lock); }static int hclge_restore_fd_entries (struct hnae3_handle *handle)
@@ -6179,7 +6177,7 @@ static int hclge_add_fd_entry_by_arfs(struct hnae3_handle *handle, u16 queue_id, u16 flow_id, struct flow_keys *fkeys) { struct hclge_vport *vport = hclge_get_vport(handle); -struct hclge_fd_rule_tuples new_tuples; +struct hclge_fd_rule_tuples new_tuples = {};struct hclge_dev *hdev = vport->back;struct hclge_fd_rule *rule;u16 tmp_queue_id;
@@ -6189,20 +6187,18 @@ static int hclge_add_fd_entry_by_arfs(struct hnae3_handle *handle, u16 queue_id,if (!hnae3_dev_fd_supported (hdev))return -EOPNOTSUPP ; -memset (&new_tuples,0 ,sizeof (new_tuples)); -hclge_fd_get_flow_tuples (fkeys, &new_tuples); - -spin_lock_bh (&hdev->fd_rule_lock); -/* when there is already fd rule existed add by user, * arfs should not work */ +spin_lock_bh (&hdev->fd_rule_lock);if (hdev->fd_active_type ==HCLGE_FD_EP_ACTIVE ) {spin_unlock_bh (&hdev->fd_rule_lock);return -EOPNOTSUPP ; } +hclge_fd_get_flow_tuples (fkeys, &new_tuples); +/* check is there flow director filter existed for this flow, * if not, create a new filter for it; * if filter exist with different queue id, modify the filter;
@@ -6287,6 +6283,7 @@ static void hclge_rfs_filter_expire(struct hclge_dev *hdev)#endif } +/* make sure being called after lock up with fd_rule_lock */ static void hclge_clear_arfs_rules (struct hnae3_handle *handle) {#ifdef CONFIG_RFS_ACCEL
@@ -6331,10 +6328,14 @@ static void hclge_enable_fd(struct hnae3_handle *handle, bool enable) hdev->fd_en = enable; clear = hdev->fd_active_type ==HCLGE_FD_ARFS_ACTIVE ; -if (!enable) + +if (!enable) { +spin_lock_bh (&hdev->fd_rule_lock);hclge_del_all_fd_entries (handle, clear); -else +spin_unlock_bh (&hdev->fd_rule_lock); + }else {hclge_restore_fd_entries (handle); + } }static void hclge_cfg_mac_mode (struct hclge_dev *hdev,bool enable)
@@ -6799,8 +6800,9 @@ static void hclge_ae_stop(struct hnae3_handle *handle)int i;set_bit (HCLGE_STATE_DOWN , &hdev->state); - +spin_lock_bh (&hdev->fd_rule_lock);hclge_clear_arfs_rules (handle); +spin_unlock_bh (&hdev->fd_rule_lock);/* If it is not PF reset, the firmware will disable the MAC, * so it only need to stop phy here.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/120 net: hns3: fix for VLAN config when reset failed
In reply to Greg Kroah-HartmanFrom: Guojia Liao <[email protected]>
[ Upstream commit b7b5d25bdd7bdea7d72a41e0a97b1b8f3dea2ee7 ]
When device is resetting or reset failed, firmware is unable to handle mailbox. VLAN should not be configured in this case.
--- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 ++++--- .../net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +4 -3
@@ -8534,11 +8534,12 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,bool writen_to_tbl = false;int ret =0 ; -/* When device is resetting, firmware is unable to handle -* mailbox. Just record the vlan id, and remove it after +/* When device is resetting or reset failed, firmware is unable to +* handle mailbox. Just record the vlan id, and remove it after * reset finished. */ -if (test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state) && is_kill) { +if ((test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state) || +test_bit (HCLGE_STATE_RST_FAIL , &hdev->state)) && is_kill) {set_bit (vlan_id, vport->vlan_del_fail_bmap);return -EBUSY ; }
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +6 -4
@@ -1322,11 +1322,12 @@ static int hclgevf_set_vlan_filter(struct hnae3_handle *handle,if (proto !=htons (ETH_P_8021Q ))return -EPROTONOSUPPORT ; -/* When device is resetting, firmware is unable to handle -* mailbox. Just record the vlan id, and remove it after +/* When device is resetting or reset failed, firmware is unable to +* handle mailbox. Just record the vlan id, and remove it after * reset finished. */ -if (test_bit (HCLGEVF_STATE_RST_HANDLING , &hdev->state) && is_kill) { +if ((test_bit (HCLGEVF_STATE_RST_HANDLING , &hdev->state) || +test_bit (HCLGEVF_STATE_RST_FAIL , &hdev->state)) && is_kill) {set_bit (vlan_id, hdev->vlan_del_fail_bmap);return -EBUSY ; }
@@ -3146,7 +3147,8 @@ void hclgevf_update_port_base_vlan_info(struct hclgevf_dev *hdev, u16 state,rtnl_lock (); -if (test_bit (HCLGEVF_STATE_RST_HANDLING , &hdev->state)) { +if (test_bit (HCLGEVF_STATE_RST_HANDLING , &hdev->state) || +test_bit (HCLGEVF_STATE_RST_FAIL , &hdev->state)) {dev_warn (&hdev->pdev->dev,"is resetting when updating port based vlan info\n" );rtnl_unlock ();
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/120 net/mlx5: E-switch, Destroy TSAR when fail to enable the mode
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 2b8e9c7c3fd0e31091edb1c66cc06ffe4988ca21 ]
When either esw_legacy_enable() or esw_offloads_enable() fails, code missed to destroy the created TSAR.
Hence, add the missing call to destroy the TSAR.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -1
@@ -2161,7 +2161,7 @@ abort:mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB );mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_ETH ); } - +esw_destroy_tsar (esw);return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/120 net/mlx5: E-switch, Destroy TSAR after reload interface
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 0c2600c619578f759cf3d5192b01bd14e281f24c ]
When eswitch offloads is enabled, TSAR is created before reloading the interfaces.
However when eswitch offloads mode is disabled, TSAR is disabled before reloading the interfaces.
To keep the eswitch enable/disable sequence as mirror, destroy TSAR after reloading the interfaces.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +2 -2
@@ -2206,8 +2206,6 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)else if (esw->mode ==MLX5_ESWITCH_OFFLOADS )esw_offloads_disable (esw); -esw_destroy_tsar (esw); - old_mode = esw->mode; esw->mode =MLX5_ESWITCH_NONE ;
@@ -2217,6 +2215,8 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_IB );mlx5_reload_interface (esw->dev,MLX5_INTERFACE_PROTOCOL_ETH ); } +esw_destroy_tsar (esw); +if (clear_vf)mlx5_eswitch_clear_vf_vports_info (esw); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/120 net/mlx5e: Fix error path of device attach
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit 5cd39b6e9a420329a9a408894be7ba8aa7dd755e ]
On failure to attach the netdev, fix the rollback by re-setting the device's state back to MLX5E_STATE_DESTROYING.
Failing to attach doesn't stop statistics polling via .ndo_get_stats64. In this case, although the device is not attached, it falsely continues to query the firmware for counters. Setting the device's state back to MLX5E_STATE_DESTROYING prevents the firmware counters query.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +2 -0
@@ -5395,6 +5395,8 @@ err_cleanup_tx: profile->cleanup_tx (priv); out: +set_bit (MLX5E_STATE_DESTROYING , &priv->state); +cancel_work_sync (&priv->update_stats_work);return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 57/120 net/mlx5: Fix a bug of using ptp channel index as pin index
In reply to Greg Kroah-HartmanFrom: Eran Ben Elisha <[email protected]>
[ Upstream commit 88c8cf92db48b2e359fe3051ad8e09829c1bee5d ]
On PTP mlx5_ptp_enable(on=0) flow, driver mistakenly used channel index as pin index.
After ptp patch marked in fixes tag was introduced, driver can freely call ptp_find_pin() as part of the .enable() callback.
Fix driver mlx5_ptp_enable(on=0) flow to always use ptp_find_pin(). With that, Driver will use the correct pin index in mlx5_ptp_enable(on=0) flow.
In addition, when initializing the pins, always set channel to zero. As all pins can be attached to all channels, let ptp_set_pinfunc() to move them between the channels.
For stable branches, this fix to be applied only on kernels that includes both patches in fixes tag. Otherwise, mlx5_ptp_enable(on=0) will be stuck on pincfg_mux.
--- .../ethernet/mellanox/mlx5/core/lib/clock.c | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +10 -11
@@ -252,17 +252,17 @@ static int mlx5_extts_configure(struct ptp_clock_info *ptp,if (rq->extts.index >= clock->ptp_info.n_pins)return -EINVAL ; + pin =ptp_find_pin (clock->ptp,PTP_PF_EXTTS , rq->extts.index); +if (pin <0 ) +return -EBUSY ; +if (on) { - pin =ptp_find_pin (clock->ptp,PTP_PF_EXTTS , rq->extts.index); -if (pin <0 ) -return -EBUSY ; pin_mode =MLX5_PIN_MODE_IN ; pattern = !!(rq->extts.flags &PTP_FALLING_EDGE ); field_select =MLX5_MTPPS_FS_PIN_MODE |MLX5_MTPPS_FS_PATTERN |MLX5_MTPPS_FS_ENABLE ; }else { - pin = rq->extts.index; field_select =MLX5_MTPPS_FS_ENABLE ; }
@@ -310,12 +310,12 @@ static int mlx5_perout_configure(struct ptp_clock_info *ptp,if (rq->perout.index >= clock->ptp_info.n_pins)return -EINVAL ; -if (on) { - pin =ptp_find_pin (clock->ptp,PTP_PF_PEROUT , - rq->perout.index); -if (pin <0 ) -return -EBUSY ; + pin =ptp_find_pin (clock->ptp,PTP_PF_PEROUT , + rq->perout.index); +if (pin <0 ) +return -EBUSY ; +if (on) { pin_mode =MLX5_PIN_MODE_OUT ; pattern =MLX5_OUT_PATTERN_PERIODIC ; ts.tv_sec = rq->perout.period.sec;
@@ -341,7 +341,6 @@ static int mlx5_perout_configure(struct ptp_clock_info *ptp,MLX5_MTPPS_FS_ENABLE |MLX5_MTPPS_FS_TIME_STAMP ; }else { - pin = rq->perout.index; field_select =MLX5_MTPPS_FS_ENABLE ; }
@@ -431,7 +430,7 @@ static int mlx5_init_pin_config(struct mlx5_clock *clock) "mlx5_pps%d", i); clock->ptp_info.pin_config[i].index = i; clock->ptp_info.pin_config[i].func =PTP_PF_NONE ; - clock->ptp_info.pin_config[i].chan = i; + clock->ptp_info.pin_config[i].chan =0 ; }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/120 net/mlx5: Verify Hardware supports requested ptp function on a given pin
In reply to Greg Kroah-HartmanFrom: Eran Ben Elisha <[email protected]>
[ Upstream commit 071995c877a8646209d55ff8edddd2b054e7424c ]
Fix a bug where driver did not verify Hardware pin capabilities for PTP functions.
--- .../ethernet/mellanox/mlx5/core/lib/clock.c | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +22 -1
@@ -387,10 +387,31 @@ static int mlx5_ptp_enable(struct ptp_clock_info *ptp,return 0 ; } +enum { +MLX5_MTPPS_REG_CAP_PIN_X_MODE_SUPPORT_PPS_IN =BIT (0 ), +MLX5_MTPPS_REG_CAP_PIN_X_MODE_SUPPORT_PPS_OUT =BIT (1 ), +}; +static int mlx5_ptp_verify (struct ptp_clock_info *ptp,unsigned int pin,enum ptp_pin_function func,unsigned int chan) { -return (func ==PTP_PF_PHYSYNC ) ? -EOPNOTSUPP :0 ; + struct mlx5_clock *clock = container_of(ptp, struct mlx5_clock, + ptp_info); + +switch (func) { +case PTP_PF_NONE : +return 0 ; +case PTP_PF_EXTTS : +return !(clock->pps_info.pin_caps[pin] & +MLX5_MTPPS_REG_CAP_PIN_X_MODE_SUPPORT_PPS_IN ); +case PTP_PF_PEROUT : +return !(clock->pps_info.pin_caps[pin] & +MLX5_MTPPS_REG_CAP_PIN_X_MODE_SUPPORT_PPS_OUT ); +default : +return -EOPNOTSUPP ; + } + +return -EOPNOTSUPP ; }static const struct ptp_clock_info mlx5_ptp_clock_info = {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/120 net/mlx5: Query PPS pin operational status before registering it
In reply to Greg Kroah-HartmanFrom: Eran Ben Elisha <[email protected]>
[ Upstream commit ed56d749c366be269d58b29597392e4a0ae71c0a ]
In a special configuration, a ConnectX6-Dx pin pps-out might be activated when driver is loaded. Fix the driver to always read the operational pin mode when registering it, and advertise it accordingly.
--- .../ethernet/mellanox/mlx5/core/lib/clock.c | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +33 -1
@@ -431,6 +431,38 @@ static const struct ptp_clock_info mlx5_ptp_clock_info = { .verify = NULL, }; +static int mlx5_query_mtpps_pin_mode (struct mlx5_core_dev *mdev,u8 pin, +u32 *mtpps,u32 mtpps_size) +{ +u32 in[MLX5_ST_SZ_DW (mtpps_reg)] = {}; + +MLX5_SET (mtpps_reg, in, pin, pin); + +return mlx5_core_access_reg (mdev, in,sizeof (in), mtpps, + mtpps_size,MLX5_REG_MTPPS ,0 ,0 ); +} + +static int mlx5_get_pps_pin_mode (struct mlx5_clock *clock,u8 pin) +{ +struct mlx5_core_dev *mdev = clock->mdev; +u32 out[MLX5_ST_SZ_DW (mtpps_reg)] = {}; +u8 mode; +int err; + + err =mlx5_query_mtpps_pin_mode (mdev, pin, out,sizeof (out)); +if (err || !MLX5_GET (mtpps_reg, out, enable)) +return PTP_PF_NONE ; + + mode =MLX5_GET (mtpps_reg, out, pin_mode); + +if (mode ==MLX5_PIN_MODE_IN ) +return PTP_PF_EXTTS ; +else if (mode ==MLX5_PIN_MODE_OUT ) +return PTP_PF_PEROUT ; + +return PTP_PF_NONE ; +} +static int mlx5_init_pin_config (struct mlx5_clock *clock) {int i;
@@ -450,7 +482,7 @@ static int mlx5_init_pin_config(struct mlx5_clock *clock)sizeof (clock->ptp_info.pin_config[i].name), "mlx5_pps%d", i); clock->ptp_info.pin_config[i].index = i; - clock->ptp_info.pin_config[i].func =PTP_PF_NONE ; + clock->ptp_info.pin_config[i].func =mlx5_get_pps_pin_mode (clock, i); clock->ptp_info.pin_config[i].chan =0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/120 net/mlx5e: Modify uplink state on interface up/down
In reply to Greg Kroah-HartmanFrom: Ron Diskin <[email protected]>
[ Upstream commit 7d0314b11cdd92bca8b89684c06953bf114605fc ]
When setting the PF interface up/down, notify the firmware to update uplink state via MODIFY_VPORT_STATE, when E-Switch is enabled.
This behavior will prevent sending traffic out on uplink port when PF is down, such as sending traffic from a VF interface which is still up. Currently when calling mlx5e_open/close(), the driver only sends PAOS command to notify the firmware to set the physical port state to up/down, however, it is not sufficient. When VF is in "auto" state, it follows the uplink state, which was not updated on mlx5e_open/close() before this patch.
When switchdev mode is enabled and uplink representor is first enabled, set the uplink port state value back to its FW default "AUTO".
--- .../net/ethernet/mellanox/mlx5/core/en_main.c | 25 ++++++++++++++++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 2 ++ .../net/ethernet/mellanox/mlx5/core/eswitch.c | 16 +++++++----- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 2 ++ include/linux/mlx5/mlx5_ifc.h | 1 + 5 files changed, 37 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +22 -3
@@ -3041,6 +3041,25 @@ void mlx5e_timestamp_init(struct mlx5e_priv *priv) priv->tstamp.rx_filter =HWTSTAMP_FILTER_NONE ; } +static void mlx5e_modify_admin_state (struct mlx5_core_dev *mdev, +enum mlx5_port_status state) +{ +struct mlx5_eswitch *esw = mdev->priv.eswitch; +int vport_admin_state; + +mlx5_set_port_admin_status (mdev, state); + +if (!MLX5_ESWITCH_MANAGER (mdev) ||mlx5_eswitch_mode (esw) ==MLX5_ESWITCH_OFFLOADS ) +return ; + +if (state ==MLX5_PORT_UP ) + vport_admin_state =MLX5_VPORT_ADMIN_STATE_AUTO ; +else + vport_admin_state =MLX5_VPORT_ADMIN_STATE_DOWN ; + +mlx5_eswitch_set_vport_state (esw,MLX5_VPORT_UPLINK , vport_admin_state); +} +int mlx5e_open_locked (struct net_device *netdev) {struct mlx5e_priv *priv =netdev_priv (netdev);
@@ -3073,7 +3092,7 @@ int mlx5e_open(struct net_device *netdev)mutex_lock (&priv->state_lock); err =mlx5e_open_locked (netdev);if (!err) -mlx5_set_port_admin_status (priv->mdev,MLX5_PORT_UP ); +mlx5e_modify_admin_state (priv->mdev,MLX5_PORT_UP );mutex_unlock (&priv->state_lock);return err;
@@ -3107,7 +3126,7 @@ int mlx5e_close(struct net_device *netdev)return -ENODEV ;mutex_lock (&priv->state_lock); -mlx5_set_port_admin_status (priv->mdev,MLX5_PORT_DOWN ); +mlx5e_modify_admin_state (priv->mdev,MLX5_PORT_DOWN ); err =mlx5e_close_locked (netdev);mutex_unlock (&priv->state_lock);
@@ -5185,7 +5204,7 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)/* Marking the link as currently not needed by the Driver */ if (!netif_running (netdev)) -mlx5_set_port_admin_status (mdev,MLX5_PORT_DOWN ); +mlx5e_modify_admin_state (mdev,MLX5_PORT_DOWN );mlx5e_set_netdev_mtu_boundaries (priv);mlx5e_set_dev_port_mtu (priv);
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -0
@@ -1922,6 +1922,8 @@ static void mlx5e_uplink_rep_enable(struct mlx5e_priv *priv)INIT_WORK (&rpriv->uplink_priv.reoffload_flows_work, mlx5e_tc_reoffload_flows_work); +mlx5_modify_vport_admin_state (mdev,MLX5_VPORT_STATE_OP_MOD_UPLINK , +0 ,0 ,MLX5_VPORT_ADMIN_STATE_AUTO );mlx5_lag_add (mdev, netdev); priv->events_nb.notifier_call = uplink_rep_async_event;mlx5_notifier_register (mdev, &priv->events_nb);
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +10 -6
@@ -2374,6 +2374,8 @@ int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw, u16 vport, int link_state) {struct mlx5_vport *evport =mlx5_eswitch_get_vport (esw, vport); +int opmod =MLX5_VPORT_STATE_OP_MOD_ESW_VPORT ; +int other_vport =1 ;int err =0 ;if (!ESW_ALLOWED (esw))
@@ -2381,15 +2383,17 @@ int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,if (IS_ERR (evport))return PTR_ERR (evport); +if (vport ==MLX5_VPORT_UPLINK ) { + opmod =MLX5_VPORT_STATE_OP_MOD_UPLINK ; + other_vport =0 ; + vport =0 ; + }mutex_lock (&esw->state_lock); - err =mlx5_modify_vport_admin_state (esw->dev, -MLX5_VPORT_STATE_OP_MOD_ESW_VPORT , - vport,1 , link_state); + err =mlx5_modify_vport_admin_state (esw->dev, opmod, vport, other_vport, link_state);if (err) { -mlx5_core_warn (esw->dev, -"Failed to set vport %d link state, err = %d" , - vport, err); +mlx5_core_warn (esw->dev,"Failed to set vport %d link state, opmod = %d, err = %d" , + vport, opmod, err); goto unlock; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +2 -0
@@ -684,6 +684,8 @@ static inline int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int num_vfs) { rstatic inline void mlx5_eswitch_disable (struct mlx5_eswitch *esw,bool clear_vf) {}static inline bool mlx5_esw_lag_prereq (struct mlx5_core_dev *dev0,struct mlx5_core_dev *dev1) {return true; }static inline bool mlx5_eswitch_is_funcs_handler (struct mlx5_core_dev *dev) {return false; } +static inline +int mlx5_eswitch_set_vport_state (struct mlx5_eswitch *esw,u16 vport,int link_state) {return 0 ; }static inline const u32 *mlx5_esw_query_functions (struct mlx5_core_dev *dev) {return ERR_PTR (-EOPNOTSUPP );
include/linux/mlx5/mlx5_ifc.h +1 -0
@@ -4347,6 +4347,7 @@ struct mlx5_ifc_query_vport_state_out_bits {enum {MLX5_VPORT_STATE_OP_MOD_VNIC_VPORT =0x0 ,MLX5_VPORT_STATE_OP_MOD_ESW_VPORT =0x1 , +MLX5_VPORT_STATE_OP_MOD_UPLINK =0x2 , };struct mlx5_ifc_arm_monitor_counter_in_bits {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/120 net/mlx5e: Fix kernel crash when setting vf VLANID on a VF dev
In reply to Greg Kroah-HartmanFrom: Alaa Hleihel <[email protected]>
[ Upstream commit 350a63249d270b1f5bd05c7e2a24cd8de0f9db20 ]
After the cited commit, function 'mlx5_eswitch_set_vport_vlan' started to acquire esw->state_lock.
However, esw is not defined for VF devices, hence attempting to set vf VLANID on a VF dev will cause a kernel panic.
Fix it by moving up the (redundant) esw validation from function '__mlx5_eswitch_set_vport_vlan' since the rest of the callers now have and use a valid esw.
For example with vf device eth4:
# ip link set dev eth4 vf 0 vlan 0
Trace of the panic:
[ 411.409842] BUG: unable to handle page fault for address: 00000000000011b8 [ 411.449745] #PF: supervisor read access in kernel mode [ 411.452348] #PF: error_code(0x0000) - not-present page [ 411.454938] PGD 80000004189c9067 P4D 80000004189c9067 PUD 41899a067 PMD 0 [ 411.458382] Oops: 0000 [#1] SMP PTI [ 411.460268] CPU: 4 PID: 5711 Comm: ip Not tainted 5.8.0-rc4_for_upstream_min_debug_2020_07_08_22_04 #1 [ 411.462447] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 [ 411.464158] RIP: 0010:__mutex_lock+0x4e/0x940 [ 411.464928] Code: fd 41 54 49 89 f4 41 52 53 89 d3 48 83 ec 70 44 8b 1d ee 03 b0 01 65 48 8b 04 25 28 00 00 00 48 89 45 c8 31 c0 45 85 db 75 0a <48> 3b 7f 60 0f 85 7e 05 00 00 49 8d 45 68 41 56 41 b8 01 00 00 00 [ 411.467678] RSP: 0018:ffff88841fcd74b0 EFLAGS: 00010246 [ 411.468562] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 411.469715] RDX: 0000000000000000 RSI: 0000000000000002 RDI: 0000000000001158 [ 411.470812] RBP: ffff88841fcd7550 R08: ffffffffa00fa1ce R09: 0000000000000000 [ 411.471835] R10: ffff88841fcd7570 R11: 0000000000000000 R12: 0000000000000002 [ 411.472862] R13: 0000000000001158 R14: ffffffffa00fa1ce R15: 0000000000000000 [ 411.474004] FS: 00007faee7ca6b80(0000) GS:ffff88846fc00000(0000) knlGS:0000000000000000 [ 411.475237] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 411.476129] CR2: 00000000000011b8 CR3: 000000041909c006 CR4: 0000000000360ea0 [ 411.477260] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 411.478340] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 411.479332] Call Trace: [ 411.479760] ? __nla_validate_parse.part.6+0x57/0x8f0 [ 411.482825] ? mlx5_eswitch_set_vport_vlan+0x3e/0xa0 [mlx5_core] [ 411.483804] mlx5_eswitch_set_vport_vlan+0x3e/0xa0 [mlx5_core] [ 411.484733] mlx5e_set_vf_vlan+0x41/0x50 [mlx5_core] [ 411.485545] do_setlink+0x613/0x1000 [ 411.486165] __rtnl_newlink+0x53d/0x8c0 [ 411.486791] ? mark_held_locks+0x49/0x70 [ 411.487429] ? __lock_acquire+0x8fe/0x1eb0 [ 411.488085] ? rcu_read_lock_sched_held+0x52/0x60 [ 411.488998] ? kmem_cache_alloc_trace+0x16d/0x2d0 [ 411.489759] rtnl_newlink+0x47/0x70 [ 411.490357] rtnetlink_rcv_msg+0x24e/0x450 [ 411.490978] ? netlink_deliver_tap+0x92/0x3d0 [ 411.491631] ? validate_linkmsg+0x330/0x330 [ 411.492262] netlink_rcv_skb+0x47/0x110 [ 411.492852] netlink_unicast+0x1ac/0x270 [ 411.493551] netlink_sendmsg+0x336/0x450 [ 411.494209] sock_sendmsg+0x30/0x40 [ 411.494779] ____sys_sendmsg+0x1dd/0x1f0 [ 411.495378] ? copy_msghdr_from_user+0x5c/0x90 [ 411.496082] ___sys_sendmsg+0x87/0xd0 [ 411.496683] ? lock_acquire+0xb9/0x3a0 [ 411.497322] ? lru_cache_add+0x5/0x170 [ 411.497944] ? find_held_lock+0x2d/0x90 [ 411.498568] ? handle_mm_fault+0xe46/0x18c0 [ 411.499205] ? __sys_sendmsg+0x51/0x90 [ 411.499784] __sys_sendmsg+0x51/0x90 [ 411.500341] do_syscall_64+0x59/0x2e0 [ 411.500938] ? asm_exc_page_fault+0x8/0x30 [ 411.501609] ? rcu_read_lock_sched_held+0x52/0x60 [ 411.502350] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 411.503093] RIP: 0033:0x7faee73b85a7 [ 411.503654] Code: Bad RIP value.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +3 -2
@@ -2435,8 +2435,6 @@ int __mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,struct mlx5_vport *evport =mlx5_eswitch_get_vport (esw, vport);int err =0 ; -if (!ESW_ALLOWED (esw)) -return -EPERM ;if (IS_ERR (evport))return PTR_ERR (evport);if (vlan >4095 || qos >7 )
@@ -2464,6 +2462,9 @@ int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,u8 set_flags =0 ;int err; +if (!ESW_ALLOWED (esw)) +return -EPERM ; +if (vlan || qos) set_flags =SET_VLAN_STRIP |SET_VLAN_INSERT ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/120 net: lan78xx: add missing endpoint sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 8d8e95fd6d69d774013f51e5f2ee10c6e6d1fc14 ]
Add the missing endpoint sanity check to prevent a NULL-pointer dereference should a malicious device lack the expected endpoints.
Note that the driver has a broken endpoint-lookup helper, lan78xx_get_endpoints(), which can end up accepting interfaces in an altsetting without endpoints as long as *some* altsetting has a bulk-in and a bulk-out endpoint.
--- drivers/net/usb/lan78xx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/lan78xx.c +5 -0
@@ -3759,6 +3759,11 @@ static int lan78xx_probe(struct usb_interface *intf, netdev->max_mtu =MAX_SINGLE_PACKET_SIZE ;netif_set_gso_max_size (netdev,MAX_SINGLE_PACKET_SIZE -MAX_HEADER ); +if (intf->cur_altsetting->desc.bNumEndpoints <3 ) { + ret = -ENODEV ; + goto out3; + } + dev->ep_blkin = (intf->cur_altsetting)->endpoint +0 ; dev->ep_blkout = (intf->cur_altsetting)->endpoint +1 ; dev->ep_intr = (intf->cur_altsetting)->endpoint +2 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/120 net: lan78xx: fix transfer-buffer memory leak
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit 63634aa679ba8b5e306ad0727120309ae6ba8a8e ]
The interrupt URB transfer-buffer was never freed on disconnect or after probe errors.
--- drivers/net/usb/lan78xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/lan78xx.c +1 -0
@@ -3788,6 +3788,7 @@ static int lan78xx_probe(struct usb_interface *intf,usb_fill_int_urb (dev->urb_intr, dev->udev, dev->pipe_intr, buf, maxp, intr_complete, dev, period); + dev->urb_intr->transfer_flags |=URB_FREE_BUFFER ; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/120 rhashtable: Fix unprotected RCU dereference in __rht_ptr
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 1748f6a2cbc4694523f16da1c892b59861045b9d ]
The rcu_dereference call in rht_ptr_rcu is completely bogus because we've already dereferenced the value in __rht_ptr and operated on it. This causes potential double readings which could be fatal. The RCU dereference must occur prior to the comparison in __rht_ptr.
This patch changes the order of RCU dereference so that it is done first and the result is then fed to __rht_ptr. The RCU marking changes have been minimised using casts which will be removed in a follow-up patch.
--- include/linux/rhashtable.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
include/linux/rhashtable.h +13 -12
@@ -349,11 +349,11 @@ static inline void rht_unlock(struct bucket_table *tbl,local_bh_enable (); } -static inline struct rhash_head __rcu *__rht_ptr ( -struct rhash_lock_head *const *bkt) +static inline struct rhash_head *__rht_ptr ( +struct rhash_lock_head *p,struct rhash_lock_head __rcu *const *bkt) { -return (struct rhash_head __rcu *) - ((unsigned long )*bkt & ~BIT (0 ) ?: +return (struct rhash_head *) + ((unsigned long )p & ~BIT (0 ) ?: (unsigned long )RHT_NULLS_MARKER (bkt)); }
@@ -365,25 +365,26 @@ static inline struct rhash_head __rcu *__rht_ptr(* access is guaranteed, such as when destroying the table. */ static inline struct rhash_head *rht_ptr_rcu ( -struct rhash_lock_head *const *bkt) +struct rhash_lock_head *const *p) { -struct rhash_head __rcu *p =__rht_ptr (bkt); - -return rcu_dereference (p); +struct rhash_lock_head __rcu *const *bkt = (void *)p; +return __rht_ptr (rcu_dereference (*bkt), bkt); }static inline struct rhash_head *rht_ptr ( -struct rhash_lock_head *const *bkt, +struct rhash_lock_head *const *p,struct bucket_table *tbl,unsigned int hash) { -return rht_dereference_bucket (__rht_ptr (bkt), tbl, hash); +struct rhash_lock_head __rcu *const *bkt = (void *)p; +return __rht_ptr (rht_dereference_bucket (*bkt, tbl, hash), bkt); }static inline struct rhash_head *rht_ptr_exclusive ( -struct rhash_lock_head *const *bkt) +struct rhash_lock_head *const *p) { -return rcu_dereference_protected (__rht_ptr (bkt),1 ); +struct rhash_lock_head __rcu *const *bkt = (void *)p; +return __rht_ptr (rcu_dereference_protected (*bkt,1 ), bkt); } static inline void rht_assign_locked(struct rhash_lock_head **bkt,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/120 mlx4: disable device on shutdown
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 3cab8c65525920f00d8f4997b3e9bb73aecb3a8e ]
It appears that not disabling a PCI device on .shutdown may lead to a Hardware Error with particular (perhaps buggy) BIOS versions:
mlx4_en: eth0: Close port called
mlx4_en 0000:04:00.0: removed PHC
reboot: Restarting system
{1}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1
{1}[Hardware Error]: event severity: fatal
{1}[Hardware Error]: Error 0, type: fatal
{1}[Hardware Error]: section_type: PCIe error
{1}[Hardware Error]: port_type: 4, root port
{1}[Hardware Error]: version: 1.16
{1}[Hardware Error]: command: 0x4010, status: 0x0143
{1}[Hardware Error]: device_id: 0000:00:02.2
{1}[Hardware Error]: slot: 0
{1}[Hardware Error]: secondary_bus: 0x04
{1}[Hardware Error]: vendor_id: 0x8086, device_id: 0x2f06
{1}[Hardware Error]: class_code: 000604
{1}[Hardware Error]: bridge: secondary_status: 0x2000, control: 0x0003
{1}[Hardware Error]: aer_uncor_status: 0x00100000, aer_uncor_mask: 0x00000000
{1}[Hardware Error]: aer_uncor_severity: 0x00062030
{1}[Hardware Error]: TLP Header: 40000018 040000ff 791f4080 00000000
[hw error repeats]
Kernel panic - not syncing: Fatal hardware error!
CPU: 0 PID: 2189 Comm: reboot Kdump: loaded Not tainted 5.6.x-blabla #1
Hardware name: HP ProLiant DL380 Gen9/ProLiant DL380 Gen9, BIOS P89 05/05/2017Fix the mlx4 driver.
This is a very similar problem to what had been fixed in:
commit 0d98ba8d70b0 ("scsi: hpsa: disable device during shutdown") to address https://bugzilla.kernel.org/show_bug.cgi?id=199779.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx4/main.c +2 -0
@@ -4358,12 +4358,14 @@ end:static void mlx4_shutdown (struct pci_dev *pdev) {struct mlx4_dev_persistent *persist =pci_get_drvdata (pdev); +struct mlx4_dev *dev = persist->dev;mlx4_info (persist->dev,"mlx4_shutdown was called\n" );mutex_lock (&persist->interface_state_mutex);if (persist->interface_state &MLX4_INTERFACE_STATE_UP )mlx4_unload_one (pdev);mutex_unlock (&persist->interface_state_mutex); +mlx4_pci_disable_device (dev); }static const struct pci_error_handlers mlx4_err_handler = {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/120 octeontx2-pf: Fix reset_task bugs
In reply to Greg Kroah-HartmanFrom: Subbaraya Sundeep <[email protected]>
[ Upstream commit 948a66338f44c16f52c0f03f6ad81a6f59eb5604 ]
Two bugs exist in the code related to reset_task in PF driver one is the missing protection
against network stack ndo_open and ndo_close. Other one is the missing cancel_work.
This patch fixes those problems.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +3 -0
@@ -1730,10 +1730,12 @@ static void otx2_reset_task(struct work_struct *work)if (!netif_running (pf->netdev))return ; +rtnl_lock ();otx2_stop (pf->netdev); pf->reset_count++;otx2_open (pf->netdev);netif_trans_update (pf->netdev); +rtnl_unlock (); }static const struct net_device_ops otx2_netdev_ops = {
@@ -2111,6 +2113,7 @@ static void otx2_remove(struct pci_dev *pdev) pf =netdev_priv (netdev); +cancel_work_sync (&pf->reset_task);/* Disable link notifications */ otx2_cgx_config_linkevents (pf, false);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/120 octeontx2-pf: cancel reset_task work
In reply to Greg Kroah-HartmanFrom: Subbaraya Sundeep <[email protected]>
[ Upstream commit c0376f473c5cc2ef94f8e1e055d173293cc3698c ]
During driver exit cancel the queuedreset_task work in VF driver.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +1 -0
@@ -617,6 +617,7 @@ static void otx2vf_remove(struct pci_dev *pdev) vf =netdev_priv (netdev); +cancel_work_sync (&vf->reset_task);otx2vf_disable_mbox_intr (vf);otx2_detach_resources (&vf->mbox);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/120 octeontx2-pf: Unregister netdev at driver remove
In reply to Greg Kroah-HartmanFrom: Subbaraya Sundeep <[email protected]>
[ Upstream commit ed543f5c6a988d8a863d2436794230cef2c82389 ]
Added unregister_netdev in the driver remove function. Generally unregister_netdev is called after disabling all the device interrupts but here it is called before disabling device mailbox interrupts. The reason behind this is VF needs mailbox interrupt to communicate with its PF to clean up its resources during otx2_stop. otx2_stop disables packet I/O and queue interrupts first and by using mailbox interrupt communicates to PF to free VF resources. Hence this patch calls unregister_device just before disabling mailbox interrupts.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +1 -0
@@ -618,6 +618,7 @@ static void otx2vf_remove(struct pci_dev *pdev) vf =netdev_priv (netdev);cancel_work_sync (&vf->reset_task); +unregister_netdev (netdev);otx2vf_disable_mbox_intr (vf);otx2_detach_resources (&vf->mbox);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 69/120 bareudp: forbid mixing IP and MPLS in multiproto mode
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 302d201b5cdf6f4781ee6cd9862f377f975d6c43 ]
In multiproto mode, bareudp_xmit() accepts sending multicast MPLS and IPv6 packets regardless of the bareudp ethertype. In practice, this let an IP tunnel send multicast MPLS packets, or an MPLS tunnel send IPv6 packets.
We need to restrict the test further, so that the multiproto mode only enables
* IPv6 for IPv4 tunnels,
* or multicast MPLS for unicast MPLS tunnels.
To improve clarity, the protocol validation is moved to its own function, where each logical test has its own condition.
v2: s/ntohs/htons/
--- drivers/net/bareudp.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)
drivers/net/bareudp.c +22 -7
@@ -407,19 +407,34 @@ free_dst:return err; } +static bool bareudp_proto_valid (struct bareudp_dev *bareudp,__be16 proto) +{ +if (bareudp->ethertype == proto) +return true; + +if (!bareudp->multi_proto_mode) +return false; + +if (bareudp->ethertype ==htons (ETH_P_MPLS_UC ) && + proto ==htons (ETH_P_MPLS_MC )) +return true; + +if (bareudp->ethertype ==htons (ETH_P_IP ) && + proto ==htons (ETH_P_IPV6 )) +return true; + +return false; +} +static netdev_tx_t bareudp_xmit (struct sk_buff *skb,struct net_device *dev) {struct bareudp_dev *bareudp =netdev_priv (dev);struct ip_tunnel_info *info =NULL ;int err; -if (skb->protocol != bareudp->ethertype) { -if (!bareudp->multi_proto_mode || - (skb->protocol !=htons (ETH_P_MPLS_MC ) && - skb->protocol !=htons (ETH_P_IPV6 ))) { - err = -EINVAL ; - goto tx_error; - } +if (!bareudp_proto_valid (bareudp, skb->protocol)) { + err = -EINVAL ; + goto tx_error; } info =skb_tunnel_info (skb);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 70/120 nvme: add a Identify Namespace Identification Descriptor list quirk
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 5bedd3afee8eb01ccd256f0cd2cc0fa6f841417a ]
Add a quirk for a device that does not support the Identify Namespace Identification Descriptor list despite claiming 1.3 compliance.
--- drivers/nvme/host/core.c | 15 +++------------ drivers/nvme/host/nvme.h | 7 +++++++ drivers/nvme/host/pci.c | 2 ++ 3 files changed, 12 insertions(+), 12 deletions(-)
drivers/nvme/host/core.c +3 -12
@@ -1106,6 +1106,9 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,int pos;int len; +if (ctrl->quirks &NVME_QUIRK_NO_NS_DESC_LIST ) +return 0 ; + c.identify.opcode = nvme_admin_identify; c.identify.nsid =cpu_to_le32 (nsid); c.identify.cns =NVME_ID_CNS_NS_DESC_LIST ;
@@ -1119,18 +1122,6 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,if (status) {dev_warn (ctrl->device,"Identify Descriptors failed (%d)\n" , status); -/* -* Don't treat non-retryable errors as fatal, as we potentially -* already have a NGUID or EUI-64. If we failed with DNR set, -* we want to silently ignore the error as we can still -* identify the device, but if the status has DNR set, we want -* to propagate the error back specifically for the disk -* revalidation flow to make sure we don't abandon the -* device just because of a temporal retry-able error (such -* as path of transport errors). -*/ -if (status >0 && (status &NVME_SC_DNR )) - status =0 ; goto free_data; }
drivers/nvme/host/nvme.h +7 -0
@@ -126,6 +126,13 @@ enum nvme_quirks {* Don't change the value of the temperature threshold feature */ NVME_QUIRK_NO_TEMP_THRESH_CHANGE = (1 <<14 ), + +/* +* The controller doesn't handle the Identify Namespace +* Identification Descriptor list subcommand despite claiming +* NVMe 1.3 compliance. +*/ + NVME_QUIRK_NO_NS_DESC_LIST = (1 << 15), };/*
drivers/nvme/host/pci.c +2 -0
@@ -3105,6 +3105,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */ .driver_data =NVME_QUIRK_IDENTIFY_CNS | NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x126f, 0x2263), /* Silicon Motion unidentified */ + .driver_data = NVME_QUIRK_NO_NS_DESC_LIST, }, { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, }, { PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 71/120 mlxsw: core: Increase scope of RCU read-side critical section
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 7d8e8f3433dc8d1dc87c1aabe73a154978fb4c4d ]
The lifetime of the Rx listener item ('rxl_item') is managed using RCU, but is dereferenced outside of RCU read-side critical section, which can lead to a use-after-free.
Fix this by increasing the scope of the RCU read-side critical section.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +4 -2
@@ -2051,11 +2051,13 @@ void mlxsw_core_skb_receive(struct mlxsw_core *mlxsw_core, struct sk_buff *skb,break ; } } -rcu_read_unlock (); -if (!found) +if (!found) { +rcu_read_unlock (); goto drop; + } rxl->func (skb, local_port, rxl_item->priv); +rcu_read_unlock ();return ; drop:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 72/120 mlxsw: core: Free EMAD transactions using kfree_rcu()
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 3c8ce24b037648a5a15b85888b259a74b05ff97d ]
The lifetime of EMAD transactions (i.e., 'struct mlxsw_reg_trans') is managed using RCU. They are freed using kfree_rcu() once the transaction ends.
However, in case the transaction failed it is freed immediately after being removed from the active transactions list. This is problematic because it is still possible for a different CPU to dereference the transaction from an RCU read-side critical section while traversing the active transaction list in mlxsw_emad_rx_listener_func(). In which case, a use-after-free is triggered [1].
Fix this by freeing the transaction after a grace period by calling kfree_rcu().
[1]
BUG: KASAN: use-after-free in mlxsw_emad_rx_listener_func+0x969/0xac0 drivers/net/ethernet/mellanox/mlxsw/core.c:671
Read of size 8 at addr ffff88800b7964e8 by task syz-executor.2/2881
CPU: 0 PID: 2881 Comm: syz-executor.2 Not tainted 5.8.0-rc4+ #44
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014
Call Trace:
<IRQ>
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0xf6/0x16e lib/dump_stack.c:118
print_address_description.constprop.0+0x1c/0x250 mm/kasan/report.c:383
__kasan_report mm/kasan/report.c:513 [inline]
kasan_report.cold+0x1f/0x37 mm/kasan/report.c:530
mlxsw_emad_rx_listener_func+0x969/0xac0 drivers/net/ethernet/mellanox/mlxsw/core.c:671
mlxsw_core_skb_receive+0x571/0x700 drivers/net/ethernet/mellanox/mlxsw/core.c:2061
mlxsw_pci_cqe_rdq_handle drivers/net/ethernet/mellanox/mlxsw/pci.c:595 [inline]
mlxsw_pci_cq_tasklet+0x12a6/0x2520 drivers/net/ethernet/mellanox/mlxsw/pci.c:651
tasklet_action_common.isra.0+0x13f/0x3e0 kernel/softirq.c:550
__do_softirq+0x223/0x964 kernel/softirq.c:292
asm_call_on_stack+0x12/0x20 arch/x86/entry/entry_64.S:711
</IRQ>
__run_on_irqstack arch/x86/include/asm/irq_stack.h:22 [inline]
run_on_irqstack_cond arch/x86/include/asm/irq_stack.h:48 [inline]
do_softirq_own_stack+0x109/0x140 arch/x86/kernel/irq_64.c:77
invoke_softirq kernel/softirq.c:387 [inline]
__irq_exit_rcu kernel/softirq.c:417 [inline]
irq_exit_rcu+0x16f/0x1a0 kernel/softirq.c:429
sysvec_apic_timer_interrupt+0x4e/0xd0 arch/x86/kernel/apic/apic.c:1091
asm_sysvec_apic_timer_interrupt+0x12/0x20 arch/x86/include/asm/idtentry.h:587
RIP: 0010:arch_local_irq_restore arch/x86/include/asm/irqflags.h:85 [inline]
RIP: 0010:__raw_spin_unlock_irqrestore include/linux/spinlock_api_smp.h:160 [inline]
RIP: 0010:_raw_spin_unlock_irqrestore+0x3b/0x40 kernel/locking/spinlock.c:191
Code: e8 2a c3 f4 fc 48 89 ef e8 12 96 f5 fc f6 c7 02 75 11 53 9d e8 d6 db 11 fd 65 ff 0d 1f 21 b3 56 5b 5d c3 e8 a7 d7 11 fd 53 9d <eb> ed 0f 1f 00 55 48 89 fd 65 ff 05 05 21 b3 56 ff 74 24 08 48 8d
RSP: 0018:ffff8880446ffd80 EFLAGS: 00000286
RAX: 0000000000000006 RBX: 0000000000000286 RCX: 0000000000000006
RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffffa94ecea9
RBP: ffff888012934408 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000001 R11: fffffbfff57be301 R12: 1ffff110088dffc1
R13: ffff888037b817c0 R14: ffff88802442415a R15: ffff888024424000
__do_sys_perf_event_open+0x1b5d/0x2bd0 kernel/events/core.c:11874
do_syscall_64+0x56/0xa0 arch/x86/entry/common.c:384
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x473dbd
Code: Bad RIP value.
RSP: 002b:00007f21e5e9cc28 EFLAGS: 00000246 ORIG_RAX: 000000000000012a
RAX: ffffffffffffffda RBX: 000000000057bf00 RCX: 0000000000473dbd
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000040
RBP: 000000000057bf00 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000003 R11: 0000000000000246 R12: 000000000057bf0c
R13: 00007ffd0493503f R14: 00000000004d0f46 R15: 00007f21e5e9cd80
Allocated by task 871:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
__kasan_kmalloc mm/kasan/common.c:494 [inline]
__kasan_kmalloc.constprop.0+0xc2/0xd0 mm/kasan/common.c:467
kmalloc include/linux/slab.h:555 [inline]
kzalloc include/linux/slab.h:669 [inline]
mlxsw_core_reg_access_emad+0x70/0x1410 drivers/net/ethernet/mellanox/mlxsw/core.c:1812
mlxsw_core_reg_access+0xeb/0x540 drivers/net/ethernet/mellanox/mlxsw/core.c:1991
mlxsw_sp_port_get_hw_xstats+0x335/0x7e0 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:1130
update_stats_cache+0xf4/0x140 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:1173
process_one_work+0xa3e/0x17a0 kernel/workqueue.c:2269
worker_thread+0x9e/0x1050 kernel/workqueue.c:2415
kthread+0x355/0x470 kernel/kthread.c:291
ret_from_fork+0x22/0x30 arch/x86/entry/entry_64.S:293
Freed by task 871:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
kasan_set_free_info mm/kasan/common.c:316 [inline]
__kasan_slab_free+0x12c/0x170 mm/kasan/common.c:455
slab_free_hook mm/slub.c:1474 [inline]
slab_free_freelist_hook mm/slub.c:1507 [inline]
slab_free mm/slub.c:3072 [inline]
kfree+0xe6/0x320 mm/slub.c:4052
mlxsw_core_reg_access_emad+0xd45/0x1410 drivers/net/ethernet/mellanox/mlxsw/core.c:1819
mlxsw_core_reg_access+0xeb/0x540 drivers/net/ethernet/mellanox/mlxsw/core.c:1991
mlxsw_sp_port_get_hw_xstats+0x335/0x7e0 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:1130
update_stats_cache+0xf4/0x140 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:1173
process_one_work+0xa3e/0x17a0 kernel/workqueue.c:2269
worker_thread+0x9e/0x1050 kernel/workqueue.c:2415
kthread+0x355/0x470 kernel/kthread.c:291
ret_from_fork+0x22/0x30 arch/x86/entry/entry_64.S:293
The buggy address belongs to the object at ffff88800b796400
which belongs to the cache kmalloc-512 of size 512
The buggy address is located 232 bytes inside of
512-byte region [ffff88800b796400, ffff88800b796600)
The buggy address belongs to the page:
page:ffffea00002de500 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 head:ffffea00002de500 order:2 compound_mapcount:0 compound_pincount:0
flags: 0x100000000010200(slab|head)
raw: 0100000000010200 dead000000000100 dead000000000122 ffff88806c402500
raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800b796380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800b796400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88800b796480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88800b796500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800b796580: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +1 -1
@@ -1814,7 +1814,7 @@ static int mlxsw_core_reg_access_emad(struct mlxsw_core *mlxsw_core, err =mlxsw_emad_reg_access (mlxsw_core, reg, payload, type, trans, bulk_list, cb, cb_priv, tid);if (err) { -kfree (trans); +kfree_rcu (trans, rcu);return err; }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 73/120 mlxsw: spectrum_router: Fix use-after-free in router init / de-init
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 5515c3448d55bdcb5ff8a1778aa84f34e4205596 ]
Several notifiers are registered as part of router initialization. Since some of these notifiers are registered before the end of the initialization, it is possible for them to access uninitialized or freed memory when processing notifications [1].
Additionally, some of these notifiers queue work items on a workqueue. If these work items are executed after the router was de-initialized, they will access freed memory.
Fix both problems by moving the registration of the notifiers to the end of the router initialization and flush the work queue after they are unregistered.
[1]
BUG: KASAN: use-after-free in __mutex_lock_common kernel/locking/mutex.c:938 [inline]
BUG: KASAN: use-after-free in __mutex_lock+0xeea/0x1340 kernel/locking/mutex.c:1103
Read of size 8 at addr ffff888038c3a6e0 by task kworker/u4:1/61
CPU: 1 PID: 61 Comm: kworker/u4:1 Not tainted 5.8.0-rc2+ #36
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014
Workqueue: mlxsw_core_ordered mlxsw_sp_inet6addr_event_work
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0xf6/0x16e lib/dump_stack.c:118
print_address_description.constprop.0+0x1c/0x250 mm/kasan/report.c:383
__kasan_report mm/kasan/report.c:513 [inline]
kasan_report.cold+0x1f/0x37 mm/kasan/report.c:530
__mutex_lock_common kernel/locking/mutex.c:938 [inline]
__mutex_lock+0xeea/0x1340 kernel/locking/mutex.c:1103
mlxsw_sp_inet6addr_event_work+0xb3/0x1b0 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c:7123
process_one_work+0xa3e/0x17a0 kernel/workqueue.c:2269
worker_thread+0x9e/0x1050 kernel/workqueue.c:2415
kthread+0x355/0x470 kernel/kthread.c:291
ret_from_fork+0x22/0x30 arch/x86/entry/entry_64.S:293
Allocated by task 1298:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
__kasan_kmalloc mm/kasan/common.c:494 [inline]
__kasan_kmalloc.constprop.0+0xc2/0xd0 mm/kasan/common.c:467
kmalloc include/linux/slab.h:555 [inline]
kzalloc include/linux/slab.h:669 [inline]
mlxsw_sp_router_init+0xb2/0x1d20 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c:8074
mlxsw_sp_init+0xbd8/0x3ac0 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:2932
__mlxsw_core_bus_device_register+0x657/0x10d0 drivers/net/ethernet/mellanox/mlxsw/core.c:1375
mlxsw_core_bus_device_register drivers/net/ethernet/mellanox/mlxsw/core.c:1436 [inline]
mlxsw_devlink_core_bus_device_reload_up+0xcd/0x150 drivers/net/ethernet/mellanox/mlxsw/core.c:1133
devlink_reload net/core/devlink.c:2959 [inline]
devlink_reload+0x281/0x3b0 net/core/devlink.c:2944
devlink_nl_cmd_reload+0x2f1/0x7c0 net/core/devlink.c:2987
genl_family_rcv_msg_doit net/netlink/genetlink.c:691 [inline]
genl_family_rcv_msg net/netlink/genetlink.c:736 [inline]
genl_rcv_msg+0x611/0x9d0 net/netlink/genetlink.c:753
netlink_rcv_skb+0x152/0x440 net/netlink/af_netlink.c:2469
genl_rcv+0x24/0x40 net/netlink/genetlink.c:764
netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline]
netlink_unicast+0x53a/0x750 net/netlink/af_netlink.c:1329
netlink_sendmsg+0x850/0xd90 net/netlink/af_netlink.c:1918
sock_sendmsg_nosec net/socket.c:652 [inline]
sock_sendmsg+0x150/0x190 net/socket.c:672
____sys_sendmsg+0x6d8/0x840 net/socket.c:2363
___sys_sendmsg+0xff/0x170 net/socket.c:2417
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2450
do_syscall_64+0x56/0xa0 arch/x86/entry/common.c:359
entry_SYSCALL_64_after_hwframe+0x44/0xa9
Freed by task 1348:
save_stack+0x1b/0x40 mm/kasan/common.c:48
set_track mm/kasan/common.c:56 [inline]
kasan_set_free_info mm/kasan/common.c:316 [inline]
__kasan_slab_free+0x12c/0x170 mm/kasan/common.c:455
slab_free_hook mm/slub.c:1474 [inline]
slab_free_freelist_hook mm/slub.c:1507 [inline]
slab_free mm/slub.c:3072 [inline]
kfree+0xe6/0x320 mm/slub.c:4063
mlxsw_sp_fini+0x340/0x4e0 drivers/net/ethernet/mellanox/mlxsw/spectrum.c:3132
mlxsw_core_bus_device_unregister+0x16c/0x6d0 drivers/net/ethernet/mellanox/mlxsw/core.c:1474
mlxsw_devlink_core_bus_device_reload_down+0x8e/0xc0 drivers/net/ethernet/mellanox/mlxsw/core.c:1123
devlink_reload+0xc6/0x3b0 net/core/devlink.c:2952
devlink_nl_cmd_reload+0x2f1/0x7c0 net/core/devlink.c:2987
genl_family_rcv_msg_doit net/netlink/genetlink.c:691 [inline]
genl_family_rcv_msg net/netlink/genetlink.c:736 [inline]
genl_rcv_msg+0x611/0x9d0 net/netlink/genetlink.c:753
netlink_rcv_skb+0x152/0x440 net/netlink/af_netlink.c:2469
genl_rcv+0x24/0x40 net/netlink/genetlink.c:764
netlink_unicast_kernel net/netlink/af_netlink.c:1303 [inline]
netlink_unicast+0x53a/0x750 net/netlink/af_netlink.c:1329
netlink_sendmsg+0x850/0xd90 net/netlink/af_netlink.c:1918
sock_sendmsg_nosec net/socket.c:652 [inline]
sock_sendmsg+0x150/0x190 net/socket.c:672
____sys_sendmsg+0x6d8/0x840 net/socket.c:2363
___sys_sendmsg+0xff/0x170 net/socket.c:2417
__sys_sendmsg+0xe5/0x1b0 net/socket.c:2450
do_syscall_64+0x56/0xa0 arch/x86/entry/common.c:359
entry_SYSCALL_64_after_hwframe+0x44/0xa9
The buggy address belongs to the object at ffff888038c3a000
which belongs to the cache kmalloc-2k of size 2048
The buggy address is located 1760 bytes inside of
2048-byte region [ffff888038c3a000, ffff888038c3a800)
The buggy address belongs to the page:
page:ffffea0000e30e00 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 head:ffffea0000e30e00 order:3 compound_mapcount:0 compound_pincount:0
flags: 0x100000000010200(slab|head)
raw: 0100000000010200 dead000000000100 dead000000000122 ffff88806c40c000
raw: 0000000000000000 0000000000080008 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888038c3a580: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888038c3a600: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff888038c3a680: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888038c3a700: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888038c3a780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- .../ethernet/mellanox/mlxsw/spectrum_router.c | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +26 -24
@@ -8072,16 +8072,6 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp, mlxsw_sp->router = router; router->mlxsw_sp = mlxsw_sp; - router->inetaddr_nb.notifier_call = mlxsw_sp_inetaddr_event; - err =register_inetaddr_notifier (&router->inetaddr_nb); -if (err) - goto err_register_inetaddr_notifier; - - router->inet6addr_nb.notifier_call = mlxsw_sp_inet6addr_event; - err =register_inet6addr_notifier (&router->inet6addr_nb); -if (err) - goto err_register_inet6addr_notifier; -INIT_LIST_HEAD (&mlxsw_sp->router->nexthop_neighs_list); err =__mlxsw_sp_router_init (mlxsw_sp);if (err)
@@ -8122,12 +8112,6 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp,if (err) goto err_neigh_init; - mlxsw_sp->router->netevent_nb.notifier_call = - mlxsw_sp_router_netevent_event; - err =register_netevent_notifier (&mlxsw_sp->router->netevent_nb); -if (err) - goto err_register_netevent_notifier; - err =mlxsw_sp_mp_hash_init (mlxsw_sp);if (err) goto err_mp_hash_init;
@@ -8136,6 +8120,22 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp,if (err) goto err_dscp_init; + router->inetaddr_nb.notifier_call = mlxsw_sp_inetaddr_event; + err =register_inetaddr_notifier (&router->inetaddr_nb); +if (err) + goto err_register_inetaddr_notifier; + + router->inet6addr_nb.notifier_call = mlxsw_sp_inet6addr_event; + err =register_inet6addr_notifier (&router->inet6addr_nb); +if (err) + goto err_register_inet6addr_notifier; + + mlxsw_sp->router->netevent_nb.notifier_call = + mlxsw_sp_router_netevent_event; + err =register_netevent_notifier (&mlxsw_sp->router->netevent_nb); +if (err) + goto err_register_netevent_notifier; + mlxsw_sp->router->fib_nb.notifier_call = mlxsw_sp_router_fib_event; err = register_fib_notifier(mlxsw_sp_net(mlxsw_sp), &mlxsw_sp->router->fib_nb,
@@ -8146,10 +8146,15 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp,return 0 ; err_register_fib_notifier: -err_dscp_init: -err_mp_hash_init:unregister_netevent_notifier (&mlxsw_sp->router->netevent_nb); err_register_netevent_notifier: +unregister_inet6addr_notifier (&router->inet6addr_nb); +err_register_inet6addr_notifier: +unregister_inetaddr_notifier (&router->inetaddr_nb); +err_register_inetaddr_notifier: +mlxsw_core_flush_owq (); +err_dscp_init: +err_mp_hash_init:mlxsw_sp_neigh_fini (mlxsw_sp); err_neigh_init:mlxsw_sp_vrs_fini (mlxsw_sp);
@@ -8168,10 +8173,6 @@ err_ipips_init: err_rifs_init:__mlxsw_sp_router_fini (mlxsw_sp); err_router_init: -unregister_inet6addr_notifier (&router->inet6addr_nb); -err_register_inet6addr_notifier: -unregister_inetaddr_notifier (&router->inetaddr_nb); -err_register_inetaddr_notifier:mutex_destroy (&mlxsw_sp->router->lock);kfree (mlxsw_sp->router);return err;
@@ -8182,6 +8183,9 @@ void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)unregister_fib_notifier (mlxsw_sp_net (mlxsw_sp), &mlxsw_sp->router->fib_nb);unregister_netevent_notifier (&mlxsw_sp->router->netevent_nb); +unregister_inet6addr_notifier (&mlxsw_sp->router->inet6addr_nb); +unregister_inetaddr_notifier (&mlxsw_sp->router->inetaddr_nb); +mlxsw_core_flush_owq ();mlxsw_sp_neigh_fini (mlxsw_sp);mlxsw_sp_vrs_fini (mlxsw_sp);mlxsw_sp_mr_fini (mlxsw_sp);
@@ -8191,8 +8195,6 @@ void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)mlxsw_sp_ipips_fini (mlxsw_sp);mlxsw_sp_rifs_fini (mlxsw_sp);__mlxsw_sp_router_fini (mlxsw_sp); -unregister_inet6addr_notifier (&mlxsw_sp->router->inet6addr_nb); -unregister_inetaddr_notifier (&mlxsw_sp->router->inetaddr_nb);mutex_destroy (&mlxsw_sp->router->lock);kfree (mlxsw_sp->router); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 74/120 selftests: ethtool: Fix test when only two speeds are supported
In reply to Greg Kroah-HartmanFrom: Amit Cohen <[email protected]>
[ Upstream commit 10fef9ca6a879e7bee090b8e51c9812d438d3fb1 ]
The test case check_highest_speed_is_chosen() configures $h1 to advertise a subset of its supported speeds and checks that $h2 chooses the highest speed from the subset.
To find the common advertised speeds between $h1 and $h2, common_speeds_get() is called.
Currently, the first speed returned from common_speeds_get() is removed claiming "h1 does not advertise this speed". The claim is wrong because the function is called after $h1 already advertised a subset of speeds.
In case $h1 supports only two speeds, it will advertise a single speed which will be later removed because of previously mentioned bug. This results in the test needlessly failing. When more than two speeds are supported this is not an issue because the first advertised speed is the lowest one.
Fix this by not removing any speed from the list of commonly advertised speeds.
--- tools/testing/selftests/net/forwarding/ethtool.sh | 2 -- 1 file changed, 2 deletions(-)
tools/testing/selftests/net/forwarding/ethtool.sh +0 -2
@@ -252,8 +252,6 @@ check_highest_speed_is_chosen() fi local -a speeds_arr=($(common_speeds_get $h1 $h2 0 1)) - # Remove the first speed, h1 does not advertise this speed. - unset speeds_arr[0] max_speed=${speeds_arr[0]} for current in ${speeds_arr[@]}; do
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 75/120 ibmvnic: Fix IRQ mapping disposal in error path
In reply to Greg Kroah-HartmanFrom: Thomas Falcon <[email protected]>
[ Upstream commit 27a2145d6f826d1fad9de06ac541b1016ced3427 ]
RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ error paths. Fix this and dispose of TX IRQ mappings correctly in case of an error.
--- drivers/net/ethernet/ibm/ibmvnic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -3206,7 +3206,7 @@ req_rx_irq_failed: req_tx_irq_failed:for (j =0 ; j < i; j++) {free_irq (adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]); -irq_dispose_mapping (adapter->rx_scrq[j]->irq); +irq_dispose_mapping (adapter->tx_scrq[j]->irq); }release_sub_crqs (adapter,1 );return rc;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/120 bpf: Fix map leak in HASH_OF_MAPS map
In reply to Greg Kroah-HartmanFrom: Andrii Nakryiko <[email protected]>
[ Upstream commit 1d4e1eab456e1ee92a94987499b211db05f900ea ]
Fix HASH_OF_MAPS bug of not putting inner map pointer on bpf_map_elem_update() operation. This is due to per-cpu extra_elems optimization, which bypassed free_htab_elem() logic doing proper clean ups. Make sure that inner map is put properly in optimized case as well.
--- kernel/bpf/hashtab.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
kernel/bpf/hashtab.c +9 -3
@@ -779,15 +779,20 @@ static void htab_elem_free_rcu(struct rcu_head *head)htab_elem_free (htab, l); } -static void free_htab_elem (struct bpf_htab *htab,struct htab_elem *l) +static void htab_put_fd_value (struct bpf_htab *htab,struct htab_elem *l) {struct bpf_map *map = &htab->map; +void *ptr;if (map->ops->map_fd_put_ptr) { -void *ptr =fd_htab_map_get_ptr (map, l); - + ptr =fd_htab_map_get_ptr (map, l); map->ops->map_fd_put_ptr (ptr); } +} + +static void free_htab_elem (struct bpf_htab *htab,struct htab_elem *l) +{ +htab_put_fd_value (htab, l);if (htab_is_prealloc (htab)) {__pcpu_freelist_push (&htab->freelist, &l->fnode);
@@ -839,6 +844,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,*/ pl_new =this_cpu_ptr (htab->extra_elems); l_new = *pl_new; +htab_put_fd_value (htab, old_elem); *pl_new = old_elem; }else {struct pcpu_freelist_node *l;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 77/120 espintcp: handle short messages instead of breaking the encap socket
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit fadd1a63a7b4df295a01fa50b2f4e447542bee59 ]
Currently, short messages (less than 4 bytes after the length header) will break the stream of messages. This is unnecessary, since we can still parse messages even if they're too short to contain any usable data. This is also bogus, as keepalive messages (a single 0xff byte), though not needed with TCP encapsulation, should be allowed.
This patch changes the stream parser so that short messages are accepted and dropped in the kernel. Messages that contain a valid SPI or non-ESP header are processed as before.
--- net/xfrm/espintcp.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
net/xfrm/espintcp.c +24 -1
@@ -41,9 +41,32 @@ static void espintcp_rcv(struct strparser *strp, struct sk_buff *skb) struct espintcp_ctx *ctx = container_of(strp, struct espintcp_ctx, strp);struct strp_msg *rxm =strp_msg (skb); +int len = rxm->full_len -2 ;u32 nonesp_marker;int err; +/* keepalive packet? */ +if (unlikely (len ==1 )) { +u8 data; + + err =skb_copy_bits (skb, rxm->offset +2 , &data,1 ); +if (err <0 ) { +kfree_skb (skb); +return ; + } + +if (data ==0xff ) { +kfree_skb (skb); +return ; + } + } + +/* drop other short messages */ +if (unlikely (len <=sizeof (nonesp_marker))) { +kfree_skb (skb); +return ; + } + err =skb_copy_bits (skb, rxm->offset +2 , &nonesp_marker,sizeof (nonesp_marker));if (err <0 ) {
@@ -83,7 +106,7 @@ static int espintcp_parse(struct strparser *strp, struct sk_buff *skb)return err; len =be16_to_cpu (blen); -if (len <6 ) +if (len <2 )return -EINVAL ;return len;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/120 mac80211: mesh: Free ie data when leaving mesh
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit 6a01afcf8468d3ca2bd8bbb27503f60dcf643b20 ]
At ieee80211_join_mesh() some ie data could have been allocated (see copy_mesh_setup()) and need to be cleaned up when leaving the mesh.
This fixes the following kmemleak report:
unreferenced object 0xffff0000116bc600 (size 128):
comm "wpa_supplicant", pid 608, jiffies 4294898983 (age 293.484s) hex dump (first 32 bytes):
30 14 01 00 00 0f ac 04 01 00 00 0f ac 04 01 00 0...............
00 0f ac 08 00 00 00 00 c4 65 40 00 00 00 00 00 .........e@.....
backtrace:
[<00000000bebe439d>] __kmalloc_track_caller+0x1c0/0x330
[<00000000a349dbe1>] kmemdup+0x28/0x50
[<0000000075d69baa>] ieee80211_join_mesh+0x6c/0x3b8 [mac80211]
[<00000000683bb98b>] __cfg80211_join_mesh+0x1e8/0x4f0 [cfg80211]
[<0000000072cb507f>] nl80211_join_mesh+0x520/0x6b8 [cfg80211]
[<0000000077e9bcf9>] genl_family_rcv_msg+0x374/0x680
[<00000000b1bd936d>] genl_rcv_msg+0x78/0x108
[<0000000022c53788>] netlink_rcv_skb+0xb0/0x1c0
[<0000000011af8ec9>] genl_rcv+0x34/0x48
[<0000000069e41f53>] netlink_unicast+0x268/0x2e8
[<00000000a7517316>] netlink_sendmsg+0x320/0x4c0
[<0000000069cba205>] ____sys_sendmsg+0x354/0x3a0
[<00000000e06bab0f>] ___sys_sendmsg+0xd8/0x120
[<0000000037340728>] __sys_sendmsg+0xa4/0xf8
[<000000004fed9776>] __arm64_sys_sendmsg+0x44/0x58
[<000000001c1e5647>] el0_svc_handler+0xd0/0x1a0--- net/mac80211/cfg.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/cfg.c +1 -0
@@ -2140,6 +2140,7 @@ static int ieee80211_leave_mesh(struct wiphy *wiphy, struct net_device *dev)ieee80211_stop_mesh (sdata);mutex_lock (&sdata->local->mtx);ieee80211_vif_release_channel (sdata); +kfree (sdata->u.mesh.ie);mutex_unlock (&sdata->local->mtx);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/120 mac80211: mesh: Free pending skb when destroying a mpath
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit 5e43540c2af0a0c0a18e39579b1ad49541f87506 ]
A mpath object can hold reference on a list of skb that are waiting for mpath resolution to be sent. When destroying a mpath this skb list should be cleaned up in order to not leak memory.
Fixing that kind of leak:
unreferenced object 0xffff0000181c9300 (size 1088):
comm "openvpn", pid 1782, jiffies 4295071698 (age 80.416s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 f9 80 36 00 00 00 00 00 ..........6.....
02 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
backtrace:
[<000000004bc6a443>] kmem_cache_alloc+0x1a4/0x2f0
[<000000002caaef13>] sk_prot_alloc.isra.39+0x34/0x178
[<00000000ceeaa916>] sk_alloc+0x34/0x228
[<00000000ca1f1d04>] inet_create+0x198/0x518
[<0000000035626b1c>] __sock_create+0x134/0x328
[<00000000a12b3a87>] __sys_socket+0xb0/0x158
[<00000000ff859f23>] __arm64_sys_socket+0x40/0x58
[<00000000263486ec>] el0_svc_handler+0xd0/0x1a0
[<0000000005b5157d>] el0_svc+0x8/0xc
unreferenced object 0xffff000012973a40 (size 216):
comm "openvpn", pid 1782, jiffies 4295082137 (age 38.660s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 c0 06 16 00 00 ff ff 00 93 1c 18 00 00 ff ff ................
backtrace:
[<000000004bc6a443>] kmem_cache_alloc+0x1a4/0x2f0
[<0000000023c8c8f9>] __alloc_skb+0xc0/0x2b8
[<000000007ad950bb>] alloc_skb_with_frags+0x60/0x320
[<00000000ef90023a>] sock_alloc_send_pskb+0x388/0x3c0
[<00000000104fb1a3>] sock_alloc_send_skb+0x1c/0x28
[<000000006919d2dd>] __ip_append_data+0xba4/0x11f0
[<0000000083477587>] ip_make_skb+0x14c/0x1a8
[<0000000024f3d592>] udp_sendmsg+0xaf0/0xcf0
[<000000005aabe255>] inet_sendmsg+0x5c/0x80
[<000000008651ea08>] __sys_sendto+0x15c/0x218
[<000000003505c99b>] __arm64_sys_sendto+0x74/0x90
[<00000000263486ec>] el0_svc_handler+0xd0/0x1a0
[<0000000005b5157d>] el0_svc+0x8/0xc--- net/mac80211/mesh_pathtbl.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/mesh_pathtbl.c +1 -0
@@ -521,6 +521,7 @@ static void mesh_path_free_rcu(struct mesh_table *tbl,del_timer_sync (&mpath->timer);atomic_dec (&sdata->u.mesh.mpaths);atomic_dec (&tbl->entries); +mesh_path_flush_pending (mpath);kfree_rcu (mpath, rcu); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/120 RDMA/core: Stop DIM before destroying CQ
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 5d46b289d04b98eb992b2f8b67745cc0953e16b1 ]
HW destroy operation should be last operation after all possible CQ users completed their work, so move DIM work cancellation before such destroy call.
--- drivers/infiniband/core/cq.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/infiniband/core/cq.c +10 -3
@@ -68,6 +68,15 @@ static void rdma_dim_init(struct ib_cq *cq)INIT_WORK (&dim->work, ib_cq_rdma_dim_work); } +static void rdma_dim_destroy (struct ib_cq *cq) +{ +if (!cq->dim) +return ; + +cancel_work_sync (&cq->dim->work); +kfree (cq->dim); +} +static int __poll_cq (struct ib_cq *cq,int num_entries,struct ib_wc *wc) {int rc;
@@ -324,12 +333,10 @@ void ib_free_cq_user(struct ib_cq *cq, struct ib_udata *udata)WARN_ON_ONCE (1 ); } +rdma_dim_destroy (cq);trace_cq_free (cq);rdma_restrack_del (&cq->res); cq->device->ops.destroy_cq (cq, udata); -if (cq->dim) -cancel_work_sync (&cq->dim->work); -kfree (cq->dim);kfree (cq->wc);kfree (cq); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 81/120 RDMA/core: Free DIM memory in error unwind
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit fb448ce87a4a9482b084e67faf804aec79ed9b43 ]
The memory allocated for the DIM wasn't freed in in error unwind path, fix it by calling to rdma_dim_destroy().
--- drivers/infiniband/core/cq.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/cq.c +1 -0
@@ -270,6 +270,7 @@ struct ib_cq *__ib_alloc_cq_user(struct ib_device *dev, void *private,return cq; out_destroy_cq: +rdma_dim_destroy (cq);rdma_restrack_del (&cq->res); cq->device->ops.destroy_cq (cq, udata); out_free_wc:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 82/120 arm64/alternatives: move length validation inside the subsection
In reply to Greg Kroah-HartmanFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 966a0acce2fca776391823381dba95c40e03c339 ]
Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.
--- arch/arm64/include/asm/alternative.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/alternative.h +2 -2
@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { }"663:\n\t" \ newinstr"\n" \"664:\n\t" \ -".previous\n\t" \".org . - (664b-663b) + (662b-661b)\n\t" \ -".org . - (662b-661b) + (664b-663b)\n" \ +".org . - (662b-661b) + (664b-663b)\n\t" \ +".previous\n" \".endif\n" #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb) \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 83/120 arm64: csum: Fix handling of bad packets
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit 05fb3dbda187bbd9cc1cd0e97e5d6595af570ac6 ]
Although iph is expected to point to at least 20 bytes of valid memory, ihl may be bogus, for example on reception of a corrupt packet. If it happens to be less than 5, we really don't want to run away and dereference 16GB worth of memory until it wraps back to exactly zero...
--- arch/arm64/include/asm/checksum.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/include/asm/checksum.h +3 -2
@@ -24,16 +24,17 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) {__uint128_t tmp;u64 sum; +int n = ihl;/* we want it signed */ tmp = *(const __uint128_t *)iph; iph +=16 ; - ihl -=4 ; + n -=4 ; tmp += ((tmp >>64 ) | (tmp <<64 )); sum = tmp >>64 ;do { sum += *(const u32 *)iph; iph +=4 ; - }while (--ihl); + }while (--n >0 ); sum += ((sum >>32 ) | (sum <<32 ));return csum_fold ((__force u32)(sum >>32 ));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 84/120 Bluetooth: fix kernel oops in store_pending_adv_report
In reply to Greg Kroah-HartmanFrom: Alain Michaud <[email protected]>
[ Upstream commit a2ec905d1e160a33b2e210e45ad30445ef26ce0e ]
Fix kernel oops observed when an ext adv data is larger than 31 bytes.
This can be reproduced by setting up an advertiser with advertisement larger than 31 bytes. The issue is not sensitive to the advertisement content. In particular, this was reproduced with an advertisement of 229 bytes filled with 'A'. See stack trace below.
This is fixed by not catching ext_adv as legacy adv are only cached to be able to concatenate a scanable adv with its scan response before sending it up through mgmt.
With ext_adv, this is no longer necessary.
general protection fault: 0000 [#1] SMP PTI
CPU: 6 PID: 205 Comm: kworker/u17:0 Not tainted 5.4.0-37-generic #41-Ubuntu
Hardware name: Dell Inc. XPS 15 7590/0CF6RR, BIOS 1.7.0 05/11/2020
Workqueue: hci0 hci_rx_work [bluetooth]
RIP: 0010:hci_bdaddr_list_lookup+0x1e/0x40 [bluetooth]
Code: ff ff e9 26 ff ff ff 0f 1f 44 00 00 0f 1f 44 00 00 55 48 8b 07 48 89 e5 48 39 c7 75 0a eb 24 48 8b 00 48 39 f8 74 1c 44 8b 06 <44> 39 40 10 75 ef 44 0f b7 4e 04 66 44 39 48 14 75 e3 38 50 16 75
RSP: 0018:ffffbc6a40493c70 EFLAGS: 00010286
RAX: 4141414141414141 RBX: 000000000000001b RCX: 0000000000000000
RDX: 0000000000000000 RSI: ffff9903e76c100f RDI: ffff9904289d4b28
RBP: ffffbc6a40493c70 R08: 0000000093570362 R09: 0000000000000000
R10: 0000000000000000 R11: ffff9904344eae38 R12: ffff9904289d4000
R13: 0000000000000000 R14: 00000000ffffffa3 R15: ffff9903e76c100f
FS: 0000000000000000(0000) GS:ffff990434580000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007feed125a000 CR3: 00000001b860a003 CR4: 00000000003606e0
Call Trace:
process_adv_report+0x12e/0x560 [bluetooth]
hci_le_meta_evt+0x7b2/0xba0 [bluetooth]
hci_event_packet+0x1c29/0x2a90 [bluetooth]
hci_rx_work+0x19b/0x360 [bluetooth]
process_one_work+0x1eb/0x3b0
worker_thread+0x4d/0x400
kthread+0x104/0x140--- net/bluetooth/hci_event.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
net/bluetooth/hci_event.c +19 -7
@@ -1305,6 +1305,9 @@ static void store_pending_adv_report(struct hci_dev *hdev, bdaddr_t *bdaddr, {struct discovery_state *d = &hdev->discovery; +if (len >HCI_MAX_AD_LENGTH ) +return ; +bacpy (&d->last_adv_addr, bdaddr); d->last_adv_addr_type = bdaddr_type; d->last_adv_rssi = rssi;
@@ -5317,7 +5320,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev,static void process_adv_report (struct hci_dev *hdev,u8 type,bdaddr_t *bdaddr,u8 bdaddr_type,bdaddr_t *direct_addr, -u8 direct_addr_type,s8 rssi,u8 *data,u8 len) +u8 direct_addr_type,s8 rssi,u8 *data,u8 len, +bool ext_adv) {struct discovery_state *d = &hdev->discovery;struct smp_irk *irk;
@@ -5339,6 +5343,11 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,return ; } +if (!ext_adv && len >HCI_MAX_AD_LENGTH ) { +bt_dev_err_ratelimited (hdev,"legacy adv larger than 31 bytes" ); +return ; + } +/* Find the end of the data in case the report contains padded zero * bytes at the end causing an invalid length value. *
@@ -5398,7 +5407,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,*/ conn =check_pending_le_conn (hdev, bdaddr, bdaddr_type, type, direct_addr); -if (conn && type ==LE_ADV_IND ) { +if (!ext_adv && conn && type ==LE_ADV_IND && len <=HCI_MAX_AD_LENGTH ) {/* Store report for later inclusion by * mgmt_device_connected */
@@ -5452,7 +5461,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,* event or send an immediate device found event if the data * should not be stored for later. */ -if (!has_pending_adv_report (hdev)) { +if (!ext_adv && !has_pending_adv_report (hdev)) {/* If the report will trigger a SCAN_REQ store it for * later merging. */
@@ -5487,7 +5496,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,/* If the new report will trigger a SCAN_REQ store it for * later merging. */ -if (type ==LE_ADV_IND || type ==LE_ADV_SCAN_IND ) { +if (!ext_adv && (type ==LE_ADV_IND || + type ==LE_ADV_SCAN_IND )) {store_pending_adv_report (hdev, bdaddr, bdaddr_type, rssi, flags, data, len);return ;
@@ -5527,7 +5537,7 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) rssi = ev->data[ev->length];process_adv_report (hdev, ev->evt_type, &ev->bdaddr, ev->bdaddr_type,NULL ,0 , rssi, - ev->data, ev->length); + ev->data, ev->length, false); }else {bt_dev_err (hdev,"Dropping invalid advertising data" ); }
@@ -5599,7 +5609,8 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)if (legacy_evt_type !=LE_ADV_INVALID ) {process_adv_report (hdev, legacy_evt_type, &ev->bdaddr, ev->bdaddr_type,NULL ,0 , ev->rssi, - ev->data, ev->length); + ev->data, ev->length, + !(evt_type &LE_EXT_ADV_LEGACY_PDU )); } ptr +=sizeof (*ev) + ev->length;
@@ -5797,7 +5808,8 @@ static void hci_le_direct_adv_report_evt(struct hci_dev *hdev,process_adv_report (hdev, ev->evt_type, &ev->bdaddr, ev->bdaddr_type, &ev->direct_addr, - ev->direct_addr_type, ev->rssi,NULL ,0 ); + ev->direct_addr_type, ev->rssi,NULL ,0 , + false); ptr +=sizeof (*ev); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 85/120 selftests/bpf: fix netdevsim trap_flow_action_cookie read
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 4bbca662df2523ff7ad3224463f1f28e6a118044 ]
When read netdevsim trap_flow_action_cookie, we need to init it first, or we will get "Invalid argument" error.
--- tools/testing/selftests/bpf/test_offload.py | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/bpf/test_offload.py +3 -0
@@ -318,6 +318,9 @@ class DebugfsDir: continue if os.path.isfile(p): + # We need to init trap_flow_action_cookie before read it + if f == "trap_flow_action_cookie": + cmd('echo deadbeef > %s/%s' % (path, f)) _, out = cmd('cat %s/%s' % (path, f)) dfs[f] = out.strip() elif os.path.isdir(p):
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 86/120 net: nixge: fix potential memory leak in nixge_probe()
In reply to Greg Kroah-HartmanFrom: Lu Wei <[email protected]>
[ Upstream commit 366228ed01f6882cc203e3d5b40010dfae0be1c3 ]
If some processes in nixge_probe() fail, free_netdev(dev) needs to be called to aviod a memory leak.
--- drivers/net/ethernet/ni/nixge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/ni/nixge.c +5 -3
@@ -1298,19 +1298,21 @@ static int nixge_probe(struct platform_device *pdev)netif_napi_add (ndev, &priv->napi, nixge_poll,NAPI_POLL_WEIGHT ); err =nixge_of_get_resources (pdev);if (err) -return err; + goto free_netdev;__nixge_hw_set_mac_address (ndev); priv->tx_irq =platform_get_irq_byname (pdev,"tx" );if (priv->tx_irq <0 ) {netdev_err (ndev,"could not find 'tx' irq" ); -return priv->tx_irq; + err = priv->tx_irq; + goto free_netdev; } priv->rx_irq =platform_get_irq_byname (pdev,"rx" );if (priv->rx_irq <0 ) {netdev_err (ndev,"could not find 'rx' irq" ); -return priv->rx_irq; + err = priv->rx_irq; + goto free_netdev; } priv->coalesce_count_rx =XAXIDMA_DFT_RX_THRESHOLD ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 87/120 net: ethernet: mtk_eth_soc: fix MTU warnings
In reply to Greg Kroah-HartmanFrom: Landen Chao <[email protected]>
[ Upstream commit 555a893303872e044fb86f0a5834ce78d41ad2e2 ]
in recent kernel versions there are warnings about incorrect MTU size like these:
eth0: mtu greater than device maximummtk_soc_eth 1b100000.ethernet eth0: error -22 setting MTU to include DSA overhead
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -0
@@ -2882,6 +2882,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) eth->netdev[id]->irq = eth->irq[0 ]; eth->netdev[id]->dev.of_node = np; + eth->netdev[id]->max_mtu =MTK_MAX_RX_LENGTH -MTK_RX_ETH_HLEN ; +return 0 ; free_netdev:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 88/120 ionic: unlock queue mutex in error path
In reply to Greg Kroah-HartmanFrom: Shannon Nelson <[email protected]>
[ Upstream commit 59929fbb45e06da7d501d3a97f10a91912181f7c ]
On an error return, jump to the unlock at the end to be sure to unlock the queue_lock mutex.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +3 -1
@@ -1959,7 +1959,7 @@ int ionic_reset_queues(struct ionic_lif *lif, ionic_reset_cb cb, void *arg)netif_device_detach (lif->netdev); err =ionic_stop (lif->netdev);if (err) -return err; + goto reset_out; }if (cb)
@@ -1969,6 +1969,8 @@ int ionic_reset_queues(struct ionic_lif *lif, ionic_reset_cb cb, void *arg) err =ionic_open (lif->netdev);netif_device_attach (lif->netdev); } + +reset_out:mutex_unlock (&lif->queue_lock);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/120 net: gemini: Fix missing clk_disable_unprepare() in error path of gemini_ethernet_port_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 85496a29224188051b6135eb38da8afd4c584765 ]
Fix the missing clk_disable_unprepare() before return from gemini_ethernet_port_probe() in the error handling case.
--- drivers/net/ethernet/cortina/gemini.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/cortina/gemini.c +4 -1
@@ -2445,6 +2445,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) port->reset =devm_reset_control_get_exclusive (dev,NULL );if (IS_ERR (port->reset)) {dev_err (dev,"no reset\n" ); +clk_disable_unprepare (port->pclk);return PTR_ERR (port->reset); }reset_control_reset (port->reset);
@@ -2500,8 +2501,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)IRQF_SHARED , port_names[port->id], port); -if (ret) +if (ret) { +clk_disable_unprepare (port->pclk);return ret; + } ret =register_netdev (netdev);if (!ret) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/120 net/mlx5e: E-Switch, Add misc bit when misc fields changed for mirroring
In reply to Greg Kroah-HartmanFrom: Jianbo Liu <[email protected]>
[ Upstream commit 0faddfe6b7953e224a1283f89f671ef6a9ba73de ]
The modified flow_context fields in FTE must be indicated in modify_enable bitmask. Previously, the misc bit in modify_enable is always set as source vport must be set for each rule. So, when parsing vxlan/gre/geneve/qinq rules, this bit is not set because those are all from the same misc fileds that source vport fields are located at, and we don't need to set the indicator twice.
After adding per vport tables for mirroring, misc bit is not set, then firmware syndrome happens. To fix it, set the bit wherever misc fileds are changed. This also makes it unnecessary to check misc fields and set the misc bit accordingly in metadata matching, so here remove it.
Besides, flow_source must be specified for uplink because firmware will check it and some actions are only allowed for packets received from uplink.
--- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +++--- 5 files changed, 10 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c +2 -0
@@ -301,6 +301,8 @@ static int mlx5e_tc_tun_parse_geneve_params(struct mlx5e_priv *priv,MLX5_SET (fte_match_set_misc, misc_v, geneve_protocol_type,ETH_P_TEB ); } + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS ; +return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c +2 -0
@@ -80,6 +80,8 @@ static int mlx5e_tc_tun_parse_gretap(struct mlx5e_priv *priv, gre_key.key, be32_to_cpu(enc_keyid.key->keyid)); } + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS ; +return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c +2 -0
@@ -136,6 +136,8 @@ static int mlx5e_tc_tun_parse_vxlan(struct mlx5e_priv *priv,MLX5_SET (fte_match_set_misc, misc_v, vxlan_vni,be32_to_cpu (enc_keyid.key->keyid)); + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS ; +return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +1 -0
@@ -2256,6 +2256,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, match.key->vlan_priority); *match_level =MLX5_MATCH_L2 ; + spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS ; } }
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +3 -3
@@ -264,9 +264,6 @@ mlx5_eswitch_set_rule_source_port(struct mlx5_eswitch *esw, mlx5_eswitch_get_vport_metadata_mask()); spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS_2 ; - misc =MLX5_ADDR_OF (fte_match_param, spec->match_criteria, misc_parameters); -if (memchr_inv (misc,0 ,MLX5_ST_SZ_BYTES (fte_match_set_misc))) - spec->match_criteria_enable |=MLX5_MATCH_MISC_PARAMETERS ; }else { misc =MLX5_ADDR_OF (fte_match_param, spec->match_value, misc_parameters);MLX5_SET (fte_match_set_misc, misc, source_port, attr->in_rep->vport);
@@ -381,6 +378,9 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, flow_act.modify_hdr = attr->modify_hdr;if (split) { +if (MLX5_CAP_ESW_FLOWTABLE (esw->dev, flow_source) && + attr->in_rep->vport ==MLX5_VPORT_UPLINK ) + spec->flow_context.flow_source =MLX5_FLOW_CONTEXT_FLOW_SOURCE_UPLINK ; fdb =esw_vport_tbl_get (esw, attr); }else {if (attr->chain || attr->prio)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/120 net/mlx5e: fix bpf_prog reference count leaks in mlx5e_alloc_rq
In reply to Greg Kroah-HartmanFrom: Xin Xiong <[email protected]>
[ Upstream commit e692139e6af339a1495ef401b2d95f7f9d1c7a44 ]
The function invokes bpf_prog_inc(), which increases the reference count of a bpf_prog object "rq->xdp_prog" if the object isn't NULL.
The refcount leak issues take place in two error handling paths. When either mlx5_wq_ll_create() or mlx5_wq_cyc_create() fails, the function simply returns the error code and forgets to drop the reference count increased earlier, causing a reference count leak of "rq->xdp_prog".
Fix this issue by jumping to the error handling path err_rq_wq_destroy while either function fails.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +2 -2
@@ -422,7 +422,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, err =mlx5_wq_ll_create (mdev, &rqp->wq, rqc_wq, &rq->mpwqe.wq, &rq->wq_ctrl);if (err) -return err; + goto err_rq_wq_destroy; rq->mpwqe.wq.db = &rq->mpwqe.wq.db[MLX5_RCV_DBR ];
@@ -475,7 +475,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, err =mlx5_wq_cyc_create (mdev, &rqp->wq, rqc_wq, &rq->wqe.wq, &rq->wq_ctrl);if (err) -return err; + goto err_rq_wq_destroy; rq->wqe.wq.db = &rq->wqe.wq.db[MLX5_RCV_DBR ];
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 92/120 perf tools: Fix record failure when mixed with ARM SPE event
In reply to Greg Kroah-HartmanFrom: Wei Li <[email protected]>
[ Upstream commit bd3c628f8fafa6cbd6a1ca440034b841f0080160 ]
When recording with cache-misses and arm_spe_x event, I found that it will just fail without showing any error info if i put cache-misses after 'arm_spe_x' event.
[root@localhost 0620]# perf record -e cache-misses \ -e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ sleep 1
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.067 MB perf.data ]
[root@localhost 0620]#
[root@localhost 0620]# perf record -e arm_spe_0/ts_enable=1,pct_enable=1,pa_enable=1,load_filter=1,jitter=1,store_filter=1,min_latency=0/ \
-e cache-misses sleep 1
[root@localhost 0620]#
The current code can only work if the only event to be traced is an 'arm_spe_x', or if it is the last event to be specified. Otherwise the last event type will be checked against all the arm_spe_pmus[i]->types, none will match and an out of bound 'i' index will be used in arm_spe_recording_init().
We don't support concurrent multiple arm_spe_x events currently, that is checked in arm_spe_recording_options(), and it will show the relevant info. So add the check and record of the first found 'arm_spe_pmu' to fix this issue here.
--- tools/perf/arch/arm/util/auxtrace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/arch/arm/util/auxtrace.c +4 -4
@@ -56,7 +56,7 @@ struct auxtrace_recordstruct perf_pmu *cs_etm_pmu;struct evsel *evsel;bool found_etm = false; -bool found_spe = false; +struct perf_pmu *found_spe =NULL ;static struct perf_pmu **arm_spe_pmus =NULL ;static int nr_spes =0 ;int i =0 ;
@@ -74,12 +74,12 @@ struct auxtrace_record evsel->core.attr.type == cs_etm_pmu->type) found_etm = true; -if (!nr_spes) +if (!nr_spes || found_spe)continue ;for (i =0 ; i < nr_spes; i++) {if (evsel->core.attr.type == arm_spe_pmus[i]->type) { - found_spe = true; + found_spe = arm_spe_pmus[i];break ; } }
@@ -96,7 +96,7 @@ struct auxtrace_record#if defined(__aarch64__)if (found_spe) -return arm_spe_recording_init (err, arm_spe_pmus[i]); +return arm_spe_recording_init (err, found_spe);#endif /*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 93/120 vxlan: fix memleak of fdb
In reply to Greg Kroah-HartmanFrom: Taehee Yoo <[email protected]>
[ Upstream commit fda2ec62cf1aa7cbee52289dc8059cd3662795da ]
When vxlan interface is deleted, all fdbs are deleted by vxlan_flush(). vxlan_flush() flushes fdbs but it doesn't delete fdb, which contains all-zeros-mac because it is deleted by vxlan_uninit().
But vxlan_uninit() deletes only the fdb, which contains both all-zeros-mac and default vni.
So, the fdb, which contains both all-zeros-mac and non-default vni will not be deleted.
Test commands:
ip link add vxlan0 type vxlan dstport 4789 external
ip link set vxlan0 up
bridge fdb add to 00:00:00:00:00:00 dst 172.0.0.1 dev vxlan0 via lo \
src_vni 10000 self permanent
ip link del vxlan0
kmemleak reports as follows:
unreferenced object 0xffff9486b25ced88 (size 96):
comm "bridge", pid 2151, jiffies 4294701712 (age 35506.901s) hex dump (first 32 bytes):
02 00 00 00 ac 00 00 01 40 00 09 b1 86 94 ff ff ........@.......
46 02 00 00 00 00 00 00 a7 03 00 00 12 b5 6a 6b F.............jk
backtrace:
[<00000000c10cf651>] vxlan_fdb_append.part.51+0x3c/0xf0 [vxlan]
[<000000006b31a8d9>] vxlan_fdb_create+0x184/0x1a0 [vxlan]
[<0000000049399045>] vxlan_fdb_update+0x12f/0x220 [vxlan]
[<0000000090b1ef00>] vxlan_fdb_add+0x12a/0x1b0 [vxlan]
[<0000000056633c2c>] rtnl_fdb_add+0x187/0x270
[<00000000dd5dfb6b>] rtnetlink_rcv_msg+0x264/0x490
[<00000000fc44dd54>] netlink_rcv_skb+0x4a/0x110
[<00000000dff433e7>] netlink_unicast+0x18e/0x250
[<00000000b87fb421>] netlink_sendmsg+0x2e9/0x400
[<000000002ed55153>] ____sys_sendmsg+0x237/0x260
[<00000000faa51c66>] ___sys_sendmsg+0x88/0xd0
[<000000006c3982f1>] __sys_sendmsg+0x4e/0x80
[<00000000a8f875d2>] do_syscall_64+0x56/0xe0
[<000000003610eefa>] entry_SYSCALL_64_after_hwframe+0x44/0xa9unreferenced object 0xffff9486b1c40080 (size 128):
comm "bridge", pid 2157, jiffies 4294701754 (age 35506.866s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 f8 dc 42 b2 86 94 ff ff ..........B..... 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
backtrace:
[<00000000a2981b60>] vxlan_fdb_create+0x67/0x1a0 [vxlan]
[<0000000049399045>] vxlan_fdb_update+0x12f/0x220 [vxlan]
[<0000000090b1ef00>] vxlan_fdb_add+0x12a/0x1b0 [vxlan]
[<0000000056633c2c>] rtnl_fdb_add+0x187/0x270
[<00000000dd5dfb6b>] rtnetlink_rcv_msg+0x264/0x490
[<00000000fc44dd54>] netlink_rcv_skb+0x4a/0x110
[<00000000dff433e7>] netlink_unicast+0x18e/0x250
[<00000000b87fb421>] netlink_sendmsg+0x2e9/0x400
[<000000002ed55153>] ____sys_sendmsg+0x237/0x260
[<00000000faa51c66>] ___sys_sendmsg+0x88/0xd0
[<000000006c3982f1>] __sys_sendmsg+0x4e/0x80
[<00000000a8f875d2>] do_syscall_64+0x56/0xe0
[<000000003610eefa>] entry_SYSCALL_64_after_hwframe+0x44/0xa9--- drivers/net/vxlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/vxlan.c +4 -2
@@ -2863,8 +2863,10 @@ static void vxlan_flush(struct vxlan_dev *vxlan, bool do_all)if (!do_all && (f->state & (NUD_PERMANENT |NUD_NOARP )))continue ;/* the all_zeros_mac entry is deleted at vxlan_uninit */ -if (!is_zero_ether_addr (f->eth_addr)) -vxlan_fdb_destroy (vxlan, f, true, true); +if (is_zero_ether_addr (f->eth_addr) && + f->vni == vxlan->cfg.vni) +continue ; +vxlan_fdb_destroy (vxlan, f, true, true); }spin_unlock_bh (&vxlan->hash_lock[h]); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/120 mt76: mt7615: fix lmac queue debugsfs entry
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit d941f47caa386931c3b598ad1b43d5ddd65869aa ]
acs and wmm index are swapped in mt7615_queues_acq respect to the hw design
--- drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c +5 -4
@@ -206,10 +206,11 @@ mt7615_queues_acq(struct seq_file *s, void *data)int i;for (i =0 ; i <16 ; i++) { -int j, acs = i /4 , index = i %4 ; +int j, wmm_idx = i %MT7615_MAX_WMM_SETS ; +int acs = i /MT7615_MAX_WMM_SETS ;u32 ctrl, val, qlen =0 ; - val =mt76_rr (dev,MT_PLE_AC_QEMPTY (acs, index)); + val =mt76_rr (dev,MT_PLE_AC_QEMPTY (acs, wmm_idx)); ctrl =BIT (31 ) |BIT (15 ) | (acs <<8 );for (j =0 ; j <32 ; j++) {
@@ -217,11 +218,11 @@ mt7615_queues_acq(struct seq_file *s, void *data)continue ;mt76_wr (dev,MT_PLE_FL_Q0_CTRL , - ctrl | (j + (index <<5 ))); + ctrl | (j + (wmm_idx <<5 ))); qlen +=mt76_get_field (dev,MT_PLE_FL_Q3_CTRL ,GENMASK (11 ,0 )); } -seq_printf (s,"AC%d%d: queued=%d\n" , acs, index, qlen); +seq_printf (s,"AC%d%d: queued=%d\n" , wmm_idx, acs, qlen); }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/120 iwlwifi: fix crash in iwl_dbg_tlv_alloc_trigger
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit ea0cca61d628662e4a1b26c77c7646f9a0257069 ]
The tlv passed to iwl_dbg_tlv_alloc_trigger comes from a loaded firmware file. The memory can be marked as read-only as firmware could be shared. In anyway, writing to this memory is not expected. So, iwl_dbg_tlv_alloc_trigger can crash now:
BUG: unable to handle page fault for address: ffffae2c01bfa794 PF: supervisor write access in kernel mode PF: error_code(0x0003) - permissions violation PGD 107d51067 P4D 107d51067 PUD 107d52067 PMD 659ad2067 PTE 8000000662298161 CPU: 2 PID: 161 Comm: kworker/2:1 Not tainted 5.7.0-3.gad96a07-default #1 openSUSE Tumbleweed (unreleased) RIP: 0010:iwl_dbg_tlv_alloc_trigger+0x25/0x60 [iwlwifi] Code: eb f2 0f 1f 00 66 66 66 66 90 83 7e 04 33 48 89 f8 44 8b 46 10 48 89 f7 76 40 41 8d 50 ff 83 fa 19 77 23 8b 56 20 85 d2 75 07 <c7> 46 20 ff ff ff ff 4b 8d 14 40 48 c1 e2 04 48 8d b4 10 00 05 00 RSP: 0018:ffffae2c00417ce8 EFLAGS: 00010246 RAX: ffff8f0522334018 RBX: ffff8f0522334018 RCX: ffffffffc0fc26c0 RDX: 0000000000000000 RSI: ffffae2c01bfa774 RDI: ffffae2c01bfa774 RBP: 0000000000000000 R08: 0000000000000004 R09: 0000000000000001 R10: 0000000000000034 R11: ffffae2c01bfa77c R12: ffff8f0522334230 R13: 0000000001000009 R14: ffff8f0523fdbc00 R15: ffff8f051f395800 FS: 0000000000000000(0000) GS:ffff8f0527c80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffae2c01bfa794 CR3: 0000000389eba000 CR4: 00000000000006e0 Call Trace: iwl_dbg_tlv_alloc+0x79/0x120 [iwlwifi] iwl_parse_tlv_firmware.isra.0+0x57d/0x1550 [iwlwifi] iwl_req_fw_callback+0x3f8/0x6a0 [iwlwifi] request_firmware_work_func+0x47/0x90 process_one_work+0x1e3/0x3b0 worker_thread+0x46/0x340 kthread+0x115/0x140 ret_from_fork+0x1f/0x40
As can be seen, write bit is not set in the PTE. Read of trig->occurrences succeeds in iwl_dbg_tlv_alloc_trigger, but trig->occurrences = cpu_to_le32(-1); fails there, obviously.
This is likely because we (at SUSE) use compressed firmware and that is marked as RO after decompression (see fw_map_paged_buf).
Fix it by creating a temporary buffer in case we need to change the memory.
--- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +14 -2
@@ -263,6 +263,8 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans, {struct iwl_fw_ini_trigger_tlv *trig = (void *)tlv->data;u32 tp =le32_to_cpu (trig->time_point); +struct iwl_ucode_tlv *dup =NULL ; +int ret;if (le32_to_cpu (tlv->length) <sizeof (*trig))return -EINVAL ;
@@ -275,10 +277,20 @@ static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans,return -EINVAL ; } -if (!le32_to_cpu (trig->occurrences)) +if (!le32_to_cpu (trig->occurrences)) { + dup =kmemdup (tlv,sizeof (*tlv) +le32_to_cpu (tlv->length), +GFP_KERNEL ); +if (!dup) +return -ENOMEM ; + trig = (void *)dup->data; trig->occurrences =cpu_to_le32 (-1 ); + tlv = dup; + } + + ret =iwl_dbg_tlv_add (tlv, &trans->dbg.time_point[tp].trig_list); +kfree (dup); -return iwl_dbg_tlv_add (tlv, &trans->dbg.time_point[tp].trig_list); +return ret; } static int (*dbg_tlv_alloc[])(struct iwl_trans *trans,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 96/120 usb: hso: Fix debug compile warning on sparc32
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit e0484010ec05191a8edf980413fc92f28050c1cc ]
On sparc32, tcflag_t is "unsigned long", unlike on all other architectures, where it is "unsigned int":
drivers/net/usb/hso.c: In function ‘hso_serial_set_termios’:
include/linux/kern_levels.h:5:18: warning: format ‘%d’ expects argument of type ‘unsigned int’, but argument 4 has type ‘tcflag_t {aka long unsigned int}’ [-Wformat=] drivers/net/usb/hso.c:1393:3: note: in expansion of macro ‘hso_dbg’
hso_dbg(0x16, "Termios called with: cflags new[%d] - old[%d]\n",
^~~~~~~
include/linux/kern_levels.h:5:18: warning: format ‘%d’ expects argument of type ‘unsigned int’, but argument 5 has type ‘tcflag_t {aka long unsigned int}’ [-Wformat=] drivers/net/usb/hso.c:1393:3: note: in expansion of macro ‘hso_dbg’
hso_dbg(0x16, "Termios called with: cflags new[%d] - old[%d]\n",
^~~~~~~
As "unsigned long" is 32-bit on sparc32, fix this by casting all tcflag_t parameters to "unsigned int".
While at it, use "%u" to format unsigned numbers.
--- drivers/net/usb/hso.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/usb/hso.c +3 -2
@@ -1390,8 +1390,9 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)unsigned long flags;if (old) -hso_dbg (0x16 ,"Termios called with: cflags new[%d] - old[%d]\n" , - tty->termios.c_cflag, old->c_cflag); +hso_dbg (0x16 ,"Termios called with: cflags new[%u] - old[%u]\n" , + (unsigned int )tty->termios.c_cflag, + (unsigned int )old->c_cflag);/* the actual setup */ spin_lock_irqsave (&serial->serial_lock, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/120 selftests: fib_nexthop_multiprefix: fix cleanup() netns deletion
In reply to Greg Kroah-HartmanFrom: Paolo Pisati <[email protected]>
[ Upstream commit 651149f60376758a4759f761767965040f9e4464 ]
During setup():
...
for ns in h0 r1 h1 h2 h3
do
create_ns ${ns}
done
...
while in cleanup():
...
for n in h1 r1 h2 h3 h4
do
ip netns del ${n} 2>/dev/null
done
...
and after removing the stderr redirection in cleanup():
$ sudo ./fib_nexthop_multiprefix.sh ... TEST: IPv4: host 0 to host 3, mtu 1400 [ OK ] TEST: IPv6: host 0 to host 3, mtu 1400 [ OK ] Cannot remove namespace file "/run/netns/h4": No such file or directory $ echo $? 1
and a non-zero return code, make kselftests fail (even if the test itself is fine):
...
not ok 34 selftests: net: fib_nexthop_multiprefix.sh # exit=1
...
--- tools/testing/selftests/net/fib_nexthop_multiprefix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/fib_nexthop_multiprefix.sh +1 -1
@@ -144,7 +144,7 @@ setup() cleanup() { - for n in h1 r1 h2 h3 h4 + for n in h0 r1 h1 h2 h3 do ip netns del ${n} 2>/dev/null done
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 98/120 qed: Disable "MFW indication via attention" SPAM every 5 minutes
In reply to Greg Kroah-HartmanFrom: Laurence Oberman <[email protected]>
[ Upstream commit 1d61e21852d3161f234b9656797669fe185c251b ]
This is likely firmware causing this but its starting to annoy customers. Change the message level to verbose to prevent the spam.
Note that this seems to only show up with ISCSI enabled on the HBA via the qedi driver.
--- drivers/net/ethernet/qlogic/qed/qed_int.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_int.c +2 -1
@@ -1180,7 +1180,8 @@ static int qed_int_attentions(struct qed_hwfn *p_hwfn) index, attn_bits, attn_acks, asserted_bits, deasserted_bits, p_sb_attn_sw->known_attn); }else if (asserted_bits ==0x100 ) { -DP_INFO (p_hwfn,"MFW indication via attention\n" ); +DP_VERBOSE (p_hwfn,NETIF_MSG_INTR , +"MFW indication via attention\n" ); }else {DP_VERBOSE (p_hwfn,NETIF_MSG_INTR ,"MFW indication [deassertion]\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/120 selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support
In reply to Greg Kroah-HartmanFrom: Paolo Pisati <[email protected]>
[ Upstream commit aba69d49fb49c9166596dd78926514173b7f9ab5 ]
Fix ip_defrag.sh when CONFIG_NF_DEFRAG_IPV6=m:
$ sudo ./ip_defrag.sh + set -e + mktemp -u XXXXXX + readonly NETNS=ns-rGlXcw + trap cleanup EXIT + setup + ip netns add ns-rGlXcw + ip -netns ns-rGlXcw link set lo up + ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_high_thresh=9000000 + ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_low_thresh=7000000 + ip netns exec ns-rGlXcw sysctl -w net.ipv4.ipfrag_time=1 + ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_high_thresh=9000000 + ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_low_thresh=7000000 + ip netns exec ns-rGlXcw sysctl -w net.ipv6.ip6frag_time=1 + ip netns exec ns-rGlXcw sysctl -w net.netfilter.nf_conntrack_frag6_high_thresh=9000000 + cleanup + ip netns del ns-rGlXcw
$ ls -la /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh ls: cannot access '/proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh': No such file or directory
$ sudo modprobe nf_defrag_ipv6 $ ls -la /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh -rw-r--r-- 1 root root 0 Jul 14 12:34 /proc/sys/net/netfilter/nf_conntrack_frag6_high_thresh
--- tools/testing/selftests/net/ip_defrag.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/ip_defrag.sh +2 -0
@@ -6,6 +6,8 @@ set +x set -e +modprobe -q nf_defrag_ipv6 + readonly NETNS="ns-$(mktemp -u XXXXXX)" setup() {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 100/120 io_uring: always allow drain/link/hardlink/async sqe flags
In reply to Greg Kroah-HartmanFrom: Daniele Albano <[email protected]>
[ Upstream commit 61710e437f2807e26a3402543bdbb7217a9c8620 ]
We currently filter these for timeout_remove/async_cancel/files_update, but we only should be filtering for fixed file and buffer select. This also causes a second read of sqe->flags, which isn't needed.
Just check req->flags for the relevant bits. This then allows these commands to be used in links, for example, like everything else.
--- fs/io_uring.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
fs/io_uring.c +9 -4
@@ -4808,7 +4808,9 @@ static int io_timeout_remove_prep(struct io_kiocb *req, {if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->flags || sqe->ioprio || sqe->buf_index || sqe->len) +if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT ))) +return -EINVAL ; +if (sqe->ioprio || sqe->buf_index || sqe->len)return -EINVAL ; req->timeout.addr =READ_ONCE (sqe->addr);
@@ -5014,8 +5016,9 @@ static int io_async_cancel_prep(struct io_kiocb *req, {if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->flags || sqe->ioprio || sqe->off || sqe->len || - sqe->cancel_flags) +if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT ))) +return -EINVAL ; +if (sqe->ioprio || sqe->off || sqe->len || sqe->cancel_flags)return -EINVAL ; req->cancel.addr =READ_ONCE (sqe->addr);
@@ -5033,7 +5036,9 @@ static int io_async_cancel(struct io_kiocb *req)static int io_files_update_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -if (sqe->flags || sqe->ioprio || sqe->rw_flags) +if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT ))) +return -EINVAL ; +if (sqe->ioprio || sqe->rw_flags)return -EINVAL ; req->files_update.offset =READ_ONCE (sqe->off);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/120 habanalabs: prevent possible out-of-bounds array access
In reply to Greg Kroah-HartmanFrom: Oded Gabbay <[email protected]>
[ Upstream commit cea7a0449ea3fa4883bf5dc8397f000d6b67d6cd ]
Queue index is received from the user. Therefore, we must validate it before using it to access the queue props array.
--- drivers/misc/habanalabs/command_submission.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/misc/habanalabs/command_submission.c +11 -3
@@ -425,11 +425,19 @@ static int validate_queue_index(struct hl_device *hdev,struct asic_fixed_properties *asic = &hdev->asic_prop;struct hw_queue_properties *hw_queue_prop; +/* This must be checked here to prevent out-of-bounds access to +* hw_queues_props array +*/ +if (chunk->queue_index >=HL_MAX_QUEUES ) { +dev_err (hdev->dev,"Queue index %d is invalid\n" , + chunk->queue_index); +return -EINVAL ; + } + hw_queue_prop = &asic->hw_queues_props[chunk->queue_index]; -if ((chunk->queue_index >=HL_MAX_QUEUES ) || - (hw_queue_prop->type ==QUEUE_TYPE_NA )) { -dev_err (hdev->dev,"Queue index %d is invalid\n" , +if (hw_queue_prop->type ==QUEUE_TYPE_NA ) { +dev_err (hdev->dev,"Queue index %d is not applicable\n" , chunk->queue_index);return -EINVAL ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/120 nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 1e8fd3a97f2d83a7197876ceb4f37b4c2b00a0f3 ]
The implementation of s3fwrn5_recv_frame() is supposed to consume skb on all execution paths. Release skb before returning -ENODEV.
--- drivers/nfc/s3fwrn5/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/s3fwrn5/core.c +1 -0
@@ -198,6 +198,7 @@ int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb,case S3FWRN5_MODE_FW :return s3fwrn5_fw_recv_frame (ndev, skb);default : +kfree_skb (skb);return -ENODEV ; } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 103/120 scsi: core: Run queue in case of I/O resource contention failure
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 3f0dcfbcd2e162fc0a11c1f59b7acd42ee45f126 ]
I/O requests may be held in scheduler queue because of resource contention. The starvation scenario was handled properly in the regular completion path but we failed to account for it during I/O submission. This lead to the hang captured below. Make sure we run the queue when resource contention is encountered in the submission path.
[ 39.054963] scsi 13:0:0:0: rejecting I/O to dead device [ 39.058700] scsi 13:0:0:0: rejecting I/O to dead device [ 39.087855] sd 13:0:0:1: [sdd] Synchronizing SCSI cache [ 39.088909] scsi 13:0:0:1: rejecting I/O to dead device [ 39.095351] scsi 13:0:0:1: rejecting I/O to dead device [ 39.096962] scsi 13:0:0:1: rejecting I/O to dead device [ 247.021859] INFO: task scsi-stress-rem:813 blocked for more than 122 seconds. [ 247.023258] Not tainted 5.8.0-rc2 #8 [ 247.024069] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 247.025331] scsi-stress-rem D 0 813 802 0x00004000 [ 247.025334] Call Trace: [ 247.025354] __schedule+0x504/0x55f [ 247.027987] schedule+0x72/0xa8 [ 247.027991] blk_mq_freeze_queue_wait+0x63/0x8c [ 247.027994] ? do_wait_intr_irq+0x7a/0x7a [ 247.027996] blk_cleanup_queue+0x4b/0xc9 [ 247.028000] __scsi_remove_device+0xf6/0x14e [ 247.028002] scsi_remove_device+0x21/0x2b [ 247.029037] sdev_store_delete+0x58/0x7c [ 247.029041] kernfs_fop_write+0x10d/0x14f [ 247.031281] vfs_write+0xa2/0xdf [ 247.032670] ksys_write+0x6b/0xb3 [ 247.032673] do_syscall_64+0x56/0x82 [ 247.034053] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 247.034059] RIP: 0033:0x7f69f39e9008 [ 247.036330] Code: Bad RIP value. [ 247.036331] RSP: 002b:00007ffdd8116498 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 247.037613] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f69f39e9008 [ 247.039714] RDX: 0000000000000002 RSI: 000055cde92a0ab0 RDI: 0000000000000001 [ 247.039715] RBP: 000055cde92a0ab0 R08: 000000000000000a R09: 00007f69f3a79e80 [ 247.039716] R10: 000000000000000a R11: 0000000000000246 R12: 00007f69f3abb780 [ 247.039717] R13: 0000000000000002 R14: 00007f69f3ab6740 R15: 0000000000000002
--- drivers/scsi/scsi_lib.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/scsi/scsi_lib.c +11 -5
@@ -564,6 +564,15 @@ static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)scsi_uninit_cmd (cmd); } +static void scsi_run_queue_async (struct scsi_device *sdev) +{ +if (scsi_target (sdev)->single_lun || + !list_empty (&sdev->host->starved_list)) +kblockd_schedule_work (&sdev->requeue_work); +else +blk_mq_run_hw_queues (sdev->request_queue, true); +} +/* Returns false when no more bytes to process, true if there are more */ static bool scsi_end_request (struct request *req,blk_status_t error,unsigned int bytes)
@@ -608,11 +617,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,__blk_mq_end_request (req, error); -if (scsi_target (sdev)->single_lun || - !list_empty (&sdev->host->starved_list)) -kblockd_schedule_work (&sdev->requeue_work); -else -blk_mq_run_hw_queues (q, true); +scsi_run_queue_async (sdev);percpu_ref_put (&q->q_usage_counter);return false;
@@ -1706,6 +1711,7 @@ out_put_budget:*/ if (req->rq_flags &RQF_DONTPREP )scsi_mq_uninit_cmd (cmd); +scsi_run_queue_async (sdev);break ; }return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 104/120 riscv: kasan: use local_tlb_flush_all() to avoid uninitialized __sbi_rfence
In reply to Greg Kroah-HartmanFrom: Vincent Chen <[email protected]>
[ Upstream commit 4cb699d0447be8e0906539f93cbe41e19598ee5a ]
It fails to boot the v5.8-rc4 kernel with CONFIG_KASAN because kasan_init and kasan_early_init use uninitialized __sbi_rfence as executing the tlb_flush_all(). Actually, at this moment, only the CPU which is responsible for the system initialization enables the MMU. Other CPUs are parking at the .Lsecondary_start. Hence the tlb_flush_all() is able to be replaced by local_tlb_flush_all() to avoid using uninitialized __sbi_rfence.
--- arch/riscv/mm/kasan_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/mm/kasan_init.c +2 -2
@@ -44,7 +44,7 @@ asmlinkage void __init kasan_early_init(void) (__pa (((uintptr_t ) kasan_early_shadow_pmd))), __pgprot(_PAGE_TABLE))); -flush_tlb_all (); +local_flush_tlb_all (); }static void __init populate (void *start,void *end)
@@ -79,7 +79,7 @@ static void __init populate(void *start, void *end)pfn_pgd (PFN_DOWN (__pa (&pmd[offset])), __pgprot(_PAGE_TABLE))); -flush_tlb_all (); +local_flush_tlb_all ();memset (start,0 , end - start); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 105/120 parisc: add support for cmpxchg on u8 pointers
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
[ Upstream commit b344d6a83d01c52fddbefa6b3b4764da5b1022a0 ]
The kernel test bot reported[1] that using set_mask_bits on a u8 causes the following issue on parisc:
hppa-linux-ld: drivers/phy/ti/phy-tusb1210.o: in function `tusb1210_probe': >> (.text+0x2f4): undefined reference to `__cmpxchg_called_with_bad_pointer' >> hppa-linux-ld: (.text+0x324): undefined reference to `__cmpxchg_called_with_bad_pointer' hppa-linux-ld: (.text+0x354): undefined reference to `__cmpxchg_called_with_bad_pointer'
Add support for cmpxchg on u8 pointers.
[1] https://lore.kernel.org/patchwork/patch/1272617/#1468946
--- arch/parisc/include/asm/cmpxchg.h | 2 ++ arch/parisc/lib/bitops.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
arch/parisc/include/asm/cmpxchg.h +2 -0
@@ -60,6 +60,7 @@ extern void __cmpxchg_called_with_bad_pointer(void);extern unsigned long __cmpxchg_u32 (volatile unsigned int *m,unsigned int old,unsigned int new_);extern u64 __cmpxchg_u64 (volatile u64 *ptr,u64 old,u64 new_); +extern u8 __cmpxchg_u8 (volatile u8 *ptr,u8 old,u8 new_);/* don't worry...optimizer will get rid of most of this */ static inline unsigned long
@@ -71,6 +72,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)#endif case 4 :return __cmpxchg_u32 ((unsigned int *)ptr, (unsigned int )old, (unsigned int )new_); +case 1 :return __cmpxchg_u8 ((u8 *)ptr, (u8 )old, (u8 )new_); }__cmpxchg_called_with_bad_pointer ();return old;
arch/parisc/lib/bitops.c +12 -0
@@ -79,3 +79,15 @@ unsigned long __cmpxchg_u32(volatile unsigned int *ptr, unsigned int old, unsign_atomic_spin_unlock_irqrestore (ptr, flags);return (unsigned long )prev; } + +u8 __cmpxchg_u8 (volatile u8 *ptr,u8 old,u8 new) +{ +unsigned long flags; +u8 prev; + +_atomic_spin_lock_irqsave (ptr, flags); +if ((prev = *ptr) == old) + *ptr = new; +_atomic_spin_unlock_irqrestore (ptr, flags); +return prev; +}
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 106/120 net: ethernet: ravb: exit if re-initialization fails in tx timeout
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 015c5d5e6aa3523c758a70eb87b291cece2dbbb4 ]
According to the report of [1], this driver is possible to cause the following error in ravb_tx_timeout_work().
ravb e6800000.ethernet ethernet: failed to switch device to config mode
This error means that the hardware could not change the state from "Operation" to "Configuration" while some tx and/or rx queue are operating. After that, ravb_config() in ravb_dmac_init() will fail, and then any descriptors will be not allocaled anymore so that NULL pointer dereference happens after that on ravb_start_xmit().
To fix the issue, the ravb_tx_timeout_work() should check the return values of ravb_stop_dma() and ravb_dmac_init(). If ravb_stop_dma() fails, ravb_tx_timeout_work() re-enables TX and RX and just exits. If ravb_dmac_init() fails, just exits.
[1]
https://lore.kernel.org/linux-renesas-soc/[email protected]/
--- drivers/net/ethernet/renesas/ravb_main.c | 26 ++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +24 -2
@@ -1444,6 +1444,7 @@ static void ravb_tx_timeout_work(struct work_struct *work) struct ravb_private *priv = container_of(work, struct ravb_private, work);struct net_device *ndev = priv->ndev; +int error;netif_tx_stop_all_queues (ndev);
@@ -1452,15 +1453,36 @@ static void ravb_tx_timeout_work(struct work_struct *work)ravb_ptp_stop (ndev);/* Wait for DMA stopping */ -ravb_stop_dma (ndev); +if (ravb_stop_dma (ndev)) { +/* If ravb_stop_dma() fails, the hardware is still operating +* for TX and/or RX. So, this should not call the following +* functions because ravb_dmac_init() is possible to fail too. +* Also, this should not retry ravb_stop_dma() again and again +* here because it's possible to wait forever. So, this just +* re-enables the TX and RX and skip the following +* re-initialization procedure. +*/ +ravb_rcv_snd_enable (ndev); + goto out; + }ravb_ring_free (ndev,RAVB_BE );ravb_ring_free (ndev,RAVB_NC );/* Device init */ -ravb_dmac_init (ndev); + error =ravb_dmac_init (ndev); +if (error) { +/* If ravb_dmac_init() fails, descriptors are freed. So, this +* should return here to avoid re-enabling the TX and RX in +* ravb_emac_init(). +*/ +netdev_err (ndev,"%s: ravb_dmac_init() failed, error %d\n" , + __func__, error); +return ; + }ravb_emac_init (ndev); +out:/* Initialise PTP Clock driver */ if (priv->chip_id ==RCAR_GEN2 )ravb_ptp_init (ndev, priv->pdev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 107/120 selftest: txtimestamp: fix net ns entry logic
In reply to Greg Kroah-HartmanFrom: Paolo Pisati <[email protected]>
[ Upstream commit b346c0c85892cb8c53e8715734f71ba5bbec3387 ]
According to 'man 8 ip-netns', if ip netns identify returns an empty string, there's no net namespace associated with current PID: fix the net ns entrance logic.
--- tools/testing/selftests/net/txtimestamp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/txtimestamp.sh +1 -1
@@ -75,7 +75,7 @@ main() { fi } -if [[ "$(ip netns identify)" == "root" ]]; then +if [[ -z "$(ip netns identify)" ]]; then ./in_netns.sh $0 $@ else main $@
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 108/120 Revert "i2c: cadence: Fix the hold bit setting"
In reply to Greg Kroah-HartmanFrom: Raviteja Narayanam <[email protected]>
[ Upstream commit 0db9254d6b896b587759e2c844c277fb1a6da5b9 ]
This reverts commit d358def706880defa4c9e87381c5bf086a97d5f9.
There are two issues with "i2c: cadence: Fix the hold bit setting" commit.
1. In case of combined message request from user space, when the HOLD bit is cleared in cdns_i2c_mrecv function, a STOP condition is sent on the bus even before the last message is started. This is because when the HOLD bit is cleared, the FIFOS are empty and there is no pending transfer. The STOP condition should occur only after the last message is completed.
2. The code added by the commit is redundant. Driver is handling the setting/clearing of HOLD bit in right way before the commit.
The setting of HOLD bit based on 'bus_hold_flag' is taken care in cdns_i2c_master_xfer function even before cdns_i2c_msend/cdns_i2c_recv functions.
The clearing of HOLD bit is taken care at the end of cdns_i2c_msend and cdns_i2c_recv functions based on bus_hold_flag and byte count. Since clearing of HOLD bit is done after the slave address is written to the register (writing to address register triggers the message transfer), it is ensured that STOP condition occurs at the right time after completion of the pending transfer (last message).
--- drivers/i2c/busses/i2c-cadence.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-cadence.c +2 -7
@@ -382,10 +382,8 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id)* Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */ -if ((id->recv_count >CDNS_I2C_FIFO_DEPTH ) || id->bus_hold_flag) +if (id->recv_count >CDNS_I2C_FIFO_DEPTH ) ctrl_reg |=CDNS_I2C_CR_HOLD ; -else - ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD ;cdns_i2c_writereg (ctrl_reg,CDNS_I2C_CR_OFFSET );
@@ -442,11 +440,8 @@ static void cdns_i2c_msend(struct cdns_i2c *id)* Check for the message size against FIFO depth and set the * 'hold bus' bit if it is greater than FIFO depth. */ -if ((id->send_count >CDNS_I2C_FIFO_DEPTH ) || id->bus_hold_flag) +if (id->send_count >CDNS_I2C_FIFO_DEPTH ) ctrl_reg |=CDNS_I2C_CR_HOLD ; -else - ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD ; -cdns_i2c_writereg (ctrl_reg,CDNS_I2C_CR_OFFSET );/* Clear the interrupts in interrupt status register. */
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 109/120 i2c: cadence: Clear HOLD bit at correct time in Rx path
In reply to Greg Kroah-HartmanFrom: Raviteja Narayanam <[email protected]>
[ Upstream commit 12d4d9ec5eeecd712c73772e422b6d082e66b046 ]
There are few issues on Zynq SOC observed in the stress tests causing timeout errors. Even though all the data is received, timeout error is thrown. This is due to an IP bug in which the COMP bit in ISR is not set at end of transfer and completion interrupt is not generated.
This bug is seen on Zynq platforms when the following condition occurs:
Master read & HOLD bit set & Transfer size register reaches '0'.
One workaround is to clear the HOLD bit before the transfer size register reaches '0'. The current implementation checks for this at the start of the loop and also only for less than FIFO DEPTH case (ignoring the equal to case).
So clear the HOLD bit when the data yet to receive is less than or equal to the FIFO DEPTH. This avoids the IP bug condition.
--- drivers/i2c/busses/i2c-cadence.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-cadence.c +10 -9
@@ -230,20 +230,21 @@ static irqreturn_t cdns_i2c_isr(int irq, void *ptr)/* Read data if receive data valid is set */ while (cdns_i2c_readreg (CDNS_I2C_SR_OFFSET ) &CDNS_I2C_SR_RXDV ) { -/* -* Clear hold bit that was set for FIFO control if -* RX data left is less than FIFO depth, unless -* repeated start is selected. -*/ -if ((id->recv_count <CDNS_I2C_FIFO_DEPTH ) && - !id->bus_hold_flag) -cdns_i2c_clear_bus_hold (id); -if (id->recv_count >0 ) { *(id->p_recv_buf)++ =cdns_i2c_readreg (CDNS_I2C_DATA_OFFSET ); id->recv_count--; id->curr_recv_count--; + +/* +* Clear hold bit that was set for FIFO control +* if RX data left is less than or equal to +* FIFO DEPTH unless repeated start is selected +*/ +if (id->recv_count <=CDNS_I2C_FIFO_DEPTH && + !id->bus_hold_flag) +cdns_i2c_clear_bus_hold (id); + }else {dev_err (id->adap.dev.parent,"xfer_size reg rollover. xfer aborted!\n" );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 110/120 x86/unwind/orc: Fix ORC for newly forked tasks
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit 372a8eaa05998cd45b3417d0e0ffd3a70978211a ]
The ORC unwinder fails to unwind newly forked tasks which haven't yet run on the CPU. It correctly reads the 'ret_from_fork' instruction pointer from the stack, but it incorrectly interprets that value as a call stack address rather than a "signal" one, so the address gets incorrectly decremented in the call to orc_find(), resulting in bad ORC data.
Fix it by forcing 'ret_from_fork' frames to be signal frames.
--- arch/x86/kernel/unwind_orc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/kernel/unwind_orc.c +6 -2
@@ -440,8 +440,11 @@ bool unwind_next_frame(struct unwind_state *state)/* * Find the orc_entry associated with the text address. * -* Decrement call return addresses by one so they work for sibling -* calls and calls to noreturn functions. +* For a call frame (as opposed to a signal frame), state->ip points to +* the instruction after the call. That instruction's stack layout +* could be different from the call instruction's layout, for example +* if the call was to a noreturn function. So get the ORC data for the +* call instruction itself. */ orc =orc_find (state->signal ? state->ip : state->ip -1 );if (!orc) {
@@ -662,6 +665,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task, state->sp = task->thread.sp; state->bp =READ_ONCE_NOCHECK (frame->bp); state->ip =READ_ONCE_NOCHECK (frame->ret_addr); + state->signal = (void *)state->ip == ret_from_fork; } if (get_stack_info((unsigned long *)state->sp, state->task,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 111/120 x86/stacktrace: Fix reliable check for empty user task stacks
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit 039a7a30ec102ec866d382a66f87f6f7654f8140 ]
If a user task's stack is empty, or if it only has user regs, ORC reports it as a reliable empty stack. But arch_stack_walk_reliable() incorrectly treats it as unreliable.
That happens because the only success path for user tasks is inside the loop, which only iterates on non-empty stacks. Generally, a user task must end in a user regs frame, but an empty stack is an exception to that rule.
Thanks to commit 71c95825289f ("x86/unwind/orc: Fix error handling in __unwind_start()"), unwind_start() now sets state->error appropriately. So now for both ORC and FP unwinders, unwind_done() and !unwind_error() always means the end of the stack was successfully reached. So the success path for kthreads is no longer needed -- it can also be used for empty user tasks.
--- arch/x86/kernel/stacktrace.c | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/kernel/stacktrace.c +0 -5
@@ -58,7 +58,6 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,* or a page fault), which can make frame pointers * unreliable. */ -if (IS_ENABLED (CONFIG_FRAME_POINTER ))return -EINVAL ; }
@@ -81,10 +80,6 @@ int arch_stack_walk_reliable(stack_trace_consume_fn consume_entry,if (unwind_error (&state))return -EINVAL ; -/* Success path for non-user tasks, i.e. kthreads and idle tasks */ -if (!(task->flags & (PF_KTHREAD |PF_IDLE ))) -return -EINVAL ; -return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 112/120 cxgb4: add missing release on skb in uld_send()
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit e6827d1abdc9b061a57d7b7d3019c4e99fabea2f ]
In the implementation of uld_send(), the skb is consumed on all execution paths except one. Release skb when returning NET_XMIT_DROP.
--- drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/chelsio/cxgb4/sge.c +1 -0
@@ -2925,6 +2925,7 @@ static inline int uld_send(struct adapter *adap, struct sk_buff *skb, txq_info = adap->sge.uld_txq_info[tx_uld_type];if (unlikely (!txq_info)) {WARN_ON (true); +kfree_skb (skb);return NET_XMIT_DROP ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 113/120 xen-netfront: fix potential deadlock in xennet_remove()
In reply to Greg Kroah-HartmanFrom: Andrea Righi <[email protected]>
[ Upstream commit c2c633106453611be07821f53dff9e93a9d1c3f0 ]
There's a potential race in xennet_remove(); this is what the driver is doing upon unregistering a network device:
1. state = read bus state
2. if state is not "Closed":
3. request to set state to "Closing" 4. wait for state to be set to "Closing" 5. request to set state to "Closed" 6. wait for state to be set to "Closed"
If the state changes to "Closed" immediately after step 1 we are stuck forever in step 4, because the state will never go back from "Closed" to "Closing".
Make sure to check also for state == "Closed" in step 4 to prevent the deadlock.
Also add a 5 sec timeout any time we wait for the bus state to change, to avoid getting stuck forever in wait_event().
--- drivers/net/xen-netfront.c | 64 +++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 22 deletions(-)
drivers/net/xen-netfront.c +42 -22
@@ -63,6 +63,8 @@ module_param_named(max_queues, xennet_max_queues, uint, 0644);MODULE_PARM_DESC (max_queues,"Maximum number of queues per virtual interface" ); +#define XENNET_TIMEOUT (5 * HZ) +static const struct ethtool_ops xennet_ethtool_ops;struct netfront_cb {
@@ -1334,12 +1336,15 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)netif_carrier_off (netdev); -xenbus_switch_state (dev, XenbusStateInitialising); -wait_event (module_wq, -xenbus_read_driver_state (dev->otherend) != - XenbusStateClosed && -xenbus_read_driver_state (dev->otherend) != - XenbusStateUnknown); +do { +xenbus_switch_state (dev, XenbusStateInitialising); + err =wait_event_timeout (module_wq, +xenbus_read_driver_state (dev->otherend) != + XenbusStateClosed && +xenbus_read_driver_state (dev->otherend) != + XenbusStateUnknown,XENNET_TIMEOUT ); + }while (!err); +return netdev; exit:
@@ -2139,28 +2144,43 @@ static const struct attribute_group xennet_dev_group = { };#endif /* CONFIG_SYSFS */ -static int xennet_remove (struct xenbus_device *dev) +static void xennet_bus_close (struct xenbus_device *dev) { -struct netfront_info *info =dev_get_drvdata (&dev->dev); - -dev_dbg (&dev->dev,"%s\n" , dev->nodename); +int ret; -if (xenbus_read_driver_state (dev->otherend) != XenbusStateClosed) { +if (xenbus_read_driver_state (dev->otherend) == XenbusStateClosed) +return ; +do {xenbus_switch_state (dev, XenbusStateClosing); -wait_event (module_wq, -xenbus_read_driver_state (dev->otherend) == - XenbusStateClosing || -xenbus_read_driver_state (dev->otherend) == - XenbusStateUnknown); + ret =wait_event_timeout (module_wq, +xenbus_read_driver_state (dev->otherend) == + XenbusStateClosing || +xenbus_read_driver_state (dev->otherend) == + XenbusStateClosed || +xenbus_read_driver_state (dev->otherend) == + XenbusStateUnknown, +XENNET_TIMEOUT ); + }while (!ret); + +if (xenbus_read_driver_state (dev->otherend) == XenbusStateClosed) +return ; +do {xenbus_switch_state (dev, XenbusStateClosed); -wait_event (module_wq, -xenbus_read_driver_state (dev->otherend) == - XenbusStateClosed || -xenbus_read_driver_state (dev->otherend) == - XenbusStateUnknown); - } + ret =wait_event_timeout (module_wq, +xenbus_read_driver_state (dev->otherend) == + XenbusStateClosed || +xenbus_read_driver_state (dev->otherend) == + XenbusStateUnknown, +XENNET_TIMEOUT ); + }while (!ret); +} + +static int xennet_remove (struct xenbus_device *dev) +{ +struct netfront_info *info =dev_get_drvdata (&dev->dev); +xennet_bus_close (dev);xennet_disconnect_backend (info);if (info->netdev->reg_state ==NETREG_REGISTERED )
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 114/120 RISC-V: Set maximum number of mapped pages correctly
In reply to Greg Kroah-HartmanFrom: Atish Patra <[email protected]>
[ Upstream commit d0d8aae64566b753c4330fbd5944b88af035f299 ]
Currently, maximum number of mapper pages are set to the pfn calculated from the memblock size of the memblock containing kernel. This will work until that memblock spans the entire memory. However, it will be set to a wrong value if there are multiple memblocks defined in kernel (e.g. with efi runtime services).
Set the the maximum value to the pfn calculated from dram size.
--- arch/riscv/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/mm/init.c +1 -1
@@ -170,9 +170,9 @@ void __init setup_bootmem(void)/* Reserve from the start of the kernel to the end of the kernel */ memblock_reserve (vmlinux_start, vmlinux_end - vmlinux_start); -set_max_mapnr (PFN_DOWN (mem_size)); max_pfn =PFN_DOWN (memblock_end_of_DRAM ()); max_low_pfn = max_pfn; +set_max_mapnr (max_low_pfn);#ifdef CONFIG_BLK_DEV_INITRD setup_initrd ();
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 115/120 drivers/net/wan: lapb: Corrected the usage of skb_cow
In reply to Greg Kroah-HartmanFrom: Xie He <[email protected]>
[ Upstream commit 8754e1379e7089516a449821f88e1fe1ebbae5e1 ]
This patch fixed 2 issues with the usage of skb_cow in LAPB drivers "lapbether" and "hdlc_x25":
1) After skb_cow fails, kfree_skb should be called to drop a reference to the skb. But in both drivers, kfree_skb is not called.
2) skb_cow should be called before skb_push so that is can ensure the safety of skb_push. But in "lapbether", it is incorrectly called after skb_push.
More details about these 2 issues:
1) The behavior of calling kfree_skb on failure is also the behavior of netif_rx, which is called by this function with "return netif_rx(skb);". So this function should follow this behavior, too.
2) In "lapbether", skb_cow is called after skb_push. This results in 2 logical issues:
a) skb_push is not protected by skb_cow;
b) An extra headroom of 1 byte is ensured after skb_push. This extra headroom has no use in this function. It also has no use in the upper-layer function that this function passes the skb to (x25_lapb_receive_frame in net/x25/x25_dev.c).
So logically skb_cow should instead be called before skb_push.
--- drivers/net/wan/hdlc_x25.c | 4 +++- drivers/net/wan/lapbether.c | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/wan/hdlc_x25.c +3 -1
@@ -71,8 +71,10 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb) {unsigned char *ptr; -if (skb_cow (skb,1 )) +if (skb_cow (skb,1 )) { +kfree_skb (skb);return NET_RX_DROP ; + }skb_push (skb,1 );skb_reset_network_header (skb);
drivers/net/wan/lapbether.c +5 -3
@@ -128,10 +128,12 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb) {unsigned char *ptr; -skb_push (skb,1 ); - -if (skb_cow (skb,1 )) +if (skb_cow (skb,1 )) { +kfree_skb (skb);return NET_RX_DROP ; + } + +skb_push (skb,1 ); ptr = skb->data; *ptr =X25_IFACE_DATA ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 116/120 riscv: Parse all memory blocks to remove unusable memory
In reply to Greg Kroah-HartmanFrom: Atish Patra <[email protected]>
[ Upstream commit fa5a198359053c8e21dcc2b39c0e13871059bc9f ]
Currently, maximum physical memory allowed is equal to -PAGE_OFFSET. That's why we remove any memory blocks spanning beyond that size. However, it is done only for memblock containing linux kernel which will not work if there are multiple memblocks.
Process all memory blocks to figure out how much memory needs to be removed and remove at the end instead of updating the memblock list in place.
--- arch/riscv/mm/init.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
arch/riscv/mm/init.c +17 -14
@@ -146,26 +146,29 @@ void __init setup_bootmem(void) {struct memblock_region *reg;phys_addr_t mem_size =0 ; +phys_addr_t total_mem =0 ; +phys_addr_t mem_start, end =0 ;phys_addr_t vmlinux_end =__pa_symbol (&_end);phys_addr_t vmlinux_start =__pa_symbol (&_start);/* Find the memory region containing the kernel */ for_each_memblock (memory, reg) { -phys_addr_t end = reg->base + reg->size; - -if (reg->base <= vmlinux_start && vmlinux_end <= end) { - mem_size =min (reg->size, (phys_addr_t)-PAGE_OFFSET ); - -/* -* Remove memblock from the end of usable area to the -* end of region -*/ -if (reg->base + mem_size < end) -memblock_remove (reg->base + mem_size, - end - reg->base - mem_size); - } + end = reg->base + reg->size; +if (!total_mem) + mem_start = reg->base; +if (reg->base <= vmlinux_start && vmlinux_end <= end) +BUG_ON (reg->size ==0 ); + total_mem = total_mem + reg->size; } -BUG_ON (mem_size ==0 ); + +/* +* Remove memblock from the end of usable area to the +* end of region +*/ + mem_size =min (total_mem, (phys_addr_t)-PAGE_OFFSET ); +if (mem_start + mem_size < end) +memblock_remove (mem_start + mem_size, + end - mem_start - mem_size);/* Reserve from the start of the kernel to the end of the kernel */ memblock_reserve (vmlinux_start, vmlinux_end - vmlinux_start);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 117/120 KVM: arm64: Dont inherit exec permission across page-table levels
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit b757b47a2fcba584d4a32fd7ee68faca510ab96f upstream.
If a stage-2 page-table contains an executable, read-only mapping at the pte level (e.g. due to dirty logging being enabled), a subsequent write fault to the same page which tries to install a larger block mapping (e.g. due to dirty logging having been disabled) will erroneously inherit the exec permission and consequently skip I-cache invalidation for the rest of the block.
Ensure that exec permission is only inherited by write faults when the new mapping is of the same size as the existing one. A subsequent instruction abort will result in I-cache invalidation for the entire block mapping.
--- virt/kvm/arm/mmu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
virt/kvm/arm/mmu.c +6 -5
@@ -1198,7 +1198,7 @@ static bool stage2_get_leaf_entry(structreturn true; } -static bool stage2_is_exec (struct kvm *kvm,phys_addr_t addr) +static bool stage2_is_exec (struct kvm *kvm,phys_addr_t addr,unsigned long sz) {pud_t *pudp;pmd_t *pmdp;
@@ -1210,11 +1210,11 @@ static bool stage2_is_exec(struct kvm *kreturn false;if (pudp) -return kvm_s2pud_exec (pudp); +return sz <=PUD_SIZE &&kvm_s2pud_exec (pudp);else if (pmdp) -return kvm_s2pmd_exec (pmdp); +return sz <=PMD_SIZE &&kvm_s2pmd_exec (pmdp);else -return kvm_s2pte_exec (ptep); +return sz ==PAGE_SIZE &&kvm_s2pte_exec (ptep); } static int stage2_set_pte(struct kvm *kvm, struct kvm_mmu_memory_cache *cache,
@@ -1801,7 +1801,8 @@ static int user_mem_abort(struct kvm_vcp* execute permissions, and we preserve whatever we have. */ needs_exec = exec_fault || - (fault_status ==FSC_PERM &&stage2_is_exec (kvm, fault_ipa)); + (fault_status ==FSC_PERM && +stage2_is_exec (kvm, fault_ipa, vma_pagesize));if (vma_pagesize ==PUD_SIZE ) {pud_t new_pud =kvm_pfn_pud (pfn, mem_type);
Greg Kroah-Hartman
maintainerPATCH 118/120 KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1 upstream.
Prevent setting the tscdeadline timer if the lapic is hw disabled.
Message-Id: <[email protected]>
--- arch/x86/kvm/lapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/lapic.c +1 -1
@@ -2136,7 +2136,7 @@ void kvm_set_lapic_tscdeadline_msr(struc {struct kvm_lapic *apic = vcpu->arch.apic; -if (!lapic_in_kernel (vcpu) ||apic_lvtt_oneshot (apic) || +if (!kvm_apic_present (vcpu) ||apic_lvtt_oneshot (apic) ||apic_lvtt_period (apic))return ;
Greg Kroah-Hartman
maintainerPATCH 119/120 KVM: SVM: Fix disable pause loop exit/pause filtering capability on SVM
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit 830f01b089b12bbe93bd55f2d62837253012a30e upstream.
'Commit 8566ac8b8e7c ("KVM: SVM: Implement pause loop exit logic in SVM")' drops disable pause loop exit/pause filtering capability completely, I guess it is a merge fault by Radim since disable vmexits capabilities and pause loop exit for SVM patchsets are merged at the same time. This patch reintroduces the disable pause loop exit/pause filtering capability support.
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/svm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/svm.c +6 -3
@@ -1105,7 +1105,7 @@ static void init_vmcb(struct vcpu_svm *s svm->nested.vmcb =0 ; svm->vcpu.arch.hflags =0 ; -if (pause_filter_count) { +if (!kvm_pause_in_guest (svm->vcpu.kvm)) { control->pause_filter_count = pause_filter_count;if (pause_filter_thresh) control->pause_filter_thresh = pause_filter_thresh;
@@ -2682,7 +2682,7 @@ static int pause_interception(struct vcpstruct kvm_vcpu *vcpu = &svm->vcpu;bool in_kernel = (svm_get_cpl (vcpu) ==0 ); -if (pause_filter_thresh) +if (!kvm_pause_in_guest (vcpu->kvm))grow_ple_window (vcpu);kvm_vcpu_on_spin (vcpu, in_kernel);
@@ -3727,7 +3727,7 @@ static void svm_handle_exit_irqoff(strucstatic void svm_sched_in (struct kvm_vcpu *vcpu,int cpu) { -if (pause_filter_thresh) +if (!kvm_pause_in_guest (vcpu->kvm))shrink_ple_window (vcpu); }
@@ -3892,6 +3892,9 @@ static void svm_vm_destroy(struct kvm *kstatic int svm_vm_init (struct kvm *kvm) { +if (!pause_filter_count || !pause_filter_thresh) + kvm->arch.pause_in_guest = true; +if (avic) {int ret =avic_vm_init (kvm);if (ret)
Greg Kroah-Hartman
maintainerPATCH 120/120 x86/i8259: Use printk_deferred() to prevent deadlock
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit bdd65589593edd79b6a12ce86b3b7a7c6dae5208 upstream.
0day reported a possible circular locking dependency:
Chain exists of: &irq_desc_lock_class --> console_owner --> &port_lock_key Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&port_lock_key);
lock(console_owner);
lock(&port_lock_key); lock(&irq_desc_lock_class);
The reason for this is a printk() in the i8259 interrupt chip driver which is invoked with the irq descriptor lock held, which reverses the lock operations vs. printk() from arbitrary contexts.
Switch the printk() to printk_deferred() to avoid that.
--- arch/x86/kernel/i8259.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/i8259.c +1 -1
@@ -207,7 +207,7 @@ spurious_8259A_irq:* lets ACK and report it. [once per IRQ] */ if (!(spurious_irq_mask & irqmask)) { -printk (KERN_DEBUG +printk_deferred (KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n" , irq); spurious_irq_mask |= irqmask; }
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +0000. Anything received after that time might be too late.
Building sparc64:allmodconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included from arch/sparc/include/asm/percpu_64.h:11,
from arch/sparc/include/asm/percpu.h:5,
from include/linux/random.h:14,
from fs/crypto/policy.c:13:arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
54 | extern struct trap_per_cpu trap_block[NR_CPUS];
Inherited from mainline. Builds are not complete yet; we may see a few more failures (powerpc:ppc64e_defconfig fails to build in mainline as well).
Guenter
Greg Kroah-Hartman
maintainerQuoted 17 lines · Guenter Roeck
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +0000. Anything received after that time might be too late.
Building sparc64:allmodconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included fromarch/sparc/include/asm/percpu_64.h:11,from arch/sparc/include/asm/percpu.h:5, from include/linux/random.h:14, from fs/crypto/policy.c:13:
Quoted 6 lines
arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
54 | extern structtrap_per_cputrap_block[NR_CPUS];Inherited from mainline. Builds are not complete yet; we may see a few more failures (powerpc:ppc64e_defconfig fails to build in mainline as well).
If it gets fixed upstream, I'll fix it here :)
thanks,
greg k-h
Hi Greg,
Quoted 21 lines · Greg Kroah-Hartman
Quoted 20 lines · Guenter Roeck
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +0000. Anything received after that time might be too late.
Building sparc64:allmodconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included fromarch/sparc/include/asm/percpu_64.h:11,from arch/sparc/include/asm/percpu.h:5, from include/linux/random.h:14, from fs/crypto/policy.c:13:
arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
54 | extern structtrap_per_cputrap_block[NR_CPUS];
Quoted 5 lines
Quoted 3 lines
Inherited from mainline. Builds are not complete yet; we may see a few more failures (powerpc:ppc64e_defconfig fails to build in mainline as well).
If it gets fixed upstream, I'll fix it here :)
And else you'll release a known-broken v5.7.13?
Perhaps backporting should be a bit less aggressive?
This breakage was introduced in between v5.8-rc7 and v5.8, and backported before people had the time to properly look into the v5.8 build bot logs.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 29 lines · Geert Uytterhoeven
Hi Greg,
Quoted 25 lines · Greg Kroah-Hartman
Quoted 23 lines · Guenter Roeck
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +0000. Anything received after that time might be too late.
Building sparc64:allmodconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included fromarch/sparc/include/asm/percpu_64.h:11,from arch/sparc/include/asm/percpu.h:5, from include/linux/random.h:14, from fs/crypto/policy.c:13:
arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
54 | extern structtrap_per_cputrap_block[NR_CPUS];Inherited from mainline. Builds are not complete yet; we may see a few more failures (powerpc:ppc64e_defconfig fails to build in mainline as well).
Quoted 8 lines
Quoted 1 line
If it gets fixed upstream, I'll fix it here :)
And else you'll release a known-broken v5.7.13?
Perhaps backporting should be a bit less aggressive?
This breakage was introduced in between v5.8-rc7 and v5.8, and backported before people had the time to properly look into the v5.8 build bot logs.
The bisect log below applies to both the sparc and the powerpc build failures.
I should have guessed. Bisect points to the random changes. Those are really causing an endless amount of trouble. I hope the problem they are solving is worth all that trouble.
Guenter
---
# bad: [333e573a423b816b8b28000d6106fa52bd98e198] Linux 4.14.192-rc1
# good: [7f2c5eb458b8855655a19c44cd0043f7f83c595f] Linux 4.14.191
git bisect start 'HEAD' 'v4.14.191'
# bad: [88918f1a1f18dad31154103fa5218e714f10679e] net/x25: Fix x25_neigh refcnt leak when x25 disconnect git bisect bad 88918f1a1f18dad31154103fa5218e714f10679e
# good: [1f9d268fd05887ecb6225a9452309efc3535492d] ARM: percpu.h: fix build error
git bisect good 1f9d268fd05887ecb6225a9452309efc3535492d
# bad: [f496bedf603212e6dbef88425680f8e137a51e27] random32: remove net_rand_state from the latent entropy gcc plugin git bisect bad f496bedf603212e6dbef88425680f8e137a51e27
# good: [1e69d85c7e40051b57414953410bcee858285081] f2fs: check memory boundary by insane namelen
git bisect good 1e69d85c7e40051b57414953410bcee858285081
# bad: [0ea865dc4e3d93320e7103958ff041f5d7032ed5] random: fix circular include dependency on arm64 after addition of percpu.h git bisect bad 0ea865dc4e3d93320e7103958ff041f5d7032ed5
# good: [e2bd43f819d770de686a904b7139bf444e96543c] f2fs: check if file namelen exceeds max value
git bisect good e2bd43f819d770de686a904b7139bf444e96543c
# first bad commit: [0ea865dc4e3d93320e7103958ff041f5d7032ed5] random: fix circular include dependency on arm64 after addition of percpu.h
Hi Guenter,
Quoted 3 lines · Guenter Roeck
I should have guessed. Bisect points to the random changes. Those are really causing an endless amount of trouble. I hope the problem they are solving is worth all that trouble.
I was exactly suggesting that we postpone them. I don't think the problem is worth the trouble, and fixes are currently being proposed so it might just be a matter of days.
Regards,
Willy
Linus Torvalds
Acked-by Willy TarreauQuoted 3 lines · Guenter Roeck
The bisect log below applies to both the sparc and the powerpc build failures.
Does the attached fix it?
Linus
From 780c8591bce09bbdd2908b7c07b3baba883a1ce6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Fri, 31 Jul 2020 07:51:14 +0200
Subject: [PATCH] random32: move the pseudo-random 32-bit definitions to prandom.h
The addition of percpu.h to the list of includes in random.h revealed some circular dependencies on arm64 and possibly other platforms. This include was added solely for the pseudo-random definitions, which have nothing to do with the rest of the definitions in this file but are still there for legacy reasons.
This patch moves the pseudo-random parts to linux/prandom.h and the percpu.h include with it, which is now guarded by _LINUX_PRANDOM_H and protected against recursive inclusion.
A further cleanup step would be to remove this from <linux/random.h> entirely, and make people who use the prandom infrastructure include just the new header file. That's a bit of a churn patch, but grepping for "prandom_" and "next_pseudo_random32" should catch most users.
--- include/linux/prandom.h | 78 +++++++++++++++++++++++++++++++++++++++++ include/linux/random.h | 66 +++------------------------------- 2 files changed, 82 insertions(+), 62 deletions(-) create mode 100644 include/linux/prandom.h
include/linux/prandom.h new file +78 -0
@@ -0,0 +1,78 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* include/linux/prandom.h +* +* Include file for the fast pseudo-random 32-bit +* generation. +*/ +#ifndef _LINUX_PRANDOM_H +#define _LINUX_PRANDOM_H + +#include <linux/types.h> +#include <linux/percpu.h> + +u32 prandom_u32 (void ); +void prandom_bytes (void *buf,size_t nbytes); +void prandom_seed (u32 seed); +void prandom_reseed_late (void ); + +struct rnd_state { +__u32 s1, s2, s3, s4; +}; + +DECLARE_PER_CPU(struct rnd_state, net_rand_state); + +u32 prandom_u32_state (struct rnd_state *state); +void prandom_bytes_state (struct rnd_state *state,void *buf,size_t nbytes); +void prandom_seed_full_state (struct rnd_state __percpu *pcpu_state); + +#define prandom_init_once (pcpu_state) \ + DO_ONCE(prandom_seed_full_state, (pcpu_state)) + +/** +* prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro) +* @ep_ro: right open interval endpoint +* +* Returns a pseudo-random number that is in interval [0, ep_ro). Note +* that the result depends on PRNG being well distributed in [0, ~0U] +* u32 space. Here we use maximally equidistributed combined Tausworthe +* generator, that is, prandom_u32(). This is useful when requesting a +* random index of an array containing ep_ro elements, for example. +* +* Returns: pseudo-random number in interval [0, ep_ro) +*/ +static inline u32 prandom_u32_max (u32 ep_ro) +{ +return (u32)(((u64 )prandom_u32 () * ep_ro) >>32 ); +} + +/* +* Handle minimum values for seeds +*/ +static inline u32 __seed (u32 x,u32 m) +{ +return (x < m) ? x + m : x; +} + +/** +* prandom_seed_state - set seed for prandom_u32_state(). +* @state: pointer to state structure to receive the seed. +* @seed: arbitrary 64-bit value to use as a seed. +*/ +static inline void prandom_seed_state (struct rnd_state *state,u64 seed) +{ +u32 i = (seed >>32 ) ^ (seed <<10 ) ^ seed; + + state->s1 =__seed (i,2U ); + state->s2 =__seed (i,8U ); + state->s3 =__seed (i,16U ); + state->s4 =__seed (i,128U ); +} + +/* Pseudo random number generator from numerical recipes. */ +static inline u32 next_pseudo_random32 (u32 seed) +{ +return seed *1664525 +1013904223 ; +} + +#endif
include/linux/random.h +4 -62
84 lines not on this page · raw message
Signature · 1 line
2.28.0.4.g1bac1770cd
Quoted 7 lines · Linus Torvalds
Quoted 3 lines · Guenter Roeck
The bisect log below applies to both the sparc and the powerpc build failures.
Does the attached fix it?
Yes, for the failing file with both ppc64 and sparc64. I started a full test for all architectures with the patch applied on top of v5.8. It should take about 1-2 hours to finish. I'll let you know when I have a complete set of results.
Guenter
Guenter Roeck
Tested-byQuoted 24 lines · Linus Torvalds
Quoted 3 lines · Guenter Roeck
The bisect log below applies to both the sparc and the powerpc build failures.
Does the attached fix it?
Linus
From
780c8591bce09bbdd2908b7c07b3baba883a1ce6Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Fri, 31 Jul 2020 07:51:14 +0200
Subject: [PATCH] random32: move the pseudo-random 32-bit definitions toprandom.hThe addition of
percpu.hto the list of includes inrandom.hrevealed some circular dependencies on arm64 and possibly other platforms. This include was added solely for the pseudo-random definitions, which have nothing to do with the rest of the definitions in this file but are still there for legacy reasons.This patch moves the pseudo-random parts to
linux/prandom.hand thepercpu.hinclude with it, which is now guarded by_LINUX_PRANDOM_Hand protected against recursive inclusion.
Quoted 7 lines
A further cleanup step would be to remove this from <
linux/random.h> entirely, and make people who use the prandom infrastructure include just the new header file. That's a bit of a churn patch, but grepping for "prandom_" and "next_pseudo_random32" should catch most users.Acked-by Willy Tarreau <[email protected]>Signed-off-by Linus Torvalds <[email protected]>
With this patch applied on top of v5.8:
Build results:
total: 151 pass: 151 fail: 0 Qemu test results: total: 430 pass: 430 fail: 0
Thanks,
Guenter
Quoted 184 lines
--- include/linux/prandom.h | 78 +++++++++++++++++++++++++++++++++++++++++ include/linux/random.h | 66 +++------------------------------- 2 files changed, 82 insertions(+), 62 deletions(-) create mode 100644 include/linux/prandom.hinclude/linux/prandom.h new file +78
-0@@ -0,0 +1,78 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* include/linux/prandom.h +* +* Include file for the fast pseudo-random 32-bit +* generation. +*/ +#ifndef _LINUX_PRANDOM_H +#define _LINUX_PRANDOM_H + +#include <linux/types.h> +#include <linux/percpu.h> + +u32 prandom_u32 (void ); +void prandom_bytes (void *buf,size_t nbytes); +void prandom_seed (u32 seed); +void prandom_reseed_late (void ); + +struct rnd_state { +__u32 s1, s2, s3, s4; +}; + +DECLARE_PER_CPU(struct rnd_state, net_rand_state); + +u32 prandom_u32_state (struct rnd_state *state); +void prandom_bytes_state (struct rnd_state *state,void *buf,size_t nbytes); +void prandom_seed_full_state (struct rnd_state __percpu *pcpu_state); + +#define prandom_init_once (pcpu_state) \ + DO_ONCE(prandom_seed_full_state, (pcpu_state)) + +/** +* prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro) +* @ep_ro: right open interval endpoint +* +* Returns a pseudo-random number that is in interval [0, ep_ro). Note +* that the result depends on PRNG being well distributed in [0, ~0U] +* u32 space. Here we use maximally equidistributed combined Tausworthe +* generator, that is, prandom_u32(). This is useful when requesting a +* random index of an array containing ep_ro elements, for example. +* +* Returns: pseudo-random number in interval [0, ep_ro) +*/ +static inline u32 prandom_u32_max (u32 ep_ro) +{ +return (u32)(((u64 )prandom_u32 () * ep_ro) >>32 ); +} + +/* +* Handle minimum values for seeds +*/ +static inline u32 __seed (u32 x,u32 m) +{ +return (x < m) ? x + m : x; +} + +/** +* prandom_seed_state - set seed for prandom_u32_state(). +* @state: pointer to state structure to receive the seed. +* @seed: arbitrary 64-bit value to use as a seed. +*/ +static inline void prandom_seed_state (struct rnd_state *state,u64 seed) +{ +u32 i = (seed >>32 ) ^ (seed <<10 ) ^ seed; + + state->s1 =__seed (i,2U ); + state->s2 =__seed (i,8U ); + state->s3 =__seed (i,16U ); + state->s4 =__seed (i,128U ); +} + +/* Pseudo random number generator from numerical recipes. */ +static inline u32 next_pseudo_random32 (u32 seed) +{ +return seed *1664525 +1013904223 ; +} + +#endif include/linux/random.h +4
-62@@ -11,7 +11,6 @@#include <linux/kernel.h> #include <linux/list.h> #include <linux/once.h> -#include <asm/percpu.h> #include <uapi/linux/random.h> @@ -111,63 +110,12 @@ declare_get_random_var_wait(long)unsigned long randomize_page (unsigned long start,unsigned long range); -u32 prandom_u32 (void ); -void prandom_bytes (void *buf,size_t nbytes); -void prandom_seed (u32 seed); -void prandom_reseed_late (void ); - -struct rnd_state { -__u32 s1, s2, s3, s4; -}; - -DECLARE_PER_CPU(struct rnd_state, net_rand_state); - -u32 prandom_u32_state (struct rnd_state *state); -void prandom_bytes_state (struct rnd_state *state,void *buf,size_t nbytes); -void prandom_seed_full_state (struct rnd_state __percpu *pcpu_state); - -#define prandom_init_once (pcpu_state) \ - DO_ONCE(prandom_seed_full_state, (pcpu_state)) - -/** -* prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro) -* @ep_ro: right open interval endpoint -* -* Returns a pseudo-random number that is in interval [0, ep_ro). Note -* that the result depends on PRNG being well distributed in [0, ~0U] -* u32 space. Here we use maximally equidistributed combined Tausworthe -* generator, that is, prandom_u32(). This is useful when requesting a -* random index of an array containing ep_ro elements, for example. -* -* Returns: pseudo-random number in interval [0, ep_ro) -*/ -static inline u32 prandom_u32_max (u32 ep_ro) -{ -return (u32)(((u64 )prandom_u32 () * ep_ro) >>32 ); -} -/* -* Handle minimum values for seeds -*/ -static inline u32 __seed (u32 x,u32 m) -{ -return (x < m) ? x + m : x; -} - -/** -* prandom_seed_state - set seed for prandom_u32_state(). -* @state: pointer to state structure to receive the seed. -* @seed: arbitrary 64-bit value to use as a seed. +* This is designed to be standalone for just prandom +* users, but for now we include it from <linux/random.h> +* for legacy reasons. */ -static inline void prandom_seed_state (struct rnd_state *state,u64 seed) -{ -u32 i = (seed >>32 ) ^ (seed <<10 ) ^ seed; - - state->s1 =__seed (i,2U ); - state->s2 =__seed (i,8U ); - state->s3 =__seed (i,16U ); - state->s4 =__seed (i,128U ); -} +#include <linux/prandom.h> #ifdef CONFIG_ARCH_RANDOM # include <asm/archrandom.h> @@ -210,10 +158,4 @@ static inline bool __init arch_get_random_long_early(unsigned long *v) }#endif -/* Pseudo random number generator from numerical recipes. */ -static inline u32 next_pseudo_random32 (u32 seed) -{ -return seed *1664525 +1013904223 ; -} -#endif /* _LINUX_RANDOM_H */ Signature · 1 line
2.28.0.4.g1bac1770cd
Greg Kroah-Hartman
maintainerQuoted 33 lines · Guenter Roeck
Quoted 24 lines · Linus Torvalds
Quoted 3 lines · Guenter Roeck
The bisect log below applies to both the sparc and the powerpc build failures.
Does the attached fix it?
Linus
From
780c8591bce09bbdd2908b7c07b3baba883a1ce6Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Fri, 31 Jul 2020 07:51:14 +0200
Subject: [PATCH] random32: move the pseudo-random 32-bit definitions toprandom.hThe addition of
percpu.hto the list of includes inrandom.hrevealed some circular dependencies on arm64 and possibly other platforms. This include was added solely for the pseudo-random definitions, which have nothing to do with the rest of the definitions in this file but are still there for legacy reasons.This patch moves the pseudo-random parts to
linux/prandom.hand thepercpu.hinclude with it, which is now guarded by_LINUX_PRANDOM_Hand protected against recursive inclusion.Quoted 7 lines
A further cleanup step would be to remove this from <
linux/random.h> entirely, and make people who use the prandom infrastructure include just the new header file. That's a bit of a churn patch, but grepping for "prandom_" and "next_pseudo_random32" should catch most users.Acked-by Willy Tarreau <[email protected]>Signed-off-by Linus Torvalds <[email protected]>
Quoted 8 lines
With this patch applied on top of v5.8:
Build results:
total: 151 pass: 151 fail: 0 Qemu test results: total: 430 pass: 430 fail: 0Tested-by Guenter Roeck <[email protected]>
Thanks for this, I'll go queue it up in a bit and push out some new -rc2 releases.
greg k-h
Quoted 2 lines · Guenter Roeck
Tested-by Guenter Roeck <[email protected]>
Thanks.
Greg, I updated my internal commit with Guenter's tested-by and some more commentary (I had tried to break out that file entirely, it gets ugly).
So it's now commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to prandom.h") in my tree, and I've pushed it out.
Linus
Greg Kroah-Hartman
maintainerQuoted 4 lines · Linus Torvalds
Quoted 2 lines · Guenter Roeck
Tested-by Guenter Roeck <[email protected]>
Quoted 8 lines
Thanks.
Greg, I updated my internal commit with Guenter's tested-by and some more commentary (I had tried to break out that file entirely, it gets ugly).
So it's now commit
c0842fbc1b18("random32: move the pseudo-random 32-bit definitions toprandom.h") in my tree, and I've pushed it out.
Great, I see it now and will grab it from there, thanks!
greg k-h
Quoted 21 lines · Greg Kroah-Hartman
Quoted 20 lines · Guenter Roeck
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.7.13 release. There are 120 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, 05 Aug 2020 12:18:33 +0000. Anything received after that time might be too late.
Building sparc64:allmodconfig ... failed
--------------
Error log:
<stdin>:1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included fromarch/sparc/include/asm/percpu_64.h:11,from arch/sparc/include/asm/percpu.h:5, from include/linux/random.h:14, from fs/crypto/policy.c:13:
arch/sparc/include/asm/trap_block.h:54:39: error: 'NR_CPUS' undeclared here (not in a function)
54 | extern structtrap_per_cputrap_block[NR_CPUS];
Quoted 6 lines
Quoted 3 lines
Inherited from mainline. Builds are not complete yet; we may see a few more failures (powerpc:ppc64e_defconfig fails to build in mainline as well).
If it gets fixed upstream, I'll fix it here :)
Are you serious ? This problem literally affects all branches, starting with v4.4.y. And, yes, the powerpc builds fail as well for all branches. Just like mainline. I guess that means it doesn't matter either ?
Building powerpc:ppc64e_defconfig ... failed
--------------
Error log:
In file included from arch/powerpc/include/asm/paca.h:22,
from arch/powerpc/include/asm/percpu.h:13,
from include/linux/random.h:12,
from lib/uuid.c:22:arch/powerpc/include/asm/mmu.h:131:22: error: unknown type name 'next_tlbcam_idx'
Congratulations, looks like all stable releases are "bug for bug compatible" with mainline.
Does it even make sense to provide full reports for this set of releases ?
Guenter