Code Review
/
samplevnf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix port throughput related statistics for i40e virtual functions
[samplevnf.git]
/
VNFs
/
DPPD-PROX
/
task_init.h
diff --git
a/VNFs/DPPD-PROX/task_init.h
b/VNFs/DPPD-PROX/task_init.h
index
745a742
..
9fa9f92
100644
(file)
--- a/
VNFs/DPPD-PROX/task_init.h
+++ b/
VNFs/DPPD-PROX/task_init.h
@@
-27,6
+27,7
@@
#include "ip6_addr.h"
#include "flow_iter.h"
#include "parse_utils.h"
#include "ip6_addr.h"
#include "flow_iter.h"
#include "parse_utils.h"
+#include "prox_compat.h"
struct rte_mbuf;
struct lcore_cfg;
struct rte_mbuf;
struct lcore_cfg;
@@
-59,7
+60,7
@@
struct qos_cfg {
};
enum task_mode {NOT_SET, MASTER, QINQ_DECAP4, QINQ_DECAP6,
};
enum task_mode {NOT_SET, MASTER, QINQ_DECAP4, QINQ_DECAP6,
- QINQ_ENCAP4, QINQ_ENCAP6, GRE_DECAP, GRE_ENCAP,CGNAT, ESP_ENC, ESP_DEC,
+ QINQ_ENCAP4, QINQ_ENCAP6, GRE_DECAP, GRE_ENCAP,CGNAT, ESP_ENC, ESP_DEC,
QOS, POLICE
};
struct task_args;
};
struct task_args;
@@
-80,7
+81,6
@@
struct task_init {
size_t size;
uint16_t flag_req_data; /* flags from prox_shared.h */
uint64_t flag_features;
size_t size;
uint16_t flag_req_data; /* flags from prox_shared.h */
uint64_t flag_features;
- uint32_t mbuf_size;
LIST_ENTRY(task_init) entries;
};
LIST_ENTRY(task_init) entries;
};
@@
-90,9
+90,9
@@
static int task_init_flag_set(struct task_init *task_init, uint64_t flag)
}
enum police_action {
}
enum police_action {
- ACT_GREEN =
e_RTE_METE
R_GREEN,
- ACT_YELLOW =
e_RTE_METE
R_YELLOW,
- ACT_RED =
e_RTE_METE
R_RED,
+ ACT_GREEN =
RTE_COLO
R_GREEN,
+ ACT_YELLOW =
RTE_COLO
R_YELLOW,
+ ACT_RED =
RTE_COLO
R_RED,
ACT_DROP = 3,
ACT_INVALID = 4
};
ACT_DROP = 3,
ACT_INVALID = 4
};
@@
-106,7
+106,6
@@
struct task_args {
struct lcore_cfg *lconf;
uint32_t nb_mbuf;
uint32_t mbuf_size;
struct lcore_cfg *lconf;
uint32_t nb_mbuf;
uint32_t mbuf_size;
- uint8_t mbuf_size_set_explicitely;
uint32_t nb_cache_mbuf;
uint8_t nb_slave_threads;
uint8_t nb_worker_threads;
uint32_t nb_cache_mbuf;
uint8_t nb_slave_threads;
uint8_t nb_worker_threads;
@@
-129,6
+128,8
@@
struct task_args {
uint32_t gateway_ipv4;
uint32_t local_ipv4;
uint32_t remote_ipv4;
uint32_t gateway_ipv4;
uint32_t local_ipv4;
uint32_t remote_ipv4;
+ uint32_t arp_timeout;
+ uint32_t arp_update_time;
struct ipv6_addr local_ipv6; /* For IPv6 Tunnel, it's the local tunnel endpoint address */
struct rte_ring *rx_rings[MAX_RINGS_PER_TASK];
struct rte_ring *tx_rings[MAX_RINGS_PER_TASK];
struct ipv6_addr local_ipv6; /* For IPv6 Tunnel, it's the local tunnel endpoint address */
struct rte_ring *rx_rings[MAX_RINGS_PER_TASK];
struct rte_ring *tx_rings[MAX_RINGS_PER_TASK];
@@
-194,7
+195,7
@@
struct task_args {
uint32_t bucket_size;
uint32_t lat_enabled;
uint32_t pkt_size;
uint32_t bucket_size;
uint32_t lat_enabled;
uint32_t pkt_size;
- uint8_t pkt_inline[
ETHER_MAX_LEN
];
+ uint8_t pkt_inline[
MAX_PKT_SIZE
];
uint32_t probability;
char nat_table[256];
uint32_t use_src;
uint32_t probability;
char nat_table[256];
uint32_t use_src;
@@
-229,8
+230,10
@@
struct task_args {
struct rte_ring **ctrl_rx_rings;
struct rte_ring **ctrl_tx_rings;
int n_ctrl_rings;
struct rte_ring **ctrl_rx_rings;
struct rte_ring **ctrl_tx_rings;
int n_ctrl_rings;
+ uint irq_debug;
struct task_base *tmaster;
char sub_mode_str[PROX_MODE_LEN];
struct task_base *tmaster;
char sub_mode_str[PROX_MODE_LEN];
+ uint32_t igmp_address;
};
/* Return the first port that is reachable through the task. If the
};
/* Return the first port that is reachable through the task. If the