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 9C190A00C3 for ; Fri, 13 May 2022 11:56:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 784C440DDE; Fri, 13 May 2022 11:56:55 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 4E9FA40DDE for ; Fri, 13 May 2022 11:56:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652435813; x=1683971813; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5RJ9pZmJO2JsnIro9Hypf8QjuP9F4R9lHBLiAd9rX3o=; b=IE2x3/UozQYP+Vyo/7TaoK/inwiBzp1d7YeDEeO/Y9L3jiFs5SR1Lhlz JsccYQ4h4KgnVmlEQ4Vo1KqMWWUfDf2xyQmnR31MvRR+0qZfC3cKlF7rv 0UgV6toUykVifrw0u9ppWihuwr76To9DFQae1DRWFWC2rN4Zl4dBxwm0e 1fOPfhkIOjfUfzKnBHDi/un2RTUZ9d5T+AoXmnXfLDQuFvvc1FRKMBcP5 FhgmI+Kowt/x9cW7A3P2srtkazXYRQW8mWD84mHqyKfQbHl9IAg5vhPut YkK8V1hdi3EwA9IbPAEze8Q1nWWTN5schlOsxNyuJXR/RXtkUuyxuc1e6 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10345"; a="295526126" X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="295526126" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2022 02:56:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="637238179" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga004.fm.intel.com with ESMTP; 13 May 2022 02:56:52 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Fri, 13 May 2022 02:56:51 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Fri, 13 May 2022 02:56:51 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Fri, 13 May 2022 02:56:51 -0700 Received: from DS7PR11MB6015.namprd11.prod.outlook.com (2603:10b6:8:74::17) by DM5PR11MB1467.namprd11.prod.outlook.com (2603:10b6:4:a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.23; Fri, 13 May 2022 09:56:42 +0000 Received: from DS7PR11MB6015.namprd11.prod.outlook.com ([fe80::f943:ae81:e5d8:d8ef]) by DS7PR11MB6015.namprd11.prod.outlook.com ([fe80::f943:ae81:e5d8:d8ef%8]) with mapi id 15.20.5250.013; Fri, 13 May 2022 09:56:42 +0000 From: "Connolly, Padraig J" To: "Zhang, Peng1X" , "Yang, Qiming" , "Zhang, Qi Z" , "dev@dpdk.org" CC: "Zhang, Peng1X" , "stable@dpdk.org" Subject: RE: [PATCH v2] net/ice: fix DCF state checking mechanism Thread-Topic: [PATCH v2] net/ice: fix DCF state checking mechanism Thread-Index: AQHYZQydhFIdo6jFvEq0+T05JcxeMK0clMvA Date: Fri, 13 May 2022 09:56:42 +0000 Message-ID: References: <20220511154930.509436-1-peng1x.zhang@intel.com> In-Reply-To: <20220511154930.509436-1-peng1x.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.401.20 dlp-product: dlpe-windows dlp-reaction: no-action 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: 05314073-3212-4818-9521-08da34c6e1dd x-ms-traffictypediagnostic: DM5PR11MB1467:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr 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: WiXarsAibzB4llrtYkZEalyJF1XgKGFSsEcjqlSTyIzFI0cPVCBmQlzhlW3mASaLKLEVnejkQ4IzBsBl783eGrE817kGpnbhcKoM50UGD761/fhSiEdhUcWJ1g8tJ/8phj8ZWL1s84ONaQAcB5YEUzSLQbA7Vzp2zuqwwBDiucZPUfFYhmdEauIBiaznTMmr92rgbS0TRhLUMLPKNlOodMU+lho+skyGFtSNEuNBndI6ZbG0EoH3z9GEvFm489QIrJxW4GB1gUlYpbrj51C+HHKES+RsUKcBheaYTzojPLIR3/kl2NNZu8PisHD5SAO2zu/1NWeCHmdpzzlIHJxVscv7yG6hODGdXsrfeA5supV/LYDkzbBkr+AygzV7ljefhM18mFp7FKIiS/B+X5+lKVEE2JZF74A2wkmClfo/gNmReOfkFAH7VJb+5X2UAv5h1Sjpb8UDRqulJeg2k3drIXqTuGz1wZhxjA651pL1MvYsKcX4vK5R6P1S1cgHfjVUO9h4JHUfFIHc25D6sqJ7+tyS51+Qz+zYPoLuKpSYmj1IzuiGV8Pd6CpCDSlm18LntRWhK8Ud1CdN4bRjmS6EcKgMntL95yzCZ7WJxgasZUTFRYdXyyKI7h0Girdm7AxRSEYV0eFnUl7M8wHpGzYymsmBKp/ViWt3LzDxJO0NKpAgTDd7sfsOhEtpKm7D+ZgxhMaUCrKNDfFVA209xvd/5Q== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS7PR11MB6015.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6506007)(86362001)(53546011)(71200400001)(7696005)(508600001)(38070700005)(8936002)(83380400001)(186003)(26005)(122000001)(9686003)(55016003)(5660300002)(52536014)(33656002)(2906002)(110136005)(54906003)(316002)(66476007)(4326008)(64756008)(66556008)(66446008)(66946007)(8676002)(450100002)(76116006)(82960400001)(38100700002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?DvJWCrAIHl6JjXFl6Vp7ZXrtgE8HYV8LLgq7cFOi2zEXnbw+6/klRK23icUH?= =?us-ascii?Q?LOv0+yRH1rmyQggKZnz6mfGTL3D+tELJ0wVU78aUWBTv359ABoW7TwuaJ96T?= =?us-ascii?Q?jGBvYXIrRqIJVUH2yXrayPagIuO3Yu3DKg7OYeNUlXHpn0l8LjZDvBAmdH9E?= =?us-ascii?Q?Ny1r8+kF1Ba0qjGlbEGjacgOb7kR7II0meH9VTMR9J6S230tc0TwVp9rm/Wm?= =?us-ascii?Q?nsU1mFD7h+3sM/zc5ZA5dRlF7iyRM8TOv8l9JOWXk07IsQiGs1NIg2KTbhzm?= =?us-ascii?Q?9p7i1B8ebGkcoZjItT1dJOSX+KX7dMmb7OmTyGH9Wia/+9cvysG5TXedo1XJ?= =?us-ascii?Q?OTwPnAsWziadPzr6DrTGidB7O5bRdtWsvyk1k23HbxCFpmVg8wqFq//WQ+vj?= =?us-ascii?Q?KWdSE81V7JWe30AqBfR5QMr6Ntb71N638hi61dfpG0HkVU2YZyay8U5vaOba?= =?us-ascii?Q?PJsowaAiKj9Xk1jylJpyzNYE/g8v8f+QiPjO2sWDLz/Zu1sZCG1BN5CkTnjd?= =?us-ascii?Q?C833tm4vKsAFX33qkhs0Fx82muoZgc0S/2rfITRFkrVFZxL8828fxQ7RysQB?= =?us-ascii?Q?9fqQEHCeUPx4tjI9ZdRggyYVLekBBggz0gKAgru2gaAo1RQSG8UvTLhD/+Bk?= =?us-ascii?Q?KWgx0HKPKVfl5eLdramxLEI2QvEQRNLQp/5sz9U8rjYsZcs3ausw1MIxEKMe?= =?us-ascii?Q?ZQV7fumtXfQPJR18xZRt6PUaSPLetKRY5CiB0zLfNoGGaR3fqIwDyx+o5EOP?= =?us-ascii?Q?KXZIEgDqlVZI2NS/xTYG1jUmJH4x1y6gxRc3U4GcE0t2IXlhRe4xU+rriHcP?= =?us-ascii?Q?LqSzhfBlci0BDBG8AaTj3w5j2GRaBDaKVWgFfKsFMpXKrjnLu2RXAofCF46Q?= =?us-ascii?Q?ZzNT51RXDur9ZOApB6YzyGDXf0as2HMx09ZSRQbWdFEbqoffUPFL7anidRhD?= =?us-ascii?Q?1AVVM1V2OU7OWTJHXP7QojUIx8Nj+Thxv4aaD/wrJ3VI0bt0gti7TCZZ2HUc?= =?us-ascii?Q?W+HqEXyK0Yh7jUEeq4AOpcDhZzZsSxwf6hUWfquCmQothOyEo+JUFOJSxshR?= =?us-ascii?Q?TM+f1nd1jRA7mVV9jKCeGMDJ/yK9NLWxmX28ZuGfVEFagvTzP6o9bn96f64y?= =?us-ascii?Q?5j1O5iLjFi2BrCGjG6anXd/7G3Vi3bTkNq3VBi/j7cUJAkJrVj4LhxBY0n8l?= =?us-ascii?Q?05rAlOBEtHx5HilMocTMNtzqtq2Om8zNEbIzry1BRcanxMvh0Tey3Pl2fYjX?= =?us-ascii?Q?vgm86IpYIOcGkszYzT8RyWEdKpuqXbJSUJpQE6Y7Q0lEokzAo59YMdz1d7bk?= =?us-ascii?Q?FSdnpeUtGGB/ySHz0xH/qwvkN8g16S79xGyDD2RcofZa9j8CIisrZH0rHLTZ?= =?us-ascii?Q?iiKoVW5BVjDFaKHwNIDaS+TGMH8QKIQdOro/d/A6LPeCjV6b1AZ5LmGOPWhU?= =?us-ascii?Q?UA12iKbYib5f9/ey8+pMXDp4a16YQwZPdXM6LORF4vVMF7G8Dn8Q6vVrw6XA?= =?us-ascii?Q?ZZ0VSPrRhTc78OMbL3+KNpYqB6PIFrtpa/6klEy0P8XDLXHbtg4rIwg8zlIi?= =?us-ascii?Q?VFWYUxffLYTJJqqz4AYEDX8JPtFAKEqJW/GUXQfI8v7o3vnaqaPAA7AYXaHs?= =?us-ascii?Q?CxqGj0jV8JGOUSpEronZBVjOyXBTcJpxmEwCnXpru6KYjSUEcTzgyoCrcR3k?= =?us-ascii?Q?zvO6f7CKu9xrT83kS0OxjYa45thO0tYZQ7NghRK7gdurOFcpMjLPmGergwX/?= =?us-ascii?Q?p0LV6zucxhWSNo7yMaXXAVppgpI9BpA=3D?= arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iCvGuGBGUkozyz8O9wmUx+JgQJ0Qb9LljSFs4aMJd6HAZR2slHHBsmZQ1LhmqC5BG+jxrHpN34ttnJO+PK3857aTvK909DyC0Xe8enGjNFUmZYRNjysH0rtv/B0bDfC8Epb+A/eWpRP8sKyFtoiQDiHo/MKHwv3+QP/vtdIpmGKVJ6aJ/SrV7VjJK9dLGa8qIh8hy/LaVJJ90jjvlIFCQobu+7umyF+XGZha7dDchHT3xrR/fcgfq+rOkvTl0+vCczuLhy7Ix09uagx0Cgey+eQDugir3IL+0Sfu+wi4WWqscOiD6d43d8CLQYLGXDclbcFZjk3ynJ7l8Cb+heA5ow== 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=mliE9FwRm+97ZBRCP2TDNX5J55+Q33fe2GFySqH//5w=; b=JRoti/oFdhDMG5dmPdIVIqrnNZ6+NDSgaO4Q2HSJ7F2vi6SRZKYJgG1MwyJd8B67+Ts/ev1aGoSi6F090tieibfMqBhZ4yy3k+sTunJFbHE+48xdBtqSCLwq2Mp1fR/C3KJdxo5NAvFcV2FPWQdYARAmvUzv0jdb3V07wkOAd4pNahLGZ1jqdLusI3gsm7ZO6crylieNPZAyo0R8RD30BErLkn0l3pdlbLm5hmn9AStgHU6Ns3j2idtp0yvNCX1Y0ETnvlSWcE/cScOgyo7M4VEaij0jYsaLlE0imLeHMMCuXlklZJZFbn9z2mZAVxmhAPmQniuqPRlR6HGrrsZwrw== 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 x-ms-exchange-crosstenant-authas: Internal x-ms-exchange-crosstenant-authsource: DS7PR11MB6015.namprd11.prod.outlook.com x-ms-exchange-crosstenant-network-message-id: 05314073-3212-4818-9521-08da34c6e1dd x-ms-exchange-crosstenant-originalarrivaltime: 13 May 2022 09:56:42.3754 (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: Pzmqg0ltg3C6o35NbVlBa7UzdtHZiMTuut6OFr5x3HB7Qo/mnj14O4PfN+hyPctTG64+2Vz5MMxSHvt9pl1Kmqxd95xoyd0iF/IIs0QG7q0= x-ms-exchange-transport-crosstenantheadersstamped: DM5PR11MB1467 x-originatororg: intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 > -----Original Message----- > From: peng1x.zhang@intel.com > Sent: Wednesday, May 11, 2022 4:50 PM > To: Yang, Qiming ; Zhang, Qi Z > ; dev@dpdk.org > Cc: Zhang, Peng1X ; stable@dpdk.org > Subject: [PATCH v2] net/ice: fix DCF state checking mechanism > > From: Peng Zhang > > DCF state previous checking mechanism can not fully detect DCF state > whether is on or not,so PMD will report uncorrect error code in some case= s > and mislead user.Fix DCF state checking mechanism which will mention user > resource temporarily unavailable when DCF state is not on. > > Fixes: 285f63fc6bb7 ("net/ice: track DCF state of PF") > Cc: stable@dpdk.org > > Signed-off-by: Peng Zhang > --- > drivers/net/ice/ice_dcf_parent.c | 3 --- > drivers/net/ice/ice_switch_filter.c | 20 ++++++-------------- > 2 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/ice/ice_dcf_parent.c > b/drivers/net/ice/ice_dcf_parent.c > index 2f96dedcce..5b02e0197f 100644 > --- a/drivers/net/ice/ice_dcf_parent.c > +++ b/drivers/net/ice/ice_dcf_parent.c > @@ -121,7 +121,6 @@ ice_dcf_vsi_update_service_handler(void *param) > struct ice_dcf_hw *hw =3D reset_param->dcf_hw; > struct ice_dcf_adapter *adapter =3D > container_of(hw, struct ice_dcf_adapter, real_hw); > - struct ice_adapter *parent_adapter =3D &adapter->parent; > > pthread_detach(pthread_self()); > > @@ -130,8 +129,6 @@ ice_dcf_vsi_update_service_handler(void *param) > rte_spinlock_lock(&vsi_update_lock); > > if (!ice_dcf_handle_vsi_update_event(hw)) { > - __atomic_store_n(&parent_adapter->dcf_state_on, true, > - __ATOMIC_RELAXED); > ice_dcf_update_vf_vsi_map(&adapter->parent.hw, > hw->num_vfs, hw->vf_vsi_map); > } > diff --git a/drivers/net/ice/ice_switch_filter.c > b/drivers/net/ice/ice_switch_filter.c > index 36c9bffb73..3d36c63e97 100644 > --- a/drivers/net/ice/ice_switch_filter.c > +++ b/drivers/net/ice/ice_switch_filter.c > @@ -403,13 +403,6 @@ ice_switch_create(struct ice_adapter *ad, > goto error; > } > > - if (ice_dcf_adminq_need_retry(ad)) { > - rte_flow_error_set(error, EAGAIN, > - RTE_FLOW_ERROR_TYPE_ITEM, NULL, > - "DCF is not on"); > - goto error; > - } > - > ret =3D ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_adde= d); > if (!ret) { > filter_conf_ptr =3D rte_zmalloc("ice_switch_filter", @@ -43= 2,6 > +425,9 @@ ice_switch_create(struct ice_adapter *ad, > filter_conf_ptr->fltr_status =3D ICE_SW_FLTR_ADDED; > > flow->rule =3D filter_conf_ptr; > + > + if (ad->hw.dcf_enabled) > + __atomic_store_n(&ad->dcf_state_on, true, > __ATOMIC_RELAXED); > } else { > if (ice_dcf_adminq_need_retry(ad)) > ret =3D -EAGAIN; > @@ -490,13 +486,6 @@ ice_switch_destroy(struct ice_adapter *ad, > return -rte_errno; > } > > - if (ice_dcf_adminq_need_retry(ad)) { > - rte_flow_error_set(error, EAGAIN, > - RTE_FLOW_ERROR_TYPE_ITEM, NULL, > - "DCF is not on"); > - return -rte_errno; > - } > - > ret =3D ice_rem_adv_rule_by_id(hw, &filter_conf_ptr- > >sw_query_data); > if (ret) { > if (ice_dcf_adminq_need_retry(ad)) > @@ -508,6 +497,9 @@ ice_switch_destroy(struct ice_adapter *ad, > RTE_FLOW_ERROR_TYPE_HANDLE, NULL, > "fail to destroy switch filter rule"); > return -rte_errno; > + } else { > + if (ad->hw.dcf_enabled) > + __atomic_store_n(&ad->dcf_state_on, true, > __ATOMIC_RELAXED); > } > > ice_switch_filter_rule_free(flow); > -- > 2.25.1 Tested-by: Padraig Connolly