Attachment 14634 Details for Bug 14696 – Replace multiple large kmallocs with a single vmalloc.

[patch] Replace multiple large kmallocs with a single vmalloc.

0001-Avoid-large-kmallocs.txt (text/plain), 3.73 KB, created by Thomas Hellström on 2008-02-28 00:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hellström

Created: 2008-02-28 00:29:54 UTC

Size: 3.73 KB

patch

obsolete

>From 952143c4e12d3b2d4f623c5d091f93a8be82a466 Mon Sep 17 00:00:00 2001
>From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
>Date: Thu, 28 Feb 2008 09:08:52 +0100
>Subject: [PATCH] Avoid large kmallocs.
>---
> shared-core/i915_dma.c |   28 +++++++++++++++++-----------
> shared-core/i915_drv.h |    2 ++
> 2 files changed, 19 insertions(+), 11 deletions(-)
>
>diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
>index f9e02c7..e1abc80 100644
>--- a/shared-core/i915_dma.c
>+++ b/shared-core/i915_dma.c
>@@ -1174,7 +1174,6 @@ static int i915_handle_copyback(struct d
> 			buffers++;
> 		}
> 	}
>-
> 	return err;
> }
> 
>@@ -1265,7 +1264,6 @@ static int i915_execbuffer(struct drm_de
> 	struct drm_fence_arg *fence_arg = &exec_buf->fence_arg;
> 	int num_buffers;
> 	int ret;
>-	struct drm_i915_validate_buffer *buffers;
> 
> 	if (!dev_priv->allow_batchbuffer) {
> 		DRM_ERROR("Batchbuffer ioctl disabled\n");
>@@ -1281,7 +1279,6 @@ static int i915_execbuffer(struct drm_de
> 	if (exec_buf->num_buffers > dev_priv->max_validate_buffers)
> 		return -EINVAL;
> 
>-
> 	ret = drm_bo_read_lock(&dev->bm.bm_lock);
> 	if (ret)
> 		return ret;
>@@ -1299,8 +1296,12 @@ static int i915_execbuffer(struct drm_de
> 
> 	num_buffers = exec_buf->num_buffers;
> 
>-	buffers = drm_calloc(num_buffers, sizeof(struct drm_i915_validate_buffer), DRM_MEM_DRIVER);
>-	if (!buffers) {
>+	if (!dev_priv->val_bufs) {
>+		dev_priv->val_bufs =
>+			vmalloc(sizeof(struct drm_i915_validate_buffer)*
>+				dev_priv->max_validate_buffers);
>+	}
>+	if (!dev_priv->val_bufs) {
> 		drm_bo_read_unlock(&dev->bm.bm_lock);
> 		mutex_unlock(&dev_priv->cmdbuf_mutex);
> 		return -ENOMEM;
>@@ -1308,7 +1309,7 @@ static int i915_execbuffer(struct drm_de
> 
> 	/* validate buffer list + fixup relocations */
> 	ret = i915_validate_buffer_list(file_priv, 0, exec_buf->ops_list,
>-					buffers, &num_buffers);
>+					dev_priv->val_bufs, &num_buffers);
> 	if (ret)
> 		goto out_err0;
> 
>@@ -1317,7 +1318,7 @@ static int i915_execbuffer(struct drm_de
> 	drm_agp_chipset_flush(dev);
> 
> 	/* submit buffer */
>-	batch->start = buffers[num_buffers-1].buffer->offset;
>+	batch->start = dev_priv->val_bufs[num_buffers-1].buffer->offset;
> 
> 	DRM_DEBUG("i915 exec batchbuffer, start %x used %d cliprects %d\n",
> 		  batch->start, batch->used, batch->num_cliprects);
>@@ -1334,13 +1335,11 @@ static int i915_execbuffer(struct drm_de
> out_err0:
> 
> 	/* handle errors */
>-	ret = i915_handle_copyback(dev, buffers, num_buffers, ret);
>+	ret = i915_handle_copyback(dev, dev_priv->val_bufs, num_buffers, ret);
> 	mutex_lock(&dev->struct_mutex);
>-	i915_dereference_buffers_locked(buffers, num_buffers);
>+	i915_dereference_buffers_locked(dev_priv->val_bufs, num_buffers);
> 	mutex_unlock(&dev->struct_mutex);
> 
>-	drm_free(buffers, (exec_buf->num_buffers * sizeof(struct drm_buffer_object *)), DRM_MEM_DRIVER);
>-
> 	mutex_unlock(&dev_priv->cmdbuf_mutex);
> 	drm_bo_read_unlock(&dev->bm.bm_lock);
> 	return ret;
>@@ -1611,6 +1610,13 @@ void i915_driver_lastclose(struct drm_de
> {
> 	drm_i915_private_t *dev_priv = dev->dev_private;
> 
>+#ifdef I915_HAVE_BUFFER
>+	if (dev_priv->val_bufs) {
>+		vfree(dev_priv->val_bufs);
>+		dev_priv->val_bufs = NULL;
>+	}
>+#endif
>+
> 	if (drm_getsarea(dev) && dev_priv->sarea_priv)
> 		i915_do_cleanup_pageflip(dev);
> 	if (dev_priv->agp_heap)
>diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
>index 4d3ac0a..f9aa663 100644
>--- a/shared-core/i915_drv.h
>+++ b/shared-core/i915_drv.h
>@@ -69,6 +69,7 @@ #define DRIVER_PATCHLEVEL	0
> 
> #ifdef I915_HAVE_BUFFER
> #define I915_MAX_VALIDATE_BUFFERS 4096
>+struct drm_i915_validate_buffer;
> #endif
> 
> typedef struct _drm_i915_ring_buffer {
>@@ -141,6 +142,7 @@ #ifdef I915_HAVE_BUFFER
> 	void *agp_iomap;
> 	unsigned int max_validate_buffers;
> 	struct mutex cmdbuf_mutex;
>+	struct drm_i915_validate_buffer *val_bufs;
> #endif
> 
> 	DRM_SPINTYPE swaps_lock;
>-- 
>1.4.1
>

Actions: View | Splinter Review

Attachments on bug 14696: 14609 | 14610 | 14634 | 14635 | 14639 | 14734

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.