From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Subject: Re: [PATCH bpf-next 6/6] bpf: BPF_PROG_TYPE_CGROUP_{SKB,SOCK,SOCK_ADDR}
 require cgroups enabled
Date: Fri, 14 Dec 2018 17:11:03 -0800
Message-ID: <CAADnVQJE3v894ArK1G9720hZY=0YSyV9iobabssjx-b7KjspkA@mail.gmail.com>
References: <20181213190301.65816-1-sdf@google.com> <20181213190301.65816-7-sdf@google.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Cc: Network Development <netdev@vger.kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Edward Cree <ecree@solarflare.com>,
        Quentin Monnet <quentin.monnet@netronome.com>
To: Stanislav Fomichev <sdf@google.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-lj1-f194.google.com ([209.85.208.194]:42380 "EHLO
        mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726609AbeLOBLS (ORCPT
        <rfc822;netdev@vger.kernel.org>); Fri, 14 Dec 2018 20:11:18 -0500
Received: by mail-lj1-f194.google.com with SMTP id l15-v6so6397770lja.9
        for <netdev@vger.kernel.org>; Fri, 14 Dec 2018 17:11:16 -0800 (PST)
In-Reply-To: <20181213190301.65816-7-sdf@google.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Thu, Dec 13, 2018 at 11:03 AM Stanislav Fomichev <sdf@google.com> wrote:
>
> There is no way to exercise appropriate attach points without cgroups
> enabled. This lets test_verifier correctly skip tests for these
> prog_types if kernel was compiled without BPF cgroup support.
>
> Signed-off-by: Stanislav Fomichev <sdf@google.com>
> ---
>  include/linux/bpf_types.h |  2 ++
>  net/core/filter.c         | 18 ++++++++++++++++++
>  2 files changed, 20 insertions(+)
>
> diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h
> index 44d9ab4809bd..08bf2f1fe553 100644
> --- a/include/linux/bpf_types.h
> +++ b/include/linux/bpf_types.h
> @@ -6,9 +6,11 @@ BPF_PROG_TYPE(BPF_PROG_TYPE_SOCKET_FILTER, sk_filter)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_CLS, tc_cls_act)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_SCHED_ACT, tc_cls_act)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_XDP, xdp)
> +#ifdef CONFIG_CGROUP_BPF
>  BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SKB, cg_skb)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK, cg_sock)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, cg_sock_addr)
> +#endif
>  BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_IN, lwt_in)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_OUT, lwt_out)
>  BPF_PROG_TYPE(BPF_PROG_TYPE_LWT_XMIT, lwt_xmit)
> diff --git a/net/core/filter.c b/net/core/filter.c
> index f9348806e843..6a390e519431 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -5315,6 +5315,7 @@ bpf_base_func_proto(enum bpf_func_id func_id)
>         }
>  }
>
> +#ifdef CONFIG_CGROUP_BPF
>  static const struct bpf_func_proto *
>  sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
>  {
> @@ -5364,6 +5365,7 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
>                 return bpf_base_func_proto(func_id);
>         }
>  }
> +#endif
>
>  static const struct bpf_func_proto *
>  sk_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
> @@ -5382,6 +5384,7 @@ sk_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
>         }
>  }
>
> +#ifdef CONFIG_CGROUP_BPF
>  static const struct bpf_func_proto *
>  cg_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)

I don't think it's worth uglifying the code like this.
I prefer to leave it as-is.