From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 03F785F2F for ; Fri, 14 Dec 2018 18:52:53 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A85D3C52; Fri, 14 Dec 2018 17:52:52 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5764D60BF7; Fri, 14 Dec 2018 17:52:51 +0000 (UTC) From: Kevin Traynor To: Yaroslav Brustinov Cc: Ferruh Yigit , dpdk stable Date: Fri, 14 Dec 2018 17:51:56 +0000 Message-Id: <20181214175203.24908-12-ktraynor@redhat.com> In-Reply-To: <20181214175203.24908-1-ktraynor@redhat.com> References: <20181214175203.24908-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 14 Dec 2018 17:52:52 +0000 (UTC) Subject: [dpdk-stable] patch 'ethdev: fix typo in queue setup error log' has been queued to stable release 18.08.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: , X-List-Received-Date: Fri, 14 Dec 2018 17:52:53 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 12/18/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From b3ef805281865b12f8abdb49176b2021eaa387a0 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Mon, 3 Dec 2018 11:54:04 +0200 Subject: [PATCH] ethdev: fix typo in queue setup error log [ upstream commit b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f ] '=' should be '>=" for '[rt]x_desc_lim.nb_min' check. Fixes: 386c993e95f1 ("ethdev: add a missing sanity check for Tx queue setup") Fixes: 80a1deb4c77a ("ethdev: add API to retrieve queue information") Signed-off-by: Yaroslav Brustinov Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 84e868c31..e1d3c5215 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1520,5 +1520,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, RTE_ETHDEV_LOG(ERR, - "Invalid value for nb_rx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n", + "Invalid value for nb_rx_desc(=%hu), should be: <= %hu, >= %hu, and a product of %hu\n", nb_rx_desc, dev_info.rx_desc_lim.nb_max, dev_info.rx_desc_lim.nb_min, @@ -1624,5 +1624,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, nb_tx_desc % dev_info.tx_desc_lim.nb_align != 0) { RTE_ETHDEV_LOG(ERR, - "Invalid value for nb_tx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n", + "Invalid value for nb_tx_desc(=%hu), should be: <= %hu, >= %hu, and a product of %hu\n", nb_tx_desc, dev_info.tx_desc_lim.nb_max, dev_info.tx_desc_lim.nb_min, -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 17:49:48.065148623 +0000 +++ 0012-ethdev-fix-typo-in-queue-setup-error-log.patch 2018-12-14 17:49:47.000000000 +0000 @@ -1,13 +1,14 @@ -From b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f Mon Sep 17 00:00:00 2001 +From b3ef805281865b12f8abdb49176b2021eaa387a0 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Mon, 3 Dec 2018 11:54:04 +0200 Subject: [PATCH] ethdev: fix typo in queue setup error log +[ upstream commit b4b896fcfe9bc9f079698442697aa8e1d4a6dc3f ] + '=' should be '>=" for '[rt]x_desc_lim.nb_min' check. Fixes: 386c993e95f1 ("ethdev: add a missing sanity check for Tx queue setup") Fixes: 80a1deb4c77a ("ethdev: add API to retrieve queue information") -Cc: stable@dpdk.org Signed-off-by: Yaroslav Brustinov Reviewed-by: Ferruh Yigit @@ -16,17 +17,17 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c -index 5f858174b..9d5107dce 100644 +index 84e868c31..e1d3c5215 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c -@@ -1595,5 +1595,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, +@@ -1520,5 +1520,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, RTE_ETHDEV_LOG(ERR, - "Invalid value for nb_rx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n", + "Invalid value for nb_rx_desc(=%hu), should be: <= %hu, >= %hu, and a product of %hu\n", nb_rx_desc, dev_info.rx_desc_lim.nb_max, dev_info.rx_desc_lim.nb_min, -@@ -1699,5 +1699,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, +@@ -1624,5 +1624,5 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, nb_tx_desc % dev_info.tx_desc_lim.nb_align != 0) { RTE_ETHDEV_LOG(ERR, - "Invalid value for nb_tx_desc(=%hu), should be: <= %hu, = %hu, and a product of %hu\n",