From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Iremonger, Bernard" Subject: Re: [PATCH v3 1/5] net/i40e: add pipeline personalization profile processing Date: Thu, 23 Mar 2017 14:50:27 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C224D3850F@IRSMSX108.ger.corp.intel.com> References: <1488526784-16621-1-git-send-email-beilei.xing@intel.com> <1490263352-61174-1-git-send-email-beilei.xing@intel.com> <1490263352-61174-2-git-send-email-beilei.xing@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: "Zhang, Helin" , "dev@dpdk.org" To: "Xing, Beilei" , "Wu, Jingjing" Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7682E5598 for ; Thu, 23 Mar 2017 15:52:00 +0100 (CET) In-Reply-To: <1490263352-61174-2-git-send-email-beilei.xing@intel.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Beilei, > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Beilei Xing > Sent: Thursday, March 23, 2017 10:02 AM > To: Wu, Jingjing > Cc: Zhang, Helin ; dev@dpdk.org > Subject: [dpdk-dev] [PATCH v3 1/5] net/i40e: add pipeline personalization > profile processing >=20 > Add support for adding or removing a pipeline personalization profile > package. >=20 > Signed-off-by: Beilei Xing > --- > app/test-pmd/cmdline.c | 1 + > drivers/net/i40e/i40e_ethdev.c | 200 > ++++++++++++++++++++++++++++++ > drivers/net/i40e/i40e_ethdev.h | 5 + > drivers/net/i40e/rte_pmd_i40e.h | 21 ++++ > drivers/net/i40e/rte_pmd_i40e_version.map | 6 + > 5 files changed, 233 insertions(+) >=20 > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > 47f935d..6e0625d 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethde= v.c > index 3702214..7aff9a3 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -11259,3 +11259,203 @@ rte_pmd_i40e_reset_vf_stats(uint8_t port, >=20 > return 0; > } > + > +static void > +i40e_generate_profile_info_sec(char *name, struct i40e_ppp_version > *version, > + uint32_t track_id, uint8_t *profile_info_sec, > + bool add) > +{ > + struct i40e_profile_section_header *sec =3D NULL; > + struct i40e_profile_info *pinfo; > + > + sec =3D (struct i40e_profile_section_header *)profile_info_sec; > + sec->tbl_size =3D 1; > + sec->data_end =3D sizeof(struct i40e_profile_section_header) + > + sizeof(struct i40e_profile_info); > + sec->section.type =3D SECTION_TYPE_INFO; > + sec->section.offset =3D sizeof(struct i40e_profile_section_header); > + sec->section.size =3D sizeof(struct i40e_profile_info); > + pinfo =3D (struct i40e_profile_info *)(profile_info_sec + > + sec->section.offset); > + pinfo->track_id =3D track_id; > + memcpy(pinfo->name, name, I40E_PPP_NAME_SIZE); > + memcpy(&pinfo->version, version, sizeof(struct i40e_ppp_version)); > + if (add) > + pinfo->op =3D I40E_PPP_ADD_TRACKID; > + else > + pinfo->op =3D I40E_PPP_REMOVE_TRACKID; > +} > + > +static enum i40e_status_code > +i40e_add_rm_profile_info(struct i40e_hw *hw, uint8_t *profile_info_sec) > +{ > + enum i40e_status_code status =3D I40E_SUCCESS; > + struct i40e_profile_section_header *sec; > + uint32_t track_id; > + uint32_t offset =3D 0, info =3D 0; > + > + sec =3D (struct i40e_profile_section_header *)profile_info_sec; > + track_id =3D ((struct i40e_profile_info *)(profile_info_sec + > + sec->section.offset))->track_id; > + > + status =3D i40e_aq_write_ppp(hw, (void *)sec, sec->data_end, > + track_id, &offset, &info, NULL); > + if (status) > + PMD_DRV_LOG(ERR, "Failed to add/remove profile info: " > + "offset %d, info %d", > + offset, info); > + > + return status; > +} > + > +#define I40E_PROFILE_INFO_SIZE 48 > +#define I40E_MAX_PROFILE_NUM 16 > + > +/* Check if the profile info exists */ > +static int > +i40e_check_profile_info(uint8_t port, uint8_t *profile_info_sec) { > + struct rte_eth_dev *dev =3D &rte_eth_devices[port]; > + struct i40e_hw *hw =3D I40E_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > + uint8_t *buff; > + struct i40e_profile_list *p_list; > + struct i40e_profile_info *pinfo, *p; > + int ret; > + > + buff =3D rte_zmalloc("i40e_pinfo_list", > + (I40E_PROFILE_INFO_SIZE * > I40E_MAX_PROFILE_NUM + 4), > + 0); > + if (!buff) { > + PMD_DRV_LOG(ERR, "failed to allocate memory"); > + return -1; > + } > + > + ret =3D i40e_aq_get_ppp_list(hw, (void *)buff, > + (I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + > 4), > + 0, NULL); > + if (ret) { > + PMD_DRV_LOG(ERR, "Failed to get profile info list."); > + rte_free(buff); > + return -1; > + } > + p_list =3D (struct i40e_profile_list *)buff; > + pinfo =3D (struct i40e_profile_info *)(profile_info_sec + > + sizeof(struct i40e_profile_section_header)); > + for (uint32_t i =3D 0; i < p_list->p_count; i++) { There is a compile error in the "for" statement. dpdk/drivers/net/i40e/i40e_ethdev.c:11561:2: error: 'for' loop initial decl= arations are only allowed in C99 mode for (uint32_t i =3D 0; i < p_list->p_count; i++) { This is occurring with the following compiler: gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04.3) > + p =3D &p_list->p_info[i]; > + if ((pinfo->track_id =3D=3D p->track_id) && > + !memcmp(&pinfo->version, &p->version, > + sizeof(struct i40e_ppp_version)) && > + !memcmp(&pinfo->name, &p->name, > + I40E_PPP_NAME_SIZE)) { > + PMD_DRV_LOG(INFO, "Profile exists."); > + rte_free(buff); > + return 1; > + } > + } > + > + rte_free(buff); > + return 0; > +} > + > +int > +rte_pmd_i40e_process_ppp_package(uint8_t port, uint8_t *buff, > + uint32_t size, bool add) > +{ > + struct rte_eth_dev *dev; > + struct i40e_hw *hw; > + struct i40e_package_header *pkg_hdr; > + struct i40e_generic_seg_header *profile_seg_hdr; > + struct i40e_generic_seg_header *metadata_seg_hdr; > + uint32_t track_id; > + uint8_t *profile_info_sec; > + int is_exist; > + enum i40e_status_code status =3D I40E_SUCCESS; > + > + RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); > + > + dev =3D &rte_eth_devices[port]; > + > + if (!is_device_supported(dev, &rte_i40e_pmd)) > + return -ENOTSUP; > + > + hw =3D I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + > + if (size < (sizeof(struct i40e_package_header) + > + sizeof(struct i40e_metadata_segment) + > + sizeof(uint32_t) * 2)) { > + PMD_DRV_LOG(ERR, "Buff is invalid."); > + return -EINVAL; > + } > + > + pkg_hdr =3D (struct i40e_package_header *)buff; > + > + if (!pkg_hdr) { > + PMD_DRV_LOG(ERR, "Failed to fill the package structure"); > + return -EINVAL; > + } > + > + if (pkg_hdr->segment_count < 2) { > + PMD_DRV_LOG(ERR, "Segment_count should be 2 at > least."); > + return -EINVAL; > + } > + > + /* Find metadata segment */ > + metadata_seg_hdr =3D > i40e_find_segment_in_package(SEGMENT_TYPE_METADATA, > + pkg_hdr); > + if (!metadata_seg_hdr) { > + PMD_DRV_LOG(ERR, "Failed to find metadata segment > header"); > + return -EINVAL; > + } > + track_id =3D ((struct i40e_metadata_segment > +*)metadata_seg_hdr)->track_id; > + > + /* Find profile segment */ > + profile_seg_hdr =3D > i40e_find_segment_in_package(SEGMENT_TYPE_I40E, > + pkg_hdr); > + if (!profile_seg_hdr) { > + PMD_DRV_LOG(ERR, "Failed to find profile segment > header"); > + return -EINVAL; > + } > + > + profile_info_sec =3D rte_zmalloc("i40e_profile_info", > + sizeof(struct i40e_profile_section_header) + > + sizeof(struct i40e_profile_info), > + 0); > + if (!profile_info_sec) { > + PMD_DRV_LOG(ERR, "Failed to allocate memory"); > + return -EINVAL; > + } > + > + if (add) { > + i40e_generate_profile_info_sec( > + ((struct i40e_profile_segment *)profile_seg_hdr)->name, > + &((struct i40e_profile_segment *)profile_seg_hdr)- > >version, > + track_id, profile_info_sec, 1); > + is_exist =3D i40e_check_profile_info(port, profile_info_sec); > + if (is_exist) { > + PMD_DRV_LOG(ERR, "Profile already exists."); > + rte_free(profile_info_sec); > + return 1; > + } > + > + /* Write profile to HW */ > + status =3D i40e_write_profile(hw, > + (struct i40e_profile_segment > *)profile_seg_hdr, > + track_id); > + if (status) > + PMD_DRV_LOG(ERR, "Failed to write profile."); > + } else { > + i40e_generate_profile_info_sec( > + ((struct i40e_profile_segment *)profile_seg_hdr)->name, > + &((struct i40e_profile_segment *)profile_seg_hdr)- > >version, > + track_id, profile_info_sec, 0); > + } > + > + status =3D i40e_add_rm_profile_info(hw, profile_info_sec); > + if (status) > + PMD_DRV_LOG(ERR, "Failed to %s profile info.", > + add ? "add" : "remove"); > + > + rte_free(profile_info_sec); > + return status; > +} > diff --git a/drivers/net/i40e/i40e_ethdev.h > b/drivers/net/i40e/i40e_ethdev.h index aebb097..f0be7a3 100644 > --- a/drivers/net/i40e/i40e_ethdev.h > +++ b/drivers/net/i40e/i40e_ethdev.h > @@ -730,6 +730,11 @@ struct i40e_valid_pattern { > parse_filter_t parse_filter; > }; >=20 > +struct i40e_profile_list { > + uint32_t p_count; > + struct i40e_profile_info p_info[1]; > +}; > + > int i40e_dev_switch_queues(struct i40e_pf *pf, bool on); int > i40e_vsi_release(struct i40e_vsi *vsi); struct i40e_vsi *i40e_vsi_setup(= struct > i40e_pf *pf, diff --git a/drivers/net/i40e/rte_pmd_i40e.h > b/drivers/net/i40e/rte_pmd_i40e.h index a0ad88c..7861a56 100644 > --- a/drivers/net/i40e/rte_pmd_i40e.h > +++ b/drivers/net/i40e/rte_pmd_i40e.h > @@ -332,4 +332,25 @@ int rte_pmd_i40e_get_vf_stats(uint8_t port, int > rte_pmd_i40e_reset_vf_stats(uint8_t port, > uint16_t vf_id); >=20 > +/** > + * Load/Unload a ppp package > + * > + * @param port > + * The port identifier of the Ethernet device. > + * @param buff > + * buffer of package. > + * @param size > + * size of buffer. > + * @param add > + * - (1) load profile. > + * - (0) remove profile. > + * @return > + * - (0) if successful. > + * - (-ENODEV) if *port* invalid. > + * - (-EINVAL) if bad parameter. > + * - (1) if profile exists. > + */ > +int rte_pmd_i40e_process_ppp_package(uint8_t port, uint8_t *buff, > + uint32_t size, bool add); > + > #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 7a5d211..01c4a90 100644 > --- a/drivers/net/i40e/rte_pmd_i40e_version.map > +++ b/drivers/net/i40e/rte_pmd_i40e_version.map > @@ -22,3 +22,9 @@ DPDK_17.02 { > rte_pmd_i40e_set_vf_vlan_tag; >=20 > } DPDK_2.0; > + > +DPDK_17.05 { > + global: > + > + rte_pmd_i40e_process_ppp_package; > +}; > -- > 2.5.5 Regards, Bernard.