diff options
| author | Paul Chaignon <paul.chaignon@gmail.com> | 2023-11-07 12:53:57 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-11-09 18:26:45 +0000 |
| commit | b642300f6a70aa7ee47406afa523da855fee4e59 (patch) | |
| tree | 6c37b678c4ea3c84cfcfa1b547425327e5776bb3 | |
| parent | 44a9f04e7f0a741a7e9e72387809ae1fdf6b2a4e (diff) | |
sys/linux: describe call to BPF helper bpf_ringbuf_discard
Including this helper call in our descriptions is trivial since it takes
the same arguments and returns the same (void) as the already described
bpf_ringbuf_submit helper call.
Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
| -rw-r--r-- | sys/linux/bpf.txt | 10 | ||||
| -rw-r--r-- | sys/linux/bpf.txt.const | 1 | ||||
| -rw-r--r-- | sys/linux/test/bpf_helpers | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/sys/linux/bpf.txt b/sys/linux/bpf.txt index 14a787782..1b1b455d3 100644 --- a/sys/linux/bpf.txt +++ b/sys/linux/bpf.txt @@ -401,7 +401,7 @@ bpf_program_ringbuf { reserve bpf_insn_ringbuf_reserve null_check bpf_insn_null_check[BPF_REG_9] body array[bpf_insn] - free bpf_insn_ringbuf_submit + free bpf_insn_ringbuf_free exit bpf_insn_exit } [packed] @@ -774,15 +774,17 @@ bpf_insn_ringbuf_reserve { # (bf) r1 = r9 # (b7) r2 = 0 -# (85) call bpf_ringbuf_submit#322192 +# (85) call bpf_ringbuf_{submit,discard}#322192 # (bf) r0 = 0 -bpf_insn_ringbuf_submit { +bpf_insn_ringbuf_free { insn1 bpf_insn_mov_reg[BPF_REG_9, BPF_REG_1] insn2 bpf_insn_mov_imm[BPF_REG_2, 0] - insn3 bpf_insn_call_helper_t[const[BPF_FUNC_ringbuf_submit, int32]] + insn3 bpf_insn_call_helper_t[flags[bpf_helpers_ringbuf_free, int32]] insn4 bpf_insn_mov_imm[BPF_REG_0, 0] } +bpf_helpers_ringbuf_free = BPF_FUNC_ringbuf_submit, BPF_FUNC_ringbuf_discard + define MAX_BPF_REG __MAX_BPF_REG bpf_obj_pin_map [ diff --git a/sys/linux/bpf.txt.const b/sys/linux/bpf.txt.const index c0ee42926..9e476d995 100644 --- a/sys/linux/bpf.txt.const +++ b/sys/linux/bpf.txt.const @@ -66,6 +66,7 @@ BPF_EXIST = 2 BPF_EXIT0 = 9 BPF_FLOW_DISSECTOR = 17 BPF_FUNC_INFO_SIZE = 8 +BPF_FUNC_ringbuf_discard = 133 BPF_FUNC_ringbuf_reserve = 131 BPF_FUNC_ringbuf_submit = 132 BPF_FUNC_snprintf = 165 diff --git a/sys/linux/test/bpf_helpers b/sys/linux/test/bpf_helpers index 9cd6682b9..f8ef4a2cd 100644 --- a/sys/linux/test/bpf_helpers +++ b/sys/linux/test/bpf_helpers @@ -25,4 +25,4 @@ r4 = bpf$PROG_LOAD(AUTO, &AUTO={0x3, AUTO, &AUTO=@framed={{AUTO, AUTO, AUTO, AUT r1 = bpf$MAP_CREATE_RINGBUF(AUTO, &AUTO={AUTO, AUTO, AUTO, 0x40000, AUTO, 0x0, 0x0, "00000000000000000000000000000000", 0x0, 0x0, 0x0, 0x0, 0x0, AUTO}, 0x48) -r2 = bpf$PROG_LOAD(AUTO, &AUTO={0x3, AUTO, &AUTO=@ringbuf={{AUTO, AUTO, AUTO, AUTO, 0x0, AUTO, AUTO, AUTO, 0x0}, {{AUTO, AUTO, AUTO, AUTO, r1, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}}, {{AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO}}, [], {{AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}}, {AUTO, AUTO, AUTO, AUTO}}, &AUTO='GPL\x00', 0x0, 0x0, 0x0, 0x0, 0x0, "00000000000000000000000000000000", 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, 0xa0) +r2 = bpf$PROG_LOAD(AUTO, &AUTO={0x3, AUTO, &AUTO=@ringbuf={{AUTO, AUTO, AUTO, AUTO, 0x0, AUTO, AUTO, AUTO, 0x0}, {{AUTO, AUTO, AUTO, AUTO, r1, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}}, {{AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO}}, [], {{AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}, {AUTO, AUTO, AUTO, 0x84}, {AUTO, AUTO, AUTO, AUTO, AUTO, AUTO, AUTO}}, {AUTO, AUTO, AUTO, AUTO}}, &AUTO='GPL\x00', 0x0, 0x0, 0x0, 0x0, 0x0, "00000000000000000000000000000000", 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, 0xa0) |