Implement DirectMeter extern for eBPF backend #3243
Conversation
Co-authored-by: Tomasz Osiński <[email protected]> Co-authored-by: Jan Palimąka <[email protected]>
|
@mbudiu-vmw I will improve readability of meters PTF tests later. For now, pleas review as it is. |
| @@ -83,6 +82,16 @@ class EBPFTablePSA : public EBPFTable { | |||
| return nullptr; | |||
| } | |||
|
|
|||
| EBPFMeterPSA* getMeter(cstring name) const { | |||
| auto result = std::find_if(meters.begin(), meters.end(), | |||
There was a problem hiding this comment.
this suggests that you may want a std::map instead of a std::vector.
backends/ebpf/tests/ptf/meters.py
Outdated
| @@ -21,6 +21,7 @@ | |||
| ALL_PORTS = [PORT0, PORT1, PORT2] | |||
|
|
|||
| meter_value_mask = 0xff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00 | |||
| two_meters_value_mask = 0xff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_ff_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00_00 | |||
There was a problem hiding this comment.
if this is just meter_value_mask concatenated to itself that's perhaps what you should write.
backends/ebpf/tests/ptf/meters.py
Outdated
| # period 1ms -> 1250 B per period, 1ms -> 1e6 ns -> 0F 42 40, 1250 -> 04 E2 | ||
| self.update_map(name="ingress_tbl_fwd", key="hex 04 00 00 00", | ||
| value="hex " | ||
| "01 00 00 00 05 00 00 00 " # action id | egress port |
There was a problem hiding this comment.
Made a comment in the previous PR about utility functions to build these values, it applies here.
backends/ebpf/tests/ptf/meters.py
Outdated
| class DirectTwoMetersPSATest(P4EbpfTest): | ||
| """ | ||
| Test two Direct Meters in one table. Type BYTES. | ||
| Send 100 B packet and verify if there is 100 tokens less left. |
There was a problem hiding this comment.
that the number of tokes decreases by 100
backends/ebpf/tests/ptf/meters.py
Outdated
| class DirectAndCounterMeterPSATest(P4EbpfTest): | ||
| """ | ||
| Test Direct Meter with Direct Counter. | ||
| Send 100 B packet and verify if there is 100 tokens less left. |
| #include <core.p4> | ||
| #include <psa.p4> | ||
|
|
||
| typedef bit<48> EthernetAddress; |
There was a problem hiding this comment.
I thought you were using some common definitions of the headers using an #include.
Forgot to check this in a few previous PRs, perhaps you want to scan the recent test additions.
| apply { } | ||
| } | ||
|
|
||
| control CommonDeparserImpl(packet_out packet, |
There was a problem hiding this comment.
I am even wondering whether you couldn't also put all these controls into the common header file... would make the code much easier to read.
|
Please rerequest a review when ready. |
|
@mbudiu-vmw please review. |
| # Expecting pbs_left, cbs_left 2500 B - 100 B = 2400 B -> 09 60 | ||
| meter_value = build_meter_value(pir=250000, cir=250000, pbs=2500, |
* Implement DirectMeter extern for eBPF backend Co-authored-by: Tomasz Osiński <[email protected]> Co-authored-by: Jan Palimąka <[email protected]>
This PR adds DirectMeter extern.
Co-authored-by: Tomasz Osiński [email protected]
Co-authored-by: Jan Palimąka [email protected]