service: fix lcore role after delete
authorHarry van Haaren <harry.van.haaren@intel.com>
Tue, 9 Jan 2018 13:37:40 +0000 (13:37 +0000)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 11 Jan 2018 22:28:56 +0000 (23:28 +0100)
This patch fixes the reset of the service core,
that when rte_service_lcore_del() is called, the
lcore_role is restored to RTE.

This issue was reported as when running the unit tests, an
error was thrown that "failed to allocate lcore". Investigating
revealed that the state of the service-cores after del() was
not allowing a core to be re-used at a later point in time.

Fixes: 21698354c832 ("service: introduce service cores concept")
Cc: stable@dpdk.org
Reported-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
lib/librte_eal/common/rte_service.c

index c517658..1065392 100644 (file)
@@ -558,23 +558,6 @@ rte_service_map_lcore_get(uint32_t id, uint32_t lcore)
        return ret;
 }
 
-int32_t rte_service_lcore_reset_all(void)
-{
-       /* loop over cores, reset all to mask 0 */
-       uint32_t i;
-       for (i = 0; i < RTE_MAX_LCORE; i++) {
-               lcore_states[i].service_mask = 0;
-               lcore_states[i].is_service_core = 0;
-               lcore_states[i].runstate = RUNSTATE_STOPPED;
-       }
-       for (i = 0; i < RTE_SERVICE_NUM_MAX; i++)
-               rte_atomic32_set(&rte_services[i].num_mapped_cores, 0);
-
-       rte_smp_wmb();
-
-       return 0;
-}
-
 static void
 set_lcore_state(uint32_t lcore, int32_t state)
 {
@@ -589,6 +572,25 @@ set_lcore_state(uint32_t lcore, int32_t state)
        lcore_states[lcore].is_service_core = (state == ROLE_SERVICE);
 }
 
+int32_t rte_service_lcore_reset_all(void)
+{
+       /* loop over cores, reset all to mask 0 */
+       uint32_t i;
+       for (i = 0; i < RTE_MAX_LCORE; i++) {
+               if (lcore_states[i].is_service_core) {
+                       lcore_states[i].service_mask = 0;
+                       set_lcore_state(i, ROLE_RTE);
+                       lcore_states[i].runstate = RUNSTATE_STOPPED;
+               }
+       }
+       for (i = 0; i < RTE_SERVICE_NUM_MAX; i++)
+               rte_atomic32_set(&rte_services[i].num_mapped_cores, 0);
+
+       rte_smp_wmb();
+
+       return 0;
+}
+
 int32_t
 rte_service_lcore_add(uint32_t lcore)
 {