add LuaUnpack submodule

Author: VictorNogueiraRio

.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

include/uapi/linux/bpf.h

@@ -2242,8 +2242,7 @@ union bpf_attr {
 	FN(lua_pushstring),		\
 	FN(lua_toboolean),		\
 	FN(lua_tointeger),		\
-	FN(lua_newpacket),		\
-	FN(lua_type),
+	FN(lua_newpacket),
 	/* #endif CONFIG_XDP_LUA */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

lib/Makefile

@@ -285,9 +285,10 @@ obj-$(CONFIG_GENERIC_LIB_CMPDI2) += cmpdi2.o
 obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.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/

lib/luaunpack

@@ -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 \

net/core/Makefile

@@ -71,6 +71,8 @@
 
 #ifdef CONFIG_XDP_LUA
 #include <lua.h>
+#include <luadata.h>
+#include <luaunpack.h>
 #endif /* CONFIG_XDP_LUA */
 
 /**
@@ -5013,6 +5015,24 @@ static const struct bpf_func_proto bpf_lua_tointeger_proto = {
 	.arg1_type	= ARG_PTR_TO_CTX,
 	.arg2_type	= ARG_ANYTHING,
 };
+
+BPF_CALL_2(bpf_lua_newpacket, struct xdp_buff *, ctx, int, offset) {
+	if (offset + ctx->data < ctx->data_end) {
+		return lunpack_newpacket(ctx->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)
@@ -5095,6 +5115,8 @@ bpf_base_func_proto(enum bpf_func_id func_id)
 		return &bpf_lua_toboolean_proto;
 	case BPF_FUNC_lua_tointeger:
 		return &bpf_lua_tointeger_proto;
+	case BPF_FUNC_lua_newpacket:
+		return &bpf_lua_newpacket_proto;
 #endif /* CONFIG_XDP_LUA */
 	default:
 		return NULL;

net/core/filter.c

@@ -2239,7 +2239,8 @@ union bpf_attr {
 	FN(lua_pushskb),		\
 	FN(lua_pushstring),		\
 	FN(lua_toboolean),		\
-	FN(lua_tointeger),
+	FN(lua_tointeger),		\
+	FN(lua_newpacket),
 	/* #endif CONFIG_XDP_LUA */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

tools/include/uapi/linux/bpf.h

@@ -171,6 +171,8 @@ static int (*bpf_lua_toboolean)(void *ctx, int index) =
     (void *)BPF_FUNC_lua_toboolean;
 static int (*bpf_lua_tointeger)(void *ctx, int index) =
     (void *)BPF_FUNC_lua_tointeger;
+static int (*bpf_lua_newpacket)(void *ctx, int offset) =
+    (void *)BPF_FUNC_lua_newpacket;
 /* #endif CONFIG_XDP_LUA */
 
 /* llvm builtin functions that eBPF C program may use to