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.4 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=ham 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 EEC1EC31E40 for ; Mon, 10 Jun 2019 16:34:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7C6B20859 for ; Mon, 10 Jun 2019 16:34:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GbJtMFB5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728165AbfFJQea (ORCPT ); Mon, 10 Jun 2019 12:34:30 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:48727 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728183AbfFJQea (ORCPT ); Mon, 10 Jun 2019 12:34:30 -0400 Received: by mail-pf1-f202.google.com with SMTP id u21so4434206pfn.15 for ; Mon, 10 Jun 2019 09:34:29 -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=rzQAcgfGN5K6LU4CelXji685pxXu/comsqrtS35LUIQ=; b=GbJtMFB5zQ02SKMkJf3EeDILDaUmtvRgmgM/J9VzEv1HLmAo3Ag50o384ggtnLJPOi f3K3f6qlTFgq0ff+ABXERnsH5rRt+zMN5WeIZ5OPK2/KytGzbU0XLXkK2zgIOGesFds7 VNM3GRSRWgOWaEHEMQEdIPIBfmTO48Xk/RTNVPZjDE1sYNsyzJbk2i+DGGGXkn2yhNc0 BkBr0APNER88c/cs17oLMNin0KQgwYc+vjAU3cKGcFNdN/tLG4wOQBjRmJm/X4IziUqY 30uAmxOQHTlwf3ewA3ZVOznuKxd2ie0sRiUj8WKGssEkw8mO8Guz/br3Y2RAuwg38GA/ xYUw== 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=rzQAcgfGN5K6LU4CelXji685pxXu/comsqrtS35LUIQ=; b=ehXwnzmnjUTR1TRbrJ7P9PzW7W4bFg10MdfpDSXm1x0wjXAYHmlc6fzan8gc75ojXY 8cIXEriSaGL7o/YA3X7L0OhLWP0/Dj1CpJJfwtmxe+sxSrZzvc0O/G0byAhY36/wYx3h hWdC2t2s6RH8zYHv7glORLScQNmQcH6DxossCGjZly0MuAE55yXHhKt/tvgvhpdjsAo7 +quA3+vaQgWTBl33Cve8rK7h7+7THqDNQlxU/4gQ33nTSKZtyUGuE7HVsWDU1NswY0So dv2iWMdt5XopdZ2c74x2WarLO6v7hwYSeTgel0jMdWPCVPkEQYjw7qq/siclLhL09Xgg Zo4A== X-Gm-Message-State: APjAAAWRn0pM7LEAG106Jl5CGCXTjUXaGpm3YC6fixuzNqlJYoqo38/E TWJmmrKdvJ3qcFr2TyFLASDGyuI= X-Google-Smtp-Source: APXvYqyrVHjxMYQH10x5Cq3347EgblZ1moc+UbMeTkGUvsDhfcsR4z+HIk1WGDH+4TXcmy9Fx4aHbyA= X-Received: by 2002:a65:408d:: with SMTP id t13mr16073782pgp.373.1560184468882; Mon, 10 Jun 2019 09:34:28 -0700 (PDT) Date: Mon, 10 Jun 2019 09:34:15 -0700 In-Reply-To: <20190610163421.208126-1-sdf@google.com> Message-Id: <20190610163421.208126-3-sdf@google.com> Mime-Version: 1.0 References: <20190610163421.208126-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [PATCH bpf-next v4 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 , Martin Lau Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Export new prog type and hook points to the libbpf. Cc: Martin Lau 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..174136aa6906 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); + __bpf_md_ptr(void *, optval); + __bpf_md_ptr(void *, optval_end); + + __s32 level; + __s32 optname; + + __u32 optlen; +}; + #endif /* _UAPI__LINUX_BPF_H__ */ -- 2.22.0.rc2.383.gf4fbbf30c2-goog