Attachment 42872 Details for Bug 29325 – Slab allocate objects.

[patch] Slab allocate objects.

0001-drm-i915-Use-a-slab-for-object-allocation.patch (text/plain), 2.42 KB, created by Chris Wilson on 2011-02-02 14:04:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-02-02 14:04:47 UTC

Size: 2.42 KB

patch

obsolete

>From 1f2ac00b189597c35520c4558df440cf6628427a Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 2 Feb 2011 22:02:09 +0000
>Subject: [PATCH] drm/i915: Use a slab for object allocation
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_dma.c |    3 +++
> drivers/gpu/drm/i915/i915_drv.h |    2 ++
> drivers/gpu/drm/i915/i915_gem.c |   12 +++++++++---
> 3 files changed, 14 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index 126e174..8e39eeb 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -2142,6 +2142,9 @@ int i915_driver_unload(struct drm_device *dev)
> 
> 	destroy_workqueue(dev_priv->wq);
> 
>+	if (dev_priv->slab)
>+		kmem_cache_destroy(dev_priv->slab);
>+
> 	pci_dev_put(dev_priv->bridge_dev);
> 	kfree(dev->dev_private);
> 
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index fb59797..ce8d77b 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -258,6 +258,8 @@ typedef struct drm_i915_private {
> 
> 	const struct intel_device_info *info;
> 
>+	struct kmem_cache *slab;
>+
> 	int has_gem;
> 	int relative_constants_mode;
> 
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 52dd77b..3e46874 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -3517,7 +3517,7 @@ struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct drm_i915_gem_object *obj;
> 
>-	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
>+	obj = kmem_cache_alloc(dev_priv->slab, GFP_KERNEL | __GFP_ZERO);
> 	if (obj == NULL)
> 		return NULL;
> 
>@@ -3574,7 +3574,7 @@ static void i915_gem_free_object_tail(struct drm_i915_gem_object *obj)
> 
> 	kfree(obj->page_cpu_valid);
> 	kfree(obj->bit_17);
>-	kfree(obj);
>+	kmem_cache_free(dev_priv->slab, obj);
> }
> 
> void i915_gem_free_object(struct drm_gem_object *gem_obj)
>@@ -3767,8 +3767,14 @@ init_ring_lists(struct intel_ring_buffer *ring)
> void
> i915_gem_load(struct drm_device *dev)
> {
>-	int i;
> 	drm_i915_private_t *dev_priv = dev->dev_private;
>+	int i;
>+
>+	dev_priv->slab =
>+		kmem_cache_create("i915_gem_object",
>+				  sizeof(struct drm_i915_gem_object), 0,
>+				  SLAB_HWCACHE_ALIGN,
>+				  NULL);
> 
> 	INIT_LIST_HEAD(&dev_priv->mm.active_list);
> 	INIT_LIST_HEAD(&dev_priv->mm.flushing_list);
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 29325: 37467 | 37468 | 37469 | 37793 | 37819 | 37928 | 38765 | 40238 | 40239 | 40240 | 41854 | 42203 | 42292 | 42293 | 42485 | 42526 | 42536 | 42537 | 42864 | 42872 | 42956 | 43166 | 43340

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.