Test performance

examples/.gitignore

@@ -0,0 +1 @@
+**/*.csv

examples/Makefile

@@ -40,7 +40,7 @@ $(error "Please define RTE_SDK environment variable")
 endif
 
 # To add new examples, append the directory name to this variable
-examples = bridge basic_monitor simple_forward speed_tester flow_table test_flow_dir aes_encrypt aes_decrypt flow_tracker load_balancer arp_response nf_router scaling_example load_generator payload_scan firewall
+examples = bridge basic_monitor simple_forward speed_tester flow_table test_flow_dir aes_encrypt aes_decrypt flow_tracker load_balancer arp_response nf_router scaling_example load_generator payload_scan firewall simple_fwd_tb l2fwd
 
 ifeq ($(NDPI_HOME),)
 $(warning "Skipping ndpi_stats NF as NDPI_HOME is not set")

examples/NFD/dns_amplification_mitigation/DNSAmplificationMitigation.cpp

@@ -253,7 +253,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/dns_amplification_mitigation/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/go.sh

@@ -14,4 +14,4 @@ if [ ! -f ../../start_nf.sh ]; then
   exit 1
 fi
 
-../../start_nf.sh $NF_DIR "$@"
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/heavy_hitter_detection/HHD.cpp

@@ -260,7 +260,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/heavy_hitter_detection/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/napt/NAPT.cpp

@@ -267,7 +267,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/napt/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/stateful_firewall/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/stateful_firewall/stateful_firewall.cpp

@@ -234,7 +234,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/stateless_firewall/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/stateless_firewall/stateless_firewall.cpp

@@ -227,7 +227,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/super_spreader_detection/SSD.cpp

@@ -266,7 +266,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/super_spreader_detection/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/syn_flood_detection/SYNFloodDetection.cpp

@@ -264,7 +264,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/syn_flood_detection/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/NFD/udp_flood_mitigation/UDPFloodMitagation.cpp

@@ -259,7 +259,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 

examples/NFD/udp_flood_mitigation/go.sh

@@ -1 +1,17 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+NF_DIR=NFD/${NF_DIR}
+
+# echo ${NF_DIR}
+
+if [ ! -f ../../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+../../start_nf.sh "$NF_DIR" "$@"

examples/aes_decrypt/aesdecrypt.c

@@ -138,7 +138,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 
@@ -154,14 +154,14 @@ do_stats_display(struct rte_mbuf *pkt) {
 
         ip = onvm_pkt_ipv4_hdr(pkt);
         if (ip != NULL) {
-                struct udp_hdr *udp;
+                struct rte_udp_hdr *udp;
 
                 onvm_pkt_print(pkt);
                 /* Check if we have a valid UDP packet */
                 udp = onvm_pkt_udp_hdr(pkt);
                 if (udp != NULL) {
                         uint8_t *pkt_data;
-                        pkt_data = ((uint8_t *)udp) + sizeof(struct udp_hdr);
+                        pkt_data = ((uint8_t *)udp) + sizeof(struct rte_udp_hdr);
                         printf("Payload : %.32s\n", pkt_data);
                 }
         } else {
@@ -172,7 +172,7 @@ do_stats_display(struct rte_mbuf *pkt) {
 static int
 packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                __attribute__((unused)) struct onvm_nf_local_ctx *nf_local_ctx) {
-        struct udp_hdr *udp;
+        struct rte_udp_hdr *udp;
         static uint32_t counter = 0;
 
         /* Check if we have a valid UDP packet */
@@ -184,7 +184,7 @@ packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                 uint16_t hlen;
 
                 /* Get at the payload */
-                pkt_data = ((uint8_t *)udp) + sizeof(struct udp_hdr);
+                pkt_data = ((uint8_t *)udp) + sizeof(struct rte_udp_hdr);
                 /* Calculate length */
                 eth = rte_pktmbuf_mtod(pkt, uint8_t *);
                 hlen = pkt_data - eth;
@@ -196,7 +196,7 @@ packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                 aes_decrypt_ctr(pkt_data, plen, pkt_data, key_schedule, 256, iv[0]);
                 if (counter == 0) {
                         printf("Decrypted %d bytes at offset %d (%ld)\n", plen, hlen,
-                               sizeof(struct ether_hdr) + sizeof(struct ipv4_hdr) + sizeof(struct udp_hdr));
+                               sizeof(struct rte_ether_hdr) + sizeof(struct rte_ipv4_hdr) + sizeof(struct rte_udp_hdr));
                 }
         }
 

examples/aes_decrypt/go.sh

@@ -1 +1,20 @@
-../go.sh
+#!/bin/bash
+
+#The go.sh script is a convinient way to run start_nf.sh without specifying NF_NAME
+
+NF_DIR=${PWD##*/}
+
+if [ ! -f ../start_nf.sh ]; then
+  echo "ERROR: The ./go.sh script can only be used from the NF folder"
+  echo "If running from other directory use examples/start_nf.sh"
+  exit 1
+fi
+
+# only check for running manager if not in Docker
+if [[ -z $(pgrep -u root -f "/onvm/onvm_mgr/.*/onvm_mgr") ]] && ! grep -q "docker" /proc/1/cgroup
+then
+    echo "NF cannot start without a running manager"
+    exit 1
+fi
+
+../start_nf.sh "$NF_DIR" "$@"

examples/aes_encrypt/aesencrypt.c

@@ -138,7 +138,7 @@ do_stats_display(struct rte_mbuf *pkt) {
         const char clr[] = {27, '[', '2', 'J', '\0'};
         const char topLeft[] = {27, '[', '1', ';', '1', 'H', '\0'};
         static uint64_t pkt_process = 0;
-        struct ipv4_hdr *ip;
+        struct rte_ipv4_hdr *ip;
 
         pkt_process += print_delay;
 
@@ -154,14 +154,14 @@ do_stats_display(struct rte_mbuf *pkt) {
 
         ip = onvm_pkt_ipv4_hdr(pkt);
         if (ip != NULL) {
-                struct udp_hdr *udp;
+                struct rte_udp_hdr *udp;
 
                 onvm_pkt_print(pkt);
                 /* Check if we have a valid UDP packet */
                 udp = onvm_pkt_udp_hdr(pkt);
                 if (udp != NULL) {
                         uint8_t *pkt_data;
-                        pkt_data = ((uint8_t *)udp) + sizeof(struct udp_hdr);
+                        pkt_data = ((uint8_t *)udp) + sizeof(struct rte_udp_hdr);
                         printf("Payload : %.32s\n", pkt_data);
                 }
         } else {
@@ -172,7 +172,7 @@ do_stats_display(struct rte_mbuf *pkt) {
 static int
 packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                __attribute__((unused)) struct onvm_nf_local_ctx *nf_local_ctx) {
-        struct udp_hdr *udp;
+        struct rte_udp_hdr *udp;
 
         static uint32_t counter = 0;
         if (++counter == print_delay) {
@@ -189,7 +189,7 @@ packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                 uint16_t hlen;
 
                 /* Get at the payload */
-                pkt_data = ((uint8_t *)udp) + sizeof(struct udp_hdr);
+                pkt_data = ((uint8_t *)udp) + sizeof(struct rte_udp_hdr);
                 /* Calculate length */
                 eth = rte_pktmbuf_mtod(pkt, uint8_t *);
                 hlen = pkt_data - eth;
@@ -201,7 +201,7 @@ packet_handler(struct rte_mbuf *pkt, struct onvm_pkt_meta *meta,
                 aes_encrypt_ctr(pkt_data, plen, pkt_data, key_schedule, 256, iv[0]);
                 if (counter == 0) {
                         printf("Encrypted %d bytes at offset %d (%ld)\n", plen, hlen,
-                               sizeof(struct ether_hdr) + sizeof(struct ipv4_hdr) + sizeof(struct udp_hdr));
+                               sizeof(struct rte_ether_hdr) + sizeof(struct rte_ipv4_hdr) + sizeof(struct rte_udp_hdr));
                 }
         }