6.15.4-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 277/592 ext4: ext4: unify EXT4_EX_NOCACHE|NOFAIL flags in ext4_ext_remove_space()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 53ce42accd2002cc490fc86000ac532530507a74 ]
When removing space, we should use EXT4_EX_NOCACHE because we don't need to cache extents, and we should also use EXT4_EX_NOFAIL to prevent metadata inconsistencies that may arise from memory allocation failures. While ext4_ext_remove_space() already uses these two flags in most places, they are missing in ext4_ext_search_right() and read_extent_tree_block() calls. Unify the flags to ensure consistent behavior throughout the extent removal process.
--- fs/ext4/extents.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
fs/ext4/extents.c +10 -9
@@ -1530,7 +1530,7 @@ static int ext4_ext_search_left(struct inode *inode,static int ext4_ext_search_right (struct inode *inode,struct ext4_ext_path *path,ext4_lblk_t *logical,ext4_fsblk_t *phys, -struct ext4_extent *ret_ex) +struct ext4_extent *ret_ex,int flags) {struct buffer_head *bh =NULL ;struct ext4_extent_header *eh;
@@ -1604,7 +1604,8 @@ static int ext4_ext_search_right(struct inode *inode, ix++;while (++depth < path->p_depth) {/* subtract from p_depth to get proper eh_depth */ - bh =read_extent_tree_block (inode, ix, path->p_depth - depth,0 ); + bh =read_extent_tree_block (inode, ix, path->p_depth - depth, + flags);if (IS_ERR (bh))return PTR_ERR (bh); eh =ext_block_hdr (bh);
@@ -1612,7 +1613,7 @@ static int ext4_ext_search_right(struct inode *inode,put_bh (bh); } - bh =read_extent_tree_block (inode, ix, path->p_depth - depth,0 ); + bh =read_extent_tree_block (inode, ix, path->p_depth - depth, flags);if (IS_ERR (bh))return PTR_ERR (bh); eh =ext_block_hdr (bh);
@@ -2822,6 +2823,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,struct partial_cluster partial;handle_t *handle;int i =0 , err =0 ; +int flags =EXT4_EX_NOCACHE |EXT4_EX_NOFAIL ; partial.pclu =0 ; partial.lblk =0 ;
@@ -2852,8 +2854,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,ext4_fsblk_t pblk;/* find extent for or closest extent to this block */ - path =ext4_find_extent (inode, end,NULL , -EXT4_EX_NOCACHE |EXT4_EX_NOFAIL ); + path =ext4_find_extent (inode, end,NULL , flags);if (IS_ERR (path)) {ext4_journal_stop (handle);return PTR_ERR (path);
@@ -2919,7 +2920,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,*/ lblk = ex_end +1 ; err =ext4_ext_search_right (inode, path, &lblk, &pblk, -NULL ); +NULL , flags);if (err <0 ) goto out;if (pblk) {
@@ -2995,8 +2996,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start, i + 1, ext4_idx_pblock(path[i].p_idx));memset (path + i +1 ,0 ,sizeof (*path)); bh =read_extent_tree_block (inode, path[i].p_idx, - depth - i -1 , -EXT4_EX_NOCACHE ); + depth - i -1 , flags);if (IS_ERR (bh)) {/* should we reset i_size? */ err =PTR_ERR (bh);
@@ -4315,7 +4315,8 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,if (err) goto out; ar.lright = map->m_lblk; - err =ext4_ext_search_right (inode, path, &ar.lright, &ar.pright, &ex2); + err =ext4_ext_search_right (inode, path, &ar.lright, &ar.pright, + &ex2,0 );if (err <0 ) goto out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 278/592 jfs: fix array-index-out-of-bounds read in add_missing_indices
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Dutt <[email protected]>
[ Upstream commit 5dff41a86377563f7a2b968aae00d25b4ceb37c9 ]
stbl is s8 but it must contain offsets into slot which can go from 0 to 127.
Added a bound check for that error and return -EIO if the check fails. Also make jfs_readdir return with error if add_missing_indices returns with an error.
--- fs/jfs/jfs_dtree.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
fs/jfs/jfs_dtree.c +15 -3
@@ -2613,7 +2613,7 @@ void dtInitRoot(tid_t tid, struct inode *ip, u32 idotdot)* fsck.jfs should really fix this, but it currently does not. * Called from jfs_readdir when bad index is detected. */ -static void add_missing_indices (struct inode *inode,s64 bn) +static int add_missing_indices (struct inode *inode,s64 bn) {struct ldtentry *d;struct dt_lock *dtlck;
@@ -2622,7 +2622,7 @@ static void add_missing_indices(struct inode *inode, s64 bn)struct lv *lv;struct metapage *mp;dtpage_t *p; -int rc; +int rc =0 ;s8 *stbl;tid_t tid;struct tlock *tlck;
@@ -2647,6 +2647,16 @@ static void add_missing_indices(struct inode *inode, s64 bn) stbl =DT_GETSTBL (p);for (i =0 ; i < p->header.nextindex; i++) { +if (stbl[i] <0 ) { +jfs_err ("jfs: add_missing_indices: Invalid stbl[%d] = %d for inode %ld, block = %lld" , + i, stbl[i], (long )inode->i_ino, (long long )bn); + rc = -EIO ; + +DT_PUTPAGE (mp); +txAbort (tid,0 ); + goto end; + } + d = (struct ldtentry *) &p->slot[stbl[i]]; index =le32_to_cpu (d->index);if ((index <2 ) || (index >=JFS_IP (inode)->next_index)) {
@@ -2664,6 +2674,7 @@ static void add_missing_indices(struct inode *inode, s64 bn) (void )txCommit (tid,1 , &inode,0 ); end:txEnd (tid); +return rc; }/*
@@ -3017,7 +3028,8 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) }if (fix_page) { -add_missing_indices (ip, bn); +if ((rc =add_missing_indices (ip, bn))) + goto out; page_fixed =1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 279/592 media: ti: cal: Fix wrong goto on error path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit a5b18fd769b7dc2e77a9e6a390844cbf50626ae8 ]
If pm_runtime_resume_and_get() fails, we should unprepare the context, but currently we skip that as we goto to a later line.
--- drivers/media/platform/ti/cal/cal-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/ti/cal/cal-video.c +2 -2
@@ -758,7 +758,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) ret =pm_runtime_resume_and_get (ctx->cal->dev);if (ret <0 ) - goto error_pipeline; + goto error_unprepare;cal_ctx_set_dma_addr (ctx, addr);cal_ctx_start (ctx);
@@ -775,8 +775,8 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) error_stop:cal_ctx_stop (ctx);pm_runtime_put_sync (ctx->cal->dev); +error_unprepare:cal_ctx_unprepare (ctx); - error_pipeline:video_device_pipeline_stop (&ctx->vdev); error_release_buffers:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 280/592 drm/xe/vf: Fix guc_info debugfs for VFs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Ceraolo Spurio <[email protected]>
[ Upstream commit dba7d17d50b4488c697e991d18a0e55669d9fa59 ]
The guc_info debugfs attempts to read a bunch of registers that the VFs doesn't have access to, so fix it by skipping the reads.
--- drivers/gpu/drm/xe/xe_guc.c | 44 +++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-)
drivers/gpu/drm/xe/xe_guc.c +23 -21
@@ -1508,30 +1508,32 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p)xe_uc_fw_print (&guc->fw, p); - fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); -if (!fw_ref) -return ; +if (!IS_SRIOV_VF (gt_to_xe (gt))) { + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); +if (!fw_ref) +return ; + + status =xe_mmio_read32 (>->mmio,GUC_STATUS ); + +drm_printf (p,"\nGuC status 0x%08x:\n" , status); +drm_printf (p,"\tBootrom status = 0x%x\n" , +REG_FIELD_GET (GS_BOOTROM_MASK , status)); +drm_printf (p,"\tuKernel status = 0x%x\n" , +REG_FIELD_GET (GS_UKERNEL_MASK , status)); +drm_printf (p,"\tMIA Core status = 0x%x\n" , +REG_FIELD_GET (GS_MIA_MASK , status)); +drm_printf (p,"\tLog level = %d\n" , +xe_guc_log_get_level (&guc->log)); + +drm_puts (p,"\nScratch registers:\n" ); +for (i =0 ; i <SOFT_SCRATCH_COUNT ; i++) { +drm_printf (p,"\t%2d: \t0x%x\n" , + i,xe_mmio_read32 (>->mmio,SOFT_SCRATCH (i))); + } - status =xe_mmio_read32 (>->mmio,GUC_STATUS ); - -drm_printf (p,"\nGuC status 0x%08x:\n" , status); -drm_printf (p,"\tBootrom status = 0x%x\n" , -REG_FIELD_GET (GS_BOOTROM_MASK , status)); -drm_printf (p,"\tuKernel status = 0x%x\n" , -REG_FIELD_GET (GS_UKERNEL_MASK , status)); -drm_printf (p,"\tMIA Core status = 0x%x\n" , -REG_FIELD_GET (GS_MIA_MASK , status)); -drm_printf (p,"\tLog level = %d\n" , -xe_guc_log_get_level (&guc->log)); - -drm_puts (p,"\nScratch registers:\n" ); -for (i =0 ; i <SOFT_SCRATCH_COUNT ; i++) { -drm_printf (p,"\t%2d: \t0x%x\n" , - i,xe_mmio_read32 (>->mmio,SOFT_SCRATCH (i))); +xe_force_wake_put (gt_to_fw (gt), fw_ref); } -xe_force_wake_put (gt_to_fw (gt), fw_ref); -drm_puts (p,"\n" );xe_guc_ct_print (&guc->ct, p, false);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 281/592 drm/amd/display: Update IPS sequential_ono requirement checks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Bunea <[email protected]>
[ Upstream commit b4db797117ceba88ba405a080811369418104304 ]
[why & how]
ASICs that require special RCG/PG programming are determined based on hw_internal_rev. Update these checks to properly include all such ASICs.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 2 +- drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c +1 -1
@@ -138,7 +138,7 @@ bool dpp35_construct( dpp->base.funcs = &dcn35_dpp_funcs;// w/a for cursor memory stuck in LS by programming DISPCLK_R_GATE_DISABLE, limit w/a to some ASIC revs -if (dpp->base.ctx->asic_id.hw_internal_rev <=0x10 ) +if (dpp->base.ctx->asic_id.hw_internal_rev <0x40 ) dpp->dispclk_r_gate_disable = true;return ret; }
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c +1 -1
@@ -1903,7 +1903,7 @@ static bool dcn35_resource_construct( dc->caps.max_disp_clock_khz_at_vmin =650000 ;/* Sequential ONO is based on ASIC. */ -if (dc->ctx->asic_id.hw_internal_rev >0x10 ) +if (dc->ctx->asic_id.hw_internal_rev >=0x40 ) dc->caps.sequential_ono = true;/* Use pipe context based otg sync logic */
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c +1 -1
@@ -1876,7 +1876,7 @@ static bool dcn36_resource_construct( dc->caps.max_disp_clock_khz_at_vmin =650000 ;/* Sequential ONO is based on ASIC. */ -if (dc->ctx->asic_id.hw_internal_rev >0x10 ) +if (dc->ctx->asic_id.hw_internal_rev >=0x40 ) dc->caps.sequential_ono = true;/* Use pipe context based otg sync logic */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 282/592 drm/amd/display: Correct SSC enable detection for DCN351
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kevin Gao <[email protected]>
[ Upstream commit d01a7306e1bec9c02268793f58144e3e42695bf0 ]
[Why]
Due to very small clock register delta between DCN35 and DCN351, clock spread is being checked on the wrong register for DCN351, causing the display driver to believe that DPREFCLK downspread to be disabled when in some stacks it is enabled. This causes the clock values for audio to be incorrect.
[How]
Both DCN351 and DCN35 use the same clk_mgr, so we modify the DCN35 function that checks for SSC enable to read CLK6 instead of CLK5 when using DCN351. This allows us to read for DPREFCLK downspread correctly so the clock can properly compensate when setting values.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c | 1 + .../gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 8 +++++++- drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c +1 -0
@@ -65,6 +65,7 @@#define mmCLK1_CLK5_ALLOW_DS 0x16EB1#define mmCLK5_spll_field_8 0x1B04B +#define mmCLK6_spll_field_8 0x1B24B#define mmDENTIST_DISPCLK_CNTL 0x0124#define regDENTIST_DISPCLK_CNTL 0x0064#define regDENTIST_DISPCLK_CNTL_BASE_IDX 1
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +7 -1
@@ -90,6 +90,7 @@#define mmCLK1_CLK5_ALLOW_DS 0x16EB1#define mmCLK5_spll_field_8 0x1B24B +#define mmCLK6_spll_field_8 0x1B24B#define mmDENTIST_DISPCLK_CNTL 0x0124#define regDENTIST_DISPCLK_CNTL 0x0064#define regDENTIST_DISPCLK_CNTL_BASE_IDX 1
@@ -116,6 +117,7 @@#define DENTIST_DISPCLK_CNTL__DENTIST_DPPCLK_WDIVIDER_MASK 0x7F000000L#define CLK5_spll_field_8__spll_ssc_en_MASK 0x00002000L +#define CLK6_spll_field_8__spll_ssc_en_MASK 0x00002000L#define SMU_VER_THRESHOLD 0x5D4A00 //93.74.0#undef FN
@@ -596,7 +598,11 @@ static bool dcn35_is_spll_ssc_enabled(struct clk_mgr *clk_mgr_base)uint32_t ssc_enable; - ssc_enable =REG_READ (CLK5_spll_field_8) & CLK5_spll_field_8__spll_ssc_en_MASK; +if (clk_mgr_base->ctx->dce_version ==DCN_VERSION_3_51 ) { + ssc_enable =REG_READ (CLK6_spll_field_8) & CLK6_spll_field_8__spll_ssc_en_MASK; + }else { + ssc_enable =REG_READ (CLK5_spll_field_8) & CLK5_spll_field_8__spll_ssc_en_MASK; + }return ssc_enable !=0 ; }
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +2 -1
@@ -199,6 +199,7 @@ enum dentist_divider_range {CLK_SR_DCN35 (CLK1_CLK4_ALLOW_DS ), \CLK_SR_DCN35 (CLK1_CLK5_ALLOW_DS ), \CLK_SR_DCN35 (CLK5_spll_field_8), \ +CLK_SR_DCN35 (CLK6_spll_field_8), \SR (DENTIST_DISPCLK_CNTL ), \ #define CLK_COMMON_MASK_SH_LIST_DCN32(mask_sh) \
@@ -307,7 +308,7 @@ struct clk_mgr_registers {uint32_t CLK1_CLK4_ALLOW_DS ;uint32_t CLK1_CLK5_ALLOW_DS ;uint32_t CLK5_spll_field_8; - +uint32_t CLK6_spll_field_8; };struct clk_mgr_shift {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 283/592 drm/amd/display: Fix Vertical Interrupt definitions for dcn32, dcn401
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dillon Varone <[email protected]>
[ Upstream commit e8cc149ed906a371a5962ff8065393bae28165c9 ]
[WHY&HOW]
- VUPDATE_NO_LOCK should be used in place of VUPDATE always
- Add VERTICAL_INTERRUPT1 and VERTICAL_INTERRUPT2 definitions
--- .../display/dc/irq/dcn32/irq_service_dcn32.c | 61 ++++++++++++++----- .../dc/irq/dcn401/irq_service_dcn401.c | 60 +++++++++++++----- drivers/gpu/drm/amd/display/dc/irq_types.h | 9 +++ 3 files changed, 101 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/display/dc/irq/dcn32/irq_service_dcn32.c +46 -15
@@ -191,6 +191,16 @@ static struct irq_source_info_funcs vline0_irq_info_funcs = { .ack = NULL }; +static struct irq_source_info_funcs vline1_irq_info_funcs = { + .set =NULL , + .ack =NULL +}; + +static struct irq_source_info_funcs vline2_irq_info_funcs = { + .set =NULL , + .ack =NULL +}; +#undef BASE_INNER#define BASE_INNER (seg) DCN_BASE__INST0_SEG ## seg
@@ -259,6 +269,13 @@ static struct irq_source_info_funcs vline0_irq_info_funcs = { .funcs = &pflip_irq_info_funcs\ } +#define vblank_int_entry (reg_num)\ + [DC_IRQ_SOURCE_VBLANK1 + reg_num] = {\ + IRQ_REG_ENTRY(OTG, reg_num,\ + OTG_GLOBAL_SYNC_STATUS, VSTARTUP_INT_EN,\ + OTG_GLOBAL_SYNC_STATUS, VSTARTUP_EVENT_CLEAR),\ + .funcs = &vblank_irq_info_funcs\ + }/* vupdate_no_lock_int_entry maps to DC_IRQ_SOURCE_VUPDATEx, to match semantic * of DCE's DC_IRQ_SOURCE_VUPDATEx. */
@@ -270,14 +287,6 @@ static struct irq_source_info_funcs vline0_irq_info_funcs = { .funcs = &vupdate_no_lock_irq_info_funcs\ } -#define vblank_int_entry (reg_num)\ - [DC_IRQ_SOURCE_VBLANK1 + reg_num] = {\ - IRQ_REG_ENTRY(OTG, reg_num,\ - OTG_GLOBAL_SYNC_STATUS, VSTARTUP_INT_EN,\ - OTG_GLOBAL_SYNC_STATUS, VSTARTUP_EVENT_CLEAR),\ - .funcs = &vblank_irq_info_funcs\ -} -#define vline0_int_entry (reg_num)\ [DC_IRQ_SOURCE_DC1_VLINE0 + reg_num] = {\ IRQ_REG_ENTRY(OTG, reg_num,\
@@ -285,6 +294,20 @@ static struct irq_source_info_funcs vline0_irq_info_funcs = { OTG_VERTICAL_INTERRUPT0_CONTROL, OTG_VERTICAL_INTERRUPT0_CLEAR),\ .funcs = &vline0_irq_info_funcs\ } +#define vline1_int_entry (reg_num)\ + [DC_IRQ_SOURCE_DC1_VLINE1 + reg_num] = {\ + IRQ_REG_ENTRY(OTG, reg_num,\ + OTG_VERTICAL_INTERRUPT1_CONTROL, OTG_VERTICAL_INTERRUPT1_INT_ENABLE,\ + OTG_VERTICAL_INTERRUPT1_CONTROL, OTG_VERTICAL_INTERRUPT1_CLEAR),\ + .funcs = &vline1_irq_info_funcs\ + } +#define vline2_int_entry (reg_num)\ + [DC_IRQ_SOURCE_DC1_VLINE2 + reg_num] = {\ + IRQ_REG_ENTRY(OTG, reg_num,\ + OTG_VERTICAL_INTERRUPT2_CONTROL, OTG_VERTICAL_INTERRUPT2_INT_ENABLE,\ + OTG_VERTICAL_INTERRUPT2_CONTROL, OTG_VERTICAL_INTERRUPT2_CLEAR),\ + .funcs = &vline2_irq_info_funcs\ + }#define dmub_outbox_int_entry ()\ [DC_IRQ_SOURCE_DMCUB_OUTBOX] = {\ IRQ_REG_ENTRY_DMUB(\
@@ -387,21 +410,29 @@ irq_source_info_dcn32[DAL_IRQ_SOURCES_NUMBER] = { dc_underflow_int_entry(6), [DC_IRQ_SOURCE_DMCU_SCP] = dummy_irq_entry(), [DC_IRQ_SOURCE_VBIOS_SW ] =dummy_irq_entry (), -vupdate_no_lock_int_entry (0 ), -vupdate_no_lock_int_entry (1 ), -vupdate_no_lock_int_entry (2 ), -vupdate_no_lock_int_entry (3 ),vblank_int_entry (0 ),vblank_int_entry (1 ),vblank_int_entry (2 ), vblank_int_entry(3), + [DC_IRQ_SOURCE_DC5_VLINE1] = dummy_irq_entry(), + [DC_IRQ_SOURCE_DC6_VLINE1 ] =dummy_irq_entry (), +dmub_outbox_int_entry (), +vupdate_no_lock_int_entry (0 ), +vupdate_no_lock_int_entry (1 ), +vupdate_no_lock_int_entry (2 ), +vupdate_no_lock_int_entry (3 ),vline0_int_entry (0 ),vline0_int_entry (1 ),vline0_int_entry (2 ),vline0_int_entry (3 ), - [DC_IRQ_SOURCE_DC5_VLINE1] = dummy_irq_entry(), - [DC_IRQ_SOURCE_DC6_VLINE1 ] =dummy_irq_entry (), - dmub_outbox_int_entry(), +vline1_int_entry (0 ), +vline1_int_entry (1 ), +vline1_int_entry (2 ), +vline1_int_entry (3 ), +vline2_int_entry (0 ), +vline2_int_entry (1 ), +vline2_int_entry (2 ), +vline2_int_entry (3 ) }; static const struct irq_service_funcs irq_service_funcs_dcn32 = {
drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c +46 -14
98 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/irq_types.h +9 -0
@@ -161,6 +161,13 @@ enum dc_irq_source {DC_IRQ_SOURCE_DPCX_TX_PHYE ,DC_IRQ_SOURCE_DPCX_TX_PHYF , +DC_IRQ_SOURCE_DC1_VLINE2 , +DC_IRQ_SOURCE_DC2_VLINE2 , +DC_IRQ_SOURCE_DC3_VLINE2 , +DC_IRQ_SOURCE_DC4_VLINE2 , +DC_IRQ_SOURCE_DC5_VLINE2 , +DC_IRQ_SOURCE_DC6_VLINE2 , +DAL_IRQ_SOURCES_NUMBER };
@@ -170,6 +177,8 @@ enum irq_typeIRQ_TYPE_VUPDATE =DC_IRQ_SOURCE_VUPDATE1 ,IRQ_TYPE_VBLANK =DC_IRQ_SOURCE_VBLANK1 ,IRQ_TYPE_VLINE0 =DC_IRQ_SOURCE_DC1_VLINE0 , +IRQ_TYPE_VLINE1 =DC_IRQ_SOURCE_DC1_VLINE1 , +IRQ_TYPE_VLINE2 =DC_IRQ_SOURCE_DC1_VLINE2 , IRQ_TYPE_DCUNDERFLOW = DC_IRQ_SOURCE_DC1UNDERFLOW, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 284/592 media: cec: extron-da-hd-4k-plus: Fix Wformat-truncation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 5edc9b560f60c40e658af0b8e98ae2dfadc438d8 ]
Fix gcc8 warning:
drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c:1014:44: warning: 'DCEC' directive output may be truncated writing 4 bytes into a region of size between 0 and 53 [-Wformat-truncation=]
Resizing the 'buf' and 'cmd' arrays fixed the warning.
--- .../media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c +2 -2
@@ -1002,8 +1002,8 @@ static int extron_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 signal_free_time, struct cec_msg *msg) { struct extron_port *port = cec_get_drvdata(adap); -char buf[CEC_MAX_MSG_SIZE *3 +1 ]; -char cmd[CEC_MAX_MSG_SIZE *3 +13 ]; +char buf[(CEC_MAX_MSG_SIZE -1 ) *3 +1 ]; +char cmd[sizeof (buf) +14 ];unsigned int i;if (port->disconnected)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 285/592 media: rkvdec: Initialize the m2m context before the controls
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Dufresne <[email protected]>
[ Upstream commit d43d7db3c8a1868dcbc6cb8de90a3cdf309d6cbb ]
Setting up the control handler calls into .s_ctrl ops. While validating the controls the ops may need to access some of the context state, which could lead to a crash if not properly initialized.
--- drivers/staging/media/rkvdec/rkvdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/media/rkvdec/rkvdec.c +7 -7
@@ -825,24 +825,24 @@ static int rkvdec_open(struct file *filp)rkvdec_reset_decoded_fmt (ctx);v4l2_fh_init (&ctx->fh,video_devdata (filp)); - ret =rkvdec_init_ctrls (ctx); -if (ret) - goto err_free_ctx; - ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (rkvdec->m2m_dev, ctx, rkvdec_queue_init);if (IS_ERR (ctx->fh.m2m_ctx)) { ret =PTR_ERR (ctx->fh.m2m_ctx); - goto err_cleanup_ctrls; + goto err_free_ctx; } + ret =rkvdec_init_ctrls (ctx); +if (ret) + goto err_cleanup_m2m_ctx; + filp->private_data = &ctx->fh;v4l2_fh_add (&ctx->fh);return 0 ; -err_cleanup_ctrls: -v4l2_ctrl_handler_free (&ctx->ctrl_hdl); +err_cleanup_m2m_ctx: +v4l2_m2m_ctx_release (ctx->fh.m2m_ctx); err_free_ctx:kfree (ctx);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 286/592 drm/amdgpu: fix MES GFX mask
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arvind Yadav <[email protected]>
[ Upstream commit 9d3afcb7b9f950b9b7c58ceeeb9e71f3476e69ed ]
Current MES GFX mask prevents FW to enable oversubscription. This patch does the following:
- Fixes the mask values and adds a description for the same
- Removes the central mask setup and makes it IP specific, as it would be different when the number of pipes and queues are different.
v2: squash in fix from Shashank
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 --- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 15 +++++++++++++-- drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 15 ++++++++++++--- 4 files changed, 26 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0 -3
@@ -150,9 +150,6 @@ int amdgpu_mes_init(struct amdgpu_device *adev) adev->mes.compute_hqd_mask[i] =0xc ; } -for (i =0 ; i <AMDGPU_MES_MAX_GFX_PIPES ; i++) - adev->mes.gfx_hqd_mask[i] = i ?0 :0xfffffffe ; -for (i =0 ; i <AMDGPU_MES_MAX_SDMA_PIPES ; i++) {if (i >= adev->sdma.num_instances)break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +1 -1
@@ -111,8 +111,8 @@ struct amdgpu_mes {uint32_t vmid_mask_gfxhub;uint32_t vmid_mask_mmhub; -uint32_t compute_hqd_mask[AMDGPU_MES_MAX_COMPUTE_PIPES ];uint32_t gfx_hqd_mask[AMDGPU_MES_MAX_GFX_PIPES ]; +uint32_t compute_hqd_mask[AMDGPU_MES_MAX_COMPUTE_PIPES ];uint32_t sdma_hqd_mask[AMDGPU_MES_MAX_SDMA_PIPES ];uint32_t aggregated_doorbells[AMDGPU_MES_PRIORITY_NUM_LEVELS ];uint32_t sch_ctx_offs[AMDGPU_MAX_MES_PIPES ];
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +13 -2
@@ -669,6 +669,18 @@ static int mes_v11_0_misc_op(struct amdgpu_mes *mes, offsetof(union MESAPI__MISC, api_status)); } +static void mes_v11_0_set_gfx_hqd_mask (union MESAPI_SET_HW_RESOURCES *pkt) +{ +/* +* GFX pipe 0 queue 0 is being used by Kernel queue. +* Set GFX pipe 0 queue 1 for MES scheduling +* mask = 10b +* GFX pipe 1 can't be used for MES due to HW limitation. +*/ + pkt->gfx_hqd_mask[0 ] =0x2 ; + pkt->gfx_hqd_mask[1 ] =0 ; +} +static int mes_v11_0_set_hw_resources (struct amdgpu_mes *mes) {int i;
@@ -693,8 +705,7 @@ static int mes_v11_0_set_hw_resources(struct amdgpu_mes *mes) mes_set_hw_res_pkt.compute_hqd_mask[i] = mes->compute_hqd_mask[i]; -for (i =0 ; i <MAX_GFX_PIPES ; i++) - mes_set_hw_res_pkt.gfx_hqd_mask[i] = mes->gfx_hqd_mask[i]; +mes_v11_0_set_gfx_hqd_mask (&mes_set_hw_res_pkt);for (i =0 ; i <MAX_SDMA_PIPES ; i++) mes_set_hw_res_pkt.sdma_hqd_mask[i] = mes->sdma_hqd_mask[i];
drivers/gpu/drm/amd/amdgpu/mes_v12_0.c +12 -3
@@ -694,6 +694,17 @@ static int mes_v12_0_set_hw_resources_1(struct amdgpu_mes *mes, int pipe) offsetof(union MESAPI_SET_HW_RESOURCES_1, api_status)); } +static void mes_v12_0_set_gfx_hqd_mask (union MESAPI_SET_HW_RESOURCES *pkt) +{ +/* +* GFX V12 has only one GFX pipe, but 8 queues in it. +* GFX pipe 0 queue 0 is being used by Kernel queue. +* Set GFX pipe 0 queue 1-7 for MES scheduling +* mask = 1111 1110b +*/ + pkt->gfx_hqd_mask[0 ] =0xFE ; +} +static int mes_v12_0_set_hw_resources (struct amdgpu_mes *mes,int pipe) {int i;
@@ -716,9 +727,7 @@ static int mes_v12_0_set_hw_resources(struct amdgpu_mes *mes, int pipe) mes_set_hw_res_pkt.compute_hqd_mask[i] = mes->compute_hqd_mask[i]; -for (i =0 ; i <MAX_GFX_PIPES ; i++) - mes_set_hw_res_pkt.gfx_hqd_mask[i] = - mes->gfx_hqd_mask[i]; +mes_v12_0_set_gfx_hqd_mask (&mes_set_hw_res_pkt);for (i =0 ; i <MAX_SDMA_PIPES ; i++) mes_set_hw_res_pkt.sdma_hqd_mask[i] =
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 287/592 drm/amdgpu: Disallow partition query during reset
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit 75f138db48c5c493f0ac198c2579d52fc6a4c4a0 ]
Reject queries to get current partition modes during reset. Also, don't accept sysfs interface requests to switch compute partition mode while in reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 4 ++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +10 -0
@@ -1351,6 +1351,10 @@ static ssize_t amdgpu_gfx_get_current_compute_partition(struct device *dev,struct amdgpu_device *adev =drm_to_adev (ddev);int mode; +/* Only minimal precaution taken to reject requests while in reset.*/ +if (amdgpu_in_reset (adev)) +return -EPERM ; + mode =amdgpu_xcp_query_partition_mode (adev->xcp_mgr,AMDGPU_XCP_FL_NONE );
@@ -1394,8 +1398,14 @@ static ssize_t amdgpu_gfx_set_compute_partition(struct device *dev,return -EINVAL ; } +/* Don't allow a switch while under reset */ +if (!down_read_trylock (&adev->reset_domain->sem)) +return -EPERM ; + ret =amdgpu_xcp_switch_partition_mode (adev->xcp_mgr, mode); +up_read (&adev->reset_domain->sem); +if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +4 -0
@@ -1230,6 +1230,10 @@ static ssize_t current_memory_partition_show(struct amdgpu_device *adev =drm_to_adev (ddev);enum amdgpu_memory_partition mode; +/* Only minimal precaution taken to reject requests while in reset */ +if (amdgpu_in_reset (adev)) +return -EPERM ; + mode = adev->gmc.gmc_funcs->query_mem_partition_mode (adev);if ((mode >=ARRAY_SIZE (nps_desc)) || (BIT (mode) &AMDGPU_ALL_NPS_MASK ) !=BIT (mode))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 288/592 sunrpc: fix race in cache cleanup causing stale nextcheck time
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Long Li <[email protected]>
[ Upstream commit 2298abcbe11e9b553d03c0f1d084da786f7eff88 ]
When cache cleanup runs concurrently with cache entry removal, a race condition can occur that leads to incorrect nextcheck times. This can delay cache cleanup for the cache_detail by up to 1800 seconds:
1. cache_clean() sets nextcheck to current time plus 1800 seconds
2. While scanning a non-empty bucket, concurrent cache entry removal can empty that bucket
3. cache_clean() finds no cache entries in the now-empty bucket to update the nextcheck time
4. This maybe delays the next scan of the cache_detail by up to 1800 seconds even when it should be scanned earlier based on remaining entries
Fix this by moving the hash_lock acquisition earlier in cache_clean(). This ensures bucket emptiness checks and nextcheck updates happen atomically, preventing the race between cleanup and entry removal.
--- net/sunrpc/cache.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/sunrpc/cache.c +7 -8
@@ -464,24 +464,21 @@ static int cache_clean(void) } } +spin_lock (¤t_detail->hash_lock); +/* find a non-empty bucket in the table */ -while (current_detail && - current_index < current_detail->hash_size && +while (current_index < current_detail->hash_size &&hlist_empty (¤t_detail->hash_table[current_index])) current_index++;/* find a cleanable entry in the bucket and clean it, or set to next bucket */ - -if (current_detail && current_index < current_detail->hash_size) { +if (current_index < current_detail->hash_size) {struct cache_head *ch =NULL ;struct cache_detail *d;struct hlist_head *head;struct hlist_node *tmp; -spin_lock (¤t_detail->hash_lock); -/* Ok, now to clean this strand */ - head = ¤t_detail->hash_table[current_index];hlist_for_each_entry_safe (ch, tmp, head, cache_list) {if (current_detail->nextcheck > ch->expiry_time)
@@ -502,8 +499,10 @@ static int cache_clean(void)spin_unlock (&cache_list_lock);if (ch)sunrpc_end_cache_remove_entry (ch, d); - }else + }else { +spin_unlock (¤t_detail->hash_lock);spin_unlock (&cache_list_lock); + }return rv; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 289/592 ext4: prevent stale extent cache entries caused by concurrent get es_cache
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit f22a0ef2231a7d8374bb021eb86404d0e9de5a02 ]
The EXT4_IOC_GET_ES_CACHE and EXT4_IOC_PRECACHE_EXTENTS currently invokes ext4_ext_precache() to preload the extent cache without holding the inode's i_rwsem. This can result in stale extent cache entries when competing with operations such as ext4_collapse_range() which calls ext4_ext_remove_space() or ext4_ext_shift_extents().
The problem arises when ext4_ext_remove_space() temporarily releases i_data_sem due to insufficient journal credits. During this interval, a concurrent EXT4_IOC_GET_ES_CACHE or EXT4_IOC_PRECACHE_EXTENTS may cache extent entries that are about to be deleted. As a result, these cached entries become stale and inconsistent with the actual extents.
Loading the extents cache without holding the inode's i_rwsem or the mapping's invalidate_lock is not permitted besides during the writeback. Fix this by holding the i_rwsem during EXT4_IOC_GET_ES_CACHE and EXT4_IOC_PRECACHE_EXTENTS.
--- fs/ext4/extents.c | 2 ++ fs/ext4/ioctl.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
fs/ext4/extents.c +2 -0
@@ -4996,7 +4996,9 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo, }if (fieinfo->fi_flags &FIEMAP_FLAG_CACHE ) { +inode_lock_shared (inode); error =ext4_ext_precache (inode); +inode_unlock_shared (inode);if (error)return error; fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE ;
fs/ext4/ioctl.c +7 -1
@@ -1505,8 +1505,14 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)return 0 ; }case EXT4_IOC_PRECACHE_EXTENTS : -return ext4_ext_precache (inode); + { +int ret; +inode_lock_shared (inode); + ret =ext4_ext_precache (inode); +inode_unlock_shared (inode); +return ret; + }case FS_IOC_SET_ENCRYPTION_POLICY :if (!ext4_has_feature_encrypt (sb))return -EOPNOTSUPP ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 290/592 drm/amdgpu/gfx8: fix CSIB handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit c8b8d7a4f1c5cdfbd61d75302fb3e3cdefb1a7ab ]
We shouldn't return after the last section.
We need to update the rest of the CSIB.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +0 -2
@@ -1248,8 +1248,6 @@ static void gfx_v8_0_get_csb_buffer(struct amdgpu_device *adev, PACKET3_SET_CONTEXT_REG_START);for (i =0 ; i < ext->reg_count; i++) buffer[count++] =cpu_to_le32 (ext->extent[i]); - }else { -return ; } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 291/592 drm/amd/display: disable EASF narrow filter sharpening
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samson Tam <[email protected]>
[ Upstream commit c8d7e0be8183f4375a5cf5c3efd0c678129ea4de ]
[Why & How]
Default should be 1 to disable EASF narrow filter sharpening.
--- drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c +2 -2
@@ -1297,7 +1297,7 @@ static void spl_set_easf_data(struct spl_scratch *spl_scratch, struct spl_out *sif (enable_easf_v) { dscl_prog_data->easf_v_en = true; dscl_prog_data->easf_v_ring =0 ; - dscl_prog_data->easf_v_sharp_factor =0 ; + dscl_prog_data->easf_v_sharp_factor =1 ; dscl_prog_data->easf_v_bf1_en =1 ;// 1-bit, BF1 calculation enable, 0=disable, 1=enable dscl_prog_data->easf_v_bf2_mode =0xF ;// 4-bit, BF2 calculation mode /* 2-bit, BF3 chroma mode correction calculation mode */
@@ -1461,7 +1461,7 @@ static void spl_set_easf_data(struct spl_scratch *spl_scratch, struct spl_out *sif (enable_easf_h) { dscl_prog_data->easf_h_en = true; dscl_prog_data->easf_h_ring =0 ; - dscl_prog_data->easf_h_sharp_factor =0 ; + dscl_prog_data->easf_h_sharp_factor =1 ; dscl_prog_data->easf_h_bf1_en =1 ;// 1-bit, BF1 calculation enable, 0=disable, 1=enable dscl_prog_data->easf_h_bf2_mode =
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 292/592 drm/amdgpu/gfx9: fix CSIB handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit a4a4c0ae6742ec7d6bf1548d2c6828de440814a0 ]
We shouldn't return after the last section.
We need to update the rest of the CSIB.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -2
@@ -1649,8 +1649,6 @@ static void gfx_v9_0_get_csb_buffer(struct amdgpu_device *adev, PACKET3_SET_CONTEXT_REG_START);for (i =0 ; i < ext->reg_count; i++) buffer[count++] =cpu_to_le32 (ext->extent[i]); - }else { -return ; } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 293/592 drm/amd/display: Fix VUpdate offset calculations for dcn401
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dillon Varone <[email protected]>
[ Upstream commit fe45e2af4a22e569b35b7f45eb9f040f6fbef94f ]
[WHY&HOW]
DCN401 uses a different structure to store the VStartup offset used to calculate the VUpdate position, so adjust the calculations to use this value.
--- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 44 +++++++++++++++++++ .../amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 1 + .../amd/display/dc/hwss/dcn401/dcn401_init.c | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +44 -0
@@ -2646,3 +2646,47 @@ void dcn401_plane_atomic_power_down(struct dc *dc,if (hws->funcs.dpp_root_clock_control) hws->funcs.dpp_root_clock_control (hws, dpp->inst, false); } + +/* +* apply_front_porch_workaround +* +* This is a workaround for a bug that has existed since R5xx and has not been +* fixed keep Front porch at minimum 2 for Interlaced mode or 1 for progressive. +*/ +static void apply_front_porch_workaround ( +struct dc_crtc_timing *timing) +{ +if (timing->flags.INTERLACE ==1 ) { +if (timing->v_front_porch <2 ) + timing->v_front_porch =2 ; + }else { +if (timing->v_front_porch <1 ) + timing->v_front_porch =1 ; + } +} + +int dcn401_get_vupdate_offset_from_vsync (struct pipe_ctx *pipe_ctx) +{ +const struct dc_crtc_timing *dc_crtc_timing = &pipe_ctx->stream->timing; +struct dc_crtc_timing patched_crtc_timing; +int vesa_sync_start; +int asic_blank_end; +int interlace_factor; + + patched_crtc_timing = *dc_crtc_timing; +apply_front_porch_workaround (&patched_crtc_timing); + + interlace_factor = patched_crtc_timing.flags.INTERLACE ?2 :1 ; + + vesa_sync_start = patched_crtc_timing.v_addressable + + patched_crtc_timing.v_border_bottom + + patched_crtc_timing.v_front_porch; + + asic_blank_end = (patched_crtc_timing.v_total - + vesa_sync_start - + patched_crtc_timing.v_border_top) + * interlace_factor; + +return asic_blank_end - + pipe_ctx->global_sync.dcn4x.vstartup_lines +1 ; +}
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h +1 -0
@@ -109,4 +109,5 @@ void dcn401_detect_pipe_changes(void dcn401_plane_atomic_power_down (struct dc *dc,struct dpp *dpp,struct hubp *hubp); +int dcn401_get_vupdate_offset_from_vsync (struct pipe_ctx *pipe_ctx);#endif /* __DC_HWSS_DCN401_H__ */
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c +1 -1
@@ -73,7 +73,7 @@ static const struct hw_sequencer_funcs dcn401_funcs = { .init_sys_ctx = dcn20_init_sys_ctx, .init_vm_ctx = dcn20_init_vm_ctx, .set_flip_control_gsl = dcn20_set_flip_control_gsl, - .get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync, + .get_vupdate_offset_from_vsync = dcn401_get_vupdate_offset_from_vsync, .calc_vupdate_position = dcn10_calc_vupdate_position, .apply_idle_power_optimizations = dcn401_apply_idle_power_optimizations, .does_plane_fit_in_mall = NULL,
Signature · 1 line
2.39.5
Re: [PATCH 6.15 293/592] drm/amd/display: Fix VUpdate offset calculations for dcn401
Quoted 4 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Dillon Varone <[email protected]>
[ Upstream commit
fe45e2af4a22e569b35b7f45eb9f040f6fbef94f][WHY&HOW]
DCN401 uses a different structure to store the VStartup offset used to calculate the VUpdate position, so adjust the calculations to use this value.
This one was reverted upstream by:
commit 0fc9635a801f6ba3a03ad2de6d46f4f3e2fdfed6
Author: Dillon Varone <[email protected]> Date: Fri Mar 28 12:56:39 2025 -0400
Revert "drm/amd/display: Fix VUpdate offset calculations for dcn401"
This reverts commit fe45e2af4a22e569b35b7f45eb9f040f6fbef94f.
Reason for revert: it causes stuttering in some usecases.
thanks,
Signature · 2 lines
js suse labs
Greg Kroah-Hartman
maintainerRe: [PATCH 6.15 293/592] drm/amd/display: Fix VUpdate offset calculations for dcn401
Quoted 16 lines · Jiri Slaby
Quoted 4 lines · Greg Kroah-Hartman
6.15-stable review patch. If anyone has any objections, please let me know.
------------------
Quoted 8 lines
From: Dillon Varone <[email protected]>
[ Upstream commit
fe45e2af4a22e569b35b7f45eb9f040f6fbef94f][WHY&HOW]
DCN401 uses a different structure to store the VStartup offset used to calculate the VUpdate position, so adjust the calculations to use this value.This one was reverted upstream by:
commit0fc9635a801f6ba3a03ad2de6d46f4f3e2fdfed6
Quoted 9 lines
Author: Dillon Varone <[email protected]> Date: Fri Mar 28 12:56:39 2025 -0400Revert "drm/amd/display: Fix VUpdate offset calculations for dcn401"
This reverts commit
fe45e2af4a22e569b35b7f45eb9f040f6fbef94f.Reason for revert: it causes stuttering in some usecases.
Thanks for pointing it out, now applied.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 294/592 jfs: Fix null-ptr-deref in jfs_ioc_trim
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dylan Wolff <[email protected]>
[ Upstream commit a4685408ff6c3e2af366ad9a7274f45ff3f394ee ]
[ Syzkaller Report ]
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000087: 0000 [#1 KASAN: null-ptr-deref in range [0x0000000000000438-0x000000000000043f] CPU: 2 UID: 0 PID: 10614 Comm: syz-executor.0 Not tainted 6.13.0-rc6-gfbfd64d25c7a-dirty #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Sched_ext: serialise (enabled+all), task: runnable_at=-30ms RIP: 0010:jfs_ioc_trim+0x34b/0x8f0 Code: e7 e8 59 a4 87 fe 4d 8b 24 24 4d 8d bc 24 38 04 00 00 48 8d 93 90 82 fe ff 4c 89 ff 31 f6 RSP: 0018:ffffc900055f7cd0 EFLAGS: 00010206 RAX: 0000000000000087 RBX: 00005866a9e67ff8 RCX: 000000000000000a RDX: 0000000000000001 RSI: 0000000000000004 RDI: 0000000000000001 RBP: dffffc0000000000 R08: ffff88807c180003 R09: 1ffff1100f830000 R10: dffffc0000000000 R11: ffffed100f830001 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000438 FS: 00007fe520225640(0000) GS:ffff8880b7e80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005593c91b2c88 CR3: 000000014927c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ? __die_body+0x61/0xb0 ? die_addr+0xb1/0xe0 ? exc_general_protection+0x333/0x510 ? asm_exc_general_protection+0x26/0x30 ? jfs_ioc_trim+0x34b/0x8f0 jfs_ioctl+0x3c8/0x4f0 ? __pfx_jfs_ioctl+0x10/0x10 ? __pfx_jfs_ioctl+0x10/0x10 __se_sys_ioctl+0x269/0x350 ? __pfx___se_sys_ioctl+0x10/0x10 ? do_syscall_64+0xfb/0x210 do_syscall_64+0xee/0x210 ? syscall_exit_to_user_mode+0x1e0/0x330 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fe51f4903ad Code: c3 e8 a7 2b 00 00 0f 1f 80 00 00 00 00 f3 0f 1e fa 48 89 f8 48
89 f7 48 89 d6 48 89 ca 4d
RSP: 002b:00007fe5202250c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 00007fe51f5cbf80 RCX: 00007fe51f4903ad
RDX: 0000000020000680 RSI: 00000000c0185879 RDI: 0000000000000005
RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe520225640
R13: 000000000000000e R14: 00007fe51f44fca0 R15: 00007fe52021d000
</TASK> Modules linked in: ---[ end trace 0000000000000000 ]--- RIP: 0010:jfs_ioc_trim+0x34b/0x8f0 Code: e7 e8 59 a4 87 fe 4d 8b 24 24 4d 8d bc 24 38 04 00 00 48 8d 93 90 82 fe ff 4c 89 ff 31 f6 RSP: 0018:ffffc900055f7cd0 EFLAGS: 00010206 RAX: 0000000000000087 RBX: 00005866a9e67ff8 RCX: 000000000000000a RDX: 0000000000000001 RSI: 0000000000000004 RDI: 0000000000000001 RBP: dffffc0000000000 R08: ffff88807c180003 R09: 1ffff1100f830000 R10: dffffc0000000000 R11: ffffed100f830001 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000438 FS: 00007fe520225640(0000) GS:ffff8880b7e80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005593c91b2c88 CR3: 000000014927c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Kernel panic - not syncing: Fatal exception
[ Analysis ]
We believe that we have found a concurrency bug in the fs/jfs module that results in a null pointer dereference. There is a closely related issue which has been fixed:
... but, unfortunately, the accepted patch appears to still be susceptible to a null pointer dereference under some interleavings.
To trigger the bug, we think that JFS_SBI(ipbmap->i_sb)->bmap is set to NULL in dbFreeBits and then dereferenced in jfs_ioc_trim. This bug manifests quite rarely under normal circumstances, but is triggereable from a syz-program.
--- fs/jfs/jfs_discard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/jfs/jfs_discard.c +2 -1
@@ -86,7 +86,8 @@ int jfs_ioc_trim(struct inode *ip, struct fstrim_range *range)down_read (&sb->s_umount); bmp =JFS_SBI (ip->i_sb)->bmap; -if (minlen > bmp->db_agsize || +if (bmp ==NULL || + minlen > bmp->db_agsize || start >= bmp->db_mapsize || range->len < sb->s_blocksize) {up_read (&sb->s_umount);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 295/592 drm/amd/pm: Reset SMU v13.0.x custom settings
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit 923406e74ec66364b829b7f8b6b67d46200567a6 ]
On SMU v13.0.2 and SMU v13.0.6 variants user may choose custom min/max clocks in manual perf mode. Those custom min/max values need to be reset once user switches to auto or restores default settings. Otherwise, they may get used inadvertently during the next operation.
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 13 +++++++++++-- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 ++++++++++ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -0
@@ -310,6 +310,7 @@ int smu_v13_0_get_boot_freq_by_index(struct smu_context *smu, uint32_t *value);void smu_v13_0_interrupt_work (struct smu_context *smu); +void smu_v13_0_reset_custom_level (struct smu_context *smu);bool smu_v13_0_12_is_dpm_running (struct smu_context *smu);int smu_v13_0_12_get_max_metrics_size (void );int smu_v13_0_12_setup_driver_pptable (struct smu_context *smu);
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +11 -2
@@ -1270,6 +1270,7 @@ static int aldebaran_set_performance_level(struct smu_context *smu,struct smu_13_0_dpm_table *gfx_table = &dpm_context->dpm_tables.gfx_table;struct smu_umd_pstate_table *pstate_table = &smu->pstate_table; +int r;/* Disable determinism if switching to another mode */ if ((smu_dpm->dpm_level == AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM) &&
@@ -1282,7 +1283,11 @@ static int aldebaran_set_performance_level(struct smu_context *smu,case AMD_DPM_FORCED_LEVEL_PERF_DETERMINISM :return 0 ; - +case AMD_DPM_FORCED_LEVEL_AUTO : + r =smu_v13_0_set_performance_level (smu, level); +if (!r) +smu_v13_0_reset_custom_level (smu); +return r;case AMD_DPM_FORCED_LEVEL_HIGH :case AMD_DPM_FORCED_LEVEL_LOW :case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :
@@ -1423,7 +1428,11 @@ static int aldebaran_usr_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_ min_clk = dpm_context->dpm_tables.gfx_table.min; max_clk = dpm_context->dpm_tables.gfx_table.max; -return aldebaran_set_soft_freq_limited_range (smu,SMU_GFXCLK , min_clk, max_clk, false); + ret =aldebaran_set_soft_freq_limited_range ( + smu,SMU_GFXCLK , min_clk, max_clk, false); +if (ret) +return ret; +smu_v13_0_reset_custom_level (smu); }break ;case PP_OD_COMMIT_DPM_TABLE :
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +10 -0
@@ -2595,3 +2595,13 @@ int smu_v13_0_set_wbrf_exclusion_ranges(struct smu_context *smu,return ret; } + +void smu_v13_0_reset_custom_level (struct smu_context *smu) +{ +struct smu_umd_pstate_table *pstate_table = &smu->pstate_table; + + pstate_table->uclk_pstate.custom.min =0 ; + pstate_table->uclk_pstate.custom.max =0 ; + pstate_table->gfxclk_pstate.custom.min =0 ; + pstate_table->gfxclk_pstate.custom.max =0 ; +}
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +2 -2
@@ -1927,7 +1927,7 @@ static int smu_v13_0_6_set_performance_level(struct smu_context *smu,return ret; pstate_table->uclk_pstate.curr.max = uclk_table->max; } - pstate_table->uclk_pstate.custom.max =0 ; +smu_v13_0_reset_custom_level (smu);return 0 ;case AMD_DPM_FORCED_LEVEL_MANUAL :
@@ -2140,7 +2140,7 @@ static int smu_v13_0_6_usr_edit_dpm_table(struct smu_context *smu, smu, SMU_UCLK, min_clk, max_clk, false);if (ret)return ret; - pstate_table->uclk_pstate.custom.max =0 ; +smu_v13_0_reset_custom_level (smu); }break ;case PP_OD_COMMIT_DPM_TABLE :
Signature · 1 line
2.39.5
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.4 release. There are 592 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Hey Greg,
this stable release candidate does not build for me as-is on x86:
error[E0432]: unresolved import crate::sync::Completion
--> rust/kernel/devres.rs:16:22
|
16 | sync::{rcu, Arc, Completion},
| ^^^^^^^^^^ no `Completion` in `sync`error[E0412]: cannot find type Bound in this scope
--> rust/kernel/devres.rs:226:49
|
226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> {
| ^^^^^ not found in this scope
|
help: consider importing this enum
|
8 + use core::range::Bound;
|error[E0107]: struct takes 0 generic arguments but 1 generic argument was supplied
--> rust/kernel/devres.rs:226:42
|
226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> {
| ^^^^^^------- help: remove the unnecessary generics
| |
| expected 0 generic arguments
|
note: struct defined here, with 0 generic parameters
--> rust/kernel/device.rs:45:12
|
45 | pub struct Device(Opaque<bindings::device>);
| ^^^^^^error[E0600]: cannot apply unary operator ! to type ()
--> rust/kernel/devres.rs:172:12
|
172 | if !inner.data.revoke() {
| ^^^^^^^^^^^^^^^^^^^^ cannot apply unary operator `!`error[E0599]: no method named access found for struct Revocable in the current scope
--> rust/kernel/devres.rs:234:33
|
234 | Ok(unsafe { self.0.data.access() })
| ^^^^^^
|
::: rust/kernel/revocable.rs:64:1
|
64 | #[pin_data(PinnedDrop)]
| ----------------------- method `access` not found for this struct
|
help: there is a method `try_access` with a similar name
|
234 | Ok(unsafe { self.0.data.try_access() })
| ++++error[E0599]: no method named try_access_with found for struct Revocable in the current scope
--> rust/kernel/devres.rs:244:21
|
244 | self.0.data.try_access_with(f)
| ^^^^^^^^^^^^^^^
|
::: rust/kernel/revocable.rs:64:1
|
64 | #[pin_data(PinnedDrop)]
| ----------------------- method `try_access_with` not found for this struct
|
help: there is a method `try_access` with a similar name, but with different arguments
--> rust/kernel/revocable.rs:97:5
|
97 | pub fn try_access(&self) -> Option<RevocableGuard<'_, T>> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^error[E0308]: mismatched types
--> rust/kernel/devres.rs:257:21
|
257 | if unsafe { self.0.data.revoke_nosync() } {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `()`error: aborting due to 7 previous errors
Some errors have detailed explanations: E0107, E0308, E0412, E0432, E0599, E0600. For more information about an error, try rustc --explain E0107. make[2]: *** [rust/Makefile:536: rust/kernel.o] Error 1
make[1]: *** [/build/linux/src/linux-6.15.3/Makefile:1280: prepare] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Quoted 15 lines · Christian Heusel
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.4 release. There are 592 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.
Quoted 7 lines
Quoted 3 lines
thanks,
greg k-h
Hey Greg,
this stable release candidate does not build for me as-is on x86:
The error is related to patch #515 in this stable review, I replied there, the completion abstraction (patch 1) is missing from [0].
[0]: https://lore.kernel.org/all/[email protected]
---
Cheers,
Benno
Quoted 5 lines
error[E0432]: unresolved import
crate::sync::Completion
-->rust/kernel/devres.rs:16:22| 16 | sync::{rcu, Arc, Completion}, | ^^^^^^^^^^ no `Completion` in `sync`
Greg Kroah-Hartman
maintainerQuoted 99 lines · Christian Heusel
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.4 release. There are 592 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Hey Greg,
this stable release candidate does not build for me as-is on x86:
error[E0432]: unresolved import
crate::sync::Completion
-->rust/kernel/devres.rs:16:22| 16 | sync::{rcu, Arc, Completion}, | ^^^^^^^^^^ no `Completion` in `sync`error[E0412]: cannot find type
Boundin this scope
-->rust/kernel/devres.rs:226:49| 226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> { | ^^^^^ not found in this scope | help: consider importing this enum | 8 + use core::range::Bound; |error[E0107]: struct takes 0 generic arguments but 1 generic argument was supplied
-->rust/kernel/devres.rs:226:42| 226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> { | ^^^^^^------- help: remove the unnecessary generics | | | expected 0 generic arguments | note: struct defined here, with 0 generic parameters --> rust/kernel/device.rs:45:12 | 45 | pub struct Device(Opaque<bindings::device>); | ^^^^^^error[E0600]: cannot apply unary operator
!to type()
-->rust/kernel/devres.rs:172:12| 172 | if !inner.data.revoke() { | ^^^^^^^^^^^^^^^^^^^^ cannot apply unary operator `!`error[E0599]: no method named
accessfound for structRevocablein the current scope
-->rust/kernel/devres.rs:234:33| 234 | Ok(unsafe { self.0.data.access() }) | ^^^^^^ | ::: rust/kernel/revocable.rs:64:1 | 64 | #[pin_data(PinnedDrop)] | ----------------------- method `access` not found for this struct | help: there is a method `try_access` with a similar name | 234 | Ok(unsafe { self.0.data.try_access() }) | ++++error[E0599]: no method named
try_access_withfound for structRevocablein the current scope
-->rust/kernel/devres.rs:244:21| 244 | self.0.data.try_access_with(f) | ^^^^^^^^^^^^^^^ | ::: rust/kernel/revocable.rs:64:1 | 64 | #[pin_data(PinnedDrop)] | ----------------------- method `try_access_with` not found for this struct | help: there is a method `try_access` with a similar name, but with different arguments --> rust/kernel/revocable.rs:97:5 | 97 | pub fn try_access(&self) -> Option<RevocableGuard<'_, T>> { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^error[E0308]: mismatched types
-->rust/kernel/devres.rs:257:21| 257 | if unsafe { self.0.data.revoke_nosync() } { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `()`
Quoted 7 lines
error: aborting due to 7 previous errors
Some errors have detailed explanations: E0107, E0308, E0412, E0432, E0599, E0600. For more information about an error, try
rustc --explain E0107. make[2]: *** [rust/Makefile:536:rust/kernel.o] Error 1
make[1]: *** [/build/linux/src/linux-6.15.3/Makefile:1280: prepare] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Thanks for the report, now fixed.
greg k-h
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.4 release. There are 592 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 8 lines
Responses should be made by Wed, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.
No issues here (build tested on all our supported architectures & boot tested on x86_64) with Alpine Linux configs. Thanks!
Am 23.06.2025 um 14:59 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.15.4 release. There are 592 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697 v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.15.4 release. There are 592 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 25 Jun 2025 13:05:55 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.15.4-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.15.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm, arm64, x86_64 rust config builds with gcc-13 and clang-20 failed on
the Linux stable-rc 6.15.4-rc1.
Regressions found on arm64
* arm, build
- rustclang-lkftconfig-kselftest
* arm64, build
- rustclang-lkftconfig-kselftest
- rustgcc-lkftconfig-kselftest
* riscv, build
- rustclang-nightly-lkftconfig-kselftest
* x86_64, build
- rustclang-nightly-lkftconfig-kselftest
- rustgcc-lkftconfig-kselftest
Regression Analysis:
- New regression? Yes
- Reproducibility? Yes
Build regression: stable-rc rust unresolved import crate::sync::Completion
## Build errors
error[E0432]: unresolved import crate::sync::Completion
--> /builds/linux/rust/kernel/devres.rs:16:22
|
16 | sync::{rcu, Arc, Completion},
| ^^^^^^^^^^ no `Completion` in `sync`error[E0412]: cannot find type Bound in this scope
--> /builds/linux/rust/kernel/devres.rs:226:49
|
226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> {
| ^^^^^ not found
in this scope
|
help: consider importing this enum
|
8 + use core::range::Bound;
|error[E0107]: struct takes 0 generic arguments but 1 generic argument was supplied
--> /builds/linux/rust/kernel/devres.rs:226:42
|
226 | pub fn access<'a>(&'a self, dev: &'a Device<Bound>) -> Result<&'a T> {
| ^^^^^^------- help:
remove the unnecessary generics
| |
| expected 0 generic arguments
|
note: struct defined here, with 0 generic parameters
--> /builds/linux/rust/kernel/device.rs:45:12
|
45 | pub struct Device(Opaque<bindings::device>);
| ^^^^^^error[E0600]: cannot apply unary operator ! to type ()
--> /builds/linux/rust/kernel/devres.rs:172:12
|
172 | if !inner.data.revoke() {
| ^^^^^^^^^^^^^^^^^^^^ cannot apply unary operator `!`error[E0599]: no method named access found for struct Revocable in the current scope
--> /builds/linux/rust/kernel/devres.rs:234:33
|
234 | Ok(unsafe { self.0.data.access() })
| ^^^^^^
|
::: /builds/linux/rust/kernel/revocable.rs:64:1
|
64 | #[pin_data(PinnedDrop)]
| ----------------------- method `access` not found for this struct
|
help: there is a method `try_access` with a similar name
|
234 | Ok(unsafe { self.0.data.try_access() })
| ~~~~~~~~~~error[E0599]: no method named try_access_with found for struct Revocable in the current scope
--> /builds/linux/rust/kernel/devres.rs:244:21
|
244 | self.0.data.try_access_with(f)
| ^^^^^^^^^^^^^^^
|
::: /builds/linux/rust/kernel/revocable.rs:64:1
|
64 | #[pin_data(PinnedDrop)]
| ----------------------- method `try_access_with` not found for this struct
|
help: there is a method `try_access` with a similar name, but with
different arguments
--> /builds/linux/rust/kernel/revocable.rs:97:5
|
97 | pub fn try_access(&self) -> Option<RevocableGuard<'_, T>> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^error[E0308]: mismatched types
--> /builds/linux/rust/kernel/devres.rs:257:21
|
257 | if unsafe { self.0.data.revoke_nosync() } {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`,found ()
error: aborting due to 7 previous errors
Some errors have detailed explanations: E0107, E0308, E0412, E0432, E0599, E0600.
For more information about an error, try rustc --explain E0107. make[3]: *** [/builds/linux/rust/Makefile:536: rust/kernel.o] Error 1
## Source
* Kernel version: 6.15.4-rc1
* Git tree: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* Git sha: de19bfa00d6f93fdcd38a5c088466e093af981f2
* Git describe: v6.15.3-593-gde19bfa00d6f
* Project details:
https://regressions.linaro.org/lkft/linux-stable-rc-linux-6.15.y/v6.15.3-593-gde19bfa00d6f/
* Architectures: arm arm64 x86_64
* Toolchains: gcc-12
* Kconfigs: allyesconfig
## Build arm64
* Build log: https://qa-reports.linaro.org/api/testruns/28840986/log_file/
* Build details:
https://regressions.linaro.org/lkft/linux-stable-rc-linux-6.15.y/v6.15.3-593-gde19bfa00d6f/build/rustgcc-lkftconfig-kselftest/
* Build link: https://storage.tuxsuite.com/public/linaro/lkft/builds/2yuYPOcS6L7NBPk6w3gHjPLYyFI/
* Kernel config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2yuYPOcS6L7NBPk6w3gHjPLYyFI/config
## Steps to reproduce
- tuxmake --runtime podman \
--target-arch arm64 \
--toolchain rustgcc --kconfig defconfig \
--kconfig-add
https://gitlab.com/Linaro/lkft/kernel-fragments/-/raw/main/systemd.config
\
--kconfig-add CONFIG_GCC_PLUGINS=n \
--kconfig-add tools/testing/selftests/rust/config \
TARGETS=rust debugkernel dtbs dtbs-legacy headers kernelkselftest modules
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerPATCH 296/592 drm/amd/display: Correct prefetch calculation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: TungYu Lu <[email protected]>
[ Upstream commit 33bc89949b4366dff2dca30bc61ba1c0cbcd2ab2 ]
[Why]
The minimum value of the dst_y_prefetch_equ was not correct in prefetch calculation whice causes OPTC underflow.
[How]
Add the min operation of dst_y_prefetch_equ in prefetch calculation for legacy DML.
--- drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 1 + drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c | 1 + drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c | 1 + 3 files changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +1 -0
@@ -1002,6 +1002,7 @@ static bool CalculatePrefetchSchedule( dst_y_prefetch_equ = VStartup - (Tsetup +dml_max (TWait + TCalc, *Tdmdl)) / LineTime - (*DSTYAfterScaler + *DSTXAfterScaler / myPipe->HTotal); + dst_y_prefetch_equ =dml_min (dst_y_prefetch_equ,63.75 );// limit to the reg limit of U6.2 for DST_Y_PREFETCH Lsw_oto =dml_max (PrefetchSourceLinesY, PrefetchSourceLinesC); Tsw_oto = Lsw_oto * LineTime;
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +1 -0
@@ -1105,6 +1105,7 @@ static bool CalculatePrefetchSchedule( Tr0_oto_lines =dml_ceil (4.0 * Tr0_oto / LineTime,1 ) /4.0 ; dst_y_prefetch_oto = Tvm_oto_lines +2 * Tr0_oto_lines + Lsw_oto; dst_y_prefetch_equ = VStartup - (*TSetup +dml_max (TWait + TCalc, *Tdmdl)) / LineTime - (*DSTYAfterScaler + *DSTXAfterScaler / myPipe->HTotal); + dst_y_prefetch_equ =dml_min (dst_y_prefetch_equ,63.75 );// limit to the reg limit of U6.2 for DST_Y_PREFETCH dst_y_prefetch_equ =dml_floor (4.0 * (dst_y_prefetch_equ +0.125 ),1 ) /4.0 ; Tpre_rounded = dst_y_prefetch_equ * LineTime;
drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c +1 -0
@@ -1123,6 +1123,7 @@ static bool CalculatePrefetchSchedule( Tr0_oto_lines =dml_ceil (4.0 * Tr0_oto / LineTime,1 ) /4.0 ; dst_y_prefetch_oto = Tvm_oto_lines +2 * Tr0_oto_lines + Lsw_oto; dst_y_prefetch_equ = VStartup - (*TSetup +dml_max (TWait + TCalc, *Tdmdl)) / LineTime - (*DSTYAfterScaler + *DSTXAfterScaler / myPipe->HTotal); + dst_y_prefetch_equ =dml_min (dst_y_prefetch_equ,63.75 );// limit to the reg limit of U6.2 for DST_Y_PREFETCH dst_y_prefetch_equ =dml_floor (4.0 * (dst_y_prefetch_equ +0.125 ),1 ) /4.0 ; Tpre_rounded = dst_y_prefetch_equ * LineTime;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 297/592 drm/amd/display: Restructure DMI quirks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit de6485e3df24170d71706d6f2c55a496443c3803 ]
[Why]
DMI quirks are relatively big code that makes amdgpu_dm 200 lines larger.
[How]
Move DMI quirks into a dedicated source file and make all quirks variables for struct amdgpu_display_manager.
--- .../gpu/drm/amd/display/amdgpu_dm/Makefile | 1 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 152 +-------------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 + .../amd/display/amdgpu_dm/amdgpu_dm_quirks.c | 178 ++++++++++++++++++ 4 files changed, 191 insertions(+), 149 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c
drivers/gpu/drm/amd/display/amdgpu_dm/Makefile +1 -0
@@ -38,6 +38,7 @@ AMDGPUDM = \ amdgpu_dm_pp_smu.o \ amdgpu_dm_psr.o \ amdgpu_dm_replay.o \ + amdgpu_dm_quirks.o \ amdgpu_dm_wb.o ifdef CONFIG_DRM_AMD_DC_FP
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -149
170 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +9 -0
@@ -613,6 +613,13 @@ struct amdgpu_display_manager {*/ bool aux_hpd_discon_quirk; +/** +* @edp0_on_dp1_quirk: +* +* quirk for platforms that put edp0 on DP1. +*/ +bool edp0_on_dp1_quirk; +/** * @dpia_aux_lock: *
@@ -1045,4 +1052,6 @@ void hdmi_cec_set_edid(struct amdgpu_dm_connector *aconnector);void hdmi_cec_unset_edid (struct amdgpu_dm_connector *aconnector);int amdgpu_dm_initialize_hdmi_connector (struct amdgpu_dm_connector *aconnector); +void retrieve_dmi_info (struct amdgpu_display_manager *dm); +#endif /* __AMDGPU_DM_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c new file +178 -0
178 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 298/592 media: renesas: vsp1: Fix media bus code setup on RWPF source pad
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit b6e57605eff6224df4debf188eb7a02dedb7686f ]
The RWPF source pad media bus code can only be different from the sink pad code when enabling color space conversion, which can only convert between RGB and YUV. If the sink pad code is HSV, no conversion is possible. Fix the pad set format handler to reflect this hardware limitation.
--- drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/media/platform/renesas/vsp1/vsp1_rwpf.c +11 -2
@@ -76,11 +76,20 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev, format =v4l2_subdev_state_get_format (state, fmt->pad);if (fmt->pad ==RWPF_PAD_SOURCE ) { +const struct v4l2_mbus_framefmt *sink_format = +v4l2_subdev_state_get_format (state,RWPF_PAD_SINK ); +/* * The RWPF performs format conversion but can't scale, only the -* format code can be changed on the source pad. +* format code can be changed on the source pad when converting +* between RGB and YUV. */ - format->code = fmt->format.code; +if (sink_format->code !=MEDIA_BUS_FMT_AHSV8888_1X32 && + fmt->format.code !=MEDIA_BUS_FMT_AHSV8888_1X32 ) + format->code = fmt->format.code; +else + format->code = sink_format->code; + fmt->format = *format; goto done; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 299/592 drm/msm/dpu: dont select single flush for active CTL blocks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit e93eee524bb78f3ee4b78654d0083382f98b3d23 ]
In case of ACTIVE CTLs, a single CTL is being used for flushing all INTF blocks. Don't skip programming the CTL on those targets.
Patchwork: https://patchwork.freedesktop.org/patch/641585/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +2 -1
@@ -372,7 +372,8 @@ static void dpu_encoder_phys_vid_underrun_irq(void *arg)static bool dpu_encoder_phys_vid_needs_single_flush (struct dpu_encoder_phys *phys_enc) { -return phys_enc->split_role !=ENC_ROLE_SOLO ; +return !(phys_enc->hw_ctl->caps->features &BIT (DPU_CTL_ACTIVE_CFG )) && + phys_enc->split_role !=ENC_ROLE_SOLO ; } static void dpu_encoder_phys_vid_atomic_mode_set(
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 300/592 drm/amdkfd: Set SDMA_RLCx_IB_CNTL/SWITCH_INSIDE_IB
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amber Lin <[email protected]>
[ Upstream commit ab9fcc6362e0699fc1150aa1d8503c40fce2c1e1 ]
When submitting MQD to CP, set SDMA_RLCx_IB_CNTL/SWITCH_INSIDE_IB bit so it'll allow SDMA preemption if there is a massive command buffer of long-running SDMA commands.
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +4 -0
@@ -495,6 +495,10 @@ static void update_mqd_sdma(struct mqd_manager *mm, void *mqd, m->sdma_engine_id = q->sdma_engine_id; m->sdma_queue_id = q->sdma_queue_id; m->sdmax_rlcx_dummy_reg =SDMA_RLC_DUMMY_DEFAULT ; +/* Allow context switch so we don't cross-process starve with a massive +* command buffer of long-running SDMA commands +*/ + m->sdmax_rlcx_ib_cntl |=SDMA0_GFX_IB_CNTL__SWITCH_INSIDE_IB_MASK ; q->is_active =QUEUE_IS_ACTIVE (*q); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 301/592 media: tc358743: ignore video while HPD is low
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 6829c5b5d26b1be31880d74ec24cb32d2d75f1ae ]
If the HPD is low (happens if there is no EDID or the EDID is being updated), then return -ENOLINK in tc358743_get_detected_timings() instead of detecting video.
This avoids userspace thinking that it can start streaming when the HPD is low.
--- drivers/media/i2c/tc358743.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/tc358743.c +4 -0
@@ -313,6 +313,10 @@ static int tc358743_get_detected_timings(struct v4l2_subdev *sd,memset (timings,0 ,sizeof (struct v4l2_dv_timings )); +/* if HPD is low, ignore any video */ +if (!(i2c_rd8 (sd,HPD_CTL ) &MASK_HPD_OUT0 )) +return -ENOLINK ; +if (no_signal (sd)) {v4l2_dbg (1 , debug, sd,"%s: no valid signal\n" , __func__);return -ENOLINK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 302/592 media: platform: exynos4-is: Add hardware sync wait to fimc_is_hw_change_mode()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit bd9f6ce7d512fa21249415c16af801a4ed5d97b6 ]
In fimc_is_hw_change_mode(), the function changes camera modes without waiting for hardware completion, risking corrupted data or system hangs if subsequent operations proceed before the hardware is ready.
Add fimc_is_hw_wait_intmsr0_intmsd0() after mode configuration, ensuring hardware state synchronization and stable interrupt handling.
--- drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c +1 -0
@@ -164,6 +164,7 @@ int fimc_is_hw_change_mode(struct fimc_is *is)if (WARN_ON (is->config_index >=ARRAY_SIZE (cmd)))return -EINVAL ; +fimc_is_hw_wait_intmsr0_intmsd0 (is);mcuctl_write (cmd[is->config_index], is,MCUCTL_REG_ISSR (0 ));mcuctl_write (is->sensor_index, is,MCUCTL_REG_ISSR (1 ));mcuctl_write (is->setfile.sub_index, is,MCUCTL_REG_ISSR (2 ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 303/592 media: i2c: imx334: update mode_3840x2160_regs array
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shravan Chippa <[email protected]>
[ Upstream commit 35132d039c566b0e9d8e53f76f512b22607c2405 ]
The 3840x2160 mode operates with the imx334 reset values. If we switch to other modes and then return to the 3840x2160 mode, it should function correctly. so updated the mode_3840x2160_regs array with the imx334 reset values.
--- drivers/media/i2c/imx334.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/i2c/imx334.c +6 -0
@@ -352,6 +352,12 @@ static const struct imx334_reg mode_3840x2160_regs[] = { {0x302d, 0x00}, {0x302e, 0x00}, {0x302f, 0x0f}, + {0x3074, 0xb0}, + {0x3075, 0x00}, + {0x308e, 0xb1}, + {0x308f, 0x00}, + {0x30d8, 0x20}, + {0x30d9, 0x12}, {0x3076, 0x70}, {0x3077, 0x08}, {0x3090, 0x70},
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 304/592 nios2: force update_mmu_cache on spurious tlb-permission--related pagefaults
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Schuster <[email protected]>
[ Upstream commit 2d8a3179ea035f9341b6a73e5ba4029fc67e983d ]
NIOS2 uses a software-managed TLB for virtual address translation. To flush a cache line, the original mapping is replaced by one to physical address 0x0 with no permissions (rwx mapped to 0) set. This can lead to TLB-permission--related traps when such a nominally flushed entry is encountered as a mapping for an otherwise valid virtual address within a process (e.g. due to an MMU-PID-namespace rollover that previously flushed the complete TLB including entries of existing, running processes).
The default ptep_set_access_flags implementation from mm/pgtable-generic.c only forces a TLB-update when the page-table entry has changed within the page table:
/*
* [...] We return whether the PTE actually changed, which in turn
* instructs the caller to do things like update__mmu_cache. [...]
*/
int ptep_set_access_flags(struct vm_area_struct *vma,
unsigned long address, pte_t *ptep,
pte_t entry, int dirty)
{
int changed = !pte_same(*ptep, entry);
if (changed) {
set_pte_at(vma->vm_mm, address, ptep, entry);
flush_tlb_fix_spurious_fault(vma, address);
}
return changed;
}However, no cross-referencing with the TLB-state occurs, so the flushing-induced pseudo entries that are responsible for the pagefault in the first place are never pre-empted from TLB on this code path.
This commit fixes this behaviour by always requesting a TLB-update in this part of the pagefault handling, fixing spurious page-faults on the way. The handling is a straightforward port of the logic from the MIPS architecture via an arch-specific ptep_set_access_flags function ported from arch/mips/include/asm/pgtable.h.
--- arch/nios2/include/asm/pgtable.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/nios2/include/asm/pgtable.h +16 -0
@@ -291,4 +291,20 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma,#define update_mmu_cache (vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) +static inline int pte_same (pte_t pte_a,pte_t pte_b); + +#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS +static inline int ptep_set_access_flags (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep, +pte_t entry,int dirty) +{ +if (!pte_same (*ptep, entry)) +set_ptes (vma->vm_mm, address, ptep, entry,1 ); +/* +* update_mmu_cache will unconditionally execute, handling both +* the case that the PTE changed and the spurious fault case. +*/ +return true; +} +#endif /* _ASM_NIOS2_PGTABLE_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 305/592 media: rcar-vin: Fix stride setting for RAW8 formats
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Söderlund <[email protected]>
[ Upstream commit e7376745ad5c8548e31d9ea58adfb5a847e017a4 ]
Earlier versions of the datasheet where unclear about the stride setting for RAW8 capture formats. Later datasheets clarifies that the stride only process in this mode for non-image data. For image data the full stride shall be used. Compare section "RAW: 8 Bits and Embedded 8-Bit Non-Image Data, User Defined 8-bit Data" vs "RAW: 8 Bits".
Remove the special case from pixel formats that carry image data and treat it as any other image format.
--- .../media/platform/renesas/rcar-vin/rcar-dma.c | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/media/platform/renesas/rcar-vin/rcar-dma.c +0 -16
@@ -679,22 +679,6 @@ void rvin_crop_scale_comp(struct rvin_dev *vin) fmt =rvin_format_from_pixel (vin, vin->format.pixelformat); stride = vin->format.bytesperline / fmt->bpp; - -/* For RAW8 format bpp is 1, but the hardware process RAW8 -* format in 2 pixel unit hence configure VNIS_REG as stride / 2. -*/ -switch (vin->format.pixelformat) { -case V4L2_PIX_FMT_SBGGR8 : -case V4L2_PIX_FMT_SGBRG8 : -case V4L2_PIX_FMT_SGRBG8 : -case V4L2_PIX_FMT_SRGGB8 : -case V4L2_PIX_FMT_GREY : - stride /=2 ; -break ; -default : -break ; - } -rvin_write (vin, stride,VNIS_REG ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 306/592 drm/rockchip: vop2: Make overlay layer select register configuration take effect by vsync
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit c5996e4ab109c8bb5541453b20647eaaf9350f41 ]
Because the layer/window enable/disable is take effect by vsync, if the overlay configuration of these layers does not follow vsync and takes effect immediately instead, when multiple layers are dynamically enable/disable, inconsistent display contents may be seen on the screen.
--- drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 1 + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +1 -0
@@ -710,6 +710,7 @@ enum dst_factor_mode {#define VOP2_COLOR_KEY_MASK BIT(31) +#define RK3568_OVL_CTRL__LAYERSEL_REGDONE_SEL GENMASK(31, 30)#define RK3568_OVL_CTRL__LAYERSEL_REGDONE_IMD BIT(28)#define RK3568_OVL_CTRL__YUV_MODE (vp) BIT(vp)
drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +4 -1
@@ -2070,7 +2070,10 @@ static void rk3568_vop2_setup_layer_mixer(struct vop2_video_port *vp)struct rockchip_crtc_state *vcstate =to_rockchip_crtc_state (vp->crtc.state); ovl_ctrl =vop2_readl (vop2,RK3568_OVL_CTRL ); - ovl_ctrl |=RK3568_OVL_CTRL__LAYERSEL_REGDONE_IMD ; + ovl_ctrl &= ~RK3568_OVL_CTRL__LAYERSEL_REGDONE_IMD ; + ovl_ctrl &= ~RK3568_OVL_CTRL__LAYERSEL_REGDONE_SEL ; + ovl_ctrl |=FIELD_PREP (RK3568_OVL_CTRL__LAYERSEL_REGDONE_SEL , vp->id); +if (vcstate->yuv_overlay) ovl_ctrl |=RK3568_OVL_CTRL__YUV_MODE (vp->id);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 307/592 drm/amdgpu: Add indirect L1_TLB_CNTL reg programming for VFs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Skvortsov <[email protected]>
[ Upstream commit 0c6e39ce6da20104900b11bad64464a12fb47320 ]
VFs on some IP versions are unable to access this register directly.
This register must be programmed before PSP ring is setup, so use PSP VF mailbox directly. PSP will broadcast the register value to all VF assigned instances.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 12 +++- drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 9 +-- drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 63 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 20 +++++++ 5 files changed, 93 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +10 -0
@@ -107,6 +107,7 @@ enum psp_reg_prog_id {PSP_REG_IH_RB_CNTL =0 ,/* register IH_RB_CNTL */ PSP_REG_IH_RB_CNTL_RING1 =1 ,/* register IH_RB_CNTL_RING1 */ PSP_REG_IH_RB_CNTL_RING2 =2 ,/* register IH_RB_CNTL_RING2 */ +PSP_REG_MMHUB_L1_TLB_CNTL =25 , PSP_REG_LAST };
@@ -142,6 +143,8 @@ struct psp_funcs {bool (*get_ras_capability)(struct psp_context *psp);bool (*is_aux_sos_load_required)(struct psp_context *psp);bool (*is_reload_needed)(struct psp_context *psp); +int (*reg_program_no_ring)(struct psp_context *psp,uint32_t val, +enum psp_reg_prog_id id); };struct ta_funcs {
@@ -475,6 +478,10 @@ struct amdgpu_psp_funcs {#define psp_is_aux_sos_load_required (psp) \ ((psp)->funcs->is_aux_sos_load_required ? (psp)->funcs->is_aux_sos_load_required((psp)) : 0) +#define psp_reg_program_no_ring (psp, val, id) \ + ((psp)->funcs->reg_program_no_ring ? \ + (psp)->funcs->reg_program_no_ring((psp), val, id) : -EINVAL) +extern const struct amd_ip_funcs psp_ip_funcs;extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;
@@ -569,5 +576,8 @@ bool amdgpu_psp_get_ras_capability(struct psp_context *psp);int psp_config_sq_perfmon (struct psp_context *psp,uint32_t xcp_id,bool core_override_enable,bool reg_override_enable,bool perfmon_override_enable);bool amdgpu_psp_tos_reload_needed (struct amdgpu_device *adev); +int amdgpu_psp_reg_program_no_ring (struct psp_context *psp,uint32_t val, +enum psp_reg_prog_id id); +#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +9 -3
@@ -146,11 +146,13 @@ enum AMDGIM_FEATURE_FLAG {enum AMDGIM_REG_ACCESS_FLAG {/* Use PSP to program IH_RB_CNTL */ -AMDGIM_FEATURE_IH_REG_PSP_EN = (1 <<0 ), +AMDGIM_FEATURE_IH_REG_PSP_EN = (1 <<0 ),/* Use RLC to program MMHUB regs */ -AMDGIM_FEATURE_MMHUB_REG_RLC_EN = (1 <<1 ), +AMDGIM_FEATURE_MMHUB_REG_RLC_EN = (1 <<1 ),/* Use RLC to program GC regs */ -AMDGIM_FEATURE_GC_REG_RLC_EN = (1 <<2 ), +AMDGIM_FEATURE_GC_REG_RLC_EN = (1 <<2 ), +/* Use PSP to program L1_TLB_CNTL*/ +AMDGIM_FEATURE_L1_TLB_CNTL_PSP_EN = (1 <<3 ), };struct amdgim_pf2vf_info_v1 {
@@ -330,6 +332,10 @@ struct amdgpu_video_codec_info; (amdgpu_sriov_vf ((adev)) && \ ((adev)->virt.reg_access & (AMDGIM_FEATURE_GC_REG_RLC_EN))) +#define amdgpu_sriov_reg_indirect_l1_tlb_cntl (adev) \ +(amdgpu_sriov_vf((adev)) && \ + ((adev)->virt.reg_access & (AMDGIM_FEATURE_L1_TLB_CNTL_PSP_EN))) +#define amdgpu_sriov_rlcg_error_report_enabled (adev) \ (amdgpu_sriov_reg_indirect_mmhub(adev) || amdgpu_sriov_reg_indirect_gc(adev))
drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h +5 -4
@@ -109,10 +109,11 @@ union amd_sriov_msg_feature_flags {union amd_sriov_reg_access_flags {struct { -uint32_t vf_reg_access_ih :1 ; -uint32_t vf_reg_access_mmhub :1 ; -uint32_t vf_reg_access_gc :1 ; -uint32_t reserved :29 ; +uint32_t vf_reg_access_ih :1 ; +uint32_t vf_reg_access_mmhub :1 ; +uint32_t vf_reg_access_gc :1 ; +uint32_t vf_reg_access_l1_tlb_cntl :1 ; +uint32_t reserved :28 ; } flags;uint32_t all; };
drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c +49 -14
99 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +20 -0
@@ -858,6 +858,25 @@ static bool psp_v13_0_is_reload_needed(struct psp_context *psp)return false; } +static int psp_v13_0_reg_program_no_ring (struct psp_context *psp,uint32_t val, +enum psp_reg_prog_id id) +{ +struct amdgpu_device *adev = psp->adev; +int ret = -EOPNOTSUPP ; + +/* PSP will broadcast the value to all instances */ +if (amdgpu_sriov_vf (adev)) { +WREG32_SOC15 (MP0 ,0 , regMP0_SMN_C2PMSG_101,GFX_CTRL_CMD_ID_GBR_IH_SET ); +WREG32_SOC15 (MP0 ,0 , regMP0_SMN_C2PMSG_102, id); +WREG32_SOC15 (MP0 ,0 , regMP0_SMN_C2PMSG_103, val); + + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), +0x80000000 ,0x80000000 , false); + } + +return ret; +} +static const struct psp_funcs psp_v13_0_funcs = { .init_microcode = psp_v13_0_init_microcode, .wait_for_bootloader = psp_v13_0_wait_for_bootloader_steady_state,
@@ -884,6 +903,7 @@ static const struct psp_funcs psp_v13_0_funcs = { .get_ras_capability = psp_v13_0_get_ras_capability, .is_aux_sos_load_required = psp_v13_0_is_aux_sos_load_required, .is_reload_needed = psp_v13_0_is_reload_needed, + .reg_program_no_ring = psp_v13_0_reg_program_no_ring, };void psp_v13_0_set_psp_funcs (struct psp_context *psp)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 308/592 drm/xe/uc: Remove static from loop variable
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit 75584c8213d341ddd5b7c72abf822e62f4b3ab27 ]
The entries variable is used to loop through the array - it's supposed to be const, but not static.
--- drivers/gpu/drm/xe/xe_uc_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_uc_fw.c +1 -1
@@ -222,8 +222,8 @@ uc_fw_auto_select(struct xe_device *xe, struct xe_uc_fw *uc_fw) [XE_UC_FW_TYPE_HUC] = { entries_huc, ARRAY_SIZE(entries_huc) }, [XE_UC_FW_TYPE_GSC] = { entries_gsc, ARRAY_SIZE(entries_gsc) }, }; -static const struct uc_fw_entry *entries;enum xe_platform p = xe->info.platform; +const struct uc_fw_entry *entries;u32 count;int i;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 309/592 media: qcom: venus: Fix uninitialized variable warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nas Chung <[email protected]>
[ Upstream commit 8e172e38a623ce284baf2514f963b29e4d47c62e ]
Avoid uninitialized variable when both V4L2_TYPE_IS_OUTPUT() and V4L2_TYPE_IS_CAPTURE() return false.
--- drivers/media/platform/qcom/venus/vdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/vdec.c +2 -2
@@ -154,14 +154,14 @@ find_format_by_index(struct venus_inst *inst, unsigned int index, u32 type)return NULL ;for (i =0 ; i < size; i++) { -bool valid; +bool valid = false;if (fmt[i].type != type)continue ;if (V4L2_TYPE_IS_OUTPUT (type)) { valid =venus_helper_check_codec (inst, fmt[i].pixfmt); - }else if (V4L2_TYPE_IS_CAPTURE (type)) { + }else { valid =venus_helper_check_format (inst, fmt[i].pixfmt); if (fmt[i].pixfmt == V4L2_PIX_FMT_QC10C &&
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 310/592 drm/panel: simple: Add POWERTIP PH128800T004-ZZA01 panel entry
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antonin Godard <[email protected]>
[ Upstream commit 6374a1005f20c1c2f7bbcc1bc735c2be4910a685 ]
Add support for the POWERTIP PH128800T004-ZZA01 10.1" (1280x800) LCD-TFT panel. Its panel description is very much like the POWERTIP PH128800T006-ZHC01 configured below this one, only its timings are different.
--- drivers/gpu/drm/panel/panel-simple.c | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/panel/panel-simple.c +29 -0
@@ -3798,6 +3798,32 @@ static const struct panel_desc pda_91_00156_a0 = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, }; +static const struct drm_display_mode powertip_ph128800t004_zza01_mode = { + .clock =71150 , + .hdisplay =1280 , + .hsync_start =1280 +48 , + .hsync_end =1280 +48 +32 , + .htotal =1280 +48 +32 +80 , + .vdisplay =800 , + .vsync_start =800 +9 , + .vsync_end =800 +9 +8 , + .vtotal =800 +9 +8 +6 , + .flags =DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC , +}; + +static const struct panel_desc powertip_ph128800t004_zza01 = { + .modes = &powertip_ph128800t004_zza01_mode, + .num_modes =1 , + .bpc =8 , + .size = { + .width =216 , + .height =135 , + }, + .bus_format =MEDIA_BUS_FMT_RGB888_1X7X4_SPWG , + .bus_flags =DRM_BUS_FLAG_DE_HIGH , + .connector_type =DRM_MODE_CONNECTOR_LVDS , +}; +static const struct drm_display_mode powertip_ph128800t006_zhc01_mode = { .clock =66500 , .hdisplay =1280 ,
@@ -5155,6 +5181,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "pda,91-00156-a0", .data = &pda_91_00156_a0, + }, { + .compatible = "powertip,ph128800t004-zza01", + .data = &powertip_ph128800t004_zza01, }, { .compatible = "powertip,ph128800t006-zhc01", .data = &powertip_ph128800t006_zhc01,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 311/592 net: macb: Check return value of dma_set_mask_and_coherent()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergio Perez Gonzalez <[email protected]>
[ Upstream commit 3920a758800762917177a6b5ab39707d8e376fe6 ]
Issue flagged by coverity. Add a safety check for the return value of dma_set_mask_and_coherent, go to a safe exit if it returns error.
--- drivers/net/ethernet/cadence/macb_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +5 -1
@@ -5283,7 +5283,11 @@ static int macb_probe(struct platform_device *pdev)#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT if (GEM_BFEXT (DAW64 ,gem_readl (bp,DCFG6 ))) { -dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (44 )); + err =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (44 )); +if (err) { +dev_err (&pdev->dev,"failed to set DMA mask\n" ); + goto err_out_free_netdev; + } bp->hw_dma_cap |=HW_DMA_CAP_64B ; }#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 312/592 net: lan743x: Modify the EEPROM and OTP size for PCI1xxxx devices
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rengarajan S <[email protected]>
[ Upstream commit 3b9935586a9b54d2da27901b830d3cf46ad66a1e ]
Maximum OTP and EEPROM size for hearthstone PCI1xxxx devices are 8 Kb and 64 Kb respectively. Adjust max size definitions and return correct EEPROM length based on device. Also prevent out-of-bound read/write.
--- .../net/ethernet/microchip/lan743x_ethtool.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/net/ethernet/microchip/lan743x_ethtool.c +16 -2
@@ -18,6 +18,8 @@#define EEPROM_MAC_OFFSET (0x01)#define MAX_EEPROM_SIZE (512)#define MAX_OTP_SIZE (1024) +#define MAX_HS_OTP_SIZE (8 * 1024) +#define MAX_HS_EEPROM_SIZE (64 * 1024)#define OTP_INDICATOR_1 (0xF3)#define OTP_INDICATOR_2 (0xF7)
@@ -272,6 +274,9 @@ static int lan743x_hs_otp_read(struct lan743x_adapter *adapter, u32 offset,int ret;int i; +if (offset + length >MAX_HS_OTP_SIZE ) +return -EINVAL ; + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT );if (ret <0 )return ret;
@@ -320,6 +325,9 @@ static int lan743x_hs_otp_write(struct lan743x_adapter *adapter, u32 offset,int ret;int i; +if (offset + length >MAX_HS_OTP_SIZE ) +return -EINVAL ; + ret =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT );if (ret <0 )return ret;
@@ -497,6 +505,9 @@ static int lan743x_hs_eeprom_read(struct lan743x_adapter *adapter,u32 val;int i; +if (offset + length >MAX_HS_EEPROM_SIZE ) +return -EINVAL ; + retval =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT );if (retval <0 )return retval;
@@ -539,6 +550,9 @@ static int lan743x_hs_eeprom_write(struct lan743x_adapter *adapter,u32 val;int i; +if (offset + length >MAX_HS_EEPROM_SIZE ) +return -EINVAL ; + retval =lan743x_hs_syslock_acquire (adapter,LOCK_TIMEOUT_MAX_CNT );if (retval <0 )return retval;
@@ -604,9 +618,9 @@ static int lan743x_ethtool_get_eeprom_len(struct net_device *netdev)struct lan743x_adapter *adapter =netdev_priv (netdev);if (adapter->flags &LAN743X_ADAPTER_FLAG_OTP ) -return MAX_OTP_SIZE ; +return adapter->is_pci11x1x ?MAX_HS_OTP_SIZE :MAX_OTP_SIZE ; -return MAX_EEPROM_SIZE ; +return adapter->is_pci11x1x ?MAX_HS_EEPROM_SIZE :MAX_EEPROM_SIZE ; } static int lan743x_ethtool_get_eeprom(struct net_device *netdev,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 313/592 tipc: use kfree_sensitive() for aead cleanup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
[ Upstream commit c8ef20fe7274c5766a317f9193b70bed717b6b3d ]
The tipc_aead_free() function currently uses kfree() to release the aead structure. However, this structure contains sensitive information, such as key's SALT value, which should be securely erased from memory to prevent potential leakage.
To enhance security, replace kfree() with kfree_sensitive() when freeing the aead structure. This change ensures that sensitive data is explicitly cleared before memory deallocation, aligning with the approach used in tipc_aead_init() and adhering to best practices for handling confidential information.
--- net/tipc/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/crypto.c +1 -1
@@ -425,7 +425,7 @@ static void tipc_aead_free(struct rcu_head *rp) }free_percpu (aead->tfm_entry);kfree_sensitive (aead->key); -kfree (aead); +kfree_sensitive (aead); }static int tipc_aead_users (struct tipc_aead __rcu *aead)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 314/592 f2fs: use vmalloc instead of kvmalloc in .init_{,de}compress_ctx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 70dd07c888451503c3e93b6821e10d1ea1ec9930 ]
.init_{,de}compress_ctx uses kvmalloc() to alloc memory, it will try to allocate physically continuous page first, it may cause more memory allocation pressure, let's use vmalloc instead to mitigate it.
[Test]
cd /data/local/tmp
touch filef2fs_io setflags compression filef2fs_io getflags file
for i in $(seq 1 10); do sync; echo 3 > /proc/sys/vm/drop_caches;\
time f2fs_io write 512 0 4096 zero osync file; truncate -s 0 file;\
done
[Result]
Before After Delta
21.243 21.694 -2.12%
For compression, we recommend to use ioctl to compress file data in background for workaround.
For decompression, only zstd will be affected.
--- fs/f2fs/compress.c | 23 ++++++++++------------- fs/f2fs/f2fs.h | 5 +++++ 2 files changed, 15 insertions(+), 13 deletions(-)
fs/f2fs/compress.c +10 -13
@@ -178,8 +178,7 @@ void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct folio *folio)#ifdef CONFIG_F2FS_FS_LZO static int lzo_init_compress_ctx (struct compress_ctx *cc) { - cc->private =f2fs_kvmalloc (F2FS_I_SB (cc->inode), -LZO1X_MEM_COMPRESS ,GFP_NOFS ); + cc->private =f2fs_vmalloc (LZO1X_MEM_COMPRESS );if (!cc->private)return -ENOMEM ;
@@ -189,7 +188,7 @@ static int lzo_init_compress_ctx(struct compress_ctx *cc)static void lzo_destroy_compress_ctx (struct compress_ctx *cc) { -kvfree (cc->private); +vfree (cc->private); cc->private =NULL ; }
@@ -246,7 +245,7 @@ static int lz4_init_compress_ctx(struct compress_ctx *cc) size =LZ4HC_MEM_COMPRESS ;#endif - cc->private =f2fs_kvmalloc (F2FS_I_SB (cc->inode), size,GFP_NOFS ); + cc->private =f2fs_vmalloc (size);if (!cc->private)return -ENOMEM ;
@@ -261,7 +260,7 @@ static int lz4_init_compress_ctx(struct compress_ctx *cc)static void lz4_destroy_compress_ctx (struct compress_ctx *cc) { -kvfree (cc->private); +vfree (cc->private); cc->private =NULL ; }
@@ -342,8 +341,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc) params =zstd_get_params (level, cc->rlen); workspace_size =zstd_cstream_workspace_bound (¶ms.cParams); - workspace =f2fs_kvmalloc (F2FS_I_SB (cc->inode), - workspace_size,GFP_NOFS ); + workspace =f2fs_vmalloc (workspace_size);if (!workspace)return -ENOMEM ;
@@ -351,7 +349,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)if (!stream) {f2fs_err_ratelimited (F2FS_I_SB (cc->inode),"%s zstd_init_cstream failed" , __func__); -kvfree (workspace); +vfree (workspace);return -EIO ; }
@@ -364,7 +362,7 @@ static int zstd_init_compress_ctx(struct compress_ctx *cc)static void zstd_destroy_compress_ctx (struct compress_ctx *cc) { -kvfree (cc->private); +vfree (cc->private); cc->private =NULL ; cc->private2 =NULL ; }
@@ -423,8 +421,7 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic) workspace_size =zstd_dstream_workspace_bound (max_window_size); - workspace =f2fs_kvmalloc (F2FS_I_SB (dic->inode), - workspace_size,GFP_NOFS ); + workspace =f2fs_vmalloc (workspace_size);if (!workspace)return -ENOMEM ;
@@ -432,7 +429,7 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic)if (!stream) {f2fs_err_ratelimited (F2FS_I_SB (dic->inode),"%s zstd_init_dstream failed" , __func__); -kvfree (workspace); +vfree (workspace);return -EIO ; }
@@ -444,7 +441,7 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic)static void zstd_destroy_decompress_ctx (struct decompress_io_ctx *dic) { -kvfree (dic->private); +vfree (dic->private); dic->private =NULL ; dic->private2 =NULL ; }
fs/f2fs/f2fs.h +5 -0
@@ -3527,6 +3527,11 @@ static inline void *f2fs_kvzalloc(struct f2fs_sb_info *sbi,return f2fs_kvmalloc (sbi, size, flags | __GFP_ZERO); } +static inline void *f2fs_vmalloc (size_t size) +{ +return vmalloc (size); +} +static inline int get_extra_isize (struct inode *inode) {return F2FS_I (inode)->i_extra_isize /sizeof (__le32);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 315/592 bpf: Check rcu_read_lock_trace_held() in bpf_map_lookup_percpu_elem()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit d4965578267e2e81f67c86e2608481e77e9c8569 ]
bpf_map_lookup_percpu_elem() helper is also available for sleepable bpf program. When BPF JIT is disabled or under 32-bit host, bpf_map_lookup_percpu_elem() will not be inlined. Using it in a sleepable bpf program will trigger the warning in bpf_map_lookup_percpu_elem(), because the bpf program only holds rcu_read_lock_trace lock. Therefore, add the missed check.
--- kernel/bpf/helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/helpers.c +2 -1
@@ -129,7 +129,8 @@ const struct bpf_func_proto bpf_map_peek_elem_proto = { BPF_CALL_3(bpf_map_lookup_percpu_elem, struct bpf_map *, map, void *, key, u32, cpu) { -WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_bh_held ()); +WARN_ON_ONCE (!rcu_read_lock_held () && !rcu_read_lock_trace_held () && + !rcu_read_lock_bh_held ());return (unsigned long ) map->ops->map_lookup_percpu_elem (map, key, cpu); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 316/592 Bluetooth: btusb: Add new VID/PID 13d3/3584 for MT7922
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liwei Sun <[email protected]>
[ Upstream commit 71d9d3522aec301e4a1c4eae4b5e0656fc4a7262 ]
A new variant of MT7922 wireless device has been identified. The device introduces itself as MEDIATEK MT7922, so treat it as MediaTek device.
With this patch, btusb driver works as expected:
[ 3.151162] Bluetooth: Core ver 2.22 [ 3.151185] Bluetooth: HCI device and connection manager initialized [ 3.151189] Bluetooth: HCI socket layer initialized [ 3.151191] Bluetooth: L2CAP socket layer initialized [ 3.151194] Bluetooth: SCO socket layer initialized [ 3.295718] Bluetooth: hci0: HW/SW Version: 0x008a008a, Build Time: 20241106163512 [ 4.676634] Bluetooth: BNEP (Ethernet Emulation) ver 1.3 [ 4.676637] Bluetooth: BNEP filters: protocol multicast [ 4.676640] Bluetooth: BNEP socket layer initialized [ 5.560453] Bluetooth: hci0: Device setup in 2320660 usecs [ 5.560457] Bluetooth: hci0: HCI Enhanced Setup Synchronous Connection command is advertised, but not supported. [ 5.619197] Bluetooth: hci0: AOSP extensions version v1.00 [ 5.619204] Bluetooth: hci0: AOSP quality report is supported [ 5.619301] Bluetooth: MGMT ver 1.23 [ 6.741247] Bluetooth: RFCOMM TTY layer initialized [ 6.741258] Bluetooth: RFCOMM socket layer initialized [ 6.741261] Bluetooth: RFCOMM ver 1.11
lspci output:
04:00.0 Network controller: MEDIATEK Corp. MT7922 802.11ax PCI Express Wireless Network Adapter
USB information:
T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=02 Dev#= 3 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3584 Rev= 1.00 S: Manufacturer=MediaTek Inc. S: Product=Wireless_Device S: SerialNumber=000000000 C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms I: If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us
I:* If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us
--- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btusb.c +2 -0
@@ -678,6 +678,8 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3568), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x13d3, 0x3584), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3605), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3607), .driver_info = BTUSB_MEDIATEK |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 317/592 i2c: designware: Invoke runtime suspend on quick slave re-registration
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tan En De <[email protected]>
[ Upstream commit 2fe2b969d911a09abcd6a47401a3c66c38a310e6 ]
Replaced pm_runtime_put() with pm_runtime_put_sync_suspend() to ensure the runtime suspend is invoked immediately when unregistering a slave. This prevents a race condition where suspend was skipped when unregistering and registering slave in quick succession.
For example, consider the rapid sequence ofdelete_device -> new_device -> delete_device -> new_device. In this sequence, it is observed that the dw_i2c_plat_runtime_suspend() might not be invoked after delete_device operation.
This is because after delete_device operation, when the pm_runtime_put() is about to trigger suspend, the following new_device operation might race and cancel the suspend.
If that happens, during the new_device operation, dw_i2c_plat_runtime_resume() is skipped (since there was no suspend), which means i_dev->init(), i.e. i2c_dw_init_slave(), is skipped. Since i2c_dw_init_slave() is skipped, i2c_dw_configure_fifo_slave() is skipped too, which leaves DW_IC_INTR_MASK unconfigured. If we inspect the interrupt mask register using devmem, it will show as zero.
Example shell script to reproduce the issue:
``` #!/bin/sh SLAVE_LADDR=0x1010 SLAVE_BUS=13 NEW_DEVICE=/sys/bus/i2c/devices/i2c-$SLAVE_BUS/new_device DELETE_DEVICE=/sys/bus/i2c/devices/i2c-$SLAVE_BUS/delete_device # Create initial device echo slave-24c02 $SLAVE_LADDR > $NEW_DEVICE sleep 2 # Rapid sequence of # delete_device -> new_device -> delete_device -> new_device echo $SLAVE_LADDR > $DELETE_DEVICE echo slave-24c02 $SLAVE_LADDR > $NEW_DEVICE echo $SLAVE_LADDR > $DELETE_DEVICE echo slave-24c02 $SLAVE_LADDR > $NEW_DEVICE # Using devmem to inspect IC_INTR_MASK will show as zero ```
--- drivers/i2c/busses/i2c-designware-slave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-designware-slave.c +1 -1
@@ -96,7 +96,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave)i2c_dw_disable (dev);synchronize_irq (dev->irq); dev->slave =NULL ; -pm_runtime_put (dev->dev); +pm_runtime_put_sync_suspend (dev->dev);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 318/592 wifi: mt76: mt7996: drop fragments with multicast or broadcast RA
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Lin <[email protected]>
[ Upstream commit 80fda1cd7b0a1edd0849dc71403a070d0922118d ]
IEEE 802.11 fragmentation can only be applied to unicast frames. Therefore, drop fragments with multicast or broadcast RA. This patch addresses vulnerabilities such as CVE-2020-26145.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +8 -0
@@ -647,6 +647,14 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q, status->last_amsdu = amsdu_info ==MT_RXD4_LAST_AMSDU_FRAME ; } +/* IEEE 802.11 fragmentation can only be applied to unicast frames. +* Hence, drop fragments with multicast/broadcast RA. +* This check fixes vulnerabilities, like CVE-2020-26145. +*/ +if ((ieee80211_has_morefrags (fc) || seq_ctrl &IEEE80211_SCTL_FRAG ) && +FIELD_GET (MT_RXD3_NORMAL_ADDR_TYPE , rxd3) !=MT_RXD3_NORMAL_U2M ) +return -EINVAL ; + hdr_gap = (u8 *)rxd - skb->data +2 * remove_pad;if (hdr_trans &&ieee80211_has_morefrags (fc)) {if (mt7996_reverse_frag0_hdr_trans (skb, hdr_gap))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 319/592 emulex/benet: correct command version selection in be_cmd_get_stats()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit edb888d29748cee674006a52e544925dacc7728e ]
Logic here always sets hdr->version to 2 if it is not a BE3 or Lancer chip, even if it is BE2. Use 'else if' to prevent multiple assignments, setting version 0 for BE2, version 1 for BE3 and Lancer, and version 2 for others. Fixes potential incorrect version setting when BE2_chip and BE3_chip/lancer_chip checks could both be true.
--- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/emulex/benet/be_cmds.c +1 -1
@@ -1609,7 +1609,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)/* version 1 of the cmd is not supported only by BE2 */ if (BE2_chip (adapter)) hdr->version =0 ; -if (BE3_chip (adapter) ||lancer_chip (adapter)) +else if (BE3_chip (adapter) ||lancer_chip (adapter)) hdr->version =1 ;else hdr->version =2 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 320/592 Bluetooth: btusb: Add new VID/PID 13d3/3630 for MT7925
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiande Lu <[email protected]>
[ Upstream commit 5bd5c716f7ec3e25d8d3b8a7566e192a26f9c7ce ]
Add VID 13d3 & PID 3630 for MediaTek MT7925 USB Bluetooth chip.
The information in /sys/kernel/debug/usb/devices about the Bluetooth device is listed as the below.
T: Bus=07 Lev=01 Prnt=01 Port=10 Cnt=02 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3630 Rev= 1.00 S: Manufacturer=MediaTek Inc. S: Product=Wireless_Device S: SerialNumber=000000000 C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us I: If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) E: Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us E: Ad=0a(O) Atr=03(Int.) MxPS= 512 Ivl=125us
--- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btusb.c +2 -0
@@ -720,6 +720,8 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3628), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x13d3, 0x3630), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH }, /* Additional Realtek 8723AE Bluetooth devices */ { USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 321/592 Bluetooth: btusb: Add RTL8851BE device 0x0bda:0xb850
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: WangYuli <[email protected]>
[ Upstream commit c4dbb1bdada90168dd5fa2f7e4553cb0e1dad3c8 ]
The information in /sys/kernel/debug/usb/devices about the Bluetooth device is listed as the below:
T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0bda ProdID=b850 Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -513,6 +513,7 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH },/* Realtek 8851BE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0xb850), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x13d3, 0x3600), .driver_info = BTUSB_REALTEK },/* Realtek 8852AE Bluetooth devices */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 322/592 Bluetooth: btmrvl_sdio: Fix wakeup source leaks on device unbind
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ba6535e8b494931471df9666addf0f1e5e6efa27 ]
Device can be unbound or probe can fail, so driver must also release memory for the wakeup source.
--- drivers/bluetooth/btmrvl_sdio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/btmrvl_sdio.c +3 -1
@@ -100,7 +100,9 @@ static int btmrvl_sdio_probe_of(struct device *dev, }/* Configure wakeup (enabled by default) */ -device_init_wakeup (dev, true); + ret =devm_device_init_wakeup (dev); +if (ret) +return dev_err_probe (dev, ret,"Failed to init wakeup\n" ); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 323/592 Bluetooth: btmtksdio: Fix wakeup source leaks on device unbind
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ee3e4209e66d44180a41d5ca7271361a2a28fccf ]
Device can be unbound or probe can fail, so driver must also release memory for the wakeup source.
--- drivers/bluetooth/btmtksdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/btmtksdio.c +1 -1
@@ -1414,7 +1414,7 @@ static int btmtksdio_probe(struct sdio_func *func,*/ pm_runtime_put_noidle (bdev->dev); - err =device_init_wakeup (bdev->dev, true); + err =devm_device_init_wakeup (bdev->dev);if (err)bt_dev_err (hdev,"failed to initialize device wakeup" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 324/592 wifi: mt76: mt7996: fix uninitialized symbol warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: sunliming <[email protected]>
[ Upstream commit 187de25110c8ac8d52e24f8c596ebdcbcd55bbbf ]
Fix below smatch warnings:drivers/net/wireless/mediatek/mt76/mt7996/main.c:952 mt7996_mac_sta_add_links()
error: uninitialized symbol 'err'. drivers/net/wireless/mediatek/mt76/mt7996/main.c:1133 mt7996_set_rts_threshold()
error: uninitialized symbol 'ret'.
--- drivers/net/wireless/mediatek/mt76/mt7996/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/main.c +2 -2
@@ -991,7 +991,7 @@ mt7996_mac_sta_add_links(struct mt7996_dev *dev, struct ieee80211_vif *vif, {struct mt7996_sta *msta = (struct mt7996_sta *)sta->drv_priv;unsigned int link_id; -int err; +int err =0 ;for_each_set_bit (link_id, &new_links,IEEE80211_MLD_MAX_NUM_LINKS ) {struct ieee80211_bss_conf *link_conf;
@@ -1254,7 +1254,7 @@ static void mt7996_tx(struct ieee80211_hw *hw,static int mt7996_set_rts_threshold (struct ieee80211_hw *hw,u32 val) {struct mt7996_dev *dev =mt7996_hw_dev (hw); -int i, ret; +int i, ret =0 ;mutex_lock (&dev->mt76.mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 325/592 wifi: mt76: mt76x2: Add support for LiteOn WN4516R,WN4519R
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henk Vergonet <[email protected]>
[ Upstream commit 3c0e4f606d8693795a2c965d6f4987b1bfc31097 ]
Adds support for:
- LiteOn WN4516R
- LiteOn WN4519R
Both use:
- A nonstandard USB connector
- Mediatek chipset MT7600U
- ASIC revision: 76320044
Disabled VHT support on ASIC revision 76320044:
This fixes the 5G connectibity issue on LiteOn WN4519R module see https://github.com/openwrt/mt76/issues/971
And may also fix the 5G issues on the XBox One Wireless Adapter see https://github.com/openwrt/mt76/issues/200
I have looked at the FCC info related to the MT7632U chip as mentioned in here:
https://github.com/openwrt/mt76/issues/459
These confirm the chipset does not support 'ac' mode and hence VHT should be turned of.
--- drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 2 ++ .../net/wireless/mediatek/mt76/mt76x2/usb_init.c | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +2 -0
@@ -17,6 +17,8 @@ static const struct usb_device_id mt76x2u_device_table[] = { { USB_DEVICE(0x057c, 0x8503) }, /* Avm FRITZ!WLAN AC860 */ { USB_DEVICE(0x7392, 0xb711) }, /* Edimax EW 7722 UAC */ { USB_DEVICE(0x0e8d, 0x7632) }, /* HC-M7662BU1 */ + { USB_DEVICE(0x0471, 0x2126) }, /* LiteOn WN4516R module, nonstandard USB connector */ + { USB_DEVICE(0x0471, 0x7600) }, /* LiteOn WN4519R module, nonstandard USB connector */ { USB_DEVICE(0x2c4e, 0x0103) }, /* Mercury UD13 */ { USB_DEVICE(0x0846, 0x9014) }, /* Netgear WNDA3100v3 */ { USB_DEVICE(0x0846, 0x9053) }, /* Netgear A6210 */
drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +12 -1
@@ -191,6 +191,7 @@ int mt76x2u_register_device(struct mt76x02_dev *dev) {struct ieee80211_hw *hw =mt76_hw (dev);struct mt76_usb *usb = &dev->mt76.usb; +bool vht;int err;INIT_DELAYED_WORK (&dev->cal_work, mt76x2u_phy_calibrate);
@@ -217,7 +218,17 @@ int mt76x2u_register_device(struct mt76x02_dev *dev)/* check hw sg support in order to enable AMSDU */ hw->max_tx_fragments = dev->mt76.usb.sg_en ?MT_TX_SG_MAX_SIZE :1 ; - err =mt76_register_device (&dev->mt76, true, mt76x02_rates, +switch (dev->mt76.rev) { +case 0x76320044 : +/* these ASIC revisions do not support VHT */ + vht = false; +break ; +default : + vht = true; +break ; + } + + err =mt76_register_device (&dev->mt76, vht, mt76x02_rates,ARRAY_SIZE (mt76x02_rates));if (err) goto fail;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 326/592 wifi: mt76: mt7921: add 160 MHz AP for mt7922 device
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Williams <[email protected]>
[ Upstream commit 7011faebe543f8f094fdb3281d0ec9e1eab81309 ]
This allows mt7922 in hostapd mode to transmit up to 1.4 Gbps.
--- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7921/main.c +5 -0
@@ -83,6 +83,11 @@ mt7921_init_he_caps(struct mt792x_phy *phy, enum nl80211_band band, he_cap_elem->phy_cap_info[9 ] |=IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU ; + +if (is_mt7922 (phy->mt76->dev)) { + he_cap_elem->phy_cap_info[0 ] |= +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ; + }break ;case NL80211_IFTYPE_STATION : he_cap_elem->mac_cap_info[1] |=
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 327/592 wifi: mt76: mt7925: introduce thermal protection
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Yen <[email protected]>
[ Upstream commit 1d81e893b422a6f0ae70f8648867c2e73edfb413 ]
Add thermal protection to prevent the chip from possible overheating due to prolonged high traffic and adverse operating conditions.
--- .../net/wireless/mediatek/mt76/mt7925/init.c | 6 ++++++ .../net/wireless/mediatek/mt76/mt7925/mcu.c | 20 ++++++++++++++++++- .../net/wireless/mediatek/mt76/mt7925/mcu.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7925/init.c +6 -0
@@ -322,6 +322,12 @@ static void mt7925_init_work(struct work_struct *work)return ; } + ret =mt7925_mcu_set_thermal_protect (dev); +if (ret) { +dev_err (dev->mt76.dev,"thermal protection enable failed\n" ); +return ; + } +/* we support chip reset now */ dev->hw_init_done = true;
drivers/net/wireless/mediatek/mt76/mt7925/mcu.c +19 -1
@@ -974,6 +974,23 @@ int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable) }EXPORT_SYMBOL_GPL (mt7925_mcu_set_deep_sleep); +int mt7925_mcu_set_thermal_protect (struct mt792x_dev *dev) +{ +char cmd[64 ]; +int ret =0 ; + +snprintf (cmd,sizeof (cmd),"ThermalProtGband %d %d %d %d %d %d %d %d %d %d" , +0 ,100 ,90 ,80 ,30 ,1 ,1 ,115 ,105 ,5 ); + ret =mt7925_mcu_chip_config (dev, cmd); + +snprintf (cmd,sizeof (cmd),"ThermalProtAband %d %d %d %d %d %d %d %d %d %d" , +1 ,100 ,90 ,80 ,30 ,1 ,1 ,115 ,105 ,5 ); + ret |=mt7925_mcu_chip_config (dev, cmd); + +return ret; +} +EXPORT_SYMBOL_GPL (mt7925_mcu_set_thermal_protect); +int mt7925_run_firmware (struct mt792x_dev *dev) {int err;
@@ -3306,7 +3323,8 @@ int mt7925_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,else uni_txd->option =MCU_CMD_UNI_EXT_ACK ; -if (cmd ==MCU_UNI_CMD (HIF_CTRL )) +if (cmd ==MCU_UNI_CMD (HIF_CTRL ) || + cmd ==MCU_UNI_CMD (CHIP_CONFIG )) uni_txd->option &= ~MCU_CMD_ACK ; goto exit;
drivers/net/wireless/mediatek/mt76/mt7925/mcu.h +1 -0
@@ -637,6 +637,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,int mt7925_mcu_set_timing (struct mt792x_phy *phy,struct ieee80211_bss_conf *link_conf);int mt7925_mcu_set_deep_sleep (struct mt792x_dev *dev,bool enable); +int mt7925_mcu_set_thermal_protect (struct mt792x_dev *dev);int mt7925_mcu_set_channel_domain (struct mt76_phy *phy);int mt7925_mcu_set_radio_en (struct mt792x_phy *phy,bool enable); int mt7925_mcu_set_chctx(struct mt76_phy *phy, struct mt76_vif_link *mvif,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 328/592 wifi: mac80211: validate SCAN_FLAG_AP in scan request during MLO
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit 78a7a126dc5b8e3c5a3d4da9f513e0236d2dc1a3 ]
When an AP interface is already beaconing, a subsequent scan is not allowed unless the user space explicitly sets the flag NL80211_SCAN_FLAG_AP in the scan request. If this flag is not set, the scan request will be returned with the error code -EOPNOTSUPP. However, this restriction currently applies only to non-ML interfaces. For ML interfaces, scans are allowed without this flag being explicitly set by the user space which is wrong. This is because the beaconing check currently uses only the deflink, which does not get set during MLO.
Hence to fix this, during MLO, use the existing helper ieee80211_num_beaconing_links() to know if any of the link is beaconing.
--- net/mac80211/cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/cfg.c +1 -1
@@ -2904,7 +2904,7 @@ static int ieee80211_scan(struct wiphy *wiphy,* the frames sent while scanning on other channel will be * lost) */ -if (sdata->deflink.u.ap.beacon && +if (ieee80211_num_beaconing_links (sdata) && (!(wiphy->features &NL80211_FEATURE_AP_SCAN ) || !(req->flags &NL80211_SCAN_FLAG_AP )))return -EOPNOTSUPP ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 329/592 sctp: Do not wake readers in __sctp_write_space()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Malat <[email protected]>
[ Upstream commit af295892a7abbf05a3c2ba7abc4d81bb448623d6 ]
Function __sctp_write_space() doesn't set poll key, which leads to ep_poll_callback() waking up all waiters, not only these waiting for the socket being writable. Set the key properly using wake_up_interruptible_poll(), which is preferred over the sync variant, as writers are not woken up before at least half of the queue is available. Also, TCP does the same.
--- net/sctp/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/socket.c +2 -1
@@ -9100,7 +9100,8 @@ static void __sctp_write_space(struct sctp_association *asoc) wq =rcu_dereference (sk->sk_wq);if (wq) {if (waitqueue_active (&wq->wait)) -wake_up_interruptible (&wq->wait); +wake_up_interruptible_poll (&wq->wait,EPOLLOUT | +EPOLLWRNORM |EPOLLWRBAND );/* Note that we try to include the Async I/O support * here by modeling from the current TCP/UDP code.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 330/592 libbpf/btf: Fix string handling to support multi-split BTF
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit 4e29128a9acec2a622734844bedee013e2901bdf ]
libbpf handling of split BTF has been written largely with the assumption that multiple splits are possible, i.e. split BTF on top of split BTF on top of base BTF. One area where this does not quite work is string handling in split BTF; the start string offset should be the base BTF string section length + the base BTF string offset. This worked in the past because for a single split BTF with base the start string offset was always 0.
--- tools/lib/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/btf.c +1 -1
@@ -996,7 +996,7 @@ static struct btf *btf_new_empty(struct btf *base_btf)if (base_btf) { btf->base_btf = base_btf; btf->start_id =btf__type_cnt (base_btf); - btf->start_str_off = base_btf->hdr->str_len; + btf->start_str_off = base_btf->hdr->str_len + base_btf->start_str_off; btf->swapped_endian = base_btf->swapped_endian; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 331/592 cpufreq: scmi: Skip SCMI devices that arent used by the CPUs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Tipton <[email protected]>
[ Upstream commit 6c9bb86922728c7a4cceb99f131e00dd87514f20 ]
Currently, all SCMI devices with performance domains attempt to register a cpufreq driver, even if their performance domains aren't used to control the CPUs. The cpufreq framework only supports registering a single driver, so only the first device will succeed. And if that device isn't used for the CPUs, then cpufreq will scale the wrong domains.
To avoid this, return early from scmi_cpufreq_probe() if the probing SCMI device isn't referenced by the CPU device phandles.
This keeps the existing assumption that all CPUs are controlled by a single SCMI device.
--- drivers/cpufreq/scmi-cpufreq.c | 36 +++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)
drivers/cpufreq/scmi-cpufreq.c +35 -1
@@ -393,6 +393,40 @@ static struct cpufreq_driver scmi_cpufreq_driver = { .set_boost = cpufreq_boost_set_sw, }; +static bool scmi_dev_used_by_cpus (struct device *scmi_dev) +{ +struct device_node *scmi_np =dev_of_node (scmi_dev); +struct device_node *cpu_np, *np; +struct device *cpu_dev; +int cpu, idx; + +if (!scmi_np) +return false; + +for_each_possible_cpu (cpu) { + cpu_dev =get_cpu_device (cpu); +if (!cpu_dev) +continue ; + + cpu_np =dev_of_node (cpu_dev); + + np =of_parse_phandle (cpu_np,"clocks" ,0 ); +of_node_put (np); + +if (np == scmi_np) +return true; + + idx =of_property_match_string (cpu_np,"power-domain-names" ,"perf" ); + np =of_parse_phandle (cpu_np,"power-domains" , idx); +of_node_put (np); + +if (np == scmi_np) +return true; + } + +return false; +} +static int scmi_cpufreq_probe (struct scmi_device *sdev) {int ret;
@@ -401,7 +435,7 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev) handle = sdev->handle; -if (!handle) +if (!handle || !scmi_dev_used_by_cpus (dev))return -ENODEV ; scmi_cpufreq_driver.driver_data = sdev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 332/592 i2c: tegra: check msg length in SMBUS block read
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akhil R <[email protected]>
[ Upstream commit a6e04f05ce0b070ab39d5775580e65c7d943da0b ]
For SMBUS block read, do not continue to read if the message length passed from the device is '0' or greater than the maximum allowed bytes.
--- drivers/i2c/busses/i2c-tegra.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/i2c/busses/i2c-tegra.c +5 -0
@@ -1395,6 +1395,11 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], ret =tegra_i2c_xfer_msg (i2c_dev, &msgs[i],MSG_END_CONTINUE );if (ret)break ; + +/* Validate message length before proceeding */ +if (msgs[i].buf[0 ] ==0 || msgs[i].buf[0 ] >I2C_SMBUS_BLOCK_MAX ) +break ; +/* Set the msg length from first byte */ msgs[i].len += msgs[i].buf[0 ];dev_dbg (i2c_dev->dev,"reading %d bytes\n" , msgs[i].len);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 333/592 i2c: pasemi: Enable the unjam machine
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
[ Upstream commit 88fe3078b54c9efaea7d1adfcf295e37dfb0274f ]
The I2C bus can get stuck under some conditions (desync between controller and device). The pasemi controllers include an unjam feature that is enabled on reset, but was being disabled by the driver. Keep it enabled by explicitly setting the UJM bit in the CTL register. This should help recover the bus from certain conditions, which would otherwise remain stuck forever.
--- drivers/i2c/busses/i2c-pasemi-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-pasemi-core.c +1 -1
@@ -71,7 +71,7 @@ static inline int reg_read(struct pasemi_smbus *smbus, int reg)static void pasemi_reset (struct pasemi_smbus *smbus) { -u32 val = (CTL_MTR |CTL_MRR | (smbus->clk_div &CTL_CLK_M )); +u32 val = (CTL_MTR |CTL_MRR |CTL_UJM | (smbus->clk_div &CTL_CLK_M ));if (smbus->hw_rev >=6 ) val |=CTL_EN ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 335/592 clk: qcom: gcc-x1e80100: Set FORCE MEM CORE for UFS clocks
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit 201bf08ba9e26eeb0a96ba3fd5c026f531b31aed ]
Update the force mem core bit for UFS ICE clock and UFS PHY AXI clock to force the core on signal to remain active during halt state of the clk. If force mem core bit of the clock is not set, the memories of the subsystem will not retain the logic across power states. This is required for the MCQ feature of UFS.
--- drivers/clk/qcom/gcc-x1e80100.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/qcom/gcc-x1e80100.c +4 -0
@@ -6753,6 +6753,10 @@ static int gcc_x1e80100_probe(struct platform_device *pdev)/* Clear GDSC_SLEEP_ENA_VOTE to stop votes being auto-removed in sleep. */ regmap_write (regmap,0x52224 ,0x0 ); +/* FORCE_MEM_CORE_ON for ufs phy ice core and gcc ufs phy axi clocks */ +qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_ice_core_clk, true); +qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_axi_clk, true); +return qcom_cc_really_probe (&pdev->dev, &gcc_x1e80100_desc, regmap); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 336/592 clk: qcom: gcc: Set FORCE_MEM_CORE_ON for gcc_ufs_axi_clk for 8650/8750
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taniya Das <[email protected]>
[ Upstream commit da94a81ea6c6f1cd2f389c5631e33c145ac7b35b ]
Update the force mem core bit for UFS AXI clock to force the core on signal to remain active during halt state of the clk. If force mem core bit of the clock is not set, the memories of the subsystem will not retain the logic across power states. This is required for the MCQ feature of the UFS driver.
--- drivers/clk/qcom/gcc-sm8650.c | 2 ++ drivers/clk/qcom/gcc-sm8750.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/gcc-sm8650.c +2 -0
@@ -3817,7 +3817,9 @@ static int gcc_sm8650_probe(struct platform_device *pdev)qcom_branch_set_clk_en (regmap,0x32004 );/* GCC_VIDEO_AHB_CLK */ qcom_branch_set_clk_en (regmap,0x32030 );/* GCC_VIDEO_XO_CLK */ +/* FORCE_MEM_CORE_ON for ufs phy ice core and gcc ufs phy axi clocks */ qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_ice_core_clk, true); +qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_axi_clk, true);/* Clear GDSC_SLEEP_ENA_VOTE to stop votes being auto-removed in sleep. */ regmap_write (regmap,0x52150 ,0x0 );
drivers/clk/qcom/gcc-sm8750.c +2 -1
@@ -3244,8 +3244,9 @@ static int gcc_sm8750_probe(struct platform_device *pdev)regmap_update_bits (regmap,0x52010 ,BIT (20 ),BIT (20 ));regmap_update_bits (regmap,0x52010 ,BIT (21 ),BIT (21 )); -/* FORCE_MEM_CORE_ON for ufs phy ice core clocks */ +/* FORCE_MEM_CORE_ON for ufs phy ice core and gcc ufs phy axi clocks */ qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_ice_core_clk, true); +qcom_branch_set_force_mem_core (regmap, gcc_ufs_phy_axi_clk, true);return qcom_cc_really_probe (&pdev->dev, &gcc_sm8750_desc, regmap); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 337/592 net: dlink: add synchronization for stats update
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moon Yeounsu <[email protected]>
[ Upstream commit 12889ce926e9a9baf6b83d809ba316af539b89e2 ]
This patch synchronizes code that accesses from both user-space and IRQ contexts. The get_stats() function can be called from both context.
dev->stats.tx_errors and dev->stats.collisions are also updated in the tx_errors() function. Therefore, these fields must also be protected by synchronized.
There is no code that accessses dev->stats.tx_errors between the previous and updated lines, so the updating point can be moved.
--- drivers/net/ethernet/dlink/dl2k.c | 14 +++++++++++++- drivers/net/ethernet/dlink/dl2k.h | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/net/ethernet/dlink/dl2k.c +13 -1
@@ -146,6 +146,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) np->ioaddr = ioaddr; np->chip_id = chip_idx; np->pdev = pdev; + +spin_lock_init (&np->stats_lock);spin_lock_init (&np->tx_lock);spin_lock_init (&np->rx_lock);
@@ -865,7 +867,6 @@ tx_error (struct net_device *dev, int tx_status) frame_id = (tx_status &0xffff0000 );printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n" , dev->name, tx_status, frame_id); - dev->stats.tx_errors++;/* Ttransmit Underrun */ if (tx_status &0x10 ) { dev->stats.tx_fifo_errors++;
@@ -902,9 +903,15 @@ tx_error (struct net_device *dev, int tx_status)rio_set_led_mode (dev);/* Let TxStartThresh stay default value */ } + +spin_lock (&np->stats_lock);/* Maximum Collisions */ if (tx_status &0x08 ) dev->stats.collisions++; + + dev->stats.tx_errors++; +spin_unlock (&np->stats_lock); +/* Restart the Tx */ dw32 (MACCtrl,dr16 (MACCtrl) | TxEnable); }
@@ -1073,7 +1080,9 @@ get_stats (struct net_device *dev)int i;#endif unsigned int stat_reg; +unsigned long flags; +spin_lock_irqsave (&np->stats_lock, flags);/* All statistics registers need to be acknowledged, else statistic overflow could cause problems */
@@ -1123,6 +1132,9 @@ get_stats (struct net_device *dev)dr16 (TCPCheckSumErrors);dr16 (UDPCheckSumErrors);dr16 (IPCheckSumErrors); + +spin_unlock_irqrestore (&np->stats_lock, flags); +return &dev->stats; }
drivers/net/ethernet/dlink/dl2k.h +2 -0
@@ -372,6 +372,8 @@ struct netdev_private {struct pci_dev *pdev;void __iomem *ioaddr;void __iomem *eeprom_addr; +// To ensure synchronization when stats are updated. +spinlock_t stats_lock;spinlock_t tx_lock;spinlock_t rx_lock;unsigned int rx_buf_sz;/* Based on MTU+slack. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 338/592 net: phy: mediatek: do not require syscon compatible for pio property
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Wunderlich <[email protected]>
[ Upstream commit 15d7b3dfafa98270eade6c77d2336790dde0a40d ]
Current implementation requires syscon compatible for pio property which is used for driving the switch leds on mt7988.
Replace syscon_regmap_lookup_by_phandle with of_parse_phandle and device_node_to_regmap to get the regmap already assigned by pinctrl driver.
--- drivers/net/phy/mediatek/mtk-ge-soc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/phy/mediatek/mtk-ge-soc.c +9 -1
@@ -7,6 +7,7 @@#include <linux/pinctrl/consumer.h> #include <linux/phy.h> #include <linux/regmap.h> +#include <linux/of.h> #include "../phylib.h" #include "mtk.h"
@@ -1319,6 +1320,7 @@ static int mt7988_phy_probe_shared(struct phy_device *phydev) {struct device_node *np =dev_of_node (&phydev->mdio.bus->dev);struct mtk_socphy_shared *shared =phy_package_get_priv (phydev); +struct device_node *pio_np;struct regmap *regmap;u32 reg;int ret;
@@ -1336,7 +1338,13 @@ static int mt7988_phy_probe_shared(struct phy_device *phydev)* The 4 bits in TPBANK0 are kept as package shared data and are used to * set LED polarity for each of the LED0. */ - regmap =syscon_regmap_lookup_by_phandle (np,"mediatek,pio" ); + pio_np =of_parse_phandle (np,"mediatek,pio" ,0 ); +if (!pio_np) +return -ENODEV ; + + regmap =device_node_to_regmap (pio_np); +of_node_put (pio_np); +if (IS_ERR (regmap))return PTR_ERR (regmap);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 339/592 wifi: ath12k: fix macro definition HAL_RX_MSDU_PKT_LENGTH_GET
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kang Yang <[email protected]>
[ Upstream commit a69bbf89d751ba2d6da21d773c4e29c91c5e53c4 ]
Currently, HAL_RX_MSDU_PKT_LENGTH_GET uses u32_get_bits to obtain the MSDU length from the MSDU description.
This is not right. Because all halphy descriptions are little endian.
So use le32_get_bits for HAL_RX_MSDU_PKT_LENGTH_GET.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hal_desc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/hal_desc.h +1 -1
@@ -707,7 +707,7 @@ enum hal_rx_msdu_desc_reo_dest_ind {#define RX_MSDU_DESC_INFO0_DECAP_FORMAT GENMASK(30, 29)#define HAL_RX_MSDU_PKT_LENGTH_GET (val) \ - (u32_get_bits((val), RX_MSDU_DESC_INFO0_MSDU_LENGTH)) + (le32_get_bits((val), RX_MSDU_DESC_INFO0_MSDU_LENGTH))struct rx_msdu_desc {__le32 info0;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 340/592 wifi: ath12k: fix a possible dead lock caused by ab->base_lock
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit ef115c265a21e3c11deee7f73bd1061775a7bf20 ]
spin_lock/spin_unlock are used in ath12k_reg_chan_list_event to acquire/release ab->base_lock. For now this is safe because that function is only called in soft IRQ context.
But ath12k_reg_chan_list_event() will be called from process context in an upcoming patch, and this can result in a deadlock if ab->base_lock is acquired in process context and then soft IRQ occurs on the same CPU and tries to acquire that lock.
Fix it by using spin_lock_bh and spin_unlock_bh instead.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/wmi.c +2 -2
@@ -6019,7 +6019,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk goto fallback; } -spin_lock (&ab->base_lock); +spin_lock_bh (&ab->base_lock);if (test_bit (ATH12K_FLAG_REGISTERED , &ab->dev_flags)) {/* Once mac is registered, ar is valid and all CC events from * fw is considered to be received due to user requests
@@ -6043,7 +6043,7 @@ static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *sk ab->default_regd[pdev_idx] = regd; } ab->dfs_region = reg_info->dfs_region; -spin_unlock (&ab->base_lock); +spin_unlock_bh (&ab->base_lock); goto mem_free;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 341/592 wifi: ath11k: Fix QMI memory reuse logic
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muhammad Usama Anjum <[email protected]>
[ Upstream commit cd2e7bae92bd7e65063ab8d04721d2b711ba4cbe ]
Firmware requests 2 segments at first. The first segment is of 6799360 whose allocation fails due to dma remapping not available. The success is returned to firmware. Then firmware asks for 22 smaller segments instead of 2 big ones. Those get allocated successfully. At suspend/ hibernation time, these segments aren't freed as they will be reused by firmware after resuming.
After resuming, the firmware asks for the 2 segments again with the first segment of 6799360 size. Since chunk->vaddr is not NULL, the type and size are compared with the previous type and size to know if it can be reused or not. Unfortunately, it is detected that it cannot be reused and this first smaller segment is freed. Then we continue to allocate 6799360 size memory which fails and ath11k_qmi_free_target_mem_chunk() is called which frees the second smaller segment as well. Later success is returned to firmware which asks for 22 smaller segments again. But as we had freed 2 segments already, we'll allocate the first 2 new smaller segments again and reuse the remaining 20. Hence 20 small segments are being reused instead of 22.
Add skip logic when vaddr is set, but size/type don't match. Use the same skip and success logic as used when dma_alloc_coherent() fails. By skipping, the possibility of resume failure due to kernel failing to allocate memory for QMI can be avoided.
kernel: ath11k_pci 0000:03:00.0: failed to allocate dma memory for qmi (524288 B type 1) ath11k_pci 0000:03:00.0: failed to allocate qmi target memory: -22
Tested-on: WCN6855 WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_CE-2.52297.6
--- drivers/net/wireless/ath/ath11k/qmi.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/wireless/ath/ath11k/qmi.c +9 -0
@@ -1993,6 +1993,15 @@ static int ath11k_qmi_alloc_target_mem_chunk(struct ath11k_base *ab) chunk->prev_size == chunk->size)continue ; +if (ab->qmi.mem_seg_count <=ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT ) { +ath11k_dbg (ab,ATH11K_DBG_QMI , +"size/type mismatch (current %d %u) (prev %d %u), try later with small size\n" , + chunk->size, chunk->type, + chunk->prev_size, chunk->prev_type); + ab->qmi.target_mem_delayed = true; +return 0 ; + } +/* cannot reuse the existing chunk */ dma_free_coherent (ab->dev, chunk->prev_size, chunk->vaddr, chunk->paddr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 342/592 iommu/amd: Allow matching ACPI HID devices without matching UIDs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 51c33f333bbf7bdb6aa2a327e3a3e4bbb2591511 ]
A BIOS upgrade has changed the IVRS DTE UID for a device that no longer matches the UID in the SSDT. In this case there is only one ACPI device on the system with that _HID but the _UID mismatch.
IVRS:
```
Subtable Type : F0 [Device Entry: ACPI HID Named Device]
Device ID : 0060
Data Setting (decoded below) : 40
INITPass : 0
EIntPass : 0
NMIPass : 0
Reserved : 0
System MGMT : 0
LINT0 Pass : 1
LINT1 Pass : 0
ACPI HID : "MSFT0201"
ACPI CID : 0000000000000000
UID Format : 02
UID Length : 09
UID : "\_SB.MHSP"
```SSDT:
```
Device (MHSP)
{
Name (_ADR, Zero) // _ADR: Address
Name (_HID, "MSFT0201") // _HID: Hardware ID
Name (_UID, One) // _UID: Unique ID
```To handle this case; while enumerating ACPI devices in get_acpihid_device_id() count the number of matching ACPI devices with a matching _HID. If there is exactly one _HID match then accept it even if the UID doesn't match. Other operating systems allow this, but the current IVRS spec leaves some ambiguity whether to allow or disallow it. This should be clarified in future revisions of the spec. Output 'Firmware Bug' for this case to encourage it to be solved in the BIOS.
--- drivers/iommu/amd/iommu.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +28 -5
@@ -241,7 +241,9 @@ static inline int get_acpihid_device_id(struct device *dev, struct acpihid_map_entry **entry) {struct acpi_device *adev =ACPI_COMPANION (dev); -struct acpihid_map_entry *p; +struct acpihid_map_entry *p, *p1 =NULL ; +int hid_count =0 ; +bool fw_bug;if (!adev)return -ENODEV ;
@@ -249,12 +251,33 @@ static inline int get_acpihid_device_id(struct device *dev,list_for_each_entry (p, &acpihid_map, list) {if (acpi_dev_hid_uid_match (adev, p->hid, p->uid[0 ] ? p->uid :NULL )) { -if (entry) - *entry = p; -return p->devid; + p1 = p; + fw_bug = false; + hid_count =1 ; +break ; + } + +/* +* Count HID matches w/o UID, raise FW_BUG but allow exactly one match +*/ +if (acpi_dev_hid_match (adev, p->hid)) { + p1 = p; + hid_count++; + fw_bug = true; } } -return -EINVAL ; + +if (!p1) +return -EINVAL ; +if (fw_bug) +dev_err_once (dev,FW_BUG "No ACPI device matched UID, but %d device%s matched HID.\n" , + hid_count, hid_count >1 ?"s" :"" ); +if (hid_count >1 ) +return -EINVAL ; +if (entry) + *entry = p1; + +return p1->devid; }static inline int get_device_sbdf_id (struct device *dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 343/592 wifi: rtw89: leave idle mode when setting WEP encryption for AP mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dian-Syuan Yang <[email protected]>
[ Upstream commit d105652b33245162867ac769bea336976e67efb8 ]
Due to mac80211 triggering the hardware to enter idle mode, it fails to install WEP key causing connected station can't ping successfully. Currently, it forces the hardware to leave idle mode before driver adding WEP keys.
--- drivers/net/wireless/realtek/rtw89/cam.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/realtek/rtw89/cam.c +3 -0
@@ -6,6 +6,7 @@#include "debug.h" #include "fw.h" #include "mac.h" +#include "ps.h" static struct sk_buff * rtw89_cam_get_sec_key_cmd(struct rtw89_dev *rtwdev,
@@ -471,9 +472,11 @@ int rtw89_cam_sec_key_add(struct rtw89_dev *rtwdev,switch (key->cipher) {case WLAN_CIPHER_SUITE_WEP40 : +rtw89_leave_ips_by_hwflags (rtwdev); hw_key_type =RTW89_SEC_KEY_TYPE_WEP40 ;break ;case WLAN_CIPHER_SUITE_WEP104 : +rtw89_leave_ips_by_hwflags (rtwdev); hw_key_type =RTW89_SEC_KEY_TYPE_WEP104 ;break ;case WLAN_CIPHER_SUITE_TKIP :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 344/592 tcp: always seek for minimal rtt in tcp_rcv_rtt_update()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit b879dcb1aeeca278eacaac0b1e2425b1c7599f9f ]
tcp_rcv_rtt_update() goal is to maintain an estimation of the RTT in tp->rcv_rtt_est.rtt_us, used by tcp_rcv_space_adjust()
When TCP TS are enabled, tcp_rcv_rtt_update() is using EWMA to smooth the samples.
Change this to immediately latch the incoming value if it is lower than tp->rcv_rtt_est.rtt_us, so that tcp_rcv_space_adjust() does not overshoot tp->rcvq_space.space and sk->sk_rcvbuf.
--- net/ipv4/tcp_input.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
net/ipv4/tcp_input.c +8 -14
@@ -664,10 +664,12 @@ EXPORT_IPV6_MOD(tcp_initialize_rcv_mss);*/ static void tcp_rcv_rtt_update (struct tcp_sock *tp,u32 sample,int win_dep) { -u32 new_sample = tp->rcv_rtt_est.rtt_us; -long m = sample; +u32 new_sample, old_sample = tp->rcv_rtt_est.rtt_us; +long m = sample <<3 ; -if (new_sample !=0 ) { +if (old_sample ==0 || m < old_sample) { + new_sample = m; + }else {/* If we sample in larger samples in the non-timestamp * case, we could grossly overestimate the RTT especially * with chatty applications or bulk transfer apps which
@@ -678,17 +680,9 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep)* else with timestamps disabled convergence takes too * long. */ -if (!win_dep) { - m -= (new_sample >>3 ); - new_sample += m; - }else { - m <<=3 ; -if (m < new_sample) - new_sample = m; - } - }else { -/* No previous measure. */ - new_sample = m <<3 ; +if (win_dep) +return ; + new_sample = old_sample - (old_sample >>3 ) + sample; } tp->rcv_rtt_est.rtt_us = new_sample;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 345/592 tcp: remove zero TCP TS samples for autotuning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d59fc95be9d0fd05ed3ccc11b4a2f832bdf2ee03 ]
For TCP flows using ms RFC 7323 timestamp granularity tcp_rcv_rtt_update() can be fed with 1 ms samples, breaking TCP autotuning for data center flows with sub ms RTT.
Instead, rely on the window based samples, fed by tcp_rcv_rtt_measure()
tcp_rcvbuf_grow() for a 10 second TCP_STREAM sesssion now looks saner. We can see rcvbuf is kept at a reasonable value.
222.234976: tcp:tcp_rcvbuf_grow: time=348 rtt_us=330 copied=110592 inq=0 space=40960 ooo=0 scaling_ratio=230 rcvbuf=131072 ... 222.235276: tcp:tcp_rcvbuf_grow: time=300 rtt_us=288 copied=126976 inq=0 space=110592 ooo=0 scaling_ratio=230 rcvbuf=246187 ... 222.235569: tcp:tcp_rcvbuf_grow: time=294 rtt_us=288 copied=184320 inq=0 space=126976 ooo=0 scaling_ratio=230 rcvbuf=282659 ... 222.235833: tcp:tcp_rcvbuf_grow: time=264 rtt_us=244 copied=373760 inq=0 space=184320 ooo=0 scaling_ratio=230 rcvbuf=410312 ... 222.236142: tcp:tcp_rcvbuf_grow: time=308 rtt_us=219 copied=424960 inq=20480 space=373760 ooo=0 scaling_ratio=230 rcvbuf=832022 ... 222.236378: tcp:tcp_rcvbuf_grow: time=236 rtt_us=219 copied=692224 inq=49152 space=404480 ooo=0 scaling_ratio=230 rcvbuf=900407 ... 222.236602: tcp:tcp_rcvbuf_grow: time=225 rtt_us=219 copied=730112 inq=49152 space=643072 ooo=0 scaling_ratio=230 rcvbuf=1431534 ... 222.237050: tcp:tcp_rcvbuf_grow: time=229 rtt_us=219 copied=1160192 inq=49152 space=680960 ooo=0 scaling_ratio=230 rcvbuf=1515876 ... 222.237618: tcp:tcp_rcvbuf_grow: time=305 rtt_us=218 copied=2228224 inq=49152 space=1111040 ooo=0 scaling_ratio=230 rcvbuf=2473271 ... 222.238591: tcp:tcp_rcvbuf_grow: time=224 rtt_us=218 copied=3063808 inq=360448 space=2179072 ooo=0 scaling_ratio=230 rcvbuf=4850803 ... 222.240647: tcp:tcp_rcvbuf_grow: time=260 rtt_us=218 copied=2752512 inq=0 space=2703360 ooo=0 scaling_ratio=230 rcvbuf=6017914 ... 222.243535: tcp:tcp_rcvbuf_grow: time=224 rtt_us=218 copied=2834432 inq=49152 space=2752512 ooo=0 scaling_ratio=230 rcvbuf=6127331 ... 222.245108: tcp:tcp_rcvbuf_grow: time=240 rtt_us=218 copied=2883584 inq=49152 space=2785280 ooo=0 scaling_ratio=230 rcvbuf=6200275 ... 222.245333: tcp:tcp_rcvbuf_grow: time=224 rtt_us=218 copied=2859008 inq=0 space=2834432 ooo=0 scaling_ratio=230 rcvbuf=6309692 ... 222.301021: tcp:tcp_rcvbuf_grow: time=222 rtt_us=218 copied=2883584 inq=0 space=2859008 ooo=0 scaling_ratio=230 rcvbuf=6364400 ... 222.989242: tcp:tcp_rcvbuf_grow: time=225 rtt_us=218 copied=2899968 inq=0 space=2883584 ooo=0 scaling_ratio=230 rcvbuf=6419108 ... 224.139553: tcp:tcp_rcvbuf_grow: time=224 rtt_us=218 copied=3014656 inq=65536 space=2899968 ooo=0 scaling_ratio=230 rcvbuf=6455580 ... 224.584608: tcp:tcp_rcvbuf_grow: time=232 rtt_us=218 copied=3014656 inq=49152 space=2949120 ooo=0 scaling_ratio=230 rcvbuf=6564997 ... 230.145560: tcp:tcp_rcvbuf_grow: time=223 rtt_us=218 copied=2981888 inq=0 space=2965504 ooo=0 scaling_ratio=230 rcvbuf=6601469 ...
--- net/ipv4/tcp_input.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/ipv4/tcp_input.c +5 -5
@@ -706,7 +706,7 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp) tp->rcv_rtt_est.time = tp->tcp_mstamp; } -static s32 tcp_rtt_tsopt_us (const struct tcp_sock *tp) +static s32 tcp_rtt_tsopt_us (const struct tcp_sock *tp,u32 min_delta) {u32 delta, delta_us;
@@ -716,7 +716,7 @@ static s32 tcp_rtt_tsopt_us(const struct tcp_sock *tp)if (likely (delta <INT_MAX / (USEC_PER_SEC /TCP_TS_HZ ))) {if (!delta) - delta =1 ; + delta = min_delta; delta_us = delta * (USEC_PER_SEC /TCP_TS_HZ );return delta_us; }
@@ -734,9 +734,9 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,if (TCP_SKB_CB (skb)->end_seq -TCP_SKB_CB (skb)->seq >=inet_csk (sk)->icsk_ack.rcv_mss) { -s32 delta =tcp_rtt_tsopt_us (tp); +s32 delta =tcp_rtt_tsopt_us (tp,0 ); -if (delta >=0 ) +if (delta >0 )tcp_rcv_rtt_update (tp, delta,0 ); } }
@@ -3220,7 +3220,7 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag,*/ if (seq_rtt_us <0 && tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr && flag &FLAG_ACKED ) - seq_rtt_us = ca_rtt_us =tcp_rtt_tsopt_us (tp); + seq_rtt_us = ca_rtt_us =tcp_rtt_tsopt_us (tp,1 ); rs->rtt_us = ca_rtt_us;/* RTT of last (S)ACKed packet (or -1) */ if (seq_rtt_us <0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 346/592 tcp: fix initial tp->rcvq_space.space value for passive TS enabled flows
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit cd171461b90a2d2cf230943df60d580174633718 ]
tcp_rcv_state_process() must tweak tp->advmss for TS enabled flows before the call to tcp_init_transfer() / tcp_init_buffer_space().
Otherwise tp->rcvq_space.space is off by 120 bytes (TCP_INIT_CWND * TCPOLEN_TSTAMP_ALIGNED).
--- net/ipv4/tcp_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +3 -3
@@ -6867,6 +6867,9 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb)if (!tp->srtt_us)tcp_synack_rtt_meas (sk, req); +if (tp->rx_opt.tstamp_ok) + tp->advmss -=TCPOLEN_TSTAMP_ALIGNED ; +if (req) {tcp_rcv_synrecv_state_fastopen (sk); }else {
@@ -6892,9 +6895,6 @@ tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) tp->snd_wnd =ntohs (th->window) << tp->rx_opt.snd_wscale;tcp_init_wl (tp,TCP_SKB_CB (skb)->seq); -if (tp->rx_opt.tstamp_ok) - tp->advmss -=TCPOLEN_TSTAMP_ALIGNED ; -if (!inet_csk (sk)->icsk_ca_ops->cong_control)tcp_update_pacing_rate (sk);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 347/592 tcp: add receive queue awareness in tcp_rcv_space_adjust()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ea33537d82921e71f852ea2ed985acc562125efe ]
If the application can not drain fast enough a TCP socket queue, tcp_rcv_space_adjust() can overestimate tp->rcvq_space.space.
Then sk->sk_rcvbuf can grow and hit tcp_rmem[2] for no good reason.
Fix this by taking into acount the number of available bytes.
Keeping sk->sk_rcvbuf at the right size allows better cache efficiency.
--- include/linux/tcp.h | 2 +- net/ipv4/tcp_input.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
include/linux/tcp.h +1 -1
@@ -340,7 +340,7 @@ struct tcp_sock { } rcv_rtt_est;/* Receiver queue space */ struct { -u32 space; +int space;u32 seq;u64 time; } rcvq_space;
net/ipv4/tcp_input.c +4 -2
@@ -748,8 +748,7 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk,void tcp_rcv_space_adjust (struct sock *sk) {struct tcp_sock *tp =tcp_sk (sk); -u32 copied; -int time; +int time, inq, copied;trace_tcp_rcv_space_adjust (sk);
@@ -760,6 +759,9 @@ void tcp_rcv_space_adjust(struct sock *sk)/* Number of bytes copied to user in last RTT */ copied = tp->copied_seq - tp->rcvq_space.seq; +/* Number of bytes in receive queue. */ + inq = tp->rcv_nxt - tp->copied_seq; + copied -= inq;if (copied <= tp->rcvq_space.space) goto new_measure;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 348/592 x86/sgx: Prevent attempts to reclaim poisoned pages
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Zaborowski <[email protected]>
[ Upstream commit ed16618c380c32c68c06186d0ccbb0d5e0586e59 ]
TL;DR: SGX page reclaim touches the page to copy its contents to secondary storage. SGX instructions do not gracefully handle machine checks. Despite this, the existing SGX code will try to reclaim pages that it _knows_ are poisoned. Avoid even trying to reclaim poisoned pages.
The longer story:
Pages used by an enclave only get epc_page->poison set in arch_memory_failure() but they currently stay on sgx_active_page_list until sgx_encl_release(), with the SGX_EPC_PAGE_RECLAIMER_TRACKED flag untouched.
epc_page->poison is not checked in the reclaimer logic meaning that, if other conditions are met, an attempt will be made to reclaim an EPC page that was poisoned. This is bad because 1. we don't want that page to end up added to another enclave and 2. it is likely to cause one core to shut down and the kernel to panic.
Specifically, reclaiming uses microcode operations including "EWB" which accesses the EPC page contents to encrypt and write them out to non-SGX memory. Those operations cannot handle MCEs in their accesses other than by putting the executing core into a special shutdown state (affecting both threads with HT.) The kernel will subsequently panic on the remaining cores seeing the core didn't enter MCE handler(s) in time.
Call sgx_unmark_page_reclaimable() to remove the affected EPC page from sgx_active_page_list on memory error to stop it being considered for reclaiming.
Testing epc_page->poison in sgx_reclaim_pages() would also work but I assume it's better to add code in the less likely paths.
The affected EPC page is not added to &node->sgx_poison_page_list until later in sgx_encl_release()->sgx_free_epc_page() when it is EREMOVEd. Membership on other lists doesn't change to avoid changing any of the lists' semantics except for sgx_active_page_list. There's a "TBD" comment in arch_memory_failure() about pre-emptive actions, the goal here is not to address everything that it may imply.
This also doesn't completely close the time window when a memory error notification will be fatal (for a not previously poisoned EPC page) -- the MCE can happen after sgx_reclaim_pages() has selected its candidates or even *inside* a microcode operation (actually easy to trigger due to the amount of time spent in them.)
The spinlock in sgx_unmark_page_reclaimable() is safe because memory_failure() runs in process context and no spinlocks are held, explicitly noted in a mm/memory-failure.c comment.
--- arch/x86/kernel/cpu/sgx/main.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/sgx/main.c +2 -0
@@ -719,6 +719,8 @@ int arch_memory_failure(unsigned long pfn, int flags) goto out; } +sgx_unmark_page_reclaimable (page); +/* * TBD: Add additional plumbing to enable pre-emptive * action for asynchronous poison notification. Until
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 349/592 ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 1c0829788a6e6e165846b9bedd0b908ef16260b6 ]
The statistics are incremented with raw_cpu_inc() assuming it always happens with bottom half disabled. Without per-CPU locking in local_bh_disable() on PREEMPT_RT this is no longer true.
Use this_cpu_inc() on PREEMPT_RT for the increment to not worry about preemption.
--- net/ipv4/route.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv4/route.c +4 -0
@@ -189,7 +189,11 @@ const __u8 ip_tos2prio[16] = {EXPORT_SYMBOL (ip_tos2prio); static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); +#ifndef CONFIG_PREEMPT_RT #define RT_CACHE_STAT_INC (field) raw_cpu_inc(rt_cache_stat.field) +#else +#define RT_CACHE_STAT_INC (field) this_cpu_inc(rt_cache_stat.field) +#endif #ifdef CONFIG_PROC_FS static void *rt_cache_seq_start (struct seq_file *seq,loff_t *pos)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 350/592 net: page_pool: Dont recycle into cache on PREEMPT_RT
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 32471b2f481dea8624f27669d36ffd131d24b732 ]
With preemptible softirq and no per-CPU locking in local_bh_disable() on PREEMPT_RT the consumer can be preempted while a skb is returned.
Avoid the race by disabling the recycle into the cache on PREEMPT_RT.
--- net/core/page_pool.c | 4 ++++ 1 file changed, 4 insertions(+)
net/core/page_pool.c +4 -0
@@ -836,6 +836,10 @@ static bool page_pool_napi_local(const struct page_pool *pool)const struct napi_struct *napi;u32 cpuid; +/* On PREEMPT_RT the softirq can be preempted by the consumer */ +if (IS_ENABLED (CONFIG_PREEMPT_RT )) +return false; +if (unlikely (!in_softirq ()))return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 351/592 xfrm: validate assignment of maximal possible SEQ number
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit e86212b6b13a20c5ad404c5597933f57fd0f1519 ]
Users can set any seq/seq_hi/oseq/oseq_hi values. The XFRM core code doesn't prevent from them to set even 0xFFFFFFFF, however this value will cause for traffic drop.
Is is happening because SEQ numbers here mean that packet with such number was processed and next number should be sent on the wire. In this case, the next number will be 0, and it means overflow which causes to (expected) packet drops.
While it can be considered as misconfiguration and handled by XFRM datapath in the same manner as any other SEQ number, let's add validation to easy for packet offloads implementations which need to configure HW with next SEQ to send and not with current SEQ like it is done in core code.
--- net/xfrm/xfrm_user.c | 52 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 10 deletions(-)
net/xfrm/xfrm_user.c +42 -10
@@ -178,11 +178,27 @@ static inline int verify_replay(struct xfrm_usersa_info *p, "Replay seq and seq_hi should be 0 for output SA");return -EINVAL ; } -if (rs->oseq_hi && !(p->flags &XFRM_STATE_ESN )) { -NL_SET_ERR_MSG ( - extack, -"Replay oseq_hi should be 0 in non-ESN mode for output SA" ); -return -EINVAL ; + +if (!(p->flags &XFRM_STATE_ESN )) { +if (rs->oseq_hi) { +NL_SET_ERR_MSG ( + extack, +"Replay oseq_hi should be 0 in non-ESN mode for output SA" ); +return -EINVAL ; + } +if (rs->oseq ==U32_MAX ) { +NL_SET_ERR_MSG ( + extack, +"Replay oseq should be less than 0xFFFFFFFF in non-ESN mode for output SA" ); +return -EINVAL ; + } + }else { +if (rs->oseq ==U32_MAX && rs->oseq_hi ==U32_MAX ) { +NL_SET_ERR_MSG ( + extack, +"Replay oseq and oseq_hi should be less than 0xFFFFFFFF for output SA" ); +return -EINVAL ; + } }if (rs->bmp_len) {NL_SET_ERR_MSG (extack,"Replay bmp_len should 0 for output SA" );
@@ -196,11 +212,27 @@ static inline int verify_replay(struct xfrm_usersa_info *p, "Replay oseq and oseq_hi should be 0 for input SA");return -EINVAL ; } -if (rs->seq_hi && !(p->flags &XFRM_STATE_ESN )) { -NL_SET_ERR_MSG ( - extack, -"Replay seq_hi should be 0 in non-ESN mode for input SA" ); -return -EINVAL ; +if (!(p->flags &XFRM_STATE_ESN )) { +if (rs->seq_hi) { +NL_SET_ERR_MSG ( + extack, +"Replay seq_hi should be 0 in non-ESN mode for input SA" ); +return -EINVAL ; + } + +if (rs->seq ==U32_MAX ) { +NL_SET_ERR_MSG ( + extack, +"Replay seq should be less than 0xFFFFFFFF in non-ESN mode for input SA" ); +return -EINVAL ; + } + }else { +if (rs->seq ==U32_MAX && rs->seq_hi ==U32_MAX ) { +NL_SET_ERR_MSG ( + extack, +"Replay seq and seq_hi should be less than 0xFFFFFFFF for input SA" ); +return -EINVAL ; + } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 352/592 net: phy: marvell-88q2xxx: Enable temperature measurement in probe again
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dimitri Fedrau <[email protected]>
[ Upstream commit 10465365f3b094ba9a9795f212d13dee594bcfe7 ]
Enabling of the temperature sensor was moved from mv88q2xxx_hwmon_probe to mv88q222x_config_init with the consequence that the sensor is only usable when the PHY is configured. Enable the sensor in mv88q2xxx_hwmon_probe as well to fix this.
--- drivers/net/phy/marvell-88q2xxx.c | 103 +++++++++++++++++------------- 1 file changed, 57 insertions(+), 46 deletions(-)
drivers/net/phy/marvell-88q2xxx.c +57 -46
@@ -119,7 +119,6 @@#define MV88Q2XXX_LED_INDEX_GPIO 1struct mv88q2xxx_priv { -bool enable_temp;bool enable_led0; };
@@ -482,49 +481,6 @@ static int mv88q2xxx_config_aneg(struct phy_device *phydev)return phydev->drv->soft_reset (phydev); } -static int mv88q2xxx_config_init (struct phy_device *phydev) -{ -struct mv88q2xxx_priv *priv = phydev->priv; -int ret; - -/* The 88Q2XXX PHYs do have the extended ability register available, but -* register MDIO_PMA_EXTABLE where they should signalize it does not -* work according to specification. Therefore, we force it here. -*/ - phydev->pma_extable =MDIO_PMA_EXTABLE_BT1 ; - -/* Configure interrupt with default settings, output is driven low for -* active interrupt and high for inactive. -*/ -if (phy_interrupt_is_valid (phydev)) { - ret =phy_set_bits_mmd (phydev,MDIO_MMD_PCS , -MDIO_MMD_PCS_MV_GPIO_INT_CTRL , -MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS ); -if (ret <0 ) -return ret; - } - -/* Enable LED function and disable TX disable feature on LED/TX_ENABLE */ -if (priv->enable_led0) { - ret =phy_clear_bits_mmd (phydev,MDIO_MMD_PCS , -MDIO_MMD_PCS_MV_RESET_CTRL , -MDIO_MMD_PCS_MV_RESET_CTRL_TX_DISABLE ); -if (ret <0 ) -return ret; - } - -/* Enable temperature sense */ -if (priv->enable_temp) { - ret =phy_modify_mmd (phydev,MDIO_MMD_PCS , -MDIO_MMD_PCS_MV_TEMP_SENSOR2 , -MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK ,0 ); -if (ret <0 ) -return ret; - } - -return 0 ; -} -static int mv88q2xxx_get_sqi (struct phy_device *phydev) {int ret;
@@ -667,6 +623,12 @@ static int mv88q2xxx_resume(struct phy_device *phydev) }#if IS_ENABLED (CONFIG_HWMON ) +static int mv88q2xxx_enable_temp_sense (struct phy_device *phydev) +{ +return phy_modify_mmd (phydev,MDIO_MMD_PCS ,MDIO_MMD_PCS_MV_TEMP_SENSOR2 , +MDIO_MMD_PCS_MV_TEMP_SENSOR2_DIS_MASK ,0 ); +} +static const struct hwmon_channel_info *const mv88q2xxx_hwmon_info[] = {HWMON_CHANNEL_INFO (temp,HWMON_T_INPUT |HWMON_T_MAX |HWMON_T_ALARM ), NULL
@@ -762,11 +724,13 @@ static const struct hwmon_chip_info mv88q2xxx_hwmon_chip_info = {static int mv88q2xxx_hwmon_probe (struct phy_device *phydev) { -struct mv88q2xxx_priv *priv = phydev->priv;struct device *dev = &phydev->mdio.dev;struct device *hwmon; +int ret; - priv->enable_temp = true; + ret =mv88q2xxx_enable_temp_sense (phydev); +if (ret <0 ) +return ret; hwmon = devm_hwmon_device_register_with_info(dev, NULL, phydev, &mv88q2xxx_hwmon_chip_info,
@@ -776,6 +740,11 @@ static int mv88q2xxx_hwmon_probe(struct phy_device *phydev) }#else +static int mv88q2xxx_enable_temp_sense (struct phy_device *phydev) +{ +return 0 ; +} +static int mv88q2xxx_hwmon_probe (struct phy_device *phydev) {return 0 ;
@@ -853,6 +822,48 @@ static int mv88q222x_probe(struct phy_device *phydev)return mv88q2xxx_hwmon_probe (phydev); } +static int mv88q2xxx_config_init (struct phy_device *phydev) +{ +struct mv88q2xxx_priv *priv = phydev->priv; +int ret; + +/* The 88Q2XXX PHYs do have the extended ability register available, but +* register MDIO_PMA_EXTABLE where they should signalize it does not +* work according to specification. Therefore, we force it here. +*/ + phydev->pma_extable =MDIO_PMA_EXTABLE_BT1 ; + +/* Configure interrupt with default settings, output is driven low for +* active interrupt and high for inactive. +*/ +if (phy_interrupt_is_valid (phydev)) { + ret =phy_set_bits_mmd (phydev,MDIO_MMD_PCS , +MDIO_MMD_PCS_MV_GPIO_INT_CTRL , +MDIO_MMD_PCS_MV_GPIO_INT_CTRL_TRI_DIS ); +if (ret <0 ) +return ret; + } + +/* Enable LED function and disable TX disable feature on LED/TX_ENABLE */ +if (priv->enable_led0) { + ret =phy_clear_bits_mmd (phydev,MDIO_MMD_PCS , +MDIO_MMD_PCS_MV_RESET_CTRL , +MDIO_MMD_PCS_MV_RESET_CTRL_TX_DISABLE ); +if (ret <0 ) +return ret; + } + +/* Enable temperature sense again. There might have been a hard reset +* of the PHY and in this case the register content is restored to +* defaults and we need to enable it again. +*/ + ret =mv88q2xxx_enable_temp_sense (phydev); +if (ret <0 ) +return ret; + +return 0 ; +} +static int mv88q2110_config_init (struct phy_device *phydev) {int ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 353/592 net: atlantic: generate software timestamp just before the doorbell
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit 285ad7477559b6b5ceed10ba7ecfed9d17c0e7c6 ]
Make sure the call of skb_tx_timestamp is as close as possible to the doorbell.
--- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 - drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/aquantia/atlantic/aq_main.c +0 -1
@@ -123,7 +123,6 @@ static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *nd }#endif -skb_tx_timestamp (skb);return aq_nic_xmit (aq_nic, skb); }
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +2 -0
@@ -898,6 +898,8 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb) frags =aq_nic_map_skb (self, skb, ring); +skb_tx_timestamp (skb); +if (likely (frags)) { err = self->aq_hw_ops->hw_ring_tx_xmit (self->aq_hw, ring, frags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 354/592 pinctrl: armada-37xx: propagate error from armada_37xx_pmx_set_by_name()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 4229c28323db141eda69cb99427be75d3edba071 ]
The regmap_update_bits() function can fail, so propagate its error up to the stack instead of silently ignoring that.
--- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +1 -3
@@ -358,9 +358,7 @@ static int armada_37xx_pmx_set_by_name(struct pinctrl_dev *pctldev, val = grp->val[func]; -regmap_update_bits (info->regmap, reg, mask, val); - -return 0 ; +return regmap_update_bits (info->regmap, reg, mask, val); } static int armada_37xx_pmx_set(struct pinctrl_dev *pctldev,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 355/592 pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get_direction()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 6481c0a83367b0672951ccc876fbae7ee37b594b ]
The regmap_read() function can fail, so propagate its error up to the stack instead of silently ignoring that.
--- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +4 -1
@@ -400,10 +400,13 @@ static int armada_37xx_gpio_get_direction(struct gpio_chip *chip,struct armada_37xx_pinctrl *info =gpiochip_get_data (chip);unsigned int reg =OUTPUT_EN ;unsigned int val, mask; +int ret;armada_37xx_update_reg (®, &offset); mask =BIT (offset); -regmap_read (info->regmap, reg, &val); + ret =regmap_read (info->regmap, reg, &val); +if (ret) +return ret;if (val & mask)return GPIO_LINE_DIRECTION_OUT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 356/592 bpf: Pass the same orig_call value to trampoline functions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Leoshkevich <[email protected]>
[ Upstream commit 94bde253d3ae5d8a01cb958663b12daef1d06574 ]
There is currently some confusion in the s390x JIT regarding whether orig_call can be NULL and what that means. Originally the NULL value was used to distinguish the struct_ops case, but this was superseded by BPF_TRAMP_F_INDIRECT (see commit 0c970ed2f87c ("s390/bpf: Fix indirect trampoline generation").
The remaining reason to have this check is that NULL can actually be passed to the arch_bpf_trampoline_size() call - but not to the respective arch_prepare_bpf_trampoline()! call - by bpf_struct_ops_prepare_trampoline().
Remove this asymmetry by passing stub_func to both functions, so that JITs may rely on orig_call never being NULL.
--- kernel/bpf/bpf_struct_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/bpf_struct_ops.c +1 -1
@@ -601,7 +601,7 @@ int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks,if (model->ret_size >0 ) flags |=BPF_TRAMP_F_RET_FENTRY_RET ; - size =arch_bpf_trampoline_size (model, flags, tlinks,NULL ); + size =arch_bpf_trampoline_size (model, flags, tlinks, stub_func);if (size <=0 )return size ? : -EFAULT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 357/592 net: stmmac: generate software timestamp just before the doorbell
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit 33d4cc81fcd930fdbcca7ac9e8959225cbec0a5e ]
Make sure the call of skb_tx_timestamp is as close as possbile to the doorbell.
The patch also adjusts the order of setting SKBTX_IN_PROGRESS and generate software timestamp so that without SOF_TIMESTAMPING_OPT_TX_SWHW being set the software and hardware timestamps will not appear in the error queue of socket nearly at the same time (Please see __skb_tstamp_tx()).
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -5
@@ -4493,8 +4493,6 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev)if (priv->sarc_type)stmmac_set_desc_sarc (priv, first, priv->sarc_type); -skb_tx_timestamp (skb); -if (unlikely ((skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) && priv->hwts_tx_en)) {/* declare that device is doing timestamping */
@@ -4527,6 +4525,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) }netdev_tx_sent_queue (netdev_get_tx_queue (dev, queue), skb->len); +skb_tx_timestamp (skb);stmmac_flush_tx_descriptors (priv, queue);stmmac_tx_timer_arm (priv, queue);
@@ -4770,8 +4769,6 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)if (priv->sarc_type)stmmac_set_desc_sarc (priv, first, priv->sarc_type); -skb_tx_timestamp (skb); -/* Ready to fill the first descriptor and set the OWN bit w/o any * problems because all the descriptors are actually ready to be * passed to the DMA engine.
@@ -4818,7 +4815,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)netdev_tx_sent_queue (netdev_get_tx_queue (dev, queue), skb->len);stmmac_enable_dma_transmission (priv, priv->ioaddr, queue); - +skb_tx_timestamp (skb);stmmac_flush_tx_descriptors (priv, queue);stmmac_tx_timer_arm (priv, queue);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 358/592 pinctrl: armada-37xx: propagate error from armada_37xx_pmx_gpio_set_direction()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit bfa0ff804ffa8b1246ade8be08de98c9eb19d16f ]
The armada_37xx_gpio_direction_{in,out}put() functions can fail, so propagate their error values back to the stack instead of silently ignoring those.
--- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +4 -3
@@ -472,16 +472,17 @@ static int armada_37xx_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, {struct armada_37xx_pinctrl *info =pinctrl_dev_get_drvdata (pctldev);struct gpio_chip *chip = range->gc; +int ret;dev_dbg (info->dev,"gpio_direction for pin %u as %s-%d to %s\n" , offset, range->name, offset, input ?"input" :"output" );if (input) -armada_37xx_gpio_direction_input (chip, offset); + ret =armada_37xx_gpio_direction_input (chip, offset);else -armada_37xx_gpio_direction_output (chip, offset,0 ); + ret =armada_37xx_gpio_direction_output (chip, offset,0 ); -return 0 ; +return ret; } static int armada_37xx_gpio_request_enable(struct pinctrl_dev *pctldev,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 359/592 libbpf: Check bpf_map_skeleton link for NULL
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mykyta Yatsenko <[email protected]>
[ Upstream commit d0445d7dd3fd9b15af7564c38d7aa3cbc29778ee ]
Avoid dereferencing bpf_map_skeleton's link field if it's NULL. If BPF map skeleton is created with the size, that indicates containing link field, but the field was not actually initialized with valid bpf_link pointer, libbpf crashes. This may happen when using libbpf-rs skeleton.
Skeleton loading may still progress, but user needs to attach struct_ops map separately.
--- tools/lib/bpf/libbpf.c | 6 ++++++ 1 file changed, 6 insertions(+)
tools/lib/bpf/libbpf.c +6 -0
@@ -14078,6 +14078,12 @@ int bpf_object__attach_skeleton(struct bpf_object_skeleton *s) } link = map_skel->link; +if (!link) { +pr_warn ("map '%s': BPF map skeleton link is uninitialized\n" , +bpf_map__name (map)); +continue ; + } +if (*link)continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 360/592 pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 57273ff8bb16f3842c2597b5bbcd49e7fa12edf7 ]
The regmap_read() function can fail, so propagate its error up to the stack instead of silently ignoring that.
--- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +4 -1
@@ -443,11 +443,14 @@ static int armada_37xx_gpio_get(struct gpio_chip *chip, unsigned int offset)struct armada_37xx_pinctrl *info =gpiochip_get_data (chip);unsigned int reg =INPUT_VAL ;unsigned int val, mask; +int ret;armada_37xx_update_reg (®, &offset); mask =BIT (offset); -regmap_read (info->regmap, reg, &val); + ret =regmap_read (info->regmap, reg, &val); +if (ret) +return ret;return (val & mask) !=0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 361/592 net/mlx5: HWS, fix counting of rules in the matcher
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yevgeny Kliteynik <[email protected]>
[ Upstream commit 4c56b5cbc323a10ebb6595500fb78fd8a4762efd ]
Currently the counter that counts number of rules in a matcher is increased only when rule insertion is completed. In a multi-threaded usecase this can lead to a scenario that many rules can be in process of insertion in the same matcher, while none of them has completed the insertion and the rule counter is not updated. This results in a rule insertion failure for many of them at first attempt, which leads to all of them requiring rehash and requiring locking of all the queue locks.
This patch fixes the case by increasing the rule counter in the beginning of insertion process and decreasing in case of any failure.
--- .../net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c +5 -5
@@ -329,16 +329,12 @@ static void hws_bwc_rule_list_add(struct mlx5hws_bwc_rule *bwc_rule, u16 idx) {struct mlx5hws_bwc_matcher *bwc_matcher = bwc_rule->bwc_matcher; -atomic_inc (&bwc_matcher->num_of_rules); bwc_rule->bwc_queue_idx = idx;list_add (&bwc_rule->list_node, &bwc_matcher->rules[idx]); }static void hws_bwc_rule_list_remove (struct mlx5hws_bwc_rule *bwc_rule) { -struct mlx5hws_bwc_matcher *bwc_matcher = bwc_rule->bwc_matcher; - -atomic_dec (&bwc_matcher->num_of_rules);list_del_init (&bwc_rule->list_node); }
@@ -391,6 +387,7 @@ int mlx5hws_bwc_rule_destroy_simple(struct mlx5hws_bwc_rule *bwc_rule)mutex_lock (queue_lock); ret =hws_bwc_rule_destroy_hws_sync (bwc_rule, &attr); +atomic_dec (&bwc_matcher->num_of_rules);hws_bwc_rule_list_remove (bwc_rule);mutex_unlock (queue_lock);
@@ -860,7 +857,7 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule, }/* check if number of rules require rehash */ - num_of_rules =atomic_read (&bwc_matcher->num_of_rules); + num_of_rules =atomic_inc_return (&bwc_matcher->num_of_rules);if (unlikely (hws_bwc_matcher_rehash_size_needed (bwc_matcher, num_of_rules))) {mutex_unlock (queue_lock);
@@ -874,6 +871,7 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule, bwc_matcher->size_log -MLX5HWS_BWC_MATCHER_SIZE_LOG_STEP , bwc_matcher->size_log, ret); +atomic_dec (&bwc_matcher->num_of_rules);return ret; }
@@ -906,6 +904,7 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule,if (ret) {mlx5hws_err (ctx,"BWC rule insertion: rehash failed (%d)\n" , ret); +atomic_dec (&bwc_matcher->num_of_rules);return ret; }
@@ -921,6 +920,7 @@ int mlx5hws_bwc_rule_create_simple(struct mlx5hws_bwc_rule *bwc_rule,if (unlikely (ret)) {mutex_unlock (queue_lock);mlx5hws_err (ctx,"BWC rule insertion failed (%d)\n" , ret); +atomic_dec (&bwc_matcher->num_of_rules);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 362/592 net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit b86bcfee30576b752302c55693fff97242b35dfd ]
As mlx4 has implemented skb_tx_timestamp() in mlx4_en_xmit(), the SOFTWARE flag is surely needed when users are trying to get timestamp information.
--- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +1 -0
@@ -1897,6 +1897,7 @@ static int mlx4_en_get_ts_info(struct net_device *dev,if (mdev->dev->caps.flags2 &MLX4_DEV_CAP_FLAG2_TS ) { info->so_timestamping |=SOF_TIMESTAMPING_TX_HARDWARE | +SOF_TIMESTAMPING_TX_SOFTWARE |SOF_TIMESTAMPING_RX_HARDWARE |SOF_TIMESTAMPING_RAW_HARDWARE ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 363/592 net: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
[ Upstream commit 4ecf56f4b66011b583644bf9a62188d05dfcd78c ]
The MSE102x doesn't provide any interrupt register, so the only way to handle the level interrupt is to fetch the whole packet from the MSE102x internal buffer via SPI. So in cases the interrupt handler fails to do this, it should return IRQ_NONE. This allows the core to disable the interrupt in case the issue persists and prevent an interrupt storm.
--- drivers/net/ethernet/vertexcom/mse102x.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/vertexcom/mse102x.c +9 -6
@@ -306,7 +306,7 @@ static void mse102x_dump_packet(const char *msg, int len, const char *data) data, len, true); } -static void mse102x_rx_pkt_spi (struct mse102x_net *mse) +static irqreturn_t mse102x_rx_pkt_spi (struct mse102x_net *mse) {struct sk_buff *skb;unsigned int rxalign;
@@ -327,7 +327,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse)mse102x_tx_cmd_spi (mse,CMD_CTR ); ret =mse102x_rx_cmd_spi (mse, (u8 *)&rx);if (ret) -return ; +return IRQ_NONE ; cmd_resp =be16_to_cpu (rx);if ((cmd_resp &CMD_MASK ) !=CMD_RTS ) {
@@ -360,7 +360,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse) rxalign =ALIGN (rxlen +DET_SOF_LEN +DET_DFT_LEN ,4 ); skb =netdev_alloc_skb_ip_align (mse->ndev, rxalign);if (!skb) -return ; +return IRQ_NONE ;/* 2 bytes Start of frame (before ethernet header) * 2 bytes Data frame tail (after ethernet frame)
@@ -370,7 +370,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse)if (mse102x_rx_frame_spi (mse, rxpkt, rxlen, drop)) { mse->ndev->stats.rx_errors++;dev_kfree_skb (skb); -return ; +return IRQ_HANDLED ; }if (netif_msg_pktdata (mse))
@@ -381,6 +381,8 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse) mse->ndev->stats.rx_packets++; mse->ndev->stats.rx_bytes += rxlen; + +return IRQ_HANDLED ; } static int mse102x_tx_pkt_spi(struct mse102x_net *mse, struct sk_buff *txb,
@@ -512,12 +514,13 @@ static irqreturn_t mse102x_irq(int irq, void *_mse) {struct mse102x_net *mse = _mse;struct mse102x_net_spi *mses =to_mse102x_spi (mse); +irqreturn_t ret;mutex_lock (&mses->lock); -mse102x_rx_pkt_spi (mse); + ret =mse102x_rx_pkt_spi (mse);mutex_unlock (&mses->lock); -return IRQ_HANDLED ; +return ret; }static int mse102x_net_open (struct net_device *ndev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 364/592 wifi: rtw88: rtw8822bu VID/PID for BUFFALO WI-U2-866DM
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuuki NAGAO <[email protected]>
[ Upstream commit b7f0cc647e52296a3d4dd727b6479dcd6d7e364e ]
Add VID/PID 0411/03d1 for recently released BUFFALO WI-U2-866DM USB WiFi adapter.
--- drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtw88/rtw8822bu.c +2 -0
@@ -77,6 +77,8 @@ static const struct usb_device_id rtw_8822bu_id_table[] = { .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Mercusys MA30N */ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3322, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* D-Link DWA-T185 rev. A1 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x03d1, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* BUFFALO WI-U2-866DM */ {}, };MODULE_DEVICE_TABLE (usb, rtw_8822bu_id_table);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 365/592 wifi: iwlwifi: mld: call thermal exit without wiphy lock held
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 83128399f3b4926ab73ce8e5081ce6595e9230e9 ]
The driver must not hold the wiphy mutex when unregistering the thermal devices. Do not hold the lock for the call to iwl_mld_thermal_exit and only do a lock/unlock to cancel the ct_kill_exit_wk work.
The problem is that iwl_mld_tzone_get_temp needs to take the wiphy lock while the thermal code is holding its own locks already. When unregistering the device, the reverse would happen as the driver was calling thermal_cooling_device_unregister with the wiphy mutex already held.
It is not likely to trigger this deadlock as it can only happen if the thermal code is polling the temperature while the driver is being unloaded. However, lockdep reported it so fix it.
--- drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 ++- drivers/net/wireless/intel/iwlwifi/mld/thermal.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/mld.c +2 -1
@@ -475,8 +475,9 @@ iwl_op_mode_mld_stop(struct iwl_op_mode *op_mode)iwl_mld_ptp_remove (mld);iwl_mld_leds_exit (mld); -wiphy_lock (mld->wiphy);iwl_mld_thermal_exit (mld); + +wiphy_lock (mld->wiphy);iwl_mld_low_latency_stop (mld);iwl_mld_deinit_time_sync (mld);wiphy_unlock (mld->wiphy);
drivers/net/wireless/intel/iwlwifi/mld/thermal.c +4 -0
@@ -419,6 +419,8 @@ static void iwl_mld_cooling_device_unregister(struct iwl_mld *mld)void iwl_mld_thermal_initialize (struct iwl_mld *mld) { +lockdep_assert_not_held (&mld->wiphy->mtx); +wiphy_delayed_work_init (&mld->ct_kill_exit_wk, iwl_mld_exit_ctkill);#ifdef CONFIG_THERMAL
@@ -429,7 +431,9 @@ void iwl_mld_thermal_initialize(struct iwl_mld *mld)void iwl_mld_thermal_exit (struct iwl_mld *mld) { +wiphy_lock (mld->wiphy);wiphy_delayed_work_cancel (mld->wiphy, &mld->ct_kill_exit_wk); +wiphy_unlock (mld->wiphy);#ifdef CONFIG_THERMAL iwl_mld_cooling_device_unregister (mld);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 366/592 wireless: purelifi: plfxlc: fix memory leak in plfxlc_usb_wreq_asyn()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salah Triki <[email protected]>
[ Upstream commit 63a9a727d373fa5b8ce509eef50dbc45e0f745b9 ]
Add usb_free_urb() in the error path to prevent memory leak.
--- drivers/net/wireless/purelifi/plfxlc/usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/purelifi/plfxlc/usb.c +3 -1
@@ -503,8 +503,10 @@ int plfxlc_usb_wreq_async(struct plfxlc_usb *usb, const u8 *buffer, (void *)buffer, buffer_len, complete_fn, context); r =usb_submit_urb (urb,GFP_ATOMIC ); -if (r) +if (r) { +usb_free_urb (urb);dev_err (&udev->dev,"Async write submit failed (%d)\n" , r); + }return r; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 367/592 wifi: mac80211: do not offer a mesh path if forwarding is disabled
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit cf1b684a06170d253b47d6a5287821de976435bd ]
When processing a PREQ the code would always check whether we have a mesh path locally and reply accordingly. However, when forwarding is disabled then we should not reply with this information as we will not forward data packets down that path.
Move the check for dot11MeshForwarding up in the function and skip the mesh path lookup in that case. In the else block, set forward to false so that the rest of the function becomes a no-op and the dot11MeshForwarding check does not need to be duplicated.
This explains an effect observed in the Freifunk community where mesh forwarding is disabled. In that case a mesh with three STAs and only bad links in between them, individual STAs would occionally have indirect mpath entries. This should not have happened.
--- net/mac80211/mesh_hwmp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/mac80211/mesh_hwmp.c +4 -2
@@ -636,7 +636,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,mesh_path_add_gate (mpath); }rcu_read_unlock (); - }else { + }else if (ifmsh->mshcfg.dot11MeshForwarding) {rcu_read_lock (); mpath =mesh_path_lookup (sdata, target_addr);if (mpath) {
@@ -654,6 +654,8 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, } }rcu_read_unlock (); + }else { + forward = false; }if (reply) {
@@ -671,7 +673,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, } } -if (forward && ifmsh->mshcfg.dot11MeshForwarding) { +if (forward) {u32 preq_id;u8 hopcount;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/592 bpftool: Fix cgroup command to only show cgroup bpf programs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin KaFai Lau <[email protected]>
[ Upstream commit b69d4413aa1961930fbf9ffad8376d577378daf9 ]
The netkit program is not a cgroup bpf program and should not be shown in the output of the "bpftool cgroup show" command.
However, if the netkit device happens to have ifindex 3, the "bpftool cgroup show" command will output the netkit bpf program as well:
Quoted 1 line
ip -d link show dev nk1
3: nk1@if2: ...
link/ether ...
netkit mode ...
Quoted 1 line
bpftool net show
tc:
nk1(3) netkit/peer tw_ns_nk2phy prog_id 469447
Quoted 1 line
bpftool cgroup show
/sys/fs/cgroup/...
ID AttachType AttachFlags Name ... ... ... 469447 netkit_peer tw_ns_nk2phy
The reason is that the target_fd (which is the cgroup_fd here) and the target_ifindex are in a union in the uapi/linux/bpf.h. The bpftool iterates all values in "enum bpf_attach_type" which includes non cgroup attach types like netkit. The cgroup_fd is usually 3 here, so the bug is triggered when the netkit ifindex just happens to be 3 as well.
The bpftool's cgroup.c already has a list of cgroup-only attach type defined in "cgroup_attach_types[]". This patch fixes it by iterating over "cgroup_attach_types[]" instead of "__MAX_BPF_ATTACH_TYPE".
--- tools/bpf/bpftool/cgroup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/bpf/bpftool/cgroup.c +6 -6
@@ -318,11 +318,11 @@ static int show_bpf_progs(int cgroup_fd, enum bpf_attach_type type,static int do_show (int argc,char **argv) { -enum bpf_attach_type type;int has_attached_progs;const char *path;int cgroup_fd;int ret =-1 ; +unsigned int i; query_flags =0 ;
@@ -370,14 +370,14 @@ static int do_show(int argc, char **argv) "AttachFlags", "Name"); btf_vmlinux =libbpf_find_kernel_btf (); -for (type =0 ; type < __MAX_BPF_ATTACH_TYPE; type++) { +for (i =0 ; i <ARRAY_SIZE (cgroup_attach_types); i++) {/* * Not all attach types may be supported, so it's expected, * that some requests will fail. * If we were able to get the show for at least one * attach type, let's return 0. */ -if (show_bpf_progs (cgroup_fd, type,0 ) ==0 ) +if (show_bpf_progs (cgroup_fd, cgroup_attach_types[i],0 ) ==0 ) ret =0 ; }
@@ -400,9 +400,9 @@ static int do_show(int argc, char **argv)static int do_show_tree_fn (const char *fpath,const struct stat *sb,int typeflag,struct FTW *ftw) { -enum bpf_attach_type type;int has_attached_progs;int cgroup_fd; +unsigned int i;if (typeflag !=FTW_D )return 0 ;
@@ -434,8 +434,8 @@ static int do_show_tree_fn(const char *fpath, const struct stat *sb, } btf_vmlinux =libbpf_find_kernel_btf (); -for (type =0 ; type < __MAX_BPF_ATTACH_TYPE; type++) -show_bpf_progs (cgroup_fd, type, ftw->level); +for (i =0 ; i <ARRAY_SIZE (cgroup_attach_types); i++) +show_bpf_progs (cgroup_fd, cgroup_attach_types[i], ftw->level);if (errno ==EINVAL )/* Last attach type does not support query.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/592 clk: rockchip: rk3036: mark ddrphy as critical
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Stuebner <[email protected]>
[ Upstream commit 596a977b34a722c00245801a5774aa79cec4e81d ]
The ddrphy is supplied by the dpll, but due to the limited number of PLLs on the rk3036, the dpll also is used for other periperhals, like the GPU.
So it happened, when the Lima driver turned off the gpu clock, this in turn also disabled the dpll and thus the ram.
--- drivers/clk/rockchip/clk-rk3036.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk-rk3036.c +1 -0
@@ -431,6 +431,7 @@ static const char *const rk3036_critical_clocks[] __initconst = {"hclk_peri" ,"pclk_peri" ,"pclk_ddrupctl" , + "ddrphy", };static void __init rk3036_clk_init (struct device_node *np)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 370/592 hid-asus: check ROG Ally MCU version and warn
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luke D. Jones <[email protected]>
[ Upstream commit 00e005c952f74f50a3f86af96f56877be4685e14 ]
ASUS have fixed suspend issues arising from a flag not being cleared in the MCU FW in both the ROG Ally 1 and the ROG Ally X.
Implement a check and a warning to encourage users to update the FW to a minimum supported version.
--- drivers/hid/hid-asus.c | 107 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-)
drivers/hid/hid-asus.c +105 -2
@@ -52,6 +52,10 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define FEATURE_KBD_LED_REPORT_ID1 0x5d#define FEATURE_KBD_LED_REPORT_ID2 0x5e +#define ROG_ALLY_REPORT_SIZE 64 +#define ROG_ALLY_X_MIN_MCU 313 +#define ROG_ALLY_MIN_MCU 319 +#define SUPPORT_KBD_BACKLIGHT BIT(0)#define MAX_TOUCH_MAJOR 8
@@ -84,6 +88,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");#define QUIRK_MEDION_E1239T BIT(10)#define QUIRK_ROG_NKEY_KEYBOARD BIT(11)#define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12) +#define QUIRK_ROG_ALLY_XPAD BIT(13)#define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \
@@ -534,9 +539,99 @@ static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev)return !!(value &ASUS_WMI_DSTS_PRESENCE_BIT ); } +/* +* We don't care about any other part of the string except the version section. +* Example strings: FGA80100.RC72LA.312_T01, FGA80100.RC71LS.318_T01 +* The bytes "5a 05 03 31 00 1a 13" and possibly more come before the version +* string, and there may be additional bytes after the version string such as +* "75 00 74 00 65 00" or a postfix such as "_T01" +*/ +static int mcu_parse_version_string (const u8 *response,size_t response_size) +{ +const u8 *end = response + response_size; +const u8 *p = response; +int dots, err, version; +char buf[4 ]; + + dots =0 ; +while (p < end && dots <2 ) { +if (*p++ =='.' ) + dots++; + } + +if (dots !=2 || p >= end || (p +3 ) >= end) +return -EINVAL ; + +memcpy (buf, p,3 ); + buf[3 ] ='\0' ; + + err =kstrtoint (buf,10 , &version); +if (err || version <0 ) +return -EINVAL ; + +return version; +} + +static int mcu_request_version (struct hid_device *hdev) +{ + u8 *response __free(kfree) = kzalloc(ROG_ALLY_REPORT_SIZE, GFP_KERNEL); +const u8 request[] = {0x5a ,0x05 ,0x03 ,0x31 ,0x00 ,0x20 }; +int ret; + +if (!response) +return -ENOMEM ; + + ret =asus_kbd_set_report (hdev, request,sizeof (request)); +if (ret <0 ) +return ret; + + ret =hid_hw_raw_request (hdev,FEATURE_REPORT_ID , response, +ROG_ALLY_REPORT_SIZE ,HID_FEATURE_REPORT , +HID_REQ_GET_REPORT ); +if (ret <0 ) +return ret; + + ret =mcu_parse_version_string (response,ROG_ALLY_REPORT_SIZE ); +if (ret <0 ) { +pr_err ("Failed to parse MCU version: %d\n" , ret); +print_hex_dump (KERN_ERR ,"MCU: " ,DUMP_PREFIX_NONE , +16 ,1 , response,ROG_ALLY_REPORT_SIZE , false); + } + +return ret; +} + +static void validate_mcu_fw_version (struct hid_device *hdev,int idProduct) +{ +int min_version, version; + + version =mcu_request_version (hdev); +if (version <0 ) +return ; + +switch (idProduct) { +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY : + min_version =ROG_ALLY_MIN_MCU ; +break ; +case USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X : + min_version =ROG_ALLY_X_MIN_MCU ; +break ; +default : + min_version =0 ; + } + +if (version < min_version) { +hid_warn (hdev, +"The MCU firmware version must be %d or greater to avoid issues with suspend.\n" , + min_version); + } +} +static int asus_kbd_register_leds (struct hid_device *hdev) {struct asus_drvdata *drvdata =hid_get_drvdata (hdev); +struct usb_interface *intf; +struct usb_device *udev;unsigned char kbd_func;int ret;
@@ -560,6 +655,14 @@ static int asus_kbd_register_leds(struct hid_device *hdev)if (ret <0 )return ret; } + +if (drvdata->quirks &QUIRK_ROG_ALLY_XPAD ) { + intf =to_usb_interface (hdev->dev.parent); + udev =interface_to_usbdev (intf); +validate_mcu_fw_version (hdev, +le16_to_cpu (udev->descriptor.idProduct)); + } + }else {/* Initialize keyboard */ ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID );
@@ -1280,10 +1383,10 @@ static const struct hid_device_id asus_devices[] = { QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, {HID_USB_DEVICE (USB_VENDOR_ID_ASUSTEK ,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD}, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X ), - QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD }, + QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD | QUIRK_ROG_ALLY_XPAD }, { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD ), QUIRK_ROG_CLAYMORE_II_KEYBOARD },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 371/592 ipmi:ssif: Fix a shutdown race
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corey Minyard <[email protected]>
[ Upstream commit 6bd0eb6d759b9a22c5509ea04e19c2e8407ba418 ]
It was possible for the SSIF thread to stop and quit before the kthread_stop() call because ssif->stopping was set before the stop. So only exit the SSIF thread is kthread_should_stop() returns true.
There is no need to wake the thread, as the wait will be interrupted by kthread_stop().
--- drivers/char/ipmi/ipmi_ssif.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/char/ipmi/ipmi_ssif.c +1 -5
@@ -481,8 +481,6 @@ static int ipmi_ssif_thread(void *data)/* Wait for something to do */ result =wait_for_completion_interruptible ( &ssif_info->wake_thread); -if (ssif_info->stopping) -break ;if (result == -ERESTARTSYS )continue ;init_completion (&ssif_info->wake_thread);
@@ -1270,10 +1268,8 @@ static void shutdown_ssif(void *send_info) ssif_info->stopping = true;timer_delete_sync (&ssif_info->watch_timer);timer_delete_sync (&ssif_info->retry_timer); -if (ssif_info->thread) { -complete (&ssif_info->wake_thread); +if (ssif_info->thread)kthread_stop (ssif_info->thread); - } }static void ssif_remove (struct i2c_client *client)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 372/592 rtla: Define __NR_sched_setattr for LoongArch
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit 6a38c51a2557d4d50748818a858d507c250f3bee ]
When executing "make -C tools/tracing/rtla" on LoongArch, there exists the following error:
src/utils.c:237:24: error: '__NR_sched_setattr' undeclared
Just define __NR_sched_setattr for LoongArch if not exist.
--- tools/tracing/rtla/src/utils.c | 2 ++ 1 file changed, 2 insertions(+)
tools/tracing/rtla/src/utils.c +2 -0
@@ -227,6 +227,8 @@ long parse_ns_duration(char *val)# define __NR_sched_setattr 355# elif __s390x__# define __NR_sched_setattr 345 +# elif __loongarch__ +# define __NR_sched_setattr 274# endif #endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 373/592 wifi: iwlwifi: mvm: fix beacon CCK flag
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 8d7f08922a8cb621aa5d00bdce6a7afe57af1665 ]
The beacon CCK flag should be set for any CCK rate, not just for 1 Mbps. Fix that.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2024 Intel Corporation +* Copyright (C) 2012-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */
@@ -941,7 +941,7 @@ u16 iwl_mvm_mac_ctxt_get_beacon_flags(const struct iwl_fw *fw, u8 rate_idx)u16 flags =iwl_mvm_mac80211_idx_to_hwrate (fw, rate_idx);bool is_new_rate =iwl_fw_lookup_cmd_ver (fw,BEACON_TEMPLATE_CMD ,0 ) >10 ; -if (rate_idx <=IWL_FIRST_CCK_RATE ) +if (rate_idx <=IWL_LAST_CCK_RATE ) flags |= is_new_rate ?IWL_MAC_BEACON_CCK :IWL_MAC_BEACON_CCK_V1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 374/592 wifi: iwlwifi: dvm: pair transport op-mode enter/leave
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 6b340a694cee9e7a24b2be827c738b5b6cb13c84 ]
If there's a failure and the op-mode didn't actually fully initialize, it should leave the transport again. Fix that.
--- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/dvm/main.c +4 -2
@@ -1382,14 +1382,14 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, err =iwl_trans_start_hw (priv->trans);if (err) - goto out_free_hw; + goto out_leave_trans;/* Read the EEPROM */ err =iwl_read_eeprom (priv->trans, &priv->eeprom_blob, &priv->eeprom_blob_size);if (err) {IWL_ERR (priv,"Unable to init EEPROM\n" ); - goto out_free_hw; + goto out_leave_trans; }/* Reset chip to save power until we load uCode during "up". */
@@ -1508,6 +1508,8 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,kfree (priv->eeprom_blob); out_free_eeprom:kfree (priv->nvm_data); +out_leave_trans: +iwl_trans_op_mode_leave (priv->trans); out_free_hw:ieee80211_free_hw (priv->hw); out:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 375/592 wifi: iwlwifi: mld: check for NULL before referencing a pointer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit f9151f16e140b9c43f076579146679408af6f442 ]
Errors can happen, and it is better not to risk with a NULL pointer dereference.
Make sure that the links-to-remove pointers are not NULL before dereferencing it.
--- drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +1 -1
@@ -2460,7 +2460,7 @@ iwl_mld_change_vif_links(struct ieee80211_hw *hw, added |=BIT (0 );for (int i =0 ; i <IEEE80211_MLD_MAX_NUM_LINKS ; i++) { -if (removed &BIT (i)) +if (removed &BIT (i) && !WARN_ON (!old[i]))iwl_mld_remove_link (mld, old[i]); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 376/592 f2fs: fix to bail out in get_new_segment()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit bb5eb8a5b222fa5092f60d5555867a05ebc3bdf2 ]
------------[ cut here ]------------ WARNING: CPU: 3 PID: 579 at fs/f2fs/segment.c:2832 new_curseg+0x5e8/0x6dc pc : new_curseg+0x5e8/0x6dc Call trace: new_curseg+0x5e8/0x6dc f2fs_allocate_data_block+0xa54/0xe28 do_write_page+0x6c/0x194 f2fs_do_write_node_page+0x38/0x78 __write_node_page+0x248/0x6d4 f2fs_sync_node_pages+0x524/0x72c f2fs_write_checkpoint+0x4bc/0x9b0 __checkpoint_and_complete_reqs+0x80/0x244 issue_checkpoint_thread+0x8c/0xec kthread+0x114/0x1bc ret_from_fork+0x10/0x20
get_new_segment() detects inconsistent status in between free_segmap and free_secmap, let's record such error into super block, and bail out get_new_segment() instead of continue using the segment.
--- fs/f2fs/segment.c | 6 +++++- include/linux/f2fs_fs.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +5 -1
@@ -2836,7 +2836,11 @@ static int get_new_segment(struct f2fs_sb_info *sbi, } got_it:/* set it as dirty segment in free segmap */ -f2fs_bug_on (sbi,test_bit (segno, free_i->free_segmap)); +if (test_bit (segno, free_i->free_segmap)) { + ret = -EFSCORRUPTED ; +f2fs_stop_checkpoint (sbi, false,STOP_CP_REASON_CORRUPTED_FREE_BITMAP ); + goto out_unlock; + }/* no free section in conventional device or conventional zone */ if (new_sec && pinning &&
include/linux/f2fs_fs.h +1 -0
@@ -78,6 +78,7 @@ enum stop_cp_reason {STOP_CP_REASON_UPDATE_INODE ,STOP_CP_REASON_FLUSH_FAIL ,STOP_CP_REASON_NO_SEGMENT , +STOP_CP_REASON_CORRUPTED_FREE_BITMAP , STOP_CP_REASON_MAX, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 377/592 tracing: Only return an adjusted address if it matches the kernel address
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit 00d872dd541cdf22230510201a1baf58f0147db9 ]
The trace_adjust_address() will take a given address and examine the persistent ring buffer to see if the address matches a module that is listed there. If it does not, it will just adjust the value to the core kernel delta. But if the address was for something that was not part of the core kernel text or data it should not be adjusted.
Check the result of the adjustment and only return the adjustment if it lands in the current kernel text or data. If not, return the original address.
--- kernel/trace/trace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/trace.c +4 -1
@@ -6032,6 +6032,7 @@ unsigned long trace_adjust_address(struct trace_array *tr, unsigned long addr)struct trace_module_delta *module_delta;struct trace_scratch *tscratch;struct trace_mod_entry *entry; +unsigned long raddr;int idx =0 , nr_entries;/* If we don't have last boot delta, return the address */
@@ -6045,7 +6046,9 @@ unsigned long trace_adjust_address(struct trace_array *tr, unsigned long addr) module_delta =READ_ONCE (tr->module_delta);if (!module_delta || !tscratch->nr_entries || tscratch->entries[0 ].mod_addr > addr) { -return addr + tr->text_delta; + raddr = addr + tr->text_delta; +return __is_kernel (raddr) ||is_kernel_core_data (raddr) || +is_kernel_rodata (raddr) ? raddr : addr; }/* Note that entries must be sorted. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 378/592 netfilter: nft_set_pipapo: clamp maximum map bucket size to INT_MAX
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit b85e3367a5716ed3662a4fe266525190d2af76df ]
Otherwise, it is possible to hit WARN_ON_ONCE in __kvmalloc_node_noprof() when resizing hashtable because __GFP_NOWARN is unset.
Similar to:
b541ba7d1f5a ("netfilter: conntrack: clamp maximum hashtable size to INT_MAX")
--- net/netfilter/nft_set_pipapo.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nft_set_pipapo.c +6 -0
@@ -663,6 +663,9 @@ static int pipapo_realloc_mt(struct nft_pipapo_field *f, check_add_overflow(rules, extra, &rules_alloc))return -EOVERFLOW ; +if (rules_alloc > (INT_MAX /sizeof (*new_mt))) +return -ENOMEM ; + new_mt =kvmalloc_array (rules_alloc,sizeof (*new_mt),GFP_KERNEL_ACCOUNT );if (!new_mt)return -ENOMEM ;
@@ -1499,6 +1502,9 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old) src->groups * NFT_PIPAPO_BUCKETS(src->bb));if (src->rules >0 ) { +if (src->rules_alloc > (INT_MAX /sizeof (*src->mt))) + goto out_mt; + dst->mt =kvmalloc_array (src->rules_alloc,sizeof (*src->mt),GFP_KERNEL_ACCOUNT );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 379/592 libbpf: Add identical pointer detection to btf_dedup_is_equiv()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Maguire <[email protected]>
[ Upstream commit 8e64c387c942229c551d0f23de4d9993d3a2acb6 ]
Recently as a side-effect of
commit ac053946f5c4 ("compiler.h: introduce TYPEOF_UNQUAL() macro")
issues were observed in deduplication between modules and kernel BTF such that a large number of kernel types were not deduplicated so were found in module BTF (task_struct, bpf_prog etc). The root cause appeared to be a failure to dedup struct types, specifically those with members that were pointers with __percpu annotations.
The issue in dedup is at the point that we are deduplicating structures, we have not yet deduplicated reference types like pointers. If multiple copies of a pointer point at the same (deduplicated) integer as in this case, we do not see them as identical. Special handling already exists to deal with structures and arrays, so add pointer handling here too.
--- tools/lib/bpf/btf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/lib/bpf/btf.c +16 -0
@@ -4390,6 +4390,19 @@ static bool btf_dedup_identical_structs(struct btf_dedup *d, __u32 id1, __u32 idreturn true; } +static bool btf_dedup_identical_ptrs (struct btf_dedup *d,__u32 id1,__u32 id2) +{ +struct btf_type *t1, *t2; + + t1 =btf_type_by_id (d->btf, id1); + t2 =btf_type_by_id (d->btf, id2); + +if (!btf_is_ptr (t1) || !btf_is_ptr (t2)) +return false; + +return t1->type == t2->type; +} +/* * Check equivalence of BTF type graph formed by candidate struct/union (we'll * call it "candidate graph" in this description for brevity) to a type graph
@@ -4522,6 +4535,9 @@ static int btf_dedup_is_equiv(struct btf_dedup *d, __u32 cand_id,*/ if (btf_dedup_identical_structs (d, hypot_type_id, cand_id))return 1 ; +/* A similar case is again observed for PTRs. */ +if (btf_dedup_identical_ptrs (d, hypot_type_id, cand_id)) +return 1 ;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 380/592 scsi: lpfc: Fix lpfc_check_sli_ndlp() handling for GEN_REQUEST64 commands
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 05ae6c9c7315d844fbc15afe393f5ba5e5771126 ]
In lpfc_check_sli_ndlp(), the get_job_els_rsp64_did remote_id assignment does not apply for GEN_REQUEST64 commands as it only has meaning for a ELS_REQUEST64 command. So, if (iocb->ndlp == ndlp) is false, we could erroneously return the wrong value. Fix by replacing the fallthrough statement with a break statement before the remote_id check.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
@@ -5055,7 +5055,7 @@ lpfc_check_sli_ndlp(struct lpfc_hba *phba,case CMD_GEN_REQUEST64_CR :if (iocb->ndlp == ndlp)return 1 ; - fallthrough; +break ;case CMD_ELS_REQUEST64_CR :if (remote_id == ndlp->nlp_DID)return 1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/592 scsi: smartpqi: Add new PCI IDs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Strahan <[email protected]>
[ Upstream commit 01b8bdddcfab035cf70fd9981cb20593564cd15d ]
Add in support for more PCI devices.
All PCI ID entries in Hex.
Add PCI IDs for Ramaxel controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
Ramaxel SmartHBA RX8238-16i 9005 028f 1018 8238
Ramaxel SSSRAID card 9005 028f 1f3f 0610
Add PCI ID for Alibaba controller:
VID / DID / SVID / SDID
---- ---- ---- ----
HBA AS1340 9005 028f 1ded 3301Add PCI IDs for Inspur controller:
VID / DID / SVID / SDID
---- ---- ---- ----
RT0800M6E2i 9005 028f 1bd4 00a3Add PCI IDs for Delta controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
ThinkSystem 4450-8i SAS/SATA/NVMe PCIe Gen4 9005 028f 1d49 0222
24Gb HBA
ThinkSystem 4450-16i SAS/SATA/NVMe PCIe Gen4 9005 028f 1d49 0223
24Gb HBA
ThinkSystem 4450-8e SAS/SATA PCIe Gen4 9005 028f 1d49 0224
24Gb HBA
ThinkSystem RAID 4450-16e PCIe Gen4 24Gb 9005 028f 1d49 0225
Adapter HBA
ThinkSystem RAID 5450-16i PCIe Gen4 24Gb Adapter 9005 028f 1d49 0521 ThinkSystem RAID 9450-8i 4GB Flash PCIe Gen4 9005 028f 1d49 0624
24Gb Adapter
ThinkSystem RAID 9450-16i 4GB Flash PCIe Gen4 9005 028f 1d49 0625
24Gb Adapter
ThinkSystem RAID 9450-16i 4GB Flash PCIe Gen4 9005 028f 1d49 0626
24Gb Adapter
ThinkSystem RAID 9450-32i 8GB Flash PCIe Gen4 9005 028f 1d49 0627
24Gb Adapter
ThinkSystem RAID 9450-16e 4GB Flash PCIe Gen4 9005 028f 1d49 0628
24Gb Adapter
Add PCI ID for Cloudnine Controller:
VID / DID / SVID / SDID
---- ---- ---- ----
SmartHBA P6600-24i 9005 028f 1f51 100bAdd PCI IDs for Hurraydata Controllers:
VID / DID / SVID / SDID
---- ---- ---- ----
HRDT TrustHBA H4100-8i 9005 028f 207d 4044
HRDT TrustHBA H4100-8e 9005 028f 207d 4054
HRDT TrustHBA H4100-16i 9005 028f 207d 4084
HRDT TrustHBA H4100-16e 9005 028f 207d 4094
HRDT TrustRAID D3152s-8i 9005 028f 207d 4140
HRDT TrustRAID D3154s-8i 9005 028f 207d 4240--- drivers/scsi/smartpqi/smartpqi_init.c | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +84 -0
@@ -9709,6 +9709,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1bd4 ,0x0089 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1bd4 ,0x00a3 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1ff9 ,0x00a1 )
@@ -10045,6 +10049,30 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADAPTEC2 ,0x14f0 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4044 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4054 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4084 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4094 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4140 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x207d ,0x4240 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_ADVANTECH ,0x8312 )
@@ -10261,6 +10289,14 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1cc4 ,0x0201 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1018 ,0x8238 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1f3f ,0x0610 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0220 )
@@ -10269,10 +10305,30 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0221 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0222 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0223 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0224 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0225 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0520 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0521 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0522 )
@@ -10293,6 +10349,26 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,PCI_VENDOR_ID_LENOVO ,0x0623 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0624 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0625 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0626 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0627 ) + }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +PCI_VENDOR_ID_LENOVO ,0x0628 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1014 ,0x0718 )
@@ -10321,6 +10397,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1137 ,0x0300 ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1ded ,0x3301 ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1ff9 ,0x0045 )
@@ -10469,6 +10549,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1f51 ,0x100a ) }, + { +PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f , +0x1f51 ,0x100b ) + }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_ADAPTEC2 ,0x028f ,0x1f51 ,0x100e )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/592 iommu/amd: Ensure GA log notifier callbacks finish running before module unload
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 94c721ea03c7078163f41dbaa101ac721ddac329 ]
Synchronize RCU when unregistering KVM's GA log notifier to ensure all in-flight interrupt handlers complete before KVM-the module is unloaded.
--- drivers/iommu/amd/iommu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iommu/amd/iommu.c +8 -0
@@ -1005,6 +1005,14 @@ int amd_iommu_register_ga_log_notifier(int (*notifier)(u32)) { iommu_ga_log_notifier = notifier; +/* +* Ensure all in-flight IRQ handlers run to completion before returning +* to the caller, e.g. to ensure module code isn't unloaded while it's +* being executed in the IRQ handler. +*/ +if (!notifier) +synchronize_rcu (); +return 0 ; }EXPORT_SYMBOL (amd_iommu_register_ga_log_notifier);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/592 wifi: iwlwifi: pcie: make sure to lock rxq->read
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 1cc2c48c4af81bed5ddbe9f2c9d6e20fa163acf9 ]
rxq->read is accessed without the rxq->lock in a few places, Make sure to have the lock there.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +6 -0
@@ -2942,6 +2942,8 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,for (i =0 ; i < trans->num_rx_queues && pos < bufsz; i++) {struct iwl_rxq *rxq = &trans_pcie->rxq[i]; +spin_lock_bh (&rxq->lock); + pos +=scnprintf (buf + pos, bufsz - pos,"queue#: %2d\n" , i); pos += scnprintf(buf + pos, bufsz - pos, "\tread: %u\n",
@@ -2962,6 +2964,7 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file, pos +=scnprintf (buf + pos, bufsz - pos,"\tclosed_rb_num: Not Allocated\n" ); } +spin_unlock_bh (&rxq->lock); } ret =simple_read_from_buffer (user_buf, count, ppos, buf, pos);kfree (buf);
@@ -3662,8 +3665,11 @@ iwl_trans_pcie_dump_data(struct iwl_trans *trans, u32 dump_mask,/* Dump RBs is supported only for pre-9000 devices (1 queue) */ struct iwl_rxq *rxq = &trans_pcie->rxq[0 ];/* RBs */ +spin_lock_bh (&rxq->lock); num_rbs =iwl_get_closed_rb_stts (trans, rxq); num_rbs = (num_rbs - rxq->read) &RX_QUEUE_MASK ; +spin_unlock_bh (&rxq->lock); + len += num_rbs * (sizeof (*data) +sizeof (struct iwl_fw_error_dump_rb ) + (PAGE_SIZE << trans_pcie->rx_page_order));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/592 wifi: rtw89: 8922a: fix TX fail with wrong VCO setting
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Chung Chen <[email protected]>
[ Upstream commit 20aac091a15dc7229ef1a268253fe36bb6b2be39 ]
An incorrect Voltage Controlled Oscillator (VCO) setting may cause Synthesizer (SYN) unlock, which may lead to a failure in the TX authentication request.
--- drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c +0 -5
@@ -77,11 +77,6 @@ void rtw8922a_ctl_band_ch_bw(struct rtw89_dev *rtwdev, enum rtw89_phy_idx phy, RR_CFGCH_BAND0 | RR_CFGCH_CH); rf_reg[path][i] |=u32_encode_bits (central_ch,RR_CFGCH_CH ); -if (band ==RTW89_BAND_2G ) -rtw89_write_rf (rtwdev, path,RR_SMD ,RR_VCO2 ,0x0 ); -else -rtw89_write_rf (rtwdev, path,RR_SMD ,RR_VCO2 ,0x1 ); -switch (band) {case RTW89_BAND_2G :default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/592 wifi: mac80211_hwsim: Prevent tsf from setting if beacon is disabled
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit c575f5374be7a5c4be4acb9fe6be3a4669d94674 ]
Setting tsf is meaningless if beacon is disabled, so check that beacon is enabled before setting tsf.
--- drivers/net/wireless/virtual/mac80211_hwsim.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/virtual/mac80211_hwsim.c +5 -0
@@ -1229,6 +1229,11 @@ static void mac80211_hwsim_set_tsf(struct ieee80211_hw *hw,/* MLD not supported here */ u32 bcn_int = data->link_data[0 ].beacon_int;u64 delta =abs (tsf - now); +struct ieee80211_bss_conf *conf; + + conf =link_conf_dereference_protected (vif, data->link_data[0 ].link_id); +if (conf && !conf->enable_beacon) +return ;/* adjust after beaconing with new timestamp at old TBTT */ if (tsf > now) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/592 netdevsim: Mark NAPI ID on skb in nsim_rcv
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Damato <[email protected]>
[ Upstream commit f71c549b26a33fd62f1e9c7deeba738bfc73fbfc ]
Previously, nsim_rcv was not marking the NAPI ID on the skb, leading to applications seeing a napi ID of 0 when using SO_INCOMING_NAPI_ID.
To add to the userland confusion, netlink appears to correctly report the NAPI IDs for netdevsim queues but the resulting file descriptor from a call to accept() was reporting a NAPI ID of 0.
--- drivers/net/netdevsim/netdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/netdevsim/netdev.c +2 -0
@@ -29,6 +29,7 @@#include <net/pkt_cls.h> #include <net/rtnetlink.h> #include <net/udp_tunnel.h> +#include <net/busy_poll.h> #include "netdevsim.h"
@@ -357,6 +358,7 @@ static int nsim_rcv(struct nsim_rq *rq, int budget)break ; skb =skb_dequeue (&rq->skb_queue); +skb_mark_napi_id (skb, &rq->napi);netif_receive_skb (skb); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/592 net/mlx5: HWS, Fix IP version decision
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vlad Dogaru <[email protected]>
[ Upstream commit 5f2f8d8b6800e4fc760c2eccec9b2bd2cacf80cf ]
Unify the check for IP version when creating a definer. A given matcher is deemed to match on IPv6 if any of the higher order (>31) bits of source or destination address mask are set.
A single packet cannot mix IP versions between source and destination addresses, so it makes no sense that they would be decided on independently.
--- .../mellanox/mlx5/core/steering/hws/definer.c | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c +16 -22
@@ -509,9 +509,9 @@ static int hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd, u32 *match_param) { - bool is_s_ipv6, is_d_ipv6, smac_set, dmac_set; struct mlx5hws_definer_fc *fc = cd->fc;struct mlx5hws_definer_fc *curr_fc; +bool is_ipv6, smac_set, dmac_set;u32 *s_ipv6, *d_ipv6; if (HWS_IS_FLD_SET_SZ(match_param, outer_headers.l4_type, 0x2) ||
@@ -573,10 +573,10 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd, outer_headers.dst_ipv4_dst_ipv6.ipv6_layout);/* Assume IPv6 is used if ipv6 bits are set */ - is_s_ipv6 = s_ipv6[0 ] || s_ipv6[1 ] || s_ipv6[2 ]; - is_d_ipv6 = d_ipv6[0 ] || d_ipv6[1 ] || d_ipv6[2 ]; + is_ipv6 = s_ipv6[0 ] || s_ipv6[1 ] || s_ipv6[2 ] || + d_ipv6[0 ] || d_ipv6[1 ] || d_ipv6[2 ]; -if (is_s_ipv6) { +if (is_ipv6) {/* Handle IPv6 source address */ HWS_SET_HDR(fc, match_param, IPV6_SRC_127_96_O, outer_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_127_96,
@@ -590,13 +590,6 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd,HWS_SET_HDR (fc, match_param,IPV6_SRC_31_0_O , outer_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, ipv6_src_outer.ipv6_address_31_0); - }else { -/* Handle IPv4 source address */ -HWS_SET_HDR (fc, match_param,IPV4_SRC_O , - outer_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, - ipv4_src_dest_outer.source_address); - } -if (is_d_ipv6) {/* Handle IPv6 destination address */ HWS_SET_HDR(fc, match_param, IPV6_DST_127_96_O, outer_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_127_96,
@@ -611,6 +604,10 @@ hws_definer_conv_outer(struct mlx5hws_definer_conv_data *cd, outer_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_31_0, ipv6_dst_outer.ipv6_address_31_0); }else { +/* Handle IPv4 source address */ +HWS_SET_HDR (fc, match_param,IPV4_SRC_O , + outer_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, + ipv4_src_dest_outer.source_address);/* Handle IPv4 destination address */ HWS_SET_HDR(fc, match_param, IPV4_DST_O, outer_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_31_0,
@@ -668,9 +665,9 @@ static int hws_definer_conv_inner(struct mlx5hws_definer_conv_data *cd, u32 *match_param) { - bool is_s_ipv6, is_d_ipv6, smac_set, dmac_set; struct mlx5hws_definer_fc *fc = cd->fc;struct mlx5hws_definer_fc *curr_fc; +bool is_ipv6, smac_set, dmac_set;u32 *s_ipv6, *d_ipv6; if (HWS_IS_FLD_SET_SZ(match_param, inner_headers.l4_type, 0x2) ||
@@ -731,10 +728,10 @@ hws_definer_conv_inner(struct mlx5hws_definer_conv_data *cd, inner_headers.dst_ipv4_dst_ipv6.ipv6_layout);/* Assume IPv6 is used if ipv6 bits are set */ - is_s_ipv6 = s_ipv6[0 ] || s_ipv6[1 ] || s_ipv6[2 ]; - is_d_ipv6 = d_ipv6[0 ] || d_ipv6[1 ] || d_ipv6[2 ]; + is_ipv6 = s_ipv6[0 ] || s_ipv6[1 ] || s_ipv6[2 ] || + d_ipv6[0 ] || d_ipv6[1 ] || d_ipv6[2 ]; -if (is_s_ipv6) { +if (is_ipv6) {/* Handle IPv6 source address */ HWS_SET_HDR(fc, match_param, IPV6_SRC_127_96_I, inner_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_127_96,
@@ -748,13 +745,6 @@ hws_definer_conv_inner(struct mlx5hws_definer_conv_data *cd,HWS_SET_HDR (fc, match_param,IPV6_SRC_31_0_I , inner_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, ipv6_src_inner.ipv6_address_31_0); - }else { -/* Handle IPv4 source address */ -HWS_SET_HDR (fc, match_param,IPV4_SRC_I , - inner_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, - ipv4_src_dest_inner.source_address); - } -if (is_d_ipv6) {/* Handle IPv6 destination address */ HWS_SET_HDR(fc, match_param, IPV6_DST_127_96_I, inner_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_127_96,
@@ -769,6 +759,10 @@ hws_definer_conv_inner(struct mlx5hws_definer_conv_data *cd, inner_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_31_0, ipv6_dst_inner.ipv6_address_31_0); }else { +/* Handle IPv4 source address */ +HWS_SET_HDR (fc, match_param,IPV4_SRC_I , + inner_headers.src_ipv4_src_ipv6.ipv6_simple_layout.ipv6_31_0, + ipv4_src_dest_inner.source_address);/* Handle IPv4 destination address */ HWS_SET_HDR(fc, match_param, IPV4_DST_I, inner_headers.dst_ipv4_dst_ipv6.ipv6_simple_layout.ipv6_31_0,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 388/592 bpf: Use proper type to calculate bpf_raw_tp_null_args.mask index
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shung-Hsi Yu <[email protected]>
[ Upstream commit 53ebef53a657d7957d35dc2b953db64f1bb28065 ]
The calculation of the index used to access the mask field in 'struct bpf_raw_tp_null_args' is done with 'int' type, which could overflow when the tracepoint being attached has more than 8 arguments.
While none of the tracepoints mentioned in raw_tp_null_args[] currently have more than 8 arguments, there do exist tracepoints that had more than 8 arguments (e.g. iocost_iocg_forgive_debt), so use the correct type for calculation and avoid Smatch static checker warning.
--- kernel/bpf/btf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/btf.c +2 -2
@@ -6829,10 +6829,10 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,/* Is this a func with potential NULL args? */ if (strcmp (tname, raw_tp_null_args[i].func))continue ; -if (raw_tp_null_args[i].mask & (0x1 << (arg *4 ))) +if (raw_tp_null_args[i].mask & (0x1ULL << (arg *4 ))) info->reg_type |=PTR_MAYBE_NULL ;/* Is the current arg IS_ERR? */ -if (raw_tp_null_args[i].mask & (0x2 << (arg *4 ))) +if (raw_tp_null_args[i].mask & (0x2ULL << (arg *4 ))) ptr_err_raw_tp = true;break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 389/592 wifi: mac80211: VLAN traffic in multicast path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muna Sinada <[email protected]>
[ Upstream commit 1a4a6a22552ca9d723f28a1fe35eab1b9b3d8b33 ]
Currently for MLO, sending out multicast frames on each link is handled by mac80211 only when IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX flag is not set.
Dynamic VLAN multicast traffic utilizes software encryption. Due to this, mac80211 should handle transmitting multicast frames on all links for multicast VLAN traffic.
--- net/mac80211/tx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/mac80211/tx.c +4 -2
@@ -4526,8 +4526,10 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,IEEE80211_TX_CTRL_MLO_LINK_UNSPEC , NULL); }else if (ieee80211_vif_is_mld (&sdata->vif) && - sdata->vif.type ==NL80211_IFTYPE_AP && - !ieee80211_hw_check (&sdata->local->hw,MLO_MCAST_MULTI_LINK_TX )) { + ((sdata->vif.type ==NL80211_IFTYPE_AP && + !ieee80211_hw_check (&sdata->local->hw,MLO_MCAST_MULTI_LINK_TX )) || + (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN && + !sdata->wdev.use_4addr))) {ieee80211_mlo_multicast_tx (dev, skb); }else { normal:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 390/592 Revert "mac80211: Dynamically set CoDel parameters per station"
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 4876376988081d636a4c4e5f03a5556386b49087 ]
This reverts commit 484a54c2e597dbc4ace79c1687022282905afba0. The CoDel parameter change essentially disables CoDel on slow stations, with some questionable assumptions, as Dave pointed out in [0]. Quoting from there:
But here are my pithy comments as to why this part of mac80211 is so wrong...
static void sta_update_codel_params(struct sta_info *sta, u32 thr) {
- if (thr && thr < STA_SLOW_THRESHOLD * sta->local->num_sta) {
1) sta->local->num_sta is the number of associated, rather than active, stations. "Active" stations in the last 50ms or so, might have been a better thing to use, but as most people have far more than that associated, we end up with really lousy codel parameters, all the time. Mistake numero uno!
2) The STA_SLOW_THRESHOLD was completely arbitrary in 2016.
- sta->cparams.target = MS2TIME(50);
This, by itself, was probably not too bad. 30ms might have been better, at the time, when we were battling powersave etc, but 20ms was enough, really, to cover most scenarios, even where we had low rate 2Ghz multicast to cope with. Even then, codel has a hard time finding any sane drop rate at all, with a target this high.
- sta->cparams.interval = MS2TIME(300);
But this was horrible, a total mistake, that is leading to codel being completely ineffective in almost any scenario on clients or APS. 100ms, even 80ms, here, would be vastly better than this insanity. I'm seeing 5+seconds of delay accumulated in a bunch of otherwise happily fq-ing APs....
100ms of observed jitter during a flow is enough. Certainly (in 2016) there were interactions with powersave that I did not understand, and still don't, but if you are transmitting in the first place, powersave shouldn't be a problemmmm.....
- sta->cparams.ecn = false;
At the time we were pretty nervous about ecn, I'm kind of sanguine about it now, and reliably indicating ecn seems better than turning it off for any reason.
[...]
In production, on p2p wireless, I've had 8ms and 80ms for target and interval for years now, and it works great.
I think Dave's arguments above are basically sound on the face of it, and various experimentation with tighter CoDel parameters in the OpenWrt community have show promising results[1]. So I don't think there's any reason to keep this parameter fiddling; hence this revert.
[0] https://lore.kernel.org/linux-wireless/CAA93jw6NJ2cmLmMauz0xAgC2MGbBq6n0ZiZzAdkK0u4b+O2yXg@mail.gmail.com/
[1] https://forum.openwrt.org/t/reducing-multiplexing-latencies-still-further-in-wifi/133605/130
In-memory-of: Dave Taht <[email protected]>
--- include/net/mac80211.h | 16 ---------------- net/mac80211/debugfs_sta.c | 6 ------ net/mac80211/rate.c | 2 -- net/mac80211/sta_info.c | 28 ---------------------------- net/mac80211/sta_info.h | 11 ----------- net/mac80211/tx.c | 9 +-------- 6 files changed, 1 insertion(+), 71 deletions(-)
include/net/mac80211.h +0 -16
@@ -5346,22 +5346,6 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,struct ieee80211_tx_rate *dest, int max_rates); -/** -* ieee80211_sta_set_expected_throughput - set the expected tpt for a station -* -* Call this function to notify mac80211 about a change in expected throughput -* to a station. A driver for a device that does rate control in firmware can -* call this function when the expected throughput estimate towards a station -* changes. The information is used to tune the CoDel AQM applied to traffic -* going towards that station (which can otherwise be too aggressive and cause -* slow stations to starve). -* -* @pubsta: the station to set throughput for. -* @thr: the current expected throughput in kbps. -*/ -void ieee80211_sta_set_expected_throughput (struct ieee80211_sta *pubsta, -u32 thr); -/** * ieee80211_tx_rate_update - transmit rate update callback *
net/mac80211/debugfs_sta.c +0 -6
@@ -150,12 +150,6 @@ static ssize_t sta_aqm_read(struct file *file, char __user *userbuf,spin_lock_bh (&local->fq.lock);rcu_read_lock (); - p +=scnprintf (p, - bufsz + buf - p, -"target %uus interval %uus ecn %s\n" , -codel_time_to_us (sta->cparams.target), -codel_time_to_us (sta->cparams.interval), - sta->cparams.ecn ?"yes" :"no" ); p +=scnprintf (p, bufsz + buf - p,"tid ac backlog-bytes backlog-packets new-flows drops marks overlimit collisions tx-bytes tx-packets flags\n" );
net/mac80211/rate.c +0 -2
@@ -990,8 +990,6 @@ int rate_control_set_rates(struct ieee80211_hw *hw,if (sta->uploaded)drv_sta_rate_tbl_update (hw_to_local (hw), sta->sdata, pubsta); -ieee80211_sta_set_expected_throughput (pubsta,sta_get_expected_throughput (sta)); -return 0 ; }EXPORT_SYMBOL (rate_control_set_rates);
net/mac80211/sta_info.c +0 -28
@@ -18,7 +18,6 @@#include <linux/timer.h> #include <linux/rtnetlink.h> -#include <net/codel.h> #include <net/mac80211.h> #include "ieee80211_i.h" #include "driver-ops.h"
@@ -701,12 +700,6 @@ __sta_info_alloc(struct ieee80211_sub_if_data *sdata, } } - sta->cparams.ce_threshold =CODEL_DISABLED_THRESHOLD ; - sta->cparams.target =MS2TIME (20 ); - sta->cparams.interval =MS2TIME (100 ); - sta->cparams.ecn = true; - sta->cparams.ce_threshold_selector =0 ; - sta->cparams.ce_threshold_mask =0 ;sta_dbg (sdata,"Allocated STA %pM\n" , sta->sta.addr);
@@ -2905,27 +2898,6 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta)return sta->deflink.status_stats.last_ack; } -static void sta_update_codel_params (struct sta_info *sta,u32 thr) -{ -if (thr && thr <STA_SLOW_THRESHOLD * sta->local->num_sta) { - sta->cparams.target =MS2TIME (50 ); - sta->cparams.interval =MS2TIME (300 ); - sta->cparams.ecn = false; - }else { - sta->cparams.target =MS2TIME (20 ); - sta->cparams.interval =MS2TIME (100 ); - sta->cparams.ecn = true; - } -} - -void ieee80211_sta_set_expected_throughput (struct ieee80211_sta *pubsta, -u32 thr) -{ - struct sta_info *sta = container_of(pubsta, struct sta_info, sta); - -sta_update_codel_params (sta, thr); -} -int ieee80211_sta_allocate_link (struct sta_info *sta,unsigned int link_id) {struct ieee80211_sub_if_data *sdata = sta->sdata;
net/mac80211/sta_info.h +0 -11
@@ -466,14 +466,6 @@ struct ieee80211_fragment_cache {unsigned int next; }; -/* -* The bandwidth threshold below which the per-station CoDel parameters will be -* scaled to be more lenient (to prevent starvation of slow stations). This -* value will be scaled by the number of active stations when it is being -* applied. -*/ -#define STA_SLOW_THRESHOLD 6000/* 6 Mbps */ -/** * struct link_sta_info - Link STA information * All link specific sta info are stored here for reference. This can be
@@ -626,7 +618,6 @@ struct link_sta_info {* @sta: station information we share with the driver * @sta_state: duplicates information about station state (for debug) * @rcu_head: RCU head used for freeing this station struct -* @cparams: CoDel parameters for this station. * @reserved_tid: reserved TID (if any, otherwise IEEE80211_TID_UNRESERVED) * @amsdu_mesh_control: track the mesh A-MSDU format used by the peer: *
@@ -717,8 +708,6 @@ struct sta_info {struct dentry *debugfs_dir;#endif -struct codel_params cparams; -u8 reserved_tid;s8 amsdu_mesh_control;
net/mac80211/tx.c +1 -8
@@ -1402,16 +1402,9 @@ static struct sk_buff *fq_tin_dequeue_func(struct fq *fq, local = container_of(fq, struct ieee80211_local, fq); txqi = container_of(tin, struct txq_info, tin); + cparams = &local->cparams; cstats = &txqi->cstats; -if (txqi->txq.sta) { -struct sta_info *sta =container_of (txqi->txq.sta, - struct sta_info, sta); - cparams = &sta->cparams; - }else { - cparams = &local->cparams; - } -if (flow == &tin->default_flow) cvars = &txqi->def_cvars;else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 391/592 wifi: iwlwifi: Add missing MODULE_FIRMWARE for Qu-c0-jf-b0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Víctor Gonzalo <[email protected]>
[ Upstream commit 2b801487ac3be7bec561ae62d1a6c4d6f5283f8c ]
The module metadata for the firmware file iwlwifi-Qu-c0-jf-b0-* is missing.
--- drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +3 -0
@@ -44,6 +44,8 @@ IWL_QU_C_HR_B_FW_PRE "-" __stringify(api) ".ucode"#define IWL_QU_B_JF_B_MODULE_FIRMWARE (api) \ IWL_QU_B_JF_B_FW_PRE "-" __stringify(api) ".ucode" +#define IWL_QU_C_JF_B_MODULE_FIRMWARE (api) \ + IWL_QU_C_JF_B_FW_PRE "-" __stringify(api) ".ucode"#define IWL_CC_A_MODULE_FIRMWARE (api) \ IWL_CC_A_FW_PRE "-" __stringify(api) ".ucode"
@@ -422,6 +424,7 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = {MODULE_FIRMWARE (IWL_QU_B_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QU_C_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QU_B_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX )); +MODULE_FIRMWARE (IWL_QU_C_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QUZ_A_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QUZ_A_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_CC_A_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 392/592 net: bridge: mcast: update multicast contex when vlan state is changed
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yong Wang <[email protected]>
[ Upstream commit 6c131043eaf1be2a6cc2d228f92ceb626fbcc0f3 ]
When the vlan STP state is changed, which could be manipulated by "bridge vlan" commands, similar to port STP state, this also impacts multicast behaviors such as igmp query. In the scenario of per-VLAN snooping, there's a need to update the corresponding multicast context to re-arm the port query timer when vlan state becomes "forwarding" etc.
Update br_vlan_set_state() function to enable vlan multicast context in such scenario.
Before the patch, the IGMP query does not happen in the last step of the following test sequence, i.e. no growth for tx counter:
# ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1 # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0 # ip link add name swp1 up master br1 type dummy # sleep 1 # bridge vlan set vid 1 dev swp1 state 4 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # sleep 1 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # bridge vlan set vid 1 dev swp1 state 3 # sleep 2 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1
After the patch, the IGMP query happens in the last step of the test:
# ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1 # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0 # ip link add name swp1 up master br1 type dummy # sleep 1 # bridge vlan set vid 1 dev swp1 state 4 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # sleep 1 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # bridge vlan set vid 1 dev swp1 state 3 # sleep 2 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 3
--- net/bridge/br_mst.c | 4 ++-- net/bridge/br_multicast.c | 26 ++++++++++++++++++++++++++ net/bridge/br_private.h | 11 ++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-)
net/bridge/br_mst.c +2 -2
@@ -80,10 +80,10 @@ static void br_mst_vlan_set_state(struct net_bridge_vlan_group *vg,if (br_vlan_get_state (v) == state)return ; -br_vlan_set_state (v, state); -if (v->vid == vg->pvid)br_vlan_set_pvid_state (vg, state); + +br_vlan_set_state (v, state); } int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state,
net/bridge/br_multicast.c +26 -0
@@ -4211,6 +4211,32 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)#endif } +void br_multicast_update_vlan_mcast_ctx (struct net_bridge_vlan *v,u8 state) +{ +#if IS_ENABLED (CONFIG_BRIDGE_VLAN_FILTERING ) +struct net_bridge *br; + +if (!br_vlan_should_use (v)) +return ; + +if (br_vlan_is_master (v)) +return ; + + br = v->port->br; + +if (!br_opt_get (br,BROPT_MCAST_VLAN_SNOOPING_ENABLED )) +return ; + +if (br_vlan_state_allowed (state, true)) +br_multicast_enable_port_ctx (&v->port_mcast_ctx); + +/* Multicast is not disabled for the vlan when it goes in +* blocking state because the timers will expire and stop by +* themselves without sending more queries. +*/ +#endif +} +void br_multicast_toggle_one_vlan (struct net_bridge_vlan *vlan,bool on) {struct net_bridge *br;
net/bridge/br_private.h +10 -1
@@ -1052,6 +1052,7 @@ void br_multicast_port_ctx_init(struct net_bridge_port *port,struct net_bridge_vlan *vlan, struct net_bridge_mcast_port *pmctx);void br_multicast_port_ctx_deinit (struct net_bridge_mcast_port *pmctx); +void br_multicast_update_vlan_mcast_ctx (struct net_bridge_vlan *v,u8 state);void br_multicast_toggle_one_vlan (struct net_bridge_vlan *vlan,bool on);int br_multicast_toggle_vlan_snooping (struct net_bridge *br,bool on,struct netlink_ext_ack *extack);
@@ -1502,6 +1503,11 @@ static inline void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pm { } +static inline void br_multicast_update_vlan_mcast_ctx (struct net_bridge_vlan *v, +u8 state) +{ +} +static inline void br_multicast_toggle_one_vlan (struct net_bridge_vlan *vlan,bool on) {
@@ -1862,7 +1868,9 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,bool br_vlan_global_opts_fill (struct sk_buff *skb,u16 vid,u16 vid_range,const struct net_bridge_vlan *v_opts); -/* vlan state manipulation helpers using *_ONCE to annotate lock-free access */ +/* vlan state manipulation helpers using *_ONCE to annotate lock-free access, +* while br_vlan_set_state() may access data protected by multicast_lock. +*/ static inline u8 br_vlan_get_state (const struct net_bridge_vlan *v) {return READ_ONCE (v->state);
@@ -1871,6 +1879,7 @@ static inline u8 br_vlan_get_state(const struct net_bridge_vlan *v)static inline void br_vlan_set_state (struct net_bridge_vlan *v,u8 state) {WRITE_ONCE (v->state, state); +br_multicast_update_vlan_mcast_ctx (v, state); }static inline u8 br_vlan_get_pvid_state (const struct net_bridge_vlan_group *vg)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 393/592 net: bridge: mcast: re-implement br_multicast_{enable, disable}_port functions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yong Wang <[email protected]>
[ Upstream commit 4b30ae9adb047dd0a7982975ec3933c529537026 ]
When a bridge port STP state is changed from BLOCKING/DISABLED to FORWARDING, the port's igmp query timer will NOT re-arm itself if the bridge has been configured as per-VLAN multicast snooping.
Solve this by choosing the correct multicast context(s) to enable/disable port multicast based on whether per-VLAN multicast snooping is enabled or not, i.e. using per-{port, VLAN} context in case of per-VLAN multicast snooping by re-implementing br_multicast_enable_port() and br_multicast_disable_port() functions.
Before the patch, the IGMP query does not happen in the last step of the following test sequence, i.e. no growth for tx counter:
# ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1 # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0 # ip link add name swp1 up master br1 type dummy # bridge link set dev swp1 state 0 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # sleep 1 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # bridge link set dev swp1 state 3 # sleep 2 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1
After the patch, the IGMP query happens in the last step of the test:
# ip link add name br1 up type bridge vlan_filtering 1 mcast_snooping 1 mcast_vlan_snooping 1 mcast_querier 1 mcast_stats_enabled 1 # bridge vlan global set vid 1 dev br1 mcast_snooping 1 mcast_querier 1 mcast_query_interval 100 mcast_startup_query_count 0 # ip link add name swp1 up master br1 type dummy # bridge link set dev swp1 state 0 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # sleep 1 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 1 # bridge link set dev swp1 state 3 # sleep 2 # ip -j -p stats show dev swp1 group xstats_slave subgroup bridge suite mcast | jq '.[]["multicast"]["igmp_queries"]["tx_v2"]' 3
--- net/bridge/br_multicast.c | 77 +++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 8 deletions(-)
net/bridge/br_multicast.c +69 -8
@@ -2105,12 +2105,17 @@ static void __br_multicast_enable_port_ctx(struct net_bridge_mcast_port *pmctx) } } -void br_multicast_enable_port (struct net_bridge_port *port) +static void br_multicast_enable_port_ctx (struct net_bridge_mcast_port *pmctx) { -struct net_bridge *br = port->br; +struct net_bridge *br = pmctx->port->br;spin_lock_bh (&br->multicast_lock); -__br_multicast_enable_port_ctx (&port->multicast_ctx); +if (br_multicast_port_ctx_is_vlan (pmctx) && + !(pmctx->vlan->priv_flags &BR_VLFLAG_MCAST_ENABLED )) { +spin_unlock_bh (&br->multicast_lock); +return ; + } +__br_multicast_enable_port_ctx (pmctx);spin_unlock_bh (&br->multicast_lock); }
@@ -2137,11 +2142,67 @@ static void __br_multicast_disable_port_ctx(struct net_bridge_mcast_port *pmctx)br_multicast_rport_del_notify (pmctx, del); } +static void br_multicast_disable_port_ctx (struct net_bridge_mcast_port *pmctx) +{ +struct net_bridge *br = pmctx->port->br; + +spin_lock_bh (&br->multicast_lock); +if (br_multicast_port_ctx_is_vlan (pmctx) && + !(pmctx->vlan->priv_flags &BR_VLFLAG_MCAST_ENABLED )) { +spin_unlock_bh (&br->multicast_lock); +return ; + } + +__br_multicast_disable_port_ctx (pmctx); +spin_unlock_bh (&br->multicast_lock); +} + +static void br_multicast_toggle_port (struct net_bridge_port *port,bool on) +{ +#if IS_ENABLED (CONFIG_BRIDGE_VLAN_FILTERING ) +if (br_opt_get (port->br,BROPT_MCAST_VLAN_SNOOPING_ENABLED )) { +struct net_bridge_vlan_group *vg; +struct net_bridge_vlan *vlan; + +rcu_read_lock (); + vg =nbp_vlan_group_rcu (port); +if (!vg) { +rcu_read_unlock (); +return ; + } + +/* iterate each vlan, toggle vlan multicast context */ +list_for_each_entry_rcu (vlan, &vg->vlan_list, vlist) { +struct net_bridge_mcast_port *pmctx = + &vlan->port_mcast_ctx; +u8 state =br_vlan_get_state (vlan); +/* enable vlan multicast context when state is +* LEARNING or FORWARDING +*/ +if (on &&br_vlan_state_allowed (state, true)) +br_multicast_enable_port_ctx (pmctx); +else +br_multicast_disable_port_ctx (pmctx); + } +rcu_read_unlock (); +return ; + } +#endif +/* toggle port multicast context when vlan snooping is disabled */ +if (on) +br_multicast_enable_port_ctx (&port->multicast_ctx); +else +br_multicast_disable_port_ctx (&port->multicast_ctx); +} + +void br_multicast_enable_port (struct net_bridge_port *port) +{ +br_multicast_toggle_port (port, true); +} +void br_multicast_disable_port (struct net_bridge_port *port) { -spin_lock_bh (&port->br->multicast_lock); -__br_multicast_disable_port_ctx (&port->multicast_ctx); -spin_unlock_bh (&port->br->multicast_lock); +br_multicast_toggle_port (port, false); }static int __grp_src_delete_marked (struct net_bridge_port_group *pg)
@@ -4330,9 +4391,9 @@ int br_multicast_toggle_vlan_snooping(struct net_bridge *br, bool on,__br_multicast_open (&br->multicast_ctx);list_for_each_entry (p, &br->port_list, list) {if (on) -br_multicast_disable_port (p); +br_multicast_disable_port_ctx (&p->multicast_ctx);else -br_multicast_enable_port (p); +br_multicast_enable_port_ctx (&p->multicast_ctx); }list_for_each_entry (vlan, &vg->vlan_list, vlist)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 394/592 vxlan: Do not treat dst cache initialization errors as fatal
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 20c76dadc783759fd3819d289c72be590660cc8b ]
FDB entries are allocated in an atomic context as they can be added from the data path when learning is enabled.
After converting the FDB hash table to rhashtable, the insertion rate will be much higher (*) which will entail a much higher rate of per-CPU allocations via dst_cache_init().
When adding a large number of entries (e.g., 256k) in a batch, a small percentage (< 0.02%) of these per-CPU allocations will fail [1]. This does not happen with the current code since the insertion rate is low enough to give the per-CPU allocator a chance to asynchronously create new chunks of per-CPU memory.
Given that:
a. Only a small percentage of these per-CPU allocations fail.
b. The scenario where this happens might not be the most realistic one.
c. The driver can work correctly without dst caches. The dst_cache_*() APIs first check that the dst cache was properly initialized.
d. The dst caches are not always used (e.g., 'tos inherit').
It seems reasonable to not treat these allocation failures as fatal.
Therefore, do not bail when dst_cache_init() fails and suppress warnings by specifying '__GFP_NOWARN'.
[1] percpu: allocation failed, size=40 align=8 atomic=1, atomic alloc failed, no space left
(*) 97% reduction in average latency of vxlan_fdb_update() when adding 256k entries in a batch.
--- drivers/net/vxlan/vxlan_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/vxlan/vxlan_core.c +4 -4
@@ -610,10 +610,10 @@ static int vxlan_fdb_append(struct vxlan_fdb *f,if (rd ==NULL )return -ENOMEM ; -if (dst_cache_init (&rd->dst_cache,GFP_ATOMIC )) { -kfree (rd); -return -ENOMEM ; - } +/* The driver can work correctly without a dst cache, so do not treat +* dst cache initialization errors as fatal. +*/ +dst_cache_init (&rd->dst_cache,GFP_ATOMIC | __GFP_NOWARN); rd->remote_ip = *ip; rd->remote_port = port;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 395/592 bnxt_en: Remove unused field "ref_count" in struct bnxt_ulp
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh AP <[email protected]>
[ Upstream commit 5bccacb4cc32cb835fe2fe100a210332c494e81d ]
The "ref_count" field in struct bnxt_ulp is unused after commit a43c26fa2e6c ("RDMA/bnxt_re: Remove the sriov config callback"). So we can just remove it now.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 5 ----- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 - 2 files changed, 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +0 -5
@@ -149,7 +149,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev)struct net_device *dev = edev->net;struct bnxt *bp =netdev_priv (dev);struct bnxt_ulp *ulp; -int i =0 ; ulp = edev->ulp_tbl;netdev_lock (dev);
@@ -165,10 +164,6 @@ void bnxt_unregister_dev(struct bnxt_en_dev *edev)synchronize_rcu (); ulp->max_async_event_id =0 ; ulp->async_events_bmap =NULL ; -while (atomic_read (&ulp->ref_count) !=0 && i <10 ) { -msleep (100 ); - i++; - }mutex_unlock (&edev->en_dev_lock);netdev_unlock (dev);return ;
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +0 -1
@@ -50,7 +50,6 @@ struct bnxt_ulp {unsigned long *async_events_bmap;u16 max_async_event_id;u16 msix_requested; -atomic_t ref_count; };struct bnxt_en_dev {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 396/592 vxlan: Add RCU read-side critical sections in the Tx path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 804b09be09f8af4eda5346a72361459ba21fcf1b ]
The Tx path does not run from an RCU read-side critical section which makes the current lockless accesses to FDB entries invalid. As far as I am aware, this has not been a problem in practice, but traces will be generated once we transition the FDB lookup to rhashtable_lookup().
Add rcu_read_{lock,unlock}() around the handling of FDB entries in the Tx path. Remove the RCU read-side critical section from vxlan_xmit_nh() as now the function is always called from an RCU read-side critical section.
--- drivers/net/vxlan/vxlan_core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/vxlan/vxlan_core.c +8 -6
@@ -1916,12 +1916,15 @@ static int arp_reduce(struct net_device *dev, struct sk_buff *skb, __be32 vni) goto out; } +rcu_read_lock (); f =vxlan_find_mac (vxlan, n->ha, vni);if (f &&vxlan_addr_any (&(first_remote_rcu (f)->remote_ip))) {/* bridge-local neighbor */ neigh_release (n); +rcu_read_unlock (); goto out; } +rcu_read_unlock (); reply =arp_create (ARPOP_REPLY ,ETH_P_ARP , sip, dev, tip, sha, n->ha, sha);
@@ -2648,14 +2651,10 @@ static void vxlan_xmit_nh(struct sk_buff *skb, struct net_device *dev,memset (&nh_rdst,0 ,sizeof (struct vxlan_rdst )); hash =skb_get_hash (skb); -rcu_read_lock (); nh =rcu_dereference (f->nh); -if (!nh) { -rcu_read_unlock (); +if (!nh) goto drop; - } do_xmit =vxlan_fdb_nh_path_select (nh, hash, &nh_rdst); -rcu_read_unlock ();if (likely (do_xmit))vxlan_xmit_one (skb, dev, vni, &nh_rdst, did_rsc);
@@ -2782,6 +2781,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) } eth =eth_hdr (skb); +rcu_read_lock (); f =vxlan_find_mac (vxlan, eth->h_dest, vni); did_rsc = false;
@@ -2804,7 +2804,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)vxlan_vnifilter_count (vxlan, vni,NULL ,VXLAN_VNI_STATS_TX_DROPS ,0 );kfree_skb_reason (skb,SKB_DROP_REASON_NO_TX_TARGET ); -return NETDEV_TX_OK ; + goto out; } }
@@ -2829,6 +2829,8 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)kfree_skb_reason (skb,SKB_DROP_REASON_NO_TX_TARGET ); } +out: +rcu_read_unlock ();return NETDEV_TX_OK ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 397/592 wifi: ath12k: correctly handle mcast packets for clients
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit 4541b0c8c3c1b85564971d497224e57cf8076a02 ]
Currently, RX is_mcbc bit is set for packets sent from client as destination address (DA) is multicast/broadcast address, but packets are actually unicast as receiver address (RA) is not multicast address. Hence, packets are not handled properly due to this is_mcbc bit.
Therefore, reset the is_mcbc bit if interface type is AP.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 5 +++++ drivers/net/wireless/ath/ath12k/peer.c | 5 ++++- drivers/net/wireless/ath/ath12k/peer.h | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +5 -0
@@ -2259,6 +2259,11 @@ static void ath12k_dp_rx_h_mpdu(struct ath12k *ar,spin_lock_bh (&ar->ab->base_lock); peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu, rx_info);if (peer) { +/* resetting mcbc bit because mcbc packets are unicast +* packets only for AP as STA sends unicast packets. +*/ + rxcb->is_mcbc = rxcb->is_mcbc && !peer->ucast_ra_only; +if (rxcb->is_mcbc) enctype = peer->sec_type_grp;else
drivers/net/wireless/ath/ath12k/peer.c +4 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h"
@@ -383,6 +383,9 @@ int ath12k_peer_create(struct ath12k *ar, struct ath12k_link_vif *arvif, arvif->ast_idx = peer->hw_peer_id; } +if (vif->type ==NL80211_IFTYPE_AP ) + peer->ucast_ra_only = true; +if (sta) { ahsta =ath12k_sta_to_ahsta (sta); arsta = wiphy_dereference(ath12k_ar_to_hw(ar)->wiphy,
drivers/net/wireless/ath/ath12k/peer.h +2 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_PEER_H
@@ -62,6 +62,7 @@ struct ath12k_peer {/* for reference to ath12k_link_sta */ u8 link_id; +bool ucast_ra_only; };struct ath12k_ml_peer {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 398/592 wifi: ath12k: using msdu end descriptor to check for rx multicast packets
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit cb7433cc5cd4d07175dbc41f5a19966e9fae48be ]
Currently, the RX multicast broadcast packet check is performed using bit 15 from the info6 field of the MPDU start descriptor. This check can also be done using bit 9 from the info5 field of the MSDU end descriptor. However, in some scenarios multicast bit is not set when fetched from MPDU start descriptor.
Therefore, checking the RX multicast broadcast packet from the MSDU end descriptor is more reliable as it is per MSDU.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/hal.c +4 -4
@@ -449,8 +449,8 @@ static u8 *ath12k_hw_qcn9274_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc)static bool ath12k_hw_qcn9274_rx_desc_is_da_mcbc (struct hal_rx_desc *desc) { -return __le32_to_cpu (desc->u.qcn9274.mpdu_start.info6) & -RX_MPDU_START_INFO6_MCAST_BCAST ; +return __le16_to_cpu (desc->u.qcn9274.msdu_end.info5) & +RX_MSDU_END_INFO5_DA_IS_MCBC ; } static void ath12k_hw_qcn9274_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc,
@@ -902,8 +902,8 @@ static u8 *ath12k_hw_qcn9274_compact_rx_desc_mpdu_start_addr2(struct hal_rx_descstatic bool ath12k_hw_qcn9274_compact_rx_desc_is_da_mcbc (struct hal_rx_desc *desc) { -return __le32_to_cpu (desc->u.qcn9274_compact.mpdu_start.info6) & -RX_MPDU_START_INFO6_MCAST_BCAST ; +return __le16_to_cpu (desc->u.qcn9274_compact.msdu_end.info5) & +RX_MSDU_END_INFO5_DA_IS_MCBC ; } static void ath12k_hw_qcn9274_compact_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 399/592 net: ethernet: ti: am65-cpsw: handle -EPROBE_DEFER
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 09737cb80b8686ffca4ed1805fee745d5c85604d ]
of_get_mac_address() might fetch the MAC address from NVMEM and that driver might not have been loaded. In that case, -EPROBE_DEFER is returned. Right now, this will trigger an immediate fallback to am65_cpsw_am654_get_efuse_macid() possibly resulting in a random MAC address although the MAC address is stored in the referenced NVMEM.
Fix it by handling the -EPROBE_DEFER return code correctly. This also means that the creation of the MDIO device has to be moved to a later stage as -EPROBE_DEFER must not be returned after child devices are created.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +13 -11
@@ -2679,7 +2679,9 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) goto of_node_put; ret =of_get_mac_address (port_np, port->slave.mac_addr); -if (ret) { +if (ret == -EPROBE_DEFER ) { + goto of_node_put; + }else if (ret) {am65_cpsw_am654_get_efuse_macid (port_np, port->port_id, port->slave.mac_addr);
@@ -3561,6 +3563,16 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)return ret; } +am65_cpsw_nuss_get_ver (common); + + ret =am65_cpsw_nuss_init_host_p (common); +if (ret) + goto err_pm_clear; + + ret =am65_cpsw_nuss_init_slave_ports (common); +if (ret) + goto err_pm_clear; + node =of_get_child_by_name (dev->of_node,"mdio" );if (!node) {dev_warn (dev,"MDIO node not found\n" );
@@ -3577,16 +3589,6 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev) }of_node_put (node); -am65_cpsw_nuss_get_ver (common); - - ret =am65_cpsw_nuss_init_host_p (common); -if (ret) - goto err_of_clear; - - ret =am65_cpsw_nuss_init_slave_ports (common); -if (ret) - goto err_of_clear; -/* init common data */ ale_params.dev = dev; ale_params.ale_ageout =AM65_CPSW_ALE_AGEOUT_DEFAULT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 400/592 software node: Correct a OOB check in software_node_get_reference_args()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 31e4e12e0e9609850cefd4b2e1adf782f56337d6 ]
software_node_get_reference_args() wants to get @index-th element, so the property value requires at least '(index + 1) * sizeof(*ref)' bytes but that can not be guaranteed by current OOB check, and may cause OOB for malformed property.
Fix by using as OOB check '((index + 1) * sizeof(*ref) > prop->length)'.
--- drivers/base/swnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/swnode.c +1 -1
@@ -529,7 +529,7 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,if (prop->is_inline)return -EINVAL ; -if (index *sizeof (*ref) >= prop->length) +if ((index +1 ) *sizeof (*ref) > prop->length)return -ENOENT ; ref_array = prop->pointer;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 401/592 wifi: ath12k: make assoc link associate first
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit ead6d41116b81098061c878d9bfc0b1a6c629090 ]
In MLO scenario WCN7850 firmware requests the assoc link to associate before any other links. However currently in ath12k_mac_op_vif_cfg_changed() we are doing association in an ascending order of link id. If the assoc link does not get assigned the smallest id, a non-assoc link gets associated first and firmware crashes.
Change to do association for the assoc link first.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00209-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/net/wireless/ath/ath12k/mac.c +31 -0
@@ -3703,6 +3703,8 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw,unsigned long links = ahvif->links_map;struct ieee80211_bss_conf *info;struct ath12k_link_vif *arvif; +struct ieee80211_sta *sta; +struct ath12k_sta *ahsta;struct ath12k *ar;u8 link_id;
@@ -3715,6 +3717,35 @@ static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, }if (changed &BSS_CHANGED_ASSOC ) { +if (vif->cfg.assoc) { +/* only in station mode we can get here, so it's safe +* to use ap_addr +*/ +rcu_read_lock (); + sta =ieee80211_find_sta (vif, vif->cfg.ap_addr); +if (!sta) { +rcu_read_unlock (); +WARN_ONCE (1 ,"failed to find sta with addr %pM\n" , + vif->cfg.ap_addr); +return ; + } + + ahsta =ath12k_sta_to_ahsta (sta); + arvif =wiphy_dereference (hw->wiphy, + ahvif->link[ahsta->assoc_link_id]); +rcu_read_unlock (); + + ar = arvif->ar; +/* there is no reason for which an assoc link's +* bss info does not exist +*/ + info =ath12k_mac_get_link_bss_conf (arvif); +ath12k_bss_assoc (ar, arvif, info); + +/* exclude assoc link as it is done above */ + links &= ~BIT (ahsta->assoc_link_id); + } +for_each_set_bit (link_id, &links,IEEE80211_MLD_MAX_NUM_LINKS ) { arvif =wiphy_dereference (hw->wiphy, ahvif->link[link_id]);if (!arvif || !arvif->ar)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 402/592 isofs: fix Y2038 and Y2156 issues in Rock Ridge TF entry
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas 'Sortie' Termansen <[email protected]>
[ Upstream commit 5ea45f54c8d6ca2a95b7bd450ee9eb253310bfd3 ]
This change implements the Rock Ridge TF entry LONG_FORM bit, which uses the ISO 9660 17-byte date format (up to year 9999, with 10ms precision) instead of the 7-byte date format (up to year 2155, with 1s precision).
Previously the LONG_FORM bit was ignored; and isofs would entirely misinterpret the date as the wrong format, resulting in garbage timestamps on the filesystem.
The Y2038 issue in iso_date() is fixed by returning a struct timespec64 instead of an int.
parse_rock_ridge_inode_internal() is fixed so it does proper bounds checks of the TF entry timestamps.
--- fs/isofs/inode.c | 7 +++++-- fs/isofs/isofs.h | 4 +++- fs/isofs/rock.c | 40 ++++++++++++++++++++++----------------- fs/isofs/rock.h | 6 +----- fs/isofs/util.c | 49 +++++++++++++++++++++++++++++++----------------- 5 files changed, 64 insertions(+), 42 deletions(-)
fs/isofs/inode.c +5 -2
@@ -1275,6 +1275,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)unsigned long offset;struct iso_inode_info *ei =ISOFS_I (inode);int ret = -EIO ; +struct timespec64 ts; block = ei->i_iget5_block; bh =sb_bread (inode->i_sb, block);
@@ -1387,8 +1388,10 @@ static int isofs_read_inode(struct inode *inode, int relocated) inode->i_ino, de->flags[-high_sierra]); }#endif -inode_set_mtime_to_ts (inode, -inode_set_atime_to_ts (inode,inode_set_ctime (inode,iso_date (de->date, high_sierra),0 ))); + ts =iso_date (de->date, high_sierra ?ISO_DATE_HIGH_SIERRA :0 ); +inode_set_ctime_to_ts (inode, ts); +inode_set_atime_to_ts (inode, ts); +inode_set_mtime_to_ts (inode, ts); ei->i_first_extent = (isonum_733 (de->extent) +isonum_711 (de->ext_attr_length));
fs/isofs/isofs.h +3 -1
@@ -106,7 +106,9 @@ static inline unsigned int isonum_733(u8 *p)/* Ignore bigendian datum due to broken mastering programs */ return get_unaligned_le32 (p); } -extern int iso_date (u8 *,int ); +#define ISO_DATE_HIGH_SIERRA (1 << 0) +#define ISO_DATE_LONG_FORM (1 << 1) +struct timespec64 iso_date (u8 *p,int flags);struct inode ;/* To make gcc happy */
fs/isofs/rock.c +23 -17
@@ -412,7 +412,12 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de, } }break ; -case SIG ('T' ,'F' ): +case SIG ('T' ,'F' ): { +int flags, size, slen; + + flags = rr->u.TF.flags &TF_LONG_FORM ?ISO_DATE_LONG_FORM :0 ; + size = rr->u.TF.flags &TF_LONG_FORM ?17 :7 ; + slen = rr->len -5 ;/* * Some RRIP writers incorrectly place ctime in the * TF_CREATE field. Try to handle this correctly for
@@ -420,27 +425,28 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,*/ /* Rock ridge never appears on a High Sierra disk */ cnt =0 ; -if (rr->u.TF.flags &TF_CREATE ) { -inode_set_ctime (inode, -iso_date (rr->u.TF.times[cnt++].time,0 ), -0 ); +if ((rr->u.TF.flags &TF_CREATE ) && size <= slen) { +inode_set_ctime_to_ts (inode, +iso_date (rr->u.TF.data + size * cnt++, flags)); + slen -= size; } -if (rr->u.TF.flags &TF_MODIFY ) { -inode_set_mtime (inode, -iso_date (rr->u.TF.times[cnt++].time,0 ), -0 ); +if ((rr->u.TF.flags &TF_MODIFY ) && size <= slen) { +inode_set_mtime_to_ts (inode, +iso_date (rr->u.TF.data + size * cnt++, flags)); + slen -= size; } -if (rr->u.TF.flags &TF_ACCESS ) { -inode_set_atime (inode, -iso_date (rr->u.TF.times[cnt++].time,0 ), -0 ); +if ((rr->u.TF.flags &TF_ACCESS ) && size <= slen) { +inode_set_atime_to_ts (inode, +iso_date (rr->u.TF.data + size * cnt++, flags)); + slen -= size; } -if (rr->u.TF.flags &TF_ATTRIBUTES ) { -inode_set_ctime (inode, -iso_date (rr->u.TF.times[cnt++].time,0 ), -0 ); +if ((rr->u.TF.flags &TF_ATTRIBUTES ) && size <= slen) { +inode_set_ctime_to_ts (inode, +iso_date (rr->u.TF.data + size * cnt++, flags)); + slen -= size; }break ; + }case SIG ('S' ,'L' ): {int slen;
fs/isofs/rock.h +1 -5
@@ -65,13 +65,9 @@ struct RR_PL_s {__u8 location[8 ]; }; -struct stamp { -__u8 time[7 ];/* actually 6 unsigned, 1 signed */ -} __attribute__ ((packed)); -struct RR_TF_s {__u8 flags; -struct stamp times[];/* Variable number of these beasts */ +__u8 data[]; } __attribute__ ((packed));/* Linux-specific extension for transparent decompression */
fs/isofs/util.c +32 -17
68 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 403/592 pinctrl: mcp23s08: Reset all pins to input at probe
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Looijmans <[email protected]>
[ Upstream commit 3ede3f8b4b4b399b0ca41e44959f80d5cf84fc98 ]
At startup, the driver just assumes that all registers have their default values. But after a soft reset, the chip will just be in the state it was, and some pins may have been configured as outputs. Any modification of the output register will cause these pins to be driven low, which leads to unexpected/unwanted effects. To prevent this from happening, set the chip's IO configuration register to a known safe mode (all inputs) before toggling any other bits.
--- drivers/pinctrl/pinctrl-mcp23s08.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pinctrl/pinctrl-mcp23s08.c +8 -0
@@ -636,6 +636,14 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, mcp->reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_LOW ); +/* +* Reset the chip - we don't really know what state it's in, so reset +* all pins to input first to prevent surprises. +*/ + ret =mcp_write (mcp,MCP_IODIR , mcp->chip.ngpio ==16 ?0xFFFF :0xFF ); +if (ret <0 ) +return ret; +/* verify MCP_IOCON.SEQOP = 0, so sequential reads work, * and MCP_IOCON.HAEN = 1, so we work with all chips. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/592 wifi: ath12k: fix failed to set mhi state error during reboot with hardware grouping
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aditya Kumar Singh <[email protected]>
[ Upstream commit dce7aec6b1f74b0a46b901ab8de1f7bd0515f733 ]
With hardware grouping, during reboot, whenever a device is removed, it powers down itself and all its partner devices in the same group. Now this is done by all devices and hence there is multiple power down for devices and hence the following error messages can be seen:
ath12k_pci 0002:01:00.0: failed to set mhi state POWER_OFF(3) in current mhi state (0x0) ath12k_pci 0002:01:00.0: failed to set mhi state: POWER_OFF(3)ath12k_pci 0002:01:00.0: failed to set mhi state DEINIT(1) in current mhi state (0x0) ath12k_pci 0002:01:00.0: failed to set mhi state: DEINIT(1)ath12k_pci 0003:01:00.0: failed to set mhi state POWER_OFF(3) in current mhi state (0x0) ath12k_pci 0003:01:00.0: failed to set mhi state: POWER_OFF(3)ath12k_pci 0003:01:00.0: failed to set mhi state DEINIT(1) in current mhi state (0x0) ath12k_pci 0003:01:00.0: failed to set mhi state: DEINIT(1)ath12k_pci 0004:01:00.0: failed to set mhi state POWER_OFF(3) in current mhi state (0x0) ath12k_pci 0004:01:00.0: failed to set mhi state: POWER_OFF(3)
To prevent this, check if the ATH12K_PCI_FLAG_INIT_DONE flag is already set before powering down. If it is set, it indicates that another partner device has already performed the power down, and this device can skip this step.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath12k/pci.c +3 -0
@@ -1491,6 +1491,9 @@ void ath12k_pci_power_down(struct ath12k_base *ab, bool is_suspend) {struct ath12k_pci *ab_pci =ath12k_pci_priv (ab); +if (!test_bit (ATH12K_PCI_FLAG_INIT_DONE , &ab_pci->flags)) +return ; +/* restore aspm in case firmware bootup fails */ ath12k_pci_aspm_restore (ab_pci);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/592 scsi: lpfc: Use memcpy() for BIOS version
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit ae82eaf4aeea060bb736c3e20c0568b67c701d7d ]
The strlcat() with FORTIFY support is triggering a panic because it thinks the target buffer will overflow although the correct target buffer size is passed in.
Anyway, instead of memset() with 0 followed by a strlcat(), just use memcpy() and ensure that the resulting buffer is NULL terminated.
BIOSVersion is only used for the lpfc_printf_log() which expects a properly terminated string.
--- drivers/scsi/lpfc/lpfc_sli.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +2 -2
@@ -6003,9 +6003,9 @@ lpfc_sli4_get_ctl_attr(struct lpfc_hba *phba) phba->sli4_hba.flash_id =bf_get (lpfc_cntl_attr_flash_id, cntl_attr); phba->sli4_hba.asic_rev =bf_get (lpfc_cntl_attr_asic_rev, cntl_attr); -memset (phba->BIOSVersion,0 ,sizeof (phba->BIOSVersion)); -strlcat (phba->BIOSVersion, (char *)cntl_attr->bios_ver_str, +memcpy (phba->BIOSVersion, cntl_attr->bios_ver_str,sizeof (phba->BIOSVersion)); + phba->BIOSVersion[sizeof (phba->BIOSVersion) -1 ] ='\0' ;lpfc_printf_log (phba,KERN_INFO ,LOG_SLI , "3086 lnk_type:%d, lnk_numb:%d, bios_ver:%s, "
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/592 sock: Correct error checking condition for (assign|release)_proto_idx()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit faeefc173be40512341b102cf1568aa0b6571acd ]
(assign|release)_proto_idx() wrongly check find_first_zero_bit() failure by condition '(prot->inuse_idx == PROTO_INUSE_NR - 1)' obviously.
Fix by correcting the condition to '(prot->inuse_idx == PROTO_INUSE_NR)'
--- net/core/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/sock.c +2 -2
@@ -4004,7 +4004,7 @@ static int assign_proto_idx(struct proto *prot) { prot->inuse_idx =find_first_zero_bit (proto_inuse_idx,PROTO_INUSE_NR ); -if (unlikely (prot->inuse_idx ==PROTO_INUSE_NR -1 )) { +if (unlikely (prot->inuse_idx ==PROTO_INUSE_NR )) {pr_err ("PROTO_INUSE_NR exhausted\n" );return -ENOSPC ; }
@@ -4015,7 +4015,7 @@ static int assign_proto_idx(struct proto *prot)static void release_proto_idx (struct proto *prot) { -if (prot->inuse_idx !=PROTO_INUSE_NR -1 ) +if (prot->inuse_idx !=PROTO_INUSE_NR )clear_bit (prot->inuse_idx, proto_inuse_idx); }#else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/592 i40e: fix MMIO write access to an invalid page in i40e_clear_hw
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kyungwook Boo <[email protected]>
[ Upstream commit 015bac5daca978448f2671478c553ce1f300c21e ]
When the device sends a specific input, an integer underflow can occur, leading to MMIO write access to an invalid page.
Prevent the integer underflow by changing the type of related variables.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +4 -3
@@ -817,10 +817,11 @@ int i40e_pf_reset(struct i40e_hw *hw)void i40e_clear_hw (struct i40e_hw *hw) {u32 num_queues, base_queue; -u32 num_pf_int; -u32 num_vf_int; +s32 num_pf_int; +s32 num_vf_int;u32 num_vfs; -u32 i, j; +s32 i; +u32 j;u32 val;u32 eol =0x7ff ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/592 ixgbe: Fix unreachable retry logic in combined and byte I2C write functions
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rand Deeb <[email protected]>
[ Upstream commit cdcb3804eeda24d588348bbab6766cf14fddbeaa ]
The current implementation of ixgbe_write_i2c_combined_generic_int and ixgbe_write_i2c_byte_generic_int sets max_retry to 1, which makes the condition retry < max_retry always evaluate to false. This renders the retry mechanism ineffective, as the debug message and retry logic are never executed.
This patch increases max_retry to 3 in both functions, aligning them with the retry logic in ixgbe_read_i2c_combined_generic_int. This ensures that the retry mechanism functions as intended, improving robustness in case of I2C write failures.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +2 -2
@@ -167,7 +167,7 @@ int ixgbe_write_i2c_combined_generic_int(struct ixgbe_hw *hw, u8 addr, u16 reg, u16 val, bool lock) { u32 swfw_mask = hw->phy.phy_semaphore_mask; -int max_retry =1 ; +int max_retry =3 ;int retry =0 ;u8 reg_high;u8 csum;
@@ -2285,7 +2285,7 @@ static int ixgbe_write_i2c_byte_generic_int(struct ixgbe_hw *hw, u8 byte_offset, u8 dev_addr, u8 data, bool lock) { u32 swfw_mask = hw->phy.phy_semaphore_mask; -u32 max_retry =1 ; +u32 max_retry =3 ;u32 retry =0 ;int status;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/592 RDMA/hns: initialize db in update_srq_db()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Linxuan <[email protected]>
[ Upstream commit ffe1cee21f8b533ae27c3a31bfa56b8c1b27fa6e ]
On x86_64 with gcc version 13.3.0, I compile drivers/infiniband/hw/hns/hns_roce_hw_v2.c with:
make defconfig
./scripts/kconfig/merge_config.sh .config <(
echo CONFIG_COMPILE_TEST=y
echo CONFIG_HNS3=m
echo CONFIG_INFINIBAND=m
echo CONFIG_INFINIBAND_HNS_HIP08=m
)
make KCFLAGS="-fno-inline-small-functions -fno-inline-functions-called-once" \
drivers/infiniband/hw/hns/hns_roce_hw_v2.oThen I get a compile error:
CALL scripts/checksyscalls.sh
DESCEND objtool
INSTALL libsubcmd_headers
CC [M] drivers/infiniband/hw/hns/hns_roce_hw_v2.o
In file included from drivers/infiniband/hw/hns/hns_roce_hw_v2.c:47:
drivers/infiniband/hw/hns/hns_roce_hw_v2.c: In function 'update_srq_db':
drivers/infiniband/hw/hns/hns_roce_common.h:74:17: error: 'db' is used uninitialized [-Werror=uninitialized]
74 | *((__le32 *)_ptr + (field_h) / 32) &= \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/infiniband/hw/hns/hns_roce_common.h:90:17: note: in expansion of macro '_hr_reg_clear'
90 | _hr_reg_clear(ptr, field_type, field_h, field_l); \
| ^~~~~~~~~~~~~
drivers/infiniband/hw/hns/hns_roce_common.h:95:39: note: in expansion of macro '_hr_reg_write'
95 | #define hr_reg_write(ptr, field, val) _hr_reg_write(ptr, field, val)
| ^~~~~~~~~~~~~
drivers/infiniband/hw/hns/hns_roce_hw_v2.c:948:9: note: in expansion of macro 'hr_reg_write'
948 | hr_reg_write(&db, DB_TAG, srq->srqn);
| ^~~~~~~~~~~~
drivers/infiniband/hw/hns/hns_roce_hw_v2.c:946:31: note: 'db' declared here
946 | struct hns_roce_v2_db db;
| ^~cc1: all warnings being treated as errors
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -1
@@ -942,7 +942,7 @@ static void fill_wqe_idx(struct hns_roce_srq *srq, unsigned int wqe_idx)static void update_srq_db (struct hns_roce_srq *srq) {struct hns_roce_dev *hr_dev =to_hr_dev (srq->ibsrq.device); -struct hns_roce_v2_db db; +struct hns_roce_v2_db db = {};hr_reg_write (&db,DB_TAG , srq->srqn);hr_reg_write (&db,DB_CMD ,HNS_ROCE_V2_SRQ_DB );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/592 ice: fix check for existing switch rule
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Pacuszka <[email protected]>
[ Upstream commit a808691df39b52cd9db861b118e88e18b63e2299 ]
In case the rule already exists and another VSI wants to subscribe to it new VSI list is being created and both VSIs are moved to it. Currently, the check for already existing VSI with the same rule is done based on fdw_id.hw_vsi_id, which applies only to LOOKUP_RX flag. Change it to vsi_handle. This is software VSI ID, but it can be applied here, because vsi_map itself is also based on it.
Additionally change return status in case the VSI already exists in the VSI map to "Already exists". Such case should be handled by the caller.
--- drivers/net/ethernet/intel/ice/ice_switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_switch.c +2 -2
@@ -3146,7 +3146,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,u16 vsi_handle_arr[2 ];/* A rule already exists with the new VSI being added */ -if (cur_fltr->fwd_id.hw_vsi_id == new_fltr->fwd_id.hw_vsi_id) +if (cur_fltr->vsi_handle == new_fltr->vsi_handle)return -EEXIST ; vsi_handle_arr[0 ] = cur_fltr->vsi_handle;
@@ -5978,7 +5978,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,/* A rule already exists with the new VSI being added */ if (test_bit (vsi_handle, m_entry->vsi_list_info->vsi_map)) -return 0 ; +return -EEXIST ;/* Update the previously created VSI list set with * the new VSI ID passed in
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/592 usbnet: asix AX88772: leave the carrier control to phylink
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Hałasa <[email protected]>
[ Upstream commit 4145f00227ee80f21ab274e9cd9c09758e9bcf3d ]
ASIX AX88772B based USB 10/100 Ethernet adapter doesn't come up ("carrier off"), despite the built-in 100BASE-FX PHY positive link indication. The internal PHY is configured (using EEPROM) in fixed 100 Mbps full duplex mode.
The primary problem appears to be using carrier_netif_{on,off}() while, at the same time, delegating carrier management to phylink. Use only the latter and remove "manual control" in the asix driver.
I don't have any other AX88772 board here, but the problem doesn't seem specific to a particular board or settings - it's probably timing-dependent.
Remove unused asix_adjust_link() as well.
--- drivers/net/usb/asix.h | 1 - drivers/net/usb/asix_common.c | 22 ---------------------- drivers/net/usb/asix_devices.c | 17 ++++------------- 3 files changed, 4 insertions(+), 36 deletions(-)
drivers/net/usb/asix.h +0 -1
@@ -224,7 +224,6 @@ int asix_write_rx_ctl(struct usbnet *dev, u16 mode, int in_pm);u16 asix_read_medium_status (struct usbnet *dev,int in_pm);int asix_write_medium_mode (struct usbnet *dev,u16 mode,int in_pm); -void asix_adjust_link (struct net_device *netdev);int asix_write_gpio (struct usbnet *dev,u16 value,int sleep,int in_pm);
drivers/net/usb/asix_common.c +0 -22
@@ -414,28 +414,6 @@ int asix_write_medium_mode(struct usbnet *dev, u16 mode, int in_pm)return ret; } -/* set MAC link settings according to information from phylib */ -void asix_adjust_link (struct net_device *netdev) -{ -struct phy_device *phydev = netdev->phydev; -struct usbnet *dev =netdev_priv (netdev); -u16 mode =0 ; - -if (phydev->link) { - mode =AX88772_MEDIUM_DEFAULT ; - -if (phydev->duplex ==DUPLEX_HALF ) - mode &= ~AX_MEDIUM_FD ; - -if (phydev->speed !=SPEED_100 ) - mode &= ~AX_MEDIUM_PS ; - } - -asix_write_medium_mode (dev, mode,0 ); -phy_print_status (phydev); -usbnet_link_change (dev, phydev->link,0 ); -} -int asix_write_gpio (struct usbnet *dev,u16 value,int sleep,int in_pm) {int ret;
drivers/net/usb/asix_devices.c +4 -13
@@ -752,7 +752,6 @@ static void ax88772_mac_link_down(struct phylink_config *config,struct usbnet *dev =netdev_priv (to_net_dev (config->dev));asix_write_medium_mode (dev,0 ,0 ); -usbnet_link_change (dev, false, false); } static void ax88772_mac_link_up(struct phylink_config *config,
@@ -783,7 +782,6 @@ static void ax88772_mac_link_up(struct phylink_config *config, m |=AX_MEDIUM_RFC ;asix_write_medium_mode (dev, m,0 ); -usbnet_link_change (dev, true, false); }static const struct phylink_mac_ops ax88772_phylink_mac_ops = {
@@ -1350,10 +1348,9 @@ static const struct driver_info ax88772_info = { .description = "ASIX AX88772 USB 2.0 Ethernet", .bind = ax88772_bind, .unbind = ax88772_unbind, - .status = asix_status, .reset = ax88772_reset, .stop = ax88772_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET, .rx_fixup = asix_rx_fixup_common, .tx_fixup = asix_tx_fixup, };
@@ -1362,11 +1359,9 @@ static const struct driver_info ax88772b_info = { .description = "ASIX AX88772B USB 2.0 Ethernet", .bind = ax88772_bind, .unbind = ax88772_unbind, - .status = asix_status, .reset = ax88772_reset, .stop = ax88772_stop, - .flags =FLAG_ETHER |FLAG_FRAMING_AX |FLAG_LINK_INTR | - FLAG_MULTI_PACKET, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET, .rx_fixup = asix_rx_fixup_common, .tx_fixup = asix_tx_fixup, .data = FLAG_EEPROM_MAC,
@@ -1376,11 +1371,9 @@ static const struct driver_info lxausb_t1l_info = { .description = "Linux Automation GmbH USB 10Base-T1L", .bind = ax88772_bind, .unbind = ax88772_unbind, - .status = asix_status, .reset = ax88772_reset, .stop = ax88772_stop, - .flags =FLAG_ETHER |FLAG_FRAMING_AX |FLAG_LINK_INTR | - FLAG_MULTI_PACKET, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET, .rx_fixup = asix_rx_fixup_common, .tx_fixup = asix_tx_fixup, .data = FLAG_EEPROM_MAC,
@@ -1412,10 +1405,8 @@ static const struct driver_info hg20f9_info = { .description = "HG20F9 USB 2.0 Ethernet", .bind = ax88772_bind, .unbind = ax88772_unbind, - .status = asix_status, .reset = ax88772_reset, - .flags =FLAG_ETHER |FLAG_FRAMING_AX |FLAG_LINK_INTR | - FLAG_MULTI_PACKET, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET, .rx_fixup = asix_rx_fixup_common, .tx_fixup = asix_tx_fixup, .data = FLAG_EEPROM_MAC,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/592 f2fs: fix to set atomic write status more clear
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit db03c20c0850dc8d2bcabfa54b9438f7d666c863 ]
1. After we start atomic write in a database file, before committing all data, we'd better not set inode w/ vfs dirty status to avoid redundant updates, instead, we only set inode w/ atomic dirty status.
2. After we commit all data, before committing metadata, we need to clear atomic dirty status, and set vfs dirty status to allow vfs flush dirty inode.
--- fs/f2fs/inode.c | 4 +++- fs/f2fs/segment.c | 6 ++++++ fs/f2fs/super.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-)
fs/f2fs/inode.c +3 -1
@@ -34,7 +34,9 @@ void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync)if (f2fs_inode_dirtied (inode, sync))return ; -if (f2fs_is_atomic_file (inode)) +/* only atomic file w/ FI_ATOMIC_COMMITTED can be set vfs dirty */ +if (f2fs_is_atomic_file (inode) && + !is_inode_flag_set (inode,FI_ATOMIC_COMMITTED ))return ;mark_inode_dirty_sync (inode);
fs/f2fs/segment.c +6 -0
@@ -376,7 +376,13 @@ static int __f2fs_commit_atomic_write(struct inode *inode) }else { sbi->committed_atomic_block += fi->atomic_write_cnt;set_inode_flag (inode,FI_ATOMIC_COMMITTED ); + +/* +* inode may has no FI_ATOMIC_DIRTIED flag due to no write +* before commit. +*/ if (is_inode_flag_set (inode,FI_ATOMIC_DIRTIED )) { +/* clear atomic dirty status and set vfs dirty status */ clear_inode_flag (inode,FI_ATOMIC_DIRTIED );f2fs_mark_inode_dirty_sync (inode, true); }
fs/f2fs/super.c +3 -1
@@ -1531,7 +1531,9 @@ int f2fs_inode_dirtied(struct inode *inode, bool sync) }spin_unlock (&sbi->inode_lock[DIRTY_META ]); -if (!ret &&f2fs_is_atomic_file (inode)) +/* if atomic write is not committed, set inode w/ atomic dirty */ +if (!ret &&f2fs_is_atomic_file (inode) && + !is_inode_flag_set (inode,FI_ATOMIC_COMMITTED ))set_inode_flag (inode,FI_ATOMIC_DIRTIED );return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/592 bpf, sockmap: Fix data lost during EAGAIN retries
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 7683167196bd727ad5f3c3fc6a9ca70f54520a81 ]
We call skb_bpf_redirect_clear() to clean _sk_redir before handling skb in backlog, but when sk_psock_handle_skb() return EAGAIN due to sk_rcvbuf limit, the redirect info in _sk_redir is not recovered.
Fix skb redir loss during EAGAIN retries by restoring _sk_redir information using skb_bpf_set_redir().
Before this patch:
'''
./bench sockmap -c 2 -p 1 -a --rx-verdict-ingress
Setting up benchmark 'sockmap'...
create socket fd c1:13 p1:14 c2:15 p2:16
Benchmark 'sockmap' started.
Send Speed 1343.172 MB/s, BPF Speed 1343.238 MB/s, Rcv Speed 65.271 MB/s Send Speed 1352.022 MB/s, BPF Speed 1352.088 MB/s, Rcv Speed 0 MB/s Send Speed 1354.105 MB/s, BPF Speed 1354.105 MB/s, Rcv Speed 0 MB/s Send Speed 1355.018 MB/s, BPF Speed 1354.887 MB/s, Rcv Speed 0 MB/s
'''
Due to the high send rate, the RX processing path may frequently hit the sk_rcvbuf limit. Once triggered, incorrect _sk_redir will cause the flow to mistakenly enter the "!ingress" path, leading to send failures. (The Rcv speed depends on tcp_rmem).
After this patch:
'''
./bench sockmap -c 2 -p 1 -a --rx-verdict-ingress
Setting up benchmark 'sockmap'...
create socket fd c1:13 p1:14 c2:15 p2:16
Benchmark 'sockmap' started.
Send Speed 1347.236 MB/s, BPF Speed 1347.367 MB/s, Rcv Speed 65.402 MB/s Send Speed 1353.320 MB/s, BPF Speed 1353.320 MB/s, Rcv Speed 65.536 MB/s Send Speed 1353.186 MB/s, BPF Speed 1353.121 MB/s, Rcv Speed 65.536 MB/s
'''
--- net/core/skmsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/skmsg.c +2 -1
@@ -690,7 +690,8 @@ static void sk_psock_backlog(struct work_struct *work)if (ret <=0 ) {if (ret == -EAGAIN ) {sk_psock_skb_state (psock, state, len, off); - +/* Restore redir info we cleared before */ +skb_bpf_set_redir (skb, psock->sk, ingress);/* Delay slightly to prioritize any * other work that might be here. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/592 net: ethernet: cortina: Use TOE/TSO on all TCP
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 6a07e3af4973402fa199a80036c10060b922c92c ]
It is desireable to push the hardware accelerator to also process non-segmented TCP frames: we pass the skb->len to the "TOE/TSO" offloader and it will handle them.
Without this quirk the driver becomes unstable and lock up and and crash.
I do not know exactly why, but it is probably due to the TOE (TCP offload engine) feature that is coupled with the segmentation feature - it is not possible to turn one part off and not the other, either both TOE and TSO are active, or neither of them.
Not having the TOE part active seems detrimental, as if that hardware feature is not really supposed to be turned off.
The datasheet says:
"Based on packet parsing and TCP connection/NAT table
lookup results, the NetEngine puts the packets belonging to the same TCP connection to the same queue for the software to process. The NetEngine puts incoming packets to the buffer or series of buffers for a jumbo packet. With this hardware acceleration, IP/TCP header parsing, checksum validation and connection lookup are offloaded from the software processing."
After numerous tests with the hardware locking up after something between minutes and hours depending on load using iperf3 I have concluded this is necessary to stabilize the hardware.
--- drivers/net/ethernet/cortina/gemini.c | 37 +++++++++++++++++++++------ 1 file changed, 29 insertions(+), 8 deletions(-)
drivers/net/ethernet/cortina/gemini.c +29 -8
@@ -1144,6 +1144,7 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,struct gmac_txdesc *txd;skb_frag_t *skb_frag;dma_addr_t mapping; +bool tcp = false;void *buffer;u16 mss;int ret;
@@ -1151,6 +1152,13 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, word1 = skb->len; word3 =SOF_BIT ; +/* Determine if we are doing TCP */ +if (skb->protocol ==htons (ETH_P_IP )) + tcp = (ip_hdr (skb)->protocol ==IPPROTO_TCP ); +else +/* IPv6 */ + tcp = (ipv6_hdr (skb)->nexthdr ==IPPROTO_TCP ); + mss =skb_shinfo (skb)->gso_size;if (mss) {/* This means we are dealing with TCP and skb->len is the
@@ -1163,8 +1171,26 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, mss, skb->len); word1 |=TSS_MTU_ENABLE_BIT ; word3 |= mss; + }else if (tcp) { +/* Even if we are not using TSO, use the hardware offloader +* for transferring the TCP frame: this hardware has partial +* TCP awareness (called TOE - TCP Offload Engine) and will +* according to the datasheet put packets belonging to the +* same TCP connection in the same queue for the TOE/TSO +* engine to process. The engine will deal with chopping +* up frames that exceed ETH_DATA_LEN which the +* checksumming engine cannot handle (see below) into +* manageable chunks. It flawlessly deals with quite big +* frames and frames containing custom DSA EtherTypes. +*/ + mss = netdev->mtu +skb_tcp_all_headers (skb); + mss =min (mss, skb->len); +netdev_dbg (netdev,"TOE/TSO len %04x mtu %04x mss %04x\n" , + skb->len, netdev->mtu, mss); + word1 |=TSS_MTU_ENABLE_BIT ; + word3 |= mss; }else if (skb->len >=ETH_FRAME_LEN ) { -/* Hardware offloaded checksumming isn't working on frames +/* Hardware offloaded checksumming isn't working on non-TCP frames * bigger than 1514 bytes. A hypothesis about this is that the * checksum buffer is only 1518 bytes, so when the frames get * bigger they get truncated, or the last few bytes get
@@ -1181,21 +1207,16 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb, }if (skb->ip_summed ==CHECKSUM_PARTIAL ) { -int tcp =0 ; -/* We do not switch off the checksumming on non TCP/UDP * frames: as is shown from tests, the checksumming engine * is smart enough to see that a frame is not actually TCP * or UDP and then just pass it through without any changes * to the frame. */ -if (skb->protocol ==htons (ETH_P_IP )) { +if (skb->protocol ==htons (ETH_P_IP )) word1 |=TSS_IP_CHKSUM_BIT ; - tcp =ip_hdr (skb)->protocol ==IPPROTO_TCP ; - }else {/* IPv6 */ +else word1 |=TSS_IPV6_ENABLE_BIT ; - tcp =ipv6_hdr (skb)->nexthdr ==IPPROTO_TCP ; - } word1 |= tcp ?TSS_TCP_CHKSUM_BIT :TSS_UDP_CHKSUM_BIT ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 415/592 octeontx2-pf: Add error log forcn10k_map_unmap_rq_policer()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit 9c056ec6dd1654b1420dafbbe2a69718850e6ff2 ]
The cn10k_free_matchall_ipolicer() calls the cn10k_map_unmap_rq_policer() for each queue in a for loop without checking for any errors.
Check the return value of the cn10k_map_unmap_rq_policer() function during each loop, and report a warning if the function fails.
--- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c +6 -3
@@ -357,9 +357,12 @@ int cn10k_free_matchall_ipolicer(struct otx2_nic *pfvf)mutex_lock (&pfvf->mbox.lock);/* Remove RQ's policer mapping */ -for (qidx =0 ; qidx < hw->rx_queues; qidx++) -cn10k_map_unmap_rq_policer (pfvf, qidx, - hw->matchall_ipolicer, false); +for (qidx =0 ; qidx < hw->rx_queues; qidx++) { + rc =cn10k_map_unmap_rq_policer (pfvf, qidx, hw->matchall_ipolicer, false); +if (rc) +dev_warn (pfvf->dev,"Failed to unmap RQ %d's policer (error %d)." , + qidx, rc); + } rc =cn10k_free_leaf_profile (pfvf, hw->matchall_ipolicer);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 416/592 wifi: rtw88: Set AMPDU factor to hardware for RTL8814A
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 0d2a88690e583168effb03c64fd217a323b2c444 ]
Tell the chip the maximum AMPDU size supported by the AP. This greatly improves the TX speed of RTL8814AU in the 2.4 GHz band. Before: ~90 Mbps. After: ~300 Mbps.
--- drivers/net/wireless/realtek/rtw88/mac80211.c | 2 ++ drivers/net/wireless/realtek/rtw88/main.c | 32 +++++++++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 3 ++ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8812a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8814a.c | 11 +++++++ drivers/net/wireless/realtek/rtw88/rtw8821a.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + 11 files changed, 55 insertions(+)
drivers/net/wireless/realtek/rtw88/mac80211.c +2 -0
@@ -396,6 +396,8 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,if (rtw_bf_support)rtw_bf_assoc (rtwdev, vif, conf); +rtw_set_ampdu_factor (rtwdev, vif, conf); +rtw_fw_beacon_filter_config (rtwdev, true, vif); }else {rtw_leave_lps (rtwdev);
drivers/net/wireless/realtek/rtw88/main.c +32 -0
@@ -2447,6 +2447,38 @@ void rtw_core_enable_beacon(struct rtw_dev *rtwdev, bool enable) } } +void rtw_set_ampdu_factor (struct rtw_dev *rtwdev,struct ieee80211_vif *vif, +struct ieee80211_bss_conf *bss_conf) +{ +const struct rtw_chip_ops *ops = rtwdev->chip->ops; +struct ieee80211_sta *sta; +u8 factor =0xff ; + +if (!ops->set_ampdu_factor) +return ; + +rcu_read_lock (); + + sta =ieee80211_find_sta (vif, bss_conf->bssid); +if (!sta) { +rcu_read_unlock (); +rtw_warn (rtwdev,"%s: failed to find station %pM\n" , + __func__, bss_conf->bssid); +return ; + } + +if (sta->deflink.vht_cap.vht_supported) + factor =u32_get_bits (sta->deflink.vht_cap.cap, +IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK ); +else if (sta->deflink.ht_cap.ht_supported) + factor = sta->deflink.ht_cap.ampdu_factor; + +rcu_read_unlock (); + +if (factor !=0xff ) + ops->set_ampdu_factor (rtwdev, factor); +} +MODULE_AUTHOR ("Realtek Corporation" );MODULE_DESCRIPTION ("Realtek 802.11ac wireless core module" );MODULE_LICENSE ("Dual BSD/GPL" );
drivers/net/wireless/realtek/rtw88/main.h +3 -0
@@ -878,6 +878,7 @@ struct rtw_chip_ops { u32 antenna_rx);void (*cfg_ldo25)(struct rtw_dev *rtwdev,bool enable);void (*efuse_grant)(struct rtw_dev *rtwdev,bool enable); +void (*set_ampdu_factor)(struct rtw_dev *rtwdev,u8 factor);void (*false_alarm_statistics)(struct rtw_dev *rtwdev);void (*phy_calibration)(struct rtw_dev *rtwdev);void (*dpk_track)(struct rtw_dev *rtwdev);
@@ -2272,4 +2273,6 @@ void rtw_update_channel(struct rtw_dev *rtwdev, u8 center_channel,void rtw_core_port_switch (struct rtw_dev *rtwdev,struct ieee80211_vif *vif);bool rtw_core_check_sta_active (struct rtw_dev *rtwdev);void rtw_core_enable_beacon (struct rtw_dev *rtwdev,bool enable); +void rtw_set_ampdu_factor (struct rtw_dev *rtwdev,struct ieee80211_vif *vif, +struct ieee80211_bss_conf *bss_conf);#endif
drivers/net/wireless/realtek/rtw88/rtw8703b.c +1 -0
@@ -1904,6 +1904,7 @@ static const struct rtw_chip_ops rtw8703b_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8723x_cfg_ldo25, .efuse_grant = rtw8723x_efuse_grant, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw8723x_false_alarm_statistics, .phy_calibration = rtw8703b_phy_calibration, .dpk_track = NULL,
drivers/net/wireless/realtek/rtw88/rtw8723d.c +1 -0
@@ -1404,6 +1404,7 @@ static const struct rtw_chip_ops rtw8723d_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8723x_cfg_ldo25, .efuse_grant = rtw8723x_efuse_grant, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw8723x_false_alarm_statistics, .phy_calibration = rtw8723d_phy_calibration, .cck_pd_set = rtw8723d_phy_cck_pd_set,
drivers/net/wireless/realtek/rtw88/rtw8812a.c +1 -0
@@ -925,6 +925,7 @@ static const struct rtw_chip_ops rtw8812a_ops = { .set_tx_power_index = rtw88xxa_set_tx_power_index, .cfg_ldo25 = rtw8812a_cfg_ldo25, .efuse_grant = rtw88xxa_efuse_grant, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw88xxa_false_alarm_statistics, .phy_calibration = rtw8812a_phy_calibration, .cck_pd_set = rtw88xxa_phy_cck_pd_set,
drivers/net/wireless/realtek/rtw88/rtw8814a.c +11 -0
@@ -1332,6 +1332,16 @@ static void rtw8814a_cfg_ldo25(struct rtw_dev *rtwdev, bool enable) { } +/* Without this RTL8814A sends too many frames and (some?) 11n AP +* can't handle it, resulting in low TX speed. Other chips seem fine. +*/ +static void rtw8814a_set_ampdu_factor (struct rtw_dev *rtwdev,u8 factor) +{ + factor =min_t (u8, factor,IEEE80211_VHT_MAX_AMPDU_256K ); + +rtw_write32 (rtwdev,REG_AMPDU_MAX_LENGTH , (8192 << factor) -1 ); +} +static void rtw8814a_false_alarm_statistics (struct rtw_dev *rtwdev) {struct rtw_dm_info *dm_info = &rtwdev->dm_info;
@@ -2051,6 +2061,7 @@ static const struct rtw_chip_ops rtw8814a_ops = { .set_antenna = NULL, .cfg_ldo25 = rtw8814a_cfg_ldo25, .efuse_grant = rtw8814a_efuse_grant, + .set_ampdu_factor = rtw8814a_set_ampdu_factor, .false_alarm_statistics = rtw8814a_false_alarm_statistics, .phy_calibration = rtw8814a_phy_calibration, .cck_pd_set = rtw8814a_phy_cck_pd_set,
drivers/net/wireless/realtek/rtw88/rtw8821a.c +1 -0
@@ -871,6 +871,7 @@ static const struct rtw_chip_ops rtw8821a_ops = { .set_tx_power_index = rtw88xxa_set_tx_power_index, .cfg_ldo25 = rtw8821a_cfg_ldo25, .efuse_grant = rtw88xxa_efuse_grant, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw88xxa_false_alarm_statistics, .phy_calibration = rtw8821a_phy_calibration, .cck_pd_set = rtw88xxa_phy_cck_pd_set,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -1668,6 +1668,7 @@ static const struct rtw_chip_ops rtw8821c_ops = { .set_antenna = NULL, .set_tx_power_index = rtw8821c_set_tx_power_index, .cfg_ldo25 = rtw8821c_cfg_ldo25, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw8821c_false_alarm_statistics, .phy_calibration = rtw8821c_phy_calibration, .cck_pd_set = rtw8821c_phy_cck_pd_set,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2158,6 +2158,7 @@ static const struct rtw_chip_ops rtw8822b_ops = { .set_tx_power_index = rtw8822b_set_tx_power_index, .set_antenna = rtw8822b_set_antenna, .cfg_ldo25 = rtw8822b_cfg_ldo25, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw8822b_false_alarm_statistics, .phy_calibration = rtw8822b_phy_calibration, .pwr_track = rtw8822b_pwr_track,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -4969,6 +4969,7 @@ static const struct rtw_chip_ops rtw8822c_ops = { .set_tx_power_index = rtw8822c_set_tx_power_index, .set_antenna = rtw8822c_set_antenna, .cfg_ldo25 = rtw8822c_cfg_ldo25, + .set_ampdu_factor = NULL, .false_alarm_statistics = rtw8822c_false_alarm_statistics, .dpk_track = rtw8822c_dpk_track, .phy_calibration = rtw8822c_phy_calibration,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 417/592 wifi: ath12k: Fix incorrect rates sent to firmware
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pradeep Kumar Chitrapu <[email protected]>
[ Upstream commit cb1790249361ba9396b06b1af2500147e6e42e5e ]
Before firmware assert, if there is a station interface in the device which is not associated with an AP, the basic rates are set to zero. Following this, during firmware recovery, when basic rates are zero, ath12k driver is sending invalid rate codes, which are negative values, to firmware. This results in firmware assert.
Fix this by checking if rate codes are valid, before sending them to the firmware.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +11 -4
@@ -3451,7 +3451,10 @@ static void ath12k_recalculate_mgmt_rate(struct ath12k *ar, } sband = hw->wiphy->bands[def->chan->band]; - basic_rate_idx =ffs (bss_conf->basic_rates) -1 ; +if (bss_conf->basic_rates) + basic_rate_idx =__ffs (bss_conf->basic_rates); +else + basic_rate_idx =0 ; bitrate = sband->bitrates[basic_rate_idx].bitrate; hw_rate_code =ath12k_mac_get_rate_hw_value (bitrate);
@@ -4015,10 +4018,14 @@ static void ath12k_mac_bss_info_changed(struct ath12k *ar, band = def.chan->band; mcast_rate = info->mcast_rate[band]; -if (mcast_rate >0 ) +if (mcast_rate >0 ) { rateidx = mcast_rate -1 ; -else - rateidx =ffs (info->basic_rates) -1 ; + }else { +if (info->basic_rates) + rateidx =__ffs (info->basic_rates); +else + rateidx =0 ; + }if (ar->pdev->cap.supported_bands &WMI_HOST_WLAN_5GHZ_CAP ) rateidx +=ATH12K_MAC_FIRST_OFDM_RATE_IDX ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 418/592 wifi: ath12k: Fix the enabling of REO queue lookup table feature
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sriram R <[email protected]>
[ Upstream commit 0bbcd42b15fa730f393a01bc818802d9f0b04197 ]
Instead of storing the REO queue address inside peer entries, REO hardware module prefers them to be stored in SRAM which could be directly accessed by REO using peer_ID/TID based lookup table mechanism.
Fix the enabling of the REO queue lookup table(LUT) feature by configuring the LUT address information in the REO hardware register and setting the host service flags.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/dp.c | 77 +++++++++++++++++-------- drivers/net/wireless/ath/ath12k/dp.h | 5 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 10 +++- drivers/net/wireless/ath/ath12k/hal.h | 6 ++ drivers/net/wireless/ath/ath12k/hw.c | 2 + drivers/net/wireless/ath/ath12k/hw.h | 3 + drivers/net/wireless/ath/ath12k/wmi.c | 8 ++- drivers/net/wireless/ath/ath12k/wmi.h | 1 + 8 files changed, 83 insertions(+), 29 deletions(-)
drivers/net/wireless/ath/ath12k/dp.c +53 -24
@@ -1261,22 +1261,24 @@ static void ath12k_dp_reoq_lut_cleanup(struct ath12k_base *ab)if (!ab->hw_params->reoq_lut_support)return ; -if (dp->reoq_lut.vaddr) { +if (dp->reoq_lut.vaddr_unaligned) {ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_LUT_BASE0 (ab),0 ); -dma_free_coherent (ab->dev,DP_REOQ_LUT_SIZE , - dp->reoq_lut.vaddr, dp->reoq_lut.paddr); - dp->reoq_lut.vaddr =NULL ; +dma_free_coherent (ab->dev, dp->reoq_lut.size, + dp->reoq_lut.vaddr_unaligned, + dp->reoq_lut.paddr_unaligned); + dp->reoq_lut.vaddr_unaligned =NULL ; } -if (dp->ml_reoq_lut.vaddr) { +if (dp->ml_reoq_lut.vaddr_unaligned) {ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_LUT_BASE1 (ab),0 ); -dma_free_coherent (ab->dev,DP_REOQ_LUT_SIZE , - dp->ml_reoq_lut.vaddr, dp->ml_reoq_lut.paddr); - dp->ml_reoq_lut.vaddr =NULL ; +dma_free_coherent (ab->dev, dp->ml_reoq_lut.size, + dp->ml_reoq_lut.vaddr_unaligned, + dp->ml_reoq_lut.paddr_unaligned); + dp->ml_reoq_lut.vaddr_unaligned =NULL ; } }
@@ -1608,39 +1610,66 @@ static int ath12k_dp_cc_init(struct ath12k_base *ab)return ret; } +static int ath12k_dp_alloc_reoq_lut (struct ath12k_base *ab, +struct ath12k_reo_q_addr_lut *lut) +{ + lut->size =DP_REOQ_LUT_SIZE +HAL_REO_QLUT_ADDR_ALIGN -1 ; + lut->vaddr_unaligned =dma_alloc_coherent (ab->dev, lut->size, + &lut->paddr_unaligned, +GFP_KERNEL | __GFP_ZERO); +if (!lut->vaddr_unaligned) +return -ENOMEM ; + + lut->vaddr =PTR_ALIGN (lut->vaddr_unaligned,HAL_REO_QLUT_ADDR_ALIGN ); + lut->paddr = lut->paddr_unaligned + + ((unsigned long )lut->vaddr - (unsigned long )lut->vaddr_unaligned); +return 0 ; +} +static int ath12k_dp_reoq_lut_setup (struct ath12k_base *ab) {struct ath12k_dp *dp = &ab->dp; +u32 val; +int ret;if (!ab->hw_params->reoq_lut_support)return 0 ; - dp->reoq_lut.vaddr =dma_alloc_coherent (ab->dev, -DP_REOQ_LUT_SIZE , - &dp->reoq_lut.paddr, -GFP_KERNEL | __GFP_ZERO); -if (!dp->reoq_lut.vaddr) { + ret =ath12k_dp_alloc_reoq_lut (ab, &dp->reoq_lut); +if (ret) {ath12k_warn (ab,"failed to allocate memory for reoq table" ); -return -ENOMEM ; +return ret; } - dp->ml_reoq_lut.vaddr =dma_alloc_coherent (ab->dev, -DP_REOQ_LUT_SIZE , - &dp->ml_reoq_lut.paddr, -GFP_KERNEL | __GFP_ZERO); -if (!dp->ml_reoq_lut.vaddr) { + ret =ath12k_dp_alloc_reoq_lut (ab, &dp->ml_reoq_lut); +if (ret) {ath12k_warn (ab,"failed to allocate memory for ML reoq table" ); -dma_free_coherent (ab->dev,DP_REOQ_LUT_SIZE , - dp->reoq_lut.vaddr, dp->reoq_lut.paddr); - dp->reoq_lut.vaddr =NULL ; -return -ENOMEM ; +dma_free_coherent (ab->dev, dp->reoq_lut.size, + dp->reoq_lut.vaddr_unaligned, + dp->reoq_lut.paddr_unaligned); + dp->reoq_lut.vaddr_unaligned =NULL ; +return ret; } +/* Bits in the register have address [39:8] LUT base address to be +* allocated such that LSBs are assumed to be zero. Also, current +* design supports paddr upto 4 GB max hence it fits in 32 bit register only +*/ +ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_LUT_BASE0 (ab), - dp->reoq_lut.paddr); + dp->reoq_lut.paddr >>8 ); +ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_LUT_BASE1 (ab), dp->ml_reoq_lut.paddr >>8 ); + val =ath12k_hif_read32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_ADDR (ab)); + +ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_ADDR (ab), + val |HAL_REO_QDESC_ADDR_READ_LUT_ENABLE ); + +ath12k_hif_write32 (ab,HAL_SEQ_WCSS_UMAC_REO_REG +HAL_REO1_QDESC_MAX_PEERID (ab), +HAL_REO_QDESC_MAX_PEERID ); +return 0 ; }
drivers/net/wireless/ath/ath12k/dp.h +4 -1
@@ -311,8 +311,11 @@ struct ath12k_reo_queue_ref { } __packed;struct ath12k_reo_q_addr_lut { -dma_addr_t paddr; +u32 *vaddr_unaligned;u32 *vaddr; +dma_addr_t paddr_unaligned; +dma_addr_t paddr; +u32 size; };struct ath12k_dp {
drivers/net/wireless/ath/ath12k/dp_rx.c +8 -2
@@ -3255,8 +3255,14 @@ static int ath12k_dp_rx_h_defrag_reo_reinject(struct ath12k *ar, reo_ent_ring->rx_mpdu_info.peer_meta_data = reo_dest_ring->rx_mpdu_info.peer_meta_data; - reo_ent_ring->queue_addr_lo =cpu_to_le32 (lower_32_bits (rx_tid->paddr)); - queue_addr_hi =upper_32_bits (rx_tid->paddr); +if (ab->hw_params->reoq_lut_support) { + reo_ent_ring->queue_addr_lo = reo_dest_ring->rx_mpdu_info.peer_meta_data; + queue_addr_hi =0 ; + }else { + reo_ent_ring->queue_addr_lo =cpu_to_le32 (lower_32_bits (rx_tid->paddr)); + queue_addr_hi =upper_32_bits (rx_tid->paddr); + } + reo_ent_ring->info0 =le32_encode_bits (queue_addr_hi,HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI ) | le32_encode_bits(dst_ind,
drivers/net/wireless/ath/ath12k/hal.h +6 -0
@@ -21,6 +21,7 @@ struct ath12k_base;#define HAL_MAX_AVAIL_BLK_RES 3#define HAL_RING_BASE_ALIGN 8 +#define HAL_REO_QLUT_ADDR_ALIGN 256#define HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX 32704/* TODO: Check with hw team on the supported scatter buf size */
@@ -39,6 +40,7 @@ struct ath12k_base;#define HAL_OFFSET_FROM_HP_TO_TP 4#define HAL_SHADOW_REG (x) (HAL_SHADOW_BASE_ADDR + (4 * (x))) +#define HAL_REO_QDESC_MAX_PEERID 8191/* WCSS Relative address */ #define HAL_SEQ_WCSS_UMAC_OFFSET 0x00a00000
@@ -139,6 +141,8 @@ struct ath12k_base;#define HAL_REO1_DEST_RING_CTRL_IX_1 0x00000008#define HAL_REO1_DEST_RING_CTRL_IX_2 0x0000000c#define HAL_REO1_DEST_RING_CTRL_IX_3 0x00000010 +#define HAL_REO1_QDESC_ADDR (ab) ((ab)->hw_params->regs->hal_reo1_qdesc_addr) +#define HAL_REO1_QDESC_MAX_PEERID (ab) ((ab)->hw_params->regs->hal_reo1_qdesc_max_peerid)#define HAL_REO1_SW_COOKIE_CFG0 (ab) ((ab)->hw_params->regs->hal_reo1_sw_cookie_cfg0)#define HAL_REO1_SW_COOKIE_CFG1 (ab) ((ab)->hw_params->regs->hal_reo1_sw_cookie_cfg1)#define HAL_REO1_QDESC_LUT_BASE0 (ab) ((ab)->hw_params->regs->hal_reo1_qdesc_lut_base0)
@@ -326,6 +330,8 @@ struct ath12k_base;#define HAL_REO1_SW_COOKIE_CFG_ALIGN BIT(18)#define HAL_REO1_SW_COOKIE_CFG_ENABLE BIT(19)#define HAL_REO1_SW_COOKIE_CFG_GLOBAL_ENABLE BIT(20) +#define HAL_REO_QDESC_ADDR_READ_LUT_ENABLE BIT(7) +#define HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY BIT(6)/* CE ring bit field mask and shift */ #define HAL_CE_DST_R0_DEST_CTRL_MAX_LEN GENMASK(15, 0)
drivers/net/wireless/ath/ath12k/hw.c +2 -0
@@ -748,6 +748,8 @@ static const struct ath12k_hw_regs qcn9274_v2_regs = { .hal_reo1_sw_cookie_cfg1 = 0x00000070, .hal_reo1_qdesc_lut_base0 = 0x00000074, .hal_reo1_qdesc_lut_base1 = 0x00000078, + .hal_reo1_qdesc_addr = 0x0000007c, + .hal_reo1_qdesc_max_peerid = 0x00000088, .hal_reo1_ring_base_lsb = 0x00000500, .hal_reo1_ring_base_msb = 0x00000504, .hal_reo1_ring_id = 0x00000508,
drivers/net/wireless/ath/ath12k/hw.h +3 -0
@@ -299,6 +299,9 @@ struct ath12k_hw_regs {u32 hal_tcl_status_ring_base_lsb; +u32 hal_reo1_qdesc_addr; +u32 hal_reo1_qdesc_max_peerid; +u32 hal_wbm_idle_ring_base_lsb;u32 hal_wbm_idle_ring_misc_addr;u32 hal_wbm_r0_idle_list_cntl_addr;
drivers/net/wireless/ath/ath12k/wmi.c +6 -2
@@ -3665,7 +3665,8 @@ ath12k_fill_band_to_mac_param(struct ath12k_base *soc, }static void -ath12k_wmi_copy_resource_config (struct ath12k_wmi_resource_config_params *wmi_cfg, +ath12k_wmi_copy_resource_config (struct ath12k_base *ab, +struct ath12k_wmi_resource_config_params *wmi_cfg,struct ath12k_wmi_resource_config_arg *tg_cfg) { wmi_cfg->num_vdevs =cpu_to_le32 (tg_cfg->num_vdevs);
@@ -3732,6 +3733,9 @@ ath12k_wmi_copy_resource_config(struct ath12k_wmi_resource_config_params *wmi_cf WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION); wmi_cfg->host_service_flags =cpu_to_le32 (tg_cfg->is_reg_cc_ext_event_supported <<WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT ); +if (ab->hw_params->reoq_lut_support) + wmi_cfg->host_service_flags |= +cpu_to_le32 (1 <<WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT ); wmi_cfg->ema_max_vap_cnt =cpu_to_le32 (tg_cfg->ema_max_vap_cnt); wmi_cfg->ema_max_profile_period =cpu_to_le32 (tg_cfg->ema_max_profile_period); wmi_cfg->flags2 |=cpu_to_le32 (WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET );
@@ -3772,7 +3776,7 @@ static int ath12k_init_cmd_send(struct ath12k_wmi_pdev *wmi, ptr = skb->data +sizeof (*cmd); cfg = ptr; -ath12k_wmi_copy_resource_config (cfg, &arg->res_cfg); +ath12k_wmi_copy_resource_config (ab, cfg, &arg->res_cfg); cfg->tlv_header =ath12k_wmi_tlv_cmd_hdr (WMI_TAG_RESOURCE_CONFIG ,sizeof (*cfg));
drivers/net/wireless/ath/ath12k/wmi.h +1 -0
@@ -2461,6 +2461,7 @@ struct wmi_init_cmd { } __packed;#define WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT 4 +#define WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT 12#define WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION GENMASK(5, 4)#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5)#define WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET BIT(9)
Signature · 1 line
2.39.5