Skip to content

Commit 241f0aa

Browse files
sean-jcbonzini
authored andcommitted
drm/i915/gvt: Error out on an attempt to shadowing an unknown GTT entry type
Bail from ppgtt_populate_shadow_entry() if an unexpected GTT entry type is encountered instead of subtly falling through to the common "direct shadow" path. Eliminating the default/error path's reliance on the common handling will allow hoisting intel_gvt_dma_map_guest_page() into the case statements so that the 2MiB case can try intel_gvt_dma_map_guest_page() and fallback to splitting the entry on failure. Reviewed-by: Zhi Wang <zhi.a.wang@intel.com> Tested-by: Yongwei Ma <yongwei.ma@intel.com> Reviewed-by: Yan Zhao <yan.y.zhao@intel.com> Link: https://lore.kernel.org/r/20230729013535.1070024-8-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 96b138c commit 241f0aa

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

  • drivers/gpu/drm/i915/gvt

drivers/gpu/drm/i915/gvt/gtt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,7 @@ static int ppgtt_populate_shadow_entry(struct intel_vgpu *vgpu,
13031303
return -EINVAL;
13041304
default:
13051305
GEM_BUG_ON(1);
1306+
return -EINVAL;
13061307
}
13071308

13081309
/* direct shadow */

0 commit comments

Comments
 (0)