From owner-svn-src-stable-7@FreeBSD.ORG Tue Jun 23 15:46:22 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B48E6106564A; Tue, 23 Jun 2009 15:46:22 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 879438FC20; Tue, 23 Jun 2009 15:46:22 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NFkMK5081081; Tue, 23 Jun 2009 15:46:22 GMT (envelope-from rnoland@svn.freebsd.org) Received: (from rnoland@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NFkMUj081077; Tue, 23 Jun 2009 15:46:22 GMT (envelope-from rnoland@svn.freebsd.org) Message-Id: <200906231546.n5NFkMUj081077@svn.freebsd.org> From: Robert Noland Date: Tue, 23 Jun 2009 15:46:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194720 - in stable/7/sys: . contrib/pf dev/drm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2009 15:46:23 -0000 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; }