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 B42A7A0540 for ; Thu, 7 Jul 2022 09:56:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AFE82406B4; Thu, 7 Jul 2022 09:56:24 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 90C9C40DDE for ; Thu, 7 Jul 2022 09:56:23 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D80DE40AA5 for ; Thu, 7 Jul 2022 07:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180580; bh=xaAcrHgYECmBhPf2drxrwbwqBcjPjCCeHc812MuOQSY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LBCxMADLYnCOMfM0GSp0tdB4rPl9Jv7VzsbScOwXwc/WnWtAh35dTyfADEIHriUb3 BdTcnTVnwigTX1IKm8QzmcYBh9BJuiCExiO9ryi1uudpWEo2znlXO1+QLfC/tE3psc Vs2A1bU2o+4eaYpWPiWtwVCWnBMvnhZeHGcaLWNQa9IUUJ04vm+pFfIqTXoiDAMHUp Ke9b64qr+Q9MMIirxxEBCP3ZOPl+ulfrLChVdfWfiDaC5hh3B0gGoRJnw7rNpbhNYP hwhtOTHVmKJ+VLTnKFZfnDucbONk8ZFP2yFgii6lOPc/LROZXoxAnWUPAQTQiVM6F8 rRL/NQ50X8BJw== Received: by mail-ed1-f69.google.com with SMTP id h16-20020a05640250d000b00435bab1a7b4so13420636edb.10 for ; Thu, 07 Jul 2022 00:56:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xaAcrHgYECmBhPf2drxrwbwqBcjPjCCeHc812MuOQSY=; b=wXjblaSIoiwQTrS/23vW5lE3n4l4xu4QuV7sKxqWnHB4mYYibav0V080eOfg7jlQ2w N+DcgQKdGQyaGAq0cKr38L/ET75m2UMZxjjnUmHpU5L8F8spCdwdnZwFQvUQV7qCzICF mqbJ+sYAGgAC6bYWt1qQr3KU4jAn5R6yYLR35LZapyntQF8YQdwwcjg/18C8wfBWdI31 a+HktHRtc5MKI1XPOo3lR4DYXpmVG/464WqkDbXRQfWO1qtG5F5hrDTk3m60pgJByNnF qolVbDNoW4KJxbDsrfEcRWoDD7UffnWj3iavYgmuETo2XmNK6EO5uRK1kF45WNpKXCtP irdA== X-Gm-Message-State: AJIora+LKnSPVccWBkYBrOIq2vR9kyGKrIfyBjt4RKz0inr9ggmEkryx g/BjkpnxMMekwLPd7RkLq0IJkS4QMXIx4oIYBWyINVLCFd8DN98jLi3/GVn9eYekbAyflPPRaIk QfnKAUh1nEEfA2wvsqt5aa2n7 X-Received: by 2002:a17:906:8442:b0:72a:8b2b:c5c5 with SMTP id e2-20020a170906844200b0072a8b2bc5c5mr30714403ejy.691.1657180578745; Thu, 07 Jul 2022 00:56:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1swEoB4/dN5/4gVOh1pof2FjQHXhWiJoCogrsUzzWDXsnyzPof1o5E5O79ro0vurE/nVox4ZA== X-Received: by 2002:a17:906:8442:b0:72a:8b2b:c5c5 with SMTP id e2-20020a170906844200b0072a8b2bc5c5mr30714390ejy.691.1657180578554; Thu, 07 Jul 2022 00:56:18 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id jz2-20020a170906bb0200b00726314d0655sm18522363ejb.39.2022.07.07.00.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:17 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Maxime Coquelin Cc: David Marchand , dpdk stable Subject: patch 'net/vhost: fix TSO feature default disablement' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:13 +0200 Message-Id: <20220707075522.194223-18-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a09c7ed8a235e2c0badd10eab88761987a8845f6 Thanks. Christian Ehrhardt --- >From a09c7ed8a235e2c0badd10eab88761987a8845f6 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Fri, 22 Apr 2022 11:35:43 +0200 Subject: [PATCH] net/vhost: fix TSO feature default disablement [ upstream commit 6d7046215a3da334bac77d2b06e5ae1c208f3ca4 ] By default, TSO feature should be disabled because it requires application's support to be functional as mentioned in the documentation. However, if "tso" devarg was not specified, the feature did not get disabled. This patch fixes this issue, so that TSO is disabled, even if "tso=0" is not passed as devarg. Fixes: e289400669d5 ("net/vhost: support TSO disabling") Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand --- drivers/net/vhost/rte_eth_vhost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 0926a43781..35dcd84b8b 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1500,11 +1500,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) &open_int, &tso); if (ret < 0) goto out_free; + } - if (tso == 0) { - disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO4); - disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO6); - } + if (tso == 0) { + disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO4); + disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO6); } if (dev->device.numa_node == SOCKET_ID_ANY) -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.971035427 +0200 +++ 0018-net-vhost-fix-TSO-feature-default-disablement.patch 2022-07-07 09:54:10.817823702 +0200 @@ -1 +1 @@ -From 6d7046215a3da334bac77d2b06e5ae1c208f3ca4 Mon Sep 17 00:00:00 2001 +From a09c7ed8a235e2c0badd10eab88761987a8845f6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6d7046215a3da334bac77d2b06e5ae1c208f3ca4 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 8a6595504a..a248a65df4 100644 +index 0926a43781..35dcd84b8b 100644 @@ -29 +30 @@ -@@ -1654,11 +1654,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) +@@ -1500,11 +1500,11 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev) @@ -44 +45 @@ - if (rte_kvargs_count(kvlist, ETH_VHOST_LINEAR_BUF) == 1) { + if (dev->device.numa_node == SOCKET_ID_ANY)