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 8C023A00C2 for ; Tue, 8 Mar 2022 15:16:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86E0E4068E; Tue, 8 Mar 2022 15:16:23 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 08F614068E for ; Tue, 8 Mar 2022 15:16:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748981; 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=Ob4i7VRs0DTel3jWmhxU3B43ZCPb0Tr+8L2UfEmww9M=; b=cXjjWzwY/Ph3ObIOZ225suXqR3z1dEdWjAdpRM9KXh5B+KFeJx5HboypOgJBJkQc9QLMnV KVyLovZfXK3mfD0BPWMcxAp6K9CTp777sDONZqsjHR22CD4OITjPqpRbfXQ6ImywY9r7uU 1axvJicLiiAG4xuHwKHCaGlXSqOyu50= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-350-029FLU0POoSrjP9ErRH9lA-1; Tue, 08 Mar 2022 09:16:18 -0500 X-MC-Unique: 029FLU0POoSrjP9ErRH9lA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F4491800D50; Tue, 8 Mar 2022 14:16:17 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id C944184034; Tue, 8 Mar 2022 14:16:15 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Stephen Hemminger , Cristian Dumitrescu , dpdk stable Subject: patch 'sched: remove useless malloc in PIE data init' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:50 +0000 Message-Id: <20220308141500.286915-35-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 21.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 03/14/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/bcfadafe4a98b00dc6877caf034403724bbb90ba Thanks. Kevin --- >From bcfadafe4a98b00dc6877caf034403724bbb90ba Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Wed, 2 Mar 2022 04:32:57 +0800 Subject: [PATCH] sched: remove useless malloc in PIE data init [ upstream commit 79aab97c94024c4f969308ec806efb168cccc83d ] 'rte_pie_rt_data_init(NULL)' is not expected, and it's ought to fail when this happen. The malloc inside the function didn't work. So remove the malloc otherwise will lead to a memory leak. Fixes: 44c730b0e37971 ("sched: add PIE based congestion management") Signed-off-by: Weiguo Li Acked-by: Stephen Hemminger Acked-by: Cristian Dumitrescu --- lib/sched/rte_pie.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c index 934e9aee50..79db6e96b1 100644 --- a/lib/sched/rte_pie.c +++ b/lib/sched/rte_pie.c @@ -4,4 +4,5 @@ #include +#include #include "rte_pie.h" @@ -18,24 +19,9 @@ rte_pie_rt_data_init(struct rte_pie *pie) { if (pie == NULL) { - /* Allocate memory to use the PIE data structure */ - pie = rte_malloc(NULL, sizeof(struct rte_pie), 0); - - if (pie == NULL) - RTE_LOG(ERR, SCHED, "%s: Memory allocation fails\n", __func__); - - return -1; + RTE_LOG(ERR, SCHED, "%s: Invalid addr for pie\n", __func__); + return -EINVAL; } - pie->active = 0; - pie->in_measurement = 0; - pie->departed_bytes_count = 0; - pie->start_measurement = 0; - pie->last_measurement = 0; - pie->qlen = 0; - pie->avg_dq_time = 0; - pie->burst_allowance = 0; - pie->qdelay_old = 0; - pie->drop_prob = 0; - pie->accu_prob = 0; + memset(pie, 0, sizeof(*pie)); return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.269952515 +0000 +++ 0035-sched-remove-useless-malloc-in-PIE-data-init.patch 2022-03-08 13:55:28.506315191 +0000 @@ -1 +1 @@ -From 79aab97c94024c4f969308ec806efb168cccc83d Mon Sep 17 00:00:00 2001 +From bcfadafe4a98b00dc6877caf034403724bbb90ba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 79aab97c94024c4f969308ec806efb168cccc83d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index cdb7bab697..d37b79e6dd 100644 +index 934e9aee50..79db6e96b1 100644 @@ -30 +31 @@ -@@ -16,24 +17,9 @@ rte_pie_rt_data_init(struct rte_pie *pie) +@@ -18,24 +19,9 @@ rte_pie_rt_data_init(struct rte_pie *pie)