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 E6E4DA0471 for ; Thu, 18 Jul 2019 07:00:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB6AB1DBF; Thu, 18 Jul 2019 07:00:16 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 8A4431DBF for ; Thu, 18 Jul 2019 07:00:15 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id r1so11978627pfq.12 for ; Wed, 17 Jul 2019 22:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=yWywDmXupCHgJzsoaJaU5YikYagDgrl/WO0DB7IMo3I=; b=TAbMhEwI4PIffmg2id6ad3mwCIqk0ykJH7l805TKiSOisyq+lsS/107sgIAjbBASEf S66aKk8bgQDtmywpwd6A07UdXhJ+4RSiDu7uMOW/BOjmYbhsTRe0lhRu3dK731a4PXb+ W0ChfSL7vNA16dhKQk8l077v7LW6Gd6sPkvqUpmvgm4pKRUaNHSzLoSdnZy0kACxvi0Z uJkUmDnpdPD5JeamlLxpHKEa7EkD46nRTv8AfdAL8/O/8jFA+TMK2gp9J7g6T37d7X5X XjoLpLRtUK/Ii0BddCBv0UPFBKmLlewiLS82R+QYt70XA5W/Z80TfPv3kShWlXLH4DqH FW3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=yWywDmXupCHgJzsoaJaU5YikYagDgrl/WO0DB7IMo3I=; b=MeVTNOcCgPlMV/JFn8sfoR9yD3k6Lq76/AoUiZ0WLq9rz4wCM+/shU7rTh9YNiHhwN FAMC+732ikOhSzgtrzq39UENOscKBNxK5d9RQqdDc41teDthbSwgE+tdHw9H0zRIGiRr NkWP7Ew4UXjlYxYBGR+n9Rl52VGIL/MzfJAuvcXKdp2uehefMP+jDDghxnedmNMCeqdc VBNKA3gXc+dPcxoOLLMgiZthY61LIvuAG2U7Rz7PMJq5vH6X1/aP2RQKQMyhwU/SiMH1 H8ZnuD+jC/gTYttw40ToaaxJcyVnfg7nUYAQxQ7/p1jH2N/u/s1gCQDpKRLDWweaIqvG DdmQ== X-Gm-Message-State: APjAAAUyomajkUBF7xfjX0eAINVqZUnIL2xfDdOp24ihgDJjWgpHcoW1 88JB/nQTvNrHh25PiLtvNqSv7e9j X-Google-Smtp-Source: APXvYqxyq8RbiZFhEGpN9/yUwZRp6IGFlN0GlAt8UG2/8awEAOCNVN0K2o7jidabetHlvDrZ/rDrlA== X-Received: by 2002:a17:90a:8c92:: with SMTP id b18mr47850075pjo.97.1563426014558; Wed, 17 Jul 2019 22:00:14 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id s22sm26945837pfh.107.2019.07.17.22.00.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jul 2019 22:00:13 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Thu, 18 Jul 2019 14:00:09 +0900 Message-Id: <20190718050009.6637-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] shared/sec: parse port type while init ports X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Yasufumi Ogawa As previous patch, fix registering ports on host as phy type even if it is added with `--vdev` option. This patch is to fix parsing ports defined in init_host_port_info() which is called from spp_vf and spp_mirror. Spp_pcap is still not fixed yet. Signed-off-by: Yasufumi Ogawa --- src/nfv/main.c | 2 +- .../spp_worker_th/cmd_res_formatter.c | 2 +- .../secondary/spp_worker_th/cmd_utils.c | 64 +++++++++++++------ .../secondary/spp_worker_th/cmd_utils.h | 9 ++- 4 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/nfv/main.c b/src/nfv/main.c index eb25d13..c0126a4 100644 --- a/src/nfv/main.c +++ b/src/nfv/main.c @@ -253,7 +253,7 @@ main(int argc, char *argv[]) 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, SPP_NFV, "Failed to parse dev_name."); + RTE_LOG(ERR, SPP_NFV, "Failed to parse dev_name.\n"); if (port_type == PHY) { port_id = nof_phy_port; nof_phy_port++; diff --git a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c index 00d9466..de7acaf 100644 --- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c +++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c @@ -202,7 +202,7 @@ get_ethdev_port_id(enum port_type iface_type, int iface_no) sppwk_get_mng_data(&iface_info, NULL, NULL, NULL, NULL, NULL); switch (iface_type) { case PHY: - return iface_info->nic[iface_no].ethdev_port_id; + return iface_info->phy[iface_no].ethdev_port_id; case RING: return iface_info->ring[iface_no].ethdev_port_id; case VHOST: diff --git a/src/shared/secondary/spp_worker_th/cmd_utils.c b/src/shared/secondary/spp_worker_th/cmd_utils.c index e77dbe7..7797a71 100644 --- a/src/shared/secondary/spp_worker_th/cmd_utils.c +++ b/src/shared/secondary/spp_worker_th/cmd_utils.c @@ -158,7 +158,7 @@ get_sppwk_port(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 VHOST: return &iface_info->vhost[iface_no]; case RING: @@ -231,7 +231,7 @@ log_interface_info(const struct iface_info *iface_info) iface_info->nof_vhosts, iface_info->nof_rings); for (cnt = 0; cnt < RTE_MAX_ETHPORTS; cnt++) { - port = &iface_info->nic[cnt]; + port = &iface_info->phy[cnt]; if (port->iface_type == UNDEF) continue; @@ -357,10 +357,10 @@ init_iface_info(void) struct iface_info *p_iface_info = g_mng_data.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->vhost[port_cnt].iface_type = UNDEF; p_iface_info->vhost[port_cnt].iface_no = port_cnt; @@ -404,21 +404,48 @@ init_core_info(void) memset(g_mng_data.p_change_core, 0x00, sizeof(int)*RTE_MAX_LCORE); } -/* 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.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; + + 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, APP, "Failed to parse dev_name.\n"); - 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; + 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 VHOST: + p_iface_info->vhost[port_id].iface_type = port_type; + p_iface_info->vhost[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, APP, "Unsupported port on host, " + "type:%d, id:%d.\n", + port_type, port_id); + } } return SPP_RET_OK; @@ -433,10 +460,9 @@ init_mng_data(void) init_core_info(); init_component_info(); - int ret_nic = set_nic_interface(); - if (unlikely(ret_nic != SPP_RET_OK)) + int ret = init_host_port_info(); + if (unlikely(ret != SPP_RET_OK)) return SPP_RET_NG; - return SPP_RET_OK; } diff --git a/src/shared/secondary/spp_worker_th/cmd_utils.h b/src/shared/secondary/spp_worker_th/cmd_utils.h index 6578cb8..e1775b2 100644 --- a/src/shared/secondary/spp_worker_th/cmd_utils.h +++ b/src/shared/secondary/spp_worker_th/cmd_utils.h @@ -193,11 +193,18 @@ struct sppwk_comp_info { }; /* Manage number of interfaces and port information as global variable. */ +/** + * TODO(yasufum) confirm why nof_phys, nof_vhosts and nof_rings are required + * not used in anywhere. + * + * TODO(yasufum) confirm why having arrays of types. it seems OK having + * just one array. + */ struct iface_info { int nof_phys; /* Number of phy ports */ int nof_vhosts; /* Number of vhost 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 vhost[RTE_MAX_ETHPORTS]; struct sppwk_port_info ring[RTE_MAX_ETHPORTS]; }; -- 2.17.1