Imported Upstream version 16.11

[deb_dpdk.git] / examples / ip_pipeline / app.h

diff --git a/examples/ip_pipeline/app.h b/examples/ip_pipeline/app.h
index 6a6fdd9..f8b84e0 100644 (file)
--- a/examples/ip_pipeline/app.h
+++ b/examples/ip_pipeline/app.h
@@ -177,19 +177,29 @@ struct app_pktq_tm_params {
        uint32_t burst_write;
 };
 
+struct app_pktq_tap_params {
+       char *name;
+       uint32_t parsed;
+       uint32_t burst_read;
+       uint32_t burst_write;
+       uint32_t dropless;
+       uint64_t n_retries;
+       uint32_t mempool_id; /* Position in the app->mempool_params */
+};
+
 struct app_pktq_source_params {
        char *name;
        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 */
+       const char *file_name; /* Full path of PCAP file to be copied to mbufs */
        uint32_t n_bytes_per_pkt;
 };
 
 struct app_pktq_sink_params {
        char *name;
        uint8_t parsed;
-       char *file_name; /* Full path of PCAP file to be copied to mbufs */
+       const char *file_name; /* Full path of PCAP file to be copied to mbufs */
        uint32_t n_pkts_to_dump;
 };
 
@@ -204,6 +214,7 @@ enum app_pktq_in_type {
        APP_PKTQ_IN_HWQ,
        APP_PKTQ_IN_SWQ,
        APP_PKTQ_IN_TM,
+       APP_PKTQ_IN_TAP,
        APP_PKTQ_IN_KNI,
        APP_PKTQ_IN_SOURCE,
 };
@@ -217,6 +228,7 @@ enum app_pktq_out_type {
        APP_PKTQ_OUT_HWQ,
        APP_PKTQ_OUT_SWQ,
        APP_PKTQ_OUT_TM,
+       APP_PKTQ_OUT_TAP,
        APP_PKTQ_OUT_KNI,
        APP_PKTQ_OUT_SINK,
 };
@@ -441,6 +453,10 @@ struct app_eal_params {
 
 #define APP_MAX_PKTQ_TM                          APP_MAX_LINKS
 
+#ifndef APP_MAX_PKTQ_TAP
+#define APP_MAX_PKTQ_TAP                         APP_MAX_LINKS
+#endif
+
 #define APP_MAX_PKTQ_KNI                         APP_MAX_LINKS
 
 #ifndef APP_MAX_PKTQ_SOURCE
@@ -494,6 +510,7 @@ struct app_params {
        struct app_pktq_hwq_out_params hwq_out_params[APP_MAX_HWQ_OUT];
        struct app_pktq_swq_params swq_params[APP_MAX_PKTQ_SWQ];
        struct app_pktq_tm_params tm_params[APP_MAX_PKTQ_TM];
+       struct app_pktq_tap_params tap_params[APP_MAX_PKTQ_TAP];
        struct app_pktq_kni_params kni_params[APP_MAX_PKTQ_KNI];
        struct app_pktq_source_params source_params[APP_MAX_PKTQ_SOURCE];
        struct app_pktq_sink_params sink_params[APP_MAX_PKTQ_SINK];
@@ -506,6 +523,7 @@ struct app_params {
        uint32_t n_pktq_hwq_out;
        uint32_t n_pktq_swq;
        uint32_t n_pktq_tm;
+       uint32_t n_pktq_tap;
        uint32_t n_pktq_kni;
        uint32_t n_pktq_source;
        uint32_t n_pktq_sink;
@@ -520,6 +538,7 @@ struct app_params {
        struct app_link_data link_data[APP_MAX_LINKS];
        struct rte_ring *swq[APP_MAX_PKTQ_SWQ];
        struct rte_sched_port *tm[APP_MAX_PKTQ_TM];
+       int tap[APP_MAX_PKTQ_TAP];
 #ifdef RTE_LIBRTE_KNI
        struct rte_kni *kni[APP_MAX_PKTQ_KNI];
 #endif /* RTE_LIBRTE_KNI */
@@ -785,6 +804,66 @@ app_tm_get_reader(struct app_params *app,
        return reader;
 }
 
+static inline uint32_t
+app_tap_get_readers(struct app_params *app, struct app_pktq_tap_params *tap)
+{
+       uint32_t pos = tap - app->tap_params;
+       uint32_t n_pipelines = RTE_MIN(app->n_pipelines,
+               RTE_DIM(app->pipeline_params));
+       uint32_t n_readers = 0, i;
+
+       for (i = 0; i < n_pipelines; i++) {
+               struct app_pipeline_params *p = &app->pipeline_params[i];
+               uint32_t n_pktq_in = RTE_MIN(p->n_pktq_in, RTE_DIM(p->pktq_in));
+               uint32_t j;
+
+               for (j = 0; j < n_pktq_in; j++) {
+                       struct app_pktq_in_params *pktq = &p->pktq_in[j];
+
+                       if ((pktq->type == APP_PKTQ_IN_TAP) &&
+                               (pktq->id == pos))
+                               n_readers++;
+               }
+       }
+
+       return n_readers;
+}
+
+static inline struct app_pipeline_params *
+app_tap_get_reader(struct app_params *app,
+       struct app_pktq_tap_params *tap,
+       uint32_t *pktq_in_id)
+{
+       struct app_pipeline_params *reader = NULL;
+       uint32_t pos = tap - app->tap_params;
+       uint32_t n_pipelines = RTE_MIN(app->n_pipelines,
+               RTE_DIM(app->pipeline_params));
+       uint32_t n_readers = 0, id = 0, i;
+
+       for (i = 0; i < n_pipelines; i++) {
+               struct app_pipeline_params *p = &app->pipeline_params[i];
+               uint32_t n_pktq_in = RTE_MIN(p->n_pktq_in, RTE_DIM(p->pktq_in));
+               uint32_t j;
+
+               for (j = 0; j < n_pktq_in; j++) {
+                       struct app_pktq_in_params *pktq = &p->pktq_in[j];
+
+                       if ((pktq->type == APP_PKTQ_IN_TAP) &&
+                               (pktq->id == pos)) {
+                               n_readers++;
+                               reader = p;
+                               id = j;
+                       }
+               }
+       }
+
+       if (n_readers != 1)
+               return NULL;
+
+       *pktq_in_id = id;
+       return reader;
+}
+
 static inline uint32_t
 app_kni_get_readers(struct app_params *app, struct app_pktq_kni_params *kni)
 {
@@ -1042,6 +1121,68 @@ app_tm_get_writer(struct app_params *app,
        return writer;
 }
 
+static inline uint32_t
+app_tap_get_writers(struct app_params *app, struct app_pktq_tap_params *tap)
+{
+       uint32_t pos = tap - app->tap_params;
+       uint32_t n_pipelines = RTE_MIN(app->n_pipelines,
+               RTE_DIM(app->pipeline_params));
+       uint32_t n_writers = 0, i;
+
+       for (i = 0; i < n_pipelines; i++) {
+               struct app_pipeline_params *p = &app->pipeline_params[i];
+               uint32_t n_pktq_out = RTE_MIN(p->n_pktq_out,
+                       RTE_DIM(p->pktq_out));
+               uint32_t j;
+
+               for (j = 0; j < n_pktq_out; j++) {
+                       struct app_pktq_out_params *pktq = &p->pktq_out[j];
+
+               if ((pktq->type == APP_PKTQ_OUT_TAP) &&
+                       (pktq->id == pos))
+                       n_writers++;
+               }
+       }
+
+       return n_writers;
+}
+
+static inline struct app_pipeline_params *
+app_tap_get_writer(struct app_params *app,
+       struct app_pktq_tap_params *tap,
+       uint32_t *pktq_out_id)
+{
+       struct app_pipeline_params *writer = NULL;
+       uint32_t pos = tap - app->tap_params;
+       uint32_t n_pipelines = RTE_MIN(app->n_pipelines,
+               RTE_DIM(app->pipeline_params));
+       uint32_t n_writers = 0, id = 0, i;
+
+       for (i = 0; i < n_pipelines; i++) {
+               struct app_pipeline_params *p = &app->pipeline_params[i];
+               uint32_t n_pktq_out = RTE_MIN(p->n_pktq_out,
+                       RTE_DIM(p->pktq_out));
+               uint32_t j;
+
+               for (j = 0; j < n_pktq_out; j++) {
+                       struct app_pktq_out_params *pktq = &p->pktq_out[j];
+
+                       if ((pktq->type == APP_PKTQ_OUT_TAP) &&
+                               (pktq->id == pos)) {
+                               n_writers++;
+                               writer = p;
+                               id = j;
+                       }
+               }
+       }
+
+       if (n_writers != 1)
+               return NULL;
+
+       *pktq_out_id = id;
+       return writer;
+}
+
 static inline uint32_t
 app_kni_get_writers(struct app_params *app, struct app_pktq_kni_params *kni)
 {