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 6E2D9A04DD for ; Wed, 18 Nov 2020 17:39:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07186C904; Wed, 18 Nov 2020 17:38:35 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 631A1C8DA for ; Wed, 18 Nov 2020 17:38:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AdaHW3iZj5/xc7mxQ/A2JnNSoPueFsFMzKnRPmxVQC8=; b=Wa33wQCv/y+JaYOO/jqYytrw71qmdHAwiyzKS6oJmrAdpF7ZH2UdeuA1Tw+qY4++yvDzNf a66pV93PoONJE2JXXO7XIZfTbaAlynbbIXPxybeI+ymawTI2NPsZpkYCwxqmGy1p8Pd5y/ uIo0x1ZzGm0fKfKT2FJfEdDsnjCB9K4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-I2HwwSOePFqlLpUiqt_uxQ-1; Wed, 18 Nov 2020 11:38:26 -0500 X-MC-Unique: I2HwwSOePFqlLpUiqt_uxQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96BDF10766B9; Wed, 18 Nov 2020 16:38:25 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 871D05C1A3; Wed, 18 Nov 2020 16:38:24 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Jerin Jacob , dpdk stable Date: Wed, 18 Nov 2020 16:35:53 +0000 Message-Id: <20201118163558.1101823-67-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/thunderx: fix memory leak on rbdr desc ring failure' has been queued to LTS release 18.11.11 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 LTS release 18.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 11/24/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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4a730b3da651720402a413072f48d258047ae177 Thanks. Kevin. --- >From 4a730b3da651720402a413072f48d258047ae177 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 d627a3bb70..a47a287a5f 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -646,4 +646,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic, if (rz == NULL) { PMD_INIT_LOG(ERR, "Failed to allocate mem for rbdr desc ring"); + rte_free(rbdr); return -ENOMEM; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.189807742 +0000 +++ 0067-net-thunderx-fix-memory-leak-on-rbdr-desc-ring-failu.patch 2020-11-18 16:33:37.994215104 +0000 @@ -1 +1 @@ -From 33d1405fc3264200d762c08728f4155335799456 Mon Sep 17 00:00:00 2001 +From 4a730b3da651720402a413072f48d258047ae177 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 d627a3bb70..a47a287a5f 100644 @@ -22 +23 @@ -@@ -639,4 +639,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic, +@@ -646,4 +646,5 @@ nicvf_qset_rbdr_alloc(struct rte_eth_dev *dev, struct nicvf *nic,