d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

service: fix lcore stop

Browse Source 
lcore_states store the state of the lcore. Fixing the invalid
dereference of lcore_states with service number

Unit test case service_lcore_start_stop fails with the above fix.
Service core was stopped without stopping the service.

This commit fixes the test by adding negative and positive cases of
stopping the service lcore before and after stopping the service
respectively

Fixes: 21698354c8 ("service: introduce service cores concept")
Fixes: f038a81e1c ("service: add unit tests")

Signed-off-by: Guduri Prathyusha <gprathyusha@caviumnetworks.com>
Reviewed-by: Harry van Haaren <harry.van.haaren@intel.com>
This commit is contained in:
Guduri Prathyusha 2017-09-06 12:45:41 +05:30 committed by Thomas Monjalon
parent c4c6f68229
commit aee62e906f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_eal/common/rte_service.c
View File

@ -625,9 +625,9 @@ rte_service_lcore_stop(uint32_t lcore)
return -EALREADY;
uint32_t i;
uint64_t service_mask = lcore_states[lcore].service_mask;
for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) {
int32_t enabled =
lcore_states[i].service_mask & (UINT64_C(1) << i);
int32_t enabled = service_mask & (UINT64_C(1) << i);
int32_t service_running = rte_service_runstate_get(i);
int32_t only_core = rte_services[i].num_mapped_cores == 1;

4
test/test/test_service_cores.c
View File

@ -576,6 +576,10 @@ service_lcore_start_stop(void)
"Service core expected to poll service but it didn't");
/* core stop */
TEST_ASSERT_EQUAL(-EBUSY, rte_service_lcore_stop(slcore_id),
"Service core running a service should return -EBUSY");
TEST_ASSERT_EQUAL(0, rte_service_runstate_set(sid, 0),
"Stopping valid service failed");
TEST_ASSERT_EQUAL(-EINVAL, rte_service_lcore_stop(100000),
"Invalid Service core stop should return -EINVAL");
TEST_ASSERT_EQUAL(0, rte_service_lcore_stop(slcore_id),