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 3EF35432DA for ; Wed, 8 Nov 2023 20:25:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 37A3241133; Wed, 8 Nov 2023 20:25:39 +0100 (CET) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by mails.dpdk.org (Postfix) with ESMTP id 9305A406A2 for ; Wed, 8 Nov 2023 20:25:38 +0100 (CET) Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2c50305c5c4so104760231fa.1 for ; Wed, 08 Nov 2023 11:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471538; x=1700076338; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Za91ZEVNliwsXI12RRdC9o56i+Ce4De/EZ9qhOyXBa0=; b=NAKmlPveIXLA0iV9hol3n4Mv71aGrKOVQHIQYIXmlPhdZVlhaBvovcs9kmbVK0fCci LKv0r26RB3p4H2hdsc0MW+E+2etKyBrPBg/uxWpEHM9CislDNWxCWSxytcfDafLxDxlX Tvwsw5F73Kh7Fd5XAJhkiSrM/DqgjWFnVCQ+6dwB4xz7MODn2H7hOv+SeghGmqC817cq Q2zz5nw1GSfs3ii++33rg6tSilCETl3i18Fq1TerutG4780b+Yvtbglss1RBus7eI1JI MvI6AF9hNdNW+aTPVlx1Us4oGf1cE0nzX+50A3kFaF79T8QtFtzahuKnjWKu4aHbWpm/ ogiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471538; x=1700076338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Za91ZEVNliwsXI12RRdC9o56i+Ce4De/EZ9qhOyXBa0=; b=Kd1VV3vG/J+NP3lBQ8fQEK2ddtX77tYgPobQz8+hGvP4Q/EQLh0tzJa3W6X4nQK2Ci dtS5wG78rkzt5pLyZq/5gbQvfXmgw9BzgNDda0uKmhqGR8/qBdddyaqs7bVGlYDE6yh8 o+liw5IvtqNeSJ7G5B0ED6lh6Fu8zmgv75UZ3/5Otr6OjShU0CFbrhkdcPtsvT67imhB 8J+VpKn4CbXURpv7R/VVI5UxucdOmmMR94ep0apufTU8q7mIpR02FFnu+w5wc5/qFEfN bIzeakW5P8whafSiI5CALQAdHdF1PlpLwmSxQbr4sxfPEiEVUuL+RhhG10dINZouepgU EF2Q== X-Gm-Message-State: AOJu0YyenhsUN2eEBSD8yHt9psgJtNkC9ImF7jzaNzsDYgdO5MpCYSep 7Z+8av5XfTCLFWuKqj53mZwJ38LiE50I+Q== X-Google-Smtp-Source: AGHT+IGRfTEHquGUFaCdYzTxU6LgO67DwbNHJ6uSQqCS6rMobZI4zojOL4TKHpOvDSr6UvMdnhPtPQ== X-Received: by 2002:a05:651c:19aa:b0:2c7:f9d:587c with SMTP id bx42-20020a05651c19aa00b002c70f9d587cmr2792191ljb.24.1699471537705; Wed, 08 Nov 2023 11:25:37 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id az34-20020a05600c602200b004076f522058sm20615122wmb.0.2023.11.08.11.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:25:37 -0800 (PST) From: luca.boccassi@gmail.com To: Tyler Retzlaff Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'malloc: remove return from void functions' has been queued to stable release 20.11.10 Date: Wed, 8 Nov 2023 19:24:59 +0000 Message-Id: <20231108192535.922238-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-41-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 20.11.10 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/10/23. 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/3c037d05500c38b7accf25a4ef00762ef019f625 Thanks. Luca Boccassi --- >From 3c037d05500c38b7accf25a4ef00762ef019f625 Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff Date: Tue, 17 Oct 2023 06:03:39 -0700 Subject: [PATCH] malloc: remove return from void functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ] Remove return from rte_free and eal_free_no_trace both functions are declared to have a return type of void so they shouldn't return a value. Fixes: 52f409d614a0 ("trace: add memory tracepoints") Signed-off-by: Tyler Retzlaff Reviewed-by: Morten Brørup --- lib/librte_eal/common/rte_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c index 9d39e58c08..684af4e1fc 100644 --- a/lib/librte_eal/common/rte_malloc.c +++ b/lib/librte_eal/common/rte_malloc.c @@ -46,13 +46,13 @@ mem_free(void *addr, const bool trace_ena) void rte_free(void *addr) { - return mem_free(addr, true); + mem_free(addr, true); } void eal_free_no_trace(void *addr) { - return mem_free(addr, false); + mem_free(addr, false); } static void * -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:51.952816220 +0000 +++ 0001-malloc-remove-return-from-void-functions.patch 2023-11-08 19:23:51.713395051 +0000 @@ -1 +1 @@ -From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001 +From 3c037d05500c38b7accf25a4ef00762ef019f625 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/eal/common/rte_malloc.c | 4 ++-- + lib/librte_eal/common/rte_malloc.c | 4 ++-- @@ -21,5 +22,5 @@ -diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c -index ebafef3f6c..9db0c399ae 100644 ---- a/lib/eal/common/rte_malloc.c -+++ b/lib/eal/common/rte_malloc.c -@@ -41,13 +41,13 @@ mem_free(void *addr, const bool trace_ena) +diff --git a/lib/librte_eal/common/rte_malloc.c b/lib/librte_eal/common/rte_malloc.c +index 9d39e58c08..684af4e1fc 100644 +--- a/lib/librte_eal/common/rte_malloc.c ++++ b/lib/librte_eal/common/rte_malloc.c +@@ -46,13 +46,13 @@ mem_free(void *addr, const bool trace_ena)