From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_MED,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33E17C04AB5 for ; Thu, 6 Jun 2019 17:51:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1340720872 for ; Thu, 6 Jun 2019 17:51:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eCdWzDbU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729124AbfFFRvz (ORCPT ); Thu, 6 Jun 2019 13:51:55 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:51314 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728869AbfFFRvy (ORCPT ); Thu, 6 Jun 2019 13:51:54 -0400 Received: by mail-qk1-f202.google.com with SMTP id n126so2606954qkc.18 for ; Thu, 06 Jun 2019 10:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=3tOtYRuhXCtBCMG8P2HcvEDG0NzhuNf5NunKSxzELH4=; b=eCdWzDbUdSa4kepX8HThWqvQ6FEkFuDnry9hCdkM4Zt2g6hz98x3Q+7Urh+/fOyTb1 dBcpKepTT9amz5kF7ndOLWnorlQvqoQQV6oFEeQ19SqN3gPBOIjm3DWLPqgD8ZE55qUI bEO9mDn3rzcmb1qRh4AsT2X7rpzo6OsCI7cKUYpjnT5zNN1Rj5oHzHIXowEuVPIGVhM1 e8RAmpOl1NRtvU+nlboVAl+C0WUAptBJFAED8CUHbDxK7KZCW6ROEKuCOePebS+kaQGh 2rq0wQTqlAM1SC6zAoKXjHJOg5pwBhB7f707ZVp0i4PONhAnb1W58mmChY0KtT1FGRjW oXTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3tOtYRuhXCtBCMG8P2HcvEDG0NzhuNf5NunKSxzELH4=; b=S0a+2F/wNaRQBXLn3TyOzsHGXeDZOxwJLxuP+g+4FBBGmKx8ulluiQB+8SPs/NLj0P xRaMq0Z5ViXFipeZuEHL3r6PI1So6iMKkY+MtBcJ3Yj0jbX6ttYP4ukeUJj1pLOs4AQ4 ZxoERcF9FyOpvkPW6qpmjT1w2261Q9EX+QvJj9SQyUpvLYiWcrHQDnXclLrkmAfG8MRA aAOH51MbOymWzZiKv0SfNEehAv+77iiNcHYMjYKXQBpKtsropuyPvIBjpUw2IOrB2plZ /XZidTtkqfivpSqi//+uvGMLx6CReNoQAeWU/0Kyp/i7PU6IHDdP5ZmWo1UCsIXgNyF9 LMaQ== X-Gm-Message-State: APjAAAV0sHXOmWQ/Q1pUSarwWdVgOrhYEQrCZ1+oJZ9BH+ixi1/9kIEN RqcbShUvV3uz7XPUpLBHLj9u5zzuZ7shh/keJklOOypJjlJG1qWxqJu/LhsxxUh7RCE/bGXOYHq LfXeC/QcPBd2yWSZ7jzea3Q2vQa63g+UI8n7S0vehFSYu/8ad2egKOA== X-Google-Smtp-Source: APXvYqycamng+rPbnUuRN6QV9DVbXwrRtwwr5/56eA7JJXJEQpKlVOq1aAvb6k2VeyDfJESCnut5X+s= X-Received: by 2002:a37:4d41:: with SMTP id a62mr36656042qkb.99.1559843513584; Thu, 06 Jun 2019 10:51:53 -0700 (PDT) Date: Thu, 6 Jun 2019 10:51:40 -0700 In-Reply-To: <20190606175146.205269-1-sdf@google.com> Message-Id: <20190606175146.205269-3-sdf@google.com> Mime-Version: 1.0 References: <20190606175146.205269-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.rc1.311.g5d7573a151-goog Subject: [PATCH bpf-next v2 2/8] bpf: sync bpf.h to tools/ From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Export new prog type and hook points to the libbpf. Signed-off-by: Stanislav Fomichev --- tools/include/uapi/linux/bpf.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 7c6aef253173..310b6bbfded8 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -170,6 +170,7 @@ enum bpf_prog_type { BPF_PROG_TYPE_FLOW_DISSECTOR, BPF_PROG_TYPE_CGROUP_SYSCTL, BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE, + BPF_PROG_TYPE_CGROUP_SOCKOPT, }; enum bpf_attach_type { @@ -192,6 +193,8 @@ enum bpf_attach_type { BPF_LIRC_MODE2, BPF_FLOW_DISSECTOR, BPF_CGROUP_SYSCTL, + BPF_CGROUP_GETSOCKOPT, + BPF_CGROUP_SETSOCKOPT, __MAX_BPF_ATTACH_TYPE }; @@ -3533,4 +3536,15 @@ struct bpf_sysctl { */ }; +struct bpf_sockopt { + __bpf_md_ptr(struct bpf_sock *, sk); + + __s32 level; + __s32 optname; + + __u32 optlen; + __u32 optval; + __u32 optval_end; +}; + #endif /* _UAPI__LINUX_BPF_H__ */ -- 2.22.0.rc1.311.g5d7573a151-goog