New upstream version 18.02

[deb_dpdk.git] / examples / ip_pipeline / pipeline / pipeline_master_be.c

diff --git a/examples/ip_pipeline/pipeline/pipeline_master_be.c b/examples/ip_pipeline/pipeline/pipeline_master_be.c
index ac0cbbc..c72038e 100644 (file)
--- a/examples/ip_pipeline/pipeline/pipeline_master_be.c
+++ b/examples/ip_pipeline/pipeline/pipeline_master_be.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2015 Intel Corporation
  */
 
 #include <fcntl.h>
@@ -48,6 +19,7 @@
 struct pipeline_master {
        struct app_params *app;
        struct cmdline *cl;
+       int post_init_done;
        int script_file_done;
 } __rte_cache_aligned;
 
@@ -77,6 +49,7 @@ pipeline_init(__rte_unused struct pipeline_params *params, void *arg)
                return NULL;
        }
 
+       p->post_init_done = 0;
        p->script_file_done = 0;
        if (app->script_file == NULL)
                p->script_file_done = 1;
@@ -102,8 +75,20 @@ static int
 pipeline_run(void *pipeline)
 {
        struct pipeline_master *p = (struct pipeline_master *) pipeline;
+       struct app_params *app = p->app;
        int status;
+#ifdef RTE_LIBRTE_KNI
+       uint32_t i;
+#endif /* RTE_LIBRTE_KNI */
 
+       /* Application post-init phase */
+       if (p->post_init_done == 0) {
+               app_post_init(app);
+
+               p->post_init_done = 1;
+       }
+
+       /* Run startup script file */
        if (p->script_file_done == 0) {
                struct app_params *app = p->app;
                int fd = open(app->script_file, O_RDONLY);
@@ -124,6 +109,7 @@ pipeline_run(void *pipeline)
                p->script_file_done = 1;
        }
 
+       /* Command Line Interface (CLI) */
        status = cmdline_poll(p->cl);
        if (status < 0)
                rte_panic("CLI poll error (%" PRId32 ")\n", status);
@@ -132,6 +118,12 @@ pipeline_run(void *pipeline)
                rte_exit(0, "Bye!\n");
        }
 
+#ifdef RTE_LIBRTE_KNI
+       /* Handle KNI requests from Linux kernel */
+       for (i = 0; i < app->n_pktq_kni; i++)
+               rte_kni_handle_request(app->kni[i]);
+#endif /* RTE_LIBRTE_KNI */
+
        return 0;
 }
 
@@ -146,5 +138,4 @@ struct pipeline_be_ops pipeline_master_be_ops = {
                .f_free = pipeline_free,
                .f_run = pipeline_run,
                .f_timer = pipeline_timer,
-               .f_track = NULL,
 };