summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Kochan <vadim4j@gmail.com>2015-07-19 14:41:19 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2015-07-20 10:05:05 +0200
commita839a6ad1dd48802e50fddca2747eea511b65826 (patch)
tree2f0f536e7884efad3ab4c8287a46c2e3720f3c00
parenta1e7c1dc527ca3c37349cebc6fbeaa12a594fcf3 (diff)
bpf: Use sysctl helpers to enable bpf jit compiler
Use sysctl helpers to set /proc/sys/net/core/bpf_jit_enable param. Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--astraceroute/Makefile1
-rw-r--r--bpf.c14
-rw-r--r--bpfc/Makefile1
-rw-r--r--netsniff-ng/Makefile1
4 files changed, 5 insertions, 12 deletions
diff --git a/astraceroute/Makefile b/astraceroute/Makefile
index 2e80a11..bbf9e88 100644
--- a/astraceroute/Makefile
+++ b/astraceroute/Makefile
@@ -17,6 +17,7 @@ astraceroute-objs = xmalloc.o \
dev.o \
ring.o \
die.o \
+ sysctl.o \
astraceroute.o
ifeq ($(CONFIG_GEOIP), 1)
diff --git a/bpf.c b/bpf.c
index 25cf25d..2d769ec 100644
--- a/bpf.c
+++ b/bpf.c
@@ -18,6 +18,7 @@
#include "xmalloc.h"
#include "die.h"
#include "str.h"
+#include "sysctl.h"
#define EXTRACT_SHORT(packet) \
((unsigned short) ntohs(*(unsigned short *) packet))
@@ -380,18 +381,7 @@ void bpf_detach_from_sock(int sock)
int enable_kernel_bpf_jit_compiler(void)
{
- int fd;
- ssize_t ret;
- char *file = "/proc/sys/net/core/bpf_jit_enable";
-
- fd = open(file, O_WRONLY);
- if (unlikely(fd < 0))
- return -1;
-
- ret = write(fd, "1", strlen("1"));
-
- close(fd);
- return ret;
+ return sysctl_set_int("net/core/bpf_jit_enable", 1);
}
int __bpf_validate(const struct sock_fprog *bpf)
diff --git a/bpfc/Makefile b/bpfc/Makefile
index b8a3787..b687bd1 100644
--- a/bpfc/Makefile
+++ b/bpfc/Makefile
@@ -6,6 +6,7 @@ bpfc-objs = xmalloc.o \
bpf_lexer.yy.o \
bpf_parser.tab.o \
die.o \
+ sysctl.o \
bpfc.o
bpfc-lex = bpf_lexer.yy.o
diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile
index 33701a4..03e306e 100644
--- a/netsniff-ng/Makefile
+++ b/netsniff-ng/Makefile
@@ -66,6 +66,7 @@ netsniff-ng-objs = dissector.o \
timer.o \
mac80211.o \
die.o \
+ sysctl.o \
netsniff-ng.o
ifeq ($(CONFIG_LIBPCAP), 1)