bpf, net: switch to dynamic registration

[linux-2.6-microblaze.git] / kernel / bpf / bpf_struct_ops.c

diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index 30ab34f..defc052 100644 (file)
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -62,35 +62,6 @@ static DEFINE_MUTEX(update_mutex);
 #define VALUE_PREFIX "bpf_struct_ops_"
 #define VALUE_PREFIX_LEN (sizeof(VALUE_PREFIX) - 1)
 
-/* bpf_struct_ops_##_name (e.g. bpf_struct_ops_tcp_congestion_ops) is
- * the map's value exposed to the userspace and its btf-type-id is
- * stored at the map->btf_vmlinux_value_type_id.
- *
- */
-#define BPF_STRUCT_OPS_TYPE(_name)                             \
-extern struct bpf_struct_ops bpf_##_name;                      \
-                                                               \
-struct bpf_struct_ops_##_name {                                        \
-       struct bpf_struct_ops_common_value common;              \
-       struct _name data ____cacheline_aligned_in_smp;         \
-};
-#include "bpf_struct_ops_types.h"
-#undef BPF_STRUCT_OPS_TYPE
-
-enum {
-#define BPF_STRUCT_OPS_TYPE(_name) BPF_STRUCT_OPS_TYPE_##_name,
-#include "bpf_struct_ops_types.h"
-#undef BPF_STRUCT_OPS_TYPE
-       __NR_BPF_STRUCT_OPS_TYPE,
-};
-
-static struct bpf_struct_ops_desc bpf_struct_ops[] = {
-#define BPF_STRUCT_OPS_TYPE(_name)                             \
-       [BPF_STRUCT_OPS_TYPE_##_name] = { .st_ops = &bpf_##_name },
-#include "bpf_struct_ops_types.h"
-#undef BPF_STRUCT_OPS_TYPE
-};
-
 const struct bpf_verifier_ops bpf_struct_ops_verifier_ops = {
 };
 
@@ -145,9 +116,9 @@ static bool is_valid_value_type(struct btf *btf, s32 value_id,
        return true;
 }
 
-static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
-                                    struct btf *btf,
-                                    struct bpf_verifier_log *log)
+int bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
+                            struct btf *btf,
+                            struct bpf_verifier_log *log)
 {
        struct bpf_struct_ops *st_ops = st_ops_desc->st_ops;
        const struct btf_member *member;
@@ -161,7 +132,7 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
            sizeof(value_name)) {
                pr_warn("struct_ops name %s is too long\n",
                        st_ops->name);
-               return;
+               return -EINVAL;
        }
        sprintf(value_name, "%s%s", VALUE_PREFIX, st_ops->name);
 
@@ -170,13 +141,13 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
        if (type_id < 0) {
                pr_warn("Cannot find struct %s in %s\n",
                        st_ops->name, btf_get_name(btf));
-               return;
+               return -EINVAL;
        }
        t = btf_type_by_id(btf, type_id);
        if (btf_type_vlen(t) > BPF_STRUCT_OPS_MAX_NR_MEMBERS) {
                pr_warn("Cannot support #%u members in struct %s\n",
                        btf_type_vlen(t), st_ops->name);
-               return;
+               return -EINVAL;
        }
 
        value_id = btf_find_by_name_kind(btf, value_name,
@@ -184,10 +155,10 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
        if (value_id < 0) {
                pr_warn("Cannot find struct %s in %s\n",
                        value_name, btf_get_name(btf));
-               return;
+               return -EINVAL;
        }
        if (!is_valid_value_type(btf, value_id, t, value_name))
-               return;
+               return -EINVAL;
 
        for_each_member(i, t, member) {
                const struct btf_type *func_proto;
@@ -196,13 +167,13 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
                if (!*mname) {
                        pr_warn("anon member in struct %s is not supported\n",
                                st_ops->name);
-                       break;
+                       return -EOPNOTSUPP;
                }
 
                if (__btf_member_bitfield_size(t, member)) {
                        pr_warn("bit field member %s in struct %s is not supported\n",
                                mname, st_ops->name);
-                       break;
+                       return -EOPNOTSUPP;
                }
 
                func_proto = btf_type_resolve_func_ptr(btf,
@@ -214,7 +185,7 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
                                           &st_ops->func_models[i])) {
                        pr_warn("Error in parsing func ptr %s in struct %s\n",
                                mname, st_ops->name);
-                       break;
+                       return -EINVAL;
                }
        }
 
@@ -222,6 +193,7 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
                if (st_ops->init(btf)) {
                        pr_warn("Error in init bpf_struct_ops %s\n",
                                st_ops->name);
+                       return -EINVAL;
                } else {
                        st_ops_desc->type_id = type_id;
                        st_ops_desc->type = t;
@@ -230,54 +202,8 @@ static void bpf_struct_ops_desc_init(struct bpf_struct_ops_desc *st_ops_desc,
                                                                 value_id);
                }
        }
-}
 
-void bpf_struct_ops_init(struct btf *btf, struct bpf_verifier_log *log)
-{
-       struct bpf_struct_ops_desc *st_ops_desc;
-       u32 i;
-
-       /* Ensure BTF type is emitted for "struct bpf_struct_ops_##_name" */
-#define BPF_STRUCT_OPS_TYPE(_name) BTF_TYPE_EMIT(struct bpf_struct_ops_##_name);
-#include "bpf_struct_ops_types.h"
-#undef BPF_STRUCT_OPS_TYPE
-
-       for (i = 0; i < ARRAY_SIZE(bpf_struct_ops); i++) {
-               st_ops_desc = &bpf_struct_ops[i];
-               bpf_struct_ops_desc_init(st_ops_desc, btf, log);
-       }
-}
-
-static const struct bpf_struct_ops_desc *
-bpf_struct_ops_find_value(struct btf *btf, u32 value_id)
-{
-       unsigned int i;
-
-       if (!value_id || !btf)
-               return NULL;
-
-       for (i = 0; i < ARRAY_SIZE(bpf_struct_ops); i++) {
-               if (bpf_struct_ops[i].value_id == value_id)
-                       return &bpf_struct_ops[i];
-       }
-
-       return NULL;
-}
-
-const struct bpf_struct_ops_desc *
-bpf_struct_ops_find(struct btf *btf, u32 type_id)
-{
-       unsigned int i;
-
-       if (!type_id || !btf)
-               return NULL;
-
-       for (i = 0; i < ARRAY_SIZE(bpf_struct_ops); i++) {
-               if (bpf_struct_ops[i].type_id == type_id)
-                       return &bpf_struct_ops[i];
-       }
-
-       return NULL;
+       return 0;
 }
 
 static int bpf_struct_ops_map_get_next_key(struct bpf_map *map, void *key,