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 C00EAA0577 for ; Mon, 13 Apr 2020 05:03:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9CDAB2986; Mon, 13 Apr 2020 05:03:55 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1C7862986; Mon, 13 Apr 2020 05:03:53 +0200 (CEST) IronPort-SDR: Q61FXfgj/6oZc9tXY+ukwdxmUl48TYKa3rVpYReWybWJiQvoCGkwPori40WY3bjtBdTWGbDaYQ OrbELiYUiL6w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2020 20:03:52 -0700 IronPort-SDR: 1z/2WipQ2GTbZ44d61tfVstOPCkozHSNXbQlPzI1PLaapqfdYh/SA+mO0ynr2yAoZJ1lwMCw8/ 3YLaJ3KjZMYw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,377,1580803200"; d="scan'208";a="287758969" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga002.fm.intel.com with ESMTP; 12 Apr 2020 20:03:52 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 12 Apr 2020 20:03:51 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 12 Apr 2020 20:03:51 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.175) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 12 Apr 2020 20:03:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SgvFlT3VZodw5NHcgR92ICPNMCEolt+NSWIfMunigqYfmlHACEpwTdC1NyQs/8aW7+GO9eftRk96KDdbWdHUooX9CIxKonYPzBhMyzf52gTXM007o1MdhJl/pgTKFdorBYgaH0UOt49pRIMPONH3i4QAJ5gfUs9YmjMTJxsMg2HvHYvcXRYWnmWaM2fbJeonthUT2jqkguWkPoKjCjQM08RK5MVhEzbLaqm1iOxcYX6Ox6UTrNUHBkL3Ur2FDle62rIsBneGm4suO8CJjk5kaGtJAwrk1CvPrfkmwttKayHDyMB0g+qPd8L81gdD9BSZG0oO0aWFJ8ps2jvLH8k2Vw== 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=GDIc1uO88UI5kMLNMwfKgOuLb9kbPbV3gPSS0XbdyZU=; b=Ibcdz8CtIRDRJHI0s9ZBI8fETFzSY4aX/ZuwsLqwl0xUgHKZfo5YetjxWwMFDXEC3LzM5G0Mljnhh09rO79AhQYNxokGuSwE6COPYvW9/Uo7Dmv4GqtirXuUXSlrHDJOp9PhNVdkzhFc0ZrxRIYaS3L3KBp6+Dh8z/u8zenPEyXHWXRSKIygbfrhPffjT8sesiHAb3Vx7QIfcV8Cg+QLsPOTBhwzFyjaTi9u9aNQuixVyBrsGiMbtWqhrb6uo7EwUcpYkFUQC2y3asSHYB58w9AaueQ4O/l4JYNsnwxyNsGJ44KRvpXYK8JVYTB5oEvFGjybIISNsxdVsljH/binrA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GDIc1uO88UI5kMLNMwfKgOuLb9kbPbV3gPSS0XbdyZU=; b=gDeLf0hkRMPILV5ygb/Ak9YNLj7EwASnYriNO2rbHzWhvYytzEmVMgkqIadAUYGV3JqDgifSXe/neBvaPnyPV+3nXUA/OtCnyqk4rvSlAmVOQnGYl2Svb7Hx9r/+zGhYoVLEyDnkombZx1ip0utH62CC0gKUZZ+8ikXpmfOZMxI= Received: from BYAPR11MB3541.namprd11.prod.outlook.com (2603:10b6:a03:f5::16) by BYAPR11MB2565.namprd11.prod.outlook.com (2603:10b6:a02:c9::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2900.26; Mon, 13 Apr 2020 03:03:47 +0000 Received: from BYAPR11MB3541.namprd11.prod.outlook.com ([fe80::2c4f:22b:b8b0:27f9]) by BYAPR11MB3541.namprd11.prod.outlook.com ([fe80::2c4f:22b:b8b0:27f9%5]) with mapi id 15.20.2900.026; Mon, 13 Apr 2020 03:03:47 +0000 From: "Xing, Beilei" To: "Iremonger, Bernard" , "dev@dpdk.org" , "Zhang, Qi Z" CC: "Doherty, Declan" , "Ananyev, Konstantin" , "Shetty, Praveen" , "stable@dpdk.org" Thread-Topic: [PATCH] net/i40e: fix flow director initialisation Thread-Index: AQHWDPEIllqIamKli0C6CKFeXsRBdah2ZmBA Date: Mon, 13 Apr 2020 03:03:46 +0000 Message-ID: References: <1586273201-21961-1-git-send-email-bernard.iremonger@intel.com> In-Reply-To: <1586273201-21961-1-git-send-email-bernard.iremonger@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=beilei.xing@intel.com; x-originating-ip: [192.102.204.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 44918857-39c5-4ffb-94f5-08d7df5748f4 x-ms-traffictypediagnostic: BYAPR11MB2565: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-forefront-prvs: 037291602B x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3541.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(10019020)(39860400002)(346002)(136003)(376002)(396003)(366004)(8936002)(6506007)(81156014)(110136005)(52536014)(5660300002)(53546011)(6636002)(33656002)(76116006)(9686003)(55016002)(54906003)(8676002)(71200400001)(316002)(450100002)(26005)(4326008)(66556008)(66476007)(2906002)(478600001)(66446008)(7696005)(64756008)(186003)(66946007)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OqlPA/kK0p7O68O9iUxKTzTFspggsWFu9FSOmafaqAezHVDU0Iihz/tfHrcINgOoDlYtViVpwjeIKGOGl8mVRdLaBcJjicouRQMtp/O05i/hYWOf0H5p2knf3vU8FNR/IHOjfCZLwIgcVUxQNdHQLnjqgMKUgiug98321wi+qP4JEMWJp1I1BkYjSyVNXv26lanzWwGWTHIH2/hJsyAO5xUPMgjOZHlWca7kSXNVWr3pSeUK6qiWR+pj/Lg+pSq8QXw4QzYPz3hJyeuFt2+1JG+WI6fhbA+LQFzgprydhwB0EHSCSlPK7m6R0b1KrwXI3rC1HGNmQeXWAbFG/z1HNvys7i6WeJu2FaWjwu8WH4oeqbFSvOsOuGGbY9UwiCz8L89kyU6OZ7q0aSm83I8Bk6xa0pfnEAHB4Br21eVk/vliAMneAEBVvL3V+Lk8SiJN x-ms-exchange-antispam-messagedata: aGBtwYtvsfN8S2GNH7bdLr5J8WKTlHuDjiv1GHo958yWev9FDdqR5QFgN6OO2qXa5DYuT6yhsGUpCEUJTF1ABGEYg4myvx61qi3osULuR9ljWf5vP183twMC0LxfFGzeDybm/WhcFiBfpvkVOcSPpg== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 44918857-39c5-4ffb-94f5-08d7df5748f4 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2020 03:03:46.9125 (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: xyM/+5xW7r7YJa2REUvlgOqM8Yv+0sRtVN8dB0hl4SY1oOb2jlVPrpdLaWAX4dYgQpRaaDO7hJRPh5JglWRXmA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2565 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix flow director initialisation 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" > -----Original Message----- > From: Iremonger, Bernard > Sent: Tuesday, April 7, 2020 11:27 PM > To: dev@dpdk.org; Xing, Beilei ; Zhang, Qi Z > > Cc: Doherty, Declan ; Ananyev, Konstantin > ; Shetty, Praveen > ; Iremonger, Bernard > ; stable@dpdk.org > Subject: [PATCH] net/i40e: fix flow director initialisation >=20 > Remove references to struct rte_fdir_conf which is deprecated, in > i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and > i40e_flow_add_del_fdir_filter(). >=20 > Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup") > Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") > Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow > API") > CC: stable@dpdk.org >=20 > Signed-off-by: Bernard Iremonger > --- > drivers/net/i40e/i40e_fdir.c | 4 ++-- > drivers/net/i40e/i40e_flow.c | 7 +------ > 2 files changed, 3 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c = index > 931f259..b603b33 100644 > --- a/drivers/net/i40e/i40e_fdir.c > +++ b/drivers/net/i40e/i40e_fdir.c > @@ -1689,8 +1689,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev > *dev, > struct i40e_fdir_filter check_filter; /* Check if the filter exists */ > int ret =3D 0; >=20 > - if (dev->data->dev_conf.fdir_conf.mode !=3D > RTE_FDIR_MODE_PERFECT) { > - PMD_DRV_LOG(ERR, "FDIR is not enabled, please check the > mode in fdir_conf."); > + if (pf->fdir.fdir_vsi =3D=3D NULL) { > + PMD_DRV_LOG(ERR, "FDIR is not enabled"); > return -ENOTSUP; > } >=20 > diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c = index > d877ac2..8b6e1e4 100644 > --- a/drivers/net/i40e/i40e_flow.c > +++ b/drivers/net/i40e/i40e_flow.c > @@ -3394,8 +3394,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev > *dev, >=20 > cons_filter_type =3D RTE_ETH_FILTER_FDIR; >=20 > - if (dev->data->dev_conf.fdir_conf.mode !=3D > RTE_FDIR_MODE_PERFECT || > - pf->fdir.fdir_vsi =3D=3D NULL) { > + if (pf->fdir.fdir_vsi =3D=3D NULL) { > /* Enable fdir when fdir flow is added at first time. */ > ret =3D i40e_fdir_setup(pf); > if (ret !=3D I40E_SUCCESS) { > @@ -3411,8 +3410,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev > *dev, > NULL, "Failed to configure fdir."); > goto err; > } > - > - dev->data->dev_conf.fdir_conf.mode =3D > RTE_FDIR_MODE_PERFECT; > } >=20 > return 0; > @@ -4983,8 +4980,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, > /* If the last flow is destroyed, disable fdir. */ > if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { > i40e_fdir_teardown(pf); > - dev->data->dev_conf.fdir_conf.mode =3D > - RTE_FDIR_MODE_NONE; > i40e_fdir_rx_proc_enable(dev, 0); > } > break; > -- > 2.7.4 Acked-by: Beilei Xing