From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 528A0C433DF for ; Mon, 17 Aug 2020 15:28:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21C1723B43 for ; Mon, 17 Aug 2020 15:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678084; bh=wsIZr4khLOrQVSCHZdAE2wCu6oqsMvIEc+uEO6aHUXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XmMr/mbHUYh4wQtPMifcLs2BVijkifi5TARIlmOKzGyBkIHF889zLqFXlYsGijdZE pl4QweYODwbCeFT444a7puFAHZR02jMVSSlYOLRmn/bdoLcqhvUxir7WEXgSW1uZxK GLyub6IzdhewpWAWB4WyNdNS9YgRV7+c4YZ/Votc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729674AbgHQP2B (ORCPT ); Mon, 17 Aug 2020 11:28:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:34476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729799AbgHQP0R (ORCPT ); Mon, 17 Aug 2020 11:26:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9134823109; Mon, 17 Aug 2020 15:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597677977; bh=wsIZr4khLOrQVSCHZdAE2wCu6oqsMvIEc+uEO6aHUXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ARW0xVdMQdPfh3lMgTxju/O9BNLiO0g1kxINesDwHzU77WTrOygWIgrEmYyXbie0x XZIGGUAnUFtqqdfQVqhb+Cd2IEcFrK9xKtZzRmH7nH3g16jnOuK/AIDfwtmrw4BNQg tE+gmkI04/A9hkHo2Rk4Uwx6s/G4zqJ8glHB3k/w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ioana Ciornei , "David S. Miller" , Sasha Levin Subject: [PATCH 5.8 176/464] dpaa2-eth: fix condition for number of buffer acquire retries Date: Mon, 17 Aug 2020 17:12:09 +0200 Message-Id: <20200817143842.249705710@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ioana Ciornei [ Upstream commit 0e5ad75b02d9341eb9ca22627247f9a02cc20d6f ] We should keep retrying to acquire buffers through the software portals as long as the function returns -EBUSY and the number of retries is __below__ DPAA2_ETH_SWP_BUSY_RETRIES. Fixes: ef17bd7cc0c8 ("dpaa2-eth: Avoid unbounded while loops") Signed-off-by: Ioana Ciornei Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 0998ceb1a26ea..89c43401f2889 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -1109,7 +1109,7 @@ static void drain_bufs(struct dpaa2_eth_priv *priv, int count) buf_array, count); if (ret < 0) { if (ret == -EBUSY && - retries++ >= DPAA2_ETH_SWP_BUSY_RETRIES) + retries++ < DPAA2_ETH_SWP_BUSY_RETRIES) continue; netdev_err(priv->net_dev, "dpaa2_io_service_acquire() failed\n"); return; -- 2.25.1