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 D4983A00BE; Tue, 14 Jun 2022 10:39:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B42404068E; Tue, 14 Jun 2022 10:39:50 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id D04464067C for ; Tue, 14 Jun 2022 10:39:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655195989; x=1686731989; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1joYDrbZTJLogsuYTW60FKJ79bIaLY8QKfmgcFsig6I=; b=IFeH11itHat1CV9wcENtQnWWZc3ez/BlaN77jexy8Jb+UAllC6JyLGJR IhGfh+AoumsbKt+eE0HYIihR7RokA4n38ihNYdDQLSWKE8JoIOX4CCrqf QnDUKYflPHL9ILnyXAVs6wLnQ23mofNSfHdHTWzBUAjNj27J57rVOsLIu sHp1aO4zD0WtJ2WkLbVXgiqLATDthInVjTwwNoVLMYBPtoi+1TjYVEjdK iD2BVoNjeMeMfPbdkKLHniTAZnrcOxlnXhbW+7ZbwiSeE6zDuZn5Rhju0 IiSq9LuBbbaXEMY8GnlJl0CNck88nbds6Mm7yRSkB7cmHHTgl96UFtw/Q Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="276090649" X-IronPort-AV: E=Sophos;i="5.91,299,1647327600"; d="scan'208";a="276090649" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2022 01:39:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,299,1647327600"; d="scan'208";a="651912013" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga004.fm.intel.com with ESMTP; 14 Jun 2022 01:39:47 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 14 Jun 2022 01:39:47 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 14 Jun 2022 01:39:47 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.172) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 14 Jun 2022 01:39:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bR7s3Xl1mCv5Vv1YG5YKVEgCQVd3HsFiwmORhFnH8H5jtLTcBGRKlA9iv9PDFdbjqlaXFcD9u2hiy6SLo922PKUyhkwRK+DY7p6mIBpIPcWwQHeRUCo/h84qHrog/Pn+thke1RF66I1oOgotdbgSHlhQlG2xzyi6EaxO9w11Gp15dbHJzPloll5tGcsoLpzbsnfzpXYu5GKZYihxXJvMzTCiHT+q2krZjZ7V2rObiOC02ufldgNckN1tfw2M6/Hunh0ZqkCukTEx9IsF5jPhc0prhzAuyXh0xyo8ZIRTMbF200BDYSZK/wSlfjzuMYXjpY8NtfyMKRtrqjRc4Rd5CQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=goFJw/oFQiNg0v/sPATqTMMXYmrrgn9SA4LiD6T+6hY=; b=kJEeQmYEa0CFvlCTxc/Oh3x3SkdronTVARvk+Ef++mdENjifqUMdkrB/wadExQFC1Nk5vCJR6HDuU3Qbiqeun34f5ztx/3oQ/gl2Qi6HEZa0sZ+zYlTmkUEHd3ntYedED77z1VuN7bPlkmZxK5+m1fCWhMVAiRFQDMFZ7eF0L4jHznOql7t13V80eNIAKik8wt4Y/6ecb6orA+McKhXHnR2fcQ7WbGpKG5FGinV82tA9l01HED5lql3dC78S0xmTQzGiysZ27cO6wz4T8T3za93vq3EdCNnAOKcC1I6q0pIPjWk+OgUsg35ylAJqAClSqRmU9EAcVZG1y89rps2K8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB3516.namprd11.prod.outlook.com (2603:10b6:5:72::13) by MWHPR1101MB2096.namprd11.prod.outlook.com (2603:10b6:301:58::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14; Tue, 14 Jun 2022 08:39:44 +0000 Received: from DM6PR11MB3516.namprd11.prod.outlook.com ([fe80::187:4143:ba20:d362]) by DM6PR11MB3516.namprd11.prod.outlook.com ([fe80::187:4143:ba20:d362%7]) with mapi id 15.20.5332.020; Tue, 14 Jun 2022 08:39:44 +0000 From: "Zhang, Yuying" To: "Liu, KevinX" , "dev@dpdk.org" CC: "Xing, Beilei" , "Yang, SteveX" , "Zhang, RobinX" Subject: RE: [PATCH v7] net/i40e: add outer VLAN processing Thread-Topic: [PATCH v7] net/i40e: add outer VLAN processing Thread-Index: AQHYfKRlEzo/f4EM40yrICifnG4Csq1ONfGAgAAIS4CAAFvKwA== Date: Tue, 14 Jun 2022 08:39:44 +0000 Message-ID: References: <20220610155216.81289-1-kevinx.liu@intel.com> <20220610162944.99526-1-kevinx.liu@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 50ab42e5-9c1e-4e69-bd58-08da4de16e68 x-ms-traffictypediagnostic: MWHPR1101MB2096:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: URnTRz7WlQ7NrnsBfT+LpsdIKpU4DZtbj6Rsu3o6UefAO/aoBLiIR6vRcWTkkWo76QEMPE7IRNGsqeERWAtpSAV8gudAkFhcdOd+iwilYqe5u3Oon5594Tz24aR9dJC98n3BqmC2EaiJEoOfkMaU81NcmEK6g+Y785VE24TZM4plwDbeBP3T205Q4AO2HHQCEvHWmrIeM7oteX0RMk2W8yiLk2+BjiRySFa0/xLtBSZ1QNBCCmg4p5+4wOw2OCUBtPMpEeklxO38C3nTTn6Hcev1VFfXeIujwc5URjIvox9iCih4gVvuFMCdWwPMjui9MT4bd+ycAjMQx8Ue0SfwgpxpWhn1R3ToKucQbwpXfrHOaLKCAeFl9Gxi+FImeLyNB7wTlHc4ZAbT3JLWNGRpNv7nlwPL3rDesi5RvABg/CRbb18Kp1RgKMrouWauvCoodHoEKOUBKcmGmBTeRXHCf4N2rSarmKEjrDor9W+GaPsljq0XaEdJYCku++OGx9RFzJBrOfTZ0jStIxPxy2YfthvlEnemlnnggNkRfxCriENQKOQcT/aE/iMUBDDU4DFPHXPT5s8k2FFrj6MmqsULcjf2w3/zl8vF2SVQgzrrnz2bAZvp8E5bQGjOh8lfItsHZRIFFwvhhdtkv2dGWIH1sAgUe42n4V1yhgpzzJSnOhJXSquS69g024GSeWv7DYmhIzaELbb1F3Q1eLmRJl+pXg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB3516.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(71200400001)(508600001)(2906002)(33656002)(86362001)(186003)(107886003)(9686003)(26005)(5660300002)(53546011)(6506007)(52536014)(7696005)(38100700002)(110136005)(54906003)(8936002)(316002)(82960400001)(38070700005)(122000001)(76116006)(8676002)(64756008)(66446008)(4326008)(66556008)(66476007)(83380400001)(66946007)(55016003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-2022-jp?B?cEN4TG40ZlJpeGE0eHRRM1RlZUR6ZW9ud0trY0pmU004QnJWbUppZlBm?= =?iso-2022-jp?B?MUFQRzlNRDJJS3hwcEltUDRPZkYwSUJxMFNDZjVGVml4U0pEZEJtdHZj?= =?iso-2022-jp?B?S2hEWmZ6SzBhWEdwZytnSzUxYk5keUVZYlBmaCtaOWx4YlNLN2RlV1Np?= =?iso-2022-jp?B?Rml6YUdIRmNDVElwR1JBeGZQelBkU2pWUlpYU0VOU0dLZnRTdjNpREpI?= =?iso-2022-jp?B?RTVuVFJzVUZjdzZ3RjRIOTFrTWFLUHF5NjJqS1NJVUc2UFVnaGJReHNm?= =?iso-2022-jp?B?aVAwd3RrSlcveXdLZXdwai9mT0tKdlRuRG93OFVyTnVPMjZXd0dOZFQy?= =?iso-2022-jp?B?S21XVUQvYlFKT1NVWHhQTTdDM0htdTVITHNraS8rK0tvNmNQK2QyWDJ3?= =?iso-2022-jp?B?bGEzMWZDc09mNlV1b1dDYTFPOHBwWW1LRHRiREhmSHhYVkhaR2pSQWlZ?= =?iso-2022-jp?B?RE5aQnFxV1VnbStoVm5ZRVgxM245bWpnK0JFSk9KZngxd1pmc0Y3WXBz?= =?iso-2022-jp?B?NStIaTJTQTFLR0diSzlSOEs5V2dXeHhZTk4wbm5BRHlCeTlNRnZBUld4?= =?iso-2022-jp?B?ZDBXVGQydVlUVk0wR3hSNnova0I0RElZUFpRTU83MHRXd3ZBMEg4RG5r?= =?iso-2022-jp?B?NGNuWElkK0M3T3R5czh6RGpmcFJLcFJWLzBTTE14SFNjckFhdjIyVHF5?= =?iso-2022-jp?B?QVNQeGtDNk5nWHpkTXpXZmtRVk9wT1BEQThOSks2cERlQXBnVElaWk9Q?= =?iso-2022-jp?B?TnhVSTlHVFFXMDUzeFNxekU4U1RiemZVQkcwak1kbTZGRjYwOFZrVjZ2?= =?iso-2022-jp?B?M2owb2k4WGNpdW5kZ3BhNHZGNDNRdGhIcWpoeDR6Qi9NMy9SK1hlVXM1?= =?iso-2022-jp?B?SWlIZlkrTHFIL2R3ek1NVjFBd2VQcnpBWTRyejlpcjNIaWtlMGZUclg2?= =?iso-2022-jp?B?T0VSaTRzeG44WVlod2F4dlZiL3hCWVlyR0dMcDhLRnowR3QvVWNTdkY4?= =?iso-2022-jp?B?NWhUd2txbE9xa09PMitWRUtvbFhHS2FCOU95c0QvWG1zcko4U1l0Vllu?= =?iso-2022-jp?B?RVZMUHQwdjlVQlNiTThYRlBwcjkrUE4vZlVOUm5RT0RuM0ticjk0MjVx?= =?iso-2022-jp?B?bjdSblRYWHJRcnlFQXJYY2daQkpyNU1TbVpWem9HMWZXTUhGdTFSSzBN?= =?iso-2022-jp?B?ZnRrNm9xdi9taXMrMUdxMU54a2prMENoRWdRS2RyakJ2QzJ5RmkrZTkz?= =?iso-2022-jp?B?OFZNUGxsa0Y3dmxWbldyemNwZ2RVRkk1VXpzQTBOMFBWOGVSOHJSSlpE?= =?iso-2022-jp?B?M29JVEtZblR4ZXlzYnVqT1YxdEZnMWxrN0duN2lwZTY4dHBaN0RZTDlY?= =?iso-2022-jp?B?dUFwUm96NmRHcGlCQ1BER2J3TEpzWTZyNTQ3SzI4dHdtb2VSdTFnRWc5?= =?iso-2022-jp?B?Z1dZOVJuM2NIZmoyQS9Za3VXR3NZcVpJMjZ3Qnk5Tk5rZTVWckFjc0lh?= =?iso-2022-jp?B?dWFGQUhHOERnT2xoeVVmN0hJcDc5Z2hKWmg1OWVyZ0ttbExHbGdyVk5S?= =?iso-2022-jp?B?K3VRS0RWVHpsREgrMHBPMlJFV3k5MWNYWUZRRUJyT01yN1BuaG50TTE0?= =?iso-2022-jp?B?VFNUNi9PNTY3d0E4WHdDazNEd1NjRFpYZ0dKUndYN3o5Sk96T3B5TjVH?= =?iso-2022-jp?B?NEVLcTRTcG9tZTBDdm1DZEkwYXEzaVpCY0R1emxlb2lGVlBxVDZybHM0?= =?iso-2022-jp?B?cysrRU5RUHFhWHdGS2daWG0zcnN5WUpxNlZ0aHQ0YU1YYzgzU2dhWG1W?= =?iso-2022-jp?B?TTdEOU1MNitFT0NxaUdmajhoV0tVTUVvd2JlMlk3RHR0NlcyT28ydld5?= =?iso-2022-jp?B?ZDROUFFTdEFXbWJWcXVXTEJKcEFSaGpyMjVwUW9GZHZoTFpEeGkyeUxq?= =?iso-2022-jp?B?dXl0Wi9MUE5UVGRvVW83TXR1UmdtelBYbnVwWDdKV09NU3diTitnekNw?= =?iso-2022-jp?B?ZVl6VDY5bWh0Z3I4Mzh2MkhBL043alVtQXhHem9QOElLcy9XZUVBU211?= =?iso-2022-jp?B?UnQ4VGNrdHRCYjFCV3YrV1l1WXh1Wm1NQXpLMmxKKzNqbldoK280WDdE?= =?iso-2022-jp?B?YVBsd0ljOHpHTzZzaE1QdkVxZGZpQ1BoM3BUME9xRkpWallpcjh3SEwx?= =?iso-2022-jp?B?dC9RS3JVU2VWblBlWisxUkF4QlV2eEZFYWlyNjZBdng1MFMwRlkraFFM?= =?iso-2022-jp?B?ekduaGU3R3ZGWDFBME9meUFYUDF2cUxBOW4vYnpwUWFFY1BKNzJYVUh5?= =?iso-2022-jp?B?dFNuaE1ZaTg1YTNFVklLSmJxbS95L2JXMzJZaTROQWFaTzlLOFZYV2JR?= =?iso-2022-jp?B?WFlCeUYxS0dRT3loalFXZ3dFWEZmSmJGSVU4SzJKT0xSNkxnSGFWYVZt?= =?iso-2022-jp?B?SDdDaEQ2MGpRVTJpWFFWU1BhWFhkK0FCMXowMTZXMDNHUU13djMwd2lY?= =?iso-2022-jp?B?OVRUUUYzQmpjNWpYVmJNY255ekFRVkRjeEJTUT09?= Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3516.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50ab42e5-9c1e-4e69-bd58-08da4de16e68 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2022 08:39:44.1216 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: KgOJ1R2bllqmRb0p2GL20WLU8q4GntmuDTr18KeIy7PyqfPoCndBLynIGDC/d1PJPUI8pnXb9Z3Z6slNCMXcBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2096 X-OriginatorOrg: intel.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Hi Kevin, Workaround should be replaced when root cause be found. Best regards, Yuying > -----Original Message----- > From: Liu, KevinX > Sent: Tuesday, June 14, 2022 11:07 AM > To: Zhang, Yuying ; dev@dpdk.org > Cc: Xing, Beilei ; Yang, SteveX > ; Zhang, RobinX > Subject: RE: [PATCH v7] net/i40e: add outer VLAN processing >=20 > Hi, Yuying >=20 > > -----Original Message----- > > From: Zhang, Yuying > > Sent: 2022=1B$BG/=1B(B6=1B$B7n=1B(B14=1B$BF|=1B(B 10:44 > > To: Liu, KevinX ; dev@dpdk.org > > Cc: Xing, Beilei ; Yang, SteveX > > ; Zhang, RobinX > > Subject: RE: [PATCH v7] net/i40e: add outer VLAN processing > > > > Hi Kevin, > > > > > -----Original Message----- > > > From: Liu, KevinX > > > Sent: Saturday, June 11, 2022 12:30 AM > > > To: dev@dpdk.org > > > Cc: Zhang, Yuying ; Xing, Beilei > > > ; Yang, SteveX ; > > > Zhang, RobinX ; Liu, KevinX > > > > > > Subject: [PATCH v7] net/i40e: add outer VLAN processing > > > > > > From: Robin Zhang > > > > > > Outer VLAN processing is supported after firmware v8.4, kernel > > > driver also > > > > Since this patch can only be enabled with firmware v8.6, should you > > sync with dpdk here? > OK, I'll revise it here. > > > > > change the default behavior to support this feature. To align with > > > kernel driver, add support for outer VLAN processing in DPDK. > > > > > > But it is forbidden for firmware to change the Inner/Outer VLAN > > > configuration while there are MAC/VLAN filters in the switch table. > > > Therefore, we need to clear the MAC table before setting config, and > > > then restore the MAC table after setting. > > > > > > This will not impact on an old firmware. > > > > > > Signed-off-by: Robin Zhang > > > Signed-off-by: Kevin Liu Acked-by: Yuying Zhang > > > --- > > > drivers/net/i40e/i40e_ethdev.c | 94 > > > ++++++++++++++++++++++++++++++++-- > > > drivers/net/i40e/i40e_ethdev.h | 3 ++ > > > 2 files changed, 92 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > > b/drivers/net/i40e/i40e_ethdev.c index 755786dc10..4cae163cb9 100644 > > > --- a/drivers/net/i40e/i40e_ethdev.c > > > +++ b/drivers/net/i40e/i40e_ethdev.c > > > @@ -2575,6 +2575,7 @@ i40e_dev_close(struct rte_eth_dev *dev) > > > struct i40e_hw *hw =3D I40E_DEV_PRIVATE_TO_HW(dev->data- > > > >dev_private); > > > struct rte_pci_device *pci_dev =3D RTE_ETH_DEV_TO_PCI(dev); > > > struct rte_intr_handle *intr_handle =3D pci_dev->intr_handle; > > > + struct rte_eth_rxmode *rxmode =3D &dev->data->dev_conf.rxmode; > > > struct i40e_filter_control_settings settings; > > > struct rte_flow *p_flow; > > > uint32_t reg; > > > @@ -2587,6 +2588,18 @@ i40e_dev_close(struct rte_eth_dev *dev) > > > if (rte_eal_process_type() !=3D RTE_PROC_PRIMARY) > > > return 0; > > > > > > + /* > > > + * It is a workaround, if the double VLAN is disabled when > > > + * the program exits, an abnormal error will occur on the > > > + * NIC. Need to enable double VLAN when dev is closed. > > > + */ > > > > What is the root cause of this error, I suggest finding a true fix > > instead of adding additonal process here. > About this error, dpdk has reported a known issue. Because it doesn't kno= w > the root cause of the problem, it adds a workaround here to temporarily > avoid some problems. > > > > > + if (pf->fw8_3gt) { > > > + if (!(rxmode->offloads & > > > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)) { > > > + rxmode->offloads |=3D > > > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND; > > > + i40e_vlan_offload_set(dev, > > > RTE_ETH_VLAN_EXTEND_MASK); > > > + } > > > + } > > > + > > > ret =3D rte_eth_switch_domain_free(pf->switch_domain_id); > > > if (ret) > > > PMD_INIT_LOG(WARNING, "failed to free switch > > > domain: %d", ret); @@ -3909,6 +3922,7 @@ i40e_vlan_tpid_set(struct > > > rte_eth_dev *dev, > > > struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data- > > > >dev_private); > > > int qinq =3D dev->data->dev_conf.rxmode.offloads & > > > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND; > > > + u16 sw_flags =3D 0, valid_flags =3D 0; > > > int ret =3D 0; > > > > > > if ((vlan_type !=3D RTE_ETH_VLAN_TYPE_INNER && @@ -3927,15 > > > +3941,32 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev, > > > /* 802.1ad frames ability is added in NVM API 1.7*/ > > > if (hw->flags & I40E_HW_FLAG_802_1AD_CAPABLE) { > > > if (qinq) { > > > + if (pf->fw8_3gt) { > > > + sw_flags =3D > > > I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN; > > > + valid_flags =3D > > > I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN; > > > + } > > > if (vlan_type =3D=3D RTE_ETH_VLAN_TYPE_OUTER) > > > hw->first_tag =3D rte_cpu_to_le_16(tpid); > > > else if (vlan_type =3D=3D RTE_ETH_VLAN_TYPE_INNER) > > > hw->second_tag =3D rte_cpu_to_le_16(tpid); > > > } else { > > > - if (vlan_type =3D=3D RTE_ETH_VLAN_TYPE_OUTER) > > > - hw->second_tag =3D rte_cpu_to_le_16(tpid); > > > + /* > > > + * If tpid is equal to 0x88A8, indicates that the > > > + * disable double VLAN operation is in progress. > > > + * Need set switch configuration back to default. > > > + */ > > > > I don't suppose we need to set qinq tpid in vlan case. Please explain > > this situation in details. > I'll think about how to explain this place. Thank you. > > > > > + if (pf->fw8_3gt && tpid =3D=3D RTE_ETHER_TYPE_QINQ) { > > > + sw_flags =3D 0; > > > + valid_flags =3D > > > I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN; > > > + if (vlan_type =3D=3D > > RTE_ETH_VLAN_TYPE_OUTER) > > > + hw->first_tag =3D > > > rte_cpu_to_le_16(tpid); > > > + } else { > > > + if (vlan_type =3D=3D > > RTE_ETH_VLAN_TYPE_OUTER) > > > + hw->second_tag =3D > > > rte_cpu_to_le_16(tpid); > > > + } > > > } > > > - ret =3D i40e_aq_set_switch_config(hw, 0, 0, 0, NULL); > > > + ret =3D i40e_aq_set_switch_config(hw, sw_flags, > > > + valid_flags, 0, NULL); > > > if (ret !=3D I40E_SUCCESS) { > > > PMD_DRV_LOG(ERR, > > > "Set switch config failed aq_err: %d", @@ - > > > 3987,8 +4018,13 @@ static int i40e_vlan_offload_set(struct > > > rte_eth_dev *dev, int mask) { > > > struct i40e_pf *pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data- > > > >dev_private); > > > + struct i40e_mac_filter_info *mac_filter; > > > struct i40e_vsi *vsi =3D pf->main_vsi; > > > struct rte_eth_rxmode *rxmode; > > > + struct i40e_mac_filter *f; > > > + int i, num; > > > + void *temp; > > > + int ret; > > > > > > rxmode =3D &dev->data->dev_conf.rxmode; > > > if (mask & RTE_ETH_VLAN_FILTER_MASK) { @@ -4007,6 +4043,33 > > @@ > > > i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask) > > > } > > > > > > if (mask & RTE_ETH_VLAN_EXTEND_MASK) { > > > + i =3D 0; > > > + num =3D vsi->mac_num; > > > + mac_filter =3D rte_zmalloc("mac_filter_info_data", > > > + num * sizeof(*mac_filter), 0); > > > + if (mac_filter =3D=3D NULL) { > > > + PMD_DRV_LOG(ERR, "failed to allocate memory"); > > > + return I40E_ERR_NO_MEMORY; > > > + } > > > + > > > + /* > > > + * Outer VLAN processing is supported after firmware v8.4, > > > kernel driver > > > + * also change the default behavior to support this feature. > > > To align with > > > + * kernel driver, set switch config in 'i40e_vlan_tpie_set' to > > > support for > > > + * outer VLAN processing. But it is forbidden for firmware to > > > change the > > > + * Inner/Outer VLAN configuration while there are > > > MAC/VLAN filters in the > > > + * switch table. Therefore, we need to clear the MAC table > > > before setting > > > + * config, and then restore the MAC table after setting. This > > > feature is > > > + * recommended to be used in firmware v8.6. > > > + */ > > > + /* Remove all existing mac */ > > > + RTE_TAILQ_FOREACH_SAFE(f, &vsi->mac_list, next, temp) { > > > + mac_filter[i] =3D f->mac_info; > > > + ret =3D i40e_vsi_delete_mac(vsi, &f- > > > >mac_info.mac_addr); > > > + if (ret) > > > + PMD_DRV_LOG(ERR, "i40e vsi delete mac > > > fail."); > > > + i++; > > > + } > > > if (rxmode->offloads & > > > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) { > > > i40e_vsi_config_double_vlan(vsi, TRUE); > > > /* Set global registers with default ethertype. */ @@ > > > -4014,9 +4077,19 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, > > > int > > > mask) > > > RTE_ETHER_TYPE_VLAN); > > > i40e_vlan_tpid_set(dev, > > RTE_ETH_VLAN_TYPE_INNER, > > > RTE_ETHER_TYPE_VLAN); > > > - } > > > - else > > > + } else { > > > + if (pf->fw8_3gt) > > > + i40e_vlan_tpid_set(dev, > > > RTE_ETH_VLAN_TYPE_OUTER, > > > + RTE_ETHER_TYPE_QINQ); > > > i40e_vsi_config_double_vlan(vsi, FALSE); > > > + } > > > + /* Restore all mac */ > > > + for (i =3D 0; i < num; i++) { > > > + ret =3D i40e_vsi_add_mac(vsi, &mac_filter[i]); > > > + if (ret) > > > + PMD_DRV_LOG(ERR, "i40e vsi add mac fail."); > > > + } > > > + rte_free(mac_filter); > > > } > > > > > > if (mask & RTE_ETH_QINQ_STRIP_MASK) { @@ -4846,6 +4919,17 > @@ > > > i40e_pf_parameter_init(struct rte_eth_dev *dev) > > > return -EINVAL; > > > } > > > > > > + /** > > > + * Enable outer VLAN processing if firmware version is greater > > > + * than v8.3 > > > + */ > > > + if (hw->aq.fw_maj_ver > 8 || > > > + (hw->aq.fw_maj_ver =3D=3D 8 && hw->aq.fw_min_ver > 3)) { > > > + pf->fw8_3gt =3D true; > > > + } else { > > > + pf->fw8_3gt =3D false; > > > + } > > > + > > > return 0; > > > } > > > > > > diff --git a/drivers/net/i40e/i40e_ethdev.h > > > b/drivers/net/i40e/i40e_ethdev.h index a1ebdc093c..fe943a45ff 100644 > > > --- a/drivers/net/i40e/i40e_ethdev.h > > > +++ b/drivers/net/i40e/i40e_ethdev.h > > > @@ -1188,6 +1188,9 @@ struct i40e_pf { > > > /* Switch Domain Id */ > > > uint16_t switch_domain_id; > > > > > > + /* When firmware > 8.3, the enable flag for outer VLAN processing > > */ > > > + bool fw8_3gt; > > > + > > > struct i40e_vf_msg_cfg vf_msg_cfg; > > > uint64_t prev_rx_bytes; > > > uint64_t prev_tx_bytes; > > > -- > > > 2.34.1