From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47625A04DE for ; Wed, 28 Oct 2020 11:48:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 39229C9FA; Wed, 28 Oct 2020 11:48:11 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by dpdk.org (Postfix) with ESMTP id 2BA634C90 for ; Wed, 28 Oct 2020 11:48:09 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id w23so4085136wmi.4 for ; Wed, 28 Oct 2020 03:48:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bkqqv3o+XLTiFJ9HFDJ5YR/IAmc9fLXW90btmODy+lY=; b=XsWsftSTHuUaT1B4fRT6QUVfY1zEgJcLnocNLi8x+FThhzWtgTBMMPO/TvORlVafVt uTN0PIjOztAIbfOSZKkv/70d0t24tTgUpdd7ZimhJCjYKzhlzuWDSKYXwcgKfaZTDWvi SA36x6/QC+XBX8YZbi/b1gmoKMEwyqaw5K4M8+uEOTgLZWsE9S2nI9IdR2HhhztHyP/g qqU6LaL/wr/Rqkg4A5ttjlJwlDDwT30+D6HzIrAFlzYRu1IVB5gTpp3eIxHXJWrZ0ocK rrXyRiVdPL7hLYyrbGk3cQBNpIutGJ9r5LbbMB3IOumlX8KpI8r3VHR4z4ZokrDpZx1o ByBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bkqqv3o+XLTiFJ9HFDJ5YR/IAmc9fLXW90btmODy+lY=; b=ZuXXgmVVkAJIB0h4vw8xz9++1UWmSmDXcf8/m2C7ol/p1x+FZrrg2MWLR+9cBA2zE6 pYT1Df6BqkQ3pxMtFDHwkcNjgLErWGUiseFkXU8a+0VB8aQ53iZJ+SgEkwEVVOhx/Clz iKUAY79dSdUTeDnEMBLQveytoa+92cWVa9mApIm02vNmRJ7nH3VywwKyFHHG4+rLYqTJ jE3uTYsvGwdAKSXgruDD5bbXDw9je0ZOzDAs2bRxNQQYVIsTVIgWtNJq6KdWpS07AxLe WrPLMVY5k4VYRwPALGG5h+46TH4yHf6Yc/VX6IDagCzpnQOgb/UUnWxNYZ3ejx49IaV0 xMzQ== X-Gm-Message-State: AOAM53082ykIjQiiwNBubzrWjKQGafh6wsKi9ZNS9qK6JmR6Of+G7mvd bNDJAwUXS/w+ll49KbRGpkg= X-Google-Smtp-Source: ABdhPJy+aDeAxcU73RzBfJqs/Z7BjJOGTXAdoX4GJ43M1qUZZL6XiMANZkTe4WlZZ5/esmkSGUgA8g== X-Received: by 2002:a1c:85:: with SMTP id 127mr3361492wma.117.1603882088891; Wed, 28 Oct 2020 03:48:08 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f17sm1011359wrm.27.2020.10.28.03.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:08 -0700 (PDT) From: luca.boccassi@gmail.com To: "Wei Hu (Xavier)" Cc: Huisong Li , dpdk stable Date: Wed, 28 Oct 2020 10:43:18 +0000 Message-Id: <20201028104606.3504127-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix queue offload capability' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 10/30/20. 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. Thanks. Luca Boccassi --- >From facb61edd4157bc718534cf5ed5c4d2e3603a7d8 Mon Sep 17 00:00:00 2001 From: "Wei Hu (Xavier)" Date: Tue, 8 Sep 2020 20:28:07 +0800 Subject: [PATCH] net/hns3: fix queue offload capability [ upstream commit c533b0ef1375724acd8625e2d5205475d472855c ] Currently, offload capabilities are only enabled for all Rx/Tx queues in hns3 PF/VF PMD driver, and offload capability only applied in a Rx/Tx queue is not supported. So this patch moves 'DEV_TX_OFFLOAD_MBUF_FAST_FREE' from tx_queue_offload_capa to tx_offload_capa. Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") Fixes: a5475d61fa34 ("net/hns3: support VF") Signed-off-by: Huisong Li Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_ethdev.c | 3 +-- drivers/net/hns3/hns3_ethdev_vf.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index cd828202ee..27c89abfab 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2468,7 +2468,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_RSS_HASH); - info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | @@ -2477,7 +2476,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_TX_OFFLOAD_VLAN_INSERT | DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_MULTI_SEGS | - info->tx_queue_offload_capa); + DEV_TX_OFFLOAD_MBUF_FAST_FREE); info->rx_desc_lim = (struct rte_eth_desc_lim) { .nb_max = HNS3_MAX_RING_DESC, diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 7acc679e9b..e30e9f65c4 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -805,7 +805,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_RSS_HASH); - info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | @@ -814,7 +813,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_TX_OFFLOAD_VLAN_INSERT | DEV_TX_OFFLOAD_QINQ_INSERT | DEV_TX_OFFLOAD_MULTI_SEGS | - info->tx_queue_offload_capa); + DEV_TX_OFFLOAD_MBUF_FAST_FREE); info->rx_desc_lim = (struct rte_eth_desc_lim) { .nb_max = HNS3_MAX_RING_DESC, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.007153387 +0000 +++ 0039-net-hns3-fix-queue-offload-capability.patch 2020-10-28 10:35:11.496829906 +0000 @@ -1,8 +1,10 @@ -From c533b0ef1375724acd8625e2d5205475d472855c Mon Sep 17 00:00:00 2001 +From facb61edd4157bc718534cf5ed5c4d2e3603a7d8 Mon Sep 17 00:00:00 2001 From: "Wei Hu (Xavier)" Date: Tue, 8 Sep 2020 20:28:07 +0800 Subject: [PATCH] net/hns3: fix queue offload capability +[ upstream commit c533b0ef1375724acd8625e2d5205475d472855c ] + Currently, offload capabilities are only enabled for all Rx/Tx queues in hns3 PF/VF PMD driver, and offload capability only applied in a Rx/Tx queue is not supported. @@ -11,7 +13,6 @@ Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") Fixes: a5475d61fa34 ("net/hns3: support VF") -Cc: stable@dpdk.org Signed-off-by: Huisong Li Signed-off-by: Wei Hu (Xavier) @@ -21,47 +22,47 @@ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c -index 9dd0d9cbf1..b6ae69ff1f 100644 +index cd828202ee..27c89abfab 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c -@@ -2472,7 +2472,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -2468,7 +2468,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) + DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME | - DEV_RX_OFFLOAD_RSS_HASH | - DEV_RX_OFFLOAD_TCP_LRO); + DEV_RX_OFFLOAD_RSS_HASH); - info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | -@@ -2483,7 +2482,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) - DEV_TX_OFFLOAD_VXLAN_TNL_TSO | - DEV_TX_OFFLOAD_GRE_TNL_TSO | - DEV_TX_OFFLOAD_GENEVE_TNL_TSO | -- info->tx_queue_offload_capa | -+ DEV_TX_OFFLOAD_MBUF_FAST_FREE | - hns3_txvlan_cap_get(hw)); +@@ -2477,7 +2476,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) + DEV_TX_OFFLOAD_VLAN_INSERT | + DEV_TX_OFFLOAD_QINQ_INSERT | + DEV_TX_OFFLOAD_MULTI_SEGS | +- info->tx_queue_offload_capa); ++ DEV_TX_OFFLOAD_MBUF_FAST_FREE); info->rx_desc_lim = (struct rte_eth_desc_lim) { + .nb_max = HNS3_MAX_RING_DESC, diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c -index 1d8eef78ed..bea3695ce2 100644 +index 7acc679e9b..e30e9f65c4 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c -@@ -915,7 +915,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -805,7 +805,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) + DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME | - DEV_RX_OFFLOAD_RSS_HASH | - DEV_RX_OFFLOAD_TCP_LRO); + DEV_RX_OFFLOAD_RSS_HASH); - info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_TCP_CKSUM | -@@ -926,7 +925,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) - DEV_TX_OFFLOAD_VXLAN_TNL_TSO | - DEV_TX_OFFLOAD_GRE_TNL_TSO | - DEV_TX_OFFLOAD_GENEVE_TNL_TSO | -- info->tx_queue_offload_capa | -+ DEV_TX_OFFLOAD_MBUF_FAST_FREE | - hns3_txvlan_cap_get(hw)); +@@ -814,7 +813,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) + DEV_TX_OFFLOAD_VLAN_INSERT | + DEV_TX_OFFLOAD_QINQ_INSERT | + DEV_TX_OFFLOAD_MULTI_SEGS | +- info->tx_queue_offload_capa); ++ DEV_TX_OFFLOAD_MBUF_FAST_FREE); info->rx_desc_lim = (struct rte_eth_desc_lim) { + .nb_max = HNS3_MAX_RING_DESC, -- 2.20.1