5.10.209-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainerPATCH 157/286 drm/msm/mdp4: flush vblank event on disable
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit c6721b3c6423d8a348ae885a0f4c85e14f9bf85c ]
Flush queued events when disabling the crtc. This avoids timeouts when we come back and wait for dependencies (like the previous frame's flip_done).
Patchwork: https://patchwork.freedesktop.org/patch/569127/
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +9 -0
@@ -268,6 +268,7 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc, {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +unsigned long flags;DBG ("%s" , mdp4_crtc->name);
@@ -280,6 +281,14 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc,mdp_irq_unregister (&mdp4_kms->base, &mdp4_crtc->err);mdp4_disable (mdp4_kms); +if (crtc->state->event && !crtc->state->active) { +WARN_ON (mdp4_crtc->event); +spin_lock_irqsave (&mdp4_kms->dev->event_lock, flags); +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; +spin_unlock_irqrestore (&mdp4_kms->dev->event_lock, flags); + } + mdp4_crtc->enabled = false; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/286 drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 3d07a411b4faaf2b498760ccf12888f8de529de0 ]
This helper has been introduced to avoid programmer errors (missing _put calls leading to dangling refcnt) when using pm_runtime_get, use it.
While at it, start checking the return value.
Patchwork: https://patchwork.freedesktop.org/patch/543350/
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +3 -1
@@ -558,7 +558,9 @@ static int dsi_phy_enable_resource(struct msm_dsi_phy *phy)struct device *dev = &phy->pdev->dev;int ret; -pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev); +if (ret) +return ret; ret =clk_prepare_enable (phy->ahb_clk);if (ret) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 159/286 drm/drv: propagate errors from drm_modeset_register_all()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5f8dec200923a76dc57187965fd59c1136f5d085 ]
In case the drm_modeset_register_all() function fails, its error code will be ignored. Instead make the drm_dev_register() bail out in case of such an error.
--- drivers/gpu/drm/drm_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_drv.c +8 -2
@@ -892,8 +892,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto err_minors; } -if (drm_core_check_feature (dev,DRIVER_MODESET )) -drm_modeset_register_all (dev); +if (drm_core_check_feature (dev,DRIVER_MODESET )) { + ret =drm_modeset_register_all (dev); +if (ret) + goto err_unload; + } ret =0 ;
@@ -905,6 +908,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto out_unlock; +err_unload: +if (dev->driver->unload) + dev->driver->unload (dev); err_minors:remove_compat_control_link (dev);drm_minor_unregister (dev,DRM_MINOR_PRIMARY );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 160/286 drm/radeon: check the alloc_workqueue return value in radeon_crtc_init()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yingliang <[email protected]>
[ Upstream commit 7a2464fac80d42f6f8819fed97a553e9c2f43310 ]
check the alloc_workqueue return value in radeon_crtc_init() to avoid null-ptr-deref.
--- drivers/gpu/drm/radeon/radeon_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_display.c +6 -1
@@ -689,11 +689,16 @@ static void radeon_crtc_init(struct drm_device *dev, int index)if (radeon_crtc ==NULL )return ; + radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); +if (!radeon_crtc->flip_queue) { +kfree (radeon_crtc); +return ; + } +drm_crtc_init (dev, &radeon_crtc->base, &radeon_crtc_funcs);drm_mode_crtc_set_gamma_size (&radeon_crtc->base,256 ); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); rdev->mode_info.crtcs[index] = radeon_crtc;if (rdev->family >=CHIP_BONAIRE ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/286 drm/radeon/dpm: fix a memleak in sumo_parse_power_table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 0737df9ed0997f5b8addd6e2b9699a8c6edba2e4 ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/sumo_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/sumo_dpm.c +3 -1
@@ -1493,8 +1493,10 @@ static int sumo_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/286 drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28c28d7f77c06ac2c0b8f9c82bc04eba22912b3b ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/trinity_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/trinity_dpm.c +3 -1
@@ -1770,8 +1770,10 @@ static int trinity_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/286 drm/bridge: tc358767: Fix return value on error case
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 32bd29b619638256c5b75fb021d6d9f12fc4a984 ]
If the hpd_pin is invalid, the driver returns 'ret'. But 'ret' contains 0, instead of an error value.
Return -EINVAL instead.
--- drivers/gpu/drm/bridge/tc358767.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -1637,7 +1637,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) }else {if (tc->hpd_pin <0 || tc->hpd_pin >1 ) {dev_err (dev,"failed to parse HPD number\n" ); -return ret; +return -EINVAL ; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/286 media: cx231xx: fix a memleak in cx231xx_init_isoc
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 5d3c8990e2bbf929cb211563dadd70708f42e4e6 ]
The dma_q->p_left_data alloced by kzalloc should be freed in all the following error handling paths. However, it hasn't been freed in the allocation error paths of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer.
On the other hand, the dma_q->p_left_data did be freed in the error-handling paths after that of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer, by calling cx231xx_uninit_isoc(dev). So the same free operation should be done in error-handling paths of those two allocation.
--- drivers/media/usb/cx231xx/cx231xx-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/usb/cx231xx/cx231xx-core.c +2 -0
@@ -1024,6 +1024,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,if (!dev->video_mode.isoc_ctl.urb) {dev_err (dev->dev,"cannot alloc memory for usb buffers\n" ); +kfree (dma_q->p_left_data);return -ENOMEM ; }
@@ -1033,6 +1034,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,dev_err (dev->dev,"cannot allocate memory for usbtransfer\n" );kfree (dev->video_mode.isoc_ctl.urb); +kfree (dma_q->p_left_data);return -ENOMEM ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/286 clk: qcom: gpucc-sm8150: Update the gpu_cc_pll1 config
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 6ebd9a4f8b8d2b35cf965a04849c4ba763722f13 ]
Update the test_ctl_hi_val and test_ctl_hi1_val of gpu_cc_pll1 as per latest HW recommendation.
--- drivers/clk/qcom/gpucc-sm8150.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/gpucc-sm8150.c +2 -2
@@ -38,8 +38,8 @@ static struct alpha_pll_config gpu_cc_pll1_config = { .config_ctl_hi_val = 0x00002267, .config_ctl_hi1_val = 0x00000024, .test_ctl_val = 0x00000000, - .test_ctl_hi_val = 0x00000002, - .test_ctl_hi1_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x00000020, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000805, .user_ctl_hi1_val = 0x000000d0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/286 media: rkisp1: Disable runtime PM in probe error path
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit 13c9810281f8b24af9b7712cd84a1fce61843e93 ]
If the v4l2_device_register() call fails, runtime PM is left enabled. Fix it.
Stable-dep-of: 452f604a4683 ("media: rkisp1: Fix media device memory leak")
--- drivers/staging/media/rkisp1/rkisp1-dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/media/rkisp1/rkisp1-dev.c +2 -1
@@ -518,7 +518,7 @@ static int rkisp1_probe(struct platform_device *pdev) ret =v4l2_device_register (rkisp1->dev, &rkisp1->v4l2_dev);if (ret) -return ret; + goto err_pm_runtime_disable; ret =media_device_register (&rkisp1->media_dev);if (ret) {
@@ -538,6 +538,7 @@ static int rkisp1_probe(struct platform_device *pdev)media_device_unregister (&rkisp1->media_dev); err_unreg_v4l2_dev:v4l2_device_unregister (&rkisp1->v4l2_dev); +err_pm_runtime_disable:pm_runtime_disable (&pdev->dev);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/286 f2fs: fix to check compress file in f2fs_move_file_range()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit fb9b65340c818875ea86464faf3c744bdce0055c ]
f2fs_move_file_range() doesn't support migrating compressed cluster data, let's add the missing check condition and return -EOPNOTSUPP for the case until we support it.
--- fs/f2fs/file.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/f2fs/file.c +5 -0
@@ -2816,6 +2816,11 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, goto out; } +if (f2fs_compressed_file (src) ||f2fs_compressed_file (dst)) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } + ret = -EINVAL ;if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/286 f2fs: fix to update iostat correctly in f2fs_filemap_fault()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit bb34cc6ca87ff78f9fb5913d7619dc1389554da6 ]
In f2fs_filemap_fault(), it fixes to update iostat info only if VM_FAULT_LOCKED is tagged in return value of filemap_fault().
--- fs/f2fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/file.c +1 -1
@@ -42,7 +42,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) ret =filemap_fault (vmf);up_read (&F2FS_I (inode)->i_mmap_sem); -if (!ret) +if (ret &VM_FAULT_LOCKED )f2fs_update_iostat (F2FS_I_SB (inode),APP_MAPPED_READ_IO ,F2FS_BLKSIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/286 media: dvbdev: drop refcount on error path in dvb_device_open()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit a2dd235df435a05d389240be748909ada91201d2 ]
If call to file->f_op->open() fails, then call dvb_device_put(dvbdev).
--- drivers/media/dvb-core/dvbdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/dvb-core/dvbdev.c +2 -0
@@ -114,6 +114,8 @@ static int dvb_device_open(struct inode *inode, struct file *file) err = file->f_op->open (inode, file);up_read (&minor_rwsem);mutex_unlock (&dvbdev_mutex); +if (err) +dvb_device_put (dvbdev);return err; } fail:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/286 media: dvb-frontends: m88ds3103: Fix a memory leak in an error handling path of m88ds3103_probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 5b2f885e2f6f482d05c23f04c8240f7b4fc5bdb5 ]
If an error occurs after a successful i2c_mux_add_adapter(), then i2c_mux_del_adapters() should be called to free some resources, as already done in the remove function.
--- drivers/media/dvb-frontends/m88ds3103.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/dvb-frontends/m88ds3103.c +5 -2
@@ -1898,7 +1898,7 @@ static int m88ds3103_probe(struct i2c_client *client,/* get frontend address */ ret =regmap_read (dev->regmap,0x29 , &utmp);if (ret) - goto err_kfree; + goto err_del_adapters; dev->dt_addr = ((utmp &0x80 ) ==0 ) ?0x42 >>1 :0x40 >>1 ;dev_dbg (&client->dev,"dt addr is 0x%02x\n" , dev->dt_addr);
@@ -1906,11 +1906,14 @@ static int m88ds3103_probe(struct i2c_client *client, dev->dt_addr);if (IS_ERR (dev->dt_client)) { ret =PTR_ERR (dev->dt_client); - goto err_kfree; + goto err_del_adapters; } }return 0 ; + +err_del_adapters: +i2c_mux_del_adapters (dev->muxc); err_kfree:kfree (dev); err:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/286 drm/amdgpu/debugfs: fix error code when smc register accessors are NULL
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit afe58346d5d3887b3e49ff623d2f2e471f232a8d ]
Should be -EOPNOTSUPP.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -2
@@ -582,7 +582,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,int r;if (!adev->smc_rreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
@@ -644,7 +644,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *int r;if (!adev->smc_wreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/286 drm/amd/pm: fix a double-free in si_dpm_init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit ac16667237a82e2597e329eb9bc520d1cf9dff30 ]
When the allocation of adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries fails, amdgpu_free_extended_power_table is called to free some fields of adev. However, when the control flow returns to si_dpm_sw_init, it goes to label dpm_failed and calls si_dpm_fini, which calls amdgpu_free_extended_power_table again and free those fields again. Thus a double-free is triggered.
--- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +2 -3
@@ -7349,10 +7349,9 @@ static int si_dpm_init(struct amdgpu_device *adev)kcalloc (4 ,sizeof (struct amdgpu_clock_voltage_dependency_entry ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries)return -ENOMEM ; - } + adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count =4 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].clk =0 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].v =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/286 drivers/amd/pm: fix a use-after-free in kv_parse_power_table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28dd788382c43b330480f57cd34cde0840896743 ]
When ps allocated by kzalloc equals to NULL, kv_parse_power_table frees adev->pm.dpm.ps that allocated before. However, after the control flow goes through the following call chains:
kv_parse_power_table
|-> kv_dpm_init
|-> kv_dpm_sw_init |-> kv_dpm_fini
The adev->pm.dpm.ps is used in the for loop of kv_dpm_fini after its first free in kv_parse_power_table and causes a use-after-free bug.
--- drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c +1 -3
@@ -2733,10 +2733,8 @@ static int kv_parse_power_table(struct amdgpu_device *adev) non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; ps =kzalloc (sizeof (struct kv_ps ),GFP_KERNEL ); -if (ps ==NULL ) { -kfree (adev->pm.dpm.ps); +if (ps ==NULL )return -ENOMEM ; - } adev->pm.dpm.ps[i].ps_priv = ps; k =0 ; idx = (u8 *)&power_state->v2.clockInfoIndex[0 ];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/286 gpu/drm/radeon: fix two memleaks in radeon_vm_init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit c2709b2d6a537ca0fa0f1da36fdaf07e48ef447d ]
When radeon_bo_create and radeon_vm_clear_bo fail, the vm->page_tables allocated before need to be freed. However, neither radeon_vm_init itself nor its caller have done such deallocation.
--- drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_vm.c +6 -2
@@ -1206,13 +1206,17 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) r =radeon_bo_create (rdev, pd_size, align, true,RADEON_GEM_DOMAIN_VRAM ,0 ,NULL ,NULL , &vm->page_directory); -if (r) +if (r) { +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; - + } r =radeon_vm_clear_bo (rdev, vm->page_directory);if (r) {radeon_bo_unref (&vm->page_directory); vm->page_directory =NULL ; +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/286 dt-bindings: clock: Update the videocc resets for sm8150
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 3185f96968eedd117ec72ee7b87ead44b6d1bbbd ]
Add all the available resets for the video clock controller on sm8150.
Stable-dep-of: 1fd9a939db24 ("clk: qcom: videocc-sm8150: Update the videocc resets")
--- include/dt-bindings/clock/qcom,videocc-sm8150.h | 4 ++++ 1 file changed, 4 insertions(+)
include/dt-bindings/clock/qcom,videocc-sm8150.h +4 -0
@@ -16,6 +16,10 @@/* VIDEO_CC Resets */ #define VIDEO_CC_MVSC_CORE_CLK_BCR 0 +#define VIDEO_CC_INTERFACE_BCR 1 +#define VIDEO_CC_MVS0_BCR 2 +#define VIDEO_CC_MVS1_BCR 3 +#define VIDEO_CC_MVSC_BCR 4/* VIDEO_CC GDSCRs */ #define VENUS_GDSC 0
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/286 clk: qcom: videocc-sm8150: Update the videocc resets
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 1fd9a939db24d2f66e48f8bca3e3654add3fa205 ]
Add all the available resets for the video clock controller on sm8150.
--- drivers/clk/qcom/videocc-sm8150.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/qcom/videocc-sm8150.c +4 -0
@@ -218,6 +218,10 @@ static const struct regmap_config video_cc_sm8150_regmap_config = {static const struct qcom_reset_map video_cc_sm8150_resets[] = { [VIDEO_CC_MVSC_CORE_CLK_BCR ] = {0x850 ,2 }, + [VIDEO_CC_INTERFACE_BCR ] = {0x8f0 }, + [VIDEO_CC_MVS0_BCR ] = {0x870 }, + [VIDEO_CC_MVS1_BCR ] = {0x8b0 }, + [VIDEO_CC_MVSC_BCR ] = {0x810 }, };static const struct qcom_cc_desc video_cc_sm8150_desc = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/286 clk: qcom: videocc-sm8150: Add missing PLL config property
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 71f130c9193f613d497f7245365ed05ffdb0a401 ]
When the driver was ported upstream, PLL test_ctl_hi1 register value was omitted. Add it to ensure the PLLs are fully configured.
--- drivers/clk/qcom/videocc-sm8150.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/videocc-sm8150.c +1 -0
@@ -37,6 +37,7 @@ static struct alpha_pll_config video_pll0_config = { .config_ctl_val = 0x20485699, .config_ctl_hi_val = 0x00002267, .config_ctl_hi1_val = 0x00000024, + .test_ctl_hi1_val = 0x00000020, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000805, .user_ctl_hi1_val = 0x000000D0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/286 drivers: clk: zynqmp: calculate closest mux rate
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Buddhabhatti <[email protected]>
[ Upstream commit b782921ddd7f84f524723090377903f399fdbbcb ]
Currently zynqmp clock driver is not calculating closest mux rate and because of that Linux is not setting proper frequency for CPU and not able to set given frequency for dynamic frequency scaling.
E.g., In current logic initial acpu clock parent and frequency as below
apll1 0 0 0 2199999978 0 0 50000 Y
acpu0_mux 0 0 0 2199999978 0 0 50000 Y
acpu0_idiv1 0 0 0 2199999978 0 0 50000 Y
acpu0 0 0 0 2199999978 0 0 50000 YAfter changing acpu frequency to 549999994 Hz using CPU freq scaling its selecting incorrect parent which is not closest frequency.
rpll_to_xpd 0 0 0 1599999984 0 0 50000 Y
acpu0_mux 0 0 0 1599999984 0 0 50000 Y
acpu0_div1 0 0 0 533333328 0 0 50000 Y
acpu0 0 0 0 533333328 0 0 50000 YParent should remain same since 549999994 = 2199999978 / 4.
So use __clk_mux_determine_rate_closest() generic function to calculate closest rate for mux clock. After this change its selecting correct parent and correct clock rate.
apll1 0 0 0 2199999978 0 0 50000 Y
acpu0_mux 0 0 0 2199999978 0 0 50000 Y
acpu0_div1 0 0 0 549999995 0 0 50000 Y
acpu0 0 0 0 549999995 0 0 50000 Y--- drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/zynqmp/clk-mux-zynqmp.c +1 -1
@@ -83,7 +83,7 @@ static int zynqmp_clk_mux_set_parent(struct clk_hw *hw, u8 index)static const struct clk_ops zynqmp_clk_mux_ops = { .get_parent = zynqmp_clk_mux_get_parent, .set_parent = zynqmp_clk_mux_set_parent, - .determine_rate = __clk_mux_determine_rate, + .determine_rate = __clk_mux_determine_rate_closest, };static const struct clk_ops zynqmp_clk_mux_ro_ops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/286 clk: zynqmp: make bestdiv unsigned
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shubhrajyoti Datta <[email protected]>
[ Upstream commit d3954b51b475c4848179cd90b24ac73684cdc76b ]
Divisor is always positive make it u32 *.
Also the arguments passed are currently of u32 pointers.
Stable-dep-of: 1fe15be1fb61 ("drivers: clk: zynqmp: update divider round rate logic")
--- drivers/clk/zynqmp/divider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/zynqmp/divider.c +1 -1
@@ -112,7 +112,7 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw,static void zynqmp_get_divider2_val (struct clk_hw *hw,unsigned long rate,struct zynqmp_clk_divider *divider, -int *bestdiv) +u32 *bestdiv) {int div1;int div2;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/286 clk: zynqmp: Add a check for NULL pointer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shubhrajyoti Datta <[email protected]>
[ Upstream commit 6ab9810cfe6c8f3d8b8750c827d7870abd3751b9 ]
Add a NULL pointer check as clk_hw_get_parent can return NULL.
Stable-dep-of: 1fe15be1fb61 ("drivers: clk: zynqmp: update divider round rate logic")
--- drivers/clk/zynqmp/divider.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/clk/zynqmp/divider.c +5 -2
@@ -119,10 +119,13 @@ static void zynqmp_get_divider2_val(struct clk_hw *hw,long error =LONG_MAX ;unsigned long div1_prate;struct clk_hw *div1_parent_hw; +struct zynqmp_clk_divider *pdivider;struct clk_hw *div2_parent_hw =clk_hw_get_parent (hw); -struct zynqmp_clk_divider *pdivider = -to_zynqmp_clk_divider (div2_parent_hw); +if (!div2_parent_hw) +return ; + + pdivider =to_zynqmp_clk_divider (div2_parent_hw);if (!pdivider)return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/286 drivers: clk: zynqmp: update divider round rate logic
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Buddhabhatti <[email protected]>
[ Upstream commit 1fe15be1fb613534ecbac5f8c3f8744f757d237d ]
Currently zynqmp divider round rate is considering single parent and calculating rate and parent rate accordingly. But if divider clock flag is set to SET_RATE_PARENT then its not trying to traverse through all parent rate and not selecting best parent rate from that. So use common divider_round_rate() which is traversing through all clock parents and its rate and calculating proper parent rate.
--- drivers/clk/zynqmp/divider.c | 66 +++--------------------------------- 1 file changed, 5 insertions(+), 61 deletions(-)
drivers/clk/zynqmp/divider.c +5 -61
@@ -109,52 +109,6 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw,return DIV_ROUND_UP_ULL (parent_rate, value); } -static void zynqmp_get_divider2_val (struct clk_hw *hw, -unsigned long rate, -struct zynqmp_clk_divider *divider, -u32 *bestdiv) -{ -int div1; -int div2; -long error =LONG_MAX ; -unsigned long div1_prate; -struct clk_hw *div1_parent_hw; -struct zynqmp_clk_divider *pdivider; -struct clk_hw *div2_parent_hw =clk_hw_get_parent (hw); - -if (!div2_parent_hw) -return ; - - pdivider =to_zynqmp_clk_divider (div2_parent_hw); -if (!pdivider) -return ; - - div1_parent_hw =clk_hw_get_parent (div2_parent_hw); -if (!div1_parent_hw) -return ; - - div1_prate =clk_hw_get_rate (div1_parent_hw); - *bestdiv =1 ; -for (div1 =1 ; div1 <= pdivider->max_div;) { -for (div2 =1 ; div2 <= divider->max_div;) { -long new_error = ((div1_prate / div1) / div2) - rate; - -if (abs (new_error) <abs (error)) { - *bestdiv = div2; - error = new_error; - } -if (divider->flags &CLK_DIVIDER_POWER_OF_TWO ) - div2 = div2 <<1 ; -else - div2++; - } -if (pdivider->flags &CLK_DIVIDER_POWER_OF_TWO ) - div1 = div1 <<1 ; -else - div1++; - } -} -/** * zynqmp_clk_divider_round_rate() - Round rate of divider clock * @hw: handle between common and hardware-specific interfaces
@@ -173,6 +127,7 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw,u32 div_type = divider->div_type;u32 bestdiv;int ret; +u8 width;/* if read only, just return current value */ if (divider->flags &CLK_DIVIDER_READ_ONLY ) {
@@ -192,23 +147,12 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw,return DIV_ROUND_UP_ULL ((u64)*prate, bestdiv); } - bestdiv =zynqmp_divider_get_val (*prate, rate, divider->flags); - -/* -* In case of two divisors, compute best divider values and return -* divider2 value based on compute value. div1 will be automatically -* set to optimum based on required total divider value. -*/ -if (div_type ==TYPE_DIV2 && - (clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT )) { -zynqmp_get_divider2_val (hw, rate, divider, &bestdiv); - } + width =fls (divider->max_div); -if ((clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT ) && divider->is_frac) - bestdiv = rate % *prate ?1 : bestdiv; + rate =divider_round_rate (hw, rate, prate,NULL , width, divider->flags); - bestdiv =min_t (u32, bestdiv, divider->max_div); - *prate = rate * bestdiv; +if (divider->is_frac && (clk_hw_get_flags (hw) &CLK_SET_RATE_PARENT ) && (rate % *prate)) + *prate = rate;return rate; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/286 watchdog: set cdev owner before adding
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Curtis Klein <[email protected]>
[ Upstream commit 38d75297745f04206db9c29bdd75557f0344c7cc ]
When the new watchdog character device is registered, it becomes available for opening. This creates a race where userspace may open the device before the character device's owner is set. This results in an imbalance in module_get calls as the cdev_get in cdev_open will not increment the reference count on the watchdog driver module.
This causes problems when the watchdog character device is released as the module loader's reference will also be released. This makes it impossible to open the watchdog device later on as it now appears that the module is being unloaded. The open will fail with -ENXIO from chrdev_open.
The legacy watchdog device will fail with -EBUSY from the try_module_get in watchdog_open because it's module owner is the watchdog core module so it can still be opened but it will fail to get a refcount on the underlying watchdog device driver.
--- drivers/watchdog/watchdog_dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/watchdog/watchdog_dev.c +1 -2
@@ -1028,6 +1028,7 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)/* Fill in the data structures */ cdev_init (&wd_data->cdev, &watchdog_fops); + wd_data->cdev.owner = wdd->ops->owner;/* Add the device */ err =cdev_device_add (&wd_data->cdev, &wd_data->dev);
@@ -1042,8 +1043,6 @@ static int watchdog_cdev_register(struct watchdog_device *wdd)return err; } - wd_data->cdev.owner = wdd->ops->owner; -/* Record time of most recent heartbeat as 'just before now'. */ wd_data->last_hw_keepalive =ktime_sub (ktime_get (),1 );watchdog_set_open_deadline (wd_data);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/286 watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerry Hoemann <[email protected]>
[ Upstream commit dced0b3e51dd2af3730efe14dd86b5e3173f0a65 ]
Avoid unnecessary crashes by claiming only NMIs that are due to ERROR signalling or generated by the hpwdt hardware device.
The code does this, but only for iLO5.
The intent was to preserve legacy, Gen9 and earlier, semantics of using hpwdt for error containtment as hardware/firmware would signal fatal IO errors as an NMI with the expectation of hpwdt crashing the system. Howerver, these IO errors should be received by hpwdt as an NMI_IO_CHECK. So the test is overly permissive and should not be limited to only ilo5.
We need to enable this protection for future iLOs not matching the current PCI IDs.
--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/hpwdt.c +1 -1
@@ -174,7 +174,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)"3. OA Forward Progress Log\n" "4. iLO Event Log" ; -if (ilo5 && ulReason ==NMI_UNKNOWN && !mynmi) +if (ulReason ==NMI_UNKNOWN && !mynmi)return NMI_DONE ;if (ilo5 && !pretimeout && !mynmi)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/286 watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wahren <[email protected]>
[ Upstream commit f33f5b1fd1be5f5106d16f831309648cb0f1c31d ]
Users report about the unexpected behavior for setting timeouts above 15 sec on Raspberry Pi. According to watchdog-api.rst the ioctl WDIOC_SETTIMEOUT shouldn't fail because of hardware limitations. But looking at the code shows that max_timeout based on the register value PM_WDOG_TIME_SET, which is the maximum.
Since 664a39236e71 ("watchdog: Introduce hardware maximum heartbeat in watchdog core") the watchdog core is able to handle this problem.
This fix has been tested with watchdog-test from selftests.
--- drivers/watchdog/bcm2835_wdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/watchdog/bcm2835_wdt.c +2 -1
@@ -42,6 +42,7 @@#define SECS_TO_WDOG_TICKS (x) ((x) << 16)#define WDOG_TICKS_TO_SECS (x) ((x) >> 16) +#define WDOG_TICKS_TO_MSECS (x) ((x) * 1000 >> 16)struct bcm2835_wdt {void __iomem *base;
@@ -140,7 +141,7 @@ static struct watchdog_device bcm2835_wdt_wdd = { .info = &bcm2835_wdt_info, .ops = &bcm2835_wdt_ops, .min_timeout = 1, - .max_timeout = WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET), + .max_hw_heartbeat_ms = WDOG_TICKS_TO_MSECS(PM_WDOG_TIME_SET), .timeout = WDOG_TICKS_TO_SECS(PM_WDOG_TIME_SET), };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/286 watchdog: rti_wdt: Drop runtime pm reference count when watchdog is unused
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vignesh Raghavendra <[email protected]>
[ Upstream commit c1a6edf3b541e44e78f10bc6024df779715723f1 ]
Call runtime_pm_put*() if watchdog is not already started during probe and re enable it in watchdog start as required.
On K3 SoCs, watchdogs and their corresponding CPUs are under same power-domain, so if the reference count of unused watchdogs aren't dropped, it will lead to CPU hotplug failures as Device Management firmware won't allow to turn off the power-domain due to dangling reference count.
--- drivers/watchdog/rti_wdt.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/watchdog/rti_wdt.c +12 -1
@@ -70,6 +70,11 @@ static int rti_wdt_start(struct watchdog_device *wdd) {u32 timer_margin;struct rti_wdt_device *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret =pm_runtime_resume_and_get (wdd->parent); +if (ret) +return ret;/* set timeout period */ timer_margin = (u64 )wdd->timeout * wdt->freq;
@@ -296,6 +301,9 @@ static int rti_wdt_probe(struct platform_device *pdev)if (last_ping)watchdog_set_last_hw_keepalive (wdd, last_ping); +if (!watchdog_hw_running (wdd)) +pm_runtime_put_sync (&pdev->dev); +return 0 ; err_iomap:
@@ -310,7 +318,10 @@ static int rti_wdt_remove(struct platform_device *pdev)struct rti_wdt_device *wdt =platform_get_drvdata (pdev);watchdog_unregister_device (&wdt->wdd); -pm_runtime_put (&pdev->dev); + +if (!pm_runtime_suspended (&pdev->dev)) +pm_runtime_put (&pdev->dev); +pm_runtime_disable (&pdev->dev);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/286 clk: si5341: fix an error code problem in si5341_output_clk_set_rate
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 5607068ae5ab02c3ac9cabc6859d36e98004c341 ]
regmap_bulk_write() return zero or negative error code, return the value of regmap_bulk_write() rather than '0'.
--- drivers/clk/clk-si5341.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clk/clk-si5341.c +1 -3
@@ -888,10 +888,8 @@ static int si5341_output_clk_set_rate(struct clk_hw *hw, unsigned long rate, r[0 ] = r_div ? (r_div &0xff ) :1 ; r[1 ] = (r_div >>8 ) &0xff ; r[2 ] = (r_div >>16 ) &0xff ; - err =regmap_bulk_write (output->data->regmap, +return regmap_bulk_write (output->data->regmap,SI5341_OUT_R_REG (output), r,3 ); - -return 0 ; }static int si5341_output_reparent (struct clk_si5341_output *output,u8 index)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/286 clk: fixed-rate: add devm_clk_hw_register_fixed_rate
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 1d7d20658534c7d36fe6f4252f6f1a27d9631a99 ]
Add devm_clk_hw_register_fixed_rate(), devres-managed helper to register fixed-rate clock.
Stable-dep-of: ee0cf5e07f44 ("clk: fixed-rate: fix clk_hw_register_fixed_rate_with_accuracy_parent_hw")
--- drivers/clk/clk-fixed-rate.c | 28 ++++++++++++++++++++++++---- include/linux/clk-provider.h | 29 +++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 12 deletions(-)
drivers/clk/clk-fixed-rate.c +24 -4
@@ -49,12 +49,24 @@ const struct clk_ops clk_fixed_rate_ops = { };EXPORT_SYMBOL_GPL (clk_fixed_rate_ops); +static void devm_clk_hw_register_fixed_rate_release (struct device *dev,void *res) +{ +struct clk_fixed_rate *fix = res; + +/* +* We can not use clk_hw_unregister_fixed_rate, since it will kfree() +* the hw, resulting in double free. Just unregister the hw and let +* devres code kfree() it. +*/ +clk_hw_unregister (&fix->hw); +} +struct clk_hw *__clk_hw_register_fixed_rate (struct device *dev,struct device_node *np,const char *name,const char *parent_name,const struct clk_hw *parent_hw,const struct clk_parent_data *parent_data,unsigned long flags,unsigned long fixed_rate,unsigned long fixed_accuracy, -unsigned long clk_fixed_flags) +unsigned long clk_fixed_flags,bool devm) {struct clk_fixed_rate *fixed;struct clk_hw *hw;
@@ -62,7 +74,11 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,int ret = -EINVAL ;/* allocate fixed-rate clock */ - fixed =kzalloc (sizeof (*fixed),GFP_KERNEL ); +if (devm) + fixed =devres_alloc (devm_clk_hw_register_fixed_rate_release, +sizeof (*fixed),GFP_KERNEL ); +else + fixed =kzalloc (sizeof (*fixed),GFP_KERNEL );if (!fixed)return ERR_PTR (-ENOMEM );
@@ -90,9 +106,13 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,else if (np) ret =of_clk_hw_register (np, hw);if (ret) { -kfree (fixed); +if (devm) +devres_free (fixed); +else +kfree (fixed); hw =ERR_PTR (ret); - } + }else if (devm) +devres_add (dev, fixed);return hw; }
include/linux/clk-provider.h +21 -8
@@ -350,7 +350,7 @@ struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev, const char *parent_name, const struct clk_hw *parent_hw, const struct clk_parent_data *parent_data, unsigned long flags, unsigned long fixed_rate, unsigned long fixed_accuracy, - unsigned long clk_fixed_flags); + unsigned long clk_fixed_flags, bool devm);struct clk *clk_register_fixed_rate (struct device *dev,const char *name,const char *parent_name,unsigned long flags,unsigned long fixed_rate);
@@ -365,7 +365,20 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,*/ #define clk_hw_register_fixed_rate (dev, name, parent_name, flags, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \ - NULL, (flags), (fixed_rate), 0, 0) + NULL, (flags), (fixed_rate), 0, 0, false) + +/** +* devm_clk_hw_register_fixed_rate - register fixed-rate clock with the clock +* framework +* @dev: device that is registering this clock +* @name: name of this clock +* @parent_name: name of clock's parent +* @flags: framework-specific flags +* @fixed_rate: non-adjustable clock rate +*/ +#define devm_clk_hw_register_fixed_rate (dev, name, parent_name, flags, fixed_rate) \ + __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \ + NULL, (flags), (fixed_rate), 0, 0, true)/** * clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with * the clock framework
@@ -378,7 +391,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,#define clk_hw_register_fixed_rate_parent_hw (dev, name, parent_hw, flags, \ fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \ - NULL, (flags), (fixed_rate), 0, 0) + NULL, (flags), (fixed_rate), 0, 0, false)/** * clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with * the clock framework
@@ -392,7 +405,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ (parent_data), (flags), (fixed_rate), 0, \ - 0) + 0, false)/** * clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with * the clock framework
@@ -408,7 +421,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, fixed_accuracy) \ __clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), \NULL ,NULL , (flags), (fixed_rate), \ - (fixed_accuracy), 0) + (fixed_accuracy), 0, false)/** * clk_hw_register_fixed_rate_with_accuracy_parent_hw - register fixed-rate * clock with the clock framework
@@ -423,7 +436,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, parent_hw, flags, fixed_rate, fixed_accuracy) \__clk_hw_register_fixed_rate ((dev),NULL , (name),NULL , (parent_hw ) \NULL ,NULL , (flags), (fixed_rate), \ - (fixed_accuracy),0 ) + (fixed_accuracy),0 , false)/** * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate * clock with the clock framework
@@ -438,7 +451,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, parent_data, flags, fixed_rate, fixed_accuracy) \__clk_hw_register_fixed_rate ((dev),NULL , (name),NULL ,NULL , \ (parent_data),NULL , (flags), \ - (fixed_rate), (fixed_accuracy),0 ) + (fixed_rate), (fixed_accuracy),0 , false)/** * clk_hw_register_fixed_rate_parent_accuracy - register fixed-rate clock with * the clock framework
@@ -452,7 +465,7 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name, flags, fixed_rate) \ __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL, \ (parent_data), (flags), (fixed_rate), 0, \ - CLK_FIXED_RATE_PARENT_ACCURACY) + CLK_FIXED_RATE_PARENT_ACCURACY, false)void clk_unregister_fixed_rate (struct clk *clk);void clk_hw_unregister_fixed_rate (struct clk_hw *hw);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/286 clk: fixed-rate: fix clk_hw_register_fixed_rate_with_accuracy_parent_hw
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit ee0cf5e07f44a10fce8f1bfa9db226c0b5ecf880 ]
Add missing comma and remove extraneous NULL argument. The macro is currently used by no one which explains why the typo slipped by.
--- include/linux/clk-provider.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/clk-provider.h +2 -2
@@ -434,8 +434,8 @@ struct clk *clk_register_fixed_rate(struct device *dev, const char *name,*/ #define clk_hw_register_fixed_rate_with_accuracy_parent_hw (dev, name, \ parent_hw, flags, fixed_rate, fixed_accuracy) \ - __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw) \ - NULL, NULL, (flags), (fixed_rate), \ + __clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw), \ + NULL, (flags), (fixed_rate), \ (fixed_accuracy), 0, false)/** * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/286 pwm: stm32: Use regmap_clear_bits and regmap_set_bits where applicable
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 632ae5d7eb348b3ef88552ec0999260b6f9d6ab1 ]
Found using coccinelle and the following semantic patch:
@@
expression map, reg, bits;
@@
- regmap_update_bits(map, reg, bits, bits)
+ regmap_set_bits(map, reg, bits)
@@
expression map, reg, bits;
@@
- regmap_update_bits(map, reg, bits, 0)
+ regmap_clear_bits(map, reg, bits)
Stable-dep-of: 19f1016ea960 ("pwm: stm32: Fix enable count for clk in .probe()")
--- drivers/pwm/pwm-stm32.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/pwm/pwm-stm32.c +16 -18
@@ -115,14 +115,14 @@ static int stm32_pwm_raw_capture(struct stm32_pwm *priv, struct pwm_device *pwm,int ret;/* Ensure registers have been updated, enable counter and capture */ -regmap_update_bits (priv->regmap,TIM_EGR ,TIM_EGR_UG ,TIM_EGR_UG ); -regmap_update_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN ,TIM_CR1_CEN ); +regmap_set_bits (priv->regmap,TIM_EGR ,TIM_EGR_UG ); +regmap_set_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN );/* Use cc1 or cc3 DMA resp for PWM input channels 1 & 2 or 3 & 4 */ dma_id = pwm->hwpwm <2 ?STM32_TIMERS_DMA_CH1 :STM32_TIMERS_DMA_CH3 ; ccen = pwm->hwpwm <2 ?TIM_CCER_CC12E :TIM_CCER_CC34E ; ccr = pwm->hwpwm <2 ?TIM_CCR1 :TIM_CCR3 ; -regmap_update_bits (priv->regmap,TIM_CCER , ccen, ccen); +regmap_set_bits (priv->regmap,TIM_CCER , ccen);/* * Timer DMA burst mode. Request 2 registers, 2 bursts, to get both
@@ -160,8 +160,8 @@ static int stm32_pwm_raw_capture(struct stm32_pwm *priv, struct pwm_device *pwm, } stop: -regmap_update_bits (priv->regmap,TIM_CCER , ccen,0 ); -regmap_update_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN ,0 ); +regmap_clear_bits (priv->regmap,TIM_CCER , ccen); +regmap_clear_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN );return ret; }
@@ -359,7 +359,7 @@ static int stm32_pwm_config(struct stm32_pwm *priv, int ch,regmap_write (priv->regmap,TIM_PSC , prescaler);regmap_write (priv->regmap,TIM_ARR , prd -1 ); -regmap_update_bits (priv->regmap,TIM_CR1 ,TIM_CR1_ARPE ,TIM_CR1_ARPE ); +regmap_set_bits (priv->regmap,TIM_CR1 ,TIM_CR1_ARPE );/* Calculate the duty cycles */ dty = prd * duty_ns;
@@ -377,7 +377,7 @@ static int stm32_pwm_config(struct stm32_pwm *priv, int ch,else regmap_update_bits (priv->regmap,TIM_CCMR2 , mask, ccmr); -regmap_update_bits (priv->regmap,TIM_BDTR ,TIM_BDTR_MOE ,TIM_BDTR_MOE ); +regmap_set_bits (priv->regmap,TIM_BDTR ,TIM_BDTR_MOE );return 0 ; }
@@ -411,13 +411,13 @@ static int stm32_pwm_enable(struct stm32_pwm *priv, int ch)if (priv->have_complementary_output) mask |=TIM_CCER_CC1NE << (ch *4 ); -regmap_update_bits (priv->regmap,TIM_CCER , mask, mask); +regmap_set_bits (priv->regmap,TIM_CCER , mask);/* Make sure that registers are updated */ -regmap_update_bits (priv->regmap,TIM_EGR ,TIM_EGR_UG ,TIM_EGR_UG ); +regmap_set_bits (priv->regmap,TIM_EGR ,TIM_EGR_UG );/* Enable controller */ -regmap_update_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN ,TIM_CR1_CEN ); +regmap_set_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN );return 0 ; }
@@ -431,11 +431,11 @@ static void stm32_pwm_disable(struct stm32_pwm *priv, int ch)if (priv->have_complementary_output) mask |=TIM_CCER_CC1NE << (ch *4 ); -regmap_update_bits (priv->regmap,TIM_CCER , mask,0 ); +regmap_clear_bits (priv->regmap,TIM_CCER , mask);/* When all channels are disabled, we can disable the controller */ if (!active_channels (priv)) -regmap_update_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN ,0 ); +regmap_clear_bits (priv->regmap,TIM_CR1 ,TIM_CR1_CEN );clk_disable (priv->clk); }
@@ -568,10 +568,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv)* If complementary bit doesn't exist writing 1 will have no * effect so we can detect it. */ -regmap_update_bits (priv->regmap, -TIM_CCER ,TIM_CCER_CC1NE ,TIM_CCER_CC1NE ); +regmap_set_bits (priv->regmap,TIM_CCER ,TIM_CCER_CC1NE );regmap_read (priv->regmap,TIM_CCER , &ccer); -regmap_update_bits (priv->regmap,TIM_CCER ,TIM_CCER_CC1NE ,0 ); +regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CC1NE ); priv->have_complementary_output = (ccer !=0 ); }
@@ -585,10 +584,9 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv)* If channels enable bits don't exist writing 1 will have no * effect so we can detect and count them. */ -regmap_update_bits (priv->regmap, -TIM_CCER ,TIM_CCER_CCXE ,TIM_CCER_CCXE ); +regmap_set_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE );regmap_read (priv->regmap,TIM_CCER , &ccer); -regmap_update_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE ,0 ); +regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE );if (ccer &TIM_CCER_CC1E ) npwm++;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/286 pwm: stm32: Use hweight32 in stm32_pwm_detect_channels
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Zabel <[email protected]>
[ Upstream commit 41fa8f57c0d269243fe3bde2bce71e82c884b9ad ]
Use hweight32() to count the CCxE bits in stm32_pwm_detect_channels(). Since the return value is assigned to chip.npwm, change it to unsigned int as well.
Stable-dep-of: 19f1016ea960 ("pwm: stm32: Fix enable count for clk in .probe()")
--- drivers/pwm/pwm-stm32.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
drivers/pwm/pwm-stm32.c +2 -15
@@ -575,10 +575,9 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) priv->have_complementary_output = (ccer !=0 ); } -static int stm32_pwm_detect_channels (struct stm32_pwm *priv) +static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv) {u32 ccer; -int npwm =0 ;/* * If channels enable bits don't exist writing 1 will have no
@@ -588,19 +587,7 @@ static int stm32_pwm_detect_channels(struct stm32_pwm *priv)regmap_read (priv->regmap,TIM_CCER , &ccer);regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE ); -if (ccer &TIM_CCER_CC1E ) - npwm++; - -if (ccer &TIM_CCER_CC2E ) - npwm++; - -if (ccer &TIM_CCER_CC3E ) - npwm++; - -if (ccer &TIM_CCER_CC4E ) - npwm++; - -return npwm; +return hweight32 (ccer &TIM_CCER_CCXE ); }static int stm32_pwm_probe (struct platform_device *pdev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/286 pwm: stm32: Fix enable count for clk in .probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Zabel <[email protected]>
[ Upstream commit 19f1016ea9600ed89bc24247c36ff5934ad94fbb ]
Make the driver take over hardware state without disabling in .probe() and enable the clock for each enabled channel.
--- drivers/pwm/pwm-stm32.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/pwm/pwm-stm32.c +14 -4
@@ -575,17 +575,21 @@ static void stm32_pwm_detect_complementary(struct stm32_pwm *priv) priv->have_complementary_output = (ccer !=0 ); } -static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv) +static unsigned int stm32_pwm_detect_channels (struct stm32_pwm *priv, +unsigned int *num_enabled) { -u32 ccer; +u32 ccer, ccer_backup;/* * If channels enable bits don't exist writing 1 will have no * effect so we can detect and count them. */ +regmap_read (priv->regmap,TIM_CCER , &ccer_backup);regmap_set_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE );regmap_read (priv->regmap,TIM_CCER , &ccer); -regmap_clear_bits (priv->regmap,TIM_CCER ,TIM_CCER_CCXE ); +regmap_write (priv->regmap,TIM_CCER , ccer_backup); + + *num_enabled =hweight32 (ccer_backup &TIM_CCER_CCXE );return hweight32 (ccer &TIM_CCER_CCXE ); }
@@ -596,6 +600,8 @@ static int stm32_pwm_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct stm32_timers *ddata =dev_get_drvdata (pdev->dev.parent);struct stm32_pwm *priv; +unsigned int num_enabled; +unsigned int i;int ret; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );
@@ -621,7 +627,11 @@ static int stm32_pwm_probe(struct platform_device *pdev) priv->chip.base =-1 ; priv->chip.dev = dev; priv->chip.ops = &stm32pwm_ops; - priv->chip.npwm =stm32_pwm_detect_channels (priv); + priv->chip.npwm =stm32_pwm_detect_channels (priv, &num_enabled); + +/* Initialize clock refcount to number of enabled PWM channels. */ +for (i =0 ; i < num_enabled; i++) +clk_enable (priv->clk); ret =pwmchip_add (&priv->chip);if (ret <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/286 mmc: sdhci_am654: Fix TI SoC dependencies
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit cb052da7f031b0d2309a4895ca236afb3b4bbf50 ]
The sdhci_am654 is specific to recent TI SoCs, update the dependencies for those SoCs and compile testing. While we're at it update the text to reflect the wider range of supported TI SoCS the driver now supports.
--- drivers/mmc/host/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +3 -2
@@ -1080,14 +1080,15 @@ config MMC_SDHCI_OMAP config MMC_SDHCI_AM654 tristate "Support for the SDHCI Controller in TI's AM654 SOCs" + depends on ARCH_K3 || COMPILE_TEST depends on MMC_SDHCI_PLTFM && OF select MMC_SDHCI_IO_ACCESSORS select MMC_CQHCI select REGMAP_MMIO help This selects the Secure Digital Host Controller Interface (SDHCI) - support present in TI's AM654 SOCs. The controller supports - SD/MMC/SDIO devices. + support present in TI's AM65x/AM64x/AM62x/J721E SOCs. The controller + supports SD/MMC/SDIO devices. If you have a controller with this interface, say Y or M here.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/286 mmc: sdhci_omap: Fix TI SoC dependencies
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit 09f164d393a6671e5ff8342ba6b3cb7fe3f20208 ]
The sdhci_omap is specific to older TI SoCs, update the dependencies for those SoCs and compile testing. While we're at it update the text to reflect the wider range of supported TI SoCS the driver now supports.
--- drivers/mmc/host/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/host/Kconfig +3 -2
@@ -1065,14 +1065,15 @@ config MMC_SDHCI_XENON config MMC_SDHCI_OMAP tristate "TI SDHCI Controller Support" + depends on ARCH_OMAP2PLUS || ARCH_KEYSTONE || COMPILE_TEST depends on MMC_SDHCI_PLTFM && OF select THERMAL imply TI_SOC_THERMAL select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE help This selects the Secure Digital Host Controller Interface (SDHCI) - support present in TI's DRA7 SOCs. The controller supports - SD/MMC/SDIO devices. + support present in TI's Keystone/OMAP2+/DRA7 SOCs. The controller + supports SD/MMC/SDIO devices. If you have a controller with this interface, say Y or M here.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/286 IB/iser: Prevent invalidating wrong MR
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Gorenko <[email protected]>
[ Upstream commit 2f1888281e67205bd80d3e8f54dbd519a9653f26 ]
The iser_reg_resources structure has two pointers to MR but only one mr_valid field. The implementation assumes that we use only *sig_mr when pi_enable is true. Otherwise, we use only *mr. However, it is only sometimes correct. Read commands without protection information occur even when pi_enble is true. For example, the following SCSI commands have a Data-In buffer but never have protection information: READ CAPACITY (16), INQUIRY, MODE SENSE(6), MAINTENANCE IN. So, we use*sig_mr for some SCSI commands and *mr for the other SCSI commands.
In most cases, it works fine because the remote invalidation is applied. However, there are two cases when the remote invalidation is not applicable.
1. Small write commands when all data is sent as an immediate.
2. The target does not support the remote invalidation feature.
The lazy invalidation is used if the remote invalidation is impossible. Since, at the lazy invalidation, we always invalidate the MR we want to use, the wrong MR may be invalidated.
To fix the issue, we need a field per MR that indicates the MR needs invalidation. Since the ib_mr structure already has such a field, let's use ib_mr.need_inval instead of iser_reg_resources.mr_valid.
--- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 -- drivers/infiniband/ulp/iser/iser_initiator.c | 5 ++++- drivers/infiniband/ulp/iser/iser_memory.c | 8 ++++---- drivers/infiniband/ulp/iser/iser_verbs.c | 1 - 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.h +0 -2
@@ -322,12 +322,10 @@ struct iser_device {* * @mr: memory region * @sig_mr: signature memory region -* @mr_valid: is mr valid indicator */ struct iser_reg_resources {struct ib_mr *mr;struct ib_mr *sig_mr; -u8 mr_valid:1 ; };/**
drivers/infiniband/ulp/iser/iser_initiator.c +4 -1
@@ -602,7 +602,10 @@ iser_inv_desc(struct iser_fr_desc *desc, u32 rkey)return -EINVAL ; } - desc->rsc.mr_valid =0 ; +if (desc->sig_protected) + desc->rsc.sig_mr->need_inval = false; +else + desc->rsc.mr->need_inval = false;return 0 ; }
drivers/infiniband/ulp/iser/iser_memory.c +4 -4
@@ -250,7 +250,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task,iser_set_prot_checks (iser_task->sc, &sig_attrs->check_mask); -if (rsc->mr_valid) +if (rsc->sig_mr->need_inval)iser_inv_rkey (&tx_desc->inv_wr, mr, cqe, &wr->wr);ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey));
@@ -274,7 +274,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task, wr->access =IB_ACCESS_LOCAL_WRITE |IB_ACCESS_REMOTE_READ |IB_ACCESS_REMOTE_WRITE ; - rsc->mr_valid =1 ; + rsc->sig_mr->need_inval = true; sig_reg->sge.lkey = mr->lkey; sig_reg->rkey = mr->rkey;
@@ -299,7 +299,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task,struct ib_reg_wr *wr = &tx_desc->reg_wr;int n; -if (rsc->mr_valid) +if (rsc->mr->need_inval)iser_inv_rkey (&tx_desc->inv_wr, mr, cqe, &wr->wr);ib_update_fast_reg_key (mr,ib_inc_rkey (mr->rkey));
@@ -322,7 +322,7 @@ static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task,IB_ACCESS_REMOTE_WRITE |IB_ACCESS_REMOTE_READ ; - rsc->mr_valid =1 ; + rsc->mr->need_inval = true; reg->sge.lkey = mr->lkey; reg->rkey = mr->rkey;
drivers/infiniband/ulp/iser/iser_verbs.c +0 -1
@@ -136,7 +136,6 @@ iser_create_fastreg_desc(struct iser_device *device, goto err_alloc_mr_integrity; } } - desc->rsc.mr_valid =0 ;return desc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/286 of: Fix double free in of_parse_phandle_with_args_map
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian A. Ehrhardt <[email protected]>
[ Upstream commit 4dde83569832f9377362e50f7748463340c5db6b ]
In of_parse_phandle_with_args_map() the inner loop that iterates through the map entries calls of_node_put(new) to free the reference acquired by the previous iteration of the inner loop. This assumes that the value of "new" is NULL on the first iteration of the inner loop.
Make sure that this is true in all iterations of the outer loop by setting "new" to NULL after its value is assigned to "cur".
Extend the unittest to detect the double free and add an additional test case that actually triggers this path.
--- drivers/of/base.c | 1 + drivers/of/unittest-data/tests-phandle.dtsi | 10 ++- drivers/of/unittest.c | 74 ++++++++++++--------- 3 files changed, 53 insertions(+), 32 deletions(-)
drivers/of/base.c +1 -0
@@ -1670,6 +1670,7 @@ int of_parse_phandle_with_args_map(const struct device_node *np, out_args->np = new;of_node_put (cur); cur = new; + new =NULL ; } put:of_node_put (cur);
drivers/of/unittest-data/tests-phandle.dtsi +9 -1
@@ -38,6 +38,13 @@ provider4: provider4 { phandle-map-pass-thru = <0x0 0xf0>; }; + provider5: provider5 { + #phandle-cells = <2>; + phandle-map = <2 7 &provider4 2 3>; + phandle-map-mask = <0xff 0xf>; + phandle-map-pass-thru = <0x0 0xf0>; + }; + consumer-a { phandle-list = <&provider1 1>, <&provider2 2 0>,
@@ -64,7 +71,8 @@ consumer-b { <&provider4 4 0x100>, <&provider4 0 0x61>, <&provider0>, - <&provider4 19 0x20>; + <&provider4 19 0x20>, + <&provider5 2 7>; phandle-list-bad-phandle = <12345678 0 0>; phandle-list-bad-args = <&provider2 1 0>, <&provider4 0>;
drivers/of/unittest.c +43 -31
144 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/286 of: unittest: Fix of_count_phandle_with_args() expected value message
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 716089b417cf98d01f0dc1b39f9c47e1d7b4c965 ]
The expected result value for the call to of_count_phandle_with_args() was updated from 7 to 8, but the accompanying error message was forgotten.
--- drivers/of/unittest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/unittest.c +1 -1
@@ -565,7 +565,7 @@ static void __init of_unittest_parse_phandle_with_args_map(void) } rc =of_count_phandle_with_args (np,"phandle-list" ,"#phandle-cells" ); -unittest (rc ==8 ,"of_count_phandle_with_args() returned %i, expected 7\n" , rc); +unittest (rc ==8 ,"of_count_phandle_with_args() returned %i, expected 8\n" , rc);for (i =0 ; i <9 ; i++) {bool passed = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/286 keys, dns: Fix size check of V1 server-list header
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
commit acc657692aed438e9931438f8c923b2b107aebf9 upstream.
Fix the size check added to dns_resolver_preparse() for the V1 server-list header so that it doesn't give EINVAL if the size supplied is the same as the size of the header struct (which should be valid).
This can be tested with:
echo -n -e '\0\0\01\xff\0\0' | keyctl padd dns_resolver desc @p
which will give "add_key: Invalid argument" without this fix.
--- net/dns_resolver/dns_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +1 -1
@@ -104,7 +104,7 @@ dns_resolver_preparse(struct key_preparsconst struct dns_server_list_v1_header *v1;/* It may be a server list. */ -if (datalen <=sizeof (*v1)) +if (datalen <sizeof (*v1))return -EINVAL ; v1 = (const struct dns_server_list_v1_header *)data;
Greg Kroah-Hartman
maintainerPATCH 198/286 binder: fix async space check for 0-sized buffers
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 3091c21d3e9322428691ce0b7a0cfa9c0b239eeb upstream.
Move the padding of 0-sized buffers to an earlier stage to account for this round up during the alloc->free_async_space check.
--- drivers/android/binder_alloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/android/binder_alloc.c +4 -3
@@ -415,6 +415,10 @@ static struct binder_buffer *binder_allo alloc->pid, extra_buffers_size);return ERR_PTR (-EINVAL ); } + +/* Pad 0-size buffers so they get assigned unique addresses */ + size =max (size,sizeof (void *)); +if (is_async && alloc->free_async_space < size +sizeof (struct binder_buffer )) { binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
@@ -423,9 +427,6 @@ static struct binder_buffer *binder_alloreturn ERR_PTR (-ENOSPC ); } -/* Pad 0-size buffers so they get assigned unique addresses */ - size =max (size,sizeof (void *)); -while (n) { buffer = rb_entry(n, struct binder_buffer, rb_node);BUG_ON (!buffer->free);
Greg Kroah-Hartman
maintainerPATCH 199/286 binder: fix unused alloc->free_async_space
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit c6d05e0762ab276102246d24affd1e116a46aa0c upstream.
Each transaction is associated with a 'struct binder_buffer' that stores the metadata about its buffer area. Since commit 74310e06be4d ("android:
binder: Move buffer out of area shared with user space") this struct is no longer embedded within the buffer itself but is instead allocated on the heap to prevent userspace access to this driver-exclusive info.
Unfortunately, the space of this struct is still being accounted for in the total buffer size calculation, specifically for async transactions. This results in an additional 104 bytes added to every async buffer request, and this area is never used.
This wasted space can be substantial. If we consider the maximum mmap buffer space of SZ_4M, the driver will reserve half of it for async transactions, or 0x200000. This area should, in theory, accommodate up to 262,144 buffers of the minimum 8-byte size. However, after adding the extra 'sizeof(struct binder_buffer)', the total number of buffers drops to only 18,724, which is a sad 7.14% of the actual capacity.
This patch fixes the buffer size calculation to enable the utilization of the entire async buffer space. This is expected to reduce the number of -ENOSPC errors that are seen on the field.
--- drivers/android/binder_alloc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/android/binder_alloc.c +4 -7
@@ -359,8 +359,7 @@ static void debug_low_async_space_lockedcontinue ;if (!buffer->async_transaction)continue ; - total_alloc_size +=binder_alloc_buffer_size (alloc, buffer) - +sizeof (struct binder_buffer ); + total_alloc_size +=binder_alloc_buffer_size (alloc, buffer); num_buffers++; }
@@ -419,8 +418,7 @@ static struct binder_buffer *binder_allo/* Pad 0-size buffers so they get assigned unique addresses */ size =max (size,sizeof (void *)); -if (is_async && - alloc->free_async_space < size +sizeof (struct binder_buffer )) { +if (is_async && alloc->free_async_space < size) {binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC ,"%d: binder_alloc_buf size %zd failed, no async space left\n" , alloc->pid, size);
@@ -527,7 +525,7 @@ static struct binder_buffer *binder_allo buffer->extra_buffers_size = extra_buffers_size; buffer->pid = pid;if (is_async) { - alloc->free_async_space -= size +sizeof (struct binder_buffer ); + alloc->free_async_space -= size;binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC_ASYNC ,"%d: binder_alloc_buf size %zd async free %zd\n" , alloc->pid, size, alloc->free_async_space);
@@ -663,8 +661,7 @@ static void binder_free_buf_locked(strucBUG_ON (buffer->user_data > alloc->buffer + alloc->buffer_size);if (buffer->async_transaction) { - alloc->free_async_space += buffer_size +sizeof (struct binder_buffer ); - + alloc->free_async_space += buffer_size;binder_alloc_debug (BINDER_DEBUG_BUFFER_ALLOC_ASYNC ,"%d: binder_free_buf size %zd async free %zd\n" , alloc->pid, size, alloc->free_async_space);
Greg Kroah-Hartman
maintainerPATCH 200/286 binder: fix use-after-free in shinkers callback
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 3f489c2067c5824528212b0fc18b28d51332d906 upstream.
The mmap read lock is used during the shrinker's callback, which means that using alloc->vma pointer isn't safe as it can race with munmap(). As of commit dd2283f2605e ("mm: mmap: zap pages with read mmap_sem in munmap") the mmap lock is downgraded after the vma has been isolated.
I was able to reproduce this issue by manually adding some delays and triggering page reclaiming through the shrinker's debug sysfs. The following KASAN report confirms the UAF:
==================================================================
BUG: KASAN: slab-use-after-free in zap_page_range_single+0x470/0x4b8 Read of size 8 at addr ffff356ed50e50f0 by task bash/478 CPU: 1 PID: 478 Comm: bash Not tainted 6.6.0-rc5-00055-g1c8b86a3799f-dirty #70 Hardware name: linux,dummy-virt (DT) Call trace: zap_page_range_single+0x470/0x4b8 binder_alloc_free_page+0x608/0xadc __list_lru_walk_one+0x130/0x3b0 list_lru_walk_node+0xc4/0x22c binder_shrink_scan+0x108/0x1dc shrinker_debugfs_scan_write+0x2b4/0x500 full_proxy_write+0xd4/0x140 vfs_write+0x1ac/0x758 ksys_write+0xf0/0x1dc __arm64_sys_write+0x6c/0x9c Allocated by task 492: kmem_cache_alloc+0x130/0x368 vm_area_alloc+0x2c/0x190 mmap_region+0x258/0x18bc do_mmap+0x694/0xa60 vm_mmap_pgoff+0x170/0x29c ksys_mmap_pgoff+0x290/0x3a0 __arm64_sys_mmap+0xcc/0x144 Freed by task 491: kmem_cache_free+0x17c/0x3c8 vm_area_free_rcu_cb+0x74/0x98 rcu_core+0xa38/0x26d4 rcu_core_si+0x10/0x1c __do_softirq+0x2fc/0xd24 Last potentially related work creation: __call_rcu_common.constprop.0+0x6c/0xba0 call_rcu+0x10/0x1c vm_area_free+0x18/0x24 remove_vma+0xe4/0x118 do_vmi_align_munmap.isra.0+0x718/0xb5c do_vmi_munmap+0xdc/0x1fc __vm_munmap+0x10c/0x278 __arm64_sys_munmap+0x58/0x7c
Fix this issue by performing instead a vma_lookup() which will fail to find the vma that was isolated before the mmap lock downgrade. Note that this option has better performance than upgrading to a mmap write lock which would increase contention. Plus, mmap_write_trylock() has been recently removed anyway.
[cmllamas: use find_vma() instead of vma_lookup() as commit ce6d42f2e4a2
is missing in v5.10. This only works because we check the vma against our cached alloc->vma pointer.]
--- drivers/android/binder_alloc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/android/binder_alloc.c +5 -1
@@ -1000,7 +1000,9 @@ enum lru_status binder_alloc_free_page(s goto err_mmget;if (!mmap_read_trylock (mm)) goto err_mmap_read_lock_failed; - vma =binder_alloc_get_vma (alloc); + vma =find_vma (mm, page_addr); +if (vma && vma !=binder_alloc_get_vma (alloc)) + goto err_invalid_vma;list_lru_isolate (lru, item);spin_unlock (lock);
@@ -1026,6 +1028,8 @@ enum lru_status binder_alloc_free_page(smutex_unlock (&alloc->mutex);return LRU_REMOVED_RETRY ; +err_invalid_vma: +mmap_read_unlock (mm); err_mmap_read_lock_failed:mmput_async (mm); err_mmget:
Greg Kroah-Hartman
maintainerPATCH 201/286 Input: atkbd - use ab83 as id when skipping the getid command
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit 58f65f9db7e0de366a5a115c2e2c0703858bba69 upstream.
Barnabás reported that the change to skip the getid command when the controller is in translated mode on laptops caused the Version field of his "AT Translated Set 2 keyboard" input device to change from ab83 to abba, breaking a custom hwdb entry for this keyboard.
Use the standard ab83 id for keyboards when getid is skipped (rather then that getid fails) to avoid reporting a different Version to userspace then before skipping the getid.
--- drivers/input/keyboard/atkbd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/input/keyboard/atkbd.c +7 -5
@@ -782,9 +782,9 @@ static bool atkbd_is_portable_device(voi* not work. So in this case simply assume a keyboard is connected to avoid * confusing some laptop keyboards. * -* Skipping ATKBD_CMD_GETID ends up using a fake keyboard id. Using a fake id is -* ok in translated mode, only atkbd_select_set() checks atkbd->id and in -* translated mode that is a no-op. +* Skipping ATKBD_CMD_GETID ends up using a fake keyboard id. Using the standard +* 0xab83 id is ok in translated mode, only atkbd_select_set() checks atkbd->id +* and in translated mode that is a no-op. */ static bool atkbd_skip_getid (struct atkbd *atkbd) {
@@ -802,6 +802,7 @@ static int atkbd_probe(struct atkbd *atk {struct ps2dev *ps2dev = &atkbd->ps2dev;unsigned char param[2 ]; +bool skip_getid;/* * Some systems, where the bit-twiddling when testing the io-lines of the
@@ -823,7 +824,8 @@ static int atkbd_probe(struct atkbd *atk*/ param[0 ] = param[1 ] =0xa5 ;/* initialize with invalid values */ -if (atkbd_skip_getid (atkbd) ||ps2_command (ps2dev, param,ATKBD_CMD_GETID )) { + skip_getid =atkbd_skip_getid (atkbd); +if (skip_getid ||ps2_command (ps2dev, param,ATKBD_CMD_GETID )) {/* * If the get ID command was skipped or failed, we check if we can at least set
@@ -833,7 +835,7 @@ static int atkbd_probe(struct atkbd *atk param[0 ] =0 ;if (ps2_command (ps2dev, param,ATKBD_CMD_SETLEDS ))return -1 ; - atkbd->id =0xabba ; + atkbd->id = skip_getid ?0xab83 :0xabba ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 202/286 dma-mapping: Fix build error unused-value
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ren Zhijie <[email protected]>
commit 50d6281ce9b8412f7ef02d1bc9d23aa62ae0cf98 upstream.
If CONFIG_DMA_DECLARE_COHERENT is not set,
make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- will be failed, like this:
drivers/remoteproc/remoteproc_core.c: In function ‘rproc_rvdev_release’:./include/linux/dma-map-ops.h:182:42: error: statement with no effect [-Werror=unused-value]
#define dma_release_coherent_memory(dev) (0)
^drivers/remoteproc/remoteproc_core.c:464:2: note: in expansion of macro ‘dma_release_coherent_memory’
dma_release_coherent_memory(dev);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
The return type of function dma_release_coherent_memory in CONFIG_DMA_DECLARE_COHERENT area is void, so in !CONFIG_DMA_DECLARE_COHERENT area it should neither return any value nor be defined as zero.
--- include/linux/dma-map-ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/dma-map-ops.h +1 -1
@@ -185,10 +185,10 @@ static inline int dma_declare_coherent_mreturn -ENOSYS ; } -#define dma_release_coherent_memory (dev) (0)#define dma_alloc_from_dev_coherent (dev, size, handle, ret) (0)#define dma_release_from_dev_coherent (dev, order, vaddr) (0)#define dma_mmap_from_dev_coherent (dev, vma, vaddr, order, ret) (0) +static inline void dma_release_coherent_memory (struct device *dev) { }static inline void *dma_alloc_from_global_coherent (struct device *dev,ssize_t size,dma_addr_t *dma_handle)
Greg Kroah-Hartman
maintainerPATCH 203/286 virtio-crypto: fix memory-leak
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: lei he <[email protected]>
commit 1bedcf22c081a6e9943f09937b2da8d3ef52d20d upstream.
Fix memory-leak for virtio-crypto akcipher request, this problem is introduced by 59ca6c93387d3(virtio-crypto: implement RSA algorithm). The leak can be reproduced and tested with the following script inside virtual machine:
#!/bin/bash
LOOP_TIMES=10000
# required module: pkcs8_key_parser, virtio_crypto modprobe pkcs8_key_parser # if CONFIG_PKCS8_PRIVATE_KEY_PARSER=m modprobe virtio_crypto # if CONFIG_CRYPTO_DEV_VIRTIO=m rm -rf /tmp/data dd if=/dev/random of=/tmp/data count=1 bs=230
# generate private key and self-signed cert openssl req -nodes -x509 -newkey rsa:2048 -keyout key.pem \ -outform der -out cert.der \ -subj "/C=CN/ST=GD/L=SZ/O=vihoo/OU=dev/CN=always.com/[email protected]" # convert private key from pem to der openssl pkcs8 -in key.pem -topk8 -nocrypt -outform DER -out key.der
# add key PRIV_KEY_ID=`cat key.der | keyctl padd asymmetric test_priv_key @s` echo "priv key id = "$PRIV_KEY_ID PUB_KEY_ID=`cat cert.der | keyctl padd asymmetric test_pub_key @s` echo "pub key id = "$PUB_KEY_ID
# query key keyctl pkey_query $PRIV_KEY_ID 0 keyctl pkey_query $PUB_KEY_ID 0
# here we only run pkey_encrypt becasuse it is the fastest interface
function bench_pub() {
keyctl pkey_encrypt $PUB_KEY_ID 0 /tmp/data enc=pkcs1 >/tmp/enc.pub
}# do bench_pub in loop to obtain the memory leak
for (( i = 0; i < ${LOOP_TIMES}; ++i )); do
bench_pub
doneMessage-Id: <[email protected]>
--- drivers/crypto/virtio/virtio_crypto_akcipher_algs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/virtio/virtio_crypto_akcipher_algs.c +4 -0
@@ -56,6 +56,10 @@ static void virtio_crypto_akcipher_finalstruct virtio_crypto_akcipher_request *vc_akcipher_req, struct akcipher_request *req, int err) { + kfree(vc_akcipher_req->src_buf); +kfree (vc_akcipher_req->dst_buf); + vc_akcipher_req->src_buf =NULL ; + vc_akcipher_req->dst_buf =NULL ;virtcrypto_clear_request (&vc_akcipher_req->base);crypto_finalize_akcipher_request (vc_akcipher_req->base.dataq->engine, req, err);
Greg Kroah-Hartman
maintainerPATCH 204/286 virtio-crypto: fix memory leak in virtio_crypto_alg_skcipher_close_session()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Yongjun <[email protected]>
commit b1d65f717cd6305a396a8738e022c6f7c65cfbe8 upstream.
'vc_ctrl_req' is alloced in virtio_crypto_alg_skcipher_close_session(), and should be freed in the invalid ctrl_status->status error handling case. Otherwise there is a memory leak.
Message-Id: <[email protected]>
--- drivers/crypto/virtio/virtio_crypto_algs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/virtio/virtio_crypto_algs.c +2 -1
@@ -239,7 +239,8 @@ static int virtio_crypto_alg_skcipher_clpr_err ("virtio_crypto: Close session failed status: %u, session_id: 0x%llx\n" , ctrl_status->status, destroy_session->session_id); -return -EINVAL ; + err = -EINVAL ; + goto out; } err =0 ;
Greg Kroah-Hartman
maintainerPATCH 205/286 Revert "ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
This reverts commit 608fc58858bfa7552a9824c2f0e4a3ab8dd4efaa which is commit c775cbf62ed4911e4f0f23880f01815753123690 upstream.
It is reported to cause problems, so drop it from the 5.10.y tree for now.
--- sound/soc/atmel/sam9g20_wm8731.c | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
sound/soc/atmel/sam9g20_wm8731.c +61 -0
@@ -46,6 +46,35 @@*/ #undef ENABLE_MIC_INPUT +static struct clk *mclk; + +static int at91sam9g20ek_set_bias_level (struct snd_soc_card *card, +struct snd_soc_dapm_context *dapm, +enum snd_soc_bias_level level) +{ +static int mclk_on; +int ret =0 ; + +switch (level) { +case SND_SOC_BIAS_ON : +case SND_SOC_BIAS_PREPARE : +if (!mclk_on) + ret =clk_enable (mclk); +if (ret ==0 ) + mclk_on =1 ; +break ; + +case SND_SOC_BIAS_OFF : +case SND_SOC_BIAS_STANDBY : +if (mclk_on) +clk_disable (mclk); + mclk_on =0 ; +break ; + } + +return ret; +} +static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = {SND_SOC_DAPM_MIC ("Int Mic" ,NULL ),SND_SOC_DAPM_SPK ("Ext Spk" ,NULL ),
@@ -106,6 +135,7 @@ static struct snd_soc_card snd_soc_at91s .owner = THIS_MODULE, .dai_link = &at91sam9g20ek_dai, .num_links = 1, + .set_bias_level = at91sam9g20ek_set_bias_level, .dapm_widgets = at91sam9g20ek_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(at91sam9g20ek_dapm_widgets),
@@ -118,6 +148,7 @@ static int at91sam9g20ek_audio_probe(str {struct device_node *np = pdev->dev.of_node;struct device_node *codec_np, *cpu_np; +struct clk *pllb;struct snd_soc_card *card = &snd_soc_at91sam9g20ek;int ret;
@@ -131,6 +162,31 @@ static int at91sam9g20ek_audio_probe(strreturn -EINVAL ; } +/* +* Codec MCLK is supplied by PCK0 - set it up. +*/ + mclk =clk_get (NULL ,"pck0" ); +if (IS_ERR (mclk)) { +dev_err (&pdev->dev,"Failed to get MCLK\n" ); + ret =PTR_ERR (mclk); + goto err; + } + + pllb =clk_get (NULL ,"pllb" ); +if (IS_ERR (pllb)) { +dev_err (&pdev->dev,"Failed to get PLLB\n" ); + ret =PTR_ERR (pllb); + goto err_mclk; + } + ret =clk_set_parent (mclk, pllb); +clk_put (pllb); +if (ret !=0 ) { +dev_err (&pdev->dev,"Failed to set MCLK parent\n" ); + goto err_mclk; + } + +clk_set_rate (mclk,MCLK_RATE ); + card->dev = &pdev->dev;/* Parse device node info */
@@ -174,6 +230,9 @@ static int at91sam9g20ek_audio_probe(strreturn ret; +err_mclk: +clk_put (mclk); + mclk =NULL ; err:atmel_ssc_put_audio (0 );return ret;
@@ -183,6 +242,8 @@ static int at91sam9g20ek_audio_remove(st {struct snd_soc_card *card =platform_get_drvdata (pdev); +clk_disable (mclk); + mclk =NULL ;snd_soc_unregister_card (card);atmel_ssc_put_audio (0 );
Greg Kroah-Hartman
maintainerPATCH 206/286 kprobes: Fix to handle forcibly unoptimized kprobes on freeing_list
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit 4fbd2f83fda0ca44a2ec6421ca3508b355b31858 upstream.
Since forcibly unoptimized kprobes will be put on the freeing_list directly in the unoptimize_kprobe(), do_unoptimize_kprobes() must continue to check the freeing_list even if unoptimizing_list is empty.
This bug can happen if a kprobe is put in an instruction which is in the middle of the jump-replaced instruction sequence of an optprobe, *and* the optprobe is recently unregistered and queued on unoptimizing_list. In this case, the optprobe will be unoptimized forcibly (means immediately) and put it into the freeing_list, expecting the optprobe will be handled in do_unoptimize_kprobe().
But if there is no other optprobes on the unoptimizing_list, current code returns from the do_unoptimize_kprobe() soon and does not handle the optprobe which is on the freeing_list. Then the optprobe will hit the WARN_ON_ONCE() in the do_free_cleaned_kprobes(), because it is not handled in the latter loop of the do_unoptimize_kprobe().
To solve this issue, do not return from do_unoptimize_kprobes() immediately even if unoptimizing_list is empty.
Moreover, this change affects another case. kill_optimized_kprobes() expects kprobe_optimizer() will just free the optprobe on freeing_list. So I changed it to just do list_move() to freeing_list if optprobes are on unoptimizing list. And the do_unoptimize_kprobe() will skip arch_disarm_kprobe() if the probe on freeing_list has gone flag.
[fp: adjust comment conflict regarding commit 223a76b268c9 ("kprobes: Fix
coding style issues")]
--- kernel/kprobes.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
kernel/kprobes.c +10 -13
@@ -545,17 +545,15 @@ static void do_unoptimize_kprobes(void)/* See comment in do_optimize_kprobes() */ lockdep_assert_cpus_held (); -/* Unoptimization must be done anytime */ -if (list_empty (&unoptimizing_list)) -return ; +if (!list_empty (&unoptimizing_list)) +arch_unoptimize_kprobes (&unoptimizing_list, &freeing_list); -arch_unoptimize_kprobes (&unoptimizing_list, &freeing_list); -/* Loop free_list for disarming */ +/* Loop on 'freeing_list' for disarming and removing from kprobe hash list */ list_for_each_entry_safe (op, tmp, &freeing_list, list) {/* Switching from detour code to origin */ op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED ; -/* Disarm probes if marked disabled */ -if (kprobe_disabled (&op->kp)) +/* Disarm probes if marked disabled and not gone */ +if (kprobe_disabled (&op->kp) && !kprobe_gone (&op->kp))arch_disarm_kprobe (&op->kp);if (kprobe_unused (&op->kp)) {/*
@@ -784,14 +782,13 @@ static void kill_optimized_kprobe(struct op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED ;if (kprobe_unused (p)) { -/* Enqueue if it is unused */ -list_add (&op->list, &freeing_list);/* -* Remove unused probes from the hash list. After waiting -* for synchronization, this probe is reclaimed. -* (reclaiming is done by do_free_cleaned_kprobes().) +* Unused kprobe is on unoptimizing or freeing list. We move it +* to freeing_list and let the kprobe_optimizer() remove it from +* the kprobe hash list and free it. */ -hlist_del_rcu (&op->kp.hlist); +if (optprobe_queued_unopt (op)) +list_move (&op->list, &freeing_list); }/* Don't touch the code, because it is already freed. */
Greg Kroah-Hartman
maintainerPATCH 207/286 net: ethernet: mtk_eth_soc: remove duplicate if statements
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
It seems that there was something wrong with backport, causing if (err) to appear twice in the same place.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +0 -1
@@ -2302,7 +2302,6 @@ static int mtk_open(struct net_device *dif (!refcount_read (ð->dma_refcnt)) {int err =mtk_start_dma (eth); -if (err)if (err) {phylink_disconnect_phy (mac->phylink);return err;
Greg Kroah-Hartman
maintainerPATCH 208/286 xen-netback: dont produce zero-size SKB frags
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit c7ec4f2d684e17d69bbdd7c4324db0ef5daac26a upstream.
While frontends may submit zero-size requests (wasting a precious slot), core networking code as of at least 3ece782693c4b ("sock: skb_copy_ubufs support for compound pages") can't deal with SKBs when they have all zero-size fragments. Respond to empty requests right when populating fragments; all further processing is fragment based and hence won't encounter these empty requests anymore.
In a way this should have been that way from the beginning: When no data is to be transferred for a particular request, there's not even a point in validating the respective grant ref. That's no different from e.g. passing NULL into memcpy() when at the same time the size is 0.
This is XSA-448 / CVE-2023-46838.
--- drivers/net/xen-netback/netback.c | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-)
drivers/net/xen-netback/netback.c +38 -6
@@ -463,12 +463,25 @@ static void xenvif_get_requests(struct x }for (shinfo->nr_frags =0 ; nr_slots >0 && shinfo->nr_frags <MAX_SKB_FRAGS ; - shinfo->nr_frags++, gop++, nr_slots--) { + nr_slots--) { +if (unlikely (!txp->size)) { +unsigned long flags; + +spin_lock_irqsave (&queue->response_lock, flags); +make_tx_response (queue, txp,0 ,XEN_NETIF_RSP_OKAY ); +push_tx_responses (queue); +spin_unlock_irqrestore (&queue->response_lock, flags); + ++txp; +continue ; + } + index =pending_index (queue->pending_cons++); pending_idx = queue->pending_ring[index];xenvif_tx_create_map_op (queue, pending_idx, txp, txp == first ? extra_count :0 , gop);frag_set_pending_idx (&frags[shinfo->nr_frags], pending_idx); + ++shinfo->nr_frags; + ++gop;if (txp == first) txp = txfrags;
@@ -481,20 +494,39 @@ static void xenvif_get_requests(struct x shinfo =skb_shinfo (nskb); frags = shinfo->frags; -for (shinfo->nr_frags =0 ; shinfo->nr_frags < nr_slots; - shinfo->nr_frags++, txp++, gop++) { +for (shinfo->nr_frags =0 ; shinfo->nr_frags < nr_slots; ++txp) { +if (unlikely (!txp->size)) { +unsigned long flags; + +spin_lock_irqsave (&queue->response_lock, flags); +make_tx_response (queue, txp,0 , +XEN_NETIF_RSP_OKAY ); +push_tx_responses (queue); +spin_unlock_irqrestore (&queue->response_lock, + flags); +continue ; + } + index =pending_index (queue->pending_cons++); pending_idx = queue->pending_ring[index];xenvif_tx_create_map_op (queue, pending_idx, txp,0 , gop);frag_set_pending_idx (&frags[shinfo->nr_frags], pending_idx); + ++shinfo->nr_frags; + ++gop; } -skb_shinfo (skb)->frag_list = nskb; - }else if (nskb) { +if (shinfo->nr_frags) { +skb_shinfo (skb)->frag_list = nskb; + nskb =NULL ; + } + } + +if (nskb) {/* A frag_list skb was allocated but it is no longer needed -* because enough slots were converted to copy ops above. +* because enough slots were converted to copy ops above or some +* were empty. */ kfree_skb (nskb); }
Greg Kroah-Hartman
maintainerPATCH 209/286 binder: fix race between mmput() and do_exit()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 9a9ab0d963621d9d12199df9817e66982582d5a5 upstream.
Task A calls binder_update_page_range() to allocate and insert pages on a remote address space from Task B. For this, Task A pins the remote mm via mmget_not_zero() first. This can race with Task B do_exit() and the final mmput() refcount decrement will come from Task A.
Task A | Task B
------------------+------------------
mmget_not_zero() |
| do_exit()
| exit_mm()
| mmput()
mmput() |
exit_mmap() |
remove_vma() |
fput() |In this case, the work of ____fput() from Task B is queued up in Task A as TWA_RESUME. So in theory, Task A returns to userspace and the cleanup work gets executed. However, Task A instead sleep, waiting for a reply from Task B that never comes (it's dead).
This means the binder_deferred_release() is blocked until an unrelated binder event forces Task A to go back to userspace. All the associated death notifications will also be delayed until then.
In order to fix this use mmput_async() that will schedule the work in the corresponding mm->async_put_work WQ instead of Task A.
--- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder_alloc.c +2 -2
@@ -271,7 +271,7 @@ static int binder_update_page_range(stru }if (mm) {mmap_write_unlock (mm); -mmput (mm); +mmput_async (mm); }return 0 ;
@@ -304,7 +304,7 @@ err_page_ptr_cleared: err_no_vma:if (mm) {mmap_write_unlock (mm); -mmput (mm); +mmput_async (mm); }return vma ? -ENOMEM : -ESRCH ; }
Greg Kroah-Hartman
maintainerPATCH 210/286 tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit 71fee48fb772ac4f6cfa63dbebc5629de8b4cc09 upstream.
When offlining and onlining CPUs the overall reported idle and iowait times as reported by /proc/stat jump backward and forward:
cpu 132 0 176 225249 47 6 6 21 0 0
cpu0 80 0 115 112575 33 3 4 18 0 0
cpu1 52 0 60 112673 13 3 1 2 0 0
cpu 133 0 177 226681 47 6 6 21 0 0
cpu0 80 0 116 113387 33 3 4 18 0 0
cpu 133 0 178 114431 33 6 6 21 0 0 <---- jump backward cpu0 80 0 116 114247 33 3 4 18 0 0
cpu1 52 0 61 183 0 3 1 2 0 0 <---- idle + iowait start with 0
cpu 133 0 178 228956 47 6 6 21 0 0 <---- jump forward cpu0 81 0 117 114929 33 3 4 18 0 0
Reason for this is that get_idle_time() in fs/proc/stat.c has different sources for both values depending on if a CPU is online or offline:
- if a CPU is online the values may be taken from its per cpu tick_cpu_sched structure
- if a CPU is offline the values are taken from its per cpu cpustat structure
The problem is that the per cpu tick_cpu_sched structure is set to zero on CPU offline. See tick_cancel_sched_timer() in kernel/time/tick-sched.c.
Therefore when a CPU is brought offline and online afterwards both its idle and iowait sleeptime will be zero, causing a jump backward in total system idle and iowait sleeptime. In a similar way if a CPU is then brought offline again the total idle and iowait sleeptimes will jump forward.
It looks like this behavior was introduced with commit 4b0c0f294f60 ("tick: Cleanup NOHZ per cpu data on cpu down").
This was only noticed now on s390, since we switched to generic idle time reporting with commit be76ea614460 ("s390/idle: remove arch_cpu_idle_time() and corresponding code").
Fix this by preserving the values of idle_sleeptime and iowait_sleeptime members of the per-cpu tick_sched structure on CPU hotplug.
--- kernel/time/tick-sched.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/time/tick-sched.c +5 -0
@@ -1439,13 +1439,18 @@ void tick_setup_sched_timer(void)void tick_cancel_sched_timer (int cpu) {struct tick_sched *ts = &per_cpu (tick_cpu_sched, cpu); +ktime_t idle_sleeptime, iowait_sleeptime;# ifdef CONFIG_HIGH_RES_TIMERS if (ts->sched_timer.base)hrtimer_cancel (&ts->sched_timer);# endif + idle_sleeptime = ts->idle_sleeptime; + iowait_sleeptime = ts->iowait_sleeptime;memset (ts,0 ,sizeof (*ts)); + ts->idle_sleeptime = idle_sleeptime; + ts->iowait_sleeptime = iowait_sleeptime; }#endif
Greg Kroah-Hartman
maintainerPATCH 211/286 usb: phy: mxs: remove CONFIG_USB_OTG condition for mxs_phy_is_otg_host()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit ff2b89de471da942a4d853443688113a44fd35ed upstream.
When CONFIG_USB_OTG is not set, mxs_phy_is_otg_host() will always return false. This behaviour is wrong. Since phy.last_event will always be set for either host or device mode. Therefore, CONFIG_USB_OTG condition can be removed.
--- drivers/usb/phy/phy-mxs-usb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +1 -2
@@ -388,8 +388,7 @@ static void __mxs_phy_disconnect_line(ststatic bool mxs_phy_is_otg_host (struct mxs_phy *mxs_phy) { -return IS_ENABLED (CONFIG_USB_OTG ) && - mxs_phy->phy.last_event ==USB_EVENT_ID ; +return mxs_phy->phy.last_event ==USB_EVENT_ID ; }static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on)
Greg Kroah-Hartman
maintainerPATCH 212/286 usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uttkarsh Aggarwal <[email protected]>
commit e9d40b215e38480fd94c66b06d79045717a59e9c upstream.
Current implementation blocks the running operations when Plug-out and Plug-In is performed continuously, process gets stuck in dwc3_thread_interrupt().
Code Flow:
CPU1 ->Gadget_start ->dwc3_interrupt ->dwc3_thread_interrupt ->dwc3_process_event_buf ->dwc3_process_event_entry ->dwc3_endpoint_interrupt ->dwc3_ep0_interrupt ->dwc3_ep0_inspect_setup ->dwc3_ep0_stall_and_restart
By this time if pending_list is not empty, it will get the next request on the given list and calls dwc3_gadget_giveback which will unmap request and call its complete() callback to notify upper layers that it has completed. Currently dwc3_gadget_giveback status is set to -ECONNRESET, whereas it should be -ESHUTDOWN based on condition if not dwc->connected is true.
--- drivers/usb/dwc3/ep0.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/dwc3/ep0.c +4 -1
@@ -236,7 +236,10 @@ static void dwc3_ep0_stall_and_restart(sstruct dwc3_request *req; req =next_request (&dep->pending_list); -dwc3_gadget_giveback (dep, req, -ECONNRESET ); +if (!dwc->connected) +dwc3_gadget_giveback (dep, req, -ESHUTDOWN ); +else +dwc3_gadget_giveback (dep, req, -ECONNRESET ); } dwc->ep0state =EP0_SETUP_PHASE ;
Greg Kroah-Hartman
maintainerPATCH 213/286 Revert "usb: dwc3: Soft reset phy on probe for host"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit 7059fbebcb00554c3f31e5b5d93ef6d2d96dc7b4 upstream.
This reverts commit 8bea147dfdf823eaa8d3baeccc7aeb041b41944b.
The phy soft reset GUSB2PHYCFG.PHYSOFTRST only applies to UTMI phy, not ULPI. This fix is incomplete.
--- drivers/usb/dwc3/core.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-)
drivers/usb/dwc3/core.c +1 -38
@@ -277,46 +277,9 @@ int dwc3_core_soft_reset(struct dwc3 *dw* XHCI driver will reset the host block. If dwc3 was configured for * host-only mode or current role is host, then we can return early. */ -if (dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST ) +if (dwc->dr_mode ==USB_DR_MODE_HOST || dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST )return 0 ; -/* -* If the dr_mode is host and the dwc->current_dr_role is not the -* corresponding DWC3_GCTL_PRTCAP_HOST, then the dwc3_core_init_mode -* isn't executed yet. Ensure the phy is ready before the controller -* updates the GCTL.PRTCAPDIR or other settings by soft-resetting -* the phy. -* -* Note: GUSB3PIPECTL[n] and GUSB2PHYCFG[n] are port settings where n -* is port index. If this is a multiport host, then we need to reset -* all active ports. -*/ -if (dwc->dr_mode ==USB_DR_MODE_HOST ) { -u32 usb3_port; -u32 usb2_port; - - usb3_port =dwc3_readl (dwc->regs,DWC3_GUSB3PIPECTL (0 )); - usb3_port |=DWC3_GUSB3PIPECTL_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), usb3_port); - - usb2_port =dwc3_readl (dwc->regs,DWC3_GUSB2PHYCFG (0 )); - usb2_port |=DWC3_GUSB2PHYCFG_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), usb2_port); - -/* Small delay for phy reset assertion */ -usleep_range (1000 ,2000 ); - - usb3_port &= ~DWC3_GUSB3PIPECTL_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB3PIPECTL (0 ), usb3_port); - - usb2_port &= ~DWC3_GUSB2PHYCFG_PHYSOFTRST ; -dwc3_writel (dwc->regs,DWC3_GUSB2PHYCFG (0 ), usb2_port); - -/* Wait for clock synchronization */ -msleep (50 ); -return 0 ; - } - reg =dwc3_readl (dwc->regs,DWC3_DCTL ); reg |=DWC3_DCTL_CSFTRST ; reg &= ~DWC3_DCTL_RUN_STOP ;
Greg Kroah-Hartman
maintainerPATCH 214/286 Revert "usb: dwc3: dont reset device side if dwc3 was configured as host-only"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thinh Nguyen <[email protected]>
commit afe28cd686aeb77e8d9140d50fb1cf06a7ecb731 upstream.
This reverts commit e835c0a4e23c38531dcee5ef77e8d1cf462658c7.
Don't omit soft-reset. During initialization, the driver may need to perform a soft reset to ensure the phy is ready when the controller updates the GCTL.PRTCAPDIR or other settings by issuing phy soft-reset. Many platforms often have access to DCTL register for soft-reset despite being host-only. If there are actual reported issues from the platforms that don't expose DCTL registers, then we will need to revisit (perhaps to teach dwc3 to perform xhci's soft-reset USBCMD.HCRST).
--- drivers/usb/dwc3/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.c +2 -2
@@ -275,9 +275,9 @@ int dwc3_core_soft_reset(struct dwc3 *dw/* * We're resetting only the device side because, if we're in host mode, * XHCI driver will reset the host block. If dwc3 was configured for -* host-only mode or current role is host, then we can return early. +* host-only mode, then we can return early. */ -if (dwc->dr_mode ==USB_DR_MODE_HOST || dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST ) +if (dwc->current_dr_role ==DWC3_GCTL_PRTCAP_HOST )return 0 ; reg =dwc3_readl (dwc->regs,DWC3_DCTL );
Greg Kroah-Hartman
maintainerPATCH 215/286 usb: chipidea: wait controller resume finished for wakeup irq
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 128d849074d05545becf86e713715ce7676fc074 upstream.
After the chipidea driver introduce extcon for id and vbus, it's able to wakeup from another irq source, in case the system with extcon ID cable, wakeup from usb ID cable and device removal, the usb device disconnect irq may come firstly before the extcon notifier while system resume, so we will get 2 "wakeup" irq, one for usb device disconnect; and one for extcon ID cable change(real wakeup event), current driver treat them as 2 successive wakeup irq so can't handle it correctly, then finally the usb irq can't be enabled. This patch adds a check to bypass further usb events before controller resume finished to fix it.
--- drivers/usb/chipidea/core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/chipidea/core.c +7 -0
@@ -516,6 +516,13 @@ static irqreturn_t ci_irq_handler(int iru32 otgsc =0 ;if (ci->in_lpm) { +/* +* If we already have a wakeup irq pending there, +* let's just return to wait resume finished firstly. +*/ +if (ci->wakeup_int) +return IRQ_HANDLED ; +disable_irq_nosync (irq); ci->wakeup_int = true;pm_runtime_get (ci->dev);
Greg Kroah-Hartman
maintainerPATCH 216/286 Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs"
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
commit 9c6b789e954fae73c548f39332bcc56bdf0d4373 upstream.
This reverts commit b17b7fe6dd5c6ff74b38b0758ca799cdbb79e26e.
That commit messed up the reference counting, so it needs to be rethought.
--- drivers/usb/typec/class.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/typec/class.c +2 -3
@@ -194,7 +194,7 @@ static void typec_altmode_put_partner(stif (!partner)return ; - adev = &altmode->adev; + adev = &partner->adev;if (is_typec_plug (adev->dev.parent)) {struct typec_plug *plug =to_typec_plug (adev->dev.parent);
@@ -424,8 +424,7 @@ static void typec_altmode_release(struct {struct altmode *alt =to_altmode (to_typec_altmode (dev)); -if (!is_typec_port (dev->parent)) -typec_altmode_put_partner (alt); +typec_altmode_put_partner (alt);altmode_id_remove (alt->adev.dev.parent, alt->id);kfree (alt);
Greg Kroah-Hartman
maintainerPATCH 217/286 usb: typec: class: fix typec_altmode_put_partner to put plugs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit 5962ded777d689cd8bf04454273e32228d7fb71f upstream.
When typec_altmode_put_partner is called by a plug altmode upon release, the port altmode the plug belongs to will not remove its reference to the plug. The check to see if the altmode being released is a plug evaluates against the released altmode's partner instead of the calling altmode, so change adev in typec_altmode_put_partner to properly refer to the altmode being released.
Because typec_altmode_set_partner calls get_device() on the port altmode, add partner_adev that points to the port altmode in typec_put_partner to call put_device() on. typec_altmode_set_partner is not called for port altmodes, so add a check in typec_altmode_release to prevent typec_altmode_put_partner() calls on port altmode release.
--- drivers/usb/typec/class.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/typec/class.c +6 -3
@@ -190,11 +190,13 @@ static void typec_altmode_put_partner(st {struct altmode *partner = altmode->partner;struct typec_altmode *adev; +struct typec_altmode *partner_adev;if (!partner)return ; - adev = &partner->adev; + adev = &altmode->adev; + partner_adev = &partner->adev;if (is_typec_plug (adev->dev.parent)) {struct typec_plug *plug =to_typec_plug (adev->dev.parent);
@@ -203,7 +205,7 @@ static void typec_altmode_put_partner(st }else { partner->partner =NULL ; } -put_device (&adev->dev); +put_device (&partner_adev->dev); }/**
@@ -424,7 +426,8 @@ static void typec_altmode_release(struct {struct altmode *alt =to_altmode (to_typec_altmode (dev)); -typec_altmode_put_partner (alt); +if (!is_typec_port (dev->parent)) +typec_altmode_put_partner (alt);altmode_id_remove (alt->adev.dev.parent, alt->id);kfree (alt);
Greg Kroah-Hartman
maintainerPATCH 218/286 usb: mon: Fix atomicity violation in mon_bin_vma_fault
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
commit 2dd23cc4d0e6aa55cf9fb3b05f2f4165b01de81c upstream.
In mon_bin_vma_fault():
offset = vmf->pgoff << PAGE_SHIFT;
if (offset >= rp->b_size)
return VM_FAULT_SIGBUS;
chunk_idx = offset / CHUNK_SIZE;
pageptr = rp->b_vec[chunk_idx].pg;The code is executed without holding any lock.
In mon_bin_vma_close():
spin_lock_irqsave(&rp->b_lock, flags);
rp->mmap_active--;
spin_unlock_irqrestore(&rp->b_lock, flags);In mon_bin_ioctl():
spin_lock_irqsave(&rp->b_lock, flags);
if (rp->mmap_active) {
...
} else {
...
kfree(rp->b_vec);
rp->b_vec = vec;
rp->b_size = size;
...
}
spin_unlock_irqrestore(&rp->b_lock, flags);Concurrent execution of mon_bin_vma_fault() with mon_bin_vma_close() and mon_bin_ioctl() could lead to atomicity violations. mon_bin_vma_fault() accesses rp->b_size and rp->b_vec without locking, risking array out-of-bounds access or use-after-free bugs due to possible modifications in mon_bin_ioctl().
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 6.2.
To address this issue, it is proposed to add a spin lock pair in mon_bin_vma_fault() to ensure atomicity. With this patch applied, our tool never reports the possible bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
--- drivers/usb/mon/mon_bin.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/mon/mon_bin.c +6 -1
@@ -1247,14 +1247,19 @@ static vm_fault_t mon_bin_vma_fault(strustruct mon_reader_bin *rp = vmf->vma->vm_private_data;unsigned long offset, chunk_idx;struct page *pageptr; +unsigned long flags; +spin_lock_irqsave (&rp->b_lock, flags); offset = vmf->pgoff <<PAGE_SHIFT ; -if (offset >= rp->b_size) +if (offset >= rp->b_size) { +spin_unlock_irqrestore (&rp->b_lock, flags);return VM_FAULT_SIGBUS ; + } chunk_idx = offset /CHUNK_SIZE ; pageptr = rp->b_vec[chunk_idx].pg;get_page (pageptr); vmf->page = pageptr; +spin_unlock_irqrestore (&rp->b_lock, flags);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 219/286 serial: imx: Ensure that imx_uart_rs485_config() is called with enabled clock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Niedermaier <[email protected]>
commit 7c45eaa813476bd195ac1227a64b52f9cf2e2030 upstream.
There are register accesses in the function imx_uart_rs485_config(). The clock must be enabled for these accesses. This was ensured by calling it via the function uart_rs485_config() in the probe() function within the range where the clock is enabled. With the commit 7c7f9bc986e6 ("serial:
Deassert Transmit Enable on probe in driver-specific way") it was removed from the probe() function and is now only called through the function uart_add_one_port() which is located at the end of the probe() function. But the clock is already switched off in this area. To ensure that the clock is enabled during register access, move the disabling of the clock to the very end of the probe() function. To avoid leaking enabled clocks on error also add an error path for exiting with disabling the clock.
--- drivers/tty/serial/imx.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/tty/serial/imx.c +12 -11
@@ -2358,10 +2358,8 @@ static int imx_uart_probe(struct platfor sport->ufcr =readl (sport->port.membase +UFCR ); ret =uart_get_rs485_mode (&sport->port); -if (ret) { -clk_disable_unprepare (sport->clk_ipg); -return ret; - } +if (ret) + goto err_clk;if (sport->port.rs485.flags &SER_RS485_ENABLED && (!sport->have_rtscts && !sport->have_rtsgpio))
@@ -2415,8 +2413,6 @@ static int imx_uart_probe(struct platforimx_uart_writel (sport, ucr3,UCR3 ); } -clk_disable_unprepare (sport->clk_ipg); -hrtimer_init (&sport->trigger_start_tx,CLOCK_MONOTONIC ,HRTIMER_MODE_REL );hrtimer_init (&sport->trigger_stop_tx,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); sport->trigger_start_tx.function = imx_trigger_start_tx;
@@ -2432,7 +2428,7 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request rx irq: %d\n" , ret); -return ret; + goto err_clk; } ret = devm_request_irq(&pdev->dev, txirq, imx_uart_txint, 0,
@@ -2440,7 +2436,7 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request tx irq: %d\n" , ret); -return ret; + goto err_clk; } ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
@@ -2448,14 +2444,14 @@ static int imx_uart_probe(struct platforif (ret) {dev_err (&pdev->dev,"failed to request rts irq: %d\n" , ret); -return ret; + goto err_clk; } }else { ret =devm_request_irq (&pdev->dev, rxirq, imx_uart_int,0 ,dev_name (&pdev->dev), sport);if (ret) {dev_err (&pdev->dev,"failed to request irq: %d\n" , ret); -return ret; + goto err_clk; } }
@@ -2463,7 +2459,12 @@ static int imx_uart_probe(struct platforplatform_set_drvdata (pdev, sport); -return uart_add_one_port (&imx_uart_uart_driver, &sport->port); + ret =uart_add_one_port (&imx_uart_uart_driver, &sport->port); + +err_clk: +clk_disable_unprepare (sport->clk_ipg); + +return ret; }static int imx_uart_remove (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 220/286 ALSA: oxygen: Fix right channel of capture volume mixer
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit a03cfad512ac24a35184d7d87ec0d5489e1cb763 upstream.
There was a typo in oxygen mixer code that didn't update the right channel value properly for the capture volume. Let's fix it.
This trivial fix was originally reported on Bugzilla.
--- sound/pci/oxygen/oxygen_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/oxygen/oxygen_mixer.c +1 -1
@@ -718,7 +718,7 @@ static int ac97_fp_rec_volume_put(struct oldreg =oxygen_read_ac97 (chip,1 ,AC97_REC_GAIN ); newreg = oldreg & ~0x0707 ; newreg = newreg | (value->value.integer.value[0 ] &7 ); - newreg = newreg | ((value->value.integer.value[0 ] &7 ) <<8 ); + newreg = newreg | ((value->value.integer.value[1 ] &7 ) <<8 ); change = newreg != oldreg;if (change)oxygen_write_ac97 (chip,1 ,AC97_REC_GAIN , newreg);
Greg Kroah-Hartman
maintainerPATCH 221/286 ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq2xxx
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Çağhan Demir <[email protected]>
commit bc7863d18677df66b2c7a0e172c91296ff380f11 upstream.
This HP Laptop uses ALC236 codec with COEF 0x07 idx 1 controlling the mute LED. This patch enables the already existing quirk for this device.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9034,6 +9034,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f5 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87f6 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ), +SND_PCI_QUIRK (0x103c ,0x87fe ,"HP Laptop 15s-fq2xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x8805 ,"HP ProBook 650 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x880d ,"HP EliteBook 830 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8811, "HP Spectre x360 15-eb1xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),
Greg Kroah-Hartman
maintainerPATCH 222/286 fbdev: flush deferred work in fb_deferred_io_fsync()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
commit 15e4c1f462279b4e128f27de48133e0debe9e0df upstream.
The driver's fsync() is supposed to flush any pending operation to hardware. It is implemented in this driver by cancelling the queued deferred IO first, then schedule it for "immediate execution" by calling schedule_delayed_work() again with delay=0. However, setting delay=0 only means the work is scheduled immediately, it does not mean the work is executed immediately. There is no guarantee that the work is finished after schedule_delayed_work() returns. After this driver's fsync() returns, there can still be pending work. Furthermore, if close() is called by users immediately after fsync(), the pending work gets cancelled and fsync() may do nothing.
To ensure that the deferred IO completes, use flush_delayed_work() instead. Write operations to this driver either write to the device directly, or invoke schedule_delayed_work(); so by flushing the workqueue, it can be guaranteed that all previous writes make it to the device.
--- drivers/video/fbdev/core/fb_defio.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/video/fbdev/core/fb_defio.c +1 -5
@@ -78,11 +78,7 @@ int fb_deferred_io_fsync(struct file *fireturn 0 ;inode_lock (inode); -/* Kill off the delayed work */ -cancel_delayed_work_sync (&info->deferred_work); - -/* Run it immediately */ -schedule_delayed_work (&info->deferred_work,0 ); +flush_delayed_work (&info->deferred_work);inode_unlock (inode);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 223/286 pwm: jz4740: Dont use dev_err_probe() in .request()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
commit 9320fc509b87b4d795fb37112931e2f4f8b5c55f upstream.
dev_err_probe() is only supposed to be used in probe functions. While it probably doesn't hurt, both the EPROBE_DEFER handling and calling device_set_deferred_probe_reason() are conceptually wrong in the request callback. So replace the call by dev_err() and a separate return statement.
This effectively reverts commit c0bfe9606e03 ("pwm: jz4740: Simplify with dev_err_probe()").
--- drivers/pwm/pwm-jz4740.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/pwm/pwm-jz4740.c +4 -3
@@ -60,9 +60,10 @@ static int jz4740_pwm_request(struct pwmsnprintf (name,sizeof (name),"timer%u" , pwm->hwpwm); clk =clk_get (chip->dev, name); -if (IS_ERR (clk)) -return dev_err_probe (chip->dev,PTR_ERR (clk), -"Failed to get clock\n" ); +if (IS_ERR (clk)) { +dev_err (chip->dev,"error %pe: Failed to get clock\n" , clk); +return PTR_ERR (clk); + } err =clk_prepare_enable (clk);if (err <0 ) {
Greg Kroah-Hartman
maintainerPATCH 224/286 io_uring/rw: ensure io->bytes_done is always initialized
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 0a535eddbe0dc1de4386046ab849f08aeb2f8faf upstream.
If IOSQE_ASYNC is set and we fail importing an iovec for a readv or writev request, then we leave ->bytes_done uninitialized and hence the eventual failure CQE posted can potentially have a random res value rather than the expected -EINVAL.
Setup ->bytes_done before potentially failing, so we have a consistent value if we fail the request early.
--- io_uring/io_uring.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
io_uring/io_uring.c +6 -3
@@ -3485,14 +3485,17 @@ static inline int io_rw_prep_async(strucstruct iovec *iov = iorw->fast_iov;int ret; + iorw->bytes_done =0 ; + iorw->free_iovec =NULL ; + ret =io_import_iovec (rw, req, &iov, &iorw->iter, false);if (unlikely (ret <0 ))return ret; - iorw->bytes_done =0 ; - iorw->free_iovec = iov; -if (iov) +if (iov) { + iorw->free_iovec = iov; req->flags |=REQ_F_NEED_CLEANUP ; + }iov_iter_save_state (&iorw->iter, &iorw->iter_state);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 225/286 rootfs: Fix support for rootfstype= when root= is given
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Berger <[email protected]>
commit 21528c69a0d8483f7c6345b1a0bc8d8975e9a172 upstream.
Documentation/filesystems/ramfs-rootfs-initramfs.rst states:
If CONFIG_TMPFS is enabled, rootfs will use tmpfs instead of ramfs by default. To force ramfs, add "rootfstype=ramfs" to the kernel command line.
This currently does not work when root= is provided since then saved_root_name contains a string and rootfstype= is ignored. Therefore, ramfs is currently always chosen when root= is provided.
The current behavior for rootfs's filesystem is:
root= | rootfstype= | chosen rootfs filesystem
------------+-------------+--------------------------
unspecified | unspecified | tmpfs
unspecified | tmpfs | tmpfs
unspecified | ramfs | ramfs
provided | ignored | ramfsrootfstype= should be respected regardless whether root= is given, as shown below:
root= | rootfstype= | chosen rootfs filesystem
------------+-------------+--------------------------
unspecified | unspecified | tmpfs (as before)
unspecified | tmpfs | tmpfs (as before)
unspecified | ramfs | ramfs (as before)
provided | unspecified | ramfs (compatibility with before)
provided | tmpfs | tmpfs (new)
provided | ramfs | ramfs (new)This table represents the new behavior.
--- init/do_mounts.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
init/do_mounts.c +6 -3
@@ -649,7 +649,10 @@ struct file_system_type rootfs_fs_type =void __init init_rootfs (void ) { -if (IS_ENABLED (CONFIG_TMPFS ) && !saved_root_name[0 ] && - (!root_fs_names ||strstr (root_fs_names,"tmpfs" ))) - is_tmpfs = true; +if (IS_ENABLED (CONFIG_TMPFS )) { +if (!saved_root_name[0 ] && !root_fs_names) + is_tmpfs = true; +else if (root_fs_names && !!strstr (root_fs_names,"tmpfs" )) + is_tmpfs = true; + } }
Greg Kroah-Hartman
maintainerPATCH 226/286 Bluetooth: Fix atomicity violation in {min,max}_key_size_set
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
commit da9065caa594d19b26e1a030fd0cc27bd365d685 upstream.
In min_key_size_set():
if (val > hdev->le_max_key_size || val < SMP_MIN_ENC_KEY_SIZE)
return -EINVAL;
hci_dev_lock(hdev);
hdev->le_min_key_size = val;
hci_dev_unlock(hdev);In max_key_size_set():
if (val > SMP_MAX_ENC_KEY_SIZE || val < hdev->le_min_key_size)
return -EINVAL;
hci_dev_lock(hdev);
hdev->le_max_key_size = val;
hci_dev_unlock(hdev);The atomicity violation occurs due to concurrent execution of set_min and set_max funcs.Consider a scenario where setmin writes a new, valid 'min' value, and concurrently, setmax writes a value that is greater than the old 'min' but smaller than the new 'min'. In this case, setmax might check against the old 'min' value (before acquiring the lock) but write its value after the 'min' has been updated by setmin. This leads to a situation where the 'max' value ends up being smaller than the 'min' value, which is an inconsistency.
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 5.17.
To resolve this issue, it is suggested to encompass the validity checks within the locked sections in both set_min and set_max funcs. The modification ensures that the validation of 'val' against the current min/max values is atomic, thus maintaining the integrity of the settings. With this patch applied, our tool no longer reports the bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
--- net/bluetooth/hci_debugfs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/bluetooth/hci_debugfs.c +8 -4
@@ -994,10 +994,12 @@ static int min_key_size_set(void *data, {struct hci_dev *hdev = data; -if (val > hdev->le_max_key_size || val <SMP_MIN_ENC_KEY_SIZE ) +hci_dev_lock (hdev); +if (val > hdev->le_max_key_size || val <SMP_MIN_ENC_KEY_SIZE ) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_min_key_size = val;hci_dev_unlock (hdev);
@@ -1022,10 +1024,12 @@ static int max_key_size_set(void *data, {struct hci_dev *hdev = data; -if (val >SMP_MAX_ENC_KEY_SIZE || val < hdev->le_min_key_size) +hci_dev_lock (hdev); +if (val >SMP_MAX_ENC_KEY_SIZE || val < hdev->le_min_key_size) { +hci_dev_unlock (hdev);return -EINVAL ; + } -hci_dev_lock (hdev); hdev->le_max_key_size = val;hci_dev_unlock (hdev);
Greg Kroah-Hartman
maintainerPATCH 227/286 iommu/arm-smmu-qcom: Add missing GMU entry to match table
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
commit afc95681c3068956fed1241a1ff1612c066c75ac upstream.
In some cases the firmware expects cbndx 1 to be assigned to the GMU, so we also want the default domain for the GMU to be an identy domain. This way it does not get a context bank assigned. Without this, both of_dma_configure() and drm/msm's iommu_domain_attach() will trigger allocating and configuring a context bank. So GMU ends up attached to both cbndx 1 and later cbndx 2. This arrangement seemingly confounds and surprises the firmware if the GPU later triggers a translation fault, resulting (on sc8280xp / lenovo x13s, at least) in the SMMU getting wedged and the GPU stuck without memory access.
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +1 -0
@@ -21,6 +21,7 @@ static struct qcom_smmu *to_qcom_smmu(ststatic const struct of_device_id qcom_smmu_client_of_match[]__maybe_unused = { { .compatible ="qcom,adreno" }, + { .compatible ="qcom,adreno-gmu" }, { .compatible ="qcom,mdp4" }, { .compatible ="qcom,mdss" }, { .compatible ="qcom,sc7180-mdss" },
Greg Kroah-Hartman
maintainerPATCH 228/286 wifi: rtlwifi: Remove bogus and dangerous ASPM disable/enable code
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit b3943b3c2971444364e03224cfc828c5789deada upstream.
Ever since introduction in the commit 0c8173385e54 ("rtl8192ce: Add new driver") the rtlwifi code has, according to comments, attempted to disable/enable ASPM of the upstream bridge by writing into its LNKCTL register. However, the code has never been correct because it performs the writes to the device instead of the upstream bridge.
Worse yet, the offset where the PCIe capabilities reside is derived from the offset of the upstream bridge. As a result, the write will use an offset on the device that does not relate to the LNKCTL register making the ASPM disable/enable code outright dangerous.
Because of those problems, there is no indication that the driver needs disable/enable ASPM on the upstream bridge. As the Capabilities offset is not correctly calculated for the write to target device's LNKCTL register, the code is not disabling/enabling device's ASPM either. Therefore, just remove the upstream bridge related ASPM disable/enable code entirely.
The upstream bridge related ASPM code was the only user of the struct mp_adapter members num4bytes, pcibridge_pciehdr_offset, and pcibridge_linkctrlreg so those are removed as well.
Note: This change does not remove the code related to changing the device's ASPM on purpose (which is independent of this flawed code related to upstream bridge's ASPM).
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 58 ----------------------------- drivers/net/wireless/realtek/rtlwifi/pci.h | 5 -- 2 files changed, 1 insertion(+), 62 deletions(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +1 -57
@@ -192,11 +192,8 @@ static void rtl_pci_disable_aspm(structstruct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor; -u8 num4bytes = pcipriv->ndis_adapter.num4bytes;/*Retrieve original configuration settings. */ u8 linkctrl_reg = pcipriv->ndis_adapter.linkctrl_reg; -u16 pcibridge_linkctrlreg = pcipriv->ndis_adapter. - pcibridge_linkctrlreg;u16 aspmlevel =0 ;u8 tmp_u1b =0 ;
@@ -221,16 +218,8 @@ static void rtl_pci_disable_aspm(struct/*Set corresponding value. */ aspmlevel |=BIT (0 ) |BIT (1 ); linkctrl_reg &= ~aspmlevel; - pcibridge_linkctrlreg &= ~(BIT (0 ) |BIT (1 ));_rtl_pci_platform_switch_device_pci_aspm (hw, linkctrl_reg); -udelay (50 ); - -/*4 Disable Pci Bridge ASPM */ -pci_write_config_byte (rtlpci->pdev, (num4bytes <<2 ), - pcibridge_linkctrlreg); - -udelay (50 ); }/*Enable RTL8192SE ASPM & Enable Pci Bridge ASPM for
@@ -245,9 +234,7 @@ static void rtl_pci_enable_aspm(struct istruct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor; -u8 num4bytes = pcipriv->ndis_adapter.num4bytes;u16 aspmlevel; -u8 u_pcibridge_aspmsetting;u8 u_device_aspmsetting;if (!ppsc->support_aspm)
@@ -259,25 +246,6 @@ static void rtl_pci_enable_aspm(struct ireturn ; } -/*4 Enable Pci Bridge ASPM */ - - u_pcibridge_aspmsetting = - pcipriv->ndis_adapter.pcibridge_linkctrlreg | - rtlpci->const_hostpci_aspm_setting; - -if (pcibridge_vendor ==PCI_BRIDGE_VENDOR_INTEL ) - u_pcibridge_aspmsetting &= ~BIT (0 ); - -pci_write_config_byte (rtlpci->pdev, (num4bytes <<2 ), - u_pcibridge_aspmsetting); - -rtl_dbg (rtlpriv,COMP_INIT ,DBG_LOUD , -"PlatformEnableASPM(): Write reg[%x] = %x\n" , - (pcipriv->ndis_adapter.pcibridge_pciehdr_offset +0x10 ), - u_pcibridge_aspmsetting); - -udelay (50 ); -/*Get ASPM level (with/without Clock Req) */ aspmlevel = rtlpci->const_devicepci_aspm_setting; u_device_aspmsetting = pcipriv->ndis_adapter.linkctrl_reg;
@@ -359,22 +327,6 @@ static bool rtl_pci_check_buddy_priv(strreturn find_buddy_priv; } -static void rtl_pci_get_linkcontrol_field (struct ieee80211_hw *hw) -{ -struct rtl_pci_priv *pcipriv =rtl_pcipriv (hw); -struct rtl_pci *rtlpci =rtl_pcidev (pcipriv); -u8 capabilityoffset = pcipriv->ndis_adapter.pcibridge_pciehdr_offset; -u8 linkctrl_reg; -u8 num4bbytes; - - num4bbytes = (capabilityoffset +0x10 ) /4 ; - -/*Read Link Control Register */ -pci_read_config_byte (rtlpci->pdev, (num4bbytes <<2 ), &linkctrl_reg); - - pcipriv->ndis_adapter.pcibridge_linkctrlreg = linkctrl_reg; -} -static void rtl_pci_parse_configuration (struct pci_dev *pdev,struct ieee80211_hw *hw) {
@@ -2035,12 +1987,6 @@ static bool _rtl_pci_find_adapter(structPCI_SLOT (bridge_pdev->devfn); pcipriv->ndis_adapter.pcibridge_funcnum =PCI_FUNC (bridge_pdev->devfn); - pcipriv->ndis_adapter.pcibridge_pciehdr_offset = -pci_pcie_cap (bridge_pdev); - pcipriv->ndis_adapter.num4bytes = - (pcipriv->ndis_adapter.pcibridge_pciehdr_offset +0x10 ) /4 ; - -rtl_pci_get_linkcontrol_field (hw);if (pcipriv->ndis_adapter.pcibridge_vendor ==PCI_BRIDGE_VENDOR_AMD ) {
@@ -2057,13 +2003,11 @@ static bool _rtl_pci_find_adapter(struct pdev->vendor, pcipriv->ndis_adapter.linkctrl_reg);rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG , -"pci_bridge busnumber:devnumber:funcnumber:vendor:pcie_cap:link_ctl_reg:amd %d:%d:%d:%x:%x:%x:%x\n" , +"pci_bridge busnumber:devnumber:funcnumber:vendor:amd %d:%d:%d:%x:%x\n" , pcipriv->ndis_adapter.pcibridge_busnum, pcipriv->ndis_adapter.pcibridge_devnum, pcipriv->ndis_adapter.pcibridge_funcnum, pcibridge_vendors[pcipriv->ndis_adapter.pcibridge_vendor], - pcipriv->ndis_adapter.pcibridge_pciehdr_offset, - pcipriv->ndis_adapter.pcibridge_linkctrlreg, pcipriv->ndis_adapter.amd_l1_patch);rtl_pci_parse_configuration (pdev, hw);
drivers/net/wireless/realtek/rtlwifi/pci.h +0 -5
@@ -236,11 +236,6 @@ struct mp_adapter {u16 pcibridge_vendorid;u16 pcibridge_deviceid; -u8 num4bytes; - -u8 pcibridge_pciehdr_offset; -u8 pcibridge_linkctrlreg; -bool amd_l1_patch; };
Greg Kroah-Hartman
maintainerPATCH 229/286 wifi: rtlwifi: Convert LNKCTL change to PCIe cap RMW accessors
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit 5894d0089cbc146063dcc0239a78ede0a8142efb upstream.
The rtlwifi driver comes with custom code to write into PCIe Link Control register. RMW access for the Link Control register requires locking that is already provided by the standard PCIe capability accessors.
Convert the custom RMW code writing into LNKCTL register to standard RMW capability accessors. The accesses are changed to cover the full LNKCTL register instead of touching just a single byte of the register.
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +15 -6
@@ -164,21 +164,29 @@ static bool _rtl_pci_platform_switch_devstruct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw)); + value &=PCI_EXP_LNKCTL_ASPMC ; +if (rtlhal->hw_type !=HARDWARE_TYPE_RTL8192SE ) - value |=0x40 ; + value |=PCI_EXP_LNKCTL_CCC ; -pci_write_config_byte (rtlpci->pdev,0x80 , value); +pcie_capability_clear_and_set_word (rtlpci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC | value, + value);return false; } -/*When we set 0x01 to enable clk request. Set 0x0 to disable clk req.*/ -static void _rtl_pci_switch_clk_req (struct ieee80211_hw *hw,u8 value) +/* @value is PCI_EXP_LNKCTL_CLKREQ_EN or 0 to enable/disable clk request. */ +static void _rtl_pci_switch_clk_req (struct ieee80211_hw *hw,u16 value) {struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw)); -pci_write_config_byte (rtlpci->pdev,0x81 , value); + value &=PCI_EXP_LNKCTL_CLKREQ_EN ; + +pcie_capability_clear_and_set_word (rtlpci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CLKREQ_EN , + value);if (rtlhal->hw_type ==HARDWARE_TYPE_RTL8192SE )udelay (100 );
@@ -259,7 +267,8 @@ static void rtl_pci_enable_aspm(struct iif (ppsc->reg_rfps_level &RT_RF_OFF_LEVL_CLK_REQ ) {_rtl_pci_switch_clk_req (hw, (ppsc->reg_rfps_level & -RT_RF_OFF_LEVL_CLK_REQ ) ?1 :0 ); +RT_RF_OFF_LEVL_CLK_REQ ) ? +PCI_EXP_LNKCTL_CLKREQ_EN :0 );RT_SET_PS_LEVEL (ppsc,RT_RF_OFF_LEVL_CLK_REQ ); }udelay (100 );
Greg Kroah-Hartman
maintainerPATCH 230/286 wifi: mwifiex: configure BSSID consistently when starting AP
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lin <[email protected]>
commit f0dd488e11e71ac095df7638d892209c629d9af2 upstream.
AP BSSID configuration is missing at AP start. Without this fix, FW returns STA interface MAC address after first init. When hostapd restarts, it gets MAC address from netdev before driver sets STA MAC to netdev again. Now MAC address between hostapd and net interface are different causes STA cannot connect to AP. After that MAC address of uap0 mlan0 become the same. And issue disappears after following hostapd restart (another issue is AP/STA MAC address become the same).
This patch fixes the issue cleanly.
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 ++ drivers/net/wireless/marvell/mwifiex/fw.h | 1 + drivers/net/wireless/marvell/mwifiex/ioctl.h | 1 + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 8 ++++++++ 4 files changed, 12 insertions(+)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +2 -0
@@ -1980,6 +1980,8 @@ static int mwifiex_cfg80211_start_ap(strmwifiex_set_sys_config_invalid_data (bss_cfg); +memcpy (bss_cfg->mac_addr, priv->curr_addr,ETH_ALEN ); +if (params->beacon_interval) bss_cfg->beacon_period = params->beacon_interval;if (params->dtim_period)
drivers/net/wireless/marvell/mwifiex/fw.h +1 -0
@@ -177,6 +177,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {#define TLV_TYPE_STA_MAC_ADDR (PROPRIETARY_TLV_BASE_ID + 32)#define TLV_TYPE_BSSID (PROPRIETARY_TLV_BASE_ID + 35)#define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42) +#define TLV_TYPE_UAP_MAC_ADDRESS (PROPRIETARY_TLV_BASE_ID + 43)#define TLV_TYPE_UAP_BEACON_PERIOD (PROPRIETARY_TLV_BASE_ID + 44)#define TLV_TYPE_UAP_DTIM_PERIOD (PROPRIETARY_TLV_BASE_ID + 45)#define TLV_TYPE_UAP_BCAST_SSID (PROPRIETARY_TLV_BASE_ID + 48)
drivers/net/wireless/marvell/mwifiex/ioctl.h +1 -0
@@ -119,6 +119,7 @@ struct mwifiex_uap_bss_param {u8 qos_info;u8 power_constraint;struct mwifiex_types_wmm_info wmm_info; +u8 mac_addr[ETH_ALEN ]; };enum {
drivers/net/wireless/marvell/mwifiex/uap_cmd.c +8 -0
@@ -479,6 +479,7 @@ void mwifiex_config_uap_11d(struct mwifistatic int mwifiex_uap_bss_param_prepare (u8 *tlv,void *cmd_buf,u16 *param_size) { +struct host_cmd_tlv_mac_addr *mac_tlv;struct host_cmd_tlv_dtim_period *dtim_period;struct host_cmd_tlv_beacon_period *beacon_period;struct host_cmd_tlv_ssid *ssid;
@@ -498,6 +499,13 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, vint i;u16 cmd_size = *param_size; + mac_tlv = (struct host_cmd_tlv_mac_addr *)tlv; + mac_tlv->header.type =cpu_to_le16 (TLV_TYPE_UAP_MAC_ADDRESS ); + mac_tlv->header.len =cpu_to_le16 (ETH_ALEN ); +memcpy (mac_tlv->mac_addr, bss_cfg->mac_addr,ETH_ALEN ); + cmd_size +=sizeof (struct host_cmd_tlv_mac_addr ); + tlv +=sizeof (struct host_cmd_tlv_mac_addr ); +if (bss_cfg->ssid.ssid_len) { ssid = (struct host_cmd_tlv_ssid *)tlv; ssid->header.type =cpu_to_le16 (TLV_TYPE_UAP_SSID );
Greg Kroah-Hartman
maintainerPATCH 231/286 x86/kvm: Do not try to disable kvmclock if it was not enabled
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kirill A. Shutemov <[email protected]>
commit 1c6d984f523f67ecfad1083bb04c55d91977bb15 upstream.
kvm_guest_cpu_offline() tries to disable kvmclock regardless if it is present in the VM. It leads to write to a MSR that doesn't exist on some configurations, namely in TDX guest:
unchecked MSR access error: WRMSR to 0x12 (tried to write 0x0000000000000000) at rIP: 0xffffffff8110687c (kvmclock_disable+0x1c/0x30)
kvmclock enabling is gated by CLOCKSOURCE and CLOCKSOURCE2 KVM paravirt features.
Do not disable kvmclock if it was not enabled.
Message-Id: <[email protected]>
--- arch/x86/kernel/kvmclock.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/x86/kernel/kvmclock.c +8 -4
@@ -24,8 +24,8 @@static int kvmclock__initdata =1 ;static int kvmclock_vsyscall__initdata =1 ; -static int msr_kvm_system_time__ro_after_init =MSR_KVM_SYSTEM_TIME ; -static int msr_kvm_wall_clock__ro_after_init =MSR_KVM_WALL_CLOCK ; +static int msr_kvm_system_time__ro_after_init ; +static int msr_kvm_wall_clock__ro_after_init ;static u64 kvm_sched_clock_offset__ro_after_init ;static int __init parse_no_kvmclock (char *arg)
@@ -196,7 +196,8 @@ static void kvm_setup_secondary_clock(vovoid kvmclock_disable (void ) { -native_write_msr (msr_kvm_system_time,0 ,0 ); +if (msr_kvm_system_time) +native_write_msr (msr_kvm_system_time,0 ,0 ); }static void __init kvmclock_init_mem (void )
@@ -292,7 +293,10 @@ void __init kvmclock_init(void)if (kvm_para_has_feature (KVM_FEATURE_CLOCKSOURCE2 )) { msr_kvm_system_time =MSR_KVM_SYSTEM_TIME_NEW ; msr_kvm_wall_clock =MSR_KVM_WALL_CLOCK_NEW ; - }else if (!kvm_para_has_feature (KVM_FEATURE_CLOCKSOURCE )) { + }else if (kvm_para_has_feature (KVM_FEATURE_CLOCKSOURCE )) { + msr_kvm_system_time =MSR_KVM_SYSTEM_TIME ; + msr_kvm_wall_clock =MSR_KVM_WALL_CLOCK ; + }else {return ; }
Greg Kroah-Hartman
maintainerPATCH 232/286 KVM: arm64: vgic-v4: Restore pending state on host userspace write
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
commit 7b95382f965133ef61ce44aaabc518c16eb46909 upstream.
When the VMM writes to ISPENDR0 to set the state pending state of an SGI, we fail to convey this to the HW if this SGI is already backed by a GICv4.1 vSGI.
This is a bit of a corner case, as this would only occur if the vgic state is changed on an already running VM, but this can apparently happen across a guest reset driven by the VMM.
Fix this by always writing out the pending_latch value to the HW, and reseting it to false.
--- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
arch/arm64/kvm/vgic/vgic-mmio-v3.c +17 -10
@@ -356,19 +356,26 @@ static int vgic_v3_uaccess_write_pendingstruct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i);raw_spin_lock_irqsave (&irq->irq_lock, flags); -if (test_bit (i, &val)) { -/* -* pending_latch is set irrespective of irq type -* (level or edge) to avoid dependency that VM should -* restore irq config before pending info. -*/ - irq->pending_latch = true; -vgic_queue_irq_unlock (vcpu->kvm, irq, flags); - }else { + +/* +* pending_latch is set irrespective of irq type +* (level or edge) to avoid dependency that VM should +* restore irq config before pending info. +*/ + irq->pending_latch =test_bit (i, &val); + +if (irq->hw &&vgic_irq_is_sgi (irq->intid)) { +irq_set_irqchip_state (irq->host_irq, +IRQCHIP_STATE_PENDING , + irq->pending_latch); irq->pending_latch = false; -raw_spin_unlock_irqrestore (&irq->irq_lock, flags); } +if (irq->pending_latch) +vgic_queue_irq_unlock (vcpu->kvm, irq, flags); +else +raw_spin_unlock_irqrestore (&irq->irq_lock, flags); +vgic_put_irq (vcpu->kvm, irq); }
Greg Kroah-Hartman
maintainerPATCH 233/286 KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Upton <[email protected]>
commit ad362fe07fecf0aba839ff2cc59a3617bd42c33f upstream.
There is a potential UAF scenario in the case of an LPI translation cache hit racing with an operation that invalidates the cache, such as a DISCARD ITS command. The root of the problem is that vgic_its_check_cache() does not elevate the refcount on the vgic_irq before dropping the lock that serializes refcount changes.
Have vgic_its_check_cache() raise the refcount on the returned vgic_irq and add the corresponding decrement after queueing the interrupt.
--- arch/arm64/kvm/vgic/vgic-its.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/kvm/vgic/vgic-its.c +5 -0
@@ -584,7 +584,11 @@ static struct vgic_irq *vgic_its_check_cunsigned long flags;raw_spin_lock_irqsave (&dist->lpi_list_lock, flags); + irq =__vgic_its_check_cache (dist, db, devid, eventid); +if (irq) +vgic_get_irq_kref (irq); +raw_spin_unlock_irqrestore (&dist->lpi_list_lock, flags);return irq;
@@ -763,6 +767,7 @@ int vgic_its_inject_cached_translation(sraw_spin_lock_irqsave (&irq->irq_lock, flags); irq->pending_latch = true;vgic_queue_irq_unlock (kvm, irq, flags); +vgic_put_irq (kvm, irq);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 234/286 iio: adc: ad7091r: Pass iio_dev to event handler
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marcelo Schmitt <[email protected]>
commit a25a7df518fc71b1ba981d691e9322e645d2689c upstream.
Previous version of ad7091r event handler received the ADC state pointer and retrieved the iio device from driver data field with dev_get_drvdata(). However, no driver data have ever been set, which led to null pointer dereference when running the event handler.
Pass the iio device to the event handler and retrieve the ADC state struct from it so we avoid the null pointer dereference and save the driver from filling the driver data field.
--- drivers/iio/adc/ad7091r-base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/adc/ad7091r-base.c +3 -3
@@ -174,8 +174,8 @@ static const struct iio_info ad7091r_infstatic irqreturn_t ad7091r_event_handler (int irq,void *private) { -struct ad7091r_state *st = (struct ad7091r_state *) private; -struct iio_dev *iio_dev =dev_get_drvdata (st->dev); +struct iio_dev *iio_dev = private; +struct ad7091r_state *st =iio_priv (iio_dev);unsigned int i, read_val;int ret;s64 timestamp =iio_get_time_ns (iio_dev);
@@ -234,7 +234,7 @@ int ad7091r_probe(struct device *dev, coif (irq) { ret =devm_request_threaded_irq (dev, irq,NULL , ad7091r_event_handler, -IRQF_TRIGGER_FALLING |IRQF_ONESHOT , name, st); +IRQF_TRIGGER_FALLING |IRQF_ONESHOT , name, iio_dev);if (ret)return ret; }
Greg Kroah-Hartman
maintainerPATCH 235/286 HID: wacom: Correct behavior when processing some confidence == false touches
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gerecke <[email protected]>
commit 502296030ec6b0329e00f9fb15018e170cc63037 upstream.
There appear to be a few different ways that Wacom devices can deal with confidence:
1. If the device looses confidence in a touch, it will first clear the tipswitch flag in one report, and then clear the confidence flag in a second report. This behavior is used by e.g. DTH-2452.
2. If the device looses confidence in a touch, it will clear both the tipswitch and confidence flags within the same report. This behavior is used by some AES devices.
3. If the device looses confidence in a touch, it will clear *only* the confidence bit. The tipswitch bit will remain set so long as the touch is tracked. This behavior may be used in future devices.
The driver does not currently handle situation 3 properly. Touches that loose confidence will remain "in prox" and essentially frozen in place until the tipswitch bit is finally cleared. Not only does this result in userspace seeing a stuck touch, but it also prevents pen arbitration from working properly (the pen won't send events until all touches are up, but we don't currently process events from non-confident touches).
This commit centralizes the checking of the confidence bit in the wacom_wac_finger_slot() function and has 'prox' depend on it. In the case where situation 3 is encountered, the treat the touch as though it was removed, allowing both userspace and the pen arbitration to act normally.
--- drivers/hid/wacom_wac.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-)
drivers/hid/wacom_wac.c +4 -28
@@ -2612,8 +2612,8 @@ static void wacom_wac_finger_slot(struct {struct hid_data *hid_data = &wacom_wac->hid_data;bool mt = wacom_wac->features.touch_max >1 ; -bool prox = hid_data->tipswitch && -report_touch_events (wacom_wac); +bool touch_down = hid_data->tipswitch && hid_data->confidence; +bool prox = touch_down &&report_touch_events (wacom_wac);if (wacom_wac->shared->has_mute_touch_switch && !wacom_wac->shared->is_touch_on) {
@@ -2652,24 +2652,6 @@ static void wacom_wac_finger_slot(struct } } -static bool wacom_wac_slot_is_active (struct input_dev *dev,int key) -{ -struct input_mt *mt = dev->mt; -struct input_mt_slot *s; - -if (!mt) -return false; - -for (s = mt->slots; s != mt->slots + mt->num_slots; s++) { -if (s->key == key && -input_mt_get_value (s,ABS_MT_TRACKING_ID ) >=0 ) { -return true; - } - } - -return false; -} -static void wacom_wac_finger_event (struct hid_device *hdev,struct hid_field *field,struct hid_usage *usage,__s32 value) {
@@ -2717,14 +2699,8 @@ static void wacom_wac_finger_event(struc }if (usage->usage_index +1 == field->report_count) { -if (equivalent_usage == wacom_wac->hid_data.last_slot_field) { -bool touch_removed =wacom_wac_slot_is_active (wacom_wac->touch_input, - wacom_wac->hid_data.id) && !wacom_wac->hid_data.tipswitch; - -if (wacom_wac->hid_data.confidence || touch_removed) { -wacom_wac_finger_slot (wacom_wac, wacom_wac->touch_input); - } - } +if (equivalent_usage == wacom_wac->hid_data.last_slot_field) +wacom_wac_finger_slot (wacom_wac, wacom_wac->touch_input); } }
Greg Kroah-Hartman
maintainerPATCH 236/286 mfd: syscon: Fix null pointer dereference in of_syscon_register()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit 41673c66b3d0c09915698fec5c13b24336f18dd1 ]
kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
--- drivers/mfd/syscon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mfd/syscon.c +4 -0
@@ -103,6 +103,10 @@ static struct syscon *of_syscon_register(struct device_node *np, bool check_clk) syscon_config.name =kasprintf (GFP_KERNEL ,"%pOFn@%llx" , np, (u64 )res.start); +if (!syscon_config.name) { + ret = -ENOMEM ; + goto err_regmap; + } syscon_config.reg_stride = reg_io_width; syscon_config.val_bits = reg_io_width *8 ; syscon_config.max_register =resource_size (&res) - reg_io_width;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/286 leds: aw2013: Select missing dependency REGMAP_I2C
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dang Huynh <[email protected]>
[ Upstream commit 75469bb0537ad2ab0fc1fb6e534a79cfc03f3b3f ]
The AW2013 driver uses devm_regmap_init_i2c, so REGMAP_I2C needs to be selected.
Otherwise build process may fail with:
ld: drivers/leds/leds-aw2013.o: in function `aw2013_probe':
leds-aw2013.c:345: undefined reference to `__devm_regmap_init_i2c'
--- drivers/leds/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/leds/Kconfig +1 -0
@@ -116,6 +116,7 @@ config LEDS_AS3645A config LEDS_AW2013 tristate "LED support for Awinic AW2013" depends on LEDS_CLASS && I2C && OF + select REGMAP_I2C help This option enables support for the AW2013 3-channel LED driver.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/286 mips: dmi: Fix early remap on MIPS32
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Serge Semin <[email protected]>
[ Upstream commit 0d0a3748a2cb38f9da1f08d357688ebd982eb788 ]
dmi_early_remap() has been defined as ioremap_cache() which on MIPS32 gets to be converted to the VM-based mapping. DMI early remapping is performed at the setup_arch() stage with no VM available. So calling the dmi_early_remap() for MIPS32 causes the system to crash at the early boot time. Fix that by converting dmi_early_remap() to the uncached remapping which is always available on both 32 and 64-bits MIPS systems.
Note this change shall not cause any regressions on the current DMI support implementation because on the early boot-up stage neither MIPS32 nor MIPS64 has the cacheable ioremapping support anyway.
--- arch/mips/include/asm/dmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/dmi.h +1 -1
@@ -5,7 +5,7 @@#include <linux/io.h> #include <linux/memblock.h> -#define dmi_early_remap (x, l) ioremap_cache(x, l) +#define dmi_early_remap (x, l) ioremap(x, l)#define dmi_early_unmap (x, l) iounmap(x)#define dmi_remap (x, l) ioremap_cache(x, l)#define dmi_unmap (x) iounmap(x)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/286 mips: Fix incorrect max_low_pfn adjustment
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Serge Semin <[email protected]>
[ Upstream commit 0f5cc249ff73552d3bd864e62f85841dafaa107d ]
max_low_pfn variable is incorrectly adjusted if the kernel is built with high memory support and the later is detected in a running system, so the memory which actually can be directly mapped is getting into the highmem zone. See the ZONE_NORMAL range on my MIPS32r5 system:
Quoted 4 lines
Zone ranges:
DMA [mem 0x0000000000000000-0x0000000000ffffff] Normal [mem 0x0000000001000000-0x0000000007ffffff] HighMem [mem 0x0000000008000000-0x000000020fffffff]
while the zones are supposed to look as follows:
Quoted 4 lines
Zone ranges:
DMA [mem 0x0000000000000000-0x0000000000ffffff] Normal [mem 0x0000000001000000-0x000000001fffffff] HighMem [mem 0x0000000020000000-0x000000020fffffff]
Even though the physical memory within the range [0x08000000;0x20000000] belongs to MMIO on our system, we don't really want it to be considered as high memory since on MIPS32 that range still can be directly mapped.
Note there might be other problems caused by the max_low_pfn variable misconfiguration. For instance high_memory variable is initialize with virtual address corresponding to the max_low_pfn PFN, and by design it must define the upper bound on direct map memory, then end of the normal zone. That in its turn potentially may cause problems in accessing the memory by means of the /dev/mem and /dev/kmem devices.
Let's fix the discovered misconfiguration then. It turns out the commit a94e4f24ec83 ("MIPS: init: Drop boot_mem_map") didn't introduce the max_low_pfn adjustment quite correct. If the kernel is built with high memory support and the system is equipped with high memory, the max_low_pfn variable will need to be initialized with PFN of the most upper directly reachable memory address so the zone normal would be correctly setup. On MIPS that PFN corresponds to PFN_DOWN(HIGHMEM_START). If the system is built with no high memory support and one is detected in the running system, we'll just need to adjust the max_pfn variable to discard the found high memory from the system and leave the max_low_pfn as is, since the later will be less than PFN_DOWN(HIGHMEM_START) anyway by design of the for_each_memblock() loop performed a bit early in the bootmem_init() method.
--- arch/mips/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/kernel/setup.c +2 -2
@@ -322,11 +322,11 @@ static void __init bootmem_init(void)panic ("Incorrect memory mapping !!!" );if (max_pfn >PFN_DOWN (HIGHMEM_START )) { + max_low_pfn =PFN_DOWN (HIGHMEM_START );#ifdef CONFIG_HIGHMEM - highstart_pfn =PFN_DOWN (HIGHMEM_START ); + highstart_pfn = max_low_pfn; highend_pfn = max_pfn;#else - max_low_pfn =PFN_DOWN (HIGHMEM_START ); max_pfn = max_low_pfn;#endif }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/286 MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 89c4b588d11e9acf01d604de4b0c715884f59213 ]
When calling spi_register_board_info(), we should pass the number of elements in 'db1200_spi_devs', not 'db1200_i2c_devs'.
--- arch/mips/alchemy/devboards/db1200.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/alchemy/devboards/db1200.c +1 -1
@@ -847,7 +847,7 @@ int __init db1200_dev_setup(void)i2c_register_board_info (0 , db1200_i2c_devs,ARRAY_SIZE (db1200_i2c_devs));spi_register_board_info (db1200_spi_devs, -ARRAY_SIZE (db1200_i2c_devs)); +ARRAY_SIZE (db1200_spi_devs));/* SWITCHES: S6.8 I2C/SPI selector (OFF=I2C ON=SPI) * S6.7 AC97/I2S selector (OFF=AC97 ON=I2S)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/286 MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 3c1e5abcda64bed0c7bffa65af2316995f269a61 ]
When calling spi_register_board_info(),
--- arch/mips/alchemy/devboards/db1550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/alchemy/devboards/db1550.c +1 -1
@@ -588,7 +588,7 @@ int __init db1550_dev_setup(void)i2c_register_board_info (0 , db1550_i2c_devs,ARRAY_SIZE (db1550_i2c_devs));spi_register_board_info (db1550_spi_devs, -ARRAY_SIZE (db1550_i2c_devs)); +ARRAY_SIZE (db1550_spi_devs)); c =clk_get (NULL ,"psc0_intclk" );if (!IS_ERR (c)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/286 power: supply: cw2015: correct time_to_empty units in sysfs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Palus <[email protected]>
[ Upstream commit f37669119423ca852ca855b24732f25c0737aa57 ]
RRT_ALRT register holds remaining battery time in minutes therefore it needs to be scaled accordingly when exposing TIME_TO_EMPTY via sysfs expressed in seconds
--- drivers/power/supply/cw2015_battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/power/supply/cw2015_battery.c +1 -1
@@ -490,7 +490,7 @@ static int cw_battery_get_property(struct power_supply *psy,case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW :if (cw_battery_valid_time_to_empty (cw_bat)) - val->intval = cw_bat->time_to_empty; + val->intval = cw_bat->time_to_empty *60 ;else val->intval =0 ;break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/286 serial: 8250: omap: Dont skip resource freeing if pm_runtime_resume_and_get() failed
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit ad90d0358bd3b4554f243a425168fc7cebe7d04e ]
Returning an error code from .remove() makes the driver core emit the little helpful error message:
remove callback returned a non-zero value. This will be ignored.
and then remove the device anyhow. So all resources that were not freed are leaked in this case. Skipping serial8250_unregister_port() has the potential to keep enough of the UART around to trigger a use-after-free.
So replace the error return (and with it the little helpful error message) by a more useful error message and continue to cleanup.
--- drivers/tty/serial/8250/8250_omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/8250/8250_omap.c +1 -1
@@ -1497,7 +1497,7 @@ static int omap8250_remove(struct platform_device *pdev) err =pm_runtime_resume_and_get (&pdev->dev);if (err) -return err; +dev_err (&pdev->dev,"Failed to resume hardware\n" );serial8250_unregister_port (priv->line); priv->line = -ENODEV ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/286 libapi: Add missing linux/types.h header to get the __u64 type on io.h
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit af76b2dec0984a079d8497bfa37d29a9b55932e1 ]
There are functions using __u64, so we need to have the linux/types.h header otherwise we'll break when its not included before api/io.h.
--- tools/lib/api/io.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/api/io.h +1 -0
@@ -9,6 +9,7 @@#include <stdlib.h> #include <unistd.h> +#include <linux/types.h> struct io {/* File descriptor being read/ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/286 acpi: property: Let args be NULL in __acpi_node_get_property_reference
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
[ Upstream commit bef52aa0f3de1b7d8c258c13b16e577361dabf3a ]
fwnode_get_property_reference_args() may not be called with args argument NULL on ACPI, OF already supports this. Add the missing NULL checks and document this.
The purpose is to be able to count the references.
--- drivers/acpi/property.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/acpi/property.c +4 -0
@@ -639,6 +639,7 @@ acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,* @index: Index of the reference to return * @num_args: Maximum number of arguments after each reference * @args: Location to store the returned reference with optional arguments +* (may be NULL) * * Find property with @name, verifify that it is a package containing at least * one object reference and if so, store the ACPI device object pointer to the
@@ -697,6 +698,9 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,if (ret)return ret == -ENODEV ? -EINVAL : ret; +if (!args) +return 0 ; + args->fwnode =acpi_fwnode_handle (device); args->nargs =0 ;return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/286 software node: Let args be NULL in software_node_get_reference_args
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
[ Upstream commit 1eaea4b3604eb9ca7d9a1e73d88fc121bb4061f5 ]
fwnode_get_property_reference_args() may not be called with args argument NULL and while OF already supports this. Add the missing NULL check.
The purpose is to be able to count the references.
--- drivers/base/swnode.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/base/swnode.c +3 -0
@@ -531,6 +531,9 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,if (nargs >NR_FWNODE_REFERENCE_ARGS )return -EINVAL ; +if (!args) +return 0 ; + args->fwnode =software_node_get (refnode); args->nargs = nargs;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/286 serial: imx: fix tx statemachine deadlock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Geurts <[email protected]>
[ Upstream commit 78d60dae9a0c9f09aa3d6477c94047df2fe6f7b0 ]
When using the serial port as RS485 port, the tx statemachine is used to control the RTS pin to drive the RS485 transceiver TX_EN pin. When the TTY port is closed in the middle of a transmission (for instance during userland application crash), imx_uart_shutdown disables the interface and disables the Transmission Complete interrupt. afer that, imx_uart_stop_tx bails on an incomplete transmission, to be retriggered by the TC interrupt. This interrupt is disabled and therefore the tx statemachine never transitions out of SEND. The statemachine is in deadlock now, and the TX_EN remains low, making the interface useless.
imx_uart_stop_tx now checks for incomplete transmission AND whether TC interrupts are enabled before bailing to be retriggered. This makes sure the state machine handling is reached, and is properly set to WAIT_AFTER_SEND.
--- drivers/tty/serial/imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/imx.c +2 -2
@@ -461,13 +461,13 @@ static void imx_uart_stop_tx(struct uart_port *port) ucr1 =imx_uart_readl (sport,UCR1 );imx_uart_writel (sport, ucr1 & ~UCR1_TRDYEN ,UCR1 ); + ucr4 =imx_uart_readl (sport,UCR4 ); usr2 =imx_uart_readl (sport,USR2 ); -if (!(usr2 &USR2_TXDC )) { +if ((!(usr2 &USR2_TXDC )) && (ucr4 &UCR4_TCEN )) {/* The shifter is still busy, so retry once TC triggers */ return ; } - ucr4 =imx_uart_readl (sport,UCR4 ); ucr4 &= ~UCR4_TCEN ;imx_uart_writel (sport, ucr4,UCR4 );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/286 iio: adc: ad9467: Benefit from devm_clk_get_enabled() to simplify
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit cdd07b3ab94a020570132558442a26e74b70bc42 ]
Make use of devm_clk_get_enabled() to replace some code that effectively open codes this new function.
Stable-dep-of: 76f028539cf3 ("iio: adc: ad9467: fix reset gpio handling")
--- drivers/iio/adc/ad9467.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/iio/adc/ad9467.c +1 -16
@@ -378,13 +378,6 @@ static int ad9467_preenable_setup(struct adi_axi_adc_conv *conv)return ad9467_outputmode_set (st->spi, st->output_mode); } -static void ad9467_clk_disable (void *data) -{ -struct ad9467_state *st = data; - -clk_disable_unprepare (st->clk); -} -static int ad9467_probe (struct spi_device *spi) {const struct ad9467_chip_info *info;
@@ -404,18 +397,10 @@ static int ad9467_probe(struct spi_device *spi) st =adi_axi_adc_conv_priv (conv); st->spi = spi; - st->clk =devm_clk_get (&spi->dev,"adc-clk" ); + st->clk =devm_clk_get_enabled (&spi->dev,"adc-clk" );if (IS_ERR (st->clk))return PTR_ERR (st->clk); - ret =clk_prepare_enable (st->clk); -if (ret <0 ) -return ret; - - ret =devm_add_action_or_reset (&spi->dev, ad9467_clk_disable, st); -if (ret) -return ret; - st->pwrdown_gpio =devm_gpiod_get_optional (&spi->dev,"powerdown" ,GPIOD_OUT_LOW );if (IS_ERR (st->pwrdown_gpio))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/286 iio: adc: ad9467: fix reset gpio handling
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit 76f028539cf360f750efd8cde560edda298e4c6b ]
The reset gpio was being handled with inverted polarity. This means that as far as gpiolib is concerned we were actually leaving the pin asserted (in theory, this would mean reset). However, inverting the polarity in devicetree made things work. Fix it by doing it the proper way and how gpiolib expects it to be done.
While at it, moved the handling to it's own function and dropped 'reset_gpio' from the 'struct ad9467_state' as we only need it during probe. On top of that, refactored things so that we now request the gpio asserted (i.e in reset) and then de-assert it. Also note that we now use gpiod_set_value_cansleep() instead of gpiod_direction_output() as we already request the pin as output.
--- drivers/iio/adc/ad9467.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
drivers/iio/adc/ad9467.c +18 -13
@@ -121,7 +121,6 @@ struct ad9467_state {unsigned int output_mode;struct gpio_desc *pwrdown_gpio; -struct gpio_desc *reset_gpio; };static int ad9467_spi_read (struct spi_device *spi,unsigned int reg)
@@ -378,6 +377,21 @@ static int ad9467_preenable_setup(struct adi_axi_adc_conv *conv)return ad9467_outputmode_set (st->spi, st->output_mode); } +static int ad9467_reset (struct device *dev) +{ +struct gpio_desc *gpio; + + gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR_OR_NULL (gpio)) +return PTR_ERR_OR_ZERO (gpio); + +fsleep (1 ); +gpiod_set_value_cansleep (gpio,0 ); +fsleep (10 *USEC_PER_MSEC ); + +return 0 ; +} +static int ad9467_probe (struct spi_device *spi) {const struct ad9467_chip_info *info;
@@ -406,18 +420,9 @@ static int ad9467_probe(struct spi_device *spi)if (IS_ERR (st->pwrdown_gpio))return PTR_ERR (st->pwrdown_gpio); - st->reset_gpio =devm_gpiod_get_optional (&spi->dev,"reset" , -GPIOD_OUT_LOW ); -if (IS_ERR (st->reset_gpio)) -return PTR_ERR (st->reset_gpio); - -if (st->reset_gpio) { -udelay (1 ); - ret =gpiod_direction_output (st->reset_gpio,1 ); -if (ret) -return ret; -mdelay (10 ); - } + ret =ad9467_reset (&spi->dev); +if (ret) +return ret;spi_set_drvdata (spi, st);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/286 iio: adc: ad9467: dont ignore error codes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit e072e149cfb827e0ab4cafb0547e9658e35393cd ]
Make sure functions that return errors are not ignored.
--- drivers/iio/adc/ad9467.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/iio/adc/ad9467.c +17 -10
@@ -162,9 +162,10 @@ static int ad9467_reg_access(struct adi_axi_adc_conv *conv, unsigned int reg,if (readval ==NULL ) { ret =ad9467_spi_write (spi, reg, writeval); -ad9467_spi_write (spi,AN877_ADC_REG_TRANSFER , -AN877_ADC_TRANSFER_SYNC ); -return ret; +if (ret) +return ret; +return ad9467_spi_write (spi,AN877_ADC_REG_TRANSFER , +AN877_ADC_TRANSFER_SYNC ); } ret =ad9467_spi_read (spi, reg);
@@ -272,10 +273,13 @@ static int ad9467_get_scale(struct adi_axi_adc_conv *conv, int *val, int *val2)const struct ad9467_chip_info *info1 =to_ad9467_chip_info (info);struct ad9467_state *st =adi_axi_adc_conv_priv (conv);unsigned int i, vref_val; +int ret; - vref_val =ad9467_spi_read (st->spi,AN877_ADC_REG_VREF ); + ret =ad9467_spi_read (st->spi,AN877_ADC_REG_VREF ); +if (ret <0 ) +return ret; - vref_val &= info1->vref_mask; + vref_val = ret & info1->vref_mask;for (i =0 ; i < info->num_scales; i++) {if (vref_val == info->scale_table[i][1 ])
@@ -296,6 +300,7 @@ static int ad9467_set_scale(struct adi_axi_adc_conv *conv, int val, int val2)struct ad9467_state *st =adi_axi_adc_conv_priv (conv);unsigned int scale_val[2 ];unsigned int i; +int ret;if (val !=0 )return -EINVAL ;
@@ -305,11 +310,13 @@ static int ad9467_set_scale(struct adi_axi_adc_conv *conv, int val, int val2)if (scale_val[0 ] != val || scale_val[1 ] != val2)continue ; -ad9467_spi_write (st->spi,AN877_ADC_REG_VREF , - info->scale_table[i][1 ]); -ad9467_spi_write (st->spi,AN877_ADC_REG_TRANSFER , -AN877_ADC_TRANSFER_SYNC ); -return 0 ; + ret =ad9467_spi_write (st->spi,AN877_ADC_REG_VREF , + info->scale_table[i][1 ]); +if (ret <0 ) +return ret; + +return ad9467_spi_write (st->spi,AN877_ADC_REG_TRANSFER , +AN877_ADC_TRANSFER_SYNC ); }return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/286 iio: adc: ad9467: fix scale setting
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sa <[email protected]>
[ Upstream commit b73f08bb7fe5a0901646ca5ceaa1e7a2d5ee6293 ]
When reading in_voltage_scale we can get something like:
root@analog:/sys/bus/iio/devices/iio:device2# cat in_voltage_scale 0.038146
However, when reading the available options:
root@analog:/sys/bus/iio/devices/iio:device2# cat in_voltage_scale_available 2000.000000 2100.000006 2200.000007 2300.000008 2400.000009 2500.000010
which does not make sense. Moreover, when trying to set a new scale we get an error because there's no call to __ad9467_get_scale() to give us values as given when reading in_voltage_scale. Fix it by computing the available scales during probe and properly pass the list when .read_available() is called.
While at it, change to use .read_available() from iio_info. Also note that to properly fix this, adi-axi-adc.c has to be changed accordingly.
--- drivers/iio/adc/ad9467.c | 47 ++++++++++++++++++ drivers/iio/adc/adi-axi-adc.c | 74 ++++++----------------------- include/linux/iio/adc/adi-axi-adc.h | 4 ++ 3 files changed, 66 insertions(+), 59 deletions(-)
drivers/iio/adc/ad9467.c +47 -0
@@ -119,6 +119,7 @@ struct ad9467_state {struct spi_device *spi;struct clk *clk;unsigned int output_mode; +unsigned int (*scales)[2 ];struct gpio_desc *pwrdown_gpio; };
@@ -212,6 +213,7 @@ static void __ad9467_get_scale(struct adi_axi_adc_conv *conv, int index, .channel = _chan, \ .info_mask_shared_by_type =BIT (IIO_CHAN_INFO_SCALE ) | \ BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_SCALE), \ .scan_index = _si, \ .scan_type = { \ .sign = _sign, \
@@ -365,6 +367,26 @@ static int ad9467_write_raw(struct adi_axi_adc_conv *conv, } } +static int ad9467_read_avail (struct adi_axi_adc_conv *conv, +struct iio_chan_spec const *chan, +const int **vals,int *type,int *length, +long mask) +{ +const struct adi_axi_adc_chip_info *info = conv->chip_info; +struct ad9467_state *st =adi_axi_adc_conv_priv (conv); + +switch (mask) { +case IIO_CHAN_INFO_SCALE : + *vals = (const int *)st->scales; + *type =IIO_VAL_INT_PLUS_MICRO ; +/* Values are stored in a 2D matrix */ + *length = info->num_scales *2 ; +return IIO_AVAIL_LIST ; +default : +return -EINVAL ; + } +} +static int ad9467_outputmode_set (struct spi_device *spi,unsigned int mode) {int ret;
@@ -377,6 +399,26 @@ static int ad9467_outputmode_set(struct spi_device *spi, unsigned int mode) AN877_ADC_TRANSFER_SYNC); } +static int ad9467_scale_fill (struct adi_axi_adc_conv *conv) +{ +const struct adi_axi_adc_chip_info *info = conv->chip_info; +struct ad9467_state *st =adi_axi_adc_conv_priv (conv); +unsigned int i, val1, val2; + + st->scales =devm_kmalloc_array (&st->spi->dev, info->num_scales, +sizeof (*st->scales),GFP_KERNEL ); +if (!st->scales) +return -ENOMEM ; + +for (i =0 ; i < info->num_scales; i++) { +__ad9467_get_scale (conv, i, &val1, &val2); + st->scales[i][0 ] = val1; + st->scales[i][1 ] = val2; + } + +return 0 ; +} +static int ad9467_preenable_setup (struct adi_axi_adc_conv *conv) {struct ad9467_state *st =adi_axi_adc_conv_priv (conv);
@@ -435,6 +477,10 @@ static int ad9467_probe(struct spi_device *spi) conv->chip_info = &info->axi_adc_info; + ret =ad9467_scale_fill (conv); +if (ret) +return ret; + id =ad9467_spi_read (spi,AN877_ADC_REG_CHIP_ID );if (id != conv->chip_info->id) { dev_err(&spi->dev, "Mismatch CHIP_ID, got 0x%X, expected 0x%X\n",
@@ -445,6 +491,7 @@ static int ad9467_probe(struct spi_device *spi) conv->reg_access = ad9467_reg_access; conv->write_raw = ad9467_write_raw; conv->read_raw = ad9467_read_raw; + conv->read_avail = ad9467_read_avail; conv->preenable_setup = ad9467_preenable_setup; st->output_mode = info->default_output_mode |
drivers/iio/adc/adi-axi-adc.c +15 -59
90 lines not on this page · raw message
include/linux/iio/adc/adi-axi-adc.h +4 -0
@@ -41,6 +41,7 @@ struct adi_axi_adc_chip_info {* @reg_access IIO debugfs_reg_access hook for the client ADC * @read_raw IIO read_raw hook for the client ADC * @write_raw IIO write_raw hook for the client ADC +* @read_avail IIO read_avail hook for the client ADC */ struct adi_axi_adc_conv {const struct adi_axi_adc_chip_info *chip_info;
@@ -54,6 +55,9 @@ struct adi_axi_adc_conv {int (*write_raw)(struct adi_axi_adc_conv *conv,struct iio_chan_spec const *chan,int val,int val2,long mask); +int (*read_avail)(struct adi_axi_adc_conv *conv, +struct iio_chan_spec const *chan, +const int **val,int *type,int *length,long mask); }; struct adi_axi_adc_conv *devm_adi_axi_adc_conv_register(struct device *dev,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/286 perf genelf: Set ELF program header addresses properly
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
[ Upstream commit 1af478903fc48c1409a8dd6b698383b62387adf1 ]
The text section starts after the ELF headers so PHDR.p_vaddr and others should have the correct addresses.
--- tools/perf/util/genelf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/genelf.c +3 -3
@@ -291,9 +291,9 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,*/ phdr =elf_newphdr (e,1 ); phdr[0 ].p_type =PT_LOAD ; - phdr[0 ].p_offset =0 ; - phdr[0 ].p_vaddr =0 ; - phdr[0 ].p_paddr =0 ; + phdr[0 ].p_offset =GEN_ELF_TEXT_OFFSET ; + phdr[0 ].p_vaddr =GEN_ELF_TEXT_OFFSET ; + phdr[0 ].p_paddr =GEN_ELF_TEXT_OFFSET ; phdr[0 ].p_filesz = csize; phdr[0 ].p_memsz = csize; phdr[0 ].p_flags =PF_X |PF_R ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/286 tty: change tty_write_lock()s ndelay parameter to bool
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit af815336556df28f800669c58ab3bdad7d786b98 ]
It's a yes-no parameter, so convert it to bool to be obvious.
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
--- drivers/tty/tty.h | 2 +- drivers/tty/tty_io.c | 6 +++--- drivers/tty/tty_ioctl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/tty/tty.h +1 -1
@@ -64,7 +64,7 @@ int tty_check_change(struct tty_struct *tty);void __stop_tty (struct tty_struct *tty);void __start_tty (struct tty_struct *tty);void tty_write_unlock (struct tty_struct *tty); -int tty_write_lock (struct tty_struct *tty,int ndelay); +int tty_write_lock (struct tty_struct *tty,bool ndelay);void tty_vhangup_session (struct tty_struct *tty);void tty_open_proc_set_tty (struct file *filp,struct tty_struct *tty);int tty_signal_session_leader (struct tty_struct *tty,int exit_session);
drivers/tty/tty_io.c +3 -3
@@ -948,7 +948,7 @@ void tty_write_unlock(struct tty_struct *tty)wake_up_interruptible_poll (&tty->write_wait,EPOLLOUT ); } -int tty_write_lock (struct tty_struct *tty,int ndelay) +int tty_write_lock (struct tty_struct *tty,bool ndelay) {if (!mutex_trylock (&tty->atomic_write_lock)) {if (ndelay)
@@ -1167,7 +1167,7 @@ int tty_send_xchar(struct tty_struct *tty, char ch)return 0 ; } -if (tty_write_lock (tty,0 ) <0 ) +if (tty_write_lock (tty, false) <0 )return -ERESTARTSYS ;down_read (&tty->termios_rwsem);
@@ -2473,7 +2473,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration) retval = tty->ops->break_ctl (tty, duration); else {/* Do the work ourselves */ -if (tty_write_lock (tty,0 ) <0 ) +if (tty_write_lock (tty, false) <0 )return -EINTR ; retval = tty->ops->break_ctl (tty,-1 );if (retval)
drivers/tty/tty_ioctl.c +1 -1
@@ -404,7 +404,7 @@ static int set_termios(struct tty_struct *tty, void __user *arg, int opt)if (retval <0 )return retval; -if (tty_write_lock (tty,0 ) <0 ) +if (tty_write_lock (tty, false) <0 ) goto retry_write_wait;/* Racing writer? */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/286 tty: early return from send_break() on TTY_DRIVER_HARDWARE_BREAK
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 66619686d187b4a6395316b7f39881e945dce4bc ]
If the driver sets TTY_DRIVER_HARDWARE_BREAK, we leave ops->break_ctl() to the driver and return from send_break(). But we do it using a local variable and keep the code flowing through the end of the function. Instead, do 'return' immediately with the ops->break_ctl()'s return value.
This way, we don't have to stuff the 'else' branch of the 'if' with the software break handling. And we can re-indent the function too.
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
--- drivers/tty/tty_io.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/tty/tty_io.c +17 -15
@@ -2470,22 +2470,24 @@ static int send_break(struct tty_struct *tty, unsigned int duration)return 0 ;if (tty->driver->flags &TTY_DRIVER_HARDWARE_BREAK ) - retval = tty->ops->break_ctl (tty, duration); -else { -/* Do the work ourselves */ -if (tty_write_lock (tty, false) <0 ) -return -EINTR ; - retval = tty->ops->break_ctl (tty,-1 ); -if (retval) - goto out; -if (!signal_pending (current)) -msleep_interruptible (duration); - retval = tty->ops->break_ctl (tty,0 ); +return tty->ops->break_ctl (tty, duration); + +/* Do the work ourselves */ +if (tty_write_lock (tty, false) <0 ) +return -EINTR ; + + retval = tty->ops->break_ctl (tty,-1 ); +if (retval) + goto out; +if (!signal_pending (current)) +msleep_interruptible (duration); + retval = tty->ops->break_ctl (tty,0 ); out: -tty_write_unlock (tty); -if (signal_pending (current)) - retval = -EINTR ; - } +tty_write_unlock (tty); + +if (signal_pending (current)) + retval = -EINTR ; +return retval; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/286 tty: dont check for signal_pending() in send_break()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit fd99392b643b824813df2edbaebe26a2136d31e6 ]
msleep_interruptible() will check on its own. So no need to do the check in send_break() before calling the above.
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
--- drivers/tty/tty_io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/tty/tty_io.c +1 -2
@@ -2479,8 +2479,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration) retval = tty->ops->break_ctl (tty,-1 );if (retval) goto out; -if (!signal_pending (current)) -msleep_interruptible (duration); +msleep_interruptible (duration); retval = tty->ops->break_ctl (tty,0 ); out:tty_write_unlock (tty);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/286 tty: use if in send_break() instead of goto
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 24f2cd019946fc2e88e632d2e24a34c2cc3f2be4 ]
Now, the "jumped-over" code is simple enough to be put inside an 'if'. Do so to make it 'goto'-less.
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
--- drivers/tty/tty_io.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/tty/tty_io.c +4 -5
@@ -2477,11 +2477,10 @@ static int send_break(struct tty_struct *tty, unsigned int duration)return -EINTR ; retval = tty->ops->break_ctl (tty,-1 ); -if (retval) - goto out; -msleep_interruptible (duration); - retval = tty->ops->break_ctl (tty,0 ); -out: +if (!retval) { +msleep_interruptible (duration); + retval = tty->ops->break_ctl (tty,0 ); + }tty_write_unlock (tty);if (signal_pending (current))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/286 usb: cdc-acm: return correct error code on unsupported break
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 66aad7d8d3ec5a3a8ec2023841bcec2ded5f65c9 ]
In ACM support for sending breaks to devices is optional. If a device says that it doenot support sending breaks, the host must respect that.
Given the number of optional features providing tty operations for each combination is not practical and errors need to be returned dynamically if unsupported features are requested.
In case a device does not support break, we want the tty layer to treat that like it treats drivers that statically cannot support sending a break. It ignores the inability and does nothing. This patch uses EOPNOTSUPP to indicate that.
--- drivers/tty/tty_io.c | 3 +++ drivers/usb/class/cdc-acm.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/tty/tty_io.c +3 -0
@@ -2480,6 +2480,9 @@ static int send_break(struct tty_struct *tty, unsigned int duration)if (!retval) {msleep_interruptible (duration); retval = tty->ops->break_ctl (tty,0 ); + }else if (retval == -EOPNOTSUPP ) { +/* some drivers can tell only dynamically */ + retval =0 ; }tty_write_unlock (tty);
drivers/usb/class/cdc-acm.c +3 -0
@@ -896,6 +896,9 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state)struct acm *acm = tty->driver_data;int retval; +if (!(acm->ctrl_caps &USB_CDC_CAP_BRK )) +return -EOPNOTSUPP ; + retval =acm_send_break (acm, state ?0xffff :0 );if (retval <0 ) dev_dbg(&acm->control->dev,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 258/286 nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit efa56305908ba20de2104f1b8508c6a7401833be ]
If the host sends an H2CData command with an invalid DATAL, the kernel may crash in nvmet_tcp_build_pdu_iovec().
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 lr : nvmet_tcp_io_work+0x6ac/0x718 [nvmet_tcp] Call trace: process_one_work+0x174/0x3c8 worker_thread+0x2d0/0x3e8 kthread+0x104/0x110
Fix the bug by raising a fatal error if DATAL isn't coherent with the packet size.
Also, the PDU length should never exceed the MAXH2CDATA parameter which has been communicated to the host in nvmet_tcp_handle_icreq().
--- drivers/nvme/target/tcp.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/nvme/target/tcp.c +12 -1
@@ -18,6 +18,7 @@#include "nvmet.h" #define NVMET_TCP_DEF_INLINE_DATA_SIZE (4 * PAGE_SIZE) +#define NVMET_TCP_MAXH2CDATA 0x400000/* 16M arbitrary limit */ /* Define the socket priority to use for connections were it is desirable * that the NIC consider performing optimized packet processing or filtering.
@@ -872,7 +873,7 @@ static int nvmet_tcp_handle_icreq(struct nvmet_tcp_queue *queue) icresp->hdr.pdo =0 ; icresp->hdr.plen =cpu_to_le32 (icresp->hdr.hlen); icresp->pfv =cpu_to_le16 (NVME_TCP_PFV_1_0 ); - icresp->maxdata =cpu_to_le32 (0x400000 );/* 16M arbitrary limit */ + icresp->maxdata =cpu_to_le32 (NVMET_TCP_MAXH2CDATA ); icresp->cpda =0 ;if (queue->hdr_digest) icresp->digest |=NVME_TCP_HDR_DIGEST_ENABLE ;
@@ -918,6 +919,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) {struct nvme_tcp_data_pdu *data = &queue->pdu.data;struct nvmet_tcp_cmd *cmd; +unsigned int plen;if (likely (queue->nr_cmds)) {if (unlikely (data->ttag >= queue->nr_cmds)) {
@@ -941,7 +943,16 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)return -EPROTO ; } + plen =le32_to_cpu (data->hdr.plen); cmd->pdu_len =le32_to_cpu (data->data_length); +if (unlikely (cmd->pdu_len != (plen -sizeof (*data)) || + cmd->pdu_len ==0 || + cmd->pdu_len >NVMET_TCP_MAXH2CDATA )) { +pr_err ("H2CData PDU len %u is invalid\n" , cmd->pdu_len); +/* FIXME: use proper transport errors */ +nvmet_tcp_fatal_error (queue); +return -EPROTO ; + } cmd->pdu_recv =0 ;nvmet_tcp_map_pdu_iovec (cmd); queue->cmd = cmd;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 259/286 nvmet-tcp: fix a crash in nvmet_req_complete()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 0849a5441358cef02586fb2d60f707c0db195628 ]
in nvmet_tcp_handle_h2c_data_pdu(), if the host sends a data_offset different from rbytes_done, the driver ends up calling nvmet_req_complete() passing a status error.
The problem is that at this point cmd->req is not yet initialized, the kernel will crash after dereferencing a NULL pointer.
Fix the bug by replacing the call to nvmet_req_complete() with nvmet_tcp_fatal_error().
--- drivers/nvme/target/tcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/target/tcp.c +1 -2
@@ -938,8 +938,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) data->ttag,le32_to_cpu (data->data_offset), cmd->rbytes_done);/* FIXME: use path and transport errors */ -nvmet_req_complete (&cmd->req, -NVME_SC_INVALID_FIELD |NVME_SC_DNR ); +nvmet_tcp_fatal_error (queue);return -EPROTO ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 260/286 perf env: Avoid recursively taking env->bpf_progs.lock
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 9c51f8788b5d4e9f46afbcf563255cfd355690b3 ]
Add variants of perf_env__insert_bpf_prog_info(), perf_env__insert_btf() and perf_env__find_btf prefixed with __ to indicate the env->bpf_progs.lock is assumed held.
Call these variants when the lock is held to avoid recursively taking it and potentially having a thread deadlock with itself.
--- tools/perf/util/bpf-event.c | 8 +++--- tools/perf/util/bpf-event.h | 12 ++++----- tools/perf/util/env.c | 50 ++++++++++++++++++++++++------------- tools/perf/util/env.h | 4 +++ tools/perf/util/header.c | 8 +++--- 5 files changed, 50 insertions(+), 32 deletions(-)
tools/perf/util/bpf-event.c +4 -4
@@ -533,9 +533,9 @@ int evlist__add_bpf_sb_event(struct evlist *evlist, struct perf_env *env)return perf_evlist__add_sb_event (evlist, &attr, bpf_event__sb_cb, env); } -void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, -struct perf_env *env, -FILE *fp) +void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, +struct perf_env *env, +FILE *fp) {__u32 *prog_lens = (__u32 *)(uintptr_t )(info->jited_func_lens);__u64 *prog_addrs = (__u64 *)(uintptr_t )(info->jited_ksyms);
@@ -551,7 +551,7 @@ void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,if (info->btf_id) {struct btf_node *node; - node =perf_env__find_btf (env, info->btf_id); + node =__perf_env__find_btf (env, info->btf_id);if (node) btf =btf__new ((__u8 *)(node->data), node->data_size);
tools/perf/util/bpf-event.h +6 -6
@@ -34,9 +34,9 @@ struct btf_node {int machine__process_bpf (struct machine *machine,union perf_event *event,struct perf_sample *sample);int evlist__add_bpf_sb_event (struct evlist *evlist,struct perf_env *env); -void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, -struct perf_env *env, -FILE *fp); +void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, +struct perf_env *env, +FILE *fp);#else static inline int machine__process_bpf(struct machine *machine __maybe_unused, union perf_event *event __maybe_unused,
@@ -51,9 +51,9 @@ static inline int evlist__add_bpf_sb_event(struct evlist *evlist __maybe_unused,return 0 ; } -static inline void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info__maybe_unused , -struct perf_env *env__maybe_unused , -FILE *fp__maybe_unused ) +static inline void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info__maybe_unused , +struct perf_env *env__maybe_unused , +FILE *fp__maybe_unused ) { }
tools/perf/util/env.c +32 -18
112 lines not on this page · raw message
tools/perf/util/env.h +4 -0
@@ -139,12 +139,16 @@ const char *perf_env__raw_arch(struct perf_env *env);int perf_env__nr_cpus_avail (struct perf_env *env);void perf_env__init (struct perf_env *env); +void __perf_env__insert_bpf_prog_info (struct perf_env *env, +struct bpf_prog_info_node *info_node);void perf_env__insert_bpf_prog_info (struct perf_env *env,struct bpf_prog_info_node *info_node);struct bpf_prog_info_node *perf_env__find_bpf_prog_info (struct perf_env *env,__u32 prog_id);bool perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); +bool __perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); +struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id);int perf_env__numa_node (struct perf_env *env,int cpu);#endif /* __PERF_ENV_H */
tools/perf/util/header.c +4 -4
@@ -1655,8 +1655,8 @@ static void print_bpf_prog_info(struct feat_fd *ff, FILE *fp) node = rb_entry(next, struct bpf_prog_info_node, rb_node); next =rb_next (&node->rb_node); -bpf_event__print_bpf_prog_info (&node->info_linear->info, - env, fp); +__bpf_event__print_bpf_prog_info (&node->info_linear->info, + env, fp); }up_read (&env->bpf_progs.lock);
@@ -2927,7 +2927,7 @@ static int process_bpf_prog_info(struct feat_fd *ff, void *data __maybe_unused)/* after reading from file, translate offset to address */ bpf_program__bpil_offs_to_addr (info_linear); info_node->info_linear = info_linear; -perf_env__insert_bpf_prog_info (env, info_node); +__perf_env__insert_bpf_prog_info (env, info_node); }up_write (&env->bpf_progs.lock);
@@ -2980,7 +2980,7 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused)if (__do_read (ff, node->data, data_size)) goto out; -perf_env__insert_btf (env, node); +__perf_env__insert_btf (env, node); node =NULL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 261/286 apparmor: avoid crash when parsed profile name is empty
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit 55a8210c9e7d21ff2644809699765796d4bfb200 ]
When processing a packed profile in unpack_profile() described like
"profile :ns::samba-dcerpcd /usr/lib*/samba/{,samba/}samba-dcerpcd {...}"
a string ":samba-dcerpcd" is unpacked as a fully-qualified name and then passed to aa_splitn_fqname().
aa_splitn_fqname() treats ":samba-dcerpcd" as only containing a namespace. Thus it returns NULL for tmpname, meanwhile tmpns is non-NULL. Later aa_alloc_profile() crashes as the new profile name is NULL now.
general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 6 PID: 1657 Comm: apparmor_parser Not tainted 6.7.0-rc2-dirty #16 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.2-3-gd478f380-rebuilt.opensuse.org 04/01/2014 RIP: 0010:strlen+0x1e/0xa0 Call Trace: <TASK> ? strlen+0x1e/0xa0 aa_policy_init+0x1bb/0x230 aa_alloc_profile+0xb1/0x480 unpack_profile+0x3bc/0x4960 aa_unpack+0x309/0x15e0 aa_replace_profiles+0x213/0x33c0 policy_update+0x261/0x370 profile_replace+0x20e/0x2a0 vfs_write+0x2af/0xe00 ksys_write+0x126/0x250 do_syscall_64+0x46/0xf0 entry_SYSCALL_64_after_hwframe+0x6e/0x76 </TASK> ---[ end trace 0000000000000000 ]--- RIP: 0010:strlen+0x1e/0xa0
It seems such behaviour of aa_splitn_fqname() is expected and checked in other places where it is called (e.g. aa_remove_profiles). Well, there is an explicit comment "a ns name without a following profile is allowed" inside.
AFAICS, nothing can prevent unpacked "name" to be in form like ":samba-dcerpcd" - it is passed from userspace.
Deny the whole profile set replacement in such case and inform user with EPROTO and an explaining message.
Found by Linux Verification Center (linuxtesting.org).
--- security/apparmor/policy_unpack.c | 4 ++++ 1 file changed, 4 insertions(+)
security/apparmor/policy_unpack.c +4 -0
@@ -696,6 +696,10 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) tmpname =aa_splitn_fqname (name,strlen (name), &tmpns, &ns_len);if (tmpns) { +if (!tmpname) { + info ="empty profile name" ; + goto fail; + } *ns_name =kstrndup (tmpns, ns_len,GFP_KERNEL );if (!*ns_name) { info ="out of memory" ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 262/286 serial: imx: Correct clock error message in function probe()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Niedermaier <[email protected]>
[ Upstream commit 3e189470cad27d41a3a9dc02649f965b7ed1c90f ]
Correct the clock error message by changing the clock name.
--- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/imx.c +1 -1
@@ -2346,7 +2346,7 @@ static int imx_uart_probe(struct platform_device *pdev)/* For register access, we only need to enable the ipg clock. */ ret =clk_prepare_enable (sport->clk_ipg);if (ret) { -dev_err (&pdev->dev,"failed to enable per clk: %d\n" , ret); +dev_err (&pdev->dev,"failed to enable ipg clk: %d\n" , ret);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 263/286 nvmet-tcp: Fix the H2C expected PDU len calculation
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 9a1abc24850eb759e36a2f8869161c3b7254c904 ]
The nvmet_tcp_handle_h2c_data_pdu() function should take into consideration the possibility that the header digest and/or the data digests are enabled when calculating the expected PDU length, before comparing it to the value stored in cmd->pdu_len.
--- drivers/nvme/target/tcp.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/nvme/target/tcp.c +7 -3
@@ -919,7 +919,7 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) {struct nvme_tcp_data_pdu *data = &queue->pdu.data;struct nvmet_tcp_cmd *cmd; -unsigned int plen; +unsigned int exp_data_len;if (likely (queue->nr_cmds)) {if (unlikely (data->ttag >= queue->nr_cmds)) {
@@ -942,9 +942,13 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue)return -EPROTO ; } - plen =le32_to_cpu (data->hdr.plen); + exp_data_len =le32_to_cpu (data->hdr.plen) - +nvmet_tcp_hdgst_len (queue) - +nvmet_tcp_ddgst_len (queue) - +sizeof (*data); + cmd->pdu_len =le32_to_cpu (data->data_length); -if (unlikely (cmd->pdu_len != (plen -sizeof (*data)) || +if (unlikely (cmd->pdu_len != exp_data_len || cmd->pdu_len ==0 || cmd->pdu_len >NVMET_TCP_MAXH2CDATA )) {pr_err ("H2CData PDU len %u is invalid\n" , cmd->pdu_len);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 264/286 PCI: keystone: Fix race condition when initializing PHYs
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit c12ca110c613a81cb0f0099019c839d078cd0f38 ]
The PCI driver invokes the PHY APIs using the ks_pcie_enable_phy() function. The PHY in this case is the Serdes. It is possible that the PCI instance is configured for two lane operation across two different Serdes instances, using one lane of each Serdes.
In such a configuration, if the reference clock for one Serdes is provided by the other Serdes, it results in a race condition. After the Serdes providing the reference clock is initialized by the PCI driver by invoking its PHY APIs, it is not guaranteed that this Serdes remains powered on long enough for the PHY APIs based initialization of the dependent Serdes. In such cases, the PLL of the dependent Serdes fails to lock due to the absence of the reference clock from the former Serdes which has been powered off by the PM Core.
Fix this by obtaining reference to the PHYs before invoking the PHY initialization APIs and releasing reference after the initialization is complete.
--- drivers/pci/controller/dwc/pci-keystone.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/pci/controller/dwc/pci-keystone.c +9 -0
@@ -1261,7 +1261,16 @@ static int ks_pcie_probe(struct platform_device *pdev) goto err_link; } +/* Obtain references to the PHYs */ +for (i =0 ; i < num_lanes; i++) +phy_pm_runtime_get_sync (ks_pcie->phy[i]); + ret =ks_pcie_enable_phy (ks_pcie); + +/* Release references to the PHYs */ +for (i =0 ; i < num_lanes; i++) +phy_pm_runtime_put_sync (ks_pcie->phy[i]); +if (ret) {dev_err (dev,"failed to enable phy\n" ); goto err_link;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 265/286 s390/pci: fix max size calculation in zpci_memcpy_toio()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit 80df7d6af7f6d229b34cf237b2cc9024c07111cd ]
The zpci_get_max_write_size() helper is used to determine the maximum size a PCI store or load can use at a given __iomem address.
For the PCI block store the following restrictions apply:
1. The dst + len must not cross a 4K boundary in the (pseudo-)MMIO space
2. len must not exceed ZPCI_MAX_WRITE_SIZE
3. len must be a multiple of 8 bytes
4. The src address must be double word (8 byte) aligned
5. The dst address must be double word (8 byte) aligned
Otherwise only a normal PCI store which takes its src value from a register can be used. For these PCI store restriction 1 still applies. Similarly 1 also applies to PCI loads.
It turns out zpci_max_write_size() instead implements stricter conditions which prevents PCI block stores from being used where they can and should be used. In particular instead of conditions 4 and 5 it wrongly enforces both dst and src to be size aligned. This indirectly covers condition 1 but also prevents many legal PCI block stores.
On top of the functional shortcomings the zpci_get_max_write_size() is misnamed as it is used for both read and write size calculations. Rename it to zpci_get_max_io_size() and implement the listed conditions explicitly.
--- arch/s390/include/asm/pci_io.h | 32 ++++++++++++++++++-------------- arch/s390/pci/pci_mmio.c | 12 ++++++------ 2 files changed, 24 insertions(+), 20 deletions(-)
arch/s390/include/asm/pci_io.h +18 -14
@@ -11,6 +11,8 @@/* I/O size constraints */ #define ZPCI_MAX_READ_SIZE 8#define ZPCI_MAX_WRITE_SIZE 128 +#define ZPCI_BOUNDARY_SIZE (1 << 12) +#define ZPCI_BOUNDARY_MASK (ZPCI_BOUNDARY_SIZE - 1)/* I/O Map */ #define ZPCI_IOMAP_SHIFT 48
@@ -125,16 +127,18 @@ static inline int zpci_read_single(void *dst, const volatile void __iomem *src,int zpci_write_block (volatile void __iomem *dst,const void *src,unsigned long len); -static inline u8 zpci_get_max_write_size (u64 src,u64 dst,int len,int max) +static inline int zpci_get_max_io_size (u64 src,u64 dst,int len,int max) { -int count = len > max ? max : len, size =1 ; +int offset = dst &ZPCI_BOUNDARY_MASK ; +int size; -while (!(src &0x1 ) && !(dst &0x1 ) && ((size <<1 ) <= count)) { - dst = dst >>1 ; - src = src >>1 ; - size = size <<1 ; - } -return size; + size =min3 (len,ZPCI_BOUNDARY_SIZE - offset, max); +if (IS_ALIGNED (src,8 ) &&IS_ALIGNED (dst,8 ) &&IS_ALIGNED (size,8 )) +return size; + +if (size >=8 ) +return 8 ; +return rounddown_pow_of_two (size); } static inline int zpci_memcpy_fromio(void *dst,
@@ -144,9 +148,9 @@ static inline int zpci_memcpy_fromio(void *dst,int size, rc =0 ;while (n >0 ) { - size =zpci_get_max_write_size ((u64 __force ) src, - (u64 ) dst, n, -ZPCI_MAX_READ_SIZE ); + size =zpci_get_max_io_size ((u64 __force ) src, + (u64 ) dst, n, +ZPCI_MAX_READ_SIZE ); rc =zpci_read_single (dst, src, size);if (rc)break ;
@@ -166,9 +170,9 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst,return -EINVAL ;while (n >0 ) { - size =zpci_get_max_write_size ((u64 __force ) dst, - (u64 ) src, n, -ZPCI_MAX_WRITE_SIZE ); + size =zpci_get_max_io_size ((u64 __force ) dst, + (u64 ) src, n, +ZPCI_MAX_WRITE_SIZE );if (size >8 )/* main path */ rc =zpci_write_block (dst, src, size);else
arch/s390/pci/pci_mmio.c +6 -6
@@ -100,9 +100,9 @@ static inline int __memcpy_toio_inuser(void __iomem *dst, old_fs =enable_sacf_uaccess ();while (n >0 ) { - size =zpci_get_max_write_size ((u64 __force ) dst, - (u64 __force ) src, n, -ZPCI_MAX_WRITE_SIZE ); + size =zpci_get_max_io_size ((u64 __force ) dst, + (u64 __force ) src, n, +ZPCI_MAX_WRITE_SIZE );if (size >8 )/* main path */ rc =__pcistb_mio_inuser (dst, src, size, &status);else
@@ -252,9 +252,9 @@ static inline int __memcpy_fromio_inuser(void __user *dst, old_fs =enable_sacf_uaccess ();while (n >0 ) { - size =zpci_get_max_write_size ((u64 __force ) src, - (u64 __force ) dst, n, -ZPCI_MAX_READ_SIZE ); + size =zpci_get_max_io_size ((u64 __force ) src, + (u64 __force ) dst, n, +ZPCI_MAX_READ_SIZE ); rc =__pcilg_mio_inuser (dst, src, size, &status);if (rc)break ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 266/286 net: qualcomm: rmnet: fix global oob in rmnet_policy
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit b33fb5b801c6db408b774a68e7c8722796b59ecc ]
The variable rmnet_link_ops assign a *bigger* maxtype which leads to a global out-of-bounds read when parsing the netlink attributes. See bug trace below:
==================================================================
BUG: KASAN: global-out-of-bounds in validate_nla lib/nlattr.c:386 [inline]
BUG: KASAN: global-out-of-bounds in __nla_validate_parse+0x24af/0x2750 lib/nlattr.c:600
Read of size 1 at addr ffffffff92c438d0 by task syz-executor.6/84207
CPU: 0 PID: 84207 Comm: syz-executor.6 Tainted: G N 6.1.0 #3
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+0x8b/0xb3 lib/dump_stack.c:106
print_address_description mm/kasan/report.c:284 [inline]
print_report+0x172/0x475 mm/kasan/report.c:395
kasan_report+0xbb/0x1c0 mm/kasan/report.c:495
validate_nla lib/nlattr.c:386 [inline]
__nla_validate_parse+0x24af/0x2750 lib/nlattr.c:600
__nla_parse+0x3e/0x50 lib/nlattr.c:697
nla_parse_nested_deprecated include/net/netlink.h:1248 [inline]
__rtnl_newlink+0x50a/0x1880 net/core/rtnetlink.c:3485
rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3594
rtnetlink_rcv_msg+0x43c/0xd70 net/core/rtnetlink.c:6091
netlink_rcv_skb+0x14f/0x410 net/netlink/af_netlink.c:2540
netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline]
netlink_unicast+0x54e/0x800 net/netlink/af_netlink.c:1345
netlink_sendmsg+0x930/0xe50 net/netlink/af_netlink.c:1921
sock_sendmsg_nosec net/socket.c:714 [inline]
sock_sendmsg+0x154/0x190 net/socket.c:734
____sys_sendmsg+0x6df/0x840 net/socket.c:2482
___sys_sendmsg+0x110/0x1b0 net/socket.c:2536
__sys_sendmsg+0xf3/0x1c0 net/socket.c:2565
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x3b/0x90 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x63/0xcd
RIP: 0033:0x7fdcf2072359
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 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 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007fdcf13e3168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
RAX: ffffffffffffffda RBX: 00007fdcf219ff80 RCX: 00007fdcf2072359
RDX: 0000000000000000 RSI: 0000000020000200 RDI: 0000000000000003
RBP: 00007fdcf20bd493 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000
R13: 00007fffbb8d7bdf R14: 00007fdcf13e3300 R15: 0000000000022000
</TASK>
The buggy address belongs to the variable:
rmnet_policy+0x30/0xe0
The buggy address belongs to the physical page:
page:0000000065bdeb3c refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x155243
flags: 0x200000000001000(reserved|node=0|zone=2)
raw: 0200000000001000 ffffea00055490c8 ffffea00055490c8 0000000000000000
raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffffffff92c43780: f9 f9 f9 f9 00 00 00 02 f9 f9 f9 f9 00 00 00 07
ffffffff92c43800: f9 f9 f9 f9 00 00 00 05 f9 f9 f9 f9 06 f9 f9 f9
>ffffffff92c43880: f9 f9 f9 f9 00 00 00 00 00 00 f9 f9 f9 f9 f9 f9
^
ffffffff92c43900: 00 00 00 00 00 00 00 00 07 f9 f9 f9 f9 f9 f9 f9
ffffffff92c43980: 00 00 00 07 f9 f9 f9 f9 00 00 00 05 f9 f9 f9 f9According to the comment of nla_parse_nested_deprecated, the maxtype should be len(destination array) - 1. Hence use IFLA_RMNET_MAX here.
--- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +1 -1
@@ -389,7 +389,7 @@ static int rmnet_fill_info(struct sk_buff *skb, const struct net_device *dev)struct rtnl_link_ops rmnet_link_ops__read_mostly = { .kind ="rmnet" , - .maxtype = __IFLA_RMNET_MAX, + .maxtype =IFLA_RMNET_MAX , .priv_size =sizeof (struct rmnet_priv ), .setup = rmnet_vnd_setup, .validate = rmnet_rtnl_validate,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 267/286 net: ethernet: ti: am65-cpsw: Fix max mtu to fit ethernet frames
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanjuán García, Jorge <[email protected]>
[ Upstream commit 64e47d8afb5ca533b27efc006405e5bcae2c4a7b ]
The value of AM65_CPSW_MAX_PACKET_SIZE represents the maximum length of a received frame. This value is written to the register AM65_CPSW_PORT_REG_RX_MAXLEN.
The maximum MTU configured on the network device should then leave some room for the ethernet headers and frame check. Otherwise, if the network interface is configured to its maximum mtu possible, the frames will be larger than AM65_CPSW_MAX_PACKET_SIZE and will get dropped as oversized.
The switch supports ethernet frame sizes between 64 and 2024 bytes (including VLAN) as stated in the technical reference manual, so define AM65_CPSW_MAX_PACKET_SIZE with that maximum size.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +3 -2
@@ -51,7 +51,7 @@#define AM65_CPSW_MAX_PORTS 8#define AM65_CPSW_MIN_PACKET_SIZE VLAN_ETH_ZLEN -#define AM65_CPSW_MAX_PACKET_SIZE (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN) +#define AM65_CPSW_MAX_PACKET_SIZE 2024#define AM65_CPSW_REG_CTL 0x004#define AM65_CPSW_REG_STAT_PORT_EN 0x014
@@ -1853,7 +1853,8 @@ static int am65_cpsw_nuss_init_ndev_2g(struct am65_cpsw_common *common)ether_addr_copy (port->ndev->dev_addr, port->slave.mac_addr); port->ndev->min_mtu =AM65_CPSW_MIN_PACKET_SIZE ; - port->ndev->max_mtu =AM65_CPSW_MAX_PACKET_SIZE ; + port->ndev->max_mtu =AM65_CPSW_MAX_PACKET_SIZE - + (VLAN_ETH_HLEN +ETH_FCS_LEN ); port->ndev->hw_features =NETIF_F_SG |NETIF_F_RXCSUM | NETIF_F_HW_CSUM |
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 268/286 net: phy: micrel: populate .soft_reset for KSZ9131
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit e398822c4751017fe401f57409488f5948d12fb5 ]
The RZ/G3S SMARC Module has 2 KSZ9131 PHYs. In this setup, the KSZ9131 PHY is used with the ravb Ethernet driver. It has been discovered that when bringing the Ethernet interface down/up continuously, e.g., with the following sh script:
$ while :; do ifconfig eth0 down; ifconfig eth0 up; done
the link speed and duplex are wrong after interrupting the bring down/up operation even though the Ethernet interface is up. To recover from this state the following configuration sequence is necessary (executed manually):
$ ifconfig eth0 down $ ifconfig eth0 up
The behavior has been identified also on the Microchip SAMA7G5-EK board which runs the macb driver and uses the same PHY.
The order of PHY-related operations in ravb_open() is as follows:ravb_open() ->
ravb_phy_start() ->
ravb_phy_init() ->
of_phy_connect() ->
phy_connect_direct() ->
phy_attach_direct() ->
phy_init_hw() ->
phydev->drv->soft_reset()
phydev->drv->config_init()
phydev->drv->config_intr()
phy_resume()
kszphy_resume()The order of PHY-related operations in ravb_close is as follows:ravb_close() ->
phy_stop() ->
phy_suspend() ->
kszphy_suspend() ->
genphy_suspend()
// set BMCR_PDOWN bit in MII_BMCRIn genphy_suspend() setting the BMCR_PDWN bit in MII_BMCR switches the PHY to Software Power-Down (SPD) mode (according to the KSZ9131 datasheet). Thus, when opening the interface after it has been previously closed (via ravb_close()), the phydev->drv->config_init() and phydev->drv->config_intr() reach the KSZ9131 PHY driver via the ksz9131_config_init() and kszphy_config_intr() functions.
KSZ9131 specifies that the MII management interface remains operational during SPD (Software Power-Down), but (according to manual):
- Only access to the standard registers (0 through 31) is supported.
- Access to MMD address spaces other than MMD address space 1 is possible if the spd_clock_gate_override bit is set.
- Access to MMD address space 1 is not possible.
The spd_clock_gate_override bit is not used in the KSZ9131 driver.
ksz9131_config_init() configures RGMII delay, pad skews and LEDs by accessesing MMD registers other than those in address space 1.
The datasheet for the KSZ9131 does not specify what happens if registers from an unsupported address space are accessed while the PHY is in SPD.
To fix the issue the .soft_reset method has been instantiated for KSZ9131, too. This resets the PHY to the default state before doing any configurations to it, thus switching it out of SPD.
--- drivers/net/phy/micrel.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/micrel.c +1 -0
@@ -1345,6 +1345,7 @@ static struct phy_driver ksphy_driver[] = {/* PHY_GBIT_FEATURES */ .driver_data = &ksz9021_type, .probe = kszphy_probe, + .soft_reset = genphy_soft_reset, .config_init = ksz9131_config_init, .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 269/286 net: ravb: Fix dma_addr_t truncation in error case
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Yushchenko <[email protected]>
[ Upstream commit e327b2372bc0f18c30433ac40be07741b59231c5 ]
In ravb_start_xmit(), ravb driver uses u32 variable to store result of dma_map_single() call. Since ravb hardware has 32-bit address fields in descriptors, this works properly when mapping is successful - it is platform's job to provide mapping addresses that fit into hardware limitations.
However, in failure case dma_map_single() returns DMA_MAPPING_ERROR constant that is 64-bit when dma_addr_t is 64-bit. Storing this constant in u32 leads to truncation, and further call to dma_mapping_error() fails to notice the error.
Fix that by storing result of dma_map_single() in a dma_addr_t variable.
--- drivers/net/ethernet/renesas/ravb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/renesas/ravb_main.c +1 -1
@@ -1500,7 +1500,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)struct ravb_tstamp_skb *ts_skb;struct ravb_tx_desc *desc;unsigned long flags; -u32 dma_addr; +dma_addr_t dma_addr;void *buffer;u32 entry;u32 len;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 270/286 net: dsa: vsc73xx: Add null pointer check to vsc73xx_gpio_probe
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kunwu Chan <[email protected]>
[ Upstream commit 776dac5a662774f07a876b650ba578d0a62d20db ]
devm_kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure.
--- drivers/net/dsa/vitesse-vsc73xx-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/vitesse-vsc73xx-core.c +2 -0
@@ -1119,6 +1119,8 @@ static int vsc73xx_gpio_probe(struct vsc73xx *vsc) vsc->gc.label =devm_kasprintf (vsc->dev,GFP_KERNEL ,"VSC%04x" , vsc->chipid); +if (!vsc->gc.label) +return -ENOMEM ; vsc->gc.ngpio =4 ; vsc->gc.owner =THIS_MODULE ; vsc->gc.parent = vsc->dev;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 271/286 netfilter: nf_tables: do not allow mismatch field size and set key length
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 3ce67e3793f48c1b9635beb9bb71116ca1e51b58 ]
The set description provides the size of each field in the set whose sum should not mismatch the set key length, bail out otherwise.
I did not manage to crash nft_set_pipapo with mismatch fields and set key length so far, but this is UB which must be disallowed.
--- net/netfilter/nf_tables_api.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +5 -1
@@ -4302,8 +4302,8 @@ static int nft_set_desc_concat_parse(const struct nlattr *attr,static int nft_set_desc_concat (struct nft_set_desc *desc,const struct nlattr *nla) { +u32 num_regs =0 , key_num_regs =0 ;struct nlattr *attr; -u32 num_regs =0 ;int rem, err, i;nla_for_each_nested (attr, nla, rem) {
@@ -4318,6 +4318,10 @@ static int nft_set_desc_concat(struct nft_set_desc *desc,for (i =0 ; i < desc->field_count; i++) num_regs +=DIV_ROUND_UP (desc->field_len[i],sizeof (u32)); + key_num_regs =DIV_ROUND_UP (desc->klen,sizeof (u32)); +if (key_num_regs != num_regs) +return -EINVAL ; +if (num_regs >NFT_REG32_COUNT )return -E2BIG ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 272/286 netfilter: nf_tables: skip dead set elements in netlink dump
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 6b1ca88e4bb63673dc9f9c7f23c899f22c3cb17a ]
Delete from packet path relies on the garbage collector to purge elements with NFT_SET_ELEM_DEAD_BIT on.
Skip these dead elements from nf_tables_dump_setelem() path, I very rarely see tests/shell/testcases/maps/typeof_maps_add_delete reports [DUMP FAILED] showing a mismatch in the expected output with an element that should not be there.
If the netlink dump happens before GC worker run, it might show dead elements in the ruleset listing.
nft_rhash_get() already skips dead elements in nft_rhash_cmp(), therefore, it already does not show the element when getting a single element via netlink control plane.
--- net/netfilter/nf_tables_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +1 -1
@@ -5011,7 +5011,7 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,const struct nft_set_ext *ext =nft_set_elem_ext (set, elem->priv);struct nft_set_dump_args *args; -if (nft_set_elem_expired (ext)) +if (nft_set_elem_expired (ext) ||nft_set_elem_is_dead (ext))return 0 ; args = container_of(iter, struct nft_set_dump_args, iter);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 273/286 netfilter: nf_tables: reject NFT_SET_CONCAT with not field length description
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 113661e07460a6604aacc8ae1b23695a89e7d4b3 ]
It is still possible to set on the NFT_SET_CONCAT flag by specifying a set size and no field description, report EINVAL in such case.
--- net/netfilter/nf_tables_api.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +5 -1
@@ -4466,8 +4466,12 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk,if (err <0 )return err; -if (desc.field_count >1 && !(flags &NFT_SET_CONCAT )) +if (desc.field_count >1 ) { +if (!(flags &NFT_SET_CONCAT )) +return -EINVAL ; + }else if (flags &NFT_SET_CONCAT ) {return -EINVAL ; + } }else if (flags &NFT_SET_CONCAT ) {return -EINVAL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 274/286 ipvs: avoid stat macros calls from preemptible context
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit d6938c1c76c64f42363d0d1f051e1b4641c2ad40 ]
Inside decrement_ttl() upon discovering that the packet ttl has exceeded, __IP_INC_STATS and __IP6_INC_STATS macros can be called from preemptible context having the following backtrace:
check_preemption_disabled: 48 callbacks suppressed
BUG: using __this_cpu_add() in preemptible [00000000] code: curl/1177 caller is decrement_ttl+0x217/0x830 CPU: 5 PID: 1177 Comm: curl Not tainted 6.7.0+ #34 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0xbd/0xe0 check_preemption_disabled+0xd1/0xe0 decrement_ttl+0x217/0x830 __ip_vs_get_out_rt+0x4e0/0x1ef0 ip_vs_nat_xmit+0x205/0xcd0 ip_vs_in_hook+0x9b1/0x26a0 nf_hook_slow+0xc2/0x210 nf_hook+0x1fb/0x770 __ip_local_out+0x33b/0x640 ip_local_out+0x2a/0x490 __ip_queue_xmit+0x990/0x1d10 __tcp_transmit_skb+0x288b/0x3d10 tcp_connect+0x3466/0x5180 tcp_v4_connect+0x1535/0x1bb0 __inet_stream_connect+0x40d/0x1040 inet_stream_connect+0x57/0xa0 __sys_connect_file+0x162/0x1a0 __sys_connect+0x137/0x160 __x64_sys_connect+0x72/0xb0 do_syscall_64+0x6f/0x140 entry_SYSCALL_64_after_hwframe+0x6e/0x76 RIP: 0033:0x7fe6dbbc34e0
Use the corresponding preemption-aware variants: IP_INC_STATS and IP6_INC_STATS.
Found by Linux Verification Center (linuxtesting.org).
--- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_xmit.c +2 -2
@@ -271,7 +271,7 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs, skb->dev = dst->dev;icmpv6_send (skb,ICMPV6_TIME_EXCEED ,ICMPV6_EXC_HOPLIMIT ,0 ); -__IP6_INC_STATS (net, idev,IPSTATS_MIB_INHDRERRORS ); +IP6_INC_STATS (net, idev,IPSTATS_MIB_INHDRERRORS );return false; }
@@ -286,7 +286,7 @@ static inline bool decrement_ttl(struct netns_ipvs *ipvs, {if (ip_hdr (skb)->ttl <=1 ) {/* Tell the sender its packet died... */ -__IP_INC_STATS (net,IPSTATS_MIB_INHDRERRORS ); +IP_INC_STATS (net,IPSTATS_MIB_INHDRERRORS );icmp_send (skb,ICMP_TIME_EXCEEDED ,ICMP_EXC_TTL ,0 );return false; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 275/286 kdb: Fix a potential buffer overflow in kdb_local()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c ]
When appending "[defcmd]" to 'kdb_prompt_str', the size of the string already in the buffer should be taken into account.
An option could be to switch from strncat() to strlcat() which does the correct test to avoid such an overflow.
However, this actually looks as dead code, because 'defcmd_in_progress' can't be true here.
See a more detailed explanation at [1].
[1]: https://lore.kernel.org/all/CAD=FV=WSh7wKN7Yp-3wWiDgX4E3isQ8uh0LCzTmd1v9Cg9j+nQ@mail.gmail.com/
--- kernel/debug/kdb/kdb_main.c | 2 -- 1 file changed, 2 deletions(-)
kernel/debug/kdb/kdb_main.c +0 -2
@@ -1364,8 +1364,6 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs,/* PROMPT can only be set if we have MEM_READ permission. */ snprintf (kdb_prompt_str,CMD_BUFLEN ,kdbgetenv ("PROMPT" ),raw_smp_processor_id ()); -if (defcmd_in_progress) -strncat (kdb_prompt_str,"[defcmd]" ,CMD_BUFLEN );/* * Fetch command from keyboard
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 276/286 ethtool: netlink: Add missing ethnl_ops_begin/complete
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ludvig Pärsson <[email protected]>
[ Upstream commit f1172f3ee3a98754d95b968968920a7d03fdebcc ]
Accessing an ethernet device that is powered off or clock gated might cause the CPU to hang. Add ethnl_ops_begin/complete in ethnl_set_features() to protect against this.
--- net/ethtool/features.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/ethtool/features.c +7 -2
@@ -235,17 +235,20 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) dev = req_info.dev;rtnl_lock (); + ret =ethnl_ops_begin (dev); +if (ret <0 ) + goto out_rtnl;ethnl_features_to_bitmap (old_active, dev->features);ethnl_features_to_bitmap (old_wanted, dev->wanted_features); ret =ethnl_parse_bitset (req_wanted, req_mask,NETDEV_FEATURE_COUNT , tb[ETHTOOL_A_FEATURES_WANTED ], netdev_features_strings, info->extack);if (ret <0 ) - goto out_rtnl; + goto out_ops;if (ethnl_bitmap_to_features (req_mask) & ~NETIF_F_ETHTOOL_BITS ) {GENL_SET_ERR_MSG (info,"attempt to change non-ethtool features" ); ret = -EINVAL ; - goto out_rtnl; + goto out_ops; }/* set req_wanted bits not in req_mask from old_wanted */
@@ -282,6 +285,8 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)if (mod)netdev_features_change (dev); +out_ops: +ethnl_ops_complete (dev); out_rtnl:rtnl_unlock ();dev_put (dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 277/286 mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Cohen <[email protected]>
[ Upstream commit 6d6eeabcfaba2fcadf5443b575789ea606f9de83 ]
Lately, a bug was found when many TC filters are added - at some point, several bugs are printed to dmesg [1] and the switch is crashed with segmentation fault.
The issue starts when gen_pool_free() fails because of unexpected behavior - a try to free memory which is already freed, this leads to BUG() call which crashes the switch and makes many other bugs.
Trying to track down the unexpected behavior led to a bug in eRP code. The function mlxsw_sp_acl_erp_table_alloc() gets a pointer to the allocated index, sets the value and returns an error code. When gen_pool_alloc() fails it returns address 0, we track it and return -ENOBUFS outside, BUT the call for gen_pool_alloc() already override the index in erp_table structure. This is a problem when such allocation is done as part of table expansion. This is not a new table, which will not be used in case of allocation failure. We try to expand eRP table and override the current index (non-zero) with zero. Then, it leads to an unexpected behavior when address 0 is freed twice. Note that address 0 is valid in erp_table->base_index and indeed other tables use it.
gen_pool_alloc() fails in case that there is no space left in the pre-allocated pool, in our case, the pool is limited to ACL_MAX_ERPT_BANK_SIZE, which is read from hardware. When more than max erp entries are required, we exceed the limit and return an error, this error leads to "Failed to migrate vregion" print.
Fix this by changing erp_table->base_index only in case of a successful allocation.
Add a test case for such a scenario. Without this fix it causes segmentation fault:
$ TESTS="max_erp_entries_test" ./tc_flower.sh ./tc_flower.sh: line 988: 1560 Segmentation fault tc filter del dev $h2 ingress chain $i protocol ip pref $i handle $j flower &>/dev/null
[1]:
kernel BUG at lib/genalloc.c:508!
invalid opcode: 0000 [#1] PREEMPT SMP
CPU: 6 PID: 3531 Comm: tc Not tainted 6.7.0-rc5-custom-ga6893f479f5e #1 Hardware name: Mellanox Technologies Ltd. MSN4700/VMOD0010, BIOS 5.11 07/12/2021 RIP: 0010:gen_pool_free_owner+0xc9/0xe0 ... Call Trace: <TASK> __mlxsw_sp_acl_erp_table_other_dec+0x70/0xa0 [mlxsw_spectrum] mlxsw_sp_acl_erp_mask_destroy+0xf5/0x110 [mlxsw_spectrum] objagg_obj_root_destroy+0x18/0x80 [objagg] objagg_obj_destroy+0x12c/0x130 [objagg] mlxsw_sp_acl_erp_mask_put+0x37/0x50 [mlxsw_spectrum] mlxsw_sp_acl_ctcam_region_entry_remove+0x74/0xa0 [mlxsw_spectrum] mlxsw_sp_acl_ctcam_entry_del+0x1e/0x40 [mlxsw_spectrum] mlxsw_sp_acl_tcam_ventry_del+0x78/0xd0 [mlxsw_spectrum] mlxsw_sp_flower_destroy+0x4d/0x70 [mlxsw_spectrum] mlxsw_sp_flow_block_cb+0x73/0xb0 [mlxsw_spectrum] tc_setup_cb_destroy+0xc1/0x180 fl_hw_destroy_filter+0x94/0xc0 [cls_flower] __fl_delete+0x1ac/0x1c0 [cls_flower] fl_destroy+0xc2/0x150 [cls_flower] tcf_proto_destroy+0x1a/0xa0
...mlxsw_spectrum3 0000:07:00.0: Failed to migrate vregion mlxsw_spectrum3 0000:07:00.0: Failed to migrate vregion
--- .../mellanox/mlxsw/spectrum_acl_erp.c | 8 +-- .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 52 ++++++++++++++++++- 2 files changed, 56 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c +5 -3
@@ -301,6 +301,7 @@ mlxsw_sp_acl_erp_table_alloc(struct mlxsw_sp_acl_erp_core *erp_core, unsigned long *p_index) {unsigned int num_rows, entry_size; +unsigned long index;/* We only allow allocations of entire rows */ if (num_erps % erp_core->num_erp_banks !=0 )
@@ -309,10 +310,11 @@ mlxsw_sp_acl_erp_table_alloc(struct mlxsw_sp_acl_erp_core *erp_core, entry_size = erp_core->erpt_entries_size[region_type]; num_rows = num_erps / erp_core->num_erp_banks; - *p_index =gen_pool_alloc (erp_core->erp_tables, num_rows * entry_size); -if (*p_index ==0 ) + index =gen_pool_alloc (erp_core->erp_tables, num_rows * entry_size); +if (!index)return -ENOBUFS ; - *p_index -=MLXSW_SP_ACL_ERP_GENALLOC_OFFSET ; + + *p_index = index -MLXSW_SP_ACL_ERP_GENALLOC_OFFSET ;return 0 ; }
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh +51 -1
64 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 278/286 mlxsw: spectrum: Use bitmap_zalloc() when applicable
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 2c087dfcc9d5e7e8557d217f01f58ba42d1ddbf1 ]
Use 'bitmap_zalloc()' to simplify code, improve the semantic and avoid some open-coded arithmetic in allocator arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep consistency.
Stable-dep-of: 483ae90d8f97 ("mlxsw: spectrum_acl_tcam: Fix stack corruption")
--- .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 8 +++----- .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 15 ++++++--------- .../net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 9 +++------ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 11 ++++------- 4 files changed, 16 insertions(+), 27 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c +3 -5
@@ -119,7 +119,6 @@ mlxsw_sp_acl_atcam_region_12kb_init(struct mlxsw_sp_acl_atcam_region *aregion) {struct mlxsw_sp *mlxsw_sp = aregion->region->mlxsw_sp;struct mlxsw_sp_acl_atcam_region_12kb *region_12kb; -size_t alloc_size;u64 max_lkey_id;int err;
@@ -131,8 +130,7 @@ mlxsw_sp_acl_atcam_region_12kb_init(struct mlxsw_sp_acl_atcam_region *aregion)if (!region_12kb)return -ENOMEM ; - alloc_size =BITS_TO_LONGS (max_lkey_id) *sizeof (unsigned long ); - region_12kb->used_lkey_id =kzalloc (alloc_size,GFP_KERNEL ); + region_12kb->used_lkey_id =bitmap_zalloc (max_lkey_id,GFP_KERNEL );if (!region_12kb->used_lkey_id) { err = -ENOMEM ; goto err_used_lkey_id_alloc;
@@ -149,7 +147,7 @@ mlxsw_sp_acl_atcam_region_12kb_init(struct mlxsw_sp_acl_atcam_region *aregion)return 0 ; err_rhashtable_init: -kfree (region_12kb->used_lkey_id); +bitmap_free (region_12kb->used_lkey_id); err_used_lkey_id_alloc:kfree (region_12kb);return err;
@@ -161,7 +159,7 @@ mlxsw_sp_acl_atcam_region_12kb_fini(struct mlxsw_sp_acl_atcam_region *aregion)struct mlxsw_sp_acl_atcam_region_12kb *region_12kb = aregion->priv;rhashtable_destroy (®ion_12kb->lkey_ht); -kfree (region_12kb->used_lkey_id); +bitmap_free (region_12kb->used_lkey_id);kfree (region_12kb); }
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +6 -9
@@ -36,7 +36,6 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp,u64 max_tcam_regions;u64 max_regions;u64 max_groups; -size_t alloc_size;int err;mutex_init (&tcam->lock);
@@ -52,15 +51,13 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp,if (max_tcam_regions < max_regions) max_regions = max_tcam_regions; - alloc_size =sizeof (tcam->used_regions[0 ]) *BITS_TO_LONGS (max_regions); - tcam->used_regions =kzalloc (alloc_size,GFP_KERNEL ); + tcam->used_regions =bitmap_zalloc (max_regions,GFP_KERNEL );if (!tcam->used_regions)return -ENOMEM ; tcam->max_regions = max_regions; max_groups =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_GROUPS ); - alloc_size =sizeof (tcam->used_groups[0 ]) *BITS_TO_LONGS (max_groups); - tcam->used_groups =kzalloc (alloc_size,GFP_KERNEL ); + tcam->used_groups =bitmap_zalloc (max_groups,GFP_KERNEL );if (!tcam->used_groups) { err = -ENOMEM ; goto err_alloc_used_groups;
@@ -76,9 +73,9 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp,return 0 ; err_tcam_init: -kfree (tcam->used_groups); +bitmap_free (tcam->used_groups); err_alloc_used_groups: -kfree (tcam->used_regions); +bitmap_free (tcam->used_regions);return err; }
@@ -89,8 +86,8 @@ void mlxsw_sp_acl_tcam_fini(struct mlxsw_sp *mlxsw_sp,mutex_destroy (&tcam->lock); ops->fini (mlxsw_sp, tcam->priv); -kfree (tcam->used_groups); -kfree (tcam->used_regions); +bitmap_free (tcam->used_groups); +bitmap_free (tcam->used_regions); } int mlxsw_sp_acl_tcam_priority_get(struct mlxsw_sp *mlxsw_sp,
drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c +3 -6
@@ -122,7 +122,6 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp)unsigned int sub_pools_count =ARRAY_SIZE (mlxsw_sp_counter_sub_pools);struct devlink *devlink =priv_to_devlink (mlxsw_sp->core);struct mlxsw_sp_counter_pool *pool; -unsigned int map_size;int err; pool = kzalloc(struct_size(pool, sub_pools, sub_pools_count),
@@ -143,9 +142,7 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp)devlink_resource_occ_get_register (devlink,MLXSW_SP_RESOURCE_COUNTERS , mlxsw_sp_counter_pool_occ_get, pool); - map_size =BITS_TO_LONGS (pool->pool_size) *sizeof (unsigned long ); - - pool->usage =kzalloc (map_size,GFP_KERNEL ); + pool->usage =bitmap_zalloc (pool->pool_size,GFP_KERNEL );if (!pool->usage) { err = -ENOMEM ; goto err_usage_alloc;
@@ -158,7 +155,7 @@ int mlxsw_sp_counter_pool_init(struct mlxsw_sp *mlxsw_sp)return 0 ; err_sub_pools_init: -kfree (pool->usage); +bitmap_free (pool->usage); err_usage_alloc:devlink_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_COUNTERS );
@@ -176,7 +173,7 @@ void mlxsw_sp_counter_pool_fini(struct mlxsw_sp *mlxsw_sp)WARN_ON (find_first_bit (pool->usage, pool->pool_size) != pool->pool_size);WARN_ON (atomic_read (&pool->active_entries_count)); -kfree (pool->usage); +bitmap_free (pool->usage);devlink_resource_occ_get_unregister (devlink,MLXSW_SP_RESOURCE_COUNTERS );kfree (pool);
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +4 -7
@@ -1631,16 +1631,13 @@ mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp, u16 fid) {struct mlxsw_sp_mid *mid; -size_t alloc_size; mid =kzalloc (sizeof (*mid),GFP_KERNEL );if (!mid)return NULL ; - alloc_size =sizeof (unsigned long ) * -BITS_TO_LONGS (mlxsw_core_max_ports (mlxsw_sp->core)); - - mid->ports_in_mid =kzalloc (alloc_size,GFP_KERNEL ); + mid->ports_in_mid =bitmap_zalloc (mlxsw_core_max_ports (mlxsw_sp->core), +GFP_KERNEL );if (!mid->ports_in_mid) goto err_ports_in_mid_alloc;
@@ -1659,7 +1656,7 @@ mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,return mid; err_write_mdb_entry: -kfree (mid->ports_in_mid); +bitmap_free (mid->ports_in_mid); err_ports_in_mid_alloc:kfree (mid);return NULL ;
@@ -1676,7 +1673,7 @@ static int mlxsw_sp_port_remove_from_mid(struct mlxsw_sp_port *mlxsw_sp_port, mlxsw_core_max_ports(mlxsw_sp->core))) { err =mlxsw_sp_mc_remove_mdb_entry (mlxsw_sp, mid);list_del (&mid->list); -kfree (mid->ports_in_mid); +bitmap_free (mid->ports_in_mid);kfree (mid); }return err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 279/286 mlxsw: spectrum_acl_tcam: Add missing mutex_destroy()
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 65823e07b1e4055b6278725fd92f4d7e6f8d53fd ]
Pair mutex_init() with a mutex_destroy() in the error path. Found during code review. No functional changes.
Stable-dep-of: 483ae90d8f97 ("mlxsw: spectrum_acl_tcam: Fix stack corruption")
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +6 -2
@@ -52,8 +52,10 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, max_regions = max_tcam_regions; tcam->used_regions =bitmap_zalloc (max_regions,GFP_KERNEL ); -if (!tcam->used_regions) -return -ENOMEM ; +if (!tcam->used_regions) { + err = -ENOMEM ; + goto err_alloc_used_regions; + } tcam->max_regions = max_regions; max_groups =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_GROUPS );
@@ -76,6 +78,8 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp,bitmap_free (tcam->used_groups); err_alloc_used_groups:bitmap_free (tcam->used_regions); +err_alloc_used_regions: +mutex_destroy (&tcam->lock);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 280/286 mlxsw: spectrum_acl_tcam: Make fini symmetric to init
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 61fe3b9102ac84ba479ab84d8f5454af2e21e468 ]
Move mutex_destroy() to the end to make the function symmetric with mlxsw_sp_acl_tcam_init(). No functional changes.
Stable-dep-of: 483ae90d8f97 ("mlxsw: spectrum_acl_tcam: Fix stack corruption")
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +1 -1
@@ -88,10 +88,10 @@ void mlxsw_sp_acl_tcam_fini(struct mlxsw_sp *mlxsw_sp, {const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops; -mutex_destroy (&tcam->lock); ops->fini (mlxsw_sp, tcam->priv);bitmap_free (tcam->used_groups);bitmap_free (tcam->used_regions); +mutex_destroy (&tcam->lock); } int mlxsw_sp_acl_tcam_priority_get(struct mlxsw_sp *mlxsw_sp,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 281/286 mlxsw: spectrum_acl_tcam: Reorder functions to avoid forward declarations
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 194ab9476089bbfc021073214e071a404e375ee6 ]
Move the initialization and de-initialization code further below in order to avoid forward declarations in the next patch. No functional changes.
Stable-dep-of: 483ae90d8f97 ("mlxsw: spectrum_acl_tcam: Fix stack corruption")
--- .../mellanox/mlxsw/spectrum_acl_tcam.c | 130 +++++++++--------- 1 file changed, 65 insertions(+), 65 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +65 -65
@@ -29,71 +29,6 @@ size_t mlxsw_sp_acl_tcam_priv_size(struct mlxsw_sp *mlxsw_sp)#define MLXSW_SP_ACL_TCAM_VREGION_REHASH_INTRVL_MIN 3000/* ms */ #define MLXSW_SP_ACL_TCAM_VREGION_REHASH_CREDITS 100/* number of entries */ -int mlxsw_sp_acl_tcam_init (struct mlxsw_sp *mlxsw_sp, -struct mlxsw_sp_acl_tcam *tcam) -{ -const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops; -u64 max_tcam_regions; -u64 max_regions; -u64 max_groups; -int err; - -mutex_init (&tcam->lock); - tcam->vregion_rehash_intrvl = -MLXSW_SP_ACL_TCAM_VREGION_REHASH_INTRVL_DFLT ; -INIT_LIST_HEAD (&tcam->vregion_list); - - max_tcam_regions =MLXSW_CORE_RES_GET (mlxsw_sp->core, -ACL_MAX_TCAM_REGIONS ); - max_regions =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_REGIONS ); - -/* Use 1:1 mapping between ACL region and TCAM region */ -if (max_tcam_regions < max_regions) - max_regions = max_tcam_regions; - - tcam->used_regions =bitmap_zalloc (max_regions,GFP_KERNEL ); -if (!tcam->used_regions) { - err = -ENOMEM ; - goto err_alloc_used_regions; - } - tcam->max_regions = max_regions; - - max_groups =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_GROUPS ); - tcam->used_groups =bitmap_zalloc (max_groups,GFP_KERNEL ); -if (!tcam->used_groups) { - err = -ENOMEM ; - goto err_alloc_used_groups; - } - tcam->max_groups = max_groups; - tcam->max_group_size =MLXSW_CORE_RES_GET (mlxsw_sp->core, -ACL_MAX_GROUP_SIZE ); - - err = ops->init (mlxsw_sp, tcam->priv, tcam); -if (err) - goto err_tcam_init; - -return 0 ; - -err_tcam_init: -bitmap_free (tcam->used_groups); -err_alloc_used_groups: -bitmap_free (tcam->used_regions); -err_alloc_used_regions: -mutex_destroy (&tcam->lock); -return err; -} - -void mlxsw_sp_acl_tcam_fini (struct mlxsw_sp *mlxsw_sp, -struct mlxsw_sp_acl_tcam *tcam) -{ -const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops; - - ops->fini (mlxsw_sp, tcam->priv); -bitmap_free (tcam->used_groups); -bitmap_free (tcam->used_regions); -mutex_destroy (&tcam->lock); -} -int mlxsw_sp_acl_tcam_priority_get (struct mlxsw_sp *mlxsw_sp,struct mlxsw_sp_acl_rule_info *rulei,u32 *priority,bool fillup_priority)
@@ -1546,6 +1481,71 @@ mlxsw_sp_acl_tcam_vregion_rehash(struct mlxsw_sp *mlxsw_sp,mlxsw_sp_acl_tcam_vregion_rehash_end (mlxsw_sp, vregion, ctx); } +int mlxsw_sp_acl_tcam_init (struct mlxsw_sp *mlxsw_sp, +struct mlxsw_sp_acl_tcam *tcam) +{ +const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops; +u64 max_tcam_regions; +u64 max_regions; +u64 max_groups; +int err; + +mutex_init (&tcam->lock); + tcam->vregion_rehash_intrvl = +MLXSW_SP_ACL_TCAM_VREGION_REHASH_INTRVL_DFLT ; +INIT_LIST_HEAD (&tcam->vregion_list); + + max_tcam_regions =MLXSW_CORE_RES_GET (mlxsw_sp->core, +ACL_MAX_TCAM_REGIONS ); + max_regions =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_REGIONS ); + +/* Use 1:1 mapping between ACL region and TCAM region */ +if (max_tcam_regions < max_regions) + max_regions = max_tcam_regions; + + tcam->used_regions =bitmap_zalloc (max_regions,GFP_KERNEL ); +if (!tcam->used_regions) { + err = -ENOMEM ; + goto err_alloc_used_regions; + } + tcam->max_regions = max_regions; + + max_groups =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_GROUPS ); + tcam->used_groups =bitmap_zalloc (max_groups,GFP_KERNEL ); +if (!tcam->used_groups) { + err = -ENOMEM ; + goto err_alloc_used_groups; + } + tcam->max_groups = max_groups; + tcam->max_group_size =MLXSW_CORE_RES_GET (mlxsw_sp->core, +ACL_MAX_GROUP_SIZE ); + + err = ops->init (mlxsw_sp, tcam->priv, tcam); +if (err) + goto err_tcam_init; + +return 0 ; + +err_tcam_init: +bitmap_free (tcam->used_groups); +err_alloc_used_groups: +bitmap_free (tcam->used_regions); +err_alloc_used_regions: +mutex_destroy (&tcam->lock); +return err; +} + +void mlxsw_sp_acl_tcam_fini (struct mlxsw_sp *mlxsw_sp, +struct mlxsw_sp_acl_tcam *tcam) +{ +const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops; + + ops->fini (mlxsw_sp, tcam->priv); +bitmap_free (tcam->used_groups); +bitmap_free (tcam->used_regions); +mutex_destroy (&tcam->lock); +} +static const enum mlxsw_afk_element mlxsw_sp_acl_tcam_pattern_ipv4[] = {MLXSW_AFK_ELEMENT_SRC_SYS_PORT ,MLXSW_AFK_ELEMENT_DMAC_32_47 ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 282/286 mlxsw: spectrum_acl_tcam: Fix stack corruption
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 483ae90d8f976f8339cf81066312e1329f2d3706 ]
When tc filters are first added to a net device, the corresponding local port gets bound to an ACL group in the device. The group contains a list of ACLs. In turn, each ACL points to a different TCAM region where the filters are stored. During forwarding, the ACLs are sequentially evaluated until a match is found.
One reason to place filters in different regions is when they are added with decreasing priorities and in an alternating order so that two consecutive filters can never fit in the same region because of their key usage.
In Spectrum-2 and newer ASICs the firmware started to report that the maximum number of ACLs in a group is more than 16, but the layout of the register that configures ACL groups (PAGT) was not updated to account for that. It is therefore possible to hit stack corruption [1] in the rare case where more than 16 ACLs in a group are required.
Fix by limiting the maximum ACL group size to the minimum between what the firmware reports and the maximum ACLs that fit in the PAGT register.
Add a test case to make sure the machine does not crash when this condition is hit.
[1]
Kernel panic - not syncing: stack-protector: Kernel stack is corrupted in: mlxsw_sp_acl_tcam_group_update+0x116/0x120 [...] dump_stack_lvl+0x36/0x50 panic+0x305/0x330 __stack_chk_fail+0x15/0x20 mlxsw_sp_acl_tcam_group_update+0x116/0x120 mlxsw_sp_acl_tcam_group_region_attach+0x69/0x110 mlxsw_sp_acl_tcam_vchunk_get+0x492/0xa20 mlxsw_sp_acl_tcam_ventry_add+0x25/0xe0 mlxsw_sp_acl_rule_add+0x47/0x240 mlxsw_sp_flower_replace+0x1a9/0x1d0 tc_setup_cb_add+0xdc/0x1c0 fl_hw_replace_filter+0x146/0x1f0 fl_change+0xc17/0x1360 tc_new_tfilter+0x472/0xb90 rtnetlink_rcv_msg+0x313/0x3b0 netlink_rcv_skb+0x58/0x100 netlink_unicast+0x244/0x390 netlink_sendmsg+0x1e4/0x440 ____sys_sendmsg+0x164/0x260 ___sys_sendmsg+0x9a/0xe0 __sys_sendmsg+0x7a/0xc0 do_syscall_64+0x40/0xe0 entry_SYSCALL_64_after_hwframe+0x63/0x6b
--- .../mellanox/mlxsw/spectrum_acl_tcam.c | 2 + .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 56 ++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +2 -0
@@ -1519,6 +1519,8 @@ int mlxsw_sp_acl_tcam_init(struct mlxsw_sp *mlxsw_sp, tcam->max_groups = max_groups; tcam->max_group_size =MLXSW_CORE_RES_GET (mlxsw_sp->core,ACL_MAX_GROUP_SIZE ); + tcam->max_group_size = min_t(unsigned int, tcam->max_group_size, +MLXSW_REG_PAGT_ACL_MAX_NUM ); err = ops->init (mlxsw_sp, tcam->priv, tcam);if (err)
tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh +55 -1
68 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 283/286 selftests: mlxsw: qos_pfc: Convert to iproute2 dcb
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Machata <[email protected]>
[ Upstream commit b0bab2298ec9b3a837f8ef4a0cae4b42a4d03365 ]
There is a dedicated tool for configuration of DCB in iproute2 now. Use it in the selftest instead of mlnx_qos.
Stable-dep-of: b34f4de6d30c ("selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes")
--- .../selftests/drivers/net/mlxsw/qos_pfc.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh +12 -12
@@ -171,7 +171,7 @@ switch_create() # assignment. tc qdisc replace dev $swp1 root handle 1: \ ets bands 8 strict 8 priomap 7 6 - __mlnx_qos -i $swp1 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp1 prio-buffer all:0 1:1 # $swp2 # -----
@@ -209,8 +209,8 @@ switch_create() # the lossless prio into a buffer of its own. Don't bother with buffer # sizes though, there is not going to be any pressure in the "backward" # direction. - __mlnx_qos -i $swp3 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null - __mlnx_qos -i $swp3 --pfc=0,1,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp3 prio-buffer all:0 1:1 + dcb pfc set dev $swp3 prio-pfc all:off 1:on # $swp4 # -----
@@ -226,11 +226,11 @@ switch_create() # Configure qdisc so that we can hand-tune headroom. tc qdisc replace dev $swp4 root handle 1: \ ets bands 8 strict 8 priomap 7 6 - __mlnx_qos -i $swp4 --prio2buffer=0,1,0,0,0,0,0,0 >/dev/null - __mlnx_qos -i $swp4 --pfc=0,1,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp4 prio-buffer all:0 1:1 + dcb pfc set dev $swp4 prio-pfc all:off 1:on # PG0 will get autoconfigured to Xoff, give PG1 arbitrarily 100K, which # is (-2*MTU) about 80K of delay provision. - __mlnx_qos -i $swp4 --buffer_size=0,$_100KB,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp4 buffer-size all:0 1:$_100KB # bridges # -------
@@ -273,9 +273,9 @@ switch_destroy() # $swp4 # ----- - __mlnx_qos -i $swp4 --buffer_size=0,0,0,0,0,0,0,0 >/dev/null - __mlnx_qos -i $swp4 --pfc=0,0,0,0,0,0,0,0 >/dev/null - __mlnx_qos -i $swp4 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp4 buffer-size all:0 + dcb pfc set dev $swp4 prio-pfc all:off + dcb buffer set dev $swp4 prio-buffer all:0 tc qdisc del dev $swp4 root devlink_tc_bind_pool_th_restore $swp4 1 ingress
@@ -288,8 +288,8 @@ switch_destroy() # $swp3 # ----- - __mlnx_qos -i $swp3 --pfc=0,0,0,0,0,0,0,0 >/dev/null - __mlnx_qos -i $swp3 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null + dcb pfc set dev $swp3 prio-pfc all:off + dcb buffer set dev $swp3 prio-buffer all:0 tc qdisc del dev $swp3 root devlink_tc_bind_pool_th_restore $swp3 1 egress
@@ -315,7 +315,7 @@ switch_destroy() # $swp1 # ----- - __mlnx_qos -i $swp1 --prio2buffer=0,0,0,0,0,0,0,0 >/dev/null + dcb buffer set dev $swp1 prio-buffer all:0 tc qdisc del dev $swp1 root devlink_tc_bind_pool_th_restore $swp1 1 ingress
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 284/286 selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Cohen <[email protected]>
[ Upstream commit b34f4de6d30cbaa8fed905a5080b6eace8c84dc7 ]
'qos_pfc' test checks PFC behavior. The idea is to limit the traffic using a shaper somewhere in the flow of the packets. In this area, the buffer is smaller than the buffer at the beginning of the flow, so it fills up until there is no more space left. The test configures there PFC which is supposed to notice that the headroom is filling up and send PFC Xoff to indicate the transmitter to stop sending traffic for the priorities sharing this PG.
The Xon/Xoff threshold is auto-configured and always equal to 2*(MTU rounded up to cell size). Even after sending the PFC Xoff packet, traffic will keep arriving until the transmitter receives and processes the PFC packet. This amount of traffic is known as the PFC delay allowance.
Currently the buffer for the delay traffic is configured as 100KB. The MTU in the test is 10KB, therefore the threshold for Xoff is about 20KB. This allows 80KB extra to be stored in this buffer.
8-lane ports use two buffers among which the configured buffer is split, the Xoff threshold then applies to each buffer in parallel.
The test does not take into account the behavior of 8-lane ports, when the ports are configured to 400Gbps with 8 lanes or 800Gbps with 8 lanes, packets are dropped and the test fails.
Check if the relevant ports use 8 lanes, in such case double the size of the buffer, as the headroom is split half-half.
--- .../selftests/drivers/net/mlxsw/qos_pfc.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
tools/testing/selftests/drivers/net/mlxsw/qos_pfc.sh +17 -1
@@ -121,6 +121,9 @@ h2_destroy() switch_create() { + local lanes_swp4 + local pg1_size + # pools # -----
@@ -230,7 +233,20 @@ switch_create() dcb pfc set dev $swp4 prio-pfc all:off 1:on # PG0 will get autoconfigured to Xoff, give PG1 arbitrarily 100K, which # is (-2*MTU) about 80K of delay provision. - dcb buffer set dev $swp4 buffer-size all:0 1:$_100KB + pg1_size=$_100KB + + setup_wait_dev_with_timeout $swp4 + + lanes_swp4=$(ethtool $swp4 | grep 'Lanes:') + lanes_swp4=${lanes_swp4#*"Lanes: "} + + # 8-lane ports use two buffers among which the configured buffer + # is split, so double the size to get twice (20K + 80K). + if [[ $lanes_swp4 -eq 8 ]]; then + pg1_size=$((pg1_size * 2)) + fi + + dcb buffer set dev $swp4 buffer-size all:0 1:$pg1_size # bridges # -------
Signature · 1 line
2.43.0
Greg Kroah-Hartman wrote on Mon, Jan 22, 2024 at 03:55:06PM -0800:
Quoted 5 lines
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Quoted 8 lines
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.209-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.
Tested 3c264a5f70c7 ("Linux 5.10.209-rc1") on:
- arm i.MX6ULL (Armadillo 640)
- arm64 i.MX8MP (Armadillo G4)
No obvious regression in dmesg or basic tests:
Signature · 1 line
Dominique
Greg Kroah-Hartman
maintainerPATCH 285/286 i2c: s3c24xx: fix read transfers in polling mode
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 0d9cf23ed55d7ba3ab26d617a3ae507863674c8f ]
To properly handle read transfers in polling mode, no waiting for the ACK state is needed as it will never come. Just wait a bit to ensure start state is on the bus and continue processing next bytes.
--- drivers/i2c/busses/i2c-s3c2410.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-s3c2410.c +11 -2
@@ -223,8 +223,17 @@ static bool is_ack(struct s3c24xx_i2c *i2c)int tries;for (tries =50 ; tries; --tries) { -if (readl (i2c->regs +S3C2410_IICCON ) - &S3C2410_IICCON_IRQPEND ) { +unsigned long tmp =readl (i2c->regs +S3C2410_IICCON ); + +if (!(tmp &S3C2410_IICCON_ACKEN )) { +/* +* Wait a bit for the bus to stabilize, +* delay estimated experimentally. +*/ +usleep_range (100 ,200 ); +return true; + } +if (tmp &S3C2410_IICCON_IRQPEND ) {if (!(readl (i2c->regs +S3C2410_IICSTAT ) &S3C2410_IICSTAT_LASTBIT ))return true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 286/286 i2c: s3c24xx: fix transferring more than one message in polling mode
In reply to Greg Kroah-Hartman5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 990489e1042c6c5d6bccf56deca68f8dbeed8180 ]
To properly handle ACK on the bus when transferring more than one message in polling mode, move the polling handling loop from s3c24xx_i2c_message_start() to s3c24xx_i2c_doxfer(). This way i2c_s3c_irq_nextbyte() is always executed till the end, properly acknowledging the IRQ bits and no recursive calls to i2c_s3c_irq_nextbyte() are made.
While touching this, also fix finishing transfers in polling mode by using common code path and always waiting for the bus to become idle and disabled.
--- drivers/i2c/busses/i2c-s3c2410.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
drivers/i2c/busses/i2c-s3c2410.c +10 -17
@@ -286,16 +286,6 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, stat |=S3C2410_IICSTAT_START ;writel (stat, i2c->regs +S3C2410_IICSTAT ); - -if (i2c->quirks &QUIRK_POLL ) { -while ((i2c->msg_num !=0 ) &&is_ack (i2c)) { -i2c_s3c_irq_nextbyte (i2c, stat); - stat =readl (i2c->regs +S3C2410_IICSTAT ); - -if (stat &S3C2410_IICSTAT_ARBITR ) -dev_err (i2c->dev,"deal with arbitration loss\n" ); - } - } }static inline void s3c24xx_i2c_stop (struct s3c24xx_i2c *i2c,int ret)
@@ -702,7 +692,7 @@ static void s3c24xx_i2c_wait_idle(struct s3c24xx_i2c *i2c)static int s3c24xx_i2c_doxfer (struct s3c24xx_i2c *i2c,struct i2c_msg *msgs,int num) { -unsigned long timeout; +unsigned long timeout =0 ;int ret; ret =s3c24xx_i2c_set_master (i2c);
@@ -722,16 +712,19 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,s3c24xx_i2c_message_start (i2c, msgs);if (i2c->quirks &QUIRK_POLL ) { - ret = i2c->msg_idx; +while ((i2c->msg_num !=0 ) &&is_ack (i2c)) { +unsigned long stat =readl (i2c->regs +S3C2410_IICSTAT ); -if (ret != num) -dev_dbg (i2c->dev,"incomplete xfer (%d)\n" , ret); +i2c_s3c_irq_nextbyte (i2c, stat); - goto out; + stat =readl (i2c->regs +S3C2410_IICSTAT ); +if (stat &S3C2410_IICSTAT_ARBITR ) +dev_err (i2c->dev,"deal with arbitration loss\n" ); + } + }else { + timeout =wait_event_timeout (i2c->wait, i2c->msg_num ==0 ,HZ *5 ); } - timeout =wait_event_timeout (i2c->wait, i2c->msg_num ==0 ,HZ *5 ); - ret = i2c->msg_idx;/*
Signature · 1 line
2.43.0
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.209-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.209-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.10.209-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.10.y
* git commit: 3c264a5f70c74960386987716dab9e042db1689b
* git describe: v5.10.208-287-g3c264a5f70c7
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.208-287-g3c264a5f70c7
## Test Regressions (compared to v5.10.208)
## Metric Regressions (compared to v5.10.208)
## Test Fixes (compared to v5.10.208)
## Metric Fixes (compared to v5.10.208)
## Test result summary
total: 97987, pass: 74379, fail: 4011, skip: 19507, xfail: 90
## Build Summary
* arc: 5 total, 5 passed, 0 failed
* arm: 117 total, 117 passed, 0 failed
* arm64: 44 total, 44 passed, 0 failed
* i386: 35 total, 35 passed, 0 failed
* mips: 24 total, 24 passed, 0 failed
* parisc: 3 total, 0 passed, 3 failed
* powerpc: 25 total, 25 passed, 0 failed
* riscv: 11 total, 11 passed, 0 failed
* s390: 12 total, 12 passed, 0 failed
* sh: 10 total, 10 passed, 0 failed
* sparc: 8 total, 8 passed, 0 failed
* x86_64: 38 total, 38 passed, 0 failed
## Test suites summary
* boot
* kselftest-android
* kselftest-arm64
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-exec
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-filesystems-epoll
* kselftest-firmware
* kselftest-fpu
* kselftest-ftrace
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-net-forwarding
* kselftest-net-mptcp
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-sigaltstack
* kselftest-size
* kselftest-tc-testing
* kselftest-timens
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-user_events
* kselftest-vDSO
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* perf
* rcutorture
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithm
Curious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Guenter
Greg Kroah-Hartman
maintainerQuoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
thanks,
greg k-h
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
In file included from /home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from /home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from /home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from /home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to __read_overflow2_field declared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
__read_overflow2_field(q_size_field, size);
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem. Of course, on top of all that, the error message is completely useless.
Either case, we don't use that code in chromeos-5.10, so reverting the entire series from the merge was the easiest way to proceed. But we really don't have an incentive to apply the series to v5.15.y because we don't need/use it there, and we might end up having to revert it from there as well if it is applied.
Guenter
Greg Kroah-Hartman
maintainerQuoted 48 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem. Of course, on top of all that, the error message is completely useless.
Quoted 5 lines
Either case, we don't use that code in chromeos-5.10, so reverting the entire series from the merge was the easiest way to proceed. But we really don't have an incentive to apply the series to v5.15.y because we don't need/use it there, and we might end up having to revert it from there as well if it is applied.
If this is causing build issues, I'll drop this, I was worried about it during review but no one had any reports then, but now it looks like it should be reworked. I'll go revert them, thanks.
greg k-h
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit eaafc590053b ("fortify: Explicitly disable Clang support") as commit c19861d34c003 ("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit 281d0c962752 ("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
https://github.com/ClangBuiltLinux/continuous-integration2/actions/runs/7662499796
https://github.com/ClangBuiltLinux/continuous-integration2/actions/runs/7662534888
Reverting this series from 5.10 seems reasonable given your other comments but if there is still something to sort out upstream, I definitely want to.
Quoted 1 line
Of course, on top of all that, the error message is completely useless.
Indeed, outstanding papercut unfortunately:
https://github.com/ClangBuiltLinux/linux/issues/1571
Cheers,
Nathan
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);
Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.
That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.
Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf /tmp/crypto-build
mkdir /tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15 drivers/crypto/virtio/virtio_crypto_akcipher_algs.o
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
Guenter
Greg Kroah-Hartman
maintainerQuoted 50 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.
Quoted 2 lines
That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
Ok, I'll leave them as-is for now, thanks.
greg k-h
(slimming up the CC list, I don't think this is too relevant to the wider stable community)
Quoted 80 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit
c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf
/tmp/crypto-build
mkdir/tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15drivers/crypto/virtio/virtio_crypto_akcipher_algs.o
Quoted 8 lines
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/bin
Okay interesting, this warning is hidden behind W=1, which our CI does not test with. Looks like it has been that way since the introduction of these checks in f68f2ff91512 ("fortify: Detect struct member overflows in memcpy() at compile-time").
I think this is a legitimate warning though. It is complaining about the second memcpy() in virtio_crypto_alg_akcipher_init_session():
memcpy(&ctrl->u, para, sizeof(ctrl->u));
where ctrl is:
struct virtio_crypto_op_ctrl_req {
struct virtio_crypto_ctrl_header header; /* 0 16 */
union {
struct virtio_crypto_sym_create_session_req sym_create_session; /* 16 56 */
struct virtio_crypto_hash_create_session_req hash_create_session; /* 16 56 */
struct virtio_crypto_mac_create_session_req mac_create_session; /* 16 56 */
struct virtio_crypto_aead_create_session_req aead_create_session; /* 16 56 */
struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 16 56 */
struct virtio_crypto_destroy_session_req destroy_session; /* 16 56 */
__u8 padding[56]; /* 16 56 */
} u; /* 16 56 */
union {
struct virtio_crypto_sym_create_session_req sym_create_session; /* 0 56 */
struct virtio_crypto_hash_create_session_req hash_create_session; /* 0 56 */
struct virtio_crypto_mac_create_session_req mac_create_session; /* 0 56 */
struct virtio_crypto_aead_create_session_req aead_create_session; /* 0 56 */
struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 0 56 */
struct virtio_crypto_destroy_session_req destroy_session; /* 0 56 */
__u8 padding[56]; /* 0 56 */
}; /* size: 72, cachelines: 2, members: 2 */
/* last cacheline: 8 bytes */};
(so size and p_size_field should be 56) and the type of the para parameter in virtio_crypto_alg_akcipher_init_session() is 'void *' but the para passed by reference to virtio_crypto_alg_akcipher_init_session() in virtio_crypto_rsa_set_key() has a type of 'struct virtio_crypto_akcipher_session_para':
struct virtio_crypto_akcipher_session_para {
__le32 algo; /* 0 4 */
__le32 keytype; /* 4 4 */
__le32 keylen; /* 8 4 */
union {
struct virtio_crypto_rsa_session_para rsa; /* 12 8 */
struct virtio_crypto_ecdsa_session_para ecdsa; /* 12 8 */
} u; /* 12 8 */
union {
struct virtio_crypto_rsa_session_para rsa; /* 0 8 */
struct virtio_crypto_ecdsa_session_para ecdsa; /* 0 8 */
}; /* size: 20, cachelines: 1, members: 4 */
/* last cacheline: 20 bytes */};
(so q_size_field would be 20 if clang were able to do inlining to see through the 'void *'...?), which would result in the
__compiletime_lessthan(q_size_field, size)
check succeeding and triggering the warning because 20 < 56, so it does seem like there is an overread of the source buffer here? Adding the maintainers of the driver and subsystem in question.
Cheers,
Nathan
Quoted 93 lines · Nathan Chancellor
(slimming up the CC list, I don't think this is too relevant to the wider stable community)
Quoted 80 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit
c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf
/tmp/crypto-build
mkdir/tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15drivers/crypto/virtio/virtio_crypto_akcipher_algs.oQuoted 8 lines
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/bin
Quoted 5 lines
Okay interesting, this warning is hidden behind W=1, which our CI does not test with. Looks like it has been that way since the introduction of these checks in
f68f2ff91512("fortify: Detect struct member overflows inmemcpy()at compile-time").
Interestingly the warning is seen in chromeos-5.10, without this patch, and without W=1. I guess that must have to do with the revert which is finally biting us.
Quoted 57 lines
I think this is a legitimate warning though. It is complaining about the second
memcpy()invirtio_crypto_alg_akcipher_init_session():memcpy(&ctrl->u, para, sizeof(ctrl->u));where ctrl is:
struct virtio_crypto_op_ctrl_req { struct virtio_crypto_ctrl_header header; /* 0 16 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 16 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 16 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 16 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 16 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 16 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 16 56 */ __u8 padding[56]; /* 16 56 */ } u; /* 16 56 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 0 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 0 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 0 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 0 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 0 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 0 56 */ __u8 padding[56]; /* 0 56 */ };/* size: 72, cachelines: 2, members: 2 */ /* last cacheline: 8 bytes */};
(so size and
p_size_fieldshould be 56) and the type of the para parameter invirtio_crypto_alg_akcipher_init_session()is 'void *' but the para passed by reference tovirtio_crypto_alg_akcipher_init_session()invirtio_crypto_rsa_set_key()has a type of 'structvirtio_crypto_akcipher_session_para':struct virtio_crypto_akcipher_session_para { __le32 algo; /* 0 4 */ __le32 keytype; /* 4 4 */ __le32 keylen; /* 8 4 */ union { struct virtio_crypto_rsa_session_para rsa; /* 12 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 12 8 */ } u; /* 12 8 */ union { struct virtio_crypto_rsa_session_para rsa; /* 0 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 0 8 */ };/* size: 20, cachelines: 1, members: 4 */ /* last cacheline: 20 bytes */};
Quoted 7 lines
(so
q_size_fieldwould be 20 if clang were able to do inlining to see through the 'void *'...?), which would result in the
__compiletime_lessthan(q_size_field, size)check succeeding and triggering the warning because 20 < 56, so it does seem like there is an overread of the source buffer here? Adding the
Looks like it; I think either the passed 'para' should be of type virtio_crypto_akcipher_create_session_req() or it should only copy sizeof(struct virtio_crypto_akcipher_session_para) bytes.
Anyway, how did you find that ? Is there a magic trick to find the actual code causing the warning ? I am asking because we had seen similar warnings before, and it would help to know how to find the problematic code.
Thanks,
Guenter
Quoted 4 lines
maintainers of the driver and subsystem in question.
Cheers,
Nathan
Quoted 4 lines · Guenter Roeck
Anyway, how did you find that ? Is there a magic trick to find the actual code causing the warning ? I am asking because we had seen similar warnings before, and it would help to know how to find the problematic code.
The easiest way I have found is figuring out what primitive is causing the warning (memset, memcpy) then just commenting out the uses in the particular file until the warning goes away. Sometimes it is quick like in this case since there were only two instances of memcpy() in that file but other cases it can definitely take time. There could be potential issues with that approach if the problematic use is in a header, at which point you could generate a preprocessed ('.i') file and see where fortify_memcpy_chk() or fortify_memset_chk() come from in that file.
Cheers,
Nathan
Michael S. Tsirkin
maintainerQuoted 173 lines · Guenter Roeck
Quoted 93 lines · Nathan Chancellor
(slimming up the CC list, I don't think this is too relevant to the wider stable community)
Quoted 80 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit
c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf
/tmp/crypto-build
mkdir/tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15drivers/crypto/virtio/virtio_crypto_akcipher_algs.oQuoted 8 lines
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/binQuoted 5 lines
Okay interesting, this warning is hidden behind W=1, which our CI does not test with. Looks like it has been that way since the introduction of these checks in
f68f2ff91512("fortify: Detect struct member overflows inmemcpy()at compile-time").Interestingly the warning is seen in chromeos-5.10, without this patch, and without W=1. I guess that must have to do with the revert which is finally biting us.
Quoted 57 lines
I think this is a legitimate warning though. It is complaining about the second
memcpy()invirtio_crypto_alg_akcipher_init_session():memcpy(&ctrl->u, para, sizeof(ctrl->u));where ctrl is:
struct virtio_crypto_op_ctrl_req { struct virtio_crypto_ctrl_header header; /* 0 16 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 16 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 16 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 16 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 16 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 16 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 16 56 */ __u8 padding[56]; /* 16 56 */ } u; /* 16 56 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 0 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 0 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 0 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 0 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 0 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 0 56 */ __u8 padding[56]; /* 0 56 */ };/* size: 72, cachelines: 2, members: 2 */ /* last cacheline: 8 bytes */};
(so size and
p_size_fieldshould be 56) and the type of the para parameter invirtio_crypto_alg_akcipher_init_session()is 'void *' but the para passed by reference tovirtio_crypto_alg_akcipher_init_session()invirtio_crypto_rsa_set_key()has a type of 'structvirtio_crypto_akcipher_session_para':struct virtio_crypto_akcipher_session_para { __le32 algo; /* 0 4 */ __le32 keytype; /* 4 4 */ __le32 keylen; /* 8 4 */ union { struct virtio_crypto_rsa_session_para rsa; /* 12 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 12 8 */ } u; /* 12 8 */ union { struct virtio_crypto_rsa_session_para rsa; /* 0 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 0 8 */ };/* size: 20, cachelines: 1, members: 4 */ /* last cacheline: 20 bytes */};
Quoted 7 lines
(so
q_size_fieldwould be 20 if clang were able to do inlining to see through the 'void *'...?), which would result in the
__compiletime_lessthan(q_size_field, size)check succeeding and triggering the warning because 20 < 56, so it does seem like there is an overread of the source buffer here? Adding the
Looks like it; I think either the passed 'para' should be of type
virtio_crypto_akcipher_create_session_req()or it should only copysizeof(struct virtio_crypto_akcipher_session_para)bytes.
Quoted 12 lines
Anyway, how did you find that ? Is there a magic trick to find the actual code causing the warning ? I am asking because we had seen similar warnings before, and it would help to know how to find the problematic code.
Thanks,
GuenterQuoted 4 lines
maintainers of the driver and subsystem in question.
Cheers,
Nathan
CC patch contributor before I revert the whole thing.
Signature · 1 line
MST
Michael S. Tsirkin
maintainerQuoted 173 lines · Guenter Roeck
Quoted 93 lines · Nathan Chancellor
(slimming up the CC list, I don't think this is too relevant to the wider stable community)
Quoted 80 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit
c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf
/tmp/crypto-build
mkdir/tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15drivers/crypto/virtio/virtio_crypto_akcipher_algs.oQuoted 8 lines
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/binQuoted 5 lines
Okay interesting, this warning is hidden behind W=1, which our CI does not test with. Looks like it has been that way since the introduction of these checks in
f68f2ff91512("fortify: Detect struct member overflows inmemcpy()at compile-time").Interestingly the warning is seen in chromeos-5.10, without this patch, and without W=1. I guess that must have to do with the revert which is finally biting us.
Quoted 57 lines
I think this is a legitimate warning though. It is complaining about the second
memcpy()invirtio_crypto_alg_akcipher_init_session():memcpy(&ctrl->u, para, sizeof(ctrl->u));where ctrl is:
struct virtio_crypto_op_ctrl_req { struct virtio_crypto_ctrl_header header; /* 0 16 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 16 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 16 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 16 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 16 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 16 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 16 56 */ __u8 padding[56]; /* 16 56 */ } u; /* 16 56 */ union { struct virtio_crypto_sym_create_session_req sym_create_session; /* 0 56 */ struct virtio_crypto_hash_create_session_req hash_create_session; /* 0 56 */ struct virtio_crypto_mac_create_session_req mac_create_session; /* 0 56 */ struct virtio_crypto_aead_create_session_req aead_create_session; /* 0 56 */ struct virtio_crypto_akcipher_create_session_req akcipher_create_session; /* 0 56 */ struct virtio_crypto_destroy_session_req destroy_session; /* 0 56 */ __u8 padding[56]; /* 0 56 */ };/* size: 72, cachelines: 2, members: 2 */ /* last cacheline: 8 bytes */};
(so size and
p_size_fieldshould be 56) and the type of the para parameter invirtio_crypto_alg_akcipher_init_session()is 'void *' but the para passed by reference tovirtio_crypto_alg_akcipher_init_session()invirtio_crypto_rsa_set_key()has a type of 'structvirtio_crypto_akcipher_session_para':struct virtio_crypto_akcipher_session_para { __le32 algo; /* 0 4 */ __le32 keytype; /* 4 4 */ __le32 keylen; /* 8 4 */ union { struct virtio_crypto_rsa_session_para rsa; /* 12 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 12 8 */ } u; /* 12 8 */ union { struct virtio_crypto_rsa_session_para rsa; /* 0 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 0 8 */ };/* size: 20, cachelines: 1, members: 4 */ /* last cacheline: 20 bytes */};
Quoted 7 lines
(so
q_size_fieldwould be 20 if clang were able to do inlining to see through the 'void *'...?), which would result in the
__compiletime_lessthan(q_size_field, size)check succeeding and triggering the warning because 20 < 56, so it does seem like there is an overread of the source buffer here? Adding the
Looks like it; I think either the passed 'para' should be of type
virtio_crypto_akcipher_create_session_req()or it should only copysizeof(struct virtio_crypto_akcipher_session_para)bytes.
Quoted 7 lines
Anyway, how did you find that ? Is there a magic trick to find the actual code causing the warning ? I am asking because we had seen similar warnings before, and it would help to know how to find the problematic code.
Thanks,
Guenter
Zhenwei I think you wrote most of the code here.
Can you take a look please?
Stack overflows are plus plus ungood.
Quoted 4 lines
Quoted 4 lines
maintainers of the driver and subsystem in question.
Cheers,
Nathan
Quoted 184 lines · Michael S. Tsirkin
Quoted 173 lines · Guenter Roeck
Quoted 93 lines · Nathan Chancellor
(slimming up the CC list, I don't think this is too relevant to the wider stable community)
Quoted 80 lines · Guenter Roeck
Quoted 40 lines · Nathan Chancellor
Quoted 32 lines · Guenter Roeck
Quoted 21 lines · Greg Kroah-Hartman
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.209 release. There are 286 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 24 Jan 2024 23:56:49 +0000. Anything received after that time might be too late.
[ ... ]
Quoted 8 lines
Quoted 3 lines
zhenwei pi <[email protected]>
virtio-crypto: implement RSA algorithmCurious: Why was this (and its subsequent fixes) backported to v5.10.y ? It is quite beyond a bug fix. Also, unless I am really missing something, the series (or at least this patch) was not applied to v5.15.y, so we now have functionality in v5.10.y which is not in v5.15.y.
Quoted 6 lines
See the commit text, it was a dependency of a later fix and documented as such.
Having it in 5.10 and not 5.15 is a bit odd, I agree, so patches are gladly accepted :)
We reverted the entire series from the merge because it results in a build failure for us.
Quoted 6 lines
In file included from
/home/groeck/src/linux-chromeos/drivers/crypto/virtio/virtio_crypto_akcipher_algs.c:10:
In file included from/home/groeck/src/linux-chromeos/include/linux/mpi.h:21:
In file included from/home/groeck/src/linux-chromeos/include/linux/scatterlist.h:5:
In file included from/home/groeck/src/linux-chromeos/include/linux/string.h:293:/home/groeck/src/linux-chromeos/include/linux/fortify-string.h:512:4: error: call to__read_overflow2_fielddeclared with 'warning' attribute: detected read beyond size of field (2nd parameter); maybe usestruct_group()? [-Werror,-Wattribute-warning]__read_overflow2_field(q_size_field, size);Quoted 8 lines
For what it's worth, this is likely self inflicted for chromeos-5.10, which carries a revert of commit
eaafc590053b("fortify: Explicitly disable Clang support") as commitc19861d34c003("CHROMIUM: Revert "fortify: Explicitly disable Clang support""). I don't see the series that added proper support for clang to fortify in 5.18 that ended with commit281d0c962752("fortify: Add Clang support") in that ChromeOS branch, so this seems somewhat expected.That explains that ;-). I don't mind if the patches stay in v5.10.y, we have them reverted anyway.
The revert was a pure process issue, as you may see when looking into commit
c19861d34c003, so, yes, I agree that it is self-inflicted damage. Still, that doesn't explain why the problem exists in 5.18+.Quoted 8 lines
Quoted 7 lines
I also see that upstream (starting with 6.1) when trying to build it with clang, so I guess it is one of those bug-for-bug compatibility things. I really have no idea what causes it, or why we don't see the problem when building chromeos-6.1 or chromeos-6.6, but (so far) only with chromeos-5.10 after merging 5.10.209 into it. Making things worse, the problem isn't _always_ seen. Sometimes I can compile the file in 6.1.y without error, sometimes not. I have no idea what triggers the problem.
Quoted 5 lines
Have a .config that reproduces it on upstream? I have not personally seen this warning in my build matrix nor has our continuous-integration matrix (I don't see it in the warning output at the bottom but that could have missed something for some reason) in 6.1:
The following command sequence reproduces the problem for me with all stable branches starting with 5.18.y (plus mainline).
rm -rf
/tmp/crypto-build
mkdir/tmp/crypto-build
make -j CC=clang-15 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-15 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-15drivers/crypto/virtio/virtio_crypto_akcipher_algs.oQuoted 8 lines
I tried clang versions 14, 15, and 16. This is with my home system running Ubuntu 22.04, no ChromeOS or Google specifics/internals involved. For clang-15, the version is
Ubuntu clang version 15.0.7
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/binQuoted 5 lines
Okay interesting, this warning is hidden behind W=1, which our CI does not test with. Looks like it has been that way since the introduction of these checks in
f68f2ff91512("fortify: Detect struct member overflows inmemcpy()at compile-time").Interestingly the warning is seen in chromeos-5.10, without this patch, and without W=1. I guess that must have to do with the revert which is finally biting us.
Quoted 57 lines
I think this is a legitimate warning though. It is complaining about the second
memcpy()invirtio_crypto_alg_akcipher_init_session():memcpy(&ctrl->u, para, sizeof(ctrl->u));where ctrl is:
struct
virtio_crypto_op_ctrl_req{
structvirtio_crypto_ctrl_headerheader; /* 0 16 */
union {
structvirtio_crypto_sym_create_session_reqsym_create_session; /* 16 56 */
structvirtio_crypto_hash_create_session_reqhash_create_session; /* 16 56 */
structvirtio_crypto_mac_create_session_reqmac_create_session; /* 16 56 */
structvirtio_crypto_aead_create_session_reqaead_create_session; /* 16 56 */
structvirtio_crypto_akcipher_create_session_reqakcipher_create_session; /* 16 56 */
structvirtio_crypto_destroy_session_reqdestroy_session; /* 16 56 */
__u8padding[56]; /* 16 56 */
} u; /* 16 56 */
union {
structvirtio_crypto_sym_create_session_reqsym_create_session; /* 0 56 */
structvirtio_crypto_hash_create_session_reqhash_create_session; /* 0 56 */
structvirtio_crypto_mac_create_session_reqmac_create_session; /* 0 56 */
structvirtio_crypto_aead_create_session_reqaead_create_session; /* 0 56 */
structvirtio_crypto_akcipher_create_session_reqakcipher_create_session; /* 0 56 */
structvirtio_crypto_destroy_session_reqdestroy_session; /* 0 56 */
__u8padding[56]; /* 0 56 */
};/* size: 72, cachelines: 2, members: 2 */ /* last cacheline: 8 bytes */
};(so size and
p_size_fieldshould be 56) and the type of the para parameter invirtio_crypto_alg_akcipher_init_session()is 'void *' but the para passed by reference tovirtio_crypto_alg_akcipher_init_session()invirtio_crypto_rsa_set_key()has a type of 'structvirtio_crypto_akcipher_session_para':struct virtio_crypto_akcipher_session_para { __le32 algo; /* 0 4 */ __le32 keytype; /* 4 4 */ __le32 keylen; /* 8 4 */ union { struct virtio_crypto_rsa_session_para rsa; /* 12 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 12 8 */ } u; /* 12 8 */ union { struct virtio_crypto_rsa_session_para rsa; /* 0 8 */ struct virtio_crypto_ecdsa_session_para ecdsa; /* 0 8 */ }; /* size: 20, cachelines: 1, members: 4 */ /* last cacheline: 20 bytes */ };Quoted 7 lines
(so
q_size_fieldwould be 20 if clang were able to do inlining to see through the 'void *'...?), which would result in the
__compiletime_lessthan(q_size_field, size)check succeeding and triggering the warning because 20 < 56, so it does seem like there is an overread of the source buffer here? Adding the
Looks like it; I think either the passed 'para' should be of type
virtio_crypto_akcipher_create_session_req()or it should only copysizeof(struct virtio_crypto_akcipher_session_para)bytes.Quoted 7 lines
Anyway, how did you find that ? Is there a magic trick to find the actual code causing the warning ? I am asking because we had seen similar warnings before, and it would help to know how to find the problematic code.
Thanks,
Guenter
Quoted 14 lines
Cc zhenwei pi <[email protected]>Zhenwei I think you wrote most of the code here.
Can you take a look please?
Stack overflows are plus plus ungood.Quoted 4 lines
Quoted 4 lines
maintainers of the driver and subsystem in question.
Cheers,
Nathan
I can also reproduce this warning by commands on ubuntu-2204:
make -j CC=clang-14 mrproper >/dev/null 2>&1
make -j O=/tmp/crypto-build CC=clang-14 allmodconfig >/dev/null 2>&1
make -j O=/tmp/crypto-build W=1 CC=clang-14 drivers/crypto/virtio/virtio_crypto_akcipher_algs.o
so sorry on this issue, I think Guenter's suggestion is right(also test by these commands), I'll send a fix later.
Signature · 1 line
zhenwei pi