mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
![Alexei Starovoitov](/assets/img/avatar_default.png)
clean up names related to socket filtering and bpf in the following way: - everything that deals with sockets keeps 'sk_*' prefix - everything that is pure BPF is changed to 'bpf_*' prefix split 'struct sk_filter' into struct sk_filter { atomic_t refcnt; struct rcu_head rcu; struct bpf_prog *prog; }; and struct bpf_prog { u32 jited:1, len:31; struct sock_fprog_kern *orig_prog; unsigned int (*bpf_func)(const struct sk_buff *skb, const struct bpf_insn *filter); union { struct sock_filter insns[0]; struct bpf_insn insnsi[0]; struct work_struct work; }; }; so that 'struct bpf_prog' can be used independent of sockets and cleans up 'unattached' bpf use cases split SK_RUN_FILTER macro into: SK_RUN_FILTER to be used with 'struct sk_filter *' and BPF_PROG_RUN to be used with 'struct bpf_prog *' __sk_filter_release(struct sk_filter *) gains __bpf_prog_release(struct bpf_prog *) helper function also perform related renames for the functions that work with 'struct bpf_prog *', since they're on the same lines: sk_filter_size -> bpf_prog_size sk_filter_select_runtime -> bpf_prog_select_runtime sk_filter_free -> bpf_prog_free sk_unattached_filter_create -> bpf_prog_create sk_unattached_filter_destroy -> bpf_prog_destroy sk_store_orig_filter -> bpf_prog_store_orig_filter sk_release_orig_filter -> bpf_release_orig_filter __sk_migrate_filter -> bpf_migrate_filter __sk_prepare_filter -> bpf_prepare_filter API for attaching classic BPF to a socket stays the same: sk_attach_filter(prog, struct sock *)/sk_detach_filter(struct sock *) and SK_RUN_FILTER(struct sk_filter *, ctx) to execute a program which is used by sockets, tun, af_packet API for 'unattached' BPF programs becomes: bpf_prog_create(struct bpf_prog **)/bpf_prog_destroy(struct bpf_prog *) and BPF_PROG_RUN(struct bpf_prog *, ctx) to execute a program which is used by isdn, ppp, team, seccomp, ptp, xt_bpf, cls_bpf, test_bpf Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
74 lines
1.8 KiB
C
74 lines
1.8 KiB
C
/* Xtables module to match packets using a BPF filter.
|
|
* Copyright 2013 Google Inc.
|
|
* Written by Willem de Bruijn <willemb@google.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/filter.h>
|
|
|
|
#include <linux/netfilter/xt_bpf.h>
|
|
#include <linux/netfilter/x_tables.h>
|
|
|
|
MODULE_AUTHOR("Willem de Bruijn <willemb@google.com>");
|
|
MODULE_DESCRIPTION("Xtables: BPF filter match");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("ipt_bpf");
|
|
MODULE_ALIAS("ip6t_bpf");
|
|
|
|
static int bpf_mt_check(const struct xt_mtchk_param *par)
|
|
{
|
|
struct xt_bpf_info *info = par->matchinfo;
|
|
struct sock_fprog_kern program;
|
|
|
|
program.len = info->bpf_program_num_elem;
|
|
program.filter = info->bpf_program;
|
|
|
|
if (bpf_prog_create(&info->filter, &program)) {
|
|
pr_info("bpf: check failed: parse error\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static bool bpf_mt(const struct sk_buff *skb, struct xt_action_param *par)
|
|
{
|
|
const struct xt_bpf_info *info = par->matchinfo;
|
|
|
|
return BPF_PROG_RUN(info->filter, skb);
|
|
}
|
|
|
|
static void bpf_mt_destroy(const struct xt_mtdtor_param *par)
|
|
{
|
|
const struct xt_bpf_info *info = par->matchinfo;
|
|
bpf_prog_destroy(info->filter);
|
|
}
|
|
|
|
static struct xt_match bpf_mt_reg __read_mostly = {
|
|
.name = "bpf",
|
|
.revision = 0,
|
|
.family = NFPROTO_UNSPEC,
|
|
.checkentry = bpf_mt_check,
|
|
.match = bpf_mt,
|
|
.destroy = bpf_mt_destroy,
|
|
.matchsize = sizeof(struct xt_bpf_info),
|
|
.me = THIS_MODULE,
|
|
};
|
|
|
|
static int __init bpf_mt_init(void)
|
|
{
|
|
return xt_register_match(&bpf_mt_reg);
|
|
}
|
|
|
|
static void __exit bpf_mt_exit(void)
|
|
{
|
|
xt_unregister_match(&bpf_mt_reg);
|
|
}
|
|
|
|
module_init(bpf_mt_init);
|
|
module_exit(bpf_mt_exit);
|