Commit 698584df authored by Daniel T. Lee's avatar Daniel T. Lee Committed by Daniel Borkmann
Browse files

samples, bpf: Replace bpf_program__title() with bpf_program__section_name() 



From commit 52109584 ("libbpf: Deprecate notion of BPF program
"title" in favor of "section name""), the term title has been replaced
with section name in libbpf.

Since the bpf_program__title() has been deprecated, this commit
switches this function to bpf_program__section_name(). Due to
this commit, the compilation warning issue has also been resolved.

Fixes: 52109584 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"")
Signed-off-by: default avatarDaniel T. Lee <danieltimlee@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200904063434.24963-1-danieltimlee@gmail.com
parent 8eb62958

samples/bpf/sockex3_user.c

+3 −3
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ int main(int argc, char **argv) 
	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	struct bpf_program *prog;

	struct bpf_object *obj;

	const char *section;

	char filename[256];

	const char *title;

	FILE *f;



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
@@ -58,8 +58,8 @@ int main(int argc, char **argv) 
	bpf_object__for_each_program(prog, obj) {

		fd = bpf_program__fd(prog);



		title = bpf_program__title(prog, false);

		if (sscanf(title, "socket/%d", &key) != 1) {

		section = bpf_program__section_name(prog);

		if (sscanf(section, "socket/%d", &key) != 1) {

			fprintf(stderr, "ERROR: finding prog failed\n");

			goto cleanup;

		}

samples/bpf/spintest_user.c

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ int main(int ac, char **argv) 
	long key, next_key, value;

	struct bpf_program *prog;

	int map_fd, i, j = 0;

	const char *title;

	const char *section;

	struct ksym *sym;



	if (setrlimit(RLIMIT_MEMLOCK, &r)) {
@@ -51,8 +51,8 @@ int main(int ac, char **argv) 
	}



	bpf_object__for_each_program(prog, obj) {

		title = bpf_program__title(prog, false);

		if (sscanf(title, "kprobe/%s", symbol) != 1)

		section = bpf_program__section_name(prog);

		if (sscanf(section, "kprobe/%s", symbol) != 1)

			continue;



		/* Attach prog only when symbol exists */

samples/bpf/tracex5_user.c

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ int main(int ac, char **argv) 
	struct bpf_program *prog;

	struct bpf_object *obj;

	int key, fd, progs_fd;

	const char *section;

	char filename[256];

	const char *title;

	FILE *f;



	setrlimit(RLIMIT_MEMLOCK, &r);
@@ -78,9 +78,9 @@ int main(int ac, char **argv) 
	}



	bpf_object__for_each_program(prog, obj) {

		title = bpf_program__title(prog, false);

		section = bpf_program__section_name(prog);

		/* register only syscalls to PROG_ARRAY */

		if (sscanf(title, "kprobe/%d", &key) != 1)

		if (sscanf(section, "kprobe/%d", &key) != 1)

			continue;



		fd = bpf_program__fd(prog);

samples/bpf/xdp_redirect_cpu_user.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void print_avail_progs(struct bpf_object *obj) 


	bpf_object__for_each_program(pos, obj) {

		if (bpf_program__is_xdp(pos))

			printf(" %s\n", bpf_program__title(pos, false));

			printf(" %s\n", bpf_program__section_name(pos));

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE