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=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 8F594C43612 for ; Fri, 18 Jan 2019 00:41:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58CFA20873 for ; Fri, 18 Jan 2019 00:41:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tGNsCfap" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726682AbfARAlR (ORCPT ); Thu, 17 Jan 2019 19:41:17 -0500 Received: from mail-it1-f202.google.com ([209.85.166.202]:36994 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725982AbfARAlR (ORCPT ); Thu, 17 Jan 2019 19:41:17 -0500 Received: by mail-it1-f202.google.com with SMTP id y86so2247542ita.2 for ; Thu, 17 Jan 2019 16:41:16 -0800 (PST) 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=NzKH+hAH0U9Ee/9yS9KS2bUjH/Z9XFW85X7FaoaQiOY=; b=tGNsCfapXkIH0tf0mkKx154LmoZTHLroAnXUV2XMNJdMxyaO92Nu9/zgy6kL6x+vCI hRhdIg3hLCn+JIEHTQD7WWrmz6DSrbpXa1pNIL1vGPX8HMz86Fbrtd49IwfCTVG1n7XU j1jva2BX8jvAczG2xqD/dLhvO/Pef1b8iXP53ba0+FGW1ykmSxpfNBsQer4jnFn8Rb4E xcjuCDA2udDKh+gPnq16d7MEu3f2V3G6Q1rQt8inVMugsf2jPx35mC1csJzcZ77P6OMP JW7VMfLH15Z9EiUva+aVerPF7JW/gaJtkPct3HjOxtpL5Dl1+fHGqRiBzFnUT3Jnwgca yC0Q== 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=NzKH+hAH0U9Ee/9yS9KS2bUjH/Z9XFW85X7FaoaQiOY=; b=s1c1h+FIrNVuWRHwtudAUNPqZIOocH+TgJpmwDjiXdpXqkPZc+ZaXjfNZhlbP8vqz4 gdeMWnK8Wsa+7wLsgs5+FGd1U6gSGCgTVCI6UYRA2j73wZ42sgJGV2y6kfBLESoFRoLY vZK8fHvoc0tdZqsKdgFDC1vq2r+1NwB/OGMAJvalh+4EYg9W2Ywr+ZfN4hgVmC5fFWlc BUes/s2tzpu44WvTgQ6zh4OSVwOfumH/jchvlWHr8qWzDFWaVSpHap/LBhAdi13kFO58 gkVjCBwNKEYd60kSIRcPh9LNqSYNHaLYndgGkRNH7O1iJXBgtJJt+G4HY/bgPRulIJ/Y ZpLg== X-Gm-Message-State: AJcUukc7qu3cItFvIVpdaS63eC8L1PW5jQQEu7EyGDF4GjfIBlG/PuEk QmxXZ6aXQRQldMoaM38HFuQ8gBEPJv4Jy0KssLV6lzFwC1mKvhZmU2xjpzNjzLavMDm4hEvlqUF RXBYHhOG1/FTd4QnVc9XInIKDRUzyJp6OiEe+xwVzA6HLLyzPAF4K+A== X-Google-Smtp-Source: ALg8bN5cNYCNv/t4A3FqDP8HHgJPmeVXExzbVk7jZEmBr22IXlcxDqDvnNW/QQjgMjeL6XWbQ+O5Sm0= X-Received: by 2002:a24:78c:: with SMTP id f134mr7305931itf.24.1547772075888; Thu, 17 Jan 2019 16:41:15 -0800 (PST) Date: Thu, 17 Jan 2019 16:41:03 -0800 In-Reply-To: <20190118004106.163825-1-sdf@google.com> Message-Id: <20190118004106.163825-3-sdf@google.com> Mime-Version: 1.0 References: <20190118004106.163825-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH bpf-next 2/5] tools: bpf: support BPF_CGROUP_INET{4,6}_SOCK_RELEASE in libbpf/bpftool From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sync uapi and make sure libbpf and bpftools are aware of the hooks. Signed-off-by: Stanislav Fomichev --- tools/bpf/bpftool/cgroup.c | 2 ++ tools/include/uapi/linux/bpf.h | 2 ++ tools/lib/bpf/libbpf.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c index 4b5c8da2a7c0..3474f810ba5a 100644 --- a/tools/bpf/bpftool/cgroup.c +++ b/tools/bpf/bpftool/cgroup.c @@ -31,6 +31,8 @@ static const char * const attach_type_strings[] = { [BPF_CGROUP_INET_INGRESS] = "ingress", [BPF_CGROUP_INET_EGRESS] = "egress", [BPF_CGROUP_INET_SOCK_CREATE] = "sock_create", + [BPF_CGROUP_INET4_SOCK_RELEASE] = "sock_release4", + [BPF_CGROUP_INET6_SOCK_RELEASE] = "sock_release6", [BPF_CGROUP_SOCK_OPS] = "sock_ops", [BPF_CGROUP_DEVICE] = "device", [BPF_CGROUP_INET4_BIND] = "bind4", diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 91c43884f295..8e78aa28a42e 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -186,6 +186,8 @@ enum bpf_attach_type { BPF_CGROUP_UDP6_SENDMSG, BPF_LIRC_MODE2, BPF_FLOW_DISSECTOR, + BPF_CGROUP_INET4_SOCK_RELEASE, + BPF_CGROUP_INET6_SOCK_RELEASE, __MAX_BPF_ATTACH_TYPE }; diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 169e347c76f6..fdadd1ac22ad 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2626,6 +2626,10 @@ static const struct { BPF_APROG_SEC("cgroup_skb/egress", BPF_PROG_TYPE_CGROUP_SKB, BPF_CGROUP_INET_EGRESS), BPF_APROG_COMPAT("cgroup/skb", BPF_PROG_TYPE_CGROUP_SKB), + BPF_EAPROG_SEC("cgroup/sock_release4", BPF_PROG_TYPE_CGROUP_SOCK, + BPF_CGROUP_INET4_SOCK_RELEASE), + BPF_EAPROG_SEC("cgroup/sock_release6", BPF_PROG_TYPE_CGROUP_SOCK, + BPF_CGROUP_INET6_SOCK_RELEASE), BPF_APROG_SEC("cgroup/sock", BPF_PROG_TYPE_CGROUP_SOCK, BPF_CGROUP_INET_SOCK_CREATE), BPF_EAPROG_SEC("cgroup/post_bind4", BPF_PROG_TYPE_CGROUP_SOCK, -- 2.20.1.321.g9e740568ce-goog