From patchwork Wed Jul 1 20:13:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1320787 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=XPFcwwz+; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xsqH4J0Bz9sRf for ; Thu, 2 Jul 2020 06:13:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727018AbgGAUNP (ORCPT ); Wed, 1 Jul 2020 16:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgGAUNO (ORCPT ); Wed, 1 Jul 2020 16:13:14 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6952C08C5C1 for ; Wed, 1 Jul 2020 13:13:13 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id z7so27444257ybz.1 for ; Wed, 01 Jul 2020 13:13:13 -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=KeQTrd37BEFhJhhFg8eLib2y6OHrwfUDJnin6VhVDDE=; b=XPFcwwz+IN0GhlhFtLkS54T/AZox3vukZ/EUvPT/i0rbNqsZm+7ptZp6276Y0MIU7+ zC7FNTBq8N7L4wY4fDKZ60+fAhTJGJQyvfPCVmzo1IKbh2DmWhuzvzsvft0La448sT6H yZWPG3KepMC7HMIor0MvX7mDyp8mIwsUSuwe1FvaSQP15JJ9SZMYAER72sVUUF+4X7AJ N0vEvGbIyoI3ZsstYS6khx6KqC+dInvaT4ppZws44O2ZjIYseM8SVQThZv4BV/mmqxdH qNuZ8VYr1we2UkHAO2V6xvapYhgcm49pQMDJnRMNjRBDYnk4Cl2rZWMxup4LwwUEyAG6 M4aw== 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=KeQTrd37BEFhJhhFg8eLib2y6OHrwfUDJnin6VhVDDE=; b=dCDYth5UBCEp0CCgEYYmRMRCXzxnEwdlKZ6mgkEaO35LBvhgRI/5QOtA61x5qXjpDV ALmz2QVcoHXp/G0WpIyX4SnPBuhNG+KNTvUX6XRqTTlPVfK8wu32iZcEl73V/WMeSdz1 FCM3KOPAy9exMm2/837zYuy6TNZwKi4+XrUAd7I7VrUdeNIOk9vweLoPU0WYwvbr/Eu+ cBAiwXbWuYetzKXUC3q833Pr2d20rue31T/l8z923PYRN/WnRtYdpDV9hCzDGeGVo8kh hVj8OVFvwG8JuWnAYzHLbo7OB4F1tsD/PM5x72VUGkvkOe2p1BGEpKkLP26XxutGV+ox Rzfg== X-Gm-Message-State: AOAM533Vl/K170xzEEqeIkj1bVcKCfUG/n/iWtmrUslkA9jqk8mA8Lrc CI3OqzmrMQq0q1dSWN06PNcpHis= X-Google-Smtp-Source: ABdhPJxz3YBEHyQoZOW9dyvNhF7Y+L81FC/JAfShrbT3eSsWT6KVByCnW9l5xQYbw0o6jDJ6VV/EmKk= X-Received: by 2002:a25:3f87:: with SMTP id m129mr47200320yba.371.1593634392985; Wed, 01 Jul 2020 13:13:12 -0700 (PDT) Date: Wed, 1 Jul 2020 13:13:05 -0700 In-Reply-To: <20200701201307.855717-1-sdf@google.com> Message-Id: <20200701201307.855717-3-sdf@google.com> Mime-Version: 1.0 References: <20200701201307.855717-1-sdf@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH bpf-next v3 2/4] libbpf: add support for BPF_CGROUP_INET_SOCK_RELEASE 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 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Add auto-detection for the cgroup/sock_release programs. Signed-off-by: Stanislav Fomichev Acked-by: Andrii Nakryiko --- tools/include/uapi/linux/bpf.h | 1 + tools/lib/bpf/libbpf.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index da9bf35a26f8..548a749aebb3 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -226,6 +226,7 @@ enum bpf_attach_type { BPF_CGROUP_INET4_GETSOCKNAME, BPF_CGROUP_INET6_GETSOCKNAME, BPF_XDP_DEVMAP, + BPF_CGROUP_INET_SOCK_RELEASE, __MAX_BPF_ATTACH_TYPE }; diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 4ea7f4f1a691..88a483627a2b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -6917,6 +6917,10 @@ static const struct bpf_sec_def section_defs[] = { 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_create", BPF_PROG_TYPE_CGROUP_SOCK, + BPF_CGROUP_INET_SOCK_CREATE), + BPF_EAPROG_SEC("cgroup/sock_release", BPF_PROG_TYPE_CGROUP_SOCK, + BPF_CGROUP_INET_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,