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 2C306A0093 for ; Fri, 22 May 2020 11:42:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 213C91D945; Fri, 22 May 2020 11:42:26 +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 7C1031D96F for ; Fri, 22 May 2020 11:42:23 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id l17so9540344wrr.4 for ; Fri, 22 May 2020 02:42:23 -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=64wkqa7jRTJluBE4X4hsFtrgZbhVFLvKSwCZMxVUtTc=; b=a2VfL6FeSEVS6LhFYjaVbxisKMH9tWk5eF5lz923IggAXP7DVQJz08kz5pSbAHBlmr UX4mEsusk4Fo6xtS8fBRo1M3TcmkjAsiMw09V/xUCylrApYJIf1F8Z3fv+OXhRPF2yaV sA7i8U1F3k9t2Ho5IoYqK2u3IDoJ6+qzVgzksQKBje8YYVbGrZtGqoKxxPdAG1dZmvmt LaUnOTGYah/0i8loggREQQHj6Lpm203lZjLiJF0Q/zoDiDtkioMI07qD+RqtjCI0BUyI g8WYe0MSLNTPzDDch3MpxAnk74B02xdVw5M6gmsuKYm+FJdpF06jjvjzevvrd1SbVwu1 mdOA== 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=64wkqa7jRTJluBE4X4hsFtrgZbhVFLvKSwCZMxVUtTc=; b=KDDLA/yuqZ8BcXq97AiSmhGpyrcCUBLeGi2JHNR7uh0VXlYEplmfFRhZdjrp68s3ot HZirZyLZfAxkvTHXHEJ7yemyq4FKDAbBlhZVKuzTc8rIIoE1pr6z1Jpn2UW+pyNaPV+0 gxyS6YiuDnUt2QZ8NjUmnV876znpe/MnZlL0VpwmIyQDqqJvMkNBYliI7zBgpfnWlUdT i0xBunIR1ZVFcp6L9vAkHjXHrE/m0Mi0fCE2Ed5ZeO7qht2hH9aui1vi5tfkPTpAOadF hXxlFTrUZX1/9k45b3mCUHA1cuvNZCMhXB89AZPWDtp3OJ65Tg+KeUVbFhbxIL9JbTp7 JxHw== X-Gm-Message-State: AOAM533RgBpsotd7BCIIDvj9pdbPPvJ+pusx7WgRmL4g1cFdWvAGvZ9B 2qaLWBKJojNlk/ugdDwSKINC5ru3wvc6Lg== X-Google-Smtp-Source: ABdhPJz4CrPA/q9L1eDvmbQpyoRr2lqCrtxPue7sCalYuoWW94dJqFXL7vECiS0y1xd/t19YWv2qdg== X-Received: by 2002:adf:eac8:: with SMTP id o8mr2649937wrn.268.1590140543248; Fri, 22 May 2020 02:42:23 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q1sm5288059wmc.12.2020.05.22.02.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:42:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Rasesh Mody Cc: Ferruh Yigit , dpdk stable Date: Fri, 22 May 2020 10:40:18 +0100 Message-Id: <20200522094022.1025696-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/24/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 3af38347316ba0ff4312ecf52601998e6214f0ca 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 f867f5fc9b..b2866238fd 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -770,9 +770,11 @@ 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)) { RTE_LOG(ERR, APP, "Invalid port id %d\n", port_id); @@ -800,7 +802,7 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) return ret; } - 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 " "for port%u (%d)\n", (unsigned int)port_id, @@ -825,6 +827,16 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) return ret; } + 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); if (ret < 0) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:40.744721585 +0100 +++ 0039-examples-kni-fix-MTU-change-to-setup-Tx-queue.patch 2020-05-22 10:37:39.248414865 +0100 @@ -1,13 +1,14 @@ -From a26b116749a38db09223cfbb18f4c349f2bbae8e Mon Sep 17 00:00:00 2001 +From 3af38347316ba0ff4312ecf52601998e6214f0ca 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") -Cc: stable@dpdk.org Signed-off-by: Rasesh Mody Acked-by: Ferruh Yigit @@ -16,10 +17,10 @@ 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/examples/kni/main.c b/examples/kni/main.c -index 6b4ab3b5b5..7a927a50c0 100644 +index f867f5fc9b..b2866238fd 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c -@@ -774,9 +774,11 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -770,9 +770,11 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) { int ret; uint16_t nb_rxd = NB_RXD; @@ -31,7 +32,7 @@ if (!rte_eth_dev_is_valid_port(port_id)) { RTE_LOG(ERR, APP, "Invalid port id %d\n", port_id); -@@ -804,7 +806,7 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -800,7 +802,7 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) return ret; } @@ -40,7 +41,7 @@ if (ret < 0) rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors " "for port%u (%d)\n", (unsigned int)port_id, -@@ -829,6 +831,16 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) +@@ -825,6 +827,16 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) return ret; }