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 63990A0542 for ; Fri, 7 Feb 2020 16:14:01 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5B44B1C11E; Fri, 7 Feb 2020 16:14:01 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 22C391C11E for ; Fri, 7 Feb 2020 16:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088439; 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=CKE/eCdcpcz09jSoEtgnlCiBf6AaAuS05BHYwQEa9us=; b=b2Q5Oaw5e1YVGnwM74t8Shz7WJLu+vncX94SwFbMIJHUJOZkCCg4pB3kV9FjZ2tbBES0hP C7O4M3+/I57KsiZxxlZVtHOoo1g5V8cd/xNlp4zpMGXMUSmvx0YybVlY/nm6szGTu3Z8AO lYLfdPPKXJDE1CQirwaPa14WxX8z/yM= 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-204-AVTVZkOvO6avKvMR3xuVlQ-1; Fri, 07 Feb 2020 10:13:43 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DF90100551A; Fri, 7 Feb 2020 15:13:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D5211001B0B; Fri, 7 Feb 2020 15:13:39 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Pandi Kumar Maharajan , Paul M Stillwell Jr , Qiming Yang , dpdk stable Date: Fri, 7 Feb 2020 15:12:31 +0000 Message-Id: <20200207151248.29804-19-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: AVTVZkOvO6avKvMR3xuVlQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/iavf/base: fix command buffer memory leak' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 rebasi= ng (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/ee7c6ac8635d308d3d= 2b719742fae2bfba3fde26 Thanks. Kevin. --- >From ee7c6ac8635d308d3d2b719742fae2bfba3fde26 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 3 Dec 2019 15:03:12 +0800 Subject: [PATCH] net/iavf/base: fix command buffer memory leak [ upstream commit 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 ] Allocated resources were not freed in the event of failure in iavf_init_asq function. This patch gracefully handles all failures. Fixes: e5b2a9e957e7 ("net/avf/base: add base code for avf PMD") Signed-off-by: Pandi Kumar Maharajan Signed-off-by: Paul M Stillwell Jr Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/avf/base/avf_adminq.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_a= dminq.c index 616e2a9cce..71f18b3477 100644 --- a/drivers/net/avf/base/avf_adminq.c +++ b/drivers/net/avf/base/avf_adminq.c @@ -114,4 +114,5 @@ enum avf_status_code avf_alloc_adminq_arq_ring(struct a= vf_hw *hw) void avf_free_adminq_asq(struct avf_hw *hw) { +=09avf_free_virt_mem(hw, &hw->aq.asq.cmd_buf); =09avf_free_dma_mem(hw, &hw->aq.asq.desc_buf); } @@ -397,5 +398,5 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw) =09ret_code =3D avf_config_asq_regs(hw); =09if (ret_code !=3D AVF_SUCCESS) -=09=09goto init_adminq_free_rings; +=09=09goto init_config_regs; =20 =09/* success! */ @@ -405,4 +406,8 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw) init_adminq_free_rings: =09avf_free_adminq_asq(hw); +=09return ret_code; + +init_config_regs: +=09avf_free_asq_bufs(hw); =20 init_adminq_exit: --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.518657985 +0000 +++ 0019-net-iavf-base-fix-command-buffer-memory-leak.patch=092020-02-07 15= :08:17.527062777 +0000 @@ -1 +1 @@ -From 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 Mon Sep 17 00:00:00 2001 +From ee7c6ac8635d308d3d2b719742fae2bfba3fde26 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87aca6d8d8a452ce0d3534dd80bab28ff8e66b58 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/iavf/base/iavf_adminq.c | 7 ++++++- + drivers/net/avf/base/avf_adminq.c | 7 ++++++- @@ -20,6 +21,6 @@ -diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/i= avf_adminq.c -index ef352ac4c4..298e77277e 100644 ---- a/drivers/net/iavf/base/iavf_adminq.c -+++ b/drivers/net/iavf/base/iavf_adminq.c -@@ -83,4 +83,5 @@ enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_= hw *hw) - void iavf_free_adminq_asq(struct iavf_hw *hw) +diff --git a/drivers/net/avf/base/avf_adminq.c b/drivers/net/avf/base/avf_= adminq.c +index 616e2a9cce..71f18b3477 100644 +--- a/drivers/net/avf/base/avf_adminq.c ++++ b/drivers/net/avf/base/avf_adminq.c +@@ -114,4 +114,5 @@ enum avf_status_code avf_alloc_adminq_arq_ring(struct = avf_hw *hw) + void avf_free_adminq_asq(struct avf_hw *hw) @@ -27,2 +28,2 @@ -+=09iavf_free_virt_mem(hw, &hw->aq.asq.cmd_buf); - =09iavf_free_dma_mem(hw, &hw->aq.asq.desc_buf); ++=09avf_free_virt_mem(hw, &hw->aq.asq.cmd_buf); + =09avf_free_dma_mem(hw, &hw->aq.asq.desc_buf); @@ -30,3 +31,3 @@ -@@ -354,5 +355,5 @@ enum iavf_status iavf_init_asq(struct iavf_hw *hw) - =09ret_code =3D iavf_config_asq_regs(hw); - =09if (ret_code !=3D IAVF_SUCCESS) +@@ -397,5 +398,5 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw) + =09ret_code =3D avf_config_asq_regs(hw); + =09if (ret_code !=3D AVF_SUCCESS) @@ -37 +38 @@ -@@ -362,4 +363,8 @@ enum iavf_status iavf_init_asq(struct iavf_hw *hw) +@@ -405,4 +406,8 @@ enum avf_status_code avf_init_asq(struct avf_hw *hw) @@ -39 +40 @@ - =09iavf_free_adminq_asq(hw); + =09avf_free_adminq_asq(hw); @@ -43 +44 @@ -+=09iavf_free_asq_bufs(hw); ++=09avf_free_asq_bufs(hw);