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

Improve cpu { coremask-% } configure option

Browse Source 
Accept any sized hexadecimal bitmask specification to
support platforms with hundreds of cores.

Change-Id: Ib881db0cf60f78bdeffa13acfc2fc7fe7e128cc4
Signed-off-by: Yi He <yi.he@arm.com>
This commit is contained in:
Yi He
2018-07-17 14:18:41 +08:00
committed by Damjan Marion
parent cc4a5e8089
commit e4a9eb7873
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vlib/threads.c
View File

@ -1267,7 +1267,6 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
uword *p;
vlib_thread_main_t *tm = &vlib_thread_main;
u8 *name;
u64 coremask;
uword *bitmap;
u32 count;
@ -1296,25 +1295,10 @@ cpu_config (vlib_main_t * vm, unformat_input_t * input)
;
else if (unformat (input, "skip-cores %u", &tm->skip_cores))
;
else if (unformat (input, "coremask-%s %llx", &name, &coremask))
{
p = hash_get_mem (tm->thread_registrations_by_name, name);
if (p == 0)
return clib_error_return (0, "no such thread type '%s'", name);
tr = (vlib_thread_registration_t *) p[0];
if (tr->use_pthreads)
return clib_error_return (0,
"coremask cannot be set for '%s' threads",
name);
tr->coremask = clib_bitmap_set_multiple
(tr->coremask, 0, coremask, BITS (coremask));
tr->count = clib_bitmap_count_set_bits (tr->coremask);
}
else if (unformat (input, "corelist-%s %U", &name, unformat_bitmap_list,
&bitmap))
else if (unformat (input, "coremask-%s %U", &name,
unformat_bitmap_mask, &bitmap) ||
unformat (input, "corelist-%s %U", &name,
unformat_bitmap_list, &bitmap))
{
p = hash_get_mem (tm->thread_registrations_by_name, name);
if (p == 0)

36
src/vppinfra/bitmap.h
View File

@ -735,6 +735,42 @@ clib_bitmap_next_clear (uword * ai, uword i)
return i;
}
/** unformat an any sized hexadecimal bitmask into a bitmap
uword * bitmap;
rv = unformat ("%U", unformat_bitmap_mask, &bitmap);
Standard unformat_function_t arguments
@param input - pointer an unformat_input_t
@param va - varargs list comprising a single uword **
@returns 1 on success, 0 on failure
*/
static inline uword
unformat_bitmap_mask (unformat_input_t * input, va_list * va)
{
u8 *v = 0; /* hexadecimal vector */
uword **bitmap_return = va_arg (*va, uword **);
uword *bitmap = 0;
if (unformat (input, "%U", unformat_hex_string, &v))
{
int i, s = vec_len (v) - 1; /* 's' for significance or shift */
/* v[0] holds the most significant byte */
for (i = 0; s >= 0; i++, s--)
bitmap = clib_bitmap_set_multiple (bitmap,
s * BITS (v[i]), v[i],
BITS (v[i]));
vec_free (v);
*bitmap_return = bitmap;
return 1;
}
return 0;
}
/** unformat a list of bit ranges into a bitmap (eg "0-3,5-7,11" )
uword * bitmap;