5.4.62-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.4.62-rc1 review
This is the start of the stable review cycle for the 5.4.62 release. There are 214 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, 03 Sep 2020 15:09:01 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.62-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.62-rc1
Hector Martin <[email protected]>
ALSA: usb-audio: Update documentation comment for MS2109 quirk
Andrii Nakryiko <[email protected]>
libbpf: Fix build on ppc64le architecture
Peilin Ye <[email protected]>
HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
Denis Efremov <[email protected]>
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
Denis Efremov <[email protected]>
kbuild: add variables for compression tools
Masahiro Yamada <[email protected]>
kheaders: explain why include/config/autoconf.h is excluded from md5sum
Masahiro Yamada <[email protected]>
kheaders: remove the last bashism to allow sh to run it
Masahiro Yamada <[email protected]>
kheaders: optimize header copy for in-tree builds
Masahiro Yamada <[email protected]>
kheaders: optimize md5sum calculation for in-tree builds
Masahiro Yamada <[email protected]>
kheaders: remove unneeded 'cat' command piped to 'head' / 'tail'
Tetsuo Handa <[email protected]>
fbmem: pull fbcon_update_vcs() out of fb_set_var()
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Handle ZLP for sg requests
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Fix handling ZLP
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't setup more than requested
Mika Kuoppala <[email protected]>
drm/i915: Fix cmd parser desc matching with masks
Alan Stern <[email protected]>
usb: storage: Add unusual_uas entry for Sony PSZ drives
Tom Rix <[email protected]>
USB: cdc-acm: rework notification_buffer resizing
Andy Shevchenko <[email protected]>
USB: gadget: u_f: Unbreak offset calculation in VLAs
Brooke Basile <[email protected]>
USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
Brooke Basile <[email protected]>
USB: gadget: u_f: add overflow checks to VLA macros
Tang Bin <[email protected]>
usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
Cyril Roelandt <[email protected]>
USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
Alan Stern <[email protected]>
USB: quirks: Ignore duplicate endpoint on Sound Devices MixPre-D
Kai-Heng Feng <[email protected]>
USB: quirks: Add no-lpm quirk for another Raydium touchscreen
Thinh Nguyen <[email protected]>
usb: uas: Add quirk for PNY Pro Elite
Alan Stern <[email protected]>
USB: yurex: Fix bad gfp argument
Evan Quan <[email protected]>
drm/amd/pm: correct the thermal alert temperature limit settings
Evan Quan <[email protected]>
drm/amd/pm: correct Vega20 swctf limit setting
Evan Quan <[email protected]>
drm/amd/pm: correct Vega12 swctf limit setting
Evan Quan <[email protected]>
drm/amd/pm: correct Vega10 swctf limit setting
Nicholas Kazlauskas <[email protected]>
drm/amd/powerplay: Fix hardmins not being sent to SMU for RV
Jiansong Chen <[email protected]>
drm/amdgpu/gfx10: refine mgcg setting
Alex Deucher <[email protected]>
drm/amdgpu: Fix buffer overflow in INFO ioctl
Ashok Raj <[email protected]>
x86/hotplug: Silence APIC only after all interrupts are migrated
qiuguorui1 <[email protected]>
irqchip/stm32-exti: Avoid losing interrupts due to clearing pending bits by mistake
Thomas Gleixner <[email protected]>
genirq/matrix: Deal with the sillyness of for_each_cpu() on UP
Herbert Xu <[email protected]>
crypto: af_alg - Work around empty control messages without MSG_MORE
Heikki Krogerus <[email protected]>
device property: Fix the secondary firmware node handling in set_primary_fwnode()
Alexey Kardashevskiy <[email protected]>
powerpc/perf: Fix crashes with generic_compat_pmu & BHRB
Rafael J. Wysocki <[email protected]>
PM: sleep: core: Fix the handling of pending runtime resume requests
Frank van der Linden <[email protected]>
arm64: vdso32: make vdso32 install conditional
Ding Hui <[email protected]>
xhci: Always restore EP_SOFT_CLEAR_TOGGLE even if ep reset failed
Kai-Heng Feng <[email protected]>
xhci: Do warm-reset when both CAS and XDEV_RESUME are set
Li Jun <[email protected]>
usb: host: xhci: fix ep context print mismatch in debugfs
Thomas Gleixner <[email protected]>
XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.
Jan Kara <[email protected]>
writeback: Fix sync livelock due to b_dirty_time processing
Jan Kara <[email protected]>
writeback: Avoid skipping inode writeback
Jan Kara <[email protected]>
writeback: Protect inode->i_io_list with inode->i_lock
Sergey Senozhatsky <[email protected]>
serial: 8250: change lock order in serial8250_do_startup()
Valmer Huhn <[email protected]>
serial: 8250_exar: Fix number of ports for Commtech PCIe cards
Holger Assmann <[email protected]>
serial: stm32: avoid kernel warning on absence of optional IRQ
Lukas Wunner <[email protected]>
serial: pl011: Don't leak amba_ports entry on driver register error
Lukas Wunner <[email protected]>
serial: pl011: Fix oops on -EPROBE_DEFER
Tamseel Shams <[email protected]>
serial: samsung: Removes the IRQ not found warning
George Kennedy <[email protected]>
vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
Tetsuo Handa <[email protected]>
vt: defer kfree() of vc_screenbuf in vc_do_resize()
Evgeny Novikov <[email protected]>
USB: lvtest: return proper error code in probe
George Kennedy <[email protected]>
fbcon: prevent user font height or width change from causing potential out-of-bounds access
Boris Burkov <[email protected]>
btrfs: detect nocow for swap after snapshot delete
Filipe Manana <[email protected]>
btrfs: fix space cache memory leak after transaction abort
Josef Bacik <[email protected]>
btrfs: check the right error variable in btrfs_del_dir_entries_in_log
Marcos Paulo de Souza <[email protected]>
btrfs: reset compression level for lzo on remount
Ming Lei <[email protected]>
blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART
Hans de Goede <[email protected]>
HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
Ming Lei <[email protected]>
block: loop: set discard granularity and alignment for block device backed loop
Keith Busch <[email protected]>
block: fix get_max_io_size()
Marc Zyngier <[email protected]>
arm64: Allow booting of late CPUs affected by erratum 1418040
Marc Zyngier <[email protected]>
arm64: Move handling of erratum 1418040 into C code
Athira Rajeev <[email protected]>
powerpc/perf: Fix soft lockups due to missed interrupt accounting
Sumera Priyadarsini <[email protected]>
net: gianfar: Add of_node_put() before goto statement
Alvin Šipraga <[email protected]>
macvlan: validate setting of multiple remote source MAC addresses
Saurav Kashyap <[email protected]>
Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Check if FW supports MQ before enabling
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix login timeout
Stanley Chu <[email protected]>
scsi: ufs: Clean up completed request without interrupt notification
Adrian Hunter <[email protected]>
scsi: ufs: Improve interrupt handling for shared interrupts
Stanley Chu <[email protected]>
scsi: ufs: Fix possible infinite loop in ufshcd_hold
Mike Christie <[email protected]>
scsi: fcoe: Fix I/O path allocation
David Ahern <[email protected]>
selftests: disable rp_filter for icmp_redirect.sh
Sylwester Nawrocki <[email protected]>
ASoC: wm8994: Avoid attempts to read unreadable registers
Vineeth Vijayan <[email protected]>
s390/cio: add cond_resched() in the slow_eval_known_fn() loop
Mike Pozulp <[email protected]>
ALSA: hda/realtek: Add model alc298-samsung-headphone
Oleksij Rempel <[email protected]>
can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions
Florian Westphal <[email protected]>
netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency
Jean-Philippe Brucker <[email protected]>
libbpf: Handle GCC built-in types for Arm NEON
Anthony Koo <[email protected]>
drm/amd/display: Switch to immediate mode for updating infopackets
Evan Quan <[email protected]>
drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading
Evan Quan <[email protected]>
drm/amd/powerplay: correct Vega20 cached smu feature state
Alain Volmat <[email protected]>
spi: stm32: always perform registers configuration prior to transfer
Amelie Delaunay <[email protected]>
spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate
Amelie Delaunay <[email protected]>
spi: stm32: fix fifo threshold level in case of short transfer
Antonio Borneo <[email protected]>
spi: stm32h7: fix race condition at end of transfer
Xianting Tian <[email protected]>
fs: prevent BUG_ON in submit_bh_wbc()
Jan Kara <[email protected]>
ext4: correctly restore system zone info when remount fails
Jan Kara <[email protected]>
ext4: handle error of ext4_setup_system_zone() on remount
Lukas Czerner <[email protected]>
ext4: handle option set by mount flags correctly
zhangyi (F) <[email protected]>
jbd2: abort journal if free a async write error metadata buffer
Lukas Czerner <[email protected]>
ext4: handle read only external journal device
Jan Kara <[email protected]>
ext4: don't BUG on inconsistent journal feature
Lukas Czerner <[email protected]>
jbd2: make sure jh have b_transaction set in refile/unfile_buffer
Tobias Schramm <[email protected]>
spi: stm32: clear only asserted irq flags on interrupt
Christophe JAILLET <[email protected]>
usb: gadget: f_tcm: Fix some resource leaks in some error paths
Wolfram Sang <[email protected]>
i2c: rcar: in slave mode, clear NACK earlier
Andy Shevchenko <[email protected]>
i2c: core: Don't fail PRP0001 enumeration when no ID table exist
Hou Pu <[email protected]>
null_blk: fix passing of REQ_FUA flag in null_handle_rq
Martin Wilck <[email protected]>
nvme: multipath: round-robin: fix single non-optimized path case
Tianjia Zhang <[email protected]>
nvme-fc: Fix wrong return value in __nvme_fc_init_request()
Yufen Yu <[email protected]>
blkcg: fix memleak for iolatency
Ming Lei <[email protected]>
blk-mq: insert request not through ->queue_rq into sw/scheduler queue
Jason Baron <[email protected]>
hwmon: (nct7904) Correct divide by 0
Dmitry Monakhov <[email protected]>
bfq: fix blkio cgroup leakage v4
Matthew Wilcox (Oracle) <[email protected]>
block: Fix page_is_mergeable() for compound pages
Rob Clark <[email protected]>
drm/msm/adreno: fix updating ring fence
Ming Lei <[email protected]>
block: virtio_blk: fix handling single range discard request
Ming Lei <[email protected]>
block: respect queue limit of max discard segment
Sean Young <[email protected]>
media: gpio-ir-tx: improve precision of transmitted signal due to scheduling
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode
Ansuel Smith <[email protected]>
PCI: qcom: Add missing reset for ipq806x
Abhishek Sahu <[email protected]>
PCI: qcom: Change duplicate PCI reset to phy reset
Ansuel Smith <[email protected]>
PCI: qcom: Add missing ipq806x clocks in PCIe driver
Tony Luck <[email protected]>
EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
Mauro Carvalho Chehab <[email protected]>
EDAC: skx_common: get rid of unused type var
Mauro Carvalho Chehab <[email protected]>
EDAC: sb_edac: get rid of unused vars
Sasha Levin <[email protected]>
mm/vunmap: add cond_resched() in vunmap_pmd_range
Stylon Wang <[email protected]>
drm/amd/display: Fix dmesg warning from setting abm level
Aurabindo Pillai <[email protected]>
drm/amd/display: Add additional config guards for DCN
Mikita Lipski <[email protected]>
drm/amd/display: Trigger modesets on MST DSC connectors
Paul Cercueil <[email protected]>
drm/ingenic: Fix incorrect assumption about plane->index
Paul Cercueil <[email protected]>
gpu/drm: ingenic: Use the plane's src_[x,y] to configure DMA length
Mike Kravetz <[email protected]>
cma: don't quit at first error when activating reserved areas
Yunfeng Ye <[email protected]>
mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation
Peter Zijlstra <[email protected]>
mm: fix kthread_use_mm() vs TLB invalidate
David Hildenbrand <[email protected]>
mm/shuffle: don't move pages between zones and don't read garbage memmaps
Filipe Manana <[email protected]>
btrfs: only commit delayed items at fsync if we are logging a directory
Filipe Manana <[email protected]>
btrfs: only commit the delayed inode when doing a full fsync
Filipe Manana <[email protected]>
btrfs: factor out inode items copy loop from btrfs_log_inode()
Sasha Levin <[email protected]>
s390/numa: set node distance to LOCAL_DISTANCE
Oleksandr Andrushchenko <[email protected]>
drm/xen-front: Fix misused IS_ERR_OR_NULL checks
Ding Xiang <[email protected]>
drm/xen: fix passing zero to 'PTR_ERR' warning
Marc Zyngier <[email protected]>
PM / devfreq: rk3399_dmc: Fix kernel oops when rockchip,pmu is absent
Yangtao Li <[email protected]>
PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails
Yangtao Li <[email protected]>
PM / devfreq: rk3399_dmc: Add missing of_node_put()
Sasha Levin <[email protected]>
usb: cdns3: gadget: always zeroed TRB buffer when enable endpoint
Qais Yousef <[email protected]>
sched/uclamp: Fix a deadlock when enabling uclamp static key
Qais Yousef <[email protected]>
sched/uclamp: Protect uclamp fast path code with static key
Zhi Chen <[email protected]>
Revert "ath10k: fix DMA related firmware crashes on multiple devices"
Kefeng Wang <[email protected]>
arm64: Fix __cpu_logical_map undefined issue
Andrey Konovalov <[email protected]>
efi: provide empty efi_enter_virtual_mode implementation
Nicolas Saenz Julienne <[email protected]>
brcmfmac: Set timeout value when configuring power save
Changming Liu <[email protected]>
USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
Arnd Bergmann <[email protected]>
powerpc/spufs: add CONFIG_COREDUMP dependency
David Brazdil <[email protected]>
KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
Evgeny Novikov <[email protected]>
media: davinci: vpif_capture: fix potential double free
Mike Kravetz <[email protected]>
hugetlbfs: prevent filesystem stacking of hugetlbfs
Jason Baron <[email protected]>
EDAC/ie31200: Fallback if host bridge device is already initialized
Javed Hasan <[email protected]>
scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
Xiubo Li <[email protected]>
ceph: do not access the kiocb after aio requests
Xiubo Li <[email protected]>
ceph: fix potential mdsc use-after-free crash
Jing Xiangfeng <[email protected]>
scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
Nikolay Borisov <[email protected]>
btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
Qu Wenruo <[email protected]>
btrfs: file: reserve qgroup space after the hole punch range is locked
Chris Wilson <[email protected]>
locking/lockdep: Fix overflow in presentation of average lock-time
Aditya Pakki <[email protected]>
drm/nouveau: Fix reference count leak in nouveau_connector_detect
Aditya Pakki <[email protected]>
drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
Aditya Pakki <[email protected]>
drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
Li Guifu <[email protected]>
f2fs: fix use-after-free issue
Ikjoon Jang <[email protected]>
HID: quirks: add NOGET quirk for Logitech GROUP
Hans Verkuil <[email protected]>
cec-api: prevent leaking memory through hole in structure
Kaige Li <[email protected]>
ALSA: hda: Add support for Loongson 7A1000 controller
Peng Fan <[email protected]>
mips/vdso: Fix resource leaks in genvdso.c
Reto Schneider <[email protected]>
rtlwifi: rtl8192cu: Prevent leaking urb
Yangbo Lu <[email protected]>
ARM: dts: ls1021a: output PPS signal on FIPER2
Qiushi Wu <[email protected]>
PCI: Fix pci_create_slot() reference count leak
Aditya Pakki <[email protected]>
omapfb: fix multiple reference count leaks due to pm_runtime_get_sync
Chao Yu <[email protected]>
f2fs: fix error path in do_recover_data()
Desnes A. Nunes do Rosario <[email protected]>
selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
Mike Christie <[email protected]>
scsi: target: Fix xcopy sess release leak
Dave Chinner <[email protected]>
xfs: Don't allow logging of XFS_ISTALE inodes
Dick Kennedy <[email protected]>
scsi: lpfc: Fix shost refcount mismatch when deleting vport
Navid Emamdoost <[email protected]>
drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
Navid Emamdoost <[email protected]>
drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
Navid Emamdoost <[email protected]>
drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
Navid Emamdoost <[email protected]>
drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
Aditya Pakki <[email protected]>
drm/radeon: fix multiple reference count leak
Qiushi Wu <[email protected]>
drm/amdkfd: Fix reference count leaks.
Robin Murphy <[email protected]>
iommu/iova: Don't BUG on invalid PFNs
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs
Bodo Stroesser <[email protected]>
scsi: target: tcmu: Fix crash on ARM during cmd completion
Luis Chamberlain <[email protected]>
blktrace: ensure our debugfs dir exists
Jia-Ju Bai <[email protected]>
media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
Alexey Kardashevskiy <[email protected]>
powerpc/xive: Ignore kmemleak false positives
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
Andy Shevchenko <[email protected]>
mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs
Qiushi Wu <[email protected]>
ASoC: tegra: Fix reference count leaks.
Qiushi Wu <[email protected]>
ASoC: img-parallel-out: Fix a reference count leak
Qiushi Wu <[email protected]>
ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
Kai-Heng Feng <[email protected]>
ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
Randy Dunlap <[email protected]>
ALSA: pci: delete repeated words in comments
Kai-Heng Feng <[email protected]>
ALSA: hda/hdmi: Add quirk to force connectivity
Mahesh Bandewar <[email protected]>
ipvlan: fix device features
Alaa Hleihel <[email protected]>
net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow
Shay Agroskin <[email protected]>
net: ena: Make missed_tx stat incremental
Cong Wang <[email protected]>
tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
Peilin Ye <[email protected]>
net/smc: Prevent kernel-infoleak in __smc_diag_dump()
David Laight <[email protected]>
net: sctp: Fix negotiation of the number of data streams.
Necip Fazil Yildiran <[email protected]>
net: qrtr: fix usage of idr in port assignment to socket
Nikolay Aleksandrov <[email protected]>
net: nexthop: don't allow empty NHA_GROUP
Miaohe Lin <[email protected]>
net: Fix potential wrong skb->protocol in skb_vlan_untag()
Mark Tomlinson <[email protected]>
gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY
Max Filippov <[email protected]>
binfmt_flat: revert "binfmt_flat: don't offset the data start"
Michael Ellerman <[email protected]>
powerpc/64s: Don't init FSCR_DSCR in __init_FSCR()
-------------
Diffstat:
Makefile | 15 +- arch/arm/boot/deflate_xip_data.sh | 2 +- arch/arm/boot/dts/ls1021a.dtsi | 2 +- arch/arm64/Makefile | 3 +- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- arch/arm64/include/asm/smp.h | 7 +- arch/arm64/kernel/cpu_errata.c | 2 + arch/arm64/kernel/process.c | 34 +++ arch/arm64/kernel/setup.c | 8 +- arch/arm64/kernel/smp.c | 6 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/ia64/Makefile | 2 +- arch/m68k/Makefile | 8 +- arch/mips/vdso/genvdso.c | 10 + arch/parisc/Makefile | 2 +- arch/powerpc/kernel/cpu_setup_power.S | 2 +- arch/powerpc/perf/core-book3s.c | 23 +- arch/powerpc/platforms/cell/Kconfig | 1 + arch/powerpc/sysdev/xive/native.c | 2 + arch/s390/include/asm/numa.h | 1 - arch/s390/include/asm/topology.h | 2 - arch/s390/numa/numa.c | 6 - arch/x86/kernel/smpboot.c | 26 +- block/bfq-cgroup.c | 2 +- block/bfq-iosched.h | 1 - block/bfq-wf2q.c | 12 +- block/bio.c | 10 +- block/blk-cgroup.c | 8 +- block/blk-merge.c | 13 +- block/blk-mq-sched.c | 9 + block/blk-mq.c | 12 +- crypto/af_alg.c | 13 +- drivers/base/core.c | 12 +- drivers/base/power/main.c | 16 +- drivers/block/loop.c | 33 ++- drivers/block/null_blk_main.c | 2 +- drivers/block/virtio_blk.c | 31 ++- drivers/cpufreq/intel_pstate.c | 18 +- drivers/devfreq/rk3399_dmc.c | 51 ++-- drivers/edac/i7core_edac.c | 4 +- drivers/edac/ie31200_edac.c | 50 +++- drivers/edac/pnd2_edac.c | 2 +- drivers/edac/sb_edac.c | 25 +- drivers/edac/skx_common.c | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 ++++ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 +- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 22 +- .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 21 +- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 44 ++- .../gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c | 21 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 14 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 6 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 +- drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 22 +- drivers/hid/usbhid/hiddev.c | 4 + drivers/hwmon/nct7904.c | 4 +- drivers/i2c/busses/i2c-rcar.c | 1 + drivers/i2c/i2c-core-base.c | 2 +- drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-stm32-exti.c | 14 +- drivers/media/cec/cec-api.c | 8 +- drivers/media/pci/ttpci/av7110.c | 5 +- drivers/media/platform/davinci/vpif_capture.c | 2 - drivers/media/rc/gpio-ir-tx.c | 7 +- drivers/mfd/intel-lpss-pci.c | 19 ++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 +- drivers/net/ethernet/freescale/gianfar.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ipvlan/ipvlan_main.c | 27 +- drivers/net/macvlan.c | 21 +- drivers/net/wireless/ath/ath10k/hw.h | 2 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 + drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +- drivers/nvme/host/fc.c | 4 +- drivers/nvme/host/multipath.c | 15 +- drivers/pci/controller/dwc/pcie-qcom.c | 58 +++- drivers/pci/slot.c | 6 +- drivers/s390/cio/css.c | 5 + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 26 +- drivers/scsi/qla2xxx/qla_gs.c | 18 +- drivers/scsi/qla2xxx/qla_mbx.c | 8 - drivers/scsi/qla2xxx/qla_nvme.c | 5 + drivers/scsi/qla2xxx/qla_os.c | 5 + drivers/scsi/qla2xxx/qla_target.c | 2 +- drivers/scsi/scsi_transport_iscsi.c | 2 +- drivers/scsi/ufs/ufshcd.c | 14 +- drivers/spi/spi-stm32.c | 73 ++--- drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 7 +- drivers/target/target_core_user.c | 9 +- drivers/target/target_core_xcopy.c | 11 +- drivers/tty/serial/8250/8250_exar.c | 24 +- drivers/tty/serial/8250/8250_port.c | 9 +- drivers/tty/serial/amba-pl011.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/serial/stm32-usart.c | 2 +- drivers/tty/vt/vt.c | 5 +- drivers/tty/vt/vt_ioctl.c | 12 +- drivers/usb/cdns3/gadget.c | 4 +- drivers/usb/class/cdc-acm.c | 22 +- drivers/usb/core/quirks.c | 7 + drivers/usb/dwc3/gadget.c | 104 +++++-- drivers/usb/gadget/function/f_ncm.c | 81 +++++- drivers/usb/gadget/function/f_tcm.c | 7 +- drivers/usb/gadget/u_f.h | 38 ++- drivers/usb/host/ohci-exynos.c | 5 +- drivers/usb/host/xhci-debugfs.c | 8 +- drivers/usb/host/xhci-hub.c | 19 +- drivers/usb/host/xhci.c | 3 +- drivers/usb/misc/lvstest.c | 2 +- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/usb/storage/unusual_uas.h | 14 + drivers/video/fbdev/core/fbcon.c | 25 +- drivers/video/fbdev/core/fbmem.c | 8 +- drivers/video/fbdev/core/fbsysfs.c | 4 +- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +- drivers/video/fbdev/ps3fb.c | 5 +- drivers/xen/events/events_base.c | 16 +- fs/binfmt_flat.c | 20 +- fs/btrfs/ctree.h | 4 +- fs/btrfs/disk-io.c | 1 + fs/btrfs/extent-tree.c | 17 +- fs/btrfs/file.c | 10 +- fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/inode.c | 18 +- fs/btrfs/qgroup.c | 14 +- fs/btrfs/qgroup.h | 2 +- fs/btrfs/super.c | 1 + fs/btrfs/tree-log.c | 305 +++++++++++---------- fs/buffer.c | 9 + fs/ceph/file.c | 5 +- fs/ceph/mds_client.c | 14 +- fs/ext4/block_validity.c | 8 - fs/ext4/super.c | 175 ++++++++---- fs/f2fs/f2fs.h | 4 +- fs/f2fs/inline.c | 19 +- fs/f2fs/node.c | 6 +- fs/f2fs/recovery.c | 10 +- fs/f2fs/super.c | 5 +- fs/fs-writeback.c | 83 +++--- fs/hugetlbfs/inode.c | 6 + fs/jbd2/transaction.c | 26 ++ fs/xfs/libxfs/xfs_trans_inode.c | 2 + fs/xfs/xfs_icache.c | 3 +- fs/xfs/xfs_inode.c | 25 +- include/linux/efi.h | 4 + include/linux/fb.h | 2 - include/linux/fs.h | 8 +- include/linux/netfilter_ipv6.h | 18 -- include/trace/events/writeback.h | 13 +- kernel/Makefile | 2 +- kernel/gen_kheaders.sh | 66 +++-- kernel/irq/matrix.c | 7 + kernel/locking/lockdep_proc.c | 2 +- kernel/sched/core.c | 81 +++++- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/sched.h | 47 +++- kernel/trace/blktrace.c | 12 + mm/cma.c | 29 +- mm/mmu_context.c | 7 +- mm/shuffle.c | 18 +- mm/vmalloc.c | 2 + net/bridge/netfilter/nf_conntrack_bridge.c | 8 +- net/can/j1939/transport.c | 15 +- net/core/skbuff.c | 4 +- net/ipv4/nexthop.c | 5 +- net/ipv6/ip6_tunnel.c | 10 +- net/ipv6/netfilter.c | 3 - net/qrtr/qrtr.c | 20 +- net/sched/act_ct.c | 2 +- net/sctp/stream.c | 6 +- net/smc/smc_diag.c | 16 +- net/tipc/netlink_compat.c | 12 +- scripts/Makefile.lib | 12 +- scripts/Makefile.package | 8 +- scripts/package/buildtar | 6 +- scripts/xz_wrap.sh | 2 +- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_hdmi.c | 17 +- sound/pci/hda/patch_realtek.c | 12 + sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- sound/soc/codecs/wm8958-dsp2.c | 4 + sound/soc/img/img-i2s-in.c | 4 +- sound/soc/img/img-parallel-out.c | 4 +- sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- sound/usb/quirks-table.h | 34 ++- tools/lib/bpf/btf_dump.c | 35 ++- tools/testing/selftests/net/icmp_redirect.sh | 2 + .../powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 - .../selftests/powerpc/pmu/ebb/cycles_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 - .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 - tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 - .../powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 - .../powerpc/pmu/ebb/lost_exception_test.c | 1 - .../selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 - .../powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 - .../selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 - .../powerpc/pmu/ebb/pmc56_overflow_test.c | 2 - 231 files changed, 2150 insertions(+), 1015 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/214 powerpc/64s: Dont init FSCR_DSCR in __init_FSCR()
From: Michael Ellerman <[email protected]>
commit 0828137e8f16721842468e33df0460044a0c588b upstream.
__init_FSCR() was added originally in commit 2468dcf641e4 ("powerpc:
Add support for context switching the TAR register") (Feb 2013), and only set FSCR_TAR.
At that point FSCR (Facility Status and Control Register) was not context switched, so the setting was permanent after boot.
Later we added initialisation of FSCR_DSCR to __init_FSCR(), in commit 54c9b2253d34 ("powerpc: Set DSCR bit in FSCR setup") (Mar 2013), again that was permanent after boot.
Then commit 2517617e0de6 ("powerpc: Fix context switch DSCR on POWER8") (Aug 2013) added a limited context switch of FSCR, just the FSCR_DSCR bit was context switched based on thread.dscr_inherit. That commit said "This clears the H/FSCR DSCR bit initially", but it didn't, it left the initialisation of FSCR_DSCR in __init_FSCR(). However the initial context switch from init_task to pid 1 would clear FSCR_DSCR because thread.dscr_inherit was 0.
That commit also introduced the requirement that FSCR_DSCR be clear for user processes, so that we can take the facility unavailable interrupt in order to manage dscr_inherit.
Then in commit 152d523e6307 ("powerpc: Create context switch helpers save_sprs() and restore_sprs()") (Dec 2015) FSCR was added to thread_struct. However it still wasn't fully context switched, we just took the existing value and set FSCR_DSCR if the new thread had dscr_inherit set. FSCR was still initialised at boot to FSCR_DSCR | FSCR_TAR, but that value was not propagated into the thread_struct, so the initial context switch set FSCR_DSCR back to 0.
Finally commit b57bd2de8c6c ("powerpc: Improve FSCR init and context switching") (Jun 2016) added a full context switch of the FSCR, and added an initialisation of init_task.thread.fscr to FSCR_TAR | FSCR_EBB, but omitted FSCR_DSCR.
The end result is that swapper runs with FSCR_DSCR set because of the initialisation in __init_FSCR(), but no other processes do, they use the value from init_task.thread.fscr.
Having FSCR_DSCR set for swapper allows it to access SPR 3 from userspace, but swapper never runs userspace, so it has no useful effect. It's also confusing to have the value initialised in two places to two different values.
So remove FSCR_DSCR from __init_FSCR(), this at least gets us to the point where there's a single value of FSCR, even if it's still set in two places.
--- arch/powerpc/kernel/cpu_setup_power.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/cpu_setup_power.S +1 -1
@@ -184,7 +184,7 @@ __init_LPCR_ISA300: __init_FSCR: mfspr r3,SPRN_FSCR - ori r3,r3,FSCR_TAR|FSCR_DSCR|FSCR_EBB + ori r3,r3,FSCR_TAR|FSCR_EBB mtspr SPRN_FSCR,r3 blr
Greg Kroah-Hartman
maintainerPATCH 2/214 binfmt_flat: revert "binfmt_flat: dont offset the data start"
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit 2217b982624680d19a80ebb4600d05c8586c4f96 upstream.
binfmt_flat loader uses the gap between text and data to store data segment pointers for the libraries. Even in the absence of shared libraries it stores at least one pointer to the executable's own data segment. Text and data can go back to back in the flat binary image and without offsetting data segment last few instructions in the text segment may get corrupted by the data segment pointer.
Fix it by reverting commit a2357223c50a ("binfmt_flat: don't offset the data start").
--- fs/binfmt_flat.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
fs/binfmt_flat.c +12 -8
@@ -571,7 +571,7 @@ static int load_flat_file(struct linux_b goto err; } - len = data_len + extra; + len = data_len + extra +MAX_SHARED_LIBS *sizeof (unsigned long ); len =PAGE_ALIGN (len); realdatastart =vm_mmap (NULL ,0 , len,PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_PRIVATE ,0 );
@@ -585,7 +585,9 @@ static int load_flat_file(struct linux_bvm_munmap (textpos, text_len); goto err; } - datapos =ALIGN (realdatastart,FLAT_DATA_ALIGN ); + datapos =ALIGN (realdatastart + +MAX_SHARED_LIBS *sizeof (unsigned long ), +FLAT_DATA_ALIGN );pr_debug ("Allocated data+bss+stack (%u bytes): %lx\n" , data_len + bss_len + stack_len, datapos);
@@ -615,7 +617,7 @@ static int load_flat_file(struct linux_b memp_size = len; }else { - len = text_len + data_len + extra; + len = text_len + data_len + extra +MAX_SHARED_LIBS *sizeof (u32); len =PAGE_ALIGN (len); textpos =vm_mmap (NULL ,0 , len,PROT_READ |PROT_EXEC |PROT_WRITE ,MAP_PRIVATE ,0 );
@@ -630,7 +632,9 @@ static int load_flat_file(struct linux_b } realdatastart = textpos +ntohl (hdr->data_start); - datapos =ALIGN (realdatastart,FLAT_DATA_ALIGN ); + datapos =ALIGN (realdatastart + +MAX_SHARED_LIBS *sizeof (u32), +FLAT_DATA_ALIGN ); reloc = (__be32 __user *) (datapos + (ntohl (hdr->reloc_start) - text_len));
@@ -647,9 +651,8 @@ static int load_flat_file(struct linux_b (text_len + full_data -sizeof (struct flat_hdr )), 0); -if (datapos != realdatastart) -memmove ((void *)datapos, (void *)realdatastart, - full_data); +memmove ((void *) datapos, (void *) realdatastart, + full_data);#else /* * This is used on MMU systems mainly for testing.
@@ -705,7 +708,8 @@ static int load_flat_file(struct linux_bif (IS_ERR_VALUE (result)) { ret = result;pr_err ("Unable to read code+data+bss, errno %d\n" , ret); -vm_munmap (textpos, text_len + data_len + extra); +vm_munmap (textpos, text_len + data_len + extra + +MAX_SHARED_LIBS *sizeof (u32)); goto err; } }
Greg Kroah-Hartman
maintainerPATCH 3/214 gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY
In reply to Greg Kroah-HartmanFrom: Mark Tomlinson <[email protected]>
[ Upstream commit 272502fcb7cda01ab07fc2fcff82d1d2f73d43cc ]
When receiving an IPv4 packet inside an IPv6 GRE packet, and the IP6_TNL_F_RCV_DSCP_COPY flag is set on the tunnel, the IPv4 header would get corrupted. This is due to the common ip6_tnl_rcv() function assuming that the inner header is always IPv6. This patch checks the tunnel protocol for IPv4 inner packets, but still defaults to IPv6.
--- net/ipv6/ip6_tunnel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/ipv6/ip6_tunnel.c +9 -1
@@ -860,7 +860,15 @@ int ip6_tnl_rcv(struct ip6_tnl *t, struc struct metadata_dst *tun_dst, bool log_ecn_err) { - return __ip6_tnl_rcv(t, skb, tpi, tun_dst, ip6ip6_dscp_ecn_decapsulate, +int (*dscp_ecn_decapsulate)(const struct ip6_tnl *t, +const struct ipv6hdr *ipv6h, +struct sk_buff *skb); + + dscp_ecn_decapsulate = ip6ip6_dscp_ecn_decapsulate; +if (tpi->proto ==htons (ETH_P_IP )) + dscp_ecn_decapsulate = ip4ip6_dscp_ecn_decapsulate; + +return __ip6_tnl_rcv (t, skb, tpi, tun_dst, dscp_ecn_decapsulate, log_ecn_err); }EXPORT_SYMBOL (ip6_tnl_rcv);
Greg Kroah-Hartman
maintainerPATCH 4/214 net: Fix potential wrong skb->protocol in skb_vlan_untag()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 55eff0eb7460c3d50716ed9eccf22257b046ca92 ]
We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). So we should pull VLAN_HLEN + sizeof(unsigned short) in skb_vlan_untag() or we may access the wrong data.
--- net/core/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/skbuff.c +2 -2
@@ -5317,8 +5317,8 @@ struct sk_buff *skb_vlan_untag(struct sk skb =skb_share_check (skb,GFP_ATOMIC );if (unlikely (!skb)) goto err_free; - -if (unlikely (!pskb_may_pull (skb,VLAN_HLEN ))) +/* We may access the two bytes after vlan_hdr in vlan_set_encap_proto(). */ +if (unlikely (!pskb_may_pull (skb,VLAN_HLEN +sizeof (unsigned short )))) goto err_free; vhdr = (struct vlan_hdr *)skb->data;
Greg Kroah-Hartman
maintainerPATCH 5/214 net: nexthop: dont allow empty NHA_GROUP
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit eeaac3634ee0e3f35548be35275efeca888e9b23 ]
Currently the nexthop code will use an empty NHA_GROUP attribute, but it requires at least 1 entry in order to function properly. Otherwise we end up derefencing null or random pointers all over the place due to not having any nh_grp_entry members allocated, nexthop code relies on having at least the first member present. Empty NHA_GROUP doesn't make any sense so just disallow it.
Also add a WARN_ON for any future users of nexthop_create_group().
BUG: kernel NULL pointer dereference, address: 0000000000000080 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] SMP CPU: 0 PID: 558 Comm: ip Not tainted 5.9.0-rc1+ #93 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-2.fc32 04/01/2014 RIP: 0010:fib_check_nexthop+0x4a/0xaa Code: 0f 84 83 00 00 00 48 c7 02 80 03 f7 81 c3 40 80 fe fe 75 12 b8 ea ff ff ff 48 85 d2 74 6b 48 c7 02 40 03 f7 81 c3 48 8b 40 10 <48> 8b 80 80 00 00 00 eb 36 80 78 1a 00 74 12 b8 ea ff ff ff 48 85 RSP: 0018:ffff88807983ba00 EFLAGS: 00010213 RAX: 0000000000000000 RBX: ffff88807983bc00 RCX: 0000000000000000 RDX: ffff88807983bc00 RSI: 0000000000000000 RDI: ffff88807bdd0a80 RBP: ffff88807983baf8 R08: 0000000000000dc0 R09: 000000000000040a R10: 0000000000000000 R11: ffff88807bdd0ae8 R12: 0000000000000000 R13: 0000000000000000 R14: ffff88807bea3100 R15: 0000000000000001 FS: 00007f10db393700(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000080 CR3: 000000007bd0f004 CR4: 00000000003706f0 Call Trace: fib_create_info+0x64d/0xaf7 fib_table_insert+0xf6/0x581 ? __vma_adjust+0x3b6/0x4d4 inet_rtm_newroute+0x56/0x70 rtnetlink_rcv_msg+0x1e3/0x20d ? rtnl_calcit.isra.0+0xb8/0xb8 netlink_rcv_skb+0x5b/0xac netlink_unicast+0xfa/0x17b netlink_sendmsg+0x334/0x353 sock_sendmsg_nosec+0xf/0x3f ____sys_sendmsg+0x1a0/0x1fc ? copy_msghdr_from_user+0x4c/0x61 ___sys_sendmsg+0x63/0x84 ? handle_mm_fault+0xa39/0x11b5 ? sockfd_lookup_light+0x72/0x9a __sys_sendmsg+0x50/0x6e do_syscall_64+0x54/0xbe entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f10dacc0bb7 Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb cd 66 0f 1f 44 00 00 8b 05 9a 4b 2b 00 85 c0 75 2e 48 63 ff 48 63 d2 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 01 c3 48 8b 15 b1 f2 2a 00 f7 d8 64 89 02 48 RSP: 002b:00007ffcbe628bf8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007ffcbe628f80 RCX: 00007f10dacc0bb7 RDX: 0000000000000000 RSI: 00007ffcbe628c60 RDI: 0000000000000003 RBP: 000000005f41099c R08: 0000000000000001 R09: 0000000000000008 R10: 00000000000005e9 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000000 R14: 00007ffcbe628d70 R15: 0000563a86c6e440 Modules linked in: CR2: 0000000000000080
--- net/ipv4/nexthop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv4/nexthop.c +4 -1
@@ -403,7 +403,7 @@ static int nh_check_attr_group(struct nestruct nexthop_grp *nhg;unsigned int i, j; -if (len & (sizeof (struct nexthop_grp ) -1 )) { +if (!len || len & (sizeof (struct nexthop_grp ) -1 )) {NL_SET_ERR_MSG (extack,"Invalid length for nexthop group attribute" );return -EINVAL ;
@@ -1105,6 +1105,9 @@ static struct nexthop *nexthop_create_grstruct nexthop *nh;int i; +if (WARN_ON (!num_nh)) +return ERR_PTR (-EINVAL ); + nh =nexthop_alloc ();if (!nh)return ERR_PTR (-ENOMEM );
Greg Kroah-Hartman
maintainerPATCH 6/214 net: qrtr: fix usage of idr in port assignment to socket
In reply to Greg Kroah-HartmanFrom: Necip Fazil Yildiran <[email protected]>
[ Upstream commit 8dfddfb79653df7c38a9c8c4c034f242a36acee9 ]
Passing large uint32 sockaddr_qrtr.port numbers for port allocation triggers a warning within idr_alloc() since the port number is cast to int, and thus interpreted as a negative number. This leads to the rejection of such valid port numbers in qrtr_port_assign() as idr_alloc() fails.
To avoid the problem, switch to idr_alloc_u32() instead.
--- net/qrtr/qrtr.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
net/qrtr/qrtr.c +11 -9
@@ -547,23 +547,25 @@ static void qrtr_port_remove(struct qrtr*/ static int qrtr_port_assign (struct qrtr_sock *ipc,int *port) { +u32 min_port;int rc;mutex_lock (&qrtr_port_lock);if (!*port) { - rc =idr_alloc (&qrtr_ports, ipc, -QRTR_MIN_EPH_SOCKET ,QRTR_MAX_EPH_SOCKET +1 , -GFP_ATOMIC ); -if (rc >=0 ) - *port = rc; + min_port =QRTR_MIN_EPH_SOCKET ; + rc =idr_alloc_u32 (&qrtr_ports, ipc, &min_port,QRTR_MAX_EPH_SOCKET ,GFP_ATOMIC ); +if (!rc) + *port = min_port; }else if (*port <QRTR_MIN_EPH_SOCKET && !capable (CAP_NET_ADMIN )) { rc = -EACCES ; }else if (*port ==QRTR_PORT_CTRL ) { - rc =idr_alloc (&qrtr_ports, ipc,0 ,1 ,GFP_ATOMIC ); + min_port =0 ; + rc =idr_alloc_u32 (&qrtr_ports, ipc, &min_port,0 ,GFP_ATOMIC ); }else { - rc =idr_alloc (&qrtr_ports, ipc, *port, *port +1 ,GFP_ATOMIC ); -if (rc >=0 ) - *port = rc; + min_port = *port; + rc =idr_alloc_u32 (&qrtr_ports, ipc, &min_port, *port,GFP_ATOMIC ); +if (!rc) + *port = min_port; }mutex_unlock (&qrtr_port_lock);
Greg Kroah-Hartman
maintainerPATCH 7/214 net: sctp: Fix negotiation of the number of data streams.
In reply to Greg Kroah-HartmanFrom: David Laight <[email protected]>
[ Upstream commit ab921f3cdbec01c68705a7ade8bec628d541fc2b ]
The number of output and input streams was never being reduced, eg when processing received INIT or INIT_ACK chunks.
The effect is that DATA chunks can be sent with invalid stream ids and then discarded by the remote system.
--- net/sctp/stream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/sctp/stream.c +4 -2
@@ -88,12 +88,13 @@ static int sctp_stream_alloc_out(structint ret;if (outcnt <= stream->outcnt) -return 0 ; + goto out; ret =genradix_prealloc (&stream->out, outcnt, gfp);if (ret)return ret; +out: stream->outcnt = outcnt;return 0 ; }
@@ -104,12 +105,13 @@ static int sctp_stream_alloc_in(struct sint ret;if (incnt <= stream->incnt) -return 0 ; + goto out; ret =genradix_prealloc (&stream->in, incnt, gfp);if (ret)return ret; +out: stream->incnt = incnt;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 8/214 net/smc: Prevent kernel-infoleak in __smc_diag_dump()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit ce51f63e63c52a4e1eee4dd040fb0ba0af3b43ab ]
__smc_diag_dump() is potentially copying uninitialized kernel stack memory into socket buffers, since the compiler may leave a 4-byte hole near the beginning of struct smcd_diag_dmbinfo. Fix it by initializing dinfo with memset().
--- net/smc/smc_diag.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/smc/smc_diag.c +9 -7
@@ -170,13 +170,15 @@ static int __smc_diag_dump(struct sock * (req->diag_ext & (1 << (SMC_DIAG_DMBINFO - 1))) && !list_empty(&smc->conn.lgr->list)) {struct smc_connection *conn = &smc->conn; -struct smcd_diag_dmbinfo dinfo = { - .linkid = *((u32 *)conn->lgr->id), - .peer_gid = conn->lgr->peer_gid, - .my_gid = conn->lgr->smcd->local_gid, - .token = conn->rmb_desc->token, - .peer_token = conn->peer_token - }; +struct smcd_diag_dmbinfo dinfo; + +memset (&dinfo,0 ,sizeof (dinfo)); + + dinfo.linkid = *((u32 *)conn->lgr->id); + dinfo.peer_gid = conn->lgr->peer_gid; + dinfo.my_gid = conn->lgr->smcd->local_gid; + dinfo.token = conn->rmb_desc->token; + dinfo.peer_token = conn->peer_token;if (nla_put (skb,SMC_DIAG_DMBINFO ,sizeof (dinfo), &dinfo) <0 ) goto errout;
Greg Kroah-Hartman
maintainerPATCH 9/214 tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 47733f9daf4fe4f7e0eb9e273f21ad3a19130487 ]
__tipc_nl_compat_dumpit() has two callers, and it expects them to pass a valid nlmsghdr via arg->data. This header is artificial and crafted just for __tipc_nl_compat_dumpit().
tipc_nl_compat_publ_dump() does so by putting a genlmsghdr as well as some nested attribute, TIPC_NLA_SOCK. But the other caller tipc_nl_compat_dumpit() does not, this leaves arg->data uninitialized on this call path.
Fix this by just adding a similar nlmsghdr without any payload in tipc_nl_compat_dumpit().
This bug exists since day 1, but the recent commit 6ea67769ff33 ("net: tipc: prepare attrs in __tipc_nl_compat_dumpit()") makes it easier to appear.
--- net/tipc/netlink_compat.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/tipc/netlink_compat.c +11 -1
@@ -255,8 +255,9 @@ err_out:static int tipc_nl_compat_dumpit (struct tipc_nl_compat_cmd_dump *cmd,struct tipc_nl_compat_msg *msg) { -int err; +struct nlmsghdr *nlh;struct sk_buff *arg; +int err;if (msg->req_type && (!msg->req_size || !TLV_CHECK_TYPE (msg->req, msg->req_type)))
@@ -285,6 +286,15 @@ static int tipc_nl_compat_dumpit(structreturn -ENOMEM ; } + nlh =nlmsg_put (arg,0 ,0 , tipc_genl_family.id,0 ,NLM_F_MULTI ); +if (!nlh) { +kfree_skb (arg); +kfree_skb (msg->rep); + msg->rep =NULL ; +return -EMSGSIZE ; + } +nlmsg_end (arg, nlh); + err =__tipc_nl_compat_dumpit (cmd, msg, arg);if (err) {kfree_skb (msg->rep);
Greg Kroah-Hartman
maintainerPATCH 10/214 net: ena: Make missed_tx stat incremental
In reply to Greg Kroah-HartmanFrom: Shay Agroskin <[email protected]>
[ Upstream commit ccd143e5150f24b9ba15145c7221b61dd9e41021 ]
Most statistics in ena driver are incremented, meaning that a stat's value is a sum of all increases done to it since driver/queue initialization.
This patch makes all statistics this way, effectively making missed_tx statistic incremental.
Also added a comment regarding rx_drops and tx_drops to make it clearer how these counters are calculated.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +4 -1
@@ -2924,7 +2924,7 @@ static int check_missing_comp_in_tx_queu }u64_stats_update_begin (&tx_ring->syncp); - tx_ring->tx_stats.missed_tx = missed_tx; + tx_ring->tx_stats.missed_tx += missed_tx;u64_stats_update_end (&tx_ring->syncp);return rc;
@@ -3848,6 +3848,9 @@ static void ena_keep_alive_wd(void *adap rx_drops = ((u64 )desc->rx_drops_high <<32 ) | desc->rx_drops_low;u64_stats_update_begin (&adapter->syncp); +/* These stats are accumulated by the device, so the counters indicate +* all drops since last reset. +*/ adapter->dev_stats.rx_drops = rx_drops;u64_stats_update_end (&adapter->syncp); }
Greg Kroah-Hartman
maintainerPATCH 11/214 net/sched: act_ct: Fix skb double-free in tcf_ct_handle_fragments() error flow
In reply to Greg Kroah-HartmanFrom: Alaa Hleihel <[email protected]>
[ Upstream commit eda814b97dfb8d9f4808eb2f65af9bd3705c4cae ]
tcf_ct_handle_fragments() shouldn't free the skb when ip_defrag() call fails. Otherwise, we will cause a double-free bug.
In such cases, just return the error to the caller.
--- net/sched/act_ct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_ct.c +1 -1
@@ -186,7 +186,7 @@ static int tcf_ct_handle_fragments(strucmemset (IP6CB (skb),0 ,sizeof (struct inet6_skb_parm )); err =nf_ct_frag6_gather (net, skb, user);if (err && err != -EINPROGRESS ) - goto out_free; +return err;#else err = -EOPNOTSUPP ; goto out_free;
Greg Kroah-Hartman
maintainerPATCH 12/214 ipvlan: fix device features
In reply to Greg Kroah-HartmanFrom: Mahesh Bandewar <[email protected]>
[ Upstream commit d0f5c7076e01fef6fcb86988d9508bf3ce258bd4 ]
Processing NETDEV_FEAT_CHANGE causes IPvlan links to lose NETIF_F_LLTX feature because of the incorrect handling of features in ipvlan_fix_features().
--before--
lpaa10:~# ethtool -k ipvl0 | grep tx-lockless tx-lockless: on [fixed] lpaa10:~# ethtool -K ipvl0 tso off Cannot change tcp-segmentation-offload Actual changes: vlan-challenged: off [fixed] tx-lockless: off [fixed] lpaa10:~# ethtool -k ipvl0 | grep tx-lockless tx-lockless: off [fixed] lpaa10:~#
--after--
lpaa10:~# ethtool -k ipvl0 | grep tx-lockless tx-lockless: on [fixed] lpaa10:~# ethtool -K ipvl0 tso off Cannot change tcp-segmentation-offload Could not change any device features lpaa10:~# ethtool -k ipvl0 | grep tx-lockless tx-lockless: on [fixed] lpaa10:~#
--- drivers/net/ipvlan/ipvlan_main.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
drivers/net/ipvlan/ipvlan_main.c +22 -5
@@ -106,12 +106,21 @@ static void ipvlan_port_destroy(struct nkfree (port); } +#define IPVLAN_ALWAYS_ON_OFLOADS \ + (NETIF_F_SG | NETIF_F_HW_CSUM | \ + NETIF_F_GSO_ROBUST | NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ENCAP_ALL) + +#define IPVLAN_ALWAYS_ON \ + (IPVLAN_ALWAYS_ON_OFLOADS | NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED) +#define IPVLAN_FEATURES \ - (NETIF_F_SG | NETIF_F_CSUM_MASK | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ + (NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \ NETIF_F_GSO | NETIF_F_TSO | NETIF_F_GSO_ROBUST | \ NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \ NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER) +/* NETIF_F_GSO_ENCAP_ALL NETIF_F_GSO_SOFTWARE Newly added */ +#define IPVLAN_STATE_MASK \ ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))
@@ -125,7 +134,9 @@ static int ipvlan_init(struct net_device dev->state = (dev->state & ~IPVLAN_STATE_MASK ) | (phy_dev->state &IPVLAN_STATE_MASK ); dev->features = phy_dev->features &IPVLAN_FEATURES ; - dev->features |=NETIF_F_LLTX |NETIF_F_VLAN_CHALLENGED ; + dev->features |=IPVLAN_ALWAYS_ON ; + dev->vlan_features = phy_dev->vlan_features &IPVLAN_FEATURES ; + dev->vlan_features |=IPVLAN_ALWAYS_ON_OFLOADS ; dev->hw_enc_features |= dev->features; dev->gso_max_size = phy_dev->gso_max_size; dev->gso_max_segs = phy_dev->gso_max_segs;
@@ -225,7 +236,14 @@ static netdev_features_t ipvlan_fix_feat {struct ipvl_dev *ipvlan =netdev_priv (dev); -return features & (ipvlan->sfeatures | ~IPVLAN_FEATURES ); + features |=NETIF_F_ALL_FOR_ALL ; + features &= (ipvlan->sfeatures | ~IPVLAN_FEATURES ); + features =netdev_increment_features (ipvlan->phy_dev->features, + features, features); + features |=IPVLAN_ALWAYS_ON ; + features &= (IPVLAN_FEATURES |IPVLAN_ALWAYS_ON ); + +return features; }static void ipvlan_change_rx_flags (struct net_device *dev,int change)
@@ -732,10 +750,9 @@ static int ipvlan_device_event(struct nocase NETDEV_FEAT_CHANGE :list_for_each_entry (ipvlan, &port->ipvlans, pnode) { - ipvlan->dev->features = dev->features &IPVLAN_FEATURES ; ipvlan->dev->gso_max_size = dev->gso_max_size; ipvlan->dev->gso_max_segs = dev->gso_max_segs; -netdev_features_change (ipvlan->dev); +netdev_update_features (ipvlan->dev); }break ;
Greg Kroah-Hartman
maintainerPATCH 13/214 ALSA: hda/hdmi: Add quirk to force connectivity
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit cd72c317a0a11f64225b9a3f1fe503bb8c7327b5 ]
HDMI on some platforms doesn't enable audio support because its Port Connectivity [31:30] is set to AC_JACK_PORT_NONE:
Node 0x05 [Pin Complex] wcaps 0x40778d: 8-Channels Digital Amp-Out CP
Amp-Out caps: ofs=0x00, nsteps=0x00, stepsize=0x00, mute=1 Amp-Out vals: [0x00 0x00]
Pincap 0x0b000094: OUT Detect HBR HDMI DP
Pin Default 0x58560010: [N/A] Digital Out at Int HDMI
Conn = Digital, Color = Unknown
DefAssociation = 0x1, Sequence = 0x0
Pin-ctls: 0x40: OUT
Unsolicited: tag=00, enabled=0
Power states: D0 D3 EPSS
Power: setting=D0, actual=D0
Devices: 0
Connection: 3
0x02 0x03* 0x04
For now, use a quirk to force connectivity based on SSID. If there are more platforms affected by the same issue, we can eye for a more generic solution.
--- sound/pci/hda/patch_hdmi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +15 -1
@@ -176,6 +176,7 @@ struct hdmi_spec {bool use_jack_detect;/* jack detection enabled */ bool use_acomp_notifier;/* use eld_notify callback for hotplug */ bool acomp_registered;/* audio component registered in this driver */ +bool force_connect;/* force connectivity */ struct drm_audio_component_audio_ops drm_audio_ops;int (*port2pin)(struct hda_codec *,int );/* reverse port/pin mapping */
@@ -1711,7 +1712,8 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)* all device entries on the same pin */ config =snd_hda_codec_get_pincfg (codec, pin_nid); -if (get_defcfg_connect (config) ==AC_JACK_PORT_NONE ) +if (get_defcfg_connect (config) ==AC_JACK_PORT_NONE && + !spec->force_connect)return 0 ;/*
@@ -1815,11 +1817,18 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)return 0 ; } +static const struct snd_pci_quirk force_connect_list[] = { +SND_PCI_QUIRK (0x103c ,0x871a ,"HP" ,1 ), + {} +}; +static int hdmi_parse_codec (struct hda_codec *codec) { +struct hdmi_spec *spec = codec->spec;hda_nid_t start_nid;unsigned int caps;int i, nodes; +const struct snd_pci_quirk *q; nodes =snd_hda_get_sub_nodes (codec, codec->core.afg, &start_nid);if (!start_nid || nodes <0 ) {
@@ -1827,6 +1836,11 @@ static int hdmi_parse_codec(struct hda_codec *codec)return -EINVAL ; } + q =snd_pci_quirk_lookup (codec->bus->pci, force_connect_list); + +if (q && q->value) + spec->force_connect = true; +/* * hdmi_add_pin() assumes total amount of converters to * be known, so first discover all converters
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 14/214 ALSA: pci: delete repeated words in comments
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit c7fabbc51352f50cc58242a6dc3b9c1a3599849b ]
Drop duplicated words in sound/pci/.
{and, the, at}
--- sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/ice1712/prodigy192.c | 2 +- sound/pci/oxygen/xonar_dg.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
sound/pci/cs46xx/cs46xx_lib.c +1 -1
@@ -766,7 +766,7 @@ static void snd_cs46xx_set_capture_sample_rate(struct snd_cs46xx *chip, unsigned rate =48000 /9 ;/* -* We can not capture at at rate greater than the Input Rate (48000). +* We can not capture at a rate greater than the Input Rate (48000). * Return an error if an attempt is made to stray outside that limit. */ if (rate >48000 )
sound/pci/cs46xx/dsp_spos_scb_lib.c +1 -1
@@ -1716,7 +1716,7 @@ int cs46xx_iec958_pre_open (struct snd_cs46xx *chip)struct dsp_spos_instance * ins = chip->dsp_spos_instance;if ( ins->spdif_status_out &DSP_SPDIF_STATUS_OUTPUT_ENABLED ) { -/* remove AsynchFGTxSCB and and PCMSerialInput_II */ +/* remove AsynchFGTxSCB and PCMSerialInput_II */ cs46xx_dsp_disable_spdif_out (chip);/* save state */
sound/pci/hda/hda_codec.c +1 -1
@@ -3420,7 +3420,7 @@ EXPORT_SYMBOL_GPL(snd_hda_set_power_save);* @nid: NID to check / update * * Check whether the given NID is in the amp list. If it's in the list, -* check the current AMP status, and update the the power-status according +* check the current AMP status, and update the power-status according * to the mute status. * * This function is supposed to be set or called from the check_power_status
sound/pci/hda/hda_generic.c +1 -1
@@ -813,7 +813,7 @@ static void activate_amp_in(struct hda_codec *codec, struct nid_path *path, } } -/* sync power of each widget in the the given path */ +/* sync power of each widget in the given path */ static hda_nid_t path_power_update (struct hda_codec *codec,struct nid_path *path,bool allow_powerdown)
sound/pci/hda/patch_sigmatel.c +1 -1
@@ -832,7 +832,7 @@ static int stac_auto_create_beep_ctls(struct hda_codec *codec,static struct snd_kcontrol_new beep_vol_ctl =HDA_CODEC_VOLUME (NULL ,0 ,0 ,0 ); -/* check for mute support for the the amp */ +/* check for mute support for the amp */ if ((caps &AC_AMPCAP_MUTE ) >>AC_AMPCAP_MUTE_SHIFT ) {const struct snd_kcontrol_new *temp;if (spec->anabeep_nid == nid)
sound/pci/ice1712/prodigy192.c +1 -1
@@ -32,7 +32,7 @@* Experimentally I found out that only a combination of * OCKS0=1, OCKS1=1 (128fs, 64fs output) and ice1724 - * VT1724_MT_I2S_MCLK_128X=0 (256fs input) yields correct -* sampling rate. That means the the FPGA doubles the +* sampling rate. That means that the FPGA doubles the * MCK01 rate. * * Copyright (c) 2003 Takashi Iwai <[email protected]>
sound/pci/oxygen/xonar_dg.c +1 -1
@@ -29,7 +29,7 @@* GPIO 4 <- headphone detect * GPIO 5 -> enable ADC analog circuit for the left channel * GPIO 6 -> enable ADC analog circuit for the right channel -* GPIO 7 -> switch green rear output jack between CS4245 and and the first +* GPIO 7 -> switch green rear output jack between CS4245 and the first * channel of CS4361 (mechanical relay) * GPIO 8 -> enable output to speakers *
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 15/214 ALSA: hda/realtek: Fix pin default on Intel NUC 8 Rugged
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit e2d2fded6bdf3f7bb40718a208140dba8b4ec574 ]
The jack on Intel NUC 8 Rugged rear panel doesn't work.
The spec [1] states that the jack supports both headphone and microphone, so override a Pin Complex which has both Amp-In and Amp-Out to make the jack work.
Node 0x1b fits the requirement, and user confirmed the jack now works with new pin config.
[1] https://www.intel.com/content/dam/support/us/en/documents/mini-pcs/NUC8CCH_TechProdSpec.pdf
--- sound/pci/hda/patch_realtek.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/pci/hda/patch_realtek.c +11 -0
@@ -6137,6 +6137,7 @@ enum {ALC269_FIXUP_CZC_L101 ,ALC269_FIXUP_LEMOTE_A1802 ,ALC269_FIXUP_LEMOTE_A190X , + ALC256_FIXUP_INTEL_NUC8_RUGGED, }; static const struct hda_fixup alc269_fixups[] = {
@@ -7458,6 +7459,15 @@ static const struct hda_fixup alc269_fixups[] = { }, .chain_id = ALC269_FIXUP_DMIC, }, + [ALC256_FIXUP_INTEL_NUC8_RUGGED] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x1b ,0x01a1913c },/* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id =ALC269_FIXUP_HEADSET_MODE + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7757,6 +7767,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x10ec ,0x118c ,"Medion EE4254 MD62100" ,ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE ),SND_PCI_QUIRK (0x1c06 ,0x2013 ,"Lemote A1802" ,ALC269_FIXUP_LEMOTE_A1802 ),SND_PCI_QUIRK (0x1c06 ,0x2015 ,"Lemote A190X" ,ALC269_FIXUP_LEMOTE_A190X ), +SND_PCI_QUIRK (0x8086 ,0x2080 ,"Intel NUC 8 Rugged" ,ALC256_FIXUP_INTEL_NUC8_RUGGED ), #if 0/* Below is a quirk table taken from the old code.
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 16/214 ALSA: hda/hdmi: Use force connectivity quirk on another HP desktop
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit d96f27c80b65437a7b572647ecb4717ec9a50c98 ]
There's another HP desktop has buggy BIOS which flags the Port Connectivity bit as no connection.
Apply force connectivity quirk to enable DP/HDMI audio.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1818,6 +1818,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) }static const struct snd_pci_quirk force_connect_list[] = { +SND_PCI_QUIRK (0x103c ,0x870f ,"HP" ,1 ),SND_PCI_QUIRK (0x103c ,0x871a ,"HP" ,1 ), {} };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 17/214 ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit c4c59b95b7f7d4cef5071b151be2dadb33f3287b ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- sound/soc/img/img-i2s-in.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/img/img-i2s-in.c +3 -1
@@ -343,8 +343,10 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) chan_control_mask =IMG_I2S_IN_CH_CTL_CLK_TRANS_MASK ; ret =pm_runtime_get_sync (i2s->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (i2s->dev);return ret; + }for (i =0 ; i < i2s->active_channels; i++)img_i2s_in_ch_disable (i2s, i);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 18/214 ASoC: img-parallel-out: Fix a reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 6b9fbb073636906eee9fe4d4c05a4f445b9e2a23 ]
pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if pm_runtime_put_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.
--- sound/soc/img/img-parallel-out.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/img/img-parallel-out.c +3 -1
@@ -163,8 +163,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) } ret =pm_runtime_get_sync (prl->dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put_noidle (prl->dev);return ret; + } reg =img_prl_out_readl (prl,IMG_PRL_OUT_CTL ); reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK ) | control_set;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 19/214 ASoC: tegra: Fix reference count leaks.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit deca195383a6085be62cb453079e03e04d618d6e ]
Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put is not called in error handling paths. Call pm_runtime_put if pm_runtime_get_sync fails.
--- sound/soc/tegra/tegra30_ahub.c | 4 +++- sound/soc/tegra/tegra30_i2s.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
sound/soc/tegra/tegra30_ahub.c +3 -1
@@ -643,8 +643,10 @@ static int tegra30_ahub_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + } ret =regcache_sync (ahub->regmap_ahub); ret |=regcache_sync (ahub->regmap_apbif);pm_runtime_put (dev);
sound/soc/tegra/tegra30_i2s.c +3 -1
@@ -538,8 +538,10 @@ static int tegra30_i2s_resume(struct device *dev)int ret; ret =pm_runtime_get_sync (dev); -if (ret <0 ) +if (ret <0 ) { +pm_runtime_put (dev);return ret; + } ret =regcache_sync (i2s->regmap);pm_runtime_put (dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 20/214 mfd: intel-lpss: Add Intel Emmitsburg PCH PCI IDs
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 3ea2e4eab64cefa06055bb0541fcdedad4b48565 ]
Intel Emmitsburg PCH has the same LPSS than Intel Ice Lake. Add the new IDs to the list of supported devices.
--- drivers/mfd/intel-lpss-pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mfd/intel-lpss-pci.c +3 -0
@@ -196,6 +196,9 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x1ac4), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1ac6), (kernel_ulong_t)&bxt_info }, { PCI_VDEVICE(INTEL, 0x1aee), (kernel_ulong_t)&bxt_uart_info }, +/* EBG */ + { PCI_VDEVICE(INTEL, 0x1bad), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x1bae), (kernel_ulong_t)&bxt_uart_info },/* GLK */ { PCI_VDEVICE(INTEL, 0x31ac), (kernel_ulong_t)&glk_i2c_info }, { PCI_VDEVICE(INTEL, 0x31ae), (kernel_ulong_t)&glk_i2c_info },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 21/214 arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e2ee9edc282961783d519c760bbaa20fed4dec38 ]
The original qcom kernel changed the PDM GPIOs to be pull-down during sleep at some point. Reportedly this was done because there was some "leakage at PDM outputs during sleep":
I cannot say how effective this is, but everything seems to work fine with this change so let's apply the same to mainline just to be sure.
--- arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi +1 -1
@@ -521,7 +521,7 @@ pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68"; drive-strength = <2>; - bias-disable; + bias-pull-down; }; }; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 22/214 powerpc/xive: Ignore kmemleak false positives
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit f0993c839e95dd6c7f054a1015e693c87e33e4fb ]
xive_native_provision_pages() allocates memory and passes the pointer to OPAL so kmemleak cannot find the pointer usage in the kernel memory and produces a false positive report (below) (even if the kernel did scan OPAL memory, it is unable to deal with __pa() addresses anyway).
This silences the warning.
unreferenced object 0xc000200350c40000 (size 65536):
comm "qemu-system-ppc", pid 2725, jiffies 4294946414 (age 70776.530s) hex dump (first 32 bytes):
02 00 00 00 50 00 00 00 00 00 00 00 00 00 00 00 ....P...........
01 00 08 07 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000081ff046c>] xive_native_alloc_vp_block+0x120/0x250
[<00000000d555d524>] kvmppc_xive_compute_vp_id+0x248/0x350 [kvm]
[<00000000d69b9c9f>] kvmppc_xive_connect_vcpu+0xc0/0x520 [kvm]
[<000000006acbc81c>] kvm_arch_vcpu_ioctl+0x308/0x580 [kvm]
[<0000000089c69580>] kvm_vcpu_ioctl+0x19c/0xae0 [kvm]
[<00000000902ae91e>] ksys_ioctl+0x184/0x1b0
[<00000000f3e68bd7>] sys_ioctl+0x48/0xb0
[<0000000001b2c127>] system_call_exception+0x124/0x1f0
[<00000000d2b2ee40>] system_call_common+0xe8/0x214--- arch/powerpc/sysdev/xive/native.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/sysdev/xive/native.c +2 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/cpumask.h> #include <linux/mm.h> +#include <linux/kmemleak.h> #include <asm/prom.h> #include <asm/io.h>
@@ -646,6 +647,7 @@ static bool xive_native_provision_pages(void)pr_err ("Failed to allocate provisioning page\n" );return false; } +kmemleak_ignore (p);opal_xive_donate_page (chip,__pa (p)); }return true;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 23/214 media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 6499a0db9b0f1e903d52f8244eacc1d4be00eea2 ]
The value av7110->debi_virt is stored in DMA memory, and it is assigned to data, and thus data[0] can be modified at any time by malicious hardware. In this case, "if (data[0] < 2)" can be passed, but then data[0] can be changed into a large number, which may cause buffer overflow when the code "av7110->ci_slot[data[0]]" is used.
To fix this possible bug, data[0] is assigned to a local variable, which replaces the use of data[0].
--- drivers/media/pci/ttpci/av7110.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/pci/ttpci/av7110.c +3 -2
@@ -406,14 +406,15 @@ static void debiirq(unsigned long cookie)case DATA_CI_GET : {u8 *data = av7110->debi_virt; +u8 data_0 = data[0 ]; -if ((data[0 ] <2 ) && data[2 ] ==0xff ) { +if (data_0 <2 && data[2 ] ==0xff ) {int flags =0 ;if (data[5 ] >0 ) flags |=CA_CI_MODULE_PRESENT ;if (data[5 ] >5 ) flags |=CA_CI_MODULE_READY ; - av7110->ci_slot[data[0 ]].flags = flags; + av7110->ci_slot[data_0].flags = flags; }else ci_get_data(&av7110->ci_rbuffer, av7110->debi_virt,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 24/214 blktrace: ensure our debugfs dir exists
In reply to Greg Kroah-HartmanFrom: Luis Chamberlain <[email protected]>
[ Upstream commit b431ef837e3374da0db8ff6683170359aaa0859c ]
We make an assumption that a debugfs directory exists, but since this can fail ensure it exists before allowing blktrace setup to complete. Otherwise we end up stuffing blktrace files on the debugfs root directory. In the worst case scenario this *in theory* can create an eventual panic *iff* in the future a similarly named file is created prior on the debugfs root directory. This theoretical crash can happen due to a recursive removal followed by a specific dentry removal.
This doesn't fix any known crash, however I have seen the files go into the main debugfs root directory in cases where the debugfs directory was not created due to other internal bugs with blktrace now fixed.
blktrace is also completely useless without this directory, so this ensures to userspace we only setup blktrace if the kernel can stuff files where they are supposed to go into.
debugfs directory creations typically aren't checked for, and we have maintainers doing sweep removals of these checks, but since we need this check to ensure proper userspace blktrace functionality we make sure to annotate the justification for the check.
--- kernel/trace/blktrace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/trace/blktrace.c +12 -0
@@ -535,6 +535,18 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,#endif bt->dir = dir =debugfs_create_dir (buts->name, blk_debugfs_root); +/* +* As blktrace relies on debugfs for its interface the debugfs directory +* is required, contrary to the usual mantra of not checking for debugfs +* files or directories. +*/ +if (IS_ERR_OR_NULL (dir)) { +pr_warn ("debugfs_dir not present for %s so skipping\n" , + buts->name); + ret = -ENOENT ; + goto err; + } + bt->dev = dev;atomic_set (&bt->dropped,0 );INIT_LIST_HEAD (&bt->running_list);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 25/214 scsi: target: tcmu: Fix crash on ARM during cmd completion
In reply to Greg Kroah-HartmanFrom: Bodo Stroesser <[email protected]>
[ Upstream commit 5a0c256d96f020e4771f6fd5524b80f89a2d3132 ]
If tcmu_handle_completions() has to process a padding shorter than sizeof(struct tcmu_cmd_entry), the current call to tcmu_flush_dcache_range() with sizeof(struct tcmu_cmd_entry) as length param is wrong and causes crashes on e.g. ARM, because tcmu_flush_dcache_range() in this case calls flush_dcache_page(vmalloc_to_page(start)); with start being an invalid address above the end of the vmalloc'ed area.
The fix is to use the minimum of remaining ring space and sizeof(struct tcmu_cmd_entry) as the length param.
The patch was tested on kernel 4.19.118.
See https://bugzilla.kernel.org/show_bug.cgi?id=208045#c10
--- drivers/target/target_core_user.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/target/target_core_user.c +8 -1
@@ -1220,7 +1220,14 @@ static unsigned int tcmu_handle_completions(struct tcmu_dev *udev)struct tcmu_cmd_entry *entry = (void *) mb +CMDR_OFF + udev->cmdr_last_cleaned; -tcmu_flush_dcache_range (entry,sizeof (*entry)); +/* +* Flush max. up to end of cmd ring since current entry might +* be a padding that is shorter than sizeof(*entry) +*/ +size_t ring_left =head_to_end (udev->cmdr_last_cleaned, + udev->cmdr_size); +tcmu_flush_dcache_range (entry, ring_left <sizeof (*entry) ? + ring_left :sizeof (*entry));if (tcmu_hdr_get_op (entry->hdr.len_op) ==TCMU_OP_PAD ) { UPDATE_HEAD(udev->cmdr_last_cleaned,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 26/214 mfd: intel-lpss: Add Intel Tiger Lake PCH-H PCI IDs
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit bb7fcad48d3804d814b97c785514e2d1657e157f ]
Intel Tiger Lake PCH-H has the same LPSS than Intel Broxton. Add the new IDs to the list of supported devices.
--- drivers/mfd/intel-lpss-pci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/mfd/intel-lpss-pci.c +16 -0
@@ -228,6 +228,22 @@ static const struct pci_device_id intel_lpss_pci_ids[] = { { PCI_VDEVICE(INTEL, 0x34ea), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info }, { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info }, +/* TGL-H */ + { PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43a9), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43aa), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ab), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43ad), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ae), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43d8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43da), (kernel_ulong_t)&bxt_uart_info }, + { PCI_VDEVICE(INTEL, 0x43e8), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43e9), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43ea), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43eb), (kernel_ulong_t)&bxt_i2c_info }, + { PCI_VDEVICE(INTEL, 0x43fb), (kernel_ulong_t)&bxt_info }, + { PCI_VDEVICE(INTEL, 0x43fd), (kernel_ulong_t)&bxt_info },/* EHL */ { PCI_VDEVICE(INTEL, 0x4b28), (kernel_ulong_t)&bxt_uart_info }, { PCI_VDEVICE(INTEL, 0x4b29), (kernel_ulong_t)&bxt_uart_info },
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 27/214 iommu/iova: Dont BUG on invalid PFNs
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit d3e3d2be688b4b5864538de61e750721a311e4fc ]
Unlike the other instances which represent a complete loss of consistency within the rcache mechanism itself, or a fundamental and obvious misconfiguration by an IOMMU driver, the BUG_ON() in iova_magazine_free_pfns() can be provoked at more or less any time in a "spooky action-at-a-distance" manner by any old device driver passing nonsense to dma_unmap_*() which then propagates through to queue_iova().
Not only is this well outside the IOVA layer's control, it's also nowhere near fatal enough to justify panicking anyway - all that really achieves is to make debugging the offending driver more difficult. Let's simply WARN and otherwise ignore bogus PFNs.
--- drivers/iommu/iova.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/iova.c +3 -1
@@ -811,7 +811,9 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad)for (i =0 ; i < mag->size; ++i) {struct iova *iova =private_find_iova (iovad, mag->pfns[i]); -BUG_ON (!iova); +if (WARN_ON (!iova)) +continue ; +private_free_iova (iovad, iova); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 28/214 drm/amdkfd: Fix reference count leaks.
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 20eca0123a35305e38b344d571cf32768854168c ]
kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
--- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +15 -5
@@ -612,8 +612,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev, ret =kobject_init_and_add (dev->kobj_node, &node_type, sys_props.kobj_nodes,"%d" , id); -if (ret <0 ) +if (ret <0 ) { +kobject_put (dev->kobj_node);return ret; + } dev->kobj_mem =kobject_create_and_add ("mem_banks" , dev->kobj_node);if (!dev->kobj_mem)
@@ -660,8 +662,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (mem->kobj, &mem_type, dev->kobj_mem,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (mem->kobj);return ret; + } mem->attr.name ="properties" ; mem->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -679,8 +683,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (cache->kobj, &cache_type, dev->kobj_cache,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (cache->kobj);return ret; + } cache->attr.name ="properties" ; cache->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -698,8 +704,10 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev,return -ENOMEM ; ret =kobject_init_and_add (iolink->kobj, &iolink_type, dev->kobj_iolink,"%d" , i); -if (ret <0 ) +if (ret <0 ) { +kobject_put (iolink->kobj);return ret; + } iolink->attr.name ="properties" ; iolink->attr.mode =KFD_SYSFS_FILE_MODE ;
@@ -779,8 +787,10 @@ static int kfd_topology_update_sysfs(void) ret =kobject_init_and_add (sys_props.kobj_topology, &sysprops_type, &kfd_device->kobj,"topology" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (sys_props.kobj_topology);return ret; + } sys_props.kobj_nodes =kobject_create_and_add ("nodes" , sys_props.kobj_topology);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 29/214 drm/radeon: fix multiple reference count leak
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 6f2e8acdb48ed166b65d47837c31b177460491ec ]
On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +15 -5
@@ -883,8 +883,10 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -1029,8 +1031,10 @@ radeon_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1167,8 +1171,10 @@ radeon_tv_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =radeon_best_single_encoder (connector);
@@ -1251,8 +1257,10 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (radeon_connector->detected_hpd_without_ddc) {
@@ -1666,8 +1674,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&radeon_check_hpd_status_unchanged (connector)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 30/214 drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 9ba8923cbbe11564dd1bf9f3602add9a9cfbb5c6 ]
in amdgpu_driver_open_kms the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -1
@@ -976,7 +976,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) r =pm_runtime_get_sync (dev->dev);if (r <0 ) -return r; + goto pm_put; fpriv =kzalloc (sizeof (*fpriv),GFP_KERNEL );if (unlikely (!fpriv)) {
@@ -1027,6 +1027,7 @@ error_pasid: out_suspend:pm_runtime_mark_last_busy (dev->dev); +pm_put:pm_runtime_put_autosuspend (dev->dev);return r;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 31/214 drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 5509ac65f2fe5aa3c0003237ec629ca55024307c ]
in amdgpu_drm_ioctl the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -1
@@ -1286,11 +1286,12 @@ long amdgpu_drm_ioctl(struct file *filp, dev = file_priv->minor->dev; ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_ioctl (filp, cmd, arg);pm_runtime_mark_last_busy (dev->dev); +out:pm_runtime_put_autosuspend (dev->dev);return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 32/214 drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit e008fa6fb41544b63973a529b704ef342f47cc65 ]
in amdgpu_display_crtc_set_config, the call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count. In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +3 -2
@@ -282,7 +282,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, ret =pm_runtime_get_sync (dev->dev);if (ret <0 ) -return ret; + goto out; ret =drm_crtc_helper_set_config (set, ctx);
@@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,take the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; -return ret; + goto out; }/* if we have no active crtcs, then drop the power ref we got before */
@@ -306,6 +306,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, adev->have_disp_power_ref = false; } +out:/* drop the power reference we got coming in here */ pm_runtime_put_autosuspend (dev->dev);return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 33/214 drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit f79f94765f8c39db0b7dec1d335ab046aac03f20 ]
The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +12 -4
@@ -719,8 +719,10 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (encoder) {
@@ -857,8 +859,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } } encoder =amdgpu_connector_best_single_encoder (connector);
@@ -980,8 +984,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
@@ -1330,8 +1336,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)if (!drm_kms_helper_is_poll_worker ()) { r =pm_runtime_get_sync (connector->dev->dev); -if (r <0 ) +if (r <0 ) { +pm_runtime_put_autosuspend (connector->dev->dev);return connector_status_disconnected; + } }if (!force &&amdgpu_connector_check_hpd_status_unchanged (connector)) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 34/214 scsi: lpfc: Fix shost refcount mismatch when deleting vport
In reply to Greg Kroah-HartmanFrom: Dick Kennedy <[email protected]>
[ Upstream commit 03dbfe0668e6692917ac278883e0586cd7f7d753 ]
When vports are deleted, it is observed that there is memory/kthread leakage as the vport isn't fully being released.
There is a shost reference taken in scsi_add_host_dma that is not released during scsi_remove_host. It was noticed that other drivers resolve this by doing a scsi_host_put after calling scsi_remove_host.
The vport_delete routine is taking two references one that corresponds to an access to the scsi_host in the vport_delete routine and another that is released after the adapter mailbox command completes that destroys the VPI that corresponds to the vport.
Remove one of the references taken such that the second reference that is put will complete the missing scsi_add_host_dma reference and the shost will be terminated.
--- drivers/scsi/lpfc/lpfc_vport.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
drivers/scsi/lpfc/lpfc_vport.c +8 -18
@@ -642,27 +642,16 @@ lpfc_vport_delete(struct fc_vport *fc_vport) vport->port_state < LPFC_VPORT_READY)return -EAGAIN ; } +/* -* This is a bit of a mess. We want to ensure the shost doesn't get -* torn down until we're done with the embedded lpfc_vport structure. -* -* Beyond holding a reference for this function, we also need a -* reference for outstanding I/O requests we schedule during delete -* processing. But once we scsi_remove_host() we can no longer obtain -* a reference through scsi_host_get(). -* -* So we take two references here. We release one reference at the -* bottom of the function -- after delinking the vport. And we -* release the other at the completion of the unreg_vpi that get's -* initiated after we've disposed of all other resources associated -* with the port. +* Take early refcount for outstanding I/O requests we schedule during +* delete processing for unreg_vpi. Always keep this before +* scsi_remove_host() as we can no longer obtain a reference through +* scsi_host_get() after scsi_host_remove as shost is set to SHOST_DEL. */ if (!scsi_host_get (shost))return VPORT_INVAL ; -if (!scsi_host_get (shost)) { -scsi_host_put (shost); -return VPORT_INVAL ; - } +lpfc_free_sysfs_attr (vport);lpfc_debugfs_terminate (vport);
@@ -809,8 +798,9 @@ skip_logo:if (!(vport->vpi_state &LPFC_VPI_REGISTERED ) ||lpfc_mbx_unreg_vpi (vport))scsi_host_put (shost); - }else + }else {scsi_host_put (shost); + }lpfc_free_vpi (phba, vport->vpi); vport->work_port_events =0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 35/214 xfs: Dont allow logging of XFS_ISTALE inodes
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 96355d5a1f0ee6dcc182c37db4894ec0c29f1692 ]
In tracking down a problem in this patchset, I discovered we are reclaiming dirty stale inodes. This wasn't discovered until inodes were always attached to the cluster buffer and then the rcu callback that freed inodes was assert failing because the inode still had an active pointer to the cluster buffer after it had been reclaimed.
Debugging the issue indicated that this was a pre-existing issue resulting from the way the inodes are handled in xfs_inactive_ifree. When we free a cluster buffer from xfs_ifree_cluster, all the inodes in cache are marked XFS_ISTALE. Those that are clean have nothing else done to them and so eventually get cleaned up by background reclaim. i.e. it is assumed we'll never dirty/relog an inode marked XFS_ISTALE.
On journal commit dirty stale inodes as are handled by both buffer and inode log items to run though xfs_istale_done() and removed from the AIL (buffer log item commit) or the log item will simply unpin it because the buffer log item will clean it. What happens to any specific inode is entirely dependent on which log item wins the commit race, but the result is the same - stale inodes are clean, not attached to the cluster buffer, and not in the AIL. Hence inode reclaim can just free these inodes without further care.
However, if the stale inode is relogged, it gets dirtied again and relogged into the CIL. Most of the time this isn't an issue, because relogging simply changes the inode's location in the current checkpoint. Problems arise, however, when the CIL checkpoints between two transactions in the xfs_inactive_ifree() deferops processing. This results in the XFS_ISTALE inode being redirtied and inserted into the CIL without any of the other stale cluster buffer infrastructure being in place.
Hence on journal commit, it simply gets unpinned, so it remains dirty in memory. Everything in inode writeback avoids XFS_ISTALE inodes so it can't be written back, and it is not tracked in the AIL so there's not even a trigger to attempt to clean the inode. Hence the inode just sits dirty in memory until inode reclaim comes along, sees that it is XFS_ISTALE, and goes to reclaim it. This reclaiming of a dirty inode caused use after free, list corruptions and other nasty issues later in this patchset.
Hence this patch addresses a violation of the "never log XFS_ISTALE inodes" caused by the deferops processing rolling a transaction and relogging a stale inode in xfs_inactive_free. It also adds a bunch of asserts to catch this problem in debug kernels so that we don't reintroduce this problem in future.
Reproducer for this issue was generic/558 on a v4 filesystem.
--- fs/xfs/libxfs/xfs_trans_inode.c | 2 ++ fs/xfs/xfs_icache.c | 3 ++- fs/xfs/xfs_inode.c | 25 ++++++++++++++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-)
fs/xfs/libxfs/xfs_trans_inode.c +2 -0
@@ -36,6 +36,7 @@ xfs_trans_ijoin(ASSERT (iip->ili_lock_flags ==0 ); iip->ili_lock_flags = lock_flags; +ASSERT (!xfs_iflags_test (ip,XFS_ISTALE ));/* * Get a log_item_desc to point at the new item.
@@ -91,6 +92,7 @@ xfs_trans_log_inode(ASSERT (ip->i_itemp !=NULL );ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); +ASSERT (!xfs_iflags_test (ip,XFS_ISTALE ));/* * Don't bother with i_lock for the I_DIRTY_TIME check here, as races
fs/xfs/xfs_icache.c +2 -1
@@ -1132,7 +1132,7 @@ restart: goto out_ifunlock;xfs_iunpin_wait (ip); } -if (xfs_iflags_test (ip,XFS_ISTALE ) ||xfs_inode_clean (ip)) { +if (xfs_inode_clean (ip)) {xfs_ifunlock (ip); goto reclaim; }
@@ -1219,6 +1219,7 @@ reclaim:xfs_ilock (ip,XFS_ILOCK_EXCL );xfs_qm_dqdetach (ip);xfs_iunlock (ip,XFS_ILOCK_EXCL ); +ASSERT (xfs_inode_clean (ip));__xfs_inode_free (ip);return error;
fs/xfs/xfs_inode.c +22 -3
@@ -1761,10 +1761,31 @@ xfs_inactive_ifree(return error; } +/* +* We do not hold the inode locked across the entire rolling transaction +* here. We only need to hold it for the first transaction that +* xfs_ifree() builds, which may mark the inode XFS_ISTALE if the +* underlying cluster buffer is freed. Relogging an XFS_ISTALE inode +* here breaks the relationship between cluster buffer invalidation and +* stale inode invalidation on cluster buffer item journal commit +* completion, and can result in leaving dirty stale inodes hanging +* around in memory. +* +* We have no need for serialising this inode operation against other +* operations - we freed the inode and hence reallocation is required +* and that will serialise on reallocating the space the deferops need +* to free. Hence we can unlock the inode on the first commit of +* the transaction rather than roll it right through the deferops. This +* avoids relogging the XFS_ISTALE inode. +* +* We check that xfs_ifree() hasn't grown an internal transaction roll +* by asserting that the inode is still locked when it returns. +*/ xfs_ilock (ip,XFS_ILOCK_EXCL ); -xfs_trans_ijoin (tp, ip,0 ); +xfs_trans_ijoin (tp, ip,XFS_ILOCK_EXCL ); error =xfs_ifree (tp, ip); +ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL ));if (error) {/* * If we fail to free the inode, shut down. The cancel
@@ -1777,7 +1798,6 @@ xfs_inactive_ifree(xfs_force_shutdown (mp,SHUTDOWN_META_IO_ERROR ); }xfs_trans_cancel (tp); -xfs_iunlock (ip,XFS_ILOCK_EXCL );return error; }
@@ -1795,7 +1815,6 @@ xfs_inactive_ifree(xfs_notice (mp,"%s: xfs_trans_commit returned error %d" , __func__, error); -xfs_iunlock (ip,XFS_ILOCK_EXCL );return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 36/214 scsi: target: Fix xcopy sess release leak
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 3c006c7d23aac928279f7cbe83bbac4361255d53 ]
transport_init_session can allocate memory via percpu_ref_init, and target_xcopy_release_pt never frees it. This adds a transport_uninit_session function to handle cleanup of resources allocated in the init function.
--- drivers/target/target_core_internal.h | 1 + drivers/target/target_core_transport.c | 7 ++++++- drivers/target/target_core_xcopy.c | 11 +++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)
drivers/target/target_core_internal.h +1 -0
@@ -138,6 +138,7 @@ int init_se_kmem_caches(void);void release_se_kmem_caches (void );u32 scsi_get_new_index (scsi_index_t );void transport_subsystem_check_init (void ); +void transport_uninit_session (struct se_session *);unsigned char *transport_dump_cmd_direction (struct se_cmd *);void transport_dump_dev_state (struct se_device *,char *,int *); void transport_dump_dev_info(struct se_device *, struct se_lun *,
drivers/target/target_core_transport.c +6 -1
@@ -236,6 +236,11 @@ int transport_init_session(struct se_session *se_sess) }EXPORT_SYMBOL (transport_init_session); +void transport_uninit_session (struct se_session *se_sess) +{ +percpu_ref_exit (&se_sess->cmd_count); +} +/** * transport_alloc_session - allocate a session object and initialize it * @sup_prot_ops: bitmask that defines which T10-PI modes are supported.
@@ -579,7 +584,7 @@ void transport_free_session(struct se_session *se_sess)sbitmap_queue_free (&se_sess->sess_tag_pool);kvfree (se_sess->sess_cmd_map); } -percpu_ref_exit (&se_sess->cmd_count); +transport_uninit_session (se_sess);kmem_cache_free (se_sess_cache, se_sess); }EXPORT_SYMBOL (transport_free_session);
drivers/target/target_core_xcopy.c +9 -2
@@ -479,7 +479,7 @@ int target_xcopy_setup_pt(void)memset (&xcopy_pt_sess,0 ,sizeof (struct se_session )); ret =transport_init_session (&xcopy_pt_sess);if (ret <0 ) -return ret; + goto destroy_wq; xcopy_pt_nacl.se_tpg = &xcopy_pt_tpg; xcopy_pt_nacl.nacl_sess = &xcopy_pt_sess;
@@ -488,12 +488,19 @@ int target_xcopy_setup_pt(void) xcopy_pt_sess.se_node_acl = &xcopy_pt_nacl;return 0 ; + +destroy_wq: +destroy_workqueue (xcopy_wq); + xcopy_wq =NULL ; +return ret; }void target_xcopy_release_pt (void ) { -if (xcopy_wq) +if (xcopy_wq) {destroy_workqueue (xcopy_wq); +transport_uninit_session (&xcopy_pt_sess); + } }/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 37/214 selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
In reply to Greg Kroah-HartmanFrom: Desnes A. Nunes do Rosario <[email protected]>
[ Upstream commit 3337bf41e0dd70b4064cdf60acdfcdc2d050066c ]
An extra count on ebb_state.stats.pmc_count[PMC_INDEX(pmc)] is being per- formed when count_pmc() is used to reset PMCs on a few selftests. This extra pmc_count can occasionally invalidate results, such as the ones from cycles_test shown hereafter. The ebb_check_count() failed with an above the upper limit error due to the extra value on ebb_state.stats.pmc_count.
Furthermore, this extra count is also indicated by extra PMC1 trace_log on the output of the cycle test (as well as on pmc56_overflow_test):
==========
...
[21]: counter = 8
[22]: register SPRN_MMCR0 = 0x0000000080000080
[23]: register SPRN_PMC1 = 0x0000000080000004
[24]: counter = 9
[25]: register SPRN_MMCR0 = 0x0000000080000080
[26]: register SPRN_PMC1 = 0x0000000080000004
[27]: counter = 10
[28]: register SPRN_MMCR0 = 0x0000000080000080
[29]: register SPRN_PMC1 = 0x0000000080000004
Quoted 1 line
Quoted 1 line
[30]: register
SPRN_PMC1=0x000000004000051e
PMC1 count (0x280000546) above upper limit 0x2800003e8 (+0x15e) [FAIL] Test FAILED on line 52
failure: cycles
==========
--- .../selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c | 2 -- tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c | 2 -- .../selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c | 2 -- .../selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c | 2 -- tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 2 -- .../selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c | 2 -- .../selftests/powerpc/pmu/ebb/lost_exception_test.c | 1 - .../testing/selftests/powerpc/pmu/ebb/multi_counter_test.c | 7 ------- .../selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c | 2 -- .../testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c | 2 -- .../selftests/powerpc/pmu/ebb/pmc56_overflow_test.c | 2 -- 11 files changed, 26 deletions(-)
tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c +0 -2
@@ -91,8 +91,6 @@ int back_to_back_ebbs(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c +0 -2
@@ -42,8 +42,6 @@ int cycles(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c +0 -2
@@ -99,8 +99,6 @@ int cycles_with_freeze(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();printf ("EBBs while frozen %d\n" , ebbs_while_frozen);
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c +0 -2
@@ -71,8 +71,6 @@ int cycles_with_mmcr2(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/ebb.c +0 -2
@@ -396,8 +396,6 @@ int ebb_child(union pipe read_pipe, union pipe write_pipe)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c +0 -2
@@ -38,8 +38,6 @@ static int victim_child(union pipe read_pipe, union pipe write_pipe)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();FAIL_IF (ebb_state.stats.ebb_count ==0 );
tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c +0 -1
@@ -75,7 +75,6 @@ static int test_body(void)ebb_freeze_pmcs ();ebb_global_disable (); -count_pmc (4 , sample_period);mtspr (SPRN_PMC4 ,0xdead );dump_summary_ebb_state ();
tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c +0 -7
@@ -70,13 +70,6 @@ int multi_counter(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -count_pmc (2 , sample_period); -count_pmc (3 , sample_period); -count_pmc (4 , sample_period); -count_pmc (5 , sample_period); -count_pmc (6 , sample_period); -dump_ebb_state ();for (i =0 ; i <6 ; i++)
tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c +0 -2
@@ -61,8 +61,6 @@ static int cycles_child(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_summary_ebb_state ();event_close (&event);
tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c +0 -2
@@ -82,8 +82,6 @@ static int test_body(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (1 , sample_period); -dump_ebb_state ();if (mmcr0_mismatch)
tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c +0 -2
@@ -76,8 +76,6 @@ int pmc56_overflow(void)ebb_global_disable ();ebb_freeze_pmcs (); -count_pmc (2 , sample_period); -dump_ebb_state ();printf ("PMC5/6 overflow %d\n" , pmc56_overflowed);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 38/214 f2fs: fix error path in do_recover_data()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 9627a7b31f3c4ff8bc8f3be3683983ffe6eaebe6 ]
- don't panic kernel if f2fs_get_node_page() fails in f2fs_recover_inline_data() or f2fs_recover_inline_xattr();
- return error number of f2fs_truncate_blocks() to f2fs_recover_inline_data()'s caller;
--- fs/f2fs/f2fs.h | 4 ++-- fs/f2fs/inline.c | 19 ++++++++++++------- fs/f2fs/node.c | 6 ++++-- fs/f2fs/recovery.c | 10 ++++++++-- 4 files changed, 26 insertions(+), 13 deletions(-)
fs/f2fs/f2fs.h +2 -2
@@ -3061,7 +3061,7 @@ bool f2fs_alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid);void f2fs_alloc_nid_done (struct f2fs_sb_info *sbi,nid_t nid);void f2fs_alloc_nid_failed (struct f2fs_sb_info *sbi,nid_t nid);int f2fs_try_to_free_nids (struct f2fs_sb_info *sbi,int nr_shrink); -void f2fs_recover_inline_xattr (struct inode *inode,struct page *page); +int f2fs_recover_inline_xattr (struct inode *inode,struct page *page);int f2fs_recover_xattr_data (struct inode *inode,struct page *page);int f2fs_recover_inode_page (struct f2fs_sb_info *sbi,struct page *page); int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
@@ -3487,7 +3487,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page);int f2fs_convert_inline_page (struct dnode_of_data *dn,struct page *page);int f2fs_convert_inline_inode (struct inode *inode);int f2fs_write_inline_data (struct inode *inode,struct page *page); -bool f2fs_recover_inline_data (struct inode *inode,struct page *npage); +int f2fs_recover_inline_data (struct inode *inode,struct page *npage);struct f2fs_dir_entry *f2fs_find_in_inline_dir (struct inode *dir,struct fscrypt_name *fname,struct page **res_page); int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,
fs/f2fs/inline.c +12 -7
@@ -252,7 +252,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)return 0 ; } -bool f2fs_recover_inline_data (struct inode *inode,struct page *npage) +int f2fs_recover_inline_data (struct inode *inode,struct page *npage) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode *ri =NULL ;
@@ -274,7 +274,8 @@ bool f2fs_recover_inline_data(struct inode *inode, struct page *npage) ri && (ri->i_inline & F2FS_INLINE_DATA)) { process_inline: ipage =f2fs_get_node_page (sbi, inode->i_ino); -f2fs_bug_on (sbi,IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage);f2fs_wait_on_page_writeback (ipage,NODE , true, true);
@@ -287,21 +288,25 @@ process_inline:set_page_dirty (ipage);f2fs_put_page (ipage,1 ); -return true; +return 1 ; }if (f2fs_has_inline_data (inode)) { ipage =f2fs_get_node_page (sbi, inode->i_ino); -f2fs_bug_on (sbi,IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage);f2fs_truncate_inline_inode (inode, ipage,0 );clear_inode_flag (inode,FI_INLINE_DATA );f2fs_put_page (ipage,1 ); }else if (ri && (ri->i_inline &F2FS_INLINE_DATA )) { -if (f2fs_truncate_blocks (inode,0 , false)) -return false; +int ret; + + ret =f2fs_truncate_blocks (inode,0 , false); +if (ret) +return ret; goto process_inline; } -return false; +return 0 ; } struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
fs/f2fs/node.c +4 -2
@@ -2512,7 +2512,7 @@ int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink)return nr - nr_shrink; } -void f2fs_recover_inline_xattr (struct inode *inode,struct page *page) +int f2fs_recover_inline_xattr (struct inode *inode,struct page *page) {void *src_addr, *dst_addr;size_t inline_size;
@@ -2520,7 +2520,8 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page)struct f2fs_inode *ri; ipage =f2fs_get_node_page (F2FS_I_SB (inode), inode->i_ino); -f2fs_bug_on (F2FS_I_SB (inode),IS_ERR (ipage)); +if (IS_ERR (ipage)) +return PTR_ERR (ipage); ri =F2FS_INODE (page);if (ri->i_inline &F2FS_INLINE_XATTR ) {
@@ -2539,6 +2540,7 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page) update_inode:f2fs_update_inode (inode, ipage);f2fs_put_page (ipage,1 ); +return 0 ; }int f2fs_recover_xattr_data (struct inode *inode,struct page *page)
fs/f2fs/recovery.c +8 -2
@@ -514,7 +514,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,/* step 1: recover xattr */ if (IS_INODE (page)) { -f2fs_recover_inline_xattr (inode, page); + err =f2fs_recover_inline_xattr (inode, page); +if (err) + goto out; }else if (f2fs_has_xattr_block (ofs_of_node (page))) { err =f2fs_recover_xattr_data (inode, page);if (!err)
@@ -523,8 +525,12 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, }/* step 2: recover inline data */ -if (f2fs_recover_inline_data (inode, page)) + err =f2fs_recover_inline_data (inode, page); +if (err) { +if (err ==1 ) + err =0 ; goto out; + }/* step 3: recover data indices */ start =f2fs_start_bidx_of_node (ofs_of_node (page), inode);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 39/214 omapfb: fix multiple reference count leaks due to pm_runtime_get_sync
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 78c2ce9bde70be5be7e3615a2ae7024ed8173087 ]
On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error.
--- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/dss.c | 7 +++++-- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +++-- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 5 +++-- drivers/video/fbdev/omap2/omapfb/dss/venc.c | 7 +++++-- 6 files changed, 26 insertions(+), 12 deletions(-)
drivers/video/fbdev/omap2/omapfb/dss/dispc.c +5 -2
@@ -520,8 +520,11 @@ int dispc_runtime_get(void)DSSDBG ("dispc_runtime_get\n" ); r =pm_runtime_get_sync (&dispc.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dispc.pdev->dev); +return r; + } +return 0 ; }EXPORT_SYMBOL (dispc_runtime_get);
drivers/video/fbdev/omap2/omapfb/dss/dsi.c +5 -2
@@ -1137,8 +1137,11 @@ static int dsi_runtime_get(struct platform_device *dsidev)DSSDBG ("dsi_runtime_get\n" ); r =pm_runtime_get_sync (&dsi->pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dsi->pdev->dev); +return r; + } +return 0 ; }static void dsi_runtime_put (struct platform_device *dsidev)
drivers/video/fbdev/omap2/omapfb/dss/dss.c +5 -2
@@ -768,8 +768,11 @@ int dss_runtime_get(void)DSSDBG ("dss_runtime_get\n" ); r =pm_runtime_get_sync (&dss.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&dss.pdev->dev); +return r; + } +return 0 ; }void dss_runtime_put (void )
drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +3 -2
@@ -39,9 +39,10 @@ static int hdmi_runtime_get(void)DSSDBG ("hdmi_runtime_get\n" ); r =pm_runtime_get_sync (&hdmi.pdev->dev); -WARN_ON (r <0 ); -if (r <0 ) +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&hdmi.pdev->dev);return r; + }return 0 ; }
drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c +3 -2
@@ -43,9 +43,10 @@ static int hdmi_runtime_get(void)DSSDBG ("hdmi_runtime_get\n" ); r =pm_runtime_get_sync (&hdmi.pdev->dev); -WARN_ON (r <0 ); -if (r <0 ) +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&hdmi.pdev->dev);return r; + }return 0 ; }
drivers/video/fbdev/omap2/omapfb/dss/venc.c +5 -2
@@ -391,8 +391,11 @@ static int venc_runtime_get(void)DSSDBG ("venc_runtime_get\n" ); r =pm_runtime_get_sync (&venc.pdev->dev); -WARN_ON (r <0 ); -return r <0 ? r :0 ; +if (WARN_ON (r <0 )) { +pm_runtime_put_sync (&venc.pdev->dev); +return r; + } +return 0 ; }static void venc_runtime_put (void )
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 40/214 PCI: Fix pci_create_slot() reference count leak
In reply to Greg Kroah-HartmanFrom: Qiushi Wu <[email protected]>
[ Upstream commit 8a94644b440eef5a7b9c104ac8aa7a7f413e35e5 ]
kobject_init_and_add() takes a reference even when it fails. If it returns an error, kobject_put() must be called to clean up the memory associated with the object.
When kobject_init_and_add() fails, call kobject_put() instead of kfree().
b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") fixed a similar problem.
--- drivers/pci/slot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/slot.c +4 -2
@@ -304,13 +304,16 @@ placeholder: slot_name =make_slot_name (name);if (!slot_name) { err = -ENOMEM ; +kfree (slot); goto err; } err =kobject_init_and_add (&slot->kobj, &pci_slot_ktype,NULL ,"%s" , slot_name); -if (err) +if (err) { +kobject_put (&slot->kobj); goto err; + }INIT_LIST_HEAD (&slot->list);list_add (&slot->list, &parent->slots);
@@ -329,7 +332,6 @@ out:mutex_unlock (&pci_slot_mutex);return slot; err: -kfree (slot); slot =ERR_PTR (err); goto out; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 41/214 ARM: dts: ls1021a: output PPS signal on FIPER2
In reply to Greg Kroah-HartmanFrom: Yangbo Lu <[email protected]>
[ Upstream commit 5656bb3857c4904d1dec6e1b8f876c1c0337274e ]
The timer fixed interval period pulse generator register is used to generate periodic pulses. The down count register loads the value programmed in the fixed period interval (FIPER). At every tick of the timer accumulator overflow, the counter decrements by the value of TMR_CTRL[TCLK_PERIOD]. It generates a pulse when the down counter value reaches zero. It reloads the down counter in the cycle following a pulse.
To use the TMR_FIPER register to generate desired periodic pulses. The value should programmed is, desired_period - tclk_period
Current tmr-fiper2 value is to generate 100us periodic pulses. (But the value should have been 99995, not 99990. The tclk_period is 5.) This patch is to generate 1 second periodic pulses with value 999999995 programmed which is more desired by user.
--- arch/arm/boot/dts/ls1021a.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ls1021a.dtsi +1 -1
@@ -753,7 +753,7 @@ fsl,tmr-prsc = <2>; fsl,tmr-add = <0xaaaaaaab>; fsl,tmr-fiper1 = <999999995>; - fsl,tmr-fiper2 = <99990>; + fsl,tmr-fiper2 = <999999995>; fsl,max-adj = <499999999>; fsl,extts-fifo; };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 42/214 rtlwifi: rtl8192cu: Prevent leaking urb
In reply to Greg Kroah-HartmanFrom: Reto Schneider <[email protected]>
[ Upstream commit 03128643eb5453a798db5770952c73dc64fcaf00 ]
If usb_submit_urb fails the allocated urb should be unanchored and released.
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +4 -1
@@ -718,8 +718,11 @@ static int _rtl_usb_receive(struct ieee80211_hw *hw)usb_anchor_urb (urb, &rtlusb->rx_submitted); err =usb_submit_urb (urb,GFP_KERNEL ); -if (err) +if (err) { +usb_unanchor_urb (urb); +usb_free_urb (urb); goto err_out; + }usb_free_urb (urb); }return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 43/214 mips/vdso: Fix resource leaks in genvdso.c
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit a859647b4e6bfeb192284d27d24b6a0c914cae1d ]
Close "fd" before the return of map_vdso() and close "out_file" in main().
--- arch/mips/vdso/genvdso.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/mips/vdso/genvdso.c +10 -0
@@ -122,6 +122,7 @@ static void *map_vdso(const char *path, size_t *_size)if (fstat (fd, &stat) !=0 ) {fprintf (stderr,"%s: Failed to stat '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -130,6 +131,7 @@ static void *map_vdso(const char *path, size_t *_size)if (addr ==MAP_FAILED ) {fprintf (stderr,"%s: Failed to map '%s': %s\n" , program_name, path,strerror (errno)); +close (fd);return NULL ; }
@@ -139,6 +141,7 @@ static void *map_vdso(const char *path, size_t *_size)if (memcmp (ehdr->e_ident,ELFMAG ,SELFMAG ) !=0 ) {fprintf (stderr,"%s: '%s' is not an ELF file\n" , program_name, path); +close (fd);return NULL ; }
@@ -150,6 +153,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF class\n" , program_name, path); +close (fd);return NULL ; }
@@ -161,6 +165,7 @@ static void *map_vdso(const char *path, size_t *_size)default :fprintf (stderr,"%s: '%s' has invalid ELF data order\n" , program_name, path); +close (fd);return NULL ; }
@@ -168,15 +173,18 @@ static void *map_vdso(const char *path, size_t *_size)fprintf (stderr,"%s: '%s' has invalid ELF machine (expected EM_MIPS)\n" , program_name, path); +close (fd);return NULL ; }else if (swap_uint16 (ehdr->e_type) !=ET_DYN ) {fprintf (stderr,"%s: '%s' has invalid ELF type (expected ET_DYN)\n" , program_name, path); +close (fd);return NULL ; } *_size = stat.st_size; +close (fd);return addr; }
@@ -280,10 +288,12 @@ int main(int argc, char **argv)/* Calculate and write symbol offsets to <output file> */ if (!get_symbols (dbg_vdso_path, dbg_vdso)) {unlink (out_path); +fclose (out_file);return EXIT_FAILURE ; }fprintf (out_file,"};\n" ); +fclose (out_file);return EXIT_SUCCESS ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 44/214 ALSA: hda: Add support for Loongson 7A1000 controller
In reply to Greg Kroah-HartmanFrom: Kaige Li <[email protected]>
[ Upstream commit 61eee4a7fc406f94e441778c3cecbbed30373c89 ]
Add the new PCI ID 0x0014 0x7a07 to support Loongson 7A1000 controller.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2671,6 +2671,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI },/* Zhaoxin */ { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN }, + /* Loongson */ + { PCI_DEVICE(0x0014, 0x7a07), .driver_data = AZX_DRIVER_GENERIC }, { 0, } };MODULE_DEVICE_TABLE (pci, azx_ids);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 45/214 cec-api: prevent leaking memory through hole in structure
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 6c42227c3467549ddc65efe99c869021d2f4a570 ]
Fix this smatch warning:
drivers/media/cec/core/cec-api.c:156 cec_adap_g_log_addrs() warn: check that 'log_addrs' doesn't leak information (struct has a hole after 'features')
--- drivers/media/cec/cec-api.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/media/cec/cec-api.c +7 -1
@@ -147,7 +147,13 @@ static long cec_adap_g_log_addrs(struct cec_adapter *adap,struct cec_log_addrs log_addrs;mutex_lock (&adap->lock); - log_addrs = adap->log_addrs; +/* +* We use memcpy here instead of assignment since there is a +* hole at the end of struct cec_log_addrs that an assignment +* might ignore. So when we do copy_to_user() we could leak +* one byte of memory. +*/ +memcpy (&log_addrs, &adap->log_addrs,sizeof (log_addrs));if (!adap->is_configured)memset (log_addrs.log_addr,CEC_LOG_ADDR_INVALID ,sizeof (log_addrs.log_addr));
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 46/214 HID: quirks: add NOGET quirk for Logitech GROUP
In reply to Greg Kroah-HartmanFrom: Ikjoon Jang <[email protected]>
[ Upstream commit 68f775ddd2a6f513e225f9a565b054ab48fef142 ]
Add HID_QUIRK_NOGET for Logitech GROUP device.
Logitech GROUP is a compound with camera and audio. When the HID interface in an audio device is requested to get specific report id, all following control transfers are stalled and never be restored back.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -771,6 +771,7 @@#define USB_DEVICE_ID_LOGITECH_G27_WHEEL 0xc29b#define USB_DEVICE_ID_LOGITECH_WII_WHEEL 0xc29c#define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a +#define USB_DEVICE_ID_LOGITECH_GROUP_AUDIO 0x0882#define USB_DEVICE_ID_S510_RECEIVER 0xc50c#define USB_DEVICE_ID_S510_RECEIVER_2 0xc517#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500 0xc512
drivers/hid/hid-quirks.c +1 -0
@@ -179,6 +179,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET }, { 0 } };
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 47/214 f2fs: fix use-after-free issue
In reply to Greg Kroah-HartmanFrom: Li Guifu <[email protected]>
[ Upstream commit 99c787cfd2bd04926f1f553b30bd7dcea2caaba1 ]
During umount, f2fs_put_super() unregisters procfs entries after f2fs_destroy_segment_manager(), it may cause use-after-free issue when umount races with procfs accessing, fix it by relocating f2fs_unregister_sysfs().
[Chao Yu: change commit title/message a bit]
--- fs/f2fs/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/f2fs/super.c +3 -2
@@ -1075,6 +1075,9 @@ static void f2fs_put_super(struct super_block *sb)int i;bool dropped; +/* unregister procfs/sysfs entries in advance to avoid race case */ +f2fs_unregister_sysfs (sbi); +f2fs_quota_off_umount (sb);/* prevent remaining shrinker jobs */
@@ -1138,8 +1141,6 @@ static void f2fs_put_super(struct super_block *sb)kvfree (sbi->ckpt); -f2fs_unregister_sysfs (sbi); - sb->s_fs_info =NULL ;if (sbi->s_chksum_driver)crypto_free_shash (sbi->s_chksum_driver);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 48/214 drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit bfad51c7633325b5d4b32444efe04329d53297b2 ]
nouveau_fbcon_open() calls calls pm_runtime_get_sync() that increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_fbcon.c +3 -1
@@ -189,8 +189,10 @@ nouveau_fbcon_open(struct fb_info *info, int user)struct nouveau_fbdev *fbcon = info->par;struct nouveau_drm *drm =nouveau_drm (fbcon->helper.dev);int ret =pm_runtime_get_sync (drm->dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put (drm->dev->dev);return ret; + }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 49/214 drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit a2cdf39536b0d21fb06113f5e16692513d7bcb9c ]
nv50_disp_atomic_commit() calls calls pm_runtime_get_sync and in turn increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
@@ -2032,8 +2032,10 @@ nv50_disp_atomic_commit(struct drm_device *dev,int ret, i; ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return ret; + } ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 50/214 drm/nouveau: Fix reference count leak in nouveau_connector_detect
In reply to Greg Kroah-HartmanFrom: Aditya Pakki <[email protected]>
[ Upstream commit 990a1162986e8eff7ca18cc5a0e03b4304392ae2 ]
nouveau_connector_detect() calls pm_runtime_get_sync and in turn increments the reference count. In case of failure, decrement the ref count before returning the error.
--- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_connector.c +3 -1
@@ -568,8 +568,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)pm_runtime_get_noresume (dev->dev); }else { ret =pm_runtime_get_sync (dev->dev); -if (ret <0 && ret != -EACCES ) +if (ret <0 && ret != -EACCES ) { +pm_runtime_put_autosuspend (dev->dev);return conn_status; + } } nv_encoder =nouveau_connector_ddc_detect (connector);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 51/214 locking/lockdep: Fix overflow in presentation of average lock-time
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit a7ef9b28aa8d72a1656fa6f0a01bbd1493886317 ]
Though the number of lock-acquisitions is tracked as unsigned long, this is passed as the divisor to div_s64() which interprets it as a s32, giving nonsense values with more than 2 billion acquisitons. E.g.
acquisitions holdtime-min holdtime-max holdtime-total holdtime-avg
-------------------------------------------------------------------------
2350439395 0.07 353.38 649647067.36 0.-32
--- kernel/locking/lockdep_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep_proc.c +1 -1
@@ -400,7 +400,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)seq_time (m, lt->min);seq_time (m, lt->max);seq_time (m, lt->total); -seq_time (m, lt->nr ?div_s64 (lt->total, lt->nr) :0 ); +seq_time (m, lt->nr ?div64_u64 (lt->total, lt->nr) :0 ); }static void seq_stats (struct seq_file *m,struct lock_stat_data *data)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 52/214 btrfs: file: reserve qgroup space after the hole punch range is locked
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit a7f8b1c2ac21bf081b41264c9cfd6260dffa6246 ]
The incoming qgroup reserved space timing will move the data reservation to ordered extent completely.
However in btrfs_punch_hole_lock_range() will call btrfs_invalidate_page(), which will clear QGROUP_RESERVED bit for the range.
In current stage it's OK, but if we're making ordered extents handle the reserved space, then btrfs_punch_hole_lock_range() can clear the QGROUP_RESERVED bit before we submit ordered extent, leading to qgroup reserved space leakage.
So here change the timing to make reserve data space after btrfs_punch_hole_lock_range().
The new timing is fine for either current code or the new code.
--- fs/btrfs/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/btrfs/file.c +4 -4
@@ -3130,14 +3130,14 @@ reserve_space:if (ret <0 ) goto out; space_reserved = true; - ret =btrfs_qgroup_reserve_data (inode, &data_reserved, - alloc_start, bytes_to_reserve); -if (ret) - goto out; ret =btrfs_punch_hole_lock_range (inode, lockstart, lockend, &cached_state);if (ret) goto out; + ret =btrfs_qgroup_reserve_data (inode, &data_reserved, + alloc_start, bytes_to_reserve); +if (ret) + goto out; ret = btrfs_prealloc_file_range(inode, mode, alloc_start, alloc_end - alloc_start, i_blocksize(inode),
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 53/214 btrfs: make btrfs_qgroup_check_reserved_leak take btrfs_inode
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
[ Upstream commit cfdd45921571eb24073e0737fa0bd44b4218f914 ]
vfs_inode is used only for the inode number everything else requires btrfs_inode.
--- fs/btrfs/inode.c | 2 +- fs/btrfs/qgroup.c | 14 +++++++------- fs/btrfs/qgroup.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
fs/btrfs/inode.c +1 -1
@@ -9568,7 +9568,7 @@ void btrfs_destroy_inode(struct inode *inode)btrfs_put_ordered_extent (ordered); } } -btrfs_qgroup_check_reserved_leak (inode); +btrfs_qgroup_check_reserved_leak (BTRFS_I (inode));inode_tree_del (inode);btrfs_drop_extent_cache (BTRFS_I (inode),0 , (u64)-1 ,0 ); }
fs/btrfs/qgroup.c +7 -7
@@ -3769,7 +3769,7 @@ void btrfs_qgroup_convert_reserved_meta(struct btrfs_root *root, int num_bytes)* Check qgroup reserved space leaking, normally at destroy inode * time */ -void btrfs_qgroup_check_reserved_leak (struct inode *inode) +void btrfs_qgroup_check_reserved_leak (struct btrfs_inode *inode) {struct extent_changeset changeset;struct ulist_node *unode;
@@ -3777,19 +3777,19 @@ void btrfs_qgroup_check_reserved_leak(struct inode *inode)int ret;extent_changeset_init (&changeset); - ret =clear_record_extent_bits (&BTRFS_I (inode)->io_tree,0 , (u64)-1 , + ret =clear_record_extent_bits (&inode->io_tree,0 , (u64)-1 ,EXTENT_QGROUP_RESERVED , &changeset);WARN_ON (ret <0 );if (WARN_ON (changeset.bytes_changed)) {ULIST_ITER_INIT (&iter);while ((unode =ulist_next (&changeset.range_changed, &iter))) { -btrfs_warn (BTRFS_I (inode)->root->fs_info, -"leaking qgroup reserved space, ino: %lu, start: %llu, end: %llu" , - inode->i_ino, unode->val, unode->aux); +btrfs_warn (inode->root->fs_info, +"leaking qgroup reserved space, ino: %llu, start: %llu, end: %llu" , +btrfs_ino (inode), unode->val, unode->aux); } -btrfs_qgroup_free_refroot (BTRFS_I (inode)->root->fs_info, -BTRFS_I (inode)->root->root_key.objectid, +btrfs_qgroup_free_refroot (inode->root->fs_info, + inode->root->root_key.objectid, changeset.bytes_changed,BTRFS_QGROUP_RSV_DATA ); }
fs/btrfs/qgroup.h +1 -1
@@ -399,7 +399,7 @@ void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root);*/ void btrfs_qgroup_convert_reserved_meta (struct btrfs_root *root,int num_bytes); -void btrfs_qgroup_check_reserved_leak (struct inode *inode); +void btrfs_qgroup_check_reserved_leak (struct btrfs_inode *inode);/* btrfs_qgroup_swapped_blocks related functions */ void btrfs_qgroup_init_swapped_blocks(
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 54/214 scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
In reply to Greg Kroah-HartmanFrom: Jing Xiangfeng <[email protected]>
[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]
If scsi_host_lookup() fails we will jump to put_host which may cause a panic. Jump to exit_set_fnode instead.
--- drivers/scsi/scsi_transport_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_transport_iscsi.c +1 -1
@@ -3174,7 +3174,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,pr_err ("%s could not find host no %u\n" , __func__, ev->u.set_flashnode.host_no); err = -ENODEV ; - goto put_host; + goto exit_set_fnode; } idx = ev->u.set_flashnode.flashnode_idx;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 55/214 ceph: fix potential mdsc use-after-free crash
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit fa9967734227b44acb1b6918033f9122dc7825b9 ]
Make sure the delayed work stopped before releasing the resources.
cancel_delayed_work_sync() will only guarantee that the work finishes executing if the work is already in the ->worklist. That means after the cancel_delayed_work_sync() returns, it will leave the work requeued if it was rearmed at the end. That can lead to a use after free once the work struct is freed.
Fix it by flushing the delayed work instead of trying to cancel it, and ensure that the work doesn't rearm if the mdsc is stopping.
URL: https://tracker.ceph.com/issues/46293
--- fs/ceph/mds_client.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/ceph/mds_client.c +13 -1
@@ -4068,6 +4068,9 @@ static void delayed_work(struct work_struct *work)dout ("mdsc delayed_work\n" ); +if (mdsc->stopping) +return ; +mutex_lock (&mdsc->mutex); renew_interval = mdsc->mdsmap->m_session_timeout >>2 ; renew_caps = time_after_eq(jiffies, HZ*renew_interval +
@@ -4433,7 +4436,16 @@ void ceph_mdsc_force_umount(struct ceph_mds_client *mdsc)static void ceph_mdsc_stop (struct ceph_mds_client *mdsc) {dout ("stop\n" ); -cancel_delayed_work_sync (&mdsc->delayed_work);/* cancel timer */ +/* +* Make sure the delayed work stopped before releasing +* the resources. +* +* Because the cancel_delayed_work_sync() will only +* guarantee that the work finishes executing. But the +* delayed work will re-arm itself again after that. +*/ +flush_delayed_work (&mdsc->delayed_work); +if (mdsc->mdsmap)ceph_mdsmap_destroy (mdsc->mdsmap);kfree (mdsc->sessions);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 56/214 ceph: do not access the kiocb after aio requests
In reply to Greg Kroah-HartmanFrom: Xiubo Li <[email protected]>
[ Upstream commit d1d9655052606fd9078e896668ec90191372d513 ]
In aio case, if the completion comes very fast just before the ceph_read_iter() returns to fs/aio.c, the kiocb will be freed in the completion callback, then if ceph_read_iter() access again we will potentially hit the use-after-free bug.
[ jlayton: initialize direct_lock early, and use it everywhere ]
URL: https://tracker.ceph.com/issues/45649
--- fs/ceph/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ceph/file.c +3 -2
@@ -1260,6 +1260,7 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to)struct inode *inode =file_inode (filp);struct ceph_inode_info *ci =ceph_inode (inode);struct page *pinned_page =NULL ; +bool direct_lock = iocb->ki_flags &IOCB_DIRECT ;ssize_t ret;int want, got =0 ;int retry_op =0 , read =0 ;
@@ -1268,7 +1269,7 @@ again:dout ("aio_read %p %llx.%llx %llu~%u trying to get caps on %p\n" , inode,ceph_vinop (inode), iocb->ki_pos, (unsigned )len, inode); -if (iocb->ki_flags &IOCB_DIRECT ) +if (direct_lock)ceph_start_io_direct (inode);else ceph_start_io_read (inode);
@@ -1325,7 +1326,7 @@ again: }ceph_put_cap_refs (ci, got); -if (iocb->ki_flags &IOCB_DIRECT ) +if (direct_lock)ceph_end_io_direct (inode);else ceph_end_io_read (inode);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 57/214 scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
In reply to Greg Kroah-HartmanFrom: Javed Hasan <[email protected]>
[ Upstream commit e95b4789ff4380733006836d28e554dc296b2298 ]
In fcoe_sysfs_fcf_del(), we first deleted the fcf from the list and then freed it if ctlr_dev was not NULL. This was causing a memory leak.
Free the fcf even if ctlr_dev is NULL.
--- drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/fcoe/fcoe_ctlr.c +1 -1
@@ -255,9 +255,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new)WARN_ON (!fcf_dev); new->fcf_dev =NULL ;fcoe_fcf_device_delete (fcf_dev); -kfree (new);mutex_unlock (&cdev->lock); } +kfree (new); }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 58/214 EDAC/ie31200: Fallback if host bridge device is already initialized
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
[ Upstream commit 709ed1bcef12398ac1a35c149f3e582db04456c2 ]
The Intel uncore driver may claim some of the pci ids from ie31200 which means that the ie31200 edac driver will not initialize them as part of pci_register_driver().
Let's add a fallback for this case to 'pci_get_device()' to get a reference on the device such that it can still be configured. This is similar in approach to other edac drivers.
--- drivers/edac/ie31200_edac.c | 50 ++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/edac/ie31200_edac.c +47 -3
@@ -170,6 +170,8 @@ (n << (28 + (2 * skl) - PAGE_SHIFT))static int nr_channels; +static struct pci_dev *mci_pdev; +static int ie31200_registered =1 ;struct ie31200_priv {void __iomem *window;
@@ -541,12 +543,16 @@ fail_free:static int ie31200_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -edac_dbg (0 ,"MC:\n" ); +int rc; +edac_dbg (0 ,"MC:\n" );if (pci_enable_device (pdev) <0 )return -EIO ; + rc =ie31200_probe1 (pdev, ent->driver_data); +if (rc ==0 && !mci_pdev) + mci_pdev =pci_dev_get (pdev); -return ie31200_probe1 (pdev, ent->driver_data); +return rc; }static void ie31200_remove_one (struct pci_dev *pdev)
@@ -555,6 +561,8 @@ static void ie31200_remove_one(struct pci_dev *pdev)struct ie31200_priv *priv;edac_dbg (0 ,"\n" ); +pci_dev_put (mci_pdev); + mci_pdev =NULL ; mci =edac_mc_del_mc (&pdev->dev);if (!mci)return ;
@@ -596,17 +604,53 @@ static struct pci_driver ie31200_driver = {static int __init ie31200_init (void ) { +int pci_rc, i; +edac_dbg (3 ,"MC:\n" );/* Ensure that the OPSTATE is set correctly for POLL or NMI */ opstate_init (); -return pci_register_driver (&ie31200_driver); + pci_rc =pci_register_driver (&ie31200_driver); +if (pci_rc <0 ) + goto fail0; + +if (!mci_pdev) { + ie31200_registered =0 ; +for (i =0 ; ie31200_pci_tbl[i].vendor !=0 ; i++) { + mci_pdev =pci_get_device (ie31200_pci_tbl[i].vendor, + ie31200_pci_tbl[i].device, +NULL ); +if (mci_pdev) +break ; + } +if (!mci_pdev) { +edac_dbg (0 ,"ie31200 pci_get_device fail\n" ); + pci_rc = -ENODEV ; + goto fail1; + } + pci_rc =ie31200_init_one (mci_pdev, &ie31200_pci_tbl[i]); +if (pci_rc <0 ) { +edac_dbg (0 ,"ie31200 init fail\n" ); + pci_rc = -ENODEV ; + goto fail1; + } + } +return 0 ; + +fail1: +pci_unregister_driver (&ie31200_driver); +fail0: +pci_dev_put (mci_pdev); + +return pci_rc; } static void __exit ie31200_exit(void) {edac_dbg (3 ,"MC:\n" );pci_unregister_driver (&ie31200_driver); +if (!ie31200_registered) +ie31200_remove_one (mci_pdev); }module_init (ie31200_init);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 59/214 hugetlbfs: prevent filesystem stacking of hugetlbfs
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
[ Upstream commit 15568299b7d9988063afce60731df605ab236e2a ]
syzbot found issues with having hugetlbfs on a union/overlay as reported in [1]. Due to the limitations (no write) and special functionality of hugetlbfs, it does not work well in filesystem stacking. There are no know use cases for hugetlbfs stacking. Rather than making modifications to get hugetlbfs working in such environments, simply prevent stacking.
[1] https://lore.kernel.org/linux-mm/[email protected]/
--- fs/hugetlbfs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/hugetlbfs/inode.c +6 -0
@@ -1284,6 +1284,12 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic =HUGETLBFS_MAGIC ; sb->s_op = &hugetlbfs_ops; sb->s_time_gran =1 ; + +/* +* Due to the special and limited functionality of hugetlbfs, it does +* not work well as a stacking filesystem. +*/ + sb->s_stack_depth =FILESYSTEM_MAX_STACK_DEPTH ; sb->s_root =d_make_root (hugetlbfs_get_root (sb, ctx));if (!sb->s_root) goto out_free;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 60/214 media: davinci: vpif_capture: fix potential double free
In reply to Greg Kroah-HartmanFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 602649eadaa0c977e362e641f51ec306bc1d365d ]
In case of errors vpif_probe_complete() releases memory for vpif_obj.sd and unregisters the V4L2 device. But then this is done again by vpif_probe() itself. The patch removes the cleaning from vpif_probe_complete().
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpif_capture.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/platform/davinci/vpif_capture.c +0 -2
@@ -1482,8 +1482,6 @@ probe_out:/* Unregister video device */ video_unregister_device (&ch->video_dev); } -kfree (vpif_obj.sd); -v4l2_device_unregister (&vpif_obj.v4l2_dev);return err; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 61/214 KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
In reply to Greg Kroah-HartmanFrom: David Brazdil <[email protected]>
[ Upstream commit b38b298aa4397e2dc74a89b4dd3eac9e59b64c96 ]
__hyp_call_panic_nvhe contains inline assembly which did not declare its dependency on the __hyp_panic_string symbol.
The static-declared string has previously been kept alive because of a use in __hyp_call_panic_vhe. Fix this in preparation for separating the source files between VHE and nVHE when the two users land in two different compilation units. The static variable otherwise gets dropped when compiling the nVHE source file, causing an undefined symbol linker error later.
--- arch/arm64/kvm/hyp/switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/hyp/switch.c +1 -1
@@ -754,7 +754,7 @@ static void __hyp_text __hyp_call_panic_nvhe(u64 spsr, u64 elr, u64 par,* making sure it is a kernel address and not a PC-relative * reference. */ - asmvolatile ("ldr %0, =__hyp_panic_string" :"=r" (str_va)); + asmvolatile ("ldr %0, =%1" :"=r" (str_va) :"S" (__hyp_panic_string)); __hyp_do_panic(str_va, spsr, elr,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 62/214 powerpc/spufs: add CONFIG_COREDUMP dependency
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b648a5132ca3237a0f1ce5d871fff342b0efcf8a ]
The kernel test robot pointed out a slightly different error message after recent commit 5456ffdee666 ("powerpc/spufs: simplify spufs core dumping") to spufs for a configuration that never worked:
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_proxydma_info_dump':
Quoted 1 line
Quoted 1 line
file.c:(.text+0x4c68): undefined reference to `.dump_emit'
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_dma_info_dump':
file.c:(.text+0x4d70): undefined reference to `.dump_emit'
powerpc64-linux-ld: arch/powerpc/platforms/cell/spufs/file.o: in function `.spufs_wbox_info_dump':
file.c:(.text+0x4df4): undefined reference to `.dump_emit'
Add a Kconfig dependency to prevent this from happening again.
--- arch/powerpc/platforms/cell/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/cell/Kconfig +1 -0
@@ -44,6 +44,7 @@ config SPU_FS tristate "SPU file system" default m depends on PPC_CELL + depends on COREDUMP select SPU_BASE help The SPU file system is used to access Synergistic Processing
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 63/214 USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
In reply to Greg Kroah-HartmanFrom: Changming Liu <[email protected]>
[ Upstream commit 2b53a19284f537168fb506f2f40d7fda40a01162 ]
The char buffer buf, receives data directly from user space, so its content might be negative and its elements are left shifted to form an unsigned integer.
Since left shifting a negative value is undefined behavior, thus change the char to u8 to elimintate this UB.
--- drivers/usb/misc/sisusbvga/sisusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/sisusbvga/sisusb.c +1 -1
@@ -761,7 +761,7 @@ static int sisusb_write_mem_bulk(struct sisusb_usb_data *sisusb, u32 addr,u8 swap8, fromkern = kernbuffer ?1 :0 ;u16 swap16;u32 swap32, flag = (length >>28 ) &1 ; -char buf[4 ]; +u8 buf[4 ];/* if neither kernbuffer not userbuffer are given, assume * data in obuf
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 64/214 brcmfmac: Set timeout value when configuring power save
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit 3dc05ffb04436020f63138186dbc4f37bd938552 ]
Set the timeout value as per cfg80211's set_power_mgmt() request. If the requested value value is left undefined we set it to 2 seconds, the maximum supported value.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +8 -0
@@ -82,6 +82,8 @@#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000) +#define BRCMF_PS_MAX_TIMEOUT_MS 2000 +#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
@@ -2789,6 +2791,12 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,else bphy_err (drvr,"error (%d)\n" , err); } + + err =brcmf_fil_iovar_int_set (ifp,"pm2_sleep_ret" , +min_t (u32, timeout,BRCMF_PS_MAX_TIMEOUT_MS )); +if (err) +bphy_err (drvr,"Unable to set pm timeout, (%d)\n" , err); + done:brcmf_dbg (TRACE ,"Exit\n" );return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 65/214 efi: provide empty efi_enter_virtual_mode implementation
In reply to Greg Kroah-HartmanFrom: Andrey Konovalov <[email protected]>
[ Upstream commit 2c547f9da0539ad1f7ef7f08c8c82036d61b011a ]
When CONFIG_EFI is not enabled, we might get an undefined reference to efi_enter_virtual_mode() error, if this efi_enabled() call isn't inlined into start_kernel(). This happens in particular, if start_kernel() is annodated with __no_sanitize_address.
--- include/linux/efi.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/efi.h +4 -0
@@ -1039,7 +1039,11 @@ extern void *efi_get_pal_addr (void);extern void efi_map_pal_code (void );extern void efi_memmap_walk (efi_freemem_callback_t callback,void *arg);extern void efi_gettimeofday (struct timespec64 *ts); +#ifdef CONFIG_EFI extern void efi_enter_virtual_mode (void );/* switch EFI to virtual mode, if possible */ +#else +static inline void efi_enter_virtual_mode (void ) {} +#endif #ifdef CONFIG_X86 extern efi_status_t efi_query_variable_store(u32 attributes, unsigned long size,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 66/214 arm64: Fix __cpu_logical_map undefined issue
In reply to Greg Kroah-HartmanFrom: Kefeng Wang <[email protected]>
[ Upstream commit eaecca9e7710281be7c31d892c9f447eafd7ddd9 ]
The __cpu_logical_map undefined issue occued when the new tegra194-cpufreq drvier building as a module.
ERROR: modpost: "__cpu_logical_map" [drivers/cpufreq/tegra194-cpufreq.ko] undefined!
The driver using cpu_logical_map() macro which will expand to __cpu_logical_map, we can't access it in a drvier. Let's turn cpu_logical_map() into a C wrapper and export it to fix the build issue.
Also create a function set_cpu_logical_map(cpu, hwid) when assign a value to cpu_logical_map(cpu).
--- arch/arm64/include/asm/smp.h | 7 ++++++- arch/arm64/kernel/setup.c | 8 +++++++- arch/arm64/kernel/smp.c | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-)
arch/arm64/include/asm/smp.h +6 -1
@@ -46,7 +46,12 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);* Logical CPU mapping. */ extern u64 __cpu_logical_map[NR_CPUS ]; -#define cpu_logical_map (cpu) __cpu_logical_map[cpu] +extern u64 cpu_logical_map (int cpu); + +static inline void set_cpu_logical_map (int cpu,u64 hwid) +{ + __cpu_logical_map[cpu] = hwid; +}struct seq_file ;
arch/arm64/kernel/setup.c +7 -1
@@ -85,7 +85,7 @@ u64 __cacheline_aligned boot_args[4];void __init smp_setup_processor_id (void ) {u64 mpidr =read_cpuid_mpidr () &MPIDR_HWID_BITMASK ; -cpu_logical_map (0 ) = mpidr; +set_cpu_logical_map (0 , mpidr);/* * clear __my_cpu_offset on boot CPU to avoid hang caused by
@@ -276,6 +276,12 @@ arch_initcall(reserve_memblock_reserved_regions);u64 __cpu_logical_map[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =INVALID_HWID }; +u64 cpu_logical_map (int cpu) +{ +return __cpu_logical_map[cpu]; +} +EXPORT_SYMBOL_GPL (cpu_logical_map); +void __init setup_arch (char **cmdline_p) { init_mm.start_code = (unsigned long ) _text;
arch/arm64/kernel/smp.c +3 -3
@@ -549,7 +549,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)return ;/* map the logical cpu id to cpu MPIDR */ -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid); cpu_madt_gicc[cpu_count] = *processor;
@@ -663,7 +663,7 @@ static void __init of_parse_and_init_cpus(void) goto next;pr_debug ("cpu logical map 0x%llx\n" , hwid); -cpu_logical_map (cpu_count) = hwid; +set_cpu_logical_map (cpu_count, hwid);early_map_cpu_to_node (cpu_count,of_node_to_nid (dn)); next:
@@ -704,7 +704,7 @@ void __init smp_init_cpus(void)for (i =1 ; i < nr_cpu_ids; i++) {if (cpu_logical_map (i) !=INVALID_HWID ) {if (smp_cpu_setup (i)) -cpu_logical_map (i) =INVALID_HWID ; +set_cpu_logical_map (i,INVALID_HWID ); } } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 67/214 Revert "ath10k: fix DMA related firmware crashes on multiple devices"
In reply to Greg Kroah-HartmanFrom: Zhi Chen <[email protected]>
[ Upstream commit a1769bb68a850508a492e3674ab1e5e479b11254 ]
This reverts commit 76d164f582150fd0259ec0fcbc485470bcd8033e. PCIe hung issue was observed on multiple platforms. The issue was reproduced when DUT was configured as AP and associated with 50+ STAs.
For QCA9984/QCA9888, the DMA_BURST_SIZE register controls the AXI burst size of the RD/WR access to the HOST MEM.
0 - No split , RAW read/write transfer size from MAC is put out on bus
as burst length
1 - Split at 256 byte boundary
2,3 - Reserved
With PCIe protocol analyzer, we can see DMA Read crossing 4KB boundary when issue happened. It broke PCIe spec and caused PCIe stuck. So revert the default value from 0 to 1.
Tested: IPQ8064 + QCA9984 with firmware 10.4-3.10-00047
QCS404 + QCA9984 with firmware 10.4-3.9.0.2--00044
Synaptics AS370 + QCA9888 with firmware 10.4-3.9.0.2--00040--- drivers/net/wireless/ath/ath10k/hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/hw.h +1 -1
@@ -810,7 +810,7 @@ ath10k_is_rssi_enable(struct ath10k_hw_params *hw,#define TARGET_10_4_TX_DBG_LOG_SIZE 1024#define TARGET_10_4_NUM_WDS_ENTRIES 32 -#define TARGET_10_4_DMA_BURST_SIZE 0 +#define TARGET_10_4_DMA_BURST_SIZE 1#define TARGET_10_4_MAC_AGGR_DELIM 0#define TARGET_10_4_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK 1#define TARGET_10_4_VOW_CONFIG 0
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 68/214 sched/uclamp: Protect uclamp fast path code with static key
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit 46609ce227039fd192e0ecc7d940bed587fd2c78 ]
There is a report that when uclamp is enabled, a netperf UDP test regresses compared to a kernel compiled without uclamp.
https://lore.kernel.org/lkml/[email protected]/
While investigating the root cause, there were no sign that the uclamp code is doing anything particularly expensive but could suffer from bad cache behavior under certain circumstances that are yet to be understood.
https://lore.kernel.org/lkml/20200616110824.dgkkbyapn3io6wik@e107158-lin/
To reduce the pressure on the fast path anyway, add a static key that is by default will skip executing uclamp logic in the enqueue/dequeue_task() fast path until it's needed.
As soon as the user start using util clamp by:
1. Changing uclamp value of a task with sched_setattr()
2. Modifying the default sysctl_sched_util_clamp_{min, max}
3. Modifying the default cpu.uclamp.{min, max} value in cgroup
We flip the static key now that the user has opted to use util clamp. Effectively re-introducing uclamp logic in the enqueue/dequeue_task() fast path. It stays on from that point forward until the next reboot.
This should help minimize the effect of util clamp on workloads that don't need it but still allow distros to ship their kernels with uclamp compiled in by default.
SCHED_WARN_ON() in uclamp_rq_dec_id() was removed since now we can end up with unbalanced call to uclamp_rq_dec_id() if we flip the key while a task is running in the rq. Since we know it is harmless we just quietly return if we attempt a uclamp_rq_dec_id() when rq->uclamp[].bucket[].tasks is 0.
In schedutil, we introduce a new uclamp_is_enabled() helper which takes the static key into account to ensure RT boosting behavior is retained.
The following results demonstrates how this helps on 2 Sockets Xeon E5 2x10-Cores system.
nouclamp uclamp uclamp-static-key Hmean send-64 162.43 ( 0.00%) 157.84 * -2.82%* 163.39 * 0.59%* Hmean send-128 324.71 ( 0.00%) 314.78 * -3.06%* 326.18 * 0.45%* Hmean send-256 641.55 ( 0.00%) 628.67 * -2.01%* 648.12 * 1.02%* Hmean send-1024 2525.28 ( 0.00%) 2448.26 * -3.05%* 2543.73 * 0.73%* Hmean send-2048 4836.14 ( 0.00%) 4712.08 * -2.57%* 4867.69 * 0.65%* Hmean send-3312 7540.83 ( 0.00%) 7425.45 * -1.53%* 7621.06 * 1.06%* Hmean send-4096 9124.53 ( 0.00%) 8948.82 * -1.93%* 9276.25 * 1.66%* Hmean send-8192 15589.67 ( 0.00%) 15486.35 * -0.66%* 15819.98 * 1.48%* Hmean send-16384 26386.47 ( 0.00%) 25752.25 * -2.40%* 26773.74 * 1.47%*
The perf diff between nouclamp and uclamp-static-key when uclamp is disabled in the fast path:
8.73% -1.55% [kernel.kallsyms] [k] try_to_wake_up
0.07% +0.04% [kernel.kallsyms] [k] deactivate_task
0.13% -0.02% [kernel.kallsyms] [k] activate_taskThe diff between nouclamp and uclamp-static-key when uclamp is enabled in the fast path:
8.73% -0.72% [kernel.kallsyms] [k] try_to_wake_up
0.13% +0.39% [kernel.kallsyms] [k] activate_task
0.07% +0.38% [kernel.kallsyms] [k] deactivate_task[ Fix minor conflict with kernel/sched.h because of function renamed later ]
--- kernel/sched/core.c | 74 +++++++++++++++++++++++++++++++- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/sched.h | 47 +++++++++++++++++++- 3 files changed, 119 insertions(+), 4 deletions(-)
kernel/sched/core.c +73 -1
@@ -794,6 +794,26 @@ unsigned int sysctl_sched_uclamp_util_max = SCHED_CAPACITY_SCALE;/* All clamps are required to be less or equal than these values */ static struct uclamp_se uclamp_default[UCLAMP_CNT ]; +/* +* This static key is used to reduce the uclamp overhead in the fast path. It +* primarily disables the call to uclamp_rq_{inc, dec}() in +* enqueue/dequeue_task(). +* +* This allows users to continue to enable uclamp in their kernel config with +* minimum uclamp overhead in the fast path. +* +* As soon as userspace modifies any of the uclamp knobs, the static key is +* enabled, since we have an actual users that make use of uclamp +* functionality. +* +* The knobs that would enable this static key are: +* +* * A task modifying its uclamp value with sched_setattr(). +* * An admin modifying the sysctl_sched_uclamp_{min, max} via procfs. +* * An admin modifying the cgroup cpu.uclamp.{min, max} +*/ +DEFINE_STATIC_KEY_FALSE (sched_uclamp_used); +/* Integer rounded range for each bucket */ #define UCLAMP_BUCKET_DELTA DIV_ROUND_CLOSEST(SCHED_CAPACITY_SCALE, UCLAMP_BUCKETS)
@@ -990,10 +1010,38 @@ static inline void uclamp_rq_dec_id(struct rq *rq, struct task_struct *p,lockdep_assert_held (&rq->lock); +/* +* If sched_uclamp_used was enabled after task @p was enqueued, +* we could end up with unbalanced call to uclamp_rq_dec_id(). +* +* In this case the uc_se->active flag should be false since no uclamp +* accounting was performed at enqueue time and we can just return +* here. +* +* Need to be careful of the following enqeueue/dequeue ordering +* problem too +* +* enqueue(taskA) +* // sched_uclamp_used gets enabled +* enqueue(taskB) +* dequeue(taskA) +* // Must not decrement bukcet->tasks here +* dequeue(taskB) +* +* where we could end up with stale data in uc_se and +* bucket[uc_se->bucket_id]. +* +* The following check here eliminates the possibility of such race. +*/ +if (unlikely (!uc_se->active)) +return ; + bucket = &uc_rq->bucket[uc_se->bucket_id]; +SCHED_WARN_ON (!bucket->tasks);if (likely (bucket->tasks)) bucket->tasks--; + uc_se->active = false;/*
@@ -1021,6 +1069,15 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p) {enum uclamp_id clamp_id; +/* +* Avoid any overhead until uclamp is actually used by the userspace. +* +* The condition is constructed such that a NOP is generated when +* sched_uclamp_used is disabled. +*/ +if (!static_branch_unlikely (&sched_uclamp_used)) +return ; +if (unlikely (!p->sched_class->uclamp_enabled))return ;
@@ -1036,6 +1093,15 @@ static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) {enum uclamp_id clamp_id; +/* +* Avoid any overhead until uclamp is actually used by the userspace. +* +* The condition is constructed such that a NOP is generated when +* sched_uclamp_used is disabled. +*/ +if (!static_branch_unlikely (&sched_uclamp_used)) +return ; +if (unlikely (!p->sched_class->uclamp_enabled))return ;
@@ -1145,8 +1211,10 @@ int sysctl_sched_uclamp_handler(struct ctl_table *table, int write, update_root_tg = true; } -if (update_root_tg) +if (update_root_tg) { +static_branch_enable (&sched_uclamp_used);uclamp_update_root_tg (); + }/* * We update all RUNNABLE tasks only when task groups are in use.
@@ -1211,6 +1279,8 @@ static void __setscheduler_uclamp(struct task_struct *p,if (likely (!(attr->sched_flags &SCHED_FLAG_UTIL_CLAMP )))return ; +static_branch_enable (&sched_uclamp_used); +if (attr->sched_flags &SCHED_FLAG_UTIL_CLAMP_MIN ) {uclamp_se_set (&p->uclamp_req[UCLAMP_MIN ], attr->sched_util_min, true);
@@ -7294,6 +7364,8 @@ static ssize_t cpu_uclamp_write(struct kernfs_open_file *of, char *buf,if (req.ret)return req.ret; +static_branch_enable (&sched_uclamp_used); +mutex_lock (&uclamp_mutex);rcu_read_lock ();
kernel/sched/cpufreq_schedutil.c +1 -1
@@ -210,7 +210,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,unsigned long dl_util, util, irq;struct rq *rq =cpu_rq (cpu); -if (!IS_BUILTIN (CONFIG_UCLAMP_TASK ) && +if (!uclamp_is_used () && type ==FREQUENCY_UTIL &&rt_rq_is_runnable (&rq->rt)) {return max; }
kernel/sched/sched.h +45 -2
75 lines not on this page · raw message
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 69/214 sched/uclamp: Fix a deadlock when enabling uclamp static key
In reply to Greg Kroah-HartmanFrom: Qais Yousef <[email protected]>
[ Upstream commit e65855a52b479f98674998cb23b21ef5a8144b04 ]
The following splat was caught when setting uclamp value of a task:
BUG: sleeping function called from invalid context at ./include/linux/percpu-rwsem.h:49 cpus_read_lock+0x68/0x130 static_key_enable+0x1c/0x38 __sched_setscheduler+0x900/0xad8
Fix by ensuring we enable the key outside of the critical section in __sched_setscheduler()
--- kernel/sched/core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
kernel/sched/core.c +9 -2
@@ -1249,6 +1249,15 @@ static int uclamp_validate(struct task_struct *p,if (upper_bound >SCHED_CAPACITY_SCALE )return -EINVAL ; +/* +* We have valid uclamp attributes; make sure uclamp is enabled. +* +* We need to do that here, because enabling static branches is a +* blocking operation which obviously cannot be done while holding +* scheduler locks. +*/ +static_branch_enable (&sched_uclamp_used); +return 0 ; }
@@ -1279,8 +1288,6 @@ static void __setscheduler_uclamp(struct task_struct *p,if (likely (!(attr->sched_flags &SCHED_FLAG_UTIL_CLAMP )))return ; -static_branch_enable (&sched_uclamp_used); -if (attr->sched_flags &SCHED_FLAG_UTIL_CLAMP_MIN ) {uclamp_se_set (&p->uclamp_req[UCLAMP_MIN ], attr->sched_util_min, true);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 70/214 usb: cdns3: gadget: always zeroed TRB buffer when enable endpoint
In reply to Greg Kroah-Hartman[ Upstream commit 95f5acfc4f58f01a22b66d8c9c0ffb72aa96271c ]
During the endpoint dequeue operation, it changes dequeued TRB as link TRB, when the endpoint is disabled and re-enabled, the DMA fetches the TRB before the link TRB, after it handles current TRB, the DMA pointer will advance to the TRB after link TRB, but enqueue and dequene variables don't know it due to no hardware interrupt at the time, when the next TRB is added to link TRB position, the DMA will not handle this TRB due to its pointer is already at the next TRB. See the trace log like below:
file-storage-675 [001] d..1 86.585657: usb_ep_queue: ep0: req 00000000df9b3a4f length 0/0 sgs 0/0 stream 0 zsI status 0 --> 0
file-storage-675 [001] d..1 86.585663: cdns3_ep_queue: ep1out: req: 000000002ebce364, req buff 00000000f5bc96b4, length: 0/1024 zsi, status: -115, trb: [start:0, end:0: virt addr (null)], flags:0 SID: 0
file-storage-675 [001] d..1 86.585671: cdns3_prepare_trb: ep1out: trb 000000007f770303, dma buf: 0xbd195800, size: 1024, burst: 128 ctrl: 0x00000425 (C=1, T=0, ISP, IOC, Normal) SID:0 LAST_SID:0
file-storage-675 [001] d..1 86.585676: cdns3_ring:
Ring contents for ep1out:
Ring deq index: 0, trb: 000000007f770303 (virt), 0xc4003000 (dma)
Ring enq index: 1, trb: 0000000049c1ba21 (virt), 0xc400300c (dma)
free trbs: 38, CCS=1, PCS=1
@0x00000000c4003000 bd195800 80020400 00000425
@0x00000000c400300c c4003018 80020400 00001811
@0x00000000c4003018 bcfcc000 0000001f 00000426
@0x00000000c4003024 bcfce800 0000001f 00000426
... irq/144-5b13000-698 [000] d... 87.619286: usb_gadget_giveback_request: ep1in: req 0000000031b832eb length 13/13 sgs 0/0 stream 0 zsI status 0 --> 0
file-storage-675 [001] d..1 87.619287: cdns3_ep_queue: ep1out: req: 000000002ebce364, req buff 00000000f5bc96b4, length: 0/1024 zsi, status: -115, trb: [start:0, end:0: virt addr 0x80020400c400300c], flags:0 SID: 0
file-storage-675 [001] d..1 87.619294: cdns3_prepare_trb: ep1out: trb 0000000049c1ba21, dma buf: 0xbd198000, size: 1024, burst: 128 ctrl: 0x00000425 (C=1, T=0, ISP, IOC, Normal) SID:0 LAST_SID:0
file-storage-675 [001] d..1 87.619297: cdns3_ring:
Ring contents for ep1out:
Ring deq index: 1, trb: 0000000049c1ba21 (virt), 0xc400300c (dma)
Ring enq index: 2, trb: 0000000059b34b67 (virt), 0xc4003018 (dma)
free trbs: 38, CCS=1, PCS=1
@0x00000000c4003000 bd195800 0000001f 00000427
@0x00000000c400300c bd198000 80020400 00000425
@0x00000000c4003018 bcfcc000 0000001f 00000426
@0x00000000c4003024 bcfce800 0000001f 00000426
...
file-storage-675 [001] d..1 87.619305: cdns3_doorbell_epx: ep1out, ep_trbaddr c4003018
file-storage-675 [001] .... 87.619308: usb_ep_queue: ep1out: req 000000002ebce364 length 0/1024 sgs 0/0 stream 0 zsI status -115 --> 0
irq/144-5b13000-698 [000] d..1 87.619315: cdns3_epx_irq: IRQ for ep1out: 01000c80 TRBERR , ep_traddr: c4003018 ep_last_sid: 00000000 use_streams: 0
irq/144-5b13000-698 [000] d..1 87.619395: cdns3_usb_irq: IRQ 00000008 = Hot Reset--- drivers/usb/cdns3/gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/cdns3/gadget.c +2 -2
@@ -189,10 +189,10 @@ int cdns3_allocate_trb_pool(struct cdns3_endpoint *priv_ep) GFP_DMA32 | GFP_ATOMIC);if (!priv_ep->trb_pool)return -ENOMEM ; - }else { -memset (priv_ep->trb_pool,0 , ring_size); } +memset (priv_ep->trb_pool,0 , ring_size); +if (!priv_ep->num)return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 71/214 PM / devfreq: rk3399_dmc: Add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 29d867e97f7d781972ed542acfca3c2c0b512603 ]
of_node_put() needs to be called when the device node which is got from of_parse_phandle has finished using.
--- drivers/devfreq/rk3399_dmc.c | 1 + 1 file changed, 1 insertion(+)
drivers/devfreq/rk3399_dmc.c +1 -0
@@ -372,6 +372,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) node =of_parse_phandle (np,"rockchip,pmu" ,0 );if (node) { data->regmap_pmu =syscon_node_to_regmap (node); +of_node_put (node);if (IS_ERR (data->regmap_pmu))return PTR_ERR (data->regmap_pmu); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 72/214 PM / devfreq: rk3399_dmc: Disable devfreq-event device when fails
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit 39a6e4739c19d5334e552d71ceca544ed84f4b87 ]
The probe process may fail, but the devfreq event device remains enabled. Call devfreq_event_disable_edev on the error return path.
--- drivers/devfreq/rk3399_dmc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/devfreq/rk3399_dmc.c +13 -5
@@ -364,7 +364,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)if (res.a0) {dev_err (dev,"Failed to set dram param: %ld\n" , res.a0); -return -EINVAL ; + ret = -EINVAL ; + goto err_edev; } } }
@@ -373,8 +374,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)if (node) { data->regmap_pmu =syscon_node_to_regmap (node);of_node_put (node); -if (IS_ERR (data->regmap_pmu)) -return PTR_ERR (data->regmap_pmu); +if (IS_ERR (data->regmap_pmu)) { + ret =PTR_ERR (data->regmap_pmu); + goto err_edev; + } }regmap_read (data->regmap_pmu,RK3399_PMUGRF_OS_REG2 , &val);
@@ -392,7 +395,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) data->odt_dis_freq = data->timing.lpddr4_odt_dis_freq;break ;default : -return -EINVAL ; + ret = -EINVAL ; + goto err_edev; }; arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
@@ -426,7 +430,8 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)*/ if (dev_pm_opp_of_add_table (dev)) {dev_err (dev,"Invalid operating-points in device tree.\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto err_edev; } of_property_read_u32(np, "upthreshold",
@@ -466,6 +471,9 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) err_free_opp:dev_pm_opp_of_remove_table (&pdev->dev); +err_edev: +devfreq_event_disable_edev (data->edev); +return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 73/214 PM / devfreq: rk3399_dmc: Fix kernel oops when rockchip,pmu is absent
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 63ef91f24f9bfc70b6446319f6cabfd094481372 ]
Booting a recent kernel on a rk3399-based system (nanopc-t4), equipped with a recent u-boot and ATF results in an Oops due to a NULL pointer dereference.
This turns out to be due to the rk3399-dmc driver looking for an *undocumented* property (rockchip,pmu), and happily using a NULL pointer when the property isn't there.
Instead, make most of what was brought in with 9173c5ceb035 ("PM / devfreq: rk3399_dmc: Pass ODT and auto power down parameters to TF-A.") conditioned on finding this property in the device-tree, preventing the driver from exploding.
--- drivers/devfreq/rk3399_dmc.c | 42 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-)
drivers/devfreq/rk3399_dmc.c +23 -19
@@ -95,18 +95,20 @@ static int rk3399_dmcfreq_target(struct device *dev, unsigned long *freq,mutex_lock (&dmcfreq->lock); -if (target_rate >= dmcfreq->odt_dis_freq) - odt_enable = true; - -/* -* This makes a SMC call to the TF-A to set the DDR PD (power-down) -* timings and to enable or disable the ODT (on-die termination) -* resistors. -*/ -arm_smccc_smc (ROCKCHIP_SIP_DRAM_FREQ , dmcfreq->odt_pd_arg0, - dmcfreq->odt_pd_arg1, -ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD , - odt_enable,0 ,0 ,0 , &res); +if (dmcfreq->regmap_pmu) { +if (target_rate >= dmcfreq->odt_dis_freq) + odt_enable = true; + +/* +* This makes a SMC call to the TF-A to set the DDR PD +* (power-down) timings and to enable or disable the +* ODT (on-die termination) resistors. +*/ +arm_smccc_smc (ROCKCHIP_SIP_DRAM_FREQ , dmcfreq->odt_pd_arg0, + dmcfreq->odt_pd_arg1, +ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD , + odt_enable,0 ,0 ,0 , &res); + }/* * If frequency scaling from low to high, adjust voltage first.
@@ -371,13 +373,14 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) } node =of_parse_phandle (np,"rockchip,pmu" ,0 ); -if (node) { - data->regmap_pmu =syscon_node_to_regmap (node); -of_node_put (node); -if (IS_ERR (data->regmap_pmu)) { - ret =PTR_ERR (data->regmap_pmu); - goto err_edev; - } +if (!node) + goto no_pmu; + + data->regmap_pmu =syscon_node_to_regmap (node); +of_node_put (node); +if (IS_ERR (data->regmap_pmu)) { + ret =PTR_ERR (data->regmap_pmu); + goto err_edev; }regmap_read (data->regmap_pmu,RK3399_PMUGRF_OS_REG2 , &val);
@@ -399,6 +402,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) goto err_edev; }; +no_pmu:arm_smccc_smc (ROCKCHIP_SIP_DRAM_FREQ ,0 ,0 ,ROCKCHIP_SIP_CONFIG_DRAM_INIT ,0 ,0 ,0 ,0 , &res);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 74/214 drm/xen: fix passing zero to PTR_ERR warning
In reply to Greg Kroah-HartmanFrom: Ding Xiang <[email protected]>
[ Upstream commit 4c1cb04e0e7ac4ba1ef5457929ef9b5671d9eed3 ]
Fix a static code checker warning:
drivers/gpu/drm/xen/xen_drm_front.c:404 xen_drm_drv_dumb_create()
warn: passing zero to 'PTR_ERR'
--- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xen/xen_drm_front.c +1 -1
@@ -401,7 +401,7 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp, obj =xen_drm_front_gem_create (dev, args->size);if (IS_ERR_OR_NULL (obj)) { - ret =PTR_ERR (obj); + ret =PTR_ERR_OR_ZERO (obj); goto fail; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 75/214 drm/xen-front: Fix misused IS_ERR_OR_NULL checks
In reply to Greg Kroah-HartmanFrom: Oleksandr Andrushchenko <[email protected]>
[ Upstream commit 14dee058610446aa464254fc5c8e88c7535195e0 ]
The patch c575b7eeb89f: "drm/xen-front: Add support for Xen PV display frontend" from Apr 3, 2018, leads to the following static checker warning:
drivers/gpu/drm/xen/xen_drm_front_gem.c:140 xen_drm_front_gem_create() warn: passing zero to 'ERR_CAST'
drivers/gpu/drm/xen/xen_drm_front_gem.c
133 struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev,
134 size_t size)
135 {
136 struct xen_gem_object *xen_obj;
137
138 xen_obj = gem_create(dev, size);
139 if (IS_ERR_OR_NULL(xen_obj))
140 return ERR_CAST(xen_obj);
Fix this and the rest of misused places with IS_ERR_OR_NULL in the driver.
--- drivers/gpu/drm/xen/xen_drm_front.c | 4 ++-- drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 ++++---- drivers/gpu/drm/xen/xen_drm_front_kms.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/xen/xen_drm_front.c +2 -2
@@ -400,8 +400,8 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp, args->size = args->pitch * args->height; obj =xen_drm_front_gem_create (dev, args->size); -if (IS_ERR_OR_NULL (obj)) { - ret =PTR_ERR_OR_ZERO (obj); +if (IS_ERR (obj)) { + ret =PTR_ERR (obj); goto fail; }
drivers/gpu/drm/xen/xen_drm_front_gem.c +4 -4
@@ -83,7 +83,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size) size =round_up (size,PAGE_SIZE ); xen_obj =gem_create_obj (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return xen_obj;if (drm_info->front_info->cfg.be_alloc) {
@@ -117,7 +117,7 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size)*/ xen_obj->num_pages =DIV_ROUND_UP (size,PAGE_SIZE ); xen_obj->pages =drm_gem_get_pages (&xen_obj->base); -if (IS_ERR_OR_NULL (xen_obj->pages)) { +if (IS_ERR (xen_obj->pages)) { ret =PTR_ERR (xen_obj->pages); xen_obj->pages =NULL ; goto fail;
@@ -136,7 +136,7 @@ struct drm_gem_object *xen_drm_front_gem_create(struct drm_device *dev,struct xen_gem_object *xen_obj; xen_obj =gem_create (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return ERR_CAST (xen_obj);return &xen_obj->base;
@@ -194,7 +194,7 @@ xen_drm_front_gem_import_sg_table(struct drm_device *dev, size = attach->dmabuf->size; xen_obj =gem_create_obj (dev, size); -if (IS_ERR_OR_NULL (xen_obj)) +if (IS_ERR (xen_obj))return ERR_CAST (xen_obj); ret =gem_alloc_pages_array (xen_obj, size);
drivers/gpu/drm/xen/xen_drm_front_kms.c +1 -1
@@ -60,7 +60,7 @@ fb_create(struct drm_device *dev, struct drm_file *filp,int ret; fb =drm_gem_fb_create_with_funcs (dev, filp, mode_cmd, &fb_funcs); -if (IS_ERR_OR_NULL (fb)) +if (IS_ERR (fb))return fb; gem_obj =drm_gem_object_lookup (filp, mode_cmd->handles[0 ]);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 76/214 s390/numa: set node distance to LOCAL_DISTANCE
In reply to Greg Kroah-Hartman[ Upstream commit 535e4fc623fab2e09a0653fc3a3e17f382ad0251 ]
The node distance is hardcoded to 0, which causes a trouble for some user-level applications. In particular, "libnuma" expects the distance of a node to itself as LOCAL_DISTANCE. This update removes the offending node distance override.
--- arch/s390/include/asm/numa.h | 1 - arch/s390/include/asm/topology.h | 2 -- arch/s390/numa/numa.c | 6 ------ 3 files changed, 9 deletions(-)
arch/s390/include/asm/numa.h +0 -1
@@ -17,7 +17,6 @@void numa_setup (void );int numa_pfn_to_nid (unsigned long pfn); -int __node_distance (int a,int b);void numa_update_cpu_topology (void );extern cpumask_t node_to_cpumask_map[MAX_NUMNODES ];
arch/s390/include/asm/topology.h +0 -2
@@ -83,8 +83,6 @@ static inline const struct cpumask *cpumask_of_node(int node)#define pcibus_to_node (bus) __pcibus_to_node(bus) -#define node_distance (a, b) __node_distance(a, b) -#else /* !CONFIG_NUMA */ #define numa_node_id numa_node_id
arch/s390/numa/numa.c +0 -6
@@ -49,12 +49,6 @@ void numa_update_cpu_topology(void) mode->update_cpu_topology (); } -int __node_distance (int a,int b) -{ -return mode->distance ? mode->distance (a, b) :0 ; -} -EXPORT_SYMBOL (__node_distance); -int numa_debug_enabled;/*
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 77/214 btrfs: factor out inode items copy loop from btrfs_log_inode()
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit da447009a25609327309f695b244710f12794471 ]
The function btrfs_log_inode() is quite large and so is its loop which iterates the inode items from the fs/subvolume tree and copies them into a log tree. Because this is a large loop inside a very large function and because an upcoming patch in this series needs to add some more logic inside that loop, move the loop into a helper function to make it a bit more manageable.
--- fs/btrfs/tree-log.c | 274 ++++++++++++++++++++++---------------------- 1 file changed, 138 insertions(+), 136 deletions(-)
fs/btrfs/tree-log.c +138 -136
@@ -4994,6 +4994,138 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,return ret; } +static int copy_inode_items_to_log (struct btrfs_trans_handle *trans, +struct btrfs_inode *inode, +struct btrfs_key *min_key, +const struct btrfs_key *max_key, +struct btrfs_path *path, +struct btrfs_path *dst_path, +const u64 logged_isize, +const bool recursive_logging, +const int inode_only, +struct btrfs_log_ctx *ctx, +bool *need_log_inode_item) +{ +struct btrfs_root *root = inode->root; +int ins_start_slot =0 ; +int ins_nr =0 ; +int ret; + +while (1 ) { + ret =btrfs_search_forward (root, min_key, path, trans->transid); +if (ret <0 ) +return ret; +if (ret >0 ) { + ret =0 ; +break ; + } +again: +/* Note, ins_nr might be > 0 here, cleanup outside the loop */ +if (min_key->objectid != max_key->objectid) +break ; +if (min_key->type > max_key->type) +break ; + +if (min_key->type ==BTRFS_INODE_ITEM_KEY ) + *need_log_inode_item = false; + +if ((min_key->type ==BTRFS_INODE_REF_KEY || + min_key->type ==BTRFS_INODE_EXTREF_KEY ) && + inode->generation == trans->transid && + !recursive_logging) { +u64 other_ino =0 ; +u64 other_parent =0 ; + + ret =btrfs_check_ref_name_override (path->nodes[0 ], + path->slots[0 ], min_key, inode, + &other_ino, &other_parent); +if (ret <0 ) { +return ret; + }else if (ret >0 && ctx && + other_ino !=btrfs_ino (BTRFS_I (ctx->inode))) { +if (ins_nr >0 ) { + ins_nr++; + }else { + ins_nr =1 ; + ins_start_slot = path->slots[0 ]; + } + ret =copy_items (trans, inode, dst_path, path, + ins_start_slot, ins_nr, + inode_only, logged_isize); +if (ret <0 ) +return ret; + ins_nr =0 ; + + ret =log_conflicting_inodes (trans, root, path, + ctx, other_ino, other_parent); +if (ret) +return ret; +btrfs_release_path (path); + goto next_key; + } + } + +/* Skip xattrs, we log them later with btrfs_log_all_xattrs() */ +if (min_key->type ==BTRFS_XATTR_ITEM_KEY ) { +if (ins_nr ==0 ) + goto next_slot; + ret =copy_items (trans, inode, dst_path, path, + ins_start_slot, + ins_nr, inode_only, logged_isize); +if (ret <0 ) +return ret; + ins_nr =0 ; + goto next_slot; + } + +if (ins_nr && ins_start_slot + ins_nr == path->slots[0 ]) { + ins_nr++; + goto next_slot; + }else if (!ins_nr) { + ins_start_slot = path->slots[0 ]; + ins_nr =1 ; + goto next_slot; + } + + ret =copy_items (trans, inode, dst_path, path, ins_start_slot, + ins_nr, inode_only, logged_isize); +if (ret <0 ) +return ret; + ins_nr =1 ; + ins_start_slot = path->slots[0 ]; +next_slot: + path->slots[0 ]++; +if (path->slots[0 ] <btrfs_header_nritems (path->nodes[0 ])) { +btrfs_item_key_to_cpu (path->nodes[0 ], min_key, + path->slots[0 ]); + goto again; + } +if (ins_nr) { + ret =copy_items (trans, inode, dst_path, path, + ins_start_slot, ins_nr, inode_only, + logged_isize); +if (ret <0 ) +return ret; + ins_nr =0 ; + } +btrfs_release_path (path); +next_key: +if (min_key->offset < (u64)-1 ) { + min_key->offset++; + }else if (min_key->type < max_key->type) { + min_key->type++; + min_key->offset =0 ; + }else { +break ; + } + } +if (ins_nr) + ret =copy_items (trans, inode, dst_path, path, ins_start_slot, + ins_nr, inode_only, logged_isize); + +return ret; +} +/* log a single inode in the tree log. * At least one parent directory for this inode must exist in the tree * or be logged already.
@@ -5023,9 +5155,6 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,struct btrfs_root *log = root->log_root;int err =0 ;int ret; -int nritems; -int ins_start_slot =0 ; -int ins_nr;bool fast_search = false;u64 ino =btrfs_ino (inode);struct extent_map_tree *em_tree = &inode->extent_tree;
@@ -5156,139 +5285,12 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, goto out_unlock; } -while (1 ) { - ins_nr =0 ; - ret =btrfs_search_forward (root, &min_key, - path, trans->transid); -if (ret <0 ) { - err = ret; - goto out_unlock; - } -if (ret !=0 ) -break ; -again: -/* note, ins_nr might be > 0 here, cleanup outside the loop */ -if (min_key.objectid != ino) -break ; -if (min_key.type > max_key.type) -break ; - -if (min_key.type ==BTRFS_INODE_ITEM_KEY ) - need_log_inode_item = false; - -if ((min_key.type ==BTRFS_INODE_REF_KEY || - min_key.type ==BTRFS_INODE_EXTREF_KEY ) && - inode->generation == trans->transid && - !recursive_logging) { -u64 other_ino =0 ; -u64 other_parent =0 ; - - ret =btrfs_check_ref_name_override (path->nodes[0 ], - path->slots[0 ], &min_key, inode, - &other_ino, &other_parent); -if (ret <0 ) { - err = ret; - goto out_unlock; - }else if (ret >0 && ctx && - other_ino !=btrfs_ino (BTRFS_I (ctx->inode))) { -if (ins_nr >0 ) { - ins_nr++; - }else { - ins_nr =1 ; - ins_start_slot = path->slots[0 ]; - } - ret =copy_items (trans, inode, dst_path, path, - ins_start_slot, - ins_nr, inode_only, - logged_isize); -if (ret <0 ) { - err = ret; - goto out_unlock; - } - ins_nr =0 ; - - err =log_conflicting_inodes (trans, root, path, - ctx, other_ino, other_parent); -if (err) - goto out_unlock; -btrfs_release_path (path); - goto next_key; - } - } - -/* Skip xattrs, we log them later with btrfs_log_all_xattrs() */ -if (min_key.type ==BTRFS_XATTR_ITEM_KEY ) { -if (ins_nr ==0 ) - goto next_slot; - ret =copy_items (trans, inode, dst_path, path, - ins_start_slot, - ins_nr, inode_only, logged_isize); -if (ret <0 ) { - err = ret; - goto out_unlock; - } - ins_nr =0 ; - goto next_slot; - } - -if (ins_nr && ins_start_slot + ins_nr == path->slots[0 ]) { - ins_nr++; - goto next_slot; - }else if (!ins_nr) { - ins_start_slot = path->slots[0 ]; - ins_nr =1 ; - goto next_slot; - } - - ret =copy_items (trans, inode, dst_path, path, - ins_start_slot, ins_nr, inode_only, - logged_isize); -if (ret <0 ) { - err = ret; - goto out_unlock; - } - ins_nr =1 ; - ins_start_slot = path->slots[0 ]; -next_slot: - - nritems =btrfs_header_nritems (path->nodes[0 ]); - path->slots[0 ]++; -if (path->slots[0 ] < nritems) { -btrfs_item_key_to_cpu (path->nodes[0 ], &min_key, - path->slots[0 ]); - goto again; - } -if (ins_nr) { - ret =copy_items (trans, inode, dst_path, path, - ins_start_slot, - ins_nr, inode_only, logged_isize); -if (ret <0 ) { - err = ret; - goto out_unlock; - } - ins_nr =0 ; - } -btrfs_release_path (path); -next_key: -if (min_key.offset < (u64)-1 ) { - min_key.offset++; - }else if (min_key.type < max_key.type) { - min_key.type++; - min_key.offset =0 ; - }else { -break ; - } - } -if (ins_nr) { - ret =copy_items (trans, inode, dst_path, path, - ins_start_slot, ins_nr, inode_only, - logged_isize); -if (ret <0 ) { - err = ret; - goto out_unlock; - } - ins_nr =0 ; - } + err =copy_inode_items_to_log (trans, inode, &min_key, &max_key, + path, dst_path, logged_isize, + recursive_logging, inode_only, ctx, + &need_log_inode_item); +if (err) + goto out_unlock;btrfs_release_path (path);btrfs_release_path (dst_path);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 78/214 btrfs: only commit the delayed inode when doing a full fsync
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 8c8648dd1f6d62aeb912deeb788b6ac33cb782e7 ]
Commit 2c2c452b0cafdc ("Btrfs: fix fsync when extend references are added to an inode") forced a commit of the delayed inode when logging an inode in order to ensure we would end up logging the inode item during a full fsync. By committing the delayed inode, we updated the inode item in the fs/subvolume tree and then later when copying items from leafs modified in the current transaction into the log tree (with copy_inode_items_to_log()) we ended up copying the inode item from the fs/subvolume tree into the log tree. Logging an up to date version of the inode item is required to make sure at log replay time we get the link count fixup triggered among other things (replay xattr deletes, etc). The test case generic/040 from fstests exercises the bug which that commit fixed.
However for a fast fsync we don't need to commit the delayed inode because we always log an up to date version of the inode item based on the struct btrfs_inode we have in-memory. We started doing this for fast fsyncs since commit e4545de5b035c7 ("Btrfs: fix fsync data loss after append write").
So just stop committing the delayed inode if we are doing a fast fsync, we are only wasting time and adding contention on fs/subvolume tree.
This patch is part of a series that has the following patches:
1/4 btrfs: only commit the delayed inode when doing a full fsync 2/4 btrfs: only commit delayed items at fsync if we are logging a directory 3/4 btrfs: stop incremening log_batch for the log root tree when syncing log 4/4 btrfs: remove no longer needed use of log_writers for the log root tree
After the entire patchset applied I saw about 12% decrease on max latency reported by dbench. The test was done on a qemu vm, with 8 cores, 16Gb of ram, using kvm and using a raw NVMe device directly (no intermediary fs on the host). The test was invoked like the following:
mkfs.btrfs -f /dev/sdk
mount -o ssd -o nospace_cache /dev/sdk /mnt/sdk
dbench -D /mnt/sdk -t 300 8
umount /mnt/dsk
--- fs/btrfs/tree-log.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/btrfs/tree-log.c +7 -5
@@ -5154,7 +5154,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,struct btrfs_key max_key;struct btrfs_root *log = root->log_root;int err =0 ; -int ret; +int ret =0 ;bool fast_search = false;u64 ino =btrfs_ino (inode);struct extent_map_tree *em_tree = &inode->extent_tree;
@@ -5191,14 +5191,16 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,/* * Only run delayed items if we are a dir or a new file. -* Otherwise commit the delayed inode only, which is needed in -* order for the log replay code to mark inodes for link count -* fixup (create temporary BTRFS_TREE_LOG_FIXUP_OBJECTID items). +* Otherwise commit the delayed inode only if the full sync flag is set, +* as we want to make sure an up to date version is in the subvolume +* tree so copy_inode_items_to_log() / copy_items() can find it and copy +* it to the log tree. For a non full sync, we always log the inode item +* based on the in-memory struct btrfs_inode which is always up to date. */ if (S_ISDIR (inode->vfs_inode.i_mode) || inode->generation > fs_info->last_trans_committed) ret =btrfs_commit_inode_delayed_items (trans, inode); -else +else if (test_bit (BTRFS_INODE_NEEDS_FULL_SYNC , &inode->runtime_flags)) ret =btrfs_commit_inode_delayed_inode (inode);if (ret) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 79/214 btrfs: only commit delayed items at fsync if we are logging a directory
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 5aa7d1a7f4a2f8ca6be1f32415e9365d026e8fa7 ]
When logging an inode we are committing its delayed items if either the inode is a directory or if it is a new inode, created in the current transaction.
We need to do it for directories, since new directory indexes are stored as delayed items of the inode and when logging a directory we need to be able to access all indexes from the fs/subvolume tree in order to figure out which index ranges need to be logged.
However for new inodes that are not directories, we do not need to do it because the only type of delayed item they can have is the inode item, and we are guaranteed to always log an up to date version of the inode item:
*) for a full fsync we do it by committing the delayed inode and then
copying the item from the fs/subvolume tree with copy_inode_items_to_log();
*) for a fast fsync we always log the inode item based on the contents of
the in-memory struct btrfs_inode. We guarantee this is always done since commit e4545de5b035c7 ("Btrfs: fix fsync data loss after append write").
So stop running delayed items for a new inodes that are not directories, since that forces committing the delayed inode into the fs/subvolume tree, wasting time and adding contention to the tree when a full fsync is not required. We will only do it in case a fast fsync is needed.
This patch is part of a series that has the following patches:
1/4 btrfs: only commit the delayed inode when doing a full fsync 2/4 btrfs: only commit delayed items at fsync if we are logging a directory 3/4 btrfs: stop incremening log_batch for the log root tree when syncing log 4/4 btrfs: remove no longer needed use of log_writers for the log root tree
After the entire patchset applied I saw about 12% decrease on max latency reported by dbench. The test was done on a qemu vm, with 8 cores, 16Gb of ram, using kvm and using a raw NVMe device directly (no intermediary fs on the host). The test was invoked like the following:
mkfs.btrfs -f /dev/sdk
mount -o ssd -o nospace_cache /dev/sdk /mnt/sdk
dbench -D /mnt/sdk -t 300 8
umount /mnt/dsk
--- fs/btrfs/tree-log.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/btrfs/tree-log.c +5 -4
@@ -5147,7 +5147,6 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,const loff_t end, struct btrfs_log_ctx *ctx) { - struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_path *path;struct btrfs_path *dst_path;struct btrfs_key min_key;
@@ -5190,15 +5189,17 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, max_key.offset = (u64)-1 ;/* -* Only run delayed items if we are a dir or a new file. +* Only run delayed items if we are a directory. We want to make sure +* all directory indexes hit the fs/subvolume tree so we can find them +* and figure out which index ranges have to be logged. +* * Otherwise commit the delayed inode only if the full sync flag is set, * as we want to make sure an up to date version is in the subvolume * tree so copy_inode_items_to_log() / copy_items() can find it and copy * it to the log tree. For a non full sync, we always log the inode item * based on the in-memory struct btrfs_inode which is always up to date. */ -if (S_ISDIR (inode->vfs_inode.i_mode) || - inode->generation > fs_info->last_trans_committed) +if (S_ISDIR (inode->vfs_inode.i_mode)) ret =btrfs_commit_inode_delayed_items (trans, inode);else if (test_bit (BTRFS_INODE_NEEDS_FULL_SYNC , &inode->runtime_flags)) ret =btrfs_commit_inode_delayed_inode (inode);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 80/214 mm/shuffle: dont move pages between zones and dont read garbage memmaps
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
[ Upstream commit 4a93025cbe4a0b19d1a25a2d763a3d2018bad0d9 ]
Especially with memory hotplug, we can have offline sections (with a garbage memmap) and overlapping zones. We have to make sure to only touch initialized memmaps (online sections managed by the buddy) and that the zone matches, to not move pages between zones.
To test if this can actually happen, I added a simple
BUG_ON(page_zone(page_i) != page_zone(page_j));
right before the swap. When hotplugging a 256M DIMM to a 4G x86-64 VM and onlining the first memory block "online_movable" and the second memory block "online_kernel", it will trigger the BUG, as both zones (NORMAL and MOVABLE) overlap.
This might result in all kinds of weird situations (e.g., double allocations, list corruptions, unmovable allocations ending up in the movable zone).
--- mm/shuffle.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
mm/shuffle.c +9 -9
@@ -58,25 +58,25 @@ module_param_call(shuffle, shuffle_store, shuffle_show, &shuffle_param, 0400);* For two pages to be swapped in the shuffle, they must be free (on a * 'free_area' lru), have the same order, and have the same migratetype. */ -static struct page *__meminit shuffle_valid_page (unsigned long pfn,int order) +static struct page *__meminit shuffle_valid_page (struct zone *zone, +unsigned long pfn,int order) { -struct page *page; +struct page *page =pfn_to_online_page (pfn);/* * Given we're dealing with randomly selected pfns in a zone we * need to ask questions like... */ -/* ...is the pfn even in the memmap? */ -if (!pfn_valid_within (pfn)) +/* ... is the page managed by the buddy? */ +if (!page)return NULL ; -/* ...is the pfn in a present section or a hole? */ -if (!pfn_present (pfn)) +/* ... is the page assigned to the same zone? */ +if (page_zone (page) != zone)return NULL ;/* ...is the page free and currently on a free_area list? */ - page =pfn_to_page (pfn);if (!PageBuddy (page))return NULL ;
@@ -123,7 +123,7 @@ void __meminit __shuffle_zone(struct zone *z)* page_j randomly selected in the span @zone_start_pfn to * @spanned_pages. */ - page_i =shuffle_valid_page (i, order); + page_i =shuffle_valid_page (z, i, order);if (!page_i)continue ;
@@ -137,7 +137,7 @@ void __meminit __shuffle_zone(struct zone *z) j = z->zone_start_pfn +ALIGN_DOWN (get_random_long () % z->spanned_pages, order_pages); - page_j =shuffle_valid_page (j, order); + page_j =shuffle_valid_page (z, j, order);if (page_j && page_j != page_i)break ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 81/214 mm: fix kthread_use_mm() vs TLB invalidate
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 38cf307c1f2011d413750c5acb725456f47d9172 ]
For SMP systems using IPI based TLB invalidation, looking at current->active_mm is entirely reasonable. This then presents the following race condition:
CPU0 CPU1
flush_tlb_mm(mm) use_mm(mm)
<send-IPI> tsk->active_mm = mm; <IPI> if (tsk->active_mm == mm) // flush TLBs </IPI> switch_mm(old_mm,mm,tsk);
Where it is possible the IPI flushed the TLBs for @old_mm, not @mm, because the IPI lands before we actually switched.
Avoid this by disabling IRQs across changing ->active_mm and switch_mm().
Of the (SMP) architectures that have IPI based TLB invalidate:
Alpha - checks active_mm ARC - ASID specific IA64 - checks active_mm MIPS - ASID specific flush OpenRISC - shoots down world PARISC - shoots down world SH - ASID specific SPARC - ASID specific x86 - N/A xtensa - checks active_mm
So at the very least Alpha, IA64 and Xtensa are suspect.
On top of this, for scheduler consistency we need at least preemption disabled across changing tsk->mm and doing switch_mm(), which is currently provided by task_lock(), but that's not sufficient for PREEMPT_RT.
[[email protected]: add comment]
--- mm/mmu_context.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
mm/mmu_context.c +6 -1
@@ -25,13 +25,16 @@ void use_mm(struct mm_struct *mm)struct task_struct *tsk = current;task_lock (tsk); +/* Hold off tlb flush IPIs while switching mm's */ +local_irq_disable (); active_mm = tsk->active_mm;if (active_mm != mm) {mmgrab (mm); tsk->active_mm = mm; } tsk->mm = mm; -switch_mm (active_mm, mm, tsk); +switch_mm_irqs_off (active_mm, mm, tsk); +local_irq_enable ();task_unlock (tsk);#ifdef finish_arch_post_lock_switchfinish_arch_post_lock_switch ();
@@ -56,9 +59,11 @@ void unuse_mm(struct mm_struct *mm)task_lock (tsk);sync_mm_rss (mm); +local_irq_disable (); tsk->mm =NULL ;/* active_mm is still 'mm' */ enter_lazy_tlb (mm, tsk); +local_irq_enable ();task_unlock (tsk); }EXPORT_SYMBOL_GPL (unuse_mm);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 82/214 mm/cma.c: switch to bitmap_zalloc() for cma bitmap allocation
In reply to Greg Kroah-HartmanFrom: Yunfeng Ye <[email protected]>
[ Upstream commit 2184f9928ab52f26c2ae5e9ba37faf29c78f50b8 ]
kzalloc() is used for cma bitmap allocation in cma_activate_area(), switch to bitmap_zalloc() for clarity.
--- mm/cma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/cma.c +2 -4
@@ -95,13 +95,11 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,static int __init cma_activate_area (struct cma *cma) { -int bitmap_size =BITS_TO_LONGS (cma_bitmap_maxno (cma)) *sizeof (long );unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;unsigned i = cma->count >> pageblock_order;struct zone *zone; - cma->bitmap =kzalloc (bitmap_size,GFP_KERNEL ); - + cma->bitmap =bitmap_zalloc (cma_bitmap_maxno (cma),GFP_KERNEL );if (!cma->bitmap) { cma->count =0 ;return -ENOMEM ;
@@ -139,7 +137,7 @@ static int __init cma_activate_area(struct cma *cma) not_in_zone:pr_err ("CMA area %s could not be activated\n" , cma->name); -kfree (cma->bitmap); +bitmap_free (cma->bitmap); cma->count =0 ;return -EINVAL ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 83/214 cma: dont quit at first error when activating reserved areas
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
[ Upstream commit 3a5139f1c5bb76d69756fb8f13fffa173e261153 ]
The routine cma_init_reserved_areas is designed to activate all reserved cma areas. It quits when it first encounters an error. This can leave some areas in a state where they are reserved but not activated. There is no feedback to code which performed the reservation. Attempting to allocate memory from areas in such a state will result in a BUG.
Modify cma_init_reserved_areas to always attempt to activate all areas. The called routine, cma_activate_area is responsible for leaving the area in a valid state. No one is making active use of returned error codes, so change the routine to void.
How to reproduce: This example uses kernelcore, hugetlb and cma as an easy way to reproduce. However, this is a more general cma issue.
Two node x86 VM 16GB total, 8GB per node
Kernel command line parameters, kernelcore=4G hugetlb_cma=8G Related boot time messages,
hugetlb_cma: reserve 8192 MiB, up to 4096 MiB per node
cma: Reserved 4096 MiB at 0x0000000100000000
hugetlb_cma: reserved 4096 MiB on node 0
cma: Reserved 4096 MiB at 0x0000000300000000
hugetlb_cma: reserved 4096 MiB on node 1
cma: CMA area hugetlb could not be activated
# echo 8 > /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages
BUG: kernel NULL pointer dereference, address: 0000000000000000
#PF: supervisor read access in kernel mode
#PF: error_code(0x0000) - not-present page
PGD 0 P4D 0
Oops: 0000 [#1] SMP PTI
...
Call Trace:
bitmap_find_next_zero_area_off+0x51/0x90
cma_alloc+0x1a5/0x310
alloc_fresh_huge_page+0x78/0x1a0
alloc_pool_huge_page+0x6f/0xf0
set_max_huge_pages+0x10c/0x250
nr_hugepages_store_common+0x92/0x120
? __kmalloc+0x171/0x270
kernfs_fop_write+0xc1/0x1a0
vfs_write+0xc7/0x1f0
ksys_write+0x5f/0xe0
do_syscall_64+0x4d/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xa9--- mm/cma.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
mm/cma.c +9 -14
@@ -93,17 +93,15 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,mutex_unlock (&cma->lock); } -static int __init cma_activate_area (struct cma *cma) +static void __init cma_activate_area (struct cma *cma) {unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;unsigned i = cma->count >> pageblock_order;struct zone *zone; cma->bitmap =bitmap_zalloc (cma_bitmap_maxno (cma),GFP_KERNEL ); -if (!cma->bitmap) { - cma->count =0 ; -return -ENOMEM ; - } +if (!cma->bitmap) + goto out_error;WARN_ON_ONCE (!pfn_valid (pfn)); zone =page_zone (pfn_to_page (pfn));
@@ -133,25 +131,22 @@ static int __init cma_activate_area(struct cma *cma)spin_lock_init (&cma->mem_head_lock);#endif -return 0 ; +return ; not_in_zone: -pr_err ("CMA area %s could not be activated\n" , cma->name);bitmap_free (cma->bitmap); +out_error: cma->count =0 ; -return -EINVAL ; +pr_err ("CMA area %s could not be activated\n" , cma->name); +return ; }static int __init cma_init_reserved_areas (void ) {int i; -for (i =0 ; i < cma_area_count; i++) { -int ret =cma_activate_area (&cma_areas[i]); - -if (ret) -return ret; - } +for (i =0 ; i < cma_area_count; i++) +cma_activate_area (&cma_areas[i]);return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 84/214 gpu/drm: ingenic: Use the planes src_[x,y] to configure DMA length
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 52e4607dace1eeeb2e012fca291dc4e6cb449bff ]
Instead of obtaining the width/height of the framebuffer from the CRTC state, obtain it from the current plane state.
v2: No change
# *** extracted tags ***
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +2 -2
@@ -375,8 +375,8 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,if (state && state->fb) { addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); - width = state->crtc->state->adjusted_mode.hdisplay; - height = state->crtc->state->adjusted_mode.vdisplay; + width = state->src_w >>16 ; + height = state->src_h >>16 ; cpp = state->fb->format->cpp[plane->index]; priv->dma_hwdesc->addr = addr;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 85/214 drm/ingenic: Fix incorrect assumption about plane->index
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit ca43f274e03f91c533643299ae4984965ce03205 ]
plane->index is NOT the index of the color plane in a YUV frame. Actually, a YUV frame is represented by a single drm_plane, even though it contains three Y, U, V planes.
v2-v3: No change
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -1
@@ -377,7 +377,7 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); width = state->src_w >>16 ; height = state->src_h >>16 ; - cpp = state->fb->format->cpp[plane->index]; + cpp = state->fb->format->cpp[0 ]; priv->dma_hwdesc->addr = addr; priv->dma_hwdesc->cmd = width * height * cpp /4 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 86/214 drm/amd/display: Trigger modesets on MST DSC connectors
In reply to Greg Kroah-HartmanFrom: Mikita Lipski <[email protected]>
[ Upstream commit 44be939ff7ac5858f0dbd8a2a4af1fe198e14db1 ]
Whenever a connector on an MST network is attached, detached, or undergoes a modeset, the DSC configs for each stream on that topology will be recalculated. This can change their required bandwidth, requiring a full reprogramming, as though a modeset was performed, even if that stream did not change timing.
Therefore, whenever a crtc has drm_atomic_crtc_needs_modeset, for each crtc that shares a MST topology with that stream and supports DSC, add that crtc (and all affected connectors and planes) to the atomic state and set mode_changed on its state
v2: Do this check only on Navi and before adding connectors and planes on modesetting crtcs
v3: Call the drm_dp_mst_add_affected_dsc_crtcs() to update all affected CRTCs
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +33 -0
@@ -7230,6 +7230,29 @@ dm_determine_update_type_for_commit(struct amdgpu_display_manager *dm,return ret; } +static int add_affected_mst_dsc_crtcs (struct drm_atomic_state *state,struct drm_crtc *crtc) +{ +struct drm_connector *connector; +struct drm_connector_state *conn_state; +struct amdgpu_dm_connector *aconnector =NULL ; +int i; +for_each_new_connector_in_state (state, connector, conn_state, i) { +if (conn_state->crtc != crtc) +continue ; + + aconnector =to_amdgpu_dm_connector (connector); +if (!aconnector->port || !aconnector->mst_port) + aconnector =NULL ; +else +break ; + } + +if (!aconnector) +return 0 ; + +return drm_dp_mst_add_affected_dsc_crtcs (state, &aconnector->mst_port->mst_mgr); +} +/** * amdgpu_dm_atomic_check() - Atomic check implementation for AMDgpu DM. * @dev: The DRM device
@@ -7282,6 +7305,16 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; +if (adev->asic_type >=CHIP_NAVI10 ) { +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { +if (drm_atomic_crtc_needs_modeset (new_crtc_state)) { + ret =add_affected_mst_dsc_crtcs (state, crtc); +if (ret) + goto fail; + } + } + } +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { if (!drm_atomic_crtc_needs_modeset(new_crtc_state) && !new_crtc_state->color_mgmt_changed &&
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 87/214 drm/amd/display: Add additional config guards for DCN
In reply to Greg Kroah-HartmanFrom: Aurabindo Pillai <[email protected]>
[ Upstream commit e10517b3cb93f90c8a790def6ae884d1e2b65ee7 ]
[Why&How]
Fix build error by protecting code with config guard to enable building amdgpu without CONFIG_DRM_AMD_DC_DCN enabled. This option is disabled by default for allmodconfig.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -2
@@ -7229,7 +7229,7 @@ dm_determine_update_type_for_commit(struct amdgpu_display_manager *dm, *out_type = update_type;return ret; } - +#if defined(CONFIG_DRM_AMD_DC_DCN )static int add_affected_mst_dsc_crtcs (struct drm_atomic_state *state,struct drm_crtc *crtc) {struct drm_connector *connector;
@@ -7252,6 +7252,7 @@ static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm return drm_dp_mst_add_affected_dsc_crtcs(state, &aconnector->mst_port->mst_mgr); } +#endif /** * amdgpu_dm_atomic_check() - Atomic check implementation for AMDgpu DM.
@@ -7305,6 +7306,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; +#if defined(CONFIG_DRM_AMD_DC_DCN )if (adev->asic_type >=CHIP_NAVI10 ) {for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {if (drm_atomic_crtc_needs_modeset (new_crtc_state)) {
@@ -7314,7 +7316,7 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, } } } - +#endif for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { if (!drm_atomic_crtc_needs_modeset(new_crtc_state) && !new_crtc_state->color_mgmt_changed &&
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 88/214 drm/amd/display: Fix dmesg warning from setting abm level
In reply to Greg Kroah-HartmanFrom: Stylon Wang <[email protected]>
[ Upstream commit c5892a10218214d729699ab61bad6fc109baf0ce ]
[Why]
Setting abm level does not correctly update CRTC state. As a result no surface update is added to dc stream state and triggers warning.
[How]
Correctly update CRTC state when setting abm level property.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +23 -0
@@ -7306,6 +7306,29 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,if (ret) goto fail; +/* Check connector changes */ +for_each_oldnew_connector_in_state (state, connector, old_con_state, new_con_state, i) { +struct dm_connector_state *dm_old_con_state =to_dm_connector_state (old_con_state); +struct dm_connector_state *dm_new_con_state =to_dm_connector_state (new_con_state); + +/* Skip connectors that are disabled or part of modeset already. */ +if (!old_con_state->crtc && !new_con_state->crtc) +continue ; + +if (!new_con_state->crtc) +continue ; + + new_crtc_state =drm_atomic_get_crtc_state (state, new_con_state->crtc); +if (IS_ERR (new_crtc_state)) { + ret =PTR_ERR (new_crtc_state); + goto fail; + } + +if (dm_old_con_state->abm_level != + dm_new_con_state->abm_level) + new_crtc_state->connectors_changed = true; + } +#if defined(CONFIG_DRM_AMD_DC_DCN )if (adev->asic_type >=CHIP_NAVI10 ) {for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 89/214 mm/vunmap: add cond_resched() in vunmap_pmd_range
In reply to Greg Kroah-Hartman[ Upstream commit e47110e90584a22e9980510b00d0dfad3a83354e ]
Like zap_pte_range add cond_resched so that we can avoid softlockups as reported below. On non-preemptible kernel with large I/O map region (like the one we get when using persistent memory with sector mode), an unmap of the namespace can report below softlockups.
22724.027334] watchdog: BUG: soft lockup - CPU#49 stuck for 23s! [ndctl:50777]
NIP [c0000000000dc224] plpar_hcall+0x38/0x58
LR [c0000000000d8898] pSeries_lpar_hpte_invalidate+0x68/0xb0
Call Trace:
flush_hash_page+0x114/0x200
hpte_need_flush+0x2dc/0x540
vunmap_page_range+0x538/0x6f0
free_unmap_vmap_area+0x30/0x70
remove_vm_area+0xfc/0x140
__vunmap+0x68/0x270
__iounmap.part.0+0x34/0x60
memunmap+0x54/0x70
release_nodes+0x28c/0x300
device_release_driver_internal+0x16c/0x280
unbind_store+0x124/0x170
drv_attr_store+0x44/0x60
sysfs_kf_write+0x64/0x90
kernfs_fop_write+0x1b0/0x290
__vfs_write+0x3c/0x70
vfs_write+0xd8/0x260
ksys_write+0xdc/0x130
system_call+0x5c/0x70--- mm/vmalloc.c | 2 ++ 1 file changed, 2 insertions(+)
mm/vmalloc.c +2 -0
@@ -85,6 +85,8 @@ static void vunmap_pmd_range(pud_t *pud, unsigned long addr, unsigned long end)if (pmd_none_or_clear_bad (pmd))continue ;vunmap_pte_range (pmd, addr, next); + +cond_resched (); }while (pmd++, addr = next, addr != end); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 90/214 EDAC: sb_edac: get rid of unused vars
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 323014d85d2699b2879ecb15cd06a15408e3e801 ]
There are several vars unused on this driver, probably because it was a modified copy of another driver. Get rid of them.
drivers/edac/sb_edac.c: In function ‘knl_get_dimm_capacity’:
drivers/edac/sb_edac.c:1343:16: warning: variable ‘sad_size’ set but not used [-Wunused-but-set-variable]
1343 | u64 sad_base, sad_size, sad_limit = 0;
| ^~~~~~~~
drivers/edac/sb_edac.c: In function ‘sbridge_mce_output_error’:
drivers/edac/sb_edac.c:2955:8: warning: variable ‘type’ set but not used [-Wunused-but-set-variable]
2955 | char *type, *optype, msg[256];
| ^~~~
drivers/edac/sb_edac.c: In function ‘sbridge_unregister_mci’:
drivers/edac/sb_edac.c:3203:22: warning: variable ‘pvt’ set but not used [-Wunused-but-set-variable]
3203 | struct sbridge_pvt *pvt;
| ^~~
At top level:
drivers/edac/sb_edac.c:266:18: warning: ‘correrrthrsld’ defined but not used [-Wunused-const-variable=]
266 | static const u32 correrrthrsld[] = {
| ^~~~~~~~~~~~~
drivers/edac/sb_edac.c:257:18: warning: ‘correrrcnt’ defined but not used [-Wunused-const-variable=]
257 | static const u32 correrrcnt[] = {
| ^~~~~~~~~~--- drivers/edac/sb_edac.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/edac/sb_edac.c +8 -13
@@ -254,18 +254,20 @@ static const u32 rir_offset[MAX_RIR_RANGES][MAX_RIR_WAY] = {* FIXME: Implement the error count reads directly */ -static const u32 correrrcnt[] = { -0x104 ,0x108 ,0x10c ,0x110 , -}; -#define RANK_ODD_OV (reg) GET_BITFIELD(reg, 31, 31)#define RANK_ODD_ERR_CNT (reg) GET_BITFIELD(reg, 16, 30)#define RANK_EVEN_OV (reg) GET_BITFIELD(reg, 15, 15)#define RANK_EVEN_ERR_CNT (reg) GET_BITFIELD(reg, 0, 14) +#if 0 /* Currently unused*/ +static const u32 correrrcnt[] = { +0x104 ,0x108 ,0x10c ,0x110 , +}; +static const u32 correrrthrsld[] = {0x11c ,0x120 ,0x124 ,0x128 , }; +#endif #define RANK_ODD_ERR_THRSLD (reg) GET_BITFIELD(reg, 16, 30)#define RANK_EVEN_ERR_THRSLD (reg) GET_BITFIELD(reg, 0, 14)
@@ -1340,7 +1342,7 @@ static void knl_show_mc_route(u32 reg, char *s)*/ static int knl_get_dimm_capacity (struct sbridge_pvt *pvt,u64 *mc_sizes) { -u64 sad_base, sad_size, sad_limit =0 ; +u64 sad_base, sad_limit =0 ;u64 tad_base, tad_size, tad_limit, tad_deadspace, tad_livespace;int sad_rule =0 ;int tad_rule =0 ;
@@ -1427,7 +1429,6 @@ static int knl_get_dimm_capacity(struct sbridge_pvt *pvt, u64 *mc_sizes) edram_only =KNL_EDRAM_ONLY (dram_rule); sad_limit = pvt->info.sad_limit (dram_rule)+1 ; - sad_size = sad_limit - sad_base;pci_read_config_dword (pvt->pci_sad0, pvt->info.interleave_list[sad_rule], &interleave_reg);
@@ -2952,7 +2953,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,struct mem_ctl_info *new_mci;struct sbridge_pvt *pvt = mci->pvt_info;enum hw_event_mc_err_type tp_event; -char *type, *optype, msg[256 ]; +char *optype, msg[256 ];bool ripv =GET_BITFIELD (m->mcgstatus,0 ,0 );bool overflow =GET_BITFIELD (m->status,62 ,62 );bool uncorrected_error =GET_BITFIELD (m->status,61 ,61 );
@@ -2981,14 +2982,11 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; tp_event =HW_EVENT_ERR_FATAL ; }else { - type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; } }else { - type ="CORRECTED" ; tp_event =HW_EVENT_ERR_CORRECTED ; }
@@ -3200,7 +3198,6 @@ static struct notifier_block sbridge_mce_dec = {static void sbridge_unregister_mci (struct sbridge_dev *sbridge_dev) {struct mem_ctl_info *mci = sbridge_dev->mci; -struct sbridge_pvt *pvt;if (unlikely (!mci || !mci->pvt_info)) {edac_dbg (0 ,"MC: dev = %p\n" , &sbridge_dev->pdev[0 ]->dev);
@@ -3209,8 +3206,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)return ; } - pvt = mci->pvt_info; -edac_dbg (0 ,"MC: mci = %p, dev = %p\n" , mci, &sbridge_dev->pdev[0 ]->dev);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 91/214 EDAC: skx_common: get rid of unused type var
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit f05390d30e20cccd8f8de981dee42bcdd8d2d137 ]
drivers/edac/skx_common.c: In function ‘skx_mce_output_error’: drivers/edac/skx_common.c:478:8: warning: variable ‘type’ set but not used [-Wunused-but-set-variable] 478 | char *type, *optype; | ^~~~
--- drivers/edac/skx_common.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/edac/skx_common.c +1 -4
@@ -475,7 +475,7 @@ static void skx_mce_output_error(struct mem_ctl_info *mci, struct decoded_addr *res) {enum hw_event_mc_err_type tp_event; -char *type, *optype; +char *optype;bool ripv =GET_BITFIELD (m->mcgstatus,0 ,0 );bool overflow =GET_BITFIELD (m->status,62 ,62 );bool uncorrected_error =GET_BITFIELD (m->status,61 ,61 );
@@ -490,14 +490,11 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - type ="FATAL" ; tp_event =HW_EVENT_ERR_FATAL ; }else { - type ="NON_FATAL" ; tp_event =HW_EVENT_ERR_UNCORRECTED ; } }else { - type ="CORRECTED" ; tp_event =HW_EVENT_ERR_CORRECTED ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 92/214 EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
In reply to Greg Kroah-HartmanFrom: Tony Luck <[email protected]>
[ Upstream commit 45bc6098a3e279d8e391d22428396687562797e2 ]
IA32_MCG_STATUS.RIPV indicates whether the return RIP value pushed onto the stack as part of machine check delivery is valid or not.
Various drivers copied a code fragment that uses the RIPV bit to determine the severity of the error as either HW_EVENT_ERR_UNCORRECTED or HW_EVENT_ERR_FATAL, but this check is reversed (marking errors where RIPV is set as "FATAL").
Reverse the tests so that the error is marked fatal when RIPV is not set.
--- drivers/edac/i7core_edac.c | 4 ++-- drivers/edac/pnd2_edac.c | 2 +- drivers/edac/sb_edac.c | 4 ++-- drivers/edac/skx_common.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/edac/i7core_edac.c +2 -2
@@ -1711,9 +1711,9 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) - tp_event =HW_EVENT_ERR_FATAL ; -else tp_event =HW_EVENT_ERR_UNCORRECTED ; +else + tp_event =HW_EVENT_ERR_FATAL ; }else { tp_event =HW_EVENT_ERR_CORRECTED ; }
drivers/edac/pnd2_edac.c +1 -1
@@ -1155,7 +1155,7 @@ static void pnd2_mce_output_error(struct mem_ctl_info *mci, const struct mce *m,u32 optypenum =GET_BITFIELD (m->status,4 ,6 );int rc; - tp_event = uc_err ? (ripv ?HW_EVENT_ERR_FATAL :HW_EVENT_ERR_UNCORRECTED ) : + tp_event = uc_err ? (ripv ?HW_EVENT_ERR_UNCORRECTED :HW_EVENT_ERR_FATAL ) :HW_EVENT_ERR_CORRECTED ;/*
drivers/edac/sb_edac.c +2 -2
@@ -2982,9 +2982,9 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - tp_event =HW_EVENT_ERR_FATAL ; - }else { tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + tp_event =HW_EVENT_ERR_FATAL ; } }else { tp_event =HW_EVENT_ERR_CORRECTED ;
drivers/edac/skx_common.c +2 -2
@@ -490,9 +490,9 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,if (uncorrected_error) { core_err_cnt =1 ;if (ripv) { - tp_event =HW_EVENT_ERR_FATAL ; - }else { tp_event =HW_EVENT_ERR_UNCORRECTED ; + }else { + tp_event =HW_EVENT_ERR_FATAL ; } }else { tp_event =HW_EVENT_ERR_CORRECTED ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 93/214 PCI: qcom: Add missing ipq806x clocks in PCIe driver
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit 8b6f0330b5f9a7543356bfa9e76d580f03aa2c1e ]
Aux and Ref clk are missing in PCIe qcom driver. Add support for this optional clks for ipq8064/apq8064 SoC.
--- drivers/pci/controller/dwc/pcie-qcom.c | 38 ++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +33 -5
@@ -103,6 +103,8 @@ struct qcom_pcie_resources_2_1_0 {struct clk *iface_clk;struct clk *core_clk;struct clk *phy_clk; +struct clk *aux_clk; +struct clk *ref_clk;struct reset_control *pci_reset;struct reset_control *axi_reset;struct reset_control *ahb_reset;
@@ -253,6 +255,14 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie)if (IS_ERR (res->phy_clk))return PTR_ERR (res->phy_clk); + res->aux_clk =devm_clk_get_optional (dev,"aux" ); +if (IS_ERR (res->aux_clk)) +return PTR_ERR (res->aux_clk); + + res->ref_clk =devm_clk_get_optional (dev,"ref" ); +if (IS_ERR (res->ref_clk)) +return PTR_ERR (res->ref_clk); + res->pci_reset =devm_reset_control_get_exclusive (dev,"pci" );if (IS_ERR (res->pci_reset))return PTR_ERR (res->pci_reset);
@@ -285,6 +295,8 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk);clk_disable_unprepare (res->phy_clk); +clk_disable_unprepare (res->aux_clk); +clk_disable_unprepare (res->ref_clk);regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies); }
@@ -315,16 +327,28 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_assert_ahb; } + ret =clk_prepare_enable (res->core_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable core clock\n" ); + goto err_clk_core; + } + ret =clk_prepare_enable (res->phy_clk);if (ret) {dev_err (dev,"cannot prepare/enable phy clock\n" ); goto err_clk_phy; } - ret =clk_prepare_enable (res->core_clk); + ret =clk_prepare_enable (res->aux_clk);if (ret) { -dev_err (dev,"cannot prepare/enable core clock\n" ); - goto err_clk_core; +dev_err (dev,"cannot prepare/enable aux clock\n" ); + goto err_clk_aux; + } + + ret =clk_prepare_enable (res->ref_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable ref clock\n" ); + goto err_clk_ref; } ret =reset_control_deassert (res->ahb_reset);
@@ -400,10 +424,14 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)return 0 ; err_deassert_ahb: -clk_disable_unprepare (res->core_clk); -err_clk_core: +clk_disable_unprepare (res->ref_clk); +err_clk_ref: +clk_disable_unprepare (res->aux_clk); +err_clk_aux:clk_disable_unprepare (res->phy_clk); err_clk_phy: +clk_disable_unprepare (res->core_clk); +err_clk_core:clk_disable_unprepare (res->iface_clk); err_assert_ahb:regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 94/214 PCI: qcom: Change duplicate PCI reset to phy reset
In reply to Greg Kroah-HartmanFrom: Abhishek Sahu <[email protected]>
[ Upstream commit dd58318c019f10bc94db36df66af6c55d4c0cbba ]
The deinit issues reset_control_assert for PCI twice and does not contain phy reset.
--- drivers/pci/controller/dwc/pcie-qcom.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +8 -10
@@ -287,14 +287,14 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie) {struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0; +clk_disable_unprepare (res->phy_clk);reset_control_assert (res->pci_reset);reset_control_assert (res->axi_reset);reset_control_assert (res->ahb_reset);reset_control_assert (res->por_reset); -reset_control_assert (res->pci_reset); +reset_control_assert (res->phy_reset);clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk); -clk_disable_unprepare (res->phy_clk);clk_disable_unprepare (res->aux_clk);clk_disable_unprepare (res->ref_clk);regulator_bulk_disable (ARRAY_SIZE (res->supplies), res->supplies);
@@ -333,12 +333,6 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_clk_core; } - ret =clk_prepare_enable (res->phy_clk); -if (ret) { -dev_err (dev,"cannot prepare/enable phy clock\n" ); - goto err_clk_phy; - } - ret =clk_prepare_enable (res->aux_clk);if (ret) {dev_err (dev,"cannot prepare/enable aux clock\n" );
@@ -411,6 +405,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)return ret; } + ret =clk_prepare_enable (res->phy_clk); +if (ret) { +dev_err (dev,"cannot prepare/enable phy clock\n" ); + goto err_deassert_ahb; + } +/* wait for clock acquisition */ usleep_range (1000 ,1500 );
@@ -428,8 +428,6 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) err_clk_ref:clk_disable_unprepare (res->aux_clk); err_clk_aux: -clk_disable_unprepare (res->phy_clk); -err_clk_phy:clk_disable_unprepare (res->core_clk); err_clk_core:clk_disable_unprepare (res->iface_clk);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 95/214 PCI: qcom: Add missing reset for ipq806x
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit ee367e2cdd2202b5714982739e684543cd2cee0e ]
Add missing ext reset used by ipq8064 SoC in PCIe qcom driver.
--- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +12 -0
@@ -110,6 +110,7 @@ struct qcom_pcie_resources_2_1_0 {struct reset_control *ahb_reset;struct reset_control *por_reset;struct reset_control *phy_reset; +struct reset_control *ext_reset;struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY ]; };
@@ -279,6 +280,10 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie *pcie)if (IS_ERR (res->por_reset))return PTR_ERR (res->por_reset); + res->ext_reset =devm_reset_control_get_optional_exclusive (dev,"ext" ); +if (IS_ERR (res->ext_reset)) +return PTR_ERR (res->ext_reset); + res->phy_reset =devm_reset_control_get_exclusive (dev,"phy" );return PTR_ERR_OR_ZERO (res->phy_reset); }
@@ -292,6 +297,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)reset_control_assert (res->axi_reset);reset_control_assert (res->ahb_reset);reset_control_assert (res->por_reset); +reset_control_assert (res->ext_reset);reset_control_assert (res->phy_reset);clk_disable_unprepare (res->iface_clk);clk_disable_unprepare (res->core_clk);
@@ -351,6 +357,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie) goto err_deassert_ahb; } + ret =reset_control_deassert (res->ext_reset); +if (ret) { +dev_err (dev,"cannot deassert ext reset\n" ); + goto err_deassert_ahb; + } +/* enable PCIe clocks and resets */ val =readl (pcie->parf +PCIE20_PARF_PHY_CTRL ); val &= ~BIT (0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 96/214 cpufreq: intel_pstate: Fix EPP setting via sysfs in active mode
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit de002c55cadfc2f6cdf0ed427526f6085d240238 ]
Because intel_pstate_set_energy_pref_index() reads and writes the MSR_HWP_REQUEST register without using the cached value of it used by intel_pstate_hwp_boost_up() and intel_pstate_hwp_boost_down(), those functions may overwrite the value written by it and so the EPP value set via sysfs may be lost.
To avoid that, make intel_pstate_set_energy_pref_index() take the cached value of MSR_HWP_REQUEST just like the other two routines mentioned above and update it with the new EPP value coming from user space in addition to updating the MSR.
Note that the MSR itself still needs to be updated too in case hwp_boost is unset or the boosting mechanism is not active at the EPP change time.
--- drivers/cpufreq/intel_pstate.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/cpufreq/intel_pstate.c +12 -6
@@ -649,11 +649,12 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,mutex_lock (&intel_pstate_limits_lock);if (boot_cpu_has (X86_FEATURE_HWP_EPP )) { -u64 value; - - ret =rdmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , &value); -if (ret) - goto return_pref; +/* +* Use the cached HWP Request MSR value, because the register +* itself may be updated by intel_pstate_hwp_boost_up() or +* intel_pstate_hwp_boost_down() at any time. +*/ +u64 value =READ_ONCE (cpu_data->hwp_req_cached); value &= ~GENMASK_ULL (31 ,24 );
@@ -661,13 +662,18 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data, epp = epp_values[pref_index -1 ]; value |= (u64 )epp <<24 ; +/* +* The only other updater of hwp_req_cached in the active mode, +* intel_pstate_hwp_set(), is called under the same lock as this +* function, so it cannot run in parallel with the update below. +*/ +WRITE_ONCE (cpu_data->hwp_req_cached, value); ret =wrmsrl_on_cpu (cpu_data->cpu,MSR_HWP_REQUEST , value); }else {if (epp == -EINVAL ) epp = (pref_index -1 ) <<2 ; ret =intel_pstate_set_epb (cpu_data->cpu, epp); } -return_pref:mutex_unlock (&intel_pstate_limits_lock);return ret;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 97/214 ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1)
In reply to Greg Kroah-HartmanFrom: Alexander Tsoy <[email protected]>
[ Upstream commit 470757f5b3a46bd85741bb0d8c1fd3f21048a2af ]
Capture and playback endpoints on Saffire 6 (USB 1.1) resides on the same interface. This was not supported by the composite quirk back in the day when initial support for this device was added, thus only playback was enabled until now.
--- sound/usb/quirks-table.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
sound/usb/quirks-table.h +30 -0
@@ -2695,6 +2695,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, .data = (const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_STANDARD_MIXER , + }, { .ifnum =0 , .type =QUIRK_AUDIO_FIXED_ENDPOINT ,
@@ -2707,6 +2711,32 @@ YAMAHA_DEVICE(0x7010, "UB99"), .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE, .endpoint = 0x01, .ep_attr = USB_ENDPOINT_XFER_ISOC, + .datainterval = 1, + .maxpacksize = 0x024c, + .rates =SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000, + .rate_min = 44100, + .rate_max = 48000, + .nr_rates = 2, + .rate_table = (unsigned int []) { +44100 ,48000 + } + } + }, + { + .ifnum = 0, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S24_3LE , + .channels =2 , + .iface =0 , + .altsetting =1 , + .altset_idx =1 , + .attributes =0 , + .endpoint =0x82 , + .ep_attr =USB_ENDPOINT_XFER_ISOC , + .datainterval =1 , + .maxpacksize =0x0126 , .rates =SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_48000 , .rate_min =44100 ,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 98/214 media: gpio-ir-tx: improve precision of transmitted signal due to scheduling
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
[ Upstream commit ea8912b788f8144e7d32ee61e5ccba45424bef83 ]
usleep_range() may take longer than the max argument due to scheduling, especially under load. This is causing random errors in the transmitted IR. Remove the usleep_range() in favour of busy-looping with udelay().
--- drivers/media/rc/gpio-ir-tx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/media/rc/gpio-ir-tx.c +1 -6
@@ -79,13 +79,8 @@ static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,// space edge =ktime_add_us (edge, txbuf[i]); delta =ktime_us_delta (edge,ktime_get ()); -if (delta >10 ) { -spin_unlock_irqrestore (&gpio_ir->lock, flags); -usleep_range (delta, delta +10 ); -spin_lock_irqsave (&gpio_ir->lock, flags); - }else if (delta >0 ) { +if (delta >0 )udelay (delta); - } }else {// pulse ktime_t last =ktime_add_us (edge, txbuf[i]);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 99/214 block: respect queue limit of max discard segment
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 943b40c832beb71115e38a1c4d99b640b5342738 ]
When queue_max_discard_segments(q) is 1, blk_discard_mergable() will return false for discard request, then normal request merge is applied. However, only queue_max_segments() is checked, so max discard segment limit isn't respected.
Check max discard segment limit in the request merge code for fixing the issue.
Discard request failure of virtio_blk is fixed.
--- block/blk-merge.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
block/blk-merge.c +9 -2
@@ -553,10 +553,17 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, }EXPORT_SYMBOL (blk_rq_map_sg); +static inline unsigned int blk_rq_get_max_segments (struct request *rq) +{ +if (req_op (rq) ==REQ_OP_DISCARD ) +return queue_max_discard_segments (rq->q); +return queue_max_segments (rq->q); +} +static inline int ll_new_hw_segment (struct request *req,struct bio *bio,unsigned int nr_phys_segs) { -if (req->nr_phys_segments + nr_phys_segs >queue_max_segments (req->q)) +if (req->nr_phys_segments + nr_phys_segs >blk_rq_get_max_segments (req)) goto no_merge;if (blk_integrity_merge_bio (req->q, req, bio) == false)
@@ -640,7 +647,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,return 0 ; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments; -if (total_phys_segments >queue_max_segments (q)) +if (total_phys_segments >blk_rq_get_max_segments (req))return 0 ;if (blk_integrity_merge_rq (q, req, next) == false)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 100/214 block: virtio_blk: fix handling single range discard request
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit af822aa68fbdf0a480a17462ed70232998127453 ]
1f23816b8eb8 ("virtio_blk: add discard and write zeroes support") starts to support multi-range discard for virtio-blk. However, the virtio-blk disk may report max discard segment as 1, at least that is exactly what qemu is doing.
So far, block layer switches to normal request merge if max discard segment limit is 1, and multiple bios can be merged to single segment. This way may cause memory corruption in virtblk_setup_discard_write_zeroes().
Fix the issue by handling single max discard segment in straightforward way.
--- drivers/block/virtio_blk.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
drivers/block/virtio_blk.c +23 -8
@@ -205,16 +205,31 @@ static int virtblk_setup_discard_write_zeroes(struct request *req, bool unmap)if (!range)return -ENOMEM ; -__rq_for_each_bio (bio, req) { -u64 sector = bio->bi_iter.bi_sector; -u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; - - range[n].flags =cpu_to_le32 (flags); - range[n].num_sectors =cpu_to_le32 (num_sectors); - range[n].sector =cpu_to_le64 (sector); - n++; +/* +* Single max discard segment means multi-range discard isn't +* supported, and block layer only runs contiguity merge like +* normal RW request. So we can't reply on bio for retrieving +* each range info. +*/ +if (queue_max_discard_segments (req->q) ==1 ) { + range[0 ].flags =cpu_to_le32 (flags); + range[0 ].num_sectors =cpu_to_le32 (blk_rq_sectors (req)); + range[0 ].sector =cpu_to_le64 (blk_rq_pos (req)); + n =1 ; + }else { +__rq_for_each_bio (bio, req) { +u64 sector = bio->bi_iter.bi_sector; +u32 num_sectors = bio->bi_iter.bi_size >>SECTOR_SHIFT ; + + range[n].flags =cpu_to_le32 (flags); + range[n].num_sectors =cpu_to_le32 (num_sectors); + range[n].sector =cpu_to_le64 (sector); + n++; + } } +WARN_ON_ONCE (n != segments); + req->special_vec.bv_page =virt_to_page (range); req->special_vec.bv_offset =offset_in_page (range); req->special_vec.bv_len =sizeof (*range) * segments;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 101/214 drm/msm/adreno: fix updating ring fence
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit f228af11dfa1d1616bc67f3a4119ab77c36181f1 ]
We need to set it to the most recent completed fence, not the most recent submitted. Otherwise we have races where we think we can retire submits that the GPU is not finished with, if the GPU doesn't manage to overwrite the seqno before we look at it.
This can show up with hang recovery if one of the submits after the crashing submit also hangs after it is replayed.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +1 -1
@@ -350,7 +350,7 @@ int adreno_hw_init(struct msm_gpu *gpu) ring->next = ring->start;/* reset completed fence seqno: */ - ring->memptrs->fence = ring->seqno; + ring->memptrs->fence = ring->fctx->completed_fence; ring->memptrs->rptr =0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 102/214 block: Fix page_is_mergeable() for compound pages
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit d81665198b83e55a28339d1f3e4890ed8a434556 ]
If we pass in an offset which is larger than PAGE_SIZE, then page_is_mergeable() thinks it's not mergeable with the previous bio_vec, leading to a large number of bio_vecs being used. Use a slightly more obvious test that the two pages are compatible with each other.
--- block/bio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
block/bio.c +5 -5
@@ -683,8 +683,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv, struct page *page, unsigned int len, unsigned int off, bool *same_page) { - phys_addr_t vec_end_addr = page_to_phys(bv->bv_page) + - bv->bv_offset + bv->bv_len -1 ; + size_t bv_end = bv->bv_offset + bv->bv_len; +phys_addr_t vec_end_addr =page_to_phys (bv->bv_page) + bv_end -1 ;phys_addr_t page_addr =page_to_phys (page);if (vec_end_addr +1 != page_addr + off)
@@ -693,9 +693,9 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,return false; *same_page = ((vec_end_addr &PAGE_MASK ) == page_addr); -if (!*same_page &&pfn_to_page (PFN_DOWN (vec_end_addr)) +1 != page) -return false; -return true; +if (*same_page) +return true; +return (bv->bv_page + bv_end /PAGE_SIZE ) == (page + off /PAGE_SIZE ); } static bool bio_try_merge_pc_page(struct request_queue *q, struct bio *bio,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 103/214 bfq: fix blkio cgroup leakage v4
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
[ Upstream commit 2de791ab4918969d8108f15238a701968375f235 ]
Changes from v1:
- update commit description with proper ref-accounting justification
commit db37a34c563b ("block, bfq: get a ref to a group when adding it to a service tree") introduce leak forbfq_group and blkcg_gq objects because of get/put imbalance.
In fact whole idea of original commit is wrong because bfq_group entity
can not dissapear under us because it is referenced by child bfq_queue's entities from here:
-> bfq_init_entity()
->bfqg_and_blkg_get(bfqg);
->entity->parent = bfqg->my_entity -> bfq_put_queue(bfqq)
FINAL_PUT
->bfqg_and_blkg_put(bfqq_group(bfqq))
->kmem_cache_free(bfq_pool, bfqq);So parent entity can not disappear while child entity is in tree,
and child entities already has proper protection.
This patch revert commit db37a34c563b ("block, bfq: get a ref to a group when adding it to a service tree")
bfq_group leak trace caused by bad commit:
-> blkg_alloc
-> bfq_pq_alloc
-> bfqg_get (+1)
->bfq_activate_bfqq
->bfq_activate_requeue_entity
-> __bfq_activate_entity
->bfq_get_entity
->bfqg_and_blkg_get (+1) <==== : Note1
->bfq_del_bfqq_busy
->bfq_deactivate_entity+0x53/0xc0 [bfq]
->__bfq_deactivate_entity+0x1b8/0x210 [bfq]
-> bfq_forget_entity(is_in_service = true)
entity->on_st_or_in_serv = false <=== :Note2
if (is_in_service)
return; ==> do not touch reference-> blkcg_css_offline
-> blkcg_destroy_blkgs
-> blkg_destroy
-> bfq_pd_offline
-> __bfq_deactivate_entity
if (!entity->on_st_or_in_serv) /* true, because (Note2)
return false;
-> bfq_pd_free
-> bfqg_put() (-1, byt bfqg->ref == 2) because of (Note2)So bfq_group and blkcg_gq will leak forever, see test-case below.
##TESTCASE_BEGIN:
#!/bin/bash
max_iters=${1:-100}
#prep cgroup mounts
mount -t tmpfs cgroup_root /sys/fs/cgroup mkdir /sys/fs/cgroup/blkio
mount -t cgroup -o blkio none /sys/fs/cgroup/blkio
# Prepare blkdev
grep blkio /proc/cgroups
truncate -s 1M img
losetup /dev/loop0 img
echo bfq > /sys/block/loop0/queue/scheduler
grep blkio /proc/cgroups
for ((i=0;i<max_iters;i++))
do
mkdir -p /sys/fs/cgroup/blkio/a
echo 0 > /sys/fs/cgroup/blkio/a/cgroup.procs
dd if=/dev/loop0 bs=4k count=1 of=/dev/null iflag=direct 2> /dev/null echo 0 > /sys/fs/cgroup/blkio/cgroup.procs
rmdir /sys/fs/cgroup/blkio/a
grep blkio /proc/cgroups
done
##TESTCASE_END:
--- block/bfq-cgroup.c | 2 +- block/bfq-iosched.h | 1 - block/bfq-wf2q.c | 12 ++---------- 3 files changed, 3 insertions(+), 12 deletions(-)
block/bfq-cgroup.c +1 -1
@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)kfree (bfqg); } -void bfqg_and_blkg_get (struct bfq_group *bfqg) +static void bfqg_and_blkg_get (struct bfq_group *bfqg) {/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ bfqg_get (bfqg);
block/bfq-iosched.h +0 -1
@@ -980,7 +980,6 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,struct blkcg_gq *bfqg_to_blkg (struct bfq_group *bfqg);struct bfq_group *bfqq_group (struct bfq_queue *bfqq);struct bfq_group *bfq_create_group_hierarchy (struct bfq_data *bfqd,int node); -void bfqg_and_blkg_get (struct bfq_group *bfqg);void bfqg_and_blkg_put (struct bfq_group *bfqg);#ifdef CONFIG_BFQ_GROUP_IOSCHED
block/bfq-wf2q.c +2 -10
@@ -536,9 +536,7 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++;bfq_log_bfqq (bfqq->bfqd, bfqq,"get_entity: %p %d" , bfqq, bfqq->ref); - } else -bfqg_and_blkg_get (container_of (entity ,struct bfq_group , -entity )); + } }/**
@@ -652,14 +650,8 @@ static void bfq_forget_entity(struct bfq_service_tree *st, entity->on_st = false; st->wsum -= entity->weight; -if (is_in_service) -return ; - -if (bfqq) +if (bfqq && !is_in_service)bfq_put_queue (bfqq); -else - bfqg_and_blkg_put(container_of(entity, struct bfq_group, - entity)); }/**
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 104/214 hwmon: (nct7904) Correct divide by 0
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
[ Upstream commit 8aebbbb2d573d0b4afc08b90ac7d73dba2d9da97 ]
We hit a kernel panic due to a divide by 0 in nct7904_read_fan() for the hwmon_fan_min case. Extend the check to hwmon_fan_input case as well for safety.
[ 1656.545650] divide error: 0000 [#1] SMP PTI [ 1656.545779] CPU: 12 PID: 18010 Comm: sensors Not tainted 5.4.47 #1 [ 1656.546065] RIP: 0010:nct7904_read+0x1e9/0x510 [nct7904] ... [ 1656.546549] RAX: 0000000000149970 RBX: ffffbd6b86bcbe08 RCX: 0000000000000000 ... [ 1656.547548] Call Trace: [ 1656.547665] hwmon_attr_show+0x32/0xd0 [hwmon] [ 1656.547783] dev_attr_show+0x18/0x50 [ 1656.547898] sysfs_kf_seq_show+0x99/0x120 [ 1656.548013] seq_read+0xd8/0x3e0 [ 1656.548127] vfs_read+0x89/0x130 [ 1656.548234] ksys_read+0x7d/0xb0 [ 1656.548342] do_syscall_64+0x48/0x110 [ 1656.548451] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/hwmon/nct7904.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/nct7904.c +2 -2
@@ -197,7 +197,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
@@ -209,7 +209,7 @@ static int nct7904_read_fan(struct device *dev, u32 attr, int channel,if (ret <0 )return ret; cnt = ((ret &0xff00 ) >>3 ) | (ret &0x1f ); -if (cnt ==0x1fff ) +if (cnt ==0 || cnt ==0x1fff ) rpm =0 ;else rpm =1350000 / cnt;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 105/214 blk-mq: insert request not through ->queue_rq into sw/scheduler queue
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit db03f88fae8a2c8007caafa70287798817df2875 ]
c616cbee97ae ("blk-mq: punt failed direct issue to dispatch list") supposed to add request which has been through ->queue_rq() to the hw queue dispatch list, however it adds request running out of budget or driver tag to hw queue too. This way basically bypasses request merge, and causes too many request dispatched to LLD, and system% is unnecessary increased.
Fixes this issue by adding request not through ->queue_rq into sw/scheduler queue, and this way is safe because no ->queue_rq is called on this request yet.
High %system can be observed on Azure storvsc device, and even soft lock is observed. This patch reduces %system during heavy sequential IO, meantime decreases soft lockup risk.
--- block/blk-mq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-mq.c +2 -1
@@ -1869,7 +1869,8 @@ insert:if (bypass_insert)return BLK_STS_RESOURCE ; -blk_mq_request_bypass_insert (rq, false, run_queue); +blk_mq_sched_insert_request (rq, false, run_queue, false); +return BLK_STS_OK ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 106/214 blkcg: fix memleak for iolatency
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 27029b4b18aa5d3b060f0bf2c26dae254132cfce ]
Normally, blkcg_iolatency_exit() will free related memory in iolatency when cleanup queue. But if blk_throtl_init() return error and queue init fail, blkcg_iolatency_exit() will not do that for us. Then it cause memory leak.
--- block/blk-cgroup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-cgroup.c +5 -3
@@ -1219,13 +1219,15 @@ int blkcg_init_queue(struct request_queue *q)if (preloaded)radix_tree_preload_end (); - ret =blk_iolatency_init (q); + ret =blk_throtl_init (q);if (ret) goto err_destroy_all; - ret =blk_throtl_init (q); -if (ret) + ret =blk_iolatency_init (q); +if (ret) { +blk_throtl_exit (q); goto err_destroy_all; + }return 0 ; err_destroy_all:
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 107/214 nvme-fc: Fix wrong return value in __nvme_fc_init_request()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
[ Upstream commit f34448cd0dc697723fb5f4118f8431d9233b370d ]
On an error exit path, a negative error code should be returned instead of a positive return value.
--- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +2 -2
@@ -1740,7 +1740,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.cmddma)) {dev_err (ctrl->dev,"FCP Op failed - cmdiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; goto out_on_error; }
@@ -1750,7 +1750,7 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,if (fc_dma_mapping_error (ctrl->lport->dev, op->fcp_req.rspdma)) {dev_err (ctrl->dev,"FCP Op failed - rspiu dma mapping failed.\n" ); - ret =EFAULT ; + ret = -EFAULT ; }atomic_set (&op->state,FCPOP_STATE_IDLE );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 108/214 nvme: multipath: round-robin: fix single non-optimized path case
In reply to Greg Kroah-HartmanFrom: Martin Wilck <[email protected]>
[ Upstream commit 93eb0381e13d249a18ed4aae203291ff977e7ffb ]
If there's only one usable, non-optimized path, nvme_round_robin_path() returns NULL, which is wrong. Fix it by falling back to "old", like in the single optimized path case. Also, if the active path isn't changed, there's no need to re-assign the pointer.
--- drivers/nvme/host/multipath.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/nvme/host/multipath.c +10 -5
@@ -249,12 +249,17 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, fallback = ns; } -/* No optimized path found, re-check the current path */ +/* +* The loop above skips the current path for round-robin semantics. +* Fall back to the current path if either: +* - no other optimized path found and current is optimized, +* - no other usable path found and current is usable. +*/ if (!nvme_path_is_disabled (old) && - old->ana_state ==NVME_ANA_OPTIMIZED ) { - found = old; - goto out; - } + (old->ana_state ==NVME_ANA_OPTIMIZED || + (!fallback && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) +return old; +if (!fallback)return NULL ; found = fallback;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 109/214 null_blk: fix passing of REQ_FUA flag in null_handle_rq
In reply to Greg Kroah-HartmanFrom: Hou Pu <[email protected]>
[ Upstream commit 2d62e6b038e729c3e4bfbfcfbd44800ef0883680 ]
REQ_FUA should be checked using rq->cmd_flags instead of req_op().
--- drivers/block/null_blk_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/null_blk_main.c +1 -1
@@ -1072,7 +1072,7 @@ static int null_handle_rq(struct nullb_cmd *cmd) len = bvec.bv_len; err =null_transfer (nullb, bvec.bv_page, len, bvec.bv_offset,op_is_write (req_op (rq)), sector, -req_op (rq) &REQ_FUA ); + rq->cmd_flags &REQ_FUA );if (err) {spin_unlock_irq (&nullb->lock);return err;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 110/214 i2c: core: Dont fail PRP0001 enumeration when no ID table exist
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit e3cb82c6d6f6c27ab754e13ae29bdd6b949982e2 ]
When commit c64ffff7a9d1 ("i2c: core: Allow empty id_table in ACPI case as well") fixed the enumeration of I²C devices on ACPI enabled platforms when driver has no ID table, it missed the PRP0001 support.
i2c_device_match() and i2c_acpi_match_device() differently match driver against given device. Use acpi_driver_match_device(), that is used in the former, in i2c_device_probe() and don't fail PRP0001 enumeration when no ID table exist.
--- drivers/i2c/i2c-core-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/i2c-core-base.c +1 -1
@@ -354,7 +354,7 @@ static int i2c_device_probe(struct device *dev)* or ACPI ID table is supplied for the probing device. */ if (!driver->id_table && - !i2c_acpi_match_device (dev->driver->acpi_match_table, client) && + !acpi_driver_match_device (dev, dev->driver) && !i2c_of_match_device (dev->driver->of_match_table, client)) { status = -ENODEV ; goto put_sync_adapter;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 111/214 i2c: rcar: in slave mode, clear NACK earlier
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 914a7b3563b8fb92f976619bbd0fa3a4a708baae ]
Currently, a NACK in slave mode is set/cleared when SCL is held low by the IP core right before the bit is about to be pushed out. This is too late for clearing and then a NACK from the previous byte is still used for the current one. Now, let's clear the NACK right after we detected the STOP condition following the NACK.
--- drivers/i2c/busses/i2c-rcar.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-rcar.c +1 -0
@@ -587,6 +587,7 @@ static bool rcar_i2c_slave_irq(struct rcar_i2c_priv *priv)/* master sent stop */ if (ssr_filtered &SSR ) {i2c_slave_event (priv->slave,I2C_SLAVE_STOP , &value); +rcar_i2c_write (priv,ICSCR ,SIE |SDBS );/* clear our NACK */ rcar_i2c_write (priv,ICSIER ,SAR );rcar_i2c_write (priv,ICSSR , ~SSR &0xff ); }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 112/214 usb: gadget: f_tcm: Fix some resource leaks in some error paths
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 07c8434150f4eb0b65cae288721c8af1080fde17 ]
If a memory allocation fails within a 'usb_ep_alloc_request()' call, the already allocated memory must be released.
Fix a mix-up in the code and free the correct requests.
--- drivers/usb/gadget/function/f_tcm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/gadget/function/f_tcm.c +4 -3
@@ -751,12 +751,13 @@ static int uasp_alloc_stream_res(struct f_uas *fu, struct uas_stream *stream) goto err_sts;return 0 ; + err_sts: -usb_ep_free_request (fu->ep_status, stream->req_status); - stream->req_status =NULL ; -err_out:usb_ep_free_request (fu->ep_out, stream->req_out); stream->req_out =NULL ; +err_out: +usb_ep_free_request (fu->ep_in, stream->req_in); + stream->req_in =NULL ; out:return -ENOMEM ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 113/214 spi: stm32: clear only asserted irq flags on interrupt
In reply to Greg Kroah-HartmanFrom: Tobias Schramm <[email protected]>
[ Upstream commit ae1ba50f1e706dfd7ce402ac52c1f1f10becad68 ]
Previously the stm32h7 interrupt thread cleared all non-masked interrupts. If an interrupt was to occur during the handling of another interrupt its flag would be unset, resulting in a lost interrupt.
This patches fixes the issue by clearing only the currently set interrupt flags.
--- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-stm32.c +1 -1
@@ -962,7 +962,7 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id)if (!spi->cur_usedma && (spi->rx_buf && (spi->rx_len >0 )))stm32h7_spi_read_rxfifo (spi, false); -writel_relaxed (mask, spi->base +STM32H7_SPI_IFCR ); +writel_relaxed (sr & mask, spi->base +STM32H7_SPI_IFCR );spin_unlock_irqrestore (&spi->lock, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 114/214 jbd2: make sure jh have b_transaction set in refile/unfile_buffer
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit 24dc9864914eb5813173cfa53313fcd02e4aea7d ]
Callers of __jbd2_journal_unfile_buffer() and __jbd2_journal_refile_buffer() assume that the b_transaction is set. In fact if it's not, we can end up with journal_head refcounting errors leading to crash much later that might be very hard to track down. Add asserts to make sure that is the case.
We also make sure that b_next_transaction is NULL in __jbd2_journal_unfile_buffer() since the callers expect that as well and we should not get into that stage in this state anyway, leading to problems later on if we do.
Tested with fstests.
--- fs/jbd2/transaction.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/jbd2/transaction.c +10 -0
@@ -1983,6 +1983,9 @@ static void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh)*/ static void __jbd2_journal_unfile_buffer (struct journal_head *jh) { +J_ASSERT_JH (jh, jh->b_transaction !=NULL ); +J_ASSERT_JH (jh, jh->b_next_transaction ==NULL ); +__jbd2_journal_temp_unlink_buffer (jh); jh->b_transaction =NULL ;jbd2_journal_put_journal_head (jh);
@@ -2530,6 +2533,13 @@ void __jbd2_journal_refile_buffer(struct journal_head *jh) was_dirty =test_clear_buffer_jbddirty (bh);__jbd2_journal_temp_unlink_buffer (jh); + +/* +* b_transaction must be set, otherwise the new b_transaction won't +* be holding jh reference +*/ +J_ASSERT_JH (jh, jh->b_transaction !=NULL ); +/* * We set b_transaction here because b_next_transaction will inherit * our jh reference and thus __jbd2_journal_file_buffer() must not
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 115/214 ext4: dont BUG on inconsistent journal feature
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 11215630aada28307ba555a43138db6ac54fa825 ]
A customer has reported a BUG_ON in ext4_clear_journal_err() hitting during an LTP testing. Either this has been caused by a test setup issue where the filesystem was being overwritten while LTP was mounting it or the journal replay has overwritten the superblock with invalid data. In either case it is preferable we don't take the machine down with a BUG_ON. So handle the situation of unexpectedly missing has_journal feature more gracefully. We issue warning and fail the mount in the cases where the race window is narrow and the failed check is most likely a programming error. In cases where fs corruption is more likely, we do full ext4_error() handling before failing mount / remount.
--- fs/ext4/super.c | 68 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 21 deletions(-)
fs/ext4/super.c +47 -21
@@ -66,10 +66,10 @@ static int ext4_load_journal(struct super_block *, struct ext4_super_block *, unsigned long journal_devnum);static int ext4_show_options (struct seq_file *seq,struct dentry *root);static int ext4_commit_super (struct super_block *sb,int sync); -static void ext4_mark_recovery_complete (struct super_block *sb, +static int ext4_mark_recovery_complete (struct super_block *sb,struct ext4_super_block *es); -static void ext4_clear_journal_err (struct super_block *sb, -struct ext4_super_block *es); +static int ext4_clear_journal_err (struct super_block *sb, +struct ext4_super_block *es);static int ext4_sync_fs (struct super_block *sb,int wait);static int ext4_remount (struct super_block *sb,int *flags,char *data);static int ext4_statfs (struct dentry *dentry,struct kstatfs *buf);
@@ -4635,7 +4635,9 @@ no_journal:EXT4_SB (sb)->s_mount_state &= ~EXT4_ORPHAN_FS ;if (needs_recovery) {ext4_msg (sb,KERN_INFO ,"recovery complete" ); -ext4_mark_recovery_complete (sb, es); + err =ext4_mark_recovery_complete (sb, es); +if (err) + goto failed_mount8; }if (EXT4_SB (sb)->s_journal) {if (test_opt (sb,DATA_FLAGS ) ==EXT4_MOUNT_JOURNAL_DATA )
@@ -4678,10 +4680,8 @@ cantfind_ext4:ext4_msg (sb,KERN_ERR ,"VFS: Can't find ext4 filesystem" ); goto failed_mount; -#ifdef CONFIG_QUOTA failed_mount8:ext4_unregister_sysfs (sb); -#endif failed_mount7:ext4_unregister_li_request (sb); failed_mount6:
@@ -4820,7 +4820,8 @@ static journal_t *ext4_get_journal(struct super_block *sb,struct inode *journal_inode;journal_t *journal; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return NULL ; journal_inode =ext4_get_journal_inode (sb, journal_inum);if (!journal_inode)
@@ -4850,7 +4851,8 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,struct ext4_super_block *es;struct block_device *bdev; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return NULL ; bdev =ext4_blkdev_get (j_dev, sb);if (bdev ==NULL )
@@ -4942,7 +4944,8 @@ static int ext4_load_journal(struct super_block *sb,int err =0 ;int really_read_only; -BUG_ON (!ext4_has_feature_journal (sb)); +if (WARN_ON_ONCE (!ext4_has_feature_journal (sb))) +return -EFSCORRUPTED ;if (journal_devnum && journal_devnum !=le32_to_cpu (es->s_journal_dev)) {
@@ -5012,7 +5015,12 @@ static int ext4_load_journal(struct super_block *sb, }EXT4_SB (sb)->s_journal = journal; -ext4_clear_journal_err (sb, es); + err =ext4_clear_journal_err (sb, es); +if (err) { +EXT4_SB (sb)->s_journal =NULL ; +jbd2_journal_destroy (journal); +return err; + }if (!really_read_only && journal_devnum && journal_devnum !=le32_to_cpu (es->s_journal_dev)) {
@@ -5108,26 +5116,32 @@ static int ext4_commit_super(struct super_block *sb, int sync)* remounting) the filesystem readonly, then we will end up with a * consistent fs on disk. Record that fact. */ -static void ext4_mark_recovery_complete (struct super_block *sb, -struct ext4_super_block *es) +static int ext4_mark_recovery_complete (struct super_block *sb, +struct ext4_super_block *es) { +int err;journal_t *journal =EXT4_SB (sb)->s_journal;if (!ext4_has_feature_journal (sb)) { -BUG_ON (journal !=NULL ); -return ; +if (journal !=NULL ) { +ext4_error (sb,"Journal got removed while the fs was " +"mounted!" ); +return -EFSCORRUPTED ; + } +return 0 ; }jbd2_journal_lock_updates (journal); -if (jbd2_journal_flush (journal) <0 ) + err =jbd2_journal_flush (journal); +if (err <0 ) goto out;if (ext4_has_feature_journal_needs_recovery (sb) &&sb_rdonly (sb)) {ext4_clear_feature_journal_needs_recovery (sb);ext4_commit_super (sb,1 ); } - out:jbd2_journal_unlock_updates (journal); +return err; }/*
@@ -5135,14 +5149,17 @@ out:* has recorded an error from a previous lifetime, move that error to the * main filesystem now. */ -static void ext4_clear_journal_err (struct super_block *sb, +static int ext4_clear_journal_err (struct super_block *sb,struct ext4_super_block *es) {journal_t *journal;int j_errno;const char *errstr; -BUG_ON (!ext4_has_feature_journal (sb)); +if (!ext4_has_feature_journal (sb)) { +ext4_error (sb,"Journal got removed while the fs was mounted!" ); +return -EFSCORRUPTED ; + } journal =EXT4_SB (sb)->s_journal;
@@ -5167,6 +5184,7 @@ static void ext4_clear_journal_err(struct super_block *sb,jbd2_journal_clear_err (journal);jbd2_journal_update_sb_errno (journal); } +return 0 ; }/*
@@ -5437,8 +5455,13 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) (sbi->s_mount_state & EXT4_VALID_FS)) es->s_state =cpu_to_le16 (sbi->s_mount_state); -if (sbi->s_journal) +if (sbi->s_journal) { +/* +* We let remount-ro finish even if marking fs +* as clean failed... +*/ ext4_mark_recovery_complete (sb, es); + }if (sbi->s_mmp_tsk)kthread_stop (sbi->s_mmp_tsk); }else {
@@ -5486,8 +5509,11 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)* been changed by e2fsck since we originally mounted * the partition.) */ -if (sbi->s_journal) -ext4_clear_journal_err (sb, es); +if (sbi->s_journal) { + err =ext4_clear_journal_err (sb, es); +if (err) + goto restore_opts; + } sbi->s_mount_state =le16_to_cpu (es->s_state); err =ext4_setup_super (sb, es,0 );
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 116/214 ext4: handle read only external journal device
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit 273108fa5015eeffc4bacfa5ce272af3434b96e4 ]
Ext4 uses blkdev_get_by_dev() to get the block_device for journal device which does check to see if the read-only block device was opened read-only.
As a result ext4 will hapily proceed mounting the file system with external journal on read-only device. This is bad as we would not be able to use the journal leading to errors later on.
Instead of simply failing to mount file system in this case, treat it in a similar way we treat internal journal on read-only device. Allow to mount with -o noload in read-only mode.
This can be reproduced easily like this:
mke2fs -F -O journal_dev $JOURNAL_DEV 100M
mkfs.$FSTYPE -F -J device=$JOURNAL_DEV $FS_DEV
blockdev --setro $JOURNAL_DEV
mount $FS_DEV $MNT
touch $MNT/file
umount $MNT
leading to error like this
[ 1307.318713] ------------[ cut here ]------------ [ 1307.323362] generic_make_request: Trying to write to read-only block-device dm-2 (partno 0) [ 1307.331741] WARNING: CPU: 36 PID: 3224 at block/blk-core.c:855 generic_make_request_checks+0x2c3/0x580 [ 1307.341041] Modules linked in: ext4 mbcache jbd2 rfkill intel_rapl_msr intel_rapl_common isst_if_commd [ 1307.419445] CPU: 36 PID: 3224 Comm: jbd2/dm-2 Tainted: G W I 5.8.0-rc5 #2 [ 1307.427359] Hardware name: Dell Inc. PowerEdge R740/01KPX8, BIOS 2.3.10 08/15/2019 [ 1307.434932] RIP: 0010:generic_make_request_checks+0x2c3/0x580 [ 1307.440676] Code: 94 03 00 00 48 89 df 48 8d 74 24 08 c6 05 cf 2b 18 01 01 e8 7f a4 ff ff 48 c7 c7 50e [ 1307.459420] RSP: 0018:ffffc0d70eb5fb48 EFLAGS: 00010286 [ 1307.464646] RAX: 0000000000000000 RBX: ffff9b33b2978300 RCX: 0000000000000000 [ 1307.471780] RDX: ffff9b33e12a81e0 RSI: ffff9b33e1298000 RDI: ffff9b33e1298000 [ 1307.478913] RBP: ffff9b7b9679e0c0 R08: 0000000000000837 R09: 0000000000000024 [ 1307.486044] R10: 0000000000000000 R11: ffffc0d70eb5f9f0 R12: 0000000000000400 [ 1307.493177] R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000 [ 1307.500308] FS: 0000000000000000(0000) GS:ffff9b33e1280000(0000) knlGS:0000000000000000 [ 1307.508396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1307.514142] CR2: 000055eaf4109000 CR3: 0000003dee40a006 CR4: 00000000007606e0 [ 1307.521273] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1307.528407] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1307.535538] PKRU: 55555554 [ 1307.538250] Call Trace: [ 1307.540708] generic_make_request+0x30/0x340 [ 1307.544985] submit_bio+0x43/0x190 [ 1307.548393] ? bio_add_page+0x62/0x90 [ 1307.552068] submit_bh_wbc+0x16a/0x190 [ 1307.555833] jbd2_write_superblock+0xec/0x200 [jbd2] [ 1307.560803] jbd2_journal_update_sb_log_tail+0x65/0xc0 [jbd2] [ 1307.566557] jbd2_journal_commit_transaction+0x2ae/0x1860 [jbd2] [ 1307.572566] ? check_preempt_curr+0x7a/0x90 [ 1307.576756] ? update_curr+0xe1/0x1d0 [ 1307.580421] ? account_entity_dequeue+0x7b/0xb0 [ 1307.584955] ? newidle_balance+0x231/0x3d0 [ 1307.589056] ? __switch_to_asm+0x42/0x70 [ 1307.592986] ? __switch_to_asm+0x36/0x70 [ 1307.596918] ? lock_timer_base+0x67/0x80 [ 1307.600851] kjournald2+0xbd/0x270 [jbd2] [ 1307.604873] ? finish_wait+0x80/0x80 [ 1307.608460] ? commit_timeout+0x10/0x10 [jbd2] [ 1307.612915] kthread+0x114/0x130 [ 1307.616152] ? kthread_park+0x80/0x80 [ 1307.619816] ret_from_fork+0x22/0x30 [ 1307.623400] ---[ end trace 27490236265b1630 ]---
--- fs/ext4/super.c | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-)
fs/ext4/super.c +33 -18
@@ -4943,6 +4943,7 @@ static int ext4_load_journal(struct super_block *sb,dev_t journal_dev;int err =0 ;int really_read_only; +int journal_dev_ro;if (WARN_ON_ONCE (!ext4_has_feature_journal (sb)))return -EFSCORRUPTED ;
@@ -4955,7 +4956,31 @@ static int ext4_load_journal(struct super_block *sb, }else journal_dev =new_decode_dev (le32_to_cpu (es->s_journal_dev)); - really_read_only =bdev_read_only (sb->s_bdev); +if (journal_inum && journal_dev) { +ext4_msg (sb,KERN_ERR , +"filesystem has both journal inode and journal device!" ); +return -EINVAL ; + } + +if (journal_inum) { + journal =ext4_get_journal (sb, journal_inum); +if (!journal) +return -EINVAL ; + }else { + journal =ext4_get_dev_journal (sb, journal_dev); +if (!journal) +return -EINVAL ; + } + + journal_dev_ro =bdev_read_only (journal->j_dev); + really_read_only =bdev_read_only (sb->s_bdev) | journal_dev_ro; + +if (journal_dev_ro && !sb_rdonly (sb)) { +ext4_msg (sb,KERN_ERR , +"journal device read-only, try mounting with '-o ro'" ); + err = -EROFS ; + goto err_out; + }/* * Are we loading a blank journal or performing recovery after a
@@ -4970,27 +4995,14 @@ static int ext4_load_journal(struct super_block *sb,ext4_msg (sb,KERN_ERR ,"write access " "unavailable, cannot proceed " "(try mounting with noload)" ); -return -EROFS ; + err = -EROFS ; + goto err_out; }ext4_msg (sb,KERN_INFO ,"write access will " "be enabled during recovery" ); } } -if (journal_inum && journal_dev) { -ext4_msg (sb,KERN_ERR ,"filesystem has both journal " -"and inode journals!" ); -return -EINVAL ; - } - -if (journal_inum) { -if (!(journal =ext4_get_journal (sb, journal_inum))) -return -EINVAL ; - }else { -if (!(journal =ext4_get_dev_journal (sb, journal_dev))) -return -EINVAL ; - } -if (!(journal->j_flags &JBD2_BARRIER ))ext4_msg (sb,KERN_INFO ,"barriers disabled" );
@@ -5010,8 +5022,7 @@ static int ext4_load_journal(struct super_block *sb,if (err) {ext4_msg (sb,KERN_ERR ,"error loading journal" ); -jbd2_journal_destroy (journal); -return err; + goto err_out; }EXT4_SB (sb)->s_journal = journal;
@@ -5031,6 +5042,10 @@ static int ext4_load_journal(struct super_block *sb, }return 0 ; + +err_out: +jbd2_journal_destroy (journal); +return err; }static int ext4_commit_super (struct super_block *sb,int sync)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 117/214 jbd2: abort journal if free a async write error metadata buffer
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit c044f3d8360d2ecf831ba2cc9f08cf9fb2c699fb ]
If we free a metadata buffer which has been failed to async write out in the background, the jbd2 checkpoint procedure will not detect this failure in jbd2_log_do_checkpoint(), so it may lead to filesystem inconsistency after cleanup journal tail. This patch abort the journal if free a buffer has write_io_error flag to prevent potential further inconsistency.
--- fs/jbd2/transaction.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/jbd2/transaction.c +16 -0
@@ -2077,6 +2077,7 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal, {struct buffer_head *head;struct buffer_head *bh; +bool has_write_io_error = false;int ret =0 ;J_ASSERT (PageLocked (page));
@@ -2101,11 +2102,26 @@ int jbd2_journal_try_to_free_buffers(journal_t *journal,jbd_unlock_bh_state (bh);if (buffer_jbd (bh)) goto busy; + +/* +* If we free a metadata buffer which has been failed to +* write out, the jbd2 checkpoint procedure will not detect +* this failure and may lead to filesystem inconsistency +* after cleanup journal tail. +*/ +if (buffer_write_io_error (bh)) { +pr_err ("JBD2: Error while async write back metadata bh %llu." , + (unsigned long long )bh->b_blocknr); + has_write_io_error = true; + } }while ((bh = bh->b_this_page) != head); ret =try_to_free_buffers (page); busy: +if (has_write_io_error) +jbd2_journal_abort (journal, -EIO ); +return ret; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 118/214 ext4: handle option set by mount flags correctly
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit f25391ebb475d3ffb3aa61bb90e3594c841749ef ]
Currently there is a problem with mount options that can be both set by vfs using mount flags or by a string parsing in ext4.
i_version/iversion options gets lost after remount, for example
$ mount -o i_version /dev/pmem0 /mnt $ grep pmem0 /proc/self/mountinfo | grep i_version 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,seclabel,i_version $ mount -o remount,ro /mnt $ grep pmem0 /proc/self/mountinfo | grep i_version
nolazytime gets ignored by ext4 on remount, for example
$ mount -o lazytime /dev/pmem0 /mnt $ grep pmem0 /proc/self/mountinfo | grep lazytime 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,lazytime,seclabel $ mount -o remount,nolazytime /mnt $ grep pmem0 /proc/self/mountinfo | grep lazytime 310 95 259:0 / /mnt rw,relatime shared:163 - ext4 /dev/pmem0 rw,lazytime,seclabel
Fix it by applying the SB_LAZYTIME and SB_I_VERSION flags from *flags to s_flags before we parse the option and use the resulting state of the same flags in *flags at the end of successful remount.
--- fs/ext4/super.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
fs/ext4/super.c +16 -5
@@ -5342,7 +5342,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) {struct ext4_super_block *es;struct ext4_sb_info *sbi =EXT4_SB (sb); -unsigned long old_sb_flags; +unsigned long old_sb_flags, vfs_flags;struct ext4_mount_options old_opts;int enable_quota =0 ;ext4_group_t g;
@@ -5385,6 +5385,14 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)if (sbi->s_journal && sbi->s_journal->j_task->io_context) journal_ioprio = sbi->s_journal->j_task->io_context->ioprio; +/* +* Some options can be enabled by ext4 and/or by VFS mount flag +* either way we need to make sure it matches in both *flags and +* s_flags. Copy those selected flags from *flags to s_flags +*/ + vfs_flags =SB_LAZYTIME |SB_I_VERSION ; + sb->s_flags = (sb->s_flags & ~vfs_flags) | (*flags & vfs_flags); +if (!parse_options (data, sb,NULL , &journal_ioprio,1 )) { err = -EINVAL ; goto restore_opts;
@@ -5438,9 +5446,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)set_task_ioprio (sbi->s_journal->j_task, journal_ioprio); } -if (*flags &SB_LAZYTIME ) - sb->s_flags |=SB_LAZYTIME ; -if ((bool )(*flags &SB_RDONLY ) !=sb_rdonly (sb)) {if (sbi->s_mount_flags &EXT4_MF_FS_ABORTED ) { err = -EROFS ;
@@ -5580,7 +5585,13 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) }#endif - *flags = (*flags & ~SB_LAZYTIME ) | (sb->s_flags &SB_LAZYTIME ); +/* +* Some options can be enabled by ext4 and/or by VFS mount flag +* either way we need to make sure it matches in both *flags and +* s_flags. Copy those selected flags from s_flags to *flags +*/ + *flags = (*flags & ~vfs_flags) | (sb->s_flags & vfs_flags); +ext4_msg (sb,KERN_INFO ,"re-mounted. Opts: %s" , orig_data);kfree (orig_data);return 0 ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 119/214 ext4: handle error of ext4_setup_system_zone() on remount
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit d176b1f62f242ab259ff665a26fbac69db1aecba ]
ext4_setup_system_zone() can fail. Handle the failure in ext4_remount().
--- fs/ext4/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ext4/super.c +4 -1
@@ -5563,7 +5563,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)ext4_register_li_request (sb, first_not_zeroed); } -ext4_setup_system_zone (sb); + err =ext4_setup_system_zone (sb); +if (err) + goto restore_opts; +if (sbi->s_journal ==NULL && !(old_sb_flags &SB_RDONLY )) { err =ext4_commit_super (sb,1 );if (err)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 120/214 ext4: correctly restore system zone info when remount fails
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 0f5bde1db174f6c471f0bd27198575719dabe3e5 ]
When remounting filesystem fails late during remount handling and block_validity mount option is also changed during the remount, we fail to restore system zone information to a state matching the mount option. This is mostly harmless, just the block validity checking will not match the situation described by the mount option. Make sure these two are always consistent.
--- fs/ext4/block_validity.c | 8 -------- fs/ext4/super.c | 29 +++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-)
fs/ext4/block_validity.c +0 -8
@@ -250,14 +250,6 @@ int ext4_setup_system_zone(struct super_block *sb)int flex_size =ext4_flex_bg_size (sbi);int ret; -if (!test_opt (sb,BLOCK_VALIDITY )) { -if (sbi->system_blks) -ext4_release_system_zone (sb); -return 0 ; - } -if (sbi->system_blks) -return 0 ; - system_blks =kzalloc (sizeof (*system_blks),GFP_KERNEL );if (!system_blks)return -ENOMEM ;
fs/ext4/super.c +21 -8
@@ -4563,11 +4563,13 @@ no_journal:ext4_set_resv_clusters (sb); - err =ext4_setup_system_zone (sb); -if (err) { -ext4_msg (sb,KERN_ERR ,"failed to initialize system " -"zone (%d)" , err); - goto failed_mount4a; +if (test_opt (sb,BLOCK_VALIDITY )) { + err =ext4_setup_system_zone (sb); +if (err) { +ext4_msg (sb,KERN_ERR ,"failed to initialize system " +"zone (%d)" , err); + goto failed_mount4a; + } }ext4_ext_init (sb);
@@ -5563,9 +5565,16 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)ext4_register_li_request (sb, first_not_zeroed); } - err =ext4_setup_system_zone (sb); -if (err) - goto restore_opts; +/* +* Handle creation of system zone data early because it can fail. +* Releasing of existing data is done when we are sure remount will +* succeed. +*/ +if (test_opt (sb,BLOCK_VALIDITY ) && !sbi->system_blks) { + err =ext4_setup_system_zone (sb); +if (err) + goto restore_opts; + }if (sbi->s_journal ==NULL && !(old_sb_flags &SB_RDONLY )) { err =ext4_commit_super (sb,1 );
@@ -5587,6 +5596,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) } }#endif +if (!test_opt (sb,BLOCK_VALIDITY ) && sbi->system_blks) +ext4_release_system_zone (sb);/* * Some options can be enabled by ext4 and/or by VFS mount flag
@@ -5608,6 +5619,8 @@ restore_opts: sbi->s_commit_interval = old_opts.s_commit_interval; sbi->s_min_batch_time = old_opts.s_min_batch_time; sbi->s_max_batch_time = old_opts.s_max_batch_time; +if (!test_opt (sb,BLOCK_VALIDITY ) && sbi->system_blks) +ext4_release_system_zone (sb);#ifdef CONFIG_QUOTA sbi->s_jquota_fmt = old_opts.s_jquota_fmt;for (i =0 ; i <EXT4_MAXQUOTAS ; i++) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 121/214 fs: prevent BUG_ON in submit_bh_wbc()
In reply to Greg Kroah-HartmanFrom: Xianting Tian <[email protected]>
[ Upstream commit 377254b2cd2252c7c3151b113cbdf93a7736c2e9 ]
If a device is hot-removed --- for example, when a physical device is unplugged from pcie slot or a nbd device's network is shutdown --- this can result in a BUG_ON() crash in submit_bh_wbc(). This is because the when the block device dies, the buffer heads will have their Buffer_Mapped flag get cleared, leading to the crash in submit_bh_wbc.
We had attempted to work around this problem in commit a17712c8 ("ext4: check superblock mapped prior to committing"). Unfortunately, it's still possible to hit the BUG_ON(!buffer_mapped(bh)) if the device dies between when the work-around check in ext4_commit_super() and when submit_bh_wbh() is finally called:
Code path:ext4_commit_super
judge if 'buffer_mapped(sbh)' is false, return <== commit a17712c8
lock_buffer(sbh)
...
unlock_buffer(sbh)
__sync_dirty_buffer(sbh,...
lock_buffer(sbh)
judge if 'buffer_mapped(sbh))' is false, return <== added by this patch
submit_bh(...,sbh)
submit_bh_wbc(...,sbh,...)[100722.966497] kernel BUG at fs/buffer.c:3095! <== BUG_ON(!buffer_mapped(bh))' in submit_bh_wbc() [100722.966503] invalid opcode: 0000 [#1] SMP [100722.966566] task: ffff8817e15a9e40 task.stack: ffffc90024744000 [100722.966574] RIP: 0010:submit_bh_wbc+0x180/0x190 [100722.966575] RSP: 0018:ffffc90024747a90 EFLAGS: 00010246 [100722.966576] RAX: 0000000000620005 RBX: ffff8818a80603a8 RCX: 0000000000000000 [100722.966576] RDX: ffff8818a80603a8 RSI: 0000000000020800 RDI: 0000000000000001 [100722.966577] RBP: ffffc90024747ac0 R08: 0000000000000000 R09: ffff88207f94170d [100722.966578] R10: 00000000000437c8 R11: 0000000000000001 R12: 0000000000020800 [100722.966578] R13: 0000000000000001 R14: 000000000bf9a438 R15: ffff88195f333000 [100722.966580] FS: 00007fa2eee27700(0000) GS:ffff88203d840000(0000) knlGS:0000000000000000 [100722.966580] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [100722.966581] CR2: 0000000000f0b008 CR3: 000000201a622003 CR4: 00000000007606e0 [100722.966582] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [100722.966583] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [100722.966583] PKRU: 55555554 [100722.966583] Call Trace: [100722.966588] __sync_dirty_buffer+0x6e/0xd0 [100722.966614] ext4_commit_super+0x1d8/0x290 [ext4] [100722.966626] __ext4_std_error+0x78/0x100 [ext4] [100722.966635] ? __ext4_journal_get_write_access+0xca/0x120 [ext4] [100722.966646] ext4_reserve_inode_write+0x58/0xb0 [ext4] [100722.966655] ? ext4_dirty_inode+0x48/0x70 [ext4] [100722.966663] ext4_mark_inode_dirty+0x53/0x1e0 [ext4] [100722.966671] ? __ext4_journal_start_sb+0x6d/0xf0 [ext4] [100722.966679] ext4_dirty_inode+0x48/0x70 [ext4] [100722.966682] __mark_inode_dirty+0x17f/0x350 [100722.966686] generic_update_time+0x87/0xd0 [100722.966687] touch_atime+0xa9/0xd0 [100722.966690] generic_file_read_iter+0xa09/0xcd0 [100722.966694] ? page_cache_tree_insert+0xb0/0xb0 [100722.966704] ext4_file_read_iter+0x4a/0x100 [ext4] [100722.966707] ? __inode_security_revalidate+0x4f/0x60 [100722.966709] __vfs_read+0xec/0x160 [100722.966711] vfs_read+0x8c/0x130 [100722.966712] SyS_pread64+0x87/0xb0 [100722.966716] do_syscall_64+0x67/0x1b0 [100722.966719] entry_SYSCALL64_slow_path+0x25/0x25
To address this, add the check of 'buffer_mapped(bh)' to __sync_dirty_buffer(). This also has the benefit of fixing this for other file systems.
With this addition, we can drop the workaround in ext4_commit_supper().
[ Commit description rewritten by tytso. ]
--- fs/buffer.c | 9 +++++++++ fs/ext4/super.c | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-)
fs/buffer.c +9 -0
@@ -3170,6 +3170,15 @@ int __sync_dirty_buffer(struct buffer_head *bh, int op_flags)WARN_ON (atomic_read (&bh->b_count) <1 );lock_buffer (bh);if (test_clear_buffer_dirty (bh)) { +/* +* The bh should be mapped, but it might not be if the +* device was hot-removed. Not much we can do but fail the I/O. +*/ +if (!buffer_mapped (bh)) { +unlock_buffer (bh); +return -EIO ; + } +get_bh (bh); bh->b_end_io = end_buffer_write_sync; ret =submit_bh (REQ_OP_WRITE , op_flags, bh);
fs/ext4/super.c +0 -7
@@ -5059,13 +5059,6 @@ static int ext4_commit_super(struct super_block *sb, int sync)if (!sbh ||block_device_ejected (sb))return error; -/* -* The superblock bh should be mapped, but it might not be if the -* device was hot-removed. Not much we can do but fail the I/O. -*/ -if (!buffer_mapped (sbh)) -return error; -/* * If the file system is mounted read-only, don't update the * superblock write time. This avoids updating the superblock
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 122/214 spi: stm32h7: fix race condition at end of transfer
In reply to Greg Kroah-HartmanFrom: Antonio Borneo <[email protected]>
[ Upstream commit 135dd873d3c76d812ae64c668adef3f2c59ed27f ]
The caller of stm32_spi_transfer_one(), spi_transfer_one_message(), is waiting for us to call spi_finalize_current_transfer() and will eventually schedule a new transfer, if available.
We should guarantee that the spi controller is really available before calling spi_finalize_current_transfer().
Move the call to spi_finalize_current_transfer() _after_ the call to stm32_spi_disable().
--- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-stm32.c +1 -1
@@ -967,8 +967,8 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id)spin_unlock_irqrestore (&spi->lock, flags);if (end) { -spi_finalize_current_transfer (master);stm32h7_spi_disable (spi); +spi_finalize_current_transfer (master); }return IRQ_HANDLED ;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 123/214 spi: stm32: fix fifo threshold level in case of short transfer
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 3373e9004acc0603242622b4378c64bc01d21b5f ]
When transfer is shorter than half of the fifo, set the data packet size up to transfer size instead of up to half of the fifo.
Check also that threshold is set at least to 1 data frame.
--- drivers/spi/spi-stm32.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/spi/spi-stm32.c +18 -8
@@ -469,20 +469,27 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz,/** * stm32h7_spi_prepare_fthlv - Determine FIFO threshold level * @spi: pointer to the spi controller data structure +* @xfer_len: length of the message to be transferred */ -static u32 stm32h7_spi_prepare_fthlv (struct stm32_spi *spi) +static u32 stm32h7_spi_prepare_fthlv (struct stm32_spi *spi,u32 xfer_len) { -u32 fthlv, half_fifo; +u32 fthlv, half_fifo, packet;/* data packet should not exceed 1/2 of fifo space */ half_fifo = (spi->fifo_size /2 ); +/* data_packet should not exceed transfer length */ +if (half_fifo > xfer_len) + packet = xfer_len; +else + packet = half_fifo; +if (spi->cur_bpw <=8 ) - fthlv = half_fifo; + fthlv = packet;else if (spi->cur_bpw <=16 ) - fthlv = half_fifo /2 ; + fthlv = packet /2 ;else - fthlv = half_fifo /4 ; + fthlv = packet /4 ;/* align packet size with data registers access */ if (spi->cur_bpw >8 )
@@ -490,6 +497,9 @@ static u32 stm32h7_spi_prepare_fthlv(struct stm32_spi *spi)else fthlv -= (fthlv %4 );/* multiple of 4 */ +if (!fthlv) + fthlv =1 ; +return fthlv; }
@@ -1396,7 +1406,7 @@ static void stm32h7_spi_set_bpw(struct stm32_spi *spi) cfg1_setb |= (bpw <<STM32H7_SPI_CFG1_DSIZE_SHIFT ) &STM32H7_SPI_CFG1_DSIZE ; - spi->cur_fthlv =stm32h7_spi_prepare_fthlv (spi); + spi->cur_fthlv =stm32h7_spi_prepare_fthlv (spi, spi->cur_xferlen); fthlv = spi->cur_fthlv -1 ; cfg1_clrb |=STM32H7_SPI_CFG1_FTHLV ;
@@ -1582,6 +1592,8 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,spin_lock_irqsave (&spi->lock, flags); + spi->cur_xferlen = transfer->len; +if (spi->cur_bpw != transfer->bits_per_word) { spi->cur_bpw = transfer->bits_per_word; spi->cfg->set_bpw (spi);
@@ -1629,8 +1641,6 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi, goto out; } - spi->cur_xferlen = transfer->len; -dev_dbg (spi->dev,"transfer communication mode set to %d\n" , spi->cur_comm); dev_dbg(spi->dev,
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 124/214 spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 9cc61973bf9385b19ff5dda4a2a7e265fcba85e4 ]
Fix spi->clk_rate when it is odd to the nearest lowest even value because minimum SPI divider is 2.
--- drivers/spi/spi-stm32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-stm32.c +2 -1
@@ -443,7 +443,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz, {u32 div, mbrdiv; - div =DIV_ROUND_UP (spi->clk_rate, speed_hz); +/* Ensure spi->clk_rate is even */ + div =DIV_ROUND_UP (spi->clk_rate & ~0x1 , speed_hz);/* * SPI framework set xfer->speed_hz to master->max_speed_hz if
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 125/214 spi: stm32: always perform registers configuration prior to transfer
In reply to Greg Kroah-HartmanFrom: Alain Volmat <[email protected]>
[ Upstream commit 60ccb3515fc61a0124c70aa37317f75b67560024 ]
SPI registers content may have been lost upon suspend/resume sequence. So, always compute and apply the necessary configuration in stm32_spi_transfer_one_setup routine.
--- drivers/spi/spi-stm32.c | 42 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 25 deletions(-)
drivers/spi/spi-stm32.c +17 -25
@@ -1590,41 +1590,33 @@ static int stm32_spi_transfer_one_setup(struct stm32_spi *spi,unsigned long flags;unsigned int comm_type;int nb_words, ret =0 ; +int mbr;spin_lock_irqsave (&spi->lock, flags); spi->cur_xferlen = transfer->len; -if (spi->cur_bpw != transfer->bits_per_word) { - spi->cur_bpw = transfer->bits_per_word; - spi->cfg->set_bpw (spi); - } - -if (spi->cur_speed != transfer->speed_hz) { -int mbr; - -/* Update spi->cur_speed with real clock speed */ - mbr =stm32_spi_prepare_mbr (spi, transfer->speed_hz, - spi->cfg->baud_rate_div_min, - spi->cfg->baud_rate_div_max); -if (mbr <0 ) { - ret = mbr; - goto out; - } + spi->cur_bpw = transfer->bits_per_word; + spi->cfg->set_bpw (spi); - transfer->speed_hz = spi->cur_speed; -stm32_spi_set_mbr (spi, mbr); +/* Update spi->cur_speed with real clock speed */ + mbr =stm32_spi_prepare_mbr (spi, transfer->speed_hz, + spi->cfg->baud_rate_div_min, + spi->cfg->baud_rate_div_max); +if (mbr <0 ) { + ret = mbr; + goto out; } - comm_type =stm32_spi_communication_type (spi_dev, transfer); -if (spi->cur_comm != comm_type) { - ret = spi->cfg->set_mode (spi, comm_type); + transfer->speed_hz = spi->cur_speed; +stm32_spi_set_mbr (spi, mbr); -if (ret <0 ) - goto out; + comm_type =stm32_spi_communication_type (spi_dev, transfer); + ret = spi->cfg->set_mode (spi, comm_type); +if (ret <0 ) + goto out; - spi->cur_comm = comm_type; - } + spi->cur_comm = comm_type;if (spi->cfg->set_data_idleness) spi->cfg->set_data_idleness (spi, transfer->len);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 126/214 drm/amd/powerplay: correct Vega20 cached smu feature state
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 266d81d9eed30f4994d76a2b237c63ece062eefe ]
Correct the cached smu feature state on pp_features sysfs setting.
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +19 -19
@@ -981,27 +981,15 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr) {struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); -uint64_t features_enabled; -int i; -bool enabled; -int ret =0 ; +int i, ret =0 ;PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_DisableAllSmuFeatures)) ==0 ,"[DisableAllSMUFeatures] Failed to disable all smu features!" , return ret); - ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); -PP_ASSERT_WITH_CODE (!ret, -"[DisableAllSMUFeatures] Failed to get enabled smc features!" , - return ret); - -for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? - true : false; - data->smu_features[i].enabled = enabled; - data->smu_features[i].supported = enabled; - } +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) + data->smu_features[i].enabled =0 ;return 0 ; }
@@ -3211,10 +3199,11 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)static int vega20_set_ppfeature_status (struct pp_hwmgr *hwmgr,uint64_t new_ppfeature_masks) { -uint64_t features_enabled; -uint64_t features_to_enable; -uint64_t features_to_disable; -int ret =0 ; +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +uint64_t features_enabled, features_to_enable, features_to_disable; +int i, ret =0 ; +bool enabled;if (new_ppfeature_masks >= (1ULL <<GNLD_FEATURES_MAX ))return -EINVAL ;
@@ -3243,6 +3232,17 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfereturn ret; } +/* Update the cached feature enablement state */ + ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); +if (ret) +return ret; + +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { + enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? + true : false; + data->smu_features[i].enabled = enabled; + } +return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 127/214 drm/amd/powerplay: correct UVD/VCE PG state on custom pptable uploading
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 2c5b8080d810d98e3e59617680218499b17c84a1 ]
The UVD/VCE PG state is managed by UVD and VCE IP. It's error-prone to assume the bootup state in SMU based on the dpm status.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -6
@@ -1640,12 +1640,6 @@ static void vega20_init_powergate_state(struct pp_hwmgr *hwmgr) data->uvd_power_gated = true; data->vce_power_gated = true; - -if (data->smu_features[GNLD_DPM_UVD ].enabled) - data->uvd_power_gated = false; - -if (data->smu_features[GNLD_DPM_VCE ].enabled) - data->vce_power_gated = false; }static int vega20_enable_dpm_tasks (struct pp_hwmgr *hwmgr)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 128/214 drm/amd/display: Switch to immediate mode for updating infopackets
In reply to Greg Kroah-HartmanFrom: Anthony Koo <[email protected]>
[ Upstream commit abba907c7a20032c2d504fd5afe3af7d440a09d0 ]
[Why]
Using FRAME_UPDATE will result in infopacket to be potentially updated one frame late.
In commit stream scenarios for previously active stream, some stale infopacket data from previous config might be erroneously sent out on initial frame after stream is re-enabled.
[How]
Switch to using IMMEDIATE_UPDATE mode
--- .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 16 ++++++++-------- .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +8 -8
@@ -121,35 +121,35 @@ void enc1_update_generic_info_packet(switch (packet_index) {case 0 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC0_FRAME_UPDATE ,1 ); +AFMT_GENERIC0_IMMEDIATE_UPDATE ,1 );break ;case 1 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC1_FRAME_UPDATE ,1 ); +AFMT_GENERIC1_IMMEDIATE_UPDATE ,1 );break ;case 2 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC2_FRAME_UPDATE ,1 ); +AFMT_GENERIC2_IMMEDIATE_UPDATE ,1 );break ;case 3 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC3_FRAME_UPDATE ,1 ); +AFMT_GENERIC3_IMMEDIATE_UPDATE ,1 );break ;case 4 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC4_FRAME_UPDATE ,1 ); +AFMT_GENERIC4_IMMEDIATE_UPDATE ,1 );break ;case 5 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC5_FRAME_UPDATE ,1 ); +AFMT_GENERIC5_IMMEDIATE_UPDATE ,1 );break ;case 6 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC6_FRAME_UPDATE ,1 ); +AFMT_GENERIC6_IMMEDIATE_UPDATE ,1 );break ;case 7 :REG_UPDATE (AFMT_VBI_PACKET_CONTROL1 , -AFMT_GENERIC7_FRAME_UPDATE ,1 ); +AFMT_GENERIC7_IMMEDIATE_UPDATE ,1 );break ;default :break ;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +14 -0
@@ -275,7 +275,14 @@ struct dcn10_stream_enc_registers {SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_FRAME_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC0_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC1_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC2_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC3_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC4_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_IMMEDIATE_UPDATE , mask_sh),\ +SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC7_IMMEDIATE_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC5_FRAME_UPDATE , mask_sh),\SE_SF (DIG0_AFMT_VBI_PACKET_CONTROL1 ,AFMT_GENERIC6_FRAME_UPDATE , mask_sh),\ SE_SF(DIG0_AFMT_VBI_PACKET_CONTROL1, AFMT_GENERIC7_FRAME_UPDATE, mask_sh),\
@@ -339,7 +346,14 @@ struct dcn10_stream_enc_registers {type AFMT_GENERIC2_FRAME_UPDATE ;\type AFMT_GENERIC3_FRAME_UPDATE ;\type AFMT_GENERIC4_FRAME_UPDATE ;\ +type AFMT_GENERIC0_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC1_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC2_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC3_IMMEDIATE_UPDATE ;\type AFMT_GENERIC4_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC5_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC6_IMMEDIATE_UPDATE ;\ +type AFMT_GENERIC7_IMMEDIATE_UPDATE ;\type AFMT_GENERIC5_FRAME_UPDATE ;\type AFMT_GENERIC6_FRAME_UPDATE ;\type AFMT_GENERIC7_FRAME_UPDATE ;\
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 129/214 libbpf: Handle GCC built-in types for Arm NEON
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 702eddc77a905782083b14ccd05b23840675fd18 ]
When building Arm NEON (SIMD) code from lib/raid6/neon.uc, GCC emits DWARF information using a base type "__Poly8_t", which is internal to GCC and not recognized by Clang. This causes build failures when building with Clang a vmlinux.h generated from an arm64 kernel that was built with GCC.
vmlinux.h:47284:9: error: unknown type name '__Poly8_t' typedef __Poly8_t poly8x16_t[16]; ^~~~~~~~~
The polyX_t types are defined as unsigned integers in the "Arm C Language Extension" document (101028_Q220_00_en). Emit typedefs based on standard integer types for the GCC internal types, similar to those emitted by Clang.
Including linux/kernel.h to use ARRAY_SIZE() incidentally redefined max(), causing a build bug due to different types, hence the seemingly unrelated change.
--- tools/lib/bpf/btf_dump.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
tools/lib/bpf/btf_dump.c +34 -1
@@ -13,6 +13,7 @@#include <errno.h> #include <linux/err.h> #include <linux/btf.h> +#include <linux/kernel.h> #include "btf.h" #include "hashmap.h" #include "libbpf.h"
@@ -543,6 +544,9 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr) } } +static void btf_dump_emit_missing_aliases (struct btf_dump *d,__u32 id, +const struct btf_type *t); +static void btf_dump_emit_struct_fwd (struct btf_dump *d,__u32 id,const struct btf_type *t); static void btf_dump_emit_struct_def(struct btf_dump *d, __u32 id,
@@ -665,6 +669,9 @@ static void btf_dump_emit_type(struct btf_dump *d, __u32 id, __u32 cont_id)switch (kind) {case BTF_KIND_INT : +/* Emit type alias definitions if necessary */ +btf_dump_emit_missing_aliases (d, id, t); + tstate->emit_state =EMITTED ;break ;case BTF_KIND_ENUM :
@@ -899,7 +906,7 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d,": %d" , m_sz); off = m_off + m_sz; }else { - m_sz =max (0 ,btf__resolve_size (d->btf, m->type)); + m_sz =max (0LL ,btf__resolve_size (d->btf, m->type)); off = m_off + m_sz *8 ; }btf_dump_printf (d,";" );
@@ -919,6 +926,32 @@ static void btf_dump_emit_struct_def(struct btf_dump *d,btf_dump_printf (d," __attribute__((packed))" ); } +static const char *missing_base_types[][2 ] = { +/* +* GCC emits typedefs to its internal __PolyX_t types when compiling Arm +* SIMD intrinsics. Alias them to standard base types. +*/ + {"__Poly8_t" ,"unsigned char" }, + {"__Poly16_t" ,"unsigned short" }, + {"__Poly64_t" ,"unsigned long long" }, + {"__Poly128_t" ,"unsigned __int128" }, +}; + +static void btf_dump_emit_missing_aliases (struct btf_dump *d,__u32 id, +const struct btf_type *t) +{ +const char *name =btf_dump_type_name (d, id); +int i; + +for (i =0 ; i <ARRAY_SIZE (missing_base_types); i++) { +if (strcmp (name, missing_base_types[i][0 ]) ==0 ) { +btf_dump_printf (d,"typedef %s %s;\n\n" , + missing_base_types[i][1 ], name); +break ; + } + } +} +static void btf_dump_emit_enum_fwd (struct btf_dump *d,__u32 id,const struct btf_type *t) {
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 130/214 netfilter: avoid ipv6 -> nf_defrag_ipv6 module dependency
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 2404b73c3f1a5f15726c6ecd226b56f6f992767f ]
nf_ct_frag6_gather is part of nf_defrag_ipv6.ko, not ipv6 core.
The current use of the netfilter ipv6 stub indirections causes a module dependency between ipv6 and nf_defrag_ipv6.
This prevents nf_defrag_ipv6 module from being removed because ipv6 can't be unloaded.
Remove the indirection and always use a direct call. This creates a depency from nf_conntrack_bridge to nf_defrag_ipv6 instead:
modinfo nf_conntrack
depends: nf_conntrack,nf_defrag_ipv6,bridge
.. and nf_conntrack already depends on nf_defrag_ipv6 anyway.
--- include/linux/netfilter_ipv6.h | 18 ------------------ net/bridge/netfilter/nf_conntrack_bridge.c | 8 ++++++-- net/ipv6/netfilter.c | 3 --- 3 files changed, 6 insertions(+), 23 deletions(-)
include/linux/netfilter_ipv6.h +0 -18
@@ -58,7 +58,6 @@ struct nf_ipv6_ops { int (*output)(struct net *, struct sock *, struct sk_buff *));int (*reroute)(struct sk_buff *skb,const struct nf_queue_entry *entry);#if IS_MODULE (CONFIG_IPV6 ) -int (*br_defrag)(struct net *net,struct sk_buff *skb,u32 user); int (*br_fragment)(struct net *net, struct sock *sk, struct sk_buff *skb, struct nf_bridge_frag_data *data,
@@ -117,23 +116,6 @@ static inline int nf_ip6_route(struct net *net, struct dst_entry **dst,#include <net/netfilter/ipv6/nf_defrag_ipv6.h> -static inline int nf_ipv6_br_defrag (struct net *net,struct sk_buff *skb, -u32 user) -{ -#if IS_MODULE (CONFIG_IPV6 ) -const struct nf_ipv6_ops *v6_ops =nf_get_ipv6_ops (); - -if (!v6_ops) -return 1 ; - -return v6_ops->br_defrag (net, skb, user); -#elif IS_BUILTIN (CONFIG_IPV6 ) -return nf_ct_frag6_gather (net, skb, user); -#else -return 1 ; -#endif -} - int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, struct nf_bridge_frag_data *data, int (*output)(struct net *, struct sock *sk,
net/bridge/netfilter/nf_conntrack_bridge.c +6 -2
@@ -168,6 +168,7 @@ static unsigned int nf_ct_br_defrag4(struct sk_buff *skb,static unsigned int nf_ct_br_defrag6 (struct sk_buff *skb,const struct nf_hook_state *state) { +#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )u16 zone_id =NF_CT_DEFAULT_ZONE_ID ;enum ip_conntrack_info ctinfo;struct br_input_skb_cb cb;
@@ -180,14 +181,17 @@ static unsigned int nf_ct_br_defrag6(struct sk_buff *skb,br_skb_cb_save (skb, &cb,sizeof (struct inet6_skb_parm )); - err =nf_ipv6_br_defrag (state->net, skb, -IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id); + err =nf_ct_frag6_gather (state->net, skb, +IP_DEFRAG_CONNTRACK_BRIDGE_IN + zone_id);/* queued */ if (err == -EINPROGRESS )return NF_STOLEN ;br_skb_cb_restore (skb, &cb,IP6CB (skb)->frag_max_size);return err ==0 ?NF_ACCEPT :NF_DROP ; +#else +return NF_ACCEPT ; +#endif }static int nf_ct_br_ip_check (const struct sk_buff *skb)
net/ipv6/netfilter.c +0 -3
@@ -245,9 +245,6 @@ static const struct nf_ipv6_ops ipv6ops = { .route_input = ip6_route_input, .fragment = ip6_fragment, .reroute = nf_ip6_reroute, -#if IS_MODULE (CONFIG_IPV6 ) &&IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 ) - .br_defrag = nf_ct_frag6_gather, -#endif #if IS_MODULE (CONFIG_IPV6 ) .br_fragment = br_ip6_fragment,#endif
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 131/214 can: j1939: transport: j1939_xtp_rx_dat_one(): compare own packets to detect corruptions
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit e052d0540298bfe0f6cbbecdc7e2ea9b859575b2 ]
Since the stack relays on receiving own packets, it was overwriting own transmit buffer from received packets.
At least theoretically, the received echo buffer can be corrupt or changed and the session partner can request to resend previous data. In this case we will re-send bad data.
With this patch we will stop to overwrite own TX buffer and use it for sanity checking.
--- net/can/j1939/transport.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/can/j1939/transport.c +14 -1
@@ -1803,7 +1803,20 @@ static void j1939_xtp_rx_dat_one(struct j1939_session *session, } tpdat = se_skb->data; -memcpy (&tpdat[offset], &dat[1 ], nbytes); +if (!session->transmission) { +memcpy (&tpdat[offset], &dat[1 ], nbytes); + }else { +int err; + + err =memcmp (&tpdat[offset], &dat[1 ], nbytes); +if (err) +netdev_err_once (priv->ndev, +"%s: 0x%p: Data of RX-looped back packet (%*ph) doesn't match TX data (%*ph)!\n" , + __func__, session, + nbytes, &dat[1 ], + nbytes, &tpdat[offset]); + } +if (packet == session->pkt.rx) session->pkt.rx++;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 132/214 ALSA: hda/realtek: Add model alc298-samsung-headphone
In reply to Greg Kroah-HartmanFrom: Mike Pozulp <[email protected]>
[ Upstream commit 23dc958689449be85e39351a8c809c3d344b155b ]
The very quiet and distorted headphone output bug that afflicted my Samsung Notebook 9 is appearing in many other Samsung laptops. Expose the quirk which fixed my laptop as a model so other users can try it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -7939,6 +7939,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC299_FIXUP_PREDATOR_SPK, .name = "predator-spk"}, {.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"}, {.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"}, + {.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"}, {} };#define ALC225_STANDARD_PINS \
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 133/214 s390/cio: add cond_resched() in the slow_eval_known_fn() loop
In reply to Greg Kroah-HartmanFrom: Vineeth Vijayan <[email protected]>
[ Upstream commit 0b8eb2ee9da1e8c9b8082f404f3948aa82a057b2 ]
The scanning through subchannels during the time of an event could take significant amount of time in case of platforms with lots of known subchannels. This might result in higher scheduling latencies for other tasks especially on systems with a single CPU. Add cond_resched() call, as the loop in slow_eval_known_fn() can be executed for a longer duration.
--- drivers/s390/cio/css.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/s390/cio/css.c +5 -0
@@ -677,6 +677,11 @@ static int slow_eval_known_fn(struct subchannel *sch, void *data) rc =css_evaluate_known_subchannel (sch,1 );if (rc == -EAGAIN )css_schedule_eval (sch->schid); +/* +* The loop might take long time for platforms with lots of +* known devices. Allow scheduling here. +*/ +cond_resched (); }return 0 ; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 134/214 ASoC: wm8994: Avoid attempts to read unreadable registers
In reply to Greg Kroah-HartmanFrom: Sylwester Nawrocki <[email protected]>
[ Upstream commit f082bb59b72039a2326ec1a44496899fb8aa6d0e ]
The driver supports WM1811, WM8994, WM8958 devices but according to documentation and the regmap definitions the WM8958_DSP2_* registers are only available on WM8958. In current code these registers are being accessed as if they were available on all the three chips.
When starting playback on WM1811 CODEC multiple errors like:
"wm8994-codec wm8994-codec: ASoC: error at soc_component_read_no_lock on wm8994-codec: -5" can be seen, which is caused by attempts to read an unavailable WM8958_DSP2_PROGRAM register. The issue has been uncovered by recent
commit "e2329ee ASoC: soc-component: add soc_component_err()".
This patch adds a check in wm8958_aif_ev() callback so the DSP2 handling is only done for WM8958.
--- sound/soc/codecs/wm8958-dsp2.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/soc/codecs/wm8958-dsp2.c +4 -0
@@ -416,8 +416,12 @@ int wm8958_aif_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) {struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); +struct wm8994 *control =dev_get_drvdata (component->dev->parent);int i; +if (control->type !=WM8958 ) +return 0 ; +switch (event) {case SND_SOC_DAPM_POST_PMU :case SND_SOC_DAPM_PRE_PMU :
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 135/214 selftests: disable rp_filter for icmp_redirect.sh
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit bcf7ddb0186d366f761f86196b480ea6dd2dc18c ]
h1 is initially configured to reach h2 via r1 rather than the more direct path through r2. If rp_filter is set and inherited for r2, forwarding fails since the source address of h1 is reachable from eth0 vs the packet coming to it via r1 and eth1. Since rp_filter setting affects the test, explicitly reset it.
--- tools/testing/selftests/net/icmp_redirect.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/icmp_redirect.sh +2 -0
@@ -180,6 +180,8 @@ setup() ;; r[12]) ip netns exec $ns sysctl -q -w net.ipv4.ip_forward=1 ip netns exec $ns sysctl -q -w net.ipv4.conf.all.send_redirects=1 + ip netns exec $ns sysctl -q -w net.ipv4.conf.default.rp_filter=0 + ip netns exec $ns sysctl -q -w net.ipv4.conf.all.rp_filter=0 ip netns exec $ns sysctl -q -w net.ipv6.conf.all.forwarding=1 ip netns exec $ns sysctl -q -w net.ipv6.route.mtu_expires=10
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 136/214 scsi: fcoe: Fix I/O path allocation
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit fa39ab5184d64563cd36f2fb5f0d3fbad83a432c ]
ixgbe_fcoe_ddp_setup() can be called from the main I/O path and is called with a spin_lock held, so we have to use GFP_ATOMIC allocation instead of GFP_KERNEL.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -192,7 +192,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, }/* alloc the udl from per cpu ddp pool */ - ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_KERNEL , &ddp->udp); + ddp->udl =dma_pool_alloc (ddp_pool->pool,GFP_ATOMIC , &ddp->udp);if (!ddp->udl) {e_err (drv,"failed allocated ddp context\n" ); goto out_noddp_unmap;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 137/214 scsi: ufs: Fix possible infinite loop in ufshcd_hold
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit 93b6c5db06028a3b55122bbb74d0715dd8ca4ae0 ]
In ufshcd_suspend(), after clk-gating is suspended and link is set as Hibern8 state, ufshcd_hold() is still possibly invoked before ufshcd_suspend() returns. For example, MediaTek's suspend vops may issue UIC commands which would call ufshcd_hold() during the command issuing flow.
Now if UFSHCD_CAP_HIBERN8_WITH_CLK_GATING capability is enabled, then ufshcd_hold() may enter infinite loops because there is no clk-ungating work scheduled or pending. In this case, ufshcd_hold() shall just bypass, and keep the link as Hibern8 state.
--- drivers/scsi/ufs/ufshcd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +4 -1
@@ -1516,6 +1516,7 @@ unblock_reqs:int ufshcd_hold (struct ufs_hba *hba,bool async) {int rc =0 ; +bool flush_result;unsigned long flags;if (!ufshcd_is_clkgating_allowed (hba))
@@ -1547,7 +1548,9 @@ start:break ; }spin_unlock_irqrestore (hba->host->host_lock, flags); -flush_work (&hba->clk_gating.ungate_work); + flush_result =flush_work (&hba->clk_gating.ungate_work); +if (hba->clk_gating.is_suspended && !flush_result) + goto out;spin_lock_irqsave (hba->host->host_lock, flags); goto start; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 138/214 scsi: ufs: Improve interrupt handling for shared interrupts
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit 127d5f7c4b653b8be5eb3b2c7bbe13728f9003ff ]
For shared interrupts, the interrupt status might be zero, so check that first.
--- drivers/scsi/ufs/ufshcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -3
@@ -5612,7 +5612,7 @@ static void ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status)*/ static irqreturn_t ufshcd_intr (int irq,void *__hba) { -u32 intr_status, enabled_intr_status; +u32 intr_status, enabled_intr_status =0 ;irqreturn_t retval =IRQ_NONE ;struct ufs_hba *hba = __hba;int retries = hba->nutrs;
@@ -5626,7 +5626,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)* read, make sure we handle them by checking the interrupt status * again in a loop until we process all of the reqs before returning. */ - do { +while (intr_status && retries--) { enabled_intr_status = intr_status &ufshcd_readl (hba,REG_INTERRUPT_ENABLE );if (intr_status)
@@ -5637,7 +5637,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) } intr_status =ufshcd_readl (hba,REG_INTERRUPT_STATUS ); - }while (intr_status && --retries); + }spin_unlock (hba->host->host_lock);return retval;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 139/214 scsi: ufs: Clean up completed request without interrupt notification
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit b10178ee7fa88b68a9e8adc06534d2605cb0ec23 ]
If somehow no interrupt notification is raised for a completed request and its doorbell bit is cleared by host, UFS driver needs to cleanup its outstanding bit in ufshcd_abort(). Otherwise, system may behave abnormally in the following scenario:
After ufshcd_abort() returns, this request will be requeued by SCSI layer with its outstanding bit set. Any future completed request will trigger ufshcd_transfer_req_compl() to handle all "completed outstanding bits". At this time the "abnormal outstanding bit" will be detected and the "requeued request" will be chosen to execute request post-processing flow. This is wrong because this request is still "alive".
--- drivers/scsi/ufs/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -6140,7 +6140,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)/* command completed already */ dev_err (hba->dev,"%s: cmd at tag %d successfully cleared from DB.\n" , __func__, tag); - goto out; + goto cleanup; }else { dev_err(hba->dev, "%s: no response from device. tag = %d, err %d\n",
@@ -6174,6 +6174,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto out; } +cleanup:scsi_dma_unmap (cmd);spin_lock_irqsave (host->host_lock, flags);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 140/214 scsi: qla2xxx: Fix login timeout
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit abb31aeaa9b20680b0620b23fea5475ea4591e31 ]
Multipath errors were seen during failback due to login timeout. The remote device sent LOGO, the local host tore down the session and did relogin. The RSCN arrived indicates remote device is going through failover after which the relogin is in a 20s timeout phase. At this point the driver is stuck in the relogin process. Add a fix to delete the session as part of abort/flush the login.
--- drivers/scsi/qla2xxx/qla_gs.c | 18 +++++++++++++++--- drivers/scsi/qla2xxx/qla_target.c | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +15 -3
@@ -3673,10 +3673,22 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) }if (fcport->scan_state !=QLA_FCPORT_FOUND ) { +bool do_delete = false; + +if (fcport->scan_needed && + fcport->disc_state ==DSC_LOGIN_PEND ) { +/* Cable got disconnected after we sent +* a login. Do delete to prevent timeout. +*/ + fcport->logout_on_delete =1 ; + do_delete = true; + } + fcport->scan_needed =0 ; -if ((qla_dual_mode_enabled (vha) || -qla_ini_mode_enabled (vha)) && -atomic_read (&fcport->state) ==FCS_ONLINE ) { +if (((qla_dual_mode_enabled (vha) || +qla_ini_mode_enabled (vha)) && +atomic_read (&fcport->state) ==FCS_ONLINE ) || + do_delete) {if (fcport->loop_id !=FC_NO_LOOP_ID ) {if (fcport->flags &FCF_FCP2_DEVICE ) fcport->logout_on_delete =0 ;
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -1262,7 +1262,7 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)qla24xx_chk_fcp_state (sess); -ql_dbg (ql_dbg_tgt, sess->vha,0xe001 , +ql_dbg (ql_dbg_disc, sess->vha,0xe001 ,"Scheduling sess %p for deletion %8phC\n" , sess, sess->port_name);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 141/214 scsi: qla2xxx: Check if FW supports MQ before enabling
In reply to Greg Kroah-HartmanFrom: Saurav Kashyap <[email protected]>
[ Upstream commit dffa11453313a115157b19021cc2e27ea98e624c ]
OS boot during Boot from SAN was stuck at dracut emergency shell after enabling NVMe driver parameter. For non-MQ support the driver was enabling MQ. Add a check to confirm if FW supports MQ.
--- drivers/scsi/qla2xxx/qla_os.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +5 -0
@@ -1993,6 +1993,11 @@ skip_pio:/* Determine queue resources */ ha->max_req_queues = ha->max_rsp_queues =1 ; ha->msix_count =QLA_BASE_VECTORS ; + +/* Check if FW supports MQ or not */ +if (!(ha->fw_attributes &BIT_6 )) + goto mqiobase_exit; +if (!ql2xmqsupport || !ql2xnvmeenable || (!IS_QLA25XX (ha) && !IS_QLA81XX (ha))) goto mqiobase_exit;
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 142/214 scsi: qla2xxx: Fix null pointer access during disconnect from subsystem
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 83949613fac61e8e37eadf8275bf072342302f4e ]
NVMEAsync command is being submitted to QLA while the same NVMe controller is in the middle of reset. The reset path has deleted the association and freed aen_op->fcp_req.private. Add a check for this private pointer before issuing the command.
...
6 [ffffb656ca11fce0] page_fault at ffffffff8c00114e
[exception RIP: qla_nvme_post_cmd+394]
RIP: ffffffffc0d012ba RSP: ffffb656ca11fd98 RFLAGS: 00010206
RAX: ffff8fb039eda228 RBX: ffff8fb039eda200 RCX: 00000000000da161
RDX: ffffffffc0d4d0f0 RSI: ffffffffc0d26c9b RDI: ffff8fb039eda220
RBP: 0000000000000013 R8: ffff8fb47ff6aa80 R9: 0000000000000002
R10: 0000000000000000 R11: ffffb656ca11fdc8 R12: ffff8fb27d04a3b0
R13: ffff8fc46dd98a58 R14: 0000000000000000 R15: ffff8fc4540f0000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 7 [ffffb656ca11fe08] nvme_fc_start_fcp_op at ffffffffc0241568 [nvme_fc] 8 [ffffb656ca11fe50] nvme_fc_submit_async_event at ffffffffc0241901 [nvme_fc] 9 [ffffb656ca11fe68] nvme_async_event_work at ffffffffc014543d [nvme_core]
10 [ffffb656ca11fe98] process_one_work at ffffffff8b6cd437
11 [ffffb656ca11fed8] worker_thread at ffffffff8b6cdcef
12 [ffffb656ca11ff10] kthread at ffffffff8b6d3402
13 [ffffb656ca11ff50] ret_from_fork at ffffffff8c000255
--
PID: 37824 TASK: ffff8fb033063d80 CPU: 20 COMMAND: "kworker/u97:451"
0 [ffffb656ce1abc28] __schedule at ffffffff8be629e3
1 [ffffb656ce1abcc8] schedule at ffffffff8be62fe8
2 [ffffb656ce1abcd0] schedule_timeout at ffffffff8be671ed
3 [ffffb656ce1abd70] wait_for_completion at ffffffff8be639cf
4 [ffffb656ce1abdd0] flush_work at ffffffff8b6ce2d5
5 [ffffb656ce1abe70] nvme_stop_ctrl at ffffffffc0144900 [nvme_core] 6 [ffffb656ce1abe80] nvme_fc_reset_ctrl_work at ffffffffc0243445 [nvme_fc] 7 [ffffb656ce1abe98] process_one_work at ffffffff8b6cd437
8 [ffffb656ce1abed8] worker_thread at ffffffff8b6cdb50
9 [ffffb656ce1abf10] kthread at ffffffff8b6d3402
10 [ffffb656ce1abf50] ret_from_fork at ffffffff8c000255
--- drivers/scsi/qla2xxx/qla_nvme.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/qla2xxx/qla_nvme.c +5 -0
@@ -535,6 +535,11 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,struct nvme_private *priv = fd->private;struct qla_nvme_rport *qla_rport = rport->private; +if (!priv) { +/* nvme association has been torn down */ +return rval; + } + fcport = qla_rport->fcport; if (!qpair || !fcport || (qpair && !qpair->fw_started) ||
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 143/214 Revert "scsi: qla2xxx: Fix crash on qla2x00_mailbox_command"
In reply to Greg Kroah-HartmanFrom: Saurav Kashyap <[email protected]>
[ Upstream commit de7e6194301ad31c4ce95395eb678e51a1b907e5 ]
FCoE adapter initialization failed for ISP8021 with the following patch applied. In addition, reproduction of the issue the patch originally tried to address has been unsuccessful.
This reverts commit 3cb182b3fa8b7a61f05c671525494697cba39c6a.
--- drivers/scsi/qla2xxx/qla_mbx.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +0 -8
@@ -335,14 +335,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if (time_after (jiffies, wait_time))break ; -/* -* Check if it's UNLOADING, cause we cannot poll in -* this case, or else a NULL pointer dereference -* is triggered. -*/ -if (unlikely (test_bit (UNLOADING , &base_vha->dpc_flags))) -return QLA_FUNCTION_TIMEOUT ; -/* Check for pending interrupts. */ qla2x00_poll (ha->rsp_q_map[0 ]);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 144/214 macvlan: validate setting of multiple remote source MAC addresses
In reply to Greg Kroah-HartmanFrom: Alvin Šipraga <[email protected]>
[ Upstream commit 8b61fba503904acae24aeb2bd5569b4d6544d48f ]
Remote source MAC addresses can be set on a 'source mode' macvlan interface via the IFLA_MACVLAN_MACADDR_DATA attribute. This commit tightens the validation of these MAC addresses to match the validation already performed when setting or adding a single MAC address via the IFLA_MACVLAN_MACADDR attribute.
iproute2 uses IFLA_MACVLAN_MACADDR_DATA for its 'macvlan macaddr set' command, and IFLA_MACVLAN_MACADDR for its 'macvlan macaddr add' command, which demonstrates the inconsistent behaviour that this commit addresses:
# ip link add link eth0 name macvlan0 type macvlan mode source
# ip link set link dev macvlan0 type macvlan macaddr add 01:00:00:00:00:00
RTNETLINK answers: Cannot assign requested address
# ip link set link dev macvlan0 type macvlan macaddr set 01:00:00:00:00:00
# ip -d link show macvlan0
5: macvlan0@eth0: <BROADCAST,MULTICAST,DYNAMIC,UP,LOWER_UP> mtu 1500 ...
link/ether 2e:ac:fd:2d:69:f8 brd ff:ff:ff:ff:ff:ff promiscuity 0
macvlan mode source remotes (1) 01:00:00:00:00:00 numtxqueues 1 ...With this change, the 'set' command will (rightly) fail in the same way as the 'add' command.
--- drivers/net/macvlan.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/net/macvlan.c +17 -4
@@ -1259,6 +1259,9 @@ static void macvlan_port_destroy(struct net_device *dev)static int macvlan_validate (struct nlattr *tb[],struct nlattr *data[],struct netlink_ext_ack *extack) { +struct nlattr *nla, *head; +int rem, len; +if (tb[IFLA_ADDRESS ]) {if (nla_len (tb[IFLA_ADDRESS ]) !=ETH_ALEN )return -EINVAL ;
@@ -1306,6 +1309,20 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[],return -EADDRNOTAVAIL ; } +if (data[IFLA_MACVLAN_MACADDR_DATA ]) { + head =nla_data (data[IFLA_MACVLAN_MACADDR_DATA ]); + len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]); + +nla_for_each_attr (nla, head, len, rem) { +if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || +nla_len (nla) !=ETH_ALEN ) +return -EINVAL ; + +if (!is_valid_ether_addr (nla_data (nla))) +return -EADDRNOTAVAIL ; + } + } +if (data[IFLA_MACVLAN_MACADDR_COUNT ])return -EINVAL ;
@@ -1362,10 +1379,6 @@ static int macvlan_changelink_sources(struct macvlan_dev *vlan, u32 mode, len =nla_len (data[IFLA_MACVLAN_MACADDR_DATA ]);nla_for_each_attr (nla, head, len, rem) { -if (nla_type (nla) !=IFLA_MACVLAN_MACADDR || -nla_len (nla) !=ETH_ALEN ) -continue ; - addr =nla_data (nla); ret =macvlan_hash_add_source (vlan, addr);if (ret)
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 145/214 net: gianfar: Add of_node_put() before goto statement
In reply to Greg Kroah-HartmanFrom: Sumera Priyadarsini <[email protected]>
[ Upstream commit 989e4da042ca4a56bbaca9223d1a93639ad11e17 ]
Every iteration of for_each_available_child_of_node() decrements reference count of the previous node, however when control is transferred from the middle of the loop, as in the case of a return or break or goto, there is no decrement thus ultimately resulting in a memory leak.
Fix a potential memory leak in gianfar.c by inserting of_node_put() before the goto statement.
Issue found with Coccinelle.
--- drivers/net/ethernet/freescale/gianfar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/gianfar.c +3 -1
@@ -751,8 +751,10 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)continue ; err =gfar_parse_group (child, priv, model); -if (err) +if (err) { +of_node_put (child); goto err_grp_init; + } } }else {/* SQ_SG_MODE */ err =gfar_parse_group (np, priv, model);
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 146/214 powerpc/perf: Fix soft lockups due to missed interrupt accounting
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 17899eaf88d689529b866371344c8f269ba79b5f ]
Performance monitor interrupt handler checks if any counter has overflown and calls record_and_restart() in core-book3s which invokes perf_event_overflow() to record the sample information. Apart from creating sample, perf_event_overflow() also does the interrupt and period checks via perf_event_account_interrupt().
Currently we record information only if the SIAR (Sampled Instruction Address Register) valid bit is set (using siar_valid() check) and hence the interrupt check.
But it is possible that we do sampling for some events that are not generating valid SIAR, and hence there is no chance to disable the event if interrupts are more than max_samples_per_tick. This leads to soft lockup.
Fix this by adding perf_event_account_interrupt() in the invalid SIAR code path for a sampling event. ie if SIAR is invalid, just do interrupt check and don't record the sample information.
--- arch/powerpc/perf/core-book3s.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/perf/core-book3s.c +4 -0
@@ -2106,6 +2106,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val,if (perf_event_overflow (event, &data, regs))power_pmu_stop (event,0 ); + }else if (period) { +/* Account for interrupt in case of invalid SIAR */ +if (perf_event_account_interrupt (event)) +power_pmu_stop (event,0 ); } }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 147/214 arm64: Move handling of erratum 1418040 into C code
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit d49f7d7376d0c0daf8680984a37bd07581ac7d38 ]
Instead of dealing with erratum 1418040 on each entry and exit, let's move the handling to __switch_to() instead, which has several advantages:
- It can be applied when it matters (switching between 32 and 64 bit tasks).
- It is written in C (yay!)
- It can rely on static keys rather than alternatives
--- arch/arm64/kernel/process.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
arch/arm64/kernel/process.c +34 -0
@@ -498,6 +498,39 @@ static void entry_task_switch(struct task_struct *next)__this_cpu_write (__entry_task, next); } +/* +* ARM erratum 1418040 handling, affecting the 32bit view of CNTVCT. +* Assuming the virtual counter is enabled at the beginning of times: +* +* - disable access when switching from a 64bit task to a 32bit task +* - enable access when switching from a 32bit task to a 64bit task +*/ +static void erratum_1418040_thread_switch (struct task_struct *prev, +struct task_struct *next) +{ +bool prev32, next32; +u64 val; + +if (!(IS_ENABLED (CONFIG_ARM64_ERRATUM_1418040 ) && +cpus_have_const_cap (ARM64_WORKAROUND_1418040 ))) +return ; + + prev32 =is_compat_thread (task_thread_info (prev)); + next32 =is_compat_thread (task_thread_info (next)); + +if (prev32 == next32) +return ; + + val =read_sysreg (cntkctl_el1); + +if (!next32) + val |=ARCH_TIMER_USR_VCT_ACCESS_EN ; +else + val &= ~ARCH_TIMER_USR_VCT_ACCESS_EN ; + +write_sysreg (val, cntkctl_el1); +} +/* * Thread switching. */
@@ -514,6 +547,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,uao_thread_switch (next);ptrauth_thread_switch (next);ssbs_thread_switch (next); +erratum_1418040_thread_switch (prev, next);/* * Complete any pending TLB or cache maintenance on this CPU in case
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 148/214 arm64: Allow booting of late CPUs affected by erratum 1418040
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit bf87bb0881d0f59181fe3bbcf29c609f36483ff8 ]
As we can now switch from a system that isn't affected by 1418040 to a system that globally is affected, let's allow affected CPUs to come in at a later time.
--- arch/arm64/kernel/cpu_errata.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kernel/cpu_errata.c +2 -0
@@ -917,6 +917,8 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .desc = "ARM erratum 1418040", .capability =ARM64_WORKAROUND_1418040 ,ERRATA_MIDR_RANGE_LIST (erratum_1418040_list), + .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU ), }, #endif #ifdef CONFIG_ARM64_ERRATUM_1165522
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerPATCH 149/214 block: fix get_max_io_size()
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
commit e4b469c66f3cbb81c2e94d31123d7bcdf3c1dabd upstream.
A previous commit aligning splits to physical block sizes inadvertently modified one return case such that that it now returns 0 length splits when the number of sectors doesn't exceed the physical offset. This later hits a BUG in bio_split(). Restore the previous working behavior.
--- block/blk-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-merge.c +1 -1
@@ -154,7 +154,7 @@ static inline unsigned get_max_io_size(sif (max_sectors > start_offset)return max_sectors - start_offset; -return sectors & (lbs -1 ); +return sectors & ~(lbs -1 ); } static inline unsigned get_max_segment_size(const struct request_queue *q,
Greg Kroah-Hartman
maintainerPATCH 150/214 block: loop: set discard granularity and alignment for block device backed loop
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit bcb21c8cc9947286211327d663ace69f07d37a76 upstream.
In case of block device backend, if the backend supports write zeros, the loop device will set queue flag of QUEUE_FLAG_DISCARD. However, limits.discard_granularity isn't setup, and this way is wrong, see the following description in Documentation/ABI/testing/sysfs-block:
A discard_granularity of 0 means that the device does not support discard functionality.
Especially 9b15d109a6b2 ("block: improve discard bio alignment in __blkdev_issue_discard()") starts to take q->limits.discard_granularity for computing max discard sectors. And zero discard granularity may cause kernel oops, or fail discard request even though the loop queue claims discard support via QUEUE_FLAG_DISCARD.
Fix the issue by setup discard granularity and alignment.
--- drivers/block/loop.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/block/loop.c +18 -15
@@ -863,6 +863,7 @@ static void loop_config_discard(struct lstruct file *file = lo->lo_backing_file;struct inode *inode = file->f_mapping->host;struct request_queue *q = lo->lo_queue; +u32 granularity, max_discard_sectors;/* * If the backing device is a block device, mirror its zeroing
@@ -875,11 +876,10 @@ static void loop_config_discard(struct lstruct request_queue *backingq; backingq =bdev_get_queue (inode->i_bdev); -blk_queue_max_discard_sectors (q, - backingq->limits.max_write_zeroes_sectors); -blk_queue_max_write_zeroes_sectors (q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: +queue_physical_block_size (backingq);/* * We use punch hole to reclaim the free space used by the
@@ -888,23 +888,26 @@ static void loop_config_discard(struct l* useful information. */ }else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity =0 ; - q->limits.discard_alignment =0 ; -blk_queue_max_discard_sectors (q,0 ); -blk_queue_max_write_zeroes_sectors (q,0 ); + max_discard_sectors =0 ; + granularity =0 ; }else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment =0 ; - -blk_queue_max_discard_sectors (q,UINT_MAX >>9 ); -blk_queue_max_write_zeroes_sectors (q,UINT_MAX >>9 ); + max_discard_sectors =UINT_MAX >>9 ; + granularity = inode->i_sb->s_blocksize; } -if (q->limits.max_write_zeroes_sectors) +if (max_discard_sectors) { + q->limits.discard_granularity = granularity; +blk_queue_max_discard_sectors (q, max_discard_sectors); +blk_queue_max_write_zeroes_sectors (q, max_discard_sectors);blk_queue_flag_set (QUEUE_FLAG_DISCARD , q); -else + }else { + q->limits.discard_granularity =0 ; +blk_queue_max_discard_sectors (q,0 ); +blk_queue_max_write_zeroes_sectors (q,0 );blk_queue_flag_clear (QUEUE_FLAG_DISCARD , q); + } + q->limits.discard_alignment =0 ; }static void loop_unprepare_queue (struct loop_device *lo)
Greg Kroah-Hartman
maintainerPATCH 151/214 HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit eef4016243e94c438f177ca8226876eb873b9c75 upstream.
Before this commit i2c_hid_parse() consists of the following steps:
1. Send power on cmd
2. usleep_range(1000, 5000)
3. Send reset cmd
4. Wait for reset to complete (device interrupt, or msleep(100))
5. Send power on cmd
6. Try to read HID descriptor
Notice how there is an usleep_range(1000, 5000) after the first power-on command, but not after the second power-on command.
Testing has shown that at least on the BMAX Y13 laptop's i2c-hid touchpad, not having a delay after the second power-on command causes the HID descriptor to read as all zeros.
In case we hit this on other devices too, the descriptor being all zeros can be recognized by the following message being logged many, many times:
hid-generic 0018:0911:5288.0002: unknown main item tag 0x0
At the same time as the BMAX Y13's touchpad issue was debugged, Kai-Heng was working on debugging some issues with Goodix i2c-hid touchpads. It turns out that these need a delay after a PWR_ON command too, otherwise they stop working after a suspend/resume cycle. According to Goodix a delay of minimal 60ms is needed.
Having multiple cases where we need a delay after sending the power-on command, seems to indicate that we should always sleep after the power-on command.
This commit fixes the mentioned issues by moving the existing 1ms sleep to the i2c_hid_set_power() function and changing it to a 60ms sleep.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +13 -9
@@ -422,6 +422,19 @@ static int i2c_hid_set_power(struct i2c_dev_err (&client->dev,"failed to change power setting.\n" ); set_pwr_exit: + +/* +* The HID over I2C specification states that if a DEVICE needs time +* after the PWR_ON request, it should utilise CLOCK stretching. +* However, it has been observered that the Windows driver provides a +* 1ms sleep between the PWR_ON and RESET requests. +* According to Goodix Windows even waits 60 ms after (other?) +* PWR_ON requests. Testing has confirmed that several devices +* will not work properly without a delay after a PWR_ON request. +*/ +if (!ret && power_state ==I2C_HID_PWR_ON ) +msleep (60 ); +return ret; }
@@ -443,15 +456,6 @@ static int i2c_hid_hwreset(struct i2c_clif (ret) goto out_unlock; -/* -* The HID over I2C specification states that if a DEVICE needs time -* after the PWR_ON request, it should utilise CLOCK stretching. -* However, it has been observered that the Windows driver provides a -* 1ms sleep between the PWR_ON and RESET requests and that some devices -* rely on this. -*/ -usleep_range (1000 ,5000 ); -i2c_hid_dbg (ihid,"resetting...\n" ); ret =i2c_hid_command (client, &hid_reset_cmd,NULL ,0 );
Greg Kroah-Hartman
maintainerPATCH 152/214 blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit d7d8535f377e9ba87edbf7fbbd634ac942f3f54f upstream.
SCHED_RESTART code path is relied to re-run queue for dispatch requests in hctx->dispatch. Meantime the SCHED_RSTART flag is checked when adding requests to hctx->dispatch.
memory barriers have to be used for ordering the following two pair of OPs:
1) adding requests to hctx->dispatch and checking SCHED_RESTART in blk_mq_dispatch_rq_list()
2) clearing SCHED_RESTART and checking if there is request in hctx->dispatch in blk_mq_sched_restart().
Without the added memory barrier, either:
1) blk_mq_sched_restart() may miss requests added to hctx->dispatch meantime blk_mq_dispatch_rq_list() observes SCHED_RESTART, and not run queue in dispatch side
or
2) blk_mq_dispatch_rq_list still sees SCHED_RESTART, and not run queue in dispatch side, meantime checking if there is request in hctx->dispatch from blk_mq_sched_restart() is missed.
IO hang in ltp/fs_fill test is reported by kernel test robot:
https://lkml.org/lkml/2020/7/26/77
Turns out it is caused by the above out-of-order OPs. And the IO hang can't be observed any more after applying this patch.
--- block/blk-mq-sched.c | 9 +++++++++ block/blk-mq.c | 9 +++++++++ 2 files changed, 18 insertions(+)
block/blk-mq-sched.c +9 -0
@@ -77,6 +77,15 @@ void blk_mq_sched_restart(struct blk_mq_return ;clear_bit (BLK_MQ_S_SCHED_RESTART , &hctx->state); +/* +* Order clearing SCHED_RESTART and list_empty_careful(&hctx->dispatch) +* in blk_mq_run_hw_queue(). Its pair is the barrier in +* blk_mq_dispatch_rq_list(). So dispatch code won't see SCHED_RESTART, +* meantime new request added to hctx->dispatch is missed to check in +* blk_mq_run_hw_queue(). +*/ +smp_mb (); +blk_mq_run_hw_queue (hctx, true); }
block/blk-mq.c +9 -0
@@ -1319,6 +1319,15 @@ bool blk_mq_dispatch_rq_list(struct requspin_unlock (&hctx->lock);/* +* Order adding requests to hctx->dispatch and checking +* SCHED_RESTART flag. The pair of this smp_mb() is the one +* in blk_mq_sched_restart(). Avoid restart code path to +* miss the new added requests to hctx->dispatch, meantime +* SCHED_RESTART is observed here. +*/ +smp_mb (); + +/* * If SCHED_RESTART was set by the caller of this function and * it is no longer set that means that it was cleared by another * thread and hence that a queue rerun is needed.
Greg Kroah-Hartman
maintainerPATCH 153/214 btrfs: reset compression level for lzo on remount
In reply to Greg Kroah-HartmanFrom: Marcos Paulo de Souza <[email protected]>
commit 282dd7d7718444679b046b769d872b188818ca35 upstream.
Currently a user can set mount "-o compress" which will set the compression algorithm to zlib, and use the default compress level for zlib (3):
relatime,compress=zlib:3,space_cache
If the user remounts the fs using "-o compress=lzo", then the old compress_level is used:
relatime,compress=lzo:3,space_cache
But lzo does not expose any tunable compression level. The same happens if we set any compress argument with different level, also with zstd.
Fix this by resetting the compress_level when compress=lzo is specified. With the fix applied, lzo is shown without compress level:
relatime,compress=lzo,space_cache
--- fs/btrfs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/super.c +1 -0
@@ -544,6 +544,7 @@ int btrfs_parse_options(struct btrfs_fs_ }else if (strncmp (args[0 ].from,"lzo" ,3 ) ==0 ) { compress_type ="lzo" ; info->compress_type =BTRFS_COMPRESS_LZO ; + info->compress_level =0 ;btrfs_set_opt (info->mount_opt,COMPRESS );btrfs_clear_opt (info->mount_opt,NODATACOW );btrfs_clear_opt (info->mount_opt,NODATASUM );
Greg Kroah-Hartman
maintainerPATCH 154/214 btrfs: check the right error variable in btrfs_del_dir_entries_in_log
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit fb2fecbad50964b9f27a3b182e74e437b40753ef upstream.
With my new locking code dbench is so much faster that I tripped over a transaction abort from ENOSPC. This turned out to be because btrfs_del_dir_entries_in_log was checking for ret == -ENOSPC, but this function sets err on error, and returns err. So instead of properly marking the inode as needing a full commit, we were returning -ENOSPC and aborting in __btrfs_unlink_inode. Fix this by checking the proper variable so that we return the correct thing in the case of ENOSPC.
The ENOENT needs to be checked, because btrfs_lookup_dir_item_index() can return -ENOENT if the dir item isn't in the tree log (which would happen if we hadn't fsync'ed this guy). We actually handle that case in __btrfs_unlink_inode, so it's an expected error to get back.
--- fs/btrfs/tree-log.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/btrfs/tree-log.c +6 -4
@@ -3473,11 +3473,13 @@ fail:btrfs_free_path (path); out_unlock:mutex_unlock (&dir->log_mutex); -if (ret == -ENOSPC ) { +if (err == -ENOSPC ) {btrfs_set_log_full_commit (trans); - ret =0 ; - }else if (ret <0 ) -btrfs_abort_transaction (trans, ret); + err =0 ; + }else if (err <0 && err != -ENOENT ) { +/* ENOENT can be returned if the entry hasn't been fsynced yet */ +btrfs_abort_transaction (trans, err); + }btrfs_end_log_trans (root);
Greg Kroah-Hartman
maintainerPATCH 155/214 btrfs: fix space cache memory leak after transaction abort
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit bbc37d6e475eee8ffa2156ec813efc6bbb43c06d upstream.
If a transaction aborts it can cause a memory leak of the pages array of a block group's io_ctl structure. The following steps explain how that can happen:
1) Transaction N is committing, currently in state TRANS_STATE_UNBLOCKED and it's about to start writing out dirty extent buffers;
2) Transaction N + 1 already started and another task, task A, just called btrfs_commit_transaction() on it;
3) Block group B was dirtied (extents allocated from it) by transaction N + 1, so when task A calls btrfs_start_dirty_block_groups(), at the very beginning of the transaction commit, it starts writeback for the block group's space cache by calling btrfs_write_out_cache(), which allocates the pages array for the block group's io_ctl with a call to io_ctl_init(). Block group A is added to the io_list of transaction N + 1 by btrfs_start_dirty_block_groups();
4) While transaction N's commit is writing out the extent buffers, it gets an IO error and aborts transaction N, also setting the file system to RO mode;
5) Task A has already returned from btrfs_start_dirty_block_groups(), is at btrfs_commit_transaction() and has set transaction N + 1 state to TRANS_STATE_COMMIT_START. Immediately after that it checks that the filesystem was turned to RO mode, due to transaction N's abort, and jumps to the "cleanup_transaction" label. After that we end up at btrfs_cleanup_one_transaction() which calls btrfs_cleanup_dirty_bgs(). That helper finds block group B in the transaction's io_list but it never releases the pages array of the block group's io_ctl, resulting in a memory leak.
In fact at the point when we are at btrfs_cleanup_dirty_bgs(), the pages array points to pages that were already released by us at __btrfs_write_out_cache() through the call to io_ctl_drop_pages(). We end up freeing the pages array only after waiting for the ordered extent to complete through btrfs_wait_cache_io(), which calls io_ctl_free() to do that. But in the transaction abort case we don't wait for the space cache's ordered extent to complete through a call to btrfs_wait_cache_io(), so that's why we end up with a memory leak - we wait for the ordered extent to complete indirectly by shutting down the work queues and waiting for any jobs in them to complete before returning from close_ctree().
We can solve the leak simply by freeing the pages array right after releasing the pages (with the call to io_ctl_drop_pages()) at __btrfs_write_out_cache(), since we will never use it anymore after that and the pages array points to already released pages at that point, which is currently not a problem since no one will use it after that, but not a good practice anyway since it can easily lead to use-after-free issues.
So fix this by freeing the pages array right after releasing the pages at __btrfs_write_out_cache().
This issue can often be reproduced with test case generic/475 from fstests and kmemleak can detect it and reports it with the following trace:
unreferenced object 0xffff9bbf009fa600 (size 512):
comm "fsstress", pid 38807, jiffies 4298504428 (age 22.028s) hex dump (first 32 bytes):
00 a0 7c 4d 3d ed ff ff 40 a0 7c 4d 3d ed ff ff ..|M=...@.|M=...
80 a0 7c 4d 3d ed ff ff c0 a0 7c 4d 3d ed ff ff ..|M=.....|M=...
backtrace:
[<00000000f4b5cfe2>] __kmalloc+0x1a8/0x3e0
[<0000000028665e7f>] io_ctl_init+0xa7/0x120 [btrfs]
[<00000000a1f95b2d>] __btrfs_write_out_cache+0x86/0x4a0 [btrfs]
[<00000000207ea1b0>] btrfs_write_out_cache+0x7f/0xf0 [btrfs]
[<00000000af21f534>] btrfs_start_dirty_block_groups+0x27b/0x580 [btrfs]
[<00000000c3c23d44>] btrfs_commit_transaction+0xa6f/0xe70 [btrfs]
[<000000009588930c>] create_subvol+0x581/0x9a0 [btrfs]
[<000000009ef2fd7f>] btrfs_mksubvol+0x3fb/0x4a0 [btrfs]
[<00000000474e5187>] __btrfs_ioctl_snap_create+0x119/0x1a0 [btrfs]
[<00000000708ee349>] btrfs_ioctl_snap_create_v2+0xb0/0xf0 [btrfs]
[<00000000ea60106f>] btrfs_ioctl+0x12c/0x3130 [btrfs]
[<000000005c923d6d>] __x64_sys_ioctl+0x83/0xb0
[<0000000043ace2c9>] do_syscall_64+0x33/0x80
[<00000000904efbce>] entry_SYSCALL_64_after_hwframe+0x44/0xa9--- fs/btrfs/disk-io.c | 1 + fs/btrfs/free-space-cache.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +1 -0
@@ -4477,6 +4477,7 @@ static void btrfs_cleanup_bg_io(struct b cache->io_ctl.inode =NULL ;iput (inode); } +ASSERT (cache->io_ctl.pages ==NULL );btrfs_put_block_group (cache); }
fs/btrfs/free-space-cache.c +1 -1
@@ -1166,7 +1166,6 @@ static int __btrfs_wait_cache_io(struct ret =update_cache_item (trans, root, inode, path, offset, io_ctl->entries, io_ctl->bitmaps); out: -io_ctl_free (io_ctl);if (ret) {invalidate_inode_pages2 (inode->i_mapping);BTRFS_I (inode)->generation =0 ;
@@ -1329,6 +1328,7 @@ static int __btrfs_write_out_cache(struc* them out later */ io_ctl_drop_pages (io_ctl); +io_ctl_free (io_ctl);unlock_extent_cached (&BTRFS_I (inode)->io_tree,0 ,i_size_read (inode) -1 , &cached_state);
Greg Kroah-Hartman
maintainerPATCH 156/214 btrfs: detect nocow for swap after snapshot delete
In reply to Greg Kroah-HartmanFrom: Boris Burkov <[email protected]>
commit a84d5d429f9eb56f81b388609841ed993f0ddfca upstream.
can_nocow_extent and btrfs_cross_ref_exist both rely on a heuristic for detecting a must cow condition which is not exactly accurate, but saves unnecessary tree traversal. The incorrect assumption is that if the extent was created in a generation smaller than the last snapshot generation, it must be referenced by that snapshot. That is true, except the snapshot could have since been deleted, without affecting the last snapshot generation.
The original patch claimed a performance win from this check, but it also leads to a bug where you are unable to use a swapfile if you ever snapshotted the subvolume it's in. Make the check slower and more strict for the swapon case, without modifying the general cow checks as a compromise. Turning swap on does not seem to be a particularly performance sensitive operation, so incurring a possibly unnecessary btrfs_search_slot seems worthwhile for the added usability.
Note: Until the snapshot is competely cleaned after deletion, check_committed_refs will still cause the logic to think that cow is necessary, so the user must until 'btrfs subvolu sync' finished before activating the swapfile swapon.
--- fs/btrfs/ctree.h | 4 ++-- fs/btrfs/extent-tree.c | 17 +++++++++++------ fs/btrfs/file.c | 2 +- fs/btrfs/inode.c | 16 +++++++++------- 4 files changed, 23 insertions(+), 16 deletions(-)
fs/btrfs/ctree.h +2 -2
@@ -2415,7 +2415,7 @@ int btrfs_pin_extent_for_log_replay(stru u64 bytenr, u64 num_bytes);int btrfs_exclude_logged_extents (struct extent_buffer *eb);int btrfs_cross_ref_exist (struct btrfs_root *root, -u64 objectid,u64 offset,u64 bytenr); +u64 objectid,u64 offset,u64 bytenr,bool strict); struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 parent, u64 root_objectid,
@@ -2821,7 +2821,7 @@ struct extent_map *btrfs_get_extent_fiem u64 start, u64 len); noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,u64 *orig_start,u64 *orig_block_len, -u64 *ram_bytes); +u64 *ram_bytes,bool strict);void __btrfs_del_delalloc_inode (struct btrfs_root *root,struct btrfs_inode *inode);
fs/btrfs/extent-tree.c +11 -6
@@ -2320,7 +2320,8 @@ static noinline int check_delayed_ref(st static noinline int check_committed_ref(struct btrfs_root *root,struct btrfs_path *path, -u64 objectid,u64 offset,u64 bytenr) +u64 objectid,u64 offset,u64 bytenr, +bool strict) {struct btrfs_fs_info *fs_info = root->fs_info;struct btrfs_root *extent_root = fs_info->extent_root;
@@ -2362,9 +2363,13 @@ static noinline int check_committed_ref( btrfs_extent_inline_ref_size(BTRFS_EXTENT_DATA_REF_KEY)) goto out; -/* If extent created before last snapshot => it's definitely shared */ -if (btrfs_extent_generation (leaf, ei) <= -btrfs_root_last_snapshot (&root->root_item)) +/* +* If extent created before last snapshot => it's shared unless the +* snapshot has been deleted. Use the heuristic if strict is false. +*/ +if (!strict && + (btrfs_extent_generation (leaf, ei) <= +btrfs_root_last_snapshot (&root->root_item))) goto out; iref = (struct btrfs_extent_inline_ref *)(ei +1 );
@@ -2389,7 +2394,7 @@ out: }int btrfs_cross_ref_exist (struct btrfs_root *root,u64 objectid,u64 offset, -u64 bytenr) +u64 bytenr,bool strict) {struct btrfs_path *path;int ret;
@@ -2400,7 +2405,7 @@ int btrfs_cross_ref_exist(struct btrfs_r do { ret = check_committed_ref(root, path, objectid, - offset, bytenr); + offset, bytenr, strict); if (ret && ret != -ENOENT) goto out;
fs/btrfs/file.c +1 -1
@@ -1568,7 +1568,7 @@ static noinline int check_can_nocow(stru num_bytes = lockend - lockstart +1 ; ret =can_nocow_extent (&inode->vfs_inode, lockstart, &num_bytes, -NULL ,NULL ,NULL ); +NULL ,NULL ,NULL , false);if (ret <=0 ) { ret =0 ;btrfs_end_write_no_snapshotting (root);
fs/btrfs/inode.c +9 -7
@@ -1578,7 +1578,7 @@ next_slot: goto out_check; ret =btrfs_cross_ref_exist (root, ino, found_key.offset - - extent_offset, disk_bytenr); + extent_offset, disk_bytenr, false);if (ret) {/* * ret could be -EIO if the above fails to read
@@ -7529,7 +7529,7 @@ static struct extent_map *btrfs_new_exte*/ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,u64 *orig_start,u64 *orig_block_len, -u64 *ram_bytes) +u64 *ram_bytes,bool strict) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_path *path;
@@ -7607,8 +7607,9 @@ noinline int can_nocow_extent(struct ino* Do the same check as in btrfs_cross_ref_exist but without the * unnecessary search. */ -if (btrfs_file_extent_generation (leaf, fi) <= -btrfs_root_last_snapshot (&root->root_item)) +if (!strict && + (btrfs_file_extent_generation (leaf, fi) <= +btrfs_root_last_snapshot (&root->root_item))) goto out; backref_offset =btrfs_file_extent_offset (leaf, fi);
@@ -7644,7 +7645,8 @@ noinline int can_nocow_extent(struct ino*/ ret =btrfs_cross_ref_exist (root,btrfs_ino (BTRFS_I (inode)), - key.offset - backref_offset, disk_bytenr); + key.offset - backref_offset, disk_bytenr, + strict);if (ret) { ret =0 ; goto out;
@@ -7865,7 +7867,7 @@ static int btrfs_get_blocks_direct_write block_start = em->block_start + (start - em->start);if (can_nocow_extent (inode, start, &len, &orig_start, - &orig_block_len, &ram_bytes) ==1 && + &orig_block_len, &ram_bytes, false) ==1 &&btrfs_inc_nocow_writers (fs_info, block_start)) {struct extent_map *em2;
@@ -11030,7 +11032,7 @@ static int btrfs_swap_activate(struct swfree_extent_map (em); em =NULL ; - ret =can_nocow_extent (inode, start, &len,NULL ,NULL ,NULL ); + ret =can_nocow_extent (inode, start, &len,NULL ,NULL ,NULL , true);if (ret <0 ) { goto out; }else if (ret) {