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 6AE0EA055A for ; Thu, 27 Feb 2020 10:35:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 62B0A1C01; Thu, 27 Feb 2020 10:35:37 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 905681C01 for ; Thu, 27 Feb 2020 10:35:36 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id t23so2688392wmi.1 for ; Thu, 27 Feb 2020 01:35:36 -0800 (PST) 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=C7+LwtNMgXtpJr3qfeArUBkNakz0x1bCw2hbWPWNG6o=; b=u3i9yUqgvuGaTgvJnQY46YUHhorxyj31XOA+McTZPshuUP26Xgo/c0SBcJgKssPmqX A2WpB1hpEn7XqKY5YxLuk5G0otQ6KNADppN6B7LGikxIl+tWXjeXUU7GmeT8g7V1spUZ qxOzku+d0BGFlVlKv9UmBpPs69oNCBGzAcqzH68t4RzpZcen6EARJjwIdHJfyr1BqmuG vS71DOMlpE/LCRphv1nfzRlefs/n5SN1pJsVBPsCvbupAPw+2K6tMPyzC58oUnTLdWxp Z93Tnj4AYRK7YEob6Jx1ED7+qF74ohnc0IMW5UI1sQmSTHoQ3rNAs3FRVv/6+HsweJIC WVlQ== 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=C7+LwtNMgXtpJr3qfeArUBkNakz0x1bCw2hbWPWNG6o=; b=FYsmFsJKg72QMJ05m5lY6QolswuYa21yqvZLa/4/eNmO2YFPGr0zXf6qig25k0DYRT Fp9r0msQxv3JsGqjnmrDV31JmhjrkhLXd3dhnXVtp845SFW3i/tY9mrVkE1/Fg9HVwh4 pHyjLeq183cokif3hzTlr0hoFcVSpKNo8lfSksfNfZY9ahloes+7gBT8VpsNFfwEFaaw 36/C56+CQvwZ1bQ/FBmWlTOjetslLahYuDZeS67L4O2EbRHnipqCFxWgr36gUK9oH3j8 BrE4uRWvKquiu2M9YwHSqPs4Sk2R1+OPThocBRa8vzOIw5lfgidJAHgXch+jAcDlmE4n cyvQ== X-Gm-Message-State: APjAAAWOO/wjoSnwqNlvSzsZke9b2UPRMq72ID6YqD033SXjz/tH4uAv viSrjRNhBszPMTJpDeitbIE= X-Google-Smtp-Source: APXvYqyVj5qZefSZGfPKi3P32zmFVu189hDlbHw3dnUmnV1CA+XAtwJsHxv93CsdhAUIX9R2SszK7Q== X-Received: by 2002:a7b:cbd6:: with SMTP id n22mr4295542wmi.118.1582796136319; Thu, 27 Feb 2020 01:35:36 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v8sm7054595wrw.2.2020.02.27.01.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:35 -0800 (PST) From: luca.boccassi@gmail.com To: Shiri Kuzin Cc: Sylvain Rodon , Matan Azrad , dpdk stable Date: Thu, 27 Feb 2020 09:33:54 +0000 Message-Id: <20200227093402.17690-34-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix running without Rx queue' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/29/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 b59c15173db24a5db8787f27af12bf3d6cb8bd39 Mon Sep 17 00:00:00 2001 From: Shiri Kuzin Date: Thu, 20 Feb 2020 14:42:26 +0000 Subject: [PATCH] net/mlx5: fix running without Rx queue [ upstream commit 606d690548983ef69560c20b21c1431d4ebc0ca2 ] When running mlx5_dev_start in mlx5_ethdev the function calls mlx5_dev_configure_rss_reta in order to configure the rxq's. Before mlx5_dev_configure_rss_reta there isn't a check whether there are rxq's and if rxq's are 0 the function fails. For example, this command: /build/app/test-pmd/testpmd -n 4 -w 0000:08:00.0,rx_vec_en=0 -- --burst=64 --mbcache=512 -i --nb-cores=27 --txd=2048 --rxd=2048 --vxlan-gpe-port=6081 --mp-alloc=xbuf --rxq 0 --forward-mode=txonly would fail. In order to fix this issue, we should call mlx5_dev_configure_rss_reta only if we have rxq's. Fixes: 63bd16292c3a ("net/mlx5: support RSS on hairpin") Reported-by: Sylvain Rodon Signed-off-by: Shiri Kuzin Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_trigger.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 7e12cd5e8b..e3ea2862a5 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -272,11 +272,13 @@ mlx5_dev_start(struct rte_eth_dev *dev) int ret; DRV_LOG(DEBUG, "port %u starting device", dev->data->port_id); - ret = mlx5_dev_configure_rss_reta(dev); - if (ret) { - DRV_LOG(ERR, "port %u reta config failed: %s", - dev->data->port_id, strerror(rte_errno)); - return -rte_errno; + if (dev->data->nb_rx_queues > 0) { + ret = mlx5_dev_configure_rss_reta(dev); + if (ret) { + DRV_LOG(ERR, "port %u reta config failed: %s", + dev->data->port_id, strerror(rte_errno)); + return -rte_errno; + } } ret = mlx5_txq_start(dev); if (ret) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.914960723 +0000 +++ 0034-net-mlx5-fix-running-without-Rx-queue.patch 2020-02-27 09:31:55.819946489 +0000 @@ -1,8 +1,10 @@ -From 606d690548983ef69560c20b21c1431d4ebc0ca2 Mon Sep 17 00:00:00 2001 +From b59c15173db24a5db8787f27af12bf3d6cb8bd39 Mon Sep 17 00:00:00 2001 From: Shiri Kuzin Date: Thu, 20 Feb 2020 14:42:26 +0000 Subject: [PATCH] net/mlx5: fix running without Rx queue +[ upstream commit 606d690548983ef69560c20b21c1431d4ebc0ca2 ] + When running mlx5_dev_start in mlx5_ethdev the function calls mlx5_dev_configure_rss_reta in order to configure the rxq's. @@ -18,7 +20,6 @@ only if we have rxq's. Fixes: 63bd16292c3a ("net/mlx5: support RSS on hairpin") -Cc: stable@dpdk.org Reported-by: Sylvain Rodon Signed-off-by: Shiri Kuzin @@ -28,13 +29,13 @@ 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c -index be47df529f..571b7a003c 100644 +index 7e12cd5e8b..e3ea2862a5 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c -@@ -280,11 +280,13 @@ mlx5_dev_start(struct rte_eth_dev *dev) - rte_net_mlx5_dynf_inline_mask = 1UL << fine_inline; - else - rte_net_mlx5_dynf_inline_mask = 0; +@@ -272,11 +272,13 @@ mlx5_dev_start(struct rte_eth_dev *dev) + int ret; + + DRV_LOG(DEBUG, "port %u starting device", dev->data->port_id); - ret = mlx5_dev_configure_rss_reta(dev); - if (ret) { - DRV_LOG(ERR, "port %u reta config failed: %s",