From nobody Mon Sep 8 08:51:29 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1286BC6FA8A for ; Tue, 13 Sep 2022 14:55:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234711AbiIMOxs (ORCPT ); Tue, 13 Sep 2022 10:53:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234712AbiIMOtb (ORCPT ); Tue, 13 Sep 2022 10:49:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8D8C719B8; Tue, 13 Sep 2022 07:25:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5AB43B80F2B; Tue, 13 Sep 2022 14:25:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF5B0C433D6; Tue, 13 Sep 2022 14:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663079140; bh=dtjOxUDGcurKy9p4wiuughU8huRVNGM2fGxvFdBUQm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UFMQUkvDEfycB/4ntgJ85XIKhB1JmlF0UbJfakFmfX1aHcm94QJ3CeFFed3J2fCqa hozYq84dDKgO0gOPYy2KFNsDf1oxnq7c+EfhOoqgCvgoVrg3icOFqVPNP6SQ7XU4rg WTtYGfS0ExlesFX8fpIlPHtlhH7K3pcOhJBUKFWM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 019/108] Revert "sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb" Date: Tue, 13 Sep 2022 16:05:50 +0200 Message-Id: <20220913140354.422468786@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140353.549108748@linuxfoundation.org> References: <20220913140353.549108748@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jakub Kicinski [ Upstream commit 0b4f688d53fdc2a731b9d9cdf0c96255bc024ea6 ] This reverts commit 90fabae8a2c225c4e4936723c38857887edde5cc. Patch was applied hastily, revert and let the v2 be reviewed. Fixes: 90fabae8a2c2 ("sch_cake: Return __NET_XMIT_STOLEN when consuming enq= ueued skb") Link: https://lore.kernel.org/all/87wnao2ha3.fsf@toke.dk/ Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_cake.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 737368c701c53..0eb4d4a568f77 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1677,7 +1677,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Q= disc *sch, } idx--; flow =3D &b->flows[idx]; - ret =3D NET_XMIT_SUCCESS; =20 /* ensure shaper state isn't stale */ if (!b->tin_backlog) { @@ -1738,7 +1737,6 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Q= disc *sch, =20 qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen); consume_skb(skb); - ret |=3D __NET_XMIT_STOLEN; } else { /* not splitting */ cobalt_set_enqueue_time(skb, now); @@ -1872,7 +1870,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Q= disc *sch, } b->drop_overlimit +=3D dropped; } - return ret; + return NET_XMIT_SUCCESS; } =20 static struct sk_buff *cake_dequeue_one(struct Qdisc *sch) --=20 2.35.1