From patchwork Mon Jul 22 15:07:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C5=81ukasz_Bartosik?= X-Patchwork-Id: 813899 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CCD716DC19 for ; Mon, 22 Jul 2024 15:07:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721660871; cv=none; b=Nff8n/rwMN3JGlNQQGYvG1CLMBOWDYMsnwf2V87d4TXwjOZNQN8Muz9JcXPcbjmKi6ZVIi7uPc7Us316jYG5qsUYRqtex5WqrhivHuLf0aniWY+hFntk9aWLQlK886/H8wDhTxtweB/H/Ul0T2q1DuH4OytiTBJDuXmgcxXyGwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721660871; c=relaxed/simple; bh=jIqt4Hbp8GJaITtD5lM5gqvwRU1Z06PkXGVXnhHa5CQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=RuGGey74RMkFbBixf3EHlBdJ4pNpBixEeEIT01xcAjZu6OtSL2lQQXqMh/iI5pRcYDf9YWH1gGEKtGUIlBBkP8JK2vMwBvgYVtlcQIRLVIGgfmTfnwqDV+I1WRymvHXuLeQ1KdSKrjgxgXxGTrxw8RwADKAIxm8RZVvdzm5Q9ts= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=CtX0djcS; arc=none smtp.client-ip=209.85.167.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CtX0djcS" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-52ed9b802ceso3958001e87.3 for ; Mon, 22 Jul 2024 08:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1721660867; x=1722265667; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=X2KDctmkzeTLfWPD9P3UpxzxUToeDXQ0Slf0LuPYEi8=; b=CtX0djcSnxMyWecmyOJOMNWkpYChYAJuFUtlrydztKwL4e2Q5c8O5jICYA1sh81uI0 ZsZs7uCOHCAd16cjDKmMsgjNqMO0bYEikPy6BnT/CNhtaz5jiujW26yEEuyBaUjsafn7 Xcjd6/iEtHVUlMuB4Y7YjRFJ4SjMHWe5Ir2tM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721660867; x=1722265667; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X2KDctmkzeTLfWPD9P3UpxzxUToeDXQ0Slf0LuPYEi8=; b=PCvBp8QjGr6zb4U8ca2T8mIo0dzv3VXul/810UzxlGfxytYG5BBI57jQv1+OmG6CO6 xE20QKB7QfyKtvCZcNqFitokDcr59NkfJqaoM1qnD3egYErBAhjoPxIx8hGXjk33EgZ5 atSgXxXQQVU8QEUJWQkNDnCBuW3xMS8/08cZS1Zq3Xy+vnkclxagjkP4Zml5u1HXMLQK Kv/is/MWF/dGrmsGcujE+BIu7xge19/KXrkkFl7jVOdNnVgah4iiAqUoYLLTy7kh+t/t zOEtUnjse7ZPSF7nd/52pwiIl1NEJ1XRTgsvGFzuF9V9iqNOQJK2t2x13D+e6BgTvKo0 tXcQ== X-Gm-Message-State: AOJu0YzTdTFFeHzlYkRBe7ofu67geK30pr02cSl4eYWocj7r2/w5NgzC 4tVOCjESdOslYuDmCvBPb6x0wizjfFQVEzBfWY7IGC/NfpVl7biGzJVe2x5YlQ7RuIOYW0vZtOj e X-Google-Smtp-Source: AGHT+IEfG1lB96O4hcUqULaf0e0Oad0xMEgn49MrnQsV9HCkpv4JN5p6yGT5n/ht5l3IMLHHjWmy1g== X-Received: by 2002:a05:6512:31c9:b0:52e:faf0:410 with SMTP id 2adb3069b0e04-52efb533724mr5253088e87.1.1721660867285; Mon, 22 Jul 2024 08:07:47 -0700 (PDT) Received: from ukaszb-ng.c.googlers.com.com (61.134.90.34.bc.googleusercontent.com. [34.90.134.61]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7a83aedeaesm19289966b.2.2024.07.22.08.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 08:07:46 -0700 (PDT) From: =?utf-8?q?=C5=81ukasz_Bartosik?= To: Mathias Nyman , Greg Kroah-Hartman , Lu Baolu Cc: linux-usb@vger.kernel.org Subject: [PATCH v1] xhci: dbc: fix handling ClearFeature Halt requests Date: Mon, 22 Jul 2024 15:07:38 +0000 Message-ID: <20240722150738.61486-1-ukaszb@chromium.org> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DbC driver does not handle ClearFeature Halt requests correctly which in turn may lead to dropping packets on the receive path. Below is a trace capture where due to incorrect handling of ClearFeature Halt packet gets dropped on the receive path. /sys/kernel/debug/tracing # cat trace 1) kworker/10:3-514 [010] d..1. 2925.601843: xhci_dbc_handle_event: EVENT: TRB 000000019588c0e0 status 'Stall Error' len 0 slot 1 ep 2 type 'Transfer Event' flags e:C 2) kworker/10:3-514 [010] d..1. 2925.613285: xhci_dbc_handle_event: EVENT: TRB 000000019588bc80 status 'Stall Error' len 1024 slot 1 ep 3 type 'Transfer Event' flags e:C 3) kworker/10:3-514 [010] d..1. 2925.619024: xhci_dbc_handle_transfer: BULK: Buffer 0000000244b49800 length 1024 TD size 0 intr 0 type 'Normal' flags b:i:I:c:s:i:e:C 4) kworker/10:3-514 [010] d..1. 2925.619025: xhci_dbc_giveback_request: bulk-in: req 00000000a70b5ad2 length 0/1024 ==> -6 5) kworker/10:3-514 [010] dNs2. 2925.623820: xhci_dbc_gadget_ep_queue: BULK: Buffer 0000000244b49800 length 1024 TD size 0 intr 0 type 'Normal' flags b:i:I:c:s:i:e:c 6) kworker/10:3-514 [010] dNs1. 2925.623823: xhci_dbc_queue_request: bulk-in: req 00000000a70b5ad2 length 0/1024 ==> -115 7) kworker/10:3-514 [010] d..1. 2925.629865: xhci_dbc_handle_event: EVENT: TRB 000000019588bc80 status 'Short Packet' len 1000 slot 1 ep 3 type 'Transfer Event' flags e:C 8) kworker/10:3-514 [010] d..1. 2925.635540: xhci_dbc_handle_event: EVENT: TRB 000000019588bc90 status 'Short Packet' len 763 slot 1 ep 3 type 'Transfer Event' flags e:C 9) kworker/10:3-514 [010] d..1. 2925.635540: xhci_dbc_handle_transfer: BULK: Buffer 0000000244b49c00 length 1024 TD size 0 intr 0 type 'Normal' flags b:i:I:c:s:i:e:C 10) kworker/10:3-514 [010] d..1. 2925.635541: xhci_dbc_giveback_request: bulk-in: req 00000000b4ec77d7 length 261/1024 ==> 0 11) kworker/10:3-514 [010] dNs2. 2925.635561: xhci_dbc_gadget_ep_queue: BULK: Buffer 0000000244b49c00 length 1024 TD size 0 intr 0 type 'Normal' flags b:i:I:c:s:i:e:c 12) kworker/10:3-514 [010] dNs1. 2925.635562: xhci_dbc_queue_request: bulk-in: req 00000000b4ec77d7 length 0/1024 ==> -115 Lines 1 and 2 are Endpoints OUT and IN responses to receiving ClearFeature Halt requests. Line 7 notifies of reception of 24 bytes packet. Line 8 notifies of reception of 261 bytes packet In Lines [9, 12] 261 bytes packet is being processed. However 24 bytes packet gets dropped. The kernel log includes entry which is an indication of a packet drop: [ 127.651845] xhci_hcd 0000:00:0d.0: no matched request This fix adds correct handling of ClearFeature Halt requests by restarting an endpoint which received the request. Fixes: dfba2174dc42 ("usb: xhci: Add DbC support in xHCI driver") Signed-off-by: Łukasz Bartosik --- drivers/usb/host/xhci-dbgcap.c | 29 +++++++++++++++++++---------- drivers/usb/host/xhci-dbgtty.c | 5 +++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c index 872d9cddbcef..b7af3a5ac98a 100644 --- a/drivers/usb/host/xhci-dbgcap.c +++ b/drivers/usb/host/xhci-dbgcap.c @@ -173,7 +173,7 @@ static void xhci_dbc_giveback(struct dbc_request *req, int status) spin_lock(&dbc->lock); } -static void xhci_dbc_flush_single_request(struct dbc_request *req) +static void xhci_dbc_flush_single_request(struct dbc_request *req, int status) { union xhci_trb *trb = req->trb; @@ -183,21 +183,27 @@ static void xhci_dbc_flush_single_request(struct dbc_request *req) trb->generic.field[3] &= cpu_to_le32(TRB_CYCLE); trb->generic.field[3] |= cpu_to_le32(TRB_TYPE(TRB_TR_NOOP)); - xhci_dbc_giveback(req, -ESHUTDOWN); + xhci_dbc_giveback(req, status); } -static void xhci_dbc_flush_endpoint_requests(struct dbc_ep *dep) +static void xhci_dbc_flush_endpoint_requests(struct dbc_ep *dep, bool restart) { + struct list_head *list = &dep->list_pending; struct dbc_request *req, *tmp; + int status = -ESHUTDOWN; + + list_for_each_entry_safe(req, tmp, list, list_pending) { + if (restart && list_is_last(&req->list_pending, list)) + status = -ERESTART; - list_for_each_entry_safe(req, tmp, &dep->list_pending, list_pending) - xhci_dbc_flush_single_request(req); + xhci_dbc_flush_single_request(req, status); + } } static void xhci_dbc_flush_requests(struct xhci_dbc *dbc) { - xhci_dbc_flush_endpoint_requests(&dbc->eps[BULK_OUT]); - xhci_dbc_flush_endpoint_requests(&dbc->eps[BULK_IN]); + xhci_dbc_flush_endpoint_requests(&dbc->eps[BULK_OUT], false); + xhci_dbc_flush_endpoint_requests(&dbc->eps[BULK_IN], false); } struct dbc_request * @@ -718,10 +724,13 @@ static void dbc_handle_xfer_event(struct xhci_dbc *dbc, union xhci_trb *event) case COMP_TRB_ERROR: case COMP_BABBLE_DETECTED_ERROR: case COMP_USB_TRANSACTION_ERROR: - case COMP_STALL_ERROR: dev_warn(dbc->dev, "tx error %d detected\n", comp_code); status = -comp_code; break; + case COMP_STALL_ERROR: + /* Restart endpoint */ + xhci_dbc_flush_endpoint_requests(dep, true); + return; default: dev_err(dbc->dev, "unknown tx error %d\n", comp_code); status = -comp_code; @@ -823,12 +832,12 @@ static enum evtreturn xhci_dbc_do_handle_events(struct xhci_dbc *dbc) if (ctrl & DBC_CTRL_HALT_IN_TR) { dep = get_in_ep(dbc); - xhci_dbc_flush_endpoint_requests(dep); + xhci_dbc_flush_endpoint_requests(dep, false); } if (ctrl & DBC_CTRL_HALT_OUT_TR) { dep = get_out_ep(dbc); - xhci_dbc_flush_endpoint_requests(dep); + xhci_dbc_flush_endpoint_requests(dep, false); } return EVT_DONE; diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c index b74e98e94393..bdf80aa2b28c 100644 --- a/drivers/usb/host/xhci-dbgtty.c +++ b/drivers/usb/host/xhci-dbgtty.c @@ -121,6 +121,7 @@ static void dbc_write_complete(struct xhci_dbc *dbc, struct dbc_request *req) list_add(&req->list_pool, &port->write_pool); switch (req->status) { case 0: + case -ERESTART: dbc_start_tx(port); break; case -ESHUTDOWN: @@ -318,6 +319,10 @@ static void dbc_rx_push(struct tasklet_struct *t) case -ESHUTDOWN: disconnect = true; break; + case -ERESTART: + disconnect = false; + req->actual = 0; + break; default: pr_warn("ttyDBC0: unexpected RX status %d\n", req->status);