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 B32F2A0093 for ; Tue, 19 May 2020 15:10:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A9FE81D6F3; Tue, 19 May 2020 15:10:49 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 389C61D6DD for ; Tue, 19 May 2020 15:10:48 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id e1so15860762wrt.5 for ; Tue, 19 May 2020 06:10:48 -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=4D/X8+VCvzA3B+qhyS+CklrnrePRIcOwl2g+T1vxyZc=; b=seXQTjizR10CqBL1z5ncaZkRGa0IlCKoj92qgX1TW+y1XHVQ6ZIG4QAR9pXZxUqN2f tE01d3dTh0x/1ILvSunOXaOzZEqimQ48U3CHNni4ztip6OwHkt3/XMTGu2SXas/Wtq16 ZSNOJ98nB25Y/aVzh7pixGmt+6RbtxHjJhiEKbnGNWFIv2JNX7WS3/7O3OctHn+S/QJb D5TSa+e90s/Prd8neFUVOFwrDY5RgwghpfJIO5UXIfYsnHQtGGt8QD0u2wNMfkbEH+ny Dqt2+5AtJ3Ejlbkn6/SRR1DklkzVKSTox9aiQI8oi9hgzPW6BUKegNbIRKwfeWWFyDOB Ht8w== 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=4D/X8+VCvzA3B+qhyS+CklrnrePRIcOwl2g+T1vxyZc=; b=WAAiGsWjfwBB99LgKcQMv3J11UroI+5Nf8x/kSLp+ZcZykMhF8mhRf6RgpQLIBo1bx wJwpjp5aIiuLiEZEEYsvO79GlWt8SVUn/eNsGjlJlOi4rrquiHnAxDbbpwOOvm3ve5ap E3xqLIt4qIPwthj0Oe+wWnrrbMsqhV9MCfWwPSlW9B+tQzvcHdIILeSW0xwGrIK1gXTD 6aXgc1jZ7Pi4O10mWs9pNzz4ku/OAmAvUVZC+gyzh7XxEfqXioVecGPinI2yKJ/EGU4G ALeizMuwIU7W745K1eqcDDitLXzwBYgGNxqWVbpSITxt84rhdWeWJJclqXy5kuFGRDkS tDOg== X-Gm-Message-State: AOAM533dTjpIAkFp7YdZUslOO1aq9Kt5U1dCjUuK8UB3+41jgKUctxZu OVRO1h4o7mgHWHHFGq8DaDE= X-Google-Smtp-Source: ABdhPJz6oyzFSjvKLQ0wY4qme1PGW3LEOgGmJ7d+NmeB4HultZBHpmsQVV0wuKeiGQyoAzMZISHjEQ== X-Received: by 2002:adf:e783:: with SMTP id n3mr25386042wrm.157.1589893847979; Tue, 19 May 2020 06:10:47 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b7sm3774524wmj.29.2020.05.19.06.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:10:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ferruh Yigit , Stephen Hemminger , dpdk stable Date: Tue, 19 May 2020 14:03:49 +0100 Message-Id: <20200519130549.112823-94-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix mbuf and mem leak during queue release' 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/21/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 2fe4af64f9f3d2c979fde46a7f7ecd81f292d45a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 11:04:25 +0800 Subject: [PATCH] net/tap: fix mbuf and mem leak during queue release [ upstream commit 710aa4279097e9ee5a131b7e0732e5a8ef8bcfc1 ] For the tap PMD, we should release mbufs and iovecs from the Rx queue when closing device. In order to remove duplicated code, rte_pmd_tap_remove() calls tap_dev_close(). Fixes: 0781f5762cfe ("net/tap: support segmented mbufs") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit Acked-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 36 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 6d54c254d7..9c88b9268e 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1020,15 +1020,25 @@ tap_dev_close(struct rte_eth_dev *dev) int i; struct pmd_internals *internals = dev->data->dev_private; struct pmd_process_private *process_private = dev->process_private; + struct rx_queue *rxq; tap_link_set_down(dev); - tap_flow_flush(dev, NULL); - tap_flow_implicit_flush(internals, NULL); + if (internals->nlsk_fd != -1) { + tap_flow_flush(dev, NULL); + tap_flow_implicit_flush(internals, NULL); + tap_nl_final(internals->nlsk_fd); + internals->nlsk_fd = -1; + } for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { if (process_private->rxq_fds[i] != -1) { + rxq = &internals->rxq[i]; close(process_private->rxq_fds[i]); process_private->rxq_fds[i] = -1; + rte_pktmbuf_free(rxq->pool); + rte_free(rxq->iovecs); + rxq->pool = NULL; + rxq->iovecs = NULL; } if (process_private->txq_fds[i] != -1) { close(process_private->txq_fds[i]); @@ -2398,8 +2408,6 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) { struct rte_eth_dev *eth_dev = NULL; struct pmd_internals *internals; - struct pmd_process_private *process_private; - int i; /* find the ethdev entry */ eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev)); @@ -2412,28 +2420,12 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return rte_eth_dev_release_port(eth_dev); + tap_dev_close(eth_dev); + internals = eth_dev->data->dev_private; - process_private = eth_dev->process_private; - TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u", tuntap_types[internals->type], rte_socket_id()); - if (internals->nlsk_fd) { - tap_flow_flush(eth_dev, NULL); - tap_flow_implicit_flush(internals, NULL); - tap_nl_final(internals->nlsk_fd); - } - for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { - if (process_private->rxq_fds[i] != -1) { - close(process_private->rxq_fds[i]); - process_private->rxq_fds[i] = -1; - } - if (process_private->txq_fds[i] != -1) { - close(process_private->txq_fds[i]); - process_private->txq_fds[i] = -1; - } - } - close(internals->ioctl_sock); rte_free(eth_dev->process_private); if (tap_devices_count == 1) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.307562558 +0100 +++ 0094-net-tap-fix-mbuf-and-mem-leak-during-queue-release.patch 2020-05-19 14:04:44.304649968 +0100 @@ -1,14 +1,15 @@ -From 710aa4279097e9ee5a131b7e0732e5a8ef8bcfc1 Mon Sep 17 00:00:00 2001 +From 2fe4af64f9f3d2c979fde46a7f7ecd81f292d45a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 11:04:25 +0800 Subject: [PATCH] net/tap: fix mbuf and mem leak during queue release +[ upstream commit 710aa4279097e9ee5a131b7e0732e5a8ef8bcfc1 ] + For the tap PMD, we should release mbufs and iovecs from the Rx queue when closing device. In order to remove duplicated code, rte_pmd_tap_remove() calls tap_dev_close(). Fixes: 0781f5762cfe ("net/tap: support segmented mbufs") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit