diff mbox

[dpdk-dev,v6,1/2] net/i40e: get information about protocols defined in ddp profile

Message ID 1506605599-31693-2-git-send-email-kirill.rybalchenko@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Rybalchenko, Kirill Sept. 28, 2017, 1:33 p.m. UTC 
  This patch adds new package info types to get list of protocols,
pctypes and ptypes defined in a profile

---
v3
info_size parameter always represents size of the info buffer in bytes

v6
fix bug with wrong usage of info_size parameter

Signed-off-by: Kirill Rybalchenko <kirill.rybalchenko@intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.c | 174 ++++++++++++++++++++++++++++++++++++++++
 drivers/net/i40e/rte_pmd_i40e.h |  25 ++++++
 2 files changed, 199 insertions(+)

Comments

Xing, Beilei Sept. 29, 2017, 7:30 a.m. UTC | #1 
Seems you didn't address my questions except the memory access error in your last version.

> -----Original Message-----
> From: Rybalchenko, Kirill
> Sent: Thursday, September 28, 2017 9:33 PM
> To: dev@dpdk.org
> Cc: Rybalchenko, Kirill <kirill.rybalchenko@intel.com>; Chilikin, Andrey
> <andrey.chilikin@intel.com>; Xing, Beilei <beilei.xing@intel.com>; Wu,
> Jingjing <jingjing.wu@intel.com>
> Subject: [PATCH v6 1/2] net/i40e: get information about protocols defined in
> ddp profile
> 
> This patch adds new package info types to get list of protocols, pctypes and
> ptypes defined in a profile
> 
> ---
> v3
> info_size parameter always represents size of the info buffer in bytes
> 
> v6
> fix bug with wrong usage of info_size parameter
> 
> Signed-off-by: Kirill Rybalchenko <kirill.rybalchenko@intel.com>
> ---
>  drivers/net/i40e/rte_pmd_i40e.c | 174
> ++++++++++++++++++++++++++++++++++++++++
>  drivers/net/i40e/rte_pmd_i40e.h |  25 ++++++
>  2 files changed, 199 insertions(+)
> 
> diff --git a/drivers/net/i40e/rte_pmd_i40e.c
> b/drivers/net/i40e/rte_pmd_i40e.c index c08e07a..f57e59b 100644
> --- a/drivers/net/i40e/rte_pmd_i40e.c
> +++ b/drivers/net/i40e/rte_pmd_i40e.c
> @@ -1706,6 +1706,26 @@ rte_pmd_i40e_process_ddp_package(uint8_t
> port, uint8_t *buff,
>  	return status;
>  }
> 
> +/* Get number of tvl records in the section */ static unsigned int
> +i40e_get_tlv_section_size(struct i40e_profile_section_header *sec) {
> +	unsigned int i, nb_rec, nb_tlv = 0;
> +	struct i40e_profile_tlv_section_record *tlv;
> +
> +	if (!sec)
> +		return nb_tlv;
> +
> +	/* get number of records in the section */
> +	nb_rec = sec->section.size / sizeof(struct
> i40e_profile_tlv_section_record);
> +	for (i = 0; i < nb_rec; ) {
> +		tlv = (struct i40e_profile_tlv_section_record *)&sec[1 + i];
> +		i += tlv->len;
> +		nb_tlv++;
> +	}
> +	return nb_tlv;
> +}
> +
>  int rte_pmd_i40e_get_ddp_info(uint8_t *pkg_buff, uint32_t pkg_size,
>  	uint8_t *info_buff, uint32_t info_size,
>  	enum rte_pmd_i40e_package_info type)
> @@ -1860,6 +1880,160 @@ int rte_pmd_i40e_get_ddp_info(uint8_t
> *pkg_buff, uint32_t pkg_size,
>  		return I40E_SUCCESS;
>  	}
> 
> +	/* get number of protocols */
> +	if (type == RTE_PMD_I40E_PKG_INFO_PROTOCOL_NUM) {
> +		struct i40e_profile_section_header *proto;
> +
> +		if (info_size < sizeof(uint32_t)) {
> +			PMD_DRV_LOG(ERR, "Invalid information buffer
> size");
> +			return -EINVAL;
> +		}
> +		proto = i40e_find_section_in_profile(SECTION_TYPE_PROTO,
> +						     (struct
> i40e_profile_segment *)
> +						     i40e_seg_hdr);
> +		*(uint32_t *)info_buff = i40e_get_tlv_section_size(proto);
> +		return I40E_SUCCESS;
> +	}
> +
> +	/* get list of protocols */
> +	if (type == RTE_PMD_I40E_PKG_INFO_PROTOCOL_LIST) {
> +		uint32_t i, j, nb_rec, nb_rec_buf;
> +		struct rte_pmd_i40e_proto_info *pinfo;
> +		struct i40e_profile_section_header *proto;
> +		struct i40e_profile_tlv_section_record *tlv;
> +
> +		proto = i40e_find_section_in_profile(SECTION_TYPE_PROTO,
> +						     (struct
> i40e_profile_segment *)
> +						     i40e_seg_hdr);
> +		nb_rec = i40e_get_tlv_section_size(proto);

If number of records is different with number of TLV, I think it's better to change nb_rec with nb_tlv, a little confused here.

> +		nb_rec_buf = info_size / sizeof(struct
> rte_pmd_i40e_proto_info);

How about changing nb_rec_buf with nb_proto_info?

> +		if (nb_rec_buf < nb_rec) {
> +			PMD_DRV_LOG(ERR, "Invalid information buffer
> size");
> +			return -EINVAL;
> +		}
> +		pinfo = (struct rte_pmd_i40e_proto_info *)info_buff;
> +		for (i = 0; i < nb_rec_buf; i++) {
> +			pinfo[i].proto_id = RTE_PMD_I40E_PROTO_UNUSED;
> +			memset(pinfo[i].name, 0,
> RTE_PMD_I40E_DDP_NAME_SIZE);
> +		}
> +		if (nb_rec == 0)
> +			return I40E_SUCCESS;


Why not check nb_rec just when getting the value?  

<...>

Same comments for RTE_PMD_I40E_PKG_INFO_PCTYPE_LIST and RTE_PMD_I40E_PKG_INFO_PTYPE_LIST.
diff mbox

Patch

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index c08e07a..f57e59b 100644
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -1706,6 +1706,26 @@  rte_pmd_i40e_process_ddp_package(uint8_t port, uint8_t *buff,
 	return status;
 }
 
+/* Get number of tvl records in the section */
+static unsigned int
+i40e_get_tlv_section_size(struct i40e_profile_section_header *sec)
+{
+	unsigned int i, nb_rec, nb_tlv = 0;
+	struct i40e_profile_tlv_section_record *tlv;
+
+	if (!sec)
+		return nb_tlv;
+
+	/* get number of records in the section */
+	nb_rec = sec->section.size / sizeof(struct i40e_profile_tlv_section_record);
+	for (i = 0; i < nb_rec; ) {
+		tlv = (struct i40e_profile_tlv_section_record *)&sec[1 + i];
+		i += tlv->len;
+		nb_tlv++;
+	}
+	return nb_tlv;
+}
+
 int rte_pmd_i40e_get_ddp_info(uint8_t *pkg_buff, uint32_t pkg_size,
 	uint8_t *info_buff, uint32_t info_size,
 	enum rte_pmd_i40e_package_info type)
@@ -1860,6 +1880,160 @@  int rte_pmd_i40e_get_ddp_info(uint8_t *pkg_buff, uint32_t pkg_size,
 		return I40E_SUCCESS;
 	}
 
+	/* get number of protocols */
+	if (type == RTE_PMD_I40E_PKG_INFO_PROTOCOL_NUM) {
+		struct i40e_profile_section_header *proto;
+
+		if (info_size < sizeof(uint32_t)) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		proto = i40e_find_section_in_profile(SECTION_TYPE_PROTO,
+						     (struct i40e_profile_segment *)
+						     i40e_seg_hdr);
+		*(uint32_t *)info_buff = i40e_get_tlv_section_size(proto);
+		return I40E_SUCCESS;
+	}
+
+	/* get list of protocols */
+	if (type == RTE_PMD_I40E_PKG_INFO_PROTOCOL_LIST) {
+		uint32_t i, j, nb_rec, nb_rec_buf;
+		struct rte_pmd_i40e_proto_info *pinfo;
+		struct i40e_profile_section_header *proto;
+		struct i40e_profile_tlv_section_record *tlv;
+
+		proto = i40e_find_section_in_profile(SECTION_TYPE_PROTO,
+						     (struct i40e_profile_segment *)
+						     i40e_seg_hdr);
+		nb_rec = i40e_get_tlv_section_size(proto);
+		nb_rec_buf = info_size / sizeof(struct rte_pmd_i40e_proto_info);
+		if (nb_rec_buf < nb_rec) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		pinfo = (struct rte_pmd_i40e_proto_info *)info_buff;
+		for (i = 0; i < nb_rec_buf; i++) {
+			pinfo[i].proto_id = RTE_PMD_I40E_PROTO_UNUSED;
+			memset(pinfo[i].name, 0, RTE_PMD_I40E_DDP_NAME_SIZE);
+		}
+		if (nb_rec == 0)
+			return I40E_SUCCESS;
+		/* get number of records in the section */
+		nb_rec = proto->section.size /
+					sizeof(struct i40e_profile_tlv_section_record);
+		tlv = (struct i40e_profile_tlv_section_record *)&proto[1];
+		for (i = j = 0; i < nb_rec; j++) {
+			pinfo[j].proto_id = tlv->data[0];
+			strncpy(pinfo[j].name, (const char *)&tlv->data[1],
+				I40E_DDP_NAME_SIZE);
+			i += tlv->len;
+			tlv = &tlv[tlv->len];
+		}
+		return I40E_SUCCESS;
+	}
+
+	/* get number of packet classification types */
+	if (type == RTE_PMD_I40E_PKG_INFO_PCTYPE_NUM) {
+		struct i40e_profile_section_header *pctype;
+
+		if (info_size < sizeof(uint32_t)) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		pctype = i40e_find_section_in_profile(SECTION_TYPE_PCTYPE,
+						      (struct i40e_profile_segment *)
+						      i40e_seg_hdr);
+		*(uint32_t *)info_buff = i40e_get_tlv_section_size(pctype);
+		return I40E_SUCCESS;
+	}
+
+	/* get list of packet classification types */
+	if (type == RTE_PMD_I40E_PKG_INFO_PCTYPE_LIST) {
+		uint32_t i, j, nb_rec, nb_rec_buf;
+
+		struct rte_pmd_i40e_ptype_info *pinfo;
+		struct i40e_profile_section_header *pctype;
+		struct i40e_profile_tlv_section_record *tlv;
+
+		pctype = i40e_find_section_in_profile(SECTION_TYPE_PCTYPE,
+						      (struct i40e_profile_segment *)
+						      i40e_seg_hdr);
+		nb_rec = i40e_get_tlv_section_size(pctype);
+		nb_rec_buf = info_size / sizeof(struct rte_pmd_i40e_ptype_info);
+		if (nb_rec_buf < nb_rec) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		pinfo = (struct rte_pmd_i40e_ptype_info *)info_buff;
+		for (i = 0; i < nb_rec_buf; i++)
+			memset(&pinfo[i], RTE_PMD_I40E_PROTO_UNUSED,
+			       sizeof(struct rte_pmd_i40e_ptype_info));
+
+		if (nb_rec == 0)
+			return I40E_SUCCESS;
+		/* get number of records in the section */
+		nb_rec = pctype->section.size /
+					sizeof(struct i40e_profile_tlv_section_record);
+		tlv = (struct i40e_profile_tlv_section_record *)&pctype[1];
+		for (i = j = 0; i < nb_rec; j++) {
+			memcpy(&pinfo[j], tlv->data,
+			       sizeof(struct rte_pmd_i40e_ptype_info));
+			i += tlv->len;
+			tlv = &tlv[tlv->len];
+		}
+		return I40E_SUCCESS;
+	}
+
+	/* get number of packet types */
+	if (type == RTE_PMD_I40E_PKG_INFO_PTYPE_NUM) {
+		struct i40e_profile_section_header *ptype;
+
+		if (info_size < sizeof(uint32_t)) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		ptype = i40e_find_section_in_profile(SECTION_TYPE_PTYPE,
+						     (struct i40e_profile_segment *)
+						     i40e_seg_hdr);
+		*(uint32_t *)info_buff = i40e_get_tlv_section_size(ptype);
+		return I40E_SUCCESS;
+	}
+
+	/* get list of packet types */
+	if (type == RTE_PMD_I40E_PKG_INFO_PTYPE_LIST) {
+		uint32_t i, j, nb_rec, nb_rec_buf;
+		struct rte_pmd_i40e_ptype_info *pinfo;
+		struct i40e_profile_section_header *ptype;
+		struct i40e_profile_tlv_section_record *tlv;
+
+		ptype = i40e_find_section_in_profile(SECTION_TYPE_PTYPE,
+						     (struct i40e_profile_segment *)
+						     i40e_seg_hdr);
+		nb_rec = i40e_get_tlv_section_size(ptype);
+		nb_rec_buf = info_size / sizeof(struct rte_pmd_i40e_ptype_info);
+		if (nb_rec_buf < nb_rec) {
+			PMD_DRV_LOG(ERR, "Invalid information buffer size");
+			return -EINVAL;
+		}
+		pinfo = (struct rte_pmd_i40e_ptype_info *)info_buff;
+		for (i = 0; i < nb_rec_buf; i++)
+			memset(&pinfo[i], RTE_PMD_I40E_PROTO_UNUSED,
+			       sizeof(struct rte_pmd_i40e_ptype_info));
+
+		if (nb_rec == 0)
+			return I40E_SUCCESS;
+		/* get number of records in the section */
+		nb_rec = ptype->section.size /
+					sizeof(struct i40e_profile_tlv_section_record);
+		for (i = j = 0; i < nb_rec; j++) {
+			tlv = (struct i40e_profile_tlv_section_record *)&ptype[1 + i];
+			memcpy(&pinfo[j], tlv->data,
+			       sizeof(struct rte_pmd_i40e_ptype_info));
+			i += tlv->len;
+		}
+		return I40E_SUCCESS;
+	}
+
 	PMD_DRV_LOG(ERR, "Info type %u is invalid.", type);
 	return -EINVAL;
 }
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 155b7e8..b9fd18e 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -88,6 +88,12 @@  enum rte_pmd_i40e_package_info {
 	RTE_PMD_I40E_PKG_INFO_HEADER,
 	RTE_PMD_I40E_PKG_INFO_DEVID_NUM,
 	RTE_PMD_I40E_PKG_INFO_DEVID_LIST,
+	RTE_PMD_I40E_PKG_INFO_PROTOCOL_NUM,
+	RTE_PMD_I40E_PKG_INFO_PROTOCOL_LIST,
+	RTE_PMD_I40E_PKG_INFO_PCTYPE_NUM,
+	RTE_PMD_I40E_PKG_INFO_PCTYPE_LIST,
+	RTE_PMD_I40E_PKG_INFO_PTYPE_NUM,
+	RTE_PMD_I40E_PKG_INFO_PTYPE_LIST,
 	RTE_PMD_I40E_PKG_INFO_MAX = 0xFFFFFFFF
 };
 
@@ -133,6 +139,25 @@  struct rte_pmd_i40e_profile_list {
 	struct rte_pmd_i40e_profile_info p_info[1];
 };
 
+#define RTE_PMD_I40E_PROTO_NUM 6
+#define RTE_PMD_I40E_PROTO_UNUSED 0xFF
+
+/**
+ * Protocols information stored in profile
+ */
+struct rte_pmd_i40e_proto_info {
+	uint8_t proto_id;
+	char name[RTE_PMD_I40E_DDP_NAME_SIZE];
+};
+
+/**
+ * Packet classification/ packet type information stored in profile
+ */
+struct rte_pmd_i40e_ptype_info {
+	uint8_t ptype_id;
+	uint8_t protocols[RTE_PMD_I40E_PROTO_NUM];
+};
+
 /**
  * ptype mapping table only accept RTE_PTYPE_XXX or "user defined" ptype.
  * A ptype with MSB set will be regarded as a user defined ptype.