6.1.79-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 6.1.79-rc1 review
This is the start of the stable review cycle for the 6.1.79 release. There are 197 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 Thu, 22 Feb 2024 20:48:08 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.79-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-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.1.79-rc1
Lokesh Gidra <[email protected]>
userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb
Jiri Olsa <[email protected]>
bpf: Remove trace_printk_lock
Jiri Olsa <[email protected]>
bpf: Do cleanup in bpf_bprintf_cleanup only when needed
Jiri Olsa <[email protected]>
bpf: Add struct for bin_args arg in bpf_bprintf_prepare
Eric Dumazet <[email protected]>
net: prevent mss overflow in skb_segment()
Paulo Alcantara <[email protected]>
smb: client: fix parsing of SMB3.1.1 POSIX create context
Paulo Alcantara <[email protected]>
smb: client: fix potential OOBs in smb2_parse_contexts()
Mike Marciniszyn <[email protected]>
RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned
Davidlohr Bueso <[email protected]>
hrtimer: Ignore slack time for RT tasks in schedule_hrtimeout_range()
NeilBrown <[email protected]>
nfsd: don't take fi_lock in nfsd_break_deleg_cb()
NeilBrown <[email protected]>
nfsd: fix RELEASE_LOCKOWNER
Helge Deller <[email protected]>
parisc: Fix random data corruption from exception handler
Jozsef Kadlecsik <[email protected]>
netfilter: ipset: Missing gc cancellations fixed
Jozsef Kadlecsik <[email protected]>
netfilter: ipset: fix performance regression in swap operation
Damien Le Moal <[email protected]>
block: fix partial zone append completion handling in req_bio_endio()
Tianjia Zhang <[email protected]>
crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init
David Lin <[email protected]>
wifi: mwifiex: fix uninitialized firmware_stat
Johan Hovold <[email protected]>
arm64: dts: qcom: sm8150: fix USB SS wakeup
Johan Hovold <[email protected]>
arm64: dts: qcom: sdm845: fix USB SS wakeup
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Make blsp_dma controlled-remotely
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Enable blsp_dma by default
Sjoerd Simons <[email protected]>
bus: moxtet: Add spi device table
David Lin <[email protected]>
wifi: mwifiex: add extra delay for firmware ready
Lukas Wunner <[email protected]>
wifi: mwifiex: Support SD8978 chipset
Andrejs Cainikovs <[email protected]>
ARM: dts: imx6q-apalis: add can power-up delay on ixora board
Junxiao Bi <[email protected]>
md: bypass block throttle for superblock update
Audra Mitchell <[email protected]>
selftests/mm: Update va_high_addr_switch.sh to check CPU for la57 flag
Ryan Roberts <[email protected]>
selftests/mm: ksm_tests should only MADV_HUGEPAGE valid memory
Jann Horn <[email protected]>
tls: fix NULL deref on tls_sw_splice_eof() with empty record
Herbert Xu <[email protected]>
xfrm: Silence warnings triggerable by bad packets
Herbert Xu <[email protected]>
xfrm: Use xfrm_state selector for BEET input
Steven Rostedt (Google) <[email protected]>
tracing: Inform kmemleak of saved_cmdlines allocation
Oleg Nesterov <[email protected]>
fs/proc: do_task_stat: move thread_group_cputime_adjusted() outside of lock_task_sighand()
Konrad Dybcio <[email protected]>
pmdomain: core: Move the unused cleanup to a _sync initcall
Oleksij Rempel <[email protected]>
can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
Ziqi Zhao <[email protected]>
can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock
Maxime Jayat <[email protected]>
can: netlink: Fix TDCO calculation using the old data bittiming
Nuno Sa <[email protected]>
of: property: fix typo in io-channels
Prakash Sangappa <[email protected]>
mm: hugetlb pages should not be reserved by shmat() if SHM_NORESERVE
Oscar Salvador <[email protected]>
fs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super
Rishabh Dave <[email protected]>
ceph: prevent use-after-free in encode_cap_msg()
Shradha Gupta <[email protected]>
hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed
Sinthu Raja <[email protected]>
net: ethernet: ti: cpsw_new: enable mac_managed_pm to fix mdio
Alexandra Winter <[email protected]>
s390/qeth: Fix potential loss of L3-IP@ in case of network issues
Sinthu Raja <[email protected]>
net: ethernet: ti: cpsw: enable mac_managed_pm to fix mdio
Christian Brauner <[email protected]>
fs: relax mount_setattr() permission checks
Daniel Bristot de Oliveira <[email protected]>
tools/rtla: Fix Makefile compiler options for clang
Daniel Bristot de Oliveira <[email protected]>
tools/rtla: Fix uninitialized bucket/data->bucket_size warning
John Kacur <[email protected]>
tools/rtla: Exit with EXIT_SUCCESS when help is invoked
limingming3 <[email protected]>
tools/rtla: Replace setting prio with nice for SCHED_OTHER
Daniel Bristot de Oliveira <[email protected]>
tools/rtla: Remove unused sched_getattr() function
Mario Limonciello <[email protected]>
ASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8
Fred Ai <[email protected]>
mmc: sdhci-pci-o2micro: Fix a warm reboot issue that disk can't be detected by BIOS
Damien Le Moal <[email protected]>
zonefs: Improve error handling
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update
Doug Berger <[email protected]>
irqchip/irq-brcmstb-l2: Add write memory barrier before exit
Johannes Berg <[email protected]>
wifi: mac80211: reload info pointer in ieee80211_tx_dequeue()
Johannes Berg <[email protected]>
wifi: cfg80211: fix wiphy delayed work queueing
Daniel de Villiers <[email protected]>
nfp: flower: prevent re-adding mac index for bonded port
Daniel Basilio <[email protected]>
nfp: use correct macro for LengthSelect in BAR config
Kim Phillips <[email protected]>
crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked
Ryusuke Konishi <[email protected]>
nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
Ryusuke Konishi <[email protected]>
nilfs2: fix data corruption in dsync block recovery for small block sizes
bo liu <[email protected]>
ALSA: hda/conexant: Add quirk for SWS JS201D
Eniac Zhang <[email protected]>
ALSA: hda/realtek: fix mute/micmute LED For HP mt645
Alexander Stein <[email protected]>
mmc: slot-gpio: Allow non-sleeping GPIO ro
Jens Axboe <[email protected]>
io_uring/net: fix multishot accept overflow handling
Steve Wahl <[email protected]>
x86/mm/ident_map: Use gbpages only where full GB page should be mapped.
Mingwei Zhang <[email protected]>
KVM: x86/pmu: Fix type length error when reading pmu->fixed_ctr_ctrl
Andrei Vagin <[email protected]>
x86/fpu: Stop relying on userspace for info to fault in xsave buffer
Aleksander Mazur <[email protected]>
x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6
Shrikanth Hegde <[email protected]>
powerpc/pseries: fix accuracy of stolen time
David Engraf <[email protected]>
powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
Naveen N Rao <[email protected]>
powerpc/64: Set task pt_regs->link to the LR value on scv entry
Hugo Villeneuve <[email protected]>
serial: max310x: prevent infinite while() loop in port startup
Hugo Villeneuve <[email protected]>
serial: max310x: fail probe if clock crystal is unstable
Hugo Villeneuve <[email protected]>
serial: max310x: improve crystal stable clock detection
Hugo Villeneuve <[email protected]>
serial: max310x: set default value when reading clock ready bit
Hui Zhou <[email protected]>
nfp: flower: fix hardware offload for the transfer layer port
Vincent Donnefort <[email protected]>
ring-buffer: Clean ring_buffer_poll_wait() error return
Souradeep Chakrabarti <[email protected]>
hv_netvsc: Fix race condition between netvsc_probe and netvsc_remove
Tom Chung <[email protected]>
drm/amd/display: Preserve original aspect ratio in create stream
Nathan Chancellor <[email protected]>
drm/amd/display: Increase frame-larger-than for all display_mode_vba files
Philip Yang <[email protected]>
drm/prime: Support page array >= 4GB
Rob Clark <[email protected]>
drm/msm: Wire up tlb ops
Herbert Xu <[email protected]>
xfrm: Remove inner/outer modes from input path
Herbert Xu <[email protected]>
xfrm: Remove inner/outer modes from output path
Fedor Pchelkin <[email protected]>
ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails
Sean Young <[email protected]>
media: rc: bpf attach/detach requires write permission
Randy Dunlap <[email protected]>
iio: imu: bno055: serdev requires REGMAP
Nuno Sa <[email protected]>
iio: imu: adis: ensure proper DMA alignment
Nuno Sa <[email protected]>
iio: adc: ad_sigma_delta: ensure proper DMA alignment
Mario Limonciello <[email protected]>
iio: accel: bma400: Fix a compilation problem
Nuno Sa <[email protected]>
iio: commom: st_sensors: ensure proper DMA alignment
Dinghao Liu <[email protected]>
iio: core: fix memleak in iio_device_register_sysfs
zhili.liu <[email protected]>
iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC
David Schiller <[email protected]>
staging: iio: ad5933: fix type mismatch regression
Steven Rostedt (Google) <[email protected]>
tracing: Fix wasted memory in saved_cmdlines logic
Baokun Li <[email protected]>
ext4: avoid bb_free and bb_fragments inconsistency in mb_free_blocks()
Baokun Li <[email protected]>
ext4: fix double-free of blocks due to wrong extents moved_len
Ekansh Gupta <[email protected]>
misc: fastrpc: Mark all sessions as invalid in cb_remove
Carlos Llamas <[email protected]>
binder: signal epoll threads of self-work
Andy Chi <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power
Vitaly Rodionov <[email protected]>
ALSA: hda/cs8409: Suppress vmaster control for Dolphin models
Krzysztof Kozlowski <[email protected]>
ASoC: codecs: wcd938x: handle deferred probe
Edson Juliano Drosdeck <[email protected]>
ALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL
Nathan Chancellor <[email protected]>
modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS
Nathan Chancellor <[email protected]>
um: Fix adding '-no-pie' for clang
Nathan Chancellor <[email protected]>
modpost: Include '.text.*' in TEXT_SECTIONS
Masahiro Yamada <[email protected]>
linux/init: remove __memexit* annotations
Uwe Kleine-König <[email protected]>
modpost: Don't let "driver"s reference .exit.*
Masahiro Yamada <[email protected]>
modpost: propagate W=1 build option to modpost
Jan Beulich <[email protected]>
xen-netback: properly sync TX responses
Esben Haabendal <[email protected]>
net: stmmac: do not clear TBS enable bit on link up/down
Nikita Zhandarovich <[email protected]>
net: hsr: remove WARN_ONCE() in send_hsr_supervision_frame()
Fedor Pchelkin <[email protected]>
nfc: nci: free rx_data_reassembly skb on NCI device cleanup
Nathan Chancellor <[email protected]>
kbuild: Fix changing ELF file type for output of gen_btf for big endian
José Relvas <[email protected]>
ALSA: hda/realtek: Apply headset jack quirk for non-bass alc287 thinkpads
Takashi Sakamoto <[email protected]>
firewire: core: correct documentation of fw_csr_string() kernel API
Ondrej Mosnacek <[email protected]>
lsm: fix the logic in security_inode_getsecctx()
Sebastian Ott <[email protected]>
drm/virtio: Set segment size for virtio_gpu device
Mario Limonciello <[email protected]>
Revert "drm/amd: flush any delayed gfxoff on suspend entry"
Lee Duncan <[email protected]>
scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock"
Tomi Valkeinen <[email protected]>
media: Revert "media: rkisp1: Drop IRQF_SHARED"
Geliang Tang <[email protected]>
mptcp: check addrs list in userspace_pm_get_local_id
Paolo Abeni <[email protected]>
mptcp: drop the push_pending field
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: increase timeout to 30 min
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: add missing kconfig for NF Mangle
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: add missing kconfig for NF Filter in v6
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: add missing kconfig for NF Filter
Paolo Abeni <[email protected]>
mptcp: fix data re-injection from stale subflow
Paolo Abeni <[email protected]>
mptcp: get rid of msk->subflow
Radek Krejci <[email protected]>
modpost: trim leading spaces when processing source files list
Jean Delvare <[email protected]>
i2c: i801: Fix block process call transactions
Arnd Bergmann <[email protected]>
i2c: pasemi: split driver into two separate modules
Michael Ellerman <[email protected]>
powerpc/kasan: Limit KASAN thread size increase to 32KB
Bibo Mao <[email protected]>
irqchip/loongson-eiointc: Use correct struct type in eiointc_domain_alloc()
Viken Dadhaniya <[email protected]>
i2c: qcom-geni: Correct I2C TRE sequence
Dan Carpenter <[email protected]>
cifs: fix underflow in parse_server_interfaces()
Jiangfeng Xiao <[email protected]>
powerpc/kasan: Fix addr error caused by page alignment
Matthias Schiffer <[email protected]>
powerpc/6xx: set High BAT Enable flag on G2_LE cores
Saravana Kannan <[email protected]>
driver core: fw_devlink: Improve detection of overlapping cycles
Zhipeng Lu <[email protected]>
media: ir_toy: fix a memleak in irtoy_tx
Konrad Dybcio <[email protected]>
interconnect: qcom: sc8180x: Mark CO0 BCM keepalive
Uttkarsh Aggarwal <[email protected]>
usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
yuan linyu <[email protected]>
usb: f_mass_storage: forbid async queue when shutdown happen
Oliver Neukum <[email protected]>
USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT
Christian A. Ehrhardt <[email protected]>
usb: ucsi_acpi: Fix command completion handling
Sean Anderson <[email protected]>
usb: ulpi: Fix debugfs directory leak
Christian A. Ehrhardt <[email protected]>
usb: ucsi: Add missing ppm_lock
Srinivas Pandruvada <[email protected]>
iio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP
Jason Gerecke <[email protected]>
HID: wacom: Do not register input devices until after hid_hw_start
Tatsunosuke Tobita <[email protected]>
HID: wacom: generic: Avoid reporting a serial of '0' to userspace
Johan Hovold <[email protected]>
HID: i2c-hid-of: fix NULL-deref on failed power up
Luka Guzenko <[email protected]>
ALSA: hda/realtek: Enable Mute LED on HP Laptop 14-fq0xxx
David Senoner <[email protected]>
ALSA: hda/realtek: Fix the external mic not being recognised for Acer Swift 1 SF114-32
Helge Deller <[email protected]>
parisc: Prevent hung tasks when printing inventory on serial console
Techno Mooney <[email protected]>
ASoC: amd: yc: Add DMI quirk for MSI Bravo 15 C7VF
Mikulas Patocka <[email protected]>
dm-crypt, dm-verity: disable tasklets
Michael Kelley <[email protected]>
scsi: storvsc: Fix ring buffer size calculation
Zach O'Keefe <[email protected]>
mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again
Jan Kara <[email protected]>
readahead: avoid multiple marked readahead pages
Masami Hiramatsu (Google) <[email protected]>
tracing/trigger: Fix to return error if failed to alloc snapshot
Samuel Holland <[email protected]>
scs: add CONFIG_MMU dependency for vfree_atomic()
Ivan Vecera <[email protected]>
i40e: Fix waiting for queues of all VSIs to be disabled
Ivan Vecera <[email protected]>
i40e: Do not allow untrusted VF to remove administratively set MAC
Guenter Roeck <[email protected]>
MIPS: Add 'memory' clobber to csum_ipv6_magic() inline assembler
Arnd Bergmann <[email protected]>
nouveau/svm: fix kvcalloc() argument order
Breno Leitao <[email protected]>
net: sysfs: Fix /sys/class/net/<iface> path for statistics
Alexey Khoroshilov <[email protected]>
ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work()
Uwe Kleine-König <[email protected]>
spi: ppc4xx: Drop write-only variable
Jakub Kicinski <[email protected]>
net: tls: fix returned read length with async decrypt
Sabrina Dubroca <[email protected]>
net: tls: fix use-after-free with partial reads and async decrypt
Jakub Kicinski <[email protected]>
tls: fix race between async notify and socket close
Jakub Kicinski <[email protected]>
net: tls: factor out tls_*crypt_async_wait()
Sabrina Dubroca <[email protected]>
tls: extract context alloc/initialization out of tls_set_sw_offload
David Howells <[email protected]>
tls/sw: Use splice_eof() to flush
Horatiu Vultur <[email protected]>
lan966x: Fix crash when adding interface under a lag
Aaron Conole <[email protected]>
net: openvswitch: limit the number of recursions from action sets
Saravana Kannan <[email protected]>
of: property: Improve finding the supplier of a remote-endpoint property
Dan Carpenter <[email protected]>
wifi: iwlwifi: uninitialized variable in iwl_acpi_get_ppag_table()
Dan Carpenter <[email protected]>
wifi: iwlwifi: Fix some error codes
Sean Christopherson <[email protected]>
KVM: selftests: Fix a semaphore imbalance in the dirty ring logging test
Gavin Shan <[email protected]>
KVM: selftests: Clear dirty ring states between two modes in dirty_log_test
Christian A. Ehrhardt <[email protected]>
of: unittest: Fix compile in the non-dynamic case
Saravana Kannan <[email protected]>
driver core: Fix device_link_flag_is_sync_state_only()
Josef Bacik <[email protected]>
btrfs: don't drop extent_map for free space inode on write error
Filipe Manana <[email protected]>
btrfs: reject encoded write if inode has nodatasum flag set
Filipe Manana <[email protected]>
btrfs: don't reserve space for checksums when writing to nocow files
David Sterba <[email protected]>
btrfs: send: return EOPNOTSUPP on unknown flags
Boris Burkov <[email protected]>
btrfs: forbid deleting live subvol qgroup
Qu Wenruo <[email protected]>
btrfs: do not ASSERT() if the newly created subvolume already got read
Boris Burkov <[email protected]>
btrfs: forbid creating subvol qgroups
Filipe Manana <[email protected]>
btrfs: do not delete unused block group if it may be used soon
Filipe Manana <[email protected]>
btrfs: add and use helper to check if block group is used
Linus Torvalds <[email protected]>
update workarounds for gcc "asm goto" issue
Linus Torvalds <[email protected]>
work around gcc bugs with 'asm goto' with outputs
-------------
Diffstat:
.../ABI/testing/sysfs-class-net-statistics | 48 ++--- .../bindings/net/wireless/marvell-8xxx.txt | 4 +- Makefile | 4 +- arch/Kconfig | 1 + arch/arc/include/asm/jump_label.h | 4 +- arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 + arch/arm/include/asm/jump_label.h | 4 +- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 4 - arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +- arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 +- arch/arm64/include/asm/alternative-macros.h | 4 +- arch/arm64/include/asm/jump_label.h | 4 +- arch/csky/include/asm/jump_label.h | 4 +- arch/mips/include/asm/checksum.h | 3 +- arch/mips/include/asm/jump_label.h | 4 +- arch/parisc/Kconfig | 1 - arch/parisc/include/asm/assembly.h | 1 + arch/parisc/include/asm/extable.h | 64 ++++++ arch/parisc/include/asm/jump_label.h | 4 +- arch/parisc/include/asm/special_insns.h | 6 +- arch/parisc/include/asm/uaccess.h | 48 +---- arch/parisc/kernel/drivers.c | 3 + arch/parisc/kernel/unaligned.c | 44 ++-- arch/parisc/mm/fault.c | 11 +- arch/powerpc/include/asm/bug.h | 2 +- arch/powerpc/include/asm/jump_label.h | 4 +- arch/powerpc/include/asm/reg.h | 2 + arch/powerpc/include/asm/thread_info.h | 2 +- arch/powerpc/include/asm/uaccess.h | 8 +- arch/powerpc/kernel/cpu_setup_6xx.S | 20 +- arch/powerpc/kernel/cpu_specs_e500mc.h | 3 +- arch/powerpc/kernel/interrupt_64.S | 4 +- arch/powerpc/kernel/irq_64.c | 2 +- arch/powerpc/mm/kasan/init_32.c | 1 + arch/powerpc/platforms/pseries/lpar.c | 8 +- arch/riscv/include/asm/jump_label.h | 4 +- arch/s390/include/asm/jump_label.h | 4 +- arch/sparc/include/asm/jump_label.h | 4 +- arch/um/Makefile | 4 +- arch/um/include/asm/cpufeature.h | 2 +- arch/x86/Kconfig.cpu | 2 +- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/include/asm/jump_label.h | 6 +- arch/x86/include/asm/rmwcc.h | 2 +- arch/x86/include/asm/uaccess.h | 10 +- arch/x86/include/asm/virtext.h | 12 +- arch/x86/kernel/fpu/signal.c | 13 +- arch/x86/kvm/svm/svm_ops.h | 6 +- arch/x86/kvm/vmx/pmu_intel.c | 2 +- arch/x86/kvm/vmx/vmx.c | 8 +- arch/x86/kvm/vmx/vmx_ops.h | 6 +- arch/x86/mm/ident_map.c | 23 ++- arch/xtensa/include/asm/jump_label.h | 4 +- block/blk-mq.c | 9 +- drivers/android/binder.c | 10 + drivers/base/core.c | 15 +- drivers/base/power/domain.c | 2 +- drivers/bus/moxtet.c | 7 + drivers/crypto/ccp/sev-dev.c | 10 +- drivers/firewire/core-device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 + drivers/gpu/drm/amd/display/dc/dml/Makefile | 6 +- drivers/gpu/drm/drm_prime.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 32 ++- drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + drivers/hid/i2c-hid/i2c-hid-of.c | 1 + drivers/hid/wacom_sys.c | 63 ++++-- drivers/hid/wacom_wac.c | 9 +- drivers/i2c/busses/Makefile | 6 +- drivers/i2c/busses/i2c-i801.c | 4 +- drivers/i2c/busses/i2c-pasemi-core.c | 5 + drivers/i2c/busses/i2c-qcom-geni.c | 16 +- drivers/iio/accel/Kconfig | 2 + drivers/iio/imu/bno055/Kconfig | 1 + drivers/iio/industrialio-core.c | 5 +- drivers/iio/light/hid-sensor-als.c | 1 + drivers/iio/magnetometer/rm3100-core.c | 10 +- drivers/infiniband/hw/irdma/verbs.c | 7 + drivers/interconnect/qcom/sc8180x.c | 1 + drivers/irqchip/irq-brcmstb-l2.c | 5 +- drivers/irqchip/irq-gic-v3-its.c | 22 +- drivers/irqchip/irq-loongson-eiointc.c | 2 +- drivers/md/dm-crypt.c | 37 +--- drivers/md/dm-verity-target.c | 26 +-- drivers/md/dm-verity.h | 1 - drivers/md/md.c | 7 +- .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- drivers/media/rc/bpf-lirc.c | 6 +- drivers/media/rc/ir_toy.c | 2 + drivers/media/rc/lirc_dev.c | 5 +- drivers/media/rc/rc-core-priv.h | 2 +- drivers/misc/fastrpc.c | 2 +- drivers/mmc/core/slot-gpio.c | 6 +- drivers/mmc/host/sdhci-pci-o2micro.c | 30 +++ drivers/net/can/dev/netlink.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 38 +++- .../net/ethernet/microchip/lan966x/lan966x_lag.c | 9 +- .../net/ethernet/netronome/nfp/flower/conntrack.c | 24 ++- .../ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 + drivers/net/ethernet/ti/cpsw.c | 2 + drivers/net/ethernet/ti/cpsw_new.c | 3 + drivers/net/hyperv/netvsc.c | 5 +- drivers/net/hyperv/netvsc_drv.c | 82 ++++++-- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 15 +- drivers/net/wireless/marvell/mwifiex/Kconfig | 5 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 46 ++++- drivers/net/wireless/marvell/mwifiex/sdio.h | 3 + drivers/net/xen-netback/netback.c | 100 +++++---- drivers/of/property.c | 14 +- drivers/of/unittest.c | 12 +- drivers/s390/net/qeth_l3_main.c | 9 +- drivers/scsi/fcoe/fcoe_ctlr.c | 20 +- drivers/scsi/storvsc_drv.c | 12 +- drivers/spi/spi-ppc4xx.c | 5 - drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- drivers/tty/serial/max310x.c | 53 ++++- drivers/usb/common/ulpi.c | 2 +- drivers/usb/core/hub.c | 30 ++- drivers/usb/dwc3/gadget.c | 6 +- drivers/usb/gadget/function/f_mass_storage.c | 20 +- drivers/usb/typec/ucsi/ucsi.c | 2 + drivers/usb/typec/ucsi/ucsi_acpi.c | 17 +- fs/btrfs/block-group.c | 49 ++++- fs/btrfs/block-group.h | 7 + fs/btrfs/delalloc-space.c | 29 ++- fs/btrfs/disk-io.c | 13 +- fs/btrfs/inode.c | 26 ++- fs/btrfs/ioctl.c | 5 + fs/btrfs/qgroup.c | 14 ++ fs/btrfs/send.c | 2 +- fs/ceph/caps.c | 3 +- fs/ext4/mballoc.c | 39 ++-- fs/ext4/move_extent.c | 6 +- fs/hugetlbfs/inode.c | 19 +- fs/namespace.c | 11 +- fs/nfsd/nfs4state.c | 37 ++-- fs/nilfs2/file.c | 8 +- fs/nilfs2/recovery.c | 7 +- fs/proc/array.c | 10 +- fs/smb/client/cached_dir.c | 8 +- fs/smb/client/smb2ops.c | 2 +- fs/smb/client/smb2pdu.c | 95 +++++---- fs/smb/client/smb2proto.h | 12 +- fs/smb/server/smb2pdu.c | 8 +- fs/zonefs/file.c | 42 ++-- fs/zonefs/super.c | 66 +++--- include/asm-generic/vmlinux.lds.h | 6 - include/linux/bpf.h | 12 +- include/linux/compiler-gcc.h | 20 ++ include/linux/compiler_types.h | 11 +- include/linux/iio/adc/ad_sigma_delta.h | 4 +- include/linux/iio/common/st_sensors.h | 4 +- include/linux/iio/imu/adis.h | 3 +- include/linux/init.h | 3 - include/linux/mmc/sdio_ids.h | 1 + include/linux/netfilter/ipset/ip_set.h | 4 + include/net/tls.h | 5 - init/Kconfig | 9 + io_uring/net.c | 5 +- kernel/bpf/helpers.c | 67 +++--- kernel/bpf/verifier.c | 3 +- kernel/time/hrtimer.c | 14 +- kernel/trace/bpf_trace.c | 56 +++-- kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace.c | 78 +++---- kernel/trace/trace_events_trigger.c | 6 +- lib/mpi/ec.c | 3 + mm/page-writeback.c | 2 +- mm/readahead.c | 4 +- mm/userfaultfd.c | 15 +- net/can/j1939/j1939-priv.h | 3 +- net/can/j1939/main.c | 2 +- net/can/j1939/socket.c | 46 +++-- net/core/skbuff.c | 3 +- net/hsr/hsr_device.c | 4 +- net/mac80211/tx.c | 5 +- net/mptcp/pm_userspace.c | 13 +- net/mptcp/protocol.c | 24 +-- net/mptcp/protocol.h | 4 +- net/netfilter/ipset/ip_set_bitmap_gen.h | 14 +- net/netfilter/ipset/ip_set_core.c | 39 +++- net/netfilter/ipset/ip_set_hash_gen.h | 19 +- net/netfilter/ipset/ip_set_list_set.c | 13 +- net/netfilter/nft_set_pipapo_avx2.c | 2 +- net/nfc/nci/core.c | 4 + net/openvswitch/flow_netlink.c | 49 +++-- net/tls/tls.h | 1 + net/tls/tls_main.c | 2 + net/tls/tls_sw.c | 226 +++++++++++++-------- net/wireless/core.c | 1 + net/xfrm/xfrm_input.c | 77 +++---- net/xfrm/xfrm_output.c | 33 +-- samples/bpf/asm_goto_workaround.h | 8 +- scripts/Makefile.modpost | 1 + scripts/link-vmlinux.sh | 9 +- scripts/mod/modpost.c | 43 ++-- scripts/mod/sumversion.c | 7 +- security/security.c | 14 +- sound/pci/hda/patch_conexant.c | 18 ++ sound/pci/hda/patch_cs8409.c | 1 + sound/pci/hda/patch_realtek.c | 11 +- sound/soc/amd/yc/acp6x-mach.c | 14 ++ sound/soc/codecs/rt5645.c | 1 + sound/soc/codecs/wcd938x.c | 2 +- tools/arch/x86/include/asm/rmwcc.h | 2 +- tools/include/linux/compiler_types.h | 4 +- tools/testing/selftests/kvm/dirty_log_test.c | 77 ++++--- tools/testing/selftests/net/mptcp/config | 3 + tools/testing/selftests/net/mptcp/settings | 2 +- tools/testing/selftests/vm/ksm_tests.c | 2 +- tools/testing/selftests/vm/va_128TBswitch.sh | 6 + tools/tracing/rtla/Makefile | 7 +- tools/tracing/rtla/src/osnoise_hist.c | 9 +- tools/tracing/rtla/src/osnoise_top.c | 6 +- tools/tracing/rtla/src/timerlat_hist.c | 9 +- tools/tracing/rtla/src/timerlat_top.c | 6 +- tools/tracing/rtla/src/utils.c | 12 +- tools/tracing/rtla/src/utils.h | 2 + 225 files changed, 2020 insertions(+), 1099 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/197 work around gcc bugs with asm goto with outputs
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 68fb3ca0e408e00db1c3f8fccdfa19e274c033be upstream.
We've had issues with gcc and 'asm goto' before, and we created a 'asm_volatile_goto()' macro for that in the past: see commits 3f0116c3238a ("compiler/gcc4: Add quirk for 'asm goto' miscompilation bug") and a9f180345f53 ("compiler/gcc4: Make quirk for asm_volatile_goto() unconditional").
Then, much later, we ended up removing the workaround in commit 43c249ea0b1e ("compiler-gcc.h: remove ancient workaround for gcc PR 58670") because we no longer supported building the kernel with the affected gcc versions, but we left the macro uses around.
Now, Sean Christopherson reports a new version of a very similar problem, which is fixed by re-applying that ancient workaround. But the problem in question is limited to only the 'asm goto with outputs' cases, so instead of re-introducing the old workaround as-is, let's rename and limit the workaround to just that much less common case.
It looks like there are at least two separate issues that all hit in this area:
(a) some versions of gcc don't mark the asm goto as 'volatile' when it
has outputs:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98619
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110420
which is easy to work around by just adding the 'volatile' by hand.(b) Internal compiler errors:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110422
which are worked around by adding the extra empty 'asm' as a barrier, as in the original workaround.
but the problem Sean sees may be a third thing since it involves bad code generation (not an ICE) even with the manually added 'volatile'.
The same old workaround works for this case, even if this feels a bit like voodoo programming and may only be hiding the issue.
--- arch/arc/include/asm/jump_label.h | 4 ++-- arch/arm/include/asm/jump_label.h | 4 ++-- arch/arm64/include/asm/alternative-macros.h | 4 ++-- arch/arm64/include/asm/jump_label.h | 4 ++-- arch/csky/include/asm/jump_label.h | 4 ++-- arch/mips/include/asm/jump_label.h | 4 ++-- arch/parisc/include/asm/jump_label.h | 4 ++-- arch/powerpc/include/asm/bug.h | 2 +- arch/powerpc/include/asm/jump_label.h | 4 ++-- arch/powerpc/include/asm/uaccess.h | 8 ++++---- arch/powerpc/kernel/irq_64.c | 2 +- arch/riscv/include/asm/jump_label.h | 4 ++-- arch/s390/include/asm/jump_label.h | 4 ++-- arch/sparc/include/asm/jump_label.h | 4 ++-- arch/um/include/asm/cpufeature.h | 2 +- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/include/asm/jump_label.h | 6 +++--- arch/x86/include/asm/rmwcc.h | 2 +- arch/x86/include/asm/uaccess.h | 10 +++++----- arch/x86/include/asm/virtext.h | 12 ++++++------ arch/x86/kvm/svm/svm_ops.h | 6 +++--- arch/x86/kvm/vmx/vmx.c | 8 ++++---- arch/x86/kvm/vmx/vmx_ops.h | 6 +++--- arch/xtensa/include/asm/jump_label.h | 4 ++-- include/linux/compiler-gcc.h | 19 +++++++++++++++++++ include/linux/compiler_types.h | 4 ++-- net/netfilter/nft_set_pipapo_avx2.c | 2 +- samples/bpf/asm_goto_workaround.h | 8 ++++---- tools/arch/x86/include/asm/rmwcc.h | 2 +- tools/include/linux/compiler_types.h | 4 ++-- 30 files changed, 86 insertions(+), 67 deletions(-)
arch/arc/include/asm/jump_label.h +2 -2
@@ -31,7 +31,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,bool branch) { - asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n" + asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n""1: \n" "nop \n" ".pushsection __jump_table, \"aw\" \n"
@@ -47,7 +47,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key,bool branch) { - asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n" + asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n""1: \n" "b %l[l_yes] \n" ".pushsection __jump_table, \"aw\" \n"
arch/arm/include/asm/jump_label.h +2 -2
@@ -11,7 +11,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { - asm_volatile_goto("1:\n\t" + asm goto("1:\n\t" WASM(nop) "\n\t"".pushsection __jump_table, \"aw\"\n\t" ".word 1b, %l[l_yes], %c0\n\t"
@@ -25,7 +25,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { - asm_volatile_goto("1:\n\t" + asm goto("1:\n\t" WASM(b) " %l[l_yes]\n\t"".pushsection __jump_table, \"aw\"\n\t" ".word 1b, %l[l_yes], %c0\n\t"
arch/arm64/include/asm/alternative-macros.h +2 -2
@@ -229,7 +229,7 @@ alternative_has_feature_likely(unsignedcompiletime_assert (feature <ARM64_NCAPS ,"feature must be < ARM64_NCAPS" ); -asm_volatile_goto ( + asm goto( ALTERNATIVE_CB("b %l[l_no]", %[feature], alt_cb_patch_nops) : : [feature] "i" (feature)
@@ -247,7 +247,7 @@ alternative_has_feature_unlikely(unsignecompiletime_assert (feature <ARM64_NCAPS ,"feature must be < ARM64_NCAPS" ); -asm_volatile_goto ( + asm goto( ALTERNATIVE("nop", "b %l[l_yes]", %[feature]) : : [feature] "i" (feature)
arch/arm64/include/asm/jump_label.h +2 -2
@@ -18,7 +18,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,bool branch) { -asm_volatile_goto ( + asm goto("1: nop \n\t" " .pushsection __jump_table, \"aw\" \n\t" " .align 3 \n\t"
@@ -35,7 +35,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key,bool branch) { -asm_volatile_goto ( + asm goto("1: b %l[l_yes] \n\t" " .pushsection __jump_table, \"aw\" \n\t" " .align 3 \n\t"
arch/csky/include/asm/jump_label.h +2 -2
@@ -12,7 +12,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,bool branch) { -asm_volatile_goto ( + asm goto("1: nop32 \n" " .pushsection __jump_table, \"aw\" \n" " .align 2 \n"
@@ -29,7 +29,7 @@ label: static __always_inline bool arch_static_branch_jump(struct static_key *key,bool branch) { -asm_volatile_goto ( + asm goto("1: bsr32 %l[label] \n" " .pushsection __jump_table, \"aw\" \n" " .align 2 \n"
arch/mips/include/asm/jump_label.h +2 -2
@@ -36,7 +36,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\t" B_INSN " 2f\n\t" + asm goto("1:\t" B_INSN " 2f\n\t" "2:\t.insn\n\t" ".pushsection __jump_table, \"aw\"\n\t" WORD_INSN " 1b, %l[l_yes], %0\n\t"
@@ -50,7 +50,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\t" J_INSN " %l[l_yes]\n\t" + asm goto("1:\t" J_INSN " %l[l_yes]\n\t" ".pushsection __jump_table, \"aw\"\n\t" WORD_INSN " 1b, %l[l_yes], %0\n\t" ".popsection\n\t"
arch/parisc/include/asm/jump_label.h +2 -2
@@ -12,7 +12,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".align %1\n\t"
@@ -29,7 +29,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "b,n %l[l_yes]\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".align %1\n\t"
arch/powerpc/include/asm/bug.h +1 -1
@@ -74,7 +74,7 @@ ##__VA_ARGS__)#define WARN_ENTRY (insn, flags, label, ...) \ - asm_volatile_goto( \ + asm goto( \ "1: " insn "\n" \ EX_TABLE(1b, %l[label]) \ _EMIT_BUG_ENTRY \
arch/powerpc/include/asm/jump_label.h +2 -2
@@ -17,7 +17,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "nop # arch_static_branch\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".long 1b - ., %l[l_yes] - .\n\t"
@@ -32,7 +32,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "b %l[l_yes] # arch_static_branch_jump\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".long 1b - ., %l[l_yes] - .\n\t"
arch/powerpc/include/asm/uaccess.h +4 -4
@@ -72,7 +72,7 @@ __pu_failed: \* are no aliasing issues. */ #define __put_user_asm_goto (x, addr, label, op) \ - asm_volatile_goto( \ + asm goto( \ "1: " op "%U1%X1 %0,%1 # put_user\n" \ EX_TABLE(1b, %l2) \ : \
@@ -85,7 +85,7 @@ __pu_failed: \ __put_user_asm_goto(x, ptr, label, "std")#else /* __powerpc64__ */ #define __put_user_asm2_goto (x, addr, label) \ - asm_volatile_goto( \ + asm goto( \ "1: stw%X1 %0, %1\n" \ "2: stw%X1 %L0, %L1\n" \ EX_TABLE(1b, %l2) \
@@ -132,7 +132,7 @@ do { \#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT #define __get_user_asm_goto (x, addr, label, op) \ - asm_volatile_goto( \ + asm_goto_output( \ "1: "op"%U1%X1 %0, %1 # get_user\n" \ EX_TABLE(1b, %l2) \ : "=r" (x) \
@@ -145,7 +145,7 @@ do { \ __get_user_asm_goto(x, addr, label, "ld")#else /* __powerpc64__ */ #define __get_user_asm2_goto (x, addr, label) \ - asm_volatile_goto( \ + asm_goto_output( \ "1: lwz%X1 %0, %1\n" \ "2: lwz%X1 %L0, %L1\n" \ EX_TABLE(1b, %l2) \
arch/powerpc/kernel/irq_64.c +1 -1
@@ -230,7 +230,7 @@ again:* This allows interrupts to be unmasked without hard disabling, and * also without new hard interrupts coming in ahead of pending ones. */ -asm_volatile_goto ( + asm goto("1: \n" " lbz 9,%0(13) \n" " cmpwi 9,0 \n"
arch/riscv/include/asm/jump_label.h +2 -2
@@ -17,7 +17,7 @@ static __always_inline bool arch_static_branch(struct static_key * const key,const bool branch) { -asm_volatile_goto ( + asm goto(" .align 2 \n\t" " .option push \n\t" " .option norelax \n\t"
@@ -39,7 +39,7 @@ label: static __always_inline bool arch_static_branch_jump(struct static_key * const key,const bool branch) { -asm_volatile_goto ( + asm goto(" .align 2 \n\t" " .option push \n\t" " .option norelax \n\t"
arch/s390/include/asm/jump_label.h +2 -2
@@ -25,7 +25,7 @@*/ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { -asm_volatile_goto ("0: brcl 0,%l[label]\n" + asm goto("0: brcl 0,%l[label]\n" ".pushsection __jump_table,\"aw\"\n" ".balign 8\n" ".long 0b-.,%l[label]-.\n"
@@ -39,7 +39,7 @@ label: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { -asm_volatile_goto ("0: brcl 15,%l[label]\n" + asm goto("0: brcl 15,%l[label]\n" ".pushsection __jump_table,\"aw\"\n" ".balign 8\n" ".long 0b-.,%l[label]-.\n"
arch/sparc/include/asm/jump_label.h +2 -2
@@ -10,7 +10,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "nop\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t"
@@ -26,7 +26,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "b %l[l_yes]\n\t" "nop\n\t" ".pushsection __jump_table, \"aw\"\n\t"
arch/um/include/asm/cpufeature.h +1 -1
@@ -75,7 +75,7 @@ extern void setup_clear_cpu_cap(unsigned*/ static __always_inline bool _static_cpu_has(u16 bit) { -asm_volatile_goto ("1: jmp 6f\n" + asm goto("1: jmp 6f\n" "2:\n" ".skip -(((5f-4f) - (2b-1b)) > 0) * " "((5f-4f) - (2b-1b)),0x90\n"
arch/x86/include/asm/cpufeature.h +1 -1
@@ -173,7 +173,7 @@ extern void clear_cpu_cap(struct cpuinfo*/ static __always_inline bool _static_cpu_has(u16 bit) { -asm_volatile_goto ( + asm goto( ALTERNATIVE_TERNARY("jmp 6f", %P[feature], "", "jmp %l[t_no]")".pushsection .altinstr_aux,\"ax\"\n" "6:\n"
arch/x86/include/asm/jump_label.h +3 -3
@@ -24,7 +24,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool branch) { - asm_volatile_goto("1:" + asm goto("1:" "jmp %l[l_yes] # objtool NOPs this \n\t" JUMP_TABLE_ENTRY : :"i" (key),"i" (2 | branch) : : l_yes);
@@ -38,7 +38,7 @@ l_yes: static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch) { - asm_volatile_goto("1:" + asm goto("1:" ".byte " __stringify(BYTES_NOP5) "\n\t" JUMP_TABLE_ENTRY : : "i" (key), "i" (branch) : : l_yes);
@@ -52,7 +52,7 @@ l_yes: static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch) { - asm_volatile_goto("1:" + asm goto("1:" "jmp %l[l_yes]\n\t" JUMP_TABLE_ENTRY : :"i" (key),"i" (branch) : : l_yes);
arch/x86/include/asm/rmwcc.h +1 -1
@@ -18,7 +18,7 @@#define __GEN_RMWcc (fullop, _var, cc, clobbers, ...) \ ({ \ bool c = false; \ - asm_volatile_goto (fullop "; j" #cc " %l[cc_label]" \ + asm goto (fullop "; j" #cc " %l[cc_label]" \ : : [var] "m" (_var), ## __VA_ARGS__ \ : clobbers : cc_label); \ if (0) { \
arch/x86/include/asm/uaccess.h +5 -5
@@ -155,7 +155,7 @@ extern int __get_user_bad(void);#ifdef CONFIG_X86_32 #define __put_user_goto_u64 (x, addr, label) \ - asm_volatile_goto("\n" \ + asm goto("\n" \ "1: movl %%eax,0(%1)\n" \ "2: movl %%edx,4(%1)\n" \ _ASM_EXTABLE_UA(1b, %l2) \
@@ -317,7 +317,7 @@ do { \ } while (0)#define __get_user_asm (x, addr, itype, ltype, label) \ - asm_volatile_goto("\n" \ + asm_goto_output("\n" \ "1: mov"itype" %[umem],%[output]\n" \ _ASM_EXTABLE_UA(1b, %l2) \ : [output] ltype(x) \
@@ -397,7 +397,7 @@ do { \__typeof__ (_ptr) _old = (__typeof__ (_ptr))(_pold); \ __typeof__(*(_ptr)) __old = *_old; \ __typeof__(*(_ptr)) __new = (_new); \ -asm_volatile_goto ("\n" \ +asm_goto_output ("\n" \"1: " LOCK_PREFIX "cmpxchg" itype" %[new], %[ptr]\n" \ _ASM_EXTABLE_UA(1b, %l[label]) \ : CC_OUT(z) (success), \
@@ -416,7 +416,7 @@ do { \__typeof__ (_ptr) _old = (__typeof__ (_ptr))(_pold); \ __typeof__(*(_ptr)) __old = *_old; \ __typeof__(*(_ptr)) __new = (_new); \ - asm_volatile_goto("\n" \ + asm_goto_output("\n" \ "1: " LOCK_PREFIX "cmpxchg8b %[ptr]\n" \ _ASM_EXTABLE_UA(1b, %l[label]) \ : CC_OUT(z) (success), \
@@ -499,7 +499,7 @@ struct __large_struct { unsigned long bu* aliasing issues. */ #define __put_user_goto (x, addr, itype, ltype, label) \ - asm_volatile_goto("\n" \ + asm goto("\n" \ "1: mov"itype" %0,%1\n" \ _ASM_EXTABLE_UA(1b, %l2) \ : : ltype(x), "m" (__m(addr)) \
arch/x86/include/asm/virtext.h +6 -6
@@ -43,9 +43,9 @@ static inline int cpu_has_vmx(void)*/ static inline int cpu_vmxoff (void ) { - asm_volatile_goto("1: vmxoff\n\t" - _ASM_EXTABLE(1b, %l[fault]) - ::: "cc", "memory" : fault); + asm goto("1: vmxoff\n\t" + _ASM_EXTABLE(1b, %l[fault]) + ::: "cc", "memory" : fault); cr4_clear_bits(X86_CR4_VMXE );return 0 ;
@@ -129,9 +129,9 @@ static inline void cpu_svm_disable(void)* case, GIF must already be set, otherwise the NMI would have * been blocked, so just eat the fault. */ - asm_volatile_goto("1: stgi\n\t" - _ASM_EXTABLE(1b, %l[fault]) - ::: "memory" : fault); + asm goto("1: stgi\n\t" + _ASM_EXTABLE(1b, %l[fault]) + ::: "memory" : fault); fault:wrmsrl (MSR_EFER , efer & ~EFER_SVME ); }
arch/x86/kvm/svm/svm_ops.h +3 -3
@@ -8,7 +8,7 @@ #define svm_asm(insn, clobber...) \ do { \ - asm_volatile_goto("1: " __stringify(insn) "\n\t" \ + asm goto("1: " __stringify(insn) "\n\t" \ _ASM_EXTABLE(1b, %l[fault]) \ ::: clobber : fault); \ return; \
@@ -18,7 +18,7 @@ fault: \ #define svm_asm1(insn, op1, clobber...) \ do { \ - asm_volatile_goto("1: " __stringify(insn) " %0\n\t" \ + asm goto("1: " __stringify(insn) " %0\n\t" \ _ASM_EXTABLE(1b, %l[fault]) \ :: op1 : clobber : fault); \ return; \
@@ -28,7 +28,7 @@ fault: \ #define svm_asm2(insn, op1, op2, clobber...) \ do { \ - asm_volatile_goto("1: " __stringify(insn) " %1, %0\n\t" \ + asm goto("1: " __stringify(insn) " %1, %0\n\t" \ _ASM_EXTABLE(1b, %l[fault]) \ :: op1, op2 : clobber : fault); \ return; \
arch/x86/kvm/vmx/vmx.c +4 -4
@@ -2469,10 +2469,10 @@ static int kvm_cpu_vmxon(u64 vmxon_pointcr4_set_bits (X86_CR4_VMXE ); - asm_volatile_goto("1: vmxon %[vmxon_pointer]\n\t" - _ASM_EXTABLE(1b, %l[fault]) - : : [vmxon_pointer] "m"(vmxon_pointer) - : : fault); + asm goto("1: vmxon %[vmxon_pointer]\n\t" + _ASM_EXTABLE(1b, %l[fault]) + : : [vmxon_pointer] "m"(vmxon_pointer) + : : fault);return 0 ; fault:
arch/x86/kvm/vmx/vmx_ops.h +3 -3
@@ -73,7 +73,7 @@ static __always_inline unsigned long __v#ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT -asm_volatile_goto ("1: vmread %[field], %[output]\n\t" +asm_goto_output ("1: vmread %[field], %[output]\n\t" "jna %l[do_fail]\n\t" _ASM_EXTABLE(1b, %l[do_exception])
@@ -166,7 +166,7 @@ static __always_inline unsigned long vmc #define vmx_asm1(insn, op1, error_args...) \ do { \ - asm_volatile_goto("1: " __stringify(insn) " %0\n\t" \ + asm goto("1: " __stringify(insn) " %0\n\t" \ ".byte 0x2e\n\t"/* branch not taken hint */ \"jna %l[error]\n\t" \ _ASM_EXTABLE(1b, %l[fault]) \
@@ -183,7 +183,7 @@ fault: \ #define vmx_asm2(insn, op1, op2, error_args...) \ do { \ - asm_volatile_goto("1: " __stringify(insn) " %1, %0\n\t" \ + asm goto("1: " __stringify(insn) " %1, %0\n\t" \ ".byte 0x2e\n\t"/* branch not taken hint */ \"jna %l[error]\n\t" \ _ASM_EXTABLE(1b, %l[fault]) \
arch/xtensa/include/asm/jump_label.h +2 -2
@@ -13,7 +13,7 @@ static __always_inline bool arch_static_branch(struct static_key *key,bool branch) { -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" "_nop\n\t" ".pushsection __jump_table, \"aw\"\n\t" ".word 1b, %l[l_yes], %c0\n\t"
@@ -38,7 +38,7 @@ static __always_inline bool arch_static_* make it reachable and wrap both into a no-transform block * to avoid any assembler interference with this. */ -asm_volatile_goto ("1:\n\t" + asm goto("1:\n\t" ".begin no-transform\n\t" "_j %l[l_yes]\n\t" "2:\n\t"
include/linux/compiler-gcc.h +19 -0
@@ -66,6 +66,25 @@__builtin_unreachable (); \ }while (0 ) +/* +* GCC 'asm goto' with outputs miscompiles certain code sequences: +* +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110420 +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110422 +* +* Work it around via the same compiler barrier quirk that we used +* to use for the old 'asm goto' workaround. +* +* Also, always mark such 'asm goto' statements as volatile: all +* asm goto statements are supposed to be volatile as per the +* documentation, but some versions of gcc didn't actually do +* that for asms with outputs: +* +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98619 +*/ +#define asm_goto_output(x...) \ + do { asm volatile goto(x); asm (""); } while (0) +#if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP )#define __HAVE_BUILTIN_BSWAP32__#define __HAVE_BUILTIN_BSWAP64__
include/linux/compiler_types.h +2 -2
@@ -284,8 +284,8 @@ struct ftrace_likely_data {# define __realloc_size (x, ...)#endif -#ifndef asm_volatile_goto -#define asm_volatile_goto(x...) asm goto(x) +#ifndef asm_goto_output +#define asm_goto_output(x...) asm goto(x)#endif #ifdef CONFIG_CC_HAS_ASM_INLINE
net/netfilter/nft_set_pipapo_avx2.c +1 -1
@@ -57,7 +57,7 @@/* Jump to label if @reg is zero */ #define NFT_PIPAPO_AVX2_NOMATCH_GOTO (reg, label) \ - asm_volatile_goto("vptest %%ymm" #reg ", %%ymm" #reg ";" \ + asm goto("vptest %%ymm" #reg ", %%ymm" #reg ";" \ "je %l[" #label "]" : : : : label)/* Store 256 bits from YMM register into memory. Contrary to bucket load
samples/bpf/asm_goto_workaround.h +4 -4
@@ -4,14 +4,14 @@#define __ASM_GOTO_WORKAROUND_H/* -* This will bring in asm_volatile_goto and asm_inline macro definitions +* This will bring in asm_goto_output and asm_inline macro definitions * if enabled by compiler and config options. */ #include <linux/types.h> -#ifdef asm_volatile_goto -#undef asm_volatile_goto -#define asm_volatile_goto(x...) asm volatile("invalid use of asm_volatile_goto") +#ifdef asm_goto_output +#undef asm_goto_output +#define asm_goto_output(x...) asm volatile("invalid use of asm_goto_output")#endif /*
tools/arch/x86/include/asm/rmwcc.h +1 -1
@@ -4,7 +4,7 @@#define __GEN_RMWcc (fullop, var, cc, ...) \ do { \ - asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \ + asm goto (fullop "; j" cc " %l[cc_label]" \ : : "m" (var), ## __VA_ARGS__ \ : "memory" : cc_label); \ return 0; \
tools/include/linux/compiler_types.h +2 -2
@@ -36,8 +36,8 @@#include <linux/compiler-gcc.h> #endif -#ifndef asm_volatile_goto -#define asm_volatile_goto(x...) asm goto(x) +#ifndef asm_goto_output +#define asm_goto_output(x...) asm goto(x)#endif #endif /* __LINUX_COMPILER_TYPES_H */
Greg Kroah-Hartman
maintainerPATCH 2/197 update workarounds for gcc "asm goto" issue
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 68fb3ca0e408e00db1c3f8fccdfa19e274c033be upstream.
In commit 4356e9f841f7 ("work around gcc bugs with 'asm goto' with outputs") I did the gcc workaround unconditionally, because the cause of the bad code generation wasn't entirely clear.
In the meantime, Jakub Jelinek debugged the issue, and has come up with a fix in gcc [2], which also got backported to the still maintained branches of gcc-11, gcc-12 and gcc-13.
Note that while the fix technically wasn't in the original gcc-14 branch, Jakub says:
"while it is true that no GCC 14 snapshots until today (or whenever the
fix will be committed) have the fix, for GCC trunk it is up to the distros to use the latest snapshot if they use it at all and would allow better testing of the kernel code without the workaround, so that if there are other issues they won't be discovered years later. Most userland code doesn't actually use asm goto with outputs..."
so we will consider gcc-14 to be fixed - if somebody is using gcc snapshots of the gcc-14 before the fix, they should upgrade.
Note that while the bug goes back to gcc-11, in practice other gcc changes seem to have effectively hidden it since gcc-12.1 as per a bisect by Jakub. So even a gcc-14 snapshot without the fix likely doesn't show actual problems.
Also, make the default 'asm_goto_output()' macro mark the asm as volatile by hand, because of an unrelated gcc issue [1] where it doesn't match the documented behavior ("asm goto is always volatile").
--- include/linux/compiler-gcc.h | 7 ++++--- include/linux/compiler_types.h | 9 ++++++++- init/Kconfig | 9 +++++++++ 3 files changed, 21 insertions(+), 4 deletions(-)
include/linux/compiler-gcc.h +4 -3
@@ -69,10 +69,9 @@/* * GCC 'asm goto' with outputs miscompiles certain code sequences: * -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110420 -* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110422 +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921 * -* Work it around via the same compiler barrier quirk that we used +* Work around it via the same compiler barrier quirk that we used * to use for the old 'asm goto' workaround. * * Also, always mark such 'asm goto' statements as volatile: all
@@ -82,8 +81,10 @@* * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98619 */ +#ifdef CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND #define asm_goto_output(x...) \ do { asm volatile goto(x); asm (""); } while (0) +#endif #if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP )#define __HAVE_BUILTIN_BSWAP32__
include/linux/compiler_types.h +8 -1
@@ -284,8 +284,15 @@ struct ftrace_likely_data {# define __realloc_size (x, ...)#endif +/* +* Some versions of gcc do not mark 'asm goto' volatile: +* +* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103979 +* +* We do it here by hand, because it doesn't hurt. +*/ #ifndef asm_goto_output -#define asm_goto_output(x...) asm goto(x) +#define asm_goto_output(x...) asm volatile goto(x)#endif #ifdef CONFIG_CC_HAS_ASM_INLINE
init/Kconfig +9 -0
@@ -89,6 +89,15 @@ config CC_HAS_ASM_GOTO_TIED_OUTPUT # Detect buggy gcc and clang, fixed in gcc-11 clang-14. def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) +config GCC_ASM_GOTO_OUTPUT_WORKAROUND + bool + depends on CC_IS_GCC && CC_HAS_ASM_GOTO_OUTPUT + # Fixed in GCC 14, 13.3, 12.4 and 11.5 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921 + default y if GCC_VERSION < 110500 + default y if GCC_VERSION >= 120000 && GCC_VERSION < 120400 + default y if GCC_VERSION >= 130000 && GCC_VERSION < 130300 + config TOOLS_SUPPORT_RELR def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
Greg Kroah-Hartman
maintainerPATCH 3/197 btrfs: add and use helper to check if block group is used
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 1693d5442c458ae8d5b0d58463b873cd879569ed upstream.
Add a helper function to determine if a block group is being used and make use of it at btrfs_delete_unused_bgs(). This helper will also be used in future code changes.
--- fs/btrfs/block-group.c | 3 +-- fs/btrfs/block-group.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/block-group.c +1 -2
@@ -1375,8 +1375,7 @@ void btrfs_delete_unused_bgs(struct btrf }spin_lock (&block_group->lock); -if (block_group->reserved || block_group->pinned || - block_group->used || block_group->ro || +if (btrfs_is_block_group_used (block_group) || block_group->ro ||list_is_singular (&block_group->list)) {/* * We want to bail if we made new allocations or have
fs/btrfs/block-group.h +7 -0
@@ -241,6 +241,13 @@ static inline u64 btrfs_block_group_end(return (block_group->start + block_group->length); } +static inline bool btrfs_is_block_group_used (const struct btrfs_block_group *bg) +{ +lockdep_assert_held (&bg->lock); + +return (bg->used >0 || bg->reserved >0 || bg->pinned >0 ); +} +static inline bool btrfs_is_block_group_data_only (struct btrfs_block_group *block_group) {
Greg Kroah-Hartman
maintainerPATCH 4/197 btrfs: do not delete unused block group if it may be used soon
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit f4a9f219411f318ae60d6ff7f129082a75686c6c upstream.
Before deleting a block group that is in the list of unused block groups (fs_info->unused_bgs), we check if the block group became used before deleting it, as extents from it may have been allocated after it was added to the list.
However even if the block group was not yet used, there may be tasks that have only reserved space and have not yet allocated extents, and they might be relying on the availability of the unused block group in order to allocate extents. The reservation works first by increasing the "bytes_may_use" field of the corresponding space_info object (which may first require flushing delayed items, allocating a new block group, etc), and only later a task does the actual allocation of extents.
For metadata we usually don't end up using all reserved space, as we are pessimistic and typically account for the worst cases (need to COW every single node in a path of a tree at maximum possible height, etc). For data we usually reserve the exact amount of space we're going to allocate later, except when using compression where we always reserve space based on the uncompressed size, as compression is only triggered when writeback starts so we don't know in advance how much space we'll actually need, or if the data is compressible.
So don't delete an unused block group if the total size of its space_info object minus the block group's size is less then the sum of used space and space that may be used (space_info->bytes_may_use), as that means we have tasks that reserved space and may need to allocate extents from the block group. In this case, besides skipping the deletion, re-add the block group to the list of unused block groups so that it may be reconsidered later, in case the tasks that reserved space end up not needing to allocate extents from it.
Allowing the deletion of the block group while we have reserved space, can result in tasks failing to allocate metadata extents (-ENOSPC) while under a transaction handle, resulting in a transaction abort, or failure during writeback for the case of data extents.
--- fs/btrfs/block-group.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
fs/btrfs/block-group.c +46 -0
@@ -1318,6 +1318,7 @@ out:*/ void btrfs_delete_unused_bgs (struct btrfs_fs_info *fs_info) { +LIST_HEAD (retry_list);struct btrfs_block_group *block_group;struct btrfs_space_info *space_info;struct btrfs_trans_handle *trans;
@@ -1339,6 +1340,7 @@ void btrfs_delete_unused_bgs(struct btrfspin_lock (&fs_info->unused_bgs_lock);while (!list_empty (&fs_info->unused_bgs)) { +u64 used;int trimming; block_group = list_first_entry(&fs_info->unused_bgs,
@@ -1374,6 +1376,7 @@ void btrfs_delete_unused_bgs(struct btrf goto next; } +spin_lock (&space_info->lock);spin_lock (&block_group->lock);if (btrfs_is_block_group_used (block_group) || block_group->ro ||list_is_singular (&block_group->list)) {
@@ -1385,10 +1388,49 @@ void btrfs_delete_unused_bgs(struct btrf*/ trace_btrfs_skip_unused_block_group (block_group);spin_unlock (&block_group->lock); +spin_unlock (&space_info->lock);up_write (&space_info->groups_sem); goto next; } + +/* +* The block group may be unused but there may be space reserved +* accounting with the existence of that block group, that is, +* space_info->bytes_may_use was incremented by a task but no +* space was yet allocated from the block group by the task. +* That space may or may not be allocated, as we are generally +* pessimistic about space reservation for metadata as well as +* for data when using compression (as we reserve space based on +* the worst case, when data can't be compressed, and before +* actually attempting compression, before starting writeback). +* +* So check if the total space of the space_info minus the size +* of this block group is less than the used space of the +* space_info - if that's the case, then it means we have tasks +* that might be relying on the block group in order to allocate +* extents, and add back the block group to the unused list when +* we finish, so that we retry later in case no tasks ended up +* needing to allocate extents from the block group. +*/ + used =btrfs_space_info_used (space_info, true); +if (space_info->total_bytes - block_group->length < used) { +/* +* Add a reference for the list, compensate for the ref +* drop under the "next" label for the +* fs_info->unused_bgs list. +*/ +btrfs_get_block_group (block_group); +list_add_tail (&block_group->bg_list, &retry_list); + +trace_btrfs_skip_unused_block_group (block_group); +spin_unlock (&block_group->lock); +spin_unlock (&space_info->lock); +up_write (&space_info->groups_sem); + goto next; + } +spin_unlock (&block_group->lock); +spin_unlock (&space_info->lock);/* We don't want to force the issue, only flip if it's ok. */ ret =inc_block_group_ro (block_group,0 );
@@ -1512,12 +1554,16 @@ next:btrfs_put_block_group (block_group);spin_lock (&fs_info->unused_bgs_lock); } +list_splice_tail (&retry_list, &fs_info->unused_bgs);spin_unlock (&fs_info->unused_bgs_lock);mutex_unlock (&fs_info->reclaim_bgs_lock);return ; flip_async:btrfs_end_transaction (trans); +spin_lock (&fs_info->unused_bgs_lock); +list_splice_tail (&retry_list, &fs_info->unused_bgs); +spin_unlock (&fs_info->unused_bgs_lock);mutex_unlock (&fs_info->reclaim_bgs_lock);btrfs_put_block_group (block_group);btrfs_discard_punt_unused_bgs_list (fs_info);
Greg Kroah-Hartman
maintainerPATCH 5/197 btrfs: forbid creating subvol qgroups
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Burkov <[email protected]>
commit 0c309d66dacddf8ce939b891d9ead4a8e21ad6f0 upstream.
Creating a qgroup 0/subvolid leads to various races and it isn't helpful, because you can't specify a subvol id when creating a subvol, so you can't be sure it will be the right one. Any requirements on the automatic subvol can be gratified by using a higher level qgroup and the inheritance parameters of subvol creation.
--- fs/btrfs/ioctl.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/btrfs/ioctl.c +5 -0
@@ -4695,6 +4695,11 @@ static long btrfs_ioctl_qgroup_create(st goto out; } +if (sa->create &&is_fstree (sa->qgroupid)) { + ret = -EINVAL ; + goto out; + } + trans =btrfs_join_transaction (root);if (IS_ERR (trans)) { ret =PTR_ERR (trans);
Greg Kroah-Hartman
maintainerPATCH 6/197 btrfs: do not ASSERT() if the newly created subvolume already got read
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
commit e03ee2fe873eb68c1f9ba5112fee70303ebf9dfb upstream.
[BUG]
There is a syzbot crash, triggered by the ASSERT() during subvolume creation:
assertion failed: !anon_dev, in fs/btrfs/disk-io.c:1319
------------[ cut here ]------------ kernel BUG at fs/btrfs/disk-io.c:1319! invalid opcode: 0000 [#1] PREEMPT SMP KASAN RIP: 0010:btrfs_get_root_ref.part.0+0x9aa/0xa60 <TASK> btrfs_get_new_fs_root+0xd3/0xf0 create_subvol+0xd02/0x1650 btrfs_mksubvol+0xe95/0x12b0 __btrfs_ioctl_snap_create+0x2f9/0x4f0 btrfs_ioctl_snap_create+0x16b/0x200 btrfs_ioctl+0x35f0/0x5cf0 __x64_sys_ioctl+0x19d/0x210 do_syscall_64+0x3f/0xe0 entry_SYSCALL_64_after_hwframe+0x63/0x6b ---[ end trace 0000000000000000 ]---
[CAUSE]
During create_subvol(), after inserting root item for the newly created subvolume, we would trigger btrfs_get_new_fs_root() to get the btrfs_root of that subvolume.
The idea here is, we have preallocated an anonymous device number for the subvolume, thus we can assign it to the new subvolume.
But there is really nothing preventing things like backref walk to read the new subvolume.
If that happens before we call btrfs_get_new_fs_root(), the subvolume would be read out, with a new anonymous device number assigned already.
In that case, we would trigger ASSERT(), as we really expect no one to read out that subvolume (which is not yet accessible from the fs). But things like backref walk is still possible to trigger the read on the subvolume.
Thus our assumption on the ASSERT() is not correct in the first place.
[FIX]
Fix it by removing the ASSERT(), and just free the @anon_dev, reset it to 0, and continue.
If the subvolume tree is read out by something else, it should have already get a new anon_dev assigned thus we only need to free the preallocated one.
--- fs/btrfs/disk-io.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +11 -2
@@ -1662,8 +1662,17 @@ static struct btrfs_root *btrfs_get_root again: root =btrfs_lookup_fs_root (fs_info, objectid);if (root) { -/* Shouldn't get preallocated anon_dev for cached roots */ -ASSERT (!anon_dev); +/* +* Some other caller may have read out the newly inserted +* subvolume already (for things like backref walk etc). Not +* that common but still possible. In that case, we just need +* to free the anon_dev. +*/ +if (unlikely (anon_dev)) { +free_anon_bdev (anon_dev); + anon_dev =0 ; + } +if (check_ref &&btrfs_root_refs (&root->root_item) ==0 ) {btrfs_put_root (root);return ERR_PTR (-ENOENT );
Greg Kroah-Hartman
maintainerPATCH 7/197 btrfs: forbid deleting live subvol qgroup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Burkov <[email protected]>
commit a8df35619948bd8363d330c20a90c9a7fbff28c0 upstream.
If a subvolume still exists, forbid deleting its qgroup 0/subvolid. This behavior generally leads to incorrect behavior in squotas and doesn't have a legitimate purpose.
--- fs/btrfs/qgroup.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/btrfs/qgroup.c +14 -0
@@ -1635,6 +1635,15 @@ out:return ret; } +static bool qgroup_has_usage (struct btrfs_qgroup *qgroup) +{ +return (qgroup->rfer >0 || qgroup->rfer_cmpr >0 || + qgroup->excl >0 || qgroup->excl_cmpr >0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_DATA ] >0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PREALLOC ] >0 || + qgroup->rsv.values[BTRFS_QGROUP_RSV_META_PERTRANS ] >0 ); +} +int btrfs_remove_qgroup (struct btrfs_trans_handle *trans,u64 qgroupid) {struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -1654,6 +1663,11 @@ int btrfs_remove_qgroup(struct btrfs_tra goto out; } +if (is_fstree (qgroupid) &&qgroup_has_usage (qgroup)) { + ret = -EBUSY ; + goto out; + } +/* Check if there are no children of this qgroup */ if (!list_empty (&qgroup->members)) { ret = -EBUSY ;
Greg Kroah-Hartman
maintainerPATCH 8/197 btrfs: send: return EOPNOTSUPP on unknown flags
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Sterba <[email protected]>
commit f884a9f9e59206a2d41f265e7e403f080d10b493 upstream.
When some ioctl flags are checked we return EOPNOTSUPP, like for BTRFS_SCRUB_SUPPORTED_FLAGS, BTRFS_SUBVOL_CREATE_ARGS_MASK or fallocate modes. The EINVAL is supposed to be for a supported but invalid values or combination of options. Fix that when checking send flags so it's consistent with the rest.
--- fs/btrfs/send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/send.c +1 -1
@@ -7852,7 +7852,7 @@ long btrfs_ioctl_send(struct inode *inod }if (arg->flags & ~BTRFS_SEND_FLAG_MASK ) { - ret = -EINVAL ; + ret = -EOPNOTSUPP ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 9/197 btrfs: dont reserve space for checksums when writing to nocow files
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit feefe1f49d26bad9d8997096e3a200280fa7b1c5 upstream.
Currently when doing a write to a file we always reserve metadata space for inserting data checksums. However we don't need to do it if we have a nodatacow file (-o nodatacow mount option or chattr +C) or if checksums are disabled (-o nodatasum mount option), as in that case we are only adding unnecessary pressure to metadata reservations.
For example on x86_64, with the default node size of 16K, a 4K buffered write into a nodatacow file is reserving 655360 bytes of metadata space, as it's accounting for checksums. After this change, which stops reserving space for checksums if we have a nodatacow file or checksums are disabled, we only need to reserve 393216 bytes of metadata.
--- fs/btrfs/delalloc-space.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)
fs/btrfs/delalloc-space.c +19 -10
@@ -243,7 +243,6 @@ static void btrfs_calculate_inode_block_struct btrfs_block_rsv *block_rsv = &inode->block_rsv;u64 reserve_size =0 ;u64 qgroup_rsv_size =0 ; -u64 csum_leaves;unsigned outstanding_extents;lockdep_assert_held (&inode->lock);
@@ -258,10 +257,12 @@ static void btrfs_calculate_inode_block_ outstanding_extents); reserve_size +=btrfs_calc_metadata_size (fs_info,1 ); } - csum_leaves =btrfs_csum_bytes_to_leaves (fs_info, - inode->csum_bytes); - reserve_size +=btrfs_calc_insert_metadata_size (fs_info, - csum_leaves); +if (!(inode->flags &BTRFS_INODE_NODATASUM )) { +u64 csum_leaves; + + csum_leaves =btrfs_csum_bytes_to_leaves (fs_info, inode->csum_bytes); + reserve_size +=btrfs_calc_insert_metadata_size (fs_info, csum_leaves); + }/* * For qgroup rsv, the calculation is very simple: * account one nodesize for each outstanding extent
@@ -276,14 +277,20 @@ static void btrfs_calculate_inode_block_spin_unlock (&block_rsv->lock); } -static void calc_inode_reservations (struct btrfs_fs_info *fs_info, +static void calc_inode_reservations (struct btrfs_inode *inode,u64 num_bytes,u64 disk_num_bytes,u64 *meta_reserve,u64 *qgroup_reserve) { +struct btrfs_fs_info *fs_info = inode->root->fs_info;u64 nr_extents =count_max_extents (fs_info, num_bytes); -u64 csum_leaves =btrfs_csum_bytes_to_leaves (fs_info, disk_num_bytes); +u64 csum_leaves;u64 inode_update =btrfs_calc_metadata_size (fs_info,1 ); +if (inode->flags &BTRFS_INODE_NODATASUM ) + csum_leaves =0 ; +else + csum_leaves =btrfs_csum_bytes_to_leaves (fs_info, disk_num_bytes); + *meta_reserve =btrfs_calc_insert_metadata_size (fs_info, nr_extents + csum_leaves);
@@ -335,7 +342,7 @@ int btrfs_delalloc_reserve_metadata(stru* everything out and try again, which is bad. This way we just * over-reserve slightly, and clean up the mess when we are done. */ -calc_inode_reservations (fs_info, num_bytes, disk_num_bytes, +calc_inode_reservations (inode, num_bytes, disk_num_bytes, &meta_reserve, &qgroup_reserve); ret =btrfs_qgroup_reserve_meta_prealloc (root, qgroup_reserve, true, noflush);
@@ -356,7 +363,8 @@ int btrfs_delalloc_reserve_metadata(struspin_lock (&inode->lock); nr_extents =count_max_extents (fs_info, num_bytes);btrfs_mod_outstanding_extents (inode, nr_extents); - inode->csum_bytes += disk_num_bytes; +if (!(inode->flags &BTRFS_INODE_NODATASUM )) + inode->csum_bytes += disk_num_bytes;btrfs_calculate_inode_block_rsv_size (fs_info, inode);spin_unlock (&inode->lock);
@@ -390,7 +398,8 @@ void btrfs_delalloc_release_metadata(str num_bytes =ALIGN (num_bytes, fs_info->sectorsize);spin_lock (&inode->lock); - inode->csum_bytes -= num_bytes; +if (!(inode->flags &BTRFS_INODE_NODATASUM )) + inode->csum_bytes -= num_bytes;btrfs_calculate_inode_block_rsv_size (fs_info, inode);spin_unlock (&inode->lock);
Greg Kroah-Hartman
maintainerPATCH 10/197 btrfs: reject encoded write if inode has nodatasum flag set
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
commit 1bd96c92c6a0a4d43815eb685c15aa4b78879dc9 upstream.
Currently we allow an encoded write against inodes that have the NODATASUM flag set, either because they are NOCOW files or they were created while the filesystem was mounted with "-o nodatasum". This results in having compressed extents without corresponding checksums, which is a filesystem inconsistency reported by 'btrfs check'.
For example, running btrfs/281 with MOUNT_OPTIONS="-o nodatacow" triggers this and 'btrfs check' errors out with:
[1/7] checking root items
[2/7] checking extents
[3/7] checking free space tree
[4/7] checking fs roots
root 256 inode 257 errors 1040, bad file extent, some csum missing root 256 inode 258 errors 1040, bad file extent, some csum missing
ERROR: errors found in fs roots
(...)
So reject encoded writes if the target inode has NODATASUM set.
--- fs/btrfs/inode.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/btrfs/inode.c +7 -0
@@ -10774,6 +10774,13 @@ ssize_t btrfs_do_encoded_write(struct kiif (encoded->encryption !=BTRFS_ENCODED_IO_ENCRYPTION_NONE )return -EINVAL ; +/* +* Compressed extents should always have checksums, so error out if we +* have a NOCOW file or inode was created while mounted with NODATASUM. +*/ +if (inode->flags &BTRFS_INODE_NODATASUM ) +return -EINVAL ; + orig_count =iov_iter_count (from);/* The extent size must be sane. */
Greg Kroah-Hartman
maintainerPATCH 11/197 btrfs: dont drop extent_map for free space inode on write error
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
commit 5571e41ec6e56e35f34ae9f5b3a335ef510e0ade upstream.
While running the CI for an unrelated change I hit the following panic with generic/648 on btrfs_holes_spacecache.
assertion failed: block_start != EXTENT_MAP_HOLE, in fs/btrfs/extent_io.c:1385
------------[ cut here ]------------ kernel BUG at fs/btrfs/extent_io.c:1385! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 1 PID: 2695096 Comm: fsstress Kdump: loaded Tainted: G W 6.8.0-rc2+ #1 RIP: 0010:__extent_writepage_io.constprop.0+0x4c1/0x5c0 Call Trace: <TASK> extent_write_cache_pages+0x2ac/0x8f0 extent_writepages+0x87/0x110 do_writepages+0xd5/0x1f0 filemap_fdatawrite_wbc+0x63/0x90 __filemap_fdatawrite_range+0x5c/0x80 btrfs_fdatawrite_range+0x1f/0x50 btrfs_write_out_cache+0x507/0x560 btrfs_write_dirty_block_groups+0x32a/0x420 commit_cowonly_roots+0x21b/0x290 btrfs_commit_transaction+0x813/0x1360 btrfs_sync_file+0x51a/0x640 __x64_sys_fdatasync+0x52/0x90 do_syscall_64+0x9c/0x190 entry_SYSCALL_64_after_hwframe+0x6e/0x76
This happens because we fail to write out the free space cache in one instance, come back around and attempt to write it again. However on the second pass through we go to call btrfs_get_extent() on the inode to get the extent mapping. Because this is a new block group, and with the free space inode we always search the commit root to avoid deadlocking with the tree, we find nothing and return a EXTENT_MAP_HOLE for the requested range.
This happens because the first time we try to write the space cache out we hit an error, and on an error we drop the extent mapping. This is normal for normal files, but the free space cache inode is special. We always expect the extent map to be correct. Thus the second time through we end up with a bogus extent map.
Since we're deprecating this feature, the most straightforward way to fix this is to simply skip dropping the extent map range for this failed range.
I shortened the test by using error injection to stress the area to make it easier to reproduce. With this patch in place we no longer panic with my error injection test.
--- fs/btrfs/inode.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +17 -2
@@ -3364,8 +3364,23 @@ out: unwritten_start += logical_len;clear_extent_uptodate (io_tree, unwritten_start, end,NULL ); -/* Drop extent maps for the part of the extent we didn't write. */ -btrfs_drop_extent_map_range (inode, unwritten_start, end, false); +/* +* Drop extent maps for the part of the extent we didn't write. +* +* We have an exception here for the free_space_inode, this is +* because when we do btrfs_get_extent() on the free space inode +* we will search the commit root. If this is a new block group +* we won't find anything, and we will trip over the assert in +* writepage where we do ASSERT(em->block_start != +* EXTENT_MAP_HOLE). +* +* Theoretically we could also skip this for any NOCOW extent as +* we don't mess with the extent map tree in the NOCOW case, but +* for now simply skip this if we are the free space inode. +*/ +if (!btrfs_is_free_space_inode (inode)) +btrfs_drop_extent_map_range (inode, unwritten_start, + end, false);/* * If the ordered extent had an IOERR or something else went
Greg Kroah-Hartman
maintainerPATCH 12/197 driver core: Fix device_link_flag_is_sync_state_only()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan <[email protected]>
commit 7fddac12c38237252431d5b8af7b6d5771b6d125 upstream.
device_link_flag_is_sync_state_only() correctly returns true on the flags of an existing device link that only implements sync_state() functionality. However, it incorrectly and confusingly returns false if it's called with DL_FLAG_SYNC_STATE_ONLY.
This bug doesn't manifest in any of the existing calls to this function, but fix this confusing behavior to avoid future bugs.
--- drivers/base/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/base/core.c +4 -2
@@ -337,10 +337,12 @@ static bool device_is_ancestor(struct dereturn false; } +#define DL_MARKER_FLAGS (DL_FLAG_INFERRED | \ + DL_FLAG_CYCLE | \ + DL_FLAG_MANAGED)static inline bool device_link_flag_is_sync_state_only (u32 flags) { -return (flags & ~(DL_FLAG_INFERRED |DL_FLAG_CYCLE )) == - (DL_FLAG_SYNC_STATE_ONLY |DL_FLAG_MANAGED ); +return (flags & ~DL_MARKER_FLAGS ) ==DL_FLAG_SYNC_STATE_ONLY ; }/**
Greg Kroah-Hartman
maintainerPATCH 13/197 of: unittest: Fix compile in the non-dynamic case
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian A. Ehrhardt <[email protected]>
[ Upstream commit 607aad1e4356c210dbef9022955a3089377909b2 ]
If CONFIG_OF_KOBJ is not set, a device_node does not contain a kobj and attempts to access the embedded kobj via kref_read break the compile.
Replace affected kref_read calls with a macro that reads the refcount if it exists and returns 1 if there is no embedded kobj.
--- drivers/of/unittest.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/of/unittest.c +9 -3
@@ -49,6 +49,12 @@ static struct unittest_results { failed; \ }) +#ifdef CONFIG_OF_KOBJ +#define OF_KREF_READ (NODE ) kref_read(&(NODE)->kobj.kref) +#else +#define OF_KREF_READ (NODE ) 1 +#endif +/* * Expected message may have a message level other than KERN_INFO. * Print the expected message only if the current loglevel will allow
@@ -562,7 +568,7 @@ static void __init of_unittest_parse_phandle_with_args_map(void)pr_err ("missing testcase data\n" );return ; } - prefs[i] =kref_read (&p[i]->kobj.kref); + prefs[i] =OF_KREF_READ (p[i]); } rc =of_count_phandle_with_args (np,"phandle-list" ,"#phandle-cells" );
@@ -685,9 +691,9 @@ static void __init of_unittest_parse_phandle_with_args_map(void)unittest (rc == -EINVAL ,"expected:%i got:%i\n" , -EINVAL , rc);for (i =0 ; i <ARRAY_SIZE (p); ++i) { -unittest (prefs[i] ==kref_read (&p[i]->kobj.kref), +unittest (prefs[i] ==OF_KREF_READ (p[i]),"provider%d: expected:%d got:%d\n" , - i, prefs[i],kref_read (&p[i]->kobj.kref)); + i, prefs[i],OF_KREF_READ (p[i]));of_node_put (p[i]); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/197 KVM: selftests: Clear dirty ring states between two modes in dirty_log_test
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gavin Shan <[email protected]>
[ Upstream commit 7167190ddb863bd061c0c6b61f4cec94184b40da ]
There are two states, which need to be cleared before next mode is executed. Otherwise, we will hit failure as the following messages indicate.
- The variable 'dirty_ring_vcpu_ring_full' shared by main and vcpu thread. It's indicating if the vcpu exit due to full ring buffer. The value can be carried from previous mode (VM_MODE_P40V48_4K) to current one (VM_MODE_P40V48_64K) when VM_MODE_P40V48_16K isn't supported.
- The current ring buffer index needs to be reset before next mode (VM_MODE_P40V48_64K) is executed. Otherwise, the stale value is carried from previous mode (VM_MODE_P40V48_4K).
# ./dirty_log_test -M dirty-ring
Setting log mode to: 'dirty-ring'
Test iterations: 32, interval: 10 (ms)
Testing guest mode: PA-bits:40, VA-bits:48, 4K pages
guest physical test memory offset: 0xffbfffc000
:
Dirtied 995328 pages
Total bits checked: dirty (1012434), clear (7114123), track_next (966700)
Testing guest mode: PA-bits:40, VA-bits:48, 64K pages
guest physical test memory offset: 0xffbffc0000
vcpu stops because vcpu is kicked out...
vcpu continues now.
Notifying vcpu to continue
Iteration 1 collected 0 pages
vcpu stops because dirty ring is full...
vcpu continues now.
vcpu stops because dirty ring is full...
vcpu continues now.
vcpu stops because dirty ring is full...
==== Test Assertion Failure ====
dirty_log_test.c:369: cleared == count
pid=10541 tid=10541 errno=22 - Invalid argument
1 0x0000000000403087: dirty_ring_collect_dirty_pages at dirty_log_test.c:369
2 0x0000000000402a0b: log_mode_collect_dirty_pages at dirty_log_test.c:492
3 (inlined by) run_test at dirty_log_test.c:795
4 (inlined by) run_test at dirty_log_test.c:705
5 0x0000000000403a37: for_each_guest_mode at guest_modes.c:100
6 0x0000000000401ccf: main at dirty_log_test.c:938
7 0x0000ffff9ecd279b: ?? ??:0
8 0x0000ffff9ecd286b: ?? ??:0
9 0x0000000000401def: _start at ??:?
Reset dirty pages (0) mismatch with collected (35566)Fix the issues by clearing 'dirty_ring_vcpu_ring_full' and the ring buffer index before next new mode is to be executed.
Stable-dep-of: ba58f873cdee ("KVM: selftests: Fix a semaphore imbalance in the dirty ring logging test")
--- tools/testing/selftests/kvm/dirty_log_test.c | 27 ++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +17 -10
@@ -226,13 +226,15 @@ static void clear_log_create_vm_done(struct kvm_vm *vm) }static void dirty_log_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot, -void *bitmap,uint32_t num_pages) +void *bitmap,uint32_t num_pages, +uint32_t *unused) {kvm_vm_get_dirty_log (vcpu->vm, slot, bitmap); }static void clear_log_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot, -void *bitmap,uint32_t num_pages) +void *bitmap,uint32_t num_pages, +uint32_t *unused) {kvm_vm_get_dirty_log (vcpu->vm, slot, bitmap);kvm_vm_clear_dirty_log (vcpu->vm, slot, bitmap,0 , num_pages);
@@ -329,10 +331,9 @@ static void dirty_ring_continue_vcpu(void) }static void dirty_ring_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot, -void *bitmap,uint32_t num_pages) +void *bitmap,uint32_t num_pages, +uint32_t *ring_buf_idx) { -/* We only have one vcpu */ -static uint32_t fetch_index =0 ;uint32_t count =0 , cleared;bool continued_vcpu = false;
@@ -349,7 +350,8 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot,/* Only have one vcpu */ count =dirty_ring_collect_one (vcpu_map_dirty_ring (vcpu), - slot, bitmap, num_pages, &fetch_index); + slot, bitmap, num_pages, + ring_buf_idx); cleared =kvm_vm_reset_dirty_ring (vcpu->vm);
@@ -406,7 +408,8 @@ struct log_mode {void (*create_vm_done)(struct kvm_vm *vm);/* Hook to collect the dirty pages into the bitmap provided */ void (*collect_dirty_pages) (struct kvm_vcpu *vcpu,int slot, -void *bitmap,uint32_t num_pages); +void *bitmap,uint32_t num_pages, +uint32_t *ring_buf_idx);/* Hook to call when after each vcpu run */ void (*after_vcpu_run)(struct kvm_vcpu *vcpu,int ret,int err);void (*before_vcpu_join) (void );
@@ -471,13 +474,14 @@ static void log_mode_create_vm_done(struct kvm_vm *vm) }static void log_mode_collect_dirty_pages (struct kvm_vcpu *vcpu,int slot, -void *bitmap,uint32_t num_pages) +void *bitmap,uint32_t num_pages, +uint32_t *ring_buf_idx) {struct log_mode *mode = &log_modes[host_log_mode];TEST_ASSERT (mode->collect_dirty_pages !=NULL ,"collect_dirty_pages() is required for any log mode!" ); - mode->collect_dirty_pages (vcpu, slot, bitmap, num_pages); + mode->collect_dirty_pages (vcpu, slot, bitmap, num_pages, ring_buf_idx); }static void log_mode_after_vcpu_run (struct kvm_vcpu *vcpu,int ret,int err)
@@ -696,6 +700,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)struct kvm_vcpu *vcpu;struct kvm_vm *vm;unsigned long *bmap; +uint32_t ring_buf_idx =0 ;if (!log_mode_supported ()) { print_skip("Log mode '%s' not supported",
@@ -771,6 +776,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) host_dirty_count =0 ; host_clear_count =0 ; host_track_next_count =0 ; +WRITE_ONCE (dirty_ring_vcpu_ring_full, false);pthread_create (&vcpu_thread,NULL , vcpu_worker, vcpu);
@@ -778,7 +784,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)/* Give the vcpu thread some time to dirty some pages */ usleep (p->interval *1000 );log_mode_collect_dirty_pages (vcpu,TEST_MEM_SLOT_INDEX , - bmap, host_num_pages); + bmap, host_num_pages, + &ring_buf_idx);/* * See vcpu_sync_stop_requested definition for details on why
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/197 KVM: selftests: Fix a semaphore imbalance in the dirty ring logging test
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit ba58f873cdeec30b6da48e28dd5782c5a3e1371b ]
When finishing the final iteration of dirty_log_test testcase, set host_quit _before_ the final "continue" so that the vCPU worker doesn't run an extra iteration, and delete the hack-a-fix of an extra "continue" from the dirty ring testcase. This fixes a bug where the extra post to sem_vcpu_cont may not be consumed, which results in failures in subsequent runs of the testcases. The bug likely was missed during development as x86 supports only a single "guest mode", i.e. there aren't any subsequent testcases after the dirty ring test, because for_each_guest_mode() only runs a single iteration.
For the regular dirty log testcases, letting the vCPU run one extra iteration is a non-issue as the vCPU worker waits on sem_vcpu_cont if and only if the worker is explicitly told to stop (vcpu_sync_stop_requested). But for the dirty ring test, which needs to periodically stop the vCPU to reap the dirty ring, letting the vCPU resume the guest _after_ the last iteration means the vCPU will get stuck without an extra "continue".
However, blindly firing off an post to sem_vcpu_cont isn't guaranteed to be consumed, e.g. if the vCPU worker sees host_quit==true before resuming the guest. This results in a dangling sem_vcpu_cont, which leads to subsequent iterations getting out of sync, as the vCPU worker will continue on before the main task is ready for it to resume the guest, leading to a variety of asserts, e.g.
==== Test Assertion Failure ====
dirty_log_test.c:384: dirty_ring_vcpu_ring_full
pid=14854 tid=14854 errno=22 - Invalid argument
1 0x00000000004033eb: dirty_ring_collect_dirty_pages at dirty_log_test.c:384
2 0x0000000000402d27: log_mode_collect_dirty_pages at dirty_log_test.c:505
3 (inlined by) run_test at dirty_log_test.c:802
4 0x0000000000403dc7: for_each_guest_mode at guest_modes.c:100
5 0x0000000000401dff: main at dirty_log_test.c:941 (discriminator 3)
6 0x0000ffff9be173c7: ?? ??:0
7 0x0000ffff9be1749f: ?? ??:0
8 0x000000000040206f: _start at ??:?Didn't continue vcpu even without ring full
Alternatively, the test could simply reset the semaphores before each testcase, but papering over hacks with more hacks usually ends in tears.
--- tools/testing/selftests/kvm/dirty_log_test.c | 50 +++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +27 -23
@@ -355,7 +355,10 @@ static void dirty_ring_collect_dirty_pages(struct kvm_vcpu *vcpu, int slot, cleared =kvm_vm_reset_dirty_ring (vcpu->vm); -/* Cleared pages should be the same as collected */ +/* +* Cleared pages should be the same as collected, as KVM is supposed to +* clear only the entries that have been harvested. +*/ TEST_ASSERT (cleared == count,"Reset dirty pages (%u) mismatch " "with collected (%u)" , cleared, count);
@@ -394,12 +397,6 @@ static void dirty_ring_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err) } } -static void dirty_ring_before_vcpu_join (void ) -{ -/* Kick another round of vcpu just to make sure it will quit */ -sem_post (&sem_vcpu_cont); -} -struct log_mode {const char *name;/* Return true if this mode is supported, otherwise false */
@@ -412,7 +409,6 @@ struct log_mode { uint32_t *ring_buf_idx);/* Hook to call when after each vcpu run */ void (*after_vcpu_run)(struct kvm_vcpu *vcpu,int ret,int err); -void (*before_vcpu_join) (void ); } log_modes[LOG_MODE_NUM] = { { .name = "dirty-log",
@@ -431,7 +427,6 @@ struct log_mode { .supported = dirty_ring_supported, .create_vm_done = dirty_ring_create_vm_done, .collect_dirty_pages = dirty_ring_collect_dirty_pages, - .before_vcpu_join = dirty_ring_before_vcpu_join, .after_vcpu_run = dirty_ring_after_vcpu_run, }, };
@@ -492,14 +487,6 @@ static void log_mode_after_vcpu_run(struct kvm_vcpu *vcpu, int ret, int err) mode->after_vcpu_run (vcpu, ret, err); } -static void log_mode_before_vcpu_join (void ) -{ -struct log_mode *mode = &log_modes[host_log_mode]; - -if (mode->before_vcpu_join) - mode->before_vcpu_join (); -} -static void generate_random_array (uint64_t *guest_array,uint64_t size) {uint64_t i;
@@ -701,6 +688,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)struct kvm_vm *vm;unsigned long *bmap;uint32_t ring_buf_idx =0 ; +int sem_val;if (!log_mode_supported ()) { print_skip("Log mode '%s' not supported",
@@ -772,12 +760,22 @@ static void run_test(enum vm_guest_mode mode, void *arg)/* Start the iterations */ iteration =1 ;sync_global_to_guest (vm, iteration); - host_quit = false; +WRITE_ONCE (host_quit, false); host_dirty_count =0 ; host_clear_count =0 ; host_track_next_count =0 ;WRITE_ONCE (dirty_ring_vcpu_ring_full, false); +/* +* Ensure the previous iteration didn't leave a dangling semaphore, i.e. +* that the main task and vCPU worker were synchronized and completed +* verification of all iterations. +*/ +sem_getvalue (&sem_vcpu_stop, &sem_val); +TEST_ASSERT_EQ (sem_val,0 ); +sem_getvalue (&sem_vcpu_cont, &sem_val); +TEST_ASSERT_EQ (sem_val,0 ); +pthread_create (&vcpu_thread,NULL , vcpu_worker, vcpu);while (iteration < p->iterations) {
@@ -803,15 +801,21 @@ static void run_test(enum vm_guest_mode mode, void *arg)assert (host_log_mode ==LOG_MODE_DIRTY_RING ||atomic_read (&vcpu_sync_stop_requested) == false);vm_dirty_log_verify (mode, bmap); -sem_post (&sem_vcpu_cont); - iteration++; +/* +* Set host_quit before sem_vcpu_cont in the final iteration to +* ensure that the vCPU worker doesn't resume the guest. As +* above, the dirty ring test may stop and wait even when not +* explicitly request to do so, i.e. would hang waiting for a +* "continue" if it's allowed to resume the guest. +*/ +if (++iteration == p->iterations) +WRITE_ONCE (host_quit, true); + +sem_post (&sem_vcpu_cont);sync_global_to_guest (vm, iteration); } -/* Tell the vcpu thread to quit */ - host_quit = true; -log_mode_before_vcpu_join ();pthread_join (vcpu_thread,NULL ); pr_info("Total bits checked: dirty (%"PRIu64"), clear (%"PRIu64"), "
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/197 wifi: iwlwifi: Fix some error codes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit c6ebb5b67641994de8bc486b33457fe0b681d6fe ]
This saves the error as PTR_ERR(wifi_pkg). The problem is that "wifi_pkg" is a valid pointer, not an error pointer. Set the error code to -EINVAL instead.
--- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/acpi.c +6 -6
@@ -576,7 +576,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=2 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
@@ -592,7 +592,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=1 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
@@ -608,7 +608,7 @@ int iwl_sar_get_wrds_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=0 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
@@ -665,7 +665,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=2 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
@@ -681,7 +681,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=1 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
@@ -697,7 +697,7 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) &tbl_rev);if (!IS_ERR (wifi_pkg)) {if (tbl_rev !=0 ) { - ret =PTR_ERR (wifi_pkg); + ret = -EINVAL ; goto out_free; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/197 wifi: iwlwifi: uninitialized variable in iwl_acpi_get_ppag_table()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 65c6ee90455053cfd3067c17aaa4a42b0c766543 ]
This is an error path and Smatch complains that "tbl_rev" is uninitialized on this path. All the other functions follow this same patter where they set the error code and goto out_free so that's probably what was intended here as well.
--- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/fw/acpi.c +3 -0
@@ -1044,6 +1044,9 @@ int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt) goto read_table; } + ret =PTR_ERR (wifi_pkg); + goto out_free; + read_table: fwrt->ppag_ver = tbl_rev; flags = &wifi_pkg->package.elements[1 ];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/197 of: property: Improve finding the supplier of a remote-endpoint property
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan <[email protected]>
[ Upstream commit 782bfd03c3ae2c0e6e01b661b8e18f1de50357be ]
After commit 4a032827daa8 ("of: property: Simplify of_link_to_phandle()"), remote-endpoint properties created a fwnode link from the consumer device to the supplier endpoint. This is a tiny bit inefficient (not buggy) when trying to create device links or detecting cycles. So, improve this the same way we improved finding the consumer of a remote-endpoint property.
--- drivers/of/property.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/of/property.c +11 -1
@@ -1261,7 +1261,6 @@ DEFINE_SIMPLE_PROP(pinctrl5, "pinctrl-5", NULL) DEFINE_SIMPLE_PROP(pinctrl6, "pinctrl-6", NULL) DEFINE_SIMPLE_PROP(pinctrl7, "pinctrl-7", NULL) DEFINE_SIMPLE_PROP(pinctrl8, "pinctrl-8", NULL) -DEFINE_SIMPLE_PROP(remote_endpoint, "remote-endpoint", NULL) DEFINE_SIMPLE_PROP(pwms, "pwms", "#pwm-cells") DEFINE_SIMPLE_PROP(resets, "resets", "#reset-cells")DEFINE_SIMPLE_PROP (leds,"leds" ,NULL )
@@ -1326,6 +1325,17 @@ static struct device_node *parse_interrupts(struct device_node *np,return of_irq_parse_one (np, index, &sup_args) ?NULL : sup_args.np; } +static struct device_node *parse_remote_endpoint (struct device_node *np, +const char *prop_name, +int index) +{ +/* Return NULL for index > 0 to signify end of remote-endpoints. */ +if (!index ||strcmp (prop_name,"remote-endpoint" )) +return NULL ; + +return of_graph_get_remote_port_parent (np); +} +static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/197 net: openvswitch: limit the number of recursions from action sets
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Conole <[email protected]>
[ Upstream commit 6e2f90d31fe09f2b852de25125ca875aabd81367 ]
The ovs module allows for some actions to recursively contain an action list for complex scenarios, such as sampling, checking lengths, etc. When these actions are copied into the internal flow table, they are evaluated to validate that such actions make sense, and these calls happen recursively.
The ovs-vswitchd userspace won't emit more than 16 recursion levels deep. However, the module has no such limit and will happily accept limits larger than 16 levels nested. Prevent this by tracking the number of recursions happening and manually limiting it to 16 levels nested.
The initial implementation of the sample action would track this depth and prevent more than 3 levels of recursion, but this was removed to support the clone use case, rather than limited at the current userspace limit.
--- net/openvswitch/flow_netlink.c | 49 +++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 16 deletions(-)
net/openvswitch/flow_netlink.c +33 -16
@@ -47,6 +47,7 @@ struct ovs_len_tbl {#define OVS_ATTR_NESTED -1#define OVS_ATTR_VARIABLE -2 +#define OVS_COPY_ACTIONS_MAX_DEPTH 16static bool actions_may_change_flow (const struct nlattr *actions) {
@@ -2543,13 +2544,15 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr,const struct sw_flow_key *key, struct sw_flow_actions **sfa, __be16 eth_type, __be16 vlan_tci, - u32 mpls_label_count, bool log); + u32 mpls_label_count, bool log, + u32 depth);static int validate_and_copy_sample (struct net *net,const struct nlattr *attr,const struct sw_flow_key *key,struct sw_flow_actions **sfa,__be16 eth_type,__be16 vlan_tci, -u32 mpls_label_count,bool log,bool last) +u32 mpls_label_count,bool log,bool last, +u32 depth) {const struct nlattr *attrs[OVS_SAMPLE_ATTR_MAX +1 ];const struct nlattr *probability, *actions;
@@ -2600,7 +2603,8 @@ static int validate_and_copy_sample(struct net *net, const struct nlattr *attr,return err; err =__ovs_nla_copy_actions (net, actions, key, sfa, - eth_type, vlan_tci, mpls_label_count, log); + eth_type, vlan_tci, mpls_label_count, log, + depth +1 );if (err)return err;
@@ -2615,7 +2619,8 @@ static int validate_and_copy_dec_ttl(struct net *net,const struct sw_flow_key *key, struct sw_flow_actions **sfa, __be16 eth_type, __be16 vlan_tci, - u32 mpls_label_count, bool log) + u32 mpls_label_count, bool log, + u32 depth) { const struct nlattr *attrs[OVS_DEC_TTL_ATTR_MAX + 1];int start, action_start, err, rem;
@@ -2658,7 +2663,8 @@ static int validate_and_copy_dec_ttl(struct net *net,return action_start; err =__ovs_nla_copy_actions (net, actions, key, sfa, eth_type, - vlan_tci, mpls_label_count, log); + vlan_tci, mpls_label_count, log, + depth +1 );if (err)return err;
@@ -2672,7 +2678,8 @@ static int validate_and_copy_clone(struct net *net,const struct sw_flow_key *key, struct sw_flow_actions **sfa, __be16 eth_type, __be16 vlan_tci, - u32 mpls_label_count, bool log, bool last) + u32 mpls_label_count, bool log, bool last, + u32 depth) { int start, err;u32 exec;
@@ -2692,7 +2699,8 @@ static int validate_and_copy_clone(struct net *net,return err; err =__ovs_nla_copy_actions (net, attr, key, sfa, - eth_type, vlan_tci, mpls_label_count, log); + eth_type, vlan_tci, mpls_label_count, log, + depth +1 );if (err)return err;
@@ -3061,7 +3069,7 @@ static int validate_and_copy_check_pkt_len(struct net *net,struct sw_flow_actions **sfa, __be16 eth_type, __be16 vlan_tci, u32 mpls_label_count, - bool log, bool last) + bool log, bool last, u32 depth) { const struct nlattr *acts_if_greater, *acts_if_lesser_eq;struct nlattr *a[OVS_CHECK_PKT_LEN_ATTR_MAX +1 ];
@@ -3109,7 +3117,8 @@ static int validate_and_copy_check_pkt_len(struct net *net,return nested_acts_start; err =__ovs_nla_copy_actions (net, acts_if_lesser_eq, key, sfa, - eth_type, vlan_tci, mpls_label_count, log); + eth_type, vlan_tci, mpls_label_count, log, + depth +1 );if (err)return err;
@@ -3122,7 +3131,8 @@ static int validate_and_copy_check_pkt_len(struct net *net,return nested_acts_start; err =__ovs_nla_copy_actions (net, acts_if_greater, key, sfa, - eth_type, vlan_tci, mpls_label_count, log); + eth_type, vlan_tci, mpls_label_count, log, + depth +1 );if (err)return err;
@@ -3150,12 +3160,16 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr,const struct sw_flow_key *key, struct sw_flow_actions **sfa, __be16 eth_type, __be16 vlan_tci, - u32 mpls_label_count, bool log) + u32 mpls_label_count, bool log, + u32 depth) { u8 mac_proto = ovs_key_mac_proto(key);const struct nlattr *a;int rem, err; +if (depth >OVS_COPY_ACTIONS_MAX_DEPTH ) +return -EOVERFLOW ; +nla_for_each_nested (a, attr, rem) {/* Expected argument lengths, (u32)-1 for variable length. */ static const u32 action_lens[OVS_ACTION_ATTR_MAX + 1] = {
@@ -3350,7 +3364,7 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, err =validate_and_copy_sample (net, a, key, sfa, eth_type, vlan_tci, mpls_label_count, - log, last); + log, last, depth);if (err)return err; skip_copy = true;
@@ -3421,7 +3435,7 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, err =validate_and_copy_clone (net, a, key, sfa, eth_type, vlan_tci, mpls_label_count, - log, last); + log, last, depth);if (err)return err; skip_copy = true;
@@ -3435,7 +3449,8 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, eth_type, vlan_tci, mpls_label_count, - log, last); + log, last, + depth);if (err)return err; skip_copy = true;
@@ -3445,7 +3460,8 @@ static int __ovs_nla_copy_actions(struct net *net, const struct nlattr *attr,case OVS_ACTION_ATTR_DEC_TTL : err =validate_and_copy_dec_ttl (net, a, key, sfa, eth_type, vlan_tci, - mpls_label_count, log); + mpls_label_count, log, + depth);if (err)return err; skip_copy = true;
@@ -3485,7 +3501,8 @@ int ovs_nla_copy_actions(struct net *net, const struct nlattr *attr, (*sfa)->orig_len =nla_len (attr); err =__ovs_nla_copy_actions (net, attr, key, sfa, key->eth.type, - key->eth.vlan.tci, mpls_label_count, log); + key->eth.vlan.tci, mpls_label_count, log, +0 );if (err)ovs_nla_free_flow_actions (*sfa);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/197 lan966x: Fix crash when adding interface under a lag
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit 15faa1f67ab405d47789d4702f587ec7df7ef03e ]
There is a crash when adding one of the lan966x interfaces under a lag interface. The issue can be reproduced like this:
ip link add name bond0 type bond miimon 100 mode balance-xor ip link set dev eth0 master bond0
The reason is because when adding a interface under the lag it would go through all the ports and try to figure out which other ports are under that lag interface. And the issue is that lan966x can have ports that are NULL pointer as they are not probed. So then iterating over these ports it would just crash as they are NULL pointers.
The fix consists in actually checking for NULL pointers before accessing something from the ports. Like we do in other places.
--- drivers/net/ethernet/microchip/lan966x/lan966x_lag.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_lag.c +7 -2
@@ -37,19 +37,24 @@ static void lan966x_lag_set_aggr_pgids(struct lan966x *lan966x)/* Now, set PGIDs for each active LAG */ for (lag =0 ; lag < lan966x->num_phys_ports; ++lag) { -struct net_device *bond = lan966x->ports[lag]->bond; +struct lan966x_port *port = lan966x->ports[lag];int num_active_ports =0 ; +struct net_device *bond;unsigned long bond_mask;u8 aggr_idx[16 ]; -if (!bond || (visited &BIT (lag))) +if (!port || !port->bond || (visited &BIT (lag)))continue ; + bond = port->bond; bond_mask =lan966x_lag_get_mask (lan966x, bond);for_each_set_bit (p, &bond_mask, lan966x->num_phys_ports) {struct lan966x_port *port = lan966x->ports[p]; +if (!port) +continue ; +lan_wr (ANA_PGID_PGID_SET (bond_mask), lan966x,ANA_PGID (p));if (port->lag_tx_active)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/197 tls/sw: Use splice_eof() to flush
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit df720d288dbb1793e82b6ccbfc670ec871e9def4 ]
Allow splice to end a TLS record after prematurely ending a splice/sendfile due to getting an EOF condition (->splice_read() returned 0) after splice had called TLS with a sendmsg() with MSG_MORE set when the user didn't set MSG_MORE.
Stable-dep-of: aec7961916f3 ("tls: fix race between async notify and socket close")
--- net/tls/tls.h | 1 + net/tls/tls_main.c | 2 ++ net/tls/tls_sw.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+)
net/tls/tls.h +1 -0
@@ -97,6 +97,7 @@ void tls_update_rx_zc_capable(struct tls_context *tls_ctx);void tls_sw_strparser_arm (struct sock *sk,struct tls_context *ctx);void tls_sw_strparser_done (struct tls_context *tls_ctx);int tls_sw_sendmsg (struct sock *sk,struct msghdr *msg,size_t size); +void tls_sw_splice_eof (struct socket *sock);int tls_sw_sendpage_locked (struct sock *sk,struct page *page,int offset,size_t size,int flags); int tls_sw_sendpage(struct sock *sk, struct page *page,
net/tls/tls_main.c +2 -0
@@ -922,6 +922,7 @@ static void build_proto_ops(struct proto_ops ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG] ops[TLS_BASE ][TLS_BASE ] = *base; ops[TLS_SW ][TLS_BASE ] = ops[TLS_BASE ][TLS_BASE ]; + ops[TLS_SW ][TLS_BASE ].splice_eof = tls_sw_splice_eof; ops[TLS_SW ][TLS_BASE ].sendpage_locked = tls_sw_sendpage_locked; ops[TLS_BASE ][TLS_SW ] = ops[TLS_BASE ][TLS_BASE ];
@@ -990,6 +991,7 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], prot[TLS_SW ][TLS_BASE ] = prot[TLS_BASE ][TLS_BASE ]; prot[TLS_SW ][TLS_BASE ].sendmsg = tls_sw_sendmsg; + prot[TLS_SW ][TLS_BASE ].splice_eof = tls_sw_splice_eof; prot[TLS_SW ][TLS_BASE ].sendpage = tls_sw_sendpage; prot[TLS_BASE ][TLS_SW ] = prot[TLS_BASE ][TLS_BASE ];
net/tls/tls_sw.c +74 -0
80 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/197 tls: extract context alloc/initialization out of tls_set_sw_offload
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sabrina Dubroca <[email protected]>
[ Upstream commit 615580cbc99af0da2d1c7226fab43a3d5003eb97 ]
Simplify tls_set_sw_offload a bit.
Stable-dep-of: aec7961916f3 ("tls: fix race between async notify and socket close")
--- net/tls/tls_sw.c | 86 ++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 35 deletions(-)
net/tls/tls_sw.c +51 -35
@@ -2587,6 +2587,48 @@ void tls_update_rx_zc_capable(struct tls_context *tls_ctx) tls_ctx->prot_info.version !=TLS_1_3_VERSION ; } +static struct tls_sw_context_tx *init_ctx_tx (struct tls_context *ctx,struct sock *sk) +{ +struct tls_sw_context_tx *sw_ctx_tx; + +if (!ctx->priv_ctx_tx) { + sw_ctx_tx =kzalloc (sizeof (*sw_ctx_tx),GFP_KERNEL ); +if (!sw_ctx_tx) +return NULL ; + }else { + sw_ctx_tx = ctx->priv_ctx_tx; + } + +crypto_init_wait (&sw_ctx_tx->async_wait); +spin_lock_init (&sw_ctx_tx->encrypt_compl_lock); +INIT_LIST_HEAD (&sw_ctx_tx->tx_list); +INIT_DELAYED_WORK (&sw_ctx_tx->tx_work.work, tx_work_handler); + sw_ctx_tx->tx_work.sk = sk; + +return sw_ctx_tx; +} + +static struct tls_sw_context_rx *init_ctx_rx (struct tls_context *ctx) +{ +struct tls_sw_context_rx *sw_ctx_rx; + +if (!ctx->priv_ctx_rx) { + sw_ctx_rx =kzalloc (sizeof (*sw_ctx_rx),GFP_KERNEL ); +if (!sw_ctx_rx) +return NULL ; + }else { + sw_ctx_rx = ctx->priv_ctx_rx; + } + +crypto_init_wait (&sw_ctx_rx->async_wait); +spin_lock_init (&sw_ctx_rx->decrypt_compl_lock); +init_waitqueue_head (&sw_ctx_rx->wq); +skb_queue_head_init (&sw_ctx_rx->rx_list); +skb_queue_head_init (&sw_ctx_rx->async_hold); + +return sw_ctx_rx; +} +int tls_set_sw_offload (struct sock *sk,struct tls_context *ctx,int tx) {struct tls_context *tls_ctx =tls_get_ctx (sk);
@@ -2608,48 +2650,22 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx) }if (tx) { -if (!ctx->priv_ctx_tx) { - sw_ctx_tx =kzalloc (sizeof (*sw_ctx_tx),GFP_KERNEL ); -if (!sw_ctx_tx) { - rc = -ENOMEM ; - goto out; - } - ctx->priv_ctx_tx = sw_ctx_tx; - }else { - sw_ctx_tx = - (struct tls_sw_context_tx *)ctx->priv_ctx_tx; - } - }else { -if (!ctx->priv_ctx_rx) { - sw_ctx_rx =kzalloc (sizeof (*sw_ctx_rx),GFP_KERNEL ); -if (!sw_ctx_rx) { - rc = -ENOMEM ; - goto out; - } - ctx->priv_ctx_rx = sw_ctx_rx; - }else { - sw_ctx_rx = - (struct tls_sw_context_rx *)ctx->priv_ctx_rx; - } - } + ctx->priv_ctx_tx =init_ctx_tx (ctx, sk); +if (!ctx->priv_ctx_tx) +return -ENOMEM ; -if (tx) { -crypto_init_wait (&sw_ctx_tx->async_wait); -spin_lock_init (&sw_ctx_tx->encrypt_compl_lock); + sw_ctx_tx = ctx->priv_ctx_tx; crypto_info = &ctx->crypto_send.info; cctx = &ctx->tx; aead = &sw_ctx_tx->aead_send; -INIT_LIST_HEAD (&sw_ctx_tx->tx_list); -INIT_DELAYED_WORK (&sw_ctx_tx->tx_work.work, tx_work_handler); - sw_ctx_tx->tx_work.sk = sk; }else { -crypto_init_wait (&sw_ctx_rx->async_wait); -spin_lock_init (&sw_ctx_rx->decrypt_compl_lock); -init_waitqueue_head (&sw_ctx_rx->wq); + ctx->priv_ctx_rx =init_ctx_rx (ctx); +if (!ctx->priv_ctx_rx) +return -ENOMEM ; + + sw_ctx_rx = ctx->priv_ctx_rx; crypto_info = &ctx->crypto_recv.info; cctx = &ctx->rx; -skb_queue_head_init (&sw_ctx_rx->rx_list); -skb_queue_head_init (&sw_ctx_rx->async_hold); aead = &sw_ctx_rx->aead_recv; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/197 net: tls: factor out tls_*crypt_async_wait()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c57ca512f3b68ddcd62bda9cc24a8f5584ab01b1 ]
Factor out waiting for async encrypt and decrypt to finish. There are already multiple copies and a subsequent fix will need more. No functional changes.
Note that crypto_wait_req() returns wait->err
Stable-dep-of: aec7961916f3 ("tls: fix race between async notify and socket close")
--- net/tls/tls_sw.c | 96 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 51 deletions(-)
net/tls/tls_sw.c +45 -51
@@ -229,6 +229,20 @@ static void tls_decrypt_done(crypto_completion_data_t *data, int err)spin_unlock_bh (&ctx->decrypt_compl_lock); } +static int tls_decrypt_async_wait (struct tls_sw_context_rx *ctx) +{ +int pending; + +spin_lock_bh (&ctx->decrypt_compl_lock); +reinit_completion (&ctx->async_wait.completion); + pending =atomic_read (&ctx->decrypt_pending); +spin_unlock_bh (&ctx->decrypt_compl_lock); +if (pending) +crypto_wait_req (-EINPROGRESS , &ctx->async_wait); + +return ctx->async_wait.err; +} + static int tls_do_decryption(struct sock *sk, struct scatterlist *sgin, struct scatterlist *sgout,
@@ -496,6 +510,28 @@ static void tls_encrypt_done(crypto_completion_data_t *data, int err)schedule_delayed_work (&ctx->tx_work.work,1 ); } +static int tls_encrypt_async_wait (struct tls_sw_context_tx *ctx) +{ +int pending; + +spin_lock_bh (&ctx->encrypt_compl_lock); + ctx->async_notify = true; + + pending =atomic_read (&ctx->encrypt_pending); +spin_unlock_bh (&ctx->encrypt_compl_lock); +if (pending) +crypto_wait_req (-EINPROGRESS , &ctx->async_wait); +else +reinit_completion (&ctx->async_wait.completion); + +/* There can be no concurrent accesses, since we have no +* pending encrypt operations +*/ +WRITE_ONCE (ctx->async_notify, false); + +return ctx->async_wait.err; +} + static int tls_do_encryption(struct sock *sk, struct tls_context *tls_ctx, struct tls_sw_context_tx *ctx,
@@ -953,7 +989,6 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)int num_zc =0 ;int orig_size;int ret =0 ; -int pending;if (msg->msg_flags & ~(MSG_MORE |MSG_DONTWAIT |MSG_NOSIGNAL |MSG_CMSG_COMPAT ))
@@ -1122,24 +1157,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)if (!num_async) { goto send_end; }else if (num_zc) { -/* Wait for pending encryptions to get completed */ -spin_lock_bh (&ctx->encrypt_compl_lock); - ctx->async_notify = true; - - pending =atomic_read (&ctx->encrypt_pending); -spin_unlock_bh (&ctx->encrypt_compl_lock); -if (pending) -crypto_wait_req (-EINPROGRESS , &ctx->async_wait); -else -reinit_completion (&ctx->async_wait.completion); - -/* There can be no concurrent accesses, since we have no -* pending encrypt operations -*/ -WRITE_ONCE (ctx->async_notify, false); +int err; -if (ctx->async_wait.err) { - ret = ctx->async_wait.err; +/* Wait for pending encryptions to get completed */ + err =tls_encrypt_async_wait (ctx); +if (err) { + ret = err; copied =0 ; } }
@@ -1171,7 +1194,6 @@ void tls_sw_splice_eof(struct socket *sock)ssize_t copied =0 ;bool retrying = false;int ret =0 ; -int pending;if (!ctx->open_rec)return ;
@@ -1203,22 +1225,7 @@ void tls_sw_splice_eof(struct socket *sock) }/* Wait for pending encryptions to get completed */ -spin_lock_bh (&ctx->encrypt_compl_lock); - ctx->async_notify = true; - - pending =atomic_read (&ctx->encrypt_pending); -spin_unlock_bh (&ctx->encrypt_compl_lock); -if (pending) -crypto_wait_req (-EINPROGRESS , &ctx->async_wait); -else -reinit_completion (&ctx->async_wait.completion); - -/* There can be no concurrent accesses, since we have no pending -* encrypt operations -*/ -WRITE_ONCE (ctx->async_notify, false); - -if (ctx->async_wait.err) +if (tls_encrypt_async_wait (ctx)) goto unlock;/* Transmit if any encryptions have completed */
@@ -2197,16 +2204,10 @@ int tls_sw_recvmsg(struct sock *sk, recv_end:if (async) { -int ret, pending; +int ret;/* Wait for all previously submitted records to be decrypted */ -spin_lock_bh (&ctx->decrypt_compl_lock); -reinit_completion (&ctx->async_wait.completion); - pending =atomic_read (&ctx->decrypt_pending); -spin_unlock_bh (&ctx->decrypt_compl_lock); - ret =0 ; -if (pending) - ret =crypto_wait_req (-EINPROGRESS , &ctx->async_wait); + ret =tls_decrypt_async_wait (ctx);__skb_queue_purge (&ctx->async_hold);if (ret) {
@@ -2425,16 +2426,9 @@ void tls_sw_release_resources_tx(struct sock *sk)struct tls_context *tls_ctx =tls_get_ctx (sk);struct tls_sw_context_tx *ctx =tls_sw_ctx_tx (tls_ctx);struct tls_rec *rec, *tmp; -int pending;/* Wait for any pending async encryptions to complete */ -spin_lock_bh (&ctx->encrypt_compl_lock); - ctx->async_notify = true; - pending =atomic_read (&ctx->encrypt_pending); -spin_unlock_bh (&ctx->encrypt_compl_lock); - -if (pending) -crypto_wait_req (-EINPROGRESS , &ctx->async_wait); +tls_encrypt_async_wait (ctx);tls_tx_records (sk,-1 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/197 tls: fix race between async notify and socket close
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit aec7961916f3f9e88766e2688992da6980f11b8d ]
The submitting thread (one which called recvmsg/sendmsg) may exit as soon as the async crypto handler calls complete() so any code past that point risks touching already freed data.
Try to avoid the locking and extra flags altogether. Have the main thread hold an extra reference, this way we can depend solely on the atomic ref counter for synchronization.
Don't futz with reiniting the completion, either, we are now tightly controlling when completion fires.
--- include/net/tls.h | 5 ----- net/tls/tls_sw.c | 43 ++++++++++--------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)
include/net/tls.h +0 -5
@@ -108,9 +108,6 @@ struct tls_sw_context_tx {struct tls_rec *open_rec;struct list_head tx_list;atomic_t encrypt_pending; -/* protect crypto_wait with encrypt_pending */ -spinlock_t encrypt_compl_lock; -int async_notify; u8 async_capable:1;#define BIT_TX_SCHEDULED 0
@@ -147,8 +144,6 @@ struct tls_sw_context_rx {struct tls_strparser strp;atomic_t decrypt_pending; -/* protect crypto_wait with decrypt_pending*/ -spinlock_t decrypt_compl_lock;struct sk_buff_head async_hold;struct wait_queue_head wq; };
net/tls/tls_sw.c +10 -33
99 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/197 net: tls: fix use-after-free with partial reads and async decrypt
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sabrina Dubroca <[email protected]>
[ Upstream commit 32b55c5ff9103b8508c1e04bfa5a08c64e7a925f ]
tls_decrypt_sg doesn't take a reference on the pages from clear_skb, so the put_page() in tls_decrypt_done releases them, and we trigger a use-after-free in process_rx_list when we try to read from the partially-read skb.
--- net/tls/tls_sw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/tls/tls_sw.c +3 -2
@@ -62,6 +62,7 @@ struct tls_decrypt_ctx {u8 iv[MAX_IV_SIZE ];u8 aad[TLS_MAX_AAD_SIZE ];u8 tail; +bool free_sgout;struct scatterlist sg[]; };
@@ -186,7 +187,6 @@ static void tls_decrypt_done(crypto_completion_data_t *data, int err)struct aead_request *aead_req =crypto_get_completion_data (data);struct crypto_aead *aead =crypto_aead_reqtfm (aead_req);struct scatterlist *sgout = aead_req->dst; -struct scatterlist *sgin = aead_req->src;struct tls_sw_context_rx *ctx;struct tls_decrypt_ctx *dctx;struct tls_context *tls_ctx;
@@ -212,7 +212,7 @@ static void tls_decrypt_done(crypto_completion_data_t *data, int err) }/* Free the destination pages if skb was not decrypted inplace */ -if (sgout != sgin) { +if (dctx->free_sgout) {/* Skip the first S/G entry as it points to AAD */ for_each_sg (sg_next (sgout), sg,UINT_MAX , pages) {if (!sg)
@@ -1653,6 +1653,7 @@ static int tls_decrypt_sg(struct sock *sk, struct iov_iter *out_iov, }else if (out_sg) {memcpy (sgout, out_sg, n_sgout *sizeof (*sgout)); } + dctx->free_sgout = !!pages;/* Prepare and submit AEAD request */ err = tls_do_decryption(sk, sgin, sgout, dctx->iv,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/197 net: tls: fix returned read length with async decrypt
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit ac437a51ce662364062f704e321227f6728e6adc ]
We double count async, non-zc rx data. The previous fix was lucky because if we fully zc async_copy_bytes is 0 so we add 0. Decrypted already has all the bytes we handled, in all cases. We don't have to adjust anything, delete the erroneous line.
--- net/tls/tls_sw.c | 1 - 1 file changed, 1 deletion(-)
net/tls/tls_sw.c +0 -1
@@ -2202,7 +2202,6 @@ int tls_sw_recvmsg(struct sock *sk,else err =process_rx_list (ctx, msg, &control,0 , async_copy_bytes, is_peek); - decrypted +=max (err,0 ); } copied += decrypted;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/197 spi: ppc4xx: Drop write-only variable
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit b3aa619a8b4706f35cb62f780c14e68796b37f3f ]
Since commit 24778be20f87 ("spi: convert drivers to use bits_per_word_mask") the bits_per_word variable is only written to. The check that was there before isn't needed any more as the spi core ensures that only 8 bit transfers are used, so the variable can go away together with all assignments to it.
--- drivers/spi/spi-ppc4xx.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/spi/spi-ppc4xx.c +0 -5
@@ -166,10 +166,8 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)int scr;u8 cdm =0 ;u32 speed; -u8 bits_per_word;/* Start with the generic configuration for this device. */ - bits_per_word = spi->bits_per_word; speed = spi->max_speed_hz;/*
@@ -177,9 +175,6 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)* the transfer to overwrite the generic configuration with zeros. */ if (t) { -if (t->bits_per_word) - bits_per_word = t->bits_per_word; -if (t->speed_hz) speed =min (t->speed_hz, spi->max_speed_hz); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/197 ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Khoroshilov <[email protected]>
[ Upstream commit 6ef5d5b92f7117b324efaac72b3db27ae8bb3082 ]
There is a path in rt5645_jack_detect_work(), where rt5645->jd_mutex is left locked forever. That may lead to deadlock
when rt5645_jack_detect_work() is called for the second time.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- sound/soc/codecs/rt5645.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5645.c +1 -0
@@ -3288,6 +3288,7 @@ static void rt5645_jack_detect_work(struct work_struct *work) report, SND_JACK_HEADPHONE);snd_soc_jack_report (rt5645->mic_jack, report,SND_JACK_MICROPHONE ); +mutex_unlock (&rt5645->jd_mutex);return ;case 4 : val =snd_soc_component_read (rt5645->component,RT5645_A_JD_CTRL1 ) &0x0020 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/197 net: sysfs: Fix /sys/class/net/<iface> path for statistics
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 5b3fbd61b9d1f4ed2db95aaf03f9adae0373784d ]
The Documentation/ABI/testing/sysfs-class-net-statistics documentation is pointing to the wrong path for the interface. Documentation is pointing to /sys/class/<iface>, instead of /sys/class/net/<iface>.
Fix it by adding the net/ directory before the interface.
--- .../ABI/testing/sysfs-class-net-statistics | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-)
Documentation/ABI/testing/sysfs-class-net-statistics +24 -24
@@ -1,4 +1,4 @@ -What: /sys/class/<iface>/statistics/collisions +What: /sys/class/net/<iface>/statistics/collisions Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -6,7 +6,7 @@ Description: Indicates the number of collisions seen by this network device. This value might not be relevant with all MAC layers. -What: /sys/class/<iface>/statistics/multicast +What: /sys/class/net/<iface>/statistics/multicast Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -14,7 +14,7 @@ Description: Indicates the number of multicast packets received by this network device. -What: /sys/class/<iface>/statistics/rx_bytes +What: /sys/class/net/<iface>/statistics/rx_bytes Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -23,7 +23,7 @@ Description: See the network driver for the exact meaning of when this value is incremented. -What: /sys/class/<iface>/statistics/rx_compressed +What: /sys/class/net/<iface>/statistics/rx_compressed Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -32,7 +32,7 @@ Description: network device. This value might only be relevant for interfaces that support packet compression (e.g: PPP). -What: /sys/class/<iface>/statistics/rx_crc_errors +What: /sys/class/net/<iface>/statistics/rx_crc_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -41,7 +41,7 @@ Description: by this network device. Note that the specific meaning might depend on the MAC layer used by the interface. -What: /sys/class/<iface>/statistics/rx_dropped +What: /sys/class/net/<iface>/statistics/rx_dropped Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -51,7 +51,7 @@ Description: packet processing. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_errors +What: /sys/class/net/<iface>/statistics/rx_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -59,7 +59,7 @@ Description: Indicates the number of receive errors on this network device. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_fifo_errors +What: /sys/class/net/<iface>/statistics/rx_fifo_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -68,7 +68,7 @@ Description: network device. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_frame_errors +What: /sys/class/net/<iface>/statistics/rx_frame_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -78,7 +78,7 @@ Description: on the MAC layer protocol used. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_length_errors +What: /sys/class/net/<iface>/statistics/rx_length_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -87,7 +87,7 @@ Description: error, oversized or undersized. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_missed_errors +What: /sys/class/net/<iface>/statistics/rx_missed_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -96,7 +96,7 @@ Description: due to lack of capacity in the receive side. See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_nohandler +What: /sys/class/net/<iface>/statistics/rx_nohandler Date: February 2016 KernelVersion: 4.6 Contact: [email protected]
@@ -104,7 +104,7 @@ Description: Indicates the number of received packets that were dropped on an inactive device by the network core. -What: /sys/class/<iface>/statistics/rx_over_errors +What: /sys/class/net/<iface>/statistics/rx_over_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -114,7 +114,7 @@ Description: (e.g: larger than MTU). See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/rx_packets +What: /sys/class/net/<iface>/statistics/rx_packets Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -122,7 +122,7 @@ Description: Indicates the total number of good packets received by this network device. -What: /sys/class/<iface>/statistics/tx_aborted_errors +What: /sys/class/net/<iface>/statistics/tx_aborted_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -132,7 +132,7 @@ Description: a medium collision). See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/tx_bytes +What: /sys/class/net/<iface>/statistics/tx_bytes Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -143,7 +143,7 @@ Description: transmitted packets or all packets that have been queued for transmission. -What: /sys/class/<iface>/statistics/tx_carrier_errors +What: /sys/class/net/<iface>/statistics/tx_carrier_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -152,7 +152,7 @@ Description: because of carrier errors (e.g: physical link down). See the network driver for the exact meaning of this value. -What: /sys/class/<iface>/statistics/tx_compressed +What: /sys/class/net/<iface>/statistics/tx_compressed Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -161,7 +161,7 @@ Description: this might only be relevant for devices that support compression (e.g: PPP). -What: /sys/class/<iface>/statistics/tx_dropped +What: /sys/class/net/<iface>/statistics/tx_dropped Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -170,7 +170,7 @@ Description: See the driver for the exact reasons as to why the packets were dropped. -What: /sys/class/<iface>/statistics/tx_errors +What: /sys/class/net/<iface>/statistics/tx_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -179,7 +179,7 @@ Description: a network device. See the driver for the exact reasons as to why the packets were dropped. -What: /sys/class/<iface>/statistics/tx_fifo_errors +What: /sys/class/net/<iface>/statistics/tx_fifo_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -188,7 +188,7 @@ Description: FIFO error. See the driver for the exact reasons as to why the packets were dropped. -What: /sys/class/<iface>/statistics/tx_heartbeat_errors +What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -197,7 +197,7 @@ Description: reported as heartbeat errors. See the driver for the exact reasons as to why the packets were dropped. -What: /sys/class/<iface>/statistics/tx_packets +What: /sys/class/net/<iface>/statistics/tx_packets Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
@@ -206,7 +206,7 @@ Description: device. See the driver for whether this reports the number of all attempted or successful transmissions. -What: /sys/class/<iface>/statistics/tx_window_errors +What: /sys/class/net/<iface>/statistics/tx_window_errors Date: April 2005 KernelVersion: 2.6.12 Contact: [email protected]
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/197 nouveau/svm: fix kvcalloc() argument order
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 2c80a2b715df75881359d07dbaacff8ad411f40e ]
The conversion to kvcalloc() mixed up the object size and count arguments, causing a warning:
drivers/gpu/drm/nouveau/nouveau_svm.c: In function 'nouveau_svm_fault_buffer_ctor':drivers/gpu/drm/nouveau/nouveau_svm.c:1010:40: error: 'kvcalloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
1010 | buffer->fault = kvcalloc(sizeof(*buffer->fault), buffer->entries, GFP_KERNEL);
| ^drivers/gpu/drm/nouveau/nouveau_svm.c:1010:40: note: earlier argument should specify number of elements, later size of each element
The behavior is still correct aside from the warning, but fixing it avoids the warnings and can help the compiler track the individual objects better.
--- drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_svm.c +1 -1
@@ -997,7 +997,7 @@ nouveau_svm_fault_buffer_ctor(struct nouveau_svm *svm, s32 oclass, int id)if (ret)return ret; - buffer->fault =kvcalloc (sizeof (*buffer->fault), buffer->entries,GFP_KERNEL ); + buffer->fault =kvcalloc (buffer->entries,sizeof (*buffer->fault),GFP_KERNEL );if (!buffer->fault)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/197 MIPS: Add memory clobber to csum_ipv6_magic() inline assembler
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit d55347bfe4e66dce2e1e7501e5492f4af3e315f8 ]
After 'lib: checksum: Use aligned accesses for ip_fast_csum and csum_ipv6_magic tests' was applied, the test_csum_ipv6_magic unit test started failing for all mips platforms, both little and bit endian. Oddly enough, adding debug code into test_csum_ipv6_magic() made the problem disappear.
The gcc manual says:
"The "memory" clobber tells the compiler that the assembly code performs
memory reads or writes to items other than those listed in the input and output operands (for example, accessing the memory pointed to by one of the input parameters)
"
This is definitely the case for csum_ipv6_magic(). Indeed, adding the 'memory' clobber fixes the problem.
--- arch/mips/include/asm/checksum.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/include/asm/checksum.h +2 -1
@@ -241,7 +241,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, " .set pop" : "=&r" (sum), "=&r" (tmp) : "r" (saddr), "r" (daddr), - "0" (htonl(len)), "r" (htonl(proto)), "r" (sum)); + "0" (htonl(len)), "r" (htonl(proto)), "r" (sum) + : "memory");return csum_fold (sum); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/197 i40e: Do not allow untrusted VF to remove administratively set MAC
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit 73d9629e1c8c1982f13688c4d1019c3994647ccc ]
Currently when PF administratively sets VF's MAC address and the VF is put down (VF tries to delete all MACs) then the MAC is removed from MAC filters and primary VF MAC is zeroed.
Do not allow untrusted VF to remove primary MAC when it was set administratively by PF.
Reproducer:
1) Create VF
2) Set VF interface up
3) Administratively set the VF's MAC
4) Put VF interface down
[root@host ~]# echo 1 > /sys/class/net/enp2s0f0/device/sriov_numvfs
[root@host ~]# ip link set enp2s0f0v0 up
[root@host ~]# ip link set enp2s0f0 vf 0 mac fe:6c:b5:da:c7:7d
[root@host ~]# ip link show enp2s0f0
23: enp2s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 3c:ec:ef:b7:dd:04 brd ff:ff:ff:ff:ff:ff
vf 0 link/ether fe:6c:b5:da:c7:7d brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state auto, trust off
[root@host ~]# ip link set enp2s0f0v0 down
[root@host ~]# ip link show enp2s0f0
23: enp2s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 3c:ec:ef:b7:dd:04 brd ff:ff:ff:ff:ff:ff
vf 0 link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state auto, trust off--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +33 -5
@@ -2846,6 +2846,24 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg) (u8 *)&stats, sizeof(stats)); } +/** +* i40e_can_vf_change_mac +* @vf: pointer to the VF info +* +* Return true if the VF is allowed to change its MAC filters, false otherwise +*/ +static bool i40e_can_vf_change_mac (struct i40e_vf *vf) +{ +/* If the VF MAC address has been set administratively (via the +* ndo_set_vf_mac command), then deny permission to the VF to +* add/delete unicast MAC addresses, unless the VF is trusted +*/ +if (vf->pf_set_mac && !vf->trusted) +return false; + +return true; +} +#define I40E_MAX_MACVLAN_PER_HW 3072#define I40E_MAX_MACVLAN_PER_PF (num_ports) (I40E_MAX_MACVLAN_PER_HW / \ (num_ports))
@@ -2905,8 +2923,8 @@ static inline int i40e_check_vf_permission(struct i40e_vf *vf,* The VF may request to set the MAC address filter already * assigned to it so do not return an error in that case. */ -if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps) && - !is_multicast_ether_addr (addr) && vf->pf_set_mac && +if (!i40e_can_vf_change_mac (vf) && + !is_multicast_ether_addr (addr) && !ether_addr_equal (addr, vf->default_lan_addr.addr)) {dev_err (&pf->pdev->dev,"VF attempting to override administratively set MAC address, bring down and up the VF interface to resume normal operation\n" );
@@ -3049,19 +3067,29 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg) ret =I40E_ERR_INVALID_MAC_ADDR ; goto error_param; } -if (ether_addr_equal (al->list[i].addr, vf->default_lan_addr.addr)) - was_unimac_deleted = true; } vsi = pf->vsi[vf->lan_vsi_idx];spin_lock_bh (&vsi->mac_filter_hash_lock);/* delete addresses from the list */ -for (i =0 ; i < al->num_elements; i++) +for (i =0 ; i < al->num_elements; i++) { +const u8 *addr = al->list[i].addr; + +/* Allow to delete VF primary MAC only if it was not set +* administratively by PF or if VF is trusted. +*/ +if (ether_addr_equal (addr, vf->default_lan_addr.addr) && +i40e_can_vf_change_mac (vf)) + was_unimac_deleted = true; +else +continue ; +if (i40e_del_mac_filter (vsi, al->list[i].addr)) { ret =I40E_ERR_INVALID_MAC_ADDR ;spin_unlock_bh (&vsi->mac_filter_hash_lock); goto error_param; } + }spin_unlock_bh (&vsi->mac_filter_hash_lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/197 i40e: Fix waiting for queues of all VSIs to be disabled
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Vecera <[email protected]>
[ Upstream commit c73729b64bb692186da080602cd13612783f52ac ]
The function i40e_pf_wait_queues_disabled() iterates all PF's VSIs up to 'pf->hw.func_caps.num_vsis' but this is incorrect because the real number of VSIs can be up to 'pf->num_alloc_vsi' that can be higher. Fix this loop.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -5333,7 +5333,7 @@ static int i40e_pf_wait_queues_disabled(struct i40e_pf *pf) {int v, ret =0 ; -for (v =0 ; v < pf->hw.func_caps.num_vsis; v++) { +for (v =0 ; v < pf->num_alloc_vsi; v++) {if (pf->vsi[v]) { ret =i40e_vsi_wait_queues_disabled (pf->vsi[v]);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/197 scs: add CONFIG_MMU dependency for vfree_atomic()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Holland <[email protected]>
commit 6f9dc684cae638dda0570154509884ee78d0f75c upstream.
The shadow call stack implementation fails to build without CONFIG_MMU:
ld.lld: error: undefined symbol: vfree_atomic
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
referenced by
scs.c
kernel/scs.o:(scs_free) in archive vmlinux.a
--- arch/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/Kconfig +1 -0
@@ -642,6 +642,7 @@ config SHADOW_CALL_STACK bool "Shadow Call Stack" depends on ARCH_SUPPORTS_SHADOW_CALL_STACK depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER + depends on MMU help This option enables the compiler's Shadow Call Stack, which uses a shadow stack to protect function return addresses from
Greg Kroah-Hartman
maintainerPATCH 35/197 tracing/trigger: Fix to return error if failed to alloc snapshot
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit 0958b33ef5a04ed91f61cef4760ac412080c4e08 upstream.
Fix register_snapshot_trigger() to return error code if it failed to allocate a snapshot instead of 0 (success). Unless that, it will register snapshot trigger without an error.
--- kernel/trace/trace_events_trigger.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/trace/trace_events_trigger.c +4 -2
@@ -1455,8 +1455,10 @@ register_snapshot_trigger(char *glob,struct event_trigger_data *data, struct trace_event_file *file) { - if (tracing_alloc_snapshot_instance(file->tr) != 0) - return 0; + int ret = tracing_alloc_snapshot_instance(file->tr); + +if (ret <0 ) +return ret;return register_trigger (glob, data, file); }
Greg Kroah-Hartman
maintainerPATCH 36/197 readahead: avoid multiple marked readahead pages
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit ab4443fe3ca6298663a55c4a70efc6c3ce913ca6 upstream.
ra_alloc_folio() marks a page that should trigger next round of async readahead. However it rounds up computed index to the order of page being allocated. This can however lead to multiple consecutive pages being marked with readahead flag. Consider situation with index == 1, mark == 1, order == 0. We insert order 0 page at index 1 and mark it. Then we bump order to 1, index to 2, mark (still == 1) is rounded up to 2 so page at index 2 is marked as well. Then we bump order to 2, index is incremented to 4, mark gets rounded to 4 so page at index 4 is marked as well. The fact that multiple pages get marked within a single readahead window confuses the readahead logic and results in readahead window being trimmed back to 1. This situation is triggered in particular when maximum readahead window size is not a power of two (in the observed case it was 768 KB) and as a result sequential read throughput suffers.
Fix the problem by rounding 'mark' down instead of up. Because the index is naturally aligned to 'order', we are guaranteed 'rounded mark' == index iff 'mark' is within the page we are allocating at 'index' and thus exactly one page is marked with readahead flag as required by the readahead code and sequential read performance is restored.
This effectively reverts part of commit b9ff43dd2743 ("mm/readahead: Fix readahead with large folios"). The commit changed the rounding with the rationale:
"... we were setting the readahead flag on the folio which contains the last byte read from the block. This is wrong because we will trigger readahead at the end of the read without waiting to see if a subsequent read is going to use the pages we just read."
Although this is true, the fact is this was always the case with read sizes not aligned to folio boundaries and large folios in the page cache just make the situation more obvious (and frequent). Also for sequential read workloads it is better to trigger the readahead earlier rather than later. It is true that the difference in the rounding and thus earlier triggering of the readahead can result in reading more for semi-random workloads. However workloads really suffering from this seem to be rare. In particular I have verified that the workload described in commit b9ff43dd2743 ("mm/readahead: Fix readahead with large folios") of reading random 100k blocks from a file like:
[reader]
bs=100k
rw=randread
numjobs=1
size=64g
runtime=60s
is not impacted by the rounding change and achieves ~70MB/s in both cases.
--- mm/readahead.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/readahead.c +2 -2
@@ -483,7 +483,7 @@ static inline int ra_alloc_folio(structif (!folio)return -ENOMEM ; - mark =round_up (mark,1UL << order); + mark =round_down (mark,1UL << order);if (index == mark)folio_set_readahead (folio); err =filemap_add_folio (ractl->mapping, folio, index, gfp);
@@ -591,7 +591,7 @@ static void ondemand_readahead(struct re* It's the expected callback index, assume sequential access. * Ramp up sizes, and push forward the readahead window. */ - expected =round_up (ra->start + ra->size - ra->async_size, + expected =round_down (ra->start + ra->size - ra->async_size,1UL << order);if (index == expected || index == (ra->start + ra->size)) { ra->start += ra->size;
Re: [PATCH 6.1 036/197] readahead: avoid multiple marked readahead pages
Quoted 1 line · Greg Kroah-Hartman
6.1-stable review patch. If anyone has any objections, please let me know.
Maybe hold off on this one?
kernel test robot noticed a -21.4% regression of vm-scalability.throughput on:
commit: ab4443fe3ca6298663a55c4a70efc6c3ce913ca6 ("readahead: avoid multiple marked readahead pages")
https://lore.kernel.org/linux-fsdevel/[email protected]/
Not a definite no just yet; nobody's dug into it, but some caution seems warranted.
Quoted 91 lines
------------------
From: Jan Kara <[email protected]>
commit
ab4443fe3ca6298663a55c4a70efc6c3ce913ca6upstream.
ra_alloc_folio()marks a page that should trigger next round of async readahead. However it rounds up computed index to the order of page being allocated. This can however lead to multiple consecutive pages being marked with readahead flag. Consider situation with index == 1, mark == 1, order == 0. We insert order 0 page at index 1 and mark it. Then we bump order to 1, index to 2, mark (still == 1) is rounded up to 2 so page at index 2 is marked as well. Then we bump order to 2, index is incremented to 4, mark gets rounded to 4 so page at index 4 is marked as well. The fact that multiple pages get marked within a single readahead window confuses the readahead logic and results in readahead window being trimmed back to 1. This situation is triggered in particular when maximum readahead window size is not a power of two (in the observed case it was 768 KB) and as a result sequential read throughput suffers.Fix the problem by rounding 'mark' down instead of up. Because the index is naturally aligned to 'order', we are guaranteed 'rounded mark' == index iff 'mark' is within the page we are allocating at 'index' and thus exactly one page is marked with readahead flag as required by the readahead code and sequential read performance is restored.
This effectively reverts part of commit
b9ff43dd2743("mm/readahead: Fix readahead with large folios"). The commit changed the rounding with the rationale:"... we were setting the readahead flag on the folio which contains the last byte read from the block. This is wrong because we will trigger readahead at the end of the read without waiting to see if a subsequent read is going to use the pages we just read."
Although this is true, the fact is this was always the case with read sizes not aligned to folio boundaries and large folios in the page cache just make the situation more obvious (and frequent). Also for sequential read workloads it is better to trigger the readahead earlier rather than later. It is true that the difference in the rounding and thus earlier triggering of the readahead can result in reading more for semi-random workloads. However workloads really suffering from this seem to be rare. In particular I have verified that the workload described in commit
b9ff43dd2743("mm/readahead: Fix readahead with large folios") of reading random 100k blocks from a file like:[reader]
bs=100k
rw=randread
numjobs=1
size=64g
runtime=60sis not impacted by the rounding change and achieves ~70MB/s in both cases.
[[email protected]: fix one more place where mark rounding was done as well]Fixes b9ff43dd2743 ("mm/readahead: Fix readahead with large folios")Signed-off-by Jan Kara <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Guo Xuenan <[email protected]>Cc <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- mm/readahead.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)mm/readahead.c +2
-2@@ -483,7 +483,7 @@ static inline int ra_alloc_folio(structif (!folio)return -ENOMEM ; - mark =round_up (mark,1UL << order); + mark =round_down (mark,1UL << order);if (index == mark)folio_set_readahead (folio); err =filemap_add_folio (ractl->mapping, folio, index, gfp);@@ -591,7 +591,7 @@ static void ondemand_readahead(struct re* It's the expected callback index, assume sequential access. * Ramp up sizes, and push forward the readahead window. */ - expected =round_up (ra->start + ra->size - ra->async_size, + expected =round_down (ra->start + ra->size - ra->async_size,1UL << order);if (index == expected || index == (ra->start + ra->size)) { ra->start += ra->size;
Greg Kroah-Hartman
maintainerRe: [PATCH 6.1 036/197] readahead: avoid multiple marked readahead pages
Quoted 5 lines · Matthew Wilcox
Quoted 1 line · Greg Kroah-Hartman
6.1-stable review patch. If anyone has any objections, please let me know.
Maybe hold off on this one?
Quoted 7 lines
kernel test robot noticed a -21.4% regression of vm-scalability.throughput on:
commit:ab4443fe3ca6298663a55c4a70efc6c3ce913ca6("readahead: avoid multiple marked readahead pages")https://lore.kernel.org/linux-fsdevel/[email protected]/
Not a definite no just yet; nobody's dug into it, but some caution seems warranted.
Thanks for the warning, I've dropped it from all stable queues now. If you all figure it out, let us know and we can add it back in.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 37/197 mm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zach O'Keefe <[email protected]>
commit 9319b647902cbd5cc884ac08a8a6d54ce111fc78 upstream.
(struct dirty_throttle_control *)->thresh is an unsigned long, but is passed as the u32 divisor argument to div_u64(). On architectures where unsigned long is 64 bytes, the argument will be implicitly truncated.
Use div64_u64() instead of div_u64() so that the value used in the "is this a safe division" check is the same as the divisor.
Also, remove redundant cast of the numerator to u64, as that should happen implicitly.
This would be difficult to exploit in memcg domain, given the ratio-based arithmetic domain_drity_limits() uses, but is much easier in global writeback domain with a BDI_CAP_STRICTLIMIT-backing device, using e.g. vm.dirty_bytes=(1<<32)*PAGE_SIZE so that dtc->thresh == (1<<32)
--- mm/page-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page-writeback.c +1 -1
@@ -1526,7 +1526,7 @@ static inline void wb_dirty_limits(struc*/ dtc->wb_thresh =__wb_calc_thresh (dtc); dtc->wb_bg_thresh = dtc->thresh ? -div_u64 ((u64 )dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) :0 ; +div64_u64 (dtc->wb_thresh * dtc->bg_thresh, dtc->thresh) :0 ;/* * In order to avoid the stacked BDI deadlock we need
Greg Kroah-Hartman
maintainerPATCH 38/197 scsi: storvsc: Fix ring buffer size calculation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Kelley <[email protected]>
commit f4469f3858352ad1197434557150b1f7086762a0 upstream.
Current code uses the specified ring buffer size (either the default of 128 Kbytes or a module parameter specified value) to encompass the one page ring buffer header plus the actual ring itself. When the page size is 4K, carving off one page for the header isn't significant. But when the page size is 64K on ARM64, only half of the default 128 Kbytes is left for the actual ring. While this doesn't break anything, the smaller ring size could be a performance bottleneck.
Fix this by applying the VMBUS_RING_SIZE macro to the specified ring buffer size. This macro adds a page for the header, and rounds up the size to a page boundary, using the page size for which the kernel is built. Use this new size for subsequent ring buffer calculations. For example, on ARM64 with 64K page size and the default ring size, this results in the actual ring being 128 Kbytes, which is intended.
--- drivers/scsi/storvsc_drv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/scsi/storvsc_drv.c +7 -5
@@ -326,6 +326,7 @@ enum storvsc_request_type {*/ static int storvsc_ringbuffer_size = (128 *1024 ); +static int aligned_ringbuffer_size;static u32 max_outstanding_req_per_channel;static int storvsc_change_queue_depth (struct scsi_device *sdev,int queue_depth);
@@ -683,8 +684,8 @@ static void handle_sc_creation(struct vm new_sc->next_request_id_callback = storvsc_next_request_id; ret =vmbus_open (new_sc, - storvsc_ringbuffer_size, - storvsc_ringbuffer_size, + aligned_ringbuffer_size, + aligned_ringbuffer_size, (void *)&props,sizeof (struct vmstorage_channel_properties ), storvsc_on_channel_callback, new_sc);
@@ -1964,7 +1965,7 @@ static int storvsc_probe(struct hv_devicdma_set_min_align_mask (&device->device,HV_HYP_PAGE_SIZE -1 ); stor_device->port_number = host->host_no; - ret =storvsc_connect_to_vsp (device, storvsc_ringbuffer_size, is_fc); + ret =storvsc_connect_to_vsp (device, aligned_ringbuffer_size, is_fc);if (ret) goto err_out1;
@@ -2157,7 +2158,7 @@ static int storvsc_resume(struct hv_devi {int ret; - ret =storvsc_connect_to_vsp (hv_dev, storvsc_ringbuffer_size, + ret =storvsc_connect_to_vsp (hv_dev, aligned_ringbuffer_size,hv_dev_is_fc (hv_dev));return ret; }
@@ -2191,8 +2192,9 @@ static int __init storvsc_drv_init(void)* the ring buffer indices) by the max request size (which is * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64) */ + aligned_ringbuffer_size =VMBUS_RING_SIZE (storvsc_ringbuffer_size); max_outstanding_req_per_channel = - ((storvsc_ringbuffer_size -PAGE_SIZE ) / + ((aligned_ringbuffer_size -PAGE_SIZE ) /ALIGN (MAX_MULTIPAGE_BUFFER_PACKET +sizeof (struct vstor_packet ) +sizeof (u64),sizeof (u64)));
Greg Kroah-Hartman
maintainerPATCH 39/197 dm-crypt, dm-verity: disable tasklets
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 0a9bab391e336489169b95cb0d4553d921302189 upstream.
Tasklets have an inherent problem with memory corruption. The function tasklet_action_common calls tasklet_trylock, then it calls the tasklet callback and then it calls tasklet_unlock. If the tasklet callback frees the structure that contains the tasklet or if it calls some code that may free it, tasklet_unlock will write into free memory.
The commits 8e14f610159d and d9a02e016aaf try to fix it for dm-crypt, but it is not a sufficient fix and the data corruption can still happen [1]. There is no fix for dm-verity and dm-verity will write into free memory with every tasklet-processed bio.
There will be atomic workqueues implemented in the kernel 6.9 [2]. They will have better interface and they will not suffer from the memory corruption problem.
But we need something that stops the memory corruption now and that can be backported to the stable kernels. So, I'm proposing this commit that disables tasklets in both dm-crypt and dm-verity. This commit doesn't remove the tasklet support, because the tasklet code will be reused when atomic workqueues will be implemented.
[1] https://lore.kernel.org/all/[email protected]/T/
[2] https://lore.kernel.org/lkml/[email protected]/
--- drivers/md/dm-crypt.c | 37 ++----------------------------------- drivers/md/dm-verity-target.c | 26 ++------------------------ drivers/md/dm-verity.h | 1 - 3 files changed, 4 insertions(+), 60 deletions(-)
drivers/md/dm-crypt.c +2 -35
@@ -72,10 +72,8 @@ struct dm_crypt_io {struct bio *base_bio;u8 *integrity_metadata; bool integrity_metadata_from_pool:1; - bool in_tasklet:1;struct work_struct work; -struct tasklet_struct tasklet;struct convert_context ctx;
@@ -1729,7 +1727,6 @@ static void crypt_io_init(struct dm_cryp io->ctx.r.req =NULL ; io->integrity_metadata =NULL ; io->integrity_metadata_from_pool = false; - io->in_tasklet = false;atomic_set (&io->io_pending,0 ); }
@@ -1738,12 +1735,6 @@ static void crypt_inc_pending(struct dm_atomic_inc (&io->io_pending); } -static void kcryptd_io_bio_endio (struct work_struct *work) -{ - struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work); -bio_endio (io->base_bio); -} -/* * One of the bios was finished. Check for completion of * the whole request and correctly clean up the buffer.
@@ -1767,20 +1758,6 @@ static void crypt_dec_pending(struct dm_ base_bio->bi_status = error; -/* -* If we are running this function from our tasklet, -* we can't call bio_endio() here, because it will call -* clone_endio() from dm.c, which in turn will -* free the current struct dm_crypt_io structure with -* our tasklet. In this case we need to delay bio_endio() -* execution to after the tasklet is done and dequeued. -*/ -if (io->in_tasklet) { -INIT_WORK (&io->work, kcryptd_io_bio_endio); -queue_work (cc->io_queue, &io->work); -return ; - } -bio_endio (base_bio); }
@@ -2213,11 +2190,6 @@ static void kcryptd_crypt(struct work_stkcryptd_crypt_write_convert (io); } -static void kcryptd_crypt_tasklet (unsigned long work) -{ -kcryptd_crypt ((struct work_struct *)work); -} -static void kcryptd_queue_crypt (struct dm_crypt_io *io) {struct crypt_config *cc = io->cc;
@@ -2229,15 +2201,10 @@ static void kcryptd_queue_crypt(struct d* irqs_disabled(): the kernel may run some IO completion from the idle thread, but * it is being executed with irqs disabled. */ -if (in_hardirq () ||irqs_disabled ()) { - io->in_tasklet = true; -tasklet_init (&io->tasklet, kcryptd_crypt_tasklet, (unsigned long )&io->work); -tasklet_schedule (&io->tasklet); +if (!(in_hardirq () ||irqs_disabled ())) { +kcryptd_crypt (&io->work);return ; } - -kcryptd_crypt (&io->work); -return ; }INIT_WORK (&io->work, kcryptd_crypt);
drivers/md/dm-verity-target.c +2 -24
@@ -634,23 +634,6 @@ static void verity_work(struct work_struverity_finish_io (io,errno_to_blk_status (verity_verify_io (io))); } -static void verity_tasklet (unsigned long data) -{ -struct dm_verity_io *io = (struct dm_verity_io *)data; -int err; - - io->in_tasklet = true; - err =verity_verify_io (io); -if (err == -EAGAIN || err == -ENOMEM ) { -/* fallback to retrying with work-queue */ -INIT_WORK (&io->work, verity_work); -queue_work (io->v->verify_wq, &io->work); -return ; - } - -verity_finish_io (io,errno_to_blk_status (err)); -} -static void verity_end_io (struct bio *bio) {struct dm_verity_io *io = bio->bi_private;
@@ -663,13 +646,8 @@ static void verity_end_io(struct bio *bireturn ; } -if (static_branch_unlikely (&use_tasklet_enabled) && io->v->use_tasklet) { -tasklet_init (&io->tasklet, verity_tasklet, (unsigned long )io); -tasklet_schedule (&io->tasklet); - }else { -INIT_WORK (&io->work, verity_work); -queue_work (io->v->verify_wq, &io->work); - } +INIT_WORK (&io->work, verity_work); +queue_work (io->v->verify_wq, &io->work); }/*
drivers/md/dm-verity.h +0 -1
@@ -83,7 +83,6 @@ struct dm_verity_io {struct bvec_iter iter;struct work_struct work; -struct tasklet_struct tasklet;/* * Three variably-size fields follow this struct:
Greg Kroah-Hartman
maintainerPATCH 40/197 ASoC: amd: yc: Add DMI quirk for MSI Bravo 15 C7VF
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Techno Mooney <[email protected]>
commit c6dce23ec993f7da7790a9eadb36864ceb60e942 upstream.
The laptop requires a quirk ID to enable its internal microphone. Add it to the DMI quirk table.
--- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/amd/yc/acp6x-mach.c +7 -0
@@ -300,6 +300,13 @@ static const struct dmi_system_id yc_acp { .driver_data = &acp6x_card, .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"Micro-Star International Co., Ltd." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Bravo 15 C7VF"), + } + }, + { + .driver_data = &acp6x_card, + .matches = {DMI_MATCH (DMI_BOARD_VENDOR ,"Razer" ), DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 (2022) - RZ09-0427"), }
Greg Kroah-Hartman
maintainerPATCH 41/197 parisc: Prevent hung tasks when printing inventory on serial console
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
commit c8708d758e715c3824a73bf0cda97292b52be44d upstream.
Printing the inventory on a serial console can be quite slow and thus may trigger the hung task detector (CONFIG_DETECT_HUNG_TASK=y) and possibly reboot the machine. Adding a cond_resched() prevents this.
--- arch/parisc/kernel/drivers.c | 3 +++ 1 file changed, 3 insertions(+)
arch/parisc/kernel/drivers.c +3 -0
@@ -1003,6 +1003,9 @@ static __init int qemu_print_iodc_data(spr_info ("\n" ); +/* Prevent hung task messages when printing on serial console */ +cond_resched (); +pr_info ("#define HPA_%08lx_DESCRIPTION \"%s\"\n" , hpa,parisc_hardware_description (&dev->id));
Greg Kroah-Hartman
maintainerPATCH 42/197 ALSA: hda/realtek: Fix the external mic not being recognised for Acer Swift 1 SF114-32
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Senoner <[email protected]>
commit efb56d84dd9c3de3c99fc396abb57c6d330038b5 upstream.
If you connect an external headset/microphone to the 3.5mm jack on the Acer Swift 1 SF114-32 it does not recognize the microphone. This fixes that and gives the user the ability to choose between internal and headset mic.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9431,6 +9431,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1025 ,0x1247 ,"Acer vCopperbox" ,ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS ),SND_PCI_QUIRK (0x1025 ,0x1248 ,"Acer Veriton N4660G" ,ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x1269 ,"Acer SWIFT SF314-54" ,ALC256_FIXUP_ACER_HEADSET_MIC ), +SND_PCI_QUIRK (0x1025 ,0x126a ,"Acer Swift SF114-32" ,ALC256_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x128f ,"Acer Veriton Z6860G" ,ALC286_FIXUP_ACER_AIO_HEADSET_MIC ),SND_PCI_QUIRK (0x1025 ,0x1290 ,"Acer Veriton Z4860G" ,ALC286_FIXUP_ACER_AIO_HEADSET_MIC ), SND_PCI_QUIRK(0x1025, 0x1291, "Acer Veriton Z4660G", ALC286_FIXUP_ACER_AIO_HEADSET_MIC),
Greg Kroah-Hartman
maintainerPATCH 43/197 ALSA: hda/realtek: Enable Mute LED on HP Laptop 14-fq0xxx
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luka Guzenko <[email protected]>
commit f0d78972f27dc1d1d51fbace2713ad3cdc60a877 upstream.
This HP Laptop uses ALC236 codec with COEF 0x07 controlling the mute LED. Enable existing quirk for this device.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9618,6 +9618,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8786 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x8787 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x87b7 ,"HP Laptop 14-fq0xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87e5 ,"HP ProBook 440 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 44/197 HID: i2c-hid-of: fix NULL-deref on failed power up
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 00aab7dcb2267f2aef59447602f34501efe1a07f upstream.
A while back the I2C HID implementation was split in an ACPI and OF part, but the new OF driver never initialises the client pointer which is dereferenced on power-up failures.
--- drivers/hid/i2c-hid/i2c-hid-of.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/i2c-hid/i2c-hid-of.c +1 -0
@@ -80,6 +80,7 @@ static int i2c_hid_of_probe(struct i2c_cif (!ihid_of)return -ENOMEM ; + ihid_of->client = client; ihid_of->ops.power_up = i2c_hid_of_power_up; ihid_of->ops.power_down = i2c_hid_of_power_down;
Greg Kroah-Hartman
maintainerPATCH 45/197 HID: wacom: generic: Avoid reporting a serial of 0 to userspace
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tatsunosuke Tobita <[email protected]>
commit ab41a31dd5e2681803642b6d08590b61867840ec upstream.
The xf86-input-wacom driver does not treat '0' as a valid serial number and will drop any input report which contains an MSC_SERIAL = 0 event. The kernel driver already takes care to avoid sending any MSC_SERIAL event if the value of serial[0] == 0 (which is the case for devices that don't actually report a serial number), but this is not quite sufficient.
Only the lower 32 bits of the serial get reported to userspace, so if this portion of the serial is zero then there can still be problems.
This commit allows the driver to report either the lower 32 bits if they are non-zero or the upper 32 bits otherwise.
--- drivers/hid/wacom_wac.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/hid/wacom_wac.c +8 -1
@@ -2571,7 +2571,14 @@ static void wacom_wac_pen_report(struct wacom_wac->hid_data.tipswitch);input_report_key (input, wacom_wac->tool[0 ], sense);if (wacom_wac->serial[0 ]) { -input_event (input,EV_MSC ,MSC_SERIAL , wacom_wac->serial[0 ]); +/* +* xf86-input-wacom does not accept a serial number +* of '0'. Report the low 32 bits if possible, but +* if they are zero, report the upper ones instead. +*/ +__u32 serial_lo = wacom_wac->serial[0 ] &0xFFFFFFFFu ; +__u32 serial_hi = wacom_wac->serial[0 ] >>32 ; +input_event (input,EV_MSC ,MSC_SERIAL , (int )(serial_lo ? serial_lo : serial_hi));input_report_abs (input,ABS_MISC , sense ? id :0 ); }
Greg Kroah-Hartman
maintainerPATCH 46/197 HID: wacom: Do not register input devices until after hid_hw_start
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gerecke <[email protected]>
commit c1d6708bf0d3dd976460d435373cf5abf21ce258 upstream.
If a input device is opened before hid_hw_start is called, events may not be received from the hardware. In the case of USB-backed devices, for example, the hid_hw_start function is responsible for filling in the URB which is submitted when the input device is opened. If a device is opened prematurely, polling will never start because the device will not have been in the correct state to send the URB.
Because the wacom driver registers its input devices before calling hid_hw_start, there is a window of time where a device can be opened and end up in an inoperable state. Some ARM-based Chromebooks in particular reliably trigger this bug.
This commit splits the wacom_register_inputs function into two pieces. One which is responsible for setting up the allocated inputs (and runs prior to hid_hw_start so that devices are ready for any input events they may end up receiving) and another which only registers the devices (and runs after hid_hw_start to ensure devices can be immediately opened without issue). Note that the functions to initialize the LEDs and remotes are also moved after hid_hw_start to maintain their own dependency chains.
--- drivers/hid/wacom_sys.c | 63 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 20 deletions(-)
drivers/hid/wacom_sys.c +43 -20
@@ -2080,7 +2080,7 @@ static int wacom_allocate_inputs(structreturn 0 ; } -static int wacom_register_inputs (struct wacom *wacom) +static int wacom_setup_inputs (struct wacom *wacom) {struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev;struct wacom_wac *wacom_wac = &(wacom->wacom_wac);
@@ -2099,10 +2099,6 @@ static int wacom_register_inputs(structinput_free_device (pen_input_dev); wacom_wac->pen_input =NULL ; pen_input_dev =NULL ; - }else { - error =input_register_device (pen_input_dev); -if (error) - goto fail; } error =wacom_setup_touch_input_capabilities (touch_input_dev, wacom_wac);
@@ -2111,10 +2107,6 @@ static int wacom_register_inputs(structinput_free_device (touch_input_dev); wacom_wac->touch_input =NULL ; touch_input_dev =NULL ; - }else { - error =input_register_device (touch_input_dev); -if (error) - goto fail; } error =wacom_setup_pad_input_capabilities (pad_input_dev, wacom_wac);
@@ -2123,7 +2115,34 @@ static int wacom_register_inputs(structinput_free_device (pad_input_dev); wacom_wac->pad_input =NULL ; pad_input_dev =NULL ; - }else { + } + +return 0 ; +} + +static int wacom_register_inputs (struct wacom *wacom) +{ +struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev; +struct wacom_wac *wacom_wac = &(wacom->wacom_wac); +int error =0 ; + + pen_input_dev = wacom_wac->pen_input; + touch_input_dev = wacom_wac->touch_input; + pad_input_dev = wacom_wac->pad_input; + +if (pen_input_dev) { + error =input_register_device (pen_input_dev); +if (error) + goto fail; + } + +if (touch_input_dev) { + error =input_register_device (touch_input_dev); +if (error) + goto fail; + } + +if (pad_input_dev) { error =input_register_device (pad_input_dev);if (error) goto fail;
@@ -2379,6 +2398,20 @@ static int wacom_parse_and_register(stru goto fail; } + error =wacom_setup_inputs (wacom); +if (error) + goto fail; + +if (features->type ==HID_GENERIC ) + connect_mask |=HID_CONNECT_DRIVER ; + +/* Regular HID work starts now */ + error =hid_hw_start (hdev, connect_mask); +if (error) { +hid_err (hdev,"hw start failed\n" ); + goto fail; + } + error =wacom_register_inputs (wacom);if (error) goto fail;
@@ -2393,16 +2426,6 @@ static int wacom_parse_and_register(stru goto fail; } -if (features->type ==HID_GENERIC ) - connect_mask |=HID_CONNECT_DRIVER ; - -/* Regular HID work starts now */ - error =hid_hw_start (hdev, connect_mask); -if (error) { -hid_err (hdev,"hw start failed\n" ); - goto fail; - } -if (!wireless) {/* Note that if query fails it is not a hard failure */ wacom_query_tablet_data (wacom);
Greg Kroah-Hartman
maintainerPATCH 47/197 iio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
commit 621c6257128149e45b36ffb973a01c3f3461b893 upstream.
When als_capture_sample() is called with usage ID HID_USAGE_SENSOR_TIME_TIMESTAMP, return 0. The HID sensor core ignores the return value for capture_sample() callback, so return value doesn't make difference. But correct the return value to return success instead of -EINVAL.
--- drivers/iio/light/hid-sensor-als.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/light/hid-sensor-als.c +1 -0
@@ -228,6 +228,7 @@ static int als_capture_sample(struct hidcase HID_USAGE_SENSOR_TIME_TIMESTAMP : als_state->timestamp =hid_sensor_convert_timestamp (&als_state->common_attributes, *(s64 *)raw_data); + ret =0 ;break ;default :break ;
Greg Kroah-Hartman
maintainerPATCH 48/197 usb: ucsi: Add missing ppm_lock
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian A. Ehrhardt <[email protected]>
commit c9aed03a0a683fd1600ea92f2ad32232d4736272 upstream.
Calling ->sync_write must be done while holding the PPM lock as the mailbox logic does not support concurrent commands.
At least since the addition of partner task this means that ucsi_acknowledge_connector_change should be called with the PPM lock held as it calls ->sync_write.
Thus protect the only call to ucsi_acknowledge_connector_change with the PPM. All other calls to ->sync_write already happen under the PPM lock.
--- drivers/usb/typec/ucsi/ucsi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/typec/ucsi/ucsi.c +2 -0
@@ -831,7 +831,9 @@ static void ucsi_handle_connector_changeclear_bit (EVENT_PENDING , &con->ucsi->flags); +mutex_lock (&ucsi->ppm_lock); ret =ucsi_acknowledge_connector_change (ucsi); +mutex_unlock (&ucsi->ppm_lock);if (ret)dev_err (ucsi->dev,"%s: ACK failed (%d)" , __func__, ret);
Greg Kroah-Hartman
maintainerPATCH 49/197 usb: ulpi: Fix debugfs directory leak
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
commit 3caf2b2ad7334ef35f55b95f3e1b138c6f77b368 upstream.
The ULPI per-device debugfs root is named after the ulpi device's parent, but ulpi_unregister_interface tries to remove a debugfs directory named after the ulpi device itself. This results in the directory sticking around and preventing subsequent (deferred) probes from succeeding. Change the directory name to match the ulpi device.
--- drivers/usb/common/ulpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/common/ulpi.c +1 -1
@@ -301,7 +301,7 @@ static int ulpi_register(struct device *return ret; } - root =debugfs_create_dir (dev_name (dev), ulpi_root); + root =debugfs_create_dir (dev_name (&ulpi->dev), ulpi_root);debugfs_create_file ("regs" ,0444 , root, ulpi, &ulpi_regs_fops); dev_dbg(&ulpi->dev, "registered ULPI PHY: vendor %04x, product %04x\n",
Greg Kroah-Hartman
maintainerPATCH 50/197 usb: ucsi_acpi: Fix command completion handling
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian A. Ehrhardt <[email protected]>
commit 2840143e393a4ddc1caab4372969ea337371168c upstream.
In case of a spurious or otherwise delayed notification it is possible that CCI still reports the previous completion. The UCSI spec is aware of this and provides two completion bits in CCI, one for normal commands and one for acks. As acks and commands alternate the notification handler can determine if the completion bit is from the current command.
The initial UCSI code correctly handled this but the distinction between the two completion bits was lost with the introduction of the new API.
To fix this revive the ACK_PENDING bit for ucsi_acpi and only complete commands if the completion bit matches.
--- drivers/usb/typec/ucsi/ucsi_acpi.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/usb/typec/ucsi/ucsi_acpi.c +13 -4
@@ -73,9 +73,13 @@ static int ucsi_acpi_sync_write(struct u const void *val, size_t val_len) {struct ucsi_acpi *ua =ucsi_get_drvdata (ucsi); +bool ack =UCSI_COMMAND (*(u64 *)val) ==UCSI_ACK_CC_CI ;int ret; -set_bit (COMMAND_PENDING , &ua->flags); +if (ack) +set_bit (ACK_PENDING , &ua->flags); +else +set_bit (COMMAND_PENDING , &ua->flags); ret =ucsi_acpi_async_write (ucsi, offset, val, val_len);if (ret)
@@ -85,7 +89,10 @@ static int ucsi_acpi_sync_write(struct u ret = -ETIMEDOUT ; out_clear_bit: -clear_bit (COMMAND_PENDING , &ua->flags); +if (ack) +clear_bit (ACK_PENDING , &ua->flags); +else +clear_bit (COMMAND_PENDING , &ua->flags);return ret; }
@@ -142,8 +149,10 @@ static void ucsi_acpi_notify(acpi_handleif (UCSI_CCI_CONNECTOR (cci))ucsi_connector_change (ua->ucsi,UCSI_CCI_CONNECTOR (cci)); -if (test_bit (COMMAND_PENDING , &ua->flags) && - cci & (UCSI_CCI_ACK_COMPLETE |UCSI_CCI_COMMAND_COMPLETE )) +if (cci &UCSI_CCI_ACK_COMPLETE &&test_bit (ACK_PENDING , &ua->flags)) +complete (&ua->complete); +if (cci &UCSI_CCI_COMMAND_COMPLETE && +test_bit (COMMAND_PENDING , &ua->flags))complete (&ua->complete); }
Greg Kroah-Hartman
maintainerPATCH 51/197 USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit f17c34ffc792bbb520e4b61baa16b6cfc7d44b13 upstream.
The OTG 1.3 spec has the feature A_ALT_HNP_SUPPORT, which tells a device that it is connected to the wrong port. Some devices refuse to operate if you enable that feature, because it indicates to them that they ought to request to be connected to another port.
According to the spec this feature may be used based only the following three conditions:
6.5.3 a_alt_hnp_support
Setting this feature indicates to the B-device that it is connected to an A-device port that is not capable of HNP, but that the A-device does have an alternate port that is capable of HNP.
The A-device is required to set this feature under the following conditions:
• the A-device has multiple receptacles
• the A-device port that connects to the B-device does not support HNP
• the A-device has another port that does support HNP
A check for the third and first condition is missing. Add it.
--- drivers/usb/core/hub.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/usb/core/hub.c +19 -11
@@ -2389,17 +2389,25 @@ static int usb_enumerate_device_otg(stru } }else if (desc->bLength ==sizeof (struct usb_otg_descriptor )) { -/* Set a_alt_hnp_support for legacy otg device */ - err =usb_control_msg (udev, -usb_sndctrlpipe (udev,0 ), -USB_REQ_SET_FEATURE ,0 , -USB_DEVICE_A_ALT_HNP_SUPPORT , -0 ,NULL ,0 , -USB_CTRL_SET_TIMEOUT ); -if (err <0 ) -dev_err (&udev->dev, -"set a_alt_hnp_support failed: %d\n" , - err); +/* +* We are operating on a legacy OTP device +* These should be told that they are operating +* on the wrong port if we have another port that does +* support HNP +*/ +if (bus->otg_port !=0 ) { +/* Set a_alt_hnp_support for legacy otg device */ + err =usb_control_msg (udev, +usb_sndctrlpipe (udev,0 ), +USB_REQ_SET_FEATURE ,0 , +USB_DEVICE_A_ALT_HNP_SUPPORT , +0 ,NULL ,0 , +USB_CTRL_SET_TIMEOUT ); +if (err <0 ) +dev_err (&udev->dev, +"set a_alt_hnp_support failed: %d\n" , + err); + } } }#endif
Greg Kroah-Hartman
maintainerPATCH 52/197 usb: f_mass_storage: forbid async queue when shutdown happen
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: yuan linyu <[email protected]>
commit b2d2d7ea0dd09802cf5a0545bf54d8ad8987d20c upstream.
When write UDC to empty and unbind gadget driver from gadget device, it is possible that there are many queue failures for mass storage function.
The root cause is mass storage main thread alaways try to queue request to receive a command from host if running flag is on, on platform like dwc3, if pull down called, it will not queue request again and return -ESHUTDOWN, but it not affect running flag of mass storage function.
Check return code from mass storage function and clear running flag if it is -ESHUTDOWN, also indicate start in/out transfer failure to break loops.
--- drivers/usb/gadget/function/f_mass_storage.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_mass_storage.c +18 -2
@@ -544,21 +544,37 @@ static int start_transfer(struct fsg_devstatic bool start_in_transfer (struct fsg_common *common,struct fsg_buffhd *bh) { +int rc; +if (!fsg_is_set (common))return false; bh->state =BUF_STATE_SENDING ; -if (start_transfer (common->fsg, common->fsg->bulk_in, bh->inreq)) + rc =start_transfer (common->fsg, common->fsg->bulk_in, bh->inreq); +if (rc) { bh->state =BUF_STATE_EMPTY ; +if (rc == -ESHUTDOWN ) { + common->running =0 ; +return false; + } + }return true; }static bool start_out_transfer (struct fsg_common *common,struct fsg_buffhd *bh) { +int rc; +if (!fsg_is_set (common))return false; bh->state =BUF_STATE_RECEIVING ; -if (start_transfer (common->fsg, common->fsg->bulk_out, bh->outreq)) + rc =start_transfer (common->fsg, common->fsg->bulk_out, bh->outreq); +if (rc) { bh->state =BUF_STATE_FULL ; +if (rc == -ESHUTDOWN ) { + common->running =0 ; +return false; + } + }return true; }
Greg Kroah-Hartman
maintainerPATCH 53/197 usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uttkarsh Aggarwal <[email protected]>
commit 61a348857e869432e6a920ad8ea9132e8d44c316 upstream.
In current scenario if Plug-out and Plug-In performed continuously there could be a chance while checking for dwc->gadget_driver in dwc3_gadget_suspend, a NULL pointer dereference may occur.
Call Stack:
CPU1: CPU2: gadget_unbind_driver dwc3_suspend_common dwc3_gadget_stop dwc3_gadget_suspend
dwc3_disconnect_gadget
CPU1 basically clears the variable and CPU2 checks the variable. Consider CPU1 is running and right before gadget_driver is cleared and in parallel CPU2 executes dwc3_gadget_suspend where it finds dwc->gadget_driver which is not NULL and resumes execution and then CPU1 completes execution. CPU2 executes dwc3_disconnect_gadget where it checks dwc->gadget_driver is already NULL because of which the NULL pointer deference occur.
--- drivers/usb/dwc3/gadget.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/usb/dwc3/gadget.c +2 -4
@@ -4583,15 +4583,13 @@ int dwc3_gadget_suspend(struct dwc3 *dwcunsigned long flags;int ret; -if (!dwc->gadget_driver) -return 0 ; - ret =dwc3_gadget_soft_disconnect (dwc);if (ret) goto err;spin_lock_irqsave (&dwc->lock, flags); -dwc3_disconnect_gadget (dwc); +if (dwc->gadget_driver) +dwc3_disconnect_gadget (dwc);spin_unlock_irqrestore (&dwc->lock, flags);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 54/197 interconnect: qcom: sc8180x: Mark CO0 BCM keepalive
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 85e985a4f46e462a37f1875cb74ed380e7c0c2e0 ]
The CO0 BCM needs to be up at all times, otherwise some hardware (like the UFS controller) loses its connection to the rest of the SoC, resulting in a hang of the platform, accompanied by a spectacular logspam.
Mark it as keepalive to prevent such cases.
--- drivers/interconnect/qcom/sc8180x.c | 1 + 1 file changed, 1 insertion(+)
drivers/interconnect/qcom/sc8180x.c +1 -0
@@ -1387,6 +1387,7 @@ static struct qcom_icc_bcm bcm_mm0 = {static struct qcom_icc_bcm bcm_co0 = { .name ="CO0" , + .keepalive = true, .num_nodes =1 , .nodes = { &slv_qns_cdsp_mem_noc } };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/197 media: ir_toy: fix a memleak in irtoy_tx
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit dc9ceb90c4b42c6e5c6757df1d6257110433788e ]
When irtoy_command fails, buf should be freed since it is allocated by irtoy_tx, or there is a memleak.
--- drivers/media/rc/ir_toy.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/ir_toy.c +2 -0
@@ -332,6 +332,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count) sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);if (err) {dev_err (irtoy->dev,"exit sample mode: %d\n" , err); +kfree (buf);return err; }
@@ -339,6 +340,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count) sizeof(COMMAND_SMODE_ENTER), STATE_COMMAND);if (err) {dev_err (irtoy->dev,"enter sample mode: %d\n" , err); +kfree (buf);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/197 driver core: fw_devlink: Improve detection of overlapping cycles
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saravana Kannan <[email protected]>
[ Upstream commit 6442d79d880cf7a2fff18779265d657fef0cce4c ]
fw_devlink can detect most overlapping/intersecting cycles. However it was missing a few corner cases because of an incorrect optimization logic that tries to avoid repeating cycle detection for devices that are already marked as part of a cycle.
Here's an example provided by Xu Yang (edited for clarity):
usb
+-----+
tcpc | |
+-----+ | +--|
| |----------->|EP|
|--+ | | +--|
|EP|<-----------| |
|--+ | | B |
| | +-----+
| A | |
+-----+ |
^ +-----+ |
| | | |
+-----| C |<--+
| |
+-----+usb-phy
Node A (tcpc) will be populated as device 1-0050. Node B (usb) will be populated as device 38100000.usb. Node C (usb-phy) will be populated as device 381f0040.usb-phy.
The description below uses the notation:
consumer --> supplier
child ==> parent
1. Node C is populated as device C. No cycles detected because cycle detection is only run when a fwnode link is converted to a device link.
2. Node B is populated as device B. As we convert B --> C into a device link we run cycle detection and find and mark the device link/fwnode link cycle:
C--> A --> B.EP ==> B --> C
3. Node A is populated as device A. As we convert C --> A into a device link, we see it's already part of a cycle (from step 2) and don't run cycle detection. Thus we miss detecting the cycle:
A --> B.EP ==> B --> A.EP ==> A
Looking at it another way, A depends on B in one way:
A --> B.EP ==> B
But B depends on A in two ways and we only detect the first:
B --> C --> A
B --> A.EP ==> A
To detect both of these, we remove the incorrect optimization attempt in step 3 and run cycle detection even if the fwnode link from which the device link is being created has already been marked as part of a cycle.
--- drivers/base/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/base/core.c +7 -2
@@ -2056,9 +2056,14 @@ static int fw_devlink_create_devlink(struct device *con,/* * SYNC_STATE_ONLY device links don't block probing and supports cycles. -* So cycle detection isn't necessary and shouldn't be done. +* So, one might expect that cycle detection isn't necessary for them. +* However, if the device link was marked as SYNC_STATE_ONLY because +* it's part of a cycle, then we still need to do cycle detection. This +* is because the consumer and supplier might be part of multiple cycles +* and we need to detect all those cycles. */ -if (!(flags &DL_FLAG_SYNC_STATE_ONLY )) { +if (!device_link_flag_is_sync_state_only (flags) || + flags &DL_FLAG_CYCLE ) {device_links_write_lock ();if (__fw_devlink_relax_cycles (con, sup_handle)) {__fwnode_link_cycle (link);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/197 powerpc/6xx: set High BAT Enable flag on G2_LE cores
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Schiffer <[email protected]>
[ Upstream commit a038a3ff8c6582404834852c043dadc73a5b68b4 ]
MMU_FTR_USE_HIGH_BATS is set for G2_LE cores and derivatives like e300cX, but the high BATs need to be enabled in HID2 to work. Add register definitions and add the needed setup to __setup_cpu_603.
This fixes boot on CPUs like the MPC5200B with STRICT_KERNEL_RWX enabled on systems where the flag has not been set by the bootloader already.
--- arch/powerpc/include/asm/reg.h | 2 ++ arch/powerpc/kernel/cpu_setup_6xx.S | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/reg.h +2 -0
@@ -608,6 +608,8 @@#endif #define SPRN_HID2 0x3F8/* Hardware Implementation Register 2 */ #define SPRN_HID2_GEKKO 0x398/* Gekko HID2 Register */ +#define SPRN_HID2_G2_LE 0x3F3/* G2_LE HID2 Register */ +#define HID2_G2_LE_HBE (1<<18)/* High BAT Enable (G2_LE) */ #define SPRN_IABR 0x3F2/* Instruction Address Breakpoint Register */ #define SPRN_IABR2 0x3FA/* 83xx */ #define SPRN_IBCR 0x135/* 83xx Insn Breakpoint Control Reg */
arch/powerpc/kernel/cpu_setup_6xx.S +19 -1
@@ -24,6 +24,15 @@ BEGIN_FTR_SECTION bl __init_fpu_registers END_FTR_SECTION_IFCLR(CPU_FTR_FPU_UNAVAILABLE) bl setup_common_caches + + /* + * This assumes that all cores using __setup_cpu_603 with + * MMU_FTR_USE_HIGH_BATS are G2_LE compatible + */ +BEGIN_MMU_FTR_SECTION + bl setup_g2_le_hid2 +END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS) + mtlr r5 blr _GLOBAL(__setup_cpu_604)
@@ -111,6 +120,16 @@ setup_604_hid0: isync blr +/* Enable high BATs for G2_LE and derivatives like e300cX */ +SYM_FUNC_START_LOCAL(setup_g2_le_hid2) + mfspr r11,SPRN_HID2_G2_LE + oris r11,r11,HID2_G2_LE_HBE@h + mtspr SPRN_HID2_G2_LE,r11 + sync + isync + blr +SYM_FUNC_END(setup_g2_le_hid2) + /* 7400 <= rev 2.7 and 7410 rev = 1.0 suffer from some * erratas we work around here. * Moto MPC710CE.pdf describes them, those are errata
@@ -485,4 +504,3 @@ _GLOBAL(__restore_cpu_setup) mtcr r7 blr _ASM_NOKPROBE_SYMBOL(__restore_cpu_setup) -
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/197 powerpc/kasan: Fix addr error caused by page alignment
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiangfeng Xiao <[email protected]>
[ Upstream commit 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0 ]
In kasan_init_region, when k_start is not page aligned, at the begin of for loop, k_cur = k_start & PAGE_MASK is less than k_start, and then va = block + k_cur - k_start is less than block, the addr va is invalid, because the memory address space from va to block is not alloced by memblock_alloc, which will not be reserved by memblock_reserve later, it will be used by other places.
As a result, memory overwriting occurs.
for example:
int __init __weak kasan_init_region(void *start, size_t size) {
[...]
/* if say block(dcd97000) k_start(feef7400) k_end(feeff3fe) */
block = memblock_alloc(k_end - k_start, PAGE_SIZE);
[...]
for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {
/* at the begin of for loop
* block(dcd97000) va(dcd96c00) k_cur(feef7000) k_start(feef7400)
* va(dcd96c00) is less than block(dcd97000), va is invalid
*/
void *va = block + k_cur - k_start;
[...]
}[...]
}
Therefore, page alignment is performed on k_start before memblock_alloc() to ensure the validity of the VA address.
--- arch/powerpc/mm/kasan/init_32.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/mm/kasan/init_32.c +1 -0
@@ -64,6 +64,7 @@ int __init __weak kasan_init_region(void *start, size_t size)if (ret)return ret; + k_start = k_start &PAGE_MASK ; block =memblock_alloc (k_end - k_start,PAGE_SIZE );if (!block)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/197 cifs: fix underflow in parse_server_interfaces()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit cffe487026be13eaf37ea28b783d9638ab147204 ]
In this loop, we step through the buffer and after each item we check if the size_left is greater than the minimum size we need. However, the problem is that "bytes_left" is type ssize_t while sizeof() is type size_t. That means that because of type promotion, the comparison is done as an unsigned and if we have negative bytes left the loop continues instead of ending.
--- fs/smb/client/smb2ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/smb2ops.c +1 -1
@@ -613,7 +613,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, goto out; } -while (bytes_left >=sizeof (*p)) { +while (bytes_left >= (ssize_t )sizeof (*p)) {memset (&tmp_iface,0 ,sizeof (tmp_iface)); tmp_iface.speed =le64_to_cpu (p->LinkSpeed); tmp_iface.rdma_capable =le32_to_cpu (p->Capability &RDMA_CAPABLE ) ?1 :0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/197 i2c: qcom-geni: Correct I2C TRE sequence
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viken Dadhaniya <[email protected]>
[ Upstream commit 83ef106fa732aea8558253641cd98e8a895604d7 ]
For i2c read operation in GSI mode, we are getting timeout due to malformed TRE basically incorrect TRE sequence in gpi(drivers/dma/qcom/gpi.c) driver.
I2C driver has geni_i2c_gpi(I2C_WRITE) function which generates GO TRE and geni_i2c_gpi(I2C_READ)generates DMA TRE. Hence to generate GO TRE before DMA TRE, we should move geni_i2c_gpi(I2C_WRITE) before geni_i2c_gpi(I2C_READ) inside the I2C GSI mode transfer function i.e. geni_i2c_gpi_xfer().
TRE stands for Transfer Ring Element - which is basically an element with size of 4 words. It contains all information like slave address, clk divider, dma address value data size etc).
Mainly we have 3 TREs(Config, GO and DMA tre).
- CONFIG TRE : consists of internal register configuration which is required before start of the transfer.
- DMA TRE : contains DDR/Memory address, called as DMA descriptor.
- GO TRE : contains Transfer directions, slave ID, Delay flags, Length
of the transfer.
I2c driver calls GPI driver API to config each TRE depending on the protocol.
For read operation tre sequence will be as below which is not aligned to hardware programming guide.
- CONFIG tre
- DMA tre
- GO tre
As per Qualcomm's internal Hardware Programming Guide, we should configure TREs in below sequence for any RX only transfer.
- CONFIG tre
- GO tre
- DMA tre
--- drivers/i2c/busses/i2c-qcom-geni.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +7 -7
@@ -605,20 +605,20 @@ static int geni_i2c_gpi_xfer(struct geni_i2c_dev *gi2c, struct i2c_msg msgs[], i peripheral.addr = msgs[i].addr; + ret =geni_i2c_gpi (gi2c, &msgs[i], &config, + &tx_addr, &tx_buf,I2C_WRITE , gi2c->tx_c); +if (ret) + goto err; +if (msgs[i].flags &I2C_M_RD ) { ret =geni_i2c_gpi (gi2c, &msgs[i], &config, &rx_addr, &rx_buf,I2C_READ , gi2c->rx_c);if (ret) goto err; - } - - ret =geni_i2c_gpi (gi2c, &msgs[i], &config, - &tx_addr, &tx_buf,I2C_WRITE , gi2c->tx_c); -if (ret) - goto err; -if (msgs[i].flags &I2C_M_RD )dma_async_issue_pending (gi2c->rx_c); + } +dma_async_issue_pending (gi2c->tx_c); timeout =wait_for_completion_timeout (&gi2c->done,XFER_TIMEOUT );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/197 irqchip/loongson-eiointc: Use correct struct type in eiointc_domain_alloc()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibo Mao <[email protected]>
[ Upstream commit f1c2765c6afcd1f71f76ed8c9bf94acedab4cecb ]
eiointc_domain_alloc() uses struct eiointc, which is not defined, for a pointer. Older compilers treat that as a forward declaration and due to assignment of a void pointer there is no warning emitted. As the variable is then handed in as a void pointer argument to irq_domain_set_info() the code is functional.
Use struct eiointc_priv instead.
[ tglx: Rewrote changelog ]
--- drivers/irqchip/irq-loongson-eiointc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-loongson-eiointc.c +1 -1
@@ -242,7 +242,7 @@ static int eiointc_domain_alloc(struct irq_domain *domain, unsigned int virq,int ret;unsigned int i, type;unsigned long hwirq =0 ; -struct eiointc *priv = domain->host_data; +struct eiointc_priv *priv = domain->host_data; ret =irq_domain_translate_onecell (domain, arg, &hwirq, &type);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/197 powerpc/kasan: Limit KASAN thread size increase to 32KB
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit f1acb109505d983779bbb7e20a1ee6244d2b5736 ]
KASAN is seen to increase stack usage, to the point that it was reported to lead to stack overflow on some 32-bit machines (see link).
To avoid overflows the stack size was doubled for KASAN builds in commit 3e8635fb2e07 ("powerpc/kasan: Force thread size increase with KASAN").
However with a 32KB stack size to begin with, the doubling leads to a
64KB stack, which causes build errors:
arch/powerpc/kernel/switch.S:249: Error: operand out of range (0x000000000000fe50 is not between 0xffffffffffff8000 and 0x0000000000007fff)
Although the asm could be reworked, in practice a 32KB stack seems sufficient even for KASAN builds - the additional usage seems to be in the 2-3KB range for a 64-bit KASAN build.
So only increase the stack for KASAN if the stack size is < 32KB.
--- arch/powerpc/include/asm/thread_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/thread_info.h +1 -1
@@ -14,7 +14,7 @@#ifdef __KERNEL__ -#ifdef CONFIG_KASAN +#if defined(CONFIG_KASAN ) &&CONFIG_THREAD_SHIFT <15 #define MIN_THREAD_SHIFT (CONFIG_THREAD_SHIFT + 1)#else #define MIN_THREAD_SHIFT CONFIG_THREAD_SHIFT
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/197 i2c: pasemi: split driver into two separate modules
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit f44bff19268517ee98e80e944cad0f04f1db72e3 ]
On powerpc, it is possible to compile test both the new apple (arm) and old pasemi (powerpc) drivers for the i2c hardware at the same time, which leads to a warning about linking the same object file twice:
scripts/Makefile.build:244: drivers/i2c/busses/Makefile: i2c-pasemi-core.o is added to multiple modules: i2c-apple i2c-pasemi
Rework the driver to have an explicit helper module, letting Kbuild take care of whether this should be built-in or a loadable driver.
--- drivers/i2c/busses/Makefile | 6 ++---- drivers/i2c/busses/i2c-pasemi-core.c | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/i2c/busses/Makefile +2 -4
@@ -89,10 +89,8 @@ obj-$(CONFIG_I2C_NPCM) += i2c-npcm7xx.o obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o obj-$(CONFIG_I2C_OMAP) += i2c-omap.o obj-$(CONFIG_I2C_OWL) += i2c-owl.o -i2c-pasemi-objs := i2c-pasemi-core.o i2c-pasemi-pci.o -obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi.o -i2c-apple-objs := i2c-pasemi-core.o i2c-pasemi-platform.o -obj-$(CONFIG_I2C_APPLE) += i2c-apple.o +obj-$(CONFIG_I2C_PASEMI) += i2c-pasemi-core.o i2c-pasemi-pci.o +obj-$(CONFIG_I2C_APPLE) += i2c-pasemi-core.o i2c-pasemi-platform.o obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pca-platform.o obj-$(CONFIG_I2C_PNX) += i2c-pnx.o obj-$(CONFIG_I2C_PXA) += i2c-pxa.o
drivers/i2c/busses/i2c-pasemi-core.c +5 -0
@@ -356,3 +356,8 @@ int pasemi_i2c_common_probe(struct pasemi_smbus *smbus)return 0 ; } +EXPORT_SYMBOL_GPL (pasemi_i2c_common_probe); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Olof Johansson <[email protected]>" ); +MODULE_DESCRIPTION ("PA Semi PWRficient SMBus driver" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/197 i2c: i801: Fix block process call transactions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
[ Upstream commit c1c9d0f6f7f1dbf29db996bd8e166242843a5f21 ]
According to the Intel datasheets, software must reset the block buffer index twice for block process call transactions: once before writing the outgoing data to the buffer, and once again before reading the incoming data from the buffer.
The driver is currently missing the second reset, causing the wrong portion of the block buffer to be read.
--- drivers/i2c/busses/i2c-i801.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-i801.c +2 -2
@@ -500,11 +500,10 @@ static int i801_block_transaction_by_block(struct i801_priv *priv,/* Set block buffer mode */ outb_p (inb_p (SMBAUXCTL (priv)) |SMBAUXCTL_E32B ,SMBAUXCTL (priv)); -inb_p (SMBHSTCNT (priv));/* reset the data buffer index */ -if (read_write ==I2C_SMBUS_WRITE ) { len = data->block[0 ];outb_p (len,SMBHSTDAT0 (priv)); +inb_p (SMBHSTCNT (priv));/* reset the data buffer index */ for (i =0 ; i < len; i++)outb_p (data->block[i+1 ],SMBBLKDAT (priv)); }
@@ -520,6 +519,7 @@ static int i801_block_transaction_by_block(struct i801_priv *priv,return -EPROTO ; data->block[0 ] = len; +inb_p (SMBHSTCNT (priv));/* reset the data buffer index */ for (i =0 ; i < len; i++) data->block[i +1 ] =inb_p (SMBBLKDAT (priv)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/197 modpost: trim leading spaces when processing source files list
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radek Krejci <[email protected]>
[ Upstream commit 5d9a16b2a4d9e8fa028892ded43f6501bc2969e5 ]
get_line() does not trim the leading spaces, but the parse_source_files() expects to get lines with source files paths where the first space occurs after the file path.
--- scripts/mod/sumversion.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/mod/sumversion.c +6 -1
@@ -326,7 +326,12 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)/* Sum all files in the same dir or subdirs. */ while ((line =get_line (&pos))) { -char * p = line; +char * p; + +/* trim the leading spaces away */ +while (isspace (*line)) + line++; + p = line;if (strncmp (line,"source_" ,sizeof ("source_" )-1 ) ==0 ) { p =strrchr (line,' ' );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/197 mptcp: get rid of msk->subflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 39880bd808ad2ddfb9b7fee129568c3b814f0609 upstream.
This is a partial backport of the upstram commit 39880bd808ad ("mptcp:
get rid of msk->subflow"). It's partial to avoid a long a complex dependency chain not suitable for stable.
The only bit remaning from the original commit is the introduction of a new field avoid a race at close time causing an UaF:
BUG: KASAN: use-after-free in mptcp_subflow_queue_clean+0x2c9/0x390 include/net/mptcp.h:104 Read of size 1 at addr ffff88803bf72884 by task syz-executor.6/23092 CPU: 0 PID: 23092 Comm: syz-executor.6 Not tainted 6.1.65-gc6114c845984 #50 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x125/0x18f lib/dump_stack.c:106 print_report+0x163/0x4f0 mm/kasan/report.c:284 kasan_report+0xc4/0x100 mm/kasan/report.c:495 mptcp_subflow_queue_clean+0x2c9/0x390 include/net/mptcp.h:104 mptcp_check_listen_stop+0x190/0x2a0 net/mptcp/protocol.c:3009 __mptcp_close+0x9a/0x970 net/mptcp/protocol.c:3024 mptcp_close+0x2a/0x130 net/mptcp/protocol.c:3089 inet_release+0x13d/0x190 net/ipv4/af_inet.c:429 sock_close+0xcf/0x230 net/socket.c:652 __fput+0x3a2/0x870 fs/file_table.c:320 task_work_run+0x24e/0x300 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop+0xa4/0xc0 kernel/entry/common.c:171 exit_to_user_mode_prepare+0x51/0x90 kernel/entry/common.c:204 syscall_exit_to_user_mode+0x26/0x140 kernel/entry/common.c:286 do_syscall_64+0x53/0xa0 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x64/0xce RIP: 0033:0x41d791 Code: 75 14 b8 03 00 00 00 0f 05 48 3d 01 f0 ff ff 0f 83 74 2a 00 00 c3 48 83 ec 08 e8 9a fc ff ff 48 89 04 24 b8 03 00 00 00 0f 05 <48> 8b 3c 24 48 89 c2 e8 e3 fc ff ff 48 89 d0 48 83 c4 08 48 3d 01 RSP: 002b:00000000008bfb90 EFLAGS: 00000293 ORIG_RAX: 0000000000000003 RAX: 0000000000000000 RBX: 0000000000000004 RCX: 000000000041d791 RDX: 0000001b33920000 RSI: ffffffff8139adff RDI: 0000000000000003 RBP: 000000000079d980 R08: 0000001b33d20000 R09: 0000000000000951 R10: 000000008139a955 R11: 0000000000000293 R12: 00000000000c739b R13: 000000000079bf8c R14: 00007fa301053000 R15: 00000000000c705a </TASK> Allocated by task 22528: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x40/0x70 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:374 [inline] __kasan_kmalloc+0xa0/0xb0 mm/kasan/common.c:383 kasan_kmalloc include/linux/kasan.h:211 [inline] __do_kmalloc_node mm/slab_common.c:955 [inline] __kmalloc+0xaa/0x1c0 mm/slab_common.c:968 kmalloc include/linux/slab.h:558 [inline] sk_prot_alloc+0xac/0x200 net/core/sock.c:2038 sk_clone_lock+0x56/0x1090 net/core/sock.c:2236 inet_csk_clone_lock+0x26/0x420 net/ipv4/inet_connection_sock.c:1141 tcp_create_openreq_child+0x30/0x1910 net/ipv4/tcp_minisocks.c:474 tcp_v6_syn_recv_sock+0x413/0x1a90 net/ipv6/tcp_ipv6.c:1283 subflow_syn_recv_sock+0x621/0x1300 net/mptcp/subflow.c:730 tcp_get_cookie_sock+0xf0/0x5f0 net/ipv4/syncookies.c:201 cookie_v6_check+0x130f/0x1c50 net/ipv6/syncookies.c:261 tcp_v6_do_rcv+0x7e0/0x12b0 net/ipv6/tcp_ipv6.c:1147 tcp_v6_rcv+0x2494/0x2f50 net/ipv6/tcp_ipv6.c:1743 ip6_protocol_deliver_rcu+0xba3/0x1620 net/ipv6/ip6_input.c:438 ip6_input+0x1bc/0x470 net/ipv6/ip6_input.c:483 ipv6_rcv+0xef/0x2c0 include/linux/netfilter.h:302 __netif_receive_skb+0x1ea/0x6a0 net/core/dev.c:5525 process_backlog+0x353/0x660 net/core/dev.c:5967 __napi_poll+0xc6/0x5a0 net/core/dev.c:6534 net_rx_action+0x652/0xea0 net/core/dev.c:6601 __do_softirq+0x176/0x525 kernel/softirq.c:571 Freed by task 23093: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x40/0x70 mm/kasan/common.c:52 kasan_save_free_info+0x2b/0x50 mm/kasan/generic.c:516 ____kasan_slab_free+0x13a/0x1b0 mm/kasan/common.c:236 kasan_slab_free include/linux/kasan.h:177 [inline] slab_free_hook mm/slub.c:1724 [inline] slab_free_freelist_hook mm/slub.c:1750 [inline] slab_free mm/slub.c:3661 [inline] __kmem_cache_free+0x1eb/0x340 mm/slub.c:3674 sk_prot_free net/core/sock.c:2074 [inline] __sk_destruct+0x4ad/0x620 net/core/sock.c:2160 tcp_v6_rcv+0x269c/0x2f50 net/ipv6/tcp_ipv6.c:1761 ip6_protocol_deliver_rcu+0xba3/0x1620 net/ipv6/ip6_input.c:438 ip6_input+0x1bc/0x470 net/ipv6/ip6_input.c:483 ipv6_rcv+0xef/0x2c0 include/linux/netfilter.h:302 __netif_receive_skb+0x1ea/0x6a0 net/core/dev.c:5525 process_backlog+0x353/0x660 net/core/dev.c:5967 __napi_poll+0xc6/0x5a0 net/core/dev.c:6534 net_rx_action+0x652/0xea0 net/core/dev.c:6601 __do_softirq+0x176/0x525 kernel/softirq.c:571 The buggy address belongs to the object at ffff88803bf72000 which belongs to the cache kmalloc-4k of size 4096
The buggy address is located 2180 bytes inside of
4096-byte region [ffff88803bf72000, ffff88803bf73000)
The buggy address belongs to the physical page:
page:00000000a72e4e51 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x3bf70
head:00000000a72e4e51 order:3 compound_mapcount:0 compound_pincount:0
flags: 0x100000000010200(slab|head|node=0|zone=1)
raw: 0100000000010200 ffffea0000a0ea00 dead000000000002 ffff888100042140
raw: 0000000000000000 0000000000040004 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88803bf72780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88803bf72800: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88803bf72880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88803bf72900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88803bf72980: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbPrevent the MPTCP worker from freeing the first subflow for unaccepted socket when such sockets transition to TCP_CLOSE state, and let that happen at accept() or listener close() time.
--- net/mptcp/protocol.c | 9 ++++----- net/mptcp/protocol.h | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-)
net/mptcp/protocol.c +4 -5
@@ -2422,7 +2422,7 @@ static void __mptcp_close_ssk(struct soc goto out_release; } - dispose_it = !msk->subflow || ssk != msk->subflow->sk; + dispose_it = msk->free_first || ssk != msk->first;if (dispose_it)list_del (&subflow->node);
@@ -2440,7 +2440,6 @@ static void __mptcp_close_ssk(struct soc need_push = (flags &MPTCP_CF_PUSH ) &&__mptcp_retransmit_pending_data (sk);if (!dispose_it) {__mptcp_subflow_disconnect (ssk, subflow, flags); - msk->subflow->state =SS_UNCONNECTED ;release_sock (ssk); goto out;
@@ -3341,10 +3340,10 @@ static void mptcp_destroy(struct sock *s {struct mptcp_sock *msk =mptcp_sk (sk); -/* clears msk->subflow, allowing the following to close -* even the initial subflow -*/ mptcp_dispose_initial_subflow (msk); + +/* allow the following to close even the initial subflow */ + msk->free_first =1 ;mptcp_destroy_common (msk,0 );sk_sockets_allocated_dec (sk); }
net/mptcp/protocol.h +2 -1
@@ -287,7 +287,8 @@ struct mptcp_sock { cork:1, nodelay:1, fastopening:1, - in_accept_queue:1; + in_accept_queue:1, + free_first:1;struct work_struct work;struct sk_buff *ooo_last_skb;struct rb_root out_of_order_queue;
Greg Kroah-Hartman
maintainerPATCH 67/197 mptcp: fix data re-injection from stale subflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit b6c620dc43ccb4e802894e54b651cf81495e9598 upstream.
When the MPTCP PM detects that a subflow is stale, all the packet scheduler must re-inject all the mptcp-level unacked data. To avoid acquiring unneeded locks, it first try to check if any unacked data is present at all in the RTX queue, but such check is currently broken, as it uses TCP-specific helper on an MPTCP socket.
Funnily enough fuzzers and static checkers are happy, as the accessed memory still belongs to the mptcp_sock struct, and even from a functional perspective the recovery completed successfully, as the short-cut test always failed.
A recent unrelated TCP change - commit d5fed5addb2b ("tcp: reorganize tcp_sock fast path variables") - exposed the issue, as the tcp field reorganization makes the mptcp code always skip the re-inection.
Fix the issue dropping the bogus call: we are on a slow path, the early optimization proved once again to be evil.
--- net/mptcp/protocol.c | 3 --- 1 file changed, 3 deletions(-)
net/mptcp/protocol.c +0 -3
@@ -2336,9 +2336,6 @@ bool __mptcp_retransmit_pending_data(strif (__mptcp_check_fallback (mptcp_sk (sk)))return false; -if (tcp_rtx_and_write_queues_empty (sk)) -return false; -/* the closing socket has some data untransmitted and/or unacked: * some data in the mptcp rtx queue has not really xmitted yet. * keep it simple and re-inject the whole mptcp level rtx queue
Greg Kroah-Hartman
maintainerPATCH 68/197 selftests: mptcp: add missing kconfig for NF Filter
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 3645c844902bd4e173d6704fc2a37e8746904d67 upstream.
Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Filter table.
It is then required to have IP_NF_FILTER KConfig.
This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled.
--- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/mptcp/config +1 -0
@@ -22,6 +22,7 @@ CONFIG_NFT_TPROXY=m CONFIG_NFT_SOCKET=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NET_ACT_CSUM=m
Greg Kroah-Hartman
maintainerPATCH 69/197 selftests: mptcp: add missing kconfig for NF Filter in v6
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 8c86fad2cecdc6bf7283ecd298b4d0555bd8b8aa upstream.
Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Filter table for IPv6.
It is then required to have IP6_NF_FILTER KConfig.
This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled.
--- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/mptcp/config +1 -0
@@ -25,6 +25,7 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IP6_NF_FILTER=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_CLS_ACT=y
Greg Kroah-Hartman
maintainerPATCH 70/197 selftests: mptcp: add missing kconfig for NF Mangle
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 2d41f10fa497182df9012d3e95d9cea24eb42e61 upstream.
Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Mangle table, only in IPv4.
This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled.
--- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/mptcp/config +1 -0
@@ -23,6 +23,7 @@ CONFIG_NFT_SOCKET=m CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IP6_NF_FILTER=m
Greg Kroah-Hartman
maintainerPATCH 71/197 selftests: mptcp: increase timeout to 30 min
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 4d4dfb2019d7010efb65926d9d1c1793f9a367c6 upstream.
On very slow environments -- e.g. when QEmu is used without KVM --, mptcp_join.sh selftest can take a bit more than 20 minutes. Bump the default timeout by 50% as it seems normal to take that long on some environments.
When a debug kernel config is used, this selftest will take even longer, but that's certainly not a common test env to consider for the timeout.
The Fixes tag that has been picked here is there simply to help having this patch backported to older stable versions. It is difficult to point to the exact commit that made some env reaching the timeout from time to time.
--- tools/testing/selftests/net/mptcp/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/mptcp/settings +1 -1
@@ -1 +1 @@ -timeout=1200 +timeout=1800
Signature · 1 line
2.43.2
Greg Kroah-Hartman
maintainerPATCH 72/197 mptcp: drop the push_pending field
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit bdd70eb68913c960acb895b00a8c62eb64715b1f upstream.
Such field is there to avoid acquiring the data lock in a few spots, but it adds complexity to the already non trivial locking schema.
All the relevant call sites (mptcp-level re-injection, set socket options), are slow-path, drop such field in favor of 'cb_flags', adding the relevant locking.
This patch could be seen as an improvement, instead of a fix. But it simplifies the next patch. The 'Fixes' tag has been added to help having this series backported to stable.
--- net/mptcp/protocol.c | 12 ++++++------ net/mptcp/protocol.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)
net/mptcp/protocol.c +6 -6
@@ -1582,8 +1582,11 @@ static void mptcp_update_post_push(strucvoid mptcp_check_and_set_pending (struct sock *sk) { -if (mptcp_send_head (sk)) -mptcp_sk (sk)->push_pending |=BIT (MPTCP_PUSH_PENDING ); +if (mptcp_send_head (sk)) { +mptcp_data_lock (sk); +mptcp_sk (sk)->cb_flags |=BIT (MPTCP_PUSH_PENDING ); +mptcp_data_unlock (sk); + } }void __mptcp_push_pending (struct sock *sk,unsigned int flags)
@@ -3140,7 +3143,6 @@ static int mptcp_disconnect(struct sock msk->last_snd =NULL ;WRITE_ONCE (msk->flags,0 ); msk->cb_flags =0 ; - msk->push_pending =0 ; msk->recovery = false; msk->can_ack = false; msk->fully_established = false;
@@ -3384,8 +3386,7 @@ static void mptcp_release_cb(struct sockstruct mptcp_sock *msk =mptcp_sk (sk);for (;;) { -unsigned long flags = (msk->cb_flags &MPTCP_FLAGS_PROCESS_CTX_NEED ) | - msk->push_pending; +unsigned long flags = (msk->cb_flags &MPTCP_FLAGS_PROCESS_CTX_NEED );struct list_head join_list;if (!flags)
@@ -3401,7 +3402,6 @@ static void mptcp_release_cb(struct sock* datapath acquires the msk socket spinlock while helding * the subflow socket lock */ - msk->push_pending =0 ; msk->cb_flags &= ~flags;spin_unlock_bh (&sk->sk_lock.slock);
net/mptcp/protocol.h +0 -1
@@ -272,7 +272,6 @@ struct mptcp_sock {int rmem_released;unsigned long flags;unsigned long cb_flags; -unsigned long push_pending;bool recovery;/* closing subflow write queue reinjected */ bool can_ack;bool fully_established;
Greg Kroah-Hartman
maintainerPATCH 73/197 mptcp: check addrs list in userspace_pm_get_local_id
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
commit f012d796a6de662692159c539689e47e662853a8 upstream.
Before adding a new entry in mptcp_userspace_pm_get_local_id(), it's better to check whether this address is already in userspace pm local address list. If it's in the list, no need to add a new entry, just return it's address ID and use this address.
--- net/mptcp/pm_userspace.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
net/mptcp/pm_userspace.c +12 -1
@@ -132,10 +132,21 @@ int mptcp_userspace_pm_get_flags_and_ifiint mptcp_userspace_pm_get_local_id (struct mptcp_sock *msk,struct mptcp_addr_info *skc) { -struct mptcp_pm_addr_entry new_entry; +struct mptcp_pm_addr_entry *entry =NULL , *e, new_entry;__be16 msk_sport = ((struct inet_sock *)inet_sk ((struct sock *)msk))->inet_sport; +spin_lock_bh (&msk->pm.lock); +list_for_each_entry (e, &msk->pm.userspace_pm_local_addr_list, list) { +if (mptcp_addresses_equal (&e->addr, skc, false)) { + entry = e; +break ; + } + } +spin_unlock_bh (&msk->pm.lock); +if (entry) +return entry->addr.id; +memset (&new_entry,0 ,sizeof (struct mptcp_pm_addr_entry )); new_entry.addr = *skc; new_entry.addr.id =0 ;
Greg Kroah-Hartman
maintainerPATCH 74/197 media: Revert "media: rkisp1: Drop IRQF_SHARED"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
commit a107d643b2a3382e0a2d2c4ef08bf8c6bff4561d upstream.
This reverts commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74.
The rkisp1 does share interrupt lines on some platforms, after all. Thus we need to revert this, and implement a fix for the rkisp1 shared irq handling in a follow-up patch.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +1 -1
@@ -559,7 +559,7 @@ static int rkisp1_probe(struct platform_ rkisp1->irqs[il] = irq; } - ret =devm_request_irq (dev, irq, info->isrs[i].isr,0 , + ret =devm_request_irq (dev, irq, info->isrs[i].isr,IRQF_SHARED ,dev_driver_string (dev), dev);if (ret) {dev_err (dev,"request irq failed: %d\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 75/197 scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Duncan <[email protected]>
commit 977fe773dcc7098d8eaf4ee6382cb51e13e784cb upstream.
This reverts commit 1a1975551943f681772720f639ff42fbaa746212.
This commit causes interrupts to be lost for FCoE devices, since it changed sping locks from "bh" to "irqsave".
Instead, a work queue should be used, and will be addressed in a separate commit.
--- drivers/scsi/fcoe/fcoe_ctlr.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/scsi/fcoe/fcoe_ctlr.c +8 -12
@@ -319,17 +319,16 @@ static void fcoe_ctlr_announce(struct fc {struct fcoe_fcf *sel;struct fcoe_fcf *fcf; -unsigned long flags;mutex_lock (&fip->ctlr_mutex); -spin_lock_irqsave (&fip->ctlr_lock, flags); +spin_lock_bh (&fip->ctlr_lock);kfree_skb (fip->flogi_req); fip->flogi_req =NULL ;list_for_each_entry (fcf, &fip->fcfs, list) fcf->flogi_sent =0 ; -spin_unlock_irqrestore (&fip->ctlr_lock, flags); +spin_unlock_bh (&fip->ctlr_lock); sel = fip->sel_fcf;if (sel &ðer_addr_equal (sel->fcf_mac, fip->dest_addr))
@@ -700,7 +699,6 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr {struct fc_frame *fp;struct fc_frame_header *fh; -unsigned long flags;u16 old_xid;u8 op;u8 mac[ETH_ALEN ];
@@ -734,11 +732,11 @@ int fcoe_ctlr_els_send(struct fcoe_ctlr op =FIP_DT_FLOGI ;if (fip->mode ==FIP_MODE_VN2VN )break ; -spin_lock_irqsave (&fip->ctlr_lock, flags); +spin_lock_bh (&fip->ctlr_lock);kfree_skb (fip->flogi_req); fip->flogi_req = skb; fip->flogi_req_send =1 ; -spin_unlock_irqrestore (&fip->ctlr_lock, flags); +spin_unlock_bh (&fip->ctlr_lock);schedule_work (&fip->timer_work);return -EINPROGRESS ;case ELS_FDISC :
@@ -1707,11 +1705,10 @@ static int fcoe_ctlr_flogi_send_locked(sstatic int fcoe_ctlr_flogi_retry (struct fcoe_ctlr *fip) {struct fcoe_fcf *fcf; -unsigned long flags;int error;mutex_lock (&fip->ctlr_mutex); -spin_lock_irqsave (&fip->ctlr_lock, flags); +spin_lock_bh (&fip->ctlr_lock);LIBFCOE_FIP_DBG (fip,"re-sending FLOGI - reselect\n" ); fcf =fcoe_ctlr_select (fip);if (!fcf || fcf->flogi_sent) {
@@ -1722,7 +1719,7 @@ static int fcoe_ctlr_flogi_retry(structfcoe_ctlr_solicit (fip,NULL ); error =fcoe_ctlr_flogi_send_locked (fip); } -spin_unlock_irqrestore (&fip->ctlr_lock, flags); +spin_unlock_bh (&fip->ctlr_lock);mutex_unlock (&fip->ctlr_mutex);return error; }
@@ -1739,9 +1736,8 @@ static int fcoe_ctlr_flogi_retry(structstatic void fcoe_ctlr_flogi_send (struct fcoe_ctlr *fip) {struct fcoe_fcf *fcf; -unsigned long flags; -spin_lock_irqsave (&fip->ctlr_lock, flags); +spin_lock_bh (&fip->ctlr_lock); fcf = fip->sel_fcf;if (!fcf || !fip->flogi_req_send) goto unlock;
@@ -1768,7 +1764,7 @@ static void fcoe_ctlr_flogi_send(struct }else /* XXX */ LIBFCOE_FIP_DBG (fip,"No FCF selected - defer send\n" ); unlock: -spin_unlock_irqrestore (&fip->ctlr_lock, flags); +spin_unlock_bh (&fip->ctlr_lock); }/**
Greg Kroah-Hartman
maintainerPATCH 76/197 Revert "drm/amd: flush any delayed gfxoff on suspend entry"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 916361685319098f696b798ef1560f69ed96e934 upstream.
commit ab4750332dbe ("drm/amdgpu/sdma5.2: add begin/end_use ring callbacks") caused GFXOFF control to be used more heavily and the codepath that was removed from commit 0dee72639533 ("drm/amd: flush any delayed gfxoff on suspend entry") now can be exercised at suspend again.
Users report that by using GNOME to suspend the lockscreen trigger will cause SDMA traffic and the system can deadlock.
This reverts commit 0dee726395333fea833eaaf838bc80962df886c8.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -1
@@ -4203,7 +4203,6 @@ int amdgpu_device_suspend(struct drm_devdrm_fb_helper_set_suspend_unlocked (adev_to_drm (adev)->fb_helper, true);cancel_delayed_work_sync (&adev->delayed_init_work); -flush_delayed_work (&adev->gfx.gfx_off_delay_work);amdgpu_ras_suspend (adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +8 -1
@@ -585,8 +585,15 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_dif (adev->gfx.gfx_off_req_count ==0 && !adev->gfx.gfx_off_state) { -schedule_delayed_work (&adev->gfx.gfx_off_delay_work, +/* If going to s2idle, no need to wait */ +if (adev->in_s0ix) { +if (!amdgpu_dpm_set_powergating_by_smu (adev, +AMD_IP_BLOCK_TYPE_GFX , true)) + adev->gfx.gfx_off_state = true; + }else { +schedule_delayed_work (&adev->gfx.gfx_off_delay_work, delay); + } } }else {if (adev->gfx.gfx_off_req_count ==0 ) {
Greg Kroah-Hartman
maintainerPATCH 77/197 drm/virtio: Set segment size for virtio_gpu device
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Ott <[email protected]>
commit 9c64e749cebd9c2d3d55261530a98bcccb83b950 upstream.
Set the segment size of the virtio_gpu device to the value used by the drm helpers when allocating sg lists to fix the following complaint from DMA_API debug code:
DMA-API: virtio-pci 0000:07:00.0: mapping sg segment longer than device claims to support [len=262144] [max=65536]
--- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/virtio/virtgpu_drv.c +1 -0
@@ -93,6 +93,7 @@ static int virtio_gpu_probe(struct virti goto err_free; } +dma_set_max_seg_size (dev->dev,dma_max_mapping_size (dev->dev) ?:UINT_MAX ); ret =virtio_gpu_init (vdev, dev);if (ret) goto err_free;
Greg Kroah-Hartman
maintainerPATCH 78/197 lsm: fix the logic in security_inode_getsecctx()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ondrej Mosnacek <[email protected]>
commit 99b817c173cd213671daecd25ca27f56b0c7c4ec upstream.
The inode_getsecctx LSM hook has previously been corrected to have -EOPNOTSUPP instead of 0 as the default return value to fix BPF LSM behavior. However, the call_int_hook()-generated loop in security_inode_getsecctx() was left treating 0 as the neutral value, so after an LSM returns 0, the loop continues to try other LSMs, and if one of them returns a non-zero value, the function immediately returns with said value. So in a situation where SELinux and the BPF LSMs registered this hook, -EOPNOTSUPP would be incorrectly returned whenever SELinux returned 0.
Fix this by open-coding the call_int_hook() loop and making it use the correct LSM_RET_DEFAULT() value as the neutral one, similar to what other hooks do.
--- security/security.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
security/security.c +13 -1
@@ -2186,7 +2186,19 @@ EXPORT_SYMBOL(security_inode_setsecctx);int security_inode_getsecctx (struct inode *inode,void **ctx,u32 *ctxlen) { -return call_int_hook (inode_getsecctx, -EOPNOTSUPP , inode, ctx, ctxlen); +struct security_hook_list *hp; +int rc; + +/* +* Only one module will provide a security context. +*/ +hlist_for_each_entry (hp, &security_hook_heads.inode_getsecctx, list) { + rc = hp->hook.inode_getsecctx (inode, ctx, ctxlen); +if (rc !=LSM_RET_DEFAULT (inode_getsecctx)) +return rc; + } + +return LSM_RET_DEFAULT (inode_getsecctx); }EXPORT_SYMBOL (security_inode_getsecctx);
Greg Kroah-Hartman
maintainerPATCH 79/197 firewire: core: correct documentation of fw_csr_string() kernel API
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Sakamoto <[email protected]>
commit 5f9ab17394f831cb7986ec50900fa37507a127f1 upstream.
Against its current description, the kernel API can accepts all types of directory entries.
This commit corrects the documentation.
--- drivers/firewire/core-device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/firewire/core-device.c +3 -4
@@ -100,10 +100,9 @@ static int textual_leaf_to_string(const* @buf: where to put the string * @size: size of @buf, in bytes * -* The string is taken from a minimal ASCII text descriptor leaf after -* the immediate entry with @key. The string is zero-terminated. -* An overlong string is silently truncated such that it and the -* zero byte fit into @size. +* The string is taken from a minimal ASCII text descriptor leaf just after the entry with the +* @key. The string is zero-terminated. An overlong string is silently truncated such that it +* and the zero byte fit into @size. * * Returns strlen(buf) or a negative error code. */
Greg Kroah-Hartman
maintainerPATCH 80/197 ALSA: hda/realtek: Apply headset jack quirk for non-bass alc287 thinkpads
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: José Relvas <[email protected]>
commit 2468e8922d2f6da81a6192b73023eff67e3fefdd upstream.
There currently exists two thinkpad headset jack fixups:ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK ALC285_FIXUP_THINKPAD_HEADSET_JACK
The latter is applied to alc285 and alc287 thinkpads which contain bass speakers.
However, the former was only being applied to alc285 thinkpads, leaving non-bass alc287 thinkpads with no headset button controls. This patch fixes that by adding ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK to the alc287 chains, allowing the detection of headset buttons.
--- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +3 -1
@@ -9377,7 +9377,7 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = cs35l41_fixup_i2c_two, .chained = true, - .chain_id = ALC269_FIXUP_THINKPAD_ACPI, + .chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK, }, [ALC245_FIXUP_HP_MUTE_LED_COEFBIT] = { .type = HDA_FIXUP_FUNC,
@@ -9392,6 +9392,8 @@ static const struct hda_fixup alc269_fix [ALC287_FIXUP_THINKPAD_I2S_SPK] = { .type = HDA_FIXUP_FUNC, .v.func = alc287_fixup_bind_dacs, + .chained = true, + .chain_id = ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK, }, [ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = { .type = HDA_FIXUP_FUNC,
Greg Kroah-Hartman
maintainerPATCH 81/197 kbuild: Fix changing ELF file type for output of gen_btf for big endian
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit e3a9ee963ad8ba677ca925149812c5932b49af69 upstream.
Commit 90ceddcb4950 ("bpf: Support llvm-objcopy for vmlinux BTF") changed the ELF type of .btf.vmlinux.bin.o to ET_REL via dd, which works fine for little endian platforms:
00000000 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 03 00 b7 00 01 00 00 00 00 00 00 80 00 80 ff ff |................| +00000010 01 00 b7 00 01 00 00 00 00 00 00 80 00 80 ff ff |................|
However, for big endian platforms, it changes the wrong byte, resulting in an invalid ELF file type, which ld.lld rejects:
00000000 7f 45 4c 46 02 02 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 00 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| +00000010 01 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................|
Type: <unknown>: 103
ld.lld: error: .btf.vmlinux.bin.o: unknown file type
Fix this by updating the entire 16-bit e_type field rather than just a single byte, so that everything works correctly for all platforms and linkers.
00000000 7f 45 4c 46 02 02 01 00 00 00 00 00 00 00 00 00 |.ELF............| -00000010 00 03 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................| +00000010 00 01 00 16 00 00 00 01 00 00 00 00 00 10 00 00 |................|
Type: REL (Relocatable file)
While in the area, update the comment to mention that binutils 2.35+ matches LLD's behavior of rejecting an ET_EXEC input, which occurred after the comment was added.
--- scripts/link-vmlinux.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
scripts/link-vmlinux.sh +7 -2
@@ -135,8 +135,13 @@ gen_btf() ${OBJCOPY} --only-section=.BTF --set-section-flags .BTF=alloc,readonly \ --strip-all ${1} ${2} 2>/dev/null # Change e_type to ET_REL so that it can be used to link final vmlinux. - # Unlike GNU ld, lld does not allow an ET_EXEC input. - printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none + # GNU ld 2.35+ and lld do not allow an ET_EXEC input. + if is_enabled CONFIG_CPU_BIG_ENDIAN; then + et_rel='\0\1' + else + et_rel='\1\0' + fi + printf "${et_rel}" | dd of=${2} conv=notrunc bs=1 seek=16 status=none } # Create ${2} .S file with all symbols from the ${1} object file
Greg Kroah-Hartman
maintainerPATCH 82/197 nfc: nci: free rx_data_reassembly skb on NCI device cleanup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit bfb007aebe6bff451f7f3a4be19f4f286d0d5d9c upstream.
rx_data_reassembly skb is stored during NCI data exchange for processing fragmented packets. It is dropped only when the last fragment is processed or when an NTF packet with NCI_OP_RF_DEACTIVATE_NTF opcode is received. However, the NCI device may be deallocated before that which leads to skb leak.
As by design the rx_data_reassembly skb is bound to the NCI device and nothing prevents the device to be freed before the skb is processed in some way and cleaned, free it on the NCI device cleanup.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- net/nfc/nci/core.c | 4 ++++ 1 file changed, 4 insertions(+)
net/nfc/nci/core.c +4 -0
@@ -1207,6 +1207,10 @@ void nci_free_device(struct nci_dev *nde {nfc_free_device (ndev->nfc_dev);nci_hci_deallocate (ndev); + +/* drop partial rx data packet if present */ +if (ndev->rx_data_reassembly) +kfree_skb (ndev->rx_data_reassembly);kfree (ndev); }EXPORT_SYMBOL (nci_free_device);
Greg Kroah-Hartman
maintainerPATCH 83/197 net: hsr: remove WARN_ONCE() in send_hsr_supervision_frame()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
commit 37e8c97e539015637cb920d3e6f1e404f707a06e upstream.
Syzkaller reported [1] hitting a warning after failing to allocate resources for skb in hsr_init_skb(). Since a WARN_ONCE() call will not help much in this case, it might be prudent to switch to netdev_warn_once(). At the very least it will suppress syzkaller reports such as [1].
Just in case, use netdev_warn_once() in send_prp_supervision_frame() for similar reasons.
[1]
HSR: Could not send supervision frame
WARNING: CPU: 1 PID: 85 at net/hsr/hsr_device.c:294 send_hsr_supervision_frame+0x60a/0x810 net/hsr/hsr_device.c:294 RIP: 0010:send_hsr_supervision_frame+0x60a/0x810 net/hsr/hsr_device.c:294 ... Call Trace: <IRQ> hsr_announce+0x114/0x370 net/hsr/hsr_device.c:382 call_timer_fn+0x193/0x590 kernel/time/timer.c:1700 expire_timers kernel/time/timer.c:1751 [inline] __run_timers+0x764/0xb20 kernel/time/timer.c:2022 run_timer_softirq+0x58/0xd0 kernel/time/timer.c:2035 __do_softirq+0x21a/0x8de kernel/softirq.c:553 invoke_softirq kernel/softirq.c:427 [inline] __irq_exit_rcu kernel/softirq.c:632 [inline] irq_exit_rcu+0xb7/0x120 kernel/softirq.c:644 sysvec_apic_timer_interrupt+0x95/0xb0 arch/x86/kernel/apic/apic.c:1076 </IRQ> <TASK> asm_sysvec_apic_timer_interrupt+0x1a/0x20 arch/x86/include/asm/idtentry.h:649
...
This issue is also found in older kernels (at least up to 5.10).
--- net/hsr/hsr_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/hsr/hsr_device.c +2 -2
@@ -291,7 +291,7 @@ static void send_hsr_supervision_frame(s skb =hsr_init_skb (master);if (!skb) { -WARN_ONCE (1 ,"HSR: Could not send supervision frame\n" ); +netdev_warn_once (master->dev,"HSR: Could not send supervision frame\n" );return ; }
@@ -338,7 +338,7 @@ static void send_prp_supervision_frame(s skb =hsr_init_skb (master);if (!skb) { -WARN_ONCE (1 ,"PRP: Could not send supervision frame\n" ); +netdev_warn_once (master->dev,"PRP: Could not send supervision frame\n" );return ; }
Greg Kroah-Hartman
maintainerPATCH 84/197 net: stmmac: do not clear TBS enable bit on link up/down
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Esben Haabendal <[email protected]>
commit 4896bb7c0b31a0a3379b290ea7729900c59e0c69 upstream.
With the dma conf being reallocated on each call to stmmac_open(), any information in there is lost, unless we specifically handle it.
The STMMAC_TBS_EN bit is set when adding an etf qdisc, and the etf qdisc therefore would stop working when link was set down and then back up.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
@@ -3826,6 +3826,9 @@ static int __stmmac_open(struct net_devi priv->rx_copybreak =STMMAC_RX_COPYBREAK ; buf_sz = dma_conf->dma_buf_sz; +for (int i =0 ; i <MTL_MAX_TX_QUEUES ; i++) +if (priv->dma_conf.tx_queue[i].tbs &STMMAC_TBS_EN ) + dma_conf->tx_queue[i].tbs = priv->dma_conf.tx_queue[i].tbs;memcpy (&priv->dma_conf, dma_conf,sizeof (*dma_conf));stmmac_reset_queues_param (priv);
Greg Kroah-Hartman
maintainerPATCH 85/197 xen-netback: properly sync TX responses
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 7b55984c96ffe9e236eb9c82a2196e0b1f84990d upstream.
Invoking the make_tx_response() / push_tx_responses() pair with no lock held would be acceptable only if all such invocations happened from the same context (NAPI instance or dealloc thread). Since this isn't the case, and since the interface "spec" also doesn't demand that multicast operations may only be performed with no in-flight transmits, MCAST_{ADD,DEL} processing also needs to acquire the response lock around the invocations.
To prevent similar mistakes going forward, "downgrade" the present functions to private helpers of just the two remaining ones using them directly, with no forward declarations anymore. This involves renaming what so far was make_tx_response(), for the new function of that name to serve the new (wrapper) purpose.
While there,
- constify the txp parameters,
- correct xenvif_idx_release()'s status parameter's type,
- rename {,_}make_tx_response()'s status parameters for consistency with xenvif_idx_release()'s.
--- drivers/net/xen-netback/netback.c | 84 ++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 44 deletions(-)
drivers/net/xen-netback/netback.c +40 -44
@@ -104,13 +104,12 @@ bool provides_xdp_headroom = true;module_param (provides_xdp_headroom, bool,0644 );static void xenvif_idx_release (struct xenvif_queue *queue,u16 pending_idx, -u8 status); +s8 status);static void make_tx_response (struct xenvif_queue *queue, -struct xen_netif_tx_request *txp, +const struct xen_netif_tx_request *txp,unsigned int extra_count, -s8 st); -static void push_tx_responses (struct xenvif_queue *queue); +s8 status);static void xenvif_idx_unmap (struct xenvif_queue *queue,u16 pending_idx);
@@ -208,13 +207,9 @@ static void xenvif_tx_err(struct xenvif_ unsigned int extra_count, RING_IDX end) {RING_IDX cons = queue->tx.req_cons; -unsigned long flags; do { - spin_lock_irqsave(&queue->response_lock, flags); make_tx_response(queue, txp, extra_count, XEN_NETIF_RSP_ERROR); - push_tx_responses(queue); - spin_unlock_irqrestore(&queue->response_lock, flags); if (cons == end) break; RING_COPY_REQUEST(&queue->tx, cons++, txp);
@@ -465,12 +460,7 @@ static void xenvif_get_requests(struct xfor (shinfo->nr_frags =0 ; nr_slots >0 && shinfo->nr_frags <MAX_SKB_FRAGS ; nr_slots--) {if (unlikely (!txp->size)) { -unsigned long flags; - -spin_lock_irqsave (&queue->response_lock, flags);make_tx_response (queue, txp,0 ,XEN_NETIF_RSP_OKAY ); -push_tx_responses (queue); -spin_unlock_irqrestore (&queue->response_lock, flags); ++txp;continue ; }
@@ -496,14 +486,8 @@ static void xenvif_get_requests(struct xfor (shinfo->nr_frags =0 ; shinfo->nr_frags < nr_slots; ++txp) {if (unlikely (!txp->size)) { -unsigned long flags; - -spin_lock_irqsave (&queue->response_lock, flags);make_tx_response (queue, txp,0 ,XEN_NETIF_RSP_OKAY ); -push_tx_responses (queue); -spin_unlock_irqrestore (&queue->response_lock, - flags);continue ; }
@@ -997,7 +981,6 @@ static void xenvif_tx_build_gops(struct (ret ==0 ) ?XEN_NETIF_RSP_OKAY : XEN_NETIF_RSP_ERROR); -push_tx_responses (queue);continue ; }
@@ -1009,7 +992,6 @@ static void xenvif_tx_build_gops(structmake_tx_response (queue, &txreq, extra_count,XEN_NETIF_RSP_OKAY ); -push_tx_responses (queue);continue ; }
@@ -1444,8 +1426,35 @@ int xenvif_tx_action(struct xenvif_queuereturn work_done; } +static void _make_tx_response (struct xenvif_queue *queue, +const struct xen_netif_tx_request *txp, +unsigned int extra_count, +s8 status) +{ +RING_IDX i = queue->tx.rsp_prod_pvt; +struct xen_netif_tx_response *resp; + + resp =RING_GET_RESPONSE (&queue->tx, i); + resp->id = txp->id; + resp->status = status; + +while (extra_count-- !=0 ) +RING_GET_RESPONSE (&queue->tx, ++i)->status =XEN_NETIF_RSP_NULL ; + + queue->tx.rsp_prod_pvt = ++i; +} + +static void push_tx_responses (struct xenvif_queue *queue) +{ +int notify; + +RING_PUSH_RESPONSES_AND_CHECK_NOTIFY (&queue->tx, notify); +if (notify) +notify_remote_via_irq (queue->tx_irq); +} +static void xenvif_idx_release (struct xenvif_queue *queue,u16 pending_idx, -u8 status) +s8 status) {struct pending_tx_info *pending_tx_info;pending_ring_idx_t index;
@@ -1455,8 +1464,8 @@ static void xenvif_idx_release(struct xespin_lock_irqsave (&queue->response_lock, flags); -make_tx_response (queue, &pending_tx_info->req, - pending_tx_info->extra_count, status); +_make_tx_response (queue, &pending_tx_info->req, + pending_tx_info->extra_count, status);/* Release the pending index before pusing the Tx response so * its available before a new Tx request is pushed by the
@@ -1470,32 +1479,19 @@ static void xenvif_idx_release(struct xespin_unlock_irqrestore (&queue->response_lock, flags); } -static void make_tx_response (struct xenvif_queue *queue, -struct xen_netif_tx_request *txp, +const struct xen_netif_tx_request *txp,unsigned int extra_count, -s8 st) +s8 status) { -RING_IDX i = queue->tx.rsp_prod_pvt; -struct xen_netif_tx_response *resp; - - resp =RING_GET_RESPONSE (&queue->tx, i); - resp->id = txp->id; - resp->status = st; - -while (extra_count-- !=0 ) -RING_GET_RESPONSE (&queue->tx, ++i)->status =XEN_NETIF_RSP_NULL ; +unsigned long flags; - queue->tx.rsp_prod_pvt = ++i; -} +spin_lock_irqsave (&queue->response_lock, flags); -static void push_tx_responses (struct xenvif_queue *queue) -{ -int notify; +_make_tx_response (queue, txp, extra_count, status); +push_tx_responses (queue); -RING_PUSH_RESPONSES_AND_CHECK_NOTIFY (&queue->tx, notify); -if (notify) -notify_remote_via_irq (queue->tx_irq); +spin_unlock_irqrestore (&queue->response_lock, flags); }static void xenvif_idx_unmap (struct xenvif_queue *queue,u16 pending_idx)
Greg Kroah-Hartman
maintainerPATCH 86/197 modpost: propagate W=1 build option to modpost
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit 20ff36856fe00879f82de71fe6f1482ca1b72334 upstream.
"No build warning" is a strong requirement these days, so you must fix all issues before enabling a new warning flag.
We often add a new warning to W=1 first so that the kbuild test robot blocks new breakages.
This commit allows modpost to show extra warnings only when W=1 (or KBUILD_EXTRA_WARN=1) is given.
Stable-dep-of: 846cfbeed09b ("um: Fix adding '-no-pie' for clang")
--- scripts/Makefile.modpost | 1 + scripts/mod/modpost.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
scripts/Makefile.modpost +1 -0
@@ -44,6 +44,7 @@ modpost-args = \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \ $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N) \ + $(if $(findstring 1, $(KBUILD_EXTRA_WARN)),-W) \ -o $@ # 'make -i -k' ignores compile errors, and builds as many modules as possible.
scripts/mod/modpost.c +6 -1
@@ -41,6 +41,8 @@ static bool allow_missing_ns_imports;static bool error_occurred; +static bool extra_warn; +/* * Cut off the warnings when there are too many. This typically occurs when * vmlinux is missing. ('make modules' without building vmlinux.)
@@ -2290,7 +2292,7 @@ int main(int argc, char **argv)LIST_HEAD (dump_lists);struct dump_list *dl, *dl2; -while ((opt =getopt (argc, argv,"ei:mnT:o:awENd:" )) !=-1 ) { +while ((opt =getopt (argc, argv,"ei:mnT:o:aWwENd:" )) !=-1 ) {switch (opt) {case 'e' : external_module = true;
@@ -2315,6 +2317,9 @@ int main(int argc, char **argv)case 'T' : files_source = optarg;break ; +case 'W' : + extra_warn = true; +break ;case 'w' : warn_unresolved = true;break ;
Greg Kroah-Hartman
maintainerPATCH 87/197 modpost: Dont let "driver"s reference .exit.*
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Uwe Kleine-König" <[email protected]>
commit f177cd0c15fcc7bdbb68d8d1a3166dead95314c8 upstream.
Drivers must not reference functions marked with __exit as these likely are not available when the code is built-in.
There are few creative offenders uncovered for example in ARCH=amd64 allmodconfig builds. So only trigger the section mismatch warning for W=1 builds.
The dual rule that drivers must not reference .init.* is implemented since commit 0db252452378 ("modpost: don't allow *driver to reference .init.*") which however missed that .exit.* should be handled in the same way.
Thanks to Masahiro Yamada and Arnd Bergmann who gave valuable hints to find this improvement.
Stable-dep-of: 846cfbeed09b ("um: Fix adding '-no-pie' for clang")
--- scripts/mod/modpost.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
scripts/mod/modpost.c +13 -2
@@ -1087,9 +1087,20 @@ static int secref_whitelist(const struct "*_console")))return 0 ; -/* symbols in data sections that may refer to meminit/exit sections */ +/* symbols in data sections that may refer to meminit sections */ if (match (fromsec,PATTERNS (DATA_SECTIONS )) && -match (tosec,PATTERNS (ALL_XXXINIT_SECTIONS ,ALL_EXIT_SECTIONS )) && +match (tosec,PATTERNS (ALL_XXXINIT_SECTIONS ,ALL_XXXEXIT_SECTIONS )) && +match (fromsym,PATTERNS ("*driver" ))) +return 0 ; + +/* +* symbols in data sections must not refer to .exit.*, but there are +* quite a few offenders, so hide these unless for W=1 builds until +* these are fixed. +*/ +if (!extra_warn && +match (fromsec,PATTERNS (DATA_SECTIONS )) && +match (tosec,PATTERNS (EXIT_SECTIONS )) &&match (fromsym,PATTERNS ("*driver" )))return 0 ;
Greg Kroah-Hartman
maintainerPATCH 88/197 linux/init: remove __memexit* annotations
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit 6a4e59eeedc3018cb57722eecfcbb49431aeb05f upstream.
We have never used __memexit, __memexitdata, or __memexitconst.
These were unneeded.
[nathan: Remove additional case of XXXEXIT_TO_SOME_EXIT due to lack of
78dac1a22944 in 6.1]
Stable-dep-of: 846cfbeed09b ("um: Fix adding '-no-pie' for clang")
--- include/asm-generic/vmlinux.lds.h | 6 ------ include/linux/init.h | 3 --- scripts/mod/modpost.c | 16 +++------------- 3 files changed, 3 insertions(+), 22 deletions(-)
include/asm-generic/vmlinux.lds.h +0 -6
@@ -351,7 +351,6 @@ *(.ref.data) \ *(.data..shared_aligned) /* percpu related */ \ MEM_KEEP(init.data*) \ - MEM_KEEP(exit.data*) \ *(.data.unlikely) \ __start_once = .; \ *(.data.once) \
@@ -546,7 +545,6 @@ __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \ *(.ref.rodata) \ MEM_KEEP(init.rodata) \ - MEM_KEEP(exit.rodata) \ } \ \/* Built-in module parameters. */ \
@@ -601,7 +599,6 @@ *(.ref.text) \ *(.text.asan.* .text.tsan.*) \ MEM_KEEP(init.text*) \ - MEM_KEEP(exit.text*) \/* sched.text is aling to function alignment to secure we have same
@@ -751,13 +748,10 @@ *(.exit.data .exit.data.*) \ *(.fini_array .fini_array.*) \ *(.dtors .dtors.*) \ - MEM_DISCARD(exit.data*) \ - MEM_DISCARD(exit.rodata*) #define EXIT_TEXT \ *(.exit.text) \ *(.text.exit) \ - MEM_DISCARD(exit.text) #define EXIT_CALL \ *(.exitcall.exit)
include/linux/init.h +0 -3
@@ -87,9 +87,6 @@ __latent_entropy#define __meminitdata __section(".meminit.data")#define __meminitconst __section(".meminit.rodata") -#define __memexit __section(".memexit.text") __exitused __cold notrace -#define __memexitdata __section(".memexit.data") -#define __memexitconst __section(".memexit.rodata")/* For assembly routines */ #define __HEAD .section ".head.text","ax"
scripts/mod/modpost.c +3 -13
@@ -811,7 +811,7 @@ static void check_section(const char *mo#define ALL_INIT_TEXT_SECTIONS \ ".init.text", ".meminit.text"#define ALL_EXIT_TEXT_SECTIONS \ - ".exit.text", ".memexit.text" + ".exit.text"#define ALL_PCI_INIT_SECTIONS \ ".pci_fixup_early", ".pci_fixup_header", ".pci_fixup_final", \
@@ -819,10 +819,9 @@ static void check_section(const char *mo ".pci_fixup_resume_early", ".pci_fixup_suspend"#define ALL_XXXINIT_SECTIONS MEM_INIT_SECTIONS -#define ALL_XXXEXIT_SECTIONS MEM_EXIT_SECTIONS#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS -#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS +#define ALL_EXIT_SECTIONS EXIT_SECTIONS#define DATA_SECTIONS ".data", ".data.rel"#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
@@ -835,7 +834,6 @@ static void check_section(const char *mo#define MEM_INIT_SECTIONS ".meminit.*"#define EXIT_SECTIONS ".exit.*" -#define MEM_EXIT_SECTIONS ".memexit.*"#define ALL_TEXT_SECTIONS ALL_INIT_TEXT_SECTIONS, ALL_EXIT_TEXT_SECTIONS, \ TEXT_SECTIONS, OTHER_TEXT_SECTIONS
@@ -864,7 +862,6 @@ enum mismatch {TEXT_TO_ANY_EXIT ,DATA_TO_ANY_EXIT ,XXXINIT_TO_SOME_INIT , -XXXEXIT_TO_SOME_EXIT ,ANY_INIT_TO_ANY_EXIT ,ANY_EXIT_TO_ANY_INIT , EXPORT_TO_INIT_EXIT,
@@ -939,12 +936,6 @@ static const struct sectioncheck section .bad_tosec = { INIT_SECTIONS, NULL }, .mismatch = XXXINIT_TO_SOME_INIT, }, -/* Do not reference exit code/data from memexit code/data */ -{ - .fromsec = { ALL_XXXEXIT_SECTIONS, NULL }, - .bad_tosec = { EXIT_SECTIONS, NULL }, - .mismatch = XXXEXIT_TO_SOME_EXIT, -}, /* Do not use exit code/data from init code */ { .fromsec = { ALL_INIT_SECTIONS, NULL },
@@ -1089,7 +1080,7 @@ static int secref_whitelist(const struct/* symbols in data sections that may refer to meminit sections */ if (match (fromsec,PATTERNS (DATA_SECTIONS )) && -match (tosec,PATTERNS (ALL_XXXINIT_SECTIONS ,ALL_XXXEXIT_SECTIONS )) && +match (tosec,PATTERNS (ALL_XXXINIT_SECTIONS )) &&match (fromsym,PATTERNS ("*driver" )))return 0 ;
@@ -1267,7 +1258,6 @@ static void report_sec_mismatch(const chcase TEXT_TO_ANY_EXIT :case DATA_TO_ANY_EXIT :case XXXINIT_TO_SOME_INIT : -case XXXEXIT_TO_SOME_EXIT :case ANY_INIT_TO_ANY_EXIT :case ANY_EXIT_TO_ANY_INIT : warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n",
Greg Kroah-Hartman
maintainerPATCH 89/197 modpost: Include .text.* in TEXT_SECTIONS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 19331e84c3873256537d446afec1f6c507f8c4ef upstream.
Commit 6c730bfc894f ("modpost: handle -ffunction-sections") added ".text.*" to the OTHER_TEXT_SECTIONS macro to fix certain section mismatch warnings. Unfortunately, this makes it impossible for modpost to warn about section mismatches with LTO, which implies '-ffunction-sections', as all functions are put in their own '.text.<func_name>' sections, which may still reference functions in sections they are not supposed to, such as __init.
Fix this by moving ".text.*" into TEXT_SECTIONS, so that configurations with '-ffunction-sections' will see warnings about mismatched sections.
Stable-dep-of: 846cfbeed09b ("um: Fix adding '-no-pie' for clang")
--- scripts/mod/modpost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/mod/modpost.c +2 -2
@@ -824,10 +824,10 @@ static void check_section(const char *mo#define ALL_EXIT_SECTIONS EXIT_SECTIONS#define DATA_SECTIONS ".data", ".data.rel" -#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \ +#define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \ ".kprobes.text", ".cpuidle.text", ".noinstr.text"#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ - ".fixup", ".entry.text", ".exception.text", ".text.*", \ + ".fixup", ".entry.text", ".exception.text", \ ".coldtext", ".softirqentry.text"#define INIT_SECTIONS ".init.*"
Greg Kroah-Hartman
maintainerPATCH 90/197 um: Fix adding -no-pie for clang
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 846cfbeed09b45d985079a9173cf390cc053715b upstream.
The kernel builds with -fno-PIE, so commit 883354afbc10 ("um: link vmlinux with -no-pie") added the compiler linker flag '-no-pie' via cc-option because '-no-pie' was only supported in GCC 6.1.0 and newer.
While this works for GCC, this does not work for clang because cc-option uses '-c', which stops the pipeline right before linking, so '-no-pie' is unconsumed and clang warns, causing cc-option to fail just as it would if the option was entirely unsupported:
$ clang -Werror -no-pie -c -o /dev/null -x c /dev/null clang-16: error: argument unused during compilation: '-no-pie' [-Werror,-Wunused-command-line-argument]
A recent version of clang exposes this because it generates a relocation under '-mcmodel=large' that is not supported in PIE mode:
/usr/sbin/ld: init/main.o: relocation R_X86_64_32 against symbol `saved_command_line' can not be used when making a PIE object; recompile with -fPIE /usr/sbin/ld: failed to set dynamic section sizes: bad value
clang: error: linker command failed with exit code 1 (use -v to see invocation)
Remove the cc-option check altogether. It is wasteful to invoke the compiler to check for '-no-pie' because only one supported compiler version does not support it, GCC 5.x (as it is supported with the minimum version of clang and GCC 6.1.0+). Use a combination of the gcc-min-version macro and CONFIG_CC_IS_CLANG to unconditionally add '-no-pie' with CONFIG_LD_SCRIPT_DYN=y, so that it is enabled with all compilers that support this. Furthermore, using gcc-min-version can help turn this back into
LINK-$(CONFIG_LD_SCRIPT_DYN) += -no-pie
when the minimum version of GCC is bumped past 6.1.0.
--- arch/um/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/um/Makefile +3 -1
@@ -118,7 +118,9 @@ archprepare: $(Q)$(MAKE) $(build)=$(HOST_DIR)/um include/generated/user_constants.h LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static -LINK-$(CONFIG_LD_SCRIPT_DYN) += $(call cc-option, -no-pie) +ifdef CONFIG_LD_SCRIPT_DYN +LINK-$(call gcc-min-version, 60100)$(CONFIG_CC_IS_CLANG) += -no-pie +endif LINK-$(CONFIG_LD_SCRIPT_DYN_RPATH) += -Wl,-rpath,/lib CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
Greg Kroah-Hartman
maintainerPATCH 91/197 modpost: Add .ltext and .ltext.* to TEXT_SECTIONS
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 397586506c3da005b9333ce5947ad01e8018a3be upstream.
After the linked LLVM change, building ARCH=um defconfig results in a segmentation fault in modpost. Prior to commit a23e7584ecf3 ("modpost:
unify 'sym' and 'to' in default_mismatch_handler()"), there was a warning:
WARNING: modpost: vmlinux.o(__ex_table+0x88): Section mismatch in reference to the .ltext:(unknown)
WARNING: modpost: The relocation at __ex_table+0x88 references
section ".ltext" which is not in the list of
authorized sections. If you're adding a new section
and/or if this reference is valid, add ".ltext" to the
list of authorized sections to jump to on fault.
This can be achieved by adding ".ltext" to
OTHER_TEXT_SECTIONS in scripts/mod/modpost.c.
The linked LLVM change moves global objects to the '.ltext' (and '.ltext.*' with '-ffunction-sections') sections with '-mcmodel=large', which ARCH=um uses. These sections should be handled just as '.text' and '.text.*' are, so add them to TEXT_SECTIONS.
--- scripts/mod/modpost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/mod/modpost.c +2 -1
@@ -825,7 +825,8 @@ static void check_section(const char *mo#define DATA_SECTIONS ".data", ".data.rel"#define TEXT_SECTIONS ".text", ".text.*", ".sched.text", \ - ".kprobes.text", ".cpuidle.text", ".noinstr.text" + ".kprobes.text", ".cpuidle.text", ".noinstr.text", \ + ".ltext", ".ltext.*"#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \ ".fixup", ".entry.text", ".exception.text", \ ".coldtext", ".softirqentry.text"
Greg Kroah-Hartman
maintainerPATCH 92/197 ALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edson Juliano Drosdeck <[email protected]>
commit c7de2d9bb68a5fc71c25ff96705a80a76c8436eb upstream.
Vaio VJFE-ADL is equipped with ALC269VC, and it needs ALC298_FIXUP_SPK_VOLUME quirk to make its headset mic work.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10053,6 +10053,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1d72 ,0x1945 ,"Redmi G" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1d72 ,0x1947 ,"RedmiBook Air" ,ALC255_FIXUP_XIAOMI_HEADSET_MIC ),SND_PCI_QUIRK (0x2782 ,0x0232 ,"CHUWI CoreBook XPro" ,ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO ), +SND_PCI_QUIRK (0x2782 ,0x1707 ,"Vaio VJFE-ADL" ,ALC298_FIXUP_SPK_VOLUME ),SND_PCI_QUIRK (0x8086 ,0x2074 ,"Intel NUC 8" ,ALC233_FIXUP_INTEL_NUC8_DMIC ),SND_PCI_QUIRK (0x8086 ,0x2080 ,"Intel NUC 8 Rugged" ,ALC256_FIXUP_INTEL_NUC8_RUGGED ), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),
Greg Kroah-Hartman
maintainerPATCH 93/197 ASoC: codecs: wcd938x: handle deferred probe
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit 086df711d9b886194481b4fbe525eb43e9ae7403 upstream.
WCD938x sound codec driver ignores return status of getting regulators and returns EINVAL instead of EPROBE_DEFER. If regulator provider probes after the codec, system is left without probed audio:
wcd938x_codec audio-codec: wcd938x_probe: Fail to obtain platform data
wcd938x_codec: probe of audio-codec failed with error -22
--- sound/soc/codecs/wcd938x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wcd938x.c +1 -1
@@ -3588,7 +3588,7 @@ static int wcd938x_probe(struct platform ret =wcd938x_populate_dt_data (wcd938x, dev);if (ret) {dev_err (dev,"%s: Fail to obtain platform data\n" , __func__); -return -EINVAL ; +return ret; } ret =wcd938x_add_slave_components (wcd938x, dev, &match);
Greg Kroah-Hartman
maintainerPATCH 94/197 ALSA: hda/cs8409: Suppress vmaster control for Dolphin models
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Rodionov <[email protected]>
commit a2ed0a44d637ef9deca595054c206da7d6cbdcbc upstream.
Customer has reported an issue with specific desktop platform where two CS42L42 codecs are connected to CS8409 HDA bridge. If "Master Volume Control" is created then on Ubuntu OS UCM left/right balance slider in UI audio settings has no effect. This patch will fix this issue for a target paltform.
--- sound/pci/hda/patch_cs8409.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_cs8409.c +1 -0
@@ -1371,6 +1371,7 @@ void dolphin_fixups(struct hda_codec *co spec->scodecs[CS8409_CODEC1 ] = &dolphin_cs42l42_1; spec->scodecs[CS8409_CODEC1 ]->codec = codec; spec->num_scodecs =2 ; + spec->gen.suppress_vmaster =1 ; codec->patch_ops = cs8409_dolphin_patch_ops;
Greg Kroah-Hartman
maintainerPATCH 95/197 ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Chi <[email protected]>
commit 1513664f340289cf10402753110f3cff12a738aa upstream.
The HP ZBook Power using ALC236 codec which using 0x02 to control mute LED and 0x01 to control micmute LED. Therefore, add a quirk to make it works.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9726,6 +9726,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8c72 ,"HP EliteBook 865 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c96 ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8c97 ,"HP ZBook" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), +SND_PCI_QUIRK (0x103c ,0x8ca1 ,"HP ZBook Power" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8ca2 ,"HP ZBook Power" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ca4 ,"HP ZBook Fury" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ca7 ,"HP ZBook Fury" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 96/197 binder: signal epoll threads of self-work
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 97830f3c3088638ff90b20dfba2eb4d487bf14d7 upstream.
In (e)poll mode, threads often depend on I/O events to determine when data is ready for consumption. Within binder, a thread may initiate a command via BINDER_WRITE_READ without a read buffer and then make use of epoll_wait() or similar to consume any responses afterwards.
It is then crucial that epoll threads are signaled via wakeup when they queue their own work. Otherwise, they risk waiting indefinitely for an event leaving their work unhandled. What is worse, subsequent commands won't trigger a wakeup either as the thread has pending work.
--- drivers/android/binder.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/android/binder.c +10 -0
@@ -477,6 +477,16 @@ binder_enqueue_thread_work_ilocked(struc {WARN_ON (!list_empty (&thread->waiting_thread_node));binder_enqueue_work_ilocked (work, &thread->todo); + +/* (e)poll-based threads require an explicit wakeup signal when +* queuing their own work; they rely on these events to consume +* messages without I/O block. Without it, threads risk waiting +* indefinitely without handling the work. +*/ +if (thread->looper &BINDER_LOOPER_STATE_POLL && + thread->pid == current->pid && !thread->process_todo) +wake_up_interruptible_sync (&thread->wait); + thread->process_todo = true; }
Greg Kroah-Hartman
maintainerPATCH 97/197 misc: fastrpc: Mark all sessions as invalid in cb_remove
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ekansh Gupta <[email protected]>
commit a4e61de63e34860c36a71d1a364edba16fb6203b upstream.
In remoteproc shutdown sequence, rpmsg_remove will get called which would depopulate all the child nodes that have been created during rpmsg_probe. This would result in cb_remove call for all the context banks for the remoteproc. In cb_remove function, session 0 is getting skipped which is not correct as session 0 will never become available again. Add changes to mark session 0 also as invalid.
--- drivers/misc/fastrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/fastrpc.c +1 -1
@@ -1990,7 +1990,7 @@ static int fastrpc_cb_remove(struct platint i;spin_lock_irqsave (&cctx->lock, flags); -for (i =1 ; i <FASTRPC_MAX_SESSIONS ; i++) { +for (i =0 ; i <FASTRPC_MAX_SESSIONS ; i++) {if (cctx->session[i].sid == sess->sid) { cctx->session[i].valid = false; cctx->sesscount--;
Greg Kroah-Hartman
maintainerPATCH 98/197 ext4: fix double-free of blocks due to wrong extents moved_len
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
commit 55583e899a5357308274601364741a83e78d6ac4 upstream.
In ext4_move_extents(), moved_len is only updated when all moves are successfully executed, and only discards orig_inode and donor_inode preallocations when moved_len is not zero. When the loop fails to exit after successfully moving some extents, moved_len is not updated and remains at 0, so it does not discard the preallocations.
If the moved extents overlap with the preallocated extents, the overlapped extents are freed twice in ext4_mb_release_inode_pa() and ext4_process_freed_data() (as described in commit 94d7c16cbbbd ("ext4:
Fix double-free of blocks with EXT4_IOC_MOVE_EXT")), and bb_free is incremented twice. Hence when trim is executed, a zero-division bug is triggered in mb_update_avg_fragment_size() because bb_free is not zero and bb_fragments is zero.
Therefore, update move_len after each extent move to avoid the issue.
--- fs/ext4/move_extent.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/ext4/move_extent.c +2 -4
@@ -621,6 +621,7 @@ ext4_move_extents(struct file *o_filp, s goto out; o_end = o_start + len; + *moved_len =0 ;while (o_start < o_end) {struct ext4_extent *ex;ext4_lblk_t cur_blk, next_blk;
@@ -675,7 +676,7 @@ ext4_move_extents(struct file *o_filp, s*/ ext4_double_up_write_data_sem (orig_inode, donor_inode);/* Swap original branches with new branches */ -move_extent_per_page (o_filp, donor_inode, + *moved_len +=move_extent_per_page (o_filp, donor_inode, orig_page_index, donor_page_index, offset_in_page, cur_len, unwritten, &ret);
@@ -685,9 +686,6 @@ ext4_move_extents(struct file *o_filp, s o_start += cur_len; d_start += cur_len; } - *moved_len = o_start - orig_blk; -if (*moved_len > len) - *moved_len = len; out:if (*moved_len) {
Greg Kroah-Hartman
maintainerPATCH 99/197 ext4: avoid bb_free and bb_fragments inconsistency in mb_free_blocks()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
commit 2331fd4a49864e1571b4f50aa3aa1536ed6220d0 upstream.
After updating bb_free in mb_free_blocks, it is possible to return without updating bb_fragments because the block being freed is found to have already been freed, which leads to inconsistency between bb_free and bb_fragments.
Since the group may be unlocked in ext4_grp_locked_error(), this can lead to problems such as dividing by zero when calculating the average fragment length. Hence move the update of bb_free to after the block double-free check guarantees that the corresponding statistics are updated only after the core block bitmap is modified.
--- fs/ext4/mballoc.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-)
fs/ext4/mballoc.c +21 -18
@@ -1785,11 +1785,6 @@ static void mb_free_blocks(struct inodemb_check_buddy (e4b);mb_free_blocks_double (inode, e4b, first, count); -this_cpu_inc (discard_pa_seq); - e4b->bd_info->bb_free += count; -if (first < e4b->bd_info->bb_first_free) - e4b->bd_info->bb_first_free = first; -/* access memory sequentially: check left neighbour, * clear range and then check right neighbour */
@@ -1803,23 +1798,31 @@ static void mb_free_blocks(struct inodestruct ext4_sb_info *sbi =EXT4_SB (sb);ext4_fsblk_t blocknr; +/* +* Fastcommit replay can free already freed blocks which +* corrupts allocation info. Regenerate it. +*/ +if (sbi->s_mount_state &EXT4_FC_REPLAY ) { +mb_regenerate_buddy (e4b); + goto check; + } + blocknr =ext4_group_first_block_no (sb, e4b->bd_group); blocknr +=EXT4_C2B (sbi, block); -if (!(sbi->s_mount_state &EXT4_FC_REPLAY )) { -ext4_grp_locked_error (sb, e4b->bd_group, - inode ? inode->i_ino :0 , - blocknr, -"freeing already freed block (bit %u); block bitmap corrupt." , - block); -ext4_mark_group_bitmap_corrupted ( - sb, e4b->bd_group, +ext4_grp_locked_error (sb, e4b->bd_group, + inode ? inode->i_ino :0 , blocknr, +"freeing already freed block (bit %u); block bitmap corrupt." , + block); +ext4_mark_group_bitmap_corrupted (sb, e4b->bd_group,EXT4_GROUP_INFO_BBITMAP_CORRUPT ); - }else { -mb_regenerate_buddy (e4b); - } - goto done; +return ; } +this_cpu_inc (discard_pa_seq); + e4b->bd_info->bb_free += count; +if (first < e4b->bd_info->bb_first_free) + e4b->bd_info->bb_first_free = first; +/* let's maintain fragments counter */ if (left_is_free && right_is_free) e4b->bd_info->bb_fragments--;
@@ -1844,9 +1847,9 @@ static void mb_free_blocks(struct inodeif (first <= last)mb_buddy_mark_free (e4b, first >>1 , last >>1 ); -done:mb_set_largest_free_order (sb, e4b->bd_info);mb_update_avg_fragment_size (sb, e4b->bd_info); +check:mb_check_buddy (e4b); }
Greg Kroah-Hartman
maintainerPATCH 100/197 tracing: Fix wasted memory in saved_cmdlines logic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 44dc5c41b5b1267d4dd037d26afc0c4d3a568acb upstream.
While looking at improving the saved_cmdlines cache I found a huge amount of wasted memory that should be used for the cmdlines.
The tracing data saves pids during the trace. At sched switch, if a trace occurred, it will save the comm of the task that did the trace. This is saved in a "cache" that maps pids to comms and exposed to user space via the /sys/kernel/tracing/saved_cmdlines file. Currently it only caches by default 128 comms.
The structure that uses this creates an array to store the pids using PID_MAX_DEFAULT (which is usually set to 32768). This causes the structure to be of the size of 131104 bytes on 64 bit machines.
In hex: 131104 = 0x20020, and since the kernel allocates generic memory in powers of two, the kernel would allocate 0x40000 or 262144 bytes to store this structure. That leaves 131040 bytes of wasted space.
Worse, the structure points to an allocated array to store the comm names, which is 16 bytes times the amount of names to save (currently 128), which is 2048 bytes. Instead of allocating a separate array, make the structure end with a variable length string and use the extra space for that.
This is similar to a recommendation that Linus had made about eventfs_inode names:
https://lore.kernel.org/all/[email protected]/
Instead of allocating a separate string array to hold the saved comms,
have the structure end with: char saved_cmdlines[]; and round up to the next power of two over sizeof(struct saved_cmdline_buffers) + num_cmdlines * TASK_COMM_LEN It will use this extra space for the saved_cmdline portion.
Now, instead of saving only 128 comms by default, by using this wasted space at the end of the structure it can save over 8000 comms and even saves space by removing the need for allocating the other array.
--- kernel/trace/trace.c | 75 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 38 deletions(-)
kernel/trace/trace.c +37 -38
@@ -2249,7 +2249,7 @@ struct saved_cmdlines_buffer {unsigned *map_cmdline_to_pid;unsigned cmdline_num;int cmdline_idx; -char *saved_cmdlines; +char saved_cmdlines[]; };static struct saved_cmdlines_buffer *savedcmd;
@@ -2263,47 +2263,58 @@ static inline void set_cmdline(int idx,strncpy (get_saved_cmdlines (idx), cmdline,TASK_COMM_LEN ); } -static int allocate_cmdlines_buffer (unsigned int val, -struct saved_cmdlines_buffer *s) +static void free_saved_cmdlines_buffer (struct saved_cmdlines_buffer *s) { +int order =get_order (sizeof (*s) + s->cmdline_num *TASK_COMM_LEN ); + +kfree (s->map_cmdline_to_pid); +free_pages ((unsigned long )s, order); +} + +static struct saved_cmdlines_buffer *allocate_cmdlines_buffer (unsigned int val) +{ +struct saved_cmdlines_buffer *s; +struct page *page; +int orig_size, size; +int order; + +/* Figure out how much is needed to hold the given number of cmdlines */ + orig_size =sizeof (*s) + val *TASK_COMM_LEN ; + order =get_order (orig_size); + size =1 << (order +PAGE_SHIFT ); + page =alloc_pages (GFP_KERNEL , order); +if (!page) +return NULL ; + + s =page_address (page); +memset (s,0 ,sizeof (*s)); + +/* Round up to actual allocation */ + val = (size -sizeof (*s)) /TASK_COMM_LEN ; + s->cmdline_num = val; + s->map_cmdline_to_pid =kmalloc_array (val,sizeof (*s->map_cmdline_to_pid),GFP_KERNEL ); -if (!s->map_cmdline_to_pid) -return -ENOMEM ; - - s->saved_cmdlines =kmalloc_array (TASK_COMM_LEN , val,GFP_KERNEL ); -if (!s->saved_cmdlines) { -kfree (s->map_cmdline_to_pid); -return -ENOMEM ; +if (!s->map_cmdline_to_pid) { +free_saved_cmdlines_buffer (s); +return NULL ; } s->cmdline_idx =0 ; - s->cmdline_num = val;memset (&s->map_pid_to_cmdline,NO_CMDLINE_MAP ,sizeof (s->map_pid_to_cmdline));memset (s->map_cmdline_to_pid,NO_CMDLINE_MAP , val *sizeof (*s->map_cmdline_to_pid)); -return 0 ; +return s; }static int trace_create_savedcmd (void ) { -int ret; - - savedcmd =kmalloc (sizeof (*savedcmd),GFP_KERNEL ); -if (!savedcmd) -return -ENOMEM ; + savedcmd =allocate_cmdlines_buffer (SAVED_CMDLINES_DEFAULT ); - ret =allocate_cmdlines_buffer (SAVED_CMDLINES_DEFAULT , savedcmd); -if (ret <0 ) { -kfree (savedcmd); - savedcmd =NULL ; -return -ENOMEM ; - } - -return 0 ; +return savedcmd ?0 : -ENOMEM ; }int is_tracing_stopped (void )
@@ -5972,26 +5983,14 @@ tracing_saved_cmdlines_size_read(structreturn simple_read_from_buffer (ubuf, cnt, ppos, buf, r); } -static void free_saved_cmdlines_buffer (struct saved_cmdlines_buffer *s) -{ -kfree (s->saved_cmdlines); -kfree (s->map_cmdline_to_pid); -kfree (s); -} -static int tracing_resize_saved_cmdlines (unsigned int val) {struct saved_cmdlines_buffer *s, *savedcmd_temp; - s =kmalloc (sizeof (*s),GFP_KERNEL ); + s =allocate_cmdlines_buffer (val);if (!s)return -ENOMEM ; -if (allocate_cmdlines_buffer (val, s) <0 ) { -kfree (s); -return -ENOMEM ; - } -preempt_disable ();arch_spin_lock (&trace_cmdline_lock); savedcmd_temp = savedcmd;
Greg Kroah-Hartman
maintainerPATCH 101/197 staging: iio: ad5933: fix type mismatch regression
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Schiller <[email protected]>
commit 6db053cd949fcd6254cea9f2cd5d39f7bd64379c upstream.
Commit 4c3577db3e4f ("Staging: iio: impedance-analyzer: Fix sparse warning") fixed a compiler warning, but introduced a bug that resulted in one of the two 16 bit IIO channels always being zero (when both are enabled).
This is because int is 32 bits wide on most architectures and in the case of a little-endian machine the two most significant bytes would occupy the buffer for the second channel as 'val' is being passed as a void pointer to 'iio_push_to_buffers()'.
Fix by defining 'val' as u16. Tested working on ARM64.
--- drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/impedance-analyzer/ad5933.c +1 -1
@@ -608,7 +608,7 @@ static void ad5933_work(struct work_stru struct ad5933_state, work.work);struct iio_dev *indio_dev =i2c_get_clientdata (st->client);__be16 buf[2 ]; -int val[2 ]; +u16 val[2 ];unsigned char status;int ret;
Greg Kroah-Hartman
maintainerPATCH 102/197 iio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: zhili.liu <[email protected]>
commit 792595bab4925aa06532a14dd256db523eb4fa5e upstream.
Recently, we encounter kernel crash in function rm3100_common_probe caused by out of bound access of array rm3100_samp_rates (because of underlying hardware failures). Add boundary check to prevent out of bound access.
--- drivers/iio/magnetometer/rm3100-core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/iio/magnetometer/rm3100-core.c +8 -2
@@ -530,6 +530,7 @@ int rm3100_common_probe(struct device *dstruct rm3100_data *data;unsigned int tmp;int ret; +int samp_rate_index; indio_dev =devm_iio_device_alloc (dev,sizeof (*data));if (!indio_dev)
@@ -586,9 +587,14 @@ int rm3100_common_probe(struct device *d ret =regmap_read (regmap,RM3100_REG_TMRC , &tmp);if (ret <0 )return ret; + + samp_rate_index = tmp -RM3100_TMRC_OFFSET ; +if (samp_rate_index <0 || samp_rate_index >=RM3100_SAMP_NUM ) { +dev_err (dev,"The value read from RM3100_REG_TMRC is invalid!\n" ); +return -EINVAL ; + }/* Initializing max wait time, which is double conversion time. */ - data->conversion_time = rm3100_samp_rates[tmp -RM3100_TMRC_OFFSET ][2 ] - *2 ; + data->conversion_time = rm3100_samp_rates[samp_rate_index][2 ] *2 ;/* Cycle count values may not be what we want. */ if ((tmp -RM3100_TMRC_OFFSET ) ==0 )
Greg Kroah-Hartman
maintainerPATCH 103/197 iio: core: fix memleak in iio_device_register_sysfs
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dinghao Liu <[email protected]>
commit 95a0d596bbd0552a78e13ced43f2be1038883c81 upstream.
When iio_device_register_sysfs_group() fails, we should free iio_dev_opaque->chan_attr_group.attrs to prevent potential memleak.
--- drivers/iio/industrialio-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/industrialio-core.c +4 -1
@@ -1601,10 +1601,13 @@ static int iio_device_register_sysfs(str ret =iio_device_register_sysfs_group (indio_dev, &iio_dev_opaque->chan_attr_group);if (ret) - goto error_clear_attrs; + goto error_free_chan_attrs;return 0 ; +error_free_chan_attrs: +kfree (iio_dev_opaque->chan_attr_group.attrs); + iio_dev_opaque->chan_attr_group.attrs =NULL ; error_clear_attrs:iio_free_chan_devattr_list (&iio_dev_opaque->channel_attr_list);
Greg Kroah-Hartman
maintainerPATCH 104/197 iio: commom: st_sensors: ensure proper DMA alignment
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
commit 862cf85fef85becc55a173387527adb4f076fab0 upstream.
Aligning the buffer to the L1 cache is not sufficient in some platforms as they might have larger cacheline sizes for caches after L1 and thus, we can't guarantee DMA safety.
That was the whole reason to introduce IIO_DMA_MINALIGN in [1]. Do the same for st_sensors common buffer.
While at it, moved the odr_lock before buffer_data as we definitely don't want any other data to share a cacheline with the buffer.
[1]: https://lore.kernel.org/linux-iio/[email protected]/
--- include/linux/iio/common/st_sensors.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/iio/common/st_sensors.h +2 -2
@@ -261,9 +261,9 @@ struct st_sensor_data {bool hw_irq_trigger;s64 hw_timestamp; -char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE ]____cacheline_aligned ; -struct mutex odr_lock; + +char buffer_data[ST_SENSORS_MAX_BUFFER_SIZE ]__aligned(IIO_DMA_MINALIGN) ; };#ifdef CONFIG_IIO_BUFFER
Greg Kroah-Hartman
maintainerPATCH 105/197 iio: accel: bma400: Fix a compilation problem
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 4cb81840d8f29b66d9d05c6d7f360c9560f7e2f4 upstream.
The kernel fails when compiling without CONFIG_REGMAP_I2C but with CONFIG_BMA400.
``` ld: drivers/iio/accel/bma400_i2c.o: in function `bma400_i2c_probe': bma400_i2c.c:(.text+0x23): undefined reference to `__devm_regmap_init_i2c' ```
--- drivers/iio/accel/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/accel/Kconfig +2 -0
@@ -219,10 +219,12 @@ config BMA400 config BMA400_I2C tristate + select REGMAP_I2C depends on BMA400 config BMA400_SPI tristate + select REGMAP_SPI depends on BMA400 config BMC150_ACCEL
Greg Kroah-Hartman
maintainerPATCH 106/197 iio: adc: ad_sigma_delta: ensure proper DMA alignment
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
commit 59598510be1d49e1cff7fd7593293bb8e1b2398b upstream.
Aligning the buffer to the L1 cache is not sufficient in some platforms as they might have larger cacheline sizes for caches after L1 and thus, we can't guarantee DMA safety.
That was the whole reason to introduce IIO_DMA_MINALIGN in [1]. Do the same for the sigma_delta ADCs.
[1]: https://lore.kernel.org/linux-iio/[email protected]/
--- include/linux/iio/adc/ad_sigma_delta.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/linux/iio/adc/ad_sigma_delta.h +3 -1
@@ -8,6 +8,8 @@#ifndef __AD_SIGMA_DELTA_H__#define __AD_SIGMA_DELTA_H__ +#include <linux/iio/iio.h> +enum ad_sigma_delta_mode {AD_SD_MODE_CONTINUOUS =0 , AD_SD_MODE_SINGLE = 1,
@@ -99,7 +101,7 @@ struct ad_sigma_delta {* 'rx_buf' is up to 32 bits per sample + 64 bit timestamp, * rounded to 16 bytes to take into account padding. */ -uint8_t tx_buf[4 ]____cacheline_aligned ; +uint8_t tx_buf[4 ]__aligned(IIO_DMA_MINALIGN) ;uint8_t rx_buf[16 ]__aligned(8) ; };
Greg Kroah-Hartman
maintainerPATCH 107/197 iio: imu: adis: ensure proper DMA alignment
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
commit 8e98b87f515d8c4bae521048a037b2cc431c3fd5 upstream.
Aligning the buffer to the L1 cache is not sufficient in some platforms as they might have larger cacheline sizes for caches after L1 and thus, we can't guarantee DMA safety.
That was the whole reason to introduce IIO_DMA_MINALIGN in [1]. Do the same for the sigma_delta ADCs.
[1]: https://lore.kernel.org/linux-iio/[email protected]/
--- include/linux/iio/imu/adis.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/iio/imu/adis.h +2 -1
@@ -11,6 +11,7 @@#include <linux/spi/spi.h> #include <linux/interrupt.h> +#include <linux/iio/iio.h> #include <linux/iio/types.h> #define ADIS_WRITE_REG (reg) ((0x80 | (reg)))
@@ -131,7 +132,7 @@ struct adis {unsigned long irq_flag;void *buffer; -u8 tx[10 ]____cacheline_aligned ; +u8 tx[10 ]__aligned(IIO_DMA_MINALIGN) ;u8 rx[4 ]; };
Greg Kroah-Hartman
maintainerPATCH 108/197 iio: imu: bno055: serdev requires REGMAP
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
commit 35ec2d03b282a939949090bd8c39eb37a5856721 upstream.
There are a ton of build errors when REGMAP is not set, so select REGMAP to fix all of them.
Examples (not all of them):
../drivers/iio/imu/bno055/bno055_ser_core.c:495:15: error: variable 'bno055_ser_regmap_bus' has initializer but incomplete type
495 | static struct regmap_bus bno055_ser_regmap_bus = {../drivers/iio/imu/bno055/bno055_ser_core.c:496:10: error: 'struct regmap_bus' has no member named 'write'
496 | .write = bno055_ser_write_reg,../drivers/iio/imu/bno055/bno055_ser_core.c:497:10: error: 'struct regmap_bus' has no member named 'read'
497 | .read = bno055_ser_read_reg,../drivers/iio/imu/bno055/bno055_ser_core.c: In function 'bno055_ser_probe':../drivers/iio/imu/bno055/bno055_ser_core.c:532:18: error: implicit declaration of function 'devm_regmap_init'; did you mean 'vmem_map_init'? [-Werror=implicit-function-declaration]
532 | regmap = devm_regmap_init(&serdev->dev, &bno055_ser_regmap_bus,../drivers/iio/imu/bno055/bno055_ser_core.c:532:16: warning: assignment to 'struct regmap *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
532 | regmap = devm_regmap_init(&serdev->dev, &bno055_ser_regmap_bus,../drivers/iio/imu/bno055/bno055_ser_core.c: At top level:../drivers/iio/imu/bno055/bno055_ser_core.c:495:26: error: storage size of 'bno055_ser_regmap_bus' isn't known
495 | static struct regmap_bus bno055_ser_regmap_bus = {
--- drivers/iio/imu/bno055/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/iio/imu/bno055/Kconfig +1 -0
@@ -8,6 +8,7 @@ config BOSCH_BNO055 config BOSCH_BNO055_SERIAL tristate "Bosch BNO055 attached via UART" depends on SERIAL_DEV_BUS + select REGMAP select BOSCH_BNO055 help Enable this to support Bosch BNO055 IMUs attached via UART.
Signature · 1 line
2.43.2
Greg Kroah-Hartman
maintainerPATCH 109/197 media: rc: bpf attach/detach requires write permission
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
commit 6a9d552483d50953320b9d3b57abdee8d436f23f upstream.
Note that bpf attach/detach also requires CAP_NET_ADMIN.
--- drivers/media/rc/bpf-lirc.c | 6 +++--- drivers/media/rc/lirc_dev.c | 5 ++++- drivers/media/rc/rc-core-priv.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/media/rc/bpf-lirc.c +3 -3
@@ -253,7 +253,7 @@ int lirc_prog_attach(const union bpf_attif (attr->attach_flags)return -EINVAL ; - rcdev =rc_dev_get_from_fd (attr->target_fd); + rcdev =rc_dev_get_from_fd (attr->target_fd, true);if (IS_ERR (rcdev))return PTR_ERR (rcdev);
@@ -278,7 +278,7 @@ int lirc_prog_detach(const union bpf_attif (IS_ERR (prog))return PTR_ERR (prog); - rcdev =rc_dev_get_from_fd (attr->target_fd); + rcdev =rc_dev_get_from_fd (attr->target_fd, true);if (IS_ERR (rcdev)) {bpf_prog_put (prog);return PTR_ERR (rcdev);
@@ -303,7 +303,7 @@ int lirc_prog_query(const union bpf_attrif (attr->query.query_flags)return -EINVAL ; - rcdev =rc_dev_get_from_fd (attr->query.target_fd); + rcdev =rc_dev_get_from_fd (attr->query.target_fd, false);if (IS_ERR (rcdev))return PTR_ERR (rcdev);
drivers/media/rc/lirc_dev.c +4 -1
@@ -814,7 +814,7 @@ void __exit lirc_dev_exit(void)unregister_chrdev_region (lirc_base_dev,RC_DEV_MAX ); } -struct rc_dev *rc_dev_get_from_fd (int fd) +struct rc_dev *rc_dev_get_from_fd (int fd,bool write) {struct fd f =fdget (fd);struct lirc_fh *fh;
@@ -828,6 +828,9 @@ struct rc_dev *rc_dev_get_from_fd(int fdreturn ERR_PTR (-EINVAL ); } +if (write && !(f.file->f_mode &FMODE_WRITE )) +return ERR_PTR (-EPERM ); + fh = f.file->private_data; dev = fh->rc;
drivers/media/rc/rc-core-priv.h +1 -1
@@ -325,7 +325,7 @@ void lirc_raw_event(struct rc_dev *dev,void lirc_scancode_event (struct rc_dev *dev,struct lirc_scancode *lsc);int lirc_register (struct rc_dev *dev);void lirc_unregister (struct rc_dev *dev); -struct rc_dev *rc_dev_get_from_fd (int fd); +struct rc_dev *rc_dev_get_from_fd (int fd,bool write);#else static inline int lirc_dev_init (void ) {return 0 ; }static inline void lirc_dev_exit (void ) {}
Greg Kroah-Hartman
maintainerPATCH 110/197 ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 108a020c64434fed4b69762879d78cd24088b4c7 upstream.
ksmbd_iov_pin_rsp_read() doesn't free the provided aux buffer if it fails. Seems to be the caller's responsibility to clear the buffer in error case.
Found by Linux Verification Center (linuxtesting.org).
--- fs/smb/server/smb2pdu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/smb/server/smb2pdu.c +6 -2
@@ -6171,8 +6171,10 @@ static noinline int smb2_read_pipe(struc err =ksmbd_iov_pin_rsp_read (work, (void *)rsp, offsetof(struct smb2_read_rsp , Buffer), aux_payload_buf, nbytes); -if (err) +if (err) { +kvfree (aux_payload_buf); goto out; + }kvfree (rpc_resp); }else { err = ksmbd_iov_pin_rsp(work, (void *)rsp,
@@ -6382,8 +6384,10 @@ int smb2_read(struct ksmbd_work *work) err =ksmbd_iov_pin_rsp_read (work, (void *)rsp, offsetof(struct smb2_read_rsp , Buffer), aux_payload_buf, nbytes); -if (err) +if (err) { +kvfree (aux_payload_buf); goto out; + }ksmbd_fd_put (work, fp);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 111/197 xfrm: Remove inner/outer modes from output path
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit f4796398f21b9844017a2dac883b1dd6ad6edd60 upstream.
The inner/outer modes were added to abstract out common code that were once duplicated between IPv4 and IPv6. As time went on the abstractions have been removed and we are now left with empty shells that only contain duplicate information. These can be removed one-by-one as the same information is already present elsewhere in the xfrm_state object.
Just like the input-side, removing this from the output code makes it possible to use transport-mode SAs underneath an inter-family tunnel mode SA.
--- net/xfrm/xfrm_output.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)
net/xfrm/xfrm_output.c +11 -22
@@ -414,7 +414,7 @@ static int xfrm4_prepare_output(struct xIPCB (skb)->flags |=IPSKB_XFRM_TUNNEL_SIZE ; skb->protocol =htons (ETH_P_IP ); -switch (x->outer_mode.encap) { +switch (x->props.mode) {case XFRM_MODE_BEET :return xfrm4_beet_encap_add (x, skb);case XFRM_MODE_TUNNEL :
@@ -437,7 +437,7 @@ static int xfrm6_prepare_output(struct x skb->ignore_df =1 ; skb->protocol =htons (ETH_P_IPV6 ); -switch (x->outer_mode.encap) { +switch (x->props.mode) {case XFRM_MODE_BEET :return xfrm6_beet_encap_add (x, skb);case XFRM_MODE_TUNNEL :
@@ -453,22 +453,22 @@ static int xfrm6_prepare_output(struct xstatic int xfrm_outer_mode_output (struct xfrm_state *x,struct sk_buff *skb) { -switch (x->outer_mode.encap) { +switch (x->props.mode) {case XFRM_MODE_BEET :case XFRM_MODE_TUNNEL : -if (x->outer_mode.family ==AF_INET ) +if (x->props.family ==AF_INET )return xfrm4_prepare_output (x, skb); -if (x->outer_mode.family ==AF_INET6 ) +if (x->props.family ==AF_INET6 )return xfrm6_prepare_output (x, skb);break ;case XFRM_MODE_TRANSPORT : -if (x->outer_mode.family ==AF_INET ) +if (x->props.family ==AF_INET )return xfrm4_transport_output (x, skb); -if (x->outer_mode.family ==AF_INET6 ) +if (x->props.family ==AF_INET6 )return xfrm6_transport_output (x, skb);break ;case XFRM_MODE_ROUTEOPTIMIZATION : -if (x->outer_mode.family ==AF_INET6 ) +if (x->props.family ==AF_INET6 )return xfrm6_ro_output (x, skb);WARN_ON_ONCE (1 );break ;
@@ -866,21 +866,10 @@ static int xfrm6_extract_output(struct xstatic int xfrm_inner_extract_output (struct xfrm_state *x,struct sk_buff *skb) { -const struct xfrm_mode *inner_mode; - -if (x->sel.family ==AF_UNSPEC ) - inner_mode =xfrm_ip2inner_mode (x, -xfrm_af2proto (skb_dst (skb)->ops->family)); -else - inner_mode = &x->inner_mode; - -if (inner_mode ==NULL ) -return -EAFNOSUPPORT ; - -switch (inner_mode->family) { -case AF_INET : +switch (skb->protocol) { +case htons (ETH_P_IP ):return xfrm4_extract_output (x, skb); -case AF_INET6 : +case htons (ETH_P_IPV6 ):return xfrm6_extract_output (x, skb); }
Greg Kroah-Hartman
maintainerPATCH 112/197 xfrm: Remove inner/outer modes from input path
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit 5f24f41e8ea62a6a9095f9bbafb8b3aebe265c68 upstream.
The inner/outer modes were added to abstract out common code that were once duplicated between IPv4 and IPv6. As time went on the abstractions have been removed and we are now left with empty shells that only contain duplicate information. These can be removed one-by-one as the same information is already present elsewhere in the xfrm_state object.
Removing them from the input path actually allows certain valid combinations that are currently disallowed. In particular, when a transport mode SA sits beneath a tunnel mode SA that changes address families, at present the transport mode SA cannot have AF_UNSPEC as its selector because it will be erroneously be treated as inter-family itself even though it simply sits beneath one.
This is a serious problem because you can't set the selector to non-AF_UNSPEC either as that will cause the selector match to fail as we always match selectors to the inner-most traffic.
--- net/xfrm/xfrm_input.c | 66 +++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 43 deletions(-)
net/xfrm/xfrm_input.c +23 -43
@@ -232,9 +232,6 @@ static int xfrm4_remove_tunnel_encap(str {int err = -EINVAL ; -if (XFRM_MODE_SKB_CB (skb)->protocol !=IPPROTO_IPIP ) - goto out; -if (!pskb_may_pull (skb,sizeof (struct iphdr ))) goto out;
@@ -270,8 +267,6 @@ static int xfrm6_remove_tunnel_encap(str {int err = -EINVAL ; -if (XFRM_MODE_SKB_CB (skb)->protocol !=IPPROTO_IPV6 ) - goto out;if (!pskb_may_pull (skb,sizeof (struct ipv6hdr ))) goto out;
@@ -332,22 +327,26 @@ out:*/ static int xfrm_inner_mode_encap_remove (struct xfrm_state *x, -const struct xfrm_mode *inner_mode,struct sk_buff *skb) { -switch (inner_mode->encap) { +switch (x->props.mode) {case XFRM_MODE_BEET : -if (inner_mode->family ==AF_INET ) +switch (XFRM_MODE_SKB_CB (skb)->protocol) { +case IPPROTO_IPIP : +case IPPROTO_BEETPH :return xfrm4_remove_beet_encap (x, skb); -if (inner_mode->family ==AF_INET6 ) +case IPPROTO_IPV6 :return xfrm6_remove_beet_encap (x, skb); + }break ;case XFRM_MODE_TUNNEL : -if (inner_mode->family ==AF_INET ) +switch (XFRM_MODE_SKB_CB (skb)->protocol) { +case IPPROTO_IPIP :return xfrm4_remove_tunnel_encap (x, skb); -if (inner_mode->family ==AF_INET6 ) +case IPPROTO_IPV6 :return xfrm6_remove_tunnel_encap (x, skb);break ; + } }WARN_ON_ONCE (1 );
@@ -356,9 +355,7 @@ xfrm_inner_mode_encap_remove(struct xfrmstatic int xfrm_prepare_input (struct xfrm_state *x,struct sk_buff *skb) { -const struct xfrm_mode *inner_mode = &x->inner_mode; - -switch (x->outer_mode.family) { +switch (x->props.family) {case AF_INET :xfrm4_extract_header (skb);break ;
@@ -370,17 +367,12 @@ static int xfrm_prepare_input(struct xfrreturn -EAFNOSUPPORT ; } -if (x->sel.family ==AF_UNSPEC ) { - inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol); -if (!inner_mode) -return -EAFNOSUPPORT ; - } - -switch (inner_mode->family) { -case AF_INET : +switch (XFRM_MODE_SKB_CB (skb)->protocol) { +case IPPROTO_IPIP : +case IPPROTO_BEETPH : skb->protocol =htons (ETH_P_IP );break ; -case AF_INET6 : +case IPPROTO_IPV6 : skb->protocol =htons (ETH_P_IPV6 );break ;default :
@@ -388,7 +380,7 @@ static int xfrm_prepare_input(struct xfrbreak ; } -return xfrm_inner_mode_encap_remove (x, inner_mode, skb); +return xfrm_inner_mode_encap_remove (x, skb); }/* Remove encapsulation header.
@@ -434,17 +426,16 @@ static int xfrm6_transport_input(struct }static int xfrm_inner_mode_input (struct xfrm_state *x, -const struct xfrm_mode *inner_mode,struct sk_buff *skb) { -switch (inner_mode->encap) { +switch (x->props.mode) {case XFRM_MODE_BEET :case XFRM_MODE_TUNNEL :return xfrm_prepare_input (x, skb);case XFRM_MODE_TRANSPORT : -if (inner_mode->family ==AF_INET ) +if (x->props.family ==AF_INET )return xfrm4_transport_input (x, skb); -if (inner_mode->family ==AF_INET6 ) +if (x->props.family ==AF_INET6 )return xfrm6_transport_input (x, skb);break ;case XFRM_MODE_ROUTEOPTIMIZATION :
@@ -462,7 +453,6 @@ int xfrm_input(struct sk_buff *skb, int {const struct xfrm_state_afinfo *afinfo;struct net *net =dev_net (skb->dev); -const struct xfrm_mode *inner_mode;int err;__be32 seq;__be32 seq_hi;
@@ -492,7 +482,7 @@ int xfrm_input(struct sk_buff *skb, int goto drop; } - family = x->outer_mode.family; + family = x->props.family;/* An encap_type of -1 indicates async resumption. */ if (encap_type ==-1 ) {
@@ -676,17 +666,7 @@ resume:XFRM_MODE_SKB_CB (skb)->protocol = nexthdr; - inner_mode = &x->inner_mode; - -if (x->sel.family ==AF_UNSPEC ) { - inner_mode =xfrm_ip2inner_mode (x,XFRM_MODE_SKB_CB (skb)->protocol); -if (inner_mode ==NULL ) { -XFRM_INC_STATS (net,LINUX_MIB_XFRMINSTATEMODEERROR ); - goto drop; - } - } - -if (xfrm_inner_mode_input (x, inner_mode, skb)) { +if (xfrm_inner_mode_input (x, skb)) {XFRM_INC_STATS (net,LINUX_MIB_XFRMINSTATEMODEERROR ); goto drop; }
@@ -701,7 +681,7 @@ resume:* transport mode so the outer address is identical. */ daddr = &x->id.daddr; - family = x->outer_mode.family; + family = x->props.family; err =xfrm_parse_spi (skb, nexthdr, &spi, &seq);if (err <0 ) {
@@ -732,7 +712,7 @@ resume: err = -EAFNOSUPPORT ;rcu_read_lock (); - afinfo =xfrm_state_afinfo_get_rcu (x->inner_mode.family); + afinfo =xfrm_state_afinfo_get_rcu (x->props.family);if (likely (afinfo)) err = afinfo->transport_finish (skb, xfrm_gro || async);rcu_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 113/197 drm/msm: Wire up tlb ops
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
commit 8c7bfd8262319fd3f127a5380f593ea76f1b88a2 upstream.
The brute force iommu_flush_iotlb_all() was good enough for unmap, but in some cases a map operation could require removing a table pte entry to replace with a block entry. This also requires tlb invalidation. Missing this was resulting an obscure iova fault on what should be a valid buffer address.
Thanks to Robin Murphy for helping me understand the cause of the fault.
Patchwork: https://patchwork.freedesktop.org/patch/578117/
--- drivers/gpu/drm/msm/msm_iommu.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/msm_iommu.c +29 -3
@@ -21,6 +21,8 @@ struct msm_iommu_pagetable {struct msm_mmu base;struct msm_mmu *parent;struct io_pgtable_ops *pgtbl_ops; +const struct iommu_flush_ops *tlb; +struct device *iommu_dev;unsigned long pgsize_bitmap;/* Bitmap of page sizes in use */ phys_addr_t ttbr;u32 asid;
@@ -194,11 +196,33 @@ static const struct msm_mmu_funcs pagetastatic void msm_iommu_tlb_flush_all (void *cookie) { +struct msm_iommu_pagetable *pagetable = cookie; +struct adreno_smmu_priv *adreno_smmu; + +if (!pm_runtime_get_if_in_use (pagetable->iommu_dev)) +return ; + + adreno_smmu =dev_get_drvdata (pagetable->parent->dev); + + pagetable->tlb->tlb_flush_all ((void *)adreno_smmu->cookie); + +pm_runtime_put_autosuspend (pagetable->iommu_dev); }static void msm_iommu_tlb_flush_walk (unsigned long iova,size_t size,size_t granule,void *cookie) { +struct msm_iommu_pagetable *pagetable = cookie; +struct adreno_smmu_priv *adreno_smmu; + +if (!pm_runtime_get_if_in_use (pagetable->iommu_dev)) +return ; + + adreno_smmu =dev_get_drvdata (pagetable->parent->dev); + + pagetable->tlb->tlb_flush_walk (iova, size, granule, (void *)adreno_smmu->cookie); + +pm_runtime_put_autosuspend (pagetable->iommu_dev); } static void msm_iommu_tlb_add_page(struct iommu_iotlb_gather *gather,
@@ -206,7 +230,7 @@ static void msm_iommu_tlb_add_page(struc { } -static const struct iommu_flush_ops null_tlb_ops = { +static const struct iommu_flush_ops tlb_ops = { .tlb_flush_all = msm_iommu_tlb_flush_all, .tlb_flush_walk = msm_iommu_tlb_flush_walk, .tlb_add_page = msm_iommu_tlb_add_page,
@@ -254,10 +278,10 @@ struct msm_mmu *msm_iommu_pagetable_crea/* The incoming cfg will have the TTBR1 quirk enabled */ ttbr0_cfg.quirks &= ~IO_PGTABLE_QUIRK_ARM_TTBR1 ; - ttbr0_cfg.tlb = &null_tlb_ops; + ttbr0_cfg.tlb = &tlb_ops; pagetable->pgtbl_ops =alloc_io_pgtable_ops (ARM_64_LPAE_S1 , - &ttbr0_cfg, iommu->domain); + &ttbr0_cfg, pagetable);if (!pagetable->pgtbl_ops) {kfree (pagetable);
@@ -282,6 +306,8 @@ struct msm_mmu *msm_iommu_pagetable_crea/* Needed later for TLB flush */ pagetable->parent = parent; + pagetable->tlb = ttbr1_cfg->tlb; + pagetable->iommu_dev = ttbr1_cfg->iommu_dev; pagetable->pgsize_bitmap = ttbr0_cfg.pgsize_bitmap; pagetable->ttbr = ttbr0_cfg.arm_lpae_s1_cfg.ttbr;
Greg Kroah-Hartman
maintainerPATCH 114/197 drm/prime: Support page array >= 4GB
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philip Yang <[email protected]>
commit b671cd3d456315f63171a670769356a196cf7fd0 upstream.
Without unsigned long typecast, the size is passed in as zero if page array size >= 4GB, nr_pages >= 0x100000, then sg list converted will have the first and the last chunk lost.
--- drivers/gpu/drm/drm_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_prime.c +1 -1
@@ -828,7 +828,7 @@ struct sg_table *drm_prime_pages_to_sg(sif (max_segment ==0 ) max_segment =UINT_MAX ; err =sg_alloc_table_from_pages_segment (sg, pages, nr_pages,0 , - nr_pages <<PAGE_SHIFT , + (unsigned long )nr_pages <<PAGE_SHIFT , max_segment,GFP_KERNEL );if (err) {kfree (sg);
Greg Kroah-Hartman
maintainerPATCH 115/197 drm/amd/display: Increase frame-larger-than for all display_mode_vba files
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit e63e35f0164c43fbc1adb481d6604f253b9f9667 upstream.
After a recent change in LLVM, allmodconfig (which has CONFIG_KCSAN=y and CONFIG_WERROR=y enabled) has a few new instances of -Wframe-larger-than for the mode support and system configuration functions:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_mode_vba_20v2.c:3393:6: error: stack frame size (2144) exceeds limit (2048) in 'dml20v2_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than]
3393 | void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
| ^
1 error generated.
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn21/display_mode_vba_21.c:3520:6: error: stack frame size (2192) exceeds limit (2048) in 'dml21_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than]
3520 | void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
| ^
1 error generated.
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn20/display_mode_vba_20.c:3286:6: error: stack frame size (2128) exceeds limit (2048) in 'dml20_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than]
3286 | void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
| ^
1 error generated.
Without the sanitizers enabled, there are no warnings.
This was the catalyst for commit 6740ec97bcdb ("drm/amd/display:
Increase frame warning limit with KASAN or KCSAN in dml2") and that same change was made to dml in commit 5b750b22530f ("drm/amd/display:
Increase frame warning limit with KASAN or KCSAN in dml") but the frame_warn_flag variable was not applied to all files. Do so now to clear up the warnings and make all these files consistent.
--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/Makefile +3 -3
@@ -60,11 +60,11 @@ ifdef CONFIG_DRM_AMD_DC_DCN CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_vba.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn10/dcn10_fpu.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/dcn20_fpu.o := $(dml_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20.o := $(dml_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_mode_vba_20v2.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) -CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) +CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) $(frame_warn_flag) CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags)
Greg Kroah-Hartman
maintainerPATCH 116/197 drm/amd/display: Preserve original aspect ratio in create stream
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Chung <[email protected]>
commit deb110292180cd501f6fde2a0178d65fcbcabb0c upstream.
[Why]
The original picture aspect ratio in mode struct may have chance be overwritten with wrong aspect ratio data in create_stream_for_sink(). It will create a different VIC output and cause HDMI compliance test failed.
[How]
Preserve the original picture aspect ratio data during create the stream.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -6001,7 +6001,9 @@ create_stream_for_sink(struct amdgpu_dm_if (recalculate_timing) { freesync_mode =get_highest_refresh_rate_mode (aconnector, false);drm_mode_copy (&saved_mode, &mode); + saved_mode.picture_aspect_ratio = mode.picture_aspect_ratio;drm_mode_copy (&mode, freesync_mode); + mode.picture_aspect_ratio = saved_mode.picture_aspect_ratio; }else {decide_crtc_timing_for_drm_display_mode ( &mode, preferred_mode, scale);
Greg Kroah-Hartman
maintainerPATCH 117/197 hv_netvsc: Fix race condition between netvsc_probe and netvsc_remove
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Souradeep Chakrabarti <[email protected]>
commit e0526ec5360a48ad3ab2e26e802b0532302a7e11 upstream.
In commit ac5047671758 ("hv_netvsc: Disable NAPI before closing the VMBus channel"), napi_disable was getting called for all channels, including all subchannels without confirming if they are enabled or not.
This caused hv_netvsc getting hung at napi_disable, when netvsc_probe() has finished running but nvdev->subchan_work has not started yet. netvsc_subchan_work() -> rndis_set_subchannel() has not created the sub-channels and because of that netvsc_sc_open() is not running. netvsc_remove() calls cancel_work_sync(&nvdev->subchan_work), for which netvsc_subchan_work did not run.
netif_napi_add() sets the bit NAPI_STATE_SCHED because it ensures NAPI cannot be scheduled. Then netvsc_sc_open() -> napi_enable will clear the NAPIF_STATE_SCHED bit, so it can be scheduled. napi_disable() does the opposite.
Now during netvsc_device_remove(), when napi_disable is called for those subchannels, napi_disable gets stuck on infinite msleep.
This fix addresses this problem by ensuring that napi_disable() is not getting called for non-enabled NAPI struct.
But netif_napi_del() is still necessary for these non-enabled NAPI struct for cleanup purpose.
Call trace: [ 654.559417] task:modprobe state:D stack: 0 pid: 2321 ppid: 1091 flags:0x00004002 [ 654.568030] Call Trace: [ 654.571221] <TASK> [ 654.573790] __schedule+0x2d6/0x960 [ 654.577733] schedule+0x69/0xf0 [ 654.581214] schedule_timeout+0x87/0x140 [ 654.585463] ? __bpf_trace_tick_stop+0x20/0x20 [ 654.590291] msleep+0x2d/0x40 [ 654.593625] napi_disable+0x2b/0x80 [ 654.597437] netvsc_device_remove+0x8a/0x1f0 [hv_netvsc] [ 654.603935] rndis_filter_device_remove+0x194/0x1c0 [hv_netvsc] [ 654.611101] ? do_wait_intr+0xb0/0xb0 [ 654.615753] netvsc_remove+0x7c/0x120 [hv_netvsc] [ 654.621675] vmbus_remove+0x27/0x40 [hv_vmbus]
--- drivers/net/hyperv/netvsc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/hyperv/netvsc.c +4 -1
@@ -740,7 +740,10 @@ void netvsc_device_remove(struct hv_devi/* Disable NAPI and disassociate its context from the device. */ for (i =0 ; i < net_device->num_chn; i++) {/* See also vmbus_reset_channel_cb(). */ -napi_disable (&net_device->chan_table[i].napi); +/* only disable enabled NAPI channel */ +if (i < ndev->real_num_rx_queues) +napi_disable (&net_device->chan_table[i].napi); +netif_napi_del (&net_device->chan_table[i].napi); }
Greg Kroah-Hartman
maintainerPATCH 118/197 ring-buffer: Clean ring_buffer_poll_wait() error return
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Donnefort <[email protected]>
commit 66bbea9ed6446b8471d365a22734dc00556c4785 upstream.
The return type for ring_buffer_poll_wait() is __poll_t. This is behind the scenes an unsigned where we can set event bits. In case of a non-allocated CPU, we do return instead -EINVAL (0xffffffea). Lucky us, this ends up setting few error bits (EPOLLERR | EPOLLHUP | EPOLLNVAL), so user-space at least is aware something went wrong.
Nonetheless, this is an incorrect code. Replace that -EINVAL with a proper EPOLLERR to clean that output. As this doesn't change the behaviour, there's no need to treat this change as a bug fix.
--- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ring_buffer.c +1 -1
@@ -1095,7 +1095,7 @@ __poll_t ring_buffer_poll_wait(struct tr full =0 ; }else {if (!cpumask_test_cpu (cpu, buffer->cpumask)) -return -EINVAL ; +return EPOLLERR ; cpu_buffer = buffer->buffers[cpu]; work = &cpu_buffer->irq_work;
Greg Kroah-Hartman
maintainerPATCH 119/197 nfp: flower: fix hardware offload for the transfer layer port
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Zhou <[email protected]>
commit 3a007b8009b5f8af021021b7a590a6da0dc4c6e0 upstream.
The nfp driver will merge the tp source port and tp destination port into one dword which the offset must be zero to do hardware offload. However, the mangle action for the tp source port and tp destination port is separated for tc ct action. Modify the mangle action for the FLOW_ACT_MANGLE_HDR_TYPE_TCP and FLOW_ACT_MANGLE_HDR_TYPE_UDP to satisfy the nfp driver offload check for the tp port.
The mangle action provides a 4B value for source, and a 4B value for the destination, but only 2B of each contains the useful information. For offload the 2B of each is combined into a single 4B word. Since the incoming mask for the source is '0xFFFF<mask>' the shift-left will throw away the 0xFFFF part. When this gets combined together in the offload it will clear the destination field. Fix this by setting the lower bits back to 0xFFFF, effectively doing a rotate-left operation on the mask.
--- drivers/net/ethernet/netronome/nfp/flower/conntrack.c | 24 ++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/flower/conntrack.c +22 -2
@@ -1379,10 +1379,30 @@ static void nfp_nft_ct_translate_mangle_ mangle_action->mangle.mask = (__force u32 )cpu_to_be32 (mangle_action->mangle.mask);return ; +/* Both struct tcphdr and struct udphdr start with +* __be16 source; +* __be16 dest; +* so we can use the same code for both. +*/ case FLOW_ACT_MANGLE_HDR_TYPE_TCP :case FLOW_ACT_MANGLE_HDR_TYPE_UDP : - mangle_action->mangle.val = (__force u16 )cpu_to_be16 (mangle_action->mangle.val); - mangle_action->mangle.mask = (__force u16 )cpu_to_be16 (mangle_action->mangle.mask); +if (mangle_action->mangle.offset == offsetof(struct tcphdr , source)) { + mangle_action->mangle.val = + (__force u32 )cpu_to_be32 (mangle_action->mangle.val <<16 ); +/* The mask of mangle action is inverse mask, +* so clear the dest tp port with 0xFFFF to +* instead of rotate-left operation. +*/ + mangle_action->mangle.mask = + (__force u32 )cpu_to_be32 (mangle_action->mangle.mask <<16 |0xFFFF ); + } +if (mangle_action->mangle.offset == offsetof(struct tcphdr , dest)) { + mangle_action->mangle.offset =0 ; + mangle_action->mangle.val = + (__force u32 )cpu_to_be32 (mangle_action->mangle.val); + mangle_action->mangle.mask = + (__force u32 )cpu_to_be32 (mangle_action->mangle.mask); + }return ;default :
Greg Kroah-Hartman
maintainerPATCH 120/197 serial: max310x: set default value when reading clock ready bit
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
commit 0419373333c2f2024966d36261fd82a453281e80 upstream.
If regmap_read() returns a non-zero value, the 'val' variable can be left uninitialized.
Clear it before calling regmap_read() to make sure we properly detect the clock ready bit.
--- drivers/tty/serial/max310x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/max310x.c +1 -1
@@ -641,7 +641,7 @@ static u32 max310x_set_ref_clk(struct de/* Wait for crystal */ if (xtal) { -unsigned int val; +unsigned int val =0 ;msleep (10 );regmap_read (s->regmap,MAX310X_STS_IRQSTS_REG , &val);if (!(val &MAX310X_STS_CLKREADY_BIT )) {
Greg Kroah-Hartman
maintainerPATCH 121/197 serial: max310x: improve crystal stable clock detection
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
commit 93cd256ab224c2519e7c4e5f58bb4f1ac2bf0965 upstream.
Some people are seeing a warning similar to this when using a crystal:
max310x 11-006c: clock is not stable yet
The datasheet doesn't mention the maximum time to wait for the clock to be stable when using a crystal, and it seems that the 10ms delay in the driver is not always sufficient.
Jan Kundrát reported that it took three tries (each separated by 10ms) to get a stable clock.
Modify behavior to check stable clock ready bit multiple times (20), and waiting 10ms between each try.
Note: the first draft of the driver originally used a 50ms delay, without checking the clock stable bit.
Then a loop with 1000 retries was implemented, each time reading the clock stable bit.
--- drivers/tty/serial/max310x.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/tty/serial/max310x.c +16 -5
@@ -237,6 +237,10 @@#define MAX310x_REV_MASK (0xf8)#define MAX310X_WRITE_BIT 0x80 +/* Crystal-related definitions */ +#define MAX310X_XTAL_WAIT_RETRIES 20/* Number of retries */ +#define MAX310X_XTAL_WAIT_DELAY_MS 10/* Delay between retries */ +/* MAX3107 specific */ #define MAX3107_REV_ID (0xa0)
@@ -641,12 +645,19 @@ static u32 max310x_set_ref_clk(struct de/* Wait for crystal */ if (xtal) { -unsigned int val =0 ; -msleep (10 ); -regmap_read (s->regmap,MAX310X_STS_IRQSTS_REG , &val); -if (!(val &MAX310X_STS_CLKREADY_BIT )) { +bool stable = false; +unsigned int try =0 , val =0 ; + +do { +msleep (MAX310X_XTAL_WAIT_DELAY_MS ); +regmap_read (s->regmap,MAX310X_STS_IRQSTS_REG , &val); + +if (val &MAX310X_STS_CLKREADY_BIT ) + stable = true; + }while (!stable && (++try <MAX310X_XTAL_WAIT_RETRIES )); + +if (!stable)dev_warn (dev,"clock is not stable yet\n" ); - } }return bestfreq;
Greg Kroah-Hartman
maintainerPATCH 122/197 serial: max310x: fail probe if clock crystal is unstable
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
commit 8afa6c6decea37e7cb473d2c60473f37f46cea35 upstream.
A stable clock is really required in order to use this UART, so log an error message and bail out if the chip reports that the clock is not stable.
--- drivers/tty/serial/max310x.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/tty/serial/max310x.c +9 -3
@@ -587,7 +587,7 @@ static int max310x_update_best_err(unsigreturn 1 ; } -static u32 max310x_set_ref_clk (struct device *dev,struct max310x_port *s, +static s32 max310x_set_ref_clk (struct device *dev,struct max310x_port *s,unsigned long freq,bool xtal) {unsigned int div, clksrc, pllcfg =0 ;
@@ -657,7 +657,8 @@ static u32 max310x_set_ref_clk(struct de }while (!stable && (++try <MAX310X_XTAL_WAIT_RETRIES ));if (!stable) -dev_warn (dev,"clock is not stable yet\n" ); +return dev_err_probe (dev, -EAGAIN , +"clock is not stable\n" ); }return bestfreq;
@@ -1285,7 +1286,7 @@ static int max310x_probe(struct device * {int i, ret, fmin, fmax, freq;struct max310x_port *s; -u32 uartclk =0 ; +s32 uartclk =0 ;bool xtal;for (i =0 ; i < devtype->nr; i++)
@@ -1363,6 +1364,11 @@ static int max310x_probe(struct device * } uartclk =max310x_set_ref_clk (dev, s, freq, xtal); +if (uartclk <0 ) { + ret = uartclk; + goto out_uart; + } +dev_dbg (dev,"Reference clock set to %i Hz\n" , uartclk);for (i =0 ; i < devtype->nr; i++) {
Greg Kroah-Hartman
maintainerPATCH 123/197 serial: max310x: prevent infinite while() loop in port startup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
commit b35f8dbbce818b02c730dc85133dc7754266e084 upstream.
If there is a problem after resetting a port, the do/while() loop that checks the default value of DIVLSB register may run forever and spam the I2C bus.
Add a delay before each read of DIVLSB, and a maximum number of tries to prevent that situation from happening.
Also fail probe if port reset is unsuccessful.
--- drivers/tty/serial/max310x.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/tty/serial/max310x.c +18 -2
@@ -237,6 +237,10 @@#define MAX310x_REV_MASK (0xf8)#define MAX310X_WRITE_BIT 0x80 +/* Port startup definitions */ +#define MAX310X_PORT_STARTUP_WAIT_RETRIES 20/* Number of retries */ +#define MAX310X_PORT_STARTUP_WAIT_DELAY_MS 10/* Delay between retries */ +/* Crystal-related definitions */ #define MAX310X_XTAL_WAIT_RETRIES 20/* Number of retries */ #define MAX310X_XTAL_WAIT_DELAY_MS 10/* Delay between retries */
@@ -1349,6 +1353,9 @@ static int max310x_probe(struct device * goto out_clk;for (i =0 ; i < devtype->nr; i++) { +bool started = false; +unsigned int try =0 , val =0 ; +/* Reset port */ regmap_write (regmaps[i],MAX310X_MODE2_REG ,MAX310X_MODE2_RST_BIT );
@@ -1357,8 +1364,17 @@ static int max310x_probe(struct device */* Wait for port startup */ do { -regmap_read (regmaps[i],MAX310X_BRGDIVLSB_REG , &ret); - }while (ret !=0x01 ); +msleep (MAX310X_PORT_STARTUP_WAIT_DELAY_MS ); +regmap_read (regmaps[i],MAX310X_BRGDIVLSB_REG , &val); + +if (val ==0x01 ) + started = true; + }while (!started && (++try <MAX310X_PORT_STARTUP_WAIT_RETRIES )); + +if (!started) { + ret =dev_err_probe (dev, -EAGAIN ,"port reset failed\n" ); + goto out_uart; + }regmap_write (regmaps[i],MAX310X_MODE1_REG , devtype->mode1); }
Greg Kroah-Hartman
maintainerPATCH 124/197 powerpc/64: Set task pt_regs->link to the LR value on scv entry
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Naveen N Rao <[email protected]>
commit aad98efd0b121f63a2e1c221dcb4d4850128c697 upstream.
Nysal reported that userspace backtraces are missing in offcputime bcc tool. As an example:
$ sudo ./bcc/tools/offcputime.py -uU
Tracing off-CPU time (us) of user threads by user stack... Hit Ctrl-C to end.^C write - python (9107) 8 write - sudo (9105) 9 mmap - python (9107) 16 clock_nanosleep - multipathd (697) 3001604
The offcputime bcc tool attaches a bpf program to a kprobe on finish_task_switch(), which is usually hit on a syscall from userspace. With the switch to system call vectored, we started setting pt_regs->link to zero. This is because system call vectored behaves like a function call with LR pointing to the system call return address, and with no modification to SRR0/SRR1. The LR value does indicate our next instruction, so it is being saved as pt_regs->nip, and pt_regs->link is being set to zero. This is not a problem by itself, but BPF uses perf callchain infrastructure for capturing stack traces, and that stores LR as the second entry in the stack trace. perf has code to cope with the second entry being zero, and skips over it. However, generic userspace unwinders assume that a zero entry indicates end of the stack trace, resulting in a truncated userspace stack trace.
Rather than fixing all userspace unwinders to ignore/skip past the second entry, store the real LR value in pt_regs->link so that there continues to be a valid, though duplicate entry in the stack trace.
With this change:
$ sudo ./bcc/tools/offcputime.py -uU
Tracing off-CPU time (us) of user threads by user stack... Hit Ctrl-C to end.^C write write [unknown] [unknown] [unknown] [unknown] [unknown] PyObject_VectorcallMethod [unknown] [unknown] PyObject_CallOneArg PyFile_WriteObject PyFile_WriteString [unknown] [unknown] PyObject_Vectorcall _PyEval_EvalFrameDefault PyEval_EvalCode [unknown] [unknown] [unknown] _PyRun_SimpleFileObject _PyRun_AnyFileObject Py_RunMain [unknown] Py_BytesMain [unknown] __libc_start_main - python (1293) 7 write write [unknown] sudo_ev_loop_v1 sudo_ev_dispatch_v1 [unknown] [unknown] [unknown] [unknown] __libc_start_main - sudo (1291) 7 syscall syscall bpf_open_perf_buffer_opts [unknown] [unknown] [unknown] [unknown] _PyObject_MakeTpCall PyObject_Vectorcall _PyEval_EvalFrameDefault PyEval_EvalCode [unknown] [unknown] [unknown] _PyRun_SimpleFileObject _PyRun_AnyFileObject Py_RunMain [unknown] Py_BytesMain [unknown] __libc_start_main - python (1293) 11 clock_nanosleep clock_nanosleep nanosleep sleep [unknown] [unknown] __clone - multipathd (698) 3001661
--- arch/powerpc/kernel/interrupt_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/interrupt_64.S +2 -2
@@ -52,7 +52,8 @@ _ASM_NOKPROBE_SYMBOL(system_call_vectore mr r10,r1 ld r1,PACAKSAVE(r13) std r10,0(r1) - std r11,_NIP(r1) + std r11,_LINK(r1) + std r11,_NIP(r1) /* Saved LR is also the next instruction */ std r12,_MSR(r1) std r0,GPR0(r1) std r10,GPR1(r1)
@@ -70,7 +71,6 @@ _ASM_NOKPROBE_SYMBOL(system_call_vectore std r9,GPR13(r1) SAVE_NVGPRS(r1) std r11,_XER(r1) - std r11,_LINK(r1) std r11,_CTR(r1) li r11,\trapnr
Greg Kroah-Hartman
maintainerPATCH 125/197 powerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Engraf <[email protected]>
commit eb6d871f4ba49ac8d0537e051fe983a3a4027f61 upstream.
Commit e320a76db4b0 ("powerpc/cputable: Split cpu_specs[] out of cputable.h") moved the cpu_specs to separate header files. Previously PPC_FEATURE_BOOKE was enabled by CONFIG_PPC_BOOK3E_64. The definition in cpu_specs_e500mc.h for PPC64 no longer enables PPC_FEATURE_BOOKE.
This breaks user space reading the ELF hwcaps and expect PPC_FEATURE_BOOKE. Debugging an application with gdb is no longer working on e5500/e6500 because the 64-bit detection relies on PPC_FEATURE_BOOKE for Book-E.
--- arch/powerpc/kernel/cpu_specs_e500mc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/kernel/cpu_specs_e500mc.h +2 -1
@@ -8,7 +8,8 @@#ifdef CONFIG_PPC64 #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ - PPC_FEATURE_HAS_FPU | PPC_FEATURE_64) + PPC_FEATURE_HAS_FPU | PPC_FEATURE_64 | \ + PPC_FEATURE_BOOKE)#else #define COMMON_USER_BOOKE (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \ PPC_FEATURE_BOOKE)
Greg Kroah-Hartman
maintainerPATCH 126/197 powerpc/pseries: fix accuracy of stolen time
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shrikanth Hegde <[email protected]>
commit cbecc9fcbbec60136b0180ba0609c829afed5c81 upstream.
powerVM hypervisor updates the VPA fields with stolen time data. It currently reports enqueue_dispatch_tb and ready_enqueue_tb for this purpose. In linux these two fields are used to report the stolen time.
The VPA fields are updated at the TB frequency. On powerPC its mostly set at 512Mhz. Hence this needs a conversion to ns when reporting it back as rest of the kernel timings are in ns. This conversion is already handled in tb_to_ns function. So use that function to report accurate stolen time.
Observed this issue and used an Capped Shared Processor LPAR(SPLPAR) to simplify the experiments. In all these cases, 100% VP Load is run using stress-ng workload. Values of stolen time is in percentages as reported by mpstat. With the patch values are close to expected.
6.8.rc1 +Patch 12EC/12VP 0.0 0.0 12EC/24VP 25.7 50.2 12EC/36VP 37.3 69.2 12EC/48VP 38.5 78.3
--- arch/powerpc/platforms/pseries/lpar.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/lpar.c +6 -2
@@ -660,8 +660,12 @@ u64 pseries_paravirt_steal_clock(int cpu {struct lppaca *lppaca = &lppaca_of (cpu); -return be64_to_cpu (READ_ONCE (lppaca->enqueue_dispatch_tb)) + -be64_to_cpu (READ_ONCE (lppaca->ready_enqueue_tb)); +/* +* VPA steal time counters are reported at TB frequency. Hence do a +* conversion to ns before returning +*/ +return tb_to_ns (be64_to_cpu (READ_ONCE (lppaca->enqueue_dispatch_tb)) + +be64_to_cpu (READ_ONCE (lppaca->ready_enqueue_tb))); }#endif
Greg Kroah-Hartman
maintainerPATCH 127/197 x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksander Mazur <[email protected]>
commit f6a1892585cd19e63c4ef2334e26cd536d5b678d upstream.
The kernel built with MCRUSOE is unbootable on Transmeta Crusoe. It shows the following error message:
This kernel requires an i686 CPU, but only detected an i586 CPU. Unable to boot - please use a kernel appropriate for your CPU.
Remove MCRUSOE from the condition introduced in commit in Fixes, effectively changing X86_MINIMUM_CPU_FAMILY back to 5 on that machine, which matches the CPU family given by CPUID.
[ bp: Massage commit message. ]
--- arch/x86/Kconfig.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig.cpu +1 -1
@@ -375,7 +375,7 @@ config X86_CMOV config X86_MINIMUM_CPU_FAMILY int default "64" if X86_64 - default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8) + default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCORE2 || MK7 || MK8) default "5" if X86_32 && X86_CMPXCHG64 default "4"
Greg Kroah-Hartman
maintainerPATCH 128/197 x86/fpu: Stop relying on userspace for info to fault in xsave buffer
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Vagin <[email protected]>
commit d877550eaf2dc9090d782864c96939397a3c6835 upstream.
Before this change, the expected size of the user space buffer was taken from fx_sw->xstate_size. fx_sw->xstate_size can be changed from user-space, so it is possible construct a sigreturn frame where:
* fx_sw->xstate_size is smaller than the size required by valid bits in fx_sw->xfeatures.
* user-space unmaps parts of the sigrame fpu buffer so that not all of the buffer required by xrstor is accessible.
In this case, xrstor tries to restore and accesses the unmapped area which results in a fault. But fault_in_readable succeeds because buf + fx_sw->xstate_size is within the still mapped area, so it goes back and tries xrstor again. It will spin in this loop forever.
Instead, fault in the maximum size which can be touched by XRSTOR (taken from fpstate->user_size).
[ dhansen: tweak subject / changelog ]
--- arch/x86/kernel/fpu/signal.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/x86/kernel/fpu/signal.c +5 -8
@@ -274,12 +274,13 @@ static int __restore_fpregs_from_user(vo* Attempt to restore the FPU registers directly from user memory. * Pagefaults are handled and any errors returned are fatal. */ -static bool restore_fpregs_from_user (void __user *buf,u64 xrestore, -bool fx_only,unsigned int size) +static bool restore_fpregs_from_user (void __user *buf,u64 xrestore,bool fx_only) {struct fpu *fpu = ¤t->thread.fpu;int ret; +/* Restore enabled features only. */ + xrestore &= fpu->fpstate->user_xfeatures; retry:fpregs_lock ();/* Ensure that XFD is up to date */
@@ -309,7 +310,7 @@ retry:if (ret !=X86_TRAP_PF )return false; -if (!fault_in_readable (buf, size)) +if (!fault_in_readable (buf, fpu->fpstate->user_size)) goto retry;return false; }
@@ -339,7 +340,6 @@ static bool __fpu_restore_sig(void __usestruct user_i387_ia32_struct env;bool success, fx_only = false;union fpregs_state *fpregs; -unsigned int state_size;u64 user_xfeatures =0 ;if (use_xsave ()) {
@@ -349,17 +349,14 @@ static bool __fpu_restore_sig(void __usereturn false; fx_only = !fx_sw_user.magic1; - state_size = fx_sw_user.xstate_size; user_xfeatures = fx_sw_user.xfeatures; }else { user_xfeatures =XFEATURE_MASK_FPSSE ; - state_size = fpu->fpstate->user_size; }if (likely (!ia32_fxstate)) {/* Restore the FPU registers directly from user memory. */ -return restore_fpregs_from_user (buf_fx, user_xfeatures, fx_only, - state_size); +return restore_fpregs_from_user (buf_fx, user_xfeatures, fx_only); }/*
Greg Kroah-Hartman
maintainerPATCH 129/197 KVM: x86/pmu: Fix type length error when reading pmu->fixed_ctr_ctrl
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingwei Zhang <[email protected]>
commit 05519c86d6997cfb9bb6c82ce1595d1015b718dc upstream.
Use a u64 instead of a u8 when taking a snapshot of pmu->fixed_ctr_ctrl when reprogramming fixed counters, as truncating the value results in KVM thinking fixed counter 2 is already disabled (the bug also affects fixed counters 3+, but KVM doesn't yet support those). As a result, if the guest disables fixed counter 2, KVM will get a false negative and fail to reprogram/disable emulation of the counter, which can leads to incorrect counts and spurious PMIs in the guest.
--- arch/x86/kvm/vmx/pmu_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/pmu_intel.c +1 -1
@@ -38,7 +38,7 @@ static int fixed_pmc_events[] = {1, 0, 7static void reprogram_fixed_counters (struct kvm_pmu *pmu,u64 data) {struct kvm_pmc *pmc; -u8 old_fixed_ctr_ctrl = pmu->fixed_ctr_ctrl; +u64 old_fixed_ctr_ctrl = pmu->fixed_ctr_ctrl;int i; pmu->fixed_ctr_ctrl = data;
Greg Kroah-Hartman
maintainerPATCH 130/197 x86/mm/ident_map: Use gbpages only where full GB page should be mapped.
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve Wahl <[email protected]>
commit d794734c9bbfe22f86686dc2909c25f5ffe1a572 upstream.
When ident_pud_init() uses only gbpages to create identity maps, large ranges of addresses not actually requested can be included in the resulting table; a 4K request will map a full GB. On UV systems, this ends up including regions that will cause hardware to halt the system if accessed (these are marked "reserved" by BIOS). Even processor speculation into these regions is enough to trigger the system halt.
Only use gbpages when map creation requests include the full GB page of space. Fall back to using smaller 2M pages when only portions of a GB page are included in the request.
No attempt is made to coalesce mapping requests. If a request requires a map entry at the 2M (pmd) level, subsequent mapping requests within the same 1G region will also be at the pmd level, even if adjacent or overlapping such requests could have been combined to map a full gbpage. Existing usage starts with larger regions and then adds smaller regions, so this should not have any great consequence.
[ dhansen: fix up comment formatting, simplifty changelog ]
--- arch/x86/mm/ident_map.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
arch/x86/mm/ident_map.c +18 -5
@@ -26,18 +26,31 @@ static int ident_pud_init(struct x86_mapfor (; addr < end; addr = next) {pud_t *pud = pud_page +pud_index (addr);pmd_t *pmd; +bool use_gbpage; next = (addr &PUD_MASK ) +PUD_SIZE ;if (next > end) next = end; -if (info->direct_gbpages) { -pud_t pudval; +/* if this is already a gbpage, this portion is already mapped */ +if (pud_large (*pud)) +continue ; + +/* Is using a gbpage allowed? */ + use_gbpage = info->direct_gbpages; -if (pud_present (*pud)) -continue ; +/* Don't use gbpage if it maps more than the requested region. */ +/* at the begining: */ + use_gbpage &= ((addr & ~PUD_MASK ) ==0 ); +/* ... or at the end: */ + use_gbpage &= ((next & ~PUD_MASK ) ==0 ); + +/* Never overwrite existing mappings */ + use_gbpage &= !pud_present (*pud); + +if (use_gbpage) { +pud_t pudval; - addr &=PUD_MASK ; pudval =__pud ((addr - info->offset) | info->page_flag);set_pud (pud, pudval);continue ;
Greg Kroah-Hartman
maintainerPATCH 131/197 io_uring/net: fix multishot accept overflow handling
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit a37ee9e117ef73bbc2f5c0b31911afd52d229861 upstream.
If we hit CQ ring overflow when attempting to post a multishot accept completion, we don't properly save the result or return code. This results in losing the accepted fd value.
Instead, we return the result from the poll operation that triggered the accept retry. This is generally POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND which is 0xc3, or 195, which looks like a valid file descriptor, but it really has no connection to that.
Handle this like we do for other multishot completions - assign the result, and return IOU_STOP_MULTISHOT to cancel any further completions from this request when overflow is hit. This preserves the result, as we should, and tells the application that the request needs to be re-armed.
--- io_uring/net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
io_uring/net.c +3 -2
@@ -1326,7 +1326,7 @@ retry:* has already been done */ if (issue_flags &IO_URING_F_MULTISHOT ) - ret =IOU_ISSUE_SKIP_COMPLETE ; +return IOU_ISSUE_SKIP_COMPLETE ;return ret; }if (ret == -ERESTARTSYS )
@@ -1350,7 +1350,8 @@ retry:if (io_post_aux_cqe (ctx, req->cqe.user_data, ret,IORING_CQE_F_MORE , false)) goto retry; -return -ECANCELED ; +io_req_set_res (req, ret,0 ); +return IOU_STOP_MULTISHOT ; }int io_socket_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe)
Greg Kroah-Hartman
maintainerPATCH 132/197 mmc: slot-gpio: Allow non-sleeping GPIO ro
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
commit cc9432c4fb159a3913e0ce3173b8218cd5bad2e0 upstream.
This change uses the appropriate _cansleep or non-sleeping API for reading GPIO read-only state. This allows users with GPIOs that never sleepbeing called in atomic context.
Implement the same mechanism as in commit 52af318c93e97 ("mmc: Allow non-sleeping GPIO cd").
--- drivers/mmc/core/slot-gpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/core/slot-gpio.c +5 -1
@@ -62,11 +62,15 @@ int mmc_gpio_alloc(struct mmc_host *hostint mmc_gpio_get_ro (struct mmc_host *host) {struct mmc_gpio *ctx = host->slot.handler_priv; +int cansleep;if (!ctx || !ctx->ro_gpio)return -ENOSYS ; -return gpiod_get_value_cansleep (ctx->ro_gpio); + cansleep =gpiod_cansleep (ctx->ro_gpio); +return cansleep ? +gpiod_get_value_cansleep (ctx->ro_gpio) : +gpiod_get_value (ctx->ro_gpio); }EXPORT_SYMBOL (mmc_gpio_get_ro);
Greg Kroah-Hartman
maintainerPATCH 133/197 ALSA: hda/realtek: fix mute/micmute LED For HP mt645
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eniac Zhang <[email protected]>
commit 32f03f4002c5df837fb920eb23fcd2f4af9b0b23 upstream.
The HP mt645 G7 Thin Client uses an ALC236 codec and needs the ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF quirk to make the mute and micmute LEDs work.
There are two variants of the USB-C PD chip on this device. Each uses a different BIOS and board ID, hence the two entries.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9690,6 +9690,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8abb ,"HP ZBook Firefly 14 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ad1 ,"HP EliteBook 840 14 inch G9 Notebook PC" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ad2 ,"HP EliteBook 860 16 inch G9 Notebook PC" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8b0f ,"HP Elite mt645 G7 Mobile Thin Client U81" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8b2f ,"HP 255 15.6 inch G10 Notebook PC" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x8b42 ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8b43, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -9697,6 +9698,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8b45 ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8b46 ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8b47 ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8b59 ,"HP Elite mt645 G7 Mobile Thin Client U89" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8b5d ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8b5e ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), SND_PCI_QUIRK(0x103c, 0x8b63, "HP Elite Dragonfly 13.5 inch G4", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 134/197 ALSA: hda/conexant: Add quirk for SWS JS201D
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: bo liu <[email protected]>
commit 4639c5021029d49fd2f97fa8d74731f167f98919 upstream.
The SWS JS201D need a different pinconfig from windows driver. Add a quirk to use a specific pinconfig to SWS JS201D.
--- sound/pci/hda/patch_conexant.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
sound/pci/hda/patch_conexant.c +18 -0
@@ -344,6 +344,7 @@ enum {CXT_FIXUP_HP_ZBOOK_MUTE_LED ,CXT_FIXUP_HEADSET_MIC ,CXT_FIXUP_HP_MIC_NO_PRESENCE , + CXT_PINCFG_SWS_JS201D, };/* for hda_fixup_thinkpad_acpi() */
@@ -841,6 +842,17 @@ static const struct hda_pintbl cxt_pincf {} }; +/* SuoWoSi/South-holding JS201D with sn6140 */ +static const struct hda_pintbl cxt_pincfg_sws_js201d[] = { + {0x16 ,0x03211040 },/* hp out */ + {0x17 ,0x91170110 },/* SPK/Class_D */ + {0x18 ,0x95a70130 },/* Internal mic */ + {0x19 ,0x03a11020 },/* Headset Mic */ + {0x1a ,0x40f001f0 },/* Not used */ + {0x21 ,0x40f001f0 },/* Not used */ + {} +}; +static const struct hda_fixup cxt_fixups[] = { [CXT_PINCFG_LENOVO_X200 ] = { .type =HDA_FIXUP_PINS ,
@@ -996,6 +1008,10 @@ static const struct hda_fixup cxt_fixups .chained = true, .chain_id = CXT_FIXUP_HEADSET_MIC, }, + [CXT_PINCFG_SWS_JS201D] = { + .type = HDA_FIXUP_PINS, + .v.pins = cxt_pincfg_sws_js201d, + }, }; static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1069,6 +1085,7 @@ static const struct snd_pci_quirk cxt506SND_PCI_QUIRK (0x103c ,0x8457 ,"HP Z2 G4 mini" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x8458 ,"HP Z2 G4 mini premium" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x138d ,"Asus" ,CXT_FIXUP_HEADPHONE_MIC_PIN ), +SND_PCI_QUIRK (0x14f1 ,0x0265 ,"SWS JS201D" ,CXT_PINCFG_SWS_JS201D ),SND_PCI_QUIRK (0x152d ,0x0833 ,"OLPC XO-1.5" ,CXT_FIXUP_OLPC_XO ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Lenovo T400" ,CXT_PINCFG_LENOVO_TP410 ), SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),
@@ -1109,6 +1126,7 @@ static const struct hda_model_fixup cxt5 { .id = CXT_FIXUP_HP_ZBOOK_MUTE_LED, .name = "hp-zbook-mute-led" }, { .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" }, { .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" }, + { .id = CXT_PINCFG_SWS_JS201D, .name = "sws-js201d" }, {} };
Greg Kroah-Hartman
maintainerPATCH 135/197 nilfs2: fix data corruption in dsync block recovery for small block sizes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 67b8bcbaed4777871bb0dcc888fb02a614a98ab1 upstream.
The helper function nilfs_recovery_copy_block() of nilfs_recovery_dsync_blocks(), which recovers data from logs created by data sync writes during a mount after an unclean shutdown, incorrectly calculates the on-page offset when copying repair data to the file's page cache. In environments where the block size is smaller than the page size, this flaw can cause data corruption and leak uninitialized memory bytes during the recovery process.
Fix these issues by correcting this byte offset calculation on the page.
--- fs/nilfs2/recovery.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/nilfs2/recovery.c +4 -3
@@ -472,9 +472,10 @@ static int nilfs_prepare_segment_for_recstatic int nilfs_recovery_copy_block (struct the_nilfs *nilfs,struct nilfs_recovery_block *rb, -struct page *page) +loff_t pos,struct page *page) {struct buffer_head *bh_org; +size_t from = pos & ~PAGE_MASK ;void *kaddr; bh_org =__bread (nilfs->ns_bdev, rb->blocknr, nilfs->ns_blocksize);
@@ -482,7 +483,7 @@ static int nilfs_recovery_copy_block(strreturn -EIO ; kaddr =kmap_atomic (page); -memcpy (kaddr +bh_offset (bh_org), bh_org->b_data, bh_org->b_size); +memcpy (kaddr + from, bh_org->b_data, bh_org->b_size);kunmap_atomic (kaddr);brelse (bh_org);return 0 ;
@@ -521,7 +522,7 @@ static int nilfs_recover_dsync_blocks(st goto failed_inode; } - err =nilfs_recovery_copy_block (nilfs, rb, page); + err =nilfs_recovery_copy_block (nilfs, rb, pos, page);if (unlikely (err)) goto failed_page;
Greg Kroah-Hartman
maintainerPATCH 136/197 nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 38296afe3c6ee07319e01bb249aa4bb47c07b534 upstream.
Syzbot reported a hang issue in migrate_pages_batch() called by mbind() and nilfs_lookup_dirty_data_buffers() called in the log writer of nilfs2.
While migrate_pages_batch() locks a folio and waits for the writeback to complete, the log writer thread that should bring the writeback to completion picks up the folio being written back in nilfs_lookup_dirty_data_buffers() that it calls for subsequent log creation and was trying to lock the folio. Thus causing a deadlock.
In the first place, it is unexpected that folios/pages in the middle of writeback will be updated and become dirty. Nilfs2 adds a checksum to verify the validity of the log being written and uses it for recovery at mount, so data changes during writeback are suppressed. Since this is broken, an unclean shutdown could potentially cause recovery to fail.
Investigation revealed that the root cause is that the wait for writeback completion in nilfs_page_mkwrite() is conditional, and if the backing device does not require stable writes, data may be modified without waiting.
Fix these issues by making nilfs_page_mkwrite() wait for writeback to finish regardless of the stable write requirement of the backing device.
--- fs/nilfs2/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/nilfs2/file.c +7 -1
@@ -105,7 +105,13 @@ static vm_fault_t nilfs_page_mkwrite(strnilfs_transaction_commit (inode->i_sb); mapped: -wait_for_stable_page (page); +/* +* Since checksumming including data blocks is performed to determine +* the validity of the log to be written and used for recovery, it is +* necessary to wait for writeback to finish here, regardless of the +* stable write requirement of the backing device. +*/ +wait_on_page_writeback (page); out:sb_end_pagefault (inode->i_sb);return block_page_mkwrite_return (ret);
Greg Kroah-Hartman
maintainerPATCH 137/197 crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kim Phillips <[email protected]>
commit ccb88e9549e7cfd8bcd511c538f437e20026e983 upstream.
The SEV platform device can be shutdown with a null psp_master, e.g., using DEBUG_TEST_DRIVER_REMOVE. Found using KASAN:
[ 137.148210] ccp 0000:23:00.1: enabling device (0000 -> 0002) [ 137.162647] ccp 0000:23:00.1: no command queues available [ 137.170598] ccp 0000:23:00.1: sev enabled [ 137.174645] ccp 0000:23:00.1: psp enabled [ 137.178890] general protection fault, probably for non-canonical address 0xdffffc000000001e: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN NOPTI [ 137.182693] KASAN: null-ptr-deref in range [0x00000000000000f0-0x00000000000000f7] [ 137.182693] CPU: 93 PID: 1 Comm: swapper/0 Not tainted 6.8.0-rc1+ #311 [ 137.182693] RIP: 0010:__sev_platform_shutdown_locked+0x51/0x180 [ 137.182693] Code: 08 80 3c 08 00 0f 85 0e 01 00 00 48 8b 1d 67 b6 01 08 48 b8 00 00 00 00 00 fc ff df 48 8d bb f0 00 00 00 48 89 f9 48 c1 e9 03 <80> 3c 01 00 0f 85 fe 00 00 00 48 8b 9b f0 00 00 00 48 85 db 74 2c [ 137.182693] RSP: 0018:ffffc900000cf9b0 EFLAGS: 00010216 [ 137.182693] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 000000000000001e [ 137.182693] RDX: 0000000000000000 RSI: 0000000000000008 RDI: 00000000000000f0 [ 137.182693] RBP: ffffc900000cf9c8 R08: 0000000000000000 R09: fffffbfff58f5a66 [ 137.182693] R10: ffffc900000cf9c8 R11: ffffffffac7ad32f R12: ffff8881e5052c28 [ 137.182693] R13: ffff8881e5052c28 R14: ffff8881758e43e8 R15: ffffffffac64abf8 [ 137.182693] FS: 0000000000000000(0000) GS:ffff889de7000000(0000) knlGS:0000000000000000 [ 137.182693] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 137.182693] CR2: 0000000000000000 CR3: 0000001cf7c7e000 CR4: 0000000000350ef0 [ 137.182693] Call Trace: [ 137.182693] <TASK> [ 137.182693] ? show_regs+0x6c/0x80 [ 137.182693] ? __die_body+0x24/0x70 [ 137.182693] ? die_addr+0x4b/0x80 [ 137.182693] ? exc_general_protection+0x126/0x230 [ 137.182693] ? asm_exc_general_protection+0x2b/0x30 [ 137.182693] ? __sev_platform_shutdown_locked+0x51/0x180 [ 137.182693] sev_firmware_shutdown.isra.0+0x1e/0x80 [ 137.182693] sev_dev_destroy+0x49/0x100 [ 137.182693] psp_dev_destroy+0x47/0xb0 [ 137.182693] sp_destroy+0xbb/0x240 [ 137.182693] sp_pci_remove+0x45/0x60 [ 137.182693] pci_device_remove+0xaa/0x1d0 [ 137.182693] device_remove+0xc7/0x170 [ 137.182693] really_probe+0x374/0xbe0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] __driver_probe_device+0x199/0x460 [ 137.182693] driver_probe_device+0x4e/0xd0 [ 137.182693] __driver_attach+0x191/0x3d0 [ 137.182693] ? __pfx___driver_attach+0x10/0x10 [ 137.182693] bus_for_each_dev+0x100/0x190 [ 137.182693] ? __pfx_bus_for_each_dev+0x10/0x10 [ 137.182693] ? __kasan_check_read+0x15/0x20 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? _raw_spin_unlock+0x27/0x50 [ 137.182693] driver_attach+0x41/0x60 [ 137.182693] bus_add_driver+0x2a8/0x580 [ 137.182693] driver_register+0x141/0x480 [ 137.182693] __pci_register_driver+0x1d6/0x2a0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? esrt_sysfs_init+0x1cd/0x5d0 [ 137.182693] ? __pfx_sp_mod_init+0x10/0x10 [ 137.182693] sp_pci_init+0x22/0x30 [ 137.182693] sp_mod_init+0x14/0x30 [ 137.182693] ? __pfx_sp_mod_init+0x10/0x10 [ 137.182693] do_one_initcall+0xd1/0x470 [ 137.182693] ? __pfx_do_one_initcall+0x10/0x10 [ 137.182693] ? parameq+0x80/0xf0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? __kmalloc+0x3b0/0x4e0 [ 137.182693] ? kernel_init_freeable+0x92d/0x1050 [ 137.182693] ? kasan_populate_vmalloc_pte+0x171/0x190 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] kernel_init_freeable+0xa64/0x1050 [ 137.182693] ? __pfx_kernel_init+0x10/0x10 [ 137.182693] kernel_init+0x24/0x160 [ 137.182693] ? __switch_to_asm+0x3e/0x70 [ 137.182693] ret_from_fork+0x40/0x80 [ 137.182693] ? __pfx_kernel_init+0x10/0x10 [ 137.182693] ret_from_fork_asm+0x1b/0x30 [ 137.182693] </TASK> [ 137.182693] Modules linked in: [ 137.538483] ---[ end trace 0000000000000000 ]---
--- drivers/crypto/ccp/sev-dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/crypto/ccp/sev-dev.c +8 -2
@@ -515,10 +515,16 @@ EXPORT_SYMBOL_GPL(sev_platform_init);static int __sev_platform_shutdown_locked (int *error) { -struct sev_device *sev = psp_master->sev_data; +struct psp_device *psp = psp_master; +struct sev_device *sev;int ret; -if (!sev || sev->state ==SEV_STATE_UNINIT ) +if (!psp || !psp->sev_data) +return 0 ; + + sev = psp->sev_data; + +if (sev->state ==SEV_STATE_UNINIT )return 0 ; ret =__sev_do_cmd_locked (SEV_CMD_SHUTDOWN ,NULL , error);
Greg Kroah-Hartman
maintainerPATCH 138/197 nfp: use correct macro for LengthSelect in BAR config
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Basilio <[email protected]>
commit b3d4f7f2288901ed2392695919b3c0e24c1b4084 upstream.
The 1st and 2nd expansion BAR configuration registers are configured, when the driver starts up, in variables 'barcfg_msix_general' and 'barcfg_msix_xpb', respectively. The 'LengthSelect' field is ORed in from bit 0, which is incorrect. The 'LengthSelect' field should start from bit 27.
This has largely gone un-noticed because NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT happens to be 0.
--- drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +4 -2
@@ -537,11 +537,13 @@ static int enable_bars(struct nfp6000_pcconst u32 barcfg_msix_general =NFP_PCIE_BAR_PCIE2CPP_MapType ( NFP_PCIE_BAR_PCIE2CPP_MapType_GENERAL) | - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT; +NFP_PCIE_BAR_PCIE2CPP_LengthSelect ( + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT);const u32 barcfg_msix_xpb =NFP_PCIE_BAR_PCIE2CPP_MapType ( NFP_PCIE_BAR_PCIE2CPP_MapType_BULK) | - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT | +NFP_PCIE_BAR_PCIE2CPP_LengthSelect ( + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT) |NFP_PCIE_BAR_PCIE2CPP_Target_BaseAddress (NFP_CPP_TARGET_ISLAND_XPB );const u32 barcfg_explicit[4 ] = {
Greg Kroah-Hartman
maintainerPATCH 139/197 nfp: flower: prevent re-adding mac index for bonded port
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel de Villiers <[email protected]>
commit 1a1c13303ff6d64e6f718dc8aa614e580ca8d9b4 upstream.
When physical ports are reset (either through link failure or manually toggled down and up again) that are slaved to a Linux bond with a tunnel endpoint IP address on the bond device, not all tunnel packets arriving on the bond port are decapped as expected.
The bond dev assigns the same MAC address to itself and each of its slaves. When toggling a slave device, the same MAC address is therefore offloaded to the NFP multiple times with different indexes.
The issue only occurs when re-adding the shared mac. The nfp_tunnel_add_shared_mac() function has a conditional check early on that checks if a mac entry already exists and if that mac entry is
global: (entry && nfp_tunnel_is_mac_idx_global(entry->index)). In the case of a bonded device (For example br-ex), the mac index is obtained, and no new index is assigned.
We therefore modify the conditional in nfp_tunnel_add_shared_mac() to check if the port belongs to the LAG along with the existing checks to prevent a new global mac index from being re-assigned to the slave port.
--- drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +1 -1
@@ -980,7 +980,7 @@ nfp_tunnel_add_shared_mac(struct nfp_appu16 nfp_mac_idx =0 ; entry =nfp_tunnel_lookup_offloaded_macs (app, netdev->dev_addr); -if (entry &&nfp_tunnel_is_mac_idx_global (entry->index)) { +if (entry && (nfp_tunnel_is_mac_idx_global (entry->index) ||netif_is_lag_port (netdev))) {if (entry->bridge_count || !nfp_flower_is_supported_bridge (netdev)) { nfp_tunnel_offloaded_macs_inc_ref_and_link(entry,
Greg Kroah-Hartman
maintainerPATCH 140/197 wifi: cfg80211: fix wiphy delayed work queueing
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit b743287d7a0007493f5cada34ed2085d475050b4 upstream.
When a wiphy work is queued with timer, and then again without a delay, it's started immediately but *also* started again after the timer expires. This can lead, for example, to warnings in mac80211's offchannel code as reported by Jouni. Running the same work twice isn't expected, of course. Fix this by deleting the timer at this point, when queuing immediately due to delay=0.
--- net/wireless/core.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/core.c +1 -0
@@ -1671,6 +1671,7 @@ void wiphy_delayed_work_queue(struct wip unsigned long delay) {if (!delay) { +del_timer (&dwork->timer);wiphy_work_queue (wiphy, &dwork->work);return ; }
Greg Kroah-Hartman
maintainerPATCH 141/197 wifi: mac80211: reload info pointer in ieee80211_tx_dequeue()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c98d8836b817d11fdff4ca7749cbbe04ff7f0c64 upstream.
This pointer can change here since the SKB can change, so we actually later open-coded IEEE80211_SKB_CB() again. Reload the pointer where needed, so the monitor-mode case using it gets fixed, and then use info-> later as well.
--- net/mac80211/tx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac80211/tx.c +3 -2
@@ -5,7 +5,7 @@* Copyright 2006-2007 Jiri Benc <[email protected]> * Copyright 2007 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH -* Copyright (C) 2018-2022 Intel Corporation +* Copyright (C) 2018-2024 Intel Corporation * * Transmit and frame generation functions. */
@@ -3838,6 +3838,7 @@ begin: goto begin; skb =__skb_dequeue (&tx.skbs); + info =IEEE80211_SKB_CB (skb);if (!skb_queue_empty (&tx.skbs)) {spin_lock_bh (&fq->lock);
@@ -3882,7 +3883,7 @@ begin: } encap_out: -IEEE80211_SKB_CB (skb)->control.vif = vif; + info->control.vif = vif;if (tx.sta &&wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AQL )) {
Greg Kroah-Hartman
maintainerPATCH 142/197 irqchip/irq-brcmstb-l2: Add write memory barrier before exit
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Berger <[email protected]>
commit b0344d6854d25a8b3b901c778b1728885dd99007 upstream.
It was observed on Broadcom devices that use GIC v3 architecture L1 interrupt controllers as the parent of brcmstb-l2 interrupt controllers that the deactivation of the parent interrupt could happen before the brcmstb-l2 deasserted its output. This would lead the GIC to reactivate the interrupt only to find that no L2 interrupt was pending. The result was a spurious interrupt invoking handle_bad_irq() with its associated messaging. While this did not create a functional problem it is a waste of cycles.
The hazard exists because the memory mapped bus writes to the brcmstb-l2 registers are buffered and the GIC v3 architecture uses a very efficient system register write to deactivate the interrupt.
Add a write memory barrier prior to invoking chained_irq_exit() to introduce a dsb(st) on those systems to ensure the system register write cannot be executed until the memory mapped writes are visible to the system.
[ florian: Added Fixes tag ]
--- drivers/irqchip/irq-brcmstb-l2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/irqchip/irq-brcmstb-l2.c +4 -1
@@ -2,7 +2,7 @@/* * Generic Broadcom Set Top Box Level 2 Interrupt controller driver * -* Copyright (C) 2014-2017 Broadcom +* Copyright (C) 2014-2024 Broadcom */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -113,6 +113,9 @@ static void brcmstb_l2_intc_irq_handle(sgeneric_handle_domain_irq (b->domain, irq); }while (status); out: +/* Don't ack parent before all device writes are done */ +wmb (); +chained_irq_exit (chip, desc); }
Greg Kroah-Hartman
maintainerPATCH 143/197 irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit af9acbfc2c4b72c378d0b9a2ee023ed01055d3e2 upstream.
When updating the affinity of a VPE, the VMOVP command is currently skipped if the two CPUs are part of the same VPE affinity.
But this is wrong, as the doorbell corresponding to this VPE is still delivered on the 'old' CPU, which screws up the balancing. Furthermore, offlining that 'old' CPU results in doorbell interrupts generated for this VPE being discarded.
The harsh reality is that VMOVP cannot be elided when a set_affinity() request occurs. It needs to be obeyed, and if an optimisation is to be made, it is at the point where the affinity change request is made (such as in KVM).
Drop the VMOVP elision altogether, and only use the vpe_table_mask to try and stay within the same ITS affinity group if at all possible.
--- drivers/irqchip/irq-gic-v3-its.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +13 -9
@@ -3805,8 +3805,9 @@ static int its_vpe_set_affinity(struct i bool force) {struct its_vpe *vpe =irq_data_get_irq_chip_data (d); -int from, cpu =cpumask_first (mask_val); +struct cpumask common, *table_mask;unsigned long flags; +int from, cpu;/* * Changing affinity is mega expensive, so let's be as lazy as
@@ -3822,19 +3823,22 @@ static int its_vpe_set_affinity(struct i* taken on any vLPI handling path that evaluates vpe->col_idx. */ from =vpe_to_cpuid_lock (vpe, &flags); -if (from == cpu) - goto out; - - vpe->col_idx = cpu; + table_mask =gic_data_rdist_cpu (from)->vpe_table_mask;/* -* GICv4.1 allows us to skip VMOVP if moving to a cpu whose RD -* is sharing its VPE table with the current one. +* If we are offered another CPU in the same GICv4.1 ITS +* affinity, pick this one. Otherwise, any CPU will do. */ -if (gic_data_rdist_cpu (cpu)->vpe_table_mask && -cpumask_test_cpu (from,gic_data_rdist_cpu (cpu)->vpe_table_mask)) +if (table_mask &&cpumask_and (&common, mask_val, table_mask)) + cpu =cpumask_test_cpu (from, &common) ? from :cpumask_first (&common); +else + cpu =cpumask_first (mask_val); + +if (from == cpu) goto out; + vpe->col_idx = cpu; +its_send_vmovp (vpe);its_vpe_db_proxy_move (vpe, from, cpu);
Greg Kroah-Hartman
maintainerPATCH 144/197 zonefs: Improve error handling
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 14db5f64a971fce3d8ea35de4dfc7f443a3efb92 upstream.
Write error handling is racy and can sometime lead to the error recovery path wrongly changing the inode size of a sequential zone file to an incorrect value which results in garbage data being readable at the end of a file. There are 2 problems:
1) zonefs_file_dio_write() updates a zone file write pointer offset after issuing a direct IO with iomap_dio_rw(). This update is done only if the IO succeed for synchronous direct writes. However, for asynchronous direct writes, the update is done without waiting for the IO completion so that the next asynchronous IO can be immediately issued. However, if an asynchronous IO completes with a failure right before the i_truncate_mutex lock protecting the update, the update may change the value of the inode write pointer offset that was corrected by the error path (zonefs_io_error() function).
2) zonefs_io_error() is called when a read or write error occurs. This function executes a report zone operation using the callback function zonefs_io_error_cb(), which does all the error recovery handling based on the current zone condition, write pointer position and according to the mount options being used. However, depending on the zoned device being used, a report zone callback may be executed in a context that is different from the context of __zonefs_io_error(). As a result, zonefs_io_error_cb() may be executed without the inode truncate mutex lock held, which can lead to invalid error processing.
Fix both problems as follows:
- Problem 1: Perform the inode write pointer offset update before a direct write is issued with iomap_dio_rw(). This is safe to do as partial direct writes are not supported (IOMAP_DIO_PARTIAL is not set) and any failed IO will trigger the execution of zonefs_io_error() which will correct the inode write pointer offset to reflect the current state of the one on the device.
- Problem 2: Change zonefs_io_error_cb() into zonefs_handle_io_error() and call this function directly from __zonefs_io_error() after obtaining the zone information using blkdev_report_zones() with a simple callback function that copies to a local stack variable the struct blk_zone obtained from the device. This ensures that error handling is performed holding the inode truncate mutex. This change also simplifies error handling for conventional zone files by bypassing the execution of report zones entirely. This is safe to do because the condition of conventional zones cannot be read-only or offline and conventional zone files are always fully mapped with a constant file size.
--- fs/zonefs/file.c | 42 +++++++++++++++++++++------------ fs/zonefs/super.c | 68 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 66 insertions(+), 44 deletions(-)
fs/zonefs/file.c +27 -15
@@ -349,7 +349,12 @@ static int zonefs_file_write_dio_end_io(struct zonefs_inode_info *zi =ZONEFS_I (inode);if (error) { -zonefs_io_error (inode, true); +/* +* For Sync IOs, error recovery is called from +* zonefs_file_dio_write(). +*/ +if (!is_sync_kiocb (iocb)) +zonefs_io_error (inode, true);return error; }
@@ -577,6 +582,14 @@ static ssize_t zonefs_file_dio_write(str ret = -EINVAL ; goto inode_unlock; } +/* +* Advance the zone write pointer offset. This assumes that the +* IO will succeed, which is OK to do because we do not allow +* partial writes (IOMAP_DIO_PARTIAL is not set) and if the IO +* fails, the error path will correct the write pointer offset. +*/ + z->z_wpoffset += count; +zonefs_inode_account_active (inode);mutex_unlock (&zi->i_truncate_mutex); append = sync; }
@@ -596,20 +609,19 @@ static ssize_t zonefs_file_dio_write(str ret = -EBUSY ; } -if (zonefs_zone_is_seq (z) && - (ret >0 || ret == -EIOCBQUEUED )) { -if (ret >0 ) - count = ret; - -/* -* Update the zone write pointer offset assuming the write -* operation succeeded. If it did not, the error recovery path -* will correct it. Also do active seq file accounting. -*/ -mutex_lock (&zi->i_truncate_mutex); - z->z_wpoffset += count; -zonefs_inode_account_active (inode); -mutex_unlock (&zi->i_truncate_mutex); +/* +* For a failed IO or partial completion, trigger error recovery +* to update the zone write pointer offset to a correct value. +* For asynchronous IOs, zonefs_file_write_dio_end_io() may already +* have executed error recovery if the IO already completed when we +* reach here. However, we cannot know that and execute error recovery +* again (that will not change anything). +*/ +if (zonefs_zone_is_seq (z)) { +if (ret >0 && ret != count) + ret = -EIO ; +if (ret <0 && ret != -EIOCBQUEUED ) +zonefs_io_error (inode, true); } inode_unlock:
fs/zonefs/super.c +39 -29
113 lines not on this page · raw message