packages/gazelle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!297 [sync] PR-294: reduce duplicate code in lstack_cfg.c

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @wu-changsheng 
Signed-off-by: @wu-changsheng
This commit is contained in:
openeuler-ci-bot 2023-02-27 08:27:52 +00:00 committed by Gitee
commit 201fc507f3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 363 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0195-adapt-unsupport-sock-optname.patch Normal file
View File

@ -0,0 +1,61 @@
From 7a03877d6838498d82f0e506e02d4507efd047ac Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Wed, 22 Feb 2023 21:38:32 +0800
Subject: [PATCH] adapt unsupport sock optname
---
src/lstack/api/lstack_wrap.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index d976f74..77d2442 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -19,11 +19,11 @@
#include <sys/socket.h>
#include <stdarg.h>
#include <netinet/in.h>
+#include <netinet/tcp.h>
#include <sys/epoll.h>
#include <unistd.h>
#include <lwip/posix_api.h>
-#include <lwip/api.h>
#include <lwip/lwipsock.h>
#include "posix/lstack_epoll.h"
@@ -273,9 +273,21 @@ static inline int32_t do_getsockname(int32_t s, struct sockaddr *name, socklen_t
return posix_api->getsockname_fn(s, name, namelen);
}
+static bool unsupport_optname(int32_t optname)
+{
+ if (optname == SO_BROADCAST ||
+ optname == SO_PROTOCOL ||
+ optname == TCP_QUICKACK ||
+ optname == SO_SNDTIMEO ||
+ optname == SO_RCVTIMEO) {
+ return true;
+ }
+ return false;
+}
+
static inline int32_t do_getsockopt(int32_t s, int32_t level, int32_t optname, void *optval, socklen_t *optlen)
{
- if (select_path(s) == PATH_LWIP) {
+ if (select_path(s) == PATH_LWIP && !unsupport_optname(optname)) {
return rpc_call_getsockopt(s, level, optname, optval, optlen);
}
@@ -284,7 +296,7 @@ static inline int32_t do_getsockopt(int32_t s, int32_t level, int32_t optname, v
static inline int32_t do_setsockopt(int32_t s, int32_t level, int32_t optname, const void *optval, socklen_t optlen)
{
- if (select_path(s) == PATH_KERNEL) {
+ if (select_path(s) == PATH_KERNEL || unsupport_optname(optname)) {
return posix_api->setsockopt_fn(s, level, optname, optval, optlen);
}
--
2.23.0

295
0196-reduce-duplicate-code-in-lstack_cfg.c.patch Normal file
View File

@ -0,0 +1,295 @@
From dbf196207b57ec4a5184dd04f06b588bd36f8d9a Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Sat, 25 Feb 2023 20:05:12 +0800
Subject: [PATCH] reduce duplicate code in lstack_cfg.c
---
src/lstack/core/lstack_cfg.c | 211 +++++++----------------------------
1 file changed, 38 insertions(+), 173 deletions(-)
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 0c4b55b..e1ea38d 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -65,6 +65,25 @@ static int32_t parse_nic_read_number(void);
static int32_t parse_tcp_conn_count(void);
static int32_t parse_mbuf_count_per_conn(void);
+static inline int32_t parse_int(void *arg, char * arg_string, int32_t default_val,
+ int32_t min_val, int32_t max_val)
+{
+ const config_setting_t *config_arg = NULL;
+ config_arg = config_lookup(&g_config, arg_string);
+ if (config_arg == NULL) {
+ *(int32_t *)arg = default_val;
+ return 0;
+ }
+ int32_t val = config_setting_get_int(config_arg);
+ if (val < min_val || val > max_val) {
+ LSTACK_PRE_LOG(LSTACK_ERR, "cfg %s %d invaild, range is [%d, %d].\n",
+ arg_string, val, min_val, max_val);
+ return -EINVAL;
+ }
+ *(int32_t *)arg = val;
+ return 0;
+}
+
struct config_vector_t {
const char *name;
int32_t (*f)(void);
@@ -642,21 +661,12 @@ free_dpdk_args:
static int32_t parse_low_power_mode(void)
{
- const config_setting_t *setting = NULL;
-
/* Set parameter default value */
g_config_params.lpm_detect_ms = LSTACK_LPM_DETECT_MS;
g_config_params.lpm_rx_pkts = LSTACK_LPM_RX_PKTS;
g_config_params.lpm_pkts_in_detect = LSTACK_LPM_PKTS_IN_DETECT;
- setting = config_lookup(&g_config, "low_power_mode");
- if (setting == NULL) {
- g_config_params.low_power_mod = 0;
- return 0;
- }
- g_config_params.low_power_mod = (uint16_t)config_setting_get_int(setting);
-
- return 0;
+ return parse_int(&g_config_params.low_power_mod, "low_power_mode", 0, 0, 1);
}
static int32_t parse_wakeup_cpu_number(void)
@@ -695,211 +705,66 @@ static int32_t parse_wakeup_cpu_number(void)
static int32_t parse_use_ltran(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "use_ltran");
- if (arg == NULL) {
- g_config_params.use_ltran = true;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- g_config_params.use_ltran = (val == 0) ? false : true;
-
- return 0;
+ return parse_int(&g_config_params.use_ltran, "use_ltran", 1, 0, 1);
}
static int32_t parse_tcp_conn_count(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "tcp_conn_count");
- if (arg == NULL) {
- g_config_params.tcp_conn_count = TCP_CONN_COUNT;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0 || val > TCP_CONN_COUNT) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg tcp_conn_count %d invaild, it should be in (0,%d].\n", val, TCP_CONN_COUNT);
- return -EINVAL;
- }
-
- g_config_params.tcp_conn_count = val;
-
- return 0;
+ return parse_int(&g_config_params.tcp_conn_count, "tcp_conn_count", TCP_CONN_COUNT, 1, TCP_CONN_COUNT);
}
static int32_t parse_mbuf_count_per_conn(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "mbuf_count_per_conn");
- if (arg == NULL) {
- g_config_params.tcp_conn_count = MBUF_COUNT_PER_CONN;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg mbuf_count_per_conn %d invaild, it should be > 0.\n", val);
- return -EINVAL;
- }
-
- g_config_params.mbuf_count_per_conn = val;
-
- return 0;
+ return parse_int(&g_config_params.mbuf_count_per_conn, "mbuf_count_per_conn",
+ MBUF_COUNT_PER_CONN, 1, INT32_MAX);
}
static int32_t parse_send_connect_number(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "send_connect_number");
- if (arg == NULL) {
- g_config_params.send_connect_number = STACK_THREAD_DEFAULT;
- LSTACK_PRE_LOG(LSTACK_ERR, "use default send_connect_number %d.\n", STACK_THREAD_DEFAULT);
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg send_connect_number %d invaild.\n", val);
- return -EINVAL;
- }
-
- g_config_params.send_connect_number = val;
-
- return 0;
+ return parse_int(&g_config_params.send_connect_number, "send_connect_number",
+ STACK_THREAD_DEFAULT, 1, INT32_MAX);
}
static int32_t parse_read_connect_number(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "read_connect_number");
- if (arg == NULL) {
- g_config_params.read_connect_number = STACK_THREAD_DEFAULT;
- LSTACK_PRE_LOG(LSTACK_ERR, "use default read_connect_number %d.\n", STACK_THREAD_DEFAULT);
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg read_connect_number %d invaild.\n", val);
- return -EINVAL;
- }
-
- g_config_params.read_connect_number = val;
-
- return 0;
+ return parse_int(&g_config_params.read_connect_number, "read_connect_number",
+ STACK_THREAD_DEFAULT, 1, INT32_MAX);
}
static int32_t parse_rpc_number(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "rpc_number");
- if (arg == NULL) {
- g_config_params.rpc_number = STACK_THREAD_DEFAULT;
- LSTACK_PRE_LOG(LSTACK_ERR, "use default rpc_number %d.\n", STACK_THREAD_DEFAULT);
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg rpc_number %d invaild.\n", val);
- return -EINVAL;
- }
-
- g_config_params.rpc_number = val;
-
- return 0;
+ return parse_int(&g_config_params.rpc_number, "rpc_number",
+ STACK_THREAD_DEFAULT, 1, INT32_MAX);
}
static int32_t parse_nic_read_number(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "nic_read_number");
- if (arg == NULL) {
- g_config_params.nic_read_number = STACK_NIC_READ_DEFAULT;
- LSTACK_PRE_LOG(LSTACK_ERR, "use default nic_read_number %d.\n", STACK_NIC_READ_DEFAULT);
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- if (val <= 0) {
- LSTACK_PRE_LOG(LSTACK_ERR, "cfg nic_read_number %d invaild.\n", val);
- return -EINVAL;
- }
-
- g_config_params.nic_read_number = val;
-
- return 0;
+ return parse_int(&g_config_params.nic_read_number, "nic_read_number",
+ STACK_NIC_READ_DEFAULT, 1, INT32_MAX);
}
static int32_t parse_listen_shadow(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "listen_shadow");
- if (arg == NULL) {
- g_config_params.listen_shadow = false;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- g_config_params.listen_shadow = (val == 0) ? false : true;
-
- return 0;
+ return parse_int(&g_config_params.listen_shadow, "listen_shadow", 0, 0, 1);
}
+
static int32_t parse_app_bind_numa(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "app_bind_numa");
- if (arg == NULL) {
- g_config_params.app_bind_numa = true;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- g_config_params.app_bind_numa = (val == 0) ? false : true;
-
- return 0;
+ return parse_int(&g_config_params.app_bind_numa, "app_bind_numa", 1, 0, 1);
}
static int32_t parse_main_thread_affinity(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "main_thread_affinity");
- if (arg == NULL) {
- g_config_params.main_thread_affinity = false;
- return 0;
- }
-
- int32_t val = config_setting_get_int(arg);
- g_config_params.main_thread_affinity = (val == 0) ? false : true;
-
- return 0;
+ return parse_int(&g_config_params.main_thread_affinity, "main_thread_affinity", 0, 0, 1);
}
static int32_t parse_kni_switch(void)
{
- const config_setting_t *arg = NULL;
-
- arg = config_lookup(&g_config, "kni_switch");
- if (arg == NULL) {
- g_config_params.kni_switch = false;
- return 0;
+ if (parse_int(&g_config_params.kni_switch, "kni_switch", 0, 0, 1) != 0) {
+ return -1;
}
- int32_t val = config_setting_get_int(arg);
- g_config_params.kni_switch = (val == 0) ? false : true;
-
if (g_config_params.use_ltran && g_config_params.kni_switch) {
LSTACK_PRE_LOG(LSTACK_ERR, "kni_switch=1 when use_ltran=1, invaild.\n");
return -1;
--
2.23.0

8
gazelle.spec
View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.1
Release: 49
Release: 50
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -209,6 +209,8 @@ Patch9191: 0191-change-mbuf_pool_size-in-lstack.conf-to-tcp_conn_cou.patch
Patch9192: 0192-fix-build-error-in-lstack.patch
Patch9193: 0193-check-and-fix-wakeup_list-when-null-appears.patch
Patch9194: 0194-eneble-TSO-and-fix-TSO-mbuf-pktlen-error.patch
Patch9195: 0195-adapt-unsupport-sock-optname.patch
Patch9196: 0196-reduce-duplicate-code-in-lstack_cfg.c.patch
%description
%{name} is a high performance user-mode stack.
@ -249,6 +251,10 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Mon Feb 27 2023 wu-changsheng <wuchangsheng2@huawei.com> - 1.0.1-50
- reduce duplicate code in lstack_cfg.c
- adapt unsupport sock optname
* Wed Feb 22 2023 kircher <majun65@huawei.com> - 1.0.1-49
- eneble TSO and fix TSO mbuf pktlen error
- check and fix wakeup_list when null appears