Attachment 74014 Details for Bug 58354 – patch 1/2

[patch] patch 1/2

0001-drm-radeon-prevent-crash-in-the-ring-space-allocatio.patch (text/plain), 1.39 KB, created by Alex Deucher on 2013-01-31 20:22:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-01-31 20:22:37 UTC

Size: 1.39 KB

patch

obsolete

>From 535926b45d6f5eb61b9c2d64a693816c0c202884 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 30 Jan 2013 14:24:09 -0500
>Subject: [PATCH 1/2] drm/radeon: prevent crash in the ring space allocation
>
>If the requested number of DWs on the ring is larger than
>the size of the ring itself, return an error.
>
>In testing with large VM updates, we've seen crashes when we
>try and allocate more space on the ring than the total size
>without checking.
>
>This prevents the crash but for large VM updates or bo moves
>of very large buffers, we will need to break the transaction
>down into multiple batches.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_ring.c |    3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
>index 2430d80..cd72062 100644
>--- a/drivers/gpu/drm/radeon/radeon_ring.c
>+++ b/drivers/gpu/drm/radeon/radeon_ring.c
>@@ -377,6 +377,9 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi
> {
> 	int r;
> 
>+	/* make sure we aren't trying to allocate more space than there is on the ring */
>+	if (ndw > (ring->ring_size / 4))
>+		return -ENOMEM;
> 	/* Align requested size with padding so unlock_commit can
> 	 * pad safely */
> 	ndw = (ndw + ring->align_mask) & ~ring->align_mask;
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 58354: 72013 | 72014 | 72694 | 72794 | 72822 | 74014 | 74015

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.