Attachment 40481 Details for Bug 31708 – Forbid big bo allcoation

[patch] Forbid big bo allcoation

0001-drm-radeon-kms-forbid-big-bo-allocation-fdo-31708-v2.patch (text/plain), 3.10 KB, created by Jerome Glisse on 2010-11-22 09:23:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Glisse

Created: 2010-11-22 09:23:09 UTC

Size: 3.10 KB

patch

obsolete

>From 2592e1b697c0ca4a2f49b0ac02723bf4d5567f1c Mon Sep 17 00:00:00 2001
>From: Jerome Glisse <jglisse@redhat.com>
>Date: Fri, 19 Nov 2010 15:53:47 -0500
>Subject: [PATCH] drm/radeon/kms: forbid big bo allocation (fdo 31708) v2
>
>Forbid allocating buffer bigger than visible VRAM or GTT, also
>properly set lpfn field.
>
>v2 - use max macro
>   - silence warning
>
>Signed-off-by: Jerome Glisse <jglisse@redhat.com>
>---
> drivers/gpu/drm/radeon/radeon_object.c |   34 ++++++++++++++++++++++++++-----
> 1 files changed, 28 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
>index 1d06774..c2fa64c 100644
>--- a/drivers/gpu/drm/radeon/radeon_object.c
>+++ b/drivers/gpu/drm/radeon/radeon_object.c
>@@ -69,18 +69,28 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain)
> 	u32 c = 0;
> 
> 	rbo->placement.fpfn = 0;
>-	rbo->placement.lpfn = rbo->rdev->mc.active_vram_size >> PAGE_SHIFT;
>+	rbo->placement.lpfn = 0;
> 	rbo->placement.placement = rbo->placements;
> 	rbo->placement.busy_placement = rbo->placements;
>-	if (domain & RADEON_GEM_DOMAIN_VRAM)
>+	if (domain & RADEON_GEM_DOMAIN_VRAM) {
>+		rbo->placement.lpfn = max((unsigned)rbo->placement.lpfn, (unsigned)rbo->rdev->mc.active_vram_size >> PAGE_SHIFT);
> 		rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
> 					TTM_PL_FLAG_VRAM;
>-	if (domain & RADEON_GEM_DOMAIN_GTT)
>+	}
>+	if (domain & RADEON_GEM_DOMAIN_GTT) {
>+		rbo->placement.lpfn = max((unsigned)rbo->placement.lpfn, (unsigned)rbo->rdev->mc.gtt_size >> PAGE_SHIFT);
> 		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
>-	if (domain & RADEON_GEM_DOMAIN_CPU)
>+	}
>+	if (domain & RADEON_GEM_DOMAIN_CPU) {
>+		/* 4G limit for CPU domain */
>+		rbo->placement.lpfn = max(rbo->placement.lpfn, 0xFFFFFFFF >> PAGE_SHIFT);
> 		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
>-	if (!c)
>+	}
>+	if (!c) {
>+		/* 4G limit for CPU domain */
>+		rbo->placement.lpfn = max(rbo->placement.lpfn, 0xFFFFFFFF >> PAGE_SHIFT);
> 		rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
>+	}
> 	rbo->placement.num_placement = c;
> 	rbo->placement.num_busy_placement = c;
> }
>@@ -91,7 +101,8 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
> {
> 	struct radeon_bo *bo;
> 	enum ttm_bo_type type;
>-	int page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
>+	unsigned long page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
>+	unsigned long max_size = 0;
> 	int r;
> 
> 	if (unlikely(rdev->mman.bdev.dev_mapping == NULL)) {
>@@ -104,6 +115,17 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj,
> 	}
> 	*bo_ptr = NULL;
> 
>+	/* maximun bo size is the minimun btw visible vram and gtt size */
>+	max_size = rdev->mc.visible_vram_size;
>+	if (max_size > rdev->mc.gtt_size) {
>+		max_size = rdev->mc.gtt_size;
>+	}
>+	if ((page_align << PAGE_SHIFT) >= max_size) {
>+		printk(KERN_WARNING "%s:%d alloc size %ldM bigger than %ldMb limit\n",
>+			__func__, __LINE__, page_align  >> (20 - PAGE_SHIFT), max_size >> 20);
>+		return -ENOMEM;
>+	}
>+
> retry:
> 	bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
> 	if (bo == NULL)
>-- 
>1.7.3.2
>

Actions: View | Splinter Review

Attachments on bug 31708: 40397 | 40419 | 40481 | 40482 | 67172 | 67175

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.