diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-06-26 20:13:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-06-28 21:39:16 +0900 |
| commit | 8e75887d321d102200abf3a9fa621e2c10ff4cc5 (patch) | |
| tree | 6c43fe825ee8cee037dbbfae0a80d9d5f49d0b78 /net/bpfilter/Makefile | |
| parent | strparser: Remove early eaten to fix full tcp receive buffer stall (diff) | |
| download | linux-dev-8e75887d321d102200abf3a9fa621e2c10ff4cc5.tar.xz linux-dev-8e75887d321d102200abf3a9fa621e2c10ff4cc5.zip | |
bpfilter: include bpfilter_umh in assembly instead of using objcopy
What we want here is to embed a user-space program into the kernel.
Instead of the complex ELF magic, let's simply wrap it in the assembly
with the '.incbin' directive.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bpfilter/Makefile')
| -rw-r--r-- | net/bpfilter/Makefile | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile index 051dc18b8ccb..39c6980b5d99 100644 --- a/net/bpfilter/Makefile +++ b/net/bpfilter/Makefile @@ -15,20 +15,7 @@ ifeq ($(CONFIG_BPFILTER_UMH), y) HOSTLDFLAGS += -static endif -# a bit of elf magic to convert bpfilter_umh binary into a binary blob -# inside bpfilter_umh.o elf file referenced by -# _binary_net_bpfilter_bpfilter_umh_start symbol -# which bpfilter_kern.c passes further into umh blob loader at run-time -quiet_cmd_copy_umh = GEN $@ - cmd_copy_umh = echo ':' > $(obj)/.bpfilter_umh.o.cmd; \ - $(OBJCOPY) -I binary \ - `LC_ALL=C $(OBJDUMP) -f net/bpfilter/bpfilter_umh \ - |awk -F' |,' '/file format/{print "-O",$$NF} \ - /^architecture:/{print "-B",$$2}'` \ - --rename-section .data=.init.rodata $< $@ - -$(obj)/bpfilter_umh.o: $(obj)/bpfilter_umh - $(call cmd,copy_umh) +$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh obj-$(CONFIG_BPFILTER_UMH) += bpfilter.o -bpfilter-objs += bpfilter_kern.o bpfilter_umh.o +bpfilter-objs += bpfilter_kern.o bpfilter_umh_blob.o |