5.15.149-rc1 review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 408/476 nilfs2: fix hang in nilfs_lookup_dirty_data_buffers()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 38296afe3c6ee07319e01bb249aa4bb47c07b534 upstream.
Syzbot reported a hang issue in migrate_pages_batch() called by mbind() and nilfs_lookup_dirty_data_buffers() called in the log writer of nilfs2.
While migrate_pages_batch() locks a folio and waits for the writeback to complete, the log writer thread that should bring the writeback to completion picks up the folio being written back in nilfs_lookup_dirty_data_buffers() that it calls for subsequent log creation and was trying to lock the folio. Thus causing a deadlock.
In the first place, it is unexpected that folios/pages in the middle of writeback will be updated and become dirty. Nilfs2 adds a checksum to verify the validity of the log being written and uses it for recovery at mount, so data changes during writeback are suppressed. Since this is broken, an unclean shutdown could potentially cause recovery to fail.
Investigation revealed that the root cause is that the wait for writeback completion in nilfs_page_mkwrite() is conditional, and if the backing device does not require stable writes, data may be modified without waiting.
Fix these issues by making nilfs_page_mkwrite() wait for writeback to finish regardless of the stable write requirement of the backing device.
--- fs/nilfs2/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/nilfs2/file.c +7 -1
@@ -105,7 +105,13 @@ static vm_fault_t nilfs_page_mkwrite(strnilfs_transaction_commit (inode->i_sb); mapped: -wait_for_stable_page (page); +/* +* Since checksumming including data blocks is performed to determine +* the validity of the log to be written and used for recovery, it is +* necessary to wait for writeback to finish here, regardless of the +* stable write requirement of the backing device. +*/ +wait_on_page_writeback (page); out:sb_end_pagefault (inode->i_sb);return block_page_mkwrite_return (ret);
Greg Kroah-Hartman
maintainerPATCH 409/476 crypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kim Phillips <[email protected]>
commit ccb88e9549e7cfd8bcd511c538f437e20026e983 upstream.
The SEV platform device can be shutdown with a null psp_master, e.g., using DEBUG_TEST_DRIVER_REMOVE. Found using KASAN:
[ 137.148210] ccp 0000:23:00.1: enabling device (0000 -> 0002) [ 137.162647] ccp 0000:23:00.1: no command queues available [ 137.170598] ccp 0000:23:00.1: sev enabled [ 137.174645] ccp 0000:23:00.1: psp enabled [ 137.178890] general protection fault, probably for non-canonical address 0xdffffc000000001e: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN NOPTI [ 137.182693] KASAN: null-ptr-deref in range [0x00000000000000f0-0x00000000000000f7] [ 137.182693] CPU: 93 PID: 1 Comm: swapper/0 Not tainted 6.8.0-rc1+ #311 [ 137.182693] RIP: 0010:__sev_platform_shutdown_locked+0x51/0x180 [ 137.182693] Code: 08 80 3c 08 00 0f 85 0e 01 00 00 48 8b 1d 67 b6 01 08 48 b8 00 00 00 00 00 fc ff df 48 8d bb f0 00 00 00 48 89 f9 48 c1 e9 03 <80> 3c 01 00 0f 85 fe 00 00 00 48 8b 9b f0 00 00 00 48 85 db 74 2c [ 137.182693] RSP: 0018:ffffc900000cf9b0 EFLAGS: 00010216 [ 137.182693] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 000000000000001e [ 137.182693] RDX: 0000000000000000 RSI: 0000000000000008 RDI: 00000000000000f0 [ 137.182693] RBP: ffffc900000cf9c8 R08: 0000000000000000 R09: fffffbfff58f5a66 [ 137.182693] R10: ffffc900000cf9c8 R11: ffffffffac7ad32f R12: ffff8881e5052c28 [ 137.182693] R13: ffff8881e5052c28 R14: ffff8881758e43e8 R15: ffffffffac64abf8 [ 137.182693] FS: 0000000000000000(0000) GS:ffff889de7000000(0000) knlGS:0000000000000000 [ 137.182693] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 137.182693] CR2: 0000000000000000 CR3: 0000001cf7c7e000 CR4: 0000000000350ef0 [ 137.182693] Call Trace: [ 137.182693] <TASK> [ 137.182693] ? show_regs+0x6c/0x80 [ 137.182693] ? __die_body+0x24/0x70 [ 137.182693] ? die_addr+0x4b/0x80 [ 137.182693] ? exc_general_protection+0x126/0x230 [ 137.182693] ? asm_exc_general_protection+0x2b/0x30 [ 137.182693] ? __sev_platform_shutdown_locked+0x51/0x180 [ 137.182693] sev_firmware_shutdown.isra.0+0x1e/0x80 [ 137.182693] sev_dev_destroy+0x49/0x100 [ 137.182693] psp_dev_destroy+0x47/0xb0 [ 137.182693] sp_destroy+0xbb/0x240 [ 137.182693] sp_pci_remove+0x45/0x60 [ 137.182693] pci_device_remove+0xaa/0x1d0 [ 137.182693] device_remove+0xc7/0x170 [ 137.182693] really_probe+0x374/0xbe0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] __driver_probe_device+0x199/0x460 [ 137.182693] driver_probe_device+0x4e/0xd0 [ 137.182693] __driver_attach+0x191/0x3d0 [ 137.182693] ? __pfx___driver_attach+0x10/0x10 [ 137.182693] bus_for_each_dev+0x100/0x190 [ 137.182693] ? __pfx_bus_for_each_dev+0x10/0x10 [ 137.182693] ? __kasan_check_read+0x15/0x20 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? _raw_spin_unlock+0x27/0x50 [ 137.182693] driver_attach+0x41/0x60 [ 137.182693] bus_add_driver+0x2a8/0x580 [ 137.182693] driver_register+0x141/0x480 [ 137.182693] __pci_register_driver+0x1d6/0x2a0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? esrt_sysfs_init+0x1cd/0x5d0 [ 137.182693] ? __pfx_sp_mod_init+0x10/0x10 [ 137.182693] sp_pci_init+0x22/0x30 [ 137.182693] sp_mod_init+0x14/0x30 [ 137.182693] ? __pfx_sp_mod_init+0x10/0x10 [ 137.182693] do_one_initcall+0xd1/0x470 [ 137.182693] ? __pfx_do_one_initcall+0x10/0x10 [ 137.182693] ? parameq+0x80/0xf0 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] ? __kmalloc+0x3b0/0x4e0 [ 137.182693] ? kernel_init_freeable+0x92d/0x1050 [ 137.182693] ? kasan_populate_vmalloc_pte+0x171/0x190 [ 137.182693] ? srso_return_thunk+0x5/0x5f [ 137.182693] kernel_init_freeable+0xa64/0x1050 [ 137.182693] ? __pfx_kernel_init+0x10/0x10 [ 137.182693] kernel_init+0x24/0x160 [ 137.182693] ? __switch_to_asm+0x3e/0x70 [ 137.182693] ret_from_fork+0x40/0x80 [ 137.182693] ? __pfx_kernel_init+0x10/0x10 [ 137.182693] ret_from_fork_asm+0x1b/0x30 [ 137.182693] </TASK> [ 137.182693] Modules linked in: [ 137.538483] ---[ end trace 0000000000000000 ]---
--- drivers/crypto/ccp/sev-dev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/crypto/ccp/sev-dev.c +8 -2
@@ -323,10 +323,16 @@ EXPORT_SYMBOL_GPL(sev_platform_init);static int __sev_platform_shutdown_locked (int *error) { -struct sev_device *sev = psp_master->sev_data; +struct psp_device *psp = psp_master; +struct sev_device *sev;int ret; -if (!sev || sev->state ==SEV_STATE_UNINIT ) +if (!psp || !psp->sev_data) +return 0 ; + + sev = psp->sev_data; + +if (sev->state ==SEV_STATE_UNINIT )return 0 ; ret =__sev_do_cmd_locked (SEV_CMD_SHUTDOWN ,NULL , error);
Greg Kroah-Hartman
maintainerPATCH 410/476 nfp: use correct macro for LengthSelect in BAR config
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Basilio <[email protected]>
commit b3d4f7f2288901ed2392695919b3c0e24c1b4084 upstream.
The 1st and 2nd expansion BAR configuration registers are configured, when the driver starts up, in variables 'barcfg_msix_general' and 'barcfg_msix_xpb', respectively. The 'LengthSelect' field is ORed in from bit 0, which is incorrect. The 'LengthSelect' field should start from bit 27.
This has largely gone un-noticed because NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT happens to be 0.
--- drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c +4 -2
@@ -542,11 +542,13 @@ static int enable_bars(struct nfp6000_pcconst u32 barcfg_msix_general =NFP_PCIE_BAR_PCIE2CPP_MapType ( NFP_PCIE_BAR_PCIE2CPP_MapType_GENERAL) | - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT; +NFP_PCIE_BAR_PCIE2CPP_LengthSelect ( + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT);const u32 barcfg_msix_xpb =NFP_PCIE_BAR_PCIE2CPP_MapType ( NFP_PCIE_BAR_PCIE2CPP_MapType_BULK) | - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT | +NFP_PCIE_BAR_PCIE2CPP_LengthSelect ( + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT) |NFP_PCIE_BAR_PCIE2CPP_Target_BaseAddress (NFP_CPP_TARGET_ISLAND_XPB );const u32 barcfg_explicit[4 ] = {
Greg Kroah-Hartman
maintainerPATCH 411/476 nfp: flower: prevent re-adding mac index for bonded port
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel de Villiers <[email protected]>
commit 1a1c13303ff6d64e6f718dc8aa614e580ca8d9b4 upstream.
When physical ports are reset (either through link failure or manually toggled down and up again) that are slaved to a Linux bond with a tunnel endpoint IP address on the bond device, not all tunnel packets arriving on the bond port are decapped as expected.
The bond dev assigns the same MAC address to itself and each of its slaves. When toggling a slave device, the same MAC address is therefore offloaded to the NFP multiple times with different indexes.
The issue only occurs when re-adding the shared mac. The nfp_tunnel_add_shared_mac() function has a conditional check early on that checks if a mac entry already exists and if that mac entry is
global: (entry && nfp_tunnel_is_mac_idx_global(entry->index)). In the case of a bonded device (For example br-ex), the mac index is obtained, and no new index is assigned.
We therefore modify the conditional in nfp_tunnel_add_shared_mac() to check if the port belongs to the LAG along with the existing checks to prevent a new global mac index from being re-assigned to the slave port.
--- drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +1 -1
@@ -927,7 +927,7 @@ nfp_tunnel_add_shared_mac(struct nfp_appu16 nfp_mac_idx =0 ; entry =nfp_tunnel_lookup_offloaded_macs (app, netdev->dev_addr); -if (entry &&nfp_tunnel_is_mac_idx_global (entry->index)) { +if (entry && (nfp_tunnel_is_mac_idx_global (entry->index) ||netif_is_lag_port (netdev))) {if (entry->bridge_count || !nfp_flower_is_supported_bridge (netdev)) { nfp_tunnel_offloaded_macs_inc_ref_and_link(entry,
Greg Kroah-Hartman
maintainerPATCH 412/476 wifi: mac80211: reload info pointer in ieee80211_tx_dequeue()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c98d8836b817d11fdff4ca7749cbbe04ff7f0c64 upstream.
This pointer can change here since the SKB can change, so we actually later open-coded IEEE80211_SKB_CB() again. Reload the pointer where needed, so the monitor-mode case using it gets fixed, and then use info-> later as well.
--- net/mac80211/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/tx.c +2 -1
@@ -3746,6 +3746,7 @@ begin: goto begin; skb =__skb_dequeue (&tx.skbs); + info =IEEE80211_SKB_CB (skb);if (!skb_queue_empty (&tx.skbs)) {spin_lock_bh (&fq->lock);
@@ -3790,7 +3791,7 @@ begin: } encap_out: -IEEE80211_SKB_CB (skb)->control.vif = vif; + info->control.vif = vif;if (vif &&wiphy_ext_feature_isset (local->hw.wiphy,NL80211_EXT_FEATURE_AQL )) {
Greg Kroah-Hartman
maintainerPATCH 413/476 irqchip/irq-brcmstb-l2: Add write memory barrier before exit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Berger <[email protected]>
commit b0344d6854d25a8b3b901c778b1728885dd99007 upstream.
It was observed on Broadcom devices that use GIC v3 architecture L1 interrupt controllers as the parent of brcmstb-l2 interrupt controllers that the deactivation of the parent interrupt could happen before the brcmstb-l2 deasserted its output. This would lead the GIC to reactivate the interrupt only to find that no L2 interrupt was pending. The result was a spurious interrupt invoking handle_bad_irq() with its associated messaging. While this did not create a functional problem it is a waste of cycles.
The hazard exists because the memory mapped bus writes to the brcmstb-l2 registers are buffered and the GIC v3 architecture uses a very efficient system register write to deactivate the interrupt.
Add a write memory barrier prior to invoking chained_irq_exit() to introduce a dsb(st) on those systems to ensure the system register write cannot be executed until the memory mapped writes are visible to the system.
[ florian: Added Fixes tag ]
--- drivers/irqchip/irq-brcmstb-l2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/irqchip/irq-brcmstb-l2.c +4 -1
@@ -2,7 +2,7 @@/* * Generic Broadcom Set Top Box Level 2 Interrupt controller driver * -* Copyright (C) 2014-2017 Broadcom +* Copyright (C) 2014-2024 Broadcom */ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt
@@ -113,6 +113,9 @@ static void brcmstb_l2_intc_irq_handle(sgeneric_handle_domain_irq (b->domain, irq); }while (status); out: +/* Don't ack parent before all device writes are done */ +wmb (); +chained_irq_exit (chip, desc); }
Greg Kroah-Hartman
maintainerPATCH 414/476 irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit af9acbfc2c4b72c378d0b9a2ee023ed01055d3e2 upstream.
When updating the affinity of a VPE, the VMOVP command is currently skipped if the two CPUs are part of the same VPE affinity.
But this is wrong, as the doorbell corresponding to this VPE is still delivered on the 'old' CPU, which screws up the balancing. Furthermore, offlining that 'old' CPU results in doorbell interrupts generated for this VPE being discarded.
The harsh reality is that VMOVP cannot be elided when a set_affinity() request occurs. It needs to be obeyed, and if an optimisation is to be made, it is at the point where the affinity change request is made (such as in KVM).
Drop the VMOVP elision altogether, and only use the vpe_table_mask to try and stay within the same ITS affinity group if at all possible.
--- drivers/irqchip/irq-gic-v3-its.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +13 -9
@@ -3800,8 +3800,9 @@ static int its_vpe_set_affinity(struct i bool force) {struct its_vpe *vpe =irq_data_get_irq_chip_data (d); -int from, cpu =cpumask_first (mask_val); +struct cpumask common, *table_mask;unsigned long flags; +int from, cpu;/* * Changing affinity is mega expensive, so let's be as lazy as
@@ -3817,19 +3818,22 @@ static int its_vpe_set_affinity(struct i* taken on any vLPI handling path that evaluates vpe->col_idx. */ from =vpe_to_cpuid_lock (vpe, &flags); -if (from == cpu) - goto out; - - vpe->col_idx = cpu; + table_mask =gic_data_rdist_cpu (from)->vpe_table_mask;/* -* GICv4.1 allows us to skip VMOVP if moving to a cpu whose RD -* is sharing its VPE table with the current one. +* If we are offered another CPU in the same GICv4.1 ITS +* affinity, pick this one. Otherwise, any CPU will do. */ -if (gic_data_rdist_cpu (cpu)->vpe_table_mask && -cpumask_test_cpu (from,gic_data_rdist_cpu (cpu)->vpe_table_mask)) +if (table_mask &&cpumask_and (&common, mask_val, table_mask)) + cpu =cpumask_test_cpu (from, &common) ? from :cpumask_first (&common); +else + cpu =cpumask_first (mask_val); + +if (from == cpu) goto out; + vpe->col_idx = cpu; +its_send_vmovp (vpe);its_vpe_db_proxy_move (vpe, from, cpu);
Greg Kroah-Hartman
maintainerPATCH 415/476 net: ethernet: ti: cpsw: enable mac_managed_pm to fix mdio
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sinthu Raja <[email protected]>
commit bc4ce46b1e3d1da4309405cd4afc7c0fcddd0b90 upstream.
The below commit introduced a WARN when phy state is not in the states:PHY_HALTED, PHY_READY and PHY_UP.
commit 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
When cpsw resumes, there have port in PHY_NOLINK state, so the below warning comes out. Set mac_managed_pm be true to tell mdio that the phy resume/suspend is managed by the mac, to fix the following warning:
WARNING: CPU: 0 PID: 965 at drivers/net/phy/phy_device.c:326 mdio_bus_phy_resume+0x140/0x144 CPU: 0 PID: 965 Comm: sh Tainted: G O 6.1.46-g247b2535b2 #1 Hardware name: Generic AM33XX (Flattened Device Tree) unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x24/0x2c dump_stack_lvl from __warn+0x84/0x15c __warn from warn_slowpath_fmt+0x1a8/0x1c8 warn_slowpath_fmt from mdio_bus_phy_resume+0x140/0x144 mdio_bus_phy_resume from dpm_run_callback+0x3c/0x140 dpm_run_callback from device_resume+0xb8/0x2b8 device_resume from dpm_resume+0x144/0x314 dpm_resume from dpm_resume_end+0x14/0x20 dpm_resume_end from suspend_devices_and_enter+0xd0/0x924 suspend_devices_and_enter from pm_suspend+0x2e0/0x33c pm_suspend from state_store+0x74/0xd0 state_store from kernfs_fop_write_iter+0x104/0x1ec kernfs_fop_write_iter from vfs_write+0x1b8/0x358 vfs_write from ksys_write+0x78/0xf8 ksys_write from ret_fast_syscall+0x0/0x54 Exception stack(0xe094dfa8 to 0xe094dff0)
dfa0: 00000004 005c3fb8 00000001 005c3fb8 00000004 00000001
dfc0: 00000004 005c3fb8 b6f6bba0 00000004 00000004 0059edb8 00000000 00000000
dfe0: 00000004 bed918f0 b6f09bd3 b6e89a66
--- drivers/net/ethernet/ti/cpsw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/ti/cpsw.c +2 -0
@@ -631,6 +631,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) } } + phy->mac_managed_pm = true; + slave->phy = phy;phy_attached_info (slave->phy);
Signature · 1 line
2.43.2
Greg Kroah-Hartman
maintainerPATCH 416/476 s390/qeth: Fix potential loss of L3-IP@ in case of network issues
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandra Winter <[email protected]>
commit 2fe8a236436fe40d8d26a1af8d150fc80f04ee1a upstream.
Symptom:
In case of a bad cable connection (e.g. dirty optics) a fast sequence of network DOWN-UP-DOWN-UP could happen. UP triggers recovery of the qeth interface. In case of a second DOWN while recovery is still ongoing, it can happen that the IP@ of a Layer3 qeth interface is lost and will not be recovered by the second UP.
Problem:
When registration of IP addresses with Layer 3 qeth devices fails, (e.g. because of bad address format) the respective IP address is deleted from its hash-table in the driver. If registration fails because of a ENETDOWN condition, the address should stay in the hashtable, so a subsequent recovery can restore it.
3caa4af834df ("qeth: keep ip-address after LAN_OFFLINE failure") fixes this for registration failures during normal operation, but not during recovery.
Solution:
Keep L3-IP address in case of ENETDOWN in qeth_l3_recover_ip(). For consistency with qeth_l3_add_ip() we also keep it in case of EADDRINUSE, i.e. for some reason the card already/still has this address registered.
--- drivers/s390/net/qeth_l3_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/s390/net/qeth_l3_main.c +6 -3
@@ -254,9 +254,10 @@ static void qeth_l3_clear_ip_htable(struif (!recover) {hash_del (&addr->hnode);kfree (addr); -continue ; + }else { +/* prepare for recovery */ + addr->disp_flag =QETH_DISP_ADDR_ADD ; } - addr->disp_flag =QETH_DISP_ADDR_ADD ; }mutex_unlock (&card->ip_lock);
@@ -277,9 +278,11 @@ static void qeth_l3_recover_ip(struct qeif (addr->disp_flag ==QETH_DISP_ADDR_ADD ) { rc =qeth_l3_register_addr_entry (card, addr); -if (!rc) { +if (!rc || rc == -EADDRINUSE || rc == -ENETDOWN ) { +/* keep it in the records */ addr->disp_flag =QETH_DISP_ADDR_DO_NOTHING ; }else { +/* bad address */ hash_del (&addr->hnode);kfree (addr); }
Greg Kroah-Hartman
maintainerPATCH 417/476 net: ethernet: ti: cpsw_new: enable mac_managed_pm to fix mdio
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sinthu Raja <[email protected]>
commit 9def04e759caa5a3d741891037ae99f81e2fff01 upstream.
The below commit introduced a WARN when phy state is not in the states:PHY_HALTED, PHY_READY and PHY_UP.
commit 744d23c71af3 ("net: phy: Warn about incorrect mdio_bus_phy_resume() state")
When cpsw_new resumes, there have port in PHY_NOLINK state, so the below warning comes out. Set mac_managed_pm be true to tell mdio that the phy resume/suspend is managed by the mac, to fix the following warning:
WARNING: CPU: 0 PID: 965 at drivers/net/phy/phy_device.c:326 mdio_bus_phy_resume+0x140/0x144 CPU: 0 PID: 965 Comm: sh Tainted: G O 6.1.46-g247b2535b2 #1 Hardware name: Generic AM33XX (Flattened Device Tree) unwind_backtrace from show_stack+0x18/0x1c show_stack from dump_stack_lvl+0x24/0x2c dump_stack_lvl from __warn+0x84/0x15c __warn from warn_slowpath_fmt+0x1a8/0x1c8 warn_slowpath_fmt from mdio_bus_phy_resume+0x140/0x144 mdio_bus_phy_resume from dpm_run_callback+0x3c/0x140 dpm_run_callback from device_resume+0xb8/0x2b8 device_resume from dpm_resume+0x144/0x314 dpm_resume from dpm_resume_end+0x14/0x20 dpm_resume_end from suspend_devices_and_enter+0xd0/0x924 suspend_devices_and_enter from pm_suspend+0x2e0/0x33c pm_suspend from state_store+0x74/0xd0 state_store from kernfs_fop_write_iter+0x104/0x1ec kernfs_fop_write_iter from vfs_write+0x1b8/0x358 vfs_write from ksys_write+0x78/0xf8 ksys_write from ret_fast_syscall+0x0/0x54 Exception stack(0xe094dfa8 to 0xe094dff0)
dfa0: 00000004 005c3fb8 00000001 005c3fb8 00000004 00000001
dfc0: 00000004 005c3fb8 b6f6bba0 00000004 00000004 0059edb8 00000000 00000000
dfe0: 00000004 bed918f0 b6f09bd3 b6e89a66
--- drivers/net/ethernet/ti/cpsw_new.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/ti/cpsw_new.c +3 -0
@@ -772,6 +772,9 @@ static void cpsw_slave_open(struct cpsw_ slave->slave_num);return ; } + + phy->mac_managed_pm = true; + slave->phy = phy;phy_attached_info (slave->phy);
Greg Kroah-Hartman
maintainerPATCH 418/476 ceph: prevent use-after-free in encode_cap_msg()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rishabh Dave <[email protected]>
commit cda4672da1c26835dcbd7aec2bfed954eda9b5ef upstream.
In fs/ceph/caps.c, in encode_cap_msg(), "use after free" error was caught by KASAN at this line - 'ceph_buffer_get(arg->xattr_buf);'. This implies before the refcount could be increment here, it was freed.
In same file, in "handle_cap_grant()" refcount is decremented by this line - 'ceph_buffer_put(ci->i_xattrs.blob);'. It appears that a race occurred and resource was freed by the latter line before the former line could increment it.
encode_cap_msg() is called by __send_cap() and __send_cap() is called by ceph_check_caps() after calling __prep_cap(). __prep_cap() is where arg->xattr_buf is assigned to ci->i_xattrs.blob. This is the spot where the refcount must be increased to prevent "use after free" error.
--- fs/ceph/caps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ceph/caps.c +2 -1
@@ -1390,7 +1390,7 @@ static void __prep_cap(struct cap_msg_arif (flushing &CEPH_CAP_XATTR_EXCL ) { arg->old_xattr_buf =__ceph_build_xattrs_blob (ci); arg->xattr_version = ci->i_xattrs.version; - arg->xattr_buf = ci->i_xattrs.blob; + arg->xattr_buf =ceph_buffer_get (ci->i_xattrs.blob); }else { arg->xattr_buf =NULL ; arg->old_xattr_buf =NULL ;
@@ -1456,6 +1456,7 @@ static void __send_cap(struct cap_msg_arencode_cap_msg (msg, arg);ceph_con_send (&arg->session->s_con, msg);ceph_buffer_put (arg->old_xattr_buf); +ceph_buffer_put (arg->xattr_buf);if (arg->wake)wake_up_all (&ci->i_cap_wq); }
Greg Kroah-Hartman
maintainerPATCH 419/476 mm: hugetlb pages should not be reserved by shmat() if SHM_NORESERVE
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prakash Sangappa <[email protected]>
commit e656c7a9e59607d1672d85ffa9a89031876ffe67 upstream.
For shared memory of type SHM_HUGETLB, hugetlb pages are reserved in shmget() call. If SHM_NORESERVE flags is specified then the hugetlb pages are not reserved. However when the shared memory is attached with the shmat() call the hugetlb pages are getting reserved incorrectly for SHM_HUGETLB shared memory created with SHM_NORESERVE which is a bug.
-------------------------------
Following test shows the issue.
$cat shmhtb.c
int main()
{
int shmflags = 0660 | IPC_CREAT | SHM_HUGETLB | SHM_NORESERVE;
int shmid;
shmid = shmget(SKEY, SHMSZ, shmflags);
if (shmid < 0)
{
printf("shmat: shmget() failed, %d\n", errno);
return 1;
}
printf("After shmget()\n");
system("cat /proc/meminfo | grep -i hugepages_");
shmat(shmid, NULL, 0);
printf("\nAfter shmat()\n");
system("cat /proc/meminfo | grep -i hugepages_");
shmctl(shmid, IPC_RMID, NULL);
return 0;
} #sysctl -w vm.nr_hugepages=20
#./shmhtb
After shmget()
HugePages_Total: 20 HugePages_Free: 20 HugePages_Rsvd: 0 HugePages_Surp: 0
After shmat()
HugePages_Total: 20 HugePages_Free: 20 HugePages_Rsvd: 5 <-- HugePages_Surp: 0
--------------------------------
Fix is to ensure that hugetlb pages are not reserved for SHM_HUGETLB shared memory in the shmat() call.
--- fs/hugetlbfs/inode.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/hugetlbfs/inode.c +12 -1
@@ -135,6 +135,7 @@ static int hugetlbfs_file_mmap(struct filoff_t len, vma_len;int ret;struct hstate *h =hstate_file (file); +vm_flags_t vm_flags;/* * vma address alignment (but not the pgoff alignment) has
@@ -176,10 +177,20 @@ static int hugetlbfs_file_mmap(struct fifile_accessed (file); ret = -ENOMEM ; + + vm_flags = vma->vm_flags; +/* +* for SHM_HUGETLB, the pages are reserved in the shmget() call so skip +* reserving here. Note: only for SHM hugetlbfs file, the inode +* flag S_PRIVATE is set. +*/ +if (inode->i_flags &S_PRIVATE ) + vm_flags |=VM_NORESERVE ; +if (!hugetlb_reserve_pages (inode, vma->vm_pgoff >>huge_page_order (h), len >>huge_page_shift (h), vma, - vma->vm_flags)) + vm_flags)) goto out; ret =0 ;
Greg Kroah-Hartman
maintainerPATCH 420/476 of: property: fix typo in io-channels
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
commit 8f7e917907385e112a845d668ae2832f41e64bf5 upstream.
The property is io-channels and not io-channel. This was effectively preventing the devlink creation.
--- drivers/of/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/property.c +1 -1
@@ -1270,7 +1270,7 @@ DEFINE_SIMPLE_PROP(clocks, "clocks", "#c DEFINE_SIMPLE_PROP(interconnects, "interconnects", "#interconnect-cells") DEFINE_SIMPLE_PROP(iommus, "iommus", "#iommu-cells") DEFINE_SIMPLE_PROP(mboxes, "mboxes", "#mbox-cells") -DEFINE_SIMPLE_PROP(io_channels, "io-channel", "#io-channel-cells") +DEFINE_SIMPLE_PROP(io_channels, "io-channels", "#io-channel-cells") DEFINE_SIMPLE_PROP(interrupt_parent, "interrupt-parent", NULL) DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma-cells")DEFINE_SIMPLE_PROP (power_domains,"power-domains" ,"#power-domain-cells" )
Greg Kroah-Hartman
maintainerPATCH 421/476 can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziqi Zhao <[email protected]>
commit 6cdedc18ba7b9dacc36466e27e3267d201948c8d upstream.
The following 3 locks would race against each other, causing the deadlock situation in the Syzbot bug report:
- j1939_socks_lock
- active_session_list_lock
- sk_session_queue_lock
A reasonable fix is to change j1939_socks_lock to an rwlock, since in the rare situations where a write lock is required for the linked list that j1939_socks_lock is protecting, the code does not attempt to acquire any more locks. This would break the circular lock dependency, where, for example, the current thread already locks j1939_socks_lock and attempts to acquire sk_session_queue_lock, and at the same time, another thread attempts to acquire j1939_socks_lock while holding sk_session_queue_lock.
NOTE: This patch along does not fix the unregister_netdevice bug reported by Syzbot; instead, it solves a deadlock situation to prepare for one or more further patches to actually fix the Syzbot bug, which appears to be a reference counting problem within the j1939 codebase.
--- net/can/j1939/j1939-priv.h | 2 +- net/can/j1939/main.c | 2 +- net/can/j1939/socket.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-)
net/can/j1939/j1939-priv.h +1 -1
@@ -86,7 +86,7 @@ struct j1939_priv {unsigned int tp_max_packet_size;/* lock for j1939_socks list */ -spinlock_t j1939_socks_lock; +rwlock_t j1939_socks_lock;struct list_head j1939_socks;struct kref rx_kref;
net/can/j1939/main.c +1 -1
@@ -270,7 +270,7 @@ struct j1939_priv *j1939_netdev_start(streturn ERR_PTR (-ENOMEM );j1939_tp_init (priv); -spin_lock_init (&priv->j1939_socks_lock); +rwlock_init (&priv->j1939_socks_lock);INIT_LIST_HEAD (&priv->j1939_socks);mutex_lock (&j1939_netdev_lock);
net/can/j1939/socket.c +12 -12
@@ -80,16 +80,16 @@ static void j1939_jsk_add(struct j1939_p jsk->state |=J1939_SOCK_BOUND ;j1939_priv_get (priv); -spin_lock_bh (&priv->j1939_socks_lock); +write_lock_bh (&priv->j1939_socks_lock);list_add_tail (&jsk->list, &priv->j1939_socks); -spin_unlock_bh (&priv->j1939_socks_lock); +write_unlock_bh (&priv->j1939_socks_lock); }static void j1939_jsk_del (struct j1939_priv *priv,struct j1939_sock *jsk) { -spin_lock_bh (&priv->j1939_socks_lock); +write_lock_bh (&priv->j1939_socks_lock);list_del_init (&jsk->list); -spin_unlock_bh (&priv->j1939_socks_lock); +write_unlock_bh (&priv->j1939_socks_lock);j1939_priv_put (priv); jsk->state &= ~J1939_SOCK_BOUND ;
@@ -329,13 +329,13 @@ bool j1939_sk_recv_match(struct j1939_prstruct j1939_sock *jsk;bool match = false; -spin_lock_bh (&priv->j1939_socks_lock); +read_lock_bh (&priv->j1939_socks_lock);list_for_each_entry (jsk, &priv->j1939_socks, list) { match =j1939_sk_recv_match_one (jsk, skcb);if (match)break ; } -spin_unlock_bh (&priv->j1939_socks_lock); +read_unlock_bh (&priv->j1939_socks_lock);return match; }
@@ -344,11 +344,11 @@ void j1939_sk_recv(struct j1939_priv *pr {struct j1939_sock *jsk; -spin_lock_bh (&priv->j1939_socks_lock); +read_lock_bh (&priv->j1939_socks_lock);list_for_each_entry (jsk, &priv->j1939_socks, list) {j1939_sk_recv_one (jsk, skb); } -spin_unlock_bh (&priv->j1939_socks_lock); +read_unlock_bh (&priv->j1939_socks_lock); }static void j1939_sk_sock_destruct (struct sock *sk)
@@ -1078,12 +1078,12 @@ void j1939_sk_errqueue(struct j1939_sess }/* spread RX notifications to all sockets subscribed to this session */ -spin_lock_bh (&priv->j1939_socks_lock); +read_lock_bh (&priv->j1939_socks_lock);list_for_each_entry (jsk, &priv->j1939_socks, list) {if (j1939_sk_recv_match_one (jsk, &session->skcb))__j1939_sk_errqueue (session, &jsk->sk, type); } -spin_unlock_bh (&priv->j1939_socks_lock); +read_unlock_bh (&priv->j1939_socks_lock); };void j1939_sk_send_loop_abort (struct sock *sk,int err)
@@ -1271,7 +1271,7 @@ void j1939_sk_netdev_event_netdown(strucstruct j1939_sock *jsk;int error_code =ENETDOWN ; -spin_lock_bh (&priv->j1939_socks_lock); +read_lock_bh (&priv->j1939_socks_lock);list_for_each_entry (jsk, &priv->j1939_socks, list) { jsk->sk.sk_err = error_code;if (!sock_flag (&jsk->sk,SOCK_DEAD ))
@@ -1279,7 +1279,7 @@ void j1939_sk_netdev_event_netdown(strucj1939_sk_queue_drop_all (priv, jsk, error_code); } -spin_unlock_bh (&priv->j1939_socks_lock); +read_unlock_bh (&priv->j1939_socks_lock); } static int j1939_sk_no_ioctlcmd(struct socket *sock, unsigned int cmd,
Greg Kroah-Hartman
maintainerPATCH 422/476 can: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER)
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit efe7cf828039aedb297c1f9920b638fffee6aabc upstream.
Lock jsk->sk to prevent UAF when setsockopt(..., SO_J1939_FILTER, ...) modifies jsk->filters while receiving packets.
Following trace was seen on affected system:
==================================================================
BUG: KASAN: slab-use-after-free in j1939_sk_recv_match_one+0x1af/0x2d0 [can_j1939] Read of size 4 at addr ffff888012144014 by task j1939/350 CPU: 0 PID: 350 Comm: j1939 Tainted: G W OE 6.5.0-rc5 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Call Trace: print_report+0xd3/0x620 ? kasan_complete_mode_report_info+0x7d/0x200 ? j1939_sk_recv_match_one+0x1af/0x2d0 [can_j1939] kasan_report+0xc2/0x100 ? j1939_sk_recv_match_one+0x1af/0x2d0 [can_j1939] __asan_load4+0x84/0xb0 j1939_sk_recv_match_one+0x1af/0x2d0 [can_j1939] j1939_sk_recv+0x20b/0x320 [can_j1939] ? __kasan_check_write+0x18/0x20 ? __pfx_j1939_sk_recv+0x10/0x10 [can_j1939] ? j1939_simple_recv+0x69/0x280 [can_j1939] ? j1939_ac_recv+0x5e/0x310 [can_j1939] j1939_can_recv+0x43f/0x580 [can_j1939] ? __pfx_j1939_can_recv+0x10/0x10 [can_j1939] ? raw_rcv+0x42/0x3c0 [can_raw] ? __pfx_j1939_can_recv+0x10/0x10 [can_j1939] can_rcv_filter+0x11f/0x350 [can] can_receive+0x12f/0x190 [can] ? __pfx_can_rcv+0x10/0x10 [can] can_rcv+0xdd/0x130 [can] ? __pfx_can_rcv+0x10/0x10 [can] __netif_receive_skb_one_core+0x13d/0x150 ? __pfx___netif_receive_skb_one_core+0x10/0x10 ? __kasan_check_write+0x18/0x20 ? _raw_spin_lock_irq+0x8c/0xe0 __netif_receive_skb+0x23/0xb0 process_backlog+0x107/0x260 __napi_poll+0x69/0x310 net_rx_action+0x2a1/0x580 ? __pfx_net_rx_action+0x10/0x10 ? __pfx__raw_spin_lock+0x10/0x10 ? handle_irq_event+0x7d/0xa0 __do_softirq+0xf3/0x3f8 do_softirq+0x53/0x80 </IRQ> <TASK> __local_bh_enable_ip+0x6e/0x70 netif_rx+0x16b/0x180 can_send+0x32b/0x520 [can] ? __pfx_can_send+0x10/0x10 [can] ? __check_object_size+0x299/0x410 raw_sendmsg+0x572/0x6d0 [can_raw] ? __pfx_raw_sendmsg+0x10/0x10 [can_raw] ? apparmor_socket_sendmsg+0x2f/0x40 ? __pfx_raw_sendmsg+0x10/0x10 [can_raw] sock_sendmsg+0xef/0x100 sock_write_iter+0x162/0x220 ? __pfx_sock_write_iter+0x10/0x10 ? __rtnl_unlock+0x47/0x80 ? security_file_permission+0x54/0x320 vfs_write+0x6ba/0x750 ? __pfx_vfs_write+0x10/0x10 ? __fget_light+0x1ca/0x1f0 ? __rcu_read_unlock+0x5b/0x280 ksys_write+0x143/0x170 ? __pfx_ksys_write+0x10/0x10 ? __kasan_check_read+0x15/0x20 ? fpregs_assert_state_consistent+0x62/0x70 __x64_sys_write+0x47/0x60 do_syscall_64+0x60/0x90 ? do_syscall_64+0x6d/0x90 ? irqentry_exit+0x3f/0x50 ? exc_page_fault+0x79/0xf0 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Allocated by task 348: kasan_save_stack+0x2a/0x50 kasan_set_track+0x29/0x40 kasan_save_alloc_info+0x1f/0x30 __kasan_kmalloc+0xb5/0xc0 __kmalloc_node_track_caller+0x67/0x160 j1939_sk_setsockopt+0x284/0x450 [can_j1939] __sys_setsockopt+0x15c/0x2f0 __x64_sys_setsockopt+0x6b/0x80 do_syscall_64+0x60/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Freed by task 349: kasan_save_stack+0x2a/0x50 kasan_set_track+0x29/0x40 kasan_save_free_info+0x2f/0x50 __kasan_slab_free+0x12e/0x1c0 __kmem_cache_free+0x1b9/0x380 kfree+0x7a/0x120 j1939_sk_setsockopt+0x3b2/0x450 [can_j1939] __sys_setsockopt+0x15c/0x2f0 __x64_sys_setsockopt+0x6b/0x80 do_syscall_64+0x60/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
--- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/socket.c | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
net/can/j1939/j1939-priv.h +1 -0
@@ -301,6 +301,7 @@ struct j1939_sock {int ifindex;struct j1939_addr addr; +spinlock_t filters_lock;struct j1939_filter *filters;int nfilters;pgn_t pgn_rx_filter;
net/can/j1939/socket.c +18 -4
@@ -262,12 +262,17 @@ static bool j1939_sk_match_dst(struct j1static bool j1939_sk_match_filter (struct j1939_sock *jsk,const struct j1939_sk_buff_cb *skcb) { -const struct j1939_filter *f = jsk->filters; -int nfilter = jsk->nfilters; +const struct j1939_filter *f; +int nfilter; + +spin_lock_bh (&jsk->filters_lock); + + f = jsk->filters; + nfilter = jsk->nfilters;if (!nfilter)/* receive all when no filters are assigned */ -return true; + goto filter_match_found;for (; nfilter; ++f, --nfilter) {if ((skcb->addr.pgn & f->pgn_mask) != f->pgn)
@@ -276,9 +281,15 @@ static bool j1939_sk_match_filter(structcontinue ;if ((skcb->addr.src_name & f->name_mask) != f->name)continue ; -return true; + goto filter_match_found; } + +spin_unlock_bh (&jsk->filters_lock);return false; + +filter_match_found: +spin_unlock_bh (&jsk->filters_lock); +return true; } static bool j1939_sk_recv_match_one(struct j1939_sock *jsk,
@@ -401,6 +412,7 @@ static int j1939_sk_init(struct sock *skatomic_set (&jsk->skb_pending,0 );spin_lock_init (&jsk->sk_session_queue_lock);INIT_LIST_HEAD (&jsk->sk_session_queue); +spin_lock_init (&jsk->filters_lock);/* j1939_sk_sock_destruct() depends on SOCK_RCU_FREE flag */ sock_set_flag (sk,SOCK_RCU_FREE );
@@ -703,9 +715,11 @@ static int j1939_sk_setsockopt(struct so }lock_sock (&jsk->sk); +spin_lock_bh (&jsk->filters_lock); ofilters = jsk->filters; jsk->filters = filters; jsk->nfilters = count; +spin_unlock_bh (&jsk->filters_lock);release_sock (&jsk->sk);kfree (ofilters);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 423/476 pmdomain: core: Move the unused cleanup to a _sync initcall
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
commit 741ba0134fa7822fcf4e4a0a537a5c4cfd706b20 upstream.
The unused clock cleanup uses the _sync initcall to give all users at earlier initcalls time to probe. Do the same to avoid leaving some PDs dangling at "on" (which actually happened on qcom!).
--- drivers/base/power/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/domain.c +1 -1
@@ -1044,7 +1044,7 @@ static int __init genpd_power_off_unusedreturn 0 ; } -late_initcall (genpd_power_off_unused); +late_initcall_sync (genpd_power_off_unused);#ifdef CONFIG_PM_SLEEP
Greg Kroah-Hartman
maintainerPATCH 424/476 tracing: Inform kmemleak of saved_cmdlines allocation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
commit 2394ac4145ea91b92271e675a09af2a9ea6840b7 upstream.
The allocation of the struct saved_cmdlines_buffer structure changed from:
s = kmalloc(sizeof(*s), GFP_KERNEL); s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL);
to:
orig_size = sizeof(*s) + val * TASK_COMM_LEN; order = get_order(orig_size); size = 1 << (order + PAGE_SHIFT); page = alloc_pages(GFP_KERNEL, order); if (!page) return NULL; s = page_address(page); memset(s, 0, sizeof(*s)); s->saved_cmdlines = kmalloc_array(TASK_COMM_LEN, val, GFP_KERNEL);
Where that s->saved_cmdlines allocation looks to be a dangling allocation to kmemleak. That's because kmemleak only keeps track of kmalloc() allocations. For allocations that use page_alloc() directly, the kmemleak needs to be explicitly informed about it.
Add kmemleak_alloc() and kmemleak_free() around the page allocation so that it doesn't give the following false positive:
unreferenced object 0xffff8881010c8000 (size 32760):
comm "swapper", pid 0, jiffies 4294667296
hex dump (first 32 bytes):
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................
backtrace (crc ae6ec1b9):
[<ffffffff86722405>] kmemleak_alloc+0x45/0x80
[<ffffffff8414028d>] __kmalloc_large_node+0x10d/0x190
[<ffffffff84146ab1>] __kmalloc+0x3b1/0x4c0
[<ffffffff83ed7103>] allocate_cmdlines_buffer+0x113/0x230
[<ffffffff88649c34>] tracer_alloc_buffers.isra.0+0x124/0x460
[<ffffffff8864a174>] early_trace_init+0x14/0xa0
[<ffffffff885dd5ae>] start_kernel+0x12e/0x3c0
[<ffffffff885f5758>] x86_64_start_reservations+0x18/0x30
[<ffffffff885f582b>] x86_64_start_kernel+0x7b/0x80
[<ffffffff83a001c3>] secondary_startup_64_no_verify+0x15e/0x16b--- kernel/trace/trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/trace.c +3 -0
@@ -40,6 +40,7 @@#include <linux/ctype.h> #include <linux/init.h> #include <linux/panic_notifier.h> +#include <linux/kmemleak.h> #include <linux/poll.h> #include <linux/nmi.h> #include <linux/fs.h>
@@ -2255,6 +2256,7 @@ static void free_saved_cmdlines_buffer(sint order =get_order (sizeof (*s) + s->cmdline_num *TASK_COMM_LEN );kfree (s->map_cmdline_to_pid); +kmemleak_free (s);free_pages ((unsigned long )s, order); }
@@ -2274,6 +2276,7 @@ static struct saved_cmdlines_buffer *allreturn NULL ; s =page_address (page); +kmemleak_alloc (s, size,1 ,GFP_KERNEL );memset (s,0 ,sizeof (*s));/* Round up to actual allocation */
Greg Kroah-Hartman
maintainerPATCH 425/476 af_unix: Fix task hung while purging oob_skb in GC.
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
commit 25236c91b5ab4a26a56ba2e79b8060cf4e047839 upstream.
syzbot reported a task hung; at the same time, GC was looping infinitely in list_for_each_entry_safe() for OOB skb. [0]
syzbot demonstrated that the list_for_each_entry_safe() was not actually safe in this case.
A single skb could have references for multiple sockets. If we free such a skb in the list_for_each_entry_safe(), the current and next sockets could be unlinked in a single iteration.
unix_notinflight() uses list_del_init() to unlink the socket, so the prefetched next socket forms a loop itself and list_for_each_entry_safe() never stops.
Here, we must use while() and make sure we always fetch the first socket.
[0]:
Sending NMI from CPU 0 to CPUs 1:
NMI backtrace for cpu 1
CPU: 1 PID: 5065 Comm: syz-executor236 Not tainted 6.8.0-rc3-syzkaller-00136-g1f719a2f3fa6 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/25/2024 RIP: 0010:preempt_count arch/x86/include/asm/preempt.h:26 [inline] RIP: 0010:check_kcov_mode kernel/kcov.c:173 [inline] RIP: 0010:__sanitizer_cov_trace_pc+0xd/0x60 kernel/kcov.c:207 Code: cc cc cc cc 66 0f 1f 84 00 00 00 00 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa 65 48 8b 14 25 40 c2 03 00 <65> 8b 05 b4 7c 78 7e a9 00 01 ff 00 48 8b 34 24 74 0f f6 c4 01 74 RSP: 0018:ffffc900033efa58 EFLAGS: 00000283 RAX: ffff88807b077800 RBX: ffff88807b077800 RCX: 1ffffffff27b1189 RDX: ffff88802a5a3b80 RSI: ffffffff8968488d RDI: ffff88807b077f70 RBP: ffffc900033efbb0 R08: 0000000000000001 R09: fffffbfff27a900c R10: ffffffff93d48067 R11: ffffffff8ae000eb R12: ffff88807b077800 R13: dffffc0000000000 R14: ffff88807b077e40 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9500000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000564f4fc1e3a8 CR3: 000000000d57a000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <NMI> </NMI> <TASK> unix_gc+0x563/0x13b0 net/unix/garbage.c:319 unix_release_sock+0xa93/0xf80 net/unix/af_unix.c:683 unix_release+0x91/0xf0 net/unix/af_unix.c:1064 __sock_release+0xb0/0x270 net/socket.c:659 sock_close+0x1c/0x30 net/socket.c:1421 __fput+0x270/0xb80 fs/file_table.c:376 task_work_run+0x14f/0x250 kernel/task_work.c:180 exit_task_work include/linux/task_work.h:38 [inline] do_exit+0xa8a/0x2ad0 kernel/exit.c:871 do_group_exit+0xd4/0x2a0 kernel/exit.c:1020 __do_sys_exit_group kernel/exit.c:1031 [inline] __se_sys_exit_group kernel/exit.c:1029 [inline] __x64_sys_exit_group+0x3e/0x50 kernel/exit.c:1029 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xd5/0x270 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x6f/0x77 RIP: 0033:0x7f9d6cbdac09 Code: Unable to access opcode bytes at 0x7f9d6cbdabdf. RSP: 002b:00007fff5952feb8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f9d6cbdac09 RDX: 000000000000003c RSI: 00000000000000e7 RDI: 0000000000000000 RBP: 00007f9d6cc552b0 R08: ffffffffffffffb8 R09: 0000000000000006 R10: 0000000000000006 R11: 0000000000000246 R12: 00007f9d6cc552b0 R13: 0000000000000000 R14: 00007f9d6cc55d00 R15: 00007f9d6cbabe70 </TASK>
--- net/unix/garbage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/unix/garbage.c +4 -3
@@ -315,10 +315,11 @@ void unix_gc(void)__skb_queue_purge (&hitlist);#if IS_ENABLED (CONFIG_AF_UNIX_OOB ) -list_for_each_entry_safe (u, next, &gc_candidates, link) { -struct sk_buff *skb = u->oob_skb; +while (!list_empty (&gc_candidates)) { + u = list_entry(gc_candidates.next, struct unix_sock, link); +if (u->oob_skb) { +struct sk_buff *skb = u->oob_skb; -if (skb) { u->oob_skb =NULL ;kfree_skb (skb); }
Greg Kroah-Hartman
maintainerPATCH 426/476 dma-buf: add dma_fence_timestamp helper
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König <[email protected]>
[ Upstream commit b83ce9cb4a465b8f9a3fa45561b721a9551f60e3 ]
When a fence signals there is a very small race window where the timestamp isn't updated yet. sync_file solves this by busy waiting for the timestamp to appear, but on other ocassions didn't handled this correctly.
Provide a dma_fence_timestamp() helper function for this and use it in all appropriate cases.
Another alternative would be to grab the spinlock when that happens.
v2 by teddy: add a wait parameter to wait for the timestamp to show up, in case
the accurate timestamp is needed and/or the timestamp is not based on ktime (e.g. hw timestamp)
v3 chk: drop the parameter again for unified handling
--- drivers/dma-buf/dma-fence-unwrap.c | 176 +++++++++++++++++++++++++ drivers/dma-buf/sync_file.c | 9 +- drivers/gpu/drm/scheduler/sched_main.c | 3 +- include/linux/dma-fence.h | 19 +++ 4 files changed, 199 insertions(+), 8 deletions(-) create mode 100644 drivers/dma-buf/dma-fence-unwrap.c
drivers/dma-buf/dma-fence-unwrap.c new file +176 -0
@@ -0,0 +1,176 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* dma-fence-util: misc functions for dma_fence objects +* +* Copyright (C) 2022 Advanced Micro Devices, Inc. +* Authors: +* Christian König <[email protected]> +*/ + +#include <linux/dma-fence.h> +#include <linux/dma-fence-array.h> +#include <linux/dma-fence-chain.h> +#include <linux/dma-fence-unwrap.h> +#include <linux/slab.h> + +/* Internal helper to start new array iteration, don't use directly */ +static struct dma_fence * +__dma_fence_unwrap_array (struct dma_fence_unwrap *cursor) +{ + cursor->array =dma_fence_chain_contained (cursor->chain); + cursor->index =0 ; +return dma_fence_array_first (cursor->array); +} + +/** +* dma_fence_unwrap_first - return the first fence from fence containers +* @head: the entrypoint into the containers +* @cursor: current position inside the containers +* +* Unwraps potential dma_fence_chain/dma_fence_array containers and return the +* first fence. +*/ +struct dma_fence *dma_fence_unwrap_first (struct dma_fence *head, +struct dma_fence_unwrap *cursor) +{ + cursor->chain =dma_fence_get (head); +return __dma_fence_unwrap_array (cursor); +} +EXPORT_SYMBOL_GPL (dma_fence_unwrap_first); + +/** +* dma_fence_unwrap_next - return the next fence from a fence containers +* @cursor: current position inside the containers +* +* Continue unwrapping the dma_fence_chain/dma_fence_array containers and return +* the next fence from them. +*/ +struct dma_fence *dma_fence_unwrap_next (struct dma_fence_unwrap *cursor) +{ +struct dma_fence *tmp; + + ++cursor->index; + tmp =dma_fence_array_next (cursor->array, cursor->index); +if (tmp) +return tmp; + + cursor->chain =dma_fence_chain_walk (cursor->chain); +return __dma_fence_unwrap_array (cursor); +} +EXPORT_SYMBOL_GPL (dma_fence_unwrap_next); + +/* Implementation for the dma_fence_merge() marco, don't use directly */ +struct dma_fence *__dma_fence_unwrap_merge (unsigned int num_fences, +struct dma_fence **fences, +struct dma_fence_unwrap *iter) +{ +struct dma_fence_array *result; +struct dma_fence *tmp, **array; +ktime_t timestamp; +unsigned int i; +size_t count; + + count =0 ; + timestamp =ns_to_ktime (0 ); +for (i =0 ; i < num_fences; ++i) { +dma_fence_unwrap_for_each (tmp, &iter[i], fences[i]) { +if (!dma_fence_is_signaled (tmp)) { + ++count; + }else { +ktime_t t =dma_fence_timestamp (tmp); + +if (ktime_after (t, timestamp)) + timestamp = t; + } + } + } + +/* +* If we couldn't find a pending fence just return a private signaled +* fence with the timestamp of the last signaled one. +*/ +if (count ==0 ) +return dma_fence_allocate_private_stub (timestamp); + + array =kmalloc_array (count,sizeof (*array),GFP_KERNEL ); +if (!array) +return NULL ; + +/* +* This trashes the input fence array and uses it as position for the +* following merge loop. This works because the dma_fence_merge() +* wrapper macro is creating this temporary array on the stack together +* with the iterators. +*/ +for (i =0 ; i < num_fences; ++i) + fences[i] =dma_fence_unwrap_first (fences[i], &iter[i]); + + count =0 ; +do { +unsigned int sel; + +restart: + tmp =NULL ; +for (i =0 ; i < num_fences; ++i) { +struct dma_fence *next; + +while (fences[i] &&dma_fence_is_signaled (fences[i])) + fences[i] =dma_fence_unwrap_next (&iter[i]); + + next = fences[i]; +if (!next) +continue ; + +/* +* We can't guarantee that inpute fences are ordered by +* context, but it is still quite likely when this +* function is used multiple times. So attempt to order +* the fences by context as we pass over them and merge +* fences with the same context. +*/ +if (!tmp || tmp->context > next->context) { + tmp = next; + sel = i; + + }else if (tmp->context < next->context) { +continue ; + + }else if (dma_fence_is_later (tmp, next)) { + fences[i] =dma_fence_unwrap_next (&iter[i]); + goto restart; + }else { + fences[sel] =dma_fence_unwrap_next (&iter[sel]); + goto restart; + } + } + +if (tmp) { + array[count++] =dma_fence_get (tmp); + fences[sel] =dma_fence_unwrap_next (&iter[sel]); + } + }while (tmp); + +if (count ==0 ) { + tmp =dma_fence_allocate_private_stub (ktime_get ()); + goto return_tmp; + } + +if (count ==1 ) { + tmp = array[0 ]; + goto return_tmp; + } + + result =dma_fence_array_create (count, array, +dma_fence_context_alloc (1 ), +1 , false); +if (!result) { + tmp =NULL ; + goto return_tmp; + } +return &result->base; + +return_tmp: +kfree (array); +return tmp; +} +EXPORT_SYMBOL_GPL (__dma_fence_unwrap_merge);
drivers/dma-buf/sync_file.c +3 -6
@@ -384,13 +384,10 @@ static int sync_fill_fence_info(struct dma_fence *fence, sizeof(info->driver_name)); info->status =dma_fence_get_status (fence); -while (test_bit (DMA_FENCE_FLAG_SIGNALED_BIT , &fence->flags) && - !test_bit (DMA_FENCE_FLAG_TIMESTAMP_BIT , &fence->flags)) -cpu_relax (); info->timestamp_ns = -test_bit (DMA_FENCE_FLAG_TIMESTAMP_BIT , &fence->flags) ? -ktime_to_ns (fence->timestamp) : -ktime_set (0 ,0 ); +dma_fence_is_signaled (fence) ? +ktime_to_ns (dma_fence_timestamp (fence)) : +ktime_set (0 ,0 );return info->status; }
drivers/gpu/drm/scheduler/sched_main.c +1 -2
@@ -698,8 +698,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) typeof(*next), list);if (next) next->s_fence->scheduled.timestamp = - job->s_fence->finished.timestamp; - +dma_fence_timestamp (&job->s_fence->finished); }else { job =NULL ;/* queue timeout for next job */
include/linux/dma-fence.h +19 -0
@@ -551,6 +551,25 @@ static inline void dma_fence_set_error(struct dma_fence *fence, fence->error = error; } +/** +* dma_fence_timestamp - helper to get the completion timestamp of a fence +* @fence: fence to get the timestamp from. +* +* After a fence is signaled the timestamp is updated with the signaling time, +* but setting the timestamp can race with tasks waiting for the signaling. This +* helper busy waits for the correct timestamp to appear. +*/ +static inline ktime_t dma_fence_timestamp (struct dma_fence *fence) +{ +if (WARN_ON (!test_bit (DMA_FENCE_FLAG_SIGNALED_BIT , &fence->flags))) +return ktime_get (); + +while (!test_bit (DMA_FENCE_FLAG_TIMESTAMP_BIT , &fence->flags)) +cpu_relax (); + +return fence->timestamp; +} +signed long dma_fence_wait_timeout (struct dma_fence *,bool intr,signed long timeout); signed long dma_fence_wait_any_timeout(struct dma_fence **fences,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 427/476 mwifiex: Select firmware based on strapping
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrejs Cainikovs <[email protected]>
[ Upstream commit 255ca28a659d3cfb069f73c7644853ed93aecdb0 ]
Some WiFi/Bluetooth modules might have different host connection options, allowing to either use SDIO for both WiFi and Bluetooth, or SDIO for WiFi and UART for Bluetooth. It is possible to detect whether a module has SDIO-SDIO or SDIO-UART connection by reading its host strap register.
This change introduces a way to automatically select appropriate firmware depending of the connection method, and removes a need of symlinking or overwriting the original firmware file with a required one.
Host strap register used in this commit comes from the NXP driver [1] hosted at Code Aurora.
Stable-dep-of: 1c5d463c0770 ("wifi: mwifiex: add extra delay for firmware ready")
--- drivers/net/wireless/marvell/mwifiex/sdio.c | 21 ++++++++++++++++++++- drivers/net/wireless/marvell/mwifiex/sdio.h | 5 +++++ 2 files changed, 25 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.c +20 -1
@@ -182,6 +182,9 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8997 = { .host_int_rsr_reg = 0x4, .host_int_status_reg = 0x0C, .host_int_mask_reg = 0x08, + .host_strap_reg = 0xF4, + .host_strap_mask = 0x01, + .host_strap_value = 0x00, .status_reg_0 = 0xE8, .status_reg_1 = 0xE9, .sdio_int_mask = 0xff,
@@ -283,6 +286,9 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = { .host_int_rsr_reg = 0x4, .host_int_status_reg = 0x0C, .host_int_mask_reg = 0x08, + .host_strap_reg = 0xF4, + .host_strap_mask = 0x01, + .host_strap_value = 0x00, .status_reg_0 = 0xE8, .status_reg_1 = 0xE9, .sdio_int_mask = 0xff,
@@ -537,6 +543,7 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)struct mwifiex_sdio_device *data = (void *)id->driver_data; card->firmware = data->firmware; + card->firmware_sdiouart = data->firmware_sdiouart; card->reg = data->reg; card->max_ports = data->max_ports; card->mp_agg_pkt_limit = data->mp_agg_pkt_limit;
@@ -2440,6 +2447,7 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)int ret;struct sdio_mmc_card *card = adapter->card;struct sdio_func *func = card->func; +const char *firmware = card->firmware;/* save adapter pointer in card */ card->adapter = adapter;
@@ -2456,7 +2464,18 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)return ret; } -strcpy (adapter->fw_name, card->firmware); +/* Select correct firmware (sdsd or sdiouart) firmware based on the strapping +* option +*/ +if (card->firmware_sdiouart) { +u8 val; + +mwifiex_read_reg (adapter, card->reg->host_strap_reg, &val); +if ((val & card->reg->host_strap_mask) == card->reg->host_strap_value) + firmware = card->firmware_sdiouart; + } +strcpy (adapter->fw_name, firmware); +if (card->fw_dump_enh) { adapter->mem_type_mapping_tbl = generic_mem_type_map; adapter->num_mem_types =1 ;
drivers/net/wireless/marvell/mwifiex/sdio.h +5 -0
@@ -196,6 +196,9 @@ struct mwifiex_sdio_card_reg {u8 host_int_rsr_reg;u8 host_int_status_reg;u8 host_int_mask_reg; +u8 host_strap_reg; +u8 host_strap_mask; +u8 host_strap_value;u8 status_reg_0;u8 status_reg_1;u8 sdio_int_mask;
@@ -241,6 +244,7 @@ struct sdio_mmc_card {struct completion fw_done;const char *firmware; +const char *firmware_sdiouart;const struct mwifiex_sdio_card_reg *reg;u8 max_ports;u8 mp_agg_pkt_limit;
@@ -274,6 +278,7 @@ struct sdio_mmc_card {struct mwifiex_sdio_device {const char *firmware; +const char *firmware_sdiouart;const struct mwifiex_sdio_card_reg *reg;u8 max_ports;u8 mp_agg_pkt_limit;
Signature · 1 line
2.43.0
Re: [PATCH 5.15 427/476] mwifiex: Select firmware based on strapping
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
- [PATCH 5.15 427/476] mwifiex: Select firmware based on strapping Greg Kroah-Hartman
- [PATCH 5.15 428/476] wifi: mwifiex: Support SD8978 chipset Greg Kroah-Hartman
Both of the above are marked as stable-deps of this one:
- [PATCH 5.15 429/476] wifi: mwifiex: add extra delay for firmware ready Greg Kroah-Hartman
but they are not at all relevant, so I think patches 427 and 428 should be dropped. But patch 429 is OK for stable as long as 431 is included:
- [PATCH 5.15 431/476] wifi: mwifiex: fix uninitialized firmware_stat Greg Kroah-Hartman
Kind regards,
Alvin
Quoted 30 lines
------------------
From: Andrejs Cainikovs <[email protected]>
[ Upstream commit
255ca28a659d3cfb069f73c7644853ed93aecdb0]Some WiFi/Bluetooth modules might have different host connection options, allowing to either use SDIO for both WiFi and Bluetooth, or SDIO for WiFi and UART for Bluetooth. It is possible to detect whether a module has SDIO-SDIO or SDIO-UART connection by reading its host strap register.
This change introduces a way to automatically select appropriate firmware depending of the connection method, and removes a need of symlinking or overwriting the original firmware file with a required one.
Host strap register used in this commit comes from the NXP driver [1] hosted at Code Aurora.
Signed-off-by Andrejs Cainikovs <[email protected]>Reviewed-by Alvin Šipraga <[email protected]>Signed-off-by Kalle Valo <[email protected]>Stable-dep-of:
1c5d463c0770("wifi: mwifiex: add extra delay for firmware ready")Signed-off-by Sasha Levin <[email protected]>---
[...]
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 427/476] mwifiex: Select firmware based on strapping
Quoted 8 lines · Alvin Šipraga
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
- [PATCH 5.15 427/476] mwifiex: Select firmware based on strapping Greg Kroah-Hartman
- [PATCH 5.15 428/476] wifi: mwifiex: Support SD8978 chipset Greg Kroah-Hartman
Quoted 6 lines
Both of the above are marked as stable-deps of this one:
- [PATCH 5.15 429/476] wifi: mwifiex: add extra delay for firmware ready Greg Kroah-Hartman
but they are not at all relevant, so I think patches 427 and 428 should be dropped.
But if they are dropped, then this commit does not apply! Which is why they were added.
Quoted 3 lines
But patch 429 is OK for stable as long as 431 is included:
- [PATCH 5.15 431/476] wifi: mwifiex: fix uninitialized
firmware_statGreg Kroah-Hartman
I'll just drop all of these and if you think they should be applied, I'll take some working backports please.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 428/476 wifi: mwifiex: Support SD8978 chipset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
[ Upstream commit bba047f15851c8b053221f1b276eb7682d59f755 ]
The Marvell SD8978 (aka NXP IW416) uses identical registers as SD8987, so reuse the existing mwifiex_reg_sd8987 definition.
Note that mwifiex_reg_sd8977 and mwifiex_reg_sd8997 are likewise identical, save for the fw_dump_ctrl register: They define it as 0xf0 whereas mwifiex_reg_sd8987 defines it as 0xf9. I've verified that 0xf9 is the correct value on SD8978. NXP's out-of-tree driver uses 0xf9 for all of them, so there's a chance that 0xf0 is not correct in the mwifiex_reg_sd8977 and mwifiex_reg_sd8997 definitions. I cannot test that for lack of hardware, hence am leaving it as is.
NXP has only released a firmware which runs Bluetooth over UART. Perhaps Bluetooth over SDIO is unsupported by this chipset. Consequently, only an "sdiouart" firmware image is referenced, not an alternative "sdsd" image.
Stable-dep-of: 1c5d463c0770 ("wifi: mwifiex: add extra delay for firmware ready")
--- .../bindings/net/wireless/marvell-8xxx.txt | 4 ++- drivers/net/wireless/marvell/mwifiex/Kconfig | 5 ++-- drivers/net/wireless/marvell/mwifiex/sdio.c | 25 +++++++++++++++++-- drivers/net/wireless/marvell/mwifiex/sdio.h | 1 + include/linux/mmc/sdio_ids.h | 1 + 5 files changed, 31 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt +3 -1
@@ -1,4 +1,4 @@ -Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices +Marvell 8787/8897/8978/8997 (sd8787/sd8897/sd8978/sd8997/pcie8997) SDIO/PCIE devices ------ This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
@@ -10,7 +10,9 @@ Required properties: - compatible : should be one of the following: * "marvell,sd8787" * "marvell,sd8897" + * "marvell,sd8978" * "marvell,sd8997" + * "nxp,iw416" * "pci11ab,2b42" * "pci1b4b,2b42"
drivers/net/wireless/marvell/mwifiex/Kconfig +3 -2
@@ -10,13 +10,14 @@ config MWIFIEX mwifiex. config MWIFIEX_SDIO - tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8987/SD8997" + tristate "Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8978/SD8987/SD8997" depends on MWIFIEX && MMC select FW_LOADER select WANT_DEV_COREDUMP help This adds support for wireless adapters based on Marvell - 8786/8787/8797/8887/8897/8977/8987/8997 chipsets with SDIO interface. + 8786/8787/8797/8887/8897/8977/8978/8987/8997 chipsets with + SDIO interface. SD8978 is also known as NXP IW416. If you choose to build it as a module, it will be called mwifiex_sdio.
drivers/net/wireless/marvell/mwifiex/sdio.c +23 -2
@@ -275,7 +275,7 @@ static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8887 = { 0x68, 0x69, 0x6a}, }; -static const struct mwifiex_sdio_card_reg mwifiex_reg_sd8987 = { +static const struct mwifiex_sdio_card_reg mwifiex_reg_sd89xx = { .start_rd_port =0 , .start_wr_port =0 , .base_0_reg =0xF8 ,
@@ -406,6 +406,22 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = { .can_ext_scan = true, }; +static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = { + .firmware_sdiouart =SD8978_SDIOUART_FW_NAME , + .reg = &mwifiex_reg_sd89xx, + .max_ports =32 , + .mp_agg_pkt_limit =16 , + .tx_buf_size =MWIFIEX_TX_DATA_BUF_SIZE_4K , + .mp_tx_agg_buf_size =MWIFIEX_MP_AGGR_BUF_SIZE_MAX , + .mp_rx_agg_buf_size =MWIFIEX_MP_AGGR_BUF_SIZE_MAX , + .supports_sdio_new_mode = true, + .has_control_mask = false, + .can_dump_fw = true, + .fw_dump_enh = true, + .can_auto_tdls = false, + .can_ext_scan = true, +}; +static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = { .firmware =SD8997_DEFAULT_FW_NAME , .reg = &mwifiex_reg_sd8997,
@@ -439,7 +455,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = { .firmware =SD8987_DEFAULT_FW_NAME , - .reg = &mwifiex_reg_sd8987, + .reg = &mwifiex_reg_sd89xx, .max_ports =32 , .mp_agg_pkt_limit =16 , .tx_buf_size =MWIFIEX_TX_DATA_BUF_SIZE_2K ,
@@ -493,7 +509,9 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = {static const struct of_device_id mwifiex_sdio_of_match_table[]__maybe_unused = { { .compatible ="marvell,sd8787" }, { .compatible ="marvell,sd8897" }, + { .compatible ="marvell,sd8978" }, { .compatible ="marvell,sd8997" }, + { .compatible ="nxp,iw416" }, { } };
@@ -931,6 +949,8 @@ static const struct sdio_device_id mwifiex_ids[] = { .driver_data = (unsigned long)&mwifiex_sdio_sd8801}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8977_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8977}, + {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8978_WLAN), + .driver_data = (unsigned long)&mwifiex_sdio_sd8978}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8987_WLAN), .driver_data = (unsigned long)&mwifiex_sdio_sd8987}, {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SDIO_DEVICE_ID_MARVELL_8997_WLAN),
@@ -3175,5 +3195,6 @@ MODULE_FIRMWARE(SD8797_DEFAULT_FW_NAME);MODULE_FIRMWARE (SD8897_DEFAULT_FW_NAME );MODULE_FIRMWARE (SD8887_DEFAULT_FW_NAME );MODULE_FIRMWARE (SD8977_DEFAULT_FW_NAME ); +MODULE_FIRMWARE (SD8978_SDIOUART_FW_NAME );MODULE_FIRMWARE (SD8987_DEFAULT_FW_NAME );MODULE_FIRMWARE (SD8997_DEFAULT_FW_NAME );
drivers/net/wireless/marvell/mwifiex/sdio.h +1 -0
@@ -37,6 +37,7 @@#define SD8887_DEFAULT_FW_NAME "mrvl/sd8887_uapsta.bin"#define SD8801_DEFAULT_FW_NAME "mrvl/sd8801_uapsta.bin"#define SD8977_DEFAULT_FW_NAME "mrvl/sdsd8977_combo_v2.bin" +#define SD8978_SDIOUART_FW_NAME "mrvl/sdiouartiw416_combo_v0.bin"#define SD8987_DEFAULT_FW_NAME "mrvl/sd8987_uapsta.bin"#define SD8997_DEFAULT_FW_NAME "mrvl/sdsd8997_combo_v4.bin"
include/linux/mmc/sdio_ids.h +1 -0
@@ -101,6 +101,7 @@#define SDIO_DEVICE_ID_MARVELL_8977_BT 0x9146#define SDIO_DEVICE_ID_MARVELL_8987_WLAN 0x9149#define SDIO_DEVICE_ID_MARVELL_8987_BT 0x914a +#define SDIO_DEVICE_ID_MARVELL_8978_WLAN 0x9159#define SDIO_VENDOR_ID_MEDIATEK 0x037a#define SDIO_DEVICE_ID_MEDIATEK_MT7663 0x7663
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 429/476 wifi: mwifiex: add extra delay for firmware ready
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lin <[email protected]>
[ Upstream commit 1c5d463c0770c6fa2037511a24fb17966fd07d97 ]
For SDIO IW416, due to a bug, FW may return ready before complete full initialization. Command timeout may occur at driver load after reboot. Workaround by adding 100ms delay at checking FW status.
--- drivers/net/wireless/marvell/mwifiex/sdio.c | 19 +++++++++++++++++++ drivers/net/wireless/marvell/mwifiex/sdio.h | 2 ++ 2 files changed, 21 insertions(+)
drivers/net/wireless/marvell/mwifiex/sdio.c +19 -0
@@ -343,6 +343,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = { .can_dump_fw = false, .can_auto_tdls = false, .can_ext_scan = false, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
@@ -358,6 +359,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = { .can_dump_fw = false, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
@@ -373,6 +375,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = { .can_dump_fw = false, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
@@ -388,6 +391,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = { .can_dump_fw = true, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = {
@@ -404,6 +408,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8977 = { .fw_dump_enh = true, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = {
@@ -420,6 +425,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8978 = { .fw_dump_enh = true, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = true, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = {
@@ -436,6 +442,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8997 = { .fw_dump_enh = true, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
@@ -451,6 +458,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = { .can_dump_fw = false, .can_auto_tdls = true, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = {
@@ -467,6 +475,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8987 = { .fw_dump_enh = true, .can_auto_tdls = true, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {
@@ -482,6 +491,7 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = { .can_dump_fw = false, .can_auto_tdls = false, .can_ext_scan = true, + .fw_ready_extra_delay = false, };static struct memory_type_mapping generic_mem_type_map[] = {
@@ -574,6 +584,7 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) card->fw_dump_enh = data->fw_dump_enh; card->can_auto_tdls = data->can_auto_tdls; card->can_ext_scan = data->can_ext_scan; + card->fw_ready_extra_delay = data->fw_ready_extra_delay;INIT_WORK (&card->work, mwifiex_sdio_work); }
@@ -777,6 +788,7 @@ mwifiex_sdio_read_fw_status(struct mwifiex_adapter *adapter, u16 *dat)static int mwifiex_check_fw_status (struct mwifiex_adapter *adapter,u32 poll_num) { +struct sdio_mmc_card *card = adapter->card;int ret =0 ;u16 firmware_stat;u32 tries;
@@ -794,6 +806,13 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter, ret =-1 ; } +if (card->fw_ready_extra_delay && + firmware_stat ==FIRMWARE_READY_SDIO ) +/* firmware might pretend to be ready, when it's not. +* Wait a little bit more as a workaround. +*/ +msleep (100 ); +return ret; }
drivers/net/wireless/marvell/mwifiex/sdio.h +2 -0
@@ -269,6 +269,7 @@ struct sdio_mmc_card {bool fw_dump_enh;bool can_auto_tdls;bool can_ext_scan; +bool fw_ready_extra_delay;struct mwifiex_sdio_mpa_tx mpa_tx;struct mwifiex_sdio_mpa_rx mpa_rx;
@@ -292,6 +293,7 @@ struct mwifiex_sdio_device {bool fw_dump_enh;bool can_auto_tdls;bool can_ext_scan; +bool fw_ready_extra_delay; };/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 430/476 bus: moxtet: Add spi device table
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sjoerd Simons <[email protected]>
[ Upstream commit aaafe88d5500ba18b33be72458439367ef878788 ]
The moxtet module fails to auto-load on. Add a SPI id table to allow it to do so.
--- drivers/bus/moxtet.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/bus/moxtet.c +7 -0
@@ -832,6 +832,12 @@ static int moxtet_remove(struct spi_device *spi)return 0 ; } +static const struct spi_device_id moxtet_spi_ids[] = { + {"moxtet" }, + { }, +}; +MODULE_DEVICE_TABLE (spi, moxtet_spi_ids); +static const struct of_device_id moxtet_dt_ids[] = { { .compatible ="cznic,moxtet" }, {},
@@ -843,6 +849,7 @@ static struct spi_driver moxtet_spi_driver = { .name = "moxtet", .of_match_table = moxtet_dt_ids, }, + .id_table = moxtet_spi_ids, .probe = moxtet_probe, .remove = moxtet_remove, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 431/476 wifi: mwifiex: fix uninitialized firmware_stat
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lin <[email protected]>
[ Upstream commit 3df95e265924ac898c1a38a0c01846dd0bd3b354 ]
Variable firmware_stat is possible to be used without initialization.
--- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.c +1 -1
@@ -790,7 +790,7 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter, {struct sdio_mmc_card *card = adapter->card;int ret =0 ; -u16 firmware_stat; +u16 firmware_stat =0 ;u32 tries;for (tries =0 ; tries < poll_num; tries++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 432/476 crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tianjia Zhang <[email protected]>
[ Upstream commit ba3c5574203034781ac4231acf117da917efcd2a ]
When the mpi_ec_ctx structure is initialized, some fields are not cleared, causing a crash when referencing the field when the structure was released. Initially, this issue was ignored because memory for mpi_ec_ctx is allocated with the __GFP_ZERO flag. For example, this error will be triggered when calculating the Za value for SM2 separately.
--- lib/mpi/ec.c | 3 +++ 1 file changed, 3 insertions(+)
lib/mpi/ec.c +3 -0
@@ -584,6 +584,9 @@ void mpi_ec_init(struct mpi_ec_ctx *ctx, enum gcry_mpi_ec_models model, ctx->a =mpi_copy (a); ctx->b =mpi_copy (b); + ctx->d =NULL ; + ctx->t.two_inv_p =NULL ; + ctx->t.p_barrett = use_barrett >0 ?mpi_barrett_init (ctx->p,0 ) :NULL ;mpi_ec_get_reset (ctx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 433/476 usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
[ Upstream commit e4cf6580ac740f766dae26203bd6311d353dcd42 ]
If a Setup packet is received but yet to DMA out, the controller will not process the End Transfer command of any endpoint. Polling of its DEPCMD.CmdAct may block setting up TRB for Setup packet, causing a command timeout.
This may occur if the driver doesn’t service the completion interrupt of the control status stage yet due to system latency, then it won’t prepare TRB and start the transfer for the next Setup Stage. To the host side, the control transfer had completed, and the host can send a new Setup packet at this point.
In the meanwhile, if the driver receives an async call to dequeue a request (triggering End Transfer) to any endpoint, then the driver will service that End transfer first, blocking the control status stage completion handler. Since no TRB is available for the Setup stage, the Setup packet can’t be DMA’ed out and the End Transfer gets hung.
The driver must not block setting up of the Setup stage. So track and only issue the End Transfer command only when there’s Setup TRB prepared so that the controller can DMA out the Setup packet. Delay the End transfer command if there's no Setup TRB available. This is applicable to all DWC_usb3x IPs.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/ep0.c | 14 ++++++++++++++ drivers/usb/dwc3/gadget.c | 20 +++++++++++++++----- drivers/usb/dwc3/gadget.h | 1 + 4 files changed, 31 insertions(+), 5 deletions(-)
drivers/usb/dwc3/core.h +1 -0
@@ -722,6 +722,7 @@ struct dwc3_ep {#define DWC3_EP_FIRST_STREAM_PRIMED BIT(10)#define DWC3_EP_PENDING_CLEAR_STALL BIT(11)#define DWC3_EP_TXFIFO_RESIZED BIT(12) +#define DWC3_EP_DELAY_STOP BIT(13)/* This last one is specific to EP0 */ #define DWC3_EP0_DIR_IN BIT(31)
drivers/usb/dwc3/ep0.c +14 -0
@@ -274,6 +274,7 @@ void dwc3_ep0_out_start(struct dwc3 *dwc) {struct dwc3_ep *dep;int ret; +int i;complete (&dwc->ep0_in_setup);
@@ -282,6 +283,19 @@ void dwc3_ep0_out_start(struct dwc3 *dwc) DWC3_TRBCTL_CONTROL_SETUP, false); ret =dwc3_ep0_start_trans (dep);WARN_ON (ret <0 ); +for (i =2 ; i <DWC3_ENDPOINTS_NUM ; i++) { +struct dwc3_ep *dwc3_ep; + + dwc3_ep = dwc->eps[i]; +if (!dwc3_ep) +continue ; + +if (!(dwc3_ep->flags &DWC3_EP_DELAY_STOP )) +continue ; + + dwc3_ep->flags &= ~DWC3_EP_DELAY_STOP ; +dwc3_stop_active_transfer (dwc3_ep, true, true); + } }static struct dwc3_ep *dwc3_wIndex_to_dep (struct dwc3 *dwc,__le16 wIndex_le)
drivers/usb/dwc3/gadget.c +15 -5
@@ -641,9 +641,6 @@ static int dwc3_gadget_set_ep_config(struct dwc3_ep *dep, unsigned int action)return dwc3_send_gadget_ep_cmd (dep,DWC3_DEPCMD_SETEPCONFIG , ¶ms); } -static void dwc3_stop_active_transfer (struct dwc3_ep *dep,bool force, -bool interrupt); -/** * dwc3_gadget_calc_tx_fifo_size - calculates the txfifo size value * @dwc: pointer to the DWC3 context
@@ -1891,6 +1888,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)*/ if ((dep->flags &DWC3_EP_END_TRANSFER_PENDING ) || (dep->flags &DWC3_EP_WEDGE ) || + (dep->flags &DWC3_EP_DELAY_STOP ) || (dep->flags &DWC3_EP_STALL )) { dep->flags |=DWC3_EP_DELAY_START ;return 0 ;
@@ -2031,6 +2029,16 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,if (r == req) {struct dwc3_request *t; +/* +* If a Setup packet is received but yet to DMA out, the controller will +* not process the End Transfer command of any endpoint. Polling of its +* DEPCMD.CmdAct may block setting up TRB for Setup packet, causing a +* timeout. Delay issuing the End Transfer command until the Setup TRB is +* prepared. +*/ +if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) + dep->flags |=DWC3_EP_DELAY_STOP ; +/* wait until it is processed */ dwc3_stop_active_transfer (dep, true, true);
@@ -2114,7 +2122,8 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)list_for_each_entry_safe (req, tmp, &dep->started_list, list)dwc3_gadget_move_cancelled_request (req,DWC3_REQUEST_STATUS_STALLED ); -if (dep->flags &DWC3_EP_END_TRANSFER_PENDING ) { +if (dep->flags &DWC3_EP_END_TRANSFER_PENDING || + (dep->flags &DWC3_EP_DELAY_STOP )) { dep->flags |=DWC3_EP_PENDING_CLEAR_STALL ;return 0 ; }
@@ -3630,10 +3639,11 @@ static void dwc3_reset_gadget(struct dwc3 *dwc) } } -static void dwc3_stop_active_transfer (struct dwc3_ep *dep,bool force, +void dwc3_stop_active_transfer (struct dwc3_ep *dep,bool force,bool interrupt) {if (!(dep->flags &DWC3_EP_TRANSFER_STARTED ) || + (dep->flags &DWC3_EP_DELAY_STOP ) || (dep->flags &DWC3_EP_END_TRANSFER_PENDING ))return ;
drivers/usb/dwc3/gadget.h +1 -0
@@ -116,6 +116,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, gfp_t gfp_flags);int __dwc3_gadget_ep_set_halt (struct dwc3_ep *dep,int value,int protocol);void dwc3_ep0_send_delayed_status (struct dwc3 *dwc); +void dwc3_stop_active_transfer (struct dwc3_ep *dep,bool force,bool interrupt);/** * dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 434/476 usb: dwc3: ep0: Dont prepare beyond Setup stage
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
[ Upstream commit c96683798e272366866a5c0ce3073c0b5a256db7 ]
Since we can't guarantee that the host won't send new Setup packet before going through the device-initiated disconnect, don't prepare beyond the Setup stage and keep the device in EP0_SETUP_PHASE. This ensures that the device-initated disconnect sequence can go through gracefully. Note that the controller won't service the End Transfer command if it can't DMA out the Setup packet.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/ep0.c | 2 +- drivers/usb/dwc3/gadget.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-)
drivers/usb/dwc3/ep0.c +1 -1
@@ -816,7 +816,7 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,int ret = -EINVAL ;u32 len; -if (!dwc->gadget_driver) +if (!dwc->gadget_driver || !dwc->connected) goto out;trace_dwc3_ctrl_req (ctrl);
drivers/usb/dwc3/gadget.c +17 -12
@@ -2472,6 +2472,23 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc)spin_lock_irqsave (&dwc->lock, flags); dwc->connected = false; +/* +* Per databook, when we want to stop the gadget, if a control transfer +* is still in process, complete it and get the core into setup phase. +*/ +if (dwc->ep0state !=EP0_SETUP_PHASE ) { +int ret; + +reinit_completion (&dwc->ep0_in_setup); + +spin_unlock_irqrestore (&dwc->lock, flags); + ret =wait_for_completion_timeout (&dwc->ep0_in_setup, +msecs_to_jiffies (DWC3_PULL_UP_TIMEOUT )); +spin_lock_irqsave (&dwc->lock, flags); +if (ret ==0 ) +dev_warn (dwc->dev,"timed out waiting for SETUP phase\n" ); + } +/* * In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a * Section 4.1.8 Table 4-7, it states that for a device-initiated
@@ -2516,18 +2533,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) is_on = !!is_on; dwc->softconnect = is_on; -/* -* Per databook, when we want to stop the gadget, if a control transfer -* is still in process, complete it and get the core into setup phase. -*/ -if (!is_on && dwc->ep0state !=EP0_SETUP_PHASE ) { -reinit_completion (&dwc->ep0_in_setup); - - ret =wait_for_completion_timeout (&dwc->ep0_in_setup, -msecs_to_jiffies (DWC3_PULL_UP_TIMEOUT )); -if (ret ==0 ) -dev_warn (dwc->dev,"timed out waiting for SETUP phase\n" ); - }/* * Avoid issuing a runtime resume if the device is already in the
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 435/476 usb: dwc3: gadget: Only End Transfer for ep0 data phase
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
[ Upstream commit ace17b6ee4f92ab0375d12a1b42494f8590a96b6 ]
The driver shouldn't be able to issue End Transfer to the control endpoint at anytime. Typically we should only do so in error cases such as invalid/unexpected direction of Data Phase as described in the control transfer flow of the programming guide. It _may_ end started data phase during controller deinitialization from soft disconnect or driver removal. However, that should not happen because the driver should be maintained in EP0_SETUP_PHASE during driver tear-down. On soft-connect, the controller should be reset from a soft-reset and there should be no issue starting the control endpoint.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/usb/dwc3/gadget.c +11 -0
@@ -3647,6 +3647,17 @@ static void dwc3_reset_gadget(struct dwc3 *dwc)void dwc3_stop_active_transfer (struct dwc3_ep *dep,bool force,bool interrupt) { +struct dwc3 *dwc = dep->dwc; + +/* +* Only issue End Transfer command to the control endpoint of a started +* Data Phase. Typically we should only do so in error cases such as +* invalid/unexpected direction as described in the control transfer +* flow of the programming guide. +*/ +if (dep->number <=1 && dwc->ep0state !=EP0_DATA_PHASE ) +return ; +if (!(dep->flags &DWC3_EP_TRANSFER_STARTED ) || (dep->flags &DWC3_EP_DELAY_STOP ) || (dep->flags &DWC3_EP_END_TRANSFER_PENDING ))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 436/476 usb: dwc3: gadget: Delay issuing End Transfer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
[ Upstream commit f66eef8fb8989a7193cafc3870f7c7b2b97f16cb ]
If the controller hasn't DMA'ed the Setup data from its fifo, it won't process the End Transfer command. Polling for the command completion may block the driver from servicing the Setup phase and cause a timeout. Previously we only check and delay issuing End Transfer in the case of endpoint dequeue. Let's do that for all End Transfer scenarios.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/usb/dwc3/gadget.c +12 -10
@@ -2029,16 +2029,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,if (r == req) {struct dwc3_request *t; -/* -* If a Setup packet is received but yet to DMA out, the controller will -* not process the End Transfer command of any endpoint. Polling of its -* DEPCMD.CmdAct may block setting up TRB for Setup packet, causing a -* timeout. Delay issuing the End Transfer command until the Setup TRB is -* prepared. -*/ -if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) - dep->flags |=DWC3_EP_DELAY_STOP ; -/* wait until it is processed */ dwc3_stop_active_transfer (dep, true, true);
@@ -3663,6 +3653,18 @@ void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, (dep->flags & DWC3_EP_END_TRANSFER_PENDING)) return; +/* +* If a Setup packet is received but yet to DMA out, the controller will +* not process the End Transfer command of any endpoint. Polling of its +* DEPCMD.CmdAct may block setting up TRB for Setup packet, causing a +* timeout. Delay issuing the End Transfer command until the Setup TRB is +* prepared. +*/ +if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) { + dep->flags |=DWC3_EP_DELAY_STOP ; +return ; + } +/* * NOTICE: We are violating what the Databook says about the * EndTransfer command. Ideally we would _always_ wait for the
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 437/476 usb: dwc3: Fix ep0 handling when getting reset while doing control transfer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mayank Rana <[email protected]>
[ Upstream commit 9d778f0c5f95ca5aa2ff628ea281978697e8d89b ]
According to the databook ep0 should be in setup phase during reset. If host issues reset between control transfers, ep0 will be in an invalid state. Fix this by issuing stall and restart on ep0 if it is not in setup phase.
Also SW needs to complete pending control transfer and setup core for next setup stage as per data book. Hence check ep0 state during reset interrupt handling and make sure active transfers on ep0 out/in endpoint are stopped by queuing ENDXFER command for that endpoint and restart ep0 out again to receive next setup packet.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/ep0.c | 11 ++++++++--- drivers/usb/dwc3/gadget.c | 27 +++++++++++++++++++++++++-- drivers/usb/dwc3/gadget.h | 2 ++ 3 files changed, 35 insertions(+), 5 deletions(-)
drivers/usb/dwc3/ep0.c +8 -3
@@ -218,7 +218,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,return ret; } -static void dwc3_ep0_stall_and_restart (struct dwc3 *dwc) +void dwc3_ep0_stall_and_restart (struct dwc3 *dwc) {struct dwc3_ep *dep;
@@ -1090,13 +1090,18 @@ void dwc3_ep0_send_delayed_status(struct dwc3 *dwc)__dwc3_ep0_do_control_status (dwc, dwc->eps[direction]); } -static void dwc3_ep0_end_control_data (struct dwc3 *dwc,struct dwc3_ep *dep) +void dwc3_ep0_end_control_data (struct dwc3 *dwc,struct dwc3_ep *dep) {struct dwc3_gadget_ep_cmd_params params;u32 cmd;int ret; -if (!dep->resource_index) +/* +* For status/DATA OUT stage, TRB will be queued on ep0 out +* endpoint for which resource index is zero. Hence allow +* queuing ENDXFER command for ep0 out endpoint. +*/ +if (!dep->resource_index && dep->number)return ; cmd =DWC3_DEPCMD_ENDTRANSFER ;
drivers/usb/dwc3/gadget.c +25 -2
@@ -869,12 +869,13 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, unsigned int action) reg |=DWC3_DALEPENA_EP (dep->number);dwc3_writel (dwc->regs,DWC3_DALEPENA , reg); + dep->trb_dequeue =0 ; + dep->trb_enqueue =0 ; +if (usb_endpoint_xfer_control (desc)) goto out;/* Initialize the TRB ring */ - dep->trb_dequeue =0 ; - dep->trb_enqueue =0 ;memset (dep->trb_pool,0 ,sizeof (struct dwc3_trb ) *DWC3_TRB_NUM );
@@ -2702,6 +2703,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)/* begin to receive SETUP packets */ dwc->ep0state =EP0_SETUP_PHASE ; + dwc->ep0_bounced = false; dwc->link_state =DWC3_LINK_STATE_SS_DIS ; dwc->delayed_status = false;dwc3_ep0_out_start (dwc);
@@ -3790,6 +3792,27 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) }dwc3_reset_gadget (dwc); + +/* +* From SNPS databook section 8.1.2, the EP0 should be in setup +* phase. So ensure that EP0 is in setup phase by issuing a stall +* and restart if EP0 is not in setup phase. +*/ +if (dwc->ep0state !=EP0_SETUP_PHASE ) { +unsigned int dir; + + dir = !!dwc->ep0_expect_in; +if (dwc->ep0state ==EP0_DATA_PHASE ) +dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); +else +dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); + + dwc->eps[0 ]->trb_enqueue =0 ; + dwc->eps[1 ]->trb_enqueue =0 ; + +dwc3_ep0_stall_and_restart (dwc); + } +/* * In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a * Section 4.1.2 Table 4-2, it states that during a USB reset, the SW
drivers/usb/dwc3/gadget.h +2 -0
@@ -110,6 +110,8 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,void dwc3_ep0_interrupt (struct dwc3 *dwc,const struct dwc3_event_depevt *event);void dwc3_ep0_out_start (struct dwc3 *dwc); +void dwc3_ep0_end_control_data (struct dwc3 *dwc,struct dwc3_ep *dep); +void dwc3_ep0_stall_and_restart (struct dwc3 *dwc);int __dwc3_gadget_ep0_set_halt (struct usb_ep *ep,int value);int dwc3_gadget_ep0_set_halt (struct usb_ep *ep,int value); int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 438/476 usb: dwc3: gadget: Force sending delayed status during soft disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit e1ee843488d58099a89979627ef85d5bd6c5cacd ]
If any function drivers request for a delayed status phase, this leads to a SETUP transfer timeout error, since the function may take longer to process the DATA stage. This eventually results in end transfer timeouts, as there is a pending SETUP transaction.
In addition, allow the DWC3_EP_DELAY_STOP to be set for if there is a delayed status requested. Ocasionally, a host may abort the current SETUP transaction, by issuing a subsequent SETUP token. In those situations, it would result in an endxfer timeout as well.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +4 -1
@@ -2470,6 +2470,9 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc)if (dwc->ep0state !=EP0_SETUP_PHASE ) {int ret; +if (dwc->delayed_status) +dwc3_ep0_send_delayed_status (dwc); +reinit_completion (&dwc->ep0_in_setup);spin_unlock_irqrestore (&dwc->lock, flags);
@@ -3662,7 +3665,7 @@ void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force,* timeout. Delay issuing the End Transfer command until the Setup TRB is * prepared. */ -if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) { +if (dwc->ep0state !=EP0_SETUP_PHASE ) { dep->flags |=DWC3_EP_DELAY_STOP ;return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 439/476 usb: dwc3: gadget: Submit endxfer command if delayed during disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 8422b769fa46bd429dc0f324012629a4691f0dd9 ]
During a cable disconnect sequence, if ep0state is not in the SETUP phase, then nothing will trigger any pending end transfer commands. Force stopping of any pending SETUP transaction, and move back to the SETUP phase.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +12 -1
@@ -3739,13 +3739,24 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc) reg &= ~DWC3_DCTL_INITU2ENA ;dwc3_gadget_dctl_write_safe (dwc, reg); + dwc->connected = false; +dwc3_disconnect_gadget (dwc); dwc->gadget->speed =USB_SPEED_UNKNOWN ; dwc->setup_packet_pending = false;usb_gadget_set_state (dwc->gadget,USB_STATE_NOTATTACHED ); - dwc->connected = false; +if (dwc->ep0state !=EP0_SETUP_PHASE ) { +unsigned int dir; + + dir = !!dwc->ep0_expect_in; +if (dwc->ep0state ==EP0_DATA_PHASE ) +dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); +else +dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); +dwc3_ep0_stall_and_restart (dwc); + } }static void dwc3_gadget_reset_interrupt (struct dwc3 *dwc)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 440/476 usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 02435a739b81ae24aff5d6e930efef9458e2af3c ]
It was observed that there are hosts that may complete pending SETUP transactions before the stop active transfers and controller halt occurs, leading to lingering endxfer commands on DEPs on subsequent pullup/gadget start iterations.
dwc3_gadget_ep_disable name=ep8in flags=0x3009 direction=1 dwc3_gadget_ep_disable name=ep4in flags=1 direction=1 dwc3_gadget_ep_disable name=ep3out flags=1 direction=0
usb_gadget_disconnect deactivated=0 connected=0 ret=0
The sequence shows that the USB gadget disconnect (dwc3_gadget_pullup(0)) routine completed successfully, allowing for the USB gadget to proceed with a USB gadget connect. However, if this occurs the system runs into an issue where:
BUG: spinlock already unlocked on CPU spin_bug+0x0 dwc3_remove_requests+0x278 dwc3_ep0_out_start+0xb0 __dwc3_gadget_start+0x25c
This is due to the pending endxfers, leading to gadget start (w/o lock held) to execute the remove requests, which will unlock the dwc3 spinlock as part of giveback.
To mitigate this, resolve the pending endxfers on the pullup disable path by re-locating the SETUP phase check after stop active transfers, since that is where the DWC3_EP_DELAY_STOP is potentially set. This also allows for handling of a host that may be unresponsive by using the completion timeout to trigger the stall and restart for EP0.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 49 +++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 17 deletions(-)
drivers/usb/dwc3/gadget.c +32 -17
@@ -2459,29 +2459,17 @@ static int __dwc3_gadget_start(struct dwc3 *dwc);static int dwc3_gadget_soft_disconnect (struct dwc3 *dwc) {unsigned long flags; +int ret;spin_lock_irqsave (&dwc->lock, flags); dwc->connected = false;/* -* Per databook, when we want to stop the gadget, if a control transfer -* is still in process, complete it and get the core into setup phase. +* Attempt to end pending SETUP status phase, and not wait for the +* function to do so. */ -if (dwc->ep0state !=EP0_SETUP_PHASE ) { -int ret; - -if (dwc->delayed_status) -dwc3_ep0_send_delayed_status (dwc); - -reinit_completion (&dwc->ep0_in_setup); - -spin_unlock_irqrestore (&dwc->lock, flags); - ret =wait_for_completion_timeout (&dwc->ep0_in_setup, -msecs_to_jiffies (DWC3_PULL_UP_TIMEOUT )); -spin_lock_irqsave (&dwc->lock, flags); -if (ret ==0 ) -dev_warn (dwc->dev,"timed out waiting for SETUP phase\n" ); - } +if (dwc->delayed_status) +dwc3_ep0_send_delayed_status (dwc);/* * In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a
@@ -2494,6 +2482,33 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc)__dwc3_gadget_stop (dwc);spin_unlock_irqrestore (&dwc->lock, flags); +/* +* Per databook, when we want to stop the gadget, if a control transfer +* is still in process, complete it and get the core into setup phase. +* In case the host is unresponsive to a SETUP transaction, forcefully +* stall the transfer, and move back to the SETUP phase, so that any +* pending endxfers can be executed. +*/ +if (dwc->ep0state !=EP0_SETUP_PHASE ) { +reinit_completion (&dwc->ep0_in_setup); + + ret =wait_for_completion_timeout (&dwc->ep0_in_setup, +msecs_to_jiffies (DWC3_PULL_UP_TIMEOUT )); +if (ret ==0 ) { +unsigned int dir; + +dev_warn (dwc->dev,"wait for SETUP phase timed out\n" ); +spin_lock_irqsave (&dwc->lock, flags); + dir = !!dwc->ep0_expect_in; +if (dwc->ep0state ==EP0_DATA_PHASE ) +dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); +else +dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); +dwc3_ep0_stall_and_restart (dwc); +spin_unlock_irqrestore (&dwc->lock, flags); + } + } +/* * Note: if the GEVNTCOUNT indicates events in the event buffer, the * driver needs to acknowledge them before the controller can halt.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 441/476 usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 8f40fc0808137c157dd408d2632e63bfca2aecdb ]
Several sequences utilize the same routine for forcing the control endpoint back into the SETUP phase. This is required, because those operations need to ensure that EP0 is back in the default state.
Stable-dep-of: 730e12fbec53 ("usb: dwc3: gadget: Handle EP0 request dequeuing properly")
--- drivers/usb/dwc3/gadget.c | 53 ++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/usb/dwc3/gadget.c +21 -32
@@ -139,6 +139,24 @@ int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state)return -ETIMEDOUT ; } +static void dwc3_ep0_reset_state (struct dwc3 *dwc) +{ +unsigned int dir; + +if (dwc->ep0state !=EP0_SETUP_PHASE ) { + dir = !!dwc->ep0_expect_in; +if (dwc->ep0state ==EP0_DATA_PHASE ) +dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); +else +dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); + + dwc->eps[0 ]->trb_enqueue =0 ; + dwc->eps[1 ]->trb_enqueue =0 ; + +dwc3_ep0_stall_and_restart (dwc); + } +} +/** * dwc3_ep_inc_trb - increment a trb index. * @index: Pointer to the TRB index to increment.
@@ -2495,16 +2513,9 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc) ret =wait_for_completion_timeout (&dwc->ep0_in_setup,msecs_to_jiffies (DWC3_PULL_UP_TIMEOUT ));if (ret ==0 ) { -unsigned int dir; -dev_warn (dwc->dev,"wait for SETUP phase timed out\n" );spin_lock_irqsave (&dwc->lock, flags); - dir = !!dwc->ep0_expect_in; -if (dwc->ep0state ==EP0_DATA_PHASE ) -dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); -else -dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); -dwc3_ep0_stall_and_restart (dwc); +dwc3_ep0_reset_state (dwc);spin_unlock_irqrestore (&dwc->lock, flags); } }
@@ -3762,16 +3773,7 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc) dwc->setup_packet_pending = false;usb_gadget_set_state (dwc->gadget,USB_STATE_NOTATTACHED ); -if (dwc->ep0state !=EP0_SETUP_PHASE ) { -unsigned int dir; - - dir = !!dwc->ep0_expect_in; -if (dwc->ep0state ==EP0_DATA_PHASE ) -dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); -else -dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); -dwc3_ep0_stall_and_restart (dwc); - } +dwc3_ep0_reset_state (dwc); }static void dwc3_gadget_reset_interrupt (struct dwc3 *dwc)
@@ -3827,20 +3829,7 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)* phase. So ensure that EP0 is in setup phase by issuing a stall * and restart if EP0 is not in setup phase. */ -if (dwc->ep0state !=EP0_SETUP_PHASE ) { -unsigned int dir; - - dir = !!dwc->ep0_expect_in; -if (dwc->ep0state ==EP0_DATA_PHASE ) -dwc3_ep0_end_control_data (dwc, dwc->eps[dir]); -else -dwc3_ep0_end_control_data (dwc, dwc->eps[!dir]); - - dwc->eps[0 ]->trb_enqueue =0 ; - dwc->eps[1 ]->trb_enqueue =0 ; - -dwc3_ep0_stall_and_restart (dwc); - } +dwc3_ep0_reset_state (dwc);/* * In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 442/476 usb: dwc3: gadget: Handle EP0 request dequeuing properly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 730e12fbec53ab59dd807d981a204258a4cfb29a ]
Current EP0 dequeue path will share the same as other EPs. However, there are some special considerations that need to be made for EP0 transfers:
- EP0 transfers never transition into the started_list
- EP0 only has one active request at a time
In case there is a vendor specific control message for a function over USB FFS, then there is no guarantee on the timeline which the DATA/STATUS stage is responded to. While this occurs, any attempt to end transfers on non-control EPs will end up having the DWC3_EP_DELAY_STOP flag set, and defer issuing of the end transfer command. If the USB FFS application decides to timeout the control transfer, or if USB FFS AIO path exits, the USB FFS driver will issue a call to usb_ep_dequeue() for the ep0 request.
In case of the AIO exit path, the AIO FS blocks until all pending USB requests utilizing the AIO path is completed. However, since the dequeue of ep0 req does not happen properly, all non-control EPs with the DWC3_EP_DELAY_STOP flag set will not be handled, and the AIO exit path will be stuck waiting for the USB FFS data endpoints to receive a completion callback.
Fix is to utilize dwc3_ep0_reset_state() in the dequeue API to ensure EP0 is brought back to the SETUP state, and ensures that any deferred end transfer commands are handled. This also will end any active transfers on EP0, compared to the previous implementation which directly called giveback only.
--- drivers/usb/dwc3/gadget.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +11 -1
@@ -2039,7 +2039,17 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,list_for_each_entry (r, &dep->pending_list, list) {if (r == req) { -dwc3_gadget_giveback (dep, req, -ECONNRESET ); +/* +* Explicitly check for EP0/1 as dequeue for those +* EPs need to be handled differently. Control EP +* only deals with one USB req, and giveback will +* occur during dwc3_ep0_stall_and_restart(). EP0 +* requests are never added to started_list. +*/ +if (dep->number >1 ) +dwc3_gadget_giveback (dep, req, -ECONNRESET ); +else +dwc3_ep0_reset_state (dwc); goto out; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 443/476 usb: dwc3: gadget: Queue PM runtime idle on disconnect event
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
[ Upstream commit 3c7af52c7616c3aa6dacd2336ec748d4a65df8f4 ]
There is a scenario where DWC3 runtime suspend is blocked due to the dwc->connected flag still being true while PM usage_count is zero after DWC3 giveback is completed and the USB gadget session is being terminated. This leads to a case where nothing schedules a PM runtime idle for the device.
The exact condition is seen with the following sequence:
1. USB bus reset is issued by the host
2. Shortly after, or concurrently, a USB PD DR SWAP request is received
(sink->source)
3. USB bus reset event handler runs and issues
dwc3_stop_active_transfers(), and pending transfer are stopped
4. DWC3 usage_count decremented to 0, and runtime idle occurs while
dwc->connected == true, returns -EBUSY 5. DWC3 disconnect event seen, dwc->connected set to false due to DR swap handling
6. No runtime idle after this point
Address this by issuing an asynchronous PM runtime idle call after the disconnect event is completed, as it modifies the dwc->connected flag, which is what blocks the initial runtime idle.
--- drivers/usb/dwc3/gadget.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/dwc3/gadget.c +7 -0
@@ -3784,6 +3784,13 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)usb_gadget_set_state (dwc->gadget,USB_STATE_NOTATTACHED );dwc3_ep0_reset_state (dwc); + +/* +* Request PM idle to address condition where usage count is +* already decremented to zero, but waiting for the disconnect +* interrupt to set dwc->connected to FALSE. +*/ +pm_request_idle (dwc->dev); }static void dwc3_gadget_reset_interrupt (struct dwc3 *dwc)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 444/476 serial: 8250_exar: Fill in rs485_supported
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 59c221f8e1269278161313048c71929c9950b2c4 ]
Add information on supported serial_rs485 features.
Stable-dep-of: 0c2a5f471ce5 ("serial: 8250_exar: Set missing rs485_supported flag")
--- drivers/tty/serial/8250/8250_exar.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/tty/serial/8250/8250_exar.c +12 -0
@@ -123,6 +123,7 @@ struct exar8250;struct exar8250_platform {int (*rs485_config)(struct uart_port *,struct serial_rs485 *); +const struct serial_rs485 *rs485_supported;int (*register_gpio)(struct pci_dev *,struct uart_8250_port *);void (*unregister_gpio)(struct uart_8250_port *); };
@@ -441,10 +442,15 @@ static int generic_rs485_config(struct uart_port *port,return 0 ; } +static const struct serial_rs485 generic_rs485_supported = { + .flags =SER_RS485_ENABLED , +}; +static const struct exar8250_platform exar8250_default_platform = { .register_gpio = xr17v35x_register_gpio, .unregister_gpio = xr17v35x_unregister_gpio, .rs485_config = generic_rs485_config, + .rs485_supported = &generic_rs485_supported, }; static int iot2040_rs485_config(struct uart_port *port,
@@ -480,6 +486,10 @@ static int iot2040_rs485_config(struct uart_port *port,return generic_rs485_config (port, rs485); } +static const struct serial_rs485 iot2040_rs485_supported = { + .flags =SER_RS485_ENABLED |SER_RS485_RX_DURING_TX |SER_RS485_TERMINATE_BUS , +}; +static const struct property_entry iot2040_gpio_properties[] = {PROPERTY_ENTRY_U32 ("exar,first-pin" ,10 ),PROPERTY_ENTRY_U32 ("ngpios" ,1 ),
@@ -508,6 +518,7 @@ static int iot2040_register_gpio(struct pci_dev *pcidev,static const struct exar8250_platform iot2040_platform = { .rs485_config = iot2040_rs485_config, + .rs485_supported = &iot2040_rs485_supported, .register_gpio = iot2040_register_gpio, .unregister_gpio = xr17v35x_unregister_gpio, };
@@ -550,6 +561,7 @@ pci_xr17v35x_setup(struct exar8250 *priv, struct pci_dev *pcidev, port->port.uartclk = baud *16 ; port->port.rs485_config = platform->rs485_config; + port->port.rs485_supported = platform->rs485_supported;/* * Setup the UART clock for the devices on expansion slot to
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 445/476 serial: 8250_exar: Set missing rs485_supported flag
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lino Sanfilippo <[email protected]>
[ Upstream commit 0c2a5f471ce58bca8f8ab5fcb911aff91eaaa5eb ]
The UART supports an auto-RTS mode in which the RTS pin is automatically activated during transmission. So mark this mode as being supported even if RTS is not controlled by the driver but the UART.
Also the serial core expects now at least one of both modes rts-on-send or rts-after-send to be supported. This is since during sanitization unsupported flags are deleted from a RS485 configuration set by userspace. However if the configuration ends up with both flags unset, the core prints a warning since it considers such a configuration invalid (see uart_sanitize_serial_rs485()).
--- drivers/tty/serial/8250/8250_exar.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_exar.c +3 -2
@@ -443,7 +443,7 @@ static int generic_rs485_config(struct uart_port *port, }static const struct serial_rs485 generic_rs485_supported = { - .flags =SER_RS485_ENABLED , + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND , };static const struct exar8250_platform exar8250_default_platform = {
@@ -487,7 +487,8 @@ static int iot2040_rs485_config(struct uart_port *port, }static const struct serial_rs485 iot2040_rs485_supported = { - .flags =SER_RS485_ENABLED |SER_RS485_RX_DURING_TX |SER_RS485_TERMINATE_BUS , + .flags =SER_RS485_ENABLED |SER_RS485_RTS_ON_SEND | +SER_RS485_RX_DURING_TX |SER_RS485_TERMINATE_BUS , };static const struct property_entry iot2040_gpio_properties[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 446/476 fbdev/defio: Early-out if page is already enlisted
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 105a940416fc622406653b6fe54732897642dfbc ]
Return early if a page is already in the list of dirty pages for deferred I/O. This can be detected if the page's list head is not empty. Keep the list head initialized while the page is not enlisted to make this work reliably.
v2:
* update comment and fix spelling (Sam)
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/video/fbdev/core/fb_defio.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/video/fbdev/core/fb_defio.c +17 -9
@@ -59,6 +59,7 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf)printk (KERN_ERR "no mapping available\n" );BUG_ON (!page->mapping); +INIT_LIST_HEAD (&page->lru); page->index = vmf->pgoff; vmf->page = page;
@@ -118,17 +119,24 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf)*/ lock_page (page); +/* +* This check is to catch the case where a new process could start +* writing to the same page through a new PTE. This new access +* can cause a call to .page_mkwrite even if the original process' +* PTE is marked writable. +* +* TODO: The lru field is owned by the page cache; hence the name. +* We dequeue in fb_deferred_io_work() after flushing the +* page's content into video memory. Instead of lru, fbdefio +* should have it's own field. +*/ +if (!list_empty (&page->lru)) + goto page_already_added; +/* we loop through the pagelist before adding in order to keep the pagelist sorted */ list_for_each_entry (cur, &fbdefio->pagelist, lru) { -/* this check is to catch the case where a new -process could start writing to the same page -through a new pte. this new access can cause the -mkwrite even when the original ps's pte is marked -writable */ -if (unlikely (cur == page)) - goto page_already_added; -else if (cur->index > page->index) +if (cur->index > page->index)break ; }
@@ -190,7 +198,7 @@ static void fb_deferred_io_work(struct work_struct *work)/* clear the list */ list_for_each_safe (node, next, &fbdefio->pagelist) { -list_del (node); +list_del_init (node); }mutex_unlock (&fbdefio->lock); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 447/476 fbdev: Dont sort deferred-I/O pages by default
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 8c30e2d81bfddc5ab9f6b04db1c0f7d6ca7bdf46 ]
Fbdev's deferred I/O sorts all dirty pages by default, which incurs a significant overhead. Make the sorting step optional and update the few drivers that require it. Use a FIFO list by default.
Most fbdev drivers with deferred I/O build a bounding rectangle around the dirty pages or simply flush the whole screen. The only two affected DRM drivers, generic fbdev and vmwgfx, both use a bounding rectangle. In those cases, the exact order of the pages doesn't matter. The other drivers look at the page index or handle pages one-by-one. The patch sets the sort_pagelist flag for those, even though some of them would probably work correctly without sorting. Driver maintainers should update their driver accordingly.
Sorting pages by memory offset for deferred I/O performs an implicit bubble-sort step on the list of dirty pages. The algorithm goes through the list of dirty pages and inserts each new page according to its index field. Even worse, list traversal always starts at the first entry. As video memory is most likely updated scanline by scanline, the algorithm traverses through the complete list for each updated page.
For example, with 1024x768x32bpp each page covers exactly one scanline. Writing a single screen update from top to bottom requires updating 768 pages. With an average list length of 384 entries, a screen update creates (768 * 384 =) 294912 compare operation.
Fix this by making the sorting step opt-in and update the few drivers that require it. All other drivers work with unsorted page lists. Pages are appended to the list. Therefore, in the common case of writing the framebuffer top to bottom, pages are still sorted by offset, which may have a positive effect on performance.
Playing a video [1] in mplayer's benchmark mode shows the difference (i7-4790, FullHD, simpledrm, kernel with debugging).
mplayer -benchmark -nosound -vo fbdev ./big_buck_bunny_720p_stereo.ogg
With sorted page lists:
BENCHMARKs: VC: 32.960s VO: 73.068s A: 0.000s Sys: 2.413s = 108.441s
BENCHMARK%: VC: 30.3947% VO: 67.3802% A: 0.0000% Sys: 2.2251% = 100.0000%
With unsorted page lists:
BENCHMARKs: VC: 31.005s VO: 42.889s A: 0.000s Sys: 2.256s = 76.150s
BENCHMARK%: VC: 40.7156% VO: 56.3219% A: 0.0000% Sys: 2.9625% = 100.0000%
VC shows the overhead of video decoding, VO shows the overhead of the video output. Using unsorted page lists reduces the benchmark's run time by ~32s/~25%.
v2:
* Make sorted pagelists the special case (Sam)
* Comment on drivers' use of pagelist (Sam)
* Warn about the overhead in comment
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/staging/fbtft/fbtft-core.c | 1 + drivers/video/fbdev/broadsheetfb.c | 1 + drivers/video/fbdev/core/fb_defio.c | 24 +++++++++++++++++------- drivers/video/fbdev/metronomefb.c | 1 + drivers/video/fbdev/udlfb.c | 1 + include/linux/fb.h | 1 + 6 files changed, 22 insertions(+), 7 deletions(-)
drivers/staging/fbtft/fbtft-core.c +1 -0
@@ -654,6 +654,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, fbops->fb_blank = fbtft_fb_blank; fbdefio->delay =HZ / fps; + fbdefio->sort_pagelist = true; fbdefio->deferred_io = fbtft_deferred_io;fb_deferred_io_init (info);
drivers/video/fbdev/broadsheetfb.c +1 -0
@@ -1059,6 +1059,7 @@ static const struct fb_ops broadsheetfb_ops = {static struct fb_deferred_io broadsheetfb_defio = { .delay =HZ /4 , + .sort_pagelist = true, .deferred_io = broadsheetfb_dpy_deferred_io, };
drivers/video/fbdev/core/fb_defio.c +17 -7
@@ -92,7 +92,7 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf)struct page *page = vmf->page;struct fb_info *info = vmf->vma->vm_private_data;struct fb_deferred_io *fbdefio = info->fbdefio; -struct page *cur; +struct list_head *pos = &fbdefio->pagelist;/* this is a callback we get when userspace first tries to write to the page. we schedule a workqueue. that workqueue
@@ -133,14 +133,24 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf)if (!list_empty (&page->lru)) goto page_already_added; -/* we loop through the pagelist before adding in order -to keep the pagelist sorted */ -list_for_each_entry (cur, &fbdefio->pagelist, lru) { -if (cur->index > page->index) -break ; +if (unlikely (fbdefio->sort_pagelist)) { +/* +* We loop through the pagelist before adding in order to +* keep the pagelist sorted. This has significant overhead +* of O(n^2) with n being the number of written pages. If +* possible, drivers should try to work with unsorted page +* lists instead. +*/ +struct page *cur; + +list_for_each_entry (cur, &fbdefio->pagelist, lru) { +if (cur->index > page->index) +break ; + } + pos = &cur->lru; } -list_add_tail (&page->lru, &cur->lru); +list_add_tail (&page->lru, pos); page_already_added:mutex_unlock (&fbdefio->lock);
drivers/video/fbdev/metronomefb.c +1 -0
@@ -568,6 +568,7 @@ static const struct fb_ops metronomefb_ops = {static struct fb_deferred_io metronomefb_defio = { .delay =HZ , + .sort_pagelist = true, .deferred_io = metronomefb_dpy_deferred_io, };
drivers/video/fbdev/udlfb.c +1 -0
@@ -982,6 +982,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)if (fbdefio) { fbdefio->delay =DL_DEFIO_WRITE_DELAY ; + fbdefio->sort_pagelist = true; fbdefio->deferred_io = dlfb_dpy_deferred_io; }
include/linux/fb.h +1 -0
@@ -204,6 +204,7 @@ struct fb_pixmap {struct fb_deferred_io {/* delay between mkwrite and deferred handler */ unsigned long delay; +bool sort_pagelist;/* sort pagelist by offset */ struct mutex lock;/* mutex that protects the page list */ struct list_head pagelist;/* list of touched pages */ /* callback */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 448/476 fbdev: defio: fix the pagelist corruption
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuansheng Liu <[email protected]>
[ Upstream commit 856082f021a28221db2c32bd0531614a8382be67 ]
Easily hit the below list corruption:
==list_add corruption. prev->next should be next (ffffffffc0ceb090), but was ffffec604507edc8. (prev=ffffec604507edc8).
WARNING: CPU: 65 PID: 3959 at lib/list_debug.c:26 __list_add_valid+0x53/0x80 CPU: 65 PID: 3959 Comm: fbdev Tainted: G U RIP: 0010:__list_add_valid+0x53/0x80 Call Trace: <TASK> fb_deferred_io_mkwrite+0xea/0x150 do_page_mkwrite+0x57/0xc0 do_wp_page+0x278/0x2f0 __handle_mm_fault+0xdc2/0x1590 handle_mm_fault+0xdd/0x2c0 do_user_addr_fault+0x1d3/0x650 exc_page_fault+0x77/0x180 ? asm_exc_page_fault+0x8/0x30 asm_exc_page_fault+0x1e/0x30 RIP: 0033:0x7fd98fc8fad1
==
Figure out the race happens when one process is adding &page->lru into the pagelist tail in fb_deferred_io_mkwrite(), another process is re-initializing the same &page->lru in fb_deferred_io_fault(), which is not protected by the lock.
This fix is to init all the page lists one time during initialization, it not only fixes the list corruption, but also avoids INIT_LIST_HEAD() redundantly.
V2: change "int i" to "unsigned int i" (Geert Uytterhoeven)
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/video/fbdev/core/fb_defio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fb_defio.c +8 -1
@@ -59,7 +59,6 @@ static vm_fault_t fb_deferred_io_fault(struct vm_fault *vmf)printk (KERN_ERR "no mapping available\n" );BUG_ON (!page->mapping); -INIT_LIST_HEAD (&page->lru); page->index = vmf->pgoff; vmf->page = page;
@@ -216,6 +215,8 @@ static void fb_deferred_io_work(struct work_struct *work)void fb_deferred_io_init (struct fb_info *info) {struct fb_deferred_io *fbdefio = info->fbdefio; +struct page *page; +unsigned int i;BUG_ON (!fbdefio);mutex_init (&fbdefio->lock);
@@ -223,6 +224,12 @@ void fb_deferred_io_init(struct fb_info *info)INIT_LIST_HEAD (&fbdefio->pagelist);if (fbdefio->delay ==0 )/* set a default of 1 s */ fbdefio->delay =HZ ; + +/* initialize all the page lists one time */ +for (i =0 ; i < info->fix.smem_len; i +=PAGE_SIZE ) { + page =fb_deferred_io_page (info, i); +INIT_LIST_HEAD (&page->lru); + } }EXPORT_SYMBOL_GPL (fb_deferred_io_init);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 449/476 fbdev: Track deferred-I/O pages in pageref struct
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 56c134f7f1b58be08bdb0ca8372474a4a5165f31 ]
Store the per-page state for fbdev's deferred I/O in struct fb_deferred_io_pageref. Maintain a list of pagerefs for the pages that have to be written back to video memory. Update all affected drivers.
As with pages before, fbdev acquires a pageref when an mmaped page of the framebuffer is being written to. It holds the pageref in a list of all currently written pagerefs until it flushes the written pages to video memory. Writeback occurs periodically. After writeback fbdev releases all pagerefs and builds up a new dirty list until the next writeback occurs.
Using pagerefs has a number of benefits.
For pages of the framebuffer, the deferred I/O code used struct page.lru as an entry into the list of dirty pages. The lru field is owned by the page cache, which makes deferred I/O incompatible with some memory pages (e.g., most notably DRM's GEM SHMEM allocator). struct fb_deferred_io_pageref now provides an entry into a list of dirty framebuffer pages, freeing lru for use with the page cache.
Drivers also assumed that struct page.index is the page offset into the framebuffer. This is not true for DRM buffers, which are located at various offset within a mapped area. struct fb_deferred_io_pageref explicitly stores an offset into the framebuffer. struct page.index is now only the page offset into the mapped area.
These changes will allow DRM to use fbdev deferred I/O without an intermediate shadow buffer.
v3:
* use pageref->offset for sorting
* fix grammar in comment
v2:
* minor fixes in commit message
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/gpu/drm/drm_fb_helper.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 +- drivers/staging/fbtft/fbtft-core.c | 5 +- drivers/video/fbdev/broadsheetfb.c | 5 +- drivers/video/fbdev/core/fb_defio.c | 156 ++++++++++++++++--------- drivers/video/fbdev/hyperv_fb.c | 5 +- drivers/video/fbdev/metronomefb.c | 5 +- drivers/video/fbdev/sh_mobile_lcdcfb.c | 6 +- drivers/video/fbdev/smscufx.c | 5 +- drivers/video/fbdev/udlfb.c | 5 +- drivers/video/fbdev/xen-fbfront.c | 5 +- include/linux/fb.h | 11 +- 12 files changed, 145 insertions(+), 74 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +3 -3
@@ -692,13 +692,13 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist) {unsigned long start, end, min, max; -struct page *page; +struct fb_deferred_io_pageref *pageref;u32 y1, y2; min =ULONG_MAX ; max =0 ; -list_for_each_entry (page, pagelist, lru) { - start = page->index <<PAGE_SHIFT ; +list_for_each_entry (pageref, pagelist, list) { + start = pageref->offset; end = start +PAGE_SIZE -1 ; min =min (min, start); max =max (max, end);
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +3 -2
@@ -322,12 +322,13 @@ static void vmw_deferred_io(struct fb_info *info,struct vmw_fb_par *par = info->par;unsigned long start, end, min, max;unsigned long flags; -struct page *page; +struct fb_deferred_io_pageref *pageref;int y1, y2; min =ULONG_MAX ; max =0 ; -list_for_each_entry (page, pagelist, lru) { +list_for_each_entry (pageref, pagelist, list) { +struct page *page = pageref->page; start = page->index <<PAGE_SHIFT ; end = start +PAGE_SIZE -1 ; min =min (min, start);
drivers/staging/fbtft/fbtft-core.c +3 -2
@@ -326,7 +326,7 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist) {struct fbtft_par *par = info->par;unsigned int dirty_lines_start, dirty_lines_end; -struct page *page; +struct fb_deferred_io_pageref *pageref;unsigned long index;unsigned int y_low =0 , y_high =0 ;int count =0 ;
@@ -340,7 +340,8 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)spin_unlock (&par->dirty_lock);/* Mark display lines as dirty */ -list_for_each_entry (page, pagelist, lru) { +list_for_each_entry (pageref, pagelist, list) { +struct page *page = pageref->page; count++; index = page->index <<PAGE_SHIFT ; y_low = index / info->fix.line_length;
drivers/video/fbdev/broadsheetfb.c +3 -2
@@ -934,7 +934,7 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, {u16 y1 =0 , h =0 ;int prev_index =-1 ; -struct page *cur; +struct fb_deferred_io_pageref *pageref;struct fb_deferred_io *fbdefio = info->fbdefio;int h_inc;u16 yres = info->var.yres;
@@ -944,7 +944,8 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, h_inc =DIV_ROUND_UP (PAGE_SIZE , xres);/* walk the written page list and swizzle the data */ -list_for_each_entry (cur, &fbdefio->pagelist, lru) { +list_for_each_entry (pageref, &fbdefio->pagelist, list) { +struct page *cur = pageref->page;if (prev_index <0 ) {/* just starting so assign first page */ y1 = (cur->index <<PAGE_SHIFT ) / xres;
drivers/video/fbdev/core/fb_defio.c +104 -52
228 lines not on this page · raw message
drivers/video/fbdev/hyperv_fb.c +3 -2
@@ -424,7 +424,7 @@ static void synthvid_deferred_io(struct fb_info *p, struct list_head *pagelist) {struct hvfb_par *par = p->par; -struct page *page; +struct fb_deferred_io_pageref *pageref;unsigned long start, end;int y1, y2, miny, maxy;
@@ -437,7 +437,8 @@ static void synthvid_deferred_io(struct fb_info *p,* in synthvid_update function by clamping the y2 * value to yres. */ -list_for_each_entry (page, pagelist, lru) { +list_for_each_entry (pageref, pagelist, list) { +struct page *page = pageref->page; start = page->index <<PAGE_SHIFT ; end = start +PAGE_SIZE -1 ; y1 = start / p->fix.line_length;
drivers/video/fbdev/metronomefb.c +3 -2
@@ -469,12 +469,13 @@ static void metronomefb_dpy_deferred_io(struct fb_info *info, struct list_head *pagelist) {u16 cksum; -struct page *cur; +struct fb_deferred_io_pageref *pageref;struct fb_deferred_io *fbdefio = info->fbdefio;struct metronomefb_par *par = info->par;/* walk the written page list and swizzle the data */ -list_for_each_entry (cur, &fbdefio->pagelist, lru) { +list_for_each_entry (pageref, &fbdefio->pagelist, list) { +struct page *cur = pageref->page; cksum =metronomefb_dpy_update_page (par, (cur->index <<PAGE_SHIFT )); par->metromem_img_csum -= par->csum_table[cur->index];
drivers/video/fbdev/sh_mobile_lcdcfb.c +4 -2
@@ -440,13 +440,15 @@ static int sh_mobile_lcdc_sginit(struct fb_info *info, {struct sh_mobile_lcdc_chan *ch = info->par;unsigned int nr_pages_max = ch->fb_size >>PAGE_SHIFT ; -struct page *page; +struct fb_deferred_io_pageref *pageref;int nr_pages =0 ;sg_init_table (ch->sglist, nr_pages_max); -list_for_each_entry (page, pagelist, lru) +list_for_each_entry (pageref, pagelist, list) { +struct page *page = pageref->page;sg_set_page (&ch->sglist[nr_pages++], page,PAGE_SIZE ,0 ); + }return nr_pages; }
drivers/video/fbdev/smscufx.c +3 -2
@@ -956,7 +956,7 @@ static void ufx_ops_fillrect(struct fb_info *info,static void ufx_dpy_deferred_io (struct fb_info *info,struct list_head *pagelist) { -struct page *cur; +struct fb_deferred_io_pageref *pageref;struct fb_deferred_io *fbdefio = info->fbdefio;struct ufx_data *dev = info->par;
@@ -967,9 +967,10 @@ static void ufx_dpy_deferred_io(struct fb_info *info,return ;/* walk the written page list and render each to device */ -list_for_each_entry (cur, &fbdefio->pagelist, lru) { +list_for_each_entry (pageref, &fbdefio->pagelist, list) {/* create a rectangle of full screen width that encloses the * entire dirty framebuffer page */ +struct page *cur = pageref->page;const int x =0 ;const int width = dev->info->var.xres;const int y = (cur->index <<PAGE_SHIFT ) / (width *2 );
drivers/video/fbdev/udlfb.c +3 -2
@@ -783,7 +783,7 @@ static void dlfb_ops_fillrect(struct fb_info *info,static void dlfb_dpy_deferred_io (struct fb_info *info,struct list_head *pagelist) { -struct page *cur; +struct fb_deferred_io_pageref *pageref;struct fb_deferred_io *fbdefio = info->fbdefio;struct dlfb_data *dlfb = info->par;struct urb *urb;
@@ -810,7 +810,8 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, cmd = urb->transfer_buffer;/* walk the written page list and render each to device */ -list_for_each_entry (cur, &fbdefio->pagelist, lru) { +list_for_each_entry (pageref, &fbdefio->pagelist, list) { +struct page *cur = pageref->page; if (dlfb_render_hline(dlfb, &urb, (char *) info->fix.smem_start, &cmd, cur->index << PAGE_SHIFT,
drivers/video/fbdev/xen-fbfront.c +3 -2
@@ -185,13 +185,14 @@ static void xenfb_deferred_io(struct fb_info *fb_info, struct list_head *pagelist) {struct xenfb_info *info = fb_info->par; -struct page *page; +struct fb_deferred_io_pageref *pageref;unsigned long beg, end;int y1, y2, miny, maxy; miny =INT_MAX ; maxy =0 ; -list_for_each_entry (page, pagelist, lru) { +list_for_each_entry (pageref, pagelist, list) { +struct page *page = pageref->page; beg = page->index <<PAGE_SHIFT ; end = beg +PAGE_SIZE -1 ; y1 = beg / fb_info->fix.line_length;
include/linux/fb.h +10 -1
@@ -201,6 +201,13 @@ struct fb_pixmap { }; #ifdef CONFIG_FB_DEFERRED_IO +struct fb_deferred_io_pageref { + struct page *page; + unsigned long offset; + /* private */ + struct list_head list; +}; + struct fb_deferred_io { /* delay between mkwrite and deferred handler */ unsigned long delay;
@@ -469,6 +476,8 @@ struct fb_info {#endif #ifdef CONFIG_FB_DEFERRED_IO struct delayed_work deferred_work; +unsigned long npagerefs; +struct fb_deferred_io_pageref *pagerefs;struct fb_deferred_io *fbdefio;#endif
@@ -662,7 +671,7 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,/* drivers/video/fb_defio.c */ int fb_deferred_io_mmap (struct fb_info *info,struct vm_area_struct *vma); -extern void fb_deferred_io_init (struct fb_info *info); +extern int fb_deferred_io_init (struct fb_info *info);extern void fb_deferred_io_open (struct fb_info *info,struct inode *inode,struct file *file);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 450/476 fbdev: Rename pagelist to pagereflist for deferred I/O
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit e80eec1b871a2acb8f5c92db4c237e9ae6dd322b ]
Rename various instances of pagelist to pagereflist. The list now stores pageref structures, so the new name is more appropriate.
In their write-back helpers, several fbdev drivers refer to the pageref list in struct fb_deferred_io instead of using the one supplied as argument to the function. Convert them over to the supplied one. It's the same instance, so no change of behavior occurs.
v4:
* fix commit message (Javier)
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/gpu/drm/drm_fb_helper.c | 7 +++---- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 ++--- drivers/hid/hid-picolcd_fb.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 10 +++++----- drivers/video/fbdev/broadsheetfb.c | 12 +++++------- drivers/video/fbdev/core/fb_defio.c | 18 +++++++++--------- drivers/video/fbdev/hecubafb.c | 3 +-- drivers/video/fbdev/hyperv_fb.c | 5 ++--- drivers/video/fbdev/metronomefb.c | 12 +++++------- drivers/video/fbdev/sh_mobile_lcdcfb.c | 16 +++++++--------- drivers/video/fbdev/smscufx.c | 8 +++----- drivers/video/fbdev/ssd1307fb.c | 3 +-- drivers/video/fbdev/udlfb.c | 8 +++----- drivers/video/fbdev/xen-fbfront.c | 5 ++--- include/drm/drm_fb_helper.h | 3 +-- include/linux/fb.h | 6 +++--- 16 files changed, 53 insertions(+), 70 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +3 -4
@@ -683,13 +683,12 @@ static void drm_fb_helper_damage(struct fb_info *info, u32 x, u32 y,/** * drm_fb_helper_deferred_io() - fbdev deferred_io callback function * @info: fb_info struct pointer -* @pagelist: list of mmap framebuffer pages that have to be flushed +* @pagereflist: list of mmap framebuffer pages that have to be flushed * * This function is used as the &fb_deferred_io.deferred_io * callback function for flushing the fbdev mmap writes. */ -void drm_fb_helper_deferred_io (struct fb_info *info, -struct list_head *pagelist) +void drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist) {unsigned long start, end, min, max;struct fb_deferred_io_pageref *pageref;
@@ -697,7 +696,7 @@ void drm_fb_helper_deferred_io(struct fb_info *info, min =ULONG_MAX ; max =0 ; -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) { start = pageref->offset; end = start +PAGE_SIZE -1 ; min =min (min, start);
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +2 -3
@@ -316,8 +316,7 @@ static int vmw_fb_pan_display(struct fb_var_screeninfo *var,return 0 ; } -static void vmw_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void vmw_deferred_io (struct fb_info *info,struct list_head *pagereflist) {struct vmw_fb_par *par = info->par;unsigned long start, end, min, max;
@@ -327,7 +326,7 @@ static void vmw_deferred_io(struct fb_info *info, min =ULONG_MAX ; max =0 ; -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *page = pageref->page; start = page->index <<PAGE_SHIFT ; end = start +PAGE_SIZE -1 ;
drivers/hid/hid-picolcd_fb.c +1 -1
@@ -432,7 +432,7 @@ static const struct fb_ops picolcdfb_ops = {/* Callback from deferred IO workqueue */ -static void picolcd_fb_deferred_io (struct fb_info *info,struct list_head *pagelist) +static void picolcd_fb_deferred_io (struct fb_info *info,struct list_head *pagereflist) {picolcd_fb_update (info); }
drivers/staging/fbtft/fbtft-core.c +5 -5
@@ -322,7 +322,7 @@ static void fbtft_mkdirty(struct fb_info *info, int y, int height)schedule_delayed_work (&info->deferred_work, fbdefio->delay); } -static void fbtft_deferred_io (struct fb_info *info,struct list_head *pagelist) +static void fbtft_deferred_io (struct fb_info *info,struct list_head *pagereflist) {struct fbtft_par *par = info->par;unsigned int dirty_lines_start, dirty_lines_end;
@@ -340,7 +340,7 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)spin_unlock (&par->dirty_lock);/* Mark display lines as dirty */ -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *page = pageref->page; count++; index = page->index <<PAGE_SHIFT ;
@@ -654,9 +654,9 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, fbops->fb_setcolreg = fbtft_fb_setcolreg; fbops->fb_blank = fbtft_fb_blank; - fbdefio->delay =HZ / fps; - fbdefio->sort_pagelist = true; - fbdefio->deferred_io = fbtft_deferred_io; + fbdefio->delay =HZ / fps; + fbdefio->sort_pagereflist = true; + fbdefio->deferred_io = fbtft_deferred_io;fb_deferred_io_init (info);snprintf (info->fix.id,sizeof (info->fix.id),"%s" , dev->driver->name);
drivers/video/fbdev/broadsheetfb.c +5 -7
@@ -929,13 +929,11 @@ static void broadsheetfb_dpy_update(struct broadsheetfb_par *par) }/* this is called back from the deferred io workqueue */ -static void broadsheetfb_dpy_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void broadsheetfb_dpy_deferred_io (struct fb_info *info,struct list_head *pagereflist) {u16 y1 =0 , h =0 ;int prev_index =-1 ;struct fb_deferred_io_pageref *pageref; -struct fb_deferred_io *fbdefio = info->fbdefio;int h_inc;u16 yres = info->var.yres;u16 xres = info->var.xres;
@@ -944,7 +942,7 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, h_inc =DIV_ROUND_UP (PAGE_SIZE , xres);/* walk the written page list and swizzle the data */ -list_for_each_entry (pageref, &fbdefio->pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *cur = pageref->page;if (prev_index <0 ) {/* just starting so assign first page */
@@ -1059,9 +1057,9 @@ static const struct fb_ops broadsheetfb_ops = { };static struct fb_deferred_io broadsheetfb_defio = { - .delay =HZ /4 , - .sort_pagelist = true, - .deferred_io = broadsheetfb_dpy_deferred_io, + .delay =HZ /4 , + .sort_pagereflist = true, + .deferred_io = broadsheetfb_dpy_deferred_io, };static int broadsheetfb_probe (struct platform_device *dev)
drivers/video/fbdev/core/fb_defio.c +9 -9
@@ -41,7 +41,7 @@ static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info struct page *page) {struct fb_deferred_io *fbdefio = info->fbdefio; -struct list_head *pos = &fbdefio->pagelist; +struct list_head *pos = &fbdefio->pagereflist;unsigned long pgoff = offset >>PAGE_SHIFT ;struct fb_deferred_io_pageref *pageref, *cur;
@@ -63,7 +63,7 @@ static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info pageref->page = page; pageref->offset = pgoff <<PAGE_SHIFT ; -if (unlikely (fbdefio->sort_pagelist)) { +if (unlikely (fbdefio->sort_pagereflist)) {/* * We loop through the list of pagerefs before adding in * order to keep the pagerefs sorted. This has significant
@@ -71,7 +71,7 @@ static struct fb_deferred_io_pageref *fb_deferred_io_pageref_get(struct fb_info* pages. If possible, drivers should try to work with * unsorted page lists instead. */ -list_for_each_entry (cur, &info->fbdefio->pagelist, list) { +list_for_each_entry (cur, &fbdefio->pagereflist, list) {if (cur->offset > pageref->offset)break ; }
@@ -163,7 +163,7 @@ static vm_fault_t fb_deferred_io_mkwrite(struct vm_fault *vmf)mutex_lock (&fbdefio->lock);/* first write in this cycle, notify the driver */ -if (fbdefio->first_io &&list_empty (&fbdefio->pagelist)) +if (fbdefio->first_io &&list_empty (&fbdefio->pagereflist)) fbdefio->first_io (info); pageref =fb_deferred_io_pageref_get (info, offset, page);
@@ -228,18 +228,18 @@ static void fb_deferred_io_work(struct work_struct *work)/* here we mkclean the pages, then do all deferred IO */ mutex_lock (&fbdefio->lock); -list_for_each_entry (pageref, &fbdefio->pagelist, list) { +list_for_each_entry (pageref, &fbdefio->pagereflist, list) {struct page *cur = pageref->page;lock_page (cur);page_mkclean (cur);unlock_page (cur); } -/* driver's callback with pagelist */ - fbdefio->deferred_io (info, &fbdefio->pagelist); +/* driver's callback with pagereflist */ + fbdefio->deferred_io (info, &fbdefio->pagereflist);/* clear the list */ -list_for_each_entry_safe (pageref, next, &fbdefio->pagelist, list) +list_for_each_entry_safe (pageref, next, &fbdefio->pagereflist, list)fb_deferred_io_pageref_put (pageref, info);mutex_unlock (&fbdefio->lock);
@@ -259,7 +259,7 @@ int fb_deferred_io_init(struct fb_info *info)mutex_init (&fbdefio->lock);INIT_DELAYED_WORK (&info->deferred_work, fb_deferred_io_work); -INIT_LIST_HEAD (&fbdefio->pagelist); +INIT_LIST_HEAD (&fbdefio->pagereflist);if (fbdefio->delay ==0 )/* set a default of 1 s */ fbdefio->delay =HZ ;
drivers/video/fbdev/hecubafb.c +1 -2
@@ -115,8 +115,7 @@ static void hecubafb_dpy_update(struct hecubafb_par *par) }/* this is called back from the deferred io workqueue */ -static void hecubafb_dpy_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void hecubafb_dpy_deferred_io (struct fb_info *info,struct list_head *pagereflist) {hecubafb_dpy_update (info->par); }
drivers/video/fbdev/hyperv_fb.c +2 -3
@@ -420,8 +420,7 @@ static void hvfb_docopy(struct hvfb_par *par, }/* Deferred IO callback */ -static void synthvid_deferred_io (struct fb_info *p, -struct list_head *pagelist) +static void synthvid_deferred_io (struct fb_info *p,struct list_head *pagereflist) {struct hvfb_par *par = p->par;struct fb_deferred_io_pageref *pageref;
@@ -437,7 +436,7 @@ static void synthvid_deferred_io(struct fb_info *p,* in synthvid_update function by clamping the y2 * value to yres. */ -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *page = pageref->page; start = page->index <<PAGE_SHIFT ; end = start +PAGE_SIZE -1 ;
drivers/video/fbdev/metronomefb.c +5 -7
@@ -465,16 +465,14 @@ static u16 metronomefb_dpy_update_page(struct metronomefb_par *par, int index) }/* this is called back from the deferred io workqueue */ -static void metronomefb_dpy_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void metronomefb_dpy_deferred_io (struct fb_info *info,struct list_head *pagereflist) {u16 cksum;struct fb_deferred_io_pageref *pageref; -struct fb_deferred_io *fbdefio = info->fbdefio;struct metronomefb_par *par = info->par;/* walk the written page list and swizzle the data */ -list_for_each_entry (pageref, &fbdefio->pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *cur = pageref->page; cksum =metronomefb_dpy_update_page (par, (cur->index <<PAGE_SHIFT ));
@@ -568,9 +566,9 @@ static const struct fb_ops metronomefb_ops = { };static struct fb_deferred_io metronomefb_defio = { - .delay =HZ , - .sort_pagelist = true, - .deferred_io = metronomefb_dpy_deferred_io, + .delay =HZ , + .sort_pagereflist = true, + .deferred_io = metronomefb_dpy_deferred_io, };static int metronomefb_probe (struct platform_device *dev)
drivers/video/fbdev/sh_mobile_lcdcfb.c +7 -9
@@ -435,8 +435,7 @@ static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = { .read_data = lcdc_sys_read_data, }; -static int sh_mobile_lcdc_sginit (struct fb_info *info, -struct list_head *pagelist) +static int sh_mobile_lcdc_sginit (struct fb_info *info,struct list_head *pagereflist) {struct sh_mobile_lcdc_chan *ch = info->par;unsigned int nr_pages_max = ch->fb_size >>PAGE_SHIFT ;
@@ -445,7 +444,7 @@ static int sh_mobile_lcdc_sginit(struct fb_info *info,sg_init_table (ch->sglist, nr_pages_max); -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *page = pageref->page;sg_set_page (&ch->sglist[nr_pages++], page,PAGE_SIZE ,0 ); }
@@ -453,8 +452,7 @@ static int sh_mobile_lcdc_sginit(struct fb_info *info,return nr_pages; } -static void sh_mobile_lcdc_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void sh_mobile_lcdc_deferred_io (struct fb_info *info,struct list_head *pagereflist) {struct sh_mobile_lcdc_chan *ch = info->par;const struct sh_mobile_lcdc_panel_cfg *panel = &ch->cfg->panel_cfg;
@@ -463,7 +461,7 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info,sh_mobile_lcdc_clk_on (ch->lcdc);/* -* It's possible to get here without anything on the pagelist via +* It's possible to get here without anything on the pagereflist via * sh_mobile_lcdc_deferred_io_touch() or via a userspace fsync() * invocation. In the former case, the acceleration routines are * stepped in to when using the framebuffer console causing the
@@ -473,12 +471,12 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info,* acceleration routines have their own methods for writing in * that still need to be updated. * -* The fsync() and empty pagelist case could be optimized for, +* The fsync() and empty pagereflist case could be optimized for, * but we don't bother, as any application exhibiting such * behaviour is fundamentally broken anyways. */ -if (!list_empty (pagelist)) { -unsigned int nr_pages =sh_mobile_lcdc_sginit (info, pagelist); +if (!list_empty (pagereflist)) { +unsigned int nr_pages =sh_mobile_lcdc_sginit (info, pagereflist);/* trigger panel update */ dma_map_sg (ch->lcdc->dev, ch->sglist, nr_pages,DMA_TO_DEVICE );
drivers/video/fbdev/smscufx.c +3 -5
@@ -953,12 +953,10 @@ static void ufx_ops_fillrect(struct fb_info *info,* Touching ANY framebuffer memory that triggers a page fault * in fb_defio will cause a deadlock, when it also tries to * grab the same mutex. */ -static void ufx_dpy_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void ufx_dpy_deferred_io (struct fb_info *info,struct list_head *pagereflist) { -struct fb_deferred_io_pageref *pageref; -struct fb_deferred_io *fbdefio = info->fbdefio;struct ufx_data *dev = info->par; +struct fb_deferred_io_pageref *pageref;if (!fb_defio)return ;
@@ -967,7 +965,7 @@ static void ufx_dpy_deferred_io(struct fb_info *info,return ;/* walk the written page list and render each to device */ -list_for_each_entry (pageref, &fbdefio->pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {/* create a rectangle of full screen width that encloses the * entire dirty framebuffer page */ struct page *cur = pageref->page;
drivers/video/fbdev/ssd1307fb.c +1 -2
@@ -370,8 +370,7 @@ static const struct fb_ops ssd1307fb_ops = { .fb_imageblit = ssd1307fb_imageblit, }; -static void ssd1307fb_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void ssd1307fb_deferred_io (struct fb_info *info,struct list_head *pagereflist) {ssd1307fb_update_display (info->par); }
drivers/video/fbdev/udlfb.c +3 -5
@@ -780,11 +780,9 @@ static void dlfb_ops_fillrect(struct fb_info *info,* in fb_defio will cause a deadlock, when it also tries to * grab the same mutex. */ -static void dlfb_dpy_deferred_io (struct fb_info *info, -struct list_head *pagelist) +static void dlfb_dpy_deferred_io (struct fb_info *info,struct list_head *pagereflist) {struct fb_deferred_io_pageref *pageref; -struct fb_deferred_io *fbdefio = info->fbdefio;struct dlfb_data *dlfb = info->par;struct urb *urb;char *cmd;
@@ -810,7 +808,7 @@ static void dlfb_dpy_deferred_io(struct fb_info *info, cmd = urb->transfer_buffer;/* walk the written page list and render each to device */ -list_for_each_entry (pageref, &fbdefio->pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *cur = pageref->page; if (dlfb_render_hline(dlfb, &urb, (char *) info->fix.smem_start,
@@ -983,7 +981,7 @@ static int dlfb_ops_open(struct fb_info *info, int user)if (fbdefio) { fbdefio->delay =DL_DEFIO_WRITE_DELAY ; - fbdefio->sort_pagelist = true; + fbdefio->sort_pagereflist = true; fbdefio->deferred_io = dlfb_dpy_deferred_io; }
drivers/video/fbdev/xen-fbfront.c +2 -3
@@ -181,8 +181,7 @@ static void xenfb_refresh(struct xenfb_info *info,xenfb_do_update (info, x1, y1, x2 - x1 +1 , y2 - y1 +1 ); } -static void xenfb_deferred_io (struct fb_info *fb_info, -struct list_head *pagelist) +static void xenfb_deferred_io (struct fb_info *fb_info,struct list_head *pagereflist) {struct xenfb_info *info = fb_info->par;struct fb_deferred_io_pageref *pageref;
@@ -191,7 +190,7 @@ static void xenfb_deferred_io(struct fb_info *fb_info, miny =INT_MAX ; maxy =0 ; -list_for_each_entry (pageref, pagelist, list) { +list_for_each_entry (pageref, pagereflist, list) {struct page *page = pageref->page; beg = page->index <<PAGE_SHIFT ; end = beg +PAGE_SIZE -1 ;
include/drm/drm_fb_helper.h +1 -2
@@ -229,8 +229,7 @@ void drm_fb_helper_fill_info(struct fb_info *info,struct drm_fb_helper *fb_helper, struct drm_fb_helper_surface_size *sizes); -void drm_fb_helper_deferred_io (struct fb_info *info, -struct list_head *pagelist); +void drm_fb_helper_deferred_io (struct fb_info *info,struct list_head *pagereflist);ssize_t drm_fb_helper_sys_read (struct fb_info *info,char __user *buf,size_t count,loff_t *ppos);
include/linux/fb.h +3 -3
@@ -211,9 +211,9 @@ struct fb_deferred_io_pageref {struct fb_deferred_io {/* delay between mkwrite and deferred handler */ unsigned long delay; -bool sort_pagelist;/* sort pagelist by offset */ -struct mutex lock;/* mutex that protects the page list */ -struct list_head pagelist;/* list of touched pages */ +bool sort_pagereflist;/* sort pagelist by offset */ +struct mutex lock;/* mutex that protects the pageref list */ +struct list_head pagereflist;/* list of pagerefs for touched pages */ /* callback */ void (*first_io)(struct fb_info *info);void (*deferred_io)(struct fb_info *info,struct list_head *pagelist);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 451/476 fbdev: Fix invalid page access after closing deferred I/O devices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 3efc61d95259956db25347e2a9562c3e54546e20 ]
When a fbdev with deferred I/O is once opened and closed, the dirty pages still remain queued in the pageref list, and eventually later those may be processed in the delayed work. This may lead to a corruption of pages, hitting an Oops.
This patch makes sure to cancel the delayed work and clean up the pageref list at closing the device for addressing the bug. A part of the cleanup code is factored out as a new helper function that is called from the common fb_release().
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/video/fbdev/core/fb_defio.c | 10 +++++++++- drivers/video/fbdev/core/fbmem.c | 4 ++++ include/linux/fb.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fb_defio.c +9 -1
@@ -292,7 +292,7 @@ void fb_deferred_io_open(struct fb_info *info, }EXPORT_SYMBOL_GPL (fb_deferred_io_open); -void fb_deferred_io_cleanup (struct fb_info *info) +void fb_deferred_io_release (struct fb_info *info) {struct fb_deferred_io *fbdefio = info->fbdefio;struct page *page;
@@ -306,6 +306,14 @@ void fb_deferred_io_cleanup(struct fb_info *info) page =fb_deferred_io_page (info, i); page->mapping =NULL ; } +} +EXPORT_SYMBOL_GPL (fb_deferred_io_release); + +void fb_deferred_io_cleanup (struct fb_info *info) +{ +struct fb_deferred_io *fbdefio = info->fbdefio; + +fb_deferred_io_release (info);kvfree (info->pagerefs);mutex_destroy (&fbdefio->lock);
drivers/video/fbdev/core/fbmem.c +4 -0
@@ -1454,6 +1454,10 @@ __releases(&info->lock)struct fb_info *const info = file->private_data;lock_fb_info (info); +#if IS_ENABLED (CONFIG_FB_DEFERRED_IO ) +if (info->fbdefio) +fb_deferred_io_release (info); +#endif if (info->fbops->fb_release) info->fbops->fb_release (info,1 );module_put (info->fbops->owner);
include/linux/fb.h +1 -0
@@ -675,6 +675,7 @@ extern int fb_deferred_io_init(struct fb_info *info);extern void fb_deferred_io_open (struct fb_info *info,struct inode *inode,struct file *file); +extern void fb_deferred_io_release (struct fb_info *info);extern void fb_deferred_io_cleanup (struct fb_info *info);extern int fb_deferred_io_fsync (struct file *file,loff_t start,loff_t end,int datasync);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 452/476 fbdev: Fix incorrect page mapping clearance at fb_deferred_io_release()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit fe9ae05cfbe587dda724fcf537c00bc2f287da62 ]
The recent fix for the deferred I/O by the commit
3efc61d95259 ("fbdev: Fix invalid page access after closing deferred I/O devices")
caused a regression when the same fb device is opened/closed while it's being used. It resulted in a frozen screen even if something
is redrawn there after the close. The breakage is because the patch was made under a wrong assumption of a single open; in the current code, fb_deferred_io_release() cleans up the page mapping of the pageref list and it calls cancel_delayed_work_sync() unconditionally, where both are no correct behavior for multiple opens.
This patch adds a refcount for the opens of the device, and applies the cleanup only when all files get closed.
As both fb_deferred_io_open() and _close() are called always in the fb_info lock (mutex), it's safe to use the normal int for the refcounting.
Also, a useless BUG_ON() is dropped.
Stable-dep-of: 33cd6ea9c067 ("fbdev: flush deferred IO before closing")
--- drivers/video/fbdev/core/fb_defio.c | 17 +++++++++++++---- include/linux/fb.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/video/fbdev/core/fb_defio.c +13 -4
@@ -288,17 +288,18 @@ void fb_deferred_io_open(struct fb_info *info,struct inode *inode, struct file *file) { + struct fb_deferred_io *fbdefio = info->fbdefio; + file->f_mapping->a_ops = &fb_deferred_io_aops; + fbdefio->open_count++; }EXPORT_SYMBOL_GPL (fb_deferred_io_open); -void fb_deferred_io_release (struct fb_info *info) +static void fb_deferred_io_lastclose (struct fb_info *info) { -struct fb_deferred_io *fbdefio = info->fbdefio;struct page *page;int i; -BUG_ON (!fbdefio);cancel_delayed_work_sync (&info->deferred_work);/* clear out the mapping that we setup */
@@ -307,13 +308,21 @@ void fb_deferred_io_release(struct fb_info *info) page->mapping =NULL ; } } + +void fb_deferred_io_release (struct fb_info *info) +{ +struct fb_deferred_io *fbdefio = info->fbdefio; + +if (!--fbdefio->open_count) +fb_deferred_io_lastclose (info); +}EXPORT_SYMBOL_GPL (fb_deferred_io_release);void fb_deferred_io_cleanup (struct fb_info *info) {struct fb_deferred_io *fbdefio = info->fbdefio; -fb_deferred_io_release (info); +fb_deferred_io_lastclose (info);kvfree (info->pagerefs);mutex_destroy (&fbdefio->lock);
include/linux/fb.h +1 -0
@@ -212,6 +212,7 @@ struct fb_deferred_io {/* delay between mkwrite and deferred handler */ unsigned long delay;bool sort_pagereflist;/* sort pagelist by offset */ +int open_count;/* number of opened files; protected by fb_info lock */ struct mutex lock;/* mutex that protects the pageref list */ struct list_head pagereflist;/* list of pagerefs for touched pages */ /* callback */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 453/476 fbdev: flush deferred IO before closing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
[ Upstream commit 33cd6ea9c0673517cdb06ad5c915c6f22e9615fc ]
When framebuffer gets closed, the queued deferred IO gets cancelled. This can cause some last display data to vanish. This is problematic for users who send a still image to the framebuffer, then close the file: the image may never appear.
To ensure none of display data get lost, flush the queued deferred IO first before closing.
Another possible solution is to delete the cancel_delayed_work_sync() instead. The difference is that the display may appear some time after closing. However, the clearing of page mapping after this needs to be removed too, because the page mapping is used by the deferred work. It is not completely obvious whether it is okay to not clear the page mapping. For a patch intended for stable trees, go with the simple and obvious solution.
--- drivers/video/fbdev/core/fb_defio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fb_defio.c +1 -1
@@ -300,7 +300,7 @@ static void fb_deferred_io_lastclose(struct fb_info *info)struct page *page;int i; -cancel_delayed_work_sync (&info->deferred_work); +flush_delayed_work (&info->deferred_work);/* clear out the mapping that we setup */ for (i =0 ; i < info->fix.smem_len; i +=PAGE_SIZE ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 454/476 scripts/decode_stacktrace.sh: support old bash version
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Schspa Shi <[email protected]>
[ Upstream commit 3af8acf6aff2a98731522b52927429760f0b8006 ]
Old bash version don't support associative array variables. Avoid to use associative array variables to avoid error.
Without this, old bash version will report error as fellowing
[ 15.954042] Kernel panic - not syncing: sysrq triggered crash [ 15.955252] CPU: 1 PID: 167 Comm: sh Not tainted 5.18.0-rc1-00208-gb7d075db2fd5 #4 [ 15.956472] Hardware name: Hobot J5 Virtual development board (DT) [ 15.957856] Call trace:
./scripts/decode_stacktrace.sh: line 128: ,dump_backtrace: syntax error: operand expected (error token is ",dump_backtrace")
Stable-dep-of: efbd63983533 ("scripts/decode_stacktrace.sh: optionally use LLVM utilities")
--- scripts/decode_stacktrace.sh | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
scripts/decode_stacktrace.sh +19 -8
@@ -45,8 +45,13 @@ else fi fi -declare -A cache -declare -A modcache +declare aarray_support=true +declare -A cache 2>/dev/null +if [[ $? != 0 ]]; then + aarray_support=false +else + declare -A modcache +fi find_module() { if [[ -n $debuginfod ]] ; then
@@ -97,7 +102,7 @@ parse_symbol() { if [[ $module == "" ]] ; then local objfile=$vmlinux - elif [[ "${modcache[$module]+isset}" == "isset" ]]; then + elif [[ $aarray_support == true && "${modcache[$module]+isset}" == "isset" ]]; then local objfile=${modcache[$module]} else local objfile=$(find_module)
@@ -105,7 +110,9 @@ parse_symbol() { echo "WARNING! Modules path isn't set, but is needed to parse this symbol" >&2 return fi - modcache[$module]=$objfile + if [[ $aarray_support == true ]]; then + modcache[$module]=$objfile + fi fi # Remove the englobing parenthesis
@@ -125,7 +132,7 @@ parse_symbol() { # Use 'nm vmlinux' to figure out the base address of said symbol. # It's actually faster to call it every time than to load it # all into bash. - if [[ "${cache[$module,$name]+isset}" == "isset" ]]; then + if [[ $aarray_support == true && "${cache[$module,$name]+isset}" == "isset" ]]; then local base_addr=${cache[$module,$name]} else local base_addr=$(nm "$objfile" 2>/dev/null | awk '$3 == "'$name'" && ($2 == "t" || $2 == "T") {print $1; exit}')
@@ -133,7 +140,9 @@ parse_symbol() { # address not found return fi - cache[$module,$name]="$base_addr" + if [[ $aarray_support == true ]]; then + cache[$module,$name]="$base_addr" + fi fi # Let's start doing the math to get the exact address into the # symbol. First, strip out the symbol total length.
@@ -149,11 +158,13 @@ parse_symbol() { # Pass it to addr2line to get filename and line number # Could get more than one result - if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then + if [[ $aarray_support == true && "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address" 2>/dev/null) - cache[$module,$address]=$code + if [[ $aarray_support == true ]]; then + cache[$module,$address]=$code + fi fi # addr2line doesn't return a proper error code if it fails, so
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 455/476 scripts: decode_stacktrace: demangle Rust symbols
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 99115db4ecc87af73415939439ec604ea0531e6f ]
Recent versions of both Binutils (c++filt) and LLVM (llvm-cxxfilt) provide Rust v0 mangling support.
Stable-dep-of: efbd63983533 ("scripts/decode_stacktrace.sh: optionally use LLVM utilities")
--- scripts/decode_stacktrace.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
scripts/decode_stacktrace.sh +14 -0
@@ -8,6 +8,14 @@ usage() { echo " $0 -r <release> | <vmlinux> [<base path>|auto] [<modules path>]" } +# Try to find a Rust demangler +if type llvm-cxxfilt >/dev/null 2>&1 ; then + cppfilt=llvm-cxxfilt +elif type c++filt >/dev/null 2>&1 ; then + cppfilt=c++filt + cppfilt_opts=-i +fi + if [[ $1 == "-r" ]] ; then vmlinux="" basepath="auto"
@@ -180,6 +188,12 @@ parse_symbol() { # In the case of inlines, move everything to same line code=${code//$'\n'/' '} + # Demangle if the name looks like a Rust symbol and if + # we got a Rust demangler + if [[ $name =~ ^_R && $cppfilt != "" ]] ; then + name=$("$cppfilt" "$cppfilt_opts" "$name") + fi + # Replace old address with pretty line numbers symbol="$segment$name ($code)" }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 456/476 scripts/decode_stacktrace.sh: optionally use LLVM utilities
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
[ Upstream commit efbd6398353315b7018e6943e41fee9ec35e875f ]
GNU's addr2line can have problems parsing a vmlinux built with LLVM, particularly when LTO was used. In order to decode the traces correctly this patch adds the ability to switch to LLVM's utilities readelf and addr2line. The same approach is followed by Will in [1].
Before:
$ scripts/decode_stacktrace.sh vmlinux < kernel.log [17716.240635] Call trace: [17716.240646] skb_cow_data (??:?) [17716.240654] esp6_input (ld-temp.o:?) [17716.240666] xfrm_input (ld-temp.o:?) [17716.240674] xfrm6_rcv (??:?) [...]
After:
$ LLVM=1 scripts/decode_stacktrace.sh vmlinux < kernel.log [17716.240635] Call trace: [17716.240646] skb_cow_data (include/linux/skbuff.h:2172 net/core/skbuff.c:4503) [17716.240654] esp6_input (net/ipv6/esp6.c:977) [17716.240666] xfrm_input (net/xfrm/xfrm_input.c:659) [17716.240674] xfrm6_rcv (net/ipv6/xfrm6_input.c:172) [...]
Note that one could set CROSS_COMPILE=llvm- instead to hack around this issue. However, doing so can break the decodecode routine as it will force the selection of other LLVM utilities down the line e.g. llvm-as.
[1] https://lore.kernel.org/all/[email protected]/
--- scripts/decode_stacktrace.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
scripts/decode_stacktrace.sh +17 -2
@@ -16,6 +16,21 @@ elif type c++filt >/dev/null 2>&1 ; then cppfilt_opts=-i fi +UTIL_SUFFIX= +if [[ -z ${LLVM:-} ]]; then + UTIL_PREFIX=${CROSS_COMPILE:-} +else + UTIL_PREFIX=llvm- + if [[ ${LLVM} == */ ]]; then + UTIL_PREFIX=${LLVM}${UTIL_PREFIX} + elif [[ ${LLVM} == -* ]]; then + UTIL_SUFFIX=${LLVM} + fi +fi + +READELF=${UTIL_PREFIX}readelf${UTIL_SUFFIX} +ADDR2LINE=${UTIL_PREFIX}addr2line${UTIL_SUFFIX} + if [[ $1 == "-r" ]] ; then vmlinux="" basepath="auto"
@@ -75,7 +90,7 @@ find_module() { if [[ "$modpath" != "" ]] ; then for fn in $(find "$modpath" -name "${module//_/[-_]}.ko*") ; do - if readelf -WS "$fn" | grep -qwF .debug_line ; then + if ${READELF} -WS "$fn" | grep -qwF .debug_line ; then echo $fn return fi
@@ -169,7 +184,7 @@ parse_symbol() { if [[ $aarray_support == true && "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else - local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address" 2>/dev/null) + local code=$(${ADDR2LINE} -i -e "$objfile" "$address" 2>/dev/null) if [[ $aarray_support == true ]]; then cache[$module,$address]=$code fi
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 457/476 netfilter: ipset: fix performance regression in swap operation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jozsef Kadlecsik <[email protected]>
commit 97f7cf1cd80eeed3b7c808b7c12463295c751001 upstream.
The patch "netfilter: ipset: fix race condition between swap/destroy and kernel side add/del/test", commit 28628fa9 fixes a race condition. But the synchronize_rcu() added to the swap function unnecessarily slows it down: it can safely be moved to destroy and use call_rcu() instead.
Eric Dumazet pointed out that simply calling the destroy functions as rcu callback does not work: sets with timeout use garbage collectors which need cancelling at destroy which can wait. Therefore the destroy functions are split into two: cancelling garbage collectors safely at executing the command received by netlink and moving the remaining part only into the rcu callback.
--- include/linux/netfilter/ipset/ip_set.h | 4 +++ net/netfilter/ipset/ip_set_bitmap_gen.h | 14 +++++++++--- net/netfilter/ipset/ip_set_core.c | 37 ++++++++++++++++++++++++-------- net/netfilter/ipset/ip_set_hash_gen.h | 15 ++++++++++-- net/netfilter/ipset/ip_set_list_set.c | 13 ++++++++--- 5 files changed, 65 insertions(+), 18 deletions(-)
include/linux/netfilter/ipset/ip_set.h +4 -0
@@ -186,6 +186,8 @@ struct ip_set_type_variant {/* Return true if "b" set is the same as "a" * according to the create set parameters */ bool (*same_set)(const struct ip_set *a,const struct ip_set *b); +/* Cancel ongoing garbage collectors before destroying the set*/ +void (*cancel_gc)(struct ip_set *set);/* Region-locking is used */ bool region_lock; };
@@ -242,6 +244,8 @@ extern void ip_set_type_unregister(struc/* A generic IP set */ struct ip_set { +/* For call_cru in destroy */ +struct rcu_head rcu;/* The name of the set */ char name[IPSET_MAXNAMELEN ];/* Lock protecting the set data */
net/netfilter/ipset/ip_set_bitmap_gen.h +11 -3
@@ -28,6 +28,7 @@#define mtype_del IPSET_TOKEN(MTYPE, _del)#define mtype_list IPSET_TOKEN(MTYPE, _list)#define mtype_gc IPSET_TOKEN(MTYPE, _gc) +#define mtype_cancel_gc IPSET_TOKEN(MTYPE, _cancel_gc)#define mtype MTYPE#define get_ext (set, map, id) ((map)->extensions + ((set)->dsize * (id)))
@@ -57,9 +58,6 @@ mtype_destroy(struct ip_set *set) {struct mtype *map = set->data; -if (SET_WITH_TIMEOUT (set)) -del_timer_sync (&map->gc); -if (set->dsize && set->extensions &IPSET_EXT_DESTROY )mtype_ext_cleanup (set);ip_set_free (map->members);
@@ -288,6 +286,15 @@ mtype_gc(struct timer_list *t)add_timer (&map->gc); } +static void +mtype_cancel_gc (struct ip_set *set) +{ +struct mtype *map = set->data; + +if (SET_WITH_TIMEOUT (set)) +del_timer_sync (&map->gc); +} +static const struct ip_set_type_variant mtype = { .kadt = mtype_kadt, .uadt = mtype_uadt,
@@ -301,6 +308,7 @@ static const struct ip_set_type_variant .head = mtype_head, .list = mtype_list, .same_set = mtype_same_set, + .cancel_gc = mtype_cancel_gc, };#endif /* __IP_SET_BITMAP_IP_GEN_H */
net/netfilter/ipset/ip_set_core.c +28 -9
@@ -1184,6 +1184,14 @@ ip_set_destroy_set(struct ip_set *set)kfree (set); } +static void +ip_set_destroy_set_rcu (struct rcu_head *head) +{ + struct ip_set *set = container_of(head, struct ip_set, rcu); + +ip_set_destroy_set (set); +} +static int ip_set_destroy (struct sk_buff *skb,const struct nfnl_info *info,const struct nlattr *const attr[]) {
@@ -1195,8 +1203,6 @@ static int ip_set_destroy(struct sk_buffif (unlikely (protocol_min_failed (attr)))return -IPSET_ERR_PROTOCOL ; -/* Must wait for flush to be really finished in list:set */ -rcu_barrier ();/* Commands are serialized and references are * protected by the ip_set_ref_lock.
@@ -1208,8 +1214,10 @@ static int ip_set_destroy(struct sk_buff* counter, so if it's already zero, we can proceed * without holding the lock. */ -read_lock_bh (&ip_set_ref_lock);if (!attr[IPSET_ATTR_SETNAME ]) { +/* Must wait for flush to be really finished in list:set */ +rcu_barrier (); +read_lock_bh (&ip_set_ref_lock);for (i =0 ; i < inst->ip_set_max; i++) { s =ip_set (inst, i);if (s && (s->ref || s->ref_netlink)) {
@@ -1223,6 +1231,8 @@ static int ip_set_destroy(struct sk_buff s =ip_set (inst, i);if (s) {ip_set (inst, i) =NULL ; +/* Must cancel garbage collectors */ + s->variant->cancel_gc (s);ip_set_destroy_set (s); } }
@@ -1230,6 +1240,9 @@ static int ip_set_destroy(struct sk_buff inst->is_destroyed = false; }else {u32 flags =flag_exist (info->nlh); +u16 features =0 ; + +read_lock_bh (&ip_set_ref_lock); s =find_set_and_id (inst,nla_data (attr[IPSET_ATTR_SETNAME ]), &i);if (!s) {
@@ -1240,10 +1253,16 @@ static int ip_set_destroy(struct sk_buff ret = -IPSET_ERR_BUSY ; goto out; } + features = s->type->features;ip_set (inst, i) =NULL ;read_unlock_bh (&ip_set_ref_lock); - -ip_set_destroy_set (s); +if (features &IPSET_TYPE_NAME ) { +/* Must wait for flush to be really finished */ +rcu_barrier (); + } +/* Must cancel garbage collectors */ + s->variant->cancel_gc (s); +call_rcu (&s->rcu, ip_set_destroy_set_rcu); }return 0 ; out:
@@ -1396,9 +1415,6 @@ static int ip_set_swap(struct sk_buff *sip_set (inst, to_id) = from;write_unlock_bh (&ip_set_ref_lock); -/* Make sure all readers of the old set pointers are completed. */ -synchronize_rcu (); -return 0 ; }
@@ -2409,8 +2425,11 @@ ip_set_fini(void) {nf_unregister_sockopt (&so_set);nfnetlink_subsys_unregister (&ip_set_netlink_subsys); -unregister_pernet_subsys (&ip_set_net_ops); + +/* Wait for call_rcu() in destroy */ +rcu_barrier (); +pr_debug ("these are the famous last words\n" ); }
net/netfilter/ipset/ip_set_hash_gen.h +12 -3
@@ -210,6 +210,7 @@ htable_size(u8 hbits)#undef mtype_gc_do#undef mtype_gc#undef mtype_gc_init +#undef mtype_cancel_gc#undef mtype_variant#undef mtype_data_match
@@ -254,6 +255,7 @@ htable_size(u8 hbits)#define mtype_gc_do IPSET_TOKEN(MTYPE, _gc_do)#define mtype_gc IPSET_TOKEN(MTYPE, _gc)#define mtype_gc_init IPSET_TOKEN(MTYPE, _gc_init) +#define mtype_cancel_gc IPSET_TOKEN(MTYPE, _cancel_gc)#define mtype_variant IPSET_TOKEN(MTYPE, _variant)#define mtype_data_match IPSET_TOKEN(MTYPE, _data_match)
@@ -437,9 +439,6 @@ mtype_destroy(struct ip_set *set)struct htype *h = set->data;struct list_head *l, *lt; -if (SET_WITH_TIMEOUT (set)) -cancel_delayed_work_sync (&h->gc.dwork); -mtype_ahash_destroy (set,ipset_dereference_nfnl (h->table), true);list_for_each_safe (l, lt, &h->ad) {list_del (l);
@@ -586,6 +585,15 @@ mtype_gc_init(struct htable_gc *gc)queue_delayed_work (system_power_efficient_wq, &gc->dwork,HZ ); } +static void +mtype_cancel_gc (struct ip_set *set) +{ +struct htype *h = set->data; + +if (SET_WITH_TIMEOUT (set)) +cancel_delayed_work_sync (&h->gc.dwork); +} +static int mtype_add (struct ip_set *set,void *value,const struct ip_set_ext *ext,struct ip_set_ext *mext,u32 flags);
@@ -1416,6 +1424,7 @@ static const struct ip_set_type_variant .uref = mtype_uref, .resize = mtype_resize, .same_set = mtype_same_set, + .cancel_gc = mtype_cancel_gc, .region_lock = true, };
net/netfilter/ipset/ip_set_list_set.c +10 -3
@@ -426,9 +426,6 @@ list_set_destroy(struct ip_set *set)struct list_set *map = set->data;struct set_elem *e, *n; -if (SET_WITH_TIMEOUT (set)) -del_timer_sync (&map->gc); -list_for_each_entry_safe (e, n, &map->members, list) {list_del (&e->list);ip_set_put_byindex (map->net, e->id);
@@ -545,6 +542,15 @@ list_set_same_set(const struct ip_set *a a->extensions == b->extensions; } +static void +list_set_cancel_gc (struct ip_set *set) +{ +struct list_set *map = set->data; + +if (SET_WITH_TIMEOUT (set)) +del_timer_sync (&map->gc); +} +static const struct ip_set_type_variant set_variant = { .kadt = list_set_kadt, .uadt = list_set_uadt,
@@ -558,6 +564,7 @@ static const struct ip_set_type_variant .head = list_set_head, .list = list_set_list, .same_set = list_set_same_set, + .cancel_gc = list_set_cancel_gc, }; static void
Greg Kroah-Hartman
maintainerPATCH 458/476 hrtimer: Ignore slack time for RT tasks in schedule_hrtimeout_range()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
commit 0c52310f260014d95c1310364379772cb74cf82d upstream.
While in theory the timer can be triggered before expires + delta, for the cases of RT tasks they really have no business giving any lenience for extra slack time, so override any passed value by the user and always use zero for schedule_hrtimeout_range() calls. Furthermore, this is similar to what the nanosleep(2) family already does with current->timer_slack_ns.
--- kernel/time/hrtimer.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
kernel/time/hrtimer.c +11 -3
@@ -2266,7 +2266,7 @@ void __init hrtimers_init(void)/** * schedule_hrtimeout_range_clock - sleep until timeout * @expires: timeout value (ktime_t) -* @delta: slack in expires timeout (ktime_t) +* @delta: slack in expires timeout (ktime_t) for SCHED_OTHER tasks * @mode: timer mode * @clock_id: timer clock to be used */
@@ -2293,6 +2293,13 @@ schedule_hrtimeout_range_clock(ktime_t *return -EINTR ; } +/* +* Override any slack passed by the user if under +* rt contraints. +*/ +if (rt_task (current)) + delta =0 ; +hrtimer_init_sleeper_on_stack (&t, clock_id, mode);hrtimer_set_expires_range_ns (&t.timer, *expires, delta);hrtimer_sleeper_start_expires (&t, mode);
@@ -2312,7 +2319,7 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_ran/** * schedule_hrtimeout_range - sleep until timeout * @expires: timeout value (ktime_t) -* @delta: slack in expires timeout (ktime_t) +* @delta: slack in expires timeout (ktime_t) for SCHED_OTHER tasks * @mode: timer mode * * Make the current task sleep until the given expiry time has
@@ -2320,7 +2327,8 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_ran* the current task state has been set (see set_current_state()). * * The @delta argument gives the kernel the freedom to schedule the -* actual wakeup to a time that is both power and performance friendly. +* actual wakeup to a time that is both power and performance friendly +* for regular (non RT/DL) tasks. * The kernel give the normal best effort behavior for "@expires+@delta", * but may decide to fire the timer earlier, but no earlier than @expires. *
Greg Kroah-Hartman
maintainerPATCH 459/476 net: prevent mss overflow in skb_segment()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 23d05d563b7e7b0314e65c8e882bc27eac2da8e7 upstream.
Once again syzbot is able to crash the kernel in skb_segment() [1]
GSO_BY_FRAGS is a forbidden value, but unfortunately the following computation in skb_segment() can reach it quite easily :
mss = mss * partial_segs;
65535 = 3 * 5 * 17 * 257, so many initial values of mss can lead to a bad final result.
Make sure to limit segmentation so that the new mss value is smaller than GSO_BY_FRAGS.
[1]
general protection fault, probably for non-canonical address 0xdffffc000000000e: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000070-0x0000000000000077] CPU: 1 PID: 5079 Comm: syz-executor993 Not tainted 6.7.0-rc4-syzkaller-00141-g1ae4cd3cbdd0 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/10/2023 RIP: 0010:skb_segment+0x181d/0x3f30 net/core/skbuff.c:4551 Code: 83 e3 02 e9 fb ed ff ff e8 90 68 1c f9 48 8b 84 24 f8 00 00 00 48 8d 78 70 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 03 0f 8e 8a 21 00 00 48 8b 84 24 f8 00 RSP: 0018:ffffc900043473d0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000010046 RCX: ffffffff886b1597 RDX: 000000000000000e RSI: ffffffff886b2520 RDI: 0000000000000070 RBP: ffffc90004347578 R08: 0000000000000005 R09: 000000000000ffff R10: 000000000000ffff R11: 0000000000000002 R12: ffff888063202ac0 R13: 0000000000010000 R14: 000000000000ffff R15: 0000000000000046 FS: 0000555556e7e380(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020010000 CR3: 0000000027ee2000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> udp6_ufo_fragment+0xa0e/0xd00 net/ipv6/udp_offload.c:109 ipv6_gso_segment+0x534/0x17e0 net/ipv6/ip6_offload.c:120 skb_mac_gso_segment+0x290/0x610 net/core/gso.c:53 __skb_gso_segment+0x339/0x710 net/core/gso.c:124 skb_gso_segment include/net/gso.h:83 [inline] validate_xmit_skb+0x36c/0xeb0 net/core/dev.c:3626 __dev_queue_xmit+0x6f3/0x3d60 net/core/dev.c:4338 dev_queue_xmit include/linux/netdevice.h:3134 [inline] packet_xmit+0x257/0x380 net/packet/af_packet.c:276 packet_snd net/packet/af_packet.c:3087 [inline] packet_sendmsg+0x24c6/0x5220 net/packet/af_packet.c:3119 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg+0xd5/0x180 net/socket.c:745 __sys_sendto+0x255/0x340 net/socket.c:2190 __do_sys_sendto net/socket.c:2202 [inline] __se_sys_sendto net/socket.c:2198 [inline] __x64_sys_sendto+0xe0/0x1b0 net/socket.c:2198 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x40/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b RIP: 0033:0x7f8692032aa9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 d1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fff8d685418 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007f8692032aa9 RDX: 0000000000010048 RSI: 00000000200000c0 RDI: 0000000000000003 RBP: 00000000000f4240 R08: 0000000020000540 R09: 0000000000000014 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fff8d685480 R13: 0000000000000001 R14: 00007fff8d685480 R15: 0000000000000003 </TASK> Modules linked in: ---[ end trace 0000000000000000 ]--- RIP: 0010:skb_segment+0x181d/0x3f30 net/core/skbuff.c:4551 Code: 83 e3 02 e9 fb ed ff ff e8 90 68 1c f9 48 8b 84 24 f8 00 00 00 48 8d 78 70 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 03 0f 8e 8a 21 00 00 48 8b 84 24 f8 00 RSP: 0018:ffffc900043473d0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000010046 RCX: ffffffff886b1597 RDX: 000000000000000e RSI: ffffffff886b2520 RDI: 0000000000000070 RBP: ffffc90004347578 R08: 0000000000000005 R09: 000000000000ffff R10: 000000000000ffff R11: 0000000000000002 R12: ffff888063202ac0 R13: 0000000000010000 R14: 000000000000ffff R15: 0000000000000046 FS: 0000555556e7e380(0000) GS:ffff8880b9900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020010000 CR3: 0000000027ee2000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- net/core/skbuff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/skbuff.c +2 -1
@@ -4079,8 +4079,9 @@ struct sk_buff *skb_segment(struct sk_bu/* GSO partial only requires that we trim off any excess that * doesn't fit into an MSS sized block, so take care of that * now. +* Cap len to not accidentally hit GSO_BY_FRAGS. */ - partial_segs = len / mss; + partial_segs =min (len,GSO_BY_FRAGS -1U ) / mss;if (partial_segs >1 ) mss *= partial_segs;else
Greg Kroah-Hartman
maintainerPATCH 460/476 netfilter: ipset: Missing gc cancellations fixed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jozsef Kadlecsik <[email protected]>
commit 27c5a095e2518975e20a10102908ae8231699879 upstream.
The patch fdb8e12cc2cc ("netfilter: ipset: fix performance regression in swap operation") missed to add the calls to gc cancellations at the error path of create operations and at module unload. Also, because the half of the destroy operations now executed by a function registered by call_rcu(), neither NFNL_SUBSYS_IPSET mutex or rcu read lock is held and therefore the checking of them results false warnings.
--- net/netfilter/ipset/ip_set_core.c | 2 ++ net/netfilter/ipset/ip_set_hash_gen.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
net/netfilter/ipset/ip_set_core.c +2 -0
@@ -1156,6 +1156,7 @@ static int ip_set_create(struct sk_buffreturn ret; cleanup: + set->variant->cancel_gc (set); set->variant->destroy (set); put_out:module_put (set->type->me);
@@ -2378,6 +2379,7 @@ ip_set_net_exit(struct net *net) set =ip_set (inst, i);if (set) {ip_set (inst, i) =NULL ; + set->variant->cancel_gc (set);ip_set_destroy_set (set); } }
net/netfilter/ipset/ip_set_hash_gen.h +2 -2
@@ -419,7 +419,7 @@ mtype_ahash_destroy(struct ip_set *set,u32 i;for (i =0 ; i <jhash_size (t->htable_bits); i++) { - n =__ipset_dereference (hbucket (t, i)); + n = (__force struct hbucket *)hbucket (t, i);if (!n)continue ;if (set->extensions &IPSET_EXT_DESTROY && ext_destroy)
@@ -439,7 +439,7 @@ mtype_destroy(struct ip_set *set)struct htype *h = set->data;struct list_head *l, *lt; -mtype_ahash_destroy (set,ipset_dereference_nfnl (h->table), true); +mtype_ahash_destroy (set, (__force struct htable *)h->table, true);list_for_each_safe (l, lt, &h->ad) {list_del (l);kfree (l);
Greg Kroah-Hartman
maintainerPATCH 461/476 sched/membarrier: reduce the ability to hammer on sys_membarrier
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 944d5fe50f3f03daacfea16300e656a1691c4a23 upstream.
On some systems, sys_membarrier can be very expensive, causing overall slowdowns for everything. So put a lock on the path in order to serialize the accesses to prevent the ability for this to be called at too high of a frequency and saturate the machine.
[ converted to explicit mutex_*() calls - cleanup.h is not in this stable
branch - gregkh ]
--- kernel/sched/membarrier.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/sched/membarrier.c +9 -0
@@ -162,6 +162,8 @@ | MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK \ | MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK) +static DEFINE_MUTEX (membarrier_ipi_mutex); +static void ipi_mb (void *info) {smp_mb ();/* IPIs should be serializing but paranoid. */
@@ -259,6 +261,7 @@ static int membarrier_global_expedited(vif (!zalloc_cpumask_var (&tmpmask,GFP_KERNEL ))return -ENOMEM ; +mutex_lock (&membarrier_ipi_mutex);cpus_read_lock ();rcu_read_lock ();for_each_online_cpu (cpu) {
@@ -304,6 +307,8 @@ static int membarrier_global_expedited(v* rq->curr modification in scheduler. */ smp_mb ();/* exit from system call is not a mb */ +mutex_unlock (&membarrier_ipi_mutex); +return 0 ; }
@@ -347,6 +352,7 @@ static int membarrier_private_expedited(if (cpu_id <0 && !zalloc_cpumask_var (&tmpmask,GFP_KERNEL ))return -ENOMEM ; +mutex_lock (&membarrier_ipi_mutex);cpus_read_lock ();if (cpu_id >=0 ) {
@@ -419,6 +425,7 @@ out:* rq->curr modification in scheduler. */ smp_mb ();/* exit from system call is not a mb */ +mutex_unlock (&membarrier_ipi_mutex);return 0 ; }
@@ -460,6 +467,7 @@ static int sync_runqueues_membarrier_sta* between threads which are users of @mm has its membarrier state * updated. */ +mutex_lock (&membarrier_ipi_mutex);cpus_read_lock ();rcu_read_lock ();for_each_online_cpu (cpu) {
@@ -476,6 +484,7 @@ static int sync_runqueues_membarrier_stafree_cpumask_var (tmpmask);cpus_read_unlock (); +mutex_unlock (&membarrier_ipi_mutex);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 462/476 nilfs2: fix potential bug in end_buffer_async_write
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 5bc09b397cbf1221f8a8aacb1152650c9195b02b upstream.
According to a syzbot report, end_buffer_async_write(), which handles the completion of block device writes, may detect abnormal condition of the buffer async_write flag and cause a BUG_ON failure when using nilfs2.
Nilfs2 itself does not use end_buffer_async_write(). But, the async_write flag is now used as a marker by commit 7f42ec394156 ("nilfs2: fix issue with race condition of competition between segments for dirty blocks") as a means of resolving double list insertion of dirty blocks in nilfs_lookup_dirty_data_buffers() and nilfs_lookup_node_buffers() and the resulting crash.
This modification is safe as long as it is used for file data and b-tree node blocks where the page caches are independent. However, it was irrelevant and redundant to also introduce async_write for segment summary and super root blocks that share buffers with the backing device. This led to the possibility that the BUG_ON check in end_buffer_async_write would fail as described above, if independent writebacks of the backing device occurred in parallel.
The use of async_write for segment summary buffers has already been removed in a previous change.
Fix this issue by removing the manipulation of the async_write flag for the remaining super root block buffer.
--- fs/nilfs2/segment.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/nilfs2/segment.c +5 -3
@@ -1702,7 +1702,6 @@ static void nilfs_segctor_prepare_write(list_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { -set_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {if (bh->b_page != bd_page) {lock_page (bd_page);
@@ -1713,6 +1712,7 @@ static void nilfs_segctor_prepare_write( }break ; } +set_buffer_async_write (bh);if (bh->b_page != fs_page) {nilfs_begin_page_io (fs_page); fs_page = bh->b_page;
@@ -1798,7 +1798,6 @@ static void nilfs_abort_logs(struct listlist_for_each_entry (bh, &segbuf->sb_payload_buffers, b_assoc_buffers) { -clear_buffer_async_write (bh);if (bh == segbuf->sb_super_root) {clear_buffer_uptodate (bh);if (bh->b_page != bd_page) {
@@ -1807,6 +1806,7 @@ static void nilfs_abort_logs(struct list }break ; } +clear_buffer_async_write (bh);if (bh->b_page != fs_page) {nilfs_end_page_io (fs_page, err); fs_page = bh->b_page;
@@ -1894,8 +1894,9 @@ static void nilfs_segctor_complete_writeBIT (BH_Delay) |BIT (BH_NILFS_Volatile) | BIT(BH_NILFS_Redirected)); -set_mask_bits (&bh->b_state, clear_bits, set_bits);if (bh == segbuf->sb_super_root) { +set_buffer_uptodate (bh); +clear_buffer_dirty (bh);if (bh->b_page != bd_page) {end_page_writeback (bd_page); bd_page = bh->b_page;
@@ -1903,6 +1904,7 @@ static void nilfs_segctor_complete_write update_sr = true;break ; } +set_mask_bits (&bh->b_state, clear_bits, set_bits);if (bh->b_page != fs_page) {nilfs_end_page_io (fs_page,0 ); fs_page = bh->b_page;
Greg Kroah-Hartman
maintainerPATCH 463/476 nilfs2: replace WARN_ONs for invalid DAT metadata block requests
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 5124a0a549857c4b87173280e192eea24dea72ad upstream.
If DAT metadata file block access fails due to corruption of the DAT file or abnormal virtual block numbers held by b-trees or inodes, a kernel warning is generated.
This replaces the WARN_ONs by error output, so that a kernel, booted with panic_on_warn, does not panic. This patch also replaces the detected return code -ENOENT with another internal code -EINVAL to notify the bmap layer of metadata corruption. When the bmap layer sees -EINVAL, it handles the abnormal situation with nilfs_bmap_convert_error() and finally returns code -EIO as it should.
--- fs/nilfs2/dat.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
fs/nilfs2/dat.c +17 -10
@@ -40,8 +40,21 @@ static inline struct nilfs_dat_info *NILstatic int nilfs_dat_prepare_entry (struct inode *dat,struct nilfs_palloc_req *req,int create) { -return nilfs_palloc_get_entry_block (dat, req->pr_entry_nr, - create, &req->pr_entry_bh); +int ret; + + ret =nilfs_palloc_get_entry_block (dat, req->pr_entry_nr, + create, &req->pr_entry_bh); +if (unlikely (ret == -ENOENT )) { +nilfs_err (dat->i_sb, +"DAT doesn't have a block to manage vblocknr = %llu" , + (unsigned long long )req->pr_entry_nr); +/* +* Return internal code -EINVAL to notify bmap layer of +* metadata corruption. +*/ + ret = -EINVAL ; + } +return ret; } static void nilfs_dat_commit_entry(struct inode *dat,
@@ -123,11 +136,7 @@ static void nilfs_dat_commit_free(structint nilfs_dat_prepare_start (struct inode *dat,struct nilfs_palloc_req *req) { -int ret; - - ret =nilfs_dat_prepare_entry (dat, req,0 ); -WARN_ON (ret == -ENOENT ); -return ret; +return nilfs_dat_prepare_entry (dat, req,0 ); } void nilfs_dat_commit_start(struct inode *dat, struct nilfs_palloc_req *req,
@@ -154,10 +163,8 @@ int nilfs_dat_prepare_end(struct inode *int ret; ret =nilfs_dat_prepare_entry (dat, req,0 ); -if (ret <0 ) { -WARN_ON (ret == -ENOENT ); +if (ret <0 )return ret; - } kaddr =kmap_atomic (req->pr_entry_bh->b_page); entry = nilfs_palloc_block_get_entry(dat, req->pr_entry_nr,
Greg Kroah-Hartman
maintainerPATCH 464/476 dm: limit the number of targets and parameter size area
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit bd504bcfec41a503b32054da5472904b404341a4 upstream.
The kvmalloc function fails with a warning if the size is larger than INT_MAX. The warning was triggered by a syscall testing robot.
In order to avoid the warning, this commit limits the number of targets to 1048576 and the size of the parameter area to 1073741824.
--- drivers/md/dm-core.h | 2 ++ drivers/md/dm-ioctl.c | 3 ++- drivers/md/dm-table.c | 9 +++++++-- 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/md/dm-core.h +2 -0
@@ -21,6 +21,8 @@#include "dm-ima.h" #define DM_RESERVED_MAX_IOS 1024 +#define DM_MAX_TARGETS 1048576 +#define DM_MAX_TARGET_PARAMS 1024struct dm_kobject_holder {struct kobject kobj;
drivers/md/dm-ioctl.c +2 -1
@@ -1859,7 +1859,8 @@ static int copy_params(struct dm_ioctl _if (copy_from_user (param_kernel, user, minimum_data_size))return -EFAULT ; -if (param_kernel->data_size < minimum_data_size) +if (unlikely (param_kernel->data_size < minimum_data_size) || +unlikely (param_kernel->data_size >DM_MAX_TARGETS *DM_MAX_TARGET_PARAMS ))return -EINVAL ; secure_data = param_kernel->flags &DM_SECURE_DATA_FLAG ;
drivers/md/dm-table.c +7 -2
@@ -126,7 +126,12 @@ static int alloc_targets(struct dm_tableint dm_table_create (struct dm_table **result,fmode_t mode,unsigned num_targets,struct mapped_device *md) { -struct dm_table *t =kzalloc (sizeof (*t),GFP_KERNEL ); +struct dm_table *t; + +if (num_targets >DM_MAX_TARGETS ) +return -EOVERFLOW ; + + t =kzalloc (sizeof (*t),GFP_KERNEL );if (!t)return -ENOMEM ;
@@ -140,7 +145,7 @@ int dm_table_create(struct dm_table **reif (!num_targets) {kfree (t); -return -ENOMEM ; +return -EOVERFLOW ; }if (alloc_targets (t, num_targets)) {
Greg Kroah-Hartman
maintainerPATCH 465/476 arm64: Subscribe Microsoft Azure Cobalt 100 to ARM Neoverse N2 errata
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Easwar Hariharan <[email protected]>
commit fb091ff394792c018527b3211bbdfae93ea4ac02 upstream.
Add the MIDR value of Microsoft Azure Cobalt 100, which is a Microsoft implemented CPU based on r0p0 of the ARM Neoverse N2 CPU, and therefore suffers from all the same errata.
--- Documentation/arm64/silicon-errata.rst | 7 +++++++ arch/arm64/include/asm/cputype.h | 4 ++++ arch/arm64/kernel/cpu_errata.c | 3 +++ 3 files changed, 14 insertions(+)
Documentation/arm64/silicon-errata.rst +7 -0
@@ -198,3 +198,10 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 | +----------------+-----------------+-----------------+-----------------------------+ ++----------------+-----------------+-----------------+-----------------------------+ +| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 | ++----------------+-----------------+-----------------+-----------------------------+ +| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 | ++----------------+-----------------+-----------------+-----------------------------+ +| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 | ++----------------+-----------------+-----------------+-----------------------------+
arch/arm64/include/asm/cputype.h +4 -0
@@ -61,6 +61,7 @@#define ARM_CPU_IMP_HISI 0x48#define ARM_CPU_IMP_APPLE 0x61#define ARM_CPU_IMP_AMPERE 0xC0 +#define ARM_CPU_IMP_MICROSOFT 0x6D#define ARM_CPU_PART_AEM_V8 0xD0F#define ARM_CPU_PART_FOUNDATION 0xD00
@@ -116,6 +117,8 @@#define AMPERE_CPU_PART_AMPERE1 0xAC3 +#define MICROSOFT_CPU_PART_AZURE_COBALT_100 0xD49/* Based on r0p0 of ARM Neoverse N2 */ +#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -157,6 +160,7 @@#define MIDR_APPLE_M1_ICESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM)#define MIDR_APPLE_M1_FIRESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM)#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1) +#define MIDR_MICROSOFT_AZURE_COBALT_100 MIDR_CPU_MODEL(ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_AZURE_COBALT_100)/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */ #define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX
arch/arm64/kernel/cpu_errata.c +3 -0
@@ -367,6 +367,7 @@ static struct midr_range broken_aarch32_static const struct midr_range trbe_overwrite_fill_mode_cpus[] = { #ifdef CONFIG_ARM64_ERRATUM_2139208MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N2 ), +MIDR_ALL_VERSIONS (MIDR_MICROSOFT_AZURE_COBALT_100 ), #endif #ifdef CONFIG_ARM64_ERRATUM_2119858 MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
@@ -379,6 +380,7 @@ static const struct midr_range trbe_overstatic const struct midr_range tsb_flush_fail_cpus[] = { #ifdef CONFIG_ARM64_ERRATUM_2067961MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N2 ), +MIDR_ALL_VERSIONS (MIDR_MICROSOFT_AZURE_COBALT_100 ), #endif #ifdef CONFIG_ARM64_ERRATUM_2054223 MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
@@ -391,6 +393,7 @@ static const struct midr_range tsb_flushstatic struct midr_range trbe_write_out_of_range_cpus[] = { #ifdef CONFIG_ARM64_ERRATUM_2253138MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N2 ), +MIDR_ALL_VERSIONS (MIDR_MICROSOFT_AZURE_COBALT_100 ), #endif #ifdef CONFIG_ARM64_ERRATUM_2224489 MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
Greg Kroah-Hartman
maintainerPATCH 466/476 PM: runtime: Have devm_pm_runtime_enable() handle pm_runtime_dont_use_autosuspend()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit b4060db9251f919506e4d672737c6b8ab9a84701 ]
The PM Runtime docs say:
Drivers in ->remove() callback should undo the runtime PM changes done in ->probe(). Usually this means calling pm_runtime_disable(), pm_runtime_dont_use_autosuspend() etc.
Quoted 1 line
From grepping code, it's clear that many people aren't aware of the
need to call pm_runtime_dont_use_autosuspend().
When brainstorming solutions, one idea that came up was to leverage the new-ish devm_pm_runtime_enable() function. The idea here is that:
* When the devm action is called we know that the driver is being removed. It's the perfect time to undo the use_autosuspend.
* The code of pm_runtime_dont_use_autosuspend() already handles the case of being called when autosuspend wasn't enabled.
Stable-dep-of: 3d07a411b4fa ("drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks")
--- drivers/base/power/runtime.c | 5 +++++ include/linux/pm_runtime.h | 4 ++++ 2 files changed, 9 insertions(+)
drivers/base/power/runtime.c +5 -0
@@ -1479,11 +1479,16 @@ EXPORT_SYMBOL_GPL(pm_runtime_enable);static void pm_runtime_disable_action (void *data) { +pm_runtime_dont_use_autosuspend (data);pm_runtime_disable (data); }/** * devm_pm_runtime_enable - devres-enabled version of pm_runtime_enable. +* +* NOTE: this will also handle calling pm_runtime_dont_use_autosuspend() for +* you at driver exit time if needed. +* * @dev: Device to handle. */ int devm_pm_runtime_enable (struct device *dev)
include/linux/pm_runtime.h +4 -0
@@ -542,6 +542,10 @@ static inline void pm_runtime_disable(st* Allow the runtime PM autosuspend mechanism to be used for @dev whenever * requested (or "autosuspend" will be handled as direct runtime-suspend for * it). +* +* NOTE: It's important to undo this with pm_runtime_dont_use_autosuspend() +* at driver exit time unless your driver initially enabled pm_runtime +* with devm_pm_runtime_enable() (which handles it for you). */ static inline void pm_runtime_use_autosuspend (struct device *dev) {
Greg Kroah-Hartman
maintainerPATCH 467/476 drm/msm/dsi: Enable runtime PM
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 6ab502bc1cf3147ea1d8540d04b83a7a4cb6d1f1 ]
Some devices power the DSI PHY/PLL through a power rail that we model as a GENPD. Enable runtime PM to make it suspendable.
Patchwork: https://patchwork.freedesktop.org/patch/543352/
Stable-dep-of: 3d07a411b4fa ("drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks")
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +4 -0
@@ -752,6 +752,10 @@ static int dsi_phy_driver_probe(struct p goto fail; } + ret =devm_pm_runtime_enable (&pdev->dev); +if (ret) +return ret; +/* PLL init will call into clk_register which requires * register access, so we need to enable power and ahb clock. */
Greg Kroah-Hartman
maintainerPATCH 468/476 Revert "selftests/bpf: Test tail call counting with bpf2bpf and data on stack"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samasth Norway Ananda <[email protected]>
This reverts commit 3eefb2fbf4ec1c1ff239b8b65e6e78aae335e4a6.
libbpf support for "tc" progs doesn't exist for the linux-5.15.y tree. This commit was backported too far back in upstream, to a kernel where the libbpf support was not there for the test.
--- tools/testing/selftests/bpf/prog_tests/tailcalls.c | 55 ------------------ tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c | 42 ------------- 2 files changed, 97 deletions(-) delete mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c
tools/testing/selftests/bpf/prog_tests/tailcalls.c +0 -55
@@ -810,59 +810,6 @@ out:bpf_object__close (obj); } -#include "tailcall_bpf2bpf6.skel.h" - -/* Tail call counting works even when there is data on stack which is -* not aligned to 8 bytes. -*/ -static void test_tailcall_bpf2bpf_6 (void ) -{ -struct tailcall_bpf2bpf6 *obj; -int err, map_fd, prog_fd, main_fd, data_fd, i, val; -LIBBPF_OPTS (bpf_test_run_opts, topts, - .data_in = &pkt_v4, - .data_size_in = sizeof(pkt_v4), - .repeat = 1, - ); - - obj =tailcall_bpf2bpf6__open_and_load (); -if (!ASSERT_OK_PTR (obj,"open and load" )) -return ; - - main_fd =bpf_program__fd (obj->progs.entry); -if (!ASSERT_GE (main_fd,0 ,"entry prog fd" )) - goto out; - - map_fd =bpf_map__fd (obj->maps.jmp_table); -if (!ASSERT_GE (map_fd,0 ,"jmp_table map fd" )) - goto out; - - prog_fd =bpf_program__fd (obj->progs.classifier_0); -if (!ASSERT_GE (prog_fd,0 ,"classifier_0 prog fd" )) - goto out; - - i =0 ; - err =bpf_map_update_elem (map_fd, &i, &prog_fd,BPF_ANY ); -if (!ASSERT_OK (err,"jmp_table map update" )) - goto out; - - err =bpf_prog_test_run_opts (main_fd, &topts); -ASSERT_OK (err,"entry prog test run" ); -ASSERT_EQ (topts.retval,0 ,"tailcall retval" ); - - data_fd =bpf_map__fd (obj->maps.bss); -if (!ASSERT_GE (data_fd,0 ,"bss map fd" )) - goto out; - - i =0 ; - err =bpf_map_lookup_elem (data_fd, &i, &val); -ASSERT_OK (err,"bss map lookup" ); -ASSERT_EQ (val,1 ,"done flag is set" ); - -out: -tailcall_bpf2bpf6__destroy (obj); -} -void test_tailcalls (void ) {if (test__start_subtest ("tailcall_1" ))
@@ -885,6 +832,4 @@ void test_tailcalls(void)test_tailcall_bpf2bpf_4 (false);if (test__start_subtest ("tailcall_bpf2bpf_5" ))test_tailcall_bpf2bpf_4 (true); -if (test__start_subtest ("tailcall_bpf2bpf_6" )) -test_tailcall_bpf2bpf_6 (); }
tools/testing/selftests/bpf/progs/tailcall_bpf2bpf6.c deleted +0 -42
42 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 469/476 net: bcmgenet: Fix EEE implementation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
commit a9f31047baca57d47440c879cf259b86f900260c upstream.
We had a number of short comings:
- EEE must be re-evaluated whenever the state machine detects a link change as wight be switching from a link partner with EEE enabled/disabled
- tx_lpi_enabled controls whether EEE should be enabled/disabled for the transmit path, which applies to the TBUF block
- We do not need to forcibly enable EEE upon system resume, as the PHY state machine will trigger a link event that will do that, too
---
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 22 ++++++++-------------- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 3 +++ drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 ++++++ 3 files changed, 17 insertions(+), 14 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +8 -14
@@ -1248,7 +1248,8 @@ static void bcmgenet_get_ethtool_stats(s } } -static void bcmgenet_eee_enable_set (struct net_device *dev,bool enable) +void bcmgenet_eee_enable_set (struct net_device *dev,bool enable, +bool tx_lpi_enabled) {struct bcmgenet_priv *priv =netdev_priv (dev);u32 off = priv->hw_params->tbuf_offset +TBUF_ENERGY_CTRL ;
@@ -1268,7 +1269,7 @@ static void bcmgenet_eee_enable_set(stru/* Enable EEE and switch to a 27Mhz clock automatically */ reg =bcmgenet_readl (priv->base + off); -if (enable) +if (tx_lpi_enabled) reg |=TBUF_EEE_EN |TBUF_PM_EN ;else reg &= ~(TBUF_EEE_EN |TBUF_PM_EN );
@@ -1289,6 +1290,7 @@ static void bcmgenet_eee_enable_set(stru priv->eee.eee_enabled = enable; priv->eee.eee_active = enable; + priv->eee.tx_lpi_enabled = tx_lpi_enabled; }static int bcmgenet_get_eee (struct net_device *dev,struct ethtool_eee *e)
@@ -1304,6 +1306,7 @@ static int bcmgenet_get_eee(struct net_d e->eee_enabled = p->eee_enabled; e->eee_active = p->eee_active; + e->tx_lpi_enabled = p->tx_lpi_enabled; e->tx_lpi_timer =bcmgenet_umac_readl (priv,UMAC_EEE_LPI_TIMER );return phy_ethtool_get_eee (dev->phydev, e);
@@ -1313,7 +1316,6 @@ static int bcmgenet_set_eee(struct net_d {struct bcmgenet_priv *priv =netdev_priv (dev);struct ethtool_eee *p = &priv->eee; -int ret =0 ;if (GENET_IS_V1 (priv))return -EOPNOTSUPP ;
@@ -1324,16 +1326,11 @@ static int bcmgenet_set_eee(struct net_d p->eee_enabled = e->eee_enabled;if (!p->eee_enabled) { -bcmgenet_eee_enable_set (dev, false); +bcmgenet_eee_enable_set (dev, false, false); }else { - ret =phy_init_eee (dev->phydev,0 ); -if (ret) { -netif_err (priv, hw, dev,"EEE initialization failed\n" ); -return ret; - } - + p->eee_active =phy_init_eee (dev->phydev, false) >=0 ;bcmgenet_umac_writel (priv, e->tx_lpi_timer,UMAC_EEE_LPI_TIMER ); -bcmgenet_eee_enable_set (dev, true); +bcmgenet_eee_enable_set (dev, p->eee_active, e->tx_lpi_enabled); }return phy_ethtool_set_eee (dev->phydev, e);
@@ -4219,9 +4216,6 @@ static int bcmgenet_resume(struct deviceif (!device_may_wakeup (d))phy_resume (dev->phydev); -if (priv->eee.eee_enabled) -bcmgenet_eee_enable_set (dev, true); -bcmgenet_netif_start (dev);netif_device_attach (dev);
drivers/net/ethernet/broadcom/genet/bcmgenet.h +3 -0
@@ -701,4 +701,7 @@ int bcmgenet_wol_power_down_cfg(struct bvoid bcmgenet_wol_power_up_cfg (struct bcmgenet_priv *priv,enum bcmgenet_power_mode mode); +void bcmgenet_eee_enable_set (struct net_device *dev,bool enable, +bool tx_lpi_enabled); +#endif /* __BCMGENET_H__ */
drivers/net/ethernet/broadcom/genet/bcmmii.c +6 -0
@@ -25,6 +25,7 @@#include "bcmgenet.h" +/* setup netdev link state when PHY link status change and * update UMAC and RGMII block when link up */
@@ -102,6 +103,11 @@ void bcmgenet_mii_setup(struct net_devic reg |=CMD_TX_EN |CMD_RX_EN ; }bcmgenet_umac_writel (priv, reg,UMAC_CMD ); + + priv->eee.eee_active =phy_init_eee (phydev,0 ) >=0 ; +bcmgenet_eee_enable_set (dev, + priv->eee.eee_enabled && priv->eee.eee_active, + priv->eee.tx_lpi_enabled); }else {/* done if nothing has changed */ if (!status_changed)
Greg Kroah-Hartman
maintainerPATCH 470/476 fs/ntfs3: Add null pointer checks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
commit fc4992458e0aa2d2e82a25c922e6ac36c2d91083 upstream.
Added null pointer checks in function ntfs_security_init. Also added le32_to_cpu in functions ntfs_security_init and indx_read.
--- fs/ntfs3/fsntfs.c | 16 ++++++++++------ fs/ntfs3/index.c | 3 ++- 2 files changed, 12 insertions(+), 7 deletions(-)
fs/ntfs3/fsntfs.c +10 -6
@@ -1872,10 +1872,12 @@ int ntfs_security_init(struct ntfs_sb_in goto out; } - root_sdh =resident_data_ex (attr,sizeof (struct INDEX_ROOT )); -if (root_sdh->type !=ATTR_ZERO || +if (!(root_sdh =resident_data_ex (attr,sizeof (struct INDEX_ROOT ))) || + root_sdh->type !=ATTR_ZERO || root_sdh->rule !=NTFS_COLLATION_TYPE_SECURITY_HASH || - offsetof(struct INDEX_ROOT , ihdr) + root_sdh->ihdr.used > attr->res.data_size) { + offsetof(struct INDEX_ROOT , ihdr) + +le32_to_cpu (root_sdh->ihdr.used) > +le32_to_cpu (attr->res.data_size)) { err = -EINVAL ; goto out; }
@@ -1891,10 +1893,12 @@ int ntfs_security_init(struct ntfs_sb_in goto out; } - root_sii =resident_data_ex (attr,sizeof (struct INDEX_ROOT )); -if (root_sii->type !=ATTR_ZERO || +if (!(root_sii =resident_data_ex (attr,sizeof (struct INDEX_ROOT ))) || + root_sii->type !=ATTR_ZERO || root_sii->rule !=NTFS_COLLATION_TYPE_UINT || - offsetof(struct INDEX_ROOT , ihdr) + root_sii->ihdr.used > attr->res.data_size) { + offsetof(struct INDEX_ROOT , ihdr) + +le32_to_cpu (root_sii->ihdr.used) > +le32_to_cpu (attr->res.data_size)) { err = -EINVAL ; goto out; }
fs/ntfs3/index.c +2 -1
@@ -1106,7 +1106,8 @@ ok: }/* check for index header length */ -if (offsetof(struct INDEX_BUFFER , ihdr) + ib->ihdr.used > bytes) { +if (offsetof(struct INDEX_BUFFER , ihdr) +le32_to_cpu (ib->ihdr.used) > + bytes) { err = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 471/476 smb3: Replace smb2pdu 1-element arrays with flex-arrays
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit eb3e28c1e89b4984308777231887e41aa8a0151f upstream.
The kernel is globally removing the ambiguous 0-length and 1-element arrays in favor of flexible arrays, so that we can gain both compile-time and run-time array bounds checking[1].
Replace the trailing 1-element array with a flexible array in the following structures:
struct smb2_err_rsp
struct smb2_tree_connect_req
struct smb2_negotiate_rsp
struct smb2_sess_setup_req
struct smb2_sess_setup_rsp
struct smb2_read_req
struct smb2_read_rsp
struct smb2_write_req
struct smb2_write_rsp
struct smb2_query_directory_req
struct smb2_query_directory_rsp
struct smb2_set_info_req
struct smb2_change_notify_rsp
struct smb2_create_rsp
struct smb2_query_info_req
struct smb2_query_info_rsp
Replace the trailing 1-element array with a flexible array, but leave the existing structure padding:
struct smb2_file_all_info
struct smb2_lock_req
Adjust all related size calculations to match the changes to sizeof().
No machine code output or .data section differences are produced after these changes.
[1] For lots of details, see both:
https://docs.kernel.org/process/deprecated.html#zero-length-and-one-element-arrays
https://people.kernel.org/kees/bounded-flexible-arrays-in-c
--- fs/cifs/smb2misc.c | 2 +- fs/cifs/smb2ops.c | 14 +++++++------- fs/cifs/smb2pdu.c | 13 ++++++------- fs/cifs/smb2pdu.h | 42 ++++++++++++++++++++++++------------------ 4 files changed, 38 insertions(+), 33 deletions(-)
fs/cifs/smb2misc.c +1 -1
@@ -113,7 +113,7 @@ static __u32 get_neg_ctxt_len(struct smb }else if (nc_offset +1 == non_ctxlen) {cifs_dbg (FYI ,"no SPNEGO security blob in negprot rsp\n" ); size_of_pad_before_neg_ctxts =0 ; - }else if (non_ctxlen ==SMB311_NEGPROT_BASE_SIZE ) + }else if (non_ctxlen ==SMB311_NEGPROT_BASE_SIZE +1 )/* has padding, but no SPNEGO blob */ size_of_pad_before_neg_ctxts = nc_offset - non_ctxlen +1 ;else
fs/cifs/smb2ops.c +7 -7
@@ -5826,7 +5826,7 @@ struct smb_version_values smb20_values = .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5848,7 +5848,7 @@ struct smb_version_values smb21_values = .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5869,7 +5869,7 @@ struct smb_version_values smb3any_values .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5890,7 +5890,7 @@ struct smb_version_values smbdefault_val .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5911,7 +5911,7 @@ struct smb_version_values smb30_values = .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5932,7 +5932,7 @@ struct smb_version_values smb302_values .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
@@ -5953,7 +5953,7 @@ struct smb_version_values smb311_values .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND,
fs/cifs/smb2pdu.c +6 -7
@@ -1327,7 +1327,7 @@ SMB2_sess_sendreceive(struct SMB2_sess_d/* Testing shows that buffer offset must be at location of Buffer[0] */ req->SecurityBufferOffset = -cpu_to_le16 (sizeof (struct smb2_sess_setup_req ) -1 /* pad */ ); +cpu_to_le16 (sizeof (struct smb2_sess_setup_req )); req->SecurityBufferLength =cpu_to_le16 (sess_data->iov[1 ].iov_len);memset (&rqst,0 ,sizeof (struct smb_rqst ));
@@ -1826,8 +1826,7 @@ SMB2_tcon(const unsigned int xid, struct iov[0 ].iov_len = total_len -1 ;/* Testing shows that buffer offset must be at location of Buffer[0] */ - req->PathOffset =cpu_to_le16 (sizeof (struct smb2_tree_connect_req ) - -1 /* pad */ ); + req->PathOffset =cpu_to_le16 (sizeof (struct smb2_tree_connect_req )); req->PathLength =cpu_to_le16 (unc_path_len -2 ); iov[1 ].iov_base = unc_path; iov[1 ].iov_len = unc_path_len;
@@ -4748,7 +4747,7 @@ int SMB2_query_directory_init(const unsimemcpy (bufptr, &asteriks, len); req->FileNameOffset = -cpu_to_le16 (sizeof (struct smb2_query_directory_req ) -1 ); +cpu_to_le16 (sizeof (struct smb2_query_directory_req )); req->FileNameLength =cpu_to_le16 (len);/* * BB could be 30 bytes or so longer if we used SMB2 specific
@@ -4945,7 +4944,7 @@ SMB2_set_info_init(struct cifs_tcon *tco req->AdditionalInformation =cpu_to_le32 (additional_info); req->BufferOffset = -cpu_to_le16 (sizeof (struct smb2_set_info_req ) -1 ); +cpu_to_le16 (sizeof (struct smb2_set_info_req )); req->BufferLength =cpu_to_le32 (*size);memcpy (req->Buffer, *data, *size);
@@ -5177,9 +5176,9 @@ build_qfs_info_req(struct kvec *iov, str req->VolatileFileId = volatile_fid;/* 1 for pad */ req->InputBufferOffset = -cpu_to_le16 (sizeof (struct smb2_query_info_req ) -1 ); +cpu_to_le16 (sizeof (struct smb2_query_info_req )); req->OutputBufferLength =cpu_to_le32 ( - outbuf_len +sizeof (struct smb2_query_info_rsp ) -1 ); + outbuf_len +sizeof (struct smb2_query_info_rsp )); iov->iov_base = (char *)req; iov->iov_len = total_len;
fs/cifs/smb2pdu.h +24 -18
150 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 472/476 staging: fbtft: core: set smem_len before fb_deferred_io_init call
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Suti <[email protected]>
commit 81e878887ff82a7dd42f22951391069a5d520627 upstream.
The fbtft_framebuffer_alloc() calls fb_deferred_io_init() before initializing info->fix.smem_len. It is set to zero by the framebuffer_alloc() function. It will trigger a WARN_ON() at the start of fb_deferred_io_init() and the function will not do anything.
--- drivers/staging/fbtft/fbtft-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/fbtft/fbtft-core.c +1 -1
@@ -657,7 +657,6 @@ struct fb_info *fbtft_framebuffer_alloc( fbdefio->delay =HZ / fps; fbdefio->sort_pagereflist = true; fbdefio->deferred_io = fbtft_deferred_io; -fb_deferred_io_init (info);snprintf (info->fix.id,sizeof (info->fix.id),"%s" , dev->driver->name); info->fix.type =FB_TYPE_PACKED_PIXELS ;
@@ -668,6 +667,7 @@ struct fb_info *fbtft_framebuffer_alloc( info->fix.line_length = width * bpp /8 ; info->fix.accel =FB_ACCEL_NONE ; info->fix.smem_len = vmem_size; +fb_deferred_io_init (info); info->var.rotate = pdata->rotate; info->var.xres = width;
Greg Kroah-Hartman
maintainerPATCH 473/476 usb: dwc3: gadget: Dont delay End Transfer on delayed_status
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit 4db0fbb601361767144e712beb96704b966339f5 upstream.
The gadget driver may wait on the request completion when it sets the USB_GADGET_DELAYED_STATUS. Make sure that the End Transfer command can go through if the dwc->delayed_status is set so that the request can complete. When the delayed_status is set, the Setup packet is already processed, and the next phase should be either Data or Status. It's unlikely that the host would cancel the control transfer and send a new Setup packet during End Transfer command. But if that's the case, we can try again when ep0state returns to EP0_SETUP_PHASE.
--- drivers/usb/dwc3/gadget.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +11 -1
@@ -1680,6 +1680,16 @@ static int __dwc3_stop_active_transfer(s cmd |=DWC3_DEPCMD_PARAM (dep->resource_index);memset (¶ms,0 ,sizeof (params)); ret =dwc3_send_gadget_ep_cmd (dep, cmd, ¶ms); +/* +* If the End Transfer command was timed out while the device is +* not in SETUP phase, it's possible that an incoming Setup packet +* may prevent the command's completion. Let's retry when the +* ep0state returns to EP0_SETUP_PHASE. +*/ +if (ret == -ETIMEDOUT && dep->dwc->ep0state !=EP0_SETUP_PHASE ) { + dep->flags |=DWC3_EP_DELAY_STOP ; +return 0 ; + }WARN_ON_ONCE (ret); dep->resource_index =0 ;
@@ -3701,7 +3711,7 @@ void dwc3_stop_active_transfer(struct dw* timeout. Delay issuing the End Transfer command until the Setup TRB is * prepared. */ -if (dwc->ep0state !=EP0_SETUP_PHASE ) { +if (dwc->ep0state !=EP0_SETUP_PHASE && !dwc->delayed_status) { dep->flags |=DWC3_EP_DELAY_STOP ;return ; }
Greg Kroah-Hartman
maintainerPATCH 474/476 usb: dwc3: gadget: Execute gadget stop after halting the controller
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wesley Cheng <[email protected]>
commit 39674be56fba1cd3a03bf4617f523a35f85fd2c1 upstream.
Do not call gadget stop until the poll for controller halt is completed. DEVTEN is cleared as part of gadget stop, so the intention to allow ep0 events to continue while waiting for controller halt is not happening.
--- drivers/usb/dwc3/gadget.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +13 -2
@@ -2517,7 +2517,6 @@ static int dwc3_gadget_soft_disconnect(s* bit. */ dwc3_stop_active_transfers (dwc); -__dwc3_gadget_stop (dwc);spin_unlock_irqrestore (&dwc->lock, flags);/*
@@ -2547,7 +2546,19 @@ static int dwc3_gadget_soft_disconnect(s* remaining event generated by the controller while polling for * DSTS.DEVCTLHLT. */ -return dwc3_gadget_run_stop (dwc, false); + ret =dwc3_gadget_run_stop (dwc, false); + +/* +* Stop the gadget after controller is halted, so that if needed, the +* events to update EP0 state can still occur while the run/stop +* routine polls for the halted state. DEVTEN is cleared as part of +* gadget stop. +*/ +spin_lock_irqsave (&dwc->lock, flags); +__dwc3_gadget_stop (dwc); +spin_unlock_irqrestore (&dwc->lock, flags); + +return ret; }static int dwc3_gadget_soft_connect (struct dwc3 *dwc)
Greg Kroah-Hartman
maintainerPATCH 475/476 media: Revert "media: rkisp1: Drop IRQF_SHARED"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
commit a107d643b2a3382e0a2d2c4ef08bf8c6bff4561d upstream.
This reverts commit 85d2a31fe4d9be1555f621ead7a520d8791e0f74.
The rkisp1 does share interrupt lines on some platforms, after all. Thus we need to revert this, and implement a fix for the rkisp1 shared irq handling in a follow-up patch.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +1 -1
@@ -482,7 +482,7 @@ static int rkisp1_probe(struct platform_if (irq <0 )return irq; - ret =devm_request_irq (dev, irq, rkisp1_isr,0 , + ret =devm_request_irq (dev, irq, rkisp1_isr,IRQF_SHARED ,dev_driver_string (dev), dev);if (ret) {dev_err (dev,"request irq failed: %d\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 476/476 usb: dwc3: gadget: Ignore End Transfer delay on teardown
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit c4e3ef5685393c5051b52cf1e94b8891d49793ab upstream.
If we delay sending End Transfer for Setup TRB to be prepared, we need to check if the End Transfer was in preparation for a driver teardown/soft-disconnect. In those cases, just send the End Transfer command without delay.
In the case of soft-disconnect, there's a very small chance the command may not go through immediately. But should it happen, the Setup TRB will be prepared during the polling of the controller halted state, allowing the command to go through then.
In the case of disabling endpoint due to reconfiguration (e.g. set_interface(alt-setting) or usb reset), then it's driven by the host. Typically the host wouldn't immediately cancel the control request and send another control transfer to trigger the End Transfer command timeout.
--- drivers/usb/dwc3/gadget.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +4 -1
@@ -1701,6 +1701,7 @@ static int __dwc3_stop_active_transfer(s dep->flags |=DWC3_EP_END_TRANSFER_PENDING ; } + dep->flags &= ~DWC3_EP_DELAY_STOP ;return ret; }
@@ -3710,8 +3711,10 @@ void dwc3_stop_active_transfer(struct dwif (dep->number <=1 && dwc->ep0state !=EP0_DATA_PHASE )return ; +if (interrupt && (dep->flags &DWC3_EP_DELAY_STOP )) +return ; +if (!(dep->flags &DWC3_EP_TRANSFER_STARTED ) || - (dep->flags &DWC3_EP_DELAY_STOP ) || (dep->flags &DWC3_EP_END_TRANSFER_PENDING ))return ;
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
94 tests: 94 pass, 0 failLinux version: 5.15.149-rc1-gae70058cf980
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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.
Quoted 9 lines
Responses should be made by Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.
KernelCI report for stable-rc/linux-5.15.y for this week.
## stable-rc HEAD for linux-5.15.y:
Date: 2024-02-21
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/log/?h=ae70058cf980fe792e8438b4b2c5a1e6b648aada
## Build failures:
No build failures seen for the stable-rc/linux-5.15.y commit head \o/
## Boot failures:
No **new** boot failures seen for the stable-rc/linux-5.15.y commit head \o/
Thanks,
Shreeya Patel
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
The i386 allmodconfig builds failed on stable-rc 5.15, 5.10 and 5.4.
ERROR: modpost: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! make[2]: *** [/builds/linux/scripts/Makefile.modpost:133:
modules-only.symvers] Error 1
Steps to reproduce:
tuxmake --runtime podman --target-arch i386 --toolchain gcc-12
--kconfig allmodconfig
Links:
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.148-477-gae70058cf980/testrun/22797307/suite/build/test/gcc-12-allmodconfig/log
- https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15.148-477-gae70058cf980/testrun/22797307/suite/build/test/gcc-12-allmodconfig/details/
--
Linaro LKFT
https://lkft.linaro.org
Hi Greg,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
Built and boot tested on x86_64 and aarch64.
Thanks,
Harshit
Quoted 10 lines
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Quoted 9 lines
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my x86_64 and ARM64 test systems. No errors or regressions.
Thanks.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.149-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
No regressions found on WSL (x86 and arm64).
Built, booted, and reviewed dmesg.
Thank you.
Hi,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 3 lines
Herbert Xu <[email protected]>
crypto: api - Disallow identical driver names
This patch results in a severe performance regression on arm64 systems; there is more than 50% throughput loss on some sequential read tests. The problem affects v5.15.y and older kernel branches.
Analysis shows that v5.15.y and older kernel _do_ try to register the same crypto algorithm twice, once through
__crypto_register_alg
crypto_register_alg
crypto_register_skciphers
aes_init
and then again through
__crypto_register_alg
crypto_register_alg
crypto_register_skcipher
simd_skcipher_create_compat
aes_init
After above patch was applied, the second registration fails, resulting in the regression.
The problem is not seen in later kernels due to commit 676e508122d9 ("crypto: arm64/aes-ce - stop using SIMD helper for skciphers"). Applying this commit or reverting above commit fixes the regression in v5.15.y and older.
Thanks is due to Momoko Hattori for reporting the problem and finding the offending patch, Doug Anderson for finding the duplicate registration attempt, and Brian Norris for finding the fix. I copied them on this e-mail in case there are further questions.
Thanks,
Guenter
Greg Kroah-Hartman
maintainerQuoted 40 lines · Guenter Roeck
Hi,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.149 release. There are 476 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 Fri, 23 Feb 2024 12:59:02 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 3 lines
Herbert Xu <[email protected]>
crypto: api - Disallow identical driver namesThis patch results in a severe performance regression on arm64 systems; there is more than 50% throughput loss on some sequential read tests. The problem affects v5.15.y and older kernel branches.
Analysis shows that v5.15.y and older kernel _do_ try to register the same crypto algorithm twice, once through
__crypto_register_alg
crypto_register_alg
crypto_register_skciphers
aes_initand then again through
__crypto_register_alg
crypto_register_alg
crypto_register_skcipher
simd_skcipher_create_compat
aes_initAfter above patch was applied, the second registration fails, resulting in the regression.
Quoted 8 lines
The problem is not seen in later kernels due to commit
676e508122d9("crypto: arm64/aes-ce - stop using SIMD helper for skciphers"). Applying this commit or reverting above commit fixes the regression in v5.15.y and older.Thanks is due to Momoko Hattori for reporting the problem and finding the offending patch, Doug Anderson for finding the duplicate registration attempt, and Brian Norris for finding the fix. I copied them on this e-mail in case there are further questions.
Thanks for the report. I got a report that this breaks some android systems as well due to some FIPS crypto code that happens to duplicate the names as well. I think reverting it makes sense and I'll queue that up for the next round of releases.
greg k-h