From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH 3/6] spp_vm: fix bug of do_del if port does not exist
Date: Tue, 9 Oct 2018 19:53:57 +0900 [thread overview]
Message-ID: <20181009105400.42817-4-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.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/vm/main.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/vm/main.c b/src/vm/main.c
index 63d5684..3807370 100644
--- a/src/vm/main.c
+++ b/src/vm/main.c
@@ -205,11 +205,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)
@@ -227,21 +231,24 @@ 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, "ring")) {
char name[RTE_ETH_NAME_MAX_LEN];
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);
--
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 ` [spp] [PATCH 1/6] spp_nfv: fix bug of do_del if port does not exist ogawa.yasufumi
2018-10-09 10:53 ` [spp] [PATCH 2/6] spp_nfv: refactor log of patch command ogawa.yasufumi
2018-10-09 10:53 ` ogawa.yasufumi [this message]
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-4-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).