Skip to contentSkip to conversation

drm/vmwgfx: Fix error printout on signals pending

PATCH New Thomas Hellstrom 1 participant 1 message Nov 25, 2014

Subsystems (3)
DRM drivers DRM misc DRM driver for VMware virtual GPU
lore
Share & tools
lore

Thomas Hellstrom

author
#0 lore raw

PATCH 1/1 drm/vmwgfx: Fix error printout on signals pending

The function vmw_master_check() might return -ERESTARTSYS if there is a signal pending, indicating that the IOCTL should be rerun, potentially from user-space. At that point we shouldn't print out an error message since that is not an error condition. In short, avoid bloating the kernel log when a process refuses to die on SIGTERM.

Cc <[email protected]>
Signed-off-by Thomas Hellstrom <[email protected]>
Reviewed-by Jakob Bornecrantz <[email protected]>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +6 -2
index 25f3c25..daeca57 100644
@@ -1063,8 +1063,12 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,
 
 	vmaster = vmw_master_check(dev, file_priv, flags);
 	if (unlikely(IS_ERR(vmaster))) {
-		DRM_INFO("IOCTL ERROR %d\n", nr);
-		return PTR_ERR(vmaster);
+		ret = PTR_ERR(vmaster);
+
+		if (ret != -ERESTARTSYS)
+			DRM_INFO("IOCTL ERROR Command %d, Error %ld.\n",
+				 nr, ret);
+		return ret;
 	}
 
 	ret = ioctl_func(filp, cmd, arg);
Signature · 6 lines
1.8.3.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel