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 B323DA0540 for ; Wed, 6 Jul 2022 22:35:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A6F924113F; Wed, 6 Jul 2022 22:35:54 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 07E0D4069D for ; Wed, 6 Jul 2022 22:35:53 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id s1so23598664wra.9 for ; Wed, 06 Jul 2022 13:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LJ+trSEunBw1r7X6xew29GnmJuXeXSznT+WZ1gWBHqU=; b=k/wup4R0AqJng+9bOvVPmN+fN8JI+wusNrOnbrK59m7oKupnz8E3h8T5n96pKTs6mG +jvT/ilgyU2bdAps9XdIMJRzTNMN1BMOhaQkvWB/wEQEArXiZzIovYXSzdpTP+C5rw+p IuGhZkcBwe2LQF0WBeENzmfFxmqaF+HIDbFDBwBxGmDDFBpG0rE9cIKLHpnaZ36A0bgh CSph7ev19qiaLTrPPNT6lC89EEsBiyiUp6PxBDMLa+zVtyTU1wOj1fIZv+FQmzAjt1ce W72RViFzQtmLwFmqW1Vsw71xLRyUkQQcb/XLlhv+meoMEXSPyca6mtPWmdfS9tSa+rkJ lEDA== 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=LJ+trSEunBw1r7X6xew29GnmJuXeXSznT+WZ1gWBHqU=; b=fJKGqaRDkieuEBhTIciZUu74BniFiE95RBn1vZRfborVIRjlsFnYq2eQDBK141sAL2 Uk6AtTtyZduWCCCqqP8LU8g1K7FzkomsHDkA/b+soPxJw96N8FGD55SaYvAHtNSxDyS2 9dxPD3/pMT8fJUuyTbzbntcGOH4Xwom/bZ6Fj3dxbCfjZRuY8KV0cCAsfzGVOX1TH8hV dLLE22+6avIY9p4gg8QOIrzEuRibWYSDYfW4Y0PPM2gBkgjskQTu9s6kx+jZ55TCTPwF Ae1OyMZ1uUIB5B4/5wbV0P7ZhjbRvGd19/vda3vEgdjOSOmAVQK50WfQG1CoS1aHSsOH DPtQ== X-Gm-Message-State: AJIora+j9qZr6lstg8G8iizKdQry8TbclWFOPSV73cLovn/A+nzKd2MY kU+AxRkONxH5mmfvhk8CVZU= X-Google-Smtp-Source: AGRyM1s9BJ2ioQXbN5MkzQGeJiaBrkJ8fnzb2RSszpDM/UEYzRY/4dzlqWjGzJ2enH0nkh+IBmo0SA== X-Received: by 2002:a5d:6149:0:b0:21d:6ba7:6095 with SMTP id y9-20020a5d6149000000b0021d6ba76095mr16085129wrt.680.1657139752781; Wed, 06 Jul 2022 13:35:52 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id t10-20020adfe10a000000b00210320d9fbfsm44009501wrz.18.2022.07.06.13.35.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:35:52 -0700 (PDT) From: luca.boccassi@gmail.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 21.11.2 Date: Wed, 6 Jul 2022 21:34:50 +0100 Message-Id: <20220706203506.3422496-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.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 21.11.2 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/08/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1f963ee7a31061c864884f72b77a611a0f3e6507 Thanks. Luca Boccassi --- >From 1f963ee7a31061c864884f72b77a611a0f3e6507 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/vhost/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 82963c1e6d..33f54a779b 100644 --- a/lib/vhost/socket.c +++ b/lib/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,7 +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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.080253711 +0100 +++ 0015-vhost-add-some-trailing-newline-in-log-messages.patch 2022-07-06 21:07:53.543518707 +0100 @@ -1 +1 @@ -From 1ef468a7e9ff1a9da50b809ae04bbf60b6fbe351 Mon Sep 17 00:00:00 2001 +From 1f963ee7a31061c864884f72b77a611a0f3e6507 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/vhost/socket.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) @@ -21 +22 @@ -index 7a0f63af14..24d60ca149 100644 +index 82963c1e6d..33f54a779b 100644 @@ -24 +25 @@ -@@ -499,7 +499,7 @@ vhost_user_reconnect_init(void) +@@ -501,7 +501,7 @@ vhost_user_reconnect_init(void) @@ -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__); +- VHOST_LOG_CONFIG(ERR, "failed to initialize mutex"); ++ VHOST_LOG_CONFIG(ERR, "failed to initialize mutex\n"); @@ -33 +34 @@ -@@ -507,9 +507,9 @@ vhost_user_reconnect_init(void) +@@ -509,10 +509,10 @@ vhost_user_reconnect_init(void) @@ -39,3 +40,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 +47 @@ - return ret; -@@ -1170,8 +1170,8 @@ rte_vhost_driver_start(const char *path) - "vhost-events", NULL, fdset_event_dispatch, +@@ -1147,7 +1147,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); + VHOST_LOG_CONFIG(ERR, +- "failed to create fdset handling thread"); ++ "failed to create fdset handling thread\n"); + @@ -55 +55,0 @@ - }