Skip to contentSkip to conversation

drm: missing idr_preload_end in drm_gem_flink_ioctl

PATCH In review Artem Savkov 2 participants 2 messages Feb 10, 2013 – Feb 12, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: missing idr_preload_end in drm_gem_flink_ioctl

Added missing idr_preload_end calls in drm_gem_flink_ioctl(). Without those preemption stays disabled resulting in lots of "scheduling while atomic" BUGs.

Introduced in 4e486fae707d9a79c76f1be6dcacffc4a721cc1b (linux-next.git)

---
 drivers/gpu/drm/drm_gem.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_gem.c +2 -0
index 6577514..f1700ef 100644
@@ -456,6 +456,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 		obj->name = ret;
 		args->name = (uint64_t) obj->name;
 		spin_unlock(&dev->object_name_lock);
+		idr_preload_end();
 
 		if (ret < 0)
 			goto err;
@@ -465,6 +466,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 	} else {
 		args->name = (uint64_t) obj->name;
 		spin_unlock(&dev->object_name_lock);
+		idr_preload_end();
 		ret = 0;
 	}
 
Signature · 1 line
1.8.1.1
Acked-by on v1 1/1
#1 lore raw

(cc'ing Andrew)

Hello,

Quoted 24 lines · Artem Savkov

Added missing idr_preload_end calls in drm_gem_flink_ioctl(). Without those preemption stays disabled resulting in lots of "scheduling while atomic" BUGs.

Introduced in 4e486fae707d9a79c76f1be6dcacffc4a721cc1b (linux-next.git)

---
 drivers/gpu/drm/drm_gem.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_gem.c +1 -0
index 6577514..f1700ef 100644
@@ -456,6 +456,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 		obj->name = ret;
 		args->name = (uint64_t) obj->name;
 		spin_unlock(&dev->object_name_lock);
+		idr_preload_end();
 
 		if (ret < 0)
 			goto err;

drivers/gpu/drm/drm_gem.c drm_gem_flink_ioctl(struct drm_device *dev, void *data, · line 470

Quoted 5 lines
drivers/gpu/drm/drm_gem.c +1 -0
@@ -465,6 +466,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 	} else {
 		args->name = (uint64_t) obj->name;
 		spin_unlock(&dev->object_name_lock);
+		idr_preload_end();
 		ret = 0;

Oops, sorry about that.

Andrew, the original patch can be found at

http://article.gmane.org/gmane.linux.kernel/1439101/raw

Thanks.

Signature · 1 line
tejun