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 51608A0540 for ; Thu, 7 Jul 2022 09:59:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 471B9406B4; Thu, 7 Jul 2022 09:59:40 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 9536142B6C for ; Thu, 7 Jul 2022 09:59:38 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6E99F3F1AA for ; Thu, 7 Jul 2022 07:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180778; bh=509h+1YZjo96fEro5eYuNLVpxucgnOcEFY3jbBCc1Jg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dw9oZLZEZIsbrrJQcZs7QZnuS7BsACKRaRCdS8VTjZa78Ib/RWEogW9cbCRKcwctF CYYgJzNiZOO+GzEfSCPjEVyUijP/3KcMGUEPz/4VMslJsom8CQBzE9HVg5cNVtAVBr Qq7XWkBUWvib+euuZTaHXoSlBLa2Qj1P0y6dbpX52Mac3XDCnEb6fs6EOHgSFm4YzP kUgV+mG1qc1B3hlw3BnTBVJ/gOHIQIhGjN7iiYX3W7LBojbG1B0LpCfuHjjeqVsy/E 4DEvPsV8RAr40jsZcOlhXiF11+ZG06qrjOx5aXdT4buSgsJi0mCOSpqu0i3cN80nOu O7nVxMZJZGRgw== Received: by mail-ej1-f69.google.com with SMTP id qk8-20020a1709077f8800b00722fcbfdcf7so4410762ejc.2 for ; Thu, 07 Jul 2022 00:59:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=509h+1YZjo96fEro5eYuNLVpxucgnOcEFY3jbBCc1Jg=; b=PMTU3VSbzFMCuCVz0GwEhZak9Vx+jL6qfy+D27mnzJTFZKw+MWeGshMEfAUbsRQ0vI BOaednA2uNW1mSQVgwFYFliUxSCWViP2KbRGFY0xmCeSSnxD/GGRRRd54d9z6D4v4TVF 1jvie10W0FYCS5rwUnVKfe/odDYTaPwarqI993SLkG7OGDr+xcn075GnC0iMSpSbICED sbH7kyxC6f0NaurA3YlaWXP1yz+jzeYM3Q3v2JbhOIyinjNzwKHs2jy58OPIkVl9QkJV rG9vzCCkZ3XL/KkB+lDqgeKupH++A3ve8Zj0WVt2RQVcxNrVnDcl3BXKMFLWpGhGTl2J //lA== X-Gm-Message-State: AJIora+wH1fQMz25xW+IsD3lFdc7vmgnZzK2Tj+MJo6hmSO5sXjaE80E T/FrNkDj06Rwq0Bml4LMxKuYjLduvNgyd91KKI66Zm4YtmIPTXhH3cOVH8U9CkdmuNMD8A95paY SlUcYK2DCwGZZGwXuPmJgvkRg X-Received: by 2002:aa7:c0c7:0:b0:43a:79b9:5cd1 with SMTP id j7-20020aa7c0c7000000b0043a79b95cd1mr17064002edp.282.1657180777856; Thu, 07 Jul 2022 00:59:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tUBg9pn9ECVIfHlDObTv31bNgjpgecoIPmQSIJxMz+lzIWPRo6jIRIYxYT/PtLsn4SuPwhXg== X-Received: by 2002:aa7:c0c7:0:b0:43a:79b9:5cd1 with SMTP id j7-20020aa7c0c7000000b0043a79b95cd1mr17063981edp.282.1657180777611; Thu, 07 Jul 2022 00:59:37 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id h17-20020a1709060f5100b00705cdfec71esm18405664ejj.7.2022.07.07.00.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:59:36 -0700 (PDT) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Chenbo Xia , dpdk stable Subject: patch 'vhost: add some trailing newline in log messages' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:20 +0200 Message-Id: <20220707075522.194223-85-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7c4c4a4adc9316e674f83bb5295ce6af6010c8a1 Thanks. Christian Ehrhardt --- >From 7c4c4a4adc9316e674f83bb5295ce6af6010c8a1 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 [ 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index dc70ce154f..2d1f5f64ec 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -499,7 +499,7 @@ vhost_user_reconnect_init(void) ret = pthread_mutex_init(&reconn_list.mutex, NULL); if (ret < 0) { - RTE_LOG(ERR, VHOST_CONFIG, "failed to initialize mutex"); + RTE_LOG(ERR, VHOST_CONFIG, "failed to initialize mutex\n"); return ret; } TAILQ_INIT(&reconn_list.head); @@ -507,10 +507,10 @@ vhost_user_reconnect_init(void) ret = rte_ctrl_thread_create(&reconn_tid, "vhost_reconn", NULL, vhost_user_client_reconnect, NULL); if (ret != 0) { - RTE_LOG(ERR, VHOST_CONFIG, "failed to create reconnect thread"); + RTE_LOG(ERR, VHOST_CONFIG, "failed to create reconnect thread\n"); if (pthread_mutex_destroy(&reconn_list.mutex)) { RTE_LOG(ERR, VHOST_CONFIG, - "failed to destroy reconnect mutex"); + "failed to destroy reconnect mutex\n"); } } @@ -1173,7 +1173,7 @@ rte_vhost_driver_start(const char *path) &vhost_user.fdset); if (ret != 0) { RTE_LOG(ERR, VHOST_CONFIG, - "failed to create fdset handling thread"); + "failed to create fdset handling thread\n"); fdset_pipe_uninit(&vhost_user.fdset); return -1; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:14.628807533 +0200 +++ 0085-vhost-add-some-trailing-newline-in-log-messages.patch 2022-07-07 09:54:11.029825012 +0200 @@ -1 +1 @@ -From 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 Mon Sep 17 00:00:00 2001 +From 7c4c4a4adc9316e674f83bb5295ce6af6010c8a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - lib/vhost/socket.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + lib/librte_vhost/socket.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -20,4 +21,4 @@ -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 +diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c +index dc70ce154f..2d1f5f64ec 100644 +--- a/lib/librte_vhost/socket.c ++++ b/lib/librte_vhost/socket.c @@ -28,2 +29,2 @@ -- VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex", __func__); -+ VHOST_LOG_CONFIG(ERR, "%s: failed to initialize mutex\n", __func__); +- RTE_LOG(ERR, VHOST_CONFIG, "failed to initialize mutex"); ++ RTE_LOG(ERR, VHOST_CONFIG, "failed to initialize mutex\n"); @@ -33 +34 @@ -@@ -507,9 +507,9 @@ vhost_user_reconnect_init(void) +@@ -507,10 +507,10 @@ vhost_user_reconnect_init(void) @@ -37,5 +38,7 @@ -- 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, "%s: failed to destroy reconnect mutex", __func__); -+ VHOST_LOG_CONFIG(ERR, "%s: failed to destroy reconnect mutex\n", __func__); +- RTE_LOG(ERR, VHOST_CONFIG, "failed to create reconnect thread"); ++ RTE_LOG(ERR, VHOST_CONFIG, "failed to create reconnect thread\n"); + if (pthread_mutex_destroy(&reconn_list.mutex)) { + RTE_LOG(ERR, VHOST_CONFIG, +- "failed to destroy reconnect mutex"); ++ "failed to destroy reconnect mutex\n"); + } @@ -44,3 +47 @@ - return ret; -@@ -1170,8 +1170,8 @@ rte_vhost_driver_start(const char *path) - "vhost-events", NULL, fdset_event_dispatch, +@@ -1173,7 +1173,7 @@ rte_vhost_driver_start(const char *path) @@ -49,4 +50,4 @@ -- VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread", path); -- -+ VHOST_LOG_CONFIG(ERR, "(%s) failed to create fdset handling thread\n", -+ path); + RTE_LOG(ERR, VHOST_CONFIG, +- "failed to create fdset handling thread"); ++ "failed to create fdset handling thread\n"); + @@ -55 +55,0 @@ - }