From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.43 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794973286; b=e7o1orD0AezAasKXy6IrLA/uwBgqfchU9H4x9gaGdSURY/zC4OA1rbB0BeOXKYLVwhrQ sFjAtX5Vv46oqpgc9HhRDyRKc/krq7U//h3GOisg4PGFbl+ZMlb8RaFBXDQY7HGGBoigl qK2m6JSdYvSwC75CIOsYBOZAfJNKS2P42649Edm4w5noVNDu56/U3beKR9YWTM5aaq6sw hmg2IerA8mjOJ2G1sQ0lx3pnCP0KQT6IbgOyiWuwTS9wRCzd5Yn4+8gdQVdahBdFLOy48 FuHAhbsVqY4FQc2hISYZloTDl7yZgyYrQxayawy7HXu8bwGCYf+wRqa0M1aOfFi27Lg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794973286; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=iLN4MW9ODY9ox27u7mAX4K/WuNhddDvFTBwZkODNj54=; b=sJdPqGQle/PGVjHhW/n/j5WrDT5bqqJdA3e07hY/TJcf2L9WB9vnZWwASl7T9G1MDIIR A0QJRx3AWmca+lkO988nbF3CeWtQKuDylwinl63FdWDiinz7WjnWZkrYbsvrIXCLvDXtq 8yC6BbjdK0I9TP9sx023eOQfKGCjAtpypjtc2zb/M2XScfzVMJLEu8bkveWQiNtcwE/Ec rQ1/9OdwipYm+ATvIu9GXYg+RUc67ddKY23F1k0yUGjFKmNmetmJfF50pU8oZFbAH1UJe IpQrQWnaD0rB/U/hXgECPSmJv82WjUYgoIHHG6Thy4Jz9OEnriZJkDGX2eM/gzB30Sw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=wkennington.com; spf=none smtp.mailfrom=wkennington.com; dkim=pass header.d=wkennington-com.20260707.gappssmtp.com header.i=@wkennington-com.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=aPhecY8G; arc=none smtp.remote-ip=209.85.216.43 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 367B1606A334 for ; Wed, 18 Nov 2026 03:41:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 367B1606A334 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wkennington.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=wkennington.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wkennington-com.20260707.gappssmtp.com header.i=@wkennington-com.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=aPhecY8G Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-3b16896b8ceso210927a91.1 for ; Tue, 17 Nov 2026 19:41:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wkennington-com.20260707.gappssmtp.com; s=20260707; t=1794973284; x=1795578084; 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:content-type; bh=iLN4MW9ODY9ox27u7mAX4K/WuNhddDvFTBwZkODNj54=; b=aPhecY8GMBIa+nYNDpQ6Nw2J0g1Ci7+fFM7OT5D7R+XeseB5C1wIN39R7uMhX1qwpT peQckTbsk/IZmg0uS8s8NcPgsNBNtzE59Cn4tTwVR6T4LHF7jtF2PE+EZ06mqQfw743l 96vKj4zzO5vBilTrSwtCJDcIePWbU8uxVXNsX+BUUcnUr/OJ7ZH0P09IbLrzRqZJpZuC YzleiisHJ1m+ROsfbbjNkU2YzVBEMtk7g/3R0rKu+v9Gwib34WwyU2TL72xgcxuJSx4p rfw28K+OhD3SnY2T48m/MLP+tTTlcQm9KgpjAKZcWr4F8Y/WjCMyY4/Owk6PYEzAZlZt +6OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794973284; x=1795578084; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iLN4MW9ODY9ox27u7mAX4K/WuNhddDvFTBwZkODNj54=; b=jXKQ+nE2cR4F68MvuVZqPAymrOc8n6OawQIloiuQZMmKYzqjMzJ4m3bzTJpYkSkdOc lhFMaHzs2LbX/qo/eWJG+7WuAd2caIuZEGPvsCo0TnS5o07Ssfuk9XijJT2KHDBo9siL NCKtN8nWQNKXuzfzmEjjbMaznRT7h3bFIILNHqczcYTkp/LsmwNfVJ4aB8J/IdndexcG 8JjB1XjUHI7IdYNZUIDyvag/7pfj7AW7N+IwoqeS+iggamRZwJ/41ARUD3syNPP/qpUJ AG155eZIqfOEmnTD0e2wIPELlbWcmgoXt3XB2XzfyPgMuSGLYXjndu2ntjp8/azaVTh+ WTaA== X-Forwarded-Encrypted: i=1; AL+hErGyhZt88WROX4K5Z+IXUBdlg/t+plZQprqwWycgSEdu70+XmTxMEOitv9rhG99khXVQ2QH5QmE=@vger.kernel.org X-Gm-Message-State: APuU4Z9XYITEV0A18RbAtsKR7W8sFLLblYv1jFRXkPt87lvDXBlMh+vh wFwxKY3yWk7rdlo5wU0Zs0vcQsW63q6l6rA/OM0+79ZIzmwSPzsP5aTCp3NJG4CBd4k= X-Gm-Gg: AZFdTZcyZ24Rv26kr9wiiPLrafC9viC8D7m4IYeRuDams/lq7JhwQqfY1kYAyk+u/Y8 zfdumYX424/3zFLa05HJK/EBlrOsuMhKquOJTkkuhsNqQ0yfOBq06m+LuzSRkVvo/12BWkBTlGr nNRL5fwxxihtqqciK6bCW92xrActfXwyRvbvW1mLKoTgmG9FfduAYh4cPTOL7dnzl4rBBNmqlCc dzKyMC2A9tAvbNs4sLoH8oXUDVsAQxV7WJOVMKW4yEooLfT9zg7A1+CWnKaSBGL25DdzUX0w0gt 5KopL7SF7E2PbS3h3qrOCYKSnJFD5G+kD4d6WSpH+n7U1vwsjdgLK+0OtWlBVJJMxC/uePSmXKc rxSw/cFQsx5UE/j6Y58K/WJjN8V6f1wHF02YaFYsyBZC7XuJJ4b5AEl+nKFW+FKPMGbUGmfbBYH AUbDLjDJd/N/0yrGBaeYLA6aOrz+JCYfBOLN5vKe0hexkwvNu6/X5HCbZ7/gvrwRamCDuCNjM99 dM28URBw9NmtwjtjaXgr/tFV4dxpuLSdJ0QfwXlbXkeoag6XEmfNj4XPughpZN0mGvS28+voiOt LIxNRKoOzjpVv7ULVFNnNBpgUEYcrYpVBNMe8vfHX7MT4TYnekq4BNVbzDz0ofg7jXU0JQ5RhKz tc+k4rxQR+5Weasc= X-Received: by 2002:a17:90b:3c04:b0:3ac:adce:60ad with SMTP id 98e67ed59e1d1-3b3d079ffb7mr1117572a91.22.1794973284230; Tue, 17 Nov 2026 19:41:24 -0800 (PST) Received: from wak.c.googlers.com.com (246.21.127.34.bc.googleusercontent.com. [34.127.21.246]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b3d143d69csm1793636a91.1.2026.11.17.19.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 19:41:23 -0800 (PST) From: "William A. Kennington III" To: Oliver Neukum , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: =?UTF-8?q?Jan=20Kl=C3=B6tzke?= , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "William A. Kennington III" Subject: [PATCH net] net: usb: cdc_ncm: don't flush the TX timer into a stopped queue Date: Wed, 18 Nov 2026 03:41:22 +0000 Message-ID: <20261118034122.315979-1-william@wkennington.com> X-Mailer: git-send-email 2.56.0.567.gdb80ae8cd5-goog X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit cdc_ncm_txpath_bh() calls usbnet_start_xmit() directly without checking whether usbnet has stopped the netdev TX queue. Since commit ad70411a978d ("usbnet: fix kernel crash after disconnect"), usbnet_start_xmit() frees any NTB submitted while the queue is stopped and increments tx_dropped. This triggers routinely under bulk load. With the default 16 KiB NTBs, usbnet only allows MAX_QUEUE_MEMORY / tx_max = 5 TX URBs in flight, so a bulk TCP stream stops the queue constantly. The TX timer is armed while an NTB is partly filled and keeps running after a subsequent packet sends that NTB out full; when the timer fires while all 5 URBs are still in flight, any frame left in tx_rem_skb or tx_curr_skb is flushed into a new NTB and dropped by usbnet, causing steady tx_dropped increments and TCP retransmits. While TX URBs are in flight (dev->txq) or completed and awaiting usbnet_bh() (dev->done), usbnet will wake the queue again. When the queue is stopped under those conditions and cdc_ncm has buffered TX frames, restart the timer instead of flushing into usbnet_start_xmit(). Keep the existing flush path when nothing is queued to wake the device, the interface is down, or the timer is disabled (tx_timer_usecs = 0), so the timer cannot rearm indefinitely. Check the state under ctx->mtx inside netif_tx_lock_bh(), matching the lock order on the transmit path and keeping tx_reason_timeout serialized. Fixes: ad70411a978d ("usbnet: fix kernel crash after disconnect") Signed-off-by: William A. Kennington III --- drivers/net/usb/cdc_ncm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index e92dc7f011ea..e5d659dd7436 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1509,9 +1509,26 @@ static void cdc_ncm_txpath_bh(struct tasklet_struct *t) cdc_ncm_tx_timeout_start(ctx); spin_unlock(&ctx->mtx); } else if (dev->net != NULL) { - ctx->tx_reason_timeout++; /* count reason for transmitting */ spin_unlock(&ctx->mtx); netif_tx_lock_bh(dev->net); + spin_lock(&ctx->mtx); + /* usbnet drops the whole NTB if its queue is stopped. While + * TX URBs are in flight, or completed but not yet reaped by + * usbnet_bh(), the queue will be woken again, so keep any + * buffered frames and retry a timer interval later. + */ + if (ctx->timer_interval && + (ctx->tx_curr_skb || ctx->tx_rem_skb) && + netif_running(dev->net) && netif_queue_stopped(dev->net) && + (skb_queue_len_lockless(&dev->txq) || + skb_queue_len_lockless(&dev->done))) { + cdc_ncm_tx_timeout_start(ctx); + spin_unlock(&ctx->mtx); + netif_tx_unlock_bh(dev->net); + return; + } + ctx->tx_reason_timeout++; + spin_unlock(&ctx->mtx); usbnet_start_xmit(NULL, dev->net); netif_tx_unlock_bh(dev->net); } else { base-commit: 2a324a58a084c5cfd7e5a2f55e0786bee170a4a5 -- 2.56.1.703.gf848ed807c-goog