From patchwork Tue Mar 14 12:37:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jochen Henneberg X-Patchwork-Id: 13174312 X-Patchwork-Delegate: kuba@kernel.org 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 8022EC6FD1D for ; Tue, 14 Mar 2023 12:52:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232483AbjCNMwM (ORCPT ); Tue, 14 Mar 2023 08:52:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232305AbjCNMvw (ORCPT ); Tue, 14 Mar 2023 08:51:52 -0400 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE220A8825; Tue, 14 Mar 2023 05:47:44 -0700 (PDT) Received: from maxwell.localdomain ([109.43.51.107]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MHG4c-1pgRfb1IOW-00DIcr; Tue, 14 Mar 2023 13:39:43 +0100 From: Jochen Henneberg To: netdev@vger.kernel.org Cc: Jochen Henneberg , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Ong Boon Leong , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net 1/2] net: stmmac: Premature loop termination check was ignored Date: Tue, 14 Mar 2023 13:37:58 +0100 Message-Id: <20230314123759.132521-2-jh@henneberg-systemdesign.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314123759.132521-1-jh@henneberg-systemdesign.com> References: <20230314123759.132521-1-jh@henneberg-systemdesign.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:9odOXzVTEt6nET6RlhuEMzaEAU5NfNUV6HWs/su++s+L/5aTzSd 2U+FGb12WmVeADxMSgj4AoUS69olA6Y9Kqi+kaAIlGBdcnOr8aIQTWSm35+rNDTBjRDVDho eNHW/U3NzgInsz4ivdVqmoAVGimlcvOV08kcXmzmia9EAJJvXkgpnldAn3iCMiK2y9zzQ9o B/b58yd8mdmj1Sk9DPXaQ== UI-OutboundReport: notjunk:1;M01:P0:oRwcTSNJXoU=;FKXs2RQX9KFX1o/21aklpyM+DSY vFoLaNm7FBiRYQhDL+Ue4MxrTZhEYlyCgic2du8ShlsYZNPRhbaA2LDPszAVZvhAaoP23q+BQ mNs1aqrp0llsI4StFQ6fFWCXRd3Euzpa+YriZbFuFLtn/AYZyigi7xIKlPmEyhG57GI3AiUrw 6qEDxnOBsTZ7gkXhGR1N5BrGLSdsL9KamQcXucBBagRpLRhygIy2Xk7fDri1eZOGgjv5TpHpH 0Sxq0A5b1J2NnLjt3GenW2WDBztf+Ku1lSW7EuGAE6VyITrVJxcRLA3YQ0llQaS8hDK/VEHCi T4oC+ZwxsSzSDHbrjvzygd9xQUnCL2H3zAOxbGVBBMsD03k2t18N8h95OA/X+qg9P1rLe4wVL OThDc+e0NQEHp3ibxRUSgIk4XhLPxDpxhzTFtFM3+mxrHLDqbiloVQP4DLH4Gx9xPBBYLz+o6 jg8iQPwlF0HKnhNhksDYnRrsVyS2jRt7Z4nHOVS7q7lZX6c17N0URZbj03cLDSwzDvAQYoSWD DYVuN2Lc3OpXQHaZhTuzGntQV844ug2Qoj6O5L0qiTnZrURTgnEvyKe/OFRXU+pZUczYO2IHo CMpyVKIbAqbMQcIxWjun1K4Xkz7lIgdlQZIj2GxPJAMJEFaHo5mxyOyfEC3KyhYhAo8/ZXj0l GPIIOGF59p92gIxvzT8uyqXc3XKqyL0KXn9ApO1uZoY8umbYFYoeZ8Sv33SPlCN6JHTYxRJIu 0qsYl5DKVOq Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The premature loop termination check makes sense only in case of the jump to read_again where the count may have been updated. But read_again did not include the check. Fixes: ec222003bd94 ("net: stmmac: Prepare to add Split Header support") Signed-off-by: Jochen Henneberg Reviewed-by: Piotr Raczynski --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e4902a7bb61e..ea51c7c93101 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5221,10 +5221,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; buf2_len = 0; entry = next_entry; From patchwork Tue Mar 14 12:37:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jochen Henneberg X-Patchwork-Id: 13174414 X-Patchwork-Delegate: kuba@kernel.org 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 8CA4EC6FD1D for ; Tue, 14 Mar 2023 13:14:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232386AbjCNNN7 (ORCPT ); Tue, 14 Mar 2023 09:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232242AbjCNNNg (ORCPT ); Tue, 14 Mar 2023 09:13:36 -0400 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD0C9FBFC; Tue, 14 Mar 2023 06:10:21 -0700 (PDT) Received: from maxwell.localdomain ([109.43.51.107]) by mrelayeu.kundenserver.de (mreue109 [213.165.67.113]) with ESMTPSA (Nemesis) id 1MkYkC-1qO0UO1e0M-00m3Lr; Tue, 14 Mar 2023 13:39:46 +0100 From: Jochen Henneberg To: netdev@vger.kernel.org Cc: Jochen Henneberg , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Ong Boon Leong , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net 2/2] net: stmmac: Premature loop termination check was ignored Date: Tue, 14 Mar 2023 13:37:59 +0100 Message-Id: <20230314123759.132521-3-jh@henneberg-systemdesign.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314123759.132521-1-jh@henneberg-systemdesign.com> References: <20230314123759.132521-1-jh@henneberg-systemdesign.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:l1W1LjxOLRyxarFh4d7uXBRK1UHreknpzqZxegOM2jODzpg/YnC 9we6QMFFMqqrvH21mCENI6V0GewVL31+FUjESlQG/GgCnknsFYczuD3QVxAowBFgssxKeKC BvP40Y6ELDXd3GZ27r2KYfUuPWtMiyJOvLPWLgjjxUnr2hsS6L6ExUn8v0AUlKJ591P77sJ 29IArAxiVdxnm/YEFKiCg== UI-OutboundReport: notjunk:1;M01:P0:ALkaqJksCBY=;UNJi6nd3DKRNOsPUSg2Y1GXX0u6 1coJnSy7MjETLQHEvuK9ywdKPTbvXS66imF0ekDSU5EWzMqeulqgrLB7mVcSdAXH5iYgsMIxM LotuqDwvC0xR06FG8kheFe40Zg7KGAwompEBMQfb7tAOHvewSp/6MumxfpQU5k6Hn7xAf+Lm6 cCPRdJZX38lp+1mw2FNL/y3wXyyULHHdJwJJDI2ewx2vv3b9QzkB+mrYcBMbcMiWP8FSZcS7l C43xi7YEW9a1q3JYvx5wmBJtN9Pvf32cjqrXYovFuLvz7fRvSzhz7+zkcKjbPx3TMY2RctZxh M44RfssRkJmRKf4X0FxBdQ8rtWUSVXQifNg3fzrnfmXARmRt67VBFfiadjbQ+oRjhWZ9i8zwC z7VcNZ/Tjr1+2ehHceriKEEZRRAtOr0dYlYDu5LTLdFOXLXiPOzFc3yaSh04AD3Qbqx/j6WX9 WH8Jv9MGERxKdSZuxljZTJ3ZqCsEVJPI92I2XenxmHQNCwHMLSZiAJxgoYPDQx4CoqxxhJUeI Z6eG482F4kG7BPdMqogBkBrYkm5YGFXaGskjNzDLT0AYlmzEILvb3aGkxi5otf/OWeO2dq7O6 N0qdv1/b+FByC37Uj2ETGS1wT26B2kewQFkQ7ghUKsDG3P0EzkUVFk7mRAbjPFmi9snDFLUh/ 4zwbgq/IMNikStvlmyfKAiO2hPlkMfl3iVGDrJslbw== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The premature loop termination check makes sense only in case of the jump to read_again where the count may have been updated. But read_again did not include the check. Fixes: bba2556efad6 ("net: stmmac: Enable RX via AF_XDP zero-copy") Signed-off-by: Jochen Henneberg --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ea51c7c93101..4886668a54c5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5031,10 +5031,10 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; entry = next_entry; buf = &rx_q->buf_pool[entry];