From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 67696FAFC for ; Tue, 20 Dec 2016 09:16:37 +0100 (CET) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP; 20 Dec 2016 00:16:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,377,1477983600"; d="scan'208";a="41763102" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga004.jf.intel.com with ESMTP; 20 Dec 2016 00:16:35 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 20 Dec 2016 00:16:35 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.54]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.9]) with mapi id 14.03.0248.002; Tue, 20 Dec 2016 16:16:33 +0800 From: "Lu, Wenzhuo" To: "Yigit, Ferruh" , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v2 05/32] net/i40e: set TX loopback from PF Thread-Index: AQHSUDqPPUlpDrXEEU6gx6y4V8wDd6D77meAgBSeQGA= Date: Tue, 20 Dec 2016 08:16:33 +0000 Message-ID: <6A0DE07E22DDAD4C9103DF62FEBC09093B543C75@shsmsx102.ccr.corp.intel.com> References: <1480637533-37425-1-git-send-email-wenzhuo.lu@intel.com> <1481081535-37448-1-git-send-email-wenzhuo.lu@intel.com> <1481081535-37448-6-git-send-email-wenzhuo.lu@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 05/32] net/i40e: set TX loopback from PF 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: , X-List-Received-Date: Tue, 20 Dec 2016 08:16:37 -0000 Hi Ferruh, > -----Original Message----- > From: Yigit, Ferruh > Sent: Wednesday, December 7, 2016 9:05 PM > To: Lu, Wenzhuo; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 05/32] net/i40e: set TX loopback from P= F >=20 > On 12/7/2016 3:31 AM, Wenzhuo Lu wrote: > > Support enabling/disabling TX loopback from PF. > > User can call the API on PF to enable/disable TX loopback for all the > > PF and VFs. > > > > Signed-off-by: Wenzhuo Lu > > --- > > drivers/net/i40e/i40e_ethdev.c | 219 > ++++++++++++++++++++++++++++++ > > drivers/net/i40e/rte_pmd_i40e.h | 16 +++ > > drivers/net/i40e/rte_pmd_i40e_version.map | 1 + > > 3 files changed, 236 insertions(+) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > b/drivers/net/i40e/i40e_ethdev.c index ec863b9..8bd0d70 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -9938,3 +9938,222 @@ static void i40e_set_default_mac_addr(struct > > rte_eth_dev *dev, > > > > return ret; > > } > > + >=20 > <...> >=20 > > + > > +static int > > +i40e_vsi_set_tx_loopback(struct i40e_vsi *vsi, uint8_t on) { > > + struct i40e_vsi_context ctxt; > > + struct i40e_hw *hw; > > + int ret; > > + > > + hw =3D I40E_VSI_TO_HW(vsi); > > + > > + /* Use the FW API if FW >=3D v5.0 */ > > + if (hw->aq.fw_maj_ver < 5) { > > + PMD_INIT_LOG(ERR, "FW < v5.0, cannot enable loopback"); > > + return -ENOTSUP; > > + } > > + > > + /* Check if it has been already on or off */ > > + if (vsi->info.valid_sections & > > + rte_cpu_to_le_16(I40E_AQ_VSI_PROP_SWITCH_VALID)) { > > + if (on) { > > + if ((vsi->info.switch_id & > > + I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB) =3D=3D > > + I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB) > > + return 0; /* already on */ > > + } else { > > + if ((vsi->info.switch_id & > > + I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB) =3D=3D 0) > > + return 0; /* already off */ > > + } > > + } > > + > > + /* remove all the MACs first */ > > + ret =3D i40e_vsi_rm_mac_filter(vsi); > > + if (ret) > > + return ret; > > + > > + vsi->info.valid_sections =3D > cpu_to_le16(I40E_AQ_VSI_PROP_SWITCH_VALID); > > + if (on) > > + vsi->info.switch_id |=3D I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB; > > + else > > + vsi->info.switch_id &=3D ~I40E_AQ_VSI_SW_ID_FLAG_ALLOW_LB; > > + >=20 > ----> >=20 > > + memset(&ctxt, 0, sizeof(ctxt)); > > + (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info)); > > + ctxt.seid =3D vsi->seid; > > + > > + ret =3D i40e_aq_update_vsi_params(hw, &ctxt, NULL); > > + if (ret !=3D I40E_SUCCESS) { > > + PMD_DRV_LOG(ERR, "Failed to update VSI params"); > > + return ret; > > + } >=20 > <---- >=20 > This part is now duplicated in a few functions, does it make sense to mak= e it > separate function, in the first patch it appeared 3/32 ? There's already a function 'i40e_aq_update_vsi_params'. The duplicate code = is for preparing the parameter for the functions. It looks bad to me if we = add a function for that. >=20 > > + > > + /* add all the MACs back */ > > + ret =3D i40e_vsi_restore_mac_filter(vsi); > > + if (ret) > > + return ret; > > + > > + return ret; > > +} > > + > > +int > > +rte_pmd_i40e_set_tx_loopback(uint8_t port, uint8_t on) { > > + struct rte_eth_dev *dev; > > + struct i40e_pf *pf; > > + struct i40e_pf_vf *vf; > > + struct i40e_vsi *vsi; > > + uint16_t vf_id; > > + int ret; > > + > > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); > > + > > + dev =3D &rte_eth_devices[port]; > > + > > + pf =3D I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); > > + > > + /* setup PF TX loopback */ > > + vsi =3D pf->main_vsi; > > + ret =3D i40e_vsi_set_tx_loopback(vsi, on); > > + if (ret) > > + return ret; > > + > > + /* setup TX loopback for all the VFs */ > > + if (!pf->vfs) { > > + PMD_DRV_LOG(ERR, "Invalid argument."); > > + return -EINVAL; > > + } > > + > > + for (vf_id =3D 0; vf_id < pf->vf_num; vf_id++) { > > + vf =3D &pf->vfs[vf_id]; > > + vsi =3D vf->vsi; > > + > > + ret =3D i40e_vsi_set_tx_loopback(vsi, on); > > + if (ret) > > + return ret; > > + } > > + > > + return ret; > > +} > > diff --git a/drivers/net/i40e/rte_pmd_i40e.h > > b/drivers/net/i40e/rte_pmd_i40e.h index c8736c8..3c65be4 100644 > > --- a/drivers/net/i40e/rte_pmd_i40e.h > > +++ b/drivers/net/i40e/rte_pmd_i40e.h > > @@ -114,4 +114,20 @@ int rte_pmd_i40e_set_vf_vlan_anti_spoof(uint8_t > port, > > uint16_t vf_id, > > uint8_t on); > > > > +/** > > + * Enable/Disable TX loopback on all the PF and VFs. > > + * > > + * @param port > > + * The port identifier of the Ethernet device. > > + * @param on > > + * 1 - Enable TX loopback. > > + * 0 - Disable TX loopback. > > + * @return > > + * - (0) if successful. > > + * - (-ENODEV) if *port* invalid. > > + * - (-EINVAL) if bad parameter. > > + */ > > +int rte_pmd_i40e_set_tx_loopback(uint8_t port, > > + uint8_t on); > > + > > #endif /* _PMD_I40E_H_ */ > > diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map > > b/drivers/net/i40e/rte_pmd_i40e_version.map > > index fff6cf9..3da04d3 100644 > > --- a/drivers/net/i40e/rte_pmd_i40e_version.map > > +++ b/drivers/net/i40e/rte_pmd_i40e_version.map > > @@ -9,4 +9,5 @@ DPDK_17.02 { > > rte_pmd_i40e_ping_vfs; > > rte_pmd_i40e_set_vf_mac_anti_spoof; > > rte_pmd_i40e_set_vf_vlan_anti_spoof; > > + rte_pmd_i40e_set_tx_loopback; >=20 > We can add these alphabetically. > This may not worth to create a new version of the patch itself, but can b= e fixed > if a new version already required.. Yes, will do it. >=20 > > } DPDK_2.0; > >