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 4976de80e764dc808bcccc7836568f64d224707f)
This commit is contained in:
kircher 2023-05-16 19:59:02 +08:00 committed by openeuler-sync-bot
parent d055a00b0c
commit 6134dce27f
6 changed files with 3118 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0241-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
0242-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
0243-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 d475961..a79b963 100644
--- a/src/lstack/Makefile
+++ b/src/lstack/Makefile
@@ -83,7 +83,8 @@ LIBRTE_LIB = $(DPDK_LIB_PATH)/librte_pci.so \
$(DPDK_LIB_PATH)/librte_net.so \
$(DPDK_LIB_PATH)/librte_ethdev.so \
$(DPDK_LIB_PATH)/librte_pdump.so \
- $(DPDK_LIB_PATH)/librte_pmd_pcap.so
+ $(DPDK_LIB_PATH)/librte_pmd_pcap.so \
+ $(DPDK_LIB_PATH)/librte_pmd_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
0244-clean-code.patch Normal file
View File

File diff suppressed because it is too large Load Diff

518
0245-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 ed89054..c748b37 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;
@@ -535,7 +548,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);
@@ -580,6 +594,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) {
@@ -593,14 +612,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) {
@@ -640,10 +659,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);
}
@@ -651,6 +675,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;
@@ -662,7 +687,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);
@@ -711,11 +736,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
@@ -734,10 +769,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++;
}
@@ -785,7 +829,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;
}
@@ -914,7 +959,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);
@@ -931,7 +977,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;
}
@@ -955,7 +1001,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;
@@ -994,7 +1040,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;
@@ -1051,6 +1097,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++;
@@ -1106,7 +1156,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);
@@ -1189,11 +1244,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 7514e58..ebe7450 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 |= PKT_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

14
gazelle.spec
View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.1
Release: 62
Release: 63
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -255,6 +255,11 @@ Patch9237: 0237-fix-rpc-msg-alloc-failed.patch
Patch9238: 0238-add-parentheses-to-fix-build-error.patch
Patch9239: 0239-add-udp-protocol-support-in-example.patch
Patch9240: 0240-fix-bond_ports-parse-error.patch
Patch9241: 0241-dfx-set-g_unix_fd-to-1-after-abnormal-close-fd-to-av.patch
Patch9242: 0242-dfx-security-function-failed-return-error-directly.patch
Patch9243: 0243-add-bond4-suport.patch
Patch9244: 0244-clean-code.patch
Patch9245: 0245-add-udp-multicast-support-in-gazelle.patch
%description
%{name} is a high performance user-mode stack.
@ -295,6 +300,13 @@ 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-63
- 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
* Mon Apr 10 2023 jiangheng12 <jiangheng14@huawei.com> - 1.0.1-62
- 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 udp protocol support in example