bpf: minimal support for programs hooked into netfilter framework

This adds minimal support for BPF_PROG_TYPE_NETFILTER bpf programs
that will be invoked via the NF_HOOK() points in the ip stack.

Invocation incurs an indirect call.  This is not a necessity: Its
possible to add 'DEFINE_BPF_DISPATCHER(nf_progs)' and handle the
program invocation with the same method already done for xdp progs.

This isn't done here to keep the size of this chunk down.

Verifier restricts verdicts to either DROP or ACCEPT.

Signed-off-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20230421170300.24115-3-fw@strlen.de
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h
index d4ee3ccd37531b8e2d1fc8492168cc253e3547d9..39a999abb0ceb49e885c158b7ac67d8ffe41b885 100644 (file)
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
@@ -79,6 +79,10 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_LSM, lsm,
 #endif
 BPF_PROG_TYPE(BPF_PROG_TYPE_SYSCALL, bpf_syscall,
              void *, void *)
+#ifdef CONFIG_NETFILTER
+BPF_PROG_TYPE(BPF_PROG_TYPE_NETFILTER, netfilter,
+             struct bpf_nf_ctx, struct bpf_nf_ctx)
+#endif
 
 BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY, array_map_ops)
 BPF_MAP_TYPE(BPF_MAP_TYPE_PERCPU_ARRAY, percpu_array_map_ops)

diff --git a/include/net/netfilter/nf_bpf_link.h b/include/net/netfilter/nf_bpf_link.h
index eeaeaf3d15de10e29f5e3ebd06ae7a966f1f9423..6c984b0ea83881b030c2cfb5931918d6ddfaf5a3 100644 (file)
--- a/include/net/netfilter/nf_bpf_link.h
+++ b/include/net/netfilter/nf_bpf_link.h
@@ -1,5 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
+struct bpf_nf_ctx {
+       const struct nf_hook_state *state;
+       struct sk_buff *skb;
+};
+
 #if IS_ENABLED(CONFIG_NETFILTER_BPF_LINK)
 int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog);
 #else

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 7db4ec125fbd60b8b31c1874aead793e8a18c15b..6b682b8e4b50d2df592503ae3dc3acc87fd5db34 100644 (file)
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -25,6 +25,9 @@
 #include <linux/bsearch.h>
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
+
+#include <net/netfilter/nf_bpf_link.h>
+
 #include <net/sock.h>
 #include "../tools/lib/bpf/relo_core.h"
 
@@ -212,6 +215,7 @@ enum btf_kfunc_hook {
        BTF_KFUNC_HOOK_SK_SKB,
        BTF_KFUNC_HOOK_SOCKET_FILTER,
        BTF_KFUNC_HOOK_LWT,
+       BTF_KFUNC_HOOK_NETFILTER,
        BTF_KFUNC_HOOK_MAX,
 };
 
@@ -7802,6 +7806,8 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type)
        case BPF_PROG_TYPE_LWT_XMIT:
        case BPF_PROG_TYPE_LWT_SEG6LOCAL:
                return BTF_KFUNC_HOOK_LWT;
+       case BPF_PROG_TYPE_NETFILTER:
+               return BTF_KFUNC_HOOK_NETFILTER;
        default:
                return BTF_KFUNC_HOOK_MAX;
        }

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 1e05355facdcc34fb19f6456a567930be04caec4..fc7281d39e4602fe295353df8dc76e523457c8b2 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -13816,6 +13816,9 @@ static int check_return_code(struct bpf_verifier_env *env)
                }
                break;
 
+       case BPF_PROG_TYPE_NETFILTER:
+               range = tnum_range(NF_DROP, NF_ACCEPT);
+               break;
        case BPF_PROG_TYPE_EXT:
                /* freplace program can return anything as its return value
                 * depends on the to-be-replaced kernel func or bpf program.

diff --git a/net/core/filter.c b/net/core/filter.c
index 44fb997434ad25d27ab55e8dc7e9a357fc4b8a76..d9ce04ca22ce8045bfc96cdc9cb1f9dbdd94d727 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -11717,6 +11717,7 @@ static int __init bpf_kfunc_init(void)
        ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_IN, &bpf_kfunc_set_skb);
        ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_XMIT, &bpf_kfunc_set_skb);
        ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_LWT_SEG6LOCAL, &bpf_kfunc_set_skb);
+       ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_NETFILTER, &bpf_kfunc_set_skb);
        return ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &bpf_kfunc_set_xdp);
 }
 late_initcall(bpf_kfunc_init);

diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
index efa4f33907429a2dc67c6ff831e13743e1de46e0..49cfc5215386d1909d47d5a316f7977561e90948 100644 (file)
--- a/net/netfilter/nf_bpf_link.c
+++ b/net/netfilter/nf_bpf_link.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/bpf.h>
+#include <linux/filter.h>
 #include <linux/netfilter.h>
 
 #include <net/netfilter/nf_bpf_link.h>
@@ -8,7 +9,13 @@
 static unsigned int nf_hook_run_bpf(void *bpf_prog, struct sk_buff *skb,
                                    const struct nf_hook_state *s)
 {
-       return NF_ACCEPT;
+       const struct bpf_prog *prog = bpf_prog;
+       struct bpf_nf_ctx ctx = {
+               .state = s,
+               .skb = skb,
+       };
+
+       return bpf_prog_run(prog, &ctx);
 }
 
 struct bpf_nf_link {
@@ -157,3 +164,64 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
 
        return bpf_link_settle(&link_primer);
 }
+
+const struct bpf_prog_ops netfilter_prog_ops = {
+};
+
+static bool nf_ptr_to_btf_id(struct bpf_insn_access_aux *info, const char *name)
+{
+       struct btf *btf;
+       s32 type_id;
+
+       btf = bpf_get_btf_vmlinux();
+       if (IS_ERR_OR_NULL(btf))
+               return false;
+
+       type_id = btf_find_by_name_kind(btf, name, BTF_KIND_STRUCT);
+       if (WARN_ON_ONCE(type_id < 0))
+               return false;
+
+       info->btf = btf;
+       info->btf_id = type_id;
+       info->reg_type = PTR_TO_BTF_ID | PTR_TRUSTED;
+       return true;
+}
+
+static bool nf_is_valid_access(int off, int size, enum bpf_access_type type,
+                              const struct bpf_prog *prog,
+                              struct bpf_insn_access_aux *info)
+{
+       if (off < 0 || off >= sizeof(struct bpf_nf_ctx))
+               return false;
+
+       if (type == BPF_WRITE)
+               return false;
+
+       switch (off) {
+       case bpf_ctx_range(struct bpf_nf_ctx, skb):
+               if (size != sizeof_field(struct bpf_nf_ctx, skb))
+                       return false;
+
+               return nf_ptr_to_btf_id(info, "sk_buff");
+       case bpf_ctx_range(struct bpf_nf_ctx, state):
+               if (size != sizeof_field(struct bpf_nf_ctx, state))
+                       return false;
+
+               return nf_ptr_to_btf_id(info, "nf_hook_state");
+       default:
+               return false;
+       }
+
+       return false;
+}
+
+static const struct bpf_func_proto *
+bpf_nf_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
+{
+       return bpf_base_func_proto(func_id);
+}
+
+const struct bpf_verifier_ops netfilter_verifier_ops = {
+       .is_valid_access        = nf_is_valid_access,
+       .get_func_proto         = bpf_nf_func_proto,
+};