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 54B4041D4F for ; Thu, 23 Feb 2023 10:38:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 507EF43164; Thu, 23 Feb 2023 10:38:12 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 7466043158 for ; Thu, 23 Feb 2023 10:38:11 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id c18so3585621wmr.3 for ; Thu, 23 Feb 2023 01:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=/8X0xORXL7hTaSMGvJKT2q89pbR63zwftqtuEfAcuxA=; b=JBRwTblEtZPOllmNBOJW4lfQco0iEjM3+e9cSUCcyze4hwDJhl0r1tlWQ0PkI/9a9n 49HHLJp/KTjc/SzIBz8xww1v5br8ua9cIBRw2pJ5QzNPJ1Jb44pxwOnOswFbVx2YvdHO qM+MiMFHdaF8/s0FNNP8n8yqmwConc6LP4YeN145thhcZwtZfWxAQ/PM3peAxZ3jTNtX IlwJQJnMPo/u9tLLMFph6glaSvO7Y2oLbhyQAdpYUetMBU9T+mJRb++l/SX/uiiWbjFU lHeTvR+n+s9QL9YV1kTH/CpwZO97FwAZZK8/BWh5UOjtIx2TTx7yvqlTpQY0OaxIzN7J c6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/8X0xORXL7hTaSMGvJKT2q89pbR63zwftqtuEfAcuxA=; b=XsNXwzd6vYca4vvthZdOstMvJ2L+BkYq4NP0EUXog5oVeNjZ3Sf9JcEnEJsmalAt7K hoBE87XJXUNqdK98SwNyN/GU/zHt59C41V+DPO9PwzBJj8iqZ2Ual/L1bitAhrXM9gRk NuOIxteezXUfTDJmF9tdIefNNDq6Cq2JCCAhVu+WC0VHB/NTj3Fs/hwl2JV7V+zKN+54 2tAgQx6TtzXLSHPYoWkjimn16BsEYQKcnBitIGYc1HB8LR1/0r7CpGaJivTXHfc730f0 4E6OyBMpdOdWSGu1vsUvvq+AV0/CmlDoeu+bKSm6HO5+9nAwVjg6TF9qKgZNVu4nZYzb jOcw== X-Gm-Message-State: AO0yUKVnRzTwxvAvwQEJLdFuq8wfkZzrgB/0X6kmI36y8ra+i9aOsyZZ Q4o0KubZDB+PlqvHL55+ry4= X-Google-Smtp-Source: AK7set8P6cwdMjbl/dkZSCnfq9fJdOgxVJDIhxHNxe2Rkjti+p5yPe+G4oQ38lJ2ylgzL3Bbj1VZcw== X-Received: by 2002:a05:600c:331b:b0:3df:e4b4:de69 with SMTP id q27-20020a05600c331b00b003dfe4b4de69mr7880719wmp.27.1677145091207; Thu, 23 Feb 2023 01:38:11 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id c18-20020a05600c0a5200b003e733a973d2sm9970561wmq.39.2023.02.23.01.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:38:10 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.8 Date: Thu, 23 Feb 2023 09:36:20 +0000 Message-Id: <20230223093715.3926893-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-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 02/25/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/81d653f7233bd18d6dfa6dda19436669f1e69455 Thanks. Luca Boccassi --- >From 81d653f7233bd18d6dfa6dda19436669f1e69455 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/librte_vhost/virtio_net.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index dd571b60a0..3792f82c3f 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -1329,6 +1329,12 @@ virtio_dev_rx_batch_packed(struct virtio_net *dev, sizeof(struct virtio_net_hdr_mrg_rxbuf); } + 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 09:36:28.929128827 +0000 +++ 0016-vhost-fix-net-header-settings-in-datapath.patch 2023-02-23 09:36:28.190169277 +0000 @@ -1 +1 @@ -From b9c1ec8577936419c8801dfad61e848b3535295f Mon Sep 17 00:00:00 2001 +From 81d653f7233bd18d6dfa6dda19436669f1e69455 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - lib/vhost/virtio_net.c | 6 ++++++ + lib/librte_vhost/virtio_net.c | 6 ++++++ @@ -22,5 +23,5 @@ -diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c -index 9abf752f30..a3dbf8cb10 100644 ---- a/lib/vhost/virtio_net.c -+++ b/lib/vhost/virtio_net.c -@@ -1453,6 +1453,12 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev, +diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c +index dd571b60a0..3792f82c3f 100644 +--- a/lib/librte_vhost/virtio_net.c ++++ b/lib/librte_vhost/virtio_net.c +@@ -1329,6 +1329,12 @@ virtio_dev_rx_batch_packed(struct virtio_net *dev,