From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99D14A04B1 for ; Fri, 28 Aug 2020 12:14:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 91AA4A3; Fri, 28 Aug 2020 12:14:42 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id A17FD1C123 for ; Fri, 28 Aug 2020 12:14:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O01NjtMWqVjRVQnI8K9yf408R4s/H/3dNRfk5snTqSk=; b=Iidd9bXP1VENXW59bTgpiL3Tj0u63hmyL/WpK210RdWvz0u5dSc7BhHuhf4T34zezl7AwF Yup7ANHnnOu5dIOfagpAaKNFbG7i4Yi1+n0qMoutZ7Oxkce+ATGcDIGjaMv0Ms0U9Q6vaJ AlLHKnri8/rAGXHsx4DqCjIpMaXFIlw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-449-oC844wnGOteWmfNlLLok4w-1; Fri, 28 Aug 2020 06:14:37 -0400 X-MC-Unique: oC844wnGOteWmfNlLLok4w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 080AE10ABDCD; Fri, 28 Aug 2020 10:14:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id F19CF19D7C; Fri, 28 Aug 2020 10:14:34 +0000 (UTC) From: Kevin Traynor To: Zhiguang He Cc: Wei Hu , dpdk stable Date: Fri, 28 Aug 2020 11:13:05 +0100 Message-Id: <20200828101308.223767-39-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix dead loop on RSS RETA update' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6ae8b77e3ebb3a58d800abd994754713e8d00dd4 Thanks. Kevin. --- >From 6ae8b77e3ebb3a58d800abd994754713e8d00dd4 Mon Sep 17 00:00:00 2001 From: Zhiguang He Date: Sun, 2 Aug 2020 20:27:27 +0800 Subject: [PATCH] net/bonding: fix dead loop on RSS RETA update [ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ] When parameter reta_size < RTE_RETA_GROUP_SIZE, reta_count will be 0. Then this function will be deadloop. Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration") Signed-off-by: Zhiguang He Acked-by: Wei Hu (Xavier) --- drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 8b410ff19b..0189a3d446 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2671,5 +2671,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev, /* Copy RETA table */ - reta_count = reta_size / RTE_RETA_GROUP_SIZE; + reta_count = (reta_size + RTE_RETA_GROUP_SIZE - 1) / + RTE_RETA_GROUP_SIZE; for (i = 0; i < reta_count; i++) { -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.837770642 +0100 +++ 0039-net-bonding-fix-dead-loop-on-RSS-RETA-update.patch 2020-08-28 11:03:25.991955973 +0100 @@ -1 +1 @@ -From eb8939538fddced05b906c34ba9f545bf6717ad2 Mon Sep 17 00:00:00 2001 +From 6ae8b77e3ebb3a58d800abd994754713e8d00dd4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 116e2f29de..cdbd8151ed 100644 +index 8b410ff19b..0189a3d446 100644 @@ -22 +23 @@ -@@ -2936,5 +2936,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev, +@@ -2671,5 +2671,6 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,