Skip to content

Commit 8ba651e

Browse files
Byte-LabMartin KaFai Lau
authored andcommitted
bpf: Support default .validate() and .update() behavior for struct_ops links
Currently, if a struct_ops map is loaded with BPF_F_LINK, it must also define the .validate() and .update() callbacks in its corresponding struct bpf_struct_ops in the kernel. Enabling struct_ops link is useful in its own right to ensure that the map is unloaded if an application crashes. For example, with sched_ext, we want to automatically unload the host-wide scheduler if the application crashes. We would likely never support updating elements of a sched_ext struct_ops map, so we'd have to implement these callbacks showing that they _can't_ support element updates just to benefit from the basic lifetime management of struct_ops links. Let's enable struct_ops maps to work with BPF_F_LINK even if they haven't defined these callbacks, by assuming that a struct_ops map element cannot be updated by default. Acked-by: Kui-Feng Lee <thinker.li@gmail.com> Signed-off-by: David Vernet <void@manifault.com> Link: https://lore.kernel.org/r/20230814185908.700553-2-void@manifault.com Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
1 parent ccd9a8b commit 8ba651e

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

kernel/bpf/bpf_struct_ops.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,12 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
509509
}
510510

511511
if (st_map->map.map_flags & BPF_F_LINK) {
512-
err = st_ops->validate(kdata);
513-
if (err)
514-
goto reset_unlock;
512+
err = 0;
513+
if (st_ops->validate) {
514+
err = st_ops->validate(kdata);
515+
if (err)
516+
goto reset_unlock;
517+
}
515518
set_memory_rox((long)st_map->image, 1);
516519
/* Let bpf_link handle registration & unregistration.
517520
*
@@ -663,9 +666,6 @@ static struct bpf_map *bpf_struct_ops_map_alloc(union bpf_attr *attr)
663666
if (attr->value_size != vt->size)
664667
return ERR_PTR(-EINVAL);
665668

666-
if (attr->map_flags & BPF_F_LINK && (!st_ops->validate || !st_ops->update))
667-
return ERR_PTR(-EOPNOTSUPP);
668-
669669
t = st_ops->type;
670670

671671
st_map_size = sizeof(*st_map) +
@@ -823,6 +823,9 @@ static int bpf_struct_ops_map_link_update(struct bpf_link *link, struct bpf_map
823823
if (!bpf_struct_ops_valid_to_reg(new_map))
824824
return -EINVAL;
825825

826+
if (!st_map->st_ops->update)
827+
return -EOPNOTSUPP;
828+
826829
mutex_lock(&update_mutex);
827830

828831
old_map = rcu_dereference_protected(st_link->map, lockdep_is_held(&update_mutex));

0 commit comments

Comments
 (0)