* Re: [spp] SPP PCIe hotplug changes for SPP
@ 2017-02-23 13:21 Choi, Sy Jong
2017-02-23 17:45 ` Ferruh Yigit
2017-02-24 4:35 ` Wan, Qun
0 siblings, 2 replies; 6+ messages in thread
From: Choi, Sy Jong @ 2017-02-23 13:21 UTC (permalink / raw)
To: spp
Hi Everyone,
First patch to enable spp & primary to support port start/stop and attach/detach.
>From e58c90661f702276dfeae2fc1f3e43750fe2ae2c Mon Sep 17 00:00:00 2001
From: "Choi, Sy Jong" <sy.jong.choi@intel.com>
Date: Thu, 23 Feb 2017 12:54:50 +0800
Subject: [PATCH] Signed-off-by: Choi, Sy Jong <sy.jong.choi@intel.com>
spp: adding port start/stop detach/attach
primary: adding port start/stop detach/attach
---
src/primary/init.c | 2 +-
src/primary/init.h | 2 ++
src/primary/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++---
src/spp.py | 46 ++++++++++++++++++++++++---
4 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/src/primary/init.c b/src/primary/init.c
index 5ea21f9..e5809e3 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -47,7 +47,7 @@
struct client *clients;
/* The mbuf pool for packet rx */
-static struct rte_mempool *pktmbuf_pool;
+struct rte_mempool *pktmbuf_pool;
/* the port details */
struct port_info *ports;
diff --git a/src/primary/init.h b/src/primary/init.h
index 915552c..82602a2 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -56,6 +56,8 @@ struct client {
};
extern struct client *clients;
+/* The mbuf pool for packet rx */
+extern struct rte_mempool *pktmbuf_pool;
/* the shared port information: port numbers, rx and tx stats etc. */
extern struct port_info *ports;
diff --git a/src/primary/main.c b/src/primary/main.c
index 15fa53a..94cda18 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -185,9 +185,11 @@ static int
parse_command(char *str)
{
char *token_list[MAX_PARAMETER] = {NULL};
+ char name[RTE_ETH_NAME_MAX_LEN];
int ret = 0;
int i = 0;
-
+ uint8_t port_id = 255; //invalid port id
+
/* tokenize the user commands from controller */
token_list[i] = strtok(str, " ");
while (token_list[i] != NULL) {
@@ -205,6 +207,88 @@ parse_command(char *str)
else
sprintf(str, "Server Idling\n");
+ } else if (!strcmp(token_list[0], "port")) {
+ //RTE_LOG(INFO, APP, "port\n");
+ if (i <= 1) {
+ //RTE_LOG(INFO, APP, "i lesser 1\n");
+ return -1;
+ }
+ if (strcmp(token_list[1], "stop") == 0) {
+ if (i <= 2) {
+ //RTE_LOG(INFO, APP, "i lesser 2\n");
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ //RTE_LOG(INFO, APP, "port lesser 0\n");
+ return -1;
+ }
+ else {
+ rte_eth_dev_stop(port_id);
+ sprintf(str, "Port %d stopped\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "start") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (init_port(port_id, pktmbuf_pool) == 0)
+ sprintf(str, "Port %d started\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "close") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ rte_eth_dev_close(port_id);
+ sprintf(str, "Port %d closed\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "detach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_detach(port_id, name) == 0)
+ sprintf(str, "Port %d %s detached\n", port_id, name);
+ }
+ } else if (strcmp(token_list[1], "attach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ if (token_list[2] == NULL) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_attach(token_list[2], &port_id) == 0)
+ {
+ sprintf(str, "Port %d %s attached\n", port_id, name);
+ }
+ else
+ {
+ sprintf(str, "PCIe %s attached failed\n", name);
+ }
+ }
+ } else {
+ //RTE_LOG(INFO, APP, "else port\n");
+ ret = -1;
+ }
} else if (!strcmp(token_list[0], "exit")) {
RTE_LOG(DEBUG, APP, "exit\n");
RTE_LOG(DEBUG, APP, "stop\n");
@@ -322,15 +406,14 @@ main(int argc, char *argv[])
sleep(1);
continue;
}
-
ret = do_receive(&connected, &sock, str);
if (ret < 0)
continue;
-
+
RTE_LOG(DEBUG, APP, "Received string: %s\n", str);
ret = parse_command(str);
- if (ret < 0)
+ if (ret < 0)
break;
/* Send the message back to client */
diff --git a/src/spp.py b/src/spp.py
index b937b5a..3da74fa 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -229,13 +229,44 @@ def close_all_secondary():
command_secondary(i, 'exit')
SECONDARY_COUNT = 0
+def check_pri_cmds(cmds):
+ """Validate primary commands before sending"""
+ level1 = ['status', 'exit', 'clear']
+ level2 = ['add', 'del', 'port']
+ add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
+ valid = 0
+ cmdlist = cmds.split(' ')
+
+ length = len(cmdlist)
+ if length == 1:
+ if cmdlist[0] in level1:
+ valid = 1
+ elif length == 3:
+ if cmdlist[0] in level2:
+ if cmdlist[0] == 'add' or cmdlist[0] == 'del':
+ if cmdlist[1] in add_del_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if cmdlist[1] != 'attach':
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ else:
+ if cmdlist[2]:
+ valid = 1
+
+ return valid
+
def check_sec_cmds(cmds):
"""Validate secondary commands before sending"""
- level1 = ['status', 'exit', 'forward', 'stop']
- level2 = ['add', 'patch', 'del']
+ level1 = ['status', 'exit', 'forward', 'stop', 'start']
+ level2 = ['add', 'patch', 'del', 'port']
patch_args = ['reset']
add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
cmdlist = cmds.split(' ')
valid = 0
@@ -256,7 +287,10 @@ def check_sec_cmds(cmds):
elif cmdlist[0] == 'patch':
if str.isdigit(cmdlist[1]) and str.isdigit(cmdlist[2]):
valid = 1
-
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
return valid
class Shell(cmd.Cmd):
@@ -267,7 +301,8 @@ class Shell(cmd.Cmd):
recorded_file = None
COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
- 'reset', 'exit', 'forward', 'stop', 'clear']
+ 'reset', 'exit', 'forward', 'stop', 'clear',
+ 'pause', 'start', 'port', 'detach']
def complete_pri(self, text, line, begidx, endidx):
"""Completion for primary process commands"""
@@ -301,7 +336,8 @@ class Shell(cmd.Cmd):
def do_pri(self, command):
"""Send command to primary process"""
- if command and command in self.COMMANDS:
+# if command and command in self.COMMANDS:
+ if check_pri_cmds(command):
command_primary(command)
else:
print ("primary invalid command")
--
1.8.3.1
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Monday, February 20, 2017 4:37 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: SPP PCIe hotplug changes for SPP
Hi Everyone,
New Architecture for SPP to support PCIe hotplug.
Based on DPDK testpmd here are the steps you need to perform PCIe hotplug
1) Detaching : port stop, port close and then port detach
2) Attaching : port attach and then port start
In order to support PCI hotplug, we need to follow DPDK. And here are a few limitation with SPP primary secondary configuration:-
Limitation 1:-
Port information created by primary, hotplug changes port information. So attach and detaching at primary, will not update port information on secondary process.
- Now primary will attaching and detaching the port, because primary owns the port
- We need to put in place some rediscovery in secondary processes.
Limitation 2:
To update the port information on the secondary process, it require to us to reinit dpdk eal, which dpdk eal init can only be executed once.
- Multi thread will not solve the problem.
- We will use fork, so we separated the communication part and the datapath part.
The new spp primary will attach/detach port, secondary will reinit to rediscover port changes.
+----+----------+-------------------------------------------------+
| | SPP NFV | |
| +----------+ +--------------+ fork +--------------+ |
| | Parent | | Child | |
| | Comm - spp.py| | dpdk | |
| | Commands | | init | |
| | share mem to | | fwd | |
| | control child| | | |
+-------------------+--------------+-----------+--------------+---+
Code changes will be posted in the following emails.
Regards,
Choi, Sy Jong
Platform Application Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [spp] SPP PCIe hotplug changes for SPP
2017-02-23 13:21 [spp] SPP PCIe hotplug changes for SPP Choi, Sy Jong
@ 2017-02-23 17:45 ` Ferruh Yigit
2017-02-24 4:35 ` Wan, Qun
1 sibling, 0 replies; 6+ messages in thread
From: Ferruh Yigit @ 2017-02-23 17:45 UTC (permalink / raw)
To: Choi, Sy Jong, spp
On 2/23/2017 1:21 PM, Choi, Sy Jong wrote:
> Hi Everyone,
>
> First patch to enable spp & primary to support port start/stop and attach/detach.
>
> From e58c90661f702276dfeae2fc1f3e43750fe2ae2c Mon Sep 17 00:00:00 2001
> From: "Choi, Sy Jong" <sy.jong.choi@intel.com>
> Date: Thu, 23 Feb 2017 12:54:50 +0800
> Subject: [PATCH] Signed-off-by: Choi, Sy Jong <sy.jong.choi@intel.com>
Would it be right if patch subject changed to:
"spp: add PCIe hotplug support"
>
> spp: adding port start/stop detach/attach
> primary: adding port start/stop detach/attach
Can you please document new added commands.
1- There is document for spp commands, spp_commands.md, new commands can
be documented there
2- Usage can be described briefly in setup_guide.md
Sign off should be here, with "name surname <mail>" format:
Signed-off-by: Sy Jong Choi <sy.jong.choi@intel.com>
> ---
> src/primary/init.c | 2 +-
> src/primary/init.h | 2 ++
> src/primary/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++---
> src/spp.py | 46 ++++++++++++++++++++++++---
> 4 files changed, 131 insertions(+), 10 deletions(-)
>
> diff --git a/src/primary/init.c b/src/primary/init.c
> index 5ea21f9..e5809e3 100644
> --- a/src/primary/init.c
> +++ b/src/primary/init.c
> @@ -47,7 +47,7 @@
> struct client *clients;
>
> /* The mbuf pool for packet rx */
> -static struct rte_mempool *pktmbuf_pool;
> +struct rte_mempool *pktmbuf_pool;
>
> /* the port details */
> struct port_info *ports;
> diff --git a/src/primary/init.h b/src/primary/init.h
> index 915552c..82602a2 100644
> --- a/src/primary/init.h
> +++ b/src/primary/init.h
> @@ -56,6 +56,8 @@ struct client {
> };
>
> extern struct client *clients;
> +/* The mbuf pool for packet rx */
> +extern struct rte_mempool *pktmbuf_pool;
>
> /* the shared port information: port numbers, rx and tx stats etc. */
> extern struct port_info *ports;
> diff --git a/src/primary/main.c b/src/primary/main.c
> index 15fa53a..94cda18 100644
> --- a/src/primary/main.c
> +++ b/src/primary/main.c
> @@ -185,9 +185,11 @@ static int
> parse_command(char *str)
> {
> char *token_list[MAX_PARAMETER] = {NULL};
> + char name[RTE_ETH_NAME_MAX_LEN];
> int ret = 0;
> int i = 0;
> -
> + uint8_t port_id = 255; //invalid port id
Please use /* style comments
> +
Patch adds trailing whitespace, please get rid of them.
> /* tokenize the user commands from controller */
> token_list[i] = strtok(str, " ");
> while (token_list[i] != NULL) {
> @@ -205,6 +207,88 @@ parse_command(char *str)
> else
> sprintf(str, "Server Idling\n");
>
> + } else if (!strcmp(token_list[0], "port")) {
> + //RTE_LOG(INFO, APP, "port\n");
Please remove dead code. Or uncomment it.
> + if (i <= 1) {
> + //RTE_LOG(INFO, APP, "i lesser 1\n");
And if uncommented, please describe what "i" is.
> + return -1;
> + }
> + if (strcmp(token_list[1], "stop") == 0) {
> + if (i <= 2) {
> + //RTE_LOG(INFO, APP, "i lesser 2\n");
> + return -1;
> + }
> +
> + port_id = atoi(token_list[2]);
> + if (port_id == 255) {
> + //RTE_LOG(INFO, APP, "port lesser 0\n");
> + return -1;
> + }
> + else {
> + rte_eth_dev_stop(port_id);
> + sprintf(str, "Port %d stopped\n", port_id);
> + }
> + } else if (strcmp(token_list[1], "start") == 0) {
> + if (i <= 2) {
> + return -1;
> + }
> +
> + port_id = atoi(token_list[2]);
> + if (port_id == 255) {
> + return -1;
> + }
> + else {
> + if (init_port(port_id, pktmbuf_pool) == 0)
> + sprintf(str, "Port %d started\n", port_id);
> + }
> + } else if (strcmp(token_list[1], "close") == 0) {
> + if (i <= 2) {
> + return -1;
> + }
> +
> + port_id = atoi(token_list[2]);
> + if (port_id == 255) {
> + return -1;
> + }
> + else {
> + rte_eth_dev_close(port_id);
> + sprintf(str, "Port %d closed\n", port_id);
> + }
> + } else if (strcmp(token_list[1], "detach") == 0) {
> + if (i <= 2) {
> + return -1;
> + }
> +
> + port_id = atoi(token_list[2]);
> + if (port_id == 255) {
> + return -1;
> + }
> + else {
> + if (rte_eth_dev_detach(port_id, name) == 0)
> + sprintf(str, "Port %d %s detached\n", port_id, name);
> + }
> + } else if (strcmp(token_list[1], "attach") == 0) {
> + if (i <= 2) {
> + return -1;
> + }
> +
> + if (token_list[2] == NULL) {
> + return -1;
> + }
> + else {
> + if (rte_eth_dev_attach(token_list[2], &port_id) == 0)
> + {
> + sprintf(str, "Port %d %s attached\n", port_id, name);
> + }
> + else
> + {
> + sprintf(str, "PCIe %s attached failed\n", name);
> + }
> + }
> + } else {
> + //RTE_LOG(INFO, APP, "else port\n");
> + ret = -1;
> + }
> } else if (!strcmp(token_list[0], "exit")) {
> RTE_LOG(DEBUG, APP, "exit\n");
> RTE_LOG(DEBUG, APP, "stop\n");
> @@ -322,15 +406,14 @@ main(int argc, char *argv[])
> sleep(1);
> continue;
> }
> -
> ret = do_receive(&connected, &sock, str);
> if (ret < 0)
> continue;
> -
> +
> RTE_LOG(DEBUG, APP, "Received string: %s\n", str);
>
> ret = parse_command(str);
> - if (ret < 0)
> + if (ret < 0)
There are trailing whitespace in newly added code, please clean them.
> break;
>
> /* Send the message back to client */
> diff --git a/src/spp.py b/src/spp.py
> index b937b5a..3da74fa 100755
> --- a/src/spp.py
> +++ b/src/spp.py
> @@ -229,13 +229,44 @@ def close_all_secondary():
> command_secondary(i, 'exit')
> SECONDARY_COUNT = 0
>
> +def check_pri_cmds(cmds):
> + """Validate primary commands before sending"""
> + level1 = ['status', 'exit', 'clear']
> + level2 = ['add', 'del', 'port']
> + add_del_args = ['ring', 'vhost']
> + port_args = ['stop', 'detach', 'start', 'attach', 'close']
> + valid = 0
> + cmdlist = cmds.split(' ')
> +
> + length = len(cmdlist)
> + if length == 1:
> + if cmdlist[0] in level1:
> + valid = 1
> + elif length == 3:
> + if cmdlist[0] in level2:
> + if cmdlist[0] == 'add' or cmdlist[0] == 'del':
> + if cmdlist[1] in add_del_args:
> + if str.isdigit(cmdlist[2]):
> + valid = 1
> + elif cmdlist[0] == 'port':
> + if cmdlist[1] in port_args:
> + if cmdlist[1] != 'attach':
> + if str.isdigit(cmdlist[2]):
> + valid = 1
> + else:
> + if cmdlist[2]:
> + valid = 1
> +
> + return valid
> +
> def check_sec_cmds(cmds):
> """Validate secondary commands before sending"""
>
> - level1 = ['status', 'exit', 'forward', 'stop']
> - level2 = ['add', 'patch', 'del']
> + level1 = ['status', 'exit', 'forward', 'stop', 'start']
> + level2 = ['add', 'patch', 'del', 'port']
> patch_args = ['reset']
> add_del_args = ['ring', 'vhost']
> + port_args = ['stop', 'detach', 'start', 'attach', 'close']
> cmdlist = cmds.split(' ')
> valid = 0
>
> @@ -256,7 +287,10 @@ def check_sec_cmds(cmds):
> elif cmdlist[0] == 'patch':
> if str.isdigit(cmdlist[1]) and str.isdigit(cmdlist[2]):
> valid = 1
> -
> + elif cmdlist[0] == 'port':
> + if cmdlist[1] in port_args:
> + if str.isdigit(cmdlist[2]):
> + valid = 1
> return valid
>
> class Shell(cmd.Cmd):
> @@ -267,7 +301,8 @@ class Shell(cmd.Cmd):
> recorded_file = None
>
> COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
> - 'reset', 'exit', 'forward', 'stop', 'clear']
> + 'reset', 'exit', 'forward', 'stop', 'clear',
> + 'pause', 'start', 'port', 'detach']
>
> def complete_pri(self, text, line, begidx, endidx):
> """Completion for primary process commands"""
> @@ -301,7 +336,8 @@ class Shell(cmd.Cmd):
> def do_pri(self, command):
> """Send command to primary process"""
>
> - if command and command in self.COMMANDS:
> +# if command and command in self.COMMANDS:
Please remove dead code.
> + if check_pri_cmds(command):
> command_primary(command)
> else:
> print ("primary invalid command")
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [spp] SPP PCIe hotplug changes for SPP
2017-02-23 13:21 [spp] SPP PCIe hotplug changes for SPP Choi, Sy Jong
2017-02-23 17:45 ` Ferruh Yigit
@ 2017-02-24 4:35 ` Wan, Qun
1 sibling, 0 replies; 6+ messages in thread
From: Wan, Qun @ 2017-02-24 4:35 UTC (permalink / raw)
To: Choi, Sy Jong; +Cc: spp, Zhang, Yuwei1
Hi, Sy Jong
Does it need validation support?
Best Regards,
Anna
-----Original Message-----
From: spp [mailto:spp-bounces@dpdk.org] On Behalf Of Choi, Sy Jong
Sent: Thursday, February 23, 2017 9:21 PM
To: spp@dpdk.org
Subject: Re: [spp] SPP PCIe hotplug changes for SPP
Hi Everyone,
First patch to enable spp & primary to support port start/stop and attach/detach.
>From e58c90661f702276dfeae2fc1f3e43750fe2ae2c Mon Sep 17 00:00:00 2001
From: "Choi, Sy Jong" <sy.jong.choi@intel.com>
Date: Thu, 23 Feb 2017 12:54:50 +0800
Subject: [PATCH] Signed-off-by: Choi, Sy Jong <sy.jong.choi@intel.com>
spp: adding port start/stop detach/attach
primary: adding port start/stop detach/attach
---
src/primary/init.c | 2 +-
src/primary/init.h | 2 ++
src/primary/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++---
src/spp.py | 46 ++++++++++++++++++++++++---
4 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/src/primary/init.c b/src/primary/init.c index 5ea21f9..e5809e3 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -47,7 +47,7 @@
struct client *clients;
/* The mbuf pool for packet rx */
-static struct rte_mempool *pktmbuf_pool;
+struct rte_mempool *pktmbuf_pool;
/* the port details */
struct port_info *ports;
diff --git a/src/primary/init.h b/src/primary/init.h index 915552c..82602a2 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -56,6 +56,8 @@ struct client {
};
extern struct client *clients;
+/* The mbuf pool for packet rx */
+extern struct rte_mempool *pktmbuf_pool;
/* the shared port information: port numbers, rx and tx stats etc. */ extern struct port_info *ports; diff --git a/src/primary/main.c b/src/primary/main.c index 15fa53a..94cda18 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -185,9 +185,11 @@ static int
parse_command(char *str)
{
char *token_list[MAX_PARAMETER] = {NULL};
+ char name[RTE_ETH_NAME_MAX_LEN];
int ret = 0;
int i = 0;
-
+ uint8_t port_id = 255; //invalid port id
+
/* tokenize the user commands from controller */
token_list[i] = strtok(str, " ");
while (token_list[i] != NULL) {
@@ -205,6 +207,88 @@ parse_command(char *str)
else
sprintf(str, "Server Idling\n");
+ } else if (!strcmp(token_list[0], "port")) {
+ //RTE_LOG(INFO, APP, "port\n");
+ if (i <= 1) {
+ //RTE_LOG(INFO, APP, "i lesser 1\n");
+ return -1;
+ }
+ if (strcmp(token_list[1], "stop") == 0) {
+ if (i <= 2) {
+ //RTE_LOG(INFO, APP, "i lesser 2\n");
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ //RTE_LOG(INFO, APP, "port lesser 0\n");
+ return -1;
+ }
+ else {
+ rte_eth_dev_stop(port_id);
+ sprintf(str, "Port %d stopped\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "start") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (init_port(port_id, pktmbuf_pool) == 0)
+ sprintf(str, "Port %d started\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "close") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ rte_eth_dev_close(port_id);
+ sprintf(str, "Port %d closed\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "detach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_detach(port_id, name) == 0)
+ sprintf(str, "Port %d %s detached\n", port_id, name);
+ }
+ } else if (strcmp(token_list[1], "attach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ if (token_list[2] == NULL) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_attach(token_list[2], &port_id) == 0)
+ {
+ sprintf(str, "Port %d %s attached\n", port_id, name);
+ }
+ else
+ {
+ sprintf(str, "PCIe %s attached failed\n", name);
+ }
+ }
+ } else {
+ //RTE_LOG(INFO, APP, "else port\n");
+ ret = -1;
+ }
} else if (!strcmp(token_list[0], "exit")) {
RTE_LOG(DEBUG, APP, "exit\n");
RTE_LOG(DEBUG, APP, "stop\n");
@@ -322,15 +406,14 @@ main(int argc, char *argv[])
sleep(1);
continue;
}
-
ret = do_receive(&connected, &sock, str);
if (ret < 0)
continue;
-
+
RTE_LOG(DEBUG, APP, "Received string: %s\n", str);
ret = parse_command(str);
- if (ret < 0)
+ if (ret < 0)
break;
/* Send the message back to client */ diff --git a/src/spp.py b/src/spp.py index b937b5a..3da74fa 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -229,13 +229,44 @@ def close_all_secondary():
command_secondary(i, 'exit')
SECONDARY_COUNT = 0
+def check_pri_cmds(cmds):
+ """Validate primary commands before sending"""
+ level1 = ['status', 'exit', 'clear']
+ level2 = ['add', 'del', 'port']
+ add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
+ valid = 0
+ cmdlist = cmds.split(' ')
+
+ length = len(cmdlist)
+ if length == 1:
+ if cmdlist[0] in level1:
+ valid = 1
+ elif length == 3:
+ if cmdlist[0] in level2:
+ if cmdlist[0] == 'add' or cmdlist[0] == 'del':
+ if cmdlist[1] in add_del_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if cmdlist[1] != 'attach':
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ else:
+ if cmdlist[2]:
+ valid = 1
+
+ return valid
+
def check_sec_cmds(cmds):
"""Validate secondary commands before sending"""
- level1 = ['status', 'exit', 'forward', 'stop']
- level2 = ['add', 'patch', 'del']
+ level1 = ['status', 'exit', 'forward', 'stop', 'start']
+ level2 = ['add', 'patch', 'del', 'port']
patch_args = ['reset']
add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
cmdlist = cmds.split(' ')
valid = 0
@@ -256,7 +287,10 @@ def check_sec_cmds(cmds):
elif cmdlist[0] == 'patch':
if str.isdigit(cmdlist[1]) and str.isdigit(cmdlist[2]):
valid = 1
-
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
return valid
class Shell(cmd.Cmd):
@@ -267,7 +301,8 @@ class Shell(cmd.Cmd):
recorded_file = None
COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
- 'reset', 'exit', 'forward', 'stop', 'clear']
+ 'reset', 'exit', 'forward', 'stop', 'clear',
+ 'pause', 'start', 'port', 'detach']
def complete_pri(self, text, line, begidx, endidx):
"""Completion for primary process commands"""
@@ -301,7 +336,8 @@ class Shell(cmd.Cmd):
def do_pri(self, command):
"""Send command to primary process"""
- if command and command in self.COMMANDS:
+# if command and command in self.COMMANDS:
+ if check_pri_cmds(command):
command_primary(command)
else:
print ("primary invalid command")
--
1.8.3.1
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Monday, February 20, 2017 4:37 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: SPP PCIe hotplug changes for SPP
Hi Everyone,
New Architecture for SPP to support PCIe hotplug.
Based on DPDK testpmd here are the steps you need to perform PCIe hotplug
1) Detaching : port stop, port close and then port detach
2) Attaching : port attach and then port start
In order to support PCI hotplug, we need to follow DPDK. And here are a few limitation with SPP primary secondary configuration:-
Limitation 1:-
Port information created by primary, hotplug changes port information. So attach and detaching at primary, will not update port information on secondary process.
- Now primary will attaching and detaching the port, because primary owns the port
- We need to put in place some rediscovery in secondary processes.
Limitation 2:
To update the port information on the secondary process, it require to us to reinit dpdk eal, which dpdk eal init can only be executed once.
- Multi thread will not solve the problem.
- We will use fork, so we separated the communication part and the datapath part.
The new spp primary will attach/detach port, secondary will reinit to rediscover port changes.
+----+----------+-------------------------------------------------+
| | SPP NFV | |
| +----------+ +--------------+ fork +--------------+ |
| | Parent | | Child | |
| | Comm - spp.py| | dpdk | |
| | Commands | | init | |
| | share mem to | | fwd | |
| | control child| | | |
+-------------------+--------------+-----------+--------------+---+
Code changes will be posted in the following emails.
Regards,
Choi, Sy Jong
Platform Application Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [spp] SPP PCIe hotplug changes for SPP
@ 2017-04-25 8:02 Choi, Sy Jong
0 siblings, 0 replies; 6+ messages in thread
From: Choi, Sy Jong @ 2017-04-25 8:02 UTC (permalink / raw)
To: spp
Hi Everyone,
As PCIe hotplug occur, we need to restart the dpdk to rediscover NICs.
We need a new fork based nfv, and here it's capability:-
1) Start a communication main parent process.
2) Then start the DPDK child process, this will discover NICs.
3) If PCIe hotplug occur, stop and start DPDK child process, using spp.py.
4) Added a new "pause" command to pause packet forwarding.
Example execution:-
spp > sec 0;start (must run first, in order to fork dpdk handling)
recv:6:{start}
spp > sec 0;add vhost 0
recv:6:{add vhost 0}
spp > sec 0;patch 0 2
recv:6:{patch 0 2}
spp > sec 0;patch 2 1
recv:6:{patch 2 1}
spp > sec 1;patch 0 0
recv:7:{patch00}
spp > sec 1;forward
recv:7:{forward}
spp > sec 0;forward
recv:6:{forward}
spp > sec 0;stop (this will terminate the child process for sec 0)
recv:6:{stop}
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Tuesday, March 07, 2017 4:36 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: RE: SPP PCIe hotplug changes for SPP
Hi Everyone,
Second patch to add protection to primary for port start/stop and attach/detach.
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Thursday, February 23, 2017 9:21 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: RE: SPP PCIe hotplug changes for SPP
Hi Everyone,
First patch to enable spp & primary to support port start/stop and attach/detach.
>From e58c90661f702276dfeae2fc1f3e43750fe2ae2c Mon Sep 17 00:00:00 2001
From: "Choi, Sy Jong" <sy.jong.choi@intel.com>
Date: Thu, 23 Feb 2017 12:54:50 +0800
Subject: [PATCH] Signed-off-by: Choi, Sy Jong <sy.jong.choi@intel.com>
spp: adding port start/stop detach/attach
primary: adding port start/stop detach/attach
---
src/primary/init.c | 2 +-
src/primary/init.h | 2 ++
src/primary/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++---
src/spp.py | 46 ++++++++++++++++++++++++---
4 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/src/primary/init.c b/src/primary/init.c index 5ea21f9..e5809e3 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -47,7 +47,7 @@
struct client *clients;
/* The mbuf pool for packet rx */
-static struct rte_mempool *pktmbuf_pool;
+struct rte_mempool *pktmbuf_pool;
/* the port details */
struct port_info *ports;
diff --git a/src/primary/init.h b/src/primary/init.h index 915552c..82602a2 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -56,6 +56,8 @@ struct client {
};
extern struct client *clients;
+/* The mbuf pool for packet rx */
+extern struct rte_mempool *pktmbuf_pool;
/* the shared port information: port numbers, rx and tx stats etc. */ extern struct port_info *ports; diff --git a/src/primary/main.c b/src/primary/main.c index 15fa53a..94cda18 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -185,9 +185,11 @@ static int
parse_command(char *str)
{
char *token_list[MAX_PARAMETER] = {NULL};
+ char name[RTE_ETH_NAME_MAX_LEN];
int ret = 0;
int i = 0;
-
+ uint8_t port_id = 255; //invalid port id
+
/* tokenize the user commands from controller */
token_list[i] = strtok(str, " ");
while (token_list[i] != NULL) {
@@ -205,6 +207,88 @@ parse_command(char *str)
else
sprintf(str, "Server Idling\n");
+ } else if (!strcmp(token_list[0], "port")) {
+ //RTE_LOG(INFO, APP, "port\n");
+ if (i <= 1) {
+ //RTE_LOG(INFO, APP, "i lesser 1\n");
+ return -1;
+ }
+ if (strcmp(token_list[1], "stop") == 0) {
+ if (i <= 2) {
+ //RTE_LOG(INFO, APP, "i lesser 2\n");
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ //RTE_LOG(INFO, APP, "port lesser 0\n");
+ return -1;
+ }
+ else {
+ rte_eth_dev_stop(port_id);
+ sprintf(str, "Port %d stopped\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "start") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (init_port(port_id, pktmbuf_pool) == 0)
+ sprintf(str, "Port %d started\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "close") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ rte_eth_dev_close(port_id);
+ sprintf(str, "Port %d closed\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "detach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_detach(port_id, name) == 0)
+ sprintf(str, "Port %d %s detached\n", port_id, name);
+ }
+ } else if (strcmp(token_list[1], "attach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ if (token_list[2] == NULL) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_attach(token_list[2], &port_id) == 0)
+ {
+ sprintf(str, "Port %d %s attached\n", port_id, name);
+ }
+ else
+ {
+ sprintf(str, "PCIe %s attached failed\n", name);
+ }
+ }
+ } else {
+ //RTE_LOG(INFO, APP, "else port\n");
+ ret = -1;
+ }
} else if (!strcmp(token_list[0], "exit")) {
RTE_LOG(DEBUG, APP, "exit\n");
RTE_LOG(DEBUG, APP, "stop\n");
@@ -322,15 +406,14 @@ main(int argc, char *argv[])
sleep(1);
continue;
}
-
ret = do_receive(&connected, &sock, str);
if (ret < 0)
continue;
-
+
RTE_LOG(DEBUG, APP, "Received string: %s\n", str);
ret = parse_command(str);
- if (ret < 0)
+ if (ret < 0)
break;
/* Send the message back to client */ diff --git a/src/spp.py b/src/spp.py index b937b5a..3da74fa 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -229,13 +229,44 @@ def close_all_secondary():
command_secondary(i, 'exit')
SECONDARY_COUNT = 0
+def check_pri_cmds(cmds):
+ """Validate primary commands before sending"""
+ level1 = ['status', 'exit', 'clear']
+ level2 = ['add', 'del', 'port']
+ add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
+ valid = 0
+ cmdlist = cmds.split(' ')
+
+ length = len(cmdlist)
+ if length == 1:
+ if cmdlist[0] in level1:
+ valid = 1
+ elif length == 3:
+ if cmdlist[0] in level2:
+ if cmdlist[0] == 'add' or cmdlist[0] == 'del':
+ if cmdlist[1] in add_del_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if cmdlist[1] != 'attach':
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ else:
+ if cmdlist[2]:
+ valid = 1
+
+ return valid
+
def check_sec_cmds(cmds):
"""Validate secondary commands before sending"""
- level1 = ['status', 'exit', 'forward', 'stop']
- level2 = ['add', 'patch', 'del']
+ level1 = ['status', 'exit', 'forward', 'stop', 'start']
+ level2 = ['add', 'patch', 'del', 'port']
patch_args = ['reset']
add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
cmdlist = cmds.split(' ')
valid = 0
@@ -256,7 +287,10 @@ def check_sec_cmds(cmds):
elif cmdlist[0] == 'patch':
if str.isdigit(cmdlist[1]) and str.isdigit(cmdlist[2]):
valid = 1
-
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
return valid
class Shell(cmd.Cmd):
@@ -267,7 +301,8 @@ class Shell(cmd.Cmd):
recorded_file = None
COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
- 'reset', 'exit', 'forward', 'stop', 'clear']
+ 'reset', 'exit', 'forward', 'stop', 'clear',
+ 'pause', 'start', 'port', 'detach']
def complete_pri(self, text, line, begidx, endidx):
"""Completion for primary process commands"""
@@ -301,7 +336,8 @@ class Shell(cmd.Cmd):
def do_pri(self, command):
"""Send command to primary process"""
- if command and command in self.COMMANDS:
+# if command and command in self.COMMANDS:
+ if check_pri_cmds(command):
command_primary(command)
else:
print ("primary invalid command")
--
1.8.3.1
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Monday, February 20, 2017 4:37 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: SPP PCIe hotplug changes for SPP
Hi Everyone,
New Architecture for SPP to support PCIe hotplug.
Based on DPDK testpmd here are the steps you need to perform PCIe hotplug
1) Detaching : port stop, port close and then port detach
2) Attaching : port attach and then port start
In order to support PCI hotplug, we need to follow DPDK. And here are a few limitation with SPP primary secondary configuration:-
Limitation 1:-
Port information created by primary, hotplug changes port information. So attach and detaching at primary, will not update port information on secondary process.
- Now primary will attaching and detaching the port, because primary owns the port
- We need to put in place some rediscovery in secondary processes.
Limitation 2:
To update the port information on the secondary process, it require to us to reinit dpdk eal, which dpdk eal init can only be executed once.
- Multi thread will not solve the problem.
- We will use fork, so we separated the communication part and the datapath part.
The new spp primary will attach/detach port, secondary will reinit to rediscover port changes.
+----+----------+-------------------------------------------------+
| | SPP NFV | |
| +----------+ +--------------+ fork +--------------+ |
| | Parent | | Child | |
| | Comm - spp.py| | dpdk | |
| | Commands | | init | |
| | share mem to | | fwd | |
| | control child| | | |
+-------------------+--------------+-----------+--------------+---+
Code changes will be posted in the following emails.
Regards,
Choi, Sy Jong
Platform Application Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [spp] SPP PCIe hotplug changes for SPP
@ 2017-03-07 8:36 Choi, Sy Jong
0 siblings, 0 replies; 6+ messages in thread
From: Choi, Sy Jong @ 2017-03-07 8:36 UTC (permalink / raw)
To: spp
Hi Everyone,
Second patch to add protection to primary for port start/stop and attach/detach.
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Thursday, February 23, 2017 9:21 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: RE: SPP PCIe hotplug changes for SPP
Hi Everyone,
First patch to enable spp & primary to support port start/stop and attach/detach.
>From e58c90661f702276dfeae2fc1f3e43750fe2ae2c Mon Sep 17 00:00:00 2001
From: "Choi, Sy Jong" <sy.jong.choi@intel.com>
Date: Thu, 23 Feb 2017 12:54:50 +0800
Subject: [PATCH] Signed-off-by: Choi, Sy Jong <sy.jong.choi@intel.com>
spp: adding port start/stop detach/attach
primary: adding port start/stop detach/attach
---
src/primary/init.c | 2 +-
src/primary/init.h | 2 ++
src/primary/main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++---
src/spp.py | 46 ++++++++++++++++++++++++---
4 files changed, 131 insertions(+), 10 deletions(-)
diff --git a/src/primary/init.c b/src/primary/init.c index 5ea21f9..e5809e3 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -47,7 +47,7 @@
struct client *clients;
/* The mbuf pool for packet rx */
-static struct rte_mempool *pktmbuf_pool;
+struct rte_mempool *pktmbuf_pool;
/* the port details */
struct port_info *ports;
diff --git a/src/primary/init.h b/src/primary/init.h index 915552c..82602a2 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -56,6 +56,8 @@ struct client {
};
extern struct client *clients;
+/* The mbuf pool for packet rx */
+extern struct rte_mempool *pktmbuf_pool;
/* the shared port information: port numbers, rx and tx stats etc. */ extern struct port_info *ports; diff --git a/src/primary/main.c b/src/primary/main.c index 15fa53a..94cda18 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -185,9 +185,11 @@ static int
parse_command(char *str)
{
char *token_list[MAX_PARAMETER] = {NULL};
+ char name[RTE_ETH_NAME_MAX_LEN];
int ret = 0;
int i = 0;
-
+ uint8_t port_id = 255; //invalid port id
+
/* tokenize the user commands from controller */
token_list[i] = strtok(str, " ");
while (token_list[i] != NULL) {
@@ -205,6 +207,88 @@ parse_command(char *str)
else
sprintf(str, "Server Idling\n");
+ } else if (!strcmp(token_list[0], "port")) {
+ //RTE_LOG(INFO, APP, "port\n");
+ if (i <= 1) {
+ //RTE_LOG(INFO, APP, "i lesser 1\n");
+ return -1;
+ }
+ if (strcmp(token_list[1], "stop") == 0) {
+ if (i <= 2) {
+ //RTE_LOG(INFO, APP, "i lesser 2\n");
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ //RTE_LOG(INFO, APP, "port lesser 0\n");
+ return -1;
+ }
+ else {
+ rte_eth_dev_stop(port_id);
+ sprintf(str, "Port %d stopped\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "start") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (init_port(port_id, pktmbuf_pool) == 0)
+ sprintf(str, "Port %d started\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "close") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ rte_eth_dev_close(port_id);
+ sprintf(str, "Port %d closed\n", port_id);
+ }
+ } else if (strcmp(token_list[1], "detach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ port_id = atoi(token_list[2]);
+ if (port_id == 255) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_detach(port_id, name) == 0)
+ sprintf(str, "Port %d %s detached\n", port_id, name);
+ }
+ } else if (strcmp(token_list[1], "attach") == 0) {
+ if (i <= 2) {
+ return -1;
+ }
+
+ if (token_list[2] == NULL) {
+ return -1;
+ }
+ else {
+ if (rte_eth_dev_attach(token_list[2], &port_id) == 0)
+ {
+ sprintf(str, "Port %d %s attached\n", port_id, name);
+ }
+ else
+ {
+ sprintf(str, "PCIe %s attached failed\n", name);
+ }
+ }
+ } else {
+ //RTE_LOG(INFO, APP, "else port\n");
+ ret = -1;
+ }
} else if (!strcmp(token_list[0], "exit")) {
RTE_LOG(DEBUG, APP, "exit\n");
RTE_LOG(DEBUG, APP, "stop\n");
@@ -322,15 +406,14 @@ main(int argc, char *argv[])
sleep(1);
continue;
}
-
ret = do_receive(&connected, &sock, str);
if (ret < 0)
continue;
-
+
RTE_LOG(DEBUG, APP, "Received string: %s\n", str);
ret = parse_command(str);
- if (ret < 0)
+ if (ret < 0)
break;
/* Send the message back to client */ diff --git a/src/spp.py b/src/spp.py index b937b5a..3da74fa 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -229,13 +229,44 @@ def close_all_secondary():
command_secondary(i, 'exit')
SECONDARY_COUNT = 0
+def check_pri_cmds(cmds):
+ """Validate primary commands before sending"""
+ level1 = ['status', 'exit', 'clear']
+ level2 = ['add', 'del', 'port']
+ add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
+ valid = 0
+ cmdlist = cmds.split(' ')
+
+ length = len(cmdlist)
+ if length == 1:
+ if cmdlist[0] in level1:
+ valid = 1
+ elif length == 3:
+ if cmdlist[0] in level2:
+ if cmdlist[0] == 'add' or cmdlist[0] == 'del':
+ if cmdlist[1] in add_del_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if cmdlist[1] != 'attach':
+ if str.isdigit(cmdlist[2]):
+ valid = 1
+ else:
+ if cmdlist[2]:
+ valid = 1
+
+ return valid
+
def check_sec_cmds(cmds):
"""Validate secondary commands before sending"""
- level1 = ['status', 'exit', 'forward', 'stop']
- level2 = ['add', 'patch', 'del']
+ level1 = ['status', 'exit', 'forward', 'stop', 'start']
+ level2 = ['add', 'patch', 'del', 'port']
patch_args = ['reset']
add_del_args = ['ring', 'vhost']
+ port_args = ['stop', 'detach', 'start', 'attach', 'close']
cmdlist = cmds.split(' ')
valid = 0
@@ -256,7 +287,10 @@ def check_sec_cmds(cmds):
elif cmdlist[0] == 'patch':
if str.isdigit(cmdlist[1]) and str.isdigit(cmdlist[2]):
valid = 1
-
+ elif cmdlist[0] == 'port':
+ if cmdlist[1] in port_args:
+ if str.isdigit(cmdlist[2]):
+ valid = 1
return valid
class Shell(cmd.Cmd):
@@ -267,7 +301,8 @@ class Shell(cmd.Cmd):
recorded_file = None
COMMANDS = ['status', 'add', 'patch', 'ring', 'vhost',
- 'reset', 'exit', 'forward', 'stop', 'clear']
+ 'reset', 'exit', 'forward', 'stop', 'clear',
+ 'pause', 'start', 'port', 'detach']
def complete_pri(self, text, line, begidx, endidx):
"""Completion for primary process commands"""
@@ -301,7 +336,8 @@ class Shell(cmd.Cmd):
def do_pri(self, command):
"""Send command to primary process"""
- if command and command in self.COMMANDS:
+# if command and command in self.COMMANDS:
+ if check_pri_cmds(command):
command_primary(command)
else:
print ("primary invalid command")
--
1.8.3.1
Regards,
Choi, Sy Jong
Platform Application Engineer
-----Original Message-----
From: Choi, Sy Jong
Sent: Monday, February 20, 2017 4:37 PM
To: 'spp@dpdk.org' <spp@dpdk.org>
Subject: SPP PCIe hotplug changes for SPP
Hi Everyone,
New Architecture for SPP to support PCIe hotplug.
Based on DPDK testpmd here are the steps you need to perform PCIe hotplug
1) Detaching : port stop, port close and then port detach
2) Attaching : port attach and then port start
In order to support PCI hotplug, we need to follow DPDK. And here are a few limitation with SPP primary secondary configuration:-
Limitation 1:-
Port information created by primary, hotplug changes port information. So attach and detaching at primary, will not update port information on secondary process.
- Now primary will attaching and detaching the port, because primary owns the port
- We need to put in place some rediscovery in secondary processes.
Limitation 2:
To update the port information on the secondary process, it require to us to reinit dpdk eal, which dpdk eal init can only be executed once.
- Multi thread will not solve the problem.
- We will use fork, so we separated the communication part and the datapath part.
The new spp primary will attach/detach port, secondary will reinit to rediscover port changes.
+----+----------+-------------------------------------------------+
| | SPP NFV | |
| +----------+ +--------------+ fork +--------------+ |
| | Parent | | Child | |
| | Comm - spp.py| | dpdk | |
| | Commands | | init | |
| | share mem to | | fwd | |
| | control child| | | |
+-------------------+--------------+-----------+--------------+---+
Code changes will be posted in the following emails.
Regards,
Choi, Sy Jong
Platform Application Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
* [spp] SPP PCIe hotplug changes for SPP
@ 2017-02-20 8:37 Choi, Sy Jong
0 siblings, 0 replies; 6+ messages in thread
From: Choi, Sy Jong @ 2017-02-20 8:37 UTC (permalink / raw)
To: spp
Hi Everyone,
New Architecture for SPP to support PCIe hotplug.
Based on DPDK testpmd here are the steps you need to perform PCIe hotplug
1) Detaching : port stop, port close and then port detach
2) Attaching : port attach and then port start
In order to support PCI hotplug, we need to follow DPDK. And here are a few limitation with SPP primary secondary configuration:-
Limitation 1:-
Port information created by primary, hotplug changes port information. So attach and detaching at primary, will not update port information on secondary process.
- Now primary will attaching and detaching the port, because primary owns the port
- We need to put in place some rediscovery in secondary processes.
Limitation 2:
To update the port information on the secondary process, it require to us to reinit dpdk eal, which dpdk eal init can only be executed once.
- Multi thread will not solve the problem.
- We will use fork, so we separated the communication part and the datapath part.
The new spp primary will attach/detach port, secondary will reinit to rediscover port changes.
+----+----------+-------------------------------------------------+
| | SPP NFV | |
| +----------+ +--------------+ fork +--------------+ |
| | Parent | | Child | |
| | Comm - spp.py| | dpdk | |
| | Commands | | init | |
| | share mem to | | fwd | |
| | control child| | | |
+-------------------+--------------+-----------+--------------+---+
Code changes will be posted in the following emails.
Regards,
Choi, Sy Jong
Platform Application Engineer
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-25 8:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-23 13:21 [spp] SPP PCIe hotplug changes for SPP Choi, Sy Jong
2017-02-23 17:45 ` Ferruh Yigit
2017-02-24 4:35 ` Wan, Qun
-- strict thread matches above, loose matches on Subject: below --
2017-04-25 8:02 Choi, Sy Jong
2017-03-07 8:36 Choi, Sy Jong
2017-02-20 8:37 Choi, Sy Jong
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).