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 E8ED8A0524 for ; Fri, 5 Feb 2021 12:22:17 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E05F41606CD; Fri, 5 Feb 2021 12:22:17 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 102601606D1 for ; Fri, 5 Feb 2021 12:22:17 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id l12so5732010wmq.2 for ; Fri, 05 Feb 2021 03:22:17 -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=Ag0UdML22YdrS4SIcFAi3RpR5+c0/4ZB1xSWL3sFtSA=; b=CRVLxElLGtwVnJjtYEfUptL1JgdNNWuCkjbKEl9N1kR/b8VVnpfjYNBPpUremvZlRl 61Tvbb18Rx2HZXIOdq4ougl9yEJM2ntTSYtqTgBBGfCowDXiCh1RYRWvg4RILkPE5VPx laeTVHQSVHXGKXCt9x8yuqpNL6aixwy6k+u0UQhx8aQGpCHCVcqGwF1CEcSruw1tSYiX tvi0BE7LV4DgydyN2CP7c0pGqGr1XlcTwmePe9jy5O9wG5x2wXquXnlPjxBiaihiJeul xOauBW7mrQRUv8LzRy8mqU571JzLKn2ZwzWw7cZ6AikRg+q4GX8NtG014Eh/bRuzsZe0 OdnQ== 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=Ag0UdML22YdrS4SIcFAi3RpR5+c0/4ZB1xSWL3sFtSA=; b=h5NIUDjwXucNRVQ9LTy+uFcMi6hDhd/Bia5fGdQ+L2gOrTE7plHEWVMzTgCcaT0NaD 6DUZMu/3RySZDNZ0dv9X/qeSSvTnmqMpM6GoQORiGrWi9FMXs9B12Dlt2utbij3dutx3 0drvuhHqGGbenFCiR4uDxf+XmPIwC+HpRi/8p/Aaka7OGEWPpMQHXm/i7bLSUKHk8DoJ Jw9vAXJn64P132/nXIOcCC3u5pLoXbujU92Pj9jw1QiW5htxcED9nFvbzypOjY3YeGmh Mtd+LecUkFEQH0qUaEYhQv9Qnz+6qTypIOnfUKkeDdTQB98xA09j3MwFZEPqimm+C10G 2lpg== X-Gm-Message-State: AOAM531u3EzBJZHiEzGE8G36ffa8HBnVY8h/ovCsIq8alfyO8UT7yZ9k XqNfgq/gS5OVhEeGUfGYqTA= X-Google-Smtp-Source: ABdhPJzJnwpi90rtl2kIteehdgxS05Vtn39ctNpeZRQJofIXdloa1yCaG/MEAnij2ii1d7M4vfLXVw== X-Received: by 2002:a1c:99d0:: with SMTP id b199mr3171291wme.147.1612524136857; Fri, 05 Feb 2021 03:22:16 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t205sm8730421wmt.28.2021.02.05.03.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:16 -0800 (PST) From: luca.boccassi@gmail.com To: Ting Xu Cc: Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:15:38 +0000 Message-Id: <20210205111920.1272063-52-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix memory leak in large VF' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 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/07/21. 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/2cbc61868038c0101d56587f6706d3cfd29e82f9 Thanks. Luca Boccassi --- >From 2cbc61868038c0101d56587f6706d3cfd29e82f9 Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Mon, 14 Dec 2020 14:04:10 +0800 Subject: [PATCH] net/iavf: fix memory leak in large VF [ upstream commit 20aa3a899ce0203d179cc5ea3bc5688193116a25 ] This patch fixed the issue that the memory allocated for structure virtchnl_del_ena_dis_queues is not released at the end of the functions iavf_enable_queues_lv, iavf_disable_queues_lv and iavf_switch_queue_lv. Fixes: 9cf9c02bf6ee ("net/iavf: add enable/disable queues for large VF") Signed-off-by: Ting Xu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_vchnl.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 33d03af653..c17ae06227 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -644,12 +644,12 @@ iavf_enable_queues_lv(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; err = iavf_execute_vf_cmd(adapter, &args); - if (err) { + if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_ENABLE_QUEUES_V2"); - return err; - } - return 0; + + rte_free(queue_select); + return err; } int @@ -688,12 +688,12 @@ iavf_disable_queues_lv(struct iavf_adapter *adapter) args.out_buffer = vf->aq_resp; args.out_size = IAVF_AQ_BUF_SZ; err = iavf_execute_vf_cmd(adapter, &args); - if (err) { + if (err) PMD_DRV_LOG(ERR, "Failed to execute command of OP_DISABLE_QUEUES_V2"); - return err; - } - return 0; + + rte_free(queue_select); + return err; } int @@ -737,6 +737,8 @@ iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid, if (err) PMD_DRV_LOG(ERR, "Failed to execute command of %s", on ? "OP_ENABLE_QUEUES_V2" : "OP_DISABLE_QUEUES_V2"); + + rte_free(queue_select); return err; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.616492707 +0000 +++ 0052-net-iavf-fix-memory-leak-in-large-VF.patch 2021-02-05 11:18:28.774690503 +0000 @@ -1 +1 @@ -From 20aa3a899ce0203d179cc5ea3bc5688193116a25 Mon Sep 17 00:00:00 2001 +From 2cbc61868038c0101d56587f6706d3cfd29e82f9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 20aa3a899ce0203d179cc5ea3bc5688193116a25 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org