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 4B35942ECF for ; Thu, 20 Jul 2023 17:25:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4884442D3E; Thu, 20 Jul 2023 17:25:31 +0200 (CEST) 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 EE07342BAC for ; Thu, 20 Jul 2023 17:25:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866728; 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=j7oLfuEPdeXvDNCJaRpXufbSMKqGAYucBZ9ztygOPgU=; b=ekH7e/DxIWgt7DURR6gcenYPchVt2fhGZGOrIEVSKyzSomCtjfjKGBczx3H5p68dFE0kE3 H9fYTu7rNUkwhbaV4v3WLlUwD7xhysbQdW/+Vh7uy08uw0FSA39xN2Oj0wCx/ioD+pbhNA 17p8R4Sc9eaMJEFN64SWs6AZSpjXIrg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-498-Zii6OUAoMKq-uOc99hi7ow-1; Thu, 20 Jul 2023 11:20:45 -0400 X-MC-Unique: Zii6OUAoMKq-uOc99hi7ow-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5F9618E0BE1; Thu, 20 Jul 2023 15:20:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C0CE4A9004; Thu, 20 Jul 2023 15:20:05 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Tyler Retzlaff , dpdk stable Subject: patch 'telemetry: fix autotest on Alpine' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:19 +0100 Message-ID: <20230720151942.262154-8-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/c95d48b0d4e2f9eb5cdb4d2b2e7a1da22b534e94 Thanks. Kevin --- >From c95d48b0d4e2f9eb5cdb4d2b2e7a1da22b534e94 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 5 Apr 2023 17:03:22 +0100 Subject: [PATCH] telemetry: fix autotest on Alpine [ upstream commit 6ffce64857216344f02ee88d92cb69ee241b3c7b ] On Alpine linux, the telemetry_data_autotest was failing for the test where we had dictionaries embedded in other dictionaries up to three levels deep. Indications are that this issue is due to excess data being stored on the stack, so replace stack-allocated buffer data with dynamically allocated data in the case where we are doing recursive processing of telemetry data structures into json. Bugzilla ID: 1177 Fixes: c933bb5177ca ("telemetry: support array values in data object") Fixes: d2671e642a8e ("telemetry: support dict of dicts") Signed-off-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/telemetry/telemetry.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c index 9ff0def182..e73f4a593e 100644 --- a/lib/telemetry/telemetry.c +++ b/lib/telemetry/telemetry.c @@ -198,5 +198,9 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) case RTE_TEL_CONTAINER: { - char temp[buf_len]; + char *temp = malloc(buf_len); + if (temp == NULL) + break; + *temp = '\0'; /* ensure valid string */ + const struct container *cont = &v->value.container; @@ -209,4 +213,5 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) if (!cont->keep) rte_tel_data_free(cont->data); + free(temp); break; } @@ -265,5 +270,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) case RTE_TEL_CONTAINER: { - char temp[buf_len]; + char *temp = malloc(buf_len); + if (temp == NULL) + break; + *temp = '\0'; /* ensure valid string */ + const struct container *cont = &v->value.container; @@ -276,4 +285,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) if (!cont->keep) rte_tel_data_free(cont->data); + free(temp); } } @@ -307,5 +317,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) d->data.array[i].u64val); else if (d->type == RTE_TEL_ARRAY_CONTAINER) { - char temp[buf_len]; + char *temp = malloc(buf_len); + if (temp == NULL) + break; + *temp = '\0'; /* ensure valid string */ + const struct container *rec_data = &d->data.array[i].container; @@ -317,4 +331,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) if (!rec_data->keep) rte_tel_data_free(rec_data->data); + free(temp); } used += prefix_used; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:56.195946273 +0100 +++ 0008-telemetry-fix-autotest-on-Alpine.patch 2023-07-20 16:17:54.430749564 +0100 @@ -1 +1 @@ -From 6ffce64857216344f02ee88d92cb69ee241b3c7b Mon Sep 17 00:00:00 2001 +From c95d48b0d4e2f9eb5cdb4d2b2e7a1da22b534e94 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6ffce64857216344f02ee88d92cb69ee241b3c7b ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index deba7f34a3..590720bfa6 100644 +index 9ff0def182..e73f4a593e 100644 @@ -29 +30 @@ -@@ -209,5 +209,9 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) +@@ -198,5 +198,9 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) @@ -40 +41 @@ -@@ -220,4 +224,5 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) +@@ -209,4 +213,5 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) @@ -46 +47 @@ -@@ -276,5 +281,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) +@@ -265,5 +270,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) @@ -57 +58 @@ -@@ -287,4 +296,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) +@@ -276,4 +285,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) @@ -63,3 +64,3 @@ -@@ -312,5 +322,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) - d->data.array[i].uval); - else if (d->type == TEL_ARRAY_CONTAINER) { +@@ -307,5 +317,9 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) + d->data.array[i].u64val); + else if (d->type == RTE_TEL_ARRAY_CONTAINER) { @@ -74 +75 @@ -@@ -322,4 +336,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) +@@ -317,4 +331,5 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) @@ -79 +80 @@ - break; + used += prefix_used;