5.15.104-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 5.15.104-rc1 review
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +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.15.104-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.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.104-rc1
Lee Jones <[email protected]>
HID: uhid: Over-ride the default maximum data buffer value with our own
Lee Jones <[email protected]>
HID: core: Provide new max_buffer_size attribute to over-ride the default
Lukas Wunner <[email protected]>
PCI/DPC: Await readiness of secondary bus after reset
Lukas Wunner <[email protected]>
PCI: Unify delay handling for reset and resume
Fedor Pchelkin <[email protected]>
io_uring: avoid null-ptr-deref in io_arm_poll_handler
Janusz Krzysztofik <[email protected]>
drm/i915/active: Fix misuse of non-idle barriers as fence trackers
John Harrison <[email protected]>
drm/i915: Don't use stolen memory for ring buffers with LLC
Shawn Wang <[email protected]>
x86/resctrl: Clear staged_config[] before and after it is used
Nikita Zhandarovich <[email protected]>
x86/mm: Fix use of uninitialized buffer in sme_enable()
Yazen Ghannam <[email protected]>
x86/mce: Make sure logged MCEs are processed after sysfs update
Shawn Guo <[email protected]>
cpuidle: psci: Iterate backwards over list in psci_pd_remove()
Radu Pirea (OSS) <[email protected]>
net: phy: nxp-c45-tja11xx: fix MII_BASIC_CONFIG_REV bit
Tero Kristo <[email protected]>
trace/hwlat: Do not wipe the contents of per-cpu thread data
Helge Deller <[email protected]>
fbdev: stifb: Provide valid pixelclock and add fb_check_var() checks
Francesco Dolcini <[email protected]>
mmc: sdhci_am654: lower power-on failed message severity
David Hildenbrand <[email protected]>
mm/userfaultfd: propagate uffd-wp bit when PTE-mapping the huge zeropage
Dave Ertman <[email protected]>
ice: avoid bonding causing auxiliary plug/unplug under RTNL lock
Elmer Miroslav Mosher Golovin <[email protected]>
nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV3000
Chen Zhongjin <[email protected]>
ftrace: Fix invalid address access in lookup_rec() when index is 0
Paolo Abeni <[email protected]>
mptcp: fix lockdep false positive in mptcp_pm_nl_create_listen_socket()
Matthieu Baerts <[email protected]>
mptcp: avoid setting TCP_CLOSE state twice
Geliang Tang <[email protected]>
mptcp: add ro_after_init for tcp{,v6}_prot_override
Paolo Abeni <[email protected]>
mptcp: fix possible deadlock in subflow_error_report
Błażej Szczygieł <[email protected]>
drm/amd/pm: Fix sienna cichlid incorrect OD volage after resume
Johan Hovold <[email protected]>
drm/sun4i: fix missing component unbind on bind errors
Dmitry Osipenko <[email protected]>
drm/shmem-helper: Remove another errant put in error path
Guo Ren <[email protected]>
riscv: asid: Fixup stale TLB entry cause application crash
Sergey Matyukevich <[email protected]>
Revert "riscv: mm: notify remote harts about mmu cache updates"
Hamidreza H. Fard <[email protected]>
ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book2 Pro
Bard Liao <[email protected]>
ALSA: hda: intel-dsp-config: add MTL PCI id
Paolo Bonzini <[email protected]>
KVM: nVMX: add missing consistency checks for CR0 and CR4
Volker Lendecke <[email protected]>
cifs: Fix smb2_set_path_size()
Steven Rostedt (Google) <[email protected]>
tracing: Make tracepoint lockdep check actually test something
Steven Rostedt (Google) <[email protected]>
tracing: Check field value in hist_field_name()
Sung-hun Kim <[email protected]>
tracing: Make splice_read available again
Johan Hovold <[email protected]>
interconnect: exynos: fix node leak in probe PM QoS error path
Johan Hovold <[email protected]>
interconnect: fix mem leak when freeing nodes
Sven Schnelle <[email protected]>
s390/ipl: add missing intersection check to ipl_report handling
Roman Gushchin <[email protected]>
firmware: xilinx: don't make a sleepable memory allocation from an atomic context
Johan Hovold <[email protected]>
serial: 8250_fsl: fix handle_irq locking
Biju Das <[email protected]>
serial: 8250_em: Fix UART port type
Sherry Sun <[email protected]>
tty: serial: fsl_lpuart: skip waiting for transmission complete when UARTCTRL_SBK is asserted
Theodore Ts'o <[email protected]>
ext4: fix possible double unlock when moving a directory
Alex Hung <[email protected]>
drm/amd/display: fix shift-out-of-bounds in CalculateVMAndRowBytes
Michael Karcher <[email protected]>
sh: intc: Avoid spurious sizeof-pointer-div warning
Eric Van Hensbergen <[email protected]>
net/9p: fix bug in client create for .L
Qu Huang <[email protected]>
drm/amdkfd: Fix an illegal memory access
Baokun Li <[email protected]>
ext4: fix task hung in ext4_xattr_delete_inode
Baokun Li <[email protected]>
ext4: update s_journal_inum if it changes after journal replay
Baokun Li <[email protected]>
ext4: fail ext4_iget if special inode unallocated
David Gow <[email protected]>
rust: arch/um: Disable FP/SIMD instruction to match x86
Yifei Liu <[email protected]>
jffs2: correct logic when creating a hole in jffs2_write_begin
Tobias Schramm <[email protected]>
mmc: atmel-mci: fix race between stop command and start of next command
Linus Torvalds <[email protected]>
media: m5mols: fix off-by-one loop termination error
Lars-Peter Clausen <[email protected]>
hwmon: (ltc2992) Set can_sleep flag for GPIO chip
Lars-Peter Clausen <[email protected]>
hwmon: (adm1266) Set can_sleep flag for GPIO chip
Jurica Vukadin <[email protected]>
kconfig: Update config changed flag before calling callback
Krzysztof Kozlowski <[email protected]>
hwmon: tmp512: drop of_match_ptr for ID table
Lars-Peter Clausen <[email protected]>
hwmon: (ucd90320) Add minimum delay between bus accesses
Marcus Folkesson <[email protected]>
hwmon: (ina3221) return prober error code
Zheng Wang <[email protected]>
hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to race condition
Tony O'Brien <[email protected]>
hwmon: (adt7475) Fix masking of hysteresis registers
Tony O'Brien <[email protected]>
hwmon: (adt7475) Display smoothing attributes in correct order
Nikolay Aleksandrov <[email protected]>
bonding: restore bond's IFF_SLAVE flag if a non-eth dev enslave fails
Nikolay Aleksandrov <[email protected]>
bonding: restore IFF_MASTER/SLAVE flags on bond enslave ether type change
Liang He <[email protected]>
ethernet: sun: add check for the mdesc_grab()
Daniil Tatianin <[email protected]>
qed/qed_mng_tlv: correctly zero out ->min instead of ->hour
Po-Hsu Lin <[email protected]>
selftests: net: devlink_port_split.py: skip test if no suitable device available
Alexandra Winter <[email protected]>
net/iucv: Fix size of interrupt data
Szymon Heidrich <[email protected]>
net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
Ido Schimmel <[email protected]>
ipv4: Fix incorrect table ID in IOCTL path
Wolfram Sang <[email protected]>
sh_eth: avoid PHY being resumed when interface is not up
Wolfram Sang <[email protected]>
ravb: avoid PHY being resumed when interface is not up
Vladimir Oltean <[email protected]>
net: dsa: mv88e6xxx: fix max_mtu of 1492 on 6165, 6191, 6220, 6250, 6290
Maciej Fijalkowski <[email protected]>
ice: xsk: disable txq irq before flushing hw
Liang He <[email protected]>
block: sunvdc: add check for mdesc_grab() returning NULL
Damien Le Moal <[email protected]>
nvmet: avoid potential UAF in nvmet_req_complete()
Ming Lei <[email protected]>
nvme: fix handling single range discard request
Damien Le Moal <[email protected]>
block: null_blk: Fix handling of fake timeout request
Liu Ying <[email protected]>
drm/bridge: Fix returned array size name for atomic_get_input_bus_fmts kdoc
Szymon Heidrich <[email protected]>
net: usb: smsc75xx: Limit packet length to skb->len
Wenjia Zhang <[email protected]>
net/smc: fix deadlock triggered by cancel_delayed_work_syn()
Zheng Wang <[email protected]>
nfc: st-nci: Fix use after free bug in ndlc_remove due to race condition
Heiner Kallweit <[email protected]>
net: phy: smsc: bail out in lan87xx_read_status if genphy_read_status fails
Eric Dumazet <[email protected]>
net: tunnels: annotate lockless accesses to dev->needed_headroom
Bart Van Assche <[email protected]>
loop: Fix use-after-free issues
Arınç ÜNAL <[email protected]>
net: dsa: mt7530: set PLL frequency and trgmii only when trgmii is used
Arınç ÜNAL <[email protected]>
net: dsa: mt7530: remove now incorrect comment regarding port 5
Daniil Tatianin <[email protected]>
qed/qed_dev: guard against a possible division by zero
D. Wythe <[email protected]>
net/smc: fix NULL sndbuf_desc in smc_cdc_tx_handler()
Jouni Högander <[email protected]>
drm/i915/psr: Use calculated io and fast wake lines
Tom Rix <[email protected]>
drm/i915/display: clean up comments
José Roberto de Souza <[email protected]>
drm/i915/display/psr: Handle plane and pipe restrictions at every page flip
José Roberto de Souza <[email protected]>
drm/i915/display/psr: Use drm damage helpers to calculate plane damaged area
José Roberto de Souza <[email protected]>
drm/i915/display: Workaround cursor left overs with PSR2 selective fetch enabled
Niklas Schnelle <[email protected]>
PCI: s390: Fix use-after-free of PCI resources with per-function hotplug
Eugenio Pérez <[email protected]>
vdpa_sim: set last_used_idx as last_avail_idx in vdpasim_queue_ready
Eugenio Pérez <[email protected]>
vdpa_sim: not reset state in vdpasim_queue_ready
Ivan Vecera <[email protected]>
i40e: Fix kernel crash during reboot when adapter is in recovery mode
Jianguo Wu <[email protected]>
ipvlan: Make skb->skb_iif track skb->dev for l3s mode
Fedor Pchelkin <[email protected]>
nfc: pn533: initialize struct pn533_out_arg properly
Breno Leitao <[email protected]>
tcp: tcp_make_synack() can be called from process context
Bart Van Assche <[email protected]>
scsi: core: Fix a procfs host directory removal regression
Jeremy Sowden <[email protected]>
netfilter: nft_redir: correct value of inet type .maxattrs
Jeremy Sowden <[email protected]>
netfilter: nft_redir: correct length for loading protocol registers
Jeremy Sowden <[email protected]>
netfilter: nft_masq: correct length for loading protocol registers
Jeremy Sowden <[email protected]>
netfilter: nft_nat: correct length for loading protocol registers
Bjorn Helgaas <[email protected]>
ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU()
Wenchao Hao <[email protected]>
scsi: mpt3sas: Fix NULL pointer access in mpt3sas_transport_port_add()
Glenn Washburn <[email protected]>
docs: Correct missing "d_" prefix for dentry_operations member d_weak_revalidate
Randy Dunlap <[email protected]>
clk: HI655X: select REGMAP instead of depending on it
Christian Hewitt <[email protected]>
drm/meson: fix 1px pink line on GXM when scaling video overlay
Zhang Xiaoxu <[email protected]>
cifs: Move the in_send statistic to __smb_send_rqst()
Dmitry Osipenko <[email protected]>
drm/panfrost: Don't sync rpm suspension after mmu flushing
Herbert Xu <[email protected]>
xfrm: Allow transport-mode states with AF_UNSPEC selector
-------------
Diffstat:
Documentation/filesystems/vfs.rst | 2 +- Makefile | 4 +- arch/riscv/include/asm/mmu.h | 2 - arch/riscv/include/asm/tlbflush.h | 18 -- arch/riscv/mm/context.c | 40 ++-- arch/riscv/mm/tlbflush.c | 28 +-- arch/s390/boot/ipl_report.c | 8 + arch/s390/pci/pci.c | 16 +- arch/s390/pci/pci_bus.c | 12 +- arch/s390/pci/pci_bus.h | 3 +- arch/x86/Makefile.um | 6 + arch/x86/kernel/cpu/mce/core.c | 1 + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 7 +- arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 25 ++- arch/x86/kvm/vmx/nested.c | 10 +- arch/x86/mm/mem_encrypt_identity.c | 3 +- drivers/block/loop.c | 25 ++- drivers/block/null_blk/main.c | 6 +- drivers/block/sunvdc.c | 2 + drivers/clk/Kconfig | 2 +- drivers/cpuidle/cpuidle-psci-domain.c | 3 +- drivers/firmware/xilinx/zynqmp.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 9 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 5 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 43 ++++- drivers/gpu/drm/drm_gem_shmem_helper.c | 9 +- drivers/gpu/drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/display/intel_psr.c | 207 +++++++++++++++------ drivers/gpu/drm/i915/gt/intel_ring.c | 2 +- drivers/gpu/drm/i915/i915_active.c | 24 +-- drivers/gpu/drm/meson/meson_vpp.c | 2 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +- drivers/hid/hid-core.c | 18 +- drivers/hid/uhid.c | 1 + drivers/hwmon/adt7475.c | 8 +- drivers/hwmon/ina3221.c | 2 +- drivers/hwmon/ltc2992.c | 1 + drivers/hwmon/pmbus/adm1266.c | 1 + drivers/hwmon/pmbus/ucd9000.c | 75 ++++++++ drivers/hwmon/tmp513.c | 2 +- drivers/hwmon/xgene-hwmon.c | 1 + drivers/interconnect/core.c | 4 + drivers/interconnect/samsung/exynos.c | 6 +- drivers/media/i2c/m5mols/m5mols_core.c | 2 +- drivers/mmc/host/atmel-mci.c | 3 - drivers/mmc/host/sdhci_am654.c | 2 +- drivers/net/bonding/bond_main.c | 23 ++- drivers/net/dsa/mt7530.c | 64 +++---- drivers/net/dsa/mv88e6xxx/chip.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + drivers/net/ethernet/intel/ice/ice.h | 14 +- drivers/net/ethernet/intel/ice/ice_main.c | 19 +- drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 + drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 12 +- drivers/net/ethernet/renesas/sh_eth.c | 12 +- drivers/net/ethernet/sun/ldmvsw.c | 3 + drivers/net/ethernet/sun/sunvnet.c | 3 + drivers/net/ipvlan/ipvlan_l3s.c | 1 + drivers/net/phy/nxp-c45-tja11xx.c | 2 +- drivers/net/phy/smsc.c | 5 +- drivers/net/usb/smsc75xx.c | 7 + drivers/nfc/pn533/usb.c | 1 + drivers/nfc/st-nci/ndlc.c | 6 +- drivers/nvme/host/core.c | 28 ++- drivers/nvme/host/pci.c | 2 + drivers/nvme/target/core.c | 4 +- drivers/pci/bus.c | 21 +++ drivers/pci/pci-driver.c | 4 +- drivers/pci/pci.c | 57 +++--- drivers/pci/pci.h | 16 +- drivers/pci/pcie/dpc.c | 4 +- drivers/scsi/hosts.c | 3 - drivers/scsi/mpt3sas/mpt3sas_transport.c | 14 +- drivers/tty/serial/8250/8250_em.c | 4 +- drivers/tty/serial/8250/8250_fsl.c | 4 +- drivers/tty/serial/fsl_lpuart.c | 12 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 13 ++ drivers/video/fbdev/stifb.c | 27 +++ fs/cifs/smb2inode.c | 31 ++- fs/cifs/transport.c | 21 +-- fs/ext4/inode.c | 18 +- fs/ext4/namei.c | 4 +- fs/ext4/super.c | 7 +- fs/ext4/xattr.c | 11 ++ fs/jffs2/file.c | 15 +- include/drm/drm_bridge.h | 4 +- include/linux/hid.h | 3 + include/linux/netdevice.h | 6 +- include/linux/pci.h | 1 + include/linux/sh_intc.h | 5 +- include/linux/tracepoint.h | 15 +- io_uring/io_uring.c | 4 +- kernel/trace/ftrace.c | 3 +- kernel/trace/trace.c | 2 + kernel/trace/trace_events_hist.c | 3 + kernel/trace/trace_hwlat.c | 3 - mm/huge_memory.c | 6 +- net/9p/client.c | 2 +- net/ipv4/fib_frontend.c | 3 + net/ipv4/ip_tunnel.c | 12 +- net/ipv4/tcp_output.c | 2 +- net/ipv6/ip6_tunnel.c | 4 +- net/iucv/iucv.c | 2 +- net/mptcp/pm_netlink.c | 16 ++ net/mptcp/subflow.c | 12 +- net/netfilter/nft_masq.c | 2 +- net/netfilter/nft_nat.c | 2 +- net/netfilter/nft_redir.c | 4 +- net/smc/smc_cdc.c | 3 + net/smc/smc_core.c | 2 +- net/xfrm/xfrm_state.c | 3 - scripts/kconfig/confdata.c | 6 +- sound/hda/intel-dsp-config.c | 9 + sound/pci/hda/hda_intel.c | 5 +- sound/pci/hda/patch_realtek.c | 1 + tools/testing/selftests/net/devlink_port_split.py | 36 +++- 120 files changed, 925 insertions(+), 439 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/115 xfrm: Allow transport-mode states with AF_UNSPEC selector
From: Herbert Xu <[email protected]>
[ Upstream commit c276a706ea1f51cf9723ed8484feceaf961b8f89 ]
xfrm state selectors are matched against the inner-most flow which can be of any address family. Therefore middle states in nested configurations need to carry a wildcard selector in order to work at all.
However, this is currently forbidden for transport-mode states.
Fix this by removing the unnecessary check.
--- net/xfrm/xfrm_state.c | 3 --- 1 file changed, 3 deletions(-)
net/xfrm/xfrm_state.c +0 -3
@@ -2643,9 +2643,6 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload)if (inner_mode ==NULL ) goto error; -if (!(inner_mode->flags &XFRM_MODE_FLAG_TUNNEL )) - goto error; - x->inner_mode = *inner_mode;if (x->props.family ==AF_INET )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 2/115 drm/panfrost: Dont sync rpm suspension after mmu flushing
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit ba3be66f11c3c49afaa9f49b99e21d88756229ef ]
Lockdep warns about potential circular locking dependency of devfreq with the fs_reclaim caused by immediate device suspension when mapping is released by shrinker. Fix it by doing the suspension asynchronously.
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -1
@@ -253,7 +253,7 @@ static void panfrost_mmu_flush_range(struct panfrost_device *pfdev,if (pm_runtime_active (pfdev->dev))mmu_hw_do_operation (pfdev, mmu, iova, size,AS_COMMAND_FLUSH_PT ); -pm_runtime_put_sync_autosuspend (pfdev->dev); +pm_runtime_put_autosuspend (pfdev->dev); } static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 3/115 cifs: Move the in_send statistic to __smb_send_rqst()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
[ Upstream commit d0dc41119905f740e8d5594adce277f7c0de8c92 ]
When send SMB_COM_NT_CANCEL and RFC1002_SESSION_REQUEST, the in_send statistic was lost.
Let's move the in_send statistic to the send function to avoid this scenario.
--- fs/cifs/transport.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
fs/cifs/transport.c +9 -12
@@ -299,7 +299,7 @@ static int __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, struct smb_rqst *rqst) { - int rc = 0; + int rc;struct kvec *iov;int n_vec;unsigned int send_length =0 ;
@@ -310,6 +310,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,struct msghdr smb_msg = {};__be32 rfc1002_marker; +cifs_in_send_inc (server);if (cifs_rdma_enabled (server)) {/* return -EAGAIN when connecting or reconnecting */ rc = -EAGAIN ;
@@ -318,14 +319,17 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, goto smbd_done; } + rc = -EAGAIN ;if (ssocket ==NULL ) -return -EAGAIN ; + goto out; + rc = -ERESTARTSYS ;if (fatal_signal_pending (current)) {cifs_dbg (FYI ,"signal pending before send request\n" ); -return -ERESTARTSYS ; + goto out; } + rc =0 ;/* cork the socket */ tcp_sock_set_cork (ssocket->sk, true);
@@ -438,7 +442,8 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, rc); else if (rc > 0) rc =0 ; - +out: +cifs_in_send_dec (server);return rc; }
@@ -855,9 +860,7 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,* I/O response may come back and free the mid entry on another thread. */ cifs_save_when_sent (mid); -cifs_in_send_inc (server); rc =smb_send_rqst (server,1 , rqst, flags); -cifs_in_send_dec (server);if (rc <0 ) {revert_current_mid (server, mid->credits);
@@ -1149,9 +1152,7 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,else midQ[i]->callback = cifs_compound_last_callback; } -cifs_in_send_inc (server); rc =smb_send_rqst (server, num_rqst, rqst, flags); -cifs_in_send_dec (server);for (i =0 ; i < num_rqst; i++)cifs_save_when_sent (midQ[i]);
@@ -1388,9 +1389,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, midQ->mid_state =MID_REQUEST_SUBMITTED ; -cifs_in_send_inc (server); rc =smb_send (server, in_buf, len); -cifs_in_send_dec (server);cifs_save_when_sent (midQ);if (rc <0 )
@@ -1527,9 +1526,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, } midQ->mid_state =MID_REQUEST_SUBMITTED ; -cifs_in_send_inc (server); rc =smb_send (server, in_buf, len); -cifs_in_send_dec (server);cifs_save_when_sent (midQ);if (rc <0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 4/115 drm/meson: fix 1px pink line on GXM when scaling video overlay
In reply to Greg Kroah-HartmanFrom: Christian Hewitt <[email protected]>
[ Upstream commit 5c8cf1664f288098a971a1d1e65716a2b6a279e1 ]
Playing media with a resolution smaller than the crtc size requires the video overlay to be scaled for output and GXM boards display a 1px pink line on the bottom of the scaled overlay. Comparing with the downstream vendor driver revealed VPP_DUMMY_DATA not being set [0].
Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen.
[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869
--- drivers/gpu/drm/meson/meson_vpp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/meson/meson_vpp.c +2 -0
@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv) priv->io_base + _REG(VPP_DOLBY_CTRL));writel_relaxed (0x1020080 , priv->io_base +_REG (VPP_DUMMY_DATA1 )); +writel_relaxed (0x42020 , + priv->io_base +_REG (VPP_DUMMY_DATA )); }else if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A ))writel_relaxed (0xf , priv->io_base +_REG (DOLBY_PATH_CTRL ));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 5/115 clk: HI655X: select REGMAP instead of depending on it
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 0ffad67784a097beccf34d297ddd1b0773b3b8a3 ]
REGMAP is a hidden (not user visible) symbol. Users cannot set it directly thru "make *config", so drivers should select it instead of depending on it if they need it.
Consistently using "select" or "depends on" can also help reduce Kconfig circular dependency issues.
Therefore, change the use of "depends on REGMAP" to "select REGMAP".
--- drivers/clk/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/Kconfig +1 -1
@@ -83,7 +83,7 @@ config COMMON_CLK_RK808 config COMMON_CLK_HI655X tristate "Clock driver for Hi655x" if EXPERT depends on (MFD_HI655X_PMIC || COMPILE_TEST) - depends on REGMAP + select REGMAP default MFD_HI655X_PMIC help This driver supports the hi655x PMIC clock. This
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 6/115 docs: Correct missing "d_" prefix for dentry_operations member d_weak_revalidate
In reply to Greg Kroah-HartmanFrom: Glenn Washburn <[email protected]>
[ Upstream commit 74596085796fae0cfce3e42ee46bf4f8acbdac55 ]
The details for struct dentry_operations member d_weak_revalidate is missing a "d_" prefix.
--- Documentation/filesystems/vfs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/filesystems/vfs.rst +1 -1
@@ -1210,7 +1210,7 @@ defined: return -ECHILD and it will be called again in ref-walk mode. -``_weak_revalidate`` +``d_weak_revalidate`` called when the VFS needs to revalidate a "jumped" dentry. This is called when a path-walk ends at dentry that was not acquired by doing a lookup in the parent directory. This includes "/",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 7/115 scsi: mpt3sas: Fix NULL pointer access in mpt3sas_transport_port_add()
In reply to Greg Kroah-HartmanFrom: Wenchao Hao <[email protected]>
[ Upstream commit d3c57724f1569311e4b81e98fad0931028b9bdcd ]
Port is allocated by sas_port_alloc_num() and rphy is allocated by either sas_end_device_alloc() or sas_expander_alloc(), all of which may return NULL. So we need to check the rphy to avoid possible NULL pointer access.
If sas_rphy_add() returned with failure, rphy is set to NULL. We would access the rphy in the following lines which would also result NULL pointer access.
--- drivers/scsi/mpt3sas/mpt3sas_transport.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_transport.c +12 -2
@@ -785,7 +785,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, goto out_fail; } port =sas_port_alloc_num (sas_node->parent_dev); -if ((sas_port_add (port))) { +if (!port || (sas_port_add (port))) {ioc_err (ioc,"failure at %s:%d/%s()!\n" , __FILE__, __LINE__, __func__); goto out_fail;
@@ -824,6 +824,12 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, mpt3sas_port->remote_identify.sas_address; } +if (!rphy) { +ioc_err (ioc,"failure at %s:%d/%s()!\n" , + __FILE__, __LINE__, __func__); + goto out_delete_port; + } + rphy->identify = mpt3sas_port->remote_identify;if ((sas_rphy_add (rphy))) {
@@ -831,6 +837,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, __FILE__, __LINE__, __func__);sas_rphy_free (rphy); rphy =NULL ; + goto out_delete_port; }if (mpt3sas_port->remote_identify.device_type ==SAS_END_DEVICE ) {
@@ -857,7 +864,10 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, rphy_to_expander_device(rphy), hba_port->port_id);return mpt3sas_port; - out_fail: +out_delete_port: +sas_port_delete (port); + +out_fail:list_for_each_entry_safe (mpt3sas_phy, next, &mpt3sas_port->phy_list, port_siblings)list_del (&mpt3sas_phy->port_siblings);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 8/115 ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU()
In reply to Greg Kroah-HartmanFrom: Bjorn Helgaas <[email protected]>
[ Upstream commit ff447886e675979d66b2bc01810035d3baea1b3a ]
CONTROLLER_IN_GPU() is clearly intended to match only Intel devices, but previously it checked only the PCI Device ID, not the Vendor ID, so it could match devices from other vendors that happened to use the same Device ID.
Update CONTROLLER_IN_GPU() so it matches only Intel devices.
--- sound/pci/hda/hda_intel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/hda/hda_intel.c +3 -2
@@ -331,14 +331,15 @@ enum {#define needs_eld_notify_link (chip) false#endif -#define CONTROLLER_IN_GPU (pci) (((pci)->device == 0x0a0c) || \ +#define CONTROLLER_IN_GPU (pci) (((pci)->vendor == 0x8086) && \ + (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \ ((pci)->device == 0x160c) || \ ((pci)->device == 0x490d) || \ ((pci)->device == 0x4f90) || \ ((pci)->device == 0x4f91) || \ - ((pci)->device == 0x4f92)) + ((pci)->device == 0x4f92)))#define IS_BXT (pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 9/115 netfilter: nft_nat: correct length for loading protocol registers
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 068d82e75d537b444303b8c449a11e51ea659565 ]
The values in the protocol registers are two bytes wide. However, when parsing the register loads, the code currently uses the larger 16-byte size of a union nf_inet_addr. Change it to use the (correct) size of a union nf_conntrack_man_proto instead.
--- net/netfilter/nft_nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_nat.c +1 -1
@@ -226,7 +226,7 @@ static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr, priv->flags |=NF_NAT_RANGE_MAP_IPS ; } - plen = sizeof_field(struct nf_nat_range, min_addr.all); + plen = sizeof_field(struct nf_nat_range, min_proto.all);if (tb[NFTA_NAT_REG_PROTO_MIN ]) { err =nft_parse_register_load (tb[NFTA_NAT_REG_PROTO_MIN ], &priv->sreg_proto_min, plen);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 10/115 netfilter: nft_masq: correct length for loading protocol registers
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit ec2c5917eb858428b2083d1c74f445aabbe8316b ]
The values in the protocol registers are two bytes wide. However, when parsing the register loads, the code currently uses the larger 16-byte size of a union nf_inet_addr. Change it to use the (correct) size of a union nf_conntrack_man_proto instead.
--- net/netfilter/nft_masq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_masq.c +1 -1
@@ -43,7 +43,7 @@ static int nft_masq_init(const struct nft_ctx *ctx,const struct nft_expr *expr, const struct nlattr * const tb[]) { - u32 plen = sizeof_field(struct nf_nat_range, min_addr.all); + u32 plen = sizeof_field(struct nf_nat_range, min_proto.all);struct nft_masq *priv =nft_expr_priv (expr);int err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 11/115 netfilter: nft_redir: correct length for loading protocol registers
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 1f617b6b4c7a3d5ea7a56abb83a4c27733b60c2f ]
The values in the protocol registers are two bytes wide. However, when parsing the register loads, the code currently uses the larger 16-byte size of a union nf_inet_addr. Change it to use the (correct) size of a union nf_conntrack_man_proto instead.
--- net/netfilter/nft_redir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_redir.c +1 -1
@@ -48,7 +48,7 @@ static int nft_redir_init(const struct nft_ctx *ctx,unsigned int plen;int err; - plen = sizeof_field(struct nf_nat_range, min_addr.all); + plen = sizeof_field(struct nf_nat_range, min_proto.all);if (tb[NFTA_REDIR_REG_PROTO_MIN ]) { err =nft_parse_register_load (tb[NFTA_REDIR_REG_PROTO_MIN ], &priv->sreg_proto_min, plen);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 12/115 netfilter: nft_redir: correct value of inet type `.maxattrs`
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 493924519b1fe3faab13ee621a43b0d0939abab1 ]
nft_redir_inet_type.maxattrs was being set, presumably because of a cut-and-paste error, to NFTA_MASQ_MAX, instead of NFTA_REDIR_MAX.
--- net/netfilter/nft_redir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_redir.c +1 -1
@@ -232,7 +232,7 @@ static struct nft_expr_type nft_redir_inet_type __read_mostly = { .name = "redir", .ops = &nft_redir_inet_ops, .policy = nft_redir_policy, - .maxattr = NFTA_MASQ_MAX, + .maxattr = NFTA_REDIR_MAX, .owner = THIS_MODULE, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 13/115 scsi: core: Fix a procfs host directory removal regression
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit be03df3d4bfe7e8866d4aa43d62e648ffe884f5f ]
scsi_proc_hostdir_rm() decreases a reference counter and hence must only be called once per host that is removed. This change does not require a scsi_add_host_with_dma() change since scsi_add_host_with_dma() will return 0 (success) if scsi_proc_host_add() is called.
--- drivers/scsi/hosts.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/hosts.c +0 -3
@@ -322,9 +322,6 @@ static void scsi_host_dev_release(struct device *dev)struct Scsi_Host *shost =dev_to_shost (dev);struct device *parent = dev->parent; -/* In case scsi_remove_host() has not been called. */ -scsi_proc_hostdir_rm (shost->hostt); -/* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */ rcu_barrier ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/115 tcp: tcp_make_synack() can be called from process context
In reply to Greg Kroah-HartmanFrom: Breno Leitao <[email protected]>
[ Upstream commit bced3f7db95ff2e6ca29dc4d1c9751ab5e736a09 ]
tcp_rtx_synack() now could be called in process context as explained in 0a375c822497 ("tcp: tcp_rtx_synack() can be called from process context").
tcp_rtx_synack() might call tcp_make_synack(), which will touch per-CPU variables with preemption enabled. This causes the following BUG:
BUG: using __this_cpu_add() in preemptible [00000000] code: ThriftIO1/5464
caller is tcp_make_synack+0x841/0xac0
Call Trace:
<TASK>
dump_stack_lvl+0x10d/0x1a0
check_preemption_disabled+0x104/0x110
tcp_make_synack+0x841/0xac0
tcp_v6_send_synack+0x5c/0x450
tcp_rtx_synack+0xeb/0x1f0
inet_rtx_syn_ack+0x34/0x60
tcp_check_req+0x3af/0x9e0
tcp_rcv_state_process+0x59b/0x2030
tcp_v6_do_rcv+0x5f5/0x700
release_sock+0x3a/0xf0
tcp_sendmsg+0x33/0x40
____sys_sendmsg+0x2f2/0x490
__sys_sendmsg+0x184/0x230
do_syscall_64+0x3d/0x90Avoid calling __TCP_INC_STATS() with will touch per-cpu variables. Use TCP_INC_STATS() which is safe to be called from context switch.
--- net/ipv4/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_output.c +1 -1
@@ -3610,7 +3610,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst, th->window =htons (min (req->rsk_rcv_wnd,65535U ));tcp_options_write ((__be32 *)(th +1 ),NULL , &opts); th->doff = (tcp_header_size >>2 ); -__TCP_INC_STATS (sock_net (sk),TCP_MIB_OUTSEGS ); +TCP_INC_STATS (sock_net (sk),TCP_MIB_OUTSEGS );#ifdef CONFIG_TCP_MD5SIG /* Okay, we have all we need - do the md5 hash if needed */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/115 nfc: pn533: initialize struct pn533_out_arg properly
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 484b7059796e3bc1cb527caa61dfc60da649b4f6 ]
struct pn533_out_arg used as a temporary context for out_urb is not initialized properly. Its uninitialized 'phy' field can be dereferenced in error cases inside pn533_out_complete() callback function. It causes the following failure:
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 6.2.0-rc3-next-20230110-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:pn533_out_complete.cold+0x15/0x44 drivers/nfc/pn533/usb.c:441 Call Trace: <IRQ> __usb_hcd_giveback_urb+0x2b6/0x5c0 drivers/usb/core/hcd.c:1671 usb_hcd_giveback_urb+0x384/0x430 drivers/usb/core/hcd.c:1754 dummy_timer+0x1203/0x32d0 drivers/usb/gadget/udc/dummy_hcd.c:1988 call_timer_fn+0x1da/0x800 kernel/time/timer.c:1700 expire_timers+0x234/0x330 kernel/time/timer.c:1751 __run_timers kernel/time/timer.c:2022 [inline] __run_timers kernel/time/timer.c:1995 [inline] run_timer_softirq+0x326/0x910 kernel/time/timer.c:2035 __do_softirq+0x1fb/0xaf6 kernel/softirq.c:571 invoke_softirq kernel/softirq.c:445 [inline] __irq_exit_rcu+0x123/0x180 kernel/softirq.c:650 irq_exit_rcu+0x9/0x20 kernel/softirq.c:662 sysvec_apic_timer_interrupt+0x97/0xc0 arch/x86/kernel/apic/apic.c:1107
Initialize the field with the pn533_usb_phy currently used.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/nfc/pn533/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/pn533/usb.c +1 -0
@@ -175,6 +175,7 @@ static int pn533_usb_send_frame(struct pn533 *dev,print_hex_dump_debug ("PN533 TX: " ,DUMP_PREFIX_NONE ,16 ,1 , out->data, out->len, false); + arg.phy = phy;init_completion (&arg.done); cntx = phy->out_urb->context; phy->out_urb->context = &arg;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/115 ipvlan: Make skb->skb_iif track skb->dev for l3s mode
In reply to Greg Kroah-HartmanFrom: Jianguo Wu <[email protected]>
[ Upstream commit 59a0b022aa249e3f5735d93de0849341722c4754 ]
For l3s mode, skb->dev is set to ipvlan interface in ipvlan_nf_input():
skb->dev = addr->master->dev
but, skb->skb_iif remain unchanged, this will cause socket lookup failed if a target socket is bound to a interface, like the following example:
ip link add ipvlan0 link eth0 type ipvlan mode l3s ip addr add dev ipvlan0 192.168.124.111/24 ip link set ipvlan0 up
ping -c 1 -I ipvlan0 8.8.8.8
100% packet loss
This is because there is no match sk in __raw_v4_lookup() as sk->sk_bound_dev_if != dif(skb->skb_iif). Fix this by make skb->skb_iif track skb->dev in ipvlan_nf_input().
--- drivers/net/ipvlan/ipvlan_l3s.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ipvlan/ipvlan_l3s.c +1 -0
@@ -101,6 +101,7 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, goto out; skb->dev = addr->master->dev; + skb->skb_iif = skb->dev->ifindex; len = skb->len +ETH_HLEN ;ipvlan_count_rx (addr->master, len, true, false); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/115 i40e: Fix kernel crash during reboot when adapter is in recovery mode
In reply to Greg Kroah-HartmanFrom: Ivan Vecera <[email protected]>
[ Upstream commit 7e4f8a0c495413a50413e8c9f1032ce1bc633bae ]
If the driver detects during probe that firmware is in recovery mode then i40e_init_recovery_mode() is called and the rest of probe function is skipped including pci_set_drvdata(). Subsequent i40e_shutdown() called during shutdown/reboot dereferences NULL pointer as pci_get_drvdata() returns NULL.
To fix call pci_set_drvdata() also during entering to recovery mode.
Reproducer:
1) Lets have i40e NIC with firmware in recovery mode
2) Run reboot
Result:
[ 139.084698] i40e: Intel(R) Ethernet Connection XL710 Network Driver [ 139.090959] i40e: Copyright (c) 2013 - 2019 Intel Corporation. [ 139.108438] i40e 0000:02:00.0: Firmware recovery mode detected. Limiting functionality. [ 139.116439] i40e 0000:02:00.0: Refer to the Intel(R) Ethernet Adapters and Devices User Guide for details on firmware recovery mode. [ 139.129499] i40e 0000:02:00.0: fw 8.3.64775 api 1.13 nvm 8.30 0x8000b78d 1.3106.0 [8086:1583] [15d9:084a] [ 139.215932] i40e 0000:02:00.0 enp2s0f0: renamed from eth0 [ 139.223292] i40e 0000:02:00.1: Firmware recovery mode detected. Limiting functionality. [ 139.231292] i40e 0000:02:00.1: Refer to the Intel(R) Ethernet Adapters and Devices User Guide for details on firmware recovery mode. [ 139.244406] i40e 0000:02:00.1: fw 8.3.64775 api 1.13 nvm 8.30 0x8000b78d 1.3106.0 [8086:1583] [15d9:084a] [ 139.329209] i40e 0000:02:00.1 enp2s0f1: renamed from eth0 ... [ 156.311376] BUG: kernel NULL pointer dereference, address: 00000000000006c2 [ 156.318330] #PF: supervisor write access in kernel mode [ 156.323546] #PF: error_code(0x0002) - not-present page [ 156.328679] PGD 0 P4D 0 [ 156.331210] Oops: 0002 [#1] PREEMPT SMP NOPTI [ 156.335567] CPU: 26 PID: 15119 Comm: reboot Tainted: G E 6.2.0+ #1 [ 156.343126] Hardware name: Abacus electric, s.r.o. - [email protected] Super Server/H12SSW-iN, BIOS 2.4 04/13/2022 [ 156.353369] RIP: 0010:i40e_shutdown+0x15/0x130 [i40e] [ 156.358430] Code: c1 fc ff ff 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa 0f 1f 44 00 00 55 48 89 fd 53 48 8b 9f 48 01 00 00 <f0> 80 8b c2 06 00 00 04 f0 80 8b c0 06 00 00 08 48 8d bb 08 08 00 [ 156.377168] RSP: 0018:ffffb223c8447d90 EFLAGS: 00010282 [ 156.382384] RAX: ffffffffc073ee70 RBX: 0000000000000000 RCX: 0000000000000001 [ 156.389510] RDX: 0000000080000001 RSI: 0000000000000246 RDI: ffff95db49988000 [ 156.396634] RBP: ffff95db49988000 R08: ffffffffffffffff R09: ffffffff8bd17d40 [ 156.403759] R10: 0000000000000001 R11: ffffffff8a5e3d28 R12: ffff95db49988000 [ 156.410882] R13: ffffffff89a6fe17 R14: ffff95db49988150 R15: 0000000000000000 [ 156.418007] FS: 00007fe7c0cc3980(0000) GS:ffff95ea8ee80000(0000) knlGS:0000000000000000 [ 156.426083] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 156.431819] CR2: 00000000000006c2 CR3: 00000003092fc005 CR4: 0000000000770ee0 [ 156.438944] PKRU: 55555554 [ 156.441647] Call Trace: [ 156.444096] <TASK> [ 156.446199] pci_device_shutdown+0x38/0x60 [ 156.450297] device_shutdown+0x163/0x210 [ 156.454215] kernel_restart+0x12/0x70 [ 156.457872] __do_sys_reboot+0x1ab/0x230 [ 156.461789] ? vfs_writev+0xa6/0x1a0 [ 156.465362] ? __pfx_file_free_rcu+0x10/0x10 [ 156.469635] ? __call_rcu_common.constprop.85+0x109/0x5a0 [ 156.475034] do_syscall_64+0x3e/0x90 [ 156.478611] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 156.483658] RIP: 0033:0x7fe7bff37ab7
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -0
@@ -15338,6 +15338,7 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)int err;int v_idx; +pci_set_drvdata (pf->pdev, pf);pci_save_state (pf->pdev);/* set up periodic task facility */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/115 vdpa_sim: not reset state in vdpasim_queue_ready
In reply to Greg Kroah-HartmanFrom: Eugenio Pérez <[email protected]>
[ Upstream commit 0e84f918fac8ae61dcb790534fad5e3555ca2930 ]
vdpasim_queue_ready calls vringh_init_iotlb, which resets split indexes. But it can be called after setting a ring base with vdpasim_set_vq_state.
Fix it by stashing them. They're still resetted in vdpasim_vq_reset.
This was discovered and tested live migrating the vdpa_sim_net device.
Message-Id: <[email protected]>
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +2 -0
@@ -65,6 +65,7 @@ static void vdpasim_vq_notify(struct vringh *vring)static void vdpasim_queue_ready (struct vdpasim *vdpasim,unsigned int idx) {struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx]; +uint16_t last_avail_idx = vq->vring.last_avail_idx; vringh_init_iotlb(&vq->vring, vdpasim->features, vq->num, false, (struct vring_desc *)(uintptr_t)vq->desc_addr,
@@ -73,6 +74,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) (struct vring_used *) (uintptr_t)vq->device_addr); + vq->vring.last_avail_idx = last_avail_idx; vq->vring.notify = vdpasim_vq_notify; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 19/115 vdpa_sim: set last_used_idx as last_avail_idx in vdpasim_queue_ready
In reply to Greg Kroah-HartmanFrom: Eugenio Pérez <[email protected]>
[ Upstream commit b4cca6d48eb3fa6f0d9caba4329b1a2b0ff67a77 ]
Starting from an used_idx different than 0 is needed in use cases like virtual machine migration. Not doing so and letting the caller set an avail idx different than 0 causes destination device to try to use old buffers that source driver already recover and are not available anymore.
Since vdpa_sim does not support receive inflight descriptors as a destination of a migration, let's set both avail_idx and used_idx the same at vq start. This is how vhost-user works in a VHOST_SET_VRING_BASE call.
Although the simple fix is to set last_used_idx at vdpasim_set_vq_state, it would be reset at vdpasim_queue_ready. The last_avail_idx case is fixed with commit 0e84f918fac8 ("vdpa_sim: not reset state in vdpasim_queue_ready"). Since the only option is to make it equal to last_avail_idx, adding the only change needed here.
This was discovered and tested live migrating the vdpa_sim_net device.
Message-Id: <[email protected]>
--- drivers/vdpa/vdpa_sim/vdpa_sim.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/vdpa/vdpa_sim/vdpa_sim.c +11 -0
@@ -75,6 +75,17 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx) (uintptr_t)vq->device_addr); vq->vring.last_avail_idx = last_avail_idx; + +/* +* Since vdpa_sim does not support receive inflight descriptors as a +* destination of a migration, let's set both avail_idx and used_idx +* the same at vq start. This is how vhost-user works in a +* VHOST_SET_VRING_BASE call. +* +* Although the simple fix is to set last_used_idx at +* vdpasim_set_vq_state, it would be reset at vdpasim_queue_ready. +*/ + vq->vring.last_used_idx = last_avail_idx; vq->vring.notify = vdpasim_vq_notify; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/115 PCI: s390: Fix use-after-free of PCI resources with per-function hotplug
In reply to Greg Kroah-HartmanFrom: Niklas Schnelle <[email protected]>
[ Upstream commit ab909509850b27fd39b8ba99e44cda39dbc3858c ]
On s390 PCI functions may be hotplugged individually even when they belong to a multi-function device. In particular on an SR-IOV device VFs may be removed and later re-added.
In commit a50297cf8235 ("s390/pci: separate zbus creation from scanning") it was missed however that struct pci_bus and struct zpci_bus's resource list retained a reference to the PCI functions MMIO resources even though those resources are released and freed on hot-unplug. These stale resources may subsequently be claimed when the PCI function re-appears resulting in use-after-free.
One idea of fixing this use-after-free in s390 specific code that was investigated was to simply keep resources around from the moment a PCI function first appeared until the whole virtual PCI bus created for a multi-function device disappears. The problem with this however is that due to the requirement of artificial MMIO addreesses (address cookies) extra logic is then needed to keep the address cookies compatible on re-plug. At the same time the MMIO resources semantically belong to the PCI function so tying their lifecycle to the function seems more logical.
Instead a simpler approach is to remove the resources of an individually hot-unplugged PCI function from the PCI bus's resource list while keeping the resources of other PCI functions on the PCI bus untouched.
This is done by introducing pci_bus_remove_resource() to remove an individual resource. Similarly the resource also needs to be removed from the struct zpci_bus's resource list. It turns out however, that there is really no need to add the MMIO resources to the struct zpci_bus's resource list at all and instead we can simply use the zpci_bar_struct's resource pointer directly.
--- arch/s390/pci/pci.c | 16 ++++++++++------ arch/s390/pci/pci_bus.c | 12 +++++------- arch/s390/pci/pci_bus.h | 3 +-- drivers/pci/bus.c | 21 +++++++++++++++++++++ include/linux/pci.h | 1 + 5 files changed, 38 insertions(+), 15 deletions(-)
arch/s390/pci/pci.c +10 -6
@@ -503,8 +503,7 @@ static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start,return r; } -int zpci_setup_bus_resources (struct zpci_dev *zdev, -struct list_head *resources) +int zpci_setup_bus_resources (struct zpci_dev *zdev) {unsigned long addr, size, flags;struct resource *res;
@@ -540,7 +539,6 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev,return -ENOMEM ; } zdev->bars[i].res = res; -pci_add_resource (resources, res); } zdev->has_resources =1 ;
@@ -549,17 +547,23 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev,static void zpci_cleanup_bus_resources (struct zpci_dev *zdev) { +struct resource *res;int i; +pci_lock_rescan_remove ();for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { -if (!zdev->bars[i].size || !zdev->bars[i].res) + res = zdev->bars[i].res; +if (!res)continue ; +release_resource (res); +pci_bus_remove_resource (zdev->zbus->bus, res);zpci_free_iomap (zdev, zdev->bars[i].map_idx); -release_resource (zdev->bars[i].res); -kfree (zdev->bars[i].res); + zdev->bars[i].res =NULL ; +kfree (res); } zdev->has_resources =0 ; +pci_unlock_rescan_remove (); }int pcibios_add_device (struct pci_dev *pdev)
arch/s390/pci/pci_bus.c +5 -7
@@ -41,9 +41,7 @@ static int zpci_nb_devices;*/ static int zpci_bus_prepare_device (struct zpci_dev *zdev) { -struct resource_entry *window, *n; -struct resource *res; -int rc; +int rc, i;if (!zdev_enabled (zdev)) { rc =zpci_enable_device (zdev);
@@ -57,10 +55,10 @@ static int zpci_bus_prepare_device(struct zpci_dev *zdev) }if (!zdev->has_resources) { -zpci_setup_bus_resources (zdev, &zdev->zbus->resources); -resource_list_for_each_entry_safe (window, n, &zdev->zbus->resources) { - res = window->res; -pci_bus_add_resource (zdev->zbus->bus, res,0 ); +zpci_setup_bus_resources (zdev); +for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { +if (zdev->bars[i].res) +pci_bus_add_resource (zdev->zbus->bus, zdev->bars[i].res,0 ); } }
arch/s390/pci/pci_bus.h +1 -2
@@ -30,8 +30,7 @@ static inline void zpci_zdev_get(struct zpci_dev *zdev)int zpci_alloc_domain (int domain);void zpci_free_domain (int domain); -int zpci_setup_bus_resources (struct zpci_dev *zdev, -struct list_head *resources); +int zpci_setup_bus_resources (struct zpci_dev *zdev);static inline struct zpci_dev *get_zdev_by_bus (struct pci_bus *bus,unsigned int devfn)
drivers/pci/bus.c +21 -0
@@ -76,6 +76,27 @@ struct resource *pci_bus_resource_n(const struct pci_bus *bus, int n) }EXPORT_SYMBOL_GPL (pci_bus_resource_n); +void pci_bus_remove_resource (struct pci_bus *bus,struct resource *res) +{ +struct pci_bus_resource *bus_res, *tmp; +int i; + +for (i =0 ; i <PCI_BRIDGE_RESOURCE_NUM ; i++) { +if (bus->resource[i] == res) { + bus->resource[i] =NULL ; +return ; + } + } + +list_for_each_entry_safe (bus_res, tmp, &bus->resources, list) { +if (bus_res->res == res) { +list_del (&bus_res->list); +kfree (bus_res); +return ; + } + } +} +void pci_bus_remove_resources (struct pci_bus *bus) {int i;
include/linux/pci.h +1 -0
@@ -1390,6 +1390,7 @@ void pci_bus_add_resource(struct pci_bus *bus, struct resource *res, unsigned int flags);struct resource *pci_bus_resource_n (const struct pci_bus *bus,int n);void pci_bus_remove_resources (struct pci_bus *bus); +void pci_bus_remove_resource (struct pci_bus *bus,struct resource *res);int devm_request_pci_bus_resources (struct device *dev,struct list_head *resources);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/115 drm/i915/display: Workaround cursor left overs with PSR2 selective fetch enabled
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
[ Upstream commit 1f3a11c341ab211d6ba55ef3d58026b7b5319945 ]
Not sure why but when moving the cursor fast it causes some artifacts of the cursor to be left in the cursor path, adding some pixels above the cursor to the damaged area fixes the issue, so leaving this as a workaround until proper fix is found.
This is reproducile on TGL and ADL-P.
Stable-dep-of: 71c602103c74 ("drm/i915/psr: Use calculated io and fast wake lines")
--- drivers/gpu/drm/i915/display/intel_psr.c | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/i915/display/intel_psr.c +25 -0
@@ -1601,6 +1601,28 @@ static void intel_psr2_sel_fetch_pipe_alignment(const struct intel_crtc_state *cdrm_warn (&dev_priv->drm,"Missing PSR2 sel fetch alignment with DSC\n" ); } +/* +* FIXME: Not sure why but when moving the cursor fast it causes some artifacts +* of the cursor to be left in the cursor path, adding some pixels above the +* cursor to the damaged area fixes the issue. +*/ +static void cursor_area_workaround (const struct intel_plane_state *new_plane_state, +struct drm_rect *damaged_area, +struct drm_rect *pipe_clip) +{ +const struct intel_plane *plane =to_intel_plane (new_plane_state->uapi.plane); +int height; + +if (plane->id !=PLANE_CURSOR ) +return ; + + height =drm_rect_height (&new_plane_state->uapi.dst) /2 ; + damaged_area->y1 -= height; + damaged_area->y1 =max (damaged_area->y1,0 ); + +clip_area_update (pipe_clip, damaged_area); +} +int intel_psr2_sel_fetch_update (struct intel_atomic_state *state,struct intel_crtc *crtc) {
@@ -1669,6 +1691,9 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, damaged_area.y2 = new_plane_state->uapi.dst.y2;clip_area_update (&pipe_clip, &damaged_area); } + +cursor_area_workaround (new_plane_state, &damaged_area, + &pipe_clip);continue ; } else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha || (!num_clips &&
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/115 drm/i915/display/psr: Use drm damage helpers to calculate plane damaged area
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
[ Upstream commit af7ea1e22afc7ce7773b2e4562df4370c8c711ea ]
drm_atomic_helper_damage_iter_init() + drm_atomic_for_each_plane_damage() returns the full plane area in case no damaged area was set by userspace or it was discarted by driver.
This is important to fix the rendering of userspace applications that does frontbuffer rendering and notify driver about dirty areas but do not set any dirty clips.
With this we don't need to worry about to check and mark the whole area as damaged in page flips.
Another important change here is the move of drm_atomic_add_affected_planes() call, it needs to called late otherwise the area of all the planes would be added to pipe_clip and not saving power.
Stable-dep-of: 71c602103c74 ("drm/i915/psr: Use calculated io and fast wake lines")
--- drivers/gpu/drm/i915/display/intel_psr.c | 37 +++++++++--------------- 1 file changed, 13 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +13 -24
@@ -22,6 +22,7 @@*/ #include <drm/drm_atomic_helper.h> +#include <drm/drm_damage_helper.h> #include "display/intel_dp.h"
@@ -1636,10 +1637,6 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,if (!crtc_state->enable_psr2_sel_fetch)return 0 ; - ret =drm_atomic_add_affected_planes (&state->base, &crtc->base); -if (ret) -return ret; -/* * Calculate minimal selective fetch area of each plane and calculate * the pipe damaged area.
@@ -1649,8 +1646,8 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,for_each_oldnew_intel_plane_in_state (state, plane, old_plane_state, new_plane_state, i) {struct drm_rect src, damaged_area = { .y1 =-1 }; -struct drm_mode_rect *damaged_clips; -u32 num_clips, j; +struct drm_atomic_helper_damage_iter iter; +struct drm_rect clip;if (new_plane_state->uapi.crtc != crtc_state->uapi.crtc)continue ;
@@ -1670,8 +1667,6 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,break ; } - num_clips =drm_plane_get_damage_clips_count (&new_plane_state->uapi); -/* * If visibility or plane moved, mark the whole plane area as * damaged as it needs to be complete redraw in the new and old
@@ -1695,14 +1690,8 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,cursor_area_workaround (new_plane_state, &damaged_area, &pipe_clip);continue ; - }else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha || - (!num_clips && - new_plane_state->uapi.fb != old_plane_state->uapi.fb)) { -/* -* If the plane don't have damaged areas but the -* framebuffer changed or alpha changed, mark the whole -* plane area as damaged. -*/ + }else if (new_plane_state->uapi.alpha != old_plane_state->uapi.alpha) { +/* If alpha changed mark the whole plane area as damaged */ damaged_area.y1 = new_plane_state->uapi.dst.y1; damaged_area.y2 = new_plane_state->uapi.dst.y2;clip_area_update (&pipe_clip, &damaged_area);
@@ -1710,15 +1699,11 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, }drm_rect_fp_to_int (&src, &new_plane_state->uapi.src); - damaged_clips =drm_plane_get_damage_clips (&new_plane_state->uapi); - -for (j =0 ; j < num_clips; j++) { -struct drm_rect clip; - clip.x1 = damaged_clips[j].x1; - clip.y1 = damaged_clips[j].y1; - clip.x2 = damaged_clips[j].x2; - clip.y2 = damaged_clips[j].y2; +drm_atomic_helper_damage_iter_init (&iter, + &old_plane_state->uapi, + &new_plane_state->uapi); +drm_atomic_for_each_plane_damage (&iter, &clip) {if (drm_rect_intersect (&clip, &src))clip_area_update (&damaged_area, &clip); }
@@ -1734,6 +1719,10 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,if (full_update) goto skip_sel_fetch_set_loop; + ret =drm_atomic_add_affected_planes (&state->base, &crtc->base); +if (ret) +return ret; +intel_psr2_sel_fetch_pipe_alignment (crtc_state, &pipe_clip);/*
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/115 drm/i915/display/psr: Handle plane and pipe restrictions at every page flip
In reply to Greg Kroah-HartmanFrom: José Roberto de Souza <[email protected]>
[ Upstream commit ac220f5f754b1d2f4a69428f515c3f1b10d1fad0 ]
PSR2 selective is not supported over rotated and scaled planes. We had the rotation check in intel_psr2_sel_fetch_config_valid() but that code path is only execute when a modeset is needed and those plane parameters can change without a modeset.
Pipe selective fetch restrictions are also needed, it could be added in intel_psr_compute_config() but pippe scaling is computed after it is executed, so leaving as is for now.
There is no much loss in this approach as it would cause selective fetch to not enabled as for alderlake-P and newer will cause it to switch to PSR1 that will have the same power-savings as do full pipe fetch.
Also need to check those restricions in the second for_each_oldnew_intel_plane_in_state() loop because the state could only have a plane that is not affected by those restricitons but the damaged area intersect with planes that has those restrictions, so a full pipe fetch is required.
v2:
- also handling pipe restrictions
BSpec: 55229
Stable-dep-of: 71c602103c74 ("drm/i915/psr: Use calculated io and fast wake lines")
--- drivers/gpu/drm/i915/display/intel_psr.c | 65 +++++++++++++++++------- 1 file changed, 46 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +46 -19
@@ -756,11 +756,7 @@ tgl_dc3co_exitline_compute_config(struct intel_dp *intel_dp,static bool intel_psr2_sel_fetch_config_valid (struct intel_dp *intel_dp,struct intel_crtc_state *crtc_state) { -struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state);struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); -struct intel_plane_state *plane_state; -struct intel_plane *plane; -int i;if (!dev_priv->params.enable_psr2_sel_fetch && intel_dp->psr.debug !=I915_PSR_DEBUG_ENABLE_SEL_FETCH ) {
@@ -775,14 +771,6 @@ static bool intel_psr2_sel_fetch_config_valid(struct intel_dp *intel_dp,return false; } -for_each_new_intel_plane_in_state (state, plane, plane_state, i) { -if (plane_state->uapi.rotation !=DRM_MODE_ROTATE_0 ) { -drm_dbg_kms (&dev_priv->drm, -"PSR2 sel fetch not enabled, plane rotated\n" ); -return false; - } - } -/* Wa_14010254185 Wa_14010103792 */ if (IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_C0 )) { drm_dbg_kms(&dev_priv->drm,
@@ -1624,6 +1612,41 @@ static void cursor_area_workaround(const struct intel_plane_state *new_plane_staclip_area_update (pipe_clip, damaged_area); } +/* +* TODO: Not clear how to handle planes with negative position, +* also planes are not updated if they have a negative X +* position so for now doing a full update in this cases +* +* Plane scaling and rotation is not supported by selective fetch and both +* properties can change without a modeset, so need to be check at every +* atomic commmit. +*/ +static bool psr2_sel_fetch_plane_state_supported (const struct intel_plane_state *plane_state) +{ +if (plane_state->uapi.dst.y1 <0 || + plane_state->uapi.dst.x1 <0 || + plane_state->scaler_id >=0 || + plane_state->uapi.rotation !=DRM_MODE_ROTATE_0 ) +return false; + +return true; +} + +/* +* Check for pipe properties that is not supported by selective fetch. +* +* TODO: pipe scaling causes a modeset but skl_update_scaler_crtc() is executed +* after intel_psr_compute_config(), so for now keeping PSR2 selective fetch +* enabled and going to the full update path. +*/ +static bool psr2_sel_fetch_pipe_state_supported (const struct intel_crtc_state *crtc_state) +{ +if (crtc_state->scaler_state.scaler_id >=0 ) +return false; + +return true; +} +int intel_psr2_sel_fetch_update (struct intel_atomic_state *state,struct intel_crtc *crtc) {
@@ -1637,6 +1660,11 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,if (!crtc_state->enable_psr2_sel_fetch)return 0 ; +if (!psr2_sel_fetch_pipe_state_supported (crtc_state)) { + full_update = true; + goto skip_sel_fetch_set_loop; + } +/* * Calculate minimal selective fetch area of each plane and calculate * the pipe damaged area.
@@ -1656,13 +1684,7 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, !old_plane_state->uapi.visible)continue ; -/* -* TODO: Not clear how to handle planes with negative position, -* also planes are not updated if they have a negative X -* position so for now doing a full update in this cases -*/ -if (new_plane_state->uapi.dst.y1 <0 || - new_plane_state->uapi.dst.x1 <0 ) { +if (!psr2_sel_fetch_plane_state_supported (new_plane_state)) { full_update = true;break ; }
@@ -1741,6 +1763,11 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state,if (!drm_rect_intersect (&inter, &new_plane_state->uapi.dst))continue ; +if (!psr2_sel_fetch_plane_state_supported (new_plane_state)) { + full_update = true; +break ; + } + sel_fetch_area = &new_plane_state->psr2_sel_fetch_area; sel_fetch_area->y1 = inter.y1 - new_plane_state->uapi.dst.y1; sel_fetch_area->y2 = inter.y2 - new_plane_state->uapi.dst.y1;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/115 drm/i915/display: clean up comments
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 3461b040a90d723c93c9d1c7c11e3464f5cadc0e ]
spelling changes
resoluition -> resolution
dont -> don't commmit -> commit Invalidade -> Invalidate
Stable-dep-of: 71c602103c74 ("drm/i915/psr: Use calculated io and fast wake lines")
--- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +4 -4
@@ -580,7 +580,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)/* * TODO: 7 lines of IO_BUFFER_WAKE and FAST_WAKE are default * values from BSpec. In order to setting an optimal power -* consumption, lower than 4k resoluition mode needs to decrese +* consumption, lower than 4k resolution mode needs to decrease * IO_BUFFER_WAKE and FAST_WAKE. And higher than 4K resolution * mode needs to increase IO_BUFFER_WAKE and FAST_WAKE. */
@@ -986,7 +986,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,int psr_setup_time;/* -* Current PSR panels dont work reliably with VRR enabled +* Current PSR panels don't work reliably with VRR enabled * So if VRR is enabled, do not enable PSR. */ if (crtc_state->vrr.enable)
@@ -1619,7 +1619,7 @@ static void cursor_area_workaround(const struct intel_plane_state *new_plane_sta* * Plane scaling and rotation is not supported by selective fetch and both * properties can change without a modeset, so need to be check at every -* atomic commmit. +* atomic commit. */ static bool psr2_sel_fetch_plane_state_supported (const struct intel_plane_state *plane_state) {
@@ -2067,7 +2067,7 @@ static void intel_psr_work(struct work_struct *work) }/** -* intel_psr_invalidate - Invalidade PSR +* intel_psr_invalidate - Invalidate PSR * @dev_priv: i915 device * @frontbuffer_bits: frontbuffer plane tracking bits * @origin: which operation caused the invalidate
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/115 drm/i915/psr: Use calculated io and fast wake lines
In reply to Greg Kroah-HartmanFrom: Jouni Högander <[email protected]>
[ Upstream commit 71c602103c74b277bef3d20a308874a33ec8326d ]
Currently we are using hardcoded 7 for io and fast wake lines.
According to Bspec io and fast wake times are both 42us for DISPLAY_VER >= 12 and 50us and 32us for older platforms.
Calculate line counts for these and configure them into PSR2_CTL accordingly
Use 45 us for the fast wake calculation as 42 seems to be too tight based on testing.
Bspec: 49274, 4289
--- .../drm/i915/display/intel_display_types.h | 2 + drivers/gpu/drm/i915/display/intel_psr.c | 78 +++++++++++++++---- 2 files changed, 63 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -1520,6 +1520,8 @@ struct intel_psr {bool psr2_sel_fetch_enabled;bool req_psr2_sdp_prior_scanline;u8 sink_sync_latency; +u8 io_wake_lines; +u8 fast_wake_lines;ktime_t last_entry_attempt;ktime_t last_exit;bool sink_not_reliable;
drivers/gpu/drm/i915/display/intel_psr.c +61 -17
110 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/115 net/smc: fix NULL sndbuf_desc in smc_cdc_tx_handler()
In reply to Greg Kroah-HartmanFrom: D. Wythe <[email protected]>
[ Upstream commit 22a825c541d775c1dbe7b2402786025acad6727b ]
When performing a stress test on SMC-R by rmmod mlx5_ib driver during the wrk/nginx test, we found that there is a probability of triggering a panic while terminating all link groups.
This issue dues to the race between smc_smcr_terminate_all() and smc_buf_create().
smc_smcr_terminate_all
smc_buf_create
/* init */conn->sndbuf_desc = NULL;
...
__smc_lgr_terminate smc_conn_kill smc_close_abort smc_cdc_get_slot_and_msg_send __softirqentry_text_start smc_wr_tx_process_cqe smc_cdc_tx_handler READ(conn->sndbuf_desc->len); /* panic dues to NULL sndbuf_desc */
conn->sndbuf_desc = xxx;
This patch tries to fix the issue by always to check the sndbuf_desc before send any cdc msg, to make sure that no null pointer is seen during cqe processing.
--- net/smc/smc_cdc.c | 3 +++ 1 file changed, 3 insertions(+)
net/smc/smc_cdc.c +3 -0
@@ -104,6 +104,9 @@ int smc_cdc_msg_send(struct smc_connection *conn,union smc_host_cursor cfed;int rc; +if (unlikely (!READ_ONCE (conn->sndbuf_desc))) +return -ENOBUFS ; +smc_cdc_add_pending_send (conn, pend); conn->tx_cdc_seq++;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/115 qed/qed_dev: guard against a possible division by zero
In reply to Greg Kroah-HartmanFrom: Daniil Tatianin <[email protected]>
[ Upstream commit 1a9dc5610ef89d807acdcfbff93a558f341a44da ]
Previously we would divide total_left_rate by zero if num_vports happened to be 1 because non_requested_count is calculated as num_vports - req_count. Guard against this by validating num_vports at the beginning and returning an error otherwise.
Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_dev.c +5 -0
@@ -5022,6 +5022,11 @@ static int qed_init_wfq_param(struct qed_hwfn *p_hwfn, num_vports = p_hwfn->qm_info.num_vports; +if (num_vports <2 ) { +DP_NOTICE (p_hwfn,"Unexpected num_vports: %d\n" , num_vports); +return -EINVAL ; + } +/* Accounting for the vports which are configured for WFQ explicitly */ for (i =0 ; i < num_vports; i++) {u32 tmp_speed;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/115 net: dsa: mt7530: remove now incorrect comment regarding port 5
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit feb03fd11c5616f3a47e4714d2f9917d0f1a2edd ]
Remove now incorrect comment regarding port 5 as GMAC5. This is supposed to be supported since commit 38f790a80560 ("net: dsa: mt7530: Add support for port 5") under mt7530_setup_port5().
--- drivers/net/dsa/mt7530.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/mt7530.c +1 -1
@@ -2168,7 +2168,7 @@ mt7530_setup(struct dsa_switch *ds)mt7530_pll_setup (priv); -/* Enable Port 6 only; P5 as GMAC5 which currently is not supported */ +/* Enable port 6 */ val =mt7530_read (priv,MT7530_MHWTRAP ); val &= ~MHWTRAP_P6_DIS & ~MHWTRAP_PHY_ACCESS ; val |=MHWTRAP_MANUAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/115 net: dsa: mt7530: set PLL frequency and trgmii only when trgmii is used
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 0b086d76e7b011772b0ac214c6e5fd5816eff2df ]
As my testing on the MCM MT7530 switch on MT7621 SoC shows, setting the PLL frequency does not affect MII modes other than trgmii on port 5 and port 6. So the assumption is that the operation here called "setting the PLL frequency" actually sets the frequency of the TRGMII TX clock.
Make it so that it and the rest of the trgmii setup run only when the trgmii mode is used.
Tested rgmii and trgmii modes of port 6 on MCM MT7530 on MT7621AT Unielec U7621-06 and standalone MT7530 on MT7623NI Bananapi BPI-R2.
--- drivers/net/dsa/mt7530.c | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-)
drivers/net/dsa/mt7530.c +31 -31
@@ -425,8 +425,6 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)switch (interface) {case PHY_INTERFACE_MODE_RGMII : trgint =0 ; -/* PLL frequency: 125MHz */ - ncpo1 =0x0c80 ;break ;case PHY_INTERFACE_MODE_TRGMII : trgint =1 ;
@@ -457,38 +455,40 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)mt7530_rmw (priv,MT7530_P6ECR ,P6_INTF_MODE_MASK ,P6_INTF_MODE (trgint)); -/* Lower Tx Driving for TRGMII path */ -for (i =0 ; i <NUM_TRGMII_CTRL ; i++) -mt7530_write (priv,MT7530_TRGMII_TD_ODT (i), -TD_DM_DRVP (8 ) |TD_DM_DRVN (8 )); - -/* Disable MT7530 core and TRGMII Tx clocks */ -core_clear (priv,CORE_TRGMII_GSW_CLK_CG , -REG_GSWCK_EN |REG_TRGMIICK_EN ); - -/* Setup the MT7530 TRGMII Tx Clock */ -core_write (priv,CORE_PLL_GROUP5 ,RG_LCDDS_PCW_NCPO1 (ncpo1)); -core_write (priv,CORE_PLL_GROUP6 ,RG_LCDDS_PCW_NCPO0 (0 )); -core_write (priv,CORE_PLL_GROUP10 ,RG_LCDDS_SSC_DELTA (ssc_delta)); -core_write (priv,CORE_PLL_GROUP11 ,RG_LCDDS_SSC_DELTA1 (ssc_delta)); -core_write (priv,CORE_PLL_GROUP4 , -RG_SYSPLL_DDSFBK_EN |RG_SYSPLL_BIAS_EN | -RG_SYSPLL_BIAS_LPF_EN ); -core_write (priv,CORE_PLL_GROUP2 , -RG_SYSPLL_EN_NORMAL |RG_SYSPLL_VODEN | -RG_SYSPLL_POSDIV (1 )); -core_write (priv,CORE_PLL_GROUP7 , -RG_LCDDS_PCW_NCPO_CHG |RG_LCCDS_C (3 ) | -RG_LCDDS_PWDB |RG_LCDDS_ISO_EN ); - -/* Enable MT7530 core and TRGMII Tx clocks */ -core_set (priv,CORE_TRGMII_GSW_CLK_CG , -REG_GSWCK_EN |REG_TRGMIICK_EN ); - -if (!trgint) +if (trgint) { +/* Lower Tx Driving for TRGMII path */ +for (i =0 ; i <NUM_TRGMII_CTRL ; i++) +mt7530_write (priv,MT7530_TRGMII_TD_ODT (i), +TD_DM_DRVP (8 ) |TD_DM_DRVN (8 )); + +/* Disable MT7530 core and TRGMII Tx clocks */ +core_clear (priv,CORE_TRGMII_GSW_CLK_CG , +REG_GSWCK_EN |REG_TRGMIICK_EN ); + +/* Setup the MT7530 TRGMII Tx Clock */ +core_write (priv,CORE_PLL_GROUP5 ,RG_LCDDS_PCW_NCPO1 (ncpo1)); +core_write (priv,CORE_PLL_GROUP6 ,RG_LCDDS_PCW_NCPO0 (0 )); +core_write (priv,CORE_PLL_GROUP10 ,RG_LCDDS_SSC_DELTA (ssc_delta)); +core_write (priv,CORE_PLL_GROUP11 ,RG_LCDDS_SSC_DELTA1 (ssc_delta)); +core_write (priv,CORE_PLL_GROUP4 , +RG_SYSPLL_DDSFBK_EN |RG_SYSPLL_BIAS_EN | +RG_SYSPLL_BIAS_LPF_EN ); +core_write (priv,CORE_PLL_GROUP2 , +RG_SYSPLL_EN_NORMAL |RG_SYSPLL_VODEN | +RG_SYSPLL_POSDIV (1 )); +core_write (priv,CORE_PLL_GROUP7 , +RG_LCDDS_PCW_NCPO_CHG |RG_LCCDS_C (3 ) | +RG_LCDDS_PWDB |RG_LCDDS_ISO_EN ); + +/* Enable MT7530 core and TRGMII Tx clocks */ +core_set (priv,CORE_TRGMII_GSW_CLK_CG , +REG_GSWCK_EN |REG_TRGMIICK_EN ); + }else {for (i =0 ; i <NUM_TRGMII_CTRL ; i++)mt7530_rmw (priv,MT7530_TRGMII_RD (i),RD_TAP_MASK ,RD_TAP (16 )); + } +return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/115 loop: Fix use-after-free issues
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 9b0cb770f5d7b1ff40bea7ca385438ee94570eec ]
do_req_filebacked() calls blk_mq_complete_request() synchronously or asynchronously when using asynchronous I/O unless memory allocation fails. Hence, modify loop_handle_cmd() such that it does not dereference 'cmd' nor 'rq' after do_req_filebacked() finished unless we are sure that the request has not yet been completed. This patch fixes the following kernel crash:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000054 Call trace: css_put.42938+0x1c/0x1ac loop_process_work+0xc8c/0xfd4 loop_rootcg_workfn+0x24/0x34 process_one_work+0x244/0x558 worker_thread+0x400/0x8fc kthread+0x16c/0x1e0 ret_from_fork+0x10/0x20
--- drivers/block/loop.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/block/loop.c +17 -8
@@ -2188,35 +2188,44 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx,static void loop_handle_cmd (struct loop_cmd *cmd) { +struct cgroup_subsys_state *cmd_blkcg_css = cmd->blkcg_css; +struct cgroup_subsys_state *cmd_memcg_css = cmd->memcg_css;struct request *rq =blk_mq_rq_from_pdu (cmd);const bool write =op_is_write (req_op (rq));struct loop_device *lo = rq->q->queuedata;int ret =0 ;struct mem_cgroup *old_memcg =NULL ; +const bool use_aio = cmd->use_aio;if (write && (lo->lo_flags &LO_FLAGS_READ_ONLY )) { ret = -EIO ; goto failed; } -if (cmd->blkcg_css) -kthread_associate_blkcg (cmd->blkcg_css); -if (cmd->memcg_css) +if (cmd_blkcg_css) +kthread_associate_blkcg (cmd_blkcg_css); +if (cmd_memcg_css) old_memcg =set_active_memcg ( -mem_cgroup_from_css (cmd->memcg_css)); +mem_cgroup_from_css (cmd_memcg_css)); +/* +* do_req_filebacked() may call blk_mq_complete_request() synchronously +* or asynchronously if using aio. Hence, do not touch 'cmd' after +* do_req_filebacked() has returned unless we are sure that 'cmd' has +* not yet been completed. +*/ ret =do_req_filebacked (lo, rq); -if (cmd->blkcg_css) +if (cmd_blkcg_css)kthread_associate_blkcg (NULL ); -if (cmd->memcg_css) { +if (cmd_memcg_css) {set_active_memcg (old_memcg); -css_put (cmd->memcg_css); +css_put (cmd_memcg_css); } failed:/* complete non-aio request */ -if (!cmd->use_aio || ret) { +if (!use_aio || ret) {if (ret == -EOPNOTSUPP ) cmd->ret = ret;else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/115 net: tunnels: annotate lockless accesses to dev->needed_headroom
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 4b397c06cb987935b1b097336532aa6b4210e091 ]
IP tunnels can apparently update dev->needed_headroom in their xmit path.
This patch takes care of three tunnels xmit, and also the core LL_RESERVED_SPACE() and LL_RESERVED_SPACE_EXTRA() helpers.
More changes might be needed for completeness.
BUG: KCSAN: data-race in ip_tunnel_xmit / ip_tunnel_xmit
read to 0xffff88815b9da0ec of 2 bytes by task 888 on cpu 1:
ip_tunnel_xmit+0x1270/0x1730 net/ipv4/ip_tunnel.c:803 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip_finish_output2+0x740/0x840 net/ipv4/ip_output.c:228 ip_finish_output+0xf4/0x240 net/ipv4/ip_output.c:316 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip_output+0xe5/0x1b0 net/ipv4/ip_output.c:430 dst_output include/net/dst.h:444 [inline] ip_local_out+0x64/0x80 net/ipv4/ip_output.c:126 iptunnel_xmit+0x34a/0x4b0 net/ipv4/ip_tunnel_core.c:82 ip_tunnel_xmit+0x1451/0x1730 net/ipv4/ip_tunnel.c:813 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246
write to 0xffff88815b9da0ec of 2 bytes by task 2379 on cpu 0:
ip_tunnel_xmit+0x1294/0x1730 net/ipv4/ip_tunnel.c:804 __gre_xmit net/ipv4/ip_gre.c:469 [inline] ipgre_xmit+0x516/0x570 net/ipv4/ip_gre.c:661 __netdev_start_xmit include/linux/netdevice.h:4881 [inline] netdev_start_xmit include/linux/netdevice.h:4895 [inline] xmit_one net/core/dev.c:3580 [inline] dev_hard_start_xmit+0x127/0x400 net/core/dev.c:3596 __dev_queue_xmit+0x1007/0x1eb0 net/core/dev.c:4246 dev_queue_xmit include/linux/netdevice.h:3051 [inline] neigh_direct_output+0x17/0x20 net/core/neighbour.c:1623 neigh_output include/net/neighbour.h:546 [inline] ip6_finish_output2+0x9bc/0xc50 net/ipv6/ip6_output.c:134 __ip6_finish_output net/ipv6/ip6_output.c:195 [inline] ip6_finish_output+0x39a/0x4e0 net/ipv6/ip6_output.c:206 NF_HOOK_COND include/linux/netfilter.h:291 [inline] ip6_output+0xeb/0x220 net/ipv6/ip6_output.c:227 dst_output include/net/dst.h:444 [inline] NF_HOOK include/linux/netfilter.h:302 [inline] mld_sendpack+0x438/0x6a0 net/ipv6/mcast.c:1820 mld_send_cr net/ipv6/mcast.c:2121 [inline] mld_ifc_work+0x519/0x7b0 net/ipv6/mcast.c:2653 process_one_work+0x3e6/0x750 kernel/workqueue.c:2390 worker_thread+0x5f2/0xa10 kernel/workqueue.c:2537 kthread+0x1ac/0x1e0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:308
value changed: 0x0dd4 -> 0x0e14
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 2379 Comm: kworker/0:0 Not tainted 6.3.0-rc1-syzkaller-00002-g8ca09d5fa354-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/02/2023 Workqueue: mld mld_ifc_work
--- include/linux/netdevice.h | 6 ++++-- net/ipv4/ip_tunnel.c | 12 ++++++------ net/ipv6/ip6_tunnel.c | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-)
include/linux/netdevice.h +4 -2
@@ -275,9 +275,11 @@ struct hh_cache {* relationship HH alignment <= LL alignment. */ #define LL_RESERVED_SPACE (dev) \ - ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) + ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom)) \ + & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)#define LL_RESERVED_SPACE_EXTRA (dev,extra) \ - ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) + ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom) + (extra)) \ + & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)struct header_ops { int (*create) (struct sk_buff *skb, struct net_device *dev,
net/ipv4/ip_tunnel.c +6 -6
@@ -613,10 +613,10 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, } headroom +=LL_RESERVED_SPACE (rt->dst.dev) + rt->dst.header_len; -if (headroom > dev->needed_headroom) - dev->needed_headroom = headroom; +if (headroom >READ_ONCE (dev->needed_headroom)) +WRITE_ONCE (dev->needed_headroom, headroom); -if (skb_cow_head (skb, dev->needed_headroom)) { +if (skb_cow_head (skb,READ_ONCE (dev->needed_headroom))) {ip_rt_put (rt); goto tx_dropped; }
@@ -797,10 +797,10 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, max_headroom =LL_RESERVED_SPACE (rt->dst.dev) +sizeof (struct iphdr ) + rt->dst.header_len +ip_encap_hlen (&tunnel->encap); -if (max_headroom > dev->needed_headroom) - dev->needed_headroom = max_headroom; +if (max_headroom >READ_ONCE (dev->needed_headroom)) +WRITE_ONCE (dev->needed_headroom, max_headroom); -if (skb_cow_head (skb, dev->needed_headroom)) { +if (skb_cow_head (skb,READ_ONCE (dev->needed_headroom))) {ip_rt_put (rt); dev->stats.tx_dropped++;kfree_skb (skb);
net/ipv6/ip6_tunnel.c +2 -2
@@ -1237,8 +1237,8 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,*/ max_headroom =LL_RESERVED_SPACE (dst->dev) +sizeof (struct ipv6hdr ) + dst->header_len + t->hlen; -if (max_headroom > dev->needed_headroom) - dev->needed_headroom = max_headroom; +if (max_headroom >READ_ONCE (dev->needed_headroom)) +WRITE_ONCE (dev->needed_headroom, max_headroom); err =ip6_tnl_encap (skb, t, &proto, fl6);if (err)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/115 net: phy: smsc: bail out in lan87xx_read_status if genphy_read_status fails
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit c22c3bbf351e4ce905f082649cffa1ff893ea8c1 ]
If genphy_read_status fails then further access to the PHY may result in unpredictable behavior. To prevent this bail out immediately if genphy_read_status fails.
--- drivers/net/phy/smsc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/phy/smsc.c +4 -1
@@ -206,8 +206,11 @@ static int lan95xx_config_aneg_ext(struct phy_device *phydev)static int lan87xx_read_status (struct phy_device *phydev) {struct smsc_phy_priv *priv = phydev->priv; +int err; -int err =genphy_read_status (phydev); + err =genphy_read_status (phydev); +if (err) +return err;if (!phydev->link && priv->energy_enable && phydev->irq ==PHY_POLL ) {/* Disable EDPD to wake up PHY */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/115 nfc: st-nci: Fix use after free bug in ndlc_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 5000fe6c27827a61d8250a7e4a1d26c3298ef4f6 ]
This bug influences both st_nci_i2c_remove and st_nci_spi_remove. Take st_nci_i2c_remove as an example.
In st_nci_i2c_probe, it called ndlc_probe and bound &ndlc->sm_work with llt_ndlc_sm_work.
When it calls ndlc_recv or timeout handler, it will finally call schedule_work to start the work.
When we call st_nci_i2c_remove to remove the driver, there may be a sequence as follows:
Fix it by finishing the work before cleanup in ndlc_remove
CPU0 CPU1
|llt_ndlc_sm_work
st_nci_i2c_remove |
ndlc_remove |
st_nci_remove |
nci_free_device|
kfree(ndev) |
//free ndlc->ndev |
|llt_ndlc_rcv_queue
|nci_recv_frame
|//use ndlc->ndev--- drivers/nfc/st-nci/ndlc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/nfc/st-nci/ndlc.c +4 -2
@@ -286,13 +286,15 @@ EXPORT_SYMBOL(ndlc_probe);void ndlc_remove (struct llt_ndlc *ndlc) { -st_nci_remove (ndlc->ndev); -/* cancel timers */ del_timer_sync (&ndlc->t1_timer);del_timer_sync (&ndlc->t2_timer); ndlc->t2_active = false; ndlc->t1_active = false; +/* cancel work */ +cancel_work_sync (&ndlc->sm_work); + +st_nci_remove (ndlc->ndev);skb_queue_purge (&ndlc->rcv_q);skb_queue_purge (&ndlc->send_q);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/115 net/smc: fix deadlock triggered by cancel_delayed_work_syn()
In reply to Greg Kroah-HartmanFrom: Wenjia Zhang <[email protected]>
[ Upstream commit 13085e1b5cab8ad802904d72e6a6dae85ae0cd20 ]
The following LOCKDEP was detected:
Workqueue: events smc_lgr_free_work [smc]
WARNING: possible circular locking dependency detected
6.1.0-20221027.rc2.git8.56bc5b569087.300.fc36.s390x+debug #1 Not tainted
------------------------------------------------------
kworker/3:0/176251 is trying to acquire lock:
00000000f1467148 ((wq_completion)smc_tx_wq-00000000#2){+.+.}-{0:0},
at: __flush_workqueue+0x7a/0x4f0
but task is already holding lock:
0000037fffe97dc8 ((work_completion)(&(&lgr->free_work)->work)){+.+.}-{0:0},
at: process_one_work+0x232/0x730
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 ((work_completion)(&(&lgr->free_work)->work)){+.+.}-{0:0}:
__lock_acquire+0x58e/0xbd8
lock_acquire.part.0+0xe2/0x248
lock_acquire+0xac/0x1c8
__flush_work+0x76/0xf0
__cancel_work_timer+0x170/0x220
__smc_lgr_terminate.part.0+0x34/0x1c0 [smc]
smc_connect_rdma+0x15e/0x418 [smc]
__smc_connect+0x234/0x480 [smc]
smc_connect+0x1d6/0x230 [smc]
__sys_connect+0x90/0xc0
__do_sys_socketcall+0x186/0x370
__do_syscall+0x1da/0x208
system_call+0x82/0xb0
-> #3 (smc_client_lgr_pending){+.+.}-{3:3}:
__lock_acquire+0x58e/0xbd8
lock_acquire.part.0+0xe2/0x248
lock_acquire+0xac/0x1c8
__mutex_lock+0x96/0x8e8
mutex_lock_nested+0x32/0x40
smc_connect_rdma+0xa4/0x418 [smc]
__smc_connect+0x234/0x480 [smc]
smc_connect+0x1d6/0x230 [smc]
__sys_connect+0x90/0xc0
__do_sys_socketcall+0x186/0x370
__do_syscall+0x1da/0x208
system_call+0x82/0xb0
-> #2 (sk_lock-AF_SMC){+.+.}-{0:0}:
__lock_acquire+0x58e/0xbd8
lock_acquire.part.0+0xe2/0x248
lock_acquire+0xac/0x1c8
lock_sock_nested+0x46/0xa8
smc_tx_work+0x34/0x50 [smc]
process_one_work+0x30c/0x730
worker_thread+0x62/0x420
kthread+0x138/0x150
__ret_from_fork+0x3c/0x58
ret_from_fork+0xa/0x40
-> #1 ((work_completion)(&(&smc->conn.tx_work)->work)){+.+.}-{0:0}:
__lock_acquire+0x58e/0xbd8
lock_acquire.part.0+0xe2/0x248
lock_acquire+0xac/0x1c8
process_one_work+0x2bc/0x730
worker_thread+0x62/0x420
kthread+0x138/0x150
__ret_from_fork+0x3c/0x58
ret_from_fork+0xa/0x40
-> #0 ((wq_completion)smc_tx_wq-00000000#2){+.+.}-{0:0}:
check_prev_add+0xd8/0xe88
validate_chain+0x70c/0xb20
__lock_acquire+0x58e/0xbd8
lock_acquire.part.0+0xe2/0x248
lock_acquire+0xac/0x1c8
__flush_workqueue+0xaa/0x4f0
drain_workqueue+0xaa/0x158
destroy_workqueue+0x44/0x2d8
smc_lgr_free+0x9e/0xf8 [smc]
process_one_work+0x30c/0x730
worker_thread+0x62/0x420
kthread+0x138/0x150
__ret_from_fork+0x3c/0x58
ret_from_fork+0xa/0x40
other info that might help us debug this:
Chain exists of:
(wq_completion)smc_tx_wq-00000000#2
--> smc_client_lgr_pending
--> (work_completion)(&(&lgr->free_work)->work)
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock((work_completion)(&(&lgr->free_work)->work));
lock(smc_client_lgr_pending);
lock((work_completion)
(&(&lgr->free_work)->work));
lock((wq_completion)smc_tx_wq-00000000#2);
*** DEADLOCK ***
2 locks held by kworker/3:0/176251:
#0: 0000000080183548
((wq_completion)events){+.+.}-{0:0},
at: process_one_work+0x232/0x730
#1: 0000037fffe97dc8
((work_completion)
(&(&lgr->free_work)->work)){+.+.}-{0:0},
at: process_one_work+0x232/0x730
stack backtrace:
CPU: 3 PID: 176251 Comm: kworker/3:0 Not tainted
Hardware name: IBM 8561 T01 701 (z/VM 7.2.0)
Call Trace:
[<000000002983c3e4>] dump_stack_lvl+0xac/0x100
[<0000000028b477ae>] check_noncircular+0x13e/0x160
[<0000000028b48808>] check_prev_add+0xd8/0xe88
[<0000000028b49cc4>] validate_chain+0x70c/0xb20
[<0000000028b4bd26>] __lock_acquire+0x58e/0xbd8
[<0000000028b4cf6a>] lock_acquire.part.0+0xe2/0x248
[<0000000028b4d17c>] lock_acquire+0xac/0x1c8
[<0000000028addaaa>] __flush_workqueue+0xaa/0x4f0
[<0000000028addf9a>] drain_workqueue+0xaa/0x158
[<0000000028ae303c>] destroy_workqueue+0x44/0x2d8
[<000003ff8029af26>] smc_lgr_free+0x9e/0xf8 [smc]
[<0000000028adf3d4>] process_one_work+0x30c/0x730
[<0000000028adf85a>] worker_thread+0x62/0x420
[<0000000028aeac50>] kthread+0x138/0x150
[<0000000028a63914>] __ret_from_fork+0x3c/0x58
[<00000000298503da>] ret_from_fork+0xa/0x40
INFO: lockdep is turned off.
===================================================================This deadlock occurs because cancel_delayed_work_sync() waits for the work(&lgr->free_work) to finish, while the &lgr->free_work waits for the work(lgr->tx_wq), which needs the sk_lock-AF_SMC, that is already used under the mutex_lock.
The solution is to use cancel_delayed_work() instead, which kills off a pending work.
--- net/smc/smc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/smc/smc_core.c +1 -1
@@ -1297,7 +1297,7 @@ static void __smc_lgr_terminate(struct smc_link_group *lgr, bool soft)if (lgr->terminating)return ;/* lgr already terminating */ /* cancel free_work sync, will terminate when lgr->freeing is set */ -cancel_delayed_work_sync (&lgr->free_work); +cancel_delayed_work (&lgr->free_work); lgr->terminating =1 ;/* kill remaining link group connections */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/115 net: usb: smsc75xx: Limit packet length to skb->len
In reply to Greg Kroah-HartmanFrom: Szymon Heidrich <[email protected]>
[ Upstream commit d8b228318935044dafe3a5bc07ee71a1f1424b8d ]
Packet length retrieved from skb data may be larger than the actual socket buffer length (up to 9026 bytes). In such case the cloned skb passed up the network stack will leak kernel memory contents.
--- drivers/net/usb/smsc75xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/usb/smsc75xx.c +2 -1
@@ -2211,7 +2211,8 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) dev->net->stats.rx_frame_errors++; }else {/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */ -if (unlikely (size > (MAX_SINGLE_PACKET_SIZE +ETH_HLEN +12 ))) { +if (unlikely (size > (MAX_SINGLE_PACKET_SIZE +ETH_HLEN +12 ) || + size > skb->len)) {netif_dbg (dev, rx_err, dev->net,"size err rx_cmd_a=0x%08x\n" , rx_cmd_a);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/115 drm/bridge: Fix returned array size name for atomic_get_input_bus_fmts kdoc
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 0d3c9333d976af41d7dbc6bf4d9d2e95fbdf9c89 ]
The returned array size for input formats is set through atomic_get_input_bus_fmts()'s 'num_input_fmts' argument, so use 'num_input_fmts' to represent the array size in the function's kdoc, not 'num_output_fmts'.
--- include/drm/drm_bridge.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/drm/drm_bridge.h +2 -2
@@ -447,11 +447,11 @@ struct drm_bridge_funcs {* * The returned array must be allocated with kmalloc() and will be * freed by the caller. If the allocation fails, NULL should be -* returned. num_output_fmts must be set to the returned array size. +* returned. num_input_fmts must be set to the returned array size. * Formats listed in the returned array should be listed in decreasing * preference order (the core will try all formats until it finds one * that works). When the format is not supported NULL should be -* returned and num_output_fmts should be set to 0. +* returned and num_input_fmts should be set to 0. * * This method is called on all elements of the bridge chain as part of * the bus format negotiation process that happens in
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/115 block: null_blk: Fix handling of fake timeout request
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 63f886597085f346276e3b3c8974de0100d65f32 ]
When injecting a fake timeout into the null_blk driver using fail_io_timeout, the request timeout handler does not execute blk_mq_complete_request(), so the complete callback is never executed for a timedout request.
The null_blk driver also has a driver-specific fake timeout mechanism which does not have this problem. Fix the problem with fail_io_timeout by using the same meachanism as null_blk internal timeout feature, using the fake_timeout field of null_blk commands.
--- drivers/block/null_blk/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/null_blk/main.c +3 -3
@@ -1314,8 +1314,7 @@ static inline void nullb_complete_cmd(struct nullb_cmd *cmd)case NULL_IRQ_SOFTIRQ :switch (cmd->nq->dev->queue_mode) {case NULL_Q_MQ : -if (likely (!blk_should_fake_timeout (cmd->rq->q))) -blk_mq_complete_request (cmd->rq); +blk_mq_complete_request (cmd->rq);break ;case NULL_Q_BIO :/*
@@ -1491,7 +1490,8 @@ static blk_status_t null_queue_rq(struct blk_mq_hw_ctx *hctx, cmd->rq = bd->rq; cmd->error =BLK_STS_OK ; cmd->nq = nq; - cmd->fake_timeout =should_timeout_request (bd->rq); + cmd->fake_timeout =should_timeout_request (bd->rq) || +blk_should_fake_timeout (bd->rq->q);blk_mq_start_request (bd->rq);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/115 nvme: fix handling single range discard request
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 37f0dc2ec78af0c3f35dd05578763de059f6fe77 ]
When investigating one customer report on warning in nvme_setup_discard, we observed the controller(nvme/tcp) actually exposes queue_max_discard_segments(req->q) == 1.
Obviously the current code can't handle this situation, since contiguity merge like normal RW request is taken.
Fix the issue by building range from request sector/nr_sectors directly.
--- drivers/nvme/host/core.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/nvme/host/core.c +19 -9
@@ -853,16 +853,26 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req, range =page_address (ns->ctrl->discard_page); } -__rq_for_each_bio (bio, req) { -u64 slba =nvme_sect_to_lba (ns, bio->bi_iter.bi_sector); -u32 nlb = bio->bi_iter.bi_size >> ns->lba_shift; - -if (n < segments) { - range[n].cattr =cpu_to_le32 (0 ); - range[n].nlb =cpu_to_le32 (nlb); - range[n].slba =cpu_to_le64 (slba); +if (queue_max_discard_segments (req->q) ==1 ) { +u64 slba =nvme_sect_to_lba (ns,blk_rq_pos (req)); +u32 nlb =blk_rq_sectors (req) >> (ns->lba_shift -9 ); + + range[0 ].cattr =cpu_to_le32 (0 ); + range[0 ].nlb =cpu_to_le32 (nlb); + range[0 ].slba =cpu_to_le64 (slba); + n =1 ; + }else { +__rq_for_each_bio (bio, req) { +u64 slba =nvme_sect_to_lba (ns, bio->bi_iter.bi_sector); +u32 nlb = bio->bi_iter.bi_size >> ns->lba_shift; + +if (n < segments) { + range[n].cattr =cpu_to_le32 (0 ); + range[n].nlb =cpu_to_le32 (nlb); + range[n].slba =cpu_to_le64 (slba); + } + n++; } - n++; }if (WARN_ON_ONCE (n != segments)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/115 nvmet: avoid potential UAF in nvmet_req_complete()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 6173a77b7e9d3e202bdb9897b23f2a8afe7bf286 ]
An nvme target ->queue_response() operation implementation may free the request passed as argument. Such implementation potentially could result in a use after free of the request pointer when percpu_ref_put() is called in nvmet_req_complete().
Avoid such problem by using a local variable to save the sq pointer before calling __nvmet_req_complete(), thus avoiding dereferencing the req pointer after that function call.
--- drivers/nvme/target/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/target/core.c +3 -1
@@ -756,8 +756,10 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)void nvmet_req_complete (struct nvmet_req *req,u16 status) { +struct nvmet_sq *sq = req->sq; +__nvmet_req_complete (req, status); -percpu_ref_put (&req->sq->ref); +percpu_ref_put (&sq->ref); }EXPORT_SYMBOL_GPL (nvmet_req_complete);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/115 block: sunvdc: add check for mdesc_grab() returning NULL
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 6030363199e3a6341afb467ddddbed56640cbf6a ]
In vdc_port_probe(), we should check the return value of mdesc_grab() as it may return NULL, which can cause potential NPD bug.
--- drivers/block/sunvdc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/sunvdc.c +2 -0
@@ -964,6 +964,8 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)print_version (); hp =mdesc_grab (); +if (!hp) +return -ENODEV ; err = -ENODEV ;if ((vdev->dev_no <<PARTITION_SHIFT ) & ~(u64 )MINORMASK ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/115 ice: xsk: disable txq irq before flushing hw
In reply to Greg Kroah-HartmanFrom: Maciej Fijalkowski <[email protected]>
[ Upstream commit b830c9642386867863ac64295185f896ff2928ac ]
ice_qp_dis() intends to stop a given queue pair that is a target of xsk pool attach/detach. One of the steps is to disable interrupts on these queues. It currently is broken in a way that txq irq is turned off *after* HW flush which in turn takes no effect.
ice_qp_dis():
-> ice_qvec_dis_irq()
--> disable rxq irq
--> flush hw
-> ice_vsi_stop_tx_ring()
-->disable txq irq
Below splat can be triggered by following steps:
- start xdpsock WITHOUT loading xdp prog
- run xdp_rxq_info with XDP_TX action on this interface
- start traffic
- terminate xdpsock
[ 256.312485] BUG: kernel NULL pointer dereference, address: 0000000000000018 [ 256.319560] #PF: supervisor read access in kernel mode [ 256.324775] #PF: error_code(0x0000) - not-present page [ 256.329994] PGD 0 P4D 0 [ 256.332574] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 256.337006] CPU: 3 PID: 32 Comm: ksoftirqd/3 Tainted: G OE 6.2.0-rc5+ #51 [ 256.345218] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0008.031920191559 03/19/2019 [ 256.355807] RIP: 0010:ice_clean_rx_irq_zc+0x9c/0x7d0 [ice] [ 256.361423] Code: b7 8f 8a 00 00 00 66 39 ca 0f 84 f1 04 00 00 49 8b 47 40 4c 8b 24 d0 41 0f b7 45 04 66 25 ff 3f 66 89 04 24 0f 84 85 02 00 00 <49> 8b 44 24 18 0f b7 14 24 48 05 00 01 00 00 49 89 04 24 49 89 44 [ 256.380463] RSP: 0018:ffffc900088bfd20 EFLAGS: 00010206 [ 256.385765] RAX: 000000000000003c RBX: 0000000000000035 RCX: 000000000000067f [ 256.393012] RDX: 0000000000000775 RSI: 0000000000000000 RDI: ffff8881deb3ac80 [ 256.400256] RBP: 000000000000003c R08: ffff889847982710 R09: 0000000000010000 [ 256.407500] R10: ffffffff82c060c0 R11: 0000000000000004 R12: 0000000000000000 [ 256.414746] R13: ffff88811165eea0 R14: ffffc9000d255000 R15: ffff888119b37600 [ 256.421990] FS: 0000000000000000(0000) GS:ffff8897e0cc0000(0000) knlGS:0000000000000000 [ 256.430207] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 256.436036] CR2: 0000000000000018 CR3: 0000000005c0a006 CR4: 00000000007706e0 [ 256.443283] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 256.450527] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 256.457770] PKRU: 55555554 [ 256.460529] Call Trace: [ 256.463015] <TASK> [ 256.465157] ? ice_xmit_zc+0x6e/0x150 [ice] [ 256.469437] ice_napi_poll+0x46d/0x680 [ice] [ 256.473815] ? _raw_spin_unlock_irqrestore+0x1b/0x40 [ 256.478863] __napi_poll+0x29/0x160 [ 256.482409] net_rx_action+0x136/0x260 [ 256.486222] __do_softirq+0xe8/0x2e5 [ 256.489853] ? smpboot_thread_fn+0x2c/0x270 [ 256.494108] run_ksoftirqd+0x2a/0x50 [ 256.497747] smpboot_thread_fn+0x1c1/0x270 [ 256.501907] ? __pfx_smpboot_thread_fn+0x10/0x10 [ 256.506594] kthread+0xea/0x120 [ 256.509785] ? __pfx_kthread+0x10/0x10 [ 256.513597] ret_from_fork+0x29/0x50 [ 256.517238] </TASK>
In fact, irqs were not disabled and napi managed to be scheduled and run while xsk_pool pointer was still valid, but SW ring of xdp_buff pointers was already freed.
To fix this, call ice_qvec_dis_irq() after ice_vsi_stop_tx_ring(). Also while at it, remove redundant ice_clean_rx_ring() call - this is handled in ice_qp_clean_rings().
--- drivers/net/ethernet/intel/ice/ice_xsk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_xsk.c +2 -2
@@ -166,8 +166,6 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx) }netif_tx_stop_queue (netdev_get_tx_queue (vsi->netdev, q_idx)); -ice_qvec_dis_irq (vsi, rx_ring, q_vector); -ice_fill_txq_meta (vsi, tx_ring, &txq_meta); err =ice_vsi_stop_tx_ring (vsi,ICE_NO_RESET ,0 , tx_ring, &txq_meta);if (err)
@@ -182,6 +180,8 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)if (err)return err; } +ice_qvec_dis_irq (vsi, rx_ring, q_vector); + err =ice_vsi_ctrl_one_rx_ring (vsi, false, q_idx, true);if (err)return err;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/115 net: dsa: mv88e6xxx: fix max_mtu of 1492 on 6165, 6191, 6220, 6250, 6290
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 7e9517375a14f44ee830ca1c3278076dd65fcc8f ]
There are 3 classes of switch families that the driver is aware of, as far as mv88e6xxx_change_mtu() is concerned:
- MTU configuration is available per port. Here, the chip->info->ops->port_set_jumbo_size() method will be present.
- MTU configuration is global to the switch. Here, the chip->info->ops->set_max_frame_size() method will be present.
- We don't know how to change the MTU. Here, none of the above methods will be present.
Switch families MV88E6165, MV88E6191, MV88E6220, MV88E6250 and MV88E6290 fall in category 3.
The blamed commit has adjusted the MTU for all 3 categories by EDSA_HLEN (8 bytes), resulting in a new maximum MTU of 1492 being reported by the driver for these switches.
I don't have the hardware to test, but I do have a MV88E6390 switch on which I can simulate this by commenting out its .port_set_jumbo_size definition from mv88e6390_ops. The result is this set of messages at probe time:
mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 1 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 2 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 3 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 4 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 5 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 6 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 7 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 8
It is highly implausible that there exist Ethernet switches which don't support the standard MTU of 1500 octets, and this is what the DSA framework says as well - the error comes from dsa_slave_create() -> dsa_slave_change_mtu(slave_dev, ETH_DATA_LEN).
But the error messages are alarming, and it would be good to suppress them.
As a consequence of this unlikeliness, we reimplement mv88e6xxx_get_max_mtu() and mv88e6xxx_change_mtu() on switches from the 3rd category as follows:
the maximum supported MTU is 1500, and any request to set the MTU to a value larger than that fails in dev_validate_mtu().
--- drivers/net/dsa/mv88e6xxx/chip.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +12 -4
@@ -3054,7 +3054,7 @@ static int mv88e6xxx_get_max_mtu(struct dsa_switch *ds, int port)return 10240 -VLAN_ETH_HLEN -EDSA_HLEN -ETH_FCS_LEN ; else if (chip->info->ops->set_max_frame_size) return 1632 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN; -return 1522 -VLAN_ETH_HLEN -EDSA_HLEN -ETH_FCS_LEN ; +return ETH_DATA_LEN ; }static int mv88e6xxx_change_mtu (struct dsa_switch *ds,int port,int new_mtu)
@@ -3062,6 +3062,17 @@ static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)struct mv88e6xxx_chip *chip = ds->priv;int ret =0 ; +/* For families where we don't know how to alter the MTU, +* just accept any value up to ETH_DATA_LEN +*/ +if (!chip->info->ops->port_set_jumbo_size && + !chip->info->ops->set_max_frame_size) { +if (new_mtu >ETH_DATA_LEN ) +return -EINVAL ; + +return 0 ; + } +if (dsa_is_dsa_port (ds, port) ||dsa_is_cpu_port (ds, port)) new_mtu +=EDSA_HLEN ;
@@ -3070,9 +3081,6 @@ static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu) ret = chip->info->ops->port_set_jumbo_size (chip, port, new_mtu); else if (chip->info->ops->set_max_frame_size) ret = chip->info->ops->set_max_frame_size (chip, new_mtu); - else - if (new_mtu > 1522) - ret = -EINVAL ;mv88e6xxx_reg_unlock (chip);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/115 ravb: avoid PHY being resumed when interface is not up
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 7f5ebf5dae42e710162f1c481ebcf28ab7b741c7 ]
RAVB doesn't need mdiobus suspend/resume, that's why it sets 'mac_managed_pm'. However, setting it needs to be moved from init to probe, so mdiobus PM functions will really never be called (e.g. when the interface is not up yet during suspend/resume).
--- drivers/net/ethernet/renesas/ravb_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/renesas/ravb_main.c +10 -2
@@ -1115,8 +1115,6 @@ static int ravb_phy_init(struct net_device *ndev)phy_remove_link_mode (phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);phy_remove_link_mode (phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT); -/* Indicate that the MAC is responsible for managing PHY PM */ - phydev->mac_managed_pm = true;phy_attached_info (phydev);return 0 ;
@@ -1961,6 +1959,8 @@ static int ravb_mdio_init(struct ravb_private *priv) {struct platform_device *pdev = priv->pdev;struct device *dev = &pdev->dev; +struct phy_device *phydev; +struct device_node *pn;int error;/* Bitbang init */
@@ -1982,6 +1982,14 @@ static int ravb_mdio_init(struct ravb_private *priv)if (error) goto out_free_bus; + pn =of_parse_phandle (dev->of_node,"phy-handle" ,0 ); + phydev =of_phy_find_device (pn); +if (phydev) { + phydev->mac_managed_pm = true; +put_device (&phydev->mdio.dev); + } +of_node_put (pn); +return 0 ; out_free_bus:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/115 sh_eth: avoid PHY being resumed when interface is not up
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit c6be7136afb224a01d4cde2983ddebac8da98693 ]
SH_ETH doesn't need mdiobus suspend/resume, that's why it sets 'mac_managed_pm'. However, setting it needs to be moved from init to probe, so mdiobus PM functions will really never be called (e.g. when the interface is not up yet during suspend/resume).
--- drivers/net/ethernet/renesas/sh_eth.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/renesas/sh_eth.c +10 -2
@@ -2033,8 +2033,6 @@ static int sh_eth_phy_init(struct net_device *ndev) } } -/* Indicate that the MAC is responsible for managing PHY PM */ - phydev->mac_managed_pm = true;phy_attached_info (phydev);return 0 ;
@@ -3074,6 +3072,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,struct bb_info *bitbang;struct platform_device *pdev = mdp->pdev;struct device *dev = &mdp->pdev->dev; +struct phy_device *phydev; +struct device_node *pn;/* create bit control struct for PHY */ bitbang =devm_kzalloc (dev,sizeof (struct bb_info ),GFP_KERNEL );
@@ -3108,6 +3108,14 @@ static int sh_mdio_init(struct sh_eth_private *mdp,if (ret) goto out_free_bus; + pn =of_parse_phandle (dev->of_node,"phy-handle" ,0 ); + phydev =of_phy_find_device (pn); +if (phydev) { + phydev->mac_managed_pm = true; +put_device (&phydev->mdio.dev); + } +of_node_put (pn); +return 0 ; out_free_bus:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/115 ipv4: Fix incorrect table ID in IOCTL path
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 8a2618e14f81604a9b6ad305d57e0c8da939cd65 ]
Commit f96a3d74554d ("ipv4: Fix incorrect route flushing when source address is deleted") started to take the table ID field in the FIB info structure into account when determining if two structures are identical or not. This field is initialized using the 'fc_table' field in the route configuration structure, which is not set when adding a route via IOCTL.
The above can result in user space being able to install two identical routes that only differ in the table ID field of their associated FIB info.
Fix by initializing the table ID field in the route configuration structure in the IOCTL path.
Before the fix:
# ip route add default via 192.0.2.2 # route add default gw 192.0.2.2 # ip -4 r show default # default via 192.0.2.2 dev dummy10 # default via 192.0.2.2 dev dummy10
After the fix:
# ip route add default via 192.0.2.2 # route add default gw 192.0.2.2 SIOCADDRT: File exists # ip -4 r show default default via 192.0.2.2 dev dummy10
Audited the code paths to ensure there are no other paths that do not properly initialize the route configuration structure when installing a route.
--- net/ipv4/fib_frontend.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv4/fib_frontend.c +3 -0
@@ -573,6 +573,9 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt, cfg->fc_scope =RT_SCOPE_UNIVERSE ; } +if (!cfg->fc_table) + cfg->fc_table =RT_TABLE_MAIN ; +if (cmd ==SIOCDELRT )return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/115 net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull
In reply to Greg Kroah-HartmanFrom: Szymon Heidrich <[email protected]>
[ Upstream commit 43ffe6caccc7a1bb9d7442fbab521efbf6c1378c ]
Packet length check needs to be located after size and align_count calculation to prevent kernel panic in skb_pull() in case rx_cmd_a & RX_CMD_A_RED evaluates to true.
--- drivers/net/usb/smsc75xx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/usb/smsc75xx.c +8 -2
@@ -2199,6 +2199,13 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) size = (rx_cmd_a &RX_CMD_A_LEN ) -RXW_PADDING ; align_count = (4 - ((size +RXW_PADDING ) %4 )) %4 ; +if (unlikely (size > skb->len)) { +netif_dbg (dev, rx_err, dev->net, +"size err rx_cmd_a=0x%08x\n" , + rx_cmd_a); +return 0 ; + } +if (unlikely (rx_cmd_a &RX_CMD_A_RED )) {netif_dbg (dev, rx_err, dev->net,"Error rx_cmd_a=0x%08x\n" , rx_cmd_a);
@@ -2211,8 +2218,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) dev->net->stats.rx_frame_errors++; }else {/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */ -if (unlikely (size > (MAX_SINGLE_PACKET_SIZE +ETH_HLEN +12 ) || - size > skb->len)) { +if (unlikely (size > (MAX_SINGLE_PACKET_SIZE +ETH_HLEN +12 ))) {netif_dbg (dev, rx_err, dev->net,"size err rx_cmd_a=0x%08x\n" , rx_cmd_a);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/115 net/iucv: Fix size of interrupt data
In reply to Greg Kroah-HartmanFrom: Alexandra Winter <[email protected]>
[ Upstream commit 3d87debb8ed2649608ff432699e7c961c0c6f03b ]
iucv_irq_data needs to be 4 bytes larger.
These bytes are not used by the iucv module, but written by the z/VM hypervisor in case a CPU is deconfigured.
Reported as:
BUG dma-kmalloc-64 (Not tainted): kmalloc Redzone overwritten
-----------------------------------------------------------------------------
0x0000000000400564-0x0000000000400567 @offset=1380. First byte 0x80 instead of 0xcc Allocated in iucv_cpu_prepare+0x44/0xd0 age=167839 cpu=2 pid=1
__kmem_cache_alloc_node+0x166/0x450 kmalloc_node_trace+0x3a/0x70 iucv_cpu_prepare+0x44/0xd0 cpuhp_invoke_callback+0x156/0x2f0 cpuhp_issue_call+0xf0/0x298 __cpuhp_setup_state_cpuslocked+0x136/0x338 __cpuhp_setup_state+0xf4/0x288 iucv_init+0xf4/0x280 do_one_initcall+0x78/0x390 do_initcalls+0x11a/0x140 kernel_init_freeable+0x25e/0x2a0 kernel_init+0x2e/0x170 __ret_from_fork+0x3c/0x58 ret_from_fork+0xa/0x40 Freed in iucv_init+0x92/0x280 age=167839 cpu=2 pid=1 __kmem_cache_free+0x308/0x358 iucv_init+0x92/0x280 do_one_initcall+0x78/0x390 do_initcalls+0x11a/0x140 kernel_init_freeable+0x25e/0x2a0 kernel_init+0x2e/0x170 __ret_from_fork+0x3c/0x58 ret_from_fork+0xa/0x40
Slab 0x0000037200010000 objects=32 used=30 fp=0x0000000000400640 flags=0x1ffff00000010200(slab|head|node=0|zone=0| Object 0x0000000000400540 @offset=1344 fp=0x0000000000000000
Redzone 0000000000400500: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................ Redzone 0000000000400510: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................ Redzone 0000000000400520: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................ Redzone 0000000000400530: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................
Object 0000000000400540: 00 01 00 03 00 00 00 00 00 00 00 00 00 00 00 00 ................
Object 0000000000400550: f3 86 81 f2 f4 82 f8 82 f0 f0 f0 f0 f0 f0 f0 f2 ................
Object 0000000000400560: 00 00 00 00 80 00 00 00 cc cc cc cc cc cc cc cc ................
Object 0000000000400570: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc ................
Redzone 0000000000400580: cc cc cc cc cc cc cc cc ........
Padding 00000000004005d4: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ Padding 00000000004005e4: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZZZZZ
Padding 00000000004005f4: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZ
CPU: 6 PID: 121030 Comm: 116-pai-crypto. Not tainted 6.3.0-20230221.rc0.git4.99b8246b2d71.300.fc37.s390x+debug #1 Hardware name: IBM 3931 A01 704 (z/VM 7.3.0) Call Trace: [<000000032aa034ec>] dump_stack_lvl+0xac/0x100 [<0000000329f5a6cc>] check_bytes_and_report+0x104/0x140 [<0000000329f5aa78>] check_object+0x370/0x3c0 [<0000000329f5ede6>] free_debug_processing+0x15e/0x348 [<0000000329f5f06a>] free_to_partial_list+0x9a/0x2f0 [<0000000329f5f4a4>] __slab_free+0x1e4/0x3a8 [<0000000329f61768>] __kmem_cache_free+0x308/0x358 [<000000032a91465c>] iucv_cpu_dead+0x6c/0x88 [<0000000329c2fc66>] cpuhp_invoke_callback+0x156/0x2f0 [<000000032aa062da>] _cpu_down.constprop.0+0x22a/0x5e0 [<0000000329c3243e>] cpu_device_down+0x4e/0x78 [<000000032a61dee0>] device_offline+0xc8/0x118 [<000000032a61e048>] online_store+0x60/0xe0 [<000000032a08b6b0>] kernfs_fop_write_iter+0x150/0x1e8 [<0000000329fab65c>] vfs_write+0x174/0x360 [<0000000329fab9fc>] ksys_write+0x74/0x100 [<000000032aa03a5a>] __do_syscall+0x1da/0x208 [<000000032aa177b2>] system_call+0x82/0xb0
INFO: lockdep is turned off.
FIX dma-kmalloc-64: Restoring kmalloc Redzone 0x0000000000400564-0x0000000000400567=0xcc FIX dma-kmalloc-64: Object at 0x0000000000400540 not freed
--- net/iucv/iucv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/iucv/iucv.c +1 -1
@@ -83,7 +83,7 @@ struct iucv_irq_data {u16 ippathid;u8 ipflags1;u8 iptype; -u32 res2[8 ]; +u32 res2[9 ]; };struct iucv_irq_list {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 48/115 selftests: net: devlink_port_split.py: skip test if no suitable device available
In reply to Greg Kroah-HartmanFrom: Po-Hsu Lin <[email protected]>
[ Upstream commit 24994513ad13ff2c47ba91d2b5df82c3d496c370 ]
The devlink -j port show command output may not contain the "flavour" key, an example from Ubuntu 22.10 s390x LPAR(5.19.0-37-generic), with mlx4 driver and iproute2-5.15.0:
{"port":{"pci/0001:00:00.0/1":{"type":"eth","netdev":"ens301"},
"pci/0001:00:00.0/2":{"type":"eth","netdev":"ens301d1"},
"pci/0002:00:00.0/1":{"type":"eth","netdev":"ens317"},
"pci/0002:00:00.0/2":{"type":"eth","netdev":"ens317d1"}}}This will cause a KeyError exception.
Create a validate_devlink_output() to check for this "flavour" from devlink command output to avoid this KeyError exception. Also let it handle the check for devlink -j dev show output in main().
Apart from this, if the test was not started because the max lanes of the designated device is 0. The script will still return 0 and thus causing a false-negative test result.
Use a found_max_lanes flag to determine if these tests were skipped due to this reason and return KSFT_SKIP to make it more clear.
--- .../selftests/net/devlink_port_split.py | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-)
tools/testing/selftests/net/devlink_port_split.py +31 -5
@@ -59,6 +59,8 @@ class devlink_ports(object): assert stderr == "" ports = json.loads(stdout)['port'] + validate_devlink_output(ports, 'flavour') + for port in ports: if dev in port: if ports[port]['flavour'] == 'physical':
@@ -220,6 +222,27 @@ def split_splittable_port(port, k, lanes, dev): unsplit(port.bus_info) +def validate_devlink_output(devlink_data, target_property=None): + """ + Determine if test should be skipped by checking: + 1. devlink_data contains values + 2. The target_property exist in devlink_data + """ + skip_reason = None + if any(devlink_data.values()): + if target_property: + skip_reason = "{} not found in devlink output, test skipped".format(target_property) + for key in devlink_data: + if target_property in devlink_data[key]: + skip_reason = None + else: + skip_reason = 'devlink output is empty, test skipped' + + if skip_reason: + print(skip_reason) + sys.exit(KSFT_SKIP) + + def make_parser(): parser = argparse.ArgumentParser(description='A test for port splitting.') parser.add_argument('--dev',
@@ -240,12 +263,9 @@ def main(cmdline=None): stdout, stderr = run_command(cmd) assert stderr == "" + validate_devlink_output(json.loads(stdout)) devs = json.loads(stdout)['dev'] - if devs: - dev = list(devs.keys())[0] - else: - print("no devlink device was found, test skipped") - sys.exit(KSFT_SKIP) + dev = list(devs.keys())[0] cmd = "devlink dev show %s" % dev stdout, stderr = run_command(cmd)
@@ -255,6 +275,7 @@ def main(cmdline=None): ports = devlink_ports(dev) + found_max_lanes = False for port in ports.if_names: max_lanes = get_max_lanes(port.name)
@@ -277,6 +298,11 @@ def main(cmdline=None): split_splittable_port(port, lane, max_lanes, dev) lane //= 2 + found_max_lanes = True + + if not found_max_lanes: + print(f"Test not started, no port of device {dev} reports max_lanes") + sys.exit(KSFT_SKIP) if __name__ == "__main__":
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/115 qed/qed_mng_tlv: correctly zero out ->min instead of ->hour
In reply to Greg Kroah-HartmanFrom: Daniil Tatianin <[email protected]>
[ Upstream commit 470efd68a4653d9819d391489886432cd31bcd0b ]
This fixes an issue where ->hour would erroneously get zeroed out instead of ->min because of a bad copy paste.
Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
--- drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c +1 -1
@@ -422,7 +422,7 @@ qed_mfw_get_tlv_time_value(struct qed_mfw_tlv_time *p_time,if (p_time->hour >23 ) p_time->hour =0 ;if (p_time->min >59 ) - p_time->hour =0 ; + p_time->min =0 ;if (p_time->msec >999 ) p_time->msec =0 ;if (p_time->usec >999 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/115 ethernet: sun: add check for the mdesc_grab()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 90de546d9a0b3c771667af18bb3f80567eabb89b ]
In vnet_port_probe() and vsw_port_probe(), we should check the return value of mdesc_grab() as it may return NULL which can caused NPD bugs.
--- drivers/net/ethernet/sun/ldmvsw.c | 3 +++ drivers/net/ethernet/sun/sunvnet.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/sun/ldmvsw.c +3 -0
@@ -290,6 +290,9 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) hp =mdesc_grab (); +if (!hp) +return -ENODEV ; + rmac =mdesc_get_property (hp, vdev->mp, remote_macaddr_prop, &len); err = -ENODEV ;if (!rmac) {
drivers/net/ethernet/sun/sunvnet.c +3 -0
@@ -431,6 +431,9 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) hp =mdesc_grab (); +if (!hp) +return -ENODEV ; + vp =vnet_find_parent (hp, vdev->mp, vdev);if (IS_ERR (vp)) {pr_err ("Cannot find port parent vnet\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/115 bonding: restore IFF_MASTER/SLAVE flags on bond enslave ether type change
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 9ec7eb60dcbcb6c41076defbc5df7bbd95ceaba5 ]
Add bond_ether_setup helper which is used to fix ether_setup() calls in the bonding driver. It takes care of both IFF_MASTER and IFF_SLAVE flags, the former is always restored and the latter only if it was set.
If the bond enslaves non-ARPHRD_ETHER device (changes its type), then releases it and enslaves ARPHRD_ETHER device (changes back) then we use ether_setup() to restore the bond device type but it also resets its flags and removes IFF_MASTER and IFF_SLAVE[1]. Use the bond_ether_setup helper to restore both after such transition.
[1] reproduce (nlmon is non-ARPHRD_ETHER):
$ ip l add nlmon0 type nlmon
$ ip l add bond2 type bond mode active-backup
$ ip l set nlmon0 master bond2
$ ip l set nlmon0 nomaster
$ ip l add bond1 type bond
(we use bond1 as ARPHRD_ETHER device to restore bond2's mode)
$ ip l set bond1 master bond2
$ ip l sh dev bond2
37: bond2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether be:d7:c5:40:5b:cc brd ff:ff:ff:ff:ff:ff promiscuity 0 minmtu 68 maxmtu 1500
(notice bond2's IFF_MASTER is missing)--- drivers/net/bonding/bond_main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/bonding/bond_main.c +15 -4
@@ -1744,6 +1744,19 @@ void bond_lower_state_changed(struct slave *slave)slave_err (bond_dev, slave_dev,"Error: %s\n" , errmsg); \ }while (0 ) +/* The bonding driver uses ether_setup() to convert a master bond device +* to ARPHRD_ETHER, that resets the target netdevice's flags so we always +* have to restore the IFF_MASTER flag, and only restore IFF_SLAVE if it was set +*/ +static void bond_ether_setup(struct net_device *bond_dev) +{ +unsigned int slave_flag = bond_dev->flags &IFF_SLAVE ; + +ether_setup (bond_dev); + bond_dev->flags |=IFF_MASTER | slave_flag; + bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING ; +} +/* enslave device <slave> to bond device <master> */ int bond_enslave (struct net_device *bond_dev,struct net_device *slave_dev,struct netlink_ext_ack *extack)
@@ -1835,10 +1848,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,if (slave_dev->type !=ARPHRD_ETHER )bond_setup_by_slave (bond_dev, slave_dev); -else { -ether_setup (bond_dev); - bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING ; - } +else +bond_ether_setup (bond_dev);call_netdevice_notifiers (NETDEV_POST_TYPE_CHANGE , bond_dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 52/115 bonding: restore bonds IFF_SLAVE flag if a non-eth dev enslave fails
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit e667d469098671261d558be0cd93dca4d285ce1e ]
syzbot reported a warning[1] where the bond device itself is a slave and we try to enslave a non-ethernet device as the first slave which fails but then in the error path when ether_setup() restores the bond device it also clears all flags. In my previous fix[2] I restored the IFF_MASTER flag, but I didn't consider the case that the bond device itself might also be a slave with IFF_SLAVE set, so we need to restore that flag as well. Use the bond_ether_setup helper which does the right thing and restores the bond's flags properly.
Steps to reproduce using a nlmon dev:
$ ip l add nlmon0 type nlmon $ ip l add bond1 type bond $ ip l add bond2 type bond $ ip l set bond1 master bond2 $ ip l set dev nlmon0 master bond1 $ ip -d l sh dev bond1 22: bond1: <BROADCAST,MULTICAST,MASTER> mtu 1500 qdisc noqueue master bond2 state DOWN mode DEFAULT group default qlen 1000 (now bond1's IFF_SLAVE flag is gone and we'll hit a warning[3] if we try to delete it)
[1] https://syzkaller.appspot.com/bug?id=391c7b1f6522182899efba27d891f1743e8eb3ef
[2] commit 7d5cd2ce5292 ("bonding: correctly handle bonding type change on enslave failure")
[3] example warning:
[ 27.008664] bond1: (slave nlmon0): The slave device specified does not support setting the MAC address [ 27.008692] bond1: (slave nlmon0): Error -95 calling set_mac_address [ 32.464639] bond1 (unregistering): Released all slaves [ 32.464685] ------------[ cut here ]------------ [ 32.464686] WARNING: CPU: 1 PID: 2004 at net/core/dev.c:10829 unregister_netdevice_many+0x72a/0x780 [ 32.464694] Modules linked in: br_netfilter bridge bonding virtio_net [ 32.464699] CPU: 1 PID: 2004 Comm: ip Kdump: loaded Not tainted 5.18.0-rc3+ #47 [ 32.464703] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.1-2.fc37 04/01/2014 [ 32.464704] RIP: 0010:unregister_netdevice_many+0x72a/0x780 [ 32.464707] Code: 99 fd ff ff ba 90 1a 00 00 48 c7 c6 f4 02 66 96 48 c7 c7 20 4d 35 96 c6 05 fa c7 2b 02 01 e8 be 6f 4a 00 0f 0b e9 73 fd ff ff <0f> 0b e9 5f fd ff ff 80 3d e3 c7 2b 02 00 0f 85 3b fd ff ff ba 59 [ 32.464710] RSP: 0018:ffffa006422d7820 EFLAGS: 00010206 [ 32.464712] RAX: ffff8f6e077140a0 RBX: ffffa006422d7888 RCX: 0000000000000000 [ 32.464714] RDX: ffff8f6e12edbe58 RSI: 0000000000000296 RDI: ffffffff96d4a520 [ 32.464716] RBP: ffff8f6e07714000 R08: ffffffff96d63600 R09: ffffa006422d7728 [ 32.464717] R10: 0000000000000ec0 R11: ffffffff9698c988 R12: ffff8f6e12edb140 [ 32.464719] R13: dead000000000122 R14: dead000000000100 R15: ffff8f6e12edb140 [ 32.464723] FS: 00007f297c2f1740(0000) GS:ffff8f6e5d900000(0000) knlGS:0000000000000000 [ 32.464725] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 32.464726] CR2: 00007f297bf1c800 CR3: 00000000115e8000 CR4: 0000000000350ee0 [ 32.464730] Call Trace: [ 32.464763] <TASK> [ 32.464767] rtnl_dellink+0x13e/0x380 [ 32.464776] ? cred_has_capability.isra.0+0x68/0x100 [ 32.464780] ? __rtnl_unlock+0x33/0x60 [ 32.464783] ? bpf_lsm_capset+0x10/0x10 [ 32.464786] ? security_capable+0x36/0x50 [ 32.464790] rtnetlink_rcv_msg+0x14e/0x3b0 [ 32.464792] ? _copy_to_iter+0xb1/0x790 [ 32.464796] ? post_alloc_hook+0xa0/0x160 [ 32.464799] ? rtnl_calcit.isra.0+0x110/0x110 [ 32.464802] netlink_rcv_skb+0x50/0xf0 [ 32.464806] netlink_unicast+0x216/0x340 [ 32.464809] netlink_sendmsg+0x23f/0x480 [ 32.464812] sock_sendmsg+0x5e/0x60 [ 32.464815] ____sys_sendmsg+0x22c/0x270 [ 32.464818] ? import_iovec+0x17/0x20 [ 32.464821] ? sendmsg_copy_msghdr+0x59/0x90 [ 32.464823] ? do_set_pte+0xa0/0xe0 [ 32.464828] ___sys_sendmsg+0x81/0xc0 [ 32.464832] ? mod_objcg_state+0xc6/0x300 [ 32.464835] ? refill_obj_stock+0xa9/0x160 [ 32.464838] ? memcg_slab_free_hook+0x1a5/0x1f0 [ 32.464842] __sys_sendmsg+0x49/0x80 [ 32.464847] do_syscall_64+0x3b/0x90 [ 32.464851] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 32.464865] RIP: 0033:0x7f297bf2e5e7 [ 32.464868] Code: 64 89 02 48 c7 c0 ff ff ff ff eb bb 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 32.464869] RSP: 002b:00007ffd96c824c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 32.464872] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f297bf2e5e7 [ 32.464874] RDX: 0000000000000000 RSI: 00007ffd96c82540 RDI: 0000000000000003 [ 32.464875] RBP: 00000000640f19de R08: 0000000000000001 R09: 000000000000007c [ 32.464876] R10: 00007f297bffabe0 R11: 0000000000000246 R12: 0000000000000001 [ 32.464877] R13: 00007ffd96c82d20 R14: 00007ffd96c82610 R15: 000055bfe38a7020 [ 32.464881] </TASK> [ 32.464882] ---[ end trace 0000000000000000 ]---
--- drivers/net/bonding/bond_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/bonding/bond_main.c +1 -3
@@ -2267,9 +2267,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,eth_hw_addr_random (bond_dev);if (bond_dev->type !=ARPHRD_ETHER ) {dev_close (bond_dev); -ether_setup (bond_dev); - bond_dev->flags |=IFF_MASTER ; - bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING ; +bond_ether_setup (bond_dev); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/115 hwmon: (adt7475) Display smoothing attributes in correct order
In reply to Greg Kroah-HartmanFrom: Tony O'Brien <[email protected]>
[ Upstream commit 5f8d1e3b6f9b5971f9c06d5846ce00c49e3a8d94 ]
Throughout the ADT7475 driver, attributes relating to the temperature sensors are displayed in the order Remote 1, Local, Remote 2. Make temp_st_show() conform to this expectation so that values set by temp_st_store() can be displayed using the correct attribute.
--- drivers/hwmon/adt7475.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/adt7475.c +2 -2
@@ -554,11 +554,11 @@ static ssize_t temp_st_show(struct device *dev, struct device_attribute *attr, val = data->enh_acoustics[0 ] &0xf ;break ;case 1 : - val = (data->enh_acoustics[1 ] >>4 ) &0xf ; + val = data->enh_acoustics[1 ] &0xf ;break ;case 2 :default : - val = data->enh_acoustics[1 ] &0xf ; + val = (data->enh_acoustics[1 ] >>4 ) &0xf ;break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/115 hwmon: (adt7475) Fix masking of hysteresis registers
In reply to Greg Kroah-HartmanFrom: Tony O'Brien <[email protected]>
[ Upstream commit 48e8186870d9d0902e712d601ccb7098cb220688 ]
The wrong bits are masked in the hysteresis register; indices 0 and 2 should zero bits [7:4] and preserve bits [3:0], and index 1 should zero bits [3:0] and preserve bits [7:4].
--- drivers/hwmon/adt7475.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/adt7475.c +2 -2
@@ -486,10 +486,10 @@ static ssize_t temp_store(struct device *dev, struct device_attribute *attr, val = (temp - val) /1000 ;if (sattr->index !=1 ) { - data->temp[HYSTERSIS ][sattr->index] &=0xF0 ; + data->temp[HYSTERSIS ][sattr->index] &=0x0F ; data->temp[HYSTERSIS ][sattr->index] |= (val &0xF ) <<4 ; }else { - data->temp[HYSTERSIS ][sattr->index] &=0x0F ; + data->temp[HYSTERSIS ][sattr->index] &=0xF0 ; data->temp[HYSTERSIS ][sattr->index] |= (val &0xF ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/115 hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit cb090e64cf25602b9adaf32d5dfc9c8bec493cd1 ]
In xgene_hwmon_probe, &ctx->workq is bound with xgene_hwmon_evt_work. Then it will be started.
If we remove the driver which will call xgene_hwmon_remove to clean up, there may be unfinished work.
The possible sequence is as follows:
Fix it by finishing the work before cleanup in xgene_hwmon_remove.
CPU0 CPU1
|xgene_hwmon_evt_workxgene_hwmon_remove |
kfifo_free(&ctx->async_msg_fifo);|
|
|kfifo_out_spinlocked
|//use &ctx->async_msg_fifo--- drivers/hwmon/xgene-hwmon.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/xgene-hwmon.c +1 -0
@@ -768,6 +768,7 @@ static int xgene_hwmon_remove(struct platform_device *pdev) {struct xgene_hwmon_dev *ctx =platform_get_drvdata (pdev); +cancel_work_sync (&ctx->workq);hwmon_device_unregister (ctx->hwmon_dev);kfifo_free (&ctx->async_msg_fifo);if (acpi_disabled)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/115 hwmon: (ina3221) return prober error code
In reply to Greg Kroah-HartmanFrom: Marcus Folkesson <[email protected]>
[ Upstream commit c93f5e2ab53243b17febabb9422a697017d3d49a ]
ret is set to 0 which do not indicate an error.
Return -EINVAL instead.
--- drivers/hwmon/ina3221.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/ina3221.c +1 -1
@@ -772,7 +772,7 @@ static int ina3221_probe_child_from_dt(struct device *dev,return ret; }else if (val >INA3221_CHANNEL3 ) {dev_err (dev,"invalid reg %d of %pOFn\n" , val, child); -return ret; +return -EINVAL ; } input = &ina->inputs[val];
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/115 hwmon: (ucd90320) Add minimum delay between bus accesses
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit 8d655e65237643c48ada2c131b83679bf1105373 ]
When probing the ucd90320 access to some of the registers randomly fails. Sometimes it NACKs a transfer, sometimes it returns just random data and the PEC check fails.
Experimentation shows that this seems to be triggered by a register access directly back to back with a previous register write. Experimentation also shows that inserting a small delay after register writes makes the issue go away.
Use a similar solution to what the max15301 driver does to solve the same problem. Create a custom set of bus read and write functions that make sure that the delay is added.
--- drivers/hwmon/pmbus/ucd9000.c | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)
drivers/hwmon/pmbus/ucd9000.c +75 -0
@@ -7,6 +7,7 @@*/ #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/of_device.h>
@@ -16,6 +17,7 @@#include <linux/i2c.h> #include <linux/pmbus.h> #include <linux/gpio/driver.h> +#include <linux/timekeeping.h> #include "pmbus.h" enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd90320, ucd9090,
@@ -65,6 +67,7 @@ struct ucd9000_data {struct gpio_chip gpio;#endif struct dentry *debugfs; +ktime_t write_time; };#define to_ucd9000_data (_info) container_of(_info, struct ucd9000_data, info)
@@ -73,6 +76,73 @@ struct ucd9000_debugfs_entry {u8 index; }; +/* +* It has been observed that the UCD90320 randomly fails register access when +* doing another access right on the back of a register write. To mitigate this +* make sure that there is a minimum delay between a write access and the +* following access. The 250us is based on experimental data. At a delay of +* 200us the issue seems to go away. Add a bit of extra margin to allow for +* system to system differences. +*/ +#define UCD90320_WAIT_DELAY_US 250 + +static inline void ucd90320_wait (const struct ucd9000_data *data) +{ +s64 delta =ktime_us_delta (ktime_get (), data->write_time); + +if (delta <UCD90320_WAIT_DELAY_US ) +udelay (UCD90320_WAIT_DELAY_US - delta); +} + +static int ucd90320_read_word_data (struct i2c_client *client,int page, +int phase,int reg) +{ +const struct pmbus_driver_info *info =pmbus_get_driver_info (client); +struct ucd9000_data *data =to_ucd9000_data (info); + +if (reg >=PMBUS_VIRT_BASE ) +return -ENXIO ; + +ucd90320_wait (data); +return pmbus_read_word_data (client, page, phase, reg); +} + +static int ucd90320_read_byte_data (struct i2c_client *client,int page,int reg) +{ +const struct pmbus_driver_info *info =pmbus_get_driver_info (client); +struct ucd9000_data *data =to_ucd9000_data (info); + +ucd90320_wait (data); +return pmbus_read_byte_data (client, page, reg); +} + +static int ucd90320_write_word_data (struct i2c_client *client,int page, +int reg,u16 word) +{ +const struct pmbus_driver_info *info =pmbus_get_driver_info (client); +struct ucd9000_data *data =to_ucd9000_data (info); +int ret; + +ucd90320_wait (data); + ret =pmbus_write_word_data (client, page, reg, word); + data->write_time =ktime_get (); + +return ret; +} + +static int ucd90320_write_byte (struct i2c_client *client,int page,u8 value) +{ +const struct pmbus_driver_info *info =pmbus_get_driver_info (client); +struct ucd9000_data *data =to_ucd9000_data (info); +int ret; + +ucd90320_wait (data); + ret =pmbus_write_byte (client, page, value); + data->write_time =ktime_get (); + +return ret; +} +static int ucd9000_get_fan_config (struct i2c_client *client,int fan) {int fan_config =0 ;
@@ -598,6 +668,11 @@ static int ucd9000_probe(struct i2c_client *client) info->read_byte_data = ucd9000_read_byte_data; info->func[0 ] |=PMBUS_HAVE_FAN12 |PMBUS_HAVE_STATUS_FAN12 |PMBUS_HAVE_FAN34 |PMBUS_HAVE_STATUS_FAN34 ; + }else if (mid->driver_data == ucd90320) { + info->read_byte_data = ucd90320_read_byte_data; + info->read_word_data = ucd90320_read_word_data; + info->write_byte = ucd90320_write_byte; + info->write_word_data = ucd90320_write_word_data; }ucd9000_probe_gpio (client, mid, data);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 58/115 hwmon: tmp512: drop of_match_ptr for ID table
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 00d85e81796b17a29a0e096c5a4735daa47adef8 ]
The driver will match mostly by DT table (even thought there is regular ID table) so there is little benefit in of_match_ptr (this also allows ACPI matching via PRP0001, even though it might not be relevant here). This also fixes !CONFIG_OF error:
drivers/hwmon/tmp513.c:610:34: error: ‘tmp51x_of_match’ defined but not used [-Werror=unused-const-variable=]
--- drivers/hwmon/tmp513.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/tmp513.c +1 -1
@@ -758,7 +758,7 @@ static int tmp51x_probe(struct i2c_client *client)static struct i2c_driver tmp51x_driver = { .driver = { .name ="tmp51x" , - .of_match_table =of_match_ptr (tmp51x_of_match), + .of_match_table = tmp51x_of_match, }, .probe_new = tmp51x_probe, .id_table = tmp51x_id,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/115 kconfig: Update config changed flag before calling callback
In reply to Greg Kroah-HartmanFrom: Jurica Vukadin <[email protected]>
[ Upstream commit ee06a3ef7e3cddb62b90ac40aa661d3c12f7cabc ]
Prior to commit 5ee546594025 ("kconfig: change sym_change_count to a boolean flag"), the conf_updated flag was set to the new value *before* calling the callback. xconfig's save action depends on this behaviour, because xconfig calls conf_get_changed() directly from the callback and now sees the old value, thus never enabling the save button or the shortcut.
Restore the previous behaviour.
--- scripts/kconfig/confdata.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/kconfig/confdata.c +4 -2
@@ -1124,10 +1124,12 @@ static void (*conf_changed_callback)(void);void conf_set_changed (bool val) { -if (conf_changed_callback && conf_changed != val) -conf_changed_callback (); +bool changed = conf_changed != val; conf_changed = val; + +if (conf_changed_callback && changed) +conf_changed_callback (); }bool conf_get_changed (void )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/115 hwmon: (adm1266) Set `can_sleep` flag for GPIO chip
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit a5bb73b3f5db1a4e91402ad132b59b13d2651ed9 ]
The adm1266 driver uses I2C bus access in its GPIO chip set and get implementation. This means these functions can sleep and the GPIO chip should set the can_sleep property to true.
This will ensure that a warning is printed when trying to set or get the GPIO value from a context that potentially can't sleep.
--- drivers/hwmon/pmbus/adm1266.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/pmbus/adm1266.c +1 -0
@@ -301,6 +301,7 @@ static int adm1266_config_gpio(struct adm1266_data *data) data->gc.label = name; data->gc.parent = &data->client->dev; data->gc.owner =THIS_MODULE ; + data->gc.can_sleep = true; data->gc.base =-1 ; data->gc.names = data->gpio_names; data->gc.ngpio =ARRAY_SIZE (data->gpio_names);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/115 hwmon: (ltc2992) Set `can_sleep` flag for GPIO chip
In reply to Greg Kroah-HartmanFrom: Lars-Peter Clausen <[email protected]>
[ Upstream commit ab00709310eedcd8dae0df1f66d332f9bc64c99e ]
The ltc2992 drivers uses a mutex and I2C bus access in its GPIO chip set and get implementation. This means these functions can sleep and the GPIO chip should set the can_sleep property to true.
This will ensure that a warning is printed when trying to set or get the GPIO value from a context that potentially can't sleep.
--- drivers/hwmon/ltc2992.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/ltc2992.c +1 -0
@@ -324,6 +324,7 @@ static int ltc2992_config_gpio(struct ltc2992_state *st) st->gc.label = name; st->gc.parent = &st->client->dev; st->gc.owner =THIS_MODULE ; + st->gc.can_sleep = true; st->gc.base =-1 ; st->gc.names = st->gpio_names; st->gc.ngpio =ARRAY_SIZE (st->gpio_names);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 62/115 media: m5mols: fix off-by-one loop termination error
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
[ Upstream commit efbcbb12ee99f750c9f25c873b55ad774871de2a ]
The __find_restype() function loops over the m5mols_default_ffmt[] array, and the termination condition ends up being wrong: instead of stopping when the iterator becomes the size of the array it traverses, it stops after it has already overshot the array.
Now, in practice this doesn't likely matter, because the code will always find the entry it looks for, and will thus return early and never hit that last extra iteration.
But it turns out that clang will unroll the loop fully, because it has only two iterations (well, three due to the off-by-one bug), and then clang will end up just giving up in the middle of the loop unrolling when it notices that the code walks past the end of the array.
And that made 'objtool' very unhappy indeed, because the generated code just falls off the edge of the universe, and ends up falling through to the next function, causing this warning:
drivers/media/i2c/m5mols/m5mols.o: warning: objtool: m5mols_set_fmt() falls through to next function m5mols_get_frame_desc()
Fix the loop ending condition.
--- drivers/media/i2c/m5mols/m5mols_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/m5mols/m5mols_core.c +1 -1
@@ -488,7 +488,7 @@ static enum m5mols_restype __find_restype(u32 code)do {if (code == m5mols_default_ffmt[type].code)return type; - }while (type++ !=SIZE_DEFAULT_FFMT ); + }while (++type !=SIZE_DEFAULT_FFMT );return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/115 mmc: atmel-mci: fix race between stop command and start of next command
In reply to Greg Kroah-HartmanFrom: Tobias Schramm <[email protected]>
[ Upstream commit eca5bd666b0aa7dc0bca63292e4778968241134e ]
This commit fixes a race between completion of stop command and start of a new command.
Previously the command ready interrupt was enabled before stop command was written to the command register. This caused the command ready interrupt to fire immediately since the CMDRDY flag is asserted constantly while there is no command in progress.
Consequently the command state machine will immediately advance to the next state when the tasklet function is executed again, no matter actual completion state of the stop command.
Thus a new command can then be dispatched immediately, interrupting and corrupting the stop command on the CMD line.
Fix that by dropping the command ready interrupt enable before calling atmci_send_stop_cmd. atmci_send_stop_cmd does already enable the command ready interrupt, no further writes to ATMCI_IER are necessary.
--- drivers/mmc/host/atmel-mci.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mmc/host/atmel-mci.c +0 -3
@@ -1818,7 +1818,6 @@ static void atmci_tasklet_func(struct tasklet_struct *t)atmci_writel (host,ATMCI_IER ,ATMCI_NOTBUSY ); state =STATE_WAITING_NOTBUSY ; }else if (host->mrq->stop) { -atmci_writel (host,ATMCI_IER ,ATMCI_CMDRDY );atmci_send_stop_cmd (host, data); state =STATE_SENDING_STOP ; }else {
@@ -1851,8 +1850,6 @@ static void atmci_tasklet_func(struct tasklet_struct *t)* command to send. */ if (host->mrq->stop) { -atmci_writel (host,ATMCI_IER , -ATMCI_CMDRDY );atmci_send_stop_cmd (host, data); state =STATE_SENDING_STOP ; }else {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/115 jffs2: correct logic when creating a hole in jffs2_write_begin
In reply to Greg Kroah-HartmanFrom: Yifei Liu <[email protected]>
[ Upstream commit 23892d383bee15b64f5463bd7195615734bb2415 ]
Bug description and fix:
1. Write data to a file, say all 1s from offset 0 to 16.
2. Truncate the file to a smaller size, say 8 bytes.
3. Write new bytes (say 2s) from an offset past the original size of the file, say at offset 20, for 4 bytes. This is supposed to create a "hole" in the file, meaning that the bytes from offset 8 (where it was truncated above) up to the new write at offset 20, should all be 0s (zeros).
4. Flush all caches using "echo 3 > /proc/sys/vm/drop_caches" (or unmount and remount) the f/s.
5. Check the content of the file. It is wrong. The 1s that used to be between bytes 9 and 16, before the truncation, have REAPPEARED (they should be 0s).
We wrote a script and helper C program to reproduce the bug (reproduce_jffs2_write_begin_issue.sh, write_file.c, and Makefile). We can make them available to anyone.
The above example is shown when writing a small file within the same first page. But the bug happens for larger files, as long as steps 1, 2, and 3 above all happen within the same page.
The problem was traced to the jffs2_write_begin code, where it goes into an 'if' statement intended to handle writes past the current EOF (i.e., writes that may create a hole). The code computes a 'pageofs' that is the floor of the write position (pos), aligned to the page size boundary. In other words, 'pageofs' will never be larger than 'pos'. The code then sets the internal jffs2_raw_inode->isize to the size of max(current inode size, pageofs) but that is wrong: the new file size should be the 'pos', which is larger than both the current inode size and pageofs.
Similarly, the code incorrectly sets the internal jffs2_raw_inode->dsize to the difference between the pageofs minus current inode size; instead it should be the current pos minus the current inode size. Finally, inode->i_size was also set incorrectly.
The patch below fixes this bug. The bug was discovered using a new tool for finding f/s bugs using model checking, called MCFS (Model Checking File Systems).
--- fs/jffs2/file.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
fs/jffs2/file.c +7 -8
@@ -138,19 +138,18 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,struct jffs2_inode_info *f =JFFS2_INODE_INFO (inode);struct jffs2_sb_info *c =JFFS2_SB_INFO (inode->i_sb);pgoff_t index = pos >>PAGE_SHIFT ; -uint32_t pageofs = index <<PAGE_SHIFT ;int ret =0 ;jffs2_dbg (1 ,"%s()\n" , __func__); -if (pageofs > inode->i_size) { -/* Make new hole frag from old EOF to new page */ +if (pos > inode->i_size) { +/* Make new hole frag from old EOF to new position */ struct jffs2_raw_inode ri;struct jffs2_full_dnode *fn;uint32_t alloc_len; -jffs2_dbg (1 ,"Writing new hole frag 0x%x-0x%x between current EOF and new page\n" , - (unsigned int )inode->i_size, pageofs); +jffs2_dbg (1 ,"Writing new hole frag 0x%x-0x%x between current EOF and new position\n" , + (unsigned int )inode->i_size, (uint32_t )pos); ret =jffs2_reserve_space (c,sizeof (ri), &alloc_len,ALLOC_NORMAL ,JFFS2_SUMMARY_INODE_SIZE );
@@ -170,10 +169,10 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, ri.mode =cpu_to_jemode (inode->i_mode); ri.uid =cpu_to_je16 (i_uid_read (inode)); ri.gid =cpu_to_je16 (i_gid_read (inode)); - ri.isize =cpu_to_je32 (max ((uint32_t )inode->i_size, pageofs)); + ri.isize =cpu_to_je32 ((uint32_t )pos); ri.atime = ri.ctime = ri.mtime =cpu_to_je32 (JFFS2_NOW ()); ri.offset =cpu_to_je32 (inode->i_size); - ri.dsize =cpu_to_je32 (pageofs - inode->i_size); + ri.dsize =cpu_to_je32 ((uint32_t )pos - inode->i_size); ri.csize =cpu_to_je32 (0 ); ri.compr =JFFS2_COMPR_ZERO ; ri.node_crc =cpu_to_je32 (crc32 (0 , &ri,sizeof (ri)-8 ));
@@ -203,7 +202,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, goto out_err; }jffs2_complete_reservation (c); - inode->i_size = pageofs; + inode->i_size = pos;mutex_unlock (&f->sem); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 65/115 rust: arch/um: Disable FP/SIMD instruction to match x86
In reply to Greg Kroah-HartmanFrom: David Gow <[email protected]>
[ Upstream commit 8849818679478933dd1d9718741f4daa3f4e8b86 ]
The kernel disables all SSE and similar FP/SIMD instructions on x86-based architectures (partly because we shouldn't be using floats in the kernel, and partly to avoid the need for stack alignment, see:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53383 )
UML does not do the same thing, which isn't in itself a problem, but does add to the list of differences between UML and "normal" x86 builds.
In addition, there was a crash bug with LLVM < 15 / rustc < 1.65 when building with SSE, so disabling it fixes rust builds with earlier compiler versions, see:
https://github.com/Rust-for-Linux/linux/pull/881
--- arch/x86/Makefile.um | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/Makefile.um +6 -0
@@ -1,6 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 core-y += arch/x86/crypto/ +# +# Disable SSE and other FP/SIMD instructions to match normal x86 +# +KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -mno-avx +KBUILD_RUSTFLAGS += -Ctarget-feature=-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2 + ifeq ($(CONFIG_X86_32),y) START := 0x8048000
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/115 ext4: fail ext4_iget if special inode unallocated
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit 5cd740287ae5e3f9d1c46f5bfe8778972fd6d3fe ]
In ext4_fill_super(), EXT4_ORPHAN_FS flag is cleared after ext4_orphan_cleanup() is executed. Therefore, when __ext4_iget() is called to get an inode whose i_nlink is 0 when the flag exists, no error is returned. If the inode is a special inode, a null pointer dereference may occur. If the value of i_nlink is 0 for any inodes (except boot loader inodes) got by using the EXT4_IGET_SPECIAL flag, the current file system is corrupted. Therefore, make the ext4_iget() function return an error if it gets such an abnormal special inode.
--- fs/ext4/inode.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
fs/ext4/inode.c +8 -10
@@ -4636,13 +4636,6 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, goto bad_inode; raw_inode =ext4_raw_inode (&iloc); -if ((ino ==EXT4_ROOT_INO ) && (raw_inode->i_links_count ==0 )) { -ext4_error_inode (inode, function, line,0 , -"iget: root inode unallocated" ); - ret = -EFSCORRUPTED ; - goto bad_inode; - } -if ((flags &EXT4_IGET_HANDLE ) && (raw_inode->i_links_count ==0 ) && (raw_inode->i_mode ==0 )) { ret = -ESTALE ;
@@ -4715,11 +4708,16 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,* NeilBrown 1999oct15 */ if (inode->i_nlink ==0 ) { -if ((inode->i_mode ==0 || +if ((inode->i_mode ==0 || flags &EXT4_IGET_SPECIAL || !(EXT4_SB (inode->i_sb)->s_mount_state &EXT4_ORPHAN_FS )) && ino !=EXT4_BOOT_LOADER_INO ) { -/* this inode is deleted */ - ret = -ESTALE ; +/* this inode is deleted or unallocated */ +if (flags &EXT4_IGET_SPECIAL ) { +ext4_error_inode (inode, function, line,0 , +"iget: special inode unallocated" ); + ret = -EFSCORRUPTED ; + }else + ret = -ESTALE ; goto bad_inode; }/* The only unlinked inodes we let through here have
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/115 ext4: update s_journal_inum if it changes after journal replay
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit 3039d8b8692408438a618fac2776b629852663c3 ]
When mounting a crafted ext4 image, s_journal_inum may change after journal replay, which is obviously unreasonable because we have successfully loaded and replayed the journal through the old s_journal_inum. And the new s_journal_inum bypasses some of the checks in ext4_get_journal(), which may trigger a null pointer dereference problem. So if s_journal_inum changes after the journal replay, we ignore the change, and rewrite the current journal_inum to the superblock.
--- fs/ext4/super.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/ext4/super.c +5 -2
@@ -5385,8 +5385,11 @@ static int ext4_load_journal(struct super_block *sb,if (!really_read_only && journal_devnum && journal_devnum !=le32_to_cpu (es->s_journal_dev)) { es->s_journal_dev =cpu_to_le32 (journal_devnum); - -/* Make sure we flush the recovery flag to disk. */ +ext4_commit_super (sb); + } +if (!really_read_only && journal_inum && + journal_inum !=le32_to_cpu (es->s_journal_inum)) { + es->s_journal_inum =cpu_to_le32 (journal_inum);ext4_commit_super (sb); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 68/115 ext4: fix task hung in ext4_xattr_delete_inode
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit 0f7bfd6f8164be32dbbdf36aa1e5d00485c53cd7 ]
Syzbot reported a hung task problem:
==================================================================
INFO: task syz-executor232:5073 blocked for more than 143 seconds.
Not tainted 6.2.0-rc2-syzkaller-00024-g512dee0c00ad #0
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:syz-exec232 state:D stack:21024 pid:5073 ppid:5072 flags:0x00004004
Call Trace:
<TASK>
context_switch kernel/sched/core.c:5244 [inline]
__schedule+0x995/0xe20 kernel/sched/core.c:6555
schedule+0xcb/0x190 kernel/sched/core.c:6631
__wait_on_freeing_inode fs/inode.c:2196 [inline]
find_inode_fast+0x35a/0x4c0 fs/inode.c:950
iget_locked+0xb1/0x830 fs/inode.c:1273
__ext4_iget+0x22e/0x3ed0 fs/ext4/inode.c:4861
ext4_xattr_inode_iget+0x68/0x4e0 fs/ext4/xattr.c:389
ext4_xattr_inode_dec_ref_all+0x1a7/0xe50 fs/ext4/xattr.c:1148
ext4_xattr_delete_inode+0xb04/0xcd0 fs/ext4/xattr.c:2880
ext4_evict_inode+0xd7c/0x10b0 fs/ext4/inode.c:296
evict+0x2a4/0x620 fs/inode.c:664
ext4_orphan_cleanup+0xb60/0x1340 fs/ext4/orphan.c:474
__ext4_fill_super fs/ext4/super.c:5516 [inline]
ext4_fill_super+0x81cd/0x8700 fs/ext4/super.c:5644
get_tree_bdev+0x400/0x620 fs/super.c:1282
vfs_get_tree+0x88/0x270 fs/super.c:1489
do_new_mount+0x289/0xad0 fs/namespace.c:3145
do_mount fs/namespace.c:3488 [inline]
__do_sys_mount fs/namespace.c:3697 [inline]
__se_sys_mount+0x2d3/0x3c0 fs/namespace.c:3674
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7fa5406fd5ea
RSP: 002b:00007ffc7232f968 EFLAGS: 00000202 ORIG_RAX: 00000000000000a5
RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fa5406fd5ea
RDX: 0000000020000440 RSI: 0000000020000000 RDI: 00007ffc7232f970
RBP: 00007ffc7232f970 R08: 00007ffc7232f9b0 R09: 0000000000000432
R10: 0000000000804a03 R11: 0000000000000202 R12: 0000000000000004
R13: 0000555556a7a2c0 R14: 00007ffc7232f9b0 R15: 0000000000000000
</TASK>
==================================================================The problem is that the inode contains an xattr entry with ea_inum of 15 when cleaning up an orphan inode <15>. When evict inode <15>, the reference counting of the corresponding EA inode is decreased. When EA inode <15> is found by find_inode_fast() in __ext4_iget(), it is found that the EA inode holds the I_FREEING flag and waits for the EA inode to complete deletion. As a result, when inode <15> is being deleted, we wait for inode <15> to complete the deletion, resulting in an infinite loop and triggering Hung Task. To solve this problem, we only need to check whether the ino of EA inode and parent is the same before getting EA inode.
--- fs/ext4/xattr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/ext4/xattr.c +11 -0
@@ -386,6 +386,17 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,struct inode *inode;int err; +/* +* We have to check for this corruption early as otherwise +* iget_locked() could wait indefinitely for the state of our +* parent inode. +*/ +if (parent->i_ino == ea_ino) { +ext4_error (parent->i_sb, +"Parent and EA inode have the same ino %lu" , ea_ino); +return -EFSCORRUPTED ; + } + inode =ext4_iget (parent->i_sb, ea_ino,EXT4_IGET_NORMAL );if (IS_ERR (inode)) { err =PTR_ERR (inode);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/115 drm/amdkfd: Fix an illegal memory access
In reply to Greg Kroah-HartmanFrom: Qu Huang <[email protected]>
[ Upstream commit 4fc8fff378b2f2039f2a666d9f8c570f4e58352c ]
In the kfd_wait_on_events() function, the kfd_event_waiter structure is allocated by alloc_event_waiters(), but the event field of the waiter structure is not initialized; When copy_from_user() fails in the kfd_wait_on_events() function, it will enter exception handling to release the previously allocated memory of the waiter structure; Due to the event field of the waiters structure being accessed in the free_waiters() function, this results in illegal memory access and system crash, here is the crash log:
localhost kernel: RIP: 0010:native_queued_spin_lock_slowpath+0x185/0x1e0 localhost kernel: RSP: 0018:ffffaa53c362bd60 EFLAGS: 00010082
localhost kernel: RAX: ff3d3d6bff4007cb RBX: 0000000000000282 RCX: 00000000002c0000 localhost kernel: RDX: ffff9e855eeacb80 RSI: 000000000000279c RDI: ffffe7088f6a21d0 localhost kernel: RBP: ffffe7088f6a21d0 R08: 00000000002c0000 R09: ffffaa53c362be64 localhost kernel: R10: ffffaa53c362bbd8 R11: 0000000000000001 R12: 0000000000000002 localhost kernel: R13: ffff9e7ead15d600 R14: 0000000000000000 R15: ffff9e7ead15d698 localhost kernel: FS: 0000152a3d111700(0000) GS:ffff9e855ee80000(0000) knlGS:0000000000000000 localhost kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
localhost kernel: CR2: 0000152938000010 CR3: 000000044d7a4000 CR4: 00000000003506e0 localhost kernel: Call Trace:
localhost kernel: _raw_spin_lock_irqsave+0x30/0x40
localhost kernel: remove_wait_queue+0x12/0x50
localhost kernel: kfd_wait_on_events+0x1b6/0x490 [hydcu]
localhost kernel: ? ftrace_graph_caller+0xa0/0xa0
localhost kernel: kfd_ioctl+0x38c/0x4a0 [hydcu]
localhost kernel: ? kfd_ioctl_set_trap_handler+0x70/0x70 [hydcu]
localhost kernel: ? kfd_ioctl_create_queue+0x5a0/0x5a0 [hydcu]
localhost kernel: ? ftrace_graph_caller+0xa0/0xa0
localhost kernel: __x64_sys_ioctl+0x8e/0xd0
localhost kernel: ? syscall_trace_enter.isra.18+0x143/0x1b0
localhost kernel: do_syscall_64+0x33/0x80
localhost kernel: entry_SYSCALL_64_after_hwframe+0x44/0xa9
localhost kernel: RIP: 0033:0x152a4dff68d7
Allocate the structure with kcalloc, and remove redundant 0-initialization and a redundant loop condition check.
--- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_events.c +3 -6
@@ -528,16 +528,13 @@ static struct kfd_event_waiter *alloc_event_waiters(uint32_t num_events)struct kfd_event_waiter *event_waiters;uint32_t i; - event_waiters =kmalloc_array (num_events, -sizeof (struct kfd_event_waiter ), -GFP_KERNEL ); + event_waiters =kcalloc (num_events,sizeof (struct kfd_event_waiter ), +GFP_KERNEL );if (!event_waiters)return NULL ; -for (i =0 ; (event_waiters) && (i < num_events) ; i++) { +for (i =0 ; i < num_events; i++)init_wait (&event_waiters[i].wait); - event_waiters[i].activated = false; - }return event_waiters; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/115 net/9p: fix bug in client create for .L
In reply to Greg Kroah-HartmanFrom: Eric Van Hensbergen <[email protected]>
[ Upstream commit 3866584a1c56a2bbc8c0981deb4476d0b801969e ]
We are supposed to set fid->mode to reflect the flags that were used to open the file. We were actually setting it to the creation mode which is the default perms of the file not the flags the file was opened with.
--- net/9p/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/9p/client.c +1 -1
@@ -1315,7 +1315,7 @@ int p9_client_create_dotl(struct p9_fid *ofid, const char *name, u32 flags, qid->type, qid->path, qid->version, iounit);memmove (&ofid->qid, qid,sizeof (struct p9_qid )); - ofid->mode = mode; + ofid->mode = flags; ofid->iounit = iounit; free_and_error:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 71/115 sh: intc: Avoid spurious sizeof-pointer-div warning
In reply to Greg Kroah-HartmanFrom: Michael Karcher <[email protected]>
[ Upstream commit 250870824c1cf199b032b1ef889c8e8d69d9123a ]
GCC warns about the pattern sizeof(void*)/sizeof(void), as it looks like the abuse of a pattern to calculate the array size. This pattern appears in the unevaluated part of the ternary operator in _INTC_ARRAY if the parameter is NULL.
The replacement uses an alternate approach to return 0 in case of NULL which does not generate the pattern sizeof(void*)/sizeof(void), but still emits the warning if _INTC_ARRAY is called with a nonarray parameter.
This patch is required for successful compilation with -Werror enabled.
The idea to use _Generic for type distinction is taken from Comment #7 in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108483 by Jakub Jelinek
--- include/linux/sh_intc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/linux/sh_intc.h +4 -1
@@ -97,7 +97,10 @@ struct intc_hw_desc {unsigned int nr_subgroups; }; -#define _INTC_ARRAY (a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) +#define _INTC_SIZEOF_OR_ZERO (a) (_Generic(a, \ + typeof(NULL): 0, \ + default: sizeof(a))) +#define _INTC_ARRAY (a) a, _INTC_SIZEOF_OR_ZERO(a)/sizeof(*a)#define INTC_HW_DESC (vectors, groups, mask_regs, \ prio_regs, sense_regs, ack_regs) \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 72/115 drm/amd/display: fix shift-out-of-bounds in CalculateVMAndRowBytes
In reply to Greg Kroah-HartmanFrom: Alex Hung <[email protected]>
[ Upstream commit 031f196d1b1b6d5dfcb0533b431e3ab1750e6189 ]
[WHY]
When PTEBufferSizeInRequests is zero, UBSAN reports the following warning because dml_log2 returns an unexpected negative value:
shift exponent 4294966273 is too large for 32-bit type 'int'
[HOW]
In the case PTEBufferSizeInRequests is zero, skip the dml_log2() and assign the result directly.
--- .../gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +4 -1
@@ -1868,7 +1868,10 @@ static unsigned int CalculateVMAndRowBytes( }if (SurfaceTiling == dm_sw_linear) { - *dpte_row_height =dml_min (128 ,1 << (unsigned int )dml_floor (dml_log2 (PTEBufferSizeInRequests * *PixelPTEReqWidth / Pitch),1 )); +if (PTEBufferSizeInRequests ==0 ) + *dpte_row_height =1 ; +else + *dpte_row_height =dml_min (128 ,1 << (unsigned int )dml_floor (dml_log2 (PTEBufferSizeInRequests * *PixelPTEReqWidth / Pitch),1 )); *dpte_row_width_ub = (dml_ceil (((double ) SwathWidth -1 ) / *PixelPTEReqWidth,1 ) +1 ) * *PixelPTEReqWidth; *PixelPTEBytesPerRow = *dpte_row_width_ub / *PixelPTEReqWidth * *PTERequestSize; }else if (ScanDirection != dm_vert) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/115 ext4: fix possible double unlock when moving a directory
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 70e42feab2e20618ddd0cbfc4ab4b08628236ecd upstream.
--- fs/ext4/namei.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/ext4/namei.c +1 -3
@@ -3898,10 +3898,8 @@ static int ext4_rename(struct user_names goto end_rename; } retval =ext4_rename_dir_prepare (handle, &old); -if (retval) { -inode_unlock (old.inode); +if (retval) goto end_rename; - } }/* * If we're renaming a file within an inline_data dir and adding or
Greg Kroah-Hartman
maintainerPATCH 74/115 tty: serial: fsl_lpuart: skip waiting for transmission complete when UARTCTRL_SBK is asserted
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
commit 2411fd94ceaa6e11326e95d6ebf876cbfed28d23 upstream.
According to LPUART RM, Transmission Complete Flag becomes 0 if queuing a break character by writing 1 to CTRL[SBK], so here need to skip waiting for transmission complete when UARTCTRL_SBK is asserted, otherwise the kernel may stuck here.
And actually set_termios() adds transmission completion waiting to avoid data loss or data breakage when changing the baud rate, but we don't need to worry about this when queuing break characters.
--- drivers/tty/serial/fsl_lpuart.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/tty/serial/fsl_lpuart.c +9 -3
@@ -2201,9 +2201,15 @@ lpuart32_set_termios(struct uart_port *p/* update the per-port timeout */ uart_update_timeout (port, termios->c_cflag, baud); -/* wait transmit engin complete */ -lpuart32_write (&sport->port,0 ,UARTMODIR ); -lpuart32_wait_bit_set (&sport->port,UARTSTAT ,UARTSTAT_TC ); +/* +* LPUART Transmission Complete Flag may never be set while queuing a break +* character, so skip waiting for transmission complete when UARTCTRL_SBK is +* asserted. +*/ +if (!(old_ctrl &UARTCTRL_SBK )) { +lpuart32_write (&sport->port,0 ,UARTMODIR ); +lpuart32_wait_bit_set (&sport->port,UARTSTAT ,UARTSTAT_TC ); + }/* disable transmit and receive */ lpuart32_write(&sport->port, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE),
Greg Kroah-Hartman
maintainerPATCH 75/115 serial: 8250_em: Fix UART port type
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
commit 32e293be736b853f168cd065d9cbc1b0c69f545d upstream.
As per HW manual for EMEV2 "R19UH0040EJ0400 Rev.4.00", the UART IP found on EMMA mobile SoC is Register-compatible with the general-purpose 16750 UART chip. Fix UART port type as 16750 and enable 64-bytes fifo support.
--- drivers/tty/serial/8250/8250_em.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_em.c +2 -2
@@ -106,8 +106,8 @@ static int serial8250_em_probe(struct plmemset (&up,0 ,sizeof (up)); up.port.mapbase = regs->start; up.port.irq = irq; - up.port.type =PORT_UNKNOWN ; - up.port.flags =UPF_BOOT_AUTOCONF |UPF_FIXED_PORT |UPF_IOREMAP ; + up.port.type =PORT_16750 ; + up.port.flags =UPF_FIXED_PORT |UPF_IOREMAP |UPF_FIXED_TYPE ; up.port.dev = &pdev->dev; up.port.private_data = priv;
Greg Kroah-Hartman
maintainerPATCH 76/115 serial: 8250_fsl: fix handle_irq locking
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 6e01f9a594ee0f69fb52cc8d11971612b4817f0b upstream.
The 8250 handle_irq callback is not just called from the interrupt handler but also from a timer callback when polling (e.g. for ports without an interrupt line). Consequently the callback must explicitly disable interrupts to avoid a potential deadlock with another interrupt in polled mode.
Fix up the two paths in the freescale callback that failed to re-enable interrupts when polling.
--- drivers/tty/serial/8250/8250_fsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_fsl.c +2 -2
@@ -38,7 +38,7 @@ int fsl8250_handle_irq(struct uart_port iir = port->serial_in (port,UART_IIR );if (iir &UART_IIR_NO_INT ) { -spin_unlock (&up->port.lock); +spin_unlock_irqrestore (&up->port.lock, flags);return 0 ; }
@@ -46,7 +46,7 @@ int fsl8250_handle_irq(struct uart_portif (unlikely (up->lsr_saved_flags &UART_LSR_BI )) { up->lsr_saved_flags &= ~UART_LSR_BI ; port->serial_in (port,UART_RX ); -spin_unlock (&up->port.lock); +spin_unlock_irqrestore (&up->port.lock, flags);return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 77/115 firmware: xilinx: dont make a sleepable memory allocation from an atomic context
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit 38ed310c22e7a0fc978b1f8292136a4a4a8b3051 upstream.
The following issue was discovered using lockdep:
[ 6.691371] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:209
[ 6.694602] in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 1, name: swapper/0
[ 6.702431] 2 locks held by swapper/0/1:
[ 6.706300] #0: ffffff8800f6f188 (&dev->mutex){....}-{3:3}, at: __device_driver_lock+0x4c/0x90
[ 6.714900] #1: ffffffc009a2abb8 (enable_lock){....}-{2:2}, at: clk_enable_lock+0x4c/0x140
[ 6.723156] irq event stamp: 304030
[ 6.726596] hardirqs last enabled at (304029): [<ffffffc008d17ee0>] _raw_spin_unlock_irqrestore+0xc0/0xd0
[ 6.736142] hardirqs last disabled at (304030): [<ffffffc00876bc5c>] clk_enable_lock+0xfc/0x140
[ 6.744742] softirqs last enabled at (303958): [<ffffffc0080904f0>] _stext+0x4f0/0x894
[ 6.752655] softirqs last disabled at (303951): [<ffffffc0080e53b8>] irq_exit+0x238/0x280
[ 6.760744] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G U 5.15.36 #2
[ 6.768048] Hardware name: xlnx,zynqmp (DT)
[ 6.772179] Call trace:
[ 6.774584] dump_backtrace+0x0/0x300
[ 6.778197] show_stack+0x18/0x30
[ 6.781465] dump_stack_lvl+0xb8/0xec
[ 6.785077] dump_stack+0x1c/0x38
[ 6.788345] ___might_sleep+0x1a8/0x2a0
[ 6.792129] __might_sleep+0x6c/0xd0
[ 6.795655] kmem_cache_alloc_trace+0x270/0x3d0
[ 6.800127] do_feature_check_call+0x100/0x220
[ 6.804513] zynqmp_pm_invoke_fn+0x8c/0xb0
[ 6.808555] zynqmp_pm_clock_getstate+0x90/0xe0
[ 6.813027] zynqmp_pll_is_enabled+0x8c/0x120
[ 6.817327] zynqmp_pll_enable+0x38/0xc0
[ 6.821197] clk_core_enable+0x144/0x400
[ 6.825067] clk_core_enable+0xd4/0x400
[ 6.828851] clk_core_enable+0xd4/0x400
[ 6.832635] clk_core_enable+0xd4/0x400
[ 6.836419] clk_core_enable+0xd4/0x400
[ 6.840203] clk_core_enable+0xd4/0x400
[ 6.843987] clk_core_enable+0xd4/0x400
[ 6.847771] clk_core_enable+0xd4/0x400
[ 6.851555] clk_core_enable_lock+0x24/0x50
[ 6.855683] clk_enable+0x24/0x40
[ 6.858952] fclk_probe+0x84/0xf0
[ 6.862220] platform_probe+0x8c/0x110
[ 6.865918] really_probe+0x110/0x5f0
[ 6.869530] __driver_probe_device+0xcc/0x210
[ 6.873830] driver_probe_device+0x64/0x140
[ 6.877958] __driver_attach+0x114/0x1f0
[ 6.881828] bus_for_each_dev+0xe8/0x160
[ 6.885698] driver_attach+0x34/0x50
[ 6.889224] bus_add_driver+0x228/0x300
[ 6.893008] driver_register+0xc0/0x1e0
[ 6.896792] __platform_driver_register+0x44/0x60
[ 6.901436] fclk_driver_init+0x1c/0x28
[ 6.905220] do_one_initcall+0x104/0x590
[ 6.909091] kernel_init_freeable+0x254/0x2bc
[ 6.913390] kernel_init+0x24/0x130
[ 6.916831] ret_from_fork+0x10/0x20Fix it by passing the GFP_ATOMIC gfp flag for the corresponding memory allocation.
--- drivers/firmware/xilinx/zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/xilinx/zynqmp.c +1 -1
@@ -171,7 +171,7 @@ static int zynqmp_pm_feature(u32 api_id) }/* Add new entry if not present */ - feature_data =kmalloc (sizeof (*feature_data),GFP_KERNEL ); + feature_data =kmalloc (sizeof (*feature_data),GFP_ATOMIC );if (!feature_data)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 78/115 s390/ipl: add missing intersection check to ipl_report handling
In reply to Greg Kroah-HartmanFrom: Sven Schnelle <[email protected]>
commit a52e5cdbe8016d4e3e6322fd93d71afddb9a5af9 upstream.
The code which handles the ipl report is searching for a free location in memory where it could copy the component and certificate entries to. It checks for intersection between the sections required for the kernel and the component/certificate data area, but fails to check whether the data structures linking these data areas together intersect.
This might cause the iplreport copy code to overwrite the iplreport itself. Fix this by adding two addtional intersection checks.
--- arch/s390/boot/ipl_report.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/boot/ipl_report.c +8 -0
@@ -57,11 +57,19 @@ repeat:if (IS_ENABLED (CONFIG_BLK_DEV_INITRD ) && initrd_data.start && initrd_data.size &&intersects (initrd_data.start, initrd_data.size, safe_addr, size)) safe_addr = initrd_data.start + initrd_data.size; +if (intersects (safe_addr, size, (unsigned long )comps, comps->len)) { + safe_addr = (unsigned long )comps + comps->len; + goto repeat; + }for_each_rb_entry (comp, comps)if (intersects (safe_addr, size, comp->addr, comp->len)) { safe_addr = comp->addr + comp->len; goto repeat; } +if (intersects (safe_addr, size, (unsigned long )certs, certs->len)) { + safe_addr = (unsigned long )certs + certs->len; + goto repeat; + }for_each_rb_entry (cert, certs)if (intersects (safe_addr, size, cert->addr, cert->len)) { safe_addr = cert->addr + cert->len;
Greg Kroah-Hartman
maintainerPATCH 79/115 interconnect: fix mem leak when freeing nodes
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a5904f415e1af72fa8fe6665aa4f554dc2099a95 upstream.
The node link array is allocated when adding links to a node but is not deallocated when nodes are destroyed.
--- drivers/interconnect/core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/interconnect/core.c +4 -0
@@ -850,6 +850,10 @@ void icc_node_destroy(int id)mutex_unlock (&icc_lock); +if (!node) +return ; + +kfree (node->links);kfree (node); }EXPORT_SYMBOL_GPL (icc_node_destroy);
Greg Kroah-Hartman
maintainerPATCH 80/115 interconnect: exynos: fix node leak in probe PM QoS error path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3aab264875bf3c915ea2517fae1eec213e0b4987 upstream.
Make sure to add the newly allocated interconnect node to the provider before adding the PM QoS request so that the node is freed on errors.
--- drivers/interconnect/samsung/exynos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/interconnect/samsung/exynos.c +3 -3
@@ -149,6 +149,9 @@ static int exynos_generic_icc_probe(stru &priv->bus_clk_ratio)) priv->bus_clk_ratio =EXYNOS_ICC_DEFAULT_BUS_CLK_RATIO ; + icc_node->data = priv; +icc_node_add (icc_node, provider); +/* * Register a PM QoS request for the parent (devfreq) device. */
@@ -157,9 +160,6 @@ static int exynos_generic_icc_probe(struif (ret <0 ) goto err_node_del; - icc_node->data = priv; -icc_node_add (icc_node, provider); - icc_parent_node =exynos_icc_get_parent (bus_dev->of_node);if (IS_ERR (icc_parent_node)) { ret =PTR_ERR (icc_parent_node);
Greg Kroah-Hartman
maintainerPATCH 81/115 tracing: Make splice_read available again
In reply to Greg Kroah-HartmanFrom: Sung-hun Kim <[email protected]>
commit e400be674a1a40e9dcb2e95f84d6c1fd2d88f31d upstream.
Since the commit 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops") is applied to the kernel, splice() and sendfile() calls on the trace file (/sys/kernel/debug/tracing /trace) return EINVAL.
This patch restores these system calls by initializing splice_read in file_operations of the trace file. This patch only enables such functionalities for the read case.
--- kernel/trace/trace.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/trace.c +2 -0
@@ -5093,6 +5093,8 @@ loff_t tracing_lseek(struct file *file,static const struct file_operations tracing_fops = { .open = tracing_open, .read = seq_read, + .read_iter = seq_read_iter, + .splice_read = generic_file_splice_read, .write = tracing_write_stub, .llseek = tracing_lseek, .release = tracing_release,
Greg Kroah-Hartman
maintainerPATCH 82/115 tracing: Check field value in hist_field_name()
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
commit 9f116f76fa8c04c81aef33ad870dbf9a158e5b70 upstream.
The function hist_field_name() cannot handle being passed a NULL field parameter. It should never be NULL, but due to a previous bug, NULL was passed to the function and the kernel crashed due to a NULL dereference. Mark Rutland reported this to me on IRC.
The bug was fixed, but to prevent future bugs from crashing the kernel, check the field and add a WARN_ON() if it is NULL.
--- kernel/trace/trace_events_hist.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/trace_events_hist.c +3 -0
@@ -1127,6 +1127,9 @@ static const char *hist_field_name(struc {const char *field_name ="" ; +if (WARN_ON_ONCE (!field)) +return field_name; +if (level >1 )return field_name;
Greg Kroah-Hartman
maintainerPATCH 83/115 tracing: Make tracepoint lockdep check actually test something
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
commit c2679254b9c9980d9045f0f722cf093a2b1f7590 upstream.
A while ago where the trace events had the following:
rcu_read_lock_sched_notrace(); rcu_dereference_sched(...); rcu_read_unlock_sched_notrace();
If the tracepoint is enabled, it could trigger RCU issues if called in the wrong place. And this warning was only triggered if lockdep was enabled. If the tracepoint was never enabled with lockdep, the bug would not be caught. To handle this, the above sequence was done when lockdep was enabled regardless if the tracepoint was enabled or not (although the always enabled code really didn't do anything, it would still trigger a warning).
But a lot has changed since that lockdep code was added. One is, that sequence no longer triggers any warning. Another is, the tracepoint when enabled doesn't even do that sequence anymore.
The main check we care about today is whether RCU is "watching" or not. So if lockdep is enabled, always check if rcu_is_watching() which will trigger a warning if it is not (tracepoints require RCU to be watching).
Note, that old sequence did add a bit of overhead when lockdep was enabled, and with the latest kernel updates, would cause the system to slow down enough to trigger kernel "stalled" warnings.
--- include/linux/tracepoint.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
include/linux/tracepoint.h +6 -9
@@ -231,12 +231,11 @@ static inline struct tracepoint *tracepo* not add unwanted padding between the beginning of the section and the * structure. Force alignment to the same alignment as the section start. * -* When lockdep is enabled, we make sure to always do the RCU portions of -* the tracepoint code, regardless of whether tracing is on. However, -* don't check if the condition is false, due to interaction with idle -* instrumentation. This lets us find RCU issues triggered with tracepoints -* even when this tracepoint is off. This code has no purpose other than -* poking RCU a bit. +* When lockdep is enabled, we make sure to always test if RCU is +* "watching" regardless if the tracepoint is enabled or not. Tracepoints +* require RCU to be active, and it should always warn at the tracepoint +* site if it is not watching, as it will need to be active when the +* tracepoint is enabled. */ #define __DECLARE_TRACE (name, proto, args, cond, data_proto) \ extern int __traceiter_##name(data_proto); \
@@ -249,9 +248,7 @@ static inline struct tracepoint *tracepoTP_ARGS (args), \ TP_CONDITION(cond), 0); \if (IS_ENABLED (CONFIG_LOCKDEP ) && (cond)) { \ -rcu_read_lock_sched_notrace (); \ - rcu_dereference_sched(__tracepoint_##name.funcs);\ - rcu_read_unlock_sched_notrace(); \ +WARN_ON_ONCE (!rcu_is_watching ()); \ } \ } \ __DECLARE_TRACE_RCU(name, PARAMS(proto), PARAMS(args), \
Greg Kroah-Hartman
maintainerPATCH 84/115 cifs: Fix smb2_set_path_size()
In reply to Greg Kroah-HartmanFrom: Volker Lendecke <[email protected]>
commit 211baef0eabf4169ce4f73ebd917749d1a7edd74 upstream.
If cifs_get_writable_path() finds a writable file, smb2_compound_op() must use that file's FID and not the COMPOUND_FID.
--- fs/cifs/smb2inode.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
fs/cifs/smb2inode.c +24 -7
@@ -223,15 +223,32 @@ smb2_compound_op(const unsigned int xid, size[0 ] =8 ;/* sizeof __le64 */ data[0 ] = ptr; - rc =SMB2_set_info_init (tcon, server, - &rqst[num_rqst],COMPOUND_FID , -COMPOUND_FID , current->tgid, -FILE_END_OF_FILE_INFORMATION , -SMB2_O_INFO_FILE ,0 , data, size); +if (cfile) { + rc =SMB2_set_info_init (tcon, server, + &rqst[num_rqst], + cfile->fid.persistent_fid, + cfile->fid.volatile_fid, + current->tgid, +FILE_END_OF_FILE_INFORMATION , +SMB2_O_INFO_FILE ,0 , + data, size); + }else { + rc =SMB2_set_info_init (tcon, server, + &rqst[num_rqst], +COMPOUND_FID , +COMPOUND_FID , + current->tgid, +FILE_END_OF_FILE_INFORMATION , +SMB2_O_INFO_FILE ,0 , + data, size); +if (!rc) { +smb2_set_next_command (tcon, &rqst[num_rqst]); +smb2_set_related (&rqst[num_rqst]); + } + }if (rc) goto finished; -smb2_set_next_command (tcon, &rqst[num_rqst]); -smb2_set_related (&rqst[num_rqst++]); + num_rqst++;trace_smb3_set_eof_enter (xid, ses->Suid, tcon->tid, full_path);break ;case SMB2_OP_SET_INFO :
Greg Kroah-Hartman
maintainerPATCH 85/115 KVM: nVMX: add missing consistency checks for CR0 and CR4
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 112e66017bff7f2837030f34c2bc19501e9212d5 upstream.
The effective values of the guest CR0 and CR4 registers may differ from those included in the VMCS12. In particular, disabling EPT forces CR4.PAE=1 and disabling unrestricted guest mode forces CR0.PG=CR0.PE=1.
Therefore, checks on these bits cannot be delegated to the processor and must be performed by KVM.
--- arch/x86/kvm/vmx/nested.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +8 -2
@@ -2991,7 +2991,7 @@ static int nested_vmx_check_guest_state(struct vmcs12 *vmcs12, enum vm_entry_failure_code *entry_failure_code) { - bool ia32e; + bool ia32e = !!(vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE); *entry_failure_code =ENTRY_FAIL_DEFAULT ;
@@ -3017,6 +3017,13 @@ static int nested_vmx_check_guest_state( vmcs12->guest_ia32_perf_global_ctrl)))return -EINVAL ; +if (CC ((vmcs12->guest_cr0 & (X86_CR0_PG |X86_CR0_PE )) ==X86_CR0_PG )) +return -EINVAL ; + +if (CC (ia32e && !(vmcs12->guest_cr4 &X86_CR4_PAE )) || +CC (ia32e && !(vmcs12->guest_cr0 &X86_CR0_PG ))) +return -EINVAL ; +/* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR:
@@ -3028,7 +3035,6 @@ static int nested_vmx_check_guest_state(*/ if (to_vmx(vcpu)->nested.nested_run_pending && (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)) { - ia32e = (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE) != 0; if (CC(!kvm_valid_efer(vcpu, vmcs12->guest_ia32_efer)) || CC(ia32e != !!(vmcs12->guest_ia32_efer & EFER_LMA)) || CC(((vmcs12->guest_cr0 & X86_CR0_PG) &&
Greg Kroah-Hartman
maintainerPATCH 86/115 ALSA: hda: intel-dsp-config: add MTL PCI id
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
commit bbdf904b13a62bb8b1272d92a7dde082dff86fbb upstream.
Use SOF as default audio driver.
--- sound/hda/intel-dsp-config.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/hda/intel-dsp-config.c +9 -0
@@ -376,6 +376,15 @@ static const struct config_entry config_ },#endif +/* Meteor Lake */ +#if IS_ENABLED (CONFIG_SND_SOC_SOF_METEORLAKE ) +/* Meteorlake-P */ + { + .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, + .device = 0x7e28, + }, +#endif + };static const struct config_entry *snd_intel_dsp_find_config
Greg Kroah-Hartman
maintainerPATCH 87/115 ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book2 Pro
In reply to Greg Kroah-HartmanFrom: Hamidreza H. Fard <[email protected]>
commit a86e79e3015f5dd8e1b01ccfa49bd5c6e41047a1 upstream.
Samsung Galaxy Book2 Pro (13" 2022 NP930XED-KA1DE) with codec SSID 144d:c868 requires the same workaround for enabling the speaker amp like other Samsung models with ALC298 code.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9166,6 +9166,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x144d ,0xc830 ,"Samsung Galaxy Book Ion (NT950XCJ-X716A)" ,ALC298_FIXUP_SAMSUNG_AMP ),SND_PCI_QUIRK (0x144d ,0xc832 ,"Samsung Galaxy Book Flex Alpha (NP730QCJ)" ,ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xca03 ,"Samsung Galaxy Book2 Pro 360 (NP930QED)" ,ALC298_FIXUP_SAMSUNG_AMP ), +SND_PCI_QUIRK (0x144d ,0xc868 ,"Samsung Galaxy Book2 Pro (NP930XED)" ,ALC298_FIXUP_SAMSUNG_AMP ),SND_PCI_QUIRK (0x1458 ,0xfa53 ,"Gigabyte BXBT-2807" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x1462 ,0xb120 ,"MSI Cubi MS-B120" ,ALC283_FIXUP_HEADSET_MIC ), SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
Greg Kroah-Hartman
maintainerPATCH 88/115 Revert "riscv: mm: notify remote harts about mmu cache updates"
In reply to Greg Kroah-HartmanFrom: Sergey Matyukevich <[email protected]>
commit e921050022f1f12d5029d1487a7dfc46cde15523 upstream.
This reverts the remaining bits of commit 4bd1d80efb5a ("riscv: mm:
notify remote harts harts about mmu cache updates").
According to bug reports, suggested approach to fix stale TLB entries is not sufficient. It needs to be replaced by a more robust solution.
--- arch/riscv/include/asm/mmu.h | 2 -- arch/riscv/include/asm/tlbflush.h | 18 ------------------ arch/riscv/mm/context.c | 10 ---------- arch/riscv/mm/tlbflush.c | 28 +++++++++++++++++----------- 4 files changed, 17 insertions(+), 41 deletions(-)
arch/riscv/include/asm/mmu.h +0 -2
@@ -19,8 +19,6 @@ typedef struct {#ifdef CONFIG_SMP /* A local icache flush is needed before user execution can resume. */ cpumask_t icache_stale_mask; -/* A local tlb flush is needed before user execution can resume. */ -cpumask_t tlb_stale_mask;#endif } mm_context_t;
arch/riscv/include/asm/tlbflush.h +0 -18
@@ -22,24 +22,6 @@ static inline void local_flush_tlb_page( {ALT_FLUSH_TLB_PAGE (__asm__ __volatile__ ("sfence.vma %0" : :"r" (addr) :"memory" )); } - -static inline void local_flush_tlb_all_asid (unsigned long asid) -{ - __asm__ __volatile__ ("sfence.vma x0, %0" - : - :"r" (asid) - :"memory" ); -} - -static inline void local_flush_tlb_page_asid (unsigned long addr, -unsigned long asid) -{ - __asm__ __volatile__ ("sfence.vma %0, %1" - : - :"r" (addr),"r" (asid) - :"memory" ); -} -#else /* CONFIG_MMU */ #define local_flush_tlb_all () do { } while (0)#define local_flush_tlb_page (addr) do { } while (0)
arch/riscv/mm/context.c +0 -10
@@ -196,16 +196,6 @@ switch_mm_fast:if (need_flush_tlb)local_flush_tlb_all (); -#ifdef CONFIG_SMP - else { -cpumask_t *mask = &mm->context.tlb_stale_mask; - -if (cpumask_test_cpu (cpu, mask)) { -cpumask_clear_cpu (cpu, mask); -local_flush_tlb_all_asid (cntx & asid_mask); - } - } -#endif }static void set_mm_noasid (struct mm_struct *mm)
arch/riscv/mm/tlbflush.c +17 -11
@@ -5,7 +5,23 @@#include <linux/sched.h> #include <asm/sbi.h> #include <asm/mmu_context.h> -#include <asm/tlbflush.h> + +static inline void local_flush_tlb_all_asid (unsigned long asid) +{ + __asm__ __volatile__ ("sfence.vma x0, %0" + : + :"r" (asid) + :"memory" ); +} + +static inline void local_flush_tlb_page_asid (unsigned long addr, +unsigned long asid) +{ + __asm__ __volatile__ ("sfence.vma %0, %1" + : + :"r" (addr),"r" (asid) + :"memory" ); +}void flush_tlb_all (void ) {
@@ -15,7 +31,6 @@ void flush_tlb_all(void)static void __sbi_tlb_flush_range (struct mm_struct *mm,unsigned long start,unsigned long size,unsigned long stride) { -struct cpumask *pmask = &mm->context.tlb_stale_mask;struct cpumask *cmask =mm_cpumask (mm);struct cpumask hmask;unsigned int cpuid;
@@ -30,15 +45,6 @@ static void __sbi_tlb_flush_range(structif (static_branch_unlikely (&use_asid_allocator)) {unsigned long asid =atomic_long_read (&mm->context.id); -/* -* TLB will be immediately flushed on harts concurrently -* executing this MM context. TLB flush on other harts -* is deferred until this MM context migrates there. -*/ -cpumask_setall (pmask); -cpumask_clear_cpu (cpuid, pmask); -cpumask_andnot (pmask, pmask, cmask); -if (broadcast) {riscv_cpuid_to_hartid_mask (cmask, &hmask); sbi_remote_sfence_vma_asid(cpumask_bits(&hmask),
Greg Kroah-Hartman
maintainerPATCH 89/115 riscv: asid: Fixup stale TLB entry cause application crash
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
commit 82dd33fde0268cc622d3d1ac64971f3f61634142 upstream.
After use_asid_allocator is enabled, the userspace application will crash by stale TLB entries. Because only using cpumask_clear_cpu without local_flush_tlb_all couldn't guarantee CPU's TLB entries were fresh. Then set_mm_asid would cause the user space application to get a stale value by stale TLB entry, but set_mm_noasid is okay.
Here is the symptom of the bug:
unhandled signal 11 code 0x1 (coredump)
0x0000003fd6d22524 <+4>: auipc s0,0x70 0x0000003fd6d22528 <+8>: ld s0,-148(s0) # 0x3fd6d92490 => 0x0000003fd6d2252c <+12>: ld a5,0(s0)
(gdb) i r s0
s0 0x8082ed1cc3198b21 0x8082ed1cc3198b21
(gdb) x /2x 0x3fd6d924900x3fd6d92490: 0xd80ac8a8 0x0000003f
The core dump file shows that register s0 is wrong, but the value in memory is correct. Because 'ld s0, -148(s0)' used a stale mapping entry in TLB and got a wrong result from an incorrect physical address.
When the task ran on CPU0, which loaded/speculative-loaded the value of address(0x3fd6d92490), then the first version of the mapping entry was PTWed into CPU0's TLB.
When the task switched from CPU0 to CPU1 (No local_tlb_flush_all here by asid), it happened to write a value on the address (0x3fd6d92490). It caused do_page_fault -> wp_page_copy -> ptep_clear_flush -> ptep_get_and_clear & flush_tlb_page.
The flush_tlb_page used mm_cpumask(mm) to determine which CPUs need TLB flush, but CPU0 had cleared the CPU0's mm_cpumask in the previous switch_mm. So we only flushed the CPU1 TLB and set the second version mapping of the PTE. When the task switched from CPU1 to CPU0 again, CPU0 still used a stale TLB mapping entry which contained a wrong target physical address. It raised a bug when the task happened to read that value.
CPU0 CPU1
- switch 'task' in
- read addr (Fill stale mapping
entry into TLB)
- switch 'task' out (no tlb_flush)
- switch 'task' in (no tlb_flush)
- write addr cause pagefault do_page_fault() (change to new addr mapping) wp_page_copy() ptep_clear_flush() ptep_get_and_clear() & flush_tlb_page() write new value into addr
- switch 'task' out (no tlb_flush)
- switch 'task' in (no tlb_flush)
- read addr again (Use stale
mapping entry in TLB)
get wrong value from old phyical
addr, BUG!
The solution is to keep all CPUs' footmarks of cpumask(mm) in switch_mm, which could guarantee to invalidate all stale TLB entries during TLB flush.
--- arch/riscv/mm/context.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
arch/riscv/mm/context.c +20 -10
@@ -205,12 +205,24 @@ static void set_mm_noasid(struct mm_strulocal_flush_tlb_all (); } -static inline void set_mm (struct mm_struct *mm,unsigned int cpu) +static inline void set_mm (struct mm_struct *prev, +struct mm_struct *next,unsigned int cpu) { -if (static_branch_unlikely (&use_asid_allocator)) -set_mm_asid (mm, cpu); -else -set_mm_noasid (mm); +/* +* The mm_cpumask indicates which harts' TLBs contain the virtual +* address mapping of the mm. Compared to noasid, using asid +* can't guarantee that stale TLB entries are invalidated because +* the asid mechanism wouldn't flush TLB for every switch_mm for +* performance. So when using asid, keep all CPUs footmarks in +* cpumask() until mm reset. +*/ +cpumask_set_cpu (cpu,mm_cpumask (next)); +if (static_branch_unlikely (&use_asid_allocator)) { +set_mm_asid (next, cpu); + }else { +cpumask_clear_cpu (cpu,mm_cpumask (prev)); +set_mm_noasid (next); + } }static int __init asids_init (void )
@@ -262,7 +274,8 @@ static int __init asids_init(void) }early_initcall (asids_init);#else -static inline void set_mm (struct mm_struct *mm,unsigned int cpu) +static inline void set_mm (struct mm_struct *prev, +struct mm_struct *next,unsigned int cpu) {/* Nothing to do here when there is no MMU */ }
@@ -315,10 +328,7 @@ void switch_mm(struct mm_struct *prev, s*/ cpu =smp_processor_id (); -cpumask_clear_cpu (cpu,mm_cpumask (prev)); -cpumask_set_cpu (cpu,mm_cpumask (next)); - -set_mm (next, cpu); +set_mm (prev, next, cpu);flush_icache_deferred (next, cpu); }
Greg Kroah-Hartman
maintainerPATCH 90/115 drm/shmem-helper: Remove another errant put in error path
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit ee9adb7a45516cfa536ca92253d7ae59d56db9e4 upstream.
drm_gem_shmem_mmap() doesn't own reference in error code path, resulting in the dma-buf shmem GEM object getting prematurely freed leading to a later use-after-free.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +6 -3
@@ -591,11 +591,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shint ret;if (obj->import_attach) { -/* Drop the reference drm_gem_mmap_obj() acquired.*/ -drm_gem_object_put (obj); vma->vm_private_data =NULL ; + ret =dma_buf_mmap (obj->dma_buf, vma,0 ); + +/* Drop the reference drm_gem_mmap_obj() acquired.*/ +if (!ret) +drm_gem_object_put (obj); -return dma_buf_mmap (obj->dma_buf, vma,0 ); +return ret; } ret =drm_gem_shmem_get_pages (shmem);
Greg Kroah-Hartman
maintainerPATCH 91/115 drm/sun4i: fix missing component unbind on bind errors
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c22f2ff8724b49dce2ae797e9fbf4bc0fa91112f upstream.
Make sure to unbind all subcomponents when binding the aggregate device fails.
--- drivers/gpu/drm/sun4i/sun4i_drv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun4i_drv.c +4 -2
@@ -94,12 +94,12 @@ static int sun4i_drv_bind(struct device/* drm_vblank_init calls kcalloc, which can fail */ ret =drm_vblank_init (drm, drm->mode_config.num_crtc);if (ret) - goto cleanup_mode_config; + goto unbind_all;/* Remove early framebuffers (ie. simplefb) */ ret =drm_aperture_remove_framebuffers (false, &sun4i_drv_driver);if (ret) - goto cleanup_mode_config; + goto unbind_all;sun4i_framebuffer_init (drm);
@@ -118,6 +118,8 @@ static int sun4i_drv_bind(struct device finish_poll:drm_kms_helper_poll_fini (drm); +unbind_all: +component_unbind_all (dev,NULL ); cleanup_mode_config:drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev);
Greg Kroah-Hartman
maintainerPATCH 92/115 drm/amd/pm: Fix sienna cichlid incorrect OD volage after resume
In reply to Greg Kroah-HartmanFrom: Błażej Szczygieł <[email protected]>
commit a9386ee9681585794dbab95d4ce6826f73d19af6 upstream.
Always setup overdrive tables after resume. Preserve only some user-defined settings in user_overdrive_table if they're set.
Copy restored user_overdrive_table into od_table to get correct values.
On cold boot, BTC was triggered and GfxVfCurve was calibrated. We got VfCurve settings (a). On resuming back, BTC will be triggered again and GfxVfCurve will be recalibrated. VfCurve settings (b) got may be different from those of cold boot. So if we reuse those VfCurve settings (a) got on cold boot on suspend, we can run into discrepencies.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 43 ++++++++++++---- 1 file changed, 33 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +33 -10
@@ -2013,16 +2013,9 @@ static int sienna_cichlid_set_default_od (OverDriveTable_t *)smu->smu_table.boot_overdrive_table;OverDriveTable_t *user_od_table = (OverDriveTable_t *)smu->smu_table.user_overdrive_table; +OverDriveTable_t user_od_table_bak;int ret =0 ; -/* -* For S3/S4/Runpm resume, no need to setup those overdrive tables again as -* - either they already have the default OD settings got during cold bootup -* - or they have some user customized OD settings which cannot be overwritten -*/ -if (smu->adev->in_suspend) -return 0 ; - ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)boot_od_table, false);if (ret) {
@@ -2033,7 +2026,23 @@ static int sienna_cichlid_set_default_odsienna_cichlid_dump_od_table (smu, boot_od_table);memcpy (od_table, boot_od_table,sizeof (OverDriveTable_t)); -memcpy (user_od_table, boot_od_table,sizeof (OverDriveTable_t)); + +/* +* For S3/S4/Runpm resume, we need to setup those overdrive tables again, +* but we have to preserve user defined values in "user_od_table". +*/ +if (!smu->adev->in_suspend) { +memcpy (user_od_table, boot_od_table,sizeof (OverDriveTable_t)); + smu->user_dpm_profile.user_od = false; + }else if (smu->user_dpm_profile.user_od) { +memcpy (&user_od_table_bak, user_od_table,sizeof (OverDriveTable_t)); +memcpy (user_od_table, boot_od_table,sizeof (OverDriveTable_t)); + user_od_table->GfxclkFmin = user_od_table_bak.GfxclkFmin; + user_od_table->GfxclkFmax = user_od_table_bak.GfxclkFmax; + user_od_table->UclkFmin = user_od_table_bak.UclkFmin; + user_od_table->UclkFmax = user_od_table_bak.UclkFmax; + user_od_table->VddGfxOffset = user_od_table_bak.VddGfxOffset; + }return 0 ; }
@@ -2243,6 +2252,20 @@ static int sienna_cichlid_od_edit_dpm_tareturn ret; } +static int sienna_cichlid_restore_user_od_settings (struct smu_context *smu) +{ +struct smu_table_context *table_context = &smu->smu_table; +OverDriveTable_t *od_table = table_context->overdrive_table; +OverDriveTable_t *user_od_table = table_context->user_overdrive_table; +int res; + + res =smu_v11_0_restore_user_od_settings (smu); +if (res ==0 ) +memcpy (od_table, user_od_table,sizeof (OverDriveTable_t)); + +return res; +} +static int sienna_cichlid_run_btc (struct smu_context *smu) {return smu_cmn_send_smc_msg (smu, SMU_MSG_RunDcBtc,NULL );
@@ -3980,7 +4003,7 @@ static const struct pptable_funcs sienna .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, .set_default_od_settings = sienna_cichlid_set_default_od_settings, .od_edit_dpm_table = sienna_cichlid_od_edit_dpm_table, - .restore_user_od_settings = smu_v11_0_restore_user_od_settings, + .restore_user_od_settings = sienna_cichlid_restore_user_od_settings, .run_btc = sienna_cichlid_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
Greg Kroah-Hartman
maintainerPATCH 93/115 mptcp: fix possible deadlock in subflow_error_report
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit b7a679ba7c652587b85294f4953f33ac0b756d40 upstream.
Christoph reported a possible deadlock while the TCP stack destroys an unaccepted subflow due to an incoming reset: the MPTCP socket error path tries to acquire the msk-level socket lock while TCP still owns the listener socket accept queue spinlock, and the reverse dependency already exists in the TCP stack.
Note that the above is actually a lockdep false positive, as the chain involves two separate sockets. A different per-socket lockdep key will address the issue, but such a change will be quite invasive.
Instead, we can simply stop earlier the socket error handling for orphaned or unaccepted subflows, breaking the critical lockdep chain. Error handling in such a scenario is a no-op.
--- net/mptcp/subflow.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/mptcp/subflow.c +7 -0
@@ -1316,6 +1316,13 @@ static void subflow_error_report(struct {struct sock *sk =mptcp_subflow_ctx (ssk)->conn; +/* bail early if this is a no-op, so that we avoid introducing a +* problematic lockdep dependency between TCP accept queue lock +* and msk socket spinlock +*/ +if (!sk->sk_socket) +return ; +mptcp_data_lock (sk);if (!sock_owned_by_user (sk))__mptcp_error_report (sk);
Greg Kroah-Hartman
maintainerPATCH 94/115 mptcp: add ro_after_init for tcp{,v6}_prot_override
In reply to Greg Kroah-HartmanFrom: Geliang Tang <[email protected]>
commit 822467a48e938e661965d09df5fcac66f7291050 upstream.
Add __ro_after_init labels for the variables tcp_prot_override and tcpv6_prot_override, just like other variables adjacent to them, to indicate that they are initialised from the init hooks and no writes occur afterwards.
--- net/mptcp/subflow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mptcp/subflow.c +2 -2
@@ -514,7 +514,7 @@ static struct request_sock_ops mptcp_substatic struct tcp_request_sock_ops subflow_request_sock_ipv6_ops__ro_after_init ;static struct inet_connection_sock_af_ops subflow_v6_specific__ro_after_init ;static struct inet_connection_sock_af_ops subflow_v6m_specific__ro_after_init ; -static struct proto tcpv6_prot_override; +static struct proto tcpv6_prot_override__ro_after_init ;static int subflow_v6_conn_request (struct sock *sk,struct sk_buff *skb) {
@@ -817,7 +817,7 @@ dispose_child: }static struct inet_connection_sock_af_ops subflow_specific__ro_after_init ; -static struct proto tcp_prot_override; +static struct proto tcp_prot_override__ro_after_init ;enum mapping_status {MAPPING_OK ,
Greg Kroah-Hartman
maintainerPATCH 95/115 mptcp: avoid setting TCP_CLOSE state twice
In reply to Greg Kroah-HartmanFrom: Matthieu Baerts <[email protected]>
commit 3ba14528684f528566fb7d956bfbfb958b591d86 upstream.
tcp_set_state() is called from tcp_done() already.
There is then no need to first set the state to TCP_CLOSE, then call tcp_done().
--- net/mptcp/subflow.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/subflow.c +0 -1
@@ -358,7 +358,6 @@ void mptcp_subflow_reset(struct sock *ss/* must hold: tcp_done() could drop last reference on parent */ sock_hold (sk); -tcp_set_state (ssk,TCP_CLOSE );tcp_send_active_reset (ssk,GFP_ATOMIC );tcp_done (ssk); if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags) &&
Greg Kroah-Hartman
maintainerPATCH 96/115 mptcp: fix lockdep false positive in mptcp_pm_nl_create_listen_socket()
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit cee4034a3db1d30c3243dd51506a9d4ab1a849fa upstream.
Christoph reports a lockdep splat in the mptcp_subflow_create_socket() error path, when such function is invoked by mptcp_pm_nl_create_listen_socket().
Such code path acquires two separates, nested socket lock, with the internal lock operation lacking the "nested" annotation. Adding that in sock_release() for mptcp's sake only could be confusing.
Instead just add a new lockclass to the in-kernel msk socket, re-initializing the lockdep infra after the socket creation.
--- net/mptcp/pm_netlink.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/mptcp/pm_netlink.c +16 -0
@@ -886,9 +886,13 @@ out:return ret; } +static struct lock_class_key mptcp_slock_keys[2 ]; +static struct lock_class_key mptcp_keys[2 ]; +static int mptcp_pm_nl_create_listen_socket (struct sock *sk,struct mptcp_pm_addr_entry *entry) { +bool is_ipv6 = sk->sk_family ==AF_INET6 ;int addrlen =sizeof (struct sockaddr_in );struct sockaddr_storage addr;struct socket *ssock;
@@ -907,6 +911,18 @@ static int mptcp_pm_nl_create_listen_soc goto out; } +/* The subflow socket lock is acquired in a nested to the msk one +* in several places, even by the TCP stack, and this msk is a kernel +* socket: lockdep complains. Instead of propagating the _nested +* modifiers in several places, re-init the lock class for the msk +* socket to an mptcp specific one. +*/ +sock_lock_init_class_and_name (newsk, + is_ipv6 ?"mlock-AF_INET6" :"mlock-AF_INET" , + &mptcp_slock_keys[is_ipv6], + is_ipv6 ?"msk_lock-AF_INET6" :"msk_lock-AF_INET" , + &mptcp_keys[is_ipv6]); +lock_sock (newsk); ssock =__mptcp_nmpc_socket (mptcp_sk (newsk));release_sock (newsk);
Greg Kroah-Hartman
maintainerPATCH 97/115 ftrace: Fix invalid address access in lookup_rec() when index is 0
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
commit ee92fa443358f4fc0017c1d0d325c27b37802504 upstream.
KASAN reported follow problem:
BUG: KASAN: use-after-free in lookup_rec Read of size 8 at addr ffff000199270ff0 by task modprobe CPU: 2 Comm: modprobe Call trace: kasan_report __asan_load8 lookup_rec ftrace_location arch_check_ftrace_location check_kprobe_address_safe register_kprobe
When checking pg->records[pg->index - 1].ip in lookup_rec(), it can get a pg which is newly added to ftrace_pages_start in ftrace_process_locs(). Before the first pg->index++, index is 0 and accessing pg->records[-1].ip will cause this problem.
Don't check the ip when pg->index is 0.
--- kernel/trace/ftrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/ftrace.c +2 -1
@@ -1538,7 +1538,8 @@ static struct dyn_ftrace *lookup_rec(uns key.flags = end;/* overload flags, as it is unsigned long */ for (pg = ftrace_pages_start; pg; pg = pg->next) { -if (end < pg->records[0 ].ip || +if (pg->index ==0 || + end < pg->records[0 ].ip || start >= (pg->records[pg->index -1 ].ip +MCOUNT_INSN_SIZE ))continue ; rec = bsearch(&key, pg->records, pg->index,
Greg Kroah-Hartman
maintainerPATCH 98/115 nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV3000
In reply to Greg Kroah-HartmanFrom: Elmer Miroslav Mosher Golovin <[email protected]>
commit 9630d80655bfe7e62e4aff2889dc4eae7ceeb887 upstream.
Added a quirk to fix the Netac NV3000 SSD reporting duplicate NGUIDs.
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3378,6 +3378,8 @@ static const struct pci_device_id nvme_i .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, { PCI_DEVICE(0x2646, 0x501E), /* KINGSTON OM3PGP4xxxxQ OS21011 NVMe SSD */ .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x1f40, 0x1202), /* Netac Technologies Co. NV3000 NVMe SSD */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1f40, 0x5236), /* Netac Technologies Co. NV7000 NVMe SSD */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1e4B, 0x1001), /* MAXIO MAP1001 */
Greg Kroah-Hartman
maintainerPATCH 99/115 ice: avoid bonding causing auxiliary plug/unplug under RTNL lock
In reply to Greg Kroah-HartmanFrom: Dave Ertman <[email protected]>
commit 248401cb2c4612d83eb0c352ee8103b78b8eb365 upstream.
RDMA is not supported in ice on a PF that has been added to a bonded interface. To enforce this, when an interface enters a bond, we unplug the auxiliary device that supports RDMA functionality. This unplug currently happens in the context of handling the netdev bonding event. This event is sent to the ice driver under RTNL context. This is causing a deadlock where the RDMA driver is waiting for the RTNL lock to complete the removal.
Defer the unplugging/re-plugging of the auxiliary device to the service task so that it is not performed under the RTNL lock context.
--- drivers/net/ethernet/intel/ice/ice.h | 14 +++++--------- drivers/net/ethernet/intel/ice/ice_main.c | 19 ++++++++----------- 2 files changed, 13 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +5 -9
@@ -399,6 +399,7 @@ enum ice_pf_flags {ICE_FLAG_MDD_AUTO_RESET_VF ,ICE_FLAG_LINK_LENIENT_MODE_ENA ,ICE_FLAG_PLUG_AUX_DEV , +ICE_FLAG_UNPLUG_AUX_DEV ,ICE_FLAG_MTU_CHANGED , ICE_PF_FLAGS_NBITS /* must be last */ };
@@ -706,16 +707,11 @@ static inline void ice_set_rdma_cap(stru*/ static inline void ice_clear_rdma_cap (struct ice_pf *pf) { -/* We can directly unplug aux device here only if the flag bit -* ICE_FLAG_PLUG_AUX_DEV is not set because ice_unplug_aux_dev() -* could race with ice_plug_aux_dev() called from -* ice_service_task(). In this case we only clear that bit now and -* aux device will be unplugged later once ice_plug_aux_device() -* called from ice_service_task() finishes (see ice_service_task()). +/* defer unplug to service task to avoid RTNL lock and +* clear PLUG bit so that pending plugs don't interfere */ -if (!test_and_clear_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags)) -ice_unplug_aux_dev (pf); - +clear_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags); +set_bit (ICE_FLAG_UNPLUG_AUX_DEV , pf->flags);clear_bit (ICE_FLAG_RDMA_ENA , pf->flags);clear_bit (ICE_FLAG_AUX_ENA , pf->flags); }
drivers/net/ethernet/intel/ice/ice_main.c +8 -11
@@ -2156,18 +2156,15 @@ static void ice_service_task(struct work } } -if (test_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags)) { -/* Plug aux device per request */ -ice_plug_aux_dev (pf); +/* unplug aux dev per request, if an unplug request came in +* while processing a plug request, this will handle it +*/ +if (test_and_clear_bit (ICE_FLAG_UNPLUG_AUX_DEV , pf->flags)) +ice_unplug_aux_dev (pf); -/* Mark plugging as done but check whether unplug was -* requested during ice_plug_aux_dev() call -* (e.g. from ice_clear_rdma_cap()) and if so then -* plug aux device. -*/ -if (!test_and_clear_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags)) -ice_unplug_aux_dev (pf); - } +/* Plug aux device per request */ +if (test_and_clear_bit (ICE_FLAG_PLUG_AUX_DEV , pf->flags)) +ice_plug_aux_dev (pf);if (test_and_clear_bit (ICE_FLAG_MTU_CHANGED , pf->flags)) {struct iidc_event *event;
Greg Kroah-Hartman
maintainerPATCH 100/115 mm/userfaultfd: propagate uffd-wp bit when PTE-mapping the huge zeropage
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit 42b2af2c9b7eede8ef21d0943f84d135e21a32a3 upstream.
Currently, we'd lose the userfaultfd-wp marker when PTE-mapping a huge zeropage, resulting in the next write faults in the PMD range not triggering uffd-wp events.
Various actions (partial MADV_DONTNEED, partial mremap, partial munmap, partial mprotect) could trigger this. However, most importantly, un-protecting a single sub-page from the userfaultfd-wp handler when processing a uffd-wp event will PTE-map the shared huge zeropage and lose the uffd-wp bit for the remainder of the PMD.
Let's properly propagate the uffd-wp bit to the PMDs.
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
#include <inttypes.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <poll.h>
#include <pthread.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/ioctl.h>
#include <linux/userfaultfd.h>
static size_t pagesize;
static int uffd;
static volatile bool uffd_triggered;
#define barrier() __asm__ __volatile__("": : :"memory")
static void uffd_wp_range(char *start, size_t size, bool wp) {
struct uffdio_writeprotect uffd_writeprotect;
uffd_writeprotect.range.start = (unsigned long) start; uffd_writeprotect.range.len = size;
if (wp) {
uffd_writeprotect.mode = UFFDIO_WRITEPROTECT_MODE_WP;
} else {
uffd_writeprotect.mode = 0;
}
if (ioctl(uffd, UFFDIO_WRITEPROTECT, &uffd_writeprotect)) {
fprintf(stderr, "UFFDIO_WRITEPROTECT failed: %d\n", errno); exit(1);
}
}
static void *uffd_thread_fn(void *arg)
{
static struct uffd_msg msg;
ssize_t nread;
while (1) {
struct pollfd pollfd;
int nready;
pollfd.fd = uffd;
pollfd.events = POLLIN;
nready = poll(&pollfd, 1, -1);
if (nready == -1) {
fprintf(stderr, "poll() failed: %d\n", errno); exit(1);
}
nread = read(uffd, &msg, sizeof(msg)); if (nread <= 0)
continue;
if (msg.event != UFFD_EVENT_PAGEFAULT ||
!(msg.arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WP)) {
printf("FAIL: wrong uffd-wp event fired\n"); exit(1);
}
/* un-protect the single page. */ uffd_triggered = true;
uffd_wp_range((char *)(uintptr_t)msg.arg.pagefault.address,
pagesize, false);
}
return arg;
}
static int setup_uffd(char *map, size_t size)
{
struct uffdio_api uffdio_api;
struct uffdio_register uffdio_register;
pthread_t thread;
uffd = syscall(__NR_userfaultfd,
O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY);
if (uffd < 0) {
fprintf(stderr, "syscall() failed: %d\n", errno); return -errno;
}
uffdio_api.api = UFFD_API;
uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP; if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) {
fprintf(stderr, "UFFDIO_API failed: %d\n", errno); return -errno;
}
if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {
fprintf(stderr, "UFFD_FEATURE_WRITEPROTECT missing\n"); return -ENOSYS;
}
uffdio_register.range.start = (unsigned long) map; uffdio_register.range.len = size; uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register) < 0) {
fprintf(stderr, "UFFDIO_REGISTER failed: %d\n", errno); return -errno;
}
pthread_create(&thread, NULL, uffd_thread_fn, NULL);
return 0;
}
int main(void)
{
const size_t size = 4 * 1024 * 1024ull;
char *map, *cur;
pagesize = getpagesize();
map = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0); if (map == MAP_FAILED) {
fprintf(stderr, "mmap() failed\n");
return -errno;
}
if (madvise(map, size, MADV_HUGEPAGE)) {
fprintf(stderr, "MADV_HUGEPAGE failed\n"); return -errno;
}
if (setup_uffd(map, size))
return 1;
/* Read the whole range, populating zeropages. */ madvise(map, size, MADV_POPULATE_READ);
/* Write-protect the whole range. */
uffd_wp_range(map, size, true);
/* Make sure uffd-wp triggers on each page. */ for (cur = map; cur < map + size; cur += pagesize) {
uffd_triggered = false;
barrier();
/* Trigger a write fault. */
*cur = 1;
barrier();
if (!uffd_triggered) {
printf("FAIL: uffd-wp did not trigger\n"); return 1;
}
}
printf("PASS: uffd-wp triggered\n");
return 0;
}
--- mm/huge_memory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
mm/huge_memory.c +4 -2
@@ -1926,7 +1926,7 @@ static void __split_huge_zero_page_pmd(s {struct mm_struct *mm = vma->vm_mm;pgtable_t pgtable; -pmd_t _pmd; +pmd_t _pmd, old_pmd;int i;/*
@@ -1937,7 +1937,7 @@ static void __split_huge_zero_page_pmd(s* * See Documentation/vm/mmu_notifier.rst */ -pmdp_huge_clear_flush (vma, haddr, pmd); + old_pmd =pmdp_huge_clear_flush (vma, haddr, pmd); pgtable =pgtable_trans_huge_withdraw (mm, pmd);pmd_populate (mm, &_pmd, pgtable);
@@ -1946,6 +1946,8 @@ static void __split_huge_zero_page_pmd(spte_t *pte, entry; entry =pfn_pte (my_zero_pfn (haddr), vma->vm_page_prot); entry =pte_mkspecial (entry); +if (pmd_uffd_wp (old_pmd)) + entry =pte_mkuffd_wp (entry); pte =pte_offset_map (&_pmd, haddr);VM_BUG_ON (!pte_none (*pte));set_pte_at (mm, haddr, pte, entry);
Greg Kroah-Hartman
maintainerPATCH 101/115 mmc: sdhci_am654: lower power-on failed message severity
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
commit 11440da77d6020831ee6f9ce4551b545dea789ee upstream.
Lower the power-on failed message severity from warn to info when the controller does not power-up. It's normal to have this situation when the SD card slot is empty, therefore we should not warn the user about it.
--- drivers/mmc/host/sdhci_am654.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci_am654.c +1 -1
@@ -369,7 +369,7 @@ static void sdhci_am654_write_b(struct sMAX_POWER_ON_TIMEOUT , false, host, val, reg);if (ret) -dev_warn (mmc_dev (host->mmc),"Power on failed\n" ); +dev_info (mmc_dev (host->mmc),"Power on failed\n" ); } }
Greg Kroah-Hartman
maintainerPATCH 102/115 fbdev: stifb: Provide valid pixelclock and add fb_check_var() checks
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 203873a535d627c668f293be0cb73e26c30f9cc7 upstream.
Find a valid modeline depending on the machine graphic card configuration and add the fb_check_var() function to validate Xorg provided graphics settings.
--- drivers/video/fbdev/stifb.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/video/fbdev/stifb.c +27 -0
@@ -922,6 +922,28 @@ SETUP_HCRX(struct stifb_info *fb)/* ------------------- driver specific functions --------------------------- */ static int +stifb_check_var (struct fb_var_screeninfo *var,struct fb_info *info) +{ + struct stifb_info *fb = container_of(info, struct stifb_info, info); + +if (var->xres != fb->info.var.xres || + var->yres != fb->info.var.yres || + var->bits_per_pixel != fb->info.var.bits_per_pixel) +return -EINVAL ; + + var->xres_virtual = var->xres; + var->yres_virtual = var->yres; + var->xoffset =0 ; + var->yoffset =0 ; + var->grayscale = fb->info.var.grayscale; + var->red.length = fb->info.var.red.length; + var->green.length = fb->info.var.green.length; + var->blue.length = fb->info.var.blue.length; + +return 0 ; +} + +static int stifb_setcolreg (u_int regno,u_int red,u_int green,u_int blue,u_int transp,struct fb_info *info) {
@@ -1145,6 +1167,7 @@ stifb_init_display(struct stifb_info *fbstatic const struct fb_ops stifb_ops = { .owner =THIS_MODULE , + .fb_check_var = stifb_check_var, .fb_setcolreg = stifb_setcolreg, .fb_blank = stifb_blank, .fb_fillrect = stifb_fillrect,
@@ -1164,6 +1187,7 @@ static int __init stifb_init_fb(struct sstruct stifb_info *fb;struct fb_info *info;unsigned long sti_rom_address; +char modestr[32 ];char *dev_name;int bpp, xres, yres;
@@ -1342,6 +1366,9 @@ static int __init stifb_init_fb(struct s info->flags =FBINFO_HWACCEL_COPYAREA |FBINFO_HWACCEL_FILLRECT ; info->pseudo_palette = &fb->pseudo_palette; +scnprintf (modestr,sizeof (modestr),"%dx%d-%d" , xres, yres, bpp); +fb_find_mode (&info->var, info, modestr,NULL ,0 ,NULL , bpp); +/* This has to be done !!! */ if (fb_alloc_cmap (&info->cmap,NR_PALETTE ,0 )) goto out_err1;
Greg Kroah-Hartman
maintainerPATCH 103/115 trace/hwlat: Do not wipe the contents of per-cpu thread data
In reply to Greg Kroah-HartmanFrom: Tero Kristo <[email protected]>
commit 4c42f5f0d1dd20bddd9f940beb1e6ccad60c4498 upstream.
Do not wipe the contents of the per-cpu kthread data when starting the tracer, as this will completely forget about already running instances and can later start new additional per-cpu threads.
--- kernel/trace/trace_hwlat.c | 3 --- 1 file changed, 3 deletions(-)
kernel/trace/trace_hwlat.c +0 -3
@@ -588,9 +588,6 @@ static int start_per_cpu_kthreads(struct*/ cpumask_and (current_mask, cpu_online_mask, tr->tracing_cpumask); -for_each_online_cpu (cpu) -per_cpu (hwlat_per_cpu_data, cpu).kthread =NULL ; -for_each_cpu (cpu, current_mask) { retval =start_cpu_kthread (cpu);if (retval)
Greg Kroah-Hartman
maintainerPATCH 104/115 net: phy: nxp-c45-tja11xx: fix MII_BASIC_CONFIG_REV bit
In reply to Greg Kroah-HartmanFrom: Radu Pirea (OSS) <[email protected]>
commit 8ba572052a4b8fe5b205854d27e54e3486049b71 upstream.
According to the TJA1103 user manual, the bit for the reversed role in MII or RMII modes is bit 4.
--- drivers/net/phy/nxp-c45-tja11xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/nxp-c45-tja11xx.c +1 -1
@@ -79,7 +79,7 @@#define SGMII_ABILITY BIT(0)#define VEND1_MII_BASIC_CONFIG 0xAFC6 -#define MII_BASIC_CONFIG_REV BIT(8) +#define MII_BASIC_CONFIG_REV BIT(4)#define MII_BASIC_CONFIG_SGMII 0x9#define MII_BASIC_CONFIG_RGMII 0x7#define MII_BASIC_CONFIG_RMII 0x5
Greg Kroah-Hartman
maintainerPATCH 105/115 cpuidle: psci: Iterate backwards over list in psci_pd_remove()
In reply to Greg Kroah-HartmanFrom: Shawn Guo <[email protected]>
commit 6b0313c2fa3d2cf991c9ffef6fae6e7ef592ce6d upstream.
In case that psci_pd_init_topology() fails for some reason, psci_pd_remove() will be responsible for deleting provider and removing genpd from psci_pd_providers list. There will be a failure when removing the cluster PD, because the cpu (child) PDs haven't been removed.
[ 0.050232] CPUidle PSCI: init PM domain cpu0 [ 0.050278] CPUidle PSCI: init PM domain cpu1 [ 0.050329] CPUidle PSCI: init PM domain cpu2 [ 0.050370] CPUidle PSCI: init PM domain cpu3 [ 0.050422] CPUidle PSCI: init PM domain cpu-cluster0 [ 0.050475] PM: genpd_remove: unable to remove cpu-cluster0 [ 0.051412] PM: genpd_remove: removed cpu3 [ 0.051449] PM: genpd_remove: removed cpu2 [ 0.051499] PM: genpd_remove: removed cpu1 [ 0.051546] PM: genpd_remove: removed cpu0
Fix the problem by iterating the provider list reversely, so that parent PD gets removed after child's PDs like below.
[ 0.029052] CPUidle PSCI: init PM domain cpu0 [ 0.029076] CPUidle PSCI: init PM domain cpu1 [ 0.029103] CPUidle PSCI: init PM domain cpu2 [ 0.029124] CPUidle PSCI: init PM domain cpu3 [ 0.029151] CPUidle PSCI: init PM domain cpu-cluster0 [ 0.029647] PM: genpd_remove: removed cpu0 [ 0.029666] PM: genpd_remove: removed cpu1 [ 0.029690] PM: genpd_remove: removed cpu2 [ 0.029714] PM: genpd_remove: removed cpu3 [ 0.029738] PM: genpd_remove: removed cpu-cluster0
--- drivers/cpuidle/cpuidle-psci-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-psci-domain.c +2 -1
@@ -182,7 +182,8 @@ static void psci_pd_remove(void)struct psci_pd_provider *pd_provider, *it;struct generic_pm_domain *genpd; -list_for_each_entry_safe (pd_provider, it, &psci_pd_providers, link) { +list_for_each_entry_safe_reverse (pd_provider, it, + &psci_pd_providers, link) {of_genpd_del_provider (pd_provider->node); genpd =of_genpd_remove_last (pd_provider->node);
Greg Kroah-Hartman
maintainerPATCH 106/115 x86/mce: Make sure logged MCEs are processed after sysfs update
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
commit 4783b9cb374af02d49740e00e2da19fd4ed6dec4 upstream.
A recent change introduced a flag to queue up errors found during boot-time polling. These errors will be processed during late init once the MCE subsystem is fully set up.
A number of sysfs updates call mce_restart() which goes through a subset of the CPU init flow. This includes polling MCA banks and logging any errors found. Since the same function is used as boot-time polling, errors will be queued. However, the system is now past late init, so the errors will remain queued until another error is found and the workqueue is triggered.
Call mce_schedule_work() at the end of mce_restart() so that queued errors are processed.
--- arch/x86/kernel/cpu/mce/core.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/mce/core.c +1 -0
@@ -2302,6 +2302,7 @@ static void mce_restart(void) {mce_timer_delete_all ();on_each_cpu (mce_cpu_restart,NULL ,1 ); +mce_schedule_work (); }/* Toggle features for corrected errors */
Greg Kroah-Hartman
maintainerPATCH 107/115 x86/mm: Fix use of uninitialized buffer in sme_enable()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
commit cbebd68f59f03633469f3ecf9bea99cd6cce3854 upstream.
cmdline_find_option() may fail before doing any initialization of the buffer array. This may lead to unpredictable results when the same buffer is used later in calls to strncmp() function. Fix the issue by returning early if cmdline_find_option() returns an error.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- arch/x86/mm/mem_encrypt_identity.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/mm/mem_encrypt_identity.c +2 -1
@@ -585,7 +585,8 @@ void __init sme_enable(struct boot_param cmdline_ptr = (const char *)((u64 )bp->hdr.cmd_line_ptr | ((u64 )bp->ext_cmd_line_ptr <<32 )); -cmdline_find_option (cmdline_ptr, cmdline_arg, buffer,sizeof (buffer)); +if (cmdline_find_option (cmdline_ptr, cmdline_arg, buffer,sizeof (buffer)) <0 ) +return ;if (!strncmp (buffer, cmdline_on,sizeof (buffer))) sme_me_mask = me_mask;
Greg Kroah-Hartman
maintainerPATCH 108/115 x86/resctrl: Clear staged_config[] before and after it is used
In reply to Greg Kroah-HartmanFrom: Shawn Wang <[email protected]>
commit 0424a7dfe9129b93f29b277511a60e87f052ac6b upstream.
As a temporary storage, staged_config[] in rdt_domain should be cleared before and after it is used. The stale value in staged_config[] could cause an MSR access error.
Here is a reproducer on a system with 16 usable CLOSIDs for a 15-way L3 Cache (MBA should be disabled if the number of CLOSIDs for MB is less than 16.) :
mount -t resctrl resctrl -o cdp /sys/fs/resctrl
mkdir /sys/fs/resctrl/p{1..7}
umount /sys/fs/resctrl/
mount -t resctrl resctrl /sys/fs/resctrl
mkdir /sys/fs/resctrl/p{1..8}An error occurs when creating resource group named p8:
unchecked MSR access error: WRMSR to 0xca0 (tried to write 0x00000000000007ff) at rIP: 0xffffffff82249142 (cat_wrmsr+0x32/0x60)
Call Trace:
<IRQ>
__flush_smp_call_function_queue+0x11d/0x170
__sysvec_call_function+0x24/0xd0
sysvec_call_function+0x89/0xc0
</IRQ>
<TASK>
asm_sysvec_call_function+0x16/0x20When creating a new resource control group, hardware will be configured by the following process:
rdtgroup_mkdir()
rdtgroup_mkdir_ctrl_mon()
rdtgroup_init_alloc()
resctrl_arch_update_domains()
resctrl_arch_update_domains() iterates and updates all resctrl_conf_type whose have_new_ctrl is true. Since staged_config[] holds the same values as when CDP was enabled, it will continue to update the CDP_CODE and CDP_DATA configurations. When group p8 is created, get_config_index() called in resctrl_arch_update_domains() will return 16 and 17 as the CLOSIDs for CDP_CODE and CDP_DATA, which will be translated to an invalid register - 0xca0 in this scenario.
Fix it by clearing staged_config[] before and after it is used.
[reinette: re-order commit tags]
--- arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 7 ++----- arch/x86/kernel/cpu/resctrl/internal.h | 1 + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 25 +++++++++++++++++++++---- 3 files changed, 24 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/resctrl/ctrlmondata.c +2 -5
@@ -353,7 +353,6 @@ ssize_t rdtgroup_schemata_write(struct k {struct resctrl_schema *s;struct rdtgroup *rdtgrp; -struct rdt_domain *dom;struct rdt_resource *r;char *tok, *resname;int ret =0 ;
@@ -382,10 +381,7 @@ ssize_t rdtgroup_schemata_write(struct k goto out; } -list_for_each_entry (s, &resctrl_schema_all, list) { -list_for_each_entry (dom, &s->res->domains, list) -memset (dom->staged_config,0 ,sizeof (dom->staged_config)); - } +rdt_staged_configs_clear ();while ((tok =strsep (&buf,"\n" )) !=NULL ) { resname =strim (strsep (&tok,":" ));
@@ -422,6 +418,7 @@ ssize_t rdtgroup_schemata_write(struct k } out: +rdt_staged_configs_clear ();rdtgroup_kn_unlock (of->kn);cpus_read_unlock ();return ret ?: nbytes;
arch/x86/kernel/cpu/resctrl/internal.h +1 -0
@@ -550,5 +550,6 @@ bool has_busy_rmid(struct rdt_resource *void __check_limbo (struct rdt_domain *d,bool force_free);void rdt_domain_reconfigure_cdp (struct rdt_resource *r);void __init thread_throttle_mode_init (void ); +void rdt_staged_configs_clear (void );#endif /* _ASM_X86_RESCTRL_INTERNAL_H */
arch/x86/kernel/cpu/resctrl/rdtgroup.c +21 -4
@@ -78,6 +78,19 @@ void rdt_last_cmd_printf(const char *fmtva_end (ap); } +void rdt_staged_configs_clear (void ) +{ +struct rdt_resource *r; +struct rdt_domain *dom; + +lockdep_assert_held (&rdtgroup_mutex); + +for_each_alloc_capable_rdt_resource (r) { +list_for_each_entry (dom, &r->domains, list) +memset (dom->staged_config,0 ,sizeof (dom->staged_config)); + } +} +/* * Trivial allocator for CLOSIDs. Since h/w only supports a small number, * we can keep a bitmap of free CLOSIDs in a single integer.
@@ -2813,7 +2826,9 @@ static int rdtgroup_init_alloc(struct rd {struct resctrl_schema *s;struct rdt_resource *r; -int ret; +int ret =0 ; + +rdt_staged_configs_clear ();list_for_each_entry (s, &resctrl_schema_all, list) { r = s->res;
@@ -2822,20 +2837,22 @@ static int rdtgroup_init_alloc(struct rd }else { ret =rdtgroup_init_cat (s, rdtgrp->closid);if (ret <0 ) -return ret; + goto out; } ret =resctrl_arch_update_domains (r, rdtgrp->closid);if (ret <0 ) {rdt_last_cmd_puts ("Failed to initialize allocations\n" ); -return ret; + goto out; } } rdtgrp->mode =RDT_MODE_SHAREABLE ; -return 0 ; +out: +rdt_staged_configs_clear (); +return ret; } static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
Greg Kroah-Hartman
maintainerPATCH 109/115 drm/i915: Dont use stolen memory for ring buffers with LLC
In reply to Greg Kroah-HartmanFrom: John Harrison <[email protected]>
commit 690e0ec8e63da9a29b39fedc6ed5da09c7c82651 upstream.
Direction from hardware is that stolen memory should never be used for ring buffer allocations on platforms with LLC. There are too many caching pitfalls due to the way stolen memory accesses are routed. So it is safest to just not use it.
--- drivers/gpu/drm/i915/gt/intel_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_ring.c +1 -1
@@ -113,7 +113,7 @@ static struct i915_vma *create_ring_vma(struct i915_vma *vma; obj =i915_gem_object_create_lmem (i915, size,I915_BO_ALLOC_VOLATILE ); -if (IS_ERR (obj) &&i915_ggtt_has_aperture (ggtt)) +if (IS_ERR (obj) &&i915_ggtt_has_aperture (ggtt) && !HAS_LLC (i915)) obj =i915_gem_object_create_stolen (i915, size);if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);
Greg Kroah-Hartman
maintainerPATCH 110/115 drm/i915/active: Fix misuse of non-idle barriers as fence trackers
In reply to Greg Kroah-HartmanFrom: Janusz Krzysztofik <[email protected]>
commit e0e6b416b25ee14716f3549e0cbec1011b193809 upstream.
Users reported oopses on list corruptions when using i915 perf with a number of concurrently running graphics applications. Root cause analysis pointed at an issue in barrier processing code -- a race among perf open / close replacing active barriers with perf requests on kernel context and concurrent barrier preallocate / acquire operations performed during user context first pin / last unpin.
When adding a request to a composite tracker, we try to reuse an existing fence tracker, already allocated and registered with that composite. The tracker we obtain may already track another fence, may be an idle barrier, or an active barrier.
If the tracker we get occurs a non-idle barrier then we try to delete that barrier from a list of barrier tasks it belongs to. However, while doing that we don't respect return value from a function that performs the barrier deletion. Should the deletion ever fail, we would end up reusing the tracker still registered as a barrier task. Since the same structure field is reused with both fence callback lists and barrier tasks list, list corruptions would likely occur.
Barriers are now deleted from a barrier tasks list by temporarily removing the list content, traversing that content with skip over the node to be deleted, then populating the list back with the modified content. Should that intentionally racy concurrent deletion attempts be not serialized, one or more of those may fail because of the list being temporary empty.
Related code that ignores the results of barrier deletion was initially introduced in v5.4 by commit d8af05ff38ae ("drm/i915: Allow sharing the idle-barrier from other kernel requests"). However, all users of the barrier deletion routine were apparently serialized at that time, then the issue didn't exhibit itself. Results of git bisect with help of a newly developed igt@gem_barrier_race@remote-request IGT test indicate that list corruptions might start to appear after commit 311770173fac ("drm/i915/gt:
Schedule request retirement when timeline idles"), introduced in v5.5.
Respect results of barrier deletion attempts -- mark the barrier as idle only if successfully deleted from the list. Then, before proceeding with setting our fence as the one currently tracked, make sure that the tracker we've got is not a non-idle barrier. If that check fails then don't use that tracker but go back and try to acquire a new, usable one.
v3: use unlikely() to document what outcome we expect (Andi),
- fix bad grammar in commit description.
v2: no code changes,
- blame commit 311770173fac ("drm/i915/gt: Schedule request retirement when timeline idles"), v5.5, not commit d8af05ff38ae ("drm/i915: Allow sharing the idle-barrier from other kernel requests"), v5.4,
- reword commit description.
--- drivers/gpu/drm/i915/i915_active.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_active.c +14 -12
@@ -422,8 +422,7 @@ replace_barrier(struct i915_active *ref,* we can use it to substitute for the pending idle-barrer * request that we want to emit on the kernel_context. */ -__active_del_barrier (ref,node_from_active (active)); -return true; +return __active_del_barrier (ref,node_from_active (active)); }int i915_active_ref (struct i915_active *ref,u64 idx,struct dma_fence *fence)
@@ -436,16 +435,19 @@ int i915_active_ref(struct i915_active *if (err)return err; - active =active_instance (ref, idx); -if (!active) { - err = -ENOMEM ; - goto out; - } - -if (replace_barrier (ref, active)) { -RCU_INIT_POINTER (active->fence,NULL ); -atomic_dec (&ref->count); - } +do { + active =active_instance (ref, idx); +if (!active) { + err = -ENOMEM ; + goto out; + } + +if (replace_barrier (ref, active)) { +RCU_INIT_POINTER (active->fence,NULL ); +atomic_dec (&ref->count); + } + }while (unlikely (is_barrier (active))); +if (!__i915_active_fence_set (active, fence))__i915_active_acquire (ref);
Greg Kroah-Hartman
maintainerPATCH 111/115 io_uring: avoid null-ptr-deref in io_arm_poll_handler
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
No upstream commit exists for this commit.
The issue was introduced with backporting upstream commit c16bda37594f ("io_uring/poll: allow some retries for poll triggering spuriously").
Memory allocation can possibly fail causing invalid pointer be dereferenced just before comparing it to NULL value.
Move the pointer check in proper place (upstream has the similar location of the check). In case the request has REQ_F_POLLED flag up, apoll can't be NULL so no need to check there.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- io_uring/io_uring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
io_uring/io_uring.c +2 -2
@@ -5937,10 +5937,10 @@ static int io_arm_poll_handler(struct io } }else { apoll =kmalloc (sizeof (*apoll),GFP_ATOMIC ); +if (unlikely (!apoll)) +return IO_APOLL_ABORTED ; apoll->poll.retries =APOLL_MAX_RETRY ; } -if (unlikely (!apoll)) -return IO_APOLL_ABORTED ; apoll->double_poll =NULL ; req->apoll = apoll; req->flags |=REQ_F_POLLED ;
Greg Kroah-Hartman
maintainerPATCH 112/115 PCI: Unify delay handling for reset and resume
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit ac91e6980563ed53afadd925fa6585ffd2bc4a2c upstream.
Sheng Bi reports that pci_bridge_secondary_bus_reset() may fail to wait for devices on the secondary bus to become accessible after reset:
Although it does call pci_dev_wait(), it erroneously passes the bridge's pci_dev rather than that of a child. The bridge of course is always accessible while its secondary bus is reset, so pci_dev_wait() returns immediately.
Sheng Bi proposes introducing a new pci_bridge_secondary_bus_wait() function which is called from pci_bridge_secondary_bus_reset():
https://lore.kernel.org/linux-pci/[email protected]/
However we already have pci_bridge_wait_for_secondary_bus() which does almost exactly what we need. So far it's only called on resume from D3cold (which implies a Fundamental Reset per PCIe r6.0 sec 5.8). Re-using it for Secondary Bus Resets is a leaner and more rational approach than introducing a new function.
That only requires a few minor tweaks:
- Amend pci_bridge_wait_for_secondary_bus() to await accessibility of the first device on the secondary bus by calling pci_dev_wait() after performing the prescribed delays. pci_dev_wait() needs two parameters, a reset reason and a timeout, which callers must now pass to pci_bridge_wait_for_secondary_bus(). The timeout is 1 sec for resume (PCIe r6.0 sec 6.6.1) and 60 sec for reset (commit 821cdad5c46c ("PCI:
Wait up to 60 seconds for device to become ready after FLR")). Introduce a PCI_RESET_WAIT macro for the 1 sec timeout.
- Amend pci_bridge_wait_for_secondary_bus() to return 0 on success or -ENOTTY on error for consumption by pci_bridge_secondary_bus_reset().
- Drop an unnecessary 1 sec delay from pci_reset_secondary_bus() which is now performed by pci_bridge_wait_for_secondary_bus(). A static delay this long is only necessary for Conventional PCI, so modern PCIe systems benefit from shorter reset times as a side effect.
--- drivers/pci/pci-driver.c | 4 +-- drivers/pci/pci.c | 54 ++++++++++++++++++++--------------------------- drivers/pci/pci.h | 10 +++++++- 3 files changed, 35 insertions(+), 33 deletions(-)
drivers/pci/pci-driver.c +2 -2
@@ -925,7 +925,7 @@ static int pci_pm_resume_noirq(struct depcie_pme_root_status_cleanup (pci_dev);if (!skip_bus_pm && prev_state == PCI_D3cold) -pci_bridge_wait_for_secondary_bus (pci_dev); +pci_bridge_wait_for_secondary_bus (pci_dev,"resume" ,PCI_RESET_WAIT );if (pci_has_legacy_pm_support (pci_dev))return 0 ;
@@ -1312,7 +1312,7 @@ static int pci_pm_runtime_resume(structpci_pm_default_resume (pci_dev);if (prev_state == PCI_D3cold) -pci_bridge_wait_for_secondary_bus (pci_dev); +pci_bridge_wait_for_secondary_bus (pci_dev,"resume" ,PCI_RESET_WAIT );if (pm && pm->runtime_resume) error = pm->runtime_resume (dev);
drivers/pci/pci.c +24 -30
137 lines not on this page · raw message
drivers/pci/pci.h +9 -1
@@ -63,6 +63,13 @@ struct pci_cap_saved_state *pci_find_sav#define PCI_PM_D3HOT_WAIT 10/* msec */ #define PCI_PM_D3COLD_WAIT 100/* msec */ +/* +* Following exit from Conventional Reset, devices must be ready within 1 sec +* (PCIe r6.0 sec 6.6.1). A D3cold to D0 transition implies a Conventional +* Reset (PCIe r6.0 sec 5.8). +*/ +#define PCI_RESET_WAIT 1000/* msec */ +/** * struct pci_platform_pm_ops - Firmware PM callbacks *
@@ -124,7 +131,8 @@ void pci_msi_init(struct pci_dev *dev);void pci_msix_init (struct pci_dev *dev);bool pci_bridge_d3_possible (struct pci_dev *dev);void pci_bridge_d3_update (struct pci_dev *dev); -void pci_bridge_wait_for_secondary_bus (struct pci_dev *dev); +int pci_bridge_wait_for_secondary_bus (struct pci_dev *dev,char *reset_type, +int timeout);static inline void pci_wakeup_event (struct pci_dev *dev) {
Greg Kroah-Hartman
maintainerPATCH 113/115 PCI/DPC: Await readiness of secondary bus after reset
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 53b54ad074de1896f8b021615f65b27f557ce874 upstream.
pci_bridge_wait_for_secondary_bus() is called after a Secondary Bus Reset, but not after a DPC-induced Hot Reset.
As a result, the delays prescribed by PCIe r6.0 sec 6.6.1 are not observed and devices on the secondary bus may be accessed before they're ready.
One affected device is Intel's Ponte Vecchio HPC GPU. It comprises a PCIe switch whose upstream port is not immediately ready after reset. Because its config space is restored too early, it remains in D0uninitialized, its subordinate devices remain inaccessible and DPC recovery fails with messages such as:
i915 0000:8c:00.0: can't change power state from D3cold to D0 (config space inaccessible) intel_vsec 0000:8e:00.1: can't change power state from D3cold to D0 (config space inaccessible) pcieport 0000:89:02.0: AER: device recovery failed
Fix it.
--- drivers/pci/pci.c | 3 --- drivers/pci/pci.h | 6 ++++++ drivers/pci/pcie/dpc.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/pci/pci.c +0 -3
@@ -163,9 +163,6 @@ static int __init pcie_port_pm_setup(cha }__setup ("pcie_port_pm=" , pcie_port_pm_setup); -/* Time to wait after a reset for device to become responsive */ -#define PCIE_RESET_READY_POLL_MS 60000 -/** * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children * @bus: pointer to PCI bus structure to search
drivers/pci/pci.h +6 -0
@@ -69,6 +69,12 @@ struct pci_cap_saved_state *pci_find_sav* Reset (PCIe r6.0 sec 5.8). */ #define PCI_RESET_WAIT 1000/* msec */ +/* +* Devices may extend the 1 sec period through Request Retry Status completions +* (PCIe r6.0 sec 2.3.1). The spec does not provide an upper limit, but 60 sec +* ought to be enough for any device to become responsive. +*/ +#define PCIE_RESET_READY_POLL_MS 60000/* msec */ /** * struct pci_platform_pm_ops - Firmware PM callbacks
drivers/pci/pcie/dpc.c +2 -2
@@ -170,8 +170,8 @@ pci_ers_result_t dpc_reset_link(struct ppci_write_config_word (pdev, cap +PCI_EXP_DPC_STATUS ,PCI_EXP_DPC_STATUS_TRIGGER ); -if (!pcie_wait_for_link (pdev, true)) { -pci_info (pdev,"Data Link Layer Link Active not set in 1000 msec\n" ); +if (pci_bridge_wait_for_secondary_bus (pdev,"DPC" , +PCIE_RESET_READY_POLL_MS )) {clear_bit (PCI_DPC_RECOVERED , &pdev->priv_flags); ret =PCI_ERS_RESULT_DISCONNECT ; }else {
Greg Kroah-Hartman
maintainerPATCH 114/115 HID: core: Provide new max_buffer_size attribute to over-ride the default
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
commit b1a37ed00d7908a991c1d0f18a8cba3c2aa99bdc upstream.
Presently, when a report is processed, its proposed size, provided by the user of the API (as Report Size * Report Count) is compared against the subsystem default HID_MAX_BUFFER_SIZE (16k). However, some low-level HID drivers allocate a reduced amount of memory to their buffers (e.g. UHID only allocates UHID_DATA_MAX (4k) buffers), rending this check inadequate in some cases.
In these circumstances, if the received report ends up being smaller than the proposed report size, the remainder of the buffer is zeroed. That is, the space between sizeof(csize) (size of the current report) and the rsize (size proposed i.e. Report Size * Report Count), which can be handled up to HID_MAX_BUFFER_SIZE (16k). Meaning that memset() shoots straight past the end of the buffer boundary and starts zeroing out in-use values, often resulting in calamity.
This patch introduces a new variable into 'struct hid_ll_driver' where individual low-level drivers can over-ride the default maximum value of HID_MAX_BUFFER_SIZE (16k) with something more sympathetic to the interface.
--- drivers/hid/hid-core.c | 18 +++++++++++++----- include/linux/hid.h | 3 +++ 2 files changed, 16 insertions(+), 5 deletions(-)
drivers/hid/hid-core.c +13 -5
@@ -258,6 +258,7 @@ static int hid_add_field(struct hid_pars {struct hid_report *report;struct hid_field *field; +unsigned int max_buffer_size =HID_MAX_BUFFER_SIZE ;unsigned int usages;unsigned int offset;unsigned int i;
@@ -288,8 +289,11 @@ static int hid_add_field(struct hid_pars offset = report->size; report->size += parser->global.report_size * parser->global.report_count; +if (parser->device->ll_driver->max_buffer_size) + max_buffer_size = parser->device->ll_driver->max_buffer_size; +/* Total size check: Allow for possible report index byte */ -if (report->size > (HID_MAX_BUFFER_SIZE -1 ) <<3 ) { +if (report->size > (max_buffer_size -1 ) <<3 ) {hid_err (parser->device,"report is too long\n" );return -1 ; }
@@ -1752,6 +1756,7 @@ int hid_report_raw_event(struct hid_devistruct hid_report_enum *report_enum = hid->report_enum + type;struct hid_report *report;struct hid_driver *hdrv; +int max_buffer_size =HID_MAX_BUFFER_SIZE ;unsigned int a;u32 rsize, csize = size;u8 *cdata = data;
@@ -1768,10 +1773,13 @@ int hid_report_raw_event(struct hid_devi rsize =hid_compute_report_size (report); -if (report_enum->numbered && rsize >=HID_MAX_BUFFER_SIZE ) - rsize =HID_MAX_BUFFER_SIZE -1 ; -else if (rsize >HID_MAX_BUFFER_SIZE ) - rsize =HID_MAX_BUFFER_SIZE ; +if (hid->ll_driver->max_buffer_size) + max_buffer_size = hid->ll_driver->max_buffer_size; + +if (report_enum->numbered && rsize >= max_buffer_size) + rsize = max_buffer_size -1 ; +else if (rsize > max_buffer_size) + rsize = max_buffer_size;if (csize < rsize) { dbg_hid("report %d is too short, (%d < %d)\n", report->id,
include/linux/hid.h +3 -0
@@ -805,6 +805,7 @@ struct hid_driver {* @output_report: send output report to device * @idle: send idle request to device * @may_wakeup: return if device may act as a wakeup source during system-suspend +* @max_buffer_size: over-ride maximum data buffer size (default: HID_MAX_BUFFER_SIZE) */ struct hid_ll_driver {int (*start)(struct hid_device *hdev);
@@ -830,6 +831,8 @@ struct hid_ll_driver {int (*idle)(struct hid_device *hdev,int report,int idle,int reqtype);bool (*may_wakeup)(struct hid_device *hdev); + +unsigned int max_buffer_size; };extern struct hid_ll_driver i2c_hid_ll_driver;
Greg Kroah-Hartman
maintainerPATCH 115/115 HID: uhid: Over-ride the default maximum data buffer value with our own
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
commit 1c5d4221240a233df2440fe75c881465cdf8da07 upstream.
The default maximum data buffer size for this interface is UHID_DATA_MAX (4k). When data buffers are being processed, ensure this value is used when ensuring the sanity, rather than a value between the user provided value and HID_MAX_BUFFER_SIZE (16k).
--- drivers/hid/uhid.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/uhid.c +1 -0
@@ -395,6 +395,7 @@ struct hid_ll_driver uhid_hid_driver = { .parse = uhid_hid_parse, .raw_request = uhid_hid_raw_request, .output_report = uhid_hid_output_report, + .max_buffer_size = UHID_DATA_MAX, };EXPORT_SYMBOL_GPL (uhid_hid_driver);
Hello Greg,
Quoted 10 lines
From: Greg Kroah-Hartman <[email protected]>
Sent: 20 March 2023 14:54This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
CIP configurations built and booted with Linux 5.15.104-rc1 (433daa4de681):
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/812172283
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/commits/linux-5.15.y
Kind regards, Chris
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.15.104-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: 433daa4de6819b2f97fc17c5a71d1fa5b1f8b14c
* git describe: v5.15.103-116-g433daa4de681
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.103-116-g433daa4de681
## Test Regressions (compared to v5.15.103)
## Metric Regressions (compared to v5.15.103)
## Test Fixes (compared to v5.15.103)
## Metric Fixes (compared to v5.15.103)
## Test result summary
total: 94469, pass: 77630, fail: 2510, skip: 14101, xfail: 228
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 112 total, 111 passed, 1 failed
* arm64: 39 total, 39 passed, 0 failed
* i386: 30 total, 29 passed, 1 failed
* mips: 24 total, 24 passed, 0 failed
* parisc: 6 total, 6 passed, 0 failed
* powerpc: 24 total, 24 passed, 0 failed
* riscv: 8 total, 8 passed, 0 failed
* s390: 9 total, 9 passed, 0 failed
* sh: 12 total, 12 passed, 0 failed
* sparc: 6 total, 6 passed, 0 failed
* x86_64: 33 total, 33 passed, 0 failed
## Test suites summary
* boot
* fwts
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* perf
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my x86_64 and ARM64 test systems. No errors or regressions.
Thanks.
Hi Greg,
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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.
No problems detected on x86_64 and aarch64.
Thanks,
Harshit
Quoted 13 lines
Responses should be made by Wed, 22 Mar 2023 14:54:26 +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.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.2.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra.
Due to infrastructure issues, no test report available, but all tests are passing.
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.104-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.104 release. There are 115 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, 22 Mar 2023 14:54:26 +0000. Anything received after that time might be too late.
Build results:
total: 160 pass: 160 fail: 0
Qemu test results:
total: 499 pass: 499 fail: 0
Guenter