* [spp] [PATCH] spp_pcap: remove nouse nof_rings and nof_nics
@ 2019-07-18 5:00 yasufum.o
0 siblings, 0 replies; 2+ messages in thread
From: yasufum.o @ 2019-07-18 5:00 UTC (permalink / raw)
To: spp, ferruh.yigit, yasufum.o
From: Yasufumi Ogawa <yasufum.o@gmail.com>
In struct `iface_info`, members `nof_rings` and `nof_nics` for
containing the number of ports of each type are defined, but not
required actually. This patch is to remove it.
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
src/pcap/cmd_utils.c | 57 +++++++++++++++++++++++++++++++-------------
src/pcap/cmd_utils.h | 5 +---
2 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/src/pcap/cmd_utils.c b/src/pcap/cmd_utils.c
index 69f0fa0..31f4922 100644
--- a/src/pcap/cmd_utils.c
+++ b/src/pcap/cmd_utils.c
@@ -154,7 +154,7 @@ get_iface_info(enum port_type iface_type, int iface_no)
switch (iface_type) {
case PHY:
- return &iface_info->nic[iface_no];
+ return &iface_info->phy[iface_no];
case RING:
return &iface_info->ring[iface_no];
default:
@@ -174,10 +174,10 @@ init_iface_info(void)
struct iface_info *p_iface_info = g_mng_data_addr.p_iface_info;
memset(p_iface_info, 0x00, sizeof(struct iface_info));
for (port_cnt = 0; port_cnt < RTE_MAX_ETHPORTS; port_cnt++) {
- p_iface_info->nic[port_cnt].iface_type = UNDEF;
- p_iface_info->nic[port_cnt].iface_no = port_cnt;
- p_iface_info->nic[port_cnt].ethdev_port_id = -1;
- p_iface_info->nic[port_cnt].cls_attrs.vlantag.vid =
+ p_iface_info->phy[port_cnt].iface_type = UNDEF;
+ p_iface_info->phy[port_cnt].iface_no = port_cnt;
+ p_iface_info->phy[port_cnt].ethdev_port_id = -1;
+ p_iface_info->phy[port_cnt].cls_attrs.vlantag.vid =
ETH_VLAN_ID_MAX;
p_iface_info->ring[port_cnt].iface_type = UNDEF;
p_iface_info->ring[port_cnt].iface_no = port_cnt;
@@ -199,21 +199,44 @@ init_core_info(void)
*g_mng_data_addr.p_capture_status = SPP_CAPTURE_IDLE;
}
-/* Setup port info of port on host */
+/* Initialize mng data of ports on host */
static int
-set_nic_interface(void)
+init_host_port_info(void)
{
- int nic_cnt = 0;
+ int port_type, port_id;
+ int i, ret;
+ int nof_phys = 0;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = { 0 };
struct iface_info *p_iface_info = g_mng_data_addr.p_iface_info;
- /* NIC Setting */
- p_iface_info->nof_phys = rte_eth_dev_count_avail();
- if (p_iface_info->nof_phys > RTE_MAX_ETHPORTS)
- p_iface_info->nof_phys = RTE_MAX_ETHPORTS;
+ for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+ if (!rte_eth_dev_is_valid_port(i))
+ continue;
- for (nic_cnt = 0; nic_cnt < p_iface_info->nof_phys; nic_cnt++) {
- p_iface_info->nic[nic_cnt].iface_type = PHY;
- p_iface_info->nic[nic_cnt].ethdev_port_id = nic_cnt;
+ rte_eth_dev_get_name_by_port(i, dev_name);
+ ret = parse_dev_name(dev_name, &port_type, &port_id);
+ if (ret < 0)
+ RTE_LOG(ERR, PCAP_UTILS, "Failed to parse dev_name.\n");
+
+ if (port_type == PHY) {
+ port_id = nof_phys;
+ nof_phys++;
+ }
+
+ switch (port_type) {
+ case PHY:
+ p_iface_info->phy[port_id].iface_type = port_type;
+ p_iface_info->phy[port_id].ethdev_port_id = port_id;
+ break;
+ case RING:
+ p_iface_info->ring[port_id].iface_type = port_type;
+ p_iface_info->ring[port_id].ethdev_port_id = port_id;
+ break;
+ default:
+ RTE_LOG(ERR, PCAP_UTILS, "Unsupported port on host, "
+ "type:%d, id:%d.\n",
+ port_type, port_id);
+ }
}
return SPPWK_RET_OK;
@@ -227,8 +250,8 @@ init_mng_data(void)
init_iface_info();
init_core_info();
- int ret_nic = set_nic_interface();
- if (unlikely(ret_nic != SPPWK_RET_OK))
+ int ret = init_host_port_info();
+ if (unlikely(ret != SPPWK_RET_OK))
return SPPWK_RET_NG;
return SPPWK_RET_OK;
diff --git a/src/pcap/cmd_utils.h b/src/pcap/cmd_utils.h
index f2cb9ef..fb8c300 100644
--- a/src/pcap/cmd_utils.h
+++ b/src/pcap/cmd_utils.h
@@ -151,11 +151,8 @@ struct sppwk_comp_info {
};
/* Manage interfaces and port information as global variable */
-/* TODO(yasufum) confirm why nof_rings is required not used in anywhere. */
struct iface_info {
- int nof_phys; /* Number of phy ports */
- int nof_rings; /* Number of ring ports */
- struct sppwk_port_info nic[RTE_MAX_ETHPORTS];
+ struct sppwk_port_info phy[RTE_MAX_ETHPORTS];
struct sppwk_port_info ring[RTE_MAX_ETHPORTS];
};
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread* [spp] [PATCH] spp_pcap: remove nouse nof_rings and nof_nics
@ 2019-07-17 8:39 yasufum.o
0 siblings, 0 replies; 2+ messages in thread
From: yasufum.o @ 2019-07-17 8:39 UTC (permalink / raw)
To: spp, ferruh.yigit, yasufum.o
From: Yasufumi Ogawa <yasufum.o@gmail.com>
In struct `iface_info`, members `nof_rings` and `nof_nics` for
containing the number of ports of each type are defined, but not
required actually. This patch is to remove it.
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
src/pcap/cmd_utils.c | 57 +++++++++++++++++++++++++++++++-------------
src/pcap/cmd_utils.h | 5 +---
2 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/src/pcap/cmd_utils.c b/src/pcap/cmd_utils.c
index 69f0fa0..31f4922 100644
--- a/src/pcap/cmd_utils.c
+++ b/src/pcap/cmd_utils.c
@@ -154,7 +154,7 @@ get_iface_info(enum port_type iface_type, int iface_no)
switch (iface_type) {
case PHY:
- return &iface_info->nic[iface_no];
+ return &iface_info->phy[iface_no];
case RING:
return &iface_info->ring[iface_no];
default:
@@ -174,10 +174,10 @@ init_iface_info(void)
struct iface_info *p_iface_info = g_mng_data_addr.p_iface_info;
memset(p_iface_info, 0x00, sizeof(struct iface_info));
for (port_cnt = 0; port_cnt < RTE_MAX_ETHPORTS; port_cnt++) {
- p_iface_info->nic[port_cnt].iface_type = UNDEF;
- p_iface_info->nic[port_cnt].iface_no = port_cnt;
- p_iface_info->nic[port_cnt].ethdev_port_id = -1;
- p_iface_info->nic[port_cnt].cls_attrs.vlantag.vid =
+ p_iface_info->phy[port_cnt].iface_type = UNDEF;
+ p_iface_info->phy[port_cnt].iface_no = port_cnt;
+ p_iface_info->phy[port_cnt].ethdev_port_id = -1;
+ p_iface_info->phy[port_cnt].cls_attrs.vlantag.vid =
ETH_VLAN_ID_MAX;
p_iface_info->ring[port_cnt].iface_type = UNDEF;
p_iface_info->ring[port_cnt].iface_no = port_cnt;
@@ -199,21 +199,44 @@ init_core_info(void)
*g_mng_data_addr.p_capture_status = SPP_CAPTURE_IDLE;
}
-/* Setup port info of port on host */
+/* Initialize mng data of ports on host */
static int
-set_nic_interface(void)
+init_host_port_info(void)
{
- int nic_cnt = 0;
+ int port_type, port_id;
+ int i, ret;
+ int nof_phys = 0;
+ char dev_name[RTE_DEV_NAME_MAX_LEN] = { 0 };
struct iface_info *p_iface_info = g_mng_data_addr.p_iface_info;
- /* NIC Setting */
- p_iface_info->nof_phys = rte_eth_dev_count_avail();
- if (p_iface_info->nof_phys > RTE_MAX_ETHPORTS)
- p_iface_info->nof_phys = RTE_MAX_ETHPORTS;
+ for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+ if (!rte_eth_dev_is_valid_port(i))
+ continue;
- for (nic_cnt = 0; nic_cnt < p_iface_info->nof_phys; nic_cnt++) {
- p_iface_info->nic[nic_cnt].iface_type = PHY;
- p_iface_info->nic[nic_cnt].ethdev_port_id = nic_cnt;
+ rte_eth_dev_get_name_by_port(i, dev_name);
+ ret = parse_dev_name(dev_name, &port_type, &port_id);
+ if (ret < 0)
+ RTE_LOG(ERR, PCAP_UTILS, "Failed to parse dev_name.\n");
+
+ if (port_type == PHY) {
+ port_id = nof_phys;
+ nof_phys++;
+ }
+
+ switch (port_type) {
+ case PHY:
+ p_iface_info->phy[port_id].iface_type = port_type;
+ p_iface_info->phy[port_id].ethdev_port_id = port_id;
+ break;
+ case RING:
+ p_iface_info->ring[port_id].iface_type = port_type;
+ p_iface_info->ring[port_id].ethdev_port_id = port_id;
+ break;
+ default:
+ RTE_LOG(ERR, PCAP_UTILS, "Unsupported port on host, "
+ "type:%d, id:%d.\n",
+ port_type, port_id);
+ }
}
return SPPWK_RET_OK;
@@ -227,8 +250,8 @@ init_mng_data(void)
init_iface_info();
init_core_info();
- int ret_nic = set_nic_interface();
- if (unlikely(ret_nic != SPPWK_RET_OK))
+ int ret = init_host_port_info();
+ if (unlikely(ret != SPPWK_RET_OK))
return SPPWK_RET_NG;
return SPPWK_RET_OK;
diff --git a/src/pcap/cmd_utils.h b/src/pcap/cmd_utils.h
index f2cb9ef..fb8c300 100644
--- a/src/pcap/cmd_utils.h
+++ b/src/pcap/cmd_utils.h
@@ -151,11 +151,8 @@ struct sppwk_comp_info {
};
/* Manage interfaces and port information as global variable */
-/* TODO(yasufum) confirm why nof_rings is required not used in anywhere. */
struct iface_info {
- int nof_phys; /* Number of phy ports */
- int nof_rings; /* Number of ring ports */
- struct sppwk_port_info nic[RTE_MAX_ETHPORTS];
+ struct sppwk_port_info phy[RTE_MAX_ETHPORTS];
struct sppwk_port_info ring[RTE_MAX_ETHPORTS];
};
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-18 5:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-18 5:00 [spp] [PATCH] spp_pcap: remove nouse nof_rings and nof_nics yasufum.o
-- strict thread matches above, loose matches on Subject: below --
2019-07-17 8:39 yasufum.o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).