mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: virtio: use kmem_cache

Browse Source 
Just use kmem_cache instead of rolling
our own, limited implementation.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1488377348-5006-1-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann
2017-03-01 15:09:08 +01:00
parent 2d856f94e6
commit f5985bf9ca
2 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/virtio/virtgpu_drv.h
View File

@@ -178,9 +178,7 @@ struct virtio_gpu_device {
struct virtio_gpu_queue ctrlq; struct virtio_gpu_queue ctrlq;
struct virtio_gpu_queue cursorq; struct virtio_gpu_queue cursorq;
struct list_head free_vbufs; struct kmem_cache *vbufs;
spinlock_t free_vbufs_lock;
void *vbufs;
bool vqs_ready; bool vqs_ready;
struct idr resource_idr; struct idr resource_idr;

57
drivers/gpu/drm/virtio/virtgpu_vq.c
View File

@@ -74,51 +74,19 @@ void virtio_gpu_cursor_ack(struct virtqueue *vq)
int virtio_gpu_alloc_vbufs(struct virtio_gpu_device *vgdev) int virtio_gpu_alloc_vbufs(struct virtio_gpu_device *vgdev)
{ {
struct virtio_gpu_vbuffer *vbuf; vgdev->vbufs = kmem_cache_create("virtio-gpu-vbufs",
int i, size, count = 16; VBUFFER_SIZE,
void *ptr; __alignof__(struct virtio_gpu_vbuffer),
0, NULL);
INIT_LIST_HEAD(&vgdev->free_vbufs);
spin_lock_init(&vgdev->free_vbufs_lock);
count += virtqueue_get_vring_size(vgdev->ctrlq.vq);
count += virtqueue_get_vring_size(vgdev->cursorq.vq);
size = count * VBUFFER_SIZE;
DRM_INFO("virtio vbuffers: %d bufs, %zdB each, %dkB total.\n",
count, VBUFFER_SIZE, size / 1024);
vgdev->vbufs = kzalloc(size, GFP_KERNEL);
if (!vgdev->vbufs) if (!vgdev->vbufs)
return -ENOMEM; return -ENOMEM;
for (i = 0, ptr = vgdev->vbufs;
i < count;
i++, ptr += VBUFFER_SIZE) {
vbuf = ptr;
list_add(&vbuf->list, &vgdev->free_vbufs);
}
return 0; return 0;
} }
void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev) void virtio_gpu_free_vbufs(struct virtio_gpu_device *vgdev)
{ {
struct virtio_gpu_vbuffer *vbuf; kmem_cache_destroy(vgdev->vbufs);
int i, count = 0; vgdev->vbufs = NULL;
count += virtqueue_get_vring_size(vgdev->ctrlq.vq);
count += virtqueue_get_vring_size(vgdev->cursorq.vq);
spin_lock(&vgdev->free_vbufs_lock);
for (i = 0; i < count; i++) {
if (WARN_ON(list_empty(&vgdev->free_vbufs))) {
spin_unlock(&vgdev->free_vbufs_lock);
return;
}
vbuf = list_first_entry(&vgdev->free_vbufs,
struct virtio_gpu_vbuffer, list);
list_del(&vbuf->list);
}
spin_unlock(&vgdev->free_vbufs_lock);
kfree(vgdev->vbufs);
} }
static struct virtio_gpu_vbuffer* static struct virtio_gpu_vbuffer*
@@ -128,12 +96,9 @@ virtio_gpu_get_vbuf(struct virtio_gpu_device *vgdev,
{ {
struct virtio_gpu_vbuffer *vbuf; struct virtio_gpu_vbuffer *vbuf;
spin_lock(&vgdev->free_vbufs_lock); vbuf = kmem_cache_alloc(vgdev->vbufs, GFP_KERNEL);
BUG_ON(list_empty(&vgdev->free_vbufs)); if (IS_ERR(vbuf))
vbuf = list_first_entry(&vgdev->free_vbufs, return ERR_CAST(vbuf);
struct virtio_gpu_vbuffer, list);
list_del(&vbuf->list);
spin_unlock(&vgdev->free_vbufs_lock);
memset(vbuf, 0, VBUFFER_SIZE); memset(vbuf, 0, VBUFFER_SIZE);
BUG_ON(size > MAX_INLINE_CMD_SIZE); BUG_ON(size > MAX_INLINE_CMD_SIZE);
@@ -208,9 +173,7 @@ static void free_vbuf(struct virtio_gpu_device *vgdev,
if (vbuf->resp_size > MAX_INLINE_RESP_SIZE) if (vbuf->resp_size > MAX_INLINE_RESP_SIZE)
kfree(vbuf->resp_buf); kfree(vbuf->resp_buf);
kfree(vbuf->data_buf); kfree(vbuf->data_buf);
spin_lock(&vgdev->free_vbufs_lock); kmem_cache_free(vgdev->vbufs, vbuf);
list_add(&vbuf->list, &vgdev->free_vbufs);
spin_unlock(&vgdev->free_vbufs_lock);
} }
static void reclaim_vbufs(struct virtqueue *vq, struct list_head *reclaim_list) static void reclaim_vbufs(struct virtqueue *vq, struct list_head *reclaim_list)