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 DDF82A0C41 for ; Tue, 30 Nov 2021 17:37:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D54DA4118F; Tue, 30 Nov 2021 17:37:52 +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 B18DA410F7 for ; Tue, 30 Nov 2021 17:37:51 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 95A143F1ED for ; Tue, 30 Nov 2021 16:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290271; bh=Tg0h4SQrysvf71RtiXUOnN2uASRMgEX1I8xj8ztMHh0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cITYV9pxqVwHttiDflj9+Z39r3XhjFFRs9h2IWfj4/4dPqwXbUEiFpIDT0V88LJhs SzVIcwx/S0GLqeC/rodey+9w6LnRIMsZ/KYv62m6LYvdr2SNx3kSjLDUE/QwlJAsFv ykcIxVIsfwR4+zn2nv1HUCWKYgTl1WEmXCm4rMHTHb0BlkgEUOy7xccVcLRybSYpC8 RGAo7dEcVK9k12UNA5XkSojjfc01WvtPtJVPCUKAVYvc9d3hzfBnOZTDNR/39hBMxD I89DOMKFkqmOkLKNljTrVgouDUgd4gjsPrBpBiCBGaZdD3c4AdiFIRhM0PaXrM1yhm c1afGtou4vXTA== Received: by mail-ed1-f72.google.com with SMTP id w4-20020aa7cb44000000b003e7c0f7cfffso17487354edt.2 for ; Tue, 30 Nov 2021 08:37:51 -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=Tg0h4SQrysvf71RtiXUOnN2uASRMgEX1I8xj8ztMHh0=; b=NvcwSC8NEXApdMvob4H0XTXcCzpRatb/fbrKrrpQ1sebsWX+CYRPLCeWV89UYPWVuq sZA/tDH3ZPk7pEnZcAqqeoyso91aHWl3zAVM0+kqZMK4d9EqsT872sHIxBBrMntZX4z8 bfp4FvW4M+qnsdGiqwhW1yaM0+CvhfqTMulvIILZ2A0IgoDMp71ZMV6f3aWjnd+ZXn1j qM1I1I16N8ZI4jYgGmTEuqf7dWPSRm+6F/kNIEQA3fs6wMGoZPLmkKtvfBpgOuZshGNj cs6BVUs/GlWb7u1rARTwnoX2OwsgzpA0decCda+VPE9ypiTTeD3OfHQsr2QPJRKrUG6t w6WQ== X-Gm-Message-State: AOAM533OuGV86UBaCfapUaYGjDjMQmVrSOSeppW+KXIeQq2U2jGTLmsl YOCSas/dCVG0+bdz30YD+SiM2aqwEGBlO38CbD/YAqFt2M+T/72EZmFJ6qSKDI9CT/4H1IHqwI7 0vSH6Q7mxeBzeSatxIeURL5su X-Received: by 2002:a17:906:9253:: with SMTP id c19mr196131ejx.63.1638290270871; Tue, 30 Nov 2021 08:37:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkhWCSk+iKBI6oO5snWvgMhmeqcdRMT3+2jLogPgxDCLZsSa/Ox3eqJFg90RfAR5L2OeS4CA== X-Received: by 2002:a17:906:9253:: with SMTP id c19mr196115ejx.63.1638290270670; Tue, 30 Nov 2021 08:37:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:50 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix mbuf leak' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:56 +0100 Message-Id: <20211130163605.2460997-32-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/ba9d67f359f0b92bfb409e0fa4cb33276ca3d395 Thanks. Christian Ehrhardt --- >From ba9d67f359f0b92bfb409e0fa4cb33276ca3d395 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Mon, 23 Aug 2021 09:50:34 +0800 Subject: [PATCH] net/i40e: fix mbuf leak [ upstream commit 4b458675d3df13d1a35db959fe97a04a132788b2 ] 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: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 6cba729639..0d5c721b52 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2487,6 +2487,10 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq) #endif /* RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC */ 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; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.935682225 +0100 +++ 0032-net-i40e-fix-mbuf-leak.patch 2021-11-30 16:50:05.622872298 +0100 @@ -1 +1 @@ -From 4b458675d3df13d1a35db959fe97a04a132788b2 Mon Sep 17 00:00:00 2001 +From ba9d67f359f0b92bfb409e0fa4cb33276ca3d395 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b458675d3df13d1a35db959fe97a04a132788b2 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 8329cbdd4e..3eb82578b0 100644 +index 6cba729639..0d5c721b52 100644 @@ -26 +27 @@ -@@ -2590,6 +2590,10 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq) +@@ -2487,6 +2487,10 @@ i40e_reset_rx_queue(struct i40e_rx_queue *rxq)