From: Kevin Traynor <ktraynor@redhat.com> To: Rasesh Mody <rmody@marvell.com> Cc: Igor Russkikh <irusskikh@marvell.com>, dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'net/qede: fix port reconfiguration' has been queued to LTS release 18.11.9 Date: Fri, 5 Jun 2020 19:24:57 +0100 Message-ID: <20200605182525.22483-60-ktraynor@redhat.com> (raw) In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> 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/8cd93f836bec14d0df67c59ede1dd4639a7ad833 Thanks. Kevin. --- From 8cd93f836bec14d0df67c59ede1dd4639a7ad833 Mon Sep 17 00:00:00 2001 From: Rasesh Mody <rmody@marvell.com> Date: Thu, 14 May 2020 23:34:19 -0700 Subject: [PATCH] net/qede: fix port reconfiguration [ upstream commit 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d ] This patch fixes deallocation of all fastpath resources unconditionally, when re-configuring the device. When re-allocating resources PMD depends on application to explicitly setup the Rx/Tx queue. Deallocation of all the resources is only required if the Rx/Tx queue configuration changes. For other scenarios like KNI MTU change we'd keep existing configuration. Fixes: 8de0c4201926 ("net/qede: fix odd number of queues usage in 100G mode") Fixes: dd28bc8c6ef4 ("net/qede: fix VF port creation sequence") Signed-off-by: Rasesh Mody <rmody@marvell.com> Signed-off-by: Igor Russkikh <irusskikh@marvell.com> --- drivers/net/qede/qede_ethdev.c | 19 +++++++++++++------ drivers/net/qede/qede_rxtx.c | 4 +++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 340c35a1be..b4a266444b 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1174,4 +1174,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); struct rte_eth_rxmode *rxmode = ð_dev->data->dev_conf.rxmode; + uint8_t num_rxqs; + uint8_t num_txqs; int ret; @@ -1203,10 +1205,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) return -ENOTSUP; - qede_dealloc_fp_resc(eth_dev); - qdev->num_tx_queues = eth_dev->data->nb_tx_queues * edev->num_hwfns; - qdev->num_rx_queues = eth_dev->data->nb_rx_queues * edev->num_hwfns; - - if (qede_alloc_fp_resc(qdev)) - return -ENOMEM; + /* Allocate/reallocate fastpath resources only for new queue config */ + num_txqs = eth_dev->data->nb_tx_queues * edev->num_hwfns; + num_rxqs = eth_dev->data->nb_rx_queues * edev->num_hwfns; + if (qdev->num_tx_queues != num_txqs || + qdev->num_rx_queues != num_rxqs) { + qede_dealloc_fp_resc(eth_dev); + qdev->num_tx_queues = num_txqs; + qdev->num_rx_queues = num_rxqs; + if (qede_alloc_fp_resc(qdev)) + return -ENOMEM; + } /* If jumbo enabled adjust MTU */ diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 52ebc8b8b3..a72c9aa333 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -594,5 +594,5 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info, int qede_alloc_fp_resc(struct qede_dev *qdev) { - struct ecore_dev *edev = &qdev->edev; + struct ecore_dev *edev = QEDE_INIT_EDEV(qdev); struct qede_fastpath *fp; uint32_t num_sbs; @@ -600,4 +600,6 @@ int qede_alloc_fp_resc(struct qede_dev *qdev) int i; + PMD_INIT_FUNC_TRACE(edev); + if (IS_VF(edev)) ecore_vf_get_num_sbs(ECORE_LEADING_HWFN(edev), &num_sbs); -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.096647251 +0100 +++ 0060-net-qede-fix-port-reconfiguration.patch 2020-06-05 19:20:50.885039109 +0100 @@ -1 +1 @@ -From 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d Mon Sep 17 00:00:00 2001 +From 8cd93f836bec14d0df67c59ede1dd4639a7ad833 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index d3d916e81a..c4f8f12589 100644 +index 340c35a1be..b4a266444b 100644 @@ -29 +30 @@ -@@ -1274,4 +1274,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) +@@ -1174,4 +1174,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) @@ -36 +37 @@ -@@ -1306,10 +1308,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) +@@ -1203,10 +1205,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev) @@ -59 +60 @@ -index b81788ca47..9878ba50ea 100644 +index 52ebc8b8b3..a72c9aa333 100644
next prev parent reply other threads:[~2020-06-05 18:27 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-05 18:23 [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' " Kevin Traynor 2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix typo in endian conversion macros' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'doc: add i40e limitation for flow director' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flush of flow director filter' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: fix peer close check' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix memory leak for thread' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix RSS enablement' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix race condition for MT unsafe service' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix identification of service running on other lcore' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'service: remove rte prefix from static functions' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'remove references to private PCI probe function' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'mem: fix overflow on allocation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples/eventdev: fix crash on exit' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bbdev: fix doxygen comments' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/failsafe: fix fd leak' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix statistics after reset' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/netvsc: fix comment spelling' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/vmbus: " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/tap: fix crash in flow destroy' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix FW version query' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/ring: fix device pointer on allocation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx4: fix drop queue error handling' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app: remove extra new line after link duplex' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'examples: " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix C++17 compilation' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'doc: fix multicast filter feature announcement' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix link state configuration' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/vmxnet3: handle bad host framing' " Kevin Traynor 2020-06-05 18:24 ` Kevin Traynor [this message] 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix error log for command timeout' " Kevin Traynor 2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'app/testpmd: fix DCB set' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe/base: update copyright' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e/base: " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'pci: accept 32-bit domain numbers' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'pci: reject negative values in PCI id' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'kvargs: fix strcmp helper documentation' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'fix same typo in multiple places' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix wild pointer' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix queue related exception handling' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'vhost: fix zero-copy server mode' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' " Kevin Traynor 2020-06-05 22:46 ` Thomas Monjalon 2020-06-10 14:48 ` Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix setting L2TAG' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/iavf: " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix crash during MTU set' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: add NASM installation steps' " Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix typo in contributors guide' " Kevin Traynor 2020-06-05 18:25 ` Kevin Traynor 2020-06-05 18:25 ` [dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' " Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200605182525.22483-60-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=irusskikh@marvell.com \ --cc=rmody@marvell.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git