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 2C72A42800 for ; Wed, 22 Mar 2023 01:42:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20B03427F2; Wed, 22 Mar 2023 01:42:22 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id DB7B440E09 for ; Wed, 22 Mar 2023 01:42:18 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id az3-20020a05600c600300b003ed2920d585so12064876wmb.2 for ; Tue, 21 Mar 2023 17:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679445738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bLrkUvybPYlyBRP5JIZ2OwfpoQUwR2qAjZWr2XC1WT8=; b=cTSdXPL0TsucSoHtxId9KI4tB/yik0nnGM+/omFJc8hKgMKcWRlJXSJwlGEPblh8r0 ueAQGSQSwXGhbHKL+bjEFaUbeUjrTWdJfIfUXv4LKyg9tpYSPMD6gthjaBZjuD52kvsV Dpxops7s13p1chD09/V3wVg806/N8e8SkWpE2ODe9FZ2+JzGWk3fk6NXgDKIZQL3z0me SkWhAgYok4+JqsJN5VAZM/AhzV358cCp0csRe8QkKWepg2EqgmEgaSQBkU+Vzf48i8rn c5XxFiA3+9/CgKa7FTIsPiWpNaPVj4BoWLfo0SxfsTzUOSj+n7zf2x05mgnZL7tUW7eb seug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679445738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bLrkUvybPYlyBRP5JIZ2OwfpoQUwR2qAjZWr2XC1WT8=; b=YG4fEsoeOmF1BJJMzh7WhYMHcC35qpcoVvRocmLmoKR1Xgh4W/XXKCZph+mw5mYknL bPc+NnOt9mdy6V5RVDfZLIqMeTM+U4RaNbNgHYsgKeatpb2/YWw/gRlElYOY9z2oJleo hKF8wJqyGEoWyr92HgpjrHTxJ/+aWfu8ETV58FA4/XZaFQiNm9s1d9Zv/MEja3f4ae44 FVCaycAnz/rKs57KcPjdPubCUiNLkAXJJXKOYIz0Y8ex92mgZP5hzuDa7mexjvq+Hygj j9SS9KqgzPJjgAm4ePRzMbdnRUA91rTqwhZpUZknC4VebEep5gwa4PX1bJvC8n5Iw0bb wXLw== X-Gm-Message-State: AO0yUKVupSQnsG9DPIXItPxtmqCjVnsUyXZY7FUQUDcTmII6rqa1t2wb a8+AWe9C/9pB0obOpvY9gpI= X-Google-Smtp-Source: AK7set/Gn3c8h4RTcz0VzUzu7cOyZ9F7jJLQVvVOg1rpETwl4JDBY/RJkDYeF9HlVZF+TGknPOR+DA== X-Received: by 2002:a05:600c:ad7:b0:3ed:4627:ed09 with SMTP id c23-20020a05600c0ad700b003ed4627ed09mr3652216wmr.28.1679445738466; Tue, 21 Mar 2023 17:42:18 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id y13-20020a1c4b0d000000b003ed551b139csm15019379wma.36.2023.03.21.17.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 17:42:18 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Chenbo Xia , dpdk stable Subject: patch 'net/vhost: add missing newline in logs' has been queued to stable release 20.11.8 Date: Wed, 22 Mar 2023 00:41:46 +0000 Message-Id: <20230322004155.2333903-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-1-luca.boccassi@gmail.com> References: <20230315224631.1025649-39-luca.boccassi@gmail.com> <20230322004155.2333903-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 20.11.8 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/23/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6de448700ea0880adf455369e0e9f2042d09b799 Thanks. Luca Boccassi --- >From 6de448700ea0880adf455369e0e9f2042d09b799 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 9 Mar 2023 13:37:50 +0100 Subject: [PATCH] net/vhost: add missing newline in logs [ upstream commit d539a20b7561d9e97d13f9b43d74ec030bd1a4ba ] Fixes: 3f8ff12821e4 ("vhost: support interrupt mode") Fixes: 8f1750f42e2d ("net/vhost: perform SW checksum in Rx path") Fixes: 8ba1723783b2 ("net/vhost: perform SW checksum in Tx path") Signed-off-by: David Marchand Reviewed-by: Chenbo Xia --- drivers/net/vhost/rte_eth_vhost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index c994f2429b..5e57e35ebd 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -623,7 +623,7 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) ret = rte_vhost_get_vhost_vring(vq->vid, (qid << 1) + 1, &vring); if (ret < 0) { - VHOST_LOG(ERR, "Failed to get rxq%d's vring", qid); + VHOST_LOG(ERR, "Failed to get rxq%d's vring\n", qid); return ret; } VHOST_LOG(INFO, "Disable interrupt for rxq%d\n", qid); @@ -819,7 +819,7 @@ new_device(int vid) if (dev_conf->intr_conf.rxq) { if (eth_vhost_install_intr(eth_dev) < 0) { VHOST_LOG(INFO, - "Failed to install interrupt handler."); + "Failed to install interrupt handler.\n"); return -1; } } @@ -1152,7 +1152,7 @@ eth_dev_start(struct rte_eth_dev *eth_dev) if (dev_conf->intr_conf.rxq) { if (eth_vhost_install_intr(eth_dev) < 0) { VHOST_LOG(INFO, - "Failed to install interrupt handler."); + "Failed to install interrupt handler.\n"); return -1; } } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-21 21:56:37.460657174 +0000 +++ 0010-net-vhost-add-missing-newline-in-logs.patch 2023-03-21 21:56:37.064806882 +0000 @@ -1 +1 @@ -From d539a20b7561d9e97d13f9b43d74ec030bd1a4ba Mon Sep 17 00:00:00 2001 +From 6de448700ea0880adf455369e0e9f2042d09b799 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d539a20b7561d9e97d13f9b43d74ec030bd1a4ba ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/vhost/rte_eth_vhost.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + drivers/net/vhost/rte_eth_vhost.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) @@ -18 +19 @@ -index 9c609b45a3..198bf4d1f4 100644 +index c994f2429b..5e57e35ebd 100644 @@ -21,19 +22 @@ -@@ -297,7 +297,7 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev) - if (internal->features & (1ULL << VIRTIO_NET_F_CSUM)) { - if (!(rxmode->offloads & - (RTE_ETH_RX_OFFLOAD_UDP_CKSUM | RTE_ETH_RX_OFFLOAD_TCP_CKSUM))) { -- VHOST_LOG(NOTICE, "Rx csum will be done in SW, may impact performance."); -+ VHOST_LOG(NOTICE, "Rx csum will be done in SW, may impact performance.\n"); - internal->rx_sw_csum = true; - } - } -@@ -305,7 +305,7 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev) - if (!(internal->features & (1ULL << VIRTIO_NET_F_GUEST_CSUM))) { - if (txmode->offloads & - (RTE_ETH_TX_OFFLOAD_UDP_CKSUM | RTE_ETH_TX_OFFLOAD_TCP_CKSUM)) { -- VHOST_LOG(NOTICE, "Tx csum will be done in SW, may impact performance."); -+ VHOST_LOG(NOTICE, "Tx csum will be done in SW, may impact performance.\n"); - internal->tx_sw_csum = true; - } - } -@@ -646,7 +646,7 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) +@@ -623,7 +623,7 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) @@ -48 +31 @@ -@@ -851,7 +851,7 @@ new_device(int vid) +@@ -819,7 +819,7 @@ new_device(int vid) @@ -57 +40 @@ -@@ -1191,7 +1191,7 @@ eth_dev_start(struct rte_eth_dev *eth_dev) +@@ -1152,7 +1152,7 @@ eth_dev_start(struct rte_eth_dev *eth_dev)