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 12B42427EF for ; Wed, 22 Mar 2023 11:32:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08944410EF; Wed, 22 Mar 2023 11:32:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B70F942BAC for ; Wed, 22 Mar 2023 11:32:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OH4oYjipfR/Z9sBgZ6MFgoxWDBqTbxq9w1ZidM0ruYM=; b=LUj6yQ4Cn4/vGPth0/N2RxSLY24Dp2ofY9MF7sNBd6sHJLBpUL3zqUkr/vJkF0PVm/AJeB 5WzLsBhXs/qMp5ZU3+N/gR7uKpoJznA7tWw0Il5J8viBrjc4e49jsU5UQGiyNt0o6hqLCT EsBo+LD/xEEPjMfYl4qwN70u2Y701HA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-85-FXNrmaflPjylMdQwIlMUoA-1; Wed, 22 Mar 2023 06:32:31 -0400 X-MC-Unique: FXNrmaflPjylMdQwIlMUoA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B657C101157B; Wed, 22 Mar 2023 10:32:30 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBC9A492C13; Wed, 22 Mar 2023 10:32:29 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Chenbo Xia , dpdk stable Subject: patch 'net/vhost: add missing newline in logs' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:56 +0000 Message-Id: <20230322103209.456098-9-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 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/24/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/14297e3110bb392e8acce99e0cb230994503e44c Thanks. Kevin --- >From 14297e3110bb392e8acce99e0cb230994503e44c 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 a280e788fb..ad2d52475d 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -621,5 +621,5 @@ 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; } @@ -821,5 +821,5 @@ new_device(int vid) if (eth_vhost_install_intr(eth_dev) < 0) { VHOST_LOG(INFO, - "Failed to install interrupt handler."); + "Failed to install interrupt handler.\n"); return -1; } @@ -1157,5 +1157,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev) 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-22 10:30:08.157065379 +0000 +++ 0009-net-vhost-add-missing-newline-in-logs.patch 2023-03-22 10:30:07.910866559 +0000 @@ -1 +1 @@ -From d539a20b7561d9e97d13f9b43d74ec030bd1a4ba Mon Sep 17 00:00:00 2001 +From 14297e3110bb392e8acce99e0cb230994503e44c 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 a280e788fb..ad2d52475d 100644 @@ -21,15 +22 @@ -@@ -298,5 +298,5 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev) - 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; - } -@@ -306,5 +306,5 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev) - 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; - } -@@ -647,5 +647,5 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) +@@ -621,5 +621,5 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) @@ -42 +29 @@ -@@ -852,5 +852,5 @@ new_device(int vid) +@@ -821,5 +821,5 @@ new_device(int vid) @@ -49 +36 @@ -@@ -1192,5 +1192,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev) +@@ -1157,5 +1157,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev)