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 804E5A04DD for ; Wed, 28 Oct 2020 11:53:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 63C12CA12; Wed, 28 Oct 2020 11:53:00 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id 12A89C9FA for ; Wed, 28 Oct 2020 11:52:59 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id v5so4112374wmh.1 for ; Wed, 28 Oct 2020 03:52:59 -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=+s6gDEwqfWaZ/8euh4KwE+YoANzLVvxof4QVnHv1PNQ=; b=CY61HqmjfbT6cezle3VteqsE4PgqBz2Lac9rQAeQvxjGD6WbmGlKzTZx4eFXQakQr2 Oa7vr1F9VHX69Lw7WEJdvvTc4ZesaTL5F1Pcp4bToNTvcGTJZRp5JKAXmaKRgJSoC921 sprNXLvilmEnNwzPNtFVjcNhGff12/f9CoiwCqceCcSB1AGJxKMBB+VBbnXHKwgMzJ2f vRCmSTCQvqGPmpT8S4AYkhpxl7pt63vrzu9h1tyBEpG2F49v748+vFxeTc2lwFICILL5 xFdpogeyUWRQDFZzsz8I8GXFBj0k8YUOPHrqUgfG3C0FRrrml3lq6fmvOsQSbTtg+4Lh jypA== 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=+s6gDEwqfWaZ/8euh4KwE+YoANzLVvxof4QVnHv1PNQ=; b=ZHuFMP9NCQPCILcESo2yS4lFbTpPdHjpCyQI457bZqriCJURPAnxZyMwL3LPtV9/Y9 iii1F+/m44/Sp66gEku+YD6895ahTGdw4ktUPJ9ECTr9fpahUK+XSGluZ424g+i7Qk/L KJKR7jnc5f+GaCyge10RW6AqQ+gEKKL0ypWVX9VuvNIhcRu/ELOoCoDrj6XUju5qCRML Em+X/RK1Ia4ns5dr1r/bFFARHhzaQZ+n/IhmoMjU5ll4xAweH1uD5hW6lvIw+DFpcls6 Sxj/awegSs+rREn+BvwckaRBfaV1Vlyn73aEIIpSs+CHsT8IObFDuqslcSeqnLrlFaBc gdKA== X-Gm-Message-State: AOAM531PlEmGc8IpSrodz8Rm6NycFSym/osik26Fu98S9AZv0NKnr5Wv QYTulbA1uVo31IoP8Q6Su08= X-Google-Smtp-Source: ABdhPJx90JBygLv94UKZJlWW5gBVNZy9cgO8lv3vbpvmMc59uGoKg7qJEUvBdWezF5fQZF1r/n8n3g== X-Received: by 2002:a7b:cb09:: with SMTP id u9mr6212288wmj.49.1603882377863; Wed, 28 Oct 2020 03:52:57 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d129sm6140292wmd.5.2020.10.28.03.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:52:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Xiao Wang , dpdk stable Date: Wed, 28 Oct 2020 10:44:48 +0000 Message-Id: <20201028104606.3504127-129-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 Tx 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 4d88e14ad7f458cc586c838609a893e0b20e5ce9 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 7 Oct 2020 15:36:46 +0800 Subject: [PATCH] net/fm10k: fix memory leak when Tx thresh check fails [ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ] In fm10k_tx_queue_setup(), we allocate memory for the queue structure but not released when Tx thresh check fails. Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release") Signed-off-by: Yunjian Wang Acked-by: Xiao Wang --- drivers/net/fm10k/fm10k_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 5ce59be7d5..7a83b6f68e 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -2037,8 +2037,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->ops = &def_txq_ops; q->tail_ptr = (volatile uint32_t *) &((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)]; - if (handle_txconf(q, conf)) + if (handle_txconf(q, conf)) { + rte_free(q); return -EINVAL; + } /* allocate memory for the software ring */ q->sw_ring = rte_zmalloc_socket("fm10k sw ring", -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.754284907 +0000 +++ 0129-net-fm10k-fix-memory-leak-when-Tx-thresh-check-fails.patch 2020-10-28 10:35:11.700832909 +0000 @@ -1,13 +1,14 @@ -From 9e4f075bc500dafe4568edf99b9a1161b554316e Mon Sep 17 00:00:00 2001 +From 4d88e14ad7f458cc586c838609a893e0b20e5ce9 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Wed, 7 Oct 2020 15:36:46 +0800 Subject: [PATCH] net/fm10k: fix memory leak when Tx thresh check fails +[ upstream commit 9e4f075bc500dafe4568edf99b9a1161b554316e ] + In fm10k_tx_queue_setup(), we allocate memory for the queue structure but not released when Tx thresh check fails. Fixes: 98068e0e044e ("fm10k: add Tx queue setup/release") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Xiao Wang @@ -16,10 +17,10 @@ 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c -index 3096370718..c4a6fdf7f0 100644 +index 5ce59be7d5..7a83b6f68e 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c -@@ -2024,8 +2024,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2037,8 +2037,10 @@ fm10k_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_id, q->ops = &def_txq_ops; q->tail_ptr = (volatile uint32_t *) &((uint32_t *)hw->hw_addr)[FM10K_TDT(queue_id)];