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 78705A0351 for ; Thu, 6 Aug 2020 11:59:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 716551C127; Thu, 6 Aug 2020 11:59:38 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id F11CC1C199 for ; Thu, 6 Aug 2020 11:59:36 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id f12so7552628wru.13 for ; Thu, 06 Aug 2020 02:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fKhGfBVlKfCKWvPKvsmHeVfhFMv2IoYcoNQ7k3+zJCA=; b=LMiTxW0+qTOXbyzm2/o2tcvlx9DO2P/NBJ1UFUR4T+ip+iQmX7Gc93i3/uiFIR2pSk 4AFBcbkqefTfAuQezg+ZJuTf3rV8I2Og+vc8ZEDI5djQIVTMuFDGNTePUhGz2sf9nbgg 9iOn7hdSJ3aHFd0EGBRlrY6yVB5b78wJoinrgX57KbqutsvHIKFEymsBgGYKQW7K0y6K VbG37bflWBmoaGzxrFg4p2INdC1AvZCjXfLgj4q4gDZXm5BM/x9hB3DsrropQ226dK7G 6eOa+Wa+FEpuJS7qZOGcQKIhV3YKYUzShy1nOFOiKxUu6RFcxSal7lF0Dr7LdGzepnyk bWPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fKhGfBVlKfCKWvPKvsmHeVfhFMv2IoYcoNQ7k3+zJCA=; b=F21XjICS0HB0iaBqQ4Wq1Od+ZYM2zWucr/k+VzufZdjVLHHXyLCH25OhiQ8eI2FKiT TwaqCgCwTWlEr0/S0HaoYS7Lm/03fJQQwcGE6RhDxIIKuzF+Kd4+4MyAaSTLFOsvpF5H qDbRk8+wdUGL0iJis8aROV44sQtYYNWpW2DBS8/I7Zxd1U3Lbarim7M1tDegM4vDRg2h BYs3XaSVvhAaYzUX9CSyvp4TfKcax09U+oVNdUR6FmbD+W7j0QVkqqnw/RgsFB+dijU6 xFHRNSaoDdBhiTQHUJ3kMVGs4ovg8rG2H0IbZVxpFADiHT9VBZ4Yv14ZS7ncxvHI80Kp PZsw== X-Gm-Message-State: AOAM5325ZevXjydBxGPUV0bNPkLCsC3fGp6FpJWmJA+tgJhq2wuCXqAI agaf+MocOXJk2DSBgC/1Dp/NIeecynA0eg== X-Google-Smtp-Source: ABdhPJyCzIRQq4WLeEuZ3DkVI8auSsYWLQhACmEkS5SfY0tVvB6QKwfMttXp+pnjM4t4ztWvTnmPTA== X-Received: by 2002:adf:ef44:: with SMTP id c4mr6532851wrp.84.1596707976750; Thu, 06 Aug 2020 02:59:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 126sm5996393wme.42.2020.08.06.02.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhiguang He Cc: Wei Hu , dpdk stable Date: Thu, 6 Aug 2020 10:54:07 +0100 Message-Id: <20200806095411.774624-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix dead loop on RSS RETA update' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/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. Thanks. Luca Boccassi --- >From d41943482e2d1d4372b3d6aa69e71f40d2ea9fc2 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 419e03c00..fccfcb2c8 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2935,7 +2935,8 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev, return -EINVAL; /* 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++) { internals->reta_conf[i].mask = reta_conf[i].mask; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:17.295130569 +0100 +++ 0039-net-bonding-fix-dead-loop-on-RSS-RETA-update.patch 2020-08-06 10:53:15.836598114 +0100 @@ -1,13 +1,14 @@ -From eb8939538fddced05b906c34ba9f545bf6717ad2 Mon Sep 17 00:00:00 2001 +From d41943482e2d1d4372b3d6aa69e71f40d2ea9fc2 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") -Cc: stable@dpdk.org Signed-off-by: Zhiguang He Acked-by: Wei Hu (Xavier) @@ -16,7 +17,7 @@ 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 116e2f29d..cdbd8151e 100644 +index 419e03c00..fccfcb2c8 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2935,7 +2935,8 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,