X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fprox_args.c;h=d77eab1ad68a9e74bf0c6872714cbccc6f791320;hb=3d17d9c7e0daae0b82973283a23f3e85d0decabd;hp=bbe27382ce5310829cb14d90e7d5caad62cd5696;hpb=0bb9030df98a4214cd0ea2bb9d7dabd3d9635ad2;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/prox_args.c b/VNFs/DPPD-PROX/prox_args.c
index bbe27382..d77eab1a 100644
--- a/VNFs/DPPD-PROX/prox_args.c
+++ b/VNFs/DPPD-PROX/prox_args.c
@@ -35,6 +35,7 @@
 #include "defaults.h"
 #include "prox_lua.h"
 #include "cqm.h"
+#include "prox_compat.h"
 
 #define MAX_RTE_ARGV 64
 #define MAX_ARG_LEN  64
@@ -538,13 +539,60 @@ static int get_port_cfg(unsigned sindex, char *str, void *data)
 		}
 		cfg->lsc_val = val;
 	}
+#if RTE_VERSION >= RTE_VERSION_NUM(18,8,0,1)
+	else if (STR_EQ(str, "disable tx offload")) {
+		uint32_t val;
+		if (parse_int(&val, pkey)) {
+			return -1;
+		}
+		if (val)
+			cfg->disabled_tx_offload = val;
+	}
+#endif
 	else if (STR_EQ(str, "strip crc")) {
 		uint32_t val;
 		if (parse_bool(&val, pkey)) {
 			return -1;
 		}
-		cfg->port_conf.rxmode.hw_strip_crc = val;
+		if (val)
+			cfg->requested_rx_offload |= DEV_RX_OFFLOAD_CRC_STRIP;
+		else
+			cfg->requested_rx_offload &= ~DEV_RX_OFFLOAD_CRC_STRIP;
 	}
+	else if (STR_EQ(str, "vlan")) {
+#if RTE_VERSION >= RTE_VERSION_NUM(18,8,0,1)
+		uint32_t val;
+		if (parse_bool(&val, pkey)) {
+			return -1;
+		}
+		if (val) {
+			cfg->requested_rx_offload |= DEV_RX_OFFLOAD_VLAN_STRIP;
+			cfg->requested_tx_offload |= DEV_TX_OFFLOAD_VLAN_INSERT;
+		} else {
+			cfg->requested_rx_offload &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+			cfg->requested_tx_offload &= ~DEV_TX_OFFLOAD_VLAN_INSERT;
+		}
+#else
+		plog_warn("vlan option not supported : update DPDK at least to 18.08 to support this option\n");
+#endif
+	}
+	else if (STR_EQ(str, "mtu size")) {
+		uint32_t val;
+		if (parse_int(&val, pkey)) {
+			return -1;
+		}
+		if (val) {
+			cfg->mtu = val;
+			// A frame of 1526 bytes (1500 bytes mtu, 14 bytes hdr, 4 bytes crc and 8 bytes vlan)
+			// should not be considered as a jumbo frame. However rte_ethdev.c considers that
+			// the max_rx_pkt_len for a non jumbo frame is 1518
+			cfg->port_conf.rxmode.max_rx_pkt_len = cfg->mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+			if (cfg->port_conf.rxmode.max_rx_pkt_len > ETHER_MAX_LEN) {
+				cfg->requested_rx_offload |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+			}
+		}
+	}
+
 	else if (STR_EQ(str, "rss")) {
 		uint32_t val;
 		if (parse_bool(&val, pkey)) {
@@ -958,7 +1006,8 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
 				return -1;
 			}
 			if (targ->pkt_size == sizeof(targ->pkt_inline)) {
-				set_errf("Inline packet definition can't be longer than 1518");
+				set_errf("Inline packet definition can't be longer than %u", sizeof(targ->pkt_inline));
+				return -1;
 			}
 
 			targ->pkt_inline[targ->pkt_size++] = byte;
@@ -1203,7 +1252,6 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
 	}
 
 	else if (STR_EQ(str, "mbuf size")) {
-		targ->mbuf_size_set_explicitely = 1;
 		return parse_int(&targ->mbuf_size, pkey);
 	}
 	if (STR_EQ(str, "memcache size")) {
@@ -1292,7 +1340,7 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
 			}
 			else if (STR_EQ(pkey, "packet"))
 				return 0;
-			else if (STR_EQ(pkey, "packet")) {
+			else if (STR_EQ(pkey, "hw")) {
 				targ->flags |= TASK_ARG_HW_SRC_MAC;
 				return 0;
 			} else {
@@ -1314,6 +1362,10 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
         if (STR_EQ(str, "local ipv6")) { /* source IPv6 address to be used for packets */
                 return parse_ip6(&targ->local_ipv6, pkey);
         }
+	if (STR_EQ(str, "arp timeout"))
+		return parse_int(&targ->arp_timeout, pkey);
+	if (STR_EQ(str, "arp update time"))
+		return parse_int(&targ->arp_update_time, pkey);
 	if (STR_EQ(str, "number of packets"))
 		return parse_int(&targ->n_pkts, pkey);
 	if (STR_EQ(str, "pipes")) {
@@ -1519,6 +1571,11 @@ static int get_core_cfg(unsigned sindex, char *str, void *data)
                 return 0;
         }
 
+	if (STR_EQ(str, "irq debug")) {
+		parse_int(&targ->irq_debug, pkey);
+		return 0;
+	}
+
 	set_errf("Option '%s' is not known", str);
 	/* fail on unknown keys */
 	return -1;
@@ -1955,7 +2012,7 @@ int prox_setup_rte(const char *prog_name)
 	}
 
 	if (rte_cfg.no_output) {
-		rte_set_log_level(0);
+		rte_log_set_global_level(0);
 	}
 	/* init EAL */
 	plog_info("\tEAL command line:");