From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ABDF5A0350 for ; Mon, 21 Feb 2022 16:39:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A529C410F2; Mon, 21 Feb 2022 16:39:56 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4E7834013F for ; Mon, 21 Feb 2022 16:39:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457994; 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=pmrm2yDVmOXFxRCGIuG5eOs2/UE0C1v6JORskNCI4Zc=; b=fyj76XS2SmIFrBQliV0w2C/CO4WiPmDE2NdS904fnVNmE5cQpp52PcC4e72YqFdG59JAbL C5yLhLdnqQTast0jUCjDSIAKVGqkATj1pcPINgiiGWHXToDFKCLOnnj6qwYtwEtfj8BppM A3TP/QyUeiYLubYqm6eGM04CrqWGGFE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-j-qx07wQN9mDK36ib_Vi8Q-1; Mon, 21 Feb 2022 10:39:51 -0500 X-MC-Unique: j-qx07wQN9mDK36ib_Vi8Q-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 A371D1846088; Mon, 21 Feb 2022 15:39:50 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEE907E2EF; Mon, 21 Feb 2022 15:39:49 +0000 (UTC) From: Kevin Traynor To: Heinrich Kuhn Cc: Simon Horman , dpdk stable Subject: patch 'net/nfp: free HW ring memzone on queue release' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:54 +0000 Message-Id: <20220221153625.152324-105-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9d6db3c3ada99139dc50a8cf225123c11dd9f433 Thanks. Kevin --- >From 9d6db3c3ada99139dc50a8cf225123c11dd9f433 Mon Sep 17 00:00:00 2001 From: Heinrich Kuhn Date: Wed, 19 Jan 2022 13:48:00 +0200 Subject: [PATCH] net/nfp: free HW ring memzone on queue release [ upstream commit 15174c40b70dfa89c1d94ff93ae756fae8d471bc ] During Rx/Tx queue setup, memory is reserved for the hardware rings. This memory zone should subsequently be freed in the queue release logic. This commit also adds a call to the release logic in the dev_close() callback so that the ring memzone may be freed during port close too. Fixes: b812daadad0d ("nfp: add Rx and Tx") Signed-off-by: Heinrich Kuhn Signed-off-by: Simon Horman --- drivers/net/nfp/nfp_ethdev.c | 2 ++ drivers/net/nfp/nfp_ethdev_vf.c | 2 ++ drivers/net/nfp/nfp_rxtx.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 8e81cc498f..9166f65da3 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -303,4 +303,5 @@ nfp_net_close(struct rte_eth_dev *dev) this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); + nfp_net_tx_queue_release(dev, i); } @@ -308,4 +309,5 @@ nfp_net_close(struct rte_eth_dev *dev) this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); + nfp_net_rx_queue_release(dev, i); } diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 303ef72b1b..0034d68ea6 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -220,4 +220,5 @@ nfp_netvf_close(struct rte_eth_dev *dev) this_tx_q = (struct nfp_net_txq *)dev->data->tx_queues[i]; nfp_net_reset_tx_queue(this_tx_q); + nfp_net_tx_queue_release(dev, i); } @@ -225,4 +226,5 @@ nfp_netvf_close(struct rte_eth_dev *dev) this_rx_q = (struct nfp_net_rxq *)dev->data->rx_queues[i]; nfp_net_reset_rx_queue(this_rx_q); + nfp_net_rx_queue_release(dev, i); } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 0fe1415596..335a90b2c9 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -471,4 +471,5 @@ nfp_net_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx) if (rxq) { nfp_net_rx_queue_release_mbufs(rxq); + rte_eth_dma_zone_free(dev, "rx_ring", queue_idx); rte_free(rxq->rxbufs); rte_free(rxq); @@ -661,4 +662,5 @@ nfp_net_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx) if (txq) { nfp_net_tx_queue_release_mbufs(txq); + rte_eth_dma_zone_free(dev, "tx_ring", queue_idx); rte_free(txq->txbufs); rte_free(txq); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.890309100 +0000 +++ 0105-net-nfp-free-HW-ring-memzone-on-queue-release.patch 2022-02-21 15:22:44.212704398 +0000 @@ -1 +1 @@ -From 15174c40b70dfa89c1d94ff93ae756fae8d471bc Mon Sep 17 00:00:00 2001 +From 9d6db3c3ada99139dc50a8cf225123c11dd9f433 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 15174c40b70dfa89c1d94ff93ae756fae8d471bc ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org