Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71863/?format=api
{ "id": 71863, "url": "https://patches.dpdk.org/api/patches/71863/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1592794047-51529-3-git-send-email-xavier.huwei@huawei.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1592794047-51529-3-git-send-email-xavier.huwei@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1592794047-51529-3-git-send-email-xavier.huwei@huawei.com", "date": "2020-06-22T02:47:27", "name": "[v3,2/2] ethdev: fix VLAN offloads set if no relative capabilities", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f9ebd6ae5285a99f9d7d12730e42c60373cb67a9", "submitter": { "id": 1405, "url": "https://patches.dpdk.org/api/people/1405/?format=api", "name": "Wei Hu (Xavier)", "email": "xavier.huwei@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1592794047-51529-3-git-send-email-xavier.huwei@huawei.com/mbox/", "series": [ { "id": 10539, "url": "https://patches.dpdk.org/api/series/10539/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10539", "date": "2020-06-22T02:47:25", "name": "ethdev: minor bugfixes", "version": 3, "mbox": "https://patches.dpdk.org/series/10539/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/71863/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/71863/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7E226A0350;\n\tMon, 22 Jun 2020 04:49:27 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F21B01C121;\n\tMon, 22 Jun 2020 04:49:16 +0200 (CEST)", "from huawei.com (szxga06-in.huawei.com [45.249.212.32])\n by dpdk.org (Postfix) with ESMTP id EC7051C117\n for <dev@dpdk.org>; Mon, 22 Jun 2020 04:49:14 +0200 (CEST)", "from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58])\n by Forcepoint Email with ESMTP id CB981FC31D5E96F1767;\n Mon, 22 Jun 2020 10:49:13 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id\n 14.3.487.0; Mon, 22 Jun 2020 10:49:02 +0800" ], "From": "\"Wei Hu (Xavier)\" <xavier.huwei@huawei.com>", "To": "<thomas@monjalon.net>, <ferruh.yigit@intel.com>,\n <arybchenko@solarflare.com>, <anatoly.burakov@intel.com>,\n <hemant.agrawal@nxp.com>, <sachin.saxena@nxp.com>, <johndale@cisco.com>,\n <hyonkim@cisco.com>, <qi.z.zhang@intel.com>, <xiao.w.wang@intel.com>,\n <xuanziyang2@huawei.com>, <cloud.wangxiaoyun@huawei.com>,\n <zhouguoyang@huawei.com>, <beilei.xing@intel.com>, <jia.guo@intel.com>,\n <heinrich.kuhn@netronome.com>, <hkalra@marvell.com>, <jerinj@marvell.com>,\n <ndabilpuram@marvell.com>, <kirankumark@marvell.com>, <rmody@marvell.com>,\n <shshaikh@marvell.com>", "CC": "<dev@dpdk.org>, <xavier.huwei@huawei.com>", "Date": "Mon, 22 Jun 2020 10:47:27 +0800", "Message-ID": "<1592794047-51529-3-git-send-email-xavier.huwei@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1592794047-51529-1-git-send-email-xavier.huwei@huawei.com>", "References": "<1592794047-51529-1-git-send-email-xavier.huwei@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH v3 2/2] ethdev: fix VLAN offloads set if no\n\trelative capabilities", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Currently, there is a potential problem that calling the API function\nrte_eth_dev_set_vlan_offload to start VLAN hardware offloads which the\ndriver does not support. If the PMD driver does not support certain VLAN\nhardware offloads and does not check for it, the hardware setting will\nnot change, but the VLAN offloads in dev->data->dev_conf.rxmode.offloads\nwill be turned on.\n\nIt is supposed to check the hardware capabilities to decide whether the\nrelative callback needs to be called just like the behavior in the API\nfunction named rte_eth_dev_configure. And it is also needed to cleanup\nduplicated checks which are done in some PMDs. Also, note that it is\nbehaviour change for some PMDs which simply ignore (with error/warning log\nmessage) unsupported VLAN offloads, but now it will fail.\n\nFixes: a4996bd89c42 (\"ethdev: new Rx/Tx offloads API\")\nCc: stable@dpdk.org\n\nSigned-off-by: Chengchang Tang <tangchengchang@huawei.com>\nSigned-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>\nAcked-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\nv2 -> v3: Add __rte_unused to avoid unused parameter 'dev' and 'mask'\n\t warning.\nv1 -> v2: cleanup duplicated checks which are done in some PMDs.\n---\n drivers/net/dpaa2/dpaa2_ethdev.c | 5 -----\n drivers/net/enic/enic_ethdev.c | 12 ------------\n drivers/net/fm10k/fm10k_ethdev.c | 23 ++---------------------\n drivers/net/hinic/hinic_pmd_ethdev.c | 6 ------\n drivers/net/i40e/i40e_ethdev.c | 5 -----\n drivers/net/nfp/nfp_net.c | 5 -----\n drivers/net/octeontx/octeontx_ethdev_ops.c | 10 ----------\n drivers/net/octeontx2/otx2_vlan.c | 5 -----\n drivers/net/qede/qede_ethdev.c | 3 ---\n lib/librte_ethdev/rte_ethdev.c | 21 +++++++++++++++++++++\n 10 files changed, 23 insertions(+), 72 deletions(-)", "diff": "diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 2f031ec..da5018f 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -169,11 +169,6 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \t\t\tDPAA2_PMD_INFO(\"Unable to set vlan filter = %d\", ret);\n \t}\n next_mask:\n-\tif (mask & ETH_VLAN_EXTEND_MASK) {\n-\t\tif (dev->data->dev_conf.rxmode.offloads &\n-\t\t\tDEV_RX_OFFLOAD_VLAN_EXTEND)\n-\t\t\tDPAA2_PMD_INFO(\"VLAN extend offload not supported\");\n-\t}\n \n \treturn 0;\n }\ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex 32d5397..ef8900d 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -374,18 +374,6 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)\n \t\t\tenic->ig_vlan_strip_en = 0;\n \t}\n \n-\tif ((mask & ETH_VLAN_FILTER_MASK) &&\n-\t (offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) {\n-\t\tdev_warning(enic,\n-\t\t\t\"Configuration of VLAN filter is not supported\\n\");\n-\t}\n-\n-\tif ((mask & ETH_VLAN_EXTEND_MASK) &&\n-\t (offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)) {\n-\t\tdev_warning(enic,\n-\t\t\t\"Configuration of extended VLAN is not supported\\n\");\n-\t}\n-\n \treturn enic_set_vlan_strip(enic);\n }\n \ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex f537ab2..f5b854e 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -1575,28 +1575,9 @@ fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n }\n \n static int\n-fm10k_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n+fm10k_vlan_offload_set(struct rte_eth_dev *dev __rte_unused,\n+\t\t int mask __rte_unused)\n {\n-\tif (mask & ETH_VLAN_STRIP_MASK) {\n-\t\tif (!(dev->data->dev_conf.rxmode.offloads &\n-\t\t\tDEV_RX_OFFLOAD_VLAN_STRIP))\n-\t\t\tPMD_INIT_LOG(ERR, \"VLAN stripping is \"\n-\t\t\t\t\t\"always on in fm10k\");\n-\t}\n-\n-\tif (mask & ETH_VLAN_EXTEND_MASK) {\n-\t\tif (dev->data->dev_conf.rxmode.offloads &\n-\t\t\tDEV_RX_OFFLOAD_VLAN_EXTEND)\n-\t\t\tPMD_INIT_LOG(ERR, \"VLAN QinQ is not \"\n-\t\t\t\t\t\"supported in fm10k\");\n-\t}\n-\n-\tif (mask & ETH_VLAN_FILTER_MASK) {\n-\t\tif (!(dev->data->dev_conf.rxmode.offloads &\n-\t\t\tDEV_RX_OFFLOAD_VLAN_FILTER))\n-\t\t\tPMD_INIT_LOG(ERR, \"VLAN filter is always on in fm10k\");\n-\t}\n-\n \treturn 0;\n }\n \ndiff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c\nindex 0c3e1c0..0009a61 100644\n--- a/drivers/net/hinic/hinic_pmd_ethdev.c\n+++ b/drivers/net/hinic/hinic_pmd_ethdev.c\n@@ -1701,12 +1701,6 @@ static int hinic_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \t\t\t nic_dev->proc_dev_name, dev->data->port_id);\n \t}\n \n-\tif (mask & ETH_VLAN_EXTEND_MASK) {\n-\t\tPMD_DRV_LOG(ERR, \"Don't support vlan qinq, device: %s, port_id: %d\",\n-\t\t\t nic_dev->proc_dev_name, dev->data->port_id);\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \treturn 0;\n }\n \ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 970a31c..9211cf5 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -3877,11 +3877,6 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \tstruct i40e_vsi *vsi = pf->main_vsi;\n \tstruct rte_eth_rxmode *rxmode;\n \n-\tif (mask & ETH_QINQ_STRIP_MASK) {\n-\t\tPMD_DRV_LOG(ERR, \"Strip qinq is not supported.\");\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \trxmode = &dev->data->dev_conf.rxmode;\n \tif (mask & ETH_VLAN_FILTER_MASK) {\n \t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER)\ndiff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c\nindex 2460ee1..b7a91ae 100644\n--- a/drivers/net/nfp/nfp_net.c\n+++ b/drivers/net/nfp/nfp_net.c\n@@ -2353,11 +2353,6 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \thw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n \tnew_ctrl = 0;\n \n-\tif ((mask & ETH_VLAN_FILTER_OFFLOAD) ||\n-\t (mask & ETH_VLAN_EXTEND_OFFLOAD))\n-\t\tPMD_DRV_LOG(INFO, \"No support for ETH_VLAN_FILTER_OFFLOAD or\"\n-\t\t\t\" ETH_VLAN_EXTEND_OFFLOAD\");\n-\n \t/* Enable vlan strip if it is not configured yet */\n \tif ((mask & ETH_VLAN_STRIP_OFFLOAD) &&\n \t !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN))\ndiff --git a/drivers/net/octeontx/octeontx_ethdev_ops.c b/drivers/net/octeontx/octeontx_ethdev_ops.c\nindex ff627a6..dbe13ce 100644\n--- a/drivers/net/octeontx/octeontx_ethdev_ops.c\n+++ b/drivers/net/octeontx/octeontx_ethdev_ops.c\n@@ -43,16 +43,6 @@ octeontx_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \n \trxmode = &dev->data->dev_conf.rxmode;\n \n-\tif (mask & ETH_VLAN_EXTEND_MASK) {\n-\t\tocteontx_log_err(\"Extend offload not supported\");\n-\t\treturn -ENOTSUP;\n-\t}\n-\n-\tif (mask & ETH_VLAN_STRIP_MASK) {\n-\t\tocteontx_log_err(\"VLAN strip offload not supported\");\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \tif (mask & ETH_VLAN_FILTER_MASK) {\n \t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER) {\n \t\t\trc = octeontx_vlan_hw_filter(nic, true);\ndiff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c\nindex 322a565..7357b06 100644\n--- a/drivers/net/octeontx2/otx2_vlan.c\n+++ b/drivers/net/octeontx2/otx2_vlan.c\n@@ -717,11 +717,6 @@ otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)\n \n \trxmode = ð_dev->data->dev_conf.rxmode;\n \n-\tif (mask & ETH_VLAN_EXTEND_MASK) {\n-\t\totx2_err(\"Extend offload not supported\");\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \tif (mask & ETH_VLAN_STRIP_MASK) {\n \t\tif (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) {\n \t\t\toffloads |= DEV_RX_OFFLOAD_VLAN_STRIP;\ndiff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c\nindex c4f8f12..04d17c7 100644\n--- a/drivers/net/qede/qede_ethdev.c\n+++ b/drivers/net/qede/qede_ethdev.c\n@@ -1036,9 +1036,6 @@ static int qede_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)\n \t\t}\n \t}\n \n-\tif (mask & ETH_VLAN_EXTEND_MASK)\n-\t\tDP_ERR(edev, \"Extend VLAN not supported\\n\");\n-\n \tqdev->vlan_offload_mask = mask;\n \n \tDP_INFO(edev, \"VLAN offload mask %d\\n\", mask);\ndiff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c\nindex b0b0474..bf79749 100644\n--- a/lib/librte_ethdev/rte_ethdev.c\n+++ b/lib/librte_ethdev/rte_ethdev.c\n@@ -3260,12 +3260,14 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id,\n int\n rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)\n {\n+\tstruct rte_eth_dev_info dev_info;\n \tstruct rte_eth_dev *dev;\n \tint ret = 0;\n \tint mask = 0;\n \tint cur, org = 0;\n \tuint64_t orig_offloads;\n \tuint64_t dev_offloads;\n+\tuint64_t new_offloads;\n \n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);\n \tdev = &rte_eth_devices[port_id];\n@@ -3319,6 +3321,25 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)\n \tif (mask == 0)\n \t\treturn ret;\n \n+\tret = rte_eth_dev_info_get(port_id, &dev_info);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\t/*\n+\t * New added Rx VLAN offloading which are not enabled in\n+\t * rte_eth_dev_configure() must be within its device capabilities\n+\t */\n+\tif ((dev_offloads & dev_info.rx_offload_capa) != dev_offloads) {\n+\t\tnew_offloads = dev_offloads & ~orig_offloads;\n+\t\tRTE_ETHDEV_LOG(ERR,\n+\t\t\t\"Ethdev port_id=%u requested new added VLAN offloads \"\n+\t\t\t\"0x%\" PRIx64 \" must be within Rx offloads capabilities \"\n+\t\t\t\"0x%\" PRIx64 \" in %s()\\n\",\n+\t\t\tport_id, new_offloads, dev_info.rx_offload_capa,\n+\t\t\t__func__);\n+\t\treturn -EINVAL;\n+\t}\n+\n \tRTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP);\n \tdev->data->dev_conf.rxmode.offloads = dev_offloads;\n \tret = (*dev->dev_ops->vlan_offload_set)(dev, mask);\n", "prefixes": [ "v3", "2/2" ] }