Skip to content

Commit 431aeb2

Browse files
ameryhungqmonnet
authored andcommitted
bpf: Support associating BPF program with struct_ops
Add a new BPF command BPF_PROG_ASSOC_STRUCT_OPS to allow associating a BPF program with a struct_ops map. This command takes a file descriptor of a struct_ops map and a BPF program and set prog->aux->st_ops_assoc to the kdata of the struct_ops map. The command does not accept a struct_ops program nor a non-struct_ops map. Programs of a struct_ops map is automatically associated with the map during map update. If a program is shared between two struct_ops maps, prog->aux->st_ops_assoc will be poisoned to indicate that the associated struct_ops is ambiguous. The pointer, once poisoned, cannot be reset since we have lost track of associated struct_ops. For other program types, the associated struct_ops map, once set, cannot be changed later. This restriction may be lifted in the future if there is a use case. A kernel helper bpf_prog_get_assoc_struct_ops() can be used to retrieve the associated struct_ops pointer. The returned pointer, if not NULL, is guaranteed to be valid and point to a fully updated struct_ops struct. For struct_ops program reused in multiple struct_ops map, the return will be NULL. prog->aux->st_ops_assoc is protected by bumping the refcount for non-struct_ops programs and RCU for struct_ops programs. Since it would be inefficient to track programs associated with a struct_ops map, every non-struct_ops program will bump the refcount of the map to make sure st_ops_assoc stays valid. For a struct_ops program, it is protected by RCU as map_free will wait for an RCU grace period before disassociating the program with the map. The helper must be called in BPF program context or RCU read-side critical section. struct_ops implementers should note that the struct_ops returned may not be initialized nor attached yet. The struct_ops implementer will be responsible for tracking and checking the state of the associated struct_ops map if the use case expects an initialized or attached struct_ops. Signed-off-by: Amery Hung <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Acked-by: Martin KaFai Lau <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent f1e7adc commit 431aeb2

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

include/uapi/linux/bpf.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,16 @@ union bpf_iter_link_info {
918918
* Number of bytes read from the stream on success, or -1 if an
919919
* error occurred (in which case, *errno* is set appropriately).
920920
*
921+
* BPF_PROG_ASSOC_STRUCT_OPS
922+
* Description
923+
* Associate a BPF program with a struct_ops map. The struct_ops
924+
* map is identified by *map_fd* and the BPF program is
925+
* identified by *prog_fd*.
926+
*
927+
* Return
928+
* 0 on success or -1 if an error occurred (in which case,
929+
* *errno* is set appropriately).
930+
*
921931
* NOTES
922932
* eBPF objects (maps and programs) can be shared between processes.
923933
*
@@ -974,6 +984,7 @@ enum bpf_cmd {
974984
BPF_PROG_BIND_MAP,
975985
BPF_TOKEN_CREATE,
976986
BPF_PROG_STREAM_READ_BY_FD,
987+
BPF_PROG_ASSOC_STRUCT_OPS,
977988
__MAX_BPF_CMD,
978989
};
979990

@@ -1894,6 +1905,12 @@ union bpf_attr {
18941905
__u32 prog_fd;
18951906
} prog_stream_read;
18961907

1908+
struct {
1909+
__u32 map_fd;
1910+
__u32 prog_fd;
1911+
__u32 flags;
1912+
} prog_assoc_struct_ops;
1913+
18971914
} __attribute__((aligned(8)));
18981915

18991916
/* The description below is an attempt at providing documentation to eBPF

0 commit comments

Comments
 (0)