Blame SOURCES/0048-bpf-add-support-for-btf_-fields-in-BPF_MAP_CREATE.patch

b484ca
From 14a9b6ca66109fc1231eb16e98a9ce4262fb610c Mon Sep 17 00:00:00 2001
b484ca
From: "Dmitry V. Levin" <ldv@altlinux.org>
b484ca
Date: Tue, 12 Mar 2019 11:17:20 +0000
b484ca
Subject: [PATCH] bpf: add support for btf_* fields in BPF_MAP_CREATE
b484ca
b484ca
* bpf_attr.h (struct BPF_MAP_CREATE_struct): Add btf_fd,
b484ca
btf_key_type_id, and btf_value_type_id fields.
b484ca
* bpf.c (BEGIN_BPF_CMD_DECODER(BPF_MAP_CREATE)): Decode btf_fd,
b484ca
btf_key_type_id, and btf_value_type_id fields introduced by Linux
b484ca
commits v4.18-rc1~114^2~417^2~1^2~3 and v4.18-rc1~114^2~148^2~7^2~2.
b484ca
* tests/bpf.c (BPF_MAP_CREATE_checks): Check it.
b484ca
* tests/bpf-obj_get_info_by_fd.c (print_map_create): Update expected
b484ca
output.
b484ca
---
b484ca
 bpf.c                          | 10 ++++++++++
b484ca
 bpf_attr.h                     |  5 ++++-
b484ca
 tests/bpf-obj_get_info_by_fd.c |  4 ++++
b484ca
 tests/bpf.c                    | 20 ++++++++++++++++++++
b484ca
 4 files changed, 38 insertions(+), 1 deletion(-)
b484ca
b484ca
Index: strace-4.24/bpf.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/bpf.c	2020-01-28 00:14:36.905228319 +0100
b484ca
+++ strace-4.24/bpf.c	2020-01-28 00:15:26.973756792 +0100
b484ca
@@ -212,6 +212,16 @@
b484ca
 	if (len <= offsetof(struct BPF_MAP_CREATE_struct, map_ifindex))
b484ca
 		break;
b484ca
 	PRINT_FIELD_IFINDEX(", ", attr, map_ifindex);
b484ca
+
b484ca
+	/*
b484ca
+	 * The following three fields were introduced by Linux commits
b484ca
+	 * v4.18-rc1~114^2~417^2~1^2~3 and v4.18-rc1~114^2~148^2~7^2~2.
b484ca
+	 */
b484ca
+	if (len <= offsetof(struct BPF_MAP_CREATE_struct, btf_fd))
b484ca
+		break;
b484ca
+	PRINT_FIELD_FD(", ", attr, btf_fd, tcp);
b484ca
+	PRINT_FIELD_U(", ", attr, btf_key_type_id);
b484ca
+	PRINT_FIELD_U(", ", attr, btf_value_type_id);
b484ca
 }
b484ca
 END_BPF_CMD_DECODER(RVAL_DECODED | RVAL_FD)
b484ca
 
b484ca
Index: strace-4.24/bpf_attr.h
b484ca
===================================================================
b484ca
--- strace-4.24.orig/bpf_attr.h	2020-01-28 00:14:36.905228319 +0100
b484ca
+++ strace-4.24/bpf_attr.h	2020-01-28 00:15:26.974756783 +0100
b484ca
@@ -45,11 +45,14 @@
b484ca
 	uint32_t numa_node;
b484ca
 	char     map_name[BPF_OBJ_NAME_LEN];
b484ca
 	uint32_t map_ifindex;
b484ca
+	uint32_t btf_fd;
b484ca
+	uint32_t btf_key_type_id;
b484ca
+	uint32_t btf_value_type_id;
b484ca
 };
b484ca
 
b484ca
 # define BPF_MAP_CREATE_struct_size \
b484ca
 	sizeof(struct BPF_MAP_CREATE_struct)
b484ca
-# define expected_BPF_MAP_CREATE_struct_size 48
b484ca
+# define expected_BPF_MAP_CREATE_struct_size 60
b484ca
 
b484ca
 struct BPF_MAP_LOOKUP_ELEM_struct {
b484ca
 	uint32_t map_fd;
b484ca
Index: strace-4.24/tests/bpf-obj_get_info_by_fd.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests/bpf-obj_get_info_by_fd.c	2020-01-28 00:14:36.905228319 +0100
b484ca
+++ strace-4.24/tests/bpf-obj_get_info_by_fd.c	2020-01-28 00:15:26.974756783 +0100
b484ca
@@ -84,6 +84,10 @@
b484ca
 		printf(", map_name=\"test_map\"");
b484ca
 	if (size > offsetof(struct BPF_MAP_CREATE_struct, map_ifindex))
b484ca
 		printf(", map_ifindex=0");
b484ca
+	if (size > offsetof(struct BPF_MAP_CREATE_struct, btf_fd)) {
b484ca
+		printf(", btf_fd=0</dev/null>"
b484ca
+		       ", btf_key_type_id=0, btf_value_type_id=0");
b484ca
+	}
b484ca
 	printf("}, %zu) = ", size);
b484ca
 	if (rc >= 0)
b484ca
 		printf("%ld<anon_inode:bpf-map>\n", rc);
b484ca
Index: strace-4.24/tests/bpf.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests/bpf.c	2020-01-28 00:14:36.905228319 +0100
b484ca
+++ strace-4.24/tests/bpf.c	2020-01-28 00:15:26.975756773 +0100
b484ca
@@ -400,6 +400,26 @@
b484ca
 		       ", map_ifindex=" IFINDEX_LO_STR,
b484ca
 		.init_fn = init_BPF_MAP_CREATE_attr7,
b484ca
 	},
b484ca
+	{ /* 8 */
b484ca
+		.data = { .BPF_MAP_CREATE_data = {
b484ca
+			.btf_fd = 0xbadc0ded,
b484ca
+			.btf_key_type_id = 0xfacefeed,
b484ca
+			.btf_value_type_id = 0xcafef00d
b484ca
+		} },
b484ca
+		.size = offsetofend(struct BPF_MAP_CREATE_struct,
b484ca
+				    btf_value_type_id),
b484ca
+		.str = "map_type=BPF_MAP_TYPE_UNSPEC"
b484ca
+		       ", key_size=0"
b484ca
+		       ", value_size=0"
b484ca
+		       ", max_entries=0"
b484ca
+		       ", map_flags=0"
b484ca
+		       ", inner_map_fd=0"
b484ca
+		       ", map_name=\"\""
b484ca
+		       ", map_ifindex=0"
b484ca
+		       ", btf_fd=-1159983635"
b484ca
+		       ", btf_key_type_id=4207869677"
b484ca
+		       ", btf_value_type_id=3405705229"
b484ca
+	},
b484ca
 };
b484ca
 
b484ca
 static const struct bpf_attr_check BPF_MAP_LOOKUP_ELEM_checks[] = {
b484ca
Index: strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests-m32/bpf-obj_get_info_by_fd.c	2020-01-28 00:15:16.441855977 +0100
b484ca
+++ strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c	2020-01-28 00:15:51.739523557 +0100
b484ca
@@ -84,6 +84,10 @@
b484ca
 		printf(", map_name=\"test_map\"");
b484ca
 	if (size > offsetof(struct BPF_MAP_CREATE_struct, map_ifindex))
b484ca
 		printf(", map_ifindex=0");
b484ca
+	if (size > offsetof(struct BPF_MAP_CREATE_struct, btf_fd)) {
b484ca
+		printf(", btf_fd=0</dev/null>"
b484ca
+		       ", btf_key_type_id=0, btf_value_type_id=0");
b484ca
+	}
b484ca
 	printf("}, %zu) = ", size);
b484ca
 	if (rc >= 0)
b484ca
 		printf("%ld<anon_inode:bpf-map>\n", rc);
b484ca
Index: strace-4.24/tests-m32/bpf.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests-m32/bpf.c	2020-01-28 00:15:08.917926835 +0100
b484ca
+++ strace-4.24/tests-m32/bpf.c	2020-01-28 00:15:45.840579111 +0100
b484ca
@@ -400,6 +400,26 @@
b484ca
 		       ", map_ifindex=" IFINDEX_LO_STR,
b484ca
 		.init_fn = init_BPF_MAP_CREATE_attr7,
b484ca
 	},
b484ca
+	{ /* 8 */
b484ca
+		.data = { .BPF_MAP_CREATE_data = {
b484ca
+			.btf_fd = 0xbadc0ded,
b484ca
+			.btf_key_type_id = 0xfacefeed,
b484ca
+			.btf_value_type_id = 0xcafef00d
b484ca
+		} },
b484ca
+		.size = offsetofend(struct BPF_MAP_CREATE_struct,
b484ca
+				    btf_value_type_id),
b484ca
+		.str = "map_type=BPF_MAP_TYPE_UNSPEC"
b484ca
+		       ", key_size=0"
b484ca
+		       ", value_size=0"
b484ca
+		       ", max_entries=0"
b484ca
+		       ", map_flags=0"
b484ca
+		       ", inner_map_fd=0"
b484ca
+		       ", map_name=\"\""
b484ca
+		       ", map_ifindex=0"
b484ca
+		       ", btf_fd=-1159983635"
b484ca
+		       ", btf_key_type_id=4207869677"
b484ca
+		       ", btf_value_type_id=3405705229"
b484ca
+	},
b484ca
 };
b484ca
 
b484ca
 static const struct bpf_attr_check BPF_MAP_LOOKUP_ELEM_checks[] = {
b484ca
Index: strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests-mx32/bpf-obj_get_info_by_fd.c	2020-01-28 00:15:18.824833536 +0100
b484ca
+++ strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c	2020-01-28 00:15:55.110491811 +0100
b484ca
@@ -84,6 +84,10 @@
b484ca
 		printf(", map_name=\"test_map\"");
b484ca
 	if (size > offsetof(struct BPF_MAP_CREATE_struct, map_ifindex))
b484ca
 		printf(", map_ifindex=0");
b484ca
+	if (size > offsetof(struct BPF_MAP_CREATE_struct, btf_fd)) {
b484ca
+		printf(", btf_fd=0</dev/null>"
b484ca
+		       ", btf_key_type_id=0, btf_value_type_id=0");
b484ca
+	}
b484ca
 	printf("}, %zu) = ", size);
b484ca
 	if (rc >= 0)
b484ca
 		printf("%ld<anon_inode:bpf-map>\n", rc);
b484ca
Index: strace-4.24/tests-mx32/bpf.c
b484ca
===================================================================
b484ca
--- strace-4.24.orig/tests-mx32/bpf.c	2020-01-28 00:15:10.852908612 +0100
b484ca
+++ strace-4.24/tests-mx32/bpf.c	2020-01-28 00:15:48.667552488 +0100
b484ca
@@ -400,6 +400,26 @@
b484ca
 		       ", map_ifindex=" IFINDEX_LO_STR,
b484ca
 		.init_fn = init_BPF_MAP_CREATE_attr7,
b484ca
 	},
b484ca
+	{ /* 8 */
b484ca
+		.data = { .BPF_MAP_CREATE_data = {
b484ca
+			.btf_fd = 0xbadc0ded,
b484ca
+			.btf_key_type_id = 0xfacefeed,
b484ca
+			.btf_value_type_id = 0xcafef00d
b484ca
+		} },
b484ca
+		.size = offsetofend(struct BPF_MAP_CREATE_struct,
b484ca
+				    btf_value_type_id),
b484ca
+		.str = "map_type=BPF_MAP_TYPE_UNSPEC"
b484ca
+		       ", key_size=0"
b484ca
+		       ", value_size=0"
b484ca
+		       ", max_entries=0"
b484ca
+		       ", map_flags=0"
b484ca
+		       ", inner_map_fd=0"
b484ca
+		       ", map_name=\"\""
b484ca
+		       ", map_ifindex=0"
b484ca
+		       ", btf_fd=-1159983635"
b484ca
+		       ", btf_key_type_id=4207869677"
b484ca
+		       ", btf_value_type_id=3405705229"
b484ca
+	},
b484ca
 };
b484ca
 
b484ca
 static const struct bpf_attr_check BPF_MAP_LOOKUP_ELEM_checks[] = {