Date: Tue, 23 Jun 2009 15:46:22 +0000 (UTC) From: Robert Noland <rnoland@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r194720 - in stable/7/sys: . contrib/pf dev/drm Message-ID: <200906231546.n5NFkMUj081077@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rnoland Date: Tue Jun 23 15:46:22 2009 New Revision: 194720 URL: http://svn.freebsd.org/changeset/base/194720 Log: Merge 190023 from HEAD Add some debugging so I can see when syscalls are being restarted consistantly. After a lengthy irc discussion it seems like we shouldn't need to worry about them, but it's nice to know about. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/drm/drm_lock.c stable/7/sys/dev/drm/mga_irq.c stable/7/sys/dev/drm/radeon_irq.c Modified: stable/7/sys/dev/drm/drm_lock.c ============================================================================== --- stable/7/sys/dev/drm/drm_lock.c Tue Jun 23 15:44:23 2009 (r194719) +++ stable/7/sys/dev/drm/drm_lock.c Tue Jun 23 15:46:22 2009 (r194720) @@ -87,7 +87,12 @@ int drm_lock(struct drm_device *dev, voi break; } DRM_UNLOCK(); - DRM_DEBUG("%d %s\n", lock->context, ret ? "interrupted" : "has lock"); + + if (ret == ERESTART) + DRM_DEBUG("restarting syscall\n"); + else + DRM_DEBUG("%d %s\n", lock->context, + ret ? "interrupted" : "has lock"); if (ret != 0) return ret; Modified: stable/7/sys/dev/drm/mga_irq.c ============================================================================== --- stable/7/sys/dev/drm/mga_irq.c Tue Jun 23 15:44:23 2009 (r194719) +++ stable/7/sys/dev/drm/mga_irq.c Tue Jun 23 15:46:22 2009 (r194720) @@ -139,6 +139,9 @@ int mga_driver_fence_wait(struct drm_dev (((cur_fence = atomic_read(&dev_priv->last_fence_retired)) - *sequence) <= (1 << 23))); + if (ret == -ERESTART) + DRM_DEBUG("restarting syscall\n"); + *sequence = cur_fence; return ret; Modified: stable/7/sys/dev/drm/radeon_irq.c ============================================================================== --- stable/7/sys/dev/drm/radeon_irq.c Tue Jun 23 15:44:23 2009 (r194719) +++ stable/7/sys/dev/drm/radeon_irq.c Tue Jun 23 15:46:22 2009 (r194720) @@ -282,6 +282,9 @@ static int radeon_wait_irq(struct drm_de DRM_WAIT_ON(ret, dev_priv->swi_queue, 3 * DRM_HZ, RADEON_READ(RADEON_LAST_SWI_REG) >= swi_nr); + if (ret == -ERESTART) + DRM_DEBUG("restarting syscall"); + return ret; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906231546.n5NFkMUj081077>