5.14.15-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 5.14.15-rc1 review
This is the start of the stable review cycle for the 5.14.15 release. There are 169 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, 27 Oct 2021 19:08:09 +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.14.15-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.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.14.15-rc1
Fabien Dessenne <[email protected]>
pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume()
Nick Desaulniers <[email protected]>
ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
Sasha Neftin <[email protected]>
e1000e: Separate TGP board type from SPT
Yanfei Xu <[email protected]>
net: mdiobus: Fix memory leak in __mdiobus_register
Oliver Neukum <[email protected]>
usbnet: sanity check for maxpacket
Daniel Borkmann <[email protected]>
bpf, test, cgroup: Use sk_{alloc,free} for test cases
Niklas Schnelle <[email protected]>
s390/pci: fix zpci_zdev_put() on reserve
Niklas Schnelle <[email protected]>
s390/pci: cleanup resources only if necessary
Dexuan Cui <[email protected]>
scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma()
Ian Kent <[email protected]>
autofs: fix wait name hash calculation in autofs_wait()
Anitha Chrisanthus <[email protected]>
drm/kmb: Limit supported mode to 1080p
Edmund Dea <[email protected]>
drm/kmb: Enable alpha blended second plane
Maor Dickman <[email protected]>
net/mlx5: Lag, change multipath and bonding to be mutually exclusive
Mark Bloch <[email protected]>
net/mlx5: Lag, move lag destruction to a workqueue
Yunsheng Lin <[email protected]>
net: hns3: fix for miscalculation of rx unused desc
Woody Lin <[email protected]>
sched/scs: Reset the shadow stack when idle_task_exit
Marek Szyprowski <[email protected]>
mm/thp: decrease nr_thps in file's mapping on THP split
Joy Gu <[email protected]>
scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()
Sreekanth Reddy <[email protected]>
scsi: mpi3mr: Fix duplicate device entries when scanning through sysfs
Andrea Parri (Microsoft) <[email protected]>
scsi: storvsc: Fix validation for unsolicited incoming packets
Mike Christie <[email protected]>
scsi: iscsi: Fix set_param() handling
Srinivasa Rao Mandadapu <[email protected]>
ASoC: codec: wcd938x: Add irq config support
Uwe Kleine-König <[email protected]>
Input: snvs_pwrkey - add clk handling
Kan Liang <[email protected]>
perf/x86/msr: Add Sapphire Rapids CPU support
Shunsuke Nakamura <[email protected]>
libperf tests: Fix test_stat_cpu
Shunsuke Nakamura <[email protected]>
libperf test evsel: Fix build error on !x86 architectures
Uwe Kleine-König <[email protected]>
spi-mux: Fix false-positive lockdep splats
Mark Brown <[email protected]>
spi: Fix deadlock when adding SPI controllers on SPI buses
Kai Vehmanen <[email protected]>
ALSA: hda: avoid write to STATESTS if controller is in reset
Prashant Malani <[email protected]>
platform/x86: intel_scu_ipc: Update timeout value in comment
Prashant Malani <[email protected]>
platform/x86: intel_scu_ipc: Increase virtual timeout to 10s
Zheyu Ma <[email protected]>
isdn: mISDN: Fix sleeping function called from invalid context
Herve Codina <[email protected]>
ARM: dts: spear3xx: Fix gmac node
Herve Codina <[email protected]>
net: stmmac: add support for dwmac 3.40a
Filipe Manana <[email protected]>
btrfs: deal with errors when checking if a dir entry exists during log replay
Takashi Iwai <[email protected]>
ALSA: hda: intel: Allow repeatedly probing on codec configuration errors
Michael Forney <[email protected]>
objtool: Update section header before relocations
Michael Forney <[email protected]>
objtool: Check for gelf_update_rel[a] failures
Arnd Bergmann <[email protected]>
bitfield: build kunit tests without structleak plugin
Brendan Higgins <[email protected]>
thunderbolt: build kunit tests without structleak plugin
Brendan Higgins <[email protected]>
device property: build kunit tests without structleak plugin
Brendan Higgins <[email protected]>
iio/test-format: build kunit tests without structleak plugin
Brendan Higgins <[email protected]>
gcc-plugins/structleak: add makefile var for disabling structleak
Rob Clark <[email protected]>
drm/msm/a6xx: Serialize GMU communication
Xiyu Yang <[email protected]>
kunit: fix reference count leak in kfree_at_end
Chenyi Qiang <[email protected]>
KVM: MMU: Reset mmu->pkru_mask to avoid stale data
Yunsheng Lin <[email protected]>
net: hns3: fix the max tx size according to user manual
Marek Vasut <[email protected]>
drm: mxsfb: Fix NULL pointer dereference crash on unload
Peter Gonda <[email protected]>
KVM: SEV-ES: Set guest_state_protected after VMSA update
Nikolay Aleksandrov <[email protected]>
net: bridge: mcast: use multicast_membership_interval for IGMPv3
Florian Westphal <[email protected]>
selftests: netfilter: remove stray bash debug line
Vegard Nossum <[email protected]>
netfilter: Kconfig: use 'default y' instead of 'm' for bool config option
Xiaolong Huang <[email protected]>
isdn: cpai: check ctr->cnr to avoid array index out of bound
Lin Ma <[email protected]>
nfc: nci: fix the UAF of rf_conn_info object
Paolo Bonzini <[email protected]>
KVM: x86: remove unnecessary arguments from complete_emulator_pio_in
Paolo Bonzini <[email protected]>
KVM: x86: split the two parts of emulator_pio_in
Paolo Bonzini <[email protected]>
KVM: x86: check for interrupts before deciding whether to exit the fast path
Paolo Bonzini <[email protected]>
KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out
Paolo Bonzini <[email protected]>
KVM: SEV-ES: reduce ghcb_sa_len to 32 bits
Paolo Bonzini <[email protected]>
KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed
Paolo Bonzini <[email protected]>
KVM: SEV-ES: fix length of string I/O
Paolo Bonzini <[email protected]>
KVM: SEV-ES: keep INS functions together
Paolo Bonzini <[email protected]>
KVM: SEV-ES: clean up kvm_sev_es_ins/outs
Paolo Bonzini <[email protected]>
KVM: SEV-ES: rename guest_ins_data to sev_pio_data
Masahiro Kozuka <[email protected]>
KVM: SEV: Flush cache on non-coherent systems before RECEIVE_UPDATE_DATA
Paolo Bonzini <[email protected]>
KVM: nVMX: promptly process interrupts delivered while in guest mode
Miaohe Lin <[email protected]>
mm, slub: fix incorrect memcg slab count for bulk free
Miaohe Lin <[email protected]>
mm, slub: fix potential use-after-free in slab_debugfs_fops
Miaohe Lin <[email protected]>
mm, slub: fix potential memoryleak in kmem_cache_open()
Miaohe Lin <[email protected]>
mm, slub: fix mismatch between reconstructed freelist depth and cnt
Michael Ellerman <[email protected]>
powerpc/idle: Don't corrupt back chain when going idle
Michael Ellerman <[email protected]>
KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest
Michael Ellerman <[email protected]>
KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest()
Eric W. Biederman <[email protected]>
ucounts: Fix signal ucount refcounting
Eric W. Biederman <[email protected]>
ucounts: Proper error handling in set_cred_ucounts
Eric W. Biederman <[email protected]>
ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds
Eric W. Biederman <[email protected]>
ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring
DENG Qingfang <[email protected]>
net: dsa: mt7530: correct ds->num_ports
Gaosheng Cui <[email protected]>
audit: fix possible null-pointer dereference in audit_filter_rules
Tejun Heo <[email protected]>
blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu
Hans de Goede <[email protected]>
ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
Takashi Iwai <[email protected]>
ASoC: DAPM: Fix missing kctl change notifications
Steven Clarkson <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo PC50HS
Brendan Grieve <[email protected]>
ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
Sean Christopherson <[email protected]>
mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem()
Matthew Wilcox (Oracle) <[email protected]>
vfs: check fd has read access in kernel_read_file_from_fd()
Lukas Bulwahn <[email protected]>
elfcore: correct reference to CONFIG_UML
Eric Dumazet <[email protected]>
mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind()
Nadav Amit <[email protected]>
userfaultfd: fix a race between writeprotect and exit_mmap()
Peter Xu <[email protected]>
mm/userfaultfd: selftests: fix memory corruption with thp enabled
Valentin Vidic <[email protected]>
ocfs2: mount fails with buffer overflow in strlen
Jan Kara <[email protected]>
ocfs2: fix data corruption after conversion from inline format
Steven Rostedt (VMware) <[email protected]>
tracing: Have all levels of checks prevent recursion
Jeff Layton <[email protected]>
ceph: fix handling of "meta" errors
Jeff Layton <[email protected]>
ceph: skip existing superblocks that are blocklisted or shut down when mounting
Zhang Changzhong <[email protected]>
can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes
Zhang Changzhong <[email protected]>
can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length
Ziyang Xuan <[email protected]>
can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
Ziyang Xuan <[email protected]>
can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer
Ziyang Xuan <[email protected]>
can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg()
Ziyang Xuan <[email protected]>
can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible()
Marc Kleine-Budde <[email protected]>
can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path
Zheyu Ma <[email protected]>
can: peak_pci: peak_pci_remove(): fix UAF
Stephane Grosjean <[email protected]>
can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
Yoshihiro Shimoda <[email protected]>
can: rcar_can: fix suspend/resume
Vladimir Oltean <[email protected]>
net: enetc: make sure all traffic classes can send large frames
Vladimir Oltean <[email protected]>
net: enetc: fix ethtool counter name for PM0_TERR
Anitha Chrisanthus <[email protected]>
drm/kmb: Enable ADV bridge after modeset
Anitha Chrisanthus <[email protected]>
drm/kmb: Corrected typo in handle_lcd_irq
Edmund Dea <[email protected]>
drm/kmb: Disable change of plane parameters
Edmund Dea <[email protected]>
drm/kmb: Remove clearing DPHY regs
Anitha Chrisanthus <[email protected]>
drm/kmb: Work around for higher system clock
Dan Johansen <[email protected]>
drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel
Emeel Hakim <[email protected]>
net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags
Emeel Hakim <[email protected]>
net/mlx5e: IPsec: Fix a misuse of the software parser's fields
Tony Nguyen <[email protected]>
ice: Add missing E810 device ids
Sasha Neftin <[email protected]>
igc: Update I226_K device ID
Sasha Neftin <[email protected]>
e1000e: Fix packet loss on Tiger Lake and later
Yang Yingliang <[email protected]>
ptp: Fix possible memory leak in ptp_clock_register()
Kurt Kanzenbach <[email protected]>
net: stmmac: Fix E2E delay mechanism
Peng Li <[email protected]>
net: hns3: disable sriov before unload hclge layer
Yufeng Mo <[email protected]>
net: hns3: fix vf reset workqueue cannot exit
Yunsheng Lin <[email protected]>
net: hns3: schedule the polling again when allocation fails
Guangbin Huang <[email protected]>
net: hns3: add limit ets dwrr bandwidth cannot be 0
Guangbin Huang <[email protected]>
net: hns3: reset DWRR of unused tc to zero
Jiaran Zhang <[email protected]>
net: hns3: Add configuration of TM QCN error event
Nathan Lynch <[email protected]>
powerpc/smp: do not decrement idle task preempt count in CPU offline
Christophe JAILLET <[email protected]>
net: dsa: Fix an error handling path in 'dsa_switch_parse_ports_of()'
Randy Dunlap <[email protected]>
NIOS2: irqflags: rename a redefined register name
Paul Blakey <[email protected]>
net/sched: act_ct: Fix byte count on fragmented packets
Aleksander Jan Bajkowski <[email protected]>
net: dsa: lantiq_gswip: fix register definition
Randy Dunlap <[email protected]>
hamradio: baycom_epp: fix build for UML
Stephen Suryaputra <[email protected]>
ipv6: When forwarding count rx stats on the orig netdev
Leonard Crestez <[email protected]>
tcp: md5: Fix overlap between vrf and non-vrf keys
Vegard Nossum <[email protected]>
lan78xx: select CRC32
Xin Long <[email protected]>
sctp: fix transport encap_port update in sctp_vtag_verify
Antoine Tenart <[email protected]>
netfilter: ipvs: make global sysctl readonly in non-init netns
Xin Long <[email protected]>
netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
Brett Creeley <[email protected]>
ice: Print the api_patch as part of the fw.mgmt.api
Michal Swiatkowski <[email protected]>
ice: fix getting UDP tunnel entry
Dave Ertman <[email protected]>
ice: Avoid crash from unnecessary IDA free
Brett Creeley <[email protected]>
ice: Fix failure to re-add LAN/RDMA Tx queues
Shengjiu Wang <[email protected]>
ASoC: wm8960: Fix clock configuration on slave mode
Gerald Schaefer <[email protected]>
dma-debug: fix sg checks in debug_dma_map_sg()
Florian Westphal <[email protected]>
netfilter: nf_tables: skip netdev events generated on netns removal
Juhee Kang <[email protected]>
netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value
Quentin Perret <[email protected]>
KVM: arm64: Release mmap_lock when using VM_SHARED with MTE
Quentin Perret <[email protected]>
KVM: arm64: Fix host stage-2 PGD refcount
Mark Brown <[email protected]>
ASoC: cs4341: Add SPI device ID table
Mark Brown <[email protected]>
ASoC: pcm179x: Add missing entries SPI to device ID table
Shengjiu Wang <[email protected]>
ASoC: fsl_xcvr: Fix channel swap issue with ARC
Peter Rosin <[email protected]>
ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers
Naveen N. Rao <[email protected]>
powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC
Naveen N. Rao <[email protected]>
powerpc/security: Add a helper to query stf_barrier type
Naveen N. Rao <[email protected]>
powerpc/bpf: Validate branch ranges
Naveen N. Rao <[email protected]>
powerpc/lib: Add helper to check if offset is within conditional branch range
Benjamin Coddington <[email protected]>
NFSD: Keep existing listeners on portlist error
Guenter Roeck <[email protected]>
xtensa: xtfpga: Try software restart before simulating CPU reset
Max Filippov <[email protected]>
xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
Yifan Zhang <[email protected]>
drm/amdgpu: init iommu after amdkfd device init
Alex Deucher <[email protected]>
drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
Hayes Wang <[email protected]>
r8152: avoid to resubmit rx immediately
Jan Beulich <[email protected]>
xen/x86: prevent PVH type from getting clobbered
Johannes Thumshirn <[email protected]>
block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
Eugen Hristev <[email protected]>
ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default
Rob Herring <[email protected]>
arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
Geert Uytterhoeven <[email protected]>
sh: pgtable-3level: fix cast to pointer from integer of different size
Helge Deller <[email protected]>
parisc: math-emu: Fix fall-through warnings
Geert Uytterhoeven <[email protected]>
block/mq-deadline: Move dd_queued() to fix defined but not used warning
-------------
Diffstat:
Documentation/networking/devlink/ice.rst | 9 +- Makefile | 4 +- arch/arm/Kconfig | 1 + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - arch/arm/boot/dts/spear3xx.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 1 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 13 +- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 ++ arch/arm64/kvm/mmu.c | 6 +- arch/nios2/include/asm/irqflags.h | 4 +- arch/nios2/include/asm/registers.h | 2 +- arch/parisc/math-emu/fpudispatch.c | 56 ++++++- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/include/asm/security_features.h | 5 + arch/powerpc/kernel/idle_book3s.S | 10 +- arch/powerpc/kernel/security.c | 5 + arch/powerpc/kernel/smp.c | 2 - arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++-- arch/powerpc/lib/code-patching.c | 7 +- arch/powerpc/net/bpf_jit.h | 33 ++-- arch/powerpc/net/bpf_jit64.h | 8 +- arch/powerpc/net/bpf_jit_comp.c | 6 +- arch/powerpc/net/bpf_jit_comp32.c | 8 +- arch/powerpc/net/bpf_jit_comp64.c | 63 +++++++- arch/s390/include/asm/pci.h | 2 + arch/s390/pci/pci.c | 48 +++++- arch/s390/pci/pci_event.c | 4 +- arch/sh/include/asm/pgtable-3level.h | 2 +- arch/x86/events/msr.c | 1 + arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/mmu/mmu.c | 6 +- arch/x86/kvm/svm/sev.c | 16 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/kvm/vmx/vmx.c | 17 +- arch/x86/kvm/x86.c | 150 ++++++++++++------ arch/x86/xen/enlighten.c | 9 +- arch/xtensa/platforms/xtfpga/setup.c | 12 +- block/blk-cgroup.c | 5 +- block/blk-mq-debugfs.c | 1 + block/mq-deadline.c | 12 +- drivers/base/test/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/display/Kconfig | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 41 ++++- drivers/gpu/drm/kmb/kmb_drv.c | 10 +- drivers/gpu/drm/kmb/kmb_drv.h | 13 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 25 +-- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 122 +++++++++++++-- drivers/gpu/drm/kmb/kmb_plane.h | 11 +- drivers/gpu/drm/kmb/kmb_regs.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 40 ++++- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 +- drivers/iio/test/Makefile | 1 + drivers/input/keyboard/snvs_pwrkey.c | 29 ++++ drivers/isdn/capi/kcapi.c | 5 + drivers/isdn/hardware/mISDN/netjet.c | 2 +- drivers/net/can/rcar/rcar_can.c | 20 ++- drivers/net/can/sja1000/peak_pci.c | 9 +- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 +- drivers/net/dsa/lantiq_gswip.c | 2 +- drivers/net/dsa/mt7530.c | 8 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 +- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 37 +++-- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 7 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 ++ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 5 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/intel/e1000e/e1000.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 31 +++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 + drivers/net/ethernet/intel/e1000e/netdev.c | 29 ++-- drivers/net/ethernet/intel/ice/ice_common.c | 2 + drivers/net/ethernet/intel/ice/ice_devids.h | 4 + drivers/net/ethernet/intel/ice/ice_devlink.c | 3 +- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 +- drivers/net/ethernet/intel/ice/ice_lib.c | 9 ++ drivers/net/ethernet/intel/ice/ice_main.c | 8 +- drivers/net/ethernet/intel/ice/ice_sched.c | 13 ++ drivers/net/ethernet/intel/ice/ice_sched.h | 1 + drivers/net/ethernet/intel/igc/igc_hw.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 51 +++--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 20 +-- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 19 ++- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 2 + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 + drivers/net/hamradio/baycom_epp.c | 6 +- drivers/net/phy/mdio_bus.c | 1 + drivers/net/usb/Kconfig | 1 + drivers/net/usb/r8152.c | 16 +- drivers/net/usb/usbnet.c | 4 + drivers/pci/hotplug/s390_pci_hpc.c | 9 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/ptp/ptp_clock.c | 15 +- drivers/scsi/hosts.c | 3 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 - drivers/scsi/storvsc_drv.c | 32 ++-- drivers/spi/spi-mux.c | 7 + drivers/spi/spi.c | 27 ++-- drivers/thunderbolt/Makefile | 1 + fs/autofs/waitq.c | 2 +- fs/btrfs/tree-log.c | 47 +++--- fs/ceph/caps.c | 12 +- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 - fs/ceph/mds_client.c | 17 +- fs/ceph/super.c | 17 +- fs/ceph/super.h | 3 - fs/kernel_read_file.c | 2 +- fs/nfsd/nfsctl.c | 5 +- fs/ocfs2/alloc.c | 46 ++---- fs/ocfs2/super.c | 14 +- fs/userfaultfd.c | 12 +- include/linux/elfcore.h | 2 +- include/linux/mlx5/driver.h | 1 - include/linux/secretmem.h | 2 +- include/linux/spi/spi.h | 3 + include/linux/trace_recursion.h | 49 ++---- include/linux/user_namespace.h | 2 + include/net/sctp/sm.h | 6 +- include/sound/hda_codec.h | 1 + kernel/auditsc.c | 2 +- kernel/cred.c | 9 +- kernel/dma/debug.c | 12 +- kernel/sched/core.c | 1 + kernel/signal.c | 25 +-- kernel/trace/ftrace.c | 4 +- kernel/ucount.c | 49 ++++++ lib/Makefile | 2 +- lib/kunit/executor_test.c | 4 +- mm/huge_memory.c | 6 +- mm/mempolicy.c | 16 +- mm/slub.c | 23 ++- net/bpf/test_run.c | 14 +- net/bridge/br_private.h | 4 +- net/can/isotp.c | 51 ++++-- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 7 +- net/can/j1939/transport.c | 14 +- net/dsa/dsa2.c | 9 +- net/ipv4/tcp_ipv4.c | 19 ++- net/ipv6/ip6_output.c | 3 +- net/ipv6/netfilter/ip6t_rt.c | 48 +----- net/netfilter/Kconfig | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 5 + net/netfilter/nft_chain_filter.c | 9 +- net/netfilter/xt_IDLETIMER.c | 2 +- net/nfc/nci/rsp.c | 2 + net/sched/act_ct.c | 2 +- scripts/Makefile.gcc-plugins | 4 + security/keys/process_keys.c | 8 + sound/hda/hdac_controller.c | 5 +- sound/pci/hda/hda_bind.c | 20 +-- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++- sound/pci/hda/hda_intel.h | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/cs4341.c | 7 + sound/soc/codecs/nau8824.c | 4 +- sound/soc/codecs/pcm179x-spi.c | 1 + sound/soc/codecs/pcm512x.c | 2 + sound/soc/codecs/wm8960.c | 13 +- sound/soc/fsl/fsl_xcvr.c | 17 +- sound/soc/soc-dapm.c | 13 +- sound/usb/quirks-table.h | 32 ++++ tools/lib/perf/tests/test-evlist.c | 6 +- tools/lib/perf/tests/test-evsel.c | 7 +- tools/objtool/elf.c | 56 +++---- tools/testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 +++++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - tools/testing/selftests/vm/userfaultfd.c | 23 ++- 196 files changed, 1761 insertions(+), 731 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/169 block/mq-deadline: Move dd_queued() to fix defined but not used warning
From: Geert Uytterhoeven <[email protected]>
commit 55a51ea14094a1e7dd0d7f33237d246033dd39ab upstream.
If CONFIG_BLK_DEBUG_FS=n:
block/mq-deadline.c:274:12: warning: ‘dd_queued’ defined but not used [-Wunused-function]
274 | static u32 dd_queued(struct deadline_data *dd, enum dd_prio prio)
| ^~~~~~~~~
Fix this by moving dd_queued() just before the sole function that calls it.
--- block/mq-deadline.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/mq-deadline.c +6 -6
@@ -270,12 +270,6 @@ deadline_move_request(struct deadline_dadeadline_remove_request (rq->q, per_prio, rq); } -/* Number of requests queued for a given priority level. */ -static u32 dd_queued (struct deadline_data *dd,enum dd_prio prio) -{ -return dd_sum (dd, inserted, prio) -dd_sum (dd, completed, prio); -} -/* * deadline_check_fifo returns 0 if there are no expired requests on the fifo, * 1 otherwise. Requires !list_empty(&dd->fifo_list[data_dir])
@@ -953,6 +947,12 @@ static int dd_async_depth_show(void *datreturn 0 ; } +/* Number of requests queued for a given priority level. */ +static u32 dd_queued (struct deadline_data *dd,enum dd_prio prio) +{ +return dd_sum (dd, inserted, prio) -dd_sum (dd, completed, prio); +} +static int dd_queued_show (void *data,struct seq_file *m) {struct request_queue *q = data;
Greg Kroah-Hartman
maintainerPATCH 2/169 parisc: math-emu: Fix fall-through warnings
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6f1fce595b78b775d7fb585c15c2dc3a6994f96e upstream.
Fix lots of fallthrough warnings, e.g.:arch/parisc/math-emu/fpudispatch.c:323:33: warning: this statement may fall through [-Wimplicit-fallthrough=]
--- arch/parisc/math-emu/fpudispatch.c | 56 +++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 3 deletions(-)
arch/parisc/math-emu/fpudispatch.c +53 -3
@@ -310,12 +310,15 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1];return (NOEXCEPTION ); } +BUG ();case 3 :/* FABS */ switch (fmt) {case 2 :/* illegal */
@@ -325,13 +328,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and clear sign bit */ fpregs[t] = fpregs[r1] &0x7fffffff ;return (NOEXCEPTION ); } +BUG ();case 6 :/* FNEG */ switch (fmt) {case 2 :/* illegal */
@@ -341,13 +347,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and invert sign bit */ fpregs[t] = fpregs[r1] ^0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 7 :/* FNEGABS */ switch (fmt) {case 2 :/* illegal */
@@ -357,13 +366,16 @@ decode_0c(u_int ir, u_int class, u_int s r1 &= ~3 ; fpregs[t+3 ] = fpregs[r1+3 ]; fpregs[t+2 ] = fpregs[r1+2 ]; + fallthrough;case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ /* copy and set sign bit */ fpregs[t] = fpregs[r1] |0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 4 :/* FSQRT */ switch (fmt) {case 0 :
@@ -376,6 +388,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 5 :/* FRND */ switch (fmt) {case 0 :
@@ -389,7 +402,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (MAJOR_0C_EXCP ); } }/* end of switch (subop) */ - +BUG ();case 1 :/* class 1 */ df =extru (ir,fpdfpos,2 );/* get dest format */ if ((df &2 ) || (fmt &2 )) {
@@ -419,6 +432,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* dbl/dbl */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FCNVXF */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -434,6 +448,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvxf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 2 :/* FCNVFX */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -449,6 +464,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfx (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 3 :/* FCNVFXT */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -464,6 +480,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfxt (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 5 :/* FCNVUF (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -479,6 +496,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvuf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 6 :/* FCNVFU (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -494,6 +512,7 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfu (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 7 :/* FCNVFUT (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -509,10 +528,11 @@ decode_0c(u_int ir, u_int class, u_int sreturn (dbl_to_dbl_fcnvfut (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 4 :/* undefined */ return (MAJOR_0C_EXCP ); }/* end of switch subop */ - +BUG ();case 2 :/* class 2 */ fpu_type_flags=fpregs[FPU_TYPE_FLAG_POS ]; r2 =extru (ir, fpr2pos,5 ) *sizeof (double )/sizeof (u_int);
@@ -590,6 +610,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FTEST */ switch (fmt) {case 0 :
@@ -609,8 +630,10 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :return (MAJOR_0C_EXCP ); } +BUG (); }/* end of switch subop */ }/* end of else for PA1.0 & PA1.1 */ +BUG ();case 3 :/* class 3 */ r2 =extru (ir,fpr2pos,5 ) *sizeof (double )/sizeof (u_int);if (r2 ==0 )
@@ -633,6 +656,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 1 :/* FSUB */ switch (fmt) {case 0 :
@@ -645,6 +669,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 2 :/* FMPY */ switch (fmt) {case 0 :
@@ -657,6 +682,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 3 :/* FDIV */ switch (fmt) {case 0 :
@@ -669,6 +695,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG ();case 4 :/* FREM */ switch (fmt) {case 0 :
@@ -681,6 +708,7 @@ decode_0c(u_int ir, u_int class, u_int scase 3 :/* quad not implemented */ return (MAJOR_0C_EXCP ); } +BUG (); }/* end of class 3 switch */ }/* end of switch(class) */
@@ -736,10 +764,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1];return (NOEXCEPTION ); } +BUG ();case 3 :/* FABS */ switch (fmt) {case 2 :
@@ -747,10 +777,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] &0x7fffffff ;return (NOEXCEPTION ); } +BUG ();case 6 :/* FNEG */ switch (fmt) {case 2 :
@@ -758,10 +790,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] ^0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 7 :/* FNEGABS */ switch (fmt) {case 2 :
@@ -769,10 +803,12 @@ u_int fpregs[];return (MAJOR_0E_EXCP );case 1 :/* double */ fpregs[t+1 ] = fpregs[r1+1 ]; + fallthrough;case 0 :/* single */ fpregs[t] = fpregs[r1] |0x80000000 ;return (NOEXCEPTION ); } +BUG ();case 4 :/* FSQRT */ switch (fmt) {case 0 :
@@ -785,6 +821,7 @@ u_int fpregs[];case 3 :return (MAJOR_0E_EXCP ); } +BUG ();case 5 :/* FRMD */ switch (fmt) {case 0 :
@@ -798,7 +835,7 @@ u_int fpregs[];return (MAJOR_0E_EXCP ); } }/* end of switch (subop */ - +BUG ();case 1 :/* class 1 */ df =extru (ir,fpdfpos,2 );/* get dest format */ /*
@@ -826,6 +863,7 @@ u_int fpregs[];case 3 :/* dbl/dbl */ return (MAJOR_0E_EXCP ); } +BUG ();case 1 :/* FCNVXF */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -841,6 +879,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvxf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 2 :/* FCNVFX */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -856,6 +895,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfx (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 3 :/* FCNVFXT */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -871,6 +911,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfxt (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 5 :/* FCNVUF (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -886,6 +927,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvuf (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 6 :/* FCNVFU (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -901,6 +943,7 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfu (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 7 :/* FCNVFUT (PA2.0 only) */ switch (fmt) {case 0 :/* sgl/sgl */
@@ -916,9 +959,11 @@ u_int fpregs[];return (dbl_to_dbl_fcnvfut (&fpregs[r1],0 , &fpregs[t],status)); } +BUG ();case 4 :/* undefined */ return (MAJOR_0C_EXCP ); }/* end of switch subop */ +BUG ();case 2 :/* class 2 */ /* * Be careful out there.
@@ -994,6 +1039,7 @@ u_int fpregs[]; } }/* end of switch subop */ }/* end of else for PA1.0 & PA1.1 */ +BUG ();case 3 :/* class 3 */ /* * Be careful out there.
@@ -1026,6 +1072,7 @@ u_int fpregs[];return (dbl_fadd (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 1 :/* FSUB */ switch (fmt) {case 0 :
@@ -1035,6 +1082,7 @@ u_int fpregs[];return (dbl_fsub (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 2 :/* FMPY or XMPYU */ /* * check for integer multiply (x bit set)
@@ -1071,6 +1119,7 @@ u_int fpregs[]; &fpregs[r2],&fpregs[t],status)); } } +BUG ();case 3 :/* FDIV */ switch (fmt) {case 0 :
@@ -1080,6 +1129,7 @@ u_int fpregs[];return (dbl_fdiv (&fpregs[r1],&fpregs[r2], &fpregs[t],status)); } +BUG ();case 4 :/* FREM */ switch (fmt) {case 0 :
Greg Kroah-Hartman
maintainerPATCH 3/169 sh: pgtable-3level: fix cast to pointer from integer of different size
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit e8e9f1e6327005be9656aa135aeb9dfdaf6b3032 upstream.
If X2TLB=y (CPU_SHX2=y or CPU_SHX3=y, e.g. migor_defconfig), pgd_t.pgd is "unsigned long long", causing:
In file included from arch/sh/include/asm/pgtable.h:13,
from include/linux/pgtable.h:6,
from include/linux/mm.h:33,
from arch/sh/kernel/asm-offsets.c:14:
arch/sh/include/asm/pgtable-3level.h: In function `pud_pgtable':
arch/sh/include/asm/pgtable-3level.h:37:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
37 | return (pmd_t *)pud_val(pud);
| ^
Fix this by adding an intermediate cast to "unsigned long", which is basically what the old code did before.
--- arch/sh/include/asm/pgtable-3level.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/include/asm/pgtable-3level.h +1 -1
@@ -34,7 +34,7 @@ typedef struct { unsigned long long pmd;static inline pmd_t *pud_pgtable (pud_t pud) { -return (pmd_t *)pud_val (pud); +return (pmd_t *)(unsigned long )pud_val (pud); }/* only used by the stubbed out hugetlb gup code, should never be called */
Greg Kroah-Hartman
maintainerPATCH 4/169 arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 2e9edc07df2ec6f835222151fa4e536e9e54856a ]
Based on 'ranges', the 'bus@4000000' node unit-address is off by 1 '0'.
--- arch/arm/boot/dts/vexpress-v2m.dtsi | 2 +- arch/arm/boot/dts/vexpress-v2p-ca9.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/vexpress-v2m.dtsi +1 -1
@@ -19,7 +19,7 @@ */ / { - bus@4000000 { + bus@40000000 { motherboard { model = "V2M-P1"; arm,hbi = <0x190>;
arch/arm/boot/dts/vexpress-v2p-ca9.dts +1 -1
@@ -295,7 +295,7 @@ }; }; - smb: bus@4000000 { + smb: bus@40000000 { compatible = "simple-bus"; #address-cells = <2>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 5/169 ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 4348cc10da6377a86940beb20ad357933b8f91bb ]
Without a sensor node, the ISC will simply fail to probe, as the corresponding port node is missing.
It is then logical to disable the node in the devicetree.
If we add a port with a connection to a sensor endpoint, ISC can be enabled.
--- arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +0 -1
@@ -71,7 +71,6 @@ isc: isc@f0008000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>; - status = "okay"; }; qspi1: spi@f0024000 {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 6/169 block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
[ Upstream commit 1dbdd99b511c966be9147ad72991a2856ac76f22 ]
While debugging an issue we've found that $DEBUGFS/block/$disk/state doesn't decode QUEUE_FLAG_HCTX_ACTIVE but only displays its numerical value.
Add QUEUE_FLAG(HCTX_ACTIVE) to the blk_queue_flag_name array so it'll get decoded properly.
--- block/blk-mq-debugfs.c | 1 + 1 file changed, 1 insertion(+)
block/blk-mq-debugfs.c +1 -0
@@ -129,6 +129,7 @@ static const char *const blk_queue_flag_name[] = {QUEUE_FLAG_NAME (PCI_P2PDMA ),QUEUE_FLAG_NAME (ZONE_RESETALL ),QUEUE_FLAG_NAME (RQ_ALLOC_TIME ), +QUEUE_FLAG_NAME (HCTX_ACTIVE ), QUEUE_FLAG_NAME(NOWAIT), };#undef QUEUE_FLAG_NAME
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 7/169 xen/x86: prevent PVH type from getting clobbered
In reply to Greg Kroah-HartmanFrom: Jan Beulich <[email protected]>
[ Upstream commit 9172b5c4a778da1f855b2e3780b1afabb3cfd523 ]
Like xen_start_flags, xen_domain_type gets set before .bss gets cleared. Hence this variable also needs to be prevented from getting put in .bss, which is possible because XEN_NATIVE is an enumerator evaluating to zero. Any use prior to init_hvm_pv_info() setting the variable again would lead to wrong decisions; one such case is xenboot_console_setup() when called as a result of "earlyprintk=xen".
Use __ro_after_init as more applicable than either __section(".data") or __read_mostly.
--- arch/x86/xen/enlighten.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/x86/xen/enlighten.c +4 -5
@@ -52,9 +52,6 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);DEFINE_PER_CPU (uint32_t, xen_vcpu_id);EXPORT_PER_CPU_SYMBOL (xen_vcpu_id); -enum xen_domain_type xen_domain_type =XEN_NATIVE ; -EXPORT_SYMBOL_GPL (xen_domain_type); -unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START ;EXPORT_SYMBOL (machine_to_phys_mapping);unsigned long machine_to_phys_nr;
@@ -69,9 +66,11 @@ __read_mostly int xen_have_vector_callback;EXPORT_SYMBOL_GPL (xen_have_vector_callback);/* -* NB: needs to live in .data because it's used by xen_prepare_pvh which runs -* before clearing the bss. +* NB: These need to live in .data or alike because they're used by +* xen_prepare_pvh() which runs before clearing the bss. */ +enum xen_domain_type __ro_after_init xen_domain_type =XEN_NATIVE ; +EXPORT_SYMBOL_GPL (xen_domain_type); uint32_t xen_start_flags __section(".data") = 0;EXPORT_SYMBOL (xen_start_flags);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 8/169 r8152: avoid to resubmit rx immediately
In reply to Greg Kroah-HartmanFrom: Hayes Wang <[email protected]>
[ Upstream commit baf33d7a75642b4b38a87fdf1cd96b506df4849f ]
For the situation that the disconnect event comes very late when the device is unplugged, the driver would resubmit the RX bulk transfer after getting the callback with -EPROTO immediately and continually. Finally, soft lockup occurs.
This patch avoids to resubmit RX immediately. It uses a workqueue to schedule the RX NAPI. And the NAPI would resubmit the RX. It let the disconnect event have opportunity to stop the submission before soft lockup.
--- drivers/net/usb/r8152.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/net/usb/r8152.c +15 -1
@@ -767,6 +767,7 @@ enum rtl8152_flags {PHY_RESET ,SCHEDULE_TASKLET ,GREEN_ETHERNET , + RX_EPROTO, };#define DEVICE_ID_THINKPAD_THUNDERBOLT3_DOCK_GEN2 0x3082
@@ -1770,6 +1771,14 @@ static void read_bulk_callback(struct urb *urb)rtl_set_unplug (tp);netif_device_detach (tp->netdev);return ; +case -EPROTO : + urb->actual_length =0 ; +spin_lock_irqsave (&tp->rx_lock, flags); +list_add_tail (&agg->list, &tp->rx_done); +spin_unlock_irqrestore (&tp->rx_lock, flags); +set_bit (RX_EPROTO , &tp->flags); +schedule_delayed_work (&tp->schedule,1 ); +return ;case -ENOENT :return ;/* the urb is in unlink state */ case -ETIME :
@@ -2425,6 +2434,7 @@ static int rx_bottom(struct r8152 *tp, int budget)if (list_empty (&tp->rx_done)) goto out1; +clear_bit (RX_EPROTO , &tp->flags);INIT_LIST_HEAD (&rx_queue);spin_lock_irqsave (&tp->rx_lock, flags);list_splice_init (&tp->rx_done, &rx_queue);
@@ -2441,7 +2451,7 @@ static int rx_bottom(struct r8152 *tp, int budget) agg = list_entry(cursor, struct rx_agg, list); urb = agg->urb; -if (urb->actual_length <ETH_ZLEN ) +if (urb->status !=0 || urb->actual_length <ETH_ZLEN ) goto submit; agg_free =rtl_get_free_rx (tp,GFP_ATOMIC );
@@ -6643,6 +6653,10 @@ static void rtl_work_func_t(struct work_struct *work) netif_carrier_ok(tp->netdev))tasklet_schedule (&tp->tx_tl); +if (test_and_clear_bit (RX_EPROTO , &tp->flags) && + !list_empty (&tp->rx_done)) +napi_schedule (&tp->napi); +mutex_unlock (&tp->control); out1:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 9/169 drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 4702b34d1de9582df9dfa0e583ea28fff7de29df ]
Depends on DRM_AMDGPU_SI and DRM_AMD_DC
--- drivers/gpu/drm/amd/display/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/Kconfig +2 -0
@@ -25,6 +25,8 @@ config DRM_AMD_DC_HDCP config DRM_AMD_DC_SI bool "AMD DC support for Southern Islands ASICs" + depends on DRM_AMDGPU_SI + depends on DRM_AMD_DC default n help Choose this option to enable new AMD DC support for SI asics
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 10/169 drm/amdgpu: init iommu after amdkfd device init
In reply to Greg Kroah-HartmanFrom: Yifan Zhang <[email protected]>
[ Upstream commit 714d9e4574d54596973ee3b0624ee4a16264d700 ]
This patch is to fix clinfo failure in Raven/Picasso:
Number of platforms: 1
Platform Profile: FULL_PROFILE
Platform Version: OpenCL 2.2 AMD-APP (3364.0) Platform Name: AMD Accelerated Parallel Processing Platform Vendor: Advanced Micro Devices, Inc. Platform Extensions: cl_khr_icd cl_amd_event_callback
Platform Name: AMD Accelerated Parallel Processing Number of devices: 0
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -4
@@ -2342,10 +2342,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)if (r) goto init_failed; - r =amdgpu_amdkfd_resume_iommu (adev); -if (r) - goto init_failed; - r =amdgpu_device_ip_hw_init_phase1 (adev);if (r) goto init_failed;
@@ -2384,6 +2380,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)if (!adev->gmc.xgmi.pending_reset)amdgpu_amdkfd_device_init (adev); + r =amdgpu_amdkfd_resume_iommu (adev); +if (r) + goto init_failed; +amdgpu_fru_get_product_info (adev); init_failed:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 11/169 xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit f3d7c2cdf6dc0d5402ec29c3673893b3542c5ad1 ]
Use platform data to initialize xtfpga device drivers when CONFIG_USE_OF is not selected. This fixes xtfpga networking when CONFIG_USE_OF is not selected but CONFIG_OF is.
--- arch/xtensa/platforms/xtfpga/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/platforms/xtfpga/setup.c +2 -2
@@ -66,7 +66,7 @@ void __init platform_calibrate_ccount(void)#endif -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF static void __init xtfpga_clk_setup (struct device_node *np) {
@@ -284,4 +284,4 @@ static int __init xtavnet_init(void)*/ arch_initcall (xtavnet_init); -#endif /* CONFIG_OF */ +#endif /* CONFIG_USE_OF */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 12/169 xtensa: xtfpga: Try software restart before simulating CPU reset
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit 012e974501a270d8dfd4ee2039e1fdf7579c907e ]
Rebooting xtensa images loaded with the '-kernel' option in qemu does not work. When executing a reboot command, the qemu session either hangs or experiences an endless sequence of error messages.
Kernel panic - not syncing: Unrecoverable error in exception handler
Reset code jumps to the CPU restart address, but Linux can not recover from there because code and data in the kernel init sections have been discarded and overwritten at this point.
XTFPGA platforms have a means to reset the CPU by writing 0xdead into a specific FPGA IO address. When used in QEMU the kernel image loaded with the '-kernel' option gets restored to its original state allowing the machine to boot successfully.
Use that mechanism to attempt a platform reset. If it does not work, fall back to the existing mechanism.
--- arch/xtensa/platforms/xtfpga/setup.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/xtensa/platforms/xtfpga/setup.c +6 -2
@@ -51,8 +51,12 @@ void platform_power_off(void)void platform_restart (void ) { -/* Flush and reset the mmu, simulate a processor reset, and -* jump to the reset vector. */ +/* Try software reset first. */ +WRITE_ONCE (*(u32 *)XTFPGA_SWRST_VADDR ,0xdead ); + +/* If software reset did not work, flush and reset the mmu, +* simulate a processor reset, and jump to the reset vector. +*/ cpu_reset ();/* control never gets here */ }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 13/169 NFSD: Keep existing listeners on portlist error
In reply to Greg Kroah-HartmanFrom: Benjamin Coddington <[email protected]>
[ Upstream commit c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 ]
If nfsd has existing listening sockets without any processes, then an error returned from svc_create_xprt() for an additional transport will remove those existing listeners. We're seeing this in practice when userspace attempts to create rpcrdma transports without having the rpcrdma modules present before creating nfsd kernel processes. Fix this by checking for existing sockets before calling nfsd_destroy().
--- fs/nfsd/nfsctl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/nfsd/nfsctl.c +4 -1
@@ -793,7 +793,10 @@ out_close:svc_xprt_put (xprt); } out_err: -nfsd_destroy (net); +if (!list_empty (&nn->nfsd_serv->sv_permsocks)) + nn->nfsd_serv->sv_nrthreads--; +else +nfsd_destroy (net);return err; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 14/169 powerpc/lib: Add helper to check if offset is within conditional branch range
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 4549c3ea3160fa8b3f37dfe2f957657bb265eda9 ]
Add a helper to check if a given offset is within the branch range for a powerpc conditional branch instruction, and update some sites to use the new helper.
--- arch/powerpc/include/asm/code-patching.h | 1 + arch/powerpc/lib/code-patching.c | 7 ++++++- arch/powerpc/net/bpf_jit.h | 7 +------ 3 files changed, 8 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/code-patching.h +1 -0
@@ -23,6 +23,7 @@#define BRANCH_ABSOLUTE 0x2bool is_offset_in_branch_range (long offset); +bool is_offset_in_cond_branch_range (long offset);int create_branch (struct ppc_inst *instr,const u32 *addr,unsigned long target,int flags); int create_cond_branch(struct ppc_inst *instr, const u32 *addr,
arch/powerpc/lib/code-patching.c +6 -1
@@ -228,6 +228,11 @@ bool is_offset_in_branch_range(long offset)return (offset >=-0x2000000 && offset <=0x1fffffc && !(offset &0x3 )); } +bool is_offset_in_cond_branch_range (long offset) +{ +return offset >=-0x8000 && offset <=0x7fff && !(offset &0x3 ); +} +/* * Helper to check if a given instruction is a conditional branch * Derived from the conditional checks in analyse_instr()
@@ -280,7 +285,7 @@ int create_cond_branch(struct ppc_inst *instr, const u32 *addr, offset = offset - (unsigned long )addr;/* Check we can represent the target in the instruction format */ -if (offset <-0x8000 || offset >0x7FFF || offset &0x3 ) +if (!is_offset_in_cond_branch_range (offset))return 1 ;/* Mask out the flags and target, so they don't step on each other. */
arch/powerpc/net/bpf_jit.h +1 -6
@@ -78,11 +78,6 @@#define PPC_FUNC_ADDR (d,i) do { PPC_LI32(d, i); } while(0)#endif -static inline bool is_nearbranch (int offset) -{ -return (offset <32768 ) && (offset >=-32768 ); -} -/* * The fly in the ointment of code size changing from pass to pass is * avoided by padding the short branch case with a NOP. If code size differs
@@ -91,7 +86,7 @@ static inline bool is_nearbranch(int offset)* state. */ #define PPC_BCC (cond, dest) do { \ - if (is_nearbranch((dest) - (ctx->idx * 4))) { \ + if (is_offset_in_cond_branch_range((long)(dest) - (ctx->idx * 4))) { \ PPC_BCC_SHORT(cond, dest); \ EMIT(PPC_RAW_NOP()); \ } else { \
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 15/169 powerpc/bpf: Validate branch ranges
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 3832ba4e283d7052b783dab8311df7e3590fed93 ]
Add checks to ensure that we never emit branch instructions with truncated branch offsets.
--- arch/powerpc/net/bpf_jit.h | 26 ++++++++++++++++++++------ arch/powerpc/net/bpf_jit_comp.c | 6 +++++- arch/powerpc/net/bpf_jit_comp32.c | 8 ++++++-- arch/powerpc/net/bpf_jit_comp64.c | 8 ++++++-- 4 files changed, 37 insertions(+), 11 deletions(-)
arch/powerpc/net/bpf_jit.h +20 -6
@@ -24,16 +24,30 @@#define EMIT (instr) PLANT_INSTR(image, ctx->idx, instr)/* Long jump; (unconditional 'branch') */ -#define PPC_JMP (dest) EMIT(PPC_INST_BRANCH | \ - (((dest) - (ctx->idx * 4)) & 0x03fffffc)) +#define PPC_JMP (dest) \ + do { \ + long offset = (long)(dest) - (ctx->idx * 4); \ + if (!is_offset_in_branch_range(offset)) { \ + pr_err_ratelimited("Branch offset 0x%lx (@%u) out of range\n", offset, ctx->idx); \ + return -ERANGE; \ + } \ + EMIT(PPC_INST_BRANCH | (offset & 0x03fffffc)); \ + } while (0) +/* blr; (unconditional 'branch' with link) to absolute address */ #define PPC_BL_ABS (dest) EMIT(PPC_INST_BL | \ (((dest) - (unsigned long)(image + ctx->idx)) & 0x03fffffc))/* "cond" here covers BO:BI fields. */ -#define PPC_BCC_SHORT (cond, dest) EMIT(PPC_INST_BRANCH_COND | \ - (((cond) & 0x3ff) << 16) | \ - (((dest) - (ctx->idx * 4)) & \ - 0xfffc)) +#define PPC_BCC_SHORT (cond, dest) \ + do { \ + long offset = (long)(dest) - (ctx->idx * 4); \ + if (!is_offset_in_cond_branch_range(offset)) { \ + pr_err_ratelimited("Conditional branch offset 0x%lx (@%u) out of range\n", offset, ctx->idx); \ + return -ERANGE; \ + } \ + EMIT(PPC_INST_BRANCH_COND | (((cond) & 0x3ff) << 16) | (offset & 0xfffc)); \ + } while (0) +/* Sign-extended 32-bit immediate load */ #define PPC_LI32 (d, i) do { \ if ((int)(uintptr_t)(i) >= -32768 && \
arch/powerpc/net/bpf_jit_comp.c +5 -1
@@ -210,7 +210,11 @@ skip_init_ctx:/* Now build the prologue, body code & epilogue for real. */ cgctx.idx =0 ;bpf_jit_build_prologue (code_base, &cgctx); -bpf_jit_build_body (fp, code_base, &cgctx, addrs, extra_pass); +if (bpf_jit_build_body (fp, code_base, &cgctx, addrs, extra_pass)) { +bpf_jit_binary_free (bpf_hdr); + fp = org_fp; + goto out_addrs; + }bpf_jit_build_epilogue (code_base, &cgctx);if (bpf_jit_enable >1 )
arch/powerpc/net/bpf_jit_comp32.c +6 -2
@@ -200,7 +200,7 @@ void bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 fun } } -static void bpf_jit_emit_tail_call (u32 *image,struct codegen_context *ctx,u32 out) +static int bpf_jit_emit_tail_call (u32 *image,struct codegen_context *ctx,u32 out) {/* * By now, the eBPF program has already setup parameters in r3-r6
@@ -261,7 +261,9 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32bpf_jit_emit_common_epilogue (image, ctx);EMIT (PPC_RAW_BCTR ()); +/* out: */ +return 0 ; }/* Assemble the body code between the prologue & epilogue */
@@ -1090,7 +1092,9 @@ cond_branch:*/ case BPF_JMP |BPF_TAIL_CALL : ctx->seen |=SEEN_TAILCALL ; -bpf_jit_emit_tail_call (image, ctx, addrs[i +1 ]); + ret =bpf_jit_emit_tail_call (image, ctx, addrs[i +1 ]); +if (ret <0 ) +return ret;break ;default :
arch/powerpc/net/bpf_jit_comp64.c +6 -2
@@ -206,7 +206,7 @@ void bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 funEMIT (PPC_RAW_BCTRL ()); } -static void bpf_jit_emit_tail_call (u32 *image,struct codegen_context *ctx,u32 out) +static int bpf_jit_emit_tail_call (u32 *image,struct codegen_context *ctx,u32 out) {/* * By now, the eBPF program has already setup parameters in r3, r4 and r5
@@ -267,7 +267,9 @@ static void bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32bpf_jit_emit_common_epilogue (image, ctx);EMIT (PPC_RAW_BCTR ()); +/* out: */ +return 0 ; }/* Assemble the body code between the prologue & epilogue */
@@ -1006,7 +1008,9 @@ cond_branch:*/ case BPF_JMP |BPF_TAIL_CALL : ctx->seen |=SEEN_TAILCALL ; -bpf_jit_emit_tail_call (image, ctx, addrs[i +1 ]); + ret =bpf_jit_emit_tail_call (image, ctx, addrs[i +1 ]); +if (ret <0 ) +return ret;break ;default :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 16/169 powerpc/security: Add a helper to query stf_barrier type
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 030905920f32e91a52794937f67434ac0b3ea41a ]
Add a helper to return the stf_barrier type for the current processor.
--- arch/powerpc/include/asm/security_features.h | 5 +++++ arch/powerpc/kernel/security.c | 5 +++++ 2 files changed, 10 insertions(+)
arch/powerpc/include/asm/security_features.h +5 -0
@@ -39,6 +39,11 @@ static inline bool security_ftr_enabled(u64 feature)return !!(powerpc_security_features & feature); } +#ifdef CONFIG_PPC_BOOK3S_64 +enum stf_barrier_type stf_barrier_type_get (void ); +#else +static inline enum stf_barrier_type stf_barrier_type_get (void ) {return STF_BARRIER_NONE ; } +#endif // Features indicating support for Spectre/Meltdown mitigations
arch/powerpc/kernel/security.c +5 -0
@@ -263,6 +263,11 @@ static int __init handle_no_stf_barrier(char *p)early_param ("no_stf_barrier" , handle_no_stf_barrier); +enum stf_barrier_type stf_barrier_type_get (void ) +{ +return stf_enabled_flush_types; +} +/* This is the generic flag used by other architectures */ static int __init handle_ssbd (char *p) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 17/169 powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit b7540d62509453263604a155bf2d5f0ed450cba2 ]
Emit similar instruction sequences to commit a048a07d7f4535 ("powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit") when encountering BPF_NOSPEC.
Mitigations are enabled depending on what the firmware advertises. In particular, we do not gate these mitigations based on current settings, just like in x86. Due to this, we don't need to take any action if mitigations are enabled or disabled at runtime.
--- arch/powerpc/net/bpf_jit64.h | 8 ++--- arch/powerpc/net/bpf_jit_comp64.c | 55 ++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 8 deletions(-)
arch/powerpc/net/bpf_jit64.h +4 -4
@@ -16,18 +16,18 @@* with our redzone usage. * * [ prev sp ] <------------- -* [ nv gpr save area ] 6*8 | +* [ nv gpr save area ] 5*8 | * [ tail_call_cnt ] 8 | -* [ local_tmp_var ] 8 | +* [ local_tmp_var ] 16 | * fp (r31) --> [ ebpf stack space ] upto 512 | * [ frame header ] 32/112 | * sp (r1) ---> [ stack pointer ] -------------- */ /* for gpr non volatile registers BPG_REG_6 to 10 */ -#define BPF_PPC_STACK_SAVE (6*8) +#define BPF_PPC_STACK_SAVE (5*8)/* for bpf JIT code internal usage */ -#define BPF_PPC_STACK_LOCALS 16 +#define BPF_PPC_STACK_LOCALS 24/* stack frame excluding BPF stack, ensure this is quadword aligned */ #define BPF_PPC_STACKFRAME (STACK_FRAME_MIN_SIZE + \ BPF_PPC_STACK_LOCALS + BPF_PPC_STACK_SAVE)
arch/powerpc/net/bpf_jit_comp64.c +51 -4
94 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 18/169 ASoC: pcm512x: Mend accesses to the I2S_1 and I2S_2 registers
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit 3f4b57ad07d9237acf1b8cff3f8bf530cacef87a ]
Commit 25d27c4f68d2 ("ASoC: pcm512x: Add support for more data formats") breaks the TSE-850 device, which is using a pcm5142 in I2S and CBM_CFS mode (maybe not relevant). Without this fix, the result is:
pcm512x 0-004c: Failed to set data format: -16
And after that, no sound.
This fix is not 100% correct. The datasheet of at least the pcm5142 states that four bits (0xcc) in the I2S_1 register are "RSV" ("Reserved. Do not access.") and no hint is given as to what the initial values are supposed to be. So, specifying defaults for these bits is wrong. But perhaps better than a broken driver?
--- sound/soc/codecs/pcm512x.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/pcm512x.c +2 -0
@@ -116,6 +116,8 @@ static const struct reg_default pcm512x_reg_defaults[] = { { PCM512x_FS_SPEED_MODE, 0x00 }, { PCM512x_IDAC_1, 0x01 }, { PCM512x_IDAC_2, 0x00 }, + { PCM512x_I2S_1, 0x02 }, + { PCM512x_I2S_2, 0x00 }, };static bool pcm512x_readable (struct device *dev,unsigned int reg)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 19/169 ASoC: fsl_xcvr: Fix channel swap issue with ARC
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 74b7ee0e7b61838a0a161a84d105aeff0d042646 ]
With pause and resume test for ARC, there is occasionally channel swap issue. The reason is that currently driver set the DPATH out of reset first, then start the DMA, the first data got from FIFO may not be the Left channel.
Moving DPATH out of reset operation after the dma enablement to fix this issue.
--- sound/soc/fsl/fsl_xcvr.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
sound/soc/fsl/fsl_xcvr.c +12 -5
@@ -487,8 +487,9 @@ static int fsl_xcvr_prepare(struct snd_pcm_substream *substream,return ret; } -/* clear DPATH RESET */ +/* set DPATH RESET */ m_ctl |=FSL_XCVR_EXT_CTRL_DPTH_RESET (tx); + v_ctl |=FSL_XCVR_EXT_CTRL_DPTH_RESET (tx); ret =regmap_update_bits (xcvr->regmap,FSL_XCVR_EXT_CTRL , m_ctl, v_ctl);if (ret <0 ) {dev_err (dai->dev,"Error while setting EXT_CTRL: %d\n" , ret);
@@ -590,10 +591,6 @@ static void fsl_xcvr_shutdown(struct snd_pcm_substream *substream, val |=FSL_XCVR_EXT_CTRL_CMDC_RESET (tx); } -/* set DPATH RESET */ - mask |=FSL_XCVR_EXT_CTRL_DPTH_RESET (tx); - val |=FSL_XCVR_EXT_CTRL_DPTH_RESET (tx); - ret =regmap_update_bits (xcvr->regmap,FSL_XCVR_EXT_CTRL , mask, val);if (ret <0 ) {dev_err (dai->dev,"Err setting DPATH RESET: %d\n" , ret);
@@ -643,6 +640,16 @@ static int fsl_xcvr_trigger(struct snd_pcm_substream *substream, int cmd,dev_err (dai->dev,"Failed to enable DMA: %d\n" , ret);return ret; } + +/* clear DPATH RESET */ + ret =regmap_update_bits (xcvr->regmap,FSL_XCVR_EXT_CTRL , +FSL_XCVR_EXT_CTRL_DPTH_RESET (tx), +0 ); +if (ret <0 ) { +dev_err (dai->dev,"Failed to clear DPATH RESET: %d\n" , ret); +return ret; + } +break ;case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_SUSPEND :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 20/169 ASoC: pcm179x: Add missing entries SPI to device ID table
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit ceef3240f9b7e592dd8d10d619c312c7336117fa ]
Currently autoloading for SPI devices does not use the DT ID table, it uses SPI modalises. Supporting OF modalises is going to be difficult if not impractical, an attempt was made but has been reverted, so ensure that module autoloading works for this driver by adding SPI IDs for parts that only have a compatible listed.
--- sound/soc/codecs/pcm179x-spi.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/pcm179x-spi.c +1 -0
@@ -36,6 +36,7 @@ static const struct of_device_id pcm179x_of_match[] = {MODULE_DEVICE_TABLE (of, pcm179x_of_match);static const struct spi_device_id pcm179x_spi_ids[] = { + {"pcm1792a" ,0 }, {"pcm179x" ,0 }, { }, };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 21/169 ASoC: cs4341: Add SPI device ID table
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit 0cc3687eadd0971d5d38ff90d14819d88f854960 ]
Currently autoloading for SPI devices does not use the DT ID table, it uses SPI modalises. Supporting OF modalises is going to be difficult if not impractical, an attempt was made but has been reverted, so ensure that module autoloading works for this driver by adding SPI IDs for parts that only have a compatible listed.
--- sound/soc/codecs/cs4341.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/codecs/cs4341.c +7 -0
@@ -305,12 +305,19 @@ static int cs4341_spi_probe(struct spi_device *spi) return cs4341_probe(&spi->dev); } +static const struct spi_device_id cs4341_spi_ids[] = { + {"cs4341a" }, + { } +}; +MODULE_DEVICE_TABLE (spi, cs4341_spi_ids); +static struct spi_driver cs4341_spi_driver = { .driver = { .name ="cs4341-spi" , .of_match_table =of_match_ptr (cs4341_dt_ids), }, .probe = cs4341_spi_probe, + .id_table = cs4341_spi_ids, };#endif
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 22/169 KVM: arm64: Fix host stage-2 PGD refcount
In reply to Greg Kroah-HartmanFrom: Quentin Perret <[email protected]>
[ Upstream commit 1d58a17ef54599506d44c45ac95be27273a4d2b1 ]
The KVM page-table library refcounts the pages of concatenated stage-2 PGDs individually. However, when running KVM in protected mode, the host's stage-2 PGD is currently managed by EL2 as a single high-order compound page, which can cause the refcount of the tail pages to reach 0 when they shouldn't, hence corrupting the page-table.
Fix this by introducing a new hyp_split_page() helper in the EL2 page allocator (matching the kernel's split_page() function), and make use of it from host_s2_zalloc_pages_exact().
--- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 1 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 13 ++++++++++++- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-)
arch/arm64/kvm/hyp/include/nvhe/gfp.h +1 -0
@@ -24,6 +24,7 @@ struct hyp_pool {/* Allocation */ void *hyp_alloc_pages (struct hyp_pool *pool,unsigned short order); +void hyp_split_page (struct hyp_page *page);void hyp_get_page (struct hyp_pool *pool,void *addr);void hyp_put_page (struct hyp_pool *pool,void *addr);
arch/arm64/kvm/hyp/nvhe/mem_protect.c +12 -1
@@ -35,7 +35,18 @@ static const u8 pkvm_hyp_id = 1;static void *host_s2_zalloc_pages_exact (size_t size) { -return hyp_alloc_pages (&host_s2_pool,get_order (size)); +void *addr =hyp_alloc_pages (&host_s2_pool,get_order (size)); + +hyp_split_page (hyp_virt_to_page (addr)); + +/* +* The size of concatenated PGDs is always a power of two of PAGE_SIZE, +* so there should be no need to free any of the tail pages to make the +* allocation exact. +*/ +WARN_ON (size != (PAGE_SIZE <<get_order (size))); + +return addr; }static void *host_s2_zalloc_page (void *pool)
arch/arm64/kvm/hyp/nvhe/page_alloc.c +14 -0
@@ -193,6 +193,20 @@ void hyp_get_page(struct hyp_pool *pool, void *addr)hyp_spin_unlock (&pool->lock); } +void hyp_split_page (struct hyp_page *p) +{ +unsigned short order = p->order; +unsigned int i; + + p->order =0 ; +for (i =1 ; i < (1 << order); i++) { +struct hyp_page *tail = p + i; + + tail->order =0 ; +hyp_set_page_refcounted (tail); + } +} +void *hyp_alloc_pages (struct hyp_pool *pool,unsigned short order) {unsigned short i = order;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 23/169 KVM: arm64: Release mmap_lock when using VM_SHARED with MTE
In reply to Greg Kroah-HartmanFrom: Quentin Perret <[email protected]>
[ Upstream commit 6e6a8ef088e1222cb1250942f51ad9c1ab219ab2 ]
VM_SHARED mappings are currently forbidden in a memslot with MTE to prevent two VMs racing to sanitise the same page. However, this check is performed while holding current->mm's mmap_lock, but fails to release it. Fix this by releasing the lock when needed.
--- arch/arm64/kvm/mmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/kvm/mmu.c +4 -2
@@ -1477,8 +1477,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,* when updating the PG_mte_tagged page flag, see * sanitise_mte_tags for more details. */ -if (kvm_has_mte (kvm) && vma->vm_flags &VM_SHARED ) -return -EINVAL ; +if (kvm_has_mte (kvm) && vma->vm_flags &VM_SHARED ) { + ret = -EINVAL ; +break ; + }if (vma->vm_flags &VM_PFNMAP ) {/* IO region dirty page logging not allowed */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 24/169 netfilter: xt_IDLETIMER: fix panic that occurs when timer_type has garbage value
In reply to Greg Kroah-HartmanFrom: Juhee Kang <[email protected]>
[ Upstream commit 902c0b1887522a099aa4e1e6b4b476c2fe5dd13e ]
Currently, when the rule related to IDLETIMER is added, idletimer_tg timer structure is initialized by kmalloc on executing idletimer_tg_create function. However, in this process timer->timer_type is not defined to a specific value. Thus, timer->timer_type has garbage value and it occurs kernel panic. So, this commit fixes the panic by initializing timer->timer_type using kzalloc instead of kmalloc.
Test commands:
# iptables -A OUTPUT -j IDLETIMER --timeout 1 --label test
$ cat /sys/class/xt_idletimer/timers/test
KilledSplat looks like:
BUG: KASAN: user-memory-access in alarm_expires_remaining+0x49/0x70
Read of size 8 at addr 0000002e8c7bc4c8 by task cat/917
CPU: 12 PID: 917 Comm: cat Not tainted 5.14.0+ #3 79940a339f71eb14fc81aee1757a20d5bf13eb0e
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014
Call Trace:
dump_stack_lvl+0x6e/0x9c
kasan_report.cold+0x112/0x117
? alarm_expires_remaining+0x49/0x70
__asan_load8+0x86/0xb0
alarm_expires_remaining+0x49/0x70
idletimer_tg_show+0xe5/0x19b [xt_IDLETIMER 11219304af9316a21bee5ba9d58f76a6b9bccc6d]
dev_attr_show+0x3c/0x60
sysfs_kf_seq_show+0x11d/0x1f0
? device_remove_bin_file+0x20/0x20
kernfs_seq_show+0xa4/0xb0
seq_read_iter+0x29c/0x750
kernfs_fop_read_iter+0x25a/0x2c0
? __fsnotify_parent+0x3d1/0x570
? iov_iter_init+0x70/0x90
new_sync_read+0x2a7/0x3d0
? __x64_sys_llseek+0x230/0x230
? rw_verify_area+0x81/0x150
vfs_read+0x17b/0x240
ksys_read+0xd9/0x180
? vfs_write+0x460/0x460
? do_syscall_64+0x16/0xc0
? lockdep_hardirqs_on+0x79/0x120
__x64_sys_read+0x43/0x50
do_syscall_64+0x3b/0xc0
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7f0cdc819142
Code: c0 e9 c2 fe ff ff 50 48 8d 3d 3a ca 0a 00 e8 f5 19 02 00 0f 1f 44 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 0f 05 <48> 3d 00 f0 ff ff 77 56 c3 0f 1f 44 00 00 48 83 ec 28 48 89 54 24
RSP: 002b:00007fff28eee5b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000000
RAX: ffffffffffffffda RBX: 0000000000020000 RCX: 00007f0cdc819142
RDX: 0000000000020000 RSI: 00007f0cdc032000 RDI: 0000000000000003
RBP: 00007f0cdc032000 R08: 00007f0cdc031010 R09: 0000000000000000
R10: 0000000000000022 R11: 0000000000000246 R12: 00005607e9ee31f0
R13: 0000000000000003 R14: 0000000000020000 R15: 0000000000020000--- net/netfilter/xt_IDLETIMER.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_IDLETIMER.c +1 -1
@@ -137,7 +137,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) {int ret; - info->timer =kmalloc (sizeof (*info->timer),GFP_KERNEL ); + info->timer =kzalloc (sizeof (*info->timer),GFP_KERNEL );if (!info->timer) { ret = -ENOMEM ; goto out;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 25/169 netfilter: nf_tables: skip netdev events generated on netns removal
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 68a3765c659f809dcaac20030853a054646eb739 ]
syzbot reported following (harmless) WARN:
WARNING: CPU: 1 PID: 2648 at net/netfilter/core.c:468 nft_netdev_unregister_hooks net/netfilter/nf_tables_api.c:230 [inline] nf_tables_unregister_hook include/net/netfilter/nf_tables.h:1090 [inline] __nft_release_basechain+0x138/0x640 net/netfilter/nf_tables_api.c:9524 nft_netdev_event net/netfilter/nft_chain_filter.c:351 [inline] nf_tables_netdev_event+0x521/0x8a0 net/netfilter/nft_chain_filter.c:382
reproducer:
unshare -n bash -c 'ip link add br0 type bridge; nft add table netdev t ; \
nft add chain netdev t ingress \{ type filter hook ingress device "br0" \
priority 0\; policy drop\; \}'
Problem is that when netns device exit hooks create the UNREGISTER event, the .pre_exit hook for nf_tables core has already removed the base hook. Notifier attempts to do this again.
The need to do base hook unregister unconditionally was needed in the past, because notifier was last stage where reg->dev dereference was safe.
Now that nf_tables does the hook removal in .pre_exit, this isn't needed anymore.
--- net/netfilter/nft_chain_filter.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
net/netfilter/nft_chain_filter.c +3 -6
@@ -342,12 +342,6 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,return ; } -/* UNREGISTER events are also happening on netns exit. -* -* Although nf_tables core releases all tables/chains, only this event -* handler provides guarantee that hook->ops.dev is still accessible, -* so we cannot skip exiting net namespaces. -*/ __nft_release_basechain (ctx); }
@@ -366,6 +360,9 @@ static int nf_tables_netdev_event(struct notifier_block *this, event != NETDEV_CHANGENAME)return NOTIFY_DONE ; +if (!check_net (ctx.net)) +return NOTIFY_DONE ; + nft_net =nft_pernet (ctx.net);mutex_lock (&nft_net->commit_mutex);list_for_each_entry (table, &nft_net->tables, list) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 26/169 dma-debug: fix sg checks in debug_dma_map_sg()
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
[ Upstream commit 293d92cbbd2418ca2ba43fed07f1b92e884d1c77 ]
The following warning occurred sporadically on s390:
DMA-API: nvme 0006:00:00.0: device driver maps memory from kernel text or rodata [addr=0000000048cc5e2f] [len=131072]
WARNING: CPU: 4 PID: 825 at kernel/dma/debug.c:1083 check_for_illegal_area+0xa8/0x138
It is a false-positive warning, due to broken logic in debug_dma_map_sg(). check_for_illegal_area() checks for overlay of sg elements with kernel text or rodata. It is called with sg_dma_len(s) instead of s->length as parameter. After the call to ->map_sg(), sg_dma_len() will contain the length of possibly combined sg elements in the DMA address space, and not the individual sg element length, which would be s->length.
The check will then use the physical start address of an sg element, and add the DMA length for the overlap check, which could result in the false warning, because the DMA length can be larger than the actual single sg element length.
In addition, the call to check_for_illegal_area() happens in the iteration over mapped_ents, which will not include all individual sg elements if any of them were combined in ->map_sg().
Fix this by using s->length instead of sg_dma_len(s). Also put the call to check_for_illegal_area() in a separate loop, iterating over all the individual sg elements ("nents" instead of "mapped_ents").
While at it, as suggested by Robin Murphy, also move check_for_stack() inside the new loop, as it is similarly concerned with validating the individual sg elements.
--- kernel/dma/debug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/dma/debug.c +6 -6
@@ -1299,6 +1299,12 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,if (unlikely (dma_debug_disabled ()))return ; +for_each_sg (sg, s, nents, i) { +check_for_stack (dev,sg_page (s), s->offset); +if (!PageHighMem (sg_page (s))) +check_for_illegal_area (dev,sg_virt (s), s->length); + } +for_each_sg (sg, s, mapped_ents, i) { entry =dma_entry_alloc ();if (!entry)
@@ -1314,12 +1320,6 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg, entry->sg_call_ents = nents; entry->sg_mapped_ents = mapped_ents; -check_for_stack (dev,sg_page (s), s->offset); - -if (!PageHighMem (sg_page (s))) { -check_for_illegal_area (dev,sg_virt (s),sg_dma_len (s)); - } -check_sg_segment (dev, s);add_dma_entry (entry);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 27/169 ASoC: wm8960: Fix clock configuration on slave mode
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6b9b546dc00797c74bef491668ce5431ff54e1e2 ]
There is a noise issue for 8kHz sample rate on slave mode. Compared with master mode, the difference is the DACDIV setting, after correcting the DACDIV, the noise is gone.
There is no noise issue for 48kHz sample rate, because the default value of DACDIV is correct for 48kHz.
So wm8960_configure_clocking() should be functional for ADC and DAC function even if it is slave mode.
In order to be compatible for old use case, just add condition for checking that sysclk is zero with slave mode.
--- sound/soc/codecs/wm8960.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8960.c +10 -3
@@ -742,9 +742,16 @@ static int wm8960_configure_clocking(struct snd_soc_component *component)int i, j, k;int ret; -if (!(iface1 & (1 <<6 ))) { -dev_dbg (component->dev, -"Codec is slave mode, no need to configure clock\n" ); +/* +* For Slave mode clocking should still be configured, +* so this if statement should be removed, but some platform +* may not work if the sysclk is not configured, to avoid such +* compatible issue, just add '!wm8960->sysclk' condition in +* this if statement. +*/ +if (!(iface1 & (1 <<6 )) && !wm8960->sysclk) { +dev_warn (component->dev, +"slave mode, but proceeding with no clock configuration\n" );return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 28/169 ice: Fix failure to re-add LAN/RDMA Tx queues
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit ff7e93219442f5ac5b2cfd33e4fe4b7d5942f957 ]
Currently if the VSI is rebuilt/removed and the RDMA PF driver is active the RDMA Tx queue scheduler node configuration will not be cleaned up. This will cause the rebuild/re-add of the VSI to fail due to the software structures not being correctly cleaned up for the VSI index. Fix this by always calling ice_rm_vsi_rdma_cfg() for all VSI. If there are no RDMA scheduler nodes created, then there is no harm in calling ice_rm_vsi_rdma_cfg(). This change applies to all VSI types, so if RDMA support is added for other VSI types they will also get this change.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 9 +++++++++ drivers/net/ethernet/intel/ice/ice_sched.c | 13 +++++++++++++ drivers/net/ethernet/intel/ice/ice_sched.h | 1 + 3 files changed, 23 insertions(+)
drivers/net/ethernet/intel/ice/ice_lib.c +9 -0
@@ -2841,6 +2841,7 @@ void ice_napi_del(struct ice_vsi *vsi)*/ int ice_vsi_release (struct ice_vsi *vsi) { +enum ice_status err;struct ice_pf *pf;if (!vsi->back)
@@ -2912,6 +2913,10 @@ int ice_vsi_release(struct ice_vsi *vsi)ice_fltr_remove_all (vsi);ice_rm_vsi_lan_cfg (vsi->port_info, vsi->idx); + err =ice_rm_vsi_rdma_cfg (vsi->port_info, vsi->idx); +if (err) +dev_err (ice_pf_to_dev (vsi->back),"Failed to remove RDMA scheduler config for VSI %u, err %d\n" , + vsi->vsi_num, err);ice_vsi_delete (vsi);ice_vsi_free_q_vectors (vsi);
@@ -3092,6 +3097,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) prev_num_q_vectors =ice_vsi_rebuild_get_coalesce (vsi, coalesce);ice_rm_vsi_lan_cfg (vsi->port_info, vsi->idx); + ret =ice_rm_vsi_rdma_cfg (vsi->port_info, vsi->idx); +if (ret) +dev_err (ice_pf_to_dev (vsi->back),"Failed to remove RDMA scheduler config for VSI %u, err %d\n" , + vsi->vsi_num, ret);ice_vsi_free_q_vectors (vsi);/* SR-IOV determines needed MSIX resources all at once instead of per
drivers/net/ethernet/intel/ice/ice_sched.c +13 -0
@@ -2070,6 +2070,19 @@ enum ice_status ice_rm_vsi_lan_cfg(struct ice_port_info *pi, u16 vsi_handle)return ice_sched_rm_vsi_cfg (pi, vsi_handle,ICE_SCHED_NODE_OWNER_LAN ); } +/** +* ice_rm_vsi_rdma_cfg - remove VSI and its RDMA children nodes +* @pi: port information structure +* @vsi_handle: software VSI handle +* +* This function clears the VSI and its RDMA children nodes from scheduler tree +* for all TCs. +*/ +enum ice_status ice_rm_vsi_rdma_cfg (struct ice_port_info *pi,u16 vsi_handle) +{ +return ice_sched_rm_vsi_cfg (pi, vsi_handle,ICE_SCHED_NODE_OWNER_RDMA ); +} +/** * ice_get_agg_info - get the aggregator ID * @hw: pointer to the hardware structure
drivers/net/ethernet/intel/ice/ice_sched.h +1 -0
@@ -89,6 +89,7 @@ enum ice_status ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs, u8 owner, bool enable);enum ice_status ice_rm_vsi_lan_cfg (struct ice_port_info *pi,u16 vsi_handle); +enum ice_status ice_rm_vsi_rdma_cfg (struct ice_port_info *pi,u16 vsi_handle);/* Tx scheduler rate limiter functions */ enum ice_status
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 29/169 ice: Avoid crash from unnecessary IDA free
In reply to Greg Kroah-HartmanFrom: Dave Ertman <[email protected]>
[ Upstream commit 73e30a62b19b9fbb4e6a3465c59da186630d5f2e ]
In the remove path, there is an attempt to free the aux_idx IDA whether it was allocated or not. This can potentially cause a crash when unloading the driver on systems that do not initialize support for RDMA. But, this free cannot be gated by the status bit for RDMA, since it is allocated if the driver detects support for RDMA at probe time, but the driver can enter into a state where RDMA is not supported after the IDA has been allocated at probe time and this would lead to a memory leak.
Initialize aux_idx to an invalid value and check for a valid value when unloading to determine if an IDA free is necessary.
--- drivers/net/ethernet/intel/ice/ice_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_main.c +5 -1
@@ -4224,6 +4224,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)if (!pf)return -ENOMEM ; +/* initialize Auxiliary index to invalid value */ + pf->aux_idx =-1 ; +/* set up for high or low DMA */ err =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (64 ));if (err)
@@ -4615,7 +4618,8 @@ static void ice_remove(struct pci_dev *pdev)ice_aq_cancel_waiting_tasks (pf);ice_unplug_aux_dev (pf); -ida_free (&ice_aux_ida, pf->aux_idx); +if (pf->aux_idx >=0 ) +ida_free (&ice_aux_ida, pf->aux_idx);set_bit (ICE_DOWN , pf->state);mutex_destroy (&(&pf->hw)->fdir_fltr_lock);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 30/169 ice: fix getting UDP tunnel entry
In reply to Greg Kroah-HartmanFrom: Michal Swiatkowski <[email protected]>
[ Upstream commit e4c2efa1393c6f1fbfabf91d1d83fcb4ae691ccb ]
Correct parameters order in call to ice_tunnel_idx_to_entry function.
Entry in sparse port table is correct when the idx is 0. For idx 1 one correct entry should be skipped, for idx 2 two of them should be skipped etc. Change if condition to be true when idx is 0, which means that previous valid entry of this tunnel type were skipped.
--- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_flex_pipe.c +2 -2
@@ -1668,7 +1668,7 @@ static u16 ice_tunnel_idx_to_entry(struct ice_hw *hw, enum ice_tunnel_type type,for (i =0 ; i < hw->tnl.count && i <ICE_TUNNEL_MAX_ENTRIES ; i++)if (hw->tnl.tbl[i].valid && hw->tnl.tbl[i].type == type && - idx--) + idx-- ==0 )return i;WARN_ON_ONCE (1 );
@@ -1828,7 +1828,7 @@ int ice_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,u16 index; tnl_type = ti->type ==UDP_TUNNEL_TYPE_VXLAN ?TNL_VXLAN :TNL_GENEVE ; - index =ice_tunnel_idx_to_entry (&pf->hw, idx, tnl_type); + index =ice_tunnel_idx_to_entry (&pf->hw, tnl_type, idx); status =ice_create_tunnel (&pf->hw, index, tnl_type,ntohs (ti->port));if (status) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 31/169 ice: Print the api_patch as part of the fw.mgmt.api
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit b726ddf984a56a385c9df406a66c221f3a77c951 ]
Currently when a user uses "devlink dev info", the fw.mgmt.api will be the major.minor numbers as shown below:
devlink dev info pci/0000:3b:00.0
pci/0000:3b:00.0:
driver ice
serial_number 00-01-00-ff-ff-00-00-00
versions:
fixed:
board.id K91258-000
running:
fw.mgmt 6.1.2
fw.mgmt.api 1.7 <--- No patch number included
fw.mgmt.build 0xd75e7d06
fw.mgmt.srev 5
fw.undi 1.2992.0
fw.undi.srev 5
fw.psid.api 3.10
fw.bundle_id 0x800085cc
fw.app.name ICE OS Default Package
fw.app 1.3.27.0
fw.app.bundle_id 0xc0000001
fw.netlist 3.10.2000-3.1e.0
fw.netlist.build 0x2a76e110
stored:
fw.mgmt.srev 5
fw.undi 1.2992.0
fw.undi.srev 5
fw.psid.api 3.10
fw.bundle_id 0x800085cc
fw.netlist 3.10.2000-3.1e.0
fw.netlist.build 0x2a76e110There are many features in the driver that depend on the major, minor, and patch version of the FW. Without the patch number in the output for fw.mgmt.api debugging issues related to the FW API version is difficult. Also, using major.minor.patch aligns with the existing firmware version which uses a 3 digit value.
Fix this by making the fw.mgmt.api print the major.minor.patch versions. Shown below is the result:
devlink dev info pci/0000:3b:00.0
pci/0000:3b:00.0:
driver ice
serial_number 00-01-00-ff-ff-00-00-00
versions:
fixed:
board.id K91258-000
running:
fw.mgmt 6.1.2
fw.mgmt.api 1.7.9 <--- patch number included
fw.mgmt.build 0xd75e7d06
fw.mgmt.srev 5
fw.undi 1.2992.0
fw.undi.srev 5
fw.psid.api 3.10
fw.bundle_id 0x800085cc
fw.app.name ICE OS Default Package
fw.app 1.3.27.0
fw.app.bundle_id 0xc0000001
fw.netlist 3.10.2000-3.1e.0
fw.netlist.build 0x2a76e110
stored:
fw.mgmt.srev 5
fw.undi 1.2992.0
fw.undi.srev 5
fw.psid.api 3.10
fw.bundle_id 0x800085cc
fw.netlist 3.10.2000-3.1e.0
fw.netlist.build 0x2a76e110--- Documentation/networking/devlink/ice.rst | 9 +++++---- drivers/net/ethernet/intel/ice/ice_devlink.c | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-)
Documentation/networking/devlink/ice.rst +5 -4
@@ -30,10 +30,11 @@ The ``ice`` driver reports the following versions PHY, link, etc. * - ``fw.mgmt.api`` - running - - 1.5 - - 2-digit version number of the API exported over the AdminQ by the - management firmware. Used by the driver to identify what commands - are supported. + - 1.5.1 + - 3-digit version number (major.minor.patch) of the API exported over + the AdminQ by the management firmware. Used by the driver to + identify what commands are supported. Historical versions of the + kernel only displayed a 2-digit version number (major.minor). * - ``fw.mgmt.build`` - running - 0x305d955f
drivers/net/ethernet/intel/ice/ice_devlink.c +2 -1
@@ -63,7 +63,8 @@ static int ice_info_fw_api(struct ice_pf *pf, struct ice_info_ctx *ctx) {struct ice_hw *hw = &pf->hw; -snprintf (ctx->buf,sizeof (ctx->buf),"%u.%u" , hw->api_maj_ver, hw->api_min_ver); +snprintf (ctx->buf,sizeof (ctx->buf),"%u.%u.%u" , hw->api_maj_ver, + hw->api_min_ver, hw->api_patch);return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 32/169 netfilter: ip6t_rt: fix rt0_hdr parsing in rt_mt6
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit a482c5e00a9b5a194085bcd372ac36141028becb ]
In rt_mt6(), when it's a nonlinear skb, the 1st skb_header_pointer() only copies sizeof(struct ipv6_rt_hdr) to _route that rh points to. The access by ((const struct rt0_hdr *)rh)->reserved will overflow the buffer. So this access should be moved below the 2nd call to skb_header_pointer().
Besides, after the 2nd skb_header_pointer(), its return value should also be checked, othersize, *rp may cause null-pointer-ref.
v1->v2:
- clean up some old debugging log.
--- net/ipv6/netfilter/ip6t_rt.c | 48 +++++------------------------------- 1 file changed, 6 insertions(+), 42 deletions(-)
net/ipv6/netfilter/ip6t_rt.c +6 -42
@@ -25,12 +25,7 @@ MODULE_AUTHOR("Andras Kis-Szabo <[email protected]>");static inline bool segsleft_match (u_int32_t min,u_int32_t max,u_int32_t id,bool invert) { -bool r; -pr_debug ("segsleft_match:%c 0x%x <= 0x%x <= 0x%x\n" , - invert ?'!' :' ' , min, id, max); - r = (id >= min && id <= max) ^ invert; -pr_debug (" result %s\n" , r ?"PASS" :"FAILED" ); -return r; +return (id >= min && id <= max) ^ invert; }static bool rt_mt6 (const struct sk_buff *skb,struct xt_action_param *par)
@@ -65,30 +60,6 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -pr_debug ("IPv6 RT LEN %u %u " , hdrlen, rh->hdrlen); -pr_debug ("TYPE %04X " , rh->type); -pr_debug ("SGS_LEFT %u %02X\n" , rh->segments_left, rh->segments_left); - -pr_debug ("IPv6 RT segsleft %02X " , -segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], - rh->segments_left, - !!(rtinfo->invflags &IP6T_RT_INV_SGS ))); -pr_debug ("type %02X %02X %02X " , - rtinfo->rt_type, rh->type, - (!(rtinfo->flags &IP6T_RT_TYP ) || - ((rtinfo->rt_type == rh->type) ^ - !!(rtinfo->invflags &IP6T_RT_INV_TYP )))); -pr_debug ("len %02X %04X %02X " , - rtinfo->hdrlen, hdrlen, - !(rtinfo->flags &IP6T_RT_LEN ) || - ((rtinfo->hdrlen == hdrlen) ^ - !!(rtinfo->invflags &IP6T_RT_INV_LEN ))); -pr_debug ("res %02X %02X %02X " , - rtinfo->flags &IP6T_RT_RES , - ((const struct rt0_hdr *)rh)->reserved, - !((rtinfo->flags &IP6T_RT_RES ) && - (((const struct rt0_hdr *)rh)->reserved))); - ret = (segsleft_match (rtinfo->segsleft[0 ], rtinfo->segsleft[1 ], rh->segments_left, !!(rtinfo->invflags & IP6T_RT_INV_SGS))) &&
@@ -107,22 +78,22 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par) reserved),sizeof (_reserved), &_reserved); +if (!rp) { + par->hotdrop = true; +return false; + } ret = (*rp ==0 ); } -pr_debug ("#%d " , rtinfo->addrnr);if (!(rtinfo->flags &IP6T_RT_FST )) {return ret; }else if (rtinfo->flags &IP6T_RT_FST_NSTRICT ) { -pr_debug ("Not strict " );if (rtinfo->addrnr > (unsigned int )((hdrlen -8 ) /16 )) { -pr_debug ("There isn't enough space\n" );return false; }else {unsigned int i =0 ; -pr_debug ("#%d " , rtinfo->addrnr);for (temp =0 ; temp < (unsigned int )((hdrlen -8 ) /16 ); temp++) {
@@ -138,26 +109,20 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)return false; } -if (ipv6_addr_equal (ap, &rtinfo->addrs[i])) { -pr_debug ("i=%d temp=%d;\n" , i, temp); +if (ipv6_addr_equal (ap, &rtinfo->addrs[i])) i++; - }if (i == rtinfo->addrnr)break ; } -pr_debug ("i=%d #%d\n" , i, rtinfo->addrnr);if (i == rtinfo->addrnr)return ret;else return false; } }else { -pr_debug ("Strict " );if (rtinfo->addrnr > (unsigned int )((hdrlen -8 ) /16 )) { -pr_debug ("There isn't enough space\n" );return false; }else { -pr_debug ("#%d " , rtinfo->addrnr);for (temp =0 ; temp < rtinfo->addrnr; temp++) { ap =skb_header_pointer (skb, ptr
@@ -173,7 +138,6 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par)if (!ipv6_addr_equal (ap, &rtinfo->addrs[temp]))break ; } -pr_debug ("temp=%d #%d\n" , temp, rtinfo->addrnr);if (temp == rtinfo->addrnr && temp == (unsigned int )((hdrlen -8 ) /16 ))return ret;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 33/169 netfilter: ipvs: make global sysctl readonly in non-init netns
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 174c376278949c44aad89c514a6b5db6cee8db59 ]
Because the data pointer of net/ipv4/vs/debug_level is not updated per netns, it must be marked as read-only in non-init netns.
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/ipvs/ip_vs_ctl.c +5 -0
@@ -4090,6 +4090,11 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode; tbl[idx++].data = &ipvs->sysctl_schedule_icmp; tbl[idx++].data = &ipvs->sysctl_ignore_tunneled; +#ifdef CONFIG_IP_VS_DEBUG +/* Global sysctls must be ro in non-init netns */ +if (!net_eq (net, &init_net)) + tbl[idx++].mode =0444 ; +#endif ipvs->sysctl_hdr =register_net_sysctl (net,"net/ipv4/vs" , tbl);if (ipvs->sysctl_hdr ==NULL ) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 34/169 sctp: fix transport encap_port update in sctp_vtag_verify
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 075718fdaf0efe20223571236c1bf14ca35a7aa1 ]
transport encap_port update should be updated when sctp_vtag_verify() succeeds, namely, returns 1, not returns 0. Correct it in this patch.
While at it, also fix the indentation.
--- include/net/sctp/sm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/net/sctp/sm.h +3 -3
@@ -384,11 +384,11 @@ sctp_vtag_verify(const struct sctp_chunk *chunk,* Verification Tag value does not match the receiver's own * tag value, the receiver shall silently discard the packet... */ -if (ntohl (chunk->sctp_hdr->vtag) == asoc->c.my_vtag) -return 1 ; +if (ntohl (chunk->sctp_hdr->vtag) != asoc->c.my_vtag) +return 0 ; chunk->transport->encap_port =SCTP_INPUT_CB (chunk->skb)->encap_port; -return 0 ; +return 1 ; }/* Check VTAG of the packet matches the sender's own tag and the T bit is
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 35/169 lan78xx: select CRC32
In reply to Greg Kroah-HartmanFrom: Vegard Nossum <[email protected]>
[ Upstream commit 46393d61a328d7c4e3264252dae891921126c674 ]
Fix the following build/link error by adding a dependency on the CRC32 routines:
ld: drivers/net/usb/lan78xx.o: in function `lan78xx_set_multicast':
lan78xx.c:(.text+0x48cf): undefined reference to `crc32_le'
The actual use of crc32_le() comes indirectly through ether_crc().
--- drivers/net/usb/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/Kconfig +1 -0
@@ -117,6 +117,7 @@ config USB_LAN78XX select PHYLIB select MICROCHIP_PHY select FIXED_PHY + select CRC32 help This option adds support for Microchip LAN78XX based USB 2 & USB 3 10/100/1000 Ethernet adapters.
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 36/169 tcp: md5: Fix overlap between vrf and non-vrf keys
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
[ Upstream commit 86f1e3a8489f6a0232c1f3bc2bdb379f5ccdecec ]
With net.ipv4.tcp_l3mdev_accept=1 it is possible for a listen socket to accept connection from the same client address in different VRFs. It is also possible to set different MD5 keys for these clients which differ only in the tcpm_l3index field.
This appears to work when distinguishing between different VRFs but not between non-VRF and VRF connections. In particular:
* tcp_md5_do_lookup_exact will match a non-vrf key against a vrf key.
This means that adding a key with l3index != 0 after a key with l3index == 0 will cause the earlier key to be deleted. Both keys can be present if the non-vrf key is added later.
* _tcp_md5_do_lookup can match a non-vrf key before a vrf key. This
casues failures if the passwords differ.
Fix this by making tcp_md5_do_lookup_exact perform an actual exact comparison on l3index and by making __tcp_md5_do_lookup perfer vrf-bound keys above other considerations like prefixlen.
--- net/ipv4/tcp_ipv4.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
net/ipv4/tcp_ipv4.c +16 -3
@@ -1037,6 +1037,20 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req)DEFINE_STATIC_KEY_FALSE (tcp_md5_needed);EXPORT_SYMBOL (tcp_md5_needed); +static bool better_md5_match (struct tcp_md5sig_key *old,struct tcp_md5sig_key *new) +{ +if (!old) +return true; + +/* l3index always overrides non-l3index */ +if (old->l3index && new->l3index ==0 ) +return false; +if (old->l3index ==0 && new->l3index) +return true; + +return old->prefixlen < new->prefixlen; +} +/* Find the Key structure for an address. */ struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index, const union tcp_md5_addr *addr,
@@ -1074,8 +1088,7 @@ struct tcp_md5sig_key *__tcp_md5_do_lookup(const struct sock *sk, int l3index, match = false; } -if (match && (!best_match || - key->prefixlen > best_match->prefixlen)) +if (match &&better_md5_match (best_match, key)) best_match = key; }return best_match;
@@ -1105,7 +1118,7 @@ static struct tcp_md5sig_key *tcp_md5_do_lookup_exact(const struct sock *sk, lockdep_sock_is_held(sk)) {if (key->family != family)continue ; -if (key->l3index && key->l3index != l3index) +if (key->l3index != l3index)continue ;if (!memcmp (&key->addr, addr, size) && key->prefixlen == prefixlen)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 37/169 ipv6: When forwarding count rx stats on the orig netdev
In reply to Greg Kroah-HartmanFrom: Stephen Suryaputra <[email protected]>
[ Upstream commit 0857d6f8c759d95f89d0436f86cdfd189ef99f20 ]
Commit bdb7cc643fc9 ("ipv6: Count interface receive statistics on the ingress netdev") does not work when ip6_forward() executes on the skbs with vrf-enslaved netdev. Use IP6CB(skb)->iif to get to the right one.
Add a selftest script to verify.
--- net/ipv6/ip6_output.c | 3 +- .../testing/selftests/net/forwarding/Makefile | 1 + .../net/forwarding/forwarding.config.sample | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 172 ++++++++++++++++++ tools/testing/selftests/net/forwarding/lib.sh | 8 + 5 files changed, 185 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh
net/ipv6/ip6_output.c +2 -1
@@ -488,13 +488,14 @@ static bool ip6_pkt_too_big(const struct sk_buff *skb, unsigned int mtu)int ip6_forward (struct sk_buff *skb) { -struct inet6_dev *idev =__in6_dev_get_safely (skb->dev);struct dst_entry *dst =skb_dst (skb);struct ipv6hdr *hdr =ipv6_hdr (skb);struct inet6_skb_parm *opt =IP6CB (skb);struct net *net =dev_net (dst->dev); +struct inet6_dev *idev;u32 mtu; + idev =__in6_dev_get_safely (dev_get_by_index_rcu (net,IP6CB (skb)->iif));if (net->ipv6.devconf_all->forwarding ==0 ) goto error;
tools/testing/selftests/net/forwarding/Makefile +1 -0
@@ -9,6 +9,7 @@ TEST_PROGS = bridge_igmp.sh \ gre_inner_v4_multipath.sh \ gre_inner_v6_multipath.sh \ gre_multipath.sh \ + ip6_forward_instats_vrf.sh \ ip6gre_inner_v4_multipath.sh \ ip6gre_inner_v6_multipath.sh \ ipip_flat_gre_key.sh \
tools/testing/selftests/net/forwarding/forwarding.config.sample +2 -0
@@ -39,3 +39,5 @@ NETIF_CREATE=yes # Timeout (in seconds) before ping exits regardless of how many packets have # been sent or received PING_TIMEOUT=5 +# IPv6 traceroute utility name. +TROUTE6=traceroute6
tools/testing/selftests/net/forwarding/ip6_forward_instats_vrf.sh new file +172 -0
172 lines not on this page · raw message
tools/testing/selftests/net/forwarding/lib.sh +8 -0
@@ -748,6 +748,14 @@ qdisc_parent_stats_get() | jq '.[] | select(.parent == "'"$parent"'") | '"$selector" } +ipv6_stats_get() +{ + local dev=$1; shift + local stat=$1; shift + + cat /proc/net/dev_snmp6/$dev | grep "^$stat" | cut -f2 +} + humanize() { local speed=$1; shift
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 38/169 hamradio: baycom_epp: fix build for UML
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 0a9bb11a5e298e72b675255a4bb2893513000584 ]
On i386, the baycom_epp driver wants to inspect X86 CPU features (TSC) and then act on that data, but that info is not available when running on UML, so prevent that test and do the default action.
Prevents this build error on UML + i386:
../drivers/net/hamradio/baycom_epp.c: In function ‘epp_bh’:../drivers/net/hamradio/baycom_epp.c:630:6: error: implicit declaration of function ‘boot_cpu_has’; did you mean ‘get_cpu_mask’? [-Werror=implicit-function-declaration]
if (boot_cpu_has(X86_FEATURE_TSC)) \
^../drivers/net/hamradio/baycom_epp.c:658:2: note: in expansion of macro ‘GETTICK’
GETTICK(time1);
--- drivers/net/hamradio/baycom_epp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/hamradio/baycom_epp.c +3 -3
@@ -623,16 +623,16 @@ static int receive(struct net_device *dev, int cnt)/* --------------------------------------------------------------------- */ -#ifdef __i386__ +#if defined(__i386__) && !defined(CONFIG_UML )#include <asm/msr.h> #define GETTICK (x) \ ({ \ if (boot_cpu_has(X86_FEATURE_TSC)) \ x = (unsigned int)rdtsc(); \ }) -#else /* __i386__ */ +#else /* __i386__ && !CONFIG_UML */ #define GETTICK (x) -#endif /* __i386__ */ +#endif /* __i386__ && !CONFIG_UML */ static void epp_bh (struct work_struct *work) {
Signature · 9 lines
2.33.0 _______________________________________________ linux-um mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-um
Greg Kroah-Hartman
maintainerPATCH 39/169 net: dsa: lantiq_gswip: fix register definition
In reply to Greg Kroah-HartmanFrom: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 66d262804a2276721eac86cf18fcd61046149193 ]
I compared the register definitions with the D-Link DWR-966 GPL sources and found that the PUAFD field definition was incorrect. This definition is unused and causes no issues.
--- drivers/net/dsa/lantiq_gswip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/lantiq_gswip.c +1 -1
@@ -230,7 +230,7 @@#define GSWIP_SDMA_PCTRLp (p) (0xBC0 + ((p) * 0x6))#define GSWIP_SDMA_PCTRL_EN BIT(0)/* SDMA Port Enable */ #define GSWIP_SDMA_PCTRL_FCEN BIT(1)/* Flow Control Enable */ -#define GSWIP_SDMA_PCTRL_PAUFWD BIT(1)/* Pause Frame Forwarding */ +#define GSWIP_SDMA_PCTRL_PAUFWD BIT(3)/* Pause Frame Forwarding */ #define GSWIP_TABLE_ACTIVE_VLAN 0x01#define GSWIP_TABLE_VLAN_MAPPING 0x02
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 40/169 net/sched: act_ct: Fix byte count on fragmented packets
In reply to Greg Kroah-HartmanFrom: Paul Blakey <[email protected]>
[ Upstream commit 2dc4e9e88cfcc38454d52b01ed3422238c134003 ]
First fragmented packets (frag offset = 0) byte len is zeroed when stolen by ip_defrag(). And since act_ct update the stats only afterwards (at end of execute), bytes aren't correctly accounted for such packets.
To fix this, move stats update to start of action execute.
--- net/sched/act_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_ct.c +1 -1
@@ -960,6 +960,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, tmpl = p->tmpl;tcf_lastuse_update (&c->tcf_tm); +tcf_action_update_bstats (&c->common, skb);if (clear) {qdisc_skb_cb (skb)->post_ct = false;
@@ -1049,7 +1050,6 @@ out_push:qdisc_skb_cb (skb)->post_ct = true; out_clear: -tcf_action_update_bstats (&c->common, skb);if (defrag)qdisc_skb_cb (skb)->pkt_len = skb->len;return retval;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 41/169 NIOS2: irqflags: rename a redefined register name
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 4cce60f15c04d69eff6ffc539ab09137dbe15070 ]
Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro with the name "CTL_STATUS". Change the one in arch/nios2/ to be "CTL_FSTATUS" (flags status) to eliminate the build warning.
In file included from ../drivers/mmc/host/tmio_mmc.c:22:drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
31 | #define CTL_STATUS 0x1carch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
14 | #define CTL_STATUS 0
--- arch/nios2/include/asm/irqflags.h | 4 ++-- arch/nios2/include/asm/registers.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/nios2/include/asm/irqflags.h +2 -2
@@ -9,7 +9,7 @@static inline unsigned long arch_local_save_flags (void ) { -return RDCTL (CTL_STATUS ); +return RDCTL (CTL_FSTATUS ); }/*
@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void)*/ static inline void arch_local_irq_restore (unsigned long flags) { -WRCTL (CTL_STATUS , flags); +WRCTL (CTL_FSTATUS , flags); }static inline void arch_local_irq_disable (void )
arch/nios2/include/asm/registers.h +1 -1
@@ -11,7 +11,7 @@#endif /* control register numbers */ -#define CTL_STATUS 0 +#define CTL_FSTATUS 0#define CTL_ESTATUS 1#define CTL_BSTATUS 2#define CTL_IENABLE 3
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 42/169 net: dsa: Fix an error handling path in dsa_switch_parse_ports_of()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ba69fd9101f20a6d05a96ab743341d4e7b1a2178 ]
If we return before the end of the 'for_each_child_of_node()' iterator, the reference taken on 'port' must be released.
Add the missing 'of_node_put()' calls.
--- net/dsa/dsa2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/dsa/dsa2.c +7 -2
@@ -1283,12 +1283,15 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,for_each_available_child_of_node (ports, port) { err =of_property_read_u32 (port,"reg" , ®); -if (err) +if (err) { +of_node_put (port); goto out_put_node; + }if (reg >= ds->num_ports) {dev_err (ds->dev,"port %pOF index %u exceeds num_ports (%zu)\n" , port, reg, ds->num_ports); +of_node_put (port); err = -EINVAL ; goto out_put_node; }
@@ -1296,8 +1299,10 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, dp =dsa_to_port (ds, reg); err =dsa_port_parse_of (dp, port); -if (err) +if (err) { +of_node_put (port); goto out_put_node; + } } out_put_node:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 43/169 powerpc/smp: do not decrement idle task preempt count in CPU offline
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 787252a10d9422f3058df9a4821f389e5326c440 ]
With PREEMPT_COUNT=y, when a CPU is offlined and then onlined again, we get:
BUG: scheduling while atomic: swapper/1/0/0x00000000 no locks held by swapper/1/0. CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.15.0-rc2+ #100 Call Trace: dump_stack_lvl+0xac/0x108 __schedule_bug+0xac/0xe0 __schedule+0xcf8/0x10d0 schedule_idle+0x3c/0x70 do_idle+0x2d8/0x4a0 cpu_startup_entry+0x38/0x40 start_secondary+0x2ec/0x3a0 start_secondary_prolog+0x10/0x14
This is because powerpc's arch_cpu_idle_dead() decrements the idle task's preempt count, for reasons explained in commit a7c2bb8279d2 ("powerpc:
Re-enable preemption before cpu_die()"), specifically "start_secondary() expects a preempt_count() of 0."
However, since commit 2c669ef6979c ("powerpc/preempt: Don't touch the idle task's preempt_count during hotplug") and commit f1a0a376ca0c ("sched/core:
Initialize the idle task with preemption disabled"), that justification no longer holds.
The idle task isn't supposed to re-enable preemption, so remove the vestigial preempt_enable() from the CPU offline path.
Tested with pseries and powernv in qemu, and pseries on PowerVM.
--- arch/powerpc/kernel/smp.c | 2 -- 1 file changed, 2 deletions(-)
arch/powerpc/kernel/smp.c +0 -2
@@ -1703,8 +1703,6 @@ void __cpu_die(unsigned int cpu)void arch_cpu_idle_dead (void ) { -sched_preempt_enable_no_resched (); -/* * Disable on the down path. This will be re-enabled by * start_secondary() via start_secondary_resume() below
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 44/169 net: hns3: Add configuration of TM QCN error event
In reply to Greg Kroah-HartmanFrom: Jiaran Zhang <[email protected]>
[ Upstream commit 60484103d5c387df49bd60de4b16c88022747048 ]
Add configuration of interrupt type and fifo interrupt enable of TM QCN error event if enabled, otherwise this event will not be reported when there is error.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 5 ++++- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c +4 -1
@@ -995,8 +995,11 @@ static int hclge_config_tm_hw_err_int(struct hclge_dev *hdev, bool en)/* configure TM QCN hw errors */ hclge_cmd_setup_basic_desc (&desc,HCLGE_TM_QCN_MEM_INT_CFG , false); -if (en) + desc.data[0 ] =cpu_to_le32 (HCLGE_TM_QCN_ERR_INT_TYPE ); +if (en) { + desc.data[0 ] |=cpu_to_le32 (HCLGE_TM_QCN_FIFO_INT_EN ); desc.data[1 ] =cpu_to_le32 (HCLGE_TM_QCN_MEM_ERR_INT_EN ); + } ret =hclge_cmd_send (&hdev->hw, &desc,1 );if (ret)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h +2 -0
@@ -50,6 +50,8 @@#define HCLGE_PPP_MPF_ECC_ERR_INT3_EN 0x003F#define HCLGE_PPP_MPF_ECC_ERR_INT3_EN_MASK 0x003F#define HCLGE_TM_SCH_ECC_ERR_INT_EN 0x3 +#define HCLGE_TM_QCN_ERR_INT_TYPE 0x29 +#define HCLGE_TM_QCN_FIFO_INT_EN 0xFFFF00#define HCLGE_TM_QCN_MEM_ERR_INT_EN 0xFFFFFF#define HCLGE_NCSI_ERR_INT_EN 0x3#define HCLGE_NCSI_ERR_INT_TYPE 0x9
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 45/169 net: hns3: reset DWRR of unused tc to zero
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit b63fcaab959807282e9822e659034edf95fc8bd1 ]
Currently, DWRR of tc will be initialized to a fixed value when this tc is enabled, but it is not been reset to 0 when this tc is disabled. It cause a problem that the DWRR of unused tc is not 0 after using tc tool to add and delete multi-tc parameters.
For examples, after enabling 4 TCs and restoring to 1 TC by follow tc commands:
$ tc qdisc add dev eth0 root mqprio num_tc 4 map 0 1 2 3 0 1 2 3 queues \ 8@0 8@8 8@16 8@24 hw 1 mode channel $ tc qdisc del dev eth0 root
Now there is just one TC is enabled for eth0, but the tc info querying by debugfs is shown as follow:
$ cat /mnt/hns3/0000:7d:00.0/tm/tc_sch_info enabled tc number: 1 weight_offset: 14 TC MODE WEIGHT 0 dwrr 100 1 dwrr 100 2 dwrr 100 3 dwrr 100 4 dwrr 0 5 dwrr 0 6 dwrr 0 7 dwrr 0
This patch fixes it by resetting DWRR of tc to 0 when tc is disabled.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +2 -0
@@ -752,6 +752,8 @@ static void hclge_tm_pg_info_init(struct hclge_dev *hdev) hdev->tm_info.pg_info[i].tc_bit_map = hdev->hw_tc_map;for (k =0 ; k < hdev->tm_info.num_tc; k++) hdev->tm_info.pg_info[i].tc_dwrr[k] =BW_PERCENT ; +for (; k <HNAE3_MAX_TC ; k++) + hdev->tm_info.pg_info[i].tc_dwrr[k] =0 ; } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 46/169 net: hns3: add limit ets dwrr bandwidth cannot be 0
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit 731797fdffa3d083db536e2fdd07ceb050bb40b1 ]
If ets dwrr bandwidth of tc is set to 0, the hardware will switch to SP mode. In this case, this tc may occupy all the tx bandwidth if it has huge traffic, so it violates the purpose of the user setting.
To fix this problem, limit the ets dwrr bandwidth must greater than 0.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c +9 -0
@@ -133,6 +133,15 @@ static int hclge_ets_validate(struct hclge_dev *hdev, struct ieee_ets *ets, *changed = true;break ;case IEEE_8021QAZ_TSA_ETS : +/* The hardware will switch to sp mode if bandwidth is +* 0, so limit ets bandwidth must be greater than 0. +*/ +if (!ets->tc_tx_bw[i]) { +dev_err (&hdev->pdev->dev, +"tc%u ets bw cannot be 0\n" , i); +return -EINVAL ; + } +if (hdev->tm_info.tc_info[i].tc_sch_mode !=HCLGE_SCH_MODE_DWRR ) *changed = true;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 47/169 net: hns3: schedule the polling again when allocation fails
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 68752b24f51a71d4f350a764d890b670f59062c5 ]
Currently when there is a rx page allocation failure, it is possible that polling may be stopped if there is no more packet to be reveiced, which may cause queue stall problem under memory pressure.
This patch makes sure polling is scheduled again when there is any rx page allocation failure, and polling will try to allocate receive buffers until it succeeds.
Now the allocation retry is added, it is unnecessary to do the rx page allocation at the end of rx cleaning, so remove it. And reset the unused_count to zero after calling hns3_nic_alloc_rx_buffers() to avoid calling hns3_nic_alloc_rx_buffers() repeatedly under memory pressure.
--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +12 -10
@@ -3488,7 +3488,8 @@ static int hns3_desc_unused(struct hns3_enet_ring *ring)return ((ntc >= ntu) ?0 : ring->desc_num) + ntc - ntu; } -static void hns3_nic_alloc_rx_buffers (struct hns3_enet_ring *ring, +/* Return true if there is any allocation failure */ +static bool hns3_nic_alloc_rx_buffers (struct hns3_enet_ring *ring,int cleand_count) {struct hns3_desc_cb *desc_cb;
@@ -3513,7 +3514,10 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,hns3_rl_err (ring_to_netdev (ring),"alloc rx buffer failed: %d\n" , ret); -break ; + +writel (i, ring->tqp->io_base + +HNS3_RING_RX_RING_HEAD_REG ); +return true; }hns3_replace_buffer (ring, ring->next_to_use, &res_cbs);
@@ -3526,6 +3530,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring, }writel (i, ring->tqp->io_base +HNS3_RING_RX_RING_HEAD_REG ); +return false; }static bool hns3_can_reuse_page (struct hns3_desc_cb *cb)
@@ -4159,6 +4164,7 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget, {#define RCB_NOF_ALLOC_RX_BUFF_ONCE 16int unused_count =hns3_desc_unused (ring); +bool failure = false;int recv_pkts =0 ;int err;
@@ -4167,9 +4173,9 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget,while (recv_pkts < budget) {/* Reuse or realloc buffers */ if (unused_count >=RCB_NOF_ALLOC_RX_BUFF_ONCE ) { -hns3_nic_alloc_rx_buffers (ring, unused_count); - unused_count =hns3_desc_unused (ring) - - ring->pending_buf; + failure = failure || +hns3_nic_alloc_rx_buffers (ring, unused_count); + unused_count =0 ; }/* Poll one pkt */
@@ -4188,11 +4194,7 @@ int hns3_clean_rx_ring(struct hns3_enet_ring *ring, int budget, } out: -/* Make all data has been write before submit */ -if (unused_count >0 ) -hns3_nic_alloc_rx_buffers (ring, unused_count); - -return recv_pkts; +return failure ? budget : recv_pkts; }static void hns3_update_rx_int_coalesce (struct hns3_enet_tqp_vector *tqp_vector)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 48/169 net: hns3: fix vf reset workqueue cannot exit
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
[ Upstream commit 1385cc81baeb3bd8cbbbcdc1557f038ac1712529 ]
The task of VF reset is performed through the workqueue. It checks the value of hdev->reset_pending to determine whether to exit the loop. However, the value of hdev->reset_pending may also be assigned by the interrupt function hclgevf_misc_irq_handle(), which may cause the loop fail to exit and keep occupying the workqueue. This loop is not necessary, so remove it and the workqueue will be rescheduled if the reset needs to be retried or a new reset occurs.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +3 -3
@@ -2271,9 +2271,9 @@ static void hclgevf_reset_service_task(struct hclgevf_dev *hdev) hdev->reset_attempts =0 ; hdev->last_reset_time = jiffies; -while ((hdev->reset_type = -hclgevf_get_reset_level (hdev, &hdev->reset_pending)) - !=HNAE3_NONE_RESET ) + hdev->reset_type = +hclgevf_get_reset_level (hdev, &hdev->reset_pending); +if (hdev->reset_type !=HNAE3_NONE_RESET )hclgevf_reset (hdev); }else if (test_and_clear_bit (HCLGEVF_RESET_REQUESTED , &hdev->reset_state)) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 49/169 net: hns3: disable sriov before unload hclge layer
In reply to Greg Kroah-HartmanFrom: Peng Li <[email protected]>
[ Upstream commit 0dd8a25f355b4df2d41c08df1716340854c7d4c5 ]
HNS3 driver includes hns3.ko, hnae3.ko and hclge.ko. hns3.ko includes network stack and pci_driver, hclge.ko includes HW device action, algo_ops and timer task, hnae3.ko includes some register function.
When SRIOV is enable and hclge.ko is removed, HW device is unloaded but VF still exists, PF will not reply VF mbx messages, and cause errors.
This patch fix it by disable SRIOV before remove hclge.ko.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 21 +++++++++++++++++++ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + .../hisilicon/hns3/hns3pf/hclge_main.c | 1 + 3 files changed, 23 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hnae3.c +21 -0
@@ -10,6 +10,27 @@ static LIST_HEAD(hnae3_ae_algo_list);static LIST_HEAD (hnae3_client_list);static LIST_HEAD (hnae3_ae_dev_list); +void hnae3_unregister_ae_algo_prepare (struct hnae3_ae_algo *ae_algo) +{ +const struct pci_device_id *pci_id; +struct hnae3_ae_dev *ae_dev; + +if (!ae_algo) +return ; + +list_for_each_entry (ae_dev, &hnae3_ae_dev_list, node) { +if (!hnae3_get_bit (ae_dev->flag,HNAE3_DEV_INITED_B )) +continue ; + + pci_id =pci_match_id (ae_algo->pdev_id_table, ae_dev->pdev); +if (!pci_id) +continue ; +if (IS_ENABLED (CONFIG_PCI_IOV )) +pci_disable_sriov (ae_dev->pdev); + } +} +EXPORT_SYMBOL (hnae3_unregister_ae_algo_prepare); +/* we are keeping things simple and using single lock for all the * list. This is a non-critical code so other updations, if happen * in parallel, can wait.
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -0
@@ -850,6 +850,7 @@ struct hnae3_handle {int hnae3_register_ae_dev (struct hnae3_ae_dev *ae_dev);void hnae3_unregister_ae_dev (struct hnae3_ae_dev *ae_dev); +void hnae3_unregister_ae_algo_prepare (struct hnae3_ae_algo *ae_algo);void hnae3_unregister_ae_algo (struct hnae3_ae_algo *ae_algo);void hnae3_register_ae_algo (struct hnae3_ae_algo *ae_algo);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -0
@@ -13023,6 +13023,7 @@ static int hclge_init(void)static void hclge_exit (void ) { +hnae3_unregister_ae_algo_prepare (&ae_algo);hnae3_unregister_ae_algo (&ae_algo);destroy_workqueue (hclge_wq); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 50/169 net: stmmac: Fix E2E delay mechanism
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 3cb958027cb8b78d3ee639ce9af54c2ef1bf964f ]
When utilizing End to End delay mechanism, the following error messages show up:
|root@ehl1:~# ptp4l --tx_timestamp_timeout=50 -H -i eno2 -E -m |ptp4l[950.573]: selected /dev/ptp3 as PTP clock |ptp4l[950.586]: port 1: INITIALIZING to LISTENING on INIT_COMPLETE |ptp4l[950.586]: port 0: INITIALIZING to LISTENING on INIT_COMPLETE |ptp4l[952.879]: port 1: new foreign master 001395.fffe.4897b4-1 |ptp4l[956.879]: selected best master clock 001395.fffe.4897b4 |ptp4l[956.879]: port 1: assuming the grand master role |ptp4l[956.879]: port 1: LISTENING to GRAND_MASTER on RS_GRAND_MASTER |ptp4l[962.017]: port 1: received DELAY_REQ without timestamp |ptp4l[962.273]: port 1: received DELAY_REQ without timestamp |ptp4l[963.090]: port 1: received DELAY_REQ without timestamp
Commit f2fb6b6275eb ("net: stmmac: enable timestamp snapshot for required PTP packets in dwmac v5.10a") already addresses this problem for the dwmac v5.10. However, same holds true for all dwmacs above version v4.10. Correct the check accordingly. Afterwards everything works as expected.
Tested on Intel Atom(R) x6414RE Processor.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -736,7 +736,7 @@ static int stmmac_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) config.rx_filter =HWTSTAMP_FILTER_PTP_V2_EVENT ; ptp_v2 =PTP_TCR_TSVER2ENA ; snap_type_sel =PTP_TCR_SNAPTYPSEL_1 ; -if (priv->synopsys_id !=DWMAC_CORE_5_10 ) +if (priv->synopsys_id <DWMAC_CORE_4_10 ) ts_event_en =PTP_TCR_TSEVNTENA ; ptp_over_ipv4_udp =PTP_TCR_TSIPV4ENA ; ptp_over_ipv6_udp =PTP_TCR_TSIPV6ENA ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 51/169 ptp: Fix possible memory leak in ptp_clock_register()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 4225fea1cb28370086e17e82c0f69bec2779dca0 ]
I got memory leak as follows when doing fault injection test:
unreferenced object 0xffff88800906c618 (size 8):
comm "i2c-idt82p33931", pid 4421, jiffies 4294948083 (age 13.188s) hex dump (first 8 bytes):
70 74 70 30 00 00 00 00 ptp0....
backtrace:
[<00000000312ed458>] __kmalloc_track_caller+0x19f/0x3a0
[<0000000079f6e2ff>] kvasprintf+0xb5/0x150
[<0000000026aae54f>] kvasprintf_const+0x60/0x190
[<00000000f323a5f7>] kobject_set_name_vargs+0x56/0x150
[<000000004e35abdd>] dev_set_name+0xc0/0x100
[<00000000f20cfe25>] ptp_clock_register+0x9f4/0xd30 [ptp]
[<000000008bb9f0de>] idt82p33_probe.cold+0x8b6/0x1561 [ptp_idt82p33]When posix_clock_register() returns an error, the name allocated in dev_set_name() will be leaked, the put_device() should be used to give up the device reference, then the name will be freed in kobject_cleanup() and other memory will be freed in ptp_clock_release().
--- drivers/ptp/ptp_clock.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/ptp/ptp_clock.c +11 -4
@@ -283,15 +283,22 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,/* Create a posix clock and link it to the device. */ err =posix_clock_register (&ptp->clock, &ptp->dev);if (err) { +if (ptp->pps_source) +pps_unregister_source (ptp->pps_source); + +kfree (ptp->vclock_index); + +if (ptp->kworker) +kthread_destroy_worker (ptp->kworker); + +put_device (&ptp->dev); +pr_err ("failed to create posix clock\n" ); - goto no_clock; +return ERR_PTR (err); }return ptp; -no_clock: -if (ptp->pps_source) -pps_unregister_source (ptp->pps_source); no_pps:ptp_cleanup_pin_groups (ptp); no_pin_groups:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 52/169 e1000e: Fix packet loss on Tiger Lake and later
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 639e298f432fb058a9496ea16863f53b1ce935fe ]
Update the HW MAC initialization flow. Do not gate DMA clock from the modPHY block. Keeping this clock will prevent dropped packets sent in burst mode on the Kumeran interface.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213651
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=213377
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +10 -1
@@ -4804,7 +4804,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)static s32 e1000_init_hw_ich8lan (struct e1000_hw *hw) {struct e1000_mac_info *mac = &hw->mac; -u32 ctrl_ext, txdctl, snoop; +u32 ctrl_ext, txdctl, snoop, fflt_dbg;s32 ret_val;u16 i;
@@ -4863,6 +4863,15 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) snoop = (u32 )~(PCIE_NO_SNOOP_ALL );e1000e_set_pcie_no_snoop (hw, snoop); +/* Enable workaround for packet loss issue on TGP PCH +* Do not gate DMA clock from the modPHY block +*/ +if (mac->type >= e1000_pch_tgp) { + fflt_dbg =er32 (FFLT_DBG ); + fflt_dbg |=E1000_FFLT_DBG_DONT_GATE_WAKE_DMA_CLK ; +ew32 (FFLT_DBG , fflt_dbg); + } + ctrl_ext =er32 (CTRL_EXT ); ctrl_ext |=E1000_CTRL_EXT_RO_DIS ;ew32 (CTRL_EXT , ctrl_ext);
drivers/net/ethernet/intel/e1000e/ich8lan.h +3 -0
@@ -286,6 +286,9 @@/* Proprietary Latency Tolerance Reporting PCI Capability */ #define E1000_PCI_LTR_CAP_LPT 0xA8 +/* Don't gate wake DMA clock */ +#define E1000_FFLT_DBG_DONT_GATE_WAKE_DMA_CLK 0x1000 +void e1000e_write_protect_nvm_ich8lan (struct e1000_hw *hw);void e1000e_set_kmrn_lock_loss_workaround_ich8lan (struct e1000_hw *hw,bool state);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 53/169 igc: Update I226_K device ID
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 79cc8322b6d82747cb63ea464146c0bf5b5a6bc1 ]
The device ID for I226_K was incorrectly assigned, update the device ID to the correct one.
--- drivers/net/ethernet/intel/igc/igc_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_hw.h +1 -1
@@ -22,8 +22,8 @@#define IGC_DEV_ID_I220_V 0x15F7#define IGC_DEV_ID_I225_K 0x3100#define IGC_DEV_ID_I225_K2 0x3101 +#define IGC_DEV_ID_I226_K 0x3102#define IGC_DEV_ID_I225_LMVP 0x5502 -#define IGC_DEV_ID_I226_K 0x5504#define IGC_DEV_ID_I225_IT 0x0D9F#define IGC_DEV_ID_I226_LM 0x125B#define IGC_DEV_ID_I226_V 0x125C
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 54/169 ice: Add missing E810 device ids
In reply to Greg Kroah-HartmanFrom: Tony Nguyen <[email protected]>
[ Upstream commit 7dcf78b870be6418d72bb1c4d4924bf0f5ca5052 ]
As part of support for E810 XXV devices, some device ids were inadvertently left out. Add those missing ids.
--- drivers/net/ethernet/intel/ice/ice_common.c | 2 ++ drivers/net/ethernet/intel/ice/ice_devids.h | 4 ++++ drivers/net/ethernet/intel/ice/ice_main.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/ethernet/intel/ice/ice_common.c +2 -0
@@ -25,6 +25,8 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)case ICE_DEV_ID_E810C_BACKPLANE :case ICE_DEV_ID_E810C_QSFP :case ICE_DEV_ID_E810C_SFP : +case ICE_DEV_ID_E810_XXV_BACKPLANE : +case ICE_DEV_ID_E810_XXV_QSFP :case ICE_DEV_ID_E810_XXV_SFP : hw->mac_type =ICE_MAC_E810 ;break ;
drivers/net/ethernet/intel/ice/ice_devids.h +4 -0
@@ -21,6 +21,10 @@#define ICE_DEV_ID_E810C_QSFP 0x1592/* Intel(R) Ethernet Controller E810-C for SFP */ #define ICE_DEV_ID_E810C_SFP 0x1593 +/* Intel(R) Ethernet Controller E810-XXV for backplane */ +#define ICE_DEV_ID_E810_XXV_BACKPLANE 0x1599 +/* Intel(R) Ethernet Controller E810-XXV for QSFP */ +#define ICE_DEV_ID_E810_XXV_QSFP 0x159A/* Intel(R) Ethernet Controller E810-XXV for SFP */ #define ICE_DEV_ID_E810_XXV_SFP 0x159B/* Intel(R) Ethernet Connection E823-C for backplane */
drivers/net/ethernet/intel/ice/ice_main.c +2 -0
@@ -5020,6 +5020,8 @@ static const struct pci_device_id ice_pci_tbl[] = { { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_BACKPLANE), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810C_SFP), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_BACKPLANE), 0 }, + { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_QSFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E810_XXV_SFP), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_BACKPLANE), 0 }, { PCI_VDEVICE(INTEL, ICE_DEV_ID_E823C_QSFP), 0 },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 55/169 net/mlx5e: IPsec: Fix a misuse of the software parsers fields
In reply to Greg Kroah-HartmanFrom: Emeel Hakim <[email protected]>
[ Upstream commit d10457f85d4ae4d32c0df0cd65358a78c577fbe6 ]
IPsec crypto offload current Software Parser (SWP) fields settings in the ethernet segment (eseg) are not aligned with PRM/HW expectations. Among others in case of IP|ESP|TCP packet, current driver sets the offsets for inner_l3 and inner_l4 although there is no inner l3/l4 headers relative to ESP header in such packets.
SWP provides the offsets for HW ,so it can be used to find csum fields to offload the checksum, however these are not necessarily used by HW and are used as fallback in case HW fails to parse the packet, e.g when performing IPSec Transport Aware (IP | ESP | TCP) there is no need to add SW parse on inner packet. So in some cases packets csum was calculated correctly , whereas in other cases it failed. The later faced csum errors (caused by wrong packet length calculations) which led to lots of packet drops hence the low throughput.
Fix by setting the SWP fields as expected in a IP|ESP|TCP packet.
the following describe the expected SWP offsets:
* Tunnel Mode:
* SWP: OutL3 InL3 InL4 * Pkt: MAC IP ESP IP L4 * * Transport Mode: * SWP: OutL3 OutL4 * Pkt: MAC IP ESP L4 * * Tunnel(VXLAN TCP/UDP) over Transport Mode * SWP: OutL3 InL3 InL4 * Pkt: MAC IP ESP UDP VXLAN IP L4
--- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c +27 -24
@@ -141,8 +141,7 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb,* Pkt: MAC IP ESP IP L4 * * Transport Mode: -* SWP: OutL3 InL4 -* InL3 +* SWP: OutL3 OutL4 * Pkt: MAC IP ESP L4 * * Tunnel(VXLAN TCP/UDP) over Transport Mode
@@ -171,31 +170,35 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb,return ;if (!xo->inner_ipproto) { - eseg->swp_inner_l3_offset =skb_network_offset (skb) /2 ; - eseg->swp_inner_l4_offset =skb_inner_transport_offset (skb) /2 ; -if (skb->protocol ==htons (ETH_P_IPV6 )) - eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; -if (xo->proto ==IPPROTO_UDP ) +switch (xo->proto) { +case IPPROTO_UDP : + eseg->swp_flags |=MLX5_ETH_WQE_SWP_OUTER_L4_UDP ; + fallthrough; +case IPPROTO_TCP : +/* IP | ESP | TCP */ + eseg->swp_outer_l4_offset =skb_inner_transport_offset (skb) /2 ; +break ; +default : +break ; + } + }else { +/* Tunnel(VXLAN TCP/UDP) over Transport Mode */ +switch (xo->inner_ipproto) { +case IPPROTO_UDP : eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L4_UDP ; -return ; - } - -/* Tunnel(VXLAN TCP/UDP) over Transport Mode */ -switch (xo->inner_ipproto) { -case IPPROTO_UDP : - eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L4_UDP ; - fallthrough; -case IPPROTO_TCP : - eseg->swp_inner_l3_offset =skb_inner_network_offset (skb) /2 ; - eseg->swp_inner_l4_offset = (skb->csum_start + skb->head - skb->data) /2 ; -if (skb->protocol ==htons (ETH_P_IPV6 )) - eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; -break ; -default : -break ; + fallthrough; +case IPPROTO_TCP : + eseg->swp_inner_l3_offset =skb_inner_network_offset (skb) /2 ; + eseg->swp_inner_l4_offset = + (skb->csum_start + skb->head - skb->data) /2 ; +if (skb->protocol ==htons (ETH_P_IPV6 )) + eseg->swp_flags |=MLX5_ETH_WQE_SWP_INNER_L3_IPV6 ; +break ; +default : +break ; + } } -return ; } void mlx5e_ipsec_set_iv_esn(struct sk_buff *skb, struct xfrm_state *x,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 56/169 net/mlx5e: IPsec: Fix work queue entry ethernet segment checksum flags
In reply to Greg Kroah-HartmanFrom: Emeel Hakim <[email protected]>
[ Upstream commit 1d000323940137332d4d62c6332b6daf5f07aba7 ]
Current Work Queue Entry (WQE) checksum (csum) flags in the ethernet segment (eseg) in case of IPsec crypto offload datapath are not aligned with PRM/HW expectations.
Currently the driver always sets the l3_inner_csum flag in case of IPsec because of the wrong usage of skb->encapsulation as indicator for inner IPsec header since skb->encapsulation is always ON for IPsec packets since IPsec itself is an encapsulation protocol. The above forced a failing attempts of calculating csum of non-existing segments (like in the IP|ESP|TCP packet case which does not have an l3_inner) which led to lots of packet drops hence the low throughput.
Fix by using xo->inner_ipproto as indicator for inner IPsec header instead of skb->encapsulation in addition to setting the csum flags as following:
* Tunnel Mode:
* Pkt: MAC IP ESP IP L4
* CSUM: l3_cs | l3_inner_cs | l4_inner_cs
*
* Transport Mode:
* Pkt: MAC IP ESP L4
* CSUM: l3_cs [ | l4_cs (checksum partial case)]
*
* Tunnel(VXLAN TCP/UDP) over Transport Mode
* Pkt: MAC IP ESP UDP VXLAN IP L4
* CSUM: l3_cs | l3_inner_cs | l4_inner_cs
--- .../net/ethernet/mellanox/mlx5/core/en_tx.c | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +11 -9
@@ -213,19 +213,18 @@ static inline void mlx5e_insert_vlan(void *start, struct sk_buff *skb, u16 ihs)memcpy (&vhdr->h_vlan_encapsulated_proto, skb->data + cpy1_sz, cpy2_sz); } -/* If packet is not IP's CHECKSUM_PARTIAL (e.g. icmd packet), -* need to set L3 checksum flag for IPsec -*/ static void ipsec_txwqe_build_eseg_csum (struct mlx5e_txqsq *sq,struct sk_buff *skb,struct mlx5_wqe_eth_seg *eseg) { +struct xfrm_offload *xo =xfrm_offload (skb); + eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ; -if (skb->encapsulation) { - eseg->cs_flags |=MLX5_ETH_WQE_L3_INNER_CSUM ; +if (xo->inner_ipproto) { + eseg->cs_flags |=MLX5_ETH_WQE_L4_INNER_CSUM |MLX5_ETH_WQE_L3_INNER_CSUM ; + }else if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { + eseg->cs_flags |=MLX5_ETH_WQE_L4_CSUM ; sq->stats->csum_partial_inner++; - }else { - sq->stats->csum_partial++; } }
@@ -234,6 +233,11 @@ mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb,struct mlx5e_accel_tx_state *accel, struct mlx5_wqe_eth_seg *eseg) { + if (unlikely(mlx5e_ipsec_eseg_meta(eseg))) { +ipsec_txwqe_build_eseg_csum (sq ,skb ,eseg ); +return ; + } +if (likely (skb->ip_summed ==CHECKSUM_PARTIAL )) { eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM ;if (skb->encapsulation) {
@@ -249,8 +253,6 @@ mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, eseg->cs_flags =MLX5_ETH_WQE_L3_CSUM |MLX5_ETH_WQE_L4_CSUM ; sq->stats->csum_partial++;#endif - }else if (unlikely (mlx5e_ipsec_eseg_meta (eseg))) { -ipsec_txwqe_build_eseg_csum (sq, skb, eseg); }else sq->stats->csum_none++; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 57/169 drm/panel: ilitek-ili9881c: Fix sync for Feixin K101-IM2BYL02 panel
In reply to Greg Kroah-HartmanFrom: Dan Johansen <[email protected]>
[ Upstream commit 772970620a839141835eaf2bc507d957b10adcca ]
This adjusts sync values according to the datasheet
--- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +6 -6
@@ -590,14 +590,14 @@ static const struct drm_display_mode k101_im2byl02_default_mode = { .clock = 69700, .hdisplay = 800, - .hsync_start = 800 + 6, - .hsync_end = 800 + 6 + 15, - .htotal = 800 + 6 + 15 + 16, + .hsync_start = 800 + 52, + .hsync_end = 800 + 52 + 8, + .htotal = 800 + 52 + 8 + 48, .vdisplay = 1280, - .vsync_start = 1280 + 8, - .vsync_end = 1280 + 8 + 48, - .vtotal = 1280 + 8 + 48 + 52, + .vsync_start = 1280 + 16, + .vsync_end = 1280 + 16 + 6, + .vtotal = 1280 + 16 + 6 + 15, .width_mm = 135, .height_mm = 217,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 58/169 drm/kmb: Work around for higher system clock
In reply to Greg Kroah-HartmanFrom: Anitha Chrisanthus <[email protected]>
[ Upstream commit 3e4c31e8f70251732529a10934355084c7fab0ac ]
Use a different value for system clock offset in the ppl/llp ratio calculations for clocks higher than 500 Mhz.
--- drivers/gpu/drm/kmb/kmb_dsi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_dsi.c +10 -1
@@ -482,6 +482,10 @@ static u32 mipi_tx_fg_section_cfg(struct kmb_dsi *kmb_dsi,return 0 ; } +#define CLK_DIFF_LOW 50 +#define CLK_DIFF_HI 60 +#define SYSCLK_500 500 +static void mipi_tx_fg_cfg_regs (struct kmb_dsi *kmb_dsi,u8 frame_gen,struct mipi_tx_frame_timing_cfg *fg_cfg) {
@@ -492,7 +496,12 @@ static void mipi_tx_fg_cfg_regs(struct kmb_dsi *kmb_dsi, u8 frame_gen,/* 500 Mhz system clock minus 50 to account for the difference in * MIPI clock speed in RTL tests */ - sysclk = kmb_dsi->sys_clk_mhz -50 ; +if (kmb_dsi->sys_clk_mhz ==SYSCLK_500 ) { + sysclk = kmb_dsi->sys_clk_mhz -CLK_DIFF_LOW ; + }else { +/* 700 Mhz clk*/ + sysclk = kmb_dsi->sys_clk_mhz -CLK_DIFF_HI ; + }/* PPL-Pixel Packing Layer, LLP-Low Level Protocol * Frame genartor timing parameters are clocked on the system clock,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 59/169 drm/kmb: Remove clearing DPHY regs
In reply to Greg Kroah-HartmanFrom: Edmund Dea <[email protected]>
[ Upstream commit 13047a092c6d3f23b7d684b5b3fe46b2b50423b9 ]
Don't clear the shared DPHY registers common to MIPI Rx and MIPI Tx during DSI initialization since this was causing MIPI Rx reset. Rest of the writes are bitwise, so will not affect Mipi Rx side.
--- drivers/gpu/drm/kmb/kmb_dsi.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +0 -5
@@ -1393,11 +1393,6 @@ int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode, mipi_tx_init_cfg.lane_rate_mbps = data_rate; } -kmb_write_mipi (kmb_dsi,DPHY_ENABLE ,0 ); -kmb_write_mipi (kmb_dsi,DPHY_INIT_CTRL0 ,0 ); -kmb_write_mipi (kmb_dsi,DPHY_INIT_CTRL1 ,0 ); -kmb_write_mipi (kmb_dsi,DPHY_INIT_CTRL2 ,0 ); -/* Initialize mipi controller */ mipi_tx_init_cntrl (kmb_dsi, &mipi_tx_init_cfg);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 60/169 drm/kmb: Disable change of plane parameters
In reply to Greg Kroah-HartmanFrom: Edmund Dea <[email protected]>
[ Upstream commit 982f8ad666a1123028a077b6b009871a0dc9df26 ]
Due to HW limitations, KMB cannot change height, width, or pixel format after initial plane configuration.
v2: removed memset disp_cfg as it is already zero.
--- drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_plane.c | 43 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/kmb/kmb_plane.h | 6 +++++ 3 files changed, 49 insertions(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -45,6 +45,7 @@ struct kmb_drm_private {spinlock_t irq_lock;int irq_lcd;int sys_clk_mhz; +struct disp_cfg init_disp_cfg[KMB_MAX_PLANES ];struct layer_status plane_status[KMB_MAX_PLANES ];int kmb_under_flow;int kmb_flush_done;
drivers/gpu/drm/kmb/kmb_plane.c +42 -1
86 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h +6 -0
@@ -62,6 +62,12 @@ struct layer_status { u32 ctrl; }; +struct disp_cfg { +unsigned int width; +unsigned int height; +unsigned int format; +}; +struct kmb_plane *kmb_plane_init (struct drm_device *drm);void kmb_plane_destroy (struct drm_plane *plane);#endif /* __KMB_PLANE_H__ */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 61/169 drm/kmb: Corrected typo in handle_lcd_irq
In reply to Greg Kroah-HartmanFrom: Anitha Chrisanthus <[email protected]>
[ Upstream commit 004d2719806fb8e355c1bccd538e82c04319d391 ]
Check for Overflow bits for layer3 in the irq handler.
--- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_drv.c +1 -1
@@ -381,7 +381,7 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev)if (val &LAYER3_DMA_FIFO_UNDERFLOW )drm_dbg (&kmb->drm,"LAYER3:GL1 DMA UNDERFLOW val = 0x%lx" , val); -if (val &LAYER3_DMA_FIFO_UNDERFLOW ) +if (val &LAYER3_DMA_FIFO_OVERFLOW )drm_dbg (&kmb->drm,"LAYER3:GL1 DMA OVERFLOW val = 0x%lx" , val); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 62/169 drm/kmb: Enable ADV bridge after modeset
In reply to Greg Kroah-HartmanFrom: Anitha Chrisanthus <[email protected]>
[ Upstream commit 74056092ff415e7e20ce2544689b32ee811c4f0b ]
On KMB, ADV bridge must be programmed and powered on prior to MIPI DSI HW initialization.
v2: changed to atomic_bridge_chain_enable (Sam)
--- drivers/gpu/drm/kmb/kmb_crtc.c | 7 ++++--- drivers/gpu/drm/kmb/kmb_dsi.c | 9 +++++---- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +4 -3
@@ -66,7 +66,8 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = { .disable_vblank = kmb_crtc_disable_vblank, }; -static void kmb_crtc_set_mode (struct drm_crtc *crtc) +static void kmb_crtc_set_mode (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) {struct drm_device *dev = crtc->dev;struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -75,7 +76,7 @@ static void kmb_crtc_set_mode(struct drm_crtc *crtc)unsigned int val =0 ;/* Initialize mipi */ -kmb_dsi_mode_set (kmb->kmb_dsi, m, kmb->sys_clk_mhz); +kmb_dsi_mode_set (kmb->kmb_dsi, m, kmb->sys_clk_mhz, old_state); drm_info(dev, "vfp= %d vbp= %d vsync_len=%d hfp=%d hbp=%d hsync_len=%d\n", m->crtc_vsync_start - m->crtc_vdisplay,
@@ -138,7 +139,7 @@ static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,struct kmb_drm_private *kmb =crtc_to_kmb_priv (crtc);clk_prepare_enable (kmb->kmb_clk.clk_lcd); -kmb_crtc_set_mode (crtc); +kmb_crtc_set_mode (crtc, state);drm_crtc_vblank_on (crtc); }
drivers/gpu/drm/kmb/kmb_dsi.c +5 -4
@@ -1331,7 +1331,8 @@ static u32 mipi_tx_init_dphy(struct kmb_dsi *kmb_dsi,return 0 ; } -static void connect_lcd_to_mipi (struct kmb_dsi *kmb_dsi) +static void connect_lcd_to_mipi (struct kmb_dsi *kmb_dsi, +struct drm_atomic_state *old_state) {struct regmap *msscam;
@@ -1340,7 +1341,7 @@ static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi)dev_dbg (kmb_dsi->dev,"failed to get msscam syscon" );return ; } - +drm_atomic_bridge_chain_enable (adv_bridge, old_state);/* DISABLE MIPI->CIF CONNECTION */ regmap_write (msscam,MSS_MIPI_CIF_CFG ,0 );
@@ -1351,7 +1352,7 @@ static void connect_lcd_to_mipi(struct kmb_dsi *kmb_dsi) }int kmb_dsi_mode_set (struct kmb_dsi *kmb_dsi,struct drm_display_mode *mode, -int sys_clk_mhz) +int sys_clk_mhz,struct drm_atomic_state *old_state) {u64 data_rate;
@@ -1399,7 +1400,7 @@ int kmb_dsi_mode_set(struct kmb_dsi *kmb_dsi, struct drm_display_mode *mode,/* Dphy initialization */ mipi_tx_init_dphy (kmb_dsi, &mipi_tx_init_cfg); -connect_lcd_to_mipi (kmb_dsi); +connect_lcd_to_mipi (kmb_dsi, old_state);dev_info (kmb_dsi->dev,"mipi hw initialized" );return 0 ;
drivers/gpu/drm/kmb/kmb_dsi.h +1 -1
@@ -380,7 +380,7 @@ int kmb_dsi_host_bridge_init(struct device *dev);struct kmb_dsi *kmb_dsi_init (struct platform_device *pdev);void kmb_dsi_host_unregister (struct kmb_dsi *kmb_dsi);int kmb_dsi_mode_set (struct kmb_dsi *kmb_dsi,struct drm_display_mode *mode, -int sys_clk_mhz); +int sys_clk_mhz,struct drm_atomic_state *old_state);int kmb_dsi_map_mmio (struct kmb_dsi *kmb_dsi);int kmb_dsi_clk_init (struct kmb_dsi *kmb_dsi);int kmb_dsi_encoder_init (struct drm_device *dev,struct kmb_dsi *kmb_dsi);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 63/169 net: enetc: fix ethtool counter name for PM0_TERR
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit fb8dc5fc8cbdfd62ecd16493848aee2f42ed84d9 ]
There are two counters named "MAC tx frames", one of them is actually incorrect. The correct name for that counter should be "MAC tx error frames", which is symmetric to the existing "MAC rx error frames".
--- drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +1 -1
@@ -157,7 +157,7 @@ static const struct { { ENETC_PM0_TFRM, "MAC tx frames" }, { ENETC_PM0_TFCS, "MAC tx fcs errors" }, { ENETC_PM0_TVLAN, "MAC tx VLAN frames" }, - { ENETC_PM0_TERR, "MAC tx frames" }, + { ENETC_PM0_TERR, "MAC tx frame errors" }, { ENETC_PM0_TUCA, "MAC tx unicast frames" }, { ENETC_PM0_TMCA, "MAC tx multicast frames" }, { ENETC_PM0_TBCA, "MAC tx broadcast frames" },
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 64/169 net: enetc: make sure all traffic classes can send large frames
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit e378f4967c8edd64c680f2e279cb646ee06b6f2d ]
The enetc driver does not implement .ndo_change_mtu, instead it configures the MAC register field PTC{Traffic Class}MSDUR[MAXSDU] statically to a large value during probe time.
The driver used to configure only the max SDU for traffic class 0, and that was fine while the driver could only use traffic class 0. But with the introduction of mqprio, sending a large frame into any other TC than 0 is broken.
This patch fixes that by replicating per traffic class the static configuration done in enetc_configure_port_mac().
--- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_pf.c +4 -1
@@ -517,10 +517,13 @@ static void enetc_port_si_configure(struct enetc_si *si)static void enetc_configure_port_mac (struct enetc_hw *hw) { +int tc; +enetc_port_wr (hw,ENETC_PM0_MAXFRM ,ENETC_SET_MAXFRM (ENETC_RX_MAXFRM_SIZE )); -enetc_port_wr (hw,ENETC_PTCMSDUR (0 ),ENETC_MAC_MAXFRM_SIZE ); +for (tc =0 ; tc <8 ; tc++) +enetc_port_wr (hw,ENETC_PTCMSDUR (tc),ENETC_MAC_MAXFRM_SIZE );enetc_port_wr (hw,ENETC_PM0_CMD_CFG ,ENETC_PM0_CMD_PHY_TX_EN |ENETC_PM0_CMD_TXP |ENETC_PM0_PROMISC );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 65/169 can: rcar_can: fix suspend/resume
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit f7c05c3987dcfde9a4e8c2d533db013fabebca0d upstream.
If the driver was not opened, rcar_can_suspend() should not call clk_disable() because the clock was not enabled.
--- drivers/net/can/rcar/rcar_can.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/net/can/rcar/rcar_can.c +12 -8
@@ -846,10 +846,12 @@ static int __maybe_unused rcar_can_suspestruct rcar_can_priv *priv =netdev_priv (ndev);u16 ctlr; -if (netif_running (ndev)) { -netif_stop_queue (ndev); -netif_device_detach (ndev); - } +if (!netif_running (ndev)) +return 0 ; + +netif_stop_queue (ndev); +netif_device_detach (ndev); + ctlr =readw (&priv->regs->ctlr); ctlr |=RCAR_CAN_CTLR_CANM_HALT ;writew (ctlr, &priv->regs->ctlr);
@@ -868,6 +870,9 @@ static int __maybe_unused rcar_can_resumu16 ctlr;int err; +if (!netif_running (ndev)) +return 0 ; + err =clk_enable (priv->clk);if (err) {netdev_err (ndev,"clk_enable() failed, error %d\n" , err);
@@ -881,10 +886,9 @@ static int __maybe_unused rcar_can_resumwritew (ctlr, &priv->regs->ctlr); priv->can.state =CAN_STATE_ERROR_ACTIVE ; -if (netif_running (ndev)) { -netif_device_attach (ndev); -netif_start_queue (ndev); - } +netif_device_attach (ndev); +netif_start_queue (ndev); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 66/169 can: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notification
In reply to Greg Kroah-HartmanFrom: Stephane Grosjean <[email protected]>
commit 3d031abc7e7249573148871180c28ecedb5e27df upstream.
This corrects the lack of notification of a return to ERROR_ACTIVE state for USB - CANFD devices from PEAK-System.
--- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/can/usb/peak_usb/pcan_usb_fd.c +2 -3
@@ -551,11 +551,10 @@ static int pcan_usb_fd_decode_status(str }else if (sm->channel_p_w_b &PUCAN_BUS_WARNING ) { new_state =CAN_STATE_ERROR_WARNING ; }else { -/* no error bit (so, no error skb, back to active state) */ - dev->can.state =CAN_STATE_ERROR_ACTIVE ; +/* back to (or still in) ERROR_ACTIVE state */ + new_state =CAN_STATE_ERROR_ACTIVE ; pdev->bec.txerr =0 ; pdev->bec.rxerr =0 ; -return 0 ; }/* state hasn't changed */
Greg Kroah-Hartman
maintainerPATCH 67/169 can: peak_pci: peak_pci_remove(): fix UAF
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
commit 949fe9b35570361bc6ee2652f89a0561b26eec98 upstream.
When remove the module peek_pci, referencing 'chan' again after releasing 'dev' will cause UAF.
Fix this by releasing 'dev' later.
The following log reveals it:
[ 35.961814 ] BUG: KASAN: use-after-free in peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.963414 ] Read of size 8 at addr ffff888136998ee8 by task modprobe/5537 [ 35.965513 ] Call Trace: [ 35.965718 ] dump_stack_lvl+0xa8/0xd1 [ 35.966028 ] print_address_description+0x87/0x3b0 [ 35.966420 ] kasan_report+0x172/0x1c0 [ 35.966725 ] ? peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.967137 ] ? trace_irq_enable_rcuidle+0x10/0x170 [ 35.967529 ] ? peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.967945 ] __asan_report_load8_noabort+0x14/0x20 [ 35.968346 ] peak_pci_remove+0x16f/0x270 [peak_pci] [ 35.968752 ] pci_device_remove+0xa9/0x250
--- drivers/net/can/sja1000/peak_pci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/can/sja1000/peak_pci.c +4 -5
@@ -729,16 +729,15 @@ static void peak_pci_remove(struct pci_dstruct net_device *prev_dev = chan->prev_dev;dev_info (&pdev->dev,"removing device %s\n" , dev->name); +/* do that only for first channel */ +if (!prev_dev && chan->pciec_card) +peak_pciec_remove (chan->pciec_card);unregister_sja1000dev (dev);free_sja1000dev (dev); dev = prev_dev; -if (!dev) { -/* do that only for first channel */ -if (chan->pciec_card) -peak_pciec_remove (chan->pciec_card); +if (!dev)break ; - } priv =netdev_priv (dev); chan = priv->priv; }
Greg Kroah-Hartman
maintainerPATCH 68/169 can: isotp: isotp_sendmsg(): fix return error on FC timeout on TX path
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit d674a8f123b4096d85955c7eaabec688f29724c9 upstream.
When the a large chunk of data send and the receiver does not send a Flow Control frame back in time, the sendmsg() does not return a error code, but the number of bytes sent corresponding to the size of the packet.
If a timeout occurs the isotp_tx_timer_handler() is fired, sets sk->sk_err and calls the sk->sk_error_report() function. It was wrongly expected that the error would be propagated to user space in every case. For isotp_sendmsg() blocking on wait_event_interruptible() this is not the case.
This patch fixes the problem by checking if sk->sk_err is set and returning the error to user space.
--- net/can/isotp.c | 3 +++ 1 file changed, 3 insertions(+)
net/can/isotp.c +3 -0
@@ -960,6 +960,9 @@ static int isotp_sendmsg(struct socket *if (wait_tx_done) {/* wait for complete transmission of current pdu */ wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); + +if (sk->sk_err) +return -sk->sk_err; }return size;
Greg Kroah-Hartman
maintainerPATCH 69/169 can: isotp: isotp_sendmsg(): add result check for wait_event_interruptible()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit 9acf636215a6ce9362fe618e7da4913b8bfe84c8 upstream.
Using wait_event_interruptible() to wait for complete transmission, but do not check the result of wait_event_interruptible() which can be interrupted. It will result in TX buffer has multiple accessors and the later process interferes with the previous process.
Following is one of the problems reported by syzbot.
=============================================================
WARNING: CPU: 0 PID: 0 at net/can/isotp.c:840 isotp_tx_timer_handler+0x2e0/0x4c0 CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.13.0-rc7+ #68 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1 04/01/2014 RIP: 0010:isotp_tx_timer_handler+0x2e0/0x4c0 Call Trace: <IRQ> ? isotp_setsockopt+0x390/0x390 __hrtimer_run_queues+0xb8/0x610 hrtimer_run_softirq+0x91/0xd0 ? rcu_read_lock_sched_held+0x4d/0x80 __do_softirq+0xe8/0x553 irq_exit_rcu+0xf8/0x100 sysvec_apic_timer_interrupt+0x9e/0xc0 </IRQ> asm_sysvec_apic_timer_interrupt+0x12/0x20
Add result check for wait_event_interruptible() in isotp_sendmsg() to avoid multiple accessers for tx buffer.
--- net/can/isotp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/can/isotp.c +3 -1
@@ -865,7 +865,9 @@ static int isotp_sendmsg(struct socket *return -EAGAIN ;/* wait for complete transmission of current pdu */ -wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); + err =wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE ); +if (err) +return err; }if (!size || size >MAX_MSG_LENGTH )
Greg Kroah-Hartman
maintainerPATCH 70/169 can: isotp: isotp_sendmsg(): fix TX buffer concurrent access in isotp_sendmsg()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit 43a08c3bdac4cb42eff8fe5e2278bffe0c5c3daa upstream.
When isotp_sendmsg() concurrent, tx.state of all TX processes can be ISOTP_IDLE. The conditions so->tx.state != ISOTP_IDLE and wq_has_sleeper(&so->wait) can not protect TX buffer from being accessed by multiple TX processes.
We can use cmpxchg() to try to modify tx.state to ISOTP_SENDING firstly. If the modification of the previous process succeed, the later process must wait tx.state to ISOTP_IDLE firstly. Thus, we can ensure TX buffer is accessed by only one process at the same time. And we should also restore the original tx.state at the subsequent error processes.
--- net/can/isotp.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)
net/can/isotp.c +31 -15
@@ -121,7 +121,7 @@ enum {struct tpcon {int idx;int len; -u8 state; +u32 state;u8 bs;u8 sn;u8 ll_dl;
@@ -848,6 +848,7 @@ static int isotp_sendmsg(struct socket * {struct sock *sk = sock->sk;struct isotp_sock *so =isotp_sk (sk); +u32 old_state = so->tx.state;struct sk_buff *skb;struct net_device *dev;struct canfd_frame *cf;
@@ -860,47 +861,55 @@ static int isotp_sendmsg(struct socket *return -EADDRNOTAVAIL ;/* we do not support multiple buffers - for now */ -if (so->tx.state !=ISOTP_IDLE ||wq_has_sleeper (&so->wait)) { -if (msg->msg_flags &MSG_DONTWAIT ) -return -EAGAIN ; +if (cmpxchg (&so->tx.state,ISOTP_IDLE ,ISOTP_SENDING ) !=ISOTP_IDLE || +wq_has_sleeper (&so->wait)) { +if (msg->msg_flags &MSG_DONTWAIT ) { + err = -EAGAIN ; + goto err_out; + }/* wait for complete transmission of current pdu */ err =wait_event_interruptible (so->wait, so->tx.state ==ISOTP_IDLE );if (err) -return err; + goto err_out; } -if (!size || size >MAX_MSG_LENGTH ) -return -EINVAL ; +if (!size || size >MAX_MSG_LENGTH ) { + err = -EINVAL ; + goto err_out; + }/* take care of a potential SF_DL ESC offset for TX_DL > 8 */ off = (so->tx.ll_dl >CAN_MAX_DLEN ) ?1 :0 ;/* does the given data fit into a single frame for SF_BROADCAST? */ if ((so->opt.flags &CAN_ISOTP_SF_BROADCAST ) && - (size > so->tx.ll_dl -SF_PCI_SZ4 - ae - off)) -return -EINVAL ; + (size > so->tx.ll_dl -SF_PCI_SZ4 - ae - off)) { + err = -EINVAL ; + goto err_out; + } err =memcpy_from_msg (so->tx.buf, msg, size);if (err <0 ) -return err; + goto err_out; dev =dev_get_by_index (sock_net (sk), so->ifindex); -if (!dev) -return -ENXIO ; +if (!dev) { + err = -ENXIO ; + goto err_out; + } skb =sock_alloc_send_skb (sk, so->ll.mtu +sizeof (struct can_skb_priv ), msg->msg_flags &MSG_DONTWAIT , &err);if (!skb) {dev_put (dev); -return err; + goto err_out; }can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;can_skb_prv (skb)->skbcnt =0 ; - so->tx.state =ISOTP_SENDING ; so->tx.len = size; so->tx.idx =0 ;
@@ -956,7 +965,7 @@ static int isotp_sendmsg(struct socket *if (err) {pr_notice_once ("can-isotp: %s: can_send_ret %pe\n" , __func__,ERR_PTR (err)); -return err; + goto err_out; }if (wait_tx_done) {
@@ -968,6 +977,13 @@ static int isotp_sendmsg(struct socket * }return size; + +err_out: + so->tx.state = old_state; +if (so->tx.state ==ISOTP_IDLE ) +wake_up_interruptible (&so->wait); + +return err; } static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
Greg Kroah-Hartman
maintainerPATCH 71/169 can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit b504a884f6b5a77dac7d580ffa08e482f70d1a30 upstream.
When the session state is J1939_SESSION_DONE, j1939_tp_rxtimer() will give an alert "rx timeout, send abort", but do nothing actually. Move the alert into session active judgment condition, it is more reasonable.
One of the scenarios is that j1939_tp_rxtimer() execute followed by j1939_xtp_rx_abort_one(). After j1939_xtp_rx_abort_one(), the session state is J1939_SESSION_DONE, then j1939_tp_rxtimer() give an alert.
--- net/can/j1939/transport.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/can/j1939/transport.c +2 -3
@@ -1230,12 +1230,11 @@ static enum hrtimer_restart j1939_tp_rxt session->err = -ETIME ;j1939_session_deactivate (session); }else { -netdev_alert (priv->ndev,"%s: 0x%p: rx timeout, send abort\n" , - __func__, session); -j1939_session_list_lock (session->priv);if (session->state >=J1939_SESSION_ACTIVE && session->state <J1939_SESSION_ACTIVE_MAX ) { +netdev_alert (priv->ndev,"%s: 0x%p: rx timeout, send abort\n" , + __func__, session);j1939_session_get (session); hrtimer_start(&session->rxtimer, ms_to_ktime(J1939_XTP_ABORT_TIMEOUT_MS),
Greg Kroah-Hartman
maintainerPATCH 72/169 can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit d9d52a3ebd284882f5562c88e55991add5d01586 upstream.
It will trigger UAF for rx_kref of j1939_priv as following.
cpu0 cpu1j1939_sk_bind(socket0, ndev0, ...)j1939_netdev_start
j1939_sk_bind(socket1, ndev0, ...)
j1939_netdev_start
j1939_priv_set
j1939_priv_get_by_ndev_lockedj1939_jsk_add
.....j1939_netdev_stopkref_put_lock(&priv->rx_kref, ...)
kref_get(&priv->rx_kref, ...)
REFCOUNT_WARN("addition on 0;...")====================================================refcount_t: addition on 0; use-after-free.
WARNING: CPU: 1 PID: 20874 at lib/refcount.c:25 refcount_warn_saturate+0x169/0x1e0 RIP: 0010:refcount_warn_saturate+0x169/0x1e0 Call Trace: j1939_netdev_start+0x68b/0x920 j1939_sk_bind+0x426/0xeb0 ? security_socket_bind+0x83/0xb0
The rx_kref's kref_get() and kref_put() should use j1939_netdev_lock to protect.
--- net/can/j1939/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/can/j1939/main.c +5 -2
@@ -249,11 +249,14 @@ struct j1939_priv *j1939_netdev_start(ststruct j1939_priv *priv, *priv_new;int ret; - priv =j1939_priv_get_by_ndev (ndev); +spin_lock (&j1939_netdev_lock); + priv =j1939_priv_get_by_ndev_locked (ndev);if (priv) {kref_get (&priv->rx_kref); +spin_unlock (&j1939_netdev_lock);return priv; } +spin_unlock (&j1939_netdev_lock); priv =j1939_priv_create (ndev);if (!priv)
@@ -269,10 +272,10 @@ struct j1939_priv *j1939_netdev_start(st/* Someone was faster than us, use their priv and roll * back our's. */ +kref_get (&priv_new->rx_kref);spin_unlock (&j1939_netdev_lock);dev_put (ndev);kfree (priv); -kref_get (&priv_new->rx_kref);return priv_new; }j1939_priv_set (ndev, priv);
Greg Kroah-Hartman
maintainerPATCH 73/169 can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error length
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit 379743985ab6cfe2cbd32067cf4ed497baca6d06 upstream.
According to SAE-J1939-21, the data length of TP.DT must be 8 bytes, so cancel session when receive unexpected TP.DT message.
--- net/can/j1939/transport.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/can/j1939/transport.c +5 -2
@@ -1770,6 +1770,7 @@ static void j1939_xtp_rx_dpo(struct j193static void j1939_xtp_rx_dat_one (struct j1939_session *session,struct sk_buff *skb) { +enum j1939_xtp_abort abort =J1939_XTP_ABORT_FAULT ;struct j1939_priv *priv = session->priv;struct j1939_sk_buff_cb *skcb;struct sk_buff *se_skb =NULL ;
@@ -1784,9 +1785,11 @@ static void j1939_xtp_rx_dat_one(struct skcb =j1939_skb_to_cb (skb); dat = skb->data; -if (skb->len <=1 ) +if (skb->len !=8 ) {/* makes no sense */ + abort =J1939_XTP_ABORT_UNEXPECTED_DATA ; goto out_session_cancel; + }switch (session->last_cmd) {case 0xff :
@@ -1884,7 +1887,7 @@ static void j1939_xtp_rx_dat_one(struct out_session_cancel:kfree_skb (se_skb);j1939_session_timers_cancel (session); -j1939_session_cancel (session,J1939_XTP_ABORT_FAULT ); +j1939_session_cancel (session, abort);j1939_session_put (session); }
Greg Kroah-Hartman
maintainerPATCH 74/169 can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes
In reply to Greg Kroah-HartmanFrom: Zhang Changzhong <[email protected]>
commit a4fbe70c5cb746441d56b28cf88161d9e0e25378 upstream.
The receiver should abort TP if 'total message size' in TP.CM_RTS and TP.CM_BAM is less than 9 or greater than 1785 [1], but currently the j1939 stack only checks the upper bound and the receiver will accept the following broadcast message:
vcan1 18ECFF00 [8] 20 08 00 02 FF 00 23 01 vcan1 18EBFF00 [8] 01 00 00 00 00 00 00 00 vcan1 18EBFF00 [8] 02 00 FF FF FF FF FF FF
This patch adds check for the lower bound and abort illegal TP.
[1] SAE-J1939-82 A.3.4 Row 2 and A.3.6 Row 6.
--- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/transport.c | 2 ++ 2 files changed, 3 insertions(+)
net/can/j1939/j1939-priv.h +1 -0
@@ -326,6 +326,7 @@ int j1939_session_activate(struct j1939_void j1939_tp_schedule_txtimer (struct j1939_session *session,int msec);void j1939_session_timers_cancel (struct j1939_session *session); +#define J1939_MIN_TP_PACKET_SIZE 9#define J1939_MAX_TP_PACKET_SIZE (7 * 0xff)#define J1939_MAX_ETP_PACKET_SIZE (7 * 0x00ffffff)
net/can/j1939/transport.c +2 -0
@@ -1596,6 +1596,8 @@ j1939_session *j1939_xtp_rx_rts_session_ abort =J1939_XTP_ABORT_FAULT ; else if (len > priv->tp_max_packet_size) abort =J1939_XTP_ABORT_RESOURCE ; + else if (len < J1939_MIN_TP_PACKET_SIZE) + abort =J1939_XTP_ABORT_FAULT ; }if (abort !=J1939_XTP_NO_ABORT ) {
Greg Kroah-Hartman
maintainerPATCH 75/169 ceph: skip existing superblocks that are blocklisted or shut down when mounting
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 98d0a6fb7303a6f4a120b8b8ed05b86ff5db53e8 upstream.
Currently when mounting, we may end up finding an existing superblock that corresponds to a blocklisted MDS client. This means that the new mount ends up being unusable.
If we've found an existing superblock with a client that is already blocklisted, and the client is not configured to recover on its own, fail the match. Ditto if the superblock has been forcibly unmounted.
While we're in here, also rename "other" to the more conventional "fsc".
Cc: [email protected]
URL: https://bugzilla.redhat.com/show_bug.cgi?id=1901499
--- fs/ceph/super.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
fs/ceph/super.c +14 -3
@@ -1002,16 +1002,16 @@ static int ceph_compare_super(struct supstruct ceph_fs_client *new = fc->s_fs_info;struct ceph_mount_options *fsopt = new->mount_options;struct ceph_options *opt = new->client->options; -struct ceph_fs_client *other =ceph_sb_to_client (sb); +struct ceph_fs_client *fsc =ceph_sb_to_client (sb);dout ("ceph_compare_super %p\n" , sb); -if (compare_mount_options (fsopt, opt, other)) { +if (compare_mount_options (fsopt, opt, fsc)) {dout ("monitor(s)/mount options don't match\n" );return 0 ; }if ((opt->flags &CEPH_OPT_FSID ) && -ceph_fsid_compare (&opt->fsid, &other->client->fsid)) { +ceph_fsid_compare (&opt->fsid, &fsc->client->fsid)) {dout ("fsid doesn't match\n" );return 0 ; }
@@ -1019,6 +1019,17 @@ static int ceph_compare_super(struct supdout ("flags differ\n" );return 0 ; } + +if (fsc->blocklisted && !ceph_test_mount_opt (fsc,CLEANRECOVER )) { +dout ("client is blocklisted (and CLEANRECOVER is not set)\n" ); +return 0 ; + } + +if (fsc->mount_state ==CEPH_MOUNT_SHUTDOWN ) { +dout ("client has been forcibly unmounted\n" ); +return 0 ; + } +return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 76/169 ceph: fix handling of "meta" errors
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
commit 1bd85aa65d0e7b5e4d09240f492f37c569fdd431 upstream.
Currently, we check the wb_err too early for directories, before all of the unsafe child requests have been waited on. In order to fix that we need to check the mapping->wb_err later nearer to the end of ceph_fsync.
We also have an overly-complex method for tracking errors after blocklisting. The errors recorded in cleanup_session_requests go to a completely separate field in the inode, but we end up reporting them the same way we would for any other error (in fsync).
There's no real benefit to tracking these errors in two different places, since the only reporting mechanism for them is in fsync, and we'd need to advance them both every time.
Given that, we can just remove i_meta_err, and convert the places that used it to instead just use mapping->wb_err instead. That also fixes the original problem by ensuring that we do a check_and_advance of the wb_err at the end of the fsync op.
Cc: [email protected]
URL: https://tracker.ceph.com/issues/52864
--- fs/ceph/caps.c | 12 +++--------- fs/ceph/file.c | 1 - fs/ceph/inode.c | 2 -- fs/ceph/mds_client.c | 17 +++++------------ fs/ceph/super.h | 3 --- 5 files changed, 8 insertions(+), 27 deletions(-)
fs/ceph/caps.c +3 -9
@@ -2264,7 +2264,6 @@ static int unsafe_request_wait(struct inint ceph_fsync (struct file *file,loff_t start,loff_t end,int datasync) { -struct ceph_file_info *fi = file->private_data;struct inode *inode = file->f_mapping->host;struct ceph_inode_info *ci =ceph_inode (inode);u64 flush_tid;
@@ -2299,14 +2298,9 @@ int ceph_fsync(struct file *file, loff_tif (err <0 ) ret = err; -if (errseq_check (&ci->i_meta_err,READ_ONCE (fi->meta_err))) { -spin_lock (&file->f_lock); - err =errseq_check_and_advance (&ci->i_meta_err, - &fi->meta_err); -spin_unlock (&file->f_lock); -if (err <0 ) - ret = err; - } + err =file_check_and_advance_wb_err (file); +if (err <0 ) + ret = err; out:dout ("fsync %p%s result=%d\n" , inode, datasync ?" datasync" :"" , ret);return ret;
fs/ceph/file.c +0 -1
@@ -233,7 +233,6 @@ static int ceph_init_file_info(struct inspin_lock_init (&fi->rw_contexts_lock);INIT_LIST_HEAD (&fi->rw_contexts); - fi->meta_err =errseq_sample (&ci->i_meta_err); fi->filp_gen =READ_ONCE (ceph_inode_to_client (inode)->filp_gen);return 0 ;
fs/ceph/inode.c +0 -2
@@ -541,8 +541,6 @@ struct inode *ceph_alloc_inode(struct suceph_fscache_inode_init (ci); - ci->i_meta_err =0 ; -return &ci->vfs_inode; }
fs/ceph/mds_client.c +5 -12
@@ -1479,7 +1479,6 @@ static void cleanup_session_requests(str {struct ceph_mds_request *req;struct rb_node *p; -struct ceph_inode_info *ci;dout ("cleanup_session_requests mds%d\n" , session->s_mds);mutex_lock (&mdsc->mutex);
@@ -1488,16 +1487,10 @@ static void cleanup_session_requests(str struct ceph_mds_request, r_unsafe_item);pr_warn_ratelimited (" dropping unsafe request %llu\n" , req->r_tid); -if (req->r_target_inode) { -/* dropping unsafe change of inode's attributes */ - ci =ceph_inode (req->r_target_inode); -errseq_set (&ci->i_meta_err, -EIO ); - } -if (req->r_unsafe_dir) { -/* dropping unsafe directory operation */ - ci =ceph_inode (req->r_unsafe_dir); -errseq_set (&ci->i_meta_err, -EIO ); - } +if (req->r_target_inode) +mapping_set_error (req->r_target_inode->i_mapping, -EIO ); +if (req->r_unsafe_dir) +mapping_set_error (req->r_unsafe_dir->i_mapping, -EIO );__unregister_request (mdsc, req); }/* zero r_attempts, so kick_requests() will re-send requests */
@@ -1664,7 +1657,7 @@ static int remove_session_caps_cb(structspin_unlock (&mdsc->cap_dirty_lock);if (dirty_dropped) { -errseq_set (&ci->i_meta_err, -EIO ); +mapping_set_error (inode->i_mapping, -EIO ); if (ci->i_wrbuffer_ref_head == 0 && ci->i_wr_ref == 0 &&
fs/ceph/super.h +0 -3
@@ -430,8 +430,6 @@ struct ceph_inode_info {#ifdef CONFIG_CEPH_FSCACHE struct fscache_cookie *fscache;#endif -errseq_t i_meta_err; -struct inode vfs_inode;/* at end */ };
@@ -775,7 +773,6 @@ struct ceph_file_info {spinlock_t rw_contexts_lock;struct list_head rw_contexts; -errseq_t meta_err;u32 filp_gen;atomic_t num_locks; };
Greg Kroah-Hartman
maintainerPATCH 77/169 tracing: Have all levels of checks prevent recursion
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit ed65df63a39a3f6ed04f7258de8b6789e5021c18 upstream.
While writing an email explaining the "bit = 0" logic for a discussion on making ftrace_test_recursion_trylock() disable preemption, I discovered a path that makes the "not do the logic if bit is zero" unsafe.
The recursion logic is done in hot paths like the function tracer. Thus, any code executed causes noticeable overhead. Thus, tricks are done to try to limit the amount of code executed. This included the recursion testing logic.
Having recursion testing is important, as there are many paths that can end up in an infinite recursion cycle when tracing every function in the kernel. Thus protection is needed to prevent that from happening.
Because it is OK to recurse due to different running context levels (e.g. an interrupt preempts a trace, and then a trace occurs in the interrupt handler), a set of bits are used to know which context one is in (normal, softirq, irq and NMI). If a recursion occurs in the same level, it is prevented*.
Then there are infrastructure levels of recursion as well. When more than one callback is attached to the same function to trace, it calls a loop function to iterate over all the callbacks. Both the callbacks and the loop function have recursion protection. The callbacks use the "ftrace_test_recursion_trylock()" which has a "function" set of context bits to test, and the loop function calls the internal trace_test_and_set_recursion() directly, with an "internal" set of bits.
If an architecture does not implement all the features supported by ftrace then the callbacks are never called directly, and the loop function is called instead, which will implement the features of ftrace.
Since both the loop function and the callbacks do recursion protection, it was seemed unnecessary to do it in both locations. Thus, a trick was made to have the internal set of recursion bits at a more significant bit location than the function bits. Then, if any of the higher bits were set, the logic of the function bits could be skipped, as any new recursion would first have to go through the loop function.
This is true for architectures that do not support all the ftrace features, because all functions being traced must first go through the loop function before going to the callbacks. But this is not true for architectures that support all the ftrace features. That's because the loop function could be called due to two callbacks attached to the same function, but then a recursion function inside the callback could be called that does not share any other callback, and it will be called directly.
i.e.
traced_function_1: [ more than one callback tracing it ]
call loop_func
loop_func:
trace_recursion set internal bit
call callback
callback:
trace_recursion [ skipped because internal bit is set, return 0 ] call traced_function_2
traced_function_2: [ only traced by above callback ]
call callback
callback:
trace_recursion [ skipped because internal bit is set, return 0 ] call traced_function_2
[ wash, rinse, repeat, BOOM! out of shampoo! ]
Thus, the "bit == 0 skip" trick is not safe, unless the loop function is call for all functions.
Since we want to encourage architectures to implement all ftrace features, having them slow down due to this extra logic may encourage the maintainers to update to the latest ftrace features. And because this logic is only safe for them, remove it completely.
[*] There is on layer of recursion that is allowed, and that is to allow
for the transition between interrupt context (normal -> softirq ->
irq -> NMI), because a trace may occur before the context update is
visible to the trace recursion logic.--- include/linux/trace_recursion.h | 49 +++++++--------------------------------- kernel/trace/ftrace.c | 4 +-- 2 files changed, 11 insertions(+), 42 deletions(-)
include/linux/trace_recursion.h +9 -40
@@ -16,23 +16,8 @@* When function tracing occurs, the following steps are made: * If arch does not support a ftrace feature: * call internal function (uses INTERNAL bits) which calls... -* If callback is registered to the "global" list, the list -* function is called and recursion checks the GLOBAL bits. -* then this function calls... * The function callback, which can use the FTRACE bits to * check for recursion. -* -* Now if the arch does not support a feature, and it calls -* the global list function which calls the ftrace callback -* all three of these steps will do a recursion protection. -* There's no reason to do one if the previous caller already -* did. The recursion that we are protecting against will -* go through the same steps again. -* -* To prevent the multiple recursion checks, if a recursion -* bit is set that is higher than the MAX bit of the current -* check, then we know that the check was made by the previous -* caller, and we can skip the current check. */ enum {/* Function recursion bits */
@@ -40,12 +25,14 @@ enum {TRACE_FTRACE_NMI_BIT ,TRACE_FTRACE_IRQ_BIT ,TRACE_FTRACE_SIRQ_BIT , +TRACE_FTRACE_TRANSITION_BIT , -/* INTERNAL_BITs must be greater than FTRACE_BITs */ +/* Internal use recursion bits */ TRACE_INTERNAL_BIT ,TRACE_INTERNAL_NMI_BIT ,TRACE_INTERNAL_IRQ_BIT ,TRACE_INTERNAL_SIRQ_BIT , +TRACE_INTERNAL_TRANSITION_BIT ,TRACE_BRANCH_BIT ,/*
@@ -86,12 +73,6 @@ enum {*/ TRACE_GRAPH_NOTRACE_BIT , -/* -* When transitioning between context, the preempt_count() may -* not be correct. Allow for a single recursion to cover this case. -*/ -TRACE_TRANSITION_BIT , -/* Used to prevent recursion recording from recursing. */ TRACE_RECORD_RECURSION_BIT, };
@@ -113,12 +94,10 @@ enum {#define TRACE_CONTEXT_BITS 4#define TRACE_FTRACE_START TRACE_FTRACE_BIT -#define TRACE_FTRACE_MAX ((1 << (TRACE_FTRACE_START + TRACE_CONTEXT_BITS)) - 1)#define TRACE_LIST_START TRACE_INTERNAL_BIT -#define TRACE_LIST_MAX ((1 << (TRACE_LIST_START + TRACE_CONTEXT_BITS)) - 1) -#define TRACE_CONTEXT_MASK TRACE_LIST_MAX +#define TRACE_CONTEXT_MASK ((1 << (TRACE_LIST_START + TRACE_CONTEXT_BITS)) - 1)/* * Used for setting context
@@ -132,6 +111,7 @@ enum {TRACE_CTX_IRQ ,TRACE_CTX_SOFTIRQ ,TRACE_CTX_NORMAL , + TRACE_CTX_TRANSITION, }; static __always_inline int trace_get_context_bit(void)
@@ -160,45 +140,34 @@ extern void ftrace_record_recursion(unsi#endif static __always_inline int trace_test_and_set_recursion(unsigned long ip, unsigned long pip, -int start,int max) +int start) {unsigned int val =READ_ONCE (current->trace_recursion);int bit; -/* A previous recursion check was made */ -if ((val &TRACE_CONTEXT_MASK ) > max) -return 0 ; - bit =trace_get_context_bit () + start;if (unlikely (val & (1 << bit))) {/* * It could be that preempt_count has not been updated during * a switch between contexts. Allow for a single recursion. */ - bit =TRACE_TRANSITION_BIT ; + bit =TRACE_CTX_TRANSITION + start;if (val & (1 << bit)) {do_ftrace_record_recursion (ip, pip);return -1 ; } - }else { -/* Normal check passed, clear the transition to allow it again */ - val &= ~(1 <<TRACE_TRANSITION_BIT ); } val |=1 << bit; current->trace_recursion = val;barrier (); -return bit +1 ; +return bit; } static __always_inline void trace_clear_recursion(int bit) { -if (!bit) -return ; -barrier (); - bit--;trace_recursion_clear (bit); }
@@ -214,7 +183,7 @@ static __always_inline void trace_clear_ static __always_inline int ftrace_test_recursion_trylock(unsigned long ip,unsigned long parent_ip) { -return trace_test_and_set_recursion (ip, parent_ip,TRACE_FTRACE_START ,TRACE_FTRACE_MAX ); +return trace_test_and_set_recursion (ip, parent_ip,TRACE_FTRACE_START ); }/**
kernel/trace/ftrace.c +2 -2
@@ -6977,7 +6977,7 @@ __ftrace_ops_list_func(unsigned long ip,struct ftrace_ops *op;int bit; - bit =trace_test_and_set_recursion (ip, parent_ip,TRACE_LIST_START ,TRACE_LIST_MAX ); + bit =trace_test_and_set_recursion (ip, parent_ip,TRACE_LIST_START );if (bit <0 )return ;
@@ -7052,7 +7052,7 @@ static void ftrace_ops_assist_func(unsig {int bit; - bit =trace_test_and_set_recursion (ip, parent_ip,TRACE_LIST_START ,TRACE_LIST_MAX ); + bit =trace_test_and_set_recursion (ip, parent_ip,TRACE_LIST_START );if (bit <0 )return ;
Greg Kroah-Hartman
maintainerPATCH 78/169 ocfs2: fix data corruption after conversion from inline format
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 5314454ea3ff6fc746eaf71b9a7ceebed52888fa upstream.
Commit 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()") uncovered a latent bug in ocfs2 conversion from inline inode format to a normal inode format.
The code in ocfs2_convert_inline_data_to_extents() attempts to zero out the whole cluster allocated for file data by grabbing, zeroing, and dirtying all pages covering this cluster. However these pages are beyond i_size, thus writeback code generally ignores these dirty pages and no blocks were ever actually zeroed on the disk.
This oversight was fixed by commit 693c241a5f6a ("ocfs2: No need to zero pages past i_size.") for standard ocfs2 write path, inline conversion path was apparently forgotten; the commit log also has a reasoning why the zeroing actually is not needed.
After commit 6dbf7bb55598, things became worse as writeback code stopped invalidating buffers on pages beyond i_size and thus these pages end up with clean PageDirty bit but with buffers attached to these pages being still dirty. So when a file is converted from inline format, then writeback triggers, and then the file is grown so that these pages become valid, the invalid dirtiness state is preserved, mark_buffer_dirty() does nothing on these pages (buffers are already dirty) but page is never written back because it is clean. So data written to these pages is lost once pages are reclaimed.
Simple reproducer for the problem is:
xfs_io -f -c "pwrite 0 2000" -c "pwrite 2000 2000" -c "fsync" \
-c "pwrite 4000 2000" ocfs2_fileAfter unmounting and mounting the fs again, you can observe that end of 'ocfs2_file' has lost its contents.
Fix the problem by not doing the pointless zeroing during conversion from inline format similarly as in the standard write path.
[[email protected]: fix whitespace, per Joseph]
--- fs/ocfs2/alloc.c | 46 ++++++++++++---------------------------------- 1 file changed, 12 insertions(+), 34 deletions(-)
fs/ocfs2/alloc.c +12 -34
@@ -7045,7 +7045,7 @@ void ocfs2_set_inode_data_inline(structint ocfs2_convert_inline_data_to_extents (struct inode *inode,struct buffer_head *di_bh) { -int ret, i, has_data, num_pages =0 ; +int ret, has_data, num_pages =0 ;int need_free =0 ;u32 bit_off, num;handle_t *handle;
@@ -7054,26 +7054,17 @@ int ocfs2_convert_inline_data_to_extentsstruct ocfs2_super *osb =OCFS2_SB (inode->i_sb);struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;struct ocfs2_alloc_context *data_ac =NULL ; -struct page **pages =NULL ; -loff_t end = osb->s_clustersize; +struct page *page =NULL ;struct ocfs2_extent_tree et;int did_quota =0 ; has_data =i_size_read (inode) ?1 :0 ;if (has_data) { - pages =kcalloc (ocfs2_pages_per_cluster (osb->sb), -sizeof (struct page *),GFP_NOFS ); -if (pages ==NULL ) { - ret = -ENOMEM ; -mlog_errno (ret); -return ret; - } - ret =ocfs2_reserve_clusters (osb,1 , &data_ac);if (ret) {mlog_errno (ret); - goto free_pages; + goto out; } }
@@ -7093,7 +7084,8 @@ int ocfs2_convert_inline_data_to_extents }if (has_data) { -unsigned int page_end; +unsigned int page_end =min_t (unsigned,PAGE_SIZE , + osb->s_clustersize);u64 phys; ret = dquot_alloc_space_nodirty(inode,
@@ -7117,15 +7109,8 @@ int ocfs2_convert_inline_data_to_extents*/ block = phys =ocfs2_clusters_to_blocks (inode->i_sb, bit_off); -/* -* Non sparse file systems zero on extend, so no need -* to do that now. -*/ -if (!ocfs2_sparse_alloc (osb) && -PAGE_SIZE < osb->s_clustersize) - end =PAGE_SIZE ; - - ret =ocfs2_grab_eof_pages (inode,0 , end, pages, &num_pages); + ret =ocfs2_grab_eof_pages (inode,0 , page_end, &page, + &num_pages);if (ret) {mlog_errno (ret); need_free =1 ;
@@ -7136,20 +7121,15 @@ int ocfs2_convert_inline_data_to_extents* This should populate the 1st page for us and mark * it up to date. */ - ret =ocfs2_read_inline_data (inode, pages[0 ], di_bh); + ret =ocfs2_read_inline_data (inode, page, di_bh);if (ret) {mlog_errno (ret); need_free =1 ; goto out_unlock; } - page_end =PAGE_SIZE ; -if (PAGE_SIZE > osb->s_clustersize) - page_end = osb->s_clustersize; - -for (i =0 ; i < num_pages; i++) -ocfs2_map_and_dirty_page (inode, handle,0 , page_end, - pages[i], i >0 , &phys); +ocfs2_map_and_dirty_page (inode, handle,0 , page_end, page,0 , + &phys); }spin_lock (&oi->ip_lock);
@@ -7180,8 +7160,8 @@ int ocfs2_convert_inline_data_to_extents } out_unlock: -if (pages) -ocfs2_unlock_and_free_pages (pages, num_pages); +if (page) +ocfs2_unlock_and_free_pages (&page, num_pages); out_commit:if (ret <0 && did_quota)
@@ -7205,8 +7185,6 @@ out_commit: out:if (data_ac)ocfs2_free_alloc_context (data_ac); -free_pages: -kfree (pages);return ret; }
Greg Kroah-Hartman
maintainerPATCH 79/169 ocfs2: mount fails with buffer overflow in strlen
In reply to Greg Kroah-HartmanFrom: Valentin Vidic <[email protected]>
commit b15fa9224e6e1239414525d8d556d824701849fc upstream.
Starting with kernel 5.11 built with CONFIG_FORTIFY_SOURCE mouting an ocfs2 filesystem with either o2cb or pcmk cluster stack fails with the trace below. Problem seems to be that strings for cluster stack and cluster name are not guaranteed to be null terminated in the disk representation, while strlcpy assumes that the source string is always null terminated. This causes a read outside of the source string triggering the buffer overflow detection.
detected buffer overflow in strlen
------------[ cut here ]------------
kernel BUG at lib/string.c:1149!
invalid opcode: 0000 [#1] SMP PTI
CPU: 1 PID: 910 Comm: mount.ocfs2 Not tainted 5.14.0-1-amd64 #1
Debian 5.14.6-2
RIP: 0010:fortify_panic+0xf/0x11
...
Call Trace:
ocfs2_initialize_super.isra.0.cold+0xc/0x18 [ocfs2]
ocfs2_fill_super+0x359/0x19b0 [ocfs2]
mount_bdev+0x185/0x1b0
legacy_get_tree+0x27/0x40
vfs_get_tree+0x25/0xb0
path_mount+0x454/0xa20
__x64_sys_mount+0x103/0x140
do_syscall_64+0x3b/0xc0
entry_SYSCALL_64_after_hwframe+0x44/0xae--- fs/ocfs2/super.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
fs/ocfs2/super.c +10 -4
@@ -2167,11 +2167,17 @@ static int ocfs2_initialize_super(struct }if (ocfs2_clusterinfo_valid (osb)) { +/* +* ci_stack and ci_cluster in ocfs2_cluster_info may not be null +* terminated, so make sure no overflow happens here by using +* memcpy. Destination strings will always be null terminated +* because osb is allocated using kzalloc. +*/ osb->osb_stackflags =OCFS2_RAW_SB (di)->s_cluster_info.ci_stackflags; -strlcpy (osb->osb_cluster_stack, +memcpy (osb->osb_cluster_stack,OCFS2_RAW_SB (di)->s_cluster_info.ci_stack, -OCFS2_STACK_LABEL_LEN +1 ); +OCFS2_STACK_LABEL_LEN );if (strlen (osb->osb_cluster_stack) !=OCFS2_STACK_LABEL_LEN ) {mlog (ML_ERROR , "couldn't mount because of an invalid "
@@ -2180,9 +2186,9 @@ static int ocfs2_initialize_super(struct status = -EINVAL ; goto bail; } -strlcpy (osb->osb_cluster_name, +memcpy (osb->osb_cluster_name,OCFS2_RAW_SB (di)->s_cluster_info.ci_cluster, -OCFS2_CLUSTER_NAME_LEN +1 ); +OCFS2_CLUSTER_NAME_LEN ); }else {/* The empty string is identical with classic tools that * don't know about s_cluster_info. */
Greg Kroah-Hartman
maintainerPATCH 80/169 mm/userfaultfd: selftests: fix memory corruption with thp enabled
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 8913970c19915bbe773d97d42989cd85b7fdc098 upstream.
In RHEL's gating selftests we've encountered memory corruption in the uffd event test even with upstream kernel:
# ./userfaultfd anon 128 4
nr_pages: 32768, nr_pages_per_cpu: 32768
bounces: 3, mode: rnd racing read, userfaults: 6240 missing (6240) 14729 wp (14729)
bounces: 2, mode: racing read, userfaults: 1444 missing (1444) 28877 wp (28877)
bounces: 1, mode: rnd read, userfaults: 6055 missing (6055) 14699 wp (14699)
bounces: 0, mode: read, userfaults: 82 missing (82) 25196 wp (25196)
testing uffd-wp with pagemap (pgsize=4096): done
testing uffd-wp with pagemap (pgsize=2097152): done
testing events (fork, remap, remove): ERROR: nr 32427 memory corruption 0 1 (errno=0, line=963)
ERROR: faulting process failed (errno=0, line=1117)It can be easily reproduced when global thp enabled, which is the default for RHEL.
It's also known as a side effect of commit 0db282ba2c12 ("selftest: use mmap instead of posix_memalign to allocate memory", 2021-07-23), which is imho right itself on using mmap() to make sure the addresses will be untagged even on arm.
The problem is, for each test we allocate buffers using two allocate_area() calls. We assumed these two buffers won't affect each other, however they could, because mmap() could have found that the two buffers are near each other and having the same VMA flags, so they got merged into one VMA.
It won't be a big problem if thp is not enabled, but when thp is agressively enabled it means when initializing the src buffer it could accidentally setup part of the dest buffer too when there's a shared THP that overlaps the two regions. Then some of the dest buffer won't be able to be trapped by userfaultfd missing mode, then it'll cause memory corruption as described.
To fix it, do release_pages() after initializing the src buffer.
Since the previous two release_pages() calls are after uffd_test_ctx_clear() which will unmap all the buffers anyway (which is stronger than release pages; as unmap() also tear town pgtables), drop them as they shouldn't really be anything useful.
We can mark the Fixes tag upon 0db282ba2c12 as it's reported to only happen there, however the real "Fixes" IMHO should be 8ba6e8640844, as before that commit we'll always do explicit release_pages() before registration of uffd, and 8ba6e8640844 changed that logic by adding extra unmap/map and we didn't release the pages at the right place. Meanwhile I don't have a solid glue anyway on whether posix_memalign() could always avoid triggering this bug, hence it's safer to attach this fix to commit 8ba6e8640844.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1994931
--- tools/testing/selftests/vm/userfaultfd.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
tools/testing/selftests/vm/userfaultfd.c +20 -3
@@ -414,9 +414,6 @@ static void uffd_test_ctx_init_ext(uint6 uffd_test_ops->allocate_area ((void **)&area_src); uffd_test_ops->allocate_area ((void **)&area_dst); - uffd_test_ops->release_pages (area_src); - uffd_test_ops->release_pages (area_dst); -userfaultfd_open (features); count_verify =malloc (nr_pages *sizeof (unsigned long long ));
@@ -437,6 +434,26 @@ static void uffd_test_ctx_init_ext(uint6 *(area_count (area_src, nr) +1 ) =1 ; } +/* +* After initialization of area_src, we must explicitly release pages +* for area_dst to make sure it's fully empty. Otherwise we could have +* some area_dst pages be errornously initialized with zero pages, +* hence we could hit memory corruption later in the test. +* +* One example is when THP is globally enabled, above allocate_area() +* calls could have the two areas merged into a single VMA (as they +* will have the same VMA flags so they're mergeable). When we +* initialize the area_src above, it's possible that some part of +* area_dst could have been faulted in via one huge THP that will be +* shared between area_src and area_dst. It could cause some of the +* area_dst won't be trapped by missing userfaults. +* +* This release_pages() will guarantee even if that happened, we'll +* proactively split the thp and drop any accidentally initialized +* pages within area_dst. +*/ + uffd_test_ops->release_pages (area_dst); + pipefd =malloc (sizeof (int ) * nr_cpus *2 );if (!pipefd)err ("pipefd" );
Greg Kroah-Hartman
maintainerPATCH 81/169 userfaultfd: fix a race between writeprotect and exit_mmap()
In reply to Greg Kroah-HartmanFrom: Nadav Amit <[email protected]>
commit cb185d5f1ebf900f4ae3bf84cee212e6dd035aca upstream.
A race is possible when a process exits, its VMAs are removed by exit_mmap() and at the same time userfaultfd_writeprotect() is called.
The race was detected by KASAN on a development kernel, but it appears to be possible on vanilla kernels as well.
Use mmget_not_zero() to prevent the race as done in other userfaultfd operations.
--- fs/userfaultfd.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/userfaultfd.c +9 -3
@@ -1826,9 +1826,15 @@ static int userfaultfd_writeprotect(struif (mode_wp && mode_dontwake)return -EINVAL ; - ret =mwriteprotect_range (ctx->mm, uffdio_wp.range.start, - uffdio_wp.range.len, mode_wp, - &ctx->mmap_changing); +if (mmget_not_zero (ctx->mm)) { + ret =mwriteprotect_range (ctx->mm, uffdio_wp.range.start, + uffdio_wp.range.len, mode_wp, + &ctx->mmap_changing); +mmput (ctx->mm); + }else { +return -ESRCH ; + } +if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 82/169 mm/mempolicy: do not allow illegal MPOL_F_NUMA_BALANCING | MPOL_LOCAL in mbind()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 6d2aec9e123bb9c49cb5c7fc654f25f81e688e8c upstream.
syzbot reported access to unitialized memory in mbind() [1]
Issue came with commit bda420b98505 ("numa balancing: migrate on fault among multiple bound nodes")
This commit added a new bit in MPOL_MODE_FLAGS, but only checked valid combination (MPOL_F_NUMA_BALANCING can only be used with MPOL_BIND) in do_set_mempolicy()
This patch moves the check in sanitize_mpol_flags() so that it is also used by mbind()
[1]
BUG: KMSAN: uninit-value in __mpol_equal+0x567/0x590 mm/mempolicy.c:2260 __mpol_equal+0x567/0x590 mm/mempolicy.c:2260 mpol_equal include/linux/mempolicy.h:105 [inline] vma_merge+0x4a1/0x1e60 mm/mmap.c:1190 mbind_range+0xcc8/0x1e80 mm/mempolicy.c:811 do_mbind+0xf42/0x15f0 mm/mempolicy.c:1333 kernel_mbind mm/mempolicy.c:1483 [inline] __do_sys_mbind mm/mempolicy.c:1490 [inline] __se_sys_mbind+0x437/0xb80 mm/mempolicy.c:1486 __x64_sys_mbind+0x19d/0x200 mm/mempolicy.c:1486 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x44/0xae
Uninit was created at:
slab_alloc_node mm/slub.c:3221 [inline] slab_alloc mm/slub.c:3230 [inline] kmem_cache_alloc+0x751/0xff0 mm/slub.c:3235 mpol_new mm/mempolicy.c:293 [inline] do_mbind+0x912/0x15f0 mm/mempolicy.c:1289 kernel_mbind mm/mempolicy.c:1483 [inline] __do_sys_mbind mm/mempolicy.c:1490 [inline] __se_sys_mbind+0x437/0xb80 mm/mempolicy.c:1486 __x64_sys_mbind+0x19d/0x200 mm/mempolicy.c:1486 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x44/0xae ===================================================== Kernel panic - not syncing: panic_on_kmsan set ... CPU: 0 PID: 15049 Comm: syz-executor.0 Tainted: G B 5.15.0-rc2-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1ff/0x28e lib/dump_stack.c:106 dump_stack+0x25/0x28 lib/dump_stack.c:113 panic+0x44f/0xdeb kernel/panic.c:232 kmsan_report+0x2ee/0x300 mm/kmsan/report.c:186 __msan_warning+0xd7/0x150 mm/kmsan/instrumentation.c:208 __mpol_equal+0x567/0x590 mm/mempolicy.c:2260 mpol_equal include/linux/mempolicy.h:105 [inline] vma_merge+0x4a1/0x1e60 mm/mmap.c:1190 mbind_range+0xcc8/0x1e80 mm/mempolicy.c:811 do_mbind+0xf42/0x15f0 mm/mempolicy.c:1333 kernel_mbind mm/mempolicy.c:1483 [inline] __do_sys_mbind mm/mempolicy.c:1490 [inline] __se_sys_mbind+0x437/0xb80 mm/mempolicy.c:1486 __x64_sys_mbind+0x19d/0x200 mm/mempolicy.c:1486 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- mm/mempolicy.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
mm/mempolicy.c +5 -11
@@ -857,16 +857,6 @@ static long do_set_mempolicy(unsigned sh goto out; } -if (flags &MPOL_F_NUMA_BALANCING ) { -if (new && new->mode ==MPOL_BIND ) { - new->flags |= (MPOL_F_MOF |MPOL_F_MORON ); - }else { - ret = -EINVAL ; -mpol_put (new); - goto out; - } - } - ret =mpol_set_nodemask (new, nodes, scratch);if (ret) {mpol_put (new);
@@ -1450,7 +1440,11 @@ static inline int sanitize_mpol_flags(inreturn -EINVAL ;if ((*flags &MPOL_F_STATIC_NODES ) && (*flags &MPOL_F_RELATIVE_NODES ))return -EINVAL ; - +if (*flags &MPOL_F_NUMA_BALANCING ) { +if (*mode !=MPOL_BIND ) +return -EINVAL ; + *flags |= (MPOL_F_MOF |MPOL_F_MORON ); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 83/169 elfcore: correct reference to CONFIG_UML
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
commit b0e901280d9860a0a35055f220e8e457f300f40a upstream.
Commit 6e7b64b9dd6d ("elfcore: fix building with clang") introduces special handling for two architectures, ia64 and User Mode Linux. However, the wrong name, i.e., CONFIG_UM, for the intended Kconfig symbol for User-Mode Linux was used.
Although the directory for User Mode Linux is ./arch/um; the Kconfig symbol for this architecture is called CONFIG_UML.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
UM
Referencing files: include/linux/elfcore.h
Similar symbols: UML, NUMA
Correct the name of the config to the intended one.
--- include/linux/elfcore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/elfcore.h +1 -1
@@ -109,7 +109,7 @@ static inline int elf_core_copy_task_fpr#endif } -#if defined(CONFIG_UM ) || defined(CONFIG_IA64 ) +#if (defined(CONFIG_UML ) && defined(CONFIG_X86_32 )) || defined(CONFIG_IA64 )/* * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out * extra segments containing the gate DSO contents. Dumping its
Greg Kroah-Hartman
maintainerPATCH 84/169 vfs: check fd has read access in kernel_read_file_from_fd()
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
commit 032146cda85566abcd1c4884d9d23e4e30a07e9a upstream.
If we open a file without read access and then pass the fd to a syscall whose implementation calls kernel_read_file_from_fd(), we get a warning from __kernel_read():
if (WARN_ON_ONCE(!(file->f_mode & FMODE_READ)))
This currently affects both finit_module() and kexec_file_load(), but it could affect other syscalls in the future.
--- fs/kernel_read_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/kernel_read_file.c +1 -1
@@ -178,7 +178,7 @@ int kernel_read_file_from_fd(int fd, lofstruct fd f =fdget (fd);int ret = -EBADF ; -if (!f.file) +if (!f.file || !(f.file->f_mode &FMODE_READ )) goto out; ret =kernel_read_file (f.file, offset, buf, buf_size, file_size, id);
Greg Kroah-Hartman
maintainerPATCH 85/169 mm/secretmem: fix NULL page->mapping dereference in page_is_secretmem()
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 79f9bc5843142b649575f887dccdf1c07ad75c20 upstream.
Check for a NULL page->mapping before dereferencing the mapping in page_is_secretmem(), as the page's mapping can be nullified while gup() is running, e.g. by reclaim or truncation.
BUG: kernel NULL pointer dereference, address: 0000000000000068 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 6 PID: 4173897 Comm: CPU 3/KVM Tainted: G W RIP: 0010:internal_get_user_pages_fast+0x621/0x9d0 Code: <48> 81 7a 68 80 08 04 bc 0f 85 21 ff ff 8 89 c7 be RSP: 0018:ffffaa90087679b0 EFLAGS: 00010046 RAX: ffffe3f37905b900 RBX: 00007f2dd561e000 RCX: ffffe3f37905b934 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffe3f37905b900 ... CR2: 0000000000000068 CR3: 00000004c5898003 CR4: 00000000001726e0 Call Trace: get_user_pages_fast_only+0x13/0x20 hva_to_pfn+0xa9/0x3e0 try_async_pf+0xa1/0x270 direct_page_fault+0x113/0xad0 kvm_mmu_page_fault+0x69/0x680 vmx_handle_exit+0xe1/0x5d0 kvm_arch_vcpu_ioctl_run+0xd81/0x1c70 kvm_vcpu_ioctl+0x267/0x670 __x64_sys_ioctl+0x83/0xa0 do_syscall_64+0x56/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- include/linux/secretmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/secretmem.h +1 -1
@@ -23,7 +23,7 @@ static inline bool page_is_secretmem(str mapping = (struct address_space *) ((unsigned long )page->mapping & ~PAGE_MAPPING_FLAGS ); -if (mapping != page->mapping) +if (!mapping || mapping != page->mapping)return false;return mapping->a_ops == &secretmem_aops;
Greg Kroah-Hartman
maintainerPATCH 86/169 ALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset
In reply to Greg Kroah-HartmanFrom: Brendan Grieve <[email protected]>
commit 3c414eb65c294719a91a746260085363413f91c1 upstream.
As per discussion at: https://github.com/szszoke/sennheiser-gsp670-pulseaudio-profile/issues/13
The GSP670 has 2 playback and 1 recording device that by default are detected in an incompatible order for alsa. This may have been done to make it compatible for the console by the manufacturer and only affects the latest firmware which uses its own ID.
This quirk will resolve this by reordering the channels.
--- sound/usb/quirks-table.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
sound/usb/quirks-table.h +32 -0
@@ -4080,6 +4080,38 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge } } }, +{ +/* +* Sennheiser GSP670 +* Change order of interfaces loaded +*/ + USB_DEVICE(0x1395, 0x0300), + .bInterfaceClass = USB_CLASS_PER_INTERFACE, + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = &(const struct snd_usb_audio_quirk []) { +// Communication + { + .ifnum =3 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +// Recording + { + .ifnum =4 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, +// Main + { + .ifnum =1 , + .type =QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum =-1 + } + } + } +}, #undef USB_DEVICE_VENDOR_SPEC #undef USB_AUDIO_DEVICE
Greg Kroah-Hartman
maintainerPATCH 87/169 ALSA: hda/realtek: Add quirk for Clevo PC50HS
In reply to Greg Kroah-HartmanFrom: Steven Clarkson <[email protected]>
commit aef454b40288158b850aab13e3d2a8c406779401 upstream.
Apply existing PCI quirk to the Clevo PC50HS and related models to fix audio output on the built in speakers.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2547,6 +2547,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x65d2 ,"Clevo PB51R[CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65e1 ,"Clevo PB51[ED][DF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65e5 ,"Clevo PC50D[PRS](?:-D|-G)?" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x65f1 ,"Clevo PC50HS" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e1 ,"Clevo PB71[DE][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x67e5, "Clevo PC70D[PRS](?:-D|-G)?", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
Greg Kroah-Hartman
maintainerPATCH 88/169 ASoC: DAPM: Fix missing kctl change notifications
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 5af82c81b2c49cfb1cad84d9eb6eab0e3d1c4842 upstream.
The put callback of a kcontrol is supposed to return 1 when the value is changed, and this will be notified to user-space. However, some DAPM kcontrols always return 0 (except for errors), hence the user-space misses the update of a control value.
This patch corrects the behavior by properly returning 1 when the value gets updated.
--- sound/soc/soc-dapm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +8 -5
@@ -2559,6 +2559,7 @@ static int snd_soc_dapm_set_pin(struct s const char *pin, int status) {struct snd_soc_dapm_widget *w =dapm_find_widget (dapm, pin, true); +int ret =0 ;dapm_assert_locked (dapm);
@@ -2571,13 +2572,14 @@ static int snd_soc_dapm_set_pin(struct sdapm_mark_dirty (w,"pin configuration" );dapm_widget_invalidate_input_paths (w);dapm_widget_invalidate_output_paths (w); + ret =1 ; } w->connected = status;if (status ==0 ) w->force =0 ; -return 0 ; +return ret; }/**
@@ -3582,14 +3584,15 @@ int snd_soc_dapm_put_pin_switch(struct s {struct snd_soc_card *card =snd_kcontrol_chip (kcontrol);const char *pin = (const char *)kcontrol->private_value; +int ret;if (ucontrol->value.integer.value[0 ]) -snd_soc_dapm_enable_pin (&card->dapm, pin); + ret =snd_soc_dapm_enable_pin (&card->dapm, pin);else -snd_soc_dapm_disable_pin (&card->dapm, pin); + ret =snd_soc_dapm_disable_pin (&card->dapm, pin);snd_soc_dapm_sync (&card->dapm); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (snd_soc_dapm_put_pin_switch);
@@ -4023,7 +4026,7 @@ static int snd_soc_dapm_dai_link_put(str rtd->params_select = ucontrol->value.enumerated.item[0 ]; -return 0 ; +return 1 ; } static void
Greg Kroah-Hartman
maintainerPATCH 89/169 ASoC: nau8824: Fix headphone vs headset, button-press detection no longer working
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 42871e95a3afea8956d8cc567ea725b33a837775 upstream.
Commit 1d25684e2251 ("ASoC: nau8824: Fix open coded prefix handling") replaced the nau8824_dapm_enable_pin() helper with direct calls to snd_soc_dapm_enable_pin(), but the helper was using snd_soc_dapm_force_enable_pin() and not forcing the MICBIAS + SAR supplies on breaks headphone vs headset and button-press detection.
Replace the snd_soc_dapm_enable_pin() calls withsnd_soc_dapm_force_enable_pin() to fix this.
--- sound/soc/codecs/nau8824.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/nau8824.c +2 -2
@@ -867,8 +867,8 @@ static void nau8824_jdet_work(struct worstruct regmap *regmap = nau8824->regmap;int adc_value, event =0 , event_mask =0 ; -snd_soc_dapm_enable_pin (dapm,"MICBIAS" ); -snd_soc_dapm_enable_pin (dapm,"SAR" ); +snd_soc_dapm_force_enable_pin (dapm,"MICBIAS" ); +snd_soc_dapm_force_enable_pin (dapm,"SAR" );snd_soc_dapm_sync (dapm);msleep (100 );
Greg Kroah-Hartman
maintainerPATCH 90/169 blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 5370b0f49078203acf3c064b634a09707167a864 upstream.
c3df5fb57fe8 ("cgroup: rstat: fix A-A deadlock on 32bit around u64_stats_sync") made u64_stats updates irq-safe to avoid A-A deadlocks. Unfortunately, the conversion missed one in blk_cgroup_bio_start(). Fix it.
--- block/blk-cgroup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
block/blk-cgroup.c +3 -2
@@ -1916,10 +1916,11 @@ void blk_cgroup_bio_start(struct bio *bi {int rwd =blk_cgroup_io_type (bio), cpu;struct blkg_iostat_set *bis; +unsigned long flags; cpu =get_cpu (); bis =per_cpu_ptr (bio->bi_blkg->iostat_cpu, cpu); -u64_stats_update_begin (&bis->sync); + flags =u64_stats_update_begin_irqsave (&bis->sync);/* * If the bio is flagged with BIO_CGROUP_ACCT it means this is a split
@@ -1931,7 +1932,7 @@ void blk_cgroup_bio_start(struct bio *bi } bis->cur.ios[rwd]++; -u64_stats_update_end (&bis->sync); +u64_stats_update_end_irqrestore (&bis->sync, flags);if (cgroup_subsys_on_dfl (io_cgrp_subsys))cgroup_rstat_updated (bio->bi_blkg->blkcg->css.cgroup, cpu);put_cpu ();
Greg Kroah-Hartman
maintainerPATCH 91/169 audit: fix possible null-pointer dereference in audit_filter_rules
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
commit 6e3ee990c90494561921c756481d0e2125d8b895 upstream.
Fix possible null-pointer dereference in audit_filter_rules.
audit_filter_rules() error: we previously assumed 'ctx' could be null
--- kernel/auditsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/auditsc.c +1 -1
@@ -657,7 +657,7 @@ static int audit_filter_rules(struct tas result =audit_comparator (audit_loginuid_set (tsk), f->op, f->val);break ;case AUDIT_SADDR_FAM : -if (ctx->sockaddr) +if (ctx && ctx->sockaddr) result =audit_comparator (ctx->sockaddr->ss_family, f->op, f->val);break ;
Greg Kroah-Hartman
maintainerPATCH 92/169 net: dsa: mt7530: correct ds->num_ports
In reply to Greg Kroah-HartmanFrom: DENG Qingfang <[email protected]>
commit 342afce10d6f61c443c95e244f812d4766f73f53 upstream.
Setting ds->num_ports to DSA_MAX_PORTS made DSA core allocate unnecessary dsa_port's and call mt7530_port_disable for non-existent ports.
Set it to MT7530_NUM_PORTS to fix that, and dsa_is_user_port check in port_enable/disable is no longer required.
--- drivers/net/dsa/mt7530.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/dsa/mt7530.c +1 -7
@@ -1031,9 +1031,6 @@ mt7530_port_enable(struct dsa_switch *ds {struct mt7530_priv *priv = ds->priv; -if (!dsa_is_user_port (ds, port)) -return 0 ; -mutex_lock (&priv->reg_mutex);/* Allow the user port gets connected to the cpu port and also
@@ -1056,9 +1053,6 @@ mt7530_port_disable(struct dsa_switch *d {struct mt7530_priv *priv = ds->priv; -if (!dsa_is_user_port (ds, port)) -return ; -mutex_lock (&priv->reg_mutex);/* Clear up all port matrix which could be restored in the next
@@ -3132,7 +3126,7 @@ mt7530_probe(struct mdio_device *mdiodevreturn -ENOMEM ; priv->ds->dev = &mdiodev->dev; - priv->ds->num_ports =DSA_MAX_PORTS ; + priv->ds->num_ports =MT7530_NUM_PORTS ;/* Use medatek,mcm property to distinguish hardware type that would * casues a little bit differences on power-on sequence.
Greg Kroah-Hartman
maintainerPATCH 93/169 ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 5ebcbe342b1c12fae44b4f83cbeae1520e09857e upstream.
Setting cred->ucounts in cred_alloc_blank does not make sense. The uid and user_ns are deliberately not set in cred_alloc_blank but instead the setting is delayed until key_change_session_keyring.
So move dealing with ucounts into key_change_session_keyring as well.
Unfortunately that movement of get_ucounts adds a new failure mode to key_change_session_keyring. I do not see anything stopping the parent process from calling setuid and changing the relevant part of it's cred while keyctl_session_to_parent is running making it fundamentally necessary to call get_ucounts in key_change_session_keyring. Which means that the new failure mode cannot be avoided.
A failure of key_change_session_keyring results in a single threaded parent keeping it's existing credentials. Which results in the parent process not being able to access the session keyring and whichever keys are in the new keyring.
Further get_ucounts is only expected to fail if the number of bits in the refernece count for the structure is too few.
Since the code has no other way to report the failure of get_ucounts and because such failures are not expected to be common add a WARN_ONCE to report this problem to userspace.
Between the WARN_ONCE and the parent process not having access to the keys in the new session keyring I expect any failure of get_ucounts will be noticed and reported and we can find another way to handle this condition. (Possibly by just making ucounts->count an atomic_long_t).
--- kernel/cred.c | 2 -- security/keys/process_keys.c | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
kernel/cred.c +0 -2
@@ -225,8 +225,6 @@ struct cred *cred_alloc_blank(void)#ifdef CONFIG_DEBUG_CREDENTIALS new->magic =CRED_MAGIC ;#endif - new->ucounts =get_ucounts (&init_ucounts); -if (security_cred_alloc_blank (new,GFP_KERNEL_ACCOUNT ) <0 ) goto error;
security/keys/process_keys.c +8 -0
@@ -918,6 +918,13 @@ void key_change_session_keyring(struct creturn ; } +/* If get_ucounts fails more bits are needed in the refcount */ +if (unlikely (!get_ucounts (old->ucounts))) { +WARN_ONCE (1 ,"In %s get_ucounts failed\n" , __func__); +put_cred (new); +return ; + } + new-> uid = old-> uid; new-> euid = old-> euid; new-> suid = old-> suid;
@@ -927,6 +934,7 @@ void key_change_session_keyring(struct c new-> sgid = old-> sgid; new->fsgid = old->fsgid; new->user =get_uid (old->user); + new->ucounts = old->ucounts; new->user_ns =get_user_ns (old->user_ns); new->group_info =get_group_info (old->group_info);
Greg Kroah-Hartman
maintainerPATCH 94/169 ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 629715adc62b0ad27ab04d0aa73a71927f886910 upstream.
The purpose of inc_rlimit_ucounts and dec_rlimit_ucounts in commit_creds is to change which rlimit counter is used to track a process when the credentials changes.
Use the same test for both to guarantee the tracking is correct.
--- kernel/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cred.c +1 -1
@@ -499,7 +499,7 @@ int commit_creds(struct cred *new)inc_rlimit_ucounts (new->ucounts,UCOUNT_RLIMIT_NPROC ,1 );rcu_assign_pointer (task->real_cred, new);rcu_assign_pointer (task->cred, new); -if (new->user != old->user) +if (new->user != old->user || new->user_ns != old->user_ns)dec_rlimit_ucounts (old->ucounts,UCOUNT_RLIMIT_NPROC ,1 );alter_cred_subscribers (old,-2 );
Greg Kroah-Hartman
maintainerPATCH 95/169 ucounts: Proper error handling in set_cred_ucounts
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 34dc2fd6e6908499b669c7b45320cddf38b332e1 upstream.
Instead of leaking the ucounts in new if alloc_ucounts fails, store the result of alloc_ucounts into a temporary variable, which is later assigned to new->ucounts.
--- kernel/cred.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/cred.c +3 -2
@@ -667,7 +667,7 @@ int set_cred_ucounts(struct cred *new) {struct task_struct *task = current;const struct cred *old = task->real_cred; -struct ucounts *old_ucounts = new->ucounts; +struct ucounts *new_ucounts, *old_ucounts = new->ucounts;if (new->user == old->user && new->user_ns == old->user_ns)return 0 ;
@@ -679,9 +679,10 @@ int set_cred_ucounts(struct cred *new)if (old_ucounts && old_ucounts->ns == new->user_ns &&uid_eq (old_ucounts->uid, new->euid))return 0 ; -if (!(new->ucounts =alloc_ucounts (new->user_ns, new->euid))) +if (!(new_ucounts =alloc_ucounts (new->user_ns, new->euid)))return -EAGAIN ; + new->ucounts = new_ucounts;if (old_ucounts)put_ucounts (old_ucounts);
Greg Kroah-Hartman
maintainerPATCH 96/169 ucounts: Fix signal ucount refcounting
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 15bc01effefe97757ef02ca09e9d1b927ab22725 upstream.
In commit fda31c50292a ("signal: avoid double atomic counter increments for user accounting") Linus made a clever optimization to how rlimits and the struct user_struct. Unfortunately that optimization does not work in the obvious way when moved to nested rlimits. The problem is that the last decrement of the per user namespace per user sigpending counter might also be the last decrement of the sigpending counter in the parent user namespace as well. Which means that simply freeing the leaf ucount in __free_sigqueue is not enough.
Maintain the optimization and handle the tricky cases by introducing inc_rlimit_get_ucounts and dec_rlimit_put_ucounts.
By moving the entire optimization into functions that perform all of the work it becomes possible to ensure that every level is handled properly.
The new function inc_rlimit_get_ucounts returns 0 on failure to increment the ucount. This is different than inc_rlimit_ucounts which increments the ucounts and returns LONG_MAX if the ucount counter has exceeded it's maximum or it wrapped (to indicate the counter needs to decremented).
I wish we had a single user to account all pending signals to across all of the threads of a process so this complexity was not necessary
v1: https://lkml.kernel.org/r/87mtnavszx.fsf_-_@disp2133
--- include/linux/user_namespace.h | 2 + kernel/signal.c | 25 +++++--------------- kernel/ucount.c | 49 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 19 deletions(-)
include/linux/user_namespace.h +2 -0
@@ -127,6 +127,8 @@ static inline long get_ucounts_value(strlong inc_rlimit_ucounts (struct ucounts *ucounts,enum ucount_type type,long v);bool dec_rlimit_ucounts (struct ucounts *ucounts,enum ucount_type type,long v); +long inc_rlimit_get_ucounts (struct ucounts *ucounts,enum ucount_type type); +void dec_rlimit_put_ucounts (struct ucounts *ucounts,enum ucount_type type);bool is_ucounts_overlimit (struct ucounts *ucounts,enum ucount_type type,unsigned long max); static inline void set_rlimit_ucount_max(struct user_namespace *ns,
kernel/signal.c +6 -19
@@ -425,22 +425,10 @@ __sigqueue_alloc(int sig, struct task_st*/ rcu_read_lock (); ucounts =task_ucounts (t); - sigpending =inc_rlimit_ucounts (ucounts,UCOUNT_RLIMIT_SIGPENDING ,1 ); -switch (sigpending) { -case 1 : -if (likely (get_ucounts (ucounts))) -break ; - fallthrough; -case LONG_MAX : -/* -* we need to decrease the ucount in the userns tree on any -* failure to avoid counts leaking. -*/ -dec_rlimit_ucounts (ucounts,UCOUNT_RLIMIT_SIGPENDING ,1 ); -rcu_read_unlock (); -return NULL ; - } + sigpending =inc_rlimit_get_ucounts (ucounts,UCOUNT_RLIMIT_SIGPENDING );rcu_read_unlock (); +if (!sigpending) +return NULL ;if (override_rlimit ||likely (sigpending <=task_rlimit (t,RLIMIT_SIGPENDING ))) { q =kmem_cache_alloc (sigqueue_cachep, gfp_flags);
@@ -449,8 +437,7 @@ __sigqueue_alloc(int sig, struct task_st }if (unlikely (q ==NULL )) { -if (dec_rlimit_ucounts (ucounts,UCOUNT_RLIMIT_SIGPENDING ,1 )) -put_ucounts (ucounts); +dec_rlimit_put_ucounts (ucounts,UCOUNT_RLIMIT_SIGPENDING ); }else {INIT_LIST_HEAD (&q->list); q->flags = sigqueue_flags;
@@ -463,8 +450,8 @@ static void __sigqueue_free(struct sigqu {if (q->flags &SIGQUEUE_PREALLOC )return ; -if (q->ucounts &&dec_rlimit_ucounts (q->ucounts,UCOUNT_RLIMIT_SIGPENDING ,1 )) { -put_ucounts (q->ucounts); +if (q->ucounts) { +dec_rlimit_put_ucounts (q->ucounts,UCOUNT_RLIMIT_SIGPENDING ); q->ucounts =NULL ; }kmem_cache_free (sigqueue_cachep, q);
kernel/ucount.c +49 -0
55 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 97/169 KVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest()
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 9b4416c5095c20e110c82ae602c254099b83b72f upstream.
In commit 10d91611f426 ("powerpc/64s: Reimplement book3s idle code in C") kvm_start_guest() became idle_kvm_start_guest(). The old code allocated a stack frame on the emergency stack, but didn't use the frame to store anything, and also didn't store anything in its caller's frame.
idle_kvm_start_guest() on the other hand is written more like a normal C function, it creates a frame on entry, and also stores CR/LR into its callers frame (per the ABI). The problem is that there is no caller frame on the emergency stack.
The emergency stack for a given CPU is allocated with:
paca_ptrs[i]->emergency_sp = alloc_stack(limit, i) + THREAD_SIZE;
So emergency_sp actually points to the first address above the emergency stack allocation for a given CPU, we must not store above it without first decrementing it to create a frame. This is different to the regular kernel stack, paca->kstack, which is initialised to point at an initial frame that is ready to use.
idle_kvm_start_guest() stores the backchain, CR and LR all of which write outside the allocation for the emergency stack. It then creates a stack frame and saves the non-volatile registers. Unfortunately the frame it creates is not large enough to fit the non-volatiles, and so the saving of the non-volatile registers also writes outside the emergency stack allocation.
The end result is that we corrupt whatever is at 0-24 bytes, and 112-248 bytes above the emergency stack allocation.
In practice this has gone unnoticed because the memory immediately above the emergency stack happens to be used for other stack allocations, either another CPUs mc_emergency_sp or an IRQ stack. See the order of calls to irqstack_early_init() and emergency_stack_init().
The low addresses of another stack are the top of that stack, and so are only used if that stack is under extreme pressue, which essentially never happens in practice - and if it did there's a high likelyhood we'd crash due to that stack overflowing.
Still, we shouldn't be corrupting someone else's stack, and it is purely luck that we aren't corrupting something else.
To fix it we save CR/LR into the caller's frame using the existing r1 on entry, we then create a SWITCH_FRAME_SIZE frame (which has space for pt_regs) on the emergency stack with the backchain pointing to the existing stack, and then finally we switch to the new frame on the emergency stack.
--- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +10 -9
@@ -255,13 +255,15 @@ kvm_novcpu_exit: * r3 contains the SRR1 wakeup value, SRR1 is trashed. */ _GLOBAL(idle_kvm_start_guest) - ld r4,PACAEMERGSP(r13) mfcr r5 mflr r0 - std r1,0(r4) - std r5,8(r4) - std r0,16(r4) - subi r1,r4,STACK_FRAME_OVERHEAD + std r5, 8(r1) // Save CR in caller's frame + std r0, 16(r1) // Save LR in caller's frame + // Create frame on emergency stack + ld r4, PACAEMERGSP(r13) + stdu r1, -SWITCH_FRAME_SIZE(r4) + // Switch to new frame on emergency stack + mr r1, r4 SAVE_NVGPRS(r1) /*
@@ -395,10 +397,9 @@ kvm_no_guest: /* set up r3 for return */ mfspr r3,SPRN_SRR1 REST_NVGPRS(r1) - addi r1, r1, STACK_FRAME_OVERHEAD - ld r0, 16(r1) - ld r5, 8(r1) - ld r1, 0(r1) + ld r1, 0(r1) // Switch back to caller stack + ld r0, 16(r1) // Reload LR + ld r5, 8(r1) // Reload CR mtlr r0 mtcr r5 blr
Greg Kroah-Hartman
maintainerPATCH 98/169 KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit cdeb5d7d890e14f3b70e8087e745c4a6a7d9f337 upstream.
We call idle_kvm_start_guest() from power7_offline() if the thread has been requested to enter KVM. We pass it the SRR1 value that was returned from power7_idle_insn() which tells us what sort of wakeup we're processing.
Depending on the SRR1 value we pass in, the KVM code might enter the guest, or it might return to us to do some host action if the wakeup requires it.
If idle_kvm_start_guest() is able to handle the wakeup, and enter the guest it is supposed to indicate that by returning a zero SRR1 value to us.
That was the behaviour prior to commit 10d91611f426 ("powerpc/64s:
Reimplement book3s idle code in C"), however in that commit the handling of SRR1 was reworked, and the zeroing behaviour was lost.
Returning from idle_kvm_start_guest() without zeroing the SRR1 value can confuse the host offline code, causing the guest to crash and other weirdness.
--- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +7 -2
@@ -264,6 +264,7 @@ _GLOBAL(idle_kvm_start_guest) stdu r1, -SWITCH_FRAME_SIZE(r4) // Switch to new frame on emergency stack mr r1, r4 + std r3, 32(r1) // Save SRR1 wakeup value SAVE_NVGPRS(r1) /*
@@ -315,6 +316,10 @@ kvm_unsplit_wakeup: kvm_secondary_got_guest: + // About to go to guest, clear saved SRR1 + li r0, 0 + std r0, 32(r1) + /* Set HSTATE_DSCR(r13) to something sensible */ ld r6, PACA_DSCR_DEFAULT(r13) std r6, HSTATE_DSCR(r13)
@@ -394,8 +399,8 @@ kvm_no_guest: mfspr r4, SPRN_LPCR rlwimi r4, r3, 0, LPCR_PECE0 | LPCR_PECE1 mtspr SPRN_LPCR, r4 - /* set up r3 for return */ - mfspr r3,SPRN_SRR1 + // Return SRR1 wakeup value, or 0 if we went into the guest + ld r3, 32(r1) REST_NVGPRS(r1) ld r1, 0(r1) // Switch back to caller stack ld r0, 16(r1) // Reload LR
Greg Kroah-Hartman
maintainerPATCH 99/169 powerpc/idle: Dont corrupt back chain when going idle
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
commit 496c5fe25c377ddb7815c4ce8ecfb676f051e9b6 upstream.
In isa206_idle_insn_mayloss() we store various registers into the stack red zone, which is allowed.
However inside the IDLE_STATE_ENTER_SEQ_NORET macro we save r2 again, to 0(r1), which corrupts the stack back chain.
We used to do the same in isa206_idle_insn_mayloss() itself, but we fixed that in 73287caa9210 ("powerpc64/idle: Fix SP offsets when saving GPRs"), however we missed that the macro also corrupts the back chain.
Corrupting the back chain is bad for debuggability but doesn't necessarily cause a bug.
However we recently changed the stack handling in some KVM code, and it now relies on the stack back chain being valid when it returns. The corruption causes that code to return with r1 pointing somewhere in kernel data, at some point LR is restored from the stack and we branch to NULL or somewhere else invalid.
Only affects Power8 hosts running KVM guests, with dynamic_mt_modes enabled (which it is by default).
The fixes tag below points to the commit that changed the KVM stack handling, exposing this bug. The actual corruption of the back chain has always existed since 948cf67c4726 ("powerpc: Add NAP mode support on Power7 in HV mode").
--- arch/powerpc/kernel/idle_book3s.S | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/powerpc/kernel/idle_book3s.S +6 -4
@@ -126,14 +126,16 @@ _GLOBAL(idle_return_gpr_loss) /* * This is the sequence required to execute idle instructions, as * specified in ISA v2.07 (and earlier). MSR[IR] and MSR[DR] must be 0. - * - * The 0(r1) slot is used to save r2 in isa206, so use that here. + * We have to store a GPR somewhere, ptesync, then reload it, and create + * a false dependency on the result of the load. It doesn't matter which + * GPR we store, or where we store it. We have already stored r2 to the + * stack at -8(r1) in isa206_idle_insn_mayloss, so use that. */ #define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ - std r2,0(r1); \ + std r2,-8(r1); \ ptesync; \ - ld r2,0(r1); \ + ld r2,-8(r1); \ 236: cmpd cr0,r2,r2; \ bne 236b; \ IDLE_INST; \
Greg Kroah-Hartman
maintainerPATCH 100/169 mm, slub: fix mismatch between reconstructed freelist depth and cnt
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 899447f669da76cc3605665e1a95ee877bc464cc upstream.
If object's reuse is delayed, it will be excluded from the reconstructed freelist. But we forgot to adjust the cnt accordingly. So there will be a mismatch between reconstructed freelist depth and cnt. This will lead to free_debug_processing() complaining about freelist count or a incorrect slub inuse count.
--- mm/slub.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
mm/slub.c +9 -2
@@ -1629,7 +1629,8 @@ static __always_inline bool slab_free_ho }static inline bool slab_free_freelist_hook (struct kmem_cache *s, -void **head,void **tail) +void **head,void **tail, +int *cnt) {void *object;
@@ -1656,6 +1657,12 @@ static inline bool slab_free_freelist_ho *head = object;if (!*tail) *tail = object; + }else { +/* +* Adjust the reconstructed freelist depth +* accordingly if object's reuse is delayed. +*/ + --(*cnt); } }while (object != old_tail);
@@ -3210,7 +3217,7 @@ static __always_inline void slab_free(st* With KASAN enabled slab_free_freelist_hook modifies the freelist * to remove objects, whose reuse must be delayed. */ -if (slab_free_freelist_hook (s, &head, &tail)) +if (slab_free_freelist_hook (s, &head, &tail, &cnt))do_slab_free (s, page, head, tail, cnt, addr); }
Greg Kroah-Hartman
maintainerPATCH 101/169 mm, slub: fix potential memoryleak in kmem_cache_open()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 9037c57681d25e4dcc442d940d6dbe24dd31f461 upstream.
In error path, the random_seq of slub cache might be leaked. Fix this by using __kmem_cache_release() to release all the relevant resources.
--- mm/slub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/slub.c +1 -1
@@ -3935,8 +3935,8 @@ static int kmem_cache_open(struct kmem_cif (alloc_kmem_cache_cpus (s))return 0 ; -free_kmem_cache_nodes (s); error: +__kmem_cache_release (s);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 102/169 mm, slub: fix potential use-after-free in slab_debugfs_fops
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 67823a544414def2a36c212abadb55b23bcda00c upstream.
When sysfs_slab_add failed, we shouldn't call debugfs_slab_add() for s because s will be freed soon. And slab_debugfs_fops will use s later leading to a use-after-free.
--- mm/slub.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/slub.c +4 -2
@@ -4604,13 +4604,15 @@ int __kmem_cache_create(struct kmem_cachreturn 0 ; err =sysfs_slab_add (s); -if (err) +if (err) {__kmem_cache_release (s); +return err; + }if (s->flags &SLAB_STORE_USER )debugfs_slab_add (s); -return err; +return 0 ; }void *__kmalloc_track_caller (size_t size,gfp_t gfpflags,unsigned long caller)
Greg Kroah-Hartman
maintainerPATCH 103/169 mm, slub: fix incorrect memcg slab count for bulk free
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
commit 3ddd60268c24bcac9d744404cc277e9dc52fe6b6 upstream.
kmem_cache_free_bulk() will call memcg_slab_free_hook() for all objects when doing bulk free. So we shouldn't call memcg_slab_free_hook() again for bulk free to avoid incorrect memcg slab count.
--- mm/slub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/slub.c +3 -1
@@ -3173,7 +3173,9 @@ static __always_inline void do_slab_freestruct kmem_cache_cpu *c;unsigned long tid; -memcg_slab_free_hook (s, &head,1 ); +/* memcg_slab_free_hook() is already called for bulk free. */ +if (!tail) +memcg_slab_free_hook (s, &head,1 ); redo:/* * Determine the currently cpus per cpu slab.
Greg Kroah-Hartman
maintainerPATCH 104/169 KVM: nVMX: promptly process interrupts delivered while in guest mode
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 3a25dfa67fe40f3a2690af2c562e0947a78bd6a0 upstream.
Since commit c300ab9f08df ("KVM: x86: Replace late check_nested_events() hack with more precise fix") there is no longer the certainty that check_nested_events() tries to inject an external interrupt vmexit to L1 on every call to vcpu_enter_guest. Therefore, even in that case we need to set KVM_REQ_EVENT. This ensures that inject_pending_event() is called, and from there kvm_check_nested_events().
--- arch/x86/kvm/vmx/vmx.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
arch/x86/kvm/vmx/vmx.c +6 -11
@@ -6288,18 +6288,13 @@ static int vmx_sync_pir_to_irr(struct kv/* * If we are running L2 and L1 has a new pending interrupt -* which can be injected, we should re-evaluate -* what should be done with this new L1 interrupt. -* If L1 intercepts external-interrupts, we should -* exit from L2 to L1. Otherwise, interrupt should be -* delivered directly to L2. +* which can be injected, this may cause a vmexit or it may +* be injected into L2. Either way, this interrupt will be +* processed via KVM_REQ_EVENT, not RVI, because we do not use +* virtual interrupt delivery to inject L1 interrupts into L2. */ -if (is_guest_mode (vcpu) && max_irr_updated) { -if (nested_exit_on_intr (vcpu)) -kvm_vcpu_exiting_guest_mode (vcpu); -else -kvm_make_request (KVM_REQ_EVENT , vcpu); - } +if (is_guest_mode (vcpu) && max_irr_updated) +kvm_make_request (KVM_REQ_EVENT , vcpu); }else { max_irr =kvm_lapic_find_highest_irr (vcpu); }
Greg Kroah-Hartman
maintainerPATCH 105/169 KVM: SEV: Flush cache on non-coherent systems before RECEIVE_UPDATE_DATA
In reply to Greg Kroah-HartmanFrom: Masahiro Kozuka <[email protected]>
commit c8c340a9b4149fe5caa433f3b62463a1c8e07a46 upstream.
Flush the destination page before invoking RECEIVE_UPDATE_DATA, as the PSP encrypts the data with the guest's key when writing to guest memory. If the target memory was not previously encrypted, the cache may contain dirty, unecrypted data that will persist on non-coherent systems.
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/sev.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kvm/svm/sev.c +7 -0
@@ -1480,6 +1480,13 @@ static int sev_receive_update_data(struc goto e_free_trans; } +/* +* Flush (on non-coherent CPUs) before RECEIVE_UPDATE_DATA, the PSP +* encrypts the written data with the guest's key, and the cache may +* contain dirty, unencrypted data. +*/ +sev_clflush_pages (guest_page, n); +/* The RECEIVE_UPDATE_DATA command requires C-bit to be always set. */ data.guest_address = (page_to_pfn (guest_page[0 ]) <<PAGE_SHIFT ) + offset; data.guest_address |= sev_me_mask;
Greg Kroah-Hartman
maintainerPATCH 106/169 KVM: SEV-ES: rename guest_ins_data to sev_pio_data
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit b5998402e3de429b5e5f9bdea08ddf77c5fd661e upstream.
We will be using this field for OUTS emulation as well, in case the data that is pushed via OUTS spans more than one page. In that case, there will be a need to save the data pointer across exits to userspace.
So, change the name to something that refers to any kind of PIO. Also spell out what it is used for, namely SEV-ES.
No functional change intended.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/x86.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -695,7 +695,7 @@ struct kvm_vcpu_arch {struct kvm_pio_request pio;void *pio_data; -void *guest_ins_data; +void *sev_pio_data;u8 event_exit_inst_len;
arch/x86/kvm/x86.c +2 -2
@@ -12322,7 +12322,7 @@ EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);static int complete_sev_es_emulated_ins (struct kvm_vcpu *vcpu) { -memcpy (vcpu->arch.guest_ins_data, vcpu->arch.pio_data, +memcpy (vcpu->arch.sev_pio_data, vcpu->arch.pio_data, vcpu->arch.pio.count * vcpu->arch.pio.size); vcpu->arch.pio.count =0 ;
@@ -12354,7 +12354,7 @@ static int kvm_sev_es_ins(struct kvm_vcpif (ret) { vcpu->arch.pio.count =0 ; }else { - vcpu->arch.guest_ins_data = data; + vcpu->arch.sev_pio_data = data; vcpu->arch.complete_userspace_io = complete_sev_es_emulated_ins; }
Greg Kroah-Hartman
maintainerPATCH 107/169 KVM: SEV-ES: clean up kvm_sev_es_ins/outs
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit ea724ea420aac58b41bc822d1aed6940b136b78d upstream.
A few very small cleanups to the functions, smushed together because the patch is already very small like this:
- inline emulator_pio_in_emulated and emulator_pio_out_emulated, since we already have the vCPU
- remove the data argument and pull setting vcpu->arch.sev_pio_data into the caller
- remove unnecessary clearing of vcpu->arch.pio.count when emulation is done by the kernel (and therefore vcpu->arch.pio.count is already clear on exit from emulator_pio_in and emulator_pio_out).
No functional change intended.
--- arch/x86/kvm/x86.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
arch/x86/kvm/x86.c +15 -16
@@ -12330,34 +12330,32 @@ static int complete_sev_es_emulated_ins( }static int kvm_sev_es_outs (struct kvm_vcpu *vcpu,unsigned int size, -unsigned int port,void *data,unsigned int count) +unsigned int port,unsigned int count) { -int ret; +int ret =emulator_pio_out (vcpu, size, port, + vcpu->arch.sev_pio_data, count); - ret =emulator_pio_out_emulated (vcpu->arch.emulate_ctxt, size, port, - data, count); -if (ret) +if (ret) { +/* Emulation done by the kernel. */ return ret; + } vcpu->arch.pio.count =0 ; -return 0 ; }static int kvm_sev_es_ins (struct kvm_vcpu *vcpu,unsigned int size, -unsigned int port,void *data,unsigned int count) +unsigned int port,unsigned int count) { -int ret; +int ret =emulator_pio_in (vcpu, size, port, + vcpu->arch.sev_pio_data, count); - ret =emulator_pio_in_emulated (vcpu->arch.emulate_ctxt, size, port, - data, count);if (ret) { - vcpu->arch.pio.count =0 ; - }else { - vcpu->arch.sev_pio_data = data; - vcpu->arch.complete_userspace_io = complete_sev_es_emulated_ins; +/* Emulation done by the kernel. */ +return ret; } + vcpu->arch.complete_userspace_io = complete_sev_es_emulated_ins;return 0 ; }
@@ -12365,8 +12363,9 @@ int kvm_sev_es_string_io(struct kvm_vcpu unsigned int port, void *data, unsigned int count, int in) { - return in ? kvm_sev_es_ins(vcpu, size, port, data, count) - : kvm_sev_es_outs(vcpu, size, port, data, count); + vcpu->arch.sev_pio_data = data; +return in ?kvm_sev_es_ins (vcpu, size, port, count) + :kvm_sev_es_outs (vcpu, size, port, count); }EXPORT_SYMBOL_GPL (kvm_sev_es_string_io);
Greg Kroah-Hartman
maintainerPATCH 108/169 KVM: SEV-ES: keep INS functions together
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 4fa4b38dae6fc6a3695695add8c18fa8b6a05a1a upstream.
Make the diff a little nicer when we actually get to fixing the bug. No functional change intended.
--- arch/x86/kvm/x86.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
arch/x86/kvm/x86.c +9 -9
@@ -12320,15 +12320,6 @@ int kvm_sev_es_mmio_read(struct kvm_vcpu }EXPORT_SYMBOL_GPL (kvm_sev_es_mmio_read); -static int complete_sev_es_emulated_ins (struct kvm_vcpu *vcpu) -{ -memcpy (vcpu->arch.sev_pio_data, vcpu->arch.pio_data, - vcpu->arch.pio.count * vcpu->arch.pio.size); - vcpu->arch.pio.count =0 ; - -return 1 ; -} -static int kvm_sev_es_outs (struct kvm_vcpu *vcpu,unsigned int size,unsigned int port,unsigned int count) {
@@ -12344,6 +12335,15 @@ static int kvm_sev_es_outs(struct kvm_vcreturn 0 ; } +static int complete_sev_es_emulated_ins (struct kvm_vcpu *vcpu) +{ +memcpy (vcpu->arch.sev_pio_data, vcpu->arch.pio_data, + vcpu->arch.pio.count * vcpu->arch.pio.size); + vcpu->arch.pio.count =0 ; + +return 1 ; +} +static int kvm_sev_es_ins (struct kvm_vcpu *vcpu,unsigned int size,unsigned int port,unsigned int count) {
Greg Kroah-Hartman
maintainerPATCH 109/169 KVM: SEV-ES: fix length of string I/O
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 019057bd73d1751fdfec41e43148baf3303d98f9 upstream.
The size of the data in the scratch buffer is not divided by the size of each port I/O operation, so vcpu->arch.pio.count ends up being larger than it should be by a factor of size.
--- arch/x86/kvm/svm/sev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +1 -1
@@ -2591,7 +2591,7 @@ int sev_es_string_io(struct vcpu_svm *svreturn -EINVAL ;return kvm_sev_es_string_io (&svm->vcpu, size, port, - svm->ghcb_sa, svm->ghcb_sa_len, in); + svm->ghcb_sa, svm->ghcb_sa_len / size, in); }void sev_es_init_vmcb (struct vcpu_svm *svm)
Greg Kroah-Hartman
maintainerPATCH 110/169 KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 95e16b4792b0429f1933872f743410f00e590c55 upstream.
The PIO scratch buffer is larger than a single page, and therefore it is not possible to copy it in a single step to vcpu->arch/pio_data. Bound each call to emulator_pio_in/out to a single page; keep track of how many I/O operations are left in vcpu->arch.sev_pio_count, so that the operation can be restarted in the complete_userspace_io callback.
For OUT, this means that the previous kvm_sev_es_outs implementation becomes an iterator of the loop, and we can consume the sev_pio_data buffer before leaving to userspace.
For IN, instead, consuming the buffer and decreasing sev_pio_count is always done in the complete_userspace_io callback, because that is when the memcpy is done into sev_pio_data.
--- arch/x86/include/asm/kvm_host.h | 1 arch/x86/kvm/x86.c | 72 +++++++++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 16 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -696,6 +696,7 @@ struct kvm_vcpu_arch {struct kvm_pio_request pio;void *pio_data;void *sev_pio_data; +unsigned sev_pio_count;u8 event_exit_inst_len;
arch/x86/kvm/x86.c +56 -16
102 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 111/169 KVM: SEV-ES: reduce ghcb_sa_len to 32 bits
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 9f1ee7b169afbd10c3ad254220d1b37beb5798aa upstream.
The size of the GHCB scratch area is limited to 16 KiB (GHCB_SCRATCH_AREA_LIMIT), so there is no need for it to be a u64. This fixes a build error on 32-bit systems:
i686-linux-gnu-ld: arch/x86/kvm/svm/sev.o: in function `sev_es_string_io:
sev.c:(.text+0x110f): undefined reference to `__udivdi3'
--- arch/x86/kvm/svm/svm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/svm.h +1 -1
@@ -191,7 +191,7 @@ struct vcpu_svm {/* SEV-ES scratch area support */ void *ghcb_sa; -u64 ghcb_sa_len; +u32 ghcb_sa_len;bool ghcb_sa_sync;bool ghcb_sa_free;
Greg Kroah-Hartman
maintainerPATCH 112/169 KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 0d33b1baeb6ca7165d5ed4fdd1a8f969985e35b9 upstream.
Currently emulator_pio_in clears vcpu->arch.pio.count twice if emulator_pio_in_out performs kernel PIO. Move the clear into emulator_pio_out where it is actually necessary.
No functional change intended.
--- arch/x86/kvm/x86.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +9 -4
@@ -6915,10 +6915,8 @@ static int emulator_pio_in_out(struct kv vcpu->arch.pio.count = count; vcpu->arch.pio.size = size; -if (!kernel_pio (vcpu, vcpu->arch.pio_data)) { - vcpu->arch.pio.count =0 ; +if (!kernel_pio (vcpu, vcpu->arch.pio_data))return 1 ; - } vcpu->run->exit_reason =KVM_EXIT_IO ; vcpu->run->io.direction = in ?KVM_EXIT_IO_IN :KVM_EXIT_IO_OUT ;
@@ -6964,9 +6962,16 @@ static int emulator_pio_out(struct kvm_v unsigned short port, const void *val, unsigned int count) { + int ret; +memcpy (vcpu->arch.pio_data, val, size * count);trace_kvm_pio (KVM_PIO_OUT , port, size, count, vcpu->arch.pio_data); -return emulator_pio_in_out (vcpu, size, port, (void *)val, count, false); + ret =emulator_pio_in_out (vcpu, size, port, (void *)val, count, false); +if (ret) + vcpu->arch.pio.count =0 ; + +return ret; + } static int emulator_pio_out_emulated(struct x86_emulate_ctxt *ctxt,
Greg Kroah-Hartman
maintainerPATCH 113/169 KVM: x86: check for interrupts before deciding whether to exit the fast path
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit de7cd3f6761f49bef044ec49493d88737a70f1a6 upstream.
The kvm_x86_sync_pir_to_irr callback can sometimes set KVM_REQ_EVENT. If that happens exactly at the time that an exit is handled as EXIT_FASTPATH_REENTER_GUEST, vcpu_enter_guest will go incorrectly through the loop that calls kvm_x86_run, instead of processing the request promptly.
--- arch/x86/kvm/x86.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kvm/x86.c +5 -5
@@ -9642,14 +9642,14 @@ static int vcpu_enter_guest(struct kvm_vif (likely (exit_fastpath !=EXIT_FASTPATH_REENTER_GUEST ))break ; -if (unlikely (kvm_vcpu_exit_request (vcpu))) { +if (vcpu->arch.apicv_active) +static_call (kvm_x86_sync_pir_to_irr)(vcpu); + +if (unlikely (kvm_vcpu_exit_request (vcpu))) { exit_fastpath =EXIT_FASTPATH_EXIT_HANDLED ;break ; } - -if (vcpu->arch.apicv_active) -static_call (kvm_x86_sync_pir_to_irr)(vcpu); - } + }/* * Do this here before restoring debug registers on the host. And
Greg Kroah-Hartman
maintainerPATCH 114/169 KVM: x86: split the two parts of emulator_pio_in
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 3b27de27183911d461afedf50c6fa30c59740c07 upstream.
emulator_pio_in handles both the case where the data is pending in vcpu->arch.pio.count, and the case where I/O has to be done via either an in-kernel device or a userspace exit. For SEV-ES we would like to split these, to identify clearly the moment at which the sev_pio_data is consumed. To this end, create two different
functions: __emulator_pio_in fills in vcpu->arch.pio.count, while complete_emulator_pio_in clears it and releases vcpu->arch.pio.data.
Because this patch has to be backported, things are left a bit messy. kernel_pio() operates on vcpu->arch.pio, which leads to emulator_pio_in() having with two calls to complete_emulator_pio_in(). It will be fixed in the next release.
While at it, remove the unused void* val argument of emulator_pio_in_out. The function currently hardcodes vcpu->arch.pio_data as the source/destination buffer, which sucks but will be fixed after the more severe SEV-ES buffer overflow.
No functional change intended.
--- arch/x86/kvm/x86.c | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-)
arch/x86/kvm/x86.c +28 -17
@@ -6907,7 +6907,7 @@ static int kernel_pio(struct kvm_vcpu *v }static int emulator_pio_in_out (struct kvm_vcpu *vcpu,int size, -unsigned short port,void *val, +unsigned short port,unsigned int count,bool in) { vcpu->arch.pio.port = port;
@@ -6928,26 +6928,38 @@ static int emulator_pio_in_out(struct kvreturn 0 ; } -static int emulator_pio_in (struct kvm_vcpu *vcpu,int size, -unsigned short port,void *val,unsigned int count) +static int __emulator_pio_in (struct kvm_vcpu *vcpu,int size, +unsigned short port,unsigned int count) { -int ret; +WARN_ON (vcpu->arch.pio.count); +memset (vcpu->arch.pio_data,0 , size * count); +return emulator_pio_in_out (vcpu, size, port, count, true); +} -if (vcpu->arch.pio.count) - goto data_avail; +static void complete_emulator_pio_in (struct kvm_vcpu *vcpu,int size, +unsigned short port,void *val) +{ +memcpy (val, vcpu->arch.pio_data, size * vcpu->arch.pio.count); +trace_kvm_pio (KVM_PIO_IN , port, size, vcpu->arch.pio.count, vcpu->arch.pio_data); + vcpu->arch.pio.count =0 ; +} -memset (vcpu->arch.pio_data,0 , size * count); +static int emulator_pio_in (struct kvm_vcpu *vcpu,int size, +unsigned short port,void *val,unsigned int count) +{ +if (vcpu->arch.pio.count) { +/* Complete previous iteration. */ + }else { +int r =__emulator_pio_in (vcpu, size, port, count); +if (!r) +return r; - ret =emulator_pio_in_out (vcpu, size, port, val, count, true); -if (ret) { -data_avail: -memcpy (val, vcpu->arch.pio_data, size * count); -trace_kvm_pio (KVM_PIO_IN , port, size, count, vcpu->arch.pio_data); - vcpu->arch.pio.count =0 ; -return 1 ; +/* Results already available, fall through. */ } -return 0 ; +WARN_ON (count != vcpu->arch.pio.count); +complete_emulator_pio_in (vcpu, size, port, val); +return 1 ; } static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,
@@ -6966,12 +6978,11 @@ static int emulator_pio_out(struct kvm_vmemcpy (vcpu->arch.pio_data, val, size * count);trace_kvm_pio (KVM_PIO_OUT , port, size, count, vcpu->arch.pio_data); - ret =emulator_pio_in_out (vcpu, size, port, (void *)val, count, false); + ret =emulator_pio_in_out (vcpu, size, port, count, false);if (ret) vcpu->arch.pio.count =0 ;return ret; - } static int emulator_pio_out_emulated(struct x86_emulate_ctxt *ctxt,
Greg Kroah-Hartman
maintainerPATCH 115/169 KVM: x86: remove unnecessary arguments from complete_emulator_pio_in
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 6b5efc930bbc8c97e4a1fe2ccb9a6f286365a56d upstream.
complete_emulator_pio_in can expect that vcpu->arch.pio has been filled in, and therefore does not need the size and count arguments. This makes things nicer when the function is called directly from a complete_userspace_io callback.
No functional change intended.
--- arch/x86/kvm/x86.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/x86.c +6 -5
@@ -6936,11 +6936,12 @@ static int __emulator_pio_in(struct kvm_return emulator_pio_in_out (vcpu, size, port, count, true); } -static void complete_emulator_pio_in (struct kvm_vcpu *vcpu,int size, -unsigned short port,void *val) +static void complete_emulator_pio_in (struct kvm_vcpu *vcpu,void *val) { -memcpy (val, vcpu->arch.pio_data, size * vcpu->arch.pio.count); -trace_kvm_pio (KVM_PIO_IN , port, size, vcpu->arch.pio.count, vcpu->arch.pio_data); +int size = vcpu->arch.pio.size; +unsigned count = vcpu->arch.pio.count; +memcpy (val, vcpu->arch.pio_data, size * count); +trace_kvm_pio (KVM_PIO_IN , vcpu->arch.pio.port, size, count, vcpu->arch.pio_data); vcpu->arch.pio.count =0 ; }
@@ -6958,7 +6959,7 @@ static int emulator_pio_in(struct kvm_vc }WARN_ON (count != vcpu->arch.pio.count); -complete_emulator_pio_in (vcpu, size, port, val); +complete_emulator_pio_in (vcpu, val);return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 116/169 nfc: nci: fix the UAF of rf_conn_info object
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
commit 1b1499a817c90fd1ce9453a2c98d2a01cca0e775 upstream.
The nci_core_conn_close_rsp_packet() function will release the conn_info with given conn_id. However, it needs to set the rf_conn_info to NULL to prevent other routines like nci_rf_intf_activated_ntf_packet() to trigger the UAF.
--- net/nfc/nci/rsp.c | 2 ++ 1 file changed, 2 insertions(+)
net/nfc/nci/rsp.c +2 -0
@@ -330,6 +330,8 @@ static void nci_core_conn_close_rsp_pack ndev->cur_conn_id);if (conn_info) {list_del (&conn_info->list); +if (conn_info == ndev->rf_conn_info) + ndev->rf_conn_info =NULL ;devm_kfree (&ndev->nfc_dev->dev, conn_info); } }
Greg Kroah-Hartman
maintainerPATCH 117/169 isdn: cpai: check ctr->cnr to avoid array index out of bound
In reply to Greg Kroah-HartmanFrom: Xiaolong Huang <[email protected]>
commit 1f3e2e97c003f80c4b087092b225c8787ff91e4d upstream.
The cmtp_add_connection() would add a cmtp session to a controller and run a kernel thread to process cmtp.
__module_get(THIS_MODULE); session->task = kthread_run(cmtp_session, session, "kcmtpd_ctr_%d", session->num);
During this process, the kernel thread would call detach_capi_ctr() to detach a register controller. if the controller
was not attached yet, detach_capi_ctr() would
trigger an array-index-out-bounds bug.
[ 46.866069][ T6479] UBSAN: array-index-out-of-bounds in drivers/isdn/capi/kcapi.c:483:21 [ 46.867196][ T6479] index -1 is out of range for type 'capi_ctr *[32]' [ 46.867982][ T6479] CPU: 1 PID: 6479 Comm: kcmtpd_ctr_0 Not tainted 5.15.0-rc2+ #8 [ 46.869002][ T6479] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 [ 46.870107][ T6479] Call Trace: [ 46.870473][ T6479] dump_stack_lvl+0x57/0x7d [ 46.870974][ T6479] ubsan_epilogue+0x5/0x40 [ 46.871458][ T6479] __ubsan_handle_out_of_bounds.cold+0x43/0x48 [ 46.872135][ T6479] detach_capi_ctr+0x64/0xc0 [ 46.872639][ T6479] cmtp_session+0x5c8/0x5d0 [ 46.873131][ T6479] ? __init_waitqueue_head+0x60/0x60 [ 46.873712][ T6479] ? cmtp_add_msgpart+0x120/0x120 [ 46.874256][ T6479] kthread+0x147/0x170 [ 46.874709][ T6479] ? set_kthread_struct+0x40/0x40 [ 46.875248][ T6479] ret_from_fork+0x1f/0x30 [ 46.875773][ T6479]
--- drivers/isdn/capi/kcapi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/isdn/capi/kcapi.c +5 -0
@@ -480,6 +480,11 @@ int detach_capi_ctr(struct capi_ctr *ctrctr_down (ctr,CAPI_CTR_DETACHED ); +if (ctr->cnr <1 || ctr->cnr -1 >=CAPI_MAXCONTR ) { + err = -EINVAL ; + goto unlock_out; + } +if (capi_controller[ctr->cnr -1 ] != ctr) { err = -EINVAL ; goto unlock_out;
Greg Kroah-Hartman
maintainerPATCH 118/169 netfilter: Kconfig: use default y instead of m for bool config option
In reply to Greg Kroah-HartmanFrom: Vegard Nossum <[email protected]>
commit 77076934afdcd46516caf18ed88b2f88025c9ddb upstream.
This option, NF_CONNTRACK_SECMARK, is a bool, so it can never be 'm'.
--- net/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/Kconfig +1 -1
@@ -109,7 +109,7 @@ config NF_CONNTRACK_MARK config NF_CONNTRACK_SECMARK bool 'Connection tracking security mark support' depends on NETWORK_SECMARK - default m if NETFILTER_ADVANCED=n + default y if NETFILTER_ADVANCED=n help This option enables security markings to be applied to connections. Typically they are copied to connections from
Greg Kroah-Hartman
maintainerPATCH 119/169 selftests: netfilter: remove stray bash debug line
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
commit 3e6ed7703dae6838c104d73d3e76e9b79f5c0528 upstream.
This should not be there.
--- tools/testing/selftests/netfilter/nft_flowtable.sh | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/netfilter/nft_flowtable.sh +0 -1
@@ -199,7 +199,6 @@ fi # test basic connectivity if ! ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then echo "ERROR: ns1 cannot reach ns2" 1>&2 - bash exit 1 fi
Greg Kroah-Hartman
maintainerPATCH 120/169 net: bridge: mcast: use multicast_membership_interval for IGMPv3
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
commit fac3cb82a54a4b7c49c932f96ef196cf5774344c upstream.
When I added IGMPv3 support I decided to follow the RFC for computing the GMI dynamically:
" 8.4. Group Membership Interval
The Group Membership Interval is the amount of time that must pass before a multicast router decides there are no more members of a group or a particular source on a network.
This value MUST be ((the Robustness Variable) times (the Query Interval)) plus (one Query Response Interval)."
But that actually is inconsistent with how the bridge used to compute it for IGMPv2, where it was user-configurable that has a correct default value but it is up to user-space to maintain it. This would make it consistent with the other timer values which are also maintained correct by the user instead of being dynamically computed. It also changes back to the previous user-expected GMI behaviour for IGMPv3 queries which were supported before IGMPv3 was added. Note that to properly compute it dynamically we would need to add support for "Robustness Variable" which is currently missing.
--- net/bridge/br_private.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/bridge/br_private.h +1 -3
@@ -1002,9 +1002,7 @@ static inline unsigned long br_multicaststatic inline unsigned long br_multicast_gmi (const struct net_bridge *br) { -/* use the RFC default of 2 for QRV */ -return 2 * br->multicast_query_interval + - br->multicast_query_response_interval; +return br->multicast_membership_interval; }#else static inline int br_multicast_rcv(struct net_bridge *br,
Greg Kroah-Hartman
maintainerPATCH 121/169 KVM: SEV-ES: Set guest_state_protected after VMSA update
In reply to Greg Kroah-HartmanFrom: Peter Gonda <[email protected]>
commit baa1e5ca172ce7bf9554070139482dd7ea919528 upstream.
The refactoring in commit bb18a6777465 ("KVM: SEV: Acquire vcpu mutex when updating VMSA") left behind the assignment to svm->vcpu.arch.guest_state_protected; add it back.
[Delta between v2 and v3 of Peter's patch, which had already been
committed; the commit message is my own. - Paolo]
--- arch/x86/kvm/svm/sev.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/sev.c +6 -1
@@ -619,7 +619,12 @@ static int __sev_launch_update_vmsa(stru vmsa.handle =to_kvm_svm (kvm)->sev_info.handle; vmsa.address =__sme_pa (svm->vmsa); vmsa.len =PAGE_SIZE ; -return sev_issue_cmd (kvm,SEV_CMD_LAUNCH_UPDATE_VMSA , &vmsa, error); + ret =sev_issue_cmd (kvm,SEV_CMD_LAUNCH_UPDATE_VMSA , &vmsa, error); +if (ret) +return ret; + + vcpu->arch.guest_state_protected = true; +return 0 ; }static int sev_launch_update_vmsa (struct kvm *kvm,struct kvm_sev_cmd *argp)
Greg Kroah-Hartman
maintainerPATCH 122/169 drm: mxsfb: Fix NULL pointer dereference crash on unload
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit 3cfc183052c3dbf8eae57b6c1685dab00ed3db4a upstream.
The mxsfb->crtc.funcs may already be NULL when unloading the driver, in which case calling mxsfb_irq_disable() via drm_irq_uninstall() from mxsfb_unload() leads to NULL pointer dereference.
Since all we care about is masking the IRQ and mxsfb->base is still valid, just use that to clear and mask the IRQ.
--- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_drv.c +5 -1
@@ -268,7 +268,11 @@ static void mxsfb_irq_disable(struct drmstruct mxsfb_drm_private *mxsfb = drm->dev_private;mxsfb_enable_axi_clk (mxsfb); - mxsfb->crtc.funcs->disable_vblank (&mxsfb->crtc); + +/* Disable and clear VBLANK IRQ */ +writel (CTRL1_CUR_FRAME_DONE_IRQ_EN , mxsfb->base +LCDC_CTRL1 +REG_CLR ); +writel (CTRL1_CUR_FRAME_DONE_IRQ , mxsfb->base +LCDC_CTRL1 +REG_CLR ); +mxsfb_disable_axi_clk (mxsfb); }
Greg Kroah-Hartman
maintainerPATCH 123/169 net: hns3: fix the max tx size according to user manual
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
commit adfb7b4966c0c4c63a791f202b8b3837b07a9ece upstream.
Currently the max tx size supported by the hw is calculated by using the max BD num supported by the hw. According to the hw user manual, the max tx size is fixed value for both non-TSO and TSO skb.
This patch updates the max tx size according to the manual.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 ++----- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +2 -5
@@ -1845,7 +1845,6 @@ void hns3_shinfo_pack(struct skb_shared_static int hns3_skb_linearize (struct hns3_enet_ring *ring,struct sk_buff *skb, -u8 max_non_tso_bd_num,unsigned int bd_num) {/* 'bd_num == UINT_MAX' means the skb' fraglist has a
@@ -1862,8 +1861,7 @@ static int hns3_skb_linearize(struct hns* will not help. */ if (skb->len >HNS3_MAX_TSO_SIZE || - (!skb_is_gso (skb) && skb->len > -HNS3_MAX_NON_TSO_SIZE (max_non_tso_bd_num))) { + (!skb_is_gso (skb) && skb->len >HNS3_MAX_NON_TSO_SIZE )) {u64_stats_update_begin (&ring->syncp); ring->stats.hw_limitation++;u64_stats_update_end (&ring->syncp);
@@ -1898,8 +1896,7 @@ static int hns3_nic_maybe_stop_tx(struct goto out; } -if (hns3_skb_linearize (ring, skb, max_non_tso_bd_num, - bd_num)) +if (hns3_skb_linearize (ring, skb, bd_num))return -ENOMEM ; bd_num =hns3_tx_bd_count (skb->len);
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +2 -4
@@ -185,11 +185,9 @@ enum hns3_nic_state {#define HNS3_MAX_BD_SIZE 65535#define HNS3_MAX_TSO_BD_NUM 63U -#define HNS3_MAX_TSO_SIZE \ - (HNS3_MAX_BD_SIZE * HNS3_MAX_TSO_BD_NUM) +#define HNS3_MAX_TSO_SIZE 1048576U +#define HNS3_MAX_NON_TSO_SIZE 9728U -#define HNS3_MAX_NON_TSO_SIZE (max_non_tso_bd_num) \ - (HNS3_MAX_BD_SIZE * (max_non_tso_bd_num))#define HNS3_VECTOR_GL0_OFFSET 0x100#define HNS3_VECTOR_GL1_OFFSET 0x200
Greg Kroah-Hartman
maintainerPATCH 124/169 KVM: MMU: Reset mmu->pkru_mask to avoid stale data
In reply to Greg Kroah-HartmanFrom: Chenyi Qiang <[email protected]>
commit a3ca5281bb771d8103ea16f0a6a8a5df9a7fb4f3 upstream.
When updating mmu->pkru_mask, the value can only be added but it isn't reset in advance. This will make mmu->pkru_mask keep the stale data. Fix this issue.
Message-Id: <[email protected]>
--- arch/x86/kvm/mmu/mmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/mmu/mmu.c +3 -3
@@ -4465,10 +4465,10 @@ static void update_pkru_bitmask(struct kunsigned bit;bool wp; -if (!is_cr4_pke (mmu)) { - mmu->pkru_mask =0 ; + mmu->pkru_mask =0 ; + +if (!is_cr4_pke (mmu))return ; - } wp =is_cr0_wp (mmu);
Greg Kroah-Hartman
maintainerPATCH 125/169 kunit: fix reference count leak in kfree_at_end
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
[ Upstream commit f62314b1ced25c58b86e044fc951cd6a1ea234cf ]
The reference counting issue happens in the normal path of kfree_at_end(). When kunit_alloc_and_get_resource() is invoked, the function forgets to handle the returned resource object, whose refcount increased inside, causing a refcount leak.
Fix this issue by calling kunit_alloc_resource() instead of kunit_alloc_and_get_resource().
Fixed the following when applying:
Shuah Khan <[email protected]>
CHECK: Alignment should match open parenthesis
+ kunit_alloc_resource(test, NULL, kfree_res_free, GFP_KERNEL,
(void *)to_free);
--- lib/kunit/executor_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/kunit/executor_test.c +2 -2
@@ -116,8 +116,8 @@ static void kfree_at_end(struct kunit *test, const void *to_free)/* kfree() handles NULL already, but avoid allocating a no-op cleanup. */ if (IS_ERR_OR_NULL (to_free))return ; -kunit_alloc_and_get_resource (test,NULL , kfree_res_free,GFP_KERNEL , - (void *)to_free); +kunit_alloc_resource (test,NULL , kfree_res_free,GFP_KERNEL , + (void *)to_free); } static struct kunit_suite *alloc_fake_suite(struct kunit *test,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 126/169 drm/msm/a6xx: Serialize GMU communication
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit f6f59072e821901d96c791864a07d57d8ec8d312 ]
I've seen some crashes in our crash reporting that *look* like multiple threads stomping on each other while communicating with GMU. So wrap all those paths in a lock.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 ++++ drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 ++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 40 +++++++++++++++++++++++---- 3 files changed, 43 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +6 -0
@@ -296,6 +296,8 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state)u32 val;int request, ack; +WARN_ON_ONCE (!mutex_is_locked (&gmu->lock)); +if (state >=ARRAY_SIZE (a6xx_gmu_oob_bits))return -EINVAL ;
@@ -337,6 +339,8 @@ void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state) {int bit; +WARN_ON_ONCE (!mutex_is_locked (&gmu->lock)); +if (state >=ARRAY_SIZE (a6xx_gmu_oob_bits))return ;
@@ -1478,6 +1482,8 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)if (!pdev)return -ENODEV ; +mutex_init (&gmu->lock); + gmu->dev = &pdev->dev;of_dma_configure (gmu->dev, node, true);
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +3 -0
@@ -44,6 +44,9 @@ struct a6xx_gmu_bo {struct a6xx_gmu {struct device *dev; +/* For serializing communication with the GMU: */ +struct mutex lock; +struct msm_gem_address_space *aspace;void *__iomem mmio;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +34 -6
@@ -859,7 +859,7 @@ static int a6xx_zap_shader_init(struct msm_gpu *gpu) A6XX_RBBM_INT_0_MASK_UCHE_OOB_ACCESS | \ A6XX_RBBM_INT_0_MASK_UCHE_TRAP_INTR) -static int a6xx_hw_init (struct msm_gpu *gpu) +static int hw_init (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);
@@ -1107,6 +1107,19 @@ out:return ret; } +static int a6xx_hw_init (struct msm_gpu *gpu) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +int ret; + +mutex_lock (&a6xx_gpu->gmu.lock); + ret =hw_init (gpu); +mutex_unlock (&a6xx_gpu->gmu.lock); + +return ret; +} +static void a6xx_dump (struct msm_gpu *gpu) { DRM_DEV_INFO(&gpu->pdev->dev, "status: %08x\n",
@@ -1481,7 +1494,9 @@ static int a6xx_pm_resume(struct msm_gpu *gpu)trace_msm_gpu_resume (0 ); +mutex_lock (&a6xx_gpu->gmu.lock); ret =a6xx_gmu_resume (a6xx_gpu); +mutex_unlock (&a6xx_gpu->gmu.lock);if (ret)return ret;
@@ -1504,7 +1519,9 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu)devfreq_suspend_device (gpu->devfreq.devfreq); +mutex_lock (&a6xx_gpu->gmu.lock); ret =a6xx_gmu_stop (a6xx_gpu); +mutex_unlock (&a6xx_gpu->gmu.lock);if (ret)return ret;
@@ -1519,18 +1536,19 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); -static DEFINE_MUTEX (perfcounter_oob); -mutex_lock (&perfcounter_oob); +mutex_lock (&a6xx_gpu->gmu.lock);/* Force the GPU power on so we can read this register */ a6xx_gmu_set_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET ); *value =gpu_read64 (gpu,REG_A6XX_CP_ALWAYS_ON_COUNTER_LO , -REG_A6XX_CP_ALWAYS_ON_COUNTER_HI ); +REG_A6XX_CP_ALWAYS_ON_COUNTER_HI );a6xx_gmu_clear_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET ); -mutex_unlock (&perfcounter_oob); + +mutex_unlock (&a6xx_gpu->gmu.lock); +return 0 ; }
@@ -1594,6 +1612,16 @@ static unsigned long a6xx_gpu_busy(struct msm_gpu *gpu)return (unsigned long )busy_time; } +void a6xx_gpu_set_freq (struct msm_gpu *gpu,struct dev_pm_opp *opp) +{ +struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu); +struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); + +mutex_lock (&a6xx_gpu->gmu.lock); +a6xx_gmu_set_freq (gpu, opp); +mutex_unlock (&a6xx_gpu->gmu.lock); +} +static struct msm_gem_address_space *a6xx_create_address_space (struct msm_gpu *gpu,struct platform_device *pdev) {
@@ -1740,7 +1768,7 @@ static const struct adreno_gpu_funcs funcs = {#endif .gpu_busy = a6xx_gpu_busy, .gpu_get_freq = a6xx_gmu_get_freq, - .gpu_set_freq = a6xx_gmu_set_freq, + .gpu_set_freq = a6xx_gpu_set_freq,#if defined(CONFIG_DRM_MSM_GPU_STATE ) .gpu_state_get = a6xx_gpu_state_get, .gpu_state_put = a6xx_gpu_state_put,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 127/169 gcc-plugins/structleak: add makefile var for disabling structleak
In reply to Greg Kroah-HartmanFrom: Brendan Higgins <[email protected]>
[ Upstream commit 554afc3b9797511e3245864e32aebeb6abbab1e3 ]
KUnit and structleak don't play nice, so add a makefile variable for enabling structleak when it complains.
--- scripts/Makefile.gcc-plugins | 4 ++++ 1 file changed, 4 insertions(+)
scripts/Makefile.gcc-plugins +4 -0
@@ -19,6 +19,10 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF) \ += -fplugin-arg-structleak_plugin-byref gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) \ += -fplugin-arg-structleak_plugin-byref-all +ifdef CONFIG_GCC_PLUGIN_STRUCTLEAK + DISABLE_STRUCTLEAK_PLUGIN += -fplugin-arg-structleak_plugin-disable +endif +export DISABLE_STRUCTLEAK_PLUGIN gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK) \ += -DSTRUCTLEAK_PLUGIN
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 128/169 iio/test-format: build kunit tests without structleak plugin
In reply to Greg Kroah-HartmanFrom: Brendan Higgins <[email protected]>
[ Upstream commit 2326f3cdba1d105b68cc1295e78f17ae8faa5a76 ]
The structleak plugin causes the stack frame size to grow immensely when used with KUnit:
../drivers/iio/test/iio-test-format.c: In function ‘iio_test_iio_format_value_fixedpoint’:../drivers/iio/test/iio-test-format.c:98:1: warning: the frame size of 2336 bytes is larger than 2048 bytes [-Wframe-larger-than=]
Turn it off in this file.
--- drivers/iio/test/Makefile | 1 + 1 file changed, 1 insertion(+)
drivers/iio/test/Makefile +1 -0
@@ -5,3 +5,4 @@ # Keep in alphabetical order obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o +CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 129/169 device property: build kunit tests without structleak plugin
In reply to Greg Kroah-HartmanFrom: Brendan Higgins <[email protected]>
[ Upstream commit 6a1e2d93d55b000962b82b9a080006446150b022 ]
The structleak plugin causes the stack frame size to grow immensely when used with KUnit:
../drivers/base/test/property-entry-test.c:492:1: warning: the frame size of 2832 bytes is larger than 2048 bytes [-Wframe-larger-than=] ../drivers/base/test/property-entry-test.c:322:1: warning: the frame size of 2080 bytes is larger than 2048 bytes [-Wframe-larger-than=] ../drivers/base/test/property-entry-test.c:250:1: warning: the frame size of 4976 bytes is larger than 2048 bytes [-Wframe-larger-than=] ../drivers/base/test/property-entry-test.c:115:1: warning: the frame size of 3280 bytes is larger than 2048 bytes [-Wframe-larger-than=]
Turn it off in this file.
--- drivers/base/test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/test/Makefile +1 -1
@@ -2,4 +2,4 @@ obj-$(CONFIG_TEST_ASYNC_DRIVER_PROBE) += test_async_driver_probe.o obj-$(CONFIG_DRIVER_PE_KUNIT_TEST) += property-entry-test.o -CFLAGS_REMOVE_property-entry-test.o += -fplugin-arg-structleak_plugin-byref -fplugin-arg-structleak_plugin-byref-all +CFLAGS_property-entry-test.o += $(DISABLE_STRUCTLEAK_PLUGIN)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 130/169 thunderbolt: build kunit tests without structleak plugin
In reply to Greg Kroah-HartmanFrom: Brendan Higgins <[email protected]>
[ Upstream commit 33d4951e021bb67ebd6bdb01f3d437c0f45b3c0c ]
The structleak plugin causes the stack frame size to grow immensely when used with KUnit:
drivers/thunderbolt/test.c:1529:1: error: the frame size of 1176 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
Turn it off in this file.
Linus already split up tests in this file, so this change *should* be redundant now.
--- drivers/thunderbolt/Makefile | 1 + 1 file changed, 1 insertion(+)
drivers/thunderbolt/Makefile +1 -0
@@ -7,6 +7,7 @@ thunderbolt-objs += usb4_port.o nvm.o retimer.o quirks.o thunderbolt-${CONFIG_ACPI} += acpi.o thunderbolt-$(CONFIG_DEBUG_FS) += debugfs.o thunderbolt-${CONFIG_USB4_KUNIT_TEST} += test.o +CFLAGS_test.o += $(DISABLE_STRUCTLEAK_PLUGIN) thunderbolt_dma_test-${CONFIG_USB4_DMA_TEST} += dma_test.o obj-$(CONFIG_USB4_DMA_TEST) += thunderbolt_dma_test.o
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 131/169 bitfield: build kunit tests without structleak plugin
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a8cf90332ae3e2b53813a146a99261b6a5e16a73 ]
The structleak plugin causes the stack frame size to grow immensely:
lib/bitfield_kunit.c: In function 'test_bitfields_constants':lib/bitfield_kunit.c:93:1: error: the frame size of 7440 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
Turn it off in this file.
--- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/Makefile +1 -1
@@ -351,7 +351,7 @@ obj-$(CONFIG_OBJAGG) += objagg.o obj-$(CONFIG_PLDMFW) += pldmfw/ # KUnit tests -CFLAGS_bitfield_kunit.o := $(call cc-option,-Wframe-larger-than=10240) +CFLAGS_bitfield_kunit.o := $(DISABLE_STRUCTLEAK_PLUGIN) obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 132/169 objtool: Check for gelf_update_rel[a] failures
In reply to Greg Kroah-HartmanFrom: Michael Forney <[email protected]>
[ Upstream commit b46179d6bb3182c020f2bf9bb4df6ba5463b0495 ]
Otherwise, if these fail we end up with garbage data in the .rela.orc_unwind_ip section, leading to errors like
ld: fs/squashfs/namei.o: bad reloc symbol index (0x7f16 >= 0x12) for offset 0x7f16d5c82cc8 in section `.orc_unwind_ip'
--- tools/objtool/elf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
tools/objtool/elf.c +8 -2
@@ -1003,7 +1003,10 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr)list_for_each_entry (reloc, &sec->reloc_list, list) { reloc->rel.r_offset = reloc->offset; reloc->rel.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); -gelf_update_rel (sec->data, idx, &reloc->rel); +if (!gelf_update_rel (sec->data, idx, &reloc->rel)) { +WARN_ELF ("gelf_update_rel" ); +return -1 ; + } idx++; }
@@ -1035,7 +1038,10 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr) reloc->rela.r_offset = reloc->offset; reloc->rela.r_addend = reloc->addend; reloc->rela.r_info =GELF_R_INFO (reloc->sym->idx, reloc->type); -gelf_update_rela (sec->data, idx, &reloc->rela); +if (!gelf_update_rela (sec->data, idx, &reloc->rela)) { +WARN_ELF ("gelf_update_rela" ); +return -1 ; + } idx++; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 133/169 objtool: Update section header before relocations
In reply to Greg Kroah-HartmanFrom: Michael Forney <[email protected]>
[ Upstream commit 86e1e054e0d2105cf32b0266cf1a64e6c26424f7 ]
The libelf implementation from elftoolchain has a safety check in gelf_update_rel[a] to check that the data corresponds to a section that has type SHT_REL[A] [0]. If the relocation is updated before the section header is updated with the proper type, this check fails.
To fix this, update the section header first, before the relocations. Previously, the section size was calculated in elf_rebuild_reloc_section by counting the number of entries in the reloc_list. However, we now need the size during elf_write so instead keep a running total and add to it for every new relocation.
--- tools/objtool/elf.c | 46 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 29 deletions(-)
tools/objtool/elf.c +17 -29
@@ -509,6 +509,7 @@ int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,list_add_tail (&reloc->list, &sec->reloc->reloc_list);elf_hash_add (reloc, &reloc->hash,reloc_hash (reloc)); + sec->reloc->sh.sh_size += sec->reloc->sh.sh_entsize; sec->reloc->changed = true;return 0 ;
@@ -979,26 +980,23 @@ static struct section *elf_create_reloc_section(struct elf *elf, } } -static int elf_rebuild_rel_reloc_section (struct section *sec,int nr) +static int elf_rebuild_rel_reloc_section (struct section *sec) {struct reloc *reloc; -int idx =0 , size; +int idx =0 ;void *buf;/* Allocate a buffer for relocations */ - size = nr *sizeof (GElf_Rel); - buf =malloc (size); + buf =malloc (sec->sh.sh_size);if (!buf) {perror ("malloc" );return -1 ; } sec->data->d_buf = buf; - sec->data->d_size = size; + sec->data->d_size = sec->sh.sh_size; sec->data->d_type =ELF_T_REL ; - sec->sh.sh_size = size; - idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { reloc->rel.r_offset = reloc->offset;
@@ -1013,26 +1011,23 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr)return 0 ; } -static int elf_rebuild_rela_reloc_section (struct section *sec,int nr) +static int elf_rebuild_rela_reloc_section (struct section *sec) {struct reloc *reloc; -int idx =0 , size; +int idx =0 ;void *buf;/* Allocate a buffer for relocations with addends */ - size = nr *sizeof (GElf_Rela); - buf =malloc (size); + buf =malloc (sec->sh.sh_size);if (!buf) {perror ("malloc" );return -1 ; } sec->data->d_buf = buf; - sec->data->d_size = size; + sec->data->d_size = sec->sh.sh_size; sec->data->d_type =ELF_T_RELA ; - sec->sh.sh_size = size; - idx =0 ;list_for_each_entry (reloc, &sec->reloc_list, list) { reloc->rela.r_offset = reloc->offset;
@@ -1050,16 +1045,9 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr)static int elf_rebuild_reloc_section (struct elf *elf,struct section *sec) { -struct reloc *reloc; -int nr; - - nr =0 ; -list_for_each_entry (reloc, &sec->reloc_list, list) - nr++; -switch (sec->sh.sh_type) { -case SHT_REL :return elf_rebuild_rel_reloc_section (sec, nr); -case SHT_RELA :return elf_rebuild_rela_reloc_section (sec, nr); +case SHT_REL :return elf_rebuild_rel_reloc_section (sec); +case SHT_RELA :return elf_rebuild_rela_reloc_section (sec);default :return -1 ; } }
@@ -1119,12 +1107,6 @@ int elf_write(struct elf *elf)/* Update changed relocation sections and section headers: */ list_for_each_entry (sec, &elf->sections, list) {if (sec->changed) { -if (sec->base && -elf_rebuild_reloc_section (elf, sec)) { -WARN ("elf_rebuild_reloc_section" ); -return -1 ; - } - s =elf_getscn (elf->elf, sec->idx);if (!s) {WARN_ELF ("elf_getscn" );
@@ -1135,6 +1117,12 @@ int elf_write(struct elf *elf)return -1 ; } +if (sec->base && +elf_rebuild_reloc_section (elf, sec)) { +WARN ("elf_rebuild_reloc_section" ); +return -1 ; + } + sec->changed = false; elf->changed = true; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 134/169 ALSA: hda: intel: Allow repeatedly probing on codec configuration errors
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit c0f1886de7e173865f1a0fa7680a1c07954a987f ]
It seems that a few recent AMD systems show the codec configuration errors at the early boot, while loading the driver at a later stage works magically. Although the root cause of the error isn't clear, it's certainly not bad to allow retrying the codec probe in such a case if that helps.
This patch adds the capability for retrying the probe upon codec probe errors on the certain AMD platforms. The probe_work is changed to a delayed work, and at the secondary call, it'll jump to the codec probing.
Note that, not only adding the re-probing, this includes the behavior changes in the codec configuration function. Namely, snd_hda_codec_configure() won't unregister the codec at errors any longer. Instead, its caller, azx_codec_configure() unregisters the codecs with the probe failures *if* any codec has been successfully configured. If all codec probe failed, it doesn't unregister but let it re-probed -- which is the most case we're seeing and this patch tries to improve.
Even if the driver doesn't re-probe or give up, it will go to the "free-all" error path, hence the leftover codecs shall be disabled / deleted in anyway.
--- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_bind.c | 20 +++++++++++--------- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_controller.c | 24 ++++++++++++++++-------- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 29 +++++++++++++++++++++++------ sound/pci/hda/hda_intel.h | 4 +++- 7 files changed, 56 insertions(+), 25 deletions(-)
include/sound/hda_codec.h +1 -0
@@ -225,6 +225,7 @@ struct hda_codec {#endif /* misc flags */ + unsigned int configured:1; /* codec was configured */ unsigned int in_freeing:1; /* being released */ unsigned int registered:1; /* codec was registered */ unsigned int display_power_control:1; /* needs display power */
sound/pci/hda/hda_bind.c +11 -9
@@ -304,29 +304,31 @@ int snd_hda_codec_configure(struct hda_codec *codec) {int err; +if (codec->configured) +return 0 ; +if (is_generic_config (codec)) codec->probe_id =HDA_CODEC_ID_GENERIC ;else codec->probe_id =0 ; - err =snd_hdac_device_register (&codec->core); -if (err <0 ) -return err; +if (!device_is_registered (&codec->core.dev)) { + err =snd_hdac_device_register (&codec->core); +if (err <0 ) +return err; + }if (!codec->preset)codec_bind_module (codec);if (!codec->preset) { err =codec_bind_generic (codec);if (err <0 ) { -codec_err (codec,"Unable to bind the codec\n" ); - goto error; +codec_dbg (codec,"Unable to bind the codec\n" ); +return err; } } + codec->configured =1 ;return 0 ; - - error: -snd_hdac_device_unregister (&codec->core); -return err; }EXPORT_SYMBOL_GPL (snd_hda_codec_configure);
sound/pci/hda/hda_codec.c +1 -0
@@ -791,6 +791,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec)snd_array_free (&codec->nids);remove_conn_list (codec);snd_hdac_regmap_exit (&codec->core); + codec->configured =0 ; }EXPORT_SYMBOL_GPL (snd_hda_codec_cleanup_for_unbind);
sound/pci/hda/hda_controller.c +16 -8
@@ -25,6 +25,7 @@#include <sound/core.h> #include <sound/initval.h> #include "hda_controller.h" +#include "hda_local.h" #define CREATE_TRACE_POINTS #include "hda_controller_trace.h"
@@ -1259,17 +1260,24 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);int azx_codec_configure (struct azx *chip) {struct hda_codec *codec, *next; +int success =0 ; -/* use _safe version here since snd_hda_codec_configure() deregisters -* the device upon error and deletes itself from the bus list. -*/ -list_for_each_codec_safe (codec, next, &chip->bus) { -snd_hda_codec_configure (codec); +list_for_each_codec (codec, &chip->bus) { +if (!snd_hda_codec_configure (codec)) + success++; } -if (!azx_bus (chip)->num_codecs) -return -ENODEV ; -return 0 ; +if (success) { +/* unregister failed codecs if any codec has been probed */ +list_for_each_codec_safe (codec, next, &chip->bus) { +if (!codec->configured) { +codec_err (codec,"Unable to configure, disabling\n" ); +snd_hdac_device_unregister (&codec->core); + } + } + } + +return success ?0 : -ENODEV ; }EXPORT_SYMBOL_GPL (azx_codec_configure);
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_RETRY_PROBE (1 << 27)/* retry probe if no codec is configured */ #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 +23 -6
@@ -307,7 +307,8 @@ enum {/* quirks for AMD SB */ #define AZX_DCAPS_PRESET_AMD_SB \ (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_AMD_WORKAROUND |\ - AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME) + AZX_DCAPS_SNOOP_TYPE(ATI) | AZX_DCAPS_PM_RUNTIME |\ + AZX_DCAPS_RETRY_PROBE)/* quirks for Nvidia */ #define AZX_DCAPS_PRESET_NVIDIA \
@@ -1730,7 +1731,7 @@ static void azx_check_snoop_available(struct azx *chip)static void azx_probe_work (struct work_struct *work) { - struct hda_intel *hda = container_of(work, struct hda_intel, probe_work); + struct hda_intel *hda = container_of(work, struct hda_intel, probe_work.work);azx_probe_continue (&hda->chip); }
@@ -1839,7 +1840,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, }/* continue probing in work context as may trigger request module */ -INIT_WORK (&hda->probe_work, azx_probe_work); +INIT_DELAYED_WORK (&hda->probe_work, azx_probe_work); *rchip = chip;
@@ -2170,7 +2171,7 @@ static int azx_probe(struct pci_dev *pci,#endif if (schedule_probe) -schedule_work (&hda->probe_work); +schedule_delayed_work (&hda->probe_work,0 ); dev++;if (chip->disabled)
@@ -2256,6 +2257,11 @@ static int azx_probe_continue(struct azx *chip)int dev = chip->dev_index;int err; +if (chip->disabled || hda->init_failed) +return -EIO ; +if (hda->probe_retry) + goto probe_retry; +to_hda_bus (bus)->bus_probing =1 ; hda->probe_continued =1 ;
@@ -2317,10 +2323,20 @@ static int azx_probe_continue(struct azx *chip) #endif }#endif + + probe_retry:if (bus->codec_mask && !(probe_only[dev] &1 )) { err =azx_codec_configure (chip); -if (err <0 ) +if (err) { +if ((chip->driver_caps &AZX_DCAPS_RETRY_PROBE ) && + ++hda->probe_retry <60 ) { +schedule_delayed_work (&hda->probe_work, +msecs_to_jiffies (1000 )); +return 0 ;/* keep things up */ + } +dev_err (chip->card->dev,"Cannot probe codecs, giving up\n" ); goto out_free; + } } err =snd_card_register (chip->card);
@@ -2350,6 +2366,7 @@ out_free:display_power (chip, false);complete_all (&hda->probe_wait);to_hda_bus (bus)->bus_probing =0 ; + hda->probe_retry =0 ;return 0 ; }
@@ -2375,7 +2392,7 @@ static void azx_remove(struct pci_dev *pci)* device during cancel_work_sync() call. */ device_unlock (&pci->dev); -cancel_work_sync (&hda->probe_work); +cancel_delayed_work_sync (&hda->probe_work);device_lock (&pci->dev);snd_card_free (card);
sound/pci/hda/hda_intel.h +3 -1
@@ -14,7 +14,7 @@ struct hda_intel {/* sync probing */ struct completion probe_wait; -struct work_struct probe_work; +struct delayed_work probe_work;/* card list (for power_save trigger) */ struct list_head list;
@@ -30,6 +30,8 @@ struct hda_intel { unsigned int freed:1; /* resources already released */ bool need_i915_power:1; /* the hda controller needs i915 power */ + + int probe_retry; /* being probe-retry */ };#endif
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 135/169 btrfs: deal with errors when checking if a dir entry exists during log replay
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 77a5b9e3d14cbce49ceed2766b2003c034c066dc ]
Currently inode_in_dir() ignores errors returned from btrfs_lookup_dir_index_item() and from btrfs_lookup_dir_item(), treating any errors as if the directory entry does not exists in the fs/subvolume tree, which is obviously not correct, as we can get errors such as -EIO when reading extent buffers while searching the fs/subvolume's tree.
Fix that by making inode_in_dir() return the errors and making its only caller, add_inode_ref(), deal with returned errors as well.
--- fs/btrfs/tree-log.c | 47 ++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 18 deletions(-)
fs/btrfs/tree-log.c +29 -18
@@ -939,9 +939,11 @@ out: }/* -* helper function to see if a given name and sequence number found -* in an inode back reference are already in a directory and correctly -* point to this inode +* See if a given name and sequence number found in an inode back reference are +* already in a directory and correctly point to this inode. +* +* Returns: < 0 on error, 0 if the directory entry does not exists and 1 if it +* exists. */ static noinline int inode_in_dir(struct btrfs_root *root, struct btrfs_path *path,
@@ -950,29 +952,35 @@ static noinline int inode_in_dir(struct btrfs_root *root, {struct btrfs_dir_item *di;struct btrfs_key location; -int match =0 ; +int ret =0 ; di =btrfs_lookup_dir_index_item (NULL , root, path, dirid, index, name, name_len,0 ); -if (di && !IS_ERR (di)) { +if (IS_ERR (di)) { +if (PTR_ERR (di) != -ENOENT ) + ret =PTR_ERR (di); + goto out; + }else if (di) {btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location);if (location.objectid != objectid) goto out; - }else + }else { goto out; -btrfs_release_path (path); + } +btrfs_release_path (path); di =btrfs_lookup_dir_item (NULL , root, path, dirid, name, name_len,0 ); -if (di && !IS_ERR (di)) { -btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location); -if (location.objectid != objectid) - goto out; - }else +if (IS_ERR (di)) { + ret =PTR_ERR (di); goto out; - match =1 ; + }else if (di) { +btrfs_dir_item_key_to_cpu (path->nodes[0 ], di, &location); +if (location.objectid == objectid) + ret =1 ; + } out:btrfs_release_path (path); -return match; +return ret; }/*
@@ -1522,10 +1530,12 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (ret) goto out; -/* if we already have a perfect match, we're done */ -if (!inode_in_dir (root, path,btrfs_ino (BTRFS_I (dir)), -btrfs_ino (BTRFS_I (inode)), ref_index, - name, namelen)) { + ret =inode_in_dir (root, path,btrfs_ino (BTRFS_I (dir)), +btrfs_ino (BTRFS_I (inode)), ref_index, + name, namelen); +if (ret <0 ) { + goto out; + }else if (ret ==0 ) {/* * look for a conflicting back reference in the * metadata. if we find one we have to unlink that name
@@ -1585,6 +1595,7 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,if (ret) goto out; } +/* Else, ret == 1, we already have a perfect match, we're done. */ ref_ptr = (unsigned long )(ref_ptr + ref_struct_size) + namelen;kfree (name);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 136/169 net: stmmac: add support for dwmac 3.40a
In reply to Greg Kroah-HartmanFrom: Herve Codina <[email protected]>
[ Upstream commit 9cb1d19f47fafad7dcf7c8564e633440c946cfd7 ]
dwmac 3.40a is an old ip version that can be found on SPEAr3xx soc.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++++++ 2 files changed, 9 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c +1 -0
@@ -71,6 +71,7 @@ err_remove_config_dt:static const struct of_device_id dwmac_generic_match[] = { { .compatible ="st,spear600-gmac" }, + { .compatible ="snps,dwmac-3.40a" }, { .compatible ="snps,dwmac-3.50a" }, { .compatible ="snps,dwmac-3.610" }, { .compatible ="snps,dwmac-3.70a" },
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +8 -0
@@ -508,6 +508,14 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) plat->pmt =1 ; } +if (of_device_is_compatible (np,"snps,dwmac-3.40a" )) { + plat->has_gmac =1 ; + plat->enh_desc =1 ; + plat->tx_coe =1 ; + plat->bugged_jumbo =1 ; + plat->pmt =1 ; + } + if (of_device_is_compatible(np, "snps,dwmac-4.00") || of_device_is_compatible(np, "snps,dwmac-4.10a") || of_device_is_compatible(np, "snps,dwmac-4.20a") ||
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 137/169 ARM: dts: spear3xx: Fix gmac node
In reply to Greg Kroah-HartmanFrom: Herve Codina <[email protected]>
[ Upstream commit 6636fec29cdf6665bd219564609e8651f6ddc142 ]
On SPEAr3xx, ethernet driver is not compatible with the SPEAr600 one.
Indeed, SPEAr3xx uses an earlier version of this IP (v3.40) and needs some driver tuning compare to SPEAr600.
The v3.40 IP support was added to stmmac driver and this patch fixes this issue and use the correct compatible string for SPEAr3xx
--- arch/arm/boot/dts/spear3xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/spear3xx.dtsi +1 -1
@@ -47,7 +47,7 @@ }; gmac: eth@e0800000 { - compatible = "st,spear600-gmac"; + compatible = "snps,dwmac-3.40a"; reg = <0xe0800000 0x8000>; interrupts = <23 22>; interrupt-names = "macirq", "eth_wake_irq";
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 138/169 isdn: mISDN: Fix sleeping function called from invalid context
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 6510e80a0b81b5d814e3aea6297ba42f5e76f73c ]
The driver can call card->isac.release() function from an atomic context.
Fix this by calling this function after releasing the lock.
The following log reveals it:
[ 44.168226 ] BUG: sleeping function called from invalid context at kernel/workqueue.c:3018 [ 44.168941 ] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 5475, name: modprobe [ 44.169574 ] INFO: lockdep is turned off. [ 44.169899 ] irq event stamp: 0 [ 44.170160 ] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 44.170627 ] hardirqs last disabled at (0): [<ffffffff814209ed>] copy_process+0x132d/0x3e00 [ 44.171240 ] softirqs last enabled at (0): [<ffffffff81420a1a>] copy_process+0x135a/0x3e00 [ 44.171852 ] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 44.172318 ] Preemption disabled at: [ 44.172320 ] [<ffffffffa009b0a9>] nj_release+0x69/0x500 [netjet] [ 44.174441 ] Call Trace: [ 44.174630 ] dump_stack_lvl+0xa8/0xd1 [ 44.174912 ] dump_stack+0x15/0x17 [ 44.175166 ] ___might_sleep+0x3a2/0x510 [ 44.175459 ] ? nj_release+0x69/0x500 [netjet] [ 44.175791 ] __might_sleep+0x82/0xe0 [ 44.176063 ] ? start_flush_work+0x20/0x7b0 [ 44.176375 ] start_flush_work+0x33/0x7b0 [ 44.176672 ] ? trace_irq_enable_rcuidle+0x85/0x170 [ 44.177034 ] ? kasan_quarantine_put+0xaa/0x1f0 [ 44.177372 ] ? kasan_quarantine_put+0xaa/0x1f0 [ 44.177711 ] __flush_work+0x11a/0x1a0 [ 44.177991 ] ? flush_work+0x20/0x20 [ 44.178257 ] ? lock_release+0x13c/0x8f0 [ 44.178550 ] ? __kasan_check_write+0x14/0x20 [ 44.178872 ] ? do_raw_spin_lock+0x148/0x360 [ 44.179187 ] ? read_lock_is_recursive+0x20/0x20 [ 44.179530 ] ? __kasan_check_read+0x11/0x20 [ 44.179846 ] ? do_raw_spin_unlock+0x55/0x900 [ 44.180168 ] ? ____kasan_slab_free+0x116/0x140 [ 44.180505 ] ? _raw_spin_unlock_irqrestore+0x41/0x60 [ 44.180878 ] ? skb_queue_purge+0x1a3/0x1c0 [ 44.181189 ] ? kfree+0x13e/0x290 [ 44.181438 ] flush_work+0x17/0x20 [ 44.181695 ] mISDN_freedchannel+0xe8/0x100 [ 44.182006 ] isac_release+0x210/0x260 [mISDNipac] [ 44.182366 ] nj_release+0xf6/0x500 [netjet] [ 44.182685 ] nj_remove+0x48/0x70 [netjet] [ 44.182989 ] pci_device_remove+0xa9/0x250
--- drivers/isdn/hardware/mISDN/netjet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/isdn/hardware/mISDN/netjet.c +1 -1
@@ -949,8 +949,8 @@ nj_release(struct tiger_hw *card)nj_disable_hwirq (card);mode_tiger (&card->bc[0 ],ISDN_P_NONE );mode_tiger (&card->bc[1 ],ISDN_P_NONE ); - card->isac.release (&card->isac);spin_unlock_irqrestore (&card->lock, flags); + card->isac.release (&card->isac);release_region (card->base, card->base_s); card->base_s =0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 139/169 platform/x86: intel_scu_ipc: Increase virtual timeout to 10s
In reply to Greg Kroah-HartmanFrom: Prashant Malani <[email protected]>
[ Upstream commit 5c02b581ce84eea240d25c8318a1f65133a04415 ]
Commit a7d53dbbc70a ("platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds") states that the recommended timeout range is 5-10 seconds. Adjust the timeout value to the higher of those i.e 10 seconds, to account for situations where the 5 seconds is insufficient for disconnect command success.
--- drivers/platform/x86/intel_scu_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -75,7 +75,7 @@ struct intel_scu_ipc_dev {#define IPC_READ_BUFFER 0x90/* Timeout in jiffies */ -#define IPC_TIMEOUT (5 * HZ) +#define IPC_TIMEOUT (10 * HZ)static struct intel_scu_ipc_dev *ipcdev;/* Only one for now */ static DEFINE_MUTEX (ipclock);/* lock used to prevent multiple call to SCU */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 140/169 platform/x86: intel_scu_ipc: Update timeout value in comment
In reply to Greg Kroah-HartmanFrom: Prashant Malani <[email protected]>
[ Upstream commit a0c5814b9933f25ecb6de169483c5b88cf632bca ]
The comment decribing the IPC timeout hadn't been updated when the actual timeout was changed from 3 to 5 seconds in
commit a7d53dbbc70a ("platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds") .
Since the value is anyway updated to 10s now, take this opportunity to update the value in the comment too.
--- drivers/platform/x86/intel_scu_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -247,7 +247,7 @@ static inline int busy_loop(struct intel_scu_ipc_dev *scu)return -ETIMEDOUT ; } -/* Wait till ipc ioc interrupt is received or timeout in 3 HZ */ +/* Wait till ipc ioc interrupt is received or timeout in 10 HZ */ static inline int ipc_wait_for_interrupt (struct intel_scu_ipc_dev *scu) {int status;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 141/169 ALSA: hda: avoid write to STATESTS if controller is in reset
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit b37a15188eae9d4c49c5bb035e0c8d4058e4d9b3 ]
The snd_hdac_bus_reset_link() contains logic to clear STATESTS register before performing controller reset. This code dates back to an old bugfix in commit e8a7f136f5ed ("[ALSA] hda-intel - Improve HD-audio codec probing robustness"). Originally the code was added to azx_reset().
The code was moved around in commit a41d122449be ("ALSA: hda - Embed bus into controller object") and ended up to snd_hdac_bus_reset_link() and called primarily via snd_hdac_bus_init_chip().
The logic to clear STATESTS is correct when snd_hdac_bus_init_chip() is called when controller is not in reset. In this case, STATESTS can be cleared. This can be useful e.g. when forcing a controller reset to retry codec probe. A normal non-power-on reset will not clear the bits.
However, this old logic is problematic when controller is already in reset. The HDA specification states that controller must be taken out of reset before writing to registers other than GCTL.CRST (1.0a spec, 3.3.7). The write to STATESTS in snd_hdac_bus_reset_link() will be lost if the controller is already in reset per the HDA specification mentioned.
This has been harmless on older hardware. On newer generation of Intel PCIe based HDA controllers, if configured to report issues, this write will emit an unsupported request error. If ACPI Platform Error Interface (APEI) is enabled in kernel, this will end up to kernel log.
Fix the code in snd_hdac_bus_reset_link() to only clear the STATESTS if the function is called when controller is not in reset. Otherwise clearing the bits is not possible and should be skipped.
--- sound/hda/hdac_controller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/hda/hdac_controller.c +3 -2
@@ -421,8 +421,9 @@ int snd_hdac_bus_reset_link(struct hdac_bus *bus, bool full_reset)if (!full_reset) goto skip_reset; -/* clear STATESTS */ -snd_hdac_chip_writew (bus,STATESTS ,STATESTS_INT_MASK ); +/* clear STATESTS if not in reset */ +if (snd_hdac_chip_readb (bus,GCTL ) &AZX_GCTL_RESET ) +snd_hdac_chip_writew (bus,STATESTS ,STATESTS_INT_MASK );/* reset controller */ snd_hdac_bus_enter_link_reset (bus);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 142/169 spi: Fix deadlock when adding SPI controllers on SPI buses
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit 6098475d4cb48d821bdf453c61118c56e26294f0 ]
Currently we have a global spi_add_lock which we take when adding new devices so that we can check that we're not trying to reuse a chip select that's already controlled. This means that if the SPI device is itself a SPI controller and triggers the instantiation of further SPI devices we trigger a deadlock as we try to register and instantiate those devices while in the process of doing so for the parent controller and hence already holding the global spi_add_lock. Since we only care about concurrency within a single SPI bus move the lock to be per controller, avoiding the deadlock.
This can be easily triggered in the case of spi-mux.
--- drivers/spi/spi.c | 17 ++++++----------- include/linux/spi/spi.h | 3 +++ 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/spi/spi.c +6 -11
@@ -480,12 +480,6 @@ static LIST_HEAD(spi_controller_list);*/ static DEFINE_MUTEX (board_lock); -/* -* Prevents addition of devices with same chip select and -* addition of devices below an unregistering controller. -*/ -static DEFINE_MUTEX (spi_add_lock); -/** * spi_alloc_device - Allocate a new SPI device * @ctlr: Controller to which device is connected
@@ -638,9 +632,9 @@ int spi_add_device(struct spi_device *spi)* chipselect **BEFORE** we call setup(), else we'll trash * its configuration. Lock against concurrent add() calls. */ -mutex_lock (&spi_add_lock); +mutex_lock (&ctlr->add_lock); status =__spi_add_device (spi); -mutex_unlock (&spi_add_lock); +mutex_unlock (&ctlr->add_lock);return status; }EXPORT_SYMBOL_GPL (spi_add_device);
@@ -660,7 +654,7 @@ static int spi_add_device_locked(struct spi_device *spi)/* Set the bus ID string */ spi_dev_set_name (spi); -WARN_ON (!mutex_is_locked (&spi_add_lock)); +WARN_ON (!mutex_is_locked (&ctlr->add_lock));return __spi_add_device (spi); }
@@ -2832,6 +2826,7 @@ int spi_register_controller(struct spi_controller *ctlr)spin_lock_init (&ctlr->bus_lock_spinlock);mutex_init (&ctlr->bus_lock_mutex);mutex_init (&ctlr->io_mutex); +mutex_init (&ctlr->add_lock); ctlr->bus_lock_flag =0 ;init_completion (&ctlr->xfer_completion);if (!ctlr->max_dma_len)
@@ -2968,7 +2963,7 @@ void spi_unregister_controller(struct spi_controller *ctlr)/* Prevent addition of new devices, unregister existing ones */ if (IS_ENABLED (CONFIG_SPI_DYNAMIC )) -mutex_lock (&spi_add_lock); +mutex_lock (&ctlr->add_lock);device_for_each_child (&ctlr->dev,NULL , __unregister);
@@ -2999,7 +2994,7 @@ void spi_unregister_controller(struct spi_controller *ctlr)mutex_unlock (&board_lock);if (IS_ENABLED (CONFIG_SPI_DYNAMIC )) -mutex_unlock (&spi_add_lock); +mutex_unlock (&ctlr->add_lock); }EXPORT_SYMBOL_GPL (spi_unregister_controller);
include/linux/spi/spi.h +3 -0
@@ -527,6 +527,9 @@ struct spi_controller {/* I/O mutex */ struct mutex io_mutex; +/* Used to avoid adding the same CS twice */ +struct mutex add_lock; +/* lock and mutex for SPI bus locking */ spinlock_t bus_lock_spinlock;struct mutex bus_lock_mutex;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 143/169 spi-mux: Fix false-positive lockdep splats
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 16a8e2fbb2d49111004efc1c7342e083eafabeb0 ]
io_mutex is taken by spi_setup() and spi-mux's .setup() callback calls spi_setup() which results in a nested lock of io_mutex.
add_lock is taken by spi_add_device(). The device_add() call in there can result in calling spi-mux's .probe() callback which registers its own spi controller which in turn results in spi_add_device() being called again.
To fix this initialize the controller's locks already in spi_alloc_controller() to give spi_mux_probe() a chance to set the lockdep subclass.
--- drivers/spi/spi-mux.c | 7 +++++++ drivers/spi/spi.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/spi/spi-mux.c +7 -0
@@ -137,6 +137,13 @@ static int spi_mux_probe(struct spi_device *spi) priv =spi_controller_get_devdata (ctlr); priv->spi = spi; +/* +* Increase lockdep class as these lock are taken while the parent bus +* already holds their instance's lock. +*/ +lockdep_set_subclass (&ctlr->io_mutex,1 ); +lockdep_set_subclass (&ctlr->add_lock,1 ); + priv->mux =devm_mux_control_get (&spi->dev,NULL );if (IS_ERR (priv->mux)) { ret = dev_err_probe(&spi->dev, PTR_ERR(priv->mux),
drivers/spi/spi.c +6 -6
@@ -2549,6 +2549,12 @@ struct spi_controller *__spi_alloc_controller(struct device *dev,return NULL ;device_initialize (&ctlr->dev); +INIT_LIST_HEAD (&ctlr->queue); +spin_lock_init (&ctlr->queue_lock); +spin_lock_init (&ctlr->bus_lock_spinlock); +mutex_init (&ctlr->bus_lock_mutex); +mutex_init (&ctlr->io_mutex); +mutex_init (&ctlr->add_lock); ctlr->bus_num =-1 ; ctlr->num_chipselect =1 ; ctlr->slave = slave;
@@ -2821,12 +2827,6 @@ int spi_register_controller(struct spi_controller *ctlr)return id; ctlr->bus_num = id; } -INIT_LIST_HEAD (&ctlr->queue); -spin_lock_init (&ctlr->queue_lock); -spin_lock_init (&ctlr->bus_lock_spinlock); -mutex_init (&ctlr->bus_lock_mutex); -mutex_init (&ctlr->io_mutex); -mutex_init (&ctlr->add_lock); ctlr->bus_lock_flag =0 ;init_completion (&ctlr->xfer_completion);if (!ctlr->max_dma_len)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 144/169 libperf test evsel: Fix build error on !x86 architectures
In reply to Greg Kroah-HartmanFrom: Shunsuke Nakamura <[email protected]>
[ Upstream commit f304c8d949f9adc2ef51304b63e49d5ea1c2d288 ]
In test_stat_user_read, following build error occurs except i386 and x86_64 architectures:
tests/test-evsel.c:129:31: error: variable 'pc' set but not used [-Werror=unused-but-set-variable]
struct perf_event_mmap_page *pc;
Fix build error.
--- tools/lib/perf/tests/test-evsel.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/perf/tests/test-evsel.c +1 -0
@@ -148,6 +148,7 @@ static int test_stat_user_read(int event)__T ("failed to mmap evsel" , err ==0 ); pc =perf_evsel__mmap_base (evsel,0 ,0 ); +__T ("failed to get mmapped address" , pc);#if defined(__i386__) || defined(__x86_64__)__T ("userspace counter access not supported" , pc->cap_user_rdpmc);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 145/169 libperf tests: Fix test_stat_cpu
In reply to Greg Kroah-HartmanFrom: Shunsuke Nakamura <[email protected]>
[ Upstream commit 3ff6d64e68abc231955d216236615918797614ae ]
The cpu argument of perf_evsel__read() must specify the cpu index.
perf_cpu_map__for_each_cpu() is for iterating the cpu number (not index) and is thus not appropriate for use with perf_evsel__read().
So, if there is an offline CPU, the cpu number specified in the argument may point out of range because the cpu number and the cpu index are different.
Fix test_stat_cpu().
Testing it:
# make tests -C tools/lib/perf/ make: Entering directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf' running static: - running tests/test-cpumap.c...OK - running tests/test-threadmap.c...OK - running tests/test-evlist.c...OK - running tests/test-evsel.c...OK running dynamic: - running tests/test-cpumap.c...OK - running tests/test-threadmap.c...OK - running tests/test-evlist.c...OK - running tests/test-evsel.c...OK make: Leaving directory '/home/nakamura/kernel_src/linux-5.15-rc4_fix/tools/lib/perf'
--- tools/lib/perf/tests/test-evlist.c | 6 +++--- tools/lib/perf/tests/test-evsel.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/lib/perf/tests/test-evlist.c +3 -3
@@ -40,7 +40,7 @@ static int test_stat_cpu(void) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_TASK_CLOCK, }; -int err, cpu, tmp; +int err, idx; cpus =perf_cpu_map__new (NULL );__T ("failed to create cpus" , cpus);
@@ -70,10 +70,10 @@ static int test_stat_cpu(void)perf_evlist__for_each_evsel (evlist, evsel) { cpus =perf_evsel__cpus (evsel); -perf_cpu_map__for_each_cpu (cpu, tmp, cpus) { +for (idx =0 ; idx <perf_cpu_map__nr (cpus); idx++) {struct perf_counts_values counts = { .val =0 }; -perf_evsel__read (evsel, cpu,0 , &counts); +perf_evsel__read (evsel, idx,0 , &counts);__T ("failed to read value for evsel" , counts.val !=0 ); } }
tools/lib/perf/tests/test-evsel.c +3 -3
@@ -22,7 +22,7 @@ static int test_stat_cpu(void) .type = PERF_TYPE_SOFTWARE, .config = PERF_COUNT_SW_CPU_CLOCK, }; -int err, cpu, tmp; +int err, idx; cpus =perf_cpu_map__new (NULL );__T ("failed to create cpus" , cpus);
@@ -33,10 +33,10 @@ static int test_stat_cpu(void) err =perf_evsel__open (evsel, cpus,NULL );__T ("failed to open evsel" , err ==0 ); -perf_cpu_map__for_each_cpu (cpu, tmp, cpus) { +for (idx =0 ; idx <perf_cpu_map__nr (cpus); idx++) {struct perf_counts_values counts = { .val =0 }; -perf_evsel__read (evsel, cpu,0 , &counts); +perf_evsel__read (evsel, idx,0 , &counts);__T ("failed to read value for evsel" , counts.val !=0 ); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 146/169 perf/x86/msr: Add Sapphire Rapids CPU support
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
[ Upstream commit 71920ea97d6d1d800ee8b51951dc3fda3f5dc698 ]
SMI_COUNT MSR is supported on Sapphire Rapids CPU.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -68,6 +68,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_BROADWELL_D :case INTEL_FAM6_BROADWELL_G :case INTEL_FAM6_BROADWELL_X : +case INTEL_FAM6_SAPPHIRERAPIDS_X :case INTEL_FAM6_ATOM_SILVERMONT :case INTEL_FAM6_ATOM_SILVERMONT_D :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 147/169 Input: snvs_pwrkey - add clk handling
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit d997cc1715df7b6c3df798881fb9941acf0079f8 ]
On i.MX7S and i.MX8M* (but not i.MX6*) the pwrkey device has an associated clock. Accessing the registers requires that this clock is enabled. Binding the driver on at least i.MX7S and i.MX8MP while not having the clock enabled results in a complete hang of the machine. (This usually only happens if snvs_pwrkey is built as a module and the rtc-snvs driver isn't already bound because at bootup the required clk is on and only gets disabled when the clk framework disables unused clks late during boot.)
This completes the fix in commit 135be16d3505 ("ARM: dts: imx7s: add snvs clock to pwrkey").
--- drivers/input/keyboard/snvs_pwrkey.c | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/input/keyboard/snvs_pwrkey.c +29 -0
@@ -3,6 +3,7 @@// Driver for the IMX SNVS ON/OFF Power Key // Copyright (C) 2015 Freescale Semiconductor, Inc. All Rights Reserved. +#include <linux/clk.h> #include <linux/device.h> #include <linux/err.h> #include <linux/init.h>
@@ -99,6 +100,11 @@ static irqreturn_t imx_snvs_pwrkey_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } +static void imx_snvs_pwrkey_disable_clk (void *data) +{ +clk_disable_unprepare (data); +} +static void imx_snvs_pwrkey_act (void *pdata) {struct pwrkey_drv_data *pd = pdata;
@@ -111,6 +117,7 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)struct pwrkey_drv_data *pdata;struct input_dev *input;struct device_node *np; +struct clk *clk;int error;u32 vid;
@@ -134,6 +141,28 @@ static int imx_snvs_pwrkey_probe(struct platform_device *pdev)dev_warn (&pdev->dev,"KEY_POWER without setting in dts\n" ); } + clk =devm_clk_get_optional (&pdev->dev,NULL ); +if (IS_ERR (clk)) { +dev_err (&pdev->dev,"Failed to get snvs clock (%pe)\n" , clk); +return PTR_ERR (clk); + } + + error =clk_prepare_enable (clk); +if (error) { +dev_err (&pdev->dev,"Failed to enable snvs clock (%pe)\n" , +ERR_PTR (error)); +return error; + } + + error =devm_add_action_or_reset (&pdev->dev, + imx_snvs_pwrkey_disable_clk, clk); +if (error) { +dev_err (&pdev->dev, +"Failed to register clock cleanup handler (%pe)\n" , +ERR_PTR (error)); +return error; + } + pdata->wakeup =of_property_read_bool (np,"wakeup-source" ); pdata->irq =platform_get_irq (pdev,0 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 148/169 ASoC: codec: wcd938x: Add irq config support
In reply to Greg Kroah-HartmanFrom: Srinivasa Rao Mandadapu <[email protected]>
[ Upstream commit 214174d9f56c7f81f4860a26b6b8b961a6b92654 ]
This patch fixes compilation error in wcd98x codec driver.
--- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/Kconfig +1 -0
@@ -1564,6 +1564,7 @@ config SND_SOC_WCD938X config SND_SOC_WCD938X_SDW tristate "WCD9380/WCD9385 Codec - SDW" select SND_SOC_WCD938X + select REGMAP_IRQ depends on SOUNDWIRE select REGMAP_SOUNDWIRE help
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 149/169 scsi: iscsi: Fix set_param() handling
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 187a580c9e7895978dcd1e627b9c9e7e3d13ca96 ]
In commit 9e67600ed6b8 ("scsi: iscsi: Fix race condition between login and sync thread") we meant to add a check where before we call ->set_param() we make sure the iscsi_cls_connection is bound. The problem is that between versions 4 and 5 of the patch the deletion of the unchecked set_param() call was dropped so we ended up with 2 calls. As a result we can still hit a crash where we access the unbound connection on the first call.
This patch removes that first call.
--- drivers/scsi/scsi_transport_iscsi.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +0 -2
@@ -2930,8 +2930,6 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) session->recovery_tmo = value;break ;default : - err = transport->set_param (conn, ev->u.set_param.param, - data, ev->u.set_param.len);if ((conn->state ==ISCSI_CONN_BOUND ) || (conn->state ==ISCSI_CONN_UP )) { err = transport->set_param(conn, ev->u.set_param.param,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 150/169 scsi: storvsc: Fix validation for unsolicited incoming packets
In reply to Greg Kroah-HartmanFrom: Andrea Parri (Microsoft) <[email protected]>
[ Upstream commit 6fd13d699d24beaa28310848fe65fd898fbb9043 ]
The validation on the length of incoming packets performed in storvsc_on_channel_callback() does not apply to unsolicited packets with ID of 0 sent by Hyper-V. Adjust the validation for such unsolicited packets.
--- drivers/scsi/storvsc_drv.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/scsi/storvsc_drv.c +23 -9
@@ -1285,11 +1285,15 @@ static void storvsc_on_channel_callback(void *context) foreach_vmbus_pkt(desc, channel) {struct vstor_packet *packet =hv_pkt_data (desc);struct storvsc_cmd_request *request =NULL ; +u32 pktlen =hv_pkt_datalen (desc);u64 rqst_id = desc->trans_id; +u32 minlen = rqst_id ?sizeof (struct vstor_packet ) - + stor_device->vmscsi_size_delta :sizeof (enum vstor_packet_operation ); -if (hv_pkt_datalen (desc) <sizeof (struct vstor_packet ) - - stor_device->vmscsi_size_delta) { -dev_err (&device->device,"Invalid packet len\n" ); +if (pktlen < minlen) { +dev_err (&device->device, +"Invalid pkt: id=%llu, len=%u, minlen=%u\n" , + rqst_id, pktlen, minlen);continue ; }
@@ -1302,13 +1306,23 @@ static void storvsc_on_channel_callback(void *context)if (rqst_id ==0 ) {/* * storvsc_on_receive() looks at the vstor_packet in the message -* from the ring buffer. If the operation in the vstor_packet is -* COMPLETE_IO, then we call storvsc_on_io_completion(), and -* dereference the guest memory address. Make sure we don't call -* storvsc_on_io_completion() with a guest memory address that is -* zero if Hyper-V were to construct and send such a bogus packet. +* from the ring buffer. +* +* - If the operation in the vstor_packet is COMPLETE_IO, then +* we call storvsc_on_io_completion(), and dereference the +* guest memory address. Make sure we don't call +* storvsc_on_io_completion() with a guest memory address +* that is zero if Hyper-V were to construct and send such +* a bogus packet. +* +* - If the operation in the vstor_packet is FCHBA_DATA, then +* we call cache_wwn(), and access the data payload area of +* the packet (wwn_packet); however, there is no guarantee +* that the packet is big enough to contain such area. +* Future-proof the code by rejecting such a bogus packet. */ -if (packet->operation ==VSTOR_OPERATION_COMPLETE_IO ) { +if (packet->operation ==VSTOR_OPERATION_COMPLETE_IO || + packet->operation ==VSTOR_OPERATION_FCHBA_DATA ) {dev_err (&device->device,"Invalid packet with ID of 0\n" );continue ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 151/169 scsi: mpi3mr: Fix duplicate device entries when scanning through sysfs
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 97e6ea6d78064e7f1e9e19c45dc690aabbb71297 ]
When scanning devices through the 'scan' attribute in sysfs, the user will observe duplicate device entries in lsscsi command output.
Set the shost's max_channel to zero to avoid this.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +1 -1
@@ -3755,7 +3755,7 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_lun =-1 ; shost->unique_id = mrioc->id; - shost->max_channel =1 ; + shost->max_channel =0 ; shost->max_id =0xFFFFFFFF ;if (prot_mask >=0 )
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 152/169 scsi: qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()
In reply to Greg Kroah-HartmanFrom: Joy Gu <[email protected]>
[ Upstream commit 7fb223d0ad801f633c78cbe42b1d1b55f5d163ad ]
Commit 8c0eb596baa5 ("[SCSI] qla2xxx: Fix a memory leak in an error path of qla2x00_process_els()"), intended to change:
bsg_job->request->msgcode == FC_BSG_HST_ELS_NOLOGIN
to:
bsg_job->request->msgcode != FC_BSG_RPT_ELS
but changed it to:
bsg_job->request->msgcode == FC_BSG_RPT_ELS
instead.
Change the == to a != to avoid leaking the fcport structure or freeing unallocated memory.
--- drivers/scsi/qla2xxx/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_bsg.c +1 -1
@@ -415,7 +415,7 @@ done_unmap_sg: goto done_free_fcport; done_free_fcport: -if (bsg_request->msgcode ==FC_BSG_RPT_ELS ) +if (bsg_request->msgcode !=FC_BSG_RPT_ELS )qla2x00_free_fcport (fcport); done:return rval;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 153/169 mm/thp: decrease nr_thps in files mapping on THP split
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 1ca7554d05ac038c98271f8968ed821266ecaa9c ]
Decrease nr_thps counter in file's mapping to ensure that the page cache won't be dropped excessively on file write access if page has been already split.
I've tried a test scenario running a big binary, kernel remaps it with THPs, then force a THP split with /sys/kernel/debug/split_huge_pages. During any further open of that binary with O_RDWR or O_WRITEONLY kernel drops page cache for it, because of non-zero thps counter.
--- mm/huge_memory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/huge_memory.c +4 -2
@@ -2724,12 +2724,14 @@ int split_huge_page_to_list(struct page *page, struct list_head *list)if (mapping) {int nr =thp_nr_pages (head); -if (PageSwapBacked (head)) +if (PageSwapBacked (head)) {__mod_lruvec_page_state (head,NR_SHMEM_THPS , -nr); -else + }else {__mod_lruvec_page_state (head,NR_FILE_THPS , -nr); +filemap_nr_thps_dec (mapping); + } }__split_huge_page (page, list, end);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 154/169 sched/scs: Reset the shadow stack when idle_task_exit
In reply to Greg Kroah-HartmanFrom: Woody Lin <[email protected]>
[ Upstream commit 63acd42c0d4942f74710b11c38602fb14dea7320 ]
Commit f1a0a376ca0c ("sched/core: Initialize the idle task with preemption disabled") removed the init_idle() call from idle_thread_get(). This was the sole call-path on hotplug that resets the Shadow Call Stack (scs) Stack Pointer (sp).
Not resetting the scs-sp leads to scs overflow after enough hotplug cycles. Therefore add an explicit scs_task_reset() to the hotplug code to make sure the scs-sp does get reset on hotplug.
--- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/core.c +1 -0
@@ -8495,6 +8495,7 @@ void idle_task_exit(void)finish_arch_post_lock_switch (); } +scs_task_reset (current);/* finish_cpu(), as ran on the BP, will clean up the active_mm state */ }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 155/169 net: hns3: fix for miscalculation of rx unused desc
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 9f9f0f19994b42b3e5e8735d41b9c5136828a76c ]
rx unused desc is the desc that need attatching new buffer before refilling to hw to receive new packet, the number of desc need attatching new buffer is calculated using next_to_use and next_to_clean. when next_to_use == next_to_clean, currently hns3 driver assumes that all the desc has the buffer attatched, but 'next_to_use == next_to_clean' also means all the desc need attatching new buffer if hw has comsumed all the desc and the driver has not attatched any buffer to the desc yet.
This patch adds 'refill' in desc_cb to indicate whether a new buffer has been refilled to a desc.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 ++++++++ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 1 + 2 files changed, 9 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +8 -0
@@ -3263,6 +3263,7 @@ static void hns3_buffer_detach(struct hns3_enet_ring *ring, int i) {hns3_unmap_buffer (ring, &ring->desc_cb[i]); ring->desc[i].addr =0 ; + ring->desc_cb[i].refill =0 ; } static void hns3_free_buffer_detach(struct hns3_enet_ring *ring, int i,
@@ -3340,6 +3341,7 @@ static int hns3_alloc_and_attach_buffer(struct hns3_enet_ring *ring, int i)return ret; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma); + ring->desc_cb[i].refill =1 ;return 0 ; }
@@ -3370,12 +3372,14 @@ static void hns3_replace_buffer(struct hns3_enet_ring *ring, int i,hns3_unmap_buffer (ring, &ring->desc_cb[i]); ring->desc_cb[i] = *res_cb; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma); + ring->desc_cb[i].refill =1 ; ring->desc[i].rx.bd_base_info =0 ; }static void hns3_reuse_buffer (struct hns3_enet_ring *ring,int i) { ring->desc_cb[i].reuse_flag =0 ; + ring->desc_cb[i].refill =1 ; ring->desc[i].addr =cpu_to_le64 (ring->desc_cb[i].dma + ring->desc_cb[i].page_offset); ring->desc[i].rx.bd_base_info =0 ;
@@ -3482,6 +3486,9 @@ static int hns3_desc_unused(struct hns3_enet_ring *ring)int ntc = ring->next_to_clean;int ntu = ring->next_to_use; +if (unlikely (ntc == ntu && !ring->desc_cb[ntc].refill)) +return ring->desc_num; +return ((ntc >= ntu) ?0 : ring->desc_num) + ntc - ntu; }
@@ -3826,6 +3833,7 @@ static void hns3_rx_ring_move_fw(struct hns3_enet_ring *ring) { ring->desc[ring->next_to_clean].rx.bd_base_info &=cpu_to_le32 (~BIT (HNS3_RXD_VLD_B )); + ring->desc_cb[ring->next_to_clean].refill =0 ; ring->next_to_clean +=1 ;if (unlikely (ring->next_to_clean == ring->desc_num))
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +1 -0
@@ -322,6 +322,7 @@ struct hns3_desc_cb {u32 length;/* length of the buffer */ u16 reuse_flag; +u16 refill;/* desc type, used by the ring user to mark the type of the priv data */ u16 type;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 156/169 net/mlx5: Lag, move lag destruction to a workqueue
In reply to Greg Kroah-HartmanFrom: Mark Bloch <[email protected]>
[ Upstream commit 63d4a9afbcee4167ffb0d126b23b8884b15e5837 ]
If a netdev is removed from the lag the lag should be destroyed. With downstream patches this might trigger a reconfiguration of representors on a different eswitch and such we don't have the proper locking to so from this path. Move the destruction to be done by the workqueue.
As the destruction won't affect the netdev side it okay to do so. The RDMA side will be reconfigured and it already coded to handle such reconfiguration.
--- drivers/net/ethernet/mellanox/mlx5/core/lag.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag.c +9 -8
@@ -372,12 +372,13 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)bool do_bond, roce_lag;int err; -if (!mlx5_lag_is_ready (ldev)) -return ; - - tracker = ldev->tracker; +if (!mlx5_lag_is_ready (ldev)) { + do_bond = false; + }else { + tracker = ldev->tracker; - do_bond = tracker.is_bonded &&mlx5_lag_check_prereq (ldev); + do_bond = tracker.is_bonded &&mlx5_lag_check_prereq (ldev); + }if (do_bond && !__mlx5_lag_is_active (ldev)) { roce_lag = !mlx5_sriov_is_enabled(dev0) &&
@@ -691,11 +692,11 @@ void mlx5_lag_remove_netdev(struct mlx5_core_dev *dev,if (!ldev)return ; -if (__mlx5_lag_is_active (ldev)) -mlx5_disable_lag (ldev); -mlx5_ldev_remove_netdev (ldev, netdev); ldev->flags &= ~MLX5_LAG_FLAG_READY ; + +if (__mlx5_lag_is_active (ldev)) +mlx5_queue_bond_work (ldev,0 ); }/* Must be called with intf_mutex held */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 157/169 net/mlx5: Lag, change multipath and bonding to be mutually exclusive
In reply to Greg Kroah-HartmanFrom: Maor Dickman <[email protected]>
[ Upstream commit 14fe2471c62816ba82546fb68369d957c3a58b59 ]
Both multipath and bonding events are changing the HW LAG state independently.
Handling one of the features events while the other is already enabled can cause unwanted behavior, for example handling bonding event while multipath enabled will disable the lag and cause multipath to stop working.
Fix it by ignoring bonding event while in multipath and ignoring FIB events while in bonding mode.
--- drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/lag.c | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 13 ++++++++----- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h | 2 ++ include/linux/mlx5/driver.h | 1 - 6 files changed, 18 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c +2 -0
@@ -10,6 +10,8 @@#include "en_tc.h" #include "rep/tc.h" #include "rep/neigh.h" +#include "lag.h" +#include "lag_mp.h" struct mlx5e_tc_tun_route_attr {struct net_device *out_dev;
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +2 -0
@@ -72,6 +72,8 @@#include "lib/fs_chains.h" #include "diag/en_tc_tracepoint.h" #include <asm/div64.h> +#include "lag.h" +#include "lag_mp.h" #define nic_chains (priv) ((priv)->fs.tc.chains)#define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)
drivers/net/ethernet/mellanox/mlx5/core/lag.c +4 -0
@@ -375,6 +375,10 @@ static void mlx5_do_bond(struct mlx5_lag *ldev)if (!mlx5_lag_is_ready (ldev)) { do_bond = false; }else { +/* VF LAG is in multipath mode, ignore bond change requests */ +if (mlx5_lag_is_multipath (dev0)) +return ; + tracker = ldev->tracker; do_bond = tracker.is_bonded &&mlx5_lag_check_prereq (ldev);
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +8 -5
@@ -9,20 +9,23 @@#include "eswitch.h" #include "lib/mlx5.h" +static bool __mlx5_lag_is_multipath (struct mlx5_lag *ldev) +{ +return !!(ldev->flags &MLX5_LAG_FLAG_MULTIPATH ); +} +static bool mlx5_lag_multipath_check_prereq (struct mlx5_lag *ldev) {if (!mlx5_lag_is_ready (ldev))return false; +if (__mlx5_lag_is_active (ldev) && !__mlx5_lag_is_multipath (ldev)) +return false; +return mlx5_esw_multipath_prereq (ldev->pf[MLX5_LAG_P1 ].dev, ldev->pf[MLX5_LAG_P2 ].dev); } -static bool __mlx5_lag_is_multipath (struct mlx5_lag *ldev) -{ -return !!(ldev->flags &MLX5_LAG_FLAG_MULTIPATH ); -} -bool mlx5_lag_is_multipath (struct mlx5_core_dev *dev) {struct mlx5_lag *ldev;
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h +2 -0
@@ -24,12 +24,14 @@ struct lag_mp {void mlx5_lag_mp_reset (struct mlx5_lag *ldev);int mlx5_lag_mp_init (struct mlx5_lag *ldev);void mlx5_lag_mp_cleanup (struct mlx5_lag *ldev); +bool mlx5_lag_is_multipath (struct mlx5_core_dev *dev);#else /* CONFIG_MLX5_ESWITCH */ static inline void mlx5_lag_mp_reset (struct mlx5_lag *ldev) {};static inline int mlx5_lag_mp_init (struct mlx5_lag *ldev) {return 0 ; }static inline void mlx5_lag_mp_cleanup (struct mlx5_lag *ldev) {} +bool mlx5_lag_is_multipath (struct mlx5_core_dev *dev) {return false; }#endif /* CONFIG_MLX5_ESWITCH */ #endif /* __MLX5_LAG_MP_H__ */
include/linux/mlx5/driver.h +0 -1
@@ -1135,7 +1135,6 @@ int mlx5_cmd_create_vport_lag(struct mlx5_core_dev *dev);int mlx5_cmd_destroy_vport_lag (struct mlx5_core_dev *dev);bool mlx5_lag_is_roce (struct mlx5_core_dev *dev);bool mlx5_lag_is_sriov (struct mlx5_core_dev *dev); -bool mlx5_lag_is_multipath (struct mlx5_core_dev *dev);bool mlx5_lag_is_active (struct mlx5_core_dev *dev);struct net_device *mlx5_lag_get_roce_netdev (struct mlx5_core_dev *dev); u8 mlx5_lag_get_slave_port(struct mlx5_core_dev *dev,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 158/169 drm/kmb: Enable alpha blended second plane
In reply to Greg Kroah-HartmanFrom: Edmund Dea <[email protected]>
[ Upstream commit c026565fe9be813fe826f7e5533ed763283af5f0 ]
Enable one additional plane that is alpha blended on top of the primary plane.
This also fixes the below warnings when building with -Warray-bounds:
drivers/gpu/drm/kmb/kmb_plane.c:135:20: warning: array subscript 3 is above array bounds of 'struct layer_status[1]' [-Warray-bounds] drivers/gpu/drm/kmb/kmb_plane.c:132:20: warning: array subscript 2 is above array bounds of 'struct layer_status[1]' [-Warray-bounds] drivers/gpu/drm/kmb/kmb_plane.c:129:20: warning: array subscript 1 is above array bounds of 'struct layer_status[1]' [-Warray-bounds]
v2: corrected previous patch dependecies so it builds
--- drivers/gpu/drm/kmb/kmb_drv.c | 8 ++-- drivers/gpu/drm/kmb/kmb_drv.h | 5 ++ drivers/gpu/drm/kmb/kmb_plane.c | 81 +++++++++++++++++++++++++++++---- drivers/gpu/drm/kmb/kmb_plane.h | 5 +- drivers/gpu/drm/kmb/kmb_regs.h | 3 ++ 5 files changed, 87 insertions(+), 15 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +4 -4
@@ -173,10 +173,10 @@ static int kmb_setup_mode_config(struct drm_device *drm) ret =drmm_mode_config_init (drm);if (ret)return ret; - drm->mode_config.min_width =KMB_MIN_WIDTH ; - drm->mode_config.min_height =KMB_MIN_HEIGHT ; - drm->mode_config.max_width =KMB_MAX_WIDTH ; - drm->mode_config.max_height =KMB_MAX_HEIGHT ; + drm->mode_config.min_width =KMB_FB_MIN_WIDTH ; + drm->mode_config.min_height =KMB_FB_MIN_HEIGHT ; + drm->mode_config.max_width =KMB_FB_MAX_WIDTH ; + drm->mode_config.max_height =KMB_FB_MAX_HEIGHT ; drm->mode_config.funcs = &kmb_mode_config_funcs; ret =kmb_setup_crtc (drm);
drivers/gpu/drm/kmb/kmb_drv.h +5 -0
@@ -20,6 +20,11 @@#define DRIVER_MAJOR 1#define DRIVER_MINOR 1 +#define KMB_FB_MAX_WIDTH 1920 +#define KMB_FB_MAX_HEIGHT 1080 +#define KMB_FB_MIN_WIDTH 1 +#define KMB_FB_MIN_HEIGHT 1 +#define KMB_LCD_DEFAULT_CLK 200000000#define KMB_SYS_CLK_MHZ 500
drivers/gpu/drm/kmb/kmb_plane.c +72 -9
139 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h +3 -2
@@ -35,6 +35,9 @@#define POSSIBLE_CRTCS 1#define to_kmb_plane (x) container_of(x, struct kmb_plane, base_plane) +#define POSSIBLE_CRTCS 1 +#define KMB_MAX_PLANES 2 +enum layer_id {LAYER_0 ,LAYER_1 ,
@@ -43,8 +46,6 @@ enum layer_id {/* KMB_MAX_PLANES */ }; -#define KMB_MAX_PLANES 1 -enum sub_plane_id {Y_PLANE ,U_PLANE ,
drivers/gpu/drm/kmb/kmb_regs.h +3 -0
@@ -43,8 +43,10 @@#define LCD_CTRL_OUTPUT_ENABLED BIT(19)#define LCD_CTRL_BPORCH_ENABLE BIT(21)#define LCD_CTRL_FPORCH_ENABLE BIT(22) +#define LCD_CTRL_ALPHA_BLEND_BKGND_DISABLE BIT(23)#define LCD_CTRL_PIPELINE_DMA BIT(28)#define LCD_CTRL_VHSYNC_IDLE_LVL BIT(31) +#define LCD_CTRL_ALPHA_ALL (0xff << 6)/* interrupts */ #define LCD_INT_STATUS (0x4 * 0x001)
@@ -115,6 +117,7 @@#define LCD_LAYER_ALPHA_EMBED BIT(5)#define LCD_LAYER_ALPHA_COMBI (LCD_LAYER_ALPHA_STATIC | \ LCD_LAYER_ALPHA_EMBED) +#define LCD_LAYER_ALPHA_DISABLED ~(LCD_LAYER_ALPHA_COMBI)/* RGB multiplied with alpha */ #define LCD_LAYER_ALPHA_PREMULT BIT(6)#define LCD_LAYER_INVERT_COL BIT(7)
Signature · 1 line
2.33.0