Skip to content

netns_tuner: use kprobe attach only for setup_net() #96

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

Merged
alan-maguire merged 1 commit into from
Oct 23, 2024
Merged

netns_tuner: use kprobe attach only for setup_net() #96

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
netns_tuner: use kprobe attach only for setup_net() 
In recent kernels, setup_net() drops second (unused) argument
so use kprobe attach to be compatible across different kernels
since it will not test function signature compatibility.

Signed-off-by: Alan Maguire <[email protected]>
  • Loading branch information
@alan-maguire
alan-maguire committed Oct 23, 2024
commit d2ae9c24c4434b895e86bb7773cf7e543c8ac867
41 changes: 1 addition & 40 deletions src/netns_tuner.bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@
#include <bpftune/bpftune.bpf.h>
#include "netns_tuner.h"

#ifdef BPFTUNE_LEGACY

struct setup_net {
struct net *net;
};

BPF_MAP_DEF(setup_net_map, BPF_MAP_TYPE_HASH, __u64, __u64, 65536, 0);

SEC("kprobe/setup_net")
int BPF_KPROBE(bpftune_setup_net, struct net *net, struct user_namespace *user_ns)
int BPF_KPROBE(bpftune_setup_net, struct net *net)
{
save_entry_data(setup_net_map, setup_net, net, net);
return 0;
Expand Down Expand Up @@ -57,40 +55,3 @@ int BPF_KRETPROBE(bpftune_setup_net_return, int ret)

return 0;
}

#else
SEC("fexit/setup_net")
int BPF_PROG(bpftune_setup_net, struct net *net, struct user_namespace *user_ns,
int ret)
{
struct bpftune_event event = {};

if (ret != 0 || net == NULL || net == &init_net)
return 0;

event.tuner_id = tuner_id;
event.pid = bpf_get_current_pid_tgid() >> 32;
event.scenario_id = NETNS_SCENARIO_CREATE;
event.netns_cookie = get_netns_cookie(net);
if (event.netns_cookie >= 0)
bpf_ringbuf_output(&ring_buffer_map, &event, sizeof(event), 0);

return 0;
}
#endif

/*BPF_FENTRY(net_free, struct net *net)
{
struct bpftune_event event = {};

if (!net)
return 0;

event.tuner_id = tuner_id;
event.scenario_id = NETNS_SCENARIO_DESTROY;
event.netns_cookie = get_netns_cookie(net);
if (event.netns_cookie >= 0)
bpf_ringbuf_output(&ring_buffer_map, &event, sizeof(event), 0);

return 0;
} */