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 49B0CA04DD for ; Wed, 28 Oct 2020 11:50:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3F680C9FA; Wed, 28 Oct 2020 11:50:36 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by dpdk.org (Postfix) with ESMTP id 330774C90 for ; Wed, 28 Oct 2020 11:50:34 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id w23so4091787wmi.4 for ; Wed, 28 Oct 2020 03:50:34 -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=BO0LB28MaRb1c7Q4QbN1U2edZEBl4z5uQrwQ/fUg5Vw=; b=Xii9uP9F8CcqYQy7FojS+iaez0xzzJX11gPYYBBVC8WcQLp7AhD08sCCRZBYMaLLuB 39kUE50GtrFlviVDeW359R4lb0mSWeoTTFa8cbBXAo7FDOvsTDFRyOOd8LVjZOAiNlSw 2v/PSpbduB4tuUsUWoWaBCKsxMVdpCa+Fry+awcaDFa5k7y5SrSRvbrKSeCahmOV3c18 2ZMRzBib7ZIRDrtr0g+jCQSph0mbnebaX4fU7pMD6152qJW4MG+k9qE1cz3AI+qUXhSt I3IIyrxwyTxQnGyeyUc3udz0E4YXXqvhpdRgA+jw3OdeYhNuzHz87SIre37SnwQW8bT6 2fUg== 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=BO0LB28MaRb1c7Q4QbN1U2edZEBl4z5uQrwQ/fUg5Vw=; b=FmvmEcMjgZT/LeRDZsHn3BnDI2k2oAWbhliCPiiT9S4UUe4Wpb/wQxyelpuKVL3gQc RY1bF7TCQGbhtgwX13ULr3oDbc7mWrWjxE5LjPi5P92butG7FEaaWhQ9lDSXJ1b/cx5q UIJVAiXqnQ3NH9Jz0KiNP4GxfWQj42L5KwsNYc0dwo9Swnw2NwMseRSNl2hPQqCTz4Qo Qw9PHdfn0u7UTXkPU7ZKkd9wFCxIyMQfQBImevP1/vD9pU5TBxhEOmbKMTPL5245p6iG x5rvOP9WCRjIw1ccILcri7bwaL0Tp8TGHzNK9u+xktRCmI02hpaBdV0v+ZqOJ83FTq/Y 7GtA== X-Gm-Message-State: AOAM533hLbQZwFG/YWH1Is6REpR+vdaUvVYnhIK97u8zcejlwjO8tW1c X+lpXUwY/KYp5gpBluFO2yg= X-Google-Smtp-Source: ABdhPJz8IpAkO0JpZ1KH7kTe7j5K43hAjLHTOMMXgFi2wKZPgQe3Dtt3sfoLqhhqtPVXZHam05/JNQ== X-Received: by 2002:a1c:5585:: with SMTP id j127mr7777699wmb.90.1603882232929; Wed, 28 Oct 2020 03:50:32 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z6sm4401325wmi.1.2020.10.28.03.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:50:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Qi Zhang , dpdk stable Date: Wed, 28 Oct 2020 10:44:03 +0000 Message-Id: <20201028104606.3504127-84-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/fm10k: fix memory leak when thresh check fails' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 3b77cd741f5dfd61738cafa0dabf8adf5586270e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 28 Sep 2020 20:44:42 +0800 Subject: [PATCH] net/fm10k: fix memory leak when thresh check fails [ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ] In fm10k_rx_queue_setup(), we allocate memory for the queue structure but not released when thresh check fails. Fixes: 6cfe8969c969 ("fm10k: add Rx queue setup/release") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/fm10k/fm10k_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index a65865c683..5ce59be7d5 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -1854,9 +1854,10 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->tail_ptr = (volatile uint32_t *) &((uint32_t *)hw->hw_addr)[FM10K_RDT(queue_id)]; q->offloads = offloads; - if (handle_rxconf(q, conf)) + if (handle_rxconf(q, conf)) { + rte_free(q); return -EINVAL; - + } /* allocate memory for the software ring */ q->sw_ring = rte_zmalloc_socket("fm10k sw ring", (nb_desc + q->nb_fake_desc) * sizeof(struct rte_mbuf *), -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.378618201 +0000 +++ 0084-net-fm10k-fix-memory-leak-when-thresh-check-fails.patch 2020-10-28 10:35:11.604831496 +0000 @@ -1,13 +1,14 @@ -From c87a6de2a130c436fcf73b27f829c48e8249bcc4 Mon Sep 17 00:00:00 2001 +From 3b77cd741f5dfd61738cafa0dabf8adf5586270e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 28 Sep 2020 20:44:42 +0800 Subject: [PATCH] net/fm10k: fix memory leak when thresh check fails +[ upstream commit c87a6de2a130c436fcf73b27f829c48e8249bcc4 ] + In fm10k_rx_queue_setup(), we allocate memory for the queue structure but not released when thresh check fails. Fixes: 6cfe8969c969 ("fm10k: add Rx queue setup/release") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c -index 5771d83b55..98e396b8e7 100644 +index a65865c683..5ce59be7d5 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c -@@ -1841,9 +1841,10 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -1854,9 +1854,10 @@ fm10k_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->tail_ptr = (volatile uint32_t *) &((uint32_t *)hw->hw_addr)[FM10K_RDT(queue_id)]; q->offloads = offloads;