From 957e09a45b8a0cb9a394c6a189a0b925c73b3ca1 Mon Sep 17 00:00:00 2001 From: kircher Date: Sat, 17 Dec 2022 15:34:25 +0800 Subject: [PATCH] sync add RXTX_NB_MBUF_MAX to limit mbuf_pool_size to its range (cherry picked from commit e9bcfb02add587ca909571c8c4eeb5233dbd00b8) --- ..._MAX-to-limit-mbuf_pool_size-to-its-.patch | 40 +++++++++++++++++++ gazelle.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0163-add-RXTX_NB_MBUF_MAX-to-limit-mbuf_pool_size-to-its-.patch diff --git a/0163-add-RXTX_NB_MBUF_MAX-to-limit-mbuf_pool_size-to-its-.patch b/0163-add-RXTX_NB_MBUF_MAX-to-limit-mbuf_pool_size-to-its-.patch new file mode 100644 index 0000000..ac91772 --- /dev/null +++ b/0163-add-RXTX_NB_MBUF_MAX-to-limit-mbuf_pool_size-to-its-.patch @@ -0,0 +1,40 @@ +From 546cde6494913a9d5b1c12578385ca586ee999ef Mon Sep 17 00:00:00 2001 +From: kircher +Date: Sat, 17 Dec 2022 15:25:26 +0800 +Subject: [PATCH] add RXTX_NB_MBUF_MAX to limit mbuf_pool_size to its range + +--- + src/common/gazelle_opt.h | 1 + + src/lstack/core/lstack_cfg.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/common/gazelle_opt.h b/src/common/gazelle_opt.h +index a23b329..7e55422 100644 +--- a/src/common/gazelle_opt.h ++++ b/src/common/gazelle_opt.h +@@ -48,6 +48,7 @@ + #define RTE_TEST_RX_DESC_DEFAULT 4096 + + #define RXTX_NB_MBUF_DEFAULT (128 * 2000) /* mbuf per connect * connect num. size of mbuf is 2536 Byte */ ++#define RXTX_NB_MBUF_MAX (2560 * 2000) + + #define MBUF_MAX_DATA_LEN 1460 + +diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c +index 52a34a4..9c23115 100644 +--- a/src/lstack/core/lstack_cfg.c ++++ b/src/lstack/core/lstack_cfg.c +@@ -717,8 +717,8 @@ static int32_t parse_rxtx_pool_size(void) + } + + int32_t val = config_setting_get_int(arg); +- if (val <= 0) { +- LSTACK_PRE_LOG(LSTACK_ERR, "cfg mbuf_pool_size %d invaild.\n", val); ++ if (val <= 0 || val > RXTX_NB_MBUF_MAX) { ++ LSTACK_PRE_LOG(LSTACK_ERR, "cfg mbuf_pool_size %d invaild, it should be in (0,%d].\n", val, RXTX_NB_MBUF_MAX); + return -EINVAL; + } + +-- +2.33.0 + diff --git a/gazelle.spec b/gazelle.spec index eedd1b6..7cc7973 100644 --- a/gazelle.spec +++ b/gazelle.spec @@ -2,7 +2,7 @@ Name: gazelle Version: 1.0.1 -Release: 36 +Release: 37 Summary: gazelle is a high performance user-mode stack License: MulanPSL-2.0 URL: https://gitee.com/openeuler/gazelle @@ -177,6 +177,7 @@ Patch9159: 0159-fix-kernel-event-thread-bind-numa-failed.patch Patch9160: 0160-stack-thread-parms-config-by-conf.patch Patch9161: 0161-ltran-rxtx-mbuf-pool-size-config-by-conf.patch Patch9162: 0162-move-select_thread_path-after-posix_api_init.patch +Patch9163: 0163-add-RXTX_NB_MBUF_MAX-to-limit-mbuf_pool_size-to-its-.patch %description %{name} is a high performance user-mode stack. @@ -217,6 +218,9 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b %config(noreplace) %{conf_path}/ltran.conf %changelog +* Sat Dec 17 2022 kircher - 1.0.1-37 +- add RXTX_NB_MBUF_MAX to limit mbuf_pool_size to its range + * Fri Dec 16 2022 kircher - 1.0.1-36 - move select_thread_path after posix_api_init