6.15.7-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 141/192 wifi: mt76: Move RCU section in mt7996_mcu_add_rate_ctrl_fixed()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 28d519d0d493a8cf3f8ca01f10d962c56cec1825 ]
Since mt7996_mcu_set_fixed_field() can't be executed in a RCU critical section, move RCU section in mt7996_mcu_add_rate_ctrl_fixed() and run mt7996_mcu_set_fixed_field() in non-atomic context. This is a preliminary patch to fix a 'sleep while atomic' issue in mt7996_mac_sta_rc_work().
--- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 86 ++++++++++++------- 1 file changed, 57 insertions(+), 29 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +57 -29
@@ -1955,51 +1955,74 @@ int mt7996_mcu_set_fixed_field(struct mt7996_dev *dev, struct mt7996_sta *msta, }static int -mt7996_mcu_add_rate_ctrl_fixed (struct mt7996_dev *dev, -struct ieee80211_link_sta *link_sta, -struct mt7996_vif_link *link, -struct mt7996_sta_link *msta_link, -u8 link_id) +mt7996_mcu_add_rate_ctrl_fixed (struct mt7996_dev *dev,struct mt7996_sta *msta, +struct ieee80211_vif *vif,u8 link_id) { -struct cfg80211_chan_def *chandef = &link->phy->mt76->chandef; -struct cfg80211_bitrate_mask *mask = &link->bitrate_mask; -enum nl80211_band band = chandef->chan->band; -struct mt7996_sta *msta = msta_link->sta; +struct ieee80211_link_sta *link_sta; +struct cfg80211_bitrate_mask mask; +struct mt7996_sta_link *msta_link; +struct mt7996_vif_link *link;struct sta_phy_uni phy = {}; -int ret, nrates =0 ; +struct ieee80211_sta *sta; +int ret, nrates =0 , idx; +enum nl80211_band band; +bool has_he;#define __sta_phy_bitrate_mask_check (_mcs, _gi, _ht, _he) \ do { \ - u8 i, gi = mask->control[band]._gi; \ + u8 i, gi = mask.control[band]._gi; \ gi = (_he) ? gi : gi == NL80211_TXRATE_FORCE_SGI; \ phy.sgi = gi; \ - phy.he_ltf = mask->control[band].he_ltf; \ - for (i = 0; i < ARRAY_SIZE(mask->control[band]._mcs); i++) { \ - if (!mask->control[band]._mcs[i]) \ + phy.he_ltf = mask.control[band].he_ltf; \ + for (i = 0; i < ARRAY_SIZE(mask.control[band]._mcs); i++) { \ + if (!mask.control[band]._mcs[i]) \ continue; \ - nrates += hweight16(mask->control[band]._mcs[i]); \ - phy.mcs = ffs(mask->control[band]._mcs[i]) - 1; \ + nrates += hweight16(mask.control[band]._mcs[i]); \ + phy.mcs = ffs(mask.control[band]._mcs[i]) - 1; \ if (_ht) \ phy.mcs += 8 * i; \ } \ } while (0) -if (link_sta->he_cap.has_he) { +rcu_read_lock (); + + link =mt7996_vif_link (dev, vif, link_id); +if (!link) + goto error_unlock; + + msta_link =rcu_dereference (msta->link[link_id]); +if (!msta_link) + goto error_unlock; + + sta =wcid_to_sta (&msta_link->wcid); + link_sta =rcu_dereference (sta->link[link_id]); +if (!link_sta) + goto error_unlock; + + band = link->phy->mt76->chandef.chan->band; + has_he = link_sta->he_cap.has_he; + mask = link->bitrate_mask; + idx = msta_link->wcid.idx; + +if (has_he) {__sta_phy_bitrate_mask_check (he_mcs, he_gi,0 ,1 ); }else if (link_sta->vht_cap.vht_supported) {__sta_phy_bitrate_mask_check (vht_mcs, gi,0 ,0 ); }else if (link_sta->ht_cap.ht_supported) {__sta_phy_bitrate_mask_check (ht_mcs, gi,1 ,0 ); }else { - nrates =hweight32 (mask->control[band].legacy); - phy.mcs =ffs (mask->control[band].legacy) -1 ; + nrates =hweight32 (mask.control[band].legacy); + phy.mcs =ffs (mask.control[band].legacy) -1 ; } + +rcu_read_unlock (); +#undef __sta_phy_bitrate_mask_check/* fall back to auto rate control */ -if (mask->control[band].gi ==NL80211_TXRATE_DEFAULT_GI && - mask->control[band].he_gi ==GENMASK (7 ,0 ) && - mask->control[band].he_ltf ==GENMASK (7 ,0 ) && +if (mask.control[band].gi ==NL80211_TXRATE_DEFAULT_GI && + mask.control[band].he_gi ==GENMASK (7 ,0 ) && + mask.control[band].he_ltf ==GENMASK (7 ,0 ) && nrates !=1 )return 0 ;
@@ -2012,16 +2035,16 @@ mt7996_mcu_add_rate_ctrl_fixed(struct mt7996_dev *dev, }/* fixed GI */ -if (mask->control[band].gi !=NL80211_TXRATE_DEFAULT_GI || - mask->control[band].he_gi !=GENMASK (7 ,0 )) { +if (mask.control[band].gi !=NL80211_TXRATE_DEFAULT_GI || + mask.control[band].he_gi !=GENMASK (7 ,0 )) {u32 addr;/* firmware updates only TXCMD but doesn't take WTBL into * account, so driver should update here to reflect the * actual txrate hardware sends out. */ - addr =mt7996_mac_wtbl_lmac_addr (dev, msta_link->wcid.idx,7 ); -if (link_sta->he_cap.has_he) + addr =mt7996_mac_wtbl_lmac_addr (dev, idx,7 ); +if (has_he)mt76_rmw_field (dev, addr,GENMASK (31 ,24 ), phy.sgi);else mt76_rmw_field (dev, addr,GENMASK (15 ,12 ), phy.sgi);
@@ -2033,7 +2056,7 @@ mt7996_mcu_add_rate_ctrl_fixed(struct mt7996_dev *dev, }/* fixed HE_LTF */ -if (mask->control[band].he_ltf !=GENMASK (7 ,0 )) { +if (mask.control[band].he_ltf !=GENMASK (7 ,0 )) { ret =mt7996_mcu_set_fixed_field (dev, msta, &phy, link_id,RATE_PARAM_FIXED_HE_LTF );if (ret)
@@ -2041,6 +2064,11 @@ mt7996_mcu_add_rate_ctrl_fixed(struct mt7996_dev *dev, }return 0 ; + +error_unlock: +rcu_read_unlock (); + +return -ENODEV ; } static void
@@ -2159,6 +2187,7 @@ int mt7996_mcu_add_rate_ctrl(struct mt7996_dev *dev,struct mt7996_sta_link *msta_link, u8 link_id, bool changed) { + struct mt7996_sta *msta = msta_link->sta;struct sk_buff *skb;int ret;
@@ -2185,8 +2214,7 @@ int mt7996_mcu_add_rate_ctrl(struct mt7996_dev *dev,if (ret)return ret; -return mt7996_mcu_add_rate_ctrl_fixed (dev, link_sta, link, msta_link, - link_id); +return mt7996_mcu_add_rate_ctrl_fixed (dev, msta, vif, link_id); } static int
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 142/192 wifi: mt76: Move RCU section in mt7996_mcu_add_rate_ctrl()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 3dd6f67c669c860b93ff533f790f23ee1cb36f25 ]
Since mt76_mcu_skb_send_msg() routine can't be executed in atomic context, move RCU section in mt7996_mcu_add_rate_ctrl() and execute mt76_mcu_skb_send_msg() in non-atomic context. This is a preliminary patch to fix a 'sleep while atomic' issue in mt7996_mac_sta_rc_work().
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 6 +-- .../net/wireless/mediatek/mt76/mt7996/main.c | 6 +-- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 50 +++++++++++++++---- .../wireless/mediatek/mt76/mt7996/mt7996.h | 10 ++-- 4 files changed, 45 insertions(+), 27 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +1 -5
@@ -2321,7 +2321,6 @@ void mt7996_mac_sta_rc_work(struct work_struct *work)struct ieee80211_bss_conf *link_conf;struct ieee80211_link_sta *link_sta;struct mt7996_sta_link *msta_link; -struct mt7996_vif_link *link;struct mt76_vif_link *mlink;struct ieee80211_sta *sta;struct ieee80211_vif *vif;
@@ -2363,13 +2362,10 @@ void mt7996_mac_sta_rc_work(struct work_struct *work)spin_unlock_bh (&dev->mt76.sta_poll_lock); - link = (struct mt7996_vif_link *)mlink; -if (changed & (IEEE80211_RC_SUPP_RATES_CHANGED |IEEE80211_RC_NSS_CHANGED |IEEE80211_RC_BW_CHANGED )) -mt7996_mcu_add_rate_ctrl (dev, vif, link_conf, - link_sta, link, msta_link, +mt7996_mcu_add_rate_ctrl (dev, msta_link->sta, vif, link_id, true);if (changed &IEEE80211_RC_SMPS_CHANGED )
drivers/net/wireless/mediatek/mt76/mt7996/main.c +2 -4
@@ -1112,10 +1112,8 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,if (err)return err; - err =mt7996_mcu_add_rate_ctrl (dev, vif, link_conf, - link_sta, link, - msta_link, link_id, - false); + err =mt7996_mcu_add_rate_ctrl (dev, msta_link->sta, vif, + link_id, false);if (err)return err;
drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +39 -11
74 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h +3 -7
@@ -604,13 +604,9 @@ int mt7996_mcu_beacon_inband_discov(struct mt7996_dev *dev,int mt7996_mcu_add_obss_spr (struct mt7996_phy *phy,struct mt7996_vif_link *link,struct ieee80211_he_obss_pd *he_obss_pd); -int mt7996_mcu_add_rate_ctrl (struct mt7996_dev *dev, -struct ieee80211_vif *vif, -struct ieee80211_bss_conf *link_conf, -struct ieee80211_link_sta *link_sta, -struct mt7996_vif_link *link, -struct mt7996_sta_link *msta_link, -u8 link_id,bool changed); +int mt7996_mcu_add_rate_ctrl (struct mt7996_dev *dev,struct mt7996_sta *msta, +struct ieee80211_vif *vif,u8 link_id, +bool changed);int mt7996_set_channel (struct mt76_phy *mphy);int mt7996_mcu_set_chan_info (struct mt7996_phy *phy,u16 tag); int mt7996_mcu_set_tx(struct mt7996_dev *dev, struct ieee80211_vif *vif,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/192 wifi: mt76: Remove RCU section in mt7996_mac_sta_rc_work()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 71532576f41e5b0ec967a82ed49d5dfb1027ccdb ]
Since mt7996_mcu_add_rate_ctrl() and mt7996_mcu_set_fixed_field() can't run in atomic context, move RCU critical section in mt7996_mcu_add_rate_ctrl() and mt7996_mcu_set_fixed_field(). This patch fixes a 'sleep while atomic' issue in mt7996_mac_sta_rc_work().
--- .../net/wireless/mediatek/mt76/mt7996/mac.c | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +7 -28
@@ -2318,19 +2318,12 @@ void mt7996_mac_update_stats(struct mt7996_phy *phy)void mt7996_mac_sta_rc_work (struct work_struct *work) { struct mt7996_dev *dev = container_of(work, struct mt7996_dev, rc_work); -struct ieee80211_bss_conf *link_conf; -struct ieee80211_link_sta *link_sta;struct mt7996_sta_link *msta_link; -struct mt76_vif_link *mlink; -struct ieee80211_sta *sta;struct ieee80211_vif *vif; -struct mt7996_sta *msta;struct mt7996_vif *mvif;LIST_HEAD (list);u32 changed; -u8 link_id; -rcu_read_lock ();spin_lock_bh (&dev->mt76.sta_poll_lock);list_splice_init (&dev->sta_rc_list, &list);
@@ -2341,24 +2334,9 @@ void mt7996_mac_sta_rc_work(struct work_struct *work) changed = msta_link->changed; msta_link->changed =0 ; - - sta =wcid_to_sta (&msta_link->wcid); - link_id = msta_link->wcid.link_id; - msta = msta_link->sta; - mvif = msta->vif; - vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv); - - mlink =rcu_dereference (mvif->mt76.link[link_id]); -if (!mlink) -continue ; - - link_sta =rcu_dereference (sta->link[link_id]); -if (!link_sta) -continue ; - - link_conf =rcu_dereference (vif->link_conf[link_id]); -if (!link_conf) -continue ; + mvif = msta_link->sta->vif; + vif = container_of((void *)mvif, struct ieee80211_vif, + drv_priv);spin_unlock_bh (&dev->mt76.sta_poll_lock);
@@ -2366,17 +2344,18 @@ void mt7996_mac_sta_rc_work(struct work_struct *work) IEEE80211_RC_NSS_CHANGED | IEEE80211_RC_BW_CHANGED))mt7996_mcu_add_rate_ctrl (dev, msta_link->sta, vif, - link_id, true); + msta_link->wcid.link_id, + true);if (changed &IEEE80211_RC_SMPS_CHANGED ) -mt7996_mcu_set_fixed_field (dev, msta,NULL , link_id, +mt7996_mcu_set_fixed_field (dev, msta_link->sta,NULL , + msta_link->wcid.link_id,RATE_PARAM_MMPS_UPDATE );spin_lock_bh (&dev->mt76.sta_poll_lock); }spin_unlock_bh (&dev->mt76.sta_poll_lock); -rcu_read_unlock (); }void mt7996_mac_work (struct work_struct *work)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/192 wifi: mt76: mt7925: Fix null-ptr-deref in mt7925_thermal_init()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 03ee8f73801a8f46d83dfc2bf73fb9ffa5a21602 ]
devm_kasprintf() returns NULL on error. Currently, mt7925_thermal_init() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after devm_kasprintf() to prevent this issue.
--- drivers/net/wireless/mediatek/mt76/mt7925/init.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7925/init.c +2 -0
@@ -52,6 +52,8 @@ static int mt7925_thermal_init(struct mt792x_phy *phy) name =devm_kasprintf (&wiphy->dev,GFP_KERNEL ,"mt7925_%s" ,wiphy_name (wiphy)); +if (!name) +return -ENOMEM ; hwmon =devm_hwmon_device_register_with_groups (&wiphy->dev, name, phy, mt7925_hwmon_groups);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/192 nbd: fix uaf in nbd_genl_connect() error path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Qixing <[email protected]>
[ Upstream commit aa9552438ebf015fc5f9f890dbfe39f0c53cf37e ]
There is a use-after-free issue in nbd:
block nbd6: Receive control failed (result -104)
block nbd6: shutting down sockets
==================================================================
BUG: KASAN: slab-use-after-free in recv_work+0x694/0xa80 drivers/block/nbd.c:1022 Write of size 4 at addr ffff8880295de478 by task kworker/u33:0/67 CPU: 2 UID: 0 PID: 67 Comm: kworker/u33:0 Not tainted 6.15.0-rc5-syzkaller-00123-g2c89c1b655c0 #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: nbd6-recv recv_work Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:408 [inline] print_report+0xc3/0x670 mm/kasan/report.c:521 kasan_report+0xe0/0x110 mm/kasan/report.c:634 check_region_inline mm/kasan/generic.c:183 [inline] kasan_check_range+0xef/0x1a0 mm/kasan/generic.c:189 instrument_atomic_read_write include/linux/instrumented.h:96 [inline] atomic_dec include/linux/atomic/atomic-instrumented.h:592 [inline] recv_work+0x694/0xa80 drivers/block/nbd.c:1022 process_one_work+0x9cc/0x1b70 kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400 kthread+0x3c2/0x780 kernel/kthread.c:464 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK>
nbd_genl_connect() does not properly stop the device on certain error paths after nbd_start_device() has been called. This causes the error path to put nbd->config while recv_work continue to use the config after putting it, leading to use-after-free in recv_work.
This patch moves nbd_start_device() after the backend file creation.
--- drivers/block/nbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/nbd.c +3 -3
@@ -2198,9 +2198,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) goto out; } } - ret =nbd_start_device (nbd); -if (ret) - goto out; +if (info->attrs[NBD_ATTR_BACKEND_IDENTIFIER ]) { nbd->backend =nla_strdup (info->attrs[NBD_ATTR_BACKEND_IDENTIFIER ],GFP_KERNEL );
@@ -2216,6 +2214,8 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) goto out; }set_bit (NBD_RT_HAS_BACKEND_FILE , &config->runtime_flags); + + ret =nbd_start_device (nbd); out:mutex_unlock (&nbd->config_lock);if (!ret) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/192 block: reject bs > ps block devices when THP is disabled
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pankaj Raghav <[email protected]>
[ Upstream commit 4cdf1bdd45ac78a088773722f009883af30ad318 ]
If THP is disabled and when a block device with logical block size > page size is present, the following null ptr deref panic happens during boot:
[ [13.2 mK AOSAN: null-ptr-deref in range [0x0000000000000000-0x0000000000K0 0 0[07]
[ 13.017749] RIP: 0010:create_empty_buffers+0x3b/0x380 <snip> [ 13.025448] Call Trace: [ 13.025692] <TASK> [ 13.025895] block_read_full_folio+0x610/0x780 [ 13.026379] ? __pfx_blkdev_get_block+0x10/0x10 [ 13.027008] ? __folio_batch_add_and_move+0x1fa/0x2b0 [ 13.027548] ? __pfx_blkdev_read_folio+0x10/0x10 [ 13.028080] filemap_read_folio+0x9b/0x200 [ 13.028526] ? __pfx_filemap_read_folio+0x10/0x10 [ 13.029030] ? __filemap_get_folio+0x43/0x620 [ 13.029497] do_read_cache_folio+0x155/0x3b0 [ 13.029962] ? __pfx_blkdev_read_folio+0x10/0x10 [ 13.030381] read_part_sector+0xb7/0x2a0 [ 13.030805] read_lba+0x174/0x2c0 <snip> [ 13.045348] nvme_scan_ns+0x684/0x850 [nvme_core] [ 13.045858] ? __pfx_nvme_scan_ns+0x10/0x10 [nvme_core] [ 13.046414] ? _raw_spin_unlock+0x15/0x40 [ 13.046843] ? __switch_to+0x523/0x10a0 [ 13.047253] ? kvm_clock_get_cycles+0x14/0x30 [ 13.047742] ? __pfx_nvme_scan_ns_async+0x10/0x10 [nvme_core] [ 13.048353] async_run_entry_fn+0x96/0x4f0 [ 13.048787] process_one_work+0x667/0x10a0 [ 13.049219] worker_thread+0x63c/0xf60
As large folio support depends on THP, only allow bs > ps block devices if THP is enabled.
--- include/linux/blkdev.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/blkdev.h +5 -0
@@ -268,11 +268,16 @@ static inline dev_t disk_devt(struct gendisk *disk)return MKDEV (disk->major, disk->first_minor); } +#ifdef CONFIG_TRANSPARENT_HUGEPAGE /* * We should strive for 1 << (PAGE_SHIFT + MAX_PAGECACHE_ORDER) * however we constrain this to what we can validate and test. */ #define BLK_MAX_BLOCK_SIZE SZ_64K +#else +#define BLK_MAX_BLOCK_SIZE PAGE_SIZE +#endif +/* blk_validate_limits() validates bsize, so drivers don't usually need to */ static inline int blk_validate_block_size (unsigned long bsize)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/192 drm/xe/pf: Clear all LMTT pages on alloc
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 705a412a367f383430fa34bada387af2e52eb043 ]
Our LMEM buffer objects are not cleared by default on alloc and during VF provisioning we only setup LMTT PTEs for the actually provisioned LMEM range. But beyond that valid range we might leave some stale data that could either point to some other VFs allocations or even to the PF pages.
Explicitly clear all new LMTT page to avoid the risk that a malicious VF would try to exploit that gap.
While around add asserts to catch any undesired PTE overwrites and low-level debug traces to track LMTT PT life-cycle.
--- drivers/gpu/drm/xe/xe_lmtt.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/xe/xe_lmtt.c +11 -0
@@ -78,6 +78,9 @@ static struct xe_lmtt_pt *lmtt_pt_alloc(struct xe_lmtt *lmtt, unsigned int level }lmtt_assert (lmtt,xe_bo_is_vram (bo)); +lmtt_debug (lmtt,"level=%u addr=%#llx\n" , level, (u64 )xe_bo_main_addr (bo,XE_PAGE_SIZE )); + +xe_map_memset (lmtt_to_xe (lmtt), &bo->vmap,0 ,0 , bo->size); pt->level = level; pt->bo = bo;
@@ -91,6 +94,9 @@ static struct xe_lmtt_pt *lmtt_pt_alloc(struct xe_lmtt *lmtt, unsigned int levelstatic void lmtt_pt_free (struct xe_lmtt_pt *pt) { +lmtt_debug (&pt->bo->tile->sriov.pf.lmtt,"level=%u addr=%llx\n" , + pt->level, (u64 )xe_bo_main_addr (pt->bo,XE_PAGE_SIZE )); +xe_bo_unpin_map_no_vm (pt->bo);kfree (pt); }
@@ -226,9 +232,14 @@ static void lmtt_write_pte(struct xe_lmtt *lmtt, struct xe_lmtt_pt *pt,switch (lmtt->ops->lmtt_pte_size (level)) {case sizeof (u32): +lmtt_assert (lmtt, !overflows_type (pte, u32)); +lmtt_assert (lmtt, !pte || !iosys_map_rd (&pt->bo->vmap, idx *sizeof (u32), u32)); +xe_map_wr (lmtt_to_xe (lmtt), &pt->bo->vmap, idx *sizeof (u32), u32, pte);break ;case sizeof (u64): +lmtt_assert (lmtt, !pte || !iosys_map_rd (&pt->bo->vmap, idx *sizeof (u64), u64)); +xe_map_wr (lmtt_to_xe (lmtt), &pt->bo->vmap, idx *sizeof (u64), u64, pte);break ;default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/192 erofs: refine readahead tracepoint
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
[ Upstream commit 4eb56b0761e75034dd35067a81da4c280c178262 ]
- trace_erofs_readpages => trace_erofs_readahead;
- Rename a redundant statement nrpages = readahead_count(rac);;
- Move the tracepoint to the beginning of z_erofs_readahead().
Stable-dep-of: d53238b614e0 ("erofs: fix to add missing tracepoint in erofs_readahead()")
--- fs/erofs/fileio.c | 2 +- fs/erofs/zdata.c | 5 ++--- include/trace/events/erofs.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
fs/erofs/fileio.c +1 -1
@@ -180,7 +180,7 @@ static void erofs_fileio_readahead(struct readahead_control *rac)struct folio *folio;int err; -trace_erofs_readpages (inode,readahead_index (rac), +trace_erofs_readahead (inode,readahead_index (rac),readahead_count (rac), true);while ((folio =readahead_folio (rac))) { err =erofs_fileio_scan_folio (&io, folio);
fs/erofs/zdata.c +2 -3
@@ -1855,13 +1855,12 @@ static void z_erofs_readahead(struct readahead_control *rac) {struct inode *const inode = rac->mapping->host;Z_EROFS_DEFINE_FRONTEND (f, inode,readahead_pos (rac)); -struct folio *head =NULL , *folio;unsigned int nrpages =readahead_count (rac); +struct folio *head =NULL , *folio;int err; +trace_erofs_readahead (inode,readahead_index (rac), nrpages, false);z_erofs_pcluster_readmore (&f, rac, true); - nrpages =readahead_count (rac); -trace_erofs_readpages (inode,readahead_index (rac), nrpages, false);while ((folio =readahead_folio (rac))) { folio->private = head; head = folio;
include/trace/events/erofs.h +1 -1
@@ -113,7 +113,7 @@ TRACE_EVENT(erofs_read_folio, __entry->raw) ); -TRACE_EVENT(erofs_readpages, +TRACE_EVENT(erofs_readahead, TP_PROTO(struct inode *inode, pgoff_t start, unsigned int nrpage, bool raw),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/192 erofs: fix to add missing tracepoint in erofs_readahead()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit d53238b614e01266a3d36b417b60a502e0698504 ]
Commit 771c994ea51f ("erofs: convert all uncompressed cases to iomap") converts to use iomap interface, it removed trace_erofs_readahead() tracepoint in the meantime, let's add it back.
--- fs/erofs/data.c | 3 +++ 1 file changed, 3 insertions(+)
fs/erofs/data.c +3 -0
@@ -363,6 +363,9 @@ static int erofs_read_folio(struct file *file, struct folio *folio)static void erofs_readahead (struct readahead_control *rac) { +trace_erofs_readahead (rac->mapping->host,readahead_index (rac), +readahead_count (rac), true); +return iomap_readahead (rac, &erofs_iomap_ops); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 150/192 wifi: mac80211: add the virtual monitor after reconfig complete
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit c07981af55d3ba3ec3be880cfe4a0cc10f1f7138 ]
In reconfig we add the virtual monitor in 2 cases:
1. If we are resuming (it was deleted on suspend)
2. If it was added after an error but before the reconfig (due to the last non-monitor interface removal).
In the second case, the removal of the non-monitor interface will succeed but the addition of the virtual monitor will fail, so we add it in the reconfig.
The problem is that we mislead the driver to think that this is an existing interface that is getting re-added - while it is actually a completely new interface from the drivers' point of view.
Some drivers act differently when a interface is re-added. For example, it might not initialize things because they were already initialized. Such drivers will - in this case - be left with a partialy initialized vif.
To fix it, add the virtual monitor after reconfig_complete, so the driver will know that this is a completely new interface.
--- net/mac80211/util.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/mac80211/util.c +4 -5
@@ -2155,11 +2155,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)cfg80211_sched_scan_stopped_locked (local->hw.wiphy,0 ); wake_up: - -if (local->virt_monitors >0 && - local->virt_monitors == local->open_count) -ieee80211_add_virtual_monitor (local); -/* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume.
@@ -2213,6 +2208,10 @@ int ieee80211_reconfig(struct ieee80211_local *local) } } +if (local->virt_monitors >0 && + local->virt_monitors == local->open_count) +ieee80211_add_virtual_monitor (local); +if (!suspended)return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 151/192 netfilter: flowtable: account for Ethernet header in nf_flow_pppoe_proto()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 18cdb3d982da8976b28d57691eb256ec5688fad2 ]
syzbot found a potential access to uninit-value in nf_flow_pppoe_proto()
Blamed commit forgot the Ethernet header.
BUG: KMSAN: uninit-value in nf_flow_offload_inet_hook+0x7e4/0x940 net/netfilter/nf_flow_table_inet.c:27 nf_flow_offload_inet_hook+0x7e4/0x940 net/netfilter/nf_flow_table_inet.c:27 nf_hook_entry_hookfn include/linux/netfilter.h:157 [inline] nf_hook_slow+0xe1/0x3d0 net/netfilter/core.c:623 nf_hook_ingress include/linux/netfilter_netdev.h:34 [inline] nf_ingress net/core/dev.c:5742 [inline] __netif_receive_skb_core+0x4aff/0x70c0 net/core/dev.c:5837 __netif_receive_skb_one_core net/core/dev.c:5975 [inline] __netif_receive_skb+0xcc/0xac0 net/core/dev.c:6090 netif_receive_skb_internal net/core/dev.c:6176 [inline] netif_receive_skb+0x57/0x630 net/core/dev.c:6235 tun_rx_batched+0x1df/0x980 drivers/net/tun.c:1485 tun_get_user+0x4ee0/0x6b40 drivers/net/tun.c:1938 tun_chr_write_iter+0x3e9/0x5c0 drivers/net/tun.c:1984 new_sync_write fs/read_write.c:593 [inline] vfs_write+0xb4b/0x1580 fs/read_write.c:686 ksys_write fs/read_write.c:738 [inline] __do_sys_write fs/read_write.c:749 [inline]
--- include/net/netfilter/nf_flow_table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/netfilter/nf_flow_table.h +1 -1
@@ -370,7 +370,7 @@ static inline __be16 __nf_flow_pppoe_proto(const struct sk_buff *skb)static inline bool nf_flow_pppoe_proto (struct sk_buff *skb,__be16 *inner_proto) { -if (!pskb_may_pull (skb,PPPOE_SES_HLEN )) +if (!pskb_may_pull (skb,ETH_HLEN +PPPOE_SES_HLEN ))return false; *inner_proto =__nf_flow_pppoe_proto (skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 152/192 net: appletalk: Fix device refcount leak in atrtr_create()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kito Xu <[email protected]>
[ Upstream commit 711c80f7d8b163d3ecd463cd96f07230f488e750 ]
When updating an existing route entry in atrtr_create(), the old device reference was not being released before assigning the new device, leading to a device refcount leak. Fix this by calling dev_put() to release the old device reference before holding the new one.
--- net/appletalk/ddp.c | 1 + 1 file changed, 1 insertion(+)
net/appletalk/ddp.c +1 -0
@@ -576,6 +576,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)/* Fill in the routing entry */ rt->target = ta->sat_addr; +dev_put (rt->dev);/* Release old device */ dev_hold (devhint); rt->dev = devhint; rt->flags = r->rt_flags;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 153/192 ibmvnic: Fix hardcoded NUM_RX_STATS/NUM_TX_STATS with dynamic sizeof
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingming Cao <[email protected]>
[ Upstream commit 01b8114b432d7baaa5e51ab229c12c4f36b8e2c6 ]
The previous hardcoded definitions of NUM_RX_STATS and NUM_TX_STATS were not updated when new fields were added to the ibmvnic_{rx,tx}_queue_stats structures. Specifically, commit 2ee73c54a615 ("ibmvnic: Add stat for tx direct vs tx batched") added a fourth TX stat, but NUM_TX_STATS remained 3, leading to a mismatch.
This patch replaces the static defines with dynamic sizeof-based calculations to ensure the stat arrays are correctly sized. This fixes incorrect indexing and prevents incomplete stat reporting in tools like ethtool.
--- drivers/net/ethernet/ibm/ibmvnic.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.h +6 -2
@@ -211,7 +211,6 @@ struct ibmvnic_statistics {u8 reserved[72 ]; } __packed__aligned(8) ; -#define NUM_TX_STATS 3struct ibmvnic_tx_queue_stats {u64 batched_packets;u64 direct_packets;
@@ -219,13 +218,18 @@ struct ibmvnic_tx_queue_stats {u64 dropped_packets; }; -#define NUM_RX_STATS 3 +#define NUM_TX_STATS \ + (sizeof(struct ibmvnic_tx_queue_stats) / sizeof(u64)) +struct ibmvnic_rx_queue_stats {u64 packets;u64 bytes;u64 interrupts; }; +#define NUM_RX_STATS \ + (sizeof(struct ibmvnic_rx_queue_stats) / sizeof(u64)) +struct ibmvnic_acl_buffer {__be32 len;__be32 version;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 154/192 net: phy: microchip: Use genphy_soft_reset() to purge stale LPA bits
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit b4517c363e0e005c7f81ae3be199eec68e87f122 ]
Enable .soft_reset for the LAN88xx PHY driver by assigning genphy_soft_reset() to ensure that the phylib core performs a proper soft reset during reconfiguration.
Previously, the driver left .soft_reset unimplemented, so calls to phy_init_hw() (e.g., from lan88xx_link_change_notify()) did not fully reset the PHY. As a result, stale contents in the Link Partner Ability (LPA) register could persist, causing the PHY to incorrectly report that the link partner advertised autonegotiation even when it did not.
Using genphy_soft_reset() guarantees a clean reset of the PHY and corrects the false autoneg reporting in these scenarios.
--- drivers/net/phy/microchip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/microchip.c +1 -0
@@ -486,6 +486,7 @@ static struct phy_driver microchip_phy_driver[] = { .config_init = lan88xx_config_init, .config_aneg = lan88xx_config_aneg, .link_change_notify = lan88xx_link_change_notify, + .soft_reset = genphy_soft_reset,/* Interrupt handling is broken, do not define related * functions to force polling.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 155/192 net: phy: microchip: limit 100M workaround to link-down events on LAN88xx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit dd4360c0e8504f2f7639c7f5d07c93cfd6a98333 ]
Restrict the 100Mbit forced-mode workaround to link-down transitions only, to prevent repeated link reset cycles in certain configurations.
The workaround was originally introduced to improve signal reliability when switching cables between long and short distances. It temporarily forces the PHY into 10 Mbps before returning to 100 Mbps.
However, when used with autonegotiating link partners (e.g., Intel i350), executing this workaround on every link change can confuse the partner and cause constant renegotiation loops. This results in repeated link down/up transitions and the PHY never reaching a stable state.
Limit the workaround to only run during the PHY_NOLINK state. This ensures it is triggered only once per link drop, avoiding disruptive toggling while still preserving its intended effect.
Note: I am not able to reproduce the original issue that this workaround addresses. I can only confirm that 100 Mbit mode works correctly in my test setup. Based on code inspection, I assume the workaround aims to reset some internal state machine or signal block by toggling speeds. However, a PHY reset is already performed earlier in the function via phy_init_hw(), which may achieve a similar effect. Without a reproducer, I conservatively keep the workaround but restrict its conditions.
--- drivers/net/phy/microchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/microchip.c +1 -1
@@ -332,7 +332,7 @@ static void lan88xx_link_change_notify(struct phy_device *phydev)* As workaround, set to 10 before setting to 100 * at forced 100 F/H mode. */ -if (!phydev->autoneg && phydev->speed ==100 ) { +if (phydev->state ==PHY_NOLINK && !phydev->autoneg && phydev->speed ==100 ) {/* disable phy interrupt */ temp =phy_read (phydev,LAN88XX_INT_MASK ); temp &= ~LAN88XX_INT_MASK_MDINTPIN_EN_ ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 156/192 selftests: net: lib: fix shift count out of range
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 47c84997c686b4d43b225521b732492552b84758 ]
I got the following warning when writing other tests:
+ handle_test_result_pass 'bond 802.3ad' '(lacp_active off)'
+ local 'test_name=bond 802.3ad'
+ shift
+ local 'opt_str=(lacp_active off)'
+ shift
+ log_test_result 'bond 802.3ad' '(lacp_active off)' ' OK '
+ local 'test_name=bond 802.3ad'
+ shift
+ local 'opt_str=(lacp_active off)'
+ shift
+ local 'result= OK '
+ shift
+ local retmsg=
+ shift
/net/tools/testing/selftests/net/forwarding/../lib.sh: line 315: shift: shift count out of range
This happens because an extra shift is executed even after all arguments have been consumed. Remove the last shift in log_test_result() to avoid this warning.
--- tools/testing/selftests/net/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/lib.sh +1 -1
@@ -286,7 +286,7 @@ log_test_result() local test_name=$1; shift local opt_str=$1; shift local result=$1; shift - local retmsg=$1; shift + local retmsg=$1 printf "TEST: %-60s [%s]\n" "$test_name $opt_str" "$result" if [[ $retmsg ]]; then
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 157/192 drm/xe/pm: Restore display pm if there is error after display suspend
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuicheng Lin <[email protected]>
[ Upstream commit 6d33df611a39a1b4ad9f2b609ded5d6efa04d97e ]
xe_bo_evict_all() is called after xe_display_pm_suspend(). So if there is error with xe_bo_evict_all(), display pm should be restored.
--- drivers/gpu/drm/xe/xe_pm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_pm.c +1 -2
@@ -135,7 +135,7 @@ int xe_pm_suspend(struct xe_device *xe)/* FIXME: Super racey... */ err =xe_bo_evict_all (xe);if (err) - goto err_pxp; + goto err_display;for_each_gt (gt, xe, id) { err =xe_gt_suspend (gt);
@@ -152,7 +152,6 @@ int xe_pm_suspend(struct xe_device *xe) err_display:xe_display_pm_resume (xe); -err_pxp:xe_pxp_pm_resume (xe->pxp); err:drm_dbg (&xe->drm,"Device suspend failed %d\n" , err);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 158/192 drm/xe/pm: Correct comment of xe_pm_set_vram_threshold()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuicheng Lin <[email protected]>
[ Upstream commit 0539c5eaf81f3f844213bf6b3137a53e5b04b083 ]
The parameter threshold is with size in MiB, not in bits. Correct it to avoid any confusion.
v2: s/mb/MiB, s/vram/VRAM, fix return section. (Michal)
--- drivers/gpu/drm/xe/xe_pm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_pm.c +5 -3
@@ -706,11 +706,13 @@ void xe_pm_assert_unbounded_bridge(struct xe_device *xe) }/** -* xe_pm_set_vram_threshold - Set a vram threshold for allowing/blocking D3Cold +* xe_pm_set_vram_threshold - Set a VRAM threshold for allowing/blocking D3Cold * @xe: xe device instance -* @threshold: VRAM size in bites for the D3cold threshold +* @threshold: VRAM size in MiB for the D3cold threshold * -* Returns 0 for success, negative error code otherwise. +* Return: +* * 0 - success +* * -EINVAL - invalid argument */ int xe_pm_set_vram_threshold (struct xe_device *xe,u32 threshold) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 159/192 can: m_can: m_can_handle_lost_msg(): downgrade msg lost in rx message to debug level
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Nyekjaer <[email protected]>
[ Upstream commit 58805e9cbc6f6a28f35d90e740956e983a0e036e ]
Downgrade the "msg lost in rx" message to debug level, to prevent flooding the kernel log with error messages.
--- drivers/net/can/m_can/m_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/m_can/m_can.c +1 -1
@@ -665,7 +665,7 @@ static int m_can_handle_lost_msg(struct net_device *dev)struct can_frame *frame;u32 timestamp =0 ; -netdev_err (dev,"msg lost in rxf0\n" ); +netdev_dbg (dev,"msg lost in rxf0\n" ); stats->rx_errors++; stats->rx_over_errors++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 160/192 net/mlx5: Reset bw_share field when changing a nodes parent
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carolina Jubran <[email protected]>
[ Upstream commit f7b76466894083c8f518cf29fef75fcd3ec670e5 ]
When changing a node's parent, its scheduling element is destroyed and re-created with bw_share 0. However, the node's bw_share field was not updated accordingly.
Set the node's bw_share to 0 after re-creation to keep the software state in sync with the firmware configuration.
--- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +1 -0
@@ -1076,6 +1076,7 @@ static int esw_qos_vports_node_update_parent(struct mlx5_esw_sched_node *node,return err; }esw_qos_node_set_parent (node, parent); + node->bw_share =0 ;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 161/192 net/mlx5e: Fix race between DIM disable and net_dim()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carolina Jubran <[email protected]>
[ Upstream commit eb41a264a3a576dc040ee37c3d9d6b7e2d9be968 ]
There's a race between disabling DIM and NAPI callbacks using the dim pointer on the RQ or SQ.
If NAPI checks the DIM state bit and sees it still set, it assumes rq->dim or sq->dim is valid. But if DIM gets disabled right after that check, the pointer might already be set to NULL, leading to a NULL pointer dereference in net_dim().
Fix this by calling synchronize_net() before freeing the DIM context. This ensures all in-progress NAPI callbacks are finished before the pointer is cleared.
Kernel log:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:net_dim+0x23/0x190 ... Call Trace: <TASK> ? __die+0x20/0x60 ? page_fault_oops+0x150/0x3e0 ? common_interrupt+0xf/0xa0 ? sysvec_call_function_single+0xb/0x90 ? exc_page_fault+0x74/0x130 ? asm_exc_page_fault+0x22/0x30 ? net_dim+0x23/0x190 ? mlx5e_poll_ico_cq+0x41/0x6f0 [mlx5_core] ? sysvec_apic_timer_interrupt+0xb/0x90 mlx5e_handle_rx_dim+0x92/0xd0 [mlx5_core] mlx5e_napi_poll+0x2cd/0xac0 [mlx5_core] ? mlx5e_poll_ico_cq+0xe5/0x6f0 [mlx5_core] busy_poll_stop+0xa2/0x200 ? mlx5e_napi_poll+0x1d9/0xac0 [mlx5_core] ? mlx5e_trigger_irq+0x130/0x130 [mlx5_core] __napi_busy_loop+0x345/0x3b0 ? sysvec_call_function_single+0xb/0x90 ? asm_sysvec_call_function_single+0x16/0x20 ? sysvec_apic_timer_interrupt+0xb/0x90 ? pcpu_free_area+0x1e4/0x2e0 napi_busy_loop+0x11/0x20 xsk_recvmsg+0x10c/0x130 sock_recvmsg+0x44/0x70 __sys_recvfrom+0xbc/0x130 ? __schedule+0x398/0x890 __x64_sys_recvfrom+0x20/0x30 do_syscall_64+0x4c/0x100 entry_SYSCALL_64_after_hwframe+0x4b/0x53 ... ---[ end trace 0000000000000000 ]--- ... ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]---
--- drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_dim.c +2 -2
@@ -113,7 +113,7 @@ int mlx5e_dim_rx_change(struct mlx5e_rq *rq, bool enable)__set_bit (MLX5E_RQ_STATE_DIM , &rq->state); }else {__clear_bit (MLX5E_RQ_STATE_DIM , &rq->state); - +synchronize_net ();mlx5e_dim_disable (rq->dim); rq->dim =NULL ; }
@@ -140,7 +140,7 @@ int mlx5e_dim_tx_change(struct mlx5e_txqsq *sq, bool enable)__set_bit (MLX5E_SQ_STATE_DIM , &sq->state); }else {__clear_bit (MLX5E_SQ_STATE_DIM , &sq->state); - +synchronize_net ();mlx5e_dim_disable (sq->dim); sq->dim =NULL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 162/192 net/mlx5e: Add new prio for promiscuous mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianbo Liu <[email protected]>
[ Upstream commit 4c9fce56fa702059bbc5ab737265b68f79cbaac4 ]
An optimization for promiscuous mode adds a high-priority steering table with a single catch-all rule to steer all traffic directly to the TTC table.
However, a gap exists between the creation of this table and the insertion of the catch-all rule. Packets arriving in this brief window would miss as no rule was inserted yet, unnecessarily incrementing the 'rx_steer_missed_packets' counter and dropped.
This patch resolves the issue by introducing a new prio for this table, placing it between MLX5E_TC_PRIO and MLX5E_NIC_PRIO. By doing so, packets arriving during the window now fall through to the next prio (at MLX5E_NIC_PRIO) instead of being dropped.
--- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 9 +++++++-- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 13 +++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h +7 -2
@@ -18,7 +18,8 @@ enum {enum {MLX5E_TC_PRIO =0 , -MLX5E_NIC_PRIO +MLX5E_PROMISC_PRIO , +MLX5E_NIC_PRIO , };struct mlx5e_flow_table {
@@ -68,9 +69,13 @@ struct mlx5e_l2_table { MLX5_HASH_FIELD_SEL_DST_IP |\ MLX5_HASH_FIELD_SEL_IPSEC_SPI) -/* NIC prio FTS */ +/* NIC promisc FT level */ enum {MLX5E_PROMISC_FT_LEVEL , +}; + +/* NIC prio FTS */ +enum {MLX5E_VLAN_FT_LEVEL ,MLX5E_L2_FT_LEVEL ,MLX5E_TTC_FT_LEVEL ,
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +1 -1
@@ -776,7 +776,7 @@ static int mlx5e_create_promisc_table(struct mlx5e_flow_steering *fs) ft_attr.max_fte =MLX5E_PROMISC_TABLE_SIZE ; ft_attr.autogroup.max_num_groups =1 ; ft_attr.level =MLX5E_PROMISC_FT_LEVEL ; - ft_attr.prio =MLX5E_NIC_PRIO ; + ft_attr.prio =MLX5E_PROMISC_PRIO ; ft->t =mlx5_create_auto_grouped_flow_table (fs->ns, &ft_attr);if (IS_ERR (ft->t)) {
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +9 -4
@@ -113,13 +113,16 @@#define ETHTOOL_PRIO_NUM_LEVELS 1#define ETHTOOL_NUM_PRIOS 11#define ETHTOOL_MIN_LEVEL (KERNEL_MIN_LEVEL + ETHTOOL_NUM_PRIOS) -/* Promiscuous, Vlan, mac, ttc, inner ttc, {UDP/ANY/aRFS/accel/{esp, esp_err}}, IPsec policy, +/* Vlan, mac, ttc, inner ttc, {UDP/ANY/aRFS/accel/{esp, esp_err}}, IPsec policy, * {IPsec RoCE MPV,Alias table},IPsec RoCE policy */ -#define KERNEL_NIC_PRIO_NUM_LEVELS 11 +#define KERNEL_NIC_PRIO_NUM_LEVELS 10#define KERNEL_NIC_NUM_PRIOS 1 -/* One more level for tc */ -#define KERNEL_MIN_LEVEL (KERNEL_NIC_PRIO_NUM_LEVELS + 1) +/* One more level for tc, and one more for promisc */ +#define KERNEL_MIN_LEVEL (KERNEL_NIC_PRIO_NUM_LEVELS + 2) + +#define KERNEL_NIC_PROMISC_NUM_PRIOS 1 +#define KERNEL_NIC_PROMISC_NUM_LEVELS 1#define KERNEL_NIC_TC_NUM_PRIOS 1#define KERNEL_NIC_TC_NUM_LEVELS 3
@@ -187,6 +190,8 @@ static struct init_tree_node {ADD_NS (MLX5_FLOW_TABLE_MISS_ACTION_DEF ,ADD_MULTIPLE_PRIO (KERNEL_NIC_TC_NUM_PRIOS ,KERNEL_NIC_TC_NUM_LEVELS ), +ADD_MULTIPLE_PRIO (KERNEL_NIC_PROMISC_NUM_PRIOS , +KERNEL_NIC_PROMISC_NUM_LEVELS ),ADD_MULTIPLE_PRIO (KERNEL_NIC_NUM_PRIOS , KERNEL_NIC_PRIO_NUM_LEVELS))), ADD_PRIO(0, BY_PASS_MIN_LEVEL, 0, FS_CHAINING_CAPS,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 163/192 net: ll_temac: Fix missing tx_pending check in ethtools_set_ringparam()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit e81750b4e3826fedce7362dad839cb40384d60ae ]
The function ll_temac_ethtools_set_ringparam() incorrectly checked rx_pending twice, once correctly for RX and once mistakenly in place of tx_pending. This caused tx_pending to be left unchecked against TX_BD_NUM_MAX.
As a result, invalid TX ring sizes may have been accepted or valid ones wrongly rejected based on the RX limit, leading to potential misconfiguration or unexpected results.
This patch corrects the condition to properly validate tx_pending.
--- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/xilinx/ll_temac_main.c +1 -1
@@ -1309,7 +1309,7 @@ ll_temac_ethtools_set_ringparam(struct net_device *ndev,if (ering->rx_pending >RX_BD_NUM_MAX || ering->rx_mini_pending || ering->rx_jumbo_pending || - ering->rx_pending >TX_BD_NUM_MAX ) + ering->tx_pending >TX_BD_NUM_MAX )return -EINVAL ;if (netif_running (ndev))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 164/192 bnxt_en: Fix DCB ETS validation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shravya KN <[email protected]>
[ Upstream commit b74c2a2e9cc471e847abd87e50a2354c07e02040 ]
In bnxt_ets_validate(), the code incorrectly loops over all possible traffic classes to check and add the ETS settings. Fix it to loop over the configured traffic classes only.
The unconfigured traffic classes will default to TSA_ETS with 0 bandwidth. Looping over these unconfigured traffic classes may cause the validation to fail and trigger this error message:
"rejecting ETS config starving a TC\n"
The .ieee_setets() will then fail.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +2 -0
@@ -487,7 +487,9 @@ static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc)if ((ets->tc_tx_bw[i] || ets->tc_tsa[i]) && i > bp->max_tc)return -EINVAL ; + } +for (i =0 ; i < max_tc; i++) {switch (ets->tc_tsa[i]) {case IEEE_8021QAZ_TSA_STRICT :break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 165/192 bnxt_en: Flush FW trace before copying to the coredump
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shruti Parab <[email protected]>
[ Upstream commit 100c08c89d173b7fdf953e7d9f9ca8f69f80d1c5 ]
bnxt_fill_drv_seg_record() calls bnxt_dbg_hwrm_log_buffer_flush() to flush the FW trace buffer. This needs to be done before we call bnxt_copy_ctx_mem() to copy the trace data.
Without this fix, the coredump may not contain all the FW traces.
--- .../net/ethernet/broadcom/bnxt/bnxt_coredump.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c +11 -7
@@ -368,23 +368,27 @@ static u32 bnxt_get_ctx_coredump(struct bnxt *bp, void *buf, u32 offset,if (!ctxm->mem_valid || !seg_id)continue ; -if (trace) +if (trace) { extra_hlen =BNXT_SEG_RCD_LEN ; +if (buf) { +u16 trace_type = bnxt_bstore_to_trace[type]; + +bnxt_fill_drv_seg_record (bp, &record, ctxm, + trace_type); + } + } +if (buf) data = buf +BNXT_SEG_HDR_LEN + extra_hlen; + seg_len =bnxt_copy_ctx_mem (bp, ctxm, data,0 ) + extra_hlen;if (buf) {bnxt_fill_coredump_seg_hdr (bp, &seg_hdr,NULL , seg_len,0 ,0 ,0 , comp_id, seg_id);memcpy (buf, &seg_hdr,BNXT_SEG_HDR_LEN ); buf +=BNXT_SEG_HDR_LEN ; -if (trace) { -u16 trace_type = bnxt_bstore_to_trace[type]; - -bnxt_fill_drv_seg_record (bp, &record, ctxm, - trace_type); +if (trace)memcpy (buf, &record,BNXT_SEG_RCD_LEN ); - } buf += seg_len; } len +=BNXT_SEG_HDR_LEN + seg_len;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 166/192 bnxt_en: Set DMA unmap len correctly for XDP_REDIRECT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Somnath Kotur <[email protected]>
[ Upstream commit 3cdf199d4755d477972ee87110b2aebc88b3cfad ]
When transmitting an XDP_REDIRECT packet, call dma_unmap_len_set() with the proper length instead of 0. This bug triggers this warning on a system with IOMMU enabled:
WARNING: CPU: 36 PID: 0 at drivers/iommu/dma-iommu.c:842 __iommu_dma_unmap+0x159/0x170 RIP: 0010:__iommu_dma_unmap+0x159/0x170 Code: a8 00 00 00 00 48 c7 45 b0 00 00 00 00 48 c7 45 c8 00 00 00 00 48 c7 45 a0 ff ff ff ff 4c 89 45
b8 4c 89 45 c0 e9 77 ff ff ff <0f> 0b e9 60 ff ff ff e8 8b bf 6a 00 66 66 2e 0f 1f 84 00 00 00 00
RSP: 0018:ff22d31181150c88 EFLAGS: 00010206
RAX: 0000000000002000 RBX: 00000000e13a0000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
RBP: ff22d31181150cf0 R08: ff22d31181150ca8 R09: 0000000000000000
R10: 0000000000000000 R11: ff22d311d36c9d80 R12: 0000000000001000
R13: ff13544d10645010 R14: ff22d31181150c90 R15: ff13544d0b2bac00
FS: 0000000000000000(0000) GS:ff13550908a00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00005be909dacff8 CR3: 0008000173408003 CR4: 0000000000f71ef0
PKRU: 55555554
Call Trace: <IRQ> ? show_regs+0x6d/0x80 ? __warn+0x89/0x160 ? __iommu_dma_unmap+0x159/0x170 ? report_bug+0x17e/0x1b0 ? handle_bug+0x46/0x90 ? exc_invalid_op+0x18/0x80 ? asm_exc_invalid_op+0x1b/0x20 ? __iommu_dma_unmap+0x159/0x170 ? __iommu_dma_unmap+0xb3/0x170 iommu_dma_unmap_page+0x4f/0x100 dma_unmap_page_attrs+0x52/0x220 ? srso_alias_return_thunk+0x5/0xfbef5 ? xdp_return_frame+0x2e/0xd0 bnxt_tx_int_xdp+0xdf/0x440 [bnxt_en] __bnxt_poll_work_done+0x81/0x1e0 [bnxt_en] bnxt_poll+0xd3/0x1e0 [bnxt_en]
--- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c +1 -1
@@ -115,7 +115,7 @@ static void __bnxt_xmit_xdp_redirect(struct bnxt *bp, tx_buf->action =XDP_REDIRECT ; tx_buf->xdpf = xdpf;dma_unmap_addr_set (tx_buf, mapping, mapping); -dma_unmap_len_set (tx_buf, len,0 ); +dma_unmap_len_set (tx_buf, len, len); }void bnxt_tx_int_xdp (struct bnxt *bp,struct bnxt_napi *bnapi,int budget)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 167/192 ublk: sanity check add_dev input for underflow
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronnie Sahlberg <[email protected]>
[ Upstream commit 969127bf0783a4ac0c8a27e633a9e8ea1738583f ]
Add additional checks that queue depth and number of queues are non-zero.
--- drivers/block/ublk_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +2 -1
@@ -2710,7 +2710,8 @@ static int ublk_ctrl_add_dev(const struct ublksrv_ctrl_cmd *header)if (copy_from_user (&info, argp,sizeof (info)))return -EFAULT ; -if (info.queue_depth >UBLK_MAX_QUEUE_DEPTH || info.nr_hw_queues >UBLK_MAX_NR_QUEUES ) +if (info.queue_depth >UBLK_MAX_QUEUE_DEPTH || !info.queue_depth || + info.nr_hw_queues >UBLK_MAX_NR_QUEUES || !info.nr_hw_queues)return -EINVAL ;if (capable (CAP_SYS_ADMIN ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 168/192 atm: idt77252: Add missing `dma_map_error()`
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit c4890963350dcf4e9a909bae23665921fba4ad27 ]
The DMA map functions can fail and should be tested for errors.
--- drivers/atm/idt77252.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/atm/idt77252.c +5 -0
@@ -852,6 +852,8 @@ queue_skb(struct idt77252_dev *card, struct vc_map *vc,IDT77252_PRV_PADDR (skb) =dma_map_single (&card->pcidev->dev, skb->data, skb->len,DMA_TO_DEVICE ); +if (dma_mapping_error (&card->pcidev->dev,IDT77252_PRV_PADDR (skb))) +return -ENOMEM ; error = -EINVAL ;
@@ -1857,6 +1859,8 @@ add_rx_skb(struct idt77252_dev *card, int queue, paddr =dma_map_single (&card->pcidev->dev, skb->data,skb_end_pointer (skb) - skb->data,DMA_FROM_DEVICE ); +if (dma_mapping_error (&card->pcidev->dev, paddr)) + goto outpoolrm;IDT77252_PRV_PADDR (skb) = paddr;if (push_rx_skb (card, skb, queue)) {
@@ -1871,6 +1875,7 @@ add_rx_skb(struct idt77252_dev *card, int queue,dma_unmap_single (&card->pcidev->dev,IDT77252_PRV_PADDR (skb),skb_end_pointer (skb) - skb->data,DMA_FROM_DEVICE ); +outpoolrm: handle =IDT77252_PRV_POOL (skb); card->sbpool[POOL_QUEUE (handle)].skb[POOL_INDEX (handle)] =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 169/192 um: vector: Reduce stack usage in vector_eth_configure()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiwei Bie <[email protected]>
[ Upstream commit 2d65fc13be85c336c56af7077f08ccd3a3a15a4a ]
When compiling with clang (19.1.7), initializing *vp using a compound literal may result in excessive stack usage. Fix it by initializing the required fields of *vp individually.
Without this patch:
$ objdump -d arch/um/drivers/vector_kern.o | ./scripts/checkstack.pl x86_64 0 ... 0x0000000000000540 vector_eth_configure [vector_kern.o]:1472 ...
With this patch:
$ objdump -d arch/um/drivers/vector_kern.o | ./scripts/checkstack.pl x86_64 0 ... 0x0000000000000540 vector_eth_configure [vector_kern.o]:208 ...
--- arch/um/drivers/vector_kern.c | 42 +++++++++++------------------------ 1 file changed, 13 insertions(+), 29 deletions(-)
arch/um/drivers/vector_kern.c +13 -29
@@ -1592,35 +1592,19 @@ static void vector_eth_configure( device->dev = dev; - *vp = ((struct vector_private ) - { - .list =LIST_HEAD_INIT (vp->list), - .dev = dev, - .unit = n, - .options =get_transport_options (def), - .rx_irq =0 , - .tx_irq =0 , - .parsed = def, - .max_packet =get_mtu (def) +ETH_HEADER_OTHER , -/* TODO - we need to calculate headroom so that ip header -* is 16 byte aligned all the time -*/ - .headroom =get_headroom (def), - .form_header =NULL , - .verify_header =NULL , - .header_rxbuffer =NULL , - .header_txbuffer =NULL , - .header_size =0 , - .rx_header_size =0 , - .rexmit_scheduled = false, - .opened = false, - .transport_data =NULL , - .in_write_poll = false, - .coalesce =2 , - .req_size =get_req_size (def), - .in_error = false, - .bpf =NULL - }); +INIT_LIST_HEAD (&vp->list); + vp->dev = dev; + vp->unit = n; + vp->options =get_transport_options (def); + vp->parsed = def; + vp->max_packet =get_mtu (def) +ETH_HEADER_OTHER ; +/* +* TODO - we need to calculate headroom so that ip header +* is 16 byte aligned all the time +*/ + vp->headroom =get_headroom (def); + vp->coalesce =2 ; + vp->req_size =get_req_size (def); dev->features = dev->hw_features = (NETIF_F_SG |NETIF_F_FRAGLIST );INIT_WORK (&vp->reset_tx, vector_reset_tx);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 170/192 ASoC: SOF: Intel: hda: Use devm_kstrdup() to avoid memleak.
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tamura Dai <[email protected]>
[ Upstream commit 6c038b58a2dc5a008c7e7a1297f5aaa4deaaaa7e ]
sof_pdata->tplg_filename can have address allocated by kstrdup() and can be overwritten. Memory leak was detected with kmemleak:
unreferenced object 0xffff88812391ff60 (size 16):
comm "kworker/4:1", pid 161, jiffies 4294802931
hex dump (first 16 bytes):
73 6f 66 2d 68 64 61 2d 67 65 6e 65 72 69 63 00 sof-hda-generic.
backtrace (crc 4bf1675c):
__kmalloc_node_track_caller_noprof+0x49c/0x6b0
kstrdup+0x46/0xc0
hda_machine_select.cold+0x1de/0x12cf [snd_sof_intel_hda_generic]
sof_init_environment+0x16f/0xb50 [snd_sof]
sof_probe_continue+0x45/0x7c0 [snd_sof]
sof_probe_work+0x1e/0x40 [snd_sof]
process_one_work+0x894/0x14b0
worker_thread+0x5e5/0xfb0
kthread+0x39d/0x760
ret_from_fork+0x31/0x70
ret_from_fork_asm+0x1a/0x30--- sound/soc/sof/intel/hda.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/sof/intel/hda.c +3 -3
@@ -1254,11 +1254,11 @@ static int check_tplg_quirk_mask(struct snd_soc_acpi_mach *mach)return 0 ; } -static char *remove_file_ext (const char *tplg_filename) +static char *remove_file_ext (struct device *dev,const char *tplg_filename) {char *filename, *tmp; - filename =kstrdup (tplg_filename,GFP_KERNEL ); + filename =devm_kstrdup (dev, tplg_filename,GFP_KERNEL );if (!filename)return NULL ;
@@ -1342,7 +1342,7 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)*/ if (!sof_pdata->tplg_filename) {/* remove file extension if it exists */ - tplg_filename =remove_file_ext (mach->sof_tplg_filename); + tplg_filename =remove_file_ext (sdev->dev, mach->sof_tplg_filename);if (!tplg_filename)return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 171/192 ASoC: rt721-sdca: fix boost gain calculation error
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Yu <[email protected]>
[ Upstream commit ff21a6ec0f27c126db0a86d96751bd6e5d1d9874 ]
Fix the boost gain calculation error in rt721_sdca_set_gain_get. This patch is specific for "FU33 Boost Volume".
--- sound/soc/codecs/rt721-sdca.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
sound/soc/codecs/rt721-sdca.c +19 -4
@@ -430,6 +430,7 @@ static int rt721_sdca_set_gain_get(struct snd_kcontrol *kcontrol,unsigned int read_l, read_r, ctl_l =0 , ctl_r =0 ;unsigned int adc_vol_flag =0 ;const unsigned int interval_offset =0xc0 ; +const unsigned int tendA =0x200 ;const unsigned int tendB =0xa00 ; if (strstr(ucontrol->id.name, "FU1E Capture Volume") ||
@@ -439,9 +440,16 @@ static int rt721_sdca_set_gain_get(struct snd_kcontrol *kcontrol,regmap_read (rt721->mbq_regmap, mc->reg, &read_l);regmap_read (rt721->mbq_regmap, mc->rreg, &read_r); -if (mc->shift ==8 )/* boost gain */ +if (mc->shift ==8 ) { +/* boost gain */ ctl_l = read_l / tendB; -else { + }else if (mc->shift ==1 ) { +/* FU33 boost gain */ +if (read_l ==0x8000 || read_l ==0xfe00 ) + ctl_l =0 ; +else + ctl_l = read_l / tendA +1 ; + }else {if (adc_vol_flag) ctl_l = mc->max - (((0x1e00 - read_l) &0xffff ) / interval_offset);else
@@ -449,9 +457,16 @@ static int rt721_sdca_set_gain_get(struct snd_kcontrol *kcontrol, }if (read_l != read_r) { -if (mc->shift ==8 )/* boost gain */ +if (mc->shift ==8 ) { +/* boost gain */ ctl_r = read_r / tendB; -else {/* ADC/DAC gain */ + }else if (mc->shift ==1 ) { +/* FU33 boost gain */ +if (read_r ==0x8000 || read_r ==0xfe00 ) + ctl_r =0 ; +else + ctl_r = read_r / tendA +1 ; + }else {/* ADC/DAC gain */ if (adc_vol_flag) ctl_r = mc->max - (((0x1e00 - read_r) &0xffff ) / interval_offset);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 172/192 ALSA: hda/realtek: Add mic-mute LED setup for ASUS UM5606
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 41c66461cb2e8d3934a5395f27e572ebe63696b4 ]
ASUS UM5606* models use the quirk to set up the bass speakers, but it missed the mic-mute LED configuration. Other similar models have the AMD ACP dmic, and the mic-mute is set up for that, but those models don't have AMD ACP but rather built-in mics of Realtek codec, hence the Realtek driver should set it up, instead.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -6609,6 +6609,7 @@ static void alc294_fixup_bass_speaker_15(struct hda_codec *codec,if (action ==HDA_FIXUP_ACT_PRE_PROBE ) {static const hda_nid_t conn[] = {0x02 ,0x03 };snd_hda_override_conn_list (codec,0x15 ,ARRAY_SIZE (conn), conn); +snd_hda_gen_add_micmute_led_cdev (codec,NULL ); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 173/192 ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook 6 G1a
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Chiu <[email protected]>
[ Upstream commit 9a07ca9a4015f8f71e2b594ee76ac55483babd89 ]
HP EliteBook 6 G1a laptops use ALC236 codec and need the fixup ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF to make the mic/micmute LEDs work.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -10886,7 +10886,9 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x8def ,"HP EliteBook 660 G12" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8df0 ,"HP EliteBook 630 G12" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8df1 ,"HP EliteBook 630 G12" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8dfb ,"HP EliteBook 6 G1a 14" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8dfc ,"HP EliteBook 645 G12" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8dfd ,"HP EliteBook 6 G1a 16" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8dfe ,"HP EliteBook 665 G12" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8e11 ,"HP Trekker" ,ALC287_FIXUP_CS35L41_I2C_2 ), SND_PCI_QUIRK(0x103c, 0x8e12, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 174/192 io_uring: make fallocate be hashed work
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fengnan Chang <[email protected]>
[ Upstream commit 88a80066af1617fab444776135d840467414beb6 ]
Like ftruncate and write, fallocate operations on the same file cannot be executed in parallel, so it is better to make fallocate be hashed work.
--- io_uring/opdef.c | 1 + 1 file changed, 1 insertion(+)
io_uring/opdef.c +1 -0
@@ -216,6 +216,7 @@ const struct io_issue_def io_issue_defs[] = { }, [IORING_OP_FALLOCATE] = { .needs_file = 1, + .hash_reg_file = 1, .prep = io_fallocate_prep, .issue = io_fallocate, },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 175/192 ASoC: amd: yc: add quirk for Acer Nitro ANV15-41 internal mic
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuzuru10 <[email protected]>
[ Upstream commit 7186b81807b4a08f8bf834b6bdc72d6ed8ba1587 ]
This patch adds DMI-based quirk for the Acer Nitro ANV15-41, allowing the internal microphone to be detected correctly on machines with "RB" as board vendor.
--- sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+)
sound/soc/amd/yc/acp6x-mach.c +7 -0
@@ -346,6 +346,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"), } }, + { + .driver_data = &acp6x_card, + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"RB" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Nitro ANV15-41"), + } + }, { .driver_data = &acp6x_card, .matches = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 176/192 ALSA: hda/realtek - Enable mute LED on HP Pavilion Laptop 15-eg100
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yasmin Fitzgerald <[email protected]>
[ Upstream commit 68cc9d3c8e44afe90e43cbbd2960da15c2f31e23 ]
The HP Pavilion Laptop 15-eg100 has Realtek HDA codec ALC287. It needs the ALC287_FIXUP_HP_GPIO_LED quirk to enable the mute LED.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10715,6 +10715,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x8975 ,"HP EliteBook x360 840 Aero G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x897d ,"HP mt440 Mobile Thin Client U74" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8981 ,"HP Elite Dragonfly G3" ,ALC245_FIXUP_CS35L41_SPI_4 ), +SND_PCI_QUIRK (0x103c ,0x898a ,"HP Pavilion 15-eg100" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x898e ,"HP EliteBook 835 G9" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x103c ,0x898f ,"HP EliteBook 835 G9" ,ALC287_FIXUP_CS35L41_I2C_2 ), SND_PCI_QUIRK(0x103c, 0x8991, "HP EliteBook 845 G9", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 177/192 ALSA: hda/realtek: Add quirks for some Clevo laptops
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tim Crawford <[email protected]>
[ Upstream commit e41687b511d5e5437db5d2151e23c115dba30411 ]
Add audio quirks to fix speaker output and headset detection on the following Clevo models:
- V350ENC
- V350WNPQ
- V540TU
- X560WNR
- X580WNS
--- sound/pci/hda/patch_realtek.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/pci/hda/patch_realtek.c +5 -0
@@ -2656,6 +2656,7 @@ static const struct hda_quirk alc882_fixup_tbl[] = {SND_PCI_QUIRK (0x147b ,0x107a ,"Abit AW9D-MAX" ,ALC882_FIXUP_ABIT_AW9D_MAX ),SND_PCI_QUIRK (0x1558 ,0x3702 ,"Clevo X370SN[VW]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x50d3 ,"Clevo PC50[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x5802 ,"Clevo X58[05]WN[RST]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65d1 ,"Clevo PB51[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x65d2 ,"Clevo PB51R[CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x65e1, "Clevo PB51[ED][DF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS),
@@ -11117,6 +11118,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1558 ,0x14a1 ,"Clevo L141MU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x2624 ,"Clevo L240TU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x28c1 ,"Clevo V370VND" ,ALC2XX_FIXUP_HEADSET_MIC ), +SND_PCI_QUIRK (0x1558 ,0x35a1 ,"Clevo V3[56]0EN[CDE]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x35b1 ,"Clevo V3[57]0WN[MNP]Q" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x4018 ,"Clevo NV40M[BE]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x4019 ,"Clevo NV40MZ" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x4020, "Clevo NV40MB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -11144,6 +11147,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1558 ,0x51b1 ,"Clevo NS50AU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x51b3 ,"Clevo NS70AU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x5630 ,"Clevo NP50RNJS" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x5700 ,"Clevo X560WN[RST]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x70a1 ,"Clevo NB70T[HJK]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x70b3 ,"Clevo NK70SB" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x70f2, "Clevo NH79EPY", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
@@ -11183,6 +11187,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1558 ,0xa650 ,"Clevo NP[567]0SN[CD]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xa671 ,"Clevo NP70SN[CDE]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xa741 ,"Clevo V54x_6x_TNE" ,ALC245_FIXUP_CLEVO_NOISY_MIC ), +SND_PCI_QUIRK (0x1558 ,0xa743 ,"Clevo V54x_6x_TU" ,ALC245_FIXUP_CLEVO_NOISY_MIC ),SND_PCI_QUIRK (0x1558 ,0xa763 ,"Clevo V54x_6x_TU" ,ALC245_FIXUP_CLEVO_NOISY_MIC ),SND_PCI_QUIRK (0x1558 ,0xb018 ,"Clevo NP50D[BE]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0xb019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 178/192 net: usb: qmi_wwan: add SIMCom 8230C composition
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaowei Li <[email protected]>
[ Upstream commit 0b39b055b5b48cbbdf5746a1ca6e3f6b0221e537 ]
Add support for SIMCom 8230C which is based on Qualcomm SDX35 chip. 0x9071: tty (DM) + tty (NMEA) + tty (AT) + rmnet
T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=02 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1e0e ProdID=9071 Rev= 5.15 S: Manufacturer=SIMCOM S: Product=SDXBAAGHA-IDP _SN:D744C4C5 S: SerialNumber=0123456789ABCDEF C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=86(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=none E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1426,6 +1426,7 @@ static const struct usb_device_id products[] = { {QMI_QUIRK_SET_DTR(0x22de, 0x9051, 2)}, /* Hucom Wireless HM-211S/K */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ + {QMI_QUIRK_SET_DTR(0x1e0e, 0x9071, 3)}, /* SIMCom 8230C ++ */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 179/192 driver: bluetooth: hci_qca:fix unable to load the BT driver
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuai Zhang <[email protected]>
[ Upstream commit db0ff7e15923ffa7067874604ca275e92343f1b1 ]
Some modules have BT_EN enabled via a hardware pull-up, meaning it is not defined in the DTS and is not controlled through the power sequence. In such cases, fall through to follow the legacy flow.
--- drivers/bluetooth/hci_qca.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/bluetooth/hci_qca.c +10 -3
@@ -2392,10 +2392,17 @@ static int qca_serdev_probe(struct serdev_device *serdev)*/ qcadev->bt_power->pwrseq =devm_pwrseq_get (&serdev->dev,"bluetooth" ); -if (IS_ERR (qcadev->bt_power->pwrseq)) -return PTR_ERR (qcadev->bt_power->pwrseq); -break ; +/* +* Some modules have BT_EN enabled via a hardware pull-up, +* meaning it is not defined in the DTS and is not controlled +* through the power sequence. In such cases, fall through +* to follow the legacy flow. +*/ +if (IS_ERR (qcadev->bt_power->pwrseq)) + qcadev->bt_power->pwrseq =NULL ; +else +break ; } fallthrough;case QCA_WCN3950 :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 180/192 HID: lenovo: Add support for ThinkPad X1 Tablet Thin Keyboard Gen2
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akira Inoue <[email protected]>
[ Upstream commit a8905238c3bbe13db90065ed74682418f23830c3 ]
Add "Thinkpad X1 Tablet Gen 2 Keyboard" PID to hid-lenovo driver to fix trackpoint not working issue.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-lenovo.c | 8 ++++++++ drivers/hid/hid-multitouch.c | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-)
drivers/hid/hid-ids.h +1 -0
@@ -818,6 +818,7 @@#define USB_DEVICE_ID_LENOVO_TPPRODOCK 0x6067#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085#define USB_DEVICE_ID_LENOVO_X1_TAB 0x60a3 +#define USB_DEVICE_ID_LENOVO_X1_TAB2 0x60a4#define USB_DEVICE_ID_LENOVO_X1_TAB3 0x60b5#define USB_DEVICE_ID_LENOVO_X12_TAB 0x60fe#define USB_DEVICE_ID_LENOVO_X12_TAB2 0x61ae
drivers/hid/hid-lenovo.c +8 -0
@@ -492,6 +492,7 @@ static int lenovo_input_mapping(struct hid_device *hdev,case USB_DEVICE_ID_LENOVO_X12_TAB :case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 :return lenovo_input_mapping_x1_tab_kbd (hdev, hi, field, usage, bit, max);default :
@@ -608,6 +609,7 @@ static ssize_t attr_fn_lock_store(struct device *dev,case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_TP10UBKBD :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 : ret =lenovo_led_set_tp10ubkbd (hdev,TP10UBKBD_FN_LOCK_LED , value);if (ret)
@@ -864,6 +866,7 @@ static int lenovo_event(struct hid_device *hdev, struct hid_field *field,case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_TP10UBKBD :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 :return lenovo_event_tp10ubkbd (hdev, field, usage, value);default :
@@ -1147,6 +1150,7 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_TP10UBKBD :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 : ret =lenovo_led_set_tp10ubkbd (hdev, tp10ubkbd_led[led_nr], value);break ;
@@ -1387,6 +1391,7 @@ static int lenovo_probe(struct hid_device *hdev,case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_TP10UBKBD :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 : ret =lenovo_probe_tp10ubkbd (hdev);break ;
@@ -1476,6 +1481,7 @@ static void lenovo_remove(struct hid_device *hdev)case USB_DEVICE_ID_LENOVO_X12_TAB2 :case USB_DEVICE_ID_LENOVO_TP10UBKBD :case USB_DEVICE_ID_LENOVO_X1_TAB : +case USB_DEVICE_ID_LENOVO_X1_TAB2 :case USB_DEVICE_ID_LENOVO_X1_TAB3 :lenovo_remove_tp10ubkbd (hdev);break ;
@@ -1526,6 +1532,8 @@ static const struct hid_device_id lenovo_devices[] = {*/ {HID_DEVICE (BUS_USB ,HID_GROUP_GENERIC , USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB2) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_TAB3) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
drivers/hid/hid-multitouch.c +7 -1
@@ -2122,12 +2122,18 @@ static const struct hid_device_id mt_devices[] = { HID_DEVICE(BUS_I2C, HID_GROUP_GENERIC, USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_7010) }, -/* Lenovo X1 TAB Gen 2 */ +/* Lenovo X1 TAB Gen 1 */ { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,HID_DEVICE (BUS_USB ,HID_GROUP_MULTITOUCH_WIN_8 ,USB_VENDOR_ID_LENOVO , USB_DEVICE_ID_LENOVO_X1_TAB) }, + /* Lenovo X1 TAB Gen 2 */ + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, +HID_DEVICE (BUS_USB ,HID_GROUP_MULTITOUCH_WIN_8 , +USB_VENDOR_ID_LENOVO , + USB_DEVICE_ID_LENOVO_X1_TAB2) }, + /* Lenovo X1 TAB Gen 3 */ { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 181/192 net: mana: Record doorbell physical address in PF mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Long Li <[email protected]>
[ Upstream commit e0fca6f2cebff539e9317a15a37dcf432e3b851a ]
MANA supports RDMA in PF mode. The driver should record the doorbell physical address when in PF mode.
The doorbell physical address is used by the RDMA driver to map doorbell pages of the device to user-mode applications through RDMA verbs interface. In the past, they have been mapped to user-mode while the device is in VF mode. With the support for PF mode implemented, also expose those pages in PF mode.
Support for PF mode is implemented in290e5d3c49f6 ("net: mana: Add support for Multi Vports on Bare metal")
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/microsoft/mana/gdma_main.c +3 -0
@@ -31,6 +31,9 @@ static void mana_gd_init_pf_regs(struct pci_dev *pdev) gc->db_page_base = gc->bar0_va +mana_gd_r64 (gc,GDMA_PF_REG_DB_PAGE_OFF ); + gc->phys_db_page_base = gc->bar0_pa + +mana_gd_r64 (gc,GDMA_PF_REG_DB_PAGE_OFF ); + sriov_base_off =mana_gd_r64 (gc,GDMA_SRIOV_REG_CFG_BASE_OFF ); sriov_base_va = gc->bar0_va + sriov_base_off;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 182/192 btrfs: fix assertion when building free space tree
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 1961d20f6fa8903266ed9bd77c691924c22c8f02 ]
When building the free space tree with the block group tree feature enabled, we can hit an assertion failure like this:
BTRFS info (device loop0 state M): rebuilding free space tree assertion failed: ret == 0, in fs/btrfs/free-space-tree.c:1102
------------[ cut here ]------------ kernel BUG at fs/btrfs/free-space-tree.c:1102! Internal error: Oops - BUG: 00000000f2000800 [#1] SMP Modules linked in: CPU: 1 UID: 0 PID: 6592 Comm: syz-executor322 Not tainted 6.15.0-rc7-syzkaller-gd7fa1af5b33e #0 PREEMPT Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : populate_free_space_tree+0x514/0x518 fs/btrfs/free-space-tree.c:1102 lr : populate_free_space_tree+0x514/0x518 fs/btrfs/free-space-tree.c:1102 sp : ffff8000a4ce7600 x29: ffff8000a4ce76e0 x28: ffff0000c9bc6000 x27: ffff0000ddfff3d8 x26: ffff0000ddfff378 x25: dfff800000000000 x24: 0000000000000001 x23: ffff8000a4ce7660 x22: ffff70001499cecc x21: ffff0000e1d8c160 x20: ffff0000e1cb7800 x19: ffff0000e1d8c0b0 x18: 00000000ffffffff x17: ffff800092f39000 x16: ffff80008ad27e48 x15: ffff700011e740c0 x14: 1ffff00011e740c0 x13: 0000000000000004 x12: ffffffffffffffff x11: ffff700011e740c0 x10: 0000000000ff0100 x9 : 94ef24f55d2dbc00 x8 : 94ef24f55d2dbc00 x7 : 0000000000000001 x6 : 0000000000000001 x5 : ffff8000a4ce6f98 x4 : ffff80008f415ba0 x3 : ffff800080548ef0 x2 : 0000000000000000 x1 : 0000000100000000 x0 : 000000000000003e Call trace: populate_free_space_tree+0x514/0x518 fs/btrfs/free-space-tree.c:1102 (P) btrfs_rebuild_free_space_tree+0x14c/0x54c fs/btrfs/free-space-tree.c:1337 btrfs_start_pre_rw_mount+0xa78/0xe10 fs/btrfs/disk-io.c:3074 btrfs_remount_rw fs/btrfs/super.c:1319 [inline] btrfs_reconfigure+0x828/0x2418 fs/btrfs/super.c:1543 reconfigure_super+0x1d4/0x6f0 fs/super.c:1083 do_remount fs/namespace.c:3365 [inline] path_mount+0xb34/0xde0 fs/namespace.c:4200 do_mount fs/namespace.c:4221 [inline] __do_sys_mount fs/namespace.c:4432 [inline] __se_sys_mount fs/namespace.c:4409 [inline] __arm64_sys_mount+0x3e8/0x468 fs/namespace.c:4409 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 el0_svc+0x58/0x17c arch/arm64/kernel/entry-common.c:767 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 Code: f0047182 91178042 528089c3 9771d47b (d4210000) ---[ end trace 0000000000000000 ]---
This happens because we are processing an empty block group, which has no extents allocated from it, there are no items for this block group, including the block group item since block group items are stored in a dedicated tree when using the block group tree feature. It also means this is the block group with the highest start offset, so there are no higher keys in the extent root, hence btrfs_search_slot_for_read() returns 1 (no higher key found).
Fix this by asserting 'ret' is 0 only if the block group tree feature is not enabled, in which case we should find a block group item for the block group since it's stored in the extent root and block group item keys are greater than extent item keys (the value for BTRFS_BLOCK_GROUP_ITEM_KEY is 192 and for BTRFS_EXTENT_ITEM_KEY and BTRFS_METADATA_ITEM_KEY the values are 168 and 169 respectively). In case 'ret' is 1, we just need to add a record to the free space tree which spans the whole block group, and we can achieve this by making 'ret == 0' as the while loop's condition.
--- fs/btrfs/free-space-tree.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
fs/btrfs/free-space-tree.c +12 -4
@@ -1099,11 +1099,21 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans, ret =btrfs_search_slot_for_read (extent_root, &key, path,1 ,0 );if (ret <0 ) goto out_locked; -ASSERT (ret ==0 ); +/* +* If ret is 1 (no key found), it means this is an empty block group, +* without any extents allocated from it and there's no block group +* item (key BTRFS_BLOCK_GROUP_ITEM_KEY) located in the extent tree +* because we are using the block group tree feature, so block group +* items are stored in the block group tree. It also means there are no +* extents allocated for block groups with a start offset beyond this +* block group's end offset (this is the last, highest, block group). +*/ +if (!btrfs_fs_compat_ro (trans->fs_info,BLOCK_GROUP_TREE )) +ASSERT (ret ==0 ); start = block_group->start; end = block_group->start + block_group->length; -while (1 ) { +while (ret ==0 ) {btrfs_item_key_to_cpu (path->nodes[0 ], &key, path->slots[0 ]); if (key.type == BTRFS_EXTENT_ITEM_KEY ||
@@ -1133,8 +1143,6 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans, ret =btrfs_next_item (extent_root, path);if (ret <0 ) goto out_locked; -if (ret) -break ; }if (start < end) { ret = __add_to_free_space_tree(trans, block_group, path2,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 183/192 vt: add missing notification when switching back to text mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Pitre <[email protected]>
[ Upstream commit ff78538e07fa284ce08cbbcb0730daa91ed16722 ]
Programs using poll() on /dev/vcsa to be notified when VT changes occur were missing one case: the switch from gfx to text mode.
--- drivers/tty/vt/vt.c | 1 + 1 file changed, 1 insertion(+)
drivers/tty/vt/vt.c +1 -0
@@ -4566,6 +4566,7 @@ void do_unblank_screen(int leaving_gfx)set_palette (vc);set_cursor (vc);vt_event_post (VT_EVENT_UNBLANK , vc->vc_num, vc->vc_num); +notify_update (vc); }EXPORT_SYMBOL (do_unblank_screen);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 184/192 bpf: Adjust free target to avoid global starvation of LRU map
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
[ Upstream commit d4adf1c9ee7722545450608bcb095fb31512f0c6 ]
BPF_MAP_TYPE_LRU_HASH can recycle most recent elements well before the map is full, due to percpu reservations and force shrink before neighbor stealing. Once a CPU is unable to borrow from the global map, it will once steal one elem from a neighbor and after that each time flush this one element to the global list and immediately recycle it.
Batch value LOCAL_FREE_TARGET (128) will exhaust a 10K element map with 79 CPUs. CPU 79 will observe this behavior even while its neighbors hold 78 * 127 + 1 * 15 == 9921 free elements (99%).
CPUs need not be active concurrently. The issue can appear with affinity migration, e.g., irqbalance. Each CPU can reserve and then hold onto its 128 elements indefinitely.
Avoid global list exhaustion by limiting aggregate percpu caches to half of map size, by adjusting LOCAL_FREE_TARGET based on cpu count. This change has no effect on sufficiently large tables.
Similar to LOCAL_NR_SCANS and lru->nr_scans, introduce a map variable lru->free_target. The extra field fits in a hole in struct bpf_lru. The cacheline is already warm where read in the hot path. The field is only accessed with the lru lock held.
--- Documentation/bpf/map_hash.rst | 8 ++- Documentation/bpf/map_lru_hash_update.dot | 6 +- kernel/bpf/bpf_lru_list.c | 9 ++- kernel/bpf/bpf_lru_list.h | 1 + tools/testing/selftests/bpf/test_lru_map.c | 72 +++++++++++----------- 5 files changed, 52 insertions(+), 44 deletions(-)
Documentation/bpf/map_hash.rst +7 -1
@@ -233,10 +233,16 @@ attempts in order to enforce the LRU property which have increasing impacts on other CPUs involved in the following operation attempts: - Attempt to use CPU-local state to batch operations -- Attempt to fetch free nodes from global lists +- Attempt to fetch ``target_free`` free nodes from global lists - Attempt to pull any node from a global list and remove it from the hashmap - Attempt to pull any node from any CPU's list and remove it from the hashmap +The number of nodes to borrow from the global list in a batch, ``target_free``, +depends on the size of the map. Larger batch size reduces lock contention, but +may also exhaust the global structure. The value is computed at map init to +avoid exhaustion, by limiting aggregate reservation by all CPUs to half the map +size. With a minimum of a single element and maximum budget of 128 at a time. + This algorithm is described visually in the following diagram. See the description in commit 3a08c2fd7634 ("bpf: LRU List") for a full explanation of the corresponding operations:
Documentation/bpf/map_lru_hash_update.dot +3 -3
@@ -35,18 +35,18 @@ digraph { fn_bpf_lru_list_pop_free_to_local [shape=rectangle,fillcolor=2, label="Flush local pending, Rotate Global list, move - LOCAL_FREE_TARGET + target_free from global -> local"] // Also corresponds to: // fn__local_list_flush() // fn_bpf_lru_list_rotate() fn___bpf_lru_node_move_to_free[shape=diamond,fillcolor=2, - label="Able to free\nLOCAL_FREE_TARGET\nnodes?"] + label="Able to free\ntarget_free\nnodes?"] fn___bpf_lru_list_shrink_inactive [shape=rectangle,fillcolor=3, label="Shrink inactive list up to remaining - LOCAL_FREE_TARGET + target_free (global LRU -> local)"] fn___bpf_lru_list_shrink [shape=diamond,fillcolor=2, label="> 0 entries in\nlocal free list?"]
kernel/bpf/bpf_lru_list.c +6 -3
@@ -337,12 +337,12 @@ static void bpf_lru_list_pop_free_to_local(struct bpf_lru *lru, list) {__bpf_lru_node_move_to_free (l, node,local_free_list (loc_l),BPF_LRU_LOCAL_LIST_T_FREE ); -if (++nfree ==LOCAL_FREE_TARGET ) +if (++nfree == lru->target_free)break ; } -if (nfree <LOCAL_FREE_TARGET ) -__bpf_lru_list_shrink (lru, l,LOCAL_FREE_TARGET - nfree, +if (nfree < lru->target_free) +__bpf_lru_list_shrink (lru, l, lru->target_free - nfree,local_free_list (loc_l),BPF_LRU_LOCAL_LIST_T_FREE );
@@ -577,6 +577,9 @@ static void bpf_common_lru_populate(struct bpf_lru *lru, void *buf,list_add (&node->list, &l->lists[BPF_LRU_LIST_T_FREE ]); buf += elem_size; } + + lru->target_free =clamp ((nr_elems /num_possible_cpus ()) /2 , +1 ,LOCAL_FREE_TARGET ); } static void bpf_percpu_lru_populate(struct bpf_lru *lru, void *buf,
kernel/bpf/bpf_lru_list.h +1 -0
@@ -58,6 +58,7 @@ struct bpf_lru {del_from_htab_func del_from_htab;void *del_arg;unsigned int hash_offset; +unsigned int target_free;unsigned int nr_scans;bool percpu; };
tools/testing/selftests/bpf/test_lru_map.c +35 -37
156 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 185/192 riscv: vdso: Exclude .rodata from the PT_DYNAMIC segment
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fangrui Song <[email protected]>
[ Upstream commit e0eb1b6b0cd29ca7793c501d5960fd36ba11f110 ]
.rodata is implicitly included in the PT_DYNAMIC segment due to inheriting the segment of the preceding .dynamic section (in both GNU ld and LLD). When the .rodata section's size is not a multiple of 16 bytes on riscv64, llvm-readelf will report a "PT_DYNAMIC dynamic table is invalid" warning. Note: in the presence of the .dynamic section, GNU readelf and llvm-readelf's -d option decodes the dynamic section using the section.
This issue arose after commit 8f8c1ff879fab60f80f3a7aec3000f47e5b03ba9 ("riscv: vdso.lds.S: remove hardcoded 0x800 .text start addr"), which placed .rodata directly after .dynamic by removing .eh_frame.
This patch resolves the implicit inclusion into PT_DYNAMIC by explicitly specifying the :text output section phdr.
--- arch/riscv/kernel/vdso/vdso.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/vdso/vdso.lds.S +1 -1
@@ -30,7 +30,7 @@ SECTIONS *(.data .data.* .gnu.linkonce.d.*) *(.dynbss) *(.bss .bss.* .gnu.linkonce.b.*) - } + } :text .note : { *(.note.*) } :text :note
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 186/192 HID: Add IGNORE quirk for SMARTLINKTECHNOLOGY
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Heng <[email protected]>
[ Upstream commit 1a8953f4f7746c6a515989774fe03047c522c613 ]
MARTLINKTECHNOLOGY is a microphone device, when the HID interface in an audio device is requested to get specific report id, the following error may occur.
[ 562.939373] usb 1-1.4.1.2: new full-speed USB device number 21 using xhci_hcd [ 563.104908] usb 1-1.4.1.2: New USB device found, idVendor=4c4a, idProduct=4155, bcdDevice= 1.00 [ 563.104910] usb 1-1.4.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 563.104911] usb 1-1.4.1.2: Product: USB Composite Device [ 563.104912] usb 1-1.4.1.2: Manufacturer: SmartlinkTechnology [ 563.104913] usb 1-1.4.1.2: SerialNumber: 20201111000001 [ 563.229499] input: SmartlinkTechnology USB Composite Device as /devices/pci0000:00/0000:00:07.1/0000:04:00.3/usb1/1-1/1-1.4/1-1.4.1/1-1.4.1.2/1-1.4.1.2:1.2/0003:4C4A:4155.000F/input/input35 [ 563.291505] hid-generic 0003:4C4A:4155.000F: input,hidraw2: USB HID v2.01 Keyboard [SmartlinkTechnology USB Composite Device] on usb-0000:04:00.3-1.4.1.2/input2 [ 563.291557] usbhid 1-1.4.1.2:1.3: couldn't find an input interrupt endpoint [ 568.506654] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 573.626656] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 578.746657] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 583.866655] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110) [ 588.986657] usb 1-1.4.1.2: 1:1: usb_set_interface failed (-110)
Ignore HID interface. The device is working properly.
--- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-quirks.c | 1 + 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +3 -0
@@ -1525,4 +1525,7 @@#define USB_VENDOR_ID_SIGNOTEC 0x2133#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 +#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a +#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155 +#endif
drivers/hid/hid-quirks.c +1 -0
@@ -904,6 +904,7 @@ static const struct hid_device_id hid_ignore_list[] = {#endif { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, { } };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 187/192 HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP Cameras
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chia-Lin Kao (AceLan) <[email protected]>
[ Upstream commit 54bae4c17c11688339eb73a04fd24203bb6e7494 ]
The Chicony Electronics HP 5MP Cameras (USB ID 04F2:B824 & 04F2:B82C) report a HID sensor interface that is not actually implemented. Attempting to access this non-functional sensor via iio_info causes system hangs as runtime PM tries to wake up an unresponsive sensor.
Add these 2 devices to the HID ignore list since the sensor interface is non-functional by design and should not be exposed to userspace.
--- drivers/hid/hid-ids.h | 2 ++ drivers/hid/hid-quirks.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +2 -0
@@ -311,6 +311,8 @@#define USB_DEVICE_ID_ASUS_AK1D 0x1125#define USB_DEVICE_ID_CHICONY_TOSHIBA_WT10A 0x1408#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421 +#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA 0xb824 +#define USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2 0xb82c#define USB_VENDOR_ID_CHUNGHWAT 0x2247#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001
drivers/hid/hid-quirks.c +2 -0
@@ -757,6 +757,8 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) }, { HID_USB_DEVICE(USB_VENDOR_ID_AXENTIA, USB_DEVICE_ID_AXENTIA_FM_RADIO) }, { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA) }, + { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_HP_5MP_CAMERA2) }, { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) }, { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI4713) },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 188/192 HID: nintendo: avoid bluetooth suspend/resume stalls
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel J. Ogorchock <[email protected]>
[ Upstream commit 4a0381080397e77792a5168069f174d3e56175ff ]
Ensure we don't stall or panic the kernel when using bluetooth-connected controllers. This was reported as an issue on android devices using kernel 6.6 due to the resume hook which had been added for usb joycons.
First, set a new state value to JOYCON_CTLR_STATE_SUSPENDED in a newly-added nintendo_hid_suspend. This makes sure we will not stall out the kernel waiting for input reports during led classdev suspend. The stalls could happen if connectivity is unreliable or lost to the controller prior to suspend.
Second, since we lose connectivity during suspend, do not try joycon_init() for bluetooth controllers in the nintendo_hid_resume path.
Tested via multiple suspend/resume flows when using the controller both in USB and bluetooth modes.
--- drivers/hid/hid-nintendo.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
drivers/hid/hid-nintendo.c +36 -2
@@ -308,6 +308,7 @@ enum joycon_ctlr_state {JOYCON_CTLR_STATE_INIT ,JOYCON_CTLR_STATE_READ ,JOYCON_CTLR_STATE_REMOVED , + JOYCON_CTLR_STATE_SUSPENDED, };/* Controller type received as part of device info */
@@ -2750,14 +2751,46 @@ static void nintendo_hid_remove(struct hid_device *hdev)static int nintendo_hid_resume (struct hid_device *hdev) { -int ret =joycon_init (hdev); +struct joycon_ctlr *ctlr =hid_get_drvdata (hdev); +int ret; + +hid_dbg (hdev,"resume\n" ); +if (!joycon_using_usb (ctlr)) { +hid_dbg (hdev,"no-op resume for bt ctlr\n" ); + ctlr->ctlr_state =JOYCON_CTLR_STATE_READ ; +return 0 ; + } + ret =joycon_init (hdev);if (ret) -hid_err (hdev,"Failed to restore controller after resume" ); +hid_err (hdev, +"Failed to restore controller after resume: %d\n" , + ret); +else + ctlr->ctlr_state =JOYCON_CTLR_STATE_READ ;return ret; } +static int nintendo_hid_suspend (struct hid_device *hdev,pm_message_t message) +{ +struct joycon_ctlr *ctlr =hid_get_drvdata (hdev); + +hid_dbg (hdev,"suspend: %d\n" , message.event); +/* +* Avoid any blocking loops in suspend/resume transitions. +* +* joycon_enforce_subcmd_rate() can result in repeated retries if for +* whatever reason the controller stops providing input reports. +* +* This has been observed with bluetooth controllers which lose +* connectivity prior to suspend (but not long enough to result in +* complete disconnection). +*/ + ctlr->ctlr_state =JOYCON_CTLR_STATE_SUSPENDED ; +return 0 ; +} +#endif static const struct hid_device_id nintendo_hid_devices[] = {
@@ -2796,6 +2829,7 @@ static struct hid_driver nintendo_hid_driver = {#ifdef CONFIG_PM .resume = nintendo_hid_resume, + .suspend = nintendo_hid_suspend,#endif };static int __init nintendo_init (void )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 189/192 selftests/bpf: adapt one more case in test_lru_map to the new target_free
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
commit 5e9388f7984a9cc7e659a105113f6ccf0aebedd0 upstream.
The below commit that updated BPF_MAP_TYPE_LRU_HASH free target, also updated tools/testing/selftests/bpf/test_lru_map to match.
But that missed one case that passes with 4 cores, but fails at higher cpu counts.
Update test_lru_sanity3 to also adjust its expectation of target_free.
This time tested with 1, 4, 16, 64 and 384 cpu count.
--- tools/testing/selftests/bpf/test_lru_map.c | 33 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-)
tools/testing/selftests/bpf/test_lru_map.c +18 -15
@@ -138,6 +138,12 @@ static int sched_next_online(int pid, inreturn ret; } +/* Derive target_free from map_size, same as bpf_common_lru_populate */ +static unsigned int __tgt_size (unsigned int map_size) +{ +return (map_size / nr_cpus) /2 ; +} +/* Inverse of how bpf_common_lru_populate derives target_free from map_size. */ static unsigned int __map_size (unsigned int tgt_free) {
@@ -410,12 +416,12 @@ static void test_lru_sanity2(int map_typprintf ("Pass\n" ); } -/* Size of the LRU map is 2*tgt_free -* It is to test the active/inactive list rotation -* Insert 1 to 2*tgt_free (+2*tgt_free keys) -* Lookup key 1 to tgt_free*3/2 -* Add 1+2*tgt_free to tgt_free*5/2 (+tgt_free/2 keys) -* => key 1+tgt_free*3/2 to 2*tgt_free are removed from LRU +/* Test the active/inactive list rotation +* +* Fill the whole map, deplete the free list. +* Reference all except the last lru->target_free elements. +* Insert lru->target_free new elements. This triggers one shrink. +* Verify that the non-referenced elements are replaced. */ static void test_lru_sanity3 (int map_type,int map_flags,unsigned int tgt_free) {
@@ -434,8 +440,7 @@ static void test_lru_sanity3(int map_typassert (sched_next_online (0 , &next_cpu) !=-1 ); - batch_size = tgt_free /2 ; -assert (batch_size *2 == tgt_free); + batch_size =__tgt_size (tgt_free); map_size = tgt_free *2 ; lru_map_fd =create_map (map_type, map_flags, map_size);
@@ -446,23 +451,21 @@ static void test_lru_sanity3(int map_typ value[0 ] =1234 ; -/* Insert 1 to 2*tgt_free (+2*tgt_free keys) */ - end_key =1 + (2 * tgt_free); +/* Fill the map */ + end_key =1 + map_size;for (key =1 ; key < end_key; key++)assert (!bpf_map_update_elem (lru_map_fd, &key, value,BPF_NOEXIST )); -/* Lookup key 1 to tgt_free*3/2 */ - end_key = tgt_free + batch_size; +/* Reference all but the last batch_size */ + end_key =1 + map_size - batch_size;for (key =1 ; key < end_key; key++) {assert (!bpf_map_lookup_elem_with_ref_bit (lru_map_fd, key, value));assert (!bpf_map_update_elem (expected_map_fd, &key, value,BPF_NOEXIST )); } -/* Add 1+2*tgt_free to tgt_free*5/2 -* (+tgt_free/2 keys) -*/ +/* Insert new batch_size: replaces the non-referenced elements */ key =2 * tgt_free +1 ; end_key = key + batch_size;for (; key < end_key; key++) {
Greg Kroah-Hartman
maintainerPATCH 190/192 net: wangxun: revert the adjustment of the IRQ vector sequence
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiawen Wu <[email protected]>
commit e37546ad1f9b2c777d3a21d7e50ce265ee3dece8 upstream.
Due to hardware limitations of NGBE, queue IRQs can only be requested on vector 0 to 7. When the number of queues is set to the maximum 8, the PCI IRQ vectors are allocated from 0 to 8. The vector 0 is used by MISC interrupt, and althrough the vector 8 is used by queue interrupt, it is unable to receive packets. This will cause some packets to be dropped when RSS is enabled and they are assigned to queue 8.
So revert the adjustment of the MISC IRQ location, to make it be the last one in IRQ vectors.
--- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 16 ++++++++-------- drivers/net/ethernet/wangxun/libwx/wx_type.h | 2 +- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 2 +- drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 2 +- drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 4 ++-- drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-)
drivers/net/ethernet/wangxun/libwx/wx_lib.c +8 -8
@@ -1680,7 +1680,7 @@ static void wx_set_num_queues(struct wx*/ static int wx_acquire_msix_vectors (struct wx *wx) { -struct irq_affinity affd = { .pre_vectors =1 }; +struct irq_affinity affd = { .post_vectors =1 };int nvecs, i;/* We start by asking for one vector per queue pair */
@@ -1717,16 +1717,17 @@ static int wx_acquire_msix_vectors(strucreturn nvecs; } - wx->msix_entry->entry =0 ; - wx->msix_entry->vector =pci_irq_vector (wx->pdev,0 ); nvecs -=1 ;for (i =0 ; i < nvecs; i++) { wx->msix_q_entries[i].entry = i; - wx->msix_q_entries[i].vector =pci_irq_vector (wx->pdev, i +1 ); + wx->msix_q_entries[i].vector =pci_irq_vector (wx->pdev, i); } wx->num_q_vectors = nvecs; + wx->msix_entry->entry = nvecs; + wx->msix_entry->vector =pci_irq_vector (wx->pdev, nvecs); +return 0 ; }
@@ -2182,7 +2183,6 @@ static void wx_set_ivar(struct wx *wx, swr32 (wx,WX_PX_MISC_IVAR , ivar); }else {/* tx or rx causes */ - msix_vector +=1 ;/* offset for queue vectors */ msix_vector |=WX_PX_IVAR_ALLOC_VAL ; index = ((16 * (queue &1 )) + (8 * direction)); ivar =rd32 (wx,WX_PX_IVAR (queue >>1 ));
@@ -2220,7 +2220,7 @@ void wx_write_eitr(struct wx_q_vector *q itr_reg |=WX_PX_ITR_CNT_WDIS ; -wr32 (wx,WX_PX_ITR (v_idx +1 ), itr_reg); +wr32 (wx,WX_PX_ITR (v_idx), itr_reg); }/**
@@ -2266,9 +2266,9 @@ void wx_configure_vectors(struct wx *wx)wx_write_eitr (q_vector); } -wx_set_ivar (wx,-1 ,0 ,0 ); +wx_set_ivar (wx,-1 ,0 , v_idx);if (pdev->msix_enabled) -wr32 (wx,WX_PX_ITR (0 ),1950 ); +wr32 (wx,WX_PX_ITR (v_idx),1950 ); }EXPORT_SYMBOL (wx_configure_vectors);
drivers/net/ethernet/wangxun/libwx/wx_type.h +1 -1
@@ -1242,7 +1242,7 @@ struct wx { };#define WX_INTR_ALL (~0ULL) -#define WX_INTR_Q (i) BIT((i) + 1) +#define WX_INTR_Q (i) BIT((i))/* register operations */ #define wr32 (a, reg, value) writel((value), ((a)->hw_addr + (reg)))
drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +1 -1
@@ -155,7 +155,7 @@ static void ngbe_irq_enable(struct wx *wif (queues)wx_intr_enable (wx,NGBE_INTR_ALL );else -wx_intr_enable (wx,NGBE_INTR_MISC ); +wx_intr_enable (wx,NGBE_INTR_MISC (wx)); }/**
drivers/net/ethernet/wangxun/ngbe/ngbe_type.h +1 -1
@@ -85,7 +85,7 @@#define NGBE_PX_MISC_IC_TIMESYNC BIT(11)/* time sync */ #define NGBE_INTR_ALL 0x1FF -#define NGBE_INTR_MISC BIT(0) +#define NGBE_INTR_MISC (A ) BIT((A)->num_q_vectors)#define NGBE_PHY_CONFIG (reg_offset) (0x14000 + ((reg_offset) * 4))#define NGBE_CFG_LAN_SPEED 0x14440
drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c +2 -2
@@ -21,7 +21,7 @@ void txgbe_irq_enable(struct wx *wx, boowr32 (wx,WX_PX_MISC_IEN ,TXGBE_PX_MISC_IEN_MASK );/* unmask interrupt */ -wx_intr_enable (wx,TXGBE_INTR_MISC ); +wx_intr_enable (wx,TXGBE_INTR_MISC (wx));if (queues)wx_intr_enable (wx,TXGBE_INTR_QALL (wx)); }
@@ -147,7 +147,7 @@ static irqreturn_t txgbe_misc_irq_thread nhandled++; } -wx_intr_enable (wx,TXGBE_INTR_MISC ); +wx_intr_enable (wx,TXGBE_INTR_MISC (wx));return (nhandled >0 ?IRQ_HANDLED :IRQ_NONE ); }
drivers/net/ethernet/wangxun/txgbe/txgbe_type.h +2 -2
@@ -280,8 +280,8 @@ struct txgbe_fdir_filter {#define TXGBE_DEFAULT_RX_WORK 128#endif -#define TXGBE_INTR_MISC BIT(0) -#define TXGBE_INTR_QALL (A ) GENMASK((A)->num_q_vectors, 1) +#define TXGBE_INTR_MISC (A ) BIT((A)->num_q_vectors) +#define TXGBE_INTR_QALL (A ) (TXGBE_INTR_MISC(A) - 1)#define TXGBE_MAX_EITR GENMASK(11, 3)
Greg Kroah-Hartman
maintainerPATCH 191/192 x86/sev: Use TSC_FACTOR for Secure TSC frequency calculation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikunj A Dadhania <[email protected]>
commit 52e1a03e6cf61ae165f59f41c44394a653a0a788 upstream.
When using Secure TSC, the GUEST_TSC_FREQ MSR reports a frequency based on the nominal P0 frequency, which deviates slightly (typically ~0.2%) from the actual mean TSC frequency due to clocking parameters.
Over extended VM uptime, this discrepancy accumulates, causing clock skew between the hypervisor and a SEV-SNP VM, leading to early timer interrupts as perceived by the guest.
The guest kernel relies on the reported nominal frequency for TSC-based timekeeping, while the actual frequency set during SNP_LAUNCH_START may differ. This mismatch results in inaccurate time calculations, causing the guest to perceive hrtimers as firing earlier than expected.
Utilize the TSC_FACTOR from the SEV firmware's secrets page (see "Secrets Page Format" in the SNP Firmware ABI Specification) to calculate the mean TSC frequency, ensuring accurate timekeeping and mitigating clock skew in SEV-SNP VMs.
Use early_ioremap_encrypted() to map the secrets page as ioremap_encrypted() uses kmalloc() which is not available during early TSC initialization and causes a panic.
[ bp: Drop the silly dummy var:
https://lore.kernel.org/r/20250630192726.GBaGLlHl84xIopx4Pt@fat_crate.local ]
--- arch/x86/coco/sev/core.c | 22 +++++++++++++++++++--- arch/x86/include/asm/sev.h | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-)
arch/x86/coco/sev/core.c +19 -3
@@ -103,7 +103,7 @@ static u64 secrets_pa __ro_after_init;*/ static u64 snp_tsc_scale__ro_after_init ;static u64 snp_tsc_offset__ro_after_init ; -static u64 snp_tsc_freq_khz__ro_after_init ; +static unsigned long snp_tsc_freq_khz__ro_after_init ;/* #VC handler runtime per-CPU data */ struct sev_es_runtime_data {
@@ -3347,15 +3347,31 @@ static unsigned long securetsc_get_tsc_kvoid __init snp_secure_tsc_init (void ) { -unsigned long long tsc_freq_mhz; +struct snp_secrets_page *secrets; +unsigned long tsc_freq_mhz; +void *mem;if (!cc_platform_has (CC_ATTR_GUEST_SNP_SECURE_TSC ))return ; + mem =early_memremap_encrypted (secrets_pa,PAGE_SIZE ); +if (!mem) { +pr_err ("Unable to get TSC_FACTOR: failed to map the SNP secrets page.\n" ); +sev_es_terminate (SEV_TERM_SET_LINUX ,GHCB_TERM_SECURE_TSC ); + } + + secrets = (__force struct snp_secrets_page *)mem; +setup_force_cpu_cap (X86_FEATURE_TSC_KNOWN_FREQ );rdmsrl (MSR_AMD64_GUEST_TSC_FREQ , tsc_freq_mhz); - snp_tsc_freq_khz = (unsigned long )(tsc_freq_mhz *1000 ); + +/* Extract the GUEST TSC MHZ from BIT[17:0], rest is reserved space */ + tsc_freq_mhz &=GENMASK_ULL (17 ,0 ); + + snp_tsc_freq_khz =SNP_SCALE_TSC_FREQ (tsc_freq_mhz *1000 , secrets->tsc_factor); x86_platform.calibrate_cpu = securetsc_get_tsc_khz; x86_platform.calibrate_tsc = securetsc_get_tsc_khz; + +early_memunmap (mem,PAGE_SIZE ); }
arch/x86/include/asm/sev.h +16 -1
@@ -192,6 +192,18 @@ struct snp_tsc_info_resp {u8 rsvd2[100 ]; } __packed; +/* +* Obtain the mean TSC frequency by decreasing the nominal TSC frequency with +* TSC_FACTOR as documented in the SNP Firmware ABI specification: +* +* GUEST_TSC_FREQ * (1 - (TSC_FACTOR * 0.00001)) +* +* which is equivalent to: +* +* GUEST_TSC_FREQ -= (GUEST_TSC_FREQ * TSC_FACTOR) / 100000; +*/ +#define SNP_SCALE_TSC_FREQ (freq, factor) ((freq) - (freq) * (factor) / 100000) +struct snp_guest_req {void *req_buf;size_t req_sz;
@@ -251,8 +263,11 @@ struct snp_secrets_page {u8 svsm_guest_vmpl;u8 rsvd3[3 ]; +/* The percentage decrease from nominal to mean TSC frequency. */ +u32 tsc_factor; +/* Remainder of page */ -u8 rsvd4[3744 ]; +u8 rsvd4[3740 ]; } __packed;struct snp_msg_desc {
Greg Kroah-Hartman
maintainerPATCH 192/192 ksmbd: fix potential use-after-free in oplock/lease break ack
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit 50f930db22365738d9387c974416f38a06e8057e upstream.
If ksmbd_iov_pin_rsp return error, use-after-free can happen by accessing opinfo->state and opinfo_put and ksmbd_fd_put could called twice.
--- fs/smb/server/smb2pdu.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-)
fs/smb/server/smb2pdu.c +9 -20
@@ -8535,11 +8535,6 @@ static void smb20_oplock_break_ack(struc goto err_out; } - opinfo->op_state =OPLOCK_STATE_NONE ; -wake_up_interruptible_all (&opinfo->oplock_q); -opinfo_put (opinfo); -ksmbd_fd_put (work, fp); - rsp->StructureSize =cpu_to_le16 (24 ); rsp->OplockLevel = rsp_oplevel; rsp->Reserved =0 ;
@@ -8547,16 +8542,15 @@ static void smb20_oplock_break_ack(struc rsp->VolatileFid = volatile_id; rsp->PersistentFid = persistent_id; ret =ksmbd_iov_pin_rsp (work, rsp,sizeof (struct smb2_oplock_break )); -if (!ret) -return ; - +if (ret) { err_out: +smb2_set_err_rsp (work); + } + opinfo->op_state =OPLOCK_STATE_NONE ;wake_up_interruptible_all (&opinfo->oplock_q); -opinfo_put (opinfo);ksmbd_fd_put (work, fp); -smb2_set_err_rsp (work); }static int check_lease_state (struct lease *lease,__le32 req_state)
@@ -8686,11 +8680,6 @@ static void smb21_lease_break_ack(struct } lease_state = lease->state; - opinfo->op_state =OPLOCK_STATE_NONE ; -wake_up_interruptible_all (&opinfo->oplock_q); -atomic_dec (&opinfo->breaking_cnt); -wake_up_interruptible_all (&opinfo->oplock_brk); -opinfo_put (opinfo); rsp->StructureSize =cpu_to_le16 (36 ); rsp->Reserved =0 ;
@@ -8699,16 +8688,16 @@ static void smb21_lease_break_ack(struct rsp->LeaseState = lease_state; rsp->LeaseDuration =0 ; ret =ksmbd_iov_pin_rsp (work, rsp,sizeof (struct smb2_lease_ack )); -if (!ret) -return ; - +if (ret) { err_out: +smb2_set_err_rsp (work); + } + + opinfo->op_state =OPLOCK_STATE_NONE ;wake_up_interruptible_all (&opinfo->oplock_q);atomic_dec (&opinfo->breaking_cnt);wake_up_interruptible_all (&opinfo->oplock_brk); -opinfo_put (opinfo); -smb2_set_err_rsp (work); }/**
Hi
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
Quoted 8 lines · On Tue, 15 Jul 2025 15:11:35 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
Boot-tested under QEMU for Rust x86_64, arm64 and riscv64; built-tested for loongarch64:
Thanks!
Cheers,
Miguel
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
6.15.7-rc1 tested.
Build successfully completed.
Boot successfully completed.
No dmesg regressions.
Video output normal.
Sound output normal.
Lenovo ThinkPad X1 Carbon Gen10(Intel i7-1260P(x86_64) arch linux)
[ 0.000000] Linux version 6.15.7-rc1rv-ge6001d5f7944
(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 15.1.1 20250425, GNU ld (GNU Binutils) 2.44.0) #1 SMP PREEMPT_DYNAMIC Wed Jul 16 05:56:57 JST 2025
Thanks
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Thanks, build-tested on all Alpine Linux architectures and boot-tested on x86_64. No issues noticed.
AMD Ryzen 5 5600 6-Core Processor:
https://www.inet.se/produkt/5304697/amd-ryzen-5-5600-3-5-ghz-35mb on a
https://www.gigabyte.com/Motherboard/B550-AORUS-ELITE-V2-rev-12
https://www.inet.se/produkt/1903406/gigabyte-b550-aorus-elite-v2
motherboard :)
running Arch Linux with the testing repos enabled:
https://archlinux.org/ https://archboot.com/
https://wiki.archlinux.org/title/Arch_Testing_Team
Den tis 15 juli 2025 kl 23:09 skrev Greg Kroah-Hartman <[email protected]>:
Quoted 813 lines
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 6.15.7-rc1Namjae Jeon <[email protected]>
ksmbd: fix potential use-after-free in oplock/lease break ackNikunj A Dadhania <[email protected]>
x86/sev: UseTSC_FACTORfor Secure TSC frequency calculationJiawen Wu <[email protected]>
net: wangxun: revert the adjustment of the IRQ vector sequenceWillem de Bruijn <[email protected]>
selftests/bpf: adapt one more case intest_lru_mapto the newtarget_freeDaniel J. Ogorchock <[email protected]>
HID: nintendo: avoid bluetooth suspend/resume stallsChia-Lin Kao (AceLan) <[email protected]>
HID: quirks: Add quirk for 2 Chicony Electronics HP 5MP CamerasZhang Heng <[email protected]>
HID: Add IGNORE quirk for SMARTLINKTECHNOLOGYFangrui Song <[email protected]>
riscv: vdso: Exclude .rodata from thePT_DYNAMICsegmentWillem de Bruijn <[email protected]>
bpf: Adjust free target to avoid global starvation of LRU mapNicolas Pitre <[email protected]>
vt: add missing notification when switching back to text modeFilipe Manana <[email protected]>
btrfs: fix assertion when building free space treeLong Li <[email protected]>
net: mana: Record doorbell physical address in PF modeAkira Inoue <[email protected]>
HID: lenovo: Add support for ThinkPad X1 Tablet Thin Keyboard Gen2Shuai Zhang <[email protected]>
driver: bluetooth: hci_qca:fix unable to load the BT driverXiaowei Li <[email protected]>
net: usb:qmi_wwan: add SIMCom 8230C compositionTim Crawford <[email protected]>
ALSA: hda/realtek: Add quirks for some Clevo laptopsYasmin Fitzgerald <[email protected]>
ALSA: hda/realtek - Enable mute LED on HP Pavilion Laptop 15-eg100Yuzuru10 <[email protected]>
ASoC: amd: yc: add quirk for Acer Nitro ANV15-41 internal micFengnan Chang <[email protected]>
io_uring: make fallocate be hashed workChris Chiu <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook 6 G1aTakashi Iwai <[email protected]>
ALSA: hda/realtek: Add mic-mute LED setup for ASUS UM5606Jack Yu <[email protected]>
ASoC: rt721-sdca: fix boost gain calculation errorTamura Dai <[email protected]>
ASoC: SOF: Intel: hda: Usedevm_kstrdup()to avoid memleak.Tiwei Bie <[email protected]>
um: vector: Reduce stack usage invector_eth_configure()Thomas Fourier <[email protected]>
atm: idt77252: Add missing `dma_map_error()`Ronnie Sahlberg <[email protected]>
ublk: sanity checkadd_devinput for underflowSomnath Kotur <[email protected]>
bnxt_en: Set DMA unmap len correctly forXDP_REDIRECTShruti Parab <[email protected]>
bnxt_en: Flush FW trace before copying to the coredumpShravya KN <[email protected]>
bnxt_en: Fix DCB ETS validationAlok Tiwari <[email protected]>
net:ll_temac: Fix missingtx_pendingcheck inethtools_set_ringparam()Jianbo Liu <[email protected]>
net/mlx5e: Add new prio for promiscuous modeCarolina Jubran <[email protected]>
net/mlx5e: Fix race between DIM disable andnet_dim()Carolina Jubran <[email protected]>
net/mlx5: Resetbw_sharefield when changing a node's parentSean Nyekjaer <[email protected]>
can:m_can:m_can_handle_lost_msg(): downgrade msg lost in rx message to debug levelShuicheng Lin <[email protected]>
drm/xe/pm: Correct comment ofxe_pm_set_vram_threshold()Shuicheng Lin <[email protected]>
drm/xe/pm: Restore display pm if there is error after display suspendHangbin Liu <[email protected]>
selftests: net: lib: fix shift count out of rangeOleksij Rempel <[email protected]>
net: phy: microchip: limit 100M workaround to link-down events on LAN88xxOleksij Rempel <[email protected]>
net: phy: microchip: Usegenphy_soft_reset()to purge stale LPA bitsMingming Cao <[email protected]>
ibmvnic: Fix hardcoded NUM_RX_STATS/NUM_TX_STATS with dynamic sizeofKito Xu <[email protected]>
net: appletalk: Fix device refcount leak inatrtr_create()Eric Dumazet <[email protected]>
netfilter: flowtable: account for Ethernet header innf_flow_pppoe_proto()Miri Korenblit <[email protected]>
wifi: mac80211: add the virtual monitor after reconfig completeChao Yu <[email protected]>
erofs: fix to add missing tracepoint inerofs_readahead()Gao Xiang <[email protected]>
erofs: refine readahead tracepointMichal Wajdeczko <[email protected]>
drm/xe/pf: Clear all LMTT pages on allocPankaj Raghav <[email protected]>
block: reject bs > ps block devices when THP is disabledZheng Qixing <[email protected]>
nbd: fix uaf innbd_genl_connect()error pathHenry Martin <[email protected]>
wifi: mt76: mt7925: Fix null-ptr-deref in mt7925_thermal_init()Lorenzo Bianconi <[email protected]>
wifi: mt76: Remove RCU section inmt7996_mac_sta_rc_work()Lorenzo Bianconi <[email protected]>
wifi: mt76: Move RCU section inmt7996_mcu_add_rate_ctrl()Lorenzo Bianconi <[email protected]>
wifi: mt76: Move RCU section inmt7996_mcu_add_rate_ctrl_fixed()Lorenzo Bianconi <[email protected]>
wifi: mt76: Move RCU section inmt7996_mcu_set_fixed_field()Lorenzo Bianconi <[email protected]>
wifi: mt76: Assume__mt76_connac_mcu_alloc_sta_reqruns in atomic contextBen Skeggs <[email protected]>
drm/nouveau/gsp: fix potential leak of memory used during acpi initPavel Begunkov <[email protected]>
io_uring/zcrx: fix pp destruction warningsFelix Fietkau <[email protected]>
wifi: rt2x00: fix remove callback type mismatchMoon Hee Lee <[email protected]>
wifi: mac80211: reject VHT opmode for unsupported channel widthsJohannes Berg <[email protected]>
wifi: mac80211: fix non-transmitted BSSID profile searchLachlan Hodges <[email protected]>
wifi: mac80211: correctly identify S1G short beaconZheng Qixing <[email protected]>
md/raid1,raid10: stripREQ_NOWAITfrom member biosNigel Croxon <[email protected]>
raid10: cleanup memleak atraid10_make_requestWang Jinchao <[email protected]>
md/raid1: Fix stack memory use after return inraid1_reshapeMikko Perttunen <[email protected]>
drm/tegra: nvdec: Fixdma_alloc_coherenterror checkDaniil Dulov <[email protected]>
wifi: zd1211rw: Fix potential NULL pointer dereference inzd_mac_tx_to_dev()Lachlan Hodges <[email protected]>
wifi: cfg80211: fix S1G beacon head validation in nl80211Jakub Kicinski <[email protected]>
netlink: make sure we allow at least one dump skbKuniyuki Iwashima <[email protected]>
netlink: Fix rmem check innetlink_broadcast_deliver().Peter Ujfalusi <[email protected]>
ASoC: Intel: sof-function-topology-lib: Print out the unsupported dmic countGao Xiang <[email protected]>
erofs: fix large fragment handlingGao Xiang <[email protected]>
erofs: address D-cache aliasingChao Yu <[email protected]>
erofs: fix to add missing tracepoint inerofs_read_folio()Al Viro <[email protected]>
ksmbd: fix a mount write count leak inksmbd_vfs_kern_path_locked()Stefan Metzmacher <[email protected]>
smb: server: make use ofrdma_destroy_qp()Sascha Hauer <[email protected]>
clk: scmi: Handle case where child clocks are initialized before their parentsJulien Massot <[email protected]>
dt-bindings: clock: mediatek: Add #reset-cells property for MT8188Mikhail Paulyshka <[email protected]>
x86/CPU/AMD: Disable INVLPGB on Zen2Jann Horn <[email protected]>
x86/mm: Disable hugetlb page table sharing on 32-bitMikhail Paulyshka <[email protected]>
x86/rdrand: Disable RDSEED on AMD Cyan SkillfishXiaolei Wang <[email protected]>
clk: imx: Fix an out-of-bounds access indispmix_csr_clk_dev_dataHarry Yoo <[email protected]>
lib/alloc_tag: do not acquire non-existent lock inalloc_tag_top_users()Honggyu Kim <[email protected]>
samples/damon: fix damon sample wsse for start failureHonggyu Kim <[email protected]>
samples/damon: fix damon sample prcl for start failureHonggyu Kim <[email protected]>
mm/damon: fix divide by zero indamon_get_intervals_score()SeongJae Park <[email protected]>
mm/damon/core: handledamon_call_controlas normal under kdmond deactivationLance Yang <[email protected]>
mm/rmap: fix potential out-of-bounds page table access during batched unmapAlexander Gordeev <[email protected]>
mm/vmalloc: leave lazy MMU mode on PTE mapping errorIllia Ostapyshyn <[email protected]>
scripts: gdb: vfs: support external dentry namesFlorian Fainelli <[email protected]>
scripts/gdb: fixinterrupts.pyafter maple tree conversionFlorian Fainelli <[email protected]>
scripts/gdb: de-reference per-CPU MCE interruptsFlorian Fainelli <[email protected]>
scripts/gdb: fix interrupts display after MCP on x86Baolin Wang <[email protected]>
mm: fix the inaccurate memory statistics issue for usersWei Yang <[email protected]>
maple_tree: fixmt_destroy_walk()on root leaf nodeYeoreum Yun <[email protected]>
kasan: removekasan_find_vm_area()to prevent possible deadlockAchill Gilgenast <[email protected]>
kallsyms: fix build without execinfoZhe Qiao <[email protected]>
Revert "PCI/ACPI: Fix allocated memory release on error inpci_acpi_scan_root()"Rafael J. Wysocki <[email protected]>
Revert "ACPI: battery: negate current when discharging"Matthew Brost <[email protected]>
drm/xe: Allocate PF queue size on pow2 boundaryThomas Zimmermann <[email protected]>
drm/framebuffer: Acquire internal references on GEM handlesKuen-Han Tsai <[email protected]>
Revert "usb: gadget:u_serial: Add null pointer check ings_start_io"Kuen-Han Tsai <[email protected]>
usb: gadget:u_serial: Fix race condition in TTY wakeupAaron Thompson <[email protected]>
drm/nouveau: Do not fail module init on debugfs errorsMatthew Brost <[email protected]>
Revert "drm/xe/xe2: Enable Indirect Ring State support for Xe2"Matthew Auld <[email protected]>
drm/xe/bmg: fix compressed VRAM handlingSimona Vetter <[email protected]>
drm/gem: Fix race indrm_gem_handle_create_tail()Christian König <[email protected]>
drm/ttm: fix error handling inttm_buffer_object_transferMatthew Brost <[email protected]>
drm/sched: Increment job count before swapping tail spsc queueThomas Zimmermann <[email protected]>
drm/gem: Acquire references on GEM handles for framebuffersAlex Deucher <[email protected]>
drm/amdkfd: addhqd_sdma_get_doorbellcallbacks for gfx7/8Kent Russell <[email protected]>
drm/amdgpu: Include sdma_4_4_4.binPhilip Yang <[email protected]>
drm/amdkfd: Don't call mmput from MMU notifier callbackAlessio Belle <[email protected]>
drm/imagination: Fix kernel crash when hard resetting the GPUMichael Lo <[email protected]>
wifi: mt76: mt7925: fix invalid array index in ssid assignment during hw scanMing Yen Hsieh <[email protected]>
wifi: mt76: mt7925: fix the wrong config for tx interruptDeren Wu <[email protected]>
wifi: mt76: mt7925: prevent NULL pointer dereference inmt7925_sta_set_decap_offload()Deren Wu <[email protected]>
wifi: mt76: mt7921: prevent decap offload config before STA initializationVitor Soares <[email protected]>
wifi: mwifiex: discard erroneous disassoc frames on STA interfaceMathy Vanhoef <[email protected]>
wifi: prevent A-MSDU attacks in mesh networksUwe Kleine-König <[email protected]>
pwm: mediatek: Ensure to disable clocks in error pathUwe Kleine-König <[email protected]>
pwm: Fix invalid state detectionBartosz Golaszewski <[email protected]>
pinctrl: qcom: msm: mark certain pins as invalid for interruptsMiquel Raynal <[email protected]>
pinctrl: nuvoton: Fix boot on ma35dx platformsHåkon Bugge <[email protected]>
md/md-bitmap: fix GPF inbitmap_get_stats()Hugo Villeneuve <[email protected]>
gpiolib: fix performance regression when usinggpio_chip_get_multiple()Haoxiang Li <[email protected]>
net: ethernet: rtsn: Fix a null pointer dereference inrtsn_probe()Guillaume Nault <[email protected]>
gre: Fix IPv6 multicast route creation.Jens Axboe <[email protected]>
io_uring/msg_ring: ensureio_kiocbfreeing is deferred for RCUArun Raghavan <[email protected]>
ASoC:fsl_sai: Force a software reset when starting in consumer modeMark Brown <[email protected]>
arm64: Filter out SME hwcaps whenFEAT_SMEisn't implementedEdip Hazuri <[email protected]>
ALSA: hda/realtek - Add mute LED support for HP Victus 15-fb2xxxThorsten Blum <[email protected]>
ALSA: ad1816a: Fix potential NULL pointer deref insnd_card_ad1816a_pnp()Thomas Weißschuh <[email protected]>
sched: Fix preemption string ofpreempt_dynamic_noneLiam Merwick <[email protected]>
KVM: Allow CPU to reschedule while setting per-page memory attributesSean Christopherson <[email protected]>
KVM: SVM: Reject SEV{-ES} intra host migration if vCPU creation is in-flightNikunj A Dadhania <[email protected]>
KVM: SVM: Add missing member inSNP_LAUNCH_STARTcommand structureManuel Andreas <[email protected]>
KVM: x86/hyper-v: Skip non-canonical addresses during PV TLB flushDavid Woodhouse <[email protected]>
KVM: x86/xen: Allow 'out of range' event channel ports in IRQ routing table.JP Kobryn <[email protected]>
x86/mce: Make sure CMCI banks are cleared during shutdown on IntelYazen Ghannam <[email protected]>
x86/mce: Ensure user polling settings are honored when restarting timerYazen Ghannam <[email protected]>
x86/mce: Don't remove sysfs if thresholding sysfs init failsYazen Ghannam <[email protected]>
x86/mce/amd: Fix threshold limit resetYazen Ghannam <[email protected]>
x86/mce/amd: Add default names for MCA banks and blocksDan Carpenter <[email protected]>
ipmi:msghandler: Fix potential memory corruption inipmi_create_user()David Howells <[email protected]>
rxrpc: Fix oops due to non-existence of prealloc backlog structEric Biggers <[email protected]>
crypto: s390/sha - Fix uninitialized variable in SHA-1 and SHA-2David Howells <[email protected]>
rxrpc: Fix bug due to prealloc collisionVictor Nogueira <[email protected]>
net/sched: Abort__tc_modify_qdiscif parent class does not existChintan Vankar <[email protected]>
net: ethernet: ti: am65-cpsw-nuss: Fix skb size by accounting forskb_shared_infoYue Haibing <[email protected]>
atm: clip: Fix NULL pointer dereference invcc_sendmsg()Kuniyuki Iwashima <[email protected]>
atm: clip: Fix infinite recursive call ofclip_push().Kuniyuki Iwashima <[email protected]>
atm: clip: Fix memory leak of structclip_vcc.Kuniyuki Iwashima <[email protected]>
atm: clip: Fix potential null-ptr-deref into_atmarpd().Oleksij Rempel <[email protected]>
net: phy: smsc: Fix link failure in forced mode with Auto-MDIXOleksij Rempel <[email protected]>
net: phy: smsc: Force predictable MDI-X state on LAN87xxOleksij Rempel <[email protected]>
net: phy: smsc: Fix Auto-MDIX configuration when disabled by strapEricChan <[email protected]>
net: stmmac: Fix interrupt handling for level-triggered mode inDWC_XGMAC2Petr Pavlu <[email protected]>
module: Fix memory deallocation on error path inmove_module()Christophe JAILLET <[email protected]>
net: airoha: Fix an error handling path inairoha_probe()Michal Luczaj <[email protected]>
vsock: FixIOCTL_VM_SOCKETS_GET_LOCAL_CIDto check alsotransport_localMichal Luczaj <[email protected]>
vsock: Fix transport_* TOCTOUMichal Luczaj <[email protected]>
vsock: Fix transport_{g2h,h2g} TOCTOUJiayuan Chen <[email protected]>
tcp: Correct signedness in skb remaining space calculationKuniyuki Iwashima <[email protected]>
tipc: Fix use-after-free intipc_conn_close().Stefano Garzarella <[email protected]>
vsock: fixvsock_protodeclarationKuniyuki Iwashima <[email protected]>
netlink: Fix wraparounds of sk->sk_rmem_alloc.Luo Jie <[email protected]>
net: phy: qcom: qca808x: Fix WoL issue by utilizingat8031_set_wol()Luo Jie <[email protected]>
net: phy: qcom: move the WoL function to shared libraryAnshuman Khandual <[email protected]>
arm64/mm: Drop wrong writes intoTCR2_EL1Kevin Brodsky <[email protected]>
arm64: poe: Handle spurious Overlay faultsJason Xing <[email protected]>
bnxt_en: eliminate the compile warning inbnxt_request_irqdue toCONFIG_RFS_ACCELkuyo chang <[email protected]>
sched/deadline: Fixdl_serverruntime calculation formulaAl Viro <[email protected]>
fixproc_sys_compare()handling of in-lookup dentriesMario Limonciello <[email protected]>
pinctrl: amd: Clear GPIO debounce for suspendLuiz Augusto von Dentz <[email protected]>
Bluetooth:hci_event: Fix not marking Broadcast Sink BIS as connectedLuiz Augusto von Dentz <[email protected]>
Bluetooth:hci_sync: Fix attempting to sendHCI_Disconnectto BIS handleLuiz Augusto von Dentz <[email protected]>
Bluetooth:hci_core: Remove check ofBDADDR_ANYinhci_conn_hash_lookup_big_stateLuiz Augusto von Dentz <[email protected]>
Bluetooth:hci_sync: Fix not disabling advertising instanceRichard Fitzgerald <[email protected]>
ASoC: cs35l56:probe()should fail if the device ID is not recognizedPeter Zijlstra <[email protected]>
perf: Revert to requiringCAP_SYS_ADMINfor uprobesHeiko Carstens <[email protected]>
objtool: Add missing endian conversion toread_annotate()Peter Zijlstra <[email protected]>
sched/core: Fixmigrate_swap()vs. hotplugNam Cao <[email protected]>
irqchip/irq-msi-lib: SelectCONFIG_GENERIC_MSI_IRQShiju Jose <[email protected]>
EDAC: Initialize EDAC features sysfs attributesLuo Gengkun <[email protected]>
perf/core: Fix theWARN_ON_ONCEis out of lock protected regionCharles Keepax <[email protected]>
ASoC: Intel: soc-acpi: arl: Correct order of cs42l43 matchesBard Liao <[email protected]>
ASoC: Intel: soc-acpi-intel-arl-match: setget_function_tplg_filesopsBard Liao <[email protected]>
ASoC: Intel: addsof_sdw_get_tplg_filesopsBard Liao <[email protected]>
ASoC: soc-acpi: addget_function_tplg_filesopsBard Liao <[email protected]>
ASoC: Intel:SND_SOC_INTEL_SOF_BOARD_HELPERSselectSND_SOC_ACPI_INTEL_MATCHShengjiu Wang <[email protected]>
ASoC:fsl_asrc: use internal measured ratio for non-ideal ratio modeKaustabh Chakraborty <[email protected]>
drm/exynos:exynos7_drm_decon: add vblank check in IRQ handlingLinus Torvalds <[email protected]>
eventpoll: don't decrement ep refcount while still holding the ep mutex-------------
Diffstat:
Documentation/bpf/map_hash.rst | 8 +- Documentation/bpf/map_lru_hash_update.dot | 6 +- .../bindings/clock/mediatek,mt8188-clock.yaml | 3 + Makefile | 4 +- arch/arm64/kernel/cpufeature.c | 57 +++-- arch/arm64/kernel/process.c | 5 + arch/arm64/mm/fault.c | 30 ++- arch/arm64/mm/proc.S | 1 - arch/riscv/kernel/vdso/vdso.lds.S | 2 +- arch/s390/crypto/sha1_s390.c | 2 + arch/s390/crypto/sha256_s390.c | 3 + arch/s390/crypto/sha512_s390.c | 3 + arch/um/drivers/vector_kern.c | 42 ++-- arch/x86/Kconfig | 2 +- arch/x86/coco/sev/core.c | 22 +- arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/sev.h | 17 +- arch/x86/kernel/cpu/amd.c | 10 + arch/x86/kernel/cpu/mce/amd.c | 28 ++- arch/x86/kernel/cpu/mce/core.c | 24 +- arch/x86/kernel/cpu/mce/intel.c | 1 + arch/x86/kvm/hyperv.c | 3 + arch/x86/kvm/svm/sev.c | 4 + arch/x86/kvm/xen.c | 15 +- drivers/acpi/battery.c | 19 +- drivers/atm/idt77252.c | 5 + drivers/block/nbd.c | 6 +- drivers/block/ublk_drv.c | 3 +- drivers/bluetooth/hci_qca.c | 13 +- drivers/char/ipmi/ipmi_msghandler.c | 3 +- drivers/clk/clk-scmi.c | 20 +- drivers/clk/imx/clk-imx95-blk-ctl.c | 12 +- drivers/edac/ecs.c | 4 +- drivers/edac/mem_repair.c | 1 + drivers/edac/scrub.c | 1 + drivers/gpio/gpiolib.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 8 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 8 + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 43 ++-- drivers/gpu/drm/drm_framebuffer.c | 31 ++- drivers/gpu/drm/drm_gem.c | 74 +++++- drivers/gpu/drm/drm_internal.h | 2 + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 + drivers/gpu/drm/imagination/pvr_power.c | 4 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 6 +- drivers/gpu/drm/nouveau/nouveau_debugfs.h | 5 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 20 +- drivers/gpu/drm/tegra/nvdec.c | 6 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +- drivers/gpu/drm/xe/xe_gt_pagefault.c | 1 + drivers/gpu/drm/xe/xe_lmtt.c | 11 + drivers/gpu/drm/xe/xe_migrate.c | 2 +- drivers/gpu/drm/xe/xe_pci.c | 1 - drivers/gpu/drm/xe/xe_pm.c | 11 +- drivers/hid/hid-ids.h | 6 + drivers/hid/hid-lenovo.c | 8 + drivers/hid/hid-multitouch.c | 8 +- drivers/hid/hid-nintendo.c | 38 +++- drivers/hid/hid-quirks.c | 3 + drivers/irqchip/Kconfig | 1 + drivers/md/md-bitmap.c | 3 +- drivers/md/raid1.c | 4 +- drivers/md/raid10.c | 12 +- drivers/net/can/m_can/m_can.c | 2 +- drivers/net/ethernet/airoha/airoha_eth.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 18 +- drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.h | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 9 +- drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 13 +- drivers/net/ethernet/microsoft/mana/gdma_main.c | 3 + drivers/net/ethernet/renesas/rtsn.c | 5 + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 24 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 16 +- drivers/net/ethernet/wangxun/libwx/wx_type.h | 2 +- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 2 +- drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 2 +- drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 4 +- drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 4 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/phy/microchip.c | 3 +- drivers/net/phy/qcom/at803x.c | 27 --- drivers/net/phy/qcom/qca808x.c | 2 +- drivers/net/phy/qcom/qcom-phy-lib.c | 25 ++ drivers/net/phy/qcom/qcom.h | 5 + drivers/net/phy/smsc.c | 57 ++++- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/marvell/mwifiex/util.c | 4 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 6 +- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 3 + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 2 + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 6 + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 4 +- drivers/net/wireless/mediatek/mt76/mt7925/regs.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 40 +--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 5 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 188 ++++++++++----- drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 16 +- drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 4 +- drivers/net/wireless/ralink/rt2x00/rt2x00soc.h | 2 +- drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 6 +- drivers/pci/pci-acpi.c | 23 +- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 10 +- drivers/pinctrl/pinctrl-amd.c | 11 + drivers/pinctrl/qcom/pinctrl-msm.c | 20 ++ drivers/pwm/core.c | 2 +- drivers/pwm/pwm-mediatek.c | 13 +- drivers/tty/vt/vt.c | 1 + drivers/usb/gadget/function/u_serial.c | 12 +- fs/btrfs/free-space-tree.c | 16 +- fs/erofs/data.c | 21 +- fs/erofs/decompressor.c | 12 +- fs/erofs/fileio.c | 6 +- fs/erofs/internal.h | 6 +- fs/erofs/zdata.c | 13 +- fs/erofs/zmap.c | 9 +- fs/eventpoll.c | 12 +- fs/proc/inode.c | 2 +- fs/proc/proc_sysctl.c | 18 +- fs/proc/task_mmu.c | 14 +- fs/smb/server/smb2pdu.c | 29 +-- fs/smb/server/transport_rdma.c | 5 +- fs/smb/server/vfs.c | 1 + include/drm/drm_file.h | 3 + include/drm/drm_framebuffer.h | 7 + include/drm/spsc_queue.h | 4 +- include/linux/blkdev.h | 5 + include/linux/ieee80211.h | 45 +++- include/linux/io_uring_types.h | 2 + include/linux/mm.h | 5 + include/linux/psp-sev.h | 2 + include/net/af_vsock.h | 2 +- include/net/bluetooth/hci_core.h | 3 +- include/net/netfilter/nf_flow_table.h | 2 +- include/sound/soc-acpi.h | 13 ++ include/trace/events/erofs.h | 2 +- io_uring/msg_ring.c | 4 +- io_uring/opdef.c | 1 + io_uring/zcrx.c | 3 - kernel/bpf/bpf_lru_list.c | 9 +- kernel/bpf/bpf_lru_list.h | 1 + kernel/events/core.c | 6 +- kernel/module/main.c | 4 +- kernel/sched/core.c | 7 +- kernel/sched/deadline.c | 10 +- kernel/stop_machine.c | 20 +- lib/alloc_tag.c | 3 + lib/maple_tree.c | 1 + mm/damon/core.c | 8 +- mm/kasan/report.c | 45 +--- mm/rmap.c | 46 ++-- mm/vmalloc.c | 22 +- net/appletalk/ddp.c | 1 + net/atm/clip.c | 64 ++++-- net/bluetooth/hci_event.c | 3 + net/bluetooth/hci_sync.c | 4 +- net/ipv4/tcp.c | 2 +- net/ipv6/addrconf.c | 9 +- net/mac80211/cfg.c | 14 ++ net/mac80211/mlme.c | 7 +- net/mac80211/parse.c | 6 +- net/mac80211/util.c | 9 +- net/netlink/af_netlink.c | 90 +++++--- net/rxrpc/call_accept.c | 4 + net/sched/sch_api.c | 23 +- net/tipc/topsrv.c | 2 + net/vmw_vsock/af_vsock.c | 57 ++++- net/wireless/nl80211.c | 7 +- net/wireless/util.c | 52 ++++- samples/damon/prcl.c | 8 +- samples/damon/wsse.c | 8 +- scripts/gdb/linux/constants.py.in | 7 + scripts/gdb/linux/interrupts.py | 16 +- scripts/gdb/linux/mapletree.py | 252 +++++++++++++++++++++ scripts/gdb/linux/vfs.py | 2 +- scripts/gdb/linux/xarray.py | 28 +++ sound/isa/ad1816a/ad1816a.c | 2 +- sound/pci/hda/patch_realtek.c | 10 + sound/soc/amd/yc/acp6x-mach.c | 7 + sound/soc/codecs/cs35l56-shared.c | 2 +- sound/soc/codecs/rt721-sdca.c | 23 +- sound/soc/fsl/fsl_asrc.c | 3 +- sound/soc/fsl/fsl_sai.c | 14 +- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/common/Makefile | 2 +- sound/soc/intel/common/soc-acpi-intel-arl-match.c | 21 +- sound/soc/intel/common/sof-function-topology-lib.c | 136 +++++++++++ sound/soc/intel/common/sof-function-topology-lib.h | 15 ++ sound/soc/sof/intel/hda.c | 6 +- tools/arch/x86/include/asm/msr-index.h | 1 + tools/include/linux/kallsyms.h | 4 + tools/objtool/check.c | 1 + tools/testing/selftests/bpf/test_lru_map.c | 105 ++++----- tools/testing/selftests/net/lib.sh | 2 +- virt/kvm/kvm_main.c | 3 + 203 files changed, 2012 insertions(+), 833 deletions(-)
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 6.15.7-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git commit: e6001d5f79448ece8e204c0df46072a010b00f6c
* git describe: v6.15.6-193-ge6001d5f7944
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.15.y/build/v6.15.6-193-ge6001d5f7944
## Test Regressions (compared to v6.15.5-179-gb283c37b8f14)
## Metric Regressions (compared to v6.15.5-179-gb283c37b8f14)
## Test Fixes (compared to v6.15.5-179-gb283c37b8f14)
## Metric Fixes (compared to v6.15.5-179-gb283c37b8f14)
## Test result summary
total: 306856, pass: 279725, fail: 7552, skip: 19579, xfail: 0
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 139 total, 138 passed, 1 failed
* arm64: 57 total, 56 passed, 0 failed, 1 skipped
* i386: 18 total, 18 passed, 0 failed
* mips: 34 total, 27 passed, 7 failed
* parisc: 4 total, 4 passed, 0 failed
* powerpc: 40 total, 39 passed, 1 failed
* riscv: 25 total, 25 passed, 0 failed
* s390: 22 total, 22 passed, 0 failed
* sh: 5 total, 5 passed, 0 failed
* sparc: 4 total, 3 passed, 1 failed
* x86_64: 49 total, 49 passed, 0 failed
## Test suites summary
* boot
* commands
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-efivarfs
* kselftest-exec
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-kcmp
* kselftest-kvm
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-mincore
* kselftest-mm
* kselftest-mqueue
* kselftest-net
* kselftest-net-mptcp
* kselftest-openat2
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-rust
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user_events
* kselftest-vDSO
* kselftest-x86
* kunit
* kvm-unit-tests
* lava
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-build-clang
* log-parser-build-gcc
* log-parser-test
* ltp-capability
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-hugetlb
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* modules
* perf
* rcutorture
* rt-tests-cyclicdeadline
* rt-tests-pi-stress
* rt-tests-pmqtest
* rt-tests-rt-migrate-test
* rt-tests-signaltest
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
120 tests: 120 pass, 0 failLinux version: 6.15.7-rc1-g6b1915284e47
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra186-p3509-0000+p3636-0001, tegra194-p2972-0000,
tegra194-p3509-0000+p3668-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 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 · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 6.15.7 release. There are 192 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.15.y
6.6 passes our testing, too:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.6.y
We have some problems here, but I believe they are test problems:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.15.y
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.4.y
Best regards,
Pavel
Signature · 2 lines
In cooperation with DENX Software Engineering GmbH, HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.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 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 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.
Hi Greg
6.15.7-rc1 compiles on x86_64 (Xeon E5-1620 v2, Slackware64-15.0), and boots & runs on x86_64 (AMD Ryzen 5 7520U, Slackware64-current), no regressions observed.
Am 15.07.2025 um 15:11 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.15.7 release. There are 192 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.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697 v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +0000. Anything received after that time might be too late.
Tested on a ThinkPad E14 Gen 3 with a AMD Ryzen 5 5500U CPU.
There was one oddity though, that under high IO pressure the following messages were emitted and I can't judge the severity of that:
[65524.312500] nvme nvme0: I/O tag 956 (f3bc) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:8192 [65524.312530] nvme nvme0: I/O tag 957 (e3bd) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312544] nvme nvme0: I/O tag 958 (d3be) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312556] nvme nvme0: I/O tag 959 (d3bf) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312568] nvme nvme0: I/O tag 960 (23c0) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312580] nvme nvme0: I/O tag 961 (73c1) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312592] nvme nvme0: I/O tag 962 (13c2) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.312604] nvme nvme0: I/O tag 963 (13c3) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:4096 [65524.515650] nvme nvme0: Abort status: 0x0 [65524.536423] nvme nvme0: Abort status: 0x0 [65524.581238] nvme nvme0: Abort status: 0x0 [65524.628017] nvme nvme0: Abort status: 0x0 [65524.661905] nvme nvme0: Abort status: 0x0 [65524.702179] nvme nvme0: Abort status: 0x0 [65524.723759] nvme nvme0: Abort status: 0x0 [65524.779577] nvme nvme0: Abort status: 0x0 [65524.871981] nvme nvme0: I/O tag 2 (8002) opcode 0x1 (Write) QID 11 timeout, aborting req_op:WRITE(1) size:16384 [65525.019778] nvme nvme0: Abort status: 0x0
I'll loop in the NVME list that they can maybe judge this. I also double checked and the device has no SMART issues whatsoever.
Cheers,
Chris
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.7 release. There are 192 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 17 Jul 2025 13:07:32 +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/v6.x/stable-review/patch-6.15.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.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
# Librecast Test Results
010/010 [ OK ] libmld
120/120 [ OK ] liblibrecast
CPU/kernel: Linux auntie 6.15.7-rc1-ge6001d5f7944 #14 SMP PREEMPT_DYNAMIC Thu Jul 17 07:41:45 -00 2025 x86_64 AMD Ryzen 9 9950X 16-Core Processor AuthenticAMD GNU/Linux