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=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 729CCC282CE for ; Tue, 4 Jun 2019 21:35:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 451EA207E0 for ; Tue, 4 Jun 2019 21:35:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="R9O5zBUv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726510AbfFDVff (ORCPT ); Tue, 4 Jun 2019 17:35:35 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:50282 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbfFDVfe (ORCPT ); Tue, 4 Jun 2019 17:35:34 -0400 Received: by mail-qt1-f202.google.com with SMTP id g30so11826637qtm.17 for ; Tue, 04 Jun 2019 14:35:34 -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=XK0eih1n6zYzYlyLg0LkT0iv/L7hits8mcx9itm13cQ=; b=R9O5zBUvPhnbTvR6k9U2ClcE1X9YCIA7WmSNH9lNG4YnxKieTWBciH97ZfhBeCXVw3 lnsTDtiA3kUs5VHXDlymMHhssxkc2HsEqUUiuej758yvSf2mI+i7TCPzii9FOLbooLvE qsWdyk119DwvLINnmppbjy/XL8+cr63s9UuQvG/3dE9QFBRsTj2b0kMQWRY32kbau8Q2 4prJf5shnF+yDXRMieEuZEmZq93H2E42FoPb/QnZm5lAcACLCQI6cGZ+oZQv6eJI8m1M vai/hNaUcQbn29/v9AmV7aOdnMAn9OXMiaSF4Rt4z5W1qhzmcmFOC+pk84f2iRXAt6df ZJRA== 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=XK0eih1n6zYzYlyLg0LkT0iv/L7hits8mcx9itm13cQ=; b=VHhIX8n2vvgGET38OTq1u5vPahacF8eWuxCy714r0P0FrOsQKRiVVoI070WgnJFPn7 BzO31RJRVijUDGWt7LfBEFhC5DFojV6KAUB4Hs7p3kajQ81/lpHWQ3RaJ1Ogq+rN6+2+ nNAKiVMrbYhI5xio7+bk9Ce5BQALz5Qum7afEammh2BFn0/YfYTIFEsso6aNWMN2QO3W tTdWzkbAPUSL3sk54uIe8ceZ2rwb8CYt9yXE7BQAuXskm2kscSkY5HywZBoeR9ldT86g 1N2zOwUi5huhMyEbLTcajZYq3xLqtNCIKv5Us81XgQ76P9OgvyZJcElrrARjGP/AN9Av y7hw== X-Gm-Message-State: APjAAAUK1SMo5aeQi6izJrL7nNK9Pr/VMTQjfEvG7DDk9K03NPX+f+A+ IjtsqwI9+vUd32WvLMJ0jI9x/CQ= X-Google-Smtp-Source: APXvYqwAP1eOiV84kmjXmknhgYAj+J3DxfnDTGVLakiGp3ra337zgH1aA7jHJ5W/RNwCGpd4BYznyRU= X-Received: by 2002:a37:b3c2:: with SMTP id c185mr29138123qkf.44.1559684134006; Tue, 04 Jun 2019 14:35:34 -0700 (PDT) Date: Tue, 4 Jun 2019 14:35:19 -0700 In-Reply-To: <20190604213524.76347-1-sdf@google.com> Message-Id: <20190604213524.76347-3-sdf@google.com> Mime-Version: 1.0 References: <20190604213524.76347-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.rc1.311.g5d7573a151-goog Subject: [PATCH bpf-next 2/7] 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: 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. Signed-off-by: Stanislav Fomichev --- tools/include/uapi/linux/bpf.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 7c6aef253173..b6c3891241ef 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 }; @@ -2815,7 +2818,8 @@ union bpf_attr { FN(strtoul), \ FN(sk_storage_get), \ FN(sk_storage_delete), \ - FN(send_signal), + FN(send_signal), \ + FN(sockopt_handled), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3533,4 +3537,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