6.16.1-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 397/627 selftests/cgroup: fix cpu.max tests
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shashank Balaji <[email protected]>
[ Upstream commit 954bacce36d976fe472090b55987df66da00c49b ]
Current cpu.max tests (both the normal one and the nested one) are broken.
They setup cpu.max with 1000 us quota and the default period (100,000 us). A cpu hog is run for a duration of 1s as per wall clock time. This corresponds to 10 periods, hence an expected usage of 10,000 us. We want the measured usage (as per cpu.stat) to be close to 10,000 us.
Previously, this approximate equality test was done by !values_close(usage_usec, expected_usage_usec, 95): if the absolute difference between usage_usec and expected_usage_usec is greater than 95% of their sum, then we pass. And expected_usage_usec was set to 1,000,000 us. Mathematically, this translates to the following being true for pass:
|usage - expected_usage| > (usage + expected_usage)*0.95
If usage > expected_usage:
usage - expected_usage > (usage + expected_usage)*0.95 0.05*usage > 1.95*expected_usage
usage > 39*expected_usage = 39s
If usage < expected_usage:
expected_usage - usage > (usage + expected_usage)*0.95 0.05*expected_usage > 1.95*usage
usage < 0.0256*expected_usage = 25,600 us
Combined,
Pass if usage < 25,600 us or > 39 s,
which makes no sense given that all we need is for usage_usec to be close to 10,000 us.
Fix this by explicitly calcuating the expected usage duration based on the configured quota, default period, and the duration, and compare usage_usec and expected_usage_usec using values_close() with a 10% error margin.
Also, use snprintf to get the quota string to write to cpu.max instead of hardcoding the quota, ensuring a single source of truth.
Remove the check comparing user_usec and expected_usage_usec, since on running this test modified with printfs, it's seen that user_usec and usage_usec can regularly exceed the theoretical expected_usage_usec:
$ sudo ./test_cpu user: 10485, usage: 10485, expected: 10000 ok 1 test_cpucg_max user: 11127, usage: 11127, expected: 10000 ok 2 test_cpucg_max_nested $ sudo ./test_cpu user: 10286, usage: 10286, expected: 10000 ok 1 test_cpucg_max user: 10404, usage: 11271, expected: 10000 ok 2 test_cpucg_max_nested
Hence, a values_close() check of usage_usec and expected_usage_usec is sufficient.
--- tools/testing/selftests/cgroup/test_cpu.c | 63 ++++++++++++++++------- 1 file changed, 43 insertions(+), 20 deletions(-)
tools/testing/selftests/cgroup/test_cpu.c +43 -20
@@ -2,6 +2,7 @@#define _GNU_SOURCE#include <linux/limits.h> +#include <sys/param.h> #include <sys/sysinfo.h> #include <sys/wait.h> #include <errno.h>
@@ -645,10 +646,16 @@ test_cpucg_nested_weight_underprovisioned(const char *root)static int test_cpucg_max (const char *root) {int ret =KSFT_FAIL ; -long usage_usec, user_usec; -long usage_seconds =1 ; -long expected_usage_usec = usage_seconds *USEC_PER_SEC ; +long quota_usec =1000 ; +long default_period_usec =100000 ;/* cpu.max's default period */ +long duration_seconds =1 ; + +long duration_usec = duration_seconds *USEC_PER_SEC ; +long usage_usec, n_periods, remainder_usec, expected_usage_usec;char *cpucg; +char quota_buf[32 ]; + +snprintf (quota_buf,sizeof (quota_buf),"%ld" , quota_usec); cpucg =cg_name (root,"cpucg_test" );if (!cpucg)
@@ -657,13 +664,13 @@ static int test_cpucg_max(const char *root)if (cg_create (cpucg)) goto cleanup; -if (cg_write (cpucg,"cpu.max" ,"1000" )) +if (cg_write (cpucg,"cpu.max" , quota_buf)) goto cleanup;struct cpu_hog_func_param param = { .nprocs =1 , .ts = { - .tv_sec = usage_seconds, + .tv_sec = duration_seconds, .tv_nsec =0 , }, .clock_type =CPU_HOG_CLOCK_WALL ,
@@ -672,14 +679,19 @@ static int test_cpucg_max(const char *root) goto cleanup; usage_usec =cg_read_key_long (cpucg,"cpu.stat" ,"usage_usec" ); - user_usec =cg_read_key_long (cpucg,"cpu.stat" ,"user_usec" ); -if (user_usec <=0 ) +if (usage_usec <=0 ) goto cleanup; -if (user_usec >= expected_usage_usec) - goto cleanup; +/* +* The following calculation applies only since +* the cpu hog is set to run as per wall-clock time +*/ + n_periods = duration_usec / default_period_usec; + remainder_usec = duration_usec - n_periods * default_period_usec; + expected_usage_usec + = n_periods * quota_usec +MIN (remainder_usec, quota_usec); -if (values_close (usage_usec, expected_usage_usec,95 )) +if (!values_close (usage_usec, expected_usage_usec,10 )) goto cleanup; ret =KSFT_PASS ;
@@ -698,10 +710,16 @@ static int test_cpucg_max(const char *root)static int test_cpucg_max_nested (const char *root) {int ret =KSFT_FAIL ; -long usage_usec, user_usec; -long usage_seconds =1 ; -long expected_usage_usec = usage_seconds *USEC_PER_SEC ; +long quota_usec =1000 ; +long default_period_usec =100000 ;/* cpu.max's default period */ +long duration_seconds =1 ; + +long duration_usec = duration_seconds *USEC_PER_SEC ; +long usage_usec, n_periods, remainder_usec, expected_usage_usec;char *parent, *child; +char quota_buf[32 ]; + +snprintf (quota_buf,sizeof (quota_buf),"%ld" , quota_usec); parent =cg_name (root,"cpucg_parent" ); child =cg_name (parent,"cpucg_child" );
@@ -717,13 +735,13 @@ static int test_cpucg_max_nested(const char *root)if (cg_create (child)) goto cleanup; -if (cg_write (parent,"cpu.max" ,"1000" )) +if (cg_write (parent,"cpu.max" , quota_buf)) goto cleanup;struct cpu_hog_func_param param = { .nprocs =1 , .ts = { - .tv_sec = usage_seconds, + .tv_sec = duration_seconds, .tv_nsec =0 , }, .clock_type =CPU_HOG_CLOCK_WALL ,
@@ -732,14 +750,19 @@ static int test_cpucg_max_nested(const char *root) goto cleanup; usage_usec =cg_read_key_long (child,"cpu.stat" ,"usage_usec" ); - user_usec =cg_read_key_long (child,"cpu.stat" ,"user_usec" ); -if (user_usec <=0 ) +if (usage_usec <=0 ) goto cleanup; -if (user_usec >= expected_usage_usec) - goto cleanup; +/* +* The following calculation applies only since +* the cpu hog is set to run as per wall-clock time +*/ + n_periods = duration_usec / default_period_usec; + remainder_usec = duration_usec - n_periods * default_period_usec; + expected_usage_usec + = n_periods * quota_usec +MIN (remainder_usec, quota_usec); -if (values_close (usage_usec, expected_usage_usec,95 )) +if (!values_close (usage_usec, expected_usage_usec,10 )) goto cleanup; ret =KSFT_PASS ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 398/627 ext4: fix inode use after free in ext4_end_io_rsv_work()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit c678bdc998754589cea2e6afab9401d7d8312ac4 ]
In ext4_io_end_defer_completion(), check if io_end->list_vec is empty to avoid adding an io_end that requires no conversion to the i_rsv_conversion_list, which in turn prevents starting an unnecessary worker. An ext4_emergency_state() check is also added to avoid attempting to abort the journal in an emergency state.
Additionally, ext4_put_io_end_defer() is refactored to call ext4_io_end_defer_completion() directly instead of being open-coded. This also prevents starting an unnecessary worker when EXT4_IO_END_FAILED is set but data_err=abort is not enabled.
This ensures that the check in ext4_put_io_end_defer() is consistent with the check in ext4_end_bio(). Otherwise, we might add an io_end to the i_rsv_conversion_list and then call ext4_finish_bio(), after which the inode could be freed before ext4_end_io_rsv_work() is called, triggering a use-after-free issue.
--- fs/ext4/page-io.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
fs/ext4/page-io.c +8 -8
@@ -236,10 +236,12 @@ static void dump_completed_IO(struct inode *inode, struct list_head *head)static bool ext4_io_end_defer_completion (ext4_io_end_t *io_end) { -if (io_end->flag &EXT4_IO_END_UNWRITTEN ) +if (io_end->flag &EXT4_IO_END_UNWRITTEN && + !list_empty (&io_end->list_vec))return true;if (test_opt (io_end->inode->i_sb,DATA_ERR_ABORT ) && - io_end->flag &EXT4_IO_END_FAILED ) + io_end->flag &EXT4_IO_END_FAILED && + !ext4_emergency_state (io_end->inode->i_sb))return true;return false; }
@@ -256,6 +258,7 @@ static void ext4_add_complete_io(ext4_io_end_t *io_end)WARN_ON (!(io_end->flag &EXT4_IO_END_DEFER_COMPLETION ));WARN_ON (io_end->flag &EXT4_IO_END_UNWRITTEN && !io_end->handle && sbi->s_journal); +WARN_ON (!io_end->bio);spin_lock_irqsave (&ei->i_completed_io_lock, flags); wq = sbi->rsv_conversion_wq;
@@ -318,12 +321,9 @@ ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags)void ext4_put_io_end_defer (ext4_io_end_t *io_end) {if (refcount_dec_and_test (&io_end->count)) { -if (io_end->flag &EXT4_IO_END_FAILED || - (io_end->flag &EXT4_IO_END_UNWRITTEN && - !list_empty (&io_end->list_vec))) { -ext4_add_complete_io (io_end); -return ; - } +if (ext4_io_end_defer_completion (io_end)) +return ext4_add_complete_io (io_end); +ext4_release_io_end (io_end); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 399/627 ext4: Make sure BH_New bit is cleared in ->write_end handler
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 91b8ca8b26729b729dda8a4eddb9aceaea706f37 ]
Currently we clear BH_New bit in case of error and also in the standard ext4_write_end() handler (in block_commit_write()). However ext4_journalled_write_end() misses this clearing and thus we are leaving stale BH_New bits behind. Generally ext4_block_write_begin() clears these bits before any harm can be done but in case blocksize < pagesize and we hit some error when processing a page with these stale bits, we'll try to zero buffers with these stale BH_New bits and jbd2 will complain (as buffers were not prepared for writing in this transaction). Fix the problem by clearing BH_New bits in ext4_journalled_write_end() and WARN if ext4_block_write_begin() sees stale BH_New bits.
--- fs/ext4/inline.c | 2 ++ fs/ext4/inode.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
fs/ext4/inline.c +2 -0
@@ -612,6 +612,7 @@ static int ext4_convert_inline_data_to_extent(struct address_space *mapping, }else ret =ext4_block_write_begin (handle, folio, from, to, ext4_get_block); +clear_buffer_new (folio_buffers (folio));if (!ret &&ext4_should_journal_data (inode)) { ret = ext4_walk_page_buffers(handle, inode,
@@ -891,6 +892,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,return ret; } +clear_buffer_new (folio_buffers (folio));folio_mark_dirty (folio);folio_mark_uptodate (folio);ext4_clear_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA );
fs/ext4/inode.c +2 -1
@@ -1171,7 +1171,7 @@ int ext4_block_write_begin(handle_t *handle, struct folio *folio, }continue ; } -if (buffer_new (bh)) +if (WARN_ON_ONCE (buffer_new (bh)))clear_buffer_new (bh);if (!buffer_mapped (bh)) {WARN_ON (bh->b_size != blocksize);
@@ -1395,6 +1395,7 @@ static int write_end_fn(handle_t *handle, struct inode *inode, ret =ext4_dirty_journalled_data (handle, bh);clear_buffer_meta (bh);clear_buffer_prio (bh); +clear_buffer_new (bh);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 400/627 clk: at91: sam9x7: update pll clk ranges
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Varshini Rajendran <[email protected]>
[ Upstream commit c7f7ddbd27d55fa552a7269b7bae539adc2a3d46 ]
Update the min, max ranges of the PLL clocks according to the latest datasheet to be coherent in the driver. This patch solves the issues in configuring the clocks related to peripherals with the desired frequency within the range.
--- drivers/clk/at91/sam9x7.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/clk/at91/sam9x7.c +10 -10
@@ -61,44 +61,44 @@ static const struct clk_master_layout sam9x7_master_layout = {/* Fractional PLL core output range. */ static const struct clk_range plla_core_outputs[] = { - { .min =375000000 , .max =1600000000 }, + { .min =800000000 , .max =1600000000 }, };static const struct clk_range upll_core_outputs[] = { - { .min =600000000 , .max =1200000000 }, + { .min =600000000 , .max =960000000 }, };static const struct clk_range lvdspll_core_outputs[] = { - { .min =400000000 , .max =800000000 }, + { .min =600000000 , .max =1200000000 }, };static const struct clk_range audiopll_core_outputs[] = { - { .min =400000000 , .max =800000000 }, + { .min =600000000 , .max =1200000000 }, };static const struct clk_range plladiv2_core_outputs[] = { - { .min =375000000 , .max =1600000000 }, + { .min =800000000 , .max =1600000000 }, };/* Fractional PLL output range. */ static const struct clk_range plla_outputs[] = { - { .min =732421 , .max =800000000 }, + { .min =400000000 , .max =800000000 }, };static const struct clk_range upll_outputs[] = { - { .min =300000000 , .max =600000000 }, + { .min =300000000 , .max =480000000 }, };static const struct clk_range lvdspll_outputs[] = { - { .min =10000000 , .max =800000000 }, + { .min =175000000 , .max =550000000 }, };static const struct clk_range audiopll_outputs[] = { - { .min =10000000 , .max =800000000 }, + { .min =0 , .max =300000000 }, };static const struct clk_range plladiv2_outputs[] = { - { .min =366210 , .max =400000000 }, + { .min =200000000 , .max =400000000 }, };/* PLL characteristics. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 401/627 hwrng: mtk - handle devm_pm_runtime_enable errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 522a242a18adc5c63a24836715dbeec4dc3faee1 ]
Although unlikely, devm_pm_runtime_enable() call might fail, so handle the return value.
--- drivers/char/hw_random/mtk-rng.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/char/hw_random/mtk-rng.c +3 -1
@@ -143,7 +143,9 @@ static int mtk_rng_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, priv);pm_runtime_set_autosuspend_delay (&pdev->dev,RNG_AUTOSUSPEND_TIMEOUT );pm_runtime_use_autosuspend (&pdev->dev); -devm_pm_runtime_enable (&pdev->dev); + ret =devm_pm_runtime_enable (&pdev->dev); +if (ret) +return ret;dev_info (&pdev->dev,"registered RNG driver\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 402/627 crypto: keembay - Fix dma_unmap_sg() nents value
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 01951a7dc5ac1a37e5fb7d86ea7eb2dfbf96e8b6 ]
The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned.
--- drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c +7 -1
@@ -68,6 +68,7 @@ struct ocs_hcu_ctx {* @sg_data_total: Total data in the SG list at any time. * @sg_data_offset: Offset into the data of the current individual SG node. * @sg_dma_nents: Number of sg entries mapped in dma_list. +* @nents: Number of entries in the scatterlist. */ struct ocs_hcu_rctx {struct ocs_hcu_dev *hcu_dev;
@@ -91,6 +92,7 @@ struct ocs_hcu_rctx {unsigned int sg_data_total;unsigned int sg_data_offset;unsigned int sg_dma_nents; +unsigned int nents; };/**
@@ -199,7 +201,7 @@ static void kmb_ocs_hcu_dma_cleanup(struct ahash_request *req,/* Unmap req->src (if mapped). */ if (rctx->sg_dma_nents) { -dma_unmap_sg (dev, req->src, rctx->sg_dma_nents,DMA_TO_DEVICE ); +dma_unmap_sg (dev, req->src, rctx->nents,DMA_TO_DEVICE ); rctx->sg_dma_nents =0 ; }
@@ -260,6 +262,10 @@ static int kmb_ocs_dma_prepare(struct ahash_request *req) rc = -ENOMEM ; goto cleanup; } + +/* Save the value of nents to pass to dma_unmap_sg. */ + rctx->nents = nents; +/* * The value returned by dma_map_sg() can be < nents; so update * nents accordingly.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 403/627 crypto: img-hash - Fix dma_unmap_sg() nents value
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 34b283636181ce02c52633551f594fec9876bec7 ]
The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned.
--- drivers/crypto/img-hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/img-hash.c +1 -1
@@ -436,7 +436,7 @@ static int img_hash_write_via_dma_stop(struct img_hash_dev *hdev)struct img_hash_request_ctx *ctx =ahash_request_ctx (hdev->req);if (ctx->flags &DRIVER_FLAGS_SG ) -dma_unmap_sg (hdev->dev, ctx->sg, ctx->dma_ct,DMA_TO_DEVICE ); +dma_unmap_sg (hdev->dev, ctx->sg,1 ,DMA_TO_DEVICE );return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/627 crypto: qat - disable ZUC-256 capability for QAT GEN5
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bairavi Alagappan <[email protected]>
[ Upstream commit d956692c7dd523b331d4556ee03def8dd02609dc ]
The ZUC-256 EEA (encryption) and EIA (integrity) algorithms are not supported on QAT GEN5 devices, as their current implementation does not align with the NIST specification. Earlier versions of the ZUC-256 specification used a different initialization scheme, which has since been revised to comply with the 5G specification.
Due to this misalignment with the updated specification, remove support for ZUC-256 EEA and EIA for QAT GEN5 by masking out the ZUC-256 capability.
--- drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c +1 -8
@@ -191,7 +191,6 @@ static u32 get_accel_cap(struct adf_accel_dev *accel_dev)ICP_ACCEL_CAPABILITIES_SM4 |ICP_ACCEL_CAPABILITIES_AES_V2 |ICP_ACCEL_CAPABILITIES_ZUC | -ICP_ACCEL_CAPABILITIES_ZUC_256 |ICP_ACCEL_CAPABILITIES_WIRELESS_CRYPTO_EXT |ICP_ACCEL_CAPABILITIES_EXT_ALGCHAIN ;
@@ -223,17 +222,11 @@ static u32 get_accel_cap(struct adf_accel_dev *accel_dev)if (fusectl1 &ICP_ACCEL_GEN4_MASK_WCP_WAT_SLICE ) { capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_ZUC ; - capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_ZUC_256 ; capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_WIRELESS_CRYPTO_EXT ; } -if (fusectl1 &ICP_ACCEL_GEN4_MASK_EIA3_SLICE ) { +if (fusectl1 &ICP_ACCEL_GEN4_MASK_EIA3_SLICE ) capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_ZUC ; - capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_ZUC_256 ; - } - -if (fusectl1 &ICP_ACCEL_GEN4_MASK_ZUC_256_SLICE ) - capabilities_sym &= ~ICP_ACCEL_CAPABILITIES_ZUC_256 ; capabilities_asym =ICP_ACCEL_CAPABILITIES_CRYPTO_ASYMMETRIC | ICP_ACCEL_CAPABILITIES_SM2 |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/627 crypto: qat - fix virtual channel configuration for GEN6 devices
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Kumar Chakraborty <[email protected]>
[ Upstream commit e83cfb8ff1433cc832d31b8cac967a1eb79d5b44 ]
The TCVCMAP (Traffic Class to Virtual Channel Mapping) field in the PVC0CTL and PVC1CTL register controls how traffic classes are mapped to virtual channels in QAT GEN6 hardware.
The driver previously wrote a default TCVCMAP value to this register, but this configuration was incorrect.
Modify the TCVCMAP configuration to explicitly enable both VC0 and VC1, and map Traffic Classes 0 to 7 → VC0 and Traffic Class 8 → VC1. Replace FIELD_PREP() with FIELD_MODIFY() to ensure that only the intended TCVCMAP field is updated, preserving other bits in the register. This prevents unintended overwrites of unrelated configuration fields when modifying TC to VC mappings.
--- drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c | 10 +++++----- drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c +5 -5
@@ -520,8 +520,8 @@ static void set_vc_csr_for_bank(void __iomem *csr, u32 bank_number)* driver must program the ringmodectl CSRs. */ value =ADF_CSR_RD (csr,ADF_GEN6_CSR_RINGMODECTL (bank_number)); - value |=FIELD_PREP (ADF_GEN6_RINGMODECTL_TC_MASK ,ADF_GEN6_RINGMODECTL_TC_DEFAULT ); - value |=FIELD_PREP (ADF_GEN6_RINGMODECTL_TC_EN_MASK ,ADF_GEN6_RINGMODECTL_TC_EN_OP1 ); +FIELD_MODIFY (ADF_GEN6_RINGMODECTL_TC_MASK , &value,ADF_GEN6_RINGMODECTL_TC_DEFAULT ); +FIELD_MODIFY (ADF_GEN6_RINGMODECTL_TC_EN_MASK , &value,ADF_GEN6_RINGMODECTL_TC_EN_OP1 );ADF_CSR_WR (csr,ADF_GEN6_CSR_RINGMODECTL (bank_number), value); }
@@ -537,7 +537,7 @@ static int set_vc_config(struct adf_accel_dev *accel_dev)* Read PVC0CTL then write the masked values. */ pci_read_config_dword (pdev,ADF_GEN6_PVC0CTL_OFFSET , &value); - value |=FIELD_PREP (ADF_GEN6_PVC0CTL_TCVCMAP_MASK ,ADF_GEN6_PVC0CTL_TCVCMAP_DEFAULT ); +FIELD_MODIFY (ADF_GEN6_PVC0CTL_TCVCMAP_MASK , &value,ADF_GEN6_PVC0CTL_TCVCMAP_DEFAULT ); err =pci_write_config_dword (pdev,ADF_GEN6_PVC0CTL_OFFSET , value);if (err) {dev_err (&GET_DEV (accel_dev),"pci write to PVC0CTL failed\n" );
@@ -546,8 +546,8 @@ static int set_vc_config(struct adf_accel_dev *accel_dev)/* Read PVC1CTL then write masked values */ pci_read_config_dword (pdev,ADF_GEN6_PVC1CTL_OFFSET , &value); - value |=FIELD_PREP (ADF_GEN6_PVC1CTL_TCVCMAP_MASK ,ADF_GEN6_PVC1CTL_TCVCMAP_DEFAULT ); - value |=FIELD_PREP (ADF_GEN6_PVC1CTL_VCEN_MASK ,ADF_GEN6_PVC1CTL_VCEN_ON ); +FIELD_MODIFY (ADF_GEN6_PVC1CTL_TCVCMAP_MASK , &value,ADF_GEN6_PVC1CTL_TCVCMAP_DEFAULT ); +FIELD_MODIFY (ADF_GEN6_PVC1CTL_VCEN_MASK , &value,ADF_GEN6_PVC1CTL_VCEN_ON ); err =pci_write_config_dword (pdev,ADF_GEN6_PVC1CTL_OFFSET , value);if (err)dev_err (&GET_DEV (accel_dev),"pci write to PVC1CTL failed\n" );
drivers/crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.h +1 -1
@@ -99,7 +99,7 @@#define ADF_GEN6_PVC0CTL_OFFSET 0x204#define ADF_GEN6_PVC0CTL_TCVCMAP_OFFSET 1#define ADF_GEN6_PVC0CTL_TCVCMAP_MASK GENMASK(7, 1) -#define ADF_GEN6_PVC0CTL_TCVCMAP_DEFAULT 0x7F +#define ADF_GEN6_PVC0CTL_TCVCMAP_DEFAULT 0x3F/* VC1 Resource Control Register */ #define ADF_GEN6_PVC1CTL_OFFSET 0x210
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/627 crypto: krb5 - Fix memory leak in krb5_test_one_prf()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit b19f1ab8d5bf417e00d5855c62e061fb449b13c5 ]
Fix a leak reported by kmemleak:
unreferenced object 0xffff8880093bf7a0 (size 32):
comm "swapper/0", pid 1, jiffies 4294877529
hex dump (first 32 bytes):
9d 18 86 16 f6 38 52 fe 86 91 5b b8 40 b4 a8 86 .....8R...[.@...
ff 3e 6b b0 f8 19 b4 9b 89 33 93 d3 93 85 42 95 .>k......3....B.
backtrace (crc 8ba12f3b):
kmemleak_alloc+0x8d/0xa0
__kmalloc_noprof+0x3cd/0x4d0
prep_buf+0x36/0x70
load_buf+0x10d/0x1c0
krb5_test_one_prf+0x1e1/0x3c0
krb5_selftest.cold+0x7c/0x54c
crypto_krb5_init+0xd/0x20
do_one_initcall+0xa5/0x230
do_initcalls+0x213/0x250
kernel_init_freeable+0x220/0x260
kernel_init+0x1d/0x170
ret_from_fork+0x301/0x410
ret_from_fork_asm+0x1a/0x30--- crypto/krb5/selftest.c | 1 + 1 file changed, 1 insertion(+)
crypto/krb5/selftest.c +1 -0
@@ -152,6 +152,7 @@ static int krb5_test_one_prf(const struct krb5_prf_test *test) out:clear_buf (&result); +clear_buf (&prf);clear_buf (&octet);clear_buf (&key);return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/627 cgroup: Add compatibility option for content of /proc/cgroups
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Koutný <[email protected]>
[ Upstream commit 646faf36d7271c597497ca547a59912fcab49be9 ]
/proc/cgroups lists only v1 controllers by default, however, this is only enforced since the commit af000ce85293b ("cgroup: Do not report unavailable v1 controllers in /proc/cgroups") and there is software in the wild that uses content of /proc/cgroups to decide on availability of v2 (sic) controllers.
Add a boottime param that can bring back the previous behavior for setups where the check in the software cannot be changed and it causes e.g. unintended OOMs.
Also, this patch takes out cgrp_v1_visible from cgroup1_subsys_absent() guard since it's only important to check which hierarchy (v1 vs v2) the subsys is attached to. This has no effect on the printed message but the code is cleaner since cgrp_v1_visible is really about mounted hierarchies, not the content of /proc/cgroups.
--- Documentation/admin-guide/kernel-parameters.txt | 8 ++++++++ kernel/cgroup/cgroup-v1.c | 14 ++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +8 -0
@@ -633,6 +633,14 @@ named mounts. Specifying both "all" and "named" disables all v1 hierarchies. + cgroup_v1_proc= [KNL] Show also missing controllers in /proc/cgroups + Format: { "true" | "false" } + /proc/cgroups lists only v1 controllers by default. + This compatibility option enables listing also v2 + controllers (whose v1 code is not compiled!), so that + semi-legacy software can check this file to decide + about usage of v2 (sic) controllers. + cgroup_favordynmods= [KNL] Enable or Disable favordynmods. Format: { "true" | "false" } Defaults to the value of CONFIG_CGROUP_FAVOR_DYNMODS.
kernel/cgroup/cgroup-v1.c +12 -2
@@ -32,6 +32,9 @@ static u16 cgroup_no_v1_mask;/* disable named v1 mounts */ static bool cgroup_no_v1_named; +/* Show unavailable controllers in /proc/cgroups */ +static bool proc_show_all; +/* * pidlist destructions need to be flushed on cgroup destruction. Use a * separate workqueue as flush domain.
@@ -683,10 +686,11 @@ int proc_cgroupstats_show(struct seq_file *m, void *v)*/ for_each_subsys (ss, i) { -if (cgroup1_subsys_absent (ss)) -continue ; cgrp_v1_visible |= ss->root != &cgrp_dfl_root; +if (!proc_show_all &&cgroup1_subsys_absent (ss)) +continue ; + seq_printf(m, "%s\t%d\t%d\t%d\n", ss->legacy_name, ss->root->hierarchy_id, atomic_read(&ss->root->nr_cgrps),
@@ -1359,3 +1363,9 @@ static int __init cgroup_no_v1(char *str)return 1 ; }__setup ("cgroup_no_v1=" , cgroup_no_v1); + +static int __init cgroup_v1_proc (char *str) +{ +return (kstrtobool (str, &proc_show_all) ==0 ); +} +__setup ("cgroup_v1_proc=" , cgroup_v1_proc);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/627 soundwire: stream: restore params when prepare ports fail
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
[ Upstream commit dba7d9dbfdc4389361ff3a910e767d3cfca22587 ]
The bus->params should be restored if the stream is failed to prepare. The issue exists since beginning. The Fixes tag just indicates the first commit that the commit can be applied to.
--- drivers/soundwire/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/stream.c +1 -1
@@ -1510,7 +1510,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream,if (ret <0 ) {dev_err (bus->dev,"Prepare port(s) failed ret = %d\n" , ret); -return ret; + goto restore_params; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/627 PCI: endpoint: pci-epf-vntb: Fix the incorrect usage of __iomem attribute
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 61ae7f8694fb4b57a8c02a1a8d2b601806afc999 ]
__iomem attribute is supposed to be used only with variables holding the MMIO pointer. But here, 'mw_addr' variable is just holding a 'void *' returned by pci_epf_alloc_space(). So annotating it with __iomem is clearly wrong. Hence, drop the attribute.
This also fixes the below sparse warning:
drivers/pci/endpoint/functions/pci-epf-vntb.c:524:17: warning: incorrect type in assignment (different address spaces)
drivers/pci/endpoint/functions/pci-epf-vntb.c:524:17: expected void [noderef] __iomem *mw_addr
drivers/pci/endpoint/functions/pci-epf-vntb.c:524:17: got void *
drivers/pci/endpoint/functions/pci-epf-vntb.c:530:21: warning: incorrect type in assignment (different address spaces)
drivers/pci/endpoint/functions/pci-epf-vntb.c:530:21: expected unsigned int [usertype] *epf_db
drivers/pci/endpoint/functions/pci-epf-vntb.c:530:21: got void [noderef] __iomem *mw_addr
drivers/pci/endpoint/functions/pci-epf-vntb.c:542:38: warning: incorrect type in argument 2 (different address spaces)
drivers/pci/endpoint/functions/pci-epf-vntb.c:542:38: expected void *addr
drivers/pci/endpoint/functions/pci-epf-vntb.c:542:38: got void [noderef] __iomem *mw_addr
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-vntb.c +1 -1
@@ -510,7 +510,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)struct device *dev = &ntb->epf->dev;int ret;struct pci_epf_bar *epf_bar; -void __iomem *mw_addr; +void *mw_addr;enum pci_barno barno;size_t size =sizeof (u32) * ntb->db_count;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/627 clk: imx95-blk-ctl: Fix synchronous abort
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurentiu Palcu <[email protected]>
[ Upstream commit b08217a257215ed9130fce93d35feba66b49bf0a ]
When enabling runtime PM for clock suppliers that also belong to a power domain, the following crash is thrown:
error: synchronous external abort: 0000000096000010 [#1] PREEMPT SMP
Workqueue: events_unbound deferred_probe_work_func pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : clk_mux_get_parent+0x60/0x90 lr : clk_core_reparent_orphans_nolock+0x58/0xd8 Call trace: clk_mux_get_parent+0x60/0x90 clk_core_reparent_orphans_nolock+0x58/0xd8 of_clk_add_hw_provider.part.0+0x90/0x100 of_clk_add_hw_provider+0x1c/0x38 imx95_bc_probe+0x2e0/0x3f0 platform_probe+0x70/0xd8
Enabling runtime PM without explicitly resuming the device caused the power domain cut off after clk_register() is called. As a result, a crash happens when the clock hardware provider is added and attempts to access the BLK_CTL register.
Fix this by using devm_pm_runtime_enable() instead of pm_runtime_enable() and getting rid of the pm_runtime_disable() in the cleanup path.
--- drivers/clk/imx/clk-imx95-blk-ctl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/clk/imx/clk-imx95-blk-ctl.c +7 -6
@@ -342,8 +342,10 @@ static int imx95_bc_probe(struct platform_device *pdev)if (!clk_hw_data)return -ENOMEM ; -if (bc_data->rpm_enabled) -pm_runtime_enable (&pdev->dev); +if (bc_data->rpm_enabled) { +devm_pm_runtime_enable (&pdev->dev); +pm_runtime_resume_and_get (&pdev->dev); + } clk_hw_data->num = bc_data->num_clks; hws = clk_hw_data->hws;
@@ -383,8 +385,10 @@ static int imx95_bc_probe(struct platform_device *pdev) goto cleanup; } -if (pm_runtime_enabled (bc->dev)) +if (pm_runtime_enabled (bc->dev)) { +pm_runtime_put_sync (&pdev->dev);clk_disable_unprepare (bc->clk_apb); + }return 0 ;
@@ -395,9 +399,6 @@ static int imx95_bc_probe(struct platform_device *pdev)clk_hw_unregister (hws[i]); } -if (bc_data->rpm_enabled) -pm_runtime_disable (&pdev->dev); -return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/627 phy: qcom: phy-qcom-snps-eusb2: Add missing write from init sequence
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 7f5f703210109366c1e1b685086c9b0a4897ea54 ]
As per a commit from Qualcomm's downstream 6.1 kernel[0], the init sequence is missing setting the CMN_CTRL_OVERRIDE_EN bit back to 0 at the end, as per the 'latest' HPG revision (as of November 2023).
[0] https://git.codelinaro.org/clo/la/kernel/qcom/-/commit/b77774a89e3fda3246e09dd39e16e2ab43cd1329
--- drivers/phy/phy-snps-eusb2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/phy/phy-snps-eusb2.c +3 -0
@@ -437,6 +437,9 @@ static int qcom_snps_eusb2_hsphy_init(struct phy *p)snps_eusb2_hsphy_write_mask (phy->base,QCOM_USB_PHY_HS_PHY_CTRL2 ,USB2_SUSPEND_N_SEL ,0 ); +snps_eusb2_hsphy_write_mask (phy->base,QCOM_USB_PHY_CFG0 , +CMN_CTRL_OVERRIDE_EN ,0 ); +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/627 remoteproc: xlnx: Disable unsupported features
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tanmay Shah <[email protected]>
[ Upstream commit 699cdd706290208d47bd858a188b030df2e90357 ]
AMD-Xilinx platform driver does not support iommu or recovery mechanism yet. Disable both features in platform driver.
--- drivers/remoteproc/xlnx_r5_remoteproc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/remoteproc/xlnx_r5_remoteproc.c +2 -0
@@ -938,6 +938,8 @@ static struct zynqmp_r5_core *zynqmp_r5_add_rproc_core(struct device *cdev)rproc_coredump_set_elf_info (r5_rproc,ELFCLASS32 ,EM_ARM ); + r5_rproc->recovery_disabled = true; + r5_rproc->has_iommu = false; r5_rproc->auto_boot = false; r5_core = r5_rproc->priv; r5_core->dev = cdev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/627 fs/orangefs: Allow 2 more characters in do_c_string()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 2138e89cb066b40386b1d9ddd61253347d356474 ]
The do_k_string() and do_c_string() functions do essentially the same thing which is they add a string and a comma onto the end of an existing string. At the end, the caller will overwrite the last comma with a newline. Later, in orangefs_kernel_debug_init(), we add a newline to the string.
The change to do_k_string() is just cosmetic. I moved the "- 1" to the other side of the comparison and made it "+ 1". This has no effect on runtime, I just wanted the functions to match each other and the rest of the file.
However in do_c_string(), I removed the "- 2" which allows us to print two extra characters. I noticed this issue while reviewing the code and I doubt affects anything in real life. My guess is that this was double counting the comma and the newline. The "+ 1" accounts for the newline, and the caller will delete the final comma which ensures there is enough space for the newline.
Removing the "- 2" lets us print 2 more characters, but mainly it makes the code more consistent and understandable for reviewers.
--- fs/orangefs/orangefs-debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/orangefs/orangefs-debugfs.c +3 -3
@@ -769,8 +769,8 @@ static void do_k_string(void *k_mask, int index)if (*mask & s_kmod_keyword_mask_map[index].mask_val) {if ((strlen (kernel_debug_string) + -strlen (s_kmod_keyword_mask_map[index].keyword)) - <ORANGEFS_MAX_DEBUG_STRING_LEN -1 ) { +strlen (s_kmod_keyword_mask_map[index].keyword) +1 ) + <ORANGEFS_MAX_DEBUG_STRING_LEN ) {strcat (kernel_debug_string, s_kmod_keyword_mask_map[index].keyword);strcat (kernel_debug_string,"," );
@@ -797,7 +797,7 @@ static void do_c_string(void *c_mask, int index) (mask->mask2 & cdm_array[index].mask2)) {if ((strlen (client_debug_string) +strlen (cdm_array[index].keyword) +1 ) - <ORANGEFS_MAX_DEBUG_STRING_LEN -2 ) { + <ORANGEFS_MAX_DEBUG_STRING_LEN ) {strcat (client_debug_string, cdm_array[index].keyword);strcat (client_debug_string,"," );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/627 clk: thead: th1520-ap: Describe mux clocks with clk_mux
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yao Zi <[email protected]>
[ Upstream commit 54edba916e2913b0893b0f6404b73155d48374ea ]
Mux clocks are now described with a customized ccu_mux structure consisting of ccu_internal and ccu_common substructures, and registered later with devm_clk_hw_register_mux_parent_data_table(). As this helper always allocates a new clk_hw structure, it's extremely hard to use mux clocks as parents statically by clk_hw pointers, since CCF has no knowledge about the clk_hw structure embedded in ccu_mux.
This scheme already causes issues for clock c910, which takes a mux clock, c910-i0, as a possible parent. With mainline U-Boot that reparents c910 to c910-i0 at boottime, c910 is considered as an orphan by CCF.
This patch refactors handling of mux clocks, embeds a clk_mux structure in ccu_mux directly. Instead of calling devm_clk_hw_register_mux_*(), we could register mux clocks on our own without allocating any new clk_hw pointer, fixing c910 clock's issue.
--- drivers/clk/thead/clk-th1520-ap.c | 95 ++++++++++++------------------- 1 file changed, 37 insertions(+), 58 deletions(-)
drivers/clk/thead/clk-th1520-ap.c +37 -58
@@ -42,8 +42,9 @@ struct ccu_common { };struct ccu_mux { -struct ccu_internal mux; -struct ccu_common common; +int clkid; +u32 reg; +struct clk_mux mux; };struct ccu_gate {
@@ -75,6 +76,17 @@ struct ccu_pll { .flags = _flags, \ } +#define TH_CCU_MUX (_name, _parents, _shift, _width) \ + { \ + .mask = GENMASK(_width - 1, 0), \ + .shift = _shift, \ + .hw.init = CLK_HW_INIT_PARENTS_DATA( \ + _name, \ + _parents, \ + &clk_mux_ops, \ + 0), \ + } +#define CCU_GATE (_clkid, _struct, _name, _parent, _reg, _gate, _flags) \ struct ccu_gate _struct = { \ .enable = _gate, \
@@ -94,13 +106,6 @@ static inline struct ccu_common *hw_to_ccu_common(struct clk_hw *hw) return container_of(hw, struct ccu_common, hw); } -static inline struct ccu_mux *hw_to_ccu_mux (struct clk_hw *hw) -{ -struct ccu_common *common =hw_to_ccu_common (hw); - - return container_of(common, struct ccu_mux, common); -} -static inline struct ccu_pll *hw_to_ccu_pll (struct clk_hw *hw) {struct ccu_common *common =hw_to_ccu_common (hw);
@@ -415,32 +420,20 @@ static const struct clk_parent_data c910_i0_parents[] = { };static struct ccu_mux c910_i0_clk = { - .mux =TH_CCU_ARG (1 ,1 ), - .common = { - .clkid =CLK_C910_I0 , - .cfg0 =0x100 , - .hw.init =CLK_HW_INIT_PARENTS_DATA ("c910-i0" , - c910_i0_parents, - &clk_mux_ops, -0 ), - } + .clkid =CLK_C910_I0 , + .reg =0x100 , + .mux =TH_CCU_MUX ("c910-i0" , c910_i0_parents,1 ,1 ), };static const struct clk_parent_data c910_parents[] = { - { .hw = &c910_i0_clk.common.hw }, + { .hw = &c910_i0_clk.mux.hw }, { .hw = &cpu_pll1_clk.common.hw } };static struct ccu_mux c910_clk = { - .mux =TH_CCU_ARG (0 ,1 ), - .common = { - .clkid =CLK_C910 , - .cfg0 =0x100 , - .hw.init =CLK_HW_INIT_PARENTS_DATA ("c910" , - c910_parents, - &clk_mux_ops, -0 ), - } + .clkid =CLK_C910 , + .reg =0x100 , + .mux =TH_CCU_MUX ("c910" , c910_parents,0 ,1 ), };static const struct clk_parent_data ahb2_cpusys_parents[] = {
@@ -924,15 +917,9 @@ static const struct clk_parent_data uart_sclk_parents[] = { };static struct ccu_mux uart_sclk = { - .mux =TH_CCU_ARG (0 ,1 ), - .common = { - .clkid =CLK_UART_SCLK , - .cfg0 =0x210 , - .hw.init =CLK_HW_INIT_PARENTS_DATA ("uart-sclk" , - uart_sclk_parents, - &clk_mux_ops, -0 ), - } + .clkid =CLK_UART_SCLK , + .reg =0x210 , + .mux =TH_CCU_MUX ("uart-sclk" , uart_sclk_parents,0 ,1 ), };static struct ccu_common *th1520_pll_clks[] = {
@@ -969,10 +956,10 @@ static struct ccu_common *th1520_div_clks[] = { &dpu1_clk.common, }; -static struct ccu_common *th1520_mux_clks[] = { - &c910_i0_clk.common, - &c910_clk.common, - &uart_sclk.common, +static struct ccu_mux *th1520_mux_clks[] = { + &c910_i0_clk, + &c910_clk, + &uart_sclk, };static struct ccu_common *th1520_gate_clks[] = {
@@ -1074,7 +1061,7 @@ static const struct regmap_config th1520_clk_regmap_config = {struct th1520_plat_data {struct ccu_common **th1520_pll_clks;struct ccu_common **th1520_div_clks; -struct ccu_common **th1520_mux_clks; +struct ccu_mux **th1520_mux_clks;struct ccu_common **th1520_gate_clks;int nr_clks;
@@ -1161,23 +1148,15 @@ static int th1520_clk_probe(struct platform_device *pdev) }for (i =0 ; i < plat_data->nr_mux_clks; i++) { -struct ccu_mux *cm =hw_to_ccu_mux (&plat_data->th1520_mux_clks[i]->hw); -const struct clk_init_data *init = cm->common.hw.init; - - plat_data->th1520_mux_clks[i]->map = map; - hw =devm_clk_hw_register_mux_parent_data_table (dev, - init->name, - init->parent_data, - init->num_parents, -0 , - base + cm->common.cfg0, - cm->mux.shift, - cm->mux.width, -0 ,NULL ,NULL ); -if (IS_ERR (hw)) -return PTR_ERR (hw); +struct ccu_mux *cm = plat_data->th1520_mux_clks[i]; + + cm->mux.reg = base + cm->reg; + + ret =devm_clk_hw_register (dev, &cm->mux.hw); +if (ret) +return ret; - priv->hws[cm->common.clkid] = hw; + priv->hws[cm->clkid] = &cm->mux.hw; }for (i =0 ; i < plat_data->nr_gate_clks; i++) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 415/627 tools subcmd: Tighten the filename size in check_if_command_finished
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 478272d1cdd9959a6d638e9d81f70642f04290c9 ]
FILENAME_MAX is often PATH_MAX (4kb), far more than needed for the /proc path. Make the buffer size sufficient for the maximum integer plus "/proc/" and "/status" with a '\0' terminator.
--- tools/lib/subcmd/run-command.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/lib/subcmd/run-command.c +13 -2
@@ -5,6 +5,7 @@#include <ctype.h> #include <fcntl.h> #include <string.h> +#include <linux/compiler.h> #include <linux/string.h> #include <errno.h> #include <sys/wait.h>
@@ -216,10 +217,20 @@ static int wait_or_whine(struct child_process *cmd, bool block)return result; } +/* +* Conservative estimate of number of characaters needed to hold an a decoded +* integer, assume each 3 bits needs a character byte and plus a possible sign +* character. +*/ +#ifndef is_signed_type +#define is_signed_type (type) (((type)(-1)) < (type)1) +#endif +#define MAX_STRLEN_TYPE (type) (sizeof(type) * 8 / 3 + (is_signed_type(type) ? 1 : 0)) +int check_if_command_finished (struct child_process *cmd) {#ifdef __linux__ -char filename[FILENAME_MAX +12 ]; +char filename[6 +MAX_STRLEN_TYPE (typeof (cmd->pid)) +7 +1 ];char status_line[256 ];FILE *status_file;
@@ -227,7 +238,7 @@ int check_if_command_finished(struct child_process *cmd)* Check by reading /proc/<pid>/status as calling waitpid causes * stdout/stderr to be closed and data lost. */ -sprintf (filename,"/proc/%d/status" , cmd->pid); +sprintf (filename,"/proc/%u/status" , cmd->pid); status_file =fopen (filename,"r" );if (status_file ==NULL ) {/* Open failed assume finish_command was called. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 416/627 perf pmu: Switch FILENAME_MAX to NAME_MAX
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 82aac553372cd201b91a8b064be0cd5a501932b2 ]
FILENAME_MAX is the same as PATH_MAX (4kb) in glibc rather than NAME_MAX's 255. Switch to using NAME_MAX and ensure the '\0' is accounted for in the path's buffer size.
--- tools/perf/util/pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/pmu.c +2 -2
@@ -452,7 +452,7 @@ static struct perf_pmu_alias *perf_pmu__find_alias(struct perf_pmu *pmu, {struct perf_pmu_alias *alias;bool has_sysfs_event; -char event_file_name[FILENAME_MAX +8 ]; +char event_file_name[NAME_MAX +8 ];if (hashmap__find (pmu->aliases, name, &alias))return alias;
@@ -752,7 +752,7 @@ static int pmu_aliases_parse(struct perf_pmu *pmu)static int pmu_aliases_parse_eager (struct perf_pmu *pmu,int sysfs_fd) { -char path[FILENAME_MAX +7 ]; +char path[NAME_MAX +8 ];int ret, events_dir_fd;scnprintf (path,sizeof (path),"%s/events" , pmu->name);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 417/627 dmaengine: mv_xor: Fix missing check after DMA map and missing unmap
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 60095aca6b471b7b7a79c80b7395f7e4e414b479 ]
The DMA map functions can fail and should be tested for errors.
In case of error, unmap the already mapped regions.
--- drivers/dma/mv_xor.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/dma/mv_xor.c +19 -2
@@ -1061,8 +1061,16 @@ mv_xor_channel_add(struct mv_xor_device *xordev,*/ mv_chan->dummy_src_addr =dma_map_single (dma_dev->dev, mv_chan->dummy_src,MV_XOR_MIN_BYTE_COUNT ,DMA_FROM_DEVICE ); +if (dma_mapping_error (dma_dev->dev, mv_chan->dummy_src_addr)) +return ERR_PTR (-ENOMEM ); + mv_chan->dummy_dst_addr =dma_map_single (dma_dev->dev, mv_chan->dummy_dst,MV_XOR_MIN_BYTE_COUNT ,DMA_TO_DEVICE ); +if (dma_mapping_error (dma_dev->dev, mv_chan->dummy_dst_addr)) { + ret = -ENOMEM ; + goto err_unmap_src; + } +/* allocate coherent memory for hardware descriptors * note: writecombine gives slightly better performance, but
@@ -1071,8 +1079,10 @@ mv_xor_channel_add(struct mv_xor_device *xordev, mv_chan->dma_desc_pool_virt =dma_alloc_wc (&pdev->dev,MV_XOR_POOL_SIZE , &mv_chan->dma_desc_pool,GFP_KERNEL ); -if (!mv_chan->dma_desc_pool_virt) -return ERR_PTR (-ENOMEM ); +if (!mv_chan->dma_desc_pool_virt) { + ret = -ENOMEM ; + goto err_unmap_dst; + }/* discover transaction capabilities from the platform data */ dma_dev->cap_mask = cap_mask;
@@ -1155,6 +1165,13 @@ mv_xor_channel_add(struct mv_xor_device *xordev, err_free_dma:dma_free_coherent (&pdev->dev,MV_XOR_POOL_SIZE , mv_chan->dma_desc_pool_virt, mv_chan->dma_desc_pool); +err_unmap_dst: +dma_unmap_single (dma_dev->dev, mv_chan->dummy_dst_addr, +MV_XOR_MIN_BYTE_COUNT ,DMA_TO_DEVICE ); +err_unmap_src: +dma_unmap_single (dma_dev->dev, mv_chan->dummy_src_addr, +MV_XOR_MIN_BYTE_COUNT ,DMA_FROM_DEVICE ); +return ERR_PTR (ret); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 418/627 dmaengine: nbpfaxi: Add missing check after DMA map
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit c6ee78fc8f3e653bec427cfd06fec7877ee782bd ]
The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error.
--- drivers/dma/nbpfaxi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/dma/nbpfaxi.c +13 -0
@@ -711,6 +711,9 @@ static int nbpf_desc_page_alloc(struct nbpf_channel *chan)list_add_tail (&ldesc->node, &lhead); ldesc->hwdesc_dma_addr =dma_map_single (dchan->device->dev, hwdesc,sizeof (*hwdesc),DMA_TO_DEVICE ); +if (dma_mapping_error (dchan->device->dev, + ldesc->hwdesc_dma_addr)) + goto unmap_error;dev_dbg (dev,"%s(): mapped 0x%p to %pad\n" , __func__, hwdesc, &ldesc->hwdesc_dma_addr);
@@ -737,6 +740,16 @@ static int nbpf_desc_page_alloc(struct nbpf_channel *chan)spin_unlock_irq (&chan->lock);return ARRAY_SIZE (dpage->desc); + +unmap_error: +while (i--) { + ldesc--; hwdesc--; + +dma_unmap_single (dchan->device->dev, ldesc->hwdesc_dma_addr, +sizeof (hwdesc),DMA_TO_DEVICE ); + } + +return -ENOMEM ; }static void nbpf_desc_put (struct nbpf_desc *desc)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 419/627 mfd: tps65219: Update TPS65214 MFD cells GPIO compatible string
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shree Ramamoorthy <[email protected]>
[ Upstream commit 6f27d26e363a41fc651be852094823ce47a43243 ]
This patch reflects the change made to move TPS65215 from 1 GPO and 1 GPIO to 2 GPOs and 1 GPIO. TPS65215 and TPS65219 both have 2 GPOs and 1 GPIO. TPS65214 has 1 GPO and 1 GPIO. TPS65215 will reuse the TPS65219 GPIO compatible string.
TPS65214 TRM: https://www.ti.com/lit/pdf/slvud30
TPS65215 TRM: https://www.ti.com/lit/pdf/slvucw5/
--- drivers/mfd/tps65219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/tps65219.c +1 -1
@@ -190,7 +190,7 @@ static const struct resource tps65219_regulator_resources[] = {static const struct mfd_cell tps65214_cells[] = {MFD_CELL_RES ("tps65214-regulator" , tps65214_regulator_resources), -MFD_CELL_NAME ("tps65215-gpio" ), +MFD_CELL_NAME ("tps65214-gpio" ), };static const struct mfd_cell tps65215_cells[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 420/627 ASoC: SDCA: Fix some holes in the regmap readable/writeable helpers
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 061fade7a67f6cdfe918a675270d84107abbef61 ]
The current regmap readable/writeable helper functions always allow the Next flag and allows any Control Number. Mask the Next flag based on SDCA_ACCESS_MODE_DUAL which is the only Mode that supports it. Also check that the Control Number is valid for the given control.
--- sound/soc/sdca/sdca_regmap.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
sound/soc/sdca/sdca_regmap.c +14 -2
@@ -72,12 +72,18 @@ bool sdca_regmap_readable(struct sdca_function_data *function, unsigned int reg)if (!control)return false; +if (!(BIT (SDW_SDCA_CTL_CNUM (reg)) & control->cn_list)) +return false; +switch (control->mode) {case SDCA_ACCESS_MODE_RW :case SDCA_ACCESS_MODE_RO : -case SDCA_ACCESS_MODE_DUAL :case SDCA_ACCESS_MODE_RW1S :case SDCA_ACCESS_MODE_RW1C : +if (SDW_SDCA_NEXT_CTL (0 ) & reg) +return false; + fallthrough; +case SDCA_ACCESS_MODE_DUAL :/* No access to registers marked solely for device use */ return control->layers & ~SDCA_ACCESS_LAYER_DEVICE ;default :
@@ -104,11 +110,17 @@ bool sdca_regmap_writeable(struct sdca_function_data *function, unsigned int regif (!control)return false; +if (!(BIT (SDW_SDCA_CTL_CNUM (reg)) & control->cn_list)) +return false; +switch (control->mode) {case SDCA_ACCESS_MODE_RW : -case SDCA_ACCESS_MODE_DUAL :case SDCA_ACCESS_MODE_RW1S :case SDCA_ACCESS_MODE_RW1C : +if (SDW_SDCA_NEXT_CTL (0 ) & reg) +return false; + fallthrough; +case SDCA_ACCESS_MODE_DUAL :/* No access to registers marked solely for device use */ return control->layers & ~SDCA_ACCESS_LAYER_DEVICE ;default :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 421/627 ASoC: fsl_xcvr: get channel status data when PHY is not exists
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit ca592e20659e0304ebd8f4dabb273da4f9385848 ]
There is no PHY for the XCVR module on i.MX93, the channel status needs to be obtained from FSL_XCVR_RX_CS_DATA_* registers. And channel status acknowledge (CSA) bit should be set once channel status is processed.
--- sound/soc/fsl/fsl_xcvr.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
sound/soc/fsl/fsl_xcvr.c +20 -0
@@ -1423,6 +1423,26 @@ static irqreturn_t irq0_isr(int irq, void *devid)/* clear CS control register */ memset_io (reg_ctrl,0 ,sizeof (val)); } + }else { +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_0 , + (u32 *)&xcvr->rx_iec958.status[0 ]); +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_1 , + (u32 *)&xcvr->rx_iec958.status[4 ]); +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_2 , + (u32 *)&xcvr->rx_iec958.status[8 ]); +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_3 , + (u32 *)&xcvr->rx_iec958.status[12 ]); +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_4 , + (u32 *)&xcvr->rx_iec958.status[16 ]); +regmap_read (xcvr->regmap,FSL_XCVR_RX_CS_DATA_5 , + (u32 *)&xcvr->rx_iec958.status[20 ]); +for (i =0 ; i <6 ; i++) { + val = *(u32 *)(xcvr->rx_iec958.status + i *4 ); + *(u32 *)(xcvr->rx_iec958.status + i *4 ) = +bitrev32 (val); + } +regmap_set_bits (xcvr->regmap,FSL_XCVR_RX_DPTH_CTRL , +FSL_XCVR_RX_DPTH_CTRL_CSA ); } }if (isr &FSL_XCVR_IRQ_NEW_UD ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 422/627 ASoC: fsl_xcvr: get channel status data with firmware exists
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit 6776ecc9dd587c08a6bb334542f9f8821a091013 ]
For the XCVR module on i.MX95, even though it only supports SPDIF, the channel status needs to be obtained from RAM space, which is processed by firmware. Firmware is necessary to trigger the FSL_XCVR_IRQ_NEW_CS interrupt.
This change also applies for the SPDIF & ARC function on i.MX8MP which has the firmware.
--- sound/soc/fsl/fsl_xcvr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl_xcvr.c +3 -2
@@ -1395,7 +1395,7 @@ static irqreturn_t irq0_isr(int irq, void *devid)if (isr &FSL_XCVR_IRQ_NEW_CS ) {dev_dbg (dev,"Received new CS block\n" ); isr_clr |=FSL_XCVR_IRQ_NEW_CS ; -if (!xcvr->soc_data->spdif_only) { +if (xcvr->soc_data->fw_name) {/* Data RAM is 4KiB, last two pages: 8 and 9. Select page 8. */ regmap_update_bits(xcvr->regmap, FSL_XCVR_EXT_CTRL, FSL_XCVR_EXT_CTRL_PAGE_MASK,
@@ -1517,6 +1517,7 @@ static const struct fsl_xcvr_soc_data fsl_xcvr_imx93_data = { };static const struct fsl_xcvr_soc_data fsl_xcvr_imx95_data = { + .fw_name ="imx/xcvr/xcvr-imx95.bin" , .spdif_only = true, .use_phy = true, .use_edma = true,
@@ -1806,7 +1807,7 @@ static int fsl_xcvr_runtime_resume(struct device *dev) } } -if (xcvr->mode ==FSL_XCVR_MODE_EARC ) { +if (xcvr->soc_data->fw_name) { ret =fsl_xcvr_load_firmware (xcvr);if (ret) {dev_err (dev,"failed to load firmware.\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 423/627 perf topdown: Use attribute to see an event is a topdown metic or slots
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 5b546de9cc177936a3ed07d7d46ef072db4fdbab ]
The string comparisons were overly broad and could fire for the incorrect PMU and events. Switch to using the config in the attribute then add a perf test to confirm the attribute config values match those of parsed events of that name and don't match others. This exposed matches for slots events that shouldn't have matched as the slots fixed counter event, such as topdown.slots_p.
--- tools/perf/arch/x86/include/arch-tests.h | 4 ++ tools/perf/arch/x86/tests/Build | 1 + tools/perf/arch/x86/tests/arch-tests.c | 1 + tools/perf/arch/x86/tests/topdown.c | 76 ++++++++++++++++++++++++ tools/perf/arch/x86/util/evsel.c | 46 ++++---------- tools/perf/arch/x86/util/topdown.c | 31 ++++------ tools/perf/arch/x86/util/topdown.h | 4 ++ 7 files changed, 108 insertions(+), 55 deletions(-) create mode 100644 tools/perf/arch/x86/tests/topdown.c
tools/perf/arch/x86/include/arch-tests.h +4 -0
@@ -2,6 +2,8 @@#ifndef ARCH_TESTS_H #define ARCH_TESTS_H +#include "tests/tests.h" +struct test_suite ;/* Tests */
@@ -17,6 +19,8 @@ int test__amd_ibs_via_core_pmu(struct test_suite *test, int subtest);int test__amd_ibs_period (struct test_suite *test,int subtest);int test__hybrid (struct test_suite *test,int subtest); +DECLARE_SUITE (x86_topdown); +extern struct test_suite *arch_tests[];#endif
tools/perf/arch/x86/tests/Build +1 -0
@@ -11,6 +11,7 @@ endif perf-test-$(CONFIG_X86_64) += bp-modify.o perf-test-y += amd-ibs-via-core-pmu.o perf-test-y += amd-ibs-period.o +perf-test-y += topdown.o ifdef SHELLCHECK SHELL_TESTS := gen-insn-x86-dat.sh
tools/perf/arch/x86/tests/arch-tests.c +1 -0
@@ -53,5 +53,6 @@ struct test_suite *arch_tests[] = { &suite__amd_ibs_via_core_pmu, &suite__amd_ibs_period, &suite__hybrid, + &suite__x86_topdown, NULL, };
tools/perf/arch/x86/tests/topdown.c new file +76 -0
76 lines not on this page · raw message
tools/perf/arch/x86/util/evsel.c +12 -34
59 lines not on this page · raw message
tools/perf/arch/x86/util/topdown.c +10 -21
@@ -1,6 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -#include "api/fs/fs.h" -#include "util/evsel.h" #include "util/evlist.h" #include "util/pmu.h" #include "util/pmus.h"
@@ -8,6 +6,9 @@#include "topdown.h" #include "evsel.h" +// cmask=0, inv=0, pc=0, edge=0, umask=4, event=0 +#define TOPDOWN_SLOTS 0x0400 +/* Check whether there is a PMU which supports the perf metrics. */ bool topdown_sys_has_perf_metrics (void ) {
@@ -32,31 +33,19 @@ bool topdown_sys_has_perf_metrics(void)return has_perf_metrics; } -#define TOPDOWN_SLOTS 0x0400bool arch_is_topdown_slots (const struct evsel *evsel) { -if (evsel->core.attr.config ==TOPDOWN_SLOTS ) -return true; - -return false; +return evsel->core.attr.type ==PERF_TYPE_RAW && + evsel->core.attr.config ==TOPDOWN_SLOTS && + evsel->core.attr.config1 ==0 ; }bool arch_is_topdown_metrics (const struct evsel *evsel) { -int config = evsel->core.attr.config; -const char *name_from_config; -struct perf_pmu *pmu; - -/* All topdown events have an event code of 0. */ -if ((config &0xFF ) !=0 ) -return false; - - pmu =evsel__find_pmu (evsel); -if (!pmu || !pmu->is_core) -return false; - - name_from_config =perf_pmu__name_from_config (pmu, config); -return name_from_config &&strcasestr (name_from_config,"topdown" ); +// cmask=0, inv=0, pc=0, edge=0, umask=0x80-0x87, event=0 +return evsel->core.attr.type ==PERF_TYPE_RAW && + (evsel->core.attr.config &0xFFFFF8FF ) ==0x8000 && + evsel->core.attr.config1 ==0 ; }/*
tools/perf/arch/x86/util/topdown.h +4 -0
@@ -2,6 +2,10 @@#ifndef _TOPDOWN_H#define _TOPDOWN_H 1 +#include <stdbool.h> + +struct evsel ; +bool topdown_sys_has_perf_metrics (void );bool arch_is_topdown_slots (const struct evsel *evsel);bool arch_is_topdown_metrics (const struct evsel *evsel);
Signature · 1 line
2.39.5
Re: [PATCH 6.16 423/627] perf topdown: Use attribute to see an event is a topdown metic or slots
Quoted 6 lines · Greg Kroah-Hartman
6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
Quoted 8 lines
[ Upstream commit
5b546de9cc177936a3ed07d7d46ef072db4fdbab]The string comparisons were overly broad and could fire for the incorrect PMU and events. Switch to using the config in the attribute then add a perf test to confirm the attribute config values match those of parsed events of that name and don't match others. This exposed matches for slots events that shouldn't have matched as the slots fixed counter event, such as topdown.slots_p.
This caused the following build error for me when building perf on Fedora x86_64:
arch/x86/tests/topdown.c: In function ‘event_cb’:arch/x86/tests/topdown.c:53:25: error: implicit declaration of function ‘pr_debug’ [-Wimplicit-function-declaration]
53 | pr_debug("Broken topdown information for '%s'\n", evsel__name(evsel));
| ^~~~~~~~make[6]: *** [/builddir/build/BUILD/kernel-6.16.1-build/kernel-6.16.1-rc1/linux-6.16.1-0.rc1.200.vanilla.fc42.x86_64/tools/build/Makefile.build:85: arch/x86/tests/topdown.o] Error 1 make[6]: *** Waiting for unfinished jobs....
Reverting fixed the problem. Full log:
https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/stable-rc/fedora-42-x86_64/09405663-stablerc-stablerc-releases/builder-live.log.gz
Ciao, Thorsten
Quoted 282 lines
Fixes fbc798316bef ("perf x86/topdown: Refine helper arch_is_topdown_metrics()")Signed-off-by Ian Rogers <[email protected]>Signed-off-by Namhyung Kim <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/perf/arch/x86/include/arch-tests.h | 4 ++ tools/perf/arch/x86/tests/Build | 1 + tools/perf/arch/x86/tests/arch-tests.c | 1 + tools/perf/arch/x86/tests/topdown.c | 76 ++++++++++++++++++++++++ tools/perf/arch/x86/util/evsel.c | 46 ++++---------- tools/perf/arch/x86/util/topdown.c | 31 ++++------ tools/perf/arch/x86/util/topdown.h | 4 ++ 7 files changed, 108 insertions(+), 55 deletions(-) create mode 100644 tools/perf/arch/x86/tests/topdown.ctools/perf/arch/x86/include/arch-tests.h +4
-0@@ -2,6 +2,8 @@#ifndef ARCH_TESTS_H #define ARCH_TESTS_H +#include "tests/tests.h" +struct test_suite ;/* Tests */ @@ -17,6 +19,8 @@ int test__amd_ibs_via_core_pmu(struct test_suite *test, int subtest);int test__amd_ibs_period (struct test_suite *test,int subtest);int test__hybrid (struct test_suite *test,int subtest); +DECLARE_SUITE (x86_topdown); +extern struct test_suite *arch_tests[];#endif tools/perf/arch/x86/tests/Build +1
-0@@ -11,6 +11,7 @@ endif perf-test-$(CONFIG_X86_64) += bp-modify.o perf-test-y += amd-ibs-via-core-pmu.o perf-test-y += amd-ibs-period.o +perf-test-y += topdown.o ifdef SHELLCHECK SHELL_TESTS := gen-insn-x86-dat.shtools/perf/arch/x86/tests/arch-tests.c +1
-0@@ -53,5 +53,6 @@ struct test_suite *arch_tests[] = { &suite__amd_ibs_via_core_pmu, &suite__amd_ibs_period, &suite__hybrid, + &suite__x86_topdown, NULL, };tools/perf/arch/x86/tests/topdown.c new file +76
-0@@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "arch-tests.h" +#include "../util/topdown.h" +#include "evlist.h" +#include "parse-events.h" +#include "pmu.h" +#include "pmus.h" + +static int event_cb (void *state,struct pmu_event_info *info) +{ +char buf[256 ]; +struct parse_events_error parse_err; +int *ret = state, err; +struct evlist *evlist =evlist__new (); +struct evsel *evsel; + +if (!evlist) +return -ENOMEM ; + +parse_events_error__init (&parse_err); +snprintf (buf,sizeof (buf),"%s/%s/" , info->pmu->name, info->name); + err =parse_events (evlist, buf, &parse_err); +if (err) { +parse_events_error__print (&parse_err, buf); + *ret =TEST_FAIL ; + } +parse_events_error__exit (&parse_err); +evlist__for_each_entry (evlist, evsel) { +bool fail = false; +bool p_core_pmu = evsel->pmu->type ==PERF_TYPE_RAW ; +const char *name =evsel__name (evsel); + +if (strcasestr (name,"uops_retired.slots" ) || +strcasestr (name,"topdown.backend_bound_slots" ) || +strcasestr (name,"topdown.br_mispredict_slots" ) || +strcasestr (name,"topdown.memory_bound_slots" ) || +strcasestr (name,"topdown.bad_spec_slots" ) || +strcasestr (name,"topdown.slots_p" )) { +if (arch_is_topdown_slots (evsel) ||arch_is_topdown_metrics (evsel)) + fail = true; + }else if (strcasestr (name,"slots" )) { +if (arch_is_topdown_slots (evsel) != p_core_pmu || +arch_is_topdown_metrics (evsel)) + fail = true; + }else if (strcasestr (name,"topdown" )) { +if (arch_is_topdown_slots (evsel) || +arch_is_topdown_metrics (evsel) != p_core_pmu) + fail = true; + }else if (arch_is_topdown_slots (evsel) ||arch_is_topdown_metrics (evsel)) { + fail = true; + } +if (fail) { +pr_debug ("Broken topdown information for '%s'\n" ,evsel__name (evsel)); + *ret =TEST_FAIL ; + } + } +evlist__delete (evlist); +return 0 ; +} + +static int test__x86_topdown (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +{ +int ret =TEST_OK ; +struct perf_pmu *pmu =NULL ; + +if (!topdown_sys_has_perf_metrics ()) +return TEST_OK ; + +while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { +if (perf_pmu__for_each_event (pmu,/*skip_duplicate_pmus=*/ false, &ret, event_cb)) +break ; + } +return ret; +} + +DEFINE_SUITE ("x86 topdown" , x86_topdown);tools/perf/arch/x86/util/evsel.c +12
-34@@ -23,47 +23,25 @@ void arch_evsel__set_sample_weight(struct evsel *evsel)bool evsel__sys_has_perf_metrics (const struct evsel *evsel) {struct perf_pmu *pmu; -u32 type = evsel->core.attr.type; -/* -* The PERF_TYPE_RAW type is the core PMU type, e.g., "cpu" PMU -* on a non-hybrid machine, "cpu_core" PMU on a hybrid machine. -* The slots event is only available for the core PMU, which -* supports the perf metrics feature. -* Checking both the PERF_TYPE_RAW type and the slots event -* should be good enough to detect the perf metrics feature. -*/ -again: -switch (type) { -case PERF_TYPE_HARDWARE : -case PERF_TYPE_HW_CACHE : - type = evsel->core.attr.config >>PERF_PMU_TYPE_SHIFT ; -if (type) - goto again; -break ; -case PERF_TYPE_RAW : -break ; -default : +if (!topdown_sys_has_perf_metrics ())return false; - } - - pmu = evsel->pmu; -if (pmu &&perf_pmu__is_fake (pmu)) - pmu =NULL ; -if (!pmu) { -while ((pmu =perf_pmus__scan_core (pmu)) !=NULL ) { -if (pmu->type ==PERF_TYPE_RAW ) -break ; - } - } -return pmu &&perf_pmu__have_event (pmu,"slots" ); +/* +* The PERF_TYPE_RAW type is the core PMU type, e.g., "cpu" PMU on a +* non-hybrid machine, "cpu_core" PMU on a hybrid machine. The +* topdown_sys_has_perf_metrics checks the slots event is only available +* for the core PMU, which supports the perf metrics feature. Checking +* both the PERF_TYPE_RAW type and the slots event should be good enough +* to detect the perf metrics feature. +*/ + pmu =evsel__find_pmu (evsel); +return pmu && pmu->type ==PERF_TYPE_RAW ; }bool arch_evsel__must_be_in_group (const struct evsel *evsel) { -if (!evsel__sys_has_perf_metrics (evsel) || !evsel->name || -strcasestr (evsel->name,"uops_retired.slots" )) +if (!evsel__sys_has_perf_metrics (evsel))return false;return arch_is_topdown_metrics (evsel) ||arch_is_topdown_slots (evsel);tools/perf/arch/x86/util/topdown.c +10
-21@@ -1,6 +1,4 @@// SPDX-License-Identifier: GPL-2.0 -#include "api/fs/fs.h" -#include "util/evsel.h" #include "util/evlist.h" #include "util/pmu.h" #include "util/pmus.h" @@ -8,6 +6,9 @@#include "topdown.h" #include "evsel.h" +// cmask=0, inv=0, pc=0, edge=0, umask=4, event=0 +#define TOPDOWN_SLOTS 0x0400 +/* Check whether there is a PMU which supports the perf metrics. */ bool topdown_sys_has_perf_metrics (void ) {@@ -32,31 +33,19 @@ bool topdown_sys_has_perf_metrics(void)return has_perf_metrics; } -#define TOPDOWN_SLOTS 0x0400bool arch_is_topdown_slots (const struct evsel *evsel) { -if (evsel->core.attr.config ==TOPDOWN_SLOTS ) -return true; - -return false; +return evsel->core.attr.type ==PERF_TYPE_RAW && + evsel->core.attr.config ==TOPDOWN_SLOTS && + evsel->core.attr.config1 ==0 ; }bool arch_is_topdown_metrics (const struct evsel *evsel) { -int config = evsel->core.attr.config; -const char *name_from_config; -struct perf_pmu *pmu; - -/* All topdown events have an event code of 0. */ -if ((config &0xFF ) !=0 ) -return false; - - pmu =evsel__find_pmu (evsel); -if (!pmu || !pmu->is_core) -return false; - - name_from_config =perf_pmu__name_from_config (pmu, config); -return name_from_config &&strcasestr (name_from_config,"topdown" ); +// cmask=0, inv=0, pc=0, edge=0, umask=0x80-0x87, event=0 +return evsel->core.attr.type ==PERF_TYPE_RAW && + (evsel->core.attr.config &0xFFFFF8FF ) ==0x8000 && + evsel->core.attr.config1 ==0 ; }/* tools/perf/arch/x86/util/topdown.h +4
-0@@ -2,6 +2,10 @@#ifndef _TOPDOWN_H#define _TOPDOWN_H 1 +#include <stdbool.h> + +struct evsel ; +bool topdown_sys_has_perf_metrics (void );bool arch_is_topdown_slots (const struct evsel *evsel);bool arch_is_topdown_metrics (const struct evsel *evsel);
Greg Kroah-Hartman
maintainerRe: [PATCH 6.16 423/627] perf topdown: Use attribute to see an event is a topdown metic or slots
Quoted 23 lines · Thorsten Leemhuis
Quoted 6 lines · Greg Kroah-Hartman
6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
Quoted 8 lines
[ Upstream commit
5b546de9cc177936a3ed07d7d46ef072db4fdbab]The string comparisons were overly broad and could fire for the incorrect PMU and events. Switch to using the config in the attribute then add a perf test to confirm the attribute config values match those of parsed events of that name and don't match others. This exposed matches for slots events that shouldn't have matched as the slots fixed counter event, such as topdown.slots_p.
This caused the following build error for me when building perf on Fedora
x86_64:
arch/x86/tests/topdown.c: In function ‘event_cb’:arch/x86/tests/topdown.c:53:25: error: implicit declaration of function ‘pr_debug’ [-Wimplicit-function-declaration]53 | pr_debug("Broken topdown information for '%s'\n", evsel__name(evsel)); | ^~~~~~~~
Quoted 7 lines
make[6]: *** [/builddir/build/BUILD/kernel-6.16.1-build/kernel-6.16.1-rc1/linux-6.16.1-0.rc1.200.vanilla.fc42.x86_64/tools/build/Makefile.build:85:
arch/x86/tests/topdown.o] Error 1 make[6]: *** Waiting for unfinished jobs....Reverting fixed the problem. Full log:
https://download.copr.fedorainfracloud.org/results/@kernel-vanilla/stable-rc/fedora-42-x86_64/09405663-stablerc-stablerc-releases/builder-live.log.gzCiao, Thorsten
Thanks, I've now deleted this patch from the queue.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 424/627 clk: spacemit: ccu_pll: fix error return value in recalc_rate callback
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akhilesh Patil <[email protected]>
[ Upstream commit c60b95389d0206a3a3c087c09113315e7084be3f ]
Return 0 instead of -EINVAL if function ccu_pll_recalc_rate() fails to get correct rate entry. Follow .recalc_rate callback documentation as mentioned in include/linux/clk-provider.h for error return value.
--- drivers/clk/spacemit/ccu_pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/spacemit/ccu_pll.c +1 -1
@@ -122,7 +122,7 @@ static unsigned long ccu_pll_recalc_rate(struct clk_hw *hw,WARN_ON_ONCE (!entry); -return entry ? entry->rate : -EINVAL ; +return entry ? entry->rate :0 ; } static long ccu_pll_round_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 425/627 sh: Do not use hyphen in exported variable name
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit c32969d0362a790fbc6117e0b6a737a7e510b843 ]
arch/sh/Makefile defines and exports ld-bfd to be used by arch/sh/boot/compressed/Makefile and arch/sh/boot/romimage/Makefile. However some shells, including dash, will not pass through environment variables whose name includes a hyphen. Usually GNU make does not use a shell to recurse, but if e.g. $(srctree) contains '~' it will use a shell here.
Other instances of this problem were previously fixed by commits 2bfbe7881ee0 "kbuild: Do not use hyphen in exported variable name" and 82977af93a0d "sh: rename suffix-y to suffix_y".
Rename the variable to ld_bfd.
References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sh4&ver=4.13%7Erc5-1%7Eexp1&stamp=1502943967&raw=0
--- arch/sh/Makefile | 10 +++++----- arch/sh/boot/compressed/Makefile | 4 ++-- arch/sh/boot/romimage/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/sh/Makefile +5 -5
@@ -103,16 +103,16 @@ UTS_MACHINE := sh LDFLAGS_vmlinux += -e _stext ifdef CONFIG_CPU_LITTLE_ENDIAN -ld-bfd := elf32-sh-linux -LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd) +ld_bfd := elf32-sh-linux +LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld_bfd) KBUILD_LDFLAGS += -EL else -ld-bfd := elf32-shbig-linux -LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd) +ld_bfd := elf32-shbig-linux +LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd) KBUILD_LDFLAGS += -EB endif -export ld-bfd +export ld_bfd # Mach groups machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se
arch/sh/boot/compressed/Makefile +2 -2
@@ -27,7 +27,7 @@ endif ccflags-remove-$(CONFIG_MCOUNT) += -pg -LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \ +LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(IMAGE_OFFSET) -e startup \ -T $(obj)/../../kernel/vmlinux.lds KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
@@ -51,7 +51,7 @@ $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE OBJCOPYFLAGS += -R .empty_zero_page -LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T +LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE $(call if_changed,ld)
arch/sh/boot/romimage/Makefile +2 -2
@@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724) := $(obj)/mmcif-sh7724.o load-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-load-y) obj-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-obj-y) -LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \ +LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(load-y) -e romstart \ -T $(obj)/../../kernel/vmlinux.lds $(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
@@ -24,7 +24,7 @@ OBJCOPYFLAGS += -j .empty_zero_page $(obj)/zeropage.bin: vmlinux FORCE $(call if_changed,objcopy) -LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T +LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/zeropage.bin arch/sh/boot/zImage FORCE $(call if_changed,ld)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 426/627 perf tools: Remove libtraceevent in .gitignore
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Pei <[email protected]>
[ Upstream commit af470fb532fc803c4c582d15b4bd394682a77a15 ]
The libtraceevent has been removed from the source tree, and .gitignore needs to be updated as well.
--- tools/perf/.gitignore | 2 -- 1 file changed, 2 deletions(-)
tools/perf/.gitignore +0 -2
@@ -48,8 +48,6 @@ libbpf/ libperf/ libsubcmd/ libsymbol/ -libtraceevent/ -libtraceevent_plugins/ fixdep Documentation/doc.dep python_ext_build/
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 427/627 clk: clocking-wizard: Fix the round rate handling for versal
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shubhrajyoti Datta <[email protected]>
[ Upstream commit 7f5e9ca0a424af44a708bb4727624d56f83ecffa ]
Fix the clk_round_rate implementation for Versal platforms by calling the Versal-specific divider calculation helper. The existing code used the generic divider routine, which results in incorrect round rate.
--- drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/xilinx/clk-xlnx-clock-wizard.c +1 -1
@@ -669,7 +669,7 @@ static long clk_wzrd_ver_round_rate_all(struct clk_hw *hw, unsigned long rate,u32 m, d, o, div, f;int err; - err =clk_wzrd_get_divisors (hw, rate, *prate); + err =clk_wzrd_get_divisors_ver (hw, rate, *prate);if (err)return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 428/627 crypto: qat - fix DMA direction for compression on GEN2 devices
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
[ Upstream commit d41d75fe1b751ee6b347bf1cb1cfe9accc4fcb12 ]
QAT devices perform an additional integrity check during compression by decompressing the output. Starting from QAT GEN4, this verification is done in-line by the hardware. However, on GEN2 devices, the hardware reads back the compressed output from the destination buffer and performs a decompression operation using it as the source.
In the current QAT driver, destination buffers are always marked as write-only. This is incorrect for QAT GEN2 compression, where the buffer is also read during verification. Since commit 6f5dc7658094 ("iommu/vt-d: Restore WO permissions on second-level paging entries"), merged in v6.16-rc1, write-only permissions are strictly enforced, leading to DMAR errors when using QAT GEN2 devices for compression, if VT-d is enabled.
Mark the destination buffers as DMA_BIDIRECTIONAL. This ensures compatibility with GEN2 devices, even though it is not required for QAT GEN4 and later.
--- drivers/crypto/intel/qat/qat_common/qat_bl.c | 6 +++--- drivers/crypto/intel/qat/qat_common/qat_compression.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/crypto/intel/qat/qat_common/qat_bl.c +3 -3
@@ -38,7 +38,7 @@ void qat_bl_free_bufl(struct adf_accel_dev *accel_dev,for (i =0 ; i < blout->num_mapped_bufs; i++) {dma_unmap_single (dev, blout->buffers[i].addr, blout->buffers[i].len, -DMA_FROM_DEVICE ); +DMA_BIDIRECTIONAL ); }dma_unmap_single (dev, blpout, sz_out,DMA_TO_DEVICE );
@@ -162,7 +162,7 @@ static int __qat_bl_sgl_to_bufl(struct adf_accel_dev *accel_dev, } buffers[y].addr =dma_map_single (dev,sg_virt (sg) + left, sg->length - left, -DMA_FROM_DEVICE ); +DMA_BIDIRECTIONAL );if (unlikely (dma_mapping_error (dev, buffers[y].addr))) goto err_out; buffers[y].len = sg->length;
@@ -204,7 +204,7 @@ static int __qat_bl_sgl_to_bufl(struct adf_accel_dev *accel_dev,if (!dma_mapping_error (dev, buflout->buffers[i].addr))dma_unmap_single (dev, buflout->buffers[i].addr, buflout->buffers[i].len, -DMA_FROM_DEVICE ); +DMA_BIDIRECTIONAL ); }if (!buf->sgl_dst_valid)
drivers/crypto/intel/qat/qat_common/qat_compression.c +2 -2
@@ -204,7 +204,7 @@ static int qat_compression_alloc_dc_data(struct adf_accel_dev *accel_dev)if (!obuff) goto err; - obuff_p =dma_map_single (dev, obuff, ovf_buff_sz,DMA_FROM_DEVICE ); + obuff_p =dma_map_single (dev, obuff, ovf_buff_sz,DMA_BIDIRECTIONAL );if (unlikely (dma_mapping_error (dev, obuff_p))) goto err;
@@ -232,7 +232,7 @@ static void qat_free_dc_data(struct adf_accel_dev *accel_dev)return ;dma_unmap_single (dev, dc_data->ovf_buff_p, dc_data->ovf_buff_sz, -DMA_FROM_DEVICE ); +DMA_BIDIRECTIONAL );kfree_sensitive (dc_data->ovf_buff);kfree (dc_data); accel_dev->dc_data =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 429/627 crypto: qat - fix seq_file position update in adf_ring_next()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
[ Upstream commit 6908c5f4f066a0412c3d9a6f543a09fa7d87824b ]
The adf_ring_next() function in the QAT debug transport interface fails to correctly update the position index when reaching the end of the ring elements. This triggers the following kernel warning when reading ring files, such as /sys/kernel/debug/qat_c6xx_<D:B:D:F>/transport/bank_00/ring_00:
[27725.022965] seq_file: buggy .next function adf_ring_next [intel_qat] did not update position index
Ensure that the *pos index is incremented before returning NULL when after the last element in the ring is found, satisfying the seq_file API requirements and preventing the warning.
--- drivers/crypto/intel/qat/qat_common/adf_transport_debug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/intel/qat/qat_common/adf_transport_debug.c +3 -1
@@ -31,8 +31,10 @@ static void *adf_ring_next(struct seq_file *sfile, void *v, loff_t *pos)struct adf_etr_ring_data *ring = sfile->private;if (*pos >= (ADF_SIZE_TO_RING_SIZE_IN_BYTES (ring->ring_size) / -ADF_MSG_SIZE_TO_BYTES (ring->msg_size))) +ADF_MSG_SIZE_TO_BYTES (ring->msg_size))) { + (*pos)++;return NULL ; + }return ring->base_addr + (ADF_MSG_SIZE_TO_BYTES (ring->msg_size) * (*pos)++);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 430/627 fbdev: imxfb: Check fb_add_videomode to prevent null-ptr-deref
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit da11e6a30e0bb8e911288bdc443b3dc8f6a7cac7 ]
fb_add_videomode() can fail with -ENOMEM when its internal kmalloc() cannot allocate a struct fb_modelist. If that happens, the modelist stays empty but the driver continues to register. Add a check for its return value to prevent poteintial null-ptr-deref, which is similar to the commit 17186f1f90d3 ("fbdev:
Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var").
--- drivers/video/fbdev/imxfb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/video/fbdev/imxfb.c +7 -2
@@ -996,8 +996,13 @@ static int imxfb_probe(struct platform_device *pdev) info->fix.smem_start = fbi->map_dma;INIT_LIST_HEAD (&info->modelist); -for (i =0 ; i < fbi->num_modes; i++) -fb_add_videomode (&fbi->mode[i].mode, &info->modelist); +for (i =0 ; i < fbi->num_modes; i++) { + ret =fb_add_videomode (&fbi->mode[i].mode, &info->modelist); +if (ret) { +dev_err (&pdev->dev,"Failed to add videomode\n" ); + goto failed_cmap; + } + }/* * This makes sure that our colour bitfield
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 431/627 smb: client: allow parsing zero-length AV pairs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit be77ab6b9fbe348daf3c2d3ee40f23ca5110a339 ]
Zero-length AV pairs should be considered as valid target infos. Don't skip the next AV pairs that follow them.
--- fs/smb/client/cifsencrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/cifsencrypt.c +2 -2
@@ -343,7 +343,7 @@ static struct ntlmssp2_name *find_next_av(struct cifs_ses *ses, len =AV_LEN (av);if (AV_TYPE (av) ==NTLMSSP_AV_EOL )return NULL ; -if (!len || (u8 *)av +sizeof (*av) + len > end) +if ((u8 *)av +sizeof (*av) + len > end)return NULL ;return av; }
@@ -363,7 +363,7 @@ static int find_av_name(struct cifs_ses *ses, u16 type, char **name, u16 maxlen)av_for_each_entry (ses, av) { len =AV_LEN (av); -if (AV_TYPE (av) != type) +if (AV_TYPE (av) != type || !len)continue ;if (!IS_ALIGNED (len,sizeof (__le16))) { cifs_dbg(VFS | ONCE, "%s: bad length(%u) for type %u\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 432/627 drm/xe/configfs: Fix pci_dev reference leak
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit 942ac8da6388c25fe62b2792c78715e0ea6e649b ]
We are using pci_get_domain_bus_and_slot() function to verify if the given config directory name matches any existing PCI device, but we missed to call matching pci_dev_put() to release reference.
While around, also change error code in case of no device match, to make it more specific than generic formatting error.
--- drivers/gpu/drm/xe/xe_configfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_configfs.c +2 -1
@@ -133,7 +133,8 @@ static struct config_group *xe_config_make_device_group(struct config_group *gro pdev =pci_get_domain_bus_and_slot (domain, bus,PCI_DEVFN (slot, function));if (!pdev) -return ERR_PTR (-EINVAL ); +return ERR_PTR (-ENODEV ); +pci_dev_put (pdev); dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 433/627 jfs: fix metapage reference count leak in dbAllocCtl
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yu <[email protected]>
[ Upstream commit 856db37592021e9155384094e331e2d4589f28b1 ]
In dbAllocCtl(), read_metapage() increases the reference count of the metapage. However, when dp->tree.budmin < 0, the function returns -EIO without calling release_metapage() to decrease the reference count, leading to a memory leak.
Add release_metapage(mp) before the error return to properly manage the metapage reference count and prevent the leak.
--- fs/jfs/jfs_dmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jfs/jfs_dmap.c +3 -1
@@ -1809,8 +1809,10 @@ dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno, s64 * results)return -EIO ; dp = (struct dmap *) mp->data; -if (dp->tree.budmin <0 ) +if (dp->tree.budmin <0 ) { +release_metapage (mp);return -EIO ; + }/* try to allocate the blocks. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 434/627 mtd: rawnand: atmel: Fix dma_mapping_error() address
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit e1e6b933c56b1e9fda93caa0b8bae39f3f421e5c ]
It seems like what was intended is to test if the dma_map of the previous line failed but the wrong dma address was passed.
Rule: add
--- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/atmel/nand-controller.c +1 -1
@@ -373,7 +373,7 @@ static int atmel_nand_dma_transfer(struct atmel_nand_controller *nc,dma_cookie_t cookie; buf_dma =dma_map_single (nc->dev, buf, len, dir); -if (dma_mapping_error (nc->dev, dev_dma)) { +if (dma_mapping_error (nc->dev, buf_dma)) {dev_err (nc->dev,"Failed to prepare a buffer for DMA access\n" ); goto err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 435/627 mtd: rawnand: rockchip: Add missing check after DMA map
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 3b36f86dc47261828f96f826077131a35dd825fd ]
The DMA map functions can fail and should be tested for errors.
--- drivers/mtd/nand/raw/rockchip-nand-controller.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/mtd/nand/raw/rockchip-nand-controller.c +15 -0
@@ -656,9 +656,16 @@ static int rk_nfc_write_page_hwecc(struct nand_chip *chip, const u8 *buf, dma_data =dma_map_single (nfc->dev, (void *)nfc->page_buf, mtd->writesize,DMA_TO_DEVICE ); +if (dma_mapping_error (nfc->dev, dma_data)) +return -ENOMEM ; + dma_oob =dma_map_single (nfc->dev, nfc->oob_buf, ecc->steps * oob_step,DMA_TO_DEVICE ); +if (dma_mapping_error (nfc->dev, dma_oob)) { +dma_unmap_single (nfc->dev, dma_data, mtd->writesize,DMA_TO_DEVICE ); +return -ENOMEM ; + }reinit_completion (&nfc->done);writel (INT_DMA , nfc->regs + nfc->cfg->int_en_off);
@@ -772,9 +779,17 @@ static int rk_nfc_read_page_hwecc(struct nand_chip *chip, u8 *buf, int oob_on, dma_data =dma_map_single (nfc->dev, nfc->page_buf, mtd->writesize,DMA_FROM_DEVICE ); +if (dma_mapping_error (nfc->dev, dma_data)) +return -ENOMEM ; + dma_oob =dma_map_single (nfc->dev, nfc->oob_buf, ecc->steps * oob_step,DMA_FROM_DEVICE ); +if (dma_mapping_error (nfc->dev, dma_oob)) { +dma_unmap_single (nfc->dev, dma_data, mtd->writesize, +DMA_FROM_DEVICE ); +return -ENOMEM ; + }/* * The first blocks (4, 8 or 16 depending on the device)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 436/627 mtd: rawnand: atmel: set pmecc data setup time
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balamanikandan Gunasundar <[email protected]>
[ Upstream commit f552a7c7e0a14215cb8a6fd89e60fa3932a74786 ]
Setup the pmecc data setup time as 3 clock cycles for 133MHz as recommended by the datasheet.
--- drivers/mtd/nand/raw/atmel/pmecc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mtd/nand/raw/atmel/pmecc.c +6 -0
@@ -143,6 +143,7 @@ struct atmel_pmecc_caps {int nstrengths;int el_offset;bool correct_erased_chunks; +bool clk_ctrl; };struct atmel_pmecc {
@@ -843,6 +844,10 @@ static struct atmel_pmecc *atmel_pmecc_create(struct platform_device *pdev,if (IS_ERR (pmecc->regs.errloc))return ERR_CAST (pmecc->regs.errloc); +/* pmecc data setup time */ +if (caps->clk_ctrl) +writel (PMECC_CLK_133MHZ , pmecc->regs.base +ATMEL_PMECC_CLK ); +/* Disable all interrupts before registering the PMECC handler. */ writel (0xffffffff , pmecc->regs.base +ATMEL_PMECC_IDR );atmel_pmecc_reset (pmecc);
@@ -896,6 +901,7 @@ static struct atmel_pmecc_caps at91sam9g45_caps = { .strengths = atmel_pmecc_strengths, .nstrengths = 5, .el_offset = 0x8c, + .clk_ctrl = true, };static struct atmel_pmecc_caps sama5d4_caps = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 437/627 drm/xe/vf: Disable CSC support on VF
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukasz Laguna <[email protected]>
[ Upstream commit f62408efc8669b82541295a4611494c8c8c52684 ]
CSC is not accessible by VF drivers, so disable its support flag on VF to prevent further initialization attempts.
--- drivers/gpu/drm/xe/xe_device.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/xe/xe_device.c +1 -0
@@ -685,6 +685,7 @@ static void sriov_update_device_info(struct xe_device *xe)/* disable features that are not available/applicable to VFs */ if (IS_SRIOV_VF (xe)) { xe->info.probe_display =0 ; + xe->info.has_heci_cscfi =0 ; xe->info.has_heci_gscfi =0 ; xe->info.skip_guc_pc =1 ; xe->info.skip_pcode =1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 438/627 selftests: ALSA: fix memory leak in utimer test
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: WangYuli <[email protected]>
[ Upstream commit 6260da046819b7bda828bacae148fc8856fdebd7 ]
Free the malloc'd buffer in TEST_F(timer_f, utimer) to prevent memory leak.
--- tools/testing/selftests/alsa/utimer-test.c | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/alsa/utimer-test.c +1 -0
@@ -135,6 +135,7 @@ TEST_F(timer_f, utimer) {pthread_join (ticking_thread,NULL );ASSERT_EQ (total_ticks,TICKS_COUNT );pclose (rfp); +free (buf); }TEST (wrong_timers_test) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 439/627 ALSA: usb: scarlett2: Fix missing NULL check
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit df485a4b2b3ee5b35c80f990beb554e38a8a5fb1 ]
scarlett2_input_select_ctl_info() sets up the string arrays allocated via kasprintf(), but it misses NULL checks, which may lead to NULL dereference Oops. Let's add the proper NULL check.
--- sound/usb/mixer_scarlett2.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/usb/mixer_scarlett2.c +6 -1
@@ -3971,8 +3971,13 @@ static int scarlett2_input_select_ctl_info( goto unlock;/* Loop through each input */ -for (i =0 ; i < inputs; i++) +for (i =0 ; i < inputs; i++) { values[i] =kasprintf (GFP_KERNEL ,"Input %d" , i +1 ); +if (!values[i]) { + err = -ENOMEM ; + goto unlock; + } + } err =snd_ctl_enum_info (uinfo,1 , i, (const char *const *)values);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 440/627 perf record: Cache build-ID of hit DSOs only
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 6235ce77749f45cac27f630337e2fdf04e8a6c73 ]
It post-processes samples to find which DSO has samples. Based on that info, it can save used DSOs in the build-ID cache directory. But for some reason, it saves all DSOs without checking the hit mark. Skipping unused DSOs can give some speedup especially with --buildid-mmap being default.
On my idle machine, time perf record -a sleep 1 goes down from 3 sec to 1.5 sec with this change.
--- tools/perf/util/build-id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/build-id.c +1 -1
@@ -864,7 +864,7 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine,char *allocated_name =NULL ;int ret =0 ; -if (!dso__has_build_id (dso)) +if (!dso__has_build_id (dso) || !dso__hit (dso))return 0 ;if (dso__is_kcore (dso)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 441/627 bpf: Add cookie object to bpf maps
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 12df58ad294253ac1d8df0c9bb9cf726397a671d ]
Add a cookie to BPF maps to uniquely identify BPF maps for the timespan when the node is up. This is different to comparing a pointer or BPF map id which could get rolled over and reused.
Stable-dep-of: abad3d0bad72 ("bpf: Fix oob access in cgroup local storage")
--- include/linux/bpf.h | 1 + kernel/bpf/syscall.c | 6 ++++++ 2 files changed, 7 insertions(+)
include/linux/bpf.h +1 -0
@@ -310,6 +310,7 @@ struct bpf_map {bool free_after_rcu_gp;atomic64_t sleepable_refcnt;s64 __percpu *elem_count; +u64 cookie;/* write-once */ };static inline const char *btf_field_type_name (enum btf_field_type type)
kernel/bpf/syscall.c +6 -0
@@ -37,6 +37,7 @@#include <linux/trace_events.h> #include <linux/tracepoint.h> #include <linux/overflow.h> +#include <linux/cookie.h> #include <net/netfilter/nf_bpf_link.h> #include <net/netkit.h>
@@ -53,6 +54,7 @@#define BPF_OBJ_FLAG_MASK (BPF_F_RDONLY | BPF_F_WRONLY)DEFINE_PER_CPU (int, bpf_prog_active); +DEFINE_COOKIE (bpf_map_cookie);static DEFINE_IDR (prog_idr);static DEFINE_SPINLOCK (prog_idr_lock);static DEFINE_IDR (map_idr);
@@ -1487,6 +1489,10 @@ static int map_create(union bpf_attr *attr, bool kernel)if (err <0 ) goto free_map; +preempt_disable (); + map->cookie =gen_cookie_next (&bpf_map_cookie); +preempt_enable (); +atomic64_set (&map->refcnt,1 );atomic64_set (&map->usercnt,1 );mutex_init (&map->freeze_mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 442/627 bpf: Move bpf map owner out of common struct
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit fd1c98f0ef5cbcec842209776505d9e70d8fcd53 ]
Given this is only relevant for BPF tail call maps, it is adding up space and penalizing other map types. We also need to extend this with further objects to track / compare to. Therefore, lets move this out into a separate structure and dynamically allocate it only for BPF tail call maps.
Stable-dep-of: abad3d0bad72 ("bpf: Fix oob access in cgroup local storage")
--- include/linux/bpf.h | 36 ++++++++++++++++++++++++------------ kernel/bpf/core.c | 35 ++++++++++++++++++----------------- kernel/bpf/syscall.c | 13 +++++++------ 3 files changed, 49 insertions(+), 35 deletions(-)
include/linux/bpf.h +24 -12
@@ -260,6 +260,18 @@ struct bpf_list_node_kern {void *owner; } __attribute__((aligned(8))); +/* 'Ownership' of program-containing map is claimed by the first program +* that is going to use this map or by the first program which FD is +* stored in the map to make sure that all callers and callees have the +* same prog type, JITed flag and xdp_has_frags flag. +*/ +struct bpf_map_owner { +enum bpf_prog_type type; +bool jited; +bool xdp_has_frags; +const struct btf_type *attach_func_proto; +}; +struct bpf_map {const struct bpf_map_ops *ops;struct bpf_map *inner_map_meta;
@@ -292,18 +304,8 @@ struct bpf_map {struct rcu_head rcu; };atomic64_t writecnt; -/* 'Ownership' of program-containing map is claimed by the first program -* that is going to use this map or by the first program which FD is -* stored in the map to make sure that all callers and callees have the -* same prog type, JITed flag and xdp_has_frags flag. -*/ -struct { -const struct btf_type *attach_func_proto; -spinlock_t lock; -enum bpf_prog_type type; -bool jited; -bool xdp_has_frags; - } owner; +spinlock_t owner_lock; +struct bpf_map_owner *owner;bool bypass_spec_v1;bool frozen;/* write-once; write-protected by freeze_mutex */ bool free_after_mult_rcu_gp;
@@ -2072,6 +2074,16 @@ static inline bool bpf_map_flags_access_ok(u32 access_flags) (BPF_F_RDONLY_PROG |BPF_F_WRONLY_PROG ); } +static inline struct bpf_map_owner *bpf_map_owner_alloc (struct bpf_map *map) +{ +return kzalloc (sizeof (*map->owner),GFP_ATOMIC ); +} + +static inline void bpf_map_owner_free (struct bpf_map *map) +{ +kfree (map->owner); +} +struct bpf_event_entry {struct perf_event *event;struct file *perf_file;
kernel/bpf/core.c +18 -17
@@ -2365,28 +2365,29 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, const struct bpf_prog *fp) {enum bpf_prog_type prog_type =resolve_prog_type (fp); -bool ret;struct bpf_prog_aux *aux = fp->aux; +bool ret = false;if (fp->kprobe_override) -return false; +return ret; -spin_lock (&map->owner.lock); -if (!map->owner.type) { -/* There's no owner yet where we could check for -* compatibility. -*/ - map->owner.type = prog_type; - map->owner.jited = fp->jited; - map->owner.xdp_has_frags = aux->xdp_has_frags; - map->owner.attach_func_proto = aux->attach_func_proto; +spin_lock (&map->owner_lock); +/* There's no owner yet where we could check for compatibility. */ +if (!map->owner) { + map->owner =bpf_map_owner_alloc (map); +if (!map->owner) + goto err; + map->owner->type = prog_type; + map->owner->jited = fp->jited; + map->owner->xdp_has_frags = aux->xdp_has_frags; + map->owner->attach_func_proto = aux->attach_func_proto; ret = true; }else { - ret = map->owner.type == prog_type && - map->owner.jited == fp->jited && - map->owner.xdp_has_frags == aux->xdp_has_frags; + ret = map->owner->type == prog_type && + map->owner->jited == fp->jited && + map->owner->xdp_has_frags == aux->xdp_has_frags;if (ret && - map->owner.attach_func_proto != aux->attach_func_proto) { + map->owner->attach_func_proto != aux->attach_func_proto) {switch (prog_type) {case BPF_PROG_TYPE_TRACING :case BPF_PROG_TYPE_LSM :
@@ -2399,8 +2400,8 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, } } } -spin_unlock (&map->owner.lock); - +err: +spin_unlock (&map->owner_lock);return ret; }
kernel/bpf/syscall.c +7 -6
@@ -887,6 +887,7 @@ static void bpf_map_free_deferred(struct work_struct *work)security_bpf_map_free (map);bpf_map_release_memcg (map); +bpf_map_owner_free (map);bpf_map_free (map); }
@@ -981,12 +982,12 @@ static void bpf_map_show_fdinfo(struct seq_file *m, struct file *filp)struct bpf_map *map = filp->private_data;u32 type =0 , jited =0 ; -if (map_type_contains_progs (map)) { -spin_lock (&map->owner.lock); - type = map->owner.type; - jited = map->owner.jited; -spin_unlock (&map->owner.lock); +spin_lock (&map->owner_lock); +if (map->owner) { + type = map->owner->type; + jited = map->owner->jited; } +spin_unlock (&map->owner_lock);seq_printf (m, "map_type:\t%u\n"
@@ -1496,7 +1497,7 @@ static int map_create(union bpf_attr *attr, bool kernel)atomic64_set (&map->refcnt,1 );atomic64_set (&map->usercnt,1 );mutex_init (&map->freeze_mutex); -spin_lock_init (&map->owner.lock); +spin_lock_init (&map->owner_lock); if (attr->btf_key_type_id || attr->btf_value_type_id ||/* Even the map's value is a kernel's struct,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 443/627 bpf: Move cgroup iterator helpers to bpf.h
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit 9621e60f59eae87eb9ffe88d90f24f391a1ef0f0 ]
Move them into bpf.h given we also need them in core code.
Stable-dep-of: abad3d0bad72 ("bpf: Fix oob access in cgroup local storage")
--- include/linux/bpf-cgroup.h | 5 ----- include/linux/bpf.h | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-)
include/linux/bpf-cgroup.h +0 -5
@@ -77,9 +77,6 @@ to_cgroup_bpf_attach_type(enum bpf_attach_type attach_type)extern struct static_key_false cgroup_bpf_enabled_key[MAX_CGROUP_BPF_ATTACH_TYPE ];#define cgroup_bpf_enabled (atype) static_branch_unlikely(&cgroup_bpf_enabled_key[atype]) -#define for_each_cgroup_storage_type (stype) \ - for (stype = 0; stype < MAX_BPF_CGROUP_STORAGE_TYPE; stype++) -struct bpf_cgroup_storage_map ;struct bpf_storage_buffer {
@@ -511,8 +508,6 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map,#define BPF_CGROUP_RUN_PROG_SETSOCKOPT (sock, level, optname, optval, optlen, \ kernel_optval) ({ 0; }) -#define for_each_cgroup_storage_type (stype) for (; false; ) -#endif /* CONFIG_CGROUP_BPF */ #endif /* _BPF_CGROUP_H */
include/linux/bpf.h +14 -8
@@ -208,6 +208,20 @@ enum btf_field_type { BPF_RES_SPIN_LOCK = (1 << 12), }; +enum bpf_cgroup_storage_type { +BPF_CGROUP_STORAGE_SHARED , +BPF_CGROUP_STORAGE_PERCPU , + __BPF_CGROUP_STORAGE_MAX +#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX +}; + +#ifdef CONFIG_CGROUP_BPF +# define for_each_cgroup_storage_type (stype) \ + for (stype = 0; stype < MAX_BPF_CGROUP_STORAGE_TYPE; stype++) +#else +# define for_each_cgroup_storage_type (stype) for (; false; ) +#endif /* CONFIG_CGROUP_BPF */ +typedef void (*btf_dtor_kfunc_t )(void *);struct btf_field_kptr {
@@ -1085,14 +1099,6 @@ struct bpf_prog_offload {u32 jited_len; }; -enum bpf_cgroup_storage_type { -BPF_CGROUP_STORAGE_SHARED , -BPF_CGROUP_STORAGE_PERCPU , - __BPF_CGROUP_STORAGE_MAX -}; - -#define MAX_BPF_CGROUP_STORAGE_TYPE __BPF_CGROUP_STORAGE_MAX -/* The longest tracepoint has 12 args. * See include/trace/bpf_probe.h */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 444/627 bpf: Fix oob access in cgroup local storage
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit abad3d0bad72a52137e0c350c59542d75ae4f513 ]
Lonial reported that an out-of-bounds access in cgroup local storage can be crafted via tail calls. Given two programs each utilizing a cgroup local storage with a different value size, and one program doing a tail call into the other. The verifier will validate each of the indivial programs just fine. However, in the runtime context the bpf_cg_run_ctx holds an bpf_prog_array_item which contains the BPF program as well as any cgroup local storage flavor the program uses. Helpers such as bpf_get_local_storage() pick this up from the runtime context:
ctx = container_of(current->bpf_ctx, struct bpf_cg_run_ctx, run_ctx);
storage = ctx->prog_item->cgroup_storage[stype];
if (stype == BPF_CGROUP_STORAGE_SHARED)
ptr = &READ_ONCE(storage->buf)->data[0];
else
ptr = this_cpu_ptr(storage->percpu_buf);For the second program which was called from the originally attached one, this means bpf_get_local_storage() will pick up the former program's map, not its own. With mismatching sizes, this can result in an unintended out-of-bounds access.
To fix this issue, we need to extend bpf_map_owner with an array of storage_cookie[] to match on i) the exact maps from the original program if the second program was using bpf_get_local_storage(), or ii) allow the tail call combination if the second program was not using any of the cgroup local storage maps.
--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+)
include/linux/bpf.h +1 -0
@@ -283,6 +283,7 @@ struct bpf_map_owner {enum bpf_prog_type type;bool jited;bool xdp_has_frags; +u64 storage_cookie[MAX_BPF_CGROUP_STORAGE_TYPE ];const struct btf_type *attach_func_proto; };
kernel/bpf/core.c +15 -0
@@ -2366,7 +2366,9 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, {enum bpf_prog_type prog_type =resolve_prog_type (fp);struct bpf_prog_aux *aux = fp->aux; +enum bpf_cgroup_storage_type i;bool ret = false; +u64 cookie;if (fp->kprobe_override)return ret;
@@ -2381,11 +2383,24 @@ static bool __bpf_prog_map_compatible(struct bpf_map *map, map->owner->jited = fp->jited; map->owner->xdp_has_frags = aux->xdp_has_frags; map->owner->attach_func_proto = aux->attach_func_proto; +for_each_cgroup_storage_type (i) { + map->owner->storage_cookie[i] = + aux->cgroup_storage[i] ? + aux->cgroup_storage[i]->cookie :0 ; + } ret = true; }else { ret = map->owner->type == prog_type && map->owner->jited == fp->jited && map->owner->xdp_has_frags == aux->xdp_has_frags; +for_each_cgroup_storage_type (i) { +if (!ret) +break ; + cookie = aux->cgroup_storage[i] ? + aux->cgroup_storage[i]->cookie :0 ; + ret = map->owner->storage_cookie[i] == cookie || + !cookie; + }if (ret && map->owner->attach_func_proto != aux->attach_func_proto) {switch (prog_type) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 445/627 vdpa/mlx5: Fix needs_teardown flag calculation
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dragos Tatulea <[email protected]>
[ Upstream commit 6f0f3d7fc4e05797b801ded4910a64d16db230e9 ]
needs_teardown is a device flag that indicates when virtual queues need to be recreated. This happens for certain configuration changes: queue size and some specific features.
Currently, the needs_teardown state can be incorrectly reset by subsequent .set_vq_num() calls. For example, for 1 rx VQ with size 512 and 1 tx VQ with size 256:
.set_vq_num(0, 512) -> sets needs_teardown to true (rx queue has a
non-default size)
.set_vq_num(1, 256) -> sets needs_teardown to false (tx queue has a
default size)
This change takes into account the previous value of the needs_teardown flag when re-calculating it during VQ size configuration.
Message-Id: <[email protected]>
--- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -1
@@ -2491,7 +2491,7 @@ static void mlx5_vdpa_set_vq_num(struct vdpa_device *vdev, u16 idx, u32 num) } mvq = &ndev->vqs[idx]; - ndev->needs_teardown = num != mvq->num_ent; + ndev->needs_teardown |= num != mvq->num_ent; mvq->num_ent = num; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 446/627 vhost-scsi: Fix log flooding with target does not exist errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 69cd720a8a5e9ef0f05ce5dd8c9ea6e018245c82 ]
As part of the normal initiator side scanning the guest's scsi layer will loop over all possible targets and send an inquiry. Since the max number of targets for virtio-scsi is 256, this can result in 255 error messages about targets not existing if you only have a single target. When there's more than 1 vhost-scsi device each with a single target, then you get N * 255 log messages.
It looks like the log message was added by accident in:
commit 3f8ca2e115e5 ("vhost/scsi: Extract common handling code from control queue handler")
when we added common helpers. Then in:
commit 09d7583294aa ("vhost/scsi: Use common handling code in request queue handler")
we converted the scsi command processing path to use the new helpers so we started to see the extra log messages during scanning.
The patches were just making some code common but added the vq_err call and I'm guessing the patch author forgot to enable the vq_err call (vq_err is implemented by pr_debug which defaults to off). So this patch removes the call since it's expected to hit this path during device discovery.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/vhost/scsi.c +1 -3
@@ -1226,10 +1226,8 @@ vhost_scsi_get_req(struct vhost_virtqueue *vq, struct vhost_scsi_ctx *vc,/* validated at handler entry */ vs_tpg =vhost_vq_get_backend (vq); tpg =READ_ONCE (vs_tpg[*vc->target]); -if (unlikely (!tpg)) { -vq_err (vq,"Target 0x%x does not exist\n" , *vc->target); +if (unlikely (!tpg)) goto out; - } }if (tpgp)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 447/627 vhost-scsi: Fix check for inline_sg_cnt exceeding preallocated limit
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 400cad513c78f9af72c5a20f3611c1f1dc71d465 ]
The condition comparing ret to VHOST_SCSI_PREALLOC_SGLS was incorrect, as ret holds the result of kstrtouint() (typically 0 on success), not the parsed value. Update the check to use cnt, which contains the actual user-provided value.
prevents silently accepting values exceeding the maximum inline_sg_cnt.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/scsi.c +1 -1
@@ -71,7 +71,7 @@ static int vhost_scsi_set_inline_sg_cnt(const char *buf,if (ret)return ret; -if (ret >VHOST_SCSI_PREALLOC_SGLS ) { +if (cnt >VHOST_SCSI_PREALLOC_SGLS ) {pr_err ("Max inline_sg_cnt is %u\n" ,VHOST_SCSI_PREALLOC_SGLS );return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 448/627 vdpa/mlx5: Fix release of uninitialized resources on error path
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dragos Tatulea <[email protected]>
[ Upstream commit cc51a66815999afb7e9cd845968de4fdf07567b7 ]
The commit in the fixes tag made sure that mlx5_vdpa_free() is the single entrypoint for removing the vdpa device resources added in mlx5_vdpa_dev_add(), even in the cleanup path of mlx5_vdpa_dev_add().
This means that all functions from mlx5_vdpa_free() should be able to handle uninitialized resources. This was not the case though:mlx5_vdpa_destroy_mr_resources() and mlx5_cmd_cleanup_async_ctx() were not able to do so. This caused the splat below when adding a vdpa device without a MAC address.
This patch fixes these remaining issues:
- Makes mlx5_vdpa_destroy_mr_resources() return early if called on uninitialized resources.
- Moves mlx5_cmd_init_async_ctx() early on during device addition because it can't fail. This means that mlx5_cmd_cleanup_async_ctx() also can't fail. To mirror this, move the call site of mlx5_cmd_cleanup_async_ctx() in mlx5_vdpa_free().
An additional comment was added in mlx5_vdpa_free() to document the expectations of functions called from this context.
Splat:
mlx5_core 0000:b5:03.2: mlx5_vdpa_dev_add:3950:(pid 2306) warning: No mac address provisioned?
------------[ cut here ]------------ WARNING: CPU: 13 PID: 2306 at kernel/workqueue.c:4207 __flush_work+0x9a/0xb0 [...] Call Trace: <TASK> ? __try_to_del_timer_sync+0x61/0x90 ? __timer_delete_sync+0x2b/0x40 mlx5_vdpa_destroy_mr_resources+0x1c/0x40 [mlx5_vdpa] mlx5_vdpa_free+0x45/0x160 [mlx5_vdpa] vdpa_release_dev+0x1e/0x50 [vdpa] device_release+0x31/0x90 kobject_cleanup+0x37/0x130 mlx5_vdpa_dev_add+0x327/0x890 [mlx5_vdpa] vdpa_nl_cmd_dev_add_set_doit+0x2c1/0x4d0 [vdpa] genl_family_rcv_msg_doit+0xd8/0x130 genl_family_rcv_msg+0x14b/0x220 ? __pfx_vdpa_nl_cmd_dev_add_set_doit+0x10/0x10 [vdpa] genl_rcv_msg+0x47/0xa0 ? __pfx_genl_rcv_msg+0x10/0x10 netlink_rcv_skb+0x53/0x100 genl_rcv+0x24/0x40 netlink_unicast+0x27b/0x3b0 netlink_sendmsg+0x1f7/0x430 __sys_sendto+0x1fa/0x210 ? ___pte_offset_map+0x17/0x160 ? next_uptodate_folio+0x85/0x2b0 ? percpu_counter_add_batch+0x51/0x90 ? filemap_map_pages+0x515/0x660 __x64_sys_sendto+0x20/0x30 do_syscall_64+0x7b/0x2c0 ? do_read_fault+0x108/0x220 ? do_pte_missing+0x14a/0x3e0 ? __handle_mm_fault+0x321/0x730 ? count_memcg_events+0x13f/0x180 ? handle_mm_fault+0x1fb/0x2d0 ? do_user_addr_fault+0x20c/0x700 ? syscall_exit_work+0x104/0x140 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7f0c25b0feca [...] ---[ end trace 0000000000000000 ]---
Message-Id: <[email protected]>
--- drivers/vdpa/mlx5/core/mr.c | 3 +++ drivers/vdpa/mlx5/net/mlx5_vnet.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/vdpa/mlx5/core/mr.c +3 -0
@@ -908,6 +908,9 @@ void mlx5_vdpa_destroy_mr_resources(struct mlx5_vdpa_dev *mvdev) {struct mlx5_vdpa_mr_resources *mres = &mvdev->mres; +if (!mres->wq_gc) +return ; +atomic_set (&mres->shutdown,1 );flush_delayed_work (&mres->gc_dwork_ent);
drivers/vdpa/mlx5/net/mlx5_vnet.c +6 -4
@@ -3432,15 +3432,17 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev) ndev =to_mlx5_vdpa_ndev (mvdev); +/* Functions called here should be able to work with +* uninitialized resources. +*/ free_fixed_resources (ndev);mlx5_vdpa_clean_mrs (mvdev);mlx5_vdpa_destroy_mr_resources (&ndev->mvdev); -mlx5_cmd_cleanup_async_ctx (&mvdev->async_ctx); -if (!is_zero_ether_addr (ndev->config.mac)) { pfmdev =pci_get_drvdata (pci_physfn (mvdev->mdev->pdev));mlx5_mpfs_del_mac (pfmdev, ndev->config.mac); } +mlx5_cmd_cleanup_async_ctx (&mvdev->async_ctx);mlx5_vdpa_free_resources (&ndev->mvdev);free_irqs (ndev);kfree (ndev->event_cbs);
@@ -3888,6 +3890,8 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, mvdev->actual_features = (device_features &BIT_ULL (VIRTIO_F_VERSION_1 )); +mlx5_cmd_init_async_ctx (mdev, &mvdev->async_ctx); + ndev->vqs =kcalloc (max_vqs,sizeof (*ndev->vqs),GFP_KERNEL ); ndev->event_cbs =kcalloc (max_vqs +1 ,sizeof (*ndev->event_cbs),GFP_KERNEL );if (!ndev->vqs || !ndev->event_cbs) {
@@ -3960,8 +3964,6 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ndev->rqt_size =1 ; } -mlx5_cmd_init_async_ctx (mdev, &mvdev->async_ctx); - ndev->mvdev.mlx_features = device_features; mvdev->vdev.dma_dev = &mdev->pdev->dev; err =mlx5_vdpa_alloc_resources (&ndev->mvdev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 449/627 vdpa: Fix IDR memory leak in VDUSE module exit
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anders Roxell <[email protected]>
[ Upstream commit d9ea58b5dc6b4b50fbb6a10c73f840e8b10442b7 ]
Add missing idr_destroy() call in vduse_exit() to properly free the vduse_idr radix tree nodes. Without this, module load/unload cycles leak 576-byte radix tree node allocations, detectable by kmemleak as:
unreferenced object (size 576):
backtrace:
[<ffffffff81234567>] radix_tree_node_alloc+0xa0/0xf0
[<ffffffff81234568>] idr_get_free+0x128/0x280The vduse_idr is initialized via DEFINE_IDR() at line 136 and used throughout the VDUSE (vDPA Device in Userspace) driver for device ID management. The fix follows the documented pattern in lib/idr.c and matches the cleanup approach used by other drivers.
This leak was discovered through comprehensive module testing with cumulative kmemleak detection across 10 load/unload iterations per module.
Message-Id: <[email protected]>
--- drivers/vdpa/vdpa_user/vduse_dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/vdpa/vdpa_user/vduse_dev.c +1 -0
@@ -2216,6 +2216,7 @@ static void vduse_exit(void)cdev_del (&vduse_ctrl_cdev);unregister_chrdev_region (vduse_major,VDUSE_DEV_MAX );class_unregister (&vduse_class); +idr_destroy (&vduse_idr); }module_exit (vduse_exit);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 450/627 vhost: Reintroduce kthread API and add mode selection
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cindy Lu <[email protected]>
[ Upstream commit 7d9896e9f6d02d8aa85e63f736871f96c59a5263 ]
Since commit 6e890c5d5021 ("vhost: use vhost_tasks for worker threads"), the vhost uses vhost_task and operates as a child of the owner thread. This is required for correct CPU usage accounting, especially when using containers.
However, this change has caused confusion for some legacy userspace applications, and we didn't notice until it's too late.
Unfortunately, it's too late to revert - we now have userspace depending both on old and new behaviour :(
To address the issue, reintroduce kthread mode for vhost workers and provide a configuration to select between kthread and task worker.
- Add 'fork_owner' parameter to vhost_dev to let users select kthread or task mode. Default mode is task mode(VHOST_FORK_OWNER_TASK).
- Reintroduce kthread mode support:
* Bring back the original vhost_worker() implementation, and renamed to vhost_run_work_kthread_list().
* Add cgroup support for the kthread
* Introduce struct vhost_worker_ops:
- Encapsulates create / stop / wake‑up callbacks.
- vhost_worker_create() selects the proper ops according to inherit_owner.
- Userspace configuration interface:
* New IOCTLs:
- VHOST_SET_FORK_FROM_OWNER lets userspace select task mode (VHOST_FORK_OWNER_TASK) or kthread mode (VHOST_FORK_OWNER_KTHREAD)
- VHOST_GET_FORK_FROM_OWNER reads the current worker mode
* Expose module parameter 'fork_from_owner_default' to allow system administrators to configure the default mode for vhost workers
* Kconfig option CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL controls whether these IOCTLs and the parameter are available
- The VHOST_NEW_WORKER functionality requires fork_owner to be set to true, with validation added to ensure proper configuration
This partially reverts or improves upon:
commit 6e890c5d5021 ("vhost: use vhost_tasks for worker threads") commit 1cdaafa1b8b4 ("vhost: replace single worker pointer with xarray")
Message-Id: <[email protected]>
--- drivers/vhost/Kconfig | 18 +++ drivers/vhost/vhost.c | 244 ++++++++++++++++++++++++++++++++++--- drivers/vhost/vhost.h | 22 ++++ include/uapi/linux/vhost.h | 29 +++++ 4 files changed, 295 insertions(+), 18 deletions(-)
drivers/vhost/Kconfig +18 -0
@@ -95,4 +95,22 @@ config VHOST_CROSS_ENDIAN_LEGACY If unsure, say "N". +config VHOST_ENABLE_FORK_OWNER_CONTROL + bool "Enable VHOST_ENABLE_FORK_OWNER_CONTROL" + default y + help + This option enables two IOCTLs: VHOST_SET_FORK_FROM_OWNER and + VHOST_GET_FORK_FROM_OWNER. These allow userspace applications + to modify the vhost worker mode for vhost devices. + + Also expose module parameter 'fork_from_owner_default' to allow users + to configure the default mode for vhost workers. + + By default, `VHOST_ENABLE_FORK_OWNER_CONTROL` is set to `y`, + users can change the worker thread mode as needed. + If this config is disabled (n),the related IOCTLs and parameters will + be unavailable. + + If unsure, say "Y". + endif
drivers/vhost/vhost.c +226 -18
330 lines not on this page · raw message
drivers/vhost/vhost.h +22 -0
@@ -26,7 +26,18 @@ struct vhost_work {unsigned long flags; }; +struct vhost_worker ; +struct vhost_dev ; + +struct vhost_worker_ops { +int (*create)(struct vhost_worker *worker,struct vhost_dev *dev, +const char *name); +void (*stop)(struct vhost_worker *worker); +void (*wakeup)(struct vhost_worker *worker); +}; +struct vhost_worker { +struct task_struct *kthread_task;struct vhost_task *vtsk;struct vhost_dev *dev;/* Used to serialize device wide flushing with worker swapping. */
@@ -36,6 +47,7 @@ struct vhost_worker {u32 id;int attachment_cnt;bool killed; +const struct vhost_worker_ops *ops; };/* Poll a file (eventfd or socket) */
@@ -176,6 +188,16 @@ struct vhost_dev {int byte_weight;struct xarray worker_xa;bool use_worker; +/* +* If fork_owner is true we use vhost_tasks to create +* the worker so all settings/limits like cgroups, NPROC, +* scheduler, etc are inherited from the owner. If false, +* we use kthreads and only attach to the same cgroups +* as the owner for compat with older kernels. +* here we use true as default value. +* The default value is set by fork_from_owner_default +*/ +bool fork_owner;int (*msg_handler)(struct vhost_dev *dev,u32 asid,struct vhost_iotlb_msg *msg); };
include/uapi/linux/vhost.h +29 -0
@@ -235,4 +235,33 @@*/ #define VHOST_VDPA_GET_VRING_SIZE _IOWR(VHOST_VIRTIO, 0x82, \ struct vhost_vring_state) + +/* fork_owner values for vhost */ +#define VHOST_FORK_OWNER_KTHREAD 0 +#define VHOST_FORK_OWNER_TASK 1 + +/** +* VHOST_SET_FORK_FROM_OWNER - Set the fork_owner flag for the vhost device, +* This ioctl must called before VHOST_SET_OWNER. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @param fork_owner: An 8-bit value that determines the vhost thread mode +* +* When fork_owner is set to VHOST_FORK_OWNER_TASK(default value): +* - Vhost will create vhost worker as tasks forked from the owner, +* inheriting all of the owner's attributes. +* +* When fork_owner is set to VHOST_FORK_OWNER_KTHREAD: +* - Vhost will create vhost workers as kernel threads. +*/ +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8) + +/** +* VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device. +* Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y +* +* @return: An 8-bit value indicating the current thread mode. +*/ +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8) +#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 451/627 bpf: Check flow_dissector ctx accesses are aligned
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit ead3d7b2b6afa5ee7958620c4329982a7d9c2b78 ]
flow_dissector_is_valid_access doesn't check that the context access is aligned. As a consequence, an unaligned access within one of the exposed field is considered valid and later rejected by flow_dissector_convert_ctx_access when we try to convert it.
The later rejection is problematic because it's reported as a verifier bug with a kernel warning and doesn't point to the right instruction in verifier logs.
--- net/core/filter.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/filter.c +3 -0
@@ -9449,6 +9449,9 @@ static bool flow_dissector_is_valid_access(int off, int size,if (off <0 || off >=sizeof (struct __sk_buff ))return false; +if (off % size !=0 ) +return false; +if (type ==BPF_WRITE )return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 452/627 bpf: Check netfilter ctx accesses are aligned
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 9e6448f7b1efb27f8d508b067ecd33ed664a4246 ]
Similarly to the previous patch fixing the flow_dissector ctx accesses, nf_is_valid_access also doesn't check that ctx accesses are aligned. Contrary to flow_dissector programs, netfilter programs don't have context conversion. The unaligned ctx accesses are therefore allowed by the verifier.
--- net/netfilter/nf_bpf_link.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_bpf_link.c +3 -0
@@ -295,6 +295,9 @@ static bool nf_is_valid_access(int off, int size, enum bpf_access_type type,if (off <0 || off >=sizeof (struct bpf_nf_ctx ))return false; +if (off % size !=0 ) +return false; +if (type ==BPF_WRITE )return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 453/627 apparmor: ensure WB_HISTORY_SIZE value is a power of 2
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Lee <[email protected]>
[ Upstream commit 6c055e62560b958354625604293652753d82bcae ]
WB_HISTORY_SIZE was defined to be a value not a power of 2, despite a comment in the declaration of struct match_workbuf stating it is and a modular arithmetic usage in the inc_wb_pos macro assuming that it is. Bump WB_HISTORY_SIZE's value up to 32 and add a BUILD_BUG_ON_NOT_POWER_OF_2 line to ensure that any future changes to the value of WB_HISTORY_SIZE respect this requirement.
--- security/apparmor/include/match.h | 3 ++- security/apparmor/match.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
security/apparmor/include/match.h +2 -1
@@ -137,7 +137,8 @@ aa_state_t aa_dfa_matchn_until(struct aa_dfa *dfa, aa_state_t start,void aa_dfa_free_kref (struct kref *kref); -#define WB_HISTORY_SIZE 24 +/* This needs to be a power of 2 */ +#define WB_HISTORY_SIZE 32struct match_workbuf {unsigned int count;unsigned int pos;
security/apparmor/match.c +1 -0
@@ -681,6 +681,7 @@ aa_state_t aa_dfa_matchn_until(struct aa_dfa *dfa, aa_state_t start,#define inc_wb_pos (wb) \ do { \ + BUILD_BUG_ON_NOT_POWER_OF_2(WB_HISTORY_SIZE); \ wb->pos = (wb->pos + 1) & (WB_HISTORY_SIZE - 1); \ wb->len = (wb->len + 1) & (WB_HISTORY_SIZE - 1); \ } while (0)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 454/627 apparmor: fix loop detection used in conflicting attachment resolution
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Lee <[email protected]>
[ Upstream commit a88db916b8c77552f49f7d9f8744095ea01a268f ]
Conflicting attachment resolution is based on the number of states traversed to reach an accepting state in the attachment DFA, accounting for DFA loops traversed during the matching process. However, the loop counting logic had multiple bugs:
- The inc_wb_pos macro increments both position and length, but length is supposed to saturate upon hitting buffer capacity, instead of wrapping around.
- If no revisited state is found when traversing the history, is_loop would still return true, as if there was a loop found the length of the history buffer, instead of returning false and signalling that no loop was found. As a result, the adjustment step of aa_dfa_leftmatch would sometimes produce negative counts with loop- free DFAs that traversed enough states.
- The iteration in the is_loop for loop is supposed to stop before i = wb->len, so the conditional should be < instead of <=.
This patch fixes the above bugs as well as the following nits:
- The count and size fields in struct match_workbuf were not used, so they can be removed.
- The history buffer in match_workbuf semantically stores aa_state_t and not unsigned ints, even if aa_state_t is currently unsigned int.
- The local variables in is_loop are counters, and thus should be unsigned ints instead of aa_state_t's.
--- security/apparmor/include/match.h | 5 +---- security/apparmor/match.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-)
security/apparmor/include/match.h +1 -4
@@ -140,15 +140,12 @@ void aa_dfa_free_kref(struct kref *kref);/* This needs to be a power of 2 */ #define WB_HISTORY_SIZE 32struct match_workbuf { -unsigned int count;unsigned int pos;unsigned int len; -unsigned int size;/* power of 2, same as history size */ -unsigned int history[WB_HISTORY_SIZE ]; +aa_state_t history[WB_HISTORY_SIZE ]; };#define DEFINE_MATCH_WB (N ) \ struct match_workbuf N = { \ - .count = 0, \ .pos = 0, \ .len = 0, \ }
security/apparmor/match.c +11 -11
@@ -679,35 +679,35 @@ aa_state_t aa_dfa_matchn_until(struct aa_dfa *dfa, aa_state_t start,return state; } -#define inc_wb_pos (wb) \ -do { \ +#define inc_wb_pos (wb) \ +do { \ BUILD_BUG_ON_NOT_POWER_OF_2(WB_HISTORY_SIZE); \ wb->pos = (wb->pos + 1) & (WB_HISTORY_SIZE - 1); \ - wb->len = (wb->len + 1) & (WB_HISTORY_SIZE - 1); \ + wb->len = (wb->len + 1) > WB_HISTORY_SIZE ? WB_HISTORY_SIZE : \ + wb->len + 1; \ } while (0)/* For DFAs that don't support extended tagging of states */ +/* adjust is only set if is_loop returns true */ static bool is_loop (struct match_workbuf *wb,aa_state_t state,unsigned int *adjust) { -aa_state_t pos = wb->pos; -aa_state_t i; +int pos = wb->pos; +int i;if (wb->history[pos] < state)return false; -for (i =0 ; i <= wb->len; i++) { +for (i =0 ; i < wb->len; i++) {if (wb->history[pos] == state) { *adjust = i;return true; } -if (pos ==0 ) - pos =WB_HISTORY_SIZE ; - pos--; +/* -1 wraps to WB_HISTORY_SIZE - 1 */ + pos = (pos -1 ) & (WB_HISTORY_SIZE -1 ); } - *adjust = i; -return true; +return false; } static aa_state_t leftmatch_fb(struct aa_dfa *dfa, aa_state_t start,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 455/627 dm-flakey: Fix corrupt_bio_byte setup checks
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kent Overstreet <[email protected]>
[ Upstream commit 75227ed6812cb869380c8fb6d41a845ae571781e ]
Fix the error_reads mode - it's incompatible with corrupt_bio_byte, but that's only enabled if corrupt_bio_byte is nonzero.
--- drivers/md/dm-flakey.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/md/dm-flakey.c +6 -3
@@ -215,16 +215,19 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, }if (test_bit (DROP_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="drop_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_WRITES , &fc->flags) && - (fc->corrupt_bio_rw ==WRITE || fc->random_write_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==WRITE ) || + fc->random_write_corrupt)) { ti->error ="error_writes is incompatible with random_write_corrupt or corrupt_bio_byte with the WRITE flag set" ;return -EINVAL ; }else if (test_bit (ERROR_READS , &fc->flags) && - (fc->corrupt_bio_rw ==READ || fc->random_read_corrupt)) { + ((fc->corrupt_bio_byte && fc->corrupt_bio_rw ==READ ) || + fc->random_read_corrupt)) { ti->error ="error_reads is incompatible with random_read_corrupt or corrupt_bio_byte with the READ flag set" ;return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 456/627 uprobes: revert ref_ctr_offset in uprobe_unregister error path
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit aa644c405291a419e92b112e2279c01c410e9a26 ]
There's error path that could lead to inactive uprobe:
1) uprobe_register succeeds - updates instruction to int3 and changes ref_ctr from 0 to 1
2) uprobe_unregister fails - int3 stays in place, but ref_ctr is changed to 0 (it's not restored to 1 in the fail path) uprobe is leaked
3) another uprobe_register comes and re-uses the leaked uprobe and succeds - but int3 is already in place, so ref_ctr update is skipped and it stays 0 - uprobe CAN NOT be triggered now
4) uprobe_unregister fails because ref_ctr value is unexpected
Fix this by reverting the updated ref_ctr value back to 1 in step 2), which is the case when uprobe_unregister fails (int3 stays in place), but we have already updated refctr.
The new scenario will go as follows:
1) uprobe_register succeeds - updates instruction to int3 and changes ref_ctr from 0 to 1
2) uprobe_unregister fails - int3 stays in place and ref_ctr is reverted to 1.. uprobe is leaked
3) another uprobe_register comes and re-uses the leaked uprobe and succeds - but int3 is already in place, so ref_ctr update is skipped and it stays 1 - uprobe CAN be triggered now
4) uprobe_unregister succeeds
--- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/uprobes.c +2 -2
@@ -581,8 +581,8 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct vm_area_struct *vma, out:/* Revert back reference counter if instruction update failed. */ -if (ret <0 && is_register && ref_ctr_updated) -update_ref_ctr (uprobe, mm,-1 ); +if (ret <0 && ref_ctr_updated) +update_ref_ctr (uprobe, mm, is_register ?-1 :1 );/* try collapse pmd for compound page */ if (ret >0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 457/627 scripts: gdb: move MNT_* constants to gdb-parsed
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 41a7f737685eed2700654720d3faaffdf0132135 ]
Since these are now no longer defines, but in an enum.
--- scripts/gdb/linux/constants.py.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
scripts/gdb/linux/constants.py.in +6 -6
@@ -74,12 +74,12 @@ if IS_BUILTIN(CONFIG_MODULES): LX_GDBPARSED(MOD_RO_AFTER_INIT) /* linux/mount.h */ -LX_VALUE(MNT_NOSUID) -LX_VALUE(MNT_NODEV) -LX_VALUE(MNT_NOEXEC) -LX_VALUE(MNT_NOATIME) -LX_VALUE(MNT_NODIRATIME) -LX_VALUE(MNT_RELATIME) +LX_GDBPARSED(MNT_NOSUID) +LX_GDBPARSED(MNT_NODEV) +LX_GDBPARSED(MNT_NOEXEC) +LX_GDBPARSED(MNT_NOATIME) +LX_GDBPARSED(MNT_NODIRATIME) +LX_GDBPARSED(MNT_RELATIME) /* linux/threads.h */ LX_VALUE(NR_CPUS)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 458/627 squashfs: use folios in squashfs_bio_read_cached()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit c9e3fb050e9cb0d3a833b2c62b35ea42cdd81e89 ]
Remove an access to page->mapping and a few calls to the old page-based APIs. This doesn't support large folios, but it's still a nice improvement.
Stable-dep-of: 97103dcec292 ("squashfs: fix incorrect argument to sizeof in kmalloc_array call")
--- fs/squashfs/block.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-)
fs/squashfs/block.c +22 -23
@@ -80,23 +80,22 @@ static int squashfs_bio_read_cached(struct bio *fullbio, struct address_space *cache_mapping, u64 index, int length, u64 read_start, u64 read_end, int page_count) { - struct page *head_to_cache = NULL, *tail_to_cache = NULL; + struct folio *head_to_cache = NULL, *tail_to_cache = NULL;struct block_device *bdev = fullbio->bi_bdev;int start_idx =0 , end_idx =0 ; -struct bvec_iter_all iter_all; +struct folio_iter fi;;struct bio *bio =NULL ; -struct bio_vec *bv;int idx =0 ;int err =0 ;#ifdef CONFIG_SQUASHFS_COMP_CACHE_FULL -struct page **cache_pages =kmalloc_array (page_count, +struct folio **cache_folios =kmalloc_array (page_count,sizeof (void *),GFP_KERNEL | __GFP_ZERO);#endif -bio_for_each_segment_all (bv, fullbio, iter_all) { -struct page *page = bv->bv_page; +bio_for_each_folio_all (fi, fullbio) { +struct folio *folio = fi.folio; -if (page->mapping == cache_mapping) { +if (folio->mapping == cache_mapping) { idx++;continue ; }
@@ -111,13 +110,13 @@ static int squashfs_bio_read_cached(struct bio *fullbio,* adjacent blocks. */ if (idx ==0 && index != read_start) - head_to_cache = page; + head_to_cache = folio;else if (idx == page_count -1 && index + length != read_end) - tail_to_cache = page; + tail_to_cache = folio;#ifdef CONFIG_SQUASHFS_COMP_CACHE_FULL /* Cache all pages in the BIO for repeated reads */ - else if (cache_pages) - cache_pages[idx] = page; + else if (cache_folios) + cache_folios[idx] = folio;#endif if (!bio || idx != end_idx) {
@@ -150,45 +149,45 @@ static int squashfs_bio_read_cached(struct bio *fullbio,return err;if (head_to_cache) { -int ret =add_to_page_cache_lru (head_to_cache, cache_mapping, +int ret =filemap_add_folio (cache_mapping, head_to_cache, read_start >>PAGE_SHIFT ,GFP_NOIO );if (!ret) { -SetPageUptodate (head_to_cache); -unlock_page (head_to_cache); +folio_mark_uptodate (head_to_cache); +folio_unlock (head_to_cache); } }if (tail_to_cache) { -int ret =add_to_page_cache_lru (tail_to_cache, cache_mapping, +int ret =filemap_add_folio (cache_mapping, tail_to_cache, (read_end >>PAGE_SHIFT ) -1 ,GFP_NOIO );if (!ret) { -SetPageUptodate (tail_to_cache); -unlock_page (tail_to_cache); +folio_mark_uptodate (tail_to_cache); +folio_unlock (tail_to_cache); } }#ifdef CONFIG_SQUASHFS_COMP_CACHE_FULL -if (!cache_pages) +if (!cache_folios) goto out;for (idx =0 ; idx < page_count; idx++) { -if (!cache_pages[idx]) +if (!cache_folios[idx])continue ; -int ret =add_to_page_cache_lru (cache_pages[idx], cache_mapping, +int ret =filemap_add_folio (cache_mapping, cache_folios[idx], (read_start >>PAGE_SHIFT ) + idx,GFP_NOIO );if (!ret) { -SetPageUptodate (cache_pages[idx]); -unlock_page (cache_pages[idx]); +folio_mark_uptodate (cache_folios[idx]); +folio_unlock (cache_folios[idx]); } } -kfree (cache_pages); +kfree (cache_folios); out:#endif return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 459/627 squashfs: fix incorrect argument to sizeof in kmalloc_array call
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit 97103dcec292b8688de142f7a48bd0d46038d3f6 ]
The sizeof(void *) is the incorrect argument in the kmalloc_array call, it best to fix this by using sizeof(*cache_folios) instead.
Fortunately the sizes of void* and folio* happen to be the same, so this has not shown up as a run time issue.
--- fs/squashfs/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/squashfs/block.c +1 -1
@@ -89,7 +89,7 @@ static int squashfs_bio_read_cached(struct bio *fullbio,int err =0 ;#ifdef CONFIG_SQUASHFS_COMP_CACHE_FULL struct folio **cache_folios =kmalloc_array (page_count, -sizeof (void *),GFP_KERNEL | __GFP_ZERO); +sizeof (*cache_folios),GFP_KERNEL | __GFP_ZERO);#endif bio_for_each_folio_all (fi, fullbio) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 460/627 apparmor: Fix unaligned memory accesses in KUnit test
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit c68804199dd9d63868497a27b5da3c3cd15356db ]
The testcase triggers some unnecessary unaligned memory accesses on the
parisc architecture:
Kernel: unaligned access to 0x12f28e27 in policy_unpack_test_init+0x180/0x374 (iir 0x0cdc1280)
Kernel: unaligned access to 0x12f28e67 in policy_unpack_test_init+0x270/0x374 (iir 0x64dc00ce)
Use the existing helper functions put_unaligned_le32() and put_unaligned_le16() to avoid such warnings on architectures which prefer aligned memory accesses.
--- security/apparmor/policy_unpack_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
security/apparmor/policy_unpack_test.c +4 -2
@@ -9,6 +9,8 @@#include "include/policy.h" #include "include/policy_unpack.h" +#include <linux/unaligned.h> +#define TEST_STRING_NAME "TEST_STRING"#define TEST_STRING_DATA "testing"#define TEST_STRING_BUF_OFFSET \
@@ -80,7 +82,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, *(buf +1 ) =strlen (TEST_U32_NAME ) +1 ;strscpy (buf +3 ,TEST_U32_NAME , e->end - (void *)(buf +3 )); *(buf +3 +strlen (TEST_U32_NAME ) +1 ) =AA_U32 ; - *((__le32 *)(buf +3 +strlen (TEST_U32_NAME ) +2 )) =cpu_to_le32 (TEST_U32_DATA ); +put_unaligned_le32 (TEST_U32_DATA , buf +3 +strlen (TEST_U32_NAME ) +2 ); buf = e->start +TEST_NAMED_U64_BUF_OFFSET ; *buf =AA_NAME ;
@@ -103,7 +105,7 @@ static struct aa_ext *build_aa_ext_struct(struct policy_unpack_fixture *puf, *(buf +1 ) =strlen (TEST_ARRAY_NAME ) +1 ;strscpy (buf +3 ,TEST_ARRAY_NAME , e->end - (void *)(buf +3 )); *(buf +3 +strlen (TEST_ARRAY_NAME ) +1 ) =AA_ARRAY ; - *((__le16 *)(buf +3 +strlen (TEST_ARRAY_NAME ) +2 )) =cpu_to_le16 (TEST_ARRAY_SIZE ); +put_unaligned_le16 (TEST_ARRAY_SIZE , buf +3 +strlen (TEST_ARRAY_NAME ) +2 );return e; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 461/627 i3c: fix module_i3c_i2c_driver() with I3C=n
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 5523a466e905b6287b94654ddb364536f2f948cf ]
When CONFIG_I3C is disabled and the i3c_i2c_driver_register() happens to not be inlined, any driver calling it still references the i3c_driver instance, which then causes a link failure:
x86_64-linux-ld: drivers/hwmon/lm75.o: in function `lm75_i3c_reg_read':
lm75.c:(.text+0xc61): undefined reference to `i3cdev_to_dev'
x86_64-linux-ld: lm75.c:(.text+0xd25): undefined reference to `i3c_device_do_priv_xfers'
x86_64-linux-ld: lm75.c:(.text+0xdd8): undefined reference to `i3c_device_do_priv_xfers'
This issue was part of the original i3c code, but only now caused problems when i3c support got added to lm75.
Change the 'inline' annotations in the header to '__always_inline' to ensure that the dead-code-elimination pass in the compiler can optimize it out as intended.
--- include/linux/i3c/device.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/i3c/device.h +2 -2
@@ -245,7 +245,7 @@ void i3c_driver_unregister(struct i3c_driver *drv);* * Return: 0 if both registrations succeeds, a negative error code otherwise. */ -static inline int i3c_i2c_driver_register (struct i3c_driver *i3cdrv, +static __always_inline int i3c_i2c_driver_register(struct i3c_driver *i3cdrv,struct i2c_driver *i2cdrv) {int ret;
@@ -270,7 +270,7 @@ static inline int i3c_i2c_driver_register(struct i3c_driver *i3cdrv,* Note that when CONFIG_I3C is not enabled, this function only unregisters the * @i2cdrv. */ -static inline void i3c_i2c_driver_unregister (struct i3c_driver *i3cdrv, +static __always_inline void i3c_i2c_driver_unregister(struct i3c_driver *i3cdrv,struct i2c_driver *i2cdrv) {if (IS_ENABLED (CONFIG_I3C ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 462/627 i3c: master: svc: Fix npcm845 FIFO_EMPTY quirk
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley Chu <[email protected]>
[ Upstream commit bc4a09d8e79cadccdd505f47b01903a80bc666e7 ]
In a private write transfer, the driver pre-fills the FIFO to work around the FIFO_EMPTY quirk. However, if an IBIWON event occurs, the hardware emits a NACK and the driver initiates a retry. During the retry, driver attempts to pre-fill the FIFO again if there is remaining data, but since the FIFO is already full, this leads to data loss.
Check available space in FIFO to prevent overflow.
--- drivers/i3c/master/svc-i3c-master.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/i3c/master/svc-i3c-master.c +14 -8
@@ -104,6 +104,7 @@#define SVC_I3C_MDATACTRL_TXTRIG_FIFO_NOT_FULL GENMASK(5, 4)#define SVC_I3C_MDATACTRL_RXTRIG_FIFO_NOT_EMPTY 0#define SVC_I3C_MDATACTRL_RXCOUNT (x) FIELD_GET(GENMASK(28, 24), (x)) +#define SVC_I3C_MDATACTRL_TXCOUNT (x) FIELD_GET(GENMASK(20, 16), (x))#define SVC_I3C_MDATACTRL_TXFULL BIT(30)#define SVC_I3C_MDATACTRL_RXEMPTY BIT(31)
@@ -1304,14 +1305,19 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,* FIFO start filling as soon as possible after EmitStartAddr. */ if (svc_has_quirk (master,SVC_I3C_QUIRK_FIFO_EMPTY ) && !rnw && xfer_len) { -u32 end = xfer_len >SVC_I3C_FIFO_SIZE ?0 :SVC_I3C_MWDATAB_END ; -u32 len =min_t (u32, xfer_len,SVC_I3C_FIFO_SIZE ); - -writesb (master->regs +SVC_I3C_MWDATAB1 , out, len -1 ); -/* Mark END bit if this is the last byte */ -writel (out[len -1 ] | end, master->regs +SVC_I3C_MWDATAB ); - xfer_len -= len; - out += len; +u32 space, end, len; + + reg =readl (master->regs +SVC_I3C_MDATACTRL ); + space =SVC_I3C_FIFO_SIZE -SVC_I3C_MDATACTRL_TXCOUNT (reg); +if (space) { + end = xfer_len > space ?0 :SVC_I3C_MWDATAB_END ; + len =min_t (u32, xfer_len, space); +writesb (master->regs +SVC_I3C_MWDATAB1 , out, len -1 ); +/* Mark END bit if this is the last byte */ +writel (out[len -1 ] | end, master->regs +SVC_I3C_MWDATAB ); + xfer_len -= len; + out += len; + } } ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 463/627 module: Restore the moduleparam prefix length check
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Pavlu <[email protected]>
[ Upstream commit bdc877ba6b7ff1b6d2ebeff11e63da4a50a54854 ]
The moduleparam code allows modules to provide their own definition of MODULE_PARAM_PREFIX, instead of using the default KBUILD_MODNAME ".".
Commit 730b69d22525 ("module: check kernel param length at compile time, not runtime") added a check to ensure the prefix doesn't exceed MODULE_NAME_LEN, as this is what param_sysfs_builtin() expects.
Later, commit 58f86cc89c33 ("VERIFY_OCTAL_PERMISSIONS: stricter checking for sysfs perms.") removed this check, but there is no indication this was intentional.
Since the check is still useful for param_sysfs_builtin() to function properly, reintroduce it in __module_param_call(), but in a modernized form using static_assert().
While here, clean up the __module_param_call() comments. In particular, remove the comment "Default value instead of permissions?", which comes from commit 9774a1f54f17 ("[PATCH] Compile-time check re world-writeable module params"). This comment was related to the test variable __param_perm_check_##name, which was removed in the previously mentioned commit 58f86cc89c33.
--- include/linux/moduleparam.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/linux/moduleparam.h +2 -3
@@ -282,10 +282,9 @@ struct kparam_array#define __moduleparam_const const#endif -/* This is the fundamental function for registering boot/module -parameters. */ +/* This is the fundamental function for registering boot/module parameters. */ #define __module_param_call (prefix, name, ops, arg, perm, level, flags) \ -/* Default value instead of permissions? */ \ + static_assert(sizeof(""prefix) - 1 <= MAX_PARAM_PREFIX_LEN); \ static const char __param_str_##name[] = prefix #name; \ static struct kernel_param __moduleparam_const __param_##name \ __used __section("__param") \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 464/627 ucount: fix atomic_long_inc_below() argument type
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uros Bizjak <[email protected]>
[ Upstream commit f8cd9193b62e92ad25def5370ca8ea2bc7585381 ]
The type of u argument of atomic_long_inc_below() should be long to avoid unwanted truncation to int.
The patch fixes the wrong argument type of an internal function to prevent unwanted argument truncation. It fixes an internal locking primitive; it should not have any direct effect on userspace.
Mark said
: AFAICT there's no problem in practice because atomic_long_inc_below() : is only used by inc_ucount(), and it looks like the value is : constrained between 0 and INT_MAX.
:
: In inc_ucount() the limit value is taken from
: user_namespace::ucount_max[], and AFAICT that's only written by : sysctls, to the table setup by setup_userns_sysctls(), where : UCOUNT_ENTRY() limits the value between 0 and INT_MAX.
:
: This is certainly a cleanup, but there might be no functional issue in : practice as above.
--- kernel/ucount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/ucount.c +1 -1
@@ -199,7 +199,7 @@ void put_ucounts(struct ucounts *ucounts) } } -static inline bool atomic_long_inc_below (atomic_long_t *v,int u) +static inline bool atomic_long_inc_below (atomic_long_t *v,long u) {long c, old; c =atomic_long_read (v);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 465/627 rtc: ds1307: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit cf6eb547a24af7ad7bbd2abe9c5327f956bbeae8 ]
When ds3231_clk_sqw_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-ds1307.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-ds1307.c +1 -1
@@ -1466,7 +1466,7 @@ static long ds3231_clk_sqw_round_rate(struct clk_hw *hw, unsigned long rate,return ds3231_clk_sqw_rates[i]; } -return 0 ; +return ds3231_clk_sqw_rates[ARRAY_SIZE (ds3231_clk_sqw_rates) -1 ]; } static int ds3231_clk_sqw_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 466/627 rtc: hym8563: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit d0a518eb0a692a2ab8357e844970660c5ea37720 ]
When hym8563_clkout_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-hym8563.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-hym8563.c +1 -1
@@ -294,7 +294,7 @@ static long hym8563_clkout_round_rate(struct clk_hw *hw, unsigned long rate,if (clkout_rates[i] <= rate)return clkout_rates[i]; -return 0 ; +return clkout_rates[0 ]; } static int hym8563_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 467/627 rtc: nct3018y: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit 437c59e4b222cd697b4cf95995d933e7d583c5f1 ]
When nct3018y_clkout_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-nct3018y.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-nct3018y.c +1 -1
@@ -376,7 +376,7 @@ static long nct3018y_clkout_round_rate(struct clk_hw *hw, unsigned long rate,if (clkout_rates[i] <= rate)return clkout_rates[i]; -return 0 ; +return clkout_rates[0 ]; } static int nct3018y_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 468/627 rtc: pcf85063: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit 186ae1869880e58bb3f142d222abdb35ecb4df0f ]
When pcf85063_clkout_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-pcf85063.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-pcf85063.c +1 -1
@@ -410,7 +410,7 @@ static long pcf85063_clkout_round_rate(struct clk_hw *hw, unsigned long rate,if (clkout_rates[i] <= rate)return clkout_rates[i]; -return 0 ; +return clkout_rates[0 ]; } static int pcf85063_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 469/627 rtc: pcf8563: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit 906726a5efeefe0ef0103ccff5312a09080c04ae ]
When pcf8563_clkout_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-pcf8563.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -339,7 +339,7 @@ static long pcf8563_clkout_round_rate(struct clk_hw *hw, unsigned long rate,if (clkout_rates[i] <= rate)return clkout_rates[i]; -return 0 ; +return clkout_rates[0 ]; } static int pcf8563_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 470/627 rtc: rv3028: fix incorrect maximum clock rate handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Masney <[email protected]>
[ Upstream commit b574acb3cf7591d2513a9f29f8c2021ad55fb881 ]
When rv3028_clkout_round_rate() is called with a requested rate higher than the highest supported rate, it currently returns 0, which disables the clock. According to the clk API, round_rate() should instead return the highest supported rate. Update the function to return the maximum supported rate in this case.
--- drivers/rtc/rtc-rv3028.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-rv3028.c +1 -1
@@ -740,7 +740,7 @@ static long rv3028_clkout_round_rate(struct clk_hw *hw, unsigned long rate,if (clkout_rates[i] <= rate)return clkout_rates[i]; -return 0 ; +return clkout_rates[0 ]; } static int rv3028_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 471/627 f2fs: turn off one_time when forcibly set to foreground GC
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daeho Jeong <[email protected]>
[ Upstream commit 8142daf8a53806689186ee255cc02f89af7f8890 ]
one_time mode is only for background GC. So, we need to set it back to false when foreground GC is enforced.
--- fs/f2fs/gc.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/gc.c +1 -0
@@ -1891,6 +1891,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control)/* Let's run FG_GC, if we don't have enough space. */ if (has_not_enough_free_secs (sbi,0 ,0 )) { gc_type =FG_GC ; + gc_control->one_time = false;/* * For example, if there are many prefree_segments below given
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 472/627 f2fs: fix bio memleak when committing super block
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sheng Yong <[email protected]>
[ Upstream commit 554d9b7242a73d701ce121ac81bb578a3fca538e ]
When committing new super block, bio is allocated but not freed, and kmemleak complains:
unreferenced object 0xffff88801d185600 (size 192):
comm "kworker/3:2", pid 128, jiffies 4298624992
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 80 67 c3 00 81 88 ff ff .........g......
01 08 06 00 00 00 00 00 00 00 00 00 01 00 00 00 ................
backtrace (crc 650ecdb1):
kmem_cache_alloc_noprof+0x3a9/0x460
mempool_alloc_noprof+0x12f/0x310
bio_alloc_bioset+0x1e2/0x7e0
__f2fs_commit_super+0xe0/0x370
f2fs_commit_super+0x4ed/0x8c0
f2fs_record_error_work+0xc7/0x190
process_one_work+0x7db/0x1970
worker_thread+0x518/0xea0
kthread+0x359/0x690
ret_from_fork+0x34/0x70
ret_from_fork_asm+0x1a/0x30The issue can be reproduced by:
mount /dev/vda /mnt
i=0
while :; do
echo '[h]abc' > /sys/fs/f2fs/vda/extension_list
echo '[h]!abc' > /sys/fs/f2fs/vda/extension_list
echo scan > /sys/kernel/debug/kmemleak
dmesg | grep "new suspected memory leaks"
[ $? -eq 0 ] && break
i=$((i + 1))
echo "$i"
done
umount /mnt--- fs/f2fs/super.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/super.c +1 -0
@@ -3451,6 +3451,7 @@ static int __f2fs_commit_super(struct f2fs_sb_info *sbi, struct folio *folio,f2fs_bug_on (sbi,1 ); ret =submit_bio_wait (bio); +bio_put (bio);folio_end_writeback (folio);return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 473/627 f2fs: fix to avoid invalid wait context issue
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 90d5c9ba3ed91950f1546bf123a7a57cd958b452 ]
=============================
[ BUG: Invalid wait context ]
6.13.0-rc1 #84 Tainted: G O
-----------------------------
cat/56160 is trying to lock:ffff888105c86648 (&cprc->stat_lock){+.+.}-{3:3}, at: update_general_status+0x32a/0x8c0 [f2fs] other info that might help us debug this:
context-{5:5}
2 locks held by cat/56160:
#0: ffff88810a002a98 (&p->lock){+.+.}-{4:4}, at: seq_read_iter+0x56/0x4c0
#1: ffffffffa0462638 (f2fs_stat_lock){....}-{2:2}, at: stat_show+0x29/0x1020 [f2fs]
stack backtrace: CPU: 0 UID: 0 PID: 56160 Comm: cat Tainted: G O 6.13.0-rc1 #84 Tainted: [O]=OOT_MODULE Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: <TASK> dump_stack_lvl+0x88/0xd0 dump_stack+0x14/0x20 __lock_acquire+0x8d4/0xbb0 lock_acquire+0xd6/0x300 _raw_spin_lock+0x38/0x50 update_general_status+0x32a/0x8c0 [f2fs] stat_show+0x50/0x1020 [f2fs] seq_read_iter+0x116/0x4c0 seq_read+0xfa/0x130 full_proxy_read+0x66/0x90 vfs_read+0xc4/0x350 ksys_read+0x74/0xf0 __x64_sys_read+0x1d/0x20 x64_sys_call+0x17d9/0x1b80 do_syscall_64+0x68/0x130 entry_SYSCALL_64_after_hwframe+0x67/0x6f RIP: 0033:0x7f2ca53147e2
- seq_read
- stat_show
- raw_spin_lock_irqsave(&f2fs_stat_lock, flags) : f2fs_stat_lock is raw_spinlock_t type variable
- update_general_status
- spin_lock(&sbi->cprc_info.stat_lock); : stat_lock is spinlock_t type variable
The root cause is the lock order is incorrect [1], we should not acquire spinlock_t lock after raw_spinlock_t lock, as if CONFIG_PREEMPT_LOCK is on, spinlock_t is implemented based on rtmutex, which can sleep after holding the lock.
To fix this issue, let's use change f2fs_stat_lock lock type from raw_spinlock_t to spinlock_t, it's safe due to:
- we don't need to use raw version of spinlock as the path is not performance sensitive.
- we don't need to use irqsave version of spinlock as it won't be used in irq context.
Quoted from [1]:
"Extend lockdep to validate lock wait-type context.
The current wait-types are:
LD_WAIT_FREE, /* wait free, rcu etc.. */ LD_WAIT_SPIN, /* spin loops, raw_spinlock_t etc.. */ LD_WAIT_CONFIG, /* CONFIG_PREEMPT_LOCK, spinlock_t etc.. */ LD_WAIT_SLEEP, /* sleeping locks, mutex_t etc.. */
Where lockdep validates that the current lock (the one being acquired) fits in the current wait-context (as generated by the held stack).
This ensures that there is no attempt to acquire mutexes while holding spinlocks, to acquire spinlocks while holding raw_spinlocks and so on. In other words, its a more fancy might_sleep()."
[1] https://lore.kernel.org/all/[email protected]
--- fs/f2fs/debug.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
fs/f2fs/debug.c +7 -10
@@ -21,7 +21,7 @@#include "gc.h" static LIST_HEAD (f2fs_stat_list); -static DEFINE_RAW_SPINLOCK (f2fs_stat_lock); +static DEFINE_SPINLOCK (f2fs_stat_lock);#ifdef CONFIG_DEBUG_FS static struct dentry *f2fs_debugfs_root;#endif
@@ -439,9 +439,8 @@ static int stat_show(struct seq_file *s, void *v) {struct f2fs_stat_info *si;int i =0 , j =0 ; -unsigned long flags; -raw_spin_lock_irqsave (&f2fs_stat_lock, flags); +spin_lock (&f2fs_stat_lock);list_for_each_entry (si, &f2fs_stat_list, stat_list) {struct f2fs_sb_info *sbi = si->sbi;
@@ -753,7 +752,7 @@ static int stat_show(struct seq_file *s, void *v)seq_printf (s," - paged : %llu KB\n" , si->page_mem >>10 ); } -raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags); +spin_unlock (&f2fs_stat_lock);return 0 ; }
@@ -765,7 +764,6 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)struct f2fs_super_block *raw_super =F2FS_RAW_SUPER (sbi);struct f2fs_stat_info *si;struct f2fs_dev_stats *dev_stats; -unsigned long flags;int i; si =f2fs_kzalloc (sbi,sizeof (struct f2fs_stat_info ),GFP_KERNEL );
@@ -817,9 +815,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)atomic_set (&sbi->max_aw_cnt,0 ); -raw_spin_lock_irqsave (&f2fs_stat_lock, flags); +spin_lock (&f2fs_stat_lock);list_add_tail (&si->stat_list, &f2fs_stat_list); -raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags); +spin_unlock (&f2fs_stat_lock);return 0 ; }
@@ -827,11 +825,10 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)void f2fs_destroy_stats (struct f2fs_sb_info *sbi) {struct f2fs_stat_info *si =F2FS_STAT (sbi); -unsigned long flags; -raw_spin_lock_irqsave (&f2fs_stat_lock, flags); +spin_lock (&f2fs_stat_lock);list_del (&si->stat_list); -raw_spin_unlock_irqrestore (&f2fs_stat_lock, flags); +spin_unlock (&f2fs_stat_lock);kfree (si->dev_stats);kfree (si);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 474/627 f2fs: compress: change the first parameter of page_array_{alloc,free} to sbi
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiguo Niu <[email protected]>
[ Upstream commit 8e2a9b656474d67c55010f2c003ea2cf889a19ff ]
No logic changes, just cleanup and prepare for fixing the UAF issue in f2fs_free_dic.
Stable-dep-of: 39868685c2a9 ("f2fs: compress: fix UAF of f2fs_inode_info in f2fs_free_dic")
--- fs/f2fs/compress.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
fs/f2fs/compress.c +20 -20
@@ -23,20 +23,18 @@static struct kmem_cache *cic_entry_slab;static struct kmem_cache *dic_entry_slab; -static void *page_array_alloc (struct inode *inode,int nr) +static void *page_array_alloc (struct f2fs_sb_info *sbi,int nr) { -struct f2fs_sb_info *sbi =F2FS_I_SB (inode);unsigned int size =sizeof (struct page *) * nr;if (likely (size <= sbi->page_array_slab_size))return f2fs_kmem_cache_alloc (sbi->page_array_slab, -GFP_F2FS_ZERO , false,F2FS_I_SB (inode)); +GFP_F2FS_ZERO , false, sbi);return f2fs_kzalloc (sbi, size,GFP_NOFS ); } -static void page_array_free (struct inode *inode,void *pages,int nr) +static void page_array_free (struct f2fs_sb_info *sbi,void *pages,int nr) { -struct f2fs_sb_info *sbi =F2FS_I_SB (inode);unsigned int size =sizeof (struct page *) * nr;if (!pages)
@@ -149,13 +147,13 @@ int f2fs_init_compress_ctx(struct compress_ctx *cc)if (cc->rpages)return 0 ; - cc->rpages =page_array_alloc (cc->inode, cc->cluster_size); + cc->rpages =page_array_alloc (F2FS_I_SB (cc->inode), cc->cluster_size);return cc->rpages ?0 : -ENOMEM ; }void f2fs_destroy_compress_ctx (struct compress_ctx *cc,bool reuse) { -page_array_free (cc->inode, cc->rpages, cc->cluster_size); +page_array_free (F2FS_I_SB (cc->inode), cc->rpages, cc->cluster_size); cc->rpages =NULL ; cc->nr_rpages =0 ; cc->nr_cpages =0 ;
@@ -622,6 +620,7 @@ static void *f2fs_vmap(struct page **pages, unsigned int count)static int f2fs_compress_pages (struct compress_ctx *cc) { +struct f2fs_sb_info *sbi =F2FS_I_SB (cc->inode);struct f2fs_inode_info *fi =F2FS_I (cc->inode);const struct f2fs_compress_ops *cops = f2fs_cops[fi->i_compress_algorithm];
@@ -642,7 +641,7 @@ static int f2fs_compress_pages(struct compress_ctx *cc) cc->nr_cpages =DIV_ROUND_UP (max_len,PAGE_SIZE ); cc->valid_nr_cpages = cc->nr_cpages; - cc->cpages =page_array_alloc (cc->inode, cc->nr_cpages); + cc->cpages =page_array_alloc (sbi, cc->nr_cpages);if (!cc->cpages) { ret = -ENOMEM ; goto destroy_compress_ctx;
@@ -716,7 +715,7 @@ static int f2fs_compress_pages(struct compress_ctx *cc)if (cc->cpages[i])f2fs_compress_free_page (cc->cpages[i]); } -page_array_free (cc->inode, cc->cpages, cc->nr_cpages); +page_array_free (sbi, cc->cpages, cc->nr_cpages); cc->cpages =NULL ; destroy_compress_ctx:if (cops->destroy_compress_ctx)
@@ -1340,7 +1339,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, cic->magic =F2FS_COMPRESSED_PAGE_MAGIC ; cic->inode = inode;atomic_set (&cic->pending_pages, cc->valid_nr_cpages); - cic->rpages =page_array_alloc (cc->inode, cc->cluster_size); + cic->rpages =page_array_alloc (sbi, cc->cluster_size);if (!cic->rpages) goto out_put_cic;
@@ -1442,13 +1441,13 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,spin_unlock (&fi->i_size_lock);f2fs_put_rpages (cc); -page_array_free (cc->inode, cc->cpages, cc->nr_cpages); +page_array_free (sbi, cc->cpages, cc->nr_cpages); cc->cpages =NULL ;f2fs_destroy_compress_ctx (cc, false);return 0 ; out_destroy_crypt: -page_array_free (cc->inode, cic->rpages, cc->cluster_size); +page_array_free (sbi, cic->rpages, cc->cluster_size);for (--i; i >=0 ; i--) {if (!cc->cpages[i])
@@ -1469,7 +1468,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,f2fs_compress_free_page (cc->cpages[i]); cc->cpages[i] =NULL ; } -page_array_free (cc->inode, cc->cpages, cc->nr_cpages); +page_array_free (sbi, cc->cpages, cc->nr_cpages); cc->cpages =NULL ;return -EAGAIN ; }
@@ -1499,7 +1498,7 @@ void f2fs_compress_write_end_io(struct bio *bio, struct page *page)end_page_writeback (cic->rpages[i]); } -page_array_free (cic->inode, cic->rpages, cic->nr_rpages); +page_array_free (sbi, cic->rpages, cic->nr_rpages);kmem_cache_free (cic_entry_slab, cic); }
@@ -1640,7 +1639,7 @@ static int f2fs_prepare_decomp_mem(struct decompress_io_ctx *dic,if (!allow_memalloc_for_decomp (F2FS_I_SB (dic->inode), pre_alloc))return 0 ; - dic->tpages =page_array_alloc (dic->inode, dic->cluster_size); + dic->tpages =page_array_alloc (F2FS_I_SB (dic->inode), dic->cluster_size);if (!dic->tpages)return -ENOMEM ;
@@ -1700,7 +1699,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc)if (!dic)return ERR_PTR (-ENOMEM ); - dic->rpages =page_array_alloc (cc->inode, cc->cluster_size); + dic->rpages =page_array_alloc (sbi, cc->cluster_size);if (!dic->rpages) {kmem_cache_free (dic_entry_slab, dic);return ERR_PTR (-ENOMEM );
@@ -1721,7 +1720,7 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc) dic->rpages[i] = cc->rpages[i]; dic->nr_rpages = cc->cluster_size; - dic->cpages =page_array_alloc (dic->inode, dic->nr_cpages); + dic->cpages =page_array_alloc (sbi, dic->nr_cpages);if (!dic->cpages) { ret = -ENOMEM ; goto out_free;
@@ -1751,6 +1750,7 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic, bool bypass_destroy_callback) {int i; +struct f2fs_sb_info *sbi =F2FS_I_SB (dic->inode);f2fs_release_decomp_mem (dic, bypass_destroy_callback, true);
@@ -1762,7 +1762,7 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic,continue ;f2fs_compress_free_page (dic->tpages[i]); } -page_array_free (dic->inode, dic->tpages, dic->cluster_size); +page_array_free (sbi, dic->tpages, dic->cluster_size); }if (dic->cpages) {
@@ -1771,10 +1771,10 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic,continue ;f2fs_compress_free_page (dic->cpages[i]); } -page_array_free (dic->inode, dic->cpages, dic->nr_cpages); +page_array_free (sbi, dic->cpages, dic->nr_cpages); } -page_array_free (dic->inode, dic->rpages, dic->nr_rpages); +page_array_free (sbi, dic->rpages, dic->nr_rpages);kmem_cache_free (dic_entry_slab, dic); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 475/627 f2fs: compress: fix UAF of f2fs_inode_info in f2fs_free_dic
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiguo Niu <[email protected]>
[ Upstream commit 39868685c2a94a70762bc6d77dc81d781d05bff5 ]
The decompress_io_ctx may be released asynchronously after I/O completion. If this file is deleted immediately after read, and the kworker of processing post_read_wq has not been executed yet due to high workloads, It is possible that the inode(f2fs_inode_info) is evicted and freed before it is used f2fs_free_dic.
The UAF case as below:
Thread A Thread B
- f2fs_decompress_end_io
- f2fs_put_dic
- queue_work
add free_dic work to post_read_wq
- do_unlink
- iput
- evict
- call_rcu
This file is deleted after read.
Thread C kworker to process post_read_wq
- rcu_do_batch
- f2fs_free_inode
- kmem_cache_free
inode is freed by rcu
- process_scheduled_works
- f2fs_late_free_dic
- f2fs_free_dic
- f2fs_release_decomp_mem
read (dic->inode)->i_compress_algorithm
This patch store compress_algorithm and sbi in dic to avoid inode UAF.
In addition, the previous solution is deprecated in [1] may cause system hang.
[1] https://lore.kernel.org/all/[email protected]
--- fs/f2fs/compress.c | 40 ++++++++++++++++++++-------------------- fs/f2fs/f2fs.h | 2 ++ 2 files changed, 22 insertions(+), 20 deletions(-)
fs/f2fs/compress.c +20 -20
@@ -214,13 +214,13 @@ static int lzo_decompress_pages(struct decompress_io_ctx *dic) ret =lzo1x_decompress_safe (dic->cbuf->cdata, dic->clen, dic->rbuf, &dic->rlen);if (ret !=LZO_E_OK ) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"lzo decompress failed, ret:%d" , ret);return -EIO ; }if (dic->rlen !=PAGE_SIZE << dic->log_cluster_size) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"lzo invalid rlen:%zu, expected:%lu" , dic->rlen,PAGE_SIZE << dic->log_cluster_size);return -EIO ;
@@ -294,13 +294,13 @@ static int lz4_decompress_pages(struct decompress_io_ctx *dic) ret =LZ4_decompress_safe (dic->cbuf->cdata, dic->rbuf, dic->clen, dic->rlen);if (ret <0 ) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"lz4 decompress failed, ret:%d" , ret);return -EIO ; }if (ret !=PAGE_SIZE << dic->log_cluster_size) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"lz4 invalid ret:%d, expected:%lu" , ret,PAGE_SIZE << dic->log_cluster_size);return -EIO ;
@@ -422,13 +422,13 @@ static int zstd_init_decompress_ctx(struct decompress_io_ctx *dic) workspace_size =zstd_dstream_workspace_bound (max_window_size); - workspace =f2fs_vmalloc (F2FS_I_SB (dic->inode), workspace_size); + workspace =f2fs_vmalloc (dic->sbi, workspace_size);if (!workspace)return -ENOMEM ; stream =zstd_init_dstream (max_window_size, workspace, workspace_size);if (!stream) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"%s zstd_init_dstream failed" , __func__);vfree (workspace);return -EIO ;
@@ -464,14 +464,14 @@ static int zstd_decompress_pages(struct decompress_io_ctx *dic) ret =zstd_decompress_stream (stream, &outbuf, &inbuf);if (zstd_is_error (ret)) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"%s zstd_decompress_stream failed, ret: %d" , __func__,zstd_get_error_code (ret));return -EIO ; }if (dic->rlen != outbuf.pos) { -f2fs_err_ratelimited (F2FS_I_SB (dic->inode), +f2fs_err_ratelimited (dic->sbi,"%s ZSTD invalid rlen:%zu, expected:%lu" , __func__, dic->rlen,PAGE_SIZE << dic->log_cluster_size);
@@ -733,7 +733,7 @@ static void f2fs_release_decomp_mem(struct decompress_io_ctx *dic,void f2fs_decompress_cluster (struct decompress_io_ctx *dic,bool in_task) { -struct f2fs_sb_info *sbi =F2FS_I_SB (dic->inode); +struct f2fs_sb_info *sbi = dic->sbi;struct f2fs_inode_info *fi =F2FS_I (dic->inode);const struct f2fs_compress_ops *cops = f2fs_cops[fi->i_compress_algorithm];
@@ -806,7 +806,7 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed, {struct decompress_io_ctx *dic = (struct decompress_io_ctx *)page_private (page); -struct f2fs_sb_info *sbi =F2FS_I_SB (dic->inode); +struct f2fs_sb_info *sbi = dic->sbi;dec_page_count (sbi,F2FS_RD_DATA );
@@ -1632,14 +1632,13 @@ static inline bool allow_memalloc_for_decomp(struct f2fs_sb_info *sbi,static int f2fs_prepare_decomp_mem (struct decompress_io_ctx *dic,bool pre_alloc) { -const struct f2fs_compress_ops *cops = - f2fs_cops[F2FS_I (dic->inode)->i_compress_algorithm]; +const struct f2fs_compress_ops *cops = f2fs_cops[dic->compress_algorithm];int i; -if (!allow_memalloc_for_decomp (F2FS_I_SB (dic->inode), pre_alloc)) +if (!allow_memalloc_for_decomp (dic->sbi, pre_alloc))return 0 ; - dic->tpages =page_array_alloc (F2FS_I_SB (dic->inode), dic->cluster_size); + dic->tpages =page_array_alloc (dic->sbi, dic->cluster_size);if (!dic->tpages)return -ENOMEM ;
@@ -1669,10 +1668,9 @@ static int f2fs_prepare_decomp_mem(struct decompress_io_ctx *dic,static void f2fs_release_decomp_mem (struct decompress_io_ctx *dic,bool bypass_destroy_callback,bool pre_alloc) { -const struct f2fs_compress_ops *cops = - f2fs_cops[F2FS_I (dic->inode)->i_compress_algorithm]; +const struct f2fs_compress_ops *cops = f2fs_cops[dic->compress_algorithm]; -if (!allow_memalloc_for_decomp (F2FS_I_SB (dic->inode), pre_alloc)) +if (!allow_memalloc_for_decomp (dic->sbi, pre_alloc))return ;if (!bypass_destroy_callback && cops->destroy_decompress_ctx)
@@ -1707,6 +1705,8 @@ struct decompress_io_ctx *f2fs_alloc_dic(struct compress_ctx *cc) dic->magic =F2FS_COMPRESSED_PAGE_MAGIC ; dic->inode = cc->inode; + dic->sbi = sbi; + dic->compress_algorithm =F2FS_I (cc->inode)->i_compress_algorithm;atomic_set (&dic->remaining_pages, cc->nr_cpages); dic->cluster_idx = cc->cluster_idx; dic->cluster_size = cc->cluster_size;
@@ -1750,7 +1750,8 @@ static void f2fs_free_dic(struct decompress_io_ctx *dic, bool bypass_destroy_callback) {int i; -struct f2fs_sb_info *sbi =F2FS_I_SB (dic->inode); +/* use sbi in dic to avoid UFA of dic->inode*/ +struct f2fs_sb_info *sbi = dic->sbi;f2fs_release_decomp_mem (dic, bypass_destroy_callback, true);
@@ -1793,8 +1794,7 @@ static void f2fs_put_dic(struct decompress_io_ctx *dic, bool in_task)f2fs_free_dic (dic, false); }else {INIT_WORK (&dic->free_work, f2fs_late_free_dic); -queue_work (F2FS_I_SB (dic->inode)->post_read_wq, - &dic->free_work); +queue_work (dic->sbi->post_read_wq, &dic->free_work); } } }
fs/f2fs/f2fs.h +2 -0
@@ -1536,6 +1536,7 @@ struct compress_io_ctx {struct decompress_io_ctx {u32 magic;/* magic number to indicate page is compressed */ struct inode *inode;/* inode the context belong to */ +struct f2fs_sb_info *sbi;/* f2fs_sb_info pointer */ pgoff_t cluster_idx;/* cluster index number */ unsigned int cluster_size;/* page count in cluster */ unsigned int log_cluster_size;/* log of cluster size */
@@ -1576,6 +1577,7 @@ struct decompress_io_ctx {bool failed;/* IO error occurred before decompression? */ bool need_verity;/* need fs-verity verification after decompression? */ +unsigned char compress_algorithm;/* backup algorithm type */ void *private;/* payload buffer for specified decompression algorithm */ void *private2;/* extra payload buffer */ struct work_struct verity_work;/* work to verify the decompressed pages */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 476/627 f2fs: fix KMSAN uninit-value in extent_info usage
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abinash Singh <[email protected]>
[ Upstream commit 154467f4ad033473e5c903a03e7b9bca7df9a0fa ]
KMSAN reported a use of uninitialized value in __is_extent_mergeable()
and __is_back_mergeable() via the read extent tree path.
The root cause is that get_read_extent_info() only initializes three fields (fofs, blk, len) of struct extent_info, leaving the remaining fields uninitialized. This leads to undefined behavior when those fields are accessed later, especially during extent merging.
Fix it by zero-initializing the extent_info struct before population.
--- fs/f2fs/extent_cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/extent_cache.c +1 -1
@@ -414,7 +414,7 @@ void f2fs_init_read_extent_tree(struct inode *inode, struct folio *ifolio)struct f2fs_extent *i_ext = &F2FS_INODE (&ifolio->page)->i_ext;struct extent_tree *et;struct extent_node *en; -struct extent_info ei; +struct extent_info ei = {0 };if (!__may_extent_tree (inode,EX_READ )) {/* drop largest read extent */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 477/627 f2fs: fix to check upper boundary for value of gc_boost_zoned_gc_percent
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: yohan.joung <[email protected]>
[ Upstream commit 10dcaa56ef93f2a45e4c3fec27d8e1594edad110 ]
to check the upper boundary when setting gc_boost_zoned_gc_percent
--- fs/f2fs/sysfs.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/sysfs.c +7 -0
@@ -628,6 +628,13 @@ static ssize_t __sbi_store(struct f2fs_attr *a,return count; } +if (!strcmp (a->attr.name,"gc_boost_zoned_gc_percent" )) { +if (t >100 ) +return -EINVAL ; + *ui = (unsigned int )t; +return count; + } +#ifdef CONFIG_F2FS_IOSTAT if (!strcmp (a->attr.name,"iostat_enable" )) { sbi->iostat_enable = !!t;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 478/627 f2fs: fix to check upper boundary for gc_valid_thresh_ratio
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 7a96d1d73ce9de5041e891a623b722f900651561 ]
This patch adds missing upper boundary check while setting gc_valid_thresh_ratio via sysfs.
--- fs/f2fs/sysfs.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/sysfs.c +7 -0
@@ -635,6 +635,13 @@ static ssize_t __sbi_store(struct f2fs_attr *a,return count; } +if (!strcmp (a->attr.name,"gc_valid_thresh_ratio" )) { +if (t >100 ) +return -EINVAL ; + *ui = (unsigned int )t; +return count; + } +#ifdef CONFIG_F2FS_IOSTAT if (!strcmp (a->attr.name,"iostat_enable" )) { sbi->iostat_enable = !!t;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 479/627 f2fs: fix to check upper boundary for gc_no_zoned_gc_percent
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit a919ae794ad2dc6d04b3eea2f9bc86332c1630cc ]
This patch adds missing upper boundary check while setting gc_no_zoned_gc_percent via sysfs.
--- fs/f2fs/sysfs.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/f2fs/sysfs.c +7 -0
@@ -628,6 +628,13 @@ static ssize_t __sbi_store(struct f2fs_attr *a,return count; } +if (!strcmp (a->attr.name,"gc_no_zoned_gc_percent" )) { +if (t >100 ) +return -EINVAL ; + *ui = (unsigned int )t; +return count; + } +if (!strcmp (a->attr.name,"gc_boost_zoned_gc_percent" )) {if (t >100 )return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 480/627 f2fs: doc: fix wrong quota mount option description
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 81b6ecca2f15922e8d653dc037df5871e754be6e ]
We should use "{usr,grp,prj}jquota=" to disable journaled quota, rather than using off{usr,grp,prj}jquota.
--- Documentation/filesystems/f2fs.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/filesystems/f2fs.rst +3 -3
@@ -238,9 +238,9 @@ usrjquota=<file> Appoint specified file and type during mount, so that quota grpjquota=<file> information can be properly updated during recovery flow, prjjquota=<file> <quota file>: must be in root directory; jqfmt=<quota type> <quota type>: [vfsold,vfsv0,vfsv1]. -offusrjquota Turn off user journalled quota. -offgrpjquota Turn off group journalled quota. -offprjjquota Turn off project journalled quota. +usrjquota= Turn off user journalled quota. +grpjquota= Turn off group journalled quota. +prjjquota= Turn off project journalled quota. quota Enable plain user disk quota accounting. noquota Disable all plain disk quota option. alloc_mode=%s Adjust block allocation policy, which supports "reuse"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 481/627 f2fs: fix to avoid UAF in f2fs_sync_inode_meta()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 7c30d79930132466f5be7d0b57add14d1a016bda ]
syzbot reported an UAF issue as below: [1] [2]
[1] https://syzkaller.appspot.com/text?tag=CrashReport&x=16594c60580000
==================================================================
BUG: KASAN: use-after-free in __list_del_entry_valid+0xa6/0x130 lib/list_debug.c:62 Read of size 8 at addr ffff888100567dc8 by task kworker/u4:0/8 CPU: 1 PID: 8 Comm: kworker/u4:0 Tainted: G W 6.1.129-syzkaller-00017-g642656a36791 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Workqueue: writeback wb_workfn (flush-7:0) Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x151/0x1b7 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:316 [inline] print_report+0x158/0x4e0 mm/kasan/report.c:427 kasan_report+0x13c/0x170 mm/kasan/report.c:531 __asan_report_load8_noabort+0x14/0x20 mm/kasan/report_generic.c:351 __list_del_entry_valid+0xa6/0x130 lib/list_debug.c:62 __list_del_entry include/linux/list.h:134 [inline] list_del_init include/linux/list.h:206 [inline] f2fs_inode_synced+0x100/0x2e0 fs/f2fs/super.c:1553 f2fs_update_inode+0x72/0x1c40 fs/f2fs/inode.c:588 f2fs_update_inode_page+0x135/0x170 fs/f2fs/inode.c:706 f2fs_write_inode+0x416/0x790 fs/f2fs/inode.c:734 write_inode fs/fs-writeback.c:1460 [inline] __writeback_single_inode+0x4cf/0xb80 fs/fs-writeback.c:1677 writeback_sb_inodes+0xb32/0x1910 fs/fs-writeback.c:1903 __writeback_inodes_wb+0x118/0x3f0 fs/fs-writeback.c:1974 wb_writeback+0x3da/0xa00 fs/fs-writeback.c:2081 wb_check_background_flush fs/fs-writeback.c:2151 [inline] wb_do_writeback fs/fs-writeback.c:2239 [inline] wb_workfn+0xbba/0x1030 fs/fs-writeback.c:2266 process_one_work+0x73d/0xcb0 kernel/workqueue.c:2299 worker_thread+0xa60/0x1260 kernel/workqueue.c:2446 kthread+0x26d/0x300 kernel/kthread.c:386 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 </TASK> Allocated by task 298: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x4b/0x70 mm/kasan/common.c:52 kasan_save_alloc_info+0x1f/0x30 mm/kasan/generic.c:505 __kasan_slab_alloc+0x6c/0x80 mm/kasan/common.c:333 kasan_slab_alloc include/linux/kasan.h:202 [inline] slab_post_alloc_hook+0x53/0x2c0 mm/slab.h:768 slab_alloc_node mm/slub.c:3421 [inline] slab_alloc mm/slub.c:3431 [inline] __kmem_cache_alloc_lru mm/slub.c:3438 [inline] kmem_cache_alloc_lru+0x102/0x270 mm/slub.c:3454 alloc_inode_sb include/linux/fs.h:3255 [inline] f2fs_alloc_inode+0x2d/0x350 fs/f2fs/super.c:1437 alloc_inode fs/inode.c:261 [inline] iget_locked+0x18c/0x7e0 fs/inode.c:1373 f2fs_iget+0x55/0x4ca0 fs/f2fs/inode.c:486 f2fs_lookup+0x3c1/0xb50 fs/f2fs/namei.c:484 __lookup_slow+0x2b9/0x3e0 fs/namei.c:1689 lookup_slow+0x5a/0x80 fs/namei.c:1706 walk_component+0x2e7/0x410 fs/namei.c:1997 lookup_last fs/namei.c:2454 [inline] path_lookupat+0x16d/0x450 fs/namei.c:2478 filename_lookup+0x251/0x600 fs/namei.c:2507 vfs_statx+0x107/0x4b0 fs/stat.c:229 vfs_fstatat fs/stat.c:267 [inline] vfs_lstat include/linux/fs.h:3434 [inline] __do_sys_newlstat fs/stat.c:423 [inline] __se_sys_newlstat+0xda/0x7c0 fs/stat.c:417 __x64_sys_newlstat+0x5b/0x70 fs/stat.c:417 x64_sys_call+0x52/0x9a0 arch/x86/include/generated/asm/syscalls_64.h:7 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x3b/0x80 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x68/0xd2 Freed by task 0: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x4b/0x70 mm/kasan/common.c:52 kasan_save_free_info+0x2b/0x40 mm/kasan/generic.c:516 ____kasan_slab_free+0x131/0x180 mm/kasan/common.c:241 __kasan_slab_free+0x11/0x20 mm/kasan/common.c:249 kasan_slab_free include/linux/kasan.h:178 [inline] slab_free_hook mm/slub.c:1745 [inline] slab_free_freelist_hook mm/slub.c:1771 [inline] slab_free mm/slub.c:3686 [inline] kmem_cache_free+0x291/0x560 mm/slub.c:3711 f2fs_free_inode+0x24/0x30 fs/f2fs/super.c:1584 i_callback+0x4b/0x70 fs/inode.c:250 rcu_do_batch+0x552/0xbe0 kernel/rcu/tree.c:2297 rcu_core+0x502/0xf40 kernel/rcu/tree.c:2557 rcu_core_si+0x9/0x10 kernel/rcu/tree.c:2574 handle_softirqs+0x1db/0x650 kernel/softirq.c:624 __do_softirq kernel/softirq.c:662 [inline] invoke_softirq kernel/softirq.c:479 [inline] __irq_exit_rcu+0x52/0xf0 kernel/softirq.c:711 irq_exit_rcu+0x9/0x10 kernel/softirq.c:723 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1118 [inline] sysvec_apic_timer_interrupt+0xa9/0xc0 arch/x86/kernel/apic/apic.c:1118 asm_sysvec_apic_timer_interrupt+0x1b/0x20 arch/x86/include/asm/idtentry.h:691 Last potentially related work creation: kasan_save_stack+0x3b/0x60 mm/kasan/common.c:45 __kasan_record_aux_stack+0xb4/0xc0 mm/kasan/generic.c:486 kasan_record_aux_stack_noalloc+0xb/0x10 mm/kasan/generic.c:496 __call_rcu_common kernel/rcu/tree.c:2807 [inline] call_rcu+0xdc/0x10f0 kernel/rcu/tree.c:2926 destroy_inode fs/inode.c:316 [inline] evict+0x87d/0x930 fs/inode.c:720 iput_final fs/inode.c:1834 [inline] iput+0x616/0x690 fs/inode.c:1860 do_unlinkat+0x4e1/0x920 fs/namei.c:4396 __do_sys_unlink fs/namei.c:4437 [inline] __se_sys_unlink fs/namei.c:4435 [inline] __x64_sys_unlink+0x49/0x50 fs/namei.c:4435 x64_sys_call+0x289/0x9a0 arch/x86/include/generated/asm/syscalls_64.h:88 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x3b/0x80 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x68/0xd2 The buggy address belongs to the object at ffff888100567a10 which belongs to the cache f2fs_inode_cache of size 1360
The buggy address is located 952 bytes inside of
1360-byte region [ffff888100567a10, ffff888100567f60)
The buggy address belongs to the physical page: page:ffffea0004015800 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x100560 head:ffffea0004015800 order:3 compound_mapcount:0 compound_pincount:0 flags: 0x4000000000010200(slab|head|zone=1) raw: 4000000000010200 0000000000000000 dead000000000122 ffff8881002c4d80 raw: 0000000000000000 0000000080160016 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 3, migratetype Reclaimable, gfp_mask 0xd2050(__GFP_IO|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_RECLAIMABLE), pid 298, tgid 298 (syz-executor330), ts 26489303743, free_ts 0 set_page_owner include/linux/page_owner.h:33 [inline] post_alloc_hook+0x213/0x220 mm/page_alloc.c:2637 prep_new_page+0x1b/0x110 mm/page_alloc.c:2644 get_page_from_freelist+0x3a98/0x3b10 mm/page_alloc.c:4539 __alloc_pages+0x234/0x610 mm/page_alloc.c:5837 alloc_slab_page+0x6c/0xf0 include/linux/gfp.h:-1 allocate_slab mm/slub.c:1962 [inline] new_slab+0x90/0x3e0 mm/slub.c:2015 ___slab_alloc+0x6f9/0xb80 mm/slub.c:3203 __slab_alloc+0x5d/0xa0 mm/slub.c:3302 slab_alloc_node mm/slub.c:3387 [inline] slab_alloc mm/slub.c:3431 [inline] __kmem_cache_alloc_lru mm/slub.c:3438 [inline] kmem_cache_alloc_lru+0x149/0x270 mm/slub.c:3454 alloc_inode_sb include/linux/fs.h:3255 [inline] f2fs_alloc_inode+0x2d/0x350 fs/f2fs/super.c:1437 alloc_inode fs/inode.c:261 [inline] iget_locked+0x18c/0x7e0 fs/inode.c:1373 f2fs_iget+0x55/0x4ca0 fs/f2fs/inode.c:486 f2fs_fill_super+0x5360/0x6dc0 fs/f2fs/super.c:4488 mount_bdev+0x282/0x3b0 fs/super.c:1445 f2fs_mount+0x34/0x40 fs/f2fs/super.c:4743 legacy_get_tree+0xf1/0x190 fs/fs_context.c:632
page_owner free stack trace missing
Memory state around the buggy address:
ffff888100567c80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888100567d00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff888100567d80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888100567e00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888100567e80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================[2] https://syzkaller.appspot.com/text?tag=CrashLog&x=13654c60580000
[ 24.675720][ T28] audit: type=1400 audit(1745327318.732:72): avc: denied { write } for pid=298 comm="syz-executor399" name="/" dev="loop0" ino=3 scontext=root:sysadm_r:sysadm_t tcontext=system_u:object_r:unlabeled_t tclass=dir permissive=1
[ 24.705426][ T296] ------------[ cut here ]------------
[ 24.706608][ T28] audit: type=1400 audit(1745327318.732:73): avc: denied { remove_name } for pid=298 comm="syz-executor399" name="file0" dev="loop0" ino=4 scontext=root:sysadm_r:sysadm_t tcontext=system_u:object_r:unlabeled_t tclass=dir permissive=1
[ 24.711550][ T296] WARNING: CPU: 0 PID: 296 at fs/f2fs/inode.c:847 f2fs_evict_inode+0x1262/0x1540
[ 24.734141][ T28] audit: type=1400 audit(1745327318.732:74): avc: denied { rename } for pid=298 comm="syz-executor399" name="file0" dev="loop0" ino=4 scontext=root:sysadm_r:sysadm_t tcontext=system_u:object_r:unlabeled_t tclass=dir permissive=1
[ 24.742969][ T296] Modules linked in:
[ 24.765201][ T28] audit: type=1400 audit(1745327318.732:75): avc: denied { add_name } for pid=298 comm="syz-executor399" name="bus" scontext=root:sysadm_r:sysadm_t tcontext=system_u:object_r:unlabeled_t tclass=dir permissive=1
[ 24.768847][ T296] CPU: 0 PID: 296 Comm: syz-executor399 Not tainted 6.1.129-syzkaller-00017-g642656a36791 #0
[ 24.799506][ T296] Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025
[ 24.809401][ T296] RIP: 0010:f2fs_evict_inode+0x1262/0x1540
[ 24.815018][ T296] Code: 34 70 4a ff eb 0d e8 2d 70 4a ff 4d 89 e5 4c 8b 64 24 18 48 8b 5c 24 28 4c 89 e7 e8 78 38 03 00 e9 84 fc ff ff e8 0e 70 4a ff <0f> 0b 4c 89 f7 be 08 00 00 00 e8 7f 21 92 ff f0 41 80 0e 04 e9 61
[ 24.834584][ T296] RSP: 0018:ffffc90000db7a40 EFLAGS: 00010293
[ 24.840465][ T296] RAX: ffffffff822aca42 RBX: 0000000000000002 RCX: ffff888110948000
[ 24.848291][ T296] RDX: 0000000000000000 RSI: 0000000000000002 RDI: 0000000000000000
[ 24.856064][ T296] RBP: ffffc90000db7bb0 R08: ffffffff822ac6a8 R09: ffffed10200b005d
[ 24.864073][ T296] R10: 0000000000000000 R11: dffffc0000000001 R12: ffff888100580000
[ 24.871812][ T296] R13: dffffc0000000000 R14: ffff88810fef4078 R15: 1ffff920001b6f5cThe root cause is w/ a fuzzed image, f2fs may missed to clear FI_DIRTY_INODE flag for target inode, after f2fs_evict_inode(), the inode is still linked in sbi->inode_list[DIRTY_META] global list, once it triggers checkpoint, f2fs_sync_inode_meta() may access the released inode.
In f2fs_evict_inode(), let's always call f2fs_inode_synced() to clear FI_DIRTY_INODE flag and drop inode from global dirty list to avoid this UAF issue.
--- fs/f2fs/inode.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/f2fs/inode.c +6 -2
@@ -949,8 +949,12 @@ void f2fs_evict_inode(struct inode *inode)if (likely (!f2fs_cp_error (sbi) && !is_sbi_flag_set (sbi,SBI_CP_DISABLED )))f2fs_bug_on (sbi,is_inode_flag_set (inode,FI_DIRTY_INODE )); -else -f2fs_inode_synced (inode); + +/* +* anyway, it needs to remove the inode from sbi->inode_list[DIRTY_META] +* list to avoid UAF in f2fs_sync_inode_meta() during checkpoint. +*/ +f2fs_inode_synced (inode);/* for the case f2fs_new_inode() was failed, .i_ino is zero, skip it */ if (inode->i_ino)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 482/627 f2fs: fix to avoid panic in f2fs_evict_inode
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit a509a55f8eecc8970b3980c6f06886bbff0e2f68 ]
As syzbot [1] reported as below:
R10: 0000000000000100 R11: 0000000000000206 R12: 00007ffe17473450
R13: 00007f28b1c10854 R14: 000000000000dae5 R15: 00007ffe17474520
</TASK> ---[ end trace 0000000000000000 ]--- ================================================================== BUG: KASAN: use-after-free in __list_del_entry_valid+0xa6/0x130 lib/list_debug.c:62 Read of size 8 at addr ffff88812d962278 by task syz-executor/564 CPU: 1 PID: 564 Comm: syz-executor Tainted: G W 6.1.129-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call Trace: <TASK> __dump_stack+0x21/0x24 lib/dump_stack.c:88 dump_stack_lvl+0xee/0x158 lib/dump_stack.c:106 print_address_description+0x71/0x210 mm/kasan/report.c:316 print_report+0x4a/0x60 mm/kasan/report.c:427 kasan_report+0x122/0x150 mm/kasan/report.c:531 __asan_report_load8_noabort+0x14/0x20 mm/kasan/report_generic.c:351 __list_del_entry_valid+0xa6/0x130 lib/list_debug.c:62 __list_del_entry include/linux/list.h:134 [inline] list_del_init include/linux/list.h:206 [inline] f2fs_inode_synced+0xf7/0x2e0 fs/f2fs/super.c:1531 f2fs_update_inode+0x74/0x1c40 fs/f2fs/inode.c:585 f2fs_update_inode_page+0x137/0x170 fs/f2fs/inode.c:703 f2fs_write_inode+0x4ec/0x770 fs/f2fs/inode.c:731 write_inode fs/fs-writeback.c:1460 [inline] __writeback_single_inode+0x4a0/0xab0 fs/fs-writeback.c:1677 writeback_single_inode+0x221/0x8b0 fs/fs-writeback.c:1733 sync_inode_metadata+0xb6/0x110 fs/fs-writeback.c:2789 f2fs_sync_inode_meta+0x16d/0x2a0 fs/f2fs/checkpoint.c:1159 block_operations fs/f2fs/checkpoint.c:1269 [inline] f2fs_write_checkpoint+0xca3/0x2100 fs/f2fs/checkpoint.c:1658 kill_f2fs_super+0x231/0x390 fs/f2fs/super.c:4668 deactivate_locked_super+0x98/0x100 fs/super.c:332 deactivate_super+0xaf/0xe0 fs/super.c:363 cleanup_mnt+0x45f/0x4e0 fs/namespace.c:1186 __cleanup_mnt+0x19/0x20 fs/namespace.c:1193 task_work_run+0x1c6/0x230 kernel/task_work.c:203 exit_task_work include/linux/task_work.h:39 [inline] do_exit+0x9fb/0x2410 kernel/exit.c:871 do_group_exit+0x210/0x2d0 kernel/exit.c:1021 __do_sys_exit_group kernel/exit.c:1032 [inline] __se_sys_exit_group kernel/exit.c:1030 [inline] __x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1030 x64_sys_call+0x7b4/0x9a0 arch/x86/include/generated/asm/syscalls_64.h:232 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x4c/0xa0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x68/0xd2 RIP: 0033:0x7f28b1b8e169 Code: Unable to access opcode bytes at 0x7f28b1b8e13f. RSP: 002b:00007ffe174710a8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 00007f28b1c10879 RCX: 00007f28b1b8e169 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000001 RBP: 0000000000000002 R08: 00007ffe1746ee47 R09: 00007ffe17472360 R10: 0000000000000009 R11: 0000000000000246 R12: 00007ffe17472360 R13: 00007f28b1c10854 R14: 000000000000dae5 R15: 00007ffe17474520 </TASK> Allocated by task 569: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x4b/0x70 mm/kasan/common.c:52 kasan_save_alloc_info+0x25/0x30 mm/kasan/generic.c:505 __kasan_slab_alloc+0x72/0x80 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:201 [inline] slab_post_alloc_hook+0x4f/0x2c0 mm/slab.h:737 slab_alloc_node mm/slub.c:3398 [inline] slab_alloc mm/slub.c:3406 [inline] __kmem_cache_alloc_lru mm/slub.c:3413 [inline] kmem_cache_alloc_lru+0x104/0x220 mm/slub.c:3429 alloc_inode_sb include/linux/fs.h:3245 [inline] f2fs_alloc_inode+0x2d/0x340 fs/f2fs/super.c:1419 alloc_inode fs/inode.c:261 [inline] iget_locked+0x186/0x880 fs/inode.c:1373 f2fs_iget+0x55/0x4c60 fs/f2fs/inode.c:483 f2fs_lookup+0x366/0xab0 fs/f2fs/namei.c:487 __lookup_slow+0x2a3/0x3d0 fs/namei.c:1690 lookup_slow+0x57/0x70 fs/namei.c:1707 walk_component+0x2e6/0x410 fs/namei.c:1998 lookup_last fs/namei.c:2455 [inline] path_lookupat+0x180/0x490 fs/namei.c:2479 filename_lookup+0x1f0/0x500 fs/namei.c:2508 vfs_statx+0x10b/0x660 fs/stat.c:229 vfs_fstatat fs/stat.c:267 [inline] vfs_lstat include/linux/fs.h:3424 [inline] __do_sys_newlstat fs/stat.c:423 [inline] __se_sys_newlstat+0xd5/0x350 fs/stat.c:417 __x64_sys_newlstat+0x5b/0x70 fs/stat.c:417 x64_sys_call+0x393/0x9a0 arch/x86/include/generated/asm/syscalls_64.h:7 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x4c/0xa0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x68/0xd2 Freed by task 13: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x4b/0x70 mm/kasan/common.c:52 kasan_save_free_info+0x31/0x50 mm/kasan/generic.c:516 ____kasan_slab_free+0x132/0x180 mm/kasan/common.c:236 __kasan_slab_free+0x11/0x20 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:177 [inline] slab_free_hook mm/slub.c:1724 [inline] slab_free_freelist_hook+0xc2/0x190 mm/slub.c:1750 slab_free mm/slub.c:3661 [inline] kmem_cache_free+0x12d/0x2a0 mm/slub.c:3683 f2fs_free_inode+0x24/0x30 fs/f2fs/super.c:1562 i_callback+0x4c/0x70 fs/inode.c:250 rcu_do_batch+0x503/0xb80 kernel/rcu/tree.c:2297 rcu_core+0x5a2/0xe70 kernel/rcu/tree.c:2557 rcu_core_si+0x9/0x10 kernel/rcu/tree.c:2574 handle_softirqs+0x178/0x500 kernel/softirq.c:578 run_ksoftirqd+0x28/0x30 kernel/softirq.c:945 smpboot_thread_fn+0x45a/0x8c0 kernel/smpboot.c:164 kthread+0x270/0x310 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 Last potentially related work creation: kasan_save_stack+0x3a/0x60 mm/kasan/common.c:45 __kasan_record_aux_stack+0xb6/0xc0 mm/kasan/generic.c:486 kasan_record_aux_stack_noalloc+0xb/0x10 mm/kasan/generic.c:496 call_rcu+0xd4/0xf70 kernel/rcu/tree.c:2845 destroy_inode fs/inode.c:316 [inline] evict+0x7da/0x870 fs/inode.c:720 iput_final fs/inode.c:1834 [inline] iput+0x62b/0x830 fs/inode.c:1860 do_unlinkat+0x356/0x540 fs/namei.c:4397 __do_sys_unlink fs/namei.c:4438 [inline] __se_sys_unlink fs/namei.c:4436 [inline] __x64_sys_unlink+0x49/0x50 fs/namei.c:4436 x64_sys_call+0x958/0x9a0 arch/x86/include/generated/asm/syscalls_64.h:88 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x4c/0xa0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x68/0xd2 The buggy address belongs to the object at ffff88812d961f20 which belongs to the cache f2fs_inode_cache of size 1200
The buggy address is located 856 bytes inside of
1200-byte region [ffff88812d961f20, ffff88812d9623d0)
The buggy address belongs to the physical page: page:ffffea0004b65800 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x12d960 head:ffffea0004b65800 order:2 compound_mapcount:0 compound_pincount:0 flags: 0x4000000000010200(slab|head|zone=1) raw: 4000000000010200 0000000000000000 dead000000000122 ffff88810a94c500 raw: 0000000000000000 00000000800c000c 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 2, migratetype Reclaimable, gfp_mask 0x1d2050(__GFP_IO|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP|__GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_RECLAIMABLE), pid 569, tgid 568 (syz.2.16), ts 55943246141, free_ts 0 set_page_owner include/linux/page_owner.h:31 [inline] post_alloc_hook+0x1d0/0x1f0 mm/page_alloc.c:2532 prep_new_page mm/page_alloc.c:2539 [inline] get_page_from_freelist+0x2e63/0x2ef0 mm/page_alloc.c:4328 __alloc_pages+0x235/0x4b0 mm/page_alloc.c:5605 alloc_slab_page include/linux/gfp.h:-1 [inline] allocate_slab mm/slub.c:1939 [inline] new_slab+0xec/0x4b0 mm/slub.c:1992 ___slab_alloc+0x6f6/0xb50 mm/slub.c:3180 __slab_alloc+0x5e/0xa0 mm/slub.c:3279 slab_alloc_node mm/slub.c:3364 [inline] slab_alloc mm/slub.c:3406 [inline] __kmem_cache_alloc_lru mm/slub.c:3413 [inline] kmem_cache_alloc_lru+0x13f/0x220 mm/slub.c:3429 alloc_inode_sb include/linux/fs.h:3245 [inline] f2fs_alloc_inode+0x2d/0x340 fs/f2fs/super.c:1419 alloc_inode fs/inode.c:261 [inline] iget_locked+0x186/0x880 fs/inode.c:1373 f2fs_iget+0x55/0x4c60 fs/f2fs/inode.c:483 f2fs_fill_super+0x3ad7/0x6bb0 fs/f2fs/super.c:4293 mount_bdev+0x2ae/0x3e0 fs/super.c:1443 f2fs_mount+0x34/0x40 fs/f2fs/super.c:4642 legacy_get_tree+0xea/0x190 fs/fs_context.c:632 vfs_get_tree+0x89/0x260 fs/super.c:1573 do_new_mount+0x25a/0xa20 fs/namespace.c:3056
page_owner free stack trace missing
Memory state around the buggy address:
ffff88812d962100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88812d962180: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88812d962200: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88812d962280: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88812d962300: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
==================================================================[1] https://syzkaller.appspot.com/x/report.txt?x=13448368580000
This bug can be reproduced w/ the reproducer [2], once we enable CONFIG_F2FS_CHECK_FS config, the reproducer will trigger panic as below, so the direct reason of this bug is the same as the one below patch [3] fixed.
kernel BUG at fs/f2fs/inode.c:857!
RIP: 0010:f2fs_evict_inode+0x1204/0x1a20 Call Trace: <TASK> evict+0x32a/0x7a0 do_unlinkat+0x37b/0x5b0 __x64_sys_unlink+0xad/0x100 do_syscall_64+0x5a/0xb0 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 RIP: 0010:f2fs_evict_inode+0x1204/0x1a20
[2] https://syzkaller.appspot.com/x/repro.c?x=17495ccc580000
[3] https://lore.kernel.org/linux-f2fs-devel/[email protected]
Tracepoints before panic:
f2fs_unlink_enter: dev = (7,0), dir ino = 3, i_size = 4096, i_blocks = 8, name = file1f2fs_unlink_exit: dev = (7,0), ino = 7, ret = 0f2fs_evict_inode: dev = (7,0), ino = 7, pino = 3, i_mode = 0x81ed, i_size = 10, i_nlink = 0, i_blocks = 0, i_advise = 0x0f2fs_truncate_node: dev = (7,0), ino = 7, nid = 8, block_address = 0x3c05
f2fs_unlink_enter: dev = (7,0), dir ino = 3, i_size = 4096, i_blocks = 8, name = file3f2fs_unlink_exit: dev = (7,0), ino = 8, ret = 0f2fs_evict_inode: dev = (7,0), ino = 8, pino = 3, i_mode = 0x81ed, i_size = 9000, i_nlink = 0, i_blocks = 24, i_advise = 0x4f2fs_truncate: dev = (7,0), ino = 8, pino = 3, i_mode = 0x81ed, i_size = 0, i_nlink = 0, i_blocks = 24, i_advise = 0x4 f2fs_truncate_blocks_enter: dev = (7,0), ino = 8, i_size = 0, i_blocks = 24, start file offset = 0f2fs_truncate_blocks_exit: dev = (7,0), ino = 8, ret = -2
The root cause is: in the fuzzed image, dnode #8 belongs to inode #7, after inode #7 eviction, dnode #8 was dropped.
However there is dirent that has ino #8, so, once we unlink file3, in f2fs_evict_inode(), both f2fs_truncate() and f2fs_update_inode_page() will fail due to we can not load node #8, result in we missed to call f2fs_inode_synced() to clear inode dirty status.
Let's fix this by calling f2fs_inode_synced() in error path of f2fs_evict_inode().
PS: As I verified, the reproducer [2] can trigger this bug in v6.1.129, but it failed in v6.16-rc4, this is because the testcase will stop due to other corruption has been detected by f2fs:
F2FS-fs (loop0): inconsistent node block, node_type:2, nid:8, node_footer[nid:8,ino:8,ofs:0,cpver:5013063228981249506,blkaddr:15366] F2FS-fs (loop0): f2fs_lookup: inode (ino=9) has zero i_nlink
--- fs/f2fs/inode.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/f2fs/inode.c +13 -0
@@ -933,6 +933,19 @@ void f2fs_evict_inode(struct inode *inode)f2fs_update_inode_page (inode);if (dquot_initialize_needed (inode))set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); + +/* +* If both f2fs_truncate() and f2fs_update_inode_page() failed +* due to fuzzed corrupted inode, call f2fs_inode_synced() to +* avoid triggering later f2fs_bug_on(). +*/ +if (is_inode_flag_set (inode,FI_DIRTY_INODE )) { +f2fs_warn (sbi, +"f2fs_evict_inode: inode is dirty, ino:%lu" , + inode->i_ino); +f2fs_inode_synced (inode); +set_sbi_flag (sbi,SBI_NEED_FSCK ); + } }if (freeze_protected)sb_end_intwrite (inode->i_sb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 483/627 f2fs: fix to avoid out-of-boundary access in devs.path
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 5661998536af52848cc4d52a377e90368196edea ]
- touch /mnt/f2fs/012345678901234567890123456789012345678901234567890123
- truncate -s $((1024*1024*1024)) \
/mnt/f2fs/012345678901234567890123456789012345678901234567890123
- touch /mnt/f2fs/file
- truncate -s $((1024*1024*1024)) /mnt/f2fs/file
- mkfs.f2fs /mnt/f2fs/012345678901234567890123456789012345678901234567890123 \
-c /mnt/f2fs/file
- mount /mnt/f2fs/012345678901234567890123456789012345678901234567890123 \
/mnt/f2fs/loop
[16937.192225] F2FS-fs (loop0): Mount Device [ 0]: /mnt/f2fs/012345678901234567890123456789012345678901234567890123\xff\x01, 511, 0 - 3ffff [16937.192268] F2FS-fs (loop0): Failed to find devices
If device path length equals to MAX_PATH_LEN, sbi->devs.path[] may not end up w/ null character due to path array is fully filled, So accidently, fields locate after path[] may be treated as part of device path, result in parsing wrong device path.
struct f2fs_dev_info {
...
char path[MAX_PATH_LEN];
...
};
Let's add one byte space for sbi->devs.path[] to store null character of device path string.
--- fs/f2fs/f2fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/f2fs.h +1 -1
@@ -1286,7 +1286,7 @@ struct f2fs_bio_info {struct f2fs_dev_info {struct file *bdev_file;struct block_device *bdev; -char path[MAX_PATH_LEN ]; +char path[MAX_PATH_LEN +1 ];unsigned int total_segments;block_t start_blk;block_t end_blk;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 484/627 f2fs: vm_unmap_ram() may be called from an invalid context
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Prusakowski <[email protected]>
[ Upstream commit 08a7efc5b02a0620ae16aa9584060e980a69cb55 ]
When testing F2FS with xfstests using UFS backed virtual disks the kernel complains sometimes that f2fs_release_decomp_mem() calls vm_unmap_ram() from an invalid context. Example trace from f2fs/007 test:
f2fs/007 5s ... [12:59:38][ 8.902525] run fstests f2fs/007
[ 11.468026] BUG: sleeping function called from invalid context at mm/vmalloc.c:2978 [ 11.471849] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 68, name: irq/22-ufshcd [ 11.475357] preempt_count: 1, expected: 0 [ 11.476970] RCU nest depth: 0, expected: 0 [ 11.478531] CPU: 0 UID: 0 PID: 68 Comm: irq/22-ufshcd Tainted: G W 6.16.0-rc5-xfstests-ufs-g40f92e79b0aa #9 PREEMPT(none) [ 11.478535] Tainted: [W]=WARN [ 11.478536] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 [ 11.478537] Call Trace: [ 11.478543] <TASK> [ 11.478545] dump_stack_lvl+0x4e/0x70 [ 11.478554] __might_resched.cold+0xaf/0xbe [ 11.478557] vm_unmap_ram+0x21/0xb0 [ 11.478560] f2fs_release_decomp_mem+0x59/0x80 [ 11.478563] f2fs_free_dic+0x18/0x1a0 [ 11.478565] f2fs_finish_read_bio+0xd7/0x290 [ 11.478570] blk_update_request+0xec/0x3b0 [ 11.478574] ? sbitmap_queue_clear+0x3b/0x60 [ 11.478576] scsi_end_request+0x27/0x1a0 [ 11.478582] scsi_io_completion+0x40/0x300 [ 11.478583] ufshcd_mcq_poll_cqe_lock+0xa3/0xe0 [ 11.478588] ufshcd_sl_intr+0x194/0x1f0 [ 11.478592] ufshcd_threaded_intr+0x68/0xb0 [ 11.478594] ? __pfx_irq_thread_fn+0x10/0x10 [ 11.478599] irq_thread_fn+0x20/0x60 [ 11.478602] ? __pfx_irq_thread_fn+0x10/0x10 [ 11.478603] irq_thread+0xb9/0x180 [ 11.478605] ? __pfx_irq_thread_dtor+0x10/0x10 [ 11.478607] ? __pfx_irq_thread+0x10/0x10 [ 11.478609] kthread+0x10a/0x230 [ 11.478614] ? __pfx_kthread+0x10/0x10 [ 11.478615] ret_from_fork+0x7e/0xd0 [ 11.478619] ? __pfx_kthread+0x10/0x10 [ 11.478621] ret_from_fork_asm+0x1a/0x30 [ 11.478623] </TASK>
This patch modifies in_task() check inside f2fs_read_end_io() to also check if interrupts are disabled. This ensures that pages are unmapped asynchronously in an interrupt handler.
--- fs/f2fs/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/data.c +1 -1
@@ -282,7 +282,7 @@ static void f2fs_read_end_io(struct bio *bio) {struct f2fs_sb_info *sbi =F2FS_P_SB (bio_first_page_all (bio));struct bio_post_read_ctx *ctx; -bool intask =in_task (); +bool intask =in_task () && !irqs_disabled ();iostat_update_and_unbind_ctx (bio); ctx = bio->bi_private;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 485/627 f2fs: fix to update upper_p in __get_secs_required() correctly
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 6840faddb65683b4e7bd8196f177b038a1e19faf ]
Commit 1acd73edbbfe ("f2fs: fix to account dirty data in __get_secs_required()") missed to calculate upper_p w/ data_secs, fix it.
--- fs/f2fs/segment.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/segment.h +1 -1
@@ -684,7 +684,7 @@ static inline void __get_secs_required(struct f2fs_sb_info *sbi,if (lower_p) *lower_p = node_secs + dent_secs + data_secs;if (upper_p) - *upper_p = node_secs + dent_secs + + *upper_p = node_secs + dent_secs + data_secs + (node_blocks ?1 :0 ) + (dent_blocks ?1 :0 ) + (data_blocks ?1 :0 );if (curseg_p)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 486/627 f2fs: fix to calculate dirty data during has_not_enough_free_secs()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit e194e140ab7de2ce2782e64b9e086a43ca6ff4f2 ]
In lfs mode, dirty data needs OPU, we'd better calculate lower_p and upper_p w/ them during has_not_enough_free_secs(), otherwise we may encounter out-of-space issue due to we missed to reclaim enough free section w/ foreground gc.
--- fs/f2fs/segment.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/f2fs/segment.h +1 -2
@@ -674,8 +674,7 @@ static inline void __get_secs_required(struct f2fs_sb_info *sbi,unsigned int dent_blocks = total_dent_blocks %CAP_BLKS_PER_SEC (sbi);unsigned int data_blocks =0 ; -if (f2fs_lfs_mode (sbi) && -unlikely (is_sbi_flag_set (sbi,SBI_CP_DISABLED ))) { +if (f2fs_lfs_mode (sbi)) { total_data_blocks =get_pages (sbi,F2FS_DIRTY_DATA ); data_secs = total_data_blocks /CAP_BLKS_PER_SEC (sbi); data_blocks = total_data_blocks %CAP_BLKS_PER_SEC (sbi);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 487/627 f2fs: fix to trigger foreground gc during f2fs_map_blocks() in lfs mode
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 1005a3ca28e90c7a64fa43023f866b960a60f791 ]
w/ "mode=lfs" mount option, generic/299 will cause system panic as below:
------------[ cut here ]------------ kernel BUG at fs/f2fs/segment.c:2835! Call Trace: <TASK> f2fs_allocate_data_block+0x6f4/0xc50 f2fs_map_blocks+0x970/0x1550 f2fs_iomap_begin+0xb2/0x1e0 iomap_iter+0x1d6/0x430 __iomap_dio_rw+0x208/0x9a0 f2fs_file_write_iter+0x6b3/0xfa0 aio_write+0x15d/0x2e0 io_submit_one+0x55e/0xab0 __x64_sys_io_submit+0xa5/0x230 do_syscall_64+0x84/0x2f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0010:new_curseg+0x70f/0x720
The root cause of we run out-of-space is: in f2fs_map_blocks(), f2fs may trigger foreground gc only if it allocates any physical block, it will be a little bit later when there is multiple threads writing data w/ aio/dio/bufio method in parallel, since we always use OPU in lfs mode, so f2fs_map_blocks() does block allocations aggressively.
In order to fix this issue, let's give a chance to trigger foreground gc in prior to block allocation in f2fs_map_blocks().
--- fs/f2fs/data.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/f2fs/data.c +4 -1
@@ -1572,8 +1572,11 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, int flag) end = pgofs + maxblocks; next_dnode: -if (map->m_may_create) +if (map->m_may_create) { +if (f2fs_lfs_mode (sbi)) +f2fs_balance_fs (sbi, true);f2fs_map_lock (sbi, flag); + }/* When reading holes, we need its node page */ set_new_dnode (&dn, inode,NULL ,NULL ,0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 488/627 exfat: fdatasync flag should be same like generic_write_sync()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengxu Zhang <[email protected]>
[ Upstream commit 2f2d42a17b5a6711378d39df74f1f69a831c5d4e ]
Test: androbench by default setting, use 64GB sdcard.
the random write speed:
without this patch 3.5MB/s
with this patch 7MB/s
After patch "11a347fb6cef", the random write speed decreased significantly. the .write_iter() interface had been modified, and check the differences with generic_file_write_iter(), when calling generic_write_sync() and exfat_file_write_iter() to call vfs_fsync_range(), the fdatasync flag is wrong, and make not use the fdatasync mode, and make random write speed decreased. So use generic_write_sync() instead of vfs_fsync_range().
--- fs/exfat/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/exfat/file.c +2 -3
@@ -623,9 +623,8 @@ static ssize_t exfat_file_write_iter(struct kiocb *iocb, struct iov_iter *iter)if (pos > valid_size) pos = valid_size; -if (iocb_is_dsync (iocb) && iocb->ki_pos > pos) { -ssize_t err =vfs_fsync_range (file, pos, iocb->ki_pos -1 , - iocb->ki_flags &IOCB_SYNC ); +if (iocb->ki_pos > pos) { +ssize_t err =generic_write_sync (iocb, iocb->ki_pos - pos);if (err <0 )return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 489/627 i2c: muxes: mule: Fix an error handling path in mule_i2c_mux_probe()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 33ac5155891cab165c93b51b0e22e153eacc2ee7 ]
If an error occurs in the loop that creates the device adapters, then a reference to 'dev' still needs to be released.
Use for_each_child_of_node_scoped() to both fix the issue and save one line of code.
--- drivers/i2c/muxes/i2c-mux-mule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/i2c/muxes/i2c-mux-mule.c +1 -2
@@ -47,7 +47,6 @@ static int mule_i2c_mux_probe(struct platform_device *pdev)struct mule_i2c_reg_mux *priv;struct i2c_client *client;struct i2c_mux_core *muxc; -struct device_node *dev;unsigned int readback;int ndev, ret;bool old_fw;
@@ -95,7 +94,7 @@ static int mule_i2c_mux_probe(struct platform_device *pdev) "Failed to register mux remove\n");/* Create device adapters */ -for_each_child_of_node (mux_dev->of_node, dev) { +for_each_child_of_node_scoped (mux_dev->of_node, dev) {u32 reg; ret =of_property_read_u32 (dev,"reg" , ®);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 490/627 vfio: Fix unbalanced vfio_df_close call in no-iommu mode
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Pan <[email protected]>
[ Upstream commit b25e271b377999191b12f0afbe1861edcf57e3fe ]
For devices with no-iommu enabled in IOMMUFD VFIO compat mode, the group open path skips vfio_df_open(), leaving open_count at 0. This causes a warning in vfio_assert_device_open(device) when vfio_df_close() is called during group close.
The correct behavior is to skip only the IOMMUFD bind in the device open path for no-iommu devices. Commit 6086efe73498 omitted vfio_df_open(), which was too broad. This patch restores the previous behavior, ensuring the vfio_df_open is called in the group open path.
--- drivers/vfio/group.c | 7 +++---- drivers/vfio/iommufd.c | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/vfio/group.c +3 -4
@@ -192,11 +192,10 @@ static int vfio_df_group_open(struct vfio_device_file *df)* implies they expected translation to exist */ if (!capable (CAP_SYS_RAWIO ) || -vfio_iommufd_device_has_compat_ioas (device, df->iommufd)) +vfio_iommufd_device_has_compat_ioas (device, df->iommufd)) { ret = -EPERM ; -else - ret =0 ; - goto out_put_kvm; + goto out_put_kvm; + } } ret =vfio_df_open (df);
drivers/vfio/iommufd.c +4 -0
@@ -25,6 +25,10 @@ int vfio_df_iommufd_bind(struct vfio_device_file *df)lockdep_assert_held (&vdev->dev_set->lock); +/* Returns 0 to permit device opening under noiommu mode */ +if (vfio_device_is_noiommu (vdev)) +return 0 ; +return vdev->ops->bind_iommufd (vdev, ictx, &df->devid); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 491/627 vfio: Prevent open_count decrement to negative
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Pan <[email protected]>
[ Upstream commit 982ddd59ed97dc7e63efd97ed50273ffb817bd41 ]
When vfio_df_close() is called with open_count=0, it triggers a warning in vfio_assert_device_open() but still decrements open_count to -1. This allows a subsequent open to incorrectly pass the open_count == 0 check, leading to unintended behavior, such as setting df->access_granted = true.
For example, running an IOMMUFD compat no-IOMMU device with VFIO tests
(https://github.com/awilliam/tests/blob/master/vfio-noiommu-pci-device-open.c)
results in a warning and a failed VFIO_GROUP_GET_DEVICE_FD ioctl on the first run, but the second run succeeds incorrectly.
Add checks to avoid decrementing open_count below zero.
--- drivers/vfio/vfio_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/vfio/vfio_main.c +2 -1
@@ -583,7 +583,8 @@ void vfio_df_close(struct vfio_device_file *df)lockdep_assert_held (&device->dev_set->lock); -vfio_assert_device_open (device); +if (!vfio_assert_device_open (device)) +return ;if (device->open_count ==1 )vfio_df_device_last_close (df); device->open_count--;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 492/627 vfio/pds: Fix missing detach_ioas op
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit fe24d5bc635e103a517ec201c3cb571eeab8be2f ]
When CONFIG_IOMMUFD is enabled and a device is bound to the pds_vfio_pci driver, the following WARN_ON() trace is seen and probe fails:
WARNING: CPU: 0 PID: 5040 at drivers/vfio/vfio_main.c:317 __vfio_register_dev+0x130/0x140 [vfio]
<...>pds_vfio_pci 0000:08:00.1: probe with driver pds_vfio_pci failed with error -22
This is because the driver's vfio_device_ops.detach_ioas isn't set.
Fix this by using the generic vfio_iommufd_physical_detach_ioas function.
--- drivers/vfio/pci/pds/vfio_dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/vfio/pci/pds/vfio_dev.c +1 -0
@@ -204,6 +204,7 @@ static const struct vfio_device_ops pds_vfio_ops = { .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas, + .detach_ioas = vfio_iommufd_physical_detach_ioas, };const struct vfio_device_ops *pds_vfio_ops_info (void )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 493/627 vfio/pci: Separate SR-IOV VF dev_set
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit e908f58b6beb337cbe4481d52c3f5c78167b1aab ]
In the below noted Fixes commit we introduced a reflck mutex to allow better scaling between devices for open and close. The reflck was based on the hot reset granularity, device level for root bus devices which cannot support hot reset or bus/slot reset otherwise. Overlooked in this were SR-IOV VFs, where there's also no bus reset option, but the default for a non-root-bus, non-slot-based device is bus level reflck granularity.
The reflck mutex has since become the dev_set mutex (via commit 2cd8b14aaa66 ("vfio/pci: Move to the device set infrastructure")) and is our defacto serialization for various operations and ioctls. It still seems to be the case though that sets of vfio-pci devices really only need serialization relative to hot resets affecting the entire set, which is not relevant to SR-IOV VFs. As described in the Closes link below, this serialization contributes to startup latency when multiple VFs sharing the same "bus" are opened concurrently.
Mark the device itself as the basis of the dev_set for SR-IOV VFs.
--- drivers/vfio/pci/vfio_pci_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci_core.c +1 -1
@@ -2149,7 +2149,7 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)return -EBUSY ; } -if (pci_is_root_bus (pdev->bus)) { +if (pci_is_root_bus (pdev->bus) || pdev->is_virtfn) { ret =vfio_assign_device_set (&vdev->vdev, vdev); }else if (!pci_probe_reset_slot (pdev->slot)) { ret =vfio_assign_device_set (&vdev->vdev, pdev->slot);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 494/627 scsi: mpt3sas: Fix a fw_event memory leak
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <[email protected]>
[ Upstream commit 3e90b38781e3bdd651edaf789585687611638862 ]
In _mpt3sas_fw_work() the fw_event reference is removed, it should also be freed in all cases.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -2
@@ -10790,8 +10790,7 @@ _mpt3sas_fw_work(struct MPT3SAS_ADAPTER *ioc, struct fw_event_work *fw_event)break ;case MPI2_EVENT_PCIE_TOPOLOGY_CHANGE_LIST :_scsih_pcie_topology_change_event (ioc, fw_event); - ioc->current_event =NULL ; -return ; +break ; } out:fw_event_work_put (fw_event);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 495/627 scsi: Revert "scsi: iscsi: Fix HW conn removal use after free"
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Lingfeng <[email protected]>
[ Upstream commit 7bdc68921481c19cd8c85ddf805a834211c19e61 ]
This reverts commit c577ab7ba5f3bf9062db8a58b6e89d4fe370447e.
The invocation of iscsi_put_conn() in iscsi_iter_destory_conn_fn() is used to free the initial reference counter of iscsi_cls_conn. For non-qla4xxx cases, the ->destroy_conn() callback (e.g., iscsi_conn_teardown) will call iscsi_remove_conn() and iscsi_put_conn() to remove the connection from the children list of session and free the connection at last. However for qla4xxx, it is not the case. The ->destroy_conn() callback of qla4xxx will keep the connection in the session conn_list and doesn't use iscsi_put_conn() to free the initial reference counter. Therefore, it seems necessary to keep the iscsi_put_conn() in the iscsi_iter_destroy_conn_fn(), otherwise, there will be memory leak problem.
--- drivers/scsi/scsi_transport_iscsi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +2 -0
@@ -2143,6 +2143,8 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data)return 0 ;iscsi_remove_conn (iscsi_dev_to_conn (dev)); +iscsi_put_conn (iscsi_dev_to_conn (dev)); +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 496/627 scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Seunghui Lee <[email protected]>
[ Upstream commit 35dabf4503b94a697bababe94678a8bc989c3223 ]
If the h8 exit fails during runtime resume process, the runtime thread enters runtime suspend immediately and the error handler operates at the same time. It becomes stuck and cannot be recovered through the error handler. To fix this, use link recovery instead of the error handler.
--- drivers/ufs/core/ufshcd.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +9 -1
@@ -4340,7 +4340,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) hba->uic_async_done =NULL ;if (reenable_intr)ufshcd_enable_intr (hba,UIC_COMMAND_COMPL ); -if (ret) { +if (ret && !hba->pm_op_in_progress) {ufshcd_set_link_broken (hba);ufshcd_schedule_eh_work (hba); }
@@ -4348,6 +4348,14 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)spin_unlock_irqrestore (hba->host->host_lock, flags);mutex_unlock (&hba->uic_cmd_mutex); +/* +* If the h8 exit fails during the runtime resume process, it becomes +* stuck and cannot be recovered through the error handler. To fix +* this, use link recovery instead of the error handler. +*/ +if (ret && hba->pm_op_in_progress) + ret =ufshcd_link_recovery (hba); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 497/627 scsi: sd: Make sd shutdown issue START STOP UNIT appropriately
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Salomon Dushimirimana <[email protected]>
[ Upstream commit 8e48727c26c4d839ff9b4b73d1cae486bea7fe19 ]
Commit aa3998dbeb3a ("ata: libata-scsi: Disable scsi device manage_system_start_stop") enabled libata EH to manage device power mode trasitions for system suspend/resume and removed the flag from ata_scsi_dev_config. However, since the sd_shutdown() function still relies on the manage_system_start_stop flag, a spin-down command is not issued to the disk with command "echo 1 > /sys/block/sdb/device/delete"
sd_shutdown() can be called for both system/runtime start stop operations, so utilize the manage_run_time_start_stop flag set in the ata_scsi_dev_config and issue a spin-down command during disk removal when the system is running. This is in addition to when the system is powering off and manage_shutdown flag is set. The manage_system_start_stop flag will still be used for drivers that still set the flag.
--- drivers/scsi/sd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/sd.c +3 -1
@@ -4173,7 +4173,9 @@ static void sd_shutdown(struct device *dev)if ((system_state !=SYSTEM_RESTART && sdkp->device->manage_system_start_stop) || (system_state ==SYSTEM_POWER_OFF && - sdkp->device->manage_shutdown)) { + sdkp->device->manage_shutdown) || + (system_state ==SYSTEM_RUNNING && + sdkp->device->manage_runtime_start_stop)) {sd_printk (KERN_NOTICE , sdkp,"Stopping disk\n" );sd_start_stop_device (sdkp,0 ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 498/627 kconfig: qconf: fix ConfigList::updateListAllforAll()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 721bfe583c52ba1ea74b3736a31a9dcfe6dd6d95 ]
ConfigList::updateListForAll() and ConfigList::updateListAllforAll() are identical.
Commit f9b918fae678 ("kconfig: qconf: move ConfigView::updateList(All) to ConfigList class") was a misconversion.
--- scripts/kconfig/qconf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/qconf.cc +1 -1
@@ -478,7 +478,7 @@ void ConfigList::updateListAllForAll() while (it.hasNext()) { ConfigList *list = it.next(); - list->updateList(); + list->updateListAll(); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 499/627 vfio/pci: Do vf_token checks for VFIO_DEVICE_BIND_IOMMUFD
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit 86624ba3b522b6512def25534341da93356c8da4 ]
This was missed during the initial implementation. The VFIO PCI encodes the vf_token inside the device name when opening the device from the group FD, something like:
"0000:04:10.0 vf_token=bd8d9d2b-5a5f-4f5a-a211-f591514ba1f3"
This is used to control access to a VF unless there is co-ordination with the owner of the PF.
Since we no longer have a device name in the cdev path, pass the token directly through VFIO_DEVICE_BIND_IOMMUFD using an optional field indicated by VFIO_DEVICE_BIND_FLAG_TOKEN.
--- drivers/vfio/device_cdev.c | 38 +++++++++++++++++-- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + drivers/vfio/pci/mlx5/main.c | 1 + drivers/vfio/pci/nvgrace-gpu/main.c | 2 + drivers/vfio/pci/pds/vfio_dev.c | 1 + drivers/vfio/pci/qat/main.c | 1 + drivers/vfio/pci/vfio_pci.c | 1 + drivers/vfio/pci/vfio_pci_core.c | 22 +++++++---- drivers/vfio/pci/virtio/main.c | 3 ++ include/linux/vfio.h | 4 ++ include/linux/vfio_pci_core.h | 2 + include/uapi/linux/vfio.h | 12 +++++- 12 files changed, 76 insertions(+), 12 deletions(-)
drivers/vfio/device_cdev.c +35 -3
@@ -60,22 +60,50 @@ static void vfio_df_get_kvm_safe(struct vfio_device_file *df)spin_unlock (&df->kvm_ref_lock); } +static int vfio_df_check_token (struct vfio_device *device, +const struct vfio_device_bind_iommufd *bind) +{ +uuid_t uuid; + +if (!device->ops->match_token_uuid) { +if (bind->flags &VFIO_DEVICE_BIND_FLAG_TOKEN ) +return -EINVAL ; +return 0 ; + } + +if (!(bind->flags &VFIO_DEVICE_BIND_FLAG_TOKEN )) +return device->ops->match_token_uuid (device,NULL ); + +if (copy_from_user (&uuid,u64_to_user_ptr (bind->token_uuid_ptr), +sizeof (uuid))) +return -EFAULT ; +return device->ops->match_token_uuid (device, &uuid); +} +long vfio_df_ioctl_bind_iommufd (struct vfio_device_file *df,struct vfio_device_bind_iommufd __user *arg) { +const u32 VALID_FLAGS =VFIO_DEVICE_BIND_FLAG_TOKEN ;struct vfio_device *device = df->device;struct vfio_device_bind_iommufd bind;unsigned long minsz; +u32 user_size;int ret;static_assert (__same_type (arg->out_devid, df->devid)); minsz = offsetofend(struct vfio_device_bind_iommufd, out_devid); -if (copy_from_user (&bind, arg, minsz)) -return -EFAULT ; + ret =get_user (user_size, &arg->argsz); +if (ret) +return ret; +if (user_size < minsz) +return -EINVAL ; + ret =copy_struct_from_user (&bind, minsz, arg, user_size); +if (ret) +return ret; -if (bind.argsz < minsz || bind.flags || bind.iommufd <0 ) +if (bind.iommufd <0 || bind.flags & ~VALID_FLAGS )return -EINVAL ;/* BIND_IOMMUFD only allowed for cdev fds */
@@ -93,6 +121,10 @@ long vfio_df_ioctl_bind_iommufd(struct vfio_device_file *df, goto out_unlock; } + ret =vfio_df_check_token (device, &bind); +if (ret) + goto out_unlock; + df->iommufd =iommufd_ctx_from_fd (bind.iommufd);if (IS_ERR (df->iommufd)) { ret =PTR_ERR (df->iommufd);
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +1 -0
@@ -1583,6 +1583,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/mlx5/main.c +1 -0
@@ -1372,6 +1372,7 @@ static const struct vfio_device_ops mlx5vf_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/nvgrace-gpu/main.c +2 -0
@@ -696,6 +696,7 @@ static const struct vfio_device_ops nvgrace_gpu_pci_ops = { .mmap = nvgrace_gpu_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
@@ -715,6 +716,7 @@ static const struct vfio_device_ops nvgrace_gpu_pci_core_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/pds/vfio_dev.c +1 -0
@@ -201,6 +201,7 @@ static const struct vfio_device_ops pds_vfio_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/qat/main.c +1 -0
@@ -614,6 +614,7 @@ static const struct vfio_device_ops qat_vf_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/vfio_pci.c +1 -0
@@ -138,6 +138,7 @@ static const struct vfio_device_ops vfio_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
drivers/vfio/pci/vfio_pci_core.c +14 -8
@@ -1821,9 +1821,13 @@ void vfio_pci_core_request(struct vfio_device *core_vdev, unsigned int count) }EXPORT_SYMBOL_GPL (vfio_pci_core_request); -static int vfio_pci_validate_vf_token (struct vfio_pci_core_device *vdev, -bool vf_token,uuid_t *uuid) +int vfio_pci_core_match_token_uuid (struct vfio_device *core_vdev, +const uuid_t *uuid) + { +struct vfio_pci_core_device *vdev = + container_of(core_vdev, struct vfio_pci_core_device, vdev); +/* * There's always some degree of trust or collaboration between SR-IOV * PF and VFs, even if just that the PF hosts the SR-IOV capability and
@@ -1854,7 +1858,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev,bool match;if (!pf_vdev) { -if (!vf_token) +if (!uuid)return 0 ;/* PF is not vfio-pci, no VF token */ pci_info_ratelimited(vdev->pdev,
@@ -1862,7 +1866,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev,return -EINVAL ; } -if (!vf_token) { +if (!uuid) {pci_info_ratelimited (vdev->pdev,"VF token required to access device\n" );return -EACCES ;
@@ -1880,7 +1884,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev, }else if (vdev->vf_token) {mutex_lock (&vdev->vf_token->lock);if (vdev->vf_token->users) { -if (!vf_token) { +if (!uuid) {mutex_unlock (&vdev->vf_token->lock);pci_info_ratelimited (vdev->pdev,"VF token required to access device\n" );
@@ -1893,12 +1897,12 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev, "Incorrect VF token provided for device\n");return -EACCES ; } - }else if (vf_token) { + }else if (uuid) {uuid_copy (&vdev->vf_token->uuid, uuid); }mutex_unlock (&vdev->vf_token->lock); - }else if (vf_token) { + }else if (uuid) {pci_info_ratelimited (vdev->pdev,"VF token incorrectly provided, not a PF or VF\n" );return -EINVAL ;
@@ -1906,6 +1910,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev,return 0 ; } +EXPORT_SYMBOL_GPL (vfio_pci_core_match_token_uuid);#define VF_TOKEN_ARG "vf_token="
@@ -1952,7 +1957,8 @@ int vfio_pci_core_match(struct vfio_device *core_vdev, char *buf) } } - ret =vfio_pci_validate_vf_token (vdev, vf_token, &uuid); + ret = core_vdev->ops->match_token_uuid (core_vdev, + vf_token ? &uuid :NULL );if (ret)return ret;
drivers/vfio/pci/virtio/main.c +3 -0
@@ -94,6 +94,7 @@ static const struct vfio_device_ops virtiovf_vfio_pci_lm_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
@@ -114,6 +115,7 @@ static const struct vfio_device_ops virtiovf_vfio_pci_tran_lm_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
@@ -134,6 +136,7 @@ static const struct vfio_device_ops virtiovf_vfio_pci_ops = { .mmap = vfio_pci_core_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
include/linux/vfio.h +4 -0
@@ -105,6 +105,9 @@ struct vfio_device {* @match: Optional device name match callback (return: 0 for no-match, >0 for * match, -errno for abort (ex. match with insufficient or incorrect * additional args) +* @match_token_uuid: Optional device token match/validation. Return 0 +* if the uuid is valid for the device, -errno otherwise. uuid is NULL +* if none was provided. * @dma_unmap: Called when userspace unmaps IOVA from the container * this device is attached to. * @device_feature: Optional, fill in the VFIO_DEVICE_FEATURE ioctl
@@ -132,6 +135,7 @@ struct vfio_device_ops {int (*mmap)(struct vfio_device *vdev,struct vm_area_struct *vma);void (*request)(struct vfio_device *vdev,unsigned int count);int (*match)(struct vfio_device *vdev,char *buf); +int (*match_token_uuid)(struct vfio_device *vdev,const uuid_t *uuid);void (*dma_unmap)(struct vfio_device *vdev,u64 iova,u64 length);int (*device_feature)(struct vfio_device *device,u32 flags,void __user *arg,size_t argsz);
include/linux/vfio_pci_core.h +2 -0
@@ -122,6 +122,8 @@ ssize_t vfio_pci_core_write(struct vfio_device *core_vdev, const char __user *buint vfio_pci_core_mmap (struct vfio_device *core_vdev,struct vm_area_struct *vma);void vfio_pci_core_request (struct vfio_device *core_vdev,unsigned int count);int vfio_pci_core_match (struct vfio_device *core_vdev,char *buf); +int vfio_pci_core_match_token_uuid (struct vfio_device *core_vdev, +const uuid_t *uuid);int vfio_pci_core_enable (struct vfio_pci_core_device *vdev);void vfio_pci_core_disable (struct vfio_pci_core_device *vdev);void vfio_pci_core_finish_enable (struct vfio_pci_core_device *vdev);
include/uapi/linux/vfio.h +11 -1
@@ -905,10 +905,12 @@ struct vfio_device_feature {* VFIO_DEVICE_BIND_IOMMUFD - _IOR(VFIO_TYPE, VFIO_BASE + 18, * struct vfio_device_bind_iommufd) * @argsz: User filled size of this data. -* @flags: Must be 0. +* @flags: Must be 0 or a bit flags of VFIO_DEVICE_BIND_* * @iommufd: iommufd to bind. * @out_devid: The device id generated by this bind. devid is a handle for * this device/iommufd bond and can be used in IOMMUFD commands. +* @token_uuid_ptr: Valid if VFIO_DEVICE_BIND_FLAG_TOKEN. Points to a 16 byte +* UUID in the same format as VFIO_DEVICE_FEATURE_PCI_VF_TOKEN. * * Bind a vfio_device to the specified iommufd. *
@@ -917,13 +919,21 @@ struct vfio_device_feature {* * Unbind is automatically conducted when device fd is closed. * +* A token is sometimes required to open the device, unless this is known to be +* needed VFIO_DEVICE_BIND_FLAG_TOKEN should not be set and token_uuid_ptr is +* ignored. The only case today is a PF/VF relationship where the VF bind must +* be provided the same token as VFIO_DEVICE_FEATURE_PCI_VF_TOKEN provided to +* the PF. +* * Return: 0 on success, -errno on failure. */ struct vfio_device_bind_iommufd {__u32 argsz;__u32 flags; +#define VFIO_DEVICE_BIND_FLAG_TOKEN (1 << 0)__s32 iommufd;__u32 out_devid; +__aligned_u64 token_uuid_ptr; };#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 18)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 500/627 sched/psi: Fix psi_seq initialization
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 99b773d720aeea1ef2170dce5fcfa80649e26b78 ]
With the seqcount moved out of the group into a global psi_seq, re-initializing the seqcount on group creation is causing seqcount corruption.
--- kernel/sched/psi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
kernel/sched/psi.c +1 -5
@@ -172,7 +172,7 @@ struct psi_group psi_system = { .pcpu = &system_group_pcpu, }; -static DEFINE_PER_CPU(seqcount_t, psi_seq); +static DEFINE_PER_CPU(seqcount_t, psi_seq) = SEQCNT_ZERO(psi_seq);static inline void psi_write_begin (int cpu) {
@@ -200,11 +200,7 @@ static void poll_timer_fn(struct timer_list *t);static void group_init (struct psi_group *group) { -int cpu; - group->enabled = true; -for_each_possible_cpu (cpu) -seqcount_init (per_cpu_ptr (&psi_seq, cpu)); group->avg_last_update =sched_clock (); group->avg_next_update = group->avg_last_update + psi_period;mutex_init (&group->avgs_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 501/627 padata: Remove comment for reorder_work
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
[ Upstream commit 82a0302e7167d0b7c6cde56613db3748f8dd806d ]
Remove comment for reorder_work which no longer exists.
--- include/linux/padata.h | 1 - 1 file changed, 1 deletion(-)
include/linux/padata.h +0 -1
@@ -90,7 +90,6 @@ struct padata_cpumask {* @processed: Number of already processed objects. * @cpu: Next CPU to be processed. * @cpumask: The cpumasks in use for parallel and serial workers. -* @reorder_work: work struct for reordering. */ struct parallel_data {struct padata_shell *ps;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 502/627 PCI: pnv_php: Clean up allocated IRQs on unplug
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
[ Upstream commit 4668619092554e1b95c9a5ac2941ca47ba6d548a ]
When the root of a nested PCIe bridge configuration is unplugged, the pnv_php driver leaked the allocated IRQ resources for the child bridges' hotplug event notifications, resulting in a panic.
Fix this by walking all child buses and deallocating all its IRQ resources before calling pci_hp_remove_devices().
Also modify the lifetime of the workqueue at struct pnv_php_slot::wq so that it is only destroyed in pnv_php_free_slot(), instead of pnv_php_disable_irq(). This is required since pnv_php_disable_irq() will now be called by workers triggered by hot unplug interrupts, so the workqueue needs to stay allocated.
The abridged kernel panic that occurs without this patch is as follows:
WARNING: CPU: 0 PID: 687 at kernel/irq/msi.c:292 msi_device_data_release+0x6c/0x9c CPU: 0 UID: 0 PID: 687 Comm: bash Not tainted 6.14.0-rc5+ #2 Call Trace: msi_device_data_release+0x34/0x9c (unreliable) release_nodes+0x64/0x13c devres_release_all+0xc0/0x140 device_del+0x2d4/0x46c pci_destroy_dev+0x5c/0x194 pci_hp_remove_devices+0x90/0x128 pci_hp_remove_devices+0x44/0x128 pnv_php_disable_slot+0x54/0xd4 power_write_file+0xf8/0x18c pci_slot_attr_store+0x40/0x5c sysfs_kf_write+0x64/0x78 kernfs_fop_write_iter+0x1b0/0x290 vfs_write+0x3bc/0x50c ksys_write+0x84/0x140 system_call_exception+0x124/0x230 system_call_vectored_common+0x15c/0x2ec
--- drivers/pci/hotplug/pnv_php.c | 96 ++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 19 deletions(-)
drivers/pci/hotplug/pnv_php.c +77 -19
@@ -3,6 +3,7 @@* PCI Hotplug Driver for PowerPC PowerNV platform. * * Copyright Gavin Shan, IBM Corporation 2016. +* Copyright (C) 2025 Raptor Engineering, LLC */ #include <linux/bitfield.h>
@@ -36,8 +37,10 @@ static void pnv_php_register(struct device_node *dn);static void pnv_php_unregister_one (struct device_node *dn);static void pnv_php_unregister (struct device_node *dn); +static void pnv_php_enable_irq (struct pnv_php_slot *php_slot); +static void pnv_php_disable_irq (struct pnv_php_slot *php_slot, -bool disable_device) +bool disable_device,bool disable_msi) {struct pci_dev *pdev = php_slot->pdev;u16 ctrl;
@@ -53,19 +56,15 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, php_slot->irq =0 ; } -if (php_slot->wq) { -destroy_workqueue (php_slot->wq); - php_slot->wq =NULL ; - } - -if (disable_device) { +if (disable_device || disable_msi) {if (pdev->msix_enabled)pci_disable_msix (pdev);else if (pdev->msi_enabled)pci_disable_msi (pdev); + } +if (disable_device)pci_disable_device (pdev); - } }static void pnv_php_free_slot (struct kref *kref)
@@ -74,7 +73,8 @@ static void pnv_php_free_slot(struct kref *kref) struct pnv_php_slot, kref);WARN_ON (!list_empty (&php_slot->children)); -pnv_php_disable_irq (php_slot, false); +pnv_php_disable_irq (php_slot, false, false); +destroy_workqueue (php_slot->wq);kfree (php_slot->name);kfree (php_slot); }
@@ -561,8 +561,58 @@ static int pnv_php_reset_slot(struct hotplug_slot *slot, bool probe)static int pnv_php_enable_slot (struct hotplug_slot *slot) {struct pnv_php_slot *php_slot =to_pnv_php_slot (slot); +u32 prop32; +int ret; + + ret =pnv_php_enable (php_slot, true); +if (ret) +return ret; + +/* (Re-)enable interrupt if the slot supports surprise hotplug */ + ret =of_property_read_u32 (php_slot->dn,"ibm,slot-surprise-pluggable" , + &prop32); +if (!ret && prop32) +pnv_php_enable_irq (php_slot); -return pnv_php_enable (php_slot, true); +return 0 ; +} + +/* +* Disable any hotplug interrupts for all slots on the provided bus, as well as +* all downstream slots in preparation for a hot unplug. +*/ +static int pnv_php_disable_all_irqs (struct pci_bus *bus) +{ +struct pci_bus *child_bus; +struct pci_slot *slot; + +/* First go down child buses */ +list_for_each_entry (child_bus, &bus->children, node) +pnv_php_disable_all_irqs (child_bus); + +/* Disable IRQs for all pnv_php slots on this bus */ +list_for_each_entry (slot, &bus->slots, list) { +struct pnv_php_slot *php_slot =to_pnv_php_slot (slot->hotplug); + +pnv_php_disable_irq (php_slot, false, true); + } + +return 0 ; +} + +/* +* Disable any hotplug interrupts for all downstream slots on the provided +* bus in preparation for a hot unplug. +*/ +static int pnv_php_disable_all_downstream_irqs (struct pci_bus *bus) +{ +struct pci_bus *child_bus; + +/* Go down child buses, recursively deactivating their IRQs */ +list_for_each_entry (child_bus, &bus->children, node) +pnv_php_disable_all_irqs (child_bus); + +return 0 ; }static int pnv_php_disable_slot (struct hotplug_slot *slot)
@@ -579,6 +629,13 @@ static int pnv_php_disable_slot(struct hotplug_slot *slot) php_slot->state != PNV_PHP_STATE_REGISTERED)return 0 ; +/* +* Free all IRQ resources from all child slots before remove. +* Note that we do not disable the root slot IRQ here as that +* would also deactivate the slot hot (re)plug interrupt! +*/ +pnv_php_disable_all_downstream_irqs (php_slot->bus); +/* Remove all devices behind the slot */ pci_lock_rescan_remove ();pci_hp_remove_devices (php_slot->bus);
@@ -647,6 +704,15 @@ static struct pnv_php_slot *pnv_php_alloc_slot(struct device_node *dn)return NULL ; } +/* Allocate workqueue for this slot's interrupt handling */ + php_slot->wq =alloc_workqueue ("pciehp-%s" ,0 ,0 , php_slot->name); +if (!php_slot->wq) { +SLOT_WARN (php_slot,"Cannot alloc workqueue\n" ); +kfree (php_slot->name); +kfree (php_slot); +return NULL ; + } +if (dn->child &&PCI_DN (dn->child)) php_slot->slot_no =PCI_SLOT (PCI_DN (dn->child)->devfn);else
@@ -843,14 +909,6 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)u16 sts, ctrl;int ret; -/* Allocate workqueue */ - php_slot->wq =alloc_workqueue ("pciehp-%s" ,0 ,0 , php_slot->name); -if (!php_slot->wq) { -SLOT_WARN (php_slot,"Cannot alloc workqueue\n" ); -pnv_php_disable_irq (php_slot, true); -return ; - } -/* Check PDC (Presence Detection Change) is broken or not */ ret =of_property_read_u32 (php_slot->dn,"ibm,slot-broken-pdc" , &broken_pdc);
@@ -869,7 +927,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) ret =request_irq (irq, pnv_php_interrupt,IRQF_SHARED , php_slot->name, php_slot);if (ret) { -pnv_php_disable_irq (php_slot, true); +pnv_php_disable_irq (php_slot, true, true);SLOT_WARN (php_slot,"Error %d enabling IRQ %d\n" , ret, irq);return ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 503/627 PCI: pnv_php: Work around switches with broken presence detection
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
[ Upstream commit 80f9fc2362797538ebd4fd70a1dfa838cc2c2cdb ]
The Microsemi Switchtec PM8533 PFX 48xG3 [11f8:8533] PCIe switch system was observed to incorrectly assert the Presence Detect Set bit in its capabilities when tested on a Raptor Computing Systems Blackbird system, resulting in the hot insert path never attempting a rescan of the bus and any downstream devices not being re-detected.
Work around this by additionally checking whether the PCIe data link is active or not when performing presence detection on downstream switches' ports, similar to the pciehp_hpc.c driver.
--- drivers/pci/hotplug/pnv_php.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/pci/hotplug/pnv_php.c +27 -0
@@ -391,6 +391,20 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)return 0 ; } +static int pcie_check_link_active (struct pci_dev *pdev) +{ +u16 lnk_status; +int ret; + + ret =pcie_capability_read_word (pdev,PCI_EXP_LNKSTA , &lnk_status); +if (ret ==PCIBIOS_DEVICE_NOT_FOUND ||PCI_POSSIBLE_ERROR (lnk_status)) +return -ENODEV ; + + ret = !!(lnk_status &PCI_EXP_LNKSTA_DLLLA ); + +return ret; +} +static int pnv_php_get_adapter_state (struct hotplug_slot *slot,u8 *state) {struct pnv_php_slot *php_slot =to_pnv_php_slot (slot);
@@ -403,6 +417,19 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)*/ ret =pnv_pci_get_presence_state (php_slot->id, &presence);if (ret >=0 ) { +if (pci_pcie_type (php_slot->pdev) ==PCI_EXP_TYPE_DOWNSTREAM && + presence ==OPAL_PCI_SLOT_EMPTY ) { +/* +* Similar to pciehp_hpc, check whether the Link Active +* bit is set to account for broken downstream bridges +* that don't properly assert Presence Detect State, as +* was observed on the Microsemi Switchtec PM8533 PFX +* [11f8:8533]. +*/ +if (pcie_check_link_active (php_slot->pdev) >0 ) + presence =OPAL_PCI_SLOT_PRESENT ; + } + *state = presence; ret =0 ; }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 504/627 powerpc/eeh: Export eeh_unfreeze_pe()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
[ Upstream commit e82b34eed04b0ddcff4548b62633467235672fd3 ]
The PowerNV hotplug driver needs to be able to clear any frozen PE(s) on the PHB after suprise removal of a downstream device.
Export the eeh_unfreeze_pe() symbol to allow implementation of this functionality in the php_nv module.
--- arch/powerpc/kernel/eeh.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/eeh.c +1 -0
@@ -1139,6 +1139,7 @@ int eeh_unfreeze_pe(struct eeh_pe *pe)return ret; } +EXPORT_SYMBOL_GPL (eeh_unfreeze_pe);static struct pci_device_id eeh_reset_ids[] = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 505/627 powerpc/eeh: Make EEH driver device hotplug safe
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
[ Upstream commit 1010b4c012b0d78dfb9d3132b49aa2ef024a07a7 ]
Multiple race conditions existed between the PCIe hotplug driver and the EEH driver, leading to a variety of kernel oopses of the same general nature:
<pcie device unplug>
<eeh driver trigger>
<hotplug removal trigger>
<pcie tree reconfiguration>
<eeh recovery next step>
<oops in EEH driver bus iteration loop>
A second class of oops is also seen when the underlying bus disappears during device recovery.
Refactor the EEH module to be PCI rescan and remove safe. Also clean up a few minor formatting / readability issues.
--- arch/powerpc/kernel/eeh_driver.c | 48 +++++++++++++++++++++----------- arch/powerpc/kernel/eeh_pe.c | 10 ++++--- 2 files changed, 38 insertions(+), 20 deletions(-)
arch/powerpc/kernel/eeh_driver.c +32 -16
@@ -257,13 +257,12 @@ static void eeh_pe_report_edev(struct eeh_dev *edev, eeh_report_fn fn,struct pci_driver *driver;enum pci_ers_result new_result; -pci_lock_rescan_remove (); pdev = edev->pdev;if (pdev)get_device (&pdev->dev); -pci_unlock_rescan_remove ();if (!pdev) {eeh_edev_info (edev,"no device" ); + *result =PCI_ERS_RESULT_DISCONNECT ;return ; }device_lock (&pdev->dev);
@@ -304,8 +303,9 @@ static void eeh_pe_report(const char *name, struct eeh_pe *root,struct eeh_dev *edev, *tmp;pr_info ("EEH: Beginning: '%s'\n" , name); - eeh_for_each_pe(root, pe) eeh_pe_for_each_dev(pe, edev, tmp) -eeh_pe_report_edev (edev, fn, result); +eeh_for_each_pe (root, pe) +eeh_pe_for_each_dev (pe, edev, tmp) +eeh_pe_report_edev (edev, fn, result);if (result)pr_info ("EEH: Finished:'%s' with aggregate recovery state:'%s'\n" , name,pci_ers_result_name (*result));
@@ -383,6 +383,8 @@ static void eeh_dev_restore_state(struct eeh_dev *edev, void *userdata)if (!edev)return ; +pci_lock_rescan_remove (); +/* * The content in the config space isn't saved because * the blocked config space on some adapters. We have
@@ -393,14 +395,19 @@ static void eeh_dev_restore_state(struct eeh_dev *edev, void *userdata)if (list_is_last (&edev->entry, &edev->pe->edevs))eeh_pe_restore_bars (edev->pe); +pci_unlock_rescan_remove ();return ; } pdev =eeh_dev_to_pci_dev (edev); -if (!pdev) +if (!pdev) { +pci_unlock_rescan_remove ();return ; + }pci_restore_state (pdev); + +pci_unlock_rescan_remove (); }/**
@@ -647,9 +654,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,if (any_passed || driver_eeh_aware || (pe->type &EEH_PE_VF )) {eeh_pe_dev_traverse (pe, eeh_rmv_device, rmv_data); }else { -pci_lock_rescan_remove ();pci_hp_remove_devices (bus); -pci_unlock_rescan_remove (); }/*
@@ -665,8 +670,6 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,if (rc)return rc; -pci_lock_rescan_remove (); -/* Restore PE */ eeh_ops->configure_bridge (pe);eeh_pe_restore_bars (pe);
@@ -674,7 +677,6 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,/* Clear frozen state */ rc =eeh_clear_pe_frozen_state (pe, false);if (rc) { -pci_unlock_rescan_remove ();return rc; }
@@ -709,7 +711,6 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, pe->tstamp = tstamp; pe->freeze_count = cnt; -pci_unlock_rescan_remove ();return 0 ; }
@@ -843,10 +844,13 @@ void eeh_handle_normal_event(struct eeh_pe *pe) {LIST_HEAD_INIT(rmv_data.removed_vf_list), 0};int devices =0 ; +pci_lock_rescan_remove (); + bus =eeh_pe_bus_get (pe);if (!bus) {pr_err ("%s: Cannot find PCI bus for PHB#%x-PE#%x\n" , __func__, pe->phb->global_number, pe->addr); +pci_unlock_rescan_remove ();return ; }
@@ -1094,10 +1098,15 @@ void eeh_handle_normal_event(struct eeh_pe *pe)eeh_pe_state_clear (pe,EEH_PE_PRI_BUS , true);eeh_pe_dev_mode_mark (pe,EEH_DEV_REMOVED ); -pci_lock_rescan_remove (); -pci_hp_remove_devices (bus); -pci_unlock_rescan_remove (); + bus =eeh_pe_bus_get (pe); +if (bus) +pci_hp_remove_devices (bus); +else +pr_err ("%s: PCI bus for PHB#%x-PE#%x disappeared\n" , + __func__, pe->phb->global_number, pe->addr); +/* The passed PE should no longer be used */ +pci_unlock_rescan_remove ();return ; }
@@ -1114,6 +1123,8 @@ void eeh_handle_normal_event(struct eeh_pe *pe)eeh_clear_slot_attention (edev->pdev);eeh_pe_state_clear (pe,EEH_PE_RECOVERING , true); + +pci_unlock_rescan_remove (); }/**
@@ -1132,6 +1143,7 @@ void eeh_handle_special_event(void)unsigned long flags;int rc; +pci_lock_rescan_remove (); do { rc = eeh_ops->next_error(&pe);
@@ -1171,10 +1183,12 @@ void eeh_handle_special_event(void)break ;case EEH_NEXT_ERR_NONE : +pci_unlock_rescan_remove ();return ;default :pr_warn ("%s: Invalid value %d from next_error()\n" , __func__, rc); +pci_unlock_rescan_remove ();return ; }
@@ -1186,7 +1200,9 @@ void eeh_handle_special_event(void)if (rc ==EEH_NEXT_ERR_FROZEN_PE || rc ==EEH_NEXT_ERR_FENCED_PHB ) {eeh_pe_state_mark (pe,EEH_PE_RECOVERING ); +pci_unlock_rescan_remove ();eeh_handle_normal_event (pe); +pci_lock_rescan_remove (); }else {eeh_for_each_pe (pe, tmp_pe)eeh_pe_for_each_dev (tmp_pe, edev, tmp_edev)
@@ -1199,7 +1215,6 @@ void eeh_handle_special_event(void) eeh_report_failure, NULL);eeh_set_channel_state (pe, pci_channel_io_perm_failure); -pci_lock_rescan_remove ();list_for_each_entry (hose, &hose_list, list_node) { phb_pe =eeh_phb_pe_get (hose); if (!phb_pe ||
@@ -1218,7 +1233,6 @@ void eeh_handle_special_event(void) }pci_hp_remove_devices (bus); } -pci_unlock_rescan_remove (); }/*
@@ -1228,4 +1242,6 @@ void eeh_handle_special_event(void)if (rc ==EEH_NEXT_ERR_DEAD_IOC )break ; }while (rc !=EEH_NEXT_ERR_NONE ); + +pci_unlock_rescan_remove (); }
arch/powerpc/kernel/eeh_pe.c +6 -4
@@ -671,10 +671,12 @@ static void eeh_bridge_check_link(struct eeh_dev *edev) eeh_ops->write_config (edev, cap +PCI_EXP_LNKCTL ,2 , val);/* Check link */ -if (!edev->pdev->link_active_reporting) { -eeh_edev_dbg (edev,"No link reporting capability\n" ); -msleep (1000 ); -return ; +if (edev->pdev) { +if (!edev->pdev->link_active_reporting) { +eeh_edev_dbg (edev,"No link reporting capability\n" ); +msleep (1000 ); +return ; + } }/* Wait the link is up until timeout (5s) */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 506/627 PCI: pnv_php: Fix surprise plug detection and recovery
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timothy Pearson <[email protected]>
[ Upstream commit a2a2a6fc2469524caa713036297c542746d148dc ]
The existing PowerNV hotplug code did not handle surprise plug events correctly, leading to a complete failure of the hotplug system after device removal and a required reboot to detect new devices.
This comes down to two issues:
1) When a device is surprise removed, often the bridge upstream port will cause a PE freeze on the PHB. If this freeze is not cleared, the MSI interrupts from the bridge hotplug notification logic will not be received by the kernel, stalling all plug events on all slots associated with the PE.
2) When a device is removed from a slot, regardless of surprise or programmatic removal, the associated PHB/PE ls left frozen. If this freeze is not cleared via a fundamental reset, skiboot is unable to clear the freeze and cannot retrain / rescan the slot. This also requires a reboot to clear the freeze and redetect the device in the slot.
Issue the appropriate unfreeze and rescan commands on hotplug events, and don't oops on hotplug if pci_bus_to_OF_node() returns NULL.
--- arch/powerpc/kernel/pci-hotplug.c | 3 + drivers/pci/hotplug/pnv_php.c | 110 +++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 3 deletions(-)
arch/powerpc/kernel/pci-hotplug.c +3 -0
@@ -141,6 +141,9 @@ void pci_hp_add_devices(struct pci_bus *bus)struct pci_controller *phb;struct device_node *dn =pci_bus_to_OF_node (bus); +if (!dn) +return ; + phb =pci_bus_to_host (bus); mode =PCI_PROBE_NORMAL ;
drivers/pci/hotplug/pnv_php.c +107 -3
148 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 507/627 tools/power turbostat: regression fix: --show C1E%
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Len Brown <[email protected]>
[ Upstream commit 5d939fbdd480cdf276eccc01eda3ed41e37d3f8a ]
The new default idle counter groupings broke "--show C1E%" (or any other C-state %)
Also delete a stray debug printf from the same offending commit.
--- tools/power/x86/turbostat/turbostat.c | 4 ---- 1 file changed, 4 deletions(-)
tools/power/x86/turbostat/turbostat.c +0 -4
@@ -2429,7 +2429,6 @@ unsigned long long bic_lookup(char *name_list, enum show_hide_mode mode) }if (i ==MAX_BIC ) { -fprintf (stderr,"deferred %s\n" , name_list);if (mode ==SHOW_LIST ) { deferred_add_names[deferred_add_index++] = name_list;if (deferred_add_index >=MAX_DEFERRED ) {
@@ -10537,9 +10536,6 @@ void probe_cpuidle_residency(void)int min_state =1024 , max_state =0 ;char *sp; -if (!DO_BIC (BIC_pct_idle)) -return ; -for (state =10 ; state >=0 ; --state) {sprintf (path,"/sys/devices/system/cpu/cpu%d/cpuidle/state%d/name" , base_cpu, state);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 508/627 pNFS/flexfiles: dont attempt pnfs on fatal DS errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tigran Mkrtchyan <[email protected]>
[ Upstream commit f06bedfa62d57f7b67d44aacd6badad2e13a803f ]
When an applications get killed (SIGTERM/SIGINT) while pNFS client performs a connection to DS, client ends in an infinite loop of connect-disconnect. This
source of the issue, it that flexfilelayoutdev#nfs4_ff_layout_prepare_ds gets an error on nfs4_pnfs_ds_connect with status ERESTARTSYS, which is set by rpc_signal_task, but the error is treated as transient, thus retried.
The issue is reproducible with Ctrl+C the following script(there should be ~1000 files in a directory, client should must not have any connections to DSes):
``` echo 3 > /proc/sys/vm/drop_caches for i in * do head -1 $i done ```
The change aims to propagate the nfs4_ff_layout_prepare_ds error state to the caller that can decide whatever this is a retryable error or not.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 26 ++++++++++++++--------- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +++--- 2 files changed, 19 insertions(+), 13 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +16 -10
@@ -762,14 +762,14 @@ ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg, {struct nfs4_ff_layout_segment *fls =FF_LAYOUT_LSEG (lseg);struct nfs4_ff_layout_mirror *mirror; -struct nfs4_pnfs_ds *ds; +struct nfs4_pnfs_ds *ds =ERR_PTR (-EAGAIN );u32 idx;/* mirrors are initially sorted by efficiency */ for (idx = start_idx; idx < fls->mirror_array_cnt; idx++) { mirror =FF_LAYOUT_COMP (lseg, idx); ds =nfs4_ff_layout_prepare_ds (lseg, mirror, false); -if (!ds) +if (IS_ERR (ds))continue ; if (check_device &&
@@ -777,10 +777,10 @@ ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg,continue ; *best_idx = idx; -return ds; +break ; } -return NULL ; +return ds; } static struct nfs4_pnfs_ds *
@@ -942,7 +942,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio,for (i =0 ; i < pgio->pg_mirror_count; i++) { mirror =FF_LAYOUT_COMP (pgio->pg_lseg, i); ds =nfs4_ff_layout_prepare_ds (pgio->pg_lseg, mirror, true); -if (!ds) { +if (IS_ERR (ds)) {if (!ff_layout_no_fallback_to_mds (pgio->pg_lseg)) goto out_mds;pnfs_generic_pg_cleanup (pgio);
@@ -1867,6 +1867,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)u32 idx = hdr->pgio_mirror_idx;int vers;struct nfs_fh *fh; +bool ds_fatal_error = false; dprintk("--> %s ino %lu pgbase %u req %zu@%llu\n", __func__, hdr->inode->i_ino,
@@ -1874,8 +1875,10 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr) mirror =FF_LAYOUT_COMP (lseg, idx); ds =nfs4_ff_layout_prepare_ds (lseg, mirror, false); -if (!ds) +if (IS_ERR (ds)) { + ds_fatal_error =nfs_error_is_fatal (PTR_ERR (ds)); goto out_failed; + } ds_clnt =nfs4_ff_find_or_create_ds_client (mirror, ds->ds_clp, hdr->inode);
@@ -1923,7 +1926,7 @@ ff_layout_read_pagelist(struct nfs_pgio_header *hdr)return PNFS_ATTEMPTED ; out_failed: -if (ff_layout_avoid_mds_available_ds (lseg)) +if (ff_layout_avoid_mds_available_ds (lseg) && !ds_fatal_error)return PNFS_TRY_AGAIN ; trace_pnfs_mds_fallback_read_pagelist(hdr->inode, hdr->args.offset, hdr->args.count,
@@ -1945,11 +1948,14 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)int vers;struct nfs_fh *fh;u32 idx = hdr->pgio_mirror_idx; +bool ds_fatal_error = false; mirror =FF_LAYOUT_COMP (lseg, idx); ds =nfs4_ff_layout_prepare_ds (lseg, mirror, true); -if (!ds) +if (IS_ERR (ds)) { + ds_fatal_error =nfs_error_is_fatal (PTR_ERR (ds)); goto out_failed; + } ds_clnt =nfs4_ff_find_or_create_ds_client (mirror, ds->ds_clp, hdr->inode);
@@ -2000,7 +2006,7 @@ ff_layout_write_pagelist(struct nfs_pgio_header *hdr, int sync)return PNFS_ATTEMPTED ; out_failed: -if (ff_layout_avoid_mds_available_ds (lseg)) +if (ff_layout_avoid_mds_available_ds (lseg) && !ds_fatal_error)return PNFS_TRY_AGAIN ; trace_pnfs_mds_fallback_write_pagelist(hdr->inode, hdr->args.offset, hdr->args.count,
@@ -2043,7 +2049,7 @@ static int ff_layout_initiate_commit(struct nfs_commit_data *data, int how) idx =calc_ds_index_from_commit (lseg, data->ds_commit_index); mirror =FF_LAYOUT_COMP (lseg, idx); ds =nfs4_ff_layout_prepare_ds (lseg, mirror, true); -if (!ds) +if (IS_ERR (ds)) goto out_err; ds_clnt = nfs4_ff_find_or_create_ds_client(mirror, ds->ds_clp,
fs/nfs/flexfilelayout/flexfilelayoutdev.c +3 -3
@@ -370,11 +370,11 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, struct nfs4_ff_layout_mirror *mirror, bool fail_return) { -struct nfs4_pnfs_ds *ds =NULL ; +struct nfs4_pnfs_ds *ds;struct inode *ino = lseg->pls_layout->plh_inode;struct nfs_server *s =NFS_SERVER (ino);unsigned int max_payload; -int status; +int status = -EAGAIN ;if (!ff_layout_init_mirror_ds (lseg->pls_layout, mirror)) goto noconnect;
@@ -418,7 +418,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg,ff_layout_send_layouterror (lseg);if (fail_return || !ff_layout_has_available_ds (lseg))pnfs_error_mark_layout_for_return (ino, lseg); - ds =NULL ; + ds =ERR_PTR (status); out:return ds; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 509/627 NFS: Fix wakeup of __nfs_lookup_revalidate() in unblock_revalidate()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 1db3a48e83bb64a70bf27263b7002585574a9c2d ]
Use store_release_wake_up() to add the appropriate memory barrier before calling wake_up_var(&dentry->d_fsdata).
--- fs/nfs/dir.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/nfs/dir.c +1 -3
@@ -1828,9 +1828,7 @@ static void block_revalidate(struct dentry *dentry)static void unblock_revalidate (struct dentry *dentry) { -/* store_release ensures wait_var_event() sees the update */ -smp_store_release (&dentry->d_fsdata,NULL ); -wake_up_var (&dentry->d_fsdata); +store_release_wake_up (&dentry->d_fsdata,NULL ); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 510/627 NFS: Fix filehandle bounds checking in nfs_fh_to_dentry()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit ef93a685e01a281b5e2a25ce4e3428cf9371a205 ]
The function needs to check the minimal filehandle length before it can access the embedded filehandle.
--- fs/nfs/export.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/nfs/export.c +9 -2
@@ -66,14 +66,21 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, {struct nfs_fattr *fattr =NULL ;struct nfs_fh *server_fh =nfs_exp_embedfh (fid->raw); -size_t fh_size = offsetof(struct nfs_fh , data) + server_fh->size; +size_t fh_size = offsetof(struct nfs_fh , data);const struct nfs_rpc_ops *rpc_ops;struct dentry *dentry;struct inode *inode; -int len =EMBED_FH_OFF +XDR_QUADLEN (fh_size); +int len =EMBED_FH_OFF ;u32 *p = fid->raw;int ret; +/* Initial check of bounds */ +if (fh_len < len +XDR_QUADLEN (fh_size) || + fh_len >XDR_QUADLEN (NFS_MAXFHSIZE )) +return NULL ; +/* Calculate embedded filehandle size */ + fh_size += server_fh->size; + len +=XDR_QUADLEN (fh_size);/* NULL translates to ESTALE */ if (fh_len < len || fh_type != len)return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 511/627 NFSv4.2: another fix for listxattr
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 9acb237deff7667b0f6b10fe6b1b70c4429ea049 ]
Currently, when the server supports NFS4.1 security labels then security.selinux label in included twice. Instead, only add it when the server doesn't possess security label support.
--- fs/nfs/nfs4proc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/nfs/nfs4proc.c +6 -4
@@ -10867,7 +10867,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {static ssize_t nfs4_listxattr (struct dentry *dentry,char *list,size_t size) { -ssize_t error, error2, error3, error4; +ssize_t error, error2, error3, error4 =0 ;size_t left = size; error =generic_listxattr (dentry, list, left);
@@ -10895,9 +10895,11 @@ static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size) left -= error3; } - error4 =security_inode_listsecurity (d_inode (dentry), list, left); -if (error4 <0 ) -return error4; +if (!nfs_server_capable (d_inode (dentry),NFS_CAP_SECURITY_LABEL )) { + error4 =security_inode_listsecurity (d_inode (dentry), list, left); +if (error4 <0 ) +return error4; + } error += error2 + error3 + error4;if (size && error > size)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 512/627 NFS: Fixup allocation flags for nfsiods __GFP_NORETRY
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit 99765233ab42bf7a4950377ad7894dce8a5c0e60 ]
If the NFS client is doing writeback from a workqueue context, avoid using __GFP_NORETRY for allocations if the task has set PF_MEMALLOC_NOIO or PF_MEMALLOC_NOFS. The combination of these flags makes memory allocation failures much more likely.
We've seen those allocation failures show up when the loopback driver is doing writeback from a workqueue to a file on NFS, where memory allocation failure results in errors or corruption within the loopback device's filesystem.
--- fs/nfs/internal.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/nfs/internal.h +6 -3
@@ -671,9 +671,12 @@ nfs_write_match_verf(const struct nfs_writeverf *verf,static inline gfp_t nfs_io_gfp_mask (void ) { -if (current->flags &PF_WQ_WORKER ) -return GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN; -return GFP_KERNEL ; +gfp_t ret =current_gfp_context (GFP_KERNEL ); + +/* For workers __GFP_NORETRY only with __GFP_IO or __GFP_FS */ +if ((current->flags &PF_WQ_WORKER ) && ret ==GFP_KERNEL ) + ret |= __GFP_NORETRY | __GFP_NOWARN; +return ret; }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 513/627 ARM: s3c/gpio: complete the conversion to new GPIO value setters
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit 3dca3d51b933beb3f35a60472ed2110d1bd7046a ]
Commit fb52f3226cab ("ARM: s3c/gpio: use new line value setter callbacks") correctly changed the assignment of the callback but missed the check one liner higher. Change it now too to using the recommended callback as the legacy one is going away soon.
--- arch/arm/mach-s3c/gpio-samsung.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-s3c/gpio-samsung.c +1 -1
@@ -516,7 +516,7 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip) gc->direction_input = samsung_gpiolib_2bit_input;if (!gc->direction_output) gc->direction_output = samsung_gpiolib_2bit_output; -if (!gc->set) +if (!gc->set_rv) gc->set_rv = samsung_gpiolib_set;if (!gc->get) gc->get = samsung_gpiolib_get;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 514/627 md/md-cluster: handle REMOVE message earlier
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heming Zhao <[email protected]>
[ Upstream commit 948b1fe12005d39e2b49087b50e5ee55c9a8f76f ]
Commit a1fd37f97808 ("md: Don't wait for MD_RECOVERY_NEEDED for HOT_REMOVE_DISK ioctl") introduced a regression in the md_cluster module. (Failed cases 02r1_Manage_re-add & 02r10_Manage_re-add)
Consider a 2-node cluster:
- node1 set faulty & remove command on a disk.
- node2 must correctly update the array metadata.
Before a1fd37f97808, on node1, the delay between msg:METADATA_UPDATED (triggered by faulty) and msg:REMOVE was sufficient for node2 to reload the disk info (written by node1).
After a1fd37f97808, node1 no longer waits between faulty and remove, causing it to send msg:REMOVE while node2 is still reloading disk info. This often results in node2 failing to remove the faulty disk.
== how to trigger ==
set up a 2-node cluster (node1 & node2) with disks vdc & vdd.
on node1:
mdadm -CR /dev/md0 -l1 -b clustered -n2 /dev/vdc /dev/vdd --assume-clean ssh node2-ip mdadm -A /dev/md0 /dev/vdc /dev/vdd
mdadm --manage /dev/md0 --fail /dev/vdc --remove /dev/vdc
check array status on both nodes with "mdadm -D /dev/md0". node1 output:
Number Major Minor RaidDevice State
- 0 0 0 removed
1 254 48 1 active sync /dev/vdd
node2 output:
Number Major Minor RaidDevice State
- 0 0 0 removed
1 254 48 1 active sync /dev/vdd
0 254 32 - faulty /dev/vdc
--- drivers/md/md.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/md/md.c +6 -3
@@ -9768,8 +9768,8 @@ void md_check_recovery(struct mddev *mddev)* remove disk. */ rdev_for_each_safe (rdev, tmp, mddev) { -if (test_and_clear_bit (ClusterRemove, &rdev->flags) && - rdev->raid_disk <0 ) +if (rdev->raid_disk <0 && +test_and_clear_bit (ClusterRemove, &rdev->flags))md_kick_rdev_from_array (rdev); } }
@@ -10075,8 +10075,11 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev)/* Check for change of roles in the active devices */ rdev_for_each_safe (rdev2, tmp, mddev) { -if (test_bit (Faulty, &rdev2->flags)) +if (test_bit (Faulty, &rdev2->flags)) { +if (test_bit (ClusterRemove, &rdev2->flags)) +set_bit (MD_RECOVERY_NEEDED , &mddev->recovery);continue ; + }/* Check if the roles changed */ role =le16_to_cpu (sb->dev_roles[rdev2->desc_nr]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 515/627 kcm: Fix splice support
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Luczaj <[email protected]>
[ Upstream commit 9063de636cee235bd736ab3e4895e2826e606dea ]
Flags passed in for splice() syscall should not end up in skb_recv_datagram(). As SPLICE_F_NONBLOCK == MSG_PEEK, kernel gets
confused: skb isn't unlinked from a receive queue, while strp_msg::offset and strp_msg::full_len are updated.
Unbreak the logic a bit more by mapping both O_NONBLOCK and SPLICE_F_NONBLOCK to MSG_DONTWAIT. This way we align with man splice(2) in regard to errno EAGAIN:
SPLICE_F_NONBLOCK was specified in flags or one of the file descriptors had been marked as nonblocking (O_NONBLOCK), and the operation would block.
--- net/kcm/kcmsock.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/kcm/kcmsock.c +6 -0
@@ -19,6 +19,7 @@#include <linux/rculist.h> #include <linux/skbuff.h> #include <linux/socket.h> +#include <linux/splice.h> #include <linux/uaccess.h> #include <linux/workqueue.h> #include <linux/syscalls.h>
@@ -1030,6 +1031,11 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos,ssize_t copied;struct sk_buff *skb; +if (sock->file->f_flags &O_NONBLOCK || flags &SPLICE_F_NONBLOCK ) + flags =MSG_DONTWAIT ; +else + flags =0 ; +/* Only support splice for SOCKSEQPACKET */ skb =skb_recv_datagram (sk, flags, &err);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 516/627 netpoll: prevent hanging NAPI when netcons gets enabled
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 2da4def0f487f24bbb0cece3bb2bcdcb918a0b72 ]
Paolo spotted hangs in NIPA running driver tests against virtio. The tests hang in virtnet_close() -> virtnet_napi_tx_disable().
The problem is only reproducible if running multiple of our tests in sequence (I used TEST_PROGS="xdp.py ping.py netcons_basic.sh \netpoll_basic.py stats.py"). Initial suspicion was that this is a simple case of double-disable of NAPI, but instrumenting the code reveals:
Deadlocked on NAPI ffff888007cd82c0 (virtnet_poll_tx):
state: 0x37, disabled: false, owner: 0, listed: false, weight: 64
The NAPI was not in fact disabled, owner is 0 (rather than -1), so the NAPI "thinks" it's scheduled for CPU 0 but it's not listed (!list_empty(&n->poll_list) => false). It seems odd that normal NAPI processing would wedge itself like this.
Better suspicion is that netpoll gets enabled while NAPI is polling, and also grabs the NAPI instance. This confuses napi_complete_done():
[netpoll] [normal NAPI]
napi_poll()
have = netpoll_poll_lock()
rcu_access_pointer(dev->npinfo)
return NULL # no netpoll
__napi_poll()
->poll(->weight)
poll_napi()
cmpxchg(->poll_owner, -1, cpu)
poll_one_napi()
set_bit(NAPI_STATE_NPSVC, ->state)
napi_complete_done()
if (NAPIF_STATE_NPSVC)
return false
# exit without clearing SCHEDThis feels very unlikely, but perhaps virtio has some interactions with the hypervisor in the NAPI ->poll that makes the race window larger?
Best I could to to prove the theory was to add and trigger this warning in napi_poll (just before netpoll_poll_unlock()):
WARN_ONCE(!have && rcu_access_pointer(n->dev->npinfo) &&
napi_is_scheduled(n) && list_empty(&n->poll_list),
"NAPI race with netpoll %px", n);If this warning hits the next virtio_close() will hang.
This patch survived 30 test iterations without a hang (without it the longest clean run was around 10). Credit for triggering this goes to Breno's recent netconsole tests.
--- net/core/netpoll.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/core/netpoll.c +7 -0
@@ -831,6 +831,13 @@ int netpoll_setup(struct netpoll *np)if (err) goto flush;rtnl_unlock (); + +/* Make sure all NAPI polls which started before dev->npinfo +* was visible have exited before we start calling NAPI poll. +* NAPI skips locking if dev->npinfo is NULL. +*/ +synchronize_rcu (); +return 0 ; flush:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 517/627 phy: mscc: Fix parsing of unicast frames
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit 6fb5ff63b35b7e849cc8510957f25753f87f63d2 ]
According to the 1588 standard, it is possible to use both unicast and multicast frames to send the PTP information. It was noticed that if the frames were unicast they were not processed by the analyzer meaning that they were not timestamped. Therefore fix this to match also these unicast frames.
--- drivers/net/phy/mscc/mscc_ptp.c | 1 + drivers/net/phy/mscc/mscc_ptp.h | 1 + 2 files changed, 2 insertions(+)
drivers/net/phy/mscc/mscc_ptp.c +1 -0
@@ -900,6 +900,7 @@ static int vsc85xx_eth1_conf(struct phy_device *phydev, enum ts_blk blk, get_unaligned_be32(ptp_multicast)); }else { val |=ANA_ETH1_FLOW_ADDR_MATCH2_ANY_MULTICAST ; + val |=ANA_ETH1_FLOW_ADDR_MATCH2_ANY_UNICAST ;vsc85xx_ts_write_csr (phydev, blk,MSCC_ANA_ETH1_FLOW_ADDR_MATCH2 (0 ), val); vsc85xx_ts_write_csr(phydev, blk,
drivers/net/phy/mscc/mscc_ptp.h +1 -0
@@ -98,6 +98,7 @@#define MSCC_ANA_ETH1_FLOW_ADDR_MATCH2 (x) (MSCC_ANA_ETH1_FLOW_ENA(x) + 3)#define ANA_ETH1_FLOW_ADDR_MATCH2_MASK_MASK GENMASK(22, 20)#define ANA_ETH1_FLOW_ADDR_MATCH2_ANY_MULTICAST 0x400000 +#define ANA_ETH1_FLOW_ADDR_MATCH2_ANY_UNICAST 0x200000#define ANA_ETH1_FLOW_ADDR_MATCH2_FULL_ADDR 0x100000#define ANA_ETH1_FLOW_ADDR_MATCH2_SRC_DEST_MASK GENMASK(17, 16)#define ANA_ETH1_FLOW_ADDR_MATCH2_SRC_DEST 0x020000
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 518/627 net: ipa: add IPA v5.1 and v5.5 to ipa_version_string()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit f2aa00e4f65efcf25ff6bc8198e21f031e7b9b1b ]
Handle the case for v5.1 and v5.5 instead of returning "0.0".
Also reword the comment below since I don't see any evidence of such a check happening, and - since 5.5 has been missing - can happen.
--- drivers/net/ipa/ipa_sysfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ipa/ipa_sysfs.c +5 -1
@@ -37,8 +37,12 @@ static const char *ipa_version_string(struct ipa *ipa)return "4.11" ;case IPA_VERSION_5_0 :return "5.0" ; +case IPA_VERSION_5_1 : +return "5.1" ; +case IPA_VERSION_5_5 : +return "5.5" ;default : -return "0.0" ;/* Won't happen (checked at probe time) */ +return "0.0" ;/* Should not happen */ } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 519/627 net: mdio_bus: Use devm for getting reset GPIO
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bence Csókás <[email protected]>
[ Upstream commit 3b98c9352511db627b606477fc7944b2fa53a165 ]
Commit bafbdd527d56 ("phylib: Add device reset GPIO support") removed devm_gpiod_get_optional() in favor of the non-devres managed fwnode_get_named_gpiod(). When it was kind-of reverted by commit 40ba6a12a548 ("net: mdio: switch to using gpiod_get_optional()"), the devm functionality was not reinstated. Nor was the GPIO unclaimed on device remove. This leads to the GPIO being claimed indefinitely, even when the device and/or the driver gets removed.
--- drivers/net/phy/mdio_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/mdio_bus.c +2 -2
@@ -36,8 +36,8 @@static int mdiobus_register_gpiod (struct mdio_device *mdiodev) {/* Deassert the optional reset signal */ - mdiodev->reset_gpio =gpiod_get_optional (&mdiodev->dev, -"reset" ,GPIOD_OUT_LOW ); + mdiodev->reset_gpio =devm_gpiod_get_optional (&mdiodev->dev, +"reset" ,GPIOD_OUT_LOW );if (IS_ERR (mdiodev->reset_gpio))return PTR_ERR (mdiodev->reset_gpio);
Signature · 1 line
2.39.5
Re: [PATCH 6.16 519/627] net: mdio_bus: Use devm for getting reset GPIO
Hi,
Quoted 16 lines · Greg Kroah-Hartman
6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bence Csókás <[email protected]>
[ Upstream commit
3b98c9352511db627b606477fc7944b2fa53a165]Commit
bafbdd527d56("phylib: Add device reset GPIO support") removeddevm_gpiod_get_optional()in favor of the non-devres managedfwnode_get_named_gpiod(). When it was kind-of reverted by commit40ba6a12a548("net: mdio: switch to usinggpiod_get_optional()"), the devm functionality was not reinstated. Nor was the GPIO unclaimed on device remove. This leads to the GPIO being claimed indefinitely, even when the device and/or the driver gets removed.
Quoted 8 lines
Fixes bafbdd527d56 ("phylib: Add device reset GPIO support")Fixes 40ba6a12a548 ("net: mdio: switch to using gpiod_get_optional()")Cc Csaba Buday <[email protected]>Signed-off-by Bence Csókás <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This was reverted and replaced by:
https://git.kernel.org/netdev/net/c/8ea25274ebaf
Please pick that instead.
Bence
Greg Kroah-Hartman
maintainerRe: [PATCH 6.16 519/627] net: mdio_bus: Use devm for getting reset GPIO
Quoted 28 lines · Csókás Bence
Hi,
Quoted 16 lines · Greg Kroah-Hartman
6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bence Csókás <[email protected]>
[ Upstream commit
3b98c9352511db627b606477fc7944b2fa53a165]Commit
bafbdd527d56("phylib: Add device reset GPIO support") removeddevm_gpiod_get_optional()in favor of the non-devres managedfwnode_get_named_gpiod(). When it was kind-of reverted by commit40ba6a12a548("net: mdio: switch to usinggpiod_get_optional()"), the devm functionality was not reinstated. Nor was the GPIO unclaimed on device remove. This leads to the GPIO being claimed indefinitely, even when the device and/or the driver gets removed.Quoted 8 lines
Fixes bafbdd527d56 ("phylib: Add device reset GPIO support")Fixes 40ba6a12a548 ("net: mdio: switch to using gpiod_get_optional()")Cc Csaba Buday <[email protected]>Signed-off-by Bence Csókás <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 2 lines
This was reverted and replaced by:
https://git.kernel.org/netdev/net/c/8ea25274ebaf
That's not in Linus's tree yet, so I can't take it :(
So I'll just drop this commit for now, thanks.
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 6.16 519/627] net: mdio_bus: Use devm for getting reset GPIO
Quoted 29 lines · Greg Kroah-Hartman
Quoted 28 lines · Csókás Bence
Hi,
Quoted 24 lines · Greg Kroah-Hartman
6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bence Csókás <[email protected]>
[ Upstream commit
3b98c9352511db627b606477fc7944b2fa53a165]Commit
bafbdd527d56("phylib: Add device reset GPIO support") removeddevm_gpiod_get_optional()in favor of the non-devres managedfwnode_get_named_gpiod(). When it was kind-of reverted by commit40ba6a12a548("net: mdio: switch to usinggpiod_get_optional()"), the devm functionality was not reinstated. Nor was the GPIO unclaimed on device remove. This leads to the GPIO being claimed indefinitely, even when the device and/or the driver gets removed.Fixes bafbdd527d56 ("phylib: Add device reset GPIO support")Fixes 40ba6a12a548 ("net: mdio: switch to using gpiod_get_optional()")Cc Csaba Buday <[email protected]>Signed-off-by Bence Csókás <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 6 lines
Quoted 2 lines
This was reverted and replaced by:
https://git.kernel.org/netdev/net/c/8ea25274ebafThat's not in Linus's tree yet, so I can't take it :(
So I'll just drop this commit for now, thanks.
Oops, nope, we took the revert also, so all is good, I'll leave this one in.
Re: [PATCH 6.16 519/627] net: mdio_bus: Use devm for getting reset GPIO
Hi,
Quoted 9 lines · Greg Kroah-Hartman
Quoted 6 lines
Quoted 2 lines
This was reverted and replaced by:
https://git.kernel.org/netdev/net/c/8ea25274ebafThat's not in Linus's tree yet, so I can't take it :(
So I'll just drop this commit for now, thanks.
Oops, nope, we took the revert also, so all is good, I'll leave this one in.
Sure, although I'm not sure what the rationale is behind taking a commit and its revert also, in the same release. Anyways, for the rest of the backport versions, drop this commit and pick 8ea25274ebaf instead (it should land in Linus' tree in the coming week or so). And when you do, don't forget to read its notes at:
https://lore.kernel.org/all/[email protected]/
Bence
Greg Kroah-Hartman
maintainerRe: [PATCH 6.16 519/627] net: mdio_bus: Use devm for getting reset GPIO
Quoted 13 lines · Csókás Bence
Hi,
Quoted 9 lines · Greg Kroah-Hartman
Quoted 6 lines
Quoted 2 lines
This was reverted and replaced by:
https://git.kernel.org/netdev/net/c/8ea25274ebafThat's not in Linus's tree yet, so I can't take it :(
So I'll just drop this commit for now, thanks.
Oops, nope, we took the revert also, so all is good, I'll leave this one in.
Quoted 7 lines
Sure, although I'm not sure what the rationale is behind taking a commit and its revert also, in the same release. Anyways, for the rest of the backport versions, drop this commit and pick
8ea25274ebafinstead (it should land in Linus' tree in the coming week or so). And when you do, don't forget to read its notes at:
Taking a commit and a revert keeps us from adding back the original commit in the future when it is triggered again in our scripts. This just mirrors what's in Linus's tree :)
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 520/627 pptp: ensure minimal skb length in pptp_xmit()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit de9c4861fb42f0cd72da844c3c34f692d5895b7b ]
Commit aabc6596ffb3 ("net: ppp: Add bound checking for skb data on ppp_sync_txmung") fixed ppp_sync_txmunge()
We need a similar fix in pptp_xmit(), otherwise we might read uninit data as reported by syzbot.
BUG: KMSAN: uninit-value in pptp_xmit+0xc34/0x2720 drivers/net/ppp/pptp.c:193 pptp_xmit+0xc34/0x2720 drivers/net/ppp/pptp.c:193 ppp_channel_bridge_input drivers/net/ppp/ppp_generic.c:2290 [inline] ppp_input+0x1d6/0xe60 drivers/net/ppp/ppp_generic.c:2314 pppoe_rcv_core+0x1e8/0x760 drivers/net/ppp/pppoe.c:379 sk_backlog_rcv+0x142/0x420 include/net/sock.h:1148 __release_sock+0x1d3/0x330 net/core/sock.c:3213 release_sock+0x6b/0x270 net/core/sock.c:3767 pppoe_sendmsg+0x15d/0xcb0 drivers/net/ppp/pppoe.c:904 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg+0x330/0x3d0 net/socket.c:727 ____sys_sendmsg+0x893/0xd80 net/socket.c:2566 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2620 __sys_sendmmsg+0x2d9/0x7c0 net/socket.c:2709
--- drivers/net/ppp/pptp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ppp/pptp.c +9 -6
@@ -159,9 +159,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)int len;unsigned char *data;__u32 seq_recv; - - -struct rtable *rt; +struct rtable *rt =NULL ;struct net_device *tdev;struct iphdr *iph;int max_headroom;
@@ -179,16 +177,20 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)if (skb_headroom (skb) < max_headroom ||skb_cloned (skb) ||skb_shared (skb)) {struct sk_buff *new_skb =skb_realloc_headroom (skb, max_headroom); -if (!new_skb) { -ip_rt_put (rt); + +if (!new_skb) goto tx_error; - } +if (skb->sk)skb_set_owner_w (new_skb, skb->sk);consume_skb (skb); skb = new_skb; } +/* Ensure we can safely access protocol field and LCP code */ +if (!pskb_may_pull (skb,3 )) + goto tx_error; + data = skb->data; islcp = ((data[0 ] <<8 ) + data[1 ]) ==PPP_LCP &&1 <= data[2 ] && data[2 ] <=7 ;
@@ -262,6 +264,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)return 1 ; tx_error: +ip_rt_put (rt);kfree_skb (skb);return 1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 521/627 nvmet: initialize discovery subsys after debugfs is initialized
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mohamed Khalfella <[email protected]>
[ Upstream commit 528589947c1802b9357c2a9b96d88cc4a11cd88b ]
During nvme target initialization discovery subsystem is initialized before "nvmet" debugfs directory is created. This results in discovery subsystem debugfs directory to be created in debugfs root directory.
nvmet_init() ->
nvmet_init_discovery() ->
nvmet_subsys_alloc() ->
nvmet_debugfs_subsys_setup()In other words, the codepath above is exeucted before nvmet_debugfs is created. We get /sys/kernel/debug/nqn.2014-08.org.nvmexpress.discovery instead of /sys/kernel/debug/nvmet/nqn.2014-08.org.nvmexpress.discovery. Move nvmet_init_discovery() call after nvmet_init_debugfs() to fix it.
--- drivers/nvme/target/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/nvme/target/core.c +6 -6
@@ -1962,24 +1962,24 @@ static int __init nvmet_init(void)if (!nvmet_wq) goto out_free_buffered_work_queue; - error =nvmet_init_discovery (); + error =nvmet_init_debugfs ();if (error) goto out_free_nvmet_work_queue; - error =nvmet_init_debugfs (); + error =nvmet_init_discovery ();if (error) - goto out_exit_discovery; + goto out_exit_debugfs; error =nvmet_init_configfs ();if (error) - goto out_exit_debugfs; + goto out_exit_discovery;return 0 ; -out_exit_debugfs: -nvmet_exit_debugfs (); out_exit_discovery:nvmet_exit_discovery (); +out_exit_debugfs: +nvmet_exit_debugfs (); out_free_nvmet_work_queue:destroy_workqueue (nvmet_wq); out_free_buffered_work_queue:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 522/627 s390/ap: Unmask SLCF bit in card and queue ap functions sysfs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
[ Upstream commit 123b7c7c2ba725daf3bfa5ce421d65b92cb5c075 ]
The SLCF bit ("stateless command filtering") introduced with CEX8 cards was because of the function mask's default value suppressed when user space read the ap function for an AP card or queue. Unmask this bit so that user space applications like lszcrypt can evaluate and list this feature.
--- arch/s390/include/asm/ap.h | 2 +- drivers/s390/crypto/ap_bus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/include/asm/ap.h +1 -1
@@ -103,7 +103,7 @@ struct ap_tapq_hwinfo { unsigned int accel : 1; /* A */ unsigned int ep11 : 1; /* X */ unsigned int apxa : 1; /* APXA */ - unsigned int : 1; + unsigned int slcf : 1; /* Cmd filtering avail. */ unsigned int class : 8; unsigned int bs : 2; /* SE bind/assoc */ unsigned int : 14;
drivers/s390/crypto/ap_bus.h +1 -1
@@ -180,7 +180,7 @@ struct ap_card {atomic64_t total_request_count;/* # requests ever for this AP device.*/ }; -#define TAPQ_CARD_HWINFO_MASK 0xFEFF0000FFFF0F0FUL +#define TAPQ_CARD_HWINFO_MASK 0xFFFF0000FFFF0F0FUL#define ASSOC_IDX_INVALID 0x10000#define to_ap_card (x) container_of((x), struct ap_card, ap_dev.device)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 523/627 s390/mm: Set high_memory at the end of the identity mapping
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Gordeev <[email protected]>
[ Upstream commit 56f4cfab1c93b14da422cdcd23898eb008033696 ]
The value of high_memory variable is set by set_high_memory() function to a value returned by memblock_end_of_DRAM(). The latter function returns by default the upper bound of the last online memory block, not the upper bound of the directly mapped memory region. As result, in case the end of memory happens to be offline, high_memory variable is set to a value that is short on the last offline memory blocks size:
RANGE SIZE STATE REMOVABLE BLOCK
0x0000000000000000-0x000000ffffffffff 1T online yes 0-511
0x0000010000000000-0x0000011fffffffff 128G offline 512-575
Memory block size: 2G Total online memory: 1T Total offline memory: 128G
crash> p/x vm_layout
$1 = {
kaslr_offset = 0x3453e918000,
kaslr_offset_phys = 0xa534218000,
identity_base = 0x0,
identity_size = 0x12000000000
}
crash> p/x high_memory
$2 = 0x10000000000
In the past the value of high_memory was derived from max_low_pfn, which in turn was derived from the identity_size. Since identity_size accommodates the whole memory size - including tailing offline blocks, the offlined blocks did not impose any problem. But since commit e120d1bc12da ("arch, mm: set high_memory in free_area_init()") the value of high_memory is derived from the last memblock online region, and that is where the problem comes from.
The value of high_memory is used by several drivers and by external tools (e.g. crash tool aborts while loading a dump).
Similarily to ARM, use the override path provided by set_high_memory() function and set the value of high_memory at the end of the identity mapping early. That forces set_high_memory() to leave in high_memory the correct value, even when the end of available memory is offline.
--- arch/s390/kernel/setup.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/s390/kernel/setup.c +6 -0
@@ -719,6 +719,11 @@ static void __init memblock_add_physmem_info(void)memblock_set_node (0 ,ULONG_MAX , &memblock.memory,0 ); } +static void __init setup_high_memory (void ) +{ + high_memory =__va (ident_map_size); +} +/* * Reserve memory used for lowcore. */
@@ -951,6 +956,7 @@ void __init setup_arch(char **cmdline_p)free_physmem_info ();setup_memory_end (); +setup_high_memory ();memblock_dump_all ();setup_memory ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 524/627 netlink: specs: ethtool: fix module EEPROM input/output arguments
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 01051012887329ea78eaca19b1d2eac4c9f601b5 ]
Module (SFP) eeprom GET has a lot of input params, they are all mistakenly listed as output in the spec. Looks like kernel doesn't output them at all. Correct what are the inputs and what the outputs.
--- Documentation/netlink/specs/ethtool.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/netlink/specs/ethtool.yaml +3 -3
@@ -2107,9 +2107,6 @@ operations: do: &module-eeprom-get-op request: - attributes: - - header - reply: attributes: - header - offset
@@ -2117,6 +2114,9 @@ operations: - page - bank - i2c-address + reply: + attributes: + - header - data dump: *module-eeprom-get-op -
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 525/627 block: Fix default IO priority if there is no IO context
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit e2ba58ccc9099514380c3300cbc0750b5055fc1c ]
Upstream commit 53889bcaf536 ("block: make __get_task_ioprio() easier to read") changes the IO priority returned to the caller if no IO context is defined for the task. Prior to this commit, the returned IO priority was determined by task_nice_ioclass() and task_nice_ioprio(). Now it is always IOPRIO_DEFAULT, which translates to IOPRIO_CLASS_NONE with priority
0. However, task_nice_ioclass() returns IOPRIO_CLASS_IDLE, IOPRIO_CLASS_RT, or IOPRIO_CLASS_BE depending on the task scheduling policy, and task_nice_ioprio() returns a value determined by task_nice(). This causes regressions in test code checking the IO priority and class of IO operations on tasks with no IO context.
Fix the problem by returning the IO priority calculated from task_nice_ioclass() and task_nice_ioprio() if no IO context is defined to match earlier behavior.
--- include/linux/ioprio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/ioprio.h +2 -1
@@ -60,7 +60,8 @@ static inline int __get_task_ioprio(struct task_struct *p)int prio;if (!ioc) -return IOPRIO_DEFAULT ; +return IOPRIO_PRIO_VALUE (task_nice_ioclass (p), +task_nice_ioprio (p));if (p != current)lockdep_assert_held (&p->alloc_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 526/627 block: ensure discard_granularity is zero when discard is not supported
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit fad6551fcf537375702b9af012508156a16a1ff7 ]
Documentation/ABI/stable/sysfs-block states:
What: /sys/block/<disk>/queue/discard_granularity [...]
A discard_granularity of 0 means that the device does not support discard functionality.
but this got broken when sorting out the block limits updates. Fix this by setting the discard_granularity limit to zero when the combined max_discard_sectors is zero.
--- block/blk-settings.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
block/blk-settings.c +10 -3
@@ -342,12 +342,19 @@ int blk_validate_limits(struct queue_limits *lim) lim->max_discard_sectors =min (lim->max_hw_discard_sectors, lim->max_user_discard_sectors); +/* +* When discard is not supported, discard_granularity should be reported +* as 0 to userspace. +*/ +if (lim->max_discard_sectors) + lim->discard_granularity = +max (lim->discard_granularity, lim->physical_block_size); +else + lim->discard_granularity =0 ; +if (!lim->max_discard_segments) lim->max_discard_segments =1 ; -if (lim->discard_granularity < lim->physical_block_size) - lim->discard_granularity = lim->physical_block_size; -/* * By default there is no limit on the segment boundary alignment, * but if there is one it can't be smaller than the page size as
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 527/627 ASoC: tas2781: Fix the wrong step for TLV on tas2781
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baojun Xu <[email protected]>
[ Upstream commit 9843cf7b6fd6f938c16fde51e86dd0e3ddbefb12 ]
The step for TLV on tas2781, should be 50 (-0.5dB).
--- include/sound/tas2781-tlv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/sound/tas2781-tlv.h +1 -1
@@ -15,7 +15,7 @@#ifndef __TAS2781_TLV_H__#define __TAS2781_TLV_H__ -static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0); +static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 50, 0); static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 528/627 spi: cs42l43: Property entry should be a null-terminated array
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Trimmer <[email protected]>
[ Upstream commit ffcfd071eec7973e58c4ffff7da4cb0e9ca7b667 ]
The software node does not specify a count of property entries, so the array must be null-terminated.
When unterminated, this can lead to a fault in the downstream cs35l56 amplifier driver, because the node parse walks off the end of the array into unknown memory.
--- drivers/spi/spi-cs42l43.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-cs42l43.c +1 -1
@@ -295,7 +295,7 @@ static struct spi_board_info *cs42l43_create_bridge_amp(struct cs42l43_spi *privstruct spi_board_info *info;if (spkid >=0 ) { - props =devm_kmalloc (priv->dev,sizeof (*props),GFP_KERNEL ); + props =devm_kcalloc (priv->dev,2 ,sizeof (*props),GFP_KERNEL );if (!props)return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 529/627 net: airoha: Fix PPE table access in airoha_ppe_debugfs_foe_show()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 38358fa3cc8e16c6862a3e5c5c233f9f652e3a6d ]
In order to avoid any possible race we need to hold the ppe_lock spinlock accessing the hw PPE table. airoha_ppe_foe_get_entry routine is always executed holding ppe_lock except in airoha_ppe_debugfs_foe_show routine. Fix the problem introducing airoha_ppe_foe_get_entry_locked routine.
--- drivers/net/ethernet/airoha/airoha_ppe.c | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
drivers/net/ethernet/airoha/airoha_ppe.c +20 -6
@@ -498,9 +498,11 @@ static void airoha_ppe_foe_flow_stats_update(struct airoha_ppe *ppe,FIELD_PREP (AIROHA_FOE_IB2_NBQ , nbq); } -struct airoha_foe_entry *airoha_ppe_foe_get_entry (struct airoha_ppe *ppe, -u32 hash) +static struct airoha_foe_entry * +airoha_ppe_foe_get_entry_locked (struct airoha_ppe *ppe,u32 hash) { +lockdep_assert_held (&ppe_lock); +if (hash <PPE_SRAM_NUM_ENTRIES ) {u32 *hwe = ppe->foe + hash *sizeof (struct airoha_foe_entry );struct airoha_eth *eth = ppe->eth;
@@ -527,6 +529,18 @@ struct airoha_foe_entry *airoha_ppe_foe_get_entry(struct airoha_ppe *ppe,return ppe->foe + hash *sizeof (struct airoha_foe_entry ); } +struct airoha_foe_entry *airoha_ppe_foe_get_entry (struct airoha_ppe *ppe, +u32 hash) +{ +struct airoha_foe_entry *hwe; + +spin_lock_bh (&ppe_lock); + hwe =airoha_ppe_foe_get_entry_locked (ppe, hash); +spin_unlock_bh (&ppe_lock); + +return hwe; +} +static bool airoha_ppe_foe_compare_entry (struct airoha_flow_table_entry *e,struct airoha_foe_entry *hwe) {
@@ -641,7 +655,7 @@ airoha_ppe_foe_commit_subflow_entry(struct airoha_ppe *ppe,struct airoha_flow_table_entry *f;int type; - hwe_p =airoha_ppe_foe_get_entry (ppe, hash); + hwe_p =airoha_ppe_foe_get_entry_locked (ppe, hash);if (!hwe_p)return -EINVAL ;
@@ -693,7 +707,7 @@ static void airoha_ppe_foe_insert_entry(struct airoha_ppe *ppe,spin_lock_bh (&ppe_lock); - hwe =airoha_ppe_foe_get_entry (ppe, hash); + hwe =airoha_ppe_foe_get_entry_locked (ppe, hash);if (!hwe) goto unlock;
@@ -808,7 +822,7 @@ airoha_ppe_foe_flow_l2_entry_update(struct airoha_ppe *ppe,u32 ib1, state;int idle; - hwe =airoha_ppe_foe_get_entry (ppe, iter->hash); + hwe =airoha_ppe_foe_get_entry_locked (ppe, iter->hash);if (!hwe)continue ;
@@ -845,7 +859,7 @@ static void airoha_ppe_foe_flow_entry_update(struct airoha_ppe *ppe,if (e->hash ==0xffff ) goto unlock; - hwe_p =airoha_ppe_foe_get_entry (ppe, e->hash); + hwe_p =airoha_ppe_foe_get_entry_locked (ppe, e->hash);if (!hwe_p) goto unlock;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 530/627 net/mlx5: Correctly set gso_segs when LRO is used
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Paasch <[email protected]>
[ Upstream commit 77bf1c55b2acc7fa3734b14f4561e3d75aea1a90 ]
When gso_segs is left at 0, a number of assumptions will end up being incorrect throughout the stack.
For example, in the GRO-path, we set NAPI_GRO_CB()->count to gso_segs. So, if a non-LRO'ed packet followed by an LRO'ed packet is being processed in GRO, the first one will have NAPI_GRO_CB()->count set to 1 and the next one to 0 (in dev_gro_receive()).
Since commit 531d0d32de3e
("net/mlx5: Correctly set gso_size when LRO is used")
these packets will get merged (as their gso_size now matches). So, we end up in gro_complete() with NAPI_GRO_CB()->count == 1 and thus don't call inet_gro_complete(). Meaning, checksum-validation in tcp_checksum_complete() will fail with a "hw csum failure".
Even before the above mentioned commit, incorrect gso_segs means that other things like TCP's accounting of incoming packets (tp->segs_in, data_segs_in, rcv_ooopack) will be incorrect. Which means that if one does bytes_received/data_segs_in, the result will be bigger than the MTU.
Fix this by initializing gso_segs correctly when LRO is used.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +1 -0
@@ -1567,6 +1567,7 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,unsigned int hdrlen =mlx5e_lro_update_hdr (skb, cqe, cqe_bcnt);skb_shinfo (skb)->gso_size =DIV_ROUND_UP (cqe_bcnt - hdrlen, lro_num_seg); +skb_shinfo (skb)->gso_segs = lro_num_seg;/* Subtract one since we already counted this as one * "regular" packet in mlx5e_complete_rx_cqe() */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 531/627 selftests: avoid using ifconfig
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 7cbd49795d4ca86fba5830084e94fece3b343b79 ]
ifconfig is deprecated and not always present, use ip command instead.
--- tools/testing/selftests/net/vlan_hw_filter.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/testing/selftests/net/vlan_hw_filter.sh +8 -8
@@ -55,10 +55,10 @@ test_vlan0_del_crash_01() { ip netns exec ${NETNS} ip link add bond0 type bond mode 0 ip netns exec ${NETNS} ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter off - ip netns exec ${NETNS} ifconfig bond0 up + ip netns exec ${NETNS} ip link set dev bond0 up ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter on - ip netns exec ${NETNS} ifconfig bond0 down - ip netns exec ${NETNS} ifconfig bond0 up + ip netns exec ${NETNS} ip link set dev bond0 down + ip netns exec ${NETNS} ip link set dev bond0 up ip netns exec ${NETNS} ip link del vlan0 || fail "Please check vlan HW filter function" cleanup }
@@ -68,11 +68,11 @@ test_vlan0_del_crash_02() { setup ip netns exec ${NETNS} ip link add bond0 type bond mode 0 ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter off - ip netns exec ${NETNS} ifconfig bond0 up + ip netns exec ${NETNS} ip link set dev bond0 up ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter on ip netns exec ${NETNS} ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q - ip netns exec ${NETNS} ifconfig bond0 down - ip netns exec ${NETNS} ifconfig bond0 up + ip netns exec ${NETNS} ip link set dev bond0 down + ip netns exec ${NETNS} ip link set dev bond0 up ip netns exec ${NETNS} ip link del vlan0 || fail "Please check vlan HW filter function" cleanup }
@@ -84,9 +84,9 @@ test_vlan0_del_crash_03() { ip netns exec ${NETNS} ip link add bond0 type bond mode 0 ip netns exec ${NETNS} ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter off - ip netns exec ${NETNS} ifconfig bond0 up + ip netns exec ${NETNS} ip link set dev bond0 up ip netns exec ${NETNS} ethtool -K bond0 rx-vlan-filter on - ip netns exec ${NETNS} ifconfig bond0 down + ip netns exec ${NETNS} ip link set dev bond0 down ip netns exec ${NETNS} ip link del vlan0 || fail "Please check vlan HW filter function" cleanup }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 532/627 ipv6: reject malicious packets in ipv6_gso_segment()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d45cf1e7d7180256e17c9ce88e32e8061a7887fe ]
syzbot was able to craft a packet with very long IPv6 extension headers leading to an overflow of skb->transport_header.
This 16bit field has a limited range.
Add skb_reset_transport_header_careful() helper and use it from ipv6_gso_segment()
WARNING: CPU: 0 PID: 5871 at ./include/linux/skbuff.h:3032 skb_reset_transport_header include/linux/skbuff.h:3032 [inline] WARNING: CPU: 0 PID: 5871 at ./include/linux/skbuff.h:3032 ipv6_gso_segment+0x15e2/0x21e0 net/ipv6/ip6_offload.c:151 Modules linked in: CPU: 0 UID: 0 PID: 5871 Comm: syz-executor211 Not tainted 6.16.0-rc6-syzkaller-g7abc678e3084 #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/12/2025 RIP: 0010:skb_reset_transport_header include/linux/skbuff.h:3032 [inline] RIP: 0010:ipv6_gso_segment+0x15e2/0x21e0 net/ipv6/ip6_offload.c:151 Call Trace: <TASK> skb_mac_gso_segment+0x31c/0x640 net/core/gso.c:53 nsh_gso_segment+0x54a/0xe10 net/nsh/nsh.c:110 skb_mac_gso_segment+0x31c/0x640 net/core/gso.c:53 __skb_gso_segment+0x342/0x510 net/core/gso.c:124 skb_gso_segment include/net/gso.h:83 [inline] validate_xmit_skb+0x857/0x11b0 net/core/dev.c:3950 validate_xmit_skb_list+0x84/0x120 net/core/dev.c:4000 sch_direct_xmit+0xd3/0x4b0 net/sched/sch_generic.c:329 __dev_xmit_skb net/core/dev.c:4102 [inline] __dev_queue_xmit+0x17b6/0x3a70 net/core/dev.c:4679
--- include/linux/skbuff.h | 23 +++++++++++++++++++++++ net/ipv6/ip6_offload.c | 4 +++- 2 files changed, 26 insertions(+), 1 deletion(-)
include/linux/skbuff.h +23 -0
@@ -3033,6 +3033,29 @@ static inline void skb_reset_transport_header(struct sk_buff *skb) skb->transport_header = offset; } +/** +* skb_reset_transport_header_careful - conditionally reset transport header +* @skb: buffer to alter +* +* Hardened version of skb_reset_transport_header(). +* +* Returns: true if the operation was a success. +*/ +static inline bool __must_check +skb_reset_transport_header_careful (struct sk_buff *skb) +{ +long offset = skb->data - skb->head; + + if (unlikely(offset != (typeof(skb->transport_header))offset)) +return false; + + if (unlikely(offset == (typeof(skb->transport_header))~0U)) +return false; + + skb->transport_header = offset; +return true; +} +static inline void skb_set_transport_header (struct sk_buff *skb,const int offset) {
net/ipv6/ip6_offload.c +3 -1
@@ -148,7 +148,9 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, ops =rcu_dereference (inet6_offloads[proto]);if (likely (ops && ops->callbacks.gso_segment)) { -skb_reset_transport_header (skb); +if (!skb_reset_transport_header_careful (skb)) + goto out; + segs = ops->callbacks.gso_segment (skb, features);if (!segs) skb->network_header =skb_mac_header (skb) + nhoff - skb->head;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 533/627 net: mdio: mdio-bcm-unimac: Correct rate fallback logic
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit a81649a4efd382497bf3d34a623360263adc6993 ]
When the parent clock is a gated clock which has multiple parents, the clock provider (clk-scmi typically) might return a rate of 0 since there is not one of those particular parent clocks that should be chosen for returning a rate. Prior to ee975351cf0c ("net: mdio: mdio-bcm-unimac:
Manage clock around I/O accesses"), we would not always be passing a clock reference depending upon how mdio-bcm-unimac was instantiated. In that case, we would take the fallback path where the rate is hard coded to 250MHz.
Make sure that we still fallback to using a fixed rate for the divider calculation, otherwise we simply ignore the desired MDIO bus clock frequency which can prevent us from interfacing with Ethernet PHYs properly.
--- drivers/net/mdio/mdio-bcm-unimac.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/mdio/mdio-bcm-unimac.c +2 -3
@@ -209,10 +209,9 @@ static int unimac_mdio_clk_set(struct unimac_mdio_priv *priv)if (ret)return ret; -if (!priv->clk) + rate =clk_get_rate (priv->clk); +if (!rate) rate =250000000 ; -else - rate =clk_get_rate (priv->clk); div = (rate / (2 * priv->clk_freq)) -1 ;if (div & ~MDIO_CLK_DIV_MASK ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 534/627 net: drop UFO packets in udp_rcv_segment()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Liang <[email protected]>
[ Upstream commit d46e51f1c78b9ab9323610feb14238d06d46d519 ]
When sending a packet with virtio_net_hdr to tun device, if the gso_type in virtio_net_hdr is SKB_GSO_UDP and the gso_size is less than udphdr size, below crash may happen.
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:4572! Oops: invalid opcode: 0000 [#1] SMP NOPTI CPU: 0 UID: 0 PID: 62 Comm: mytest Not tainted 6.16.0-rc7 #203 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 RIP: 0010:skb_pull_rcsum+0x8e/0xa0 Code: 00 00 5b c3 cc cc cc cc 8b 93 88 00 00 00 f7 da e8 37 44 38 00 f7 d8 89 83 88 00 00 00 48 8b 83 c8 00 00 00 5b c3 cc cc cc cc <0f> 0b 0f 0b 66 66 2e 0f 1f 84 00 000 RSP: 0018:ffffc900001fba38 EFLAGS: 00000297 RAX: 0000000000000004 RBX: ffff8880040c1000 RCX: ffffc900001fb948 RDX: ffff888003e6d700 RSI: 0000000000000008 RDI: ffff88800411a062 RBP: ffff8880040c1000 R08: 0000000000000000 R09: 0000000000000001 R10: ffff888003606c00 R11: 0000000000000001 R12: 0000000000000000 R13: ffff888004060900 R14: ffff888004050000 R15: ffff888004060900 FS: 000000002406d3c0(0000) GS:ffff888084a19000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000040 CR3: 0000000004007000 CR4: 00000000000006f0 Call Trace: <TASK> udp_queue_rcv_one_skb+0x176/0x4b0 net/ipv4/udp.c:2445 udp_queue_rcv_skb+0x155/0x1f0 net/ipv4/udp.c:2475 udp_unicast_rcv_skb+0x71/0x90 net/ipv4/udp.c:2626 __udp4_lib_rcv+0x433/0xb00 net/ipv4/udp.c:2690 ip_protocol_deliver_rcu+0xa6/0x160 net/ipv4/ip_input.c:205 ip_local_deliver_finish+0x72/0x90 net/ipv4/ip_input.c:233 ip_sublist_rcv_finish+0x5f/0x70 net/ipv4/ip_input.c:579 ip_sublist_rcv+0x122/0x1b0 net/ipv4/ip_input.c:636 ip_list_rcv+0xf7/0x130 net/ipv4/ip_input.c:670 __netif_receive_skb_list_core+0x21d/0x240 net/core/dev.c:6067 netif_receive_skb_list_internal+0x186/0x2b0 net/core/dev.c:6210 napi_complete_done+0x78/0x180 net/core/dev.c:6580 tun_get_user+0xa63/0x1120 drivers/net/tun.c:1909 tun_chr_write_iter+0x65/0xb0 drivers/net/tun.c:1984 vfs_write+0x300/0x420 fs/read_write.c:593 ksys_write+0x60/0xd0 fs/read_write.c:686 do_syscall_64+0x50/0x1c0 arch/x86/entry/syscall_64.c:63 </TASK>
To trigger gso segment in udp_queue_rcv_skb(), we should also set option UDP_ENCAP_ESPINUDP to enable udp_sk(sk)->encap_rcv. When the encap_rcv hook return 1 in udp_queue_rcv_one_skb(), udp_csum_pull_header() will try to pull udphdr, but the skb size has been segmented to gso size, which leads to this crash.
Previous commit cf329aa42b66 ("udp: cope with UDP GRO packet misdirection") introduces segmentation in UDP receive path only for GRO, which was never intended to be used for UFO, so drop UFO packets in udp_rcv_segment().
--- include/net/udp.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
include/net/udp.h +18 -6
@@ -587,6 +587,16 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk, {netdev_features_t features =NETIF_F_SG ;struct sk_buff *segs; +int drop_count; + +/* +* Segmentation in UDP receive path is only for UDP GRO, drop udp +* fragmentation offload (UFO) packets. +*/ +if (skb_shinfo (skb)->gso_type &SKB_GSO_UDP ) { + drop_count =1 ; + goto drop; + }/* Avoid csum recalculation by skb_segment unless userspace explicitly * asks for the final checksum values
@@ -610,16 +620,18 @@ static inline struct sk_buff *udp_rcv_segment(struct sock *sk,*/ segs =__skb_gso_segment (skb, features, false);if (IS_ERR_OR_NULL (segs)) { -int segs_nr =skb_shinfo (skb)->gso_segs; - -atomic_add (segs_nr, &sk->sk_drops); -SNMP_ADD_STATS (__UDPX_MIB (sk, ipv4),UDP_MIB_INERRORS , segs_nr); -kfree_skb (skb); -return NULL ; + drop_count =skb_shinfo (skb)->gso_segs; + goto drop; }consume_skb (skb);return segs; + +drop: +atomic_add (drop_count, &sk->sk_drops); +SNMP_ADD_STATS (__UDPX_MIB (sk, ipv4),UDP_MIB_INERRORS , drop_count); +kfree_skb (skb); +return NULL ; }static inline void udp_post_segment_fix_csum (struct sk_buff *skb)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 535/627 net/sched: taprio: enforce minimum value for picos_per_byte
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takamitsu Iwai <[email protected]>
[ Upstream commit ae8508b25def57982493c48694ef135973bfabe0 ]
Syzbot reported a WARNING in taprio_get_start_time().
When link speed is 470,589 or greater, q->picos_per_byte becomes too small, causing length_to_duration(q, ETH_ZLEN) to return zero.
This zero value leads to validation failures in fill_sched_entry() and parse_taprio_schedule(), allowing arbitrary values to be assigned to entry->interval and cycle_time. As a result, sched->cycle can become zero.
Since SPEED_800000 is the largest defined speed in include/uapi/linux/ethtool.h, this issue can occur in realistic scenarios.
To ensure length_to_duration() returns a non-zero value for minimum-sized Ethernet frames (ETH_ZLEN = 60), picos_per_byte must be at least 17 (60 * 17 > PSEC_PER_NSEC which is 1000).
This patch enforces a minimum value of 17 for picos_per_byte when the calculated value would be lower, and adds a warning message to inform users that scheduling accuracy may be affected at very high link speeds.
--- net/sched/sch_taprio.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
net/sched/sch_taprio.c +18 -3
@@ -43,6 +43,11 @@ static struct static_key_false taprio_have_working_mqprio;#define TAPRIO_SUPPORTED_FLAGS \ (TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST | TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD)#define TAPRIO_FLAGS_INVALID U32_MAX +/* Minimum value for picos_per_byte to ensure non-zero duration +* for minimum-sized Ethernet frames (ETH_ZLEN = 60). +* 60 * 17 > PSEC_PER_NSEC (1000) +*/ +#define TAPRIO_PICOS_PER_BYTE_MIN 17struct sched_entry {/* Durations between this GCL entry and the GCL entry where the
@@ -1284,7 +1289,8 @@ static void taprio_start_sched(struct Qdisc *sch, }static void taprio_set_picos_per_byte (struct net_device *dev, -struct taprio_sched *q) +struct taprio_sched *q, +struct netlink_ext_ack *extack) {struct ethtool_link_ksettings ecmd;int speed =SPEED_10 ;
@@ -1300,6 +1306,15 @@ static void taprio_set_picos_per_byte(struct net_device *dev, skip: picos_per_byte = (USEC_PER_SEC *8 ) / speed; +if (picos_per_byte <TAPRIO_PICOS_PER_BYTE_MIN ) { +if (!extack) +pr_warn ("Link speed %d is too high. Schedule may be inaccurate.\n" , + speed); +NL_SET_ERR_MSG_FMT_MOD (extack, +"Link speed %d is too high. Schedule may be inaccurate." , + speed); + picos_per_byte =TAPRIO_PICOS_PER_BYTE_MIN ; + }atomic64_set (&q->picos_per_byte, picos_per_byte); netdev_dbg(dev, "taprio: set %s's picos_per_byte to: %lld, linkspeed: %d\n",
@@ -1324,7 +1339,7 @@ static int taprio_dev_notifier(struct notifier_block *nb, unsigned long event,if (dev !=qdisc_dev (q->root))continue ; -taprio_set_picos_per_byte (dev, q); +taprio_set_picos_per_byte (dev, q,NULL ); stab =rtnl_dereference (q->root->stab);
@@ -1848,7 +1863,7 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, q->flags = taprio_flags;/* Needed for length_to_duration() during netlink attribute parsing */ -taprio_set_picos_per_byte (dev, q); +taprio_set_picos_per_byte (dev, q, extack); err =taprio_parse_mqprio_opt (dev, mqprio, extack, q->flags);if (err <0 )
Signature · 1 line
2.39.5