[bpf-next,v4,3/6] libbpf: Convert st_ops->data to shadow type.

Commit Message

Kui-Feng Lee Feb. 22, 2024, 10:26 p.m. UTC

From: Kui-Feng Lee <[e-mail]>

Convert st_ops->data to the shadow type of the struct_ops map. The shadow
type of a struct_ops type is a variant of the original struct type
providing a way to access/change the values in the maps of the struct_ops
type.

bpf_map__initial_value() will return st_ops->data for struct_ops types. The
skeleton is going to use it as the pointer to the shadow type of the
original struct type.

One of the main differences between the original struct type and the shadow
type is that all function pointers of the shadow type are converted to
pointers of struct bpf_program. Users can replace these bpf_program
pointers with other BPF programs. The st_ops->progs[] will be updated
before updating the value of a map to reflect the changes made by users.

Signed-off-by: Kui-Feng Lee <[e-mail]>
---
 tools/lib/bpf/libbpf.c | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

Comments

Martin KaFai Lau Feb. 26, 2024, 10:57 p.m. UTC | #1

On 2/22/24 2:26 PM, [e-mail] wrote:
> +/* Convert the data of a struct_ops map to shadow type.
> + *
> + * The function pointers are replaced with the pointers of bpf_program in
> + * st_ops->progs[].
> + */
> +static void struct_ops_convert_shadow(struct bpf_map *map,
> +				      const struct btf_type *t)
> +{
> +	struct btf *btf = map->obj->btf;
> +	struct bpf_struct_ops *st_ops = map->st_ops;
> +	const struct btf_member *m;
> +	const struct btf_type *mtype;
> +	char *data;
> +	int i;
> +
> +	data = st_ops->data;
> +
> +	for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
> +		mtype = skip_mods_and_typedefs(btf, m->type, NULL);
> +
> +		if (btf_kind(mtype) != BTF_KIND_PTR)
> +			continue;
> +		if (!resolve_func_ptr(btf, m->type, NULL))
> +			continue;
> +
> +		*((struct bpf_program **)(data + m->offset / 8)) =
> +			st_ops->progs[i];

This is to initialize the bpf_program pointer in the st_ops->data.
Can this be done directly at the bpf_object__collect_st_ops_relos()?

> +	}
> +}
> +

Kui-Feng Lee Feb. 27, 2024, 12:19 a.m. UTC | #2

On 2/26/24 14:57, Martin KaFai Lau wrote:
> On 2/22/24 2:26 PM, [e-mail] wrote:
>> +/* Convert the data of a struct_ops map to shadow type.
>> + *
>> + * The function pointers are replaced with the pointers of 
>> bpf_program in
>> + * st_ops->progs[].
>> + */
>> +static void struct_ops_convert_shadow(struct bpf_map *map,
>> +                      const struct btf_type *t)
>> +{
>> +    struct btf *btf = map->obj->btf;
>> +    struct bpf_struct_ops *st_ops = map->st_ops;
>> +    const struct btf_member *m;
>> +    const struct btf_type *mtype;
>> +    char *data;
>> +    int i;
>> +
>> +    data = st_ops->data;
>> +
>> +    for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
>> +        mtype = skip_mods_and_typedefs(btf, m->type, NULL);
>> +
>> +        if (btf_kind(mtype) != BTF_KIND_PTR)
>> +            continue;
>> +        if (!resolve_func_ptr(btf, m->type, NULL))
>> +            continue;
>> +
>> +        *((struct bpf_program **)(data + m->offset / 8)) =
>> +            st_ops->progs[i];
> 
> This is to initialize the bpf_program pointer in the st_ops->data.
> Can this be done directly at the bpf_object__collect_st_ops_relos()?

No problem!

> 
>> +    }
>> +}
>> +
>

Patch

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 465b50235a01..becbb4d81012 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1102,6 +1102,9 @@  static int bpf_map__init_kern_struct_ops(struct bpf_map *map)
 		if (btf_is_ptr(mtype)) {
 			struct bpf_program *prog;
 
+			/* Update the value from the shadow type */
+			st_ops->progs[i] = *(struct bpf_program **)mdata;
+
 			prog = st_ops->progs[i];
 			if (!prog)
 				continue;
@@ -1172,6 +1175,36 @@  static int bpf_object__init_kern_struct_ops_maps(struct bpf_object *obj)
 	return 0;
 }
 
+/* Convert the data of a struct_ops map to shadow type.
+ *
+ * The function pointers are replaced with the pointers of bpf_program in
+ * st_ops->progs[].
+ */
+static void struct_ops_convert_shadow(struct bpf_map *map,
+				      const struct btf_type *t)
+{
+	struct btf *btf = map->obj->btf;
+	struct bpf_struct_ops *st_ops = map->st_ops;
+	const struct btf_member *m;
+	const struct btf_type *mtype;
+	char *data;
+	int i;
+
+	data = st_ops->data;
+
+	for (i = 0, m = btf_members(t); i < btf_vlen(t); i++, m++) {
+		mtype = skip_mods_and_typedefs(btf, m->type, NULL);
+
+		if (btf_kind(mtype) != BTF_KIND_PTR)
+			continue;
+		if (!resolve_func_ptr(btf, m->type, NULL))
+			continue;
+
+		*((struct bpf_program **)(data + m->offset / 8)) =
+			st_ops->progs[i];
+	}
+}
+
 static int init_struct_ops_maps(struct bpf_object *obj, const char *sec_name,
 				int shndx, Elf_Data *data, __u32 map_flags)
 {
@@ -7531,6 +7564,19 @@  static int bpf_object_init_progs(struct bpf_object *obj, const struct bpf_object
 	return 0;
 }
 
+/* Convert the data to the shadow type for each struct_ops map. */
+static void bpf_object__init_shadow(struct bpf_object *obj)
+{
+	struct bpf_map *map;
+
+	bpf_object__for_each_map(map, obj) {
+		if (!bpf_map__is_struct_ops(map))
+			continue;
+
+		struct_ops_convert_shadow(map, map->st_ops->type);
+	}
+}
+
 static struct bpf_object *bpf_object_open(const char *path, const void *obj_buf, size_t obj_buf_sz,
 					  const struct bpf_object_open_opts *opts)
 {
@@ -7631,6 +7677,7 @@  static struct bpf_object *bpf_object_open(const char *path, const void *obj_buf,
 		goto out;
 
 	bpf_object__elf_finish(obj);
+	bpf_object__init_shadow(obj);
 
 	return obj;
 out:
@@ -9880,6 +9927,12 @@  int bpf_map__set_initial_value(struct bpf_map *map,
 
 void *bpf_map__initial_value(struct bpf_map *map, size_t *psize)
 {
+	if (bpf_map__is_struct_ops(map)) {
+		if (psize)
+			*psize = map->def.value_size;
+		return map->st_ops->data;
+	}
+
 	if (!map->mmaped)
 		return NULL;
 	*psize = map->def.value_size;