drm/amdgpu: resume kiq access debugfs
Subsystems (2)
PATCH 1/1 drm/amdgpu: resume kiq access debugfs
If there is no GPU hang, user still can access
debugfs through kiq.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 12 +++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +9 -3
@@ -335,17 +335,23 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) } } -bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) +bool amdgpu_virt_access_debugfs_is_mmio (struct amdgpu_device *adev) {return amdgpu_sriov_is_debug (adev) ? true : false; } +bool amdgpu_virt_access_debugfs_is_kiq (struct amdgpu_device *adev) +{ +return amdgpu_sriov_is_normal (adev) ? true : false; +} +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { -if (!amdgpu_sriov_vf (adev)) +if (!amdgpu_sriov_vf (adev) || +amdgpu_virt_access_debugfs_is_kiq (adev))return 0 ; -if (amdgpu_virt_can_access_debugfs (adev)) +if (amdgpu_virt_access_debugfs_is_mmio (adev)) adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ;else return -EPERM ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +2 -0
@@ -299,6 +299,8 @@ static inline bool is_virtual_machine(void) ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF)#define amdgpu_sriov_is_debug (adev) \ ((!adev->in_gpu_reset) && adev->virt.tdr_debug) +#define amdgpu_sriov_is_normal (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);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
@@ -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);
Looks your patch didn't change above logic ///
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: Yintian Tao <[email protected]>
Sent: Monday, April 13, 2020 2:58 PM
To: Liu, Monk <[email protected]>
Cc: [email protected]; Tao, Yintian <[email protected]>
Subject: [PATCH] drm/amdgpu: resume kiq access debugfs
If there is no GPU hang, user still can access debugfs through kiq.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 12 +++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +7 -3
@@ -335,17 +335,23 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) } } -bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) +bool amdgpu_virt_access_debugfs_is_mmio (struct amdgpu_device *adev) {return amdgpu_sriov_is_debug (adev) ? true : false; } +bool amdgpu_virt_access_debugfs_is_kiq (struct amdgpu_device *adev) { +return amdgpu_sriov_is_normal (adev) ? true : false; } +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { -if (!amdgpu_sriov_vf (adev)) +if (!amdgpu_sriov_vf (adev) || +amdgpu_virt_access_debugfs_is_kiq (adev))return 0 ; -if (amdgpu_virt_can_access_debugfs (adev)) +if (amdgpu_virt_access_debugfs_is_mmio (adev)) adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ;else return -EPERM ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +2 -1
@@ -299,6 +299,8 @@ static inline bool is_virtual_machine(void) ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) #define amdgpu_sriov_is_debug(adev) \ ((!adev->in_gpu_reset) && adev->virt.tdr_debug) +#define amdgpu_sriov_is_normal (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); --
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_____________________________________
Monk Liu|GPU Virtualization Team |AMD
-----Original Message-----
From: Yintian Tao <[email protected]>
Sent: Monday, April 13, 2020 2:58 PM
To: Liu, Monk <[email protected]>
Cc: [email protected]; Tao, Yintian <[email protected]>
Subject: [PATCH] drm/amdgpu: resume kiq access debugfs
If there is no GPU hang, user still can access debugfs through kiq.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 12 +++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +7 -3
@@ -335,17 +335,23 @@ void amdgpu_detect_virtualization(struct amdgpu_device *adev) } } -bool amdgpu_virt_can_access_debugfs (struct amdgpu_device *adev) +bool amdgpu_virt_access_debugfs_is_mmio (struct amdgpu_device *adev) {return amdgpu_sriov_is_debug (adev) ? true : false; } +bool amdgpu_virt_access_debugfs_is_kiq (struct amdgpu_device *adev) { +return amdgpu_sriov_is_normal (adev) ? true : false; } +int amdgpu_virt_enable_access_debugfs (struct amdgpu_device *adev) { -if (!amdgpu_sriov_vf (adev)) +if (!amdgpu_sriov_vf (adev) || +amdgpu_virt_access_debugfs_is_kiq (adev))return 0 ; -if (amdgpu_virt_can_access_debugfs (adev)) +if (amdgpu_virt_access_debugfs_is_mmio (adev)) adev->virt.caps &= ~AMDGPU_SRIOV_CAPS_RUNTIME ;else return -EPERM ;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +2 -1
@@ -299,6 +299,8 @@ static inline bool is_virtual_machine(void) ((adev)->virt.gim_feature & AMDGIM_FEATURE_PP_ONE_VF) #define amdgpu_sriov_is_debug(adev) \ ((!adev->in_gpu_reset) && adev->virt.tdr_debug) +#define amdgpu_sriov_is_normal (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); --
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx