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 2C26FA0527 for ; Mon, 9 Nov 2020 19:45:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 225BB9AEB; Mon, 9 Nov 2020 19:45:15 +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 8D51D72E9 for ; Mon, 9 Nov 2020 19:45:13 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id t67so433226wmt.5 for ; Mon, 09 Nov 2020 10:45:13 -0800 (PST) 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=3NNYzhD+aUTJIGtWi7BWeWmYLsaUnr05kW1oRGd9jxc=; b=kMC0fU9g0+yYoSTYK+aD0PGHs95TBev1uTqAaOhUNVLUf+zM1utOJvwt3t+R1ZzGTj 1rh4uFcrX8tXl9gTUMMQVF2g3Zb2RshHFAGYVq8bW8Aq34yM+wjDF9olqFDUeUdVUwLL fBNsZ1ZNgWd/xi1W0wd9EFFesEMrYfxBfIR8UTZjKoekrjhZ3YIqMJv4i3qmmWofUdQJ zSsuP+5a/CgusErVNWqiZteXvo5dBvs5t6CjmJV0SKO44ifsTrLLr7D9PHvSDPFnF0fZ 0cTwMdwNrCt/pCYH+bprU2o/6gkivAhA/Zfwfr9jgSozZgDVOtgvtoOzDIAcF0N9fKCX 2ksQ== 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=3NNYzhD+aUTJIGtWi7BWeWmYLsaUnr05kW1oRGd9jxc=; b=TIzO4UOVIqcFT49cOGHDNLCqq0R+3aOiFtX1EU8V/1IOO3w4vlruGu2rmolcioqN8R mVqXW7vnuZROdMwq43t/ABzjsVoCp9Sb1oO7EBE6JH/3JGYpENvYcFYUKUOnP3ZJ/lCW Y8gfOzbNs4gKCnLqibB4MIaunKjZhv7qXb+B5/IixftK/w/HQ0UA9R7jo7FfX+quA1Ys jGAkjmcK3MaKjlx2QMnXZgF0WdPDSnocTdPRRHyhM5ImRXBhKH1kpE+fMNDEWbJ/j01/ v4x1HwiC00UtWCB7Ur8IPKEDLCg8qE/fpLD8/1uC1O0//EoRxdx281+jxO5FLWpCWjsZ C7aw== X-Gm-Message-State: AOAM5335imEln7JRwzu+RMlCGYQ9scTv8X6qxwthqdL3lPY3za8vnHHG SxBvtwmmBriu7PsjeRQBpM8= X-Google-Smtp-Source: ABdhPJwPDrLqNQL1nvoJp9WxyEVX7esGZOV9cMF4JirhB6DGQAan18XALU4pU+f2wiZfb3DOBcMo0A== X-Received: by 2002:a05:600c:21d5:: with SMTP id x21mr564540wmj.133.1604947512364; Mon, 09 Nov 2020 10:45:12 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 18sm350375wmo.3.2020.11.09.10.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:11 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Jerin Jacob , dpdk stable Date: Mon, 9 Nov 2020 18:40:58 +0000 Message-Id: <20201109184111.3463090-70-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/thunderx: fix memory leak on rbdr desc ring failure' 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 11/11/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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/db124729af4470a5210b06939db35a850414199a Thanks. Luca Boccassi --- >From db124729af4470a5210b06939db35a850414199a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 20 Oct 2020 23:02:37 +0800 Subject: [PATCH] net/thunderx: fix memory leak on rbdr desc ring failure [ upstream commit 33d1405fc3264200d762c08728f4155335799456 ] In nicvf_qset_rbdr_alloc(), we allocate memory for the 'rbdr' structure but not released when allocate 'rbdr desc ring' fails. Fixes: 7413feee662d ("net/thunderx: add device start/stop and close") Signed-off-by: Yunjian Wang Acked-by: Jerin Jacob --- drivers/net/thunderx/nicvf_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index 26191586f7..770110eb1d 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -653,6 +653,7 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic, NICVF_RBDR_BASE_ALIGN_BYTES, nic->node); if (rz == NULL) { PMD_INIT_LOG(ERR, "Failed to allocate mem for rbdr desc ring"); + rte_free(rbdr); return -ENOMEM; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.798157902 +0000 +++ 0070-net-thunderx-fix-memory-leak-on-rbdr-desc-ring-failu.patch 2020-11-09 18:40:11.211312527 +0000 @@ -1 +1 @@ -From 33d1405fc3264200d762c08728f4155335799456 Mon Sep 17 00:00:00 2001 +From db124729af4470a5210b06939db35a850414199a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33d1405fc3264200d762c08728f4155335799456 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f0bd20a22b..b6bb05e500 100644 +index 26191586f7..770110eb1d 100644 @@ -22 +23 @@ -@@ -638,6 +638,7 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic, +@@ -653,6 +653,7 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,