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 B17A2A0350; Mon, 29 Jun 2020 16:47:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6B5271BF80; Mon, 29 Jun 2020 16:47:42 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 337111BF7B for ; Mon, 29 Jun 2020 16:47:40 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 05TEjZBU004351; Mon, 29 Jun 2020 07:47:39 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=date : from : to : cc : subject : message-id : references : content-type : in-reply-to : mime-version; s=pfpt0818; bh=w6qeHaUg4lajkMTQqMlCOec3t6Fwfxlpo4K596j4VYE=; b=bsug1MwMJhJrYVxEh20K6qYMMduVRu8JXJjVGyNPfPtz9oGFgXUSuue3voVQIxaoNaaX mwP5TwalxJIg90It3BGlcZZHnb4Rmo3ZGkrVRNSpa3zo3P/5Jg02UzFw+osVeIOJkSUg cwXiThTrUhF0MLHllUDbQp4ld5zfaAbU9wlJPJ5qy2/jJoV87SeNYhs1c/EbPRNO64xK HlaDgHIPV2eFmc07M3+BBIPJa6nzWwB4hfeKOuEk5C/bA0YxacUBLNxdyP2XFw/1btfz MQYjUsRoe2piYBBNxm0itK1+Nb22QnkftFCpftHNH0C+aZXRUVCuTCekFeimOzWXl359 Dg== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 31y0wru7wg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2020 07:47:39 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 29 Jun 2020 07:47:38 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.171) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Mon, 29 Jun 2020 07:47:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ex2Vn8ZhT1VrYE6gUyz/Y9ohjPm++7NCYUBj1ti4Qcxovxy4Ij8BdFfymIolDoCZzOXAHbVhi+sJHO0bXfxJwBr1wo5IcNVncanRYyDOS+1w28rj5VFIe2p2ep+hvuIfmoiub1fwoEcp4rY8LDi69hUIbmmR7ejCab+0MeRaHcokn0KAe0ZzCegyj8fhW/2m9oFa2rvPwaE+AFd03yTqcnhMKrUeCLn8fTCD3y/vSJ1mvxYpuBNyaS1DxXPspXcmDiFOjjHicnyshuapavS+XaXVwzbxO8B5jGznxxRpysAgbXFuTZrzVKm/d814M8/wpBhOIzyhAgrrmwhExRSwHg== 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=w6qeHaUg4lajkMTQqMlCOec3t6Fwfxlpo4K596j4VYE=; b=aQWO2/tI9A4Na1uuci+bHr1fEtU6K/qcsBUZjGmQWFYhj99z9tvQP9blJu7Cu79B9cPctm6BSZeIxa5nJrWF5de1YMh8Rtgw6AM0s0jLzZ3pyhdz/d8cZBETMB75aHNvrLsIuEb1bUbnojNSRUqZr9UEUD1Wc5d0AUE5aL+drfJoYLQG2dxmlxEd2tzPf6EMhuv2iCpdp8wdtO9uWXX7TfQJmv3xt0vN7Q28XDi/h9PClAEnY7lgqtMfDhSKfg0cC0LNkX9pLWr4SokHYFA9EVmAORoBp2CZx/7yqrn7/t74ZC9wAPZIfP3bjMaHTLK8Mnq6gfHGwb4/1d26BRgpuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w6qeHaUg4lajkMTQqMlCOec3t6Fwfxlpo4K596j4VYE=; b=LX0kjMWfKmhamHmYR2+wQO06WLeaOuNtWmLSURRGlhY47iSw3/Z6IqjHCFT6vfCEQ3/nmQ4CJhLwqqtU658V4ZAjtzMJfBzFJg7Lf9jJzafqMFuyvI5+RfZfMdDNZfiyzYBeluWIepfKVv4reFGQY/DbGJ7+ew5DejSelxWmPEU= Authentication-Results: huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=none action=none header.from=marvell.com; Received: from MWHPR18MB1070.namprd18.prod.outlook.com (2603:10b6:300:a5::11) by MW3PR18MB3660.namprd18.prod.outlook.com (2603:10b6:303:55::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.21; Mon, 29 Jun 2020 14:47:36 +0000 Received: from MWHPR18MB1070.namprd18.prod.outlook.com ([fe80::e895:bdac:e157:2ed2]) by MWHPR18MB1070.namprd18.prod.outlook.com ([fe80::e895:bdac:e157:2ed2%11]) with mapi id 15.20.3131.027; Mon, 29 Jun 2020 14:47:36 +0000 Date: Mon, 29 Jun 2020 20:17:09 +0530 From: Harman Kalra To: "Wei Hu (Xavier)" CC: , , , , , , , , , , "dev@dpdk.org" Message-ID: <20200629144708.GA193041@outlook.office365.com> References: <1592813340-44094-1-git-send-email-xavier.huwei@huawei.com> <1592813340-44094-3-git-send-email-xavier.huwei@huawei.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.0 (2018-05-17) X-ClientProxiedBy: BM1PR01CA0084.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::24) To MWHPR18MB1070.namprd18.prod.outlook.com (2603:10b6:300:a5::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from outlook.office365.com (115.113.156.2) by BM1PR01CA0084.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20 via Frontend Transport; Mon, 29 Jun 2020 14:47:33 +0000 X-Originating-IP: [115.113.156.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62020cc0-8fac-4464-10e7-08d81c3b5d0c X-MS-TrafficTypeDiagnostic: MW3PR18MB3660: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qpDDBP6vJc8xiNw9UC9zmAXZH+dfsORX4R1LkcKwsprk5BHnEFsI/oNv0nzCRFm7T519w3pL7uDffKS6GWqroWJfTR2cicUCXtsYhM35FOLpBWihmmxccPDfX3BNI4rYOqh4s3lpPZZjUFJL+GH33+QnDgEezk27Uo97xLG9u9bLOOON15MuETe6PJ7ps7eRNdX7Cr3z0Dp9sRKmNImBMRxzxdvufhsCkIPhT/v4Tf8AwgBue6eKgbW7V4X+pBeJBIZYKpAZDE8CPix+uFUZOa7HaHLdU8tWwnYSxxw9hsh3YnU8vhAGSBvgo03PFShML1y/eJ6dSMA4QkeB3c73kA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR18MB1070.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39850400004)(366004)(376002)(396003)(346002)(136003)(8676002)(30864003)(86362001)(83380400001)(52116002)(186003)(55236004)(4326008)(55016002)(5660300002)(53546011)(9686003)(66476007)(478600001)(66946007)(33656002)(316002)(26005)(66556008)(8936002)(956004)(6506007)(6666004)(2906002)(1076003)(6916009)(16526019)(7696005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: kJV7upTMrN428m5DfejuFy42iwUvPCCmvlqZKs8yp3KnbI0qLIss7gzTJnoRcPxoRM5D1M2ISPBVWuiYt6qCYm4LZHKXrZ60IvI+EIsz6jGyK3QRCkKc7FTuOkejVvlDwavfQ1cjFg8Gds3EwQGpDmT7RZNoglp462F4V+z3xdqlhrNDetraueNLq+xR35VUUGQg5c0xE1FT6h2PZiUJGWiz5Eczx3EOMjADyK8Vbc9xd3v0mtyvyY6KwghwA9kzkBQ4i7RP4As1bybQYE1Oe1ARCIvLl55IqencArV1kpF6lWWoQePvxeauL8vMKl+4NoMv45SB2gsdKzwStNVLwHoAKwBzOqwtEzTQ5lTbMghVgqVCXK/D46zsdCNk+VnZkrzcf8n5dGeNAf181VN1DD4tgrGOCM6Sfr/BOdGVXrJw8DsQY6IxWuKZmm8h97TiIKoxa/tHzhtEitG6icnjWLirIdq25aqZZ5d+FruaNqI= X-MS-Exchange-CrossTenant-Network-Message-Id: 62020cc0-8fac-4464-10e7-08d81c3b5d0c X-MS-Exchange-CrossTenant-AuthSource: MWHPR18MB1070.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2020 14:47:36.6523 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DHUoEbjnHbuLDx7npoW89yfkfK2mCy8Ze2SIf9Lm5zSCCwl8/WtNpHEW9NdA8hUbY8eTrdVDpHC2+jzf5IKGUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR18MB3660 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-06-29_15:2020-06-29, 2020-06-29 signatures=0 Subject: Re: [dpdk-dev] [EXT] Re: [PATCH v4 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" Acked-by: Harman Kalra On Mon, Jun 29, 2020 at 09:34:00AM +0800, Wei Hu (Xavier) wrote: > External Email > > ---------------------------------------------------------------------- > Hi, Heinrich Kuhn & Harman Kalra & Jerin Jacob & Nithin Dabilpuram & Kiran > Kumar K & > > Rasesh Mody & Shahed Shaikh & Qi Zhang & Xiao Wang & Beilei Xing & Jeff Guo. > > Could you please help to review this patch and give 'Acked-by' if there are > no objects. > > Thanks, Xavier > > On 2020/6/22 16:09, 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 > > Acked-by: Hyong Youb Kim > > --- > > v3 -> v4: Delete "next_mask" label and modify the function that when the > > offload is not supported the function fail. > > 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 | 12 +++--------- > > 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, 26 insertions(+), 76 deletions(-) > > > > diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c > > index 2f031ec..17a7a49 100644 > > --- a/drivers/net/dpaa2/dpaa2_ethdev.c > > +++ b/drivers/net/dpaa2/dpaa2_ethdev.c > > @@ -147,7 +147,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) > > { > > struct dpaa2_dev_priv *priv = dev->data->dev_private; > > struct fsl_mc_io *dpni = dev->process_private; > > - int ret; > > + int ret = 0; > > PMD_INIT_FUNC_TRACE(); > > @@ -155,7 +155,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) > > /* VLAN Filter not avaialble */ > > if (!priv->max_vlan_filters) { > > DPAA2_PMD_INFO("VLAN filter not available"); > > - goto next_mask; > > + return -ENOTSUP; > > } > > if (dev->data->dev_conf.rxmode.offloads & > > @@ -168,14 +168,8 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) > > if (ret < 0) > > DPAA2_PMD_INFO("Unable to set vlan filter = %d", ret); > > } > > -next_mask: > > - 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; > > + return ret; > > } > > static int > > 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); >