drm/amdgpu: Update invalid PTE flag setting
Subsystems (2)
PATCH v3 1/1 drm/amdgpu: Update invalid PTE flag setting
Update the invalid PTE flag setting with TF enabled. This is to ensure, in addition to transitioning the retry fault to a no-retry fault, it also causes the wavefront to enter the trap handler. With the current setting, the fault only transitions to a no-retry fault. Additionally, have 2 sets of invalid PTE settings, one for TF enabled, the other for TF disabled. The setting with TF disabled, doesn't work with TF enabled.
Signed-off-by Mukul Joshi <[email protected]>
---v1->v2:
- Update handling according to Christian's feedback.
v2->v3:
- Remove ASIC specific callback (Felix).
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -2583,7 +2583,7 @@ bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,/* Intentionally setting invalid PTE flag * combination to force a no-retry-fault */ - flags =AMDGPU_PTE_SNOOPED |AMDGPU_PTE_PRT ; + flags =AMDGPU_VM_NORETRY_FLAGS ; value =0 ; }else if (amdgpu_vm_fault_stop ==AMDGPU_VM_FAULT_STOP_NEVER ) {/* Redirect the access to the dummy page */
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +6 -0
@@ -84,7 +84,13 @@ struct amdgpu_mem_stats;/* PDE Block Fragment Size for VEGA10 */ #define AMDGPU_PDE_BFS (a) ((uint64_t)a << 59) +/* Flag combination to set no-retry with TF disabled */ +#define AMDGPU_VM_NORETRY_FLAGS (AMDGPU_PTE_EXECUTABLE | AMDGPU_PDE_PTE | \ + AMDGPU_PTE_TF) +/* Flag combination to set no-retry with TF enabled */ +#define AMDGPU_VM_NORETRY_FLAGS_TF (AMDGPU_PTE_VALID | AMDGPU_PTE_SYSTEM | \ + AMDGPU_PTE_PRT)/* For GFX9 */ #define AMDGPU_PTE_MTYPE_VG10 (a) ((uint64_t)(a) << 57)#define AMDGPU_PTE_MTYPE_VG10_MASK AMDGPU_PTE_MTYPE_VG10(3ULL)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +21 -0
@@ -778,6 +778,24 @@ int amdgpu_vm_pde_update(struct amdgpu_vm_update_params *params, 1, 0, flags); } +/** +* amdgpu_vm_pte_update_noretry_flags - Update PTE no-retry flags +* +* @adev - amdgpu_device pointer +* @flags: pointer to PTE flags +* +* Update PTE no-retry flags when TF is enabled. +*/ +static void amdgpu_vm_pte_update_noretry_flags (struct amdgpu_device *adev, +uint64_t *flags) +{ +/* Update no retry flags when TF is enabled */ +if ((*flags &AMDGPU_VM_NORETRY_FLAGS ) ==AMDGPU_VM_NORETRY_FLAGS ) { + *flags &= ~AMDGPU_VM_NORETRY_FLAGS ; + *flags |=AMDGPU_VM_NORETRY_FLAGS_TF ; + } +} +/* * amdgpu_vm_pte_update_flags - figure out flags for PTE updates *
@@ -804,6 +822,9 @@ static void amdgpu_vm_pte_update_flags(struct amdgpu_vm_update_params *params, flags |=AMDGPU_PTE_EXECUTABLE ; } +if (adev->gmc.translate_further && level ==AMDGPU_VM_PTB ) +amdgpu_vm_pte_update_noretry_flags (adev, &flags); +/* APUs mapping system memory may need different MTYPEs on different * NUMA nodes. Only do this for contiguous ranges that can be assumed * to be on the same NUMA node.
Signature · 1 line
2.35.1