Fix script loading synchronization issue

luainkernel · VictorNogueiraRio · Jan 30, 2020 · Jul 19, 2019 · Jan 30, 2020 · Feb 7, 2020
commit 5eb463c6e5bc7c8ac063257e9a721fe5147a903c
diff --git a/include/linux/filter.h b/include/linux/filter.h
@@ -1268,14 +1268,4 @@ struct bpf_sockopt_kern {
 	s32		retval;
 };
 
-#ifdef CONFIG_XDP_LUA
-extern struct list_head lua_state_cpu_list;
-
-struct lua_state_cpu {
-	struct lua_State 	*L;
-	int			cpu;
-	struct list_head	list;
-};
-#endif /* CONFIG_XDP_LUA */
-
 #endif /* __LINUX_FILTER_H__ */
diff --git a/include/net/xdp.h b/include/net/xdp.h
@@ -63,6 +63,19 @@ struct xdp_rxq_info {
 	struct xdp_mem_info mem;
 } ____cacheline_aligned; /* perf critical, avoid false-sharing */
 
+#ifdef CONFIG_XDP_LUA
+struct xdplua_create_work {
+	char				lua_script[8192];
+	struct lua_State	*L;
+	struct work_struct	work;
+	spinlock_t		lock;
+	bool			init;
+};
+
+DECLARE_PER_CPU(struct xdplua_create_work, luaworks);
+#endif /* CONFIG_XDP_LUA */
+
+
 struct xdp_buff {
 	void *data;
 	void *data_end;

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
@@ -2951,10 +2951,6 @@ union bpf_attr {
  *		so the memory at s can be freed or reused immediately after the
  *		function returns.
  *
- * void bpf_lua_setstate(void *ctx)
- *	Description
- *		Sets the Lua state pointer in the context struct
- *
  * int bpf_lua_toboolean(void *ctx, int index)
  *	Description
  *		Converts the Lua value at the given index to a C
@@ -3103,7 +3099,6 @@ union bpf_attr {
 	FN(lua_pushmap),		\
 	FN(lua_pushskb),		\
 	FN(lua_pushstring),		\
-	FN(lua_setstate),		\
 	FN(lua_toboolean),		\
 	FN(lua_tointeger),
 	/* #endif CONFIG_XDP_LUA */

diff --git a/net/core/dev.c b/net/core/dev.c
@@ -71,6 +71,7 @@
 #ifdef CONFIG_XDP_LUA
 #include <lua.h>
 #include <lauxlib.h>
+#include <lstate.h>
 #include <lualib.h>
 #include <luadata.h>
 #endif /* CONFIG_XDP_LUA */
@@ -159,6 +160,9 @@
 
 static DEFINE_SPINLOCK(ptype_lock);
 static DEFINE_SPINLOCK(offload_lock);
+#ifdef CONFIG_XDP_LUA
+DEFINE_PER_CPU(struct xdplua_create_work, luaworks);
+#endif
 struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly;
 struct list_head ptype_all __read_mostly;	/* Taps */
 static struct list_head offload_base __read_mostly;
@@ -171,10 +175,6 @@ static int call_netdevice_notifiers_extack(unsigned long val,
 					   struct netlink_ext_ack *extack);
 static struct napi_struct *napi_by_id(unsigned int napi_id);
 
-#ifdef CONFIG_XDP_LUA
-struct list_head lua_state_cpu_list;
-#endif /* CONFIG_XDP_LUA */
-
 /*
  * The @dev_base_head list is protected by @dev_base_lock and the rtnl
  * semaphore.
@@ -4523,6 +4523,9 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
 	bool orig_bcast;
 	int hlen, off;
 	u32 mac_len;
+#ifdef CONFIG_XDP_LUA
+	struct xdplua_create_work *lw;
+#endif /* CONFIG_XDP_LUA */
 
 	/* Reinjected packets coming from act_mirred or similar should
 	 * not get XDP generic processing.
@@ -4568,11 +4571,21 @@ static u32 netif_receive_generic_xdp(struct sk_buff *skb,
 	rxqueue = netif_get_rxqueue(skb);
 	xdp->rxq = &rxqueue->xdp_rxq;
 #ifdef CONFIG_XDP_LUA
+	lw = this_cpu_ptr(&luaworks);
+
 	xdp->skb = skb;
+	xdp->L = lw->L;
 #endif /* CONFIG_XDP_LUA */
 
 	act = bpf_prog_run_xdp(xdp_prog, xdp);
 
+#ifdef CONFIG_XDP_LUA
+	if (lw->init) {
+		lw->init = false;
+		spin_unlock(&lw->lock);
+	}
+#endif /* CONFIG_XDP_LUA */
+
 	/* check if bpf_xdp_adjust_head was used */
 	off = xdp->data - orig_data;
 	if (off) {
@@ -5381,16 +5394,29 @@ static int generic_xdp_install(struct net_device *dev, struct netdev_bpf *xdp)
 }
 
 #ifdef CONFIG_XDP_LUA
-int generic_xdp_lua_install_prog(char *lua_prog)
+
+static void per_cpu_xdp_lua_install(struct work_struct *w) {
+	int this_cpu = smp_processor_id();
+	struct xdplua_create_work *lw =
+		container_of(w, struct xdplua_create_work, work);
+
+	spin_lock_bh(&lw->lock);
+	if (luaL_dostring(lw->L, lw->lua_script)) {
+		pr_err(KERN_INFO "error: %s\nOn cpu: %d\n",
+			lua_tostring(lw->L, -1), this_cpu);
+	}
+	spin_unlock_bh(&lw->lock);
+}
+
+int generic_xdp_lua_install_prog(char *lua_script)
 {
-	struct lua_state_cpu *sc;
+	int cpu;
+	struct xdplua_create_work *lw;
 
-	list_for_each_entry(sc, &lua_state_cpu_list, list) {
-		if (luaL_dostring(sc->L, lua_prog)) {
-			pr_err(KERN_INFO "error: %s\nOn cpu: %d\n",
-				lua_tostring(sc->L, -1), sc->cpu);
-			return -EINVAL;
-		}
+	for_each_possible_cpu(cpu) {
+		lw = per_cpu_ptr(&luaworks, cpu);
+		strcpy(lw->lua_script, lua_script);
+		schedule_work_on(cpu, &lw->work);
 	}
 	return 0;
 }
@@ -10492,9 +10518,6 @@ static struct pernet_operations __net_initdata default_device_ops = {
 static int __init net_dev_init(void)
 {
 	int i, rc = -ENOMEM;
-#ifdef CONFIG_XDP_LUA
-	struct lua_state_cpu *new_state_cpu;
-#endif /* CONFIG_XDP_LUA */
 
 	BUG_ON(!dev_boot_phase);
 
@@ -10509,9 +10532,6 @@ static int __init net_dev_init(void)
 		INIT_LIST_HEAD(&ptype_base[i]);
 
 	INIT_LIST_HEAD(&offload_base);
-#ifdef CONFIG_XDP_LUA
-	INIT_LIST_HEAD(&lua_state_cpu_list);
-#endif /* CONFIG_XDP_LUA */
 
 	if (register_pernet_subsys(&netdev_net_ops))
 		goto out;
@@ -10523,6 +10543,9 @@ static int __init net_dev_init(void)
 	for_each_possible_cpu(i) {
 		struct work_struct *flush = per_cpu_ptr(&flush_works, i);
 		struct softnet_data *sd = &per_cpu(softnet_data, i);
+#ifdef CONFIG_XDP_LUA
+		struct xdplua_create_work *lw = per_cpu_ptr(&luaworks, i);
+#endif
 
 		INIT_WORK(flush, flush_backlog);
 
@@ -10542,25 +10565,18 @@ static int __init net_dev_init(void)
 		init_gro_hash(&sd->backlog);
 		sd->backlog.poll = process_backlog;
 		sd->backlog.weight = weight_p;
-
 #ifdef CONFIG_XDP_LUA
-		new_state_cpu = (struct lua_state_cpu *)
-			kmalloc(sizeof(struct lua_state_cpu), GFP_ATOMIC);
-		if (!new_state_cpu)
-			continue;
+		lw->L = luaL_newstate();
+		WARN_ON(!lw->L);
 
-		new_state_cpu->L = luaL_newstate();
-		if  (!new_state_cpu->L) {
-			kfree(new_state_cpu);
+		if (!lw->L)
 			continue;
-		}
 
-		luaL_openlibs(new_state_cpu->L);
-		luaL_requiref(new_state_cpu->L, "data", luaopen_data, 1);
-		lua_pop(new_state_cpu->L, 1);
-		new_state_cpu->cpu = i;
+		luaL_openlibs(lw->L);
+		luaL_requiref(lw->L, "data", luaopen_data, 1);
+		lua_pop(lw->L, 1);
 
-		list_add(&new_state_cpu->list, &lua_state_cpu_list);
+		INIT_WORK(&lw->work, per_cpu_xdp_lua_install);
 #endif /* CONFIG_XDP_LUA */
 	}
 

diff --git a/net/core/filter.c b/net/core/filter.c
@@ -5855,10 +5855,22 @@ static const struct bpf_func_proto bpf_tcp_gen_syncookie_proto = {
 #endif /* CONFIG_INET */
 
 #ifdef CONFIG_XDP_LUA
+
+static inline void verify_and_lock(void) {
+	struct xdplua_create_work *lw;
+
+	lw = this_cpu_ptr(&luaworks);
+	if (!lw->init) {
+		lw->init = true;
+		spin_lock(&lw->lock);
+	}
+}
+
 BPF_CALL_2(bpf_lua_dataref, struct xdp_buff *, ctx, int, offset) {
 	if (offset + ctx->data < ctx->data_end) {
 		int data_ref;
 
+		verify_and_lock();
 		data_ref = ldata_newref(ctx->L, ctx->data + offset,
 				ctx->data_end - ctx->data - offset);
 		return data_ref;
@@ -5877,6 +5889,7 @@ static const struct bpf_func_proto bpf_lua_dataref_proto = {
 };
 
 BPF_CALL_2(bpf_lua_dataunref, struct xdp_buff *, ctx, int, data_ref) {
+	verify_and_lock();
 	ldata_unref(ctx->L, data_ref);
 	return 0;
 }
@@ -5892,18 +5905,28 @@ static const struct bpf_func_proto bpf_lua_dataunref_proto = {
 
 BPF_CALL_4(bpf_lua_pcall, struct xdp_buff *, ctx, char *, funcname,
 			int, num_args, int, num_rets) {
+	int base;
+
+	verify_and_lock();
+
+	base = lua_gettop(ctx->L) - num_args;
 	if (lua_getglobal(ctx->L, funcname) != LUA_TFUNCTION) {
 		pr_err("function %s not found\n", funcname);
-		lua_pop(ctx->L, num_args);
-		return 0;
+		num_rets = 0;
+		goto clean_state;
 	}
 
-	lua_insert(ctx->L, 1);
+	lua_insert(ctx->L, base + 1);
 	if (lua_pcall(ctx->L, num_args, num_rets, 0)) {
 		pr_err("%s\n", lua_tostring(ctx->L, -1));
-		lua_pop(ctx->L, 1);
-		return 0;
+		num_rets = 0;
+		goto clean_state;
 	}
+
+	base += num_rets;
+
+clean_state:
+	lua_settop(ctx->L, base);
 	return num_rets;
 }
 
@@ -5919,6 +5942,7 @@ static const struct bpf_func_proto bpf_lua_pcall_proto = {
 };
 
 BPF_CALL_2(bpf_lua_pop, struct xdp_buff *, ctx, int, index) {
+	verify_and_lock();
 	lua_pop(ctx->L, index);
 	return 0;
 }
@@ -5933,6 +5957,7 @@ static const struct bpf_func_proto bpf_lua_pop_proto = {
 };
 
 BPF_CALL_2(bpf_lua_pushinteger, struct xdp_buff *, ctx, int, num) {
+	verify_and_lock();
 	lua_pushinteger(ctx->L, num);
 	return 0;
 }
@@ -5947,6 +5972,7 @@ static const struct bpf_func_proto bpf_lua_pushinteger_proto = {
 };
 
 BPF_CALL_2(bpf_lua_pushlightuserdata, struct xdp_buff *, ctx, void *, ptr) {
+	verify_and_lock();
 	lua_pushlightuserdata(ctx->L, ptr);
 	return 0;
 }
@@ -5961,6 +5987,7 @@ static const struct bpf_func_proto bpf_lua_pushlightuserdata_proto = {
 };
 
 BPF_CALL_2(bpf_lua_pushmap, struct xdp_buff *, ctx, struct bpf_map *, map) {
+	verify_and_lock();
 	lua_pushlightuserdata(ctx->L, map);
 	return 0;
 }
@@ -5975,6 +6002,7 @@ static const struct bpf_func_proto bpf_lua_pushmap_proto = {
 };
 
 BPF_CALL_3(bpf_lua_pushlstring, struct xdp_buff *, ctx, const char *, str, size_t, len) {
+	verify_and_lock();
 	lua_pushlstring(ctx->L, str, len);
 	return 0;
 }
@@ -5990,6 +6018,7 @@ static const struct bpf_func_proto bpf_lua_pushlstring_proto = {
 };
 
 BPF_CALL_1(bpf_lua_pushskb, struct xdp_buff *, ctx) {
+	verify_and_lock();
 	lua_pushlightuserdata(ctx->L, ctx->skb);
 	return 0;
 }
@@ -6003,6 +6032,7 @@ static const struct bpf_func_proto bpf_lua_pushskb_proto = {
 };
 
 BPF_CALL_2(bpf_lua_pushstring, struct xdp_buff *, ctx, const char *, str) {
+	verify_and_lock();
 	lua_pushstring(ctx->L, str);
 	return 0;
 }
@@ -6016,28 +6046,8 @@ static const struct bpf_func_proto bpf_lua_pushstring_proto = {
 	.arg2_type	= ARG_ANYTHING,
 };
 
-BPF_CALL_1(bpf_lua_setstate, struct xdp_buff *, ctx){
-	struct lua_state_cpu *sc;
-	int cpu = smp_processor_id();
-
-	list_for_each_entry(sc, &lua_state_cpu_list, list) {
-		if (sc->cpu == cpu) {
-			ctx->L = sc->L;
-			break;
-		}
-	}
-	return 0;
-}
-
-static const struct bpf_func_proto bpf_lua_setstate_proto = {
-	.func		= bpf_lua_setstate,
-	.gpl_only	= false,
-	.pkt_access	= false,
-	.ret_type	= RET_VOID,
-	.arg1_type	= ARG_PTR_TO_CTX,
-};
-
 BPF_CALL_2(bpf_lua_toboolean, struct xdp_buff *, ctx, int, index) {
+	verify_and_lock();
 	return lua_toboolean(ctx->L, index);
 }
 
@@ -6051,6 +6061,7 @@ static const struct bpf_func_proto bpf_lua_toboolean_proto = {
 };
 
 BPF_CALL_2(bpf_lua_tointeger, struct xdp_buff *, ctx, int, index) {
+	verify_and_lock();
 	return lua_tointeger(ctx->L, index);
 }
 
@@ -6161,8 +6172,6 @@ bpf_base_func_proto(enum bpf_func_id func_id)
 		return &bpf_lua_pushskb_proto;
 	case BPF_FUNC_lua_pushstring:
 		return &bpf_lua_pushstring_proto;
-	case BPF_FUNC_lua_setstate:
-		return &bpf_lua_setstate_proto;
 	case BPF_FUNC_lua_toboolean:
 		return &bpf_lua_toboolean_proto;
 	case BPF_FUNC_lua_tointeger:

diff --git a/samples/bpf/xdplua_map_kern.c b/samples/bpf/xdplua_map_kern.c
@@ -27,7 +27,6 @@ int xdp_lua_test_map_prog(struct xdp_md *ctx)
 	char lookupname[] = "lookup";
 	char updatename[] = "update";
 
-	bpf_lua_setstate(ctx);
 	bpf_lua_pushmap(ctx, &lua_test_map);
 	bpf_lua_pcall(ctx, updatename, 1, 0);