examples/ip_pipeline: add pcap file source

This patch add PCAP file support to ip_pipeline. Input port type SOURCE
now supports loading specific PCAP file and sends the packets in it to
pipeline instance. The packets are then released by SINK output port. This
feature can be applied by specifying parameters in configuration file as
shown below;

[PIPELINE1]
type = PASS-THROUGH
core = 1
pktq_in = SOURCE0 SOURCE1
pktq_out = SINK0 SINK1
pcap_file_rd = /path/to/eth1.PCAP /path/to/eth2.PCAP
pcap_bytes_rd_per_pkt = 0 64

The configuration section "pcap_file_rd" contains full path and name of
the PCAP file to be loaded. If multiple SOURCEs exists, each shall have
its own PCAP file path listed in this section, separated by spaces.
Multiple SOURCE ports may share same PCAP file to be copied.

The configuration section "pcap_bytes_rd_per_pkt" contains integer value
and indicates the maximum number of bytes to be copied from each packet
in the PCAP file. If this value is "0", all packets in the file will be
copied fully; if the packet size is smaller than the assigned value, the
entire packet is copied. Same as "pcap_file_rd", every SOURCE shall have
its own maximum copy byte number.

To enable PCAP support to IP pipeline, the compiler option
CONFIG_RTE_PORT_PCAP must be set to 'y'. It is possible to disable PCAP
support by removing "pcap_file_rd" and "pcap_bytes_rd_per_pkt" lines
from the configuration file.

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/examples/ip_pipeline/app.h b/examples/ip_pipeline/app.h
index f55aef8..0c22f7f 100644 (file)
--- a/examples/ip_pipeline/app.h
+++ b/examples/ip_pipeline/app.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -149,6 +149,8 @@ struct app_pktq_source_params {
        uint32_t parsed;
        uint32_t mempool_id; /* Position in the app->mempool_params array */
        uint32_t burst;
+       char *file_name; /* Full path of PCAP file to be copied to mbufs */
+       uint32_t n_bytes_per_pkt;
 };
 
 struct app_pktq_sink_params {

diff --git a/examples/ip_pipeline/config_parse.c b/examples/ip_pipeline/config_parse.c
index 4695ac1..291dbfb 100644 (file)
--- a/examples/ip_pipeline/config_parse.c
+++ b/examples/ip_pipeline/config_parse.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -181,6 +181,8 @@ struct app_pktq_source_params default_source_params = {
        .parsed = 0,
        .mempool_id = 0,
        .burst = 32,
+       .file_name = NULL,
+       .n_bytes_per_pkt = 0,
 };
 
 struct app_pktq_sink_params default_sink_params = {
@@ -954,6 +956,85 @@ parse_eal(struct app_params *app,
        free(entries);
 }
 
+static int
+parse_pipeline_pcap_source(struct app_params *app,
+       struct app_pipeline_params *p,
+       const char *file_name, const char *cp_size)
+{
+       const char *next = NULL;
+       char *end;
+       uint32_t i;
+       int parse_file = 0;
+
+       if (file_name && !cp_size) {
+               next = file_name;
+               parse_file = 1; /* parse file path */
+       } else if (cp_size && !file_name) {
+               next = cp_size;
+               parse_file = 0; /* parse copy size */
+       } else
+               return -EINVAL;
+
+       char name[APP_PARAM_NAME_SIZE];
+       size_t name_len;
+
+       if (p->n_pktq_in == 0)
+               return -EINVAL;
+
+       for (i = 0; i < p->n_pktq_in; i++) {
+               if (p->pktq_in[i].type != APP_PKTQ_IN_SOURCE)
+                       return -EINVAL;
+       }
+
+       i = 0;
+       while (*next != '\0') {
+               uint32_t id;
+
+               if (i >= p->n_pktq_in)
+                       return -EINVAL;
+
+               id = p->pktq_in[i].id;
+
+               end = strchr(next, ' ');
+               if (!end)
+                       name_len = strlen(next);
+               else
+                       name_len = end - next;
+
+               if (name_len == 0 || name_len == sizeof(name))
+                       return -EINVAL;
+
+               strncpy(name, next, name_len);
+               name[name_len] = '\0';
+               next += name_len;
+               if (*next != '\0')
+                       next++;
+
+               if (parse_file) {
+                       app->source_params[id].file_name = strdup(name);
+                       if (app->source_params[id].file_name == NULL)
+                               return -ENOMEM;
+               } else {
+                       if (parser_read_uint32(
+                               &app->source_params[id].n_bytes_per_pkt,
+                               name) != 0) {
+                               if (app->source_params[id].
+                                       file_name != NULL)
+                                       free(app->source_params[id].
+                                               file_name);
+                               return -EINVAL;
+                       }
+               }
+
+               i++;
+
+               if (i == p->n_pktq_in)
+                       return 0;
+       }
+
+       return -EINVAL;
+}
+
 static int
 parse_pipeline_pktq_in(struct app_params *app,
        struct app_pipeline_params *p,
@@ -1309,6 +1390,24 @@ parse_pipeline(struct app_params *app,
                        continue;
                }
 
+               if (strcmp(ent->name, "pcap_file_rd") == 0) {
+                       int status = parse_pipeline_pcap_source(app,
+                               param, ent->value, NULL);
+
+                       PARSE_ERROR((status == 0), section_name,
+                               ent->name);
+                       continue;
+               }
+
+               if (strcmp(ent->name, "pcap_bytes_rd_per_pkt") == 0) {
+                       int status = parse_pipeline_pcap_source(app,
+                               param, NULL, ent->value);
+
+                       PARSE_ERROR((status == 0), section_name,
+                               ent->name);
+                       continue;
+               }
+
                /* pipeline type specific items */
                APP_CHECK((param->n_args < APP_MAX_PIPELINE_ARGS),
                        "Parse error in section \"%s\": too many "
@@ -2000,6 +2099,21 @@ parse_source(struct app_params *app,
                        continue;
                }
 
+               if (strcmp(ent->name, "pcap_file_rd")) {
+                       param->file_name = strdup(ent->value);
+
+                       PARSE_ERROR_MALLOC(param->file_name != NULL);
+                       continue;
+               }
+
+               if (strcmp(ent->name, "pcap_bytes_rd_per_pkt") == 0) {
+                       int status = parser_read_uint32(
+                               &param->n_bytes_per_pkt, ent->value);
+
+                       PARSE_ERROR((status == 0), section_name,
+                               ent->name);
+               }
+
                /* unrecognized */
                PARSE_ERROR_INVALID(0, section_name, ent->name);
        }
@@ -2604,6 +2718,9 @@ save_source_params(struct app_params *app, FILE *f)
                        "mempool",
                        app->mempool_params[p->mempool_id].name);
                fprintf(f, "%s = %" PRIu32 "\n", "burst", p->burst);
+               fprintf(f, "%s = %s\n", "pcap_file_rd", p->file_name);
+               fprintf(f, "%s = %" PRIu32 "\n", "pcap_bytes_rd_per_pkt",
+                       p->n_bytes_per_pkt);
                fputc('\n', f);
        }
 }

diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c
index 2d9fae4..40bb506 100644 (file)
--- a/examples/ip_pipeline/init.c
+++ b/examples/ip_pipeline/init.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -1221,6 +1221,24 @@ static void app_pipeline_params_get(struct app_params *app,
                        out->type = PIPELINE_PORT_IN_SOURCE;
                        out->params.source.mempool = app->mempool[mempool_id];
                        out->burst_size = app->source_params[in->id].burst;
+
+#ifdef RTE_NEXT_ABI
+                       if (app->source_params[in->id].file_name
+                               != NULL) {
+                               out->params.source.file_name = strdup(
+                                       app->source_params[in->id].
+                                       file_name);
+                               if (out->params.source.file_name == NULL) {
+                                       out->params.source.
+                                               n_bytes_per_pkt = 0;
+                                       break;
+                               }
+                               out->params.source.n_bytes_per_pkt =
+                                       app->source_params[in->id].
+                                       n_bytes_per_pkt;
+                       }
+#endif
+
                        break;
                default:
                        break;