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 227274326F for ; Thu, 2 Nov 2023 14:15:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C24440ED8; Thu, 2 Nov 2023 14:15:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 6E56B42D9A for ; Thu, 2 Nov 2023 14:15:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930919; 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=E2ZTp1cUdpB8OmkUs+B1ZEn2Flm1cQ9BuMUZWu4g/tg=; b=EOratSSQrLRqVFfkFDkZTtiXPLTC0NpZ1Zp9CYq1jAptbJqbERAX3GRVhBTwVk2Q7m1H+s Qkd1PQ3HIrftqMKyzdizYOsyAY30zBlGC+KP0TGJnkwNNLKjfWv6hdadSr4KaCiuSu03Xj 5+OI4kvZCDe3SWT3dDooZITTEKz6l44= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-347-tptUBY4_OZOB96PuHrxAdw-1; Thu, 02 Nov 2023 09:15:17 -0400 X-MC-Unique: tptUBY4_OZOB96PuHrxAdw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 53BCA811E7B; Thu, 2 Nov 2023 13:15:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95706492BFA; Thu, 2 Nov 2023 13:15:16 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Chengwen Feng , dpdk stable Subject: patch 'app/procinfo: remove unnecessary rte_malloc' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:49 +0000 Message-ID: <20231102131254.315947-103-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.6 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/08/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/997c669059a4ff49e551deec11b899adba4d73ee Thanks. Kevin --- >From 997c669059a4ff49e551deec11b899adba4d73ee Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 7 Aug 2023 13:43:10 -0700 Subject: [PATCH] app/procinfo: remove unnecessary rte_malloc [ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ] Better to use malloc() which is faster than rte_malloc() and has more error checking, as is done already for statistics. Fixes: 077c546704da ("app/proc_info: add metrics displaying") Signed-off-by: Stephen Hemminger Acked-by: Chengwen Feng --- app/proc-info/main.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index e1ccdbbaa5..f628377c19 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -20,5 +20,4 @@ #include #include -#include #include #include @@ -622,6 +621,5 @@ metrics_display(int port_id) } - metrics = rte_malloc("proc_info_metrics", - sizeof(struct rte_metric_value) * len, 0); + metrics = malloc(sizeof(struct rte_metric_value) * len); if (metrics == NULL) { printf("Cannot allocate memory for metrics\n"); @@ -629,8 +627,8 @@ metrics_display(int port_id) } - names = rte_malloc(NULL, sizeof(struct rte_metric_name) * len, 0); + names = malloc(sizeof(struct rte_metric_name) * len); if (names == NULL) { printf("Cannot allocate memory for metrics names\n"); - rte_free(metrics); + free(metrics); return; } @@ -638,6 +636,6 @@ metrics_display(int port_id) if (len != rte_metrics_get_names(names, len)) { printf("Cannot get metrics names\n"); - rte_free(metrics); - rte_free(names); + free(metrics); + free(names); return; } @@ -651,6 +649,6 @@ metrics_display(int port_id) if (ret < 0 || ret > len) { printf("Cannot get metrics values\n"); - rte_free(metrics); - rte_free(names); + free(metrics); + free(names); return; } @@ -661,6 +659,6 @@ metrics_display(int port_id) printf("%s############################\n", nic_stats_border); - rte_free(metrics); - rte_free(names); + free(metrics); + free(names); } #endif -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:43.256329124 +0000 +++ 0103-app-procinfo-remove-unnecessary-rte_malloc.patch 2023-11-02 13:09:40.926163698 +0000 @@ -1 +1 @@ -From cfe29906c69bedb5f87dadcc02703ce46e80f37e Mon Sep 17 00:00:00 2001 +From 997c669059a4ff49e551deec11b899adba4d73ee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index af4c1d8bcb..ce53bc30df 100644 +index e1ccdbbaa5..f628377c19 100644 @@ -28 +29 @@ -@@ -910,6 +909,5 @@ metrics_display(int port_id) +@@ -622,6 +621,5 @@ metrics_display(int port_id) @@ -36 +37 @@ -@@ -917,8 +915,8 @@ metrics_display(int port_id) +@@ -629,8 +627,8 @@ metrics_display(int port_id) @@ -47 +48 @@ -@@ -926,6 +924,6 @@ metrics_display(int port_id) +@@ -638,6 +636,6 @@ metrics_display(int port_id) @@ -56 +57 @@ -@@ -939,6 +937,6 @@ metrics_display(int port_id) +@@ -651,6 +649,6 @@ metrics_display(int port_id) @@ -65 +66 @@ -@@ -949,6 +947,6 @@ metrics_display(int port_id) +@@ -661,6 +659,6 @@ metrics_display(int port_id)