5.18.8-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainerPATCH 71/181 perf test topology: Use !strncmp(right platform) to fix guest PPC comparision check
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit b236371421df57b93fc49c4b9d0e53bd1aab2b2e ]
commit cfd7092c31aed728 ("perf test session topology: Fix test to skip the test in guest environment") added check to skip the testcase if the socket_id can't be fetched from topology info.
But the condition check uses strncmp which should be changed to !strncmp and to correctly match platform.
Fix this condition check.
--- tools/perf/tests/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/topology.c +1 -1
@@ -115,7 +115,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)* physical_package_id will be set to -1. Hence skip this * test if physical_package_id returns -1 for cpu from perf_cpu_map. */ -if (strncmp (session->header.env.arch,"powerpc" ,7 )) { +if (!strncmp (session->header.env.arch,"ppc64le" ,7 )) {if (cpu__get_socket_id (perf_cpu_map__cpu (map,0 )) ==-1 )return TEST_SKIP ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/181 perf arm-spe: Dont set data source if its not a memory operation
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit 51ba539f5bdb5a8cc7b1dedd5e73ac54564a7602 ]
Except for memory load and store operations, ARM SPE records also can support other operation types, bug when set the data source field the current code assumes a record is a either load operation or store operation, this leads to wrongly synthesize memory samples.
This patch strictly checks the record operation type, it only sets data source only for the operation types ARM_SPE_LD and ARM_SPE_ST, otherwise, returns zero for data source. Therefore, we can synthesize memory samples only when data source is a non-zero value, the function arm_spe__is_memory_event() is useless and removed.
--- tools/perf/util/arm-spe.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
tools/perf/util/arm-spe.c +8 -14
@@ -387,26 +387,16 @@ static int arm_spe__synth_instruction_sample(struct arm_spe_queue *speq,return arm_spe_deliver_synth_event (spe, speq, event, &sample); } -#define SPE_MEM_TYPE (ARM_SPE_L1D_ACCESS | ARM_SPE_L1D_MISS | \ - ARM_SPE_LLC_ACCESS | ARM_SPE_LLC_MISS | \ - ARM_SPE_REMOTE_ACCESS) - -static bool arm_spe__is_memory_event (enum arm_spe_sample_type type) -{ -if (type &SPE_MEM_TYPE ) -return true; - -return false; -} -static u64 arm_spe__synth_data_source (const struct arm_spe_record *record) {union perf_mem_data_src data_src = {0 };if (record->op ==ARM_SPE_LD ) data_src.mem_op =PERF_MEM_OP_LOAD ; -else +else if (record->op ==ARM_SPE_ST ) data_src.mem_op =PERF_MEM_OP_STORE ; +else +return 0 ;if (record->type & (ARM_SPE_LLC_ACCESS |ARM_SPE_LLC_MISS )) { data_src.mem_lvl =PERF_MEM_LVL_L3 ;
@@ -510,7 +500,11 @@ static int arm_spe_sample(struct arm_spe_queue *speq)return err; } -if (spe->sample_memory &&arm_spe__is_memory_event (record->type)) { +/* +* When data_src is zero it means the record is not a memory operation, +* skip to synthesize memory sample for this case. +*/ +if (spe->sample_memory && data_src) { err =arm_spe__synth_mem_sample (speq, spe->memory_id, data_src);if (err)return err;
Signature · 9 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 14/181 9p: Fix refcounting during full path walks for fid lookups
In reply to Greg Kroah-HartmanFrom: Tyler Hicks <[email protected]>
commit 2a3dcbccd64ba35c045fac92272ff981c4cbef44 upstream.
Decrement the refcount of the parent dentry's fid after walking each path component during a full path walk for a lookup. Failure to do so can lead to fids that are not clunked until the filesystem is unmounted, as indicated by this warning:
9pnet: found fid 3 not clunked
The improper refcounting after walking resulted in open(2) returning -EIO on any directories underneath the mount point when using the virtio transport. When using the fd transport, there's no apparent issue until the filesytem is unmounted and the warning above is emitted to the logs.
In some cases, the user may not yet be attached to the filesystem and a new root fid, associated with the user, is created and attached to the root dentry before the full path walk is performed. Increment the new root fid's refcount to two in that situation so that it can be safely decremented to one after it is used for the walk operation. The new fid will still be attached to the root dentry when v9fs_fid_lookup_with_uid() returns so a final refcount of one is correct/expected.
--- fs/9p/fid.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
fs/9p/fid.c +9 -13
@@ -152,7 +152,7 @@ static struct p9_fid *v9fs_fid_lookup_wiconst unsigned char **wnames, *uname;int i, n, l, clone, access;struct v9fs_session_info *v9ses; -struct p9_fid *fid, *old_fid =NULL ; +struct p9_fid *fid, *old_fid; v9ses =v9fs_dentry2v9ses (dentry); access = v9ses->flags &V9FS_ACCESS_MASK ;
@@ -194,13 +194,12 @@ static struct p9_fid *v9fs_fid_lookup_wiif (IS_ERR (fid))return fid; +refcount_inc (&fid->count);v9fs_fid_add (dentry->d_sb->s_root, fid); }/* If we are root ourself just return that */ -if (dentry->d_sb->s_root == dentry) { -refcount_inc (&fid->count); +if (dentry->d_sb->s_root == dentry)return fid; - }/* * Do a multipath walk with attached root. * When walking parent we need to make sure we
@@ -212,6 +211,7 @@ static struct p9_fid *v9fs_fid_lookup_wi fid =ERR_PTR (n); goto err_out; } + old_fid = fid; clone =1 ; i =0 ;while (i < n) {
@@ -221,19 +221,15 @@ static struct p9_fid *v9fs_fid_lookup_wi* walk to ensure none of the patch component change */ fid =p9_client_walk (fid, l, &wnames[i], clone); +/* non-cloning walk will return the same fid */ +if (fid != old_fid) { +p9_client_clunk (old_fid); + old_fid = fid; + }if (IS_ERR (fid)) { -if (old_fid) { -/* -* If we fail, clunk fid which are mapping -* to path component and not the last component -* of the path. -*/ -p9_client_clunk (old_fid); - }kfree (wnames); goto err_out; } - old_fid = fid; i += l; clone =0 ; }
Greg Kroah-Hartman
maintainerPATCH 12/181 net: openvswitch: fix parsing of nw_proto for IPv6 fragments
In reply to Greg Kroah-HartmanFrom: Rosemarie O'Riorden <[email protected]>
commit 12378a5a75e33f34f8586706eb61cca9e6d4690c upstream.
When a packet enters the OVS datapath and does not match any existing flows installed in the kernel flow cache, the packet will be sent to userspace to be parsed, and a new flow will be created. The kernel and OVS rely on each other to parse packet fields in the same way so that packets will be handled properly.
As per the design document linked below, OVS expects all later IPv6 fragments to have nw_proto=44 in the flow key, so they can be correctly matched on OpenFlow rules. OpenFlow controllers create pipelines based on this design.
This behavior was changed by the commit in the Fixes tag so that nw_proto equals the next_header field of the last extension header. However, there is no counterpart for this change in OVS userspace, meaning that this field is parsed differently between OVS and the kernel. This is a problem because OVS creates actions based on what is parsed in userspace, but the kernel-provided flow key is used as a match criteria, as described in Documentation/networking/openvswitch.rst. This leads to issues such as packets incorrectly matching on a flow and thus the wrong list of actions being applied to the packet. Such changes in packet parsing cannot be implemented without breaking the userspace.
The offending commit is partially reverted to restore the expected behavior.
The change technically made sense and there is a good reason that it was implemented, but it does not comply with the original design of OVS. If in the future someone wants to implement such a change, then it must be user-configurable and disabled by default to preserve backwards compatibility with existing OVS versions.
--- net/openvswitch/flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/openvswitch/flow.c +1 -1
@@ -407,7 +407,7 @@ static int parse_ipv6hdr(struct sk_buffif (flags &IP6_FH_F_FRAG ) {if (frag_off) { key->ip.frag =OVS_FRAG_TYPE_LATER ; - key->ip.proto = nexthdr; + key->ip.proto =NEXTHDR_FRAGMENT ;return 0 ; } key->ip.frag =OVS_FRAG_TYPE_FIRST ;
Greg Kroah-Hartman
maintainerPATCH 15/181 9p: fix fid refcount leak in v9fs_vfs_atomic_open_dotl
In reply to Greg Kroah-HartmanFrom: Dominique Martinet <[email protected]>
commit beca774fc51a9ba8abbc869cf0c3d965ff17cd24 upstream.
We need to release directory fid if we fail halfway through open
This fixes fid leaking with xfstests generic 531
--- fs/9p/vfs_inode_dotl.c | 3 +++ 1 file changed, 3 insertions(+)
fs/9p/vfs_inode_dotl.c +3 -0
@@ -274,6 +274,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *if (IS_ERR (ofid)) { err =PTR_ERR (ofid);p9_debug (P9_DEBUG_VFS ,"p9_client_walk failed %d\n" , err); +p9_client_clunk (dfid); goto out; }
@@ -285,6 +286,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *if (err) {p9_debug (P9_DEBUG_VFS ,"Failed to get acl values in creat %d\n" , err); +p9_client_clunk (dfid); goto error; } err = p9_client_create_dotl(ofid, name, v9fs_open_to_dotl_flags(flags),
@@ -292,6 +294,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *if (err <0 ) {p9_debug (P9_DEBUG_VFS ,"p9_client_open_dotl failed in creat %d\n" , err); +p9_client_clunk (dfid); goto error; }v9fs_invalidate_inode_attr (dir);
Greg Kroah-Hartman
maintainerPATCH 16/181 9p: fix fid refcount leak in v9fs_vfs_get_link
In reply to Greg Kroah-HartmanFrom: Dominique Martinet <[email protected]>
commit e5690f263208c5abce7451370b7786eb25b405eb upstream.
we check for protocol version later than required, after a fid has been obtained. Just move the version check earlier.
--- fs/9p/vfs_inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/9p/vfs_inode.c +4 -4
@@ -1250,15 +1250,15 @@ static const char *v9fs_vfs_get_link(strreturn ERR_PTR (-ECHILD ); v9ses =v9fs_dentry2v9ses (dentry); - fid =v9fs_fid_lookup (dentry); +if (!v9fs_proto_dotu (v9ses)) +return ERR_PTR (-EBADF ); +p9_debug (P9_DEBUG_VFS ,"%pd\n" , dentry); + fid =v9fs_fid_lookup (dentry);if (IS_ERR (fid))return ERR_CAST (fid); -if (!v9fs_proto_dotu (v9ses)) -return ERR_PTR (-EBADF ); - st =p9_client_stat (fid);p9_client_clunk (fid);if (IS_ERR (st))
Greg Kroah-Hartman
maintainercover 5.18.8-rc1 review
This is the start of the stable review cycle for the 5.18.8 release. There are 181 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 29 Jun 2022 11:19:09 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.8-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.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.18.8-rc1
Jason A. Donenfeld <[email protected]>
powerpc/pseries: wire up rng during setup_arch()
Masahiro Yamada <[email protected]>
kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS (2nd attempt)
Dexuan Cui <[email protected]>
dma-direct: use the correct size for dma_set_encrypted()
Shyam Prasad N <[email protected]>
smb3: use netname when available on secondary channels
Adrian Hunter <[email protected]>
perf build-id: Fix caching files with a wrong build ID
Jason A. Donenfeld <[email protected]>
random: update comment from copy_to_user() -> copy_to_iter()
Steve French <[email protected]>
smb3: fix empty netname context on secondary channels
Stefan Wahren <[email protected]>
ARM: dts: bcm2711-rpi-400: Fix GPIO line names
Masahiro Yamada <[email protected]>
modpost: fix section mismatch check for exported init/exit sections
Miaoqian Lin <[email protected]>
ARM: cns3xxx: Fix refcount leak in cns3xxx_init
Miaoqian Lin <[email protected]>
memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings
Miaoqian Lin <[email protected]>
memory: mtk-smi: add missing put_device() call in mtk_smi_device_link_common
Miaoqian Lin <[email protected]>
ARM: Fix refcount leak in axxia_boot_secondary
Miaoqian Lin <[email protected]>
soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe
David Virag <[email protected]>
arm64: dts: exynos: Correct UART clocks on Exynos7885
Miaoqian Lin <[email protected]>
ARM: exynos: Fix refcount leak in exynos_map_pmu
Aswath Govindraju <[email protected]>
arm64: dts: ti: k3-am64-main: Remove support for HS400 speed mode
Lucas Stach <[email protected]>
ARM: dts: imx6qdl: correct PU regulator ramp delay
Alexander Stein <[email protected]>
ARM: dts: imx7: Move hsic_phy power domain to HSIC PHY node
Marcelo Tosatti <[email protected]>
mm: lru_cache_disable: use synchronize_rcu_expedited
zhenwei pi <[email protected]>
mm/memory-failure: disable unpoison once hw error happens
Jason A. Donenfeld <[email protected]>
powerpc/powernv: wire up rng during setup_arch
Andrew Donnellan <[email protected]>
powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address
Naveen N. Rao <[email protected]>
powerpc: Enable execve syscall exit tracepoint
Jason A. Donenfeld <[email protected]>
powerpc/microwatt: wire up rng during setup_arch()
Matt Ranostay <[email protected]>
arm64: dts: ti: k3-j721s2: Fix overlapping GICD memory region
Helge Deller <[email protected]>
parisc: Enable ARCH_HAS_STRICT_MODULE_RWX
John David Anglin <[email protected]>
parisc: Fix flush_anon_page on PA8800/PA8900
Helge Deller <[email protected]>
parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI
Liang He <[email protected]>
xtensa: Fix refcount leak bug in time.c
Liang He <[email protected]>
xtensa: xtfpga: Fix refcount leak bug in setup
Jialin Zhang <[email protected]>
iio: adc: ti-ads131e08: add missing fwnode_handle_put() in ads131e08_alloc_channels()
Miaoqian Lin <[email protected]>
iio: adc: adi-axi-adc: Fix refcount leak in adi_axi_adc_attach_client
Jialin Zhang <[email protected]>
iio: adc: rzg2l_adc: add missing fwnode_handle_put() in rzg2l_adc_parse_properties()
Hans de Goede <[email protected]>
iio: adc: axp288: Override TS pin bias current for some models
Olivier Moysan <[email protected]>
iio: adc: stm32: fix vrefint wrong calibration value handling
Yannick Brosseau <[email protected]>
iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message
Yannick Brosseau <[email protected]>
iio: adc: stm32: Fix ADCs iteration in irq handler
Miaoqian Lin <[email protected]>
iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data
Liam Beguin <[email protected]>
iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m
Linus Walleij <[email protected]>
iio: afe: rescale: Fix boolean logic bug
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: Fix broken icm42600 (chip id 0 value)
Olivier Moysan <[email protected]>
iio: adc: stm32: fix maximum clock rate for stm32mp15x
Vincent Whitchurch <[email protected]>
iio: trigger: sysfs: fix use-after-free on remove
Zheyu Ma <[email protected]>
iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up()
Haibo Chen <[email protected]>
iio: accel: mma8452: ignore the return value of reset operation
Dmitry Rokosov <[email protected]>
iio:accel:mxc4005: rearrange iio trigger get and register
Dmitry Rokosov <[email protected]>
iio:accel:bma180: rearrange iio trigger get and register
Dmitry Rokosov <[email protected]>
iio:accel:kxcjk-1013: rearrange iio trigger get and register
Dmitry Rokosov <[email protected]>
iio:chemical:ccs811: rearrange iio trigger get and register
Aashish Sharma <[email protected]>
iio:proximity:sx9324: Check ret value of device_property_read_u32_array()
Dmitry Rokosov <[email protected]>
iio:humidity:hts221: rearrange iio trigger get and register
Jaegeuk Kim <[email protected]>
f2fs: do not count ENOENT for error case
Daeho Jeong <[email protected]>
f2fs: fix iostat related lock protection
Jaegeuk Kim <[email protected]>
f2fs: attach inline_data after setting compression
Josef Bacik <[email protected]>
btrfs: fix deadlock with fsync+fiemap+transaction commit
Zygo Blaxell <[email protected]>
btrfs: don't set lock_owner when locking extent buffer for reading
Filipe Manana <[email protected]>
btrfs: fix race between reflinking and ordered extent completion
Geert Uytterhoeven <[email protected]>
dt-bindings: usb: ehci: Increase the number of PHYs
Geert Uytterhoeven <[email protected]>
dt-bindings: usb: ohci: Increase the number of PHYs
Xu Yang <[email protected]>
usb: chipidea: udc: check request status before setting device address
Alan Stern <[email protected]>
USB: gadget: Fix double-free bug in raw_gadget driver
Alan Stern <[email protected]>
usb: gadget: Fix non-unique driver names in raw-gadget driver
Dan Vacura <[email protected]>
usb: gadget: uvc: fix list double add in uvcg_video_pump
Utkarsh Patel <[email protected]>
xhci-pci: Allow host runtime PM as default for Intel Meteor Lake xHCI
Tanveer Alam <[email protected]>
xhci-pci: Allow host runtime PM as default for Intel Raptor Lake xHCI
Mathias Nyman <[email protected]>
xhci: turn off port power in shutdown
Alexander Gordeev <[email protected]>
s390/crash: make copy_oldmem_page() return number of bytes copied
Alexander Gordeev <[email protected]>
s390/crash: add missing iterator advance in copy_oldmem_page()
Matthew Wilcox (Oracle) <[email protected]>
vmcore: convert copy_oldmem_page() to take an iov_iter
Pavel Begunkov <[email protected]>
io_uring: fix wrong arm_poll error handling
Andy Shevchenko <[email protected]>
usb: typec: wcove: Drop wrong dependency to INTEL_SOC_PMIC
Pavel Begunkov <[email protected]>
io_uring: fix req->apoll_events
Christoph Hellwig <[email protected]>
io_uring: make apoll_events a __poll_t
Baruch Siach <[email protected]>
iio: adc: vf610: fix conversion mode sysfs node name
Lv Ruyi <[email protected]>
iio: adc: xilinx-ams: fix return error variable
Linus Walleij <[email protected]>
iio: magnetometer: yas530: Fix memchr_inv() misuse
Haibo Chen <[email protected]>
iio: mma8452: fix probe fail when device tree compatible is used.
Peter Gonda <[email protected]>
KVM: SEV: Init target VMCBs in sev_migrate_from
Alistair Popple <[email protected]>
filemap: Fix serialization adding transparent huge pages to page cache
Thomas Richter <[email protected]>
s390/cpumf: Handle events cycles and instructions identical
Dan Carpenter <[email protected]>
gpio: winbond: Fix error code in winbond_gpio_get()
Christoph Hellwig <[email protected]>
nvme: move the Samsung X5 quirk entry to the core quirks
Jakub Kicinski <[email protected]>
sock: redo the psock vs ULP protection check
Jakub Kicinski <[email protected]>
Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
Stephan Gerhold <[email protected]>
virtio_net: fix xdp_rxq_info bug after suspend/resume
Kai-Heng Feng <[email protected]>
igb: Make DMA faster when CPU is active on the PCIe link
Christian Marangi <[email protected]>
net: dsa: qca8k: reduce mgmt ethernet timeout
Mario Limonciello <[email protected]>
drm/amd: Revert "drm/amd/display: keep eDP Vdd on when eDP stream is already enabled"
Yoshihiro Shimoda <[email protected]>
iommu/ipmmu-vmsa: Fix compatible for rcar-gen4
Aidan MacDonald <[email protected]>
regmap-irq: Fix offset/index mismatch in read_sub_irq_data()
Aidan MacDonald <[email protected]>
regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips
Pavel Begunkov <[email protected]>
io_uring: fail links when poll fails
Anatolii Gerasymenko <[email protected]>
ice: ethtool: Prohibit improper channel config for DCB
Anatolii Gerasymenko <[email protected]>
ice: ethtool: advertise 1000M speeds properly
Wojciech Drewek <[email protected]>
ice: Fix switchdev rules book keeping
Marcin Szycik <[email protected]>
ice: ignore protocol field in GTP offload
Jens Axboe <[email protected]>
block: pop cached rq before potentially blocking rq_qos_throttle()
David Howells <[email protected]>
afs: Fix dynamic root getattr
huhai <[email protected]>
MIPS: Remove repetitive increase irq_err_count
Julien Grall <[email protected]>
x86/xen: Remove undefined behavior in setup_features()
Jason Andryuk <[email protected]>
xen-blkfront: Handle NULL gendisk
Florian Westphal <[email protected]>
netfilter: nf_dup_netdev: add and use recursion counter
Florian Westphal <[email protected]>
netfilter: nf_dup_netdev: do not push mac header a second time
Jie2x Zhou <[email protected]>
selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
Gerd Hoffmann <[email protected]>
udmabuf: add back sanity check
Ziyang Xuan <[email protected]>
net/tls: fix tls_sk_proto_close executed repeatedly
Eric Dumazet <[email protected]>
erspan: do not assume transport header is always set
Riccardo Paolo Bestetti <[email protected]>
ipv4: fix bind address validity regression tests
Leo Yan <[email protected]>
perf arm-spe: Don't set data source if it's not a memory operation
Athira Rajeev <[email protected]>
perf test topology: Use !strncmp(right platform) to fix guest PPC comparision check
Michael Petlan <[email protected]>
perf test: Record only user callchains on the "Check Arm64 callgraphs are complete in fp mode" test
Oleksij Rempel <[email protected]>
net: phy: at803x: fix NULL pointer dereference on AR9331 PHY
Kuogee Hsieh <[email protected]>
drm/msm/dp: force link training for display resolution change
Kuogee Hsieh <[email protected]>
drm/msm/dp: check core_initialized before disable interrupts at dp_display_unbind()
Miaoqian Lin <[email protected]>
drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf
Peilin Ye <[email protected]>
net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms
Ivan Vecera <[email protected]>
ethtool: Fix get module eeprom fallback
Jay Vosburgh <[email protected]>
bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers
Lorenzo Bianconi <[email protected]>
igb: fix a use-after-free issue in igb_clean_tx_ring
Masami Hiramatsu (Google) <[email protected]>
rethook: Reject getting a rethook if RCU is not watching
Christoph Hellwig <[email protected]>
block: disable the elevator int del_gendisk
Hoang Le <[email protected]>
tipc: fix use-after-free Read in tipc_named_reinit
Jay Vosburgh <[email protected]>
veth: Add updating of trans_start
Eric Dumazet <[email protected]>
net: fix data-race in dev_isalive()
Quentin Perret <[email protected]>
KVM: arm64: Prevent kmemleak from accessing pKVM memory
Claudiu Manoil <[email protected]>
phy: aquantia: Fix AN when higher speeds than 1G are not advertised
Saurabh Sengar <[email protected]>
scsi: storvsc: Correct reporting of Hyper-V I/O size limits
Yu Liao <[email protected]>
selftests dma: fix compile error for dma_map_benchmark
Jakub Sitnicki <[email protected]>
bpf, x86: Fix tail call count offset calculation on bpf2bpf call
Samuel Holland <[email protected]>
drm/sun4i: Fix crash during suspend after component bind failure
Jon Maxwell <[email protected]>
bpf: Fix request_sock leak in sk lookup helpers
Jonathan Marek <[email protected]>
drm/msm: use for_each_sgtable_sg to iterate over scatterlist
Ciara Loftus <[email protected]>
xsk: Fix generic transmit when completion queue reservation fails
Sergey Gorenko <[email protected]>
scsi: iscsi: Exclude zero from the endpoint ID range
Rob Clark <[email protected]>
drm/msm: Switch ordering of runpm put vs devfreq_idle
Damien Le Moal <[email protected]>
scsi: scsi_debug: Fix zone transition to full condition
Florian Westphal <[email protected]>
netfilter: use get_random_u32 instead of prandom
Maximilian Luz <[email protected]>
drm/msm: Fix double pm_runtime_disable() call
Rob Clark <[email protected]>
drm/msm: Ensure mmap offset is initialized
Macpaul Lin <[email protected]>
USB: serial: option: add Quectel RM500K module support
Yonglin Tan <[email protected]>
USB: serial: option: add Quectel EM05-G modem
Carlo Lobrano <[email protected]>
USB: serial: option: add Telit LE910Cx 0x1250 composition
Johan Hovold <[email protected]>
USB: serial: pl2303: add support for more HXN (G) types
George Shen <[email protected]>
drm/amd/display: Fix typo in override_lane_settings
Joshua Ashton <[email protected]>
amd/display/dc: Fix COLOR_ENCODING and COLOR_RANGE doing nothing for DCN20+
Ville Syrjälä <[email protected]>
drm/i915: Implement w/a 22010492432 for adl-s
Jann Horn <[email protected]>
mm/slub: add missing TID updates on slab deactivation
Matthew Wilcox (Oracle) <[email protected]>
filemap: Handle sibling entries in filemap_get_read_batch()
Masami Hiramatsu (Google) <[email protected]>
tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher()
Mikulas Patocka <[email protected]>
dm mirror log: clear log bits up to BITS_PER_LONG boundary
Mike Snitzer <[email protected]>
dm: do not return early from dm_io_complete if BLK_STS_AGAIN without polling
Nikos Tsironis <[email protected]>
dm era: commit metadata in postsuspend after worker stops
Edward Wu <[email protected]>
ata: libata: add qc->flags in ata_qc_complete_template tracepoint
Sascha Hauer <[email protected]>
mtd: rawnand: gpmi: Fix setting busy timeout setting
Joerg Roedel <[email protected]>
MAINTAINERS: Add new IOMMU development mailing list
Demi Marie Obenour <[email protected]>
xen/gntdev: Avoid blocking in unmap_grant_pages()
Mengqi Zhang <[email protected]>
mmc: mediatek: wait dma stop bit reset to 0
Chevron Li <[email protected]>
mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing
Tyrel Datwyler <[email protected]>
scsi: ibmvfc: Allocate/free queue resource only during probe/remove
Tyrel Datwyler <[email protected]>
scsi: ibmvfc: Store vhost pointer during subcrq allocation
David Sterba <[email protected]>
btrfs: add error messages to all unrecognized mount options
Qu Wenruo <[email protected]>
btrfs: prevent remounting to v1 space cache for subpage mount
Filipe Manana <[email protected]>
btrfs: fix hang during unmount when block group reclaim task is running
Dominique Martinet <[email protected]>
9p: fix EBADF errors in cached mode
Dominique Martinet <[email protected]>
9p: fix fid refcount leak in v9fs_vfs_get_link
Dominique Martinet <[email protected]>
9p: fix fid refcount leak in v9fs_vfs_atomic_open_dotl
Tyler Hicks <[email protected]>
9p: Fix refcounting during full path walks for fid lookups
Riccardo Paolo Bestetti <[email protected]>
ipv4: ping: fix bind address validity check
Rosemarie O'Riorden <[email protected]>
net: openvswitch: fix parsing of nw_proto for IPv6 fragments
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo NS50PU
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo PD70PNT
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly
Kailang Yang <[email protected]>
ALSA: hda/realtek - ALC897 headset MIC no sound
Soham Sen <[email protected]>
ALSA: hda/realtek: Add mute LED quirk for HP Omen laptop
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Fix missing beep setup
Takashi Iwai <[email protected]>
ALSA: hda: Fix discovery of i915 graphics PCI device
Takashi Iwai <[email protected]>
ALSA: hda/via: Fix missing beep setup
Takashi Iwai <[email protected]>
ALSA: memalloc: Drop x86-specific hack for WC allocations
Jason A. Donenfeld <[email protected]>
random: quiet urandom warning ratelimit suppression message
Jason A. Donenfeld <[email protected]>
random: schedule mix_interrupt_randomness() less often
-------------
Diffstat:
Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- .../devicetree/bindings/usb/generic-ehci.yaml | 3 +- .../devicetree/bindings/usb/generic-ohci.yaml | 3 +- Documentation/vm/hwpoison.rst | 3 +- MAINTAINERS | 11 ++ Makefile | 6 +- arch/arm/boot/dts/bcm2711-rpi-400.dts | 6 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/boot/dts/imx7s.dtsi | 2 +- arch/arm/kernel/crash_dump.c | 27 +--- arch/arm/mach-axxia/platsmp.c | 1 + arch/arm/mach-cns3xxx/core.c | 2 + arch/arm/mach-exynos/exynos.c | 1 + arch/arm64/boot/dts/exynos/exynos7885.dtsi | 12 +- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 - arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 2 +- arch/arm64/kernel/crash_dump.c | 29 +--- arch/arm64/kvm/arm.c | 6 +- arch/ia64/kernel/crash_dump.c | 32 +---- arch/mips/kernel/crash_dump.c | 27 +--- arch/mips/vr41xx/common/icu.c | 2 - arch/parisc/Kconfig | 1 + arch/parisc/include/asm/fb.h | 2 +- arch/parisc/kernel/cache.c | 5 +- arch/powerpc/kernel/crash_dump.c | 35 +---- arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/rtas.c | 11 +- arch/powerpc/platforms/microwatt/microwatt.h | 7 + arch/powerpc/platforms/microwatt/rng.c | 10 +- arch/powerpc/platforms/microwatt/setup.c | 8 ++ arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 ++++--- arch/powerpc/platforms/powernv/setup.c | 2 + arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/rng.c | 11 +- arch/powerpc/platforms/pseries/setup.c | 2 + arch/riscv/kernel/crash_dump.c | 26 +--- arch/s390/kernel/crash_dump.c | 23 ++- arch/s390/kernel/perf_cpum_cf.c | 22 ++- arch/sh/kernel/crash_dump.c | 29 +--- arch/x86/kernel/crash_dump_32.c | 29 +--- arch/x86/kernel/crash_dump_64.c | 41 ++---- arch/x86/kvm/svm/sev.c | 68 ++++++--- arch/x86/kvm/svm/svm.c | 11 +- arch/x86/kvm/svm/svm.h | 2 +- arch/x86/net/bpf_jit_comp.c | 3 +- arch/xtensa/kernel/time.c | 1 + arch/xtensa/platforms/xtfpga/setup.c | 1 + block/blk-core.c | 13 -- block/blk-mq.c | 11 +- block/genhd.c | 39 ++--- drivers/base/memory.c | 2 +- drivers/base/regmap/regmap-irq.c | 8 +- drivers/block/xen-blkfront.c | 19 ++- drivers/char/random.c | 6 +- drivers/dma-buf/udmabuf.c | 5 +- drivers/gpio/gpio-vr41xx.c | 2 - drivers/gpio/gpio-winbond.c | 7 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- .../amd/display/dc/dce110/dce110_hw_sequencer.c | 24 +--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 3 + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 3 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 3 + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 33 +++-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 16 +-- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 ++ drivers/gpu/drm/msm/msm_gpu.c | 3 +- drivers/gpu/drm/msm/msm_iommu.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- drivers/iio/accel/bma180.c | 3 +- drivers/iio/accel/kxcjk-1013.c | 4 +- drivers/iio/accel/mma8452.c | 22 +-- drivers/iio/accel/mxc4005.c | 4 +- drivers/iio/adc/adi-axi-adc.c | 3 + drivers/iio/adc/aspeed_adc.c | 1 + drivers/iio/adc/axp288_adc.c | 8 ++ drivers/iio/adc/rzg2l_adc.c | 8 +- drivers/iio/adc/stm32-adc-core.c | 9 +- drivers/iio/adc/stm32-adc.c | 37 +++-- drivers/iio/adc/ti-ads131e08.c | 10 +- drivers/iio/adc/xilinx-ams.c | 2 +- drivers/iio/afe/iio-rescale.c | 2 +- drivers/iio/chemical/ccs811.c | 4 +- drivers/iio/gyro/mpu3050-core.c | 1 + drivers/iio/humidity/hts221_buffer.c | 5 +- drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- drivers/iio/magnetometer/yamaha-yas530.c | 2 +- drivers/iio/proximity/sx9324.c | 3 + drivers/iio/test/Kconfig | 2 +- drivers/iio/test/Makefile | 2 +- drivers/iio/trigger/iio-trig-sysfs.c | 1 + drivers/iommu/ipmmu-vmsa.c | 2 +- drivers/md/dm-era-target.c | 8 +- drivers/md/dm-log.c | 2 +- drivers/md/dm.c | 4 +- drivers/memory/mtk-smi.c | 5 +- drivers/memory/samsung/exynos5422-dmc.c | 29 ++-- drivers/mmc/host/mtk-sd.c | 20 +-- drivers/mmc/host/sdhci-pci-o2micro.c | 2 + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/dsa/qca8k.h | 2 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 49 ++++++- drivers/net/ethernet/intel/ice/ice_lib.c | 42 +++++- drivers/net/ethernet/intel/ice/ice_tc_lib.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 19 +-- drivers/net/phy/aquantia_main.c | 15 +- drivers/net/phy/at803x.c | 6 + drivers/net/veth.c | 4 + drivers/net/virtio_net.c | 25 +--- drivers/nvme/host/core.c | 14 ++ drivers/nvme/host/pci.c | 4 - drivers/scsi/ibmvscsi/ibmvfc.c | 82 ++++++++--- drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/scsi/scsi_debug.c | 22 ++- drivers/scsi/scsi_transport_iscsi.c | 7 +- drivers/scsi/storvsc_drv.c | 27 +++- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + drivers/usb/chipidea/udc.c | 3 + drivers/usb/gadget/function/uvc_video.c | 3 + drivers/usb/gadget/legacy/raw_gadget.c | 63 ++++++--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-pci.c | 6 +- drivers/usb/host/xhci.c | 15 +- drivers/usb/host/xhci.h | 2 + drivers/usb/serial/option.c | 6 + drivers/usb/serial/pl2303.c | 29 ++-- drivers/usb/typec/tcpm/Kconfig | 1 - drivers/video/console/sticore.c | 2 + drivers/xen/features.c | 2 +- drivers/xen/gntdev-common.h | 7 + drivers/xen/gntdev.c | 157 ++++++++++++++------- fs/9p/fid.c | 22 ++- fs/9p/vfs_addr.c | 13 ++ fs/9p/vfs_inode.c | 8 +- fs/9p/vfs_inode_dotl.c | 3 + fs/afs/inode.c | 3 +- fs/btrfs/disk-io.c | 13 +- fs/btrfs/file.c | 67 +++++++-- fs/btrfs/locking.c | 3 - fs/btrfs/reflink.c | 15 +- fs/btrfs/super.c | 47 +++++- fs/cifs/smb2pdu.c | 21 ++- fs/f2fs/iostat.c | 31 ++-- fs/f2fs/namei.c | 17 ++- fs/f2fs/node.c | 4 +- fs/io_uring.c | 20 ++- fs/proc/vmcore.c | 54 ++++--- include/linux/crash_dump.h | 9 +- include/linux/mm.h | 1 + include/linux/ratelimit_types.h | 12 +- include/net/inet_sock.h | 5 + include/trace/events/libata.h | 1 + kernel/dma/direct.c | 5 +- kernel/trace/rethook.c | 9 ++ kernel/trace/trace_kprobe.c | 11 +- mm/filemap.c | 2 + mm/hwpoison-inject.c | 2 +- mm/madvise.c | 2 +- mm/memory-failure.c | 12 ++ mm/readahead.c | 2 + mm/slub.c | 2 + mm/swap.c | 2 +- net/core/dev.c | 25 ++-- net/core/filter.c | 34 ++++- net/core/net-sysfs.c | 1 + net/core/skmsg.c | 5 + net/ethtool/eeprom.c | 2 +- net/ipv4/ip_gre.c | 15 +- net/ipv4/ping.c | 10 +- net/ipv4/tcp_bpf.c | 3 - net/ipv6/ip6_gre.c | 15 +- net/netfilter/nf_dup_netdev.c | 25 +++- net/netfilter/nft_meta.c | 13 +- net/netfilter/nft_numgen.c | 12 +- net/openvswitch/flow.c | 2 +- net/sched/sch_netem.c | 4 +- net/tipc/core.c | 3 +- net/tls/tls_main.c | 2 + net/xdp/xsk.c | 16 ++- scripts/mod/modpost.c | 2 +- sound/core/memalloc.c | 23 +-- sound/hda/hdac_i915.c | 15 +- sound/pci/hda/hda_auto_parser.c | 7 +- sound/pci/hda/hda_local.h | 1 + sound/pci/hda/patch_conexant.c | 4 +- sound/pci/hda/patch_realtek.c | 36 ++++- sound/pci/hda/patch_via.c | 4 +- tools/perf/tests/shell/test_arm_callgraph_fp.sh | 2 +- tools/perf/tests/topology.c | 2 +- tools/perf/util/arm-spe.c | 22 ++- tools/perf/util/build-id.c | 28 ++++ tools/testing/selftests/dma/Makefile | 1 + tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- tools/testing/selftests/net/fcnal-test.sh | 61 +++++++- .../selftests/netfilter/nft_concat_range.sh | 2 +- 203 files changed, 1558 insertions(+), 920 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 3/181 ALSA: memalloc: Drop x86-specific hack for WC allocations
From: Takashi Iwai <[email protected]>
commit 9882d63bea14c8b3ed2c9360b9ab9f0e2f64ae2b upstream.
The recent report for a crash on Haswell machines implied that the x86-specific (rather hackish) implementation for write-cache memory buffer allocation in ALSA core is buggy with the recent kernel in some corner cases. This patch drops the x86-specific implementation and uses the standard dma_alloc_wc() & co generically for avoiding the bug and also for simplification.
--- sound/core/memalloc.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)
sound/core/memalloc.c +1 -22
@@ -431,33 +431,17 @@ static const struct snd_malloc_ops snd_dma_iram_ops = {*/ static void *snd_dma_dev_alloc (struct snd_dma_buffer *dmab,size_t size) { -void *p; - - p =dma_alloc_coherent (dmab->dev.dev, size, &dmab->addr,DEFAULT_GFP ); -#ifdef CONFIG_X86 -if (p && dmab->dev.type ==SNDRV_DMA_TYPE_DEV_WC ) -set_memory_wc ((unsigned long )p,PAGE_ALIGN (size) >>PAGE_SHIFT ); -#endif -return p; +return dma_alloc_coherent (dmab->dev.dev, size, &dmab->addr,DEFAULT_GFP ); }static void snd_dma_dev_free (struct snd_dma_buffer *dmab) { -#ifdef CONFIG_X86 -if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_WC ) -set_memory_wb ((unsigned long )dmab->area, -PAGE_ALIGN (dmab->bytes) >>PAGE_SHIFT ); -#endif dma_free_coherent (dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); }static int snd_dma_dev_mmap (struct snd_dma_buffer *dmab,struct vm_area_struct *area) { -#ifdef CONFIG_X86 -if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_WC ) - area->vm_page_prot =pgprot_writecombine (area->vm_page_prot); -#endif return dma_mmap_coherent (dmab->dev.dev, area, dmab->area, dmab->addr, dmab->bytes); }
@@ -471,10 +455,6 @@ static const struct snd_malloc_ops snd_dma_dev_ops = {/* * Write-combined pages */ -#ifdef CONFIG_X86 -/* On x86, share the same ops as the standard dev ops */ -#define snd_dma_wc_ops snd_dma_dev_ops -#else /* CONFIG_X86 */ static void *snd_dma_wc_alloc (struct snd_dma_buffer *dmab,size_t size) {return dma_alloc_wc (dmab->dev.dev, size, &dmab->addr,DEFAULT_GFP );
@@ -497,7 +477,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = { .free = snd_dma_wc_free, .mmap = snd_dma_wc_mmap, }; -#endif /* CONFIG_X86 */ #ifdef CONFIG_SND_DMA_SGBUF static void *snd_dma_sg_fallback_alloc (struct snd_dma_buffer *dmab,size_t size);
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 18/181 btrfs: fix hang during unmount when block group reclaim task is running
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 31e70e527806c546a72262f2fc3d982ee23c42d3 upstream.
When we start an unmount, at close_ctree(), if we have the reclaim task running and in the middle of a data block group relocation, we can trigger a deadlock when stopping an async reclaim task, producing a trace like the following:
[629724.498185] task:kworker/u16:7 state:D stack: 0 pid:681170 ppid: 2 flags:0x00004000 [629724.499760] Workqueue: events_unbound btrfs_async_reclaim_metadata_space [btrfs] [629724.501267] Call Trace: [629724.501759] <TASK> [629724.502174] __schedule+0x3cb/0xed0 [629724.502842] schedule+0x4e/0xb0 [629724.503447] btrfs_wait_on_delayed_iputs+0x7c/0xc0 [btrfs] [629724.504534] ? prepare_to_wait_exclusive+0xc0/0xc0 [629724.505442] flush_space+0x423/0x630 [btrfs] [629724.506296] ? rcu_read_unlock_trace_special+0x20/0x50 [629724.507259] ? lock_release+0x220/0x4a0 [629724.507932] ? btrfs_get_alloc_profile+0xb3/0x290 [btrfs] [629724.508940] ? do_raw_spin_unlock+0x4b/0xa0 [629724.509688] btrfs_async_reclaim_metadata_space+0x139/0x320 [btrfs] [629724.510922] process_one_work+0x252/0x5a0 [629724.511694] ? process_one_work+0x5a0/0x5a0 [629724.512508] worker_thread+0x52/0x3b0 [629724.513220] ? process_one_work+0x5a0/0x5a0 [629724.514021] kthread+0xf2/0x120 [629724.514627] ? kthread_complete_and_exit+0x20/0x20 [629724.515526] ret_from_fork+0x22/0x30 [629724.516236] </TASK> [629724.516694] task:umount state:D stack: 0 pid:719055 ppid:695412 flags:0x00004000 [629724.518269] Call Trace: [629724.518746] <TASK> [629724.519160] __schedule+0x3cb/0xed0 [629724.519835] schedule+0x4e/0xb0 [629724.520467] schedule_timeout+0xed/0x130 [629724.521221] ? lock_release+0x220/0x4a0 [629724.521946] ? lock_acquired+0x19c/0x420 [629724.522662] ? trace_hardirqs_on+0x1b/0xe0 [629724.523411] __wait_for_common+0xaf/0x1f0 [629724.524189] ? usleep_range_state+0xb0/0xb0 [629724.524997] __flush_work+0x26d/0x530 [629724.525698] ? flush_workqueue_prep_pwqs+0x140/0x140 [629724.526580] ? lock_acquire+0x1a0/0x310 [629724.527324] __cancel_work_timer+0x137/0x1c0 [629724.528190] close_ctree+0xfd/0x531 [btrfs] [629724.529000] ? evict_inodes+0x166/0x1c0 [629724.529510] generic_shutdown_super+0x74/0x120 [629724.530103] kill_anon_super+0x14/0x30 [629724.530611] btrfs_kill_super+0x12/0x20 [btrfs] [629724.531246] deactivate_locked_super+0x31/0xa0 [629724.531817] cleanup_mnt+0x147/0x1c0 [629724.532319] task_work_run+0x5c/0xa0 [629724.532984] exit_to_user_mode_prepare+0x1a6/0x1b0 [629724.533598] syscall_exit_to_user_mode+0x16/0x40 [629724.534200] do_syscall_64+0x48/0x90 [629724.534667] entry_SYSCALL_64_after_hwframe+0x44/0xae [629724.535318] RIP: 0033:0x7fa2b90437a7 [629724.535804] RSP: 002b:00007ffe0b7e4458 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 [629724.536912] RAX: 0000000000000000 RBX: 00007fa2b9182264 RCX: 00007fa2b90437a7 [629724.538156] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000555d6cf20dd0 [629724.539053] RBP: 0000555d6cf20ba0 R08: 0000000000000000 R09: 00007ffe0b7e3200 [629724.539956] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [629724.540883] R13: 0000555d6cf20dd0 R14: 0000555d6cf20cb0 R15: 0000000000000000 [629724.541796] </TASK>
This happens because:
1) Before entering close_ctree() we have the async block group reclaim task running and relocating a data block group;
2) There's an async metadata (or data) space reclaim task running;
3) We enter close_ctree() and park the cleaner kthread;
4) The async space reclaim task is at flush_space() and runs all the existing delayed iputs;
5) Before the async space reclaim task calls btrfs_wait_on_delayed_iputs(), the block group reclaim task which is doing the data block group relocation, creates a delayed iput at replace_file_extents() (called when COWing leaves that have file extent items pointing to relocated data extents, during the merging phase of relocation roots);
6) The async reclaim space reclaim task blocks at btrfs_wait_on_delayed_iputs(), since we have a new delayed iput;
7) The task at close_ctree() then calls cancel_work_sync() to stop the async space reclaim task, but it blocks since that task is waiting for the delayed iput to be run;
8) The delayed iput is never run because the cleaner kthread is parked, and no one else runs delayed iputs, resulting in a hang.
So fix this by stopping the async block group reclaim task before we park the cleaner kthread.
--- fs/btrfs/disk-io.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +11 -2
@@ -4639,6 +4639,17 @@ void __cold close_ctree(struct btrfs_fs_int ret;set_bit (BTRFS_FS_CLOSING_START , &fs_info->flags); + +/* +* We may have the reclaim task running and relocating a data block group, +* in which case it may create delayed iputs. So stop it before we park +* the cleaner kthread otherwise we can get new delayed iputs after +* parking the cleaner, and that can make the async reclaim task to hang +* if it's waiting for delayed iputs to complete, since the cleaner is +* parked and can not run delayed iputs - this will make us hang when +* trying to stop the async reclaim task. +*/ +cancel_work_sync (&fs_info->reclaim_bgs_work);/* * We don't want the cleaner to start new transactions, add more delayed * iputs, etc. while we're closing. We can't use kthread_stop() yet
@@ -4679,8 +4690,6 @@ void __cold close_ctree(struct btrfs_fs_cancel_work_sync (&fs_info->async_data_reclaim_work);cancel_work_sync (&fs_info->preempt_reclaim_work); -cancel_work_sync (&fs_info->reclaim_bgs_work); -/* Cancel or finish ongoing discard work */ btrfs_discard_cleanup (fs_info);
Greg Kroah-Hartman
maintainerPATCH 4/181 ALSA: hda/via: Fix missing beep setup
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c7807b27d510e5aa53c8a120cfc02c33c24ebb5f upstream.
Like the previous fix for Conexant codec, the beep_nid has to be set up before calling snd_hda_gen_parse_auto_config(); otherwise it'd miss the path setup.
Fix the call order for addressing the missing beep setup.
--- sound/pci/hda/patch_via.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_via.c +2 -2
@@ -520,11 +520,11 @@ static int via_parse_auto_config(structif (err <0 )return err; - err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg); + err =auto_parse_beep (codec);if (err <0 )return err; - err =auto_parse_beep (codec); + err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg);if (err <0 )return err;
Greg Kroah-Hartman
maintainerPATCH 21/181 scsi: ibmvfc: Store vhost pointer during subcrq allocation
In reply to Greg Kroah-HartmanFrom: Tyrel Datwyler <[email protected]>
commit aeaadcde1a60138bceb65de3cdaeec78170b4459 upstream.
Currently the back pointer from a queue to the vhost adapter isn't set until after subcrq interrupt registration. The value is available when a queue is first allocated and can/should be also set for primary and async queues as well as subcrqs.
This fixes a crash observed during kexec/kdump on Power 9 with legacy XICS interrupt controller where a pending subcrq interrupt from the previous kernel can be replayed immediately upon IRQ registration resulting in dereference of a garbage backpointer in ibmvfc_interrupt_scsi().
Kernel attempted to read user page (58) - exploit attempt? (uid: 0)
BUG: Kernel NULL pointer dereference on read at 0x00000058 Faulting instruction address: 0xc008000003216a08 Oops: Kernel access of bad area, sig: 11 [#1] ... NIP [c008000003216a08] ibmvfc_interrupt_scsi+0x40/0xb0 [ibmvfc] LR [c0000000082079e8] __handle_irq_event_percpu+0x98/0x270 Call Trace:
[c000000047fa3d80] [c0000000123e6180] 0xc0000000123e6180 (unreliable) [c000000047fa3df0] [c0000000082079e8] __handle_irq_event_percpu+0x98/0x270 [c000000047fa3ea0] [c000000008207d18] handle_irq_event+0x98/0x188 [c000000047fa3ef0] [c00000000820f564] handle_fasteoi_irq+0xc4/0x310 [c000000047fa3f40] [c000000008205c60] generic_handle_irq+0x50/0x80 [c000000047fa3f60] [c000000008015c40] __do_irq+0x70/0x1a0 [c000000047fa3f90] [c000000008016d7c] __do_IRQ+0x9c/0x130 [c000000014622f60] [0000000020000000] 0x20000000
[c000000014622ff0] [c000000008016e50] do_IRQ+0x40/0xa0
[c000000014623020] [c000000008017044] replay_soft_interrupts+0x194/0x2f0 [c000000014623210] [c0000000080172a8] arch_local_irq_restore+0x108/0x170 [c000000014623240] [c000000008eb1008] _raw_spin_unlock_irqrestore+0x58/0xb0 [c000000014623270] [c00000000820b12c] __setup_irq+0x49c/0x9f0 [c000000014623310] [c00000000820b7c0] request_threaded_irq+0x140/0x230 [c000000014623380] [c008000003212a50] ibmvfc_register_scsi_channel+0x1e8/0x2f0 [ibmvfc] [c000000014623450] [c008000003213d1c] ibmvfc_init_sub_crqs+0xc4/0x1f0 [ibmvfc] [c0000000146234d0] [c0080000032145a8] ibmvfc_reset_crq+0x150/0x210 [ibmvfc] [c000000014623550] [c0080000032147c8] ibmvfc_init_crq+0x160/0x280 [ibmvfc] [c0000000146235f0] [c00800000321a9cc] ibmvfc_probe+0x2a4/0x530 [ibmvfc]
--- drivers/scsi/ibmvscsi/ibmvfc.c | 3 ++- drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +2 -1
@@ -5682,6 +5682,8 @@ static int ibmvfc_alloc_queue(struct ibm queue->cur =0 ; queue->fmt = fmt; queue->size =PAGE_SIZE / fmt_size; + + queue->vhost = vhost;return 0 ; }
@@ -5790,7 +5792,6 @@ static int ibmvfc_register_scsi_channel( } scrq->hwq_id = index; - scrq->vhost = vhost;LEAVE ;return 0 ;
drivers/scsi/ibmvscsi/ibmvfc.h +1 -1
@@ -789,6 +789,7 @@ struct ibmvfc_queue {spinlock_t _lock;spinlock_t *q_lock; +struct ibmvfc_host *vhost;struct ibmvfc_event_pool evt_pool;struct list_head sent;struct list_head free;
@@ -797,7 +798,6 @@ struct ibmvfc_queue {union ibmvfc_iu cancel_rsp;/* Sub-CRQ fields */ -struct ibmvfc_host *vhost;unsigned long cookie;unsigned long vios_cookie;unsigned long hw_irq;
Greg Kroah-Hartman
maintainerPATCH 22/181 scsi: ibmvfc: Allocate/free queue resource only during probe/remove
In reply to Greg Kroah-HartmanFrom: Tyrel Datwyler <[email protected]>
commit 72ea7fe0db73d65c7d977208842d8ade9b823de9 upstream.
Currently, the sub-queues and event pool resources are allocated/freed for every CRQ connection event such as reset and LPM. This exposes the driver to a couple issues. First the inefficiency of freeing and reallocating memory that can simply be resued after being sanitized. Further, a system under memory pressue runs the risk of allocation failures that could result in a crippled driver. Finally, there is a race window where command submission/compeletion can try to pull/return elements from/to an event pool that is being deleted or already has been deleted due to the lack of host state around freeing/allocating resources. The following is an example of list corruption following a live partition migration (LPM):
Oops: Exception in kernel mode, sig: 5 [#1]
LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries
Modules linked in: vfat fat isofs cdrom ext4 mbcache jbd2 nft_counter nft_compat nf_tables nfnetlink rpadlpar_io rpaphp xsk_diag nfsv3 nfs_acl nfs lockd grace fscache netfs rfkill bonding tls sunrpc pseries_rng drm drm_panel_orientation_quirks xfs libcrc32c dm_service_time sd_mod t10_pi sg ibmvfc scsi_transport_fc ibmveth vmx_crypto dm_multipath dm_mirror dm_region_hash dm_log dm_mod ipmi_devintf ipmi_msghandler fuse
CPU: 0 PID: 2108 Comm: ibmvfc_0 Kdump: loaded Not tainted 5.14.0-70.9.1.el9_0.ppc64le #1
NIP: c0000000007c4bb0 LR: c0000000007c4bac CTR: 00000000005b9a10
REGS: c00000025c10b760 TRAP: 0700 Not tainted (5.14.0-70.9.1.el9_0.ppc64le)
MSR: 800000000282b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE> CR: 2800028f XER: 0000000f
CFAR: c0000000001f55bc IRQMASK: 0
GPR00: c0000000007c4bac c00000025c10ba00 c000000002a47c00 000000000000004e
GPR04: c0000031e3006f88 c0000031e308bd00 c00000025c10b768 0000000000000027
GPR08: 0000000000000000 c0000031e3009dc0 00000031e0eb0000 0000000000000000
GPR12: c0000031e2ffffa8 c000000002dd0000 c000000000187108 c00000020fcee2c0
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000000000000 0000000000000000 0000000000000000 c008000002f81300
GPR24: 5deadbeef0000100 5deadbeef0000122 c000000263ba6910 c00000024cc88000
GPR28: 000000000000003c c0000002430a0000 c0000002430ac300 000000000000c300
NIP [c0000000007c4bb0] __list_del_entry_valid+0x90/0x100
LR [c0000000007c4bac] __list_del_entry_valid+0x8c/0x100
Call Trace:
[c00000025c10ba00] [c0000000007c4bac] __list_del_entry_valid+0x8c/0x100 (unreliable)
[c00000025c10ba60] [c008000002f42284] ibmvfc_free_queue+0xec/0x210 [ibmvfc]
[c00000025c10bb10] [c008000002f4246c] ibmvfc_deregister_scsi_channel+0xc4/0x160 [ibmvfc]
[c00000025c10bba0] [c008000002f42580] ibmvfc_release_sub_crqs+0x78/0x130 [ibmvfc]
[c00000025c10bc20] [c008000002f4f6cc] ibmvfc_do_work+0x5c4/0xc70 [ibmvfc]
[c00000025c10bce0] [c008000002f4fdec] ibmvfc_work+0x74/0x1e8 [ibmvfc]
[c00000025c10bda0] [c0000000001872b8] kthread+0x1b8/0x1c0
[c00000025c10be10] [c00000000000cd64] ret_from_kernel_thread+0x5c/0x64
Instruction dump:
40820034 38600001 38210060 4e800020 7c0802a6 7c641b78 3c62fe7a 7d254b78
3863b590 f8010070 4ba309cd 60000000 <0fe00000> 7c0802a6 3c62fe7a 3863b640
---[ end trace 11a2b65a92f8b66c ]---ibmvfc 30000003: Send warning. Receive queue closed, will retry.
Add registration/deregistration helpers that are called instead during connection resets to sanitize and reconfigure the queues.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 79 ++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 17 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +62 -17
@@ -160,8 +160,8 @@ static void ibmvfc_npiv_logout(struct ibstatic void ibmvfc_tgt_implicit_logout_and_del (struct ibmvfc_target *);static void ibmvfc_tgt_move_login (struct ibmvfc_target *); -static void ibmvfc_release_sub_crqs (struct ibmvfc_host *); -static void ibmvfc_init_sub_crqs (struct ibmvfc_host *); +static void ibmvfc_dereg_sub_crqs (struct ibmvfc_host *); +static void ibmvfc_reg_sub_crqs (struct ibmvfc_host *);static const char *unknown_error ="unknown error" ;
@@ -917,7 +917,7 @@ static int ibmvfc_reenable_crq_queue(strstruct vio_dev *vdev =to_vio_dev (vhost->dev);unsigned long flags; -ibmvfc_release_sub_crqs (vhost); +ibmvfc_dereg_sub_crqs (vhost);/* Re-enable the CRQ */ do {
@@ -936,7 +936,7 @@ static int ibmvfc_reenable_crq_queue(strspin_unlock (vhost->crq.q_lock);spin_unlock_irqrestore (vhost->host->host_lock, flags); -ibmvfc_init_sub_crqs (vhost); +ibmvfc_reg_sub_crqs (vhost);return rc; }
@@ -955,7 +955,7 @@ static int ibmvfc_reset_crq(struct ibmvfstruct vio_dev *vdev =to_vio_dev (vhost->dev);struct ibmvfc_queue *crq = &vhost->crq; -ibmvfc_release_sub_crqs (vhost); +ibmvfc_dereg_sub_crqs (vhost);/* Close the CRQ */ do {
@@ -988,7 +988,7 @@ static int ibmvfc_reset_crq(struct ibmvfspin_unlock (vhost->crq.q_lock);spin_unlock_irqrestore (vhost->host->host_lock, flags); -ibmvfc_init_sub_crqs (vhost); +ibmvfc_reg_sub_crqs (vhost);return rc; }
@@ -5759,9 +5759,6 @@ static int ibmvfc_register_scsi_channel(ENTER ; -if (ibmvfc_alloc_queue (vhost, scrq,IBMVFC_SUB_CRQ_FMT )) -return -ENOMEM ; - rc =h_reg_sub_crq (vdev->unit_address, scrq->msg_token,PAGE_SIZE , &scrq->cookie, &scrq->hw_irq);
@@ -5801,7 +5798,6 @@ irq_failed: rc =plpar_hcall_norets (H_FREE_SUB_CRQ , vdev->unit_address, scrq->cookie); }while (rtas_busy_delay (rc)); reg_failed: -ibmvfc_free_queue (vhost, scrq);LEAVE ;return rc; }
@@ -5827,12 +5823,50 @@ static void ibmvfc_deregister_scsi_channif (rc)dev_err (dev,"Failed to free sub-crq[%d]: rc=%ld\n" , index, rc); -ibmvfc_free_queue (vhost, scrq); +/* Clean out the queue */ +memset (scrq->msgs.crq,0 ,PAGE_SIZE ); + scrq->cur =0 ; + +LEAVE ; +} + +static void ibmvfc_reg_sub_crqs (struct ibmvfc_host *vhost) +{ +int i, j; + +ENTER ; +if (!vhost->mq_enabled || !vhost->scsi_scrqs.scrqs) +return ; + +for (i =0 ; i < nr_scsi_hw_queues; i++) { +if (ibmvfc_register_scsi_channel (vhost, i)) { +for (j = i; j >0 ; j--) +ibmvfc_deregister_scsi_channel (vhost, j -1 ); + vhost->do_enquiry =0 ; +return ; + } + } + +LEAVE ; +} + +static void ibmvfc_dereg_sub_crqs (struct ibmvfc_host *vhost) +{ +int i; + +ENTER ; +if (!vhost->mq_enabled || !vhost->scsi_scrqs.scrqs) +return ; + +for (i =0 ; i < nr_scsi_hw_queues; i++) +ibmvfc_deregister_scsi_channel (vhost, i); +LEAVE ; }static void ibmvfc_init_sub_crqs (struct ibmvfc_host *vhost) { +struct ibmvfc_queue *scrq;int i, j;ENTER ;
@@ -5848,30 +5882,41 @@ static void ibmvfc_init_sub_crqs(struct }for (i =0 ; i < nr_scsi_hw_queues; i++) { -if (ibmvfc_register_scsi_channel (vhost, i)) { -for (j = i; j >0 ; j--) -ibmvfc_deregister_scsi_channel (vhost, j -1 ); + scrq = &vhost->scsi_scrqs.scrqs[i]; +if (ibmvfc_alloc_queue (vhost, scrq,IBMVFC_SUB_CRQ_FMT )) { +for (j = i; j >0 ; j--) { + scrq = &vhost->scsi_scrqs.scrqs[j -1 ]; +ibmvfc_free_queue (vhost, scrq); + }kfree (vhost->scsi_scrqs.scrqs); vhost->scsi_scrqs.scrqs =NULL ; vhost->scsi_scrqs.active_queues =0 ; vhost->do_enquiry =0 ; -break ; + vhost->mq_enabled =0 ; +return ; } } +ibmvfc_reg_sub_crqs (vhost); +LEAVE ; }static void ibmvfc_release_sub_crqs (struct ibmvfc_host *vhost) { +struct ibmvfc_queue *scrq;int i;ENTER ;if (!vhost->scsi_scrqs.scrqs)return ; -for (i =0 ; i < nr_scsi_hw_queues; i++) -ibmvfc_deregister_scsi_channel (vhost, i); +ibmvfc_dereg_sub_crqs (vhost); + +for (i =0 ; i < nr_scsi_hw_queues; i++) { + scrq = &vhost->scsi_scrqs.scrqs[i]; +ibmvfc_free_queue (vhost, scrq); + }kfree (vhost->scsi_scrqs.scrqs); vhost->scsi_scrqs.scrqs =NULL ;
Greg Kroah-Hartman
maintainerPATCH 23/181 mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing
In reply to Greg Kroah-HartmanFrom: Chevron Li <[email protected]>
commit e591fcf6b4e39335c9b128b17738fcd2fdd278ae upstream.
The result from ->get_cd() may be incorrect as the card detect debouncing isn't managed correctly. Let's fix it.
--- drivers/mmc/host/sdhci-pci-o2micro.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/sdhci-pci-o2micro.c +2 -0
@@ -152,6 +152,8 @@ static int sdhci_o2_get_cd(struct mmc_hoif (!(sdhci_readw (host,O2_PLL_DLL_WDT_CONTROL1 ) &O2_PLL_LOCK_STATUS ))sdhci_o2_enable_internal_clock (host); +else +sdhci_o2_wait_card_detect_stable (host);return !!(sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ); }
Greg Kroah-Hartman
maintainerPATCH 24/181 mmc: mediatek: wait dma stop bit reset to 0
In reply to Greg Kroah-HartmanFrom: Mengqi Zhang <[email protected]>
commit 89bcd9a64b849380ef57e3032b307574e48db524 upstream.
MediaTek IP requires that after dma stop, it need to wait this dma stop bit auto-reset to 0. When bus is in high loading state, it will take a while for the dma stop complete. If there is no waiting operation here, when program runs to clear fifo and reset, bus will hang.
In addition, there should be no return in msdc_data_xfer_next() if there is data need be transferred, because no matter what error occurs here, it should continue to excute to the following mmc_request_done. Otherwise the core layer may wait complete forever.
--- drivers/mmc/host/mtk-sd.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/mmc/host/mtk-sd.c +12 -8
@@ -1356,7 +1356,7 @@ static void msdc_data_xfer_next(struct mmsdc_request_done (host, mrq); } -static bool msdc_data_xfer_done (struct msdc_host *host,u32 events, +static void msdc_data_xfer_done (struct msdc_host *host,u32 events,struct mmc_request *mrq,struct mmc_data *data) {struct mmc_command *stop;
@@ -1376,7 +1376,7 @@ static bool msdc_data_xfer_done(struct mspin_unlock_irqrestore (&host->lock, flags);if (done) -return true; +return ; stop = data->stop;if (check_data || (stop && stop->error)) {
@@ -1385,12 +1385,15 @@ static bool msdc_data_xfer_done(struct msdr_set_field (host->base +MSDC_DMA_CTRL ,MSDC_DMA_CTRL_STOP ,1 ); + ret =readl_poll_timeout_atomic (host->base +MSDC_DMA_CTRL , val, + !(val &MSDC_DMA_CTRL_STOP ),1 ,20000 ); +if (ret) +dev_dbg (host->dev,"DMA stop timed out\n" ); + ret =readl_poll_timeout_atomic (host->base +MSDC_DMA_CFG , val, !(val &MSDC_DMA_CFG_STS ),1 ,20000 ); -if (ret) { -dev_dbg (host->dev,"DMA stop timed out\n" ); -return false; - } +if (ret) +dev_dbg (host->dev,"DMA inactive timed out\n" );sdr_clr_bits (host->base +MSDC_INTEN , data_ints_mask);dev_dbg (host->dev,"DMA stop\n" );
@@ -1415,9 +1418,7 @@ static bool msdc_data_xfer_done(struct m }msdc_data_xfer_next (host, mrq); - done = true; } -return done; }static void msdc_set_buswidth (struct msdc_host *host,u32 width)
@@ -2416,6 +2417,9 @@ static void msdc_cqe_disable(struct mmc_if (recovery) {sdr_set_field (host->base +MSDC_DMA_CTRL ,MSDC_DMA_CTRL_STOP ,1 ); +if (WARN_ON (readl_poll_timeout (host->base +MSDC_DMA_CTRL , val, + !(val &MSDC_DMA_CTRL_STOP ),1 ,3000 ))) +return ;if (WARN_ON (readl_poll_timeout (host->base +MSDC_DMA_CFG , val, !(val &MSDC_DMA_CFG_STS ),1 ,3000 )))return ;
Greg Kroah-Hartman
maintainerPATCH 25/181 xen/gntdev: Avoid blocking in unmap_grant_pages()
In reply to Greg Kroah-HartmanFrom: Demi Marie Obenour <[email protected]>
commit dbe97cff7dd9f0f75c524afdd55ad46be3d15295 upstream.
unmap_grant_pages() currently waits for the pages to no longer be used. In https://github.com/QubesOS/qubes-issues/issues/7481, this lead to a deadlock against i915: i915 was waiting for gntdev's MMU notifier to finish, while gntdev was waiting for i915 to free its pages. I also believe this is responsible for various deadlocks I have experienced in the past.
Avoid these problems by making unmap_grant_pages async. This requires making it return void, as any errors will not be available when the function returns. Fortunately, the only use of the return value is a WARN_ON(), which can be replaced by a WARN_ON when the error is detected. Additionally, a failed call will not prevent further calls from being made, but this is harmless.
Because unmap_grant_pages is now async, the grant handle will be sent to INVALID_GRANT_HANDLE too late to prevent multiple unmaps of the same handle. Instead, a separate bool array is allocated for this purpose. This wastes memory, but stuffing this information in padding bytes is too fragile. Furthermore, it is necessary to grab a reference to the map before making the asynchronous call, and release the reference when the call returns.
It is also necessary to guard against reentrancy in gntdev_map_put(), and to handle the case where userspace tries to map a mapping whose contents have not all been freed yet.
--- drivers/xen/gntdev-common.h | 7 + drivers/xen/gntdev.c | 157 +++++++++++++++++++++++++++++--------------- 2 files changed, 113 insertions(+), 51 deletions(-)
drivers/xen/gntdev-common.h +7 -0
@@ -16,6 +16,7 @@#include <linux/mmu_notifier.h> #include <linux/types.h> #include <xen/interface/event_channel.h> +#include <xen/grant_table.h> struct gntdev_dmabuf_priv ;
@@ -56,6 +57,7 @@ struct gntdev_grant_map {struct gnttab_unmap_grant_ref *unmap_ops;struct gnttab_map_grant_ref *kmap_ops;struct gnttab_unmap_grant_ref *kunmap_ops; +bool *being_removed;struct page **pages;unsigned long pages_vm_start;
@@ -73,6 +75,11 @@ struct gntdev_grant_map {/* Needed to avoid allocation in gnttab_dma_free_pages(). */ xen_pfn_t *frames;#endif + +/* Number of live grants */ +atomic_t live_grants; +/* Needed to avoid allocation in __unmap_grant_pages */ +struct gntab_unmap_queue_data unmap_data; }; struct gntdev_grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count,
drivers/xen/gntdev.c +106 -51
273 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 20/181 btrfs: add error messages to all unrecognized mount options
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
commit e3a4167c880cf889f66887a152799df4d609dd21 upstream.
Almost none of the errors stemming from a valid mount option but wrong value prints a descriptive message which would help to identify why mount failed. Like in the linked report:
$ uname -r v4.19 $ mount -o compress=zstd /dev/sdb /mnt mount: /mnt: wrong fs type, bad option, bad superblock on /dev/sdb, missing codepage or helper program, or other error. $ dmesg ... BTRFS error (device sdb): open_ctree failed
Errors caused by memory allocation failures are left out as it's not a user error so reporting that would be confusing.
--- fs/btrfs/super.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-)
fs/btrfs/super.c +32 -7
@@ -763,6 +763,8 @@ int btrfs_parse_options(struct btrfs_fs_ compress_force = false; no_compress++; }else { +btrfs_err (info,"unrecognized compression value %s" , + args[0 ].from); ret = -EINVAL ; goto out; }
@@ -821,8 +823,11 @@ int btrfs_parse_options(struct btrfs_fs_case Opt_thread_pool: ret =match_int (&args[0 ], &intarg);if (ret) { +btrfs_err (info,"unrecognized thread_pool value %s" , + args[0 ].from); goto out; }else if (intarg ==0 ) { +btrfs_err (info,"invalid value 0 for thread_pool" ); ret = -EINVAL ; goto out; }
@@ -883,8 +888,11 @@ int btrfs_parse_options(struct btrfs_fs_break ;case Opt_ratio: ret =match_int (&args[0 ], &intarg); -if (ret) +if (ret) { +btrfs_err (info,"unrecognized metadata_ratio value %s" , + args[0 ].from); goto out; + } info->metadata_ratio = intarg;btrfs_info (info,"metadata ratio %u" , info->metadata_ratio);
@@ -901,6 +909,8 @@ int btrfs_parse_options(struct btrfs_fs_btrfs_set_and_info (info,DISCARD_ASYNC ,"turning on async discard" ); }else { +btrfs_err (info,"unrecognized discard mode value %s" , + args[0 ].from); ret = -EINVAL ; goto out; }
@@ -933,6 +943,8 @@ int btrfs_parse_options(struct btrfs_fs_btrfs_set_and_info (info,FREE_SPACE_TREE ,"enabling free space tree" ); }else { +btrfs_err (info,"unrecognized space_cache value %s" , + args[0 ].from); ret = -EINVAL ; goto out; }
@@ -1014,8 +1026,12 @@ int btrfs_parse_options(struct btrfs_fs_break ;case Opt_check_integrity_print_mask: ret =match_int (&args[0 ], &intarg); -if (ret) +if (ret) { +btrfs_err (info, +"unrecognized check_integrity_print_mask value %s" , + args[0 ].from); goto out; + } info->check_integrity_print_mask = intarg;btrfs_info (info,"check_integrity_print_mask 0x%x" , info->check_integrity_print_mask);
@@ -1030,13 +1046,15 @@ int btrfs_parse_options(struct btrfs_fs_ goto out;#endif case Opt_fatal_errors: -if (strcmp (args[0 ].from,"panic" ) ==0 ) +if (strcmp (args[0 ].from,"panic" ) ==0 ) {btrfs_set_opt (info->mount_opt,PANIC_ON_FATAL_ERROR ); -else if (strcmp (args[0 ].from,"bug" ) ==0 ) + }else if (strcmp (args[0 ].from,"bug" ) ==0 ) {btrfs_clear_opt (info->mount_opt,PANIC_ON_FATAL_ERROR ); -else { + }else { +btrfs_err (info,"unrecognized fatal_errors value %s" , + args[0 ].from); ret = -EINVAL ; goto out; }
@@ -1044,8 +1062,12 @@ int btrfs_parse_options(struct btrfs_fs_case Opt_commit_interval: intarg =0 ; ret =match_int (&args[0 ], &intarg); -if (ret) +if (ret) { +btrfs_err (info,"unrecognized commit_interval value %s" , + args[0 ].from); + ret = -EINVAL ; goto out; + }if (intarg ==0 ) { btrfs_info(info, "using default commit interval %us",
@@ -1059,8 +1081,11 @@ int btrfs_parse_options(struct btrfs_fs_break ;case Opt_rescue: ret =parse_rescue_options (info, args[0 ].from); -if (ret <0 ) +if (ret <0 ) { +btrfs_err (info,"unrecognized rescue value %s" , + args[0 ].from); goto out; + }break ;#ifdef CONFIG_BTRFS_DEBUG case Opt_fragment_all:
Greg Kroah-Hartman
maintainerPATCH 1/181 random: schedule mix_interrupt_randomness() less often
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit 534d2eaf1970274150596fdd2bf552721e65d6b2 upstream.
It used to be that mix_interrupt_randomness() would credit 1 bit each time it ran, and so add_interrupt_randomness() would schedule mix() to run every 64 interrupts, a fairly arbitrary number, but nonetheless considered to be a decent enough conservative estimate.
Since e3e33fc2ea7f ("random: do not use input pool from hard IRQs"), mix() is now able to credit multiple bits, depending on the number of calls to add(). This was done for reasons separate from this commit, but it has the nice side effect of enabling this patch to schedule mix() less often.
Currently the rules are:
a) Credit 1 bit for every 64 calls to add().
b) Schedule mix() once a second that add() is called.
c) Schedule mix() once every 64 calls to add().
Rules (a) and (c) no longer need to be coupled. It's still important to have _some_ value in (c), so that we don't "over-saturate" the fast pool, but the once per second we get from rule (b) is a plenty enough baseline. So, by increasing the 64 in rule (c) to something larger, we avoid calling queue_work_on() as frequently during irq storms.
This commit changes that 64 in rule (c) to be 1024, which means we schedule mix() 16 times less often. And it does *not* need to change the 64 in rule (a).
--- drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/random.c +1 -1
@@ -1038,7 +1038,7 @@ void add_interrupt_randomness(int irq)if (new_count &MIX_INFLIGHT )return ; -if (new_count <64 && !time_is_before_jiffies (fast_pool->last +HZ )) +if (new_count <1024 && !time_is_before_jiffies (fast_pool->last +HZ ))return ;if (unlikely (!fast_pool->mix.func))
Greg Kroah-Hartman
maintainerPATCH 13/181 ipv4: ping: fix bind address validity check
In reply to Greg Kroah-HartmanFrom: Riccardo Paolo Bestetti <[email protected]>
commit b4a028c4d031c27704ad73b1195ca69a1206941e upstream.
Commit 8ff978b8b222 ("ipv4/raw: support binding to nonlocal addresses") introduced a helper function to fold duplicated validity checks of bind addresses into inet_addr_valid_or_nonlocal(). However, this caused an unintended regression in ping_check_bind_addr(), which previously would reject binding to multicast and broadcast addresses, but now these are both incorrectly allowed as reported in [1].
This patch restores the original check. A simple reordering is done to improve readability and make it evident that multicast and broadcast addresses should not be allowed. Also, add an early exit for INADDR_ANY which replaces lost behavior added by commit 0ce779a9f501 ("net: Avoid unnecessary inet_addr_type() call when addr is INADDR_ANY").
Furthermore, this patch introduces regression selftests to catch these specific cases.
[1] https://lore.kernel.org/netdev/CANP3RGdkAcDyAZoT1h8Gtuu0saq+eOrrTiWbxnOs+5zn+cpyKg@mail.gmail.com/
--- net/ipv4/ping.c | 10 ++++++--- tools/testing/selftests/net/fcnal-test.sh | 33 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-)
net/ipv4/ping.c +7 -3
@@ -319,12 +319,16 @@ static int ping_check_bind_addr(struct spr_debug ("ping_check_bind_addr(sk=%p,addr=%pI4,port=%d)\n" , sk, &addr->sin_addr.s_addr,ntohs (addr->sin_port)); +if (addr->sin_addr.s_addr ==htonl (INADDR_ANY )) +return 0 ; + tb_id =l3mdev_fib_table_by_index (net, sk->sk_bound_dev_if) ? : tb_id; chk_addr_ret =inet_addr_type_table (net, addr->sin_addr.s_addr, tb_id); -if (!inet_addr_valid_or_nonlocal (net,inet_sk (sk), - addr->sin_addr.s_addr, - chk_addr_ret)) +if (chk_addr_ret ==RTN_MULTICAST || + chk_addr_ret ==RTN_BROADCAST || + (chk_addr_ret !=RTN_LOCAL && + !inet_can_nonlocal_bind (net, isk)))return -EADDRNOTAVAIL ;#if IS_ENABLED (CONFIG_IPV6 )
tools/testing/selftests/net/fcnal-test.sh +33 -0
@@ -70,6 +70,10 @@ NSB_LO_IP6=2001:db8:2::2 NL_IP=172.17.1.1 NL_IP6=2001:db8:4::1 +# multicast and broadcast addresses +MCAST_IP=224.0.0.1 +BCAST_IP=255.255.255.255 + MD5_PW=abc123 MD5_WRONG_PW=abc1234
@@ -308,6 +312,9 @@ addr2str() 127.0.0.1) echo "loopback";; ::1) echo "IPv6 loopback";; + ${BCAST_IP}) echo "broadcast";; + ${MCAST_IP}) echo "multicast";; + ${NSA_IP}) echo "ns-A IP";; ${NSA_IP6}) echo "ns-A IPv6";; ${NSA_LO_IP}) echo "ns-A loopback IP";;
@@ -1801,6 +1808,19 @@ ipv4_addr_bind_novrf() log_test_addr ${a} $? 0 "Raw socket bind to nonlocal address after device bind" # + # check that ICMP sockets cannot bind to broadcast and multicast addresses + # + a=${BCAST_IP} + log_start + run_cmd nettest -s -R -P icmp -l ${a} -b + log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address" + + a=${MCAST_IP} + log_start + run_cmd nettest -s -R -P icmp -f -l ${a} -b + log_test_addr ${a} $? 1 "ICMP socket bind to multicast address" + + # # tcp sockets # a=${NSA_IP}
@@ -1858,6 +1878,19 @@ ipv4_addr_bind_vrf() log_test_addr ${a} $? 0 "Raw socket bind to nonlocal address after VRF bind" # + # check that ICMP sockets cannot bind to broadcast and multicast addresses + # + a=${BCAST_IP} + log_start + run_cmd nettest -s -R -P icmp -l ${a} -I ${VRF} -b + log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address after VRF bind" + + a=${MCAST_IP} + log_start + run_cmd nettest -s -R -P icmp -f -l ${a} -I ${VRF} -b + log_test_addr ${a} $? 1 "ICMP socket bind to multicast address after VRF bind" + + # # tcp sockets # for a in ${NSA_IP} ${VRF_IP}
Greg Kroah-Hartman
maintainerPATCH 17/181 9p: fix EBADF errors in cached mode
In reply to Greg Kroah-HartmanFrom: Dominique Martinet <[email protected]>
commit b0017602fdf6bd3f344dd49eaee8b6ffeed6dbac upstream.
cached operations sometimes need to do invalid operations (e.g. read on a write only file)
Historic fscache had added a "writeback fid", a special handle opened RW as root, for this. The conversion to new fscache missed that bit.
This commit reinstates a slightly lesser variant of the original code that uses the writeback fid for partial pages backfills if the regular user fid had been open as WRONLY, and thus would lack read permissions.
--- fs/9p/vfs_addr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/9p/vfs_addr.c +13 -0
@@ -58,8 +58,21 @@ static void v9fs_issue_read(struct netfs*/ static int v9fs_init_request (struct netfs_io_request *rreq,struct file *file) { +struct inode *inode =file_inode (file); +struct v9fs_inode *v9inode =V9FS_I (inode);struct p9_fid *fid = file->private_data; +BUG_ON (!fid); + +/* we might need to read from a fid that was opened write-only +* for read-modify-write of page cache, use the writeback fid +* for that */ +if (rreq->origin ==NETFS_READ_FOR_WRITE && + (fid->mode &O_ACCMODE ) ==O_WRONLY ) { + fid = v9inode->writeback_fid; +BUG_ON (!fid); + } +refcount_inc (&fid->count); rreq->netfs_priv = fid;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 19/181 btrfs: prevent remounting to v1 space cache for subpage mount
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 0591f04036218d572d54349ea8c7914ad9c82b2b upstream.
Upstream commit 9f73f1aef98b ("btrfs: force v2 space cache usage for subpage mount") forces subpage mount to use v2 cache, to avoid deprecated v1 cache which doesn't support subpage properly.
But there is a loophole that user can still remount to v1 cache.
The existing check will only give users a warning, but does not really prevent to do the remount.
Although remounting to v1 will not cause any problems since the v1 cache will always be marked invalid when mounted with a different page size, it's still better to prevent v1 cache at all for subpage mounts.
--- fs/btrfs/super.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/super.c +8 -0
@@ -1986,6 +1986,14 @@ static int btrfs_remount(struct super_blif (ret) goto restore; +/* V1 cache is not supported for subpage mount. */ +if (fs_info->sectorsize <PAGE_SIZE &&btrfs_test_opt (fs_info,SPACE_CACHE )) { +btrfs_warn (fs_info, +"v1 space cache is not supported for page size %lu with sectorsize %u" , +PAGE_SIZE , fs_info->sectorsize); + ret = -EINVAL ; + goto restore; + }btrfs_remount_begin (fs_info, old_opts, *flags);btrfs_resize_thread_pool (fs_info, fs_info->thread_pool_size, old_thread_pool_size);
Greg Kroah-Hartman
maintainerPATCH 26/181 MAINTAINERS: Add new IOMMU development mailing list
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
commit c242507c1b895646b4a25060df13b6214805759f upstream.
The IOMMU mailing list will move from lists.linux-foundation.org to lists.linux.dev. The hard switch of the archive will happen on July 5th, but add the new list now already so that people start using the list when sending patches. After July 5th the old list will disappear.
--- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
@@ -427,6 +427,7 @@ ACPI VIOT DRIVER M: Jean-Philippe Brucker <[email protected]> L: [email protected] L: [email protected] +L: [email protected] S: Maintained F: drivers/acpi/viot.c F: include/linux/acpi_viot.h
@@ -960,6 +961,7 @@ AMD IOMMU (AMD-VI) M: Joerg Roedel <[email protected]> R: Suravee Suthikulpanit <[email protected]> L: [email protected] +L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: drivers/iommu/amd/
@@ -5898,6 +5900,7 @@ M: Christoph Hellwig <[email protected]> M: Marek Szyprowski <[email protected]> R: Robin Murphy <[email protected]> L: [email protected] +L: [email protected] S: Supported W: http://git.infradead.org/users/hch/dma-mapping.git T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -5910,6 +5913,7 @@ F: kernel/dma/ DMA MAPPING BENCHMARK M: Xiang Chen <[email protected]> L: [email protected] +L: [email protected] F: kernel/dma/map_benchmark.c F: tools/testing/selftests/dma/
@@ -7476,6 +7480,7 @@ F: drivers/gpu/drm/exynos/exynos_dp* EXYNOS SYSMMU (IOMMU) driver M: Marek Szyprowski <[email protected]> L: [email protected] +L: [email protected] S: Maintained F: drivers/iommu/exynos-iommu.c
@@ -9875,6 +9880,7 @@ INTEL IOMMU (VT-d) M: David Woodhouse <[email protected]> M: Lu Baolu <[email protected]> L: [email protected] +L: [email protected] S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: drivers/iommu/intel/
@@ -10253,6 +10259,7 @@ IOMMU DRIVERS M: Joerg Roedel <[email protected]> M: Will Deacon <[email protected]> L: [email protected] +L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: Documentation/devicetree/bindings/iommu/
@@ -12369,6 +12376,7 @@ F: drivers/i2c/busses/i2c-mt65xx.c MEDIATEK IOMMU DRIVER M: Yong Wu <[email protected]> L: [email protected] +L: [email protected] L: [email protected] (moderated for non-subscribers) S: Supported F: Documentation/devicetree/bindings/iommu/mediatek*
@@ -16354,6 +16362,7 @@ F: drivers/i2c/busses/i2c-qcom-cci.c QUALCOMM IOMMU M: Rob Clark <[email protected]> L: [email protected] +L: [email protected] L: [email protected] S: Maintained F: drivers/iommu/arm/arm-smmu/qcom_iommu.c
@@ -18939,6 +18948,7 @@ F: arch/x86/boot/video* SWIOTLB SUBSYSTEM M: Christoph Hellwig <[email protected]> L: [email protected] +L: [email protected] S: Supported W: http://git.infradead.org/users/hch/dma-mapping.git T: git git://git.infradead.org/users/hch/dma-mapping.git
@@ -21609,6 +21619,7 @@ M: Juergen Gross <[email protected]> M: Stefano Stabellini <[email protected]> L: [email protected] (moderated for non-subscribers) L: [email protected] +L: [email protected] S: Supported F: arch/x86/xen/*swiotlb* F: drivers/xen/*swiotlb*
Greg Kroah-Hartman
maintainerPATCH 27/181 mtd: rawnand: gpmi: Fix setting busy timeout setting
In reply to Greg Kroah-HartmanFrom: Sascha Hauer <[email protected]>
commit 06781a5026350cde699d2d10c9914a25c1524f45 upstream.
The DEVICE_BUSY_TIMEOUT value is described in the Reference Manual as:
| Timeout waiting for NAND Ready/Busy or ATA IRQ. Used in WAIT_FOR_READY | mode. This value is the number of GPMI_CLK cycles multiplied by 4096.
So instead of multiplying the value in cycles with 4096, we have to divide it by that value. Use DIV_ROUND_UP to make sure we are on the safe side, especially when the calculated value in cycles is smaller than 4096 as typically the case.
This bug likely never triggered because any timeout != 0 usually will do. In my case the busy timeout in cycles was originally calculated as 2408, which multiplied with 4096 is 0x968000. The lower 16 bits were taken for the 16 bit wide register field, so the register value was 0x8000. With 2970bf5a32f0 ("mtd: rawnand: gpmi: fix controller timings setting") however the value in cycles became 2384, which multiplied with 4096 is 0x950000. The lower 16 bit are 0x0 now resulting in an intermediate timeout when reading from NAND.
--- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +1 -1
@@ -695,7 +695,7 @@ static int gpmi_nfc_compute_timings(stru hw->timing0 =BF_GPMI_TIMING0_ADDRESS_SETUP (addr_setup_cycles) |BF_GPMI_TIMING0_DATA_HOLD (data_hold_cycles) |BF_GPMI_TIMING0_DATA_SETUP (data_setup_cycles); - hw->timing1 =BF_GPMI_TIMING1_BUSY_TIMEOUT (busy_timeout_cycles *4096 ); + hw->timing1 =BF_GPMI_TIMING1_BUSY_TIMEOUT (DIV_ROUND_UP (busy_timeout_cycles,4096 ));/* * Derive NFC ideal delay from {3}:
Greg Kroah-Hartman
maintainerPATCH 28/181 ata: libata: add qc->flags in ata_qc_complete_template tracepoint
In reply to Greg Kroah-HartmanFrom: Edward Wu <[email protected]>
commit 540a92bfe6dab7310b9df2e488ba247d784d0163 upstream.
Add flags value to check the result of ata completion
--- include/trace/events/libata.h | 1 + 1 file changed, 1 insertion(+)
include/trace/events/libata.h +1 -0
@@ -288,6 +288,7 @@ DECLARE_EVENT_CLASS(ata_qc_complete_temp __entry->hob_feature = qc->result_tf.hob_feature; __entry->nsect = qc->result_tf.nsect; __entry->hob_nsect = qc->result_tf.hob_nsect; + __entry->flags = qc->flags; ), TP_printk("ata_port=%u ata_dev=%u tag=%d flags=%s status=%s " \
Greg Kroah-Hartman
maintainerPATCH 29/181 dm era: commit metadata in postsuspend after worker stops
In reply to Greg Kroah-HartmanFrom: Nikos Tsironis <[email protected]>
commit 9ae6e8b1c9bbf6874163d1243e393137313762b7 upstream.
During postsuspend dm-era does the following:
1. Archives the current era
2. Commits the metadata, as part of the RPC call for archiving the current era
3. Stops the worker
Until the worker stops, it might write to the metadata again. Moreover, these writes are not flushed to disk immediately, but are cached by the dm-bufio client, which writes them back asynchronously.
As a result, the committed metadata of a suspended dm-era device might not be consistent with the in-core metadata.
In some cases, this can result in the corruption of the on-disk metadata. Suppose the following sequence of events:
1. Load a new table, e.g. a snapshot-origin table, to a device with a dm-era table
2. Suspend the device
3. dm-era commits its metadata, but the worker does a few more metadata writes until it stops, as part of digesting an archived writeset
4. These writes are cached by the dm-bufio client
5. Load the dm-era table to another device.
6. The new instance of the dm-era target loads the committed, on-disk metadata, which don't include the extra writes done by the worker after the metadata commit.
7. Resume the new device
8. The new dm-era target instance starts using the metadata
9. Resume the original device
10. The destructor of the old dm-era target instance is called and destroys the dm-bufio client, which results in flushing the cached writes to disk
11. These writes might overwrite the writes done by the new dm-era instance, hence corrupting its metadata.
Fix this by committing the metadata after the worker stops running.
stop_worker uses flush_workqueue to flush the current work. However, the work item may re-queue itself and flush_workqueue doesn't wait for re-queued works to finish.
This could result in the worker changing the metadata after they have been committed, or writing to the metadata concurrently with the commit in the postsuspend thread.
Use drain_workqueue instead, which waits until the work and all re-queued works finish.
--- drivers/md/dm-era-target.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/md/dm-era-target.c +7 -1
@@ -1400,7 +1400,7 @@ static void start_worker(struct era *erastatic void stop_worker (struct era *era) {atomic_set (&era->suspended,1 ); -flush_workqueue (era->wq); +drain_workqueue (era->wq); }/*----------------------------------------------------------------
@@ -1570,6 +1570,12 @@ static void era_postsuspend(struct dm_ta }stop_worker (era); + + r =metadata_commit (era->md); +if (r) { +DMERR ("%s: metadata_commit failed" , __func__); +/* FIXME: fail mode */ + } }static int era_preresume (struct dm_target *ti)
Greg Kroah-Hartman
maintainerPATCH 30/181 dm: do not return early from dm_io_complete if BLK_STS_AGAIN without polling
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 78ccef91234ba331c04d71f3ecb1377451d21056 upstream.
Commit 5291984004edf ("dm: fix bio polling to handle possibile BLK_STS_AGAIN") inadvertently introduced an early return from dm_io_complete() without first queueing the bio to DM if BLK_STS_AGAIN occurs and bio-polling is _not_ being used.
Fix this by only returning early from dm_io_complete() if the bio has first been properly queued to DM. Otherwise, the bio will never finish via bio_endio.
--- drivers/md/dm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/dm.c +3 -1
@@ -899,9 +899,11 @@ static void dm_io_complete(struct dm_ioif (io_error ==BLK_STS_AGAIN ) {/* io_uring doesn't handle BLK_STS_AGAIN (yet) */ queue_io (md, bio); +return ; } } -return ; +if (io_error ==BLK_STS_DM_REQUEUE ) +return ; }if (bio_is_flush_with_data (bio)) {
Greg Kroah-Hartman
maintainerPATCH 7/181 ALSA: hda/realtek: Add mute LED quirk for HP Omen laptop
In reply to Greg Kroah-HartmanFrom: Soham Sen <[email protected]>
commit b2e6b3d9bbb0a59ba7c710cc06e44cc548301f5f upstream.
The HP Omen 15 laptop needs a quirk to toggle the mute LED. It already is implemented for a different variant of the HP Omen laptop so a fixup entry is needed for this variant.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9074,6 +9074,7 @@ static const struct snd_pci_quirk alc269 ALC285_FIXUP_HP_GPIO_AMP_INIT),SND_PCI_QUIRK (0x103c ,0x8783 ,"HP ZBook Fury 15 G7 Mobile Workstation" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), +SND_PCI_QUIRK (0x103c ,0x8787 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 81/181 x86/xen: Remove undefined behavior in setup_features()
In reply to Greg Kroah-HartmanFrom: Julien Grall <[email protected]>
[ Upstream commit ecb6237fa397b7b810d798ad19322eca466dbab1 ]
1 << 31 is undefined. So switch to 1U << 31.
--- drivers/xen/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/features.c +1 -1
@@ -42,7 +42,7 @@ void xen_setup_features(void)if (HYPERVISOR_xen_version (XENVER_get_features, &fi) <0 )break ;for (j =0 ; j <32 ; j++) - xen_features[i *32 + j] = !!(fi.submap &1 <<j); + xen_features[i *32 + j] = !!(fi.submap &1U << j); }if (xen_pv_domain ()) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/181 tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher()
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu (Google) <[email protected]>
commit cc72b72073ac982a954d3b43519ca1c28f03c27c upstream.
There is a small chance that get_kretprobe(ri) returns NULL in kretprobe_dispatcher() when another CPU unregisters the kretprobe right after __kretprobe_trampoline_handler().
To avoid this issue, kretprobe_dispatcher() checks the get_kretprobe() return value again. And if it is NULL, it returns soon because that kretprobe is under unregistering process.
This issue has been introduced when the kretprobe is decoupled from the struct kretprobe_instance by commit d741bf41d7c7 ("kprobes: Remove kretprobe hash"). Before that commit, the struct kretprob_instance::rp directly points the kretprobe and it is never be NULL.
--- kernel/trace/trace_kprobe.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel/trace/trace_kprobe.c +10 -1
@@ -1718,8 +1718,17 @@ static int kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs) { struct kretprobe *rp = get_kretprobe(ri); - struct trace_kprobe *tk = container_of(rp, struct trace_kprobe, rp); +struct trace_kprobe *tk; +/* +* There is a small chance that get_kretprobe(ri) returns NULL when +* the kretprobe is unregister on another CPU between kretprobe's +* trampoline_handler and this function. +*/ +if (unlikely (!rp)) +return 0 ; + + tk = container_of(rp, struct trace_kprobe, rp);raw_cpu_inc (*tk->nhit);if (trace_probe_test_flag (&tk->tp,TP_FLAG_TRACE ))
Greg Kroah-Hartman
maintainerPATCH 55/181 phy: aquantia: Fix AN when higher speeds than 1G are not advertised
In reply to Greg Kroah-HartmanFrom: Claudiu Manoil <[email protected]>
[ Upstream commit 9b7fd1670a94a57d974795acebde843a5c1a354e ]
Even when the eth port is resticted to work with speeds not higher than 1G, and so the eth driver is requesting the phy (via phylink) to advertise up to 1000BASET support, the aquantia phy device is still advertising for 2.5G and 5G speeds.
Clear these advertising defaults when requested.
--- drivers/net/phy/aquantia_main.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/phy/aquantia_main.c +14 -1
@@ -34,6 +34,8 @@#define MDIO_AN_VEND_PROV 0xc400#define MDIO_AN_VEND_PROV_1000BASET_FULL BIT(15)#define MDIO_AN_VEND_PROV_1000BASET_HALF BIT(14) +#define MDIO_AN_VEND_PROV_5000BASET_FULL BIT(11) +#define MDIO_AN_VEND_PROV_2500BASET_FULL BIT(10)#define MDIO_AN_VEND_PROV_DOWNSHIFT_EN BIT(4)#define MDIO_AN_VEND_PROV_DOWNSHIFT_MASK GENMASK(3, 0)#define MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT 4
@@ -231,9 +233,20 @@ static int aqr_config_aneg(struct phy_device *phydev) phydev->advertising)) reg |=MDIO_AN_VEND_PROV_1000BASET_HALF ; +/* Handle the case when the 2.5G and 5G speeds are not advertised */ +if (linkmode_test_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->advertising)) + reg |=MDIO_AN_VEND_PROV_2500BASET_FULL ; + +if (linkmode_test_bit (ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + phydev->advertising)) + reg |=MDIO_AN_VEND_PROV_5000BASET_FULL ; + ret =phy_modify_mmd_changed (phydev,MDIO_MMD_AN ,MDIO_AN_VEND_PROV ,MDIO_AN_VEND_PROV_1000BASET_HALF | -MDIO_AN_VEND_PROV_1000BASET_FULL , reg); +MDIO_AN_VEND_PROV_1000BASET_FULL | +MDIO_AN_VEND_PROV_2500BASET_FULL | +MDIO_AN_VEND_PROV_5000BASET_FULL , reg);if (ret <0 )return ret;if (ret >0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/181 block: disable the elevator int del_gendisk
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 50e34d78815e474d410f342fbe783b18192ca518 ]
The elevator is only used for file system requests, which are stopped in del_gendisk. Move disabling the elevator and freeing the scheduler tags to the end of del_gendisk instead of doing that work in disk_release and blk_cleanup_queue to avoid a use after free on q->tag_set from disk_release as the tag_set might not be alive at that point.
Move the blk_qos_exit call as well, as it just depends on the elevator exit and would be the only reason to keep the not exactly cheap queue freeze in disk_release.
--- block/blk-core.c | 13 ------------- block/genhd.c | 39 +++++++++++---------------------------- 2 files changed, 11 insertions(+), 41 deletions(-)
block/blk-core.c +0 -13
@@ -322,19 +322,6 @@ void blk_cleanup_queue(struct request_queue *q)blk_mq_exit_queue (q); } -/* -* In theory, request pool of sched_tags belongs to request queue. -* However, the current implementation requires tag_set for freeing -* requests, so free the pool now. -* -* Queue has become frozen, there can't be any in-queue requests, so -* it is safe to free requests now. -*/ -mutex_lock (&q->sysfs_lock); -if (q->elevator) -blk_mq_sched_free_rqs (q); -mutex_unlock (&q->sysfs_lock); -/* @q is and will stay empty, shutdown and put */ blk_put_queue (q); }
block/genhd.c +11 -28
@@ -652,6 +652,17 @@ void del_gendisk(struct gendisk *disk)blk_sync_queue (q);blk_flush_integrity (); +blk_mq_cancel_work_sync (q); + +blk_mq_quiesce_queue (q); +if (q->elevator) { +mutex_lock (&q->sysfs_lock); +elevator_exit (q); +mutex_unlock (&q->sysfs_lock); + } +rq_qos_exit (q); +blk_mq_unquiesce_queue (q); +/* * Allow using passthrough request again after the queue is torn down. */
@@ -1120,31 +1131,6 @@ static const struct attribute_group *disk_attr_groups[] = { NULL }; -static void disk_release_mq (struct request_queue *q) -{ -blk_mq_cancel_work_sync (q); - -/* -* There can't be any non non-passthrough bios in flight here, but -* requests stay around longer, including passthrough ones so we -* still need to freeze the queue here. -*/ -blk_mq_freeze_queue (q); - -/* -* Since the I/O scheduler exit code may access cgroup information, -* perform I/O scheduler exit before disassociating from the block -* cgroup controller. -*/ -if (q->elevator) { -mutex_lock (&q->sysfs_lock); -elevator_exit (q); -mutex_unlock (&q->sysfs_lock); - } -rq_qos_exit (q); -__blk_mq_unfreeze_queue (q, true); -} -/** * disk_release - releases all allocated resources of the gendisk * @dev: the device representing this disk
@@ -1166,9 +1152,6 @@ static void disk_release(struct device *dev)might_sleep ();WARN_ON_ONCE (disk_live (disk)); -if (queue_is_mq (disk->queue)) -disk_release_mq (disk->queue); -blkcg_exit_queue (disk->queue);disk_release_events (disk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/181 USB: serial: option: add Telit LE910Cx 0x1250 composition
In reply to Greg Kroah-HartmanFrom: Carlo Lobrano <[email protected]>
commit 342fc0c3b345525da21112bd0478a0dc741598ea upstream.
Add support for the following Telit LE910Cx composition:
0x1250: rmnet, tty, tty, tty, tty
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -1279,6 +1279,7 @@ static const struct usb_device_id option .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1231, 0xff), /* Telit LE910Cx (RNDIS) */ .driver_info = NCTRL(2) | RSVD(3) }, + { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x1250, 0xff, 0x00, 0x00) }, /* Telit LE910Cx (rmnet) */ { USB_DEVICE(TELIT_VENDOR_ID, 0x1260), .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, { USB_DEVICE(TELIT_VENDOR_ID, 0x1261),
Greg Kroah-Hartman
maintainerPATCH 31/181 dm mirror log: clear log bits up to BITS_PER_LONG boundary
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 90736eb3232d208ee048493f371075e4272e0944 upstream.
Commit 85e123c27d5c ("dm mirror log: round up region bitmap size to BITS_PER_LONG") introduced a regression on 64-bit architectures in the lvm testsuite tests: lvcreate-mirror, mirror-names and vgsplit-operation.
If the device is shrunk, we need to clear log bits beyond the end of the device. The code clears bits up to a 32-bit boundary and then calculates lc->sync_count by summing set bits up to a 64-bit boundary (the commit changed that; previously, this boundary was 32-bit too). So, it was using some non-zeroed bits in the calculation and this caused misbehavior.
Fix this regression by clearing bits up to BITS_PER_LONG boundary.
--- drivers/md/dm-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-log.c +1 -1
@@ -615,7 +615,7 @@ static int disk_resume(struct dm_dirty_llog_clear_bit (lc, lc->clean_bits, i);/* clear any old bits -- device has shrunk */ -for (i = lc->region_count; i % (sizeof (*lc->clean_bits) <<BYTE_SHIFT ); i++) +for (i = lc->region_count; i %BITS_PER_LONG ; i++)log_clear_bit (lc, lc->clean_bits, i);/* copy clean across to sync */
Greg Kroah-Hartman
maintainerPATCH 5/181 ALSA: hda: Fix discovery of i915 graphics PCI device
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 36a38c53b4ee51b90566f8f44a613601eb31a10e upstream.
It's been reported that the recent fix for skipping the component-binding with D-GPU caused a regression on some systems; it resulted in the completely missing component binding with i915 GPU.
The problem was the use of pci_get_class() function. It matches with the full PCI class bits, while we want to match only partially the PCI base class bits. So, when a system has an i915 graphics device with the PCI class 0380, it won't hit because we're looking for only the PCI class 0300.
This patch fixes i915_gfx_present() to look up each PCI device and match with PCI base class explicitly instead of pci_get_class().
--- sound/hda/hdac_i915.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
sound/hda/hdac_i915.c +6 -9
@@ -119,21 +119,18 @@ static int i915_component_master_match(struct device *dev, int subcomponent,/* check whether Intel graphics is present and reachable */ static int i915_gfx_present (struct pci_dev *hdac_pci) { -unsigned int class =PCI_BASE_CLASS_DISPLAY <<16 ;struct pci_dev *display_dev =NULL ; -bool match = false; -do { - display_dev =pci_get_class (class, display_dev); - -if (display_dev && display_dev->vendor ==PCI_VENDOR_ID_INTEL && +for_each_pci_dev (display_dev) { +if (display_dev->vendor ==PCI_VENDOR_ID_INTEL && + (display_dev->class >>16 ) ==PCI_BASE_CLASS_DISPLAY &&connectivity_check (display_dev, hdac_pci)) {pci_dev_put (display_dev); - match = true; +return true; } - }while (!match && display_dev); + } -return match; +return false; }/**
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 80/181 xen-blkfront: Handle NULL gendisk
In reply to Greg Kroah-HartmanFrom: Jason Andryuk <[email protected]>
[ Upstream commit f9710c357e5bbf64d7ce45ba0bc75a52222491c1 ]
When a VBD is not fully created and then closed, the kernel can have a NULL pointer dereference:
The reproducer is trivial:
[user@dom0 ~]$ sudo xl block-attach work backend=sys-usb vdev=xvdi target=/dev/sdz [user@dom0 ~]$ xl block-list work
Vdev BE handle state evt-ch ring-ref BE-path 51712 0 241 4 -1 -1 /local/domain/0/backend/vbd/241/51712 51728 0 241 4 -1 -1 /local/domain/0/backend/vbd/241/51728 51744 0 241 4 -1 -1 /local/domain/0/backend/vbd/241/51744 51760 0 241 4 -1 -1 /local/domain/0/backend/vbd/241/51760 51840 3 241 3 -1 -1 /local/domain/3/backend/vbd/241/51840
^ note state, the /dev/sdz doesn't exist in the backend
[user@dom0 ~]$ sudo xl block-detach work xvdi
[user@dom0 ~]$ xl block-list work
Vdev BE handle state evt-ch ring-ref BE-path
work is an invalid domain identifier
And its console has:
BUG: kernel NULL pointer dereference, address: 0000000000000050 PGD 80000000edebb067 P4D 80000000edebb067 PUD edec2067 PMD 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 52 Comm: xenwatch Not tainted 5.16.18-2.43.fc32.qubes.x86_64 #1 RIP: 0010:blk_mq_stop_hw_queues+0x5/0x40 Code: 00 48 83 e0 fd 83 c3 01 48 89 85 a8 00 00 00 41 39 5c 24 50 77 c0 5b 5d 41 5c 41 5d c3 c3 0f 1f 80 00 00 00 00 0f 1f 44 00 00 <8b> 47 50 85 c0 74 32 41 54 49 89 fc 55 53 31 db 49 8b 44 24 48 48 RSP: 0018:ffffc90000bcfe98 EFLAGS: 00010293 RAX: ffffffffc0008370 RBX: 0000000000000005 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000005 RDI: 0000000000000000 RBP: ffff88800775f000 R08: 0000000000000001 R09: ffff888006e620b8 R10: ffff888006e620b0 R11: f000000000000000 R12: ffff8880bff39000 R13: ffff8880bff39000 R14: 0000000000000000 R15: ffff88800604be00 FS: 0000000000000000(0000) GS:ffff8880f3300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000050 CR3: 00000000e932e002 CR4: 00000000003706e0 Call Trace: <TASK> blkback_changed+0x95/0x137 [xen_blkfront] ? read_reply+0x160/0x160 xenwatch_thread+0xc0/0x1a0 ? do_wait_intr_irq+0xa0/0xa0 kthread+0x16b/0x190 ? set_kthread_struct+0x40/0x40 ret_from_fork+0x22/0x30 </TASK> Modules linked in: snd_seq_dummy snd_hrtimer snd_seq snd_seq_device snd_timer snd soundcore ipt_REJECT nf_reject_ipv4 xt_state xt_conntrack nft_counter nft_chain_nat xt_MASQUERADE nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nft_compat nf_tables nfnetlink intel_rapl_msr intel_rapl_common crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel xen_netfront pcspkr xen_scsiback target_core_mod xen_netback xen_privcmd xen_gntdev xen_gntalloc xen_blkback xen_evtchn ipmi_devintf ipmi_msghandler fuse bpf_preload ip_tables overlay xen_blkfront CR2: 0000000000000050 ---[ end trace 7bc9597fd06ae89d ]--- RIP: 0010:blk_mq_stop_hw_queues+0x5/0x40 Code: 00 48 83 e0 fd 83 c3 01 48 89 85 a8 00 00 00 41 39 5c 24 50 77 c0 5b 5d 41 5c 41 5d c3 c3 0f 1f 80 00 00 00 00 0f 1f 44 00 00 <8b> 47 50 85 c0 74 32 41 54 49 89 fc 55 53 31 db 49 8b 44 24 48 48 RSP: 0018:ffffc90000bcfe98 EFLAGS: 00010293 RAX: ffffffffc0008370 RBX: 0000000000000005 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000005 RDI: 0000000000000000 RBP: ffff88800775f000 R08: 0000000000000001 R09: ffff888006e620b8 R10: ffff888006e620b0 R11: f000000000000000 R12: ffff8880bff39000 R13: ffff8880bff39000 R14: 0000000000000000 R15: ffff88800604be00 FS: 0000000000000000(0000) GS:ffff8880f3300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000050 CR3: 00000000e932e002 CR4: 00000000003706e0 Kernel panic - not syncing: Fatal exception
Kernel Offset: disabled
info->rq and info->gd are only set in blkfront_connect(), which is called for state 4 (XenbusStateConnected). Guard against using NULL variables in blkfront_closing() to avoid the issue.
The rest of blkfront_closing looks okay. If info->nr_rings is 0, then for_each_rinfo won't do anything.
blkfront_remove also needs to check for non-NULL pointers before cleaning up the gendisk and request queue.
--- drivers/block/xen-blkfront.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/block/xen-blkfront.c +12 -7
@@ -2137,9 +2137,11 @@ static void blkfront_closing(struct blkfront_info *info)return ;/* No more blkif_request(). */ -blk_mq_stop_hw_queues (info->rq); -blk_mark_disk_dead (info->gd); -set_capacity (info->gd,0 ); +if (info->rq && info->gd) { +blk_mq_stop_hw_queues (info->rq); +blk_mark_disk_dead (info->gd); +set_capacity (info->gd,0 ); + }for_each_rinfo (info, rinfo, i) {/* No more gnttab callback work. */
@@ -2480,16 +2482,19 @@ static int blkfront_remove(struct xenbus_device *xbdev)dev_dbg (&xbdev->dev,"%s removed" , xbdev->nodename); -del_gendisk (info->gd); +if (info->gd) +del_gendisk (info->gd);mutex_lock (&blkfront_mutex);list_del (&info->info_list);mutex_unlock (&blkfront_mutex);blkif_free (info,0 ); -xlbd_release_minors (info->gd->first_minor, info->gd->minors); -blk_cleanup_disk (info->gd); -blk_mq_free_tag_set (&info->tag_set); +if (info->gd) { +xlbd_release_minors (info->gd->first_minor, info->gd->minors); +blk_cleanup_disk (info->gd); +blk_mq_free_tag_set (&info->tag_set); + }kfree (info);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/181 ipv4: fix bind address validity regression tests
In reply to Greg Kroah-HartmanFrom: Riccardo Paolo Bestetti <[email protected]>
[ Upstream commit 313c502fa3b3494159cb8f18d4a6444d06c5c9a5 ]
Commit 8ff978b8b222 ("ipv4/raw: support binding to nonlocal addresses") introduces support for binding to nonlocal addresses, as well as some basic test coverage for some of the related cases.
Commit b4a028c4d031 ("ipv4: ping: fix bind address validity check") fixes a regression which incorrectly removed some checks for bind address validation. In addition, it introduces regression tests for those specific checks. However, those regression tests are defective, in that they perform the tests using an incorrect combination of bind flags. As a result, those tests fail when they should succeed.
This commit introduces additional regression tests for nonlocal binding and fixes the defective regression tests. It also introduces new set_sysctl calls for the ipv4_bind test group, as to perform the ICMP binding tests it is necessary to allow ICMP socket creation by setting the net.ipv4.ping_group_range knob.
--- tools/testing/selftests/net/fcnal-test.sh | 36 +++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-)
tools/testing/selftests/net/fcnal-test.sh +27 -9
@@ -1800,24 +1800,32 @@ ipv4_addr_bind_novrf() done # - # raw socket with nonlocal bind + # tests for nonlocal bind # a=${NL_IP} log_start - run_cmd nettest -s -R -P icmp -f -l ${a} -I ${NSA_DEV} -b - log_test_addr ${a} $? 0 "Raw socket bind to nonlocal address after device bind" + run_cmd nettest -s -R -f -l ${a} -b + log_test_addr ${a} $? 0 "Raw socket bind to nonlocal address" + + log_start + run_cmd nettest -s -f -l ${a} -b + log_test_addr ${a} $? 0 "TCP socket bind to nonlocal address" + + log_start + run_cmd nettest -s -D -P icmp -f -l ${a} -b + log_test_addr ${a} $? 0 "ICMP socket bind to nonlocal address" # # check that ICMP sockets cannot bind to broadcast and multicast addresses # a=${BCAST_IP} log_start - run_cmd nettest -s -R -P icmp -l ${a} -b + run_cmd nettest -s -D -P icmp -l ${a} -b log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address" a=${MCAST_IP} log_start - run_cmd nettest -s -R -P icmp -f -l ${a} -b + run_cmd nettest -s -D -P icmp -l ${a} -b log_test_addr ${a} $? 1 "ICMP socket bind to multicast address" #
@@ -1870,24 +1878,32 @@ ipv4_addr_bind_vrf() log_test_addr ${a} $? 1 "Raw socket bind to out of scope address after VRF bind" # - # raw socket with nonlocal bind + # tests for nonlocal bind # a=${NL_IP} log_start - run_cmd nettest -s -R -P icmp -f -l ${a} -I ${VRF} -b + run_cmd nettest -s -R -f -l ${a} -I ${VRF} -b log_test_addr ${a} $? 0 "Raw socket bind to nonlocal address after VRF bind" + log_start + run_cmd nettest -s -f -l ${a} -I ${VRF} -b + log_test_addr ${a} $? 0 "TCP socket bind to nonlocal address after VRF bind" + + log_start + run_cmd nettest -s -D -P icmp -f -l ${a} -I ${VRF} -b + log_test_addr ${a} $? 0 "ICMP socket bind to nonlocal address after VRF bind" + # # check that ICMP sockets cannot bind to broadcast and multicast addresses # a=${BCAST_IP} log_start - run_cmd nettest -s -R -P icmp -l ${a} -I ${VRF} -b + run_cmd nettest -s -D -P icmp -l ${a} -I ${VRF} -b log_test_addr ${a} $? 1 "ICMP socket bind to broadcast address after VRF bind" a=${MCAST_IP} log_start - run_cmd nettest -s -R -P icmp -f -l ${a} -I ${VRF} -b + run_cmd nettest -s -D -P icmp -l ${a} -I ${VRF} -b log_test_addr ${a} $? 1 "ICMP socket bind to multicast address after VRF bind" #
@@ -1922,10 +1938,12 @@ ipv4_addr_bind() log_subsection "No VRF" setup + set_sysctl net.ipv4.ping_group_range='0 2147483647' 2>/dev/null ipv4_addr_bind_novrf log_subsection "With VRF" setup "yes" + set_sysctl net.ipv4.ping_group_range='0 2147483647' 2>/dev/null ipv4_addr_bind_vrf }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/181 xsk: Fix generic transmit when completion queue reservation fails
In reply to Greg Kroah-HartmanFrom: Ciara Loftus <[email protected]>
[ Upstream commit a6e944f25cdbe6b82275402b8bc9a55ad7aac10b ]
Two points of potential failure in the generic transmit function are:
1. completion queue (cq) reservation failure.
2. skb allocation failure
Originally the cq reservation was performed first, followed by the skb allocation. Commit 675716400da6 ("xdp: fix possible cq entry leak") reversed the order because at the time there was no mechanism available to undo the cq reservation which could have led to possible cq entry leaks in the event of skb allocation failure. However if the skb allocation is performed first and the cq reservation then fails, the xsk skb destructor is called which blindly adds the skb address to the already full cq leading to undefined behavior.
This commit restores the original order (cq reservation followed by skb allocation) and uses the xskq_prod_cancel helper to undo the cq reserve in event of skb allocation failure.
--- net/xdp/xsk.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/xdp/xsk.c +9 -7
@@ -538,12 +538,6 @@ static int xsk_generic_xmit(struct sock *sk) goto out; } - skb =xsk_build_skb (xs, &desc); -if (IS_ERR (skb)) { - err =PTR_ERR (skb); - goto out; - } -/* This is the backpressure mechanism for the Tx path. * Reserve space in the completion queue and only proceed * if there is space in it. This avoids having to implement
@@ -552,11 +546,19 @@ static int xsk_generic_xmit(struct sock *sk)spin_lock_irqsave (&xs->pool->cq_lock, flags);if (xskq_prod_reserve (xs->pool->cq)) {spin_unlock_irqrestore (&xs->pool->cq_lock, flags); -kfree_skb (skb); goto out; }spin_unlock_irqrestore (&xs->pool->cq_lock, flags); + skb =xsk_build_skb (xs, &desc); +if (IS_ERR (skb)) { + err =PTR_ERR (skb); +spin_lock_irqsave (&xs->pool->cq_lock, flags); +xskq_prod_cancel (xs->pool->cq); +spin_unlock_irqrestore (&xs->pool->cq_lock, flags); + goto out; + } + err =__dev_direct_xmit (skb, xs->queue_id);if (err ==NETDEV_TX_BUSY ) {/* Tell user-space to retry the send */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/181 veth: Add updating of trans_start
In reply to Greg Kroah-HartmanFrom: Jay Vosburgh <[email protected]>
[ Upstream commit e66e257a5d8368d9c0ba13d4630f474436533e8b ]
Since commit 21a75f0915dd ("bonding: Fix ARP monitor validation"), the bonding ARP / ND link monitors depend on the trans_start time to determine link availability. NETIF_F_LLTX drivers must update trans_start directly, which veth does not do. This prevents use of the ARP or ND link monitors with veth interfaces in a bond.
Resolve this by having veth_xmit update the trans_start time.
--- drivers/net/veth.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/veth.c +4 -0
@@ -312,6 +312,7 @@ static bool veth_skb_is_eligible_for_gro(const struct net_device *dev,static netdev_tx_t veth_xmit (struct sk_buff *skb,struct net_device *dev) {struct veth_priv *rcv_priv, *priv =netdev_priv (dev); +struct netdev_queue *queue =NULL ;struct veth_rq *rq =NULL ;struct net_device *rcv;int length = skb->len;
@@ -329,6 +330,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) rxq =skb_get_queue_mapping (skb);if (rxq < rcv->real_num_rx_queues) { rq = &rcv_priv->rq[rxq]; + queue =netdev_get_tx_queue (dev, rxq);/* The napi pointer is available when an XDP program is * attached or when GRO is enabled
@@ -340,6 +342,8 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)skb_tx_timestamp (skb);if (likely (veth_forward_skb (rcv, skb, rq, use_napi) ==NET_RX_SUCCESS )) { +if (queue) +txq_trans_cond_update (queue);if (!use_napi)dev_lstats_add (dev, length); }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/181 tipc: fix use-after-free Read in tipc_named_reinit
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
[ Upstream commit 911600bf5a5e84bfda4d33ee32acc75ecf6159f0 ]
syzbot found the following issue on:
==================================================================
BUG: KASAN: use-after-free in tipc_named_reinit+0x94f/0x9b0 net/tipc/name_distr.c:413 Read of size 8 at addr ffff88805299a000 by task kworker/1:9/23764 CPU: 1 PID: 23764 Comm: kworker/1:9 Not tainted 5.18.0-rc4-syzkaller-00878-g17d49e6e8012 #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events tipc_net_finalize_work Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 print_address_description.constprop.0.cold+0xeb/0x495 mm/kasan/report.c:313 print_report mm/kasan/report.c:429 [inline] kasan_report.cold+0xf4/0x1c6 mm/kasan/report.c:491 tipc_named_reinit+0x94f/0x9b0 net/tipc/name_distr.c:413 tipc_net_finalize+0x234/0x3d0 net/tipc/net.c:138 process_one_work+0x996/0x1610 kernel/workqueue.c:2289 worker_thread+0x665/0x1080 kernel/workqueue.c:2436 kthread+0x2e9/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:298 </TASK>
[...]
==================================================================
In the commitd966ddcc3821 ("tipc: fix a deadlock when flushing scheduled work"), the cancel_work_sync() function just to make sure ONLY the work tipc_net_finalize_work() is executing/pending on any CPU completed before tipc namespace is destroyed through tipc_exit_net(). But this function is not guaranteed the work is the last queued. So, the destroyed instance may be accessed in the work which will try to enqueue later.
In order to completely fix, we re-order the calling of cancel_work_sync() to make sure the work tipc_net_finalize_work() was last queued and it must be completed by calling cancel_work_sync().
--- net/tipc/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/tipc/core.c +1 -2
@@ -109,10 +109,9 @@ static void __net_exit tipc_exit_net(struct net *net)struct tipc_net *tn =tipc_net (net);tipc_detach_loopback (net); +tipc_net_stop (net);/* Make sure the tipc_net_finalize_work() finished */ cancel_work_sync (&tn->work); -tipc_net_stop (net); -tipc_bcast_stop (net);tipc_nametbl_stop (net);tipc_sk_rht_destroy (net);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 9/181 ALSA: hda/realtek: Apply fixup for Lenovo Yoga Duet 7 properly
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 56ec3e755bd1041d35bdec020a99b327697ee470 upstream.
It turned out that Lenovo shipped two completely different products with the very same PCI SSID, where both require different quirks; namely, Lenovo C940 has already the fixup for its speaker (ALC298_FIXUP_LENOVO_SPK_VOLUME) with the PCI SSID 17aa:3818, while Yoga Duet 7 has also the very same PCI SSID but requires a different quirk, ALC287_FIXUP_YOGA7_14TIL_SPEAKERS.
Fortunately, both are with different codecs (C940 with ALC298 and Duet 7 with ALC287), hence we can apply different fixes by checking the codec ID. This patch implements that special fixup function.
For easier handling, the internal function for applying a specific fixup entry is exported as __snd_hda_apply_fixup(), so that it can be called from the codec driver. The rest is simply calling it with a different fixup ID depending on the codec ID.
--- sound/pci/hda/hda_auto_parser.c | 7 ++++--- sound/pci/hda/hda_local.h | 1 + sound/pci/hda/patch_realtek.c | 24 +++++++++++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-)
sound/pci/hda/hda_auto_parser.c +4 -3
@@ -819,7 +819,7 @@ static void set_pin_targets(struct hda_csnd_hda_set_pin_ctl_cache (codec, cfg->nid, cfg->val); } -static void apply_fixup (struct hda_codec *codec,int id,int action,int depth) +void __snd_hda_apply_fixup (struct hda_codec *codec,int id,int action,int depth) {const char *modelname = codec->fixup_name;
@@ -829,7 +829,7 @@ static void apply_fixup(struct hda_codecif (++depth >10 )break ;if (fix->chained_before) -apply_fixup (codec, fix->chain_id, action, depth +1 ); +__snd_hda_apply_fixup (codec, fix->chain_id, action, depth +1 );switch (fix->type) {case HDA_FIXUP_PINS :
@@ -870,6 +870,7 @@ static void apply_fixup(struct hda_codec id = fix->chain_id; } } +EXPORT_SYMBOL_GPL (__snd_hda_apply_fixup);/** * snd_hda_apply_fixup - Apply the fixup chain with the given action
@@ -879,7 +880,7 @@ static void apply_fixup(struct hda_codecvoid snd_hda_apply_fixup (struct hda_codec *codec,int action) {if (codec->fixup_list) -apply_fixup (codec, codec->fixup_id, action,0 ); +__snd_hda_apply_fixup (codec, codec->fixup_id, action,0 ); }EXPORT_SYMBOL_GPL (snd_hda_apply_fixup);
sound/pci/hda/hda_local.h +1 -0
@@ -348,6 +348,7 @@ void snd_hda_apply_verbs(struct hda_codevoid snd_hda_apply_pincfgs (struct hda_codec *codec,const struct hda_pintbl *cfg);void snd_hda_apply_fixup (struct hda_codec *codec,int action); +void __snd_hda_apply_fixup (struct hda_codec *codec,int id,int action,int depth); void snd_hda_pick_fixup(struct hda_codec *codec, const struct hda_model_fixup *models, const struct snd_pci_quirk *quirk,
sound/pci/hda/patch_realtek.c +23 -1
@@ -7056,6 +7056,7 @@ enum {ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS ,ALC287_FIXUP_LEGION_15IMHG05_AUTOMUTE ,ALC287_FIXUP_YOGA7_14ITL_SPEAKERS , +ALC298_FIXUP_LENOVO_C940_DUET7 ,ALC287_FIXUP_13S_GEN2_SPEAKERS ,ALC256_FIXUP_SET_COEF_DEFAULTS , ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE,
@@ -7074,6 +7075,23 @@ enum { ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE, }; +/* A special fixup for Lenovo C940 and Yoga Duet 7; +* both have the very same PCI SSID, and we need to apply different fixups +* depending on the codec ID +*/ +static void alc298_fixup_lenovo_c940_duet7 (struct hda_codec *codec, +const struct hda_fixup *fix, +int action) +{ +int id; + +if (codec->core.vendor_id ==0x10ec0298 ) + id =ALC298_FIXUP_LENOVO_SPK_VOLUME ;/* C940 */ +else + id =ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ;/* Duet 7 */ +__snd_hda_apply_fixup (codec, id, action,0 ); +} +static const struct hda_fixup alc269_fixups[] = { [ALC269_FIXUP_GPIO2 ] = { .type =HDA_FIXUP_FUNC ,
@@ -8773,6 +8791,10 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MODE, }, + [ALC298_FIXUP_LENOVO_C940_DUET7] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc298_fixup_lenovo_c940_duet7, + }, [ALC287_FIXUP_13S_GEN2_SPEAKERS] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb []) {
@@ -9326,7 +9348,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x31af ,"ThinkCentre Station" ,ALC623_FIXUP_LENOVO_THINKSTATION_P340 ),SND_PCI_QUIRK (0x17aa ,0x3802 ,"Lenovo Yoga DuetITL 2021" ,ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ),SND_PCI_QUIRK (0x17aa ,0x3813 ,"Legion 7i 15IMHG05" ,ALC287_FIXUP_LEGION_15IMHG05_SPEAKERS ), -SND_PCI_QUIRK (0x17aa ,0x3818 ,"Lenovo C940" ,ALC298_FIXUP_LENOVO_SPK_VOLUME ), +SND_PCI_QUIRK (0x17aa ,0x3818 ,"Lenovo C940 / Yoga Duet 7" ,ALC298_FIXUP_LENOVO_C940_DUET7 ),SND_PCI_QUIRK (0x17aa ,0x3819 ,"Lenovo 13s Gen2 ITL" ,ALC287_FIXUP_13S_GEN2_SPEAKERS ),SND_PCI_QUIRK (0x17aa ,0x3820 ,"Yoga Duet 7 13ITL6" ,ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ), SND_PCI_QUIRK(0x17aa, 0x3824, "Legion Y9000X 2020", ALC285_FIXUP_LEGION_Y9000X_SPEAKERS),
Greg Kroah-Hartman
maintainerPATCH 75/181 net/tls: fix tls_sk_proto_close executed repeatedly
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 69135c572d1f84261a6de2a1268513a7e71753e2 ]
After setting the sock ktls, update ctx->sk_proto to sock->sk_prot by tls_update(), so now ctx->sk_proto->close is tls_sk_proto_close(). When close the sock, tls_sk_proto_close() is called for sock->sk_prot->close is tls_sk_proto_close(). But ctx->sk_proto->close() will be executed later in tls_sk_proto_close(). Thus tls_sk_proto_close() executed repeatedly occurred. That will trigger the following bug.
=================================================================
KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] RIP: 0010:tls_sk_proto_close+0xd8/0xaf0 net/tls/tls_main.c:306 Call Trace: <TASK> tls_sk_proto_close+0x356/0xaf0 net/tls/tls_main.c:329 inet_release+0x12e/0x280 net/ipv4/af_inet.c:428 __sock_release+0xcd/0x280 net/socket.c:650 sock_close+0x18/0x20 net/socket.c:1365
Updating a proto which is same with sock->sk_prot is incorrect. Add proto and sock->sk_prot equality check at the head of tls_update() to fix it.
--- net/tls/tls_main.c | 3 +++ 1 file changed, 3 insertions(+)
net/tls/tls_main.c +3 -0
@@ -873,6 +873,9 @@ static void tls_update(struct sock *sk, struct proto *p, {struct tls_context *ctx; +if (sk->sk_prot == p) +return ; + ctx =tls_get_ctx (sk);if (likely (ctx)) { ctx->sk_write_space = write_space;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/181 filemap: Handle sibling entries in filemap_get_read_batch()
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
commit cb995f4eeba9d268fd4b56c2423ad6c1d1ea1b82 upstream.
If a read races with an invalidation followed by another read, it is possible for a folio to be replaced with a higher-order folio. If that happens, we'll see a sibling entry for the new folio in the next iteration of the loop. This manifests as a NULL pointer dereference while holding the RCU read lock.
Handle this by simply returning. The next call will find the new folio and handle it correctly. The other ways of handling this rare race are more complex and it's just not worth it.
--- mm/filemap.c | 2 ++ 1 file changed, 2 insertions(+)
mm/filemap.c +2 -0
@@ -2385,6 +2385,8 @@ static void filemap_get_read_batch(struccontinue ;if (xas.xa_index > max ||xa_is_value (folio))break ; +if (xa_is_sibling (folio)) +break ;if (!folio_try_get_rcu (folio)) goto retry;
Greg Kroah-Hartman
maintainerPATCH 42/181 drm/msm: Ensure mmap offset is initialized
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 036d20726c30267724416e966c9f92db07de8081 ]
If a GEM object is allocated, and then exported as a dma-buf fd which is mmap'd before or without the GEM buffer being directly mmap'd, the vma_node could be unitialized. This leads to a situation where the CPU mapping is not correctly torn down in drm_vma_node_unmap().
--- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +1 -1
@@ -967,7 +967,7 @@ static const struct drm_driver msm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_mmap = msm_gem_prime_mmap,#ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,#endif
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -288,6 +288,7 @@ unsigned long msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_tvoid msm_gem_shrinker_init (struct drm_device *dev);void msm_gem_shrinker_cleanup (struct drm_device *dev); +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);
drivers/gpu/drm/msm/msm_gem_prime.c +15 -0
@@ -11,6 +11,21 @@#include "msm_drv.h" #include "msm_gem.h" +int msm_gem_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma) +{ +int ret; + +/* Ensure the mmap offset is initialized. We lazily initialize it, +* so if it has not been first mmap'd directly as a GEM object, the +* mmap offset will not be already initialized. +*/ + ret =drm_gem_create_mmap_offset (obj); +if (ret) +return ret; + +return drm_gem_prime_mmap (obj, vma); +} +struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/181 block: pop cached rq before potentially blocking rq_qos_throttle()
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit 2645672ffe21f0a1c139bfbc05ad30fd4e4f2583 ]
If rq_qos_throttle() ends up blocking, then we will have invalidated and flushed our current plug. Since blk_mq_get_cached_request() hasn't popped the cached request off the plug list just yet, we end holding a pointer to a request that is no longer valid. This insta-crashes with rq->mq_hctx being NULL in the validity checks just after.
Pop the request off the cached list before doing rq_qos_throttle() to avoid using a potentially stale request.
--- block/blk-mq.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
block/blk-mq.c +8 -3
@@ -2777,15 +2777,20 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q,return NULL ; } -rq_qos_throttle (q, *bio); -if (blk_mq_get_hctx_type ((*bio)->bi_opf) != rq->mq_hctx->type)return NULL ;if (op_is_flush (rq->cmd_flags) !=op_is_flush ((*bio)->bi_opf))return NULL ; - rq->cmd_flags = (*bio)->bi_opf; +/* +* If any qos ->throttle() end up blocking, we will have flushed the +* plug and hence killed the cached_rq list as well. Pop this entry +* before we throttle. +*/ plug->cached_rq =rq_list_next (rq); +rq_qos_throttle (q, *bio); + + rq->cmd_flags = (*bio)->bi_opf;INIT_LIST_HEAD (&rq->queuelist);return rq; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/181 drm/msm/dp: check core_initialized before disable interrupts at dp_display_unbind()
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit d80c3ba0ac247791a4ed7a0cd865a64906c8906a ]
During msm initialize phase, dp_display_unbind() will be called to undo initializations had been done by dp_display_bind() previously if there is error happen at msm_drm_bind. In this case, core_initialized flag had to be check to make sure clocks is on before update DP controller register to disable HPD interrupts. Otherwise system will crash due to below NOC fatal error.
QTISECLIB [01f01a7ad]CNOC2 ERROR: ERRLOG0_LOW = 0x00061007 QTISECLIB [01f01a7ad]GEM_NOC ERROR: ERRLOG0_LOW = 0x00001007 QTISECLIB [01f0371a0]CNOC2 ERROR: ERRLOG0_HIGH = 0x00000003 QTISECLIB [01f055297]GEM_NOC ERROR: ERRLOG0_HIGH = 0x00000003 QTISECLIB [01f072beb]CNOC2 ERROR: ERRLOG1_LOW = 0x00000024 QTISECLIB [01f0914b8]GEM_NOC ERROR: ERRLOG1_LOW = 0x00000042 QTISECLIB [01f0ae639]CNOC2 ERROR: ERRLOG1_HIGH = 0x00004002 QTISECLIB [01f0cc73f]GEM_NOC ERROR: ERRLOG1_HIGH = 0x00004002 QTISECLIB [01f0ea092]CNOC2 ERROR: ERRLOG2_LOW = 0x0009020c QTISECLIB [01f10895f]GEM_NOC ERROR: ERRLOG2_LOW = 0x0ae9020c QTISECLIB [01f125ae1]CNOC2 ERROR: ERRLOG2_HIGH = 0x00000000 QTISECLIB [01f143be7]GEM_NOC ERROR: ERRLOG2_HIGH = 0x00000000 QTISECLIB [01f16153a]CNOC2 ERROR: ERRLOG3_LOW = 0x00000000 QTISECLIB [01f17fe07]GEM_NOC ERROR: ERRLOG3_LOW = 0x00000000 QTISECLIB [01f19cf89]CNOC2 ERROR: ERRLOG3_HIGH = 0x00000000 QTISECLIB [01f1bb08e]GEM_NOC ERROR: ERRLOG3_HIGH = 0x00000000 QTISECLIB [01f1d8a31]CNOC2 ERROR: SBM1 FAULTINSTATUS0_LOW = 0x00000002 QTISECLIB [01f1f72a4]GEM_NOC ERROR: SBM0 FAULTINSTATUS0_LOW = 0x00000001 QTISECLIB [01f21a217]CNOC3 ERROR: ERRLOG0_LOW = 0x00000006 QTISECLIB [01f23dfd3]NOC error fatal
changes in v2:
-- drop the first patch (drm/msm: enable msm irq after all initializations are done successfully at msm_drm_init()) since the problem had been fixed by other patch
Patchwork: https://patchwork.freedesktop.org/patch/488387/
--- drivers/gpu/drm/msm/dp/dp_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -1
@@ -308,7 +308,8 @@ static void dp_display_unbind(struct device *dev, struct device *master,struct msm_drm_private *priv =dev_get_drvdata (master);/* disable all HPD interrupts */ -dp_catalog_hpd_config_intr (dp->catalog,DP_DP_HPD_INT_MASK , false); +if (dp->core_initialized) +dp_catalog_hpd_config_intr (dp->catalog,DP_DP_HPD_INT_MASK , false);kthread_stop (dp->ev_tsk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 2/181 random: quiet urandom warning ratelimit suppression message
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit c01d4d0a82b71857be7449380338bc53dde2da92 upstream.
random.c ratelimits how much it warns about uninitialized urandom reads using __ratelimit(). When the RNG is finally initialized, it prints the number of missed messages due to ratelimiting.
It has been this way since that functionality was introduced back in 2018. Recently, cc1e127bfa95 ("random: remove ratelimiting for in-kernel unseeded randomness") put a bit more stress on the urandom ratelimiting, which teased out a bug in the implementation.
Specifically, when under pressure, __ratelimit() will print its own message and reset the count back to 0, making the final message at the end less useful. Secondly, it does so as a pr_warn(), which apparently is undesirable for people's CI.
Fortunately, __ratelimit() has the RATELIMIT_MSG_ON_RELEASE flag exactly for this purpose, so we set the flag.
--- drivers/char/random.c | 2 +- include/linux/ratelimit_types.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/char/random.c +1 -1
@@ -87,7 +87,7 @@ static RAW_NOTIFIER_HEAD(random_ready_ch/* Control how we warn userspace. */ static struct ratelimit_state urandom_warning = -RATELIMIT_STATE_INIT ("warn_urandom_randomness" ,HZ ,3 ); +RATELIMIT_STATE_INIT_FLAGS ("urandom_warning" ,HZ ,3 ,RATELIMIT_MSG_ON_RELEASE );static int ratelimit_disable__read_mostly =IS_ENABLED (CONFIG_WARN_ALL_UNSEEDED_RANDOM );module_param_named (ratelimit_disable, ratelimit_disable, int,0644 );
include/linux/ratelimit_types.h +8 -4
@@ -23,12 +23,16 @@ struct ratelimit_state {unsigned long flags; }; -#define RATELIMIT_STATE_INIT (name, interval_init, burst_init) { \ - .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \ - .interval = interval_init, \ - .burst = burst_init, \ +#define RATELIMIT_STATE_INIT_FLAGS (name, interval_init, burst_init, flags_init) { \ + .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \ + .interval = interval_init, \ + .burst = burst_init, \ + .flags = flags_init, \ } +#define RATELIMIT_STATE_INIT (name, interval_init, burst_init) \ + RATELIMIT_STATE_INIT_FLAGS(name, interval_init, burst_init, 0) +#define RATELIMIT_STATE_INIT_DISABLED \ RATELIMIT_STATE_INIT(ratelimit_state, 0, DEFAULT_RATELIMIT_BURST)
Greg Kroah-Hartman
maintainerPATCH 34/181 mm/slub: add missing TID updates on slab deactivation
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit eeaa345e128515135ccb864c04482180c08e3259 upstream.
The fastpath in slab_alloc_node() assumes that c->slab is stable as long as the TID stays the same. However, two places in __slab_alloc() currently don't update the TID when deactivating the CPU slab.
If multiple operations race the right way, this could lead to an object getting lost; or, in an even more unlikely situation, it could even lead to an object being freed onto the wrong slab's freelist, messing up the inuse counter and eventually causing a page to be freed to the page allocator while it still contains slab objects.
(I haven't actually tested these cases though, this is just based on looking at the code. Writing testcases for this stuff seems like it'd be a pain...)
The race leading to state inconsistency is (all operations on the same CPU and kmem_cache):
- task A: begin do_slab_free():
- read TID
- read pcpu freelist (==NULL)
- check slab == c->slab (true)
- [PREEMPT A->B]
- task B: begin slab_alloc_node():
- fastpath fails (c->freelist is NULL)
- enter __slab_alloc()
- slub_get_cpu_ptr() (disables preemption)
- enter ___slab_alloc()
- take local_lock_irqsave()
- read c->freelist as NULL
- get_freelist() returns NULL
- write c->slab = NULL
- drop local_unlock_irqrestore()
- goto new_slab
- slub_percpu_partial() is NULL
- get_partial() returns NULL
- slub_put_cpu_ptr() (enables preemption)
- [PREEMPT B->A]
- task A: finish do_slab_free():
- this_cpu_cmpxchg_double() succeeds()
- [CORRUPT STATE: c->slab==NULL, c->freelist!=NULL]
Quoted 1 line
From there, the object on
c->freelistwill get lost if task B is allowed to
continue from here: It will proceed to the retry_load_slab label, set c->slab, then jump to load_freelist, which clobbers c->freelist.
But if we instead continue as follows, we get worse corruption:
- task A: run __slab_free() on object from other struct slab:
- CPU_PARTIAL_FREE case (slab was on no list, is now on pcpu partial)
- task A: run slab_alloc_node() with NUMA node constraint:
- fastpath fails (c->slab is NULL)
- call __slab_alloc()
- slub_get_cpu_ptr() (disables preemption)
- enter ___slab_alloc()
- c->slab is NULL: goto new_slab
- slub_percpu_partial() is non-NULL
- set c->slab to slub_percpu_partial(c)
- [CORRUPT STATE: c->slab points to slab-1, c->freelist has objects from slab-2]
- goto redo
- node_match() fails
- goto deactivate_slab
- existing c->freelist is passed into deactivate_slab()
- inuse count of slab-1 is decremented to account for object from slab-2
At this point, the inuse count of slab-1 is 1 lower than it should be. This means that if we free all allocated objects in slab-1 except for one, SLUB will think that slab-1 is completely unused, and may free its page, leading to use-after-free.
--- mm/slub.c | 2 ++ 1 file changed, 2 insertions(+)
mm/slub.c +2 -0
@@ -2939,6 +2939,7 @@ redo:if (!freelist) { c->slab =NULL ; + c->tid =next_tid (c->tid);local_unlock_irqrestore (&s->cpu_slab->lock, flags);stat (s,DEACTIVATE_BYPASS ); goto new_slab;
@@ -2971,6 +2972,7 @@ deactivate_slab: freelist = c->freelist; c->slab =NULL ; c->freelist =NULL ; + c->tid =next_tid (c->tid);local_unlock_irqrestore (&s->cpu_slab->lock, flags);deactivate_slab (s, slab, freelist);
Greg Kroah-Hartman
maintainerPATCH 82/181 MIPS: Remove repetitive increase irq_err_count
In reply to Greg Kroah-HartmanFrom: huhai <[email protected]>
[ Upstream commit c81aba8fde2aee4f5778ebab3a1d51bd2ef48e4c ]
commit 979934da9e7a ("[PATCH] mips: update IRQ handling for vr41xx") added a function irq_dispatch, and it'll increase irq_err_count when the get_irq callback returns a negative value, but increase irq_err_count in get_irq was not removed.
And also, modpost complains once gpio-vr41xx drivers become modules.
ERROR: modpost: "irq_err_count" [drivers/gpio/gpio-vr41xx.ko] undefined!
So it would be a good idea to remove repetitive increase irq_err_count in get_irq callback.
--- arch/mips/vr41xx/common/icu.c | 2 -- drivers/gpio/gpio-vr41xx.c | 2 -- 2 files changed, 4 deletions(-)
arch/mips/vr41xx/common/icu.c +0 -2
@@ -640,8 +640,6 @@ static int icu_get_irq(unsigned int irq)printk (KERN_ERR "spurious ICU interrupt: %04x,%04x\n" , pend1, pend2); -atomic_inc (&irq_err_count); -return -1 ; }
drivers/gpio/gpio-vr41xx.c +0 -2
@@ -217,8 +217,6 @@ static int giu_get_irq(unsigned int irq)printk (KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n" , maskl, pendl, maskh, pendh); -atomic_inc (&irq_err_count); -return -EINVAL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/181 afs: Fix dynamic root getattr
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit cb78d1b5efffe4cf97e16766329dd7358aed3deb ]
The recent patch to make afs_getattr consult the server didn't account for the pseudo-inodes employed by the dynamic root-type afs superblock not having a volume or a server to access, and thus an oops occurs if such a directory is stat'd.
Fix this by checking to see if the vnode->volume pointer actually points anywhere before following it in afs_getattr().
This can be tested by stat'ing a directory in /afs. It may be sufficient just to do "ls /afs" and the oops looks something like:
BUG: kernel NULL pointer dereference, address: 0000000000000020
...
RIP: 0010:afs_getattr+0x8b/0x14b
...
Call Trace:
<TASK>
vfs_statx+0x79/0xf5
vfs_fstatat+0x49/0x62--- fs/afs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/afs/inode.c +2 -1
@@ -745,7 +745,8 @@ int afs_getattr(struct user_namespace *mnt_userns, const struct path *path,_enter ("{ ino=%lu v=%u }" , inode->i_ino, inode->i_generation); -if (!(query_flags &AT_STATX_DONT_SYNC ) && +if (vnode->volume && + !(query_flags &AT_STATX_DONT_SYNC ) && !test_bit (AFS_VNODE_CB_PROMISED , &vnode->flags)) { key =afs_request_key (vnode->volume->cell);if (IS_ERR (key))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/181 netfilter: use get_random_u32 instead of prandom
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit b1fd94e704571f98b21027340eecf821b2bdffba ]
bh might occur while updating per-cpu rnd_state from user context, ie. local_out path.
BUG: using smp_processor_id() in preemptible [00000000] code: nginx/2725 caller is nft_ng_random_eval+0x24/0x54 [nft_numgen] Call Trace: check_preemption_disabled+0xde/0xe0 nft_ng_random_eval+0x24/0x54 [nft_numgen]
Use the random driver instead, this also avoids need for local prandom state. Moreover, prandom now uses the random driver since d4150779e60f ("random32: use real rng for non-deterministic randomness").
Based on earlier patch from Pablo Neira.
--- net/netfilter/nft_meta.c | 13 ++----------- net/netfilter/nft_numgen.c | 12 +++--------- 2 files changed, 5 insertions(+), 20 deletions(-)
net/netfilter/nft_meta.c +2 -11
@@ -14,6 +14,7 @@#include <linux/in.h> #include <linux/ip.h> #include <linux/ipv6.h> +#include <linux/random.h> #include <linux/smp.h> #include <linux/static_key.h> #include <net/dst.h>
@@ -32,8 +33,6 @@#define NFT_META_SECS_PER_DAY 86400#define NFT_META_DAYS_PER_WEEK 7 -static DEFINE_PER_CPU(struct rnd_state, nft_prandom_state); -static u8 nft_meta_weekday (void ) {time64_t secs =ktime_get_real_seconds ();
@@ -271,13 +270,6 @@ static bool nft_meta_get_eval_ifname(enum nft_meta_keys key, u32 *dest,return true; } -static noinline u32 nft_prandom_u32(void) -{ -struct rnd_state *state =this_cpu_ptr (&nft_prandom_state); - -return prandom_u32_state (state); -} -#ifdef CONFIG_IP_ROUTE_CLASSID static noinline boolnft_meta_get_eval_rtclassid (const struct sk_buff *skb,u32 *dest)
@@ -389,7 +381,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,break ;#endif case NFT_META_PRANDOM : - *dest =nft_prandom_u32 (); + *dest =get_random_u32 ();break ;#ifdef CONFIG_XFRM case NFT_META_SECPATH :
@@ -518,7 +510,6 @@ int nft_meta_get_init(const struct nft_ctx *ctx, len =IFNAMSIZ ;break ;case NFT_META_PRANDOM : -prandom_init_once (&nft_prandom_state); len =sizeof (u32);break ;#ifdef CONFIG_XFRM
net/netfilter/nft_numgen.c +3 -9
@@ -9,12 +9,11 @@#include <linux/netlink.h> #include <linux/netfilter.h> #include <linux/netfilter/nf_tables.h> +#include <linux/random.h> #include <linux/static_key.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables_core.h> -static DEFINE_PER_CPU(struct rnd_state, nft_numgen_prandom_state); -struct nft_ng_inc {u8 dreg;u32 modulus;
@@ -135,12 +134,9 @@ struct nft_ng_random {u32 offset; }; -static u32 nft_ng_random_gen (struct nft_ng_random *priv) +static u32 nft_ng_random_gen (const struct nft_ng_random *priv) { -struct rnd_state *state =this_cpu_ptr (&nft_numgen_prandom_state); - -return reciprocal_scale (prandom_u32_state (state), priv->modulus) + - priv->offset; +return reciprocal_scale (get_random_u32 (), priv->modulus) + priv->offset; } static void nft_ng_random_eval(const struct nft_expr *expr,
@@ -168,8 +164,6 @@ static int nft_ng_random_init(const struct nft_ctx *ctx,if (priv->offset + priv->modulus -1 < priv->offset)return -EOVERFLOW ; -prandom_init_once (&nft_numgen_prandom_state); -return nft_parse_register_store (ctx, tb[NFTA_NG_DREG ], &priv->dreg,NULL ,NFT_DATA_VALUE ,sizeof (u32)); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/181 erspan: do not assume transport header is always set
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 301bd140ed0b24f0da660874c7e8a47dad8c8222 ]
Rewrite tests in ip6erspan_tunnel_xmit() and erspan_fb_xmit() to not assume transport header is set.
syzbot reported:
WARNING: CPU: 0 PID: 1350 at include/linux/skbuff.h:2911 skb_transport_header include/linux/skbuff.h:2911 [inline] WARNING: CPU: 0 PID: 1350 at include/linux/skbuff.h:2911 ip6erspan_tunnel_xmit+0x15af/0x2eb0 net/ipv6/ip6_gre.c:963 Modules linked in: CPU: 0 PID: 1350 Comm: aoe_tx0 Not tainted 5.19.0-rc2-syzkaller-00160-g274295c6e53f #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 RIP: 0010:skb_transport_header include/linux/skbuff.h:2911 [inline] RIP: 0010:ip6erspan_tunnel_xmit+0x15af/0x2eb0 net/ipv6/ip6_gre.c:963 Code: 0f 47 f0 40 88 b5 7f fe ff ff e8 8c 16 4b f9 89 de bf ff ff ff ff e8 a0 12 4b f9 66 83 fb ff 0f 85 1d f1 ff ff e8 71 16 4b f9 <0f> 0b e9 43 f0 ff ff e8 65 16 4b f9 48 8d 85 30 ff ff ff ba 60 00 RSP: 0018:ffffc90005daf910 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 000000000000ffff RCX: 0000000000000000 RDX: ffff88801f032100 RSI: ffffffff882e8d3f RDI: 0000000000000003 RBP: ffffc90005dafab8 R08: 0000000000000003 R09: 000000000000ffff R10: 000000000000ffff R11: 0000000000000000 R12: ffff888024f21d40 R13: 000000000000a288 R14: 00000000000000b0 R15: ffff888025a2e000 FS: 0000000000000000(0000) GS:ffff88802c800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2e425000 CR3: 000000006d099000 CR4: 0000000000152ef0 Call Trace: <TASK> __netdev_start_xmit include/linux/netdevice.h:4805 [inline] netdev_start_xmit include/linux/netdevice.h:4819 [inline] xmit_one net/core/dev.c:3588 [inline] dev_hard_start_xmit+0x188/0x880 net/core/dev.c:3604 sch_direct_xmit+0x19f/0xbe0 net/sched/sch_generic.c:342 __dev_xmit_skb net/core/dev.c:3815 [inline] __dev_queue_xmit+0x14a1/0x3900 net/core/dev.c:4219 dev_queue_xmit include/linux/netdevice.h:2994 [inline] tx+0x6a/0xc0 drivers/block/aoe/aoenet.c:63 kthread+0x1e7/0x3b0 drivers/block/aoe/aoecmd.c:1229 kthread+0x2e9/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:302 </TASK>
--- net/ipv4/ip_gre.c | 15 ++++++++++----- net/ipv6/ip6_gre.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-)
net/ipv4/ip_gre.c +10 -5
@@ -524,7 +524,6 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev)int tunnel_hlen;int version;int nhoff; -int thoff; tun_info =skb_tunnel_info (skb); if (unlikely(!tun_info || !(tun_info->mode & IP_TUNNEL_INFO_TX) ||
@@ -558,10 +557,16 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev) (ntohs(ip_hdr(skb)->tot_len) > skb->len - nhoff)) truncate = true; - thoff =skb_transport_header (skb) -skb_mac_header (skb); -if (skb->protocol ==htons (ETH_P_IPV6 ) && - (ntohs (ipv6_hdr (skb)->payload_len) > skb->len - thoff)) - truncate = true; +if (skb->protocol ==htons (ETH_P_IPV6 )) { +int thoff; + +if (skb_transport_header_was_set (skb)) + thoff =skb_transport_header (skb) -skb_mac_header (skb); +else + thoff = nhoff +sizeof (struct ipv6hdr ); +if (ntohs (ipv6_hdr (skb)->payload_len) > skb->len - thoff) + truncate = true; + }if (version ==1 ) { erspan_build_header(skb, ntohl(tunnel_id_to_key32(key->tun_id)),
net/ipv6/ip6_gre.c +10 -5
@@ -944,7 +944,6 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,__be16 proto;__u32 mtu;int nhoff; -int thoff;if (!pskb_inet_may_pull (skb)) goto tx_err;
@@ -965,10 +964,16 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, (ntohs(ip_hdr(skb)->tot_len) > skb->len - nhoff)) truncate = true; - thoff =skb_transport_header (skb) -skb_mac_header (skb); -if (skb->protocol ==htons (ETH_P_IPV6 ) && - (ntohs (ipv6_hdr (skb)->payload_len) > skb->len - thoff)) - truncate = true; +if (skb->protocol ==htons (ETH_P_IPV6 )) { +int thoff; + +if (skb_transport_header_was_set (skb)) + thoff =skb_transport_header (skb) -skb_mac_header (skb); +else + thoff = nhoff +sizeof (struct ipv6hdr ); +if (ntohs (ipv6_hdr (skb)->payload_len) > skb->len - thoff) + truncate = true; + }if (skb_cow_head (skb, dev->needed_headroom ?: t->hlen)) goto tx_err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/181 drm/i915: Implement w/a 22010492432 for adl-s
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
commit 13bd259b64bb58ae130923ada42ebc19bf3f2fa2 upstream.
adl-s needs the combo PLL DCO fraction w/a as well. Gets us slightly more accurate clock out of the PLL.
--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +2 -2
@@ -2437,7 +2437,7 @@ static void icl_wrpll_params_populate(st }/* -* Display WA #22010492432: ehl, tgl, adl-p +* Display WA #22010492432: ehl, tgl, adl-s, adl-p * Program half of the nominal DCO divider fraction value. */ static bool
@@ -2445,7 +2445,7 @@ ehl_combo_pll_div_frac_wa_needed(struct {return ((IS_PLATFORM (i915,INTEL_ELKHARTLAKE ) &&IS_JSL_EHL_DISPLAY_STEP (i915,STEP_B0 ,STEP_FOREVER )) || -IS_TIGERLAKE (i915) ||IS_ALDERLAKE_P (i915)) && +IS_TIGERLAKE (i915) ||IS_ALDERLAKE_S (i915) ||IS_ALDERLAKE_P (i915)) && i915->dpll.ref_clks.nssc ==38400 ; }
Greg Kroah-Hartman
maintainerPATCH 10/181 ALSA: hda/realtek: Add quirk for Clevo PD70PNT
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit d49951219b0249d3eff49e4f02e0de82357bc8a0 upstream.
Fixes speaker output and headset detection on Clevo PD70PNT.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2634,6 +2634,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x67e1 ,"Clevo PB71[DE][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e5 ,"Clevo PC70D[PRS](?:-D|-G)?" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67f1 ,"Clevo PC70H[PRS]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x67f5 ,"Clevo PD70PN[NRT]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x70d1 ,"Clevo PC70[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x7714 ,"Clevo X170SM" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED),
Greg Kroah-Hartman
maintainerPATCH 36/181 amd/display/dc: Fix COLOR_ENCODING and COLOR_RANGE doing nothing for DCN20+
In reply to Greg Kroah-HartmanFrom: Joshua Ashton <[email protected]>
commit e84131a88a8cdcd6fe9f234ed98e3f8ca049142b upstream.
For DCN20 and above, the code that actually hooks up the provided input_color_space got lost at some point.
Fixes COLOR_ENCODING and COLOR_RANGE doing nothing on DCN20+. Tested using Steam Remote Play Together + gamescope.
Update other DCNs the same wasy DCN1.x was updates in
commit a1e07ba89d49 ("drm/amd/display: Use plane->color_space for dpp if specified")
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c | 3 +++ drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 3 +++ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 3 +++ 3 files changed, 9 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dpp.c +3 -0
@@ -212,6 +212,9 @@ static void dpp2_cnv_setup (break ; } +/* Set default color space based on format if none is given. */ + color_space = input_color_space ? input_color_space : color_space; +if (is_2bit ==1 && alpha_2bit_lut !=NULL ) {REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT0 , alpha_2bit_lut->lut0);REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT1 , alpha_2bit_lut->lut1);
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c +3 -0
@@ -153,6 +153,9 @@ static void dpp201_cnv_setup(break ; } +/* Set default color space based on format if none is given. */ + color_space = input_color_space ? input_color_space : color_space; +if (is_2bit ==1 && alpha_2bit_lut !=NULL ) {REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT0 , alpha_2bit_lut->lut0);REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT1 , alpha_2bit_lut->lut1);
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c +3 -0
@@ -294,6 +294,9 @@ static void dpp3_cnv_setup (break ; } +/* Set default color space based on format if none is given. */ + color_space = input_color_space ? input_color_space : color_space; +if (is_2bit ==1 && alpha_2bit_lut !=NULL ) {REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT0 , alpha_2bit_lut->lut0);REG_UPDATE (ALPHA_2BIT_LUT ,ALPHA_2BIT_LUT1 , alpha_2bit_lut->lut1);
Greg Kroah-Hartman
maintainerPATCH 6/181 ALSA: hda/conexant: Fix missing beep setup
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 5faa0bc69102f3a4c605581564c367be5eb94dfa upstream.
Currently the Conexant codec driver sets up the beep NID after calling snd_hda_gen_parse_auto_config(). It turned out that this results in the insufficient setup for the beep control, as the generic parser handles the fake path in snd_hda_gen_parse_auto_config() only if the beep_nid is set up beforehand.
For dealing with the beep widget properly, call cx_auto_parse_beep() before snd_hda_gen_parse_auto_config() call.
--- sound/pci/hda/patch_conexant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_conexant.c +2 -2
@@ -1079,11 +1079,11 @@ static int patch_conexant_auto(struct hdif (err <0 ) goto error; - err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg); + err =cx_auto_parse_beep (codec);if (err <0 ) goto error; - err =cx_auto_parse_beep (codec); + err =snd_hda_gen_parse_auto_config (codec, &spec->gen.autocfg);if (err <0 ) goto error;
Greg Kroah-Hartman
maintainerPATCH 78/181 netfilter: nf_dup_netdev: do not push mac header a second time
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 574a5b85dc3b9ab672ff3fba0ee020f927960648 ]
Eric reports skb_under_panic when using dup/fwd via bond+egress hook. Before pushing mac header, we should make sure that we're called from ingress to put back what was pulled earlier.
In egress case, the MAC header is already there; we should leave skb alone.
While at it be more careful here: skb might have been altered and headroom reduced, so add a skb_cow() before so that headroom is increased if necessary.
nf_do_netdev_egress() assumes skb ownership (it normally ends with a call to dev_queue_xmit), so we must free the packet on error.
--- net/netfilter/nf_dup_netdev.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/netfilter/nf_dup_netdev.c +10 -4
@@ -13,10 +13,16 @@#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> -static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev) +static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev, +enum nf_dev_hooks hook) { -if (skb_mac_header_was_set (skb)) +if (hook ==NF_NETDEV_INGRESS &&skb_mac_header_was_set (skb)) { +if (skb_cow_head (skb, skb->mac_len)) { +kfree_skb (skb); +return ; + }skb_push (skb, skb->mac_len); + } skb->dev = dev;skb_clear_tstamp (skb);
@@ -33,7 +39,7 @@ void nf_fwd_netdev_egress(const struct nft_pktinfo *pkt, int oif)return ; } -nf_do_netdev_egress (pkt->skb, dev); +nf_do_netdev_egress (pkt->skb, dev,nft_hook (pkt)); }EXPORT_SYMBOL_GPL (nf_fwd_netdev_egress);
@@ -48,7 +54,7 @@ void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif) skb =skb_clone (pkt->skb,GFP_ATOMIC );if (skb) -nf_do_netdev_egress (skb, dev); +nf_do_netdev_egress (skb, dev,nft_hook (pkt)); }EXPORT_SYMBOL_GPL (nf_dup_netdev_egress);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/181 drm/msm: use for_each_sgtable_sg to iterate over scatterlist
In reply to Greg Kroah-HartmanFrom: Jonathan Marek <[email protected]>
[ Upstream commit 62b5e322fb6cc5a5a91fdeba0e4e57e75d9f4387 ]
The dma_map_sgtable() call (used to invalidate cache) overwrites sgt->nents with 1, so msm_iommu_pagetable_map maps only the first physical segment.
To fix this problem use for_each_sgtable_sg(), which uses orig_nents.
--- drivers/gpu/drm/msm/msm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_iommu.c +1 -1
@@ -58,7 +58,7 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova,u64 addr = iova;unsigned int i; -for_each_sg (sgt->sgl, sg, sgt->nents, i) { +for_each_sgtable_sg (sgt, sg, i) {size_t size = sg->length;phys_addr_t phys =sg_phys (sg);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/181 drm/msm: Switch ordering of runpm put vs devfreq_idle
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 49e477610087a02c3604061b8f3ee3a25a493987 ]
In msm_devfreq_suspend() we cancel idle_work synchronously so that it doesn't run after we power of the hw or in the resume path. But this means that we want to ensure that idle_work is not scheduled *after* we no longer hold a runpm ref. So switch the ordering of pm_runtime_put() vs msm_devfreq_idle().
v2. Only move the runpm _put_autosuspend, and not the _mark_last_busy()
--- drivers/gpu/drm/msm/msm_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gpu.c +2 -1
@@ -664,7 +664,6 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,msm_submit_retire (submit);pm_runtime_mark_last_busy (&gpu->pdev->dev); -pm_runtime_put_autosuspend (&gpu->pdev->dev);spin_lock_irqsave (&ring->submit_lock, flags);list_del (&submit->node);
@@ -678,6 +677,8 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,msm_devfreq_idle (gpu);mutex_unlock (&gpu->active_lock); +pm_runtime_put_autosuspend (&gpu->pdev->dev); +msm_gem_submit_put (submit); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/181 bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers
In reply to Greg Kroah-HartmanFrom: Jay Vosburgh <[email protected]>
[ Upstream commit 7a9214f3d88cfdb099f3896e102a306b316d8707 ]
The bonding ARP monitor fails to decrement send_peer_notif, the number of peer notifications (gratuitous ARP or ND) to be sent. This results in a continuous series of notifications.
Correct this by decrementing the counter for each notification.
--- drivers/net/bonding/bond_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +3 -1
@@ -3684,9 +3684,11 @@ static void bond_activebackup_arp_mon(struct bonding *bond)if (!rtnl_trylock ())return ; -if (should_notify_peers) +if (should_notify_peers) { + bond->send_peer_notif--;call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , bond->dev); + }if (should_notify_rtnl) {bond_slave_state_notify (bond);bond_slave_link_notify (bond);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/181 drm/amd/display: Fix typo in override_lane_settings
In reply to Greg Kroah-HartmanFrom: George Shen <[email protected]>
commit 98b02e9f002b21944176774cf420c4d674f6201c upstream.
[Why]
The function currently skips overriding the drive settings of the first lane.
[How]
Change for loop to start at 0 instead of 1.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +1 -1
@@ -944,7 +944,7 @@ static void override_lane_settings(constreturn ; -for (lane =1 ; lane <LANE_COUNT_DP_MAX ; lane++) { +for (lane =0 ; lane <LANE_COUNT_DP_MAX ; lane++) {if (lt_settings->voltage_swing) lane_settings[lane].VOLTAGE_SWING = *lt_settings->voltage_swing;if (lt_settings->pre_emphasis)
Greg Kroah-Hartman
maintainerPATCH 68/181 drm/msm/dp: force link training for display resolution change
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit a6e2af64a79afa7f1b29375b5231e840a84bb845 ]
Display resolution change is implemented through drm modeset. Older modeset (resolution) has to be disabled first before newer modeset (resolution) can be enabled. Display disable will turn off both pixel clock and main link clock so that main link have to be re-trained during display enable to have new video stream flow again. At current implementation, display enable function manually kicks up irq_hpd_handle which will read panel link status and start link training if link status is not in sync state.
However, there is rare case that a particular panel links status keep staying in sync for some period of time after main link had been shut down previously at display disabled. In this case, main link retraining will not be executed by irq_hdp_handle(). Hence video stream of newer display resolution will fail to be transmitted to panel due to main link is not in sync between host and panel.
This patch will bypass irq_hpd_handle() in favor of directly call dp_ctrl_on_stream() to always perform link training in regardless of main link status. So that no unexpected exception resolution change failure cases will happen. Also this implementation are more efficient than manual kicking off irq_hpd_handle function.
Changes in v2:
-- set force_link_train flag on DP only (is_edp == false)
Changes in v3:
-- revise commit text
-- add Fixes tag
Changes in v4:
-- revise commit text
Changes in v5:
-- fix spelling at commit text
Changes in v6:
-- split dp_ctrl_on_stream() for phy test case
-- revise commit text for modeset
Changes in v7:
-- drop 0 assignment at local variable (ret = 0)
Changes in v8:
-- add patch to remove pixel_rate from dp_ctrl
Changes in v9:
-- forward declare dp_ctrl_on_stream_phy_test_report()
Patchwork: https://patchwork.freedesktop.org/patch/489895/
--- drivers/gpu/drm/msm/dp/dp_ctrl.c | 33 ++++++++++++++++++++++------- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 13 ++++++------ 3 files changed, 32 insertions(+), 16 deletions(-)
drivers/gpu/drm/msm/dp/dp_ctrl.c +25 -8
@@ -1523,6 +1523,8 @@ static int dp_ctrl_link_maintenance(struct dp_ctrl_private *ctrl)return ret; } +static int dp_ctrl_on_stream_phy_test_report (struct dp_ctrl *dp_ctrl); +static int dp_ctrl_process_phy_test_request (struct dp_ctrl_private *ctrl) {int ret =0 ;
@@ -1545,7 +1547,7 @@ static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) ret =dp_ctrl_on_link (&ctrl->dp_ctrl);if (!ret) - ret =dp_ctrl_on_stream (&ctrl->dp_ctrl); + ret =dp_ctrl_on_stream_phy_test_report (&ctrl->dp_ctrl);else DRM_ERROR ("failed to enable DP link controller\n" );
@@ -1800,7 +1802,27 @@ static int dp_ctrl_link_retrain(struct dp_ctrl_private *ctrl)return dp_ctrl_setup_main_link (ctrl, &training_step); } -int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl) +static int dp_ctrl_on_stream_phy_test_report (struct dp_ctrl *dp_ctrl) +{ +int ret; +struct dp_ctrl_private *ctrl; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + + ctrl->dp_ctrl.pixel_rate = ctrl->panel->dp_mode.drm_mode.clock; + + ret =dp_ctrl_enable_stream_clocks (ctrl); +if (ret) { +DRM_ERROR ("Failed to start pixel clocks. ret=%d\n" , ret); +return ret; + } + +dp_ctrl_send_phy_test_pattern (ctrl); + +return 0 ; +} + +int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl,bool force_link_train) {int ret =0 ;bool mainlink_ready = false;
@@ -1831,12 +1853,7 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) goto end; } -if (ctrl->link->sink_request &DP_TEST_LINK_PHY_TEST_PATTERN ) { -dp_ctrl_send_phy_test_pattern (ctrl); -return 0 ; - } - -if (!dp_ctrl_channel_eq_ok (ctrl)) +if (force_link_train || !dp_ctrl_channel_eq_ok (ctrl))dp_ctrl_link_retrain (ctrl);/* stop txing train pattern to end link training */
drivers/gpu/drm/msm/dp/dp_ctrl.h +1 -1
@@ -20,7 +20,7 @@ struct dp_ctrl { };int dp_ctrl_on_link (struct dp_ctrl *dp_ctrl); -int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl); +int dp_ctrl_on_stream (struct dp_ctrl *dp_ctrl,bool force_link_train);int dp_ctrl_off_link_stream (struct dp_ctrl *dp_ctrl);int dp_ctrl_off (struct dp_ctrl *dp_ctrl);void dp_ctrl_push_idle (struct dp_ctrl *dp_ctrl);
drivers/gpu/drm/msm/dp/dp_display.c +6 -7
@@ -903,7 +903,7 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data)return 0 ; } - rc =dp_ctrl_on_stream (dp->ctrl); + rc =dp_ctrl_on_stream (dp->ctrl, data);if (!rc) dp_display->power_on = true;
@@ -1590,6 +1590,7 @@ int msm_dp_display_enable(struct msm_dp *dp, struct drm_encoder *encoder)int rc =0 ;struct dp_display_private *dp_display;u32 state; +bool force_link_train = false; dp_display = container_of(dp, struct dp_display_private, dp_display);if (!dp_display->dp_mode.drm_mode.clock) {
@@ -1618,10 +1619,12 @@ int msm_dp_display_enable(struct msm_dp *dp, struct drm_encoder *encoder) state = dp_display->hpd_state; -if (state ==ST_DISPLAY_OFF ) +if (state ==ST_DISPLAY_OFF ) {dp_display_host_phy_init (dp_display); + force_link_train = true; + } -dp_display_enable (dp_display,0 ); +dp_display_enable (dp_display, force_link_train); rc =dp_display_post_enable (dp);if (rc) {
@@ -1630,10 +1633,6 @@ int msm_dp_display_enable(struct msm_dp *dp, struct drm_encoder *encoder)dp_display_unprepare (dp); } -/* manual kick off plug event to train link */ -if (state ==ST_DISPLAY_OFF ) -dp_add_event (dp_display,EV_IRQ_HPD_INT ,0 ,0 ); -/* completed connection */ dp_display->hpd_state =ST_CONNECTED ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/181 net: phy: at803x: fix NULL pointer dereference on AR9331 PHY
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 9926de7315be3d606cc011a305ad9adb9e8e14c9 ]
Latest kernel will explode on the PHY interrupt config, since it depends now on allocated priv. So, run probe to allocate priv to fix it.
ar9331_switch ethernet.1:10 lan0 (uninitialized): PHY [!ahb!ethernet@1a000000!mdio!switch@10:00] driver [Qualcomm Atheros AR9331 built-in PHY] (irq=13) CPU 0 Unable to handle kernel paging request at virtual address 0000000a, epc == 8050e8a8, ra == 80504b34
... Call Trace: [<8050e8a8>] at803x_config_intr+0x5c/0xd0 [<80504b34>] phy_request_interrupt+0xa8/0xd0 [<8050289c>] phylink_bringup_phy+0x2d8/0x3ac [<80502b68>] phylink_fwnode_phy_connect+0x118/0x130 [<8074d8ec>] dsa_slave_create+0x270/0x420 [<80743b04>] dsa_port_setup+0x12c/0x148 [<8074580c>] dsa_register_switch+0xaf0/0xcc0 [<80511344>] ar9331_sw_probe+0x370/0x388 [<8050cb78>] mdio_probe+0x44/0x70 [<804df300>] really_probe+0x200/0x424 [<804df7b4>] __driver_probe_device+0x290/0x298 [<804df810>] driver_probe_device+0x54/0xe4 [<804dfd50>] __device_attach_driver+0xe4/0x130 [<804dcb00>] bus_for_each_drv+0xb4/0xd8 [<804dfac4>] __device_attach+0x104/0x1a4 [<804ddd24>] bus_probe_device+0x48/0xc4 [<804deb44>] deferred_probe_work_func+0xf0/0x10c [<800a0ffc>] process_one_work+0x314/0x4d4 [<800a17fc>] worker_thread+0x2a4/0x354 [<800a9a54>] kthread+0x134/0x13c [<8006306c>] ret_from_kernel_thread+0x14/0x1c
Same Issue would affect some other PHYs (QCA8081, QCA9561), so fix it too.
--- drivers/net/phy/at803x.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/at803x.c +6 -0
@@ -2072,6 +2072,8 @@ static struct phy_driver at803x_driver[] = {/* ATHEROS AR9331 */ PHY_ID_MATCH_EXACT (ATH9331_PHY_ID ), .name = "Qualcomm Atheros AR9331 built-in PHY", + .probe = at803x_probe, + .remove = at803x_remove, .suspend = at803x_suspend, .resume = at803x_resume, .flags = PHY_POLL_CABLE_TEST,
@@ -2087,6 +2089,8 @@ static struct phy_driver at803x_driver[] = {/* Qualcomm Atheros QCA9561 */ PHY_ID_MATCH_EXACT (QCA9561_PHY_ID ), .name = "Qualcomm Atheros QCA9561 built-in PHY", + .probe = at803x_probe, + .remove = at803x_remove, .suspend = at803x_suspend, .resume = at803x_resume, .flags = PHY_POLL_CABLE_TEST,
@@ -2151,6 +2155,8 @@ static struct phy_driver at803x_driver[] = {PHY_ID_MATCH_EXACT (QCA8081_PHY_ID ), .name = "Qualcomm QCA8081", .flags = PHY_POLL_CABLE_TEST, + .probe = at803x_probe, + .remove = at803x_remove, .config_intr = at803x_config_intr, .handle_interrupt = at803x_handle_interrupt, .get_tunable = at803x_get_tunable,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/181 USB: serial: pl2303: add support for more HXN (G) types
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit ae60aac59a9ad8ab64a4b07de509a534a75b6bac upstream.
Add support for further HXN (G) type devices (GT variant, GL variant, GS variant and GR) and document the bcdDevice mapping.
Note that the TA and TB types use the same bcdDevice as some GT and GE variants, respectively, but that the HX status request can be used to determine which is which.
Also note that we currently do not distinguish between the various HXN
(G) types in the driver but that this may change eventually (e.g. when adding GPIO support).
--- drivers/usb/serial/pl2303.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/usb/serial/pl2303.c +17 -12
@@ -436,22 +436,27 @@ static int pl2303_detect_type(struct usbbreak ;case 0x200 :switch (bcdDevice) { -case 0x100 : +case 0x100 :/* GC */ case 0x105 : +return TYPE_HXN ; +case 0x300 :/* GT / TA */ +if (pl2303_supports_hx_status (serial)) +return TYPE_TA ; + fallthrough;case 0x305 : +case 0x400 :/* GL */ case 0x405 : +return TYPE_HXN ; +case 0x500 :/* GE / TB */ +if (pl2303_supports_hx_status (serial)) +return TYPE_TB ; + fallthrough; +case 0x505 : +case 0x600 :/* GS */ case 0x605 : -/* -* Assume it's an HXN-type if the device doesn't -* support the old read request value. -*/ -if (!pl2303_supports_hx_status (serial)) -return TYPE_HXN ; -break ; -case 0x300 : -return TYPE_TA ; -case 0x500 : -return TYPE_TB ; +case 0x700 :/* GR */ +case 0x705 : +return TYPE_HXN ; }break ; }
Greg Kroah-Hartman
maintainerPATCH 62/181 igb: fix a use-after-free issue in igb_clean_tx_ring
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 3f6a57ee8544ec3982f8a3cbcbf4aea7d47eb9ec ]
Fix the following use-after-free bug in igb_clean_tx_ring routine when the NIC is running in XDP mode. The issue can be triggered redirecting traffic into the igb NIC and then closing the device while the traffic is flowing.
[ 73.322719] CPU: 1 PID: 487 Comm: xdp_redirect Not tainted 5.18.3-apu2 #9 [ 73.330639] Hardware name: PC Engines APU2/APU2, BIOS 4.0.7 02/28/2017 [ 73.337434] RIP: 0010:refcount_warn_saturate+0xa7/0xf0 [ 73.362283] RSP: 0018:ffffc9000081f798 EFLAGS: 00010282 [ 73.367761] RAX: 0000000000000000 RBX: ffffc90000420f80 RCX: 0000000000000000 [ 73.375200] RDX: ffff88811ad22d00 RSI: ffff88811ad171e0 RDI: ffff88811ad171e0 [ 73.382590] RBP: 0000000000000900 R08: ffffffff82298f28 R09: 0000000000000058 [ 73.390008] R10: 0000000000000219 R11: ffffffff82280f40 R12: 0000000000000090 [ 73.397356] R13: ffff888102343a40 R14: ffff88810359e0e4 R15: 0000000000000000 [ 73.404806] FS: 00007ff38d31d740(0000) GS:ffff88811ad00000(0000) knlGS:0000000000000000 [ 73.413129] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 73.419096] CR2: 000055cff35f13f8 CR3: 0000000106391000 CR4: 00000000000406e0 [ 73.426565] Call Trace: [ 73.429087] <TASK> [ 73.431314] igb_clean_tx_ring+0x43/0x140 [igb] [ 73.436002] igb_down+0x1d7/0x220 [igb] [ 73.439974] __igb_close+0x3c/0x120 [igb] [ 73.444118] igb_xdp+0x10c/0x150 [igb] [ 73.447983] ? igb_pci_sriov_configure+0x70/0x70 [igb] [ 73.453362] dev_xdp_install+0xda/0x110 [ 73.457371] dev_xdp_attach+0x1da/0x550 [ 73.461369] do_setlink+0xfd0/0x10f0 [ 73.465166] ? __nla_validate_parse+0x89/0xc70 [ 73.469714] rtnl_setlink+0x11a/0x1e0 [ 73.473547] rtnetlink_rcv_msg+0x145/0x3d0 [ 73.477709] ? rtnl_calcit.isra.0+0x130/0x130 [ 73.482258] netlink_rcv_skb+0x8d/0x110 [ 73.486229] netlink_unicast+0x230/0x340 [ 73.490317] netlink_sendmsg+0x215/0x470 [ 73.494395] __sys_sendto+0x179/0x190 [ 73.498268] ? move_addr_to_user+0x37/0x70 [ 73.502547] ? __sys_getsockname+0x84/0xe0 [ 73.506853] ? netlink_setsockopt+0x1c1/0x4a0 [ 73.511349] ? __sys_setsockopt+0xc8/0x1d0 [ 73.515636] __x64_sys_sendto+0x20/0x30 [ 73.519603] do_syscall_64+0x3b/0x80 [ 73.523399] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 73.528712] RIP: 0033:0x7ff38d41f20c [ 73.551866] RSP: 002b:00007fff3b945a68 EFLAGS: 00000246 ORIG_RAX: 000000000000002c [ 73.559640] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007ff38d41f20c [ 73.567066] RDX: 0000000000000034 RSI: 00007fff3b945b30 RDI: 0000000000000003 [ 73.574457] RBP: 0000000000000003 R08: 0000000000000000 R09: 0000000000000000 [ 73.581852] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fff3b945ab0 [ 73.589179] R13: 0000000000000000 R14: 0000000000000003 R15: 00007fff3b945b30 [ 73.596545] </TASK> [ 73.598842] ---[ end trace 0000000000000000 ]---
--- drivers/net/ethernet/intel/igb/igb_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +5 -2
@@ -4819,8 +4819,11 @@ static void igb_clean_tx_ring(struct igb_ring *tx_ring)while (i != tx_ring->next_to_use) {union e1000_adv_tx_desc *eop_desc, *tx_desc; -/* Free all the Tx ring sk_buffs */ -dev_kfree_skb_any (tx_buffer->skb); +/* Free all the Tx ring sk_buffs or xdp frames */ +if (tx_buffer->type ==IGB_TYPE_SKB ) +dev_kfree_skb_any (tx_buffer->skb); +else +xdp_return_frame (tx_buffer->xdpf);/* unmap skb header data */ dma_unmap_single(tx_ring->dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/181 net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit a2b1a5d40bd12b44322c2ccd40bb0ec1699708b6 ]
As reported by Yuming, currently tc always show a latency of UINT_MAX for netem Qdisc's on 32-bit platforms:
$ tc qdisc add dev dummy0 root netem latency 100ms
$ tc qdisc show dev dummy0
qdisc netem 8001: root refcnt 2 limit 1000 delay 275s 275s
^^^^^^^^^^^^^^^^Let us take a closer look at netem_dump():
qopt.latency = min_t(psched_tdiff_t, PSCHED_NS2TICKS(q->latency,
UINT_MAX);qopt.latency is __u32, psched_tdiff_t is signed long, (psched_tdiff_t)(UINT_MAX) is negative for 32-bit platforms, so qopt.latency is always UINT_MAX.
Fix it by using psched_time_t (u64) instead.
Note: confusingly, users have two ways to specify 'latency':
1. normally, via '__u32 latency' in struct tc_netem_qopt;
2. via the TCA_NETEM_LATENCY64 attribute, which is s64.
For the second case, theoretically 'latency' could be negative. This patch ignores that corner case, since it is broken (i.e. assigning a negative s64 to __u32) anyways, and should be handled separately.
Thanks Ted Lin for the analysis [1] .
[1] https://github.com/raspberrypi/linux/issues/3512
--- net/sched/sch_netem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_netem.c +2 -2
@@ -1146,9 +1146,9 @@ static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)struct tc_netem_rate rate;struct tc_netem_slot slot; - qopt.latency =min_t (psched_tdiff_t,PSCHED_NS2TICKS (q->latency), + qopt.latency =min_t (psched_time_t,PSCHED_NS2TICKS (q->latency),UINT_MAX ); - qopt.jitter =min_t (psched_tdiff_t,PSCHED_NS2TICKS (q->jitter), + qopt.jitter =min_t (psched_time_t,PSCHED_NS2TICKS (q->jitter),UINT_MAX ); qopt.limit = q->limit; qopt.loss = q->loss;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/181 udmabuf: add back sanity check
In reply to Greg Kroah-HartmanFrom: Gerd Hoffmann <[email protected]>
[ Upstream commit 05b252cccb2e5c3f56119d25de684b4f810ba40a ]
Check vm_fault->pgoff before using it. When we removed the warning, we also removed the check.
--- drivers/dma-buf/udmabuf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dma-buf/udmabuf.c +4 -1
@@ -32,8 +32,11 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct udmabuf *ubuf = vma->vm_private_data; +pgoff_t pgoff = vmf->pgoff; - vmf->page = ubuf->pages[vmf->pgoff]; +if (pgoff >= ubuf->pagecount) +return VM_FAULT_SIGBUS ; + vmf->page = ubuf->pages[pgoff];get_page (vmf->page);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/181 perf test: Record only user callchains on the "Check Arm64 callgraphs are complete in fp mode" test
In reply to Greg Kroah-HartmanFrom: Michael Petlan <[email protected]>
[ Upstream commit 72dcae8efd42699bbfd55e1ef187310c4e2e5dcb ]
The testcase 'Check Arm64 callgraphs are complete in fp mode' wants to see the following output:
610 leaf
62f parent
648 mainHowever, without excluding kernel callchains, the output might look like:
ffffc2ff40ef1b5c arch_local_irq_enable ffffc2ff419d032c __schedule ffffc2ff419d06c0 schedule ffffc2ff40e4da30 do_notify_resume ffffc2ff40e421b0 work_pending 610 leaf 62f parent 648 main
Adding '--user-callchains' leaves only the wanted symbols in the chain.
--- tools/perf/tests/shell/test_arm_callgraph_fp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/test_arm_callgraph_fp.sh +1 -1
@@ -43,7 +43,7 @@ CFLAGS="-g -O0 -fno-inline -fno-omit-frame-pointer" cc $CFLAGS $TEST_PROGRAM_SOURCE -o $TEST_PROGRAM || exit 1 # Add a 1 second delay to skip samples that are not in the leaf() function -perf record -o $PERF_DATA --call-graph fp -e cycles//u -D 1000 -- $TEST_PROGRAM 2> /dev/null & +perf record -o $PERF_DATA --call-graph fp -e cycles//u -D 1000 --user-callchains -- $TEST_PROGRAM 2> /dev/null & PID=$! echo " + Recording (PID=$PID)..."
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/181 drm/msm: Fix double pm_runtime_disable() call
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
[ Upstream commit ce0db505bc0c51ef5e9ba446c660de7e26f78f29 ]
Following commit 17e822f7591f ("drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init, cleanup}"), any call to adreno_unbind() will disable runtime PM twice, as indicated by the call trees below:
adreno_unbind()
-> pm_runtime_force_suspend()
-> pm_runtime_disable()
adreno_unbind()
-> gpu->funcs->destroy() [= aNxx_destroy()]
-> adreno_gpu_cleanup()
-> pm_runtime_disable()
Note that pm_runtime_force_suspend() is called right before gpu->funcs->destroy() and both functions are called unconditionally.
With recent addition of the eDP AUX bus code, this problem manifests itself when the eDP panel cannot be found yet and probing is deferred. On the first probe attempt, we disable runtime PM twice as described above. This then causes any later probe attempt to fail with
[drm:adreno_load_gpu [msm]] *ERROR* Couldn't power up the GPU: -13
preventing the driver from loading.
As there seem to be scenarios where the aNxx_destroy() functions are not called from adreno_unbind(), simply removing pm_runtime_disable() from inside adreno_unbind() does not seem to be the proper fix. This is what commit 17e822f7591f ("drm/msm: fix unbalanced pm_runtime_enable in adreno_gpu_{init, cleanup}") intended to fix. Therefore, instead check whether runtime PM is still enabled, and only disable it in that case.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +2 -1
@@ -1002,7 +1002,8 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu)for (i =0 ; i <ARRAY_SIZE (adreno_gpu->info->fw); i++)release_firmware (adreno_gpu->fw[i]); -pm_runtime_disable (&priv->gpu_pdev->dev); +if (pm_runtime_enabled (&priv->gpu_pdev->dev)) +pm_runtime_disable (&priv->gpu_pdev->dev);msm_gpu_cleanup (&adreno_gpu->base); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/181 KVM: arm64: Prevent kmemleak from accessing pKVM memory
In reply to Greg Kroah-HartmanFrom: Quentin Perret <[email protected]>
[ Upstream commit 56961c6331463cce2d84d0f973177a517fb33a82 ]
Commit a7259df76702 ("memblock: make memblock_find_in_range method private") changed the API using which memory is reserved for the pKVM hypervisor. However, memblock_phys_alloc() differs from the original API in terms of kmemleak semantics -- the old one didn't report the reserved regions to kmemleak while the new one does. Unfortunately, when protected KVM is enabled, all kernel accesses to pKVM-private memory result in a fatal exception, which can now happen because of kmemleak scans:
$ echo scan > /sys/kernel/debug/kmemleak [ 34.991354] kvm [304]: nVHE hyp BUG at: [<ffff800008fa3750>] __kvm_nvhe_handle_host_mem_abort+0x270/0x290! [ 34.991580] kvm [304]: Hyp Offset: 0xfffe8be807e00000 [ 34.991813] Kernel panic - not syncing: HYP panic: [ 34.991813] PS:600003c9 PC:0000f418011a3750 ESR:00000000f2000800 [ 34.991813] FAR:ffff000439200000 HPFAR:0000000004792000 PAR:0000000000000000 [ 34.991813] VCPU:0000000000000000 [ 34.993660] CPU: 0 PID: 304 Comm: bash Not tainted 5.19.0-rc2 #102 [ 34.994059] Hardware name: linux,dummy-virt (DT) [ 34.994452] Call trace: [ 34.994641] dump_backtrace.part.0+0xcc/0xe0 [ 34.994932] show_stack+0x18/0x6c [ 34.995094] dump_stack_lvl+0x68/0x84 [ 34.995276] dump_stack+0x18/0x34 [ 34.995484] panic+0x16c/0x354 [ 34.995673] __hyp_pgtable_total_pages+0x0/0x60 [ 34.995933] scan_block+0x74/0x12c [ 34.996129] scan_gray_list+0xd8/0x19c [ 34.996332] kmemleak_scan+0x2c8/0x580 [ 34.996535] kmemleak_write+0x340/0x4a0 [ 34.996744] full_proxy_write+0x60/0xbc [ 34.996967] vfs_write+0xc4/0x2b0 [ 34.997136] ksys_write+0x68/0xf4 [ 34.997311] __arm64_sys_write+0x20/0x2c [ 34.997532] invoke_syscall+0x48/0x114 [ 34.997779] el0_svc_common.constprop.0+0x44/0xec [ 34.998029] do_el0_svc+0x2c/0xc0 [ 34.998205] el0_svc+0x2c/0x84 [ 34.998421] el0t_64_sync_handler+0xf4/0x100 [ 34.998653] el0t_64_sync+0x18c/0x190 [ 34.999252] SMP: stopping secondary CPUs [ 35.000034] Kernel Offset: disabled [ 35.000261] CPU features: 0x800,00007831,00001086 [ 35.000642] Memory Limit: none [ 35.001329] ---[ end Kernel panic - not syncing: HYP panic: [ 35.001329] PS:600003c9 PC:0000f418011a3750 ESR:00000000f2000800 [ 35.001329] FAR:ffff000439200000 HPFAR:0000000004792000 PAR:0000000000000000 [ 35.001329] VCPU:0000000000000000 ]---
Fix this by explicitly excluding the hypervisor's memory pool from kmemleak like we already do for the hyp BSS.
--- arch/arm64/kvm/arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/kvm/arm.c +3 -3
@@ -2011,11 +2011,11 @@ static int finalize_hyp_mode(void)return 0 ;/* -* Exclude HYP BSS from kmemleak so that it doesn't get peeked -* at, which would end badly once the section is inaccessible. -* None of other sections should ever be introspected. +* Exclude HYP sections from kmemleak so that they don't get peeked +* at, which would end badly once inaccessible. */ kmemleak_free_part (__hyp_bss_start, __hyp_bss_end - __hyp_bss_start); +kmemleak_free_part (__va (hyp_mem_base), hyp_mem_size);return pkvm_drop_host_privileges (); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/181 scsi: iscsi: Exclude zero from the endpoint ID range
In reply to Greg Kroah-HartmanFrom: Sergey Gorenko <[email protected]>
[ Upstream commit f6eed15f3ea76596ccc689331e1cc850b999133b ]
The kernel returns an endpoint ID as r.ep_connect_ret.handle in the iscsi_uevent. The iscsid validates a received endpoint ID and treats zero as an error. The commit referenced in the fixes line changed the endpoint ID range, and zero is always assigned to the first endpoint ID. So, the first attempt to create a new iSER connection always fails.
--- drivers/scsi/scsi_transport_iscsi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/scsi/scsi_transport_iscsi.c +6 -1
@@ -212,7 +212,12 @@ iscsi_create_endpoint(int dd_size)return NULL ;mutex_lock (&iscsi_ep_idr_mutex); - id =idr_alloc (&iscsi_ep_idr, ep,0 ,-1 ,GFP_NOIO ); + +/* +* First endpoint id should be 1 to comply with user space +* applications (iscsid). +*/ + id =idr_alloc (&iscsi_ep_idr, ep,1 ,-1 ,GFP_NOIO );if (id <0 ) {mutex_unlock (&iscsi_ep_idr_mutex); printk(KERN_ERR "Could not allocate endpoint ID. Error %d.\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 8/181 ALSA: hda/realtek - ALC897 headset MIC no sound
In reply to Greg Kroah-HartmanFrom: Kailang Yang <[email protected]>
commit fe6900bd8156467365bd5b976df64928fdebfeb0 upstream.
There is not have Headset Mic verb table in BIOS default.
So, it will have recording issue from headset MIC.
Add the verb table value without jack detect. It will turn on Headset Mic.
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -10790,6 +10790,7 @@ enum {ALC668_FIXUP_MIC_DET_COEF ,ALC897_FIXUP_LENOVO_HEADSET_MIC ,ALC897_FIXUP_HEADSET_MIC_PIN , + ALC897_FIXUP_HP_HSMIC_VERB, }; static const struct hda_fixup alc662_fixups[] = {
@@ -11209,6 +11210,13 @@ static const struct hda_fixup alc662_fix .chained = true, .chain_id =ALC897_FIXUP_LENOVO_HEADSET_MIC }, + [ALC897_FIXUP_HP_HSMIC_VERB] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x01a1913c },/* use as headset mic, without its own jack detect */ + { } + }, + }, };static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -11234,6 +11242,7 @@ static const struct snd_pci_quirk alc662SND_PCI_QUIRK (0x1028 ,0x0698 ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x069f ,"Dell" ,ALC668_FIXUP_DELL_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x1632 ,"HP RP5800" ,ALC662_FIXUP_HP_RP5800 ), +SND_PCI_QUIRK (0x103c ,0x8719 ,"HP" ,ALC897_FIXUP_HP_HSMIC_VERB ),SND_PCI_QUIRK (0x103c ,0x873e ,"HP" ,ALC671_FIXUP_HP_HEADSET_MIC2 ),SND_PCI_QUIRK (0x103c ,0x885f ,"HP 288 Pro G8" ,ALC671_FIXUP_HP_HEADSET_MIC2 ), SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),
Greg Kroah-Hartman
maintainerPATCH 40/181 USB: serial: option: add Quectel EM05-G modem
In reply to Greg Kroah-HartmanFrom: Yonglin Tan <[email protected]>
commit 33b29dbb39bcbd0a96e440646396bbf670b914fa upstream.
The EM05-G modem has 2 USB configurations that are configurable via the AT command AT+QCFG="usbnet",[ 0 | 2 ] which make the modem enumerate with the following interfaces, respectively:
"RMNET" : AT + DIAG + NMEA + Modem + QMI
"MBIM" : MBIM + AT + DIAG + NMEA + Modem
The detailed description of the USB configuration for each mode as follows:
RMNET Mode
--------------
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 21 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=030a Rev= 3.18 S: Manufacturer=Quectel S: Product=Quectel EM05-G C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 6 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=89(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
MBIM Mode
--------------
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 16 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=030a Rev= 3.18 S: Manufacturer=Quectel S: Product=Quectel EM05-G C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00 I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=89(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -252,6 +252,7 @@ static void option_instat_callback(struc#define QUECTEL_PRODUCT_EG95 0x0195#define QUECTEL_PRODUCT_BG96 0x0296#define QUECTEL_PRODUCT_EP06 0x0306 +#define QUECTEL_PRODUCT_EM05G 0x030a#define QUECTEL_PRODUCT_EM12 0x0512#define QUECTEL_PRODUCT_RM500Q 0x0800#define QUECTEL_PRODUCT_EC200S_CN 0x6002
@@ -1134,6 +1135,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) }, + { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G, 0xff), + .driver_info = RSVD(6) | ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },
Greg Kroah-Hartman
maintainerPATCH 61/181 rethook: Reject getting a rethook if RCU is not watching
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit c0f3bb4054ef036e5f67e27f2e3cad9e6512cf00 ]
Since the rethook_recycle() will involve the call_rcu() for reclaiming the rethook_instance, the rethook must be set up at the RCU available context (non idle). This rethook_recycle() in the rethook trampoline handler is inevitable, thus the RCU available check must be done before setting the rethook trampoline.
This adds a rcu_is_watching() check in the rethook_try_get() so that it will return NULL if it is called when !rcu_is_watching().
--- kernel/trace/rethook.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/trace/rethook.c +9 -0
@@ -154,6 +154,15 @@ struct rethook_node *rethook_try_get(struct rethook *rh)if (unlikely (!handler))return NULL ; +/* +* This expects the caller will set up a rethook on a function entry. +* When the function returns, the rethook will eventually be reclaimed +* or released in the rethook_recycle() with call_rcu(). +* This means the caller must be run in the RCU-availabe context. +*/ +if (unlikely (!rcu_is_watching ())) +return NULL ; + fn =freelist_try_get (&rh->pool);if (!fn)return NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/181 net: fix data-race in dev_isalive()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit cc26c2661fefea215f41edb665193324a5f99021 ]
dev_isalive() is called under RTNL or dev_base_lock protection.
This means that changes to dev->reg_state should be done with both locks held.
syzbot reported:
BUG: KCSAN: data-race in register_netdevice / type_show
write to 0xffff888144ecf518 of 1 bytes by task 20886 on cpu 0:
register_netdevice+0xb9f/0xdf0 net/core/dev.c:10050 lapbeth_new_device drivers/net/wan/lapbether.c:414 [inline] lapbeth_device_event+0x4a0/0x6c0 drivers/net/wan/lapbether.c:456 notifier_call_chain kernel/notifier.c:87 [inline] raw_notifier_call_chain+0x53/0xb0 kernel/notifier.c:455 __dev_notify_flags+0x1d6/0x3a0 dev_change_flags+0xa2/0xc0 net/core/dev.c:8607 do_setlink+0x778/0x2230 net/core/rtnetlink.c:2780 __rtnl_newlink net/core/rtnetlink.c:3546 [inline] rtnl_newlink+0x114c/0x16a0 net/core/rtnetlink.c:3593 rtnetlink_rcv_msg+0x811/0x8c0 net/core/rtnetlink.c:6089 netlink_rcv_skb+0x13e/0x240 net/netlink/af_netlink.c:2501 rtnetlink_rcv+0x18/0x20 net/core/rtnetlink.c:6107 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x58a/0x660 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x661/0x750 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg net/socket.c:734 [inline] __sys_sendto+0x21e/0x2c0 net/socket.c:2119 __do_sys_sendto net/socket.c:2131 [inline] __se_sys_sendto net/socket.c:2127 [inline] __x64_sys_sendto+0x74/0x90 net/socket.c:2127 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
read to 0xffff888144ecf518 of 1 bytes by task 20423 on cpu 1:
dev_isalive net/core/net-sysfs.c:38 [inline] netdev_show net/core/net-sysfs.c:50 [inline] type_show+0x24/0x90 net/core/net-sysfs.c:112 dev_attr_show+0x35/0x90 drivers/base/core.c:2095 sysfs_kf_seq_show+0x175/0x240 fs/sysfs/file.c:59 kernfs_seq_show+0x75/0x80 fs/kernfs/file.c:162 seq_read_iter+0x2c3/0x8e0 fs/seq_file.c:230 kernfs_fop_read_iter+0xd1/0x2f0 fs/kernfs/file.c:235 call_read_iter include/linux/fs.h:2052 [inline] new_sync_read fs/read_write.c:401 [inline] vfs_read+0x5a5/0x6a0 fs/read_write.c:482 ksys_read+0xe8/0x1a0 fs/read_write.c:620 __do_sys_read fs/read_write.c:630 [inline] __se_sys_read fs/read_write.c:628 [inline] __x64_sys_read+0x3e/0x50 fs/read_write.c:628 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x2b/0x70 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
value changed: 0x00 -> 0x01
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 20423 Comm: udevd Tainted: G W 5.19.0-rc2-syzkaller-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/core/dev.c | 25 +++++++++++++++---------- net/core/net-sysfs.c | 1 + 2 files changed, 16 insertions(+), 10 deletions(-)
net/core/dev.c +15 -10
@@ -396,16 +396,18 @@ static void list_netdevice(struct net_device *dev)/* Device list removal * caller must respect a RCU grace period before freeing/reusing dev */ -static void unlist_netdevice (struct net_device *dev) +static void unlist_netdevice (struct net_device *dev,bool lock) {ASSERT_RTNL ();/* Unlink dev from the device chain */ -write_lock (&dev_base_lock); +if (lock) +write_lock (&dev_base_lock);list_del_rcu (&dev->dev_list);netdev_name_node_del (dev->name_node);hlist_del_rcu (&dev->index_hlist); -write_unlock (&dev_base_lock); +if (lock) +write_unlock (&dev_base_lock);dev_base_seq_inc (dev_net (dev)); }
@@ -9963,11 +9965,11 @@ int register_netdevice(struct net_device *dev) goto err_uninit; ret =netdev_register_kobject (dev); -if (ret) { - dev->reg_state =NETREG_UNREGISTERED ; +write_lock (&dev_base_lock); + dev->reg_state = ret ?NETREG_UNREGISTERED :NETREG_REGISTERED ; +write_unlock (&dev_base_lock); +if (ret) goto err_uninit; - } - dev->reg_state =NETREG_REGISTERED ;__netdev_update_features (dev);
@@ -10249,7 +10251,9 @@ void netdev_run_todo(void)continue ; } +write_lock (&dev_base_lock); dev->reg_state =NETREG_UNREGISTERED ; +write_unlock (&dev_base_lock);linkwatch_forget_dev (dev); }
@@ -10727,9 +10731,10 @@ void unregister_netdevice_many(struct list_head *head)list_for_each_entry (dev, head, unreg_list) {/* And unlink it from device chain. */ -unlist_netdevice (dev); - +write_lock (&dev_base_lock); +unlist_netdevice (dev, false); dev->reg_state =NETREG_UNREGISTERING ; +write_unlock (&dev_base_lock); }flush_all_backlogs ();
@@ -10876,7 +10881,7 @@ int __dev_change_net_namespace(struct net_device *dev, struct net *net,dev_close (dev);/* And unlink it from device chain */ -unlist_netdevice (dev); +unlist_netdevice (dev, true);synchronize_net ();
net/core/net-sysfs.c +1 -0
@@ -32,6 +32,7 @@ static const char fmt_dec[] = "%d\n";static const char fmt_ulong[] ="%lu\n" ;static const char fmt_u64[] ="%llu\n" ; +/* Caller holds RTNL or dev_base_lock */ static inline int dev_isalive (const struct net_device *dev) {return dev->reg_state <=NETREG_REGISTERED ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/181 USB: serial: option: add Quectel RM500K module support
In reply to Greg Kroah-HartmanFrom: Macpaul Lin <[email protected]>
commit 15b694e96c31807d8515aacfa687a1e8a4fbbadc upstream.
Add usb product id of the Quectel RM500K module.
RM500K provides 2 mandatory interfaces to Linux host after enumeration.
- /dev/ttyUSB5: this is a serial interface for control path. User needs to write AT commands to this device node to query status, set APN, set PIN code, and enable/disable the data connection to 5G network.
- ethX: this is the data path provided as a RNDIS devices. After the data connection has been established, Linux host can access 5G data network via this interface.
"RNDIS": RNDIS + ADB + AT (/dev/ttyUSB5) + MODEM COMs
usb-devices output for 0x7001:
T: Bus=05 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=7001 Rev=00.01 S: Manufacturer=MediaTek Inc. S: Product=USB DATA CARD S: SerialNumber=869206050009672 C: #Ifs=10 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=02 Prot=ff Driver=rndis_host E: Ad=82(I) Atr=03(Int.) MxPS= 64 Ivl=125us I: If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 8 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 9 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -257,6 +257,7 @@ static void option_instat_callback(struc#define QUECTEL_PRODUCT_RM500Q 0x0800#define QUECTEL_PRODUCT_EC200S_CN 0x6002#define QUECTEL_PRODUCT_EC200T 0x6026 +#define QUECTEL_PRODUCT_RM500K 0x7001#define CMOTECH_VENDOR_ID 0x16d8#define CMOTECH_PRODUCT_6001 0x6001
@@ -1150,6 +1151,7 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
Greg Kroah-Hartman
maintainerPATCH 77/181 selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
In reply to Greg Kroah-HartmanFrom: Jie2x Zhou <[email protected]>
[ Upstream commit 5d79d8af8dec58bf709b3124d09d9572edd9c617 ]
Before change:
make -C netfilter
TEST: performance
net,port [SKIP]
perf not supported
port,net [SKIP]
perf not supported
net6,port [SKIP]
perf not supported
port,proto [SKIP]
perf not supported
net6,port,mac [SKIP]
perf not supported
net6,port,mac,proto [SKIP]
perf not supported
net,mac [SKIP]
perf not supported
After change:
net,mac [ OK ]
baseline (drop from netdev hook): 2061098pps
baseline hash (non-ranged entries): 1606741pps
baseline rbtree (match on first field only): 1191607pps
set with 1000 full, ranged entries: 1639119ppsok 8 selftests: netfilter: nft_concat_range.sh
--- tools/testing/selftests/netfilter/nft_concat_range.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/netfilter/nft_concat_range.sh +1 -1
@@ -31,7 +31,7 @@ BUGS="flush_remove_add reload" # List of possible paths to pktgen script from kernel tree for performance tests PKTGEN_SCRIPT_PATHS=" - ../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh + ../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh pktgen/pktgen_bench_xmit_mode_netif_receive.sh" # Definition of set types:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/181 drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit b9cc4598607cb7f7eae5c75fc1e3209cd52ff5e0 ]
of_graph_get_remote_node() returns remote device node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.
Patchwork: https://patchwork.freedesktop.org/patch/488473/
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +2 -0
@@ -217,6 +217,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, encoder =mdp4_lcdc_encoder_init (dev, panel_node);if (IS_ERR (encoder)) {DRM_DEV_ERROR (dev->dev,"failed to construct LCDC encoder\n" ); +of_node_put (panel_node);return PTR_ERR (encoder); }
@@ -226,6 +227,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms, connector =mdp4_lvds_connector_init (dev, panel_node, encoder);if (IS_ERR (connector)) {DRM_DEV_ERROR (dev->dev,"failed to initialize LVDS connector\n" ); +of_node_put (panel_node);return PTR_ERR (connector); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/181 ethtool: Fix get module eeprom fallback
In reply to Greg Kroah-HartmanFrom: Ivan Vecera <[email protected]>
[ Upstream commit a3bb7b63813f674fb62bac321cdd897cc62de094 ]
Function fallback_set_params() checks if the module type returned by a driver is ETH_MODULE_SFF_8079 and in this case it assumes that buffer returns a concatenated content of page A0h and A2h. The check is wrong because the correct type is ETH_MODULE_SFF_8472.
--- net/ethtool/eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/eeprom.c +1 -1
@@ -36,7 +36,7 @@ static int fallback_set_params(struct eeprom_req_info *request,if (request->page) offset = request->page *ETH_MODULE_EEPROM_PAGE_LEN + offset; -if (modinfo->type ==ETH_MODULE_SFF_8079 && +if (modinfo->type ==ETH_MODULE_SFF_8472 && request->i2c_address ==0x51 ) offset +=ETH_MODULE_EEPROM_PAGE_LEN *2 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/181 netfilter: nf_dup_netdev: add and use recursion counter
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit fcd53c51d03709bc429822086f1e9b3e88904284 ]
Now that the egress function can be called from egress hook, we need to avoid recursive calls into the nf_tables traverser, else crash.
--- net/netfilter/nf_dup_netdev.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
net/netfilter/nf_dup_netdev.c +15 -4
@@ -13,20 +13,31 @@#include <net/netfilter/nf_tables_offload.h> #include <net/netfilter/nf_dup_netdev.h> +#define NF_RECURSION_LIMIT 2 + +static DEFINE_PER_CPU(u8, nf_dup_skb_recursion); +static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev,enum nf_dev_hooks hook) { +if (__this_cpu_read (nf_dup_skb_recursion) >NF_RECURSION_LIMIT ) + goto err; +if (hook ==NF_NETDEV_INGRESS &&skb_mac_header_was_set (skb)) { -if (skb_cow_head (skb, skb->mac_len)) { -kfree_skb (skb); -return ; - } +if (skb_cow_head (skb, skb->mac_len)) + goto err; +skb_push (skb, skb->mac_len); } skb->dev = dev;skb_clear_tstamp (skb); +__this_cpu_inc (nf_dup_skb_recursion);dev_queue_xmit (skb); +__this_cpu_dec (nf_dup_skb_recursion); +return ; +err: +kfree_skb (skb); }void nf_fwd_netdev_egress (const struct nft_pktinfo *pkt,int oif)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/181 ALSA: hda/realtek: Add quirk for Clevo NS50PU
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit 627ce0d68eb4b53e995b08089fa9da1e513ec5ba upstream.
Fixes headset detection on Clevo NS50PU.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9263,6 +9263,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x70f3 ,"Clevo NH77DPQ" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x70f4 ,"Clevo NH77EPY" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x70f6 ,"Clevo NH77DPQ-Y" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x7716 ,"Clevo NS50PU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x8228 ,"Clevo NR40BU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x8520 ,"Clevo NH50D[CD]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x8521, "Clevo NH77D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 85/181 ice: ignore protocol field in GTP offload
In reply to Greg Kroah-HartmanFrom: Marcin Szycik <[email protected]>
[ Upstream commit d4ea6f6373ef56d1d795a24f1f5874f4a6019199 ]
Commit 34a897758efe ("ice: Add support for inner etype in switchdev") added the ability to match on inner ethertype. A side effect of that change is that it is now impossible to add some filters for protocols which do not contain inner ethtype field. tc requires the protocol field to be specified when providing certain other options, e.g. src_ip. This is a problem in case of GTP - when user wants to specify e.g. src_ip, they also need to specify protocol in tc command (otherwise tc fails with: Illegal "src_ip"). Because GTP is a tunnel, the protocol field is treated as inner protocol. GTP does not contain inner ethtype field and the filter cannot be added.
To fix this, ignore the ethertype field in case of GTP filters.
--- drivers/net/ethernet/intel/ice/ice_tc_lib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_tc_lib.c +3 -1
@@ -994,7 +994,9 @@ ice_parse_cls_flower(struct net_device *filter_dev, struct ice_vsi *vsi, n_proto_key =ntohs (match.key->n_proto); n_proto_mask =ntohs (match.mask->n_proto); -if (n_proto_key ==ETH_P_ALL || n_proto_key ==0 ) { +if (n_proto_key ==ETH_P_ALL || n_proto_key ==0 || + fltr->tunnel_type ==TNL_GTPU || + fltr->tunnel_type ==TNL_GTPC ) { n_proto_key =0 ; n_proto_mask =0 ; }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/181 ice: Fix switchdev rules book keeping
In reply to Greg Kroah-HartmanFrom: Wojciech Drewek <[email protected]>
[ Upstream commit 3578dc90013b1fa20da996cdadd8515802716132 ]
Adding two filters with same matching criteria ends up with one rule in hardware with act = ICE_FWD_TO_VSI_LIST. In order to remove them properly we have to keep the information about vsi handle which is used in VSI bitmap (ice_adv_fltr_mgmt_list_entry::vsi_list_info::vsi_map).
--- drivers/net/ethernet/intel/ice/ice_tc_lib.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ice/ice_tc_lib.c +1 -0
@@ -524,6 +524,7 @@ ice_eswitch_add_tc_fltr(struct ice_vsi *vsi, struct ice_tc_flower_fltr *fltr)*/ fltr->rid = rule_added.rid; fltr->rule_id = rule_added.rule_id; + fltr->dest_id = rule_added.vsi_handle; exit:kfree (list);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/181 ice: ethtool: advertise 1000M speeds properly
In reply to Greg Kroah-HartmanFrom: Anatolii Gerasymenko <[email protected]>
[ Upstream commit c3d184c83ff4b80167e34edfc3d21df424bf27ff ]
In current implementation ice_update_phy_type enables all link modes for selected speed. This approach doesn't work for 1000M speeds, because both copper (1000baseT) and optical (1000baseX) standards cannot be enabled at once.
Fix this, by adding the function ice_set_phy_type_from_speed() for 1000M speeds.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 39 +++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +38 -1
@@ -2191,6 +2191,42 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks,return err; } +/** +* ice_set_phy_type_from_speed - set phy_types based on speeds +* and advertised modes +* @ks: ethtool link ksettings struct +* @phy_type_low: pointer to the lower part of phy_type +* @phy_type_high: pointer to the higher part of phy_type +* @adv_link_speed: targeted link speeds bitmap +*/ +static void +ice_set_phy_type_from_speed (const struct ethtool_link_ksettings *ks, +u64 *phy_type_low,u64 *phy_type_high, +u16 adv_link_speed) +{ +/* Handle 1000M speed in a special way because ice_update_phy_type +* enables all link modes, but having mixed copper and optical +* standards is not supported. +*/ + adv_link_speed &= ~ICE_AQ_LINK_SPEED_1000MB ; + +if (ethtool_link_ksettings_test_link_mode (ks, advertising, + 1000baseT_Full)) + *phy_type_low |=ICE_PHY_TYPE_LOW_1000BASE_T | +ICE_PHY_TYPE_LOW_1G_SGMII ; + +if (ethtool_link_ksettings_test_link_mode (ks, advertising, + 1000baseKX_Full)) + *phy_type_low |=ICE_PHY_TYPE_LOW_1000BASE_KX ; + +if (ethtool_link_ksettings_test_link_mode (ks, advertising, + 1000baseX_Full)) + *phy_type_low |=ICE_PHY_TYPE_LOW_1000BASE_SX | +ICE_PHY_TYPE_LOW_1000BASE_LX ; + +ice_update_phy_type (phy_type_low, phy_type_high, adv_link_speed); +} +/** * ice_set_link_ksettings - Set Speed and Duplex * @netdev: network interface device structure
@@ -2322,7 +2358,8 @@ ice_set_link_ksettings(struct net_device *netdev, adv_link_speed = curr_link_speed;/* Convert the advertise link speeds to their corresponded PHY_TYPE */ -ice_update_phy_type (&phy_type_low, &phy_type_high, adv_link_speed); +ice_set_phy_type_from_speed (ks, &phy_type_low, &phy_type_high, + adv_link_speed);if (!autoneg_changed && adv_link_speed == curr_link_speed) {netdev_info (netdev,"Nothing changed, exiting without setting anything.\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/181 bpf: Fix request_sock leak in sk lookup helpers
In reply to Greg Kroah-HartmanFrom: Jon Maxwell <[email protected]>
[ Upstream commit 3046a827316c0e55fc563b4fb78c93b9ca5c7c37 ]
A customer reported a request_socket leak in a Calico cloud environment. We found that a BPF program was doing a socket lookup with takes a refcnt on the socket and that it was finding the request_socket but returning the parent LISTEN socket via sk_to_full_sk() without decrementing the child request socket 1st, resulting in request_sock slab object leak. This patch retains the existing behaviour of returning full socks to the caller but it also decrements the child request_socket if one is present before doing so to prevent the leak.
Thanks to Curtis Taylor for all the help in diagnosing and testing this. And thanks to Antoine Tenart for the reproducer and patch input.
v2 of this patch contains, refactor as per Daniel Borkmann's suggestions to validate RCU flags on the listen socket so that it balances with bpf_sk_release() and update comments as per Martin KaFai Lau's suggestion. One small change to Daniels suggestion, put "sk = sk2" under "if (sk2 != sk)" to avoid an extra instruction.
--- net/core/filter.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
net/core/filter.c +28 -6
@@ -6506,10 +6506,21 @@ __bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len, ifindex, proto, netns_id, flags);if (sk) { - sk =sk_to_full_sk (sk); -if (!sk_fullsock (sk)) { +struct sock *sk2 =sk_to_full_sk (sk); + +/* sk_to_full_sk() may return (sk)->rsk_listener, so make sure the original sk +* sock refcnt is decremented to prevent a request_sock leak. +*/ +if (!sk_fullsock (sk2)) + sk2 =NULL ; +if (sk2 != sk) {sock_gen_put (sk); -return NULL ; +/* Ensure there is no need to bump sk2 refcnt */ +if (unlikely (sk2 && !sock_flag (sk2,SOCK_RCU_FREE ))) { +WARN_ONCE (1 ,"Found non-RCU, unreferenced socket!" ); +return NULL ; + } + sk = sk2; } }
@@ -6543,10 +6554,21 @@ bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len, flags);if (sk) { - sk =sk_to_full_sk (sk); -if (!sk_fullsock (sk)) { +struct sock *sk2 =sk_to_full_sk (sk); + +/* sk_to_full_sk() may return (sk)->rsk_listener, so make sure the original sk +* sock refcnt is decremented to prevent a request_sock leak. +*/ +if (!sk_fullsock (sk2)) + sk2 =NULL ; +if (sk2 != sk) {sock_gen_put (sk); -return NULL ; +/* Ensure there is no need to bump sk2 refcnt */ +if (unlikely (sk2 && !sock_flag (sk2,SOCK_RCU_FREE ))) { +WARN_ONCE (1 ,"Found non-RCU, unreferenced socket!" ); +return NULL ; + } + sk = sk2; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/181 drm/sun4i: Fix crash during suspend after component bind failure
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 1342b5b23da9559a1578978eaff7f797d8a87d91 ]
If the component driver fails to bind, or is unbound, the driver data for the top-level platform device points to a freed drm_device. If the system is then suspended, the driver passes this dangling pointer to drm_mode_config_helper_suspend(), which crashes.
Fix this by only setting the driver data while the platform driver holds a reference to the drm_device.
--- drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/sun4i/sun4i_drv.c +3 -1
@@ -73,7 +73,6 @@ static int sun4i_drv_bind(struct device *dev) goto free_drm; } -dev_set_drvdata (dev, drm); drm->dev_private = drv;INIT_LIST_HEAD (&drv->frontend_list);INIT_LIST_HEAD (&drv->engine_list);
@@ -114,6 +113,8 @@ static int sun4i_drv_bind(struct device *dev)drm_fbdev_generic_setup (drm,32 ); +dev_set_drvdata (dev, drm); +return 0 ; finish_poll:
@@ -130,6 +131,7 @@ static void sun4i_drv_unbind(struct device *dev) {struct drm_device *drm =dev_get_drvdata (dev); +dev_set_drvdata (dev,NULL );drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm);drm_atomic_helper_shutdown (drm);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/181 bpf, x86: Fix tail call count offset calculation on bpf2bpf call
In reply to Greg Kroah-HartmanFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit ff672c67ee7635ca1e28fb13729e8ef0d1f08ce5 ]
On x86-64 the tail call count is passed from one BPF function to another through %rax. Additionally, on function entry, the tail call count value is stored on stack right after the BPF program stack, due to register shortage.
The stored count is later loaded from stack either when performing a tail call - to check if we have not reached the tail call limit - or before calling another BPF function call in order to pass it via %rax.
In the latter case, we miscalculate the offset at which the tail call count was stored on function entry. The JIT does not take into account that the allocated BPF program stack is always a multiple of 8 on x86, while the actual stack depth does not have to be.
This leads to a load from an offset that belongs to the BPF stack, as shown in the example below:
SEC("tc")
int entry(struct __sk_buff *skb)
{
/* Have data on stack which size is not a multiple of 8 */
volatile char arr[1] = {};
return subprog_tail(skb);
}int entry(struct __sk_buff * skb):
0: (b4) w2 = 0
1: (73) *(u8 *)(r10 -1) = r2
2: (85) call pc+1#bpf_prog_ce2f79bb5f3e06dd_F
3: (95) exit
int entry(struct __sk_buff * skb):
0xffffffffa0201788: nop DWORD PTR [rax+rax*1+0x0] 0xffffffffa020178d: xor eax,eax 0xffffffffa020178f: push rbp 0xffffffffa0201790: mov rbp,rsp 0xffffffffa0201793: sub rsp,0x8 0xffffffffa020179a: push rax 0xffffffffa020179b: xor esi,esi 0xffffffffa020179d: mov BYTE PTR [rbp-0x1],sil 0xffffffffa02017a1: mov rax,QWORD PTR [rbp-0x9] !!! tail call count 0xffffffffa02017a8: call 0xffffffffa02017d8 !!! is at rbp-0x10 0xffffffffa02017ad: leave 0xffffffffa02017ae: ret
Fix it by rounding up the BPF stack depth to a multiple of 8, when calculating the tail call count offset on stack.
--- arch/x86/net/bpf_jit_comp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/net/bpf_jit_comp.c +2 -1
@@ -1415,8 +1415,9 @@ st: if (is_imm8(insn->off))case BPF_JMP |BPF_CALL : func = (u8 *) __bpf_call_base + imm32;if (tail_call_reachable) { +/* mov rax, qword ptr [rbp - rounded_stack_depth - 8] */ EMIT3_off32 (0x48 ,0x8B ,0x85 , - -(bpf_prog->aux->stack_depth +8 )); + -round_up (bpf_prog->aux->stack_depth,8 ) -8 );if (!imm32 ||emit_call (&prog, func, image + addrs[i -1 ] +7 ))return -EINVAL ; }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/181 selftests dma: fix compile error for dma_map_benchmark
In reply to Greg Kroah-HartmanFrom: Yu Liao <[email protected]>
[ Upstream commit 12a29115be72dfc72372af9ded4bc4ae7113a729 ]
When building selftests/dma:
$ make -C tools/testing/selftests TARGETS=dma I hit the following compilation error:
dma_map_benchmark.c:13:10: fatal error: linux/map_benchmark.h: No such file or directory
#include <linux/map_benchmark.h>
^~~~~~~~~~~~~~~~~~~~~~~dma/Makefile does not include the map_benchmark.h path, so add more including path, and fix include order in dma_map_benchmark.c
--- tools/testing/selftests/dma/Makefile | 1 + tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/dma/Makefile +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -I../../../../usr/include/ +CFLAGS += -I../../../../include/ TEST_GEN_PROGS := dma_map_benchmark
tools/testing/selftests/dma/dma_map_benchmark.c +1 -1
@@ -10,8 +10,8 @@#include <unistd.h> #include <sys/ioctl.h> #include <sys/mman.h> -#include <linux/map_benchmark.h> #include <linux/types.h> +#include <linux/map_benchmark.h> #define NSEC_PER_MSEC 1000000L
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/181 scsi: storvsc: Correct reporting of Hyper-V I/O size limits
In reply to Greg Kroah-HartmanFrom: Saurabh Sengar <[email protected]>
[ Upstream commit 1d3e0980782fbafaf93285779fd3905e4f866802 ]
Current code is based on the idea that the max number of SGL entries also determines the max size of an I/O request. While this idea was true in older versions of the storvsc driver when SGL entry length was limited to 4 Kbytes, commit 3d9c3dcc58e9 ("scsi: storvsc: Enable scatterlist entry lengths > 4Kbytes") removed that limitation. It's now theoretically possible for the block layer to send requests that exceed the maximum size supported by Hyper-V. This problem doesn't currently happen in practice because the block layer defaults to a 512 Kbyte maximum, while Hyper-V in Azure supports 2 Mbyte I/O sizes. But some future configuration of Hyper-V could have a smaller max I/O size, and the block layer could exceed that max.
Fix this by correctly setting max_sectors as well as sg_tablesize to reflect the maximum I/O size that Hyper-V reports. While allowing I/O sizes larger than the block layer default of 512 Kbytes doesn’t provide any noticeable performance benefit in the tests we ran, it's still appropriate to report the correct underlying Hyper-V capabilities to the Linux block layer.
Also tweak the virt_boundary_mask to reflect that the required alignment derives from Hyper-V communication using a 4 Kbyte page size, and not on the guest page size, which might be bigger (eg. ARM64).
--- drivers/scsi/storvsc_drv.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
drivers/scsi/storvsc_drv.c +22 -5
@@ -1916,7 +1916,7 @@ static struct scsi_host_template scsi_driver = { .cmd_per_lun = 2048, .this_id = -1,/* Ensure there are no gaps in presented sgls */ - .virt_boundary_mask = PAGE_SIZE-1, + .virt_boundary_mask = HV_HYP_PAGE_SIZE - 1, .no_write_same = 1, .track_queue_depth = 1, .change_queue_depth = storvsc_change_queue_depth,
@@ -1970,6 +1970,7 @@ static int storvsc_probe(struct hv_device *device,int max_targets;int max_channels;int max_sub_channels =0 ; +u32 max_xfer_bytes;/* * Based on the windows host we are running on,
@@ -2059,12 +2060,28 @@ static int storvsc_probe(struct hv_device *device, }/* max cmd length */ host->max_cmd_len =STORVSC_MAX_CMD_LEN ; -/* -* set the table size based on the info we got -* from the host. +* Any reasonable Hyper-V configuration should provide +* max_transfer_bytes value aligning to HV_HYP_PAGE_SIZE, +* protecting it from any weird value. +*/ + max_xfer_bytes =round_down (stor_device->max_transfer_bytes,HV_HYP_PAGE_SIZE ); +/* max_hw_sectors_kb */ + host->max_sectors = max_xfer_bytes >>9 ; +/* +* There are 2 requirements for Hyper-V storvsc sgl segments, +* based on which the below calculation for max segments is +* done: +* +* 1. Except for the first and last sgl segment, all sgl segments +* should be align to HV_HYP_PAGE_SIZE, that also means the +* maximum number of segments in a sgl can be calculated by +* dividing the total max transfer length by HV_HYP_PAGE_SIZE. +* +* 2. Except for the first and last, each entry in the SGL must +* have an offset that is a multiple of HV_HYP_PAGE_SIZE. */ - host->sg_tablesize = (stor_device->max_transfer_bytes >>PAGE_SHIFT ); + host->sg_tablesize = (max_xfer_bytes >>HV_HYP_PAGE_SHIFT ) +1 ;/* * For non-IDE disks, the host supports multiple channels. * Set the number of HW queues we are supporting.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/181 scsi: scsi_debug: Fix zone transition to full condition
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 566d3c57eb526f32951af15866086e236ce1fc8a ]
When a write command to a sequential write required or sequential write preferred zone result in the zone write pointer reaching the end of the zone, the zone condition must be set to full AND the number of implicitly or explicitly open zones updated to have a correct accounting for zone resources. However, the function zbc_inc_wp() only sets the zone condition to full without updating the open zone counters, resulting in a zone state machine breakage.
Introduce the helper function zbc_set_zone_full() and use it in zbc_inc_wp() to correctly transition zones to the full condition.
--- drivers/scsi/scsi_debug.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
drivers/scsi/scsi_debug.c +20 -2
@@ -2788,6 +2788,24 @@ static void zbc_open_zone(struct sdebug_dev_info *devip, } } +static inline void zbc_set_zone_full (struct sdebug_dev_info *devip, +struct sdeb_zone_state *zsp) +{ +switch (zsp->z_cond) { +case ZC2_IMPLICIT_OPEN : + devip->nr_imp_open--; +break ; +case ZC3_EXPLICIT_OPEN : + devip->nr_exp_open--; +break ; +default : +WARN_ONCE (true,"Invalid zone %llu condition %x\n" , + zsp->z_start, zsp->z_cond); +break ; + } + zsp->z_cond =ZC5_FULL ; +} +static void zbc_inc_wp (struct sdebug_dev_info *devip,unsigned long long lba,unsigned int num) {
@@ -2800,7 +2818,7 @@ static void zbc_inc_wp(struct sdebug_dev_info *devip,if (zsp->z_type ==ZBC_ZONE_TYPE_SWR ) { zsp->z_wp += num;if (zsp->z_wp >= zend) - zsp->z_cond =ZC5_FULL ; +zbc_set_zone_full (devip, zsp);return ; }
@@ -2819,7 +2837,7 @@ static void zbc_inc_wp(struct sdebug_dev_info *devip, n = num; }if (zsp->z_wp >= zend) - zsp->z_cond =ZC5_FULL ; +zbc_set_zone_full (devip, zsp); num -= n; lba += n;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/181 sock: redo the psock vs ULP protection check
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e34a07c0ae3906f97eb18df50902e2a01c1015b6 ]
Commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()") has moved the inet_csk_has_ulp(sk) check from sk_psock_init() to the new tcp_bpf_update_proto() function. I'm guessing that this was done to allow creating psocks for non-inet sockets.
Unfortunately the destruction path for psock includes the ULP unwind, so we need to fail the sk_psock_init() itself. Otherwise if ULP is already present we'll notice that later, and call tcp_update_ulp() with the sk_proto of the ULP itself, which will most likely result in the ULP looping its callbacks.
--- include/net/inet_sock.h | 5 +++++ net/core/skmsg.c | 5 +++++ net/ipv4/tcp_bpf.c | 3 --- net/tls/tls_main.c | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-)
include/net/inet_sock.h +5 -0
@@ -252,6 +252,11 @@ struct inet_sock {#define IP_CMSG_CHECKSUM BIT(7)#define IP_CMSG_RECVFRAGSIZE BIT(8) +static inline bool sk_is_inet (struct sock *sk) +{ +return sk->sk_family ==AF_INET || sk->sk_family ==AF_INET6 ; +} +/** * sk_to_full_sk - Access to a full socket * @sk: pointer to a socket
net/core/skmsg.c +5 -0
@@ -695,6 +695,11 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node)write_lock_bh (&sk->sk_callback_lock); +if (sk_is_inet (sk) &&inet_csk_has_ulp (sk)) { + psock =ERR_PTR (-EINVAL ); + goto out; + } +if (sk->sk_user_data) { psock =ERR_PTR (-EBUSY ); goto out;
net/ipv4/tcp_bpf.c +0 -3
@@ -612,9 +612,6 @@ int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)return 0 ; } -if (inet_csk_has_ulp (sk)) -return -EINVAL ; -if (sk->sk_family ==AF_INET6 ) {if (tcp_bpf_assert_proto_ops (psock->sk_proto))return -EINVAL ;
net/tls/tls_main.c +2 -0
@@ -873,6 +873,8 @@ static void tls_update(struct sock *sk, struct proto *p, {struct tls_context *ctx; +WARN_ON_ONCE (sk->sk_prot == p); + ctx =tls_get_ctx (sk);if (likely (ctx)) { ctx->sk_write_space = write_space;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 99/181 nvme: move the Samsung X5 quirk entry to the core quirks
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit e6487833182a8a0187f0292aca542fc163ccd03e ]
This device shares the PCI ID with the Samsung 970 Evo Plus that does not need or want the quirks. Move the the quirk entry to the core table based on the model number instead.
--- drivers/nvme/host/core.c | 14 ++++++++++++++ drivers/nvme/host/pci.c | 4 ---- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/nvme/host/core.c +14 -0
@@ -2487,6 +2487,20 @@ static const struct nvme_core_quirk_entry core_quirks[] = { .vid = 0x1e0f, .mn = "KCD6XVUL6T40", .quirks = NVME_QUIRK_NO_APST, + }, + { +/* +* The external Samsung X5 SSD fails initialization without a +* delay before checking if it is ready and has a whole set of +* other problems. To make this even more interesting, it +* shares the PCI ID with internal Samsung 970 Evo Plus that +* does not need or want these quirks. +*/ + .vid = 0x144d, + .mn = "Samsung Portable SSD X5", + .quirks = NVME_QUIRK_DELAY_BEFORE_CHK_RDY | + NVME_QUIRK_NO_DEEPEST_PS | + NVME_QUIRK_IGNORE_DEV_SUBNQN, } };
drivers/nvme/host/pci.c +0 -4
@@ -3475,10 +3475,6 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_128_BYTES_SQES | NVME_QUIRK_SHARED_TAGS | NVME_QUIRK_SKIP_CID_GEN }, - { PCI_DEVICE(0x144d, 0xa808), /* Samsung X5 */ - .driver_data =NVME_QUIRK_DELAY_BEFORE_CHK_RDY | -NVME_QUIRK_NO_DEEPEST_PS | - NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { 0, } };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/181 gpio: winbond: Fix error code in winbond_gpio_get()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9ca766eaea2e87b8b773bff04ee56c055cb76d4e ]
This error path returns 1, but it should instead propagate the negative error code from winbond_sio_enter().
--- drivers/gpio/gpio-winbond.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpio/gpio-winbond.c +4 -3
@@ -385,12 +385,13 @@ static int winbond_gpio_get(struct gpio_chip *gc, unsigned int offset)unsigned long *base =gpiochip_get_data (gc);const struct winbond_gpio_info *info;bool val; +int ret;winbond_gpio_get_info (&offset, &info); - val =winbond_sio_enter (*base); -if (val) -return val; + ret =winbond_sio_enter (*base); +if (ret) +return ret;winbond_sio_select_logical (*base, info->dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/181 io_uring: fail links when poll fails
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
[ Upstream commit c487a5ad48831afa6784b368ec40d0ee50f2fe1b ]
Don't forget to cancel all linked requests of poll request when __io_arm_poll_handler() failed.
--- fs/io_uring.c | 2 ++ 1 file changed, 2 insertions(+)
fs/io_uring.c +2 -0
@@ -6399,6 +6399,8 @@ static int io_poll_add(struct io_kiocb *req, unsigned int issue_flags) ipt.pt._qproc = io_poll_queue_proc; ret =__io_arm_poll_handler (req, &req->poll, &ipt, poll->events); +if (!ret && ipt.error) +req_set_fail (req); ret = ret ?: ipt.error;if (ret)__io_req_complete (req, issue_flags, ret,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/181 filemap: Fix serialization adding transparent huge pages to page cache
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
[ Upstream commit 00fa15e0d56482e32d8ca1f51d76b0ee00afb16b ]
Commit 793917d997df ("mm/readahead: Add large folio readahead") introduced support for using large folios for filebacked pages if the filesystem supports it.
page_cache_ra_order() was introduced to allocate and add these large folios to the page cache. However adding pages to the page cache should be serialized against truncation and hole punching by taking invalidate_lock. Not doing so can lead to data races resulting in stale data getting added to the page cache and marked up-to-date. See commit 730633f0b7f9 ("mm: Protect operations adding pages to page cache with invalidate_lock") for more details.
This issue was found by inspection but a testcase revealed it was possible to observe in practice on XFS. Fix this by taking invalidate_lock in page_cache_ra_order(), to mirror what is done for the non-thp case in page_cache_ra_unbounded().
--- mm/readahead.c | 2 ++ 1 file changed, 2 insertions(+)
mm/readahead.c +2 -0
@@ -508,6 +508,7 @@ void page_cache_ra_order(struct readahead_control *ractl, new_order--; } +filemap_invalidate_lock_shared (mapping);while (index <= limit) {unsigned int order = new_order;
@@ -534,6 +535,7 @@ void page_cache_ra_order(struct readahead_control *ractl, }read_pages (ractl); +filemap_invalidate_unlock_shared (mapping);/* * If there were already pages in the page cache, then we may have
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 101/181 s390/cpumf: Handle events cycles and instructions identical
In reply to Greg Kroah-HartmanFrom: Thomas Richter <[email protected]>
[ Upstream commit be857b7f77d130dbbd47c91fc35198b040f35865 ]
Events CPU_CYCLES and INSTRUCTIONS can be submitted with two different perf_event attribute::type values:
- PERF_TYPE_HARDWARE: when invoked via perf tool predefined events name cycles or cpu-cycles or instructions.
- pmu->type: when invoked via perf tool event name cpu_cf/CPU_CYLCES/ or cpu_cf/INSTRUCTIONS/. This invocation also selects the PMU to which the event belongs.
Handle both type of invocations identical for events CPU_CYLCES and INSTRUCTIONS. They address the same hardware.
The result is different when event modifier exclude_kernel is also set. Invocation with event modifier for user space event counting fails.
Output before:
# perf stat -e cpum_cf/cpu_cycles/u -- true
Performance counter stats for 'true':
<not supported> cpum_cf/cpu_cycles/u
0.000761033 seconds time elapsed
0.000076000 seconds user
0.000725000 seconds sys#
Output after:
# perf stat -e cpum_cf/cpu_cycles/u -- true
Performance counter stats for 'true':
349,613 cpum_cf/cpu_cycles/u
0.000844143 seconds time elapsed
0.000079000 seconds user
0.000800000 seconds sys#
--- arch/s390/kernel/perf_cpum_cf.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_cf.c +21 -1
@@ -516,6 +516,26 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type)return err; } +/* Events CPU_CYLCES and INSTRUCTIONS can be submitted with two different +* attribute::type values: +* - PERF_TYPE_HARDWARE: +* - pmu->type: +* Handle both type of invocations identical. They address the same hardware. +* The result is different when event modifiers exclude_kernel and/or +* exclude_user are also set. +*/ +static int cpumf_pmu_event_type (struct perf_event *event) +{ +u64 ev = event->attr.config; + +if (cpumf_generic_events_basic[PERF_COUNT_HW_CPU_CYCLES ] == ev || + cpumf_generic_events_basic[PERF_COUNT_HW_INSTRUCTIONS ] == ev || + cpumf_generic_events_user[PERF_COUNT_HW_CPU_CYCLES ] == ev || + cpumf_generic_events_user[PERF_COUNT_HW_INSTRUCTIONS ] == ev) +return PERF_TYPE_HARDWARE ; +return PERF_TYPE_RAW ; +} +static int cpumf_pmu_event_init (struct perf_event *event) {unsigned int type = event->attr.type;
@@ -525,7 +545,7 @@ static int cpumf_pmu_event_init(struct perf_event *event) err =__hw_perf_event_init (event, type); else if (event->pmu->type == type)/* Registered as unknown PMU */ - err =__hw_perf_event_init (event,PERF_TYPE_RAW ); + err =__hw_perf_event_init (event,cpumf_pmu_event_type (event)); else return -ENOENT;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/181 KVM: SEV: Init target VMCBs in sev_migrate_from
In reply to Greg Kroah-HartmanFrom: Peter Gonda <[email protected]>
[ Upstream commit 6defa24d3b12bbd418bc8526dea1cbc605265c06 ]
The target VMCBs during an intra-host migration need to correctly setup for running SEV and SEV-ES guests. Add sev_init_vmcb() function and make sev_es_init_vmcb() static. sev_init_vmcb() uses the now private function to init SEV-ES guests VMCBs when needed.
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/sev.c | 68 ++++++++++++++++++++++++++++-------------- arch/x86/kvm/svm/svm.c | 11 ++----- arch/x86/kvm/svm/svm.h | 2 +- 3 files changed, 48 insertions(+), 33 deletions(-)
arch/x86/kvm/svm/sev.c +45 -23
@@ -1665,19 +1665,24 @@ static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm) {struct kvm_sev_info *dst = &to_kvm_svm (dst_kvm)->sev_info;struct kvm_sev_info *src = &to_kvm_svm (src_kvm)->sev_info; +struct kvm_vcpu *dst_vcpu, *src_vcpu; +struct vcpu_svm *dst_svm, *src_svm;struct kvm_sev_info *mirror; +unsigned long i; dst->active = true; dst->asid = src->asid; dst->handle = src->handle; dst->pages_locked = src->pages_locked; dst->enc_context_owner = src->enc_context_owner; + dst->es_active = src->es_active; src->asid =0 ; src->active = false; src->handle =0 ; src->pages_locked =0 ; src->enc_context_owner =NULL ; + src->es_active = false;list_cut_before (&dst->regions_list, &src->regions_list, &src->regions_list);
@@ -1704,26 +1709,21 @@ static void sev_migrate_from(struct kvm *dst_kvm, struct kvm *src_kvm)list_del (&src->mirror_entry);list_add_tail (&dst->mirror_entry, &owner_sev_info->mirror_vms); } -} -static int sev_es_migrate_from (struct kvm *dst,struct kvm *src) -{ -unsigned long i; -struct kvm_vcpu *dst_vcpu, *src_vcpu; -struct vcpu_svm *dst_svm, *src_svm; +kvm_for_each_vcpu (i, dst_vcpu, dst_kvm) { + dst_svm =to_svm (dst_vcpu); -if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) -return -EINVAL ; +sev_init_vmcb (dst_svm); -kvm_for_each_vcpu (i, src_vcpu, src) { -if (!src_vcpu->arch.guest_state_protected) -return -EINVAL ; - } +if (!dst->es_active) +continue ; -kvm_for_each_vcpu (i, src_vcpu, src) { +/* +* Note, the source is not required to have the same number of +* vCPUs as the destination when migrating a vanilla SEV VM. +*/ + src_vcpu =kvm_get_vcpu (dst_kvm, i); src_svm =to_svm (src_vcpu); - dst_vcpu =kvm_get_vcpu (dst, i); - dst_svm =to_svm (dst_vcpu);/* * Transfer VMSA and GHCB state to the destination. Nullify and
@@ -1740,8 +1740,23 @@ static int sev_es_migrate_from(struct kvm *dst, struct kvm *src) src_svm->vmcb->control.vmsa_pa =INVALID_PAGE ; src_vcpu->arch.guest_state_protected = false; } -to_kvm_svm (src)->sev_info.es_active = false; -to_kvm_svm (dst)->sev_info.es_active = true; +} + +static int sev_check_source_vcpus (struct kvm *dst,struct kvm *src) +{ +struct kvm_vcpu *src_vcpu; +unsigned long i; + +if (!sev_es_guest (src)) +return 0 ; + +if (atomic_read (&src->online_vcpus) !=atomic_read (&dst->online_vcpus)) +return -EINVAL ; + +kvm_for_each_vcpu (i, src_vcpu, src) { +if (!src_vcpu->arch.guest_state_protected) +return -EINVAL ; + }return 0 ; }
@@ -1789,11 +1804,9 @@ int sev_vm_move_enc_context_from(struct kvm *kvm, unsigned int source_fd)if (ret) goto out_dst_vcpu; -if (sev_es_guest (source_kvm)) { - ret =sev_es_migrate_from (kvm, source_kvm); -if (ret) - goto out_source_vcpu; - } + ret =sev_check_source_vcpus (kvm, source_kvm); +if (ret) + goto out_source_vcpu;sev_migrate_from (kvm, source_kvm);kvm_vm_dead (source_kvm);
@@ -2910,7 +2923,7 @@ int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in) count, in); } -void sev_es_init_vmcb (struct vcpu_svm *svm) +static void sev_es_init_vmcb (struct vcpu_svm *svm) {struct kvm_vcpu *vcpu = &svm->vcpu;
@@ -2955,6 +2968,15 @@ void sev_es_init_vmcb(struct vcpu_svm *svm)set_msr_interception (vcpu, svm->msrpm,MSR_IA32_LASTINTTOIP ,1 ,1 ); } +void sev_init_vmcb (struct vcpu_svm *svm) +{ + svm->vmcb->control.nested_ctl |=SVM_NESTED_CTL_SEV_ENABLE ; +clr_exception_intercept (svm,UD_VECTOR ); + +if (sev_es_guest (svm->vcpu.kvm)) +sev_es_init_vmcb (svm); +} +void sev_es_vcpu_reset (struct vcpu_svm *svm) {/*
arch/x86/kvm/svm/svm.c +2 -9
@@ -1125,15 +1125,8 @@ static void init_vmcb(struct kvm_vcpu *vcpu) svm->vmcb->control.int_ctl |=V_GIF_ENABLE_MASK ; } -if (sev_guest (vcpu->kvm)) { - svm->vmcb->control.nested_ctl |=SVM_NESTED_CTL_SEV_ENABLE ; -clr_exception_intercept (svm,UD_VECTOR ); - -if (sev_es_guest (vcpu->kvm)) { -/* Perform SEV-ES specific VMCB updates */ -sev_es_init_vmcb (svm); - } - } +if (sev_guest (vcpu->kvm)) +sev_init_vmcb (svm);svm_hv_init_vmcb (svm->vmcb);init_vmcb_after_set_cpuid (vcpu);
arch/x86/kvm/svm/svm.h +1 -1
@@ -616,10 +616,10 @@ void __init sev_set_cpu_caps(void);void __init sev_hardware_setup (void );void sev_hardware_unsetup (void );int sev_cpu_init (struct svm_cpu_data *sd); +void sev_init_vmcb (struct vcpu_svm *svm);void sev_free_vcpu (struct kvm_vcpu *vcpu);int sev_handle_vmgexit (struct kvm_vcpu *vcpu);int sev_es_string_io (struct vcpu_svm *svm,int size,unsigned int port,int in); -void sev_es_init_vmcb (struct vcpu_svm *svm);void sev_es_vcpu_reset (struct vcpu_svm *svm);void sev_vcpu_deliver_sipi_vector (struct kvm_vcpu *vcpu,u8 vector);void sev_es_prepare_switch_to_guest (struct vmcb_save_area *hostsa);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/181 iio: mma8452: fix probe fail when device tree compatible is used.
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
[ Upstream commit fe18894930a025617114aa8ca0adbf94d5bffe89 ]
Correct the logic for the probe. First check of_match_table, if not meet, then check i2c_driver.id_table. If both not meet, then return fail.
--- drivers/iio/accel/mma8452.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/iio/accel/mma8452.c +7 -5
@@ -1556,11 +1556,13 @@ static int mma8452_probe(struct i2c_client *client,mutex_init (&data->lock); data->chip_info =device_get_match_data (&client->dev); -if (!data->chip_info && id) { - data->chip_info = &mma_chip_info_table[id->driver_data]; - }else { -dev_err (&client->dev,"unknown device model\n" ); -return -ENODEV ; +if (!data->chip_info) { +if (id) { + data->chip_info = &mma_chip_info_table[id->driver_data]; + }else { +dev_err (&client->dev,"unknown device model\n" ); +return -ENODEV ; + } } ret =iio_read_mount_matrix (&client->dev, &data->orientation);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/181 iio: magnetometer: yas530: Fix memchr_inv() misuse
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit bb52d3691db8cf24cea049235223f3599778f264 ]
The call to check if the calibration is all zeroes is doing it wrong: memchr_inv() returns NULL if the the calibration contains all zeroes, but the check is for != NULL.
Fix it up. It's probably not an urgent fix because the inner check for BIT(7) in data[13] will save us. But fix it.
--- drivers/iio/magnetometer/yamaha-yas530.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/magnetometer/yamaha-yas530.c +1 -1
@@ -639,7 +639,7 @@ static int yas532_get_calibration_data(struct yas5xx *yas5xx)dev_dbg (yas5xx->dev,"calibration data: %*ph\n" ,14 , data);/* Sanity check, is this all zeroes? */ -if (memchr_inv (data,0x00 ,13 )) { +if (memchr_inv (data,0x00 ,13 ) ==NULL ) {if (!(data[13 ] &BIT (7 )))dev_warn (yas5xx->dev,"calibration is blank!\n" ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/181 iio: adc: xilinx-ams: fix return error variable
In reply to Greg Kroah-HartmanFrom: Lv Ruyi <[email protected]>
[ Upstream commit f8ef475aa069cd72e9e7bdb2d60dc6a89e2bafad ]
Return irq instead of ret which always equals to zero here.
--- drivers/iio/adc/xilinx-ams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/xilinx-ams.c +1 -1
@@ -1409,7 +1409,7 @@ static int ams_probe(struct platform_device *pdev) irq =platform_get_irq (pdev,0 );if (irq <0 ) -return ret; +return irq; ret =devm_request_irq (&pdev->dev, irq, &ams_irq,0 ,"ams-irq" , indio_dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/181 iio: adc: vf610: fix conversion mode sysfs node name
In reply to Greg Kroah-HartmanFrom: Baruch Siach <[email protected]>
[ Upstream commit f1a633b15cd5371a2a83f02c513984e51132dd68 ]
The documentation missed the "in_" prefix for this IIO_SHARED_BY_DIR entry.
--- Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/ABI/testing/sysfs-bus-iio-vf610 +1 -1
@@ -1,4 +1,4 @@ -What: /sys/bus/iio/devices/iio:deviceX/conversion_mode +What: /sys/bus/iio/devices/iio:deviceX/in_conversion_mode KernelVersion: 4.2 Contact: [email protected] Description:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/181 regmap-irq: Fix a bug in regmap_irq_enable() for type_in_mask chips
In reply to Greg Kroah-HartmanFrom: Aidan MacDonald <[email protected]>
[ Upstream commit 485037ae9a095491beb7f893c909a76cc4f9d1e7 ]
When enabling a type_in_mask irq, the type_buf contents must be AND'd with the mask of the IRQ we're enabling to avoid enabling other IRQs by accident, which can happen if several type_in_mask irqs share a mask register.
--- drivers/base/regmap/regmap-irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/base/regmap/regmap-irq.c +3 -2
@@ -252,6 +252,7 @@ static void regmap_irq_enable(struct irq_data *data)struct regmap_irq_chip_data *d =irq_data_get_irq_chip_data (data);struct regmap *map = d->map;const struct regmap_irq *irq_data =irq_to_regmap_irq (d, data->hwirq); +unsigned int reg = irq_data->reg_offset / map->reg_stride;unsigned int mask, type; type = irq_data->type.type_falling_val | irq_data->type.type_rising_val;
@@ -268,14 +269,14 @@ static void regmap_irq_enable(struct irq_data *data)* at the corresponding offset in regmap_irq_set_type(). */ if (d->chip->type_in_mask && type) - mask = d->type_buf[irq_data->reg_offset / map->reg_stride]; + mask = d->type_buf[reg] & irq_data->mask;else mask = irq_data->mask;if (d->chip->clear_on_unmask) d->clear_status = true; - d->mask_buf[irq_data->reg_offset / map->reg_stride] &= ~mask; + d->mask_buf[reg] &= ~mask; }static void regmap_irq_disable (struct irq_data *data)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/181 io_uring: fix req->apoll_events
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
[ Upstream commit aacf2f9f382c91df73f33317e28a4c34c8038986 ]
apoll_events should be set once in the beginning of poll arming just as poll->events and not change after. However, currently io_uring resets it on each __io_poll_execute() for no clear reason. There is also a place in __io_arm_poll_handler() where we add EPOLLONESHOT to downgrade a multishot, but forget to do the same thing with ->apoll_events, which is buggy.
--- fs/io_uring.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/io_uring.c +8 -4
@@ -5984,7 +5984,8 @@ static void io_apoll_task_func(struct io_kiocb *req, bool *locked)io_req_complete_failed (req, ret); } -static void __io_poll_execute (struct io_kiocb *req,int mask,__poll_t events) +static void __io_poll_execute (struct io_kiocb *req,int mask, +__poll_t __maybe_unused events) { req->result = mask;/*
@@ -5993,7 +5994,6 @@ static void __io_poll_execute(struct io_kiocb *req, int mask, __poll_t events)* CPU. We want to avoid pulling in req->apoll->events for that * case. */ - req->apoll_events = events;if (req->opcode ==IORING_OP_POLL_ADD ) req->io_task_work.func = io_poll_task_func;else
@@ -6143,6 +6143,8 @@ static int __io_arm_poll_handler(struct io_kiocb *req,io_init_poll_iocb (poll, mask, io_poll_wake); poll->file = req->file; + req->apoll_events = poll->events; + ipt->pt._key = mask; ipt->req = req; ipt->error =0 ;
@@ -6173,8 +6175,10 @@ static int __io_arm_poll_handler(struct io_kiocb *req,if (mask) {/* can't multishot if failed, just queue the event we've got */ -if (unlikely (ipt->error || !ipt->nr_entries)) +if (unlikely (ipt->error || !ipt->nr_entries)) { poll->events |=EPOLLONESHOT ; + req->apoll_events |=EPOLLONESHOT ; + }__io_poll_execute (req, mask, poll->events);return 0 ; }
@@ -6387,7 +6391,7 @@ static int io_poll_add_prep(struct io_kiocb *req, const struct io_uring_sqe *sqereturn -EINVAL ;io_req_set_refcount (req); - req->apoll_events = poll->events =io_poll_parse_events (sqe, flags); + poll->events =io_poll_parse_events (sqe, flags);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 108/181 io_uring: make apoll_events a __poll_t
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 58f5c8d39e0ea07fdaaea6a85c49000da83dc0cc ]
apoll_events is fed to vfs_poll and the poll tables, so it should be a __poll_t.
--- fs/io_uring.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/io_uring.c +4 -3
@@ -926,7 +926,7 @@ struct io_kiocb {/* used by request caches, completion batching and iopoll */ struct io_wq_work_node comp_list;/* cache ->apoll->events */ -int apoll_events; +__poll_t apoll_events; };atomic_t refs;atomic_t poll_refs;
@@ -5984,7 +5984,7 @@ static void io_apoll_task_func(struct io_kiocb *req, bool *locked)io_req_complete_failed (req, ret); } -static void __io_poll_execute (struct io_kiocb *req,int mask,int events) +static void __io_poll_execute (struct io_kiocb *req,int mask,__poll_t events) { req->result = mask;/*
@@ -6003,7 +6003,8 @@ static void __io_poll_execute(struct io_kiocb *req, int mask, int events)io_req_task_work_add (req, false); } -static inline void io_poll_execute (struct io_kiocb *req,int res,int events) +static inline void io_poll_execute (struct io_kiocb *req,int res, +__poll_t events) {if (io_poll_get_ownership (req))__io_poll_execute (req, res, events);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/181 regmap-irq: Fix offset/index mismatch in read_sub_irq_data()
In reply to Greg Kroah-HartmanFrom: Aidan MacDonald <[email protected]>
[ Upstream commit 3f05010f243be06478a9b11cfce0ce994f5a0890 ]
We need to divide the sub-irq status register offset by register stride to get an index for the status buffer to avoid an out of bounds write when the register stride is greater than 1.
--- drivers/base/regmap/regmap-irq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/regmap/regmap-irq.c +2 -1
@@ -387,6 +387,7 @@ static inline int read_sub_irq_data(struct regmap_irq_chip_data *data, subreg = &chip->sub_reg_offsets[b];for (i =0 ; i < subreg->num_regs; i++) {unsigned int offset = subreg->offset[i]; +unsigned int index = offset / map->reg_stride;if (chip->not_fixed_stride) ret = regmap_read(map,
@@ -395,7 +396,7 @@ static inline int read_sub_irq_data(struct regmap_irq_chip_data *data,else ret =regmap_read (map, chip->status_base + offset, - &data->status_buf[offset]); + &data->status_buf[index]);if (ret)break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 115/181 xhci: turn off port power in shutdown
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 83810f84ecf11dfc5a9414a8b762c3501b328185 upstream.
If ports are not turned off in shutdown then runtime suspended self-powered USB devices may survive in U3 link state over S5.
During subsequent boot, if firmware sends an IPC command to program the port in DISCONNECT state, it will time out, causing significant delay in the boot time.
Turning off roothub port power is also recommended in xhci specification 4.19.4 "Port Power" in the additional note.
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci.c | 15 +++++++++++++-- drivers/usb/host/xhci.h | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -652,7 +652,7 @@ struct xhci_hub *xhci_get_rhub(struct us* It will release and re-aquire the lock while calling ACPI * method. */ -static void xhci_set_port_power (struct xhci_hcd *xhci,struct usb_hcd *hcd, +void xhci_set_port_power (struct xhci_hcd *xhci,struct usb_hcd *hcd,u16 index,bool on,unsigned long *flags) __must_hold(&xhci->lock) {
drivers/usb/host/xhci.c +13 -2
@@ -779,6 +779,8 @@ static void xhci_stop(struct usb_hcd *hcvoid xhci_shutdown (struct usb_hcd *hcd) {struct xhci_hcd *xhci =hcd_to_xhci (hcd); +unsigned long flags; +int i;if (xhci->quirks &XHCI_SPURIOUS_REBOOT )usb_disable_xhci_ports (to_pci_dev (hcd->self.sysdev));
@@ -794,12 +796,21 @@ void xhci_shutdown(struct usb_hcd *hcd)del_timer_sync (&xhci->shared_hcd->rh_timer); } -spin_lock_irq (&xhci->lock); +spin_lock_irqsave (&xhci->lock, flags);xhci_halt (xhci); + +/* Power off USB2 ports*/ +for (i =0 ; i < xhci->usb2_rhub.num_ports; i++) +xhci_set_port_power (xhci, xhci->main_hcd, i, false, &flags); + +/* Power off USB3 ports*/ +for (i =0 ; i < xhci->usb3_rhub.num_ports; i++) +xhci_set_port_power (xhci, xhci->shared_hcd, i, false, &flags); +/* Workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks &XHCI_SPURIOUS_WAKEUP )xhci_reset (xhci,XHCI_RESET_SHORT_USEC ); -spin_unlock_irq (&xhci->lock); +spin_unlock_irqrestore (&xhci->lock, flags);xhci_cleanup_msix (xhci);
drivers/usb/host/xhci.h +2 -0
@@ -2172,6 +2172,8 @@ int xhci_hub_control(struct usb_hcd *hcdint xhci_hub_status_data (struct usb_hcd *hcd,char *buf);int xhci_find_raw_port_number (struct usb_hcd *hcd,int port1);struct xhci_hub *xhci_get_rhub (struct usb_hcd *hcd); +void xhci_set_port_power (struct xhci_hcd *xhci,struct usb_hcd *hcd,u16 index, +bool on,unsigned long *flags);void xhci_hc_died (struct xhci_hcd *xhci);
Greg Kroah-Hartman
maintainerPATCH 117/181 xhci-pci: Allow host runtime PM as default for Intel Meteor Lake xHCI
In reply to Greg Kroah-HartmanFrom: Utkarsh Patel <[email protected]>
commit 8ffdc53a60049f3930afe161dc51c67959c8d83d upstream.
Meteor Lake TCSS(Type-C Subsystem) xHCI needs to be runtime suspended whenever possible to allow the TCSS hardware block to enter D3cold and thus save energy.
--- drivers/usb/host/xhci-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +3 -1
@@ -62,6 +62,7 @@#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI 0x464e#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI 0xa71e +#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI 0x7ec0#define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
@@ -272,7 +273,8 @@ static void xhci_pci_quirks(struct devic pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI)) + pdev->device ==PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI)) xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
Greg Kroah-Hartman
maintainerPATCH 114/181 s390/crash: make copy_oldmem_page() return number of bytes copied
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit af2debd58bd769e38f538143f0d332e15d753396 ]
Callback copy_oldmem_page() returns either error code or zero. Instead, it should return the error code or number of bytes copied.
--- arch/s390/kernel/crash_dump.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/s390/kernel/crash_dump.c +4 -3
@@ -233,9 +233,10 @@ ssize_t copy_oldmem_page(struct iov_iter rc =copy_oldmem_user (iter->iov->iov_base, src, csize); else rc =copy_oldmem_kernel (iter->kvec->iov_base, src, csize); -if (!rc) -iov_iter_advance (iter, csize); -return rc; +if (rc <0 ) +return rc; +iov_iter_advance (iter, csize); +return csize; }/*
Greg Kroah-Hartman
maintainerPATCH 116/181 xhci-pci: Allow host runtime PM as default for Intel Raptor Lake xHCI
In reply to Greg Kroah-HartmanFrom: Tanveer Alam <[email protected]>
commit 7516da47a349e74de623243a27f9b8a91446bf4f upstream.
In the same way as Intel Alder Lake TCSS (Type-C Subsystem) the Raptor Lake TCSS xHCI needs to be runtime suspended whenever possible to allow the TCSS hardware block to enter D3cold and thus save energy.
--- drivers/usb/host/xhci-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +3 -1
@@ -61,6 +61,7 @@#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI 0x461e#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI 0x464e#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed +#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI 0xa71e#define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
@@ -270,7 +271,8 @@ static void xhci_pci_quirks(struct devic pdev->device ==PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI || pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI)) + pdev->device ==PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI)) xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
Greg Kroah-Hartman
maintainerPATCH 111/181 io_uring: fix wrong arm_poll error handling
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
[ Upstream commit 9d2ad2947a53abf5e5e6527a9eeed50a3a4cbc72 ]
Leaving ip.error set when a request was punted to task_work execution is problematic, don't forget to clear it.
--- fs/io_uring.c | 1 + 1 file changed, 1 insertion(+)
fs/io_uring.c +1 -0
@@ -6178,6 +6178,7 @@ static int __io_arm_poll_handler(struct io_kiocb *req,if (unlikely (ipt->error || !ipt->nr_entries)) { poll->events |=EPOLLONESHOT ; req->apoll_events |=EPOLLONESHOT ; + ipt->error =0 ; }__io_poll_execute (req, mask, poll->events);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 113/181 s390/crash: add missing iterator advance in copy_oldmem_page()
In reply to Greg Kroah-HartmanFrom: Alexander Gordeev <[email protected]>
[ Upstream commit cc02e6e21aa5f2ac0defe8c15e5a9d024da6e73d ]
In case old memory was successfully copied the passed iterator should be advanced as well. Currently copy_oldmem_page() is always called with single-segment iterator. Should that ever change - copy_oldmem_user and copy_oldmem_kernel() functions would need a rework to deal with multi-segment iterators.
--- arch/s390/kernel/crash_dump.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/s390/kernel/crash_dump.c +7 -0
@@ -219,6 +219,11 @@ ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn, size_t csize,unsigned long src;int rc; +if (!(iter_is_iovec (iter) ||iov_iter_is_kvec (iter))) +return -EINVAL ; +/* Multi-segment iterators are not supported */ +if (iter->nr_segs >1 ) +return -EINVAL ;if (!csize)return 0 ; src =pfn_to_phys (pfn) + offset;
@@ -228,6 +233,8 @@ ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn, size_t csize, rc =copy_oldmem_user (iter->iov->iov_base, src, csize); else rc =copy_oldmem_kernel (iter->kvec->iov_base, src, csize); +if (!rc) +iov_iter_advance (iter, csize);return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/181 usb: typec: wcove: Drop wrong dependency to INTEL_SOC_PMIC
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9ef165406308515dcf2e3f6e97b39a1c56d86db5 ]
Intel SoC PMIC is a generic name for all PMICs that are used on Intel platforms. In particular, INTEL_SOC_PMIC kernel configuration option refers to Crystal Cove PMIC, which has never been a part of any Intel Broxton hardware. Drop wrong dependency from Kconfig.
Note, the correct dependency is satisfied via ACPI PMIC OpRegion driver, which the Type-C depends on.
--- drivers/usb/typec/tcpm/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/usb/typec/tcpm/Kconfig +0 -1
@@ -56,7 +56,6 @@ config TYPEC_WCOVE tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" depends on ACPI depends on MFD_INTEL_PMC_BXT - depends on INTEL_SOC_PMIC depends on BXT_WC_PMIC_OPREGION help This driver adds support for USB Type-C on Intel Broxton platforms
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/181 vmcore: convert copy_oldmem_page() to take an iov_iter
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 5d8de293c224896a4da99763fce4f9794308caf4 ]
Patch series "Convert vmcore to use an iov_iter", v5.
For some reason several people have been sending bad patches to fix compiler warnings in vmcore recently. Here's how it should be done. Compile-tested only on x86. As noted in the first patch, s390 should take this conversion a bit further, but I'm not inclined to do that work myself.
This patch (of 3):
Instead of passing in a 'buf' and 'userbuf' argument, pass in an iov_iter. s390 needs more work to pass the iov_iter down further, or refactor, but I'd be more comfortable if someone who can test on s390 did that work.
It's more convenient to convert the whole of read_from_oldmem() to take an iov_iter at the same time, so rename it to read_from_oldmem_iter() and add a temporary read_from_oldmem() wrapper that creates an iov_iter.
--- arch/arm/kernel/crash_dump.c | 27 +++------------- arch/arm64/kernel/crash_dump.c | 29 +++-------------- arch/ia64/kernel/crash_dump.c | 32 +++---------------- arch/mips/kernel/crash_dump.c | 27 +++------------- arch/powerpc/kernel/crash_dump.c | 35 +++------------------ arch/riscv/kernel/crash_dump.c | 26 +++------------ arch/s390/kernel/crash_dump.c | 13 +++++--- arch/sh/kernel/crash_dump.c | 29 +++-------------- arch/x86/kernel/crash_dump_32.c | 29 +++-------------- arch/x86/kernel/crash_dump_64.c | 41 +++++++----------------- fs/proc/vmcore.c | 54 ++++++++++++++++++++------------ include/linux/crash_dump.h | 9 +++--- 12 files changed, 91 insertions(+), 260 deletions(-)
arch/arm/kernel/crash_dump.c +4 -23
@@ -14,22 +14,10 @@#include <linux/crash_dump.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/uio.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is int he user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -40,14 +28,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,if (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user (buf, vaddr + offset, csize)) { -iounmap (vaddr); -return -EFAULT ; - } - }else { -memcpy (buf, vaddr + offset, csize); - } + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr);return csize;
arch/arm64/kernel/crash_dump.c +4 -25
@@ -9,25 +9,11 @@#include <linux/crash_dump.h> #include <linux/errno.h> #include <linux/io.h> -#include <linux/memblock.h> -#include <linux/uaccess.h> +#include <linux/uio.h> #include <asm/memory.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is in a user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -38,14 +24,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,if (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user ((char __user *)buf, vaddr + offset, csize)) { -memunmap (vaddr); -return -EFAULT ; - } - }else { -memcpy (buf, vaddr + offset, csize); - } + csize =copy_to_iter (vaddr + offset, csize, iter);memunmap (vaddr);
arch/ia64/kernel/crash_dump.c +4 -28
@@ -10,42 +10,18 @@#include <linux/errno.h> #include <linux/types.h> #include <linux/crash_dump.h> - +#include <linux/uio.h> #include <asm/page.h> -#include <linux/uaccess.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -* -* Calling copy_to_user() in atomic context is not desirable. Hence first -* copying the data to a pre-allocated kernel page and then copying to user -* space in non-atomic context. -*/ -ssize_t -copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;if (!csize)return 0 ; vaddr =__va (pfn<<PAGE_SHIFT ); -if (userbuf) { -if (copy_to_user (buf, (vaddr + offset), csize)) { -return -EFAULT ; - } - }else -memcpy (buf, (vaddr + offset), csize); + csize =copy_to_iter (vaddr + offset, csize, iter);return csize; }
arch/mips/kernel/crash_dump.c +4 -23
@@ -1,22 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/highmem.h> #include <linux/crash_dump.h> +#include <linux/uio.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -24,14 +12,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,return 0 ; vaddr =kmap_local_pfn (pfn); - -if (!userbuf) { -memcpy (buf, vaddr + offset, csize); - }else { -if (copy_to_user (buf, vaddr + offset, csize)) - csize = -EFAULT ; - } - + csize =copy_to_iter (vaddr + offset, csize, iter);kunmap_local (vaddr);return csize;
arch/powerpc/kernel/crash_dump.c +5 -30
@@ -16,7 +16,7 @@#include <asm/kdump.h> #include <asm/prom.h> #include <asm/firmware.h> -#include <linux/uaccess.h> +#include <linux/uio.h> #include <asm/rtas.h> #include <asm/inst.h>
@@ -68,33 +68,8 @@ void __init setup_kdump_trampoline(void) }#endif /* CONFIG_NONSTATIC_KERNEL */ -static size_t copy_oldmem_vaddr (void *vaddr,char *buf,size_t csize, -unsigned long offset,int userbuf) -{ -if (userbuf) { -if (copy_to_user ((char __user *)buf, (vaddr + offset), csize)) -return -EFAULT ; - }else -memcpy (buf, (vaddr + offset), csize); - -return csize; -} - -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;phys_addr_t paddr;
@@ -107,10 +82,10 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,if (memblock_is_region_memory (paddr, csize)) { vaddr =__va (paddr); - csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); + csize =copy_to_iter (vaddr + offset, csize, iter); }else { vaddr =ioremap_cache (paddr,PAGE_SIZE ); - csize =copy_oldmem_vaddr (vaddr, buf, csize, offset, userbuf); + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr); }
arch/riscv/kernel/crash_dump.c +4 -22
@@ -7,22 +7,10 @@#include <linux/crash_dump.h> #include <linux/io.h> +#include <linux/uio.h> -/** -* copy_oldmem_page() - copy one page from old kernel memory -* @pfn: page frame number to be copied -* @buf: buffer where the copied page is placed -* @csize: number of bytes to copy -* @offset: offset in bytes into the page -* @userbuf: if set, @buf is in a user address space -* -* This function copies one page from old kernel memory into buffer pointed by -* @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes -* copied or negative error in case of failure. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void *vaddr;
@@ -33,13 +21,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,if (!vaddr)return -ENOMEM ; -if (userbuf) { -if (copy_to_user ((char __user *)buf, vaddr + offset, csize)) { -memunmap (vaddr); -return -EFAULT ; - } - }else -memcpy (buf, vaddr + offset, csize); + csize =copy_to_iter (vaddr + offset, csize, iter);memunmap (vaddr);return csize;
arch/s390/kernel/crash_dump.c +8 -5
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/memblock.h> #include <linux/elf.h> +#include <linux/uio.h> #include <asm/asm-offsets.h> #include <asm/os_info.h> #include <asm/elf.h>
@@ -212,8 +213,8 @@ static int copy_oldmem_user(void __user *dst, unsigned long src, size_t count)/* * Copy one page from "oldmem" */ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf,size_t csize, -unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn,size_t csize, +unsigned long offset) {unsigned long src;int rc;
@@ -221,10 +222,12 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize,if (!csize)return 0 ; src =pfn_to_phys (pfn) + offset; -if (userbuf) - rc =copy_oldmem_user ((void __force __user *) buf, src, csize); + +/* XXX: pass the iov_iter down to a common function */ +if (iter_is_iovec (iter)) + rc =copy_oldmem_user (iter->iov->iov_base, src, csize);else - rc =copy_oldmem_kernel ((void *) buf, src, csize); + rc =copy_oldmem_kernel (iter->kvec->iov_base, src, csize);return rc; }
arch/sh/kernel/crash_dump.c +5 -24
@@ -8,23 +8,11 @@#include <linux/errno.h> #include <linux/crash_dump.h> #include <linux/io.h> +#include <linux/uio.h> #include <linux/uaccess.h> -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there is no pte mapped -* in the current kernel. We stitch up a pte, similar to kmap_atomic. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf, -size_t csize,unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset) {void __iomem *vaddr;
@@ -32,15 +20,8 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,return 0 ; vaddr =ioremap (pfn <<PAGE_SHIFT ,PAGE_SIZE ); - -if (userbuf) { -if (copy_to_user ((void __user *)buf, (vaddr + offset), csize)) { -iounmap (vaddr); -return -EFAULT ; - } - }else -memcpy (buf, (vaddr + offset), csize); - + csize =copy_to_iter (vaddr + offset, csize, iter);iounmap (vaddr); +return csize; }
arch/x86/kernel/crash_dump_32.c +4 -25
@@ -10,8 +10,7 @@#include <linux/errno.h> #include <linux/highmem.h> #include <linux/crash_dump.h> - -#include <linux/uaccess.h> +#include <linux/uio.h> static inline bool is_crashed_pfn_valid (unsigned long pfn) {
@@ -29,21 +28,8 @@ static inline bool is_crashed_pfn_valid(unsigned long pfn)#endif } -/** -* copy_oldmem_page - copy one page from "oldmem" -* @pfn: page frame number to be copied -* @buf: target memory address for the copy; this can be in kernel address -* space or user address space (see @userbuf) -* @csize: number of bytes to copy -* @offset: offset in bytes into the page (based on pfn) to begin the copy -* @userbuf: if set, @buf is in user address space, use copy_to_user(), -* otherwise @buf is in kernel address space, use memcpy(). -* -* Copy a page from "oldmem". For this page, there might be no pte mapped -* in the current kernel. -*/ -ssize_t copy_oldmem_page (unsigned long pfn,char *buf,size_t csize, -unsigned long offset,int userbuf) +ssize_t copy_oldmem_page (struct iov_iter *iter,unsigned long pfn,size_t csize, +unsigned long offset) {void *vaddr;
@@ -54,14 +40,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize,return -EFAULT ; vaddr =kmap_local_pfn (pfn); - -if (!userbuf) { -memcpy (buf, vaddr + offset, csize); - }else { -if (copy_to_user (buf, vaddr + offset, csize)) - csize = -EFAULT ; - } - + csize =copy_to_iter (vaddr + offset, csize, iter);kunmap_local (vaddr);return csize;
arch/x86/kernel/crash_dump_64.c +11 -30
69 lines not on this page · raw message
fs/proc/vmcore.c +34 -20
95 lines not on this page · raw message
include/linux/crash_dump.h +4 -5
@@ -24,11 +24,10 @@ extern int remap_oldmem_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); -extern ssize_t copy_oldmem_page (unsigned long ,char *,size_t , -unsigned long ,int ); -extern ssize_t copy_oldmem_page_encrypted (unsigned long pfn,char *buf, -size_t csize,unsigned long offset, -int userbuf); +ssize_t copy_oldmem_page (struct iov_iter *i,unsigned long pfn,size_t csize, +unsigned long offset); +ssize_t copy_oldmem_page_encrypted (struct iov_iter *iter,unsigned long pfn, +size_t csize,unsigned long offset);void vmcore_cleanup (void );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 118/181 usb: gadget: uvc: fix list double add in uvcg_video_pump
In reply to Greg Kroah-HartmanFrom: Dan Vacura <[email protected]>
commit 96163f835e65f8c9897487fac965819f0651d671 upstream.
A panic can occur if the endpoint becomes disabled and the uvcg_video_pump adds the request back to the req_free list after it has already been queued to the endpoint. The endpoint complete will add the request back to the req_free list. Invalidate the local request handle once it's been queued.
<6>[ 246.796704][T13726] configfs-gadget gadget: uvc: uvc_function_set_alt(1, 0) <3>[ 246.797078][ T26] list_add double add: new=ffffff878bee5c40, prev=ffffff878bee5c40, next=ffffff878b0f0a90. <6>[ 246.797213][ T26] ------------[ cut here ]------------ <2>[ 246.797224][ T26] kernel BUG at lib/list_debug.c:31! <6>[ 246.807073][ T26] Call trace: <6>[ 246.807180][ T26] uvcg_video_pump+0x364/0x38c <6>[ 246.807366][ T26] process_one_work+0x2a4/0x544 <6>[ 246.807394][ T26] worker_thread+0x350/0x784 <6>[ 246.807442][ T26] kthread+0x2ac/0x320
--- drivers/usb/gadget/function/uvc_video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/function/uvc_video.c +3 -0
@@ -415,6 +415,9 @@ static void uvcg_video_pump(struct work_uvcg_queue_cancel (queue,0 );break ; } + +/* Endpoint now owns the request */ + req =NULL ; video->req_int_count++; }
Greg Kroah-Hartman
maintainerPATCH 119/181 usb: gadget: Fix non-unique driver names in raw-gadget driver
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit f2d8c2606825317b77db1f9ba0fc26ef26160b30 upstream.
In a report for a separate bug (which has already been fixed by commit 5f0b5f4d50fa "usb: gadget: fix race when gadget driver register via ioctl") in the raw-gadget driver, the syzbot console log included error messages caused by attempted registration of a new driver with the same name as an existing driver:
Quoted 3 lines
kobject_add_internalfailed for raw-gadget with-EEXIST, don't try to register things with the same name in the same directory. UDC core: USB Raw Gadget: driver registration failed: -17
misc raw-gadget: fail,usb_gadget_register_driverreturned -17
These errors arise because raw_gadget.c registers a separate UDC driver for each of the UDC instances it creates, but these drivers all have the same name: "raw-gadget". Until recently this wasn't a problem, but when the "gadget" bus was added and UDC drivers were registered on this bus, it became possible for name conflicts to cause the registrations to fail. The reason is simply that the bus code in the driver core uses the driver name as a sysfs directory name (e.g., /sys/bus/gadget/drivers/raw-gadget/), and you can't create two directories with the same pathname.
To fix this problem, the driver names used by raw-gadget are made distinct by appending a unique ID number: "raw-gadget.N", with a different value of N for each driver instance. And to avoid the proliferation of error handling code in the raw_ioctl_init() routine, the error return paths are refactored into the common pattern (goto statements leading to cleanup code at the end of the routine).
--- drivers/usb/gadget/legacy/raw_gadget.c | 62 ++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 16 deletions(-)
drivers/usb/gadget/legacy/raw_gadget.c +46 -16
@@ -11,6 +11,7 @@#include <linux/ctype.h> #include <linux/debugfs.h> #include <linux/delay.h> +#include <linux/idr.h> #include <linux/kref.h> #include <linux/miscdevice.h> #include <linux/module.h>
@@ -36,6 +37,9 @@ MODULE_LICENSE("GPL");/*----------------------------------------------------------------------*/ +static DEFINE_IDA (driver_id_numbers); +#define DRIVER_DRIVER_NAME_LENGTH_MAX 32 +#define RAW_EVENT_QUEUE_SIZE 16struct raw_event_queue {
@@ -161,6 +165,9 @@ struct raw_dev {/* Reference to misc device: */ struct device *dev; +/* Make driver names unique */ +int driver_id_number; +/* Protected by lock: */ enum dev_state state;bool gadget_registered;
@@ -189,6 +196,7 @@ static struct raw_dev *dev_new(void)spin_lock_init (&dev->lock);init_completion (&dev->ep0_done);raw_event_queue_init (&dev->queue); + dev->driver_id_number =-1 ;return dev; }
@@ -199,6 +207,9 @@ static void dev_free(struct kref *kref)kfree (dev->udc_name);kfree (dev->driver.udc_name); +kfree (dev->driver.driver.name); +if (dev->driver_id_number >=0 ) +ida_free (&driver_id_numbers, dev->driver_id_number);if (dev->req) {if (dev->ep0_urb_queued)usb_ep_dequeue (dev->gadget->ep0, dev->req);
@@ -422,6 +433,7 @@ static int raw_ioctl_init(struct raw_devstruct usb_raw_init arg;char *udc_driver_name;char *udc_device_name; +char *driver_driver_name;unsigned long flags;if (copy_from_user (&arg, (void __user *)value,sizeof (arg)))
@@ -440,36 +452,44 @@ static int raw_ioctl_init(struct raw_devreturn -EINVAL ; } + ret =ida_alloc (&driver_id_numbers,GFP_KERNEL ); +if (ret <0 ) +return ret; + dev->driver_id_number = ret; + + driver_driver_name =kmalloc (DRIVER_DRIVER_NAME_LENGTH_MAX ,GFP_KERNEL ); +if (!driver_driver_name) { + ret = -ENOMEM ; + goto out_free_driver_id_number; + } +snprintf (driver_driver_name,DRIVER_DRIVER_NAME_LENGTH_MAX , +DRIVER_NAME ".%d" , dev->driver_id_number); + udc_driver_name =kmalloc (UDC_NAME_LENGTH_MAX ,GFP_KERNEL ); -if (!udc_driver_name) -return -ENOMEM ; +if (!udc_driver_name) { + ret = -ENOMEM ; + goto out_free_driver_driver_name; + } ret =strscpy (udc_driver_name, &arg.driver_name[0 ],UDC_NAME_LENGTH_MAX ); -if (ret <0 ) { -kfree (udc_driver_name); -return ret; - } +if (ret <0 ) + goto out_free_udc_driver_name; ret =0 ; udc_device_name =kmalloc (UDC_NAME_LENGTH_MAX ,GFP_KERNEL );if (!udc_device_name) { -kfree (udc_driver_name); -return -ENOMEM ; + ret = -ENOMEM ; + goto out_free_udc_driver_name; } ret =strscpy (udc_device_name, &arg.device_name[0 ],UDC_NAME_LENGTH_MAX ); -if (ret <0 ) { -kfree (udc_driver_name); -kfree (udc_device_name); -return ret; - } +if (ret <0 ) + goto out_free_udc_device_name; ret =0 ;spin_lock_irqsave (&dev->lock, flags);if (dev->state !=STATE_DEV_OPENED ) {dev_dbg (dev->dev,"fail, device is not opened\n" ); -kfree (udc_driver_name); -kfree (udc_device_name); ret = -EINVAL ; goto out_unlock; }
@@ -484,14 +504,24 @@ static int raw_ioctl_init(struct raw_dev dev->driver.suspend = gadget_suspend; dev->driver.resume = gadget_resume; dev->driver.reset = gadget_reset; - dev->driver.driver.name =DRIVER_NAME ; + dev->driver.driver.name = driver_driver_name; dev->driver.udc_name = udc_device_name; dev->driver.match_existing_only =1 ; dev->state =STATE_DEV_INITIALIZED ; +spin_unlock_irqrestore (&dev->lock, flags); +return ret; out_unlock:spin_unlock_irqrestore (&dev->lock, flags); +out_free_udc_device_name: +kfree (udc_device_name); +out_free_udc_driver_name: +kfree (udc_driver_name); +out_free_driver_driver_name: +kfree (driver_driver_name); +out_free_driver_id_number: +ida_free (&driver_id_numbers, dev->driver_id_number);return ret; }
Greg Kroah-Hartman
maintainerPATCH 120/181 USB: gadget: Fix double-free bug in raw_gadget driver
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 90bc2af24638659da56397ff835f3c95a948f991 upstream.
Re-reading a recently merged fix to the raw_gadget driver showed that it inadvertently introduced a double-free bug in a failure pathway. If raw_ioctl_init() encounters an error after the driver ID number has been allocated, it deallocates the ID number before returning. But when dev_free() runs later on, it will then try to deallocate the ID number a second time.
Closely related to this issue is another error in the recent fix: The ID number is stored in the raw_dev structure before the code checks to see whether the structure has already been initialized, in which case the new ID number would overwrite the earlier value.
The solution to both bugs is to keep the new ID number in a local variable, and store it in the raw_dev structure only after the check for prior initialization. No errors can occur after that point, so the double-free will never happen.
--- drivers/usb/gadget/legacy/raw_gadget.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/usb/gadget/legacy/raw_gadget.c +7 -6
@@ -430,6 +430,7 @@ out_put:static int raw_ioctl_init (struct raw_dev *dev,unsigned long value) {int ret =0 ; +int driver_id_number;struct usb_raw_init arg;char *udc_driver_name;char *udc_device_name;
@@ -452,10 +453,9 @@ static int raw_ioctl_init(struct raw_devreturn -EINVAL ; } - ret =ida_alloc (&driver_id_numbers,GFP_KERNEL ); -if (ret <0 ) -return ret; - dev->driver_id_number = ret; + driver_id_number =ida_alloc (&driver_id_numbers,GFP_KERNEL ); +if (driver_id_number <0 ) +return driver_id_number; driver_driver_name =kmalloc (DRIVER_DRIVER_NAME_LENGTH_MAX ,GFP_KERNEL );if (!driver_driver_name) {
@@ -463,7 +463,7 @@ static int raw_ioctl_init(struct raw_dev goto out_free_driver_id_number; }snprintf (driver_driver_name,DRIVER_DRIVER_NAME_LENGTH_MAX , -DRIVER_NAME ".%d" , dev->driver_id_number); +DRIVER_NAME ".%d" , driver_id_number); udc_driver_name =kmalloc (UDC_NAME_LENGTH_MAX ,GFP_KERNEL );if (!udc_driver_name) {
@@ -507,6 +507,7 @@ static int raw_ioctl_init(struct raw_dev dev->driver.driver.name = driver_driver_name; dev->driver.udc_name = udc_device_name; dev->driver.match_existing_only =1 ; + dev->driver_id_number = driver_id_number; dev->state =STATE_DEV_INITIALIZED ;spin_unlock_irqrestore (&dev->lock, flags);
@@ -521,7 +522,7 @@ out_free_udc_driver_name: out_free_driver_driver_name:kfree (driver_driver_name); out_free_driver_id_number: -ida_free (&driver_id_numbers, dev->driver_id_number); +ida_free (&driver_id_numbers, driver_id_number);return ret; }
Greg Kroah-Hartman
maintainerPATCH 121/181 usb: chipidea: udc: check request status before setting device address
In reply to Greg Kroah-HartmanFrom: Xu Yang <[email protected]>
commit b24346a240b36cfc4df194d145463874985aa29b upstream.
The complete() function may be called even though request is not completed. In this case, it's necessary to check request status so as not to set device address wrongly.
--- drivers/usb/chipidea/udc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/chipidea/udc.c +3 -0
@@ -1048,6 +1048,9 @@ isr_setup_status_complete(struct usb_epstruct ci_hdrc *ci = req->context;unsigned long flags; +if (req->status <0 ) +return ; +if (ci->setaddr) {hw_usb_set_address (ci, ci->address); ci->setaddr = false;
Greg Kroah-Hartman
maintainerPATCH 122/181 dt-bindings: usb: ohci: Increase the number of PHYs
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 0f074c1c95ea496dc91279b6c4b9845a337517fa upstream.
"make dtbs_check":
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dtb: usb@ee080000: phys: [[17, 0], [31]] is too long
From schema: Documentation/devicetree/bindings/usb/generic-ohci.yaml
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dtb: usb@ee0c0000: phys: [[17, 1], [33], [21, 0]] is too long
From schema: Documentation/devicetree/bindings/usb/generic-ohci.yaml
Some USB OHCI controllers (e.g. on the Renesas RZ/G1C SoC) have multiple PHYs. Increase the maximum number of PHYs to 3, which is sufficient for now.
--- Documentation/devicetree/bindings/usb/generic-ohci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/generic-ohci.yaml +2 -1
@@ -102,7 +102,8 @@ properties: Overrides the detected port count phys: - maxItems: 1 + minItems: 1 + maxItems: 3 phy-names: const: usb
Greg Kroah-Hartman
maintainerPATCH 123/181 dt-bindings: usb: ehci: Increase the number of PHYs
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 9faa1c8f92f33daad9db96944139de225cefa199 upstream.
"make dtbs_check":
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dtb: usb@ee080100: phys: [[17, 0], [31]] is too long
From schema: Documentation/devicetree/bindings/usb/generic-ehci.yaml
arch/arm/boot/dts/r8a77470-iwg23s-sbc.dtb: usb@ee0c0100: phys: [[17, 1], [33], [21, 0]] is too long
From schema: Documentation/devicetree/bindings/usb/generic-ehci.yaml
Some USB EHCI controllers (e.g. on the Renesas RZ/G1C SoC) have multiple PHYs. Increase the maximum number of PHYs to 3, which is sufficient for now.
--- Documentation/devicetree/bindings/usb/generic-ehci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/usb/generic-ehci.yaml +2 -1
@@ -135,7 +135,8 @@ properties: Phandle of a companion. phys: - maxItems: 1 + minItems: 1 + maxItems: 3 phy-names: const: usb
Greg Kroah-Hartman
maintainerPATCH 124/181 btrfs: fix race between reflinking and ordered extent completion
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit d4597898ba7b9d467b94a9aafd65ec408a75041f upstream.
While doing a reflink operation, if an ordered extent for a file range that does not overlap with the source and destination ranges of the reflink operation happens, we can end up having a failure in the reflink operation and return -EINVAL to user space.
The following sequence of steps explains how this can happen:
1) We have the page at file offset 315392 dirty (under delalloc);
2) A reflink operation for this file starts, using the same file as both source and destination, the source range is [372736, 409600) (length of 36864 bytes) and the destination range is [208896, 245760);
3) At btrfs_remap_file_range_prep(), we flush all delalloc in the source and destination ranges, and wait for any ordered extents in those range to complete;
4) Still at btrfs_remap_file_range_prep(), we then flush all delalloc in the inode, but we neither wait for it to complete nor any ordered extents to complete. This results in starting delalloc for the page at file offset 315392 and creating an ordered extent for that single page range;
5) We then move to btrfs_clone() and enter the loop to find file extent items to copy from the source range to destination range;
6) In the first iteration we end up at last file extent item stored in leaf A:
(...)
item 131 key (143616 108 315392) itemoff 5101 itemsize 53
extent data disk bytenr 1903988736 nr 73728
extent data offset 12288 nr 61440 ram 73728This represents the file range [315392, 376832), which overlaps with the source range to clone.
@datal is set to 61440, key.offset is 315392 and @next_key_min_offset is therefore set to 376832 (315392 + 61440).
@off (372736) is > key.offset (315392), so @new_key.offset is set to the value of @destoff (208896).
@new_key.offset == @last_dest_end (208896) so @drop_start is set to 208896 (@new_key.offset).
@datal is adjusted to 4096, as @off is > @key.offset.
So in this iteration we call btrfs_replace_file_extents() for the range [208896, 212991] (a single page, which is
[@drop_start, @new_key.offset + @datal - 1]).
@last_dest_end is set to 212992 (@new_key.offset + @datal = 208896 + 4096 = 212992).
Before the next iteration of the loop, @key.offset is set to the value 376832, which is @next_key_min_offset;
7) On the second iteration btrfs_search_slot() leaves us again at leaf A, but this time pointing beyond the last slot of leaf A, as that's where a key with offset 376832 should be at if it existed. So end up calling btrfs_next_leaf();
8) btrfs_next_leaf() releases the path, but before it searches again the tree for the next key/leaf, the ordered extent for the single page range at file offset 315392 completes. That results in trimming the file extent item we processed before, adjusting its key offset from 315392 to 319488, reducing its length from 61440 to 57344 and inserting a new file extent item for that single page range, with a key offset of 315392 and a length of 4096.
Leaf A now looks like:
(...)
item 132 key (143616 108 315392) itemoff 4995 itemsize 53
extent data disk bytenr 1801666560 nr 4096
extent data offset 0 nr 4096 ram 4096
item 133 key (143616 108 319488) itemoff 4942 itemsize 53
extent data disk bytenr 1903988736 nr 73728
extent data offset 16384 nr 57344 ram 737289) When btrfs_next_leaf() returns, it gives us a path pointing to leaf A at slot 133, since it's the first key that follows what was the last key we saw (143616 108 315392). In fact it's the same item we processed before, but its key offset was changed, so it counts as a new key;
10) So now we have:
@key.offset == 319488
@datal == 57344
@off (372736) is > key.offset (319488), so @new_key.offset is set to
208896 (@destoff value).
@new_key.offset (208896) != @last_dest_end (212992), so @drop_start
is set to 212992 (@last_dest_end value).
@datal is adjusted to 4096 because @off > @key.offset.
So in this iteration we call btrfs_replace_file_extents() for the
invalid range of [212992, 212991] (which is
[@drop_start, @new_key.offset + @datal - 1]).
This range is empty, the end offset is smaller than the start offset
so btrfs_replace_file_extents() returns -EINVAL, which we end up
returning to user space and fail the reflink operation.
This all happens because the range of this file extent item was
already processed in the previous iteration.This scenario can be triggered very sporadically by fsx from fstests, for example with test case generic/522.
So fix this by having btrfs_clone() skip file extent items that cover a file range that we have already processed.
--- fs/btrfs/reflink.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
fs/btrfs/reflink.c +11 -4
@@ -344,6 +344,7 @@ static int btrfs_clone(struct inode *srcint ret;const u64 len = olen_aligned;u64 last_dest_end = destoff; +u64 prev_extent_end = off; ret = -ENOMEM ; buf =kvmalloc (fs_info->nodesize,GFP_KERNEL );
@@ -363,7 +364,6 @@ static int btrfs_clone(struct inode *src key.offset = off;while (1 ) { -u64 next_key_min_offset = key.offset +1 ;struct btrfs_file_extent_item *extent;u64 extent_gen;int type;
@@ -431,14 +431,21 @@ process_slot:* The first search might have left us at an extent item that * ends before our target range's start, can happen if we have * holes and NO_HOLES feature enabled. +* +* Subsequent searches may leave us on a file range we have +* processed before - this happens due to a race with ordered +* extent completion for a file range that is outside our source +* range, but that range was part of a file extent item that +* also covered a leading part of our source range. */ -if (key.offset + datal <= off) { +if (key.offset + datal <= prev_extent_end) { path->slots[0 ]++; goto process_slot; }else if (key.offset >= off + len) {break ; } - next_key_min_offset = key.offset + datal; + + prev_extent_end = key.offset + datal; size =btrfs_item_size (leaf, slot);read_extent_buffer (leaf, buf,btrfs_item_ptr_offset (leaf, slot), size);
@@ -550,7 +557,7 @@ process_slot:break ;btrfs_release_path (path); - key.offset = next_key_min_offset; + key.offset = prev_extent_end;if (fatal_signal_pending (current)) { ret = -EINTR ;
Greg Kroah-Hartman
maintainerPATCH 126/181 btrfs: fix deadlock with fsync+fiemap+transaction commit
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit bf7ba8ee759b7b7a34787ddd8dc3f190a3d7fa24 upstream.
We are hitting the following deadlock in production occasionally
Task 1 Task 2 Task 3 Task 4 Task 5
fsync(A) start trans start commit falloc(A) lock 5m-10m start trans wait for commit
fiemap(A)
lock 0-10m
wait for 5m-10m
(have 0-5m locked)
have btrfs_need_log_full_commit !full_sync wait_ordered_extents finish_ordered_io(A) lock 0-5m DEADLOCK
We have an existing dependency of file extent lock -> transaction. However in fsync if we tried to do the fast logging, but then had to fall back to committing the transaction, we will be forced to call btrfs_wait_ordered_range() to make sure all of our extents are updated.
This creates a dependency of transaction -> file extent lock, because btrfs_finish_ordered_io() will need to take the file extent lock in order to run the ordered extents.
Fix this by stopping the transaction if we have to do the full commit and we attempted to do the fast logging. Then attach to the transaction and commit it if we need to.
--- fs/btrfs/file.c | 67 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 15 deletions(-)
fs/btrfs/file.c +52 -15
@@ -2359,25 +2359,62 @@ int btrfs_sync_file(struct file *file, l*/ btrfs_inode_unlock (inode,BTRFS_ILOCK_MMAP ); -if (ret !=BTRFS_NO_LOG_SYNC ) { +if (ret ==BTRFS_NO_LOG_SYNC ) { + ret =btrfs_end_transaction (trans); + goto out; + } + +/* We successfully logged the inode, attempt to sync the log. */ +if (!ret) { + ret =btrfs_sync_log (trans, root, &ctx);if (!ret) { - ret =btrfs_sync_log (trans, root, &ctx); -if (!ret) { - ret =btrfs_end_transaction (trans); - goto out; - } + ret =btrfs_end_transaction (trans); + goto out; } -if (!full_sync) { - ret =btrfs_wait_ordered_range (inode, start, len); -if (ret) { -btrfs_end_transaction (trans); - goto out; - } - } - ret =btrfs_commit_transaction (trans); - }else { + } + +/* +* At this point we need to commit the transaction because we had +* btrfs_need_log_full_commit() or some other error. +* +* If we didn't do a full sync we have to stop the trans handle, wait on +* the ordered extents, start it again and commit the transaction. If +* we attempt to wait on the ordered extents here we could deadlock with +* something like fallocate() that is holding the extent lock trying to +* start a transaction while some other thread is trying to commit the +* transaction while we (fsync) are currently holding the transaction +* open. +*/ +if (!full_sync) { ret =btrfs_end_transaction (trans); +if (ret) + goto out; + ret =btrfs_wait_ordered_range (inode, start, len); +if (ret) + goto out; + +/* +* This is safe to use here because we're only interested in +* making sure the transaction that had the ordered extents is +* committed. We aren't waiting on anything past this point, +* we're purely getting the transaction and committing it. +*/ + trans =btrfs_attach_transaction_barrier (root); +if (IS_ERR (trans)) { + ret =PTR_ERR (trans); + +/* +* We committed the transaction and there's no currently +* running transaction, this means everything we care +* about made it to disk and we are done. +*/ +if (ret == -ENOENT ) + ret =0 ; + goto out; + } } + + ret =btrfs_commit_transaction (trans); out:ASSERT (list_empty (&ctx.list)); err =file_check_and_advance_wb_err (file);
Greg Kroah-Hartman
maintainerPATCH 125/181 btrfs: dont set lock_owner when locking extent buffer for reading
In reply to Greg Kroah-HartmanFrom: Zygo Blaxell <[email protected]>
commit 97e86631bccddfbbe0c13f9a9605cdef11d31296 upstream.
In 196d59ab9ccc "btrfs: switch extent buffer tree lock to rw_semaphore" the functions for tree read locking were rewritten, and in the process the read lock functions started setting eb->lock_owner = current->pid. Previously lock_owner was only set in tree write lock functions.
Read locks are shared, so they don't have exclusive ownership of the underlying object, so setting lock_owner to any single value for a read lock makes no sense. It's mostly harmless because write locks and read locks are mutually exclusive, and none of the existing code in btrfs (btrfs_init_new_buffer and print_eb_refs_lock) cares what nonsense is written in lock_owner when no writer is holding the lock.
KCSAN does care, and will complain about the data race incessantly. Remove the assignments in the read lock functions because they're useless noise.
--- fs/btrfs/locking.c | 3 --- 1 file changed, 3 deletions(-)
fs/btrfs/locking.c +0 -3
@@ -45,7 +45,6 @@ void __btrfs_tree_read_lock(struct exten start_ns =ktime_get_ns ();down_read_nested (&eb->lock, nest); - eb->lock_owner = current->pid;trace_btrfs_tree_read_lock (eb, start_ns); }
@@ -62,7 +61,6 @@ void btrfs_tree_read_lock(struct extent_int btrfs_try_tree_read_lock (struct extent_buffer *eb) {if (down_read_trylock (&eb->lock)) { - eb->lock_owner = current->pid;trace_btrfs_try_tree_read_lock (eb);return 1 ; }
@@ -90,7 +88,6 @@ int btrfs_try_tree_write_lock(struct extvoid btrfs_tree_read_unlock (struct extent_buffer *eb) {trace_btrfs_tree_read_unlock (eb); - eb->lock_owner =0 ;up_read (&eb->lock); }
Greg Kroah-Hartman
maintainerPATCH 127/181 f2fs: attach inline_data after setting compression
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
commit 4cde00d50707c2ef6647b9b96b2cb40b6eb24397 upstream.
This fixes the below corruption.
[345393.335389] F2FS-fs (vdb): sanity_check_inode: inode (ino=6d0, mode=33206) should not have inline_data, run fsck to fix
--- fs/f2fs/namei.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/f2fs/namei.c +11 -6
@@ -92,8 +92,6 @@ static struct inode *f2fs_new_inode(struif (test_opt (sbi,INLINE_XATTR ))set_inode_flag (inode,FI_INLINE_XATTR ); -if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) -set_inode_flag (inode,FI_INLINE_DATA );if (f2fs_may_inline_dentry (inode))set_inode_flag (inode,FI_INLINE_DENTRY );
@@ -110,10 +108,6 @@ static struct inode *f2fs_new_inode(struf2fs_init_extent_tree (inode,NULL ); -stat_inc_inline_xattr (inode); -stat_inc_inline_inode (inode); -stat_inc_inline_dir (inode); -F2FS_I (inode)->i_flags =f2fs_mask_flags (mode,F2FS_I (dir)->i_flags &F2FS_FL_INHERITED );
@@ -130,6 +124,14 @@ static struct inode *f2fs_new_inode(struset_compress_context (inode); } +/* Should enable inline_data after compression set */ +if (test_opt (sbi,INLINE_DATA ) &&f2fs_may_inline_data (inode)) +set_inode_flag (inode,FI_INLINE_DATA ); + +stat_inc_inline_xattr (inode); +stat_inc_inline_inode (inode); +stat_inc_inline_dir (inode); +f2fs_set_inode_flags (inode);trace_f2fs_new_inode (inode,0 );
@@ -328,6 +330,9 @@ static void set_compress_inode(struct f2if (!is_extension_exist (name, ext[i], false))continue ; +/* Do not use inline_data with compression */ +stat_dec_inline_inode (inode); +clear_inode_flag (inode,FI_INLINE_DATA );set_compress_context (inode);return ; }
Greg Kroah-Hartman
maintainerPATCH 92/181 iommu/ipmmu-vmsa: Fix compatible for rcar-gen4
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 9f7d09fe23a0112c08d2326d9116fccb5a912660 ]
Fix compatible string for R-Car Gen4.
--- drivers/iommu/ipmmu-vmsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/ipmmu-vmsa.c +1 -1
@@ -987,7 +987,7 @@ static const struct of_device_id ipmmu_of_ids[] = { .compatible = "renesas,ipmmu-r8a779a0", .data = &ipmmu_features_rcar_gen4, }, { - .compatible = "renesas,rcar-gen4-ipmmu", + .compatible = "renesas,rcar-gen4-ipmmu-vmsa", .data = &ipmmu_features_rcar_gen4, }, {/* Terminator */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/181 drm/amd: Revert "drm/amd/display: keep eDP Vdd on when eDP stream is already enabled"
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 937e24b7f5595566a64e0f856ebab9147f2e4d1b ]
A variety of Lenovo machines with Rembrandt APUs and OLED panels have stopped showing the display at login. This behavior clears up after leaving it idle and moving the mouse or touching keyboard.
It was bisected to be caused by commit 559e2655220d ("drm/amd/display:
keep eDP Vdd on when eDP stream is already enabled"). Revert this commit to fix the issue.
--- .../display/dc/dce110/dce110_hw_sequencer.c | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +2 -22
@@ -1771,29 +1771,9 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)break ; } } - -/* -* TO-DO: So far the code logic below only addresses single eDP case. -* For dual eDP case, there are a few things that need to be -* implemented first: -* -* 1. Change the fastboot logic above, so eDP link[0 or 1]'s -* stream[0 or 1] will all be checked. -* -* 2. Change keep_edp_vdd_on to an array, and maintain keep_edp_vdd_on -* for each eDP. -* -* Once above 2 things are completed, we can then change the logic below -* correspondingly, so dual eDP case will be fully covered. -*/ - -// We are trying to enable eDP, don't power down VDD if eDP stream is existing -if ((edp_stream_num ==1 && edp_streams[0 ] !=NULL ) || can_apply_edp_fast_boot) { +// We are trying to enable eDP, don't power down VDD +if (can_apply_edp_fast_boot) keep_edp_vdd_on = true; -DC_LOG_EVENT_LINK_TRAINING ("Keep eDP Vdd on\n" ); - }else { -DC_LOG_EVENT_LINK_TRAINING ("No eDP stream enabled, turn eDP Vdd off\n" ); - } }// Check seamless boot support
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/181 net: dsa: qca8k: reduce mgmt ethernet timeout
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
[ Upstream commit 85467f7da18992311deafdbf32a8d163cb1e98d7 ]
The current mgmt ethernet timeout is set to 100ms. This value is too big and would slow down any mdio command in case the mgmt ethernet packet have some problems on the receiving part.
Reduce it to just 5ms to handle case when some operation are done on the master port that would cause the mgmt ethernet to not work temporarily.
--- drivers/net/dsa/qca8k.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/qca8k.h +1 -1
@@ -15,7 +15,7 @@#define QCA8K_ETHERNET_MDIO_PRIORITY 7#define QCA8K_ETHERNET_PHY_PRIORITY 6 -#define QCA8K_ETHERNET_TIMEOUT 100 +#define QCA8K_ETHERNET_TIMEOUT 5#define QCA8K_NUM_PORTS 7#define QCA8K_NUM_CPU_PORTS 2
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/181 igb: Make DMA faster when CPU is active on the PCIe link
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 4e0effd9007ea0be31f7488611eb3824b4541554 ]
Intel I210 on some Intel Alder Lake platforms can only achieve ~750Mbps Tx speed via iperf. The RR2DCDELAY shows around 0x2xxx DMA delay, which will be significantly lower when 1) ASPM is disabled or 2) SoC package c-state stays above PC3. When the RR2DCDELAY is around 0x1xxx the Tx speed can reach to ~950Mbps.
According to the I210 datasheet "8.26.1 PCIe Misc. Register - PCIEMISC", "DMA Idle Indication" doesn't seem to tie to DMA coalesce anymore, so set it to 1b for "DMA is considered idle when there is no Rx or Tx AND when there are no TLPs indicating that CPU is active detected on the PCIe link (such as the host executes CSR or Configuration register read or write operation)" and performing Tx should also fall under "active CPU on PCIe link" case.
In addition to that, commit b6e0c419f040 ("igb: Move DMA Coalescing init code to separate function.") seems to wrongly changed from enabling E1000_PCIEMISC_LX_DECISION to disabling it, also fix that.
--- drivers/net/ethernet/intel/igb/igb_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +5 -7
@@ -9901,11 +9901,10 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)struct e1000_hw *hw = &adapter->hw;u32 dmac_thr;u16 hwm; +u32 reg;if (hw->mac.type > e1000_82580) {if (adapter->flags &IGB_FLAG_DMAC ) { -u32 reg; -/* force threshold to 0. */ wr32 (E1000_DMCTXTH ,0 );
@@ -9938,7 +9937,6 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)/* Disable BMC-to-OS Watchdog Enable */ if (hw->mac.type != e1000_i354) reg &= ~E1000_DMACR_DC_BMC2OSW_EN ; -wr32 (E1000_DMACR , reg);/* no lower threshold to disable
@@ -9955,12 +9953,12 @@ static void igb_init_dmac(struct igb_adapter *adapter, u32 pba)*/ wr32 (E1000_DMCTXTH , (IGB_MIN_TXPBSIZE - (IGB_TX_BUF_4096 + adapter->max_frame_size)) >>6 ); + } -/* make low power state decision controlled -* by DMA coal -*/ +if (hw->mac.type >= e1000_i210 || + (adapter->flags &IGB_FLAG_DMAC )) { reg =rd32 (E1000_PCIEMISC ); - reg &= ~E1000_PCIEMISC_LX_DECISION ; + reg |=E1000_PCIEMISC_LX_DECISION ;wr32 (E1000_PCIEMISC , reg); }/* endif adapter->dmac is not disabled */ }else if (hw->mac.type == e1000_82580) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 128/181 f2fs: fix iostat related lock protection
In reply to Greg Kroah-HartmanFrom: Daeho Jeong <[email protected]>
commit 61803e984307c767a96d85f3b61ca50e1705fc67 upstream.
Made iostat related locks safe to be called from irq context again.
--- fs/f2fs/iostat.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
fs/f2fs/iostat.c +18 -13
@@ -91,8 +91,9 @@ static inline void __record_iostat_latenunsigned int cnt;struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE ][NR_PAGE_TYPE ];struct iostat_lat_info *io_lat = sbi->iostat_io_lat; +unsigned long flags; -spin_lock_bh (&sbi->iostat_lat_lock); +spin_lock_irqsave (&sbi->iostat_lat_lock, flags);for (idx =0 ; idx <MAX_IO_TYPE ; idx++) {for (io =0 ; io <NR_PAGE_TYPE ; io++) { cnt = io_lat->bio_cnt[idx][io];
@@ -106,7 +107,7 @@ static inline void __record_iostat_laten io_lat->bio_cnt[idx][io] =0 ; } } -spin_unlock_bh (&sbi->iostat_lat_lock); +spin_unlock_irqrestore (&sbi->iostat_lat_lock, flags);trace_f2fs_iostat_latency (sbi, iostat_lat); }
@@ -115,14 +116,15 @@ static inline void f2fs_record_iostat(st {unsigned long long iostat_diff[NR_IO_TYPE ];int i; +unsigned long flags;if (time_is_after_jiffies (sbi->iostat_next_period))return ;/* Need double check under the lock */ -spin_lock_bh (&sbi->iostat_lock); +spin_lock_irqsave (&sbi->iostat_lock, flags);if (time_is_after_jiffies (sbi->iostat_next_period)) { -spin_unlock_bh (&sbi->iostat_lock); +spin_unlock_irqrestore (&sbi->iostat_lock, flags);return ; } sbi->iostat_next_period = jiffies +
@@ -133,7 +135,7 @@ static inline void f2fs_record_iostat(st sbi->prev_rw_iostat[i]; sbi->prev_rw_iostat[i] = sbi->rw_iostat[i]; } -spin_unlock_bh (&sbi->iostat_lock); +spin_unlock_irqrestore (&sbi->iostat_lock, flags);trace_f2fs_iostat (sbi, iostat_diff);
@@ -145,25 +147,27 @@ void f2fs_reset_iostat(struct f2fs_sb_instruct iostat_lat_info *io_lat = sbi->iostat_io_lat;int i; -spin_lock_bh (&sbi->iostat_lock); +spin_lock_irq (&sbi->iostat_lock);for (i =0 ; i <NR_IO_TYPE ; i++) { sbi->rw_iostat[i] =0 ; sbi->prev_rw_iostat[i] =0 ; } -spin_unlock_bh (&sbi->iostat_lock); +spin_unlock_irq (&sbi->iostat_lock); -spin_lock_bh (&sbi->iostat_lat_lock); +spin_lock_irq (&sbi->iostat_lat_lock);memset (io_lat,0 ,sizeof (struct iostat_lat_info )); -spin_unlock_bh (&sbi->iostat_lat_lock); +spin_unlock_irq (&sbi->iostat_lat_lock); }void f2fs_update_iostat (struct f2fs_sb_info *sbi,enum iostat_type type,unsigned long long io_bytes) { +unsigned long flags; +if (!sbi->iostat_enable)return ; -spin_lock_bh (&sbi->iostat_lock); +spin_lock_irqsave (&sbi->iostat_lock, flags); sbi->rw_iostat[type] += io_bytes;if (type ==APP_BUFFERED_IO || type ==APP_DIRECT_IO )
@@ -172,7 +176,7 @@ void f2fs_update_iostat(struct f2fs_sb_iif (type ==APP_BUFFERED_READ_IO || type ==APP_DIRECT_READ_IO ) sbi->rw_iostat[APP_READ_IO ] += io_bytes; -spin_unlock_bh (&sbi->iostat_lock); +spin_unlock_irqrestore (&sbi->iostat_lock, flags);f2fs_record_iostat (sbi); }
@@ -185,6 +189,7 @@ static inline void __update_iostat_latenstruct f2fs_sb_info *sbi = iostat_ctx->sbi;struct iostat_lat_info *io_lat = sbi->iostat_io_lat;int idx; +unsigned long flags;if (!sbi->iostat_enable)return ;
@@ -202,12 +207,12 @@ static inline void __update_iostat_laten idx =WRITE_ASYNC_IO ; } -spin_lock_bh (&sbi->iostat_lat_lock); +spin_lock_irqsave (&sbi->iostat_lat_lock, flags); io_lat->sum_lat[idx][iotype] += ts_diff; io_lat->bio_cnt[idx][iotype]++;if (ts_diff > io_lat->peak_lat[idx][iotype]) io_lat->peak_lat[idx][iotype] = ts_diff; -spin_unlock_bh (&sbi->iostat_lat_lock); +spin_unlock_irqrestore (&sbi->iostat_lat_lock, flags); }void iostat_update_and_unbind_ctx (struct bio *bio,int rw)
Greg Kroah-Hartman
maintainerPATCH 129/181 f2fs: do not count ENOENT for error case
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
commit 82c7863ed95d0914f02c7c8c011200a763bc6725 upstream.
Otherwise, we can get a wrong cp_error mark.
--- fs/f2fs/node.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/node.c +3 -1
@@ -1454,7 +1454,9 @@ page_hit: out_err:ClearPageUptodate (page); out_put_err: -f2fs_handle_page_eio (sbi, page->index,NODE ); +/* ENOENT comes from read_node_page which is not an error. */ +if (err != -ENOENT ) +f2fs_handle_page_eio (sbi, page->index,NODE );f2fs_put_page (page,1 );return ERR_PTR (err); }
Greg Kroah-Hartman
maintainerPATCH 130/181 iio:humidity:hts221: rearrange iio trigger get and register
In reply to Greg Kroah-HartmanFrom: Dmitry Rokosov <[email protected]>
commit 10b9c2c33ac706face458feab8965f11743c98c0 upstream.
IIO trigger interface function iio_trigger_get() should be called after iio_trigger_register() (or its devm analogue) strictly, because of iio_trigger_get() acquires module refcnt based on the trigger->owner pointer, which is initialized inside iio_trigger_register() to THIS_MODULE.
If this call order is wrong, the next iio_trigger_put() (from sysfs callback or "delete module" path) will dereference "default" module refcnt, which is incorrect behaviour.
--- drivers/iio/humidity/hts221_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/humidity/hts221_buffer.c +4 -1
@@ -135,9 +135,12 @@ int hts221_allocate_trigger(struct iio_diio_trigger_set_drvdata (hw->trig, iio_dev); hw->trig->ops = &hts221_trigger_ops; + + err =devm_iio_trigger_register (hw->dev, hw->trig); + iio_dev->trig =iio_trigger_get (hw->trig); -return devm_iio_trigger_register (hw->dev, hw->trig); +return err; }static int hts221_buffer_preenable (struct iio_dev *iio_dev)
Greg Kroah-Hartman
maintainerPATCH 97/181 Revert "net/tls: fix tls_sk_proto_close executed repeatedly"
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 1b205d948fbb06a7613d87dcea0ff5fd8a08ed91 ]
This reverts commit 69135c572d1f84261a6de2a1268513a7e71753e2.
This commit was just papering over the issue, ULP should not get ->update() called with its own sk_prot. Each ULP would need to add this check.
--- net/tls/tls_main.c | 3 --- 1 file changed, 3 deletions(-)
net/tls/tls_main.c +0 -3
@@ -873,9 +873,6 @@ static void tls_update(struct sock *sk, struct proto *p, {struct tls_context *ctx; -if (sk->sk_prot == p) -return ; - ctx =tls_get_ctx (sk);if (likely (ctx)) { ctx->sk_write_space = write_space;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 162/181 mm: lru_cache_disable: use synchronize_rcu_expedited
In reply to Greg Kroah-HartmanFrom: Marcelo Tosatti <[email protected]>
commit 31733463372e8d88ea54bfa1e35178aad9b2ffd2 upstream.
commit ff042f4a9b050 ("mm: lru_cache_disable: replace work queue synchronization with synchronize_rcu") replaced lru_cache_disable's usage of work queues with synchronize_rcu.
Some users reported large performance regressions due to this commit, for example:
https://lore.kernel.org/all/20220521234616.GO1790663@paulmck-ThinkPad-P17-Gen-1/T/
Switching to synchronize_rcu_expedited fixes the problem.
--- mm/swap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/swap.c +1 -1
@@ -881,7 +881,7 @@ void lru_cache_disable(void)* lru_disable_count = 0 will have exited the critical * section when synchronize_rcu() returns. */ -synchronize_rcu (); +synchronize_rcu_expedited ();#ifdef CONFIG_SMP __lru_add_drain_all (true);#else
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 143/181 iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 8a2b6b5687984a010ed094b4f436a2f091987758 upstream.
of_find_node_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- drivers/iio/adc/aspeed_adc.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/aspeed_adc.c +1 -0
@@ -186,6 +186,7 @@ static int aspeed_adc_set_trim_data(strureturn -EOPNOTSUPP ; } scu =syscon_node_to_regmap (syscon); +of_node_put (syscon);if (IS_ERR (scu)) {dev_warn (data->dev,"Failed to get syscon regmap\n" );return -EOPNOTSUPP ;
Greg Kroah-Hartman
maintainerPATCH 148/181 iio: adc: rzg2l_adc: add missing fwnode_handle_put() in rzg2l_adc_parse_properties()
In reply to Greg Kroah-HartmanFrom: Jialin Zhang <[email protected]>
commit d836715f588ea15f905f607c27bc693587058db4 upstream.
fwnode_handle_put() should be used when terminating device_for_each_child_node() iteration with break or return to prevent stale device node references from being left behind.
--- drivers/iio/adc/rzg2l_adc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iio/adc/rzg2l_adc.c +6 -2
@@ -334,11 +334,15 @@ static int rzg2l_adc_parse_properties(st i =0 ;device_for_each_child_node (&pdev->dev, fwnode) { ret =fwnode_property_read_u32 (fwnode,"reg" , &channel); -if (ret) +if (ret) { +fwnode_handle_put (fwnode);return ret; + } -if (channel >=RZG2L_ADC_MAX_CHANNELS ) +if (channel >=RZG2L_ADC_MAX_CHANNELS ) { +fwnode_handle_put (fwnode);return -EINVAL ; + } chan_array[i].type =IIO_VOLTAGE ; chan_array[i].indexed =1 ;
Greg Kroah-Hartman
maintainerPATCH 149/181 iio: adc: adi-axi-adc: Fix refcount leak in adi_axi_adc_attach_client
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit ada7b0c0dedafd7d059115adf49e48acba3153a8 upstream.
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- drivers/iio/adc/adi-axi-adc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iio/adc/adi-axi-adc.c +3 -0
@@ -322,16 +322,19 @@ static struct adi_axi_adc_client *adi_axif (!try_module_get (cl->dev->driver->owner)) {mutex_unlock (®istered_clients_lock); +of_node_put (cln);return ERR_PTR (-ENODEV ); }get_device (cl->dev); cl->info = info;mutex_unlock (®istered_clients_lock); +of_node_put (cln);return cl; }mutex_unlock (®istered_clients_lock); +of_node_put (cln);return ERR_PTR (-EPROBE_DEFER ); }
Greg Kroah-Hartman
maintainerPATCH 178/181 smb3: use netname when available on secondary channels
In reply to Greg Kroah-HartmanFrom: Shyam Prasad N <[email protected]>
commit 9de74996a739bf0b7b5d8c260bd207ad6007442b upstream.
Some servers do not allow null netname contexts, which would cause multichannel to revert to single channel when mounting to some servers (e.g. Azure xSMB). The previous patch fixed that by avoiding incorrectly sending the netname context when there would be a null hostname sent in the netname context, while this patch fixes the null hostname for the secondary channel by using the hostname of the primary channel for the secondary channel.
--- fs/cifs/smb2pdu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +9 -2
@@ -543,6 +543,7 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, struct TCP_Server_Info *server, unsigned int *total_len) { char *pneg_ctxt; +char *hostname =NULL ;unsigned int ctxt_len, neg_context_count;if (*total_len >200 ) {
@@ -574,9 +575,15 @@ assemble_neg_contexts(struct smb2_negotiate_req *req, *total_len +=sizeof (struct smb2_posix_neg_context ); pneg_ctxt +=sizeof (struct smb2_posix_neg_context ); -if (server->hostname && (server->hostname[0 ] !=0 )) { +/* +* secondary channels don't have the hostname field populated +* use the hostname field in the primary channel instead +*/ + hostname =CIFS_SERVER_IS_CHAN (server) ? + server->primary_server->hostname : server->hostname; +if (hostname && (hostname[0 ] !=0 )) { ctxt_len =build_netname_ctxt ((struct smb2_netname_neg_context *)pneg_ctxt, - server->hostname); + hostname); *total_len += ctxt_len; pneg_ctxt += ctxt_len; neg_context_count =4 ;
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 152/181 xtensa: Fix refcount leak bug in time.c
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
commit a0117dc956429f2ede17b323046e1968d1849150 upstream.
In calibrate_ccount(), of_find_compatible_node() will return a node pointer with refcount incremented. We should use of_node_put() when it is not used anymore.
Message-Id: <[email protected]>
--- arch/xtensa/kernel/time.c | 1 + 1 file changed, 1 insertion(+)
arch/xtensa/kernel/time.c +1 -0
@@ -154,6 +154,7 @@ static void __init calibrate_ccount(void cpu =of_find_compatible_node (NULL ,NULL ,"cdns,xtensa-cpu" );if (cpu) { clk =of_clk_get (cpu,0 ); +of_node_put (cpu);if (!IS_ERR (clk)) { ccount_freq =clk_get_rate (clk);return ;
Greg Kroah-Hartman
maintainerPATCH 142/181 iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 7a2f6f61e8ee016b75e1b1dd62fbd03e6d6db37d upstream.
When IIO_RESCALE_KUNIT_TEST=y and IIO_RESCALE=m, drivers/iio/afe/iio-rescale.o is built twice causing the MODULE_LICENSE() to be lost, as shown by:
ERROR: modpost: missing MODULE_LICENSE() in drivers/iio/afe/iio-rescale.o
Rework the build configuration to have the dependency specified in the Kconfig.
--- drivers/iio/test/Kconfig | 2 +- drivers/iio/test/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iio/test/Kconfig +1 -1
@@ -6,7 +6,7 @@ # Keep in alphabetical order config IIO_RESCALE_KUNIT_TEST bool "Test IIO rescale conversion functions" - depends on KUNIT=y && !IIO_RESCALE + depends on KUNIT=y && IIO_RESCALE=y default KUNIT_ALL_TESTS help If you want to run tests on the iio-rescale code say Y here.
drivers/iio/test/Makefile +1 -1
@@ -4,6 +4,6 @@ # # Keep in alphabetical order -obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o ../afe/iio-rescale.o +obj-$(CONFIG_IIO_RESCALE_KUNIT_TEST) += iio-test-rescale.o obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o CFLAGS_iio-test-format.o += $(DISABLE_STRUCTLEAK_PLUGIN)
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 174/181 ARM: dts: bcm2711-rpi-400: Fix GPIO line names
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
commit b9b6d4c925604b70d007feb4c77b8cc4c038d2da upstream.
The GPIO expander line names has been fixed in the vendor tree last year, so upstream these changes.
--- arch/arm/boot/dts/bcm2711-rpi-400.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm2711-rpi-400.dts +3 -3
@@ -28,12 +28,12 @@ &expgpio { gpio-line-names = "BT_ON", "WL_ON", - "", + "PWR_LED_OFF", "GLOBAL_RESET", "VDD_SD_IO_SEL", - "CAM_GPIO", + "GLOBAL_SHUTDOWN", "SD_PWR_ON", - "SD_OC_N"; + "SHUTDOWN_REQUEST"; }; &genet_mdio {
Greg Kroah-Hartman
maintainerPATCH 134/181 iio:accel:bma180: rearrange iio trigger get and register
In reply to Greg Kroah-HartmanFrom: Dmitry Rokosov <[email protected]>
commit e5f3205b04d7f95a2ef43bce4b454a7f264d6923 upstream.
IIO trigger interface function iio_trigger_get() should be called after iio_trigger_register() (or its devm analogue) strictly, because of iio_trigger_get() acquires module refcnt based on the trigger->owner pointer, which is initialized inside iio_trigger_register() to THIS_MODULE.
If this call order is wrong, the next iio_trigger_put() (from sysfs callback or "delete module" path) will dereference "default" module refcnt, which is incorrect behaviour.
--- drivers/iio/accel/bma180.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/accel/bma180.c +2 -1
@@ -1006,11 +1006,12 @@ static int bma180_probe(struct i2c_clien data->trig->ops = &bma180_trigger_ops;iio_trigger_set_drvdata (data->trig, indio_dev); - indio_dev->trig =iio_trigger_get (data->trig); ret =iio_trigger_register (data->trig);if (ret) goto err_trigger_free; + + indio_dev->trig =iio_trigger_get (data->trig); } ret = iio_triggered_buffer_setup(indio_dev, NULL,
Greg Kroah-Hartman
maintainerPATCH 136/181 iio: accel: mma8452: ignore the return value of reset operation
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
commit bf745142cc0a3e1723f9207fb0c073c88464b7b4 upstream.
On fxls8471, after set the reset bit, the device will reset immediately, will not give ACK. So ignore the return value of this reset operation, let the following code logic to check whether the reset operation works.
--- drivers/iio/accel/mma8452.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/iio/accel/mma8452.c +7 -3
@@ -1510,10 +1510,14 @@ static int mma8452_reset(struct i2c_clieint i;int ret; - ret =i2c_smbus_write_byte_data (client,MMA8452_CTRL_REG2 , +/* +* Find on fxls8471, after config reset bit, it reset immediately, +* and will not give ACK, so here do not check the return value. +* The following code will read the reset register, and check whether +* this reset works. +*/ +i2c_smbus_write_byte_data (client,MMA8452_CTRL_REG2 ,MMA8452_CTRL_REG2_RST ); -if (ret <0 ) -return ret;for (i =0 ; i <10 ; i++) {usleep_range (100 ,200 );
Greg Kroah-Hartman
maintainerPATCH 153/181 parisc/stifb: Fix fb_is_primary_device() only available with CONFIG_FB_STI
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 1d0811b03eb30b2f0793acaa96c6ce90b8b9c87a upstream.
Fix this build error noticed by the kernel test robot:
drivers/video/console/sticore.c:1132:5: error: redefinition of 'fb_is_primary_device'
arch/parisc/include/asm/fb.h:18:19: note: previous definition of 'fb_is_primary_device'
--- arch/parisc/include/asm/fb.h | 2 +- drivers/video/console/sticore.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
arch/parisc/include/asm/fb.h +1 -1
@@ -12,7 +12,7 @@ static inline void fb_pgprotect(struct fpgprot_val (vma->vm_page_prot) |= _PAGE_NO_CACHE; } -#if defined(CONFIG_STI_CONSOLE ) || defined(CONFIG_FB_STI ) +#if defined(CONFIG_FB_STI )int fb_is_primary_device (struct fb_info *info);#else static inline int fb_is_primary_device (struct fb_info *info)
drivers/video/console/sticore.c +2 -0
@@ -1127,6 +1127,7 @@ int sti_call(const struct sti_struct *streturn ret; } +#if defined(CONFIG_FB_STI )/* check if given fb_info is the primary device */ int fb_is_primary_device (struct fb_info *info) {
@@ -1142,6 +1143,7 @@ int fb_is_primary_device(struct fb_info return (sti->info == info); }EXPORT_SYMBOL (fb_is_primary_device); +#endif MODULE_AUTHOR ("Philipp Rumpf, Helge Deller, Thomas Bogendoerfer" );MODULE_DESCRIPTION ("Core STI driver for HP's NGLE series graphics cards in HP PARISC machines" );
Greg Kroah-Hartman
maintainerPATCH 160/181 powerpc/powernv: wire up rng during setup_arch
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit f3eac426657d985b97c92fa5f7ae1d43f04721f3 upstream.
The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call.
Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much.
--- arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 +++++++++++++++++++++---------- arch/powerpc/platforms/powernv/setup.c | 2 + 3 files changed, 40 insertions(+), 16 deletions(-)
arch/powerpc/platforms/powernv/powernv.h +2 -0
@@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc,u32 __init memcons_get_size (struct memcons *mc);struct memcons *__init memcons_init (struct device_node *node,const char *mc_prop_name); +void pnv_rng_init (void ); +#endif /* _POWERNV_H */
arch/powerpc/platforms/powernv/rng.c +36 -16
90 lines not on this page · raw message
arch/powerpc/platforms/powernv/setup.c +2 -0
@@ -203,6 +203,8 @@ static void __init pnv_setup_arch(void)pnv_check_guarded_cores ();/* XXX PMCS */ + +pnv_rng_init (); }static void __init pnv_init (void )
Greg Kroah-Hartman
maintainerPATCH 169/181 ARM: Fix refcount leak in axxia_boot_secondary
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 7c7ff68daa93d8c4cdea482da4f2429c0398fcde upstream.
of_find_compatible_node() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- arch/arm/mach-axxia/platsmp.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-axxia/platsmp.c +1 -0
@@ -39,6 +39,7 @@ static int axxia_boot_secondary(unsignedreturn -ENOENT ; syscon =of_iomap (syscon_np,0 ); +of_node_put (syscon_np);if (!syscon)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 151/181 xtensa: xtfpga: Fix refcount leak bug in setup
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
commit 173940b3ae40114d4179c251a98ee039dc9cd5b3 upstream.
In machine_setup(), of_find_compatible_node() will return a node pointer with refcount incremented. We should use of_node_put() when it is not used anymore.
Message-Id: <[email protected]>
--- arch/xtensa/platforms/xtfpga/setup.c | 1 + 1 file changed, 1 insertion(+)
arch/xtensa/platforms/xtfpga/setup.c +1 -0
@@ -133,6 +133,7 @@ static int __init machine_setup(void)if ((eth =of_find_compatible_node (eth,NULL ,"opencores,ethoc" )))update_local_mac (eth); +of_node_put (eth);return 0 ; }arch_initcall (machine_setup);
Greg Kroah-Hartman
maintainerPATCH 170/181 memory: mtk-smi: add missing put_device() call in mtk_smi_device_link_common
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 038ae37c510fd57cbc543ac82db1e7b23b28557a upstream.
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling paths.
--- drivers/memory/mtk-smi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/memory/mtk-smi.c +4 -1
@@ -404,13 +404,16 @@ static int mtk_smi_device_link_common(struct device *dev, struct device **com_deof_node_put (smi_com_node);if (smi_com_pdev) {/* smi common is the supplier, Make sure it is ready before */ -if (!platform_get_drvdata (smi_com_pdev)) +if (!platform_get_drvdata (smi_com_pdev)) { +put_device (&smi_com_pdev->dev);return -EPROBE_DEFER ; + } smi_com_dev = &smi_com_pdev->dev; link =device_link_add (dev, smi_com_dev,DL_FLAG_PM_RUNTIME |DL_FLAG_STATELESS );if (!link) {dev_err (dev,"Unable to link smi-common dev\n" ); +put_device (&smi_com_pdev->dev);return -ENODEV ; } *com_dev = smi_com_dev;
Signature · 1 line
2.36.1
Greg Kroah-Hartman
maintainerPATCH 147/181 iio: adc: axp288: Override TS pin bias current for some models
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 048058399f19d43cf21de9f5d36cd8144337d004 upstream.
Since commit 9bcf15f75cac ("iio: adc: axp288: Fix TS-pin handling") we preserve the bias current set by the firmware at boot. This fixes issues we were seeing on various models.
Some models like the Nuvision Solo 10 Draw tablet actually need the old hardcoded 80ųA bias current for battery temperature monitoring to work properly.
Add a quirk entry for the Nuvision Solo 10 Draw to the DMI quirk table to restore setting the bias current to 80ųA on this model.
--- drivers/iio/adc/axp288_adc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iio/adc/axp288_adc.c +8 -0
@@ -196,6 +196,14 @@ static const struct dmi_system_id axp288 }, .driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA, }, + { + /* Nuvision Solo 10 Draw */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TMAX"), + DMI_MATCH(DMI_PRODUCT_NAME, "TM101W610L"), + }, + .driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA, + }, {} };
Greg Kroah-Hartman
maintainerPATCH 157/181 powerpc/microwatt: wire up rng during setup_arch()
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit 20a9689b3607456d92c6fb764501f6a95950b098 upstream.
The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Fortunately, each platform already has a setup_arch function pointer, which means it's easy to wire this up. This commit also removes some noisy log messages that don't add much.
--- arch/powerpc/platforms/microwatt/microwatt.h | 7 +++++++ arch/powerpc/platforms/microwatt/rng.c | 10 +++------- arch/powerpc/platforms/microwatt/setup.c | 8 ++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/platforms/microwatt/microwatt.h
arch/powerpc/platforms/microwatt/microwatt.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _MICROWATT_H +#define _MICROWATT_H + +void microwatt_rng_init (void ); + +#endif /* _MICROWATT_H */
arch/powerpc/platforms/microwatt/rng.c +3 -7
@@ -11,6 +11,7 @@#include <asm/archrandom.h> #include <asm/cputable.h> #include <asm/machdep.h> +#include "microwatt.h" #define DARN_ERR 0xFFFFFFFFFFFFFFFFul
@@ -29,7 +30,7 @@ static int microwatt_get_random_darn(unsreturn 1 ; } -static __init int rng_init (void ) +void __init microwatt_rng_init (void ) {unsigned long val;int i;
@@ -37,12 +38,7 @@ static __init int rng_init(void)for (i =0 ; i <10 ; i++) {if (microwatt_get_random_darn (&val)) { ppc_md.get_random_seed = microwatt_get_random_darn; -return 0 ; +return ; } } - -pr_warn ("Unable to use DARN for get_random_seed()\n" ); - -return -EIO ; } -machine_subsys_initcall(, rng_init);
arch/powerpc/platforms/microwatt/setup.c +8 -0
@@ -16,6 +16,8 @@#include <asm/xics.h> #include <asm/udbg.h> +#include "microwatt.h" +static void __init microwatt_init_IRQ (void ) {xics_init ();
@@ -32,10 +34,16 @@ static int __init microwatt_populate(voi }machine_arch_initcall (microwatt, microwatt_populate); +static void __init microwatt_setup_arch (void ) +{ +microwatt_rng_init (); +} +define_machine (microwatt) { .name = "microwatt", .probe = microwatt_probe, .init_IRQ = microwatt_init_IRQ, + .setup_arch = microwatt_setup_arch, .progress = udbg_progress, .calibrate_decr = generic_calibrate_decr, };
Greg Kroah-Hartman
maintainerPATCH 175/181 smb3: fix empty netname context on secondary channels
In reply to Greg Kroah-HartmanFrom: Steve French <[email protected]>
commit 73130a7b1ac92c9f30e0a255951129f4851c5794 upstream.
Some servers do not allow null netname contexts, which would cause multichannel to revert to single channel when mounting to some servers (e.g. Azure xSMB).
--- fs/cifs/smb2pdu.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/cifs/smb2pdu.c +8 -6
@@ -570,16 +570,18 @@ assemble_neg_contexts(struct smb2_negoti *total_len += ctxt_len; pneg_ctxt += ctxt_len; - ctxt_len =build_netname_ctxt ((struct smb2_netname_neg_context *)pneg_ctxt, - server->hostname); - *total_len += ctxt_len; - pneg_ctxt += ctxt_len; -build_posix_ctxt ((struct smb2_posix_neg_context *)pneg_ctxt); *total_len +=sizeof (struct smb2_posix_neg_context ); pneg_ctxt +=sizeof (struct smb2_posix_neg_context ); - neg_context_count =4 ; +if (server->hostname && (server->hostname[0 ] !=0 )) { + ctxt_len =build_netname_ctxt ((struct smb2_netname_neg_context *)pneg_ctxt, + server->hostname); + *total_len += ctxt_len; + pneg_ctxt += ctxt_len; + neg_context_count =4 ; + }else /* second channels do not have a hostname */ + neg_context_count =3 ;if (server->compress_algorithm) { build_compression_ctxt((struct smb2_compression_capabilities_context *)
Greg Kroah-Hartman
maintainerPATCH 179/181 dma-direct: use the correct size for dma_set_encrypted()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
commit 3be4562584bba603f33863a00c1c32eecf772ee6 upstream.
The third parameter of dma_set_encrypted() is a size in bytes rather than the number of pages.
--- kernel/dma/direct.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/dma/direct.c +2 -3
@@ -357,7 +357,7 @@ void dma_direct_free(struct device *dev, }else {if (IS_ENABLED (CONFIG_ARCH_HAS_DMA_CLEAR_UNCACHED ))arch_dma_clear_uncached (cpu_addr, size); -if (dma_set_encrypted (dev, cpu_addr,1 << page_order)) +if (dma_set_encrypted (dev, cpu_addr, size))return ; }
@@ -392,7 +392,6 @@ void dma_direct_free_pages(struct device struct page *page, dma_addr_t dma_addr, enum dma_data_direction dir) { - unsigned int page_order = get_order(size); void *vaddr = page_address(page);/* If cpu_addr is not from an atomic pool, dma_free_from_pool() fails */
@@ -400,7 +399,7 @@ void dma_direct_free_pages(struct device dma_free_from_pool(dev, vaddr, size))return ; -if (dma_set_encrypted (dev, vaddr,1 << page_order)) +if (dma_set_encrypted (dev, vaddr, size))return ;__dma_direct_free_pages (dev, page, size); }
Greg Kroah-Hartman
maintainerPATCH 88/181 ice: ethtool: Prohibit improper channel config for DCB
In reply to Greg Kroah-HartmanFrom: Anatolii Gerasymenko <[email protected]>
[ Upstream commit a632b2a4c920ce5af29410fb091f7ee6d2e77dc6 ]
Do not allow setting less channels, than Traffic Classes there are via ethtool. There must be at least one channel per Traffic Class.
If you set less channels, than Traffic Classes there are, then during ice_vsi_rebuild there would be allocated only the requested amount of tx/rx rings in ice_vsi_alloc_arrays. But later in ice_vsi_setup_q_map there would be requested at least one channel per Traffic Class. This results in setting num_rxq > alloc_rxq and num_txq > alloc_txq. Later, there would be a NULL pointer dereference in ice_vsi_map_rings_to_vectors, because we go beyond of rx_rings or tx_rings arrays.
Change ice_set_channels() to return error if you try to allocate less channels, than Traffic Classes there are.
Change ice_vsi_setup_q_map() and ice_vsi_setup_q_map_mqprio() to return status code instead of void.
Add error handling for ice_vsi_setup_q_map() and ice_vsi_setup_q_map_mqprio() in ice_vsi_init() and ice_vsi_cfg_tc().
[53753.889983] INFO: Flow control is disabled for this traffic class (0) on this vsi. [53763.984862] BUG: unable to handle kernel NULL pointer dereference at 0000000000000028 [53763.992915] PGD 14b45f5067 P4D 0 [53763.996444] Oops: 0002 [#1] SMP NOPTI [53764.000312] CPU: 12 PID: 30661 Comm: ethtool Kdump: loaded Tainted: GOE --------- - - 4.18.0-240.el8.x86_64 #1 [53764.011825] Hardware name: Intel Corporation WilsonCity/WilsonCity, BIOS WLYDCRB1.SYS.0020.P21.2012150710 12/15/2020 [53764.022584] RIP: 0010:ice_vsi_map_rings_to_vectors+0x7e/0x120 [ice] [53764.029089] Code: 41 0d 0f b7 b7 12 05 00 00 0f b6 d0 44 29 de 44 0f b7 c6 44 01 c2 41 39 d0 7d 2d 4c 8b 47 28 44 0f b7 ce 83 c6 01 4f 8b 04 c8 <49> 89 48 28 4 c 8b 89 b8 01 00 00 4d 89 08 4c 89 81 b8 01 00 00 44 [53764.048379] RSP: 0018:ff550dd88ea47b20 EFLAGS: 00010206 [53764.053884] RAX: 0000000000000002 RBX: 0000000000000004 RCX: ff385ea42fa4a018 [53764.061301] RDX: 0000000000000006 RSI: 0000000000000005 RDI: ff385e9baeedd018 [53764.068717] RBP: 0000000000000010 R08: 0000000000000000 R09: 0000000000000004 [53764.076133] R10: 0000000000000002 R11: 0000000000000004 R12: 0000000000000000 [53764.083553] R13: 0000000000000000 R14: ff385e658fdd9000 R15: ff385e9baeedd018 [53764.090976] FS: 000014872c5b5740(0000) GS:ff385e847f100000(0000) knlGS:0000000000000000 [53764.099362] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [53764.105409] CR2: 0000000000000028 CR3: 0000000a820fa002 CR4: 0000000000761ee0 [53764.112851] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [53764.120301] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [53764.127747] PKRU: 55555554 [53764.130781] Call Trace: [53764.133564] ice_vsi_rebuild+0x611/0x870 [ice] [53764.138341] ice_vsi_recfg_qs+0x94/0x100 [ice] [53764.143116] ice_set_channels+0x1a8/0x3e0 [ice] [53764.147975] ethtool_set_channels+0x14e/0x240 [53764.152667] dev_ethtool+0xd74/0x2a10 [53764.156665] ? __mod_lruvec_state+0x44/0x110 [53764.161280] ? __mod_lruvec_state+0x44/0x110 [53764.165893] ? page_add_file_rmap+0x15/0x170 [53764.170518] ? inet_ioctl+0xd1/0x220 [53764.174445] ? netdev_run_todo+0x5e/0x290 [53764.178808] dev_ioctl+0xb5/0x550 [53764.182485] sock_do_ioctl+0xa0/0x140 [53764.186512] sock_ioctl+0x1a8/0x300 [53764.190367] ? selinux_file_ioctl+0x161/0x200 [53764.195090] do_vfs_ioctl+0xa4/0x640 [53764.199035] ksys_ioctl+0x60/0x90 [53764.202722] __x64_sys_ioctl+0x16/0x20 [53764.206845] do_syscall_64+0x5b/0x1a0 [53764.210887] entry_SYSCALL_64_after_hwframe+0x65/0xca
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 +++++ drivers/net/ethernet/intel/ice/ice_lib.c | 42 +++++++++++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +10 -0
@@ -3477,6 +3477,16 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch) new_rx = ch->combined_count + ch->rx_count; new_tx = ch->combined_count + ch->tx_count; +if (new_rx < vsi->tc_cfg.numtc) { +netdev_err (dev,"Cannot set less Rx channels, than Traffic Classes you have (%u)\n" , + vsi->tc_cfg.numtc); +return -EINVAL ; + } +if (new_tx < vsi->tc_cfg.numtc) { +netdev_err (dev,"Cannot set less Tx channels, than Traffic Classes you have (%u)\n" , + vsi->tc_cfg.numtc); +return -EINVAL ; + }if (new_rx >ice_get_max_rxq (pf)) {netdev_err (dev,"Maximum allowed Rx channels is %d\n" ,ice_get_max_rxq (pf));
drivers/net/ethernet/intel/ice/ice_lib.c +37 -5
93 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 131/181 iio:proximity:sx9324: Check ret value of device_property_read_u32_array()
In reply to Greg Kroah-HartmanFrom: Aashish Sharma <[email protected]>
commit 70171ed6dc53d2f580166d47f5b66cf51a6d0092 upstream.
0-day reports:
drivers/iio/proximity/sx9324.c:868:3: warning: Value stored to 'ret' is never read [clang-analyzer-deadcode.DeadStores]
Put an if condition to break out of switch if ret is non-zero.
--- drivers/iio/proximity/sx9324.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iio/proximity/sx9324.c +3 -0
@@ -885,6 +885,9 @@ sx9324_get_default_reg(struct device *debreak ; ret =device_property_read_u32_array (dev, prop, pin_defs,ARRAY_SIZE (pin_defs)); +if (ret) +break ; +for (pin =0 ; pin <SX9324_NUM_PINS ; pin++) raw |= (pin_defs[pin] << (2 * pin)) &SX9324_REG_AFE_PH0_PIN_MASK (pin);
Greg Kroah-Hartman
maintainerPATCH 139/181 iio: adc: stm32: fix maximum clock rate for stm32mp15x
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
commit 990539486e7e311fb5dab1bf4d85d1a8973ae644 upstream.
Change maximum STM32 ADC input clock rate to 36MHz, as specified in STM32MP15x datasheets.
--- drivers/iio/adc/stm32-adc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/stm32-adc-core.c +1 -1
@@ -805,7 +805,7 @@ static const struct stm32_adc_priv_cfg sstatic const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = { .regs = &stm32h7_adc_common_regs, .clk_sel = stm32h7_adc_clk_sel, - .max_clk_rate_hz =40000000 , + .max_clk_rate_hz =36000000 , .has_syscfg =HAS_VBOOSTER |HAS_ANASWVDD , .num_irqs =2 , };
Greg Kroah-Hartman
maintainerPATCH 171/181 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 1332661e09304b7b8e84e5edc11811ba08d12abe upstream.
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. This function doesn't call of_node_put() in some error paths. To unify the structure, Add put_node label and goto it on errors.
--- drivers/memory/samsung/exynos5422-dmc.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/memory/samsung/exynos5422-dmc.c +18 -11
@@ -1187,33 +1187,39 @@ static int of_get_dram_timings(struct ex dmc->timing_row =devm_kmalloc_array (dmc->dev,TIMING_COUNT ,sizeof (u32),GFP_KERNEL ); -if (!dmc->timing_row) -return -ENOMEM ; +if (!dmc->timing_row) { + ret = -ENOMEM ; + goto put_node; + } dmc->timing_data =devm_kmalloc_array (dmc->dev,TIMING_COUNT ,sizeof (u32),GFP_KERNEL ); -if (!dmc->timing_data) -return -ENOMEM ; +if (!dmc->timing_data) { + ret = -ENOMEM ; + goto put_node; + } dmc->timing_power =devm_kmalloc_array (dmc->dev,TIMING_COUNT ,sizeof (u32),GFP_KERNEL ); -if (!dmc->timing_power) -return -ENOMEM ; +if (!dmc->timing_power) { + ret = -ENOMEM ; + goto put_node; + } dmc->timings =of_lpddr3_get_ddr_timings (np_ddr, dmc->dev,DDR_TYPE_LPDDR3 , &dmc->timings_arr_size);if (!dmc->timings) { -of_node_put (np_ddr);dev_warn (dmc->dev,"could not get timings from DT\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_node; } dmc->min_tck =of_lpddr3_get_min_tck (np_ddr, dmc->dev);if (!dmc->min_tck) { -of_node_put (np_ddr);dev_warn (dmc->dev,"could not get tck from DT\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_node; }/* Sorted array of OPPs with frequency ascending */
@@ -1227,13 +1233,14 @@ static int of_get_dram_timings(struct ex clk_period_ps); } -of_node_put (np_ddr);/* Take the highest frequency's timings as 'bypass' */ dmc->bypass_timing_row = dmc->timing_row[idx -1 ]; dmc->bypass_timing_data = dmc->timing_data[idx -1 ]; dmc->bypass_timing_power = dmc->timing_power[idx -1 ]; +put_node: +of_node_put (np_ddr);return ret; }
Greg Kroah-Hartman
maintainerPATCH 168/181 soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 37d838de369b07b596c19ff3662bf0293fdb09ee upstream.
of_find_matching_node() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
In brcmstb_init_sram, it pass dn to of_address_to_resource(), of_address_to_resource() will call of_find_device_by_node() to take reference, so we should release the reference returned by of_find_matching_node().
--- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + 1 file changed, 1 insertion(+)
drivers/soc/bcm/brcmstb/pm/pm-arm.c +1 -0
@@ -783,6 +783,7 @@ static int brcmstb_pm_probe(struct platf } ret =brcmstb_init_sram (dn); +of_node_put (dn);if (ret) {pr_err ("error setting up SRAM for PM\n" );return ret;
Greg Kroah-Hartman
maintainerPATCH 140/181 iio: imu: inv_icm42600: Fix broken icm42600 (chip id 0 value)
In reply to Greg Kroah-HartmanFrom: Jean-Baptiste Maneyrol <[email protected]>
commit 106b391e1b859100a3f38f0ad874236e9be06bde upstream.
The 0 value used for INV_CHIP_ICM42600 was not working since the match in i2c/spi was checking against NULL value.
To keep this check, add a first INV_CHIP_INVALID 0 value as safe guard.
--- drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/inv_icm42600/inv_icm42600.h +1 -0
@@ -17,6 +17,7 @@#include "inv_icm42600_buffer.h" enum inv_icm42600_chip { +INV_CHIP_INVALID ,INV_CHIP_ICM42600 ,INV_CHIP_ICM42602 ,INV_CHIP_ICM42605 ,
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c +1 -1
@@ -565,7 +565,7 @@ int inv_icm42600_core_probe(struct regmabool open_drain;int ret; -if (chip <0 || chip >=INV_CHIP_NB ) { +if (chip <=INV_CHIP_INVALID || chip >=INV_CHIP_NB ) {dev_err (dev,"invalid chip = %d\n" , chip);return -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 145/181 iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message
In reply to Greg Kroah-HartmanFrom: Yannick Brosseau <[email protected]>
commit 99bded02dae5e1e2312813506c41dc8db2fb656c upstream.
The check for spurious IRQs introduced in 695e2f5c289bb assumed that the bits in the control and status registers are aligned. This is true for the H7 and MP1 version, but not the F4. The interrupt was then never handled on the F4.
Instead of increasing the complexity of the comparison and check each bit specifically, we remove this check completely and rely on the generic handler for spurious IRQs.
--- drivers/iio/adc/stm32-adc.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/iio/adc/stm32-adc.c +0 -10
@@ -1407,7 +1407,6 @@ static irqreturn_t stm32_adc_threaded_isstruct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg);/* Check ovr status right now, as ovr mask should be already disabled */ if (status & regs->isr_ovr.mask) {
@@ -1422,11 +1421,6 @@ static irqreturn_t stm32_adc_threaded_isreturn IRQ_HANDLED ; } -if (!(status & mask)) -dev_err_ratelimited (&indio_dev->dev, -"Unexpected IRQ: IER=0x%08x, ISR=0x%08x\n" , - mask, status); -return IRQ_NONE ; }
@@ -1436,10 +1430,6 @@ static irqreturn_t stm32_adc_isr(int irqstruct stm32_adc *adc =iio_priv (indio_dev);const struct stm32_adc_regspec *regs = adc->cfg->regs;u32 status =stm32_adc_readl (adc, regs->isr_eoc.reg); -u32 mask =stm32_adc_readl (adc, regs->ier_eoc.reg); - -if (!(status & mask)) -return IRQ_WAKE_THREAD ;if (status & regs->isr_ovr.mask) {/*
Greg Kroah-Hartman
maintainerPATCH 166/181 ARM: exynos: Fix refcount leak in exynos_map_pmu
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit c4c79525042a4a7df96b73477feaf232fe44ae81 upstream.
of_find_matching_node() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak. of_node_put() checks null pointer.
--- arch/arm/mach-exynos/exynos.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-exynos/exynos.c +1 -0
@@ -149,6 +149,7 @@ static void exynos_map_pmu(void) np =of_find_matching_node (NULL , exynos_dt_pmu_match);if (np) pmu_base_addr =of_iomap (np,0 ); +of_node_put (np); }static void __init exynos_init_irq (void )
Greg Kroah-Hartman
maintainerPATCH 135/181 iio:accel:mxc4005: rearrange iio trigger get and register
In reply to Greg Kroah-HartmanFrom: Dmitry Rokosov <[email protected]>
commit 9354c224c9b4f55847a0de3e968cba2ebf15af3b upstream.
IIO trigger interface function iio_trigger_get() should be called after iio_trigger_register() (or its devm analogue) strictly, because of iio_trigger_get() acquires module refcnt based on the trigger->owner pointer, which is initialized inside iio_trigger_register() to THIS_MODULE.
If this call order is wrong, the next iio_trigger_put() (from sysfs callback or "delete module" path) will dereference "default" module refcnt, which is incorrect behaviour.
--- drivers/iio/accel/mxc4005.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/mxc4005.c +2 -2
@@ -456,8 +456,6 @@ static int mxc4005_probe(struct i2c_clie data->dready_trig->ops = &mxc4005_trigger_ops;iio_trigger_set_drvdata (data->dready_trig, indio_dev); - indio_dev->trig = data->dready_trig; -iio_trigger_get (indio_dev->trig); ret =devm_iio_trigger_register (&client->dev, data->dready_trig);if (ret) {
@@ -465,6 +463,8 @@ static int mxc4005_probe(struct i2c_clie "failed to register trigger\n");return ret; } + + indio_dev->trig =iio_trigger_get (data->dready_trig); }return devm_iio_device_register (&client->dev, indio_dev);