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 481F541D52 for ; Thu, 23 Feb 2023 16:07:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4454A4324B; Thu, 23 Feb 2023 16:07:33 +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 5C16343241 for ; Thu, 23 Feb 2023 16:07:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164850; 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=VQuXoFVPQsmhfTxhEe1bcwTP6Y5F8q5WYqvBYlxYTFE=; b=Xa/8gu01YhVjqPkwSYwFJ2PpLdgwQUDVjGv2fkUoO4O4mlOeRwytaFNDSYnn6Zc2a7ODS0 ds+DYWikcbWOTPFvpdrhE7Om9XAIIKBsPkYVCT/2ZRRnp5CK8RGcDrhX8CZpdBkxEhZ1Cw l5mg7sl5nAW9zWDz+QQIfKHmpVZG0Z0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-347-SfMZx8qjPHqyGlOesgxjaA-1; Thu, 23 Feb 2023 10:07:23 -0500 X-MC-Unique: SfMZx8qjPHqyGlOesgxjaA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC9D83C02558; Thu, 23 Feb 2023 15:07:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61A582166B29; Thu, 23 Feb 2023 15:07:19 +0000 (UTC) From: Kevin Traynor To: Wenwu Ma Cc: Wei Ling , Cheng Jiang , Maxime Coquelin , dpdk stable Subject: patch 'vhost: fix net header settings in datapath' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:16 +0000 Message-Id: <20230223150631.723699-25-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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 02/28/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/dd830098ef69b4165c1776a2b096b560749dfa5a Thanks. Kevin --- >From dd830098ef69b4165c1776a2b096b560749dfa5a Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Wed, 4 Jan 2023 10:39:45 +0800 Subject: [PATCH] vhost: fix net header settings in datapath [ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ] In vhost sync batch enqueue, the "num_buffers" of virtio net header is not be set, but it should be set to 1 if the mrg_rxbuf feature is turned on, This patch fix the issue. Fixes: ef861692c398 ("vhost: add packed ring batch enqueue") Signed-off-by: Wenwu Ma Tested-by: Wei Ling Acked-by: Cheng Jiang Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index e4cc9fdf49..b211799687 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -1247,4 +1247,10 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev, } + if (rxvq_is_mergeable(dev)) { + vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) { + ASSIGN_UNLESS_EQUAL(hdrs[i]->num_buffers, 1); + } + } + vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) virtio_enqueue_offload(pkts[i], &hdrs[i]->hdr); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.445317386 +0000 +++ 0025-vhost-fix-net-header-settings-in-datapath.patch 2023-02-23 14:46:23.733235837 +0000 @@ -1 +1 @@ -From b9c1ec8577936419c8801dfad61e848b3535295f Mon Sep 17 00:00:00 2001 +From dd830098ef69b4165c1776a2b096b560749dfa5a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 9abf752f30..a3dbf8cb10 100644 +index e4cc9fdf49..b211799687 100644 @@ -26 +27 @@ -@@ -1454,4 +1454,10 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev, +@@ -1247,4 +1247,10 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev,