ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: alloc exact number of bufs for multi-seg deqs

Browse Source 
Type: refactor

Signed-off-by: Simon Zhang <yuwei1.zhang@intel.com>
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I11cf806e22158e021a9a405eb4487a9ed6fdbccf
This commit is contained in:
Simon Zhang
2020-03-31 20:56:22 +08:00
committed by Florin Coras
parent a8c3b86ebe
commit ae16a98199
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vnet/session/session.h
View File

@ -52,6 +52,7 @@ typedef struct session_tx_context_
u16 deq_per_first_buf;
u16 deq_per_buf;
u16 n_segs_per_evt;
u16 n_bufs_needed;
u8 n_bufs_per_seg;
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
session_dgram_hdr_t hdr;

30
src/vnet/session/session_node.c
View File

@ -811,8 +811,25 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx,
n_bytes_per_buf = vlib_buffer_get_default_data_size (vm);
ASSERT (n_bytes_per_buf > TRANSPORT_MAX_HDRS_LEN);
n_bytes_per_seg = TRANSPORT_MAX_HDRS_LEN + ctx->sp.snd_mss;
ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf);
if (ctx->n_segs_per_evt > 1)
{
u32 n_bytes_last_seg, n_bufs_last_seg;
n_bytes_per_seg = TRANSPORT_MAX_HDRS_LEN + ctx->sp.snd_mss;
n_bytes_last_seg = TRANSPORT_MAX_HDRS_LEN + ctx->max_len_to_snd
- ((ctx->n_segs_per_evt - 1) * ctx->sp.snd_mss);
ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf);
n_bufs_last_seg = ceil ((f64) n_bytes_last_seg / n_bytes_per_buf);
ctx->n_bufs_needed = ((ctx->n_segs_per_evt - 1) * ctx->n_bufs_per_seg)
+ n_bufs_last_seg;
}
else
{
n_bytes_per_seg = TRANSPORT_MAX_HDRS_LEN + ctx->max_len_to_snd;
ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf);
ctx->n_bufs_needed = ctx->n_bufs_per_seg;
}
ctx->deq_per_buf = clib_min (ctx->sp.snd_mss, n_bytes_per_buf);
ctx->deq_per_first_buf = clib_min (ctx->sp.snd_mss,
n_bytes_per_buf -
@ -838,7 +855,7 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk,
session_evt_elt_t * elt,
int *n_tx_packets, u8 peek_data)
{
u32 n_trace, n_bufs_needed = 0, n_left, pbi, next_index, max_burst;
u32 n_trace, n_left, pbi, next_index, max_burst;
session_tx_context_t *ctx = &wrk->ctx;
session_main_t *smm = &session_main;
session_event_t *e = &elt->evt;
@ -929,11 +946,10 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk,
return SESSION_TX_NO_DATA;
}
n_bufs_needed = ctx->n_segs_per_evt * ctx->n_bufs_per_seg;
vec_validate_aligned (wrk->tx_buffers, n_bufs_needed - 1,
vec_validate_aligned (wrk->tx_buffers, ctx->n_bufs_needed - 1,
CLIB_CACHE_LINE_BYTES);
n_bufs = vlib_buffer_alloc (vm, wrk->tx_buffers, n_bufs_needed);
if (PREDICT_FALSE (n_bufs < n_bufs_needed))
n_bufs = vlib_buffer_alloc (vm, wrk->tx_buffers, ctx->n_bufs_needed);
if (PREDICT_FALSE (n_bufs < ctx->n_bufs_needed))
{
if (n_bufs)
vlib_buffer_free (vm, wrk->tx_buffers, n_bufs);