From owner-freebsd-usb@FreeBSD.ORG Tue Mar 6 03:20:09 2007 Return-Path: X-Original-To: freebsd-usb@hub.freebsd.org Delivered-To: freebsd-usb@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 038BC16A409 for ; Tue, 6 Mar 2007 03:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id B82E713C481 for ; Tue, 6 Mar 2007 03:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l263K8ql003438 for ; Tue, 6 Mar 2007 03:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l263K8aG003437; Tue, 6 Mar 2007 03:20:08 GMT (envelope-from gnats) Resent-Date: Tue, 6 Mar 2007 03:20:08 GMT Resent-Message-Id: <200703060320.l263K8aG003437@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-usb@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Maurice Castro Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B00F716A400 for ; Tue, 6 Mar 2007 03:11:20 +0000 (UTC) (envelope-from maurice@sphinx.clari.net.au) Received: from sphinx.clari.net.au (sphinx.clari.net.au [203.8.14.117]) by mx1.freebsd.org (Postfix) with ESMTP id 0B11513C48E for ; Tue, 6 Mar 2007 03:11:19 +0000 (UTC) (envelope-from maurice@sphinx.clari.net.au) Received: from sphinx.clari.net.au (localhost.clari.net.au [127.0.0.1]) by sphinx.clari.net.au (8.13.3/8.13.3) with ESMTP id l262s2sF026722 for ; Tue, 6 Mar 2007 13:54:02 +1100 (EST) (envelope-from maurice@sphinx.clari.net.au) Received: (from maurice@localhost) by sphinx.clari.net.au (8.13.3/8.13.3/Submit) id l262s2Yt026721; Tue, 6 Mar 2007 13:54:02 +1100 (EST) (envelope-from maurice) Message-Id: <200703060254.l262s2Yt026721@sphinx.clari.net.au> Date: Tue, 6 Mar 2007 13:54:02 +1100 (EST) From: Maurice Castro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: usb/109959: usb_interrupt_read does not respect timeout X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Maurice Castro List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2007 03:20:09 -0000 >Number: 109959 >Category: usb >Synopsis: usb_interrupt_read does not respect timeout >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-usb >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 06 03:20:08 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Maurice Castro >Release: FreeBSD 5.4-RELEASE i386 >Organization: Clarinet Internet Solutions >Environment: System: FreeBSD sphinx.clari.net.au 5.4-RELEASE FreeBSD 5.4-RELEASE #1: Wed Nov 30 11:05:23 EST 2005 mjb@sphinx.clari.net.au:/work/src/sys/i386/compile/sphinx i386 All version of FreeBSD (and other BSDs) since 5.4 (possibly earlier) >Description: Requesting a timeout on usb_interrupt_read has no effect. This results in hanging reads for libusb. >How-To-Repeat: In particular, the port sysutils/nut-usb will hang on initialising a Powerware 3105 UPS. >Fix: --- ugen.c.orig Tue Mar 6 13:36:15 2007 +++ ugen.c Tue Mar 6 09:56:20 2007 @@ -740,11 +740,17 @@ } sce->state |= UGEN_ASLP; DPRINTFN(5, ("ugenread: sleep on %p\n", sce)); - error = tsleep(sce, PZERO | PCATCH, "ugenri", 0); + error = tsleep(sce, PZERO | PCATCH, "ugenri", sce->timeout); sce->state &= ~UGEN_ASLP; DPRINTFN(5, ("ugenread: woke, error=%d\n", error)); if (sc->sc_dying) error = EIO; + /* we timed out - return 0 bytes */ + if (error == EAGAIN) + { + error = 0; + break; + } if (error) break; } >Release-Note: >Audit-Trail: >Unformatted: