mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tap: Don't check sequence counts when adding packets to pool

Browse source 
This is a minor optimisation possibility I spotted while trying to
debug a hang in tap4_handler(): if we run out of space for packet
sequences, it's fine to add packets to an existing per-sequence pool.

We should check the count of packet sequences only once we realise
that we actually need a new packet sequence.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-10-10 02:33:15 +02:00
parent cc65f31250
commit 2970dc257c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tap.c
View file

@ -410,6 +410,9 @@ resume:
if (seq && L4_MATCH(iph, uh, seq) && seq->p.count < TAP_SEQS) if (seq && L4_MATCH(iph, uh, seq) && seq->p.count < TAP_SEQS)
goto append; goto append;
if (seq_count == TAP_SEQS)
break; /* Resume after flushing if i < in->count */
for (seq = tap4_l4 + seq_count - 1; seq >= tap4_l4; seq--) { for (seq = tap4_l4 + seq_count - 1; seq >= tap4_l4; seq--) {
if (L4_MATCH(iph, uh, seq)) { if (L4_MATCH(iph, uh, seq)) {
if (seq->p.count >= TAP_SEQS) if (seq->p.count >= TAP_SEQS)
@ -429,9 +432,6 @@ resume:
append: append:
packet_add((struct pool *)&seq->p, l4_len, l4h); packet_add((struct pool *)&seq->p, l4_len, l4h);
if (seq_count == TAP_SEQS)
break; /* Resume after flushing if i < count */
} }
for (j = 0, seq = tap4_l4; j < seq_count; j++, seq++) { for (j = 0, seq = tap4_l4; j < seq_count; j++, seq++) {
@ -572,6 +572,9 @@ resume:
seq->p.count < TAP_SEQS) seq->p.count < TAP_SEQS)
goto append; goto append;
if (seq_count == TAP_SEQS)
break; /* Resume after flushing if i < in->count */
for (seq = tap6_l4 + seq_count - 1; seq >= tap6_l4; seq--) { for (seq = tap6_l4 + seq_count - 1; seq >= tap6_l4; seq--) {
if (L4_MATCH(ip6h, proto, uh, seq)) { if (L4_MATCH(ip6h, proto, uh, seq)) {
if (seq->p.count >= TAP_SEQS) if (seq->p.count >= TAP_SEQS)
@ -591,9 +594,6 @@ resume:
append: append:
packet_add((struct pool *)&seq->p, l4_len, l4h); packet_add((struct pool *)&seq->p, l4_len, l4h);
if (seq_count == TAP_SEQS)
break; /* Resume after flushing if i < count */
} }
for (j = 0, seq = tap6_l4; j < seq_count; j++, seq++) { for (j = 0, seq = tap6_l4; j < seq_count; j++, seq++) {