[dpdk-dev,1/1] timer: fix reset on service cores

Message ID 1515792665-6890-1-git-send-email-erik.g.carrillo@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Carrillo, Erik G Jan. 12, 2018, 9:31 p.m. UTC
The return value of rte_lcore_has_role is misinterpreted in the timer
reset function.  The return values of rte_lcore_has_role will be changed
in a future DPDK release, but this commit fixes this call site until
that happens.

Fixes: 351f463456f8 ("timer: allow reset on service cores")
Cc: stable@dpdk.org

Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
---
 lib/librte_timer/rte_timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Pavan Nikhilesh Jan. 13, 2018, 5:06 a.m. UTC | #1
On Fri, Jan 12, 2018 at 03:31:05PM -0600, Erik Gabriel Carrillo wrote:
> The return value of rte_lcore_has_role is misinterpreted in the timer
> reset function.  The return values of rte_lcore_has_role will be changed
> in a future DPDK release, but this commit fixes this call site until
> that happens.
>
> Fixes: 351f463456f8 ("timer: allow reset on service cores")
> Cc: stable@dpdk.org
>
> Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
> ---
>  lib/librte_timer/rte_timer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
> index 604ecab..4bbcd06 100644
> --- a/lib/librte_timer/rte_timer.c
> +++ b/lib/librte_timer/rte_timer.c
> @@ -403,7 +403,7 @@ rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
>
>  	if (unlikely((tim_lcore != (unsigned)LCORE_ID_ANY) &&
>  			!(rte_lcore_is_enabled(tim_lcore) ||
> -				rte_lcore_has_role(tim_lcore, ROLE_SERVICE))))
> +			  rte_lcore_has_role(tim_lcore, ROLE_SERVICE) == 0)))
>  		return -1;
>
>  	if (type == PERIODICAL)
> --
> 2.6.4
>
Acked-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
  
Thomas Monjalon Jan. 16, 2018, 12:49 a.m. UTC | #2
13/01/2018 06:06, Pavan Nikhilesh:
> On Fri, Jan 12, 2018 at 03:31:05PM -0600, Erik Gabriel Carrillo wrote:
> > The return value of rte_lcore_has_role is misinterpreted in the timer
> > reset function.  The return values of rte_lcore_has_role will be changed
> > in a future DPDK release, but this commit fixes this call site until
> > that happens.
> >
> > Fixes: 351f463456f8 ("timer: allow reset on service cores")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
> Acked-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>

Applied, thanks
  

Patch

diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c
index 604ecab..4bbcd06 100644
--- a/lib/librte_timer/rte_timer.c
+++ b/lib/librte_timer/rte_timer.c
@@ -403,7 +403,7 @@  rte_timer_reset(struct rte_timer *tim, uint64_t ticks,
 
 	if (unlikely((tim_lcore != (unsigned)LCORE_ID_ANY) &&
 			!(rte_lcore_is_enabled(tim_lcore) ||
-				rte_lcore_has_role(tim_lcore, ROLE_SERVICE))))
+			  rte_lcore_has_role(tim_lcore, ROLE_SERVICE) == 0)))
 		return -1;
 
 	if (type == PERIODICAL)