Speed up iptables-test.py
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest12 patches 1 replyIn review
- v112 patches 5 repliesSuperseded
Changes in v2 from the cover letter
- Add fallout NFQUEUE patch 1
- Adjust iptables-test.py enhancement as suggested by Jan, details in patch 2
- Avoid changing what extensions print, this is a separate discussion - instead update expected output accordingly
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/12 | extensions: NFQUEUE: Document queue-balance limitationextensions/ extensions/ extensions/ | +5 | 0 replies | |
| 2/12 | tests: iptables-test: Implement fast test modeiptables-test.py | +159 | 0 replies | |
| 3/12 | tests: iptables-test: Cover for obligatory -j CONTINUE in ebtablesiptables-test.py | +3 | 0 replies | |
| 4/12 | tests: *.t: Fix expected output for simple callsextensions/ extensions/ extensions/ +2 more | +5 | 0 replies | |
| 5/12 | tests: *.t: Fix for hexadecimal outputextensions/ extensions/ extensions/ +2 more | +6 | 0 replies | |
| 6/12 | tests: libebt_redirect.t: Plain redirect prints with trailing whitespaceextensions/ | +1 | 0 replies | |
| 7/12 | tests: libxt_length.t: Fix odd use-case outputextensions/ | +1 | 0 replies | |
| 8/12 | tests: libxt_recent.t: Add missing default valuesextensions/ | +2 | 0 replies | |
| 9/12 | tests: libxt_tos.t, libxt_TOS.t: Add missing masks in outputextensions/ extensions/ | +10 | 0 replies | |
| 10/12 | tests: libebt_vlan.t: Drop trailing whitespace from rulesextensions/ | +2 | 0 replies | |
| 11/12 | tests: libxt_connlimit.t: Add missing default valuesextensions/ | +6 | 0 replies | |
| 12/12 | tests: *.t: Add missing all-one's netmasks to expected outputextensions/ extensions/ extensions/ +1 more | +8 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [iptables PATCH v2 00/12] Speed up iptables-test.py
Changes since v1:
- Add fallout NFQUEUE patch 1
- Adjust iptables-test.py enhancement as suggested by Jan, details in patch 2
- Avoid changing what extensions print, this is a separate discussion - instead update expected output accordingly
Original cover letter text:
I had this in mind for a while now and finally got around to do it: When testing an extensions/*.t file with iptables-tests.py, act in a "batch" mode applying all rules at once and checking the expected output in one go, thereby reducing the overhead per test file to a single iptables-restore and iptables-save call each. This was a bit optimistic, but the result is still significant - on my rather slow testing VM, a full iptables-tests.py run completes in ~7min instead of ~30min (yes, it's slow).
See patch 1 for the implementation details. As a side-effect, rule existence checking became much stricter, so the remaining patches in this series deal with eliminating those differences:
* Patch 2 avoids having to add '-j CONTINUE' to almost all ebtables rules.
* Patches 3-10 adjust expected output to reality, mostly adding content the script didn't care about since the old 'output.find(<rule>)' worked fine as long as the output *started* like '<rule>'.
* Patch 11 Changes output by omitting an obvious default value, so a real functional change.
* Patch 12 drops another default value (from NFQUEUE target) I'm not sure we should keep.
So patches are roughly sorted by my confidence in correctness. Please have (at least) a close look at the last two, I don't want to break iptables for anyone just to keep test files small.
Phil Sutter (12):
extensions: NFQUEUE: Document queue-balance limitation
tests: iptables-test: Implement fast test mode
tests: iptables-test: Cover for obligatory -j CONTINUE in ebtables
tests: *.t: Fix expected output for simple calls
tests: *.t: Fix for hexadecimal output
tests: libebt_redirect.t: Plain redirect prints with trailing
whitespace
tests: libxt_length.t: Fix odd use-case output
tests: libxt_recent.t: Add missing default values
tests: libxt_tos.t, libxt_TOS.t: Add missing masks in output
tests: libebt_vlan.t: Drop trailing whitespace from rules
tests: libxt_connlimit.t: Add missing default values
tests: *.t: Add missing all-one's netmasks to expected output
extensions/libebt_log.t | 2 +- extensions/libebt_nflog.t | 2 +- extensions/libebt_redirect.t | 2 +- extensions/libebt_vlan.t | 4 +- extensions/libip6t_NETMAP.t | 2 +- extensions/libip6t_REJECT.t | 2 +- extensions/libipt_NETMAP.t | 2 +- extensions/libipt_REJECT.t | 2 +- extensions/libxt_CONNMARK.t | 8 +- extensions/libxt_DSCP.t | 2 +- extensions/libxt_MARK.t | 4 +- extensions/libxt_NFQUEUE.c | 2 +- extensions/libxt_NFQUEUE.man | 2 + extensions/libxt_NFQUEUE.t | 7 +- extensions/libxt_TOS.t | 12 +-- extensions/libxt_connlimit.t | 12 +-- extensions/libxt_connmark.t | 4 +- extensions/libxt_dscp.t | 2 +- extensions/libxt_length.t | 2 +- extensions/libxt_mark.t | 2 +- extensions/libxt_recent.t | 4 +- extensions/libxt_tos.t | 8 +- iptables-test.py | 163 ++++++++++++++++++++++++++++++++++- 23 files changed, 207 insertions(+), 45 deletions(-)
Signature · 1 line
2.34.1