From 293ee4b62ca9b9d2d68492831b060c8af684ff8e Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Sun, 9 Jan 2022 17:20:01 +0000 Subject: Added scripting support for ranges Signed-off-by: Xavier Simonart Change-Id: I532fd630498c2b00a91209ff7c3611fd09b460eb --- VNFs/DPPD-PROX/cmd_parser.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ VNFs/DPPD-PROX/handle_gen.c | 17 +++++++++++++- VNFs/DPPD-PROX/handle_gen.h | 5 ++++ 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/VNFs/DPPD-PROX/cmd_parser.c b/VNFs/DPPD-PROX/cmd_parser.c index 0973a4e5..bc796b55 100644 --- a/VNFs/DPPD-PROX/cmd_parser.c +++ b/VNFs/DPPD-PROX/cmd_parser.c @@ -721,6 +721,27 @@ static int parse_cmd_reset_randoms_all(const char *str, struct input *input) return 0; } +static int parse_cmd_reset_ranges_all(const char *str, struct input *input) +{ + if (strcmp(str, "") != 0) { + return -1; + } + + unsigned task_id, lcore_id = -1; + while (prox_core_next(&lcore_id, 0) == 0) { + for (task_id = 0; task_id < lcore_cfg[lcore_id].n_tasks_all; task_id++) { + if (task_is_mode(lcore_id, task_id, "gen")) { + struct task_base *tbase = lcore_cfg[lcore_id].tasks_all[task_id]; + uint32_t n_ranges = task_gen_get_n_ranges(tbase); + + plog_info("Resetting ranges on core %d task %d from %d ranges\n", lcore_id, task_id, n_ranges); + task_gen_reset_ranges(tbase); + } + } + } + return 0; +} + static int parse_cmd_reset_values_all(const char *str, struct input *input) { if (strcmp(str, "") != 0) { @@ -841,6 +862,39 @@ static int parse_cmd_set_random(const char *str, struct input *input) return 0; } +static int parse_cmd_set_range(const char *str, struct input *input) +{ + unsigned lcores[RTE_MAX_LCORE], lcore_id, task_id, nb_cores; + struct range range; + + if (parse_cores_task(str, lcores, &task_id, &nb_cores)) + return -1; + if (!(str = strchr_skip_twice(str, ' '))) + return -1; + if (sscanf(str, "%u %u %u", &range.offset, &range.min, &range.max) != 3) { + return -1; + } + + if (cores_task_are_valid(lcores, task_id, nb_cores)) { + for (unsigned int i = 0; i < nb_cores; i++) { + lcore_id = lcores[i]; + if (!task_is_mode(lcore_id, task_id, "gen")) { + plog_err("Core %u task %u is not generating packets\n", lcore_id, task_id); + } else if (range.offset > PROX_RTE_ETHER_MAX_LEN) { + plog_err("Offset out of range (must be less then %u)\n", PROX_RTE_ETHER_MAX_LEN); + } else if (range.min > range.max) { + plog_err("Wrong range: end (%d) must be >= start (%d)\n", range.max, range.min); + } else { + struct task_base *tbase = lcore_cfg[lcore_id].tasks_all[task_id]; + if (task_gen_add_range(tbase, &range)) { + plog_warn("Range not added on core %u task %u\n", lcore_id, task_id); + } + } + } + } + return 0; +} + static int parse_cmd_thread_info(const char *str, struct input *input) { unsigned lcores[RTE_MAX_LCORE], lcore_id, task_id, nb_cores; @@ -2265,8 +2319,10 @@ static struct cmd_str cmd_strings[] = { {"speed_byte", " ", "Change speed to . The speed is specified in units of bytes per second.", parse_cmd_speed_byte}, {"set value", " ", "Set bytes to at offset in packets generated on ", parse_cmd_set_value}, {"set random", " ", "Set bytes to at offset in packets generated on ", parse_cmd_set_random}, + {"set range", " ", "Set bytes from to at offset in packets generated on ", parse_cmd_set_range}, {"reset values all", "", "Undo all \"set value\" commands on all cores/tasks", parse_cmd_reset_values_all}, {"reset randoms all", "", "Undo all \"set random\" commands on all cores/tasks", parse_cmd_reset_randoms_all}, + {"reset ranges all", "", "Undo all \"set range\" commands on all cores/tasks", parse_cmd_reset_ranges_all}, {"reset values", " ", "Undo all \"set value\" commands on specified core/task", parse_cmd_reset_values}, {"arp add", " ", "Add a single ARP entry into a CPE table on /.", parse_cmd_arp_add}, diff --git a/VNFs/DPPD-PROX/handle_gen.c b/VNFs/DPPD-PROX/handle_gen.c index 9cacdb54..f625e01c 100644 --- a/VNFs/DPPD-PROX/handle_gen.c +++ b/VNFs/DPPD-PROX/handle_gen.c @@ -1530,6 +1530,14 @@ void task_gen_reset_randoms(struct task_base *tbase) task->n_rands = 0; } +void task_gen_reset_ranges(struct task_base *tbase) +{ + struct task_gen *task = (struct task_gen *)tbase; + + memset(task->ranges, 0, task->n_ranges * sizeof(struct range)); + task->n_ranges = 0; +} + int task_gen_set_value(struct task_base *tbase, uint32_t value, uint32_t offset, uint32_t len) { struct task_gen *task = (struct task_gen *)tbase; @@ -1572,6 +1580,13 @@ uint32_t task_gen_get_n_randoms(struct task_base *tbase) return task->n_rands; } +uint32_t task_gen_get_n_ranges(struct task_base *tbase) +{ + struct task_gen *task = (struct task_gen *)tbase; + + return task->n_ranges; +} + static void init_task_gen_pcap(struct task_base *tbase, struct task_args *targ) { struct task_gen_pcap *task = (struct task_gen_pcap *)tbase; @@ -1627,7 +1642,7 @@ static int task_gen_find_random_with_offset(struct task_gen *task, uint32_t offs return UINT32_MAX; } -static int task_gen_add_range(struct task_base *tbase, struct range *range) +int task_gen_add_range(struct task_base *tbase, struct range *range) { struct task_gen *task = (struct task_gen *)tbase; if (task->n_ranges == MAX_RANGES) { diff --git a/VNFs/DPPD-PROX/handle_gen.h b/VNFs/DPPD-PROX/handle_gen.h index bb85b0ca..bd8fae7b 100644 --- a/VNFs/DPPD-PROX/handle_gen.h +++ b/VNFs/DPPD-PROX/handle_gen.h @@ -17,6 +17,8 @@ #ifndef _HANDLE_GEN_H_ #define _HANDLE_GEN_H_ +#include "task_init.h" + struct unique_id { uint8_t generator_id; uint32_t packet_id; @@ -41,11 +43,14 @@ int task_gen_set_pkt_size(struct task_base *tbase, uint32_t pkt_size); int task_gen_set_imix(struct task_base *tbase, uint32_t nb_pkts, uint32_t *pkt_size); void task_gen_set_rate(struct task_base *tbase, uint64_t bps); void task_gen_reset_randoms(struct task_base *tbase); +void task_gen_reset_ranges(struct task_base *tbase); void task_gen_reset_values(struct task_base *tbase); int task_gen_set_value(struct task_base *tbase, uint32_t value, uint32_t offset, uint32_t len); int task_gen_add_rand(struct task_base *tbase, const char *rand_str, uint32_t offset, uint32_t rand_id); +int task_gen_add_range(struct task_base *tbase, struct range *range); uint32_t task_gen_get_n_randoms(struct task_base *tbase); +uint32_t task_gen_get_n_ranges(struct task_base *tbase); uint32_t task_gen_get_n_values(struct task_base *tbase); #endif /* _HANDLE_GEN_H_ */ -- cgit 1.2.3-korg