6.6.33-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 612/744 drm: zynqmp_dpsub: Always register bridge
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit be3f3042391d061cfca2bd22630e0d101acea5fc ]
We must always register the DRM bridge, since zynqmp_dp_hpd_work_func calls drm_bridge_hpd_notify, which in turn expects hpd_mutex to be initialized. We do this before zynqmp_dpsub_drm_init since that calls drm_bridge_attach. This fixes the following lockdep warning:
[ 19.217084] ------------[ cut here ]------------ [ 19.227530] DEBUG_LOCKS_WARN_ON(lock->magic != lock) [ 19.227768] WARNING: CPU: 0 PID: 140 at kernel/locking/mutex.c:582 __mutex_lock+0x4bc/0x550 [ 19.241696] Modules linked in: [ 19.244937] CPU: 0 PID: 140 Comm: kworker/0:4 Not tainted 6.6.20+ #96 [ 19.252046] Hardware name: xlnx,zynqmp (DT) [ 19.256421] Workqueue: events zynqmp_dp_hpd_work_func [ 19.261795] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 19.269104] pc : __mutex_lock+0x4bc/0x550 [ 19.273364] lr : __mutex_lock+0x4bc/0x550 [ 19.277592] sp : ffffffc085c5bbe0 [ 19.281066] x29: ffffffc085c5bbe0 x28: 0000000000000000 x27: ffffff88009417f8 [ 19.288624] x26: ffffff8800941788 x25: ffffff8800020008 x24: ffffffc082aa3000 [ 19.296227] x23: ffffffc080d90e3c x22: 0000000000000002 x21: 0000000000000000 [ 19.303744] x20: 0000000000000000 x19: ffffff88002f5210 x18: 0000000000000000 [ 19.311295] x17: 6c707369642e3030 x16: 3030613464662072 x15: 0720072007200720 [ 19.318922] x14: 0000000000000000 x13: 284e4f5f4e524157 x12: 0000000000000001 [ 19.326442] x11: 0001ffc085c5b940 x10: 0001ff88003f388b x9 : 0001ff88003f3888 [ 19.334003] x8 : 0001ff88003f3888 x7 : 0000000000000000 x6 : 0000000000000000 [ 19.341537] x5 : 0000000000000000 x4 : 0000000000001668 x3 : 0000000000000000 [ 19.349054] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffff88003f3880 [ 19.356581] Call trace: [ 19.359160] __mutex_lock+0x4bc/0x550 [ 19.363032] mutex_lock_nested+0x24/0x30 [ 19.367187] drm_bridge_hpd_notify+0x2c/0x6c [ 19.371698] zynqmp_dp_hpd_work_func+0x44/0x54 [ 19.376364] process_one_work+0x3ac/0x988 [ 19.380660] worker_thread+0x398/0x694 [ 19.384736] kthread+0x1bc/0x1c0 [ 19.388241] ret_from_fork+0x10/0x20 [ 19.392031] irq event stamp: 183 [ 19.395450] hardirqs last enabled at (183): [<ffffffc0800b9278>] finish_task_switch.isra.0+0xa8/0x2d4 [ 19.405140] hardirqs last disabled at (182): [<ffffffc081ad3754>] __schedule+0x714/0xd04 [ 19.413612] softirqs last enabled at (114): [<ffffffc080133de8>] srcu_invoke_callbacks+0x158/0x23c [ 19.423128] softirqs last disabled at (110): [<ffffffc080133de8>] srcu_invoke_callbacks+0x158/0x23c [ 19.432614] ---[ end trace 0000000000000000 ]---
--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +3 -4
@@ -256,12 +256,12 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev)if (ret) goto err_dp; +drm_bridge_add (dpsub->bridge); +if (dpsub->dma_enabled) { ret =zynqmp_dpsub_drm_init (dpsub);if (ret) goto err_disp; - }else { -drm_bridge_add (dpsub->bridge); }dev_info (&pdev->dev,"ZynqMP DisplayPort Subsystem driver probed" );
@@ -288,9 +288,8 @@ static void zynqmp_dpsub_remove(struct platform_device *pdev)if (dpsub->drm)zynqmp_dpsub_drm_cleanup (dpsub); -else -drm_bridge_remove (dpsub->bridge); +drm_bridge_remove (dpsub->bridge);zynqmp_disp_remove (dpsub);zynqmp_dp_remove (dpsub);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 613/744 selftests/powerpc/dexcr: Add -no-pie to hashchk tests
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Gray <[email protected]>
[ Upstream commit d7228a58d9438d6f219dc7f33eab0d1980b3bd2f ]
The hashchk tests want to verify that the hash key is changed over exec. It does so by calculating hashes at the same address across an exec. This is made simpler by disabling PIE functionality, so we can re-execute ourselves and be using the same addresses in the child.
While -fno-pie is already added, -no-pie is also required.
--- tools/testing/selftests/powerpc/dexcr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/powerpc/dexcr/Makefile +1 -1
@@ -3,7 +3,7 @@ TEST_GEN_FILES := lsdexcr include ../../lib.mk -$(OUTPUT)/hashchk_test: CFLAGS += -fno-pie $(call cc-option,-mno-rop-protect) +$(OUTPUT)/hashchk_test: CFLAGS += -fno-pie -no-pie $(call cc-option,-mno-rop-protect) $(TEST_GEN_PROGS): ../harness.c ../utils.c ./dexcr.c $(TEST_GEN_FILES): ../utils.c ./dexcr.c
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 614/744 drm/msm/a6xx: Avoid a nullptr dereference when speedbin setting fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 46d4efcccc688cbacdd70a238bedca510acaa8e4 ]
Calling a6xx_destroy() before adreno_gpu_init() leads to a null pointer dereference on:
msm_gpu_cleanup() : platform_set_drvdata(gpu->pdev, NULL);
as gpu->pdev is only assigned in:
a6xx_gpu_init()
|_ adreno_gpu_init
|_ msm_gpu_init()
Instead of relying on handwavy null checks down the cleanup chain, explicitly de-allocate the LLC data and free a6xx_gpu instead.
Patchwork: https://patchwork.freedesktop.org/patch/588919/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -1
@@ -2343,7 +2343,8 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) ret =a6xx_set_supported_hw (&pdev->dev, config->info);if (ret) { -a6xx_destroy (&(a6xx_gpu->base.base)); +a6xx_llc_slices_destroy (a6xx_gpu); +kfree (a6xx_gpu);return ERR_PTR (ret); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 615/744 ASoC: tas2781: Fix a warning reported by robot kernel test
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shenghao Ding <[email protected]>
[ Upstream commit 1ae14f3520b1a0ad144610a3f592c81a3e81cd1b ]
Fix a warning reported by robot kernel test that 'fw_entry' in function 'tas2781_load_calibration' is used uninitialized with compiler sh4-linux-gcc (GCC) 13.2.0, an update of copyright and a correction of the comments.
--- sound/soc/codecs/tas2781-fmwlib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/codecs/tas2781-fmwlib.c +3 -3
@@ -1,8 +1,8 @@// SPDX-License-Identifier: GPL-2.0 // -// tasdevice-fmw.c -- TASDEVICE firmware support +// tas2781-fmwlib.c -- TASDEVICE firmware support // -// Copyright 2023 Texas Instruments, Inc. +// Copyright 2023 - 2024 Texas Instruments, Inc. // // Author: Shenghao Ding <[email protected]>
@@ -1908,7 +1908,7 @@ int tas2781_load_calibration(void *context, char *file_name, {struct tasdevice_priv *tas_priv = (struct tasdevice_priv *)context;struct tasdevice *tasdev = &(tas_priv->tasdevice[i]); -const struct firmware *fw_entry; +const struct firmware *fw_entry =NULL ;struct tasdevice_fw *tas_fmw;struct firmware fmw;int offset =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 616/744 null_blk: Fix the WARNING: modpost: missing MODULE_DESCRIPTION()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Yanjun <[email protected]>
[ Upstream commit 9e6727f824edcdb8fdd3e6e8a0862eb49546e1cd ]
No functional changes intended.
--- drivers/block/null_blk/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/block/null_blk/main.c +1 -0
@@ -2360,4 +2360,5 @@ module_init(null_init);module_exit (null_exit);MODULE_AUTHOR ("Jens Axboe <[email protected]>" ); +MODULE_DESCRIPTION ("multi queue aware block test driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 617/744 nilfs2: make superblock data array index computation sparse friendly
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 91d743a9c8299de1fc1b47428d8bb4c85face00f ]
Upon running sparse, "warning: dubious: x & !y" is output at an array index calculation within nilfs_load_super_block().
The calculation is not wrong, but to eliminate the sparse warning, replace it with an equivalent calculation.
Also, add a comment to make it easier to understand what the unintuitive array index calculation is doing and whether it's correct.
--- fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
fs/nilfs2/the_nilfs.c +18 -2
@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,struct nilfs_super_block **sbp = nilfs->ns_sbp;struct buffer_head **sbh = nilfs->ns_sbh;u64 sb2off, devsize =bdev_nr_bytes (nilfs->ns_bdev); -int valid[2 ], swp =0 ; +int valid[2 ], swp =0 , older;if (devsize <NILFS_SEG_MIN_BLOCKS *NILFS_MIN_BLOCK_SIZE +4096 ) {nilfs_err (sb,"device size too small" );
@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,if (swp)nilfs_swap_super_block (nilfs); +/* +* Calculate the array index of the older superblock data. +* If one has been dropped, set index 0 pointing to the remaining one, +* otherwise set index 1 pointing to the old one (including if both +* are the same). +* +* Divided case valid[0] valid[1] swp -> older +* ------------------------------------------------------------- +* Both SBs are invalid 0 0 N/A (Error) +* SB1 is invalid 0 1 1 0 +* SB2 is invalid 1 0 0 0 +* SB2 is newer 1 1 1 0 +* SB2 is older or the same 1 1 0 1 +*/ + older = valid[1 ] ^ swp; + nilfs->ns_sbwcount =0 ; nilfs->ns_sbwtime =le64_to_cpu (sbp[0 ]->s_wtime); - nilfs->ns_prot_seq =le64_to_cpu (sbp[valid[1 ] & !swp]->s_last_seq); + nilfs->ns_prot_seq =le64_to_cpu (sbp[older]->s_last_seq); *sbpp = sbp[0 ];return 0 ; }
Signature · 1 line
2.43.0
Re: [PATCH 6.6 617/744] nilfs2: make superblock data array index computation sparse friendly
Quoted 9 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit
91d743a9c8299de1fc1b47428d8bb4c85face00f]
Hi Greg,
I have twice raised the suspicion that this patch should not be eligible for stable backport because it is not a bugfix (it just fixes a false positive sparse warning). And you dropped it the first time [1][2].
[1] https://lkml.kernel.org/r/CAKFNMo=kyzbvfLrTv8JhuY=e7-fkjtpL3DvcQ1r+RUPPeC4S9A@mail.gmail.com
[2] https://lkml.kernel.org/r/CAKFNMontZ54JxOyK0_xy8P_SfpE0swgq9wiPUErnZ-yrO7wOJA@mail.gmail.com
Quoted 8 lines · Greg KH
Quoted 8 lines
This commit fixes the sparse warning output by build "make C=1" with the sparse check, but does not fix any operational bugs.
Therefore, if fixing a harmless sparse warning does not meet the requirements for backporting to stable trees (I assume it does), please drop it as it is a false positive pickup. Sorry if the "Fixes:" tag is confusing.
Quoted 5 lines
Quoted 1 line
The same goes for the same patch queued to other stable-trees.
Now dropped, thanks!
greg k-h
Perhaps due to the confusing Fixes tag, this patch appears to have been picked up again.
Unless the criteria for its inclusion or exclusion have changed, I think this was selected by mistake. Please check.
Thanks,
Ryusuke Konishi
Quoted 66 lines
Upon running sparse, "warning: dubious: x & !y" is output at an array index calculation within
nilfs_load_super_block().The calculation is not wrong, but to eliminate the sparse warning, replace it with an equivalent calculation.
Also, add a comment to make it easier to understand what the unintuitive array index calculation is doing and whether it's correct.
Fixes e339ad31f599 ("nilfs2: introduce secondary super block")Signed-off-by Ryusuke Konishi <[email protected]>Cc Bart Van Assche <[email protected]>Cc Jens Axboe <[email protected]>Cc kernel test robot <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)fs/nilfs2/the_nilfs.c +18
-3@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,struct nilfs_super_block **sbp = nilfs->ns_sbp;struct buffer_head **sbh = nilfs->ns_sbh;u64 sb2off, devsize =bdev_nr_bytes (nilfs->ns_bdev); -int valid[2 ], swp =0 ; +int valid[2 ], swp =0 , older;if (devsize <NILFS_SEG_MIN_BLOCKS *NILFS_MIN_BLOCK_SIZE +4096 ) {nilfs_err (sb,"device size too small" );@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,if (swp)nilfs_swap_super_block (nilfs); +/* +* Calculate the array index of the older superblock data. +* If one has been dropped, set index 0 pointing to the remaining one, +* otherwise set index 1 pointing to the old one (including if both +* are the same). +* +* Divided case valid[0] valid[1] swp -> older +* ------------------------------------------------------------- +* Both SBs are invalid 0 0 N/A (Error) +* SB1 is invalid 0 1 1 0 +* SB2 is invalid 1 0 0 0 +* SB2 is newer 1 1 1 0 +* SB2 is older or the same 1 1 0 1 +*/ + older = valid[1 ] ^ swp; + nilfs->ns_sbwcount =0 ; nilfs->ns_sbwtime =le64_to_cpu (sbp[0 ]->s_wtime); - nilfs->ns_prot_seq =le64_to_cpu (sbp[valid[1 ] & !swp]->s_last_seq); + nilfs->ns_prot_seq =le64_to_cpu (sbp[older]->s_last_seq); *sbpp = sbp[0 ];return 0 ; } --2.43.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.6 617/744] nilfs2: make superblock data array index computation sparse friendly
Quoted 32 lines · Ryusuke Konishi
Quoted 9 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit
91d743a9c8299de1fc1b47428d8bb4c85face00f]Hi Greg,
I have twice raised the suspicion that this patch should not be eligible for stable backport because it is not a bugfix (it just fixes a false positive sparse warning). And you dropped it the first time [1][2].
[1] https://lkml.kernel.org/r/CAKFNMo=kyzbvfLrTv8JhuY=e7-fkjtpL3DvcQ1r+RUPPeC4S9A@mail.gmail.com
[2] https://lkml.kernel.org/r/CAKFNMontZ54JxOyK0_xy8P_SfpE0swgq9wiPUErnZ-yrO7wOJA@mail.gmail.comQuoted 10 lines · Greg KH
Quoted 9 lines
This commit fixes the sparse warning output by build "make C=1" with the sparse check, but does not fix any operational bugs.
Therefore, if fixing a harmless sparse warning does not meet the requirements for backporting to stable trees (I assume it does), please drop it as it is a false positive pickup. Sorry if the "Fixes:" tag is confusing.
The same goes for the same patch queued to other stable-trees.
Quoted 8 lines
Quoted 3 lines
Now dropped, thanks!
greg k-h
Perhaps due to the confusing Fixes tag, this patch appears to have been picked up again.
Unless the criteria for its inclusion or exclusion have changed, I think this was selected by mistake. Please check.
Yeah, good catch, now dropped, again.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 618/744 ALSA: hda/cs_dsp_ctl: Use private_free for control cleanup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 172811e3a557d8681a5e2d0f871dc04a2d17eb13 ]
Use the control private_free callback to free the associated data block. This ensures that the memory won't leak, whatever way the control gets destroyed.
The original implementation didn't actually remove the ALSA controls in hda_cs_dsp_control_remove(). It only freed the internal tracking structure. This meant it was possible to remove/unload the amp driver while leaving its ALSA controls still present in the soundcard. Obviously attempting to access them could cause segfaults or at least dereferencing stale pointers.
--- sound/pci/hda/hda_cs_dsp_ctl.c | 47 ++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-)
sound/pci/hda/hda_cs_dsp_ctl.c +31 -16
@@ -8,6 +8,7 @@#include <linux/module.h> #include <sound/soc.h> +#include <linux/cleanup.h> #include <linux/firmware/cirrus/cs_dsp.h> #include <linux/firmware/cirrus/wmfw.h> #include "hda_cs_dsp_ctl.h"
@@ -97,11 +98,23 @@ static unsigned int wmfw_convert_flags(unsigned int in)return out; } -static void hda_cs_dsp_add_kcontrol (struct hda_cs_dsp_coeff_ctl *ctl,const char *name) +static void hda_cs_dsp_free_kcontrol (struct snd_kcontrol *kctl) { +struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip (kctl);struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl; + +/* NULL priv to prevent a double-free in hda_cs_dsp_control_remove() */ + cs_ctl->priv =NULL ; +kfree (ctl); +} + +static void hda_cs_dsp_add_kcontrol (struct cs_dsp_coeff_ctl *cs_ctl, +const struct hda_cs_dsp_ctl_info *info, +const char *name) +{struct snd_kcontrol_new kcontrol = {0 };struct snd_kcontrol *kctl; + struct hda_cs_dsp_coeff_ctl *ctl __free(kfree) = NULL;int ret =0 ;if (cs_ctl->len >ADSP_MAX_STD_CTRL_SIZE ) {
@@ -110,6 +123,13 @@ static void hda_cs_dsp_add_kcontrol(struct hda_cs_dsp_coeff_ctl *ctl, const charreturn ; } + ctl =kzalloc (sizeof (*ctl),GFP_KERNEL ); +if (!ctl) +return ; + + ctl->cs_ctl = cs_ctl; + ctl->card = info->card; + kcontrol.name = name; kcontrol.info = hda_cs_dsp_coeff_info; kcontrol.iface =SNDRV_CTL_ELEM_IFACE_MIXER ;
@@ -117,20 +137,22 @@ static void hda_cs_dsp_add_kcontrol(struct hda_cs_dsp_coeff_ctl *ctl, const char kcontrol.get = hda_cs_dsp_coeff_get; kcontrol.put = hda_cs_dsp_coeff_put; -/* Save ctl inside private_data, ctl is owned by cs_dsp, -* and will be freed when cs_dsp removes the control */ kctl =snd_ctl_new1 (&kcontrol, (void *)ctl);if (!kctl)return ; - ret =snd_ctl_add (ctl->card, kctl); + kctl->private_free = hda_cs_dsp_free_kcontrol; + ctl->kctl = kctl; + +/* snd_ctl_add() calls our private_free on error, which will kfree(ctl) */ + cs_ctl->priv =no_free_ptr (ctl); + ret =snd_ctl_add (info->card, kctl);if (ret) {dev_err (cs_ctl->dsp->dev,"Failed to add KControl %s = %d\n" , kcontrol.name, ret);return ; }dev_dbg (cs_ctl->dsp->dev,"Added KControl: %s\n" , kcontrol.name); - ctl->kctl = kctl; } static void hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl,
@@ -138,7 +160,6 @@ static void hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl, {struct cs_dsp *cs_dsp = cs_ctl->dsp;char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ]; -struct hda_cs_dsp_coeff_ctl *ctl;const char *region_name;int ret;
@@ -163,15 +184,7 @@ static void hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl, " %.*s", cs_ctl->subname_len - skip, cs_ctl->subname + skip); } - ctl =kzalloc (sizeof (*ctl),GFP_KERNEL ); -if (!ctl) -return ; - - ctl->cs_ctl = cs_ctl; - ctl->card = info->card; - cs_ctl->priv = ctl; - -hda_cs_dsp_add_kcontrol (ctl, name); +hda_cs_dsp_add_kcontrol (cs_ctl, info, name); }void hda_cs_dsp_add_controls (struct cs_dsp *dsp,const struct hda_cs_dsp_ctl_info *info)
@@ -203,7 +216,9 @@ void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl) {struct hda_cs_dsp_coeff_ctl *ctl = cs_ctl->priv; -kfree (ctl); +/* ctl and kctl may already have been removed by ALSA private_free */ +if (ctl && ctl->kctl) +snd_ctl_remove (ctl->card, ctl->kctl); }EXPORT_SYMBOL_NS_GPL (hda_cs_dsp_control_remove,SND_HDA_CS_DSP_CONTROLS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 619/744 ASoC: cs35l56: Fix to ensure ASP1 registers match cache
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 72a77d7631c6e392677c0134343cf5edcd3a4572 ]
Add a dummy SUPPLY widget connected to the ASP that forces the chip registers to match the regmap cache when the ASP is powered-up.
On a SoundWire system the ASP is free for use as a chip-to-chip interconnect. This can be either for the firmware on multiple CS35L56 to share reference audio; or as a bridge to another device. If it is a firmware interconnect it is owned by the firmware and the Linux driver should avoid writing the registers. However. If it is a bridge then Linux may take over and handle it as a normal codec-to-codec link.
CS35L56 is designed for SDCA and a generic SDCA driver would know nothing about these chip-specific registers. So if the ASP is being used on a SoundWire system the firmware sets up the ASP registers. This means that we can't assume the default state of the ASP registers. But we don't know the initial state that the firmware set them to until after the firmware has been downloaded and booted, which can take several seconds when downloading multiple amps.
To avoid blocking probe() for several seconds waiting for the firmware, the silicon defaults are assumed. This allows the machine driver to setup the ASP configuration during probe() without being blocked. If the ASP is hooked up and used, the SUPPLY widget ensures that the chip registers match what was configured in the regmap cache.
If the machine driver does not hook up the ASP, it is assumed that it won't call any functions to configure the ASP DAI. Therefore the regmap cache will be clean for these registers so a regcache_sync() will not overwrite the chip registers. If the DAI is not hooked up, the dummy SUPPLY widget will not be invoked so it will never force-overwrite the chip registers.
Backport note:
This won't apply cleanly to kernels older than v6.6.
Stable-dep-of: d344873c4cbd ("ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance")
--- include/sound/cs35l56.h | 1 + sound/soc/codecs/cs35l56-shared.c | 41 +++++++++++++++++++++++++++++++ sound/soc/codecs/cs35l56.c | 21 ++++++++++++++++ 3 files changed, 63 insertions(+)
include/sound/cs35l56.h +1 -0
@@ -273,6 +273,7 @@ extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC ];int cs35l56_set_patch (struct cs35l56_base *cs35l56_base); +int cs35l56_force_sync_asp1_registers_from_cache (struct cs35l56_base *cs35l56_base);int cs35l56_mbox_send (struct cs35l56_base *cs35l56_base,unsigned int command);int cs35l56_firmware_shutdown (struct cs35l56_base *cs35l56_base);int cs35l56_wait_for_firmware_boot (struct cs35l56_base *cs35l56_base);
sound/soc/codecs/cs35l56-shared.c +41 -0
47 lines not on this page · raw message
sound/soc/codecs/cs35l56.c +21 -0
@@ -277,6 +277,21 @@ static SOC_VALUE_ENUM_SINGLE_DECL(cs35l56_sdw1tx4_enum,static const struct snd_kcontrol_new sdw1_tx4_mux =SOC_DAPM_ENUM ("SDW1TX4 SRC" , cs35l56_sdw1tx4_enum); +static int cs35l56_asp1_cfg_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); +struct cs35l56_private *cs35l56 =snd_soc_component_get_drvdata (component); + +switch (event) { +case SND_SOC_DAPM_PRE_PMU : +/* Override register values set by firmware boot */ +return cs35l56_force_sync_asp1_registers_from_cache (&cs35l56->base); +default : +return 0 ; + } +} +static int cs35l56_play_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -313,6 +328,9 @@ static const struct snd_soc_dapm_widget cs35l56_dapm_widgets[] = {SND_SOC_DAPM_REGULATOR_SUPPLY ("VDD_B" ,0 ,0 ),SND_SOC_DAPM_REGULATOR_SUPPLY ("VDD_AMP" ,0 ,0 ), +SND_SOC_DAPM_SUPPLY ("ASP1 CFG" ,SND_SOC_NOPM ,0 ,0 , cs35l56_asp1_cfg_event, +SND_SOC_DAPM_PRE_PMU ), +SND_SOC_DAPM_SUPPLY ("PLAY" ,SND_SOC_NOPM ,0 ,0 , cs35l56_play_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -380,6 +398,9 @@ static const struct snd_soc_dapm_route cs35l56_audio_map[] = { { "AMP", NULL, "VDD_B" }, { "AMP", NULL, "VDD_AMP" }, + { "ASP1 Playback", NULL, "ASP1 CFG" }, + { "ASP1 Capture", NULL, "ASP1 CFG" }, + { "ASP1 Playback", NULL, "PLAY" }, { "SDW1 Playback", NULL, "PLAY" },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 620/744 ALSA: hda: cs35l56: Initialize all ASP1 registers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit 856ce8982169acb31a25c5f2ecd2570ab8a6af46 ]
Add ASP1_FRAME_CONTROL1, ASP1_FRAME_CONTROL5 and the ASP1_TX?_INPUT registers to the sequence used to initialize the ASP configuration. Write this sequence to the cache and directly to the registers to ensure that they match.
A system-specific firmware can patch these registers to values that are not the silicon default, so that the CS35L56 boots already in the configuration used by Windows or by "driverless" Windows setups such as factory tuning.
These may not match how Linux is configuring the HDA codec. And anyway on Linux the ALSA controls are used to configure routing options.
Stable-dep-of: d344873c4cbd ("ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance")
--- sound/pci/hda/cs35l56_hda.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/pci/hda/cs35l56_hda.c +16 -0
@@ -29,14 +29,23 @@* ASP1_RX_WL = 24 bits per sample * ASP1_TX_WL = 24 bits per sample * ASP1_RXn_EN 1..3 and ASP1_TXn_EN 1..4 disabled +* +* Override any Windows-specific mixer settings applied by the firmware. */ static const struct reg_sequence cs35l56_hda_dai_config[] = { {CS35L56_ASP1_CONTROL1 ,0x00000021 }, {CS35L56_ASP1_CONTROL2 ,0x20200200 }, {CS35L56_ASP1_CONTROL3 ,0x00000003 }, + {CS35L56_ASP1_FRAME_CONTROL1 ,0x03020100 }, + {CS35L56_ASP1_FRAME_CONTROL5 ,0x00020100 }, {CS35L56_ASP1_DATA_CONTROL5 ,0x00000018 }, {CS35L56_ASP1_DATA_CONTROL1 ,0x00000018 }, {CS35L56_ASP1_ENABLES1 ,0x00000000 }, + {CS35L56_ASP1TX1_INPUT ,0x00000018 }, + {CS35L56_ASP1TX2_INPUT ,0x00000019 }, + {CS35L56_ASP1TX3_INPUT ,0x00000020 }, + {CS35L56_ASP1TX4_INPUT ,0x00000028 }, + };static void cs35l56_hda_play (struct cs35l56_hda *cs35l56)
@@ -132,6 +141,10 @@ static int cs35l56_hda_runtime_resume(struct device *dev) } } + ret =cs35l56_force_sync_asp1_registers_from_cache (&cs35l56->base); +if (ret) + goto err; +return 0 ; err:
@@ -969,6 +982,9 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int id)regmap_multi_reg_write (cs35l56->base.regmap, cs35l56_hda_dai_config,ARRAY_SIZE (cs35l56_hda_dai_config)); + ret =cs35l56_force_sync_asp1_registers_from_cache (&cs35l56->base); +if (ret) + goto err;/* * By default only enable one ASP1TXn, where n=amplifier index,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 621/744 ALSA: hda: cs35l56: Fix lifetime of cs_dsp instance
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
[ Upstream commit d344873c4cbde249b7152d36a273bcc45864001e ]
The cs_dsp instance is initialized in the driver probe() so it should be freed in the driver remove(). Also fix a missing call to cs_dsp_remove() in the error path of cs35l56_hda_common_probe().
The call to cs_dsp_remove() was being done in the component unbind callback cs35l56_hda_unbind(). This meant that if the driver was unbound and then re-bound it would be using an uninitialized cs_dsp instance.
It is best to initialize the cs_dsp instance in probe() so that it can return an error if it fails. The component binding API doesn't have any error handling so there's no way to handle a failure if cs_dsp was initialized in the bind.
--- sound/pci/hda/cs35l56_hda.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/pci/hda/cs35l56_hda.c +5 -3
@@ -699,8 +699,6 @@ static void cs35l56_hda_unbind(struct device *dev, struct device *master, void *if (cs35l56->base.fw_patched)cs_dsp_power_down (&cs35l56->cs_dsp); -cs_dsp_remove (&cs35l56->cs_dsp); -if (comps[cs35l56->index].dev == dev)memset (&comps[cs35l56->index],0 ,sizeof (*comps));
@@ -984,7 +982,7 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int id) ARRAY_SIZE(cs35l56_hda_dai_config)); ret =cs35l56_force_sync_asp1_registers_from_cache (&cs35l56->base);if (ret) - goto err; + goto dsp_err;/* * By default only enable one ASP1TXn, where n=amplifier index,
@@ -1010,6 +1008,8 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int id) pm_err:pm_runtime_disable (cs35l56->base.dev); +dsp_err: +cs_dsp_remove (&cs35l56->cs_dsp); err:gpiod_set_value_cansleep (cs35l56->base.reset_gpio,0 );
@@ -1027,6 +1027,8 @@ void cs35l56_hda_remove(struct device *dev)component_del (cs35l56->base.dev, &cs35l56_hda_comp_ops); +cs_dsp_remove (&cs35l56->cs_dsp); +kfree (cs35l56->system_name);pm_runtime_put_noidle (cs35l56->base.dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 622/744 ASoC: mediatek: mt8192: fix register configuration for tdm
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Te Yuan <[email protected]>
[ Upstream commit a85ed162f0efcfdd664954414a05d1d560cc95dc ]
For DSP_A, data is a BCK cycle behind LRCK trigger edge. For DSP_B, this delay doesn't exist. Fix the delay configuration to match the standard.
--- sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8192/mt8192-dai-tdm.c +2 -2
@@ -566,10 +566,10 @@ static int mtk_dai_tdm_hw_params(struct snd_pcm_substream *substream, tdm_con |=1 <<DELAY_DATA_SFT ; tdm_con |=get_tdm_lrck_width (format) <<LRCK_TDM_WIDTH_SFT ; }else if (tdm_priv->tdm_out_mode ==TDM_OUT_DSP_A ) { - tdm_con |=0 <<DELAY_DATA_SFT ; + tdm_con |=1 <<DELAY_DATA_SFT ; tdm_con |=0 <<LRCK_TDM_WIDTH_SFT ; }else if (tdm_priv->tdm_out_mode ==TDM_OUT_DSP_B ) { - tdm_con |=1 <<DELAY_DATA_SFT ; + tdm_con |=0 <<DELAY_DATA_SFT ; tdm_con |=0 <<LRCK_TDM_WIDTH_SFT ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 623/744 nouveau: add an ioctl to return vram bar size.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
[ Upstream commit 3f4d8aac6e768c2215ce68275256971c2f54f0c8 ]
This returns the BAR resources size so userspace can make decisions based on rebar support.
userspace using this has been proposed for nvk, but it's a rather trivial uapi addition.
Stable-dep-of: aed9a1a4f710 ("drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations")
--- drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 ++++ include/uapi/drm/nouveau_drm.h | 7 +++++++ 2 files changed, 11 insertions(+)
drivers/gpu/drm/nouveau/nouveau_abi16.c +4 -0
@@ -204,6 +204,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)struct nouveau_cli *cli =nouveau_cli (file_priv);struct nouveau_drm *drm =nouveau_drm (dev);struct nvif_device *device = &drm->client.device; +struct nvkm_device *nvkm_device =nvxx_device (&drm->client.device);struct nvkm_gr *gr =nvxx_gr (device);struct drm_nouveau_getparam *getparam = data;struct pci_dev *pdev =to_pci_dev (dev->dev);
@@ -268,6 +269,9 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) getparam->value =nouveau_exec_push_max_from_ib_max (ib_max);break ; } +case NOUVEAU_GETPARAM_VRAM_BAR_SIZE : + getparam->value = nvkm_device->func->resource_size (nvkm_device,1 ); +break ;default :NV_PRINTK (dbg, cli,"unknown parameter %lld\n" , getparam->param);return -EINVAL ;
include/uapi/drm/nouveau_drm.h +7 -0
@@ -54,6 +54,13 @@ extern "C" {*/ #define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17 +/* +* NOUVEAU_GETPARAM_VRAM_BAR_SIZE - query bar size +* +* Query the VRAM BAR size. +*/ +#define NOUVEAU_GETPARAM_VRAM_BAR_SIZE 18 +struct drm_nouveau_getparam {__u64 param;__u64 value;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 624/744 nouveau: add an ioctl to report vram usage
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
[ Upstream commit 72fa02fdf83306c52bc1eede28359e3fa32a151a ]
This reports the currently used vram allocations.
userspace using this has been proposed for nvk, but it's a rather trivial uapi addition.
Stable-dep-of: aed9a1a4f710 ("drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations")
--- drivers/gpu/drm/nouveau/nouveau_abi16.c | 5 +++++ include/uapi/drm/nouveau_drm.h | 7 +++++++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/nouveau/nouveau_abi16.c +5 -0
@@ -272,6 +272,11 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)case NOUVEAU_GETPARAM_VRAM_BAR_SIZE : getparam->value = nvkm_device->func->resource_size (nvkm_device,1 );break ; +case NOUVEAU_GETPARAM_VRAM_USED : { +struct ttm_resource_manager *vram_mgr =ttm_manager_type (&drm->ttm.bdev,TTM_PL_VRAM ); + getparam->value = (u64 )ttm_resource_manager_usage (vram_mgr) <<PAGE_SHIFT ; +break ; + }default :NV_PRINTK (dbg, cli,"unknown parameter %lld\n" , getparam->param);return -EINVAL ;
include/uapi/drm/nouveau_drm.h +7 -0
@@ -61,6 +61,13 @@ extern "C" {*/ #define NOUVEAU_GETPARAM_VRAM_BAR_SIZE 18 +/* +* NOUVEAU_GETPARAM_VRAM_USED +* +* Get remaining VRAM size. +*/ +#define NOUVEAU_GETPARAM_VRAM_USED 19 +struct drm_nouveau_getparam {__u64 param;__u64 value;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 625/744 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mohamed Ahmed <[email protected]>
[ Upstream commit aed9a1a4f7106ff99a882ad06318cebfa71016a2 ]
Allow PTE kind and tile mode on BO create with VM_BIND, and add a GETPARAM to indicate this change. This is needed to support modifiers in NVK and ensure correctness when dealing with the nouveau GL driver.
The userspace modifiers implementation this is for can be found here:
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795
--- drivers/gpu/drm/nouveau/nouveau_abi16.c | 3 ++ drivers/gpu/drm/nouveau/nouveau_bo.c | 44 +++++++++++-------------- include/uapi/drm/nouveau_drm.h | 7 ++++ 3 files changed, 29 insertions(+), 25 deletions(-)
drivers/gpu/drm/nouveau/nouveau_abi16.c +3 -0
@@ -277,6 +277,9 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) getparam->value = (u64 )ttm_resource_manager_usage (vram_mgr) <<PAGE_SHIFT ;break ; } +case NOUVEAU_GETPARAM_HAS_VMA_TILEMODE : + getparam->value =1 ; +break ;default :NV_PRINTK (dbg, cli,"unknown parameter %lld\n" , getparam->param);return -EINVAL ;
drivers/gpu/drm/nouveau/nouveau_bo.c +19 -25
59 lines not on this page · raw message
include/uapi/drm/nouveau_drm.h +7 -0
@@ -68,6 +68,13 @@ extern "C" {*/ #define NOUVEAU_GETPARAM_VRAM_USED 19 +/* +* NOUVEAU_GETPARAM_HAS_VMA_TILEMODE +* +* Query whether tile mode and PTE kind are accepted with VM allocs or not. +*/ +#define NOUVEAU_GETPARAM_HAS_VMA_TILEMODE 20 +struct drm_nouveau_getparam {__u64 param;__u64 value;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 626/744 blk-cgroup: fix list corruption from resetting io stat
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 6da6680632792709cecf2b006f2fe3ca7857e791 ]
Since commit 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()"), each iostat instance is added to blkcg percpu list, so blkcg_reset_stats() can't reset the stat instance by memset(), otherwise the llist may be corrupted.
Fix the issue by only resetting the counter part.
--- block/blk-cgroup.c | 58 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 23 deletions(-)
block/blk-cgroup.c +35 -23
@@ -619,12 +619,45 @@ static void blkg_destroy_all(struct gendisk *disk)spin_unlock_irq (&q->queue_lock); } +static void blkg_iostat_set (struct blkg_iostat *dst,struct blkg_iostat *src) +{ +int i; + +for (i =0 ; i <BLKG_IOSTAT_NR ; i++) { + dst->bytes[i] = src->bytes[i]; + dst->ios[i] = src->ios[i]; + } +} + +static void __blkg_clear_stat (struct blkg_iostat_set *bis) +{ +struct blkg_iostat cur = {0 }; +unsigned long flags; + + flags =u64_stats_update_begin_irqsave (&bis->sync); +blkg_iostat_set (&bis->cur, &cur); +blkg_iostat_set (&bis->last, &cur); +u64_stats_update_end_irqrestore (&bis->sync, flags); +} + +static void blkg_clear_stat (struct blkcg_gq *blkg) +{ +int cpu; + +for_each_possible_cpu (cpu) { +struct blkg_iostat_set *s =per_cpu_ptr (blkg->iostat_cpu, cpu); + +__blkg_clear_stat (s); + } +__blkg_clear_stat (&blkg->iostat); +} +static int blkcg_reset_stats (struct cgroup_subsys_state *css,struct cftype *cftype,u64 val) {struct blkcg *blkcg =css_to_blkcg (css);struct blkcg_gq *blkg; -int i, cpu; +int i;mutex_lock (&blkcg_pol_mutex);spin_lock_irq (&blkcg->lock);
@@ -635,18 +668,7 @@ static int blkcg_reset_stats(struct cgroup_subsys_state *css,* anyway. If you get hit by a race, retry. */ hlist_for_each_entry (blkg, &blkcg->blkg_list, blkcg_node) { -for_each_possible_cpu (cpu) { -struct blkg_iostat_set *bis = -per_cpu_ptr (blkg->iostat_cpu, cpu); -memset (bis,0 ,sizeof (*bis)); - -/* Re-initialize the cleared blkg_iostat_set */ -u64_stats_init (&bis->sync); - bis->blkg = blkg; - } -memset (&blkg->iostat,0 ,sizeof (blkg->iostat)); -u64_stats_init (&blkg->iostat.sync); - +blkg_clear_stat (blkg);for (i =0 ; i <BLKCG_MAX_POLS ; i++) {struct blkcg_policy *pol = blkcg_policy[i];
@@ -949,16 +971,6 @@ void blkg_conf_exit(struct blkg_conf_ctx *ctx) }EXPORT_SYMBOL_GPL (blkg_conf_exit); -static void blkg_iostat_set (struct blkg_iostat *dst,struct blkg_iostat *src) -{ -int i; - -for (i =0 ; i <BLKG_IOSTAT_NR ; i++) { - dst->bytes[i] = src->bytes[i]; - dst->ios[i] = src->ios[i]; - } -} -static void blkg_iostat_add (struct blkg_iostat *dst,struct blkg_iostat *src) {int i;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 627/744 blk-cgroup: fix list corruption from reorder of WRITE ->lqueued
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit d0aac2363549e12cc79b8e285f13d5a9f42fd08e ]
__blkcg_rstat_flush() can be run anytime, especially when blk_cgroup_bio_start is being executed.
If WRITE of ->lqueued is re-ordered with READ of 'bisc->lnode.next' in the loop of __blkcg_rstat_flush(), next_bisc can be assigned with one stat instance being added in blk_cgroup_bio_start(), then the local list in __blkcg_rstat_flush() could be corrupted.
Fix the issue by adding one barrier.
--- block/blk-cgroup.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
block/blk-cgroup.c +10 -0
@@ -1036,6 +1036,16 @@ static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu)struct blkg_iostat cur;unsigned int seq; +/* +* Order assignment of `next_bisc` from `bisc->lnode.next` in +* llist_for_each_entry_safe and clearing `bisc->lqueued` for +* avoiding to assign `next_bisc` with new next pointer added +* in blk_cgroup_bio_start() in case of re-ordering. +* +* The pair barrier is implied in llist_add() in blk_cgroup_bio_start(). +*/ +smp_mb (); +WRITE_ONCE (bisc->lqueued, false);/* fetch the current per-cpu values */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 628/744 blk-cgroup: Properly propagate the iostat update up the hierarchy
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Waiman Long <[email protected]>
[ Upstream commit 9d230c09964e6e18c8f6e4f0d41ee90eef45ec1c ]
During a cgroup_rstat_flush() call, the lowest level of nodes are flushed first before their parents. Since commit 3b8cc6298724 ("blk-cgroup:
Optimize blkcg_rstat_flush()"), iostat propagation was still done to the parent. Grandparent, however, may not get the iostat update if the parent has no blkg_iostat_set queued in its lhead lockless list.
Fix this iostat propagation problem by queuing the parent's global blkg->iostat into one of its percpu lockless lists to make sure that the delta will always be propagated up to the grandparent and so on toward the root blkcg.
Note that successive calls to __blkcg_rstat_flush() are serialized by the cgroup_rstat_lock. So no special barrier is used in the reading and writing of blkg->iostat.lqueued.
--- block/blk-cgroup.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
block/blk-cgroup.c +18 -1
@@ -323,6 +323,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct gendisk *disk, blkg->q = disk->queue;INIT_LIST_HEAD (&blkg->q_node); blkg->blkcg = blkcg; + blkg->iostat.blkg = blkg;#ifdef CONFIG_BLK_CGROUP_PUNT_BIO spin_lock_init (&blkg->async_bio_lock);bio_list_init (&blkg->async_bios);
@@ -1047,6 +1048,8 @@ static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu)smp_mb ();WRITE_ONCE (bisc->lqueued, false); +if (bisc == &blkg->iostat) + goto propagate_up;/* propagate up to parent only */ /* fetch the current per-cpu values */ do {
@@ -1056,10 +1059,24 @@ static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu)blkcg_iostat_update (blkg, &cur, &bisc->last); +propagate_up:/* propagate global delta to parent (unless that's root) */ -if (parent && parent->parent) +if (parent && parent->parent) {blkcg_iostat_update (parent, &blkg->iostat.cur, &blkg->iostat.last); +/* +* Queue parent->iostat to its blkcg's lockless +* list to propagate up to the grandparent if the +* iostat hasn't been queued yet. +*/ +if (!parent->iostat.lqueued) { +struct llist_head *plhead; + + plhead =per_cpu_ptr (parent->blkcg->lhead, cpu); +llist_add (&parent->iostat.lnode, plhead); + parent->iostat.lqueued = true; + } + } }raw_spin_unlock_irqrestore (&blkg_stat_lock, flags); out:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 629/744 regulator: bd71828: Dont overwrite runtime voltages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit 0f9f7c63c415e287cd57b5c98be61eb320dedcfc ]
Some of the regulators on the BD71828 have common voltage setting for RUN/SUSPEND/IDLE/LPSR states. The enable control can be set for each state though.
The driver allows setting the voltage values for these states via device-tree. As a side effect, setting the voltages for SUSPEND/IDLE/LPSR will also change the RUN level voltage which is not desired and can break the system.
The comment in code reflects this behaviour, but it is likely to not make people any happier. The right thing to do is to allow setting the enable/disable state at SUSPEND/IDLE/LPSR via device-tree, but to disallow setting state specific voltages for those regulators.
BUCK1 is a bit different. It only shares the SUSPEND and LPSR state voltages. The former behaviour of allowing to silently overwrite the SUSPEND state voltage by LPSR state voltage is also changed here so that the SUSPEND voltage is prioritized over LPSR voltage.
Prevent setting PMIC state specific voltages for regulators which do not support it.
--- drivers/regulator/bd71828-regulator.c | 58 +-------------------------- 1 file changed, 2 insertions(+), 56 deletions(-)
drivers/regulator/bd71828-regulator.c +2 -56
@@ -206,14 +206,11 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { .suspend_reg = BD71828_REG_BUCK1_SUSP_VOLT, .suspend_mask = BD71828_MASK_BUCK1267_VOLT, .suspend_on_mask = BD71828_MASK_SUSP_EN, - .lpsr_on_mask = BD71828_MASK_LPSR_EN,/* * LPSR voltage is same as SUSPEND voltage. Allow -* setting it so that regulator can be set enabled at -* LPSR state +* only enabling/disabling regulator for LPSR state */ - .lpsr_reg = BD71828_REG_BUCK1_SUSP_VOLT, - .lpsr_mask = BD71828_MASK_BUCK1267_VOLT, + .lpsr_on_mask = BD71828_MASK_LPSR_EN, }, .reg_inits = buck1_inits, .reg_init_amnt = ARRAY_SIZE(buck1_inits),
@@ -288,13 +285,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_BUCK3_VOLT, - .idle_reg = BD71828_REG_BUCK3_VOLT, - .suspend_reg = BD71828_REG_BUCK3_VOLT, - .lpsr_reg = BD71828_REG_BUCK3_VOLT, .run_mask = BD71828_MASK_BUCK3_VOLT, - .idle_mask = BD71828_MASK_BUCK3_VOLT, - .suspend_mask = BD71828_MASK_BUCK3_VOLT, - .lpsr_mask = BD71828_MASK_BUCK3_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -329,13 +320,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_BUCK4_VOLT, - .idle_reg = BD71828_REG_BUCK4_VOLT, - .suspend_reg = BD71828_REG_BUCK4_VOLT, - .lpsr_reg = BD71828_REG_BUCK4_VOLT, .run_mask = BD71828_MASK_BUCK4_VOLT, - .idle_mask = BD71828_MASK_BUCK4_VOLT, - .suspend_mask = BD71828_MASK_BUCK4_VOLT, - .lpsr_mask = BD71828_MASK_BUCK4_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -370,13 +355,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_BUCK5_VOLT, - .idle_reg = BD71828_REG_BUCK5_VOLT, - .suspend_reg = BD71828_REG_BUCK5_VOLT, - .lpsr_reg = BD71828_REG_BUCK5_VOLT, .run_mask = BD71828_MASK_BUCK5_VOLT, - .idle_mask = BD71828_MASK_BUCK5_VOLT, - .suspend_mask = BD71828_MASK_BUCK5_VOLT, - .lpsr_mask = BD71828_MASK_BUCK5_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -493,13 +472,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_LDO1_VOLT, - .idle_reg = BD71828_REG_LDO1_VOLT, - .suspend_reg = BD71828_REG_LDO1_VOLT, - .lpsr_reg = BD71828_REG_LDO1_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -533,13 +506,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_LDO2_VOLT, - .idle_reg = BD71828_REG_LDO2_VOLT, - .suspend_reg = BD71828_REG_LDO2_VOLT, - .lpsr_reg = BD71828_REG_LDO2_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -573,13 +540,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_LDO3_VOLT, - .idle_reg = BD71828_REG_LDO3_VOLT, - .suspend_reg = BD71828_REG_LDO3_VOLT, - .lpsr_reg = BD71828_REG_LDO3_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -614,13 +575,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_LDO4_VOLT, - .idle_reg = BD71828_REG_LDO4_VOLT, - .suspend_reg = BD71828_REG_LDO4_VOLT, - .lpsr_reg = BD71828_REG_LDO4_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -655,13 +610,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {ROHM_DVS_LEVEL_SUSPEND | ROHM_DVS_LEVEL_LPSR, .run_reg = BD71828_REG_LDO5_VOLT, - .idle_reg = BD71828_REG_LDO5_VOLT, - .suspend_reg = BD71828_REG_LDO5_VOLT, - .lpsr_reg = BD71828_REG_LDO5_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -720,9 +669,6 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { .suspend_reg = BD71828_REG_LDO7_VOLT, .lpsr_reg = BD71828_REG_LDO7_VOLT, .run_mask = BD71828_MASK_LDO_VOLT, - .idle_mask = BD71828_MASK_LDO_VOLT, - .suspend_mask = BD71828_MASK_LDO_VOLT, - .lpsr_mask = BD71828_MASK_LDO_VOLT, .idle_on_mask = BD71828_MASK_IDLE_EN, .suspend_on_mask = BD71828_MASK_SUSP_EN, .lpsr_on_mask = BD71828_MASK_LPSR_EN,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 630/744 xen/x86: add extra pages to unpopulated-alloc if available
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
[ Upstream commit a6aa4eb994ee9ced905743817c5de8451d26b911 ]
Commit 262fc47ac174 ('xen/balloon: don't use PV mode extra memory for zone device allocations') removed the addition of the extra memory ranges to the unpopulated range allocator, using those only for the balloon driver.
This forces the unpopulated allocator to attach hotplug ranges even when spare memory (as part of the extra memory ranges) is available. Furthermore, on PVH domains it defeats the purpose of commit 38620fc4e893 ('x86/xen: attempt to inflate the memory balloon on PVH'), as extra memory ranges would only be used to map foreign memory if the kernel is built without XEN_UNPOPULATED_ALLOC support.
Fix this by adding a helpers that adds the extra memory ranges to the list of unpopulated pages, and zeroes the ranges so they are not also consumed by the balloon driver.
This should have been part of 38620fc4e893, hence the fixes tag.
Note the current logic relies on unpopulated_init() (and hence arch_xen_unpopulated_init()) always being called ahead of balloon_init(), so that the extra memory regions are consumed by arch_xen_unpopulated_init().
--- arch/x86/xen/enlighten.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
arch/x86/xen/enlighten.c +33 -0
@@ -382,3 +382,36 @@ void __init xen_add_extra_mem(unsigned long start_pfn, unsigned long n_pfns)memblock_reserve (PFN_PHYS (start_pfn),PFN_PHYS (n_pfns)); } + +#ifdef CONFIG_XEN_UNPOPULATED_ALLOC +int __init arch_xen_unpopulated_init (struct resource **res) +{ +unsigned int i; + +if (!xen_domain ()) +return -ENODEV ; + +/* Must be set strictly before calling xen_free_unpopulated_pages(). */ + *res = &iomem_resource; + +/* +* Initialize with pages from the extra memory regions (see +* arch/x86/xen/setup.c). +*/ +for (i =0 ; i <XEN_EXTRA_MEM_MAX_REGIONS ; i++) { +unsigned int j; + +for (j =0 ; j < xen_extra_mem[i].n_pfns; j++) { +struct page *pg = +pfn_to_page (xen_extra_mem[i].start_pfn + j); + +xen_free_unpopulated_pages (1 , &pg); + } + +/* Zero so region is not also added to the balloon driver. */ + xen_extra_mem[i].n_pfns =0 ; + } + +return 0 ; +} +#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 631/744 perf/arm-dmc620: Fix lockdep assert in ->event_init()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit a4c5a457c6107dfe9dc65a104af1634811396bac ]
for_each_sibling_event() checks leader's ctx but it doesn't have the ctx yet if it's the leader. Like in perf_event_validate_size(), we should skip checking siblings in that case.
--- drivers/perf/arm_dmc620_pmu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/perf/arm_dmc620_pmu.c +6 -3
@@ -542,12 +542,16 @@ static int dmc620_pmu_event_init(struct perf_event *event)if (event->cpu <0 )return -EINVAL ; + hwc->idx =-1 ; + +if (event->group_leader == event) +return 0 ; +/* * We can't atomically disable all HW counters so only one event allowed, * although software events are acceptable. */ -if (event->group_leader != event && - !is_software_event (event->group_leader)) +if (!is_software_event (event->group_leader))return -EINVAL ;for_each_sibling_event (sibling, event->group_leader) {
@@ -556,7 +560,6 @@ static int dmc620_pmu_event_init(struct perf_event *event)return -EINVAL ; } - hwc->idx =-1 ;return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 632/744 x86/kconfig: Select ARCH_WANT_FRAME_POINTERS again when UNWINDER_FRAME_POINTER=y
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 66ee3636eddcc82ab82b539d08b85fb5ac1dff9b ]
It took me some time to understand the purpose of the tricky code at the end of arch/x86/Kconfig.debug.
Without it, the following would be shown:
WARNING: unmet direct dependencies detected for FRAME_POINTER
because
81d387190039 ("x86/kconfig: Consolidate unwinders into multiple choice selection")
removed 'select ARCH_WANT_FRAME_POINTERS'.
The correct and more straightforward approach should have been to move it where 'select FRAME_POINTER' is located.
Several architectures properly handle the conditional selection of ARCH_WANT_FRAME_POINTERS. For example, 'config UNWINDER_FRAME_POINTER' in arch/arm/Kconfig.debug.
--- arch/x86/Kconfig.debug | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/Kconfig.debug +1 -4
@@ -248,6 +248,7 @@ config UNWINDER_ORC config UNWINDER_FRAME_POINTER bool "Frame pointer unwinder" + select ARCH_WANT_FRAME_POINTERS select FRAME_POINTER help This option enables the frame pointer unwinder for unwinding kernel
@@ -271,7 +272,3 @@ config UNWINDER_GUESS overhead. endchoice - -config FRAME_POINTER - depends on !UNWINDER_ORC && !UNWINDER_GUESS - bool
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 633/744 net: Always descend into dsa/ folder with CONFIG_NET_DSA enabled
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit b1fa60ec252fba39130107074becd12d0b3f83ec ]
Stephen reported that he was unable to get the dsa_loop driver to get probed, and the reason ended up being because he had CONFIG_FIXED_PHY=y in his kernel configuration. As Masahiro explained it:
"obj-m += dsa/" means everything under dsa/ must be modular.
If there is a built-in object under dsa/ with CONFIG_NET_DSA=m, you cannot do "obj-$(CONFIG_NET_DSA) += dsa/".
You need to change it back to "obj-y += dsa/".
This was the case here whereby CONFIG_NET_DSA=m, and so the obj-$(CONFIG_FIXED_PHY) += dsa_loop_bdinfo.o rule is not executed and the DSA loop mdio_board info structure is not registered with the kernel, and eventually the device is simply not found.
To preserve the intention of the original commit of limiting the amount of folder descending, conditionally descend into drivers/net/dsa when CONFIG_NET_DSA is enabled.
--- drivers/net/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/Makefile +3 -1
@@ -48,7 +48,9 @@ obj-$(CONFIG_ARCNET) += arcnet/ obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_CAIF) += caif/ obj-$(CONFIG_CAN) += can/ -obj-$(CONFIG_NET_DSA) += dsa/ +ifdef CONFIG_NET_DSA +obj-y += dsa/ +endif obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_HIPPI) += hippi/
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 634/744 ipv6: sr: fix missing sk_buff release in seg6_input_core
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrea Mayer <[email protected]>
[ Upstream commit 5447f9708d9e4c17a647b16a9cb29e9e02820bd9 ]
The seg6_input() function is responsible for adding the SRH into a packet, delegating the operation to the seg6_input_core(). This function uses the skb_cow_head() to ensure that there is sufficient headroom in the sk_buff for accommodating the link-layer header.
In the event that the skb_cow_header() function fails, the seg6_input_core() catches the error but it does not release the sk_buff, which will result in a memory leak.
This issue was introduced in commit af3b5158b89d ("ipv6: sr: fix BUG due to headroom too small after SRH push") and persists even after commit 7a3f5b0de364 ("netfilter: add netfilter hooks to SRv6 data plane"), where the entire seg6_input() code was refactored to deal with netfilter hooks.
The proposed patch addresses the identified memory leak by requiring the seg6_input_core() function to release the sk_buff in the event that skb_cow_head() fails.
--- net/ipv6/seg6_iptunnel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/ipv6/seg6_iptunnel.c +6 -5
@@ -459,10 +459,8 @@ static int seg6_input_core(struct net *net, struct sock *sk,int err; err =seg6_do_srh (skb); -if (unlikely (err)) { -kfree_skb (skb); -return err; - } +if (unlikely (err)) + goto drop; slwt =seg6_lwt_lwtunnel (orig_dst->lwtstate);
@@ -486,7 +484,7 @@ static int seg6_input_core(struct net *net, struct sock *sk, err =skb_cow_head (skb,LL_RESERVED_SPACE (dst->dev));if (unlikely (err)) -return err; + goto drop;if (static_branch_unlikely (&nf_hooks_lwtunnel_enabled)) return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
@@ -494,6 +492,9 @@ static int seg6_input_core(struct net *net, struct sock *sk, skb_dst(skb)->dev, seg6_input_finish);return seg6_input_finish (dev_net (skb->dev),NULL , skb); +drop: +kfree_skb (skb); +return err; }static int seg6_input_nf (struct sk_buff *skb)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 635/744 selftests: net: kill smcrouted in the cleanup logic in amt.sh
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taehee Yoo <[email protected]>
[ Upstream commit cc563e749810f5636451d4b833fbd689899ecdb9 ]
The amt.sh requires smcrouted for multicasting routing. So, it starts smcrouted before forwarding tests. It must be stopped after all tests, but it isn't.
To fix this issue, it kills smcrouted in the cleanup logic.
--- tools/testing/selftests/net/amt.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/testing/selftests/net/amt.sh +7 -1
@@ -77,6 +77,7 @@ readonly LISTENER=$(mktemp -u listener-XXXXXXXX) readonly GATEWAY=$(mktemp -u gateway-XXXXXXXX) readonly RELAY=$(mktemp -u relay-XXXXXXXX) readonly SOURCE=$(mktemp -u source-XXXXXXXX) +readonly SMCROUTEDIR="$(mktemp -d)" ERR=4 err=0
@@ -85,6 +86,11 @@ exit_cleanup() for ns in "$@"; do ip netns delete "${ns}" 2>/dev/null || true done + if [ -f "$SMCROUTEDIR/amt.pid" ]; then + smcpid=$(< $SMCROUTEDIR/amt.pid) + kill $smcpid + fi + rm -rf $SMCROUTEDIR exit $ERR }
@@ -167,7 +173,7 @@ setup_iptables() setup_mcast_routing() { - ip netns exec "${RELAY}" smcrouted + ip netns exec "${RELAY}" smcrouted -P $SMCROUTEDIR/amt.pid ip netns exec "${RELAY}" smcroutectl a relay_src \ 172.17.0.2 239.0.0.1 amtr ip netns exec "${RELAY}" smcroutectl a relay_src \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 636/744 nfc: nci: Fix uninit-value in nci_rx_work
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryosuke Yasuoka <[email protected]>
[ Upstream commit e4a87abf588536d1cdfb128595e6e680af5cf3ed ]
syzbot reported the following uninit-value access issue [1]
nci_rx_work() parses received packet from ndev->rx_q. It should be validated header size, payload size and total packet size before processing the packet. If an invalid packet is detected, it should be silently discarded.
--- net/nfc/nci/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
net/nfc/nci/core.c +14 -1
@@ -1463,6 +1463,19 @@ int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, ndev->ops->n_core_ops); } +static bool nci_valid_size (struct sk_buff *skb) +{ +BUILD_BUG_ON (NCI_CTRL_HDR_SIZE !=NCI_DATA_HDR_SIZE ); +unsigned int hdr_size =NCI_CTRL_HDR_SIZE ; + +if (skb->len < hdr_size || + !nci_plen (skb->data) || + skb->len < hdr_size +nci_plen (skb->data)) { +return false; + } +return true; +} +/* ---- NCI TX Data worker thread ---- */ static void nci_tx_work (struct work_struct *work)
@@ -1516,7 +1529,7 @@ static void nci_rx_work(struct work_struct *work)nfc_send_to_raw_sock (ndev->nfc_dev, skb,RAW_PAYLOAD_NCI ,NFC_DIRECTION_RX ); -if (!nci_plen (skb->data)) { +if (!nci_valid_size (skb)) {kfree_skb (skb);kcov_remote_stop ();break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 637/744 ASoC: tas2552: Add TX path for capturing AUDIO-OUT data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shenghao Ding <[email protected]>
[ Upstream commit 7078ac4fd179a68d0bab448004fcd357e7a45f8d ]
TAS2552 is a Smartamp with I/V sense data, add TX path to support capturing I/V data.
--- sound/soc/codecs/tas2552.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
sound/soc/codecs/tas2552.c +13 -2
@@ -2,7 +2,8 @@/* * tas2552.c - ALSA SoC Texas Instruments TAS2552 Mono Audio Amplifier * -* Copyright (C) 2014 Texas Instruments Incorporated - https://www.ti.com +* Copyright (C) 2014 - 2024 Texas Instruments Incorporated - +* https://www.ti.com * * Author: Dan Murphy <[email protected]> */
@@ -119,12 +120,14 @@ static const struct snd_soc_dapm_widget tas2552_dapm_widgets[] = &tas2552_input_mux_control),SND_SOC_DAPM_AIF_IN ("DAC IN" ,"DAC Playback" ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("ASI OUT" ,"DAC Capture" ,0 ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_DAC ("DAC" ,NULL ,SND_SOC_NOPM ,0 ,0 ),SND_SOC_DAPM_OUT_DRV ("ClassD" ,TAS2552_CFG_2 ,7 ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("PLL" ,TAS2552_CFG_2 ,3 ,0 ,NULL ,0 ),SND_SOC_DAPM_POST ("Post Event" , tas2552_post_event), -SND_SOC_DAPM_OUTPUT ("OUT" ) +SND_SOC_DAPM_OUTPUT ("OUT" ), +SND_SOC_DAPM_INPUT ("DMIC" ) }; static const struct snd_soc_dapm_route tas2552_audio_map[] = {
@@ -134,6 +137,7 @@ static const struct snd_soc_dapm_route tas2552_audio_map[] = { {"ClassD", NULL, "Input selection"}, {"OUT", NULL, "ClassD"}, {"ClassD", NULL, "PLL"}, + {"ASI OUT", NULL, "DMIC"} };#ifdef CONFIG_PM
@@ -538,6 +542,13 @@ static struct snd_soc_dai_driver tas2552_dai[] = { .rates = SNDRV_PCM_RATE_8000_192000, .formats = TAS2552_FORMATS, }, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_192000, + .formats = TAS2552_FORMATS, + }, .ops = &tas2552_speaker_dai_ops, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 638/744 ASoC: tas2781: Fix wrong loading calibrated data sequence
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shenghao Ding <[email protected]>
[ Upstream commit b195acf5266d2dee4067f89345c3e6b88d925311 ]
Calibrated data will be set to default after loading DSP config params, which will cause speaker protection work abnormally. Reload calibrated data after loading DSP config params. Remove declaration of unused API which load calibrated data in wrong sequence, changed the copyright year and correct file name in license
header.
--- include/sound/tas2781-dsp.h | 7 +- sound/soc/codecs/tas2781-fmwlib.c | 103 ++++++++---------------------- sound/soc/codecs/tas2781-i2c.c | 4 +- 3 files changed, 32 insertions(+), 82 deletions(-)
include/sound/tas2781-dsp.h +3 -4
@@ -2,7 +2,7 @@// // ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier // -// Copyright (C) 2022 - 2023 Texas Instruments Incorporated +// Copyright (C) 2022 - 2024 Texas Instruments Incorporated // https://www.ti.com // // The TAS2781 driver implements a flexible and configurable
@@ -13,8 +13,8 @@// Author: Kevin Lu <[email protected]> // -#ifndef __TASDEVICE_DSP_H__ -#define __TASDEVICE_DSP_H__ +#ifndef __TAS2781_DSP_H__ +#define __TAS2781_DSP_H__#define MAIN_ALL_DEVICES 0x0d#define MAIN_DEVICE_A 0x01
@@ -175,7 +175,6 @@ void tasdevice_calbin_remove(void *context);int tasdevice_select_tuningprm_cfg (void *context,int prm,int cfg_no,int rca_conf_no);int tasdevice_prmg_load (void *context,int prm_no); -int tasdevice_prmg_calibdata_load (void *context,int prm_no);void tasdevice_tuning_switch (void *context,int state);int tas2781_load_calibration (void *context,char *file_name,unsigned short i);
sound/soc/codecs/tas2781-fmwlib.c +27 -76
130 lines not on this page · raw message
sound/soc/codecs/tas2781-i2c.c +2 -2
@@ -2,7 +2,7 @@// // ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier // -// Copyright (C) 2022 - 2023 Texas Instruments Incorporated +// Copyright (C) 2022 - 2024 Texas Instruments Incorporated // https://www.ti.com // // The TAS2781 driver implements a flexible and configurable
@@ -412,7 +412,7 @@ static void tasdevice_fw_ready(const struct firmware *fmw, __func__, tas_priv->cal_binaryname[i]); } -tasdevice_prmg_calibdata_load (tas_priv,0 ); +tasdevice_prmg_load (tas_priv,0 ); tas_priv->cur_prog =0 ; out:if (tas_priv->fw_state ==TASDEVICE_DSP_FW_FAIL ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 639/744 NFSv4: Fixup smatch warning for ambiguous return
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit 37ffe06537af3e3ec212e7cbe941046fce0a822f ]
Dan Carpenter reports smatch warning for nfs4_try_migration() when a memory allocation failure results in a zero return value. In this case, a transient allocation failure error will likely be retried the next time the server responds with NFS4ERR_MOVED.
We can fixup the smatch warning with a small refactor: attempt all three allocations before testing and returning on a failure.
--- fs/nfs/nfs4state.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
fs/nfs/nfs4state.c +5 -7
@@ -2117,6 +2117,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred {struct nfs_client *clp = server->nfs_client;struct nfs4_fs_locations *locations =NULL ; +struct nfs_fattr *fattr;struct inode *inode;struct page *page;int status, result;
@@ -2126,19 +2127,16 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred (unsigned long long )server->fsid.minor, clp->cl_hostname); - result =0 ; page =alloc_page (GFP_KERNEL ); locations =kmalloc (sizeof (struct nfs4_fs_locations ),GFP_KERNEL ); -if (page ==NULL || locations ==NULL ) { -dprintk ("<-- %s: no memory\n" , __func__); - goto out; - } - locations->fattr =nfs_alloc_fattr (); -if (locations->fattr ==NULL ) { + fattr =nfs_alloc_fattr (); +if (page ==NULL || locations ==NULL || fattr ==NULL ) {dprintk ("<-- %s: no memory\n" , __func__); + result =0 ; goto out; } + locations->fattr = fattr; inode =d_inode (server->super->s_root); result =nfs4_proc_get_locations (server,NFS_FH (inode), locations, page, cred);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 640/744 nfs: keep server info for remounts
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kaiser <[email protected]>
[ Upstream commit b322bf9e983addedff0894c55e92d58f4d16d92a ]
With newer kernels that use fs_context for nfs mounts, remounts fail with -EINVAL.
$ mount -t nfs -o nolock 10.0.0.1:/tmp/test /mnt/test/ $ mount -t nfs -o remount /mnt/test/ mount: mounting 10.0.0.1:/tmp/test on /mnt/test failed: Invalid argument
For remounts, the nfs server address and port are populated by nfs_init_fs_context and later overwritten with 0x00 bytes by nfs23_parse_monolithic. The remount then fails as the server address is invalid.
Fix this by not overwriting nfs server info in nfs23_parse_monolithic if we're doing a remount.
--- fs/nfs/fs_context.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/nfs/fs_context.c +6 -3
@@ -1111,9 +1111,12 @@ static int nfs23_parse_monolithic(struct fs_context *fc, ctx->acdirmax = data->acdirmax; ctx->need_mount = false; -memcpy (sap, &data->addr,sizeof (data->addr)); - ctx->nfs_server.addrlen =sizeof (data->addr); - ctx->nfs_server.port =ntohs (data->addr.sin_port); +if (!is_remount_fc (fc)) { +memcpy (sap, &data->addr,sizeof (data->addr)); + ctx->nfs_server.addrlen =sizeof (data->addr); + ctx->nfs_server.port =ntohs (data->addr.sin_port); + } +if (sap->ss_family !=AF_INET || !nfs_verify_server_address (sap)) goto out_no_address;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 641/744 sunrpc: fix NFSACL RPC retry on soft mount
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Aloni <[email protected]>
[ Upstream commit 0dc9f430027b8bd9073fdafdfcdeb1a073ab5594 ]
It used to be quite awhile ago since 1b63a75180c6 ('SUNRPC: Refactor rpc_clone_client()'), in 2012, that cl_timeout was copied in so that all mount parameters propagate to NFSACL clients. However since that change, if mount options as follows are given:
soft,timeo=50,retrans=16,vers=3
The resultant NFSACL client receives:
cl_softrtry: 1
cl_timeout: to_initval=60000, to_maxval=60000, to_increment=0, to_retries=2, to_exponential=0These values lead to NFSACL operations not being retried under the condition of transient network outages with soft mount. Instead, getacl call fails after 60 seconds with EIO.
The simple fix is to pass the existing client's cl_timeout as the new client timeout.
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/clnt.c +1 -0
@@ -1056,6 +1056,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old, .authflavor = old->cl_auth->au_flavor, .cred = old->cl_cred, .stats = old->cl_stats, + .timeout = old->cl_timeout, };struct rpc_clnt *clnt;int err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 642/744 rpcrdma: fix handling for RDMA_CM_EVENT_DEVICE_REMOVAL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Aloni <[email protected]>
[ Upstream commit 4836da219781ec510c4c0303df901aa643507a7a ]
Under the scenario of IB device bonding, when bringing down one of the ports, or all ports, we saw xprtrdma entering a non-recoverable state where it is not even possible to complete the disconnect and shut it down the mount, requiring a reboot. Following debug, we saw that transport connect never ended after receiving the RDMA_CM_EVENT_DEVICE_REMOVAL callback.
The DEVICE_REMOVAL callback is irrespective of whether the CM_ID is connected, and ESTABLISHED may not have happened. So need to work with each of these states accordingly.
--- net/sunrpc/xprtrdma/verbs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sunrpc/xprtrdma/verbs.c +5 -1
@@ -244,7 +244,11 @@ rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)case RDMA_CM_EVENT_DEVICE_REMOVAL :pr_info ("rpcrdma: removing device %s for %pISpc\n" , ep->re_id->device->name, sap); - fallthrough; +switch (xchg (&ep->re_connect_status, -ENODEV )) { +case 0 : goto wake_connect_worker; +case 1 : goto disconnected; + } +return 0 ;case RDMA_CM_EVENT_ADDR_CHANGE : ep->re_connect_status = -ENODEV ; goto disconnected;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 643/744 regulator: pickable ranges: dont always cache vsel
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit f4f4276f985a5aac7b310a4ed040b47e275e7591 ]
Some PMICs treat the vsel_reg same as apply-bit. Eg, when voltage range is changed, the new voltage setting is not taking effect until the vsel register is written.
Add a flag 'range_applied_by_vsel' to the regulator desc to indicate this behaviour and to force the vsel value to be written to hardware if range was changed, even if the old selector was same as the new one.
Stable-dep-of: 1ace99d7c7c4 ("regulator: tps6287x: Force writing VSEL bit")
--- drivers/regulator/helpers.c | 43 ++++++++++++++++++++++---------- include/linux/regulator/driver.h | 3 +++ 2 files changed, 33 insertions(+), 13 deletions(-)
drivers/regulator/helpers.c +30 -13
@@ -161,6 +161,32 @@ int regulator_get_voltage_sel_pickable_regmap(struct regulator_dev *rdev) }EXPORT_SYMBOL_GPL (regulator_get_voltage_sel_pickable_regmap); +static int write_separate_vsel_and_range (struct regulator_dev *rdev, +unsigned int sel,unsigned int range) +{ +bool range_updated; +int ret; + + ret =regmap_update_bits_base (rdev->regmap, rdev->desc->vsel_range_reg, + rdev->desc->vsel_range_mask, + range, &range_updated, false, false); +if (ret) +return ret; + +/* +* Some PMICs treat the vsel_reg same as apply-bit. Force it to be +* written if the range changed, even if the old selector was same as +* the new one +*/ +if (rdev->desc->range_applied_by_vsel && range_updated) +return regmap_write_bits (rdev->regmap, + rdev->desc->vsel_reg, + rdev->desc->vsel_mask, sel); + +return regmap_update_bits (rdev->regmap, rdev->desc->vsel_reg, + rdev->desc->vsel_mask, sel); +} +/** * regulator_set_voltage_sel_pickable_regmap - pickable range set_voltage_sel *
@@ -199,21 +225,12 @@ int regulator_set_voltage_sel_pickable_regmap(struct regulator_dev *rdev, range = rdev->desc->linear_range_selectors_bitfield[i]; range <<=ffs (rdev->desc->vsel_range_mask) -1 ; -if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg) { - ret =regmap_update_bits (rdev->regmap, - rdev->desc->vsel_reg, +if (rdev->desc->vsel_reg == rdev->desc->vsel_range_reg) + ret =regmap_update_bits (rdev->regmap, rdev->desc->vsel_reg, rdev->desc->vsel_range_mask | rdev->desc->vsel_mask, sel | range); - }else { - ret =regmap_update_bits (rdev->regmap, - rdev->desc->vsel_range_reg, - rdev->desc->vsel_range_mask, range); -if (ret) -return ret; - - ret =regmap_update_bits (rdev->regmap, rdev->desc->vsel_reg, - rdev->desc->vsel_mask, sel); - } +else + ret =write_separate_vsel_and_range (rdev, sel, range);if (ret)return ret;
include/linux/regulator/driver.h +3 -0
@@ -304,6 +304,8 @@ enum regulator_type {* @vsel_range_reg: Register for range selector when using pickable ranges * and ``regulator_map_*_voltage_*_pickable`` functions. * @vsel_range_mask: Mask for register bitfield used for range selector +* @range_applied_by_vsel: A flag to indicate that changes to vsel_range_reg +* are only effective after vsel_reg is written * @vsel_reg: Register for selector when using ``regulator_map_*_voltage_*`` * @vsel_mask: Mask for register bitfield used for selector * @vsel_step: Specify the resolution of selector stepping when setting
@@ -394,6 +396,7 @@ struct regulator_desc {unsigned int vsel_range_reg;unsigned int vsel_range_mask; +bool range_applied_by_vsel;unsigned int vsel_reg;unsigned int vsel_mask;unsigned int vsel_step;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 644/744 regulator: tps6287x: Force writing VSEL bit
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit 1ace99d7c7c4c801c0660246f741ff846a9b8e3c ]
The data-sheet for TPS6287x-Q1
https://www.ti.com/lit/ds/symlink/tps62873-q1.pdf
states at chapter 9.3.6.1 Output Voltage Range:
"Note that every change to the VRANGE[1:0] bits must be followed by a write to the VSET register, even if the value of the VSET[7:0] bits does not change."
The current implementation of the driver uses the regulator_set_voltage_sel_pickable_regmap() helper which further uses regmap_update_bits() to write the VSET-register. The regmap_update_bits() will not access the hardware if the new register value is same as old. It is worth noting that this is true also when the register is marked volatile, which I can't say is wrong because 'read-mnodify-write'-cycle with a volatile register is in any case something user should carefully consider.
The 'range_applied_by_vsel'-flag in regulator desc was added to force the vsel register upodates by using regmap_write_bits(). This variant will always unconditionally write the bits to the hardware.
It is worth noting that the vsel is now forced to be written to the hardware, whether the range was changed or not. This may cause a performance drop if users are wrtiting same voltage value repeteadly.
It would be possible to read the range register to determine if it was changed, but this would be a performance issue for users who don't use reg cache for vsel.
Always write the VSET register to the hardware regardless the cache.
--- drivers/regulator/tps6287x-regulator.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/tps6287x-regulator.c +1 -0
@@ -115,6 +115,7 @@ static struct regulator_desc tps6287x_reg = { .vsel_mask = 0xFF, .vsel_range_reg = TPS6287X_CTRL2, .vsel_range_mask = TPS6287X_CTRL2_VRANGE, + .range_applied_by_vsel = true, .ramp_reg = TPS6287X_CTRL1, .ramp_mask = TPS6287X_CTRL1_VRAMP, .ramp_delay_table = tps6287x_ramp_table,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 645/744 af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 9841991a446c87f90f66f4b9fee6fe934c1336a2 ]
Billy Jheng Bing-Jhong reported a race between __unix_gc() and queue_oob().
__unix_gc() tries to garbage-collect close()d inflight sockets, and then if the socket has MSG_OOB in unix_sk(sk)->oob_skb, GC will drop the reference and set NULL to it locklessly.
However, the peer socket still can send MSG_OOB message and queue_oob() can update unix_sk(sk)->oob_skb concurrently, leading NULL pointer dereference. [0]
To fix the issue, let's update unix_sk(sk)->oob_skb under the sk_receive_queue's lock and take it everywhere we touch oob_skb.
Note that we defer kfree_skb() in manage_oob() to silence lockdep false-positive (See [1]).
[0]:
BUG: kernel NULL pointer dereference, address: 0000000000000008 PF: supervisor write access in kernel mode PF: error_code(0x0002) - not-present page PGD 8000000009f5e067 P4D 8000000009f5e067 PUD 9f5d067 PMD 0 Oops: 0002 [#1] PREEMPT SMP PTI CPU: 3 PID: 50 Comm: kworker/3:1 Not tainted 6.9.0-rc5-00191-gd091e579b864 #110 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Workqueue: events delayed_fput RIP: 0010:skb_dequeue (./include/linux/skbuff.h:2386 ./include/linux/skbuff.h:2402 net/core/skbuff.c:3847) Code: 39 e3 74 3e 8b 43 10 48 89 ef 83 e8 01 89 43 10 49 8b 44 24 08 49 c7 44 24 08 00 00 00 00 49 8b 14 24 49 c7 04 24 00 00 00 00 <48> 89 42 08 48 89 10 e8 e7 c5 42 00 4c 89 e0 5b 5d 41 5c c3 cc cc RSP: 0018:ffffc900001bfd48 EFLAGS: 00000002 RAX: 0000000000000000 RBX: ffff8880088f5ae8 RCX: 00000000361289f9 RDX: 0000000000000000 RSI: 0000000000000206 RDI: ffff8880088f5b00 RBP: ffff8880088f5b00 R08: 0000000000080000 R09: 0000000000000001 R10: 0000000000000003 R11: 0000000000000001 R12: ffff8880056b6a00 R13: ffff8880088f5280 R14: 0000000000000001 R15: ffff8880088f5a80 FS: 0000000000000000(0000) GS:ffff88807dd80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000008 CR3: 0000000006314000 CR4: 00000000007506f0 PKRU: 55555554 Call Trace: <TASK> unix_release_sock (net/unix/af_unix.c:654) unix_release (net/unix/af_unix.c:1050) __sock_release (net/socket.c:660) sock_close (net/socket.c:1423) __fput (fs/file_table.c:423) delayed_fput (fs/file_table.c:444 (discriminator 3)) process_one_work (kernel/workqueue.c:3259) worker_thread (kernel/workqueue.c:3329 kernel/workqueue.c:3416) kthread (kernel/kthread.c:388) ret_from_fork (arch/x86/kernel/process.c:153) ret_from_fork_asm (arch/x86/entry/entry_64.S:257) </TASK> Modules linked in:
CR2: 0000000000000008
--- net/unix/af_unix.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
net/unix/af_unix.c +22 -6
@@ -2147,13 +2147,15 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *othermaybe_add_creds (skb, sock, other);skb_get (skb); +scm_stat_add (other, skb); + +spin_lock (&other->sk_receive_queue.lock);if (ousk->oob_skb)consume_skb (ousk->oob_skb); -WRITE_ONCE (ousk->oob_skb, skb); +__skb_queue_tail (&other->sk_receive_queue, skb); +spin_unlock (&other->sk_receive_queue.lock); -scm_stat_add (other, skb); -skb_queue_tail (&other->sk_receive_queue, skb);sk_send_sigurg (other);unix_state_unlock (other); other->sk_data_ready (other);
@@ -2538,8 +2540,10 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state)mutex_lock (&u->iolock);unix_state_lock (sk); +spin_lock (&sk->sk_receive_queue.lock);if (sock_flag (sk,SOCK_URGINLINE ) || !u->oob_skb) { +spin_unlock (&sk->sk_receive_queue.lock);unix_state_unlock (sk);mutex_unlock (&u->iolock);return -EINVAL ;
@@ -2551,6 +2555,8 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state)WRITE_ONCE (u->oob_skb,NULL ); elseskb_get (oob_skb ); + +spin_unlock (&sk->sk_receive_queue.lock);unix_state_unlock (sk); chunk = state->recv_actor (oob_skb,0 , chunk, state);
@@ -2579,6 +2585,10 @@ static struct sk_buff *manage_oob(struct sk_buff *skb, struct sock *sk,consume_skb (skb); skb =NULL ; }else { +struct sk_buff *unlinked_skb =NULL ; + +spin_lock (&sk->sk_receive_queue.lock); +if (skb == u->oob_skb) {if (copied) { skb =NULL ;
@@ -2590,13 +2600,19 @@ static struct sk_buff *manage_oob(struct sk_buff *skb, struct sock *sk, }else if (flags &MSG_PEEK ) { skb =NULL ; }else { -skb_unlink (skb, &sk->sk_receive_queue); +__skb_unlink (skb, &sk->sk_receive_queue);WRITE_ONCE (u->oob_skb,NULL ); -if (!WARN_ON_ONCE (skb_unref (skb))) -kfree_skb (skb); + unlinked_skb = skb; skb =skb_peek (&sk->sk_receive_queue); } } + +spin_unlock (&sk->sk_receive_queue.lock); + +if (unlinked_skb) { +WARN_ON_ONCE (skb_unref (unlinked_skb)); +kfree_skb (unlinked_skb); + } }return skb; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 646/744 ipv6: sr: fix memleak in seg6_hmac_init_algo
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit efb9f4f19f8e37fde43dfecebc80292d179f56c6 ]
seg6_hmac_init_algo returns without cleaning up the previous allocations if one fails, so it's going to leak all that memory and the crypto tfms.
Update seg6_hmac_exit to only free the memory when allocated, so we can reuse the code directly.
--- net/ipv6/seg6_hmac.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)
net/ipv6/seg6_hmac.c +28 -14
@@ -354,6 +354,7 @@ static int seg6_hmac_init_algo(void)struct crypto_shash *tfm;struct shash_desc *shash;int i, alg_count, cpu; +int ret = -ENOMEM ; alg_count =ARRAY_SIZE (hmac_algos);
@@ -364,12 +365,14 @@ static int seg6_hmac_init_algo(void) algo = &hmac_algos[i]; algo->tfms = alloc_percpu(struct crypto_shash *);if (!algo->tfms) -return -ENOMEM ; + goto error_out;for_each_possible_cpu (cpu) { tfm =crypto_alloc_shash (algo->name,0 ,0 ); -if (IS_ERR (tfm)) -return PTR_ERR (tfm); +if (IS_ERR (tfm)) { + ret =PTR_ERR (tfm); + goto error_out; + } p_tfm =per_cpu_ptr (algo->tfms, cpu); *p_tfm = tfm; }
@@ -381,18 +384,22 @@ static int seg6_hmac_init_algo(void) algo->shashs = alloc_percpu(struct shash_desc *);if (!algo->shashs) -return -ENOMEM ; + goto error_out;for_each_possible_cpu (cpu) { shash =kzalloc_node (shsize,GFP_KERNEL ,cpu_to_node (cpu));if (!shash) -return -ENOMEM ; + goto error_out; *per_cpu_ptr (algo->shashs, cpu) = shash; } }return 0 ; + +error_out: +seg6_hmac_exit (); +return ret; }int __init seg6_hmac_init (void )
@@ -410,22 +417,29 @@ int __net_init seg6_hmac_net_init(struct net *net)void seg6_hmac_exit (void ) {struct seg6_hmac_algo *algo =NULL ; +struct crypto_shash *tfm; +struct shash_desc *shash;int i, alg_count, cpu; alg_count =ARRAY_SIZE (hmac_algos);for (i =0 ; i < alg_count; i++) { algo = &hmac_algos[i]; -for_each_possible_cpu (cpu) { -struct crypto_shash *tfm; -struct shash_desc *shash; - shash = *per_cpu_ptr (algo->shashs, cpu); -kfree (shash); - tfm = *per_cpu_ptr (algo->tfms, cpu); -crypto_free_shash (tfm); +if (algo->shashs) { +for_each_possible_cpu (cpu) { + shash = *per_cpu_ptr (algo->shashs, cpu); +kfree (shash); + } +free_percpu (algo->shashs); + } + +if (algo->tfms) { +for_each_possible_cpu (cpu) { + tfm = *per_cpu_ptr (algo->tfms, cpu); +crypto_free_shash (tfm); + } +free_percpu (algo->tfms); } -free_percpu (algo->tfms); -free_percpu (algo->shashs); } }EXPORT_SYMBOL (seg6_hmac_exit);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 647/744 regulator: tps6594-regulator: Correct multi-phase configuration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neha Malcom Francis <[email protected]>
[ Upstream commit 74b38cd77d3eb63c6d0ad9cf2ae59812ae54d3ee ]
According to the TPS6594 PMIC Manual (linked) 8.3.2.1.4 Multi-Phase BUCK Regulator Configurations section, the PMIC ignores all the other bucks' except the primary buck's regulator registers. This is BUCK1 for configurations BUCK12, BUCK123 and BUCK1234 while it is BUCK3 for BUCK34. Correct the registers mapped for these configurations accordingly.
--- drivers/regulator/tps6594-regulator.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/regulator/tps6594-regulator.c +8 -8
@@ -287,30 +287,30 @@ static struct tps6594_regulator_irq_type *tps6594_ldos_irq_types[] = {static const struct regulator_desc multi_regs[] = {TPS6594_REGULATOR ("BUCK12" ,"buck12" ,TPS6594_BUCK_1 ,REGULATOR_VOLTAGE , tps6594_bucks_ops,TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_VOUT_1 (1 ), +TPS6594_REG_BUCKX_VOUT_1 (0 ),TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_CTRL (1 ), +TPS6594_REG_BUCKX_CTRL (0 ),TPS6594_BIT_BUCK_EN ,0 ,0 , bucks_ranges,4 ,4000 ,0 ,NULL ,0 ,0 ),TPS6594_REGULATOR ("BUCK34" ,"buck34" ,TPS6594_BUCK_3 ,REGULATOR_VOLTAGE , tps6594_bucks_ops,TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_VOUT_1 (3 ), +TPS6594_REG_BUCKX_VOUT_1 (2 ),TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_CTRL (3 ), +TPS6594_REG_BUCKX_CTRL (2 ),TPS6594_BIT_BUCK_EN ,0 ,0 , bucks_ranges,4 ,0 ,0 ,NULL ,0 ,0 ),TPS6594_REGULATOR ("BUCK123" ,"buck123" ,TPS6594_BUCK_1 ,REGULATOR_VOLTAGE , tps6594_bucks_ops,TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_VOUT_1 (1 ), +TPS6594_REG_BUCKX_VOUT_1 (0 ),TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_CTRL (1 ), +TPS6594_REG_BUCKX_CTRL (0 ),TPS6594_BIT_BUCK_EN ,0 ,0 , bucks_ranges,4 ,4000 ,0 ,NULL ,0 ,0 ),TPS6594_REGULATOR ("BUCK1234" ,"buck1234" ,TPS6594_BUCK_1 ,REGULATOR_VOLTAGE , tps6594_bucks_ops,TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_VOUT_1 (1 ), +TPS6594_REG_BUCKX_VOUT_1 (0 ),TPS6594_MASK_BUCKS_VSET , -TPS6594_REG_BUCKX_CTRL (1 ), +TPS6594_REG_BUCKX_CTRL (0 ),TPS6594_BIT_BUCK_EN ,0 ,0 , bucks_ranges,4 ,4000 ,0 ,NULL ,0 ,0 ), };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 648/744 tcp: Fix shift-out-of-bounds in dctcp_update_alpha().
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 3ebc46ca8675de6378e3f8f40768e180bb8afa66 ]
In dctcp_update_alpha(), we use a module parameter dctcp_shift_g as follows:
alpha -= min_not_zero(alpha, alpha >> dctcp_shift_g); ... delivered_ce <<= (10 - dctcp_shift_g);
It seems syzkaller started fuzzing module parameters and triggered shift-out-of-bounds [0] by setting 100 to dctcp_shift_g:
memcpy((void*)0x20000080,
"/sys/module/tcp_dctcp/parameters/dctcp_shift_g\000", 47);
res = syscall(__NR_openat, /*fd=*/0xffffffffffffff9cul, /*file=*/0x20000080ul,
/*flags=*/2ul, /*mode=*/0ul);
memcpy((void*)0x20000000, "100\000", 4);
syscall(__NR_write, /*fd=*/r[0], /*val=*/0x20000000ul, /*len=*/4ul);Let's limit the max value of dctcp_shift_g by param_set_uint_minmax().
With this patch:
# echo 10 > /sys/module/tcp_dctcp/parameters/dctcp_shift_g # cat /sys/module/tcp_dctcp/parameters/dctcp_shift_g 10 # echo 11 > /sys/module/tcp_dctcp/parameters/dctcp_shift_g -bash: echo: write error: Invalid argument
[0]:
UBSAN: shift-out-of-bounds in net/ipv4/tcp_dctcp.c:143:12 shift exponent 100 is too large for 32-bit type 'u32' (aka 'unsigned int') CPU: 0 PID: 8083 Comm: syz-executor345 Not tainted 6.9.0-05151-g1b294a1f3561 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x201/0x300 lib/dump_stack.c:114 ubsan_epilogue lib/ubsan.c:231 [inline] __ubsan_handle_shift_out_of_bounds+0x346/0x3a0 lib/ubsan.c:468 dctcp_update_alpha+0x540/0x570 net/ipv4/tcp_dctcp.c:143 tcp_in_ack_event net/ipv4/tcp_input.c:3802 [inline] tcp_ack+0x17b1/0x3bc0 net/ipv4/tcp_input.c:3948 tcp_rcv_state_process+0x57a/0x2290 net/ipv4/tcp_input.c:6711 tcp_v4_do_rcv+0x764/0xc40 net/ipv4/tcp_ipv4.c:1937 sk_backlog_rcv include/net/sock.h:1106 [inline] __release_sock+0x20f/0x350 net/core/sock.c:2983 release_sock+0x61/0x1f0 net/core/sock.c:3549 mptcp_subflow_shutdown+0x3d0/0x620 net/mptcp/protocol.c:2907 mptcp_check_send_data_fin+0x225/0x410 net/mptcp/protocol.c:2976 __mptcp_close+0x238/0xad0 net/mptcp/protocol.c:3072 mptcp_close+0x2a/0x1a0 net/mptcp/protocol.c:3127 inet_release+0x190/0x1f0 net/ipv4/af_inet.c:437 __sock_release net/socket.c:659 [inline] sock_close+0xc0/0x240 net/socket.c:1421 __fput+0x41b/0x890 fs/file_table.c:422 task_work_run+0x23b/0x300 kernel/task_work.c:180 exit_task_work include/linux/task_work.h:38 [inline] do_exit+0x9c8/0x2540 kernel/exit.c:878 do_group_exit+0x201/0x2b0 kernel/exit.c:1027 __do_sys_exit_group kernel/exit.c:1038 [inline] __se_sys_exit_group kernel/exit.c:1036 [inline] __x64_sys_exit_group+0x3f/0x40 kernel/exit.c:1036 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xe4/0x240 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x67/0x6f RIP: 0033:0x7f6c2b5005b6 Code: Unable to access opcode bytes at 0x7f6c2b50058c. RSP: 002b:00007ffe883eb948 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 00007f6c2b5862f0 RCX: 00007f6c2b5005b6 RDX: 0000000000000001 RSI: 000000000000003c RDI: 0000000000000001 RBP: 0000000000000001 R08: 00000000000000e7 R09: ffffffffffffffc0 R10: 0000000000000006 R11: 0000000000000246 R12: 00007f6c2b5862f0 R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000001 </TASK>
--- net/ipv4/tcp_dctcp.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
net/ipv4/tcp_dctcp.c +12 -1
@@ -58,7 +58,18 @@ struct dctcp { };static unsigned int dctcp_shift_g__read_mostly =4 ;/* g = 1/2^4 */ -module_param (dctcp_shift_g, uint,0644 ); + +static int dctcp_shift_g_set (const char *val,const struct kernel_param *kp) +{ +return param_set_uint_minmax (val, kp,0 ,10 ); +} + +static const struct kernel_param_ops dctcp_shift_g_ops = { + .set = dctcp_shift_g_set, + .get = param_get_uint, +}; + +module_param_cb (dctcp_shift_g, &dctcp_shift_g_ops, &dctcp_shift_g,0644 );MODULE_PARM_DESC (dctcp_shift_g,"parameter g for updating dctcp_alpha" );static unsigned int dctcp_alpha_on_init__read_mostly =DCTCP_MAX_ALPHA ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 649/744 pNFS/filelayout: fixup pNfs allocation modes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 3ebcb24646f8c5bfad2866892d3f3cff05514452 ]
Change left over allocation flags.
--- fs/nfs/filelayout/filelayout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/filelayout/filelayout.c +2 -2
@@ -883,7 +883,7 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,NFS4_MAX_UINT64 ,IOMODE_READ , false, - GFP_KERNEL); + nfs_io_gfp_mask());if (IS_ERR (pgio->pg_lseg)) { pgio->pg_error =PTR_ERR (pgio->pg_lseg); pgio->pg_lseg =NULL ;
@@ -907,7 +907,7 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,NFS4_MAX_UINT64 ,IOMODE_RW , false, - GFP_NOFS); + nfs_io_gfp_mask());if (IS_ERR (pgio->pg_lseg)) { pgio->pg_error =PTR_ERR (pgio->pg_lseg); pgio->pg_lseg =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 650/744 openvswitch: Set the skbuff pkt_type for proper pmtud support.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Conole <[email protected]>
[ Upstream commit 30a92c9e3d6b073932762bef2ac66f4ee784c657 ]
Open vSwitch is originally intended to switch at layer 2, only dealing with Ethernet frames. With the introduction of l3 tunnels support, it crossed into the realm of needing to care a bit about some routing details when making forwarding decisions. If an oversized packet would need to be fragmented during this forwarding decision, there is a chance for pmtu to get involved and generate a routing exception. This is gated by the skbuff->pkt_type field.
When a flow is already loaded into the openvswitch module this field is set up and transitioned properly as a packet moves from one port to another. In the case that a packet execute is invoked after a flow is newly installed this field is not properly initialized. This causes the pmtud mechanism to omit sending the required exception messages across the tunnel boundary and a second attempt needs to be made to make sure that the routing exception is properly setup. To fix this, we set the outgoing packet's pkt_type to PACKET_OUTGOING, since it can only get to the openvswitch module via a port device or packet command.
Even for bridge ports as users, the pkt_type needs to be reset when doing the transmit as the packet is truly outgoing and routing needs to get involved post packet transformations, in the case of VXLAN/GENEVE/udp-tunnel packets. In general, the pkt_type on output gets ignored, since we go straight to the driver, but in the case of tunnel ports they go through IP routing layer.
This issue is periodically encountered in complex setups, such as large openshift deployments, where multiple sets of tunnel traversal occurs. A way to recreate this is with the ovn-heater project that can setup a networking environment which mimics such large deployments. We need larger environments for this because we need to ensure that flow misses occur. In these environment, without this patch, we can see:
./ovn_cluster.sh start
podman exec ovn-chassis-1 ip r a 170.168.0.5/32 dev eth1 mtu 1200 podman exec ovn-chassis-1 ip netns exec sw01p1 ip r flush cache podman exec ovn-chassis-1 ip netns exec sw01p1 \
ping 21.0.0.3 -M do -s 1300 -c2
PING 21.0.0.3 (21.0.0.3) 1300(1328) bytes of data. From 21.0.0.3 icmp_seq=2 Frag needed and DF set (mtu = 1142)
--- 21.0.0.3 ping statistics ---
...
Using tcpdump, we can also see the expected ICMP FRAG_NEEDED message is not sent into the server.
With this patch, setting the pkt_type, we see the following:
podman exec ovn-chassis-1 ip netns exec sw01p1 \
ping 21.0.0.3 -M do -s 1300 -c2
PING 21.0.0.3 (21.0.0.3) 1300(1328) bytes of data. From 21.0.0.3 icmp_seq=1 Frag needed and DF set (mtu = 1222)
ping: local error: message too long, mtu=1222
--- 21.0.0.3 ping statistics ---
...
In this case, the first ping request receives the FRAG_NEEDED message and a local routing exception is created.
Reported-at: https://issues.redhat.com/browse/FDP-164
--- net/openvswitch/actions.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/openvswitch/actions.c +6 -0
@@ -929,6 +929,12 @@ static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port,pskb_trim (skb,ovs_mac_header_len (key)); } +/* Need to set the pkt_type to involve the routing layer. The +* packet movement through the OVS datapath doesn't generally +* use routing, but this is needed for tunnel cases. +*/ + skb->pkt_type =PACKET_OUTGOING ; +if (likely (!mru || (skb->len <= mru + vport->dev->hard_header_len))) {ovs_vport_send (vport, skb,ovs_key_mac_proto (key));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 651/744 arm64: asm-bug: Add .align 2 to the end of __BUG_ENTRY
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiangfeng Xiao <[email protected]>
[ Upstream commit ffbf4fb9b5c12ff878a10ea17997147ea4ebea6f ]
When CONFIG_DEBUG_BUGVERBOSE=n, we fail to add necessary padding bytes to bug_table entries, and as a result the last entry in a bug table will be ignored, potentially leading to an unexpected panic(). All prior entries in the table will be handled correctly.
The arm64 ABI requires that struct fields of up to 8 bytes are naturally-aligned, with padding added within a struct such that struct are suitably aligned within arrays.
When CONFIG_DEBUG_BUGVERPOSE=y, the layout of a bug_entry is:
struct bug_entry {
signed int bug_addr_disp; // 4 bytes
signed int file_disp; // 4 bytes
unsigned short line; // 2 bytes
unsigned short flags; // 2 bytes
}
... with 12 bytes total, requiring 4-byte alignment.
When CONFIG_DEBUG_BUGVERBOSE=n, the layout of a bug_entry is:
struct bug_entry {
signed int bug_addr_disp; // 4 bytes
unsigned short flags; // 2 bytes
< implicit padding > // 2 bytes
}
... with 8 bytes total, with 6 bytes of data and 2 bytes of trailing padding, requiring 4-byte alginment.
When we create a bug_entry in assembly, we align the start of the entry to 4 bytes, which implicitly handles padding for any prior entries. However, we do not align the end of the entry, and so when CONFIG_DEBUG_BUGVERBOSE=n, the final entry lacks the trailing padding bytes.
For the main kernel image this is not a problem as find_bug() doesn't depend on the trailing padding bytes when searching for entries:
for (bug = __start___bug_table; bug < __stop___bug_table; ++bug) if (bugaddr == bug_addr(bug)) return bug;
However for modules, module_bug_finalize() depends on the trailing bytes when calculating the number of entries:
mod->num_bugs = sechdrs[i].sh_size / sizeof(struct bug_entry);
... and as the last bug_entry lacks the necessary padding bytes, this entry will not be counted, e.g. in the case of a single entry:
sechdrs[i].sh_size == 6 sizeof(struct bug_entry) == 8; sechdrs[i].sh_size / sizeof(struct bug_entry) == 0;
Consequently module_find_bug() will miss the last bug_entry when it does:
for (i = 0; i < mod->num_bugs; ++i, ++bug) if (bugaddr == bug_addr(bug)) goto out;
... which can lead to a kenrel panic due to an unhandled bug.
This can be demonstrated with the following module:
static int __init buginit(void)
{
WARN(1, "hello\n");
return 0;
}
static void __exit bugexit(void)
{
}
module_init(buginit);
module_exit(bugexit);
MODULE_LICENSE("GPL");... which will trigger a kernel panic when loaded:
------------[ cut here ]------------ hello Unexpected kernel BRK exception at EL1 Internal error: BRK handler: 00000000f2000800 [#1] PREEMPT SMP Modules linked in: hello(O+) CPU: 0 PID: 50 Comm: insmod Tainted: G O 6.9.1 #8 Hardware name: linux,dummy-virt (DT) pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : buginit+0x18/0x1000 [hello] lr : buginit+0x18/0x1000 [hello] sp : ffff800080533ae0 x29: ffff800080533ae0 x28: 0000000000000000 x27: 0000000000000000 x26: ffffaba8c4e70510 x25: ffff800080533c30 x24: ffffaba8c4a28a58 x23: 0000000000000000 x22: 0000000000000000 x21: ffff3947c0eab3c0 x20: ffffaba8c4e3f000 x19: ffffaba846464000 x18: 0000000000000006 x17: 0000000000000000 x16: ffffaba8c2492834 x15: 0720072007200720 x14: 0720072007200720 x13: ffffaba8c49b27c8 x12: 0000000000000312 x11: 0000000000000106 x10: ffffaba8c4a0a7c8 x9 : ffffaba8c49b27c8 x8 : 00000000ffffefff x7 : ffffaba8c4a0a7c8 x6 : 80000000fffff000 x5 : 0000000000000107 x4 : 0000000000000000 x3 : 0000000000000000 x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff3947c0eab3c0 Call trace: buginit+0x18/0x1000 [hello] do_one_initcall+0x80/0x1c8 do_init_module+0x60/0x218 load_module+0x1ba4/0x1d70 __do_sys_init_module+0x198/0x1d0 __arm64_sys_init_module+0x1c/0x28 invoke_syscall+0x48/0x114 el0_svc_common.constprop.0+0x40/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x34/0xd8 el0t_64_sync_handler+0x120/0x12c el0t_64_sync+0x190/0x194 Code: d0ffffe0 910003fd 91000000 9400000b (d4210000) ---[ end trace 0000000000000000 ]--- Kernel panic - not syncing: BRK handler: Fatal exception
Fix this by always aligning the end of a bug_entry to 4 bytes, which is correct regardless of CONFIG_DEBUG_BUGVERBOSE.
--- arch/arm64/include/asm/asm-bug.h | 1 + 1 file changed, 1 insertion(+)
arch/arm64/include/asm/asm-bug.h +1 -0
@@ -28,6 +28,7 @@ 14470: .long 14471f - .; \_BUGVERBOSE_LOCATION (__FILE__, __LINE__) \ .short flags; \ + .align 2; \ .popsection; \ 14471:#else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 652/744 Update rv_en(dis)able_monitor doc to match kernel-doc
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Li <[email protected]>
[ Upstream commit 1e8b7b3dbb3103d577a586ca72bc329f7b67120b ]
The patch updates the function documentation comment for rv_en(dis)able_monitor to adhere to the kernel-doc specification.
--- kernel/trace/rv/rv.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/trace/rv/rv.c +2 -0
@@ -245,6 +245,7 @@ static int __rv_disable_monitor(struct rv_monitor_def *mdef, bool sync)/** * rv_disable_monitor - disable a given runtime monitor +* @mdef: Pointer to the monitor definition structure. * * Returns 0 on success. */
@@ -256,6 +257,7 @@ int rv_disable_monitor(struct rv_monitor_def *mdef)/** * rv_enable_monitor - enable a given runtime monitor +* @mdef: Pointer to the monitor definition structure. * * Returns 0 on success, error otherwise. */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 653/744 net: lan966x: Remove ptp traps in case the ptp is not enabled.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit eda40be3a5ff3fdce513d2bcfeaca8cc16cf962a ]
Lan966x is adding ptp traps to redirect the ptp frames to the CPU such that the HW will not forward these frames anywhere. The issue is that in case ptp is not enabled and the timestamping source is et to HWTSTAMP_SOURCE_NETDEV then these traps would not be removed on the error path.
Fix this by removing the traps in this case as they are not needed.
--- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +3 -3
@@ -474,14 +474,14 @@ static int lan966x_port_hwtstamp_set(struct net_device *dev, cfg->source != HWTSTAMP_SOURCE_PHYLIB)return -EOPNOTSUPP ; +if (cfg->source ==HWTSTAMP_SOURCE_NETDEV && !port->lan966x->ptp) +return -EOPNOTSUPP ; + err =lan966x_ptp_setup_traps (port, cfg);if (err)return err;if (cfg->source ==HWTSTAMP_SOURCE_NETDEV ) { -if (!port->lan966x->ptp) -return -EOPNOTSUPP ; - err =lan966x_ptp_hwtstamp_set (port, cfg, extack);if (err) {lan966x_ptp_del_traps (port);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 654/744 virtio: delete vq in vp_find_vqs_msix() when request_irq() fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Pirko <[email protected]>
[ Upstream commit 89875151fccdd024d571aa884ea97a0128b968b6 ]
When request_irq() fails, error path calls vp_del_vqs(). There, as vq is present in the list, free_irq() is called for the same vector. That causes following splat:
[ 0.414355] Trying to free already-free IRQ 27 [ 0.414403] WARNING: CPU: 1 PID: 1 at kernel/irq/manage.c:1899 free_irq+0x1a1/0x2d0 [ 0.414510] Modules linked in: [ 0.414540] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 6.9.0-rc4+ #27 [ 0.414540] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-1.fc39 04/01/2014 [ 0.414540] RIP: 0010:free_irq+0x1a1/0x2d0 [ 0.414540] Code: 1e 00 48 83 c4 08 48 89 e8 5b 5d 41 5c 41 5d 41 5e 41 5f c3 cc cc cc cc 90 8b 74 24 04 48 c7 c7 98 80 6c b1 e8 00 c9 f7 ff 90 <0f> 0b 90 90 48 89 ee 4c 89 ef e8 e0 20 b8 00 49 8b 47 40 48 8b 40 [ 0.414540] RSP: 0000:ffffb71480013ae0 EFLAGS: 00010086 [ 0.414540] RAX: 0000000000000000 RBX: ffffa099c2722000 RCX: 0000000000000000 [ 0.414540] RDX: 0000000000000000 RSI: ffffb71480013998 RDI: 0000000000000001 [ 0.414540] RBP: 0000000000000246 R08: 00000000ffffdfff R09: 0000000000000001 [ 0.414540] R10: 00000000ffffdfff R11: ffffffffb18729c0 R12: ffffa099c1c91760 [ 0.414540] R13: ffffa099c1c916a4 R14: ffffa099c1d2f200 R15: ffffa099c1c91600 [ 0.414540] FS: 0000000000000000(0000) GS:ffffa099fec40000(0000) knlGS:0000000000000000 [ 0.414540] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 0.414540] CR2: 0000000000000000 CR3: 0000000008e3e001 CR4: 0000000000370ef0 [ 0.414540] Call Trace: [ 0.414540] <TASK> [ 0.414540] ? __warn+0x80/0x120 [ 0.414540] ? free_irq+0x1a1/0x2d0 [ 0.414540] ? report_bug+0x164/0x190 [ 0.414540] ? handle_bug+0x3b/0x70 [ 0.414540] ? exc_invalid_op+0x17/0x70 [ 0.414540] ? asm_exc_invalid_op+0x1a/0x20 [ 0.414540] ? free_irq+0x1a1/0x2d0 [ 0.414540] vp_del_vqs+0xc1/0x220 [ 0.414540] vp_find_vqs_msix+0x305/0x470 [ 0.414540] vp_find_vqs+0x3e/0x1a0 [ 0.414540] vp_modern_find_vqs+0x1b/0x70 [ 0.414540] init_vqs+0x387/0x600 [ 0.414540] virtnet_probe+0x50a/0xc80 [ 0.414540] virtio_dev_probe+0x1e0/0x2b0 [ 0.414540] really_probe+0xc0/0x2c0 [ 0.414540] ? __pfx___driver_attach+0x10/0x10 [ 0.414540] __driver_probe_device+0x73/0x120 [ 0.414540] driver_probe_device+0x1f/0xe0 [ 0.414540] __driver_attach+0x88/0x180 [ 0.414540] bus_for_each_dev+0x85/0xd0 [ 0.414540] bus_add_driver+0xec/0x1f0 [ 0.414540] driver_register+0x59/0x100 [ 0.414540] ? __pfx_virtio_net_driver_init+0x10/0x10 [ 0.414540] virtio_net_driver_init+0x90/0xb0 [ 0.414540] do_one_initcall+0x58/0x230 [ 0.414540] kernel_init_freeable+0x1a3/0x2d0 [ 0.414540] ? __pfx_kernel_init+0x10/0x10 [ 0.414540] kernel_init+0x1a/0x1c0 [ 0.414540] ret_from_fork+0x31/0x50 [ 0.414540] ? __pfx_kernel_init+0x10/0x10 [ 0.414540] ret_from_fork_asm+0x1a/0x30 [ 0.414540] </TASK>
Fix this by calling deleting the current vq when request_irq() fails.
Message-Id: <[email protected]>
--- drivers/virtio/virtio_pci_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/virtio/virtio_pci_common.c +3 -1
@@ -345,8 +345,10 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs, vring_interrupt,0 , vp_dev->msix_names[msix_vec], vqs[i]); -if (err) +if (err) { +vp_del_vq (vqs[i]); goto error_find; + } }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 655/744 riscv: cpufeature: Fix thead vector hwcap removal
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlie Jenkins <[email protected]>
[ Upstream commit e482eab4d1eb31031eff2b6afb71776483101979 ]
The riscv_cpuinfo struct that contains mvendorid and marchid is not populated until all harts are booted which happens after the DT parsing. Use the mvendorid/marchid from the boot hart to determine if the DT contains an invalid V.
--- arch/riscv/include/asm/sbi.h | 2 ++ arch/riscv/kernel/cpu.c | 40 ++++++++++++++++++++++++++++++---- arch/riscv/kernel/cpufeature.c | 8 +++++-- 3 files changed, 44 insertions(+), 6 deletions(-)
arch/riscv/include/asm/sbi.h +2 -0
@@ -327,6 +327,8 @@ static inline int sbi_remote_fence_i(const struct cpumask *cpu_mask) { return -1static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ +unsigned long riscv_get_mvendorid (void ); +unsigned long riscv_get_marchid (void );unsigned long riscv_cached_mvendorid (unsigned int cpu_id);unsigned long riscv_cached_marchid (unsigned int cpu_id);unsigned long riscv_cached_mimpid (unsigned int cpu_id);
arch/riscv/kernel/cpu.c +36 -4
@@ -139,6 +139,34 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid)return -1 ; } +unsigned long __init riscv_get_marchid (void ) +{ +struct riscv_cpuinfo *ci =this_cpu_ptr (&riscv_cpuinfo); + +#if IS_ENABLED (CONFIG_RISCV_SBI ) + ci->marchid =sbi_spec_is_0_1 () ?0 :sbi_get_marchid (); +#elif IS_ENABLED (CONFIG_RISCV_M_MODE ) + ci->marchid =csr_read (CSR_MARCHID ); +#else + ci->marchid =0 ; +#endif +return ci->marchid; +} + +unsigned long __init riscv_get_mvendorid (void ) +{ +struct riscv_cpuinfo *ci =this_cpu_ptr (&riscv_cpuinfo); + +#if IS_ENABLED (CONFIG_RISCV_SBI ) + ci->mvendorid =sbi_spec_is_0_1 () ?0 :sbi_get_mvendorid (); +#elif IS_ENABLED (CONFIG_RISCV_M_MODE ) + ci->mvendorid =csr_read (CSR_MVENDORID ); +#else + ci->mvendorid =0 ; +#endif +return ci->mvendorid; +} + DEFINE_PER_CPU(struct riscv_cpuinfo, riscv_cpuinfo);unsigned long riscv_cached_mvendorid (unsigned int cpu_id)
@@ -170,12 +198,16 @@ static int riscv_cpuinfo_starting(unsigned int cpu)struct riscv_cpuinfo *ci =this_cpu_ptr (&riscv_cpuinfo);#if IS_ENABLED (CONFIG_RISCV_SBI ) - ci->mvendorid =sbi_spec_is_0_1 () ?0 :sbi_get_mvendorid (); - ci->marchid =sbi_spec_is_0_1 () ?0 :sbi_get_marchid (); +if (!ci->mvendorid) + ci->mvendorid =sbi_spec_is_0_1 () ?0 :sbi_get_mvendorid (); +if (!ci->marchid) + ci->marchid =sbi_spec_is_0_1 () ?0 :sbi_get_marchid (); ci->mimpid =sbi_spec_is_0_1 () ?0 :sbi_get_mimpid ();#elif IS_ENABLED (CONFIG_RISCV_M_MODE ) - ci->mvendorid =csr_read (CSR_MVENDORID ); - ci->marchid =csr_read (CSR_MARCHID ); +if (!ci->mvendorid) + ci->mvendorid =csr_read (CSR_MVENDORID ); +if (!ci->marchid) + ci->marchid =csr_read (CSR_MARCHID ); ci->mimpid =csr_read (CSR_MIMPID );#else ci->mvendorid =0 ;
arch/riscv/kernel/cpufeature.c +6 -2
@@ -351,6 +351,8 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)struct acpi_table_header *rhct;acpi_status status;unsigned int cpu; +u64 boot_vendorid; +u64 boot_archid;if (!acpi_disabled) { status =acpi_get_table (ACPI_SIG_RHCT ,0 , &rhct);
@@ -358,6 +360,9 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)return ; } + boot_vendorid =riscv_get_mvendorid (); + boot_archid =riscv_get_marchid (); +for_each_possible_cpu (cpu) {struct riscv_isainfo *isainfo = &hart_isa[cpu];unsigned long this_hwcap =0 ;
@@ -405,8 +410,7 @@ static void __init riscv_fill_hwcap_from_isa_string(unsigned long *isa2hwcap)* CPU cores with the ratified spec will contain non-zero * marchid. */ -if (acpi_disabled &&riscv_cached_mvendorid (cpu) ==THEAD_VENDOR_ID && -riscv_cached_marchid (cpu) ==0x0 ) { +if (acpi_disabled && boot_vendorid ==THEAD_VENDOR_ID && boot_archid ==0x0 ) { this_hwcap &= ~isa2hwcap[RISCV_ISA_EXT_v];clear_bit (RISCV_ISA_EXT_v, isainfo->isa); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 656/744 i3c: add actual_len in i3c_priv_xfer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit e5e3df06ac98d15cfb10bb5c12356709365e91b2 ]
In MIPI I3C Specification:
"Ninth Bit of SDR Target Returned (Read) Data as End-of-Data: In I2C, the ninth Data bit from Target to Controller is an ACK by the Controller. By contrast, in I3C this bit allows the Target to end a Read, and allows the Controller to Abort a Read. In SDR terms, the ninth bit of Read data is referred to as the T-Bit (for ‘Transition’)"
I3C allow devices early terminate data transfer. So need "actual_len" field to indicate how much get by i3c_priv_xfer.
Stable-dep-of: 7f3d633b460b ("i3c: master: svc: change ENXIO to EAGAIN when IBI occurs during start frame")
--- include/linux/i3c/device.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/i3c/device.h +2 -0
@@ -54,6 +54,7 @@ enum i3c_hdr_mode {* struct i3c_priv_xfer - I3C SDR private transfer * @rnw: encodes the transfer direction. true for a read, false for a write * @len: transfer length in bytes of the transfer +* @actual_len: actual length in bytes are transferred by the controller * @data: input/output buffer * @data.in: input buffer. Must point to a DMA-able buffer * @data.out: output buffer. Must point to a DMA-able buffer
@@ -62,6 +63,7 @@ enum i3c_hdr_mode {struct i3c_priv_xfer {u8 rnw;u16 len; +u16 actual_len;union {void *in;const void *out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 657/744 i3c: master: svc: rename read_len as actual_len
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 6fb61734a74eaa307a5b6a0bee770e736d8acf89 ]
I3C transfer (SDR), target can early terminate read transfer. I3C transfer (HDR), target can end write transfer. I2C transfer, target can NACK write transfer.
'actual_len' is better name than 'read_len'.
Stable-dep-of: 7f3d633b460b ("i3c: master: svc: change ENXIO to EAGAIN when IBI occurs during start frame")
--- drivers/i3c/master/svc-i3c-master.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/i3c/master/svc-i3c-master.c +13 -13
@@ -134,7 +134,7 @@ struct svc_i3c_cmd {u8 *in;const void *out;unsigned int len; -unsigned int read_len; +unsigned int actual_len;bool continued; };
@@ -1024,7 +1024,7 @@ static int svc_i3c_master_write(struct svc_i3c_master *master,static int svc_i3c_master_xfer (struct svc_i3c_master *master,bool rnw,unsigned int xfer_type,u8 addr,u8 *in,const u8 *out,unsigned int xfer_len, -unsigned int *read_len,bool continued) +unsigned int *actual_len,bool continued) {u32 reg;int ret;
@@ -1037,7 +1037,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,SVC_I3C_MCTRL_IBIRESP_NACK |SVC_I3C_MCTRL_DIR (rnw) |SVC_I3C_MCTRL_ADDR (addr) | -SVC_I3C_MCTRL_RDTERM (*read_len), +SVC_I3C_MCTRL_RDTERM (*actual_len), master->regs + SVC_I3C_MCTRL); ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
@@ -1075,7 +1075,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master, goto emit_stop;if (rnw) - *read_len = ret; + *actual_len = ret; ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , reg,SVC_I3C_MSTATUS_COMPLETE (reg),0 ,1000 );
@@ -1157,7 +1157,7 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master) ret =svc_i3c_master_xfer (master, cmd->rnw, xfer->type, cmd->addr, cmd->in, cmd->out, - cmd->len, &cmd->read_len, + cmd->len, &cmd->actual_len, cmd->continued);if (ret)break ;
@@ -1243,7 +1243,7 @@ static int svc_i3c_master_send_bdcast_ccc_cmd(struct svc_i3c_master *master, cmd->in =NULL ; cmd->out = buf; cmd->len = xfer_len; - cmd->read_len =0 ; + cmd->actual_len =0 ; cmd->continued = false;mutex_lock (&master->lock);
@@ -1263,7 +1263,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master, struct i3c_ccc_cmd *ccc) {unsigned int xfer_len = ccc->dests[0 ].payload.len; -unsigned int read_len = ccc->rnw ? xfer_len :0 ; +unsigned int actual_len = ccc->rnw ? xfer_len :0 ;struct svc_i3c_xfer *xfer;struct svc_i3c_cmd *cmd;int ret;
@@ -1281,7 +1281,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master, cmd->in =NULL ; cmd->out = &ccc->id; cmd->len =1 ; - cmd->read_len =0 ; + cmd->actual_len =0 ; cmd->continued = true;/* Directed message */
@@ -1291,7 +1291,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master, cmd->in = ccc->rnw ? ccc->dests[0 ].payload.data :NULL ; cmd->out = ccc->rnw ?NULL : ccc->dests[0 ].payload.data, cmd->len = xfer_len; - cmd->read_len = read_len; + cmd->actual_len = actual_len; cmd->continued = false;mutex_lock (&master->lock);
@@ -1300,8 +1300,8 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,svc_i3c_master_dequeue_xfer (master, xfer);mutex_unlock (&master->lock); -if (cmd->read_len != xfer_len) - ccc->dests[0 ].payload.len = cmd->read_len; +if (cmd->actual_len != xfer_len) + ccc->dests[0 ].payload.len = cmd->actual_len; ret = xfer->ret;svc_i3c_master_free_xfer (xfer);
@@ -1351,7 +1351,7 @@ static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev, cmd->in = xfers[i].rnw ? xfers[i].data.in :NULL ; cmd->out = xfers[i].rnw ?NULL : xfers[i].data.out; cmd->len = xfers[i].len; - cmd->read_len = xfers[i].rnw ? xfers[i].len :0 ; + cmd->actual_len = xfers[i].rnw ? xfers[i].len :0 ; cmd->continued = (i +1 ) < nxfers; }
@@ -1391,7 +1391,7 @@ static int svc_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, cmd->in = cmd->rnw ? xfers[i].buf :NULL ; cmd->out = cmd->rnw ?NULL : xfers[i].buf; cmd->len = xfers[i].len; - cmd->read_len = cmd->rnw ? xfers[i].len :0 ; + cmd->actual_len = cmd->rnw ? xfers[i].len :0 ; cmd->continued = (i +1 < nxfers); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 658/744 i3c: master: svc: return actual transfer data len
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 6d1a19d34e2cc07ca9cdad8892da94e716e9d15f ]
I3C allow devices early terminate data transfer. So set "actual_len" to indicate how much data get by i3c_priv_xfer.
Stable-dep-of: 7f3d633b460b ("i3c: master: svc: change ENXIO to EAGAIN when IBI occurs during start frame")
--- drivers/i3c/master/svc-i3c-master.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/i3c/master/svc-i3c-master.c +8 -0
@@ -135,6 +135,7 @@ struct svc_i3c_cmd {const void *out;unsigned int len;unsigned int actual_len; +struct i3c_priv_xfer *xfer;bool continued; };
@@ -1047,6 +1048,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,if (readl (master->regs +SVC_I3C_MERRWARN ) &SVC_I3C_MERRWARN_NACK ) { ret = -ENXIO ; + *actual_len =0 ; goto emit_stop; }
@@ -1064,6 +1066,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,*/ if (SVC_I3C_MSTATUS_IBIWON (reg)) { ret = -ENXIO ; + *actual_len =0 ; goto emit_stop; }
@@ -1159,6 +1162,10 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master) cmd->addr, cmd->in, cmd->out, cmd->len, &cmd->actual_len, cmd->continued); +/* cmd->xfer is NULL if I2C or CCC transfer */ +if (cmd->xfer) + cmd->xfer->actual_len = cmd->actual_len; +if (ret)break ; }
@@ -1346,6 +1353,7 @@ static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,for (i =0 ; i < nxfers; i++) {struct svc_i3c_cmd *cmd = &xfer->cmds[i]; + cmd->xfer = &xfers[i]; cmd->addr = master->addrs[data->index]; cmd->rnw = xfers[i].rnw; cmd->in = xfers[i].rnw ? xfers[i].data.in :NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 659/744 i3c: master: svc: change ENXIO to EAGAIN when IBI occurs during start frame
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 7f3d633b460be5553a65a247def5426d16805e72 ]
svc_i3c_master_xfer() returns error ENXIO if an In-Band Interrupt (IBI) occurs when the host starts the frame.
Change error code to EAGAIN to inform the client driver that this situation has occurred and to try again sometime later.
--- drivers/i3c/master/svc-i3c-master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i3c/master/svc-i3c-master.c +1 -1
@@ -1065,7 +1065,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,* and yield the above events handler. */ if (SVC_I3C_MSTATUS_IBIWON (reg)) { - ret = -ENXIO ; + ret = -EAGAIN ; *actual_len =0 ; goto emit_stop; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 660/744 riscv: stacktrace: fixed walk_stackframe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Bystrin <[email protected]>
[ Upstream commit a2a4d4a6a0bf5eba66f8b0b32502cc20d82715a0 ]
If the load access fault occures in a leaf function (with CONFIG_FRAME_POINTER=y), when wrong stack trace will be displayed:
[<ffffffff804853c2>] regmap_mmio_read32le+0xe/0x1c ---[ end trace 0000000000000000 ]---
Registers dump:
ra 0xffffffff80485758 <regmap_mmio_read+36>
sp 0xffffffc80200b9a0
fp 0xffffffc80200b9b0
pc 0xffffffff804853ba <regmap_mmio_read32le+6>Stack dump:
0xffffffc80200b9a0: 0xffffffc80200b9e0 0xffffffc80200b9e0
0xffffffc80200b9b0: 0xffffffff8116d7e8 0x0000000000000100
0xffffffc80200b9c0: 0xffffffd8055b9400 0xffffffd8055b9400
0xffffffc80200b9d0: 0xffffffc80200b9f0 0xffffffff8047c526
0xffffffc80200b9e0: 0xffffffc80200ba30 0xffffffff8047fe9aThe assembler dump of the function preambula:
add sp,sp,-16
sd s0,8(sp)
add s0,sp,16In the fist stack frame, where ra is not stored on the stack we can observe:
0(sp) 8(sp)
.---------------------------------------------.
sp->| frame->fp | frame->ra (saved fp) |
|---------------------------------------------|
fp->| .... | .... |
|---------------------------------------------|
| | |and in the code check is performed:
if (regs && (regs->epc == pc) && (frame->fp & 0x7))
I see no reason to check frame->fp value at all, because it is can be uninitialized value on the stack. A better way is to check frame->ra to be an address on the stack. After the stacktrace shows as expect:
[<ffffffff804853c2>] regmap_mmio_read32le+0xe/0x1c [<ffffffff80485758>] regmap_mmio_read+0x24/0x52 [<ffffffff8047c526>] _regmap_bus_reg_read+0x1a/0x22 [<ffffffff8047fe9a>] _regmap_read+0x5c/0xea [<ffffffff80480376>] _regmap_update_bits+0x76/0xc0 ... ---[ end trace 0000000000000000 ]---
As pointed by Samuel Holland it is incorrect to remove check of the stackframe entirely.
Changes since v2 [2]:
- Add accidentally forgotten curly brace
Changes since v1 [1]:
- Instead of just dropping frame->fp check, replace it with validation of frame->ra, which should be a stack address.
- Move frame pointer validation into the separate function.
[1] https://lore.kernel.org/linux-riscv/[email protected]/
[2] https://lore.kernel.org/linux-riscv/[email protected]/
--- arch/riscv/kernel/stacktrace.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
arch/riscv/kernel/stacktrace.c +14 -6
@@ -18,6 +18,16 @@ extern asmlinkage void ret_from_exception(void); +static inline int fp_is_valid (unsigned long fp,unsigned long sp) +{ +unsigned long low, high; + + low = sp +sizeof (struct stackframe ); + high =ALIGN (sp,THREAD_SIZE ); + +return !(fp < low || fp > high || fp &0x07 ); +} + void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,bool (*fn)(void *,unsigned long ),void *arg) {
@@ -41,21 +51,19 @@ void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs, }for (;;) { -unsigned long low, high;struct stackframe *frame;if (unlikely (!__kernel_text_address (pc) || (level++ >=0 && !fn (arg, pc))))break ; -/* Validate frame pointer */ - low = sp +sizeof (struct stackframe ); - high =ALIGN (sp,THREAD_SIZE ); -if (unlikely (fp < low || fp > high || fp &0x7 )) +if (unlikely (!fp_is_valid (fp, sp)))break ; +/* Unwind stack frame */ frame = (struct stackframe *)fp -1 ; sp = fp; -if (regs && (regs->epc == pc) && (frame->fp &0x7 )) { +if (regs && (regs->epc == pc) &&fp_is_valid (frame->ra, sp)) { +/* We hit function where ra is not saved on the stack */ fp = frame->ra; pc = regs->ra; }else {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 661/744 Revert "ixgbe: Manual AN-37 for troublesome link partners for X550 SFI"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit b35b1c0b4e166a427395deaf61e3140495dfcb89 ]
This reverts commit 565736048bd5f9888990569993c6b6bfdf6dcb6d.
According to the commit, it implements a manual AN-37 for some "troublesome" Juniper MX5 switches. This appears to be a workaround for a particular switch.
It has been reported that this causes a severe breakage for other switches, including a Cisco 3560CX-12PD-S.
The code appears to be a workaround for a specific switch which fails to link in SFI mode. It expects to see AN-37 auto negotiation in order to link. The Cisco switch is not expecting AN-37 auto negotiation. When the device starts the manual AN-37, the Cisco switch decides that the port is confused and stops attempting to link with it. This persists until a power cycle. A simple driver unload and reload does not resolve the issue, even if loading with a version of the driver which lacks this workaround.
The authors of the workaround commit have not responded with clarifications, and the result of the workaround is complete failure to connect with other switches.
This appears to be a case where the driver can either "correctly" link with the Juniper MX5 switch, at the cost of bricking the link with the Cisco switch, or it can behave properly for the Cisco switch, but fail to link with the Junipir MX5 switch. I do not know enough about the standards involved to clearly determine whether either switch is at fault or behaving incorrectly. Nor do I know whether there exists some alternative fix which corrects behavior with both switches.
Revert the workaround for the Juniper switch.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 - drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 56 +------------------ 2 files changed, 3 insertions(+), 56 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -3
@@ -3673,9 +3673,7 @@ struct ixgbe_info {#define IXGBE_KRM_LINK_S1 (P ) ((P) ? 0x8200 : 0x4200)#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P) ? 0x820C : 0x420C)#define IXGBE_KRM_AN_CNTL_1 (P ) ((P) ? 0x822C : 0x422C) -#define IXGBE_KRM_AN_CNTL_4 (P ) ((P) ? 0x8238 : 0x4238)#define IXGBE_KRM_AN_CNTL_8 (P ) ((P) ? 0x8248 : 0x4248) -#define IXGBE_KRM_PCS_KX_AN (P ) ((P) ? 0x9918 : 0x5918)#define IXGBE_KRM_SGMII_CTRL (P ) ((P) ? 0x82A0 : 0x42A0)#define IXGBE_KRM_LP_BASE_PAGE_HIGH (P ) ((P) ? 0x836C : 0x436C)#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P) ? 0x8634 : 0x4634)
@@ -3685,7 +3683,6 @@ struct ixgbe_info {#define IXGBE_KRM_PMD_FLX_MASK_ST20 (P ) ((P) ? 0x9054 : 0x5054)#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P) ? 0x9520 : 0x5520)#define IXGBE_KRM_RX_ANA_CTL (P ) ((P) ? 0x9A00 : 0x5A00) -#define IXGBE_KRM_FLX_TMRS_CTRL_ST31 (P ) ((P) ? 0x9180 : 0x5180)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA ~(0x3 << 20)#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR BIT(20)
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +3 -53
62 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 662/744 net: fec: avoid lock evasion when reading pps_enable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Fang <[email protected]>
[ Upstream commit 3b1c92f8e5371700fada307cc8fd2c51fa7bc8c1 ]
The assignment of pps_enable is protected by tmreg_lock, but the read operation of pps_enable is not. So the Coverity tool reports a lock evasion warning which may cause data race to occur when running in a multithread environment. Although this issue is almost impossible to occur, we'd better fix it, at least it seems more logically reasonable, and it also prevents Coverity from continuing to issue warnings.
--- drivers/net/ethernet/freescale/fec_ptp.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/freescale/fec_ptp.c +8 -6
@@ -104,14 +104,13 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable)struct timespec64 ts;u64 ns; -if (fep->pps_enable == enable) -return 0 ; - - fep->pps_channel =DEFAULT_PPS_CHANNEL ; - fep->reload_period =PPS_OUPUT_RELOAD_PERIOD ; -spin_lock_irqsave (&fep->tmreg_lock, flags); +if (fep->pps_enable == enable) { +spin_unlock_irqrestore (&fep->tmreg_lock, flags); +return 0 ; + } +if (enable) {/* clear capture or output compare interrupt status if have. */
@@ -532,6 +531,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp,int ret =0 ;if (rq->type ==PTP_CLK_REQ_PPS ) { + fep->pps_channel =DEFAULT_PPS_CHANNEL ; + fep->reload_period =PPS_OUPUT_RELOAD_PERIOD ; + ret =fec_ptp_enable_pps (fep, on);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 663/744 tls: fix missing memory barrier in tls_init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dae R. Jeong <[email protected]>
[ Upstream commit 91e61dd7a0af660408e87372d8330ceb218be302 ]
In tls_init(), a write memory barrier is missing, and store-store reordering may cause NULL dereference in tls_{setsockopt,getsockopt}.
CPU0 CPU1
----- -----
// In tls_init()
// In tls_ctx_create()
ctx = kzalloc()ctx->sk_proto = READ_ONCE(sk->sk_prot) -(1)
// In update_sk_prot()WRITE_ONCE(sk->sk_prot, tls_prots) -(2)
// In sock_common_setsockopt()
READ_ONCE(sk->sk_prot)->setsockopt()
// In tls_{setsockopt,getsockopt}()
ctx->sk_proto->setsockopt() -(3)In the above scenario, when (1) and (2) are reordered, (3) can observe the NULL value of ctx->sk_proto, causing NULL dereference.
To fix it, we rely on rcu_assign_pointer() which implies the release barrier semantic. By moving rcu_assign_pointer() after ctx->sk_proto is initialized, we can ensure that ctx->sk_proto are visible when changing sk->sk_prot.
--- net/tls/tls_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/tls/tls_main.c +9 -1
@@ -814,9 +814,17 @@ struct tls_context *tls_ctx_create(struct sock *sk)return NULL ;mutex_init (&ctx->tx_lock); -rcu_assign_pointer (icsk->icsk_ulp_data, ctx); ctx->sk_proto =READ_ONCE (sk->sk_prot); ctx->sk = sk; +/* Release semantic of rcu_assign_pointer() ensures that +* ctx->sk_proto is visible before changing sk->sk_prot in +* update_sk_prot(), and prevents reading uninitialized value in +* tls_{getsockopt, setsockopt}. Note that we do not need a +* read barrier in tls_{getsockopt,setsockopt} as there is an +* address dependency between sk->sk_proto->{getsockopt,setsockopt} +* and ctx->sk_proto. +*/ +rcu_assign_pointer (icsk->icsk_ulp_data, ctx);return ctx; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 664/744 tcp: remove 64 KByte limit for initial tp->rcv_wnd value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit 378979e94e953c2070acb4f0e0c98d29260bd09d ]
Recently, we had some servers upgraded to the latest kernel and noticed the indicator from the user side showed worse results than before. It is caused by the limitation of tp->rcv_wnd.
In 2018 commit a337531b942b ("tcp: up initial rmem to 128KB and SYN rwin to around 64KB") limited the initial value of tp->rcv_wnd to 65535, most CDN teams would not benefit from this change because they cannot have a large window to receive a big packet, which will be slowed down especially in long RTT. Small rcv_wnd means slow transfer speed, to some extent. It's the side effect for the latency/time-sensitive users.
To avoid future confusion, current change doesn't affect the initial receive window on the wire in a SYN or SYN+ACK packet which are set within 65535 bytes according to RFC 7323 also due to the limit in __tcp_transmit_skb():
th->window = htons(min(tp->rcv_wnd, 65535U));
In one word, __tcp_transmit_skb() already ensures that constraint is respected, no matter how large tp->rcv_wnd is. The change doesn't violate RFC.
Let me provide one example if with or without the patch:
Before:
client --- SYN: rwindow=65535 ---> server client <--- SYN+ACK: rwindow=65535 ---- server client --- ACK: rwindow=65536 ---> server
Note: for the last ACK, the calculation is 512 << 7.
After:
client --- SYN: rwindow=65535 ---> server client <--- SYN+ACK: rwindow=65535 ---- server client --- ACK: rwindow=175232 ---> server
Note: I use the following command to make it work:
ip route change default via [ip] dev eth0 metric 100 initrwnd 120 For the last ACK, the calculation is 1369 << 7.
When we apply such a patch, having a large rcv_wnd if the user tweak this knob can help transfer data more rapidly and save some rtts.
--- net/ipv4/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_output.c +1 -1
@@ -229,7 +229,7 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,if (READ_ONCE (sock_net (sk)->ipv4.sysctl_tcp_workaround_signed_windows)) (*rcv_wnd) =min (space,MAX_TCP_WINDOW );else - (*rcv_wnd) =min_t (u32, space,U16_MAX ); + (*rcv_wnd) = space;if (init_rcv_wnd) *rcv_wnd =min (*rcv_wnd, init_rcv_wnd * mss);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 665/744 net: relax socket state check at accept time.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 26afda78cda3da974fd4c287962c169e9462c495 ]
Christoph reported the following splat:
WARNING: CPU: 1 PID: 772 at net/ipv4/af_inet.c:761 __inet_accept+0x1f4/0x4a0 Modules linked in: CPU: 1 PID: 772 Comm: syz-executor510 Not tainted 6.9.0-rc7-g7da7119fe22b #56 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014 RIP: 0010:__inet_accept+0x1f4/0x4a0 net/ipv4/af_inet.c:759 Code: 04 38 84 c0 0f 85 87 00 00 00 41 c7 04 24 03 00 00 00 48 83 c4 10 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc e8 ec b7 da fd <0f> 0b e9 7f fe ff ff e8 e0 b7 da fd 0f 0b e9 fe fe ff ff 89 d9 80 RSP: 0018:ffffc90000c2fc58 EFLAGS: 00010293 RAX: ffffffff836bdd14 RBX: 0000000000000000 RCX: ffff888104668000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: dffffc0000000000 R08: ffffffff836bdb89 R09: fffff52000185f64 R10: dffffc0000000000 R11: fffff52000185f64 R12: dffffc0000000000 R13: 1ffff92000185f98 R14: ffff88810754d880 R15: ffff8881007b7800 FS: 000000001c772880(0000) GS:ffff88811b280000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fb9fcf2e178 CR3: 00000001045d2002 CR4: 0000000000770ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> inet_accept+0x138/0x1d0 net/ipv4/af_inet.c:786 do_accept+0x435/0x620 net/socket.c:1929 __sys_accept4_file net/socket.c:1969 [inline] __sys_accept4+0x9b/0x110 net/socket.c:1999 __do_sys_accept net/socket.c:2016 [inline] __se_sys_accept net/socket.c:2013 [inline] __x64_sys_accept+0x7d/0x90 net/socket.c:2013 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x58/0x100 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x4315f9 Code: fd ff 48 81 c4 80 00 00 00 e9 f1 fe ff ff 0f 1f 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 ab b4 fd ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007ffdb26d9c78 EFLAGS: 00000246 ORIG_RAX: 000000000000002b RAX: ffffffffffffffda RBX: 0000000000400300 RCX: 00000000004315f9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000004 RBP: 00000000006e1018 R08: 0000000000400300 R09: 0000000000400300 R10: 0000000000400300 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000040cdf0 R14: 000000000040ce80 R15: 0000000000000055 </TASK>
The reproducer invokes shutdown() before entering the listener status. After commit 94062790aedb ("tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets"), the above causes the child to reach the accept syscall in FIN_WAIT1 status.
Eric noted we can relax the existing assertion in __inet_accept()
--- net/ipv4/af_inet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ipv4/af_inet.c +3 -1
@@ -757,7 +757,9 @@ void __inet_accept(struct socket *sock, struct socket *newsock, struct sock *newsock_rps_record_flow (newsk);WARN_ON (!((1 << newsk->sk_state) & (TCPF_ESTABLISHED |TCPF_SYN_RECV | -TCPF_CLOSE_WAIT |TCPF_CLOSE ))); +TCPF_FIN_WAIT1 |TCPF_FIN_WAIT2 | +TCPF_CLOSING |TCPF_CLOSE_WAIT | +TCPF_CLOSE )));if (test_bit (SOCK_SUPPORT_ZC , &sock->flags))set_bit (SOCK_SUPPORT_ZC , &newsock->flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 666/744 nfc: nci: Fix handling of zero-length payload packets in nci_rx_work()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryosuke Yasuoka <[email protected]>
[ Upstream commit 6671e352497ca4bb07a96c48e03907065ff77d8a ]
When nci_rx_work() receives a zero-length payload packet, it should not discard the packet and exit the loop. Instead, it should continue processing subsequent packets.
--- net/nfc/nci/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/nfc/nci/core.c +1 -2
@@ -1531,8 +1531,7 @@ static void nci_rx_work(struct work_struct *work)if (!nci_valid_size (skb)) {kfree_skb (skb); -kcov_remote_stop (); -break ; +continue ; }/* Process frame */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 667/744 drivers/xen: Improve the late XenStore init protocol
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Wang <[email protected]>
[ Upstream commit a3607581cd49c17128a486a526a36a97bafcb2bb ]
Currently, the late XenStore init protocol is only triggered properly for the case that HVM_PARAM_STORE_PFN is ~0ULL (invalid). For the case that XenStore interface is allocated but not ready (the connection status is not XENSTORE_CONNECTED), Linux should also wait until the XenStore is set up properly.
Introduce a macro to describe the XenStore interface is ready, use it in xenbus_probe_initcall() to select the code path of doing the late XenStore init protocol or not. Since now we have more than one condition for XenStore late init, rework the check in xenbus_probe() for the free_irq().
Take the opportunity to enhance the check of the allocated XenStore interface can be properly mapped, and return error early if the memremap() fails.
--- drivers/xen/xenbus/xenbus_probe.c | 36 ++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-)
drivers/xen/xenbus/xenbus_probe.c +23 -13
@@ -65,13 +65,17 @@#include "xenbus.h" -static int xs_init_irq; +static int xs_init_irq =-1 ;int xen_store_evtchn;EXPORT_SYMBOL_GPL (xen_store_evtchn);struct xenstore_domain_interface *xen_store_interface;EXPORT_SYMBOL_GPL (xen_store_interface); +#define XS_INTERFACE_READY \ + ((xen_store_interface != NULL) && \ + (xen_store_interface->connection == XENSTORE_CONNECTED)) +enum xenstore_init xen_store_domain_type;EXPORT_SYMBOL_GPL (xen_store_domain_type);
@@ -751,19 +755,19 @@ static void xenbus_probe(void) { xenstored_ready =1 ; -if (!xen_store_interface) { +if (!xen_store_interface) xen_store_interface =memremap (xen_store_gfn <<XEN_PAGE_SHIFT ,XEN_PAGE_SIZE ,MEMREMAP_WB ); -/* -* Now it is safe to free the IRQ used for xenstore late -* initialization. No need to unbind: it is about to be -* bound again from xb_init_comms. Note that calling -* unbind_from_irqhandler now would result in xen_evtchn_close() -* being called and the event channel not being enabled again -* afterwards, resulting in missed event notifications. -*/ +/* +* Now it is safe to free the IRQ used for xenstore late +* initialization. No need to unbind: it is about to be +* bound again from xb_init_comms. Note that calling +* unbind_from_irqhandler now would result in xen_evtchn_close() +* being called and the event channel not being enabled again +* afterwards, resulting in missed event notifications. +*/ +if (xs_init_irq >=0 )free_irq (xs_init_irq, &xb_waitq); - }/* * In the HVM case, xenbus_init() deferred its call to
@@ -822,7 +826,7 @@ static int __init xenbus_probe_initcall(void)if (xen_store_domain_type ==XS_PV || (xen_store_domain_type ==XS_HVM && !xs_hvm_defer_init_for_callback () && - xen_store_interface !=NULL )) +XS_INTERFACE_READY ))xenbus_probe ();/*
@@ -831,7 +835,7 @@ static int __init xenbus_probe_initcall(void)* started, then probe. It will be triggered when communication * starts happening, by waiting on xb_waitq. */ -if (xen_store_domain_type ==XS_LOCAL || xen_store_interface ==NULL ) { +if (xen_store_domain_type ==XS_LOCAL || !XS_INTERFACE_READY ) {struct task_struct *probe_task; probe_task = kthread_run(xenbus_probe_thread, NULL,
@@ -1014,6 +1018,12 @@ static int __init xenbus_init(void) xen_store_interface =memremap (xen_store_gfn <<XEN_PAGE_SHIFT ,XEN_PAGE_SIZE ,MEMREMAP_WB ); +if (!xen_store_interface) { +pr_err ("%s: cannot map HVM_PARAM_STORE_PFN=%llx\n" , + __func__, v); + err = -EINVAL ; + goto out_error; + }if (xen_store_interface->connection !=XENSTORE_CONNECTED ) wait = true; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 668/744 ice: Interpret .set_channels() input differently
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larysa Zaremba <[email protected]>
[ Upstream commit 05d6f442f31f901d27dbc64fd504a8ec7d5013de ]
A bug occurs because a safety check guarding AF_XDP-related queues in ethnl_set_channels(), does not trigger. This happens, because kernel and ice driver interpret the ethtool command differently.
How the bug occurs:
1. ethtool -l <IFNAME> -> combined: 40
2. Attach AF_XDP to queue 30
3. ethtool -L <IFNAME> rx 15 tx 15
combined number is not specified, so command becomes {rx_count = 15, tx_count = 15, combined_count = 40}.
4. ethnl_set_channels checks, if there are any AF_XDP of queues from the new (combined_count + rx_count) to the old one, so from 55 to 40, check does not trigger.
5. ice interprets rx 15 tx 15 as 15 combined channels and deletes the queue that AF_XDP is attached to.
Interpret the command in a way that is more consistent with ethtool manual [0] (--show-channels and --set-channels).
Considering that in the ice driver only the difference between RX and TX queues forms dedicated channels, change the correct way to set number of channels to:
ethtool -L <IFNAME> combined 10 /* For symmetric queues */ ethtool -L <IFNAME> combined 8 tx 2 rx 0 /* For asymmetric queues */
[0] https://man7.org/linux/man-pages/man8/ethtool.8.html
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +2 -17
@@ -3429,7 +3429,6 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch)struct ice_pf *pf = vsi->back;int new_rx =0 , new_tx =0 ;bool locked = false; -u32 curr_combined;int ret =0 ;/* do not support changing channels in Safe Mode */
@@ -3451,22 +3450,8 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch)return -EOPNOTSUPP ; } - curr_combined =ice_get_combined_cnt (vsi); - -/* these checks are for cases where user didn't specify a particular -* value on cmd line but we get non-zero value anyway via -* get_channels(); look at ethtool.c in ethtool repository (the user -* space part), particularly, do_schannels() routine -*/ -if (ch->rx_count == vsi->num_rxq - curr_combined) - ch->rx_count =0 ; -if (ch->tx_count == vsi->num_txq - curr_combined) - ch->tx_count =0 ; -if (ch->combined_count == curr_combined) - ch->combined_count =0 ; - -if (!(ch->combined_count || (ch->rx_count && ch->tx_count))) { -netdev_err (dev,"Please specify at least 1 Rx and 1 Tx channel\n" ); +if (ch->rx_count && ch->tx_count) { +netdev_err (dev,"Dedicated RX or TX channels cannot be used simultaneously\n" );return -EINVAL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 669/744 kasan, fortify: properly rename memintrinsics
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Konovalov <[email protected]>
[ Upstream commit 2e577732e8d28b9183df701fb90cb7943aa4ed16 ]
After commit 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") and the follow-up fixes, with CONFIG_FORTIFY_SOURCE enabled, even though the compiler instruments meminstrinsics by generating calls to __asan/__hwasan_ prefixed functions, FORTIFY_SOURCE still uses uninstrumented memset/memmove/memcpy as the underlying functions.
As a result, KASAN cannot detect bad accesses in memset/memmove/memcpy. This also makes KASAN tests corrupt kernel memory and cause crashes.
To fix this, use __asan_/__hwasan_memset/memmove/memcpy as the underlying functions whenever appropriate. Do this only for the instrumented code (as indicated by __SANITIZE_ADDRESS__).
--- include/linux/fortify-string.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
include/linux/fortify-string.h +18 -4
@@ -31,17 +31,30 @@ void __write_overflow_field(size_t avail, size_t wanted) __compiletime_warning(" __ret; \ }) -#if defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS ) +#if defined(__SANITIZE_ADDRESS__) + +#if !defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX ) && !defined(CONFIG_GENERIC_ENTRY ) +extern void *__underlying_memset (void *p,int c,__kernel_size_t size)__RENAME (memset); +extern void *__underlying_memmove (void *p,const void *q,__kernel_size_t size)__RENAME (memmove); +extern void *__underlying_memcpy (void *p,const void *q,__kernel_size_t size)__RENAME (memcpy); +#elif defined(CONFIG_KASAN_GENERIC ) +extern void *__underlying_memset (void *p,int c,__kernel_size_t size)__RENAME (__asan_memset); +extern void *__underlying_memmove (void *p,const void *q,__kernel_size_t size)__RENAME (__asan_memmove); +extern void *__underlying_memcpy (void *p,const void *q,__kernel_size_t size)__RENAME (__asan_memcpy); +#else /* CONFIG_KASAN_SW_TAGS */ +extern void *__underlying_memset (void *p,int c,__kernel_size_t size)__RENAME (__hwasan_memset); +extern void *__underlying_memmove (void *p,const void *q,__kernel_size_t size)__RENAME (__hwasan_memmove); +extern void *__underlying_memcpy (void *p,const void *q,__kernel_size_t size)__RENAME (__hwasan_memcpy); +#endif +extern void *__underlying_memchr (const void *p,int c,__kernel_size_t size)__RENAME (memchr); extern int __underlying_memcmp(const void *p, const void *q, __kernel_size_t size) __RENAME(memcmp); -extern void *__underlying_memcpy (void *p,const void *q,__kernel_size_t size)__RENAME (memcpy); -extern void *__underlying_memmove (void *p,const void *q,__kernel_size_t size)__RENAME (memmove); -extern void *__underlying_memset (void *p,int c,__kernel_size_t size)__RENAME (memset);extern char *__underlying_strcat (char *p,const char *q)__RENAME (strcat);extern char *__underlying_strcpy (char *p,const char *q)__RENAME (strcpy); extern __kernel_size_t __underlying_strlen(const char *p) __RENAME(strlen);extern char *__underlying_strncat (char *p,const char *q,__kernel_size_t count)__RENAME (strncat);extern char *__underlying_strncpy (char *p,const char *q,__kernel_size_t size)__RENAME (strncpy); +#else #if defined(__SANITIZE_MEMORY__)
@@ -66,6 +79,7 @@ extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size)#define __underlying_strlen __builtin_strlen#define __underlying_strncat __builtin_strncat#define __underlying_strncpy __builtin_strncpy +#endif /**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 670/744 tracing/probes: fix error check in parse_btf_field()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos López <[email protected]>
[ Upstream commit e569eb34970281438e2b48a3ef11c87459fcfbcb ]
btf_find_struct_member() might return NULL or an error via the ERR_PTR() macro. However, its caller in parse_btf_field() only checks for the NULL condition. Fix this by using IS_ERR() and returning the error up the stack.
--- kernel/trace/trace_probe.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/trace_probe.c +4 -0
@@ -553,6 +553,10 @@ static int parse_btf_field(char *fieldname, const struct btf_type *type, anon_offs =0 ; field =btf_find_struct_member (ctx->btf, type, fieldname, &anon_offs); +if (IS_ERR (field)) { +trace_probe_log_err (ctx->offset,BAD_BTF_TID ); +return PTR_ERR (field); + }if (!field) {trace_probe_log_err (ctx->offset,NO_BTF_FIELD );return -ENOENT ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 671/744 tpm_tis_spi: Account for SPI header when allocating TPM SPI xfer buffer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew R. Ochs <[email protected]>
[ Upstream commit 195aba96b854dd664768f382cd1db375d8181f88 ]
The TPM SPI transfer mechanism uses MAX_SPI_FRAMESIZE for computing the maximum transfer length and the size of the transfer buffer. As such, it does not account for the 4 bytes of header that prepends the SPI data frame. This can result in out-of-bounds accesses and was confirmed with KASAN.
Introduce SPI_HDRSIZE to account for the header and use to allocate the transfer buffer.
--- drivers/char/tpm/tpm_tis_spi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/tpm/tpm_tis_spi_main.c +2 -1
@@ -37,6 +37,7 @@#include "tpm_tis_spi.h" #define MAX_SPI_FRAMESIZE 64 +#define SPI_HDRSIZE 4/* * TCG SPI flow control is documented in section 6.4 of the spec[1]. In short,
@@ -247,7 +248,7 @@ static int tpm_tis_spi_write_bytes(struct tpm_tis_data *data, u32 addr,int tpm_tis_spi_init (struct spi_device *spi,struct tpm_tis_spi_phy *phy,int irq,const struct tpm_tis_phy_ops *phy_ops) { - phy->iobuf =devm_kmalloc (&spi->dev,MAX_SPI_FRAMESIZE ,GFP_KERNEL ); + phy->iobuf =devm_kmalloc (&spi->dev,SPI_HDRSIZE +MAX_SPI_FRAMESIZE ,GFP_KERNEL );if (!phy->iobuf)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 672/744 netfilter: nfnetlink_queue: acquire rcu_read_lock() in instance_destroy_rcu()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit dc21c6cc3d6986d938efbf95de62473982c98dec ]
syzbot reported that nf_reinject() could be called without rcu_read_lock() :
WARNING: suspicious RCU usage 6.9.0-rc7-syzkaller-02060-g5c1672705a1a #0 Not tainted
net/netfilter/nfnetlink_queue.c:263 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by syz-executor.4/13427:
#0: ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_lock_acquire include/linux/rcupdate.h:329 [inline] #0: ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_do_batch kernel/rcu/tree.c:2190 [inline] #0: ffffffff8e334f60 (rcu_callback){....}-{0:0}, at: rcu_core+0xa86/0x1830 kernel/rcu/tree.c:2471 #1: ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: spin_lock_bh include/linux/spinlock.h:356 [inline] #1: ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: nfqnl_flush net/netfilter/nfnetlink_queue.c:405 [inline] #1: ffff88801ca92958 (&inst->lock){+.-.}-{2:2}, at: instance_destroy_rcu+0x30/0x220 net/netfilter/nfnetlink_queue.c:172
stack backtrace: CPU: 0 PID: 13427 Comm: syz-executor.4 Not tainted 6.9.0-rc7-syzkaller-02060-g5c1672705a1a #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 04/02/2024 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:114 lockdep_rcu_suspicious+0x221/0x340 kernel/locking/lockdep.c:6712 nf_reinject net/netfilter/nfnetlink_queue.c:323 [inline] nfqnl_reinject+0x6ec/0x1120 net/netfilter/nfnetlink_queue.c:397 nfqnl_flush net/netfilter/nfnetlink_queue.c:410 [inline] instance_destroy_rcu+0x1ae/0x220 net/netfilter/nfnetlink_queue.c:172 rcu_do_batch kernel/rcu/tree.c:2196 [inline] rcu_core+0xafd/0x1830 kernel/rcu/tree.c:2471 handle_softirqs+0x2d6/0x990 kernel/softirq.c:554 __do_softirq kernel/softirq.c:588 [inline] invoke_softirq kernel/softirq.c:428 [inline] __irq_exit_rcu+0xf4/0x1c0 kernel/softirq.c:637 irq_exit_rcu+0x9/0x30 kernel/softirq.c:649 instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1043 [inline] sysvec_apic_timer_interrupt+0xa6/0xc0 arch/x86/kernel/apic/apic.c:1043 </IRQ> <TASK>
--- net/netfilter/nfnetlink_queue.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nfnetlink_queue.c +2 -0
@@ -169,7 +169,9 @@ instance_destroy_rcu(struct rcu_head *head) struct nfqnl_instance *inst = container_of(head, struct nfqnl_instance, rcu); +rcu_read_lock ();nfqnl_flush (inst,NULL ,0 ); +rcu_read_unlock ();kfree (inst);module_put (THIS_MODULE ); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 673/744 netfilter: ipset: Add list flush to cancel_gc
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Maltsev <[email protected]>
[ Upstream commit c1193d9bbbd379defe9be3c6de566de684de8a6f ]
Flushing list in cancel_gc drops references to other lists right away, without waiting for RCU to destroy list. Fixes race when referenced ipsets can't be destroyed while referring list is scheduled for destroy.
--- net/netfilter/ipset/ip_set_list_set.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/ipset/ip_set_list_set.c +3 -0
@@ -549,6 +549,9 @@ list_set_cancel_gc(struct ip_set *set)if (SET_WITH_TIMEOUT (set))timer_shutdown_sync (&map->gc); + +/* Flush list to drop references to other ipsets */ +list_set_flush (set); }static const struct ip_set_type_variant set_variant = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 674/744 netfilter: nft_payload: restore vlan q-in-q match support
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit aff5c01fa1284d606f8e7cbdaafeef2511bb46c1 ]
Revert f6ae9f120dad ("netfilter: nft_payload: add C-VLAN support").
f41f72d09ee1 ("netfilter: nft_payload: simplify vlan header handling") already allows to match on inner vlan tags by subtract the vlan header size to the payload offset which has been popped and stored in skbuff metadata fields.
--- net/netfilter/nft_payload.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
net/netfilter/nft_payload.c +7 -16
@@ -45,36 +45,27 @@ nft_payload_copy_vlan(u32 *d, const struct sk_buff *skb, u8 offset, u8 len)int mac_off =skb_mac_header (skb) - skb->data;u8 *vlanh, *dst_u8 = (u8 *) d;struct vlan_ethhdr veth; -u8 vlan_hlen =0 ; - -if ((skb->protocol ==htons (ETH_P_8021AD ) || - skb->protocol ==htons (ETH_P_8021Q )) && - offset >=VLAN_ETH_HLEN && offset <VLAN_ETH_HLEN +VLAN_HLEN ) - vlan_hlen +=VLAN_HLEN ; vlanh = (u8 *) &veth; -if (offset <VLAN_ETH_HLEN + vlan_hlen) { +if (offset <VLAN_ETH_HLEN ) {u8 ethlen = len; -if (vlan_hlen && -skb_copy_bits (skb, mac_off, &veth,VLAN_ETH_HLEN ) <0 ) -return false; -else if (!nft_payload_rebuild_vlan_hdr (skb, mac_off, &veth)) +if (!nft_payload_rebuild_vlan_hdr (skb, mac_off, &veth))return false; -if (offset + len >VLAN_ETH_HLEN + vlan_hlen) - ethlen -= offset + len -VLAN_ETH_HLEN - vlan_hlen; +if (offset + len >VLAN_ETH_HLEN ) + ethlen -= offset + len -VLAN_ETH_HLEN ; -memcpy (dst_u8, vlanh + offset - vlan_hlen, ethlen); +memcpy (dst_u8, vlanh + offset, ethlen); len -= ethlen;if (len ==0 )return true; dst_u8 += ethlen; - offset =ETH_HLEN + vlan_hlen; + offset =ETH_HLEN ; }else { - offset -=VLAN_HLEN + vlan_hlen; + offset -=VLAN_HLEN ; }return skb_copy_bits (skb, offset + mac_off, dst_u8, len) ==0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 675/744 spi: Dont mark message DMA mapped when no transfer in it is
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 9f788ba457b45b0ce422943fcec9fa35c4587764 ]
There is no need to set the DMA mapped flag of the message if it has no mapped transfers. Moreover, it may give the code a chance to take the wrong paths, i.e. to exercise DMA related APIs on unmapped data. Make __spi_map_msg() to bail earlier on the above mentioned cases.
--- drivers/spi/spi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/spi/spi.c +4 -0
@@ -1128,6 +1128,7 @@ static int __spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)else rx_dev = ctlr->dev.parent; + ret = -ENOMSG ;list_for_each_entry (xfer, &msg->transfers, transfer_list) {/* The sync is done before each transfer. */ unsigned long attrs =DMA_ATTR_SKIP_CPU_SYNC ;
@@ -1157,6 +1158,9 @@ static int __spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg) } } } +/* No transfer has been mapped, bail out with success */ +if (ret) +return 0 ; ctlr->cur_rx_dma_dev = rx_dev; ctlr->cur_tx_dma_dev = tx_dev;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 676/744 kthread: add kthread_stop_put
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 6309727ef27162deabd5c095c11af24970fba5a2 ]
Add a kthread_stop_put() helper that stops a thread and puts its task struct. Use it to replace the various instances of kthread_stop() followed by put_task_struct().
Remove the kthread_stop_put() macro in usbip that is similar but doesn't return the result of kthread_stop().
Stable-dep-of: bb9025f4432f ("dma-mapping: benchmark: fix up kthread-related error handling")
--- drivers/accel/ivpu/ivpu_job.c | 3 +-- drivers/dma-buf/st-dma-fence-chain.c | 12 ++++-------- drivers/dma-buf/st-dma-fence.c | 4 +--- drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +--- drivers/net/xen-netback/interface.c | 3 +-- drivers/usb/usbip/usbip_common.h | 6 ------ fs/gfs2/ops_fstype.c | 9 +++------ include/linux/kthread.h | 1 + kernel/irq/manage.c | 15 +++++---------- kernel/kthread.c | 18 ++++++++++++++++++ kernel/smpboot.c | 3 +-- mm/damon/core.c | 3 +-- net/core/pktgen.c | 3 +-- 13 files changed, 38 insertions(+), 46 deletions(-)
drivers/accel/ivpu/ivpu_job.c +1 -2
@@ -618,6 +618,5 @@ int ivpu_job_done_thread_init(struct ivpu_device *vdev)void ivpu_job_done_thread_fini (struct ivpu_device *vdev) { -kthread_stop (vdev->job_done_thread); -put_task_struct (vdev->job_done_thread); +kthread_stop_put (vdev->job_done_thread); }
drivers/dma-buf/st-dma-fence-chain.c +4 -8
@@ -476,10 +476,9 @@ static int find_race(void *arg)for (i =0 ; i < ncpus; i++) {int ret; - ret =kthread_stop (threads[i]); + ret =kthread_stop_put (threads[i]);if (ret && !err) err = ret; -put_task_struct (threads[i]); }kfree (threads);
@@ -591,8 +590,7 @@ static int wait_forward(void *arg)for (i =0 ; i < fc.chain_length; i++)dma_fence_signal (fc.fences[i]); - err =kthread_stop (tsk); -put_task_struct (tsk); + err =kthread_stop_put (tsk); err:fence_chains_fini (&fc);
@@ -621,8 +619,7 @@ static int wait_backward(void *arg)for (i = fc.chain_length; i--; )dma_fence_signal (fc.fences[i]); - err =kthread_stop (tsk); -put_task_struct (tsk); + err =kthread_stop_put (tsk); err:fence_chains_fini (&fc);
@@ -669,8 +666,7 @@ static int wait_random(void *arg)for (i =0 ; i < fc.chain_length; i++)dma_fence_signal (fc.fences[i]); - err =kthread_stop (tsk); -put_task_struct (tsk); + err =kthread_stop_put (tsk); err:fence_chains_fini (&fc);
drivers/dma-buf/st-dma-fence.c +1 -3
@@ -548,11 +548,9 @@ static int race_signal_callback(void *arg)for (i =0 ; i <ARRAY_SIZE (t); i++) {int err; - err =kthread_stop (t[i].task); + err =kthread_stop_put (t[i].task);if (err && !ret) ret = err; - -put_task_struct (t[i].task); } }
drivers/gpu/drm/i915/gt/selftest_migrate.c +1 -3
@@ -719,11 +719,9 @@ static int threaded_migrate(struct intel_migrate *migrate,if (IS_ERR_OR_NULL (tsk))continue ; - status =kthread_stop (tsk); + status =kthread_stop_put (tsk);if (status && !err) err = status; - -put_task_struct (tsk); }kfree (thread);
drivers/net/xen-netback/interface.c +1 -2
@@ -668,8 +668,7 @@ int xenvif_connect_ctrl(struct xenvif *vif, grant_ref_t ring_ref,static void xenvif_disconnect_queue (struct xenvif_queue *queue) {if (queue->task) { -kthread_stop (queue->task); -put_task_struct (queue->task); +kthread_stop_put (queue->task); queue->task =NULL ; }
drivers/usb/usbip/usbip_common.h +0 -6
@@ -298,12 +298,6 @@ struct usbip_device { __k; \ }) -#define kthread_stop_put (k) \ - do { \ - kthread_stop(k); \ - put_task_struct(k); \ - } while (0) -/* usbip_common.c */ void usbip_dump_urb (struct urb *purb);void usbip_dump_header (struct usbip_header *pdu);
fs/gfs2/ops_fstype.c +3 -6
@@ -1127,8 +1127,7 @@ static int init_threads(struct gfs2_sbd *sdp)return 0 ; fail: -kthread_stop (sdp->sd_logd_process); -put_task_struct (sdp->sd_logd_process); +kthread_stop_put (sdp->sd_logd_process); sdp->sd_logd_process =NULL ;return error; }
@@ -1136,13 +1135,11 @@ static int init_threads(struct gfs2_sbd *sdp)void gfs2_destroy_threads (struct gfs2_sbd *sdp) {if (sdp->sd_logd_process) { -kthread_stop (sdp->sd_logd_process); -put_task_struct (sdp->sd_logd_process); +kthread_stop_put (sdp->sd_logd_process); sdp->sd_logd_process =NULL ; }if (sdp->sd_quotad_process) { -kthread_stop (sdp->sd_quotad_process); -put_task_struct (sdp->sd_quotad_process); +kthread_stop_put (sdp->sd_quotad_process); sdp->sd_quotad_process =NULL ; } }
include/linux/kthread.h +1 -0
@@ -86,6 +86,7 @@ void free_kthread_struct(struct task_struct *k);void kthread_bind (struct task_struct *k,unsigned int cpu);void kthread_bind_mask (struct task_struct *k,const struct cpumask *mask);int kthread_stop (struct task_struct *k); +int kthread_stop_put (struct task_struct *k);bool kthread_should_stop (void );bool kthread_should_park (void );bool kthread_should_stop_or_park (void );
kernel/irq/manage.c +5 -10
@@ -1852,15 +1852,13 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)struct task_struct *t = new->thread; new->thread =NULL ; -kthread_stop (t); -put_task_struct (t); +kthread_stop_put (t); }if (new->secondary && new->secondary->thread) {struct task_struct *t = new->secondary->thread; new->secondary->thread =NULL ; -kthread_stop (t); -put_task_struct (t); +kthread_stop_put (t); } out_mput:module_put (desc->owner);
@@ -1971,12 +1969,9 @@ static struct irqaction *__free_irq(struct irq_desc *desc, void *dev_id)* the same bit to a newly requested action. */ if (action->thread) { -kthread_stop (action->thread); -put_task_struct (action->thread); -if (action->secondary && action->secondary->thread) { -kthread_stop (action->secondary->thread); -put_task_struct (action->secondary->thread); - } +kthread_stop_put (action->thread); +if (action->secondary && action->secondary->thread) +kthread_stop_put (action->secondary->thread); }/* Last action releases resources */
kernel/kthread.c +18 -0
@@ -715,6 +715,24 @@ int kthread_stop(struct task_struct *k) }EXPORT_SYMBOL (kthread_stop); +/** +* kthread_stop_put - stop a thread and put its task struct +* @k: thread created by kthread_create(). +* +* Stops a thread created by kthread_create() and put its task_struct. +* Only use when holding an extra task struct reference obtained by +* calling get_task_struct(). +*/ +int kthread_stop_put (struct task_struct *k) +{ +int ret; + + ret =kthread_stop (k); +put_task_struct (k); +return ret; +} +EXPORT_SYMBOL (kthread_stop_put); +int kthreadd (void *unused) {struct task_struct *tsk = current;
kernel/smpboot.c +1 -2
@@ -272,8 +272,7 @@ static void smpboot_destroy_threads(struct smp_hotplug_thread *ht)struct task_struct *tsk = *per_cpu_ptr (ht->store, cpu);if (tsk) { -kthread_stop (tsk); -put_task_struct (tsk); +kthread_stop_put (tsk); *per_cpu_ptr (ht->store, cpu) =NULL ; } }
mm/damon/core.c +1 -2
@@ -708,8 +708,7 @@ static int __damon_stop(struct damon_ctx *ctx)if (tsk) {get_task_struct (tsk);mutex_unlock (&ctx->kdamond_lock); -kthread_stop (tsk); -put_task_struct (tsk); +kthread_stop_put (tsk);return 0 ; }mutex_unlock (&ctx->kdamond_lock);
net/core/pktgen.c +1 -2
@@ -3982,8 +3982,7 @@ static void __net_exit pg_net_exit(struct net *net)list_for_each_safe (q, n, &list) { t = list_entry(q, struct pktgen_thread, th_list);list_del (&t->th_list); -kthread_stop (t->tsk); -put_task_struct (t->tsk); +kthread_stop_put (t->tsk);kfree (t); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 677/744 dma-mapping: benchmark: fix up kthread-related error handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit bb9025f4432f8c158322cf2c04c2b492f23eb511 ]
kthread creation failure is invalidly handled inside do_map_benchmark(). The put_task_struct() calls on the error path are supposed to balance the get_task_struct() calls which only happen after all the kthreads are successfully created. Rollback using kthread_stop() for already created kthreads in case of such failure.
In normal situation call kthread_stop_put() to gracefully stop kthreads and put their task refcounts. This should be done for all started kthreads.
Found by Linux Verification Center (linuxtesting.org).
--- kernel/dma/map_benchmark.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
kernel/dma/map_benchmark.c +10 -6
@@ -118,6 +118,8 @@ static int do_map_benchmark(struct map_benchmark_data *map)if (IS_ERR (tsk[i])) {pr_err ("create dma_map thread failed\n" ); ret =PTR_ERR (tsk[i]); +while (--i >=0 ) +kthread_stop (tsk[i]); goto out; }
@@ -139,13 +141,17 @@ static int do_map_benchmark(struct map_benchmark_data *map)msleep_interruptible (map->bparam.seconds *1000 ); -/* wait for the completion of benchmark threads */ +/* wait for the completion of all started benchmark threads */ for (i =0 ; i < threads; i++) { - ret =kthread_stop (tsk[i]); -if (ret) - goto out; +int kthread_ret =kthread_stop_put (tsk[i]); + +if (kthread_ret) + ret = kthread_ret; } +if (ret) + goto out; + loops =atomic64_read (&map->loops);if (likely (loops >0 )) {u64 map_variance, unmap_variance;
@@ -170,8 +176,6 @@ static int do_map_benchmark(struct map_benchmark_data *map) } out: -for (i =0 ; i < threads; i++) -put_task_struct (tsk[i]);put_device (map->dev);kfree (tsk);return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 678/744 dma-mapping: benchmark: fix node id validation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit 1ff05e723f7ca30644b8ec3fb093f16312e408ad ]
While validating node ids in map_benchmark_ioctl(), node_possible() may be provided with invalid argument outside of [0,MAX_NUMNODES-1] range leading to:
BUG: KASAN: wild-memory-access in map_benchmark_ioctl (kernel/dma/map_benchmark.c:214) Read of size 8 at addr 1fffffff8ccb6398 by task dma_map_benchma/971 CPU: 7 PID: 971 Comm: dma_map_benchma Not tainted 6.9.0-rc6 #37 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Call Trace: <TASK>
dump_stack_lvl (lib/dump_stack.c:117)kasan_report (mm/kasan/report.c:603)kasan_check_range (mm/kasan/generic.c:189)variable_test_bit (arch/x86/include/asm/bitops.h:227) [inline] arch_test_bit (arch/x86/include/asm/bitops.h:239) [inline] _test_bit at (include/asm-generic/bitops/instrumented-non-atomic.h:142) [inline] node_state (include/linux/nodemask.h:423) [inline] map_benchmark_ioctl (kernel/dma/map_benchmark.c:214) full_proxy_unlocked_ioctl (fs/debugfs/file.c:333)__x64_sys_ioctl (fs/ioctl.c:890)do_syscall_64 (arch/x86/entry/common.c:83) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130)
Compare node ids with sane bounds first. NUMA_NO_NODE is considered a special valid case meaning that benchmarking kthreads won't be bound to a cpuset of a given node.
Found by Linux Verification Center (linuxtesting.org).
--- kernel/dma/map_benchmark.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/dma/map_benchmark.c +2 -1
@@ -212,7 +212,8 @@ static long map_benchmark_ioctl(struct file *file, unsigned int cmd, }if (map->bparam.node !=NUMA_NO_NODE && - !node_possible (map->bparam.node)) { + (map->bparam.node <0 || map->bparam.node >=MAX_NUMNODES || + !node_possible (map->bparam.node))) {pr_err ("invalid numa node\n" );return -EINVAL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 679/744 dma-mapping: benchmark: handle NUMA_NO_NODE correctly
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit e64746e74f717961250a155e14c156616fcd981f ]
cpumask_of_node() can be called for NUMA_NO_NODE inside do_map_benchmark() resulting in the following sanitizer report:
UBSAN: array-index-out-of-bounds in ./arch/x86/include/asm/topology.h:72:28 index -1 is out of range for type 'cpumask [64][1]' CPU: 1 PID: 990 Comm: dma_map_benchma Not tainted 6.9.0-rc6 #29 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Call Trace: <TASK>
dump_stack_lvl (lib/dump_stack.c:117)ubsan_epilogue (lib/ubsan.c:232) __ubsan_handle_out_of_bounds (lib/ubsan.c:429) cpumask_of_node (arch/x86/include/asm/topology.h:72) [inline] do_map_benchmark (kernel/dma/map_benchmark.c:104) map_benchmark_ioctl (kernel/dma/map_benchmark.c:246) full_proxy_unlocked_ioctl (fs/debugfs/file.c:333) __x64_sys_ioctl (fs/ioctl.c:890)do_syscall_64 (arch/x86/entry/common.c:83) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130)
Use cpumask_of_node() in place when binding a kernel thread to a cpuset of a particular node.
Note that the provided node id is checked inside map_benchmark_ioctl(). It's just a NUMA_NO_NODE case which is not handled properly later.
Found by Linux Verification Center (linuxtesting.org).
--- kernel/dma/map_benchmark.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/dma/map_benchmark.c +1 -2
@@ -101,7 +101,6 @@ static int do_map_benchmark(struct map_benchmark_data *map)struct task_struct **tsk;int threads = map->bparam.threads;int node = map->bparam.node; -const cpumask_t *cpu_mask =cpumask_of_node (node);u64 loops;int ret =0 ;int i;
@@ -124,7 +123,7 @@ static int do_map_benchmark(struct map_benchmark_data *map) }if (node !=NUMA_NO_NODE ) -kthread_bind_mask (tsk[i], cpu_mask); +kthread_bind_mask (tsk[i],cpumask_of_node (node)); }/* clear the old value in the previous benchmark */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 680/744 nvme-tcp: add definitions for TLS cipher suites
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit a86062aac34d100a3117c0fff91ee1892ebfb460 ]
Stable-dep-of: a2e4c5f5f68d ("nvme-multipath: fix io accounting on failover")
--- include/linux/nvme-tcp.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/nvme-tcp.h +6 -0
@@ -18,6 +18,12 @@ enum nvme_tcp_pfv { NVME_TCP_PFV_1_0 = 0x0, }; +enum nvme_tcp_tls_cipher { +NVME_TCP_TLS_CIPHER_INVALID =0 , +NVME_TCP_TLS_CIPHER_SHA256 =1 , +NVME_TCP_TLS_CIPHER_SHA384 =2 , +}; +enum nvme_tcp_fatal_error_status {NVME_TCP_FES_INVALID_PDU_HDR =0x01 ,NVME_TCP_FES_PDU_SEQ_ERR =0x02 ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 681/744 nvme-multipath: fix io accounting on failover
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keith Busch <[email protected]>
[ Upstream commit a2e4c5f5f68dbd206f132bc709b98dea64afc3b8 ]
There are io stats accounting that needs to be handled, so don't call blk_mq_end_request() directly. Use the existing nvme_end_req() helper that already handles everything.
--- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 3 ++- drivers/nvme/host/nvme.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +1 -1
@@ -377,7 +377,7 @@ static inline void nvme_end_req_zoned(struct request *req) le64_to_cpu(nvme_req(req)->result.u64)); } -static inline void nvme_end_req (struct request *req) +void nvme_end_req (struct request *req) {blk_status_t status =nvme_error_status (nvme_req (req)->status);
drivers/nvme/host/multipath.c +2 -1
@@ -118,7 +118,8 @@ void nvme_failover_req(struct request *req)blk_steal_bios (&ns->head->requeue_list, req);spin_unlock_irqrestore (&ns->head->requeue_lock, flags); -blk_mq_end_request (req,0 ); +nvme_req (req)->status =0 ; +nvme_end_req (req);kblockd_schedule_work (&ns->head->requeue_work); }
drivers/nvme/host/nvme.h +1 -0
@@ -761,6 +761,7 @@ static inline bool nvme_state_terminal(struct nvme_ctrl *ctrl) } } +void nvme_end_req (struct request *req);void nvme_complete_rq (struct request *req);void nvme_complete_batch_req (struct request *req);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 682/744 nvmet: fix ns enable/disable possible hang
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
[ Upstream commit f97914e35fd98b2b18fb8a092e0a0799f73afdfe ]
When disabling an nvmet namespace, there is a period where the subsys->lock is released, as the ns disable waits for backend IO to complete, and the ns percpu ref to be properly killed. The original intent was to avoid taking the subsystem lock for a prolong period as other processes may need to acquire it (for example new incoming connections).
However, it opens up a window where another process may come in and enable the ns, (re)intiailizing the ns percpu_ref, causing the disable sequence to hang.
Solve this by taking the global nvmet_config_sem over the entire configfs enable/disable sequence.
--- drivers/nvme/target/configfs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/nvme/target/configfs.c +8 -0
@@ -538,10 +538,18 @@ static ssize_t nvmet_ns_enable_store(struct config_item *item,if (kstrtobool (page, &enable))return -EINVAL ; +/* +* take a global nvmet_config_sem because the disable routine has a +* window where it releases the subsys-lock, giving a chance to +* a parallel enable to concurrently execute causing the disable to +* have a misaccounting of the ns percpu_ref. +*/ +down_write (&nvmet_config_sem);if (enable) ret =nvmet_ns_enable (ns);else nvmet_ns_disable (ns); +up_write (&nvmet_config_sem);return ret ? ret : count; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 683/744 drm/amd/display: Enable colorspace property for MST connectors
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 8195979d2dd995d60c2663adf54c69c1bf4eadd1 ]
MST colorspace property support was disabled due to a series of warnings that came up when the device was plugged in since the properties weren't made at device creation. Create the properties in advance instead.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -0
@@ -606,6 +606,9 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, &connector->base, dev->mode_config.tile_property, 0); + connector->colorspace_property = master->base.colorspace_property; +if (connector->colorspace_property) +drm_connector_attach_colorspace_property (connector);drm_connector_set_path_property (connector, pathprop);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 684/744 net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8061
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathieu Othacehe <[email protected]>
[ Upstream commit 128d54fbcb14b8717ecf596d3dbded327b9980b3 ]
Following a similar reinstate for the KSZ8081 and KSZ9031.
Older kernels would use the genphy_soft_reset if the PHY did not implement a .soft_reset.
The KSZ8061 errata described here:
https://ww1.microchip.com/downloads/en/DeviceDoc/KSZ8061-Errata-DS80000688B.pdf
and worked around with 232ba3a51c ("net: phy: Micrel KSZ8061: link failure after cable connect") is back again without this soft reset.
--- drivers/net/phy/micrel.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/micrel.c +1 -0
@@ -4750,6 +4750,7 @@ static struct phy_driver ksphy_driver[] = {/* PHY_BASIC_FEATURES */ .probe = kszphy_probe, .config_init = ksz8061_config_init, + .soft_reset = genphy_soft_reset, .config_intr = kszphy_config_intr, .handle_interrupt = kszphy_handle_interrupt, .suspend = kszphy_suspend,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 685/744 net/mlx5: Lag, do bond only if slaves agree on roce state
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maher Sanalla <[email protected]>
[ Upstream commit 51ef9305b8f40946d65c40368ffb4c14636d369a ]
Currently, the driver does not enforce that lag bond slaves must have matching roce capabilities. Yet, in mlx5_do_bond(), the driver attempts to enable roce on all vports of the bond slaves, causing the following syndrome when one slave has no roce fw support:
mlx5_cmd_out_err:809:(pid 25427): MODIFY_NIC_VPORT_CONTEXT(0×755) op_mod(0×0) failed, status bad parameter(0×3), syndrome (0xc1f678), err(-22)
Thus, create HW lag only if bond's slaves agree on roce state, either all slaves have roce support resulting in a roce lag bond, or none do, resulting in a raw eth bond.
--- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +10 -2
@@ -720,6 +720,7 @@ bool mlx5_lag_check_prereq(struct mlx5_lag *ldev)struct mlx5_core_dev *dev;u8 mode;#endif +bool roce_support;int i;for (i =0 ; i < ldev->ports; i++)
@@ -746,6 +747,11 @@ bool mlx5_lag_check_prereq(struct mlx5_lag *ldev)if (mlx5_sriov_is_enabled (ldev->pf[i].dev))return false;#endif + roce_support =mlx5_get_roce_state (ldev->pf[MLX5_LAG_P1 ].dev); +for (i =1 ; i < ldev->ports; i++) +if (mlx5_get_roce_state (ldev->pf[i].dev) != roce_support) +return false; +return true; }
@@ -913,8 +919,10 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) }else if (roce_lag) { dev0->priv.flags &= ~MLX5_PRIV_FLAGS_DISABLE_IB_ADEV ;mlx5_rescan_drivers_locked (dev0); -for (i =1 ; i < ldev->ports; i++) -mlx5_nic_vport_enable_roce (ldev->pf[i].dev); +for (i =1 ; i < ldev->ports; i++) { +if (mlx5_get_roce_state (ldev->pf[i].dev)) +mlx5_nic_vport_enable_roce (ldev->pf[i].dev); + } }else if (shared_fdb) {int i;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 686/744 net/mlx5: Fix MTMP register capability offset in MCAM register
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 1b9f86c6d53245dab087f1b2c05727b5982142ff ]
The MTMP register (0x900a) capability offset is off-by-one, move it to the right place.
--- include/linux/mlx5/mlx5_ifc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/mlx5/mlx5_ifc.h +2 -2
@@ -10158,9 +10158,9 @@ struct mlx5_ifc_mcam_access_reg_bits {u8 mfrl[0x1 ];u8 regs_39_to_32[0x8 ]; -u8 regs_31_to_10[0x16 ]; +u8 regs_31_to_11[0x15 ];u8 mtmp[0x1 ]; -u8 regs_8_to_0[0x9 ]; +u8 regs_9_to_0[0xa ]; };struct mlx5_ifc_mcam_access_reg_bits1 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 687/744 net/mlx5: Use mlx5_ipsec_rx_status_destroy to correctly delete status rules
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Rameshbabu <[email protected]>
[ Upstream commit 16d66a4fa81da07bc4ed19f4e53b87263c2f8d38 ]
rx_create no longer allocates a modify_hdr instance that needs to be cleaned up. The mlx5_modify_header_dealloc call will lead to a NULL pointer dereference. A leak in the rules also previously occurred since there are now two rules populated related to status.
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 109907067 P4D 109907067 PUD 116890067 PMD 0 Oops: 0000 [#1] SMP CPU: 1 PID: 484 Comm: ip Not tainted 6.9.0-rc2-rrameshbabu+ #254 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS Arch Linux 1.16.3-1-1 04/01/2014 RIP: 0010:mlx5_modify_header_dealloc+0xd/0x70 <snip> Call Trace: <TASK> ? show_regs+0x60/0x70 ? __die+0x24/0x70 ? page_fault_oops+0x15f/0x430 ? free_to_partial_list.constprop.0+0x79/0x150 ? do_user_addr_fault+0x2c9/0x5c0 ? exc_page_fault+0x63/0x110 ? asm_exc_page_fault+0x27/0x30 ? mlx5_modify_header_dealloc+0xd/0x70 rx_create+0x374/0x590 rx_add_rule+0x3ad/0x500 ? rx_add_rule+0x3ad/0x500 ? mlx5_cmd_exec+0x2c/0x40 ? mlx5_create_ipsec_obj+0xd6/0x200 mlx5e_accel_ipsec_fs_add_rule+0x31/0xf0 mlx5e_xfrm_add_state+0x426/0xc00 <snip>
--- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c +1 -2
@@ -512,8 +512,7 @@ static int rx_create(struct mlx5_core_dev *mdev, struct mlx5e_ipsec *ipsec, err_fs_ft:if (rx->allow_tunnel_mode)mlx5_eswitch_unblock_encap (mdev); -mlx5_del_flow_rules (rx->status.rule); -mlx5_modify_header_dealloc (mdev, rx->status.modify_hdr); +mlx5_ipsec_rx_status_destroy (ipsec, rx); err_add:mlx5_destroy_flow_table (rx->ft.status); err_fs_ft_status:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 688/744 net/mlx5e: Fix IPsec tunnel mode offload feature check
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Rameshbabu <[email protected]>
[ Upstream commit 9a52f6d44f4521773b4699b4ed34b8e21d5a175c ]
Remove faulty check disabling checksum offload and GSO for offload of simple IPsec tunnel L4 traffic. Comment previously describing the deleted code incorrectly claimed the check prevented double tunnel (or three layers of ip headers).
--- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +5 -12
@@ -99,18 +99,11 @@ mlx5e_ipsec_feature_check(struct sk_buff *skb, netdev_features_t features)if (!x || !x->xso.offload_handle) goto out_disable; -if (xo->inner_ipproto) { -/* Cannot support tunnel packet over IPsec tunnel mode -* because we cannot offload three IP header csum -*/ -if (x->props.mode ==XFRM_MODE_TUNNEL ) - goto out_disable; - -/* Only support UDP or TCP L4 checksum */ -if (xo->inner_ipproto !=IPPROTO_UDP && - xo->inner_ipproto !=IPPROTO_TCP ) - goto out_disable; - } +/* Only support UDP or TCP L4 checksum */ +if (xo->inner_ipproto && + xo->inner_ipproto !=IPPROTO_UDP && + xo->inner_ipproto !=IPPROTO_TCP ) + goto out_disable;return features;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 689/744 net/mlx5e: Use rx_missed_errors instead of rx_dropped for reporting buffer exhaustion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carolina Jubran <[email protected]>
[ Upstream commit 5c74195d5dd977e97556e6fa76909b831c241230 ]
Previously, the driver incorrectly used rx_dropped to report device buffer exhaustion.
According to the documentation, rx_dropped should not be used to count packets dropped due to buffer exhaustion, which is the purpose of rx_missed_errors.
Use rx_missed_errors as intended for counting packets dropped due to buffer exhaustion.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -3756,7 +3756,7 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats)mlx5e_fold_sw_stats64 (priv, stats); } - stats->rx_dropped = priv->stats.qcnt.rx_out_of_buffer; + stats->rx_missed_errors = priv->stats.qcnt.rx_out_of_buffer; stats->rx_length_errors = PPORT_802_3_GET(pstats, a_in_range_length_errors) +
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 690/744 net/mlx5e: Fix UDP GSO for encapsulated packets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 83fea49f2711fc90c0d115b0ed04046b45155b65 ]
When the skb is encapsulated, adjust the inner UDP header instead of the outer one, and account for UDP header (instead of TCP) in the inline header size calculation.
--- .../net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h | 8 +++++++- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +7 -1
@@ -102,8 +102,14 @@ static inline void mlx5e_udp_gso_handle_tx_skb(struct sk_buff *skb) {int payload_len =skb_shinfo (skb)->gso_size +sizeof (struct udphdr ); +struct udphdr *udphdr; -udp_hdr (skb)->len =htons (payload_len); +if (skb->encapsulation) + udphdr = (struct udphdr *)skb_inner_transport_header (skb); +else + udphdr =udp_hdr (skb); + + udphdr->len =htons (payload_len); }struct mlx5e_accel_tx_state {
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +5 -1
@@ -153,7 +153,11 @@ mlx5e_tx_get_gso_ihs(struct mlx5e_txqsq *sq, struct sk_buff *skb, int *hopbyhop) *hopbyhop =0 ;if (skb->encapsulation) { - ihs =skb_inner_tcp_all_headers (skb); +if (skb_shinfo (skb)->gso_type &SKB_GSO_UDP_L4 ) + ihs =skb_inner_transport_offset (skb) + +sizeof (struct udphdr ); +else + ihs =skb_inner_tcp_all_headers (skb); stats->tso_inner_packets++; stats->tso_inner_bytes += skb->len - ihs; }else {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 691/744 dma-buf/sw-sync: dont enable IRQ from sync_print_obj()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tetsuo Handa <[email protected]>
[ Upstream commit b794918961516f667b0c745aebdfebbb8a98df39 ]
Since commit a6aa8fca4d79 ("dma-buf/sw-sync: Reduce irqsave/irqrestore from known context") by error replaced spin_unlock_irqrestore() with spin_unlock_irq() for both sync_debugfs_show() and sync_print_obj() despite sync_print_obj() is called from sync_debugfs_show(), lockdep complains inconsistent lock state warning.
Use plain spin_{lock,unlock}() for sync_print_obj(), for sync_debugfs_show() is already using spin_{lock,unlock}_irq().
--- drivers/dma-buf/sync_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma-buf/sync_debug.c +2 -2
@@ -110,12 +110,12 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)seq_printf (s,"%s: %d\n" , obj->name, obj->value); -spin_lock_irq (&obj->lock); +spin_lock (&obj->lock);/* Caller already disabled IRQ. */ list_for_each (pos, &obj->pt_list) { struct sync_pt *pt = container_of(pos, struct sync_pt, link);sync_print_fence (s, &pt->base, false); } -spin_unlock_irq (&obj->lock); +spin_unlock (&obj->lock); } static void sync_print_sync_file(struct seq_file *s,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 692/744 bpf: Fix potential integer overflow in resolve_btfids
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Friedrich Vock <[email protected]>
[ Upstream commit 44382b3ed6b2787710c8ade06c0e97f5970a47c8 ]
err is a 32-bit integer, but elf_update returns an off_t, which is 64-bit at least on 64-bit platforms. If symbols_patch is called on a binary between 2-4GB in size, the result will be negative when cast to a 32-bit integer, which the code assumes means an error occurred. This can wrongly trigger build failures when building very large kernel images.
--- tools/bpf/resolve_btfids/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/resolve_btfids/main.c +1 -1
@@ -728,7 +728,7 @@ static int sets_patch(struct object *obj)static int symbols_patch (struct object *obj) { -int err; +off_t err; if (__symbols_patch(obj, &obj->structs) || __symbols_patch(obj, &obj->unions) ||
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 693/744 ALSA: jack: Use guard() for locking
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7234795b59f7b0b14569ec46dce56300a4988067 ]
We can simplify the code gracefully with new guard() macro and co for automatic cleanup of locks.
Only the code refactoring, and no functional changes.
Stable-dep-of: 495000a38634 ("ALSA: core: Remove debugfs at disconnection")
--- sound/core/jack.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
sound/core/jack.c +7 -18
@@ -42,11 +42,9 @@ static int snd_jack_dev_disconnect(struct snd_device *device)#ifdef CONFIG_SND_JACK_INPUT_DEV struct snd_jack *jack = device->device_data; -mutex_lock (&jack->input_dev_lock); -if (!jack->input_dev) { -mutex_unlock (&jack->input_dev_lock); +guard (mutex)(&jack->input_dev_lock); +if (!jack->input_dev)return 0 ; - }/* If the input device is registered with the input subsystem * then we need to use a different deallocator. */
@@ -55,7 +53,6 @@ static int snd_jack_dev_disconnect(struct snd_device *device) else input_free_device(jack->input_dev); jack->input_dev =NULL ; -mutex_unlock (&jack->input_dev_lock);#endif /* CONFIG_SND_JACK_INPUT_DEV */ return 0 ; }
@@ -92,11 +89,9 @@ static int snd_jack_dev_register(struct snd_device *device)snprintf (jack->name,sizeof (jack->name),"%s %s" , card->shortname, jack->id); -mutex_lock (&jack->input_dev_lock); -if (!jack->input_dev) { -mutex_unlock (&jack->input_dev_lock); +guard (mutex)(&jack->input_dev_lock); +if (!jack->input_dev)return 0 ; - } jack->input_dev->name = jack->name;
@@ -121,7 +116,6 @@ static int snd_jack_dev_register(struct snd_device *device)if (err ==0 ) jack->registered =1 ; -mutex_unlock (&jack->input_dev_lock); return err; }#endif /* CONFIG_SND_JACK_INPUT_DEV */
@@ -586,14 +580,9 @@ EXPORT_SYMBOL(snd_jack_new);void snd_jack_set_parent (struct snd_jack *jack,struct device *parent) {WARN_ON (jack->registered); -mutex_lock (&jack->input_dev_lock); -if (!jack->input_dev) { -mutex_unlock (&jack->input_dev_lock); -return ; - } - - jack->input_dev->dev.parent = parent; -mutex_unlock (&jack->input_dev_lock); +guard (mutex)(&jack->input_dev_lock); +if (jack->input_dev) + jack->input_dev->dev.parent = parent; }EXPORT_SYMBOL (snd_jack_set_parent);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 694/744 ALSA: core: Remove debugfs at disconnection
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 495000a38634e640e2fd02f7e4f1512ccc92d770 ]
The card-specific debugfs entries are removed at the last stage of card free phase, and it's performed after synchronization of the closes of all opened fds. This works fine for most cases, but it can be potentially problematic for a hotplug device like USB-audio. Due to the nature of snd_card_free_when_closed(), the card free isn't called immediately after the driver removal for a hotplug device, but it's left until the last fd is closed. It implies that the card debugfs entries also remain. Meanwhile, when a new device is inserted before the last close and the very same card slot is assigned, the driver tries to create the card debugfs root again on the very same path. This conflicts with the remaining entry, and results in the kernel warning such as:
debugfs: Directory 'card0' with parent 'sound' already present!
with the missing debugfs entry afterwards.
For avoiding such conflicts, remove debugfs entries at the device disconnection phase instead. The jack kctl debugfs entries get removed in snd_jack_dev_disconnect() instead of each kctl private_free.
--- sound/core/init.c | 9 +++++---- sound/core/jack.c | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-)
sound/core/init.c +5 -4
@@ -546,6 +546,11 @@ void snd_card_disconnect(struct snd_card *card)synchronize_irq (card->sync_irq);snd_info_card_disconnect (card); +#ifdef CONFIG_SND_DEBUG +debugfs_remove (card->debugfs_root); + card->debugfs_root =NULL ; +#endif +if (card->registered) {device_del (&card->card_dev); card->registered = false;
@@ -598,10 +603,6 @@ static int snd_card_do_free(struct snd_card *card)dev_warn (card->dev,"unable to free card info\n" );/* Not fatal error */ } -#ifdef CONFIG_SND_DEBUG -debugfs_remove (card->debugfs_root); - card->debugfs_root =NULL ; -#endif if (card->release_completion)complete (card->release_completion);if (!card->managed)
sound/core/jack.c +14 -7
@@ -37,11 +37,15 @@ static const int jack_switch_types[SND_JACK_SWITCH_TYPES] = { };#endif /* CONFIG_SND_JACK_INPUT_DEV */ +static void snd_jack_remove_debugfs (struct snd_jack *jack); +static int snd_jack_dev_disconnect (struct snd_device *device) { -#ifdef CONFIG_SND_JACK_INPUT_DEV struct snd_jack *jack = device->device_data; +snd_jack_remove_debugfs (jack); + +#ifdef CONFIG_SND_JACK_INPUT_DEV guard (mutex)(&jack->input_dev_lock);if (!jack->input_dev)return 0 ;
@@ -381,10 +385,14 @@ static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack,return 0 ; } -static void snd_jack_debugfs_clear_inject_node (struct snd_jack_kctl *jack_kctl) +static void snd_jack_remove_debugfs (struct snd_jack *jack) { -debugfs_remove (jack_kctl->jack_debugfs_root); - jack_kctl->jack_debugfs_root =NULL ; +struct snd_jack_kctl *jack_kctl; + +list_for_each_entry (jack_kctl, &jack->kctl_list, list) { +debugfs_remove (jack_kctl->jack_debugfs_root); + jack_kctl->jack_debugfs_root =NULL ; + } }#else /* CONFIG_SND_JACK_INJECTION_DEBUG */ static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack,
@@ -393,7 +401,7 @@ static int snd_jack_debugfs_add_inject_node(struct snd_jack *jack, return 0; } -static void snd_jack_debugfs_clear_inject_node (struct snd_jack_kctl *jack_kctl) +static void snd_jack_remove_debugfs (struct snd_jack *jack) { }#endif /* CONFIG_SND_JACK_INJECTION_DEBUG */
@@ -404,7 +412,6 @@ static void snd_jack_kctl_private_free(struct snd_kcontrol *kctl) jack_kctl = kctl->private_data;if (jack_kctl) { -snd_jack_debugfs_clear_inject_node (jack_kctl);list_del (&jack_kctl->list);kfree (jack_kctl); }
@@ -497,8 +504,8 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, .dev_free = snd_jack_dev_free, #ifdef CONFIG_SND_JACK_INPUT_DEV .dev_register = snd_jack_dev_register, - .dev_disconnect = snd_jack_dev_disconnect,#endif /* CONFIG_SND_JACK_INPUT_DEV */ + .dev_disconnect = snd_jack_dev_disconnect, };if (initial_kctl) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 695/744 ALSA: hda/realtek: Adjust G814JZR to use SPI init for amp
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luke D. Jones <[email protected]>
[ Upstream commit 2be46155d792d629e8fe3188c2cde176833afe36 ]
The 2024 ASUS ROG G814J model is much the same as the 2023 model and the 2023 16" version. We can use the same Cirrus Amp quirk.
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +1 -1
@@ -10057,7 +10057,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ),SND_PCI_QUIRK (0x1043 ,0x3a20 ,"ASUS G614JZR" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x3a30 ,"ASUS G814JVR/JIR" ,ALC245_FIXUP_CS35L41_SPI_2 ), -SND_PCI_QUIRK (0x1043 ,0x3a40 ,"ASUS G814JZR" ,ALC245_FIXUP_CS35L41_SPI_2 ), +SND_PCI_QUIRK (0x1043 ,0x3a40 ,"ASUS G814JZR" ,ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS ),SND_PCI_QUIRK (0x1043 ,0x3a50 ,"ASUS G834JYR/JZR" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x3a60 ,"ASUS G634JYR/JZR" ,ALC245_FIXUP_CS35L41_SPI_2 ), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 696/744 enic: Validate length of nl attributes in enic_set_vf_port
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roded Zats <[email protected]>
[ Upstream commit e8021b94b0412c37bcc79027c2e382086b6ce449 ]
enic_set_vf_port assumes that the nl attribute IFLA_PORT_PROFILE is of length PORT_PROFILE_MAX and that the nl attributes IFLA_PORT_INSTANCE_UUID, IFLA_PORT_HOST_UUID are of length PORT_UUID_MAX. These attributes are validated (in the function do_setlink in rtnetlink.c) using the nla_policy ifla_port_policy. The policy defines IFLA_PORT_PROFILE as NLA_STRING, IFLA_PORT_INSTANCE_UUID as NLA_BINARY and IFLA_PORT_HOST_UUID as NLA_STRING. That means that the length validation using the policy is for the max size of the attributes and not on exact size so the length of these attributes might be less than the sizes that enic_set_vf_port expects. This might cause an out of bands
read access in the memcpys of the data of these
attributes in enic_set_vf_port.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/cisco/enic/enic_main.c +12 -0
@@ -1117,18 +1117,30 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, pp->request =nla_get_u8 (port[IFLA_PORT_REQUEST ]);if (port[IFLA_PORT_PROFILE ]) { +if (nla_len (port[IFLA_PORT_PROFILE ]) !=PORT_PROFILE_MAX ) { +memcpy (pp, &prev_pp,sizeof (*pp)); +return -EINVAL ; + } pp->set |=ENIC_SET_NAME ;memcpy (pp->name,nla_data (port[IFLA_PORT_PROFILE ]),PORT_PROFILE_MAX ); }if (port[IFLA_PORT_INSTANCE_UUID ]) { +if (nla_len (port[IFLA_PORT_INSTANCE_UUID ]) !=PORT_UUID_MAX ) { +memcpy (pp, &prev_pp,sizeof (*pp)); +return -EINVAL ; + } pp->set |=ENIC_SET_INSTANCE ;memcpy (pp->instance_uuid,nla_data (port[IFLA_PORT_INSTANCE_UUID ]),PORT_UUID_MAX ); }if (port[IFLA_PORT_HOST_UUID ]) { +if (nla_len (port[IFLA_PORT_HOST_UUID ]) !=PORT_UUID_MAX ) { +memcpy (pp, &prev_pp,sizeof (*pp)); +return -EINVAL ; + } pp->set |=ENIC_SET_HOST ;memcpy (pp->host_uuid,nla_data (port[IFLA_PORT_HOST_UUID ]),PORT_UUID_MAX );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 697/744 af_unix: Annotate data-race around unix_sk(sk)->addr.
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 97e1db06c7bb948da10ba85acad8030b56886593 ]
Once unix_sk(sk)->addr is assigned under net->unx.table.locks and unix_sk(sk)->bindlock, *(unix_sk(sk)->addr) and unix_sk(sk)->path are fully set up, and unix_sk(sk)->addr is never changed.
unix_getname() and unix_copy_addr() access the two fields locklessly, and commit ae3b564179bf ("missing barriers in some of unix_sock ->addr and ->path accesses") added smp_store_release() and smp_load_acquire() pairs.
In other functions, we still read unix_sk(sk)->addr locklessly to check if the socket is bound, and KCSAN complains about it. [0]
Given these functions have no dependency for *(unix_sk(sk)->addr) and unix_sk(sk)->path, READ_ONCE() is enough to annotate the data-race.
Note that it is safe to access unix_sk(sk)->addr locklessly if the socket is found in the hash table. For example, the lockless read of otheru->addr in unix_stream_connect() is safe.
Note also that newu->addr there is of the child socket that is still not accessible from userspace, and smp_store_release() publishes the address in case the socket is accept()ed and unix_getname() / unix_copy_addr() is called.
[0]:
BUG: KCSAN: data-race in unix_bind / unix_listen
write (marked) to 0xffff88805f8d1840 of 8 bytes by task 13723 on cpu 0:
__unix_set_addr_hash net/unix/af_unix.c:329 [inline] unix_bind_bsd net/unix/af_unix.c:1241 [inline] unix_bind+0x881/0x1000 net/unix/af_unix.c:1319 __sys_bind+0x194/0x1e0 net/socket.c:1847 __do_sys_bind net/socket.c:1858 [inline] __se_sys_bind net/socket.c:1856 [inline] __x64_sys_bind+0x40/0x50 net/socket.c:1856 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x4f/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x46/0x4e
read to 0xffff88805f8d1840 of 8 bytes by task 13724 on cpu 1:
unix_listen+0x72/0x180 net/unix/af_unix.c:734 __sys_listen+0xdc/0x160 net/socket.c:1881 __do_sys_listen net/socket.c:1890 [inline] __se_sys_listen net/socket.c:1888 [inline] __x64_sys_listen+0x2e/0x40 net/socket.c:1888 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x4f/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x46/0x4e
value changed: 0x0000000000000000 -> 0xffff88807b5b1b40
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 13724 Comm: syz-executor.4 Not tainted 6.8.0-12822-gcd51db110a7e #12 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/af_unix.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/unix/af_unix.c +6 -4
@@ -732,7 +732,7 @@ static int unix_listen(struct socket *sock, int backlog)if (sock->type !=SOCK_STREAM && sock->type !=SOCK_SEQPACKET ) goto out;/* Only stream/seqpacket sockets accept */ err = -EINVAL ; -if (!u->addr) +if (!READ_ONCE (u->addr)) goto out;/* No listens on an unbound socket */ unix_state_lock (sk);if (sk->sk_state !=TCP_CLOSE && sk->sk_state !=TCP_LISTEN )
@@ -1379,7 +1379,7 @@ static int unix_dgram_connect(struct socket *sock, struct sockaddr *addr,if ((test_bit (SOCK_PASSCRED , &sock->flags) ||test_bit (SOCK_PASSPIDFD , &sock->flags)) && - !unix_sk (sk)->addr) { + !READ_ONCE (unix_sk (sk)->addr)) { err =unix_autobind (sk);if (err) goto out;
@@ -1487,7 +1487,8 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr, goto out;if ((test_bit (SOCK_PASSCRED , &sock->flags) || -test_bit (SOCK_PASSPIDFD , &sock->flags)) && !u->addr) { +test_bit (SOCK_PASSPIDFD , &sock->flags)) && + !READ_ONCE (u->addr)) { err =unix_autobind (sk);if (err) goto out;
@@ -1927,7 +1928,8 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg, }if ((test_bit (SOCK_PASSCRED , &sock->flags) || -test_bit (SOCK_PASSPIDFD , &sock->flags)) && !u->addr) { +test_bit (SOCK_PASSPIDFD , &sock->flags)) && + !READ_ONCE (u->addr)) { err =unix_autobind (sk);if (err) goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 698/744 af_unix: Read sk->sk_hash under bindlock during bind().
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 51d1b25a720982324871338b1a36b197ec9bd6f0 ]
syzkaller reported data-race of sk->sk_hash in unix_autobind() [0], and the same ones exist in unix_bind_bsd() and unix_bind_abstract().
The three bind() functions prefetch sk->sk_hash locklessly and use it later after validating that unix_sk(sk)->addr is NULL under unix_sk(sk)->bindlock.
The prefetched sk->sk_hash is the hash value of unbound socket set in unix_create1() and does not change until bind() completes.
There could be a chance that sk->sk_hash changes after the lockless read. However, in such a case, non-NULL unix_sk(sk)->addr is visible under unix_sk(sk)->bindlock, and bind() returns -EINVAL without using the prefetched value.
The KCSAN splat is false-positive, but let's silence it by reading sk->sk_hash under unix_sk(sk)->bindlock.
[0]:
BUG: KCSAN: data-race in unix_autobind / unix_autobind
write to 0xffff888034a9fb88 of 4 bytes by task 4468 on cpu 0:
__unix_set_addr_hash net/unix/af_unix.c:331 [inline] unix_autobind+0x47a/0x7d0 net/unix/af_unix.c:1185 unix_dgram_connect+0x7e3/0x890 net/unix/af_unix.c:1373 __sys_connect_file+0xd7/0xe0 net/socket.c:2048 __sys_connect+0x114/0x140 net/socket.c:2065 __do_sys_connect net/socket.c:2075 [inline] __se_sys_connect net/socket.c:2072 [inline] __x64_sys_connect+0x40/0x50 net/socket.c:2072 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x4f/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x46/0x4e
read to 0xffff888034a9fb88 of 4 bytes by task 4465 on cpu 1:
unix_autobind+0x28/0x7d0 net/unix/af_unix.c:1134 unix_dgram_connect+0x7e3/0x890 net/unix/af_unix.c:1373 __sys_connect_file+0xd7/0xe0 net/socket.c:2048 __sys_connect+0x114/0x140 net/socket.c:2065 __do_sys_connect net/socket.c:2075 [inline] __se_sys_connect net/socket.c:2072 [inline] __x64_sys_connect+0x40/0x50 net/socket.c:2072 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x4f/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x46/0x4e
value changed: 0x000000e4 -> 0x000001e3
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 4465 Comm: syz-executor.0 Not tainted 6.8.0-12822-gcd51db110a7e #12 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
--- net/unix/af_unix.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/unix/af_unix.c +6 -3
@@ -1145,8 +1145,8 @@ static struct sock *unix_find_other(struct net *net,static int unix_autobind (struct sock *sk) { -unsigned int new_hash, old_hash = sk->sk_hash;struct unix_sock *u =unix_sk (sk); +unsigned int new_hash, old_hash;struct net *net =sock_net (sk);struct unix_address *addr;u32 lastnum, ordernum;
@@ -1169,6 +1169,7 @@ static int unix_autobind(struct sock *sk) addr->name->sun_family =AF_UNIX ;refcount_set (&addr->refcnt,1 ); + old_hash = sk->sk_hash; ordernum =get_random_u32 (); lastnum = ordernum &0xFFFFF ; retry:
@@ -1209,8 +1210,8 @@ static int unix_bind_bsd(struct sock *sk, struct sockaddr_un *sunaddr, {umode_t mode =S_IFSOCK | (SOCK_INODE (sk->sk_socket)->i_mode & ~current_umask ()); -unsigned int new_hash, old_hash = sk->sk_hash;struct unix_sock *u =unix_sk (sk); +unsigned int new_hash, old_hash;struct net *net =sock_net (sk);struct mnt_idmap *idmap;struct unix_address *addr;
@@ -1248,6 +1249,7 @@ static int unix_bind_bsd(struct sock *sk, struct sockaddr_un *sunaddr,if (u->addr) goto out_unlock; + old_hash = sk->sk_hash; new_hash =unix_bsd_hash (d_backing_inode (dentry));unix_table_double_lock (net, old_hash, new_hash); u->path.mnt =mntget (parent.mnt);
@@ -1275,8 +1277,8 @@ static int unix_bind_bsd(struct sock *sk, struct sockaddr_un *sunaddr,static int unix_bind_abstract (struct sock *sk,struct sockaddr_un *sunaddr,int addr_len) { -unsigned int new_hash, old_hash = sk->sk_hash;struct unix_sock *u =unix_sk (sk); +unsigned int new_hash, old_hash;struct net *net =sock_net (sk);struct unix_address *addr;int err;
@@ -1294,6 +1296,7 @@ static int unix_bind_abstract(struct sock *sk, struct sockaddr_un *sunaddr, goto out_mutex; } + old_hash = sk->sk_hash; new_hash =unix_abstract_hash (addr->name, addr->len, sk->sk_type);unix_table_double_lock (net, old_hash, new_hash);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 699/744 Octeontx2-pf: Free send queue buffers incase of leaf to inner
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hariprasad Kelam <[email protected]>
[ Upstream commit 1684842147677a1279bcff95f8adb6de9a656e30 ]
There are two type of classes. "Leaf classes" that are the bottom of the class hierarchy. "Inner classes" that are neither the root class nor leaf classes. QoS rules can only specify leaf classes as targets for traffic.
Root
/ \
/ \
1 2
/\
/ \
4 5
classes 1,4 and 5 are leaf classes.
class 2 is a inner class.When a leaf class made as inner, or vice versa, resources associated with send queue (send queue buffers and transmit schedulers) are not getting freed.
--- drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/marvell/octeontx2/nic/qos.c +4 -0
@@ -1407,7 +1407,10 @@ static int otx2_qos_leaf_to_inner(struct otx2_nic *pfvf, u16 classid,otx2_qos_read_txschq_cfg (pfvf, node, old_cfg);/* delete the txschq nodes allocated for this node */ +otx2_qos_disable_sq (pfvf, qid); +otx2_qos_free_hw_node_schq (pfvf, node);otx2_qos_free_sw_node_schq (pfvf, node); + pfvf->qos.qid_to_sqmap[qid] =OTX2_QOS_INVALID_SQ ;/* mark this node as htb inner node */ WRITE_ONCE (node->qid,OTX2_QOS_QID_INNER );
@@ -1554,6 +1557,7 @@ static int otx2_qos_leaf_del_last(struct otx2_nic *pfvf, u16 classid, bool force dwrr_del_node = true;/* destroy the leaf node */ +otx2_qos_disable_sq (pfvf, qid);otx2_qos_destroy_node (pfvf, node); pfvf->qos.qid_to_sqmap[qid] =OTX2_QOS_INVALID_SQ ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 700/744 net: usb: smsc95xx: fix changing LED_SEL bit value updated from EEPROM
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Parthiban Veerasooran <[email protected]>
[ Upstream commit 52a2f0608366a629d43dacd3191039c95fef74ba ]
LED Select (LED_SEL) bit in the LED General Purpose IO Configuration register is used to determine the functionality of external LED pins (Speed Indicator, Link and Activity Indicator, Full Duplex Link Indicator). The default value for this bit is 0 when no EEPROM is present. If a EEPROM is present, the default value is the value of the LED Select bit in the Configuration Flags of the EEPROM. A USB Reset or Lite Reset (LRST) will cause this bit to be restored to the image value last loaded from EEPROM, or to be set to 0 if no EEPROM is present.
While configuring the dual purpose GPIO/LED pins to LED outputs in the LED General Purpose IO Configuration register, the LED_SEL bit is changed as 0 and resulting the configured value from the EEPROM is cleared. The issue is fixed by using read-modify-write approach.
--- drivers/net/usb/smsc95xx.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/usb/smsc95xx.c +7 -4
@@ -879,7 +879,7 @@ static int smsc95xx_start_rx_path(struct usbnet *dev)static int smsc95xx_reset (struct usbnet *dev) {struct smsc95xx_priv *pdata = dev->driver_priv; -u32 read_buf, write_buf, burst_cap; +u32 read_buf, burst_cap;int ret =0 , timeout;netif_dbg (dev, ifup, dev->net,"entering smsc95xx_reset\n" );
@@ -1003,10 +1003,13 @@ static int smsc95xx_reset(struct usbnet *dev)return ret;netif_dbg (dev, ifup, dev->net,"ID_REV = 0x%08x\n" , read_buf); + ret =smsc95xx_read_reg (dev,LED_GPIO_CFG , &read_buf); +if (ret <0 ) +return ret;/* Configure GPIO pins as LED outputs */ - write_buf =LED_GPIO_CFG_SPD_LED |LED_GPIO_CFG_LNK_LED | -LED_GPIO_CFG_FDX_LED ; - ret =smsc95xx_write_reg (dev,LED_GPIO_CFG , write_buf); + read_buf |=LED_GPIO_CFG_SPD_LED |LED_GPIO_CFG_LNK_LED | +LED_GPIO_CFG_FDX_LED ; + ret =smsc95xx_write_reg (dev,LED_GPIO_CFG , read_buf);if (ret <0 )return ret;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 701/744 ASoC: cs42l43: Only restrict 44.1kHz for the ASP
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 797c525e85d1e44cf0e6f338890e8e0c661f524a ]
The SoundWire interface can always support 44.1kHz using flow controlled mode, and whether the ASP is in master mode should obviously only affect the ASP. Update cs42l43_startup() to only restrict the rates for the ASP DAI.
--- sound/soc/codecs/cs42l43.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/cs42l43.c +3 -2
@@ -220,8 +220,9 @@ static int cs42l43_startup(struct snd_pcm_substream *substream, struct snd_soc_dstruct snd_soc_component *component = dai->component;struct cs42l43_codec *priv =snd_soc_component_get_drvdata (component);struct cs42l43 *cs42l43 = priv->core; -int provider = !!regmap_test_bits (cs42l43->regmap,CS42L43_ASP_CLK_CONFIG2 , -CS42L43_ASP_MASTER_MODE_MASK ); +int provider = !dai->id || !!regmap_test_bits (cs42l43->regmap, +CS42L43_ASP_CLK_CONFIG2 , +CS42L43_ASP_MASTER_MODE_MASK );if (provider) priv->constraint.mask =CS42L43_PROVIDER_RATE_MASK ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 702/744 bpf: Allow delete from sockmap/sockhash only if update is allowed
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Sitnicki <[email protected]>
[ Upstream commit 98e948fb60d41447fd8d2d0c3b8637fc6b6dc26d ]
We have seen an influx of syzkaller reports where a BPF program attached to a tracepoint triggers a locking rule violation by performing a map_delete on a sockmap/sockhash.
We don't intend to support this artificial use scenario. Extend the existing verifier allowed-program-type check for updating sockmap/sockhash to also cover deleting from a map.
Quoted 1 line
From now on only BPF programs which were previously allowed to update
sockmap/sockhash can delete from these map types.
--- kernel/bpf/verifier.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +7 -3
@@ -8742,7 +8742,8 @@ static bool may_update_sockmap(struct bpf_verifier_env *env, int func_id)enum bpf_attach_type eatype = env->prog->expected_attach_type;enum bpf_prog_type type =resolve_prog_type (env->prog); -if (func_id != BPF_FUNC_map_update_elem) +if (func_id != BPF_FUNC_map_update_elem && + func_id != BPF_FUNC_map_delete_elem)return false;/* It's not possible to get access to a locked struct sock in these
@@ -8753,6 +8754,11 @@ static bool may_update_sockmap(struct bpf_verifier_env *env, int func_id)if (eatype ==BPF_TRACE_ITER )return true;break ; +case BPF_PROG_TYPE_SOCK_OPS : +/* map_update allowed only via dedicated helpers with event type checks */ +if (func_id == BPF_FUNC_map_delete_elem) +return true; +break ;case BPF_PROG_TYPE_SOCKET_FILTER :case BPF_PROG_TYPE_SCHED_CLS :case BPF_PROG_TYPE_SCHED_ACT :
@@ -8848,7 +8854,6 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,case BPF_MAP_TYPE_SOCKMAP : if (func_id != BPF_FUNC_sk_redirect_map && func_id != BPF_FUNC_sock_map_update && - func_id != BPF_FUNC_map_delete_elem && func_id != BPF_FUNC_msg_redirect_map && func_id != BPF_FUNC_sk_select_reuseport && func_id != BPF_FUNC_map_lookup_elem &&
@@ -8858,7 +8863,6 @@ static int check_map_func_compatibility(struct bpf_verifier_env *env,case BPF_MAP_TYPE_SOCKHASH : if (func_id != BPF_FUNC_sk_redirect_hash && func_id != BPF_FUNC_sock_hash_update && - func_id != BPF_FUNC_map_delete_elem && func_id != BPF_FUNC_msg_redirect_hash && func_id != BPF_FUNC_sk_select_reuseport && func_id != BPF_FUNC_map_lookup_elem &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 703/744 net:fec: Add fec_enet_deinit()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaolei Wang <[email protected]>
[ Upstream commit bf0497f53c8535f99b72041529d3f7708a6e2c0d ]
When fec_probe() fails or fec_drv_remove() needs to release the fec queue and remove a NAPI context, therefore add a function corresponding to fec_enet_init() and call fec_enet_deinit() which does the opposite to release memory and remove a NAPI context.
--- drivers/net/ethernet/freescale/fec_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +10 -0
@@ -4113,6 +4113,14 @@ static int fec_enet_init(struct net_device *ndev)return ret; } +static void fec_enet_deinit (struct net_device *ndev) +{ +struct fec_enet_private *fep =netdev_priv (ndev); + +netif_napi_del (&fep->napi); +fec_enet_free_queue (ndev); +} +#ifdef CONFIG_OF static int fec_reset_phy (struct platform_device *pdev) {
@@ -4509,6 +4517,7 @@ fec_probe(struct platform_device *pdev)fec_enet_mii_remove (fep); failed_mii_init: failed_irq: +fec_enet_deinit (ndev); failed_init:fec_ptp_stop (pdev); failed_reset:
@@ -4572,6 +4581,7 @@ fec_drv_remove(struct platform_device *pdev)pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev); +fec_enet_deinit (ndev);free_netdev (ndev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 704/744 net: micrel: Fix lan8841_config_intr after getting out of sleep mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit 4fb679040d9f758eeb3b4d01bbde6405bf20e64e ]
When the interrupt is enabled, the function lan8841_config_intr tries to clear any pending interrupts by reading the interrupt status, then checks the return value for errors and then continue to enable the interrupt. It has been seen that once the system gets out of sleep mode, the interrupt status has the value 0x400 meaning that the PHY detected that the link was in low power. That is correct value but the problem is that the check is wrong. We try to check for errors but we return an error also in this case which is not an error. Therefore fix this by returning only when there is an error.
--- drivers/net/phy/micrel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/phy/micrel.c +9 -1
@@ -3450,7 +3450,7 @@ static int lan8841_config_intr(struct phy_device *phydev)if (phydev->interrupts ==PHY_INTERRUPT_ENABLED ) { err =phy_read (phydev,LAN8814_INTS ); -if (err) +if (err <0 )return err;/* Enable / disable interrupts. It is OK to enable PTP interrupt
@@ -3466,6 +3466,14 @@ static int lan8841_config_intr(struct phy_device *phydev)return err; err =phy_read (phydev,LAN8814_INTS ); +if (err <0 ) +return err; + +/* Getting a positive value doesn't mean that is an error, it +* just indicates what was the status. Therefore make sure to +* clear the value and say that there is no error. +*/ + err =0 ; }return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 705/744 ice: fix accounting if a VLAN already exists
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit 82617b9a04649e83ee8731918aeadbb6e6d7cbc7 ]
The ice_vsi_add_vlan() function is used to add a VLAN filter for the target VSI. This function prepares a filter in the switch table for the given VSI. If it succeeds, the vsi->num_vlan counter is incremented.
It is not considered an error to add a VLAN which already exists in the switch table, so the function explicitly checks and ignores -EEXIST. The vsi->num_vlan counter is still incremented.
This seems incorrect, as it means we can double-count in the case where the same VLAN is added twice by the caller. The actual table will have one less filter than the count.
The ice_vsi_del_vlan() function similarly checks and handles the -ENOENT condition for when deleting a filter that doesn't exist. This flow only decrements the vsi->num_vlan if it actually deleted a filter.
The vsi->num_vlan counter is used only in a few places, primarily related to tracking the number of non-zero VLANs. If the vsi->num_vlans gets out of sync, then ice_vsi_num_non_zero_vlans() will incorrectly report more VLANs than are present, and ice_vsi_has_non_zero_vlans() could return true potentially in cases where there are only VLAN 0 filters left.
Fix this by only incrementing the vsi->num_vlan in the case where we actually added an entry, and not in the case where the entry already existed.
--- drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c +6 -5
@@ -45,14 +45,15 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, struct ice_vlan *vlan)return -EINVAL ; err =ice_fltr_add_vlan (vsi, vlan); -if (err && err != -EEXIST ) { +if (!err) + vsi->num_vlan++; +else if (err == -EEXIST ) + err =0 ; +else dev_err (ice_pf_to_dev (vsi->back),"Failure Adding VLAN %d on VSI %i, status %d\n" , vlan->vid, vsi->vsi_num, err); -return err; - } - vsi->num_vlan++; -return 0 ; +return err; }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 706/744 selftests: mptcp: simult flows: mark unbalanced tests as flaky
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
[ Upstream commit cc73a6577ae64247898269d138dee6b73ff710cc ]
These tests are flaky since their introduction. This might be less or not visible depending on the CI running the tests, especially if it is also busy doing other tasks in parallel.
A first analysis shown that the transfer can be slowed down when there are some re-injections at the MPTCP level. Such re-injections can of course happen, and disturb the transfer, but it looks strange to have them in this lab. That could be caused by the kernel having access to less CPU cycles -- e.g. when other activities are executed in parallel -- or by a misinterpretation on the MPTCP packet scheduler side.
While this is being investigated, the tests are marked as flaky not to create noises in other CIs.
--- tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/net/mptcp/simult_flows.sh +3 -3
@@ -262,7 +262,7 @@ run_test() do_transfer $small $large $time lret=$? mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then ret=$lret [ $bail -eq 0 ] || exit $ret fi
@@ -272,7 +272,7 @@ run_test() do_transfer $large $small $time lret=$? mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then ret=$lret [ $bail -eq 0 ] || exit $ret fi
@@ -305,7 +305,7 @@ run_test 10 10 0 0 "balanced bwidth" run_test 10 10 1 25 "balanced bwidth with unbalanced delay" # we still need some additional infrastructure to pass the following test-cases -run_test 10 3 0 0 "unbalanced bwidth" +MPTCP_LIB_SUBTEST_FLAKY=1 run_test 10 3 0 0 "unbalanced bwidth" run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 707/744 selftests: mptcp: add ms units for tc-netem delay
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 9109853a388b7b2b934f56f4ddb250d72e486555 ]
'delay 1' in tc-netem is confusing, not sure if it's a delay of 1 second or 1 millisecond. This patch explicitly adds millisecond units to make these commands clearer.
Stable-dep-of: 38af56e6668b ("selftests: mptcp: join: mark 'fail' tests as flaky")
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +3 -3
@@ -133,8 +133,8 @@ init_shapers() { local i for i in $(seq 1 4); do - tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1 - tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1 + tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1ms + tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1ms done }
@@ -3269,7 +3269,7 @@ fail_tests() # multiple subflows if reset_with_fail "MP_FAIL MP_RST" 2; then - tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5ms pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow
tools/testing/selftests/net/mptcp/simult_flows.sh +2 -2
@@ -235,8 +235,8 @@ run_test() shift 4 local msg=$* - [ $delay1 -gt 0 ] && delay1="delay $delay1" || delay1="" - [ $delay2 -gt 0 ] && delay2="delay $delay2" || delay2="" + [ $delay1 -gt 0 ] && delay1="delay ${delay1}ms" || delay1="" + [ $delay2 -gt 0 ] && delay2="delay ${delay2}ms" || delay2="" for dev in ns1eth1 ns1eth2; do tc -n $ns1 qdisc del dev $dev root >/dev/null 2>&1
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 708/744 selftests: mptcp: join: mark fail tests as flaky
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
[ Upstream commit 38af56e6668b455f7dd0a8e2d9afe74100068e17 ]
These tests are rarely unstable. It depends on the CI running the tests, especially if it is also busy doing other tasks in parallel, and if a debug kernel config is being used.
It looks like this issue is sometimes present with the NetDev CI. While this is being investigated, the tests are marked as flaky not to create noises on such CIs.
--- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/mptcp/mptcp_join.sh +2 -0
@@ -3261,6 +3261,7 @@ fail_tests() { # single subflow if reset_with_fail "Infinite map" 1; then + MPTCP_LIB_SUBTEST_FLAKY=1 test_linkfail=128 \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)"
@@ -3269,6 +3270,7 @@ fail_tests() # multiple subflows if reset_with_fail "MP_FAIL MP_RST" 2; then + MPTCP_LIB_SUBTEST_FLAKY=1 tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5ms pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 709/744 ALSA: seq: Fix missing bank setup between MIDI1/MIDI2 UMP conversion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 8a42886cae307663f3f999846926bd6e64392000 ]
When a UMP packet is converted between MIDI1 and MIDI2 protocols, the bank selection may be lost. The conversion from MIDI1 to MIDI2 needs the encoding of the bank into UMP_MSG_STATUS_PROGRAM bits, while the conversion from MIDI2 to MIDI1 needs the extraction from that instead.
This patch implements the missing bank selection mechanism in those conversions.
--- sound/core/seq/seq_ump_convert.c | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
sound/core/seq/seq_ump_convert.c +38 -0
@@ -368,6 +368,7 @@ static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest,struct snd_seq_ump_event ev_cvt;const union snd_ump_midi1_msg *midi1 = (const union snd_ump_midi1_msg *)event->ump;union snd_ump_midi2_msg *midi2 = (union snd_ump_midi2_msg *)ev_cvt.ump; +struct snd_seq_ump_midi2_bank *cc; ev_cvt = *event;memset (&ev_cvt.ump,0 ,sizeof (ev_cvt.ump));
@@ -387,11 +388,29 @@ static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest, midi2->paf.data =upscale_7_to_32bit (midi1->paf.data);break ;case UMP_MSG_STATUS_CC : + cc = &dest_port->midi2_bank[midi1->note.channel]; +switch (midi1->cc.index) { +case UMP_CC_BANK_SELECT : + cc->bank_set =1 ; + cc->cc_bank_msb = midi1->cc.data; +return 0 ;// skip +case UMP_CC_BANK_SELECT_LSB : + cc->bank_set =1 ; + cc->cc_bank_lsb = midi1->cc.data; +return 0 ;// skip + } midi2->cc.index = midi1->cc.index; midi2->cc.data =upscale_7_to_32bit (midi1->cc.data);break ;case UMP_MSG_STATUS_PROGRAM : midi2->pg.program = midi1->pg.program; + cc = &dest_port->midi2_bank[midi1->note.channel]; +if (cc->bank_set) { + midi2->pg.bank_valid =1 ; + midi2->pg.bank_msb = cc->cc_bank_msb; + midi2->pg.bank_lsb = cc->cc_bank_lsb; + cc->bank_set =0 ; + }break ;case UMP_MSG_STATUS_CHANNEL_PRESSURE : midi2->caf.data =upscale_7_to_32bit (midi1->caf.data);
@@ -419,6 +438,7 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest,struct snd_seq_ump_event ev_cvt;union snd_ump_midi1_msg *midi1 = (union snd_ump_midi1_msg *)ev_cvt.ump;const union snd_ump_midi2_msg *midi2 = (const union snd_ump_midi2_msg *)event->ump; +int err;u16 v; ev_cvt = *event;
@@ -443,6 +463,24 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest, midi1->cc.data =downscale_32_to_7bit (midi2->cc.data);break ;case UMP_MSG_STATUS_PROGRAM : +if (midi2->pg.bank_valid) { + midi1->cc.status =UMP_MSG_STATUS_CC ; + midi1->cc.index =UMP_CC_BANK_SELECT ; + midi1->cc.data = midi2->pg.bank_msb; + err =__snd_seq_deliver_single_event (dest, dest_port, + (struct snd_seq_event *)&ev_cvt, + atomic, hop); +if (err <0 ) +return err; + midi1->cc.index =UMP_CC_BANK_SELECT_LSB ; + midi1->cc.data = midi2->pg.bank_lsb; + err =__snd_seq_deliver_single_event (dest, dest_port, + (struct snd_seq_event *)&ev_cvt, + atomic, hop); +if (err <0 ) +return err; + midi1->note.status = midi2->note.status; + } midi1->pg.program = midi2->pg.program;break ;case UMP_MSG_STATUS_CHANNEL_PRESSURE :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 710/744 ALSA: seq: Dont clear bank selection at event -> UMP MIDI2 conversion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit a200df7deb3186cd7b55abb77ab96dfefb8a4f09 ]
The current code to convert from a legacy sequencer event to UMP MIDI2 clears the bank selection at each time the program change is submitted. This is confusing and may lead to incorrect bank values tranmitted to the destination in the end.
Drop the line to clear the bank info and keep the provided values.
--- sound/core/seq/seq_ump_convert.c | 1 - 1 file changed, 1 deletion(-)
sound/core/seq/seq_ump_convert.c +0 -1
@@ -892,7 +892,6 @@ static int pgm_ev_to_ump_midi2(const struct snd_seq_event *event, data->pg.bank_msb = cc->cc_bank_msb; data->pg.bank_lsb = cc->cc_bank_lsb; cc->bank_set =0 ; - cc->cc_bank_msb = cc->cc_bank_lsb =0 ; }return 1 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 711/744 net: ti: icssg-prueth: Fix start counter for ft1 filter
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: MD Danish Anwar <[email protected]>
[ Upstream commit 56a5cf538c3f2d935b0d81040a8303b6e7fc5fd8 ]
The start counter for FT1 filter is wrongly set to 0 in the driver. FT1 is used for source address violation (SAV) check and source address starts at Byte 6 not Byte 0. Fix this by changing start counter to ETH_ALEN in icssg_ft1_set_mac_addr().
--- drivers/net/ethernet/ti/icssg/icssg_classifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/icssg/icssg_classifier.c +1 -1
@@ -360,7 +360,7 @@ void icssg_ft1_set_mac_addr(struct regmap *miig_rt, int slice, u8 *mac_addr) {const u8 mask_addr[] = {0 ,0 ,0 ,0 ,0 ,0 , }; -rx_class_ft1_set_start_len (miig_rt, slice,0 ,6 ); +rx_class_ft1_set_start_len (miig_rt, slice,ETH_ALEN ,ETH_ALEN );rx_class_ft1_set_da (miig_rt, slice,0 , mac_addr);rx_class_ft1_set_da_mask (miig_rt, slice,0 , mask_addr);rx_class_ft1_cfg_set_type (miig_rt, slice,0 ,FT1_CFG_TYPE_EQ );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 712/744 netfilter: nft_payload: skbuff vlan metadata mangle support
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 33c563ebf8d3deed7d8addd20d77398ac737ef9a ]
Userspace assumes vlan header is present at a given offset, but vlan offload allows to store this in metadata fields of the skbuff. Hence mangling vlan results in a garbled packet. Handle this transparently by adding a parser to the kernel.
If vlan metadata is present and payload offset is over 12 bytes (source and destination mac address fields), then subtract vlan header present in vlan metadata, otherwise mangle vlan metadata based on offset and length, extracting data from the source register.
This is similar to:
8cfd23e67401 ("netfilter: nft_payload: work around vlan header stripping")
to deal with vlan payload mangling.
--- net/netfilter/nft_payload.c | 72 +++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 7 deletions(-)
net/netfilter/nft_payload.c +65 -7
@@ -145,12 +145,12 @@ int nft_payload_inner_offset(const struct nft_pktinfo *pkt)return pkt->inneroff; } -static bool nft_payload_need_vlan_copy (const struct nft_payload *priv) +static bool nft_payload_need_vlan_adjust (u32 offset,u32 len) { -unsigned int len = priv->offset + priv->len; +unsigned int boundary = offset + len;/* data past ether src/dst requested, copy needed */ -if (len > offsetof(struct ethhdr , h_proto)) +if (boundary > offsetof(struct ethhdr , h_proto))return true;return false;
@@ -174,7 +174,7 @@ void nft_payload_eval(const struct nft_expr *expr, goto err;if (skb_vlan_tag_present (skb) && -nft_payload_need_vlan_copy (priv)) { +nft_payload_need_vlan_adjust (priv->offset, priv->len)) {if (!nft_payload_copy_vlan (dest, skb, priv->offset, priv->len)) goto err;
@@ -801,21 +801,79 @@ struct nft_payload_set {u8 csum_flags; }; +/* This is not struct vlan_hdr. */ +struct nft_payload_vlan_hdr { +__be16 h_vlan_proto; +__be16 h_vlan_TCI; +}; + +static bool +nft_payload_set_vlan (const u32 *src,struct sk_buff *skb,u8 offset,u8 len, +int *vlan_hlen) +{ +struct nft_payload_vlan_hdr *vlanh; +__be16 vlan_proto; +u16 vlan_tci; + +if (offset >= offsetof(struct vlan_ethhdr , h_vlan_encapsulated_proto)) { + *vlan_hlen =VLAN_HLEN ; +return true; + } + +switch (offset) { +case offsetof(struct vlan_ethhdr , h_vlan_proto): +if (len ==2 ) { + vlan_proto =nft_reg_load_be16 (src); + skb->vlan_proto = vlan_proto; + }else if (len ==4 ) { + vlanh = (struct nft_payload_vlan_hdr *)src; +__vlan_hwaccel_put_tag (skb, vlanh->h_vlan_proto, +ntohs (vlanh->h_vlan_TCI)); + }else { +return false; + } +break ; +case offsetof(struct vlan_ethhdr , h_vlan_TCI): +if (len !=2 ) +return false; + + vlan_tci =ntohs (nft_reg_load_be16 (src)); + skb->vlan_tci = vlan_tci; +break ; +default : +return false; + } + +return true; +} +static void nft_payload_set_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt) {const struct nft_payload_set *priv =nft_expr_priv (expr); -struct sk_buff *skb = pkt->skb;const u32 *src = ®s->data[priv->sreg]; -int offset, csum_offset; +int offset, csum_offset, vlan_hlen =0 ; +struct sk_buff *skb = pkt->skb;__wsum fsum, tsum;switch (priv->base) {case NFT_PAYLOAD_LL_HEADER :if (!skb_mac_header_was_set (skb)) goto err; - offset =skb_mac_header (skb) - skb->data; + +if (skb_vlan_tag_present (skb) && +nft_payload_need_vlan_adjust (priv->offset, priv->len)) { +if (!nft_payload_set_vlan (src, skb, + priv->offset, priv->len, + &vlan_hlen)) + goto err; + +if (!vlan_hlen) +return ; + } + + offset =skb_mac_header (skb) - skb->data - vlan_hlen;break ;case NFT_PAYLOAD_NETWORK_HEADER : offset =skb_network_offset (skb);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 713/744 netfilter: tproxy: bail out if IP has been disabled on the device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 21a673bddc8fd4873c370caf9ae70ffc6d47e8d3 ]
syzbot reports:
general protection fault, probably for non-canonical address 0xdffffc0000000003: 0000 [#1] PREEMPT SMP KASAN PTI KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] [..] RIP: 0010:nf_tproxy_laddr4+0xb7/0x340 net/ipv4/netfilter/nf_tproxy_ipv4.c:62 Call Trace: nft_tproxy_eval_v4 net/netfilter/nft_tproxy.c:56 [inline] nft_tproxy_eval+0xa9a/0x1a00 net/netfilter/nft_tproxy.c:168
__in_dev_get_rcu() can return NULL, so check for this.
--- net/ipv4/netfilter/nf_tproxy_ipv4.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/netfilter/nf_tproxy_ipv4.c +2 -0
@@ -58,6 +58,8 @@ __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr) laddr =0 ; indev =__in_dev_get_rcu (skb->dev); +if (!indev) +return daddr;in_dev_for_each_ifa_rcu (ifa, indev) {if (ifa->ifa_flags &IFA_F_SECONDARY )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 714/744 netfilter: nft_fib: allow from forward/input without iif selector
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Garver <[email protected]>
[ Upstream commit e8ded22ef0f4831279c363c264cd41cd9d59ca9e ]
This removes the restriction of needing iif selector in the forward/input hooks for fib lookups when requested result is oif/oifname.
Removing this restriction allows "loose" lookups from the forward hooks.
--- net/netfilter/nft_fib.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/netfilter/nft_fib.c +3 -5
@@ -35,11 +35,9 @@ int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,switch (priv->result) {case NFT_FIB_RESULT_OIF :case NFT_FIB_RESULT_OIFNAME : - hooks = (1 <<NF_INET_PRE_ROUTING ); -if (priv->flags &NFTA_FIB_F_IIF ) { - hooks |= (1 <<NF_INET_LOCAL_IN ) | - (1 <<NF_INET_FORWARD ); - } + hooks = (1 <<NF_INET_PRE_ROUTING ) | + (1 <<NF_INET_LOCAL_IN ) | + (1 <<NF_INET_FORWARD );break ;case NFT_FIB_RESULT_ADDRTYPE :if (priv->flags &NFTA_FIB_F_IIF )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 715/744 net/sched: taprio: make q->picos_per_byte available to fill_sched_entry()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit e634134180885574d1fe7aa162777ba41e7fcd5b ]
In commit b5b73b26b3ca ("taprio: Fix allowing too small intervals"), a comparison of user input against length_to_duration(q, ETH_ZLEN) was introduced, to avoid RCU stalls due to frequent hrtimers.
The implementation of length_to_duration() depends on q->picos_per_byte being set for the link speed. The blamed commit in the Fixes: tag has moved this too late, so the checks introduced above are ineffective. The q->picos_per_byte is zero at parse_taprio_schedule() -> parse_sched_list() -> parse_sched_entry() -> fill_sched_entry() time.
Move the taprio_set_picos_per_byte() call as one of the first things in taprio_change(), before the bulk of the netlink attribute parsing is done. That's because it is needed there.
Add a selftest to make sure the issue doesn't get reintroduced.
--- net/sched/sch_taprio.c | 4 +++- .../tc-testing/tc-tests/qdiscs/taprio.json | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
net/sched/sch_taprio.c +3 -1
@@ -1871,6 +1871,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, q->flags = err; +/* Needed for length_to_duration() during netlink attribute parsing */ +taprio_set_picos_per_byte (dev, q); + err =taprio_parse_mqprio_opt (dev, mqprio, extack, q->flags);if (err <0 )return err;
@@ -1930,7 +1933,6 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,if (err <0 ) goto free_sched; -taprio_set_picos_per_byte (dev, q);taprio_update_queue_max_sdu (q, new_admin, stab);if (FULL_OFFLOAD_IS_ENABLED (q->flags))
tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json +22 -0
@@ -132,6 +132,28 @@ "echo \"1\" > /sys/bus/netdevsim/del_device" ] }, + { + "id": "6f62", + "name": "Add taprio Qdisc with too short interval", + "category": [ + "qdisc", + "taprio" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "echo \"1 1 8\" > /sys/bus/netdevsim/new_device" + ], + "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: taprio num_tc 2 queues 1@0 1@1 sched-entry S 01 300 sched-entry S 02 1700 clockid CLOCK_TAI", + "expExitCode": "2", + "verifyCmd": "$TC qdisc show dev $ETH", + "matchPattern": "qdisc taprio 1: root refcnt", + "matchCount": "0", + "teardown": [ + "echo \"1\" > /sys/bus/netdevsim/del_device" + ] + }, { "id": "3e1e", "name": "Add taprio Qdisc with an invalid cycle-time",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 716/744 net/sched: taprio: extend minimum interval restriction to entire cycle too
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit fb66df20a7201e60f2b13d7f95d031b31a8831d3 ]
It is possible for syzbot to side-step the restriction imposed by the blamed commit in the Fixes: tag, because the taprio UAPI permits a cycle-time different from (and potentially shorter than) the sum of entry intervals.
We need one more restriction, which is that the cycle time itself must be larger than N * ETH_ZLEN bit times, where N is the number of schedule entries. This restriction needs to apply regardless of whether the cycle time came from the user or was the implicit, auto-calculated value, so we move the existing "cycle == 0" check outside the "if "(!new->cycle_time)" branch. This way covers both conditions and scenarios.
Add a selftest which illustrates the issue triggered by syzbot.
--- net/sched/sch_taprio.c | 10 ++++----- .../tc-testing/tc-tests/qdiscs/taprio.json | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-)
net/sched/sch_taprio.c +5 -5
@@ -1161,11 +1161,6 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb,list_for_each_entry (entry, &new->entries, list) cycle =ktime_add_ns (cycle, entry->interval); -if (!cycle) { -NL_SET_ERR_MSG (extack,"'cycle_time' can never be 0" ); -return -EINVAL ; - } -if (cycle <0 || cycle >INT_MAX ) {NL_SET_ERR_MSG (extack,"'cycle_time' is too big" );return -EINVAL ;
@@ -1174,6 +1169,11 @@ static int parse_taprio_schedule(struct taprio_sched *q, struct nlattr **tb, new->cycle_time = cycle; } +if (new->cycle_time < new->num_entries *length_to_duration (q,ETH_ZLEN )) { +NL_SET_ERR_MSG (extack,"'cycle_time' is too small" ); +return -EINVAL ; + } +taprio_calculate_gate_durations (q, new);return 0 ;
tools/testing/selftests/tc-testing/tc-tests/qdiscs/taprio.json +22 -0
@@ -154,6 +154,28 @@ "echo \"1\" > /sys/bus/netdevsim/del_device" ] }, + { + "id": "831f", + "name": "Add taprio Qdisc with too short cycle-time", + "category": [ + "qdisc", + "taprio" + ], + "plugins": { + "requires": "nsPlugin" + }, + "setup": [ + "echo \"1 1 8\" > /sys/bus/netdevsim/new_device" + ], + "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: taprio num_tc 2 queues 1@0 1@1 sched-entry S 01 200000 sched-entry S 02 200000 cycle-time 100 clockid CLOCK_TAI", + "expExitCode": "2", + "verifyCmd": "$TC qdisc show dev $ETH", + "matchPattern": "qdisc taprio 1: root refcnt", + "matchCount": "0", + "teardown": [ + "echo \"1\" > /sys/bus/netdevsim/del_device" + ] + }, { "id": "3e1e", "name": "Add taprio Qdisc with an invalid cycle-time",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 717/744 kconfig: fix comparison to constant symbols, m, n
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit aabdc960a283ba78086b0bf66ee74326f49e218e ]
Currently, comparisons to 'm' or 'n' result in incorrect output.
[Test Code]
config MODULES
def_bool y
modules
config A
def_tristate m
config B
def_bool A > n
CONFIG_B is unset, while CONFIG_B=y is expected.
The reason for the issue is because Kconfig compares the tristate values as strings.
Currently, the .type fields in the constant symbol definitions, symbol_{yes,mod,no} are unspecified, i.e., S_UNKNOWN.
When expr_calc_value() evaluates 'A > n', it checks the types of 'A' and 'n' to determine how to compare them.
The left-hand side, 'A', is a tristate symbol with a value of 'm', which corresponds to a numeric value of 1. (Internally, 'y', 'm', and 'n' are represented as 2, 1, and 0, respectively.)
The right-hand side, 'n', has an unknown type, so it is treated as the string "n" during the comparison.
expr_calc_value() compares two values numerically only when both can have numeric values. Otherwise, they are compared as strings.
symbol numeric value ASCII code
-------------------------------------
y 2 0x79
m 1 0x6d
n 0 0x6e'm' is greater than 'n' if compared numerically (since 1 is greater than 0), but smaller than 'n' if compared as strings (since the ASCII code 0x6d is smaller than 0x6e).
Specifying .type=S_TRISTATE for symbol_{yes,mod,no} fixes the above test code.
Doing so, however, would cause a regression to the following test code.
[Test Code 2]
config MODULES
def_bool n
modules
config A
def_tristate n
config B
def_bool A = m
You would get CONFIG_B=y, while CONFIG_B should not be set.
The reason is because sym_get_string_value() turns 'm' into 'n' when the module feature is disabled. Consequently, expr_calc_value() evaluates 'A = n' instead of 'A = m'. This oddity has been hidden because the type of 'm' was previously S_UNKNOWN instead of S_TRISTATE.
sym_get_string_value() should not tweak the string because the tristate value has already been correctly calculated. There is no reason to return the string "n" where its tristate value is mod.
--- scripts/kconfig/symbol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/kconfig/symbol.c +4 -2
@@ -13,18 +13,21 @@struct symbol symbol_yes = { .name ="y" , + .type =S_TRISTATE , .curr = {"y" , yes }, .flags =SYMBOL_CONST |SYMBOL_VALID , };struct symbol symbol_mod = { .name ="m" , + .type =S_TRISTATE , .curr = {"m" , mod }, .flags =SYMBOL_CONST |SYMBOL_VALID , };struct symbol symbol_no = { .name ="n" , + .type =S_TRISTATE , .curr = {"n" , no }, .flags =SYMBOL_CONST |SYMBOL_VALID , };
@@ -775,8 +778,7 @@ const char *sym_get_string_value(struct symbol *sym)case no:return "n" ;case mod: -sym_calc_value (modules_sym); -return (modules_sym->curr.tri == no) ?"n" :"m" ; +return "m" ;case yes:return "y" ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 718/744 drm/i915/guc: avoid FIELD_PREP warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit d4f36db62396b73bed383c0b6e48d36278cafa78 ]
With gcc-7 and earlier, there are lots of warnings like
In file included from <command-line>:0:0:
In function '__guc_context_policy_add_priority.isra.66',
inlined from '__guc_context_set_prio.isra.67' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3292:3,
inlined from 'guc_context_set_prio' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3320:2:
include/linux/compiler_types.h:399:38: error: call to '__compiletime_assert_631' declared with attribute error: FIELD_PREP: mask is not constant
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
^...drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:2422:3: note: in expansion of macro 'FIELD_PREP'
FIELD_PREP(GUC_KLV_0_KEY, GUC_CONTEXT_POLICIES_KLV_ID_##id) | \
^~~~~~~~~~
Make sure that GUC_KLV_0_KEY is an unsigned value to avoid the warning.
--- drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h +3 -3
@@ -29,9 +29,9 @@*/ #define GUC_KLV_LEN_MIN 1u -#define GUC_KLV_0_KEY (0xffff << 16) -#define GUC_KLV_0_LEN (0xffff << 0) -#define GUC_KLV_n_VALUE (0xffffffff << 0) +#define GUC_KLV_0_KEY (0xffffu << 16) +#define GUC_KLV_0_LEN (0xffffu << 0) +#define GUC_KLV_n_VALUE (0xffffffffu << 0)/** * DOC: GuC Self Config KLVs
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 719/744 drm/i915/gt: Fix CCS ids calculation for CCS mode setting
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andi Shyti <[email protected]>
[ Upstream commit ee01b6a386eaf9984b58a2476e8f531149679da9 ]
The whole point of the previous fixes has been to change the CCS hardware configuration to generate only one stream available to the compute users. We did this by changing the info.engine_mask that is set during device probe, reset during the detection of the fused engines, and finally reset again when choosing the CCS mode.
We can't use the engine_mask variable anymore, as with the current configuration, it imposes only one CCS no matter what the hardware configuration is.
Before changing the engine_mask for the third time, save it and use it for calculating the CCS mode.
After the previous changes, the user reported a performance drop to around 1/4. We have tested that the compute operations, with the current patch, have improved by the same factor.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 6 ++++++ drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +6 -0
@@ -923,6 +923,12 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)if (IS_DG2 (gt->i915)) {u8 first_ccs =__ffs (CCS_MASK (gt)); +/* +* Store the number of active cslices before +* changing the CCS engine configuration +*/ + gt->ccs.cslices =CCS_MASK (gt); +/* Mask off all the CCS engine */ info->engine_mask &= ~GENMASK (CCS3 ,CCS0 );/* Put back in the first CCS engine */
drivers/gpu/drm/i915/gt/intel_gt_ccs_mode.c +1 -1
@@ -19,7 +19,7 @@ unsigned int intel_gt_apply_ccs_mode(struct intel_gt *gt)/* Build the value for the fixed CCS load balancing */ for (cslice =0 ; cslice <I915_MAX_CCS ; cslice++) { -if (CCS_MASK (gt) &BIT (cslice)) +if (gt->ccs.cslices &BIT (cslice))/* * If available, assign the cslice * to the first available engine...
drivers/gpu/drm/i915/gt/intel_gt_types.h +8 -0
@@ -207,6 +207,14 @@ struct intel_gt { [MAX_ENGINE_INSTANCE +1 ];enum intel_submission_method submission_method; +struct { +/* +* Mask of the non fused CCS slices +* to be used for the load balancing +*/ +intel_engine_mask_t cslices; + } ccs; +/* * Default address space (either GGTT or ppGTT depending on arch). *
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 720/744 kheaders: use `command -v` to test for existence of `cpio`
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
[ Upstream commit 6e58e0173507e506a5627741358bc770f220e356 ]
Commit 13e1df09284d ("kheaders: explicitly validate existence of cpio command") added an explicit check for cpio using type.
However, type in dash (which is used in some popular distributions and base images as the shell script runner) prints the missing message to standard output, and thus no error is printed:
$ bash -c 'type missing >/dev/null'
bash: line 1: type: missing: not found
$ dash -c 'type missing >/dev/null'
$For instance, this issue may be seen by loongarch builders, given its defconfig enables CONFIG_IKHEADERS since commit 9cc1df421f00 ("LoongArch:
Update Loongson-3 default config file").
Therefore, use command -v instead to have consistent behavior, and take the chance to provide a more explicit error.
--- kernel/gen_kheaders.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/gen_kheaders.sh +6 -1
@@ -14,7 +14,12 @@ include/ arch/$SRCARCH/include/ " -type cpio > /dev/null +if ! command -v cpio >/dev/null; then + echo >&2 "***" + echo >&2 "*** 'cpio' could not be found." + echo >&2 "***" + exit 1 +fi # Support incremental builds by skipping archive generation # if timestamps of files being archived are not changed.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 721/744 spi: stm32: Dont warn about spurious interrupts
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 95d7c452a26564ef0c427f2806761b857106d8c4 ]
The dev_warn to notify about a spurious interrupt was introduced with the reasoning that these are unexpected. However spurious interrupts tend to trigger continously and the error message on the serial console prevents that the core's detection of spurious interrupts kicks in (which disables the irq) and just floods the console.
--- drivers/spi/spi-stm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-stm32.c +1 -1
@@ -898,7 +898,7 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id) mask |=STM32H7_SPI_SR_TXP |STM32H7_SPI_SR_RXP ;if (!(sr & mask)) { -dev_warn (spi->dev,"spurious IT (sr=0x%08x, ier=0x%08x)\n" , +dev_vdbg (spi->dev,"spurious IT (sr=0x%08x, ier=0x%08x)\n" , sr, ier);spin_unlock_irqrestore (&spi->lock, flags);return IRQ_NONE ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 722/744 net: dsa: microchip: fix RGMII error in KSZ DSA driver
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tristram Ha <[email protected]>
[ Upstream commit 278d65ccdadb5f0fa0ceaf7b9cc97b305cd72822 ]
The driver should return RMII interface when XMII is running in RMII mode.
--- drivers/net/dsa/microchip/ksz_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/microchip/ksz_common.c +1 -1
@@ -2864,7 +2864,7 @@ phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit)else interface =PHY_INTERFACE_MODE_MII ; }else if (val == bitval[P_RMII_SEL ]) { - interface =PHY_INTERFACE_MODE_RGMII ; + interface =PHY_INTERFACE_MODE_RMII ; }else { interface =PHY_INTERFACE_MODE_RGMII ;if (data8 &P_RGMII_ID_EG_ENABLE )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 723/744 e1000e: move force SMBUS near the end of enable_ulp function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
[ Upstream commit bfd546a552e140b0a4c8a21527c39d6d21addb28 ]
The commit 861e8086029e ("e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue") introduces a regression on PCH_MTP_I219_LM18 (PCIID: 0x8086550A). Without the referred commit, the ethernet works well after suspend and resume, but after applying the commit, the ethernet couldn't work anymore after the resume and the dmesg shows that the NIC link changes to 10Mbps (1000Mbps originally):
[ 43.305084] e1000e 0000:00:1f.6 enp0s31f6: NIC Link is Up 10 Mbps Full Duplex, Flow Control: Rx/Tx
Without the commit, the force SMBUS code will not be executed if "return 0" or "goto out" is executed in the enable_ulp(), and in my case, the "goto out" is executed since FWSM_FW_VALID is set. But after applying the commit, the force SMBUS code will be ran unconditionally.
Here move the force SMBUS code back to enable_ulp() and put it immediately ahead of hw->phy.ops.release(hw), this could allow the longest settling time as possible for interface in this function and doesn't change the original code logic.
The issue was found on a Lenovo laptop with the ethernet hw as below:
00:1f.6 Ethernet controller [0200]: Intel Corporation Device [8086:550a] (rev 20).
And this patch is verified (cable plug and unplug, system suspend and resume) on Lenovo laptops with ethernet hw: [8086:550a], [8086:550b], [8086:15bb], [8086:15be], [8086:1a1f], [8086:1a1c] and [8086:0dc7].
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 22 +++++++++++++++++++++ drivers/net/ethernet/intel/e1000e/netdev.c | 18 ----------------- 2 files changed, 22 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +22 -0
@@ -1225,6 +1225,28 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) } release: +/* Switching PHY interface always returns MDI error +* so disable retry mechanism to avoid wasting time +*/ +e1000e_disable_phy_retry (hw); + +/* Force SMBus mode in PHY */ + ret_val =e1000_read_phy_reg_hv_locked (hw,CV_SMB_CTRL , &phy_reg); +if (ret_val) { +e1000e_enable_phy_retry (hw); + hw->phy.ops.release (hw); + goto out; + } + phy_reg |=CV_SMB_CTRL_FORCE_SMBUS ; +e1000_write_phy_reg_hv_locked (hw,CV_SMB_CTRL , phy_reg); + +e1000e_enable_phy_retry (hw); + +/* Force SMBus mode in MAC */ + mac_reg =er32 (CTRL_EXT ); + mac_reg |=E1000_CTRL_EXT_FORCE_SMBUS ; +ew32 (CTRL_EXT , mac_reg); + hw->phy.ops.release (hw); out:if (ret_val)
drivers/net/ethernet/intel/e1000e/netdev.c +0 -18
@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)struct e1000_hw *hw = &adapter->hw;u32 ctrl, ctrl_ext, rctl, status, wufc;int retval =0 ; -u16 smb_ctrl;/* Runtime suspend should only enable wakeup for link changes */ if (runtime)
@@ -6697,23 +6696,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)if (retval)return retval; } - -/* Force SMBUS to allow WOL */ -/* Switching PHY interface always returns MDI error -* so disable retry mechanism to avoid wasting time -*/ -e1000e_disable_phy_retry (hw); - -e1e_rphy (hw,CV_SMB_CTRL , &smb_ctrl); - smb_ctrl |=CV_SMB_CTRL_FORCE_SMBUS ; -e1e_wphy (hw,CV_SMB_CTRL , smb_ctrl); - -e1000e_enable_phy_retry (hw); - -/* Force SMBus mode in MAC */ - ctrl_ext =er32 (CTRL_EXT ); - ctrl_ext |=E1000_CTRL_EXT_FORCE_SMBUS ; -ew32 (CTRL_EXT , ctrl_ext); }/* Ensure that the appropriate bits are set in LPI_CTRL
Signature · 1 line
2.43.0
Re: [PATCH 6.6 723/744] e1000e: move force SMBUS near the end of enable_ulp function
Add Todd.
Todd found a regression caused by this commit.
https://bugzilla.kernel.org/show_bug.cgi?id=218940
I think we should make that clear first.
thanks,
rui
Quoted 139 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
[ Upstream commit
bfd546a552e140b0a4c8a21527c39d6d21addb28]The commit
861e8086029e("e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue") introduces a regression onPCH_MTP_I219_LM18(PCIID:0x8086550A). Without the referred commit, the
ethernet works well after suspend and resume, but after applying the commit, the ethernet couldn't work anymore after the resume and the dmesg shows that the NIC link changes to 10Mbps (1000Mbps originally):[ 43.305084] e1000e 0000:00:1f.6 enp0s31f6: NIC Link is Up 10 Mbps Full Duplex, Flow Control: Rx/Tx
Without the commit, the force SMBUS code will not be executed if "return 0" or "goto out" is executed in the
enable_ulp(), and in my case, the "goto out" is executed sinceFWSM_FW_VALIDis set. But after
applying the commit, the force SMBUS code will be ran unconditionally.Here move the force SMBUS code back to
enable_ulp()and put it immediately ahead ofhw->phy.ops.release(hw), this could allow the longest settling time as possible for interface in this function and doesn't change the original code logic.The issue was found on a Lenovo laptop with the ethernet hw as below:
00:1f.6 Ethernet controller [0200]: Intel Corporation Device [8086:550a]
(rev 20).And this patch is verified (cable plug and unplug, system suspend and resume) on Lenovo laptops with ethernet hw: [8086:550a], [8086:550b], [8086:15bb], [8086:15be], [8086:1a1f], [8086:1a1c] and [8086:0dc7].
Fixes 861e8086029e ("e1000e: move force SMBUS from enable ulpfunction to avoid PHY loss issue")
Signed-off-by Hui Wang <[email protected]>Acked-by Vitaly Lifshits <[email protected]>Tested-by Naama Meir <[email protected]>Reviewed-by Simon Horman <[email protected]>Reviewed-by Paul Menzel <[email protected]>Signed-off-by Tony Nguyen <[email protected]>Tested-by Zhang Rui <[email protected]>Signed-off-by Jacob Keller <[email protected]>Link:
https://lore.kernel.org/r/20240528-net-2024-05-28-intel-net-fixes-v1-1-dc8593d2bbc6@intel.comSigned-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>---
drivers/net/ethernet/intel/e1000e/ich8lan.c | 22
+++++++++++++++++++++
drivers/net/ethernet/intel/e1000e/netdev.c | 18 -----------------2 files changed, 22 insertions(+), 18 deletions(-)drivers/net/ethernet/intel/e1000e/ich8lan.c +0
-0@@ -1225,6 +1225,28 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) }
release:
+ /* Switching PHY interface always returns MDI error + * so disable retry mechanism to avoid wasting time + */
+ e1000e_disable_phy_retry(hw);
+
+ /* Force SMBus mode in PHY */
+ ret_val =e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg);
+ if (ret_val) {
+ e1000e_enable_phy_retry(hw);
+ hw->phy.ops.release(hw);
+ goto out;
+ }
+ phy_reg |=CV_SMB_CTRL_FORCE_SMBUS;
+ e1000_write_phy_reg_hv_locked(hw,CV_SMB_CTRL,phy_reg);drivers/net/ethernet/intel/e1000e/ich8lan.c +8
-0+ + e1000e_enable_phy_retry(hw); + + /* Force SMBus mode in MAC */ + mac_reg = er32(CTRL_EXT); + mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS; + ew32(CTRL_EXT, mac_reg); +hw->phy.ops.release(hw);
out:
if (ret_val)drivers/net/ethernet/intel/e1000e/netdev.c +0
-1@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) struct e1000_hw *hw = &adapter->hw; u32 ctrl, ctrl_ext, rctl, status, wufc; int retval = 0; - u16 smb_ctrl;
/* Runtime suspend should only enable wakeup for link changes */
if (runtime)drivers/net/ethernet/intel/e1000e/netdev.c +0
-17@@ -6697,23 +6696,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) if (retval) return retval; } - - /* Force SMBUS to allow WOL */ - /* Switching PHY interface always returns MDI error - * so disable retry mechanism to avoid wasting time - */ - e1000e_disable_phy_retry(hw); - - e1e_rphy(hw, CV_SMB_CTRL, &smb_ctrl); - smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS; - e1e_wphy(hw, CV_SMB_CTRL, smb_ctrl); - - e1000e_enable_phy_retry(hw); - - /* Force SMBus mode in MAC */ - ctrl_ext = er32(CTRL_EXT); - ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS; - ew32(CTRL_EXT, ctrl_ext); }
/* Ensure that the appropriate bits are set inLPI_CTRL
Re: [PATCH 6.6 723/744] e1000e: move force SMBUS near the end of enable_ulp function
Hi Greg,
Please do not apply the commit to the stable kernels, there is a regression report on this commit.
Thanks,
Hui.
Quoted 150 lines · Rui
Add Todd.
Todd found a regression caused by this commit.
https://bugzilla.kernel.org/show_bug.cgi?id=218940I think we should make that clear first.
thanks,
ruiQuoted 139 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
[ Upstream commit
bfd546a552e140b0a4c8a21527c39d6d21addb28]The commit
861e8086029e("e1000e: move force SMBUS from enable ulp function to avoid PHY loss issue") introduces a regression onPCH_MTP_I219_LM18(PCIID:0x8086550A). Without the referred commit, the
ethernet works well after suspend and resume, but after applying the commit, the ethernet couldn't work anymore after the resume and the dmesg shows that the NIC link changes to 10Mbps (1000Mbps originally):[ 43.305084] e1000e 0000:00:1f.6 enp0s31f6: NIC Link is Up 10
Mbps Full Duplex, Flow Control: Rx/TxWithout the commit, the force SMBUS code will not be executed if "return 0" or "goto out" is executed in the
enable_ulp(), and in my case, the "goto out" is executed sinceFWSM_FW_VALIDis set. But after
applying the commit, the force SMBUS code will be ran unconditionally.Here move the force SMBUS code back to
enable_ulp()and put it immediately ahead ofhw->phy.ops.release(hw), this could allow the longest settling time as possible for interface in this function and doesn't change the original code logic.The issue was found on a Lenovo laptop with the ethernet hw as below:
00:1f.6 Ethernet controller [0200]: Intel Corporation Device [8086:550a]
(rev 20).And this patch is verified (cable plug and unplug, system suspend and resume) on Lenovo laptops with ethernet hw: [8086:550a], [8086:550b], [8086:15bb], [8086:15be], [8086:1a1f], [8086:1a1c] and [8086:0dc7].
Fixes 861e8086029e ("e1000e: move force SMBUS from enable ulpfunction to avoid PHY loss issue")
Signed-off-by Hui Wang <[email protected]>Acked-by Vitaly Lifshits <[email protected]>Tested-by Naama Meir <[email protected]>Reviewed-by Simon Horman <[email protected]>Reviewed-by Paul Menzel <[email protected]>Signed-off-by Tony Nguyen <[email protected]>Tested-by Zhang Rui <[email protected]>Signed-off-by Jacob Keller <[email protected]>Link:
https://lore.kernel.org/r/20240528-net-2024-05-28-intel-net-fixes-v1-1-dc8593d2bbc6@intel.comSigned-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 22 +++++++++++++++++++++ drivers/net/ethernet/intel/e1000e/netdev.c | 18 ----------------- 2 files changed, 22 insertions(+), 18 deletions(-)drivers/net/ethernet/intel/e1000e/ich8lan.c +22
-0@@ -1225,6 +1225,28 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) } release: + /* Switching PHY interface always returns MDI error + * so disable retry mechanism to avoid wasting time + */ + e1000e_disable_phy_retry(hw); + + /* Force SMBus mode in PHY */ + ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg); + if (ret_val) { + e1000e_enable_phy_retry(hw); + hw->phy.ops.release(hw); + goto out; + } + phy_reg |= CV_SMB_CTRL_FORCE_SMBUS; + e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, phy_reg); + + e1000e_enable_phy_retry(hw); + + /* Force SMBus mode in MAC */ + mac_reg = er32(CTRL_EXT); + mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS; + ew32(CTRL_EXT, mac_reg); + hw->phy.ops.release(hw);out:
if (ret_val)drivers/net/ethernet/intel/e1000e/netdev.c +0
-1@@ -6623,7 +6623,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) struct e1000_hw *hw = &adapter->hw; u32 ctrl, ctrl_ext, rctl, status, wufc; int retval = 0; - u16 smb_ctrl; /* Runtime suspend should only enable wakeup for link changes*/
if (runtime)drivers/net/ethernet/intel/e1000e/netdev.c +0
-17@@ -6697,23 +6696,6 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) if (retval) return retval; } - - /* Force SMBUS to allow WOL */ - /* Switching PHY interface always returns MDI error - * so disable retry mechanism to avoid wasting time - */ - e1000e_disable_phy_retry(hw); - - e1e_rphy(hw, CV_SMB_CTRL, &smb_ctrl); - smb_ctrl |= CV_SMB_CTRL_FORCE_SMBUS; - e1e_wphy(hw, CV_SMB_CTRL, smb_ctrl); - - e1000e_enable_phy_retry(hw); - - /* Force SMBus mode in MAC */ - ctrl_ext = er32(CTRL_EXT); - ctrl_ext |= E1000_CTRL_EXT_FORCE_SMBUS; - ew32(CTRL_EXT, ctrl_ext); }/* Ensure that the appropriate bits are set in
LPI_CTRL
[email protected]
maintainerRe: [PATCH 6.6 723/744] e1000e: move force SMBUS near the end of enable_ulp function
Quoted 4 lines · Hui Wang
Hi Greg,
Please do not apply the commit to the stable kernels, there is a regression report on this commit.
Now dropped from everywhere, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 724/744 net: ena: Reduce lines with longer column width boundary
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Arinzon <[email protected]>
[ Upstream commit 50613650c3d6255cef13a129ccaa919ca73a6743 ]
This patch reduces some of the lines by removing newlines where more variables or print strings can be pushed back to the previous line while still adhering to the styling guidelines.
Stable-dep-of: 2dc8b1e7177d ("net: ena: Fix redundant device NUMA node override")
--- drivers/net/ethernet/amazon/ena/ena_com.c | 315 +++++++----------- drivers/net/ethernet/amazon/ena/ena_eth_com.c | 49 ++- drivers/net/ethernet/amazon/ena/ena_eth_com.h | 15 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 32 +- 4 files changed, 151 insertions(+), 260 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.c +112 -203
@@ -90,8 +90,7 @@ static int ena_com_admin_init_sq(struct ena_com_admin_queue *admin_queue)struct ena_com_admin_sq *sq = &admin_queue->sq;u16 size =ADMIN_SQ_SIZE (admin_queue->q_depth); - sq->entries =dma_alloc_coherent (admin_queue->q_dmadev, size, - &sq->dma_addr,GFP_KERNEL ); + sq->entries =dma_alloc_coherent (admin_queue->q_dmadev, size, &sq->dma_addr,GFP_KERNEL );if (!sq->entries) {netdev_err (ena_dev->net_device,"Memory allocation failed\n" );
@@ -113,8 +112,7 @@ static int ena_com_admin_init_cq(struct ena_com_admin_queue *admin_queue)struct ena_com_admin_cq *cq = &admin_queue->cq;u16 size =ADMIN_CQ_SIZE (admin_queue->q_depth); - cq->entries =dma_alloc_coherent (admin_queue->q_dmadev, size, - &cq->dma_addr,GFP_KERNEL ); + cq->entries =dma_alloc_coherent (admin_queue->q_dmadev, size, &cq->dma_addr,GFP_KERNEL );if (!cq->entries) {netdev_err (ena_dev->net_device,"Memory allocation failed\n" );
@@ -136,8 +134,7 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *ena_dev, ena_dev->aenq.q_depth =ENA_ASYNC_QUEUE_DEPTH ; size =ADMIN_AENQ_SIZE (ENA_ASYNC_QUEUE_DEPTH ); - aenq->entries =dma_alloc_coherent (ena_dev->dmadev, size, - &aenq->dma_addr,GFP_KERNEL ); + aenq->entries =dma_alloc_coherent (ena_dev->dmadev, size, &aenq->dma_addr,GFP_KERNEL );if (!aenq->entries) {netdev_err (ena_dev->net_device,"Memory allocation failed\n" );
@@ -155,14 +152,13 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *ena_dev, aenq_caps =0 ; aenq_caps |= ena_dev->aenq.q_depth &ENA_REGS_AENQ_CAPS_AENQ_DEPTH_MASK ; - aenq_caps |= (sizeof (struct ena_admin_aenq_entry ) - <<ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT ) & -ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_MASK ; + aenq_caps |= + (sizeof (struct ena_admin_aenq_entry ) <<ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT ) & +ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_MASK ;writel (aenq_caps, ena_dev->reg_bar +ENA_REGS_AENQ_CAPS_OFF );if (unlikely (!aenq_handlers)) { -netdev_err (ena_dev->net_device, -"AENQ handlers pointer is NULL\n" ); +netdev_err (ena_dev->net_device,"AENQ handlers pointer is NULL\n" );return -EINVAL ; }
@@ -189,14 +185,12 @@ static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *admin_queu }if (unlikely (!admin_queue->comp_ctx)) { -netdev_err (admin_queue->ena_dev->net_device, -"Completion context is NULL\n" ); +netdev_err (admin_queue->ena_dev->net_device,"Completion context is NULL\n" );return NULL ; }if (unlikely (admin_queue->comp_ctx[command_id].occupied && capture)) { -netdev_err (admin_queue->ena_dev->net_device, -"Completion context is occupied\n" ); +netdev_err (admin_queue->ena_dev->net_device,"Completion context is occupied\n" );return NULL ; }
@@ -226,8 +220,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queu/* In case of queue FULL */ cnt = (u16 )atomic_read (&admin_queue->outstanding_cmds);if (cnt >= admin_queue->q_depth) { -netdev_dbg (admin_queue->ena_dev->net_device, -"Admin queue is full.\n" ); +netdev_dbg (admin_queue->ena_dev->net_device,"Admin queue is full.\n" ); admin_queue->stats.out_of_space++;return ERR_PTR (-ENOSPC ); }
@@ -274,8 +267,7 @@ static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *admin_queue)struct ena_comp_ctx *comp_ctx;u16 i; - admin_queue->comp_ctx = -devm_kzalloc (admin_queue->q_dmadev, size,GFP_KERNEL ); + admin_queue->comp_ctx =devm_kzalloc (admin_queue->q_dmadev, size,GFP_KERNEL );if (unlikely (!admin_queue->comp_ctx)) {netdev_err (ena_dev->net_device,"Memory allocation failed\n" );return -ENOMEM ;
@@ -336,20 +328,17 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev, dev_node =dev_to_node (ena_dev->dmadev);set_dev_node (ena_dev->dmadev, ctx->numa_node); io_sq->desc_addr.virt_addr = -dma_alloc_coherent (ena_dev->dmadev, size, - &io_sq->desc_addr.phys_addr, +dma_alloc_coherent (ena_dev->dmadev, size, &io_sq->desc_addr.phys_addr,GFP_KERNEL );set_dev_node (ena_dev->dmadev, dev_node);if (!io_sq->desc_addr.virt_addr) { io_sq->desc_addr.virt_addr =dma_alloc_coherent (ena_dev->dmadev, size, - &io_sq->desc_addr.phys_addr, -GFP_KERNEL ); + &io_sq->desc_addr.phys_addr,GFP_KERNEL ); }if (!io_sq->desc_addr.virt_addr) { -netdev_err (ena_dev->net_device, -"Memory allocation failed\n" ); +netdev_err (ena_dev->net_device,"Memory allocation failed\n" );return -ENOMEM ; } }
@@ -367,16 +356,14 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev, dev_node =dev_to_node (ena_dev->dmadev);set_dev_node (ena_dev->dmadev, ctx->numa_node); - io_sq->bounce_buf_ctrl.base_buffer = -devm_kzalloc (ena_dev->dmadev, size,GFP_KERNEL ); + io_sq->bounce_buf_ctrl.base_buffer =devm_kzalloc (ena_dev->dmadev, size,GFP_KERNEL );set_dev_node (ena_dev->dmadev, dev_node);if (!io_sq->bounce_buf_ctrl.base_buffer) io_sq->bounce_buf_ctrl.base_buffer =devm_kzalloc (ena_dev->dmadev, size,GFP_KERNEL );if (!io_sq->bounce_buf_ctrl.base_buffer) { -netdev_err (ena_dev->net_device, -"Bounce buffer memory allocation failed\n" ); +netdev_err (ena_dev->net_device,"Bounce buffer memory allocation failed\n" );return -ENOMEM ; }
@@ -425,13 +412,11 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev, prev_node =dev_to_node (ena_dev->dmadev);set_dev_node (ena_dev->dmadev, ctx->numa_node); io_cq->cdesc_addr.virt_addr = -dma_alloc_coherent (ena_dev->dmadev, size, - &io_cq->cdesc_addr.phys_addr,GFP_KERNEL ); +dma_alloc_coherent (ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr,GFP_KERNEL );set_dev_node (ena_dev->dmadev, prev_node);if (!io_cq->cdesc_addr.virt_addr) { io_cq->cdesc_addr.virt_addr = -dma_alloc_coherent (ena_dev->dmadev, size, - &io_cq->cdesc_addr.phys_addr, +dma_alloc_coherent (ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr,GFP_KERNEL ); }
@@ -514,8 +499,8 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue, u8 comp_status) {if (unlikely (comp_status !=0 )) -netdev_err (admin_queue->ena_dev->net_device, -"Admin command failed[%u]\n" , comp_status); +netdev_err (admin_queue->ena_dev->net_device,"Admin command failed[%u]\n" , + comp_status);switch (comp_status) {case ENA_ADMIN_SUCCESS :
@@ -580,8 +565,7 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c }if (unlikely (comp_ctx->status ==ENA_CMD_ABORTED )) { -netdev_err (admin_queue->ena_dev->net_device, -"Command was aborted\n" ); +netdev_err (admin_queue->ena_dev->net_device,"Command was aborted\n" );spin_lock_irqsave (&admin_queue->q_lock, flags); admin_queue->stats.aborted_cmd++;spin_unlock_irqrestore (&admin_queue->q_lock, flags);
@@ -589,8 +573,7 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c goto err; } -WARN (comp_ctx->status !=ENA_CMD_COMPLETED ,"Invalid comp status %d\n" , - comp_ctx->status); +WARN (comp_ctx->status !=ENA_CMD_COMPLETED ,"Invalid comp status %d\n" , comp_ctx->status); ret =ena_com_comp_status_to_errno (admin_queue, comp_ctx->comp_status); err:
@@ -634,8 +617,7 @@ static int ena_com_set_llq(struct ena_com_dev *ena_dev) sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to set LLQ configurations: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to set LLQ configurations: %d\n" , ret);return ret; }
@@ -658,8 +640,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev, llq_default_cfg->llq_header_location; }else {netdev_err (ena_dev->net_device, -"Invalid header location control, supported: 0x%x\n" , - supported_feat); +"Invalid header location control, supported: 0x%x\n" , supported_feat);return -EINVAL ; }
@@ -681,8 +662,8 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,netdev_err (ena_dev->net_device,"Default llq stride ctrl is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n" , - llq_default_cfg->llq_stride_ctrl, - supported_feat, llq_info->desc_stride_ctrl); + llq_default_cfg->llq_stride_ctrl, supported_feat, + llq_info->desc_stride_ctrl); } }else { llq_info->desc_stride_ctrl =0 ;
@@ -704,8 +685,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev, llq_info->desc_list_entry_size =256 ; }else {netdev_err (ena_dev->net_device, -"Invalid entry_size_ctrl, supported: 0x%x\n" , - supported_feat); +"Invalid entry_size_ctrl, supported: 0x%x\n" , supported_feat);return -EINVAL ; }
@@ -750,8 +730,8 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,netdev_err (ena_dev->net_device,"Default llq num descs before header is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n" , - llq_default_cfg->llq_num_decs_before_header, - supported_feat, llq_info->descs_num_before_header); + llq_default_cfg->llq_num_decs_before_header, supported_feat, + llq_info->descs_num_before_header); }/* Check for accelerated queue supported */ llq_accel_mode_get = llq_features->accel_mode.u.get;
@@ -767,8 +747,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev, rc =ena_com_set_llq (ena_dev);if (rc) -netdev_err (ena_dev->net_device, -"Cannot set LLQ configuration: %d\n" , rc); +netdev_err (ena_dev->net_device,"Cannot set LLQ configuration: %d\n" , rc);return rc; }
@@ -780,8 +759,7 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comint ret;wait_for_completion_timeout (&comp_ctx->wait_event, -usecs_to_jiffies ( - admin_queue->completion_timeout)); +usecs_to_jiffies (admin_queue->completion_timeout));/* In case the command wasn't completed find out the root cause. * There might be 2 kinds of errors
@@ -797,8 +775,7 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comif (comp_ctx->status ==ENA_CMD_COMPLETED ) {netdev_err (admin_queue->ena_dev->net_device,"The ena device sent a completion but the driver didn't receive a MSI-X interrupt (cmd %d), autopolling mode is %s\n" , - comp_ctx->cmd_opcode, - admin_queue->auto_polling ?"ON" :"OFF" ); + comp_ctx->cmd_opcode, admin_queue->auto_polling ?"ON" :"OFF" );/* Check if fallback to polling is enabled */ if (admin_queue->auto_polling) admin_queue->polling = true;
@@ -867,15 +844,13 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)if (unlikely (i == timeout)) {netdev_err (ena_dev->net_device,"Reading reg failed for timeout. expected: req id[%u] offset[%u] actual: req id[%u] offset[%u]\n" , - mmio_read->seq_num, offset, read_resp->req_id, - read_resp->reg_off); + mmio_read->seq_num, offset, read_resp->req_id, read_resp->reg_off); ret =ENA_MMIO_READ_TIMEOUT ; goto err; }if (read_resp->reg_off != offset) { -netdev_err (ena_dev->net_device, -"Read failure: wrong offset provided\n" ); +netdev_err (ena_dev->net_device,"Read failure: wrong offset provided\n" ); ret =ENA_MMIO_READ_TIMEOUT ; }else { ret = read_resp->reg_val;
@@ -934,8 +909,7 @@ static int ena_com_destroy_io_sq(struct ena_com_dev *ena_dev, sizeof(destroy_resp));if (unlikely (ret && (ret != -ENODEV ))) -netdev_err (ena_dev->net_device, -"Failed to destroy io sq error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to destroy io sq error: %d\n" , ret);return ret; }
@@ -949,8 +923,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,if (io_cq->cdesc_addr.virt_addr) { size = io_cq->cdesc_entry_size_in_bytes * io_cq->q_depth; -dma_free_coherent (ena_dev->dmadev, size, - io_cq->cdesc_addr.virt_addr, +dma_free_coherent (ena_dev->dmadev, size, io_cq->cdesc_addr.virt_addr, io_cq->cdesc_addr.phys_addr); io_cq->cdesc_addr.virt_addr =NULL ;
@@ -959,8 +932,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,if (io_sq->desc_addr.virt_addr) { size = io_sq->desc_entry_size * io_sq->q_depth; -dma_free_coherent (ena_dev->dmadev, size, - io_sq->desc_addr.virt_addr, +dma_free_coherent (ena_dev->dmadev, size, io_sq->desc_addr.virt_addr, io_sq->desc_addr.phys_addr); io_sq->desc_addr.virt_addr =NULL ;
@@ -985,8 +957,7 @@ static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout, val =ena_com_reg_bar_read32 (ena_dev,ENA_REGS_DEV_STS_OFF );if (unlikely (val ==ENA_MMIO_READ_TIMEOUT )) { -netdev_err (ena_dev->net_device, -"Reg read timeout occurred\n" ); +netdev_err (ena_dev->net_device,"Reg read timeout occurred\n" );return -ETIME ; }
@@ -1026,8 +997,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,int ret;if (!ena_com_check_supported_feature_id (ena_dev, feature_id)) { -netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" , - feature_id); +netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" , feature_id);return -EOPNOTSUPP ; }
@@ -1064,8 +1034,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,if (unlikely (ret))netdev_err (ena_dev->net_device, -"Failed to submit get_feature command %d error: %d\n" , - feature_id, ret); +"Failed to submit get_feature command %d error: %d\n" , feature_id, ret);return ret; }
@@ -1104,13 +1073,11 @@ static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev) {struct ena_rss *rss = &ena_dev->rss; -if (!ena_com_check_supported_feature_id (ena_dev, -ENA_ADMIN_RSS_HASH_FUNCTION )) +if (!ena_com_check_supported_feature_id (ena_dev,ENA_ADMIN_RSS_HASH_FUNCTION ))return -EOPNOTSUPP ; - rss->hash_key = -dma_alloc_coherent (ena_dev->dmadev,sizeof (*rss->hash_key), - &rss->hash_key_dma_addr,GFP_KERNEL ); + rss->hash_key =dma_alloc_coherent (ena_dev->dmadev,sizeof (*rss->hash_key), + &rss->hash_key_dma_addr,GFP_KERNEL );if (unlikely (!rss->hash_key))return -ENOMEM ;
@@ -1123,8 +1090,8 @@ static void ena_com_hash_key_destroy(struct ena_com_dev *ena_dev)struct ena_rss *rss = &ena_dev->rss;if (rss->hash_key) -dma_free_coherent (ena_dev->dmadev,sizeof (*rss->hash_key), - rss->hash_key, rss->hash_key_dma_addr); +dma_free_coherent (ena_dev->dmadev,sizeof (*rss->hash_key), rss->hash_key, + rss->hash_key_dma_addr); rss->hash_key =NULL ; }
@@ -1132,9 +1099,8 @@ static int ena_com_hash_ctrl_init(struct ena_com_dev *ena_dev) {struct ena_rss *rss = &ena_dev->rss; - rss->hash_ctrl = -dma_alloc_coherent (ena_dev->dmadev,sizeof (*rss->hash_ctrl), - &rss->hash_ctrl_dma_addr,GFP_KERNEL ); + rss->hash_ctrl =dma_alloc_coherent (ena_dev->dmadev,sizeof (*rss->hash_ctrl), + &rss->hash_ctrl_dma_addr,GFP_KERNEL );if (unlikely (!rss->hash_ctrl))return -ENOMEM ;
@@ -1147,8 +1113,8 @@ static void ena_com_hash_ctrl_destroy(struct ena_com_dev *ena_dev)struct ena_rss *rss = &ena_dev->rss;if (rss->hash_ctrl) -dma_free_coherent (ena_dev->dmadev,sizeof (*rss->hash_ctrl), - rss->hash_ctrl, rss->hash_ctrl_dma_addr); +dma_free_coherent (ena_dev->dmadev,sizeof (*rss->hash_ctrl), rss->hash_ctrl, + rss->hash_ctrl_dma_addr); rss->hash_ctrl =NULL ; }
@@ -1177,15 +1143,13 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev, tbl_size = (1ULL << log_size) *sizeof (struct ena_admin_rss_ind_table_entry ); - rss->rss_ind_tbl = -dma_alloc_coherent (ena_dev->dmadev, tbl_size, - &rss->rss_ind_tbl_dma_addr,GFP_KERNEL ); + rss->rss_ind_tbl =dma_alloc_coherent (ena_dev->dmadev, tbl_size, &rss->rss_ind_tbl_dma_addr, +GFP_KERNEL );if (unlikely (!rss->rss_ind_tbl)) goto mem_err1; tbl_size = (1ULL << log_size) *sizeof (u16); - rss->host_rss_ind_tbl = -devm_kzalloc (ena_dev->dmadev, tbl_size,GFP_KERNEL ); + rss->host_rss_ind_tbl =devm_kzalloc (ena_dev->dmadev, tbl_size,GFP_KERNEL );if (unlikely (!rss->host_rss_ind_tbl)) goto mem_err2;
@@ -1197,8 +1161,7 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev, tbl_size = (1ULL << log_size) *sizeof (struct ena_admin_rss_ind_table_entry ); -dma_free_coherent (ena_dev->dmadev, tbl_size, rss->rss_ind_tbl, - rss->rss_ind_tbl_dma_addr); +dma_free_coherent (ena_dev->dmadev, tbl_size, rss->rss_ind_tbl, rss->rss_ind_tbl_dma_addr); rss->rss_ind_tbl =NULL ; mem_err1: rss->tbl_log_size =0 ;
@@ -1261,8 +1224,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev, &create_cmd.sq_ba, io_sq->desc_addr.phys_addr);if (unlikely (ret)) { -netdev_err (ena_dev->net_device, -"Memory address set failed\n" ); +netdev_err (ena_dev->net_device,"Memory address set failed\n" );return ret; } }
@@ -1273,8 +1235,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev, (struct ena_admin_acq_entry *)&cmd_completion, sizeof(cmd_completion));if (unlikely (ret)) { -netdev_err (ena_dev->net_device, -"Failed to create IO SQ. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to create IO SQ. error: %d\n" , ret);return ret; }
@@ -1292,8 +1253,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev, cmd_completion.llq_descriptors_offset); } -netdev_dbg (ena_dev->net_device,"Created sq[%u], depth[%u]\n" , - io_sq->idx, io_sq->q_depth); +netdev_dbg (ena_dev->net_device,"Created sq[%u], depth[%u]\n" , io_sq->idx, io_sq->q_depth);return ret; }
@@ -1420,8 +1380,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev, (struct ena_admin_acq_entry *)&cmd_completion, sizeof(cmd_completion));if (unlikely (ret)) { -netdev_err (ena_dev->net_device, -"Failed to create IO CQ. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to create IO CQ. error: %d\n" , ret);return ret; }
@@ -1440,8 +1399,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev, (u32 __iomem *)((uintptr_t )ena_dev->reg_bar + cmd_completion.numa_node_register_offset); -netdev_dbg (ena_dev->net_device,"Created cq[%u], depth[%u]\n" , - io_cq->idx, io_cq->q_depth); +netdev_dbg (ena_dev->net_device,"Created cq[%u], depth[%u]\n" , io_cq->idx, io_cq->q_depth);return ret; }
@@ -1451,8 +1409,7 @@ int ena_com_get_io_handlers(struct ena_com_dev *ena_dev, u16 qid, struct ena_com_io_cq **io_cq) {if (qid >=ENA_TOTAL_NUM_QUEUES ) { -netdev_err (ena_dev->net_device, -"Invalid queue number %d but the max is %d\n" , qid, +netdev_err (ena_dev->net_device,"Invalid queue number %d but the max is %d\n" , qid,ENA_TOTAL_NUM_QUEUES );return -EINVAL ; }
@@ -1492,8 +1449,7 @@ void ena_com_wait_for_abort_completion(struct ena_com_dev *ena_dev)spin_lock_irqsave (&admin_queue->q_lock, flags);while (atomic_read (&admin_queue->outstanding_cmds) !=0 ) {spin_unlock_irqrestore (&admin_queue->q_lock, flags); -ena_delay_exponential_backoff_us (exp++, - ena_dev->ena_min_poll_delay_us); +ena_delay_exponential_backoff_us (exp++, ena_dev->ena_min_poll_delay_us);spin_lock_irqsave (&admin_queue->q_lock, flags); }spin_unlock_irqrestore (&admin_queue->q_lock, flags);
@@ -1519,8 +1475,7 @@ int ena_com_destroy_io_cq(struct ena_com_dev *ena_dev, sizeof(destroy_resp));if (unlikely (ret && (ret != -ENODEV ))) -netdev_err (ena_dev->net_device, -"Failed to destroy IO CQ. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to destroy IO CQ. error: %d\n" , ret);return ret; }
@@ -1588,8 +1543,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag) sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to config AENQ ret: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to config AENQ ret: %d\n" , ret);return ret; }
@@ -1610,8 +1564,7 @@ int ena_com_get_dma_width(struct ena_com_dev *ena_dev)netdev_dbg (ena_dev->net_device,"ENA dma width: %d\n" , width);if ((width <32 ) || width >ENA_MAX_PHYS_ADDR_SIZE_BITS ) { -netdev_err (ena_dev->net_device,"DMA width illegal value: %d\n" , - width); +netdev_err (ena_dev->net_device,"DMA width illegal value: %d\n" , width);return -EINVAL ; }
@@ -1633,19 +1586,16 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev) ctrl_ver =ena_com_reg_bar_read32 (ena_dev,ENA_REGS_CONTROLLER_VERSION_OFF ); -if (unlikely ((ver ==ENA_MMIO_READ_TIMEOUT ) || - (ctrl_ver ==ENA_MMIO_READ_TIMEOUT ))) { +if (unlikely ((ver ==ENA_MMIO_READ_TIMEOUT ) || (ctrl_ver ==ENA_MMIO_READ_TIMEOUT ))) {netdev_err (ena_dev->net_device,"Reg read timeout occurred\n" );return -ETIME ; }dev_info (ena_dev->dmadev,"ENA device version: %d.%d\n" , - (ver &ENA_REGS_VERSION_MAJOR_VERSION_MASK ) >> -ENA_REGS_VERSION_MAJOR_VERSION_SHIFT , + (ver &ENA_REGS_VERSION_MAJOR_VERSION_MASK ) >>ENA_REGS_VERSION_MAJOR_VERSION_SHIFT , ver &ENA_REGS_VERSION_MINOR_VERSION_MASK ); - dev_info(ena_dev->dmadev, - "ENA controller version: %d.%d.%d implementation version %d\n", + dev_info(ena_dev->dmadev, "ENA controller version: %d.%d.%d implementation version %d\n", (ctrl_ver & ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_MASK) >> ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_SHIFT, (ctrl_ver & ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_MASK) >>
@@ -1694,20 +1644,17 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev) size =ADMIN_SQ_SIZE (admin_queue->q_depth);if (sq->entries) -dma_free_coherent (ena_dev->dmadev, size, sq->entries, - sq->dma_addr); +dma_free_coherent (ena_dev->dmadev, size, sq->entries, sq->dma_addr); sq->entries =NULL ; size =ADMIN_CQ_SIZE (admin_queue->q_depth);if (cq->entries) -dma_free_coherent (ena_dev->dmadev, size, cq->entries, - cq->dma_addr); +dma_free_coherent (ena_dev->dmadev, size, cq->entries, cq->dma_addr); cq->entries =NULL ; size =ADMIN_AENQ_SIZE (aenq->q_depth);if (ena_dev->aenq.entries) -dma_free_coherent (ena_dev->dmadev, size, aenq->entries, - aenq->dma_addr); +dma_free_coherent (ena_dev->dmadev, size, aenq->entries, aenq->dma_addr); aenq->entries =NULL ; }
@@ -1733,10 +1680,8 @@ int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read;spin_lock_init (&mmio_read->lock); - mmio_read->read_resp = -dma_alloc_coherent (ena_dev->dmadev, -sizeof (*mmio_read->read_resp), - &mmio_read->read_resp_dma_addr,GFP_KERNEL ); + mmio_read->read_resp =dma_alloc_coherent (ena_dev->dmadev,sizeof (*mmio_read->read_resp), + &mmio_read->read_resp_dma_addr,GFP_KERNEL );if (unlikely (!mmio_read->read_resp)) goto err;
@@ -1767,8 +1712,8 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev)writel (0x0 , ena_dev->reg_bar +ENA_REGS_MMIO_RESP_LO_OFF );writel (0x0 , ena_dev->reg_bar +ENA_REGS_MMIO_RESP_HI_OFF ); -dma_free_coherent (ena_dev->dmadev,sizeof (*mmio_read->read_resp), - mmio_read->read_resp, mmio_read->read_resp_dma_addr); +dma_free_coherent (ena_dev->dmadev,sizeof (*mmio_read->read_resp), mmio_read->read_resp, + mmio_read->read_resp_dma_addr); mmio_read->read_resp =NULL ; }
@@ -1800,8 +1745,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev, }if (!(dev_sts &ENA_REGS_DEV_STS_READY_MASK )) { -netdev_err (ena_dev->net_device, -"Device isn't ready, abort com init\n" ); +netdev_err (ena_dev->net_device,"Device isn't ready, abort com init\n" );return -ENODEV ; }
@@ -1878,8 +1822,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,int ret;if (ctx->qid >=ENA_TOTAL_NUM_QUEUES ) { -netdev_err (ena_dev->net_device, -"Qid (%d) is bigger than max num of queues (%d)\n" , +netdev_err (ena_dev->net_device,"Qid (%d) is bigger than max num of queues (%d)\n" , ctx->qid,ENA_TOTAL_NUM_QUEUES );return -EINVAL ; }
@@ -1905,8 +1848,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,if (ctx->direction ==ENA_COM_IO_QUEUE_DIRECTION_TX )/* header length is limited to 8 bits */ - io_sq->tx_max_header_size = -min_t (u32, ena_dev->tx_max_header_size,SZ_256 ); + io_sq->tx_max_header_size =min_t (u32, ena_dev->tx_max_header_size,SZ_256 ); ret =ena_com_init_io_sq (ena_dev, ctx, io_sq);if (ret)
@@ -1938,8 +1880,7 @@ void ena_com_destroy_io_queue(struct ena_com_dev *ena_dev, u16 qid)struct ena_com_io_cq *io_cq;if (qid >=ENA_TOTAL_NUM_QUEUES ) { -netdev_err (ena_dev->net_device, -"Qid (%d) is bigger than max num of queues (%d)\n" , +netdev_err (ena_dev->net_device,"Qid (%d) is bigger than max num of queues (%d)\n" , qid,ENA_TOTAL_NUM_QUEUES );return ; }
@@ -1983,8 +1924,7 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,if (rc)return rc; -if (get_resp.u.max_queue_ext.version != -ENA_FEATURE_MAX_QUEUE_EXT_VER ) +if (get_resp.u.max_queue_ext.version !=ENA_FEATURE_MAX_QUEUE_EXT_VER )return -EINVAL ; memcpy(&get_feat_ctx->max_queue_ext, &get_resp.u.max_queue_ext,
@@ -2025,18 +1965,15 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev, rc =ena_com_get_feature (ena_dev, &get_resp,ENA_ADMIN_HW_HINTS ,0 );if (!rc) -memcpy (&get_feat_ctx->hw_hints, &get_resp.u.hw_hints, -sizeof (get_resp.u.hw_hints)); +memcpy (&get_feat_ctx->hw_hints, &get_resp.u.hw_hints,sizeof (get_resp.u.hw_hints));else if (rc == -EOPNOTSUPP ) -memset (&get_feat_ctx->hw_hints,0x0 , -sizeof (get_feat_ctx->hw_hints)); +memset (&get_feat_ctx->hw_hints,0x0 ,sizeof (get_feat_ctx->hw_hints));else return rc; rc =ena_com_get_feature (ena_dev, &get_resp,ENA_ADMIN_LLQ ,0 );if (!rc) -memcpy (&get_feat_ctx->llq, &get_resp.u.llq, -sizeof (get_resp.u.llq)); +memcpy (&get_feat_ctx->llq, &get_resp.u.llq,sizeof (get_resp.u.llq));else if (rc == -EOPNOTSUPP )memset (&get_feat_ctx->llq,0x0 ,sizeof (get_feat_ctx->llq));else
@@ -2084,8 +2021,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data) aenq_common = &aenq_e->aenq_common_desc;/* Go over all the events */ -while ((READ_ONCE (aenq_common->flags) & -ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK ) == phase) { +while ((READ_ONCE (aenq_common->flags) &ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK ) == phase) {/* Make sure the phase bit (ownership) is as expected before * reading the rest of the descriptor. */
@@ -2094,8 +2030,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data) timestamp = (u64 )aenq_common->timestamp_low | ((u64 )aenq_common->timestamp_high <<32 ); -netdev_dbg (ena_dev->net_device, -"AENQ! Group[%x] Syndrome[%x] timestamp: [%llus]\n" , +netdev_dbg (ena_dev->net_device,"AENQ! Group[%x] Syndrome[%x] timestamp: [%llus]\n" , aenq_common->group, aenq_common->syndrome, timestamp);/* Handle specific event*/
@@ -2124,8 +2059,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)/* write the aenq doorbell after all AENQ descriptors were read */ mb (); -writel_relaxed ((u32 )aenq->head, - ena_dev->reg_bar +ENA_REGS_AENQ_HEAD_DB_OFF ); +writel_relaxed ((u32 )aenq->head, ena_dev->reg_bar +ENA_REGS_AENQ_HEAD_DB_OFF ); } int ena_com_dev_reset(struct ena_com_dev *ena_dev,
@@ -2137,15 +2071,13 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev, stat =ena_com_reg_bar_read32 (ena_dev,ENA_REGS_DEV_STS_OFF ); cap =ena_com_reg_bar_read32 (ena_dev,ENA_REGS_CAPS_OFF ); -if (unlikely ((stat ==ENA_MMIO_READ_TIMEOUT ) || - (cap ==ENA_MMIO_READ_TIMEOUT ))) { +if (unlikely ((stat ==ENA_MMIO_READ_TIMEOUT ) || (cap ==ENA_MMIO_READ_TIMEOUT ))) {netdev_err (ena_dev->net_device,"Reg read32 timeout occurred\n" );return -ETIME ; }if ((stat &ENA_REGS_DEV_STS_READY_MASK ) ==0 ) { -netdev_err (ena_dev->net_device, -"Device isn't ready, can't reset device\n" ); +netdev_err (ena_dev->net_device,"Device isn't ready, can't reset device\n" );return -EINVAL ; }
@@ -2168,8 +2100,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev, rc =wait_for_reset_state (ena_dev, timeout,ENA_REGS_DEV_STS_RESET_IN_PROGRESS_MASK );if (rc !=0 ) { -netdev_err (ena_dev->net_device, -"Reset indication didn't turn on\n" ); +netdev_err (ena_dev->net_device,"Reset indication didn't turn on\n" );return rc; }
@@ -2177,8 +2108,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,writel (0 , ena_dev->reg_bar +ENA_REGS_DEV_CTL_OFF ); rc =wait_for_reset_state (ena_dev, timeout,0 );if (rc !=0 ) { -netdev_err (ena_dev->net_device, -"Reset indication didn't turn off\n" ); +netdev_err (ena_dev->net_device,"Reset indication didn't turn off\n" );return rc; }
@@ -2215,8 +2145,7 @@ static int ena_get_dev_stats(struct ena_com_dev *ena_dev, sizeof(*get_resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to get stats. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to get stats. error: %d\n" , ret);return ret; }
@@ -2228,8 +2157,7 @@ int ena_com_get_eni_stats(struct ena_com_dev *ena_dev,int ret;if (!ena_com_get_cap (ena_dev,ENA_ADMIN_ENI_STATS )) { -netdev_err (ena_dev->net_device, -"Capability %d isn't supported\n" , +netdev_err (ena_dev->net_device,"Capability %d isn't supported\n" ,ENA_ADMIN_ENI_STATS );return -EOPNOTSUPP ; }
@@ -2266,8 +2194,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)int ret;if (!ena_com_check_supported_feature_id (ena_dev,ENA_ADMIN_MTU )) { -netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" , -ENA_ADMIN_MTU ); +netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" ,ENA_ADMIN_MTU );return -EOPNOTSUPP ; }
@@ -2286,8 +2213,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu) sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to set mtu %d. error: %d\n" , mtu, ret); +netdev_err (ena_dev->net_device,"Failed to set mtu %d. error: %d\n" , mtu, ret);return ret; }
@@ -2301,8 +2227,7 @@ int ena_com_get_offload_settings(struct ena_com_dev *ena_dev, ret =ena_com_get_feature (ena_dev, &resp,ENA_ADMIN_STATELESS_OFFLOAD_CONFIG ,0 );if (unlikely (ret)) { -netdev_err (ena_dev->net_device, -"Failed to get offload capabilities %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to get offload capabilities %d\n" , ret);return ret; }
@@ -2320,8 +2245,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)struct ena_admin_get_feat_resp get_resp;int ret; -if (!ena_com_check_supported_feature_id (ena_dev, -ENA_ADMIN_RSS_HASH_FUNCTION )) { +if (!ena_com_check_supported_feature_id (ena_dev,ENA_ADMIN_RSS_HASH_FUNCTION )) {netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" ,ENA_ADMIN_RSS_HASH_FUNCTION );return -EOPNOTSUPP ;
@@ -2334,8 +2258,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)return ret;if (!(get_resp.u.flow_hash_func.supported_func &BIT (rss->hash_func))) { -netdev_err (ena_dev->net_device, -"Func hash %d isn't supported by device, abort\n" , +netdev_err (ena_dev->net_device,"Func hash %d isn't supported by device, abort\n" , rss->hash_func);return -EOPNOTSUPP ; }
@@ -2365,8 +2288,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev) (struct ena_admin_acq_entry *)&resp, sizeof(resp));if (unlikely (ret)) { -netdev_err (ena_dev->net_device, -"Failed to set hash function %d. error: %d\n" , +netdev_err (ena_dev->net_device,"Failed to set hash function %d. error: %d\n" , rss->hash_func, ret);return -EINVAL ; }
@@ -2398,16 +2320,15 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,return rc;if (!(BIT (func) & get_resp.u.flow_hash_func.supported_func)) { -netdev_err (ena_dev->net_device, -"Flow hash function %d isn't supported\n" , func); +netdev_err (ena_dev->net_device,"Flow hash function %d isn't supported\n" , func);return -EOPNOTSUPP ; }if ((func ==ENA_ADMIN_TOEPLITZ ) && key) {if (key_len !=sizeof (hash_key->key)) {netdev_err (ena_dev->net_device, -"key len (%u) doesn't equal the supported size (%zu)\n" , - key_len,sizeof (hash_key->key)); +"key len (%u) doesn't equal the supported size (%zu)\n" , key_len, +sizeof (hash_key->key));return -EINVAL ; }memcpy (hash_key->key, key, key_len);
@@ -2495,8 +2416,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)struct ena_admin_set_feat_resp resp;int ret; -if (!ena_com_check_supported_feature_id (ena_dev, -ENA_ADMIN_RSS_HASH_INPUT )) { +if (!ena_com_check_supported_feature_id (ena_dev,ENA_ADMIN_RSS_HASH_INPUT )) {netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" ,ENA_ADMIN_RSS_HASH_INPUT );return -EOPNOTSUPP ;
@@ -2527,8 +2447,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev) (struct ena_admin_acq_entry *)&resp, sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to set hash input. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to set hash input. error: %d\n" , ret);return ret; }
@@ -2605,8 +2524,7 @@ int ena_com_fill_hash_ctrl(struct ena_com_dev *ena_dev,int rc;if (proto >=ENA_ADMIN_RSS_PROTO_NUM ) { -netdev_err (ena_dev->net_device,"Invalid proto num (%u)\n" , - proto); +netdev_err (ena_dev->net_device,"Invalid proto num (%u)\n" , proto);return -EINVAL ; }
@@ -2658,8 +2576,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)struct ena_admin_set_feat_resp resp;int ret; -if (!ena_com_check_supported_feature_id ( - ena_dev,ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG )) { +if (!ena_com_check_supported_feature_id (ena_dev,ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG )) {netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" ,ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG );return -EOPNOTSUPP ;
@@ -2699,8 +2616,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev) sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to set indirect table. error: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to set indirect table. error: %d\n" , ret);return ret; }
@@ -2779,9 +2695,8 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev) {struct ena_host_attribute *host_attr = &ena_dev->host_attr; - host_attr->host_info = -dma_alloc_coherent (ena_dev->dmadev,SZ_4K , - &host_attr->host_info_dma_addr,GFP_KERNEL ); + host_attr->host_info =dma_alloc_coherent (ena_dev->dmadev,SZ_4K , + &host_attr->host_info_dma_addr,GFP_KERNEL );if (unlikely (!host_attr->host_info))return -ENOMEM ;
@@ -2827,8 +2742,7 @@ void ena_com_delete_debug_area(struct ena_com_dev *ena_dev)if (host_attr->debug_area_virt_addr) {dma_free_coherent (ena_dev->dmadev, host_attr->debug_area_size, - host_attr->debug_area_virt_addr, - host_attr->debug_area_dma_addr); + host_attr->debug_area_virt_addr, host_attr->debug_area_dma_addr); host_attr->debug_area_virt_addr =NULL ; } }
@@ -2877,8 +2791,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev) sizeof(resp));if (unlikely (ret)) -netdev_err (ena_dev->net_device, -"Failed to set host attributes: %d\n" , ret); +netdev_err (ena_dev->net_device,"Failed to set host attributes: %d\n" , ret);return ret; }
@@ -2896,8 +2809,7 @@ static int ena_com_update_nonadaptive_moderation_interval(struct ena_com_dev *en u32 *intr_moder_interval) {if (!intr_delay_resolution) { -netdev_err (ena_dev->net_device, -"Illegal interrupt delay granularity value\n" ); +netdev_err (ena_dev->net_device,"Illegal interrupt delay granularity value\n" );return -EFAULT ; }
@@ -2935,14 +2847,12 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)if (rc) {if (rc == -EOPNOTSUPP ) { -netdev_dbg (ena_dev->net_device, -"Feature %d isn't supported\n" , +netdev_dbg (ena_dev->net_device,"Feature %d isn't supported\n" ,ENA_ADMIN_INTERRUPT_MODERATION ); rc =0 ; }else {netdev_err (ena_dev->net_device, -"Failed to get interrupt moderation admin cmd. rc: %d\n" , - rc); +"Failed to get interrupt moderation admin cmd. rc: %d\n" , rc); }/* no moderation supported, disable adaptive support */
@@ -2990,8 +2900,7 @@ int ena_com_config_dev_mode(struct ena_com_dev *ena_dev, (llq_info->descs_num_before_header *sizeof (struct ena_eth_io_tx_desc ));if (unlikely (ena_dev->tx_max_header_size ==0 )) { -netdev_err (ena_dev->net_device, -"The size of the LLQ entry is smaller than needed\n" ); +netdev_err (ena_dev->net_device,"The size of the LLQ entry is smaller than needed\n" );return -EINVAL ; }
drivers/net/ethernet/amazon/ena/ena_eth_com.c +20 -29
127 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_eth_com.h +7 -8
@@ -145,8 +145,8 @@ static inline bool ena_com_is_doorbell_needed(struct ena_com_io_sq *io_sq, }netdev_dbg (ena_com_io_sq_to_ena_dev (io_sq)->net_device, -"Queue: %d num_descs: %d num_entries_needed: %d\n" , - io_sq->qid, num_descs, num_entries_needed); +"Queue: %d num_descs: %d num_entries_needed: %d\n" , io_sq->qid, num_descs, + num_entries_needed);return num_entries_needed > io_sq->entries_in_tx_burst_left; }
@@ -157,15 +157,14 @@ static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq)u16 tail = io_sq->tail;netdev_dbg (ena_com_io_sq_to_ena_dev (io_sq)->net_device, -"Write submission queue doorbell for queue: %d tail: %d\n" , - io_sq->qid, tail); +"Write submission queue doorbell for queue: %d tail: %d\n" , io_sq->qid, tail);writel (tail, io_sq->db_addr);if (is_llq_max_tx_burst_exists (io_sq)) {netdev_dbg (ena_com_io_sq_to_ena_dev (io_sq)->net_device, -"Reset available entries in tx burst for queue %d to %d\n" , - io_sq->qid, max_entries_in_tx_burst); +"Reset available entries in tx burst for queue %d to %d\n" , io_sq->qid, + max_entries_in_tx_burst); io_sq->entries_in_tx_burst_left = max_entries_in_tx_burst; }
@@ -248,8 +247,8 @@ static inline int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq, *req_id =READ_ONCE (cdesc->req_id);if (unlikely (*req_id >= io_cq->q_depth)) { -netdev_err (ena_com_io_cq_to_ena_dev (io_cq)->net_device, -"Invalid req id %d\n" , cdesc->req_id); +netdev_err (ena_com_io_cq_to_ena_dev (io_cq)->net_device,"Invalid req id %d\n" , + cdesc->req_id);return -EINVAL ; }
drivers/net/ethernet/amazon/ena/ena_netdev.c +12 -20
@@ -116,11 +116,9 @@ int ena_xmit_common(struct ena_adapter *adapter,if (unlikely (rc)) {netif_err (adapter, tx_queued, adapter->netdev,"Failed to prepare tx bufs\n" ); -ena_increase_stat (&ring->tx_stats.prepare_ctx_err,1 , - &ring->syncp); +ena_increase_stat (&ring->tx_stats.prepare_ctx_err,1 , &ring->syncp);if (rc != -ENOMEM ) -ena_reset_device (adapter, -ENA_REGS_RESET_DRIVER_INVALID_STATE ); +ena_reset_device (adapter,ENA_REGS_RESET_DRIVER_INVALID_STATE );return rc; }
@@ -484,8 +482,7 @@ static struct page *ena_alloc_map_page(struct ena_ring *rx_ring,*/ page =dev_alloc_page ();if (!page) { -ena_increase_stat (&rx_ring->rx_stats.page_alloc_fail,1 , - &rx_ring->syncp); +ena_increase_stat (&rx_ring->rx_stats.page_alloc_fail,1 , &rx_ring->syncp);return ERR_PTR (-ENOSPC ); }
@@ -544,8 +541,8 @@ static void ena_unmap_rx_buff_attrs(struct ena_ring *rx_ring,struct ena_rx_buffer *rx_info, unsigned long attrs) { - dma_unmap_page_attrs(rx_ring->dev, rx_info->dma_addr, ENA_PAGE_SIZE, -DMA_BIDIRECTIONAL ,attrs ); + dma_unmap_page_attrs(rx_ring->dev, rx_info->dma_addr, ENA_PAGE_SIZE, DMA_BIDIRECTIONAL, +attrs ); } static void ena_free_rx_page(struct ena_ring *rx_ring,
@@ -825,8 +822,7 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget) &req_id);if (rc) {if (unlikely (rc == -EINVAL )) -handle_invalid_req_id (tx_ring, req_id,NULL , - false); +handle_invalid_req_id (tx_ring, req_id,NULL , false);break ; }
@@ -1052,8 +1048,7 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring, DMA_FROM_DEVICE);if (!reuse_rx_buf_page) -ena_unmap_rx_buff_attrs (rx_ring, rx_info, -DMA_ATTR_SKIP_CPU_SYNC ); +ena_unmap_rx_buff_attrs (rx_ring, rx_info,DMA_ATTR_SKIP_CPU_SYNC );skb_add_rx_frag (skb,skb_shinfo (skb)->nr_frags, rx_info->page, page_offset + buf_offset, len, buf_len);
@@ -1326,8 +1321,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, adapter =netdev_priv (rx_ring->netdev);if (rc == -ENOSPC ) { -ena_increase_stat (&rx_ring->rx_stats.bad_desc_num,1 , - &rx_ring->syncp); +ena_increase_stat (&rx_ring->rx_stats.bad_desc_num,1 , &rx_ring->syncp);ena_reset_device (adapter,ENA_REGS_RESET_TOO_MANY_RX_DESCS ); }else { ena_increase_stat(&rx_ring->rx_stats.bad_req_id, 1,
@@ -1807,8 +1801,7 @@ static int ena_rss_configure(struct ena_adapter *adapter)if (!ena_dev->rss.tbl_log_size) { rc =ena_rss_init_default (adapter);if (rc && (rc != -EOPNOTSUPP )) { -netif_err (adapter, ifup, adapter->netdev, -"Failed to init RSS rc: %d\n" , rc); +netif_err (adapter, ifup, adapter->netdev,"Failed to init RSS rc: %d\n" , rc);return rc; } }
@@ -2741,8 +2734,7 @@ static void ena_config_debug_area(struct ena_adapter *adapter) rc =ena_com_set_host_attributes (adapter->ena_dev);if (rc) {if (rc == -EOPNOTSUPP ) -netif_warn (adapter, drv, adapter->netdev, -"Cannot set host attributes\n" ); +netif_warn (adapter, drv, adapter->netdev,"Cannot set host attributes\n" );else netif_err (adapter, drv, adapter->netdev,"Cannot set host attributes\n" );
@@ -3734,8 +3726,8 @@ static int ena_rss_init_default(struct ena_adapter *adapter) } } - rc =ena_com_fill_hash_function (ena_dev,ENA_ADMIN_TOEPLITZ ,NULL , -ENA_HASH_KEY_SIZE ,0xFFFFFFFF ); + rc =ena_com_fill_hash_function (ena_dev,ENA_ADMIN_TOEPLITZ ,NULL ,ENA_HASH_KEY_SIZE , +0xFFFFFFFF );if (unlikely (rc && (rc != -EOPNOTSUPP ))) {dev_err (dev,"Cannot fill hash function\n" ); goto err_fill_indir;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 725/744 net: ena: Fix redundant device NUMA node override
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Agroskin <[email protected]>
[ Upstream commit 2dc8b1e7177d4f49f492ce648440caf2de0c3616 ]
The driver overrides the NUMA node id of the device regardless of whether it knows its correct value (often setting it to -1 even though the node id is advertised in 'struct device'). This can lead to suboptimal configurations.
This patch fixes this behavior and makes the shared memory allocation functions use the NUMA node id advertised by the underlying device.
--- drivers/net/ethernet/amazon/ena/ena_com.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/net/ethernet/amazon/ena/ena_com.c +0 -11
@@ -312,7 +312,6 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev, struct ena_com_io_sq *io_sq) {size_t size; -int dev_node =0 ;memset (&io_sq->desc_addr,0x0 ,sizeof (io_sq->desc_addr));
@@ -325,12 +324,9 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev, size = io_sq->desc_entry_size * io_sq->q_depth;if (io_sq->mem_queue_type ==ENA_ADMIN_PLACEMENT_POLICY_HOST ) { - dev_node =dev_to_node (ena_dev->dmadev); -set_dev_node (ena_dev->dmadev, ctx->numa_node); io_sq->desc_addr.virt_addr =dma_alloc_coherent (ena_dev->dmadev, size, &io_sq->desc_addr.phys_addr,GFP_KERNEL ); -set_dev_node (ena_dev->dmadev, dev_node);if (!io_sq->desc_addr.virt_addr) { io_sq->desc_addr.virt_addr = dma_alloc_coherent(ena_dev->dmadev, size,
@@ -354,10 +350,7 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev, size = (size_t )io_sq->bounce_buf_ctrl.buffer_size * io_sq->bounce_buf_ctrl.buffers_num; - dev_node =dev_to_node (ena_dev->dmadev); -set_dev_node (ena_dev->dmadev, ctx->numa_node); io_sq->bounce_buf_ctrl.base_buffer =devm_kzalloc (ena_dev->dmadev, size,GFP_KERNEL ); -set_dev_node (ena_dev->dmadev, dev_node);if (!io_sq->bounce_buf_ctrl.base_buffer) io_sq->bounce_buf_ctrl.base_buffer =devm_kzalloc (ena_dev->dmadev, size,GFP_KERNEL );
@@ -397,7 +390,6 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev, struct ena_com_io_cq *io_cq) {size_t size; -int prev_node =0 ;memset (&io_cq->cdesc_addr,0x0 ,sizeof (io_cq->cdesc_addr));
@@ -409,11 +401,8 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev, size = io_cq->cdesc_entry_size_in_bytes * io_cq->q_depth; - prev_node =dev_to_node (ena_dev->dmadev); -set_dev_node (ena_dev->dmadev, ctx->numa_node); io_cq->cdesc_addr.virt_addr =dma_alloc_coherent (ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr,GFP_KERNEL ); -set_dev_node (ena_dev->dmadev, prev_node);if (!io_cq->cdesc_addr.virt_addr) { io_cq->cdesc_addr.virt_addr = dma_alloc_coherent(ena_dev->dmadev, size, &io_cq->cdesc_addr.phys_addr,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 726/744 ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outbound
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yue Haibing <[email protected]>
[ Upstream commit b3dc6e8003b500861fa307e9a3400c52e78e4d3a ]
Raw packet from PF_PACKET socket ontop of an IPv6-backed ipvlan device will hit WARN_ON_ONCE() in sk_mc_loop() through sch_direct_xmit() path.
WARNING: CPU: 2 PID: 0 at net/core/sock.c:775 sk_mc_loop+0x2d/0x70 Modules linked in: sch_netem ipvlan rfkill cirrus drm_shmem_helper sg drm_kms_helper CPU: 2 PID: 0 Comm: swapper/2 Kdump: loaded Not tainted 6.9.0+ #279 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 RIP: 0010:sk_mc_loop+0x2d/0x70 Code: fa 0f 1f 44 00 00 65 0f b7 15 f7 96 a3 4f 31 c0 66 85 d2 75 26 48 85 ff 74 1c RSP: 0018:ffffa9584015cd78 EFLAGS: 00010212 RAX: 0000000000000011 RBX: ffff91e585793e00 RCX: 0000000002c6a001 RDX: 0000000000000000 RSI: 0000000000000040 RDI: ffff91e589c0f000 RBP: ffff91e5855bd100 R08: 0000000000000000 R09: 3d00545216f43d00 R10: ffff91e584fdcc50 R11: 00000060dd8616f4 R12: ffff91e58132d000 R13: ffff91e584fdcc68 R14: ffff91e5869ce800 R15: ffff91e589c0f000 FS: 0000000000000000(0000) GS:ffff91e898100000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f788f7c44c0 CR3: 0000000008e1a000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> ? __warn (kernel/panic.c:693) ? sk_mc_loop (net/core/sock.c:760) ? report_bug (lib/bug.c:201 lib/bug.c:219) ? handle_bug (arch/x86/kernel/traps.c:239) ? exc_invalid_op (arch/x86/kernel/traps.c:260 (discriminator 1)) ? asm_exc_invalid_op (./arch/x86/include/asm/idtentry.h:621) ? sk_mc_loop (net/core/sock.c:760) ip6_finish_output2 (net/ipv6/ip6_output.c:83 (discriminator 1)) ? nf_hook_slow (net/netfilter/core.c:626) ip6_finish_output (net/ipv6/ip6_output.c:222) ? __pfx_ip6_finish_output (net/ipv6/ip6_output.c:215) ipvlan_xmit_mode_l3 (drivers/net/ipvlan/ipvlan_core.c:602) ipvlan ipvlan_start_xmit (drivers/net/ipvlan/ipvlan_main.c:226) ipvlan dev_hard_start_xmit (net/core/dev.c:3594) sch_direct_xmit (net/sched/sch_generic.c:343) __qdisc_run (net/sched/sch_generic.c:416) net_tx_action (net/core/dev.c:5286) handle_softirqs (kernel/softirq.c:555) __irq_exit_rcu (kernel/softirq.c:589) sysvec_apic_timer_interrupt (arch/x86/kernel/apic/apic.c:1043)
The warning triggers as this:packet_sendmsg
packet_snd //skb->sk is packet sk
__dev_queue_xmit
__dev_xmit_skb //q->enqueue is not NULL
__qdisc_run
sch_direct_xmit
dev_hard_start_xmit
ipvlan_start_xmit
ipvlan_xmit_mode_l3 //l3 mode
ipvlan_process_outbound //vepa flag
ipvlan_process_v6_outbound
ip6_local_out
__ip6_finish_output
ip6_finish_output2 //multicast packet
sk_mc_loop //sk->sk_family is AF_PACKETCall ip{6}_local_out() with NULL sk in ipvlan as other tunnels to fix this.
--- drivers/net/ipvlan/ipvlan_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +2 -2
@@ -439,7 +439,7 @@ static noinline_for_stack int ipvlan_process_v4_outbound(struct sk_buff *skb)memset (IPCB (skb),0 ,sizeof (*IPCB (skb))); - err =ip_local_out (net, skb->sk, skb); + err =ip_local_out (net,NULL , skb);if (unlikely (net_xmit_eval (err)))DEV_STATS_INC (dev, tx_errors);else
@@ -494,7 +494,7 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)memset (IP6CB (skb),0 ,sizeof (*IP6CB (skb))); - err =ip6_local_out (dev_net (dev), skb->sk, skb); + err =ip6_local_out (dev_net (dev),NULL , skb);if (unlikely (net_xmit_eval (err)))DEV_STATS_INC (dev, tx_errors);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 727/744 ALSA: seq: Fix yet another spot for system message conversion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 700fe6fd093d08c6da2bda8efe00479b0e617327 ]
We fixed the incorrect UMP type for system messages in the recent commit, but it missed one place in system_ev_to_ump_midi1(). Fix it now.
--- sound/core/seq/seq_ump_convert.c | 1 + 1 file changed, 1 insertion(+)
sound/core/seq/seq_ump_convert.c +1 -0
@@ -729,6 +729,7 @@ static int system_ev_to_ump_midi1(const struct snd_seq_event *event, union snd_ump_midi1_msg *data, unsigned char status) { + data->system.type =UMP_MSG_TYPE_SYSTEM ;// override data->system.status = status;return 1 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 728/744 powerpc/pseries/lparcfg: drop error message from guest name lookup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Lynch <[email protected]>
[ Upstream commit 12870ae3818e39ea65bf710f645972277b634f72 ]
It's not an error or exceptional situation when the hosting environment does not expose a name for the LP/guest via RTAS or the device tree. This happens with qemu when run without the '-name' option. The message also lacks a newline. Remove it.
--- arch/powerpc/platforms/pseries/lparcfg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/lparcfg.c +2 -2
@@ -357,8 +357,8 @@ static int read_dt_lpar_name(struct seq_file *m)static void read_lpar_name (struct seq_file *m) { -if (read_rtas_lpar_name (m) &&read_dt_lpar_name (m)) -pr_err_once ("Error can't get the LPAR name" ); +if (read_rtas_lpar_name (m)) +read_dt_lpar_name (m); }#define SPLPAR_MAXLENGTH 1026*(sizeof(char))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 729/744 powerpc/uaccess: Use YZ asm constraint for ld
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 50934945d54238d2d6d8db4b7c1d4c90d2696c57 ]
The 'ld' instruction requires a 4-byte aligned displacement because it is a DS-form instruction. But the "m" asm constraint doesn't enforce that.
Add a special case of __get_user_asm2_goto() so that the "YZ" constraint can be used for "ld".
The "Z" constraint is documented in the GCC manual PowerPC machine constraints, and specifies a "memory operand accessed with indexed or indirect addressing". "Y" is not documented in the manual but specifies a "memory operand for a DS-form instruction". Using both allows the compiler to generate a DS-form "ld" or X-form "ldx" as appropriate.
The change has to be conditional on CONFIG_PPC_KERNEL_PREFIXED because the "Y" constraint does not guarantee 4-byte alignment when prefixed instructions are enabled.
No build errors have been reported due to this, but the possibility is there depending on compiler code generation decisions.
--- arch/powerpc/include/asm/uaccess.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/powerpc/include/asm/uaccess.h +11 -0
@@ -165,8 +165,19 @@ do { \#endif #ifdef __powerpc64__ +#ifdef CONFIG_PPC_KERNEL_PREFIXED #define __get_user_asm2_goto (x, addr, label) \ __get_user_asm_goto(x, addr, label, "ld") +#else +#define __get_user_asm2_goto (x, addr, label) \ + asm_goto_output( \ + "1: ld%U1%X1 %0, %1 # get_user\n" \ + EX_TABLE(1b, %l2) \ + : "=r" (x) \ + : DS_FORM_CONSTRAINT (*addr) \ + : \ + : label) +#endif // CONFIG_PPC_KERNEL_PREFIXED #else /* __powerpc64__ */ #define __get_user_asm2_goto (x, addr, label) \ asm_goto_output( \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 730/744 drm/panel: sitronix-st7789v: fix timing for jt240mhqs_hwt_ek_e3 panel
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerald Loacker <[email protected]>
[ Upstream commit 0e5895ff7fab0fc05ec17daf9a568368828fa6ea ]
Flickering was observed when using partial mode. Moving the vsync to the same position as used by the default sitronix-st7789v timing resolves this issue.
--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +3 -3
@@ -286,9 +286,9 @@ static const struct drm_display_mode jt240mhqs_hwt_ek_e3_mode = { .hsync_end = 240 + 28 + 10, .htotal = 240 + 28 + 10 + 10, .vdisplay = 280, - .vsync_start = 280 + 8, - .vsync_end = 280 + 8 + 4, - .vtotal = 280 + 8 + 4 + 4, + .vsync_start = 280 + 48, + .vsync_end = 280 + 48 + 4, + .vtotal = 280 + 48 + 4 + 4, .width_mm = 43, .height_mm = 37, .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 731/744 drm/panel: sitronix-st7789v: tweak timing for jt240mhqs_hwt_ek_e3 panel
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerald Loacker <[email protected]>
[ Upstream commit 2ba50582634d0bfe3a333ab7575a7f0122a7cde8 ]
Use the default timing parameters to get a refresh rate of about 60 Hz for a clock of 6 MHz.
--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +3 -3
@@ -282,9 +282,9 @@ static const struct drm_display_mode et028013dma_mode = {static const struct drm_display_mode jt240mhqs_hwt_ek_e3_mode = { .clock =6000 , .hdisplay =240 , - .hsync_start =240 +28 , - .hsync_end =240 +28 +10 , - .htotal =240 +28 +10 +10 , + .hsync_start =240 +38 , + .hsync_end =240 +38 +10 , + .htotal =240 +38 +10 +10 , .vdisplay =280 , .vsync_start =280 +48 , .vsync_end =280 +48 +4 ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 732/744 drm/panel: sitronix-st7789v: fix display size for jt240mhqs_hwt_ek_e3 panel
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerald Loacker <[email protected]>
[ Upstream commit b62c150c3bae72ac1910dcc588f360159eb0744a ]
This is a portrait mode display. Change the dimensions accordingly.
--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +2 -2
@@ -289,8 +289,8 @@ static const struct drm_display_mode jt240mhqs_hwt_ek_e3_mode = { .vsync_start = 280 + 48, .vsync_end = 280 + 48 + 4, .vtotal = 280 + 48 + 4 + 4, - .width_mm = 43, - .height_mm = 37, + .width_mm = 37, + .height_mm = 43, .flags = DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 733/744 hwmon: (intel-m10-bmc-hwmon) Fix multiplier for N6000 board power sensor
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Colberg <[email protected]>
[ Upstream commit 027a44fedd55fbdf1d45603894634acd960ad04b ]
The Intel N6000 BMC outputs the board power value in milliwatt, whereas the hwmon sysfs interface must provide power values in microwatt.
--- drivers/hwmon/intel-m10-bmc-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/intel-m10-bmc-hwmon.c +1 -1
@@ -429,7 +429,7 @@ static const struct m10bmc_sdata n6000bmc_curr_tbl[] = { };static const struct m10bmc_sdata n6000bmc_power_tbl[] = { - {0x724 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,"Board Power" }, + {0x724 ,0x0 ,0x0 ,0x0 ,0x0 ,1000 ,"Board Power" }, };static const struct hwmon_channel_info *const n6000bmc_hinfo[] = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 734/744 hwmon: (shtc1) Fix property misspelling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 52a2c70c3ec555e670a34dd1ab958986451d2dd2 ]
The property name is "sensirion,low-precision", not "sensicon,low-precision".
--- drivers/hwmon/shtc1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/shtc1.c +1 -1
@@ -238,7 +238,7 @@ static int shtc1_probe(struct i2c_client *client)if (np) { data->setup.blocking_io =of_property_read_bool (np,"sensirion,blocking-io" ); - data->setup.high_precision = !of_property_read_bool (np,"sensicon,low-precision" ); + data->setup.high_precision = !of_property_read_bool (np,"sensirion,low-precision" ); }else {if (client->dev.platform_data) data->setup = *(struct shtc1_platform_data *)dev->platform_data;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 735/744 riscv: prevent pt_regs corruption for secondary idle threads
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Matyukevich <[email protected]>
[ Upstream commit a638b0461b58aa3205cd9d5f14d6f703d795b4af ]
Top of the kernel thread stack should be reserved for pt_regs. However this is not the case for the idle threads of the secondary boot harts. Their stacks overlap with their pt_regs, so both may get corrupted.
Similar issue has been fixed for the primary hart, see c7cdd96eca28 ("riscv: prevent stack corruption by reserving task_pt_regs(p) early"). However that fix was not propagated to the secondary harts. The problem has been noticed in some CPU hotplug tests with V enabled. The function smp_callin stored several registers on stack, corrupting top of pt_regs structure including status field. As a result, kernel attempted to save or restore inexistent V context.
--- arch/riscv/kernel/cpu_ops_sbi.c | 2 +- arch/riscv/kernel/cpu_ops_spinwait.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/riscv/kernel/cpu_ops_sbi.c +1 -1
@@ -72,7 +72,7 @@ static int sbi_cpu_start(unsigned int cpuid, struct task_struct *tidle)/* Make sure tidle is updated */ smp_mb (); bdata->task_ptr = tidle; - bdata->stack_ptr =task_stack_page (tidle) +THREAD_SIZE ; + bdata->stack_ptr =task_pt_regs (tidle);/* Make sure boot data is updated */ smp_mb (); hsm_data =__pa (bdata);
arch/riscv/kernel/cpu_ops_spinwait.c +1 -2
@@ -34,8 +34,7 @@ static void cpu_update_secondary_bootdata(unsigned int cpuid,/* Make sure tidle is updated */ smp_mb (); -WRITE_ONCE (__cpu_spinwait_stack_pointer[hartid], -task_stack_page (tidle) +THREAD_SIZE ); +WRITE_ONCE (__cpu_spinwait_stack_pointer[hartid],task_pt_regs (tidle));WRITE_ONCE (__cpu_spinwait_task_pointer[hartid], tidle); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 736/744 ALSA: seq: ump: Fix swapped song position pointer data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 310fa3ec2859f1c094e6e9b5d2e1ca51738c409a ]
At converting between the legacy event and UMP, the parameters for MIDI Song Position Pointer are incorrectly stored. It should have been LSB -> MSB order while it stored in MSB -> LSB order. This patch corrects the ordering.
--- sound/core/seq/seq_ump_convert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/core/seq/seq_ump_convert.c +3 -3
@@ -157,7 +157,7 @@ static void ump_system_to_one_param_ev(const union snd_ump_midi1_msg *val,static void ump_system_to_songpos_ev (const union snd_ump_midi1_msg *val,struct snd_seq_event *ev) { - ev->data.control.value = (val->system.parm1 <<7 ) | val->system.parm2; + ev->data.control.value = (val->system.parm2 <<7 ) | val->system.parm1; }/* Encoders for 0xf0 - 0xff */
@@ -752,8 +752,8 @@ static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event, unsigned char status) { data->system.status = status; - data->system.parm1 = (event->data.control.value >>7 ) &0x7f ; - data->system.parm2 = event->data.control.value &0x7f ; + data->system.parm1 = event->data.control.value &0x7f ; + data->system.parm2 = (event->data.control.value >>7 ) &0x7f ;return 1 ; }
Signature · 1 line
2.43.0