aboutsummaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2015-10-05 18:12:19 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-10-08 13:43:07 +0300
commit7082b5fb21c944afa3bac54106001eca714d0058 (patch)
treecf1b016b2d2b12cb827c55b32e03a9cd5955b5e3 /example
parentac20026ffdbbb07b46bf81bb2449e83301284145 (diff)
linux-generic: pktio: add netmap pktio support
Added new netmap pktio interface type which operates in the same manner as the existing socket io interfaces. The code is based on the odp-netmap branch. Using netmap io requires netmap headers and loaded netmap kernel module. Netmap can be installed from https://github.com/luigirizzo/netmap. ODP netmap support is enabled using --with-netmap-path=<netmap_dir> configuration option. If netmap kernel module is loaded when starting ODP application netmap io will be used by default. If the module is not found standard socket io is used. Netmap io can be disabled with ODP_PKTIO_DISABLE_NETMAP environment variable. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-and-tested by: Petri Savolainen <petri.savolainen@nokia.com> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'example')
-rw-r--r--example/generator/odp_generator.c3
-rw-r--r--example/ipsec/odp_ipsec.c3
-rw-r--r--example/packet/odp_pktio.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index f4f6038..085902b 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -1114,7 +1114,8 @@ static void usage(char *progname)
"\n"
"Optional OPTIONS\n"
" -h, --help Display help and exit.\n"
- " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
+ " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
+ " ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
" ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
" can be used to advanced pkt I/O selection for linux-generic\n"
" -p, --packetsize payload length of the packets\n"
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index 564d65e..6f5aae8 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -1577,7 +1577,8 @@ static void usage(char *progname)
"Optional OPTIONS\n"
" -c, --count <number> CPU count.\n"
" -h, --help Display help and exit.\n"
- " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
+ " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
+ " ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
" ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
" can be used to advanced pkt I/O selection for linux-generic\n"
" ODP_IPSEC_USE_POLL_QUEUES\n"
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 16d4533..de6e42b 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -700,7 +700,8 @@ static void usage(char *progname)
" 1: Receive and send via queues.\n"
" 2: Receive via scheduler, send via queues.\n"
" -h, --help Display help and exit.\n"
- " environment variables: ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
+ " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
+ " ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
" ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
" can be used to advanced pkt I/O selection for linux-generic\n"
"\n", NO_PATH(progname), NO_PATH(progname)