From: Daniel Borkmann <daniel@iogearbox•net>
To: David Ahern <dsa@cumulusnetworks•com>, netdev@vger•kernel.org
Cc: daniel@zonque•org, ast@fb•com
Subject: Re: [PATCH net-next 1/3] bpf: Refactor cgroups code in prep for new type
Date: Wed, 26 Oct 2016 01:01:35 +0200 [thread overview]
Message-ID: <580FE44F.2030403@iogearbox.net> (raw)
In-Reply-To: <1477434613-3169-2-git-send-email-dsa@cumulusnetworks.com>
On 10/26/2016 12:30 AM, David Ahern wrote:
> Code move only; no functional change intended.
Not quite, see below.
> Signed-off-by: David Ahern <dsa@cumulusnetworks•com>
> ---
> kernel/bpf/cgroup.c | 27 ++++++++++++++++++++++-----
> kernel/bpf/syscall.c | 28 +++++++++++++++-------------
> 2 files changed, 37 insertions(+), 18 deletions(-)
>
> diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
> index a0ab43f264b0..918c01a6f129 100644
> --- a/kernel/bpf/cgroup.c
> +++ b/kernel/bpf/cgroup.c
> @@ -117,6 +117,19 @@ void __cgroup_bpf_update(struct cgroup *cgrp,
> }
> }
>
> +static int __cgroup_bpf_run_filter_skb(struct sk_buff *skb,
> + struct bpf_prog *prog)
> +{
> + unsigned int offset = skb->data - skb_network_header(skb);
> + int ret;
> +
> + __skb_push(skb, offset);
> + ret = bpf_prog_run_clear_cb(prog, skb) == 1 ? 0 : -EPERM;
Original code save skb->cb[], this one clears it.
> + __skb_pull(skb, offset);
> +
> + return ret;
> +}
> +
> /**
> * __cgroup_bpf_run_filter() - Run a program for packet filtering
> * @sk: The socken sending or receiving traffic
> @@ -153,11 +166,15 @@ int __cgroup_bpf_run_filter(struct sock *sk,
>
> prog = rcu_dereference(cgrp->bpf.effective[type]);
> if (prog) {
> - unsigned int offset = skb->data - skb_network_header(skb);
> -
> - __skb_push(skb, offset);
> - ret = bpf_prog_run_save_cb(prog, skb) == 1 ? 0 : -EPERM;
> - __skb_pull(skb, offset);
> + switch (type) {
> + case BPF_CGROUP_INET_INGRESS:
> + case BPF_CGROUP_INET_EGRESS:
> + ret = __cgroup_bpf_run_filter_skb(skb, prog);
> + break;
> + /* make gcc happy else complains about missing enum value */
> + default:
> + return 0;
> + }
> }
next prev parent reply other threads:[~2016-10-25 23:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 22:30 [PATCH net-next 0/3] Add bpf support to set sk_bound_dev_if David Ahern
2016-10-25 22:30 ` [PATCH net-next 1/3] bpf: Refactor cgroups code in prep for new type David Ahern
2016-10-25 23:01 ` Daniel Borkmann [this message]
2016-10-25 23:04 ` David Ahern
2016-10-25 22:30 ` [PATCH net-next 2/3] bpf: Add new cgroups prog type to enable sock modifications David Ahern
2016-10-25 23:28 ` Daniel Borkmann
2016-10-26 1:55 ` Alexei Starovoitov
2016-10-26 2:38 ` David Ahern
2016-10-26 2:05 ` David Ahern
2016-10-26 8:33 ` Daniel Borkmann
2016-10-26 15:44 ` David Ahern
[not found] ` <CAF2d9jhE0OHgWrDfHwYzRk2tDbnmK_=ZdgFd2-ccpbTjdQzqmQ@mail.gmail.com>
2016-10-26 20:42 ` David Ahern
2016-10-25 23:39 ` Eric Dumazet
2016-10-26 2:21 ` David Ahern
2016-10-26 2:48 ` Eric Dumazet
2016-10-26 3:09 ` David Ahern
2016-10-26 8:41 ` Thomas Graf
2016-10-26 16:08 ` David Ahern
2016-10-26 18:57 ` Thomas Graf
2016-10-25 22:30 ` [PATCH net-next 3/3] samples: bpf: add userspace example for modifying sk_bound_dev_if David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=580FE44F.2030403@iogearbox.net \
--to=daniel@iogearbox$(echo .)net \
--cc=ast@fb$(echo .)com \
--cc=daniel@zonque$(echo .)org \
--cc=dsa@cumulusnetworks$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox