Commit 84544f56 authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

selftests/bpf: Move newer bpf_iter_* type redefining to a new header file 



Commit b9f4c01f ("selftest/bpf: Make bpf_iter selftest
compilable against old vmlinux.h") and Commit dda18a5c
("selftests/bpf: Convert bpf_iter_test_kern{3, 4}.c to define
own bpf_iter_meta") redefined newly introduced types
in bpf programs so the bpf program can still compile
properly with old kernels although loading may fail.

Since this patch set introduced new types and the same
workaround is needed, so let us move the workaround
to a separate header file so they do not clutter
bpf programs.

Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200623230816.3988656-1-yhs@fb.com
parent 0d4fad3e

tools/testing/selftests/bpf/progs/bpf_iter.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (c) 2020 Facebook */

/* "undefine" structs in vmlinux.h, because we "override" them below */

#define bpf_iter_meta bpf_iter_meta___not_used

#define bpf_iter__bpf_map bpf_iter__bpf_map___not_used

#define bpf_iter__ipv6_route bpf_iter__ipv6_route___not_used

#define bpf_iter__netlink bpf_iter__netlink___not_used

#define bpf_iter__task bpf_iter__task___not_used

#define bpf_iter__task_file bpf_iter__task_file___not_used

#include "vmlinux.h"

#undef bpf_iter_meta

#undef bpf_iter__bpf_map

#undef bpf_iter__ipv6_route

#undef bpf_iter__netlink

#undef bpf_iter__task

#undef bpf_iter__task_file



struct bpf_iter_meta {

	struct seq_file *seq;

	__u64 session_id;

	__u64 seq_num;

} __attribute__((preserve_access_index));



struct bpf_iter__ipv6_route {

	struct bpf_iter_meta *meta;

	struct fib6_info *rt;

} __attribute__((preserve_access_index));



struct bpf_iter__netlink {

	struct bpf_iter_meta *meta;

	struct netlink_sock *sk;

} __attribute__((preserve_access_index));



struct bpf_iter__task {

	struct bpf_iter_meta *meta;

	struct task_struct *task;

} __attribute__((preserve_access_index));



struct bpf_iter__task_file {

	struct bpf_iter_meta *meta;

	struct task_struct *task;

	__u32 fd;

	struct file *file;

} __attribute__((preserve_access_index));



struct bpf_iter__bpf_map {

	struct bpf_iter_meta *meta;

	struct bpf_map *map;

} __attribute__((preserve_access_index));

tools/testing/selftests/bpf/progs/bpf_iter_bpf_map.c

+1 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2020 Facebook */

/* "undefine" structs in vmlinux.h, because we "override" them below */

#define bpf_iter_meta bpf_iter_meta___not_used

#define bpf_iter__bpf_map bpf_iter__bpf_map___not_used

#include "vmlinux.h"

#undef bpf_iter_meta

#undef bpf_iter__bpf_map

#include "bpf_iter.h"

#include <bpf/bpf_helpers.h>

#include <bpf/bpf_tracing.h>



char _license[] SEC("license") = "GPL";



struct bpf_iter_meta {

	struct seq_file *seq;

	__u64 session_id;

	__u64 seq_num;

} __attribute__((preserve_access_index));



struct bpf_iter__bpf_map {

	struct bpf_iter_meta *meta;

	struct bpf_map *map;

} __attribute__((preserve_access_index));



SEC("iter/bpf_map")

int dump_bpf_map(struct bpf_iter__bpf_map *ctx)

{

tools/testing/selftests/bpf/progs/bpf_iter_ipv6_route.c

+1 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2020 Facebook */

/* "undefine" structs in vmlinux.h, because we "override" them below */

#define bpf_iter_meta bpf_iter_meta___not_used

#define bpf_iter__ipv6_route bpf_iter__ipv6_route___not_used

#include "vmlinux.h"

#undef bpf_iter_meta

#undef bpf_iter__ipv6_route

#include "bpf_iter.h"

#include <bpf/bpf_helpers.h>

#include <bpf/bpf_tracing.h>



struct bpf_iter_meta {

	struct seq_file *seq;

	__u64 session_id;

	__u64 seq_num;

} __attribute__((preserve_access_index));



struct bpf_iter__ipv6_route {

	struct bpf_iter_meta *meta;

	struct fib6_info *rt;

} __attribute__((preserve_access_index));



char _license[] SEC("license") = "GPL";



extern bool CONFIG_IPV6_SUBTREES __kconfig __weak;

tools/testing/selftests/bpf/progs/bpf_iter_netlink.c

+1 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2020 Facebook */

/* "undefine" structs in vmlinux.h, because we "override" them below */

#define bpf_iter_meta bpf_iter_meta___not_used

#define bpf_iter__netlink bpf_iter__netlink___not_used

#include "vmlinux.h"

#undef bpf_iter_meta

#undef bpf_iter__netlink

#include "bpf_iter.h"

#include <bpf/bpf_helpers.h>

#include <bpf/bpf_tracing.h>
@@ -14,17 +9,6 @@ char _license[] SEC("license") = "GPL"; 
#define sk_rmem_alloc	sk_backlog.rmem_alloc

#define sk_refcnt	__sk_common.skc_refcnt



struct bpf_iter_meta {

	struct seq_file *seq;

	__u64 session_id;

	__u64 seq_num;

} __attribute__((preserve_access_index));



struct bpf_iter__netlink {

	struct bpf_iter_meta *meta;

	struct netlink_sock *sk;

} __attribute__((preserve_access_index));



static inline struct inode *SOCK_INODE(struct socket *socket)

{

	return &container_of(socket, struct socket_alloc, socket)->vfs_inode;

tools/testing/selftests/bpf/progs/bpf_iter_task.c

+1 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) 2020 Facebook */

/* "undefine" structs in vmlinux.h, because we "override" them below */

#define bpf_iter_meta bpf_iter_meta___not_used

#define bpf_iter__task bpf_iter__task___not_used

#include "vmlinux.h"

#undef bpf_iter_meta

#undef bpf_iter__task

#include "bpf_iter.h"

#include <bpf/bpf_helpers.h>

#include <bpf/bpf_tracing.h>



char _license[] SEC("license") = "GPL";



struct bpf_iter_meta {

	struct seq_file *seq;

	__u64 session_id;

	__u64 seq_num;

} __attribute__((preserve_access_index));



struct bpf_iter__task {

	struct bpf_iter_meta *meta;

	struct task_struct *task;

} __attribute__((preserve_access_index));



SEC("iter/task")

int dump_task(struct bpf_iter__task *ctx)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE