diff options
| author | Eric Anholt <eric@anholt.net> | 2009-03-19 21:56:14 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-29 04:31:37 -0400 |
| commit | 955a23eb3cfc773e71b05bb7a0a0938a9e1b2568 (patch) | |
| tree | 7a9124ddf103ef1f6337484bb5e5ae51c9c288a6 | |
| parent | af7ae351ad63a137ece86740dbe3f181d09d810f (diff) | |
drm: Use a little stash on the stack to avoid kmalloc in most DRM ioctls.
The kmalloc was taking up about 1.5% of the CPU on an ioctl-heavy workload
(x11perf -aa10text on 965). Initial results look like they have a
corresponding improvement in performance for aa10text, but more numbers might
not hurt.
Thanks to ajax for pointing out this performance regression I'd introduced
back in 2007.
[airlied: well I introduced it sneakily inside Eric's patch]
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index c26ee0822a05..c4ada8b6295b 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -421,6 +421,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 421 | drm_ioctl_t *func; | 421 | drm_ioctl_t *func; |
| 422 | unsigned int nr = DRM_IOCTL_NR(cmd); | 422 | unsigned int nr = DRM_IOCTL_NR(cmd); |
| 423 | int retcode = -EINVAL; | 423 | int retcode = -EINVAL; |
| 424 | char stack_kdata[128]; | ||
| 424 | char *kdata = NULL; | 425 | char *kdata = NULL; |
| 425 | 426 | ||
| 426 | atomic_inc(&dev->ioctl_count); | 427 | atomic_inc(&dev->ioctl_count); |
| @@ -459,10 +460,14 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 459 | retcode = -EACCES; | 460 | retcode = -EACCES; |
| 460 | } else { | 461 | } else { |
| 461 | if (cmd & (IOC_IN | IOC_OUT)) { | 462 | if (cmd & (IOC_IN | IOC_OUT)) { |
| 462 | kdata = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL); | 463 | if (_IOC_SIZE(cmd) <= sizeof(stack_kdata)) { |
| 463 | if (!kdata) { | 464 | kdata = stack_kdata; |
| 464 | retcode = -ENOMEM; | 465 | } else { |
| 465 | goto err_i1; | 466 | kdata = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL); |
| 467 | if (!kdata) { | ||
| 468 | retcode = -ENOMEM; | ||
| 469 | goto err_i1; | ||
| 470 | } | ||
| 466 | } | 471 | } |
| 467 | } | 472 | } |
| 468 | 473 | ||
| @@ -483,7 +488,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 483 | } | 488 | } |
| 484 | 489 | ||
| 485 | err_i1: | 490 | err_i1: |
| 486 | if (kdata) | 491 | if (kdata != stack_kdata) |
| 487 | kfree(kdata); | 492 | kfree(kdata); |
| 488 | atomic_dec(&dev->ioctl_count); | 493 | atomic_dec(&dev->ioctl_count); |
| 489 | if (retcode) | 494 | if (retcode) |
