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 25D7FA0C41 for ; Tue, 30 Nov 2021 17:37:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FC6B410F7; Tue, 30 Nov 2021 17:37:55 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id CC9E0410F7 for ; Tue, 30 Nov 2021 17:37:53 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A88ED40035 for ; Tue, 30 Nov 2021 16:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290273; bh=oHAR6bXRyY/fKl3YvW4DrEcvBFvdFSSlzBnhHD2NoRo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X8y8PGSCJ9L5UUEslY1mP7qeCcPbXRHn2t37eRyDYlNLN5gJwvmnZRepnpGXWzrKJ H5Kz99dbdnruYaXWFCLW5tdFTiQZFNAMUgu4G+DUBG7Q1XJaJ46VceH6kNlTgwyWDw WXXiuhDWOlCrE7Q7+f2zDXE/TnVJDzYUXrgF2iDe2RLzVTT978T7MmvGKgJG2BRXyM /r24ai6jnXzy52Zd/Fjxt8qHuHjiOOqNgS2vYSH2DpDSvOqK6xbYd4oqGOYvxtYJEB EVH5sDJwHHuU/aCUEwqoZDgF/ahvtkPbTf7vyFiGWOK+M0dJ/0vkIsnrpPiN5YPHDI guczMNhB3bALQ== Received: by mail-ed1-f70.google.com with SMTP id bx28-20020a0564020b5c00b003e7c42443dbso17401169edb.15 for ; Tue, 30 Nov 2021 08:37:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oHAR6bXRyY/fKl3YvW4DrEcvBFvdFSSlzBnhHD2NoRo=; b=dTw3P455qQpCk/Dla17lUqjgu9twe15o7ffvxGGyu/88y2Mn7/qaPmDXWD2NKYanMo rH55Jw7+czu8hesuixZCn+f3DVlvcmbflLtVhzYMJcnkSHCfoucr9yHW36PhmQcA1J/w 9UKjBavBVFDQIsIcTBSM75K+YPEZMXdIM8wf8oq8fr8fWRZhme8vhgepOS27BvNtsiXp haLzqkqoHr/GGiOk/b0bQD+QlwY4Mtu1efve47+fDsZiOTAGmJG7jpKi2DLI1FHrKkmq yq3Gq91G2FIFmF3eDnSr23yM3fUR5uPCsSWXP8XvQpTIqQQaCyPAzNZfoY5GR2+0/Mq1 3CaQ== X-Gm-Message-State: AOAM530XlJhJpeeHCpy9CTjEiMyr5ivhIK2+ASqV4k3IHgRIXcS8+Bm/ CgLQSNC4Qn4zzYnxLCVcNkD5r+k/eZtaIBudjB6JGzBsIaREnoxAlyan6/5PhV6/yu/pIpIynr9 ZLHwEWPfJ9HmJvbx4grjFNRsX X-Received: by 2002:a17:906:58c9:: with SMTP id e9mr178508ejs.181.1638290273073; Tue, 30 Nov 2021 08:37:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzPzE3L+PM7I6XNus/dlrMwZZ6M+fGdYulE731OsiwmGVZMcMhhDdfCEOG/QnGn6yL4C0/Ig== X-Received: by 2002:a17:906:58c9:: with SMTP id e9mr178488ejs.181.1638290272929; Tue, 30 Nov 2021 08:37:52 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id z1sm11621883edq.54.2021.11.30.08.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:52 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix mbuf leak' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:58 +0100 Message-Id: <20211130163605.2460997-34-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a0422d6ce7d4043f4ea30e63e5df38abd7cba7dc Thanks. Christian Ehrhardt --- >From a0422d6ce7d4043f4ea30e63e5df38abd7cba7dc Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Sat, 11 Sep 2021 09:47:09 +0800 Subject: [PATCH] net/iavf: fix mbuf leak [ upstream commit a38df1edd6324f922ca46a043e87b2489f7bc17e ] A local test found that repeated port start and stop operations during the continuous SSE vector bufflist receiving process will cause the mbuf resource to run out. The final positioning is when the port is stopped, the mbuf of the pkt_first_seg pointer is not released. Resources leak. The patch scheme is to judge whether the pointer is empty when the port is stopped, and release the corresponding mbuf if it is not empty. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 17468e4ca0..167f7e53b4 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -165,6 +165,10 @@ reset_rx_queue(struct iavf_rx_queue *rxq) rxq->rx_tail = 0; rxq->nb_rx_hold = 0; + + if (rxq->pkt_first_seg != NULL) + rte_pktmbuf_free(rxq->pkt_first_seg); + rxq->pkt_first_seg = NULL; rxq->pkt_last_seg = NULL; rxq->rxrearm_nb = 0; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.059686882 +0100 +++ 0034-net-iavf-fix-mbuf-leak.patch 2021-11-30 16:50:05.642872444 +0100 @@ -1 +1 @@ -From a38df1edd6324f922ca46a043e87b2489f7bc17e Mon Sep 17 00:00:00 2001 +From a0422d6ce7d4043f4ea30e63e5df38abd7cba7dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a38df1edd6324f922ca46a043e87b2489f7bc17e ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e33fe4576b..7240e70f9e 100644 +index 17468e4ca0..167f7e53b4 100644 @@ -26 +27 @@ -@@ -225,6 +225,10 @@ reset_rx_queue(struct iavf_rx_queue *rxq) +@@ -165,6 +165,10 @@ reset_rx_queue(struct iavf_rx_queue *rxq)