fs/ntfs3: Fix work with fragmented xattr
Subsystems (12)
Sasha Levin
maintainerPATCH 1/38 fs/ntfs3: Fix work with fragmented xattr
From: Konstantin Komarov <[email protected]>
[ Upstream commit 42f86b1226a42bfc79a7125af435432ad4680a32 ]
In some cases xattr is too fragmented,
so we need to load it before writing.
--- fs/ntfs3/xattr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ntfs3/xattr.c +6 -1
@@ -118,7 +118,7 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea,run_init (&run); - err =attr_load_runs (attr_ea, ni, &run,NULL ); + err =attr_load_runs_range (ni,ATTR_EA ,NULL ,0 , &run,0 , size);if (!err) err =ntfs_read_run_nb (sbi, &run,0 , ea_p, size,NULL );run_close (&run);
@@ -444,6 +444,11 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name,/* Delete xattr, ATTR_EA */ ni_remove_attr_le (ni, attr, mi, le); }else if (attr->non_res) { + err =attr_load_runs_range (ni,ATTR_EA ,NULL ,0 , &ea_run,0 , + size); +if (err) + goto out; + err =ntfs_sb_write_run (sbi, &ea_run,0 , ea_all, size,0 );if (err) goto out;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 2/38 ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() error path
From: Biju Das <[email protected]>
[ Upstream commit c75ed9f54ce8d349fee557f2b471a4d637ed2a6b ]
We usually do cleanup in reverse order of init. Currently in case of error rz_ssi_release_dma_channels() done in the reverse order. This patch improves error handling in rz_ssi_probe() error path.
While at it, use "goto cleanup" style to reduce code duplication.
--- sound/soc/sh/rz-ssi.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
sound/soc/sh/rz-ssi.c +15 -11
@@ -1016,32 +1016,36 @@ static int rz_ssi_probe(struct platform_device *pdev) ssi->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );if (IS_ERR (ssi->rstc)) { -rz_ssi_release_dma_channels (ssi); -return PTR_ERR (ssi->rstc); + ret =PTR_ERR (ssi->rstc); + goto err_reset; }reset_control_deassert (ssi->rstc);pm_runtime_enable (&pdev->dev); ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) { -rz_ssi_release_dma_channels (ssi); -pm_runtime_disable (ssi->dev); -reset_control_assert (ssi->rstc); -return dev_err_probe (ssi->dev, ret,"pm_runtime_resume_and_get failed\n" ); +dev_err (&pdev->dev,"pm_runtime_resume_and_get failed\n" ); + goto err_pm; } ret =devm_snd_soc_register_component (&pdev->dev, &rz_ssi_soc_component, rz_ssi_soc_dai,ARRAY_SIZE (rz_ssi_soc_dai));if (ret <0 ) { -rz_ssi_release_dma_channels (ssi); - -pm_runtime_put (ssi->dev); -pm_runtime_disable (ssi->dev); -reset_control_assert (ssi->rstc);dev_err (&pdev->dev,"failed to register snd component\n" ); + goto err_snd_soc; } +return 0 ; + +err_snd_soc: +pm_runtime_put (ssi->dev); +err_pm: +pm_runtime_disable (ssi->dev); +reset_control_assert (ssi->rstc); +err_reset: +rz_ssi_release_dma_channels (ssi); +return ret; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 3/38 ASoC: rt5640: Fix the JD voltage dropping issue
In reply to Sasha LevinFrom: Oder Chiou <[email protected]>
[ Upstream commit afb176d45870048eea540991b082208270824037 ]
The patch fixes the JD voltage dropping issue in the HDA JD using.
--- sound/soc/codecs/rt5640.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5640.c +3 -2
@@ -1986,7 +1986,7 @@ static int rt5640_set_bias_level(struct snd_soc_component *component,snd_soc_component_write (component,RT5640_PWR_MIXER ,0x0000 );if (rt5640->jd_src ==RT5640_JD_SRC_HDA_HEADER )snd_soc_component_write (component,RT5640_PWR_ANLG1 , -0x0018 ); +0x2818 );else snd_soc_component_write (component,RT5640_PWR_ANLG1 ,0x0000 );
@@ -2592,7 +2592,8 @@ static void rt5640_enable_hda_jack_detect(snd_soc_component_update_bits (component,RT5640_DUMMY1 ,0x400 ,0x0 );snd_soc_component_update_bits (component,RT5640_PWR_ANLG1 , -RT5640_PWR_VREF2 ,RT5640_PWR_VREF2 ); +RT5640_PWR_VREF2 |RT5640_PWR_MB |RT5640_PWR_BG , +RT5640_PWR_VREF2 |RT5640_PWR_MB |RT5640_PWR_BG );usleep_range (10000 ,15000 );snd_soc_component_update_bits (component,RT5640_PWR_ANLG1 ,RT5640_PWR_FV2 ,RT5640_PWR_FV2 );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/38 rtla: Fix tracer name
In reply to Sasha LevinFrom: Alexandre Vicenzi <[email protected]>
[ Upstream commit f1432cd24c240cedf78c0d026631e3b10052c8e1 ]
The correct tracer name is timerlat and not timelat.
--- Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 +- tools/tracing/rtla/src/timerlat_hist.c | 2 +- tools/tracing/rtla/src/timerlat_top.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Documentation/tools/rtla/rtla-timerlat-hist.rst +1 -1
@@ -33,7 +33,7 @@ EXAMPLE ======= In the example below, **rtla timerlat hist** is set to run for *10* minutes, in the cpus *0-4*, *skipping zero* only lines. Moreover, **rtla timerlat -hist** will change the priority of the *timelat* threads to run under +hist** will change the priority of the *timerlat* threads to run under *SCHED_DEADLINE* priority, with a *10us* runtime every *1ms* period. The *1ms* period is also passed to the *timerlat* tracer::
tools/tracing/rtla/src/timerlat_hist.c +1 -1
@@ -892,7 +892,7 @@ int timerlat_hist_main(int argc, char *argv[]) return_value =0 ;if (trace_is_off (&tool->trace, &record->trace)) { -printf ("rtla timelat hit stop tracing\n" ); +printf ("rtla timerlat hit stop tracing\n" );if (params->trace_output) {printf (" Saving trace to %s\n" , params->trace_output);save_trace_to_file (record->trace.inst, params->trace_output);
tools/tracing/rtla/src/timerlat_top.c +1 -1
@@ -687,7 +687,7 @@ int timerlat_top_main(int argc, char *argv[]) return_value =0 ;if (trace_is_off (&top->trace, &record->trace)) { -printf ("rtla timelat hit stop tracing\n" ); +printf ("rtla timerlat hit stop tracing\n" );if (params->trace_output) {printf (" Saving trace to %s\n" , params->trace_output);save_trace_to_file (record->trace.inst, params->trace_output);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/38 drm/amd/display: Add a missing register field for HPO DP stream encoder
In reply to Sasha LevinFrom: Aurabindo Pillai <[email protected]>
[ Upstream commit 37bc31f0e7da4fbad4664e64d906ae7b9009e550 ]
[Why&How]
Add the missing definition to set the register field HBLANK_MINIMUM_SYMBOL_WIDTH
--- .../gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h +2 -1
@@ -162,7 +162,8 @@SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0 ,AIP_ENABLE , mask_sh),\SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0 ,ACM_ENABLE , mask_sh),\SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL ,CRC_ENABLE , mask_sh),\ - SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_CONT_MODE_ENABLE, mask_sh) +SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL ,CRC_CONT_MODE_ENABLE , mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL, HBLANK_MINIMUM_SYMBOL_WIDTH, mask_sh)#define DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST (type) \
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/38 drm/amd/display: Device flash garbage before get in OS
In reply to Sasha LevinFrom: Chiawen Huang <[email protected]>
[ Upstream commit 9c580e8f6cd6524d4e2c3490c440110526f7ddd6 ]
[Why]
Enabling stream with tg lock makes config settings pending causing the garbage until tg unlock.
[How]
Keep the original lock mechanism
The driver doesn't lock tg if plane_state is null.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -0
@@ -108,6 +108,7 @@ void dcn10_lock_all_pipes(struct dc *dc,*/ if (pipe_ctx->top_pipe || !pipe_ctx->stream || + !pipe_ctx->plane_state || !tg->funcs->is_tg_enabled (tg))continue ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/38 drm/amd/display: Avoid MPC infinite loop
In reply to Sasha LevinFrom: Josip Pavic <[email protected]>
[ Upstream commit 8de297dc046c180651c0500f8611663ae1c3828a ]
[why]
In some cases MPC tree bottom pipe ends up point to itself. This causes iterating from top to bottom to hang the system in an infinite loop.
[how]
When looping to next MPC bottom pipe, check that the pointer is not same as current to avoid infinite loop.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 ++++++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 ++++++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +6 -0
@@ -126,6 +126,12 @@ struct mpcc *mpc1_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id)while (tmp_mpcc !=NULL ) {if (tmp_mpcc->dpp_id == dpp_id)return tmp_mpcc; + +/* avoid circular linked list */ +ASSERT (tmp_mpcc != tmp_mpcc->mpcc_bot); +if (tmp_mpcc == tmp_mpcc->mpcc_bot) +break ; + tmp_mpcc = tmp_mpcc->mpcc_bot; }return NULL ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +6 -0
@@ -531,6 +531,12 @@ static struct mpcc *mpc2_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id)while (tmp_mpcc !=NULL ) {if (tmp_mpcc->dpp_id ==0xf || tmp_mpcc->dpp_id == dpp_id)return tmp_mpcc; + +/* avoid circular linked list */ +ASSERT (tmp_mpcc != tmp_mpcc->mpcc_bot); +if (tmp_mpcc == tmp_mpcc->mpcc_bot) +break ; + tmp_mpcc = tmp_mpcc->mpcc_bot; }return NULL ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 8/38 drm/amd/display: Fix HDMI VSIF V3 incorrect issue
In reply to Sasha LevinFrom: Leo Ma <[email protected]>
[ Upstream commit 0591183699fceeafb4c4141072d47775de83ecfb ]
[Why]
Reported from customer the checksum in AMD VSIF V3 is incorrect and causing blank screen issue.
[How]
Fix the packet length issue on AMD HDMI VSIF V3.
--- .../drm/amd/display/modules/freesync/freesync.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +3 -12
@@ -615,10 +615,6 @@ static void build_vrr_infopacket_data_v1(const struct mod_vrr_params *vrr,* Note: We should never go above the field rate of the mode timing set. */ infopacket->sb[8 ] = (unsigned char )((vrr->max_refresh_in_uhz +500000 ) /1000000 ); - -/* FreeSync HDR */ - infopacket->sb[9 ] =0 ; - infopacket->sb[10 ] =0 ; } static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr,
@@ -686,10 +682,6 @@ static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr,/* PB16 : Reserved bits 7:1, FixedRate bit 0 */ infopacket->sb[16 ] = (vrr->state ==VRR_STATE_ACTIVE_FIXED ) ?1 :0 ; - -//FreeSync HDR - infopacket->sb[9 ] =0 ; - infopacket->sb[10 ] =0 ; } static void build_vrr_infopacket_fs2_data(enum color_transfer_func app_tf,
@@ -774,8 +766,7 @@ static void build_vrr_infopacket_header_v2(enum signal_type signal,/* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length = 0x09] */ infopacket->hb2 =0x09 ; - *payload_size =0x0A ; - + *payload_size =0x09 ; }else if (dc_is_dp_signal (signal)) {/* HEADER */
@@ -824,9 +815,9 @@ static void build_vrr_infopacket_header_v3(enum signal_type signal, infopacket->hb1 = version;/* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length] */ - *payload_size =0x10 ; - infopacket->hb2 = *payload_size -1 ;//-1 for checksum + infopacket->hb2 =0x10 ; + *payload_size =0x10 ; }else if (dc_is_dp_signal (signal)) {/* HEADER */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 9/38 drm/amd/display: For stereo keep "FLIP_ANY_FRAME"
In reply to Sasha LevinFrom: Alvin Lee <[email protected]>
[ Upstream commit 84ef99c728079dfd21d6bc70b4c3e4af20602b3c ]
[Description]
Observed in stereomode that programming FLIP_LEFT_EYE can cause hangs. Keep FLIP_ANY_FRAME in stereo mode so the surface flip can take place before left or right eye
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c +1 -1
@@ -86,7 +86,7 @@ bool hubp3_program_surface_flip_and_addr( VMID, address->vmid);if (address->type ==PLN_ADDR_TYPE_GRPH_STEREO ) { -REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_MODE_FOR_STEREOSYNC ,0x1 ); +REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_MODE_FOR_STEREOSYNC ,0 );REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_IN_STEREOSYNC ,0x1 ); }else {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 10/38 drm/amd/display: clear optc underflow before turn off odm clock
In reply to Sasha LevinFrom: Fudong Wang <[email protected]>
[ Upstream commit b2a93490201300a749ad261b5c5d05cb50179c44 ]
[Why]
After ODM clock off, optc underflow bit will be kept there always and clear not work. We need to clear that before clock off.
[How]
Clear that if have when clock off.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +5 -0
@@ -464,6 +464,11 @@ void optc1_enable_optc_clock(struct timing_generator *optc, bool enable)OTG_CLOCK_ON ,1 , 1, 1000); }else { + +//last chance to clear underflow, otherwise, it will always there due to clock is off. +if (optc->funcs->is_optc_underflow_occurred (optc) == true) + optc->funcs->clear_optc_underflow (optc); +REG_UPDATE_2 (OTG_CLOCK_CONTROL ,OTG_CLOCK_GATE_DIS ,0 ,OTG_CLOCK_EN ,0 );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 12/38 drm/amd/pm: skip pptable override for smu_v13_0_7
In reply to Sasha LevinFrom: Kenneth Feng <[email protected]>
[ Upstream commit 4e64b529c5b04e7944b41de554ee686ecab00744 ]
skip pptable override for smu_v13_0_7 secure boards only.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +3 -7
@@ -203,6 +203,9 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)if (!adev->scpm_enabled)return 0 ; +if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 )) +return 0 ; +/* override pptable_id from driver parameter */ if (amdgpu_smu_pptable_id >=0 ) { pptable_id = amdgpu_smu_pptable_id;
@@ -210,13 +213,6 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu) }else { pptable_id = smu->smu_table.boot_values.pp_table_id; -if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 ) && - pptable_id ==3667 ) - pptable_id =36671 ; - -if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 ) && - pptable_id ==3688 ) - pptable_id =36881 ;/* * Temporary solution for SMU V13.0.0 with SCPM enabled: * - use 36831 signed pptable when pp_table_id is 3683
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 11/38 drm/amd/display: Fix TDR eDP and USB4 display light up issue
In reply to Sasha LevinFrom: Meenakshikumar Somasundaram <[email protected]>
[ Upstream commit 30456ffa65469d1d2e5e1da05017e6728d24c11c ]
[Why]
After TDR recovery, eDP and USB4 display does not light up. Because dmub outbox notifications are not enabled after dmub reload and link encoder assignments for the streams are not cleared before dc state reset.
[How]
- Dmub outbox notification is enabled after tdr recovery by issuing inbox command to dmub.
- Link encoders for the streams are unassigned before dc state reset.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 1 + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -0
@@ -3783,6 +3783,7 @@ void dc_enable_dmub_outbox(struct dc *dc)struct dc_context *dc_ctx = dc->ctx;dmub_enable_outbox_notification (dc_ctx->dmub_srv); +DC_LOG_DC ("%s: dmub outbox notifications enabled\n" , __func__); }/**
drivers/gpu/drm/amd/display/dc/dc_link.h +1 -0
@@ -337,6 +337,7 @@ enum dc_detect_reason {DETECT_REASON_HPDRX ,DETECT_REASON_FALLBACK ,DETECT_REASON_RETRAIN , + DETECT_REASON_TDR, };bool dc_link_detect (struct dc_link *dc_link,enum dc_detect_reason reason);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 13/38 drm/amdkfd: Handle restart of kfd_ioctl_wait_events
In reply to Sasha LevinFrom: Felix Kuehling <[email protected]>
[ Upstream commit bea9a56afbc4b5a41ea579b8b0dc5e189b439504 ]
When kfd_ioctl_wait_events needs to restart due to a signal, we need to update the timeout to account for the time already elapsed. We also need to undo auto_reset of events that have signaled already, so that the restarted ioctl will be able to count those signals again.
This fixes infinite hangs when kfd_ioctl_wait_events is interrupted by a signal.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 ++++++++++++------------ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +1 -1
@@ -814,7 +814,7 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p, err =kfd_wait_on_events (p, args->num_events, (void __user *)args->events_ptr, (args->wait_for_all !=0 ), - args->timeout, &args->wait_result); + &args->timeout, &args->wait_result);return err; }
drivers/gpu/drm/amd/amdkfd/kfd_events.c +12 -12
@@ -895,7 +895,8 @@ static long user_timeout_to_jiffies(uint32_t user_timeout_ms)return msecs_to_jiffies (user_timeout_ms) +1 ; } -static void free_waiters (uint32_t num_events,struct kfd_event_waiter *waiters) +static void free_waiters (uint32_t num_events,struct kfd_event_waiter *waiters, +bool undo_auto_reset) {uint32_t i;
@@ -904,6 +905,9 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters)spin_lock (&waiters[i].event->lock);remove_wait_queue (&waiters[i].event->wq, &waiters[i].wait); +if (undo_auto_reset && waiters[i].activated && + waiters[i].event && waiters[i].event->auto_reset) +set_event (waiters[i].event);spin_unlock (&waiters[i].event->lock); }
@@ -912,7 +916,7 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters)int kfd_wait_on_events (struct kfd_process *p,uint32_t num_events,void __user *data, -bool all,uint32_t user_timeout_ms, +bool all,uint32_t *user_timeout_ms,uint32_t *wait_result) { struct kfd_event_data __user *events =
@@ -921,7 +925,7 @@ int kfd_wait_on_events(struct kfd_process *p,int ret =0 ;struct kfd_event_waiter *event_waiters =NULL ; -long timeout =user_timeout_to_jiffies (user_timeout_ms); +long timeout =user_timeout_to_jiffies (*user_timeout_ms); event_waiters =alloc_event_waiters (num_events);if (!event_waiters) {
@@ -971,15 +975,11 @@ int kfd_wait_on_events(struct kfd_process *p, }if (signal_pending (current)) { -/* -* This is wrong when a nonzero, non-infinite timeout -* is specified. We need to use -* ERESTARTSYS_RESTARTBLOCK, but struct restart_block -* contains a union with data for each user and it's -* in generic kernel code that I don't want to -* touch yet. -*/ ret = -ERESTARTSYS ; +if (*user_timeout_ms !=KFD_EVENT_TIMEOUT_IMMEDIATE && + *user_timeout_ms !=KFD_EVENT_TIMEOUT_INFINITE ) + *user_timeout_ms =jiffies_to_msecs ( +max (0l , timeout-1 ));break ; }
@@ -1020,7 +1020,7 @@ int kfd_wait_on_events(struct kfd_process *p, event_waiters, events); out_unlock: -free_waiters (num_events, event_waiters); +free_waiters (num_events, event_waiters, ret == -ERESTARTSYS );mutex_unlock (&p->event_mutex); out:if (ret)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -1
@@ -1314,7 +1314,7 @@ void kfd_event_free_process(struct kfd_process *p);int kfd_event_mmap (struct kfd_process *process,struct vm_area_struct *vma);int kfd_wait_on_events (struct kfd_process *p,uint32_t num_events,void __user *data, -bool all,uint32_t user_timeout_ms, +bool all,uint32_t *user_timeout_ms,uint32_t *wait_result);void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 14/38 drm/amd/pm: Fix a potential gpu_metrics_table memory leak
In reply to Sasha LevinFrom: Zhen Ni <[email protected]>
[ Upstream commit 5afb76522a0af0513b6dc01f84128a73206b051b ]
Memory is allocated for gpu_metrics_table in smu_v13_0_4_init_smc_tables(), but not freed in smu_v13_0_4_fini_smc_tables(). This may cause memory leaks, fix it.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +3 -0
@@ -190,6 +190,9 @@ static int smu_v13_0_4_fini_smc_tables(struct smu_context *smu)kfree (smu_table->watermarks_table); smu_table->watermarks_table =NULL ; +kfree (smu_table->gpu_metrics_table); + smu_table->gpu_metrics_table =NULL ; +return 0 ; }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 15/38 ksmbd: return STATUS_BAD_NETWORK_NAME error status if share is not configured
In reply to Sasha LevinFrom: Namjae Jeon <[email protected]>
[ Upstream commit fe54833dc8d97ef387e86f7c80537d51c503ca75 ]
If share is not configured in smb.conf, smb2 tree connect should return STATUS_BAD_NETWORK_NAME instead of STATUS_BAD_NETWORK_PATH.
--- fs/ksmbd/mgmt/tree_connect.c | 2 +- fs/ksmbd/smb2pdu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
fs/ksmbd/mgmt/tree_connect.c +1 -1
@@ -18,7 +18,7 @@struct ksmbd_tree_conn_status ksmbd_tree_conn_connect (struct ksmbd_session *sess,char *share_name) { -struct ksmbd_tree_conn_status status = {-EINVAL ,NULL }; +struct ksmbd_tree_conn_status status = {-ENOENT ,NULL };struct ksmbd_tree_connect_response *resp =NULL ;struct ksmbd_share_config *sc;struct ksmbd_tree_connect *tree_conn =NULL ;
fs/ksmbd/smb2pdu.c +2 -1
@@ -1930,8 +1930,9 @@ int smb2_tree_connect(struct ksmbd_work *work) rsp->hdr.Status =STATUS_SUCCESS ; rc =0 ;break ; +case -ENOENT :case KSMBD_TREE_CONN_STATUS_NO_SHARE : - rsp->hdr.Status =STATUS_BAD_NETWORK_PATH ; + rsp->hdr.Status =STATUS_BAD_NETWORK_NAME ;break ;case -ENOMEM :case KSMBD_TREE_CONN_STATUS_NOMEM :
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 16/38 net: lan966x: fix checking for return value of platform_get_irq_byname()
In reply to Sasha LevinFrom: Li Qiong <[email protected]>
[ Upstream commit 40b4ac880e21d917da7f3752332fa57564a4c202 ]
The platform_get_irq_byname() returns non-zero IRQ number or negative error number. "if (irq)" always true, chang it to "if (irq > 0)"
--- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +4 -4
@@ -710,7 +710,7 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)disable_irq (lan966x->xtr_irq); lan966x->xtr_irq = -ENXIO ; -if (lan966x->ana_irq) { +if (lan966x->ana_irq >0 ) {disable_irq (lan966x->ana_irq); lan966x->ana_irq = -ENXIO ; }
@@ -718,10 +718,10 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)if (lan966x->fdma)devm_free_irq (lan966x->dev, lan966x->fdma_irq, lan966x); -if (lan966x->ptp_irq) +if (lan966x->ptp_irq >0 )devm_free_irq (lan966x->dev, lan966x->ptp_irq, lan966x); -if (lan966x->ptp_ext_irq) +if (lan966x->ptp_ext_irq >0 )devm_free_irq (lan966x->dev, lan966x->ptp_ext_irq, lan966x); }
@@ -1049,7 +1049,7 @@ static int lan966x_probe(struct platform_device *pdev) } lan966x->ana_irq =platform_get_irq_byname (pdev,"ana" ); -if (lan966x->ana_irq) { +if (lan966x->ana_irq >0 ) { err =devm_request_threaded_irq (&pdev->dev, lan966x->ana_irq,NULL , lan966x_ana_irq_handler,IRQF_ONESHOT ,"ana irq" , lan966x);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 17/38 neigh: fix possible DoS due to net iface start/stop loop
In reply to Sasha LevinFrom: "Denis V. Lunev" <[email protected]>
[ Upstream commit 66ba215cb51323e4e55e38fd5f250e0fae0cbc94 ]
Normal processing of ARP request (usually this is Ethernet broadcast packet) coming to the host is looking like the following:
* the packet comes to arp_process() call and is passed through routing procedure
* the request is put into the queue using pneigh_enqueue() if corresponding ARP record is not local (common case for container records on the host)
* the request is processed by timer (within 80 jiffies by default) and ARP reply is sent from the same arp_process() using NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED condition (flag is set inside pneigh_enqueue())
And here the problem comes. Linux kernel calls pneigh_queue_purge() which destroys the whole queue of ARP requests on ANY network interface start/stop event through __neigh_ifdown().
This is actually not a problem within the original world as network interface start/stop was accessible to the host 'root' only, which could do more destructive things. But the world is changed and there are Linux containers available. Here container 'root' has an access to this API and could be considered as untrusted user in the hosting (container's) world.
Thus there is an attack vector to other containers on node when container's root will endlessly start/stop interfaces. We have observed similar situation on a real production node when docker container was doing such activity and thus other containers on the node become not accessible.
The patch proposed doing very simple thing. It drops only packets from the same namespace in the pneigh_queue_purge() where network interface state change is detected. This is enough to prevent the problem for the whole node preserving original semantics of the code.
v2:
- do del_timer_sync() if queue is empty after pneigh_queue_purge()
v3:
- rebase to net tree
--- net/core/neighbour.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
net/core/neighbour.c +17 -8
@@ -307,14 +307,23 @@ static int neigh_del_timer(struct neighbour *n)return 0 ; } -static void pneigh_queue_purge (struct sk_buff_head *list) +static void pneigh_queue_purge (struct sk_buff_head *list,struct net *net) { +unsigned long flags;struct sk_buff *skb; -while ((skb =skb_dequeue (list)) !=NULL ) { -dev_put (skb->dev); -kfree_skb (skb); +spin_lock_irqsave (&list->lock, flags); + skb =skb_peek (list); +while (skb !=NULL ) { +struct sk_buff *skb_next =skb_peek_next (skb, list); +if (net ==NULL ||net_eq (dev_net (skb->dev), net)) { +__skb_unlink (skb, list); +dev_put (skb->dev); +kfree_skb (skb); + } + skb = skb_next; } +spin_unlock_irqrestore (&list->lock, flags); } static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev,
@@ -385,9 +394,9 @@ static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev,write_lock_bh (&tbl->lock);neigh_flush_dev (tbl, dev, skip_perm);pneigh_ifdown_and_unlock (tbl, dev); - -del_timer_sync (&tbl->proxy_timer); -pneigh_queue_purge (&tbl->proxy_queue); +pneigh_queue_purge (&tbl->proxy_queue,dev_net (dev)); +if (skb_queue_empty_lockless (&tbl->proxy_queue)) +del_timer_sync (&tbl->proxy_timer);return 0 ; }
@@ -1787,7 +1796,7 @@ int neigh_table_clear(int index, struct neigh_table *tbl)cancel_delayed_work_sync (&tbl->managed_work);cancel_delayed_work_sync (&tbl->gc_work);del_timer_sync (&tbl->proxy_timer); -pneigh_queue_purge (&tbl->proxy_queue); +pneigh_queue_purge (&tbl->proxy_queue,NULL );neigh_ifdown (tbl,NULL );if (atomic_read (&tbl->entries))pr_crit ("neighbour leakage\n" );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 18/38 ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41
In reply to Sasha LevinFrom: Stefan Binding <[email protected]>
[ Upstream commit 461122b999bda2ebef2086a35d8990f9ccac5ab8 ]
These Asus Zenbook laptop use Realtek HDA codec combined with 2xCS35L41 Amplifiers using SPI.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9246,6 +9246,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x1271 ,"ASUS X430UN" ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1290 ,"ASUS X441SA" ,ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x12a0 ,"ASUS X441UV" ,ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1043 ,0x12af ,"ASUS UX582ZS" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x12e0 ,"ASUS X541SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x12f0 ,"ASUS X541UV" ,ALC256_FIXUP_ASUS_MIC ), SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -9266,6 +9267,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x19e1 ,"ASUS UX581LV" ,ALC295_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1a13 ,"Asus G73Jw" ,ALC269_FIXUP_ASUS_G73JW ),SND_PCI_QUIRK (0x1043 ,0x1a30 ,"ASUS X705UD" ,ALC256_FIXUP_ASUS_MIC ), +SND_PCI_QUIRK (0x1043 ,0x1a8f ,"ASUS UX582ZS" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x1b11 ,"ASUS UX431DA" ,ALC294_FIXUP_ASUS_COEF_1B ),SND_PCI_QUIRK (0x1043 ,0x1b13 ,"Asus U41SV" ,ALC269_FIXUP_INV_DMIC ), SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 19/38 s390/hypfs: avoid error message under KVM
In reply to Sasha LevinFrom: Juergen Gross <[email protected]>
[ Upstream commit 7b6670b03641ac308aaa6fa2e6f964ac993b5ea3 ]
When booting under KVM the following error messages are issued:
hypfs.7f5705: The hardware system does not support hypfs hypfs.7a79f0: Initialization of hypfs failed with rc=-61
Demote the severity of first message from "error" to "info" and issue the second message only in other error cases.
--- arch/s390/hypfs/hypfs_diag.c | 2 +- arch/s390/hypfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/hypfs/hypfs_diag.c +1 -1
@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void)int rc;if (diag204_probe ()) { -pr_err ("The hardware system does not support hypfs\n" ); +pr_info ("The hardware system does not support hypfs\n" );return -ENODATA ; }
arch/s390/hypfs/inode.c +1 -1
@@ -496,9 +496,9 @@ static int __init hypfs_init(void)hypfs_vm_exit (); fail_hypfs_diag_exit:hypfs_diag_exit (); +pr_err ("Initialization of hypfs failed with rc=%i\n" , rc); fail_dbfs_exit:hypfs_dbfs_exit (); -pr_err ("Initialization of hypfs failed with rc=%i\n" , rc);return rc; }device_initcall (hypfs_init)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 20/38 ksmbd: don't remove dos attribute xattr on O_TRUNC open
In reply to Sasha LevinFrom: Namjae Jeon <[email protected]>
[ Upstream commit 17661ecf6a64eb11ae7f1108fe88686388b2acd5 ]
When smb client open file in ksmbd share with O_TRUNC, dos attribute xattr is removed as well as data in file. This cause the FSCTL_SET_SPARSE request from the client fails because ksmbd can't update the dos attribute after setting ATTR_SPARSE_FILE. And this patch fix xfstests generic/469 test also.
--- fs/ksmbd/smb2pdu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/ksmbd/smb2pdu.c +9 -9
@@ -2315,15 +2315,15 @@ static int smb2_remove_smb_xattrs(struct path *path) name += strlen(name) + 1) {ksmbd_debug (SMB ,"%s, len %zd\n" , name,strlen (name)); -if (strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ) && -strncmp (&name[XATTR_USER_PREFIX_LEN ],DOS_ATTRIBUTE_PREFIX , -DOS_ATTRIBUTE_PREFIX_LEN ) && -strncmp (&name[XATTR_USER_PREFIX_LEN ],STREAM_PREFIX ,STREAM_PREFIX_LEN )) -continue ; - - err =ksmbd_vfs_remove_xattr (user_ns, path->dentry, name); -if (err) -ksmbd_debug (SMB ,"remove xattr failed : %s\n" , name); +if (!strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ) && + !strncmp (&name[XATTR_USER_PREFIX_LEN ],STREAM_PREFIX , +STREAM_PREFIX_LEN )) { + err =ksmbd_vfs_remove_xattr (user_ns, path->dentry, + name); +if (err) +ksmbd_debug (SMB ,"remove xattr failed : %s\n" , + name); + } } out:kvfree (xattr_list);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 21/38 drm/amdgpu: disable 3DCGCG/CGLS temporarily due to stability issue
In reply to Sasha LevinFrom: Evan Quan <[email protected]>
[ Upstream commit 1b586595df6d04c27088ef348b8202204ce26d45 ]
Some stability issues were reported with these features.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -530,8 +530,10 @@ static int soc21_common_early_init(void *handle)case IP_VERSION (11 ,0 ,0 ): adev->cg_flags = AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_CGLS | +#if 0 AMD_CG_SUPPORT_GFX_3D_CGCG | AMD_CG_SUPPORT_GFX_3D_CGLS | +#endif AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_REPEATER_FGCG | AMD_CG_SUPPORT_GFX_FGCG |
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 22/38 drm/amd/pm: add missing ->fini_microcode interface for Sienna Cichlid
In reply to Sasha LevinFrom: Evan Quan <[email protected]>
[ Upstream commit 0a2d922a5618377cdf8fa476351362733ef55342 ]
To avoid any potential memory leak.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
@@ -4281,6 +4281,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .dump_pptable = sienna_cichlid_dump_pptable, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, + .fini_microcode = smu_v11_0_fini_microcode, .init_smc_tables = sienna_cichlid_init_smc_tables, .fini_smc_tables = smu_v11_0_fini_smc_tables, .init_power = smu_v11_0_init_power,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 23/38 drm/amd/pm: add missing ->fini_xxxx interfaces for some SMU13 asics
In reply to Sasha LevinFrom: Evan Quan <[email protected]>
[ Upstream commit 4bac1c846eff8042dd59ddecd0a43f3b9de5fd23 ]
Without these, potential memory leak may be induced.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +2 -0
@@ -1583,7 +1583,9 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { .dump_pptable = smu_v13_0_0_dump_pptable, .init_microcode = smu_v13_0_init_microcode, .load_microcode = smu_v13_0_load_microcode, + .fini_microcode = smu_v13_0_fini_microcode, .init_smc_tables = smu_v13_0_0_init_smc_tables, + .fini_smc_tables = smu_v13_0_fini_smc_tables, .init_power = smu_v13_0_init_power, .fini_power = smu_v13_0_fini_power, .check_fw_status = smu_v13_0_check_fw_status,
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +2 -0
@@ -1539,7 +1539,9 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { .dump_pptable = smu_v13_0_7_dump_pptable, .init_microcode = smu_v13_0_init_microcode, .load_microcode = smu_v13_0_load_microcode, + .fini_microcode = smu_v13_0_fini_microcode, .init_smc_tables = smu_v13_0_7_init_smc_tables, + .fini_smc_tables = smu_v13_0_fini_smc_tables, .init_power = smu_v13_0_init_power, .check_fw_status = smu_v13_0_7_check_fw_status, .setup_pptable = smu_v13_0_7_setup_pptable,
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 26/38 drm/amd/display: Fix plug/unplug external monitor will hang while playback MPO video
In reply to Sasha LevinFrom: Tom Chung <[email protected]>
[ Upstream commit e98459c06e3d45c2229b097f7b8cdd412357fa2f ]
[Why]
Pipes for MPO primary and overlay will be power down and power up during plug/unplug external monitor while MPO video playback.
But the pipes were the same after plug/unplug and should not need to be power down and power up or it will make page flip interrupt disabled and cause hang issue.
[How]
Add pipe split change condition that not only check the top pipe pointer but also check the index of top pipe if both top pipes are available.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +9 -2
@@ -1067,8 +1067,15 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context)struct dc_stream_state *old_stream = dc->current_state->res_ctx.pipe_ctx[i].stream;bool should_disable = true; -bool pipe_split_change = - context->res_ctx.pipe_ctx[i].top_pipe != dc->current_state->res_ctx.pipe_ctx[i].top_pipe; +bool pipe_split_change = false; + +if ((context->res_ctx.pipe_ctx[i].top_pipe) && + (dc->current_state->res_ctx.pipe_ctx[i].top_pipe)) + pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe->pipe_idx != + dc->current_state->res_ctx.pipe_ctx[i].top_pipe->pipe_idx; +else + pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe != + dc->current_state->res_ctx.pipe_ctx[i].top_pipe;for (j =0 ; j < context->stream_count; j++) {if (old_stream == context->streams[j]) {
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 29/38 drm/amdgpu: Add secure display TA load for Renoir
In reply to Sasha LevinFrom: Shane Xiao <[email protected]>
[ Upstream commit e42dfa66d59240afbdd8d4b47b87486db39504aa ]
Add secure display TA load for Renoir
--- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +10 -0
@@ -101,6 +101,16 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) adev->psp.dtm_context.context.bin_desc.start_addr = (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +le32_to_cpu (ta_hdr->dtm.offset_bytes); + +if (adev->apu_flags &AMD_APU_IS_RENOIR ) { + adev->psp.securedisplay_context.context.bin_desc.fw_version = +le32_to_cpu (ta_hdr->securedisplay.fw_version); + adev->psp.securedisplay_context.context.bin_desc.size_bytes = +le32_to_cpu (ta_hdr->securedisplay.size_bytes); + adev->psp.securedisplay_context.context.bin_desc.start_addr = + (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + +le32_to_cpu (ta_hdr->securedisplay.offset_bytes); + } }return 0 ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 24/38 drm/amd/display: Fix pixel clock programming
In reply to Sasha LevinFrom: Ilya Bakoulin <[email protected]>
[ Upstream commit 04fb918bf421b299feaee1006e82921d7d381f18 ]
[Why]
Some pixel clock values could cause HDMI TMDS SSCPs to be misaligned between different HDMI lanes when using YCbCr420 10-bit pixel format.
BIOS functions for transmitter/encoder control take pixel clock in kHz increments, whereas the function for setting the pixel clock is in 100Hz increments. Setting pixel clock to a value that is not on a kHz boundary will cause the issue.
[How]
Round pixel clock down to nearest kHz in 10/12-bpc cases.
--- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +2 -0
@@ -545,9 +545,11 @@ static void dce112_get_pix_clk_dividers_helper (switch (pix_clk_params->color_depth) {case COLOR_DEPTH_101010 : actual_pixel_clock_100hz = (actual_pixel_clock_100hz *5 ) >>2 ; + actual_pixel_clock_100hz -= actual_pixel_clock_100hz %10 ;break ;case COLOR_DEPTH_121212 : actual_pixel_clock_100hz = (actual_pixel_clock_100hz *6 ) >>2 ; + actual_pixel_clock_100hz -= actual_pixel_clock_100hz %10 ;break ;case COLOR_DEPTH_161616 : actual_pixel_clock_100hz = actual_pixel_clock_100hz *2 ;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 27/38 drm/amd/display: avoid doing vm_init multiple time
In reply to Sasha LevinFrom: Charlene Liu <[email protected]>
[ Upstream commit 5544a7b5a07480192eb5fd3536462faed2c21528 ]
[why]
this is to ensure that driver will not reprogram hvm_prefetch_req again if it is done.
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +7 -1
@@ -67,9 +67,15 @@ static uint32_t convert_and_clamp(void dcn21_dchvm_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub1 =TO_DCN20_HUBBUB (hubbub); -uint32_t riommu_active; +uint32_t riommu_active, prefetch_done;int i; +REG_GET (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE , &prefetch_done); + +if (prefetch_done) { + hubbub->riommu_active = true; +return ; + }//Init DCHVM block REG_UPDATE (DCHVM_CTRL0 ,HOSTVM_INIT_REQ ,1 );
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 25/38 drm/amdgpu: Increase tlb flush timeout for sriov
In reply to Sasha LevinFrom: Dusica Milinkovic <[email protected]>
[ Upstream commit 373008bfc9cdb0f050258947fa5a095f0657e1bc ]
[Why]
During multi-vf executing benchmark (Luxmark) observed kiq error timeout. It happenes because all of VFs do the tlb invalidation at the same time. Although each VF has the invalidate register set, from hardware side the invalidate requests are queue to execute.
[How]
In case of 12 VF increase timeout on 12*100ms
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -313,7 +313,7 @@ enum amdgpu_kiq_irq {AMDGPU_CP_KIQ_IRQ_DRIVER0 =0 , AMDGPU_CP_KIQ_IRQ_LAST }; - +#define SRIOV_USEC_TIMEOUT 1200000/* wait 12 * 100ms for SRIOV */ #define MAX_KIQ_REG_WAIT 5000/* in usecs, 5ms */ #define MAX_KIQ_REG_BAILOUT_INTERVAL 5/* in msecs, 5ms */ #define MAX_KIQ_REG_TRY 1000
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +2 -1
@@ -416,6 +416,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,uint32_t seq;uint16_t queried_pasid;bool ret; +u32 usec_timeout =amdgpu_sriov_vf (adev) ?SRIOV_USEC_TIMEOUT : adev->usec_timeout;struct amdgpu_ring *ring = &adev->gfx.kiq.ring;struct amdgpu_kiq *kiq = &adev->gfx.kiq;
@@ -434,7 +435,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,amdgpu_ring_commit (ring);spin_unlock (&adev->gfx.kiq.ring_lock); - r =amdgpu_fence_wait_polling (ring, seq, adev->usec_timeout); + r =amdgpu_fence_wait_polling (ring, seq, usec_timeout);if (r <1 ) {dev_err (adev->dev,"wait for kiq fence error: %ld.\n" , r);return -ETIME ;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -1
@@ -896,6 +896,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,uint32_t seq;uint16_t queried_pasid;bool ret; +u32 usec_timeout =amdgpu_sriov_vf (adev) ?SRIOV_USEC_TIMEOUT : adev->usec_timeout;struct amdgpu_ring *ring = &adev->gfx.kiq.ring;struct amdgpu_kiq *kiq = &adev->gfx.kiq;
@@ -935,7 +936,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,amdgpu_ring_commit (ring);spin_unlock (&adev->gfx.kiq.ring_lock); - r =amdgpu_fence_wait_polling (ring, seq, adev->usec_timeout); + r =amdgpu_fence_wait_polling (ring, seq, usec_timeout);if (r <1 ) {dev_err (adev->dev,"wait for kiq fence error: %ld.\n" , r);up_read (&adev->reset_domain->sem);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 28/38 drm/amdgpu: Add decode_iv_ts helper for ih_v6 block
In reply to Sasha LevinFrom: Harish Kasiviswanathan <[email protected]>
[ Upstream commit 1af9add1f1512b10d9ce44ec7137612bc81ff069 ]
Was missing. Add it.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +1 -0
@@ -727,6 +727,7 @@ static const struct amd_ip_funcs ih_v6_0_ip_funcs = {static const struct amdgpu_ih_funcs ih_v6_0_funcs = { .get_wptr = ih_v6_0_get_wptr, .decode_iv = amdgpu_ih_decode_iv_helper, + .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper, .set_rptr = ih_v6_0_set_rptr };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 34/38 ALSA: hda/cs8409: Support new Dolphin Variants
In reply to Sasha LevinFrom: Stefan Binding <[email protected]>
[ Upstream commit 1ff954f9ab054675b9eb02dd14add8f7aa376d71 ]
Add 4 new Dolphin Systems, same configuration as older systems.
--- sound/pci/hda/patch_cs8409-tables.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/pci/hda/patch_cs8409-tables.c +4 -0
@@ -546,6 +546,10 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0BD6 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0BD7 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0BD8 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C43 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C50 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C51 ,"Dolphin" ,CS8409_DOLPHIN ), + SND_PCI_QUIRK(0x1028, 0x0C52, "Dolphin", CS8409_DOLPHIN), {} /* terminator */ };
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 30/38 drm/amdgpu: Fix interrupt handling on ih_soft ring
In reply to Sasha LevinFrom: Mukul Joshi <[email protected]>
[ Upstream commit de8341ee3ce7316883e836a2c4e9bf01ab651e0f ]
There are no backing hardware registers for ih_soft ring. As a result, don't try to access hardware registers for read and write pointers when processing interrupts on the IH soft ring.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +6 -1
@@ -409,9 +409,11 @@ static u32 navi10_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -483,6 +485,9 @@ static void navi10_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +6 -1
@@ -334,9 +334,11 @@ static u32 vega10_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -409,6 +411,9 @@ static void vega10_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +6 -1
@@ -385,9 +385,11 @@ static u32 vega20_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -461,6 +463,9 @@ static void vega20_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 35/38 btrfs: move lockdep class helpers to locking.c
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit 0a27a0474d146eb79e09ec88bf0d4229f4cfc1b8 ]
These definitions exist in disk-io.c, which is not related to the locking. Move this over to locking.h/c where it makes more sense.
--- fs/btrfs/disk-io.c | 82 ---------------------------------------------- fs/btrfs/disk-io.h | 10 ------ fs/btrfs/locking.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/locking.h | 9 +++++ 4 files changed, 89 insertions(+), 92 deletions(-)
fs/btrfs/disk-io.c +0 -82
@@ -121,88 +121,6 @@ struct async_submit_bio {blk_status_t status; }; -/* -* Lockdep class keys for extent_buffer->lock's in this root. For a given -* eb, the lockdep key is determined by the btrfs_root it belongs to and -* the level the eb occupies in the tree. -* -* Different roots are used for different purposes and may nest inside each -* other and they require separate keysets. As lockdep keys should be -* static, assign keysets according to the purpose of the root as indicated -* by btrfs_root->root_key.objectid. This ensures that all special purpose -* roots have separate keysets. -* -* Lock-nesting across peer nodes is always done with the immediate parent -* node locked thus preventing deadlock. As lockdep doesn't know this, use -* subclass to avoid triggering lockdep warning in such cases. -* -* The key is set by the readpage_end_io_hook after the buffer has passed -* csum validation but before the pages are unlocked. It is also set by -* btrfs_init_new_buffer on freshly allocated blocks. -* -* We also add a check to make sure the highest level of the tree is the -* same as our lockdep setup here. If BTRFS_MAX_LEVEL changes, this code -* needs update as well. -*/ -#ifdef CONFIG_DEBUG_LOCK_ALLOC -# if BTRFS_MAX_LEVEL !=8 -# error -# endif - -#define DEFINE_LEVEL (stem, level) \ - .names[level] = "btrfs-" stem "-0" #level, - -#define DEFINE_NAME (stem) \ - DEFINE_LEVEL(stem, 0) \ - DEFINE_LEVEL(stem, 1) \ - DEFINE_LEVEL(stem, 2) \ - DEFINE_LEVEL(stem, 3) \ - DEFINE_LEVEL(stem, 4) \ - DEFINE_LEVEL(stem, 5) \ - DEFINE_LEVEL(stem, 6) \ - DEFINE_LEVEL(stem, 7) - -static struct btrfs_lockdep_keyset { -u64 id;/* root objectid */ -/* Longest entry: btrfs-free-space-00 */ -char names[BTRFS_MAX_LEVEL ][20 ]; -struct lock_class_key keys[BTRFS_MAX_LEVEL ]; -} btrfs_lockdep_keysets[] = { - { .id =BTRFS_ROOT_TREE_OBJECTID ,DEFINE_NAME ("root" ) }, - { .id =BTRFS_EXTENT_TREE_OBJECTID ,DEFINE_NAME ("extent" ) }, - { .id =BTRFS_CHUNK_TREE_OBJECTID ,DEFINE_NAME ("chunk" ) }, - { .id =BTRFS_DEV_TREE_OBJECTID ,DEFINE_NAME ("dev" ) }, - { .id =BTRFS_CSUM_TREE_OBJECTID ,DEFINE_NAME ("csum" ) }, - { .id =BTRFS_QUOTA_TREE_OBJECTID ,DEFINE_NAME ("quota" ) }, - { .id =BTRFS_TREE_LOG_OBJECTID ,DEFINE_NAME ("log" ) }, - { .id =BTRFS_TREE_RELOC_OBJECTID ,DEFINE_NAME ("treloc" ) }, - { .id =BTRFS_DATA_RELOC_TREE_OBJECTID ,DEFINE_NAME ("dreloc" ) }, - { .id =BTRFS_UUID_TREE_OBJECTID ,DEFINE_NAME ("uuid" ) }, - { .id =BTRFS_FREE_SPACE_TREE_OBJECTID ,DEFINE_NAME ("free-space" ) }, - { .id =0 ,DEFINE_NAME ("tree" ) }, -}; - -#undef DEFINE_LEVEL -#undef DEFINE_NAME - -void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb, -int level) -{ -struct btrfs_lockdep_keyset *ks; - -BUG_ON (level >=ARRAY_SIZE (ks->keys)); - -/* find the matching keyset, id 0 is the default entry */ -for (ks = btrfs_lockdep_keysets; ks->id; ks++) -if (ks->id == objectid) -break ; - -lockdep_set_class_and_name (&eb->lock, - &ks->keys[level], ks->names[level]); -} - -#endif -/* * Compute the csum of a btree block and store the result to provided buffer. */
fs/btrfs/disk-io.h +0 -10
@@ -148,14 +148,4 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root);int __init btrfs_end_io_wq_init (void );void __cold btrfs_end_io_wq_exit (void ); -#ifdef CONFIG_DEBUG_LOCK_ALLOC -void btrfs_set_buffer_lockdep_class (u64 objectid, -struct extent_buffer *eb,int level); -#else -static inline void btrfs_set_buffer_lockdep_class (u64 objectid, -struct extent_buffer *eb,int level) -{ -} -#endif -#endif
fs/btrfs/locking.c +80 -0
86 lines not on this page · raw message
fs/btrfs/locking.h +9 -0
@@ -131,4 +131,13 @@ void btrfs_drew_write_unlock(struct btrfs_drew_lock *lock);void btrfs_drew_read_lock (struct btrfs_drew_lock *lock);void btrfs_drew_read_unlock (struct btrfs_drew_lock *lock); +#ifdef CONFIG_DEBUG_LOCK_ALLOC +void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level); +#else +static inline void btrfs_set_buffer_lockdep_class (u64 objectid, +struct extent_buffer *eb,int level) +{ +} +#endif +#endif
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 36/38 btrfs: fix lockdep splat with reloc root extent buffers
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit b40130b23ca4a08c5785d5a3559805916bddba3c ]
We have been hitting the following lockdep splat with btrfs/187 recently
WARNING: possible circular locking dependency detected
5.19.0-rc8+ #775 Not tainted
------------------------------------------------------
btrfs/752500 is trying to acquire lock:
ffff97e1875a97b8 (btrfs-treloc-02#2){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
but task is already holding lock:
ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (btrfs-tree-01/1){+.+.}-{3:3}:
down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_init_new_buffer+0x7d/0x2c0 btrfs_alloc_tree_block+0x120/0x3b0 __btrfs_cow_block+0x136/0x600 btrfs_cow_block+0x10b/0x230 btrfs_search_slot+0x53b/0xb70 btrfs_lookup_inode+0x2a/0xa0 __btrfs_update_delayed_inode+0x5f/0x280 btrfs_async_run_delayed_root+0x24c/0x290 btrfs_work_helper+0xf2/0x3e0 process_one_work+0x271/0x590 worker_thread+0x52/0x3b0 kthread+0xf0/0x120 ret_from_fork+0x1f/0x30
-> #1 (btrfs-tree-01){++++}-{3:3}:
down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_search_slot+0x3c3/0xb70 do_relocation+0x10c/0x6b0 relocate_tree_blocks+0x317/0x6d0 relocate_block_group+0x1f1/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
-> #0 (btrfs-treloc-02#2){+.+.}-{3:3}:
__lock_acquire+0x1122/0x1e10 lock_acquire+0xc2/0x2d0 down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_lock_root_node+0x31/0x50 btrfs_search_slot+0x1cb/0xb70 replace_path+0x541/0x9f0 merge_reloc_root+0x1d6/0x610 merge_reloc_roots+0xe2/0x260 relocate_block_group+0x2c8/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
other info that might help us debug this:
Chain exists of:
btrfs-treloc-02#2 --> btrfs-tree-01 --> btrfs-tree-01/1
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(btrfs-tree-01/1);
lock(btrfs-tree-01);
lock(btrfs-tree-01/1);
lock(btrfs-treloc-02#2);*** DEADLOCK ***
7 locks held by btrfs/752500:
#0: ffff97e292fdf460 (sb_writers#12){.+.+}-{0:0}, at: btrfs_ioctl+0x208/0x2c90
#1: ffff97e284c02050 (&fs_info->reclaim_bgs_lock){+.+.}-{3:3}, at: btrfs_balance+0x55f/0xe40 #2: ffff97e284c00878 (&fs_info->cleaner_mutex){+.+.}-{3:3}, at: btrfs_relocate_block_group+0x236/0x400 #3: ffff97e292fdf650 (sb_internal#2){.+.+}-{0:0}, at: merge_reloc_root+0xef/0x610
#4: ffff97e284c02378 (btrfs_trans_num_writers){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 #5: ffff97e284c023a0 (btrfs_trans_num_extwriters){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 #6: ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
stack backtrace: CPU: 1 PID: 752500 Comm: btrfs Not tainted 5.19.0-rc8+ #775 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014 Call Trace: dump_stack_lvl+0x56/0x73 check_noncircular+0xd6/0x100 ? lock_is_held_type+0xe2/0x140 __lock_acquire+0x1122/0x1e10 lock_acquire+0xc2/0x2d0 ? __btrfs_tree_lock+0x24/0x110 down_write_nested+0x41/0x80 ? __btrfs_tree_lock+0x24/0x110 __btrfs_tree_lock+0x24/0x110 btrfs_lock_root_node+0x31/0x50 btrfs_search_slot+0x1cb/0xb70 ? lock_release+0x137/0x2d0 ? _raw_spin_unlock+0x29/0x50 ? release_extent_buffer+0x128/0x180 replace_path+0x541/0x9f0 merge_reloc_root+0x1d6/0x610 merge_reloc_roots+0xe2/0x260 relocate_block_group+0x2c8/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 ? lock_is_held_type+0xe2/0x140 ? lock_is_held_type+0xe2/0x140 ? __x64_sys_ioctl+0x88/0xc0 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
This isn't necessarily new, it's just tricky to hit in practice. There are two competing things going on here. With relocation we create a snapshot of every fs tree with a reloc tree. Any extent buffers that get initialized here are initialized with the reloc root lockdep key. However since it is a snapshot, any blocks that are currently in cache that originally belonged to the fs tree will have the normal tree lockdep key set. This creates the lock dependency of
reloc tree -> normal tree
for the extent buffer locking during the first phase of the relocation as we walk down the reloc root to relocate blocks.
However this is problematic because the final phase of the relocation is merging the reloc root into the original fs root. This involves searching down to any keys that exist in the original fs root and then swapping the relocated block and the original fs root block. We have to search down to the fs root first, and then go search the reloc root for the block we need to replace. This creates the dependency of
normal tree -> reloc tree
which is why lockdep complains.
Additionally even if we were to fix this particular mismatch with a different nesting for the merge case, we're still slotting in a block that has a owner of the reloc root objectid into a normal tree, so that block will have its lockdep key set to the tree reloc root, and create a lockdep splat later on when we wander into that block from the fs root.
Unfortunately the only solution here is to make sure we do not set the lockdep key to the reloc tree lockdep key normally, and then reset any blocks we wander into from the reloc root when we're doing the merged.
This solves the problem of having mixed tree reloc keys intermixed with normal tree keys, and then allows us to make sure in the merge case we maintain the lock order of
normal tree -> reloc tree
We handle this by setting a bit on the reloc root when we do the search for the block we want to relocate, and any block we search into or COW at that point gets set to the reloc tree key. This works correctly because we only ever COW down to the parent node, so we aren't resetting the key for the block we're linking into the fs root.
With this patch we no longer have the lockdep splat in btrfs/187.
--- fs/btrfs/ctree.c | 3 +++ fs/btrfs/ctree.h | 2 ++ fs/btrfs/extent-tree.c | 18 +++++++++++++++++- fs/btrfs/extent_io.c | 11 ++++++++++- fs/btrfs/locking.c | 11 +++++++++++ fs/btrfs/locking.h | 5 +++++ fs/btrfs/relocation.c | 2 ++ 7 files changed, 50 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +3 -0
@@ -2075,6 +2075,9 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,if (!p->skip_locking) { level =btrfs_header_level (b); + +btrfs_maybe_reset_lockdep_class (root, b); +if (level <= write_lock_level) {btrfs_tree_lock (b); p->locks[level] =BTRFS_WRITE_LOCK ;
fs/btrfs/ctree.h +2 -0
@@ -1147,6 +1147,8 @@ enum {BTRFS_ROOT_ORPHAN_CLEANUP ,/* This root has a drop operation that was started previously. */ BTRFS_ROOT_UNFINISHED_DROP , +/* This reloc root needs to have its buffers lockdep class reset. */ + BTRFS_ROOT_RESET_LOCKDEP_CLASS, };static inline void btrfs_wake_unfinished_drop (struct btrfs_fs_info *fs_info)
fs/btrfs/extent-tree.c +17 -1
@@ -4883,6 +4883,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, {struct btrfs_fs_info *fs_info = root->fs_info;struct extent_buffer *buf; +u64 lockdep_owner = owner; buf =btrfs_find_create_tree_block (fs_info, bytenr, owner, level);if (IS_ERR (buf))
@@ -4901,12 +4902,27 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,return ERR_PTR (-EUCLEAN ); } +/* +* The reloc trees are just snapshots, so we need them to appear to be +* just like any other fs tree WRT lockdep. +* +* The exception however is in replace_path() in relocation, where we +* hold the lock on the original fs root and then search for the reloc +* root. At that point we need to make sure any reloc root buffers are +* set to the BTRFS_TREE_RELOC_OBJECTID lockdep class in order to make +* lockdep happy. +*/ +if (lockdep_owner ==BTRFS_TREE_RELOC_OBJECTID && + !test_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &root->state)) + lockdep_owner =BTRFS_FS_TREE_OBJECTID ; +/* * This needs to stay, because we could allocate a freed block from an * old tree into a new tree, so we need to make sure this new block is * set to the appropriate level and owner. */ -btrfs_set_buffer_lockdep_class (owner, buf, level); +btrfs_set_buffer_lockdep_class (lockdep_owner, buf, level); +__btrfs_tree_lock (buf, nest);btrfs_clean_tree_block (buf);clear_bit (EXTENT_BUFFER_STALE , &buf->bflags);
fs/btrfs/extent_io.c +10 -1
@@ -6228,6 +6228,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,struct extent_buffer *exists =NULL ;struct page *p;struct address_space *mapping = fs_info->btree_inode->i_mapping; +u64 lockdep_owner = owner_root;int uptodate =1 ;int ret;
@@ -6252,7 +6253,15 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, eb =__alloc_extent_buffer (fs_info, start, len);if (!eb)return ERR_PTR (-ENOMEM ); -btrfs_set_buffer_lockdep_class (owner_root, eb, level); + +/* +* The reloc trees are just snapshots, so we need them to appear to be +* just like any other fs tree WRT lockdep. +*/ +if (lockdep_owner ==BTRFS_TREE_RELOC_OBJECTID ) + lockdep_owner =BTRFS_FS_TREE_OBJECTID ; + +btrfs_set_buffer_lockdep_class (lockdep_owner, eb, level); num_pages =num_extent_pages (eb);for (i =0 ; i < num_pages; i++, index++) {
fs/btrfs/locking.c +11 -0
@@ -91,6 +91,13 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int lockdep_set_class_and_name(&eb->lock, &ks->keys[level], ks->names[level]); } +void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root,struct extent_buffer *eb) +{ +if (test_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &root->state)) +btrfs_set_buffer_lockdep_class (root->root_key.objectid, + eb,btrfs_header_level (eb)); +} +#endif /*
@@ -244,6 +251,8 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root)while (1 ) { eb =btrfs_root_node (root); + +btrfs_maybe_reset_lockdep_class (root, eb);btrfs_tree_lock (eb);if (eb == root->node)break ;
@@ -265,6 +274,8 @@ struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)while (1 ) { eb =btrfs_root_node (root); + +btrfs_maybe_reset_lockdep_class (root, eb);btrfs_tree_read_lock (eb);if (eb == root->node)break ;
fs/btrfs/locking.h +5 -0
@@ -133,11 +133,16 @@ void btrfs_drew_read_unlock(struct btrfs_drew_lock *lock);#ifdef CONFIG_DEBUG_LOCK_ALLOC void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level); +void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root,struct extent_buffer *eb);#else static inline void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level) { } +static inline void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root, +struct extent_buffer *eb) +{ +}#endif #endif
fs/btrfs/relocation.c +2 -0
@@ -1326,7 +1326,9 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,btrfs_release_path (path); path->lowest_level = level; +set_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &src->state); ret =btrfs_search_slot (trans, src, &key, path,0 ,1 ); +clear_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &src->state); path->lowest_level =0 ;if (ret) {if (ret >0 )
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 37/38 btrfs: tree-checker: check for overlapping extent items
In reply to Sasha LevinFrom: Josef Bacik <[email protected]>
[ Upstream commit 899b7f69f244e539ea5df1b4d756046337de44a5 ]
We're seeing a weird problem in production where we have overlapping extent items in the extent tree. It's unclear where these are coming from, and in debugging we realized there's no check in the tree checker for this sort of problem. Add a check to the tree-checker to make sure that the extents do not overlap each other.
--- fs/btrfs/tree-checker.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
fs/btrfs/tree-checker.c +23 -2
@@ -1233,7 +1233,8 @@ static void extent_err(const struct extent_buffer *eb, int slot, }static int check_extent_item (struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {struct btrfs_fs_info *fs_info = leaf->fs_info;struct btrfs_extent_item *ei;
@@ -1453,6 +1454,26 @@ static int check_extent_item(struct extent_buffer *leaf, total_refs, inline_refs);return -EUCLEAN ; } + +if ((prev_key->type ==BTRFS_EXTENT_ITEM_KEY ) || + (prev_key->type ==BTRFS_METADATA_ITEM_KEY )) { +u64 prev_end = prev_key->objectid; + +if (prev_key->type ==BTRFS_METADATA_ITEM_KEY ) + prev_end += fs_info->nodesize; +else + prev_end += prev_key->offset; + +if (unlikely (prev_end > key->objectid)) { +extent_err (leaf, slot, +"previous extent [%llu %u %llu] overlaps current extent [%llu %u %llu]" , + prev_key->objectid, prev_key->type, + prev_key->offset, key->objectid, key->type, + key->offset); +return -EUCLEAN ; + } + } +return 0 ; }
@@ -1621,7 +1642,7 @@ static int check_leaf_item(struct extent_buffer *leaf,break ;case BTRFS_EXTENT_ITEM_KEY :case BTRFS_METADATA_ITEM_KEY : - ret =check_extent_item (leaf, key, slot); + ret =check_extent_item (leaf, key, slot, prev_key);break ;case BTRFS_TREE_BLOCK_REF_KEY :case BTRFS_SHARED_DATA_REF_KEY :
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 33/38 platform/x86: serial-multi-instantiate: Add CLSA0101 Laptop
In reply to Sasha LevinFrom: Lucas Tanure <[email protected]>
[ Upstream commit 88392a0dd0ab263edb4ca416ebdecabd8289158a ]
The device CLSA0101 has two instances of CS35L41
connected by I2C.
--- drivers/platform/x86/serial-multi-instantiate.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/serial-multi-instantiate.c +1 -0
@@ -329,6 +329,7 @@ static const struct acpi_device_id smi_acpi_ids[] = { { "CSC3551", (unsigned long)&cs35l41_hda },/* Non-conforming _HID for Cirrus Logic already released */ { "CLSA0100", (unsigned long)&cs35l41_hda }, + { "CLSA0101", (unsigned long)&cs35l41_hda }, { } };MODULE_DEVICE_TABLE (acpi, smi_acpi_ids);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 31/38 netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit aa5762c34213aba7a72dc58e70601370805fa794 ]
NF_CONNTRACK_PROCFS was marked obsolete in commit 54b07dca68557b09 ("netfilter: provide config option to disable ancient procfs parts") in v3.3.
--- net/netfilter/Kconfig | 1 - 1 file changed, 1 deletion(-)
net/netfilter/Kconfig +0 -1
@@ -144,7 +144,6 @@ config NF_CONNTRACK_ZONES config NF_CONNTRACK_PROCFS bool "Supply CT list in procfs (OBSOLETE)" - default y depends on PROC_FS help This option enables for the list of known conntrack entries
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 32/38 testing: selftests: nft_flowtable.sh: use random netns names
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit b71b7bfeac38c7a21c423ddafb29aa6258949df8 ]
"ns1" is a too generic name, use a random suffix to avoid errors when such a netns exists. Also allows to run multiple instances of the script in parallel.
--- .../selftests/netfilter/nft_flowtable.sh | 246 +++++++++--------- 1 file changed, 128 insertions(+), 118 deletions(-)
tools/testing/selftests/netfilter/nft_flowtable.sh +128 -118
@@ -14,6 +14,11 @@ # nft_flowtable.sh -o8000 -l1500 -r2000 # +sfx=$(mktemp -u "XXXXXXXX") +ns1="ns1-$sfx" +ns2="ns2-$sfx" +nsr1="nsr1-$sfx" +nsr2="nsr2-$sfx" # Kselftest framework requirement - SKIP code is 4. ksft_skip=4
@@ -36,18 +41,17 @@ checktool (){ checktool "nft --version" "run test without nft tool" checktool "ip -Version" "run test without ip tool" checktool "which nc" "run test without nc (netcat)" -checktool "ip netns add nsr1" "create net namespace" +checktool "ip netns add $nsr1" "create net namespace $nsr1" -ip netns add ns1 -ip netns add ns2 - -ip netns add nsr2 +ip netns add $ns1 +ip netns add $ns2 +ip netns add $nsr2 cleanup() { - for i in 1 2; do - ip netns del ns$i - ip netns del nsr$i - done + ip netns del $ns1 + ip netns del $ns2 + ip netns del $nsr1 + ip netns del $nsr2 rm -f "$ns1in" "$ns1out" rm -f "$ns2in" "$ns2out"
@@ -59,22 +63,21 @@ trap cleanup EXIT sysctl -q net.netfilter.nf_log_all_netns=1 -ip link add veth0 netns nsr1 type veth peer name eth0 netns ns1 -ip link add veth1 netns nsr1 type veth peer name veth0 netns nsr2 +ip link add veth0 netns $nsr1 type veth peer name eth0 netns $ns1 +ip link add veth1 netns $nsr1 type veth peer name veth0 netns $nsr2 -ip link add veth1 netns nsr2 type veth peer name eth0 netns ns2 +ip link add veth1 netns $nsr2 type veth peer name eth0 netns $ns2 for dev in lo veth0 veth1; do - for i in 1 2; do - ip -net nsr$i link set $dev up - done + ip -net $nsr1 link set $dev up + ip -net $nsr2 link set $dev up done -ip -net nsr1 addr add 10.0.1.1/24 dev veth0 -ip -net nsr1 addr add dead:1::1/64 dev veth0 +ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 +ip -net $nsr1 addr add dead:1::1/64 dev veth0 -ip -net nsr2 addr add 10.0.2.1/24 dev veth1 -ip -net nsr2 addr add dead:2::1/64 dev veth1 +ip -net $nsr2 addr add 10.0.2.1/24 dev veth1 +ip -net $nsr2 addr add dead:2::1/64 dev veth1 # set different MTUs so we need to push packets coming from ns1 (large MTU) # to ns2 (smaller MTU) to stack either to perform fragmentation (ip_no_pmtu_disc=1),
@@ -106,49 +109,56 @@ do esac done -if ! ip -net nsr1 link set veth0 mtu $omtu; then +if ! ip -net $nsr1 link set veth0 mtu $omtu; then exit 1 fi -ip -net ns1 link set eth0 mtu $omtu +ip -net $ns1 link set eth0 mtu $omtu -if ! ip -net nsr2 link set veth1 mtu $rmtu; then +if ! ip -net $nsr2 link set veth1 mtu $rmtu; then exit 1 fi -ip -net ns2 link set eth0 mtu $rmtu +ip -net $ns2 link set eth0 mtu $rmtu # transfer-net between nsr1 and nsr2. # these addresses are not used for connections. -ip -net nsr1 addr add 192.168.10.1/24 dev veth1 -ip -net nsr1 addr add fee1:2::1/64 dev veth1 - -ip -net nsr2 addr add 192.168.10.2/24 dev veth0 -ip -net nsr2 addr add fee1:2::2/64 dev veth0 - -for i in 1 2; do - ip netns exec nsr$i sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null - ip netns exec nsr$i sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null - - ip -net ns$i link set lo up - ip -net ns$i link set eth0 up - ip -net ns$i addr add 10.0.$i.99/24 dev eth0 - ip -net ns$i route add default via 10.0.$i.1 - ip -net ns$i addr add dead:$i::99/64 dev eth0 - ip -net ns$i route add default via dead:$i::1 - if ! ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then +ip -net $nsr1 addr add 192.168.10.1/24 dev veth1 +ip -net $nsr1 addr add fee1:2::1/64 dev veth1 + +ip -net $nsr2 addr add 192.168.10.2/24 dev veth0 +ip -net $nsr2 addr add fee1:2::2/64 dev veth0 + +for i in 0 1; do + ip netns exec $nsr1 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null + ip netns exec $nsr2 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null +done + +for ns in $ns1 $ns2;do + ip -net $ns link set lo up + ip -net $ns link set eth0 up + + if ! ip netns exec $ns sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then echo "ERROR: Check Originator/Responder values (problem during address addition)" exit 1 fi - # don't set ip DF bit for first two tests - ip netns exec ns$i sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null + ip netns exec $ns sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null done -ip -net nsr1 route add default via 192.168.10.2 -ip -net nsr2 route add default via 192.168.10.1 +ip -net $ns1 addr add 10.0.1.99/24 dev eth0 +ip -net $ns2 addr add 10.0.2.99/24 dev eth0 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns2 route add default via 10.0.2.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0 +ip -net $ns2 addr add dead:2::99/64 dev eth0 +ip -net $ns1 route add default via dead:1::1 +ip -net $ns2 route add default via dead:2::1 + +ip -net $nsr1 route add default via 192.168.10.2 +ip -net $nsr2 route add default via 192.168.10.1 -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF table inet filter { flowtable f1 { hook ingress priority 0
@@ -197,18 +207,18 @@ if [ $? -ne 0 ]; then fi # test basic connectivity -if ! ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then - echo "ERROR: ns1 cannot reach ns2" 1>&2 +if ! ip netns exec $ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then + echo "ERROR: $ns1 cannot reach ns2" 1>&2 exit 1 fi -if ! ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then - echo "ERROR: ns2 cannot reach ns1" 1>&2 +if ! ip netns exec $ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then + echo "ERROR: $ns2 cannot reach $ns1" 1>&2 exit 1 fi if [ $ret -eq 0 ];then - echo "PASS: netns routing/connectivity: ns1 can reach ns2" + echo "PASS: netns routing/connectivity: $ns1 can reach $ns2" fi ns1in=$(mktemp)
@@ -312,24 +322,24 @@ make_file "$ns2in" # First test: # No PMTU discovery, nsr1 is expected to fragment packets from ns1 to ns2 as needed. -if test_tcp_forwarding ns1 ns2; then +if test_tcp_forwarding $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2" else echo "FAIL: flow offload for ns1/ns2:" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # delete default route, i.e. ns2 won't be able to reach ns1 and # will depend on ns1 being masqueraded in nsr1. # expect ns1 has nsr1 address. -ip -net ns2 route del default via 10.0.2.1 -ip -net ns2 route del default via dead:2::1 -ip -net ns2 route add 192.168.10.1 via 10.0.2.1 +ip -net $ns2 route del default via 10.0.2.1 +ip -net $ns2 route del default via dead:2::1 +ip -net $ns2 route add 192.168.10.1 via 10.0.2.1 # Second test: # Same, but with NAT enabled. -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF table ip nat { chain prerouting { type nat hook prerouting priority 0; policy accept;
@@ -343,47 +353,47 @@ table ip nat { } EOF -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with NAT" else echo "FAIL: flow offload for ns1/ns2 with NAT" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # Third test: # Same as second test, but with PMTU discovery enabled. -handle=$(ip netns exec nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) +handle=$(ip netns exec $nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) -if ! ip netns exec nsr1 nft delete rule inet filter forward $handle; then +if ! ip netns exec $nsr1 nft delete rule inet filter forward $handle; then echo "FAIL: Could not delete large-packet accept rule" exit 1 fi -ip netns exec ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null -ip netns exec ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null +ip netns exec $ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null +ip netns exec $ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with NAT and pmtu discovery" else echo "FAIL: flow offload for ns1/ns2 with NAT and pmtu discovery" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset fi # Another test: # Add bridge interface br0 to Router1, with NAT enabled. -ip -net nsr1 link add name br0 type bridge -ip -net nsr1 addr flush dev veth0 -ip -net nsr1 link set up dev veth0 -ip -net nsr1 link set veth0 master br0 -ip -net nsr1 addr add 10.0.1.1/24 dev br0 -ip -net nsr1 addr add dead:1::1/64 dev br0 -ip -net nsr1 link set up dev br0 +ip -net $nsr1 link add name br0 type bridge +ip -net $nsr1 addr flush dev veth0 +ip -net $nsr1 link set up dev veth0 +ip -net $nsr1 link set veth0 master br0 +ip -net $nsr1 addr add 10.0.1.1/24 dev br0 +ip -net $nsr1 addr add dead:1::1/64 dev br0 +ip -net $nsr1 link set up dev br0 -ip netns exec nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null +ip netns exec $nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null # br0 with NAT enabled. -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF flush table ip nat table ip nat { chain prerouting {
@@ -398,59 +408,59 @@ table ip nat { } EOF -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with bridge NAT" else echo "FAIL: flow offload for ns1/ns2 with bridge NAT" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # Another test: # Add bridge interface br0 to Router1, with NAT and VLAN. -ip -net nsr1 link set veth0 nomaster -ip -net nsr1 link set down dev veth0 -ip -net nsr1 link add link veth0 name veth0.10 type vlan id 10 -ip -net nsr1 link set up dev veth0 -ip -net nsr1 link set up dev veth0.10 -ip -net nsr1 link set veth0.10 master br0 - -ip -net ns1 addr flush dev eth0 -ip -net ns1 link add link eth0 name eth0.10 type vlan id 10 -ip -net ns1 link set eth0 up -ip -net ns1 link set eth0.10 up -ip -net ns1 addr add 10.0.1.99/24 dev eth0.10 -ip -net ns1 route add default via 10.0.1.1 -ip -net ns1 addr add dead:1::99/64 dev eth0.10 - -if test_tcp_forwarding_nat ns1 ns2; then +ip -net $nsr1 link set veth0 nomaster +ip -net $nsr1 link set down dev veth0 +ip -net $nsr1 link add link veth0 name veth0.10 type vlan id 10 +ip -net $nsr1 link set up dev veth0 +ip -net $nsr1 link set up dev veth0.10 +ip -net $nsr1 link set veth0.10 master br0 + +ip -net $ns1 addr flush dev eth0 +ip -net $ns1 link add link eth0 name eth0.10 type vlan id 10 +ip -net $ns1 link set eth0 up +ip -net $ns1 link set eth0.10 up +ip -net $ns1 addr add 10.0.1.99/24 dev eth0.10 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0.10 + +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with bridge NAT and VLAN" else echo "FAIL: flow offload for ns1/ns2 with bridge NAT and VLAN" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # restore test topology (remove bridge and VLAN) -ip -net nsr1 link set veth0 nomaster -ip -net nsr1 link set veth0 down -ip -net nsr1 link set veth0.10 down -ip -net nsr1 link delete veth0.10 type vlan -ip -net nsr1 link delete br0 type bridge -ip -net ns1 addr flush dev eth0.10 -ip -net ns1 link set eth0.10 down -ip -net ns1 link set eth0 down -ip -net ns1 link delete eth0.10 type vlan +ip -net $nsr1 link set veth0 nomaster +ip -net $nsr1 link set veth0 down +ip -net $nsr1 link set veth0.10 down +ip -net $nsr1 link delete veth0.10 type vlan +ip -net $nsr1 link delete br0 type bridge +ip -net $ns1 addr flush dev eth0.10 +ip -net $ns1 link set eth0.10 down +ip -net $ns1 link set eth0 down +ip -net $ns1 link delete eth0.10 type vlan # restore address in ns1 and nsr1 -ip -net ns1 link set eth0 up -ip -net ns1 addr add 10.0.1.99/24 dev eth0 -ip -net ns1 route add default via 10.0.1.1 -ip -net ns1 addr add dead:1::99/64 dev eth0 -ip -net ns1 route add default via dead:1::1 -ip -net nsr1 addr add 10.0.1.1/24 dev veth0 -ip -net nsr1 addr add dead:1::1/64 dev veth0 -ip -net nsr1 link set up dev veth0 +ip -net $ns1 link set eth0 up +ip -net $ns1 addr add 10.0.1.99/24 dev eth0 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0 +ip -net $ns1 route add default via dead:1::1 +ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 +ip -net $nsr1 addr add dead:1::1/64 dev veth0 +ip -net $nsr1 link set up dev veth0 KEY_SHA="0x"$(ps -xaf | sha1sum | cut -d " " -f 1) KEY_AES="0x"$(ps -xaf | md5sum | cut -d " " -f 1)
@@ -480,23 +490,23 @@ do_esp() { } -do_esp nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 +do_esp $nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 -do_esp nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 +do_esp $nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 -ip netns exec nsr1 nft delete table ip nat +ip netns exec $nsr1 nft delete table ip nat # restore default routes -ip -net ns2 route del 192.168.10.1 via 10.0.2.1 -ip -net ns2 route add default via 10.0.2.1 -ip -net ns2 route add default via dead:2::1 +ip -net $ns2 route del 192.168.10.1 via 10.0.2.1 +ip -net $ns2 route add default via 10.0.2.1 +ip -net $ns2 route add default via dead:2::1 -if test_tcp_forwarding ns1 ns2; then +if test_tcp_forwarding $ns1 $ns2; then echo "PASS: ipsec tunnel mode for ns1/ns2" else echo "FAIL: ipsec tunnel mode for ns1/ns2" - ip netns exec nsr1 nft list ruleset 1>&2 - ip netns exec nsr1 cat /proc/net/xfrm_stat 1>&2 + ip netns exec $nsr1 nft list ruleset 1>&2 + ip netns exec $nsr1 cat /proc/net/xfrm_stat 1>&2 fi exit $ret
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 38/38 ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead
In reply to Sasha LevinFrom: Yang Jihong <[email protected]>
[ Upstream commit c3b0f72e805f0801f05fa2aa52011c4bfc694c44 ]
ftrace_startup does not remove ops from ftrace_ops_list when ftrace_startup_enable fails:
register_ftrace_function
ftrace_startup
__register_ftrace_function
...
add_ftrace_ops(&ftrace_ops_list, ops)
...
...
ftrace_startup_enable // if ftrace failed to modify, ftrace_disabled is set to 1
... return 0 // ops is in the ftrace_ops_list.
When ftrace_disabled = 1, unregister_ftrace_function simply returns without doing anything:unregister_ftrace_function
ftrace_shutdown
if (unlikely(ftrace_disabled))
return -ENODEV; // return here, __unregister_ftrace_function is not executed,
// as a result, ops is still in the ftrace_ops_list
__unregister_ftrace_function
...If ops is dynamically allocated, it will be free later, in this case, is_ftrace_trampoline accesses NULL pointer:
is_ftrace_trampoline
ftrace_ops_trampoline
do_for_each_ftrace_op(op, ftrace_ops_list) // OOPS! op may be NULL!
Syzkaller reports as follows:
[ 1203.506103] BUG: kernel NULL pointer dereference, address: 000000000000010b [ 1203.508039] #PF: supervisor read access in kernel mode [ 1203.508798] #PF: error_code(0x0000) - not-present page [ 1203.509558] PGD 800000011660b067 P4D 800000011660b067 PUD 130fb8067 PMD 0 [ 1203.510560] Oops: 0000 [#1] SMP KASAN PTI [ 1203.511189] CPU: 6 PID: 29532 Comm: syz-executor.2 Tainted: G B W 5.10.0 #8 [ 1203.512324] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [ 1203.513895] RIP: 0010:is_ftrace_trampoline+0x26/0xb0 [ 1203.514644] Code: ff eb d3 90 41 55 41 54 49 89 fc 55 53 e8 f2 00 fd ff 48 8b 1d 3b 35 5d 03 e8 e6 00 fd ff 48 8d bb 90 00 00 00 e8 2a 81 26 00 <48> 8b ab 90 00 00 00 48 85 ed 74 1d e8 c9 00 fd ff 48 8d bb 98 00 [ 1203.518838] RSP: 0018:ffffc900012cf960 EFLAGS: 00010246 [ 1203.520092] RAX: 0000000000000000 RBX: 000000000000007b RCX: ffffffff8a331866 [ 1203.521469] RDX: 0000000000000000 RSI: 0000000000000008 RDI: 000000000000010b [ 1203.522583] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffff8df18b07 [ 1203.523550] R10: fffffbfff1be3160 R11: 0000000000000001 R12: 0000000000478399 [ 1203.524596] R13: 0000000000000000 R14: ffff888145088000 R15: 0000000000000008 [ 1203.525634] FS: 00007f429f5f4700(0000) GS:ffff8881daf00000(0000) knlGS:0000000000000000 [ 1203.526801] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1203.527626] CR2: 000000000000010b CR3: 0000000170e1e001 CR4: 00000000003706e0 [ 1203.528611] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1203.529605] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Therefore, when ftrace_startup_enable fails, we need to rollback registration process and remove ops from ftrace_ops_list.
--- kernel/trace/ftrace.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/trace/ftrace.c +10 -0
@@ -2937,6 +2937,16 @@ int ftrace_startup(struct ftrace_ops *ops, int command)ftrace_startup_enable (command); +/* +* If ftrace is in an undefined state, we just remove ops from list +* to prevent the NULL pointer, instead of totally rolling it back and +* free trampoline, because those actions could cause further damage. +*/ +if (unlikely (ftrace_disabled)) { +__unregister_ftrace_function (ops); +return -ENODEV ; + } + ops->flags &= ~FTRACE_OPS_FL_ADDING ;return 0 ;
Signature · 1 line
2.35.1