Skip to content
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

bpf: declare maps with __type for key and value #3307

Merged
merged 1 commit into from
Jan 16, 2025
+34 −34
Merged

bpf: declare maps with __type for key and value #3307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bpf/process/addr_lpm_maps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct addr4_lpm_trie {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, ADDR_LPM_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_LPM_TRIE);
Expand All @@ -33,7 +33,7 @@ struct addr6_lpm_trie {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, ADDR_LPM_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_LPM_TRIE);
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/argfilter_maps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, ARGFILTER_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_execve_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int execve_send(void *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 2);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(void *));
} execve_calls SEC(".maps") = {
.values = {
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_generic_kprobe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int generic_kprobe_output(void *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 13);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(void *));
} kprobe_calls SEC(".maps") = {
.values = {
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_generic_lsm_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int generic_lsm_actions(void *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 13);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(void *));
} lsm_calls SEC(".maps") = {
.values = {
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_generic_retkprobe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int generic_retkprobe_output(struct pt_regs *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 6);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(struct pt_regs *));
} retkprobe_calls SEC(".maps") = {
.values = {
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_generic_tracepoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int generic_tracepoint_output(void *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 13);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(void *));
} tp_calls SEC(".maps") = {
.values = {
Expand Down
2 changes: 1 addition & 1 deletion bpf/process/bpf_generic_uprobe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int generic_uprobe_output(void *ctx);
struct {
__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
__uint(max_entries, 13);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(values, int(void *));
} uprobe_calls SEC(".maps") = {
.values = {
Expand Down
8 changes: 4 additions & 4 deletions bpf/process/policy_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
struct {
__uint(type, BPF_MAP_TYPE_LRU_HASH);
__uint(max_entries, POLICY_FILTER_MAX_NAMESPACES);
__uint(key_size, sizeof(u64));
__uint(value_size, sizeof(u64));
__type(key, u64);
__type(value, u64);
} tg_cgroup_namespace_map SEC(".maps");

struct {
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
__uint(max_entries, POLICY_FILTER_MAX_POLICIES);
__uint(key_size, sizeof(u32)); /* policy id */
__type(key, u32); /* policy id */
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -38,7 +38,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_HASH_OF_MAPS);
__uint(max_entries, POLICY_FILTER_MAX_CGROUP_IDS);
__uint(key_size, sizeof(__u64)); /* cgroup id */
__type(key, __u64); /* cgroup id */
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand Down
38 changes: 19 additions & 19 deletions bpf/process/string_maps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -78,7 +78,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -91,7 +91,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -104,7 +104,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -117,7 +117,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -130,7 +130,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -143,7 +143,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -156,7 +156,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -170,7 +170,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -183,7 +183,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -196,7 +196,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand All @@ -210,14 +210,14 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
__uint(max_entries, 1);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__uint(value_size, STRING_MAPS_HEAP_SIZE);
} string_maps_heap SEC(".maps");

struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
__uint(max_entries, 1);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__uint(value_size, STRING_MAPS_HEAP_SIZE);
} string_maps_ro_zero SEC(".maps");

Expand All @@ -231,7 +231,7 @@ struct string_prefix_lpm_trie {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_LPM_TRIE);
Expand All @@ -245,8 +245,8 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
__uint(max_entries, 1);
__uint(key_size, sizeof(__u32));
__uint(value_size, sizeof(struct string_prefix_lpm_trie));
__type(key, __u32);
__type(value, struct string_prefix_lpm_trie);
} string_prefix_maps_heap SEC(".maps");

#define STRING_POSTFIX_MAX_LENGTH 128
Expand All @@ -265,7 +265,7 @@ struct string_postfix_lpm_trie {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, STRING_MAPS_OUTER_MAX_ENTRIES);
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_LPM_TRIE);
Expand All @@ -279,8 +279,8 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
__uint(max_entries, 1);
__uint(key_size, sizeof(__u32));
__uint(value_size, sizeof(struct string_postfix_lpm_trie));
__type(key, __u32);
__type(value, struct string_postfix_lpm_trie);
} string_postfix_maps_heap SEC(".maps");

#endif // STRING_MAPS_H__
4 changes: 2 additions & 2 deletions bpf/process/types/basic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ struct {
struct {
__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
__uint(max_entries, MAX_SELECTORS); // only one matchBinaries per selector
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__array(
values, struct {
__uint(type, BPF_MAP_TYPE_HASH);
Expand Down Expand Up @@ -2114,7 +2114,7 @@ update_pid_tid_from_sock(struct msg_generic_kprobe *e, __u64 sockaddr)
struct {
__uint(type, BPF_MAP_TYPE_STACK_TRACE);
__uint(max_entries, 1); // Agent is resizing this if the feature is needed during kprobe load
__uint(key_size, sizeof(__u32));
__type(key, __u32);
__uint(value_size, sizeof(__u64) * PERF_MAX_STACK_DEPTH);
} stack_trace_map SEC(".maps");

Expand Down
Loading