From patchwork Tue Sep 15 18:22:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11777537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAB2D6CA for ; Tue, 15 Sep 2020 18:28:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E696206B7 for ; Tue, 15 Sep 2020 18:28:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cnEHAFTS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E696206B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIFge-0003Wy-Dg for patchwork-qemu-devel@patchwork.kernel.org; Tue, 15 Sep 2020 14:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIFe7-00012N-Ig for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIFe5-0004Je-AB for qemu-devel@nongnu.org; Tue, 15 Sep 2020 14:25:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600194335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VbW5dAGjykzIBhl5ukmXUfXgvbqIXU0mt8/3b/qic5I=; b=cnEHAFTS7fk7rOAjSwhT3zpI52361eNh1xe6ZDntig7lCPL41xQa0X9CZnVX5GipgCKn/N pNJpxdQWSUXce8LdsejlqsFrdHgA9UOselU70t/25Z7slMitJ3XZ3r12+ieHV5yOQR4Jw7 7HYeikJsx4mN452b2wHxjn2emlWVuqM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-ORnHc6ETOnqYMB_DteQPnQ-1; Tue, 15 Sep 2020 14:25:32 -0400 X-MC-Unique: ORnHc6ETOnqYMB_DteQPnQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C29689BBA9; Tue, 15 Sep 2020 18:25:13 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-229.sin2.redhat.com [10.67.116.229]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8538060CD0; Tue, 15 Sep 2020 18:25:10 +0000 (UTC) From: P J P To: Gerd Hoffmann Subject: [PATCH v2 2/2] hw: usb: hcd-ohci: check for processed TD before retire Date: Tue, 15 Sep 2020 23:52:59 +0530 Message-Id: <20200915182259.68522-3-ppandit@redhat.com> In-Reply-To: <20200915182259.68522-1-ppandit@redhat.com> References: <20200915182259.68522-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:10:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Prasad J Pandit , Li Qiang , QEMU Developers , Yi Ren , Yongkang Jia , Gaoning Pan Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Prasad J Pandit While servicing OHCI transfer descriptors(TD), ohci_service_iso_td retires a TD if it has passed its time frame. It does not check if the TD was already processed once and holds an error code in TD_CC. It may happen if the TD list has a loop. Add check to avoid an infinite loop condition. Signed-off-by: Prasad J Pandit Reviewed-by: Li Qiang --- hw/usb/hcd-ohci.c | 4 ++++ 1 file changed, 4 insertions(+) Update v2: one patch for loop issue -> https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg05145.html diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 9dc59101f9..8b912e95d3 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -691,6 +691,10 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed, the next ISO TD of the same ED */ trace_usb_ohci_iso_td_relative_frame_number_big(relative_frame_number, frame_count); + if (OHCI_CC_DATAOVERRUN == OHCI_BM(iso_td.flags, TD_CC)) { + /* avoid infinite loop */ + return 1; + } OHCI_SET_BM(iso_td.flags, TD_CC, OHCI_CC_DATAOVERRUN); ed->head &= ~OHCI_DPTR_MASK; ed->head |= (iso_td.next & OHCI_DPTR_MASK);