gfwleak/tango-tsg-service-chaining-engine
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: Add min_timeout_ms on marsio_poll_wait(); Add thread local rx_buffs on marsio_recv_burst()

Browse Source
This commit is contained in:
luwenpeng
2023-10-16 17:04:21 +08:00
parent 8f11f8381d
commit a49805a019
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/sce.conf
View File

@@ -45,6 +45,7 @@ max_chaining_size=32
# bypass_traffic:3 bypass decrypted traffic # bypass_traffic:3 bypass decrypted traffic
bypass_traffic=0 bypass_traffic=0
rx_burst_max=128 rx_burst_max=128
min_timeout_ms=900
app_symbol=sce app_symbol=sce
dev_endpoint=eth_sf_endpoint dev_endpoint=eth_sf_endpoint
dev_nf_interface=eth_nf_interface dev_nf_interface=eth_nf_interface

19
platform/src/packet_io.cpp
View File

@@ -28,6 +28,7 @@ struct config
{ {
int bypass_traffic; int bypass_traffic;
int rx_burst_max; int rx_burst_max;
int min_timeout_ms;
char app_symbol[256]; char app_symbol[256];
char dev_endpoint[256]; char dev_endpoint[256];
char dev_nf_interface[256]; char dev_nf_interface[256];
@@ -1137,6 +1138,7 @@ static int packet_io_config(const char *profile, struct config *config)
// bypass_traffic:3 bypass decrypted traffic // bypass_traffic:3 bypass decrypted traffic
MESA_load_profile_int_def(profile, "PACKET_IO", "bypass_traffic", (int *)&(config->bypass_traffic), 0); MESA_load_profile_int_def(profile, "PACKET_IO", "bypass_traffic", (int *)&(config->bypass_traffic), 0);
MESA_load_profile_int_def(profile, "PACKET_IO", "rx_burst_max", (int *)&(config->rx_burst_max), 1); MESA_load_profile_int_def(profile, "PACKET_IO", "rx_burst_max", (int *)&(config->rx_burst_max), 1);
MESA_load_profile_int_def(profile, "PACKET_IO", "min_timeout_ms", (int *)&(config->min_timeout_ms), 900);
MESA_load_profile_string_nodef(profile, "PACKET_IO", "app_symbol", config->app_symbol, sizeof(config->app_symbol)); MESA_load_profile_string_nodef(profile, "PACKET_IO", "app_symbol", config->app_symbol, sizeof(config->app_symbol));
MESA_load_profile_string_nodef(profile, "PACKET_IO", "dev_endpoint", config->dev_endpoint, sizeof(config->dev_endpoint)); MESA_load_profile_string_nodef(profile, "PACKET_IO", "dev_endpoint", config->dev_endpoint, sizeof(config->dev_endpoint));
MESA_load_profile_string_nodef(profile, "PACKET_IO", "dev_nf_interface", config->dev_nf_interface, sizeof(config->dev_nf_interface)); MESA_load_profile_string_nodef(profile, "PACKET_IO", "dev_nf_interface", config->dev_nf_interface, sizeof(config->dev_nf_interface));
@@ -1170,6 +1172,7 @@ static int packet_io_config(const char *profile, struct config *config)
LOG_DEBUG("%s: PACKET_IO->bypass_traffic : %d", LOG_TAG_PKTIO, config->bypass_traffic); LOG_DEBUG("%s: PACKET_IO->bypass_traffic : %d", LOG_TAG_PKTIO, config->bypass_traffic);
LOG_DEBUG("%s: PACKET_IO->rx_burst_max : %d", LOG_TAG_PKTIO, config->rx_burst_max); LOG_DEBUG("%s: PACKET_IO->rx_burst_max : %d", LOG_TAG_PKTIO, config->rx_burst_max);
LOG_DEBUG("%s: PACKET_IO->min_timeout_ms : %d", LOG_TAG_PKTIO, config->min_timeout_ms);
LOG_DEBUG("%s: PACKET_IO->app_symbol : %s", LOG_TAG_PKTIO, config->app_symbol); LOG_DEBUG("%s: PACKET_IO->app_symbol : %s", LOG_TAG_PKTIO, config->app_symbol);
LOG_DEBUG("%s: PACKET_IO->dev_endpoint : %s", LOG_TAG_PKTIO, config->dev_endpoint); LOG_DEBUG("%s: PACKET_IO->dev_endpoint : %s", LOG_TAG_PKTIO, config->dev_endpoint);
LOG_DEBUG("%s: PACKET_IO->dev_nf_interface : %s", LOG_TAG_PKTIO, config->dev_nf_interface); LOG_DEBUG("%s: PACKET_IO->dev_nf_interface : %s", LOG_TAG_PKTIO, config->dev_nf_interface);
@@ -1314,11 +1317,19 @@ int packet_io_thread_init(struct packet_io *handle, struct thread_ctx *thread_ct
void packet_io_thread_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms) void packet_io_thread_wait(struct packet_io *handle, struct thread_ctx *thread_ctx, int timeout_ms)
{ {
struct mr_vdev *vdevs[] = { static __thread struct mr_vdev *vdevs[] = {
handle->dev_nf_interface.mr_dev, handle->dev_nf_interface.mr_dev,
handle->dev_endpoint.mr_dev}; handle->dev_endpoint.mr_dev};
marsio_poll_wait(handle->instance, vdevs, 2, thread_ctx->thread_index, timeout_ms); int min_timeout_ms = MIN(handle->config.min_timeout_ms, timeout_ms);
if (min_timeout_ms > 0)
{
marsio_poll_wait(handle->instance, vdevs, 2, thread_ctx->thread_index, min_timeout_ms);
}
else
{
return;
}
} }
int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx) int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thread_ctx)
@@ -1326,7 +1337,7 @@ int packet_io_thread_polling_nf(struct packet_io *handle, struct thread_ctx *thr
struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics; struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics;
int thread_index = thread_ctx->thread_index; int thread_index = thread_ctx->thread_index;
marsio_buff_t *rx_buffs[RX_BURST_MAX]; static __thread marsio_buff_t *rx_buffs[RX_BURST_MAX];
int nr_recv = marsio_recv_burst(handle->dev_nf_interface.mr_dev, thread_index, rx_buffs, handle->config.rx_burst_max); int nr_recv = marsio_recv_burst(handle->dev_nf_interface.mr_dev, thread_index, rx_buffs, handle->config.rx_burst_max);
if (nr_recv <= 0) if (nr_recv <= 0)
{ {
@@ -1389,7 +1400,7 @@ int packet_io_thread_polling_endpoint(struct packet_io *handle, struct thread_ct
struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics; struct thread_metrics *thread_metrics = &thread_ctx->thread_metrics;
int thread_index = thread_ctx->thread_index; int thread_index = thread_ctx->thread_index;
marsio_buff_t *rx_buffs[RX_BURST_MAX]; static __thread marsio_buff_t *rx_buffs[RX_BURST_MAX];
int nr_recv = marsio_recv_burst(handle->dev_endpoint.mr_dev, thread_index, rx_buffs, handle->config.rx_burst_max); int nr_recv = marsio_recv_burst(handle->dev_endpoint.mr_dev, thread_index, rx_buffs, handle->config.rx_burst_max);
if (nr_recv <= 0) if (nr_recv <= 0)
{ {