[PATCH 1/4] net/cpfl: parse flow parser file in devargs

[Wenjing Qiao]

Add devargs "flow_parser" for rte_flow json parser.

Signed-off-by: Wenjing Qiao <wenjing.q...@intel.com>
---
 drivers/net/cpfl/cpfl_ethdev.c | 30 +++++++++++++++++++++++++++++-
 drivers/net/cpfl/cpfl_ethdev.h |  3 +++
 drivers/net/cpfl/meson.build   |  6 ++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c
index 8dbc175749..a2f308fb86 100644
--- a/drivers/net/cpfl/cpfl_ethdev.c
+++ b/drivers/net/cpfl/cpfl_ethdev.c
@@ -21,6 +21,7 @@
 #define CPFL_TX_SINGLE_Q       "tx_single"
 #define CPFL_RX_SINGLE_Q       "rx_single"
 #define CPFL_VPORT             "vport"
+#define CPFL_FLOW_PARSER       "flow_parser"
 
 rte_spinlock_t cpfl_adapter_lock;
 /* A list for all adapters, one adapter matches one PCI device */
@@ -32,6 +33,9 @@ static const char * const cpfl_valid_args_first[] = {
        CPFL_TX_SINGLE_Q,
        CPFL_RX_SINGLE_Q,
        CPFL_VPORT,
+#ifdef CPFL_FLOW_JSON_SUPPORT
+       CPFL_FLOW_PARSER,
+#endif
        NULL
 };
 
@@ -1671,6 +1675,19 @@ parse_repr(const char *key __rte_unused, const char 
*value, void *args)
        return 0;
 }
 
+#ifdef CPFL_FLOW_JSON_SUPPORT
+static int
+parse_parser_file(const char *key, const char *value, void *args)
+{
+       char *name = args;
+
+       PMD_DRV_LOG(DEBUG, "value:\"%s\" for key:\"%s\"", value, key);
+       strlcpy(name, value, CPFL_FLOW_FILE_LEN);
+
+       return 0;
+}
+#endif
+
 static int
 cpfl_parse_devargs(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext 
*adapter, bool first)
 {
@@ -1719,7 +1736,18 @@ cpfl_parse_devargs(struct rte_pci_device *pci_dev, 
struct cpfl_adapter_ext *adap
                                 &adapter->base.is_rx_singleq);
        if (ret != 0)
                goto fail;
-
+#ifdef CPFL_FLOW_JSON_SUPPORT
+       if (rte_kvargs_get(kvlist, CPFL_FLOW_PARSER)) {
+               ret = rte_kvargs_process(kvlist, CPFL_FLOW_PARSER,
+                                        &parse_parser_file, 
cpfl_args->flow_parser);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Failed to parser flow_parser, ret: 
%d", ret);
+                       goto fail;
+               }
+       } else {
+               cpfl_args->flow_parser[0] = '\0';
+       }
+#endif
 fail:
        rte_kvargs_free(kvlist);
        return ret;
diff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h
index 5bd6f930b8..cf989a29b3 100644
--- a/drivers/net/cpfl/cpfl_ethdev.h
+++ b/drivers/net/cpfl/cpfl_ethdev.h
@@ -87,6 +87,8 @@
 #define ACC_LCE_ID     15
 #define IMC_MBX_EFD_ID 0
 
+#define CPFL_FLOW_FILE_LEN 100
+
 struct cpfl_vport_param {
        struct cpfl_adapter_ext *adapter;
        uint16_t devarg_id; /* arg id from user */
@@ -100,6 +102,7 @@ struct cpfl_devargs {
        uint16_t req_vport_nb;
        uint8_t repr_args_num;
        struct rte_eth_devargs repr_args[CPFL_REPR_ARG_NUM_MAX];
+       char flow_parser[CPFL_FLOW_FILE_LEN];
 };
 
 struct p2p_queue_chunks_info {
diff --git a/drivers/net/cpfl/meson.build b/drivers/net/cpfl/meson.build
index fb075c6860..0be25512c3 100644
--- a/drivers/net/cpfl/meson.build
+++ b/drivers/net/cpfl/meson.build
@@ -38,3 +38,9 @@ if arch_subdir == 'x86'
         cflags += ['-DCC_AVX512_SUPPORT']
     endif
 endif
+
+js_dep = dependency('json-c', required: false, method : 'pkg-config')
+if js_dep.found()
+    dpdk_conf.set('CPFL_FLOW_JSON_SUPPORT', true)
+    ext_deps += js_dep
+endif
\ No newline at end of file
-- 
2.34.1