* [PATCH v5 2/4] timer: fix function to stop all timers [not found] ` <20220914050855.1677489-1-s.v.naga.harish.k@intel.com> @ 2022-09-14 5:08 ` Naga Harish K S V 0 siblings, 0 replies; 8+ messages in thread From: Naga Harish K S V @ 2022-09-14 5:08 UTC (permalink / raw) To: jerinj; +Cc: dev, erik.g.carrillo, pbhagavatula, sthotton, stable There is a possibility of deadlock in this API, as same spinlock is tried to be acquired in nested manner. If the lcore that is stopping the timer is different from the lcore that owns the timer, the timer list lock is acquired in timer_del(), even if local_is_locked is true. Because the same lock was already acquired in rte_timer_stop_all(), the thread will hang. This patch removes the acquisition of nested lock. Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a list") Cc: stable@dpdk.org Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> --- lib/timer/rte_timer.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 9994813d0d..85d67573eb 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -580,7 +580,7 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, } static int -__rte_timer_stop(struct rte_timer *tim, int local_is_locked, +__rte_timer_stop(struct rte_timer *tim, struct rte_timer_data *timer_data) { union rte_timer_status prev_status, status; @@ -602,7 +602,7 @@ __rte_timer_stop(struct rte_timer *tim, int local_is_locked, /* remove it from list */ if (prev_status.state == RTE_TIMER_PENDING) { - timer_del(tim, prev_status, local_is_locked, priv_timer); + timer_del(tim, prev_status, 0, priv_timer); __TIMER_STAT_ADD(priv_timer, pending, -1); } @@ -631,7 +631,7 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) TIMER_DATA_VALID_GET_OR_ERR_RET(timer_data_id, timer_data, -EINVAL); - return __rte_timer_stop(tim, 0, timer_data); + return __rte_timer_stop(tim, timer_data); } /* loop until rte_timer_stop() succeed */ @@ -987,21 +987,16 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores, walk_lcore = walk_lcores[i]; priv_timer = &timer_data->priv_timer[walk_lcore]; - rte_spinlock_lock(&priv_timer->list_lock); - for (tim = priv_timer->pending_head.sl_next[0]; tim != NULL; tim = next_tim) { next_tim = tim->sl_next[0]; - /* Call timer_stop with lock held */ - __rte_timer_stop(tim, 1, timer_data); + __rte_timer_stop(tim, timer_data); if (f) f(tim, f_arg); } - - rte_spinlock_unlock(&priv_timer->list_lock); } return 0; -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20220914051541.1678837-1-s.v.naga.harish.k@intel.com>]
* [PATCH v5 2/4] timer: fix function to stop all timers [not found] ` <20220914051541.1678837-1-s.v.naga.harish.k@intel.com> @ 2022-09-14 5:15 ` Naga Harish K S V [not found] ` <20220914135147.1846550-1-s.v.naga.harish.k@intel.com> 1 sibling, 0 replies; 8+ messages in thread From: Naga Harish K S V @ 2022-09-14 5:15 UTC (permalink / raw) To: jerinj; +Cc: dev, erik.g.carrillo, pbhagavatula, sthotton, stable There is a possibility of deadlock in this API, as same spinlock is tried to be acquired in nested manner. If the lcore that is stopping the timer is different from the lcore that owns the timer, the timer list lock is acquired in timer_del(), even if local_is_locked is true. Because the same lock was already acquired in rte_timer_stop_all(), the thread will hang. This patch removes the acquisition of nested lock. Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a list") Cc: stable@dpdk.org Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> --- lib/timer/rte_timer.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 9994813d0d..85d67573eb 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -580,7 +580,7 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, } static int -__rte_timer_stop(struct rte_timer *tim, int local_is_locked, +__rte_timer_stop(struct rte_timer *tim, struct rte_timer_data *timer_data) { union rte_timer_status prev_status, status; @@ -602,7 +602,7 @@ __rte_timer_stop(struct rte_timer *tim, int local_is_locked, /* remove it from list */ if (prev_status.state == RTE_TIMER_PENDING) { - timer_del(tim, prev_status, local_is_locked, priv_timer); + timer_del(tim, prev_status, 0, priv_timer); __TIMER_STAT_ADD(priv_timer, pending, -1); } @@ -631,7 +631,7 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) TIMER_DATA_VALID_GET_OR_ERR_RET(timer_data_id, timer_data, -EINVAL); - return __rte_timer_stop(tim, 0, timer_data); + return __rte_timer_stop(tim, timer_data); } /* loop until rte_timer_stop() succeed */ @@ -987,21 +987,16 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores, walk_lcore = walk_lcores[i]; priv_timer = &timer_data->priv_timer[walk_lcore]; - rte_spinlock_lock(&priv_timer->list_lock); - for (tim = priv_timer->pending_head.sl_next[0]; tim != NULL; tim = next_tim) { next_tim = tim->sl_next[0]; - /* Call timer_stop with lock held */ - __rte_timer_stop(tim, 1, timer_data); + __rte_timer_stop(tim, timer_data); if (f) f(tim, f_arg); } - - rte_spinlock_unlock(&priv_timer->list_lock); } return 0; -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20220914135147.1846550-1-s.v.naga.harish.k@intel.com>]
* [PATCH v6 2/3] timer: fix function to stop all timers [not found] ` <20220914135147.1846550-1-s.v.naga.harish.k@intel.com> @ 2022-09-14 13:51 ` Naga Harish K S V [not found] ` <20220914153319.1887248-1-s.v.naga.harish.k@intel.com> 1 sibling, 0 replies; 8+ messages in thread From: Naga Harish K S V @ 2022-09-14 13:51 UTC (permalink / raw) To: jerinj; +Cc: dev, erik.g.carrillo, pbhagavatula, sthotton, stable There is a possibility of deadlock in this API, as same spinlock is tried to be acquired in nested manner. If the lcore that is stopping the timer is different from the lcore that owns the timer, the timer list lock is acquired in timer_del(), even if local_is_locked is true. Because the same lock was already acquired in rte_timer_stop_all(), the thread will hang. This patch removes the acquisition of nested lock. Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a list") Cc: stable@dpdk.org Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> --- lib/timer/rte_timer.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 9994813d0d..85d67573eb 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -580,7 +580,7 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, } static int -__rte_timer_stop(struct rte_timer *tim, int local_is_locked, +__rte_timer_stop(struct rte_timer *tim, struct rte_timer_data *timer_data) { union rte_timer_status prev_status, status; @@ -602,7 +602,7 @@ __rte_timer_stop(struct rte_timer *tim, int local_is_locked, /* remove it from list */ if (prev_status.state == RTE_TIMER_PENDING) { - timer_del(tim, prev_status, local_is_locked, priv_timer); + timer_del(tim, prev_status, 0, priv_timer); __TIMER_STAT_ADD(priv_timer, pending, -1); } @@ -631,7 +631,7 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) TIMER_DATA_VALID_GET_OR_ERR_RET(timer_data_id, timer_data, -EINVAL); - return __rte_timer_stop(tim, 0, timer_data); + return __rte_timer_stop(tim, timer_data); } /* loop until rte_timer_stop() succeed */ @@ -987,21 +987,16 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores, walk_lcore = walk_lcores[i]; priv_timer = &timer_data->priv_timer[walk_lcore]; - rte_spinlock_lock(&priv_timer->list_lock); - for (tim = priv_timer->pending_head.sl_next[0]; tim != NULL; tim = next_tim) { next_tim = tim->sl_next[0]; - /* Call timer_stop with lock held */ - __rte_timer_stop(tim, 1, timer_data); + __rte_timer_stop(tim, timer_data); if (f) f(tim, f_arg); } - - rte_spinlock_unlock(&priv_timer->list_lock); } return 0; -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <20220914153319.1887248-1-s.v.naga.harish.k@intel.com>]
* [PATCH v7 2/3] timer: fix function to stop all timers [not found] ` <20220914153319.1887248-1-s.v.naga.harish.k@intel.com> @ 2022-09-14 15:33 ` Naga Harish K S V 2022-09-15 6:41 ` Jerin Jacob 0 siblings, 1 reply; 8+ messages in thread From: Naga Harish K S V @ 2022-09-14 15:33 UTC (permalink / raw) To: jerinj; +Cc: dev, erik.g.carrillo, pbhagavatula, sthotton, stable There is a possibility of deadlock in this API, as same spinlock is tried to be acquired in nested manner. If the lcore that is stopping the timer is different from the lcore that owns the timer, the timer list lock is acquired in timer_del(), even if local_is_locked is true. Because the same lock was already acquired in rte_timer_stop_all(), the thread will hang. This patch removes the acquisition of nested lock. Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a list") Cc: stable@dpdk.org Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> --- lib/timer/rte_timer.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 9994813d0d..85d67573eb 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -580,7 +580,7 @@ rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, } static int -__rte_timer_stop(struct rte_timer *tim, int local_is_locked, +__rte_timer_stop(struct rte_timer *tim, struct rte_timer_data *timer_data) { union rte_timer_status prev_status, status; @@ -602,7 +602,7 @@ __rte_timer_stop(struct rte_timer *tim, int local_is_locked, /* remove it from list */ if (prev_status.state == RTE_TIMER_PENDING) { - timer_del(tim, prev_status, local_is_locked, priv_timer); + timer_del(tim, prev_status, 0, priv_timer); __TIMER_STAT_ADD(priv_timer, pending, -1); } @@ -631,7 +631,7 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) TIMER_DATA_VALID_GET_OR_ERR_RET(timer_data_id, timer_data, -EINVAL); - return __rte_timer_stop(tim, 0, timer_data); + return __rte_timer_stop(tim, timer_data); } /* loop until rte_timer_stop() succeed */ @@ -987,21 +987,16 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores, walk_lcore = walk_lcores[i]; priv_timer = &timer_data->priv_timer[walk_lcore]; - rte_spinlock_lock(&priv_timer->list_lock); - for (tim = priv_timer->pending_head.sl_next[0]; tim != NULL; tim = next_tim) { next_tim = tim->sl_next[0]; - /* Call timer_stop with lock held */ - __rte_timer_stop(tim, 1, timer_data); + __rte_timer_stop(tim, timer_data); if (f) f(tim, f_arg); } - - rte_spinlock_unlock(&priv_timer->list_lock); } return 0; -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v7 2/3] timer: fix function to stop all timers 2022-09-14 15:33 ` [PATCH v7 " Naga Harish K S V @ 2022-09-15 6:41 ` Jerin Jacob 2022-09-16 4:40 ` Naga Harish K, S V 2022-09-26 5:21 ` Naga Harish K, S V 0 siblings, 2 replies; 8+ messages in thread From: Jerin Jacob @ 2022-09-15 6:41 UTC (permalink / raw) To: Naga Harish K S V, Thomas Monjalon Cc: jerinj, dev, erik.g.carrillo, pbhagavatula, sthotton, stable On Wed, Sep 14, 2022 at 9:03 PM Naga Harish K S V <s.v.naga.harish.k@intel.com> wrote: > > There is a possibility of deadlock in this API, > as same spinlock is tried to be acquired in nested manner. > > If the lcore that is stopping the timer is different from the lcore > that owns the timer, the timer list lock is acquired in timer_del(), > even if local_is_locked is true. Because the same lock was already > acquired in rte_timer_stop_all(), the thread will hang. > > This patch removes the acquisition of nested lock. > > Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a list") > Cc: stable@dpdk.org > > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> > --- > lib/timer/rte_timer.c | 13 ++++--------- Since this change in lib/timer. Delegating this patch to @Thomas Monjalon ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH v7 2/3] timer: fix function to stop all timers 2022-09-15 6:41 ` Jerin Jacob @ 2022-09-16 4:40 ` Naga Harish K, S V 2022-10-05 12:59 ` Thomas Monjalon 2022-09-26 5:21 ` Naga Harish K, S V 1 sibling, 1 reply; 8+ messages in thread From: Naga Harish K, S V @ 2022-09-16 4:40 UTC (permalink / raw) To: Jerin Jacob, Thomas Monjalon Cc: jerinj, dev, Carrillo, Erik G, pbhagavatula, sthotton, stable > -----Original Message----- > From: Jerin Jacob <jerinjacobk@gmail.com> > Sent: Thursday, September 15, 2022 12:12 PM > To: Naga Harish K, S V <s.v.naga.harish.k@intel.com>; Thomas Monjalon > <thomas@monjalon.net> > Cc: jerinj@marvell.com; dev@dpdk.org; Carrillo, Erik G > <erik.g.carrillo@intel.com>; pbhagavatula@marvell.com; > sthotton@marvell.com; stable@dpdk.org > Subject: Re: [PATCH v7 2/3] timer: fix function to stop all timers > > On Wed, Sep 14, 2022 at 9:03 PM Naga Harish K S V > <s.v.naga.harish.k@intel.com> wrote: > > > > There is a possibility of deadlock in this API, as same spinlock is > > tried to be acquired in nested manner. > > > > If the lcore that is stopping the timer is different from the lcore > > that owns the timer, the timer list lock is acquired in timer_del(), > > even if local_is_locked is true. Because the same lock was already > > acquired in rte_timer_stop_all(), the thread will hang. > > > > This patch removes the acquisition of nested lock. > > > > Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a > > list") > > Cc: stable@dpdk.org > > > > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> Acked-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com> Added missing ack > > --- > > lib/timer/rte_timer.c | 13 ++++--------- > > Since this change in lib/timer. Delegating this patch to @Thomas Monjalon ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v7 2/3] timer: fix function to stop all timers 2022-09-16 4:40 ` Naga Harish K, S V @ 2022-10-05 12:59 ` Thomas Monjalon 0 siblings, 0 replies; 8+ messages in thread From: Thomas Monjalon @ 2022-10-05 12:59 UTC (permalink / raw) To: Naga Harish K, S V Cc: Jerin Jacob, stable, jerinj, dev, Carrillo, Erik G, pbhagavatula, sthotton > > On Wed, Sep 14, 2022 at 9:03 PM Naga Harish K S V > > <s.v.naga.harish.k@intel.com> wrote: > > > > > > There is a possibility of deadlock in this API, as same spinlock is > > > tried to be acquired in nested manner. > > > > > > If the lcore that is stopping the timer is different from the lcore > > > that owns the timer, the timer list lock is acquired in timer_del(), > > > even if local_is_locked is true. Because the same lock was already > > > acquired in rte_timer_stop_all(), the thread will hang. > > > > > > This patch removes the acquisition of nested lock. > > > > > > Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a > > > list") > > > Cc: stable@dpdk.org > > > > > > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> > Acked-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com> > > Added missing ack Applied, thanks. ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH v7 2/3] timer: fix function to stop all timers 2022-09-15 6:41 ` Jerin Jacob 2022-09-16 4:40 ` Naga Harish K, S V @ 2022-09-26 5:21 ` Naga Harish K, S V 1 sibling, 0 replies; 8+ messages in thread From: Naga Harish K, S V @ 2022-09-26 5:21 UTC (permalink / raw) To: Jerin Jacob, Thomas Monjalon Cc: jerinj, dev, Carrillo, Erik G, pbhagavatula, sthotton, stable Hi Thomas, Did you get a chance to review this patch? Without this patch, the periodic event timer tests for SW timer adapter hangs. -Harish > -----Original Message----- > From: Jerin Jacob <jerinjacobk@gmail.com> > Sent: Thursday, September 15, 2022 12:12 PM > To: Naga Harish K, S V <s.v.naga.harish.k@intel.com>; Thomas Monjalon > <thomas@monjalon.net> > Cc: jerinj@marvell.com; dev@dpdk.org; Carrillo, Erik G > <erik.g.carrillo@intel.com>; pbhagavatula@marvell.com; > sthotton@marvell.com; stable@dpdk.org > Subject: Re: [PATCH v7 2/3] timer: fix function to stop all timers > > On Wed, Sep 14, 2022 at 9:03 PM Naga Harish K S V > <s.v.naga.harish.k@intel.com> wrote: > > > > There is a possibility of deadlock in this API, as same spinlock is > > tried to be acquired in nested manner. > > > > If the lcore that is stopping the timer is different from the lcore > > that owns the timer, the timer list lock is acquired in timer_del(), > > even if local_is_locked is true. Because the same lock was already > > acquired in rte_timer_stop_all(), the thread will hang. > > > > This patch removes the acquisition of nested lock. > > > > Fixes: 821c51267bcd63a ("timer: add function to stop all timers in a > > list") > > Cc: stable@dpdk.org > > > > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com> > > --- > > lib/timer/rte_timer.c | 13 ++++--------- > > Since this change in lib/timer. Delegating this patch to @Thomas Monjalon ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-05 12:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220812160714.287055-1-s.v.naga.harish.k@intel.com>
[not found] ` <20220914050855.1677489-1-s.v.naga.harish.k@intel.com>
2022-09-14 5:08 ` [PATCH v5 2/4] timer: fix function to stop all timers Naga Harish K S V
[not found] ` <20220914051541.1678837-1-s.v.naga.harish.k@intel.com>
2022-09-14 5:15 ` Naga Harish K S V
[not found] ` <20220914135147.1846550-1-s.v.naga.harish.k@intel.com>
2022-09-14 13:51 ` [PATCH v6 2/3] " Naga Harish K S V
[not found] ` <20220914153319.1887248-1-s.v.naga.harish.k@intel.com>
2022-09-14 15:33 ` [PATCH v7 " Naga Harish K S V
2022-09-15 6:41 ` Jerin Jacob
2022-09-16 4:40 ` Naga Harish K, S V
2022-10-05 12:59 ` Thomas Monjalon
2022-09-26 5:21 ` Naga Harish K, S V
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).