From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH 1/6] spp_nfv: fix bug of do_del if port does not exist
Date: Tue, 9 Oct 2018 19:53:55 +0900 [thread overview]
Message-ID: <20181009105400.42817-2-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <20181009105400.42817-1-ogawa.yasufumi@lab.ntt.co.jp>
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Fix bug of do_del() causing segmentation fault if not existing port is
deleted. It is because determining the result of find_port_id() is
incorrect and tries to delete invalid port.
This update is to correct the result of find_port_id() and determining
port ID.
It is also including refactor of patch command in which find_port_id()
is used. An error message is shown in log without terminating the
process if patched port is not found.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/nfv/nfv.c | 80 +++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 58 insertions(+), 22 deletions(-)
diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c
index c261e8d..049b3cf 100644
--- a/src/nfv/nfv.c
+++ b/src/nfv/nfv.c
@@ -265,11 +265,15 @@ forward_array_remove(int port_id)
}
}
-static int
+/*
+ * Return actual port ID which is assigned by system internally, or PORT_RESET
+ * if port is not found.
+ */
+static uint16_t
find_port_id(int id, enum port_type type)
{
- int port_id = PORT_RESET;
- unsigned int i;
+ uint16_t port_id = PORT_RESET;
+ uint16_t i;
for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
if (port_map[i].port_type != type)
@@ -287,18 +291,21 @@ find_port_id(int id, enum port_type type)
static int
do_del(char *res_uid)
{
- int port_id = PORT_RESET;
+ uint16_t port_id = PORT_RESET;
char *p_type;
int p_id;
int res;
res = parse_resource_uid(res_uid, &p_type, &p_id);
- if (res < 0)
+ if (res < 0) {
+ RTE_LOG(ERR, APP,
+ "Failed to parse resource UID\n");
return -1;
+ }
if (!strcmp(p_type, "vhost")) {
port_id = find_port_id(p_id, VHOST);
- if (port_id < 0)
+ if (port_id == PORT_RESET)
return -1;
} else if (!strcmp(p_type, "ring")) {
@@ -306,7 +313,7 @@ do_del(char *res_uid)
RTE_LOG(DEBUG, APP, "Del ring id %d\n", p_id);
port_id = find_port_id(p_id, RING);
- if (port_id < 0)
+ if (port_id == PORT_RESET)
return -1;
rte_eth_dev_detach(port_id, name);
@@ -315,7 +322,7 @@ do_del(char *res_uid)
char name[RTE_ETH_NAME_MAX_LEN];
port_id = find_port_id(p_id, PCAP);
- if (port_id < 0)
+ if (port_id == PORT_RESET)
return -1;
rte_eth_dev_detach(port_id, name);
@@ -324,7 +331,7 @@ do_del(char *res_uid)
char name[RTE_ETH_NAME_MAX_LEN];
port_id = find_port_id(p_id, NULLPMD);
- if (port_id < 0)
+ if (port_id == PORT_RESET)
return -1;
rte_eth_dev_detach(port_id, name);
@@ -694,7 +701,7 @@ do_add(char *res_uid)
else
port_id = (uint16_t) res;
- port_map[port_id].id = (uint16_t) p_id;
+ port_map[port_id].id = p_id;
port_map[port_id].port_type = type;
port_map[port_id].stats = &ports->client_stats[p_id];
@@ -775,23 +782,52 @@ parse_command(char *str)
/* reset forward array*/
forward_array_reset();
} else {
- int in_port;
- int out_port;
+ uint16_t in_port;
+ uint16_t out_port;
if (max_token <= 2)
return 0;
- char *p_type;
- int p_id;
-
- parse_resource_uid(token_list[1], &p_type, &p_id);
- in_port = find_port_id(p_id, get_port_type(p_type));
-
- parse_resource_uid(token_list[2], &p_type, &p_id);
- out_port = find_port_id(p_id, get_port_type(p_type));
-
- if (in_port < 0 || out_port < 0)
+ char *in_p_type;
+ char *out_p_type;
+ int in_p_id;
+ int out_p_id;
+
+ parse_resource_uid(token_list[1], &in_p_type, &in_p_id);
+ in_port = find_port_id(in_p_id,
+ get_port_type(in_p_type));
+
+ parse_resource_uid(token_list[2],
+ &out_p_type, &out_p_id);
+ out_port = find_port_id(out_p_id,
+ get_port_type(out_p_type));
+
+ if (in_port == PORT_RESET && out_port == PORT_RESET) {
+ char err_msg[128];
+ memset(err_msg, '\0', sizeof(err_msg));
+ sprintf(err_msg, "%s '%s:%d' and '%s:%d' %s",
+ "Failed to patch, both of",
+ in_p_type, in_p_id,
+ out_p_type, out_p_id,
+ "not found");
+ RTE_LOG(ERR, APP, "%s\n", err_msg);
+ return 0;
+ } else if (in_port == PORT_RESET) {
+ char err_msg[128];
+ memset(err_msg, '\0', sizeof(err_msg));
+ sprintf(err_msg, "%s '%s:%d' not found",
+ "Failed to patch, in_port",
+ in_p_type, in_p_id);
+ RTE_LOG(ERR, APP, "%s\n", err_msg);
return 0;
+ } else if (out_port == PORT_RESET) {
+ char err_msg[128];
+ memset(err_msg, '\0', sizeof(err_msg));
+ sprintf(err_msg, "%s '%s:%d' not found",
+ "Failed to patch, out_port",
+ out_p_type, out_p_id);
+ RTE_LOG(ERR, APP, "%s\n", err_msg);
+ }
add_patch(in_port, out_port);
}
--
2.7.4
next prev parent reply other threads:[~2018-10-09 10:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 10:53 [spp] [PATCH 0/6] Fix bug of assigning ports ogawa.yasufumi
2018-10-09 10:53 ` ogawa.yasufumi [this message]
2018-10-09 10:53 ` [spp] [PATCH 2/6] spp_nfv: refactor log of patch command ogawa.yasufumi
2018-10-09 10:53 ` [spp] [PATCH 3/6] spp_vm: fix bug of do_del if port does not exist ogawa.yasufumi
2018-10-09 10:53 ` [spp] [PATCH 4/6] spp_vm: fix to use uint16_t port_id in do_add ogawa.yasufumi
2018-10-09 10:53 ` [spp] [PATCH 5/6] spp_vm: correct error handling if patch cmd failed ogawa.yasufumi
2018-10-09 10:54 ` [spp] [PATCH 6/6] spp_vm: refactor log of patch command ogawa.yasufumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181009105400.42817-2-ogawa.yasufumi@lab.ntt.co.jp \
--to=ogawa.yasufumi@lab.ntt.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).