gt: correct NUMA node of LPM tables

AltraMayor · AltraMayor · commit d20820895fed · 2021-07-06T16:03:43.000-04:00
The Lua states that run policies are created during
the initialization of Grantor, and during policy reloads.
In the former case, the creation is done on the master lcore.
In the latter case, on the lcore of the dynamic configuration block.
Thus, the code has to guess the lcore that actually runs the policy
while creating LPM tables.

This patch avoids the guessing by adding the running lcore ID to
the registry of the lua states, and making the Lua LPM library to
use this information.
diff --git a/gt/lua_lpm.c b/gt/lua_lpm.c
@@ -26,6 +26,7 @@
 #include "gatekeeper_net.h"
 #include "gatekeeper_lpm.h"
 #include "gatekeeper_fib.h"
+#include "gatekeeper_gt.h"
 
 static int
 l_str_to_prefix(lua_State *l)
@@ -91,6 +92,7 @@ l_new_lpm(lua_State *l)
 	struct rte_lpm_config lpm_conf;
 	struct rte_lpm **p_lpm;
 	static rte_atomic32_t identifier = RTE_ATOMIC32_INIT(0);
+	unsigned int lcore_id;
 
 	memset(&lpm_conf, 0, sizeof(lpm_conf));
 
@@ -104,9 +106,13 @@ l_new_lpm(lua_State *l)
 		luaL_error(l, "Expected two arguments, however it got %d arguments",
 			lua_gettop(l));
 
+	lua_getfield(l, LUA_REGISTRYINDEX, GT_LUA_LCORE_ID_NAME);
+	lcore_id = lua_tonumber(l, -1);
+
 	p_lpm = lua_newuserdata(l, sizeof(struct rte_lpm *));
-	*p_lpm = init_ipv4_lpm("gt_", &lpm_conf, rte_socket_id(),
-		rte_lcore_id(), rte_atomic32_add_return(&identifier, 1));
+	*p_lpm = init_ipv4_lpm("gt_", &lpm_conf,
+		rte_lcore_to_socket_id(lcore_id), lcore_id,
+		rte_atomic32_add_return(&identifier, 1));
 	if (unlikely(*p_lpm == NULL))
 		luaL_error(l, "gt: failed to initialize the IPv4 LPM table for Lua policies");
 
@@ -255,6 +261,7 @@ l_new_lpm6(lua_State *l)
 	struct rte_lpm6_config lpm6_conf;
 	struct rte_lpm6 **p_lpm6;
 	static rte_atomic32_t identifier6 = RTE_ATOMIC32_INIT(0);
+	unsigned int lcore_id;
 
 	memset(&lpm6_conf, 0, sizeof(lpm6_conf));
 
@@ -268,9 +275,13 @@ l_new_lpm6(lua_State *l)
 		luaL_error(l, "Expected two arguments, however it got %d arguments",
 			lua_gettop(l));
 
+	lua_getfield(l, LUA_REGISTRYINDEX, GT_LUA_LCORE_ID_NAME);
+	lcore_id = lua_tonumber(l, -1);
+
 	p_lpm6 = lua_newuserdata(l, sizeof(struct rte_lpm6 *));
-	*p_lpm6 = init_ipv6_lpm("gt", &lpm6_conf, rte_socket_id(),
-		rte_lcore_id(), rte_atomic32_add_return(&identifier6, 1));
+	*p_lpm6 = init_ipv6_lpm("gt", &lpm6_conf,
+		rte_lcore_to_socket_id(lcore_id), lcore_id,
+		rte_atomic32_add_return(&identifier6, 1));
 	if (unlikely(*p_lpm6 == NULL))
 		luaL_error(l, "gt: failed to initialize the IPv6 LPM table for Lua policies");
 
diff --git a/gt/main.c b/gt/main.c
@@ -1822,8 +1822,7 @@ alloc_lua_mem_in_dpdk(void *ud, void *ptr,
 #endif
 
 static lua_State *
-alloc_and_setup_lua_state(struct gt_config *gt_conf,
-	__attribute__((unused))unsigned int lcore_id)
+alloc_and_setup_lua_state(struct gt_config *gt_conf, unsigned int lcore_id)
 {
 	int ret;
 	char lua_entry_path[128];
@@ -1849,6 +1848,11 @@ alloc_and_setup_lua_state(struct gt_config *gt_conf,
 		goto out;
 	}
 
+	/* Add lcore_id information to the registry of @lua_state. */
+	lua_pushstring(lua_state, GT_LUA_LCORE_ID_NAME);
+	lua_pushnumber(lua_state, lcore_id);
+	lua_settable(lua_state, LUA_REGISTRYINDEX);
+
 	luaL_openlibs(lua_state);
 	lualpm_openlib(lua_state);
 	set_lua_path(lua_state, gt_conf->lua_base_directory);
diff --git a/include/gatekeeper_gt.h b/include/gatekeeper_gt.h
@@ -234,4 +234,10 @@ gt_conf_hold(struct gt_config *gt_conf)
 	rte_atomic32_inc(&gt_conf->ref_cnt);
 }
 
+/*
+ * Key in the registry of a Lua state used to run policies that points to
+ * the lcore_id where the policy runs.
+ */
+#define GT_LUA_LCORE_ID_NAME "lcore_id"
+
 #endif /* _GATEKEEPER_GT_H_ */
