From patchwork Tue Apr 30 03:02:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolong Ye X-Patchwork-Id: 53159 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 437475F44; Tue, 30 Apr 2019 05:09:05 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id DA40C5F44 for ; Tue, 30 Apr 2019 05:09:02 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 20:09:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,412,1549958400"; d="scan'208";a="342012034" Received: from yexl-server.sh.intel.com ([10.67.110.206]) by fmsmga006.fm.intel.com with ESMTP; 29 Apr 2019 20:09:00 -0700 From: Xiaolong Ye To: dev@dpdk.org, Ferruh Yigit , Thomas Monjalon Cc: Xiaolong Ye Date: Tue, 30 Apr 2019 11:02:27 +0800 Message-Id: <20190430030227.50273-1-xiaolong.ye@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2] net/af_xdp: remove resources when port is closed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since 18.11, it is suggested that driver should release all its private resources at the dev_close routine. So all resources previously released in remove routine are now released at the dev_close routine, and the dev_close routine will be called in driver remove routine in order to support removing a device without closing its ports. Above behavior changes are supported by setting RTE_ETH_DEV_CLOSE_REMOVE flag during probe stage. Also as af_xdp pmd doesn't allocate MAC addresses dynamically, it needs to be set as NULL, so it won't be released by rte_eth_dev_release_port(), otherwise, there would be "EAL: Error: Invalid memory" error. Signed-off-by: Xiaolong Ye --- V2: merge previous 2 patches into 1 patch since the first one would introduce one error (second patch is the fix), it makes more sense to squash the second into the first one. drivers/net/af_xdp/rte_eth_af_xdp.c | 47 +++++++++++++++-------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index acf9ad605..f659c0496 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -426,6 +426,19 @@ remove_xdp_program(struct pmd_internals *internals) XDP_FLAGS_UPDATE_IF_NOEXIST); } +static void +xdp_umem_destroy(struct xsk_umem_info *umem) +{ + rte_memzone_free(umem->mz); + umem->mz = NULL; + + rte_ring_free(umem->buf_ring); + umem->buf_ring = NULL; + + rte_free(umem); + umem = NULL; +} + static void eth_dev_close(struct rte_eth_dev *dev) { @@ -444,6 +457,15 @@ eth_dev_close(struct rte_eth_dev *dev) } (void)xsk_umem__delete(internals->umem->umem); + + /* + * MAC is not allocated dynamically, setting it to NULL would prevent + * from releasing it in rte_eth_dev_release_port. + */ + dev->data->mac_addrs = NULL; + + xdp_umem_destroy(internals->umem); + remove_xdp_program(internals); } @@ -459,19 +481,6 @@ eth_link_update(struct rte_eth_dev *dev __rte_unused, return 0; } -static void -xdp_umem_destroy(struct xsk_umem_info *umem) -{ - rte_memzone_free(umem->mz); - umem->mz = NULL; - - rte_ring_free(umem->buf_ring); - umem->buf_ring = NULL; - - rte_free(umem); - umem = NULL; -} - static struct xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals) { @@ -856,6 +865,8 @@ init_internals(struct rte_vdev_device *dev, eth_dev->dev_ops = &ops; eth_dev->rx_pkt_burst = eth_af_xdp_rx; eth_dev->tx_pkt_burst = eth_af_xdp_tx; + /* Let rte_eth_dev_close() release the port resources. */ + eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; return eth_dev; @@ -923,7 +934,6 @@ static int rte_pmd_af_xdp_remove(struct rte_vdev_device *dev) { struct rte_eth_dev *eth_dev = NULL; - struct pmd_internals *internals; AF_XDP_LOG(INFO, "Removing AF_XDP ethdev on numa socket %u\n", rte_socket_id()); @@ -936,14 +946,7 @@ rte_pmd_af_xdp_remove(struct rte_vdev_device *dev) if (eth_dev == NULL) return -1; - internals = eth_dev->data->dev_private; - - rte_ring_free(internals->umem->buf_ring); - rte_memzone_free(internals->umem->mz); - rte_free(internals->umem); - - rte_eth_dev_release_port(eth_dev); - + eth_dev_close(eth_dev); return 0; }