From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07009A0C41 for ; Tue, 30 Nov 2021 17:38:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02F69411DB; Tue, 30 Nov 2021 17:38:39 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id EB984411B8 for ; Tue, 30 Nov 2021 17:38:37 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C378740037 for ; Tue, 30 Nov 2021 16:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290317; bh=AWAcuMI3nzSFp4RlEDqHia1LbA2J+ASdG3H1iYtWNNU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nJsAZvqf38p0vVxf3oVPXxVE8amAsmN6Vp4rZN2hDOAbAxVRr0MFkySze1G+Y6LKN NSTqCFta9wEs/XpfmOrBbNwJ4emObaVusbWFivyME4OSoRjfklie5e4gApP2jbJ979 GybRFVTggSRDydYETt62XE/ET++TAtsMsffB0bwudU2v4mrlcOXmMfN20QvX4Yp4Gd hk2CYjkBAnGAR66ngQOSxvZwB7HjRf/D7sBJr9/u0vyGLIa8MWPEvX/7GOmnfgiYDQ I08durjzluz7kY6wE6yDcA1pFBY5vqEJb1iLYhp19tdoESX3Uhc4MHyvPNNqCqczm5 qA7lqcpEnUYUA== Received: by mail-ed1-f71.google.com with SMTP id v1-20020aa7cd41000000b003e80973378aso17419284edw.14 for ; Tue, 30 Nov 2021 08:38:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AWAcuMI3nzSFp4RlEDqHia1LbA2J+ASdG3H1iYtWNNU=; b=doiylfoZqqyKliM1QRuuffaO1MHHmnxQnXhc5G+8WDM8/A/herDBp0t5X0Fo/MxJyg N6L6t1ddNlSeQn7yKtYlTgTBwIiwz9zlyKzHuXQEFq8NzI/2R2HOwhk6AcN47oUygfH3 0eIxNndcBEWT7IArXUzrB1qDQ/IKw4spZr0mtN1VOe2bM1K8pUPv/gdyP+1YbPLQyBnz yrj2DgytH5XigB5mNRhcjqY0cugHdRmdDt3B3rpHItIX9mUTZLyqYTpa0XlwKni3Temm dBQWcUyyYy0E3QUjsQOPZkDQADhHUnb8V3OT12YhsAYnPDKmjjXR/4wdKuXvb0KojV19 d/OQ== X-Gm-Message-State: AOAM5307ELi6bDA7hAWZHiABsEr3C/0hAEI9vnEEknjtVkg22VBnGSdO AQgPD9aXHY7k7w5k/uyyTB0BbUUwBP2kwoGRFh5lXDol7KOl1Jo2BecqzuT/D/J9IO7p5qVMBjD t+SlfJY2jmj1luAKG03gUKwmx X-Received: by 2002:a17:906:5951:: with SMTP id g17mr173973ejr.315.1638290317496; Tue, 30 Nov 2021 08:38:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJzr/1X2Hw8/m4s4aHgbtVM9uvy/GswVegv1W2dpCuZmwszA+RSXhXBuZbGtmMPFJxu8XkZv0g== X-Received: by 2002:a17:906:5951:: with SMTP id g17mr173952ejr.315.1638290317310; Tue, 30 Nov 2021 08:38:37 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id hd15sm9784708ejc.69.2021.11.30.08.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:36 -0800 (PST) From: christian.ehrhardt@canonical.com To: Qiming Chen Cc: Qi Zhang , dpdk stable Subject: patch 'common/iavf: fix ARQ resource leak' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:12 +0100 Message-Id: <20211130163605.2460997-48-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.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 December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/18d35ae547cab73325b30e1a25ef70717338775e Thanks. Christian Ehrhardt --- >From 18d35ae547cab73325b30e1a25ef70717338775e Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Fri, 10 Sep 2021 11:12:49 +0800 Subject: [PATCH] common/iavf: fix ARQ resource leak [ upstream commit 395d41fbb1dd2faa21e143865ce12c195ec8194b ] In the iavf_init_arq function, if an exception occurs in the iavf_config_arq_regs function, and the previously applied ARQ (Admin Receive Queue) bufs resource is released. This patch maintains the same modification as the iavf_init_asq function to roll back resources. Fixes: 87aca6d8d8a4 ("net/iavf/base: fix command buffer memory leak") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/iavf/base/iavf_adminq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c index d6943e8260..a41402e04e 100644 --- a/drivers/net/iavf/base/iavf_adminq.c +++ b/drivers/net/iavf/base/iavf_adminq.c @@ -431,7 +431,7 @@ enum iavf_status_code iavf_init_arq(struct iavf_hw *hw) /* initialize base registers */ ret_code = iavf_config_arq_regs(hw); if (ret_code != IAVF_SUCCESS) - goto init_adminq_free_rings; + goto init_config_regs; /* success! */ hw->aq.arq.count = hw->aq.num_arq_entries; @@ -439,6 +439,10 @@ enum iavf_status_code iavf_init_arq(struct iavf_hw *hw) init_adminq_free_rings: iavf_free_adminq_arq(hw); + return ret_code; + +init_config_regs: + iavf_free_arq_bufs(hw); init_adminq_exit: return ret_code; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.860702129 +0100 +++ 0048-common-iavf-fix-ARQ-resource-leak.patch 2021-11-30 16:50:05.670872649 +0100 @@ -1 +1 @@ -From 395d41fbb1dd2faa21e143865ce12c195ec8194b Mon Sep 17 00:00:00 2001 +From 18d35ae547cab73325b30e1a25ef70717338775e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 395d41fbb1dd2faa21e143865ce12c195ec8194b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/common/iavf/iavf_adminq.c | 6 +++++- + drivers/net/iavf/base/iavf_adminq.c | 6 +++++- @@ -20,5 +21,5 @@ -diff --git a/drivers/common/iavf/iavf_adminq.c b/drivers/common/iavf/iavf_adminq.c -index 0bf5af0cbe..9c36e8908e 100644 ---- a/drivers/common/iavf/iavf_adminq.c -+++ b/drivers/common/iavf/iavf_adminq.c -@@ -417,7 +417,7 @@ enum iavf_status iavf_init_arq(struct iavf_hw *hw) +diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c +index d6943e8260..a41402e04e 100644 +--- a/drivers/net/iavf/base/iavf_adminq.c ++++ b/drivers/net/iavf/base/iavf_adminq.c +@@ -431,7 +431,7 @@ enum iavf_status_code iavf_init_arq(struct iavf_hw *hw) @@ -33 +34 @@ -@@ -425,6 +425,10 @@ enum iavf_status iavf_init_arq(struct iavf_hw *hw) +@@ -439,6 +439,10 @@ enum iavf_status_code iavf_init_arq(struct iavf_hw *hw)