6.6.130-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 1/567 drm/vmwgfx: Fix invalid kref_put callback in vmw_bo_dirty_release
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brad Spengler <[email protected]>
[ Upstream commit 211ecfaaef186ee5230a77d054cdec7fbfc6724a ]
The kref_put() call uses (void *)kvfree as the release callback, which is incorrect. kref_put() expects a function with signature void (*release)(struct kref *), but kvfree has signature void (*)(const void *). Calling through an incompatible function pointer is undefined behavior.
The code only worked by accident because ref_count is the first member of vmw_bo_dirty, making the kref pointer equal to the struct pointer.
Fix this by adding a proper release callback that uses container_of() to retrieve the containing structure before freeing.
--- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +8 -1
@@ -274,6 +274,13 @@ int vmw_bo_dirty_add(struct vmw_bo *vbo)return ret; } +static void vmw_bo_dirty_free (struct kref *kref) +{ + struct vmw_bo_dirty *dirty = container_of(kref, struct vmw_bo_dirty, ref_count); + +kvfree (dirty); +} +/** * vmw_bo_dirty_release - Release a dirty-tracking user from a buffer object * @vbo: The buffer object
@@ -288,7 +295,7 @@ void vmw_bo_dirty_release(struct vmw_bo *vbo) {struct vmw_bo_dirty *dirty = vbo->dirty; -if (dirty &&kref_put (&dirty->ref_count, (void *)kvfree)) +if (dirty &&kref_put (&dirty->ref_count, vmw_bo_dirty_free)) vbo->dirty =NULL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 2/567 drm/vmwgfx: Return the correct value in vmw_translate_ptr functions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Forbes <[email protected]>
[ Upstream commit 5023ca80f9589295cb60735016e39fc5cc714243 ]
Before the referenced fixes these functions used a lookup function that returned a pointer. This was changed to another lookup function that returned an error code with the pointer becoming an out parameter.
The error path when the lookup failed was not changed to reflect this change and the code continued to return the PTR_ERR of the now uninitialized pointer. This could cause the vmw_translate_ptr functions to return success when they actually failed causing further uninitialized and OOB accesses.
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +2 -2
@@ -1160,7 +1160,7 @@ static int vmw_translate_mob_ptr(struct vmw_private *dev_priv, ret =vmw_user_bo_lookup (sw_context->filp, handle, &vmw_bo);if (ret !=0 ) {drm_dbg (&dev_priv->drm,"Could not find or use MOB buffer.\n" ); -return PTR_ERR (vmw_bo); +return ret; }vmw_bo_placement_set (vmw_bo,VMW_BO_DOMAIN_MOB ,VMW_BO_DOMAIN_MOB ); ret =vmw_validation_add_bo (sw_context->ctx, vmw_bo);
@@ -1216,7 +1216,7 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv, ret =vmw_user_bo_lookup (sw_context->filp, handle, &vmw_bo);if (ret !=0 ) {drm_dbg (&dev_priv->drm,"Could not find or use GMR region.\n" ); -return PTR_ERR (vmw_bo); +return ret; }vmw_bo_placement_set (vmw_bo,VMW_BO_DOMAIN_GMR |VMW_BO_DOMAIN_VRAM ,VMW_BO_DOMAIN_GMR |VMW_BO_DOMAIN_VRAM );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 3/567 drm/logicvc: Fix device node reference leak in logicvc_drm_config_parse()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Gu <[email protected]>
[ Upstream commit fef0e649f8b42bdffe4a916dd46e1b1e9ad2f207 ]
The logicvc_drm_config_parse() function calls of_get_child_by_name() to find the "layers" node but fails to release the reference, leading to a device node reference leak.
Fix this by using the __free(device_node) cleanup attribute to automatic release the reference when the variable goes out of scope.
--- drivers/gpu/drm/logicvc/logicvc_drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/logicvc/logicvc_drm.c +2 -2
@@ -90,7 +90,6 @@ static int logicvc_drm_config_parse(struct logicvc_drm *logicvc)struct device *dev = drm_dev->dev;struct device_node *of_node = dev->of_node;struct logicvc_drm_config *config = &logicvc->config; -struct device_node *layers_node;int ret; logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING,
@@ -126,7 +125,8 @@ static int logicvc_drm_config_parse(struct logicvc_drm *logicvc)if (ret)return ret; - layers_node =of_get_child_by_name (of_node,"layers" ); + struct device_node *layers_node __free(device_node) = +of_get_child_by_name (of_node,"layers" );if (!layers_node) {drm_err (drm_dev,"Missing non-optional layers node\n" );return -EINVAL ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainercover 6.6.130-rc1 review
This is the start of the stable review cycle for the 6.6.130 release. There are 567 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, 25 Mar 2026 13:44:33 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.6.130-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.6.130-rc1
Josh Law <[email protected]>
tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
Josh Law <[email protected]>
lib/bootconfig: check xbc_init_node() return in override path
Rahul Bukte <[email protected]>
drm/i915/gt: Check set_default_submission() before deferencing
Hyunwoo Kim <[email protected]>
ksmbd: fix use-after-free in durable v2 replay of active file handles
Hyunwoo Kim <[email protected]>
ksmbd: fix use-after-free of share_conf in compound request
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix DisplayID not-found handling in parse_edid_displayid_vrr()
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: skip DMA during panic write
Kamal Dasu <[email protected]>
mtd: rawnand: serialize lock/unlock against other NAND operations
Johan Hovold <[email protected]>
i2c: cp2615: fix serial string NULL-deref at probe
Justin Stitt <[email protected]>
i2c: cp2615: replace deprecated strncpy with strscpy
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: split gc into unlink and reclaim phase
Kyle Meyer <[email protected]>
x86/platform/uv: Handle deconfigured sockets
Gabor Juhos <[email protected]>
i2c: pxa: defer reset on Armada 3700 when recovery is used
Christophe JAILLET <[email protected]>
i2c: fsi: Fix a potential leak in fsi_i2c_probe()
Ji-Ze Hong (Peter Hong) <[email protected]>
USB: serial: f81232: fix incomplete serial port generation
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix accepting multiple L2CAP_ECRED_CONN_REQ
Maarten Lankhorst <[email protected]>
drm: Fix use-after-free on framebuffers and property blobs when calling drm_dev_unplug
Sanman Pradhan <[email protected]>
hwmon: (pmbus/isl68137) Fix unchecked return value and use sysfs_emit()
Sanman Pradhan <[email protected]>
hwmon: (pmbus/mp2975) Add error check for pmbus_read_word_data() return value
Weiming Shi <[email protected]>
icmp: fix NULL pointer dereference in icmp_tag_validation()
Anas Iqbal <[email protected]>
net: dsa: bcm_sf2: fix missing clk_disable_unprepare() in error paths
Muhammad Hammad Ijaz <[email protected]>
net: mvpp2: guard flow control update with global_tx_fc in buffer switching
Weiming Shi <[email protected]>
nfnetlink_osf: validate individual option lengths in fingerprints
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: release flowtable after rcu grace period on error
Florian Westphal <[email protected]>
netfilter: bpf: defer hook memory release until rcu readers are done
Xiang Mei <[email protected]>
net: bonding: fix NULL deref in bond_debug_rlb_hash_show
Xiang Mei <[email protected]>
udp_tunnel: fix NULL deref caused by udp_sock_create6 when CONFIG_IPV6=n
Jianbo Liu <[email protected]>
net/mlx5e: Fix race condition during IPSec ESN update
Jianbo Liu <[email protected]>
net/mlx5e: Prevent concurrent access to IPSec ASO context
Cosmin Ratiu <[email protected]>
net/mlx5: qos: Restrict RTNL area to avoid a lock cycle
Fedor Pchelkin <[email protected]>
net: macb: fix uninitialized rx_fs_lock
Rafael J. Wysocki <[email protected]>
ACPI: processor: Fix previous acpi_processor_errata_piix4() fix
Guenter Roeck <[email protected]>
wifi: wlcore: Return -ENOMEM instead of -EAGAIN if there is not enough headroom
Xiang Mei <[email protected]>
wifi: mac80211: fix NULL deref in mesh_matches_local()
Petr Oros <[email protected]>
iavf: fix VLAN filter lost on add/delete race
Kohei Enju <[email protected]>
igc: fix missing update of skb->tail in igc_xmit_frame()
Nikola Z. Ivanov <[email protected]>
net: usb: aqc111: Do not perform PM inside suspend callback
Daniel Borkmann <[email protected]>
clsact: Fix use-after-free in init/destroy rollback asymmetry
Tobi Gaertner <[email protected]>
net: usb: cdc_ncm: add ndpoffset to NDP32 nframes bounds check
Tobi Gaertner <[email protected]>
net: usb: cdc_ncm: add ndpoffset to NDP16 nframes bounds check
Jamal Hadi Salim <[email protected]>
net/sched: teql: Fix double-free in teql_master_xmit
Jiayuan Chen <[email protected]>
net/smc: fix NULL dereference and UAF in smc_tcp_syn_recv_sock()
Bart Van Assche <[email protected]>
PM: runtime: Fix a race condition related to device removal
Rafael J. Wysocki <[email protected]>
sched: idle: Consolidate the handling of two special cases
Dipayaan Roy <[email protected]>
net: mana: fix use-after-free in mana_hwc_destroy_channel() by reordering teardown
Justin Chen <[email protected]>
net: bcmgenet: increase WoL poll timeout
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: check for zero length in DecodeQ931()
Jenny Guanni Qu <[email protected]>
netfilter: xt_time: use unsigned int for monthday bit shift
Pablo Neira Ayuso <[email protected]>
netfilter: xt_CT: drop pending enqueued packets on template removal
Pablo Neira Ayuso <[email protected]>
netfilter: nft_ct: drop pending enqueued packets on removal
Andrii Melnychenko <[email protected]>
netfilter: nft_ct: add seqadj extension for natted connections
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: fix OOB read in decode_int() CONS case
Lukas Johannes Möller <[email protected]>
netfilter: nf_conntrack_sip: fix Content-Length u32 truncation in sip_help_tcp()
Hyunwoo Kim <[email protected]>
netfilter: ctnetlink: fix use-after-free in ctnetlink_dump_exp_ct()
Florian Westphal <[email protected]>
netfilter: ctnetlink: remove refcounting in expectation dumpers
Sabrina Dubroca <[email protected]>
mpls: add missing unregister_netdevice_notifier to mpls_init
Jiayuan Chen <[email protected]>
net/rose: fix NULL pointer dereference in rose_transmit_link on reconnect
Dmitry Baryshkov <[email protected]>
Bluetooth: qca: fix ROM version reading on WCN3998 chips
Shaurya Rane <[email protected]>
Bluetooth: L2CAP: Fix use-after-free in l2cap_unregister_user
Luiz Augusto von Dentz <[email protected]>
Bluetooth: HIDP: Fix possible UAF
Michael Grzeschik <[email protected]>
Bluetooth: hci_sync: Fix hci_le_create_conn_sync
Luiz Augusto von Dentz <[email protected]>
Bluetooth: ISO: Fix defer tests being unstable
Christian Eggers <[email protected]>
Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if sum of payload sizes exceed SDU
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if received packet's SDU exceeds IMTU
Felix Gu <[email protected]>
firmware: arm_scpi: Fix device_node reference leak in probe path
Peddolla Harshavardhan Reddy <[email protected]>
wifi: cfg80211: cancel pmsr_free_wk in cfg80211_pmsr_wdev_down
Kuniyuki Iwashima <[email protected]>
wifi: mac80211: Fix static_branch_dec() underflow for aql_disable.
Richard Genoud <[email protected]>
soc: fsl: qbman: fix race condition in qman_destroy_fq
Felix Gu <[email protected]>
cache: ax45mp: Fix device node reference leak in ax45mp_cache_init()
ZhengYuan Huang <[email protected]>
btrfs: tree-checker: fix misleading root drop_level error message
Filipe Manana <[email protected]>
btrfs: log new dentries when logging parent dir of a conflicting inode
Xi Ruoyao <[email protected]>
drm/amd/display: Wrap dcn32_override_min_req_memclk() in DC_FP_{START, END}Alex Deucher <[email protected]>
drm/amdgpu: apply state adjust rules to some additional HAINAN vairants
Alex Deucher <[email protected]>
drm/radeon: apply state adjust rules to some additional HAINAN vairants
Alex Deucher <[email protected]>
drm/amdgpu/mmhub3.0: add bounds checking for cid
Alex Deucher <[email protected]>
drm/amdgpu/mmhub3.0.2: add bounds checking for cid
Alex Deucher <[email protected]>
drm/amdgpu/mmhub3.0.1: add bounds checking for cid
Alex Deucher <[email protected]>
drm/amdgpu/mmhub2.3: add bounds checking for cid
Alex Deucher <[email protected]>
drm/amdgpu/mmhub2.0: add bounds checking for cid
Alex Deucher <[email protected]>
drm/amdgpu/gmc9.0: add bounds checking for cid
Maciej Andrzejewski ICEYE <[email protected]>
serial: uartlite: fix PM runtime usage count underflow on probe
Ilpo Järvinen <[email protected]>
serial: 8250: Add late synchronize_irq() to shutdown to handle DW UART BUSY
Raul E Rangel <[email protected]>
serial: 8250: Fix TX deadlock when using DMA
Martin Roukala (né Peres) <[email protected]>
serial: 8250_pci: add support for the AX99100
Guanghui Feng <[email protected]>
iommu/vt-d: Fix intel iommu iotlb sync hardlockup and retry
Finn Thain <[email protected]>
mtd: Avoid boot crash in RedBoot partition table parser
Chen Ni <[email protected]>
mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()
Olivier Sobrie <[email protected]>
mtd: rawnand: pl353: make sure optimal timings are applied
Johan Hovold <[email protected]>
spi: fix statistics allocation
Johan Hovold <[email protected]>
spi: fix use-after-free on controller registration failure
Maíra Canal <[email protected]>
pmdomain: bcm: bcm2835-power: Increase ASB control timeout
Luke Wang <[email protected]>
mmc: sdhci: fix timing selection for 1-bit bus width
Matthew Schwartz <[email protected]>
mmc: sdhci-pci-gli: fix GL9750 DMA write corruption
Kevin Hao <[email protected]>
net: macb: Reinitialize tx/rx queue pointer registers and rx ring during resume
Kevin Hao <[email protected]>
net: macb: Introduce gem_init_rx_ring()
Vineeth Karumanchi <[email protected]>
net: macb: queue tie-off or disable during WOL suspend
Jeff Layton <[email protected]>
nfsd: fix heap overflow in NFSv4.0 LOCK replay cache
Yang Yang <[email protected]>
batman-adv: avoid OGM aggregation when skb tailroom is insufficient
Antoniu Miclaus <[email protected]>
iio: light: bh1780: fix PM runtime leak on error path
Filipe Manana <[email protected]>
btrfs: fix transaction abort on file creation due to name hash collision
Filipe Manana <[email protected]>
btrfs: fix transaction abort on set received ioctl due to item overflow
Filipe Manana <[email protected]>
btrfs: fix transaction abort when snapshotting received subvolumes
Masami Hiramatsu (Google) <[email protected]>
kprobes: Remove unneeded warnings from __arm_kprobe_ftrace()
Masami Hiramatsu (Google) <[email protected]>
kprobes: Remove unneeded goto
Namjae Jeon <[email protected]>
ksmbd: unset conn->binding on failed binding request
Paulo Alcantara <[email protected]>
smb: client: fix krb5 mount with username option
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Validate L2CAP_INFO_RSP payload length before access
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Fix type confusion in l2cap_ecred_reconf_rsp()
Helge Deller <[email protected]>
parisc: Flush correct cache in cacheflush() syscall
Fedor Pchelkin <[email protected]>
net: macb: fix use-after-free access to PTP clock
Ian Ray <[email protected]>
NFC: nxp-nci: allow GPIOs to sleep
Tiezhu Yang <[email protected]>
LoongArch: Give more information if kmem access failed
Ira Weiny <[email protected]>
nvdimm/bus: Fix potential use after free in asynchronous initialization
Jeff Layton <[email protected]>
sunrpc: fix cache_request leak in cache_release
Chuck Lever <[email protected]>
NFSD: Hold net reference for the lifetime of /proc/fs/nfs/exports fd
Jens Axboe <[email protected]>
io_uring/kbuf: check if target buffer list is still legacy on recycle
David Hildenbrand (Arm) <[email protected]>
mm/mempolicy: fix wrong mmap_read_unlock() in migrate_to_node()
Harald Freudenberger <[email protected]>
s390/zcrypt: Enable AUTOSEL_DOM for CCA serialnr sysfs attribute
Heiko Carstens <[email protected]>
s390/stackleak: Fix __stackleak_poison() inline assembly constraint
Heiko Carstens <[email protected]>
s390/xor: Fix xor_xc_2() inline assembly constraints
Matthieu Baerts (NGI0) <[email protected]>
mptcp: pm: in-kernel: always set ID as avail when rm endp
Russell King (Oracle) <[email protected]>
net: stmmac: remove support for lpi_intr_o
Zilin Guan <[email protected]>
binfmt_misc: restore write access before closing files opened by open_exec()
Vincent Guittot <[email protected]>
sched/fair: Fix pelt clock sync when entering idle
Chao Yu <[email protected]>
f2fs: zone: fix to avoid inconsistence in between SIT and SSA
Zqiang <[email protected]>
rcu/nocb: Fix possible invalid rdp's->nocb_cb_kthread pointer access
Antheas Kapenekakis <[email protected]>
platform/x86/amd/pmc: Add support for Van Gogh SoC
Oleg Nesterov <[email protected]>
x86/uprobes: Fix XOL allocation failure for 32-bit tasks
Eric Dumazet <[email protected]>
net: use dst_dev_rcu() in sk_setup_caps()
Eric Dumazet <[email protected]>
net: dst: introduce dst->dev_rcu
Eric Dumazet <[email protected]>
net: dst: add four helpers to annotate data-races around dst->dev
Jeongjun Park <[email protected]>
drm/exynos: vidi: use ctx->lock to protect struct vidi_context member variables related to memory alloc/free
Jeongjun Park <[email protected]>
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeongjun Park <[email protected]>
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
Lijo Lazar <[email protected]>
drm/amdgpu: Add basic validation for RAS header
Eric Dumazet <[email protected]>
l2tp: do not use sock_hold() in pppol2tp_session_get_sock()
Timur Kristóf <[email protected]>
drm/amd/pm: Use pm_display_cfg in legacy DPM (v2)
Timur Kristóf <[email protected]>
drm/amd/display: Add pixel_clock to amd_pp_display_configuration
Vladimir Oltean <[email protected]>
net: dsa: properly keep track of conduit reference
Paul Chaignon <[email protected]>
bpf: Forget ranges when refining tnum after JSET
Jibin Zhang <[email protected]>
net: fix segmentation of forwarding fraglist GRO
Felix Fietkau <[email protected]>
net: gso: fix tcp fraglist segmentation after pull from frag_list
Felix Fietkau <[email protected]>
net: add support for segmenting TCP fraglist GSO packets
Steven Rostedt <[email protected]>
tracing: Add recursion protection in kernel stack trace recording
Guodong Xu <[email protected]>
dmaengine: mmp_pdma: Fix race condition in mmp_pdma_residue()
Lukas Gerlach <[email protected]>
riscv: Sanitize syscall table indexing under speculation
Qu Wenruo <[email protected]>
btrfs: do not strictly require dirty metadata threshold for metadata writepages
Christoph Hellwig <[email protected]>
iomap: allocate s_dio_done_wq for async reads as well
David Howells <[email protected]>
rxrpc: Fix data-race warning and potential load/store tearing
Tom Lendacky <[email protected]>
x86/sev: Check for MWAITX and MONITORX opcodes in the #VC handler
Borislav Petkov (AMD) <[email protected]>
x86/sev: Harden #VC instruction emulation somewhat
Eric Dumazet <[email protected]>
ipv6: use RCU in ip6_xmit()
Mikulas Patocka <[email protected]>
dm-verity: disable recursive forward error correction
David Howells <[email protected]>
rxrpc: Fix recvmsg() unconditional requeue
Jan Kara <[email protected]>
ext4: always allocate blocks only from groups inode can use
Jakub Kicinski <[email protected]>
eth: bnxt: always recalculate features after XDP clearing, fix null-deref
Bjorn Andersson <[email protected]>
usb: typec: ucsi: Move unregister out of atomic section
Trond Myklebust <[email protected]>
pNFS: Fix a deadlock when returning a delegation during open()
Trond Myklebust <[email protected]>
NFS: Fix a deadlock involving nfs_release_folio()
Christoph Hellwig <[email protected]>
nfs: pass explicit offset/count to trace events
Eric Dumazet <[email protected]>
dst: fix races in rt6_uncached_list_del() and rt_del_uncached_list()
Miquel Sabaté Solà <[email protected]>
btrfs: fix NULL dereference on root when tracing inode eviction
Ryan Roberts <[email protected]>
arm64: mm: Don't remap pgtables for allocate vs populate
Ryan Roberts <[email protected]>
arm64: mm: Batch dsb and isb when populating pgtables
Ryan Roberts <[email protected]>
arm64: mm: Don't remap pgtables per-cont(pte|pmd) block
Huacai Chen <[email protected]>
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
Qu Wenruo <[email protected]>
btrfs: always fallback to buffered write if the inode requires checksum
Brian Foster <[email protected]>
ext4: fix dirtyclusters double decrement on fs shutdown
Chao Yu <[email protected]>
f2fs: fix to avoid migrating empty section
Eric Biggers <[email protected]>
net/tcp-md5: Fix MAC comparison to be constant-time
Eric Biggers <[email protected]>
ksmbd: Compare MACs in constant time
Eric Biggers <[email protected]>
smb: client: Compare MACs in constant time
Long Li <[email protected]>
xfs: ensure dquot item is deleted from AIL only after log shutdown
Long Li <[email protected]>
xfs: fix integer overflow in bmap intent sort comparator
Thorsten Blum <[email protected]>
crypto: atmel-sha204a - Fix OOM ->tfm_count leak
Shyam Prasad N <[email protected]>
cifs: open files should not hold ref on superblock
Kevin Hao <[email protected]>
net: macb: Shuffle the tx ring before enabling tx
Luca Ceresoli <[email protected]>
drm/bridge: ti-sn65dsi83: halve horizontal syncs for dual LVDS output
Thomas Fourier <[email protected]>
drm/msm: Fix dma_free_attrs() buffer size
Thorsten Blum <[email protected]>
ksmbd: Don't log keys in SMB3 signing and encryption key generation
Darrick J. Wong <[email protected]>
iomap: reject delalloc mappings during writeback
Alexander Potapenko <[email protected]>
mm/kfence: fix KASAN hardware tag faults during late enablement
Sean Christopherson <[email protected]>
KVM: SVM: Set/clear CR8 write interception when AVIC is (de)activated
Naveen N Rao <[email protected]>
KVM: SVM: Add a helper to look up the max physical ID for AVIC
Naveen N Rao <[email protected]>
KVM: SVM: Limit AVIC physical max index based on configured max_vcpu_ids
Jiasheng Jiang <[email protected]>
usb: gadget: f_tcm: Fix NULL pointer dereferences in nexus handling
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_can_open(): always configure bitrates before starting device
Paul Moses <[email protected]>
net/sched: act_gate: snapshot parameters with RCU on replace
Nathan Chancellor <[email protected]>
kbuild: Leave objtool binary around with 'make clean'
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: join: check RM_ADDR not sent over same subflow
Gang Yan <[email protected]>
selftests: mptcp: add a check for 'add_addr_accepted'
Matthieu Baerts (NGI0) <[email protected]>
mptcp: pm: in-kernel: always mark signal+subflow endp as used
Matthieu Baerts (NGI0) <[email protected]>
mptcp: pm: avoid sending RM_ADDR over same subflow
Natalie Vock <[email protected]>
drm/amd/display: Use GFP_ATOMIC in dc_create_stream_for_sink
Andrew Lunn <[email protected]>
net: phy: register phy led_triggers during probe to avoid AB-BA deadlock
Ankit Garg <[email protected]>
gve: fix incorrect buffer cleanup in gve_tx_clean_pending_packets for QPL
Kim Phillips <[email protected]>
x86/sev: Allow IBPB-on-Entry feature for SNP guests
Mario Limonciello <[email protected]>
platform/x86: hp-bioscfg: Support allocations of larger data
Daniel Hodges <[email protected]>
wifi: libertas: fix use-after-free in lbs_free_adapter()
Fedor Pchelkin <[email protected]>
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Ankit Garg <[email protected]>
gve: defer interrupt enabling until NAPI registration
John Ripple <[email protected]>
drm/bridge: ti-sn65dsi86: Add support for DisplayPort mode with HPD
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Add missing TID field to no-op command descriptor
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Restart DMA ring correctly after dequeue abort
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Use ETIMEDOUT instead of ETIME for timeout errors
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: fix odr switch to the same value
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-i2c: fix pm_runtime error handling
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-core: fix pm_runtime error handling
Nuno Sá <[email protected]>
iio: buffer: Fix wait_queue not being removed
Chris Spencer <[email protected]>
iio: chemical: bme680: Fix measurement wait duration calculation
Lukas Schmid <[email protected]>
iio: potentiometer: mcp4131: fix double application of wiper shift
Antoniu Miclaus <[email protected]>
iio: chemical: sps30_i2c: fix buffer size in sps30_i2c_read_meas()
Antoniu Miclaus <[email protected]>
iio: chemical: sps30_serial: fix buffer size in sps30_serial_read_meas()
SeungJu Cheon <[email protected]>
iio: frequency: adf4377: Fix duplicated soft reset mask
Oleksij Rempel <[email protected]>
iio: dac: ds4424: reject -128 RAW value
Filipe Manana <[email protected]>
btrfs: abort transaction on failure to update root in the received subvol ioctl
Henrique Carvalho <[email protected]>
smb: client: fix iface port assignment in parse_server_interfaces
Bharath SM <[email protected]>
smb: client: fix in-place encryption corruption in SMB2_write()
Paulo Alcantara <[email protected]>
smb: client: fix atomic open with O_DIRECT & O_SYNC
Josh Law <[email protected]>
lib/bootconfig: check bounds before writing in __xbc_open_brace()
Josh Law <[email protected]>
lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
Shashank Balaji <[email protected]>
x86/apic: Disable x2apic on resume if the kernel expects so
Junxiao Bi <[email protected]>
scsi: core: Fix error handling for scsi_alloc_sdev()
Josh Law <[email protected]>
lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error
Stefan Haberland <[email protected]>
s390/dasd: Copy detected format information to secondary device
Stefan Haberland <[email protected]>
s390/dasd: Move quiesce state with pprc swap
Darrick J. Wong <[email protected]>
xfs: fix undersized l_iclog_roundoff values
Shyam Prasad N <[email protected]>
cifs: make default value of retrans as zero
Calvin Owens <[email protected]>
tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G
Janusz Krzysztofik <[email protected]>
drm/i915: Fix potential overflow of shmem scatterlist length
Luca Ceresoli <[email protected]>
drm/bridge: ti-sn65dsi83: fix CHA_DSI_CLK_RANGE rounding
Mario Limonciello <[email protected]>
drm/amd: Set num IP blocks to 0 if discovery fails
Alysa Liu <[email protected]>
drm/amdgpu: Fix use-after-free race in VM acquire
Bastien Curutchet (Schneider Electric) <[email protected]>
net: dsa: microchip: Fix error path in PTP IRQ setup
Fan Wu <[email protected]>
net: ethernet: arc: emac: quiesce interrupts before requesting IRQ
Jian Zhang <[email protected]>
net: ncsi: fix skb leak in error paths
Namjae Jeon <[email protected]>
ksmbd: fix use-after-free by using call_rcu() for oplock_info
Marios Makassikis <[email protected]>
smb: server: fix use-after-free in smb2_open()
Namjae Jeon <[email protected]>
ksmbd: fix use-after-free in smb_lazy_parent_lease_break_close()
Maíra Canal <[email protected]>
pmdomain: bcm: bcm2835-power: Fix broken reset status read
Helge Deller <[email protected]>
parisc: Check kernel mapping earlier at bootup
Helge Deller <[email protected]>
parisc: Fix initial page table creation for boot
Sanman Pradhan <[email protected]>
hwmon: (pmbus/q54sj108a2) fix stack overflow in debugfs read
Catalin Marinas <[email protected]>
arm64: mm: Add PTE_DIRTY back to PAGE_KERNEL* to fix kexec/hibernation
Dave Airlie <[email protected]>
nouveau/dpcd: return EBUSY for aux xfer if the device is asleep
Helge Deller <[email protected]>
parisc: Increase initial mapping to 64 MB with KALLSYMS
Sven Eckelmann <[email protected]>
batman-adv: Avoid double-rtnl_lock ELP metric worker
Huiwen He <[email protected]>
tracing: Fix syscall events activation by ensuring refcount hits zero
Jakub Staniszewski <[email protected]>
ice: fix retry for AQ command 0x06EE
Long Li <[email protected]>
net: mana: Ring doorbell at 4 CQ wraparounds
Ariel Silver <[email protected]>
media: dvb-net: fix OOB access in ULE extension header tables
Luka Gejak <[email protected]>
staging: rtl8723bs: fix potential out-of-bounds read in rtw_restruct_wmm_ie
Greg Kroah-Hartman <[email protected]>
staging: rtl8723bs: properly validate the data in rtw_get_ie_ex()
Jedrzej Jagielski <[email protected]>
ixgbevf: fix link setup issue
Jakub Staniszewski <[email protected]>
ice: reintroduce retry mechanism for indirect AQ
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Limit number of per-device MSIs to the range the ITS supports
Andy Shevchenko <[email protected]>
device property: Allow secondary lookup in fwnode_get_next_child_node()
Franz Schnyder <[email protected]>
drm/bridge: ti-sn65dsi86: Enable HPD polling if IRQ is not used
Osama Abdelkader <[email protected]>
drm/bridge: samsung-dsim: Fix memory leak in error path
Xu Yang <[email protected]>
Revert "tcpm: allow looking for role_sw device in the main node"
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix NULL pointer exception during user_scan()
Yihang Li <[email protected]>
scsi: hisi_sas: Use macro instead of magic number
Xingui Yang <[email protected]>
scsi: hisi_sas: Add time interval between two H2D FIS following soft reset spec
Wang Shuaiwei <[email protected]>
scsi: ufs: core: Fix SError in ufshcd_rtc_work() during UFS suspend
Adrian Ng Ho Yin <[email protected]>
i3c: dw-i3c-master: Set SIR_REJECT in DAT on device attach and reattach
Steven Rostedt <[email protected]>
time/jiffies: Mark jiffies_64_to_clock_t() notrace
Max Kellermann <[email protected]>
ceph: fix memory leaks in ceph_mdsc_build_path()
Max Kellermann <[email protected]>
ceph: fix i_nlink underrun during async unlink
Ilya Dryomov <[email protected]>
libceph: admit message frames only in CEPH_CON_S_OPEN state
Raphael Zimmer <[email protected]>
libceph: Use u32 for non-negative values in ceph_monmap_decode()
Ilya Dryomov <[email protected]>
libceph: prevent potential out-of-bounds reads in process_message_header()
Ilya Dryomov <[email protected]>
libceph: reject preamble if control segment is empty
Raphael Zimmer <[email protected]>
libceph: Fix potential out-of-bounds access in ceph_handle_auth_reply()
Masami Hiramatsu (Google) <[email protected]>
kprobes: avoid crash when rmmod/insmod after ftrace killed
Mehul Rao <[email protected]>
tipc: fix divide-by-zero in tipc_sk_filter_connect()
Ravi Hothi <[email protected]>
ASoC: qcom: qdsp6: Fix q6apm remove ordering during ADSP stop and start
Penghe Geng <[email protected]>
mmc: core: Avoid bitfield RMW for claim/retune flags
Alexander Potapenko <[email protected]>
mm/kfence: disable KFENCE upon KASAN HW tags enablement
Felix Gu <[email protected]>
mmc: mmci: Fix device_node reference leak in of_get_dml_pipe_index()
Kalesh Singh <[email protected]>
mm/tracing: rss_stat: ensure curr is false from kthread context
Ziyi Guo <[email protected]>
usb: image: mdc800: kill download URB on timeout
Oliver Neukum <[email protected]>
usb: mdc800: handle signal and read racing
Fan Wu <[email protected]>
usb: renesas_usbhs: fix use-after-free in ISR during device removal
Oliver Neukum <[email protected]>
usb: class: cdc-wdm: fix reordering issue in read code path
Alan Stern <[email protected]>
USB: core: Limit the length of unkillable synchronous timeouts
Alan Stern <[email protected]>
USB: usbtmc: Use usb_bulk_msg_killable() with user-specified timeouts
Alan Stern <[email protected]>
USB: usbcore: Introduce usb_bulk_msg_killable()
Xu Yang <[email protected]>
usb: roles: get usb role switch from parent only for usb-b-connector
Marc Zyngier <[email protected]>
usb: cdc-acm: Restore CAP_BRK functionnality to CH343
Gabor Juhos <[email protected]>
usb: core: don't power off roothub PHYs if phy_set_mode() fails
Greg Kroah-Hartman <[email protected]>
usb: misc: uss720: properly clean up reference in uss720_probe()
Heikki Krogerus <[email protected]>
usb: dwc3: pci: add support for the Intel Nova Lake -H
Oliver Neukum <[email protected]>
usb: yurex: fix race in probe
Dayu Jiang <[email protected]>
usb: xhci: Prevent interrupt storm on host controller error (HCE)
Zilin Guan <[email protected]>
usb: xhci: Fix memory leak in xhci_disable_slot()
Vyacheslav Vahnenko <[email protected]>
USB: ezcap401 needs USB_QUIRK_NO_BOS to function on 10gbs usb speed
Christoffer Sandberg <[email protected]>
usb/core/quirks: Add Huawei ME906S-device to wakeup quirk
A1RM4X <[email protected]>
USB: add QUIRK_NO_BOS for video capture several devices
Sean Christopherson <[email protected]>
KVM: SVM: Initialize AVIC VMCB fields if AVIC is enabled with in-kernel APIC
Zhang Heng <[email protected]>
ASoC: amd: yc: Add DMI quirk for ASUS EXPERTBOOK PM1503CDA
Oleksij Rempel <[email protected]>
net: usb: lan78xx: skip LTM configuration for LAN7850
Oleksij Rempel <[email protected]>
net: usb: lan78xx: fix TX byte statistics for small packets
Oleksij Rempel <[email protected]>
net: usb: lan78xx: fix silent drop of packets with checksum errors
Takashi Iwai <[email protected]>
ALSA: usb-audio: Check endpoint numbers at parsing Scarlett2 mixer interfaces
Mehul Rao <[email protected]>
ALSA: pcm: fix use-after-free on linked stream runtime in snd_pcm_drain()
Qingye Zhao <[email protected]>
cgroup: fix race between task migration and iteration
Sasha Levin <[email protected]>
Revert "arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on"
Seungjin Bae <[email protected]>
usb: gadget: f_mass_storage: Fix potential integer overflow in check_command_size_in_blocks()
Alok Tiwari <[email protected]>
octeontx2-af: devlink: fix NIX RAS reporter to use RAS interrupt status
Przemek Kitszel <[email protected]>
octeontx2-af: devlink health: use retained error fmsg API
Alok Tiwari <[email protected]>
octeontx2-af: devlink: fix NIX RAS reporter recovery condition
Ricardo B. Marlière <[email protected]>
net: bonding: Fix nd_tbl NULL dereference when IPv6 is disabled
Casey Connolly <[email protected]>
ASoC: detect empty DMI strings
Chen Ni <[email protected]>
ASoC: amd: acp3x-rt5682-max9836: Add missing error check for clock acquisition
Ben Dooks <[email protected]>
ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
Matt Vollrath <[email protected]>
e1000/e1000e: Fix leak in DMA error cleanup
Alok Tiwari <[email protected]>
i40e: fix src IP mask checks and memcpy argument names in cloud filter
Sungwoo Kim <[email protected]>
nvme-pci: Fix race bug in nvme_poll_irqdisable()
Sungwoo Kim <[email protected]>
nvme-pci: Fix slab-out-of-bounds in nvme_dbbuf_set
Rafael J. Wysocki <[email protected]>
sched: idle: Make skipping governor callbacks more consistent
Peng Fan <[email protected]>
regulator: pca9450: Correct interrupt type
Frieder Schrempf <[email protected]>
regulator: pca9450: Make IRQ optional
Yuan Tan <[email protected]>
netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_cthelper: fix OOB read in nfnl_cthelper_dump_table()
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_queue: fix entry leak in bridge verdict error path
David Dull <[email protected]>
netfilter: x_tables: guard option walkers against 1-byte tail reads
Jenny Guanni Qu <[email protected]>
netfilter: nft_set_pipapo: fix stack out-of-bounds read in pipapo_drop()
Raju Rangoju <[email protected]>
amd-xgbe: prevent CRC errors during RX adaptation with AN disabled
Raju Rangoju <[email protected]>
amd-xgbe: fix link status handling in xgbe_rx_adaptation
Chengfeng Ye <[email protected]>
mctp: route: hold key->lock in mctp_flow_prepare_output()
Wenyuan Li <[email protected]>
can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value
Haiyue Wang <[email protected]>
mctp: i2c: fix skb memory leak in receive path
Shuangpeng Bai <[email protected]>
serial: caif: hold tty->link reference in ldisc_open and ser_release
Álvaro Fernández Rojas <[email protected]>
net: sfp: improve Huawei MA5671a fixup
Chris Morgan <[email protected]>
net: sfp: add quirk for Potron SFP+ XGSPON ONU Stick
Russell King (Oracle) <[email protected]>
net: sfp: improve Nokia GPON sfp fixup
Russell King (Oracle) <[email protected]>
net: sfp: re-implement ignoring the hardware TX_FAULT signal
Sen Wang <[email protected]>
ASoC: simple-card-utils: fix graph_util_is_ports0() for DT overlays
Kuninori Morimoto <[email protected]>
ASoC: simple-card-utils: use __free(device_node) for device node
matteo.cotifava <[email protected]>
ASoC: soc-core: flush delayed work before removing DAIs and widgets
matteo.cotifava <[email protected]>
ASoC: soc-core: drop delayed_work_pending() check before flush
Weiming Shi <[email protected]>
net/sched: teql: fix NULL pointer dereference in iptunnel_xmit on TEQL slave xmit
Gal Pressman <[email protected]>
net/mlx5e: Fix DMA FIFO desync on error CQE SQ recovery
Cosmin Ratiu <[email protected]>
net/mlx5: Fix deadlock between devlink lock and esw->wq
Daniel Jurgens <[email protected]>
net/mlx5: Query to see if host PF is disabled
Daniel Jurgens <[email protected]>
net/mlx5: IFC updates for disabled host PF
Hangbin Liu <[email protected]>
bonding: handle BOND_LINK_FAIL, BOND_LINK_BACK as valid link states
Pengyu Luo <[email protected]>
drm/msm/dsi: fix pclk rate calculation for bonded dsi
Dmitry Baryshkov <[email protected]>
drm/msm/dsi: Document DSC related pclk_rate and hdisplay calculations
Mieczyslaw Nalewaj <[email protected]>
net: dsa: realtek: rtl8365mb: remove ifOutDiscards from rx_packets
Eric Badger <[email protected]>
xprtrdma: Decrement re_receiving on the early exit paths
Guenter Roeck <[email protected]>
smb/server: Fix another refcount leak in smb2_open()
J. Neuschäfer <[email protected]>
powerpc: 83xx: km83xx: Fix keymile vendor prefix
Tzung-Bi Shih <[email protected]>
remoteproc: mediatek: Unprepare SCP clock during system suspend
Bjorn Andersson <[email protected]>
remoteproc: sysmon: Correct subsys_name_len type in QMI request
Christophe Leroy (CS GROUP) <[email protected]>
powerpc/uaccess: Fix inline assembly for clang build on PPC32
Takashi Iwai <[email protected]>
ALSA: usb-audio: Check max frame size for implicit feedback mode, too
Takashi Iwai <[email protected]>
ALSA: usb-audio: Avoid implicit feedback mode on DIYINHK USB Audio 2.0
wangshuaiwei <[email protected]>
scsi: ufs: core: Fix shift out of bounds when MAXQ=32
Peter Wang <[email protected]>
scsi: ufs: core: Fix possible NULL pointer dereference in ufshcd_add_command_trace()
Charles Keepax <[email protected]>
ASoC: cs42l43: Report insert for exotic peripherals
Azamat Almazbek uulu <[email protected]>
ASoC: amd: yc: Add ASUS EXPERTBOOK BM1503CDA to quirk table
Tomas Henzl <[email protected]>
scsi: ses: Fix devices attaching to different hosts
Sofia Schneider <[email protected]>
ACPI: OSI: Add DMI quirk for Acer Aspire One D255
Ramanathan Choodamani <[email protected]>
wifi: mac80211: set default WMM parameters on all links
Al Viro <[email protected]>
unshare: fix unshare_fs() handling
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Add NULL checks when resetting request and reply queues
Piotr Mazek <[email protected]>
ACPI: PM: Save NVS memory on Lenovo G70-35
Jan Kiszka <[email protected]>
scsi: storvsc: Fix scheduling while atomic on PREEMPT_RT
John Johansen <[email protected]>
apparmor: fix race between freeing data and fs accessing it
John Johansen <[email protected]>
apparmor: fix race on rawdata dereference
John Johansen <[email protected]>
apparmor: fix differential encoding verification
John Johansen <[email protected]>
apparmor: fix unprivileged local user can do privileged policy management
John Johansen <[email protected]>
apparmor: Fix double free of ns_name in aa_replace_profiles()
Massimiliano Pellizzer <[email protected]>
apparmor: fix missing bounds check on DEFAULT table in verify_dfa()
Massimiliano Pellizzer <[email protected]>
apparmor: fix side-effect bug in match_char() macro usage
John Johansen <[email protected]>
apparmor: fix: limit the number of levels of policy namespaces
Massimiliano Pellizzer <[email protected]>
apparmor: replace recursive profile removal with iterative approach
Massimiliano Pellizzer <[email protected]>
apparmor: fix memory leak in verify_header
Massimiliano Pellizzer <[email protected]>
apparmor: validate DFA start states are in bounds in unpack_pdb
Menglong Dong <[email protected]>
net: tcp: accept old ack during closing
Victor Nogueira <[email protected]>
net/sched: Only allow act_ct to bind to clsact/ingress qdiscs and shared blocks
Guenter Roeck <[email protected]>
tracing: Add NULL pointer check to trigger_data_free()
Yifan Wu <[email protected]>
selftest/arm64: Fix sve2p1_sigill() to hwcap test
Larysa Zaremba <[email protected]>
xdp: produce a warning when calculated tailroom is negative
Larysa Zaremba <[email protected]>
i40e: use xdp.frame_sz as XDP RxQ info frag_size
Larysa Zaremba <[email protected]>
i40e: fix registering XDP RxQ info
Larysa Zaremba <[email protected]>
xsk: introduce helper to determine rxq->frag_size
Larysa Zaremba <[email protected]>
xdp: use modulo operation to calculate XDP frag tailroom
Jamal Hadi Salim <[email protected]>
net/sched: act_ife: Fix metalist update behavior
Jiayuan Chen <[email protected]>
net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
Fernando Fernandez Mancera <[email protected]>
net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
Fernando Fernandez Mancera <[email protected]>
net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
Lorenzo Bianconi <[email protected]>
net: ethernet: mtk_eth_soc: Reset prog ptr to old_prog in case of error in mtk_xdp_setup()
Ovidiu Panait <[email protected]>
net: stmmac: Fix error handling in VLAN add and delete paths
Jakub Kicinski <[email protected]>
nfc: rawsock: cancel tx_work before socket teardown
Jakub Kicinski <[email protected]>
nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
Jakub Kicinski <[email protected]>
nfc: nci: free skb on nci_transceive early error paths
Ian Ray <[email protected]>
net: nfc: nci: Fix zero-length proprietary notifications
Koichiro Den <[email protected]>
net: sched: avoid qdisc_reset_all_tx_gt() vs dequeue race for lockless qdiscs
Sungwoo Kim <[email protected]>
nvme: fix memory allocation in nvme_pr_read_keys()
Stefan Hajnoczi <[email protected]>
nvme: reject invalid pr_read_keys() num_keys values
Yujie Liu <[email protected]>
drm/sched: Fix kernel-doc warning for drm_sched_job_done()
Raju Rangoju <[email protected]>
amd-xgbe: fix sleep while atomic on suspend/resume
Jakub Kicinski <[email protected]>
ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
ZhangGuoDong <[email protected]>
smb/client: fix buffer size for smb311_posix_qinfo in SMB311_posix_query_info()
ZhangGuoDong <[email protected]>
smb/client: fix buffer size for smb311_posix_qinfo in smb2_compound_op()
Lang Xu <[email protected]>
bpf: Fix a UAF issue in bpf_trampoline_link_cgroup_shim
Kui-Feng Lee <[email protected]>
bpf: export bpf_link_inc_not_zero.
David Thomson <[email protected]>
xen/acpi-processor: fix _CST detection using undersized evaluation buffer
Allison Henderson <[email protected]>
net/rds: Fix circular locking dependency in rds_tcp_tune
Eric Dumazet <[email protected]>
indirect_call_wrapper: do not reevaluate function pointer
Lorenzo Bianconi <[email protected]>
wifi: mt76: Fix possible oob access in mt76_connac2_mac_write_txwi_80211()
Lorenzo Bianconi <[email protected]>
wifi: mt76: mt7996: Fix possible oob access in mt7996_mac_write_txwi_80211()
Bart Van Assche <[email protected]>
wifi: wlcore: Fix a locking bug
Bart Van Assche <[email protected]>
wifi: cw1200: Fix locking in error paths
Vimlesh Kumar <[email protected]>
octeon_ep: avoid compiler and IQ/OQ reordering
Vimlesh Kumar <[email protected]>
octeon_ep: Relocate counter updates before NAPI
Jiayuan Chen <[email protected]>
bpf/bonding: reject vlan+srcmac xmit_hash_policy change when XDP is loaded
Mieczyslaw Nalewaj <[email protected]>
net: dsa: realtek: rtl8365mb: fix rtl8365mb_phy_ocp_write return value
Shuvam Pandey <[email protected]>
kunit: tool: copy caller args in run_kernel to prevent mutation
Alexandre Courbot <[email protected]>
rust: kunit: fix warning when !CONFIG_PRINTK
Alban Bedel <[email protected]>
can: mcp251x: fix deadlock in error path of mcp251x_open
Oliver Hartkopp <[email protected]>
can: bcm: fix locking for bcm_op runtime updates
Raju Rangoju <[email protected]>
amd-xgbe: fix MAC_TCR_SS register width for 2.5G and 10M speeds
Jiayuan Chen <[email protected]>
atm: lec: fix null-ptr-deref in lec_arp_clear_vccs
Guenter Roeck <[email protected]>
dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler
Ioana Ciornei <[email protected]>
dpaa2-switch: do not clear any interrupts automatically
Nikhil P. Rao <[email protected]>
xsk: Fix zero-copy AF_XDP fragment drop
Nikhil P. Rao <[email protected]>
xsk: Fix fragment node deletion to prevent buffer leak
Maciej Fijalkowski <[email protected]>
xsk: s/free_list_node/list_node/
Maciej Fijalkowski <[email protected]>
xsk: Get rid of xdp_buff_xsk::xskb_list_node
Chintan Vankar <[email protected]>
net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table
Francesco Lavra <[email protected]>
drm/solomon: Fix page start when updating rectangle in page addressing mode
Javier Martinez Canillas <[email protected]>
drm/ssd130x: Replace .page_height field in device info with a constant
Javier Martinez Canillas <[email protected]>
drm/ssd130x: Store the HW buffer in the driver-private CRTC state
Geert Uytterhoeven <[email protected]>
drm/ssd130x: Use bool for ssd130x_deviceinfo flags
Vitaly Lifshits <[email protected]>
e1000e: clear DPG_EN after reset to avoid autonomous power-gating
Bart Van Assche <[email protected]>
hwmon: (it87) Check the it87_lock() return value
Felix Gu <[email protected]>
pinctrl: cirrus: cs42l43: Fix double-put in cs42l43_pin_probe()
Jonathan Teh <[email protected]>
platform/x86: thinkpad_acpi: Fix errors reading battery thresholds
Florian Eckert <[email protected]>
pinctrl: equilibrium: fix warning trace on load
Florian Eckert <[email protected]>
pinctrl: equilibrium: rename irq_chip function callbacks
Hao Yu <[email protected]>
hwmon: (aht10) Fix initialization commands for AHT20
Akhilesh Patil <[email protected]>
hwmon: (aht10) Add support for dht20
Thomas Weißschuh <[email protected]>
ARM: clean up the memset64() C wrapper
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: join: check removing signal+subflow endp
Paolo Abeni <[email protected]>
selftests: mptcp: more stable simult_flows tests
Junxiao Bi <[email protected]>
scsi: core: Fix refcount leak for tagset_refcnt
Thorsten Blum <[email protected]>
smb: client: Don't log plaintext credentials in cifs_set_cifscreds
Paulo Alcantara <[email protected]>
smb: client: fix broken multichannel with krb5+signing
Henrique Carvalho <[email protected]>
smb: client: fix cifs_pick_channel when channels are equally loaded
Christoph Böhmwalder <[email protected]>
drbd: fix null-pointer dereference on local read error
Lars Ellenberg <[email protected]>
drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
Phillip Lougher <[email protected]>
Squashfs: check metadata block offset is within range
Prithvi Tambewagh <[email protected]>
scsi: target: Fix recursive locking in __configfs_open_file()
Davide Caratti <[email protected]>
net/sched: ets: fix divide by zero in the offload path
Jason Gunthorpe <[email protected]>
RDMA/irdma: Fix kernel stack leak in irdma_create_user_ah()
Jason Gunthorpe <[email protected]>
IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
Vahagn Vardanian <[email protected]>
wifi: mac80211: fix NULL pointer dereference in mesh_rx_csa_frame()
Ariel Silver <[email protected]>
wifi: mac80211: bounds-check link_id in ieee80211_ml_reconfiguration
Daniil Dulov <[email protected]>
wifi: cfg80211: cancel rfkill_block work in wiphy_unregister()
Johannes Berg <[email protected]>
wifi: radiotap: reject radiotap with unknown bits
Jun Seo <[email protected]>
ALSA: usb-audio: Use correct version for UAC3 header validation
Kurt Borja <[email protected]>
platform/x86: dell-wmi: Add audio/mic mute key codes
Thorsten Blum <[email protected]>
platform/x86: dell-wmi-sysman: Don't hex dump plaintext password data
Mike Rapoport (Microsoft) <[email protected]>
x86/efi: defer freeing of boot services memory
Greg Kroah-Hartman <[email protected]>
HID: Add HID_CLAIMED_INPUT guards in raw_event callbacks missing them
Greg Kroah-Hartman <[email protected]>
can: usb: f81604: handle bulk write errors properly
Greg Kroah-Hartman <[email protected]>
can: usb: f81604: handle short interrupt urb messages properly
Greg Kroah-Hartman <[email protected]>
can: usb: etas_es58x: correctly anchor the urb in the read bulk callback
Greg Kroah-Hartman <[email protected]>
can: ucan: Fix infinite loop from zero-length messages
Greg Kroah-Hartman <[email protected]>
can: usb: f81604: correctly anchor the urb in the read bulk callback
Greg Kroah-Hartman <[email protected]>
can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message
Greg Kroah-Hartman <[email protected]>
net: usb: pegasus: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kalmia: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kaweth: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
nfc: pn533: properly drop the usb interface reference on disconnect
Jens Axboe <[email protected]>
media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
Jann Horn <[email protected]>
eventpoll: Fix integer overflow in ep_loop_check_proc()
Alex Deucher <[email protected]>
drm/amdgpu: keep vga memory on MacBooks with switchable graphics
Mario Limonciello <[email protected]>
drm/amd: Drop special case for yellow carp without discovery
Ethan Nelson-Moore <[email protected]>
net: arcnet: com20020-pci: fix support for 2.5Mbit cards
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Gui-Dong Han <[email protected]>
hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
Mario Limonciello <[email protected]>
drm/amd: Fix hang on amdgpu unload by using pci_dev_is_disconnected()
Thomas Richard (TI) <[email protected]>
usb: cdns3: fix role switching during resume
Théo Lebrun <[email protected]>
usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()
Hongyu Xie <[email protected]>
usb: cdns3: remove redundant if branch
Johan Hovold <[email protected]>
clk: tegra: tegra124-emc: fix device leak on set_rate()
Shawn Lin <[email protected]>
arm64: dts: rockchip: Fix rk356x PCIe range mappings
Johan Hovold <[email protected]>
mfd: omap-usb-host: Fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
mfd: omap-usb-host: Convert to platform remove callback returning void
Johan Hovold <[email protected]>
mfd: qcom-pm8xxx: Fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
mfd: qcom-pm8xxx: Convert to platform remove callback returning void
Yongjian Sun <[email protected]>
ext4: fix e4b bitmap inconsistency reports
Matthew Wilcox (Oracle) <[email protected]>
ext4: convert bd_buddy_page to bd_buddy_folio
Matthew Wilcox (Oracle) <[email protected]>
ext4: convert bd_bitmap_page to bd_bitmap_folio
Gou Hao <[email protected]>
ext4: delete redundant calculations in ext4_mb_get_buddy_page_lock()
Joonwon Kang <[email protected]>
mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()
Anup Patel <[email protected]>
mailbox: Allow controller specific mapping using fwnode
Peng Fan <[email protected]>
mailbox: Use guard/scoped_guard for con_mutex
Peng Fan <[email protected]>
mailbox: Use dev_err when there is error
Tudor Ambarus <[email protected]>
mailbox: remove unused header files
Tudor Ambarus <[email protected]>
mailbox: sort headers alphabetically
Tudor Ambarus <[email protected]>
mailbox: don't protect of_parse_phandle_with_args with con_mutex
Rob Herring (Arm) <[email protected]>
mailbox: Use of_property_match_string() instead of open-coding
Zhang Yi <[email protected]>
ext4: drop extent cache when splitting extent fails
Zhang Yi <[email protected]>
ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
Zhang Yi <[email protected]>
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
Yang Erkun <[email protected]>
ext4: correct the comments place for EXT4_EXT_MAY_ZEROOUT
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_ext_handle_unwritten_extents()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_ext_convert_to_initialized()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_convert_unwritten_extents_endio()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_split_convert_extents()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_split_extent()
Zhang Yi <[email protected]>
ext4: don't zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
Zhang Yi <[email protected]>
ext4: subdivide EXT4_EXT_DATA_VALID1
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_split_extent_at()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_ext_insert_extent()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_ext_create_new_leaf()
Baokun Li <[email protected]>
ext4: get rid of ppath in ext4_find_extent()
Johan Hovold <[email protected]>
bus: omap-ocp2scp: fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
bus: omap-ocp2scp: Convert to platform remove callback returning void
Johan Hovold <[email protected]>
drm/tegra: dsi: fix device leak on probe
Sean Christopherson <[email protected]>
KVM: x86: Ignore -EBUSY when checking nested events from vcpu_block()
Sean Christopherson <[email protected]>
KVM: x86: WARN if a vCPU gets a valid wakeup that KVM can't yet inject
Zilin Guan <[email protected]>
media: tegra-video: Fix memory leak in __tegra_channel_try_format()
Laurent Pinchart <[email protected]>
media: tegra-video: Use accessors for pad config 'try_*' fields
Sean Christopherson <[email protected]>
KVM: x86: Return "unsupported" instead of "invalid" on access to unsupported PV MSR
Sean Christopherson <[email protected]>
KVM: x86: Rename KVM_MSR_RET_INVALID to KVM_MSR_RET_UNSUPPORTED
Mathias Krause <[email protected]>
KVM: x86: Fix KVM_GET_MSRS stack info leak
Ilpo Järvinen <[email protected]>
PCI: Use resource_set_range() that correctly sets ->end
Ilpo Järvinen <[email protected]>
resource: Add resource set range and size helpers
Puranjay Mohan <[email protected]>
PCI: Use resource names in PCI log messages
Puranjay Mohan <[email protected]>
PCI: Update BAR # and window messages
Johan Hovold <[email protected]>
memory: mtk-smi: fix device leak on larb probe
Johan Hovold <[email protected]>
memory: mtk-smi: fix device leaks on common probe
Uwe Kleine-König <[email protected]>
memory: mtk-smi: Convert to platform remove callback returning void
Bjorn Helgaas <[email protected]>
PCI: Correct PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 value
Kohei Enju <[email protected]>
bpf: Fix stack-out-of-bounds write in devmap
Mark Harmstone <[email protected]>
btrfs: fix compat mask in error messages in btrfs_check_features()
Mark Harmstone <[email protected]>
btrfs: fix warning in scrub_verify_one_metadata()
Mark Harmstone <[email protected]>
btrfs: fix objectid value in error message in check_extent_data_ref()
Mark Harmstone <[email protected]>
btrfs: fix incorrect key offset in error message in check_dev_extent_item()
Johannes Thumshirn <[email protected]>
btrfs: add support for inserting raid stripe extents
Johannes Thumshirn <[email protected]>
btrfs: read raid stripe tree from disk
Johannes Thumshirn <[email protected]>
btrfs: add raid stripe tree definitions
Josef Bacik <[email protected]>
btrfs: move btrfs_extref_hash into inode-item.h
Josef Bacik <[email protected]>
btrfs: remove btrfs_crc32c wrapper
Josef Bacik <[email protected]>
btrfs: move btrfs_crc32c_final into free-space-cache.c
Richard Fitzgerald <[email protected]>
ALSA: hda: cs35l56: Fix signedness error in cs35l56_hda_posture_put()
Kuninori Morimoto <[email protected]>
ALSA: pci: hda: use snd_kcontrol_chip()
Peter Zijlstra <[email protected]>
perf: Fix __perf_event_overflow() vs perf_remove_from_context() race
Takashi Iwai <[email protected]>
ALSA: usb-audio: Use inclusive terms
Takashi Iwai <[email protected]>
ALSA: usb-audio: Cap the packet size pre-calculations
Peter Wang <[email protected]>
scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
Mathieu Desnoyers <[email protected]>
rseq: Clarify rseq registration rseq_size bound check comment
Geoffrey D. Bennett <[email protected]>
ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
Salomon Dushimirimana <[email protected]>
scsi: pm8001: Fix use-after-free in pm8001_queue_command()
Mathias Krause <[email protected]>
scsi: lpfc: Properly set WC for DPP mapping
Nam Cao <[email protected]>
irqchip/sifive-plic: Fix frozen interrupt due to affinity setting
Felix Gu <[email protected]>
drm/logicvc: Fix device node reference leak in logicvc_drm_config_parse()
Ian Forbes <[email protected]>
drm/vmwgfx: Return the correct value in vmw_translate_ptr functions
Brad Spengler <[email protected]>
drm/vmwgfx: Fix invalid kref_put callback in vmw_bo_dirty_release
-------------
Diffstat:
Documentation/hwmon/aht10.rst | 10 +- Makefile | 12 +- arch/arm/include/asm/string.h | 14 +- .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +- arch/arm64/include/asm/pgtable-prot.h | 10 +- arch/arm64/include/asm/pgtable.h | 7 +- arch/arm64/mm/mmu.c | 92 ++-- arch/loongarch/include/asm/uaccess.h | 14 +- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/cache.c | 4 +- arch/parisc/kernel/head.S | 7 +- arch/parisc/kernel/setup.c | 20 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/platforms/83xx/km83xx.c | 4 +- arch/riscv/kernel/traps.c | 5 +- arch/s390/include/asm/processor.h | 2 +- arch/s390/lib/xor.c | 4 +- arch/x86/boot/compressed/sev.c | 5 + arch/x86/include/asm/efi.h | 2 +- arch/x86/include/asm/msr-index.h | 5 +- arch/x86/kernel/apic/apic.c | 6 + arch/x86/kernel/apic/x2apic_uv_x.c | 18 +- arch/x86/kernel/sev-shared.c | 104 +++- arch/x86/kernel/sev.c | 5 +- arch/x86/kernel/uprobes.c | 24 + arch/x86/kvm/svm/avic.c | 30 +- arch/x86/kvm/svm/svm.c | 11 +- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/x86.c | 69 ++- arch/x86/kvm/x86.h | 15 +- arch/x86/platform/efi/efi.c | 2 +- arch/x86/platform/efi/quirks.c | 55 ++- drivers/acpi/acpi_processor.c | 15 +- drivers/acpi/osi.c | 13 + drivers/acpi/osl.c | 2 +- drivers/acpi/sleep.c | 8 + drivers/base/power/runtime.c | 1 + drivers/base/property.c | 27 +- drivers/block/drbd/drbd_actlog.c | 53 +- drivers/block/drbd/drbd_interval.h | 5 +- drivers/block/drbd/drbd_req.c | 3 +- drivers/bluetooth/btqca.c | 2 + drivers/bus/omap-ocp2scp.c | 19 +- drivers/cache/ax45mp_cache.c | 4 +- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- drivers/cpuidle/cpuidle.c | 10 - drivers/crypto/atmel-sha204a.c | 5 +- drivers/dma/mmp_pdma.c | 6 + drivers/firmware/arm_scpi.c | 5 +- drivers/firmware/efi/mokvar-table.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 20 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 9 +- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 3 +- drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 1 + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 2 +- drivers/gpu/drm/amd/include/dm_pp_interface.h | 1 + drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c | 67 +++ drivers/gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h | 2 + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +- drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 6 +- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 69 +-- drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 11 +- drivers/gpu/drm/bridge/samsung-dsim.c | 25 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 13 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 118 ++++- drivers/gpu/drm/drm_file.c | 5 +- drivers/gpu/drm/drm_mode_config.c | 9 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 72 ++- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 12 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/logicvc/logicvc_drm.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 62 ++- drivers/gpu/drm/msm/msm_gpummu.c | 2 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 + drivers/gpu/drm/radeon/si_dpm.c | 4 +- drivers/gpu/drm/scheduler/sched_main.c | 1 + drivers/gpu/drm/solomon/ssd130x.c | 186 +++++-- drivers/gpu/drm/solomon/ssd130x.h | 5 +- drivers/gpu/drm/tegra/dsi.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 9 +- drivers/hid/hid-cmedia.c | 2 +- drivers/hid/hid-creative-sb0540.c | 2 +- drivers/hid/hid-zydacron.c | 2 +- drivers/hwmon/Kconfig | 6 +- drivers/hwmon/aht10.c | 21 +- drivers/hwmon/it87.c | 5 +- drivers/hwmon/max16065.c | 26 +- drivers/hwmon/pmbus/isl68137.c | 7 +- drivers/hwmon/pmbus/mp2975.c | 2 + drivers/hwmon/pmbus/q54sj108a2.c | 19 +- drivers/i2c/busses/i2c-cp2615.c | 5 +- drivers/i2c/busses/i2c-fsi.c | 1 + drivers/i2c/busses/i2c-pxa.c | 17 +- drivers/i3c/master/dw-i3c-master.c | 4 +- drivers/i3c/master/mipi-i3c-hci/cmd.h | 1 + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 2 +- drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 2 +- drivers/i3c/master/mipi-i3c-hci/core.c | 6 +- drivers/i3c/master/mipi-i3c-hci/dma.c | 4 +- drivers/iio/chemical/bme680_core.c | 2 +- drivers/iio/chemical/sps30_i2c.c | 2 +- drivers/iio/chemical/sps30_serial.c | 2 +- drivers/iio/dac/ds4424.c | 2 +- drivers/iio/frequency/adf4377.c | 2 +- drivers/iio/gyro/mpu3050-core.c | 18 +- drivers/iio/gyro/mpu3050-i2c.c | 3 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 + drivers/iio/industrialio-buffer.c | 6 +- drivers/iio/light/bh1780.c | 4 +- drivers/iio/potentiometer/mcp4131.c | 2 +- drivers/infiniband/hw/irdma/verbs.c | 2 +- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- drivers/iommu/intel/dmar.c | 3 +- drivers/irqchip/irq-gic-v3-its.c | 4 + drivers/irqchip/irq-sifive-plic.c | 7 +- drivers/mailbox/mailbox.c | 150 +++--- drivers/md/dm-verity-fec.c | 4 +- drivers/md/dm-verity-fec.h | 3 - drivers/media/dvb-core/dmxdev.c | 4 +- drivers/media/dvb-core/dvb_net.c | 3 + drivers/memory/mtk-smi.c | 13 +- drivers/mfd/omap-usb-host.c | 11 +- drivers/mfd/qcom-pm8xxx.c | 14 +- drivers/mmc/host/mmci_qcom_dml.c | 1 + drivers/mmc/host/sdhci-pci-gli.c | 9 + drivers/mmc/host/sdhci.c | 9 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 +- drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 14 +- drivers/mtd/nand/raw/pl35x-nand-controller.c | 3 + drivers/mtd/parsers/redboot.c | 6 +- drivers/net/arcnet/com20020-pci.c | 16 +- drivers/net/bonding/bond_debugfs.c | 16 +- drivers/net/bonding/bond_main.c | 19 +- drivers/net/bonding/bond_options.c | 2 + drivers/net/caif/caif_serial.c | 3 + drivers/net/can/spi/hi311x.c | 5 +- drivers/net/can/spi/mcp251x.c | 15 +- drivers/net/can/usb/ems_usb.c | 7 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 8 +- drivers/net/can/usb/f81604.c | 45 +- drivers/net/can/usb/gs_usb.c | 22 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/dsa/bcm_sf2.c | 8 +- drivers/net/dsa/microchip/ksz_ptp.c | 11 +- drivers/net/dsa/realtek/rtl8365mb.c | 5 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 +- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 82 +++- drivers/net/ethernet/amd/xgbe/xgbe.h | 7 +- drivers/net/ethernet/arc/emac_main.c | 11 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 7 - drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 2 +- drivers/net/ethernet/cadence/macb.h | 7 + drivers/net/ethernet/cadence/macb_main.c | 184 ++++++- drivers/net/ethernet/cadence/macb_ptp.c | 4 +- .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 7 +- drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 5 +- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 52 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 - drivers/net/ethernet/intel/e1000e/defines.h | 1 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 9 + drivers/net/ethernet/intel/e1000e/netdev.c | 2 - drivers/net/ethernet/intel/i40e/i40e_main.c | 41 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 9 +- drivers/net/ethernet/intel/ice/ice_common.c | 13 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 35 +- drivers/net/ethernet/intel/igc/igc_main.c | 7 +- drivers/net/ethernet/intel/ixgbevf/vf.c | 3 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- .../net/ethernet/marvell/octeon_ep/octep_main.c | 48 +- drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 27 +- .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 468 ++++++------------ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 +- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 - .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 1 + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 52 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 23 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 30 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 18 +- drivers/net/ethernet/microsoft/mana/hw_channel.c | 6 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 23 +- drivers/net/ethernet/stmicro/stmmac/common.h | 1 - drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 - .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 9 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 54 +-- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 +- drivers/net/mctp/mctp-i2c.c | 1 + drivers/net/phy/phy_device.c | 25 +- drivers/net/phy/sfp.c | 62 ++- drivers/net/usb/aqc111.c | 12 +- drivers/net/usb/cdc_ncm.c | 10 +- drivers/net/usb/kalmia.c | 7 + drivers/net/usb/kaweth.c | 13 + drivers/net/usb/lan78xx.c | 10 +- drivers/net/usb/lan78xx.h | 3 + drivers/net/usb/pegasus.c | 13 +- drivers/net/vxlan/vxlan_core.c | 5 + drivers/net/wireless/marvell/libertas/main.c | 4 +- .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 1 + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 1 + drivers/net/wireless/st/cw1200/pm.c | 2 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 4 +- drivers/nfc/pn533/usb.c | 1 + drivers/nvdimm/bus.c | 5 +- drivers/nvme/host/pci.c | 8 +- drivers/nvme/host/pr.c | 10 +- drivers/pci/iov.c | 7 +- drivers/pci/pci.c | 85 +++- drivers/pci/pci.h | 2 + drivers/pci/probe.c | 32 +- drivers/pci/quirks.c | 15 +- drivers/pci/setup-bus.c | 30 +- drivers/pci/setup-res.c | 72 +-- drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 5 +- drivers/pinctrl/pinctrl-equilibrium.c | 31 +- drivers/platform/x86/amd/pmc/pmc.c | 3 + drivers/platform/x86/amd/pmc/pmc.h | 1 + drivers/platform/x86/dell/dell-wmi-base.c | 6 + .../dell/dell-wmi-sysman/passwordattr-interface.c | 1 - .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 9 +- drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/pmdomain/bcm/bcm2835-power.c | 18 +- drivers/regulator/pca9450-regulator.c | 41 +- drivers/remoteproc/mtk_scp.c | 39 ++ drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/s390/block/dasd_eckd.c | 16 + drivers/s390/crypto/zcrypt_ccamisc.c | 12 +- drivers/s390/crypto/zcrypt_cex4.c | 3 +- drivers/scsi/hisi_sas/hisi_sas.h | 43 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 42 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 246 ++++++---- drivers/scsi/lpfc/lpfc_init.c | 2 + drivers/scsi/lpfc/lpfc_sli.c | 36 +- drivers/scsi/lpfc/lpfc_sli4.h | 3 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 32 +- drivers/scsi/pm8001/pm8001_sas.c | 5 +- drivers/scsi/scsi_scan.c | 7 +- drivers/scsi/ses.c | 5 +- drivers/scsi/storvsc_drv.c | 5 +- drivers/soc/fsl/qbman/qman.c | 24 +- drivers/soc/qcom/pmic_glink.c | 10 +- drivers/spi/spi.c | 25 +- drivers/staging/media/tegra-video/vi.c | 27 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 15 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +- drivers/target/target_core_configfs.c | 15 +- drivers/tty/serial/8250/8250_dma.c | 15 + drivers/tty/serial/8250/8250_pci.c | 17 + drivers/tty/serial/8250/8250_port.c | 6 + drivers/tty/serial/uartlite.c | 1 + drivers/ufs/core/ufshcd.c | 26 +- drivers/usb/cdns3/core.c | 11 +- drivers/usb/class/cdc-acm.c | 5 + drivers/usb/class/cdc-acm.h | 1 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/class/usbtmc.c | 6 +- drivers/usb/core/message.c | 100 +++- drivers/usb/core/phy.c | 8 +- drivers/usb/core/quirks.c | 16 + drivers/usb/dwc3/dwc3-pci.c | 2 + drivers/usb/gadget/function/f_mass_storage.c | 12 +- drivers/usb/gadget/function/f_tcm.c | 14 + drivers/usb/host/xhci-ring.c | 1 + drivers/usb/host/xhci.c | 4 +- drivers/usb/image/mdc800.c | 6 +- drivers/usb/misc/uss720.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/renesas_usbhs/common.c | 9 + drivers/usb/roles/class.c | 7 +- drivers/usb/serial/f81232.c | 77 +-- drivers/usb/typec/tcpm/tcpm.c | 2 +- drivers/usb/typec/ucsi/ucsi_glink.c | 27 +- drivers/xen/xen-acpi-processor.c | 7 +- fs/binfmt_misc.c | 4 +- fs/btrfs/Makefile | 2 +- fs/btrfs/accessors.h | 8 + fs/btrfs/bio.c | 21 + fs/btrfs/block-rsv.c | 6 + fs/btrfs/ctree.h | 19 - fs/btrfs/disk-io.c | 46 +- fs/btrfs/extent-tree.c | 7 +- fs/btrfs/extent_io.c | 3 +- fs/btrfs/extent_io.h | 3 +- fs/btrfs/file.c | 16 + fs/btrfs/free-space-cache.c | 9 +- fs/btrfs/fs.h | 1 + fs/btrfs/inode-item.h | 7 + fs/btrfs/inode.c | 27 +- fs/btrfs/ioctl.c | 24 +- fs/btrfs/locking.c | 1 + fs/btrfs/ordered-data.c | 1 + fs/btrfs/ordered-data.h | 2 + fs/btrfs/raid-stripe-tree.c | 87 ++++ fs/btrfs/raid-stripe-tree.h | 35 ++ fs/btrfs/scrub.c | 2 +- fs/btrfs/send.c | 6 +- fs/btrfs/transaction.c | 16 + fs/btrfs/tree-checker.c | 6 +- fs/btrfs/tree-log.c | 6 + fs/btrfs/uuid-tree.c | 43 ++ fs/btrfs/uuid-tree.h | 2 + fs/btrfs/volumes.c | 4 +- fs/btrfs/volumes.h | 16 +- fs/ceph/dir.c | 15 +- fs/ceph/mds_client.c | 3 + fs/eventpoll.c | 5 +- fs/ext4/ext4.h | 9 +- fs/ext4/extents.c | 536 ++++++++++++--------- fs/ext4/fast_commit.c | 8 +- fs/ext4/mballoc.c | 242 +++++----- fs/ext4/mballoc.h | 4 +- fs/ext4/migrate.c | 5 +- fs/ext4/move_extent.c | 7 +- fs/f2fs/gc.c | 19 +- fs/iomap/buffered-io.c | 15 +- fs/iomap/direct-io.c | 10 +- fs/nfs/file.c | 8 +- fs/nfs/nfs4proc.c | 6 +- fs/nfs/nfstrace.h | 39 +- fs/nfs/pnfs.c | 58 ++- fs/nfs/pnfs.h | 17 +- fs/nfs/read.c | 8 +- fs/nfs/write.c | 43 +- fs/nfsd/nfs4xdr.c | 9 +- fs/nfsd/nfsctl.c | 14 +- fs/nfsd/state.h | 17 +- fs/smb/client/cifsencrypt.c | 3 +- fs/smb/client/cifsfs.c | 7 +- fs/smb/client/cifsglob.h | 11 + fs/smb/client/cifsproto.h | 1 + fs/smb/client/connect.c | 5 +- fs/smb/client/dir.c | 1 + fs/smb/client/file.c | 29 +- fs/smb/client/fs_context.c | 2 +- fs/smb/client/misc.c | 43 ++ fs/smb/client/smb2inode.c | 4 +- fs/smb/client/smb2ops.c | 14 +- fs/smb/client/smb2pdu.c | 29 +- fs/smb/client/smb2transport.c | 4 +- fs/smb/client/trace.h | 2 + fs/smb/client/transport.c | 21 +- fs/smb/server/Kconfig | 1 + fs/smb/server/auth.c | 26 +- fs/smb/server/oplock.c | 35 +- fs/smb/server/oplock.h | 5 +- fs/smb/server/smb2pdu.c | 26 +- fs/squashfs/cache.c | 3 + fs/xfs/xfs_bmap_item.c | 3 +- fs/xfs/xfs_dquot.c | 8 +- fs/xfs/xfs_log.c | 2 + include/linux/bpf.h | 6 + include/linux/indirect_call_wrapper.h | 18 +- include/linux/ioport.h | 32 ++ include/linux/irqchip/arm-gic-v3.h | 1 + include/linux/mailbox_client.h | 2 +- include/linux/mailbox_controller.h | 9 +- include/linux/mlx5/mlx5_ifc.h | 4 +- include/linux/mmc/host.h | 9 +- include/linux/nfs_fs.h | 1 + include/linux/stmmac.h | 1 - include/linux/trace_recursion.h | 9 + include/linux/uprobes.h | 1 + include/linux/usb.h | 8 +- include/net/act_api.h | 1 + include/net/bonding.h | 1 + include/net/dsa.h | 1 + include/net/dst.h | 34 +- include/net/ip.h | 7 +- include/net/ip6_route.h | 2 +- include/net/netfilter/nf_tables.h | 5 + include/net/route.h | 2 +- include/net/sch_generic.h | 43 ++ include/net/tc_act/tc_gate.h | 33 +- include/net/tc_act/tc_ife.h | 4 +- include/net/udp_tunnel.h | 2 +- include/net/xdp_sock_drv.h | 24 +- include/net/xsk_buff_pool.h | 3 +- include/trace/events/btrfs.h | 4 +- include/trace/events/kmem.h | 8 +- include/trace/events/rxrpc.h | 4 + include/uapi/linux/btrfs.h | 1 + include/uapi/linux/btrfs_tree.h | 29 ++ include/uapi/linux/pci_regs.h | 2 +- io_uring/kbuf.c | 8 +- kernel/bpf/devmap.c | 22 +- kernel/bpf/syscall.c | 3 +- kernel/bpf/trampoline.c | 4 +- kernel/bpf/verifier.c | 4 + kernel/cgroup/cgroup.c | 1 + kernel/events/core.c | 42 +- kernel/events/uprobes.c | 10 +- kernel/fork.c | 2 +- kernel/kprobes.c | 51 +- kernel/rcu/tree_nocb.h | 5 +- kernel/rseq.c | 5 +- kernel/sched/fair.c | 6 - kernel/sched/idle.c | 45 +- kernel/time/time.c | 2 +- kernel/trace/trace.c | 12 +- kernel/trace/trace_events.c | 52 +- kernel/trace/trace_events_trigger.c | 3 + lib/bootconfig.c | 9 +- mm/kfence/core.c | 29 +- mm/mempolicy.c | 4 +- net/atm/lec.c | 26 +- net/batman-adv/bat_iv_ogm.c | 3 + net/batman-adv/bat_v_elp.c | 10 +- net/batman-adv/hard-interface.c | 8 +- net/batman-adv/hard-interface.h | 1 + net/bluetooth/hci_conn.c | 4 +- net/bluetooth/hci_sync.c | 2 +- net/bluetooth/hidp/core.c | 16 +- net/bluetooth/l2cap_core.c | 51 +- net/bluetooth/smp.c | 2 +- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- net/can/bcm.c | 1 + net/ceph/auth.c | 6 +- net/ceph/messenger_v2.c | 31 +- net/ceph/mon_client.c | 6 +- net/core/dst.c | 5 +- net/core/filter.c | 8 +- net/core/sock.c | 16 +- net/dsa/dsa.c | 59 ++- net/ipv4/icmp.c | 4 +- net/ipv4/route.c | 8 +- net/ipv4/tcp.c | 3 +- net/ipv4/tcp_input.c | 18 +- net/ipv4/tcp_ipv4.c | 3 +- net/ipv4/tcp_offload.c | 74 +++ net/ipv4/udp_offload.c | 3 +- net/ipv6/ip6_output.c | 35 +- net/ipv6/route.c | 15 +- net/ipv6/tcp_ipv6.c | 3 +- net/ipv6/tcpv6_offload.c | 65 +++ net/l2tp/l2tp_ppp.c | 25 +- net/mac80211/debugfs.c | 14 +- net/mac80211/link.c | 2 + net/mac80211/mesh.c | 6 + net/mac80211/mlme.c | 3 + net/mctp/route.c | 13 +- net/mpls/af_mpls.c | 1 + net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 72 ++- net/mptcp/protocol.h | 2 + net/ncsi/ncsi-aen.c | 3 +- net/ncsi/ncsi-rsp.c | 16 +- net/netfilter/nf_bpf_link.c | 2 +- net/netfilter/nf_conntrack_h323_asn1.c | 4 + net/netfilter/nf_conntrack_netlink.c | 67 ++- net/netfilter/nf_conntrack_sip.c | 6 +- net/netfilter/nf_tables_api.c | 6 +- net/netfilter/nfnetlink_cthelper.c | 8 +- net/netfilter/nfnetlink_osf.c | 13 + net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_ct.c | 9 + net/netfilter/nft_set_pipapo.c | 54 ++- net/netfilter/nft_set_pipapo.h | 2 + net/netfilter/xt_CT.c | 4 + net/netfilter/xt_IDLETIMER.c | 6 + net/netfilter/xt_dccp.c | 4 +- net/netfilter/xt_tcpudp.c | 6 +- net/netfilter/xt_time.c | 4 +- net/nfc/nci/core.c | 21 +- net/nfc/nci/data.c | 12 +- net/nfc/rawsock.c | 11 + net/rds/tcp.c | 14 +- net/rose/af_rose.c | 5 + net/rxrpc/ar-internal.h | 9 +- net/rxrpc/conn_event.c | 2 +- net/rxrpc/output.c | 11 +- net/rxrpc/peer_event.c | 17 +- net/rxrpc/proc.c | 4 +- net/rxrpc/recvmsg.c | 19 +- net/rxrpc/rxkad.c | 2 +- net/sched/act_ct.c | 6 + net/sched/act_gate.c | 264 +++++++--- net/sched/act_ife.c | 93 ++-- net/sched/cls_api.c | 7 + net/sched/sch_ets.c | 12 +- net/sched/sch_generic.c | 27 -- net/sched/sch_ingress.c | 14 +- net/sched/sch_teql.c | 8 +- net/smc/af_smc.c | 23 +- net/smc/smc.h | 5 + net/smc/smc_close.c | 2 +- net/sunrpc/cache.c | 26 +- net/sunrpc/xprtrdma/verbs.c | 7 +- net/tipc/socket.c | 2 + net/wireless/core.c | 1 + net/wireless/pmsr.c | 1 + net/wireless/radiotap.c | 4 +- net/xdp/xsk.c | 30 +- net/xdp/xsk_buff_pool.c | 15 +- rust/kernel/kunit.rs | 8 + security/apparmor/apparmorfs.c | 225 +++++---- security/apparmor/include/label.h | 16 +- security/apparmor/include/lib.h | 12 + security/apparmor/include/match.h | 1 + security/apparmor/include/policy.h | 10 +- security/apparmor/include/policy_ns.h | 2 + security/apparmor/include/policy_unpack.h | 83 ++-- security/apparmor/label.c | 12 +- security/apparmor/match.c | 58 ++- security/apparmor/policy.c | 77 ++- security/apparmor/policy_ns.c | 2 + security/apparmor/policy_unpack.c | 65 ++- sound/core/pcm_native.c | 19 +- sound/pci/hda/cs35l56_hda.c | 14 +- sound/pci/hda/patch_conexant.c | 11 + sound/soc/amd/acp3x-rt5682-max9836.c | 9 +- sound/soc/amd/yc/acp6x-mach.c | 14 + sound/soc/codecs/cs42l43-jack.c | 1 + sound/soc/generic/simple-card-utils.c | 48 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 1 + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 1 + sound/soc/qcom/qdsp6/q6apm.c | 1 + sound/soc/soc-core.c | 11 +- sound/usb/endpoint.c | 10 +- sound/usb/mixer_scarlett2.c | 2 + sound/usb/quirks.c | 4 +- sound/usb/validate.c | 2 +- tools/bootconfig/main.c | 7 +- tools/objtool/Makefile | 8 +- tools/testing/kunit/kunit_kernel.py | 6 +- tools/testing/kunit/kunit_tool_test.py | 26 + tools/testing/selftests/arm64/abi/hwcap.c | 4 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 56 +++ tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +- 559 files changed, 6672 insertions(+), 3263 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 5/567 scsi: lpfc: Properly set WC for DPP mapping
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit bffda93a51b40afd67c11bf558dc5aae83ca0943 ]
Using set_memory_wc() to enable write-combining for the DPP portion of the MMIO mapping is wrong as set_memory_*() is meant to operate on RAM only, not MMIO mappings. In fact, as used currently triggers a BUG_ON() with enabled CONFIG_DEBUG_VIRTUAL.
Simply map the DPP region separately and in addition to the already existing mappings, avoiding any possible negative side effects for these.
--- drivers/scsi/lpfc/lpfc_init.c | 2 ++ drivers/scsi/lpfc/lpfc_sli.c | 36 +++++++++++++++++++++++++++++------ drivers/scsi/lpfc/lpfc_sli4.h | 3 +++ 3 files changed, 35 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +2 -0
@@ -12049,6 +12049,8 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba)iounmap (phba->sli4_hba.conf_regs_memmap_p);if (phba->sli4_hba.dpp_regs_memmap_p)iounmap (phba->sli4_hba.dpp_regs_memmap_p); +if (phba->sli4_hba.dpp_regs_memmap_wc_p) +iounmap (phba->sli4_hba.dpp_regs_memmap_wc_p);break ;case LPFC_SLI_INTF_IF_TYPE_1 :break ;
drivers/scsi/lpfc/lpfc_sli.c +30 -6
@@ -15938,6 +15938,32 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset)return NULL ; } +static __maybe_unused void __iomem * +lpfc_dpp_wc_map (struct lpfc_hba *phba,uint8_t dpp_barset) +{ + +/* DPP region is supposed to cover 64-bit BAR2 */ +if (dpp_barset !=WQ_PCI_BAR_4_AND_5 ) { +lpfc_log_msg (phba,KERN_WARNING ,LOG_INIT , +"3273 dpp_barset x%x != WQ_PCI_BAR_4_AND_5\n" , + dpp_barset); +return NULL ; + } + +if (!phba->sli4_hba.dpp_regs_memmap_wc_p) { +void __iomem *dpp_map; + + dpp_map =ioremap_wc (phba->pci_bar2_map, +pci_resource_len (phba->pcidev, +PCI_64BIT_BAR4 )); + +if (dpp_map) + phba->sli4_hba.dpp_regs_memmap_wc_p = dpp_map; + } + +return phba->sli4_hba.dpp_regs_memmap_wc_p; +} +/** * lpfc_modify_hba_eq_delay - Modify Delay Multiplier on EQs * @phba: HBA structure that EQs are on.
@@ -16901,9 +16927,6 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,uint8_t dpp_barset;uint32_t dpp_offset;uint8_t wq_create_version; -#ifdef CONFIG_X86 -unsigned long pg_addr; -#endif /* sanity check on queue memory */ if (!wq || !cq)
@@ -17089,14 +17112,15 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,#ifdef CONFIG_X86 /* Enable combined writes for DPP aperture */ - pg_addr = (unsigned long )(wq->dpp_regaddr) &PAGE_MASK ; - rc =set_memory_wc (pg_addr,1 ); -if (rc) { + bar_memmap_p =lpfc_dpp_wc_map (phba, dpp_barset); +if (!bar_memmap_p) {lpfc_printf_log (phba,KERN_ERR ,LOG_INIT ,"3272 Cannot setup Combined " "Write on WQ[%d] - disable DPP\n" , wq->queue_id); phba->cfg_enable_dpp =0 ; + }else { + wq->dpp_regaddr = bar_memmap_p + dpp_offset; }#else phba->cfg_enable_dpp =0 ;
drivers/scsi/lpfc/lpfc_sli4.h +3 -0
@@ -783,6 +783,9 @@ struct lpfc_sli4_hba {void __iomem *dpp_regs_memmap_p;/* Kernel memory mapped address for * dpp registers */ +void __iomem *dpp_regs_memmap_wc_p;/* Kernel memory mapped address for +* dpp registers with write combining +*/ union { struct { /* IF Type 0, BAR 0 PCI cfg space reg mem map */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 4/567 irqchip/sifive-plic: Fix frozen interrupt due to affinity setting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
[ Upstream commit 1072020685f4b81f6efad3b412cdae0bd62bb043 ]
PLIC ignores interrupt completion message for disabled interrupt, explained by the specification:
The PLIC signals it has completed executing an interrupt handler by writing the interrupt ID it received from the claim to the claim/complete register. The PLIC does not check whether the completion ID is the same as the last claim ID for that target. If the completion ID does not match an interrupt source that is currently enabled for the target, the completion is silently ignored.
This caused problems in the past, because an interrupt can be disabled while still being handled and plic_irq_eoi() had no effect. That was fixed by checking if the interrupt is disabled, and if so enable it, before sending the completion message. That check is done with irqd_irq_disabled().
However, that is not sufficient because the enable bit for the handling hart can be zero despite irqd_irq_disabled(d) being false. This can happen when affinity setting is changed while a hart is still handling the interrupt.
This problem is easily reproducible by dumping a large file to uart (which generates lots of interrupts) and at the same time keep changing the uart interrupt's affinity setting. The uart port becomes frozen almost instantaneously.
Fix this by checking PLIC's enable bit instead of irqd_irq_disabled().
--- drivers/irqchip/irq-sifive-plic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/irqchip/irq-sifive-plic.c +6 -1
@@ -148,8 +148,13 @@ static void plic_irq_disable(struct irq_data *d)static void plic_irq_eoi (struct irq_data *d) {struct plic_handler *handler =this_cpu_ptr (&plic_handlers); +u32 __iomem *reg; +bool enabled; + + reg = handler->enable_base + (d->hwirq /32 ) *sizeof (u32); + enabled =readl (reg) &BIT (d->hwirq %32 ); -if (unlikely (irqd_irq_disabled (d))) { +if (unlikely (!enabled)) {plic_toggle (handler, d->hwirq,1 );writel (d->hwirq, handler->hart_base +CONTEXT_CLAIM );plic_toggle (handler, d->hwirq,0 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 6/567 scsi: pm8001: Fix use-after-free in pm8001_queue_command()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salomon Dushimirimana <[email protected]>
[ Upstream commit 38353c26db28efd984f51d426eac2396d299cca7 ]
Commit e29c47fe8946 ("scsi: pm8001: Simplify pm8001_task_exec()") refactors pm8001_queue_command(), however it introduces a potential cause of a double free scenario when it changes the function to return -ENODEV in case of phy down/device gone state.
In this path, pm8001_queue_command() updates task status and calls task_done to indicate to upper layer that the task has been handled. However, this also frees the underlying SAS task. A -ENODEV is then returned to the caller. When libsas sas_ata_qc_issue() receives this error value, it assumes the task wasn't handled/queued by LLDD and proceeds to clean up and free the task again, resulting in a double free.
Since pm8001_queue_command() handles the SAS task in this case, it should return 0 to the caller indicating that the task has been handled.
--- drivers/scsi/pm8001/pm8001_sas.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_sas.c +3 -2
@@ -476,8 +476,9 @@ int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags) }else { task->task_done (task); } - rc = -ENODEV ; - goto err_out; +spin_unlock_irqrestore (&pm8001_ha->lock, flags); +pm8001_dbg (pm8001_ha,IO ,"pm8001_task_exec device gone\n" ); +return 0 ; } ccb =pm8001_ccb_alloc (pm8001_ha, pm8001_dev, task);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 8/567 rseq: Clarify rseq registration rseq_size bound check comment
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathieu Desnoyers <[email protected]>
[ Upstream commit 26d43a90be81fc90e26688a51d3ec83188602731 ]
The rseq registration validates that the rseq_size argument is greater or equal to 32 (the original rseq size), but the comment associated with this check does not clearly state this.
Clarify the comment to that effect.
--- kernel/rseq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/rseq.c +3 -2
@@ -432,8 +432,9 @@ SYSCALL_DEFINE4(rseq, struct rseq __user *, rseq, u32, rseq_len,* auxiliary vector AT_RSEQ_ALIGN. If rseq_len is the original rseq * size, the required alignment is the original struct rseq alignment. * -* In order to be valid, rseq_len is either the original rseq size, or -* large enough to contain all supported fields, as communicated to +* The rseq_len is required to be greater or equal to the original rseq +* size. In order to be valid, rseq_len is either the original rseq size, +* or large enough to contain all supported fields, as communicated to * user-space through the ELF auxiliary vector AT_RSEQ_FEATURE_SIZE. */ if (rseq_len < ORIG_RSEQ_SIZE ||
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 9/567 scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Wang <[email protected]>
[ Upstream commit 62c015373e1cdb1cdca824bd2dbce2dac0819467 ]
Move the link recovery trigger from ufshcd_uic_pwr_ctrl() to __ufshcd_wl_resume(). Ensure link recovery is only attempted when hibern8 exit fails during resume, not during hibern8 enter in suspend. Improve error handling and prevent unnecessary link recovery attempts.
--- drivers/ufs/core/ufshcd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/ufs/core/ufshcd.c +9 -9
@@ -4289,14 +4289,6 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)spin_unlock_irqrestore (hba->host->host_lock, flags);mutex_unlock (&hba->uic_cmd_mutex); -/* -* If the h8 exit fails during the runtime resume process, it becomes -* stuck and cannot be recovered through the error handler. To fix -* this, use link recovery instead of the error handler. -*/ -if (ret && hba->pm_op_in_progress) - ret =ufshcd_link_recovery (hba); -return ret; }
@@ -10016,7 +10008,15 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) }else {dev_err (hba->dev,"%s: hibern8 exit failed %d\n" , __func__, ret); - goto vendor_suspend; +/* +* If the h8 exit fails during the runtime resume +* process, it becomes stuck and cannot be recovered +* through the error handler. To fix this, use link +* recovery instead of the error handler. +*/ + ret =ufshcd_link_recovery (hba); +if (ret) + goto vendor_suspend; } }else if (ufshcd_is_link_off (hba)) {/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 10/567 ALSA: usb-audio: Cap the packet size pre-calculations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7fe8dec3f628e9779f1631576f8e693370050348 ]
We calculate the possible packet sizes beforehand for adaptive and synchronous endpoints, but we didn't take care of the max frame size for those pre-calculated values. When a device or a bus limits the packet size, a high sample rate or a high number of channels may lead to the packet sizes that are larger than the given limit, which results in an error from the USB core at submitting URBs.
As a simple workaround, just add the sanity checks of pre-calculated packet sizes to have the upper boundary of ep->maxframesize.
--- sound/usb/endpoint.c | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/endpoint.c +3 -0
@@ -1396,6 +1396,9 @@ int snd_usb_endpoint_set_params(struct snd_usb_audio *chip, goto unlock; } + ep->packsize[0 ] =min (ep->packsize[0 ], ep->maxframesize); + ep->packsize[1 ] =min (ep->packsize[1 ], ep->maxframesize); +/* calculate the frequency in 16.16 format */ ep->freqm = ep->freqn; ep->freqshift =INT_MIN ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 11/567 ALSA: usb-audio: Use inclusive terms
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4e9113c533acee2ba1f72fd68ee6ecd36b64484e ]
Replace the remaining with inclusive terms; it's only this function name we overlooked at the previous conversion.
--- sound/usb/endpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/endpoint.c +3 -3
@@ -160,8 +160,8 @@ int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep)* This won't be used for implicit feedback which takes the packet size * returned from the sync source */ -static int slave_next_packet_size (struct snd_usb_endpoint *ep, -unsigned int avail) +static int synced_next_packet_size (struct snd_usb_endpoint *ep, +unsigned int avail) {unsigned long flags;unsigned int phase;
@@ -230,7 +230,7 @@ int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep, }if (ep->sync_source) -return slave_next_packet_size (ep, avail); +return synced_next_packet_size (ep, avail);else return next_packet_size (ep, avail); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 7/567 ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit a8cc55bf81a45772cad44c83ea7bb0e98431094a ]
Remove QUIRK_FLAG_VALIDATE_RATES for Focusrite. With the previous commit, focusrite_valid_sample_rate() produces correct rate tables without USB probing.
QUIRK_FLAG_VALIDATE_RATES sends SET_CUR requests for each rate (~25ms each) and leaves the device at 192kHz. This is a problem because that
rate: 1) disables the internal mixer, so outputs are silent until an application opens the PCM and sets a lower rate, and 2) the Air and Safe modes get disabled.
--- sound/usb/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks.c +1 -1
@@ -2308,7 +2308,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {VENDOR_FLG (0x07fd ,/* MOTU */ QUIRK_FLAG_VALIDATE_RATES ),VENDOR_FLG (0x1235 ,/* Focusrite Novation */ -QUIRK_FLAG_VALIDATE_RATES ), +0 ),VENDOR_FLG (0x1511 ,/* AURALiC */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x152a, /* Thesycon devices */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 13/567 ALSA: pci: hda: use snd_kcontrol_chip()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 483dd12dbe34c6d4e71d4d543bcb1292bcb62d08 ]
We can use snd_kcontrol_chip(). Let's use it.
Stable-dep-of: 003ce8c9b2ca ("ALSA: hda: cs35l56: Fix signedness error in cs35l56_hda_posture_put()")
--- sound/pci/hda/cs35l56_hda.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/pci/hda/cs35l56_hda.c +6 -6
@@ -174,7 +174,7 @@ static int cs35l56_hda_mixer_info(struct snd_kcontrol *kcontrol,static int cs35l56_hda_mixer_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);unsigned int reg_val;int i;
@@ -194,7 +194,7 @@ static int cs35l56_hda_mixer_get(struct snd_kcontrol *kcontrol,static int cs35l56_hda_mixer_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);unsigned int item = ucontrol->value.enumerated.item[0 ];bool changed;
@@ -221,7 +221,7 @@ static int cs35l56_hda_posture_info(struct snd_kcontrol *kcontrol,static int cs35l56_hda_posture_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);unsigned int pos;int ret;
@@ -237,7 +237,7 @@ static int cs35l56_hda_posture_get(struct snd_kcontrol *kcontrol,static int cs35l56_hda_posture_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);unsigned long pos = ucontrol->value.integer.value[0 ];bool changed;int ret;
@@ -284,7 +284,7 @@ static int cs35l56_hda_vol_info(struct snd_kcontrol *kcontrol,static int cs35l56_hda_vol_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);unsigned int raw_vol;int vol;int ret;
@@ -308,7 +308,7 @@ static int cs35l56_hda_vol_get(struct snd_kcontrol *kcontrol,static int cs35l56_hda_vol_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) { -struct cs35l56_hda *cs35l56 = (struct cs35l56_hda *)kcontrol->private_data; +struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol);long vol = ucontrol->value.integer.value[0 ];unsigned int raw_vol;bool changed;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 14/567 ALSA: hda: cs35l56: Fix signedness error in cs35l56_hda_posture_put()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 003ce8c9b2ca28fbb4860651e76fb1c9a91f2ea1 ]
In cs35l56_hda_posture_put() assign ucontrol->value.integer.value[0] to a long instead of an unsigned long. ucontrol->value.integer.value[0] is a long.
This fixes the sparse warning:
sound/hda/codecs/side-codecs/cs35l56_hda.c:256:20: warning: unsigned value that used to be signed checked against zero? sound/hda/codecs/side-codecs/cs35l56_hda.c:252:29: signed value source
--- sound/pci/hda/cs35l56_hda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/cs35l56_hda.c +1 -1
@@ -238,7 +238,7 @@ static int cs35l56_hda_posture_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct cs35l56_hda *cs35l56 =snd_kcontrol_chip (kcontrol); -unsigned long pos = ucontrol->value.integer.value[0 ]; +long pos = ucontrol->value.integer.value[0 ];bool changed;int ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 15/567 btrfs: move btrfs_crc32c_final into free-space-cache.c
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit 102f2640a346e84cb5c2d19805a9dd38a776013c ]
This is the only place this helper is used, take it out of ctree.h and move it into free-space-cache.c.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/ctree.h | 5 ----- fs/btrfs/free-space-cache.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/ctree.h +0 -5
@@ -477,11 +477,6 @@ static inline u32 btrfs_crc32c(u32 crc, const void *address, unsigned length)return crc32c (crc, address, length); } -static inline void btrfs_crc32c_final (u32 crc,u8 *result) -{ -put_unaligned_le32 (~crc, result); -} -static inline u64 btrfs_name_hash (const char *name,int len) {return crc32c ((u32 )~1 , name, len);
fs/btrfs/free-space-cache.c +5 -0
@@ -57,6 +57,11 @@ static void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl, struct btrfs_free_space *info, u64 offset, u64 bytes, bool update_stats); +static void btrfs_crc32c_final (u32 crc,u8 *result) +{ +put_unaligned_le32 (~crc, result); +} +static void __btrfs_remove_free_space_cache (struct btrfs_free_space_ctl *ctl) {struct btrfs_free_space *info;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 12/567 perf: Fix __perf_event_overflow() vs perf_remove_from_context() race
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit c9bc1753b3cc41d0e01fbca7f035258b5f4db0ae ]
Make sure that __perf_event_overflow() runs with IRQs disabled for all possible callchains. Specifically the software events can end up running it with only preemption disabled.
This opens up a race vs perf_event_exit_event() and friends that will go and free various things the overflow path expects to be present, like the BPF program.
--- kernel/events/core.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
kernel/events/core.c +41 -1
@@ -9729,6 +9729,13 @@ int perf_event_overflow(struct perf_event *event,struct perf_sample_data *data, struct pt_regs *regs) { +/* +* Entry point from hardware PMI, interrupts should be disabled here. +* This serializes us against perf_event_remove_from_context() in +* things like perf_event_release_kernel(). +*/ +lockdep_assert_irqs_disabled (); +return __perf_event_overflow (event,1 , data, regs); }
@@ -9809,6 +9816,19 @@ static void perf_swevent_event(struct perf_event *event, u64 nr, {struct hw_perf_event *hwc = &event->hw; +/* +* This is: +* - software preempt +* - tracepoint preempt +* - tp_target_task irq (ctx->lock) +* - uprobes preempt/irq +* - kprobes preempt/irq +* - hw_breakpoint irq +* +* Any of these are sufficient to hold off RCU and thus ensure @event +* exists. +*/ +lockdep_assert_preemption_disabled ();local64_add (nr, &event->count);if (!regs)
@@ -9817,6 +9837,16 @@ static void perf_swevent_event(struct perf_event *event, u64 nr,if (!is_sampling_event (event))return ; +/* +* Serialize against event_function_call() IPIs like normal overflow +* event handling. Specifically, must not allow +* perf_event_release_kernel() -> perf_remove_from_context() to make +* progress and 'release' the event from under us. +*/ +guard (irqsave)(); +if (event->state !=PERF_EVENT_STATE_ACTIVE ) +return ; +if ((event->attr.sample_type &PERF_SAMPLE_PERIOD ) && !event->attr.freq) { data->period = nr;return perf_swevent_overflow (event,1 , data, regs);
@@ -10320,6 +10350,11 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size,struct perf_sample_data data;struct perf_event *event; +/* +* Per being a tracepoint, this runs with preemption disabled. +*/ +lockdep_assert_preemption_disabled (); +struct perf_raw_record raw = { .frag = { .size = entry_size,
@@ -10733,6 +10768,11 @@ void perf_bp_event(struct perf_event *bp, void *data)struct perf_sample_data sample;struct pt_regs *regs = data; +/* +* Exception context, will have interrupts disabled. +*/ +lockdep_assert_irqs_disabled (); +perf_sample_data_init (&sample, bp->attr.bp_addr,0 );if (!bp->hw.state && !perf_exclude_event (bp, regs))
@@ -11185,7 +11225,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer)if (regs && !perf_exclude_event (event, regs)) {if (!(event->attr.exclude_idle &&is_idle_task (current))) -if (__perf_event_overflow (event,1 , &data, regs)) +if (perf_event_overflow (event, &data, regs)) ret =HRTIMER_NORESTART ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 17/567 btrfs: move btrfs_extref_hash into inode-item.h
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit 98e4f060c4f565a3b62e8cdfe6b89f59167312b6 ]
Ideally this would be un-inlined, but that is a cleanup for later. For now move this into inode-item.h, which is where the extref code lives.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/ctree.h | 9 --------- fs/btrfs/inode-item.h | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-)
fs/btrfs/ctree.h +0 -9
@@ -477,15 +477,6 @@ static inline u64 btrfs_name_hash(const char *name, int len)return crc32c ((u32 )~1 , name, len); } -/* -* Figure the key offset of an extended inode ref -*/ -static inline u64 btrfs_extref_hash (u64 parent_objectid,const char *name, -int len) -{ -return (u64 )crc32c (parent_objectid, name, len); -} -static inline gfp_t btrfs_alloc_write_mask (struct address_space *mapping) {return mapping_gfp_constraint (mapping, ~__GFP_FS);
fs/btrfs/inode-item.h +7 -0
@@ -4,6 +4,7 @@#define BTRFS_INODE_ITEM_H #include <linux/types.h> +#include <linux/crc32c.h> struct btrfs_trans_handle ;struct btrfs_root ;
@@ -76,6 +77,12 @@ static inline void btrfs_inode_split_flags(u64 inode_item_flags, *ro_flags = (u32)(inode_item_flags >>32 ); } +/* Figure the key offset of an extended inode ref. */ +static inline u64 btrfs_extref_hash (u64 parent_objectid,const char *name,int len) +{ +return (u64 )crc32c (parent_objectid, name, len); +} +int btrfs_truncate_inode_items (struct btrfs_trans_handle *trans,struct btrfs_root *root,struct btrfs_truncate_control *control);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 16/567 btrfs: remove btrfs_crc32c wrapper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
[ Upstream commit 03e86348965a5fa13593db8682132033d663f7ee ]
This simply sends the same arguments into crc32c(), and is just used in a few places. Remove this wrapper and directly call crc32c() in these instances.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/ctree.h | 5 ----- fs/btrfs/extent-tree.c | 6 +++--- fs/btrfs/free-space-cache.c | 4 ++-- fs/btrfs/send.c | 6 +++--- 4 files changed, 8 insertions(+), 13 deletions(-)
fs/btrfs/ctree.h +0 -5
@@ -472,11 +472,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)#define BTRFS_BYTES_TO_BLKS (fs_info, bytes) \ ((bytes) >> (fs_info)->sectorsize_bits) -static inline u32 btrfs_crc32c (u32 crc,const void *address,unsigned length) -{ -return crc32c (crc, address, length); -} -static inline u64 btrfs_name_hash (const char *name,int len) {return crc32c ((u32 )~1 , name, len);
fs/btrfs/extent-tree.c +3 -3
@@ -414,11 +414,11 @@ u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset)__le64 lenum; lenum =cpu_to_le64 (root_objectid); - high_crc =btrfs_crc32c (high_crc, &lenum,sizeof (lenum)); + high_crc =crc32c (high_crc, &lenum,sizeof (lenum)); lenum =cpu_to_le64 (owner); - low_crc =btrfs_crc32c (low_crc, &lenum,sizeof (lenum)); + low_crc =crc32c (low_crc, &lenum,sizeof (lenum)); lenum =cpu_to_le64 (offset); - low_crc =btrfs_crc32c (low_crc, &lenum,sizeof (lenum)); + low_crc =crc32c (low_crc, &lenum,sizeof (lenum));return ((u64 )high_crc <<31 ) ^ (u64 )low_crc; }
fs/btrfs/free-space-cache.c +2 -2
@@ -545,7 +545,7 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index)if (index ==0 ) offset =sizeof (u32) * io_ctl->num_pages; - crc =btrfs_crc32c (crc, io_ctl->orig + offset,PAGE_SIZE - offset); + crc =crc32c (crc, io_ctl->orig + offset,PAGE_SIZE - offset);btrfs_crc32c_final (crc, (u8 *)&crc);io_ctl_unmap_page (io_ctl); tmp =page_address (io_ctl->pages[0 ]);
@@ -567,7 +567,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index) val = *tmp;io_ctl_map_page (io_ctl,0 ); - crc =btrfs_crc32c (crc, io_ctl->orig + offset,PAGE_SIZE - offset); + crc =crc32c (crc, io_ctl->orig + offset,PAGE_SIZE - offset);btrfs_crc32c_final (crc, (u8 *)&crc);if (val != crc) { btrfs_err_rl(io_ctl->fs_info,
fs/btrfs/send.c +3 -3
@@ -814,7 +814,7 @@ static int send_cmd(struct send_ctx *sctx)put_unaligned_le32 (sctx->send_size -sizeof (*hdr), &hdr->len);put_unaligned_le32 (0 , &hdr->crc); - crc =btrfs_crc32c (0 , (unsigned char *)sctx->send_buf, sctx->send_size); + crc =crc32c (0 , (unsigned char *)sctx->send_buf, sctx->send_size);put_unaligned_le32 (crc, &hdr->crc); ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size,
@@ -5740,8 +5740,8 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path, hdr = (struct btrfs_cmd_header *)sctx->send_buf; hdr->len =cpu_to_le32 (sctx->send_size + disk_num_bytes -sizeof (*hdr)); hdr->crc =0 ; - crc =btrfs_crc32c (0 , sctx->send_buf, sctx->send_size); - crc =btrfs_crc32c (crc, sctx->send_buf + data_offset, disk_num_bytes); + crc =crc32c (0 , sctx->send_buf, sctx->send_size); + crc =crc32c (crc, sctx->send_buf + data_offset, disk_num_bytes); hdr->crc =cpu_to_le32 (crc); ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 19/567 btrfs: read raid stripe tree from disk
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit 515020900d447796bc2f0f57064663617a11b65d ]
If we find the raid-stripe-tree on mount, read it from disk. This is a backward incompatible feature. The rescue=ignorebadroots mount option will skip this tree.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/block-rsv.c | 6 ++++++ fs/btrfs/disk-io.c | 18 ++++++++++++++++++ fs/btrfs/fs.h | 1 + include/uapi/linux/btrfs.h | 1 + 4 files changed, 26 insertions(+)
fs/btrfs/block-rsv.c +6 -0
@@ -354,6 +354,11 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info) min_items++; } +if (btrfs_fs_incompat (fs_info,RAID_STRIPE_TREE )) { + num_bytes +=btrfs_root_used (&fs_info->stripe_root->root_item); + min_items++; + } +/* * But we also want to reserve enough space so we can do the fallback * global reserve for an unlink, which is an additional
@@ -405,6 +410,7 @@ void btrfs_init_root_block_rsv(struct btrfs_root *root)case BTRFS_EXTENT_TREE_OBJECTID :case BTRFS_FREE_SPACE_TREE_OBJECTID :case BTRFS_BLOCK_GROUP_TREE_OBJECTID : +case BTRFS_RAID_STRIPE_TREE_OBJECTID : root->block_rsv = &fs_info->delayed_refs_rsv;break ;case BTRFS_ROOT_TREE_OBJECTID :
fs/btrfs/disk-io.c +18 -0
@@ -1179,6 +1179,8 @@ static struct btrfs_root *btrfs_get_global_root(struct btrfs_fs_info *fs_info,return btrfs_grab_root (fs_info->block_group_root);case BTRFS_FREE_SPACE_TREE_OBJECTID :return btrfs_grab_root (btrfs_global_root (fs_info, &key)); +case BTRFS_RAID_STRIPE_TREE_OBJECTID : +return btrfs_grab_root (fs_info->stripe_root);default :return NULL ; }
@@ -1259,6 +1261,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)btrfs_put_root (fs_info->fs_root);btrfs_put_root (fs_info->data_reloc_root);btrfs_put_root (fs_info->block_group_root); +btrfs_put_root (fs_info->stripe_root);btrfs_check_leaked_roots (fs_info);btrfs_extent_buffer_leak_debug_check (fs_info);kfree (fs_info->super_copy);
@@ -1812,6 +1815,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, bool free_chunk_root)free_root_extent_buffers (info->fs_root);free_root_extent_buffers (info->data_reloc_root);free_root_extent_buffers (info->block_group_root); +free_root_extent_buffers (info->stripe_root);if (free_chunk_root)free_root_extent_buffers (info->chunk_root); }
@@ -2287,6 +2291,20 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info) fs_info->uuid_root = root; } +if (btrfs_fs_incompat (fs_info,RAID_STRIPE_TREE )) { + location.objectid =BTRFS_RAID_STRIPE_TREE_OBJECTID ; + root =btrfs_read_tree_root (tree_root, &location); +if (IS_ERR (root)) { +if (!btrfs_test_opt (fs_info,IGNOREBADROOTS )) { + ret =PTR_ERR (root); + goto out; + } + }else { +set_bit (BTRFS_ROOT_TRACK_DIRTY , &root->state); + fs_info->stripe_root = root; + } + } +return 0 ; out: btrfs_warn(fs_info, "failed to read root (objectid=%llu): %d",
fs/btrfs/fs.h +1 -0
@@ -371,6 +371,7 @@ struct btrfs_fs_info {struct btrfs_root *uuid_root;struct btrfs_root *data_reloc_root;struct btrfs_root *block_group_root; +struct btrfs_root *stripe_root;/* The log root tree is a directory of all the other log roots */ struct btrfs_root *log_root_tree;
include/uapi/linux/btrfs.h +1 -0
@@ -333,6 +333,7 @@ struct btrfs_ioctl_fs_info_args {#define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11)#define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12)#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) +#define BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE (1ULL << 14)struct btrfs_ioctl_feature_flags {__u64 compat_flags;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 20/567 btrfs: add support for inserting raid stripe extents
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit 02c372e1f016e5113217597ab37b399c4e407477 ]
Add support for inserting stripe extents into the raid stripe tree on completion of every write that needs an extra logical-to-physical translation when using RAID.
Inserting the stripe extents happens after the data I/O has completed, this is done to
a) support zone-append and
b) rule out the possibility of a RAID-write-hole.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/Makefile | 2 +- fs/btrfs/bio.c | 21 +++++++++ fs/btrfs/extent-tree.c | 1 + fs/btrfs/inode.c | 8 +++- fs/btrfs/ordered-data.c | 1 + fs/btrfs/ordered-data.h | 2 + fs/btrfs/raid-stripe-tree.c | 87 +++++++++++++++++++++++++++++++++++++ fs/btrfs/raid-stripe-tree.h | 35 +++++++++++++++ fs/btrfs/volumes.c | 4 +- fs/btrfs/volumes.h | 16 ++++--- 10 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 fs/btrfs/raid-stripe-tree.c create mode 100644 fs/btrfs/raid-stripe-tree.h
fs/btrfs/Makefile +1 -1
@@ -33,7 +33,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \ block-rsv.o delalloc-space.o block-group.o discard.o reflink.o \ subpage.o tree-mod-log.o extent-io-tree.o fs.o messages.o bio.o \ - lru_cache.o + lru_cache.o raid-stripe-tree.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
fs/btrfs/bio.c +21 -0
@@ -15,6 +15,7 @@#include "rcu-string.h" #include "zoned.h" #include "file-item.h" +#include "raid-stripe-tree.h" static struct bio_set btrfs_bioset;static struct bio_set btrfs_clone_bioset;
@@ -416,6 +417,9 @@ static void btrfs_orig_write_end_io(struct bio *bio)else bio->bi_status =BLK_STS_OK ; +if (bio_op (bio) ==REQ_OP_ZONE_APPEND && !bio->bi_status) + stripe->physical = bio->bi_iter.bi_sector <<SECTOR_SHIFT ; +btrfs_orig_bbio_end_io (bbio);btrfs_put_bioc (bioc); }
@@ -427,6 +431,8 @@ static void btrfs_clone_write_end_io(struct bio *bio)if (bio->bi_status) {atomic_inc (&stripe->bioc->error);btrfs_log_dev_io_error (bio, stripe->dev); + }else if (bio_op (bio) ==REQ_OP_ZONE_APPEND ) { + stripe->physical = bio->bi_iter.bi_sector <<SECTOR_SHIFT ; }/* Pass on control to the original bio this one was cloned from */
@@ -490,6 +496,7 @@ static void btrfs_submit_mirrored_bio(struct btrfs_io_context *bioc, int dev_nr) bio->bi_private = &bioc->stripes[dev_nr]; bio->bi_iter.bi_sector = bioc->stripes[dev_nr].physical >>SECTOR_SHIFT ; bioc->stripes[dev_nr].bioc = bioc; + bioc->size = bio->bi_iter.bi_size;btrfs_submit_dev_bio (bioc->stripes[dev_nr].dev, bio); }
@@ -499,6 +506,8 @@ static void __btrfs_submit_bio(struct bio *bio, struct btrfs_io_context *bioc,if (!bioc) {/* Single mirror read/write fast path. */ btrfs_bio (bio)->mirror_num = mirror_num; +if (bio_op (bio) !=REQ_OP_READ ) +btrfs_bio (bio)->orig_physical = smap->physical; bio->bi_iter.bi_sector = smap->physical >>SECTOR_SHIFT ;if (bio_op (bio) !=REQ_OP_READ )btrfs_bio (bio)->orig_physical = smap->physical;
@@ -690,6 +699,18 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num) bio->bi_opf |=REQ_OP_ZONE_APPEND ; } +if (is_data_bbio (bbio) && bioc && +btrfs_need_stripe_tree_update (bioc->fs_info, bioc->map_type)) { +/* +* No locking for the list update, as we only add to +* the list in the I/O submission path, and list +* iteration only happens in the completion path, which +* can't happen until after the last submission. +*/ +btrfs_get_bioc (bioc); +list_add_tail (&bioc->rst_ordered_entry, &bbio->ordered->bioc_list); + } +/* * Csum items for reloc roots have already been cloned at this * point, so they are handled as part of the no-checksum case.
fs/btrfs/extent-tree.c +1 -0
@@ -42,6 +42,7 @@#include "file-item.h" #include "orphan.h" #include "tree-checker.h" +#include "raid-stripe-tree.h" #undef SCRAMBLE_DELAYED_REFS
fs/btrfs/inode.c +7 -1
@@ -71,6 +71,7 @@#include "super.h" #include "orphan.h" #include "backref.h" +#include "raid-stripe-tree.h" struct btrfs_iget_args {u64 ino;
@@ -3104,6 +3105,10 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) trans->block_rsv = &inode->block_rsv; + ret =btrfs_insert_raid_extent (trans, ordered_extent); +if (ret) + goto out; +if (test_bit (BTRFS_ORDERED_COMPRESSED , &ordered_extent->flags)) compress_type = ordered_extent->compress_type;if (test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {
@@ -3252,7 +3257,8 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)int btrfs_finish_ordered_io (struct btrfs_ordered_extent *ordered) {if (btrfs_is_zoned (btrfs_sb (ordered->inode->i_sb)) && - !test_bit (BTRFS_ORDERED_IOERR , &ordered->flags)) + !test_bit (BTRFS_ORDERED_IOERR , &ordered->flags) && +list_empty (&ordered->bioc_list))btrfs_finish_ordered_zoned (ordered);return btrfs_finish_one_ordered (ordered); }
fs/btrfs/ordered-data.c +1 -0
@@ -198,6 +198,7 @@ static struct btrfs_ordered_extent *alloc_ordered_extent(INIT_LIST_HEAD (&entry->log_list);INIT_LIST_HEAD (&entry->root_extent_list);INIT_LIST_HEAD (&entry->work_list); +INIT_LIST_HEAD (&entry->bioc_list);init_completion (&entry->completion);/*
fs/btrfs/ordered-data.h +2 -0
@@ -151,6 +151,8 @@ struct btrfs_ordered_extent {struct completion completion;struct btrfs_work flush_work;struct list_head work_list; + +struct list_head bioc_list; }; static inline void
fs/btrfs/raid-stripe-tree.c new file +87 -0
87 lines not on this page · raw message
fs/btrfs/raid-stripe-tree.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2023 Western Digital Corporation or its affiliates. +*/ + +#ifndef BTRFS_RAID_STRIPE_TREE_H +#define BTRFS_RAID_STRIPE_TREE_H + +struct btrfs_io_context ; +struct btrfs_io_stripe ; +struct btrfs_ordered_extent ; +struct btrfs_trans_handle ; + +int btrfs_insert_raid_extent (struct btrfs_trans_handle *trans, +struct btrfs_ordered_extent *ordered_extent); + +static inline bool btrfs_need_stripe_tree_update (struct btrfs_fs_info *fs_info, +u64 map_type) +{ +u64 type = map_type &BTRFS_BLOCK_GROUP_TYPE_MASK ; +u64 profile = map_type &BTRFS_BLOCK_GROUP_PROFILE_MASK ; + +if (!btrfs_fs_incompat (fs_info,RAID_STRIPE_TREE )) +return false; + +if (type !=BTRFS_BLOCK_GROUP_DATA ) +return false; + +if (profile &BTRFS_BLOCK_GROUP_RAID1_MASK ) +return true; + +return false; +} + +#endif
fs/btrfs/volumes.c +3 -1
@@ -5943,6 +5943,7 @@ static int find_live_mirror(struct btrfs_fs_info *fs_info, }static struct btrfs_io_context *alloc_btrfs_io_context (struct btrfs_fs_info *fs_info, +u64 logical,u16 total_stripes) {struct btrfs_io_context *bioc;
@@ -5962,6 +5963,7 @@ static struct btrfs_io_context *alloc_btrfs_io_context(struct btrfs_fs_info *fs_ bioc->fs_info = fs_info; bioc->replace_stripe_src =-1 ; bioc->full_stripe_logical = (u64)-1 ; + bioc->logical = logical;return bioc; }
@@ -6498,7 +6500,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, goto out; } - bioc =alloc_btrfs_io_context (fs_info, num_alloc_stripes); + bioc =alloc_btrfs_io_context (fs_info, logical, num_alloc_stripes);if (!bioc) { ret = -ENOMEM ; goto out;
fs/btrfs/volumes.h +10 -6
@@ -387,12 +387,11 @@ struct btrfs_fs_devices {struct btrfs_io_stripe {struct btrfs_device *dev; -union { -/* Block mapping */ -u64 physical; -/* For the endio handler */ -struct btrfs_io_context *bioc; - }; +/* Block mapping. */ +u64 physical; +u64 length; +/* For the endio handler. */ +struct btrfs_io_context *bioc; };struct btrfs_discard_stripe {
@@ -425,6 +424,11 @@ struct btrfs_io_context {atomic_t error;u16 max_errors; +u64 logical; +u64 size; +/* Raid stripe tree ordered entry. */ +struct list_head rst_ordered_entry; +/* * The total number of stripes, including the extra duplicated * stripe for replace.
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 21/567 btrfs: fix incorrect key offset in error message in check_dev_extent_item()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 511dc8912ae3e929c1a182f5e6b2326516fd42a0 ]
Fix the error message in check_dev_extent_item(), when an overlapping stripe is encountered. For dev extents, objectid is the disk number and offset the physical address, so prev_key->objectid should actually be prev_key->offset.
(I can't take any credit for this one - this was discovered by Chris and his friend Claude.)
--- fs/btrfs/tree-checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/tree-checker.c +1 -1
@@ -1802,7 +1802,7 @@ static int check_dev_extent_item(const struct extent_buffer *leaf,if (unlikely (prev_key->offset + prev_len > key->offset)) {generic_err (leaf, slot,"dev extent overlap, prev offset %llu len %llu current offset %llu" , - prev_key->objectid, prev_len, key->offset); + prev_key->offset, prev_len, key->offset);return -EUCLEAN ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 18/567 btrfs: add raid stripe tree definitions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit ee1293308e01d359688243d665138f35a6f1f9b8 ]
Add definitions for the raid stripe tree. This tree will hold information about the on-disk layout of the stripes in a RAID set.
Each stripe extent has a 1:1 relationship with an on-disk extent item and is doing the logical to per-drive physical address translation for the extent item in question.
Stable-dep-of: 511dc8912ae3 ("btrfs: fix incorrect key offset in error message in check_dev_extent_item()")
--- fs/btrfs/accessors.h | 8 ++++++++ fs/btrfs/locking.c | 1 + include/uapi/linux/btrfs_tree.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+)
fs/btrfs/accessors.h +8 -0
@@ -305,6 +305,14 @@ BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32); BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64); BTRFS_SETGET_STACK_FUNCS(stack_timespec_nsec, struct btrfs_timespec, nsec, 32); +BTRFS_SETGET_FUNCS(stripe_extent_encoding, struct btrfs_stripe_extent, encoding, 8); +BTRFS_SETGET_FUNCS(raid_stride_devid, struct btrfs_raid_stride, devid, 64); +BTRFS_SETGET_FUNCS(raid_stride_physical, struct btrfs_raid_stride, physical, 64); +BTRFS_SETGET_STACK_FUNCS (stack_stripe_extent_encoding, + struct btrfs_stripe_extent, encoding, 8); +BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_devid, struct btrfs_raid_stride, devid, 64); +BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_physical, struct btrfs_raid_stride, physical, 64); +/* struct btrfs_dev_extent */ BTRFS_SETGET_FUNCS(dev_extent_chunk_tree, struct btrfs_dev_extent, chunk_tree, 64); BTRFS_SETGET_FUNCS(dev_extent_chunk_objectid, struct btrfs_dev_extent,
fs/btrfs/locking.c +1 -0
@@ -73,6 +73,7 @@ static struct btrfs_lockdep_keyset { { .id = BTRFS_UUID_TREE_OBJECTID, DEFINE_NAME("uuid") }, { .id = BTRFS_FREE_SPACE_TREE_OBJECTID, DEFINE_NAME("free-space") }, { .id = BTRFS_BLOCK_GROUP_TREE_OBJECTID, DEFINE_NAME("block-group") }, + { .id = BTRFS_RAID_STRIPE_TREE_OBJECTID, DEFINE_NAME("raid-stripe") }, { .id = 0, DEFINE_NAME("tree") }, };
include/uapi/linux/btrfs_tree.h +29 -0
@@ -73,6 +73,9 @@/* Holds the block group items for extent tree v2. */ #define BTRFS_BLOCK_GROUP_TREE_OBJECTID 11ULL +/* Tracks RAID stripes in block groups. */ +#define BTRFS_RAID_STRIPE_TREE_OBJECTID 12ULL +/* device stats in the device tree */ #define BTRFS_DEV_STATS_OBJECTID 0ULL
@@ -261,6 +264,8 @@#define BTRFS_DEV_ITEM_KEY 216#define BTRFS_CHUNK_ITEM_KEY 228 +#define BTRFS_RAID_STRIPE_KEY 230 +/* * Records the overall state of the qgroups. * There's only one instance of this key present,
@@ -719,6 +724,30 @@ struct btrfs_free_space_header {__le64 num_bitmaps; } __attribute__ ((__packed__)); +struct btrfs_raid_stride { +/* The id of device this raid extent lives on. */ +__le64 devid; +/* The physical location on disk. */ +__le64 physical; +} __attribute__ ((__packed__ )); + +/* The stripe_extent::encoding, 1:1 mapping of enum btrfs_raid_types. */ +#define BTRFS_STRIPE_RAID0 1 +#define BTRFS_STRIPE_RAID1 2 +#define BTRFS_STRIPE_DUP 3 +#define BTRFS_STRIPE_RAID10 4 +#define BTRFS_STRIPE_RAID5 5 +#define BTRFS_STRIPE_RAID6 6 +#define BTRFS_STRIPE_RAID1C3 7 +#define BTRFS_STRIPE_RAID1C4 8 + +struct btrfs_stripe_extent { +__u8 encoding; +__u8 reserved[7 ]; +/* An array of raid strides this stripe is composed of. */ +struct btrfs_raid_stride strides[]; +} __attribute__ ((__packed__ )); +#define BTRFS_HEADER_FLAG_WRITTEN (1ULL << 0)#define BTRFS_HEADER_FLAG_RELOC (1ULL << 1)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 23/567 btrfs: fix warning in scrub_verify_one_metadata()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 44e2fda66427a0442d8d2c0e6443256fb458ab6b ]
Commit b471965fdb2d ("btrfs: fix replace/scrub failure with metadata_uuid") fixed the comparison in scrub_verify_one_metadata() to use metadata_uuid rather than fsid, but left the warning as it was. Fix it so it matches what we're doing.
--- fs/btrfs/scrub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/scrub.c +1 -1
@@ -635,7 +635,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nrbtrfs_warn_rl (fs_info,"tree block %llu mirror %u has bad fsid, has %pU want %pU" , logical, stripe->mirror_num, - header->fsid, fs_info->fs_devices->fsid); + header->fsid, fs_info->fs_devices->metadata_uuid);return ; } if (memcmp(header->chunk_tree_uuid, fs_info->chunk_tree_uuid,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 32/567 resource: Add resource set range and size helpers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 9fb6fef0fb49124291837af1da5028f79d53f98e ]
Setting the end address for a resource with a given size lacks a helper and is therefore coded manually unlike the getter side which has a helper for resource size calculation. Also, almost all callsites that calculate the end address for a resource also set the start address right before it like this:
res->start = start_addr; res->end = res->start + size - 1;
Add resource_set_range(res, start_addr, size) that sets the start address and calculates the end address to simplify this often repeated fragment.
Also add resource_set_size() for the cases where setting the start address of the resource is not necessary but mention in its kerneldoc that resource_set_range() is preferred when setting both addresses.
Stable-dep-of: 11721c45a826 ("PCI: Use resource_set_range() that correctly sets ->end")
--- include/linux/ioport.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
include/linux/ioport.h +32 -0
@@ -216,6 +216,38 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);int adjust_resource (struct resource *res,resource_size_t start,resource_size_t size);resource_size_t resource_alignment (struct resource *res); + +/** +* resource_set_size - Calculate resource end address from size and start +* @res: Resource descriptor +* @size: Size of the resource +* +* Calculate the end address for @res based on @size. +* +* Note: The start address of @res must be set when calling this function. +* Prefer resource_set_range() if setting both the start address and @size. +*/ +static inline void resource_set_size (struct resource *res,resource_size_t size) +{ + res->end = res->start + size -1 ; +} + +/** +* resource_set_range - Set resource start and end addresses +* @res: Resource descriptor +* @start: Start address for the resource +* @size: Size of the resource +* +* Set @res start address and calculate the end address based on @size. +*/ +static inline void resource_set_range (struct resource *res, +resource_size_t start, +resource_size_t size) +{ + res->start = start; +resource_set_size (res, size); +} +static inline resource_size_t resource_size (const struct resource *res) {return res->end - res->start +1 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 33/567 PCI: Use resource_set_range() that correctly sets ->end
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 11721c45a8266a9d0c9684153d20e37159465f96 ]
__pci_read_base() sets resource start and end addresses when resource is larger than 4G but pci_bus_addr_t or resource_size_t are not capable of representing 64-bit PCI addresses. This creates a problematic resource that has non-zero flags but the start and end addresses do not yield to resource size of 0 but 1.
Replace custom resource addresses setup with resource_set_range() that correctly sets end address as -1 which results in resource_size() returning 0.
For consistency, also use resource_set_range() in the other branch that does size based resource setup.
--- drivers/pci/probe.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/probe.c +2 -4
@@ -263,8 +263,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,if ((sizeof (pci_bus_addr_t) <8 ||sizeof (resource_size_t) <8 ) && sz64 >0x100000000ULL ) { res->flags |=IORESOURCE_UNSET |IORESOURCE_DISABLED ; - res->start =0 ; - res->end =0 ; +resource_set_range (res,0 ,0 );pci_err (dev,"%s: can't handle BAR larger than 4GB (size %#010llx)\n" , res_name, (unsigned long long )sz64); goto out;
@@ -273,8 +272,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,if ((sizeof (pci_bus_addr_t) <8 ) && l) {/* Above 32-bit boundary; try to reallocate */ res->flags |=IORESOURCE_UNSET ; - res->start =0 ; - res->end = sz64 -1 ; +resource_set_range (res,0 , sz64);pci_info (dev,"%s: can't handle BAR above 4GB (bus address %#010llx)\n" , res_name, (unsigned long long )l64); goto out;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 34/567 KVM: x86: Fix KVM_GET_MSRS stack info leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit 3376ca3f1a2075eaa23c5576c47d04d7e8a4adda ]
Commit 6abe9c1386e5 ("KVM: X86: Move ignore_msrs handling upper the stack") changed the 'ignore_msrs' handling, including sanitizing return values to the caller. This was fine until commit 12bc2132b15e ("KVM:
X86: Do the same ignore_msrs check for feature msrs") which allowed non-existing feature MSRs to be ignored, i.e. to not generate an error on the ioctl() level. It even tried to preserve the sanitization of the return value. However, the logic is flawed, as '*data' will be overwritten again with the uninitialized stack value of msr.data.
Fix this by simplifying the logic and always initializing msr.data, vanishing the need for an additional error exit path.
Stable-dep-of: 5bb9ac186512 ("KVM: x86: Return "unsupported" instead of "invalid" on access to unsupported PV MSR")
--- arch/x86/kvm/x86.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/x86/kvm/x86.c +5 -10
@@ -1719,22 +1719,17 @@ static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data)struct kvm_msr_entry msr;int r; +/* Unconditionally clear the output for simplicity */ + msr.data =0 ; msr.index = index; r =kvm_get_msr_feature (&msr); -if (r ==KVM_MSR_RET_INVALID ) { -/* Unconditionally clear the output for simplicity */ - *data =0 ; -if (kvm_msr_ignored_check (index,0 , false)) - r =0 ; - } - -if (r) -return r; +if (r ==KVM_MSR_RET_INVALID &&kvm_msr_ignored_check (index,0 , false)) + r =0 ; *data = msr.data; -return 0 ; +return r; }static bool __kvm_valid_efer (struct kvm_vcpu *vcpu,u64 efer)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 35/567 KVM: x86: Rename KVM_MSR_RET_INVALID to KVM_MSR_RET_UNSUPPORTED
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit aaecae7b6a2b19a874a7df0d474f44f3a5b5a74e ]
Rename the "INVALID" internal MSR error return code to "UNSUPPORTED" to try and make it more clear that access was denied because the MSR itself is unsupported/unknown. "INVALID" is too ambiguous, as it could just as easily mean the value for WRMSR as invalid.
Avoid UNKNOWN and UNIMPLEMENTED, as the error code is used for MSRs that _are_ actually implemented by KVM, e.g. if the MSR is unsupported because an associated feature flag is not present in guest CPUID.
Opportunistically beef up the comments for the internal MSR error codes.
Stable-dep-of: 5bb9ac186512 ("KVM: x86: Return "unsupported" instead of "invalid" on access to unsupported PV MSR")
--- arch/x86/kvm/svm/svm.c | 2 +- arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/kvm/x86.c | 12 ++++++------ arch/x86/kvm/x86.h | 15 +++++++++++---- 4 files changed, 19 insertions(+), 12 deletions(-)
arch/x86/kvm/svm/svm.c +1 -1
@@ -2848,7 +2848,7 @@ static int svm_get_msr_feature(struct kvm_msr_entry *msr) msr->data |=MSR_AMD64_DE_CFG_LFENCE_SERIALIZE ;break ;default : -return KVM_MSR_RET_INVALID ; +return KVM_MSR_RET_UNSUPPORTED ; }return 0 ;
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -1981,7 +1981,7 @@ static int vmx_get_msr_feature(struct kvm_msr_entry *msr)return 1 ;return vmx_get_vmx_msr (&vmcs_config.nested, msr->index, &msr->data);default : -return KVM_MSR_RET_INVALID ; +return KVM_MSR_RET_UNSUPPORTED ; } }
arch/x86/kvm/x86.c +6 -6
@@ -1724,7 +1724,7 @@ static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data) msr.index = index; r =kvm_get_msr_feature (&msr); -if (r ==KVM_MSR_RET_INVALID &&kvm_msr_ignored_check (index,0 , false)) +if (r ==KVM_MSR_RET_UNSUPPORTED &&kvm_msr_ignored_check (index,0 , false)) r =0 ; *data = msr.data;
@@ -1917,7 +1917,7 @@ static int kvm_set_msr_ignored_check(struct kvm_vcpu *vcpu, {int ret =__kvm_set_msr (vcpu, index, data, host_initiated); -if (ret ==KVM_MSR_RET_INVALID ) +if (ret ==KVM_MSR_RET_UNSUPPORTED )if (kvm_msr_ignored_check (index, data, true)) ret =0 ;
@@ -1962,7 +1962,7 @@ static int kvm_get_msr_ignored_check(struct kvm_vcpu *vcpu, {int ret =__kvm_get_msr (vcpu, index, data, host_initiated); -if (ret ==KVM_MSR_RET_INVALID ) { +if (ret ==KVM_MSR_RET_UNSUPPORTED ) {/* Unconditionally clear *data for simplicity */ *data =0 ;if (kvm_msr_ignored_check (index,0 , false))
@@ -2031,7 +2031,7 @@ static int complete_fast_rdmsr(struct kvm_vcpu *vcpu)static u64 kvm_msr_reason (int r) {switch (r) { -case KVM_MSR_RET_INVALID : +case KVM_MSR_RET_UNSUPPORTED :return KVM_MSR_EXIT_REASON_UNKNOWN ;case KVM_MSR_RET_FILTERED :return KVM_MSR_EXIT_REASON_FILTER ;
@@ -3997,7 +3997,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) kvm_is_msr_to_save(msr))break ; -return KVM_MSR_RET_INVALID ; +return KVM_MSR_RET_UNSUPPORTED ; }return 0 ; }
@@ -4356,7 +4356,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ; } -return KVM_MSR_RET_INVALID ; +return KVM_MSR_RET_UNSUPPORTED ; }return 0 ; }
arch/x86/kvm/x86.h +11 -4
@@ -501,11 +501,18 @@ bool kvm_msr_allowed(struct kvm_vcpu *vcpu, u32 index, u32 type);/* * Internal error codes that are used to indicate that MSR emulation encountered -* an error that should result in #GP in the guest, unless userspace -* handles it. +* an error that should result in #GP in the guest, unless userspace handles it. +* Note, '1', '0', and negative numbers are off limits, as they are used by KVM +* as part of KVM's lightly documented internal KVM_RUN return codes. +* +* UNSUPPORTED - The MSR isn't supported, either because it is completely +* unknown to KVM, or because the MSR should not exist according +* to the vCPU model. +* +* FILTERED - Access to the MSR is denied by a userspace MSR filter. */ -#define KVM_MSR_RET_INVALID 2/* in-kernel MSR emulation #GP condition */ -#define KVM_MSR_RET_FILTERED 3/* #GP due to userspace MSR filter */ +#define KVM_MSR_RET_UNSUPPORTED 2 +#define KVM_MSR_RET_FILTERED 3#define __cr4_reserved_bits (__cpu_has, __c) \ ({ \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 36/567 KVM: x86: Return "unsupported" instead of "invalid" on access to unsupported PV MSR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 5bb9ac1865123356337a389af935d3913ee917ed ]
Return KVM_MSR_RET_UNSUPPORTED instead of '1' (which for all intents and purposes means "invalid") when rejecting accesses to KVM PV MSRs to adhere to KVM's ABI of allowing host reads and writes of '0' to MSRs that are advertised to userspace via KVM_GET_MSR_INDEX_LIST, even if the vCPU model doesn't support the MSR.
E.g. running a QEMU VM with
-cpu host,-kvmclock,kvm-pv-enforce-cpuid
yields:
qemu: error: failed to set MSR 0x12 to 0x0
qemu: target/i386/kvm/kvm.c:3301: kvm_buf_set_msrs:
Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed.
--- arch/x86/kvm/x86.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
arch/x86/kvm/x86.c +20 -20
@@ -3812,47 +3812,47 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ;case MSR_KVM_WALL_CLOCK_NEW :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE2 )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; vcpu->kvm->arch.wall_clock = data;kvm_write_wall_clock (vcpu->kvm, data,0 );break ;case MSR_KVM_WALL_CLOCK :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; vcpu->kvm->arch.wall_clock = data;kvm_write_wall_clock (vcpu->kvm, data,0 );break ;case MSR_KVM_SYSTEM_TIME_NEW :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE2 )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;kvm_write_system_time (vcpu, data, false, msr_info->host_initiated);break ;case MSR_KVM_SYSTEM_TIME :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;kvm_write_system_time (vcpu, data, true, msr_info->host_initiated);break ;case MSR_KVM_ASYNC_PF_EN :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;if (kvm_pv_enable_async_pf (vcpu, data))return 1 ;break ;case MSR_KVM_ASYNC_PF_INT :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF_INT )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;if (kvm_pv_enable_async_pf_int (vcpu, data))return 1 ;break ;case MSR_KVM_ASYNC_PF_ACK :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF_INT )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;if (data &0x1 ) { vcpu->arch.apf.pageready_pending = false;kvm_check_async_pf_completion (vcpu);
@@ -3860,7 +3860,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ;case MSR_KVM_STEAL_TIME :if (!guest_pv_has (vcpu,KVM_FEATURE_STEAL_TIME )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;if (unlikely (!sched_info_on ()))return 1 ;
@@ -3878,7 +3878,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ;case MSR_KVM_PV_EOI_EN :if (!guest_pv_has (vcpu,KVM_FEATURE_PV_EOI )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;if (kvm_lapic_set_pv_eoi (vcpu, data,sizeof (u8)))return 1 ;
@@ -3886,7 +3886,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_KVM_POLL_CONTROL :if (!guest_pv_has (vcpu,KVM_FEATURE_POLL_CONTROL )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ;/* only enable bit supported */ if (data & (-1ULL <<1 ))
@@ -4193,61 +4193,61 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)break ;case MSR_KVM_WALL_CLOCK :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->kvm->arch.wall_clock;break ;case MSR_KVM_WALL_CLOCK_NEW :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE2 )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->kvm->arch.wall_clock;break ;case MSR_KVM_SYSTEM_TIME :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.time;break ;case MSR_KVM_SYSTEM_TIME_NEW :if (!guest_pv_has (vcpu,KVM_FEATURE_CLOCKSOURCE2 )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.time;break ;case MSR_KVM_ASYNC_PF_EN :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.apf.msr_en_val;break ;case MSR_KVM_ASYNC_PF_INT :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF_INT )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.apf.msr_int_val;break ;case MSR_KVM_ASYNC_PF_ACK :if (!guest_pv_has (vcpu,KVM_FEATURE_ASYNC_PF_INT )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data =0 ;break ;case MSR_KVM_STEAL_TIME :if (!guest_pv_has (vcpu,KVM_FEATURE_STEAL_TIME )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.st.msr_val;break ;case MSR_KVM_PV_EOI_EN :if (!guest_pv_has (vcpu,KVM_FEATURE_PV_EOI )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.pv_eoi.msr_val;break ;case MSR_KVM_POLL_CONTROL :if (!guest_pv_has (vcpu,KVM_FEATURE_POLL_CONTROL )) -return 1 ; +return KVM_MSR_RET_UNSUPPORTED ; msr_info->data = vcpu->arch.msr_kvm_poll_control;break ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 37/567 media: tegra-video: Use accessors for pad config try_* fields
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 0623979d8352efe18f83c4fad95a2e61df17b3e7 ]
The 'try_*' fields of the v4l2_subdev_pad_config structure are meant to be accessed through helper functions. Replace direct access with usage of the v4l2_subdev_get_pad_format(), v4l2_subdev_get_pad_crop() and v4l2_subdev_get_pad_compose() helpers.
Stable-dep-of: 43e5302d2233 ("media: tegra-video: Fix memory leak in __tegra_channel_try_format()")
--- drivers/staging/media/tegra-video/vi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/staging/media/tegra-video/vi.c +8 -6
@@ -439,6 +439,7 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, .which = V4L2_SUBDEV_FORMAT_ACTIVE, .target = V4L2_SEL_TGT_CROP_BOUNDS, }; +struct v4l2_rect *try_crop;int ret; subdev =tegra_channel_get_remote_source_subdev (chan);
@@ -473,24 +474,25 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan,* Attempt to obtain the format size from subdev. * If not available, try to get crop boundary from subdev. */ + try_crop =v4l2_subdev_get_pad_crop (subdev, sd_state,0 ); fse.code = fmtinfo->code; ret =v4l2_subdev_call (subdev, pad, enum_frame_size, sd_state, &fse);if (ret) {if (!v4l2_subdev_has_op (subdev, pad, get_selection)) { - sd_state->pads->try_crop.width =0 ; - sd_state->pads->try_crop.height =0 ; + try_crop->width =0 ; + try_crop->height =0 ; }else { ret =v4l2_subdev_call (subdev, pad, get_selection,NULL , &sdsel);if (ret)return -EINVAL ; - sd_state->pads->try_crop.width = sdsel.r.width; - sd_state->pads->try_crop.height = sdsel.r.height; + try_crop->width = sdsel.r.width; + try_crop->height = sdsel.r.height; } }else { - sd_state->pads->try_crop.width = fse.max_width; - sd_state->pads->try_crop.height = fse.max_height; + try_crop->width = fse.max_width; + try_crop->height = fse.max_height; } ret =v4l2_subdev_call (subdev, pad, set_fmt, sd_state, &fmt);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 38/567 media: tegra-video: Fix memory leak in __tegra_channel_try_format()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
[ Upstream commit 43e5302d22334f1183dec3e0d5d8007eefe2817c ]
The state object allocated by __v4l2_subdev_state_alloc() must be freed with __v4l2_subdev_state_free() when it is no longer needed.
In __tegra_channel_try_format(), two error paths return directly after v4l2_subdev_call() fails, without freeing the allocated 'sd_state' object. This violates the requirement and causes a memory leak.
Fix this by introducing a cleanup label and using goto statements in the error paths to ensure that __v4l2_subdev_state_free() is always called before the function returns.
--- drivers/staging/media/tegra-video/vi.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/staging/media/tegra-video/vi.c +8 -5
@@ -440,7 +440,7 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, .target = V4L2_SEL_TGT_CROP_BOUNDS, };struct v4l2_rect *try_crop; -int ret; +int ret =0 ; subdev =tegra_channel_get_remote_source_subdev (chan);if (!subdev)
@@ -484,8 +484,10 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, }else { ret =v4l2_subdev_call (subdev, pad, get_selection,NULL , &sdsel); -if (ret) -return -EINVAL ; +if (ret) { + ret = -EINVAL ; + goto out_free; + } try_crop->width = sdsel.r.width; try_crop->height = sdsel.r.height;
@@ -497,14 +499,15 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, ret =v4l2_subdev_call (subdev, pad, set_fmt, sd_state, &fmt);if (ret <0 ) -return ret; + goto out_free;v4l2_fill_pix_format (pix, &fmt.format); chan->vi->ops->vi_fmt_align (pix, fmtinfo->bpp); +out_free:__v4l2_subdev_state_free (sd_state); -return 0 ; +return ret; } static int tegra_channel_try_format(struct file *file, void *fh,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 39/567 KVM: x86: WARN if a vCPU gets a valid wakeup that KVM cant yet inject
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 45405155d876c326da89162b8173b8cc9ab7ed75 ]
WARN if a blocking vCPU is awakened by a valid wake event that KVM can't inject, e.g. because KVM needs to complete a nested VM-enter, or needs to re-inject an exception. For the nested VM-Enter case, KVM is supposed to clear "nested_run_pending" if L1 puts L2 into HLT, i.e. entering HLT "completes" the nested VM-Enter. And for already-injected exceptions, it should be impossible for the vCPU to be in a blocking state if a VM-Exit occurred while an exception was being vectored.
Stable-dep-of: ead63640d4e7 ("KVM: x86: Ignore -EBUSY when checking nested events from vcpu_block()")
--- arch/x86/kvm/x86.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +4 -1
@@ -11003,7 +11003,10 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu)* causes a spurious wakeup from HLT). */ if (is_guest_mode (vcpu)) { -if (kvm_check_nested_events (vcpu) <0 ) +int r =kvm_check_nested_events (vcpu); + +WARN_ON_ONCE (r == -EBUSY ); +if (r <0 )return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 40/567 KVM: x86: Ignore -EBUSY when checking nested events from vcpu_block()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit ead63640d4e72e6f6d464f4e31f7fecb79af8869 ]
Ignore -EBUSY when checking nested events after exiting a blocking state while L2 is active, as exiting to userspace will generate a spurious userspace exit, usually with KVM_EXIT_UNKNOWN, and likely lead to the VM's demise. Continuing with the wakeup isn't perfect either, as *something* has gone sideways if a vCPU is awakened in L2 with an injected event (or worse, a nested run pending), but continuing on gives the VM a decent chance of surviving without any major side effects.
As explained in the Fixes commits, it _should_ be impossible for a vCPU to be put into a blocking state with an already-injected event (exception, IRQ, or NMI). Unfortunately, userspace can stuff MP_STATE and/or injected events, and thus put the vCPU into what should be an impossible state.
Don't bother trying to preserve the WARN, e.g. with an anti-syzkaller Kconfig, as WARNs can (hopefully) be added in paths where _KVM_ would be violating x86 architecture, e.g. by WARNing if KVM attempts to inject an exception or interrupt while the vCPU isn't running.
--- arch/x86/kvm/x86.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kvm/x86.c +1 -2
@@ -11005,8 +11005,7 @@ static inline int vcpu_block(struct kvm_vcpu *vcpu)if (is_guest_mode (vcpu)) {int r =kvm_check_nested_events (vcpu); -WARN_ON_ONCE (r == -EBUSY ); -if (r <0 ) +if (r <0 && r != -EBUSY )return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 41/567 drm/tegra: dsi: fix device leak on probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit bfef062695570842cf96358f2f46f4c6642c6689 ]
Make sure to drop the reference taken when looking up the companion (ganged) device and its driver data during probe().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/gpu/drm/tegra/dsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/tegra/dsi.c +2 -4
@@ -1539,11 +1539,9 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi)return -EPROBE_DEFER ; dsi->slave =platform_get_drvdata (gangster); - -if (!dsi->slave) { -put_device (&gangster->dev); +put_device (&gangster->dev); +if (!dsi->slave)return -EPROBE_DEFER ; - } dsi->slave->master = dsi; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 24/567 btrfs: fix compat mask in error messages in btrfs_check_features()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 587bb33b10bda645a1028c1737ad3992b3d7cf61 ]
Commit d7f67ac9a928 ("btrfs: relax block-group-tree feature dependency checks") introduced a regression when it comes to handling unsupported incompat or compat_ro flags. Beforehand we only printed the flags that we didn't recognize, afterwards we printed them all, which is less useful. Fix the error handling so it behaves like it used to.
--- fs/btrfs/disk-io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/btrfs/disk-io.c +3 -3
@@ -3094,7 +3094,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount)if (incompat & ~BTRFS_FEATURE_INCOMPAT_SUPP ) {btrfs_err (fs_info,"cannot mount because of unknown incompat features (0x%llx)" , - incompat); + incompat & ~BTRFS_FEATURE_INCOMPAT_SUPP );return -EINVAL ; }
@@ -3126,7 +3126,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount)if (compat_ro_unsupp && is_rw_mount) {btrfs_err (fs_info,"cannot mount read-write because of unknown compat_ro features (0x%llx)" , - compat_ro); + compat_ro_unsupp);return -EINVAL ; }
@@ -3139,7 +3139,7 @@ int btrfs_check_features(struct btrfs_fs_info *fs_info, bool is_rw_mount) !btrfs_test_opt(fs_info, NOLOGREPLAY)) {btrfs_err (fs_info,"cannot replay dirty log with unsupported compat_ro features (0x%llx), try rescue=nologreplay" , - compat_ro); + compat_ro_unsupp);return -EINVAL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 42/567 bus: omap-ocp2scp: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 854f89a5b56354ba4135e0e1f0e57ab2caee59ee ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 5eb63e9bb65d ("bus: omap-ocp2scp: fix OF populate on driver rebind")
--- drivers/bus/omap-ocp2scp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -4
@@ -84,12 +84,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)return ret; } -static int omap_ocp2scp_remove (struct platform_device *pdev) +static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev);device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); - -return 0 ; }#ifdef CONFIG_OF
@@ -103,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);static struct platform_driver omap_ocp2scp_driver = { .probe = omap_ocp2scp_probe, - .remove = omap_ocp2scp_remove, + .remove_new = omap_ocp2scp_remove, .driver = { .name ="omap-ocp2scp" , .of_match_table =of_match_ptr (omap_ocp2scp_id_table),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 43/567 bus: omap-ocp2scp: fix OF populate on driver rebind
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 5eb63e9bb65d88abde647ced50fe6ad40c11de1a ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/bus/omap-ocp2scp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -11
@@ -17,15 +17,6 @@#define OCP2SCP_TIMING 0x18#define SYNC2_MASK 0xf -static int ocp2scp_remove_devices (struct device *dev,void *c) -{ -struct platform_device *pdev =to_platform_device (dev); - -platform_device_unregister (pdev); - -return 0 ; -} -static int omap_ocp2scp_probe (struct platform_device *pdev) {int ret;
@@ -79,7 +70,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); err0: -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev);return ret; }
@@ -87,7 +78,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev); }#ifdef CONFIG_OF
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 44/567 ext4: get rid of ppath in ext4_find_extent()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 0be4c0c2f17bd10ae16c852f02d51a6a7b318aca ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
Getting rid of ppath in ext4_find_extent() requires its caller to update ppath. These ppaths will also be dropped later. No functional changes.
Stable-dep-of: 22784ca541c0 ("ext4: subdivide EXT4_EXT_DATA_VALID1")
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 55 +++++++++++++++++++++++-------------------- fs/ext4/move_extent.c | 7 +++--- 3 files changed, 34 insertions(+), 30 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -3712,7 +3712,7 @@ extern int ext4_ext_insert_extent(handle_t *, struct inode *, struct ext4_ext_path **, struct ext4_extent *, int);extern struct ext4_ext_path *ext4_find_extent (struct inode *,ext4_lblk_t , -struct ext4_ext_path **, +struct ext4_ext_path *,int flags);extern void ext4_free_ext_path (struct ext4_ext_path *);extern int ext4_ext_check_inode (struct inode *inode);
fs/ext4/extents.c +29 -26
164 lines not on this page · raw message
fs/ext4/move_extent.c +4 -3
@@ -26,16 +26,17 @@ static inline int get_ext_path(struct inode *inode, ext4_lblk_t lblock, struct ext4_ext_path **ppath) { - struct ext4_ext_path *path; + struct ext4_ext_path *path = *ppath; - path =ext4_find_extent (inode, lblock, ppath,EXT4_EX_NOCACHE ); + *ppath =NULL ; + path =ext4_find_extent (inode, lblock, path,EXT4_EX_NOCACHE );if (IS_ERR (path))return PTR_ERR (path);if (path[ext_depth (inode)].p_ext ==NULL ) {ext4_free_ext_path (path); - *ppath =NULL ;return -ENODATA ; } + *ppath = path;return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 45/567 ext4: get rid of ppath in ext4_ext_create_new_leaf()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit a000bc8678cc2bb10a5b80b4e991e77c7b4612fd ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_ext_create_new_leaf(), the following is done here:
* Free the extents path when an error is encountered.
* Its caller needs to update ppath if it uses ppath.
No functional changes.
Stable-dep-of: 22784ca541c0 ("ext4: subdivide EXT4_EXT_DATA_VALID1")
--- fs/ext4/extents.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-)
fs/ext4/extents.c +22 -21
@@ -1392,13 +1392,12 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,* finds empty index and adds new leaf. * if no free index is found, then it requests in-depth growing. */ -static int ext4_ext_create_new_leaf (handle_t *handle,struct inode *inode, -unsigned int mb_flags, -unsigned int gb_flags, -struct ext4_ext_path **ppath, -struct ext4_extent *newext) +static struct ext4_ext_path * +ext4_ext_create_new_leaf (handle_t *handle,struct inode *inode, +unsigned int mb_flags,unsigned int gb_flags, +struct ext4_ext_path *path, +struct ext4_extent *newext) { -struct ext4_ext_path *path = *ppath;struct ext4_ext_path *curp;int depth, i, err =0 ;
@@ -1419,28 +1418,25 @@ static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode,* entry: create all needed subtree and add new leaf */ err =ext4_ext_split (handle, inode, mb_flags, path, newext, i);if (err) - goto out; + goto errout;/* refill path */ path =ext4_find_extent (inode, (ext4_lblk_t )le32_to_cpu (newext->ee_block), path, gb_flags); -if (IS_ERR (path)) - err =PTR_ERR (path); +return path; }else {/* tree is full, time to grow in depth */ err =ext4_ext_grow_indepth (handle, inode, mb_flags);if (err) - goto out; + goto errout;/* refill path */ path =ext4_find_extent (inode, (ext4_lblk_t )le32_to_cpu (newext->ee_block), path, gb_flags); -if (IS_ERR (path)) { - err =PTR_ERR (path); - goto out; - } +if (IS_ERR (path)) +return path;/* * only first (depth 0 -> 1) produces free space;
@@ -1452,9 +1448,11 @@ static int ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode, goto repeat; } } -out: - *ppath =IS_ERR (path) ?NULL : path; -return err; +return path; + +errout: +ext4_free_ext_path (path); +return ERR_PTR (err); }/*
@@ -2097,11 +2095,14 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,*/ if (gb_flags &EXT4_GET_BLOCKS_METADATA_NOFAIL ) mb_flags |=EXT4_MB_USE_RESERVED ; - err =ext4_ext_create_new_leaf (handle, inode, mb_flags, gb_flags, - ppath, newext); -if (err) + path =ext4_ext_create_new_leaf (handle, inode, mb_flags, gb_flags, + path, newext); +if (IS_ERR (path)) { + *ppath =NULL ; + err =PTR_ERR (path); goto cleanup; - path = *ppath; + } + *ppath = path; depth =ext_depth (inode); eh = path[depth].p_hdr;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 46/567 ext4: get rid of ppath in ext4_ext_insert_extent()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit f7d1331f16a869c76a5102caebb58e840e1d509c ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_ext_insert_extent(), the following is done here:
* Free the extents path when an error is encountered.
* Its caller needs to update ppath if it uses ppath.
* Free path when npath is used, free npath when it is not used.
* The got_allocated_blocks label in ext4_ext_map_blocks() does not update err now, so err is updated to 0 if the err returned by ext4_ext_search_right() is greater than 0 and is about to enter got_allocated_blocks.
No functional changes.
Stable-dep-of: 22784ca541c0 ("ext4: subdivide EXT4_EXT_DATA_VALID1")
--- fs/ext4/ext4.h | 7 ++-- fs/ext4/extents.c | 88 ++++++++++++++++++++++++------------------- fs/ext4/fast_commit.c | 8 ++-- fs/ext4/migrate.c | 5 ++- 4 files changed, 61 insertions(+), 47 deletions(-)
fs/ext4/ext4.h +4 -3
@@ -3708,9 +3708,10 @@ extern int ext4_map_blocks(handle_t *handle, struct inode *inode,extern int ext4_ext_calc_credits_for_single_extent (struct inode *inode,int num,struct ext4_ext_path *path); -extern int ext4_ext_insert_extent (handle_t *,struct inode *, -struct ext4_ext_path **, -struct ext4_extent *,int ); +extern struct ext4_ext_path *ext4_ext_insert_extent ( +handle_t *handle,struct inode *inode, +struct ext4_ext_path *path, +struct ext4_extent *newext,int gb_flags);extern struct ext4_ext_path *ext4_find_extent (struct inode *,ext4_lblk_t ,struct ext4_ext_path *,int flags);
fs/ext4/extents.c +50 -38
196 lines not on this page · raw message
fs/ext4/fast_commit.c +4 -4
@@ -1806,12 +1806,12 @@ static int ext4_fc_replay_add_range(struct super_block *sb,if (ext4_ext_is_unwritten (ex))ext4_ext_mark_unwritten (&newex);down_write (&EXT4_I (inode)->i_data_sem); - ret =ext4_ext_insert_extent ( -NULL , inode, &path, &newex,0 ); + path =ext4_ext_insert_extent (NULL , inode, + path, &newex,0 );up_write ((&EXT4_I (inode)->i_data_sem)); -ext4_free_ext_path (path); -if (ret) +if (IS_ERR (path)) goto out; +ext4_free_ext_path (path); goto next; }
fs/ext4/migrate.c +3 -2
@@ -37,7 +37,6 @@ static int finish_range(handle_t *handle, struct inode *inode, path =ext4_find_extent (inode, lb->first_block,NULL ,0 );if (IS_ERR (path)) { retval =PTR_ERR (path); - path =NULL ; goto err_out; }
@@ -53,7 +52,9 @@ static int finish_range(handle_t *handle, struct inode *inode, retval =ext4_datasem_ensure_credits (handle, inode, needed, needed,0 );if (retval <0 ) goto err_out; - retval =ext4_ext_insert_extent (handle, inode, &path, &newext,0 ); + path =ext4_ext_insert_extent (handle, inode, path, &newext,0 ); +if (IS_ERR (path)) + retval =PTR_ERR (path); err_out:up_write ((&EXT4_I (inode)->i_data_sem));ext4_free_ext_path (path);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 25/567 bpf: Fix stack-out-of-bounds write in devmap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit b7bf516c3ecd9a2aae2dc2635178ab87b734fef1 ]
get_upper_ifindexes() iterates over all upper devices and writes their indices into an array without checking bounds.
Also the callers assume that the max number of upper devices is MAX_NEST_DEV and allocate excluded_devices[1+MAX_NEST_DEV] on the stack, but that assumption is not correct and the number of upper devices could be larger than MAX_NEST_DEV (e.g., many macvlans), causing a stack-out-of-bounds write.
Add a max parameter to get_upper_ifindexes() to avoid the issue. When there are too many upper devices, return -EOVERFLOW and abort the redirect.
To reproduce, create more than MAX_NEST_DEV(8) macvlans on a device with an XDP program attached using BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS. Then send a packet to the device to trigger the XDP redirect path.
--- kernel/bpf/devmap.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
kernel/bpf/devmap.c +17 -5
@@ -577,18 +577,22 @@ static inline bool is_ifindex_excluded(int *excluded, int num_excluded, int ifin }/* Get ifindex of each upper device. 'indexes' must be able to hold at -* least MAX_NEST_DEV elements. -* Returns the number of ifindexes added. +* least 'max' elements. +* Returns the number of ifindexes added, or -EOVERFLOW if there are too +* many upper devices. */ -static int get_upper_ifindexes (struct net_device *dev,int *indexes) +static int get_upper_ifindexes (struct net_device *dev,int *indexes,int max) {struct net_device *upper;struct list_head *iter;int n =0 ;netdev_for_each_upper_dev_rcu (dev, upper, iter) { +if (n >= max) +return -EOVERFLOW ; indexes[n++] = upper->ifindex; } +return n; }
@@ -604,7 +608,11 @@ int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,int err;if (exclude_ingress) { - num_excluded =get_upper_ifindexes (dev_rx, excluded_devices); + num_excluded =get_upper_ifindexes (dev_rx, excluded_devices, +ARRAY_SIZE (excluded_devices) -1 ); +if (num_excluded <0 ) +return num_excluded; + excluded_devices[num_excluded++] = dev_rx->ifindex; }
@@ -722,7 +730,11 @@ int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,int err;if (exclude_ingress) { - num_excluded =get_upper_ifindexes (dev, excluded_devices); + num_excluded =get_upper_ifindexes (dev, excluded_devices, +ARRAY_SIZE (excluded_devices) -1 ); +if (num_excluded <0 ) +return num_excluded; + excluded_devices[num_excluded++] = dev->ifindex; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 26/567 PCI: Correct PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
[ Upstream commit 39195990e4c093c9eecf88f29811c6de29265214 ]
fb82437fdd8c ("PCI: Change capability register offsets to hex") incorrectly converted the PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 value from decimal 52 to hex 0x32:
-#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52 /* v2 endpoints with link end here */
+#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x32 /* end of v2 EPs w/ link */
This broke PCI capabilities in a VMM because subsequent ones weren't DWORD-aligned.
Change PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 to the correct value of 0x34.
fb82437fdd8c was from Baruch Siach <[email protected]>, but this was not Baruch's fault; it's a mistake I made when applying the patch.
--- include/uapi/linux/pci_regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/pci_regs.h +1 -1
@@ -694,7 +694,7 @@#define PCI_EXP_LNKCTL2_HASD 0x0020/* HW Autonomous Speed Disable */ #define PCI_EXP_LNKSTA2 0x32/* Link Status 2 */ #define PCI_EXP_LNKSTA2_FLIT 0x0400/* Flit Mode Status */ -#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x32/* end of v2 EPs w/ link */ +#define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 0x34/* end of v2 EPs w/ link */ #define PCI_EXP_SLTCAP2 0x34/* Slot Capabilities 2 */ #define PCI_EXP_SLTCAP2_IBPD 0x00000001/* In-band PD Disable Supported */ #define PCI_EXP_SLTCTL2 0x38/* Slot Control 2 */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 27/567 memory: mtk-smi: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 08c1aeaa45ce0fd18912e92c6705586c8aa5240f ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 6cfa038bddd7 ("memory: mtk-smi: fix device leaks on common probe")
--- drivers/memory/mtk-smi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/memory/mtk-smi.c +4 -6
@@ -566,14 +566,13 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)return ret; } -static int mtk_smi_larb_remove (struct platform_device *pdev) +static void mtk_smi_larb_remove (struct platform_device *pdev) {struct mtk_smi_larb *larb =platform_get_drvdata (pdev);device_link_remove (&pdev->dev, larb->smi_common_dev);pm_runtime_disable (&pdev->dev);component_del (&pdev->dev, &mtk_smi_larb_component_ops); -return 0 ; }static int __maybe_unused mtk_smi_larb_resume (struct device *dev)
@@ -616,7 +615,7 @@ static const struct dev_pm_ops smi_larb_pm_ops = {static struct platform_driver mtk_smi_larb_driver = { .probe = mtk_smi_larb_probe, - .remove = mtk_smi_larb_remove, + .remove_new = mtk_smi_larb_remove, .driver = { .name ="mtk-smi-larb" , .of_match_table = mtk_smi_larb_of_ids,
@@ -795,14 +794,13 @@ static int mtk_smi_common_probe(struct platform_device *pdev)return 0 ; } -static int mtk_smi_common_remove (struct platform_device *pdev) +static void mtk_smi_common_remove (struct platform_device *pdev) {struct mtk_smi *common =dev_get_drvdata (&pdev->dev);if (common->plat->type ==MTK_SMI_GEN2_SUB_COMM )device_link_remove (&pdev->dev, common->smi_common_dev);pm_runtime_disable (&pdev->dev); -return 0 ; }static int __maybe_unused mtk_smi_common_resume (struct device *dev)
@@ -842,7 +840,7 @@ static const struct dev_pm_ops smi_common_pm_ops = {static struct platform_driver mtk_smi_common_driver = { .probe = mtk_smi_common_probe, - .remove = mtk_smi_common_remove, + .remove_new = mtk_smi_common_remove, .driver = { .name ="mtk-smi-common" , .of_match_table = mtk_smi_common_of_ids,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 28/567 memory: mtk-smi: fix device leaks on common probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 6cfa038bddd710f544076ea2ef7792fc82fbedd6 ]
Make sure to drop the reference taken when looking up the SMI device during common probe on late probe failure (e.g. probe deferral) and on driver unbind.
--- drivers/memory/mtk-smi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/memory/mtk-smi.c +2 -0
@@ -563,6 +563,7 @@ static int mtk_smi_larb_probe(struct platform_device *pdev) err_pm_disable:pm_runtime_disable (dev);device_link_remove (dev, larb->smi_common_dev); +put_device (larb->smi_common_dev);return ret; }
@@ -801,6 +802,7 @@ static void mtk_smi_common_remove(struct platform_device *pdev)if (common->plat->type ==MTK_SMI_GEN2_SUB_COMM )device_link_remove (&pdev->dev, common->smi_common_dev);pm_runtime_disable (&pdev->dev); +put_device (common->smi_common_dev); }static int __maybe_unused mtk_smi_common_resume (struct device *dev)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 29/567 memory: mtk-smi: fix device leak on larb probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 9dae65913b32d05dbc8ff4b8a6bf04a0e49a8eb6 ]
Make sure to drop the reference taken when looking up the SMI device during larb probe on late probe failure (e.g. probe deferral) and on driver unbind.
--- drivers/memory/mtk-smi.c | 1 + 1 file changed, 1 insertion(+)
drivers/memory/mtk-smi.c +1 -0
@@ -574,6 +574,7 @@ static void mtk_smi_larb_remove(struct platform_device *pdev)device_link_remove (&pdev->dev, larb->smi_common_dev);pm_runtime_disable (&pdev->dev);component_del (&pdev->dev, &mtk_smi_larb_component_ops); +put_device (larb->smi_common_dev); }static int __maybe_unused mtk_smi_larb_resume (struct device *dev)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 30/567 PCI: Update BAR # and window messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puranjay Mohan <[email protected]>
[ Upstream commit 65f8e0beac5a495b8f3b387add1f9f4470678cb5 ]
The PCI log messages print the register offsets at some places and BAR numbers at other places. There is no uniformity in this logging mechanism. It would be better to print names than register offsets.
Add a helper function that aids in printing more meaningful information about the BAR numbers like "VF BAR", "ROM", "bridge window", etc. This function can be called while printing PCI log messages.
[bhelgaas: fold in Lukas' static array suggestion from
https: //lore.kernel.org/all/[email protected]/]
Stable-dep-of: 11721c45a826 ("PCI: Use resource_set_range() that correctly sets ->end")
--- drivers/pci/pci.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 2 ++ 2 files changed, 62 insertions(+)
drivers/pci/pci.c +60 -0
@@ -850,6 +850,66 @@ struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res) }EXPORT_SYMBOL (pci_find_resource); +/** +* pci_resource_name - Return the name of the PCI resource +* @dev: PCI device to query +* @i: index of the resource +* +* Return the standard PCI resource (BAR) name according to their index. +*/ +const char *pci_resource_name (struct pci_dev *dev,unsigned int i) +{ +static const char *const bar_name[] = { +"BAR 0" , +"BAR 1" , +"BAR 2" , +"BAR 3" , +"BAR 4" , +"BAR 5" , +"ROM" , +#ifdef CONFIG_PCI_IOV +"VF BAR 0" , +"VF BAR 1" , +"VF BAR 2" , +"VF BAR 3" , +"VF BAR 4" , +"VF BAR 5" , +#endif +"bridge window" ,/* "io" included in %pR */ +"bridge window" ,/* "mem" included in %pR */ +"bridge window" ,/* "mem pref" included in %pR */ + }; +static const char *const cardbus_name[] = { +"BAR 1" , +"unknown" , +"unknown" , +"unknown" , +"unknown" , +"unknown" , +#ifdef CONFIG_PCI_IOV +"unknown" , +"unknown" , +"unknown" , +"unknown" , +"unknown" , +"unknown" , +#endif +"CardBus bridge window 0" ,/* I/O */ +"CardBus bridge window 1" ,/* I/O */ +"CardBus bridge window 0" ,/* mem */ +"CardBus bridge window 1" ,/* mem */ + }; + +if (dev->hdr_type ==PCI_HEADER_TYPE_CARDBUS && + i <ARRAY_SIZE (cardbus_name)) +return cardbus_name[i]; + +if (i <ARRAY_SIZE (bar_name)) +return bar_name[i]; + +return "unknown" ; +} +/** * pci_wait_for_pending - wait for @mask bit(s) to clear in status word @pos * @dev: the PCI device to operate on
drivers/pci/pci.h +2 -0
@@ -281,6 +281,8 @@ void __pci_bus_assign_resources(const struct pci_bus *bus, struct list_head *fail_head);bool pci_bus_clip_resource (struct pci_dev *dev,int idx); +const char *pci_resource_name (struct pci_dev *dev,unsigned int i); +void pci_reassigndev_resource_alignment (struct pci_dev *dev);void pci_disable_bridge_window (struct pci_dev *dev);struct pci_bus *pci_bus_get (struct pci_bus *bus);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 31/567 PCI: Use resource names in PCI log messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Puranjay Mohan <[email protected]>
[ Upstream commit dc4e6f21c3f844ebc1c52b6920b8ec5dfc73f4e8 ]
Use the pci_resource_name() to get the name of the resource and use it while printing log messages.
[bhelgaas: rename to match struct resource * names, also use names in other BAR messages]
Stable-dep-of: 11721c45a826 ("PCI: Use resource_set_range() that correctly sets ->end")
--- drivers/pci/iov.c | 7 ++-- drivers/pci/pci.c | 25 +++++++------- drivers/pci/probe.c | 26 +++++++-------- drivers/pci/quirks.c | 15 ++++++--- drivers/pci/setup-bus.c | 30 +++++++++++------ drivers/pci/setup-res.c | 72 +++++++++++++++++++++++------------------ 6 files changed, 103 insertions(+), 72 deletions(-)
drivers/pci/iov.c +5 -2
@@ -749,6 +749,7 @@ static int sriov_init(struct pci_dev *dev, int pos)u16 ctrl, total;struct pci_sriov *iov;struct resource *res; +const char *res_name;struct pci_dev *pdev;pci_read_config_word (dev, pos +PCI_SRIOV_CTRL , &ctrl);
@@ -789,6 +790,8 @@ static int sriov_init(struct pci_dev *dev, int pos) nres =0 ;for (i =0 ; i <PCI_SRIOV_NUM_BARS ; i++) { res = &dev->resource[i +PCI_IOV_RESOURCES ]; + res_name =pci_resource_name (dev, i +PCI_IOV_RESOURCES ); +/* * If it is already FIXED, don't change it, something * (perhaps EA or header fixups) wants it this way.
@@ -806,8 +809,8 @@ static int sriov_init(struct pci_dev *dev, int pos) } iov->barsz[i] =resource_size (res); res->end = res->start +resource_size (res) * total -1 ; -pci_info (dev,"VF(n) BAR%d space: %pR (contains BAR%d for %d VFs)\n" , - i, res, i, total); +pci_info (dev,"%s %pR: contains BAR %d for %d VFs\n" , + res_name, res, i, total); i += bar64; nres++; }
drivers/pci/pci.c +14 -11
@@ -3419,6 +3419,7 @@ static struct resource *pci_ea_get_resource(struct pci_dev *dev, u8 bei,static int pci_ea_read (struct pci_dev *dev,int offset) {struct resource *res; +const char *res_name;int ent_size, ent_offset = offset;resource_size_t start, end;unsigned long flags;
@@ -3448,6 +3449,7 @@ static int pci_ea_read(struct pci_dev *dev, int offset) goto out; res =pci_ea_get_resource (dev, bei, prop); + res_name =pci_resource_name (dev, bei);if (!res) {pci_err (dev,"Unsupported EA entry BEI: %u\n" , bei); goto out;
@@ -3521,16 +3523,16 @@ static int pci_ea_read(struct pci_dev *dev, int offset) res->flags = flags;if (bei <=PCI_EA_BEI_BAR5 ) -pci_info (dev,"BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n" , - bei, res, prop); +pci_info (dev,"%s %pR: from Enhanced Allocation, properties %#02x\n" , + res_name, res, prop);else if (bei ==PCI_EA_BEI_ROM ) -pci_info (dev,"ROM: %pR (from Enhanced Allocation, properties %#02x)\n" , - res, prop); +pci_info (dev,"%s %pR: from Enhanced Allocation, properties %#02x\n" , + res_name, res, prop);else if (bei >=PCI_EA_BEI_VF_BAR0 && bei <=PCI_EA_BEI_VF_BAR5 ) -pci_info (dev,"VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n" , - bei -PCI_EA_BEI_VF_BAR0 , res, prop); +pci_info (dev,"%s %pR: from Enhanced Allocation, properties %#02x\n" , + res_name, res, prop);else -pci_info (dev,"BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n" , +pci_info (dev,"BEI %d %pR: from Enhanced Allocation, properties %#02x\n" , bei, res, prop); out:
@@ -6840,14 +6842,15 @@ static void pci_request_resource_alignment(struct pci_dev *dev, int bar, resource_size_t align, bool resize) {struct resource *r = &dev->resource[bar]; +const char *r_name =pci_resource_name (dev, bar);resource_size_t size;if (!(r->flags &IORESOURCE_MEM ))return ;if (r->flags &IORESOURCE_PCI_FIXED ) { -pci_info (dev,"BAR%d %pR: ignoring requested alignment %#llx\n" , - bar, r, (unsigned long long )align); +pci_info (dev,"%s %pR: ignoring requested alignment %#llx\n" , + r_name, r, (unsigned long long )align);return ; }
@@ -6883,8 +6886,8 @@ static void pci_request_resource_alignment(struct pci_dev *dev, int bar,* devices and we use the second. */ -pci_info (dev,"BAR%d %pR: requesting alignment to %#llx\n" , - bar, r, (unsigned long long )align); +pci_info (dev,"%s %pR: requesting alignment to %#llx\n" , + r_name, r, (unsigned long long )align);if (resize) { r->start =0 ;
drivers/pci/probe.c +13 -13
@@ -180,6 +180,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,u64 l64, sz64, mask64;u16 orig_cmd;struct pci_bus_region region, inverted_region; +const char *res_name =pci_resource_name (dev, res - dev->resource); mask = type ?PCI_ROM_ADDRESS_MASK : ~0 ;
@@ -254,8 +255,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, sz64 =pci_size (l64, sz64, mask64);if (!sz64) { -pci_info (dev,FW_BUG "reg 0x%x: invalid BAR (can't size)\n" , - pos); +pci_info (dev,FW_BUG "%s: invalid; can't size\n" , res_name); goto fail; }
@@ -265,8 +265,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->flags |=IORESOURCE_UNSET |IORESOURCE_DISABLED ; res->start =0 ; res->end =0 ; -pci_err (dev,"reg 0x%x: can't handle BAR larger than 4GB (size %#010llx)\n" , - pos, (unsigned long long )sz64); +pci_err (dev,"%s: can't handle BAR larger than 4GB (size %#010llx)\n" , + res_name, (unsigned long long )sz64); goto out; }
@@ -275,8 +275,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->flags |=IORESOURCE_UNSET ; res->start =0 ; res->end = sz64 -1 ; -pci_info (dev,"reg 0x%x: can't handle BAR above 4GB (bus address %#010llx)\n" , - pos, (unsigned long long )l64); +pci_info (dev,"%s: can't handle BAR above 4GB (bus address %#010llx)\n" , + res_name, (unsigned long long )l64); goto out; } }
@@ -302,8 +302,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->flags |=IORESOURCE_UNSET ; res->start =0 ; res->end = region.end - region.start; -pci_info (dev,"reg 0x%x: initial BAR value %#010llx invalid\n" , - pos, (unsigned long long )region.start); +pci_info (dev,"%s: initial BAR value %#010llx invalid\n" , + res_name, (unsigned long long )region.start); } goto out;
@@ -313,7 +313,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->flags =0 ; out:if (res->flags) -pci_info (dev,"reg 0x%x: %pR\n" , pos, res); +pci_info (dev,"%s %pR\n" , res_name, res);return (res->flags &IORESOURCE_MEM_64 ) ?1 :0 ; }
@@ -1968,14 +1968,14 @@ int pci_setup_device(struct pci_dev *dev) res = &dev->resource[0 ]; res->flags =LEGACY_IO_RESOURCE ;pcibios_bus_to_resource (dev->bus, res, ®ion); -pci_info (dev,"legacy IDE quirk: reg 0x10: %pR\n" , +pci_info (dev,"BAR 0 %pR: legacy IDE quirk\n" , res); region.start =0x3F6 ; region.end =0x3F6 ; res = &dev->resource[1 ]; res->flags =LEGACY_IO_RESOURCE ;pcibios_bus_to_resource (dev->bus, res, ®ion); -pci_info (dev,"legacy IDE quirk: reg 0x14: %pR\n" , +pci_info (dev,"BAR 1 %pR: legacy IDE quirk\n" , res); }if ((progif &4 ) ==0 ) {
@@ -1984,14 +1984,14 @@ int pci_setup_device(struct pci_dev *dev) res = &dev->resource[2 ]; res->flags =LEGACY_IO_RESOURCE ;pcibios_bus_to_resource (dev->bus, res, ®ion); -pci_info (dev,"legacy IDE quirk: reg 0x18: %pR\n" , +pci_info (dev,"BAR 2 %pR: legacy IDE quirk\n" , res); region.start =0x376 ; region.end =0x376 ; res = &dev->resource[3 ]; res->flags =LEGACY_IO_RESOURCE ;pcibios_bus_to_resource (dev->bus, res, ®ion); -pci_info (dev,"legacy IDE quirk: reg 0x1c: %pR\n" , +pci_info (dev,"BAR 3 %pR: legacy IDE quirk\n" , res); } }
drivers/pci/quirks.c +11 -4
@@ -583,13 +583,14 @@ static void quirk_extend_bar_to_page(struct pci_dev *dev)for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {struct resource *r = &dev->resource[i]; +const char *r_name =pci_resource_name (dev, i);if (r->flags &IORESOURCE_MEM &&resource_size (r) <PAGE_SIZE ) { r->end =PAGE_SIZE -1 ; r->start =0 ; r->flags |=IORESOURCE_UNSET ; -pci_info (dev,"expanded BAR %d to page size: %pR\n" , - i, r); +pci_info (dev,"%s %pR: expanded to page size\n" , + r_name, r); } } }
@@ -618,6 +619,7 @@ static void quirk_io(struct pci_dev *dev, int pos, unsigned int size,u32 region;struct pci_bus_region bus_region;struct resource *res = dev->resource + pos; +const char *res_name =pci_resource_name (dev, pos);pci_read_config_dword (dev,PCI_BASE_ADDRESS_0 + (pos <<2 ), ®ion);
@@ -635,8 +637,7 @@ static void quirk_io(struct pci_dev *dev, int pos, unsigned int size, bus_region.end = region + size -1 ;pcibios_bus_to_resource (dev->bus, res, &bus_region); -pci_info (dev,FW_BUG "%s quirk: reg 0x%x: %pR\n" , - name,PCI_BASE_ADDRESS_0 + (pos <<2 ), res); +pci_info (dev,FW_BUG "%s %pR: %s quirk\n" , res_name, res, name); }/*
@@ -683,6 +684,12 @@ static void quirk_io_region(struct pci_dev *dev, int port, bus_region.end = region + size -1 ;pcibios_bus_to_resource (dev->bus, res, &bus_region); +/* +* "res" is typically a bridge window resource that's not being +* used for a bridge window, so it's just a place to stash this +* non-standard resource. Printing "nr" or pci_resource_name() of +* it doesn't really make sense. +*/ if (!pci_claim_resource (dev, nr))pci_info (dev,"quirk: %pR claimed by %s\n" , res, name); }
drivers/pci/setup-bus.c +20 -10
@@ -213,6 +213,7 @@ static void reassign_resources_sorted(struct list_head *realloc_head, struct list_head *head) {struct resource *res; +const char *res_name;struct pci_dev_resource *add_res, *tmp;struct pci_dev_resource *dev_res;resource_size_t add_size, align;
@@ -222,6 +223,7 @@ static void reassign_resources_sorted(struct list_head *realloc_head,bool found_match = false; res = add_res->res; +/* Skip resource that has been reset */ if (!res->flags) goto out;
@@ -237,6 +239,7 @@ static void reassign_resources_sorted(struct list_head *realloc_head,continue ; idx = res - &add_res->dev->resource[0 ]; + res_name =pci_resource_name (add_res->dev, idx); add_size = add_res->add_size; align = add_res->min_align;if (!resource_size (res)) {
@@ -249,9 +252,9 @@ static void reassign_resources_sorted(struct list_head *realloc_head, (IORESOURCE_STARTALIGN |IORESOURCE_SIZEALIGN );if (pci_reassign_resource (add_res->dev, idx, add_size, align)) -pci_info (add_res->dev,"failed to add %llx res[%d]=%pR\n" , - (unsigned long long ) add_size, idx, - res); +pci_info (add_res->dev,"%s %pR: failed to add %llx\n" , + res_name, res, + (unsigned long long ) add_size); } out:list_del (&add_res->list);
@@ -571,6 +574,7 @@ EXPORT_SYMBOL(pci_setup_cardbus);static void pci_setup_bridge_io (struct pci_dev *bridge) {struct resource *res; +const char *res_name;struct pci_bus_region region;unsigned long io_mask;u8 io_base_lo, io_limit_lo;
@@ -583,6 +587,7 @@ static void pci_setup_bridge_io(struct pci_dev *bridge)/* Set up the top and bottom of the PCI I/O segment for this bus */ res = &bridge->resource[PCI_BRIDGE_IO_WINDOW ]; + res_name =pci_resource_name (bridge,PCI_BRIDGE_IO_WINDOW );pcibios_resource_to_bus (bridge->bus, ®ion, res);if (res->flags &IORESOURCE_IO ) {pci_read_config_word (bridge,PCI_IO_BASE , &l);
@@ -591,7 +596,7 @@ static void pci_setup_bridge_io(struct pci_dev *bridge) l = ((u16 ) io_limit_lo <<8 ) | io_base_lo;/* Set up upper 16 bits of I/O base/limit */ io_upper16 = (region.end &0xffff0000 ) | (region.start >>16 ); -pci_info (bridge," bridge window %pR\n" , res); +pci_info (bridge," %s %pR\n" , res_name, res); }else {/* Clear upper 16 bits of I/O base/limit */ io_upper16 =0 ;
@@ -608,16 +613,18 @@ static void pci_setup_bridge_io(struct pci_dev *bridge)static void pci_setup_bridge_mmio (struct pci_dev *bridge) {struct resource *res; +const char *res_name;struct pci_bus_region region;u32 l;/* Set up the top and bottom of the PCI Memory segment for this bus */ res = &bridge->resource[PCI_BRIDGE_MEM_WINDOW ]; + res_name =pci_resource_name (bridge,PCI_BRIDGE_MEM_WINDOW );pcibios_resource_to_bus (bridge->bus, ®ion, res);if (res->flags &IORESOURCE_MEM ) { l = (region.start >>16 ) &0xfff0 ; l |= region.end &0xfff00000 ; -pci_info (bridge," bridge window %pR\n" , res); +pci_info (bridge," %s %pR\n" , res_name, res); }else { l =0x0000fff0 ; }
@@ -627,6 +634,7 @@ static void pci_setup_bridge_mmio(struct pci_dev *bridge)static void pci_setup_bridge_mmio_pref (struct pci_dev *bridge) {struct resource *res; +const char *res_name;struct pci_bus_region region;u32 l, bu, lu;
@@ -640,6 +648,7 @@ static void pci_setup_bridge_mmio_pref(struct pci_dev *bridge)/* Set up PREF base/limit */ bu = lu =0 ; res = &bridge->resource[PCI_BRIDGE_PREF_MEM_WINDOW ]; + res_name =pci_resource_name (bridge,PCI_BRIDGE_PREF_MEM_WINDOW );pcibios_resource_to_bus (bridge->bus, ®ion, res);if (res->flags &IORESOURCE_PREFETCH ) { l = (region.start >>16 ) &0xfff0 ;
@@ -648,7 +657,7 @@ static void pci_setup_bridge_mmio_pref(struct pci_dev *bridge) bu =upper_32_bits (region.start); lu =upper_32_bits (region.end); } -pci_info (bridge," bridge window %pR\n" , res); +pci_info (bridge," %s %pR\n" , res_name, res); }else { l =0x0000fff0 ; }
@@ -1009,6 +1018,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,int i;pci_dev_for_each_resource (dev, r, i) { +const char *r_name =pci_resource_name (dev, i);resource_size_t r_size; if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
@@ -1039,8 +1049,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,if (order <0 ) order =0 ;if (order >=ARRAY_SIZE (aligns)) { -pci_warn (dev,"disabling BAR %d: %pR (bad alignment %#llx)\n" , - i, r, (unsigned long long ) align); +pci_warn (dev,"%s %pR: disabling; bad alignment %#llx\n" , + r_name, r, (unsigned long long ) align); r->flags =0 ;continue ; }
@@ -2230,6 +2240,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)for (i =PCI_BRIDGE_RESOURCES ; i <PCI_BRIDGE_RESOURCE_END ; i++) {struct resource *res = &bridge->resource[i]; +const char *res_name =pci_resource_name (bridge, i);if ((res->flags ^ type) &PCI_RES_TYPE_MASK )continue ;
@@ -2242,8 +2253,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)if (ret) goto cleanup; -pci_info (bridge,"BAR %d: releasing %pR\n" , - i, res); +pci_info (bridge,"%s %pR: releasing\n" , res_name, res);if (res->parent)release_resource (res);
drivers/pci/setup-res.c +40 -32
206 lines not on this page · raw message
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 22/567 btrfs: fix objectid value in error message in check_extent_data_ref()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit a10172780526c2002e062102ad4f2aabac495889 ]
Fix a copy-paste error in check_extent_data_ref(): we're printing root as in the message above, we should be printing objectid.
--- fs/btrfs/tree-checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/tree-checker.c +1 -1
@@ -1673,7 +1673,7 @@ static int check_extent_data_ref(struct extent_buffer *leaf, objectid > BTRFS_LAST_FREE_OBJECTID)) {extent_err (leaf, slot,"invalid extent data backref objectid value %llu" , - root); + objectid);return -EUCLEAN ; }if (unlikely (!IS_ALIGNED (offset, leaf->fs_info->sectorsize))) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 48/567 ext4: subdivide EXT4_EXT_DATA_VALID1
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 22784ca541c0f01c5ebad14e8228298dc0a390ed ]
When splitting an extent, if the EXT4_GET_BLOCKS_CONVERT flag is set and it is necessary to split the target extent in the middle, ext4_split_extent() first handles splitting the latter half of the extent and passes the EXT4_EXT_DATA_VALID1 flag. This flag implies that all blocks before the split point contain valid data; however, this assumption is incorrect.
Therefore, subdivid EXT4_EXT_DATA_VALID1 into EXT4_EXT_DATA_ENTIRE_VALID1 and EXT4_EXT_DATA_PARTIAL_VALID1, which indicate that the first half of the extent is either entirely valid or only partially valid, respectively. These two flags cannot be set simultaneously.
This patch does not use EXT4_EXT_DATA_PARTIAL_VALID1, it only replaces EXT4_EXT_DATA_VALID1 with EXT4_EXT_DATA_ENTIRE_VALID1 at the location where it is set, no logical changes.
Message-ID: <[email protected]>
--- fs/ext4/extents.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
fs/ext4/extents.c +12 -6
@@ -43,8 +43,13 @@#define EXT4_EXT_MARK_UNWRIT1 0x2/* mark first half unwritten */ #define EXT4_EXT_MARK_UNWRIT2 0x4/* mark second half unwritten */ -#define EXT4_EXT_DATA_VALID1 0x8/* first half contains valid data */ -#define EXT4_EXT_DATA_VALID2 0x10/* second half contains valid data */ +/* first half contains valid data */ +#define EXT4_EXT_DATA_ENTIRE_VALID1 0x8/* has entirely valid data */ +#define EXT4_EXT_DATA_PARTIAL_VALID1 0x10/* has partially valid data */ +#define EXT4_EXT_DATA_VALID1 (EXT4_EXT_DATA_ENTIRE_VALID1 | \ + EXT4_EXT_DATA_PARTIAL_VALID1) + +#define EXT4_EXT_DATA_VALID2 0x20/* second half contains valid data */ static __le32 ext4_extent_block_csum (struct inode *inode,struct ext4_extent_header *eh)
@@ -3173,8 +3178,9 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,unsigned int ee_len, depth;int err =0 ; -BUG_ON ((split_flag & (EXT4_EXT_DATA_VALID1 |EXT4_EXT_DATA_VALID2 )) == - (EXT4_EXT_DATA_VALID1 |EXT4_EXT_DATA_VALID2 )); +BUG_ON ((split_flag &EXT4_EXT_DATA_VALID1 ) ==EXT4_EXT_DATA_VALID1 ); +BUG_ON ((split_flag &EXT4_EXT_DATA_VALID1 ) && + (split_flag &EXT4_EXT_DATA_VALID2 ));/* Do not cache extents that are in the process of being modified. */ flags |=EXT4_EX_NOCACHE ;
@@ -3365,7 +3371,7 @@ static int ext4_split_extent(handle_t *handle, split_flag1 |=EXT4_EXT_MARK_UNWRIT1 |EXT4_EXT_MARK_UNWRIT2 ;if (split_flag &EXT4_EXT_DATA_VALID2 ) - split_flag1 |=EXT4_EXT_DATA_VALID1 ; + split_flag1 |=EXT4_EXT_DATA_ENTIRE_VALID1 ; path =ext4_split_extent_at (handle, inode, path, map->m_lblk + map->m_len, split_flag1, flags1);if (IS_ERR (path)) {
@@ -3728,7 +3734,7 @@ static int ext4_split_convert_extents(handle_t *handle,/* Convert to unwritten */ if (flags &EXT4_GET_BLOCKS_CONVERT_UNWRITTEN ) { - split_flag |=EXT4_EXT_DATA_VALID1 ; + split_flag |=EXT4_EXT_DATA_ENTIRE_VALID1 ;/* Convert to initialized */ }else if (flags &EXT4_GET_BLOCKS_CONVERT ) { split_flag |= ee_block + ee_len <= eof_block ?
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 57/567 ext4: drop extent cache after doing PARTIAL_VALID1 zeroout
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 6d882ea3b0931b43530d44149b79fcd4ffc13030 ]
When splitting an unwritten extent in the middle and converting it to initialized in ext4_split_extent() with the EXT4_EXT_MAY_ZEROOUT and EXT4_EXT_DATA_VALID2 flags set, it could leave a stale unwritten extent.
Assume we have an unwritten file and buffered write in the middle of it without dioread_nolock enabled, it will allocate blocks as written extent.
0 A B N
[UUUUUUUUUUUU] on-disk extent U: unwritten extent
[UUUUUUUUUUUU] extent status tree
[--DDDDDDDD--] D: valid data
|<- ->| ----> this range needs to be initialized
ext4_split_extent() first try to split this extent at B with EXT4_EXT_DATA_PARTIAL_VALID1 and EXT4_EXT_MAY_ZEROOUT flag set, but ext4_split_extent_at() failed to split this extent due to temporary lack of space. It zeroout B to N and leave the entire extent as unwritten.
0 A B N
[UUUUUUUUUUUU] on-disk extent
[UUUUUUUUUUUU] extent status tree
[--DDDDDDDDZZ] Z: zeroed data
ext4_split_extent() then try to split this extent at A with EXT4_EXT_DATA_VALID2 flag set. This time, it split successfully and leave an written extent from A to N.
0 A B N
[UUWWWWWWWWWW] on-disk extent W: written extent
[UUUUUUUUUUUU] extent status tree
[--DDDDDDDDZZ]
Finally ext4_map_create_blocks() only insert extent A to B to the extent status tree, and leave an stale unwritten extent in the status tree.
0 A B N
[UUWWWWWWWWWW] on-disk extent W: written extent
[UUWWWWWWWWUU] extent status tree
[--DDDDDDDDZZ]
Fix this issue by always cached extent status entry after zeroing out the second part.
Message-ID: <[email protected]>
--- fs/ext4/extents.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/ext4/extents.c +9 -1
@@ -3302,8 +3302,16 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,* extent length and ext4_split_extent() split will the * first half again. */ -if (split_flag &EXT4_EXT_DATA_PARTIAL_VALID1 ) +if (split_flag &EXT4_EXT_DATA_PARTIAL_VALID1 ) { +/* +* Drop extent cache to prevent stale unwritten +* extents remaining after zeroing out. +*/ +ext4_es_remove_extent (inode, +le32_to_cpu (zero_ex.ee_block), +ext4_ext_get_actual_len (&zero_ex)); goto fix_extent_len; + }/* update the extent length and mark as initialized */ ex->ee_len =cpu_to_le16 (ee_len);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 58/567 ext4: drop extent cache when splitting extent fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 79b592e8f1b435796cbc2722190368e3e8ffd7a1 ]
When the split extent fails, we might leave some extents still being processed and return an error directly, which will result in stale extent entries remaining in the extent status tree. So drop all of the remaining potentially stale extents if the splitting fails.
Message-ID: <[email protected]>
--- fs/ext4/extents.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ext4/extents.c +6 -2
@@ -3250,7 +3250,7 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle, err =PTR_ERR (path);if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM ) -return path; + goto out_path;/* * Get a new path to try to zeroout or fix the extent length.
@@ -3264,7 +3264,7 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,if (IS_ERR (path)) {EXT4_ERROR_INODE (inode,"Failed split extent on %u, err %ld" , split,PTR_ERR (path)); -return path; + goto out_path; } depth =ext_depth (inode); ex = path[depth].p_ext;
@@ -3341,6 +3341,10 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,ext4_free_ext_path (path); path =ERR_PTR (err); } +out_path: +if (IS_ERR (path)) +/* Remove all remaining potentially stale extents. */ +ext4_es_remove_extent (inode, ee_block, ee_len);ext4_ext_show_leaf (inode, path);return path; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 59/567 mailbox: Use of_property_match_string() instead of open-coding
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 263dbd3cc88da7ea7413494eea66418b4f1b2e6d ]
Use of_property_match_string() instead of open-coding the search. With this, of_get_property() can be removed as there is no need to check for "mbox-names" presence first.
This is part of a larger effort to remove callers of of_get_property() and similar functions. of_get_property() leaks the DT property data pointer which is a problem for dynamically allocated nodes which may be freed.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/mailbox/mailbox.c +6 -16
@@ -451,30 +451,20 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl, const char *name) {struct device_node *np = cl->dev->of_node; -struct property *prop; -const char *mbox_name; -int index =0 ; +int index;if (!np) {dev_err (cl->dev,"%s() currently only supports DT\n" , __func__);return ERR_PTR (-EINVAL ); } -if (!of_get_property (np,"mbox-names" ,NULL )) { -dev_err (cl->dev, -"%s() requires an \"mbox-names\" property\n" , __func__); + index =of_property_match_string (np,"mbox-names" , name); +if (index <0 ) { +dev_err (cl->dev,"%s() could not locate channel named \"%s\"\n" , + __func__, name);return ERR_PTR (-EINVAL ); } - -of_property_for_each_string (np,"mbox-names" , prop, mbox_name) { -if (!strncmp (name, mbox_name,strlen (name))) -return mbox_request_channel (cl, index); - index++; - } - -dev_err (cl->dev,"%s() could not locate channel named \"%s\"\n" , - __func__, name); -return ERR_PTR (-EINVAL ); +return mbox_request_channel (cl, index); }EXPORT_SYMBOL_GPL (mbox_request_channel_byname);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 60/567 mailbox: dont protect of_parse_phandle_with_args with con_mutex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 8c71c61fc613657d785a3377b4b34484bd978374 ]
There are no concurrency problems if multiple consumers parse the phandle, don't gratuiously protect the parsing with the mutex used for the controllers list.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mailbox/mailbox.c +2 -3
@@ -413,16 +413,15 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index)return ERR_PTR (-ENODEV ); } -mutex_lock (&con_mutex); - ret =of_parse_phandle_with_args (dev->of_node,"mboxes" ,"#mbox-cells" , index, &spec);if (ret) {dev_dbg (dev,"%s: can't parse \"mboxes\" property\n" , __func__); -mutex_unlock (&con_mutex);return ERR_PTR (ret); } +mutex_lock (&con_mutex); + chan =ERR_PTR (-EPROBE_DEFER );list_for_each_entry (mbox, &mbox_cons, node)if (mbox->dev->of_node == spec.np) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 61/567 mailbox: sort headers alphabetically
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit db824c1119fc16556a84cb7a771ca6553b3c3a45 ]
Sorting headers alphabetically helps locating duplicates, and makes it easier to figure out where to insert new headers.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 14 +++++++------- include/linux/mailbox_client.h | 2 +- include/linux/mailbox_controller.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/mailbox/mailbox.c +7 -7
@@ -6,18 +6,18 @@* Author: Jassi Brar <[email protected]> */ -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/mutex.h> +#include <linux/bitops.h> #include <linux/delay.h> -#include <linux/slab.h> -#include <linux/err.h> -#include <linux/module.h> #include <linux/device.h> -#include <linux/bitops.h> +#include <linux/err.h> +#include <linux/interrupt.h> #include <linux/mailbox_client.h> #include <linux/mailbox_controller.h> +#include <linux/module.h> +#include <linux/mutex.h> #include <linux/of.h> +#include <linux/slab.h> +#include <linux/spinlock.h> #include "mailbox.h"
include/linux/mailbox_client.h +1 -1
@@ -7,8 +7,8 @@#ifndef __MAILBOX_CLIENT_H#define __MAILBOX_CLIENT_H -#include <linux/of.h> #include <linux/device.h> +#include <linux/of.h> struct mbox_chan ;
include/linux/mailbox_controller.h +3 -3
@@ -3,11 +3,11 @@#ifndef __MAILBOX_CONTROLLER_H#define __MAILBOX_CONTROLLER_H +#include <linux/completion.h> +#include <linux/device.h> +#include <linux/hrtimer.h> #include <linux/of.h> #include <linux/types.h> -#include <linux/hrtimer.h> -#include <linux/device.h> -#include <linux/completion.h> struct mbox_chan ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 62/567 mailbox: remove unused header files
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 4de14ec76b5e67d824896f774b3a23d86a2ebc87 ]
There's nothing used from these header files, remove their inclusion.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mailbox/mailbox.c +0 -3
@@ -6,17 +6,14 @@* Author: Jassi Brar <[email protected]> */ -#include <linux/bitops.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> -#include <linux/interrupt.h> #include <linux/mailbox_client.h> #include <linux/mailbox_controller.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/slab.h> #include <linux/spinlock.h> #include "mailbox.h"
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 63/567 mailbox: Use dev_err when there is error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 8da4988b6e645f3eaa590ea16f433583364fd09c ]
Use dev_err to show the error log instead of using dev_dbg.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mailbox/mailbox.c +2 -2
@@ -322,7 +322,7 @@ static int __mbox_bind_client(struct mbox_chan *chan, struct mbox_client *cl)int ret;if (chan->cl || !try_module_get (chan->mbox->dev->driver->owner)) { -dev_dbg (dev,"%s: mailbox not free\n" , __func__); +dev_err (dev,"%s: mailbox not free\n" , __func__);return -EBUSY ; }
@@ -413,7 +413,7 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index) ret =of_parse_phandle_with_args (dev->of_node,"mboxes" ,"#mbox-cells" , index, &spec);if (ret) { -dev_dbg (dev,"%s: can't parse \"mboxes\" property\n" , __func__); +dev_err (dev,"%s: can't parse \"mboxes\" property\n" , __func__);return ERR_PTR (ret); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 64/567 mailbox: Use guard/scoped_guard for con_mutex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 16da9a653c5bf5d97fb296420899fe9735aa9c3c ]
Use guard and scoped_guard for con_mutex to simplify code.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 61 +++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 35 deletions(-)
drivers/mailbox/mailbox.c +26 -35
@@ -6,6 +6,7 @@* Author: Jassi Brar <[email protected]> */ +#include <linux/cleanup.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h>
@@ -370,13 +371,9 @@ static int __mbox_bind_client(struct mbox_chan *chan, struct mbox_client *cl)*/ int mbox_bind_client (struct mbox_chan *chan,struct mbox_client *cl) { -int ret; - -mutex_lock (&con_mutex); - ret =__mbox_bind_client (chan, cl); -mutex_unlock (&con_mutex); +guard (mutex)(&con_mutex); -return ret; +return __mbox_bind_client (chan, cl); }EXPORT_SYMBOL_GPL (mbox_bind_client);
@@ -417,28 +414,25 @@ struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index)return ERR_PTR (ret); } -mutex_lock (&con_mutex); + scoped_guard(mutex, &con_mutex) { + chan =ERR_PTR (-EPROBE_DEFER ); +list_for_each_entry (mbox, &mbox_cons, node) +if (mbox->dev->of_node == spec.np) { + chan = mbox->of_xlate (mbox, &spec); +if (!IS_ERR (chan)) +break ; + } - chan =ERR_PTR (-EPROBE_DEFER ); -list_for_each_entry (mbox, &mbox_cons, node) -if (mbox->dev->of_node == spec.np) { - chan = mbox->of_xlate (mbox, &spec); -if (!IS_ERR (chan)) -break ; - } +of_node_put (spec.np); -of_node_put (spec.np); +if (IS_ERR (chan)) +return chan; -if (IS_ERR (chan)) { -mutex_unlock (&con_mutex); -return chan; + ret =__mbox_bind_client (chan, cl); +if (ret) + chan =ERR_PTR (ret); } - ret =__mbox_bind_client (chan, cl); -if (ret) - chan =ERR_PTR (ret); - -mutex_unlock (&con_mutex);return chan; }EXPORT_SYMBOL_GPL (mbox_request_channel);
@@ -549,9 +543,8 @@ int mbox_controller_register(struct mbox_controller *mbox)if (!mbox->of_xlate) mbox->of_xlate = of_mbox_index_xlate; -mutex_lock (&con_mutex); -list_add_tail (&mbox->node, &mbox_cons); -mutex_unlock (&con_mutex); + scoped_guard(mutex, &con_mutex) +list_add_tail (&mbox->node, &mbox_cons);return 0 ; }
@@ -568,17 +561,15 @@ void mbox_controller_unregister(struct mbox_controller *mbox)if (!mbox)return ; -mutex_lock (&con_mutex); - -list_del (&mbox->node); + scoped_guard(mutex, &con_mutex) { +list_del (&mbox->node); -for (i =0 ; i < mbox->num_chans; i++) -mbox_free_channel (&mbox->chans[i]); +for (i =0 ; i < mbox->num_chans; i++) +mbox_free_channel (&mbox->chans[i]); -if (mbox->txdone_poll) -hrtimer_cancel (&mbox->poll_hrt); - -mutex_unlock (&con_mutex); +if (mbox->txdone_poll) +hrtimer_cancel (&mbox->poll_hrt); + } }EXPORT_SYMBOL_GPL (mbox_controller_unregister);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 65/567 mailbox: Allow controller specific mapping using fwnode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit ba879dfc0574878f3e08f217b2b4fdf845c426c0 ]
Introduce optional fw_node() callback which allows a mailbox controller driver to provide controller specific mapping using fwnode.
The Linux OF framework already implements fwnode operations for the Linux DD framework so the fw_xlate() callback works fine with device tree as well.
Stable-dep-of: fcd7f96c7836 ("mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()")
--- drivers/mailbox/mailbox.c | 65 ++++++++++++++++++------------ include/linux/mailbox_controller.h | 3 ++ 2 files changed, 43 insertions(+), 25 deletions(-)
drivers/mailbox/mailbox.c +40 -25
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/property.h> #include <linux/spinlock.h> #include "mailbox.h"
@@ -396,34 +397,56 @@ EXPORT_SYMBOL_GPL(mbox_bind_client);*/ struct mbox_chan *mbox_request_channel (struct mbox_client *cl,int index) { -struct device *dev = cl->dev; +struct fwnode_reference_args fwspec; +struct fwnode_handle *fwnode;struct mbox_controller *mbox;struct of_phandle_args spec;struct mbox_chan *chan; +struct device *dev; +unsigned int i;int ret; -if (!dev || !dev->of_node) { -pr_debug ("%s: No owner device node\n" , __func__); + dev = cl->dev; +if (!dev) { +pr_debug ("No owner device\n" );return ERR_PTR (-ENODEV ); } - ret =of_parse_phandle_with_args (dev->of_node,"mboxes" ,"#mbox-cells" , - index, &spec); + fwnode =dev_fwnode (dev); +if (!fwnode) { +dev_dbg (dev,"No owner fwnode\n" ); +return ERR_PTR (-ENODEV ); + } + + ret =fwnode_property_get_reference_args (fwnode,"mboxes" ,"#mbox-cells" , +0 , index, &fwspec);if (ret) { -dev_err (dev,"%s: can't parse \"mboxes\" property\n" , __func__); +dev_err (dev,"%s: can't parse \"%s\" property\n" , __func__,"mboxes" );return ERR_PTR (ret); } + spec.np =to_of_node (fwspec.fwnode); + spec.args_count = fwspec.nargs; +for (i =0 ; i < spec.args_count; i++) + spec.args[i] = fwspec.args[i]; + scoped_guard(mutex, &con_mutex) { chan =ERR_PTR (-EPROBE_DEFER ); -list_for_each_entry (mbox, &mbox_cons, node) -if (mbox->dev->of_node == spec.np) { - chan = mbox->of_xlate (mbox, &spec); -if (!IS_ERR (chan)) -break ; +list_for_each_entry (mbox, &mbox_cons, node) { +if (device_match_fwnode (mbox->dev, fwspec.fwnode)) { +if (mbox->fw_xlate) { + chan = mbox->fw_xlate (mbox, &fwspec); +if (!IS_ERR (chan)) +break ; + }else if (mbox->of_xlate) { + chan = mbox->of_xlate (mbox, &spec); +if (!IS_ERR (chan)) +break ; + } } + } -of_node_put (spec.np); +fwnode_handle_put (fwspec.fwnode);if (IS_ERR (chan))return chan;
@@ -440,15 +463,8 @@ EXPORT_SYMBOL_GPL(mbox_request_channel);struct mbox_chan *mbox_request_channel_byname (struct mbox_client *cl,const char *name) { -struct device_node *np = cl->dev->of_node; -int index; - -if (!np) { -dev_err (cl->dev,"%s() currently only supports DT\n" , __func__); -return ERR_PTR (-EINVAL ); - } +int index =device_property_match_string (cl->dev,"mbox-names" , name); - index =of_property_match_string (np,"mbox-names" , name);if (index <0 ) {dev_err (cl->dev,"%s() could not locate channel named \"%s\"\n" , __func__, name);
@@ -485,9 +501,8 @@ void mbox_free_channel(struct mbox_chan *chan) }EXPORT_SYMBOL_GPL (mbox_free_channel); -static struct mbox_chan * -of_mbox_index_xlate (struct mbox_controller *mbox, -const struct of_phandle_args *sp) +static struct mbox_chan *fw_mbox_index_xlate (struct mbox_controller *mbox, +const struct fwnode_reference_args *sp) {int ind = sp->args[0 ];
@@ -540,8 +555,8 @@ int mbox_controller_register(struct mbox_controller *mbox)spin_lock_init (&chan->lock); } -if (!mbox->of_xlate) - mbox->of_xlate = of_mbox_index_xlate; +if (!mbox->fw_xlate && !mbox->of_xlate) + mbox->fw_xlate = fw_mbox_index_xlate; scoped_guard(mutex, &con_mutex)list_add_tail (&mbox->node, &mbox_cons);
include/linux/mailbox_controller.h +3 -0
@@ -66,6 +66,7 @@ struct mbox_chan_ops {* no interrupt rises. Ignored if 'txdone_irq' is set. * @txpoll_period: If 'txdone_poll' is in effect, the API polls for * last TX's status after these many millisecs +* @fw_xlate: Controller driver specific mapping of channel via fwnode * @of_xlate: Controller driver specific mapping of channel via DT * @poll_hrt: API private. hrtimer used to poll for TXDONE on all * channels.
@@ -79,6 +80,8 @@ struct mbox_controller {bool txdone_irq;bool txdone_poll;unsigned txpoll_period; +struct mbox_chan *(*fw_xlate)(struct mbox_controller *mbox, +const struct fwnode_reference_args *sp);struct mbox_chan *(*of_xlate)(struct mbox_controller *mbox,const struct of_phandle_args *sp);/* Internal to API */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 66/567 mailbox: Prevent out-of-bounds access in fw_mbox_index_xlate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joonwon Kang <[email protected]>
[ Upstream commit fcd7f96c783626c07ee3ed75fa3739a8a2052310 ]
Although it is guided that #mbox-cells must be at least 1, there are many instances of #mbox-cells = <0>; in the device tree. If that is the case and the corresponding mailbox controller does not provide fw_xlate and of_xlate function pointers, fw_mbox_index_xlate()` will be used by default and out-of-bounds accesses could occur due to lack of bounds check in that function.
--- drivers/mailbox/mailbox.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mailbox/mailbox.c +2 -4
@@ -504,12 +504,10 @@ EXPORT_SYMBOL_GPL(mbox_free_channel);static struct mbox_chan *fw_mbox_index_xlate (struct mbox_controller *mbox,const struct fwnode_reference_args *sp) { -int ind = sp->args[0 ]; - -if (ind >= mbox->num_chans) +if (sp->nargs <1 || sp->args[0 ] >= mbox->num_chans)return ERR_PTR (-EINVAL ); -return &mbox->chans[ind]; +return &mbox->chans[sp->args[0 ]]; }/**
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 49/567 ext4: dont zero the entire extent if EXT4_EXT_DATA_PARTIAL_VALID1
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 1bf6974822d1dba86cf11b5f05498581cf3488a2 ]
When allocating initialized blocks from a large unwritten extent, or when splitting an unwritten extent during end I/O and converting it to initialized, there is currently a potential issue of stale data if the extent needs to be split in the middle.
0 A B N
[UUUUUUUUUUUU] U: unwritten extent
[--DDDDDDDD--] D: valid data
|<- ->| ----> this range needs to be initialized
ext4_split_extent() first try to split this extent at B with EXT4_EXT_DATA_ENTIRE_VALID1 and EXT4_EXT_MAY_ZEROOUT flag set, but ext4_split_extent_at() failed to split this extent due to temporary lack of space. It zeroout B to N and mark the entire extent from 0 to N as written.
0 A B N
[WWWWWWWWWWWW] W: written extent
[SSDDDDDDDDZZ] Z: zeroed, S: stale data
ext4_split_extent() then try to split this extent at A with EXT4_EXT_DATA_VALID2 flag set. This time, it split successfully and left a stale written extent from 0 to A.
0 A B N
[WW|WWWWWWWWWW]
[SS|DDDDDDDDZZ]Fix this by pass EXT4_EXT_DATA_PARTIAL_VALID1 to ext4_split_extent_at() when splitting at B, don't convert the entire extent to written and left it as unwritten after zeroing out B to N. The remaining work is just like the standard two-part split. ext4_split_extent() will pass the EXT4_EXT_DATA_VALID2 flag when it calls ext4_split_extent_at() for the second time, allowing it to properly handle the split. If the split is successful, it will keep extent from 0 to A as unwritten.
Message-ID: <[email protected]>
--- fs/ext4/extents.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/ext4/extents.c +12 -1
@@ -3296,6 +3296,15 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle, }if (!err) { +/* +* The first half contains partially valid data, the +* splitting of this extent has not been completed, fix +* extent length and ext4_split_extent() split will the +* first half again. +*/ +if (split_flag &EXT4_EXT_DATA_PARTIAL_VALID1 ) + goto fix_extent_len; +/* update the extent length and mark as initialized */ ex->ee_len =cpu_to_le16 (ee_len);ext4_ext_try_to_merge (handle, inode, path, ex);
@@ -3371,7 +3380,9 @@ static int ext4_split_extent(handle_t *handle, split_flag1 |=EXT4_EXT_MARK_UNWRIT1 |EXT4_EXT_MARK_UNWRIT2 ;if (split_flag &EXT4_EXT_DATA_VALID2 ) - split_flag1 |=EXT4_EXT_DATA_ENTIRE_VALID1 ; + split_flag1 |= map->m_lblk > ee_block ? +EXT4_EXT_DATA_PARTIAL_VALID1 : +EXT4_EXT_DATA_ENTIRE_VALID1 ; path =ext4_split_extent_at (handle, inode, path, map->m_lblk + map->m_len, split_flag1, flags1);if (IS_ERR (path)) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 67/567 ext4: delete redundant calculations in ext4_mb_get_buddy_page_lock()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gou Hao <[email protected]>
[ Upstream commit f2fec3e99a32d7c14dbf63c824f8286ebc94b18d ]
'blocks_per_page' is always 1 after 'if (blocks_per_page >= 2)', 'pnum' and 'block' are equal in this case.
Stable-dep-of: bdc56a9c46b2 ("ext4: fix e4b bitmap inconsistency reports")
--- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/ext4/mballoc.c +2 -3
@@ -1486,9 +1486,8 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb,return 0 ; } - block++; - pnum = block / blocks_per_page; - page =find_or_create_page (inode->i_mapping, pnum, gfp); +/* blocks_per_page == 1, hence we need another page for the buddy */ + page =find_or_create_page (inode->i_mapping, block +1 , gfp);if (!page)return -ENOMEM ;BUG_ON (page->mapping != inode->i_mapping);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 68/567 ext4: convert bd_bitmap_page to bd_bitmap_folio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 99b150d84e4939735cfce245e32e3d29312c68ec ]
There is no need to make this a multi-page folio, so leave all the infrastructure around it in pages. But since we're locking it, playing with its refcount and checking whether it's uptodate, it needs to move to the folio API.
Stable-dep-of: bdc56a9c46b2 ("ext4: fix e4b bitmap inconsistency reports")
--- fs/ext4/mballoc.c | 98 ++++++++++++++++++++++++----------------------- fs/ext4/mballoc.h | 2 +- 2 files changed, 52 insertions(+), 48 deletions(-)
fs/ext4/mballoc.c +51 -47
@@ -1461,9 +1461,10 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb,int block, pnum, poff;int blocks_per_page;struct page *page; +struct folio *folio; e4b->bd_buddy_page =NULL ; - e4b->bd_bitmap_page =NULL ; + e4b->bd_bitmap_folio =NULL ; blocks_per_page =PAGE_SIZE / sb->s_blocksize;/*
@@ -1474,12 +1475,13 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb, block = group *2 ; pnum = block / blocks_per_page; poff = block % blocks_per_page; - page =find_or_create_page (inode->i_mapping, pnum, gfp); -if (!page) -return -ENOMEM ; -BUG_ON (page->mapping != inode->i_mapping); - e4b->bd_bitmap_page = page; - e4b->bd_bitmap =page_address (page) + (poff * sb->s_blocksize); + folio =__filemap_get_folio (inode->i_mapping, pnum, +FGP_LOCK |FGP_ACCESSED |FGP_CREAT , gfp); +if (IS_ERR (folio)) +return PTR_ERR (folio); +BUG_ON (folio->mapping != inode->i_mapping); + e4b->bd_bitmap_folio = folio; + e4b->bd_bitmap =folio_address (folio) + (poff * sb->s_blocksize);if (blocks_per_page >=2 ) {/* buddy and bitmap are on the same page */
@@ -1497,9 +1499,9 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb,static void ext4_mb_put_buddy_page_lock (struct ext4_buddy *e4b) { -if (e4b->bd_bitmap_page) { -unlock_page (e4b->bd_bitmap_page); -put_page (e4b->bd_bitmap_page); +if (e4b->bd_bitmap_folio) { +folio_unlock (e4b->bd_bitmap_folio); +folio_put (e4b->bd_bitmap_folio); }if (e4b->bd_buddy_page) {unlock_page (e4b->bd_buddy_page);
@@ -1519,6 +1521,7 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)struct ext4_group_info *this_grp;struct ext4_buddy e4b;struct page *page; +struct folio *folio;int ret =0 ;might_sleep ();
@@ -1545,11 +1548,11 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp) goto err; } - page = e4b.bd_bitmap_page; - ret =ext4_mb_init_cache (page,NULL , gfp); + folio = e4b.bd_bitmap_folio; + ret =ext4_mb_init_cache (&folio->page,NULL , gfp);if (ret) goto err; -if (!PageUptodate (page)) { +if (!folio_test_uptodate (folio)) { ret = -EIO ; goto err; }
@@ -1591,6 +1594,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,int pnum;int poff;struct page *page; +struct folio *folio;int ret;struct ext4_group_info *grp;struct ext4_sb_info *sbi =EXT4_SB (sb);
@@ -1609,7 +1613,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, e4b->bd_sb = sb; e4b->bd_group = group; e4b->bd_buddy_page =NULL ; - e4b->bd_bitmap_page =NULL ; + e4b->bd_bitmap_folio =NULL ;if (unlikely (EXT4_MB_GRP_NEED_INIT (grp))) {/*
@@ -1630,53 +1634,53 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, pnum = block / blocks_per_page; poff = block % blocks_per_page; -/* we could use find_or_create_page(), but it locks page -* what we'd like to avoid in fast path ... */ - page =find_get_page_flags (inode->i_mapping, pnum,FGP_ACCESSED ); -if (page ==NULL || !PageUptodate (page)) { -if (page) +/* Avoid locking the folio in the fast path ... */ + folio =__filemap_get_folio (inode->i_mapping, pnum,FGP_ACCESSED ,0 ); +if (IS_ERR (folio) || !folio_test_uptodate (folio)) { +if (!IS_ERR (folio))/* -* drop the page reference and try -* to get the page with lock. If we +* drop the folio reference and try +* to get the folio with lock. If we * are not uptodate that implies -* somebody just created the page but -* is yet to initialize the same. So +* somebody just created the folio but +* is yet to initialize it. So * wait for it to initialize. */ -put_page (page); - page =find_or_create_page (inode->i_mapping, pnum, gfp); -if (page) { -if (WARN_RATELIMIT (page->mapping != inode->i_mapping, -"ext4: bitmap's paging->mapping != inode->i_mapping\n" )) { +folio_put (folio); + folio =__filemap_get_folio (inode->i_mapping, pnum, +FGP_LOCK |FGP_ACCESSED |FGP_CREAT , gfp); +if (!IS_ERR (folio)) { +if (WARN_RATELIMIT (folio->mapping != inode->i_mapping, +"ext4: bitmap's mapping != inode->i_mapping\n" )) {/* should never happen */ -unlock_page (page); +folio_unlock (folio); ret = -EINVAL ; goto err; } -if (!PageUptodate (page)) { - ret =ext4_mb_init_cache (page,NULL , gfp); +if (!folio_test_uptodate (folio)) { + ret =ext4_mb_init_cache (&folio->page,NULL , gfp);if (ret) { -unlock_page (page); +folio_unlock (folio); goto err; } -mb_cmp_bitmaps (e4b,page_address (page) + +mb_cmp_bitmaps (e4b,folio_address (folio) + (poff * sb->s_blocksize)); } -unlock_page (page); +folio_unlock (folio); } } -if (page ==NULL ) { - ret = -ENOMEM ; +if (IS_ERR (folio)) { + ret =PTR_ERR (folio); goto err; } -if (!PageUptodate (page)) { +if (!folio_test_uptodate (folio)) { ret = -EIO ; goto err; }/* Pages marked accessed already */ - e4b->bd_bitmap_page = page; - e4b->bd_bitmap =page_address (page) + (poff * sb->s_blocksize); + e4b->bd_bitmap_folio = folio; + e4b->bd_bitmap =folio_address (folio) + (poff * sb->s_blocksize); block++; pnum = block / blocks_per_page;
@@ -1724,8 +1728,8 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, err:if (page)put_page (page); -if (e4b->bd_bitmap_page) -put_page (e4b->bd_bitmap_page); +if (e4b->bd_bitmap_folio) +folio_put (e4b->bd_bitmap_folio); e4b->bd_buddy =NULL ; e4b->bd_bitmap =NULL ;
@@ -1740,8 +1744,8 @@ static int ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group,static void ext4_mb_unload_buddy (struct ext4_buddy *e4b) { -if (e4b->bd_bitmap_page) -put_page (e4b->bd_bitmap_page); +if (e4b->bd_bitmap_folio) +folio_put (e4b->bd_bitmap_folio);if (e4b->bd_buddy_page)put_page (e4b->bd_buddy_page); }
@@ -2167,7 +2171,7 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac,* double allocate blocks. The reference is dropped * in ext4_mb_release_context */ - ac->ac_bitmap_page = e4b->bd_bitmap_page; + ac->ac_bitmap_page = &e4b->bd_bitmap_folio->page;get_page (ac->ac_bitmap_page); ac->ac_buddy_page = e4b->bd_buddy_page;get_page (ac->ac_buddy_page);
@@ -3902,7 +3906,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb,* balance refcounts from ext4_mb_free_metadata() */ put_page (e4b.bd_buddy_page); -put_page (e4b.bd_bitmap_page); +folio_put (e4b.bd_bitmap_folio); }ext4_unlock_group (sb, entry->efd_group);ext4_mb_unload_buddy (&e4b);
@@ -6348,7 +6352,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,struct rb_node *parent =NULL , *new_node;BUG_ON (!ext4_handle_valid (handle)); -BUG_ON (e4b->bd_bitmap_page ==NULL ); +BUG_ON (e4b->bd_bitmap_folio ==NULL );BUG_ON (e4b->bd_buddy_page ==NULL ); new_node = &new_entry->efd_node;
@@ -6361,7 +6365,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,* on-disk bitmap and lose not-yet-available * blocks */ get_page (e4b->bd_buddy_page); -get_page (e4b->bd_bitmap_page); +folio_get (e4b->bd_bitmap_folio); }while (*n) { parent = *n;
fs/ext4/mballoc.h +1 -1
@@ -218,7 +218,7 @@ struct ext4_allocation_context {struct ext4_buddy {struct page *bd_buddy_page;void *bd_buddy; -struct page *bd_bitmap_page; +struct folio *bd_bitmap_folio;void *bd_bitmap;struct ext4_group_info *bd_info;struct super_block *bd_sb;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 69/567 ext4: convert bd_buddy_page to bd_buddy_folio
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 5eea586b47f05b5f5518cf8f9dd9283a01a8066d ]
There is no need to make this a multi-page folio, so leave all the infrastructure around it in pages. But since we're locking it, playing with its refcount and checking whether it's uptodate, it needs to move to the folio API.
Stable-dep-of: bdc56a9c46b2 ("ext4: fix e4b bitmap inconsistency reports")
--- fs/ext4/mballoc.c | 91 +++++++++++++++++++++++------------------------ fs/ext4/mballoc.h | 2 +- 2 files changed, 46 insertions(+), 47 deletions(-)
fs/ext4/mballoc.c +45 -46
@@ -1452,7 +1452,7 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp)* Lock the buddy and bitmap pages. This make sure other parallel init_group * on the same buddy page doesn't happen whild holding the buddy page lock. * Return locked buddy and bitmap pages on e4b struct. If buddy and bitmap -* are on the same page e4b->bd_buddy_page is NULL and return value is 0. +* are on the same page e4b->bd_buddy_folio is NULL and return value is 0. */ static int ext4_mb_get_buddy_page_lock (struct super_block *sb,ext4_group_t group,struct ext4_buddy *e4b,gfp_t gfp)
@@ -1460,10 +1460,9 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb,struct inode *inode =EXT4_SB (sb)->s_buddy_cache;int block, pnum, poff;int blocks_per_page; -struct page *page;struct folio *folio; - e4b->bd_buddy_page =NULL ; + e4b->bd_buddy_folio =NULL ; e4b->bd_bitmap_folio =NULL ; blocks_per_page =PAGE_SIZE / sb->s_blocksize;
@@ -1489,11 +1488,12 @@ static int ext4_mb_get_buddy_page_lock(struct super_block *sb, }/* blocks_per_page == 1, hence we need another page for the buddy */ - page =find_or_create_page (inode->i_mapping, block +1 , gfp); -if (!page) -return -ENOMEM ; -BUG_ON (page->mapping != inode->i_mapping); - e4b->bd_buddy_page = page; + folio =__filemap_get_folio (inode->i_mapping, block +1 , +FGP_LOCK |FGP_ACCESSED |FGP_CREAT , gfp); +if (IS_ERR (folio)) +return PTR_ERR (folio); +BUG_ON (folio->mapping != inode->i_mapping); + e4b->bd_buddy_folio = folio;return 0 ; }
@@ -1503,9 +1503,9 @@ static void ext4_mb_put_buddy_page_lock(struct ext4_buddy *e4b)folio_unlock (e4b->bd_bitmap_folio);folio_put (e4b->bd_bitmap_folio); } -if (e4b->bd_buddy_page) { -unlock_page (e4b->bd_buddy_page); -put_page (e4b->bd_buddy_page); +if (e4b->bd_buddy_folio) { +folio_unlock (e4b->bd_buddy_folio); +folio_put (e4b->bd_buddy_folio); } }
@@ -1520,7 +1520,6 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp)struct ext4_group_info *this_grp;struct ext4_buddy e4b; -struct page *page;struct folio *folio;int ret =0 ;
@@ -1557,7 +1556,7 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp) goto err; } -if (e4b.bd_buddy_page ==NULL ) { +if (e4b.bd_buddy_folio ==NULL ) {/* * If both the bitmap and buddy are in * the same page we don't need to force
@@ -1567,11 +1566,11 @@ int ext4_mb_init_group(struct super_block *sb, ext4_group_t group, gfp_t gfp) goto err; }/* init buddy cache */ - page = e4b.bd_buddy_page; - ret =ext4_mb_init_cache (page, e4b.bd_bitmap, gfp); + folio = e4b.bd_buddy_folio; + ret =ext4_mb_init_cache (&folio->page, e4b.bd_bitmap, gfp);if (ret) goto err; -if (!PageUptodate (page)) { +if (!folio_test_uptodate (folio)) { ret = -EIO ; goto err; }
@@ -1593,7 +1592,6 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,int block;int pnum;int poff; -struct page *page;struct folio *folio;int ret;struct ext4_group_info *grp;
@@ -1612,7 +1610,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, e4b->bd_info = grp; e4b->bd_sb = sb; e4b->bd_group = group; - e4b->bd_buddy_page =NULL ; + e4b->bd_buddy_folio =NULL ; e4b->bd_bitmap_folio =NULL ;if (unlikely (EXT4_MB_GRP_NEED_INIT (grp))) {
@@ -1678,7 +1676,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, goto err; } -/* Pages marked accessed already */ +/* Folios marked accessed already */ e4b->bd_bitmap_folio = folio; e4b->bd_bitmap =folio_address (folio) + (poff * sb->s_blocksize);
@@ -1686,48 +1684,49 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, pnum = block / blocks_per_page; poff = block % blocks_per_page; - page =find_get_page_flags (inode->i_mapping, pnum,FGP_ACCESSED ); -if (page ==NULL || !PageUptodate (page)) { -if (page) -put_page (page); - page =find_or_create_page (inode->i_mapping, pnum, gfp); -if (page) { -if (WARN_RATELIMIT (page->mapping != inode->i_mapping, -"ext4: buddy bitmap's page->mapping != inode->i_mapping\n" )) { + folio =__filemap_get_folio (inode->i_mapping, pnum,FGP_ACCESSED ,0 ); +if (IS_ERR (folio) || !folio_test_uptodate (folio)) { +if (!IS_ERR (folio)) +folio_put (folio); + folio =__filemap_get_folio (inode->i_mapping, pnum, +FGP_LOCK |FGP_ACCESSED |FGP_CREAT , gfp); +if (!IS_ERR (folio)) { +if (WARN_RATELIMIT (folio->mapping != inode->i_mapping, +"ext4: buddy bitmap's mapping != inode->i_mapping\n" )) {/* should never happen */ -unlock_page (page); +folio_unlock (folio); ret = -EINVAL ; goto err; } -if (!PageUptodate (page)) { - ret =ext4_mb_init_cache (page, e4b->bd_bitmap, +if (!folio_test_uptodate (folio)) { + ret =ext4_mb_init_cache (&folio->page, e4b->bd_bitmap, gfp);if (ret) { -unlock_page (page); +folio_unlock (folio); goto err; } } -unlock_page (page); +folio_unlock (folio); } } -if (page ==NULL ) { - ret = -ENOMEM ; +if (IS_ERR (folio)) { + ret =PTR_ERR (folio); goto err; } -if (!PageUptodate (page)) { +if (!folio_test_uptodate (folio)) { ret = -EIO ; goto err; } -/* Pages marked accessed already */ - e4b->bd_buddy_page = page; - e4b->bd_buddy =page_address (page) + (poff * sb->s_blocksize); +/* Folios marked accessed already */ + e4b->bd_buddy_folio = folio; + e4b->bd_buddy =folio_address (folio) + (poff * sb->s_blocksize);return 0 ; err: -if (page) -put_page (page); +if (folio) +folio_put (folio);if (e4b->bd_bitmap_folio)folio_put (e4b->bd_bitmap_folio);
@@ -1746,8 +1745,8 @@ static void ext4_mb_unload_buddy(struct ext4_buddy *e4b) {if (e4b->bd_bitmap_folio)folio_put (e4b->bd_bitmap_folio); -if (e4b->bd_buddy_page) -put_page (e4b->bd_buddy_page); +if (e4b->bd_buddy_folio) +folio_put (e4b->bd_buddy_folio); }
@@ -2173,7 +2172,7 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac,*/ ac->ac_bitmap_page = &e4b->bd_bitmap_folio->page;get_page (ac->ac_bitmap_page); - ac->ac_buddy_page = e4b->bd_buddy_page; + ac->ac_buddy_page = &e4b->bd_buddy_folio->page;get_page (ac->ac_buddy_page);/* store last allocated for subsequent stream allocation */ if (ac->ac_flags &EXT4_MB_STREAM_ALLOC ) {
@@ -3905,7 +3904,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb,/* No more items in the per group rb tree * balance refcounts from ext4_mb_free_metadata() */ -put_page (e4b.bd_buddy_page); +folio_put (e4b.bd_buddy_folio);folio_put (e4b.bd_bitmap_folio); }ext4_unlock_group (sb, entry->efd_group);
@@ -6353,7 +6352,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,BUG_ON (!ext4_handle_valid (handle));BUG_ON (e4b->bd_bitmap_folio ==NULL ); -BUG_ON (e4b->bd_buddy_page ==NULL ); +BUG_ON (e4b->bd_buddy_folio ==NULL ); new_node = &new_entry->efd_node; cluster = new_entry->efd_start_cluster;
@@ -6364,7 +6363,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,* otherwise we'll refresh it from * on-disk bitmap and lose not-yet-available * blocks */ -get_page (e4b->bd_buddy_page); +folio_get (e4b->bd_buddy_folio);folio_get (e4b->bd_bitmap_folio); }while (*n) {
fs/ext4/mballoc.h +1 -1
@@ -216,7 +216,7 @@ struct ext4_allocation_context {#define AC_STATUS_BREAK 3struct ext4_buddy { -struct page *bd_buddy_page; +struct folio *bd_buddy_folio;void *bd_buddy;struct folio *bd_bitmap_folio;void *bd_bitmap;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 70/567 ext4: fix e4b bitmap inconsistency reports
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yongjian Sun <[email protected]>
[ Upstream commit bdc56a9c46b2a99c12313122b9352b619a2e719e ]
A bitmap inconsistency issue was observed during stress tests under mixed huge-page workloads. Ext4 reported multiple e4b bitmap check failures like:
ext4_mb_complex_scan_group:2508: group 350, 8179 free clusters as per group info. But got 8192 blocks
Analysis and experimentation confirmed that the issue is caused by a race condition between page migration and bitmap modification. Although this timing window is extremely narrow, it is still hit in practice:
folio_lock ext4_mb_load_buddy__migrate_folio
check ref count
folio_mc_copy __filemap_get_folio
folio_try_get(folio)
......
mb_mark_used
ext4_mb_unload_buddy __folio_migrate_mapping
folio_ref_freezefolio_unlock
The root cause of this issue is that the fast path of load_buddy only increments the folio's reference count, which is insufficient to prevent concurrent folio migration. We observed that the folio migration process acquires the folio lock. Therefore, we can determine whether to take the fast path in load_buddy by checking the lock status. If the folio is locked, we opt for the slow path (which acquires the lock) to close this concurrency window.
Additionally, this change addresses the following issues:
When the DOUBLE_CHECK macro is enabled to inspect bitmap-related issues, the following error may be triggered:
corruption in group 324 at byte 784(6272): f in copy != ff on disk/prealloc
Analysis reveals that this is a false positive. There is a specific race window where the bitmap and the group descriptor become momentarily inconsistent, leading to this error report:
ext4_mb_load_buddy ext4_mb_load_buddy
__filemap_get_folio(create|lock)
folio_lock
ext4_mb_init_cache
folio_mark_uptodate
__filemap_get_folio(no lock)
......
mb_mark_used
mb_mark_used_double
mb_cmp_bitmaps
mb_set_bits(e4b->bd_bitmap) folio_unlock
The original logic assumed that since mb_cmp_bitmaps is called when the bitmap is newly loaded from disk, the folio lock would be sufficient to prevent concurrent access. However, this overlooks a specific race
condition: if another process attempts to load buddy and finds the folio is already in an uptodate state, it will immediately begin using it without holding folio lock.
--- fs/ext4/mballoc.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/ext4/mballoc.c +11 -10
@@ -1634,16 +1634,17 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group,/* Avoid locking the folio in the fast path ... */ folio =__filemap_get_folio (inode->i_mapping, pnum,FGP_ACCESSED ,0 ); -if (IS_ERR (folio) || !folio_test_uptodate (folio)) { +if (IS_ERR (folio) || !folio_test_uptodate (folio) ||folio_test_locked (folio)) { +/* +* folio_test_locked is employed to detect ongoing folio +* migrations, since concurrent migrations can lead to +* bitmap inconsistency. And if we are not uptodate that +* implies somebody just created the folio but is yet to +* initialize it. We can drop the folio reference and +* try to get the folio with lock in both cases to avoid +* concurrency. +*/ if (!IS_ERR (folio)) -/* -* drop the folio reference and try -* to get the folio with lock. If we -* are not uptodate that implies -* somebody just created the folio but -* is yet to initialize it. So -* wait for it to initialize. -*/ folio_put (folio); folio =__filemap_get_folio (inode->i_mapping, pnum,FGP_LOCK |FGP_ACCESSED |FGP_CREAT , gfp);
@@ -1685,7 +1686,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, poff = block % blocks_per_page; folio =__filemap_get_folio (inode->i_mapping, pnum,FGP_ACCESSED ,0 ); -if (IS_ERR (folio) || !folio_test_uptodate (folio)) { +if (IS_ERR (folio) || !folio_test_uptodate (folio) ||folio_test_locked (folio)) {if (!IS_ERR (folio))folio_put (folio); folio = __filemap_get_folio(inode->i_mapping, pnum,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 71/567 mfd: qcom-pm8xxx: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 19ea1d3953017518d85db35b69b5aea9bc64d630 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 27a8acea47a9 ("mfd: qcom-pm8xxx: Fix OF populate on driver rebind")
--- drivers/mfd/qcom-pm8xxx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -585,19 +585,17 @@ static int pm8xxx_remove_child(struct device *dev, void *unused)return 0 ; } -static int pm8xxx_remove (struct platform_device *pdev) +static void pm8xxx_remove (struct platform_device *pdev) {struct pm_irq_chip *chip =platform_get_drvdata (pdev);device_for_each_child (&pdev->dev,NULL , pm8xxx_remove_child);irq_domain_remove (chip->irqdomain); - -return 0 ; }static struct platform_driver pm8xxx_driver = { .probe = pm8xxx_probe, - .remove = pm8xxx_remove, + .remove_new = pm8xxx_remove, .driver = { .name ="pm8xxx-core" , .of_match_table = pm8xxx_id_table,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 72/567 mfd: qcom-pm8xxx: Fix OF populate on driver rebind
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 27a8acea47a93fea6ad0e2df4c20a9b51490e4d9 ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/mfd/qcom-pm8xxx.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/mfd/qcom-pm8xxx.c +1 -7
@@ -579,17 +579,11 @@ static int pm8xxx_probe(struct platform_device *pdev)return rc; } -static int pm8xxx_remove_child (struct device *dev,void *unused) -{ -platform_device_unregister (to_platform_device (dev)); -return 0 ; -} -static void pm8xxx_remove (struct platform_device *pdev) {struct pm_irq_chip *chip =platform_get_drvdata (pdev); -device_for_each_child (&pdev->dev,NULL , pm8xxx_remove_child); +of_platform_depopulate (&pdev->dev);irq_domain_remove (chip->irqdomain); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 73/567 mfd: omap-usb-host: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 418d1e74f8597e0b2d5d0d6e1be8f1f47e68f0a4 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 24804ba508a3 ("mfd: omap-usb-host: Fix OF populate on driver rebind")
--- drivers/mfd/omap-usb-host.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mfd/omap-usb-host.c +2 -3
@@ -816,13 +816,12 @@ static int usbhs_omap_remove_child(struct device *dev, void *data)* * Reverses the effect of usbhs_omap_probe(). */ -static int usbhs_omap_remove (struct platform_device *pdev) +static void usbhs_omap_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev);/* remove children */ device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); -return 0 ; }static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
@@ -845,7 +844,7 @@ static struct platform_driver usbhs_omap_driver = { .of_match_table = usbhs_omap_dt_ids, }, .probe = usbhs_omap_probe, - .remove = usbhs_omap_remove, + .remove_new = usbhs_omap_remove, };MODULE_AUTHOR ("Keshava Munegowda <[email protected]>" );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 74/567 mfd: omap-usb-host: Fix OF populate on driver rebind
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 24804ba508a3e240501c521685a1c4eb9f574f8e ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/mfd/omap-usb-host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mfd/omap-usb-host.c +4 -2
@@ -820,8 +820,10 @@ static void usbhs_omap_remove(struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -/* remove children */ -device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); +if (pdev->dev.of_node) +of_platform_depopulate (&pdev->dev); +else +device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); }static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 75/567 arm64: dts: rockchip: Fix rk356x PCIe range mappings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Lin <[email protected]>
[ Upstream commit f63ea193a404481f080ca2958f73e9f364682db9 ]
The pcie bus address should be mapped 1:1 to the cpu side MMIO address, so that there is no same address allocated from normal system memory. Otherwise it's broken if the same address assigned to the EP for DMA purpose.Fix it to sync with the vendor BSP.
--- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3568.dtsi +2 -2
@@ -97,7 +97,7 @@ pcie3x1: pcie@fe270000 { <0x0 0xf2000000 0x0 0x00100000>; ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>, <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>, - <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>; + <0x03000000 0x3 0x40000000 0x3 0x40000000 0x0 0x40000000>; reg-names = "dbi", "apb", "config"; resets = <&cru SRST_PCIE30X1_POWERUP>; reset-names = "pipe";
@@ -150,7 +150,7 @@ pcie3x2: pcie@fe280000 { <0x0 0xf0000000 0x0 0x00100000>; ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>, <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>, - <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>; + <0x03000000 0x3 0x80000000 0x3 0x80000000 0x0 0x40000000>; reg-names = "dbi", "apb", "config"; resets = <&cru SRST_PCIE30X2_POWERUP>; reset-names = "pipe";
arch/arm64/boot/dts/rockchip/rk356x.dtsi +1 -1
@@ -997,7 +997,7 @@ pcie2x1: pcie@fe260000 { power-domains = <&power RK3568_PD_PIPE>; ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>, <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>, - <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>; + <0x03000000 0x3 0x00000000 0x3 0x00000000 0x0 0x40000000>; resets = <&cru SRST_PCIE20_POWERUP>; reset-names = "pipe"; #address-cells = <3>;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 76/567 clk: tegra: tegra124-emc: fix device leak on set_rate()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit da61439c63d34ae6503d080a847f144d587e3a48 ]
Make sure to drop the reference taken when looking up the EMC device and its driver data on first set_rate().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra124-emc.c +1 -1
@@ -197,8 +197,8 @@ static struct tegra_emc *emc_ensure_emc_driver(struct tegra_clk_emc *tegra) tegra->emc_node =NULL ; tegra->emc =platform_get_drvdata (pdev); +put_device (&pdev->dev);if (!tegra->emc) { -put_device (&pdev->dev);pr_err ("%s: cannot find EMC driver\n" , __func__);return NULL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 50/567 ext4: get rid of ppath in ext4_split_extent()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit f74cde045617cc275c848c9692feac249ff7a3e7 ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_split_extent(), the following is done here:
* The 'allocated' is changed from passing a value to passing an address.
* Its caller needs to update ppath if it uses ppath.
No functional changes.
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 97 ++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 47 deletions(-)
fs/ext4/extents.c +50 -47
@@ -3348,21 +3348,18 @@ static struct ext4_ext_path *ext4_split_extent_at(handle_t *handle,* c> Splits in three extents: Somone is splitting in middle of the extent * */ -static int ext4_split_extent (handle_t *handle, -struct inode *inode, -struct ext4_ext_path **ppath, -struct ext4_map_blocks *map, -int split_flag, -int flags) +static struct ext4_ext_path *ext4_split_extent (handle_t *handle, +struct inode *inode, +struct ext4_ext_path *path, +struct ext4_map_blocks *map, +int split_flag,int flags, +unsigned int *allocated) { -struct ext4_ext_path *path = *ppath;ext4_lblk_t ee_block;struct ext4_extent *ex;unsigned int ee_len, depth; -int err =0 ;int unwritten;int split_flag1, flags1; -int allocated = map->m_len; depth =ext_depth (inode); ex = path[depth].p_ext;
@@ -3385,33 +3382,25 @@ static int ext4_split_extent(handle_t *handle,EXT4_EXT_DATA_ENTIRE_VALID1 ; path =ext4_split_extent_at (handle, inode, path, map->m_lblk + map->m_len, split_flag1, flags1); -if (IS_ERR (path)) { - err =PTR_ERR (path); - *ppath =NULL ; - goto out; +if (IS_ERR (path)) +return path; +/* +* Update path is required because previous ext4_split_extent_at +* may result in split of original leaf or extent zeroout. +*/ + path =ext4_find_extent (inode, map->m_lblk, path, flags); +if (IS_ERR (path)) +return path; + depth =ext_depth (inode); + ex = path[depth].p_ext; +if (!ex) { +EXT4_ERROR_INODE (inode,"unexpected hole at %lu" , + (unsigned long ) map->m_lblk); +ext4_free_ext_path (path); +return ERR_PTR (-EFSCORRUPTED ); } - *ppath = path; - }else { - allocated = ee_len - (map->m_lblk - ee_block); - } -/* -* Update path is required because previous ext4_split_extent_at() may -* result in split of original leaf or extent zeroout. -*/ - path =ext4_find_extent (inode, map->m_lblk, path, flags); -if (IS_ERR (path)) { - *ppath =NULL ; -return PTR_ERR (path); - } - *ppath = path; - depth =ext_depth (inode); - ex = path[depth].p_ext; -if (!ex) { -EXT4_ERROR_INODE (inode,"unexpected hole at %lu" , - (unsigned long ) map->m_lblk); -return -EFSCORRUPTED ; + unwritten =ext4_ext_is_unwritten (ex); } - unwritten =ext4_ext_is_unwritten (ex);if (map->m_lblk >= ee_block) { split_flag1 = split_flag &EXT4_EXT_DATA_VALID2 ;
@@ -3422,17 +3411,18 @@ static int ext4_split_extent(handle_t *handle, } path =ext4_split_extent_at (handle, inode, path, map->m_lblk, split_flag1, flags); -if (IS_ERR (path)) { - err =PTR_ERR (path); - *ppath =NULL ; - goto out; - } - *ppath = path; +if (IS_ERR (path)) +return path; } +if (allocated) { +if (map->m_lblk + map->m_len > ee_block + ee_len) + *allocated = ee_len - (map->m_lblk - ee_block); +else + *allocated = map->m_len; + }ext4_ext_show_leaf (inode, path); -out: -return err ? err : allocated; +return path; }/*
@@ -3677,10 +3667,15 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, } fallback: - err =ext4_split_extent (handle, inode, ppath, &split_map, split_flag, - flags); -if (err >0 ) - err =0 ; + path =ext4_split_extent (handle, inode, path, &split_map, split_flag, + flags,NULL ); +if (IS_ERR (path)) { + err =PTR_ERR (path); + *ppath =NULL ; + goto out; + } + err =0 ; + *ppath = path; out:/* If we have gotten a failure, don't zero out status tree */ if (!err) {
@@ -3726,6 +3721,7 @@ static int ext4_split_convert_extents(handle_t *handle,struct ext4_extent *ex;unsigned int ee_len;int split_flag =0 , depth; +unsigned int allocated =0 ;ext_debug (inode,"logical block %llu, max_blocks %u\n" , (unsigned long long )map->m_lblk, map->m_len);
@@ -3753,7 +3749,14 @@ static int ext4_split_convert_extents(handle_t *handle, split_flag |= (EXT4_EXT_MARK_UNWRIT2 |EXT4_EXT_DATA_VALID2 ); } flags |=EXT4_GET_BLOCKS_PRE_IO ; -return ext4_split_extent (handle, inode, ppath, map, split_flag, flags); + path =ext4_split_extent (handle, inode, path, map, split_flag, flags, + &allocated); +if (IS_ERR (path)) { + *ppath =NULL ; +return PTR_ERR (path); + } + *ppath = path; +return allocated; } static int ext4_convert_unwritten_extents_endio(handle_t *handle,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 77/567 usb: cdns3: remove redundant if branch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongyu Xie <[email protected]>
[ Upstream commit dedab674428f8a99468a4864c067128ba9ea83a6 ]
cdns->role_sw->dev->driver_data gets set in routines showing below, cdns_init
sw_desc.driver_data = cdns;
cdns->role_sw = usb_role_switch_register(dev, &sw_desc);
dev_set_drvdata(&sw->dev, desc->driver_data);In cdns_resume,cdns->role = cdns_role_get(cdns->role_sw); //line redundant
struct cdns *cdns = usb_role_switch_get_drvdata(sw);
dev_get_drvdata(&sw->dev)
return dev->driver_datareturn cdns->role;
"line redundant" equals to,
cdns->role = cdns->role;
So fix this if branch.
Stable-dep-of: 87e4b043b98a ("usb: cdns3: fix role switching during resume")
--- drivers/usb/cdns3/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/cdns3/core.c +1 -3
@@ -529,9 +529,7 @@ int cdns_resume(struct cdns *cdns)int ret =0 ;if (cdns_power_is_lost (cdns)) { -if (cdns->role_sw) { - cdns->role =cdns_role_get (cdns->role_sw); - }else { +if (!cdns->role_sw) { real_role =cdns_hw_role_state_machine (cdns);if (real_role != cdns->role) { ret =cdns_hw_role_switch (cdns);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 78/567 usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit 17c6526b333cfd89a4c888a6f7c876c8c326e5ae ]
cdns_power_is_lost() does a register read.
Call it only once rather than twice.
Stable-dep-of: 87e4b043b98a ("usb: cdns3: fix role switching during resume")
--- drivers/usb/cdns3/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/cdns3/core.c +3 -2
@@ -524,11 +524,12 @@ EXPORT_SYMBOL_GPL(cdns_suspend);int cdns_resume (struct cdns *cdns) { +bool power_lost =cdns_power_is_lost (cdns);enum usb_role real_role;bool role_changed = false;int ret =0 ; -if (cdns_power_is_lost (cdns)) { +if (power_lost) {if (!cdns->role_sw) { real_role =cdns_hw_role_state_machine (cdns);if (real_role != cdns->role) {
@@ -551,7 +552,7 @@ int cdns_resume(struct cdns *cdns) }if (cdns->roles[cdns->role]->resume) - cdns->roles[cdns->role]->resume (cdns,cdns_power_is_lost (cdns)); + cdns->roles[cdns->role]->resume (cdns, power_lost);return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 79/567 usb: cdns3: fix role switching during resume
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richard (TI) <[email protected]>
[ Upstream commit 87e4b043b98a1d269be0b812f383881abee0ca45 ]
If the role change while we are suspended, the cdns3 driver switches to the new mode during resume. However, switching to host mode in this context causes a NULL pointer dereference.
The host role's start() operation registers a xhci-hcd device, but its probe is deferred while we are in the resume path. The host role's resume() operation assumes the xhci-hcd device is already probed, which is not the case, leading to the dereference. Since the start() operation of the new role is already called, the resume operation can be skipped.
So skip the resume operation for the new role if a role switch occurs during resume. Once the resume sequence is complete, the xhci-hcd device can be probed in case of host mode.
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000208
Mem abort info:
...
Data abort info:
...
[0000000000000208] pgd=0000000000000000, p4d=0000000000000000
Internal error: Oops: 0000000096000004 [#1] SMP Modules linked in: CPU: 0 UID: 0 PID: 146 Comm: sh Not tainted 6.19.0-rc7-00013-g6e64f4aabfae-dirty #135 PREEMPT Hardware name: Texas Instruments J7200 EVM (DT) pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : usb_hcd_is_primary_hcd+0x0/0x1c lr : cdns_host_resume+0x24/0x5c ... Call trace: usb_hcd_is_primary_hcd+0x0/0x1c (P) cdns_resume+0x6c/0xbc cdns3_controller_resume.isra.0+0xe8/0x17c cdns3_plat_resume+0x18/0x24 platform_pm_resume+0x2c/0x68 dpm_run_callback+0x90/0x248 device_resume+0x100/0x24c dpm_resume+0x190/0x2ec dpm_resume_end+0x18/0x34 suspend_devices_and_enter+0x2b0/0xa44 pm_suspend+0x16c/0x5fc state_store+0x80/0xec kobj_attr_store+0x18/0x2c sysfs_kf_write+0x7c/0x94 kernfs_fop_write_iter+0x130/0x1dc vfs_write+0x240/0x370 ksys_write+0x70/0x108 __arm64_sys_write+0x1c/0x28 invoke_syscall+0x48/0x10c el0_svc_common.constprop.0+0x40/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x34/0x108 el0t_64_sync_handler+0xa0/0xe4 el0t_64_sync+0x198/0x19c Code: 52800003 f9407ca5 d63f00a0 17ffffe4 (f9410401) ---[ end trace 0000000000000000 ]---
--- drivers/usb/cdns3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/core.c +1 -1
@@ -551,7 +551,7 @@ int cdns_resume(struct cdns *cdns) } } -if (cdns->roles[cdns->role]->resume) +if (!role_changed && cdns->roles[cdns->role]->resume) cdns->roles[cdns->role]->resume (cdns, power_lost);return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 80/567 drm/amd: Fix hang on amdgpu unload by using pci_dev_is_disconnected()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit f7afda7fcd169a9168695247d07ad94cf7b9798f ]
The commit 6a23e7b4332c ("drm/amd: Clean up kfd node on surprise disconnect") introduced early KFD cleanup when drm_dev_is_unplugged() returns true. However, this causes hangs during normal module unload (rmmod amdgpu).
The issue occurs because drm_dev_unplug() is called in amdgpu_pci_remove() for all removal scenarios, not just surprise disconnects. This was done intentionally in commit 39934d3ed572 ("Revert "drm/amdgpu: TA unload messages are not actually sent to psp when amdgpu is uninstalled"") to fix IGT PCI software unplug test failures. As a result, drm_dev_is_unplugged() returns true even during normal module unload, triggering the early KFD cleanup inappropriately.
The correct check should distinguish between:
- Actual surprise disconnect (eGPU unplugged): pci_dev_is_disconnected() returns true
- Normal module unload (rmmod): pci_dev_is_disconnected() returns false
Replace drm_dev_is_unplugged() with pci_dev_is_disconnected() to ensure the early cleanup only happens during true hardware disconnect events.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -4034,7 +4034,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)* before ip_fini_early to prevent kfd locking refcount issues by calling * amdgpu_amdkfd_suspend() */ -if (drm_dev_is_unplugged (adev_to_drm (adev))) +if (pci_dev_is_disconnected (adev->pdev))amdgpu_amdkfd_device_fini_sw (adev);amdgpu_device_ip_fini_early (adev);
@@ -4046,7 +4046,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)amdgpu_gart_dummy_page_fini (adev); -if (drm_dev_is_unplugged (adev_to_drm (adev))) +if (pci_dev_is_disconnected (adev->pdev))amdgpu_device_unmap_mmio (adev); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 81/567 ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 1585cf83e98db32463e5d54161b06a5f01fe9976 ]
It was reported that we need the same quirk for HP ZBook Studio G4 (SSID 103c:826b) as other HP models to make the mute-LED working.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1085,6 +1085,7 @@ static const struct hda_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x103c ,0x8174 ,"HP Spectre x360" ,CXT_FIXUP_HP_SPECTRE ),SND_PCI_QUIRK (0x103c ,0x822e ,"HP ProBook 440 G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x8231 ,"HP ProBook 450 G4" ,CXT_FIXUP_MUTE_LED_GPIO ), +SND_PCI_QUIRK (0x103c ,0x826b ,"HP ZBook Studio G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x828c ,"HP EliteBook 840 G4" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x8299 ,"HP 800 G3 SFF" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 82/567 hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 007be4327e443d79c9dd9e56dc16c36f6395d208 ]
Simply copying shared data to a local variable cannot prevent data races. The compiler is allowed to optimize away the local copy and re-read the shared memory, causing a Time-of-Check Time-of-Use (TOCTOU) issue if the data changes between the check and the usage.
To enforce the use of the local variable, use READ_ONCE() when reading the shared data and WRITE_ONCE() when updating it. Apply these macros to the three identified locations (curr_sense, adc, and fault) where local variables are used for error validation, ensuring the value remains consistent.
--- drivers/hwmon/max16065.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/hwmon/max16065.c +13 -13
@@ -151,27 +151,27 @@ static struct max16065_data *max16065_update_device(struct device *dev)int i;for (i =0 ; i < data->num_adc; i++) - data->adc[i] - =max16065_read_adc (client,MAX16065_ADC (i)); +WRITE_ONCE (data->adc[i], +max16065_read_adc (client,MAX16065_ADC (i)));if (data->have_current) { - data->adc[MAX16065_NUM_ADC ] - =max16065_read_adc (client,MAX16065_CSP_ADC ); - data->curr_sense - =i2c_smbus_read_byte_data (client, -MAX16065_CURR_SENSE ); +WRITE_ONCE (data->adc[MAX16065_NUM_ADC ], +max16065_read_adc (client,MAX16065_CSP_ADC )); +WRITE_ONCE (data->curr_sense, +i2c_smbus_read_byte_data (client,MAX16065_CURR_SENSE )); }for (i =0 ; i <2 ; i++) - data->fault[i] - =i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)); +WRITE_ONCE (data->fault[i], +i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)));/* * MAX16067 and MAX16068 have separate undervoltage and * overvoltage alarm bits. Squash them together. */ if (data->chip == max16067 || data->chip == max16068) - data->fault[0 ] |= data->fault[1 ]; +WRITE_ONCE (data->fault[0 ], + data->fault[0 ] | data->fault[1 ]); data->last_updated = jiffies; data->valid = true;
@@ -185,7 +185,7 @@ static ssize_t max16065_alarm_show(struct device *dev, {struct sensor_device_attribute_2 *attr2 =to_sensor_dev_attr_2 (da);struct max16065_data *data =max16065_update_device (dev); -int val = data->fault[attr2->nr]; +int val =READ_ONCE (data->fault[attr2->nr]);if (val <0 )return val;
@@ -203,7 +203,7 @@ static ssize_t max16065_input_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (da);struct max16065_data *data =max16065_update_device (dev); -int adc = data->adc[attr->index]; +int adc =READ_ONCE (data->adc[attr->index]);if (unlikely (adc <0 ))return adc;
@@ -216,7 +216,7 @@ static ssize_t max16065_current_show(struct device *dev, struct device_attribute *da, char *buf) { struct max16065_data *data = max16065_update_device(dev); -int curr_sense = data->curr_sense; +int curr_sense =READ_ONCE (data->curr_sense);if (unlikely (curr_sense <0 ))return curr_sense;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 83/567 ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7bc0df86c2384bc1e2012a2c946f82305054da64 ]
Acer Swift SF314 (SSID 1025:136d) needs a bit of tweaks of the pin configurations for NID 0x16 and 0x19 to make the headphone / headset jack working. NID 0x17 can remain as is for the working speaker, and the built-in mic is supported via SOF.
--- sound/pci/hda/patch_conexant.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/pci/hda/patch_conexant.c +10 -0
@@ -312,6 +312,7 @@ enum {CXT_PINCFG_SWS_JS201D ,CXT_PINCFG_TOP_SPEAKER ,CXT_FIXUP_HP_A_U , + CXT_FIXUP_ACER_SWIFT_HP, };/* for hda_fixup_thinkpad_acpi() */
@@ -1028,6 +1029,14 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_hp_a_u, }, + [CXT_FIXUP_ACER_SWIFT_HP] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x16 ,0x0321403f },/* Headphone */ + {0x19 ,0x40f001f0 },/* Mic */ + { } + }, + }, };static const struct hda_quirk cxt5045_fixups[] = {
@@ -1077,6 +1086,7 @@ static const struct hda_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x1025 ,0x0543 ,"Acer Aspire One 522" ,CXT_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054c ,"Acer Aspire 3830TG" ,CXT_FIXUP_ASPIRE_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054f ,"Acer Aspire 4830T" ,CXT_FIXUP_ASPIRE_DMIC ), +SND_PCI_QUIRK (0x1025 ,0x136d ,"Acer Swift SF314" ,CXT_FIXUP_ACER_SWIFT_HP ),SND_PCI_QUIRK (0x103c ,0x8079 ,"HP EliteBook 840 G3" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x807C ,"HP EliteBook 820 G3" ,CXT_FIXUP_HP_DOCK ), SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 84/567 net: arcnet: com20020-pci: fix support for 2.5Mbit cards
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Nelson-Moore <[email protected]>
[ Upstream commit c7d9be66b71af490446127c6ffcb66d6bb71b8b9 ]
Commit 8c14f9c70327 ("ARCNET: add com20020 PCI IDs with metadata") converted the com20020-pci driver to use a card info structure instead of a single flag mask in driver_data. However, it failed to take into account that in the original code, driver_data of 0 indicates a card with no special flags, not a card that should not have any card info structure. This introduced a null pointer dereference when cards with no flags were probed.
Commit bd6f1fd5d33d ("net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()") then papered over this issue by rejecting cards with no driver_data instead of resolving the problem at its source.
Fix the original issue by introducing a new card info structure for 2.5Mbit cards that does not set any flags and using it if no driver_data is present.
--- drivers/net/arcnet/com20020-pci.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/net/arcnet/com20020-pci.c +15 -1
@@ -114,6 +114,8 @@ static const struct attribute_group com20020_state_group = { .attrs = com20020_state_attrs, }; +static struct com20020_pci_card_info card_info_2p5mbit; +static void com20020pci_remove (struct pci_dev *pdev); static int com20020pci_probe(struct pci_dev *pdev,
@@ -139,7 +141,7 @@ static int com20020pci_probe(struct pci_dev *pdev, ci = (struct com20020_pci_card_info *)id->driver_data;if (!ci) -return -EINVAL ; + ci = &card_info_2p5mbit; priv->ci = ci; mm = &ci->misc_map;
@@ -346,6 +348,18 @@ static struct com20020_pci_card_info card_info_5mbit = { .flags = ARC_IS_5MBIT, }; +static struct com20020_pci_card_info card_info_2p5mbit = { + .name ="ARC-PCI" , + .devcount =1 , + .chan_map_tbl = { + { + .bar =2 , + .offset =0x00 , + .size =0x08 , + }, + }, +}; +static struct com20020_pci_card_info card_info_sohard = { .name ="SOHARD SH ARC-PCI" , .devcount =1 ,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 85/567 drm/amd: Drop special case for yellow carp without discovery
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 3ef07651a5756e7de65615e18eacbf8822c23016 ]
amdgpu_gmc_get_vbios_allocations has a special case for how to bring up yellow carp when amdgpu discovery is turned off. As this ASIC ships with discovery turned on, it's generally dead code and worse it causes adev->mman.keep_stolen_vga_memory to not be initialized for yellow carp.
Remove it.
Stable-dep-of: 096bb75e13cc ("drm/amdgpu: keep vga memory on MacBooks with switchable graphics")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +0 -6
@@ -728,12 +728,6 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)case CHIP_RENOIR : adev->mman.keep_stolen_vga_memory = true;break ; -case CHIP_YELLOW_CARP : -if (amdgpu_discovery ==0 ) { - adev->mman.stolen_reserved_offset =0x1ffb0000 ; - adev->mman.stolen_reserved_size =64 *PAGE_SIZE ; - } -break ;default : adev->mman.keep_stolen_vga_memory = false;break ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 86/567 drm/amdgpu: keep vga memory on MacBooks with switchable graphics
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 096bb75e13cc508d3915b7604e356bcb12b17766 ]
On Intel MacBookPros with switchable graphics, when the iGPU is enabled, the address of VRAM gets put at 0 in the dGPU's virtual address space. This is non-standard and seems to cause issues with the cursor if it ends up at 0. We have the framework to reserve memory at 0 in the address space, so enable it here if the vram start address is 0.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +10 -0
@@ -728,6 +728,16 @@ void amdgpu_gmc_get_vbios_allocations(struct amdgpu_device *adev)case CHIP_RENOIR : adev->mman.keep_stolen_vga_memory = true;break ; +case CHIP_POLARIS10 : +case CHIP_POLARIS11 : +case CHIP_POLARIS12 : +/* MacBookPros with switchable graphics put VRAM at 0 when +* the iGPU is enabled which results in cursor issues if +* the cursor ends up at 0. Reserve vram at 0 in that case. +*/ +if (adev->gmc.vram_start ==0 ) + adev->mman.keep_stolen_vga_memory = true; +break ;default : adev->mman.keep_stolen_vga_memory = false;break ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 51/567 ext4: get rid of ppath in ext4_split_convert_extents()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 225057b1af381567ffa4eb813f4a28a5c38a25cf ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_split_convert_extents(), the following is done here:
* Its caller needs to update ppath if it uses ppath.
No functional changes.
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 65 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 32 deletions(-)
fs/ext4/extents.c +33 -32
@@ -3707,21 +3707,21 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,* being filled will be convert to initialized by the end_io callback function * via ext4_convert_unwritten_extents(). * -* Returns the size of unwritten extent to be written on success. +* The size of unwritten extent to be written is passed to the caller via the +* allocated pointer. Return an extent path pointer on success, or an error +* pointer on failure. */ -static int ext4_split_convert_extents (handle_t *handle, +static struct ext4_ext_path *ext4_split_convert_extents (handle_t *handle,struct inode *inode,struct ext4_map_blocks *map, -struct ext4_ext_path **ppath, -int flags) +struct ext4_ext_path *path, +int flags,unsigned int *allocated) { -struct ext4_ext_path *path = *ppath;ext4_lblk_t eof_block;ext4_lblk_t ee_block;struct ext4_extent *ex;unsigned int ee_len;int split_flag =0 , depth; -unsigned int allocated =0 ;ext_debug (inode,"logical block %llu, max_blocks %u\n" , (unsigned long long )map->m_lblk, map->m_len);
@@ -3749,14 +3749,8 @@ static int ext4_split_convert_extents(handle_t *handle, split_flag |= (EXT4_EXT_MARK_UNWRIT2 |EXT4_EXT_DATA_VALID2 ); } flags |=EXT4_GET_BLOCKS_PRE_IO ; - path =ext4_split_extent (handle, inode, path, map, split_flag, flags, - &allocated); -if (IS_ERR (path)) { - *ppath =NULL ; -return PTR_ERR (path); - } - *ppath = path; -return allocated; +return ext4_split_extent (handle, inode, path, map, split_flag, flags, + allocated); } static int ext4_convert_unwritten_extents_endio(handle_t *handle,
@@ -3792,11 +3786,14 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle, inode->i_ino, (unsigned long long )ee_block, ee_len, (unsigned long long)map->m_lblk, map->m_len);#endif - err =ext4_split_convert_extents (handle, inode, map, ppath, -EXT4_GET_BLOCKS_CONVERT ); -if (err <0 ) -return err; - path =ext4_find_extent (inode, map->m_lblk, *ppath,0 ); + path =ext4_split_convert_extents (handle, inode, map, path, +EXT4_GET_BLOCKS_CONVERT ,NULL ); +if (IS_ERR (path)) { + *ppath =NULL ; +return PTR_ERR (path); + } + + path =ext4_find_extent (inode, map->m_lblk, path,0 );if (IS_ERR (path)) { *ppath =NULL ;return PTR_ERR (path);
@@ -3853,11 +3850,14 @@ convert_initialized_extent(handle_t *handle, struct inode *inode, (unsigned long long)ee_block, ee_len);if (ee_block != map->m_lblk || ee_len > map->m_len) { - err =ext4_split_convert_extents (handle, inode, map, ppath, -EXT4_GET_BLOCKS_CONVERT_UNWRITTEN ); -if (err <0 ) -return err; - path =ext4_find_extent (inode, map->m_lblk, *ppath,0 ); + path =ext4_split_convert_extents (handle, inode, map, path, +EXT4_GET_BLOCKS_CONVERT_UNWRITTEN ,NULL ); +if (IS_ERR (path)) { + *ppath =NULL ; +return PTR_ERR (path); + } + + path =ext4_find_extent (inode, map->m_lblk, path,0 );if (IS_ERR (path)) { *ppath =NULL ;return PTR_ERR (path);
@@ -3923,19 +3923,20 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,/* get_block() before submitting IO, split the extent */ if (flags &EXT4_GET_BLOCKS_PRE_IO ) { - ret =ext4_split_convert_extents (handle, inode, map, ppath, - flags |EXT4_GET_BLOCKS_CONVERT ); -if (ret <0 ) { - err = ret; + *ppath =ext4_split_convert_extents (handle, inode, map, *ppath, + flags |EXT4_GET_BLOCKS_CONVERT , &allocated); +if (IS_ERR (*ppath)) { + err =PTR_ERR (*ppath); + *ppath =NULL ; goto out2; }/* -* shouldn't get a 0 return when splitting an extent unless +* shouldn't get a 0 allocated when splitting an extent unless * m_len is 0 (bug) or extent has been corrupted */ -if (unlikely (ret ==0 )) { +if (unlikely (allocated ==0 )) {EXT4_ERROR_INODE (inode, -"unexpected ret == 0, m_len = %u" , +"unexpected allocated == 0, m_len = %u" , map->m_len); err = -EFSCORRUPTED ; goto out2;
@@ -3996,9 +3997,9 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, err = -EFSCORRUPTED ; goto out2; } + allocated = ret; out: - allocated = ret; map->m_flags |=EXT4_MAP_NEW ; map_out: map->m_flags |=EXT4_MAP_MAPPED ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 87/567 eventpoll: Fix integer overflow in ep_loop_check_proc()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit fdcfce93073d990ed4b71752e31ad1c1d6e9d58b upstream.
If a recursive call to ep_loop_check_proc() hits the result = INT_MAX, an integer overflow will occur in the calling ep_loop_check_proc() at result = max(result, ep_loop_check_proc(ep_tovisit, depth + 1) + 1), breaking the recursion depth check.
Fix it by using a different placeholder value that can't lead to an overflow.
--- fs/eventpoll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/eventpoll.c +3 -2
@@ -1907,7 +1907,8 @@ static int ep_poll(struct eventpoll *ep,* @ep: the &struct eventpoll to be currently checked. * @depth: Current depth of the path being checked. * -* Return: depth of the subtree, or INT_MAX if we found a loop or went too deep. +* Return: depth of the subtree, or a value bigger than EP_MAX_NESTS if we found +* a loop or went too deep. */ static int ep_loop_check_proc (struct eventpoll *ep,int depth) {
@@ -1926,7 +1927,7 @@ static int ep_loop_check_proc(struct evestruct eventpoll *ep_tovisit; ep_tovisit = epi->ffd.file->private_data;if (ep_tovisit == inserting_into || depth >EP_MAX_NESTS ) - result =INT_MAX ; + result =EP_MAX_NESTS +1 ;else result =max (result,ep_loop_check_proc (ep_tovisit, depth +1 ) +1 );if (result >EP_MAX_NESTS )
Greg Kroah-Hartman
maintainerPATCH 88/567 media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit bfbc0b5b32a8f28ce284add619bf226716a59bc0 upstream.
dvb_dvr_open() calls dvb_ringbuffer_init() when a new reader opens the DVR device. dvb_ringbuffer_init() calls init_waitqueue_head(), which reinitializes the waitqueue list head to empty.
Since dmxdev->dvr_buffer.queue is a shared waitqueue (all opens of the same DVR device share it), this orphans any existing waitqueue entries from io_uring poll or epoll, leaving them with stale prev/next pointers while the list head is reset to {self, self}.
The waitqueue and spinlock in dvr_buffer are already properly initialized once in dvb_dmxdev_init(). The open path only needs to reset the buffer data pointer, size, and read/write positions.
Replace the dvb_ringbuffer_init() call in dvb_dvr_open() with direct assignment of data/size and a call to dvb_ringbuffer_reset(), which properly resets pread, pwrite, and error with correct memory ordering without touching the waitqueue or spinlock.
--- drivers/media/dvb-core/dmxdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dmxdev.c +3 -1
@@ -168,7 +168,9 @@ static int dvb_dvr_open(struct inode *inmutex_unlock (&dmxdev->mutex);return -ENOMEM ; } -dvb_ringbuffer_init (&dmxdev->dvr_buffer, mem,DVR_BUFFER_SIZE ); + dmxdev->dvr_buffer.data = mem; + dmxdev->dvr_buffer.size =DVR_BUFFER_SIZE ; +dvb_ringbuffer_reset (&dmxdev->dvr_buffer);if (dmxdev->may_do_mmap)dvb_vb2_init (&dmxdev->dvr_vb2_ctx,"dvr" , file->f_flags &O_NONBLOCK );
Greg Kroah-Hartman
maintainerPATCH 89/567 nfc: pn533: properly drop the usb interface reference on disconnect
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 12133a483dfa832241fbbf09321109a0ea8a520e upstream.
When the device is disconnected from the driver, there is a "dangling" reference count on the usb interface that was grabbed in the probe callback. Fix this up by properly dropping the reference after we are done with it.
--- drivers/nfc/pn533/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/pn533/usb.c +1 -0
@@ -629,6 +629,7 @@ static void pn533_usb_disconnect(structusb_free_urb (phy->out_urb);usb_free_urb (phy->ack_urb);kfree (phy->ack_buffer); +usb_put_dev (phy->udev);nfc_info (&interface->dev,"NXP PN533 NFC device disconnected\n" ); }
Greg Kroah-Hartman
maintainerPATCH 90/567 net: usb: kaweth: validate USB endpoints
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 4b063c002ca759d1b299988ee23f564c9609c875 upstream.
The kaweth driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kaweth.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/usb/kaweth.c +13 -0
@@ -883,6 +883,13 @@ static int kaweth_probe(const eth_addr_t bcast_addr = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF };int result =0 ;int rv = -EIO ; +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 }; dev_dbg(dev, "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n",
@@ -896,6 +903,12 @@ static int kaweth_probe( (int )udev->descriptor.bLength, (int)udev->descriptor.bDescriptorType); +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr) || + !usb_check_int_endpoints (intf, int_ep_addr)) { +dev_err (dev,"couldn't find required endpoints\n" ); +return -ENODEV ; + } + netdev =alloc_etherdev (sizeof (*kaweth));if (!netdev)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 91/567 net: usb: kalmia: validate USB endpoints
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit c58b6c29a4c9b8125e8ad3bca0637e00b71e2693 upstream.
The kalmia driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kalmia.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/usb/kalmia.c +7 -0
@@ -132,11 +132,18 @@ kalmia_bind(struct usbnet *dev, struct u {int status;u8 ethernet_addr[ETH_ALEN ]; +static const u8 ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 };/* Don't bind to AT command interface */ if (intf->cur_altsetting->desc.bInterfaceClass !=USB_CLASS_VENDOR_SPEC )return -EINVAL ; +if (!usb_check_bulk_endpoints (intf, ep_addr)) +return -ENODEV ; + dev->in =usb_rcvbulkpipe (dev->udev,0x81 &USB_ENDPOINT_NUMBER_MASK ); dev->out =usb_sndbulkpipe (dev->udev,0x02 &USB_ENDPOINT_NUMBER_MASK ); dev->status =NULL ;
Greg Kroah-Hartman
maintainerPATCH 92/567 net: usb: pegasus: validate USB endpoints
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 11de1d3ae5565ed22ef1f89d73d8f2d00322c699 upstream.
The pegasus driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/pegasus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/usb/pegasus.c +12 -1
@@ -815,8 +815,19 @@ static void unlink_all_urbs(pegasus_t *pstatic int alloc_urbs (pegasus_t *pegasus) { +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 };int res = -ENOMEM ; +if (!usb_check_bulk_endpoints (pegasus->intf, bulk_ep_addr) || + !usb_check_int_endpoints (pegasus->intf, int_ep_addr)) +return -ENODEV ; + pegasus->rx_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!pegasus->rx_urb) {return res;
@@ -1171,6 +1182,7 @@ static int pegasus_probe(struct usb_inte pegasus =netdev_priv (net); pegasus->dev_index = dev_index; + pegasus->intf = intf; res =alloc_urbs (pegasus);if (res <0 ) {
@@ -1182,7 +1194,6 @@ static int pegasus_probe(struct usb_inteINIT_DELAYED_WORK (&pegasus->carrier_check, check_carrier); - pegasus->intf = intf; pegasus->usb = dev; pegasus->net = net;
Greg Kroah-Hartman
maintainerPATCH 52/567 ext4: get rid of ppath in ext4_convert_unwritten_extents_endio()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 8d5ad7b08f9234bc92b9567cfe52e521df5f6626 ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_convert_unwritten_extents_endio(), the following is done here:
* Free the extents path when an error is encountered.
* Its caller needs to update ppath if it uses ppath.
No functional changes.
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-)
fs/ext4/extents.c +23 -20
@@ -3753,12 +3753,11 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, allocated); } -static int ext4_convert_unwritten_extents_endio (handle_t *handle, -struct inode *inode, -struct ext4_map_blocks *map, -struct ext4_ext_path **ppath) +static struct ext4_ext_path * +ext4_convert_unwritten_extents_endio (handle_t *handle,struct inode *inode, +struct ext4_map_blocks *map, +struct ext4_ext_path *path) { -struct ext4_ext_path *path = *ppath;struct ext4_extent *ex;ext4_lblk_t ee_block;unsigned int ee_len;
@@ -3788,24 +3787,19 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,#endif path =ext4_split_convert_extents (handle, inode, map, path,EXT4_GET_BLOCKS_CONVERT ,NULL ); -if (IS_ERR (path)) { - *ppath =NULL ; -return PTR_ERR (path); - } +if (IS_ERR (path)) +return path; path =ext4_find_extent (inode, map->m_lblk, path,0 ); -if (IS_ERR (path)) { - *ppath =NULL ; -return PTR_ERR (path); - } - *ppath = path; +if (IS_ERR (path)) +return path; depth =ext_depth (inode); ex = path[depth].p_ext; } err =ext4_ext_get_access (handle, inode, path + depth);if (err) - goto out; + goto errout;/* first mark the extent as initialized */ ext4_ext_mark_initialized (ex);
@@ -3816,9 +3810,15 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,/* Mark modified extent as dirty */ err =ext4_ext_dirty (handle, inode, path + path->p_depth); -out: +if (err) + goto errout; +ext4_ext_show_leaf (inode, path); -return err; +return path; + +errout: +ext4_free_ext_path (path); +return ERR_PTR (err); } static int
@@ -3946,10 +3946,13 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, }/* IO end_io complete, convert the filled extent to written */ if (flags &EXT4_GET_BLOCKS_CONVERT ) { - err =ext4_convert_unwritten_extents_endio (handle, inode, map, - ppath); -if (err <0 ) + *ppath =ext4_convert_unwritten_extents_endio (handle, inode, + map, *ppath); +if (IS_ERR (*ppath)) { + err =PTR_ERR (*ppath); + *ppath =NULL ; goto out2; + }ext4_update_inode_fsync_trans (handle, inode,1 ); goto map_out; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 53/567 ext4: get rid of ppath in ext4_ext_convert_to_initialized()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 33c14b8bd8a9ef8b3dfde136b0ca779e68c2f576 ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_ext_convert_to_initialized(), the following is done here:
* Free the extents path when an error is encountered.
* Its caller needs to update ppath if it uses ppath.
* The 'allocated' is changed from passing a value to passing an address.
No functional changes.
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 73 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 38 deletions(-)
fs/ext4/extents.c +35 -38
@@ -3445,13 +3445,11 @@ static struct ext4_ext_path *ext4_split_extent(handle_t *handle,* that are allocated and initialized. * It is guaranteed to be >= map->m_len. */ -static int ext4_ext_convert_to_initialized (handle_t *handle, -struct inode *inode, -struct ext4_map_blocks *map, -struct ext4_ext_path **ppath, -int flags) +static struct ext4_ext_path * +ext4_ext_convert_to_initialized (handle_t *handle,struct inode *inode, +struct ext4_map_blocks *map,struct ext4_ext_path *path, +int flags,unsigned int *allocated) { -struct ext4_ext_path *path = *ppath;struct ext4_sb_info *sbi;struct ext4_extent_header *eh;struct ext4_map_blocks split_map;
@@ -3461,7 +3459,6 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,unsigned int ee_len, depth, map_len = map->m_len;int err =0 ;int split_flag =EXT4_EXT_DATA_VALID2 ; -int allocated =0 ;unsigned int max_zeroout =0 ; ext_debug(inode, "logical block %llu, max_blocks %u\n",
@@ -3502,6 +3499,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle,* - L2: we only attempt to merge with an extent stored in the * same extent tree node. */ + *allocated =0 ; if ((map->m_lblk == ee_block) && /* See if we can merge left */ (map_len < ee_len) && /*L1*/
@@ -3531,7 +3529,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, (prev_len < (EXT_INIT_MAX_LEN - map_len))) { /*C4*/ err =ext4_ext_get_access (handle, inode, path + depth);if (err) - goto out; + goto errout;trace_ext4_ext_convert_to_initialized_fastpath (inode, map, ex, abut_ex);
@@ -3546,7 +3544,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, abut_ex->ee_len =cpu_to_le16 (prev_len + map_len);/* Result: number of initialized blocks past m_lblk */ - allocated = map_len; + *allocated = map_len; } } else if (((map->m_lblk + map_len) == (ee_block + ee_len)) && (map_len < ee_len) && /*L1*/
@@ -3577,7 +3575,7 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, (next_len < (EXT_INIT_MAX_LEN - map_len))) { /*C4*/ err =ext4_ext_get_access (handle, inode, path + depth);if (err) - goto out; + goto errout;trace_ext4_ext_convert_to_initialized_fastpath (inode, map, ex, abut_ex);
@@ -3592,18 +3590,20 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, abut_ex->ee_len =cpu_to_le16 (next_len + map_len);/* Result: number of initialized blocks past m_lblk */ - allocated = map_len; + *allocated = map_len; } } -if (allocated) { +if (*allocated) {/* Mark the block containing both extents as dirty */ err =ext4_ext_dirty (handle, inode, path + depth);/* Update path to point to the right extent */ path[depth].p_ext = abut_ex; +if (err) + goto errout; goto out; }else - allocated = ee_len - (map->m_lblk - ee_block); + *allocated = ee_len - (map->m_lblk - ee_block);WARN_ON (map->m_lblk < ee_block);/*
@@ -3630,21 +3630,21 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, split_map.m_lblk = map->m_lblk; split_map.m_len = map->m_len; -if (max_zeroout && (allocated > split_map.m_len)) { -if (allocated <= max_zeroout) { +if (max_zeroout && (*allocated > split_map.m_len)) { +if (*allocated <= max_zeroout) {/* case 3 or 5 */ zero_ex1.ee_block =cpu_to_le32 (split_map.m_lblk + split_map.m_len); zero_ex1.ee_len = -cpu_to_le16 (allocated - split_map.m_len); +cpu_to_le16 (*allocated - split_map.m_len);ext4_ext_store_pblock (&zero_ex1,ext4_ext_pblock (ex) + split_map.m_lblk + split_map.m_len - ee_block); err =ext4_ext_zeroout (inode, &zero_ex1);if (err) goto fallback; - split_map.m_len = allocated; + split_map.m_len = *allocated; }if (split_map.m_lblk - ee_block + split_map.m_len < max_zeroout) {
@@ -3662,27 +3662,24 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, split_map.m_len += split_map.m_lblk - ee_block; split_map.m_lblk = ee_block; - allocated = map->m_len; + *allocated = map->m_len; } } fallback: path =ext4_split_extent (handle, inode, path, &split_map, split_flag, flags,NULL ); -if (IS_ERR (path)) { - err =PTR_ERR (path); - *ppath =NULL ; - goto out; - } - err =0 ; - *ppath = path; +if (IS_ERR (path)) +return path; out:/* If we have gotten a failure, don't zero out status tree */ -if (!err) { -ext4_zeroout_es (inode, &zero_ex1); -ext4_zeroout_es (inode, &zero_ex2); - } -return err ? err : allocated; +ext4_zeroout_es (inode, &zero_ex1); +ext4_zeroout_es (inode, &zero_ex2); +return path; + +errout: +ext4_free_ext_path (path); +return ERR_PTR (err); }/*
@@ -3904,7 +3901,6 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, struct ext4_ext_path **ppath, int flags, unsigned int allocated, ext4_fsblk_t newblock) { - int ret = 0; int err = 0; ext_debug(inode, "logical block %llu, max_blocks %u, flags 0x%x, allocated %u\n",
@@ -3984,23 +3980,24 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,* For buffered writes, at writepage time, etc. Convert a * discovered unwritten extent to written. */ - ret =ext4_ext_convert_to_initialized (handle, inode, map, ppath, flags); -if (ret <0 ) { - err = ret; + *ppath =ext4_ext_convert_to_initialized (handle, inode, map, *ppath, + flags, &allocated); +if (IS_ERR (*ppath)) { + err =PTR_ERR (*ppath); + *ppath =NULL ; goto out2; }ext4_update_inode_fsync_trans (handle, inode,1 );/* -* shouldn't get a 0 return when converting an unwritten extent +* shouldn't get a 0 allocated when converting an unwritten extent * unless m_len is 0 (bug) or extent has been corrupted */ -if (unlikely (ret ==0 )) { -EXT4_ERROR_INODE (inode,"unexpected ret == 0, m_len = %u" , +if (unlikely (allocated ==0 )) { +EXT4_ERROR_INODE (inode,"unexpected allocated == 0, m_len = %u" , map->m_len); err = -EFSCORRUPTED ; goto out2; } - allocated = ret; out: map->m_flags |=EXT4_MAP_NEW ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 54/567 ext4: get rid of ppath in ext4_ext_handle_unwritten_extents()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 2ec2e1043473b3d4a3afbe6ad7c5a5b7a6fdf480 ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_ext_handle_unwritten_extents(), the following is done here:
* Free the extents path when an error is encountered.
* The 'allocated' is changed from passing a value to passing an address.
No functional changes.
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 82 +++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 45 deletions(-)
fs/ext4/extents.c +37 -45
@@ -3895,18 +3895,18 @@ convert_initialized_extent(handle_t *handle, struct inode *inode,return 0 ; } -static int +static struct ext4_ext_path *ext4_ext_handle_unwritten_extents (handle_t *handle,struct inode *inode,struct ext4_map_blocks *map, -struct ext4_ext_path **ppath,int flags, -unsigned int allocated,ext4_fsblk_t newblock) +struct ext4_ext_path *path,int flags, +unsigned int *allocated,ext4_fsblk_t newblock) {int err =0 ;ext_debug (inode,"logical block %llu, max_blocks %u, flags 0x%x, allocated %u\n" , (unsigned long long )map->m_lblk, map->m_len, flags, - allocated); -ext4_ext_show_leaf (inode, *ppath); + *allocated); +ext4_ext_show_leaf (inode, path);/* * When writing into unwritten space, we should not fail to
@@ -3915,40 +3915,34 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, flags |=EXT4_GET_BLOCKS_METADATA_NOFAIL ;trace_ext4_ext_handle_unwritten_extents (inode, map, flags, - allocated, newblock); + *allocated, newblock);/* get_block() before submitting IO, split the extent */ if (flags &EXT4_GET_BLOCKS_PRE_IO ) { - *ppath =ext4_split_convert_extents (handle, inode, map, *ppath, - flags |EXT4_GET_BLOCKS_CONVERT , &allocated); -if (IS_ERR (*ppath)) { - err =PTR_ERR (*ppath); - *ppath =NULL ; - goto out2; - } + path =ext4_split_convert_extents (handle, inode, map, path, + flags |EXT4_GET_BLOCKS_CONVERT , allocated); +if (IS_ERR (path)) +return path;/* * shouldn't get a 0 allocated when splitting an extent unless * m_len is 0 (bug) or extent has been corrupted */ -if (unlikely (allocated ==0 )) { +if (unlikely (*allocated ==0 )) {EXT4_ERROR_INODE (inode,"unexpected allocated == 0, m_len = %u" , map->m_len); err = -EFSCORRUPTED ; - goto out2; + goto errout; } map->m_flags |=EXT4_MAP_UNWRITTEN ; goto out; }/* IO end_io complete, convert the filled extent to written */ if (flags &EXT4_GET_BLOCKS_CONVERT ) { - *ppath =ext4_convert_unwritten_extents_endio (handle, inode, - map, *ppath); -if (IS_ERR (*ppath)) { - err =PTR_ERR (*ppath); - *ppath =NULL ; - goto out2; - } + path =ext4_convert_unwritten_extents_endio (handle, inode, + map, path); +if (IS_ERR (path)) +return path;ext4_update_inode_fsync_trans (handle, inode,1 ); goto map_out; }
@@ -3980,23 +3974,20 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,* For buffered writes, at writepage time, etc. Convert a * discovered unwritten extent to written. */ - *ppath =ext4_ext_convert_to_initialized (handle, inode, map, *ppath, - flags, &allocated); -if (IS_ERR (*ppath)) { - err =PTR_ERR (*ppath); - *ppath =NULL ; - goto out2; - } + path =ext4_ext_convert_to_initialized (handle, inode, map, path, + flags, allocated); +if (IS_ERR (path)) +return path;ext4_update_inode_fsync_trans (handle, inode,1 );/* * shouldn't get a 0 allocated when converting an unwritten extent * unless m_len is 0 (bug) or extent has been corrupted */ -if (unlikely (allocated ==0 )) { +if (unlikely (*allocated ==0 )) {EXT4_ERROR_INODE (inode,"unexpected allocated == 0, m_len = %u" , map->m_len); err = -EFSCORRUPTED ; - goto out2; + goto errout; } out:
@@ -4005,12 +3996,15 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode, map->m_flags |=EXT4_MAP_MAPPED ; out1: map->m_pblk = newblock; -if (allocated > map->m_len) - allocated = map->m_len; - map->m_len = allocated; -ext4_ext_show_leaf (inode, *ppath); -out2: -return err ? err : allocated; +if (*allocated > map->m_len) + *allocated = map->m_len; + map->m_len = *allocated; +ext4_ext_show_leaf (inode, path); +return path; + +errout: +ext4_free_ext_path (path); +return ERR_PTR (err); }/*
@@ -4204,7 +4198,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,struct ext4_extent newex, *ex, ex2;struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);ext4_fsblk_t newblock =0 , pblk; -int err =0 , depth, ret; +int err =0 , depth;unsigned int allocated =0 , offset =0 ;unsigned int allocated_clusters =0 ;struct ext4_allocation_request ar;
@@ -4279,13 +4273,11 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, goto out; } - ret =ext4_ext_handle_unwritten_extents ( - handle, inode, map, &path, flags, - allocated, newblock); -if (ret <0 ) - err = ret; -else - allocated = ret; + path =ext4_ext_handle_unwritten_extents ( + handle, inode, map, path, flags, + &allocated, newblock); +if (IS_ERR (path)) + err =PTR_ERR (path); goto out; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 55/567 ext4: correct the comments place for EXT4_EXT_MAY_ZEROOUT
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Erkun <[email protected]>
[ Upstream commit cc742fd1d184bb2a11bacf50587d2c85290622e4 ]
Move the comments just before we set EXT4_EXT_MAY_ZEROOUT in ext4_split_convert_extents.
Message-ID: <[email protected]>
Stable-dep-of: feaf2a80e78f ("ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O")
--- fs/ext4/extents.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/ext4/extents.c +4 -4
@@ -3727,10 +3727,6 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, >> inode->i_sb->s_blocksize_bits;if (eof_block < map->m_lblk + map->m_len) eof_block = map->m_lblk + map->m_len; -/* -* It is safe to convert extent to initialized via explicit -* zeroout only if extent is fully inside i_size or new_size. -*/ depth =ext_depth (inode); ex = path[depth].p_ext; ee_block =le32_to_cpu (ex->ee_block);
@@ -3741,6 +3737,10 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle, split_flag |=EXT4_EXT_DATA_ENTIRE_VALID1 ;/* Convert to initialized */ }else if (flags &EXT4_GET_BLOCKS_CONVERT ) { +/* +* It is safe to convert extent to initialized via explicit +* zeroout only if extent is fully inside i_size or new_size. +*/ split_flag |= ee_block + ee_len <= eof_block ?EXT4_EXT_MAY_ZEROOUT :0 ; split_flag |= (EXT4_EXT_MARK_UNWRIT2 |EXT4_EXT_DATA_VALID2 );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 56/567 ext4: dont set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit feaf2a80e78f89ee8a3464126077ba8683b62791 ]
When allocating blocks during within-EOF DIO and writeback with dioread_nolock enabled, EXT4_GET_BLOCKS_PRE_IO was set to split an existing large unwritten extent. However, EXT4_GET_BLOCKS_CONVERT was set when calling ext4_split_convert_extents(), which may potentially result in stale data issues.
Assume we have an unwritten extent, and then DIO writes the second half.
[UUUUUUUUUUUUUUUU] on-disk extent U: unwritten extent
[UUUUUUUUUUUUUUUU] extent status tree
|<- ->| ----> dio write this range
First, ext4_iomap_alloc() call ext4_map_blocks() with EXT4_GET_BLOCKS_PRE_IO, EXT4_GET_BLOCKS_UNWRIT_EXT and EXT4_GET_BLOCKS_CREATE flags set. ext4_map_blocks() find this extent and call ext4_split_convert_extents() with EXT4_GET_BLOCKS_CONVERT and the above flags set.
Then, ext4_split_convert_extents() calls ext4_split_extent() with EXT4_EXT_MAY_ZEROOUT, EXT4_EXT_MARK_UNWRIT2 and EXT4_EXT_DATA_VALID2 flags set, and it calls ext4_split_extent_at() to split the second half with EXT4_EXT_DATA_VALID2, EXT4_EXT_MARK_UNWRIT1, EXT4_EXT_MAY_ZEROOUT and EXT4_EXT_MARK_UNWRIT2 flags set. However, ext4_split_extent_at() failed to insert extent since a temporary lack -ENOSPC. It zeroes out the first half but convert the entire on-disk extent to written since the EXT4_EXT_DATA_VALID2 flag set, but left the second half as unwritten in the extent status tree.
[0000000000SSSSSS] data S: stale data, 0: zeroed [WWWWWWWWWWWWWWWW] on-disk extent W: written extent [WWWWWWWWWWUUUUUU] extent status tree
Finally, if the DIO failed to write data to the disk, the stale data in the second half will be exposed once the cached extent entry is gone.
Fix this issue by not passing EXT4_GET_BLOCKS_CONVERT when splitting an unwritten extent before submitting I/O, and make ext4_split_convert_extents() to zero out the entire extent range to zero for this case, and also mark the extent in the extent status tree for consistency.
Message-ID: <[email protected]>
--- fs/ext4/extents.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/ext4/extents.c +8 -4
@@ -3735,15 +3735,19 @@ static struct ext4_ext_path *ext4_split_convert_extents(handle_t *handle,/* Convert to unwritten */ if (flags &EXT4_GET_BLOCKS_CONVERT_UNWRITTEN ) { split_flag |=EXT4_EXT_DATA_ENTIRE_VALID1 ; -/* Convert to initialized */ - }else if (flags &EXT4_GET_BLOCKS_CONVERT ) { +/* Split the existing unwritten extent */ + }else if (flags & (EXT4_GET_BLOCKS_UNWRIT_EXT | +EXT4_GET_BLOCKS_CONVERT )) {/* * It is safe to convert extent to initialized via explicit * zeroout only if extent is fully inside i_size or new_size. */ split_flag |= ee_block + ee_len <= eof_block ?EXT4_EXT_MAY_ZEROOUT :0 ; - split_flag |= (EXT4_EXT_MARK_UNWRIT2 |EXT4_EXT_DATA_VALID2 ); + split_flag |=EXT4_EXT_MARK_UNWRIT2 ; +/* Convert to initialized */ +if (flags &EXT4_GET_BLOCKS_CONVERT ) + split_flag |=EXT4_EXT_DATA_VALID2 ; } flags |=EXT4_GET_BLOCKS_PRE_IO ; return ext4_split_extent(handle, inode, path, map, split_flag, flags,
@@ -3920,7 +3924,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,/* get_block() before submitting IO, split the extent */ if (flags &EXT4_GET_BLOCKS_PRE_IO ) { path =ext4_split_convert_extents (handle, inode, map, path, - flags |EXT4_GET_BLOCKS_CONVERT , allocated); + flags, allocated);if (IS_ERR (path))return path;/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 47/567 ext4: get rid of ppath in ext4_split_extent_at()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 1de82b1b60d4613753254bf3cbf622a4c02c945c ]
The use of path and ppath is now very confusing, so to make the code more readable, pass path between functions uniformly, and get rid of ppath.
To get rid of the ppath in ext4_split_extent_at(), the following is done here:
* Free the extents path when an error is encountered.
* Its caller needs to update ppath if it uses ppath.
* Teach ext4_ext_show_leaf() to skip error pointer.
No functional changes.
Stable-dep-of: 22784ca541c0 ("ext4: subdivide EXT4_EXT_DATA_VALID1")
--- fs/ext4/extents.c | 85 ++++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 38 deletions(-)
fs/ext4/extents.c +47 -38
@@ -84,12 +84,11 @@ static void ext4_extent_block_csum_set(struct inode *inode, et->et_checksum =ext4_extent_block_csum (inode, eh); } -static int ext4_split_extent_at (handle_t *handle, -struct inode *inode, -struct ext4_ext_path **ppath, -ext4_lblk_t split, -int split_flag, -int flags); +static struct ext4_ext_path *ext4_split_extent_at (handle_t *handle, +struct inode *inode, +struct ext4_ext_path *path, +ext4_lblk_t split, +int split_flag,int flags);static int ext4_ext_trunc_restart_fn (struct inode *inode,int *dropped) {
@@ -335,9 +334,15 @@ ext4_force_split_extent_at(handle_t *handle, struct inode *inode,if (nofail) flags |=EXT4_GET_BLOCKS_METADATA_NOFAIL |EXT4_EX_NOFAIL ; -return ext4_split_extent_at (handle, inode, ppath, lblk, unwritten ? + path =ext4_split_extent_at (handle, inode, path, lblk, unwritten ?EXT4_EXT_MARK_UNWRIT1 |EXT4_EXT_MARK_UNWRIT2 :0 , flags); +if (IS_ERR (path)) { + *ppath =NULL ; +return PTR_ERR (path); + } + *ppath = path; +return 0 ; } static int
@@ -689,7 +694,7 @@ static void ext4_ext_show_leaf(struct inode *inode, struct ext4_ext_path *path)struct ext4_extent *ex;int i; -if (!path) +if (IS_ERR_OR_NULL (path))return ; eh = path[depth].p_hdr;
@@ -3153,16 +3158,14 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)* a> the extent are splitted into two extent. * b> split is not needed, and just mark the extent. * -* return 0 on success. +* Return an extent path pointer on success, or an error pointer on failure. */ -static int ext4_split_extent_at (handle_t *handle, -struct inode *inode, -struct ext4_ext_path **ppath, -ext4_lblk_t split, -int split_flag, -int flags) +static struct ext4_ext_path *ext4_split_extent_at (handle_t *handle, +struct inode *inode, +struct ext4_ext_path *path, +ext4_lblk_t split, +int split_flag,int flags) { -struct ext4_ext_path *path = *ppath;ext4_fsblk_t newblock;ext4_lblk_t ee_block;struct ext4_extent *ex, newex, orig_ex, zero_ex;
@@ -3236,14 +3239,12 @@ static int ext4_split_extent_at(handle_t *handle,ext4_ext_mark_unwritten (ex2); path =ext4_ext_insert_extent (handle, inode, path, &newex, flags); -if (!IS_ERR (path)) { - *ppath = path; +if (!IS_ERR (path)) goto out; - } - *ppath =NULL ; + err =PTR_ERR (path);if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM ) -return err; +return path;/* * Get a new path to try to zeroout or fix the extent length.
@@ -3253,16 +3254,14 @@ static int ext4_split_extent_at(handle_t *handle,* in ext4_da_update_reserve_space() due to an incorrect * ee_len causing the i_reserved_data_blocks exception. */ - path =ext4_find_extent (inode, ee_block,NULL , - flags |EXT4_EX_NOFAIL ); + path =ext4_find_extent (inode, ee_block,NULL , flags |EXT4_EX_NOFAIL );if (IS_ERR (path)) {EXT4_ERROR_INODE (inode,"Failed split extent on %u, err %ld" , split,PTR_ERR (path)); -return PTR_ERR (path); +return path; } depth =ext_depth (inode); ex = path[depth].p_ext; - *ppath = path;if (EXT4_EXT_MAY_ZEROOUT & split_flag) {if (split_flag & (EXT4_EXT_DATA_VALID1 |EXT4_EXT_DATA_VALID2 )) {
@@ -3314,10 +3313,13 @@ static int ext4_split_extent_at(handle_t *handle,* and err is a non-zero error code. */ ext4_ext_dirty (handle, inode, path + path->p_depth); -return err; out: +if (err) { +ext4_free_ext_path (path); + path =ERR_PTR (err); + }ext4_ext_show_leaf (inode, path); -return err; +return path; }/*
@@ -3364,10 +3366,14 @@ static int ext4_split_extent(handle_t *handle,EXT4_EXT_MARK_UNWRIT2 ;if (split_flag &EXT4_EXT_DATA_VALID2 ) split_flag1 |=EXT4_EXT_DATA_VALID1 ; - err =ext4_split_extent_at (handle, inode, ppath, + path =ext4_split_extent_at (handle, inode, path, map->m_lblk + map->m_len, split_flag1, flags1); -if (err) +if (IS_ERR (path)) { + err =PTR_ERR (path); + *ppath =NULL ; goto out; + } + *ppath = path; }else { allocated = ee_len - (map->m_lblk - ee_block); }
@@ -3375,7 +3381,7 @@ static int ext4_split_extent(handle_t *handle,* Update path is required because previous ext4_split_extent_at() may * result in split of original leaf or extent zeroout. */ - path =ext4_find_extent (inode, map->m_lblk, *ppath, flags); + path =ext4_find_extent (inode, map->m_lblk, path, flags);if (IS_ERR (path)) { *ppath =NULL ;return PTR_ERR (path);
@@ -3397,13 +3403,17 @@ static int ext4_split_extent(handle_t *handle, split_flag1 |= split_flag & (EXT4_EXT_MAY_ZEROOUT |EXT4_EXT_MARK_UNWRIT2 ); } - err =ext4_split_extent_at (handle, inode, ppath, + path =ext4_split_extent_at (handle, inode, path, map->m_lblk, split_flag1, flags); -if (err) +if (IS_ERR (path)) { + err =PTR_ERR (path); + *ppath =NULL ; goto out; + } + *ppath = path; } -ext4_ext_show_leaf (inode, *ppath); +ext4_ext_show_leaf (inode, path); out:return err ? err : allocated; }
@@ -5590,22 +5600,21 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)if (ext4_ext_is_unwritten (extent)) split_flag =EXT4_EXT_MARK_UNWRIT1 |EXT4_EXT_MARK_UNWRIT2 ; - ret =ext4_split_extent_at (handle, inode, &path, + path =ext4_split_extent_at (handle, inode, path, offset_lblk, split_flag,EXT4_EX_NOCACHE |EXT4_GET_BLOCKS_PRE_IO |EXT4_GET_BLOCKS_METADATA_NOFAIL ); } -ext4_free_ext_path (path); -if (ret <0 ) { +if (IS_ERR (path)) {up_write (&EXT4_I (inode)->i_data_sem); + ret =PTR_ERR (path); goto out_stop; } - }else { -ext4_free_ext_path (path); } +ext4_free_ext_path (path);ext4_es_remove_extent (inode, offset_lblk,EXT_MAX_BLOCKS - offset_lblk);/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 94/567 can: usb: f81604: correctly anchor the urb in the read bulk callback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 952caa5da10bed22be09612433964f6877ba0dde upstream.
When submitting an urb, that is using the anchor pattern, it needs to be anchored before submitting it otherwise it could be leaked if usb_kill_anchored_urbs() is called. This logic is correctly done elsewhere in the driver, except in the read bulk callback so do that here also.
--- drivers/net/can/usb/f81604.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/net/can/usb/f81604.c +13 -2
@@ -413,6 +413,7 @@ static void f81604_read_bulk_callback(st {struct f81604_can_frame *frame = urb->transfer_buffer;struct net_device *netdev = urb->context; +struct f81604_port_priv *priv =netdev_priv (netdev);int ret;if (!netif_device_present (netdev))
@@ -445,10 +446,15 @@ static void f81604_read_bulk_callback(stf81604_process_rx_packet (netdev, frame); resubmit_urb: +usb_anchor_urb (urb, &priv->urbs_anchor); ret =usb_submit_urb (urb,GFP_ATOMIC ); +if (!ret) +return ; +usb_unanchor_urb (urb); +if (ret == -ENODEV )netif_device_detach (netdev); -else if (ret) +else netdev_err (netdev,"%s: failed to resubmit read bulk urb: %pe\n" , __func__,ERR_PTR (ret));
@@ -646,10 +652,15 @@ static void f81604_read_int_callback(strf81604_handle_tx (priv, data); resubmit_urb: +usb_anchor_urb (urb, &priv->urbs_anchor); ret =usb_submit_urb (urb,GFP_ATOMIC ); +if (!ret) +return ; +usb_unanchor_urb (urb); +if (ret == -ENODEV )netif_device_detach (netdev); -else if (ret) +else netdev_err (netdev,"%s: failed to resubmit int urb: %pe\n" , __func__,ERR_PTR (ret)); }
Greg Kroah-Hartman
maintainerPATCH 103/567 ALSA: usb-audio: Use correct version for UAC3 header validation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jun Seo <[email protected]>
commit 54f9d645a5453d0bfece0c465d34aaf072ea99fa upstream.
The entry of the validators table for UAC3 AC header descriptor is defined with the wrong protocol version UAC_VERSION_2, while it should have been UAC_VERSION_3. This results in the validator never matching for actual UAC3 devices (protocol == UAC_VERSION_3), causing their header descriptors to bypass validation entirely. A malicious USB device presenting a truncated UAC3 header could exploit this to cause out-of-bounds reads when the driver later accesses unvalidated descriptor fields.
The bug was introduced in the same commit as the recently fixed UAC3 feature unit sub-type typo, and appears to be from the same copy-paste error when the UAC3 section was created from the UAC2 section.
--- sound/usb/validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/validate.c +1 -1
@@ -281,7 +281,7 @@ static const struct usb_desc_validator a/* UAC_VERSION_2, UAC2_SAMPLE_RATE_CONVERTER: not implemented yet */ /* UAC3 */ - FIXED(UAC_VERSION_2, UAC_HEADER, struct uac3_ac_header_descriptor), + FIXED(UAC_VERSION_3, UAC_HEADER, struct uac3_ac_header_descriptor),FIXED (UAC_VERSION_3 ,UAC_INPUT_TERMINAL , struct uac3_input_terminal_descriptor), FIXED(UAC_VERSION_3, UAC_OUTPUT_TERMINAL,
Greg Kroah-Hartman
maintainerPATCH 104/567 wifi: radiotap: reject radiotap with unknown bits
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c854758abe0b8d86f9c43dc060ff56a0ee5b31e0 upstream.
The radiotap parser is currently only used with the radiotap namespace (not with vendor namespaces), but if the undefined field 18 is used, the alignment/size is unknown as well. In this case, iterator->_next_ns_data isn't initialized (it's only set for skipping vendor namespaces), and syzbot points out that we later compare against this uninitialized value.
Fix this by moving the rejection of unknown radiotap fields down to after the in-namespace lookup, so it will really use iterator->_next_ns_data only for vendor namespaces, even in case undefined fields are present.
--- net/wireless/radiotap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/radiotap.c +2 -2
@@ -239,14 +239,14 @@ int ieee80211_radiotap_iterator_next(default :if (!iterator->current_namespace || iterator->_arg_index >= iterator->current_namespace->n_bits) { -if (iterator->current_namespace == &radiotap_ns) -return -ENOENT ; align =0 ; }else { align = iterator->current_namespace->align_size[iterator->_arg_index].align; size = iterator->current_namespace->align_size[iterator->_arg_index].size; }if (!align) { +if (iterator->current_namespace == &radiotap_ns) +return -ENOENT ;/* skip all subsequent data */ iterator->_arg = iterator->_next_ns_data;/* give up on this namespace */
Greg Kroah-Hartman
maintainerPATCH 105/567 wifi: cfg80211: cancel rfkill_block work in wiphy_unregister()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
commit 767d23ade706d5fa51c36168e92a9c5533c351a1 upstream.
There is a use-after-free error in cfg80211_shutdown_all_interfaces found by syzkaller:
BUG: KASAN: use-after-free in cfg80211_shutdown_all_interfaces+0x213/0x220 Read of size 8 at addr ffff888112a78d98 by task kworker/0:5/5326 CPU: 0 UID: 0 PID: 5326 Comm: kworker/0:5 Not tainted 6.19.0-rc2 #2 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Workqueue: events cfg80211_rfkill_block_work Call Trace: <TASK> dump_stack_lvl+0x116/0x1f0 print_report+0xcd/0x630 kasan_report+0xe0/0x110 cfg80211_shutdown_all_interfaces+0x213/0x220 cfg80211_rfkill_block_work+0x1e/0x30 process_one_work+0x9cf/0x1b70 worker_thread+0x6c8/0xf10 kthread+0x3c5/0x780 ret_from_fork+0x56d/0x700 ret_from_fork_asm+0x1a/0x30 </TASK>
The problem arises due to the rfkill_block work is not cancelled when wiphy is being unregistered. In order to fix the issue cancel the corresponding work in wiphy_unregister().
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- net/wireless/core.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/core.c +1 -0
@@ -1132,6 +1132,7 @@ void wiphy_unregister(struct wiphy *wiph/* this has nothing to do now but make sure it's gone */ cancel_work_sync (&rdev->wiphy_work); +cancel_work_sync (&rdev->rfkill_block);cancel_work_sync (&rdev->conn_work);flush_work (&rdev->event_work);cancel_delayed_work_sync (&rdev->dfs_update_channels_wk);
Greg Kroah-Hartman
maintainerPATCH 106/567 wifi: mac80211: bounds-check link_id in ieee80211_ml_reconfiguration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ariel Silver <[email protected]>
commit 162d331d833dc73a3e905a24c44dd33732af1fc5 upstream.
link_id is taken from the ML Reconfiguration element (control & 0x000f), so it can be 0..15. link_removal_timeout[] has IEEE80211_MLD_MAX_NUM_LINKS
(15) elements, so index 15 is out-of-bounds. Skip subelements with link_id >= IEEE80211_MLD_MAX_NUM_LINKS to avoid a stack out-of-bounds write.
--- net/mac80211/mlme.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/mlme.c +3 -0
@@ -5854,6 +5854,9 @@ static void ieee80211_ml_reconfiguration control =le16_to_cpu (prof->control); link_id = control &IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID ; +if (link_id >=IEEE80211_MLD_MAX_NUM_LINKS ) +continue ; + removed_links |=BIT (link_id);/* the MAC address should not be included, but handle it */
Greg Kroah-Hartman
maintainerPATCH 107/567 wifi: mac80211: fix NULL pointer dereference in mesh_rx_csa_frame()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vahagn Vardanian <[email protected]>
commit 017c1792525064a723971f0216e6ef86a8c7af11 upstream.
In mesh_rx_csa_frame(), elems->mesh_chansw_params_ie is dereferenced at lines 1638 and 1642 without a prior NULL check:
ifmsh->chsw_ttl = elems->mesh_chansw_params_ie->mesh_ttl;
...
pre_value = le16_to_cpu(elems->mesh_chansw_params_ie->mesh_pre_value);The mesh_matches_local() check above only validates the Mesh ID, Mesh Configuration, and Supported Rates IEs. It does not verify the presence of the Mesh Channel Switch Parameters IE (element ID 118). When a received CSA action frame omits that IE, ieee802_11_parse_elems() leaves elems->mesh_chansw_params_ie as NULL, and the unconditional dereference causes a kernel NULL pointer dereference.
A remote mesh peer with an established peer link (PLINK_ESTAB) can trigger this by sending a crafted SPECTRUM_MGMT/CHL_SWITCH action frame that includes a matching Mesh ID and Mesh Configuration IE but omits the Mesh Channel Switch Parameters IE. No authentication beyond the default open mesh peering is required.
Crash confirmed on kernel 6.17.0-5-generic via mac80211_hwsim:
BUG: kernel NULL pointer dereference, address: 0000000000000000 Oops: Oops: 0000 [#1] SMP NOPTI RIP: 0010:ieee80211_mesh_rx_queued_mgmt+0x143/0x2a0 [mac80211] CR2: 0000000000000000
Fix by adding a NULL check for mesh_chansw_params_ie after mesh_matches_local() returns, consistent with how other optional IEs are guarded throughout the mesh code.
The bug has been present since v3.13 (released 2014-01-19).
--- net/mac80211/mesh.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/mesh.c +3 -0
@@ -1640,6 +1640,9 @@ static void mesh_rx_csa_frame(struct ieeif (!mesh_matches_local (sdata, elems)) goto free; +if (!elems->mesh_chansw_params_ie) + goto free; + ifmsh->chsw_ttl = elems->mesh_chansw_params_ie->mesh_ttl;if (!--ifmsh->chsw_ttl) fwd_csa = false;
Greg Kroah-Hartman
maintainerPATCH 108/567 IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
commit 117942ca43e2e3c3d121faae530989931b7f67e1 upstream.
Fix a user triggerable leak on the system call failure path.
--- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mthca/mthca_provider.c +3 -2
@@ -428,6 +428,8 @@ static int mthca_create_srq(struct ib_srif (context &&ib_copy_to_udata (udata, &srq->srqn,sizeof (__u32))) {mthca_free_srq (to_mdev (ibsrq->device), srq); +mthca_unmap_user_db (to_mdev (ibsrq->device), &context->uar, + context->db_tab, ucmd.db_index);return -EFAULT ; }
@@ -436,6 +438,7 @@ static int mthca_create_srq(struct ib_srstatic int mthca_destroy_srq (struct ib_srq *srq,struct ib_udata *udata) { +mthca_free_srq (to_mdev (srq->device),to_msrq (srq));if (udata) {struct mthca_ucontext *context = rdma_udata_to_drv_context(
@@ -446,8 +449,6 @@ static int mthca_destroy_srq(struct ib_smthca_unmap_user_db (to_mdev (srq->device), &context->uar, context->db_tab,to_msrq (srq)->db_index); } - -mthca_free_srq (to_mdev (srq->device),to_msrq (srq));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 109/567 RDMA/irdma: Fix kernel stack leak in irdma_create_user_ah()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
commit 74586c6da9ea222a61c98394f2fc0a604748438c upstream.
struct irdma_create_ah_resp { // 8 bytes, no padding
__u32 ah_id; // offset 0 - SET (uresp.ah_id = ah->sc_ah.ah_info.ah_idx)
__u8 rsvd[4]; // offset 4 - NEVER SET <- LEAK};
rsvd[4]: 4 bytes of stack memory leaked unconditionally. Only ah_id is assigned before ib_respond_udata().
The reserved members of the structure were not zeroed.
--- drivers/infiniband/hw/irdma/verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/irdma/verbs.c +1 -1
@@ -4588,7 +4588,7 @@ static int irdma_create_user_ah(struct i#define IRDMA_CREATE_AH_MIN_RESP_LEN offsetofend(struct irdma_create_ah_resp, rsvd) struct irdma_ah *ah = container_of(ibah, struct irdma_ah, ibah);struct irdma_device *iwdev =to_iwdev (ibah->pd->device); -struct irdma_create_ah_resp uresp; +struct irdma_create_ah_resp uresp = {};struct irdma_ah *parent_ah;int err;
Greg Kroah-Hartman
maintainerPATCH 110/567 net/sched: ets: fix divide by zero in the offload path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davide Caratti <[email protected]>
commit e35626f610f3d2b7953ccddf6a77453da22b3a9e upstream.
Offloading ETS requires computing each class' WRR weight: this is done by averaging over the sums of quanta as 'q_sum' and 'q_psum'. Using unsigned int, the same integer size as the individual DRR quanta, can overflow and even cause division by zero, like it happened in the following splat:
Oops: divide error: 0000 [#1] SMP PTI CPU: 13 UID: 0 PID: 487 Comm: tc Tainted: G E 6.19.0-virtme #45 PREEMPT(full) Tainted: [E]=UNSIGNED_MODULE Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Call Trace: <TASK> ets_qdisc_change+0x870/0xf40 [sch_ets] qdisc_create+0x12b/0x540 tc_modify_qdisc+0x6d7/0xbd0 rtnetlink_rcv_msg+0x168/0x6b0 netlink_rcv_skb+0x5c/0x110 netlink_unicast+0x1d6/0x2b0 netlink_sendmsg+0x22e/0x470 ____sys_sendmsg+0x38a/0x3c0 ___sys_sendmsg+0x99/0xe0 __sys_sendmsg+0x8a/0xf0 do_syscall_64+0x111/0xf80 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f440b81c77e Code: 4d 89 d8 e8 d4 bc 00 00 4c 8b 5d f8 41 8b 93 08 03 00 00 59 5e 48 83 f8 fc 74 11 c9 c3 0f 1f 80 00 00 00 00 48 8b 45 10 0f 05 <c9> c3 83 e2 39 83 fa 08 75 e7 e8 13 ff ff ff 0f 1f 00 f3 0f 1e fa RSP: 002b:00007fff951e4c10 EFLAGS: 00000202 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000481820 RCX: 00007f440b81c77e RDX: 0000000000000000 RSI: 00007fff951e4cd0 RDI: 0000000000000003 RBP: 00007fff951e4c20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000202 R12: 00007fff951f4fa8 R13: 00000000699ddede R14: 00007f440bb01000 R15: 0000000000486980 </TASK> Modules linked in: sch_ets(E) netdevsim(E) ---[ end trace 0000000000000000 ]--- RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Kernel panic - not syncing: Fatal exception Kernel Offset: 0x30000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) ---[ end Kernel panic - not syncing: Fatal exception ]---
Fix this using 64-bit integers for 'q_sum' and 'q_psum'.
--- net/sched/sch_ets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/sched/sch_ets.c +8 -4
@@ -115,12 +115,12 @@ static void ets_offload_change(struct Qdstruct ets_sched *q =qdisc_priv (sch);struct tc_ets_qopt_offload qopt;unsigned int w_psum_prev =0 ; -unsigned int q_psum =0 ; -unsigned int q_sum =0 ;unsigned int quantum;unsigned int w_psum;unsigned int weight;unsigned int i; +u64 q_psum =0 ; +u64 q_sum =0 ;if (!tc_can_offload (dev) || !dev->netdev_ops->ndo_setup_tc)return ;
@@ -138,8 +138,12 @@ static void ets_offload_change(struct Qdfor (i =0 ; i < q->nbands; i++) { quantum = q->classes[i].quantum; - q_psum += quantum; - w_psum = quantum ? q_psum *100 / q_sum :0 ; +if (quantum) { + q_psum += quantum; + w_psum =div64_u64 (q_psum *100 , q_sum); + }else { + w_psum =0 ; + } weight = w_psum - w_psum_prev; w_psum_prev = w_psum;
Greg Kroah-Hartman
maintainerPATCH 111/567 scsi: target: Fix recursive locking in __configfs_open_file()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prithvi Tambewagh <[email protected]>
commit 14d4ac19d1895397532eec407433c5d74d9da53b upstream.
In flush_write_buffer, &p->frag_sem is acquired and then the loaded store function is called, which, here, is target_core_item_dbroot_store(). This function called filp_open(), following which these functions were called (in reverse order), according to the call trace:
down_read
__configfs_open_file
do_dentry_open
vfs_open
do_open
path_openat
do_filp_open
file_open_name
filp_open
target_core_item_dbroot_store
flush_write_buffer
configfs_write_iter
target_core_item_dbroot_store() tries to validate the new file path by trying to open the file path provided to it; however, in this case, the bug report shows:
db_root: not a directory: /sys/kernel/config/target/dbroot
indicating that the same configfs file was tried to be opened, on which it is currently working on. Thus, it is trying to acquire frag_sem semaphore of the same file of which it already holds the semaphore obtained in flush_write_buffer(), leading to acquiring the semaphore in a nested manner and a possibility of recursive locking.
Fix this by modifying target_core_item_dbroot_store() to use kern_path() instead of filp_open() to avoid opening the file using filesystem-specific function __configfs_open_file(), and further modifying it to make this fix compatible.
--- drivers/target/target_core_configfs.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/target/target_core_configfs.c +6 -9
@@ -108,8 +108,8 @@ static ssize_t target_core_item_dbroot_s const char *page, size_t count) { ssize_t read_bytes; -struct file *fp;ssize_t r = -EINVAL ; +struct path path = {};mutex_lock (&target_devices_lock);if (target_devices) {
@@ -131,17 +131,14 @@ static ssize_t target_core_item_dbroot_s db_root_stage[read_bytes -1 ] ='\0' ;/* validate new db root before accepting it */ - fp =filp_open (db_root_stage,O_RDONLY ,0 ); -if (IS_ERR (fp)) { + r =kern_path (db_root_stage,LOOKUP_FOLLOW |LOOKUP_DIRECTORY , &path); +if (r) {pr_err ("db_root: cannot open: %s\n" , db_root_stage); +if (r == -ENOTDIR ) +pr_err ("db_root: not a directory: %s\n" , db_root_stage); goto unlock; } -if (!S_ISDIR (file_inode (fp)->i_mode)) { -filp_close (fp,NULL ); -pr_err ("db_root: not a directory: %s\n" , db_root_stage); - goto unlock; - } -filp_close (fp,NULL ); +path_put (&path);strncpy (db_root, db_root_stage, read_bytes);pr_debug ("Target_Core_ConfigFS: db_root set to %s\n" , db_root);
Greg Kroah-Hartman
maintainerPATCH 112/567 Squashfs: check metadata block offset is within range
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phillip Lougher <[email protected]>
commit fdb24a820a5832ec4532273282cbd4f22c291a0d upstream.
Syzkaller reports a "general protection fault in squashfs_copy_data"
This is ultimately caused by a corrupted index look-up table, which produces a negative metadata block offset.
This is subsequently passed to squashfs_copy_data (via squashfs_read_metadata) where the negative offset causes an out of bounds access.
The fix is to check that the offset is within range in squashfs_read_metadata. This will trap this and other cases.
--- fs/squashfs/cache.c | 3 +++ 1 file changed, 3 insertions(+)
fs/squashfs/cache.c +3 -0
@@ -340,6 +340,9 @@ int squashfs_read_metadata(struct super_if (unlikely (length <0 ))return -EIO ; +if (unlikely (*offset <0 || *offset >=SQUASHFS_METADATA_SIZE )) +return -EIO ; +while (length) { entry =squashfs_cache_get (sb, msblk->block_cache, *block,0 );if (entry->error) {
Greg Kroah-Hartman
maintainerPATCH 95/567 can: ucan: Fix infinite loop from zero-length messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 1e446fd0582ad8be9f6dafb115fc2e7245f9bea7 upstream.
If a broken ucan device gets a message with the message length field set to 0, then the driver will loop for forever in ucan_read_bulk_callback(), hanging the system. If the length is 0, just skip the message and go on to the next one.
This has been fixed in the kvaser_usb driver in the past in commit 0c73772cd2b8 ("can: kvaser_usb: leaf: Fix potential infinite loop in command parsers"), so there must be some broken devices out there like this somewhere.
--- drivers/net/can/usb/ucan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/usb/ucan.c +1 -1
@@ -749,7 +749,7 @@ static void ucan_read_bulk_callback(stru len =le16_to_cpu (m->len);/* check sanity (length of content) */ -if (urb->actual_length - pos < len) { +if ((len ==0 ) || (urb->actual_length - pos < len)) {netdev_warn (up->netdev,"invalid message (short; no data; l:%d)\n" , urb->actual_length);
Greg Kroah-Hartman
maintainerPATCH 113/567 drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars Ellenberg <[email protected]>
commit ab140365fb62c0bdab22b2f516aff563b2559e3b upstream.
Even though we check that we "should" be able to do lc_get_cumulative() while holding the device->al_lock spinlock, it may still fail, if some other code path decided to do lc_try_lock() with bad timing.
If that happened, we logged "LOGIC BUG for enr=...", but still did not return an error.
The rest of the code now assumed that this request has references for the relevant activity log extents.
The implcations are that during an active resync, mutual exclusivity of resync versus application IO is not guaranteed. And a potential crash at this point may not realizs that these extents could have been target of in-flight IO and would need to be resynced just in case.
Also, once the request completes, it will give up activity log references it does not even hold, which will trigger a BUG_ON(refcnt == 0) in lc_put().
Fix:
Do not crash the kernel for a condition that is harmless during normal
operation: also catch "e->refcnt == 0", not only "e == NULL" when being noisy about "al_complete_io() called on inactive extent %u\n".
And do not try to be smart and "guess" whether something will work, then be surprised when it does not.
Deal with the fact that it may or may not work. If it does not, remember a possible "partially in activity log" state (only possible for requests that cross extent boundaries), and return an error code from drbd_al_begin_io_nonblock().
A latter call for the same request will then resume from where we left off.
--- drivers/block/drbd/drbd_actlog.c | 53 ++++++++++++++++--------------------- drivers/block/drbd/drbd_interval.h | 5 ++- 2 files changed, 27 insertions(+), 31 deletions(-)
drivers/block/drbd/drbd_actlog.c +23 -30
@@ -483,38 +483,20 @@ void drbd_al_begin_io(struct drbd_deviceint drbd_al_begin_io_nonblock (struct drbd_device *device,struct drbd_interval *i) { -struct lru_cache *al = device->act_log;/* for bios crossing activity log extent boundaries, * we may need to activate two extents in one go */ unsigned first = i->sector >> (AL_EXTENT_SHIFT -9 );unsigned last = i->size ==0 ? first : (i->sector + (i->size >>9 ) -1 ) >> (AL_EXTENT_SHIFT -9 ); -unsigned nr_al_extents; -unsigned available_update_slots;unsigned enr; -D_ASSERT (device, first <= last); - - nr_al_extents =1 + last - first;/* worst case: all touched extends are cold. */ - available_update_slots =min (al->nr_elements - al->used, - al->max_pending_changes - al->pending_changes); - -/* We want all necessary updates for a given request within the same transaction -* We could first check how many updates are *actually* needed, -* and use that instead of the worst-case nr_al_extents */ -if (available_update_slots < nr_al_extents) { -/* Too many activity log extents are currently "hot". -* -* If we have accumulated pending changes already, -* we made progress. -* -* If we cannot get even a single pending change through, -* stop the fast path until we made some progress, -* or requests to "cold" extents could be starved. */ -if (!al->pending_changes) -__set_bit (__LC_STARVING, &device->act_log->flags); -return -ENOBUFS ; +if (i->partially_in_al_next_enr) { +D_ASSERT (device, first < i->partially_in_al_next_enr); +D_ASSERT (device, last >= i->partially_in_al_next_enr); + first = i->partially_in_al_next_enr; } +D_ASSERT (device, first <= last); +/* Is resync active in this area? */ for (enr = first; enr <= last; enr++) {struct lc_element *tmp;
@@ -529,14 +511,21 @@ int drbd_al_begin_io_nonblock(struct drb } } -/* Checkout the refcounts. -* Given that we checked for available elements and update slots above, -* this has to be successful. */ +/* Try to checkout the refcounts. */ for (enr = first; enr <= last; enr++) {struct lc_element *al_ext; al_ext =lc_get_cumulative (device->act_log, enr); -if (!al_ext) -drbd_info (device,"LOGIC BUG for enr=%u\n" , enr); + +if (!al_ext) { +/* Did not work. We may have exhausted the possible +* changes per transaction. Or raced with someone +* "locking" it against changes. +* Remember where to continue from. +*/ +if (enr > first) + i->partially_in_al_next_enr = enr; +return -ENOBUFS ; + } }return 0 ; }
@@ -556,7 +545,11 @@ void drbd_al_complete_io(struct drbd_devfor (enr = first; enr <= last; enr++) { extent =lc_find (device->act_log, enr); -if (!extent) { +/* Yes, this masks a bug elsewhere. However, during normal +* operation this is harmless, so no need to crash the kernel +* by the BUG_ON(refcount == 0) in lc_put(). +*/ +if (!extent || extent->refcnt ==0 ) {drbd_err (device,"al_complete_io() called on inactive extent %u\n" , enr);continue ; }
drivers/block/drbd/drbd_interval.h +4 -1
@@ -8,12 +8,15 @@struct drbd_interval {struct rb_node rb;sector_t sector;/* start sector of the interval */ -unsigned int size;/* size in bytes */ sector_t end;/* highest interval end in subtree */ +unsigned int size;/* size in bytes */ unsigned int local:1 /* local or remote request? */ ;unsigned int waiting:1 ;/* someone is waiting for completion */ unsigned int completed:1 ;/* this has been completed already; * ignore for conflict detection */ + +/* to resume a partially successful drbd_al_begin_io_nonblock(); */ +unsigned int partially_in_al_next_enr; };static inline void drbd_clear_interval (struct drbd_interval *i)
Greg Kroah-Hartman
maintainerPATCH 114/567 drbd: fix null-pointer dereference on local read error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Böhmwalder <[email protected]>
commit 0d195d3b205ca90db30d70d09d7bb6909aac178f upstream.
In drbd_request_endio(), READ_COMPLETED_WITH_ERROR is passed to __req_mod() with a NULL peer_device:
__req_mod(req, what, NULL, &m);
The READ_COMPLETED_WITH_ERROR handler then unconditionally passes this NULL peer_device to drbd_set_out_of_sync(), which dereferences it, causing a null-pointer dereference.
Fix this by obtaining the peer_device via first_peer_device(device), matching how drbd_req_destroy() handles the same situation.
--- drivers/block/drbd/drbd_req.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/drbd/drbd_req.c +2 -1
@@ -621,7 +621,8 @@ int __req_mod(struct drbd_request *req,break ;case READ_COMPLETED_WITH_ERROR : -drbd_set_out_of_sync (peer_device, req->i.sector, req->i.size); +drbd_set_out_of_sync (first_peer_device (device), + req->i.sector, req->i.size);drbd_report_io_error (device, req);__drbd_chk_io_error (device,DRBD_READ_ERROR ); fallthrough;
Greg Kroah-Hartman
maintainerPATCH 115/567 smb: client: fix cifs_pick_channel when channels are equally loaded
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henrique Carvalho <[email protected]>
commit 663c28469d3274d6456f206a6671c91493d85ff1 upstream.
cifs_pick_channel uses (start % chan_count) when channels are equally loaded, but that can return a channel that failed the eligibility checks.
Drop the fallback and return the scan-selected channel instead. If none is eligible, keep the existing behavior of using the primary channel.
--- fs/smb/client/transport.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
fs/smb/client/transport.c +10 -11
@@ -1022,16 +1022,21 @@ cifs_cancelled_callback(struct mid_q_ent }/* -* Return a channel (master if none) of @ses that can be used to send -* regular requests. +* cifs_pick_channel - pick an eligible channel for network operations * -* If we are currently binding a new channel (negprot/sess.setup), -* return the new incomplete channel. +* @ses: session reference +* +* Select an eligible channel (not terminating and not marked as needing +* reconnect), preferring the least loaded one. If no eligible channel is +* found, fall back to the primary channel (index 0). +* +* Return: TCP_Server_Info pointer for the chosen channel, or NULL if @ses is +* NULL. */ struct TCP_Server_Info *cifs_pick_channel (struct cifs_ses *ses) {uint index =0 ; -unsigned int min_in_flight =UINT_MAX , max_in_flight =0 ; +unsigned int min_in_flight =UINT_MAX ;struct TCP_Server_Info *server =NULL ;int i, start, cur;
@@ -1061,14 +1066,8 @@ struct TCP_Server_Info *cifs_pick_channe min_in_flight = server->in_flight; index = cur; } -if (server->in_flight > max_in_flight) - max_in_flight = server->in_flight; } -/* if all channels are equally loaded, fall back to round-robin */ -if (min_in_flight == max_in_flight) - index = (uint )start % ses->chan_count; - server = ses->chans[index].server;spin_unlock (&ses->chan_lock);
Greg Kroah-Hartman
maintainerPATCH 116/567 smb: client: fix broken multichannel with krb5+signing
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
commit d9d1e319b39ea685ede59319002d567c159d23c3 upstream.
When mounting a share with 'multichannel,max_channels=n,sec=krb5i', the client was duplicating signing key for all secondary channels, thus making the server fail all commands sent from secondary channels due to bad signatures.
Every channel has its own signing key, so when establishing a new channel with krb5 auth, make sure to use the new session key as the derived key to generate channel's signing key in SMB2_auth_kerberos().
Repro:
$ mount.cifs //srv/share /mnt -o multichannel,max_channels=4,sec=krb5i $ sleep 5 $ umount /mnt $ dmesg ... CIFS: VFS: sign fail cmd 0x5 message id 0x2 CIFS: VFS: \\srv SMB signature verification returned error = -13 CIFS: VFS: sign fail cmd 0x5 message id 0x2 CIFS: VFS: \\srv SMB signature verification returned error = -13 CIFS: VFS: sign fail cmd 0x4 message id 0x2 CIFS: VFS: \\srv SMB signature verification returned error = -13
--- fs/smb/client/smb2pdu.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
fs/smb/client/smb2pdu.c +10 -12
@@ -1660,19 +1660,17 @@ SMB2_auth_kerberos(struct SMB2_sess_data is_binding = (ses->ses_status ==SES_GOOD );spin_unlock (&ses->ses_lock); -/* keep session key if binding */ -if (!is_binding) { -kfree_sensitive (ses->auth_key.response); - ses->auth_key.response =kmemdup (msg->data, msg->sesskey_len, -GFP_KERNEL ); -if (!ses->auth_key.response) { -cifs_dbg (VFS ,"Kerberos can't allocate (%u bytes) memory\n" , - msg->sesskey_len); - rc = -ENOMEM ; - goto out_put_spnego_key; - } - ses->auth_key.len = msg->sesskey_len; +kfree_sensitive (ses->auth_key.response); + ses->auth_key.response =kmemdup (msg->data, + msg->sesskey_len, +GFP_KERNEL ); +if (!ses->auth_key.response) { +cifs_dbg (VFS ,"%s: can't allocate (%u bytes) memory\n" , + __func__, msg->sesskey_len); + rc = -ENOMEM ; + goto out_put_spnego_key; } + ses->auth_key.len = msg->sesskey_len; sess_data->iov[1 ].iov_base = msg->data + msg->sesskey_len; sess_data->iov[1 ].iov_len = msg->secblob_len;
Greg Kroah-Hartman
maintainerPATCH 117/567 smb: client: Dont log plaintext credentials in cifs_set_cifscreds
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
commit 2f37dc436d4e61ff7ae0b0353cf91b8c10396e4d upstream.
When debug logging is enabled, cifs_set_cifscreds() logs the key payload and exposes the plaintext username and password. Remove the debug log to avoid exposing credentials.
--- fs/smb/client/connect.c | 1 - 1 file changed, 1 deletion(-)
fs/smb/client/connect.c +0 -1
@@ -2214,7 +2214,6 @@ cifs_set_cifscreds(struct smb3_fs_contex/* find first : in payload */ payload = upayload->data; delim =strnchr (payload, upayload->datalen,':' ); -cifs_dbg (FYI ,"payload=%s\n" , payload);if (!delim) {cifs_dbg (FYI ,"Unable to find ':' in payload (datalen=%d)\n" , upayload->datalen);
Greg Kroah-Hartman
maintainerPATCH 118/567 scsi: core: Fix refcount leak for tagset_refcnt
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 1ac22c8eae81366101597d48360718dff9b9d980 upstream.
This leak will cause a hang when tearing down the SCSI host. For example, iscsid hangs with the following call trace:
[130120.652718] scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured
PID: 2528 TASK: ffff9d0408974e00 CPU: 3 COMMAND: "iscsid"
#0 [ffffb5b9c134b9e0] __schedule at ffffffff860657d4
#1 [ffffb5b9c134ba28] schedule at ffffffff86065c6f
#2 [ffffb5b9c134ba40] schedule_timeout at ffffffff86069fb0
#3 [ffffb5b9c134bab0] __wait_for_common at ffffffff8606674f
#4 [ffffb5b9c134bb10] scsi_remove_host at ffffffff85bfe84b
#5 [ffffb5b9c134bb30] iscsi_sw_tcp_session_destroy at ffffffffc03031c4 [iscsi_tcp] #6 [ffffb5b9c134bb48] iscsi_if_recv_msg at ffffffffc0292692 [scsi_transport_iscsi] #7 [ffffb5b9c134bb98] iscsi_if_rx at ffffffffc02929c2 [scsi_transport_iscsi] #8 [ffffb5b9c134bbf0] netlink_unicast at ffffffff85e551d6
#9 [ffffb5b9c134bc38] netlink_sendmsg at ffffffff85e554ef
--- drivers/scsi/scsi_scan.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/scsi_scan.c +1 -0
@@ -354,6 +354,7 @@ static struct scsi_device *scsi_alloc_sd* since we use this queue depth most of times. */ if (scsi_realloc_sdev_budget_map (sdev, depth)) { +kref_put (&sdev->host->tagset_refcnt, scsi_mq_free_tags);put_device (&starget->dev);kfree (sdev); goto out;
Greg Kroah-Hartman
maintainerPATCH 119/567 selftests: mptcp: more stable simult_flows tests
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 8c09412e584d9bcc0e71d758ec1008d1c8d1a326 upstream.
By default, the netem qdisc can keep up to 1000 packets under its belly to deal with the configured rate and delay. The simult flows test-case simulates very low speed links, to avoid problems due to slow CPUs and the TCP stack tend to transmit at a slightly higher rate than the (virtual) link constraints.
All the above causes a relatively large amount of packets being enqueued in the netem qdiscs - the longer the transfer, the longer the queue - producing increasingly high TCP RTT samples and consequently increasingly larger receive buffer size due to DRS.
When the receive buffer size becomes considerably larger than the needed size, the tests results can flake, i.e. because minimal inaccuracy in the pacing rate can lead to a single subflow usage towards the end of the connection for a considerable amount of data.
Address the issue explicitly setting netem limits suitable for the configured link speeds and unflake all the affected tests.
--- tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/simult_flows.sh +7 -4
@@ -227,10 +227,13 @@ run_test() for dev in ns2eth1 ns2eth2; do tc -n $ns2 qdisc del dev $dev root >/dev/null 2>&1 done - tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 - tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 + + # keep the queued pkts number low, or the RTT estimator will see + # increasing latency over time. + tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 limit 50 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 limit 50 # time is measured in ms, account for transfer size, aggregated link speed # and header overhead (10%)
Greg Kroah-Hartman
maintainerPATCH 120/567 selftests: mptcp: join: check removing signal+subflow endp
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 1777f349ff41b62dfe27454b69c27b0bc99ffca5 upstream.
This validates the previous commit: endpoints with both the signal and subflow flags should always be marked as used even if it was not possible to create new subflows due to the MPTCP PM limits.
For this test, an extra endpoint is created with both the signal and the subflow flags, and limits are set not to create extra subflows. In this case, an ADD_ADDR is sent, but no subflows are created. Still, the local endpoint is marked as used, and no warning is fired when removing the endpoint, after having sent a RM_ADDR.
The 'Fixes' tag here below is the same as the one from the previous
commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +13 -0
@@ -2424,6 +2424,19 @@ remove_tests() chk_rst_nr 0 0 fi + # signal+subflow with limits, remove + if reset "remove signal+subflow with limits"; then + pm_nl_set_limits $ns1 0 0 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,subflow + pm_nl_set_limits $ns2 0 0 + addr_nr_ns1=-1 speed=slow \ + run_tests $ns1 $ns2 10.0.1.1 + chk_join_nr 0 0 0 + chk_add_nr 1 1 + chk_rm_nr 1 0 invert + chk_rst_nr 0 0 + fi + # addresses remove if reset "remove addresses"; then pm_nl_set_limits $ns1 3 3
Greg Kroah-Hartman
maintainerPATCH 122/567 hwmon: (aht10) Add support for dht20
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akhilesh Patil <[email protected]>
[ Upstream commit 3eaf1b631506e8de2cb37c278d5bc042521e82c1 ]
Add support for dht20 temperature and humidity sensor from Aosong. Modify aht10 driver to handle different init command for dht20 sensor by adding init_cmd entry in the driver data. dht20 sensor is compatible with aht10 hwmon driver with this change.
Tested on TI am62x SK board with dht20 sensor connected at i2c-2 port.
Stable-dep-of: b7497b5a99f5 ("hwmon: (aht10) Fix initialization commands for AHT20")
--- Documentation/hwmon/aht10.rst | 10 +++++++++- drivers/hwmon/Kconfig | 6 +++--- drivers/hwmon/aht10.c | 19 ++++++++++++++++--- 3 files changed, 28 insertions(+), 7 deletions(-)
Documentation/hwmon/aht10.rst +9 -1
@@ -20,6 +20,14 @@ Supported chips: English: http://www.aosong.com/userfiles/files/media/Data%20Sheet%20AHT20.pdf + * Aosong DHT20 + + Prefix: 'dht20' + + Addresses scanned: None + + Datasheet: https://www.digikey.co.nz/en/htmldatasheets/production/9184855/0/0/1/101020932 + Author: Johannes Cornelis Draaijer <[email protected]>
@@ -33,7 +41,7 @@ The address of this i2c device may only be 0x38 Special Features ---------------- -AHT20 has additional CRC8 support which is sent as the last byte of the sensor +AHT20, DHT20 has additional CRC8 support which is sent as the last byte of the sensor values. Usage Notes
drivers/hwmon/Kconfig +3 -3
@@ -257,12 +257,12 @@ config SENSORS_ADT7475 will be called adt7475. config SENSORS_AHT10 - tristate "Aosong AHT10, AHT20" + tristate "Aosong AHT10, AHT20, DHT20" depends on I2C select CRC8 help - If you say yes here, you get support for the Aosong AHT10 and AHT20 - temperature and humidity sensors + If you say yes here, you get support for the Aosong AHT10, AHT20 and + DHT20 temperature and humidity sensors This driver can also be built as a module. If so, the module will be called aht10.
drivers/hwmon/aht10.c +16 -3
@@ -37,6 +37,8 @@#define AHT10_CMD_MEAS 0b10101100#define AHT10_CMD_RST 0b10111010 +#define DHT20_CMD_INIT 0x71 +/* * Flags in the answer byte/command */
@@ -48,11 +50,12 @@#define AHT10_MAX_POLL_INTERVAL_LEN 30 -enum aht10_variant { aht10, aht20 }; +enum aht10_variant { aht10, aht20, dht20};static const struct i2c_device_id aht10_id[] = { {"aht10" , aht10 }, {"aht20" , aht20 }, + {"dht20" , dht20 }, { }, };MODULE_DEVICE_TABLE (i2c, aht10_id);
@@ -77,6 +80,7 @@ MODULE_DEVICE_TABLE(i2c, aht10_id);* AHT10/AHT20 * @crc8: crc8 support flag * @meas_size: measurements data size +* @init_cmd: Initialization command */ struct aht10_data {
@@ -92,6 +96,7 @@ struct aht10_data {int humidity;bool crc8;unsigned int meas_size; +u8 init_cmd; };/**
@@ -101,13 +106,13 @@ struct aht10_data {*/ static int aht10_init (struct aht10_data *data) { -const u8 cmd_init[] = {AHT10_CMD_INIT ,AHT10_CAL_ENABLED |AHT10_MODE_CYC , +const u8 cmd_init[] = {data->init_cmd,AHT10_CAL_ENABLED |AHT10_MODE_CYC ,0x00 };int res;u8 status;struct i2c_client *client = data->client; - res =i2c_master_send (client, cmd_init,3 ); + res =i2c_master_send (client, cmd_init,sizeof (cmd_init));if (res <0 )return res;
@@ -353,9 +358,17 @@ static int aht10_probe(struct i2c_client *client) data->meas_size =AHT20_MEAS_SIZE ; data->crc8 = true;crc8_populate_msb (crc8_table,AHT20_CRC8_POLY ); + data->init_cmd =AHT10_CMD_INIT ; +break ; +case dht20: + data->meas_size =AHT20_MEAS_SIZE ; + data->crc8 = true; +crc8_populate_msb (crc8_table,AHT20_CRC8_POLY ); + data->init_cmd =DHT20_CMD_INIT ;break ;default : data->meas_size =AHT10_MEAS_SIZE ; + data->init_cmd =AHT10_CMD_INIT ;break ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 96/567 can: usb: etas_es58x: correctly anchor the urb in the read bulk callback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 5eaad4f768266f1f17e01232ffe2ef009f8129b7 upstream.
When submitting an urb, that is using the anchor pattern, it needs to be anchored before submitting it otherwise it could be leaked if usb_kill_anchored_urbs() is called. This logic is correctly done elsewhere in the driver, except in the read bulk callback so do that here also.
--- drivers/net/can/usb/etas_es58x/es58x_core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/can/usb/etas_es58x/es58x_core.c +7 -1
@@ -1461,12 +1461,18 @@ static void es58x_read_bulk_callback(str } resubmit_urb: +usb_anchor_urb (urb, &es58x_dev->rx_urbs); ret =usb_submit_urb (urb,GFP_ATOMIC ); +if (!ret) +return ; + +usb_unanchor_urb (urb); +if (ret == -ENODEV ) {for (i =0 ; i < es58x_dev->num_can_ch; i++)if (es58x_dev->netdev[i])netif_device_detach (es58x_dev->netdev[i]); - }else if (ret) + }else dev_err_ratelimited (dev,"Failed resubmitting read bulk urb: %pe\n" ,ERR_PTR (ret));
Greg Kroah-Hartman
maintainerPATCH 123/567 hwmon: (aht10) Fix initialization commands for AHT20
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hao Yu <[email protected]>
[ Upstream commit b7497b5a99f54ab8dcda5b14a308385b2fb03d8d ]
According to the AHT20 datasheet (updated to V1.0 after the 2023.09 version), the initialization command for AHT20 is 0b10111110 (0xBE). The previous sequence (0xE1) used in earlier versions is no longer compatible with newer AHT20 sensors. Update the initialization command to ensure the sensor is properly initialized.
While at it, use binary notation for DHT20_CMD_INIT to match the notation used in the datasheet.
--- drivers/hwmon/aht10.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hwmon/aht10.c +4 -2
@@ -37,7 +37,9 @@#define AHT10_CMD_MEAS 0b10101100#define AHT10_CMD_RST 0b10111010 -#define DHT20_CMD_INIT 0x71 +#define AHT20_CMD_INIT 0b10111110 + +#define DHT20_CMD_INIT 0b01110001/* * Flags in the answer byte/command
@@ -358,7 +360,7 @@ static int aht10_probe(struct i2c_client *client) data->meas_size =AHT20_MEAS_SIZE ; data->crc8 = true;crc8_populate_msb (crc8_table,AHT20_CRC8_POLY ); - data->init_cmd =AHT10_CMD_INIT ; + data->init_cmd =AHT20_CMD_INIT ;break ;case dht20: data->meas_size =AHT20_MEAS_SIZE ;
Signature · 1 line
2.51.0