drm/i915/gtt: Fix the boundary check for vm area
Subsystems (3)
PATCH 1/3 drm/i915/gtt: Fix the boundary check for vm area
The check for start + length >= total_vm_size is wrong since start + length can be exactly the size of the vm.
Fix the check to allow allocation to boundary.
Fixes a regression in commit 4dd738e9cd79
("drm/i915: Fix 32b overflow check in gen8_ppgtt_alloc_page_directories")
Testcase: igt/gem_evict_everything/swapping-interruptible
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90399
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -757,7 +757,7 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_hw_ppgtt *ppgtt,WARN_ON (!bitmap_empty (new_pds,GEN8_LEGACY_PDPES ));/* FIXME: upper bound must not overflow 32 bits */ -WARN_ON ((start + length) >= (1ULL <<32 )); +WARN_ON ((start + length) > (1ULL <<32 ));gen8_for_each_pdpe (pd, pdp, start, length, temp, pdpe) {if (pd)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/gtt: Allow >= 4GB sizes for vm.
We can have exactly 4GB sized ppgtt with 32bit system. size_t is inadequate for this.
--- drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++---- drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +++--- include/drm/intel-gtt.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
drivers/char/agp/intel-gtt.c +1 -1
@@ -1408,7 +1408,7 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (u64 *gtt_total,size_t *stolen_size,phys_addr_t *mappable_base,unsigned long *mappable_end) { *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ;
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -474,9 +474,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)seq_printf (m,"%u fault mappable objects, %zu bytes\n" , count, size); -seq_printf (m,"%zu [%lu] gtt total\n" , +seq_printf (m,"%llu [%llu] gtt total\n" , dev_priv->gtt.base.total, - dev_priv->gtt.mappable_end - dev_priv->gtt.base.start); + (u64 )dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);seq_putc (m,'\n' );print_batch_pool_stats (m, dev_priv);
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -4
@@ -2347,7 +2347,7 @@ static void chv_setup_private_ppat(struct drm_i915_private *dev_priv) }static int gen8_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)
@@ -2395,7 +2395,7 @@ static int gen8_gmch_probe(struct drm_device *dev, }static int gen6_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)
@@ -2446,7 +2446,7 @@ static void gen6_gmch_remove(struct i915_address_space *vm) }static int i915_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)
@@ -2514,7 +2514,7 @@ int i915_gem_gtt_init(struct drm_device *dev) gtt->base.dev = dev;/* GMADR is the PCI mmio aperture into the global GTT. */ -DRM_INFO ("Memory usable by graphics device = %zdM\n" , +DRM_INFO ("Memory usable by graphics device = %lluM\n" , gtt->base.total >>20 );DRM_DEBUG_DRIVER ("GMADR size = %ldM\n" , gtt->mappable_end >>20 );DRM_DEBUG_DRIVER ("GTT stolen size = %zdM\n" , gtt->stolen_size >>20 );
drivers/gpu/drm/i915/i915_gem_gtt.h +3 -3
@@ -233,8 +233,8 @@ struct i915_address_space {struct drm_mm mm;struct drm_device *dev;struct list_head global_link; -unsigned long start;/* Start offset always 0 for dri2 */ -size_t total;/* size addr space maps (ex. 2GB for ggtt) */ +u64 start;/* Start offset always 0 for dri2 */ +u64 total;/* size addr space maps (ex. 2GB for ggtt) */ struct {dma_addr_t addr;
@@ -314,7 +314,7 @@ struct i915_gtt {int mtrr;/* global gtt ops */ -int (*gtt_probe)(struct drm_device *dev,size_t *gtt_total, +int (*gtt_probe)(struct drm_device *dev,u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end); };
include/drm/intel-gtt.h +1 -1
@@ -3,7 +3,7 @@#ifndef _DRM_INTEL_GTT_H#define _DRM_INTEL_GTT_H -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (u64 *gtt_total,size_t *stolen_size,phys_addr_t *mappable_base,unsigned long *mappable_end); int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915/gtt: Allow >= 4GB sizes for vm.
Quoted 4 lines · Mika Kuoppala
We can have exactly 4GB sized ppgtt with 32bit system.
size_tis inadequate for this.Signed-off-by Mika Kuoppala <[email protected]>
A quick grep shows that there's still lots of size_t in gem code (i915_gem.c, i915_gem_gtt.c and parts of i915_debugfs.c). I think we need to convert them all to avoid overflow issues.
-Daniel
Quoted 121 lines
--- drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++---- drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +++--- include/drm/intel-gtt.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)drivers/char/agp/intel-gtt.c +1
-1@@ -1408,7 +1408,7 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, }EXPORT_SYMBOL (intel_gmch_probe); -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (u64 *gtt_total,size_t *stolen_size,phys_addr_t *mappable_base,unsigned long *mappable_end) { *gtt_total = intel_private.gtt_total_entries <<PAGE_SHIFT ;drivers/gpu/drm/i915/i915_debugfs.c +2
-2@@ -474,9 +474,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)seq_printf (m,"%u fault mappable objects, %zu bytes\n" , count, size); -seq_printf (m,"%zu [%lu] gtt total\n" , +seq_printf (m,"%llu [%llu] gtt total\n" , dev_priv->gtt.base.total, - dev_priv->gtt.mappable_end - dev_priv->gtt.base.start); + (u64 )dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);seq_putc (m,'\n' );print_batch_pool_stats (m, dev_priv);drivers/gpu/drm/i915/i915_gem_gtt.c +4
-4@@ -2347,7 +2347,7 @@ static void chv_setup_private_ppat(struct drm_i915_private *dev_priv) }static int gen8_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)@@ -2395,7 +2395,7 @@ static int gen8_gmch_probe(struct drm_device *dev, }static int gen6_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)@@ -2446,7 +2446,7 @@ static void gen6_gmch_remove(struct i915_address_space *vm) }static int i915_gmch_probe (struct drm_device *dev, -size_t *gtt_total, +u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end)@@ -2514,7 +2514,7 @@ int i915_gem_gtt_init(struct drm_device *dev) gtt->base.dev = dev;/* GMADR is the PCI mmio aperture into the global GTT. */ -DRM_INFO ("Memory usable by graphics device = %zdM\n" , +DRM_INFO ("Memory usable by graphics device = %lluM\n" , gtt->base.total >>20 );DRM_DEBUG_DRIVER ("GMADR size = %ldM\n" , gtt->mappable_end >>20 );DRM_DEBUG_DRIVER ("GTT stolen size = %zdM\n" , gtt->stolen_size >>20 );drivers/gpu/drm/i915/i915_gem_gtt.h +3
-3@@ -233,8 +233,8 @@ struct i915_address_space {struct drm_mm mm;struct drm_device *dev;struct list_head global_link; -unsigned long start;/* Start offset always 0 for dri2 */ -size_t total;/* size addr space maps (ex. 2GB for ggtt) */ +u64 start;/* Start offset always 0 for dri2 */ +u64 total;/* size addr space maps (ex. 2GB for ggtt) */ struct {dma_addr_t addr;@@ -314,7 +314,7 @@ struct i915_gtt {int mtrr;/* global gtt ops */ -int (*gtt_probe)(struct drm_device *dev,size_t *gtt_total, +int (*gtt_probe)(struct drm_device *dev,u64 *gtt_total,size_t *stolen,phys_addr_t *mappable_base,unsigned long *mappable_end); };include/drm/intel-gtt.h +1
-1@@ -3,7 +3,7 @@#ifndef _DRM_INTEL_GTT_H#define _DRM_INTEL_GTT_H -void intel_gtt_get (size_t *gtt_total,size_t *stolen_size, +void intel_gtt_get (u64 *gtt_total,size_t *stolen_size,phys_addr_t *mappable_base,unsigned long *mappable_end); int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/gtt: Check va range against vm size
In reply to Mika KuoppalaCheck the allocation area against the known end
of address space instead of against fixed value.
v2: Return ENODEV on internal bugs (Chris)
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +11 -7
@@ -756,9 +756,6 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_hw_ppgtt *ppgtt,WARN_ON (!bitmap_empty (new_pds,GEN8_LEGACY_PDPES )); -/* FIXME: upper bound must not overflow 32 bits */ -WARN_ON ((start + length) > (1ULL <<32 )); -gen8_for_each_pdpe (pd, pdp, start, length, temp, pdpe) {if (pd)continue ;
@@ -848,7 +845,10 @@ static int gen8_alloc_va_range(struct i915_address_space *vm,* actually use the other side of the canonical address space. */ if (WARN_ON (start + length < start)) -return -ERANGE ; +return -ENODEV ; + +if (WARN_ON (start + length > ppgtt->base.total)) +return -ENODEV ; ret =alloc_gen8_temp_bitmaps (&new_page_dirs, &new_page_tables);if (ret)
@@ -1290,7 +1290,7 @@ static void gen6_initialize_pt(struct i915_address_space *vm, }static int gen6_alloc_va_range (struct i915_address_space *vm, -uint64_t start,uint64_t length) +uint64_t start_in,uint64_t length_in) {DECLARE_BITMAP (new_page_tables,I915_PDES );struct drm_device *dev = vm->dev;
@@ -1298,11 +1298,15 @@ static int gen6_alloc_va_range(struct i915_address_space *vm,struct i915_hw_ppgtt *ppgtt = container_of(vm, struct i915_hw_ppgtt, base);struct i915_page_table *pt; -const uint32_t start_save = start, length_save = length; +uint32_t start, length, start_save, length_save;uint32_t pde, temp;int ret; -WARN_ON (upper_32_bits (start)); +if (WARN_ON (start_in + length_in > ppgtt->base.total)) +return -ENODEV ; + + start = start_save = start_in; + length = length_save = length_in;bitmap_zero (new_page_tables,I915_PDES );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/gtt: Check va range against vm size
Task id: 6386 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 302/302 302/302 SNB -1 314/314 313/314 IVB 338/338 338/338 BYT 286/286 286/286
BDW -1 320/320 319/320
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(13)PASS(1) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
*BDW igt@gem_gtt_hog PASS(5) DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_display.c:#assert_plane[i915]()@WARNING:.* at .* assert_plane assertion_failure@assertion failure
WARNING:at_drivers/gpu/drm/drm_irq.c:#drm_wait_one_vblank[drm]()@WARNING:.* at .* drm_wait_one_vblank+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 9 lines · Mika Kuoppala
The check for start + length >=
total_vm_sizeis wrong since start + length can be exactly the size of the vm.Fix the check to allow allocation to boundary.
Fixes a regression in commit
4dd738e9cd79
("drm/i915: Fix 32b overflow check ingen8_ppgtt_alloc_page_directories")
Quoted 8 lines
Testcase: igt/gem_evict_everything/swapping-interruptible
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90399Tested-by Lu Hua <[email protected]>Cc Chris Wilson <[email protected]>Cc Dave Gordon <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 24 lines
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_gem_gtt.c +1
-1@@ -757,7 +757,7 @@ static int gen8_ppgtt_alloc_page_directories(struct i915_hw_ppgtt *ppgtt,WARN_ON (!bitmap_empty (new_pds,GEN8_LEGACY_PDPES ));/* FIXME: upper bound must not overflow 32 bits */ -WARN_ON ((start + length) >= (1ULL <<32 )); +WARN_ON ((start + length) > (1ULL <<32 ));gen8_for_each_pdpe (pd, pdp, start, length, temp, pdpe) {if (pd)Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx