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 47ADDA00C5 for ; Wed, 20 Jul 2022 10:26:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B21741101; Wed, 20 Jul 2022 10:26:58 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43]) by mails.dpdk.org (Postfix) with ESMTP id 1EE1940697 for ; Wed, 20 Jul 2022 10:26:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=McwpKR9gFlEVoss6xOVVkUzEb9yRKaJ8JZQEUneMkFqiEW5czroE/akkRDD5izPlS3ReXmB76p6p2wMpAg5zWXUWXYQE6EY0Gw6meDOpyVz1NRo2+s+tDz5c6IZo9yTX7g8wy3cSCccu/d+K+HonABM0mww+vMQogWJCznC5FxqmPcLU/cnYWYhGjqHDkC1NljzU1XNNBmGtNtgznKFHLJpVWZSWBbtCWSRChQzErao7+1wMkIsp7ikp/N4cBfCZ+bSvOP4nicaKg/P0l2meczrooIMgjrpsJ6FlYtOzCXGLOSXh9L2L2PfnD0D5SjLksG3I4UFtYJzpQ3fWGSHaVA== 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=WvpJfSuNBErowCp2P4Se+TvtA8jnCxuEo7j3wNQYYZw=; b=Tsg6RbavEeN1QjgmKXweWOYo2+DHskeyDUKlt/sqnvz7ff1crxLI1rnqvNINuEbooYyI2KEdtM9ce6oC8aPC3zggrWFLyyJjkG+M94rT+BgzMVBSwRI2CtbhDlJkh6Mq5/k3fR8NXcpxdchHzPc4J95V4KfaHVuClEtocZkbGIsEPZkxVqL/JNAgNSE0mSbQvuZ/mMqNbU26TbHC+zj55eSPLLYfWn54fVya23v4FFXthxGdvTFR697vMzex9U1qHOg0F+LvNU7j8sVIGW8V1r/OBs7ZUJiFbxQJ9sRePYgzJbDhgJ98CtZFrXtNfnDzucC7/Cr5K7uTiQm8YmsSqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org 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=WvpJfSuNBErowCp2P4Se+TvtA8jnCxuEo7j3wNQYYZw=; b=q8r/Ni5Q1qUTtGI48nSVZglmV0zY7br/fKkb1LEAphY3entXnA7BLMfgEgiSFQSD6d8766dM+kozAqVs3WteTscBSU7pBK5mTuLhgWcTEE0nUPBQijQJqYnigVR1EwJu/8sBk3E6uce9Rkorn4RHzgoO98QPOaO7HqaEUSAaYeVKXAQBTBIAWUFhEVe7HKTp09TrmopVp6x3RO832lvi5ewRDtj//8i4R5bNTaeRGU7m/QXbiQMrGHhTdhOXn+vIvLv8A73qbQ1OUtzKVqqllNX79vx8b0QV7i1JgkPkHEMs1REbOb4ZOhlTe4z/AMDuDpht8+sxEhbtAlAT+HOwzg== Received: from MW4PR04CA0217.namprd04.prod.outlook.com (2603:10b6:303:87::12) by BL1PR12MB5947.namprd12.prod.outlook.com (2603:10b6:208:39a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Wed, 20 Jul 2022 08:26:54 +0000 Received: from CO1NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:303:87:cafe::42) by MW4PR04CA0217.outlook.office365.com (2603:10b6:303:87::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Wed, 20 Jul 2022 08:26:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT058.mail.protection.outlook.com (10.13.174.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:26:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:26:53 +0000 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.26; Wed, 20 Jul 2022 01:26:51 -0700 From: Xueming Li To: David Marchand CC: , Chenbo Xia , dpdk stable Subject: patch 'vhost: add some trailing newline in log messages' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:21:28 +0300 Message-ID: <20220720082132.3954126-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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-Office365-Filtering-Correlation-Id: 8b4245f5-4f1a-4e4a-201f-08da6a299a44 X-MS-TrafficTypeDiagnostic: BL1PR12MB5947:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CkzukRuPhRXMQ//afrCh/CUmUMD6/B1J9bAxz0wyG3yl2zbqClQixmcqKrWP?= =?us-ascii?Q?qX1Ka7i1cNkAbrN91u7S1xAER1immSExBc99fEsD9Nicn/HcMscmPYzM3prI?= =?us-ascii?Q?aN9x2Mp2plhg/QqiOzDXDXxohFI5j/y7RYj/2DNP0aPOBe0PbF5oz4Ca4sJK?= =?us-ascii?Q?7NVlUAI/qe7rOZHTSZNDerrZ5JS+dBsjJlUrZNoF3NRJBBofdjZOKpvzy7Aw?= =?us-ascii?Q?aJyaqzAR/E0sU5ubxDuguemXboM42EqfSEpwFv1bmN+C5xmG4DDykJRP7Hw3?= =?us-ascii?Q?Cq2nqNnJF0qfOY3mt3oKUf2uIZD6Dc98mEF6mG2F045zCuolSE2dGuqz+/uG?= =?us-ascii?Q?iRrvzN0jRpLsNzA0SwU2HjgYMt5qHuW9YPHmb7GNtrjiWiPIsdH5+CzJUk9R?= =?us-ascii?Q?QkFvhuJvZ49R2OAysV4FvKsUtDMoBdEuOWYIJvkbFWBZ9QL0mkWW6MD2U3fv?= =?us-ascii?Q?C3KXyVptSk2c9F9nk7CEmvSrCqxWrm4Kc5NpAN29G5biGW6stK4pMKLupOXC?= =?us-ascii?Q?FZy0LTmJDNUO6jYRbF607QQ51/qJ4baVqgDedlr2mbJv8Q0nmAUlYj6KpT+v?= =?us-ascii?Q?r+yg/d8p2i1ROJCKaAkGEc4ZLm5dv6VEsr01DKFqsrDqCjEjaIyfzqDui45q?= =?us-ascii?Q?I41W/FUFX/1bOvByeJOLqrjXt+Fy7jBZxZeF0llLOD4IzuJ2/JYJritf177k?= =?us-ascii?Q?hp0ZGYneKJ2A8L1s4to38O5tD/rPsWkb462gIoIYXCLGHElV8BB8rrWeoof5?= =?us-ascii?Q?tNifmpkyWS9AsYZJaCT/iHubJlxlPn13NYGqRYljUhx0hDuV6P1kHqXISKyz?= =?us-ascii?Q?8vWsink6ntOcFpcvwKLugOPHKSKdYWAqciaMuN1zc/Scal/TP3tfx/ehA3aH?= =?us-ascii?Q?h3gzrUgwFPA30SKS9OE9z7UxnuzRkpPnloa0yIrdvRbGLjhp2JRR3cNHfEk+?= =?us-ascii?Q?RO/JC4BkvgEDtOlPMAbd5Q=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(39860400002)(136003)(396003)(376002)(36840700001)(46966006)(40470700004)(6666004)(356005)(2616005)(6286002)(966005)(478600001)(1076003)(41300700001)(186003)(26005)(7696005)(53546011)(426003)(16526019)(36860700001)(82740400003)(81166007)(47076005)(54906003)(336012)(4326008)(83380400001)(15650500001)(40480700001)(5660300002)(8936002)(82310400005)(2906002)(55016003)(36756003)(6916009)(70586007)(8676002)(86362001)(40460700003)(316002)(70206006)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:26:53.9455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b4245f5-4f1a-4e4a-201f-08da6a299a44 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5947 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 20.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 07/22/22. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/967f4198e0a72879f1c7a5b35a449caedb04289b Thanks. Xueming Li --- >From 967f4198e0a72879f1c7a5b35a449caedb04289b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 1 Jul 2022 09:55:08 +0200 Subject: [PATCH] vhost: add some trailing newline in log messages Cc: Xueming Li [ upstream commit 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 ] VHOST_LOG_* macros don't append a newline. Add missing ones. Fixes: e623e0c6d8a5 ("vhost: add reconnect ability") Fixes: af1475918124 ("vhost: introduce API to start a specific driver") Fixes: 2dfeebe26546 ("vhost: check return of mutex initialization") Signed-off-by: David Marchand Reviewed-by: Chenbo Xia --- lib/librte_vhost/socket.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index c6548608a3..a3e5a0160b 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -501,7 +501,7 @@ vhost_user_reconnect_init(void) ret = pthread_mutex_init(&reconn_list.mutex, NULL); if (ret < 0) { - VHOST_LOG_CONFIG(ERR, "failed to initialize mutex"); + VHOST_LOG_CONFIG(ERR, "failed to initialize mutex\n"); return ret; } TAILQ_INIT(&reconn_list.head); @@ -509,10 +509,10 @@ vhost_user_reconnect_init(void) ret = rte_ctrl_thread_create(&reconn_tid, "vhost_reconn", NULL, vhost_user_client_reconnect, NULL); if (ret != 0) { - VHOST_LOG_CONFIG(ERR, "failed to create reconnect thread"); + VHOST_LOG_CONFIG(ERR, "failed to create reconnect thread\n"); if (pthread_mutex_destroy(&reconn_list.mutex)) { VHOST_LOG_CONFIG(ERR, - "failed to destroy reconnect mutex"); + "failed to destroy reconnect mutex\n"); } } @@ -1147,8 +1147,7 @@ rte_vhost_driver_start(const char *path) &vhost_user.fdset); if (ret != 0) { VHOST_LOG_CONFIG(ERR, - "failed to create fdset handling thread"); - + "failed to create fdset handling thread\n"); fdset_pipe_uninit(&vhost_user.fdset); return -1; } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:01:01.511282165 +0800 +++ 0059-vhost-add-some-trailing-newline-in-log-messages.patch 2022-07-20 15:00:58.804333679 +0800 @@ -1 +1 @@ -From 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 Mon Sep 17 00:00:00 2001 +From 967f4198e0a72879f1c7a5b35a449caedb04289b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +19,2 @@ - lib/vhost/socket.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + lib/librte_vhost/socket.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) @@ -20,5 +22,5 @@ -diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c -index 7a0f63af14..24d60ca149 100644 ---- a/lib/vhost/socket.c -+++ b/lib/vhost/socket.c -@@ -499,7 +499,7 @@ vhost_user_reconnect_init(void) +diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c +index c6548608a3..a3e5a0160b 100644 +--- a/lib/librte_vhost/socket.c ++++ b/lib/librte_vhost/socket.c +@@ -501,7 +501,7 @@ vhost_user_reconnect_init(void) @@ -28,2 +30,2 @@ -- VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex", __func__); -+ VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex\n", __func__); +- VHOST_LOG_CONFIG(ERR, "failed to initialize mutex"); ++ VHOST_LOG_CONFIG(ERR, "failed to initialize mutex\n"); @@ -33 +35 @@ -@@ -507,9 +507,9 @@ vhost_user_reconnect_init(void) +@@ -509,10 +509,10 @@ vhost_user_reconnect_init(void) @@ -39,3 +41,5 @@ - if (pthread_mutex_destroy(&reconn_list.mutex)) -- VHOST_LOG_CONFIG(ERR, "%s: failed to destroy reconnect mutex", __func__); -+ VHOST_LOG_CONFIG(ERR, "%s: failed to destroy reconnect mutex\n", __func__); + if (pthread_mutex_destroy(&reconn_list.mutex)) { + VHOST_LOG_CONFIG(ERR, +- "failed to destroy reconnect mutex"); ++ "failed to destroy reconnect mutex\n"); + } @@ -44,3 +48 @@ - return ret; -@@ -1170,8 +1170,8 @@ rte_vhost_driver_start(const char *path) - "vhost-events", NULL, fdset_event_dispatch, +@@ -1147,8 +1147,7 @@ rte_vhost_driver_start(const char *path) @@ -49 +51,2 @@ -- VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread", path); + VHOST_LOG_CONFIG(ERR, +- "failed to create fdset handling thread"); @@ -51,2 +54 @@ -+ VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread\n", -+ path); ++ "failed to create fdset handling thread\n");