Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795051640; b=NAwTo1PjDV1+rLRyn/VEgsWUUKWBD/k9aEfMvb88n/AtAMO8+LpY+MeoE6b7qMSKPyhb CLwAoD4KTJuBCSdMklhLgmX0gLDrOWrEAJX/+7daEA4nzq4ePj72XX2MK8Ewry1lVarSB BHO9BG2Hrywe5gZrS5jv2o4pE8dDqSAnWgvtfHXNu+Q+AIjE5W+C8futpcpAcLkGOMfP8 1nYeSz0Z7ebdDTIhkeIpY5RpQ3w2jWQ0SYYSZ0olHHFBEFRZnd0azT1ZcGQNbPSVyDEwd s1qU5RD39P4tsb/SFrNl8rN+HPZ00cdh+KZdMu5gUigIpU5OZBZ7PZ8B6SZcQ42NR5w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795051640; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=SyT9QerSL+R8TdIfXukQhLW8CQ5uzMUI3NgEJZNsNrw=; b=pgWZrj6ab/Wz7pM2IRdF2MveIraQumAKO3oyLHUqGixRazlce71RikBGIzuPWJpk7DK7 rMm6OeQ8r/EfBDRKZ5rYifUuttf+n3/cX6lubmEi4hX0E8NNzsWp0G2uGg+R/H9WNGA7Y damOvtcMiksTC3AyPfOkOnUE9AOgIiuyVdhCLYJB5Egwx4jPT/cdb7NP9ZamXAyRM1JqH LtZpN1c5/dnkk3P4WLMhsvI6Yb6PKZ9MrGy3xwdzAi++8GLvdlZx8DMtbb/QO6auaHvgv VKVxqpx7kc2XB7oRnvt3Taq9Tq6gIXZjb3fJTUbvo7GZmYu7lVE2R+r/myeOeahNx/w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N8D+v4ms; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D26A8606A32A; Thu, 19 Nov 2026 01:27:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N8D+v4ms Received: by smtp.kernel.org (Postfix) with ESMTPSA id D37AA1F000C4; Thu, 19 Nov 2026 01:27:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795051640; bh=SyT9QerSL+R8TdIfXukQhLW8CQ5uzMUI3NgEJZNsNrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N8D+v4msksJmW8Z8AWMpGaRU41mU1aFEgVvtmf9lZWWQlH2/3eF4yaEbtwzM1Gi8V 5J5ACraQ0FhEXf0fY7C03ZGtZw92MbKPBSQFyGiqmcKf60DaE/XyReXV+y7xkUdc09 uoz+aGJB2PitAZzX8iWMNnpYzMXQ2Gtf1+W4bWgY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Antonio Quartulli , Eric Dumazet , Jesper Dangaard Brouer , Jakub Kicinski Subject: [PATCH 5.15 0280/2214] net/sched: fix packet reordering on requeue Date: Wed, 18 Nov 2026 15:32:36 +0100 Message-ID: <20261118150021.259315442@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Antonio Quartulli commit 14368b9aa1017fee35d2589be7b17e0485c0f93e upstream. dev_requeue_skb() appends requeued skbs to the tail of q->gso_skb, while dequeue_skb() takes them back one at a time from the head. If the driver returns NETDEV_TX_BUSY again for the first of them, it moves behind the skbs still parked there and is sent after them. This showed up as heavy TCP reordering while benchmarking over veth, which returns NETDEV_TX_BUSY whenever its ring is full since commit dc82a33297fc ("veth: apply qdisc backpressure on full ptr_ring to reduce TX drops"). Requeue the skbs at the head of gso_skb, keeping their order. With 4 TCP streams over a veth pair with a pfifo qdisc, this removes about 1.3M out-of-order segments and 15-37k retransmits per 15 seconds, and raises throughput from about 40 to 76 Gbit/s. Fixes: a53851e2c321 ("net: sched: explicit locking in gso_cpu fallback") Fixes: 9540d977618c ("net: sched: fix skb leak in dev_requeue_skb()") Cc: stable@vger.kernel.org Signed-off-by: Antonio Quartulli Reviewed-by: Eric Dumazet Acked-by: Jesper Dangaard Brouer Link: https://patch.msgid.link/20261026153113.3275494-1-antonio@mandelbit.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_generic.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -141,8 +141,11 @@ static inline void qdisc_enqueue_skb_bad static inline void dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q) { + struct sk_buff_head requeue; spinlock_t *lock = NULL; + __skb_queue_head_init(&requeue); + if (q->flags & TCQ_F_NOLOCK) { lock = qdisc_lock(q); spin_lock(lock); @@ -151,7 +154,7 @@ static inline void dev_requeue_skb(struc while (skb) { struct sk_buff *next = skb->next; - __skb_queue_tail(&q->gso_skb, skb); + __skb_queue_tail(&requeue, skb); /* it's still part of the queue */ if (qdisc_is_percpu_stats(q)) { @@ -167,6 +170,11 @@ static inline void dev_requeue_skb(struc skb = next; } + /* the skbs may come from the head of gso_skb, so put them back there: + * appending them would let the ones still parked overtake them + */ + skb_queue_splice(&requeue, &q->gso_skb); + if (lock) { spin_unlock(lock); set_bit(__QDISC_STATE_MISSED, &q->state);