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 4B940433D8 for ; Mon, 11 Dec 2023 11:13:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42FA4410E6; Mon, 11 Dec 2023 11:13:04 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2066.outbound.protection.outlook.com [40.107.92.66]) by mails.dpdk.org (Postfix) with ESMTP id C344940E0F for ; Mon, 11 Dec 2023 11:13:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b/4XAjxr9+BilCZ7L4upN7mwp0ThGGj7/Z5aITxDv3dwcb7bJgfwvaGPn/0J2qtePEtzp76HlTuU7vIfHroRDmKQ/rJmS3dpC9cV6Q/NK350u9ipp941VgWHxxGAodUw4+6JpLeQEqSlT4l1sQfD+COHef6zep3kXdlNzmWGP4rE55H4y+j4lc5kd6SM5VwqboV++nIiydU4pLklJErTAOuOjgYhngXAGQapaMOmzIx8I43IlB6KDNUPjHVeY1UxtdH2f7mT4/NJx0874Jl27l5/lu+mU5XaxpMwIa63JpuBP2MRvHtdskryAev2de34vFq2SqW5fDKdSkyPNXnvQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=X08ftLCazHJGKcd5FBkcj4tnQlZQNW9FGf3C+dlJu/A=; b=Gb3WQ5qnrwww4h1S1kEmeZ/VKQ/+HhUUdHzkXyIOWprVTpkm2wCVmeglHYavyB6zt87rabSbAFz5IA7Ivc3/nryZDEG8+EhA+dLHTrS+IPsaPGe4L+sW8R+bbQi7uWNzwVwC7mNaZiI+DqlM8HaXVtI+rTmOj8E31TtQmoBwDnOyIDGq4NlDMP14HdUvG9+Z1WJof4fzt3NUVMGeWk07JV/niYCtKijW4BGLtav3shODQSqFy110KRfzSh9RH7kcgKxMq8djvo//zdWi7vW8Z8U+JQxOu4ssENC2jBAOEX7X4RCeCYpjODb2sSQg9++fN62nv4SEbjzczEBsonylwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=linux.microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X08ftLCazHJGKcd5FBkcj4tnQlZQNW9FGf3C+dlJu/A=; b=VFeo855UXX9kRvXozD4UvFuuQ+McoxDpqyr9YSU+huKSUCX8NMj5BcLc7VDa3Y8UA16SYpVhbm8rW8GpSpJbzg+1AnYLGMqmzeNU65o95DjPmZ8uBgBZ6A/uDwrHOJB1l+N5mTwqbTQt8jFfbEQlNZ1AAJ4aIODYEVzKSyzmYoEDTY+V3u9Rz5pxc3hGpF9jS6AJxffKDpoNpPUn/YfzYxI33cnPY9Wd1VQ9FPHq7jxdIz2FkBvDskLxrtYQfPMNf/ECHKudZ0o/P/RmMCbye+2xD7+bkx5HlyZkU3zE8XKi0Pg16wb3ELTrFNVg3DYvuvFkTl5qpXnOKtR79IKiAA== Received: from MN2PR03CA0027.namprd03.prod.outlook.com (2603:10b6:208:23a::32) by MW6PR12MB9018.namprd12.prod.outlook.com (2603:10b6:303:241::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:12:58 +0000 Received: from MN1PEPF0000ECD8.namprd02.prod.outlook.com (2603:10b6:208:23a:cafe::57) by MN2PR03CA0027.outlook.office365.com (2603:10b6:208:23a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:12:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD8.mail.protection.outlook.com (10.167.242.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:12:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:12:44 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:12:43 -0800 From: Xueming Li 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 22.11.4 Date: Mon, 11 Dec 2023 18:10:27 +0800 Message-ID: <20231211101226.2122-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD8:EE_|MW6PR12MB9018:EE_ X-MS-Office365-Filtering-Correlation-Id: e8e9f576-b4b5-4011-9a89-08dbfa31bfdd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FoU6nrsunjOWqzi0SH2hKJ8ZWg2AHCEd7mi5w+E0Yl0cSGRYTYLFlAHsufql2nkj2N8yaFe31a3xuyP/e79vSk+LN8V/FfjqvbEJbxEAg0syWxLTv7IaAJpaEM0hFASj5+F/0KOYtFFTgwHifTfTwhdsXKpIu19YqCmZ9hOAF2XvSd0zhkxpV935Dz37jm2ZRusANbyBbeEGCAh42OtWXdNmPnu1AjxEJjRCnqzWItOogKQ+84M4ebNAv6Ms/yY7NEnA9VfKiPTyVUEqDf1kTewW2nuGOoeqzUitHBrN7TkTTRqJezkz9zE63GD99VlzFdD//sPCkdLax19OOdIH/EGrvQRnPiXEziONM/Jywq/TJuWuJdTWpd+lJNK+DSvC+mpWgktkCHpZtkKLlKcH2eM1CixpSf01nFCF9cJm3gGdPWnM/lJ92REuB5NtcSE5qxx4cIKuap5kFnWlj0+Np4H2BtyNjj3iMd7pXUfHttKKJNut5GjrYarslmLWUvSjeUIbyTeRNbk3a1/v/AirKVtcqlEORvubjBgO7JfkZKhpZU6E4hZQd8Oq4/wC5an3+9sq785y3DdvFYkZe5Lcj3t6edCOH5JwcIjYouw9YqY4eE1hbNKK0ntYYaoQiiTmA4zdg8UaCABh4ZmlEwgi83MmOBgts4vR+C/E8uH8SOEDMQSEUCkA7A2Feakwn3S4cHgzBTwkg7myTPQvRg8CEFkdc5NjkHNQlV9+yDp3g9wp0ooimqOoKD3x2S/ixNBY9y2VuGpTEy5xWV2gftr5HA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(66574015)(47076005)(966005)(83380400001)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:12:58.0338 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8e9f576-b4b5-4011-9a89-08dbfa31bfdd X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9018 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 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4f5e8c612ff6243923a51e2d6c93bc7cf6829b10 Thanks. Xueming Li --- >From 4f5e8c612ff6243923a51e2d6c93bc7cf6829b10 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 Cc: Xueming Li [ 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/eal/common/rte_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c index 48db264449..dbd8eae5b0 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) 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.336031200 +0800 +++ 0002-malloc-remove-return-from-void-functions.patch 2023-12-11 17:56:22.877652300 +0800 @@ -1 +1 @@ -From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001 +From 4f5e8c612ff6243923a51e2d6c93bc7cf6829b10 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index ebafef3f6c..9db0c399ae 100644 +index 48db264449..dbd8eae5b0 100644