Skip to content

[PATCH v2] validation: pktio: reuse the same pktio in sub-tests to speed things up #2421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatiasElo merged 4 commits into from
Oct 19, 2026
Merged

[PATCH v2] validation: pktio: reuse the same pktio in sub-tests to speed things up #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8128293
validation: pktio: reduce test packet count in bcast statistics test
JannePeltonen Oct 14, 2026
af19e22
linux-gen: pktio: pcap: fix reception after EOF
JannePeltonen Oct 14, 2026
837b692
validation: pktio: do not close and reopen pktio between every sub-test
JannePeltonen Oct 14, 2026
c6a7240
validation: pktio: reuse the same pktio for different batch sizes
JannePeltonen Oct 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion platform/linux-generic/pktio/pcap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,15 @@ static int pcapif_recv_pkt(pktio_entry_t *pktio_entry, int index ODP_UNUSED,
if (ret == -2 && _pcapif_reopen(pcap) == 0)
continue;

if (ret != 1)
if (ret != 1) {
/* More packets may be appended to the input file after EOF has
* been seen (e.g. when the file is the output of another pcap
* pktio). Clear the sticky EOF indicator of the underlying stream
* so that subsequent receive calls can see the appended packets. */
if (ret == -2 && pcap->rx)
clearerr(pcap_file(pcap->rx));

@TuomasTaipale TuomasTaipale Oct 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Matter of taste, but alternatively, this could be done inside _pcapif_reopen(), less re-checks.

@JannePeltonen JannePeltonen Oct 19, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think that would improve the code since then _pcapif_reopen() would not be only about reopening (which is done only if requested through the loops parameter, and is skipped entirely in process mode). The clearerr() is for the opposite case where we do not want to reopen on EOF but want to retry in case more packets get appended to the file.

break;
}

pkt_len = hdr->caplen;

Expand Down
Loading
Loading