drm/amdgpu: restrict debugfs register access under SR-IOV
Subsystems (2)
PATCH 1/1 drm/amdgpu: restrict debugfs register access under SR-IOV
Under bare metal, there is no more else to take care of the GPU register access through MMIO. Under Virtualization, to access GPU register is implemented through KIQ during run-time due to world-switch.
Therefore, under SR-IOV user can only access debugfs to r/w GPU registers when meets all three conditions below.
- amdgpu_gpu_recovery=0
- TDR happened
- in_gpu_reset=0
v2: merge amdgpu_virt_can_access_debugfs() into
amdgpu_virt_enable_access_debugfs()
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 26 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 ++ 4 files changed, 108 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +69 -4
@@ -152,11 +152,16 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +if (use_bank) {if ((sh_bank !=0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) || (se_bank !=0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; }mutex_lock (&adev->grbm_idx_mutex);
@@ -207,6 +212,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -255,6 +261,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -263,6 +273,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -275,6 +286,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -304,6 +316,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -311,6 +327,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -325,6 +342,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -354,6 +372,10 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -362,6 +384,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -374,6 +397,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -403,6 +427,10 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -410,6 +438,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -424,6 +453,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -453,6 +483,10 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -461,6 +495,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -473,6 +508,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -502,6 +538,10 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;
@@ -509,6 +549,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }
@@ -523,6 +564,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -651,16 +693,24 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; + r =amdgpu_dpm_read_sensor (adev, idx, &values[0 ], &valuesize);pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } -if (size > valuesize) +if (size > valuesize) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + } outsize =0 ; x =0 ;
@@ -673,6 +723,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, } } +amdgpu_virt_disable_access_debugfs (adev);return !r ? outsize : r; }
@@ -720,6 +771,10 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex);amdgpu_gfx_select_se_sh (adev, se, sh, cu);
@@ -734,16 +789,20 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (!x) +if (!x) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + }while (size && (offset < x *4 )) {uint32_t value; value = data[offset >>2 ]; r =put_user (value, (uint32_t *)buf); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } result +=4 ; buf +=4 ;
@@ -751,6 +810,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, size -=4 ; } +amdgpu_virt_disable_access_debugfs (adev);return result; }
@@ -805,6 +865,10 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex);amdgpu_gfx_select_se_sh (adev, se, sh, cu);
@@ -840,6 +904,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, err:kfree (data); +amdgpu_virt_disable_access_debugfs (adev);return result; }
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6 -2
@@ -33,6 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job);struct amdgpu_task_info ti; +struct amdgpu_device *adev = ring->adev;memset (&ti,0 ,sizeof (struct amdgpu_task_info ));
@@ -49,10 +50,13 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)DRM_ERROR ("Process information: process %s pid %d thread %s pid %d\n" , ti.process_name, ti.tgid, ti.task_name, ti.pid); -if (amdgpu_device_should_recover_gpu (ring->adev)) +if (amdgpu_device_should_recover_gpu (ring->adev)) {amdgpu_device_gpu_recover (ring->adev, job); -else + }else {drm_sched_suspend_timeout (&ring->sched); +if (amdgpu_sriov_vf (adev)) + adev->virt.tdr_debug = true; + } } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +26 -0
@@ -334,3 +334,29 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } } + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) +{ +return amdgpu_sriov_is_debug (adev) ? true : false; +} + +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) +{ +int ret =0 ; + +if (!amdgpu_sriov_vf (adev)) +return ret; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else + ret = -EPERM ; + +return ret; +} + +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev) +{ +if (amdgpu_sriov_vf (adev)) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_RUNTIME ; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +7 -0
@@ -265,6 +265,7 @@ struct amdgpu_virt {uint32_t gim_feature;uint32_t reg_access_mode;int req_init_data_ver; +bool tdr_debug; };#define amdgpu_sriov_enabled (adev) \
@@ -296,6 +297,8 @@ static inline bool is_virtual_machine(void)#define amdgpu_sriov_is_pp_one_vf (adev) \ ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) +#define amdgpu_sriov_is_debug (adev) \ + ((!adev->in_gpu_reset) && adev->virt.tdr_debug)bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void amdgpu_virt_init_setting (struct amdgpu_device *adev);
@@ -314,4 +317,8 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned long obj_size, unsigned int chksum);void amdgpu_virt_init_data_exchange (struct amdgpu_device *adev);void amdgpu_detect_virtualization (struct amdgpu_device *adev); + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev); +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev); +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev);#endif
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 357 lines · Yintian Tao
Under bare metal, there is no more else to take care of the GPU register access through MMIO. Under Virtualization, to access GPU register is implemented through KIQ during run-time due to world-switch.
Therefore, under SR-IOV user can only access debugfs to r/w GPU registers when meets all three conditions below.
- amdgpu_gpu_recovery=0
- TDR happened
- in_gpu_reset=0v2: merge
amdgpu_virt_can_access_debugfs()into
amdgpu_virt_enable_access_debugfs()Signed-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 26 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 ++ 4 files changed, 108 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +69
-4@@ -152,11 +152,16 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +if (use_bank) {if ((sh_bank !=0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) || (se_bank !=0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; }mutex_lock (&adev->grbm_idx_mutex);@@ -207,6 +212,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -255,6 +261,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -263,6 +273,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -275,6 +286,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -304,6 +316,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -311,6 +327,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -325,6 +342,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -354,6 +372,10 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -362,6 +384,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -374,6 +397,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -403,6 +427,10 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -410,6 +438,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -424,6 +453,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -453,6 +483,10 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -461,6 +495,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -473,6 +508,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -502,6 +538,10 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -509,6 +549,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -523,6 +564,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -651,16 +693,24 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; + r =amdgpu_dpm_read_sensor (adev, idx, &values[0 ], &valuesize);pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } -if (size > valuesize) +if (size > valuesize) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + } outsize =0 ; x =0 ;@@ -673,6 +723,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, } } +amdgpu_virt_disable_access_debugfs (adev);return !r ? outsize : r; }@@ -720,6 +771,10 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex);amdgpu_gfx_select_se_sh (adev, se, sh, cu);@@ -734,16 +789,20 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (!x) +if (!x) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + }while (size && (offset < x *4 )) {uint32_t value; value = data[offset >>2 ]; r =put_user (value, (uint32_t *)buf); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } result +=4 ; buf +=4 ;@@ -751,6 +810,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, size -=4 ; } +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -805,6 +865,10 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex);amdgpu_gfx_select_se_sh (adev, se, sh, cu);@@ -840,6 +904,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, err:kfree (data); +amdgpu_virt_disable_access_debugfs (adev);return result; }drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6
-2@@ -33,6 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job);struct amdgpu_task_info ti; +struct amdgpu_device *adev = ring->adev;memset (&ti,0 ,sizeof (struct amdgpu_task_info ));@@ -49,10 +50,13 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)DRM_ERROR ("Process information: process %s pid %d thread %s pid %d\n" , ti.process_name, ti.tgid, ti.task_name, ti.pid); -if (amdgpu_device_should_recover_gpu (ring->adev)) +if (amdgpu_device_should_recover_gpu (ring->adev)) {amdgpu_device_gpu_recover (ring->adev, job); -else + }else {drm_sched_suspend_timeout (&ring->sched); +if (amdgpu_sriov_vf (adev)) + adev->virt.tdr_debug = true; + } } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9
-0@@ -334,3 +334,29 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } } + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) +{ +return amdgpu_sriov_is_debug (adev) ? true : false; +} + +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) +{ +int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 355
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +10
-0+ +if (!amdgpu_sriov_vf (adev)) +return ret; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else + ret = -EPERM ; + +return ret;
You can drop the ret variable in this function and just return constants for each case. E.g.,
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev)
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9
-0+if (!amdgpu_sriov_vf (adev)) +return 0 ; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else +return -EPERM ; + +return 0 ;
Other than that the patch looks good to me.
Alex
Quoted 40 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +7
-0+} + +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev) +{ +if (amdgpu_sriov_vf (adev)) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_RUNTIME ; +}drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +7
-1@@ -265,6 +265,7 @@ struct amdgpu_virt {uint32_t gim_feature;uint32_t reg_access_mode;int req_init_data_ver; +bool tdr_debug; };#define amdgpu_sriov_enabled (adev) \@@ -296,6 +297,8 @@ static inline bool is_virtual_machine(void)#define amdgpu_sriov_is_pp_one_vf (adev) \ ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) +#define amdgpu_sriov_is_debug (adev) \ + ((!adev->in_gpu_reset) && adev->virt.tdr_debug)bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void amdgpu_virt_init_setting (struct amdgpu_device *adev);@@ -314,4 +317,8 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned long obj_size, unsigned int chksum);void amdgpu_virt_init_data_exchange (struct amdgpu_device *adev);void amdgpu_detect_virtualization (struct amdgpu_device *adev); + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev); +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev); +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev);#endif --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Tao, Yintian
Acked-by Alex DeucherHi Alex
Many thanks for your review.
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: 2020年4月9日 23:21
To: Tao, Yintian <[email protected]>
Cc: Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Quoted 356 lines · Yintian Tao
Under bare metal, there is no more else to take care of the GPU register access through MMIO.
Under Virtualization, to access GPU register is implemented through KIQ during run-time due to world-switch.Therefore, under SR-IOV user can only access debugfs to r/w GPU registers when meets all three conditions below.
- amdgpu_gpu_recovery=0
- TDR happened
- in_gpu_reset=0v2: merge
amdgpu_virt_can_access_debugfs()into
amdgpu_virt_enable_access_debugfs()Signed-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 26 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 ++ 4 files changed, 108 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +57
-2@@ -152,11 +152,16 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +if (use_bank) {if ((sh_bank !=0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) || (se_bank !=0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; }mutex_lock (&adev->grbm_idx_mutex);@@ -207,6 +212,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -255,6 +261,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -263,6 +273,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -275,6 +286,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -304,6 +316,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -311,6 +327,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -325,6 +342,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -354,6 +372,10 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -362,6 +384,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -374,6 +397,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -403,6 +427,10 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -410,6 +438,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -424,6 +453,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -453,6 +483,10 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -461,6 +495,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -473,6 +508,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -502,6 +538,10 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -509,6 +549,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -523,6 +564,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -651,16 +693,24 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; + r =amdgpu_dpm_read_sensor (adev, idx, &values[0 ], &valuesize);pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } -if (size > valuesize) +if (size > valuesize) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + } outsize =0 ; x =0 ;@@ -673,6 +723,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, } } +amdgpu_virt_disable_access_debugfs (adev);return !r ? outsize : r; }@@ -720,6 +771,10 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -734,16 +789,20@@ static
ssize_tamdgpu_debugfs_wave_read(struct file *f, char__user*buf,pm_runtime_mark_last_busy(adev->ddev->dev); pm_runtime_put_autosuspend(adev->ddev->dev);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +11
-2-if (!x) +if (!x) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + }while (size && (offset < x *4 )) {uint32_t value; value = data[offset >>2 ]; r =put_user (value, (uint32_t *)buf); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } result +=4 ; buf +=4 ;@@ -751,6 +810,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, size -=4 ; } +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -805,6 +865,10 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -840,6 +904,7 @@static
ssize_tamdgpu_debugfs_gpr_read(struct file *f, char__user*buf,err:
kfree(data);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-0+amdgpu_virt_disable_access_debugfs (adev);return result; }drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6
-2@@ -33,6 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job);struct amdgpu_task_info ti; +struct amdgpu_device *adev = ring->adev;memset (&ti,0 ,sizeof (struct amdgpu_task_info ));@@ -49,10 +50,13 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)DRM_ERROR ("Process information: process %s pid %d thread %s pid %d\n" , ti.process_name, ti.tgid, ti.task_name, ti.pid); -if (amdgpu_device_should_recover_gpu (ring->adev)) +if (amdgpu_device_should_recover_gpu (ring->adev)) {amdgpu_device_gpu_recover (ring->adev, job); -else + }else {drm_sched_suspend_timeout (&ring->sched); +if (amdgpu_sriov_vf (adev)) + adev->virt.tdr_debug = true; + } } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +6
-0@@ -334,3 +334,29 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } } + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) { +return amdgpu_sriov_is_debug (adev) ? true : false; } + +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { +int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 352
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +10
-0+ +if (!amdgpu_sriov_vf (adev)) +return ret; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else + ret = -EPERM ; + +return ret;
You can drop the ret variable in this function and just return constants for each case. E.g.,
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev)
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9
-0+if (!amdgpu_sriov_vf (adev)) +return 0 ; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else +return -EPERM ; + +return 0 ;
Other than that the patch looks good to me.
Alex
Quoted 39 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +5
-0+} + +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev) { +if (amdgpu_sriov_vf (adev)) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_RUNTIME ; }drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3
-0@@ -265,6 +265,7 @@ struct amdgpu_virt {uint32_t gim_feature;uint32_t reg_access_mode;int req_init_data_ver; +bool tdr_debug; };#define amdgpu_sriov_enabled (adev) \@@ -296,6 +297,8 @@ static inline bool is_virtual_machine(void)#define amdgpu_sriov_is_pp_one_vf (adev) \ ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) +#define amdgpu_sriov_is_debug (adev) \ + ((!adev->in_gpu_reset) && adev->virt.tdr_debug)bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void
amdgpu_virt_init_setting(struct amdgpu_device *adev); @@ -314,4 +317,8 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned longobj_size,
unsigned int chksum); voidamdgpu_virt_init_data_exchange(struct amdgpu_device *adev); voidamdgpu_detect_virtualization(struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +4
-1+ +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev);int +amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev);void +amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev);#endif --2.17.1
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CYi ntian.Tao%40amd.com%7Cef3f5313116c4fd980f308d7dc99a4c3%7C3dd8961fe4884 e608e11a82d994e183d%7C0%7C0%7C637220424774813978&sdata=qZz3SK2%2F% 2FpN7JSfQNPG8AiyivEIBPncOhxEBM2WB5Rg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Liu, Monk
Acked-by Alex DeucherHi Yintian
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +4 -0
@@ -152,11 +152,17 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; +if (!amdgpu_virt_can_access_debugfs (adev)) +return -EINVAL ; +else +amdgpu_virt_enable_access_debugfs (adev);
You patch looks simply bail out if you are not under "debug" condition, but that looks weird: you are forbidding KIQ to do the debugfs access during non-debug condition , which is an overkill to me .
The ideal logic is :
1) When we are under "tdr_deubg" mode, we allow debugfs to handled by MMIO access, just like bare-metal
2) When we are not under "tdr_debug" mode (e.g.: no tdr triggered ) we shall still allow debugfs to work, but all the register access can go with KIQ way .
Looks you are dropping 2 totally ...
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tao, Yintian
Sent: Thursday, April 9, 2020 11:23 PM
To: Alex Deucher <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; amd-gfx list <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Hi Alex
Many thanks for your review.
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: 2020年4月9日 23:21
To: Tao, Yintian <[email protected]>
Cc: Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Quoted 356 lines · Yintian Tao
Under bare metal, there is no more else to take care of the GPU register access through MMIO.
Under Virtualization, to access GPU register is implemented through KIQ during run-time due to world-switch.Therefore, under SR-IOV user can only access debugfs to r/w GPU registers when meets all three conditions below.
- amdgpu_gpu_recovery=0
- TDR happened
- in_gpu_reset=0v2: merge
amdgpu_virt_can_access_debugfs()into
amdgpu_virt_enable_access_debugfs()Signed-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 26 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 ++ 4 files changed, 108 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +57
-2@@ -152,11 +152,16 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +if (use_bank) {if ((sh_bank !=0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) || (se_bank !=0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; }mutex_lock (&adev->grbm_idx_mutex);@@ -207,6 +212,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -255,6 +261,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -263,6 +273,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -275,6 +286,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -304,6 +316,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -311,6 +327,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -325,6 +342,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -354,6 +372,10 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -362,6 +384,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -374,6 +397,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -403,6 +427,10 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -410,6 +438,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -424,6 +453,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -453,6 +483,10 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -461,6 +495,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -473,6 +508,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -502,6 +538,10 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -509,6 +549,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -523,6 +564,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -651,16 +693,24 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; + r =amdgpu_dpm_read_sensor (adev, idx, &values[0 ], &valuesize);pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } -if (size > valuesize) +if (size > valuesize) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + } outsize =0 ; x =0 ;@@ -673,6 +723,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, } } +amdgpu_virt_disable_access_debugfs (adev);return !r ? outsize : r; }@@ -720,6 +771,10 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -734,16 +789,20@@ static
ssize_tamdgpu_debugfs_wave_read(struct file *f, char__user*buf,pm_runtime_mark_last_busy(adev->ddev->dev); pm_runtime_put_autosuspend(adev->ddev->dev);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +11
-2-if (!x) +if (!x) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + }while (size && (offset < x *4 )) {uint32_t value; value = data[offset >>2 ]; r =put_user (value, (uint32_t *)buf); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } result +=4 ; buf +=4 ;@@ -751,6 +810,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, size -=4 ; } +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -805,6 +865,10 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -840,6 +904,7 @@static
ssize_tamdgpu_debugfs_gpr_read(struct file *f, char__user*buf,err:
kfree(data);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-0+amdgpu_virt_disable_access_debugfs (adev);return result; }drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6
-2@@ -33,6 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job);struct amdgpu_task_info ti; +struct amdgpu_device *adev = ring->adev;memset (&ti,0 ,sizeof (struct amdgpu_task_info ));@@ -49,10 +50,13 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)DRM_ERROR ("Process information: process %s pid %d thread %s pid %d\n" , ti.process_name, ti.tgid, ti.task_name, ti.pid); -if (amdgpu_device_should_recover_gpu (ring->adev)) +if (amdgpu_device_should_recover_gpu (ring->adev)) {amdgpu_device_gpu_recover (ring->adev, job); -else + }else {drm_sched_suspend_timeout (&ring->sched); +if (amdgpu_sriov_vf (adev)) + adev->virt.tdr_debug = true; + } } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +6
-0@@ -334,3 +334,29 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } } + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) { +return amdgpu_sriov_is_debug (adev) ? true : false; } + +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { +int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 352
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +10
-0+ +if (!amdgpu_sriov_vf (adev)) +return ret; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else + ret = -EPERM ; + +return ret;
You can drop the ret variable in this function and just return constants for each case. E.g.,
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 361
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9
-0+if (!amdgpu_sriov_vf (adev)) +return 0 ; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else +return -EPERM ; + +return 0 ;
Other than that the patch looks good to me.
Alex
Quoted 39 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +5
-0+} + +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev) { +if (amdgpu_sriov_vf (adev)) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_RUNTIME ; }drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3
-0@@ -265,6 +265,7 @@ struct amdgpu_virt {uint32_t gim_feature;uint32_t reg_access_mode;int req_init_data_ver; +bool tdr_debug; };#define amdgpu_sriov_enabled (adev) \@@ -296,6 +297,8 @@ static inline bool is_virtual_machine(void)#define amdgpu_sriov_is_pp_one_vf (adev) \ ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) +#define amdgpu_sriov_is_debug (adev) \ + ((!adev->in_gpu_reset) && adev->virt.tdr_debug)bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void
amdgpu_virt_init_setting(struct amdgpu_device *adev); @@ -314,4 +317,8 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned longobj_size,
unsigned int chksum); voidamdgpu_virt_init_data_exchange(struct amdgpu_device *adev); voidamdgpu_detect_virtualization(struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +4
-1+ +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev);int +amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev);void +amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev);#endif --2.17.1
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CYi ntian.Tao%40amd.com%7Cef3f5313116c4fd980f308d7dc99a4c3%7C3dd8961fe4884 e608e11a82d994e183d%7C0%7C0%7C637220424774813978&sdata=qZz3SK2%2F% 2FpN7JSfQNPG8AiyivEIBPncOhxEBM2WB5Rg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cmonk.liu%40amd.com%7C89a56984ece24933347808d7dc99e4f2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637220426197692705&sdata=X6tJSycRMvfdMgSh3z1g1qqPlCfl0lQ1ytTR0fnQrWw%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Tao, Yintian
Acked-by Alex DeucherHi Monk
Thanks for your review. I have changed the code according to your comments. Please help have a review again
Best Regards
Yintian Tao
-----Original Message-----
From: Liu, Monk <[email protected]>
Sent: 2020年4月11日 16:59
To: Tao, Yintian <[email protected]>; Alex Deucher <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; amd-gfx list <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Hi Yintian
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +4 -0
@@ -152,11 +152,17 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; +if (!amdgpu_virt_can_access_debugfs (adev)) +return -EINVAL ; +else +amdgpu_virt_enable_access_debugfs (adev);
You patch looks simply bail out if you are not under "debug" condition, but that looks weird: you are forbidding KIQ to do the debugfs access during non-debug condition , which is an overkill to me .
The ideal logic is :
1) When we are under "tdr_deubg" mode, we allow debugfs to handled by MMIO access, just like bare-metal
2) When we are not under "tdr_debug" mode (e.g.: no tdr triggered ) we shall still allow debugfs to work, but all the register access can go with KIQ way .
Looks you are dropping 2 totally ...
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tao, Yintian
Sent: Thursday, April 9, 2020 11:23 PM
To: Alex Deucher <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; amd-gfx list <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Hi Alex
Many thanks for your review.
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: 2020年4月9日 23:21
To: Tao, Yintian <[email protected]>
Cc: Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; amd-gfx list <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: restrict debugfs register access under SR-IOV
Quoted 356 lines · Yintian Tao
Under bare metal, there is no more else to take care of the GPU register access through MMIO.
Under Virtualization, to access GPU register is implemented through KIQ during run-time due to world-switch.Therefore, under SR-IOV user can only access debugfs to r/w GPU registers when meets all three conditions below.
- amdgpu_gpu_recovery=0
- TDR happened
- in_gpu_reset=0v2: merge
amdgpu_virt_can_access_debugfs()into
amdgpu_virt_enable_access_debugfs()Signed-off-by Yintian Tao <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 73 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 26 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 ++ 4 files changed, 108 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +57
-2@@ -152,11 +152,16 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +if (use_bank) {if ((sh_bank !=0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) || (se_bank !=0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines)) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; }mutex_lock (&adev->grbm_idx_mutex);@@ -207,6 +212,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -255,6 +261,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -263,6 +273,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -275,6 +286,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -304,6 +316,10 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -311,6 +327,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -325,6 +342,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -354,6 +372,10 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -362,6 +384,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -374,6 +397,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -403,6 +427,10 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -410,6 +438,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userif (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -424,6 +453,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __userpm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -453,6 +483,10 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -461,6 +495,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -473,6 +508,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -502,6 +538,10 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +while (size) {uint32_t value;@@ -509,6 +549,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *if (r) {pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return r; }@@ -523,6 +564,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -651,16 +693,24 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; + r =amdgpu_dpm_read_sensor (adev, idx, &values[0 ], &valuesize);pm_runtime_mark_last_busy (adev->ddev->dev);pm_runtime_put_autosuspend (adev->ddev->dev); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } -if (size > valuesize) +if (size > valuesize) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + } outsize =0 ; x =0 ;@@ -673,6 +723,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, } } +amdgpu_virt_disable_access_debugfs (adev);return !r ? outsize : r; }@@ -720,6 +771,10 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -734,16 +789,20@@ static
ssize_tamdgpu_debugfs_wave_read(struct file *f, char__user*buf,pm_runtime_mark_last_busy(adev->ddev->dev); pm_runtime_put_autosuspend(adev->ddev->dev);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +11
-2-if (!x) +if (!x) { +amdgpu_virt_disable_access_debugfs (adev);return -EINVAL ; + }while (size && (offset < x *4 )) {uint32_t value; value = data[offset >>2 ]; r =put_user (value, (uint32_t *)buf); -if (r) +if (r) { +amdgpu_virt_disable_access_debugfs (adev);return r; + } result +=4 ; buf +=4 ;@@ -751,6 +810,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, size -=4 ; } +amdgpu_virt_disable_access_debugfs (adev);return result; }@@ -805,6 +865,10 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,if (r <0 )return r; + r =amdgpu_virt_enable_access_debugfs (adev); +if (r <0 ) +return r; +/* switch to the specific se/sh/cu */ mutex_lock (&adev->grbm_idx_mutex); amdgpu_gfx_select_se_sh(adev, se, sh, cu); @@ -840,6 +904,7 @@static
ssize_tamdgpu_debugfs_gpr_read(struct file *f, char__user*buf,err:
kfree(data);drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-0+amdgpu_virt_disable_access_debugfs (adev);return result; }drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +6
-2@@ -33,6 +33,7 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)struct amdgpu_ring *ring =to_amdgpu_ring (s_job->sched);struct amdgpu_job *job =to_amdgpu_job (s_job);struct amdgpu_task_info ti; +struct amdgpu_device *adev = ring->adev;memset (&ti,0 ,sizeof (struct amdgpu_task_info ));@@ -49,10 +50,13 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)DRM_ERROR ("Process information: process %s pid %d thread %s pid %d\n" , ti.process_name, ti.tgid, ti.task_name, ti.pid); -if (amdgpu_device_should_recover_gpu (ring->adev)) +if (amdgpu_device_should_recover_gpu (ring->adev)) {amdgpu_device_gpu_recover (ring->adev, job); -else + }else {drm_sched_suspend_timeout (&ring->sched); +if (amdgpu_sriov_vf (adev)) + adev->virt.tdr_debug = true; + } } int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +6
-0@@ -334,3 +334,29 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) adev->virt.caps |=AMDGPU_PASSTHROUGH_MODE ; } } + +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) { +return amdgpu_sriov_is_debug (adev) ? true : false; } + +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { +int ret =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 352
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +10
-0+ +if (!amdgpu_sriov_vf (adev)) +return ret; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else + ret = -EPERM ; + +return ret;
You can drop the ret variable in this function and just return constants for each case. E.g.,
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c void amdgpu_detect_virtualization(struct amdgpu_device *adev) · line 361
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9
-0+if (!amdgpu_sriov_vf (adev)) +return 0 ; + +if (amdgpu_virt_can_access_debugfs (adev)) + adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ; +else +return -EPERM ; + +return 0 ;
Other than that the patch looks good to me.
Alex
Quoted 39 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +5
-0+} + +void amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev) { +if (amdgpu_sriov_vf (adev)) + adev->virt.caps |=AMDGPU_SRIOV_CAPS_RUNTIME ; }drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3
-0@@ -265,6 +265,7 @@ struct amdgpu_virt {uint32_t gim_feature;uint32_t reg_access_mode;int req_init_data_ver; +bool tdr_debug; };#define amdgpu_sriov_enabled (adev) \@@ -296,6 +297,8 @@ static inline bool is_virtual_machine(void)#define amdgpu_sriov_is_pp_one_vf (adev) \ ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) +#define amdgpu_sriov_is_debug (adev) \ + ((!adev->in_gpu_reset) && adev->virt.tdr_debug)bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void
amdgpu_virt_init_setting(struct amdgpu_device *adev); @@ -314,4 +317,8 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj, unsigned longobj_size,
unsigned int chksum); voidamdgpu_virt_init_data_exchange(struct amdgpu_device *adev); voidamdgpu_detect_virtualization(struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +4
-1+ +bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev);int +amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev);void +amdgpu_virt_disable_access_debugfs (struct amdgpu_device *adev);#endif --2.17.1
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CYi ntian.Tao%40amd.com%7Cef3f5313116c4fd980f308d7dc99a4c3%7C3dd8961fe4884 e608e11a82d994e183d%7C0%7C0%7C637220424774813978&sdata=qZz3SK2%2F% 2FpN7JSfQNPG8AiyivEIBPncOhxEBM2WB5Rg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cmonk.liu%40amd.com%7C89a56984ece24933347808d7dc99e4f2%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637220426197692705&sdata=X6tJSycRMvfdMgSh3z1g1qqPlCfl0lQ1ytTR0fnQrWw%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx