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 BB5D8432DA for ; Wed, 8 Nov 2023 20:25:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B48FD410EA; Wed, 8 Nov 2023 20:25:43 +0100 (CET) Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by mails.dpdk.org (Postfix) with ESMTP id 6A0EE406A2 for ; Wed, 8 Nov 2023 20:25:42 +0100 (CET) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2c7369df9d6so20557551fa.1 for ; Wed, 08 Nov 2023 11:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699471542; x=1700076342; darn=dpdk.org; 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=WN557EwT885qPu0R+kg6q7+pn09MJLLJVyJan77F1KQ=; b=kIkSdsiwgHPSQVnAy5v4RyZDgB3n41nHW/ZnOrKx0fvfPH9OdvY7I36wKb0CGSSMmI Ae6zM6OeXiWKu9GznUQXpRgb0Eiidpa4CkyCWLZr/bSVE6MN3ZjJbUZgIvVrew65B4yf ljMK+H/OE72BbMn7IjfN5QQMyHwhJt0ePOxTmF6UncXoTYQER2rb1LRZsGe3TFBZNYBp V/66sG6dVvu5RwXHs+Taf/iIWS+TXoXXr4C57Cf2z+X7iRyZigCfJU+Fiay5t6hystl9 Q4Vj+9XwOZqVLE1hr0q5Lbr4Y9qseTZqrY54MWWqqQEBjVbjiZhOgcEE5lrNhUHREOVG bRgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699471542; x=1700076342; 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=WN557EwT885qPu0R+kg6q7+pn09MJLLJVyJan77F1KQ=; b=jpaURGQBEwkS0M963VnTU6FJmJgJj2Mcxu56l7AnB2YsQIbj981EyVIcHVWcbGNFVh IY84arXRkTuqrbuXcOj0sMAlzCYoLuHPlY15nXgRYOlcsWSZx2LvAfBCrFSYir0WZEON 5U8B8cUhIJyN3V3lhwh1csgjRhasckOYxcGhp+dCZM5b0nOf3SKCcP3h1JBnfvBtmBmC Urn8wP3gnwXFT9ZKEIGnZ2kc6lraTb22qp7OLE7RPNAajX/lBgPha/T1wbW3YmsAGYgS oVuqdPl/6pCVTwAvjsw6HSeG+E2LFjf1UZvMLT9323se9LNCiNabwv+WPTg6yV1o8T7f Imfg== X-Gm-Message-State: AOJu0YwuV9m6HRb/yd+FmGhB+rqsCPmG3sCcf58XUM/BtITNziR8zPxW yhuH49+FeEuOkeENfU3mnrnLELgOQUfRYA== X-Google-Smtp-Source: AGHT+IHAQaHdPCR6cdrO6lG2oWPMnZm4LhQWEGlbA/Je5tBb/m/8ICXqvaUphaqwFT5DNiu2CLKbqw== X-Received: by 2002:a2e:b011:0:b0:2b9:3684:165 with SMTP id y17-20020a2eb011000000b002b936840165mr2336417ljk.8.1699471541720; Wed, 08 Nov 2023 11:25:41 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id f21-20020a7bcc15000000b0040773c69fc0sm19784218wmh.11.2023.11.08.11.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 11:25:41 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.10 Date: Wed, 8 Nov 2023 19:25:02 +0000 Message-Id: <20231108192535.922238-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231108192535.922238-1-luca.boccassi@gmail.com> References: <20231018235930.3144-41-luca.boccassi@gmail.com> <20231108192535.922238-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.10 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/10/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/3c0ce46c7013e5c4aa86ceda81827241db7f7bbe Thanks. Luca Boccassi --- >From 3c0ce46c7013e5c4aa86ceda81827241db7f7bbe 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 --- drivers/net/virtio/virtqueue.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index 70121eb340..6811ab55d6 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -756,6 +756,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, start_dp[idx].addr = txvq->virtio_net_hdr_mem + 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++; if (idx >= vq->vq_nentries) { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-08 19:23:52.116226569 +0000 +++ 0004-net-virtio-fix-missing-next-flag-in-Tx-packed-ring.patch 2023-11-08 19:23:51.725395299 +0000 @@ -1 +1 @@ -From f923636411c557782f4718de8bee856d60afa74c Mon Sep 17 00:00:00 2001 +From 3c0ce46c7013e5c4aa86ceda81827241db7f7bbe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f923636411c557782f4718de8bee856d60afa74c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +17,0 @@ - .mailmap | 1 + @@ -19 +19 @@ - 2 files changed, 2 insertions(+) + 1 file changed, 1 insertion(+) @@ -21,12 +20,0 @@ -diff --git a/.mailmap b/.mailmap -index 3f5bab26a8..5273df74cb 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -394,6 +394,7 @@ Farah Smith - Fei Chen - Feifei Wang - Fei Qin -+Fengjiang Liu - Fengnan Chang - Fengtian Guo - Ferdinand Thiessen @@ -34 +22 @@ -index c1cb941c43..5d0c0399a8 100644 +index 70121eb340..6811ab55d6 100644 @@ -37,4 +25,4 @@ -@@ -682,6 +682,7 @@ 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; +@@ -756,6 +756,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, + start_dp[idx].addr = txvq->virtio_net_hdr_mem + + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr); + start_dp[idx].len = vq->hw->vtnet_hdr_size;