eal: reset lcore task callback and argument

In the rte_eal_remote_launch function, the lcore function
pointer is checked for NULL. However, the pointer is never
reset to NULL. Reset the lcore function pointer and argument
after the worker has completed executing the lcore function.

Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Feifei Wang <feifei.wang2@arm.com>

diff --git a/lib/eal/freebsd/eal_thread.c b/lib/eal/freebsd/eal_thread.c
index 1dce9b0..bbc3a8e 100644 (file)
--- a/lib/eal/freebsd/eal_thread.c
+++ b/lib/eal/freebsd/eal_thread.c
@@ -126,6 +126,8 @@ eal_thread_loop(__rte_unused void *arg)
                fct_arg = lcore_config[lcore_id].arg;
                ret = lcore_config[lcore_id].f(fct_arg);
                lcore_config[lcore_id].ret = ret;
+               lcore_config[lcore_id].f = NULL;
+               lcore_config[lcore_id].arg = NULL;
                rte_wmb();
                lcore_config[lcore_id].state = FINISHED;
        }

diff --git a/lib/eal/linux/eal_thread.c b/lib/eal/linux/eal_thread.c
index 83c2034..8f3c0da 100644 (file)
--- a/lib/eal/linux/eal_thread.c
+++ b/lib/eal/linux/eal_thread.c
@@ -126,6 +126,8 @@ eal_thread_loop(__rte_unused void *arg)
                fct_arg = lcore_config[lcore_id].arg;
                ret = lcore_config[lcore_id].f(fct_arg);
                lcore_config[lcore_id].ret = ret;
+               lcore_config[lcore_id].f = NULL;
+               lcore_config[lcore_id].arg = NULL;
                rte_wmb();
 
                /* when a service core returns, it should go directly to WAIT

diff --git a/lib/eal/windows/eal_thread.c b/lib/eal/windows/eal_thread.c
index 9c3f6d6..df1df5d 100644 (file)
--- a/lib/eal/windows/eal_thread.c
+++ b/lib/eal/windows/eal_thread.c
@@ -110,6 +110,8 @@ eal_thread_loop(void *arg __rte_unused)
                fct_arg = lcore_config[lcore_id].arg;
                ret = lcore_config[lcore_id].f(fct_arg);
                lcore_config[lcore_id].ret = ret;
+               lcore_config[lcore_id].f = NULL;
+               lcore_config[lcore_id].arg = NULL;
                rte_wmb();
 
                /* when a service core returns, it should go directly to WAIT