6.14.9-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 716/783 octeontx2-pf: AF_XDP zero copy receive support
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit efabce29015189cb5cd8066cf29eb1d754de6c3c ]
This patch adds support to AF_XDP zero copy for CN10K.
This patch specifically adds receive side support. In this approach once a xdp program with zero copy support on a specific rx queue is enabled, then that receive quse is disabled/detached from the existing kernel queue and re-assigned to the umem memory.
Stable-dep-of: 184fb40f731b ("octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf")
--- .../ethernet/marvell/octeontx2/nic/Makefile | 2 +- .../ethernet/marvell/octeontx2/nic/cn10k.c | 7 +- .../marvell/octeontx2/nic/otx2_common.c | 114 ++++++++--- .../marvell/octeontx2/nic/otx2_common.h | 6 +- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 25 ++- .../marvell/octeontx2/nic/otx2_txrx.c | 73 +++++-- .../marvell/octeontx2/nic/otx2_txrx.h | 6 + .../ethernet/marvell/octeontx2/nic/otx2_vf.c | 12 +- .../ethernet/marvell/octeontx2/nic/otx2_xsk.c | 182 ++++++++++++++++++ .../ethernet/marvell/octeontx2/nic/otx2_xsk.h | 21 ++ .../ethernet/marvell/octeontx2/nic/qos_sq.c | 2 +- 11 files changed, 389 insertions(+), 61 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h
drivers/net/ethernet/marvell/octeontx2/nic/Makefile +1 -1
@@ -9,7 +9,7 @@ obj-$(CONFIG_RVU_ESWITCH) += rvu_rep.o rvu_nicpf-y := otx2_pf.o otx2_common.o otx2_txrx.o otx2_ethtool.o \ otx2_flows.o otx2_tc.o cn10k.o otx2_dmac_flt.o \ - otx2_devlink.o qos_sq.o qos.o + otx2_devlink.o qos_sq.o qos.o otx2_xsk.o rvu_nicvf-y := otx2_vf.o rvu_rep-y := rep.o
drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c +6 -1
@@ -112,9 +112,12 @@ int cn10k_refill_pool_ptrs(void *dev, struct otx2_cq_queue *cq)struct otx2_nic *pfvf = dev;int cnt = cq->pool_ptrs;u64 ptrs[NPA_MAX_BURST ]; +struct otx2_pool *pool;dma_addr_t bufptr;int num_ptrs =1 ; + pool = &pfvf->qset.pool[cq->cq_idx]; +/* Refill pool with new buffers */ while (cq->pool_ptrs) {if (otx2_alloc_buffer (pfvf, cq, &bufptr)) {
@@ -124,7 +127,9 @@ int cn10k_refill_pool_ptrs(void *dev, struct otx2_cq_queue *cq)break ; } cq->pool_ptrs--; - ptrs[num_ptrs] = (u64 )bufptr +OTX2_HEAD_ROOM ; + ptrs[num_ptrs] = pool->xsk_pool ? + (u64 )bufptr : (u64 )bufptr +OTX2_HEAD_ROOM ; + num_ptrs++;if (num_ptrs ==NPA_MAX_BURST || cq->pool_ptrs ==0 ) { __cn10k_aura_freeptr(pfvf, cq->cq_idx, ptrs,
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +83 -31
228 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +5 -1
@@ -533,6 +533,8 @@ struct otx2_nic {/* Inline ipsec */ struct cn10k_ipsec ipsec; +/* af_xdp zero-copy */ +unsigned long *af_xdp_zc_qidx; };static inline bool is_otx2_lbkvf (struct pci_dev *pdev)
@@ -1004,7 +1006,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq);void otx2_free_pending_sqe (struct otx2_nic *pfvf);void otx2_sqb_flush (struct otx2_nic *pfvf);int otx2_alloc_rbuf (struct otx2_nic *pfvf,struct otx2_pool *pool, -dma_addr_t *dma); +dma_addr_t *dma,int qidx,int idx);int otx2_rxtx_enable (struct otx2_nic *pfvf,bool enable);void otx2_ctx_disable (struct mbox *mbox,int type,bool npa);int otx2_nix_config_bp (struct otx2_nic *pfvf,bool enable);
@@ -1034,6 +1036,8 @@ void otx2_pfaf_mbox_destroy(struct otx2_nic *pf);void otx2_disable_mbox_intr (struct otx2_nic *pf);void otx2_disable_napi (struct otx2_nic *pf);irqreturn_t otx2_cq_intr_handler (int irq,void *cq_irq); +int otx2_rq_init (struct otx2_nic *pfvf,u16 qidx,u16 lpb_aura); +int otx2_cq_init (struct otx2_nic *pfvf,u16 qidx);/* RSS configuration APIs*/ int otx2_rss_init (struct otx2_nic *pfvf);
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +15 -10
@@ -27,6 +27,7 @@#include "qos.h" #include <rvu_trace.h> #include "cn10k_ipsec.h" +#include "otx2_xsk.h" #define DRV_NAME "rvu_nicpf"#define DRV_STRING "Marvell RVU NIC Physical Function Driver"
@@ -1662,9 +1663,7 @@ void otx2_free_hw_resources(struct otx2_nic *pf)struct nix_lf_free_req *free_req;struct mbox *mbox = &pf->mbox;struct otx2_cq_queue *cq; -struct otx2_pool *pool;struct msg_req *req; -int pool_id;int qidx;/* Ensure all SQE are processed */
@@ -1705,13 +1704,6 @@ void otx2_free_hw_resources(struct otx2_nic *pf)/* Free RQ buffer pointers*/ otx2_free_aura_ptr (pf,AURA_NIX_RQ ); -for (qidx =0 ; qidx < pf->hw.rx_queues; qidx++) { - pool_id =otx2_get_pool_idx (pf,AURA_NIX_RQ , qidx); - pool = &pf->qset.pool[pool_id]; -page_pool_destroy (pool->page_pool); - pool->page_pool =NULL ; - } -otx2_free_cq_res (pf);/* Free all ingress bandwidth profiles allocated */
@@ -2788,6 +2780,8 @@ static int otx2_xdp(struct net_device *netdev, struct netdev_bpf *xdp)switch (xdp->command) {case XDP_SETUP_PROG :return otx2_xdp_setup (pf, xdp->prog); +case XDP_SETUP_XSK_POOL : +return otx2_xsk_pool_setup (pf, xdp->xsk.pool, xdp->xsk.queue_id);default :return -EINVAL ; }
@@ -2865,6 +2859,7 @@ static const struct net_device_ops otx2_netdev_ops = { .ndo_set_vf_vlan = otx2_set_vf_vlan, .ndo_get_vf_config = otx2_get_vf_config, .ndo_bpf = otx2_xdp, + .ndo_xsk_wakeup = otx2_xsk_wakeup, .ndo_xdp_xmit = otx2_xdp_xmit, .ndo_setup_tc = otx2_setup_tc, .ndo_set_vf_trust = otx2_ndo_set_vf_trust,
@@ -3203,16 +3198,26 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id)/* Enable link notifications */ otx2_cgx_config_linkevents (pf, true); + pf->af_xdp_zc_qidx =bitmap_zalloc (qcount,GFP_KERNEL ); +if (!pf->af_xdp_zc_qidx) { + err = -ENOMEM ; + goto err_sriov_cleannup; + } +#ifdef CONFIG_DCB err =otx2_dcbnl_set_ops (netdev);if (err) - goto err_pf_sriov_init; + goto err_free_zc_bmap;#endif otx2_qos_init (pf, qos_txqs);return 0 ; +err_free_zc_bmap: +bitmap_free (pf->af_xdp_zc_qidx); +err_sriov_cleannup: +otx2_sriov_vfcfg_cleanup (pf); err_pf_sriov_init:otx2_shutdown_tc (pf); err_mcam_flow_del:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +58 -15
154 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h +6 -0
@@ -12,6 +12,7 @@#include <linux/iommu.h> #include <linux/if_vlan.h> #include <net/xdp.h> +#include <net/xdp_sock_drv.h> #define LBK_CHAN_BASE 0x000#define SDP_CHAN_BASE 0x700
@@ -128,7 +129,11 @@ struct otx2_pool {struct qmem *stack;struct qmem *fc_addr;struct page_pool *page_pool; +struct xsk_buff_pool *xsk_pool; +struct xdp_buff **xdp; +u16 xdp_cnt;u16 rbsize; +u16 xdp_top; };struct otx2_cq_queue {
@@ -145,6 +150,7 @@ struct otx2_cq_queue {void *cqe_base;struct qmem *cqe;struct otx2_pool *rbpool; +bool xsk_zc_en;struct xdp_rxq_info xdp_rxq; }____cacheline_aligned_in_smp ;
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +11 -1
@@ -722,15 +722,25 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (err) goto err_shutdown_tc; + vf->af_xdp_zc_qidx =bitmap_zalloc (qcount,GFP_KERNEL ); +if (!vf->af_xdp_zc_qidx) { + err = -ENOMEM ; + goto err_unreg_devlink; + } +#ifdef CONFIG_DCB err =otx2_dcbnl_set_ops (netdev);if (err) - goto err_shutdown_tc; + goto err_free_zc_bmap;#endif otx2_qos_init (vf, qos_txqs);return 0 ; +err_free_zc_bmap: +bitmap_free (vf->af_xdp_zc_qidx); +err_unreg_devlink: +otx2_unregister_dl (vf); err_shutdown_tc:otx2_shutdown_tc (vf); err_unreg_netdev:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c new file +182 -0
182 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Marvell RVU PF/VF Netdev Devlink +* +* Copyright (C) 2024 Marvell. +* +*/ + +#ifndef OTX2_XSK_H +#define OTX2_XSK_H + +struct otx2_nic ; +struct xsk_buff_pool ; + +int otx2_xsk_pool_setup (struct otx2_nic *pf,struct xsk_buff_pool *pool,u16 qid); +int otx2_xsk_pool_enable (struct otx2_nic *pf,struct xsk_buff_pool *pool,u16 qid); +int otx2_xsk_pool_disable (struct otx2_nic *pf,u16 qid); +int otx2_xsk_pool_alloc_buf (struct otx2_nic *pfvf,struct otx2_pool *pool, +dma_addr_t *dma,int idx); +int otx2_xsk_wakeup (struct net_device *dev,u32 queue_id,u32 flags); + +#endif /* OTX2_XSK_H */
drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c +1 -1
@@ -82,7 +82,7 @@ static int otx2_qos_sq_aura_pool_init(struct otx2_nic *pfvf, int qidx) }for (ptr =0 ; ptr < num_sqbs; ptr++) { - err =otx2_alloc_rbuf (pfvf, pool, &bufptr); + err =otx2_alloc_rbuf (pfvf, pool, &bufptr, pool_id, ptr);if (err) goto sqb_free; pfvf->hw_ops->aura_freeptr (pfvf, pool_id, bufptr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 717/783 octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit 184fb40f731bd3353b0887731f7caba66609e9cd ]
Priority flow control is not supported for LBK and SDP vf. This patch adds support to not add dcbnl_ops for LBK and SDP vf.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +6 -3
@@ -729,9 +729,12 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id) }#ifdef CONFIG_DCB - err =otx2_dcbnl_set_ops (netdev); -if (err) - goto err_free_zc_bmap; +/* Priority flow control is not supported for LBK and SDP vf(s) */ +if (!(is_otx2_lbkvf (vf->pdev) ||is_otx2_sdp_rep (vf->pdev))) { + err =otx2_dcbnl_set_ops (netdev); +if (err) + goto err_free_zc_bmap; + }#endif otx2_qos_init (vf, qos_txqs);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 718/783 net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Liang <[email protected]>
[ Upstream commit e279024617134c94fd3e37470156534d5f2b3472 ]
Syzbot reported a slab-use-after-free with the following call trace:
==================================================================
BUG: KASAN: slab-use-after-free in tipc_aead_encrypt_done+0x4bd/0x510 net/tipc/crypto.c:840 Read of size 8 at addr ffff88807a733000 by task kworker/1:0/25 Call Trace: kasan_report+0xd9/0x110 mm/kasan/report.c:601 tipc_aead_encrypt_done+0x4bd/0x510 net/tipc/crypto.c:840 crypto_request_complete include/crypto/algapi.h:266 aead_request_complete include/crypto/internal/aead.h:85 cryptd_aead_crypt+0x3b8/0x750 crypto/cryptd.c:772 crypto_request_complete include/crypto/algapi.h:266 cryptd_queue_worker+0x131/0x200 crypto/cryptd.c:181 process_one_work+0x9fb/0x1b60 kernel/workqueue.c:3231 Allocated by task 8355: kzalloc_noprof include/linux/slab.h:778 tipc_crypto_start+0xcc/0x9e0 net/tipc/crypto.c:1466 tipc_init_net+0x2dd/0x430 net/tipc/core.c:72 ops_init+0xb9/0x650 net/core/net_namespace.c:139 setup_net+0x435/0xb40 net/core/net_namespace.c:343 copy_net_ns+0x2f0/0x670 net/core/net_namespace.c:508 create_new_namespaces+0x3ea/0xb10 kernel/nsproxy.c:110 unshare_nsproxy_namespaces+0xc0/0x1f0 kernel/nsproxy.c:228 ksys_unshare+0x419/0x970 kernel/fork.c:3323 __do_sys_unshare kernel/fork.c:3394 Freed by task 63: kfree+0x12a/0x3b0 mm/slub.c:4557 tipc_crypto_stop+0x23c/0x500 net/tipc/crypto.c:1539 tipc_exit_net+0x8c/0x110 net/tipc/core.c:119 ops_exit_list+0xb0/0x180 net/core/net_namespace.c:173 cleanup_net+0x5b7/0xbf0 net/core/net_namespace.c:640 process_one_work+0x9fb/0x1b60 kernel/workqueue.c:3231
After freed the tipc_crypto tx by delete namespace, tipc_aead_encrypt_done may still visit it in cryptd_queue_worker workqueue.
I reproduce this issue by:
ip netns add ns1
ip link add veth1 type veth peer name veth2
ip link set veth1 netns ns1
ip netns exec ns1 tipc bearer enable media eth dev veth1 ip netns exec ns1 tipc node set key this_is_a_master_key master ip netns exec ns1 tipc bearer disable media eth dev veth1 ip netns del ns1
The key of reproduction is that, simd_aead_encrypt is interrupted, leading to crypto_simd_usable() return false. Thus, the cryptd_queue_worker is triggered, and the tipc_crypto tx will be visited.
tipc_disc_timeout
tipc_bearer_xmit_skb
tipc_crypto_xmit
tipc_aead_encrypt
crypto_aead_encrypt
// encrypt()
simd_aead_encrypt
// crypto_simd_usable() is false
child = &ctx->cryptd_tfm->base; simd_aead_encrypt
crypto_aead_encrypt
// encrypt()
cryptd_aead_encrypt_enqueue
cryptd_aead_enqueue
cryptd_enqueue_request
// trigger cryptd_queue_worker
queue_work_on(smp_processor_id(), cryptd_wq, &cpu_queue->work)Fix this by holding net reference count before encrypt.
--- net/tipc/crypto.c | 5 +++++ 1 file changed, 5 insertions(+)
net/tipc/crypto.c +5 -0
@@ -817,12 +817,16 @@ static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb, goto exit; } +/* Get net to avoid freed tipc_crypto when delete namespace */ +get_net (aead->crypto->net); +/* Now, do encrypt */ rc =crypto_aead_encrypt (req);if (rc == -EINPROGRESS || rc == -EBUSY )return rc;tipc_bearer_put (b); +put_net (aead->crypto->net); exit:kfree (ctx);
@@ -860,6 +864,7 @@ static void tipc_aead_encrypt_done(void *data, int err)kfree (tx_ctx);tipc_bearer_put (b);tipc_aead_put (aead); +put_net (net); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 719/783 octeontx2-af: Set LMT_ENA bit for APR table entries
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Subbaraya Sundeep <[email protected]>
[ Upstream commit 0eefa27b493306928d88af6368193b134c98fd64 ]
This patch enables the LMT line for a PF/VF by setting the LMT_ENA bit in the APR_LMT_MAP_ENTRY_S structure.
Additionally, it simplifies the logic for calculating the LMTST table index by consistently using the maximum number of hw supported VFs (i.e., 256).
--- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c +13 -2
@@ -15,13 +15,17 @@#define LMT_TBL_OP_WRITE 1#define LMT_MAP_TABLE_SIZE (128 * 1024)#define LMT_MAPTBL_ENTRY_SIZE 16 +#define LMT_MAX_VFS 256 + +#define LMT_MAP_ENTRY_ENA BIT_ULL(20) +#define LMT_MAP_ENTRY_LINES GENMASK_ULL(18, 16)/* Function to perform operations (read/write) on lmtst map table */ static int lmtst_map_table_ops (struct rvu *rvu,u32 index,u64 *val,int lmt_tbl_op) {void __iomem *lmt_map_base; -u64 tbl_base; +u64 tbl_base, cfg; tbl_base =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_MAP_BASE );
@@ -35,6 +39,13 @@ static int lmtst_map_table_ops(struct rvu *rvu, u32 index, u64 *val, *val =readq (lmt_map_base + index); }else {writeq ((*val), (lmt_map_base + index)); + + cfg =FIELD_PREP (LMT_MAP_ENTRY_ENA ,0x1 ); +/* 2048 LMTLINES */ + cfg |=FIELD_PREP (LMT_MAP_ENTRY_LINES ,0x6 ); + +writeq (cfg, (lmt_map_base + (index +8 ))); +/* Flushing the AP interceptor cache to make APR_LMT_MAP_ENTRY_S * changes effective. Write 1 for flush and read is being used as a * barrier and sets up a data dependency. Write to 0 after a write
@@ -52,7 +63,7 @@ static int lmtst_map_table_ops(struct rvu *rvu, u32 index, u64 *val,#define LMT_MAP_TBL_W1_OFF 8static u32 rvu_get_lmtst_tbl_index (struct rvu *rvu,u16 pcifunc) { -return ((rvu_get_pf (pcifunc) * rvu->hw->total_vfs) + +return ((rvu_get_pf (pcifunc) *LMT_MAX_VFS ) + (pcifunc &RVU_PFVF_FUNC_MASK )) *LMT_MAPTBL_ENTRY_SIZE ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 720/783 octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geetha sowjanya <[email protected]>
[ Upstream commit a6ae7129819ad20788e610261246e71736543b8b ]
The current implementation maps the APR table using a fixed size, which can lead to incorrect mapping when the number of PFs and VFs varies.
This patch corrects the mapping by calculating the APR table size dynamically based on the values configured in the APR_LMT_CFG register, ensuring accurate representation of APR entries in debugfs.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 9 ++++++--- .../net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c +6 -3
@@ -13,7 +13,6 @@/* RVU LMTST */ #define LMT_TBL_OP_READ 0#define LMT_TBL_OP_WRITE 1 -#define LMT_MAP_TABLE_SIZE (128 * 1024)#define LMT_MAPTBL_ENTRY_SIZE 16#define LMT_MAX_VFS 256
@@ -26,10 +25,14 @@ static int lmtst_map_table_ops(struct rvu *rvu, u32 index, u64 *val, {void __iomem *lmt_map_base;u64 tbl_base, cfg; +int pfs, vfs; tbl_base =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_MAP_BASE ); + cfg =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_CFG ); + vfs =1 << (cfg &0xF ); + pfs =1 << ((cfg >>4 ) &0x7 ); - lmt_map_base =ioremap_wc (tbl_base,LMT_MAP_TABLE_SIZE ); + lmt_map_base =ioremap_wc (tbl_base, pfs * vfs *LMT_MAPTBL_ENTRY_SIZE );if (!lmt_map_base) {dev_err (rvu->dev,"Failed to setup lmt map table mapping!!\n" );return -ENOMEM ;
@@ -80,7 +83,7 @@ static int rvu_get_lmtaddr(struct rvu *rvu, u16 pcifunc,mutex_lock (&rvu->rsrc_lock);rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_ADDR_REQ , iova); - pf =rvu_get_pf (pcifunc) &0x1F ; + pf =rvu_get_pf (pcifunc) &RVU_PFVF_PF_MASK ; val =BIT_ULL (63 ) |BIT_ULL (14 ) |BIT_ULL (13 ) | pf <<8 | ((pcifunc &RVU_PFVF_FUNC_MASK ) &0xFF );rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_TXN_REQ , val);
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +8 -3
@@ -553,6 +553,7 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,u64 lmt_addr, val, tbl_base;int pf, vf, num_vfs, hw_vfs;void __iomem *lmt_map_base; +int apr_pfs, apr_vfs;int buf_size =10240 ;size_t off =0 ;int index =0 ;
@@ -568,8 +569,12 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,return -ENOMEM ; tbl_base =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_MAP_BASE ); + val =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_CFG ); + apr_vfs =1 << (val &0xF ); + apr_pfs =1 << ((val >>4 ) &0x7 ); - lmt_map_base =ioremap_wc (tbl_base,128 *1024 ); + lmt_map_base =ioremap_wc (tbl_base, apr_pfs * apr_vfs * +LMT_MAPTBL_ENTRY_SIZE );if (!lmt_map_base) {dev_err (rvu->dev,"Failed to setup lmt map table mapping!!\n" );kfree (buf);
@@ -591,7 +596,7 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp, off +=scnprintf (&buf[off], buf_size -1 - off,"PF%d \t\t\t" , pf); - index = pf * rvu->hw->total_vfs *LMT_MAPTBL_ENTRY_SIZE ; + index = pf * apr_vfs *LMT_MAPTBL_ENTRY_SIZE ; off +=scnprintf (&buf[off], buf_size -1 - off," 0x%llx\t\t" , (tbl_base + index)); lmt_addr =readq (lmt_map_base + index);
@@ -604,7 +609,7 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,/* Reading num of VFs per PF */ rvu_get_pf_numvfs (rvu, pf, &num_vfs, &hw_vfs);for (vf =0 ; vf < num_vfs; vf++) { - index = (pf * rvu->hw->total_vfs *16 ) + + index = (pf * apr_vfs *LMT_MAPTBL_ENTRY_SIZE ) + ((vf +1 ) *LMT_MAPTBL_ENTRY_SIZE ); off +=scnprintf (&buf[off], buf_size -1 - off,"PF%d:VF%d \t\t" , pf, vf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 721/783 clk: s2mps11: initialise clk_hw_onecell_data::num before accessing ::hws[] in probe()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Draszik <[email protected]>
commit 3e14c7207a975eefcda1929b2134a9f4119dde45 upstream.
With UBSAN enabled, we're getting the following trace:
UBSAN: array-index-out-of-bounds in .../drivers/clk/clk-s2mps11.c:186:3
index 0 is out of range for type 'struct clk_hw *[] __counted_by(num)' (aka 'struct clk_hw *[]')This is because commit f316cdff8d67 ("clk: Annotate struct clk_hw_onecell_data with __counted_by") annotated the hws member of that struct with __counted_by, which informs the bounds sanitizer about the number of elements in hws, so that it can warn when hws is accessed out of bounds.
As noted in that change, the __counted_by member must be initialised with the number of elements before the first array access happens, otherwise there will be a warning from each access prior to the initialisation because the number of elements is zero. This occurs in s2mps11_clk_probe() due to ::num being assigned after ::hws access.
Move the assignment to satisfy the requirement of assign-before-access.
--- drivers/clk/clk-s2mps11.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/clk-s2mps11.c +2 -1
@@ -137,6 +137,8 @@ static int s2mps11_clk_probe(struct platif (!clk_data)return -ENOMEM ; + clk_data->num =S2MPS11_CLKS_NUM ; +switch (hwid) {case S2MPS11X : s2mps11_reg =S2MPS11_REG_RTC_CTRL ;
@@ -186,7 +188,6 @@ static int s2mps11_clk_probe(struct plat clk_data->hws[i] = &s2mps11_clks[i].hw; } - clk_data->num =S2MPS11_CLKS_NUM ;of_clk_add_hw_provider (s2mps11_clks->clk_np, of_clk_hw_onecell_get, clk_data);
Greg Kroah-Hartman
maintainerPATCH 722/783 crypto: algif_hash - fix double free in hash_accept
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ivan Pravdin <[email protected]>
commit b2df03ed4052e97126267e8c13ad4204ea6ba9b6 upstream.
If accept(2) is called on socket type algif_hash with MSG_MORE flag set and crypto_ahash_import fails, sk2 is freed. However, it is also freed in af_alg_release, leading to slab-use-after-free error.
--- crypto/algif_hash.c | 4 ---- 1 file changed, 4 deletions(-)
crypto/algif_hash.c +0 -4
@@ -265,10 +265,6 @@ static int hash_accept(struct socket *so goto out_free_state; err =crypto_ahash_import (&ctx2->req, state); -if (err) { -sock_orphan (sk2); -sock_put (sk2); - } out_free_state:kfree_sensitive (state);
Greg Kroah-Hartman
maintainerPATCH 723/783 padata: do not leak refcount in reorder_work
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominik Grzegorzek <[email protected]>
commit d6ebcde6d4ecf34f8495fb30516645db3aea8993 upstream.
A recent patch that addressed a UAF introduced a reference count leak:
the parallel_data refcount is incremented unconditionally, regardless of the return value of queue_work(). If the work item is already queued, the incremented refcount is never decremented.
Fix this by checking the return value of queue_work() and decrementing the refcount when necessary.
Resolves:
Unreferenced object 0xffff9d9f421e3d80 (size 192):
comm "cryptomgr_probe", pid 157, jiffies 4294694003 hex dump (first 32 bytes):
80 8b cf 41 9f 9d ff ff b8 97 e0 89 ff ff ff ff ...A............
d0 97 e0 89 ff ff ff ff 19 00 00 00 1f 88 23 00 ..............#.
backtrace (crc 838fb36):
__kmalloc_cache_noprof+0x284/0x320
padata_alloc_pd+0x20/0x1e0
padata_alloc_shell+0x3b/0xa0
0xffffffffc040a54d
cryptomgr_probe+0x43/0xc0
kthread+0xf6/0x1f0
ret_from_fork+0x2f/0x50
ret_from_fork_asm+0x1a/0x30--- kernel/padata.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/padata.c +2 -1
@@ -358,7 +358,8 @@ static void padata_reorder(struct parall* To avoid UAF issue, add pd ref here, and put pd ref after reorder_work finish. */ padata_get_pd (pd); -queue_work (pinst->serial_wq, &pd->reorder_work); +if (!queue_work (pinst->serial_wq, &pd->reorder_work)) +padata_put_pd (pd); } }
Greg Kroah-Hartman
maintainerPATCH 724/783 can: slcan: allow reception of short error messages
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Sanchez <[email protected]>
commit ef0841e4cb08754be6cb42bf97739fce5d086e5f upstream.
Allows slcan to receive short messages (typically errors) from the serial interface.
When error support was added to slcan protocol in b32ff4668544e1333b694fcc7812b2d7397b4d6a ("can: slcan: extend the protocol with error info") the minimum valid message size changed from 5 (minimum standard can frame tIII0) to 3 ("e1a" is a valid protocol message, it is one of the examples given in the comments for slcan_bump_err() ), but the check for minimum message length prodicating all decoding was not adjusted. This makes short error messages discarded and error frames not being generated.
This patch changes the minimum length to the new minimum (3 characters, excluding terminator, is now a valid message).
--- drivers/net/can/slcan/slcan-core.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/net/can/slcan/slcan-core.c +20 -6
@@ -71,12 +71,21 @@ MODULE_AUTHOR("Dario Binacchi <dario.bin#define SLCAN_CMD_LEN 1#define SLCAN_SFF_ID_LEN 3#define SLCAN_EFF_ID_LEN 8 +#define SLCAN_DATA_LENGTH_LEN 1 +#define SLCAN_ERROR_LEN 1#define SLCAN_STATE_LEN 1#define SLCAN_STATE_BE_RXCNT_LEN 3#define SLCAN_STATE_BE_TXCNT_LEN 3 -#define SLCAN_STATE_FRAME_LEN (1 + SLCAN_CMD_LEN + \ - SLCAN_STATE_BE_RXCNT_LEN + \ - SLCAN_STATE_BE_TXCNT_LEN) +#define SLCAN_STATE_MSG_LEN (SLCAN_CMD_LEN + \ + SLCAN_STATE_LEN + \ + SLCAN_STATE_BE_RXCNT_LEN + \ + SLCAN_STATE_BE_TXCNT_LEN) +#define SLCAN_ERROR_MSG_LEN_MIN (SLCAN_CMD_LEN + \ + SLCAN_ERROR_LEN + \ + SLCAN_DATA_LENGTH_LEN) +#define SLCAN_FRAME_MSG_LEN_MIN (SLCAN_CMD_LEN + \ + SLCAN_SFF_ID_LEN + \ + SLCAN_DATA_LENGTH_LEN)struct slcan {struct can_priv can;
@@ -176,6 +185,9 @@ static void slcan_bump_frame(struct slcau32 tmpid;char *cmd = sl->rbuff; +if (sl->rcount <SLCAN_FRAME_MSG_LEN_MIN ) +return ; + skb =alloc_can_skb (sl->dev, &cf);if (unlikely (!skb)) { sl->dev->stats.rx_dropped++;
@@ -281,7 +293,7 @@ static void slcan_bump_state(struct slcareturn ; } -if (state == sl->can.state || sl->rcount <SLCAN_STATE_FRAME_LEN ) +if (state == sl->can.state || sl->rcount !=SLCAN_STATE_MSG_LEN )return ; cmd +=SLCAN_STATE_BE_RXCNT_LEN +SLCAN_CMD_LEN +1 ;
@@ -328,6 +340,9 @@ static void slcan_bump_err(struct slcanbool rx_errors = false, tx_errors = false, rx_over_errors = false;int i, len; +if (sl->rcount <SLCAN_ERROR_MSG_LEN_MIN ) +return ; +/* get len from sanitized ASCII value */ len = cmd[1 ];if (len >='0' && len <'9' )
@@ -456,8 +471,7 @@ static void slcan_bump(struct slcan *sl)static void slcan_unesc (struct slcan *sl,unsigned char s) {if ((s =='\r' ) || (s =='\a' )) {/* CR or BEL ends the pdu */ -if (!test_and_clear_bit (SLF_ERROR , &sl->flags) && - sl->rcount >4 ) +if (!test_and_clear_bit (SLF_ERROR , &sl->flags))slcan_bump (sl); sl->rcount =0 ;
Greg Kroah-Hartman
maintainerPATCH 725/783 can: bcm: add locking for bcm_op runtime updates
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
commit c2aba69d0c36a496ab4f2e81e9c2b271f2693fd7 upstream.
The CAN broadcast manager (CAN BCM) can send a sequence of CAN frames via hrtimer. The content and also the length of the sequence can be changed resp reduced at runtime where the 'currframe' counter is then set to zero.
Although this appeared to be a safe operation the updates of 'currframe' can be triggered from user space and hrtimer context in bcm_can_tx(). Anderson Nascimento created a proof of concept that triggered a KASAN slab-out-of-bounds read access which can be prevented with a spin_lock_bh.
At the rework of bcm_can_tx() the 'count' variable has been moved into the protected section as this variable can be modified from both contexts too.
--- net/can/bcm.c | 66 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 21 deletions(-)
net/can/bcm.c +45 -21
@@ -58,6 +58,7 @@#include <linux/can/skb.h> #include <linux/can/bcm.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <net/sock.h> #include <net/net_namespace.h>
@@ -122,6 +123,7 @@ struct bcm_op {struct canfd_frame last_sframe;struct sock *sk;struct net_device *rx_reg_dev; +spinlock_t bcm_tx_lock;/* protect currframe/count in runtime updates */ };struct bcm_sock {
@@ -285,13 +287,18 @@ static void bcm_can_tx(struct bcm_op *op {struct sk_buff *skb;struct net_device *dev; -struct canfd_frame *cf = op->frames + op->cfsiz * op->currframe; +struct canfd_frame *cf;int err;/* no target device? => exit */ if (!op->ifindex)return ; +/* read currframe under lock protection */ +spin_lock_bh (&op->bcm_tx_lock); + cf = op->frames + op->cfsiz * op->currframe; +spin_unlock_bh (&op->bcm_tx_lock); + dev =dev_get_by_index (sock_net (op->sk), op->ifindex);if (!dev) {/* RFC: should this bcm_op remove itself here? */
@@ -312,6 +319,10 @@ static void bcm_can_tx(struct bcm_op *op skb->dev = dev;can_skb_set_owner (skb, op->sk); err =can_send (skb,1 ); + +/* update currframe and count under lock protection */ +spin_lock_bh (&op->bcm_tx_lock); +if (!err) op->frames_abs++;
@@ -320,6 +331,11 @@ static void bcm_can_tx(struct bcm_op *op/* reached last frame? */ if (op->currframe >= op->nframes) op->currframe =0 ; + +if (op->count >0 ) + op->count--; + +spin_unlock_bh (&op->bcm_tx_lock); out:dev_put (dev); }
@@ -430,7 +446,7 @@ static enum hrtimer_restart bcm_tx_timeostruct bcm_msg_head msg_head;if (op->kt_ival1 && (op->count >0 )) { - op->count--; +bcm_can_tx (op);if (!op->count && (op->flags &TX_COUNTEVT )) {/* create notification to user */
@@ -445,7 +461,6 @@ static enum hrtimer_restart bcm_tx_timeobcm_send_to_user (op, &msg_head,NULL ,0 ); } -bcm_can_tx (op); }else if (op->kt_ival2) {bcm_can_tx (op);
@@ -956,6 +971,27 @@ static int bcm_tx_setup(struct bcm_msg_h } op->flags = msg_head->flags; +/* only lock for unlikely count/nframes/currframe changes */ +if (op->nframes != msg_head->nframes || + op->flags &TX_RESET_MULTI_IDX || + op->flags &SETTIMER ) { + +spin_lock_bh (&op->bcm_tx_lock); + +if (op->nframes != msg_head->nframes || + op->flags &TX_RESET_MULTI_IDX ) { +/* potentially update changed nframes */ + op->nframes = msg_head->nframes; +/* restart multiple frame transmission */ + op->currframe =0 ; + } + +if (op->flags &SETTIMER ) + op->count = msg_head->count; + +spin_unlock_bh (&op->bcm_tx_lock); + } + }else {/* insert new BCM operation for the given can_id */
@@ -963,9 +999,14 @@ static int bcm_tx_setup(struct bcm_msg_hif (!op)return -ENOMEM ; +spin_lock_init (&op->bcm_tx_lock); op->can_id = msg_head->can_id; op->cfsiz =CFSIZ (msg_head->flags); op->flags = msg_head->flags; + op->nframes = msg_head->nframes; + +if (op->flags &SETTIMER ) + op->count = msg_head->count;/* create array for CAN frames and copy the data */ if (msg_head->nframes >1 ) {
@@ -1024,22 +1065,8 @@ static int bcm_tx_setup(struct bcm_msg_h }/* if ((op = bcm_find_op(&bo->tx_ops, msg_head->can_id, ifindex))) */ -if (op->nframes != msg_head->nframes) { - op->nframes = msg_head->nframes; -/* start multiple frame transmission with index 0 */ - op->currframe =0 ; - } - -/* check flags */ - -if (op->flags &TX_RESET_MULTI_IDX ) { -/* start multiple frame transmission with index 0 */ - op->currframe =0 ; - } -if (op->flags &SETTIMER ) {/* set timer values */ - op->count = msg_head->count; op->ival1 = msg_head->ival1; op->ival2 = msg_head->ival2; op->kt_ival1 =bcm_timeval_to_ktime (msg_head->ival1);
@@ -1056,11 +1083,8 @@ static int bcm_tx_setup(struct bcm_msg_h op->flags |=TX_ANNOUNCE ; } -if (op->flags &TX_ANNOUNCE ) { +if (op->flags &TX_ANNOUNCE )bcm_can_tx (op); -if (op->count) - op->count--; - }if (op->flags &STARTTIMER )bcm_tx_start_timer (op);
Greg Kroah-Hartman
maintainerPATCH 726/783 can: bcm: add missing rcu read protection for procfs content
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
commit dac5e6249159ac255dad9781793dbe5908ac9ddb upstream.
When the procfs content is generated for a bcm_op which is in the process to be removed the procfs output might show unreliable data (UAF).
As the removal of bcm_op's is already implemented with rcu handling this patch adds the missing rcu_read_lock() and makes sure the list entries are properly removed under rcu protection.
--- net/can/bcm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/can/bcm.c +9 -4
@@ -219,7 +219,9 @@ static int bcm_proc_show(struct seq_fileseq_printf (m," / bound %s" ,bcm_proc_getifname (net, ifname, bo->ifindex));seq_printf (m," <<<\n" ); -list_for_each_entry (op, &bo->rx_ops, list) { +rcu_read_lock (); + +list_for_each_entry_rcu (op, &bo->rx_ops, list) {unsigned long reduction;
@@ -275,6 +277,9 @@ static int bcm_proc_show(struct seq_file seq_printf(m, "# sent %ld\n", op->frames_abs); }seq_putc (m,'\n' ); + +rcu_read_unlock (); +return 0 ; }#endif /* CONFIG_PROC_FS */
@@ -858,7 +863,7 @@ static int bcm_delete_rx_op(struct list_REGMASK (op->can_id), bcm_rx_handler, op); -list_del (&op->list); +list_del_rcu (&op->list);bcm_remove_op (op);return 1 ;/* done */ }
@@ -878,7 +883,7 @@ static int bcm_delete_tx_op(struct list_list_for_each_entry_safe (op, n, ops, list) {if ((op->can_id == mh->can_id) && (op->ifindex == ifindex) && (op->flags &CAN_FD_FRAME ) == (mh->flags &CAN_FD_FRAME )) { -list_del (&op->list); +list_del_rcu (&op->list);bcm_remove_op (op);return 1 ;/* done */ }
@@ -1300,7 +1305,7 @@ static int bcm_rx_setup(struct bcm_msg_h bcm_rx_handler, op, "bcm", sk);if (err) {/* this bcm rx op is broken -> remove it */ -list_del (&op->list); +list_del_rcu (&op->list);bcm_remove_op (op);return err; }
Greg Kroah-Hartman
maintainerPATCH 727/783 ASoC: SOF: ipc4-control: Use SOF_CTRL_CMD_BINARY as numid for bytes_ext
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
commit 4d14b1069e9e672dbe1adab52594076da6f4a62d upstream.
The header.numid is set to scontrol->comp_id in bytes_ext_get and it is ignored during bytes_ext_put.
The use of comp_id is not quite great as it is kernel internal identification number.
Set the header.numid to SOF_CTRL_CMD_BINARY during get and validate the numid during put to provide consistent and compatible identification number as IPC3.
For IPC4 existing tooling also ignored the numid but with the use of SOF_CTRL_CMD_BINARY the different handling of the blobs can be dropped, providing better user experience.
--- sound/soc/sof/ipc4-control.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
sound/soc/sof/ipc4-control.c +10 -1
@@ -531,6 +531,14 @@ static int sof_ipc4_bytes_ext_put(structreturn -EINVAL ; } +/* Check header id */ +if (header.numid !=SOF_CTRL_CMD_BINARY ) { +dev_err_ratelimited (scomp->dev, +"Incorrect numid for bytes put %d\n" , + header.numid); +return -EINVAL ; + } +/* Verify the ABI header first */ if (copy_from_user (&abi_hdr, tlvd->tlv,sizeof (abi_hdr)))return -EFAULT ;
@@ -613,7 +621,8 @@ static int _sof_ipc4_bytes_ext_get(strucif (data_size > size)return -ENOSPC ; - header.numid = scontrol->comp_id; +/* Set header id and length */ + header.numid =SOF_CTRL_CMD_BINARY ; header.length = data_size;if (copy_to_user (tlvd, &header,sizeof (struct snd_ctl_tlv )))
Greg Kroah-Hartman
maintainerPATCH 728/783 ASoC: SOF: Intel: hda-bus: Use PIO mode on ACE2+ platforms
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
commit 4e7010826e96702d7fad13dbe85de4e94052f833 upstream.
Keep using the PIO mode for commands on ACE2+ platforms, similarly how the legacy stack is configured.
--- sound/soc/sof/intel/hda-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/intel/hda-bus.c +1 -1
@@ -76,7 +76,7 @@ void sof_hda_bus_init(struct snd_sof_devsnd_hdac_ext_bus_init (bus, dev, &bus_core_ops, sof_hda_ext_ops); -if (chip && chip->hw_ip_version ==SOF_INTEL_ACE_2_0 ) +if (chip && chip->hw_ip_version >=SOF_INTEL_ACE_2_0 ) bus->use_pio_for_commands = true;#else snd_hdac_ext_bus_init (bus, dev,NULL ,NULL );
Greg Kroah-Hartman
maintainerPATCH 729/783 ASoc: SOF: topology: connect DAI to a single DAI link
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Vehmanen <[email protected]>
commit 6052f05254b4fe7b16bbd8224779af52fba98b71 upstream.
The partial matching of DAI widget to link names, can cause problems if one of the widget names is a substring of another. E.g. with names "Foo1" and Foo10", it's not possible to correctly link up "Foo1".
Modify the logic so that if multiple DAI links match the widget stream name, prioritize a full match if one is found.
--- sound/soc/sof/topology.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
sound/soc/sof/topology.c +14 -4
@@ -1063,7 +1063,7 @@ static int sof_connect_dai_widget(struct struct snd_sof_dai *dai) {struct snd_soc_card *card = scomp->card; -struct snd_soc_pcm_runtime *rtd; +struct snd_soc_pcm_runtime *rtd, *full, *partial;struct snd_soc_dai *cpu_dai;int stream;int i;
@@ -1080,12 +1080,22 @@ static int sof_connect_dai_widget(structelse goto end; + full =NULL ; + partial =NULL ;list_for_each_entry (rtd, &card->rtd_list, list) {/* does stream match DAI link ? */ -if (!rtd->dai_link->stream_name || - !strstr (rtd->dai_link->stream_name, w->sname)) -continue ; +if (rtd->dai_link->stream_name) { +if (!strcmp (rtd->dai_link->stream_name, w->sname)) { + full = rtd; +break ; + }else if (strstr (rtd->dai_link->stream_name, w->sname)) { + partial = rtd; + } + } + } + rtd = full ? full : partial; +if (rtd) {for_each_rtd_cpu_dais (rtd, i, cpu_dai) {/* * Please create DAI widget in the right order
Greg Kroah-Hartman
maintainerPATCH 730/783 ASoC: SOF: ipc4-pcm: Delay reporting is only supported for playback direction
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
commit 98db16f314b3a0d6e5acd94708ea69751436467f upstream.
The firmware does not provide any information for capture streams via the shared pipeline registers.
To avoid reporting invalid delay value for capture streams to user space we need to disable it.
--- sound/soc/sof/ipc4-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/sof/ipc4-pcm.c +2 -1
@@ -797,7 +797,8 @@ static int sof_ipc4_pcm_setup(struct snd spcm->stream[stream].private = stream_priv; -if (!support_info) +/* Delay reporting is only supported on playback */ +if (!support_info || stream ==SNDRV_PCM_STREAM_CAPTURE )continue ; time_info =kzalloc (sizeof (*time_info),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 731/783 ALSA: pcm: Fix race of buffer access at PCM OSS layer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 93a81ca0657758b607c3f4ba889ae806be9beb73 upstream.
The PCM OSS layer tries to clear the buffer with the silence data at initialization (or reconfiguration) of a stream with the explicit call of snd_pcm_format_set_silence() with runtime->dma_area. But this may lead to a UAF because the accessed runtime->dma_area might be freed concurrently, as it's performed outside the PCM ops.
For avoiding it, move the code into the PCM core and perform it inside the buffer access lock, so that it won't be changed during the operation.
--- include/sound/pcm.h | 2 ++ sound/core/oss/pcm_oss.c | 3 +-- sound/core/pcm_native.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-)
include/sound/pcm.h +2 -0
@@ -1404,6 +1404,8 @@ int snd_pcm_lib_mmap_iomem(struct snd_pc#define snd_pcm_lib_mmap_iomem NULL#endif +void snd_pcm_runtime_buffer_set_silence (struct snd_pcm_runtime *runtime); +/** * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer * @dma: DMA number
sound/core/oss/pcm_oss.c +1 -2
@@ -1074,8 +1074,7 @@ static int snd_pcm_oss_change_params_loc runtime->oss.params =0 ; runtime->oss.prepare =1 ; runtime->oss.buffer_used =0 ; -if (runtime->dma_area) -snd_pcm_format_set_silence (runtime->format, runtime->dma_area,bytes_to_samples (runtime, runtime->dma_bytes)); +snd_pcm_runtime_buffer_set_silence (runtime); runtime->oss.period_frames =snd_pcm_alsa_frames (substream, oss_period_size);
sound/core/pcm_native.c +11 -0
@@ -723,6 +723,17 @@ static void snd_pcm_buffer_access_unlockatomic_inc (&runtime->buffer_accessing); } +/* fill the PCM buffer with the current silence format; called from pcm_oss.c */ +void snd_pcm_runtime_buffer_set_silence (struct snd_pcm_runtime *runtime) +{ +snd_pcm_buffer_access_lock (runtime); +if (runtime->dma_area) +snd_pcm_format_set_silence (runtime->format, runtime->dma_area, +bytes_to_samples (runtime, runtime->dma_bytes)); +snd_pcm_buffer_access_unlock (runtime); +} +EXPORT_SYMBOL_GPL (snd_pcm_runtime_buffer_set_silence); +#if IS_ENABLED (CONFIG_SND_PCM_OSS )#define is_oss_stream (substream) ((substream)->oss.oss)#else
Greg Kroah-Hartman
maintainerPATCH 732/783 ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ed Burcher <[email protected]>
commit 8d70503068510e6080c2c649cccb154f16de26c9 upstream.
Lenovo Yoga Pro 7 (gen 10) with Realtek ALC3306 and combined CS35L56 amplifiers need quirk ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN to enable bass
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -11234,6 +11234,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x17aa ,0x38fa ,"Thinkbook 16P Gen5" ,ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD ),SND_PCI_QUIRK (0x17aa ,0x38fd ,"ThinkBook plus Gen5 Hybrid" ,ALC287_FIXUP_TAS2781_I2C ),SND_PCI_QUIRK (0x17aa ,0x3902 ,"Lenovo E50-80" ,ALC269_FIXUP_DMIC_THINKPAD_ACPI ), +SND_PCI_QUIRK (0x17aa ,0x390d ,"Lenovo Yoga Pro 7 14ASP10" ,ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN ),SND_PCI_QUIRK (0x17aa ,0x3913 ,"Lenovo 145" ,ALC236_FIXUP_LENOVO_INV_DMIC ),SND_PCI_QUIRK (0x17aa ,0x391f ,"Yoga S990-16 pro Quad YC Quad" ,ALC287_FIXUP_TAS2781_I2C ), SND_PCI_QUIRK(0x17aa, 0x3920, "Yoga S990-16 pro Quad VECO Quad", ALC287_FIXUP_TAS2781_I2C),
Greg Kroah-Hartman
maintainerPATCH 733/783 llc: fix data loss when reading from a socket in llc_ui_recvmsg()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilia Gavrilov <[email protected]>
commit 239af1970bcb039a1551d2c438d113df0010c149 upstream.
For SOCK_STREAM sockets, if user buffer size (len) is less than skb size (skb->len), the remaining data from skb will be lost after calling kfree_skb().
To fix this, move the statement for partial reading above skb deletion.
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org)
--- net/llc/af_llc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/llc/af_llc.c +4 -4
@@ -887,15 +887,15 @@ static int llc_ui_recvmsg(struct socketif (sk->sk_type !=SOCK_STREAM ) goto copy_uaddr; +/* Partial read */ +if (used + offset < skb_len) +continue ; +if (!(flags &MSG_PEEK )) {skb_unlink (skb, &sk->sk_receive_queue);kfree_skb (skb); *seq =0 ; } - -/* Partial read */ -if (used + offset < skb_len) -continue ; }while (len >0 ); out:
Greg Kroah-Hartman
maintainerPATCH 734/783 can: kvaser_pciefd: Continue parsing DMA buf after dropped RX
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Axel Forsman <[email protected]>
commit 6d820b81c4dc4a4023e45c3cd6707a07dd838649 upstream.
Going bus-off on a channel doing RX could result in dropped packets.
As netif_running() gets cleared before the channel abort procedure, the handling of any last RDATA packets would see netif_rx() return non-zero to signal a dropped packet. kvaser_pciefd_read_buffer() dealt with this "error" by breaking out of processing the remaining DMA RX buffer.
Only return an error from kvaser_pciefd_read_buffer() due to packet corruption, otherwise handle it internally.
--- drivers/net/can/kvaser_pciefd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/can/kvaser_pciefd.c +5 -3
@@ -1201,7 +1201,7 @@ static int kvaser_pciefd_handle_data_pac skb =alloc_canfd_skb (priv->dev, &cf);if (!skb) { priv->dev->stats.rx_dropped++; -return -ENOMEM ; +return 0 ; } cf->len =can_fd_dlc2len (dlc);
@@ -1213,7 +1213,7 @@ static int kvaser_pciefd_handle_data_pac skb =alloc_can_skb (priv->dev, (struct can_frame **)&cf);if (!skb) { priv->dev->stats.rx_dropped++; -return -ENOMEM ; +return 0 ; }can_frame_set_cc_len ((struct can_frame *)cf, dlc, priv->ctrlmode); }
@@ -1231,7 +1231,9 @@ static int kvaser_pciefd_handle_data_pac priv->dev->stats.rx_packets++;kvaser_pciefd_set_skb_timestamp (pcie, skb, p->timestamp); -return netif_rx (skb); +netif_rx (skb); + +return 0 ; } static void kvaser_pciefd_change_state(struct kvaser_pciefd_can *can,
Greg Kroah-Hartman
maintainerPATCH 735/783 can: kvaser_pciefd: Fix echo_skb race
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Axel Forsman <[email protected]>
commit 8256e0ca601051933e9395746817f3801fa9a6bf upstream.
The functions kvaser_pciefd_start_xmit() and kvaser_pciefd_handle_ack_packet() raced to stop/wake TX queues and get/put echo skbs, as kvaser_pciefd_can->echo_lock was only ever taken when transmitting and KCAN_TX_NR_PACKETS_CURRENT gets decremented prior to handling of ACKs. E.g., this caused the following error:
can_put_echo_skb: BUG! echo_skb 5 is occupied!
Instead, use the synchronization helpers in netdev_queues.h. As those piggyback on BQL barriers, start updating in-flight packets and bytes counts as well.
--- drivers/net/can/kvaser_pciefd.c | 93 +++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 34 deletions(-)
drivers/net/can/kvaser_pciefd.c +59 -34
@@ -16,6 +16,7 @@#include <linux/netdevice.h> #include <linux/pci.h> #include <linux/timer.h> +#include <net/netdev_queues.h> MODULE_LICENSE ("Dual BSD/GPL" );MODULE_AUTHOR ("Kvaser AB <[email protected]>" );
@@ -410,10 +411,13 @@ struct kvaser_pciefd_can {void __iomem *reg_base;struct can_berr_counter bec;u8 cmd_seq; +u8 tx_max_count; +u8 tx_idx; +u8 ack_idx;int err_rep_cnt; -int echo_idx; +unsigned int completed_tx_pkts; +unsigned int completed_tx_bytes;spinlock_t lock;/* Locks sensitive registers (e.g. MODE) */ -spinlock_t echo_lock;/* Locks the message echo buffer */ struct timer_list bec_poll_timer;struct completion start_comp, flush_comp; };
@@ -714,6 +718,9 @@ static int kvaser_pciefd_open(struct netint ret;struct kvaser_pciefd_can *can =netdev_priv (netdev); + can->tx_idx =0 ; + can->ack_idx =0 ; + ret =open_candev (netdev);if (ret)return ret;
@@ -745,21 +752,26 @@ static int kvaser_pciefd_stop(struct netdel_timer (&can->bec_poll_timer); } can->can.state =CAN_STATE_STOPPED ; +netdev_reset_queue (netdev);close_candev (netdev);return ret; } +static unsigned int kvaser_pciefd_tx_avail (const struct kvaser_pciefd_can *can) +{ +return can->tx_max_count - (READ_ONCE (can->tx_idx) -READ_ONCE (can->ack_idx)); +} +static int kvaser_pciefd_prepare_tx_packet (struct kvaser_pciefd_tx_packet *p, -struct kvaser_pciefd_can *can, +struct can_priv *can,u8 seq,struct sk_buff *skb) {struct canfd_frame *cf = (struct canfd_frame *)skb->data;int packet_size; -int seq = can->echo_idx;memset (p,0 ,sizeof (*p)); -if (can->can.ctrlmode &CAN_CTRLMODE_ONE_SHOT ) +if (can->ctrlmode &CAN_CTRLMODE_ONE_SHOT ) p->header[1 ] |=KVASER_PCIEFD_TPACKET_SMS ;if (cf->can_id &CAN_RTR_FLAG )
@@ -782,7 +794,7 @@ static int kvaser_pciefd_prepare_tx_pack }else { p->header[1 ] |=FIELD_PREP (KVASER_PCIEFD_RPACKET_DLC_MASK , -can_get_cc_dlc ((struct can_frame *)cf, can->can.ctrlmode)); +can_get_cc_dlc ((struct can_frame *)cf, can->ctrlmode)); } p->header[1 ] |=FIELD_PREP (KVASER_PCIEFD_PACKET_SEQ_MASK , seq);
@@ -797,22 +809,24 @@ static netdev_tx_t kvaser_pciefd_start_x struct net_device *netdev) {struct kvaser_pciefd_can *can =netdev_priv (netdev); -unsigned long irq_flags;struct kvaser_pciefd_tx_packet packet; +unsigned int seq = can->tx_idx & (can->can.echo_skb_max -1 ); +unsigned int frame_len;int nr_words; -u8 count;if (can_dev_dropped_skb (netdev, skb))return NETDEV_TX_OK ; +if (!netif_subqueue_maybe_stop (netdev,0 ,kvaser_pciefd_tx_avail (can),1 ,1 )) +return NETDEV_TX_BUSY ; - nr_words =kvaser_pciefd_prepare_tx_packet (&packet, can, skb); + nr_words =kvaser_pciefd_prepare_tx_packet (&packet, &can->can, seq, skb); -spin_lock_irqsave (&can->echo_lock, irq_flags);/* Prepare and save echo skb in internal slot */ -can_put_echo_skb (skb, netdev, can->echo_idx,0 ); - -/* Move echo index to the next slot */ - can->echo_idx = (can->echo_idx +1 ) % can->can.echo_skb_max; +WRITE_ONCE (can->can.echo_skb[seq],NULL ); + frame_len =can_skb_get_frame_len (skb); +can_put_echo_skb (skb, netdev, seq, frame_len); +netdev_sent_queue (netdev, frame_len); +WRITE_ONCE (can->tx_idx, can->tx_idx +1 );/* Write header to fifo */ iowrite32(packet.header[0],
@@ -836,14 +850,7 @@ static netdev_tx_t kvaser_pciefd_start_x KVASER_PCIEFD_KCAN_FIFO_LAST_REG); } - count =FIELD_GET (KVASER_PCIEFD_KCAN_TX_NR_PACKETS_CURRENT_MASK , -ioread32 (can->reg_base +KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG )); -/* No room for a new message, stop the queue until at least one -* successful transmit -*/ -if (count >= can->can.echo_skb_max || can->can.echo_skb[can->echo_idx]) -netif_stop_queue (netdev); -spin_unlock_irqrestore (&can->echo_lock, irq_flags); +netif_subqueue_maybe_stop (netdev,0 ,kvaser_pciefd_tx_avail (can),1 ,1 );return NETDEV_TX_OK ; }
@@ -970,6 +977,8 @@ static int kvaser_pciefd_setup_can_ctrls can->kv_pcie = pcie; can->cmd_seq =0 ; can->err_rep_cnt =0 ; + can->completed_tx_pkts =0 ; + can->completed_tx_bytes =0 ; can->bec.txerr =0 ; can->bec.rxerr =0 ;
@@ -983,11 +992,10 @@ static int kvaser_pciefd_setup_can_ctrls tx_nr_packets_max =FIELD_GET (KVASER_PCIEFD_KCAN_TX_NR_PACKETS_MAX_MASK ,ioread32 (can->reg_base +KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG )); + can->tx_max_count =min (KVASER_PCIEFD_CAN_TX_MAX_COUNT , tx_nr_packets_max -1 ); can->can.clock.freq = pcie->freq; - can->can.echo_skb_max =min (KVASER_PCIEFD_CAN_TX_MAX_COUNT , tx_nr_packets_max -1 ); - can->echo_idx =0 ; -spin_lock_init (&can->echo_lock); + can->can.echo_skb_max =roundup_pow_of_two (can->tx_max_count);spin_lock_init (&can->lock); can->can.bittiming_const = &kvaser_pciefd_bittiming_const;
@@ -1512,19 +1520,21 @@ static int kvaser_pciefd_handle_ack_packnetdev_dbg (can->can.dev,"Packet was flushed\n" ); }else {int echo_idx =FIELD_GET (KVASER_PCIEFD_PACKET_SEQ_MASK , p->header[0 ]); -int len; -u8 count; +unsigned int len, frame_len =0 ;struct sk_buff *skb; +if (echo_idx != (can->ack_idx & (can->can.echo_skb_max -1 ))) +return 0 ; skb = can->can.echo_skb[echo_idx]; -if (skb) -kvaser_pciefd_set_skb_timestamp (pcie, skb, p->timestamp); - len =can_get_echo_skb (can->can.dev, echo_idx,NULL ); - count =FIELD_GET (KVASER_PCIEFD_KCAN_TX_NR_PACKETS_CURRENT_MASK , -ioread32 (can->reg_base +KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG )); +if (!skb) +return 0 ; +kvaser_pciefd_set_skb_timestamp (pcie, skb, p->timestamp); + len =can_get_echo_skb (can->can.dev, echo_idx, &frame_len); -if (count < can->can.echo_skb_max &&netif_queue_stopped (can->can.dev)) -netif_wake_queue (can->can.dev); +/* Pairs with barrier in kvaser_pciefd_start_xmit() */ +smp_store_release (&can->ack_idx, can->ack_idx +1 ); + can->completed_tx_pkts++; + can->completed_tx_bytes += frame_len;if (!one_shot_fail) { can->can.dev->stats.tx_bytes += len;
@@ -1640,11 +1650,26 @@ static int kvaser_pciefd_read_buffer(str {int pos =0 ;int res =0 ; +unsigned int i;do { res =kvaser_pciefd_read_packet (pcie, &pos, dma_buf); }while (!res && pos >0 && pos <KVASER_PCIEFD_DMA_SIZE ); +/* Report ACKs in this buffer to BQL en masse for correct periods */ +for (i =0 ; i < pcie->nr_channels; ++i) { +struct kvaser_pciefd_can *can = pcie->can[i]; + +if (!can->completed_tx_pkts) +continue ; +netif_subqueue_completed_wake (can->can.dev,0 , + can->completed_tx_pkts, + can->completed_tx_bytes, +kvaser_pciefd_tx_avail (can),1 ); + can->completed_tx_pkts =0 ; + can->completed_tx_bytes =0 ; + } +return res; }
Greg Kroah-Hartman
maintainerPATCH 736/783 io_uring/net: only retry recv bundle for a full transfer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 3a08988123c868dbfdd054541b1090fb891fa49e upstream.
If a shorter than assumed transfer was seen, a partial buffer will have been filled. For that case it isn't sane to attempt to fill more into the bundle before posting a completion, as that will cause a gap in the received data.
Check if the iterator has hit zero and only allow to continue a bundle operation if that is the case.
Also ensure that for putting finished buffers, only the current transfer is accounted. Otherwise too many buffers may be put for a short transfer.
--- io_uring/net.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
io_uring/net.c +10 -4
@@ -860,18 +860,24 @@ static inline bool io_recv_finish(struct cflags |=IORING_CQE_F_SOCK_NONEMPTY ;if (sr->flags &IORING_RECVSEND_BUNDLE ) { - cflags |=io_put_kbufs (req, *ret,io_bundle_nbufs (kmsg, *ret), +size_t this_ret = *ret - sr->done_io; + + cflags |=io_put_kbufs (req, *ret,io_bundle_nbufs (kmsg, this_ret), issue_flags);if (sr->retry) cflags = req->cqe.flags | (cflags &CQE_F_MASK );/* bundle with no more immediate buffers, we're done */ if (req->flags &REQ_F_BL_EMPTY ) goto finish; -/* if more is available, retry and append to this one */ -if (!sr->retry && kmsg->msg.msg_inq >0 && *ret >0 ) { +/* +* If more is available AND it was a full transfer, retry and +* append to this one +*/ +if (!sr->retry && kmsg->msg.msg_inq >0 && this_ret >0 && + !iov_iter_count (&kmsg->msg.msg_iter)) { req->cqe.flags = cflags & ~CQE_F_MASK ; sr->len = kmsg->msg.msg_inq; - sr->done_io += *ret; + sr->done_io += this_ret; sr->retry = true;return false; }
Greg Kroah-Hartman
maintainerPATCH 737/783 net: dsa: microchip: linearize skb for tail-tagging switches
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakob Unterwurzacher <[email protected]>
commit ba54bce747fa9e07896c1abd9b48545f7b4b31d2 upstream.
The pointer arithmentic for accessing the tail tag only works for linear skbs.
For nonlinear skbs, it reads uninitialized memory inside the skb headroom, essentially randomizing the tag. I have observed it gets set to 6 most of the time.
Example where ksz9477_rcv thinks that the packet from port 1 comes from port 6 (which does not exist for the ksz9896 that's in use), dropping the packet. Debug prints added by me (not included in this patch):
[ 256.645337] ksz9477_rcv:323 tag0=6 [ 256.645349] skb len=47 headroom=78 headlen=0 tailroom=0 mac=(64,14) mac_len=14 net=(78,0) trans=78 shinfo(txflags=0 nr_frags=1 gso(size=0 type=0 segs=0)) csum(0x0 start=0 offset=0 ip_summed=0 complete_sw=0 valid=0 level=0) hash(0x0 sw=0 l4=0) proto=0x00f8 pkttype=1 iif=3 priority=0x0 mark=0x0 alloc_cpu=0 vlan_all=0x0 encapsulation=0 inner(proto=0x0000, mac=0, net=0, trans=0) [ 256.645377] dev name=end1 feat=0x0002e10200114bb3 [ 256.645386] skb headroom: 00000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 256.645395] skb headroom: 00000010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 256.645403] skb headroom: 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 256.645411] skb headroom: 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 256.645420] skb headroom: 00000040: ff ff ff ff ff ff 00 1c 19 f2 e2 db 08 06 [ 256.645428] skb frag: 00000000: 00 01 08 00 06 04 00 01 00 1c 19 f2 e2 db 0a 02 [ 256.645436] skb frag: 00000010: 00 83 00 00 00 00 00 00 0a 02 a0 2f 00 00 00 00 [ 256.645444] skb frag: 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 [ 256.645452] ksz_common_rcv:92 dsa_conduit_find_user returned NULL
Call skb_linearize before trying to access the tag.
This patch fixes ksz9477_rcv which is used by the ksz9896 I have at hand, and also applies the same fix to ksz8795_rcv which seems to have the same problem.
--- net/dsa/tag_ksz.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
net/dsa/tag_ksz.c +15 -4
@@ -140,7 +140,12 @@ static struct sk_buff *ksz8795_xmit(strustatic struct sk_buff *ksz8795_rcv (struct sk_buff *skb,struct net_device *dev) { -u8 *tag =skb_tail_pointer (skb) -KSZ_EGRESS_TAG_LEN ; +u8 *tag; + +if (skb_linearize (skb)) +return NULL ; + + tag =skb_tail_pointer (skb) -KSZ_EGRESS_TAG_LEN ;return ksz_common_rcv (skb, dev, tag[0 ] &KSZ8795_TAIL_TAG_EG_PORT_M ,KSZ_EGRESS_TAG_LEN );
@@ -311,10 +316,16 @@ static struct sk_buff *ksz9477_xmit(strustatic struct sk_buff *ksz9477_rcv (struct sk_buff *skb,struct net_device *dev) { -/* Tag decoding */ -u8 *tag =skb_tail_pointer (skb) -KSZ_EGRESS_TAG_LEN ; -unsigned int port = tag[0 ] &KSZ9477_TAIL_TAG_EG_PORT_M ;unsigned int len =KSZ_EGRESS_TAG_LEN ; +unsigned int port; +u8 *tag; + +if (skb_linearize (skb)) +return NULL ; + +/* Tag decoding */ + tag =skb_tail_pointer (skb) -KSZ_EGRESS_TAG_LEN ; + port = tag[0 ] &KSZ9477_TAIL_TAG_EG_PORT_M ;/* Extra 4-bytes PTP timestamp */ if (tag[0 ] &KSZ9477_PTP_TAG_INDICATION ) {
Greg Kroah-Hartman
maintainerPATCH 738/783 vmxnet3: update MTU after device quiesce
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronak Doshi <[email protected]>
commit 43f0999af011fba646e015f0bb08b6c3002a0170 upstream.
Currently, when device mtu is updated, vmxnet3 updates netdev mtu, quiesces the device and then reactivates it for the ESXi to know about the new mtu. So, technically the OS stack can start using the new mtu before ESXi knows about the new mtu.
This can lead to issues for TSO packets which use mss as per the new mtu configured. This patch fixes this issue by moving the mtu write after device quiesce.
Changes v1-> v2:
Moved MTU write after destroy of rx rings
--- drivers/net/vmxnet3/vmxnet3_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +3 -2
@@ -3607,8 +3607,6 @@ vmxnet3_change_mtu(struct net_device *nestruct vmxnet3_adapter *adapter =netdev_priv (netdev);int err =0 ; -WRITE_ONCE (netdev->mtu, new_mtu); -/* * Reset_work may be in the middle of resetting the device, wait for its * completion.
@@ -3622,6 +3620,7 @@ vmxnet3_change_mtu(struct net_device *ne/* we need to re-create the rx queue based on the new mtu */ vmxnet3_rq_destroy_all (adapter); +WRITE_ONCE (netdev->mtu, new_mtu);vmxnet3_adjust_rx_ring_size (adapter); err =vmxnet3_rq_create_all (adapter);if (err) {
@@ -3638,6 +3637,8 @@ vmxnet3_change_mtu(struct net_device *ne "Closing it\n", err); goto out; } + }else { +WRITE_ONCE (netdev->mtu, new_mtu); } out:
Greg Kroah-Hartman
maintainerPATCH 739/783 mmc: sdhci_am654: Add SDHCI_QUIRK2_SUPPRESS_V1P8_ENA quirk to am62 compatible
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Judith Mendez <[email protected]>
commit 71c9475b1e2cc4d31370b1b7a328bdfeea5d53b4 upstream.
Add a new struct for platform data for the ti,am62-sdhci compatible to apply additional quirks, namely "SDHCI_QUIRK2_SUPPRESS_V1P8_ENA", to host controllers with am62 compatible.
Note, the fix was originally introduced by commit 941a7abd4666 ("mmc: sdhci_am654: Add sdhci_am654_start_signal_voltage_switch") but was found to be applied too broadly and had to be reverted.
This fixes MMC init failures seen across am62x boards.
--- drivers/mmc/host/sdhci_am654.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci_am654.c +34 -1
@@ -155,6 +155,7 @@ struct sdhci_am654_data {u32 tuning_loop;#define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0) +#define SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA BIT(1) };struct window {
@@ -166,6 +167,7 @@ struct window {struct sdhci_am654_driver_data {const struct sdhci_pltfm_data *pdata;u32 flags; +u32 quirks;#define IOMUX_PRESENT (1 << 0)#define FREQSEL_2_BIT (1 << 1)#define STRBSEL_4_BIT (1 << 2)
@@ -356,6 +358,29 @@ static void sdhci_j721e_4bit_set_clock(ssdhci_set_clock (host, clock); } +static int sdhci_am654_start_signal_voltage_switch (struct mmc_host *mmc,struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct sdhci_am654_data *sdhci_am654 =sdhci_pltfm_priv (pltfm_host); +int ret; + +if ((sdhci_am654->quirks &SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA ) && + ios->signal_voltage ==MMC_SIGNAL_VOLTAGE_180 ) { +if (!IS_ERR (mmc->supply.vqmmc)) { + ret =mmc_regulator_set_vqmmc (mmc, ios); +if (ret <0 ) { +pr_err ("%s: Switching to 1.8V signalling voltage failed,\n" , +mmc_hostname (mmc)); +return -EIO ; + } + } +return 0 ; + } + +return sdhci_start_signal_voltage_switch (mmc, ios); +} +static u8 sdhci_am654_write_power_on (struct sdhci_host *host,u8 val,int reg) {writeb (val, host->ioaddr + reg);
@@ -650,6 +675,12 @@ static const struct sdhci_am654_driver_d .flags = IOMUX_PRESENT, }; +static const struct sdhci_am654_driver_data sdhci_am62_4bit_drvdata = { + .pdata = &sdhci_j721e_4bit_pdata, + .flags =IOMUX_PRESENT , + .quirks =SDHCI_AM654_QUIRK_SUPPRESS_V1P8_ENA , +}; +static const struct soc_device_attribute sdhci_am654_devices[] = { { .family ="AM65X" , .revision ="SR1.0" ,
@@ -872,7 +903,7 @@ static const struct of_device_id sdhci_a }, { .compatible = "ti,am62-sdhci", - .data = &sdhci_j721e_4bit_drvdata, + .data = &sdhci_am62_4bit_drvdata, }, {/* sentinel */ } };
@@ -906,6 +937,7 @@ static int sdhci_am654_probe(struct plat pltfm_host =sdhci_priv (host); sdhci_am654 =sdhci_pltfm_priv (pltfm_host); sdhci_am654->flags = drvdata->flags; + sdhci_am654->quirks = drvdata->quirks; clk_xin =devm_clk_get (dev,"clk_xin" );if (IS_ERR (clk_xin)) {
@@ -940,6 +972,7 @@ static int sdhci_am654_probe(struct plat goto err_pltfm_free; } + host->mmc_host_ops.start_signal_voltage_switch = sdhci_am654_start_signal_voltage_switch; host->mmc_host_ops.execute_tuning = sdhci_am654_execute_tuning;pm_runtime_get_noresume (dev);
Greg Kroah-Hartman
maintainerPATCH 740/783 pmdomain: renesas: rcar: Remove obsolete nullify checks
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
commit 13a6d4265665201a795a2ff5a3e6e4d183fc9c33 upstream.
All nullify users and helpers were removed, but the R-Car SYSC drivers still checked for nullified domains. Remove the obsolete checks.
--- drivers/pmdomain/renesas/rcar-gen4-sysc.c | 5 ----- drivers/pmdomain/renesas/rcar-sysc.c | 5 ----- 2 files changed, 10 deletions(-)
drivers/pmdomain/renesas/rcar-gen4-sysc.c +0 -5
@@ -338,11 +338,6 @@ static int __init rcar_gen4_sysc_pd_initstruct rcar_gen4_sysc_pd *pd;size_t n; -if (!area->name) { -/* Skip NULLified area */ -continue ; - } - n =strlen (area->name) +1 ; pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );if (!pd) {
drivers/pmdomain/renesas/rcar-sysc.c +0 -5
@@ -396,11 +396,6 @@ static int __init rcar_sysc_pd_init(voidstruct rcar_sysc_pd *pd;size_t n; -if (!area->name) { -/* Skip NULLified area */ -continue ; - } - n =strlen (area->name) +1 ; pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );if (!pd) {
Greg Kroah-Hartman
maintainerPATCH 741/783 pmdomain: core: Fix error checking in genpd_dev_pm_attach_by_id()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 0f5757667ec0aaf2456c3b76fcf0c6c3ea3591fe upstream.
The error checking for of_count_phandle_with_args() does not handle negative error codes correctly. The problem is that "index" is a u32 so in the condition "if (index >= num_domains)" negative error codes stored in "num_domains" are type promoted to very high positive values and "index" is always going to be valid.
Test for negative error codes first and then test if "index" is valid.
--- drivers/pmdomain/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pmdomain/core.c +1 -1
@@ -3091,7 +3091,7 @@ struct device *genpd_dev_pm_attach_by_id/* Verify that the index is within a valid range. */ num_domains =of_count_phandle_with_args (dev->of_node,"power-domains" ,"#power-domain-cells" ); -if (index >= num_domains) +if (num_domains <0 || index >= num_domains)return NULL ;/* Allocate and register device on the genpd bus. */
Greg Kroah-Hartman
maintainerPATCH 742/783 platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Moskovkin <[email protected]>
commit 4e89a4077490f52cde652d17e32519b666abf3a6 upstream.
If the 'buf' array received from the user contains an empty string, the 'length' variable will be zero. Accessing the 'buf' array element with index 'length - 1' will result in a buffer overflow.
Add a check for an empty string.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c +1 -1
@@ -45,7 +45,7 @@ static ssize_t current_password_store(stint length; length =strlen (buf); -if (buf[length-1 ] =='\n' ) +if (length && buf[length -1 ] =='\n' ) length--;/* firmware does verifiation of min/max password length,
Greg Kroah-Hartman
maintainerPATCH 743/783 thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
commit cf948c8e274e8b406e846cdf6cc48fe47f98cf57 upstream.
The tj_max value obtained from the Intel TCC library are in Celsius, whereas the thermal subsystem operates in milli-Celsius.
This discrepancy leads to incorrect trip temperature calculations.
Fix bogus trip temperature by converting tj_max to milli-Celsius Unit.
--- drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + 1 file changed, 1 insertion(+)
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -0
@@ -329,6 +329,7 @@ static int pkg_temp_thermal_device_add(u tj_max =intel_tcc_get_tjmax (cpu);if (tj_max <0 )return tj_max; + tj_max *=1000 ; zonedev =kzalloc (sizeof (*zonedev),GFP_KERNEL );if (!zonedev)
Greg Kroah-Hartman
maintainerPATCH 744/783 drm/edid: fixed the bug that hdr metadata was not reset
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: feijuan.li <[email protected]>
commit 6692dbc15e5ed40a3aa037aced65d7b8826c58cd upstream.
When DP connected to a device with HDR capability, the hdr structure was filled.Then connected to another sink device without hdr capability, but the hdr info still exist.
--- drivers/gpu/drm/drm_edid.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_edid.c +1 -0
@@ -6596,6 +6596,7 @@ static void drm_reset_display_info(struc info->has_hdmi_infoframe = false; info->rgb_quant_range_selectable = false;memset (&info->hdmi,0 ,sizeof (info->hdmi)); +memset (&connector->hdr_sink_metadata,0 ,sizeof (connector->hdr_sink_metadata)); info->edid_hdmi_rgb444_dc_modes =0 ; info->edid_hdmi_ycbcr444_dc_modes =0 ;
Greg Kroah-Hartman
maintainerPATCH 745/783 smb: client: Fix use-after-free in cifs_fill_dirent
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Zhaolong <[email protected]>
commit a7a8fe56e932a36f43e031b398aef92341bf5ea0 upstream.
There is a race condition in the readdir concurrency process, which may access the rsp buffer after it has been released, triggering the following KASAN warning.
==================================================================
BUG: KASAN: slab-use-after-free in cifs_fill_dirent+0xb03/0xb60 [cifs]
Read of size 4 at addr ffff8880099b819c by task a.out/342975
CPU: 2 UID: 0 PID: 342975 Comm: a.out Not tainted 6.15.0-rc6+ #240 PREEMPT(full)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014
Call Trace:
<TASK>
dump_stack_lvl+0x53/0x70
print_report+0xce/0x640
kasan_report+0xb8/0xf0
cifs_fill_dirent+0xb03/0xb60 [cifs]
cifs_readdir+0x12cb/0x3190 [cifs]
iterate_dir+0x1a1/0x520
__x64_sys_getdents+0x134/0x220
do_syscall_64+0x4b/0x110
entry_SYSCALL_64_after_hwframe+0x76/0x7e
RIP: 0033:0x7f996f64b9f9
Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89
f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01
f0 ff ff 0d f7 c3 0c 00 f7 d8 64 89 8
RSP: 002b:00007f996f53de78 EFLAGS: 00000207 ORIG_RAX: 000000000000004e
RAX: ffffffffffffffda RBX: 00007f996f53ecdc RCX: 00007f996f64b9f9
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003
RBP: 00007f996f53dea0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000207 R12: ffffffffffffff88
R13: 0000000000000000 R14: 00007ffc8cd9a500 R15: 00007f996f51e000
</TASK>
Allocated by task 408:
kasan_save_stack+0x20/0x40
kasan_save_track+0x14/0x30
__kasan_slab_alloc+0x6e/0x70
kmem_cache_alloc_noprof+0x117/0x3d0
mempool_alloc_noprof+0xf2/0x2c0
cifs_buf_get+0x36/0x80 [cifs]
allocate_buffers+0x1d2/0x330 [cifs]
cifs_demultiplex_thread+0x22b/0x2690 [cifs]
kthread+0x394/0x720
ret_from_fork+0x34/0x70
ret_from_fork_asm+0x1a/0x30
Freed by task 342979:
kasan_save_stack+0x20/0x40
kasan_save_track+0x14/0x30
kasan_save_free_info+0x3b/0x60
__kasan_slab_free+0x37/0x50
kmem_cache_free+0x2b8/0x500
cifs_buf_release+0x3c/0x70 [cifs]
cifs_readdir+0x1c97/0x3190 [cifs]
iterate_dir+0x1a1/0x520
__x64_sys_getdents64+0x134/0x220
do_syscall_64+0x4b/0x110
entry_SYSCALL_64_after_hwframe+0x76/0x7e
The buggy address belongs to the object at ffff8880099b8000
which belongs to the cache cifs_request of size 16588
The buggy address is located 412 bytes inside of
freed 16588-byte region [ffff8880099b8000, ffff8880099bc0cc)
The buggy address belongs to the physical page:
page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x99b8
head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0
anon flags: 0x80000000000040(head|node=0|zone=1)
page_type: f5(slab)
raw: 0080000000000040 ffff888001e03400 0000000000000000 dead000000000001
raw: 0000000000000000 0000000000010001 00000000f5000000 0000000000000000
head: 0080000000000040 ffff888001e03400 0000000000000000 dead000000000001
head: 0000000000000000 0000000000010001 00000000f5000000 0000000000000000
head: 0080000000000003 ffffea0000266e01 00000000ffffffff 00000000ffffffff
head: ffffffffffffffff 0000000000000000 00000000ffffffff 0000000000000008
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff8880099b8080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8880099b8100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff8880099b8180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff8880099b8200: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8880099b8280: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================POC is available in the link [1].
The problem triggering process is as follows:
Process 1 Process 2
-----------------------------------------------------------------cifs_readdir
/* file->private_data == NULL */
initiate_cifs_search
cifsFile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
smb2_query_dir_first ->query_dir_first()
SMB2_query_directory
SMB2_query_directory_init
cifs_send_recv
smb2_parse_query_directory
srch_inf->ntwrk_buf_start = (char *)rsp;
srch_inf->srch_entries_start = (char *)rsp + ...
srch_inf->last_entry = (char *)rsp + ...
srch_inf->smallBuf = true;
find_cifs_entry
/* if (cfile->srch_inf.ntwrk_buf_start) */
cifs_small_buf_release(cfile->srch_inf // free
cifs_readdir ->iterate_shared()
/* file->private_data != NULL */
find_cifs_entry
/* in while (...) loop */
smb2_query_dir_next ->query_dir_next()
SMB2_query_directory
SMB2_query_directory_init
cifs_send_recv
compound_send_recv
smb_send_rqst
__smb_send_rqst
rc = -ERESTARTSYS;
/* if (fatal_signal_pending()) */
goto out;
return rc
/* if (cfile->srch_inf.last_entry) */
cifs_save_resume_key()
cifs_fill_dirent // UAF
/* if (rc) */
return -ENOENT;Fix this by ensuring the return code is checked before using pointers from the srch_inf.
--- fs/smb/client/readdir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/readdir.c +2 -2
@@ -756,11 +756,11 @@ find_cifs_entry(const unsigned int xid, rc = server->ops->query_dir_next (xid, tcon, &cfile->fid, search_flags, &cfile->srch_inf); +if (rc) +return -ENOENT ;/* FindFirst/Next set last_entry to NULL on malformed reply */ if (cfile->srch_inf.last_entry)cifs_save_resume_key (cfile->srch_inf.last_entry, cfile); -if (rc) -return -ENOENT ; }if (index_to_find < cfile->srch_inf.index_of_last_entry) {/* we found the buffer that contains the entry */
Greg Kroah-Hartman
maintainerPATCH 746/783 arm64: dts: marvell: uDPU: define pinctrl state for alarm LEDs
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
commit b04f0d89e880bc2cca6a5c73cf287082c91878da upstream.
The two alarm LEDs of on the uDPU board are stopped working since commit 78efa53e715e ("leds: Init leds class earlier").
The LEDs are driven by the GPIO{15,16} pins of the North Bridge GPIO controller. These pins are part of the 'spi_quad' pin group for which the 'spi' function is selected via the default pinctrl state of the 'spi' node. This is wrong however, since in order to allow controlling the LEDs, the pins should use the 'gpio' function.
Before the commit mentined above, the 'spi' function is selected first by the pinctrl core before probing the spi driver, but then it gets overridden to 'gpio' implicitly via the devm_gpiod_get_index_optional() call from the 'leds-gpio' driver.
After the commit, the LED subsystem gets initialized before the SPI subsystem, so the function of the pin group remains 'spi' which in turn prevents controlling of the LEDs.
Despite the change of the initialization order, the root cause is that the pinctrl state definition is wrong since its initial commit 0d45062cfc89 ("arm64: dts: marvell: Add device tree for uDPU board"),
To fix the problem, override the function in the 'spi_quad_pins' node to 'gpio' and move the pinctrl state definition from the 'spi' node into the 'leds' node.
--- arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi +6 -2
@@ -26,6 +26,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&spi_quad_pins>; led-power1 { label = "udpu:green:power";
@@ -82,8 +84,6 @@ &spi0 { status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&spi_quad_pins>; flash@0 { compatible = "jedec,spi-nor";
@@ -108,6 +108,10 @@ }; }; +&spi_quad_pins { + function = "gpio"; +}; + &pinctrl_nb { i2c2_recovery_pins: i2c2-recovery-pins { groups = "i2c2";
Greg Kroah-Hartman
maintainerPATCH 747/783 smb: client: Reset all search buffer pointers when releasing buffer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Zhaolong <[email protected]>
commit e48f9d849bfdec276eebf782a84fd4dfbe1c14c0 upstream.
Multiple pointers in struct cifs_search_info (ntwrk_buf_start, srch_entries_start, and last_entry) point to the same allocated buffer. However, when freeing this buffer, only ntwrk_buf_start was set to NULL, while the other pointers remained pointing to freed memory.
This is defensive programming to prevent potential issues with stale pointers. While the active UAF vulnerability is fixed by the previous patch, this change ensures consistent pointer state and more robust error handling.
--- fs/smb/client/readdir.c | 3 +++ 1 file changed, 3 insertions(+)
fs/smb/client/readdir.c +3 -0
@@ -733,7 +733,10 @@ find_cifs_entry(const unsigned int xid,else cifs_buf_release (cfile->srch_inf. ntwrk_buf_start); +/* Reset all pointers to the network buffer to prevent stale references */ cfile->srch_inf.ntwrk_buf_start =NULL ; + cfile->srch_inf.srch_entries_start =NULL ; + cfile->srch_inf.last_entry =NULL ; } rc =initiate_cifs_search (xid, file, full_path);if (rc) {
Greg Kroah-Hartman
maintainerPATCH 748/783 Revert "drm/amd: Keep display off while going into S4"
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
commit 7e7cb7a13c81073d38a10fa7b450d23712281ec4 upstream.
commit 68bfdc8dc0a1a ("drm/amd: Keep display off while going into S4") attempted to keep displays off during the S4 sequence by not resuming display IP. This however leads to hangs because DRM clients such as the console can try to access registers and cause a hang.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -5
@@ -3392,11 +3392,6 @@ static int dm_resume(struct amdgpu_ip_blreturn 0 ; } - -/* leave display off for S4 sequence */ -if (adev->in_s4) -return 0 ; -/* Recreate dc_state - DC invalidates it when setting power state to S3. */ dc_state_release (dm_state->context); dm_state->context =dc_state_create (dm->dc,NULL );
Greg Kroah-Hartman
maintainerPATCH 749/783 Input: xpad - add more controllers
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vicki Pfau <[email protected]>
commit f0d17942ea3edec191f1c0fc0d2cd7feca8de2f0 upstream.
Adds support for a revision of the Turtle Beach Recon Wired Controller, the Turtle Beach Stealth Ultra, and the PowerA Wired Controller.
--- drivers/input/joystick/xpad.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/input/joystick/xpad.c +3 -0
@@ -289,6 +289,8 @@ static const struct xpad_device { { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, { 0x10f5, 0x7005, "Turtle Beach Recon Controller", 0, XTYPE_XBOXONE }, + { 0x10f5, 0x7008, "Turtle Beach Recon Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE }, + { 0x10f5, 0x7073, "Turtle Beach Stealth Ultra Controller", MAP_SHARE_BUTTON, XTYPE_XBOXONE }, { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 }, { 0x11ff, 0x0511, "PXN V900", 0, XTYPE_XBOX360 }, { 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 },
@@ -353,6 +355,7 @@ static const struct xpad_device { { 0x1ee9, 0x1590, "ZOTAC Gaming Zone", 0, XTYPE_XBOX360 }, { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, { 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, XTYPE_XBOXONE }, + { 0x20d6, 0x2064, "PowerA Wired Controller for Xbox", MAP_SHARE_BUTTON, XTYPE_XBOXONE }, { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, { 0x2345, 0xe00b, "Machenike G5 Pro Controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
Greg Kroah-Hartman
maintainerPATCH 750/783 Input: synaptics-rmi - fix crash with unsupported versions of F34
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit ca39500f6af9cfe6823dc5aa8fbaed788d6e35b2 upstream.
Sysfs interface for updating firmware for RMI devices is available even when F34 probe fails. The code checks for presence of F34 "container" pointer and then tries to use the function data attached to the sub-device. F34 assigns the function data early, before it knows if probe will succeed, leaving behind a stale pointer.
Fix this by expanding checks to not only test for presence of F34 "container" but also check if there is driver data assigned to the sub-device, and call dev_set_drvdata() only after we are certain that probe is successful.
This is not a complete fix, since F34 will be freed during firmware update, so there is still a race when fetching and accessing this pointer. This race will be addressed in follow-up changes.
--- drivers/input/rmi4/rmi_f34.c | 133 ++++++++++++++++++++++++------------------- 1 file changed, 75 insertions(+), 58 deletions(-)
drivers/input/rmi4/rmi_f34.c +75 -58
@@ -4,6 +4,7 @@* Copyright (C) 2016 Zodiac Inflight Innovations */ +#include "linux/device.h" #include <linux/kernel.h> #include <linux/rmi.h> #include <linux/firmware.h>
@@ -289,39 +290,30 @@ static int rmi_f34_update_firmware(strucreturn rmi_f34_flash_firmware (f34, syn_fw); } -static int rmi_f34_status (struct rmi_function *fn) -{ -struct f34_data *f34 =dev_get_drvdata (&fn->dev); - -/* -* The status is the percentage complete, or once complete, -* zero for success or a negative return code. -*/ -return f34->update_status; -} -static ssize_t rmi_driver_bootloader_id_show (struct device *dev,struct device_attribute *dattr,char *buf) {struct rmi_driver_data *data =dev_get_drvdata (dev); -struct rmi_function *fn = data->f34_container; +struct rmi_function *fn;struct f34_data *f34; -if (fn) { - f34 =dev_get_drvdata (&fn->dev); + fn = data->f34_container; +if (!fn) +return -ENODEV ; -if (f34->bl_version ==5 ) -return sysfs_emit (buf,"%c%c\n" , - f34->bootloader_id[0 ], - f34->bootloader_id[1 ]); -else -return sysfs_emit (buf,"V%d.%d\n" , - f34->bootloader_id[1 ], - f34->bootloader_id[0 ]); - } + f34 =dev_get_drvdata (&fn->dev); +if (!f34) +return -ENODEV ; -return 0 ; +if (f34->bl_version ==5 ) +return sysfs_emit (buf,"%c%c\n" , + f34->bootloader_id[0 ], + f34->bootloader_id[1 ]); +else +return sysfs_emit (buf,"V%d.%d\n" , + f34->bootloader_id[1 ], + f34->bootloader_id[0 ]); } static DEVICE_ATTR(bootloader_id, 0444, rmi_driver_bootloader_id_show, NULL);
@@ -334,13 +326,16 @@ static ssize_t rmi_driver_configuration_struct rmi_function *fn = data->f34_container;struct f34_data *f34; -if (fn) { - f34 =dev_get_drvdata (&fn->dev); + fn = data->f34_container; +if (!fn) +return -ENODEV ; -return sysfs_emit (buf,"%s\n" , f34->configuration_id); - } + f34 =dev_get_drvdata (&fn->dev); +if (!f34) +return -ENODEV ; -return 0 ; + +return sysfs_emit (buf,"%s\n" , f34->configuration_id); } static DEVICE_ATTR(configuration_id, 0444,
@@ -356,10 +351,14 @@ static int rmi_firmware_update(struct rmif (!data->f34_container) {dev_warn (dev,"%s: No F34 present!\n" , __func__); -return -EINVAL ; +return -ENODEV ; } f34 =dev_get_drvdata (&data->f34_container->dev); +if (!f34) { +dev_warn (dev,"%s: No valid F34 present!\n" , __func__); +return -ENODEV ; + }if (f34->bl_version >=7 ) {if (data->pdt_props &HAS_BSR ) {
@@ -485,10 +484,18 @@ static ssize_t rmi_driver_update_fw_stat char *buf) {struct rmi_driver_data *data =dev_get_drvdata (dev); -int update_status =0 ; +struct f34_data *f34; +int update_status = -ENODEV ; -if (data->f34_container) - update_status =rmi_f34_status (data->f34_container); +/* +* The status is the percentage complete, or once complete, +* zero for success or a negative return code. +*/ +if (data->f34_container) { + f34 =dev_get_drvdata (&data->f34_container->dev); +if (f34) + update_status = f34->update_status; + }return sysfs_emit (buf,"%d\n" , update_status); }
@@ -508,33 +515,21 @@ static const struct attribute_group rmi_ .attrs = rmi_firmware_attrs, }; -static int rmi_f34_probe (struct rmi_function *fn) +static int rmi_f34v5_probe (struct f34_data *f34) { -struct f34_data *f34; -unsigned char f34_queries[9 ]; +struct rmi_function *fn = f34->fn; +u8 f34_queries[9 ];bool has_config_id; -u8 version = fn->fd.function_version; -int ret; - - f34 =devm_kzalloc (&fn->dev,sizeof (struct f34_data ),GFP_KERNEL ); -if (!f34) -return -ENOMEM ; - - f34->fn = fn; -dev_set_drvdata (&fn->dev, f34); - -/* v5 code only supported version 0, try V7 probe */ -if (version >0 ) -return rmi_f34v7_probe (f34); +int error; f34->bl_version =5 ; - ret =rmi_read_block (fn->rmi_dev, fn->fd.query_base_addr, - f34_queries,sizeof (f34_queries)); -if (ret) { + error =rmi_read_block (fn->rmi_dev, fn->fd.query_base_addr, + f34_queries,sizeof (f34_queries)); +if (error) {dev_err (&fn->dev,"%s: Failed to query properties\n" , __func__); -return ret; +return error; } snprintf(f34->bootloader_id, sizeof(f34->bootloader_id),
@@ -560,11 +555,11 @@ static int rmi_f34_probe(struct rmi_func f34->v5.config_blocks);if (has_config_id) { - ret =rmi_read_block (fn->rmi_dev, fn->fd.control_base_addr, - f34_queries,sizeof (f34_queries)); -if (ret) { + error =rmi_read_block (fn->rmi_dev, fn->fd.control_base_addr, + f34_queries,sizeof (f34_queries)); +if (error) {dev_err (&fn->dev,"Failed to read F34 config ID\n" ); -return ret; +return error; } snprintf(f34->configuration_id, sizeof(f34->configuration_id),
@@ -573,11 +568,33 @@ static int rmi_f34_probe(struct rmi_func f34_queries[2], f34_queries[3]);rmi_dbg (RMI_DEBUG_FN , &fn->dev,"Configuration ID: %s\n" , - f34->configuration_id); + f34->configuration_id); }return 0 ; } + +static int rmi_f34_probe (struct rmi_function *fn) +{ +struct f34_data *f34; +u8 version = fn->fd.function_version; +int error; + + f34 =devm_kzalloc (&fn->dev,sizeof (struct f34_data ),GFP_KERNEL ); +if (!f34) +return -ENOMEM ; + + f34->fn = fn; + +/* v5 code only supported version 0 */ + error = version ==0 ?rmi_f34v5_probe (f34) :rmi_f34v7_probe (f34); +if (error) +return error; + +dev_set_drvdata (&fn->dev, f34); + +return 0 ; +}int rmi_f34_create_sysfs (struct rmi_device *rmi_dev) {
Re: [PATCH 6.14 750/783] Input: synaptics-rmi - fix crash with unsupported versions of F34
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
6.14-stable review patch. If anyone has any objections, please let me know.
Can you hold this for a bit? I might need to revert this.
Thanks.
Signature · 1 line
Dmitry
Greg Kroah-Hartman
maintainerRe: [PATCH 6.14 750/783] Input: synaptics-rmi - fix crash with unsupported versions of F34
Quoted 6 lines · Dmitry Torokhov
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
6.14-stable review patch. If anyone has any objections, please let me know.
Can you hold this for a bit? I might need to revert this.
Now dropped from all stable queues. Let us know when you want this added back.
thanks,
greg k-h
Re: [PATCH 6.14 750/783] Input: synaptics-rmi - fix crash with unsupported versions of F34
Quoted 10 lines · Greg Kroah-Hartman
Quoted 6 lines · Dmitry Torokhov
Hi Greg,
Quoted 1 line · Greg Kroah-Hartman
6.14-stable review patch. If anyone has any objections, please let me know.
Can you hold this for a bit? I might need to revert this.
Now dropped from all stable queues. Let us know when you want this added back.
Thank you. It looks like it was a false alarm, but I'll wait a few more days just to make sure.
Signature · 1 line
Dmitry
Greg Kroah-Hartman
maintainerPATCH 751/783 alloc_tag: allocate percpu counters for module tags dynamically
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suren Baghdasaryan <[email protected]>
commit 12ca42c237756182aad8ab04654c952765cb9061 upstream.
When a module gets unloaded it checks whether any of its tags are still in use and if so, we keep the memory containing module's allocation tags alive until all tags are unused. However percpu counters referenced by the tags are freed by free_module(). This will lead to UAF if the memory allocated by a module is accessed after module was unloaded.
To fix this we allocate percpu counters for module allocation tags dynamically and we keep it alive for tags which are still in use after module unloading. This also removes the requirement of a larger PERCPU_MODULE_RESERVE when memory allocation profiling is enabled because percpu memory for counters does not need to be reserved anymore.
--- include/linux/alloc_tag.h | 12 ++++++ include/linux/codetag.h | 8 ++-- include/linux/percpu.h | 4 -- lib/alloc_tag.c | 89 ++++++++++++++++++++++++++++++++++++---------- lib/codetag.c | 5 +- 5 files changed, 89 insertions(+), 29 deletions(-)
include/linux/alloc_tag.h +12 -0
@@ -104,6 +104,16 @@ DECLARE_PER_CPU(struct alloc_tag_counter#else /* ARCH_NEEDS_WEAK_PER_CPU */ +#ifdef MODULE + +#define DEFINE_ALLOC_TAG (_alloc_tag) \ + static struct alloc_tag _alloc_tag __used __aligned(8) \ + __section(ALLOC_TAG_SECTION_NAME) = { \ + .ct = CODE_TAG_INIT, \ + .counters = NULL }; + +#else /* MODULE */ +#define DEFINE_ALLOC_TAG (_alloc_tag) \ static DEFINE_PER_CPU(struct alloc_tag_counters, _alloc_tag_cntr); \ static struct alloc_tag _alloc_tag __used __aligned(8) \
@@ -111,6 +121,8 @@ DECLARE_PER_CPU(struct alloc_tag_counter .ct = CODE_TAG_INIT, \ .counters = &_alloc_tag_cntr }; +#endif /* MODULE */ +#endif /* ARCH_NEEDS_WEAK_PER_CPU */ DECLARE_STATIC_KEY_MAYBE(CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT,
include/linux/codetag.h +4 -4
@@ -36,10 +36,10 @@ union codetag_ref {struct codetag_type_desc {const char *section;size_t tag_size; -void (*module_load)(struct codetag_type *cttype, -struct codetag_module *cmod); -void (*module_unload)(struct codetag_type *cttype, -struct codetag_module *cmod); +void (*module_load)(struct module *mod, +struct codetag *start,struct codetag *end); +void (*module_unload)(struct module *mod, +struct codetag *start,struct codetag *end);#ifdef CONFIG_MODULES void (*module_replaced)(struct module *mod,struct module *new_mod);bool (*needs_section_mem)(struct module *mod,unsigned long size);
include/linux/percpu.h +0 -4
@@ -15,11 +15,7 @@/* enough to cover all DEFINE_PER_CPUs in modules */ #ifdef CONFIG_MODULES -#ifdef CONFIG_MEM_ALLOC_PROFILING -#define PERCPU_MODULE_RESERVE (8 << 13) -#else #define PERCPU_MODULE_RESERVE (8 << 10) -#endif #else #define PERCPU_MODULE_RESERVE 0#endif
lib/alloc_tag.c +70 -19
134 lines not on this page · raw message
lib/codetag.c +3 -2
@@ -194,7 +194,7 @@ static int codetag_module_init(struct coif (err >=0 ) { cttype->count +=range_size (cttype, &range);if (cttype->desc.module_load) - cttype->desc.module_load (cttype, cmod); + cttype->desc.module_load (mod, range.start, range.stop); }up_write (&cttype->mod_lock);
@@ -333,7 +333,8 @@ void codetag_unload_module(struct module }if (found) {if (cttype->desc.module_unload) - cttype->desc.module_unload (cttype, cmod); + cttype->desc.module_unload (cmod->mod, + cmod->range.start, cmod->range.stop); cttype->count -=range_size (cttype, &cmod->range);idr_remove (&cttype->mod_idr, mod_id);
Greg Kroah-Hartman
maintainerPATCH 752/783 highmem: add folio_test_partial_kmap()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
commit 97dfbbd135cb5e4426f37ca53a8fa87eaaa4e376 upstream.
In commit c749d9b7ebbc ("iov_iter: fix copy_page_from_iter_atomic() if KMAP_LOCAL_FORCE_MAP"), Hugh correctly noted that if KMAP_LOCAL_FORCE_MAP is enabled, we must limit ourselves to PAGE_SIZE bytes per call to kmap_local(). The same problem exists in memcpy_from_folio(), memcpy_to_folio(), folio_zero_tail(), folio_fill_tail() and memcpy_from_file_folio(), so add folio_test_partial_kmap() to do this more succinctly.
--- include/linux/highmem.h | 10 +++++----- include/linux/page-flags.h | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-)
include/linux/highmem.h +5 -5
@@ -461,7 +461,7 @@ static inline void memcpy_from_folio(chaconst char *from =kmap_local_folio (folio, offset);size_t chunk = len; -if (folio_test_highmem (folio) && +if (folio_test_partial_kmap (folio) && chunk >PAGE_SIZE -offset_in_page (offset)) chunk =PAGE_SIZE -offset_in_page (offset);memcpy (to, from, chunk);
@@ -489,7 +489,7 @@ static inline void memcpy_to_folio(strucchar *to =kmap_local_folio (folio, offset);size_t chunk = len; -if (folio_test_highmem (folio) && +if (folio_test_partial_kmap (folio) && chunk >PAGE_SIZE -offset_in_page (offset)) chunk =PAGE_SIZE -offset_in_page (offset);memcpy (to, from, chunk);
@@ -522,7 +522,7 @@ static inline __must_check void *folio_z {size_t len =folio_size (folio) - offset; -if (folio_test_highmem (folio)) { +if (folio_test_partial_kmap (folio)) {size_t max =PAGE_SIZE -offset_in_page (offset);while (len > max) {
@@ -560,7 +560,7 @@ static inline void folio_fill_tail(strucVM_BUG_ON (offset + len >folio_size (folio)); -if (folio_test_highmem (folio)) { +if (folio_test_partial_kmap (folio)) {size_t max =PAGE_SIZE -offset_in_page (offset);while (len > max) {
@@ -597,7 +597,7 @@ static inline size_t memcpy_from_file_fosize_t offset =offset_in_folio (folio, pos);char *from =kmap_local_folio (folio, offset); -if (folio_test_highmem (folio)) { +if (folio_test_partial_kmap (folio)) { offset =offset_in_page (offset); len =min_t (size_t, len,PAGE_SIZE - offset); }else
include/linux/page-flags.h +7 -0
@@ -578,6 +578,13 @@ FOLIO_FLAG(dropbehind, FOLIO_HEAD_PAGE) PAGEFLAG_FALSE(HighMem, highmem)#endif +/* Does kmap_local_folio() only allow access to one page of the folio? */ +#ifdef CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP +#define folio_test_partial_kmap (f) true +#else +#define folio_test_partial_kmap (f) folio_test_highmem(f) +#endif +#ifdef CONFIG_SWAP static __always_inline bool folio_test_swapcache(const struct folio *folio) {
Greg Kroah-Hartman
maintainerPATCH 753/783 kasan: avoid sleepable page allocation from atomic context
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Gordeev <[email protected]>
commit b6ea95a34cbd014ab6ade4248107b86b0aaf2d6c upstream.
apply_to_pte_range() enters the lazy MMU mode and then invokes kasan_populate_vmalloc_pte() callback on each page table walk iteration. However, the callback can go into sleep when trying to allocate a single page, e.g. if an architecutre disables preemption on lazy MMU mode enter.
On s390 if make arch_enter_lazy_mmu_mode() -> preempt_enable() and arch_leave_lazy_mmu_mode() -> preempt_disable(), such crash occurs:
[ 0.663336] BUG: sleeping function called from invalid context at ./include/linux/sched/mm.h:321 [ 0.663348] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2, name: kthreadd [ 0.663358] preempt_count: 1, expected: 0 [ 0.663366] RCU nest depth: 0, expected: 0 [ 0.663375] no locks held by kthreadd/2. [ 0.663383] Preemption disabled at: [ 0.663386] [<0002f3284cbb4eda>] apply_to_pte_range+0xfa/0x4a0 [ 0.663405] CPU: 0 UID: 0 PID: 2 Comm: kthreadd Not tainted 6.15.0-rc5-gcc-kasan-00043-gd76bb1ebb558-dirty #162 PREEMPT [ 0.663408] Hardware name: IBM 3931 A01 701 (KVM/Linux) [ 0.663409] Call Trace: [ 0.663410] [<0002f3284c385f58>] dump_stack_lvl+0xe8/0x140 [ 0.663413] [<0002f3284c507b9e>] __might_resched+0x66e/0x700 [ 0.663415] [<0002f3284cc4f6c0>] __alloc_frozen_pages_noprof+0x370/0x4b0 [ 0.663419] [<0002f3284ccc73c0>] alloc_pages_mpol+0x1a0/0x4a0 [ 0.663421] [<0002f3284ccc8518>] alloc_frozen_pages_noprof+0x88/0xc0 [ 0.663424] [<0002f3284ccc8572>] alloc_pages_noprof+0x22/0x120 [ 0.663427] [<0002f3284cc341ac>] get_free_pages_noprof+0x2c/0xc0 [ 0.663429] [<0002f3284cceba70>] kasan_populate_vmalloc_pte+0x50/0x120 [ 0.663433] [<0002f3284cbb4ef8>] apply_to_pte_range+0x118/0x4a0 [ 0.663435] [<0002f3284cbc7c14>] apply_to_pmd_range+0x194/0x3e0 [ 0.663437] [<0002f3284cbc99be>] __apply_to_page_range+0x2fe/0x7a0 [ 0.663440] [<0002f3284cbc9e88>] apply_to_page_range+0x28/0x40 [ 0.663442] [<0002f3284ccebf12>] kasan_populate_vmalloc+0x82/0xa0 [ 0.663445] [<0002f3284cc1578c>] alloc_vmap_area+0x34c/0xc10 [ 0.663448] [<0002f3284cc1c2a6>] __get_vm_area_node+0x186/0x2a0 [ 0.663451] [<0002f3284cc1e696>] __vmalloc_node_range_noprof+0x116/0x310 [ 0.663454] [<0002f3284cc1d950>] __vmalloc_node_noprof+0xd0/0x110 [ 0.663457] [<0002f3284c454b88>] alloc_thread_stack_node+0xf8/0x330 [ 0.663460] [<0002f3284c458d56>] dup_task_struct+0x66/0x4d0 [ 0.663463] [<0002f3284c45be90>] copy_process+0x280/0x4b90 [ 0.663465] [<0002f3284c460940>] kernel_clone+0xd0/0x4b0 [ 0.663467] [<0002f3284c46115e>] kernel_thread+0xbe/0xe0 [ 0.663469] [<0002f3284c4e440e>] kthreadd+0x50e/0x7f0 [ 0.663472] [<0002f3284c38c04a>] __ret_from_fork+0x8a/0xf0 [ 0.663475] [<0002f3284ed57ff2>] ret_from_fork+0xa/0x38
Instead of allocating single pages per-PTE, bulk-allocate the shadow memory prior to applying kasan_populate_vmalloc_pte() callback on a page range.
--- mm/kasan/shadow.c | 92 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 14 deletions(-)
mm/kasan/shadow.c +78 -14
@@ -292,33 +292,99 @@ void __init __weak kasan_populate_early_ { } +struct vmalloc_populate_data { +unsigned long start; +struct page **pages; +}; +static int kasan_populate_vmalloc_pte (pte_t *ptep,unsigned long addr, -void *unused) +void *_data) { -unsigned long page; +struct vmalloc_populate_data *data = _data; +struct page *page;pte_t pte; +int index;if (likely (!pte_none (ptep_get (ptep))))return 0 ; - page =__get_free_page (GFP_KERNEL ); -if (!page) -return -ENOMEM ; - -__memset ((void *)page,KASAN_VMALLOC_INVALID ,PAGE_SIZE ); - pte =pfn_pte (PFN_DOWN (__pa (page)),PAGE_KERNEL ); + index =PFN_DOWN (addr - data->start); + page = data->pages[index]; +__memset (page_to_virt (page),KASAN_VMALLOC_INVALID ,PAGE_SIZE ); + pte =pfn_pte (page_to_pfn (page),PAGE_KERNEL );spin_lock (&init_mm.page_table_lock);if (likely (pte_none (ptep_get (ptep)))) {set_pte_at (&init_mm, addr, ptep, pte); - page =0 ; + data->pages[index] =NULL ; }spin_unlock (&init_mm.page_table_lock); -if (page) -free_page (page); + +return 0 ; +} + +static void ___free_pages_bulk (struct page **pages,int nr_pages) +{ +int i; + +for (i =0 ; i < nr_pages; i++) { +if (pages[i]) { +__free_pages (pages[i],0 ); + pages[i] =NULL ; + } + } +} + +static int ___alloc_pages_bulk (struct page **pages,int nr_pages) +{ +unsigned long nr_populated, nr_total = nr_pages; +struct page **page_array = pages; + +while (nr_pages) { + nr_populated =alloc_pages_bulk (GFP_KERNEL , nr_pages, pages); +if (!nr_populated) { +___free_pages_bulk (page_array, nr_total - nr_pages); +return -ENOMEM ; + } + pages += nr_populated; + nr_pages -= nr_populated; + } +return 0 ; } +static int __kasan_populate_vmalloc (unsigned long start,unsigned long end) +{ +unsigned long nr_pages, nr_total =PFN_UP (end - start); +struct vmalloc_populate_data data; +int ret =0 ; + + data.pages = (struct page **)__get_free_page (GFP_KERNEL | __GFP_ZERO); +if (!data.pages) +return -ENOMEM ; + +while (nr_total) { + nr_pages =min (nr_total,PAGE_SIZE /sizeof (data.pages[0 ])); + ret =___alloc_pages_bulk (data.pages, nr_pages); +if (ret) +break ; + + data.start = start; + ret =apply_to_page_range (&init_mm, start, nr_pages *PAGE_SIZE , + kasan_populate_vmalloc_pte, &data); +___free_pages_bulk (data.pages, nr_pages); +if (ret) +break ; + + start += nr_pages *PAGE_SIZE ; + nr_total -= nr_pages; + } + +free_page ((unsigned long )data.pages); + +return ret; +} +int kasan_populate_vmalloc (unsigned long addr,unsigned long size) {unsigned long shadow_start, shadow_end;
@@ -348,9 +414,7 @@ int kasan_populate_vmalloc(unsigned long shadow_start =PAGE_ALIGN_DOWN (shadow_start); shadow_end =PAGE_ALIGN (shadow_end); - ret =apply_to_page_range (&init_mm, shadow_start, - shadow_end - shadow_start, - kasan_populate_vmalloc_pte,NULL ); + ret =__kasan_populate_vmalloc (shadow_start, shadow_end);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 754/783 memcg: always call cond_resched() after fn()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
commit 06717a7b6c86514dbd6ab322e8083ffaa4db5712 upstream.
I am seeing soft lockup on certain machine types when a cgroup OOMs. This is happening because killing the process in certain machine might be very slow, which causes the soft lockup and RCU stalls. This happens usually when the cgroup has MANY processes and memory.oom.group is set.
Example I am seeing in real production:
[462012.244552] Memory cgroup out of memory: Killed process 3370438 (crosvm) ....
....
[462037.318059] Memory cgroup out of memory: Killed process 4171372 (adb) ....
[462037.348314] watchdog: BUG: soft lockup - CPU#64 stuck for 26s! [stat_manager-ag:1618982]
....Quick look at why this is so slow, it seems to be related to serial flush for certain machine types. For all the crashes I saw, the target CPU was at console_flush_all().
In the case above, there are thousands of processes in the cgroup, and it is soft locking up before it reaches the 1024 limit in the code (which would call the cond_resched()). So, cond_resched() in 1024 blocks is not sufficient.
Remove the counter-based conditional rescheduling logic and call cond_resched() unconditionally after each task iteration, after fn() is called. This avoids the lockup independently of how slow fn() is.
--- mm/memcontrol.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/memcontrol.c +2 -4
@@ -1161,7 +1161,6 @@ void mem_cgroup_scan_tasks(struct mem_cg {struct mem_cgroup *iter;int ret =0 ; -int i =0 ;BUG_ON (mem_cgroup_is_root (memcg));
@@ -1171,10 +1170,9 @@ void mem_cgroup_scan_tasks(struct mem_cgcss_task_iter_start (&iter->css,CSS_TASK_ITER_PROCS , &it);while (!ret && (task =css_task_iter_next (&it))) { -/* Avoid potential softlockup warning */ -if ((++i &1023 ) ==0 ) -cond_resched (); ret =fn (task, arg); +/* Avoid potential softlockup warning */ +cond_resched (); }css_task_iter_end (&it);if (ret) {
Greg Kroah-Hartman
maintainerPATCH 755/783 mm/hugetlb: fix kernel NULL pointer dereference when replacing free hugetlb folios
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ge Yang <[email protected]>
commit 113ed54ad276c352ee5ce109bdcf0df118a43bda upstream.
A kernel crash was observed when replacing free hugetlb folios:
BUG: kernel NULL pointer dereference, address: 0000000000000028 PGD 0 P4D 0 Oops: Oops: 0000 [#1] SMP NOPTI CPU: 28 UID: 0 PID: 29639 Comm: test_cma.sh Tainted 6.15.0-rc6-zp #41 PREEMPT(voluntary) RIP: 0010:alloc_and_dissolve_hugetlb_folio+0x1d/0x1f0 RSP: 0018:ffffc9000b30fa90 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000342cca RCX: ffffea0043000000 RDX: ffffc9000b30fb08 RSI: ffffea0043000000 RDI: 0000000000000000 RBP: ffffc9000b30fb20 R08: 0000000000001000 R09: 0000000000000000 R10: ffff88886f92eb00 R11: 0000000000000000 R12: ffffea0043000000 R13: 0000000000000000 R14: 00000000010c0200 R15: 0000000000000004 FS: 00007fcda5f14740(0000) GS:ffff8888ec1d8000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000028 CR3: 0000000391402000 CR4: 0000000000350ef0 Call Trace: <TASK> replace_free_hugepage_folios+0xb6/0x100 alloc_contig_range_noprof+0x18a/0x590 ? srso_return_thunk+0x5/0x5f ? down_read+0x12/0xa0 ? srso_return_thunk+0x5/0x5f cma_range_alloc.constprop.0+0x131/0x290 __cma_alloc+0xcf/0x2c0 cma_alloc_write+0x43/0xb0 simple_attr_write_xsigned.constprop.0.isra.0+0xb2/0x110 debugfs_attr_write+0x46/0x70 full_proxy_write+0x62/0xa0 vfs_write+0xf8/0x420 ? srso_return_thunk+0x5/0x5f ? filp_flush+0x86/0xa0 ? srso_return_thunk+0x5/0x5f ? filp_close+0x1f/0x30 ? srso_return_thunk+0x5/0x5f ? do_dup2+0xaf/0x160 ? srso_return_thunk+0x5/0x5f ksys_write+0x65/0xe0 do_syscall_64+0x64/0x170 entry_SYSCALL_64_after_hwframe+0x76/0x7e
There is a potential race between __update_and_free_hugetlb_folio() and replace_free_hugepage_folios():
CPU1 CPU2__update_and_free_hugetlb_folio replace_free_hugepage_folios
folio_test_hugetlb(folio) -- It's still hugetlb folio.
__folio_clear_hugetlb(folio) hugetlb_free_folio(folio)
h = folio_hstate(folio) -- Here, h is NULL pointer
When the above race condition occurs, folio_hstate(folio) returns NULL, and subsequent access to this NULL pointer will cause the system to crash. To resolve this issue, execute folio_hstate(folio) under the protection of the hugetlb_lock lock, ensuring that folio_hstate(folio) does not return NULL.
--- mm/hugetlb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
mm/hugetlb.c +8 -0
@@ -2926,12 +2926,20 @@ int replace_free_hugepage_folios(unsignewhile (start_pfn < end_pfn) { folio =pfn_folio (start_pfn); + +/* +* The folio might have been dissolved from under our feet, so make sure +* to carefully check the state under the lock. +*/ +spin_lock_irq (&hugetlb_lock);if (folio_test_hugetlb (folio)) { h =folio_hstate (folio); }else { +spin_unlock_irq (&hugetlb_lock); start_pfn++;continue ; } +spin_unlock_irq (&hugetlb_lock);if (!folio_ref_count (folio)) { ret = alloc_and_dissolve_hugetlb_folio(h, folio,
Greg Kroah-Hartman
maintainerPATCH 756/783 mm/page_alloc.c: avoid infinite retries caused by cpuset race
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tianyang Zhang <[email protected]>
commit e05741fb10c38d70bbd7ec12b23c197b6355d519 upstream.
__alloc_pages_slowpath has no change detection for ac->nodemask in the part of retry path, while cpuset can modify it in parallel. For some processes that set mempolicy as MPOL_BIND, this results ac->nodemask changes, and then the should_reclaim_retry will judge based on the latest nodemask and jump to retry, while the get_page_from_freelist only traverses the zonelist from ac->preferred_zoneref, which selected by a expired nodemask and may cause infinite retries in some cases
cpu 64:
__alloc_pages_slowpath {
/* ..... */
retry:
/* ac->nodemask = 0x1, ac->preferred->zone->nid = 1 */
if (alloc_flags & ALLOC_KSWAPD)
wake_all_kswapds(order, gfp_mask, ac);
/* cpu 1:
cpuset_write_resmask
update_nodemask
update_nodemasks_hier
update_tasks_nodemask
mpol_rebind_task
mpol_rebind_policy
mpol_rebind_nodemask
// mempolicy->nodes has been modified,
// which ac->nodemask point to
*/
/* ac->nodemask = 0x3, ac->preferred->zone->nid = 1 */
if (should_reclaim_retry(gfp_mask, order, ac, alloc_flags,
did_some_progress > 0, &no_progress_loops))
goto retry;
}Simultaneously starting multiple cpuset01 from LTP can quickly reproduce this issue on a multi node server when the maximum memory pressure is reached and the swap is enabled
--- mm/page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
mm/page_alloc.c +8 -0
@@ -4381,6 +4381,14 @@ restart: } retry: +/* +* Deal with possible cpuset update races or zonelist updates to avoid +* infinite retries. +*/ +if (check_retry_cpuset (cpuset_mems_cookie, ac) || +check_retry_zonelist (zonelist_iter_cookie)) + goto restart; +/* Ensure kswapd doesn't accidentally go to sleep as long as we loop */ if (alloc_flags &ALLOC_KSWAPD )wake_all_kswapds (order, gfp_mask, ac);
Greg Kroah-Hartman
maintainerPATCH 757/783 module: release codetag section when module load fails
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Wang <[email protected]>
commit 221fcbf77578826fad8f4bfa0530b5b55bf9676a upstream.
When module load fails after memory for codetag section is ready, codetag section memory will not be properly released. This causes memory leak, and if next module load happens to get the same module address, codetag may pick the uninitialized section when manipulating tags during module unload, and leads to "unable to handle page fault" BUG.
--- kernel/module/main.c | 1 + 1 file changed, 1 insertion(+)
kernel/module/main.c +1 -0
@@ -2852,6 +2852,7 @@ static void module_deallocate(struct mod {percpu_modfree (mod);module_arch_freeing_init (mod); +codetag_free_module_sections (mod);free_mod_mem (mod); }
Greg Kroah-Hartman
maintainerPATCH 758/783 taskstats: fix struct taskstats breaks backward compatibility since version 15
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Yaxin <[email protected]>
commit 0bf2d838de1ffb6d0bb6f8d18a6ccc59b7d9a705 upstream.
Problem
========
commit 658eb5ab916d ("delayacct: add delay max to record delay peak")
- adding more fields
commit f65c64f311ee ("delayacct: add delay min to record delay peak")
- adding more fields
commit b016d0873777 ("taskstats: modify taskstats version")
- version bump to 15
Since version 15 (TASKSTATS_VERSION=15) the new layout of the structure adds fields in the middle of the structure, rendering all old software incompatible with newer kernels and software compiled against the new kernel headers incompatible with older kernels.
Solution
=========
move delay max and delay min to the end of taskstat, and bump the version to 16 after the change
--- include/uapi/linux/taskstats.h | 47 +++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 18 deletions(-)
include/uapi/linux/taskstats.h +29 -18
@@ -34,7 +34,7 @@*/ -#define TASKSTATS_VERSION 15 +#define TASKSTATS_VERSION 16#define TS_COMM_LEN 32/* should be >= TASK_COMM_LEN * in linux/sched.h */
@@ -72,8 +72,6 @@ struct taskstats {*/ __u64 cpu_count __attribute__((aligned(8)));__u64 cpu_delay_total; -__u64 cpu_delay_max; -__u64 cpu_delay_min;/* Following four fields atomically updated using task->delays->lock */
@@ -82,14 +80,10 @@ struct taskstats {*/ __u64 blkio_count;__u64 blkio_delay_total; -__u64 blkio_delay_max; -__u64 blkio_delay_min;/* Delay waiting for page fault I/O (swap in only) */ __u64 swapin_count;__u64 swapin_delay_total; -__u64 swapin_delay_max; -__u64 swapin_delay_min;/* cpu "wall-clock" running time * On some architectures, value will adjust for cpu time stolen
@@ -172,14 +166,11 @@ struct taskstats {/* Delay waiting for memory reclaim */ __u64 freepages_count;__u64 freepages_delay_total; -__u64 freepages_delay_max; -__u64 freepages_delay_min; +/* Delay waiting for thrashing page */ __u64 thrashing_count;__u64 thrashing_delay_total; -__u64 thrashing_delay_max; -__u64 thrashing_delay_min;/* v10: 64-bit btime to avoid overflow */ __u64 ac_btime64;/* 64-bit begin time */
@@ -187,8 +178,6 @@ struct taskstats {/* v11: Delay waiting for memory compact */ __u64 compact_count;__u64 compact_delay_total; -__u64 compact_delay_max; -__u64 compact_delay_min;/* v12 begin */ __u32 ac_tgid;/* thread group ID */
@@ -210,15 +199,37 @@ struct taskstats {/* v13: Delay waiting for write-protect copy */ __u64 wpcopy_count;__u64 wpcopy_delay_total; -__u64 wpcopy_delay_max; -__u64 wpcopy_delay_min;/* v14: Delay waiting for IRQ/SOFTIRQ */ __u64 irq_count;__u64 irq_delay_total; -__u64 irq_delay_max; -__u64 irq_delay_min; -/* v15: add Delay max */ + +/* v15: add Delay max and Delay min */ + +/* v16: move Delay max and Delay min to the end of taskstat */ +__u64 cpu_delay_max; +__u64 cpu_delay_min; + +__u64 blkio_delay_max; +__u64 blkio_delay_min; + +__u64 swapin_delay_max; +__u64 swapin_delay_min; + +__u64 freepages_delay_max; +__u64 freepages_delay_min; + +__u64 thrashing_delay_max; +__u64 thrashing_delay_min; + +__u64 compact_delay_max; +__u64 compact_delay_min; + +__u64 wpcopy_delay_max; +__u64 wpcopy_delay_min; + +__u64 irq_delay_max; +__u64 irq_delay_min; };
Signature · 1 line
2.49.0
Greg Kroah-Hartman
maintainerPATCH 759/783 mm: mmap: map MAP_STACK to VM_NOHUGEPAGE only if THP is enabled
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ignacio Moreno Gonzalez <[email protected]>
commit 7190b3c8bd2b0cde483bd440cf91ba1c518b4261 upstream.
commit c4608d1bf7c6 ("mm: mmap: map MAP_STACK to VM_NOHUGEPAGE") maps the mmap option MAP_STACK to VM_NOHUGEPAGE. This is also done if CONFIG_TRANSPARENT_HUGEPAGE is not defined. But in that case, the VM_NOHUGEPAGE does not make sense.
I discovered this issue when trying to use the tool CRIU to checkpoint and restore a container. Our running kernel is compiled without CONFIG_TRANSPARENT_HUGEPAGE. CRIU parses the output of /proc/<pid>/smaps and saves the "nh" flag. When trying to restore the container, CRIU fails to restore the "nh" mappings, since madvise() MADV_NOHUGEPAGE always returns an error because CONFIG_TRANSPARENT_HUGEPAGE is not defined.
--- include/linux/mman.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/mman.h +2 -0
@@ -157,7 +157,9 @@ calc_vm_flag_bits(struct file *file, uns return _calc_vm_trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN ) | _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ) | _calc_vm_trans(flags, MAP_SYNC, VM_SYNC ) | +#ifdef CONFIG_TRANSPARENT_HUGEPAGE _calc_vm_trans (flags,MAP_STACK ,VM_NOHUGEPAGE ) | +#endif arch_calc_vm_flag_bits(file, flags); }
Greg Kroah-Hartman
maintainerPATCH 760/783 mm: fix VM_UFFD_MINOR == VM_SHADOW_STACK on USERFAULTFD=y && ARM64_GCS=y
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florent Revest <[email protected]>
commit 0f518255bde881d2a2605bbc080b438b532b6ab2 upstream.
On configs with CONFIG_ARM64_GCS=y, VM_SHADOW_STACK is bit 38. On configs with CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y (selected by CONFIG_ARM64 when CONFIG_USERFAULTFD=y), VM_UFFD_MINOR is _also_ bit 38.
This bit being shared by two different VMA flags could lead to all sorts of unintended behaviors. Presumably, a process could maybe call into userfaultfd in a way that disables the shadow stack vma flag. I can't think of any attack where this would help (presumably, if an attacker tries to disable shadow stacks, they are trying to hijack control flow so can't arbitrarily call into userfaultfd yet anyway) but this still feels somewhat scary.
--- include/linux/mm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mm.h +1 -1
@@ -411,7 +411,7 @@ extern unsigned int kobjsize(const void#endif #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR -# define VM_UFFD_MINOR_BIT 38 +# define VM_UFFD_MINOR_BIT 41# define VM_UFFD_MINOR BIT(VM_UFFD_MINOR_BIT)/* UFFD minor faults */ #else /* !CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */ # define VM_UFFD_MINOR VM_NONE
Greg Kroah-Hartman
maintainerPATCH 761/783 mm: vmalloc: actually use the in-place vrealloc region
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit f7a35a3c36d1e36059c5654737d9bee3454f01a3 upstream.
Patch series "mm: vmalloc: Actually use the in-place vrealloc region".
This fixes a performance regression[1] with vrealloc()[1].
The refactoring to not build a new vmalloc region only actually worked when shrinking. Actually return the resized area when it grows. Ugh.
--- mm/vmalloc.c | 1 + 1 file changed, 1 insertion(+)
mm/vmalloc.c +1 -0
@@ -4115,6 +4115,7 @@ void *vrealloc_noprof(const void *p, sizif (want_init_on_alloc (flags))memset ((void *)p + old_size,0 , size - old_size); vm->requested_size = size; +return (void *)p; }/* TODO: Grow the vm_area, i.e. allocate and map additional pages. */
Greg Kroah-Hartman
maintainerPATCH 762/783 mm: vmalloc: only zero-init on vrealloc shrink
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 70d1eb031a68cbde4eed8099674be21778441c94 upstream.
The common case is to grow reallocations, and since init_on_alloc will have already zeroed the whole allocation, we only need to zero when shrinking the allocation.
--- mm/vmalloc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
mm/vmalloc.c +7 -5
@@ -4097,8 +4097,8 @@ void *vrealloc_noprof(const void *p, siz* would be a good heuristic for when to shrink the vm_area? */ if (size <= old_size) { -/* Zero out "freed" memory. */ -if (want_init_on_free ()) +/* Zero out "freed" memory, potentially for future realloc. */ +if (want_init_on_free () ||want_init_on_alloc (flags))memset ((void *)p + size,0 , old_size - size); vm->requested_size = size;kasan_poison_vmalloc (p + size, old_size - size);
@@ -4111,9 +4111,11 @@ void *vrealloc_noprof(const void *p, sizif (size <= alloced_size) {kasan_unpoison_vmalloc (p + old_size, size - old_size,KASAN_VMALLOC_PROT_NORMAL ); -/* Zero out "alloced" memory. */ -if (want_init_on_alloc (flags)) -memset ((void *)p + old_size,0 , size - old_size); +/* +* No need to zero memory here, as unused memory will have +* already been zeroed at initial allocation time or during +* realloc shrink time. +*/ vm->requested_size = size;return (void *)p; }
Greg Kroah-Hartman
maintainerPATCH 763/783 octeontx2: hide unused label
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit ca57d1c56f4015d83fe7840b41d74783ee900b28 upstream.
A previous patch introduces a build-time warning when CONFIG_DCB is disabled:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c: In function 'otx2_probe':drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c:3217:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label] drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c: In function 'otx2vf_probe':drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c:740:1: error: label 'err_free_zc_bmap' defined but not used [-Werror=unused-label]
Add the same #ifdef check around it.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 ++ drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +2 -0
@@ -3214,8 +3214,10 @@ static int otx2_probe(struct pci_dev *pdreturn 0 ; +#ifdef CONFIG_DCB err_free_zc_bmap:bitmap_free (pf->af_xdp_zc_qidx); +#endif err_sriov_cleannup:otx2_sriov_vfcfg_cleanup (pf); err_pf_sriov_init:
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +2 -0
@@ -740,8 +740,10 @@ static int otx2vf_probe(struct pci_dev *return 0 ; +#ifdef CONFIG_DCB err_free_zc_bmap:bitmap_free (vf->af_xdp_zc_qidx); +#endif err_unreg_devlink:otx2_unregister_dl (vf); err_shutdown_tc:
Greg Kroah-Hartman
maintainerPATCH 764/783 wifi: mac80211: restore monitor for outgoing frames
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit abf078c0a322159f5ebe2adaa0cd69dc45b1e710 upstream.
This code was accidentally dropped during the cooked monitor removal, but really should've been simplified instead. Add the simple version back.
--- net/mac80211/status.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/mac80211/status.c +7 -1
@@ -1085,7 +1085,13 @@ static void __ieee80211_tx_status(structieee80211_report_used_skb (local, skb, false, status->ack_hwtstamp); -if (status->free_list) +/* +* This is a bit racy but we can avoid a lot of work +* with this test... +*/ +if (local->tx_mntrs) +ieee80211_tx_monitor (local, skb, retry_count, status); +else if (status->free_list)list_add_tail (&skb->list, status->free_list);else dev_kfree_skb (skb);
Greg Kroah-Hartman
maintainerPATCH 765/783 nilfs2: fix deadlock warnings caused by lock dependency in init_nilfs()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit fb881cd7604536b17a1927fb0533f9a6982ffcc5 upstream.
After commit c0e473a0d226 ("block: fix race between set_blocksize and read paths") was merged, set_blocksize() called by sb_set_blocksize() now locks the inode of the backing device file. As a result of this change, syzbot started reporting deadlock warnings due to a circular dependency involving the semaphore "ns_sem" of the nilfs object, the inode lock of the backing device file, and the locks that this inode lock is transitively dependent on.
This is caused by a new lock dependency added by the above change, since init_nilfs() calls sb_set_blocksize() in the lock section of "ns_sem". However, these warnings are false positives because init_nilfs() is called in the early stage of the mount operation and the filesystem has not yet started.
The reason why "ns_sem" is locked in init_nilfs() was to avoid a race condition in nilfs_fill_super() caused by sharing a nilfs object among multiple filesystem instances (super block structures) in the early implementation. However, nilfs objects and super block structures have long ago become one-to-one, and there is no longer any need to use the semaphore there.
So, fix this issue by removing the use of the semaphore "ns_sem" in init_nilfs().
--- fs/nilfs2/the_nilfs.c | 3 --- 1 file changed, 3 deletions(-)
fs/nilfs2/the_nilfs.c +0 -3
@@ -705,8 +705,6 @@ int init_nilfs(struct the_nilfs *nilfs,int blocksize;int err; -down_write (&nilfs->ns_sem); - blocksize =sb_min_blocksize (sb,NILFS_MIN_BLOCK_SIZE );if (!blocksize) {nilfs_err (sb,"unable to set blocksize" );
@@ -779,7 +777,6 @@ int init_nilfs(struct the_nilfs *nilfs,set_nilfs_init (nilfs); err =0 ; out: -up_write (&nilfs->ns_sem);return err; failed_sbh:
Greg Kroah-Hartman
maintainerPATCH 766/783 Bluetooth: btmtksdio: Check function enabled before doing close
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Lu <[email protected]>
commit 07e90048e356a29079fbc011cfc2e1fa1d1c5ac9 upstream.
Check BTMTKSDIO_FUNC_ENABLED flag before doing close to prevent btmtksdio_close been called twice.
--- drivers/bluetooth/btmtksdio.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/bluetooth/btmtksdio.c +4 -0
@@ -723,6 +723,10 @@ static int btmtksdio_close(struct hci_de {struct btmtksdio_dev *bdev =hci_get_drvdata (hdev); +/* Skip btmtksdio_close if BTMTKSDIO_FUNC_ENABLED isn't set */ +if (!test_bit (BTMTKSDIO_FUNC_ENABLED , &bdev->tx_state)) +return 0 ; +sdio_claim_host (bdev->func);/* Disable interrupt */
Greg Kroah-Hartman
maintainerPATCH 767/783 Bluetooth: btmtksdio: Do close if SDIO card removed without close
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Lu <[email protected]>
commit 0b6d58bc6ea85e57de25c828444928e4a0aa79cb upstream.
To prevent Bluetooth SDIO card from be physically removed suddenly, driver needs to ensure btmtksdio_close is called before btmtksdio_remove to disable interrupts and txrx workqueue.
--- drivers/bluetooth/btmtksdio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/bluetooth/btmtksdio.c +6 -2
@@ -1447,11 +1447,15 @@ static void btmtksdio_remove(struct sdioif (!bdev)return ; + hdev = bdev->hdev; + +/* Make sure to call btmtksdio_close before removing sdio card */ +if (test_bit (BTMTKSDIO_FUNC_ENABLED , &bdev->tx_state)) +btmtksdio_close (hdev); +/* Be consistent the state in btmtksdio_probe */ pm_runtime_get_noresume (bdev->dev); - hdev = bdev->hdev; -sdio_set_drvdata (func,NULL );hci_unregister_dev (hdev);hci_free_dev (hdev);
Greg Kroah-Hartman
maintainerPATCH 768/783 Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection"
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jernej Skrabec <[email protected]>
[ Upstream commit 573f99c7585f597630f14596550c79e73ffaeef4 ]
This reverts commit 531fdbeedeb89bd32018a35c6e137765c9cc9e97.
Hardware that uses I2C wasn't designed with high speeds in mind, so communication with PMIC via RSB can intermittently fail. Go back to I2C as higher speed and efficiency isn't worth the trouble.
--- .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 38 +++++++++---------- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 14 +++---- .../dts/allwinner/sun50i-h6-orangepi.dtsi | 22 +++++------ 3 files changed, 37 insertions(+), 37 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +19 -19
@@ -152,28 +152,12 @@ vcc-pg-supply = <®_aldo1>; }; -&r_ir { - linux,rc-map-name = "rc-beelink-gs1"; - status = "okay"; -}; - -&r_pio { - /* - * FIXME: We can't add that supply for now since it would - * create a circular dependency between pinctrl, the regulator - * and the RSB Bus. - * - * vcc-pl-supply = <®_aldo1>; - */ - vcc-pm-supply = <®_aldo1>; -}; - -&r_rsb { +&r_i2c { status = "okay"; - axp805: pmic@745 { + axp805: pmic@36 { compatible = "x-powers,axp805", "x-powers,axp806"; - reg = <0x745>; + reg = <0x36>; interrupt-parent = <&r_intc>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>; interrupt-controller;
@@ -291,6 +275,22 @@ }; }; +&r_ir { + linux,rc-map-name = "rc-beelink-gs1"; + status = "okay"; +}; + +&r_pio { + /* + * PL0 and PL1 are used for PMIC I2C + * don't enable the pl-supply else + * it will fail at boot + * + * vcc-pl-supply = <®_aldo1>; + */ + vcc-pm-supply = <®_aldo1>; +}; + &spdif { pinctrl-names = "default"; pinctrl-0 = <&spdif_tx_pin>;
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +7 -7
@@ -176,16 +176,12 @@ vcc-pg-supply = <®_vcc_wifi_io>; }; -&r_ir { - status = "okay"; -}; - -&r_rsb { +&r_i2c { status = "okay"; - axp805: pmic@745 { + axp805: pmic@36 { compatible = "x-powers,axp805", "x-powers,axp806"; - reg = <0x745>; + reg = <0x36>; interrupt-parent = <&r_intc>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>; interrupt-controller;
@@ -296,6 +292,10 @@ }; }; +&r_ir { + status = "okay"; +}; + &rtc { clocks = <&ext_osc32k>; };
arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +11 -11
@@ -113,20 +113,12 @@ vcc-pg-supply = <®_aldo1>; }; -&r_ir { - status = "okay"; -}; - -&r_pio { - vcc-pm-supply = <®_bldo3>; -}; - -&r_rsb { +&r_i2c { status = "okay"; - axp805: pmic@745 { + axp805: pmic@36 { compatible = "x-powers,axp805", "x-powers,axp806"; - reg = <0x745>; + reg = <0x36>; interrupt-parent = <&r_intc>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>; interrupt-controller;
@@ -241,6 +233,14 @@ }; }; +&r_ir { + status = "okay"; +}; + +&r_pio { + vcc-pm-supply = <®_bldo3>; +}; + &rtc { clocks = <&ext_osc32k>; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 769/783 ksmbd: fix stream write failure
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 1f4bbedd4e5a69b01cde2cc21d01151ab2d0884f ]
If there is no stream data in file, v_len is zero. So, If position(*pos) is zero, stream write will fail due to stream write position validation check. This patch reorganize stream write position validation.
--- fs/smb/server/vfs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/smb/server/vfs.c +6 -8
@@ -426,10 +426,15 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos,ksmbd_debug (VFS ,"write stream data pos : %llu, count : %zd\n" , *pos, count); +if (*pos >=XATTR_SIZE_MAX ) { +pr_err ("stream write position %lld is out of bounds\n" , *pos); +return -EINVAL ; + } + size = *pos + count;if (size >XATTR_SIZE_MAX ) { size =XATTR_SIZE_MAX ; - count = (*pos + count) -XATTR_SIZE_MAX ; + count =XATTR_SIZE_MAX - *pos; } v_len = ksmbd_vfs_getcasexattr(idmap,
@@ -443,13 +448,6 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos, goto out; } -if (v_len <= *pos) { -pr_err ("stream write position %lld is out of bounds (stream length: %zd)\n" , - *pos, v_len); - err = -EINVAL ; - goto out; - } -if (v_len < size) { wbuf =kvzalloc (size,KSMBD_DEFAULT_GFP );if (!wbuf) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 770/783 platform/x86: think-lmi: Fix attribute name usage for non-compliant items
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Pearson <[email protected]>
[ Upstream commit 8508427a6e21c1ef01ae4c9f4e2675fc99deb949 ]
A few, quite rare, WMI attributes have names that are not compatible with filenames, e.g. "Intel VT for Directed I/O (VT-d)".
For these cases the '/' gets replaced with '\' for display, but doesn't get switched again when doing the WMI access.
Fix this by keeping the original attribute name and using that for sending commands to the BIOS
--- drivers/platform/x86/think-lmi.c | 26 ++++++++++++++------------ drivers/platform/x86/think-lmi.h | 1 + 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/platform/x86/think-lmi.c +14 -12
@@ -1065,8 +1065,8 @@ static ssize_t current_value_store(struct kobject *kobj, ret = -EINVAL ; goto out; } - set_str =kasprintf (GFP_KERNEL ,"%s,%s,%s" , setting->display_name, - new_setting, tlmi_priv.pwd_admin->signature); + set_str =kasprintf (GFP_KERNEL ,"%s,%s,%s" , setting->name, + new_setting, tlmi_priv.pwd_admin->signature);if (!set_str) { ret = -ENOMEM ; goto out;
@@ -1096,7 +1096,7 @@ static ssize_t current_value_store(struct kobject *kobj, goto out; } - set_str =kasprintf (GFP_KERNEL ,"%s,%s;" , setting->display_name, + set_str =kasprintf (GFP_KERNEL ,"%s,%s;" , setting->name, new_setting);if (!set_str) { ret = -ENOMEM ;
@@ -1124,11 +1124,11 @@ static ssize_t current_value_store(struct kobject *kobj, }if (auth_str) - set_str =kasprintf (GFP_KERNEL ,"%s,%s,%s" , setting->display_name, - new_setting, auth_str); + set_str =kasprintf (GFP_KERNEL ,"%s,%s,%s" , setting->name, + new_setting, auth_str);else - set_str =kasprintf (GFP_KERNEL ,"%s,%s;" , setting->display_name, - new_setting); + set_str =kasprintf (GFP_KERNEL ,"%s,%s;" , setting->name, + new_setting);if (!set_str) { ret = -ENOMEM ; goto out;
@@ -1633,9 +1633,6 @@ static int tlmi_analyze(void)continue ; } -/* It is not allowed to have '/' for file name. Convert it into '\'. */ -strreplace (item,'/' ,'\\' ); -/* Remove the value part */ strreplace (item,',' ,'\0' );
@@ -1647,11 +1644,16 @@ static int tlmi_analyze(void) goto fail_clear_attr; } setting->index = i; + +strscpy (setting->name, item); +/* It is not allowed to have '/' for file name. Convert it into '\'. */ +strreplace (item,'/' ,'\\' );strscpy (setting->display_name, item); +/* If BIOS selections supported, load those */ if (tlmi_priv.can_get_bios_selections) { - ret =tlmi_get_bios_selections (setting->display_name, - &setting->possible_values); + ret =tlmi_get_bios_selections (setting->name, + &setting->possible_values);if (ret || !setting->possible_values)pr_info ("Error retrieving possible values for %d : %s\n" , i, setting->display_name);
drivers/platform/x86/think-lmi.h +1 -0
@@ -88,6 +88,7 @@ struct tlmi_pwd_setting {struct tlmi_attr_setting {struct kobject kobj;int index; +char name[TLMI_SETTINGS_MAXLEN ];char display_name[TLMI_SETTINGS_MAXLEN ];char *possible_values; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 771/783 spi: use container_of_cont() for to_spi_device()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 1007ae0d464ceb55a3740634790521d3543aaab9 ]
Some places in the spi core pass in a const pointer to a device and the default container_of() casts that away, which is not a good idea. Preserve the proper const attribute by using container_of_const() for to_spi_device() instead, which is what it was designed for.
Note, this removes the NULL check for a device pointer in the call, but no one was ever checking for that return value, and a device pointer should never be NULL overall anyway, so this should be a safe change.
--- include/linux/spi/spi.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/linux/spi/spi.h +1 -4
@@ -247,10 +247,7 @@ struct spi_device {static_assert ((SPI_MODE_KERNEL_MASK &SPI_MODE_USER_MASK ) ==0 ,"SPI_MODE_USER_MASK & SPI_MODE_KERNEL_MASK must not overlap" ); -static inline struct spi_device *to_spi_device (const struct device *dev) -{ - return dev ? container_of(dev, struct spi_device, dev) : NULL; -} +#define to_spi_device (__dev) container_of_const(__dev, struct spi_device, dev)/* Most drivers won't need to care about device refcounting */ static inline struct spi_device *spi_dev_get (struct spi_device *spi)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 772/783 spi: spi-fsl-dspi: restrict register range for regmap access
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larisa Grigore <[email protected]>
[ Upstream commit 283ae0c65e9c592f4a1ba4f31917f5e766da7f31 ]
DSPI registers are NOT continuous, some registers are reserved and accessing them from userspace will trigger external abort, add regmap register access table to avoid below abort.
For example on S32G:
# cat /sys/kernel/debug/regmap/401d8000.spi/registers
Internal error: synchronous external abort: 96000210 1 PREEMPT SMP ... Call trace: regmap_mmio_read32le+0x24/0x48 regmap_mmio_read+0x48/0x70 _regmap_bus_reg_read+0x38/0x48 _regmap_read+0x68/0x1b0 regmap_read+0x50/0x78 regmap_read_debugfs+0x120/0x338
--- drivers/spi/spi-fsl-dspi.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/spi/spi-fsl-dspi.c +19 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ // // Copyright 2013 Freescale Semiconductor, Inc. -// Copyright 2020 NXP +// Copyright 2020-2025 NXP // // Freescale DSPI driver // This file contains a driver for the Freescale DSPI
@@ -1167,6 +1167,20 @@ static int dspi_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(dspi_pm, dspi_suspend, dspi_resume); +static const struct regmap_range dspi_yes_ranges[] = { +regmap_reg_range (SPI_MCR ,SPI_MCR ), +regmap_reg_range (SPI_TCR ,SPI_CTAR (3 )), +regmap_reg_range (SPI_SR ,SPI_TXFR3 ), +regmap_reg_range (SPI_RXFR0 ,SPI_RXFR3 ), +regmap_reg_range (SPI_CTARE (0 ),SPI_CTARE (3 )), +regmap_reg_range (SPI_SREX ,SPI_SREX ), +}; + +static const struct regmap_access_table dspi_access_table = { + .yes_ranges = dspi_yes_ranges, + .n_yes_ranges =ARRAY_SIZE (dspi_yes_ranges), +}; +static const struct regmap_range dspi_volatile_ranges[] = {regmap_reg_range (SPI_MCR ,SPI_TCR ),regmap_reg_range (SPI_SR ,SPI_SR ),
@@ -1184,6 +1198,8 @@ static const struct regmap_config dspi_regmap_config = { .reg_stride = 4, .max_register = 0x88, .volatile_table = &dspi_volatile_table, + .rd_table = &dspi_access_table, + .wr_table = &dspi_access_table, };static const struct regmap_range dspi_xspi_volatile_ranges[] = {
@@ -1205,6 +1221,8 @@ static const struct regmap_config dspi_xspi_regmap_config[] = { .reg_stride = 4, .max_register = 0x13c, .volatile_table = &dspi_xspi_volatile_table, + .rd_table = &dspi_access_table, + .wr_table = &dspi_access_table, }, { .name = "pushr",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 773/783 spi: spi-fsl-dspi: Halt the module after a new message transfer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bogdan-Gabriel Roman <[email protected]>
[ Upstream commit 8a30a6d35a11ff5ccdede7d6740765685385a917 ]
The XSPI mode implementation in this driver still uses the EOQ flag to signal the last word in a transmission and deassert the PCS signal. However, at speeds lower than ~200kHZ, the PCS signal seems to remain asserted even when SR[EOQF] = 1 indicates the end of a transmission. This is a problem for target devices which require the deassertation of the PCS signal between transfers.
Hence, this commit 'forces' the deassertation of the PCS by stopping the module through MCR[HALT] after completing a new transfer. According to the reference manual, the module stops or transitions from the Running state to the Stopped state after the current frame, when any one of the following conditions exist:
- The value of SR[EOQF] = 1.
- The chip is in Debug mode and the value of MCR[FRZ] = 1.
- The value of MCR[HALT] = 1.
This shouldn't be done if the last transfer in the message has cs_change set.
--- drivers/spi/spi-fsl-dspi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/spi/spi-fsl-dspi.c +24 -0
@@ -62,6 +62,7 @@#define SPI_SR_TFIWF BIT(18)#define SPI_SR_RFDF BIT(17)#define SPI_SR_CMDFFF BIT(16) +#define SPI_SR_TXRXS BIT(30)#define SPI_SR_CLEAR (SPI_SR_TCFQF | \ SPI_SR_TFUF | SPI_SR_TFFF | \ SPI_SR_CMDTCF | SPI_SR_SPEF | \
@@ -921,9 +922,20 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,struct spi_transfer *transfer;bool cs = false;int status =0 ; +u32 val =0 ; +bool cs_change = false; message->actual_length =0 ; +/* Put DSPI in running mode if halted. */ +regmap_read (dspi->regmap,SPI_MCR , &val); +if (val &SPI_MCR_HALT ) { +regmap_update_bits (dspi->regmap,SPI_MCR ,SPI_MCR_HALT ,0 ); +while (regmap_read (dspi->regmap,SPI_SR , &val) >=0 && + !(val &SPI_SR_TXRXS )) + ; + } +list_for_each_entry (transfer, &message->transfers, transfer_list) { dspi->cur_transfer = transfer; dspi->cur_msg = message;
@@ -953,6 +965,7 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr, dspi->tx_cmd |=SPI_PUSHR_CMD_CONT ; } + cs_change = transfer->cs_change; dspi->tx = transfer->tx_buf; dspi->rx = transfer->rx_buf; dspi->len = transfer->len;
@@ -988,6 +1001,15 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,dspi_deassert_cs (spi, &cs); } +if (status || !cs_change) { +/* Put DSPI in stop mode */ +regmap_update_bits (dspi->regmap,SPI_MCR , +SPI_MCR_HALT ,SPI_MCR_HALT ); +while (regmap_read (dspi->regmap,SPI_SR , &val) >=0 && + val &SPI_SR_TXRXS ) + ; + } + message->status = status;spi_finalize_current_message (ctlr);
@@ -1245,6 +1267,8 @@ static int dspi_init(struct fsl_dspi *dspi)if (!spi_controller_is_target (dspi->ctlr)) mcr |=SPI_MCR_HOST ; + mcr |=SPI_MCR_HALT ; +regmap_write (dspi->regmap,SPI_MCR , mcr);regmap_write (dspi->regmap,SPI_SR ,SPI_SR_CLEAR );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 774/783 spi: spi-fsl-dspi: Reset SR flags before sending a new message
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larisa Grigore <[email protected]>
[ Upstream commit 7aba292eb15389073c7f3bd7847e3862dfdf604d ]
If, in a previous transfer, the controller sends more data than expected by the DSPI target, SR.RFDF (RX FIFO is not empty) will remain asserted. When flushing the FIFOs at the beginning of a new transfer (writing 1 into MCR.CLR_TXF and MCR.CLR_RXF), SR.RFDF should also be cleared. Otherwise, when running in target mode with DMA, if SR.RFDF remains asserted, the DMA callback will be fired before the controller sends any data.
Take this opportunity to reset all Status Register fields.
--- drivers/spi/spi-fsl-dspi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-fsl-dspi.c +2 -0
@@ -975,6 +975,8 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,SPI_MCR_CLR_TXF |SPI_MCR_CLR_RXF , SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF); +regmap_write (dspi->regmap,SPI_SR ,SPI_SR_CLEAR ); +spi_take_timestamp_pre (dspi->ctlr, dspi->cur_transfer, dspi->progress, !dspi->irq);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 775/783 drm/xe: Use xe_mmio_read32() to read mtcfg register
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuicheng Lin <[email protected]>
[ Upstream commit 84b6f8503b29a6cc5a82848253a97c09a95fdf49 ]
The mtcfg register is a 32-bit register and should therefore be accessed using xe_mmio_read32().
Other 3 changes per codestyle suggestion:
"
xe_mmio.c:83: CHECK: Alignment should match open parenthesis xe_mmio.c:131: CHECK: Comparison to NULL could be written "!xe->mmio.regs" xe_mmio.c:315: CHECK: line length of 103 exceeds 100 columns
"
--- drivers/gpu/drm/xe/xe_mmio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/xe/xe_mmio.c +5 -5
@@ -76,12 +76,12 @@ static void mmio_multi_tile_setup(struct xe_device *xe, size_t tile_mmio_size)* is fine as it's going to the root tile's mmio, that's * guaranteed to be initialized earlier in xe_mmio_init() */ - mtcfg =xe_mmio_read64_2x32 (mmio,XEHP_MTCFG_ADDR ); + mtcfg =xe_mmio_read32 (mmio,XEHP_MTCFG_ADDR ); tile_count =REG_FIELD_GET (TILE_COUNT , mtcfg) +1 ;if (tile_count < xe->info.tile_count) {drm_info (&xe->drm,"tile_count: %d, reduced_tile_count %d\n" , - xe->info.tile_count, tile_count); + xe->info.tile_count, tile_count); xe->info.tile_count = tile_count;/*
@@ -173,7 +173,7 @@ int xe_mmio_init(struct xe_device *xe)*/ xe->mmio.size =pci_resource_len (pdev,GTTMMADR_BAR ); xe->mmio.regs =pci_iomap (pdev,GTTMMADR_BAR ,0 ); -if (xe->mmio.regs ==NULL ) { +if (!xe->mmio.regs) {drm_err (&xe->drm,"failed to map registers\n" );return -EIO ; }
@@ -338,8 +338,8 @@ u64 xe_mmio_read64_2x32(struct xe_mmio *mmio, struct xe_reg reg)return (u64 )udw <<32 | ldw; } -static int __xe_mmio_wait32 (struct xe_mmio *mmio,struct xe_reg reg,u32 mask,u32 val,u32 timeout_us, -u32 *out_val,bool atomic,bool expect_match) +static int __xe_mmio_wait32 (struct xe_mmio *mmio,struct xe_reg reg,u32 mask,u32 val, +u32 timeout_us,u32 *out_val,bool atomic,bool expect_match) {ktime_t cur =ktime_get_raw ();const ktime_t end =ktime_add_us (cur, timeout_us);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 776/783 err.h: move IOMEM_ERR_PTR() to err.h
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raag Jadav <[email protected]>
commit 18311a766c587fc69b1806f1d5943305903b7e6e upstream.
Since IOMEM_ERR_PTR() macro deals with an error pointer, a better place for it is err.h. This helps avoid dependency on io.h for the users that don't need it.
--- include/linux/err.h | 3 +++ include/linux/io.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)
include/linux/err.h +3 -0
@@ -44,6 +44,9 @@ static inline void * __must_check ERR_PT/* Return the pointer in the percpu address space. */ #define ERR_PTR_PCPU (error) ((void __percpu *)(unsigned long)ERR_PTR(error)) +/* Cast an error pointer to __iomem. */ +#define IOMEM_ERR_PTR (error) (__force void __iomem *)ERR_PTR(error) +/** * PTR_ERR - Extract the error code from an error pointer. * @ptr: An error pointer.
include/linux/io.h +0 -2
@@ -65,8 +65,6 @@ static inline void devm_ioport_unmap(str }#endif -#define IOMEM_ERR_PTR (err) (__force void __iomem *)ERR_PTR(err) -void __iomem *devm_ioremap (struct device *dev,resource_size_t offset,resource_size_t size); void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
Greg Kroah-Hartman
maintainerPATCH 777/783 drm/i915/dp: Fix determining SST/MST mode during MTP TU state computation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Imre Deak <[email protected]>
commit 732b87a409667a370b87955c518e5d004de740b5 upstream.
Determining the SST/MST mode during state computation must be done based on the output type stored in the CRTC state, which in turn is set once based on the modeset connector's SST vs. MST type and will not change as long as the connector is using the CRTC. OTOH the MST mode indicated by the given connector's intel_dp::is_mst flag can change independently of the above output type, based on what sink is at any moment plugged to the connector.
Fix the state computation accordingly.
References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14218
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -1
@@ -221,6 +221,7 @@ int intel_dp_mtp_tu_compute_config(structo_intel_connector (conn_state->connector);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; +bool is_mst =intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST );fixed20_12 pbn_div;int bpp, slots = -EINVAL ;int dsc_slice_count =0 ;
@@ -271,7 +272,7 @@ int intel_dp_mtp_tu_compute_config(struc link_bpp_x16, &crtc_state->dp_m_n); -if (intel_dp->is_mst) { +if (is_mst) {int remote_bw_overhead;int remote_tu;fixed20_12 pbn;
Greg Kroah-Hartman
maintainerPATCH 778/783 drm/amdgpu/vcn4.0.5: split code along instances
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit ecc9ab4e924b7eb9e2c4a668162aaa1d9d60d08c upstream.
Split the code on a per instance basis. This will allow us to use the per instance functions in the future to handle more things per instance.
v2: squash in fix for stop() from Boyuan
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 462 +++++++++++++++----------------- 1 file changed, 229 insertions(+), 233 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +229 -233
@@ -991,184 +991,179 @@ static int vcn_v4_0_5_start_dpg_mode(str* vcn_v4_0_5_start - VCN start * * @adev: amdgpu_device pointer +* @i: instance to start * * Start VCN block */ -static int vcn_v4_0_5_start (struct amdgpu_device *adev) +static int vcn_v4_0_5_start (struct amdgpu_device *adev,int i) {volatile struct amdgpu_vcn4_fw_shared *fw_shared;struct amdgpu_ring *ring;uint32_t tmp; -int i, j, k, r; +int j, k, r; -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { -if (adev->pm.dpm_enabled) -amdgpu_dpm_enable_vcn (adev, true, i); - } - -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { -if (adev->vcn.harvest_config & (1 << i)) -continue ; +if (adev->vcn.harvest_config & (1 << i)) +return 0 ; - fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; +if (adev->pm.dpm_enabled) +amdgpu_dpm_enable_vcn (adev, true, i); -if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) { - r =vcn_v4_0_5_start_dpg_mode (adev, i, adev->vcn.indirect_sram); -continue ; - } + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; -/* disable VCN power gating */ -vcn_v4_0_5_disable_static_power_gating (adev, i); +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) +return vcn_v4_0_5_start_dpg_mode (adev, i, adev->vcn.indirect_sram); -/* set VCN status busy */ - tmp =RREG32_SOC15 (VCN , i, regUVD_STATUS) |UVD_STATUS__UVD_BUSY ; -WREG32_SOC15 (VCN , i, regUVD_STATUS, tmp); - -/*SW clock gating */ -vcn_v4_0_5_disable_clock_gating (adev, i); - -/* enable VCPU clock */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), -UVD_VCPU_CNTL__CLK_EN_MASK , ~UVD_VCPU_CNTL__CLK_EN_MASK ); - -/* disable master interrupt */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_MASTINT_EN),0 , - ~UVD_MASTINT_EN__VCPU_EN_MASK ); - -/* enable LMI MC and UMC channels */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_LMI_CTRL2),0 , - ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ); - - tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); - tmp &= ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK ; - tmp &= ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ; -WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); - -/* setup regUVD_LMI_CTRL */ - tmp =RREG32_SOC15 (VCN , i, regUVD_LMI_CTRL); -WREG32_SOC15 (VCN , i, regUVD_LMI_CTRL, tmp | -UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | -UVD_LMI_CTRL__MASK_MC_URGENT_MASK | -UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | -UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK ); - -/* setup regUVD_MPC_CNTL */ - tmp =RREG32_SOC15 (VCN , i, regUVD_MPC_CNTL); - tmp &= ~UVD_MPC_CNTL__REPLACEMENT_MODE_MASK ; - tmp |=0x2 <<UVD_MPC_CNTL__REPLACEMENT_MODE__SHIFT ; -WREG32_SOC15 (VCN , i, regUVD_MPC_CNTL, tmp); - -/* setup UVD_MPC_SET_MUXA0 */ -WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUXA0, - ((0x1 <<UVD_MPC_SET_MUXA0__VARA_1__SHIFT ) | - (0x2 <<UVD_MPC_SET_MUXA0__VARA_2__SHIFT ) | - (0x3 <<UVD_MPC_SET_MUXA0__VARA_3__SHIFT ) | - (0x4 <<UVD_MPC_SET_MUXA0__VARA_4__SHIFT ))); - -/* setup UVD_MPC_SET_MUXB0 */ -WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUXB0, - ((0x1 <<UVD_MPC_SET_MUXB0__VARB_1__SHIFT ) | - (0x2 <<UVD_MPC_SET_MUXB0__VARB_2__SHIFT ) | - (0x3 <<UVD_MPC_SET_MUXB0__VARB_3__SHIFT ) | - (0x4 <<UVD_MPC_SET_MUXB0__VARB_4__SHIFT ))); - -/* setup UVD_MPC_SET_MUX */ -WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUX, - ((0x0 <<UVD_MPC_SET_MUX__SET_0__SHIFT ) | - (0x1 <<UVD_MPC_SET_MUX__SET_1__SHIFT ) | - (0x2 <<UVD_MPC_SET_MUX__SET_2__SHIFT ))); - -vcn_v4_0_5_mc_resume (adev, i); - -/* VCN global tiling registers */ -WREG32_SOC15 (VCN , i, regUVD_GFX10_ADDR_CONFIG, - adev->gfx.config.gb_addr_config); - -/* unblock VCPU register access */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_RB_ARB_CTRL),0 , - ~UVD_RB_ARB_CTRL__VCPU_DIS_MASK ); - -/* release VCPU reset to boot */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , - ~UVD_VCPU_CNTL__BLK_RST_MASK ); - -for (j =0 ; j <10 ; ++j) { -uint32_t status; - -for (k =0 ; k <100 ; ++k) { - status =RREG32_SOC15 (VCN , i, regUVD_STATUS); -if (status &2 ) -break ; -mdelay (10 ); -if (amdgpu_emu_mode ==1 ) -msleep (1 ); - } +/* disable VCN power gating */ +vcn_v4_0_5_disable_static_power_gating (adev, i); + +/* set VCN status busy */ + tmp =RREG32_SOC15 (VCN , i, regUVD_STATUS) |UVD_STATUS__UVD_BUSY ; +WREG32_SOC15 (VCN , i, regUVD_STATUS, tmp); + +/* SW clock gating */ +vcn_v4_0_5_disable_clock_gating (adev, i); + +/* enable VCPU clock */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), +UVD_VCPU_CNTL__CLK_EN_MASK , ~UVD_VCPU_CNTL__CLK_EN_MASK ); + +/* disable master interrupt */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_MASTINT_EN),0 , + ~UVD_MASTINT_EN__VCPU_EN_MASK ); + +/* enable LMI MC and UMC channels */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_LMI_CTRL2),0 , + ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ); + + tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); + tmp &= ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK ; + tmp &= ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ; +WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); + +/* setup regUVD_LMI_CTRL */ + tmp =RREG32_SOC15 (VCN , i, regUVD_LMI_CTRL); +WREG32_SOC15 (VCN , i, regUVD_LMI_CTRL, tmp | +UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | +UVD_LMI_CTRL__MASK_MC_URGENT_MASK | +UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | +UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK ); + +/* setup regUVD_MPC_CNTL */ + tmp =RREG32_SOC15 (VCN , i, regUVD_MPC_CNTL); + tmp &= ~UVD_MPC_CNTL__REPLACEMENT_MODE_MASK ; + tmp |=0x2 <<UVD_MPC_CNTL__REPLACEMENT_MODE__SHIFT ; +WREG32_SOC15 (VCN , i, regUVD_MPC_CNTL, tmp); + +/* setup UVD_MPC_SET_MUXA0 */ +WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUXA0, + ((0x1 <<UVD_MPC_SET_MUXA0__VARA_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXA0__VARA_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXA0__VARA_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXA0__VARA_4__SHIFT ))); + +/* setup UVD_MPC_SET_MUXB0 */ +WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUXB0, + ((0x1 <<UVD_MPC_SET_MUXB0__VARB_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUXB0__VARB_2__SHIFT ) | + (0x3 <<UVD_MPC_SET_MUXB0__VARB_3__SHIFT ) | + (0x4 <<UVD_MPC_SET_MUXB0__VARB_4__SHIFT ))); + +/* setup UVD_MPC_SET_MUX */ +WREG32_SOC15 (VCN , i, regUVD_MPC_SET_MUX, + ((0x0 <<UVD_MPC_SET_MUX__SET_0__SHIFT ) | + (0x1 <<UVD_MPC_SET_MUX__SET_1__SHIFT ) | + (0x2 <<UVD_MPC_SET_MUX__SET_2__SHIFT ))); + +vcn_v4_0_5_mc_resume (adev, i); + +/* VCN global tiling registers */ +WREG32_SOC15 (VCN , i, regUVD_GFX10_ADDR_CONFIG, + adev->gfx.config.gb_addr_config); + +/* unblock VCPU register access */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_RB_ARB_CTRL),0 , + ~UVD_RB_ARB_CTRL__VCPU_DIS_MASK ); + +/* release VCPU reset to boot */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , + ~UVD_VCPU_CNTL__BLK_RST_MASK ); + +for (j =0 ; j <10 ; ++j) { +uint32_t status; + +for (k =0 ; k <100 ; ++k) { + status =RREG32_SOC15 (VCN , i, regUVD_STATUS); +if (status &2 ) +break ; +mdelay (10 ); +if (amdgpu_emu_mode ==1 ) +msleep (1 ); + } -if (amdgpu_emu_mode ==1 ) { - r =-1 ; -if (status &2 ) { - r =0 ; -break ; - } - }else { +if (amdgpu_emu_mode ==1 ) { + r =-1 ; +if (status &2 ) { r =0 ; -if (status &2 ) -break ; - -dev_err (adev->dev, -"VCN[%d] is not responding, trying to reset VCPU!!!\n" , i); -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), -UVD_VCPU_CNTL__BLK_RST_MASK , - ~UVD_VCPU_CNTL__BLK_RST_MASK ); -mdelay (10 ); -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , - ~UVD_VCPU_CNTL__BLK_RST_MASK ); - -mdelay (10 ); - r =-1 ; +break ; } - } + }else { + r =0 ; +if (status &2 ) +break ; + +dev_err (adev->dev, +"VCN[%d] is not responding, trying to reset VCPU!!!\n" , i); +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), +UVD_VCPU_CNTL__BLK_RST_MASK , + ~UVD_VCPU_CNTL__BLK_RST_MASK ); +mdelay (10 ); +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , + ~UVD_VCPU_CNTL__BLK_RST_MASK ); -if (r) { -dev_err (adev->dev,"VCN[%d] is not responding, giving up!!!\n" , i); -return r; +mdelay (10 ); + r =-1 ; } + } -/* enable master interrupt */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_MASTINT_EN), -UVD_MASTINT_EN__VCPU_EN_MASK , - ~UVD_MASTINT_EN__VCPU_EN_MASK ); - -/* clear the busy bit of VCN_STATUS */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_STATUS),0 , - ~(2 <<UVD_STATUS__VCPU_REPORT__SHIFT )); - - ring = &adev->vcn.inst[i].ring_enc[0 ]; -WREG32_SOC15 (VCN , i, regVCN_RB1_DB_CTRL, - ring->doorbell_index <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | -VCN_RB1_DB_CTRL__EN_MASK ); - -WREG32_SOC15 (VCN , i, regUVD_RB_BASE_LO, ring->gpu_addr); -WREG32_SOC15 (VCN , i, regUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); -WREG32_SOC15 (VCN , i, regUVD_RB_SIZE, ring->ring_size /4 ); - - tmp =RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); - tmp &= ~(VCN_RB_ENABLE__RB1_EN_MASK ); -WREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); - fw_shared->sq.queue_mode |=FW_QUEUE_RING_RESET ; -WREG32_SOC15 (VCN , i, regUVD_RB_RPTR,0 ); -WREG32_SOC15 (VCN , i, regUVD_RB_WPTR,0 ); - - tmp =RREG32_SOC15 (VCN , i, regUVD_RB_RPTR); -WREG32_SOC15 (VCN , i, regUVD_RB_WPTR, tmp); - ring->wptr =RREG32_SOC15 (VCN , i, regUVD_RB_WPTR); - - tmp =RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); - tmp |=VCN_RB_ENABLE__RB1_EN_MASK ; -WREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); - fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET |FW_QUEUE_DPG_HOLD_OFF ); +if (r) { +dev_err (adev->dev,"VCN[%d] is not responding, giving up!!!\n" , i); +return r; } +/* enable master interrupt */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_MASTINT_EN), +UVD_MASTINT_EN__VCPU_EN_MASK , + ~UVD_MASTINT_EN__VCPU_EN_MASK ); + +/* clear the busy bit of VCN_STATUS */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_STATUS),0 , + ~(2 <<UVD_STATUS__VCPU_REPORT__SHIFT )); + + ring = &adev->vcn.inst[i].ring_enc[0 ]; +WREG32_SOC15 (VCN , i, regVCN_RB1_DB_CTRL, + ring->doorbell_index <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | +VCN_RB1_DB_CTRL__EN_MASK ); + +WREG32_SOC15 (VCN , i, regUVD_RB_BASE_LO, ring->gpu_addr); +WREG32_SOC15 (VCN , i, regUVD_RB_BASE_HI,upper_32_bits (ring->gpu_addr)); +WREG32_SOC15 (VCN , i, regUVD_RB_SIZE, ring->ring_size /4 ); + + tmp =RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); + tmp &= ~(VCN_RB_ENABLE__RB1_EN_MASK ); +WREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); + fw_shared->sq.queue_mode |=FW_QUEUE_RING_RESET ; +WREG32_SOC15 (VCN , i, regUVD_RB_RPTR,0 ); +WREG32_SOC15 (VCN , i, regUVD_RB_WPTR,0 ); + + tmp =RREG32_SOC15 (VCN , i, regUVD_RB_RPTR); +WREG32_SOC15 (VCN , i, regUVD_RB_WPTR, tmp); + ring->wptr =RREG32_SOC15 (VCN , i, regUVD_RB_WPTR); + + tmp =RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); + tmp |=VCN_RB_ENABLE__RB1_EN_MASK ; +WREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); + fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET |FW_QUEUE_DPG_HOLD_OFF ); +return 0 ; }
@@ -1204,88 +1199,87 @@ static void vcn_v4_0_5_stop_dpg_mode(str* vcn_v4_0_5_stop - VCN stop * * @adev: amdgpu_device pointer +* @i: instance to stop * * Stop VCN block */ -static int vcn_v4_0_5_stop (struct amdgpu_device *adev) +static int vcn_v4_0_5_stop (struct amdgpu_device *adev,int i) {volatile struct amdgpu_vcn4_fw_shared *fw_shared;uint32_t tmp; -int i, r =0 ; +int r =0 ; -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { -if (adev->vcn.harvest_config & (1 << i)) -continue ; - - fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; - fw_shared->sq.queue_mode |=FW_QUEUE_DPG_HOLD_OFF ; - -if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) { -vcn_v4_0_5_stop_dpg_mode (adev, i); -continue ; - } - -/* wait for vcn idle */ - r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_STATUS,UVD_STATUS__IDLE ,0x7 ); -if (r) -return r; - - tmp =UVD_LMI_STATUS__VCPU_LMI_WRITE_CLEAN_MASK | -UVD_LMI_STATUS__READ_CLEAN_MASK | -UVD_LMI_STATUS__WRITE_CLEAN_MASK | -UVD_LMI_STATUS__WRITE_CLEAN_RAW_MASK ; - r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_LMI_STATUS, tmp, tmp); -if (r) -return r; - -/* disable LMI UMC channel */ - tmp =RREG32_SOC15 (VCN , i, regUVD_LMI_CTRL2); - tmp |=UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ; -WREG32_SOC15 (VCN , i, regUVD_LMI_CTRL2, tmp); - tmp =UVD_LMI_STATUS__UMC_READ_CLEAN_RAW_MASK | -UVD_LMI_STATUS__UMC_WRITE_CLEAN_RAW_MASK ; - r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_LMI_STATUS, tmp, tmp); -if (r) -return r; - -/* block VCPU register access */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_RB_ARB_CTRL), -UVD_RB_ARB_CTRL__VCPU_DIS_MASK , - ~UVD_RB_ARB_CTRL__VCPU_DIS_MASK ); - -/* reset VCPU */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), -UVD_VCPU_CNTL__BLK_RST_MASK , - ~UVD_VCPU_CNTL__BLK_RST_MASK ); - -/* disable VCPU clock */ -WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , - ~(UVD_VCPU_CNTL__CLK_EN_MASK )); - -/* apply soft reset */ - tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); - tmp |=UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ; -WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); - tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); - tmp |=UVD_SOFT_RESET__LMI_SOFT_RESET_MASK ; -WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); - -/* clear status */ -WREG32_SOC15 (VCN , i, regUVD_STATUS,0 ); +if (adev->vcn.harvest_config & (1 << i)) +return 0 ; -/* apply HW clock gating */ -vcn_v4_0_5_enable_clock_gating (adev, i); + fw_shared = adev->vcn.inst[i].fw_shared.cpu_addr; + fw_shared->sq.queue_mode |=FW_QUEUE_DPG_HOLD_OFF ; -/* enable VCN power gating */ -vcn_v4_0_5_enable_static_power_gating (adev, i); +if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) { +vcn_v4_0_5_stop_dpg_mode (adev, i); + r =0 ; + goto done; } -for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { -if (adev->pm.dpm_enabled) -amdgpu_dpm_enable_vcn (adev, false, i); - } +/* wait for vcn idle */ + r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_STATUS,UVD_STATUS__IDLE ,0x7 ); +if (r) + goto done; + + tmp =UVD_LMI_STATUS__VCPU_LMI_WRITE_CLEAN_MASK | +UVD_LMI_STATUS__READ_CLEAN_MASK | +UVD_LMI_STATUS__WRITE_CLEAN_MASK | +UVD_LMI_STATUS__WRITE_CLEAN_RAW_MASK ; + r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_LMI_STATUS, tmp, tmp); +if (r) + goto done; + +/* disable LMI UMC channel */ + tmp =RREG32_SOC15 (VCN , i, regUVD_LMI_CTRL2); + tmp |=UVD_LMI_CTRL2__STALL_ARB_UMC_MASK ; +WREG32_SOC15 (VCN , i, regUVD_LMI_CTRL2, tmp); + tmp =UVD_LMI_STATUS__UMC_READ_CLEAN_RAW_MASK | +UVD_LMI_STATUS__UMC_WRITE_CLEAN_RAW_MASK ; + r =SOC15_WAIT_ON_RREG (VCN , i, regUVD_LMI_STATUS, tmp, tmp); +if (r) + goto done; + +/* block VCPU register access */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_RB_ARB_CTRL), +UVD_RB_ARB_CTRL__VCPU_DIS_MASK , + ~UVD_RB_ARB_CTRL__VCPU_DIS_MASK ); + +/* reset VCPU */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL), +UVD_VCPU_CNTL__BLK_RST_MASK , + ~UVD_VCPU_CNTL__BLK_RST_MASK ); + +/* disable VCPU clock */ +WREG32_P (SOC15_REG_OFFSET (VCN , i, regUVD_VCPU_CNTL),0 , + ~(UVD_VCPU_CNTL__CLK_EN_MASK )); + +/* apply soft reset */ + tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); + tmp |=UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ; +WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); + tmp =RREG32_SOC15 (VCN , i, regUVD_SOFT_RESET); + tmp |=UVD_SOFT_RESET__LMI_SOFT_RESET_MASK ; +WREG32_SOC15 (VCN , i, regUVD_SOFT_RESET, tmp); + +/* clear status */ +WREG32_SOC15 (VCN , i, regUVD_STATUS,0 ); + +/* apply HW clock gating */ +vcn_v4_0_5_enable_clock_gating (adev, i); + +/* enable VCN power gating */ +vcn_v4_0_5_enable_static_power_gating (adev, i); + +done: +if (adev->pm.dpm_enabled) +amdgpu_dpm_enable_vcn (adev, false, i); -return 0 ; +return r; }/**
@@ -1537,15 +1531,17 @@ static int vcn_v4_0_5_set_powergating_st enum amd_powergating_state state) {struct amdgpu_device *adev = ip_block->adev; -int ret; +int ret =0 , i;if (state == adev->vcn.cur_state)return 0 ; -if (state ==AMD_PG_STATE_GATE ) - ret =vcn_v4_0_5_stop (adev); -else - ret =vcn_v4_0_5_start (adev); +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) { +if (state ==AMD_PG_STATE_GATE ) + ret |=vcn_v4_0_5_stop (adev, i); +else + ret |=vcn_v4_0_5_start (adev, i); + }if (!ret) adev->vcn.cur_state = state;
Greg Kroah-Hartman
maintainerPATCH 779/783 drm/amdgpu: read back register after written for VCN v4.0.5
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: David (Ming Qiang) Wu <[email protected]>
commit ee7360fc27d6045510f8fe459b5649b2af27811a upstream.
On VCN v4.0.5 there is a race condition where the WPTR is not updated after starting from idle when doorbell is used. Adding register read-back after written at function end is to ensure all register writes are done before they can be used.
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +8 -0
@@ -983,6 +983,10 @@ static int vcn_v4_0_5_start_dpg_mode(str ring->doorbell_index <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | VCN_RB1_DB_CTRL__EN_MASK); +/* Keeping one read-back to ensure all register writes are done, otherwise +* it may introduce race conditions */ +RREG32_SOC15 (VCN , inst_idx, regVCN_RB1_DB_CTRL); +return 0 ; }
@@ -1164,6 +1168,10 @@ static int vcn_v4_0_5_start(struct amdgpWREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET |FW_QUEUE_DPG_HOLD_OFF ); +/* Keeping one read-back to ensure all register writes are done, otherwise +* it may introduce race conditions */ +RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 780/783 gcc-15: make unterminated string initialization just a warning
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit d5d45a7f26194460964eb5677a9226697f7b7fdd upstream.
gcc-15 enabling -Wunterminated-string-initialization in -Wextra by default was done with the best intentions, but the warning is still quite broken.
What annoys me about the warning is that this is a very traditional AND CORRECT way to initialize fixed byte arrays in C:
unsigned char hex[16] = "0123456789abcdef";
and we use this all over the kernel. And the warning is fine, but gcc developers apparently never made a reasonable way to disable it. As is (sadly) tradition with these things.
Yes, there's "__attribute__((nonstring))", and we have a macro to make that absolutely disgusting syntax more palatable (ie the kernel syntax for that monstrosity is just "__nonstring").
But that attribute is misdesigned. What you'd typically want to do is tell the compiler that you are using a type that isn't a string but a byte array, but that doesn't work at all:
warning: ‘nonstring’ attribute does not apply to types [-Wattributes]
and because of this fundamental mis-design, you then have to mark each instance of that pattern.
This is particularly noticeable in our ACPI code, because ACPI has this notion of a 4-byte "type name" that gets used all over, and is exactly this kind of byte array.
This is a sad oversight, because the warning is useful, but really would be so much better if gcc had also given a sane way to indicate that we really just want a byte array type at a type level, not the broken "each and every array definition" level.
So now instead of creating a nice "ACPI name" type using something like
typedef char acpi_name_t[4] __nonstring;
we have to do things like
char name[ACPI_NAMESEG_SIZE] __nonstring;
in every place that uses this concept and then happens to have the typical initializers.
This is annoying me mainly because I think the warning _is_ a good warning, which is why I'm not just turning it off in disgust. But it is hampered by this bad implementation detail.
[ And obviously I'm doing this now because system upgrades for me are
something that happen in the middle of the release cycle: don't do it before or during travel, or just before or during the busy merge window period. ]
--- Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -1053,6 +1053,9 @@ KBUILD_CFLAGS += $(call cc-option, -fstr KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow) KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) +#Currently, disable -Wunterminated-string-initialization as an error +KBUILD_CFLAGS += $(call cc-option, -Wno-error=unterminated-string-initialization) + # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += -fno-strict-overflow
Greg Kroah-Hartman
maintainerPATCH 781/783 gcc-15: disable -Wunterminated-string-initialization entirely for now
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 9d7a0577c9db35c4cc52db90bc415ea248446472 upstream.
I had left the warning around but as a non-fatal error to get my gcc-15 builds going, but fixed up some of the most annoying warning cases so that it wouldn't be *too* verbose.
Because I like the _concept_ of the warning, even if I detested the implementation to shut it up.
It turns out the implementation to shut it up is even more broken than I thought, and my "shut up most of the warnings" patch just caused fatal errors on gcc-14 instead.
I had tested with clang, but when I upgrade my development environment, I try to do it on all machines because I hate having different systems to maintain, and hadn't realized that gcc-14 now had issues.
The ACPI case is literally why I wanted to have a *type* that doesn't trigger the warning (see commit d5d45a7f2619: "gcc-15: make 'unterminated string initialization' just a warning"), instead of marking individual places as "__nonstring".
But gcc-14 doesn't like that __nonstring location that shut gcc-15 up, because it's on an array of char arrays, not on one single array:
drivers/acpi/tables.c:399:1: error: 'nonstring' attribute ignored on objects of type 'const char[][4]' [-Werror=attributes]
399 | static const char table_sigs[][ACPI_NAMESEG_SIZE] __initconst __nonstring = {
| ^~~~~~and my attempts to nest it properly with a type had failed, because of how gcc doesn't like marking the types as having attributes, only symbols.
There may be some trick to it, but I was already annoyed by the bad attribute design, now I'm just entirely fed up with it.
I wish gcc had a proper way to say "this type is a *byte* array, not a string".
The obvious thing would be to distinguish between "char []" and an explicitly signed "unsigned char []" (as opposed to an implicitly unsigned char, which is typically an architecture-specific default, but for the kernel is universal thanks to '-funsigned-char').
But any "we can typedef a 8-bit type to not become a string just because it's an array" model would be fine.
But "__attribute__((nonstring))" is sadly not that sane model.
--- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Makefile +2 -2
@@ -1053,8 +1053,8 @@ KBUILD_CFLAGS += $(call cc-option, -fstr KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow) KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) -#Currently, disable -Wunterminated-string-initialization as an error -KBUILD_CFLAGS += $(call cc-option, -Wno-error=unterminated-string-initialization) +#Currently, disable -Wunterminated-string-initialization as broken +KBUILD_CFLAGS += $(call cc-option, -Wno-unterminated-string-initialization) # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += -fno-strict-overflow
Greg Kroah-Hartman
maintainerPATCH 782/783 Fix mis-uses of cc-option for warning disablement
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit a79be02bba5c31f967885c7f3bf3a756d77d11d9 upstream.
This was triggered by one of my mis-uses causing odd build warnings on sparc in linux-next, but while figuring out why the "obviously correct" use of cc-option caused such odd breakage, I found eight other cases of the same thing in the tree.
The root cause is that 'cc-option' doesn't work for checking negative warning options (ie things like '-Wno-stringop-overflow') because gcc will silently accept options it doesn't recognize, and so 'cc-option' ends up thinking they are perfectly fine.
And it all works, until you have a situation where _another_ warning is emitted. At that point the compiler will go "Hmm, maybe the user intended to disable this warning but used that wrong option that I didn't recognize", and generate a warning for the unrecognized negative option.
Which explains why we have several cases of this in the tree: the 'cc-option' test really doesn't work for this situation, but most of the time it simply doesn't matter that ity doesn't work.
The reason my recently added case caused problems on sparc was pointed out by Thomas Weißschuh: the sparc build had a previous explicit warning that then triggered the new one.
I think the best fix for this would be to make 'cc-option' a bit smarter about this sitation, possibly by adding an intentional warning to the test case that then triggers the unrecognized option warning reliably.
But the short-term fix is to replace 'cc-option' with an existing helper designed for this exact case: 'cc-disable-warning', which picks the negative warning but uses the positive form for testing the compiler support.
--- Makefile | 4 ++-- arch/loongarch/kernel/Makefile | 8 ++++---- arch/loongarch/kvm/Makefile | 2 +- arch/riscv/kernel/Makefile | 4 ++-- scripts/Makefile.extrawarn | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-)
Makefile +2 -2
@@ -1050,11 +1050,11 @@ NOSTDINC_FLAGS += -nostdinc KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3) #Currently, disable -Wstringop-overflow for GCC 11, globally. -KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow) +KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-disable-warning, stringop-overflow) KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) #Currently, disable -Wunterminated-string-initialization as broken -KBUILD_CFLAGS += $(call cc-option, -Wno-unterminated-string-initialization) +KBUILD_CFLAGS += $(call cc-disable-warning, unterminated-string-initialization) # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += -fno-strict-overflow
arch/loongarch/kernel/Makefile +4 -4
@@ -21,10 +21,10 @@ obj-$(CONFIG_CPU_HAS_LBT) += lbt.o obj-$(CONFIG_ARCH_STRICT_ALIGN) += unaligned.o -CFLAGS_module.o += $(call cc-option,-Wno-override-init,) -CFLAGS_syscall.o += $(call cc-option,-Wno-override-init,) -CFLAGS_traps.o += $(call cc-option,-Wno-override-init,) -CFLAGS_perf_event.o += $(call cc-option,-Wno-override-init,) +CFLAGS_module.o += $(call cc-disable-warning, override-init) +CFLAGS_syscall.o += $(call cc-disable-warning, override-init) +CFLAGS_traps.o += $(call cc-disable-warning, override-init) +CFLAGS_perf_event.o += $(call cc-disable-warning, override-init) ifdef CONFIG_FUNCTION_TRACER ifndef CONFIG_DYNAMIC_FTRACE
arch/loongarch/kvm/Makefile +1 -1
@@ -23,4 +23,4 @@ kvm-y += intc/eiointc.o kvm-y += intc/pch_pic.o kvm-y += irqfd.o -CFLAGS_exit.o += $(call cc-option,-Wno-override-init,) +CFLAGS_exit.o += $(call cc-disable-warning, override-init)
arch/riscv/kernel/Makefile +2 -2
@@ -9,8 +9,8 @@ CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRAC CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE) endif -CFLAGS_syscall_table.o += $(call cc-option,-Wno-override-init,) -CFLAGS_compat_syscall_table.o += $(call cc-option,-Wno-override-init,) +CFLAGS_syscall_table.o += $(call cc-disable-warning, override-init) +CFLAGS_compat_syscall_table.o += $(call cc-disable-warning, override-init) ifdef CONFIG_KEXEC_CORE AFLAGS_kexec_relocate.o := -mcmodel=medany $(call cc-option,-mno-relax)
scripts/Makefile.extrawarn +1 -1
@@ -15,7 +15,7 @@ KBUILD_CFLAGS += -Werror=return-type KBUILD_CFLAGS += -Werror=strict-prototypes KBUILD_CFLAGS += -Wno-format-security KBUILD_CFLAGS += -Wno-trigraphs -KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) +KBUILD_CFLAGS += $(call cc-disable-warning, frame-address) KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) KBUILD_CFLAGS += -Wmissing-declarations KBUILD_CFLAGS += -Wmissing-prototypes
Greg Kroah-Hartman
maintainerPATCH 783/783 kbuild: Properly disable -Wunterminated-string-initialization for clang
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 4f79eaa2ceac86a0e0f304b0bab556cca5bf4f30 upstream.
Clang and GCC have different behaviors around disabling warnings included in -Wall and -Wextra and the order in which flags are specified, which is exposed by clang's new support for -Wunterminated-string-initialization.
$ cat test.c const char foo[3] = "FOO"; const char bar[3] __attribute__((__nonstring__)) = "BAR";
$ clang -fsyntax-only -Wextra test.c
test.c:1:21: warning: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Wunterminated-string-initialization]
1 | const char foo[3] = "FOO";
| ^~~~~
$ clang -fsyntax-only -Wextra -Wno-unterminated-string-initialization test.c
$ clang -fsyntax-only -Wno-unterminated-string-initialization -Wextra test.c
test.c:1:21: warning: initializer-string for character array is too long, array size is 3 but initializer has size 4 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Wunterminated-string-initialization]
1 | const char foo[3] = "FOO";
| ^~~~~ $ gcc -fsyntax-only -Wextra test.c
test.c:1:21: warning: initializer-string for array of ‘char’ truncates NUL terminator but destination lacks ‘nonstring’ attribute (4 chars into 3 available) [-Wunterminated-string-initialization]
1 | const char foo[3] = "FOO";
| ^~~~~
$ gcc -fsyntax-only -Wextra -Wno-unterminated-string-initialization test.c
$ gcc -fsyntax-only -Wno-unterminated-string-initialization -Wextra test.cMove -Wextra up right below -Wall in Makefile.extrawarn to ensure these flags are at the beginning of the warning options list. Move the couple of warning options that have been added to the main Makefile since commit e88ca24319e4 ("kbuild: consolidate warning flags in scripts/Makefile.extrawarn") to scripts/Makefile.extrawarn after -Wall / -Wextra to ensure they get properly disabled for all compilers.
--- Makefile | 7 ------- scripts/Makefile.extrawarn | 9 ++++++++- 2 files changed, 8 insertions(+), 8 deletions(-)
Makefile +0 -7
@@ -1049,13 +1049,6 @@ NOSTDINC_FLAGS += -nostdinc # perform bounds checking. KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3) -#Currently, disable -Wstringop-overflow for GCC 11, globally. -KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-disable-warning, stringop-overflow) -KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) - -#Currently, disable -Wunterminated-string-initialization as broken -KBUILD_CFLAGS += $(call cc-disable-warning, unterminated-string-initialization) - # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += -fno-strict-overflow
scripts/Makefile.extrawarn +8 -1
@@ -8,6 +8,7 @@ # Default set of warnings, always enabled KBUILD_CFLAGS += -Wall +KBUILD_CFLAGS += -Wextra KBUILD_CFLAGS += -Wundef KBUILD_CFLAGS += -Werror=implicit-function-declaration KBUILD_CFLAGS += -Werror=implicit-int
@@ -68,6 +69,13 @@ KBUILD_CFLAGS += -Wno-pointer-sign # globally built with -Wcast-function-type. KBUILD_CFLAGS += $(call cc-option, -Wcast-function-type) +# Currently, disable -Wstringop-overflow for GCC 11, globally. +KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-disable-warning, stringop-overflow) +KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) + +# Currently, disable -Wunterminated-string-initialization as broken +KBUILD_CFLAGS += $(call cc-disable-warning, unterminated-string-initialization) + # The allocators already balk at large sizes, so silence the compiler # warnings for bounds checks involving those possible values. While # -Wno-alloc-size-larger-than would normally be used here, earlier versions
@@ -97,7 +105,6 @@ KBUILD_CFLAGS += $(call cc-option,-Wenum # Explicitly clear padding bits during variable initialization KBUILD_CFLAGS += $(call cc-option,-fzero-init-padding-bits=all) -KBUILD_CFLAGS += -Wextra KBUILD_CFLAGS += -Wunused #
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.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
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on S390 defconfig builds failing with gcc-13, gcc-8 and clang-20 and clang-nightly tool chains on 6.14.9-rc1.
Regression Analysis:
- New regression? Yes
- Reproducible? Yes
Build regression: S390 defconfig crash_dump.c use of undeclared identifier 'NN_PRSTATUS'
Build log:
---------arch/s390/kernel/crash_dump.c:312:8: error: use of undeclared identifier 'NN_PRFPREG'
312 | ptr = nt_init(ptr, PRFPREG, nt_fpregset);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init'
274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc),
NN_ ## type)
|
^~~~~~~~~~~
<scratch space>:85:1: note: expanded from here
85 | NN_PRFPREG
| ^~~~~~~~~~
arch/s390/kernel/crash_dump.c:313:8: error: use of undeclared
identifier 'NN_S390_TIMER'
313 | ptr = nt_init(ptr, S390_TIMER, sa->timer);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init'
274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc),
NN_ ## type)
|
^~~~~~~~~~~
<scratch space>:87:1: note: expanded from here
87 | NN_S390_TIMER
| ^~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:314:8: error: use of undeclared
identifier 'NN_S390_TODCMP'
314 | ptr = nt_init(ptr, S390_TODCMP, sa->todcmp);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init'
274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc),
NN_ ## type)
|
^~~~~~~~~~~
<scratch space>:89:1: note: expanded from here
89 | NN_S390_TODCMP
| ^~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:315:8: error: use of undeclared
identifier 'NN_S390_TODPREG'
315 | ptr = nt_init(ptr, S390_TODPREG, sa->todpreg);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init'
274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc),
NN_ ## type)
|
^~~~~~~~~~~
<scratch space>:91:1: note: expanded from here
91 | NN_S390_TODPREG
| ^~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:316:8: error: use of undeclared
identifier 'NN_S390_CTRS'
316 | ptr = nt_init(ptr, S390_CTRS, sa->ctrs);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init'
274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc),
NN_ ## type)
|^~~~~~~~~~~
## Source
* kernel version: 6.14.9-rc1
* git tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git sha: 10804dbee7fa8cfb895bbffcc7be97d8221748b6
* git describe: v6.14.8-784-g10804dbee7fa
* project details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/
* architecture: S390
* toolchain: gcc-8, gcc-13, clang-20, clang-nightly
* config : defconfig
* Build config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2xgl51jcJfVGQZw8dKSuEJNFtd4/config
* Build: https://storage.tuxsuite.com/public/linaro/lkft/builds/2xgl51jcJfVGQZw8dKSuEJNFtd4/
## Boot log
* Build log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/log
* Build details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/details/
* Build history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/history/
## Steps to reproduce
- tuxmake --runtime podman --target-arch s390 --toolchain gcc-13
--kconfig defconfig
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 115 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on S390 defconfig builds failing with gcc-13, gcc-8 and clang-20 and clang-nightly tool chains on 6.14.9-rc1.
Regression Analysis:
- New regression? Yes
- Reproducible? YesBuild regression: S390 defconfig
crash_dump.cuse of undeclared identifier 'NN_PRSTATUS'Build log:
---------arch/s390/kernel/crash_dump.c:312:8: error: use of undeclared identifier 'NN_PRFPREG'312 | ptr = nt_init(ptr, PRFPREG, nt_fpregset); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init' 274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) | ^~~~~~~~~~~ <scratch space>:85:1: note: expanded from here 85 | NN_PRFPREG | ^~~~~~~~~~ arch/s390/kernel/crash_dump.c:313:8: error: use of undeclared identifier 'NN_S390_TIMER' 313 | ptr = nt_init(ptr, S390_TIMER, sa->timer); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init' 274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) | ^~~~~~~~~~~ <scratch space>:87:1: note: expanded from here 87 | NN_S390_TIMER | ^~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:314:8: error: use of undeclared identifier 'NN_S390_TODCMP' 314 | ptr = nt_init(ptr, S390_TODCMP, sa->todcmp); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init' 274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) | ^~~~~~~~~~~ <scratch space>:89:1: note: expanded from here 89 | NN_S390_TODCMP | ^~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:315:8: error: use of undeclared identifier 'NN_S390_TODPREG' 315 | ptr = nt_init(ptr, S390_TODPREG, sa->todpreg); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init' 274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) | ^~~~~~~~~~~ <scratch space>:91:1: note: expanded from here 91 | NN_S390_TODPREG | ^~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:316:8: error: use of undeclared identifier 'NN_S390_CTRS' 316 | ptr = nt_init(ptr, S390_CTRS, sa->ctrs); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/s390/kernel/crash_dump.c:274:56: note: expanded from macro 'nt_init' 274 | nt_init_name(buf, NT_ ## type, &(desc), sizeof(desc), NN_ ## type) |^~~~~~~~~~~
## Source
* kernel version: 6.14.9-rc1
* git tree: https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git sha:10804dbee7fa8cfb895bbffcc7be97d8221748b6
* git describe: v6.14.8-784-g10804dbee7fa
* project details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/
* architecture: S390
* toolchain: gcc-8, gcc-13, clang-20, clang-nightly
* config : defconfig
* Build config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2xgl51jcJfVGQZw8dKSuEJNFtd4/config
* Build: https://storage.tuxsuite.com/public/linaro/lkft/builds/2xgl51jcJfVGQZw8dKSuEJNFtd4/## Boot log
* Build log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/log
* Build details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/details/
* Build history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.8-784-g10804dbee7fa/testrun/28574235/suite/build/test/gcc-13-defconfig/history/
Quoted 3 lines
## Steps to reproduce
- tuxmake --runtime podman --target-arch s390 --toolchain gcc-13
--kconfig defconfig
Thanks, offending patch is now removed.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Am 27.05.2025 um 18:16 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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]
Hi Greg
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
6.14.9-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.14.9-rc1rv-g10804dbee7fa
(takeshi@ThinkPadX1Gen10J0764) (gcc (GCC) 15.1.1 20250425, GNU ld (GNU Binutils) 2.44.0) #1 SMP PREEMPT_DYNAMIC Wed May 28 07:41:25 JST 2025
Thanks
Quoted 8 lines · On Tue, 27 May 2025 18:16:37 +0200 Greg Kroah-Hartman…
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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!
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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.14.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter 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.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Built (with both gcc-14 and gcc-15) and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +0000. Anything received after that time might be too late.
Tested on a ThinkPad E14 Gen 3 with a AMD Ryzen 5 5500U CPU and on the Steam Deck (LCD variant) aswell as a Framework Desktop.
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +0000. Anything received after that time might be too late.
Hi Greg
6.14.9-rc1 compiles, boots and runs here on x86_64 (AMD Ryzen 5 7520U, Slackware64-current), no regressions observed.
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 minus the broken "s390/crash: Use note name macros" patch against the Fedora build system (aarch64, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.
cover 6.14.9-rc1 review
In reply to Greg Kroah-HartmanThe kernel, bpf tool, and perf tool builds fine for v6.14.9-rc1 on x86 and arm64 Azure VM.
Thanks,
Hardik
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.9 release. There are 783 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, 29 May 2025 16:22:51 +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.14.9-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v6.12:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
116 tests: 116 pass, 0 failLinux version: 6.14.9-rc1-g10804dbee7fa
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