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=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 A89A0C004E6 for ; Thu, 27 Jun 2019 20:39:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 844AD2133F for ; Thu, 27 Jun 2019 20:39:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Rc2XLaYA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbfF0UjH (ORCPT ); Thu, 27 Jun 2019 16:39:07 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:49963 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726601AbfF0UjH (ORCPT ); Thu, 27 Jun 2019 16:39:07 -0400 Received: by mail-qk1-f201.google.com with SMTP id c4so3811623qkd.16 for ; Thu, 27 Jun 2019 13:39:06 -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=k7A7l4ZbNB5h7er1WtyOS2vLQKwgAWRCbj5qceMdrCw=; b=Rc2XLaYAn5a3NANW1+CmmhyYSfNvowcxKDxpLu5CItJ/RUQA4ZdE0cTY58p7x4O3ut ONPWoPf+KKHJqi+deIaS8iD6WepPWja2gxBJfsRXddxdrxL05FnC17Iim7rFB7ryvVzZ nArJXg+IfYPCL5PSYdprqkgBi0gWJg39PsAuRLQmnaPOfbx1j11UbPwqjejsKfjy/r+c OgL6Nt1ql6p8JFdMoa6vkcU0/CtC3sK9ceJqj6uKe6WAAAf31FEAc9ZuL3ZQMT6UwiCn t5oNqt5JqP4tRmHHvjBcA2tPr9vy2ighobjtVxB2GTALYVKWKH+r6+BnJyWyOQCCR5Yt aEUQ== 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=k7A7l4ZbNB5h7er1WtyOS2vLQKwgAWRCbj5qceMdrCw=; b=BfIGMz+grfwZSz3nn2I4x5xspiSCl5H/5/CA6rD5rGuZ6vGO+5wHohy929vsSAkC3h U9lBA2uCOxZvAwUVSQJDyR4MQo/uXYrli9wm6yEeo7ajIiM73dNZBsJ0Fu8SJJm9xBBx FSi24c0rEIT5lTrzsG+AWJBS0dLWMUCCAQXEgp4N2i+M/i17OhkvrfxeZh/DY3jnIhBp p52jq30Z3vdeBppRTcKg16slXPZbLglgILOYp0GLffZPjGGt8C8nj1atn8VEFnZI8IXt mZ3ea/mhxT7I5aFW3dvqADehJH1mEDhMtwf91THlWG2+qjFeD0eZU86bNVgiBpf6+Fsp Ws/w== X-Gm-Message-State: APjAAAUaDkxs/eFCGxu2u5eB2pLh1YgJFUmOSXovOvjcrdSjfEraNPJN zIRL9CTXU1mcH63QZiI3T3K1aac= X-Google-Smtp-Source: APXvYqyLSHw/2MeuCqWntX5bAAEXYcDU5kRQ4UzuuKIS3lbUfhnNHZjFjB+y9EnbdC0V/VMYt4jSP4M= X-Received: by 2002:a0c:acab:: with SMTP id m40mr5291855qvc.52.1561667945959; Thu, 27 Jun 2019 13:39:05 -0700 (PDT) Date: Thu, 27 Jun 2019 13:38:49 -0700 In-Reply-To: <20190627203855.10515-1-sdf@google.com> Message-Id: <20190627203855.10515-4-sdf@google.com> Mime-Version: 1.0 References: <20190627203855.10515-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v9 3/9] libbpf: support sockopt hooks From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Andrii Nakryiko , 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 Make libbpf aware of new sockopt hooks so it can derive prog type and hook point from the section names. Cc: Andrii Nakryiko Cc: Martin Lau Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/libbpf.c | 5 +++++ tools/lib/bpf/libbpf_probes.c | 1 + 2 files changed, 6 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 5186b7710430..6e6ebef11ba3 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2646,6 +2646,7 @@ static bool bpf_prog_type__needs_kver(enum bpf_prog_type type) case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE: case BPF_PROG_TYPE_PERF_EVENT: case BPF_PROG_TYPE_CGROUP_SYSCTL: + case BPF_PROG_TYPE_CGROUP_SOCKOPT: return false; case BPF_PROG_TYPE_KPROBE: default: @@ -3604,6 +3605,10 @@ static const struct { BPF_CGROUP_UDP6_RECVMSG), BPF_EAPROG_SEC("cgroup/sysctl", BPF_PROG_TYPE_CGROUP_SYSCTL, BPF_CGROUP_SYSCTL), + BPF_EAPROG_SEC("cgroup/getsockopt", BPF_PROG_TYPE_CGROUP_SOCKOPT, + BPF_CGROUP_GETSOCKOPT), + BPF_EAPROG_SEC("cgroup/setsockopt", BPF_PROG_TYPE_CGROUP_SOCKOPT, + BPF_CGROUP_SETSOCKOPT), }; #undef BPF_PROG_SEC_IMPL diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index 6635a31a7a16..ace1a0708d99 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -101,6 +101,7 @@ probe_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, case BPF_PROG_TYPE_SK_REUSEPORT: case BPF_PROG_TYPE_FLOW_DISSECTOR: case BPF_PROG_TYPE_CGROUP_SYSCTL: + case BPF_PROG_TYPE_CGROUP_SOCKOPT: default: break; } -- 2.22.0.410.gd8fdbe21b5-goog