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 B678A42D46 for ; Sun, 25 Jun 2023 08:36:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0D3540ED8; Sun, 25 Jun 2023 08:36:57 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2065.outbound.protection.outlook.com [40.107.95.65]) by mails.dpdk.org (Postfix) with ESMTP id 65C7740A7F for ; Sun, 25 Jun 2023 08:36:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X8Nl02UBHWumwT3u459mmdZxMWv1W1eNm2PiCf/RwCbyMiBLD1rVIxYEGh/h8mKCWRISwuyjqYUSNkwlfi6VVmV85uZdIq0q/fq5hCzKyOv1GlDKX2hv/FcTalHJxF5ZH5A6z7n3ODs+93n1LvbKlfE9Qh4hlH52TMD9uBImTPjPzVH2EB2gNKr8AR8XrE/lz1IrLnE+03RjT88MUErK/RO5oYfdSWqMPwNBlpxkEsfxGgohTvfj8P6LKJoJns/aqiuZol52SCeRYUG31BSQ68R/93mMWRIHwKgZN4NTA3TZyXCTwvKKHqYy2erCFaVuZVgBTgePFvogaDmqJKjtnA== 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=X+XrF69cOjNbI2QeHpIwtbE+kQDokFT/KbeLeslCdB8=; b=YmHYjKGPZRP9WXMCSPQnXiRAjYNRfQEemUxfE7ar492NDpWK2FG7WZeRZYDulvnrjRhEvpEsj31nTv4RabjNuEdOJVXfDr46Yo2FSEKmMxlunoovbbxtwfZeV23mV28TcFjA50UHF8RpCNOKcODZfJ7uG9ccZeHCGN6Q1waKVwbK6SWNrfIW6x84wxsp8FUY598kwlZIePqZdlQkD5+qQiflKJjVdsT7FgjOVIdxwNKNnfy5pt9qxh/OY71Im5MaJFA7J8YBRIP8mTlu9QcnFXS4Ar2Zg+X6ngGNhRB96rTxm1OWi13/RRnE3EV6jz4G/QjNxpaZBpNmmH1IuU+QXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 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=X+XrF69cOjNbI2QeHpIwtbE+kQDokFT/KbeLeslCdB8=; b=WaWg4f9TRwh6f/hpTNG6HbG90RPNbXurORmeGDCSdPg8OaNkaFYQXQmuc5DbMvGS2PL+hUnTzY5w/UzH0PuqN4FHA4rwAOfn54IgUjECeBDyFUKzWEm5JogS+UBJC8yhj3nJz+erwkiuA6QcLCZ4ZhXn21PjDO9xRU0YZH8hNzQ622LlQ6CsWcLpQbTVWlm6y+lXkQCEP1nUjlqxdTsj+l9uIXg3SaWQ+j9ljjH1RJSGriF6MQhwJWeT4PlKoy6T7f+pWktREame3RYn8FP4mL9W/7G2GyLvm+15mkiAIxrK8W5cuKNMdxxQFVBMckNjamce3j6I33gvvvb1U3aSVg== Received: from BN8PR15CA0017.namprd15.prod.outlook.com (2603:10b6:408:c0::30) by DS0PR12MB7850.namprd12.prod.outlook.com (2603:10b6:8:146::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:36:54 +0000 Received: from BN8NAM11FT102.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::ff) by BN8PR15CA0017.outlook.office365.com (2603:10b6:408:c0::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:36:54 +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 BN8NAM11FT102.mail.protection.outlook.com (10.13.177.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:36:53 +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.5; Sat, 24 Jun 2023 23:36:39 -0700 Received: from nvidia.com (10.126.230.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.37; Sat, 24 Jun 2023 23:36:37 -0700 From: Xueming Li To: Bruce Richardson CC: Tyler Retzlaff , dpdk stable Subject: patch 'telemetry: fix autotest on Alpine' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:46 +0800 Message-ID: <20230625063544.11183-9-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT102:EE_|DS0PR12MB7850:EE_ X-MS-Office365-Filtering-Correlation-Id: b57e9db8-d4f2-4474-d312-08db754690dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LzaqAfiSpaPPz5Vsf2zJzSc4BdyCP7Psvh7mnsEy+qAeB3lHMmb/m+9l/hJU7zg2+mTM7VxMfbpt6hLapXjQObXjSYjR0vO881rie5K8jKrSRXCwS0c69DOJk++S2TG+rkHc1ahoy6QIp6GpWMYBmL98tHXWdlUy0NhG60Gw0EPs+GvDIV0V5ee2ANorx7rredjIKCGWs7h+DDuZnrzCqZYrYyJVSrHHkVHsJldcrIoy5MlfdC/AURaGfk+Tt5BFkM3mz5FTdgECYC7Bh5/F1Oki8lxaeblSNd+9r74vtC4bhdzAzfIKDSI1dSItJMf42bpWk7wVBbrxsUaKJ0GSR9HNfn7ACt0YqY2ouZM+0e/lnbsgH3EnafjMqz91UhaEge4jMCugKlD1O2AMbhZMLM2VU6zoYyiy9vX+w1JsHlCarFhsYQispBvsaKl/WTAA2PRd2Xei7IOsIiUre4TV6mNsS0LiMyTVj59/xaK+DVbAL2715PzzoF0wRcgMoae4Ls0TSIMCWBjdE4TbFNYGj8AsKg5awMiacr15PebYCQQ2ZtdTHJ1tTK2J7qzxuIKJ1uE42VfjM7kcbomR+/gYz+XbW382jg9arvqantKVbs8k7wedg4pgzbzNh5Lj3L+IrlPkn5r1BjY/J5OGORcOeSM4uJptYjOtqochyptAAdorsyoWqYoZyPQW9nlFkRRyXyFuVDFrUWe1b8+SXCwZ8yPDXlZr2/mnp7ZH+EdARvC2L+46FQ5W4KygUzdDjWxSmaLgo59fMI7eOH3bBoSZcw== 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:(13230028)(4636009)(136003)(376002)(346002)(396003)(39860400002)(451199021)(36840700001)(40470700004)(46966006)(6666004)(26005)(16526019)(82740400003)(186003)(5660300002)(356005)(53546011)(6286002)(7636003)(82310400005)(7696005)(478600001)(1076003)(2616005)(8936002)(2906002)(40480700001)(8676002)(40460700003)(41300700001)(70206006)(6916009)(54906003)(55016003)(83380400001)(316002)(426003)(966005)(70586007)(4326008)(86362001)(47076005)(336012)(36860700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:36:53.9577 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b57e9db8-d4f2-4474-d312-08db754690dc 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: BN8NAM11FT102.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7850 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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=57dd0e53b1cba93311a851d7d9a07084998a16ab Thanks. Xueming Li --- >From 57dd0e53b1cba93311a851d7d9a07084998a16ab 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 Cc: Xueming Li [ 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 7b905355cd..9c3c346ff5 100644 --- a/lib/telemetry/telemetry.c +++ b/lib/telemetry/telemetry.c @@ -208,7 +208,11 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) break; 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; if (container_to_json(cont->data, @@ -219,6 +223,7 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) v->name, temp); if (!cont->keep) rte_tel_data_free(cont->data); + free(temp); break; } } @@ -275,7 +280,11 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) break; 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; if (container_to_json(cont->data, @@ -286,6 +295,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) v->name, temp); if (!cont->keep) rte_tel_data_free(cont->data); + free(temp); } } } @@ -311,7 +321,11 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) buf_len, used, 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; if (container_to_json(rec_data->data, @@ -321,6 +335,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s) buf_len, used, temp); if (!rec_data->keep) rte_tel_data_free(rec_data->data); + free(temp); } break; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:58.806434800 +0800 +++ 0008-telemetry-fix-autotest-on-Alpine.patch 2023-06-25 14:31:58.285773900 +0800 @@ -1 +1 @@ -From 6ffce64857216344f02ee88d92cb69ee241b3c7b Mon Sep 17 00:00:00 2001 +From 57dd0e53b1cba93311a851d7d9a07084998a16ab Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6ffce64857216344f02ee88d92cb69ee241b3c7b ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index deba7f34a3..590720bfa6 100644 +index 7b905355cd..9c3c346ff5 100644 @@ -73,2 +75,2 @@ - d->data.array[i].uval); - else if (d->type == TEL_ARRAY_CONTAINER) { + d->data.array[i].u64val); + else if (d->type == RTE_TEL_ARRAY_CONTAINER) {