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 D7D8DA0540; Thu, 16 Jul 2020 06:57:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7118D1BE95; Thu, 16 Jul 2020 06:57:56 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 3DFFC4F9A; Thu, 16 Jul 2020 06:57:55 +0200 (CEST) IronPort-SDR: KLxjU2S4dLdIXksE06iWNla7cDyy3QJw5T4hH37y9Zqky4KJM4mt0vuVlsRBmaW+YOUPffzVkg IgOOQ9pzJbKA== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="214057245" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="214057245" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 21:57:54 -0700 IronPort-SDR: YT1krCRy5mYUgtcoGp/mFhjg15PHS4AK5JZNL3dzJKl8EyIdoELMuSGaIhWXFWLmQARjZALizw jenTfmm2RBOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="360927193" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga001.jf.intel.com with ESMTP; 15 Jul 2020 21:57:53 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 15 Jul 2020 21:57:53 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 15 Jul 2020 21:57:53 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.50) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 15 Jul 2020 21:57:53 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOn3KFS19oQ0VaFh0oc9zpi3/imMc5UmXpZzf65yDUlAcu5fpg7R0nZCaltYGEoxQDco00/VEoZG/Rs/YgxKMqMlKg/4GAseKRVLY5qMbDKY2YC0Cj0spBNSPSDD4EONIV5HarQSP6+cwtOxIIzun4eI0O9hmQohBfjxWjIHYgkDweHDBdxUOy7V+BVOqQgC8o1BYt8M/DtjslOUBo2hQzmnusX54an8T80c6aFydNV6t9n5QHlQzmCIL7cfQRXQMvALQXqGaJdel0ymZ95nULuSk8wlTVoOHeI9YtukKkzjVz1F9DkavrKIlF38Favd3LrIAqwdMGlNLdmZ3CmOdg== 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=HdRkYVbRKjJPTTukmjFXNhahuT6fkiacIMhpdUuh880=; b=RNJSkr3QVUIvugY1Zbt51otGO1P5+Yn6R9GfICW2xmaALTSxKsYJjWkMjE2j+kiyYfLJEJlBsoNI/DAlJiZaz1EXwvAMDyUmfuRjbPdDjXcK96WxCnzySa8J+kOvTBYR+ZuVhyTDA6VNcCCgtcYl3Uc2W0AAfOnsb1t9nyH86kntNsNwDcJYNF4uxdLx2SCNKBiNxRM/1nNBNjTigo4YCSQg4JUMq1FwbUwqSd6CtceIYXte1bdUQk9ItRLSYduqHWiokx46fJXpxPQN6D7OHkVnObSQ666a80FoO6ZwGL4jBfM9Hjsr58t/LIWmF25QqQwPsUdEljlJEOIbipN2Fw== 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=HdRkYVbRKjJPTTukmjFXNhahuT6fkiacIMhpdUuh880=; b=mOt19loIofH4zEMekj2FwkvEQFvVkZjaJRazwV6KOT+cXbf4vt5Mb6Na8qVowaBtqFdVfSVe5DxZtiCU+GlX6bwe7rINcQW7ONVZypNxdoRxKtbsJIUsX7pa6fdis8dHV147HFHmPoWBTdEG0Ccxu+TjNLuarEqTQFm1F+3j3LY= Received: from BN6PR11MB0017.namprd11.prod.outlook.com (2603:10b6:405:6c::34) by BN6PR11MB1570.namprd11.prod.outlook.com (2603:10b6:405:a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Thu, 16 Jul 2020 04:57:51 +0000 Received: from BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120]) by BN6PR11MB0017.namprd11.prod.outlook.com ([fe80::c8eb:f4c9:5b58:3120%6]) with mapi id 15.20.3195.017; Thu, 16 Jul 2020 04:57:51 +0000 From: "Yang, Qiming" To: "Zhang, AlvinX" , "Guo, Jia" CC: "Xing, Beilei" , "dev@dpdk.org" , "Zhang, AlvinX" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v5] net/i40e: fix modify the number of qps in VF Thread-Index: AQHWWyloKAgy9LVuPkCJtIL2QepC8akJo4dg Date: Thu, 16 Jul 2020 04:57:51 +0000 Message-ID: References: <20200716015211.11676-1-alvinx.zhang@intel.com> <20200716042407.14328-1-alvinx.zhang@intel.com> In-Reply-To: <20200716042407.14328-1-alvinx.zhang@intel.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9a4c07f2-4ca7-4fc2-0bca-08d82944cb14 x-ms-traffictypediagnostic: BN6PR11MB1570: 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:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: y+4PqAlefCLPHidRc9zBnSJ8D7KAGOrAxoixcqvmk/LpXc+P2Frj58t1ccAxSgwn3h1NH6UWZ1GG66k1iWHJuYpGCdC17m4ubLo2y5QfEMGJfG2N2tPBTM84f0SQ/EURjH7/KAHZMhBfHYmHdlxq97ihgbMtgDDK++VpsLH5UkP8RmvmZ5QNSiZDZak0bnHeizoZcZt8w4cZLE6L9GFRwLS6jex8tXt2G2M8avQYB8xtExm0dLZX5lar5wuLSRi3Ha3yZrIeo7GJXa27JY0qm3szVlTEL2d8yW6c49NGse3kWorASNCMOhDdDuwoULhCFdG1Job+3LUiuFQMGC2GKg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR11MB0017.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(136003)(366004)(346002)(376002)(39860400002)(66556008)(5660300002)(66446008)(66946007)(54906003)(478600001)(8936002)(83380400001)(26005)(55016002)(9686003)(76116006)(450100002)(86362001)(52536014)(8676002)(71200400001)(33656002)(4326008)(64756008)(186003)(66476007)(7696005)(110136005)(6636002)(2906002)(6506007)(316002)(53546011); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: Un6IpPQY+ne+WeGbiWlL8lwr1m1fxHJGAhltqlr742B+n59k9OCbNyY2bPk8w4E7y9WV9O0gJ9xp5ZSHj6HMpFJQyTm5Es9kP2YhdjlTRRXdO/ii2i/xQipBQX5HDSkMBl/ZNAfp5gOeb6QU3T0EAKz/apmE2oHQULO6d71t1vIm1tw6jxDOloug6W9O8VOstgQhMHsfeJYF6jnC+msH+BLun27Pg0Kp5Aefy/gVFze0Um0hF9nViQAQqLS3ysgQhOUb+aKxfe5K/GAm8plTtAbGG3KKV0PiCs9fjZIEYaCc2WDUGfLk/W9HRlQyZioKlpnpdli4lfO0W8rj2YjuHJna+PiUqoRh3gPxoOIbKQ+lSYgEAYmuuP8j/xVhetUBnhlYBJuYYLeeZQ3NLeVudAImNZjdhAd83+/r4Hd+9VzJFOCQSTDUStiO/uL3kZjjQirbB/tvSZ/sAy7EyHs65B8fA2wbDtbZ9olvoDg/AlXDB9Fob8rTbR+d0fK9Tr3P Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB0017.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a4c07f2-4ca7-4fc2-0bca-08d82944cb14 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jul 2020 04:57:51.3109 (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: KfS6OZBd+VLOT6PLPWiEUK6WujwaRUrLBZ19nvHIVbosx0PQRKWK7RE6k6ArzLmZpo/FBQsAs7h/Y7udnXK9lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1570 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v5] net/i40e: fix modify the number of qps in VF 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" Archived-At: List-Archive: > -----Original Message----- > From: dev On Behalf Of alvinx.zhang@intel.com > Sent: Thursday, July 16, 2020 12:24 > To: Guo, Jia > Cc: Xing, Beilei ; dev@dpdk.org; Zhang, AlvinX > ; stable@dpdk.org > Subject: [dpdk-dev] [PATCH v5] net/i40e: fix modify the number of qps in = VF Fix and modify are all verbs, I think you want to fix the queue pair modify= process. > From: Alvin Zhang >=20 > If a VF request PF to allocate more number of queue pairs, the PF will fr= ee > the queue pairs which have been allocated and reset the VF. So, VF should > stop to work until all the process is done. This patch modify the process= of > the request queue pairs. To improve efficiency and eliminate code > redundancy, the promiscuous ops were also updated. >=20 > Fixes: c48eb308ed13 ("net/i40e: support VF request more queues") > Cc: stable@dpdk.org >=20 > Signed-off-by: Alvin Zhang > --- >=20 > V2: Update git log and modify codes according to comments. > V3: All the code was refactored. > V4, V5: Modify codes according to comments. > --- > drivers/net/i40e/i40e_ethdev_vf.c | 104 ++++++++++++++++++++----------- > ------- > 1 file changed, 54 insertions(+), 50 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_ethdev_vf.c > b/drivers/net/i40e/i40e_ethdev_vf.c > index eca716a..69cab8e 100644 > --- a/drivers/net/i40e/i40e_ethdev_vf.c > +++ b/drivers/net/i40e/i40e_ethdev_vf.c > @@ -91,7 +91,8 @@ static int i40evf_vlan_filter_set(struct rte_eth_dev > *dev, > uint16_t vlan_id, int on); > static int i40evf_vlan_offload_set(struct rte_eth_dev *dev, int mask); = static > void i40evf_dev_close(struct rte_eth_dev *dev); -static int > i40evf_dev_reset(struct rte_eth_dev *dev); > +static int i40evf_dev_reset(struct rte_eth_dev *dev); static int > +i40evf_check_vf_reset_done(struct rte_eth_dev *dev); > static int i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev); stat= ic > int i40evf_dev_promiscuous_disable(struct rte_eth_dev *dev); static int > i40evf_dev_allmulticast_enable(struct rte_eth_dev *dev); @@ -519,10 > +520,19 @@ struct rte_i40evf_xstats_name_off { >=20 > err =3D i40evf_execute_vf_cmd(dev, &args); >=20 > - if (err) > + if (err) { > PMD_DRV_LOG(ERR, "fail to execute command " > "CONFIG_PROMISCUOUS_MODE"); > - return err; > + > + if (err =3D=3D I40E_NOT_SUPPORTED) > + return -ENOTSUP; > + > + return -EAGAIN; > + } > + > + vf->promisc_unicast_enabled =3D enable_unicast; > + vf->promisc_multicast_enabled =3D enable_multicast; > + return 0; > } >=20 > static int > @@ -1081,12 +1091,28 @@ static int i40evf_dev_xstats_get(struct > rte_eth_dev *dev, > args.out_size =3D I40E_AQ_BUF_SZ; >=20 > rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); > + > err =3D i40evf_execute_vf_cmd(dev, &args); > - if (err) > + > + rte_eal_alarm_set(I40EVF_ALARM_INTERVAL, > i40evf_dev_alarm_handler, > +dev); > + > + if (err !=3D I40E_SUCCESS) { > PMD_DRV_LOG(ERR, "fail to execute command > OP_REQUEST_QUEUES"); > + return err; > + } > + > + /* The PF will issue a reset to the VF when change the number of > + * queues. The PF will set I40E_VFGEN_RSTAT to COMPLETE first, > then > + * wait 10ms and set it to ACTIVE. In this duration, vf may not catch > + * the moment that COMPLETE is set. So, for vf, we'll try to wait a > + * long time. > + */ > + rte_delay_ms(100); > + > + err =3D i40evf_check_vf_reset_done(dev); > + if (err) > + PMD_DRV_LOG(ERR, "VF is still resetting"); >=20 > - rte_eal_alarm_set(I40EVF_ALARM_INTERVAL, > - i40evf_dev_alarm_handler, dev); > return err; > } >=20 > @@ -1514,7 +1540,7 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev > *dev, > hw->bus.device =3D pci_dev->addr.devid; > hw->bus.func =3D pci_dev->addr.function; > hw->hw_addr =3D (void *)pci_dev->mem_resource[0].addr; > - hw->adapter_stopped =3D 0; > + hw->adapter_stopped =3D 1; > hw->adapter_closed =3D 0; >=20 > /* Pass the information to the rte_eth_dev_close() that it should > also @@ -1610,7 +1636,20 @@ static int eth_i40evf_pci_remove(struct > rte_pci_device *pci_dev) > ad->tx_vec_allowed =3D true; >=20 > if (num_queue_pairs > vf->vsi_res->num_queue_pairs) { > - int ret =3D 0; > + struct i40e_hw *hw; > + int ret; > + > + if (rte_eal_process_type() !=3D RTE_PROC_PRIMARY) { > + PMD_DRV_LOG(ERR, > + "For secondary processes, change queue > pairs is not supported!"); > + return -ENOTSUP; > + } > + > + hw =3D I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + if (!hw->adapter_stopped) { > + PMD_DRV_LOG(ERR, "Device must be stopped > first!"); > + return -EBUSY; > + } >=20 > PMD_DRV_LOG(INFO, "change queue pairs from %u to %u", > vf->vsi_res->num_queue_pairs, > num_queue_pairs); @@ -2182,68 +2221,32 @@ static int > eth_i40evf_pci_remove(struct rte_pci_device *pci_dev) > i40evf_dev_promiscuous_enable(struct rte_eth_dev *dev) { > struct i40e_vf *vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data- > >dev_private); > - int ret; > - > - ret =3D i40evf_config_promisc(dev, 1, vf->promisc_multicast_enabled); > - if (ret =3D=3D 0) > - vf->promisc_unicast_enabled =3D TRUE; > - else if (ret =3D=3D I40E_NOT_SUPPORTED) > - ret =3D -ENOTSUP; > - else > - ret =3D -EAGAIN; >=20 > - return ret; > + return i40evf_config_promisc(dev, true, > +vf->promisc_multicast_enabled); > } >=20 > static int > i40evf_dev_promiscuous_disable(struct rte_eth_dev *dev) { > struct i40e_vf *vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data- > >dev_private); > - int ret; > - > - ret =3D i40evf_config_promisc(dev, 0, vf->promisc_multicast_enabled); > - if (ret =3D=3D 0) > - vf->promisc_unicast_enabled =3D FALSE; > - else if (ret =3D=3D I40E_NOT_SUPPORTED) > - ret =3D -ENOTSUP; > - else > - ret =3D -EAGAIN; >=20 > - return ret; > + return i40evf_config_promisc(dev, false, > +vf->promisc_multicast_enabled); > } >=20 > static int > i40evf_dev_allmulticast_enable(struct rte_eth_dev *dev) { > struct i40e_vf *vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data- > >dev_private); > - int ret; > - > - ret =3D i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 1); > - if (ret =3D=3D 0) > - vf->promisc_multicast_enabled =3D TRUE; > - else if (ret =3D=3D I40E_NOT_SUPPORTED) > - ret =3D -ENOTSUP; > - else > - ret =3D -EAGAIN; >=20 > - return ret; > + return i40evf_config_promisc(dev, vf->promisc_unicast_enabled, > true); > } >=20 > static int > i40evf_dev_allmulticast_disable(struct rte_eth_dev *dev) { > struct i40e_vf *vf =3D I40EVF_DEV_PRIVATE_TO_VF(dev->data- > >dev_private); > - int ret; > - > - ret =3D i40evf_config_promisc(dev, vf->promisc_unicast_enabled, 0); > - if (ret =3D=3D 0) > - vf->promisc_multicast_enabled =3D FALSE; > - else if (ret =3D=3D I40E_NOT_SUPPORTED) > - ret =3D -ENOTSUP; > - else > - ret =3D -EAGAIN; >=20 > - return ret; > + return i40evf_config_promisc(dev, vf->promisc_unicast_enabled, > false); > } >=20 > static int > @@ -2365,8 +2368,9 @@ static int eth_i40evf_pci_remove(struct > rte_pci_device *pci_dev) > * it is a workaround solution when work with kernel driver > * and it is not the normal way > */ > - i40evf_dev_promiscuous_disable(dev); > - i40evf_dev_allmulticast_disable(dev); > + if (vf->promisc_unicast_enabled || vf->promisc_multicast_enabled) > + i40evf_config_promisc(dev, false, false); > + > rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev); >=20 > i40evf_reset_vf(dev); > -- > 1.8.3.1