add LuaUnpack submodule

luainkernel · VictorNogueiraRio · Feb 11, 2020 · Feb 11, 2020 · Feb 11, 2020 · Feb 12, 2020
commit 497fd52846a0bd5b4432db685756a43bd470ab6a
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "lib/luarcu"]
 	path = lib/luarcu
 	url = https://github.com/luainkernel/luarcu
+[submodule "lib/luaunpack"]
+	path = lib/luaunpack
+	url = https://github.com/VictorNogueiraRio/luaunpack.git
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
@@ -2839,7 +2839,8 @@ union bpf_attr {
 	FN(lua_toboolean),		\
 	FN(lua_tointeger),		\
 	FN(lua_putstate),		\
-	FN(lua_removestate),
+	FN(lua_removestate),		\
+	FN(lua_newpacket),
 	/* #endif CONFIG_XDP_LUA */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --git a/lib/Makefile b/lib/Makefile
@@ -296,9 +296,10 @@ obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.o
 obj-$(CONFIG_OBJAGG) += objagg.o
 
 subdir-ccflags-y += -I$(srctree)/lib/lunatik/lua \
-	            -I$(srctree)/lib/luadata/ \
+	            -I$(srctree)/lib/luadata/ -I$(srctree)/lib/luaunpack/ \
 	            -D_KERNEL
 obj-$(CONFIG_LUNATIK) += lunatik/
 obj-$(CONFIG_LUADATA) += luadata/
 obj-$(CONFIG_LUAXDP) += luaxdp/
 obj-$(CONFIG_LUARCU) += luarcu/
+obj-$(CONFIG_LUAUNPACK) += luaunpack/
diff --git a/lib/luaunpack b/lib/luaunpack
diff --git a/net/core/Makefile b/net/core/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
 CFLAGS_dev.o = -Ilib/lunatik/lua/ -D_KERNEL \
 		-Ilib/luadata/
 CFLAGS_filter.o = -Ilib/lunatik/lua/ -D_KERNEL \
-		-Ilib/luadata/
+		-Ilib/luadata/ -Ilib/luaunpack/
 obj-y		     += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
 			neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
 			sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \

diff --git a/net/core/filter.c b/net/core/filter.c
@@ -77,6 +77,7 @@
 #ifdef CONFIG_XDP_LUA
 #include <lua.h>
 #include <luadata.h>
+#include <luaunpack.h>
 #endif /* CONFIG_XDP_LUA */
 
 /**
@@ -6072,6 +6073,23 @@ static const struct bpf_func_proto bpf_lua_removestate_proto = {
 	.ret_type	= RET_VOID,
 	.arg1_type	= ARG_PTR_TO_CTX,
 };
+BPF_CALL_2(bpf_lua_newpacket, struct xdp_buff *, ctx, int, offset) {
+	if (offset + ctx->data < ctx->data_end) {
+		return lunpack_newpacket(ctx->xdplua->L, ctx->data + offset,
+				ctx->data_end - ctx->data - offset);
+	}
+
+	return -EINVAL;
+}
+
+static const struct bpf_func_proto bpf_lua_newpacket_proto = {
+	.func		= bpf_lua_newpacket,
+	.gpl_only	= false,
+	.pkt_access	= false,
+	.ret_type	= RET_INTEGER,
+	.arg1_type	= ARG_PTR_TO_CTX,
+	.arg2_type	= ARG_ANYTHING,
+};
 #endif /* CONFIG_XDP_LUA */
 
 bool bpf_helper_changes_pkt_data(void *func)
@@ -6177,6 +6195,8 @@ bpf_base_func_proto(enum bpf_func_id func_id)
 		return &bpf_lua_putstate_proto;
 	case BPF_FUNC_lua_removestate:
 		return &bpf_lua_removestate_proto;
+	case BPF_FUNC_lua_newpacket:
+		return &bpf_lua_newpacket_proto;
 #endif /* CONFIG_XDP_LUA */
 	default:
 		return NULL;

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
@@ -2839,7 +2839,8 @@ union bpf_attr {
 	FN(lua_toboolean),		\
 	FN(lua_tointeger),		\
 	FN(lua_putstate),		\
-	FN(lua_removestate),
+	FN(lua_removestate),		\
+	FN(lua_newpacket),
 	/* #endif CONFIG_XDPLUA */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h
@@ -260,6 +260,8 @@ static void (*bpf_lua_putstate)(void *ctx) =
     (void *)BPF_FUNC_lua_putstate;
 static void (*bpf_lua_removestate)(void *ctx) =
     (void *)BPF_FUNC_lua_removestate;
+static int (*bpf_lua_newpacket)(void *ctx, int offset) =
+    (void *)BPF_FUNC_lua_newpacket;
 /* #endif CONFIG_XDPLUA */
 
 /* llvm builtin functions that eBPF C program may use to