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 A96A843345 for ; Thu, 16 Nov 2023 14:24:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A25F0402DD; Thu, 16 Nov 2023 14:24:08 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0B9CD402B0 for ; Thu, 16 Nov 2023 14:24:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141044; 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=9q6aBaCqXLxRO0NHyohu4t1RmbsDNS608A6xzn72Aek=; b=fZvTsBucDNt18OludfDQZmZAXxSk+A+LhW8OZCYRwXwMsArUDenu5W4FJ8QWLDTUcyhQ01 ikZ/Oq0lYa4TaUrA7h4Fzr1NmPS/uJR2GU1MqvOGy5bYQVJOmGZWar7EWYIfO7hTh2Q7i5 CvB5G5h1fSn7bJ6yi/xwis+vmHRGsqQ= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-356-1gAEVWqsPeCQ1HXVkl3KHQ-1; Thu, 16 Nov 2023 08:24:03 -0500 X-MC-Unique: 1gAEVWqsPeCQ1HXVkl3KHQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD8A482A66A; Thu, 16 Nov 2023 13:24:02 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7F512166B27; Thu, 16 Nov 2023 13:24:01 +0000 (UTC) From: Kevin Traynor To: Fengjiang Liu Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix missing next flag in Tx packed ring' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:22:45 +0000 Message-ID: <20231116132348.557257-3-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/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/0c91efd3313447e75d1d0c9abf76a1798c8451c8 Thanks. Kevin --- >From 0c91efd3313447e75d1d0c9abf76a1798c8451c8 Mon Sep 17 00:00:00 2001 From: Fengjiang Liu Date: Tue, 17 Oct 2023 15:26:23 +0800 Subject: [PATCH] net/virtio: fix missing next flag in Tx packed ring [ upstream commit f923636411c557782f4718de8bee856d60afa74c ] When the packets is sent in packed mode, and the packets data and virtio-header are divided into two desc, set the next flag of virtio-header desc Bugzilla ID: 1295 Fixes: 892dc798fa9c ("net/virtio: implement Tx path for packed queues") Signed-off-by: Fengjiang Liu Reviewed-by: Maxime Coquelin --- .mailmap | 1 + drivers/net/virtio/virtqueue.h | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index f0aac43189..1111c386e2 100644 --- a/.mailmap +++ b/.mailmap @@ -377,4 +377,5 @@ Fei Chen Feifei Wang Fei Qin +Fengjiang Liu Fengnan Chang Fengtian Guo diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index 99c68cf622..9a77e7d701 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -776,4 +776,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); start_dp[idx].len = vq->hw->vtnet_hdr_size; + head_flags |= VRING_DESC_F_NEXT; hdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr; idx++; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.667948162 +0000 +++ 0003-net-virtio-fix-missing-next-flag-in-Tx-packed-ring.patch 2023-11-16 13:21:52.392946206 +0000 @@ -1 +1 @@ -From f923636411c557782f4718de8bee856d60afa74c Mon Sep 17 00:00:00 2001 +From 0c91efd3313447e75d1d0c9abf76a1798c8451c8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f923636411c557782f4718de8bee856d60afa74c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 3f5bab26a8..5273df74cb 100644 +index f0aac43189..1111c386e2 100644 @@ -25 +26 @@ -@@ -395,4 +395,5 @@ Fei Chen +@@ -377,4 +377,5 @@ Fei Chen @@ -32 +33 @@ -index c1cb941c43..5d0c0399a8 100644 +index 99c68cf622..9a77e7d701 100644 @@ -35,3 +36,3 @@ -@@ -683,4 +683,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, - start_dp[idx].addr = txvq->hdr_mem + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); - start_dp[idx].len = vq->hw->vtnet_hdr_size; +@@ -776,4 +776,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); + start_dp[idx].len = vq->hw->vtnet_hdr_size;