* [spp] [PATCH 1/2] shared/sec: move append_classifier_element_value
2019-06-24 7:10 [spp] [PATCH 0/2] Move spp_vf specific funcs from shared yasufum.o
@ 2019-06-24 7:10 ` yasufum.o
2019-06-24 7:10 ` [spp] [PATCH 2/2] shared/sec: move func add_classifier_table yasufum.o
1 sibling, 0 replies; 3+ messages in thread
From: yasufum.o @ 2019-06-24 7:10 UTC (permalink / raw)
To: spp, ferruh.yigit, yasufum.o
From: Yasufumi Ogawa <yasufum.o@gmail.com>
This update is to move append_classifier_element_value() from shared dir
to spp_vf's dir because this functions is for spp_vf.
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
.../spp_worker_th/cmd_res_formatter.c | 71 -------------------
.../spp_worker_th/cmd_res_formatter.h | 6 --
src/vf/vf_cmd_runner.c | 70 ++++++++++++++++++
3 files changed, 70 insertions(+), 77 deletions(-)
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 f389939..a0c22d2 100644
--- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c
+++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c
@@ -48,18 +48,6 @@ const char *PORT_ABILITY_STAT_LIST[] = {
"", /* termination */
};
-/**
- * List of classifier type. The order of items should be same as the order of
- * enum `spp_classifier_type` defined in cmd_utils.h.
- */
-/* TODO(yasufum) fix similar var in cmd_parser.c */
-const char *CLS_TYPE_A_LIST[] = {
- "none",
- "mac",
- "vlan",
- "", /* termination */
-};
-
/* command response result string list */
struct cmd_response response_result_list[] = {
{ "result", append_result_value },
@@ -402,65 +390,6 @@ append_core_element_value(
return ret;
}
-#ifdef SPP_VF_MODULE
-/**
- * Operator function called in iterator for getting each of entries of
- * classifier table named as iterate_adding_mac_entry().
- */
-int
-append_classifier_element_value(
- struct spp_iterate_classifier_table_params *params,
- enum spp_classifier_type type,
- int vid, const char *mac,
- const struct sppwk_port_idx *port)
-{
- int ret = SPP_RET_NG;
- char *buff, *tmp_buff;
- char port_str[CMD_TAG_APPEND_SIZE];
- char value_str[STR_LEN_SHORT];
- buff = params->output;
- tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE);
- if (unlikely(tmp_buff == NULL)) {
- RTE_LOG(ERR, WK_CMD_RES_FMT,
- /* TODO(yasufum) refactor no meaning err msg */
- "allocate error. (name = classifier_table)\n");
- return ret;
- }
-
- spp_format_port_string(port_str, port->iface_type, port->iface_no);
-
- ret = append_json_str_value(&tmp_buff, "type", CLS_TYPE_A_LIST[type]);
- if (unlikely(ret < SPP_RET_OK))
- return ret;
-
- memset(value_str, 0x00, STR_LEN_SHORT);
- switch (type) {
- case SPP_CLASSIFIER_TYPE_MAC:
- sprintf(value_str, "%s", mac);
- break;
- case SPP_CLASSIFIER_TYPE_VLAN:
- sprintf(value_str, "%d/%s", vid, mac);
- break;
- default:
- /* not used */
- break;
- }
-
- ret = append_json_str_value(&tmp_buff, "value", value_str);
- if (unlikely(ret < 0))
- return ret;
-
- ret = append_json_str_value(&tmp_buff, "port", port_str);
- if (unlikely(ret < SPP_RET_OK))
- return ret;
-
- ret = append_json_block_brackets(&buff, "", tmp_buff);
- spp_strbuf_free(tmp_buff);
- params->output = buff;
- return ret;
-}
-#endif /* SPP_VF_MODULE */
-
/* append string of command response list for JSON format */
int
append_response_list_value(char **output, struct cmd_response *responses,
diff --git a/src/shared/secondary/spp_worker_th/cmd_res_formatter.h b/src/shared/secondary/spp_worker_th/cmd_res_formatter.h
index cf5f81b..6ae2c5d 100644
--- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.h
+++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.h
@@ -56,12 +56,6 @@ int append_core_element_value(struct spp_iterate_core_params *params,
const int num_rx, const struct sppwk_port_idx *rx_ports,
const int num_tx, const struct sppwk_port_idx *tx_ports);
-int append_classifier_element_value(
- struct spp_iterate_classifier_table_params *params,
- enum spp_classifier_type type,
- int vid, const char *mac,
- const struct sppwk_port_idx *port);
-
int append_response_list_value(char **output, struct cmd_response *responses,
void *tmp);
diff --git a/src/vf/vf_cmd_runner.c b/src/vf/vf_cmd_runner.c
index c7d34a6..ecb36ff 100644
--- a/src/vf/vf_cmd_runner.c
+++ b/src/vf/vf_cmd_runner.c
@@ -14,6 +14,18 @@
#define RTE_LOGTYPE_VF_CMD_RUNNER RTE_LOGTYPE_USER1
+/**
+ * List of classifier type. The order of items should be same as the order of
+ * enum `spp_classifier_type` defined in cmd_utils.h.
+ */
+/* TODO(yasufum) fix similar var in cmd_parser.c */
+const char *CLS_TYPE_A_LIST[] = {
+ "none",
+ "mac",
+ "vlan",
+ "", /* termination */
+};
+
/* Update classifier table with given action, add or del. */
static int
update_cls_table(enum sppwk_action wk_action,
@@ -536,7 +548,65 @@ update_comp_info(struct sppwk_comp_info *p_comp_info, int *p_change_comp)
return SPP_RET_OK;
}
+/**
+ * Operator function called in iterator for getting each of entries of
+ * classifier table named as iterate_adding_mac_entry().
+ */
+int
+append_classifier_element_value(
+ struct spp_iterate_classifier_table_params *params,
+ enum spp_classifier_type type,
+ int vid, const char *mac,
+ const struct sppwk_port_idx *port)
+{
+ int ret = SPP_RET_NG;
+ char *buff, *tmp_buff;
+ char port_str[CMD_TAG_APPEND_SIZE];
+ char value_str[STR_LEN_SHORT];
+ buff = params->output;
+ tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE);
+ if (unlikely(tmp_buff == NULL)) {
+ RTE_LOG(ERR, VF_CMD_RUNNER,
+ /* TODO(yasufum) refactor no meaning err msg */
+ "allocate error. (name = classifier_table)\n");
+ return ret;
+ }
+
+ spp_format_port_string(port_str, port->iface_type, port->iface_no);
+
+ ret = append_json_str_value(&tmp_buff, "type", CLS_TYPE_A_LIST[type]);
+ if (unlikely(ret < SPP_RET_OK))
+ return ret;
+
+ memset(value_str, 0x00, STR_LEN_SHORT);
+ switch (type) {
+ case SPP_CLASSIFIER_TYPE_MAC:
+ sprintf(value_str, "%s", mac);
+ break;
+ case SPP_CLASSIFIER_TYPE_VLAN:
+ sprintf(value_str, "%d/%s", vid, mac);
+ break;
+ default:
+ /* not used */
+ break;
+ }
+
+ ret = append_json_str_value(&tmp_buff, "value", value_str);
+ if (unlikely(ret < 0))
+ return ret;
+
+ ret = append_json_str_value(&tmp_buff, "port", port_str);
+ if (unlikely(ret < SPP_RET_OK))
+ return ret;
+
+ ret = append_json_block_brackets(&buff, "", tmp_buff);
+ spp_strbuf_free(tmp_buff);
+ params->output = buff;
+ return ret;
+}
+
/* Get component type from string of its name. */
+/* TODO(yasufum) consider to create and move to vf_cmd_parser.c */
enum sppwk_worker_type
get_comp_type_from_str(const char *type_str)
{
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [spp] [PATCH 2/2] shared/sec: move func add_classifier_table
2019-06-24 7:10 [spp] [PATCH 0/2] Move spp_vf specific funcs from shared yasufum.o
2019-06-24 7:10 ` [spp] [PATCH 1/2] shared/sec: move append_classifier_element_value yasufum.o
@ 2019-06-24 7:10 ` yasufum.o
1 sibling, 0 replies; 3+ messages in thread
From: yasufum.o @ 2019-06-24 7:10 UTC (permalink / raw)
To: spp, ferruh.yigit, yasufum.o
From: Yasufumi Ogawa <yasufum.o@gmail.com>
This update is to move add_classifier_table() from shared dir to
`classifier_mac.c` because this functions is not shared function.
Signed-off-by: Yasufumi Ogawa <yasufum.o@gmail.com>
---
.../spp_worker_th/cmd_res_formatter.c | 55 ------------------
src/shared/secondary/spp_worker_th/vf_deps.h | 9 +++
src/vf/classifier_mac.c | 57 +++++++++++++++++++
src/vf/vf_cmd_runner.c | 1 -
4 files changed, 66 insertions(+), 56 deletions(-)
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 a0c22d2..e4912d6 100644
--- a/src/shared/secondary/spp_worker_th/cmd_res_formatter.c
+++ b/src/shared/secondary/spp_worker_th/cmd_res_formatter.c
@@ -615,58 +615,3 @@ add_master_lcore(const char *name, char **output,
return ret;
}
-#ifdef SPP_VF_MODULE
-/* Iterate classifier_table to create response to status command */
-static int
-_add_classifier_table(
- struct spp_iterate_classifier_table_params *params)
-{
- int ret;
-
- ret = add_classifier_table_val(params);
- if (unlikely(ret != 0)) {
- RTE_LOG(ERR, WK_CMD_RES_FMT,
- "Cannot iterate classifier_mac_table.\n");
- return SPP_RET_NG;
- }
-
- return SPP_RET_OK;
-}
-
-/**
- * Add entries of classifier table in JSON. Before iterating the entries,
- * this function calls several nested functions.
- * add_classifier_table() // This function.
- * -> _add_classifier_table() // Wrapper and doesn't almost nothing.
- * -> add_classifier_table_val() // Setup data and call iterator.
- * -> iterate_adding_mac_entry()
- */
-int
-add_classifier_table(const char *name, char **output,
- void *tmp __attribute__ ((unused)))
-{
- int ret = SPP_RET_NG;
- struct spp_iterate_classifier_table_params itr_params;
- char *tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE);
- if (unlikely(tmp_buff == NULL)) {
- RTE_LOG(ERR, WK_CMD_RES_FMT,
- /* TODO(yasufum) refactor no meaning err msg */
- "allocate error. (name = %s)\n",
- name);
- return SPP_RET_NG;
- }
-
- itr_params.output = tmp_buff;
- itr_params.element_proc = append_classifier_element_value;
-
- ret = _add_classifier_table(&itr_params);
- if (unlikely(ret != SPP_RET_OK)) {
- spp_strbuf_free(itr_params.output);
- return SPP_RET_NG;
- }
-
- ret = append_json_array_brackets(output, name, itr_params.output);
- spp_strbuf_free(itr_params.output);
- return ret;
-}
-#endif /* SPP_VF_MODULE */
diff --git a/src/shared/secondary/spp_worker_th/vf_deps.h b/src/shared/secondary/spp_worker_th/vf_deps.h
index 7d77e87..72a6960 100644
--- a/src/shared/secondary/spp_worker_th/vf_deps.h
+++ b/src/shared/secondary/spp_worker_th/vf_deps.h
@@ -100,6 +100,15 @@ int add_classifier_table_val(
*/
int update_comp_info(struct sppwk_comp_info *p_comp_info, int *p_change_comp);
+int append_classifier_element_value(
+ struct spp_iterate_classifier_table_params *params,
+ enum spp_classifier_type type,
+ int vid, const char *mac,
+ const struct sppwk_port_idx *port);
+
+int add_classifier_table(const char *name, char **output,
+ void *tmp __attribute__ ((unused)));
+
enum sppwk_worker_type get_comp_type_from_str(const char *type_str);
#endif /* _SPPWK_TH_VF_DEPS_H_ */
diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c
index 6d8e664..4387fd5 100644
--- a/src/vf/classifier_mac.c
+++ b/src/vf/classifier_mac.c
@@ -24,6 +24,9 @@
#include "classifier_mac.h"
#include "spp_vf.h"
#include "shared/secondary/return_codes.h"
+#include "shared/secondary/string_buffer.h"
+#include "shared/secondary/json_helper.h"
+#include "shared/secondary/spp_worker_th/cmd_res_formatter.h"
#include "shared/secondary/spp_worker_th/vf_deps.h"
#include "shared/secondary/spp_worker_th/spp_port.h"
@@ -956,3 +959,57 @@ add_classifier_table_val(
return SPP_RET_OK;
}
+
+/* Iterate classifier_table to create response to status command */
+static int
+_add_classifier_table(
+ struct spp_iterate_classifier_table_params *params)
+{
+ int ret;
+
+ ret = add_classifier_table_val(params);
+ if (unlikely(ret != 0)) {
+ RTE_LOG(ERR, SPP_CLASSIFIER_MAC,
+ "Cannot iterate classifier_mac_table.\n");
+ return SPP_RET_NG;
+ }
+
+ return SPP_RET_OK;
+}
+
+/**
+ * Add entries of classifier table in JSON. Before iterating the entries,
+ * this function calls several nested functions.
+ * add_classifier_table() // This function.
+ * -> _add_classifier_table() // Wrapper and doesn't almost nothing.
+ * -> add_classifier_table_val() // Setup data and call iterator.
+ * -> iterate_adding_mac_entry()
+ */
+int
+add_classifier_table(const char *name, char **output,
+ void *tmp __attribute__ ((unused)))
+{
+ int ret = SPP_RET_NG;
+ struct spp_iterate_classifier_table_params itr_params;
+ char *tmp_buff = spp_strbuf_allocate(CMD_RES_BUF_INIT_SIZE);
+ if (unlikely(tmp_buff == NULL)) {
+ RTE_LOG(ERR, SPP_CLASSIFIER_MAC,
+ /* TODO(yasufum) refactor no meaning err msg */
+ "allocate error. (name = %s)\n",
+ name);
+ return SPP_RET_NG;
+ }
+
+ itr_params.output = tmp_buff;
+ itr_params.element_proc = append_classifier_element_value;
+
+ ret = _add_classifier_table(&itr_params);
+ if (unlikely(ret != SPP_RET_OK)) {
+ spp_strbuf_free(itr_params.output);
+ return SPP_RET_NG;
+ }
+
+ ret = append_json_array_brackets(output, name, itr_params.output);
+ spp_strbuf_free(itr_params.output);
+ return ret;
+}
diff --git a/src/vf/vf_cmd_runner.c b/src/vf/vf_cmd_runner.c
index ecb36ff..4c75b7e 100644
--- a/src/vf/vf_cmd_runner.c
+++ b/src/vf/vf_cmd_runner.c
@@ -5,7 +5,6 @@
#include "classifier_mac.h"
#include "spp_forward.h"
#include "shared/secondary/return_codes.h"
-#include "shared/secondary/string_buffer.h"
#include "shared/secondary/json_helper.h"
#include "shared/secondary/spp_worker_th/cmd_parser.h"
#include "shared/secondary/spp_worker_th/cmd_runner.h"
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread