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

sync add-udp-multicast-support-in-gazelle

Browse Source 
(cherry picked from commit 39a8ed6beb5633bb927b1dec1a4444ad0c321874)
This commit is contained in:
kircher 2023-05-16 15:57:04 +08:00 committed by openeuler-sync-bot
parent 5270c12dee
commit ec652d9528
12 changed files with 4061 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
0229-fix-gazellectl-x-error-when-multiplt-user-nic-config.patch Normal file
View File

@ -0,0 +1,68 @@
From dcfd85d26a09a516a924350fa6404ec4237c2514 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Fri, 31 Mar 2023 16:05:46 +0800
Subject: [PATCH] fix gazellectl -x error when multiplt user nic config
---
src/lstack/core/lstack_dpdk.c | 3 ++-
src/lstack/core/lstack_stack_stat.c | 2 +-
src/lstack/include/lstack_dpdk.h | 2 +-
src/ltran/ltran_dfx.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/lstack/core/lstack_dpdk.c b/src/lstack/core/lstack_dpdk.c
index ebfebaa..e386dfc 100644
--- a/src/lstack/core/lstack_dpdk.c
+++ b/src/lstack/core/lstack_dpdk.c
@@ -298,7 +298,8 @@ void lstack_log_level_init(void)
}
// get port id
-inline uint16_t get_port_id(){
+inline uint16_t get_port_id(void)
+{
uint16_t port_id = get_global_cfg_params()->port_id;
return port_id;
}
diff --git a/src/lstack/core/lstack_stack_stat.c b/src/lstack/core/lstack_stack_stat.c
index eed7fbf..d1c749a 100644
--- a/src/lstack/core/lstack_stack_stat.c
+++ b/src/lstack/core/lstack_stack_stat.c
@@ -260,7 +260,7 @@ int32_t handle_stack_cmd(int32_t fd, enum GAZELLE_STAT_MODE stat_mode)
struct protocol_stack_group *stack_group = get_protocol_stack_group();
if (stat_mode == GAZELLE_STAT_LSTACK_SHOW_XSTATS) {
- dpdk_nic_xstats_get(&dfx, 0);
+ dpdk_nic_xstats_get(&dfx, get_port_id());
dfx.tid = 0;
dfx.eof = 1;
send_control_cmd_data(fd, &dfx);
diff --git a/src/lstack/include/lstack_dpdk.h b/src/lstack/include/lstack_dpdk.h
index 7c222ca..a896903 100644
--- a/src/lstack/include/lstack_dpdk.h
+++ b/src/lstack/include/lstack_dpdk.h
@@ -52,7 +52,7 @@ void dpdk_skip_nic_init(void);
int32_t dpdk_init_lstack_kni(void);
void dpdk_restore_pci(void);
bool port_in_stack_queue(uint32_t src_ip, uint32_t dst_ip, uint16_t src_port, uint16_t dst_port);
-uint16_t get_port_id();
+uint16_t get_port_id(void);
struct rte_mempool *create_pktmbuf_mempool(const char *name, uint32_t nb_mbuf,uint32_t mbuf_cache_size, uint16_t queue_id);
void dpdk_nic_xstats_get(struct gazelle_stack_dfx_data *dfx, uint16_t port_id);
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 9180e89..761bbb7 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -137,7 +137,7 @@ static void gazelle_print_lstack_xstats(void *buf, const struct gazelle_stat_msg
struct nic_eth_xstats *xstats = &stat->data.nic_xstats;
static const char *nic_stats_border = "########################";
- printf("###### NIC extended statistics for port %-2d #########\n", 0);
+ printf("###### NIC extended statistics for port %-2d #########\n", xstats->port_id);
printf("%s############################\n",nic_stats_border);
if (xstats->len <= 0 || xstats->len > RTE_ETH_XSTATS_MAX_LEN) {
printf("xstats item(%d) num error!\n", xstats->len);
--
2.33.0

93
0230-fix-client-connect-number-unbalance-on-lstack.patch Normal file
View File

@ -0,0 +1,93 @@
From 3a1ff6aa0c9d85e3a5021fd3b6d788efe77db52a Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Fri, 31 Mar 2023 20:15:28 +0800
Subject: [PATCH] fix client connect number unbalance on lstack
---
src/lstack/core/lstack_lwip.c | 1 -
src/lstack/core/lstack_protocol_stack.c | 8 +++++++-
src/lstack/include/lstack_protocol_stack.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lstack/core/lstack_lwip.c b/src/lstack/core/lstack_lwip.c
index 71abbc6..ebdb469 100644
--- a/src/lstack/core/lstack_lwip.c
+++ b/src/lstack/core/lstack_lwip.c
@@ -192,7 +192,6 @@ void gazelle_init_sock(int32_t fd)
(void)replenish_send_idlembuf(stack, sock);
sock->stack = stack;
- sock->stack->conn_num++;
init_list_node_null(&sock->recv_list);
init_list_node_null(&sock->event_list);
}
diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c
index 92300ef..76914f8 100644
--- a/src/lstack/core/lstack_protocol_stack.c
+++ b/src/lstack/core/lstack_protocol_stack.c
@@ -124,6 +124,7 @@ struct protocol_stack *get_bind_protocol_stack(void)
/* same app communication thread bind same stack */
if (bind_stack) {
+ bind_stack->conn_num++;
return bind_stack;
}
@@ -140,6 +141,7 @@ struct protocol_stack *get_bind_protocol_stack(void)
return NULL;
}
} else {
+ pthread_spin_lock(&stack_group->socket_lock);
for (uint16_t i = 0; i < stack_group->stack_num; i++) {
struct protocol_stack* stack = stack_group->stacks[i];
if (get_global_cfg_params()->seperate_send_recv) {
@@ -147,7 +149,7 @@ struct protocol_stack *get_bind_protocol_stack(void)
index = i;
min_conn_num = stack->conn_num;
}
- }else {
+ } else {
if (stack->conn_num < min_conn_num) {
index = i;
min_conn_num = stack->conn_num;
@@ -156,7 +158,9 @@ struct protocol_stack *get_bind_protocol_stack(void)
}
}
+ stack_group->stacks[index]->conn_num++;
bind_stack = stack_group->stacks[index];
+ pthread_spin_unlock(&stack_group->socket_lock);
return stack_group->stacks[index];
}
@@ -541,6 +545,7 @@ int32_t init_protocol_stack(void)
init_list_node(&stack_group->poll_list);
pthread_spin_init(&stack_group->poll_list_lock, PTHREAD_PROCESS_PRIVATE);
+ pthread_spin_init(&stack_group->socket_lock, PTHREAD_PROCESS_PRIVATE);
if (init_protocol_sem() != 0) {
@@ -689,6 +694,7 @@ void stack_accept(struct rpc_msg *msg)
}
msg->result = accept_fd;
+ sock->stack->conn_num++;
if (rte_ring_count(sock->conn->recvmbox->ring)) {
add_recv_list(accept_fd);
}
diff --git a/src/lstack/include/lstack_protocol_stack.h b/src/lstack/include/lstack_protocol_stack.h
index 001ab47..c75161f 100644
--- a/src/lstack/include/lstack_protocol_stack.h
+++ b/src/lstack/include/lstack_protocol_stack.h
@@ -103,6 +103,7 @@ struct protocol_stack_group {
/* dfx stats */
bool latency_start;
uint64_t call_alloc_fail;
+ pthread_spinlock_t socket_lock;
};
long get_stack_tid(void);
--
2.33.0

218
0231-kni-down-not-stop-nic.patch Normal file
View File

@ -0,0 +1,218 @@
From 59c658fa0f75748fa7b49170b9fc34267ef1797c Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Mon, 3 Apr 2023 14:42:53 +0800
Subject: [PATCH] kni down not stop nic
---
src/common/dpdk_common.c | 37 +++++++++++--------------
src/common/dpdk_common.h | 2 +-
src/lstack/core/lstack_cfg.c | 8 +++---
src/lstack/core/lstack_protocol_stack.c | 10 ++++---
src/lstack/netif/lstack_ethdev.c | 8 ++++--
src/ltran/ltran_forward.c | 5 ++--
6 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/src/common/dpdk_common.c b/src/common/dpdk_common.c
index f5a20dd..23c96d6 100644
--- a/src/common/dpdk_common.c
+++ b/src/common/dpdk_common.c
@@ -34,16 +34,12 @@
#define COMMON_INFO(fmt, ...) LSTACK_LOG(INFO, LSTACK, fmt, ##__VA_ARGS__)
#endif
-static pthread_mutex_t g_kni_mutex = PTHREAD_MUTEX_INITIALIZER;
struct rte_kni *g_pkni = NULL;
+static volatile bool g_kni_started = false;
-/*
- * lock for preventing data race between tx thread and down operation.
- * Don't need to add lock on rx because down operation and rx are in the same thread
- */
-pthread_mutex_t *get_kni_mutex(void)
+bool get_kni_started(void)
{
- return &g_kni_mutex;
+ return g_kni_started;
}
struct rte_kni* get_gazelle_kni(void)
@@ -62,23 +58,18 @@ static int32_t kni_config_network_interface(uint16_t port_id, uint8_t if_up)
}
if (if_up != 0) { /* Configure network interface up */
- if (!g_bond_dev_started) {
- pthread_mutex_lock(&g_kni_mutex);
- ret = rte_eth_dev_start(port_id);
- pthread_mutex_unlock(&g_kni_mutex);
- if (ret < 0) {
- COMMON_ERR("Failed to start port %hu ret=%d\n", port_id, ret);
+ if (!g_kni_started) {
+ g_kni_started = true;
+ if (!g_bond_dev_started) {
+ rte_eth_dev_start(port_id);
+ g_bond_dev_started = true;
}
- g_bond_dev_started = true;
} else {
COMMON_INFO("trying to start a started dev. \n");
}
} else { /* Configure network interface down */
- if (g_bond_dev_started) {
- pthread_mutex_lock(&g_kni_mutex);
- rte_eth_dev_stop(port_id);
- pthread_mutex_unlock(&g_kni_mutex);
- g_bond_dev_started = false;
+ if (g_kni_started) {
+ g_kni_started = false;
} else {
COMMON_INFO("trying to stop a stopped dev. \n");
}
@@ -201,6 +192,12 @@ void dpdk_kni_release(void)
int32_t kni_process_tx(struct rte_mbuf **pkts_burst, uint32_t count)
{
uint32_t i;
+ if (!g_kni_started) {
+ for (i = 0; i < count; i++) {
+ rte_pktmbuf_free(pkts_burst[i]);
+ }
+ return 0;
+ }
for (i = 0; i < count; ++i) {
struct rte_ipv4_hdr * ipv4_hdr = (struct rte_ipv4_hdr *)(rte_pktmbuf_mtod(pkts_burst[i], char*)
@@ -227,9 +224,7 @@ void kni_process_rx(uint16_t port)
nb_kni_rx = rte_kni_rx_burst(g_pkni, pkts_burst, GAZELLE_KNI_READ_SIZE);
if (nb_kni_rx > 0) {
- pthread_mutex_lock(&g_kni_mutex);
nb_rx = rte_eth_tx_burst(port, 0, pkts_burst, nb_kni_rx);
- pthread_mutex_unlock(&g_kni_mutex);
for (i = nb_rx; i < nb_kni_rx; ++i) {
rte_pktmbuf_free(pkts_burst[i]);
diff --git a/src/common/dpdk_common.h b/src/common/dpdk_common.h
index 6b107ae..2f0e8d1 100644
--- a/src/common/dpdk_common.h
+++ b/src/common/dpdk_common.h
@@ -94,7 +94,7 @@ static __rte_always_inline void time_stamp_into_mbuf(uint32_t rx_count, struct r
}
}
-pthread_mutex_t *get_kni_mutex(void);
+bool get_kni_started(void);
struct rte_kni* get_gazelle_kni(void);
int32_t dpdk_kni_init(uint16_t port, struct rte_mempool *pool);
int32_t kni_process_tx(struct rte_mbuf **pkts_burst, uint32_t count);
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 168aa49..8558121 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -1026,6 +1026,10 @@ static int parse_process_index(void)
}
} else {
g_config_params.process_idx = (uint8_t)config_setting_get_int(process_idx);
+ if (g_config_params.is_primary && g_config_params.process_idx != 0 ||
+ !g_config_params.is_primary && g_config_params.process_idx == 0) {
+ return -EINVAL;
+ }
}
return 0;
@@ -1045,9 +1049,5 @@ static int parse_tuple_filter(void)
return -EINVAL;
}
- // check primary process_idx
- if (g_config_params.is_primary && g_config_params.process_idx != 0) {
- return -EINVAL;
- }
return 0;
}
diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c
index 76914f8..a858b37 100644
--- a/src/lstack/core/lstack_protocol_stack.c
+++ b/src/lstack/core/lstack_protocol_stack.c
@@ -483,7 +483,9 @@ static void* gazelle_stack_thread(void *arg)
* so processing KNI requests only in the thread with queue_id No.0 is sufficient. */
if (kni_switch && !queue_id && !(wakeup_tick & 0xfff)) {
rte_kni_handle_request(get_gazelle_kni());
- kni_handle_rx(get_port_id());
+ if (get_kni_started()) {
+ kni_handle_rx(get_port_id());
+ }
}
wakeup_tick++;
@@ -557,9 +559,9 @@ int32_t init_protocol_stack(void)
if (get_global_cfg_params()->is_primary) {
for (uint16_t idx = 0; idx < get_global_cfg_params()->tot_queue_num; idx++) {
- struct rte_mempool* rxtx_mbuf = create_pktmbuf_mempool("rxtx_mbuf",
- get_global_cfg_params()->mbuf_count_per_conn * get_global_cfg_params()->tcp_conn_count / stack_group->stack_num, RXTX_CACHE_SZ, idx);
- get_protocol_stack_group()->total_rxtx_pktmbuf_pool[idx] = rxtx_mbuf;
+ struct rte_mempool* rxtx_mbuf = create_pktmbuf_mempool("rxtx_mbuf",
+ get_global_cfg_params()->mbuf_count_per_conn * get_global_cfg_params()->tcp_conn_count / stack_group->stack_num, RXTX_CACHE_SZ, idx);
+ get_protocol_stack_group()->total_rxtx_pktmbuf_pool[idx] = rxtx_mbuf;
}
}
diff --git a/src/lstack/netif/lstack_ethdev.c b/src/lstack/netif/lstack_ethdev.c
index e26fe30..4103f22 100644
--- a/src/lstack/netif/lstack_ethdev.c
+++ b/src/lstack/netif/lstack_ethdev.c
@@ -719,7 +719,9 @@ void kni_handle_rx(uint16_t port_id)
void kni_handle_tx(struct rte_mbuf *mbuf)
{
- if (!get_global_cfg_params()->kni_switch) {
+ if (!get_global_cfg_params()->kni_switch ||
+ !get_kni_started()) {
+ rte_pktmbuf_free(mbuf);
return;
}
struct rte_ipv4_hdr *ipv4_hdr;
@@ -776,9 +778,9 @@ int32_t gazelle_eth_dev_poll(struct protocol_stack *stack, uint8_t use_ltran_fla
if (likely(transfer_type == TRANSFER_CURRENT_THREAD)) {
eth_dev_recv(stack->pkts[i], stack);
- }else if (transfer_type == TRANSFER_KERNEL) {
+ } else if (transfer_type == TRANSFER_KERNEL) {
kni_handle_tx(stack->pkts[i]);
- }else {
+ } else {
/*transfer to other thread*/
}
}
diff --git a/src/ltran/ltran_forward.c b/src/ltran/ltran_forward.c
index 8629acb..b41e1e2 100644
--- a/src/ltran/ltran_forward.c
+++ b/src/ltran/ltran_forward.c
@@ -690,7 +690,6 @@ static __rte_always_inline void downstream_forward_one(struct gazelle_stack *sta
/* send packets anyway. */
tx_pkts = 0;
- pthread_mutex_lock(get_kni_mutex());
while (tx_pkts < used_cnt) {
tx_pkts += rte_eth_tx_burst(port_id, queue_id,
(struct rte_mbuf **)(&dst_bufs[tx_pkts]),
@@ -702,7 +701,6 @@ static __rte_always_inline void downstream_forward_one(struct gazelle_stack *sta
}
}
}
- pthread_mutex_unlock(get_kni_mutex());
get_statistics()->port_stats[g_port_index].tx_bytes += tx_bytes;
get_statistics()->port_stats[g_port_index].tx += tx_pkts;
@@ -737,7 +735,8 @@ int32_t downstream_forward(uint16_t *port)
while (get_ltran_stop_flag() != GAZELLE_TRUE) {
/* kni rx means read from kni and send to nic */
- if (get_ltran_config()->dpdk.kni_switch == GAZELLE_ON) {
+ if (get_ltran_config()->dpdk.kni_switch == GAZELLE_ON &&
+ get_kni_started()) {
kni_process_rx(g_port_index);
}
--
2.33.0

79
0232-fix-rpc-msg-alloc-failed.patch Normal file
View File

@ -0,0 +1,79 @@
From 9ae296b6fbda03781799251ba8801e166cded656 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Thu, 6 Apr 2023 19:42:59 +0800
Subject: [PATCH] fix rpc msg alloc failed fix process_numa args error coredump
fix sock->conn not free when fd is kernel mode
---
src/lstack/api/lstack_wrap.c | 9 ++++++++-
src/lstack/core/lstack_cfg.c | 4 ++--
src/lstack/core/lstack_protocol_stack.c | 4 ++++
src/lstack/include/lstack_thread_rpc.h | 2 +-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index b8a6590..90b2252 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -528,7 +528,14 @@ static inline int32_t do_close(int32_t s)
{
struct lwip_sock *sock = NULL;
if (select_path(s, &sock) == PATH_KERNEL) {
- return posix_api->close_fn(s);
+ /* we called lwip_socket, even if kernel fd */
+ if (posix_api != NULL && !posix_api->ues_posix &&
+ /* contain posix_api->close_fn if success */
+ stack_broadcast_close(s) == 0) {
+ return 0;
+ } else {
+ return posix_api->close_fn(s);
+ }
}
if (sock && sock->wakeup && sock->wakeup->epollfd == s) {
return lstack_epoll_close(s);
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 8558121..9430dd7 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -998,8 +998,8 @@ static int32_t parse_process_numa(void)
return 0;
args = config_setting_get_string(cfg_args);
- if (cfg_args == NULL) {
- return 0;
+ if (args == NULL) {
+ return -EINVAL;
}
ret = separate_str_to_array((char *)args, g_config_params.process_numa, PROTOCOL_STACK_MAX, GAZELLE_MAX_NUMA_NODES);
diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c
index a858b37..061582f 100644
--- a/src/lstack/core/lstack_protocol_stack.c
+++ b/src/lstack/core/lstack_protocol_stack.c
@@ -819,6 +819,10 @@ int32_t stack_broadcast_close(int32_t fd)
struct lwip_sock *sock = get_socket(fd);
int32_t ret = 0;
+ if (sock == NULL) {
+ return -1;
+ }
+
do {
sock = sock->listen_next;
if (rpc_call_close(fd)) {
diff --git a/src/lstack/include/lstack_thread_rpc.h b/src/lstack/include/lstack_thread_rpc.h
index ed111fb..657ffa9 100644
--- a/src/lstack/include/lstack_thread_rpc.h
+++ b/src/lstack/include/lstack_thread_rpc.h
@@ -25,7 +25,7 @@
#define MSG_ARG_4 (4)
#define RPM_MSG_ARG_SIZE (5)
-#define RPC_MSG_MAX 512
+#define RPC_MSG_MAX 2048
#define RPC_MSG_MASK (RPC_MSG_MAX - 1)
struct rpc_msg;
--
2.33.0

27
0233-add-parentheses-to-fix-build-error.patch Normal file
View File

@ -0,0 +1,27 @@
From ace78c329b02e69162c1ec4b9b3260d276694ece Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Fri, 7 Apr 2023 09:42:39 +0800
Subject: [PATCH] add parentheses to fix build error
---
src/lstack/core/lstack_cfg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 9430dd7..394cb13 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -1026,8 +1026,8 @@ static int parse_process_index(void)
}
} else {
g_config_params.process_idx = (uint8_t)config_setting_get_int(process_idx);
- if (g_config_params.is_primary && g_config_params.process_idx != 0 ||
- !g_config_params.is_primary && g_config_params.process_idx == 0) {
+ if ((g_config_params.is_primary && g_config_params.process_idx != 0) ||
+ (!g_config_params.is_primary && g_config_params.process_idx == 0)) {
return -EINVAL;
}
}
--
2.33.0

446
0234-fix-bond_ports-parse-error.patch Normal file
View File

@ -0,0 +1,446 @@
From 2188bdbdfbe6ebe2bc091c87bfd9932747a7e9a4 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Fri, 7 Apr 2023 14:28:53 +0800
Subject: [PATCH] fix bond_ports parse error fix socket_mem parse error when
the value exceeds 65536 exit if create_rxtx_pktmbuf failed build.sh build
failed return 1 clean code
---
build/build.sh | 8 +++
src/common/gazelle_opt.h | 2 -
src/common/gazelle_parse_config.c | 17 +++---
src/lstack/api/lstack_wrap.c | 8 +--
src/lstack/core/lstack_cfg.c | 3 +-
src/lstack/core/lstack_init.c | 3 +-
src/lstack/core/lstack_lwip.c | 6 +--
src/lstack/core/lstack_protocol_stack.c | 20 ++++---
src/lstack/netif/lstack_ethdev.c | 4 +-
src/ltran/ltran_dfx.c | 14 ++---
src/ltran/ltran_param.c | 69 +++++++++++++------------
11 files changed, 86 insertions(+), 68 deletions(-)
diff --git a/build/build.sh b/build/build.sh
index ab25d88..4464f8c 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -14,6 +14,10 @@ cd $CURRENT_PATH
make -C ../src/lstack clean
make -C ../src/lstack
+if [ $? -ne 0 ]; then
+ echo "build lstack failed"
+ exit 1
+fi
cd ../src/ltran
rm -f CMakeCache.txt
@@ -21,5 +25,9 @@ rm -f ltran gazellectl
rm -rf CMakeFiles
cmake .
make
+if [ $? -ne 0 ]; then
+ echo "build ltran failed"
+ exit 1
+fi
cd -
diff --git a/src/common/gazelle_opt.h b/src/common/gazelle_opt.h
index 4420ba4..fe0483b 100644
--- a/src/common/gazelle_opt.h
+++ b/src/common/gazelle_opt.h
@@ -88,8 +88,6 @@
#define GAZELLE_PRIMARY_START_PATH "/var/run/gazelle/gazelle_primary"
#define GAZELLE_FILE_PERMISSION 0700
-#define GAZELLE_MAX_PORTS_VALUE (UINT16_MAX - 1)
-
#define SEND_TIME_WAIT_NS 20000
#define SECOND_NSECOND 1000000000
diff --git a/src/common/gazelle_parse_config.c b/src/common/gazelle_parse_config.c
index a2bdde1..ce6a3f8 100644
--- a/src/common/gazelle_parse_config.c
+++ b/src/common/gazelle_parse_config.c
@@ -55,7 +55,12 @@ int32_t separate_str_to_array(char *args, uint32_t *array, int32_t array_size, i
return -1;
}
errno = 0;
- idx = strtol(args, &end, 10); /* 10: decimal */
+ /* prefix 0x,0X indicate hexdecimal */
+ if (strncmp(args, "0x", 2) == 0 || strncmp(args, "0X", 2) == 0) {
+ idx = strtol(args, &end, 16); /* 16: hexdecimal */
+ } else {
+ idx = strtol(args, &end, 10); /* 10: decimal */
+ }
if (errno || end == NULL) {
return -1;
}
@@ -107,18 +112,18 @@ int32_t check_and_set_run_dir(void)
int32_t filename_check(const char* args)
{
if (args == NULL) {
- return 1;
+ return 1;
}
if (strlen(args) <= 0 || strlen(args) > GAZELLE_SOCK_FILENAME_MAXLEN - 1) {
- COMMON_ERR("socket_filename_check: invalid unix sock name %s, filename exceeds the limit %d.\n", args, GAZELLE_SOCK_FILENAME_MAXLEN);
- return 1;
+ COMMON_ERR("socket_filename_check: invalid unix sock name %s, filename exceeds the limit %d.\n", args, GAZELLE_SOCK_FILENAME_MAXLEN);
+ return 1;
}
char* sensitive_chars = strpbrk(args, "|;&$><`\\!\n");
if (sensitive_chars != NULL) {
- COMMON_ERR("socket_filename_check: invalid unix sock name %s, filename contains sensitive characters.\n", args);
- return 1;
+ COMMON_ERR("socket_filename_check: invalid unix sock name %s, filename contains sensitive characters.\n", args);
+ return 1;
}
return 0;
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index 90b2252..1b12822 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -205,7 +205,7 @@ static int get_addr(struct sockaddr_in *sin, char *interface)
}
posix_api->close_fn(sockfd);
- memcpy(sin, &ifr.ifr_addr, sizeof(struct sockaddr_in));
+ memcpy_s(sin, sizeof(struct sockaddr_in), &ifr.ifr_addr, sizeof(struct sockaddr_in));
return 0;
}
@@ -250,8 +250,8 @@ bool is_dst_ip_localhost(const struct sockaddr *addr)
++p;
int n = strcspn(p, ": \t");
- char interface[20] = {0};
- strncpy(interface, p, n);
+ char interface[20] = {0}; /* 20: nic name len */
+ strncpy_s(interface, sizeof(interface), p, n);
memset_s(sin, sizeof(struct sockaddr_in), 0, sizeof(struct sockaddr_in));
int ret = get_addr(sin, interface);
@@ -289,7 +289,7 @@ static int32_t do_connect(int32_t s, const struct sockaddr *name, socklen_t name
int32_t ret = 0;
char listen_ring_name[RING_NAME_LEN];
int remote_port = htons(((struct sockaddr_in *)name)->sin_port);
- snprintf_s(listen_ring_name, sizeof(listen_ring_name), sizeof(listen_ring_name) - 1, "listen_rx_ring_%u", remote_port);
+ snprintf_s(listen_ring_name, sizeof(listen_ring_name), sizeof(listen_ring_name) - 1, "listen_rx_ring_%d", remote_port);
if (is_dst_ip_localhost(name) && rte_ring_lookup(listen_ring_name) == NULL) {
ret = posix_api->connect_fn(s, name, namelen);
SET_CONN_TYPE_HOST(sock->conn);
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index 394cb13..cdb0200 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -492,7 +492,8 @@ static int32_t gazelle_parse_socket_mem(const char *arg, struct secondary_attach
return -1;
}
- int32_t count = separate_str_to_array(socket_mem, sec_attach_arg->socket_per_size, GAZELLE_MAX_NUMA_NODES, GAZELLE_MAX_PORTS_VALUE);
+ int32_t count = separate_str_to_array(socket_mem, sec_attach_arg->socket_per_size,
+ GAZELLE_MAX_NUMA_NODES, INT32_MAX);
if (count < 0) {
return -1;
diff --git a/src/lstack/core/lstack_init.c b/src/lstack/core/lstack_init.c
index 76dd384..f17e4d2 100644
--- a/src/lstack/core/lstack_init.c
+++ b/src/lstack/core/lstack_init.c
@@ -240,7 +240,8 @@ static void gazelle_signal_init(void)
lstack_signal_init();
}
-static void set_kni_ip_mac() {
+static void set_kni_ip_mac()
+{
struct cfg_params *cfg = get_global_cfg_params();
int32_t fd = posix_api->socket_fn(AF_INET, SOCK_DGRAM, IPPROTO_IP);
diff --git a/src/lstack/core/lstack_lwip.c b/src/lstack/core/lstack_lwip.c
index ebdb469..0535428 100644
--- a/src/lstack/core/lstack_lwip.c
+++ b/src/lstack/core/lstack_lwip.c
@@ -1392,7 +1392,7 @@ err_t netif_loop_output(struct netif *netif, struct pbuf *p)
return ERR_MEM;
}
head->ol_flags = p->ol_flags;
- memcpy(head->payload, p->payload, p->len);
+ memcpy_s(head->payload, head->len, p->payload, p->len);
if ((flags & TCP_SYN) && !(flags & TCP_ACK)) {
/* SYN packet, send to listen_ring */
@@ -1461,7 +1461,7 @@ err_t find_same_node_memzone(struct tcp_pcb *pcb, struct lwip_sock *nsock)
err_t same_node_memzone_create(const struct rte_memzone **zone, int size, int port, char *name, char *rx)
{
char mem_name[RING_NAME_LEN] = {0};
- snprintf_s(mem_name, sizeof(mem_name), sizeof(mem_name) - 1, "%s_%s_%u", name, rx, port);
+ snprintf_s(mem_name, sizeof(mem_name), sizeof(mem_name) - 1, "%s_%s_%d", name, rx, port);
*zone = rte_memzone_reserve_aligned(mem_name, size, rte_socket_id(), 0, RTE_CACHE_LINE_SIZE);
if (*zone == NULL) {
@@ -1484,7 +1484,7 @@ err_t same_node_ring_create(struct rte_ring **ring, int size, int port, char *na
flags = RING_F_SP_ENQ | RING_F_SC_DEQ;
}
- snprintf_s(ring_name, sizeof(ring_name), sizeof(ring_name) - 1, "%s_%s_ring_%u", name, rx, port);
+ snprintf_s(ring_name, sizeof(ring_name), sizeof(ring_name) - 1, "%s_%s_ring_%d", name, rx, port);
*ring = rte_ring_create(ring_name, size, rte_socket_id(), flags);
if (*ring == NULL) {
LSTACK_LOG(ERR, LSTACK, "cannot create rte_ring %s, errno is %d\n", ring_name, rte_errno);
diff --git a/src/lstack/core/lstack_protocol_stack.c b/src/lstack/core/lstack_protocol_stack.c
index 061582f..7b1b994 100644
--- a/src/lstack/core/lstack_protocol_stack.c
+++ b/src/lstack/core/lstack_protocol_stack.c
@@ -81,7 +81,8 @@ struct protocol_stack_group *get_protocol_stack_group(void)
return &g_stack_group;
}
-int get_min_conn_stack(struct protocol_stack_group *stack_group){
+int get_min_conn_stack(struct protocol_stack_group *stack_group)
+{
int min_conn_stk_idx = 0;
int min_conn_num = GAZELLE_MAX_CLIENTS;
for (int i = 0; i < stack_group->stack_num; i++) {
@@ -91,7 +92,7 @@ int get_min_conn_stack(struct protocol_stack_group *stack_group){
min_conn_stk_idx = i;
min_conn_num = stack->conn_num;
}
- }else {
+ } else {
if (stack->conn_num < min_conn_num) {
min_conn_stk_idx = i;
min_conn_num = stack->conn_num;
@@ -100,7 +101,6 @@ int get_min_conn_stack(struct protocol_stack_group *stack_group){
}
return min_conn_stk_idx;
-
}
struct protocol_stack *get_protocol_stack(void)
@@ -230,14 +230,14 @@ static int32_t create_thread(void *arg, char *thread_name, stack_thread_func fun
return -1;
}
- if (get_global_cfg_params()->seperate_send_recv){
+ if (get_global_cfg_params()->seperate_send_recv) {
ret = sprintf_s(name, sizeof(name), "%s", thread_name);
if (ret < 0) {
LSTACK_LOG(ERR, LSTACK, "set name failed\n");
return -1;
}
- }else {
+ } else {
ret = sprintf_s(name, sizeof(name), "%s%02hu", thread_name, t_params->queue_id);
if (ret < 0) {
LSTACK_LOG(ERR, LSTACK, "set name failed\n");
@@ -500,7 +500,8 @@ static void* gazelle_stack_thread(void *arg)
return NULL;
}
-static void libnet_listen_thread(void *arg){
+static void libnet_listen_thread(void *arg)
+{
struct cfg_params * cfg_param = get_global_cfg_params();
recv_pkts_from_other_process(cfg_param->process_idx, arg);
}
@@ -561,6 +562,9 @@ int32_t init_protocol_stack(void)
for (uint16_t idx = 0; idx < get_global_cfg_params()->tot_queue_num; idx++) {
struct rte_mempool* rxtx_mbuf = create_pktmbuf_mempool("rxtx_mbuf",
get_global_cfg_params()->mbuf_count_per_conn * get_global_cfg_params()->tcp_conn_count / stack_group->stack_num, RXTX_CACHE_SZ, idx);
+ if (rxtx_mbuf == NULL) {
+ return -1;
+ }
get_protocol_stack_group()->total_rxtx_pktmbuf_pool[idx] = rxtx_mbuf;
}
}
@@ -572,13 +576,13 @@ int32_t init_protocol_stack(void)
if (ret < 0) {
return -1;
}
- }else {
+ } else {
ret = sprintf_s(name, sizeof(name), "%s_%d_%d", LSTACK_SEND_THREAD_NAME, process_index, i/2);
if (ret < 0) {
return -1;
}
}
- }else {
+ } else {
ret = sprintf_s(name, sizeof(name), "%s", LSTACK_THREAD_NAME);
if (ret < 0) {
return -1;
diff --git a/src/lstack/netif/lstack_ethdev.c b/src/lstack/netif/lstack_ethdev.c
index 4103f22..0a91f79 100644
--- a/src/lstack/netif/lstack_ethdev.c
+++ b/src/lstack/netif/lstack_ethdev.c
@@ -323,7 +323,7 @@ void config_flow_director(uint16_t queue_id, uint32_t src_ip, uint32_t dst_ip, u
uint16_t port_id = get_port_id();
char rule_key[RULE_KEY_LEN] = {0};
- sprintf(rule_key,"%u_%u_%u",src_ip,src_port,dst_port);
+ sprintf_s(rule_key, sizeof(rule_key), "%u_%u_%u", src_ip, src_port, dst_port);
struct flow_rule *fl_exist = find_rule(rule_key);
if(fl_exist != NULL){
return;
@@ -347,7 +347,7 @@ void delete_flow_director(uint32_t dst_ip, uint16_t src_port, uint16_t dst_port)
{
uint16_t port_id = get_port_id();
char rule_key[RULE_KEY_LEN] = {0};
- sprintf(rule_key,"%u_%u_%u",dst_ip,dst_port,src_port);
+ sprintf_s(rule_key, RULE_KEY_LEN, "%u_%u_%u",dst_ip, dst_port, src_port);
struct flow_rule *fl = find_rule(rule_key);
if(fl != NULL){
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 761bbb7..3513125 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -209,17 +209,17 @@ static int32_t dfx_connect_ltran(bool use_ltran, bool probe)
}
ret = strncpy_s(addr.sun_path, sizeof(addr.sun_path), GAZELLE_RUN_DIR,
- strlen(GAZELLE_RUN_DIR) + 1);
+ strlen(GAZELLE_RUN_DIR) + 1);
if (ret != EOK) {
- printf("%s:%d strncpy_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ printf("%s:%d strncpy_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
}
if (g_unix_prefix) {
- ret = strncat_s(addr.sun_path, sizeof(addr.sun_path), g_unix_prefix,
- strlen(g_unix_prefix) + 1);
- if (ret != EOK) {
- printf("%s:%d strncat_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
- }
+ ret = strncat_s(addr.sun_path, sizeof(addr.sun_path), g_unix_prefix,
+ strlen(g_unix_prefix) + 1);
+ if (ret != EOK) {
+ printf("%s:%d strncat_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ }
}
addr.sun_family = AF_UNIX;
diff --git a/src/ltran/ltran_param.c b/src/ltran/ltran_param.c
index 7cf3423..1eb4f48 100644
--- a/src/ltran/ltran_param.c
+++ b/src/ltran/ltran_param.c
@@ -339,7 +339,8 @@ static int32_t parse_bond_ports(const config_t *config, const char *key, struct
return GAZELLE_ERR;
}
- ltran_config->bond.port_num = separate_str_to_array(port_str, ltran_config->bond.portmask, GAZELLE_MAX_BOND_NUM, GAZELLE_MAX_PORTS_VALUE);
+ ltran_config->bond.port_num = separate_str_to_array(port_str, ltran_config->bond.portmask,
+ GAZELLE_MAX_BOND_NUM, UINT16_MAX);
if (ltran_config->bond.port_num > GAZELLE_MAX_BOND_NUM) {
free(port_str);
@@ -547,67 +548,67 @@ static int32_t parse_unix_prefix(const config_t *config, const char *key, struct
int32_t ret = 0;
ret = memset_s(ltran_config->unix_socket_filename, sizeof(ltran_config->unix_socket_filename),
- 0, sizeof(ltran_config->unix_socket_filename));
+ 0, sizeof(ltran_config->unix_socket_filename));
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
ret = memset_s(ltran_config->dfx_socket_filename, sizeof(ltran_config->dfx_socket_filename),
- 0, sizeof(ltran_config->dfx_socket_filename));
+ 0, sizeof(ltran_config->dfx_socket_filename));
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
ret = strncpy_s(ltran_config->unix_socket_filename, sizeof(ltran_config->unix_socket_filename),
- GAZELLE_RUN_DIR, strlen(GAZELLE_RUN_DIR) + 1);
+ GAZELLE_RUN_DIR, strlen(GAZELLE_RUN_DIR) + 1);
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
ret = strncpy_s(ltran_config->dfx_socket_filename, sizeof(ltran_config->dfx_socket_filename),
- GAZELLE_RUN_DIR, strlen(GAZELLE_RUN_DIR) + 1);
+ GAZELLE_RUN_DIR, strlen(GAZELLE_RUN_DIR) + 1);
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
ret = config_lookup_string(config, key, &prefix);
if (ret) {
if (filename_check(prefix)) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
- }
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
+ }
- ret = strncat_s(ltran_config->unix_socket_filename, sizeof(ltran_config->unix_socket_filename),
- prefix, strlen(prefix) + 1);
- if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
- }
+ ret = strncat_s(ltran_config->unix_socket_filename, sizeof(ltran_config->unix_socket_filename),
+ prefix, strlen(prefix) + 1);
+ if (ret != EOK) {
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
+ }
- ret = strncat_s(ltran_config->dfx_socket_filename, sizeof(ltran_config->dfx_socket_filename),
- prefix, strlen(prefix) + 1);
- if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
- }
+ ret = strncat_s(ltran_config->dfx_socket_filename, sizeof(ltran_config->dfx_socket_filename),
+ prefix, strlen(prefix) + 1);
+ if (ret != EOK) {
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
+ }
}
ret = strncat_s(ltran_config->unix_socket_filename, sizeof(ltran_config->unix_socket_filename),
- GAZELLE_REG_SOCK_FILENAME, strlen(GAZELLE_REG_SOCK_FILENAME) + 1);
+ GAZELLE_REG_SOCK_FILENAME, strlen(GAZELLE_REG_SOCK_FILENAME) + 1);
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
ret = strncat_s(ltran_config->dfx_socket_filename, sizeof(ltran_config->dfx_socket_filename),
- GAZELLE_DFX_SOCK_FILENAME, strlen(GAZELLE_DFX_SOCK_FILENAME) + 1);
+ GAZELLE_DFX_SOCK_FILENAME, strlen(GAZELLE_DFX_SOCK_FILENAME) + 1);
if (ret != EOK) {
- gazelle_set_errno(GAZELLE_EINETATON);
- return GAZELLE_ERR;
+ gazelle_set_errno(GAZELLE_EINETATON);
+ return GAZELLE_ERR;
}
return GAZELLE_OK;
--
2.33.0

60
0235-dfx-set-g_unix_fd-to-1-after-abnormal-close-fd-to-av.patch Normal file
View File

@ -0,0 +1,60 @@
From 1cdbc7c47200b9ffc1911656567b48f53f4107b8 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Wed, 26 Apr 2023 19:34:58 +0800
Subject: [PATCH] dfx: set g_unix_fd to -1 after abnormal close fd to avoid
double close
---
src/ltran/ltran_dfx.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 3513125..4baca26 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -289,6 +289,7 @@ static int32_t dfx_stat_read_from_ltran(char *buf, uint32_t len, enum GAZELLE_ST
dfx = find_dfx_node(mode);
if (dfx == NULL) {
close(fd);
+ g_unix_fd = -1;
return GAZELLE_ERR;
}
@@ -297,6 +298,7 @@ static int32_t dfx_stat_read_from_ltran(char *buf, uint32_t len, enum GAZELLE_ST
if (ret == -1) {
printf("read stat response msg failed ret=%d\n", ret);
close(fd);
+ g_unix_fd = -1;
return GAZELLE_ERR;
}
}
@@ -1368,16 +1370,16 @@ int32_t main(int32_t argc, char *argv[])
int unix_arg = 0;
for (int32_t i = 1; i < argc; i++) {
- if (unix_arg == 0) {
- if (!strcmp(argv[i], "-u")) {
- unix_arg++;
- }
- } else if (unix_arg == 1) {
- g_unix_prefix = argv[i];
- unix_arg++;
- } else {
- argv[i - unix_arg] = argv[i];
- }
+ if (unix_arg == 0) {
+ if (!strcmp(argv[i], "-u")) {
+ unix_arg++;
+ }
+ } else if (unix_arg == 1) {
+ g_unix_prefix = argv[i];
+ unix_arg++;
+ } else {
+ argv[i - unix_arg] = argv[i];
+ }
}
argv[argc - unix_arg] = argv[argc];
--
2.33.0

63
0236-dfx-security-function-failed-return-error-directly.patch Normal file
View File

@ -0,0 +1,63 @@
From b3b492c64bab47d4bb898422fb9a57a2536e0d61 Mon Sep 17 00:00:00 2001
From: jiangheng12 <jiangheng14@huawei.com>
Date: Wed, 26 Apr 2023 20:06:42 +0800
Subject: [PATCH] dfx: security function failed, return error directly
---
src/ltran/ltran_dfx.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 4baca26..944675e 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -206,12 +206,14 @@ static int32_t dfx_connect_ltran(bool use_ltran, bool probe)
ret = memset_s(&addr, sizeof(addr), 0, sizeof(struct sockaddr_un));
if (ret != EOK) {
printf("%s:%d memset_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ goto END;
}
ret = strncpy_s(addr.sun_path, sizeof(addr.sun_path), GAZELLE_RUN_DIR,
strlen(GAZELLE_RUN_DIR) + 1);
if (ret != EOK) {
printf("%s:%d strncpy_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ goto END;
}
if (g_unix_prefix) {
@@ -219,6 +221,7 @@ static int32_t dfx_connect_ltran(bool use_ltran, bool probe)
strlen(g_unix_prefix) + 1);
if (ret != EOK) {
printf("%s:%d strncat_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ goto END;
}
}
@@ -234,6 +237,7 @@ static int32_t dfx_connect_ltran(bool use_ltran, bool probe)
strlen(GAZELLE_REG_SOCK_FILENAME) + 1);
if (ret != EOK) {
printf("%s:%d strncat_s fail ret=%d\n", __FUNCTION__, __LINE__, ret);
+ goto END;
}
}
@@ -243,11 +247,13 @@ static int32_t dfx_connect_ltran(bool use_ltran, bool probe)
printf("connect ltran failed. errno: %d ret=%d\n", errno, ret);
printf("You may need to use the -u parameter to specify the UNIX_PREFIX that matches the configuration.\n");
}
- close(fd);
- return GAZELLE_ERR;
+ goto END;
}
return fd;
+END:
+ close(fd);
+ return GAZELLE_ERR;
}
static int32_t dfx_stat_conn_to_ltran(struct gazelle_stat_msg_request *req_msg)
--
2.33.0

277
0237-add-bond4-suport.patch Normal file
View File

@ -0,0 +1,277 @@
From 97e31b514dde519ac5b83a3b7519c98d9805d746 Mon Sep 17 00:00:00 2001
From: compile_success <980965867@qq.com>
Date: Fri, 5 May 2023 11:18:59 +0000
Subject: [PATCH] add bond4 suport
---
src/lstack/Makefile | 3 +-
src/lstack/core/lstack_cfg.c | 55 +++++++++++++++++++
src/lstack/core/lstack_dpdk.c | 90 +++++++++++++++++++++++++++++---
src/lstack/include/lstack_cfg.h | 3 ++
src/lstack/include/lstack_dpdk.h | 2 +-
5 files changed, 143 insertions(+), 10 deletions(-)
diff --git a/src/lstack/Makefile b/src/lstack/Makefile
index 9fb1f4c..ab039ec 100644
--- a/src/lstack/Makefile
+++ b/src/lstack/Makefile
@@ -85,7 +85,8 @@ LIBRTE_LIB = $(LIB_PATH)/librte_bus_pci.so \
$(LIB_PATH)/librte_pcapng.so \
$(LIB_PATH)/librte_security.so \
$(LIB_PATH)/librte_cryptodev.so \
- $(LIB_PATH)/librte_net_pcap.so
+ $(LIB_PATH)/librte_net_pcap.so \
+ $(LIB_PATH)/librte_net_bond.so
DEP_LIBS = $(LWIP_LIB) $(LIBRTE_LIB)
diff --git a/src/lstack/core/lstack_cfg.c b/src/lstack/core/lstack_cfg.c
index cdb0200..c4919d3 100644
--- a/src/lstack/core/lstack_cfg.c
+++ b/src/lstack/core/lstack_cfg.c
@@ -69,6 +69,8 @@ static int32_t parse_process_numa(void);
static int32_t parse_process_index(void);
static int32_t parse_seperate_sendrecv_args(void);
static int32_t parse_tuple_filter(void);
+static int32_t parse_use_bond4(void);
+static int32_t parse_bond4_slave_mac(void);
#define PARSE_ARG(_arg, _arg_string, _default_val, _min_val, _max_val, _ret) \
do { \
@@ -121,6 +123,8 @@ static struct config_vector_t g_config_tbl[] = {
{ "process_numa", parse_process_numa },
{ "process_idx", parse_process_index },
{ "tuple_filter", parse_tuple_filter },
+ { "use_bond4", parse_use_bond4 },
+ { "bond4_slave_mac", parse_bond4_slave_mac },
{ NULL, NULL }
};
@@ -1052,3 +1056,54 @@ static int parse_tuple_filter(void)
return 0;
}
+
+static int32_t parse_use_bond4(void)
+{
+ int32_t ret;
+ PARSE_ARG(g_config_params.use_bond4, "use_bond4", 0, 0, 1, ret);
+ return ret;
+}
+
+static int32_t parse_bond4_slave_mac(void)
+{
+ if (g_config_params.use_bond4 == 0) {
+ return 0;
+ }
+
+ int32_t ret;
+ const char *slave_mac1 = NULL;
+ const char *slave_mac2 = NULL;
+ const config_setting_t *devs = NULL;
+
+ devs = config_lookup(&g_config, "slave_mac1");
+ if (devs == NULL) {
+ return -EINVAL;
+ }
+ slave_mac1 = config_setting_get_string(devs);
+ if (slave_mac1 == NULL) {
+ return 0;
+ }
+
+ devs = config_lookup(&g_config, "slave_mac2");
+ if (devs == NULL) {
+ return -EINVAL;
+ }
+ slave_mac2 = config_setting_get_string(devs);
+ if (slave_mac2 == NULL) {
+ return 0;
+ }
+
+ /* add dev */
+ ret = str_to_eth_addr(slave_mac1, g_config_params.bond4_slave1_mac_addr);
+ if (ret != 0) {
+ LSTACK_PRE_LOG(LSTACK_ERR, "cfg: invalid device name %s ret=%d.\n", slave_mac1, ret);
+ return ret;
+ }
+
+ ret = str_to_eth_addr(slave_mac2, g_config_params.bond4_slave2_mac_addr);
+ if (ret != 0) {
+ LSTACK_PRE_LOG(LSTACK_ERR, "cfg: invalid device name %s ret=%d.\n", slave_mac2, ret);
+ }
+ return ret;
+}
+
diff --git a/src/lstack/core/lstack_dpdk.c b/src/lstack/core/lstack_dpdk.c
index e386dfc..297dd7b 100644
--- a/src/lstack/core/lstack_dpdk.c
+++ b/src/lstack/core/lstack_dpdk.c
@@ -35,6 +35,9 @@
#include <lwip/pbuf.h>
#include <lwip/reg_sock.h>
#include <lwip/priv/tcp_priv.h>
+#include <rte_eth_bond_8023ad.h>
+#include <rte_eth_bond.h>
+#include <rte_ethdev.h>
#include "lstack_log.h"
#include "dpdk_common.h"
@@ -427,9 +430,10 @@ static void rss_setup(const int port_id, const uint16_t nb_queues)
free(reta_conf);
}
-int32_t dpdk_ethdev_init(void)
+int32_t dpdk_ethdev_init(int port_id, bool bond_port)
{
uint16_t nb_queues = get_global_cfg_params()->num_cpu;
+ int32_t use_bond4 = get_global_cfg_params()->use_bond4;
if (get_global_cfg_params()->seperate_send_recv) {
nb_queues = get_global_cfg_params()->num_cpu * 2;
}
@@ -440,10 +444,13 @@ int32_t dpdk_ethdev_init(void)
struct protocol_stack_group *stack_group = get_protocol_stack_group();
- int32_t port_id = ethdev_port_id(get_global_cfg_params()->mac_addr);
- if (port_id < 0) {
- return port_id;
+ if (!use_bond4) {
+ port_id = ethdev_port_id(get_global_cfg_params()->mac_addr);
+ if (port_id < 0) {
+ return port_id;
+ }
}
+
get_global_cfg_params()->port_id = port_id;
struct rte_eth_dev_info dev_info;
@@ -459,10 +466,38 @@ int32_t dpdk_ethdev_init(void)
return -EINVAL;
}
+ if (bond_port) {
+ int slave_num = 2;
+ int32_t slave_port_id[2];
+ slave_port_id[0] = ethdev_port_id(get_global_cfg_params()->bond4_slave1_mac_addr);
+ slave_port_id[1] = ethdev_port_id(get_global_cfg_params()->bond4_slave2_mac_addr);
+
+ for (int i = 0; i < slave_num; i++) {
+ ret = dpdk_ethdev_init(slave_port_id[i], 0);
+ if (ret != 0) {
+ LSTACK_LOG(ERR, LSTACK, "dpdk_ethdev_init failed\n");
+ return -1;
+ }
+ ret = rte_eth_promiscuous_enable(slave_port_id[i]);
+ rte_eth_allmulticast_enable(slave_port_id[i]);
+ ret = rte_eth_bond_slave_add(port_id, slave_port_id[i]);
+ ret = rte_eth_dev_start(slave_port_id[i]);
+ }
+ }
+
struct eth_params *eth_params = alloc_eth_params(port_id, nb_queues);
if (eth_params == NULL) {
return -ENOMEM;
}
+
+ if (bond_port) {
+ struct rte_eth_dev_info slave_dev_info;
+ int slave_id = rte_eth_bond_primary_get(port_id);
+ rte_eth_dev_info_get(slave_id, &slave_dev_info);
+ dev_info.rx_offload_capa = slave_dev_info.rx_offload_capa;
+ dev_info.tx_offload_capa = slave_dev_info.tx_offload_capa;
+ }
+
eth_params_checksum(&eth_params->conf, &dev_info);
int32_t rss_enable = 0;
if (!get_global_cfg_params()->tuple_filter) {
@@ -556,6 +591,10 @@ int32_t dpdk_ethdev_start(void)
}
}
+ if (get_global_cfg_params()->use_bond4) {
+ return 0;
+ }
+
ret = rte_eth_dev_start(stack_group->eth_params->port_id);
if (ret < 0) {
LSTACK_LOG(ERR, LSTACK, "cannot start ethdev: %d\n", (-ret));
@@ -603,10 +642,45 @@ int32_t init_dpdk_ethdev(void)
{
int32_t ret;
- ret = dpdk_ethdev_init();
- if (ret != 0) {
- LSTACK_LOG(ERR, LSTACK, "dpdk_ethdev_init failed\n");
- return -1;
+ if (get_global_cfg_params()->use_bond4) {
+ int bond_port_id = rte_eth_bond_create("net_bonding0", 4, (uint8_t)rte_socket_id());
+ if (bond_port_id < 0) {
+ LSTACK_LOG(ERR, LSTACK, "get bond port id failed ret=%d\n", bond_port_id);
+ return bond_port_id;
+ }
+
+ ret = dpdk_ethdev_init(bond_port_id, 1);
+ ret = rte_eth_bond_xmit_policy_set(bond_port_id, BALANCE_XMIT_POLICY_LAYER34);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ret = rte_eth_bond_8023ad_dedicated_queues_enable(bond_port_id);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ret = rte_eth_promiscuous_enable(bond_port_id);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ret = rte_eth_allmulticast_enable(bond_port_id);
+ if (ret < 0) {
+ return -1;
+ }
+
+ ret = rte_eth_dev_start(bond_port_id);
+ /* 20: sleep for lacp ,this is a temp plan, it will be changed in future */
+ int wait_lacp = 20;
+ sleep(wait_lacp);
+
+ } else {
+ ret = dpdk_ethdev_init(0, 0);
+ if (ret != 0) {
+ LSTACK_LOG(ERR, LSTACK, "dpdk_ethdev_init failed\n");
+ return -1;
+ }
}
if (get_global_cfg_params()->kni_switch && get_global_cfg_params()->is_primary) {
diff --git a/src/lstack/include/lstack_cfg.h b/src/lstack/include/lstack_cfg.h
index a4170ca..4d0f611 100644
--- a/src/lstack/include/lstack_cfg.h
+++ b/src/lstack/include/lstack_cfg.h
@@ -103,6 +103,9 @@ struct cfg_params {
uint16_t send_ring_size;
bool expand_send_ring;
bool tuple_filter;
+ bool use_bond4;
+ uint8_t bond4_slave1_mac_addr[ETHER_ADDR_LEN];
+ uint8_t bond4_slave2_mac_addr[ETHER_ADDR_LEN];
};
struct cfg_params *get_global_cfg_params(void);
diff --git a/src/lstack/include/lstack_dpdk.h b/src/lstack/include/lstack_dpdk.h
index a896903..1047c44 100644
--- a/src/lstack/include/lstack_dpdk.h
+++ b/src/lstack/include/lstack_dpdk.h
@@ -46,7 +46,7 @@ int32_t pktmbuf_pool_init(struct protocol_stack *stack, uint16_t stack_num);
struct rte_ring *create_ring(const char *name, uint32_t count, uint32_t flags, int32_t queue_id);
int32_t create_shared_ring(struct protocol_stack *stack);
void lstack_log_level_init(void);
-int dpdk_ethdev_init(void);
+int dpdk_ethdev_init(int port_id, bool bond_port);
int dpdk_ethdev_start(void);
void dpdk_skip_nic_init(void);
int32_t dpdk_init_lstack_kni(void);
--
2.33.0

2187
0238-clean-code.patch Normal file
View File

File diff suppressed because it is too large Load Diff

518
0239-add-udp-multicast-support-in-gazelle.patch Normal file
View File

@ -0,0 +1,518 @@
From 2c82e9a9f745f7a959014f788059ac79181b9440 Mon Sep 17 00:00:00 2001
From: kircher <majun65@huawei.com>
Date: Sat, 13 May 2023 14:32:02 +0800
Subject: [PATCH] add udp multicast support in gazelle
---
src/lstack/api/lstack_wrap.c | 75 ++++++++++++++++++++++---
src/lstack/core/lstack_lwip.c | 94 ++++++++++++++++++++++++--------
src/lstack/include/lstack_lwip.h | 9 ++-
src/lstack/lstack.Makefile | 4 +-
src/lstack/netif/lstack_ethdev.c | 6 +-
src/ltran/ltran_stat.c | 8 ++-
6 files changed, 159 insertions(+), 37 deletions(-)
diff --git a/src/lstack/api/lstack_wrap.c b/src/lstack/api/lstack_wrap.c
index 98632c0..505e33d 100644
--- a/src/lstack/api/lstack_wrap.c
+++ b/src/lstack/api/lstack_wrap.c
@@ -81,14 +81,21 @@ static inline enum KERNEL_LWIP_PATH select_path(int fd, struct lwip_sock **socke
return PATH_LWIP;
}
- struct tcp_pcb *pcb = sock->conn->pcb.tcp;
- /* after lwip connect, call send immediately, pcb->state is SYN_SENT, need return PATH_LWIP */
- /* pcb->state default value is CLOSED when call socket, need return PATH_UNKNOW */
- if (pcb != NULL && pcb->state <= ESTABLISHED && pcb->state >= LISTEN) {
+ if (NETCONN_IS_UDP(sock)) {
if (socket) {
*socket = sock;
}
return PATH_LWIP;
+ } else {
+ struct tcp_pcb *pcb = sock->conn->pcb.tcp;
+ /* after lwip connect, call send immediately, pcb->state is SYN_SENT, need return PATH_LWIP */
+ /* pcb->state default value is CLOSED when call socket, need return PATH_UNKNOW */
+ if (pcb != NULL && pcb->state <= ESTABLISHED && pcb->state >= LISTEN) {
+ if (socket) {
+ *socket = sock;
+ }
+ return PATH_LWIP;
+ }
}
return PATH_UNKNOW;
@@ -396,7 +403,7 @@ static inline int32_t do_setsockopt(int32_t s, int32_t level, int32_t optname, c
static inline int32_t do_socket(int32_t domain, int32_t type, int32_t protocol)
{
if ((domain != AF_INET && domain != AF_UNSPEC)
- || posix_api->ues_posix || ((type & SOCK_TYPE_MASK) & ~SOCK_STREAM)) {
+ || posix_api->ues_posix) {
return posix_api->socket_fn(domain, type, protocol);
}
@@ -415,7 +422,7 @@ static inline ssize_t do_recv(int32_t sockfd, void *buf, size_t len, int32_t fla
struct lwip_sock *sock = NULL;
if (select_path(sockfd, &sock) == PATH_LWIP) {
- return read_stack_data(sockfd, buf, len, flags);
+ return read_stack_data(sockfd, buf, len, flags, NULL, NULL);
}
return posix_api->recv_fn(sockfd, buf, len, flags);
@@ -433,7 +440,7 @@ static inline ssize_t do_read(int32_t s, void *mem, size_t len)
struct lwip_sock *sock = NULL;
if (select_path(s, &sock) == PATH_LWIP) {
- return read_stack_data(s, mem, len, 0);
+ return read_stack_data(s, mem, len, 0, NULL, NULL);
}
return posix_api->read_fn(s, mem, len);
}
@@ -469,7 +476,7 @@ static inline ssize_t do_send(int32_t sockfd, const void *buf, size_t len, int32
return posix_api->send_fn(sockfd, buf, len, flags);
}
- return gazelle_send(sockfd, buf, len, flags);
+ return gazelle_send(sockfd, buf, len, flags, NULL, 0);
}
static inline ssize_t do_write(int32_t s, const void *mem, size_t size)
@@ -479,7 +486,7 @@ static inline ssize_t do_write(int32_t s, const void *mem, size_t size)
return posix_api->write_fn(s, mem, size);
}
- return gazelle_send(s, mem, size, 0);
+ return gazelle_send(s, mem, size, 0, NULL, 0);
}
static inline ssize_t do_writev(int32_t s, const struct iovec *iov, int iovcnt)
@@ -529,6 +536,36 @@ static inline ssize_t do_sendmsg(int32_t s, const struct msghdr *message, int32_
return posix_api->send_msg(s, message, flags);
}
+static inline ssize_t do_recvfrom(int32_t sockfd, void *buf, size_t len, int32_t flags,
+ struct sockaddr *addr, socklen_t *addrlen)
+{
+ if (buf == NULL) {
+ GAZELLE_RETURN(EINVAL);
+ }
+
+ if (len == 0) {
+ return 0;
+ }
+
+ struct lwip_sock *sock = NULL;
+ if (select_path(sockfd, &sock) == PATH_LWIP) {
+ return read_stack_data(sockfd, buf, len, flags, addr, addrlen);
+ }
+
+ return posix_api->recv_from(sockfd, buf, len, flags, addr, addrlen);
+}
+
+static inline ssize_t do_sendto(int32_t sockfd, const void *buf, size_t len, int32_t flags,
+ const struct sockaddr *addr, socklen_t addrlen)
+{
+ struct lwip_sock *sock = NULL;
+ if (select_path(sockfd, &sock) != PATH_LWIP) {
+ return posix_api->send_to(sockfd, buf, len, flags, addr, addrlen);
+ }
+
+ return gazelle_send(sockfd, buf, len, flags, addr, addrlen);
+}
+
static inline int32_t do_close(int32_t s)
{
struct lwip_sock *sock = NULL;
@@ -716,6 +753,16 @@ ssize_t sendmsg(int32_t s, const struct msghdr *message, int32_t flags)
{
return do_sendmsg(s, message, flags);
}
+ssize_t recvfrom(int32_t sockfd, void *buf, size_t len, int32_t flags,
+ struct sockaddr *addr, socklen_t *addrlen)
+{
+ return do_recvfrom(sockfd, buf, len, flags, addr, addrlen);
+}
+ssize_t sendto(int32_t sockfd, const void *buf, size_t len, int32_t flags,
+ const struct sockaddr *addr, socklen_t addrlen)
+{
+ return do_sendto(sockfd, buf, len, flags, addr, addrlen);
+}
int32_t close(int32_t s)
{
return do_close(s);
@@ -835,6 +882,16 @@ ssize_t __wrap_sendmsg(int32_t s, const struct msghdr *message, int32_t flags)
{
return do_sendmsg(s, message, flags);
}
+ssize_t __wrap_recvfrom(int32_t sockfd, void *buf, size_t len, int32_t flags,
+ struct sockaddr *addr, socklen_t *addrlen)
+{
+ return do_recvfrom(sockfd, buf, len, flags, addr, addrlen);
+}
+ssize_t __wrap_sendto(int32_t sockfd, const void *buf, size_t len, int32_t flags,
+ const struct sockaddr *addr, socklen_t addrlen)
+{
+ return do_sendto(sockfd, buf, len, flags, addr, addrlen);
+}
int32_t __wrap_close(int32_t s)
{
return do_close(s);
diff --git a/src/lstack/core/lstack_lwip.c b/src/lstack/core/lstack_lwip.c
index b6c5813..12c2aa6 100644
--- a/src/lstack/core/lstack_lwip.c
+++ b/src/lstack/core/lstack_lwip.c
@@ -14,11 +14,13 @@
#include <stdatomic.h>
#include <lwip/sockets.h>
#include <lwip/tcp.h>
+#include <lwip/udp.h>
#include <lwipsock.h>
#include <arch/sys_arch.h>
#include <lwip/pbuf.h>
#include <lwip/priv/tcp_priv.h>
#include <lwip/posix_api.h>
+#include <lwip/api.h>
#include <lwip/tcp.h>
#include <securec.h>
#include <rte_errno.h>
@@ -121,6 +123,8 @@ static struct pbuf *init_mbuf_to_pbuf(struct rte_mbuf *mbuf, pbuf_layer layer, u
pbuf->allow_in = 1;
pbuf->head = 0;
pbuf->last = pbuf;
+ pbuf->addr.addr = 0;
+ pbuf->port = 0;
pthread_spin_init(&pbuf->pbuf_lock, PTHREAD_PROCESS_SHARED);
}
@@ -449,7 +453,8 @@ static inline ssize_t app_direct_attach(struct protocol_stack *stack, struct pbu
return send_len;
}
-static inline ssize_t app_buff_write(struct lwip_sock *sock, void *buf, size_t len, uint32_t write_num)
+static inline ssize_t app_buff_write(struct lwip_sock *sock, void *buf, size_t len, uint32_t write_num,
+ const struct sockaddr *addr, socklen_t addrlen)
{
struct pbuf *pbufs[SOCK_SEND_RING_SIZE_MAX];
@@ -457,6 +462,14 @@ static inline ssize_t app_buff_write(struct lwip_sock *sock, void *buf, size_t l
ssize_t send_len = do_app_write(pbufs, buf, len, write_num);
+ if (addr) {
+ struct sockaddr_in *saddr = (struct sockaddr_in *)addr;
+ for (int i = 0; i < write_num; i++) {
+ pbufs[i]->addr.addr = saddr->sin_addr.s_addr;
+ pbufs[i]->port = lwip_ntohs((saddr)->sin_port);
+ }
+ }
+
gazelle_ring_read_over(sock->send_ring);
sock->remain_len = MBUF_MAX_DATA_LEN - pbufs[write_num - 1]->len;
@@ -536,7 +549,8 @@ int sem_timedwait_nsecs(sem_t *sem)
return sem_timedwait(sem, &ts);
}
-ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len)
+ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len,
+ const struct sockaddr *addr, socklen_t addrlen)
{
if (sock->errevent > 0) {
GAZELLE_RETURN(ENOTCONN);
@@ -581,6 +595,11 @@ ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len)
if (wakeup) {
wakeup->stat.app_write_cnt += write_num;
}
+ if (addr) {
+ struct sockaddr_in *saddr = (struct sockaddr_in *)addr;
+ last_pbuf->addr.addr = saddr->sin_addr.s_addr;
+ last_pbuf->port = lwip_ntohs((saddr)->sin_port);
+ }
} else {
(void)rpc_call_replenish(stack, sock);
if (wakeup) {
@@ -594,14 +613,14 @@ ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len)
/* send_ring have idle */
if (get_global_cfg_params()->expand_send_ring) {
send_len += (write_num <= write_avail) ?
- app_buff_write(sock, (char *)buf + send_len, len - send_len, write_num) :
+ app_buff_write(sock, (char *)buf + send_len, len - send_len, write_num, addr, addrlen) :
app_direct_write(stack, sock, (char *)buf + send_len, len - send_len, write_num);
} else {
if (write_num > write_avail) {
write_num = write_avail;
len = write_num * MBUF_MAX_DATA_LEN;
}
- send_len += app_buff_write(sock, (char *)buf + send_len, len - send_len, write_num);
+ send_len += app_buff_write(sock, (char *)buf + send_len, len - send_len, write_num, addr, addrlen);
}
if (wakeup) {
@@ -641,10 +660,15 @@ void rpc_replenish(struct rpc_msg *msg)
msg->result = replenish_send_ring(stack, sock);
}
-static inline bool do_lwip_send(struct protocol_stack *stack, int32_t fd, struct lwip_sock *sock, int32_t flags)
+static inline bool do_lwip_send(struct protocol_stack *stack, int32_t fd, struct lwip_sock *sock,
+ size_t len, int32_t flags)
{
/* send all send_ring, so len set lwip send max. */
- (void)lwip_send(fd, sock, UINT16_MAX, flags);
+ if (NETCONN_IS_UDP(sock)) {
+ (void)lwip_send(fd, sock, len, flags);
+ } else {
+ (void)lwip_send(fd, sock, UINT16_MAX, flags);
+ }
return replenish_send_ring(stack, sock);
}
@@ -652,6 +676,7 @@ static inline bool do_lwip_send(struct protocol_stack *stack, int32_t fd, struct
void stack_send(struct rpc_msg *msg)
{
int32_t fd = msg->args[MSG_ARG_0].i;
+ size_t len = msg->args[MSG_ARG_1].size;
struct protocol_stack *stack = (struct protocol_stack *)msg->args[MSG_ARG_3].p;
bool replenish_again;
@@ -663,7 +688,7 @@ void stack_send(struct rpc_msg *msg)
return;
}
- replenish_again = do_lwip_send(stack, sock->conn->socket, sock, 0);
+ replenish_again = do_lwip_send(stack, sock->conn->socket, sock, len, 0);
__sync_fetch_and_sub(&sock->call_num, 1);
if (!NETCONN_IS_DATAOUT(sock) && !replenish_again) {
rpc_msg_free(msg);
@@ -712,11 +737,21 @@ ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags)
uint32_t data_count = rte_ring_count(sock->conn->recvmbox->ring);
uint32_t read_num = LWIP_MIN(free_count, data_count);
struct pbuf *pbufs[SOCK_RECV_RING_SIZE];
+ struct netbuf *netbufs[SOCK_RECV_RING_SIZE];
uint32_t read_count = 0;
ssize_t recv_len = 0;
for (uint32_t i = 0; i < read_num; i++) {
- err_t err = netconn_recv_tcp_pbuf_flags(sock->conn, &pbufs[i], apiflags);
+
+ err_t err = ERR_OK;
+ if (NETCONN_IS_UDP(sock)) {
+ err = netconn_recv_udp_raw_netbuf_flags(sock->conn, &netbufs[i], apiflags);
+ pbufs[i] = netbufs[i]->p;
+ pbufs[i]->addr = netbufs[i]->addr;
+ pbufs[i]->port = netbufs[i]->port;
+ } else {
+ err = netconn_recv_tcp_pbuf_flags(sock->conn, &pbufs[i], apiflags);
+ }
if (err != ERR_OK) {
if (recv_len > 0) {
/* already received data, return that (this trusts in getting the same error from
@@ -735,10 +770,19 @@ ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, u8_t apiflags)
}
uint32_t enqueue_num = gazelle_ring_sp_enqueue(sock->recv_ring, (void **)pbufs, read_count);
+ if (NETCONN_IS_UDP(sock)) {
+ for (uint32_t i = 0; i < read_count; i++) {
+ memp_free(MEMP_NETBUF, netbufs[i]);
+ }
+ }
for (uint32_t i = enqueue_num; i < read_count; i++) {
- /* update receive window */
- tcp_recved(sock->conn->pcb.tcp, pbufs[i]->tot_len);
- pbuf_free(pbufs[i]);
+ if (NETCONN_IS_UDP(sock)) {
+ netbuf_delete(netbufs[i]);
+ } else {
+ /* update receive window */
+ tcp_recved(sock->conn->pcb.tcp, pbufs[i]->tot_len);
+ pbuf_free(pbufs[i]);
+ }
sock->stack->stats.read_lwip_drop++;
}
@@ -786,7 +830,8 @@ ssize_t recvmsg_from_stack(int32_t s, struct msghdr *message, int32_t flags)
continue;
}
- ssize_t recvd_local = read_stack_data(s, message->msg_iov[i].iov_base, message->msg_iov[i].iov_len, flags);
+ ssize_t recvd_local = read_stack_data(s, message->msg_iov[i].iov_base, message->msg_iov[i].iov_len,
+ flags, NULL, NULL);
if (recvd_local > 0) {
buflen += recvd_local;
}
@@ -915,7 +960,8 @@ static inline void thread_bind_stack(struct lwip_sock *sock)
}
}
-ssize_t gazelle_send(int32_t fd, const void *buf, size_t len, int32_t flags)
+ssize_t gazelle_send(int32_t fd, const void *buf, size_t len, int32_t flags,
+ const struct sockaddr *addr, socklen_t addrlen)
{
if (buf == NULL) {
GAZELLE_RETURN(EINVAL);
@@ -932,7 +978,7 @@ ssize_t gazelle_send(int32_t fd, const void *buf, size_t len, int32_t flags)
if (sock->same_node_tx_ring != NULL) {
return gazelle_same_node_ring_send(sock, buf, len, flags);
}
- ssize_t send = write_stack_data(sock, buf, len);
+ ssize_t send = write_stack_data(sock, buf, len, addr, addrlen);
if (send <= 0) {
return send;
}
@@ -956,7 +1002,7 @@ ssize_t sendmsg_to_stack(struct lwip_sock *sock, int32_t s, const struct msghdr
continue;
}
- ret = write_stack_data(sock, message->msg_iov[i].iov_base, message->msg_iov[i].iov_len);
+ ret = write_stack_data(sock, message->msg_iov[i].iov_base, message->msg_iov[i].iov_len, NULL, 0);
if (ret <= 0) {
buflen = (buflen == 0) ? ret : buflen;
break;
@@ -995,7 +1041,7 @@ static struct pbuf *pbuf_free_partial(struct pbuf *pbuf, uint16_t free_len)
return pbuf;
}
-ssize_t read_stack_data(int32_t fd, void *buf, size_t len, int32_t flags)
+ssize_t read_stack_data(int32_t fd, void *buf, size_t len, int32_t flags, struct sockaddr *addr, socklen_t *addrlen)
{
size_t recv_left = len;
struct pbuf *pbuf = NULL;
@@ -1052,6 +1098,10 @@ ssize_t read_stack_data(int32_t fd, void *buf, size_t len, int32_t flags)
del_data_in_event(sock);
}
+ if (addr && addrlen) {
+ lwip_sock_make_addr(sock->conn, &(pbuf->addr), pbuf->port, addr, addrlen);
+ }
+
if (recvd == 0) {
if (sock->wakeup) {
sock->wakeup->stat.read_null++;
@@ -1107,7 +1157,12 @@ void read_recv_list(struct protocol_stack *stack, uint32_t max_num)
continue;
}
- ssize_t len = lwip_recv(sock->conn->socket, NULL, 0, 0);
+ ssize_t len = 0;
+ if (NETCONN_IS_UDP(sock)) {
+ len = lwip_recv(sock->conn->socket, NULL, SSIZE_MAX, 0);
+ } else {
+ len = lwip_recv(sock->conn->socket, NULL, 0, 0);
+ }
if (len == 0) {
sock->errevent = 1;
add_sock_event(sock, EPOLLERR);
@@ -1190,11 +1245,6 @@ static inline void clone_lwip_socket_opt(struct lwip_sock *dst_sock, struct lwip
int32_t gazelle_socket(int domain, int type, int protocol)
{
- if (((type & SOCK_TYPE_MASK) & ~SOCK_STREAM) != 0) {
- LSTACK_LOG(ERR, LSTACK, "sock type error:%d, only support SOCK_STREAM \n", type);
- return -1;
- }
-
int32_t fd = lwip_socket(AF_INET, type, 0);
if (fd < 0) {
return fd;
diff --git a/src/lstack/include/lstack_lwip.h b/src/lstack/include/lstack_lwip.h
index 0b29e71..223ff93 100644
--- a/src/lstack/include/lstack_lwip.h
+++ b/src/lstack/include/lstack_lwip.h
@@ -17,6 +17,7 @@
#define NETCONN_IS_DATAIN(sock) ((gazelle_ring_readable_count((sock)->recv_ring) || (sock)->recv_lastdata) || (sock->same_node_rx_ring != NULL && same_node_ring_count(sock)))
#define NETCONN_IS_DATAOUT(sock) (gazelle_ring_readover_count((sock)->send_ring) || (sock)->send_lastdata || (sock)->send_pre_del)
#define NETCONN_IS_OUTIDLE(sock) gazelle_ring_readable_count((sock)->send_ring)
+#define NETCONN_IS_UDP(sock) (NETCONNTYPE_GROUP(netconn_type((sock)->conn)) == NETCONN_UDP)
struct lwip_sock;
struct rte_mempool;
@@ -29,8 +30,9 @@ int32_t gazelle_socket(int domain, int type, int protocol);
void gazelle_clean_sock(int32_t fd);
struct pbuf *write_lwip_data(struct lwip_sock *sock, uint16_t remain_size, uint8_t *apiflags);
void write_lwip_over(struct lwip_sock *sock);
-ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len);
-ssize_t read_stack_data(int32_t fd, void *buf, size_t len, int32_t flags);
+ssize_t write_stack_data(struct lwip_sock *sock, const void *buf, size_t len,
+ const struct sockaddr *addr, socklen_t addrlen);
+ssize_t read_stack_data(int32_t fd, void *buf, size_t len, int32_t flags, struct sockaddr *addr, socklen_t *addrlen);
ssize_t read_lwip_data(struct lwip_sock *sock, int32_t flags, uint8_t apiflags);
void read_recv_list(struct protocol_stack *stack, uint32_t max_num);
void read_same_node_recv_list(struct protocol_stack *stack);
@@ -45,7 +47,8 @@ int32_t gazelle_alloc_pktmbuf(struct rte_mempool *pool, struct rte_mbuf **mbufs,
void gazelle_free_pbuf(struct pbuf *pbuf);
ssize_t sendmsg_to_stack(struct lwip_sock *sock, int32_t s, const struct msghdr *message, int32_t flags);
ssize_t recvmsg_from_stack(int32_t s, struct msghdr *message, int32_t flags);
-ssize_t gazelle_send(int32_t fd, const void *buf, size_t len, int32_t flags);
+ssize_t gazelle_send(int32_t fd, const void *buf, size_t len, int32_t flags,
+ const struct sockaddr *addr, socklen_t addrlen);
void rpc_replenish(struct rpc_msg *msg);
void stack_mempool_size(struct rpc_msg *msg);
diff --git a/src/lstack/lstack.Makefile b/src/lstack/lstack.Makefile
index 7da439d..768c5ba 100644
--- a/src/lstack/lstack.Makefile
+++ b/src/lstack/lstack.Makefile
@@ -45,7 +45,9 @@ WRAP_API := epoll_ctl \
readv \
writev \
poll \
- ppoll
+ ppoll \
+ sendto \
+ recvfrom
WRAP_LDFLAGS = $(patsubst %, $(WRAP_PREFIX)%, $(WRAP_API))
diff --git a/src/lstack/netif/lstack_ethdev.c b/src/lstack/netif/lstack_ethdev.c
index 2bae2f1..e4e7ebd 100644
--- a/src/lstack/netif/lstack_ethdev.c
+++ b/src/lstack/netif/lstack_ethdev.c
@@ -842,6 +842,10 @@ static err_t eth_dev_output(struct netif *netif, struct pbuf *pbuf)
}
}
+ if (first_pbuf->l4_len == 8) {
+ mbuf->data_off += 12;
+ }
+
if (likely(first_mbuf->pkt_len > MBUF_MAX_LEN)) {
mbuf->ol_flags |= RTE_MBUF_F_TX_TCP_SEG;
mbuf->tso_segsz = MBUF_MAX_DATA_LEN;
@@ -873,7 +877,7 @@ static err_t eth_dev_init(struct netif *netif)
netif->name[0] = 'e';
netif->name[1] = 't';
- netif->flags |= NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;
+ netif->flags |= NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_IGMP;
netif->mtu = FRAME_MTU;
netif->output = etharp_output;
netif->linkoutput = eth_dev_output;
diff --git a/src/ltran/ltran_stat.c b/src/ltran/ltran_stat.c
index 50f65e3..c17a5c1 100644
--- a/src/ltran/ltran_stat.c
+++ b/src/ltran/ltran_stat.c
@@ -16,7 +16,6 @@
#include <stdio.h>
#include <arpa/inet.h>
#include <rte_ring.h>
-#include <netinet/in.h>
#include "ltran_tcp_sock.h"
#include "ltran_tcp_conn.h"
@@ -30,6 +29,13 @@
#include "dpdk_common.h"
#include "ltran_forward.h"
+/* undefine lwip_ntohs in lwip/def.h */
+#ifdef ntohs
+#undef ntohs
+#endif
+#include <netinet/in.h>
+
+
static uint64_t g_start_time_stamp = 0;
static int32_t g_start_latency = GAZELLE_OFF;
volatile int32_t g_ltran_stop_flag = GAZELLE_FALSE;
--
2.33.0

26
gazelle.spec
View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.1
Release: 56
Release: 57
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -243,6 +243,17 @@ Patch9225: 0225-add-socket-check-before-write-it.patch
Patch9226: 0226-update-lstack.Makefile.patch
Patch9227: 0227-fix-config-flow-rule-race.patch
Patch9228: 0228-fix-build-err-with-dpdk-21.11.patch
Patch9229: 0229-fix-gazellectl-x-error-when-multiplt-user-nic-config.patch
Patch9230: 0230-fix-client-connect-number-unbalance-on-lstack.patch
Patch9231: 0231-kni-down-not-stop-nic.patch
Patch9232: 0232-fix-rpc-msg-alloc-failed.patch
Patch9233: 0233-add-parentheses-to-fix-build-error.patch
Patch9234: 0234-fix-bond_ports-parse-error.patch
Patch9235: 0235-dfx-set-g_unix_fd-to-1-after-abnormal-close-fd-to-av.patch
Patch9236: 0236-dfx-security-function-failed-return-error-directly.patch
Patch9237: 0237-add-bond4-suport.patch
Patch9238: 0238-clean-code.patch
Patch9239: 0239-add-udp-multicast-support-in-gazelle.patch
%description
%{name} is a high performance user-mode stack.
@ -283,6 +294,19 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Tue May 16 2023 kircher <majun65@huawei.com> - 1.0.1-57
- add udp multicast support in gazelle
- clean code
- add bond4 suport
- dfx: security function failed, return error directly
- dfx: set g_unix_fd to -1 after abnormal close fd to avoid double close
- fix bond_ports parse error fix socket_mem parse error when the value exceeds 65536 exit if create_rxtx_pktmbuf failed build.sh build failed return 1 clean code
- add parentheses to fix build error
- fix rpc msg alloc failed fix process_numa args error coredump fix sock->conn not free when fd is kernel mode
- kni down not stop nic
- fix client connect number unbalance on lstack
- fix gazellectl -x error when multiplt user nic config
* Sat May 13 2023 jiangheng12 <jiangheng14@huawei.com> - 1.0.1-56
- fix build err with dpdk-21.11
- fix config flow rule race