[bpf-next,v7,3/9] libbpf: support sockopt hooks

Message ID	20190619165957.235580-4-sdf@google.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> Date: Wed, 19 Jun 2019 09:59:51 -0700 In-Reply-To: <20190619165957.235580-1-sdf@google.com> Message-Id: <20190619165957.235580-4-sdf@google.com> Mime-Version: 1.0 References: <20190619165957.235580-1-sdf@google.com> Subject: [PATCH bpf-next v7 3/9] libbpf: support sockopt hooks From: Stanislav Fomichev <sdf@google.com> To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev <sdf@google.com>, Martin Lau <kafai@fb.com> Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	bpf: getsockopt and setsockopt hooks \| expand [bpf-next,v7,0/9] bpf: getsockopt and setsockopt hooks [bpf-next,v7,1/9] bpf: implement getsockopt and setsockopt hooks [bpf-next,v7,2/9] bpf: sync bpf.h to tools/ [bpf-next,v7,3/9] libbpf: support sockopt hooks [bpf-next,v7,4/9] selftests/bpf: test sockopt section name [bpf-next,v7,5/9] selftests/bpf: add sockopt test [bpf-next,v7,6/9] selftests/bpf: add sockopt test that exercises sk helpers [bpf-next,v7,7/9] selftests/bpf: add sockopt test that exercises BPF_F_ALLOW_MULTI [bpf-next,v7,8/9] bpf: add sockopt documentation [bpf-next,v7,9/9] bpftool: support cgroup sockopt

Message ID

20190619165957.235580-4-sdf@google.com

State

Changes Requested

Delegated to:

BPF Maintainers

Headers

Date: Wed, 19 Jun 2019 09:59:51 -0700
In-Reply-To: <20190619165957.235580-1-sdf@google.com>
Message-Id: <20190619165957.235580-4-sdf@google.com>
Mime-Version: 1.0
References: <20190619165957.235580-1-sdf@google.com>
Subject: [PATCH bpf-next v7 3/9] libbpf: support sockopt hooks
From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net,
	Stanislav Fomichev <sdf@google.com>, Martin Lau <kafai@fb.com>
Content-Type: text/plain; charset="UTF-8"
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

bpf: getsockopt and setsockopt hooks | expand

Commit Message

Stanislav Fomichev June 19, 2019, 4:59 p.m. UTC

Make libbpf aware of new sockopt hooks so it can derive prog type
and hook point from the section names.

Cc: Martin Lau <kafai@fb.com>
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 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 e725fa86b189..98457fc6bb76 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -2244,6 +2244,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:
@@ -3197,6 +3198,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;
 	}

[bpf-next,v7,3/9] libbpf: support sockopt hooks

Commit Message

Patch