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 8290CA0471 for ; Tue, 16 Jul 2019 14:33:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7BDE42C18; Tue, 16 Jul 2019 14:33:54 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 7256E2C18 for ; Tue, 16 Jul 2019 14:33:53 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id f20so148742pgj.0 for ; Tue, 16 Jul 2019 05:33:53 -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=NHVeE6ElUXb72yBu5UjWP9mvAYT6t1ehIPRMhKAyRwY=; b=qaNyQsLhQ31+PXZA7OSDMsCYohZKQobMzfaCGHV5tofnv7KvRUxOk0g1g6ZkBXhZcN J2vWES01dLQlIbsH1wJtuwwj/ah5vp8DAAPOp651QJ3N/qB/S180ppU6OBaB7NY0Dsw3 9oI/BZ8rgS85O82K6UmbO7u0zvlDa2BDT4B3oii0O9eNgNlcyXSGuSgw1g9bfXbKeJ7g FEO9uAFWv+rN8DnXmAi7V9EBAz4kqSLJ881JDV4FbqDyqt/7sAssCCq4Jguwnba1L4SX Xyd3vvMLWsHcnHLa6lIUIc+dcUoGSZ74//MWi0ieigPwhyMdXMFb12JPNjv91DvYS5nN N/EQ== 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=NHVeE6ElUXb72yBu5UjWP9mvAYT6t1ehIPRMhKAyRwY=; b=TlpqtZR1VEfMmjXQ/r8U85QLVFFBT8A/KACpOopm7Scz5eb9uvsfWfkj2EJMWUqG8o g2bU19QHw+MR8CUndOd9BW+j+zFPeuIGW+7jrKTojgpCv11fI7uaOU5bUklr5KbzP/6N VBix/xpSGPsVXspRxNCdtucZnkoDop61iIxjd8LuuahMghbTm6J9g06f4ICTgiOIiYfs gDtXqxBSM8r4/Ud5ShsARlNiogF2lFsEbPa/ZXDCr50FMm5f4ZLAojrdJ2dns3hk7p0F R/Z/j4QxhQFL0OgTzniDlVB9I/oM7hZr+mLAIgkfdVR4v0kNyOwMrW6UzgnrDA/v6Bm/ zw1g== X-Gm-Message-State: APjAAAVRPIgYh1jZdp/t6AyJplSM77neiYvOdAqNwxnUuOG7zq6tusHo OTIwKy8aCt4bhBUWG9q+7rDUPn7r X-Google-Smtp-Source: APXvYqxQv42myoV0rOMADX48kmV8aNbCxkDahU6aSeY3iaSyRurSieBYr4rEt5s9wl8svNE/0QVE4Q== X-Received: by 2002:a63:6eca:: with SMTP id j193mr32694663pgc.74.1563280432544; Tue, 16 Jul 2019 05:33:52 -0700 (PDT) Received: from localhost.localdomain ([192.47.164.146]) by smtp.gmail.com with ESMTPSA id 2sm35796712pgm.39.2019.07.16.05.33.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 05:33:52 -0700 (PDT) From: yasufum.o@gmail.com To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Tue, 16 Jul 2019 21:33:48 +0900 Message-Id: <20190716123348.41041-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] spp_nfv: parse port type and ID 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 Spp_nfv initialize shared ports managed by spp_primary as PHY type. However, it might be other types if spp_primary is launched with `--vdev` option, and it should be initialized with correct port type and ID. This update is to fix the issue by using parse_dev_name() which is added in the previous patch. Signed-off-by: Yasufumi Ogawa --- src/nfv/commands.h | 2 +- src/nfv/main.c | 24 +++++++++++++++++++++--- src/nfv/nfv_status.c | 16 ++++++++++++++++ 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/nfv/commands.h b/src/nfv/commands.h index 7bdbdff..06159ad 100644 --- a/src/nfv/commands.h +++ b/src/nfv/commands.h @@ -151,7 +151,7 @@ static int parse_command(char *str) { uint16_t dev_id; - char dev_name[RTE_DEV_NAME_MAX_LEN]; + char dev_name[RTE_DEV_NAME_MAX_LEN] = { 0 }; char *token_list[MAX_PARAMETER] = {NULL}; int cli_id; diff --git a/src/nfv/main.c b/src/nfv/main.c index 9117d9b..eb25d13 100644 --- a/src/nfv/main.c +++ b/src/nfv/main.c @@ -194,7 +194,10 @@ main(int argc, char *argv[]) unsigned int i; int flg_exit; // used as res of parse_command() to exit if -1 int ret; - char log_msg[1024] = {'\0'}; /* temporary log message */ + char dev_name[RTE_DEV_NAME_MAX_LEN] = { 0 }; + int port_type; + int nof_phy_port = 0; + char log_msg[1024] = { 0 }; /* temporary log message */ ret = rte_eal_init(argc, argv); if (ret < 0) @@ -246,11 +249,26 @@ main(int argc, char *argv[]) if (!rte_eth_dev_is_valid_port(i)) continue; + int port_id; + 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."); + if (port_type == PHY) { + port_id = nof_phy_port; + nof_phy_port++; + } + /* Update ports_fwd_array with phy port. */ ports_fwd_array[i].in_port_id = i; - port_map[i].port_type = PHY; - port_map[i].id = i; + port_map[i].port_type = port_type; + port_map[i].id = port_id; port_map[i].stats = &ports->port_stats[i]; + + /* TODO(yasufum) convert from int of port_type to char */ + RTE_LOG(DEBUG, SPP_NFV, "Add port, type: %d, id: %d\n", + port_type, port_id); + } /* Inspect lcores in use. */ diff --git a/src/nfv/nfv_status.c b/src/nfv/nfv_status.c index c40d0b4..a092fac 100644 --- a/src/nfv/nfv_status.c +++ b/src/nfv/nfv_status.c @@ -111,6 +111,10 @@ append_port_info_json(char *str, sprintf(str + strlen(str), "\"nullpmd:%u\",", port_map[i].id); break; + case TAP: + sprintf(str + strlen(str), "\"tap:%u\",", + port_map[i].id); + break; case UNDEF: /* TODO(yasufum) Need to remove print for undefined ? */ sprintf(str + strlen(str), "\"udf\","); @@ -191,6 +195,12 @@ append_patch_info_json(char *str, "\"nullpmd:%u\",", port_map[i].id); break; + case TAP: + RTE_LOG(INFO, SHARED, "Type: TAP\n"); + sprintf(patch_str + strlen(patch_str), + "\"tap:%u\",", + port_map[i].id); + break; case UNDEF: RTE_LOG(INFO, SHARED, "Type: UDF\n"); /* TODO(yasufum) Need to remove print for undefined ? */ @@ -241,6 +251,12 @@ append_patch_info_json(char *str, "\"nullpmd:%u\"", port_map[j].id); break; + case TAP: + RTE_LOG(INFO, SHARED, "Type: TAP\n"); + sprintf(patch_str + strlen(patch_str), + "\"tap:%u\"", + port_map[j].id); + break; case UNDEF: RTE_LOG(INFO, SHARED, "Type: UDF\n"); /* -- 2.17.1