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 EF78CC31E40 for ; Mon, 10 Jun 2019 16:34:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5EC520859 for ; Mon, 10 Jun 2019 16:34:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iNS8pKI7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728255AbfFJQed (ORCPT ); Mon, 10 Jun 2019 12:34:33 -0400 Received: from mail-qt1-f201.google.com ([209.85.160.201]:40301 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728200AbfFJQec (ORCPT ); Mon, 10 Jun 2019 12:34:32 -0400 Received: by mail-qt1-f201.google.com with SMTP id z6so2290466qtj.7 for ; Mon, 10 Jun 2019 09:34:32 -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=s4cYkdfXLpURz/IJz9ubZSdFhBas+UHvrTOfo6AKN98=; b=iNS8pKI7aB/fDcMfqTyfKDEZb9RBbVW72Rw89As56p3RX6P9AzvwWGYmZkJ2DguzT7 NEEAug3LoydctvCfvHa0l/1+nFu+wyF23gbocX+PdFnqN3sLpKuf9Rvlq5UgL3MUD3MJ up6Y6gPbjVdyZQKGhrGGmVWpGzlFzcYxA8IUZeLu44Bs5kcEWNJZ1bBVVsKtHOEUI8TS 0eQKkgubjhvHhoK4Enby5zsPYTDT6XuiXP+FZZEV+5y3gIyJD+ykAwGpIcXRMXx8NNS9 OLHdKtAh5Hv2djzVTA+PDkopxldxsSSPbmOwENQauzZTVeohd80cNxkgsTOegFUSE2gY qfUw== 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=s4cYkdfXLpURz/IJz9ubZSdFhBas+UHvrTOfo6AKN98=; b=paoyk2+zc6aLFVAk8rqMOGZHMnitGaKAfuHOaqWWynfpe+UE4syFYwJWrV7tmfbR5m lDalSXod/DplrxgA57GwsRpuEB09dTiy+D2SqzychmEB8KQi/yy/jniZ4bIkJV/wdJXe o3ukDNl8ROTGb+dKGJ537yntctQ+HKgmwLpXvCFFQF+7Oa95pX05qAjhyTcv//J5XXBb Ja859kjX8HgLem//LfvlqEJ65gBT1FdPswkOqBzmfkx+Y8bSBn3jKFp8MALtYWwtClPH KmZEs50UUimacaP/F/sLlabg7xm95BIFhmm7u93mJC4CzkuLHXeiquZRRd0O11DZsJT6 FjFA== X-Gm-Message-State: APjAAAUdt/5ysCs62Y15BVCBWJ//3Ga4ATqQ0lqkpu6ct4VU1dydEaSY R3lloL2gJ3sBXBil/YAQiU/Plg0h8YaxQ6g9BTHUBy43c8pPyhbPZhUuVUX5tGWXhzbF2GFIqwL 56YZvfqPftgDmg1xWZmUzu5p5Kbgp6hkTKW7zzpuxjmZ/mOr2duEavw== X-Google-Smtp-Source: APXvYqy74BDGRYhn8mprar56bd6oWsZM7x1h1U9BDwg6CMnZIe0I+929gZnVR2Ue7fEQlr5vxsQTcPo= X-Received: by 2002:a0c:871d:: with SMTP id 29mr43441382qvh.28.1560184471662; Mon, 10 Jun 2019 09:34:31 -0700 (PDT) Date: Mon, 10 Jun 2019 09:34:16 -0700 In-Reply-To: <20190610163421.208126-1-sdf@google.com> Message-Id: <20190610163421.208126-4-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 3/8] 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 , 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 Make libbpf aware of new sockopt hooks so it can derive prog type and hook point from the section names. 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 ba89d9727137..cd3c692a8b5d 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2243,6 +2243,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: @@ -3196,6 +3197,10 @@ static const struct { BPF_CGROUP_UDP6_SENDMSG), 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 5e2aa83f637a..7e21db11dde8 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.rc2.383.gf4fbbf30c2-goog