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 6A05143B86 for ; Tue, 5 Mar 2024 10:50:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FDBE4026B; Tue, 5 Mar 2024 10:50:17 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2061.outbound.protection.outlook.com [40.107.95.61]) by mails.dpdk.org (Postfix) with ESMTP id A71354014F for ; Tue, 5 Mar 2024 10:50:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YwogSeVnItga1bQfC5Vw7/NuzYo+d5/xvxgUmkggOwo5CMHDiAeX4hfYjoGMtdM5t6nCJEdIsgBJuyO6wCmLinfPLkrvpnGyZM4tml8oCOA5nkE1pnzD0KH783fM9DPMnG5ntcqM7zcWBW2cqR5dUfJiz0hhZ/UYf1eBSULNdzeIeF74PMUZcScdaXtyLyCS2RYMZ4vr4P9Wlw4EyuUZpNuF+uBKFqusKkEcUNNzVsk5pPbm5kr+VVfWmELfi9kRzYDnP2PHLE9QLDA+NzVG943pKGGlo1xLOf9EFQK2X5cY2W8RzSX9I8fS+YHPADDwx8Q4ojKDk1dTcwLgS9m4QA== 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=lWI9a2dBKJ0GwgnvmEXMQFrEmqCahezCt9k6bOH8UdI=; b=JsGCQ6M16Vyua2dnaCdusUVzwAY9JNXZqlE7kMalh7EqYvMx3xw+dVDJ+WaELQuJgi42VJr85KMnW4fxvfO8zxaoHSIHwVs6GjwoTMG9bRDXjtTDLYdpZV8rLLz2XBE+IFhqGd+6kIrE6U5scEhuz03fYm8wdiYHd0pPw9UqdUlLAuGVP3YJpGttuo8OYLF5GjXf2a6KdZrUk7bHowYn5KTXgbSLuPiRx7g6d6B7G856/QGe9mirYXedWrh+wkPguueEIRYniPqKIoUgNMwZhQhHIyMClfZJnuFTADpZKjn3EoiVMtzHTIslaD4u7h5x4MUQdSUNozRuOAZBCI2W8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=qq.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=lWI9a2dBKJ0GwgnvmEXMQFrEmqCahezCt9k6bOH8UdI=; b=PUz4TFDh7dISd0n1KQl6nn/YCQzGAaYFKfli+Zp6RxFNrXx4xpssqve6bOKBlA42LRJ1QdgWO3AiIeIoWACqid9qdqFPrUz0AaMzORWoo5rR5EJ8TPhQAYDxdtVNsYKL2mz2nIVv0MaMXIunkc3pjjqiVaWfP2JIA+vimcJRf7g6z0v4SNtt+g5FyPxr7h1eCtEPrKRAO7/zZaQ4I6wrSVMLzh6QxBJnK5L/0d8u0nzXM13oQ1icBZqFM7OZSwB28PAi7FbEitjiP65SpbumDhJ/1IiJ3JBqgfiLzYTI/SU9CqrCD4OKswHjWtIXMx0bg6lQo2MCVRvpDJjB7SJqyg== Received: from CY5PR13CA0012.namprd13.prod.outlook.com (2603:10b6:930::23) by LV2PR12MB5917.namprd12.prod.outlook.com (2603:10b6:408:175::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:50:13 +0000 Received: from CY4PEPF0000FCC1.namprd03.prod.outlook.com (2603:10b6:930:0:cafe::34) by CY5PR13CA0012.outlook.office365.com (2603:10b6:930::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:50:12 +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 CY4PEPF0000FCC1.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:50:12 +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; Tue, 5 Mar 2024 01:50:03 -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.1258.12; Tue, 5 Mar 2024 01:50:01 -0800 From: Xueming Li To: Shaowei Sun <1819846787@qq.com> CC: Bruce Richardson , Ciara Power , Chengwen Feng , dpdk stable Subject: patch 'telemetry: fix connected clients count' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:01 +0800 Message-ID: <20240305094757.439387-21-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: CY4PEPF0000FCC1:EE_|LV2PR12MB5917:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d2b6eee-8611-4c69-d2e6-08dc3cf9a732 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MC2kjW6VLhROmTOxLatkFVU53kvASE9Hl28LzNc13Ca8cAqIMCzWfChu2X8ftBbzJTpIF6ryNBBBbZR62+OG2Ws2uoc8atYaPhzuzr4slopwI6ijPr3scwaAw1pmlk08fTL7OLzvwvlSrrJqpNoOfVcIodBvSKBaw0YzNTW7vmTAsLIjqOWLu6NXJCA3jt69U7VSImh5A7AfIJlimRkNC8IS4/aOYf8bEPLTnrufngnDeWksYz8LhdeI96dt24NkjwWPJlyJMmeh7evP4RnXZlaA7BbQZxC5d260nIliRda5kJAZk4Vp8beVaUzfkgTuvBkPVhfXudMnYDGmFpdc5BaFrhOe7/XAUbC8LphfDR2Ll57PnzR13YrrVQoEybstCDaV4EOaTMjLxXCTR0cas4dkhR4niqibsbd9PvJAbw5ZagI2Wf2prm07wLkn3bvOxIZ7UesxrT/PcINhZkVDXclKS5HU3wk9GO+w+8eJZOrTz4qH9ZTVBkP0UKAfI84n5SsQU7d0aTFnXYcwrj+MUc9hNd1rT1lBzOX+D1jHhAXqVEql4s+aiBo8Z3tHmmlmqk4s9o8W0c3UNPtpJM7SFznvpvdltfl3mVycIdHtfqhYYS+pMvW+blN7lP0V4YmBDK/Yr8U8xKTzCPQWCRCF5jrn8pIcqiSHFtF0UybcAOcn6M2E7mF6EcBs9VTZmphVnIixIED7jQIDeicjI3s8mAoMmfhJ7SUXXliINWja52/Es/xnwXKnS4SAm6i7eeo4 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)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:50:12.8010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d2b6eee-8611-4c69-d2e6-08dc3cf9a732 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: CY4PEPF0000FCC1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5917 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=cbd1c165bb1ea86efc31c8ac309ee5e7c5f555cb Thanks. Xueming Li --- >From cbd1c165bb1ea86efc31c8ac309ee5e7c5f555cb Mon Sep 17 00:00:00 2001 From: Shaowei Sun <1819846787@qq.com> Date: Tue, 30 Jan 2024 09:57:04 +0800 Subject: [PATCH] telemetry: fix connected clients count Cc: Xueming Li [ upstream commit e14bb5f1050924de1602033596d5b417bfbeee52 ] Telemetry can only create 10 conns by default, each of which is processed by a thread. When a thread fails to write using socket, the thread will end directly without reducing the total number of conns. This will result in the machine running for a long time, and if there are 10 failures, the telemetry will be unavailable Fixes: 2a7d0b872f79 ("telemetry: add upper limit on connections") Signed-off-by: Shaowei Sun <1819846787@qq.com> Acked-by: Bruce Richardson Acked-by: Ciara Power Acked-by: Chengwen Feng --- .mailmap | 1 + lib/telemetry/telemetry.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index ab0742a382..8d8f5b1b5d 100644 --- a/.mailmap +++ b/.mailmap @@ -1278,6 +1278,7 @@ Shally Verma Shannon Nelson Shannon Zhao Shaopeng He +Shaowei Sun <1819846787@qq.com> Sharmila Podury Sharon Haroni Shay Agroskin diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c index 92982842a8..ee4718a4b3 100644 --- a/lib/telemetry/telemetry.c +++ b/lib/telemetry/telemetry.c @@ -377,8 +377,8 @@ client_handler(void *sock_id) "{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}", telemetry_version, getpid(), MAX_OUTPUT_LEN); if (write(s, info_str, strlen(info_str)) < 0) { - close(s); - return NULL; + TMTY_LOG(ERR, "Socket write base info to client failed\n"); + goto exit; } /* receive data is not null terminated */ @@ -403,6 +403,7 @@ client_handler(void *sock_id) bytes = read(s, buffer, sizeof(buffer) - 1); } +exit: close(s); rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed); return NULL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:31.698145124 +0800 +++ 0020-telemetry-fix-connected-clients-count.patch 2024-03-05 17:39:30.693566490 +0800 @@ -1 +1 @@ -From e14bb5f1050924de1602033596d5b417bfbeee52 Mon Sep 17 00:00:00 2001 +From cbd1c165bb1ea86efc31c8ac309ee5e7c5f555cb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e14bb5f1050924de1602033596d5b417bfbeee52 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index aa569ff456..a0756974e2 100644 +index ab0742a382..8d8f5b1b5d 100644 @@ -31 +33 @@ -@@ -1281,6 +1281,7 @@ Shally Verma +@@ -1278,6 +1278,7 @@ Shally Verma @@ -40 +42 @@ -index 47846ef868..d4720197ba 100644 +index 92982842a8..ee4718a4b3 100644 @@ -43 +45 @@ -@@ -378,8 +378,8 @@ client_handler(void *sock_id) +@@ -377,8 +377,8 @@ client_handler(void *sock_id) @@ -49 +51 @@ -+ TMTY_LOG_LINE(ERR, "Socket write base info to client failed"); ++ TMTY_LOG(ERR, "Socket write base info to client failed\n"); @@ -54 +56 @@ -@@ -404,6 +404,7 @@ client_handler(void *sock_id) +@@ -403,6 +403,7 @@ client_handler(void *sock_id)