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 A30B4A04A3 for ; Fri, 5 Jun 2020 20:27:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72A221D515; Fri, 5 Jun 2020 20:27:47 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id C8E611D510 for ; Fri, 5 Jun 2020 20:27:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381665; 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=WPz6jSHwDvTnfybDwkDpAgKy02l/zo8XwFMWNNf5QGk=; b=Tdy5+wWTSlIJ1yQbc7IfTB7gXPriw67CBu80CI2Rq6gvYpP9y6xgtf/2zOV7IOzrE2MGmW V7MwhXQa2227eGm02nBu/BrviRnYpmftpAuKbWXJO397EJBFLF1g4nC8KjPgCr9zn1znwY 0ha9sfn6A7Ktzg4p+DrsMd9DBr3OmiI= 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-221-NbsSPDPZMzqE0aqoPmJiKA-1; Fri, 05 Jun 2020 14:27:42 -0400 X-MC-Unique: NbsSPDPZMzqE0aqoPmJiKA-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 805A318A8220; Fri, 5 Jun 2020 18:27:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DF7F60C47; Fri, 5 Jun 2020 18:27:40 +0000 (UTC) From: Kevin Traynor To: Rasesh Mody Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Jun 2020 19:25:08 +0100 Message-Id: <20200605182525.22483-71-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/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/1804a539faca3fb88608cc3d0b2501dc77a4eac7 Thanks. Kevin. --- >From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Wed, 13 May 2020 21:09:38 -0700 Subject: [PATCH] examples/kni: fix MTU change to setup Tx queue [ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ] This patch adds a fix to setup Tx queue when changing KNI interface MTU. It ensures device can safely start txq post MTU change operation. Fixes: fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API") Signed-off-by: Rasesh Mody Acked-by: Ferruh Yigit --- examples/kni/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/examples/kni/main.c b/examples/kni/main.c index 6c9f46e77e..4fbb860109 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) int ret; uint16_t nb_rxd = NB_RXD; + uint16_t nb_txd = NB_TXD; struct rte_eth_conf conf; struct rte_eth_dev_info dev_info; struct rte_eth_rxconf rxq_conf; + struct rte_eth_txconf txq_conf; if (!rte_eth_dev_is_valid_port(port_id)) { @@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) } - ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, NULL); + ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, &nb_txd); if (ret < 0) rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors " @@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) } + txq_conf = dev_info.default_txconf; + txq_conf.offloads = conf.txmode.offloads; + ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd, + rte_eth_dev_socket_id(port_id), &txq_conf); + if (ret < 0) { + RTE_LOG(ERR, APP, "Fail to setup Tx queue of port %d\n", + port_id); + return ret; + } + /* Restart specific port */ ret = rte_eth_dev_start(port_id); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.713523082 +0100 +++ 0071-examples-kni-fix-MTU-change-to-setup-Tx-queue.patch 2020-06-05 19:20:50.944037769 +0100 @@ -1 +1 @@ -From a26b116749a38db09223cfbb18f4c349f2bbae8e Mon Sep 17 00:00:00 2001 +From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 6b4ab3b5b5..7a927a50c0 100644 +index 6c9f46e77e..4fbb860109 100644 @@ -22 +23 @@ -@@ -775,7 +775,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) @@ -32 +33 @@ -@@ -805,5 +807,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) @@ -39 +40 @@ -@@ -830,4 +832,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)