leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pktgen: Add output for imix results

Browse Source 
The bps for imix mode is calculated by:
sum(imix_entry.size) / time_elapsed

The actual counts of each imix_entry are displayed under the
"Current:" section of the interface output in the following format:
imix_size_counts: size_1,count_1 size_2,count_2 ... size_n,count_n

Example (count = 200000):
imix_weights: 256,1 859,3 205,2
imix_size_counts: 256,32082 859,99796 205,68122
Result: OK: 17992362(c17964678+d27684) usec, 200000 (859byte,0frags)
  11115pps 47Mb/sec (47977140bps) errors: 0

Summary of changes:
Calculate bps based on imix counters when in IMIX mode.
Add output for IMIX counters.

Signed-off-by: Nick Richardson <richardsonnick@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nick Richardson 2021-08-10 19:01:55 +00:00 committed by David S. Miller
parent 9014903132
commit 769afb3fda
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/core/pktgen.c
View File

@ -695,6 +695,18 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
(unsigned long long)pkt_dev->sofar,
(unsigned long long)pkt_dev->errors);
if (pkt_dev->n_imix_entries > 0) {
int i;
seq_puts(seq, " imix_size_counts: ");
for (i = 0; i < pkt_dev->n_imix_entries; i++) {
seq_printf(seq, "%llu,%llu ",
pkt_dev->imix_entries[i].size,
pkt_dev->imix_entries[i].count_so_far);
}
seq_puts(seq, "\n");
}
seq_printf(seq,
" started: %lluus stopped: %lluus idle: %lluus\n",
(unsigned long long) ktime_to_us(pkt_dev->started_at),
@ -3277,7 +3289,19 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags)
pps = div64_u64(pkt_dev->sofar * NSEC_PER_SEC,
ktime_to_ns(elapsed));
bps = pps * 8 * pkt_dev->cur_pkt_size;
if (pkt_dev->n_imix_entries > 0) {
int i;
struct imix_pkt *entry;
bps = 0;
for (i = 0; i < pkt_dev->n_imix_entries; i++) {
entry = &pkt_dev->imix_entries[i];
bps += entry->size * entry->count_so_far;
}
bps = div64_u64(bps * 8 * NSEC_PER_SEC, ktime_to_ns(elapsed));
} else {
bps = pps * 8 * pkt_dev->cur_pkt_size;
}
mbps = bps;
do_div(mbps, 1000000);