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 4D31BA0519; Mon, 22 Jun 2020 07:11:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 15B7F1C12F; Mon, 22 Jun 2020 07:11:12 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50078.outbound.protection.outlook.com [40.107.5.78]) by dpdk.org (Postfix) with ESMTP id F037A1C0D6 for ; Mon, 22 Jun 2020 07:11:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BrZflm09oERiVbyr5toSUS7XwV+chbPur/Ncy/1dWLux3kOIV+W7VWi5ubUlgw5qex0BHlSbF9RrsjYzFNJ0ckZN6gG6/XkhYS1US3Zb5zmgeiKNYQJLsKYB+8JhCCTMaAWWHDSWsv37vA2gnidcHEO0VHGYp2TmJ37v106Fh9fXVv1Vp9COMu4sLZgv57qY6s9hqVfgy4cI/8wDafo2ZK+x+RuVzwY29aXjsRtxDfoSguxGtG1Ov+h3A2oNN4NG9WEdXXBNFumM3atuMtLdHo2ibqjv1o/5MZ8wERxl3/E0wjbh+taRpABTWAGqtih9vGiQHa60o487P6UoX2sgLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3zvr0txhwCKuoM7FII4rbJ/+Ty60Ar52rB2aIHQ35Rk=; b=PObyi19IJrCUA9GvZfbSSWAkSOwe9AJgUlNG+/MZmjKHKyMzMCBmB8etmqjPMS4lWKpMSDcFgQF81tt5U00OTC7+yByKbd8c/KUH5CEC3OM/6jm0Ngfgh/4l3tukfzHkSfN0dD3ib1hTXPjDLKdouIh1ShbPI0kPt0wFVsS78J6XaZ61X5aUy9XCTejUUH2mFPYXhvoIQwz/7p68FS68DjtEoczoQXH2JJkS4NEQeSSlXcD/3L8asCNai22gV5EZ3A2AhfdLrnFzpsB031fNEF86r9owb77WaGJ7BZj9ZcPNCpxIVQlqm7vsBXJOTB7iL/SELMKNmt5YqfCpJ0PGMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3zvr0txhwCKuoM7FII4rbJ/+Ty60Ar52rB2aIHQ35Rk=; b=LfgO2gBZNsJ2fAG+JszW3E2NYJd3L0qwGjRuJ5tR408IhCLU/sgYn235G8UZkVNTHpiGQheskxdZmN1V4kPDjh4TwIFte5nmnxNy35DNgN2yHlLj8XilLZBEet4eVZH55/Kg0ITTOir9F4VXNnvh7tUiFVkx17JJoKk7SJAHc5Y= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5837.eurprd04.prod.outlook.com (2603:10a6:803:ec::28) by VI1PR04MB6976.eurprd04.prod.outlook.com (2603:10a6:803:130::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 05:11:09 +0000 Received: from VI1PR04MB5837.eurprd04.prod.outlook.com ([fe80::d4d6:f65d:34cd:aa43]) by VI1PR04MB5837.eurprd04.prod.outlook.com ([fe80::d4d6:f65d:34cd:aa43%3]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 05:11:09 +0000 To: "Wei Hu (Xavier)" , thomas@monjalon.net, ferruh.yigit@intel.com, arybchenko@solarflare.com, anatoly.burakov@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, johndale@cisco.com, hyonkim@cisco.com, qi.z.zhang@intel.com, xiao.w.wang@intel.com, xuanziyang2@huawei.com, cloud.wangxiaoyun@huawei.com, zhouguoyang@huawei.com, beilei.xing@intel.com, jia.guo@intel.com, heinrich.kuhn@netronome.com, hkalra@marvell.com, jerinj@marvell.com, ndabilpuram@marvell.com, kirankumark@marvell.com, rmody@marvell.com, shshaikh@marvell.com Cc: dev@dpdk.org References: <1592794047-51529-1-git-send-email-xavier.huwei@huawei.com> <1592794047-51529-3-git-send-email-xavier.huwei@huawei.com> From: "Sachin Saxena (OSS)" Message-ID: <2b680be5-9c93-5514-00b3-7e6fc2f5b9bc@oss.nxp.com> Date: Mon, 22 Jun 2020 10:40:55 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 In-Reply-To: <1592794047-51529-3-git-send-email-xavier.huwei@huawei.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-ClientProxiedBy: SG2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:3:17::30) To VI1PR04MB5837.eurprd04.prod.outlook.com (2603:10a6:803:ec::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.10] (106.215.19.107) by SG2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:3:17::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.25 via Frontend Transport; Mon, 22 Jun 2020 05:11:01 +0000 X-Originating-IP: [106.215.19.107] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 05432127-d05f-437f-10fc-08d8166aac2f X-MS-TrafficTypeDiagnostic: VI1PR04MB6976: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-Forefront-PRVS: 0442E569BC X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jwlkhyb6yw/axEwToSNHxGBctvU5eV1bti+dsyoB1Q+3D3O3jNfN8JjcJE50H7Ueho03VcCsFWSbFWhCdYqLHYnuSmI3cssIAqOaKxTghSh/5m9RkdS/hapcCFCAZPNsktACByalp9qW2r3LoyZPuldPS1w5GTQaoG6GYfbv94WiUOW+BVmjVYPqqIYaCUaNAe6y3Cw85i+plsUjAnZ6jGFokJOxYPEj/pFowQiY/BkG/C8Myb0W+251zFC+WENDzP3Zw2xmCNgmeK0gVFuNSW7l/oF0qnfHGumI33TrRC2v9SR8cm/yHb109OYTjjC5NwD60WddfwgU0r6SjaHfbuI6iKCj088mAhjEW/if17Fy1RxRzb897cv5zy2j3k7NDMmKPJG7LaZZL1AWCioyZQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5837.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(346002)(376002)(39860400002)(366004)(136003)(16576012)(316002)(2906002)(86362001)(956004)(5660300002)(478600001)(66476007)(31696002)(66556008)(6486002)(66946007)(2616005)(6666004)(1006002)(16526019)(26005)(8936002)(53546011)(186003)(8676002)(31686004)(83380400001)(4326008)(52116002)(7416002)(921003)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HHbxCKCaw2DNLdzsPfbP7+qLd27L8feVolr46shv6rvOL7qvMARe5raCFAMqglirZxndl1P45ciaW1pjhZz1IAKhl33Bj8+TMQLUHDj+/JKyWEKI+wPWsx2lSv1PjPdZb4viHISbsjDyuin/hkWqROHqQ1yshjr9wJvCy0IIHxOjcy85G1DXr+XY+IkWgWAgd+TI8iPeiiy7SezRsDfhzOK3FGlIVWLpvzK0Tj5bAYWKSOJCWZqWvXAokzofV443vJZDf7+OSOBQs11kl9ckG2Lkm04hhiOEGhSgKwoVwxXU4WGW3A+88IxmX9VMfFTEBvINocGQzri8Z3o2+2Ci1KfxJThpt+Xz9UClhisvebkGf1Mjx8MOIwiXNs72YZU1E2Jztxax5fjxlUb7tVZ5LgHO62AEzM5/VRAhiF8ChIiXsIG8TVGhuUk7PPu8pJ8pKBKLWsSPQCy42o2SSffvY3SuLGHGeOjL0O8VwIFI4BTkpFrtw828KjUQBXV/yE9R X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05432127-d05f-437f-10fc-08d8166aac2f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2020 05:11:08.8242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wLxKaCkNQv1xQclVX7QRxVpUcPfTnNvpXjqNm7n73RO5lnbUX4Y4SjUINKdRRzPFixXJmCp5wcuzKuB40ReOyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6976 Subject: Re: [dpdk-dev] [PATCH v3 2/2] ethdev: fix VLAN offloads set if no relative capabilities X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 22-Jun-20 8:17 AM, Wei Hu (Xavier) wrote: > Currently, there is a potential problem that calling the API function > rte_eth_dev_set_vlan_offload to start VLAN hardware offloads which the > driver does not support. If the PMD driver does not support certain VLAN > hardware offloads and does not check for it, the hardware setting will > not change, but the VLAN offloads in dev->data->dev_conf.rxmode.offloads > will be turned on. > > It is supposed to check the hardware capabilities to decide whether the > relative callback needs to be called just like the behavior in the API > function named rte_eth_dev_configure. And it is also needed to cleanup > duplicated checks which are done in some PMDs. Also, note that it is > behaviour change for some PMDs which simply ignore (with error/warning log > message) unsupported VLAN offloads, but now it will fail. > > Fixes: a4996bd89c42 ("ethdev: new Rx/Tx offloads API") > Cc: stable@dpdk.org > > Signed-off-by: Chengchang Tang > Signed-off-by: Wei Hu (Xavier) > Acked-by: Andrew Rybchenko > --- > v2 -> v3: Add __rte_unused to avoid unused parameter 'dev' and 'mask' > warning. > v1 -> v2: cleanup duplicated checks which are done in some PMDs. > --- > drivers/net/dpaa2/dpaa2_ethdev.c | 5 ----- > drivers/net/enic/enic_ethdev.c | 12 ------------ > drivers/net/fm10k/fm10k_ethdev.c | 23 ++--------------------- > drivers/net/hinic/hinic_pmd_ethdev.c | 6 ------ > drivers/net/i40e/i40e_ethdev.c | 5 ----- > drivers/net/nfp/nfp_net.c | 5 ----- > drivers/net/octeontx/octeontx_ethdev_ops.c | 10 ---------- > drivers/net/octeontx2/otx2_vlan.c | 5 ----- > drivers/net/qede/qede_ethdev.c | 3 --- > lib/librte_ethdev/rte_ethdev.c | 21 +++++++++++++++++++++ > 10 files changed, 23 insertions(+), 72 deletions(-) > > diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c > index 2f031ec..da5018f 100644 > --- a/drivers/net/dpaa2/dpaa2_ethdev.c > +++ b/drivers/net/dpaa2/dpaa2_ethdev.c > @@ -169,11 +169,6 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) > DPAA2_PMD_INFO("Unable to set vlan filter = %d", ret); > } > next_mask: The changes looks good but the label "next_mask" and its usage above should also be deleted/replaced. > - if (mask & ETH_VLAN_EXTEND_MASK) { > - if (dev->data->dev_conf.rxmode.offloads & > - DEV_RX_OFFLOAD_VLAN_EXTEND) > - DPAA2_PMD_INFO("VLAN extend offload not supported"); > - } > > return 0; > } > diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c > index 32d5397..ef8900d 100644 > --- a/drivers/net/enic/enic_ethdev.c > +++ b/drivers/net/enic/enic_ethdev.c > @@ -374,18 +374,6 @@ static int enicpmd_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask) > enic->ig_vlan_strip_en = 0; > } > > - if ((mask & ETH_VLAN_FILTER_MASK) && > - (offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) { > - dev_warning(enic, > - "Configuration of VLAN filter is not supported\n"); > - } > - > - if ((mask & ETH_VLAN_EXTEND_MASK) && > - (offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)) { > - dev_warning(enic, > - "Configuration of extended VLAN is not supported\n"); > - } > - > return enic_set_vlan_strip(enic); > } > > diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c > index f537ab2..f5b854e 100644 > --- a/drivers/net/fm10k/fm10k_ethdev.c > +++ b/drivers/net/fm10k/fm10k_ethdev.c > @@ -1575,28 +1575,9 @@ fm10k_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) > } > > static int > -fm10k_vlan_offload_set(struct rte_eth_dev *dev, int mask) > +fm10k_vlan_offload_set(struct rte_eth_dev *dev __rte_unused, > + int mask __rte_unused) > { > - if (mask & ETH_VLAN_STRIP_MASK) { > - if (!(dev->data->dev_conf.rxmode.offloads & > - DEV_RX_OFFLOAD_VLAN_STRIP)) > - PMD_INIT_LOG(ERR, "VLAN stripping is " > - "always on in fm10k"); > - } > - > - if (mask & ETH_VLAN_EXTEND_MASK) { > - if (dev->data->dev_conf.rxmode.offloads & > - DEV_RX_OFFLOAD_VLAN_EXTEND) > - PMD_INIT_LOG(ERR, "VLAN QinQ is not " > - "supported in fm10k"); > - } > - > - if (mask & ETH_VLAN_FILTER_MASK) { > - if (!(dev->data->dev_conf.rxmode.offloads & > - DEV_RX_OFFLOAD_VLAN_FILTER)) > - PMD_INIT_LOG(ERR, "VLAN filter is always on in fm10k"); > - } > - > return 0; > } > > diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c > index 0c3e1c0..0009a61 100644 > --- a/drivers/net/hinic/hinic_pmd_ethdev.c > +++ b/drivers/net/hinic/hinic_pmd_ethdev.c > @@ -1701,12 +1701,6 @@ static int hinic_vlan_offload_set(struct rte_eth_dev *dev, int mask) > nic_dev->proc_dev_name, dev->data->port_id); > } > > - if (mask & ETH_VLAN_EXTEND_MASK) { > - PMD_DRV_LOG(ERR, "Don't support vlan qinq, device: %s, port_id: %d", > - nic_dev->proc_dev_name, dev->data->port_id); > - return -ENOTSUP; > - } > - > return 0; > } > > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c > index 970a31c..9211cf5 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -3877,11 +3877,6 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask) > struct i40e_vsi *vsi = pf->main_vsi; > struct rte_eth_rxmode *rxmode; > > - if (mask & ETH_QINQ_STRIP_MASK) { > - PMD_DRV_LOG(ERR, "Strip qinq is not supported."); > - return -ENOTSUP; > - } > - > rxmode = &dev->data->dev_conf.rxmode; > if (mask & ETH_VLAN_FILTER_MASK) { > if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER) > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c > index 2460ee1..b7a91ae 100644 > --- a/drivers/net/nfp/nfp_net.c > +++ b/drivers/net/nfp/nfp_net.c > @@ -2353,11 +2353,6 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask) > hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); > new_ctrl = 0; > > - if ((mask & ETH_VLAN_FILTER_OFFLOAD) || > - (mask & ETH_VLAN_EXTEND_OFFLOAD)) > - PMD_DRV_LOG(INFO, "No support for ETH_VLAN_FILTER_OFFLOAD or" > - " ETH_VLAN_EXTEND_OFFLOAD"); > - > /* Enable vlan strip if it is not configured yet */ > if ((mask & ETH_VLAN_STRIP_OFFLOAD) && > !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) > diff --git a/drivers/net/octeontx/octeontx_ethdev_ops.c b/drivers/net/octeontx/octeontx_ethdev_ops.c > index ff627a6..dbe13ce 100644 > --- a/drivers/net/octeontx/octeontx_ethdev_ops.c > +++ b/drivers/net/octeontx/octeontx_ethdev_ops.c > @@ -43,16 +43,6 @@ octeontx_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask) > > rxmode = &dev->data->dev_conf.rxmode; > > - if (mask & ETH_VLAN_EXTEND_MASK) { > - octeontx_log_err("Extend offload not supported"); > - return -ENOTSUP; > - } > - > - if (mask & ETH_VLAN_STRIP_MASK) { > - octeontx_log_err("VLAN strip offload not supported"); > - return -ENOTSUP; > - } > - > if (mask & ETH_VLAN_FILTER_MASK) { > if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_FILTER) { > rc = octeontx_vlan_hw_filter(nic, true); > diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c > index 322a565..7357b06 100644 > --- a/drivers/net/octeontx2/otx2_vlan.c > +++ b/drivers/net/octeontx2/otx2_vlan.c > @@ -717,11 +717,6 @@ otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask) > > rxmode = ð_dev->data->dev_conf.rxmode; > > - if (mask & ETH_VLAN_EXTEND_MASK) { > - otx2_err("Extend offload not supported"); > - return -ENOTSUP; > - } > - > if (mask & ETH_VLAN_STRIP_MASK) { > if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) { > offloads |= DEV_RX_OFFLOAD_VLAN_STRIP; > diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c > index c4f8f12..04d17c7 100644 > --- a/drivers/net/qede/qede_ethdev.c > +++ b/drivers/net/qede/qede_ethdev.c > @@ -1036,9 +1036,6 @@ static int qede_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask) > } > } > > - if (mask & ETH_VLAN_EXTEND_MASK) > - DP_ERR(edev, "Extend VLAN not supported\n"); > - > qdev->vlan_offload_mask = mask; > > DP_INFO(edev, "VLAN offload mask %d\n", mask); > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c > index b0b0474..bf79749 100644 > --- a/lib/librte_ethdev/rte_ethdev.c > +++ b/lib/librte_ethdev/rte_ethdev.c > @@ -3260,12 +3260,14 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id, > int > rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) > { > + struct rte_eth_dev_info dev_info; > struct rte_eth_dev *dev; > int ret = 0; > int mask = 0; > int cur, org = 0; > uint64_t orig_offloads; > uint64_t dev_offloads; > + uint64_t new_offloads; > > RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); > dev = &rte_eth_devices[port_id]; > @@ -3319,6 +3321,25 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) > if (mask == 0) > return ret; > > + ret = rte_eth_dev_info_get(port_id, &dev_info); > + if (ret != 0) > + return ret; > + > + /* > + * New added Rx VLAN offloading which are not enabled in > + * rte_eth_dev_configure() must be within its device capabilities > + */ > + if ((dev_offloads & dev_info.rx_offload_capa) != dev_offloads) { > + new_offloads = dev_offloads & ~orig_offloads; > + RTE_ETHDEV_LOG(ERR, > + "Ethdev port_id=%u requested new added VLAN offloads " > + "0x%" PRIx64 " must be within Rx offloads capabilities " > + "0x%" PRIx64 " in %s()\n", > + port_id, new_offloads, dev_info.rx_offload_capa, > + __func__); > + return -EINVAL; > + } > + > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_offload_set, -ENOTSUP); > dev->data->dev_conf.rxmode.offloads = dev_offloads; > ret = (*dev->dev_ops->vlan_offload_set)(dev, mask);