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=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 A3B6BC4321D for ; Mon, 10 Jun 2019 21:08:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7997F20820 for ; Mon, 10 Jun 2019 21:08:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sVFOiHnA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389902AbfFJVIj (ORCPT ); Mon, 10 Jun 2019 17:08:39 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:42333 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389884AbfFJVIi (ORCPT ); Mon, 10 Jun 2019 17:08:38 -0400 Received: by mail-qk1-f201.google.com with SMTP id l16so9179788qkk.9 for ; Mon, 10 Jun 2019 14:08:38 -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=sVFOiHnAvl3NuPm1L85N7bRxgzUSn57kPTZX+v+JY1Lxs29FhzNWubIu0jJpVc3m7G Yl1ds7DUo5AZM1TKuPZ9s/B5lNSMUChsQWJc35u9bt5qKzptQipTovSrfm8hDRWsHJfC G0/fZRC9SLHSr2zkg3mtocv/fFmjQqxgkFMmGwxulY3+k0hWO6bXLWhFCpSkuh5I+wGX IJkYf54Uv73iVOW1j16jq7Blo+ImAEjRhqbCYL2R4ulDpqobpK+BS9ZN9S0mFIKaoSXg IVbrjcrhvCyyiKUQgJfOv1cqm/2SrOem45AJAyjrUuPhlIQSqbLiFqkbQLwIZ0STLn+F obng== 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=rD4yFqBejx5LdqHDWa5jspnMK4ou0VRiUYTIE21kNX8lbf4heoY5nQGpBAkvy7RcHt Ko1ZXPLaMOjPgTscYipdXqohPTVt+ak3gIyI5FnFfpe282VhzQ7uzhrcp7W/cJAamTC1 GJI+LSYIYGMeOqu+pwXXdrBYtZ6VWm/dgst267wJKZoauiUibJYROzfZlBqtqf7O35sJ A1JIfhUFiILGhNAvV/h53mbHW/8kOkzjji/DV/+QZevEsX44tPhR1KkPs4hS2r6n66tt p1WdP/JlurOSYfga2UQx0FSMOIbGRQs9rtwzZI38AKmvfCtMFoIQ7fGRobrIq8Jsz6IZ gAUA== X-Gm-Message-State: APjAAAWylVE7JNXaBRTpLIPPBZQxwDETZ96LoPqcKweQurzONVw/SLVW j6SZ2xU5mEaafCLLRKWRcYy77xXbSCRAB+/9B1zjuSz/STwachIjao1GMLTEXiU7BH8k5gE5HYt NVeoYH7VRNWLwdFX6HzLJSAt2271ieBG8lc3Ush0SOTIUiwQcJgpyQw== X-Google-Smtp-Source: APXvYqxcLLAf2+6LYdol0+arO2v11ooaEH0UgCTVnMuAJ3W5chtgfqv74SCKhJMkswudUdWIaK09sC0= X-Received: by 2002:a0c:fde5:: with SMTP id m5mr38293403qvu.192.1560200917576; Mon, 10 Jun 2019 14:08:37 -0700 (PDT) Date: Mon, 10 Jun 2019 14:08:24 -0700 In-Reply-To: <20190610210830.105694-1-sdf@google.com> Message-Id: <20190610210830.105694-3-sdf@google.com> Mime-Version: 1.0 References: <20190610210830.105694-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.rc2.383.gf4fbbf30c2-goog Subject: [PATCH bpf-next v5 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: 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. 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