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

vcl: support for uword segments

Browse Source 
Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Ibfe203fda5a0c88b26eb50bee8a430dd2cfb7dca
This commit is contained in:
Florin Coras
2020-03-27 18:41:54 +00:00
committed by Florin Coras
parent ffdc72da4f
commit d18528f5e2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/svm/fifo_segment.c
View File

@ -312,7 +312,7 @@ fs_chunk_size_is_valid (fifo_segment_header_t * fsh, u32 size)
* with a smaller FIFO.
*/
return size >= FIFO_SEGMENT_MIN_FIFO_SIZE
&& size <= (1 << fsh->max_log2_chunk_size);
&& size <= (1ULL << fsh->max_log2_chunk_size);
}
static svm_fifo_t *

18
src/vcl/vcl_cfg.c
View File

@ -323,37 +323,37 @@ vppcom_cfg_read_file (char *conf_fname)
vl_set_memory_gid (gid);
VCFG_DBG (0, "VCL<%d>: configured gid %d", getpid (), gid);
}
else if (unformat (line_input, "segment-baseva 0x%x",
else if (unformat (line_input, "segment-baseva 0x%lx",
&vcl_cfg->segment_baseva))
{
VCFG_DBG (0, "VCL<%d>: configured segment_baseva 0x%lx",
getpid (), (unsigned long) vcl_cfg->segment_baseva);
}
else if (unformat (line_input, "segment-size 0x%x",
else if (unformat (line_input, "segment-size 0x%lx",
&vcl_cfg->segment_size))
{
VCFG_DBG (0, "VCL<%d>: configured segment_size 0x%x (%d)",
VCFG_DBG (0, "VCL<%d>: configured segment_size 0x%lx (%lu)",
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
else if (unformat (line_input, "segment-size %u",
else if (unformat (line_input, "segment-size %lu",
&vcl_cfg->segment_size))
{
VCFG_DBG (0, "VCL<%d>: configured segment_size %u (0x%x)",
VCFG_DBG (0, "VCL<%d>: configured segment_size %lu (0x%lx)",
getpid (), vcl_cfg->segment_size,
vcl_cfg->segment_size);
}
else if (unformat (line_input, "add-segment-size 0x%x",
else if (unformat (line_input, "add-segment-size 0x%lx",
&vcl_cfg->add_segment_size))
{
VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%u)",
VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%lx (%lu)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}
else if (unformat (line_input, "add-segment-size %u",
else if (unformat (line_input, "add-segment-size %lu",
&vcl_cfg->add_segment_size))
{
VCFG_DBG (0, "VCL<%d>: configured add_segment_size %u (0x%x)",
VCFG_DBG (0, "VCL<%d>: configured add_segment_size %lu (0x%lx)",
getpid (), vcl_cfg->add_segment_size,
vcl_cfg->add_segment_size);
}

4
src/vcl/vcl_private.h
View File

@ -189,8 +189,8 @@ typedef struct vppcom_cfg_t_
u32 max_workers;
u32 vpp_api_q_length;
uword segment_baseva;
u32 segment_size;
u32 add_segment_size;
uword segment_size;
uword add_segment_size;
u32 preallocated_fifo_pairs;
u32 rx_fifo_size;
u32 tx_fifo_size;