From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Michal Krawczyk <mk@semihalf.com>, dev@dpdk.org
Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com,
upstream@semihalf.com, Stanislaw Kardach <kda@semihalf.com>,
Shay Agroskin <shayagr@amazon.com>
Subject: Re: [dpdk-dev] [PATCH v3 16/22] net/ena: handle spurious wakeups in ENA_WAIT_EVENT
Date: Fri, 7 May 2021 17:55:06 +0100 [thread overview]
Message-ID: <e8b97226-90e1-2f73-40eb-ca26c507a90d@intel.com> (raw)
In-Reply-To: <20210506142526.28245-17-mk@semihalf.com>
On 5/6/2021 3:25 PM, Michal Krawczyk wrote:
> From: Stanislaw Kardach <kda@semihalf.com>
>
> pthread_cond_timedwait() may spuriously wakeup according to POSIX.
> Therefore it is required to check whether predicate is actually true
> before finishing the waiting loop.
>
> Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
> Reviewed-by: Michal Krawczyk <mk@semihalf.com>
> Reviewed-by: Igor Chauskin <igorch@amazon.com>
> Reviewed-by: Shay Agroskin <shayagr@amazon.com>
> ---
> drivers/net/ena/base/ena_plat_dpdk.h | 75 +++++++++++++++++-----------
> 1 file changed, 47 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
> index 4498d53703..1d0454bebe 100644
> --- a/drivers/net/ena/base/ena_plat_dpdk.h
> +++ b/drivers/net/ena/base/ena_plat_dpdk.h
> @@ -77,6 +77,14 @@ typedef uint64_t dma_addr_t;
> #define mmiowb rte_io_wmb
> #define __iomem
>
> +#ifndef READ_ONCE
> +#define READ_ONCE(var) (*((volatile typeof(var) *)(&(var))))
> +#endif
> +
> +#define READ_ONCE8(var) READ_ONCE(var)
> +#define READ_ONCE16(var) READ_ONCE(var)
> +#define READ_ONCE32(var) READ_ONCE(var)
> +
> #define US_PER_S 1000000
> #define ENA_GET_SYSTEM_USECS() \
> (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
> @@ -137,40 +145,59 @@ extern int ena_logtype_com;
> ({(void)flags; rte_spinlock_unlock(&(spinlock)); })
> #define ENA_SPINLOCK_DESTROY(spinlock) ((void)spinlock)
>
> -#define q_waitqueue_t \
> - struct { \
> - pthread_cond_t cond; \
> - pthread_mutex_t mutex; \
> - }
> +typedef struct {
> + pthread_cond_t cond;
> + pthread_mutex_t mutex;
> + uint8_t flag;
> +} ena_wait_event_t;
>
> -#define ena_wait_queue_t q_waitqueue_t
> -
> -#define ENA_WAIT_EVENT_INIT(waitqueue) \
> +#define ENA_WAIT_EVENT_INIT(waitevent) \
> do { \
> - pthread_mutex_init(&(waitqueue).mutex, NULL); \
> - pthread_cond_init(&(waitqueue).cond, NULL); \
> + ena_wait_event_t *_we = &(waitevent); \
> + pthread_mutex_init(&_we->mutex, NULL); \
> + pthread_cond_init(&_we->cond, NULL); \
> + _we->flag = 0; \
> } while (0)
>
> #define ENA_WAIT_EVENT_WAIT(waitevent, timeout) \
> do { \
> + ena_wait_event_t *_we = &(waitevent); \
> + typeof(timeout) _tmo = (timeout); \
> + int ret = 0; \
> struct timespec wait; \
> struct timeval now; \
> unsigned long timeout_us; \
> gettimeofday(&now, NULL); \
> - wait.tv_sec = now.tv_sec + timeout / 1000000UL; \
> - timeout_us = timeout % 1000000UL; \
> + wait.tv_sec = now.tv_sec + _tmo / 1000000UL; \
> + timeout_us = _tmo % 1000000UL; \
> wait.tv_nsec = (now.tv_usec + timeout_us) * 1000UL; \
> - pthread_mutex_lock(&waitevent.mutex); \
> - pthread_cond_timedwait(&waitevent.cond, \
> - &waitevent.mutex, &wait); \
> - pthread_mutex_unlock(&waitevent.mutex); \
> + pthread_mutex_lock(&_we->mutex); \
> + while (ret == 0 && !_we->flag) { \
> + ret = pthread_cond_timedwait(&_we->cond, \
> + &_we->mutex, &wait); \
> + } \
> + /* Asserts only if not working on ena_wait_event_t */ \
> + if (unlikely(ret != 0 && ret != ETIMEDOUT)) \
> + rte_panic("Invalid wait event. pthread ret: %d\n", \
> + ret);
Drivers are not allowed to call 'rte_panic', please remove it.
Application should decide to exit or not. Maybe application is OK to run without
'ena' device if it has multiple other devices.
\
> + else if (unlikely(ret == ETIMEDOUT)) \
> + ena_trc_err(NULL, \
> + "Timeout waiting for " #waitevent "\n"); \
> + _we->flag = 0; \
> + pthread_mutex_unlock(&_we->mutex); \
> + } while (0)
> +#define ENA_WAIT_EVENT_SIGNAL(waitevent) \
> + do { \
> + ena_wait_event_t *_we = &(waitevent); \
> + pthread_mutex_lock(&_we->mutex); \
> + _we->flag = 1; \
> + pthread_cond_signal(&_we->cond); \
> + pthread_mutex_unlock(&_we->mutex); \
> } while (0)
> -#define ENA_WAIT_EVENT_SIGNAL(waitevent) pthread_cond_signal(&waitevent.cond)
> /* pthread condition doesn't need to be rearmed after usage */
> #define ENA_WAIT_EVENT_CLEAR(...)
> -#define ENA_WAIT_EVENT_DESTROY(admin_queue) ((void)(admin_queue))
> +#define ENA_WAIT_EVENT_DESTROY(waitevent) ((void)(waitevent))
>
> -#define ena_wait_event_t ena_wait_queue_t
> #define ENA_MIGHT_SLEEP()
>
> #define ena_time_t uint64_t
> @@ -284,15 +311,7 @@ extern rte_atomic64_t ena_alloc_cnt;
> #define ENA_TIME_EXPIRE(timeout) (timeout < rte_get_timer_cycles())
> #define ENA_GET_SYSTEM_TIMEOUT(timeout_us) \
> (timeout_us * rte_get_timer_hz() / 1000000 + rte_get_timer_cycles())
> -#define ENA_WAIT_EVENTS_DESTROY(waitqueue) ((void)(waitqueue))
> -
> -#ifndef READ_ONCE
> -#define READ_ONCE(var) (*((volatile typeof(var) *)(&(var))))
> -#endif
> -
> -#define READ_ONCE8(var) READ_ONCE(var)
> -#define READ_ONCE16(var) READ_ONCE(var)
> -#define READ_ONCE32(var) READ_ONCE(var)
> +#define ENA_WAIT_EVENTS_DESTROY(admin_queue) ((void)(admin_queue))
>
> /* The size must be 8 byte align */
> #define ENA_MEMCPY_TO_DEVICE_64(dst, src, size) \
>
next prev parent reply other threads:[~2021-05-07 16:55 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 12:57 [dpdk-dev] [PATCH 00/22] net/ena: update ENA PMD to v2.3.0 Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 01/22] net/ena: switch memcpy to dpdk-optimized version Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 02/22] net/ena/base: unify arg names for the functions Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 03/22] net/ena/base: add dev arg to the logging macros Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 04/22] net/ena/base: typos, style and comments improvements Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 05/22] net/ena/base: fix issues from the static code scan Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 06/22] net/ena/base: destroy multiple "wait events" Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 07/22] net/ena/base: remove indir table from ENA feat ctx Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 08/22] net/ena/base: remove mutable RSS from the host info Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 09/22] net/ena/base: update generation date and commit Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 10/22] net/ena/base: use rte_prefetch0_write Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 11/22] net/ena/base: adjust changes to lastest ena-com Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 15/22] net/ena: remove endian swap functions Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 16/22] net/ena: handle spurious wakeups in ENA_WAIT_EVENT Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 17/22] net/ena: support SMP for mz alloc counter Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 18/22] net/ena: move default RSS key to shared mem Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 19/22] net/ena: make ethdev references smp safe Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 20/22] net/ena: disable dev_ops not supported in SMP Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 21/22] net/ena: report default ring size Michal Krawczyk
2021-04-30 12:57 ` [dpdk-dev] [PATCH 22/22] net/ena: update version to v2.3.0 Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 00/22] net/ena: update ENA PMD " Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 01/22] net/ena: switch memcpy to dpdk-optimized version Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 02/22] net/ena/base: unify arg names for the functions Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 03/22] net/ena/base: add dev arg to the logging macros Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 04/22] net/ena/base: typos, style and comments improvements Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 05/22] net/ena/base: fix issues from the static code scan Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 06/22] net/ena/base: destroy multiple "wait events" Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 07/22] net/ena/base: remove indir table from ENA feat ctx Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 08/22] net/ena/base: remove mutable RSS from the host info Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 09/22] net/ena/base: update generation date and commit Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 10/22] net/ena/base: use rte_prefetch0_write Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 11/22] net/ena/base: adjust changes to lastest ena-com Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 15/22] net/ena: remove endian swap functions Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 16/22] net/ena: handle spurious wakeups in ENA_WAIT_EVENT Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 17/22] net/ena: support SMP for mz alloc counter Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 18/22] net/ena: move default RSS key to shared mem Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 19/22] net/ena: make ethdev references smp safe Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 20/22] net/ena: disable dev_ops not supported in SMP Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 21/22] net/ena: report default ring size Michal Krawczyk
2021-05-05 7:33 ` [dpdk-dev] [PATCH v2 22/22] net/ena: update version to v2.3.0 Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 00/22] net/ena: update ENA PMD " Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 01/22] net/ena: switch memcpy to dpdk-optimized version Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 02/22] net/ena/base: unify arg names for the functions Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 03/22] net/ena/base: add dev arg to the logging macros Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 04/22] net/ena/base: typos, style and comments improvements Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 05/22] net/ena/base: fix issues from the static code scan Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 06/22] net/ena/base: destroy multiple "wait events" Michal Krawczyk
2021-05-07 16:47 ` Ferruh Yigit
2021-05-09 14:17 ` Michał Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 07/22] net/ena/base: remove indir table from ENA feat ctx Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 08/22] net/ena/base: remove mutable RSS from the host info Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 09/22] net/ena/base: update generation date and commit Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 10/22] net/ena/base: use rte_prefetch0_write Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 11/22] net/ena/base: adjust changes to lastest ena-com Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 12/22] net/ena: fix parsing of large_llq_hdr argument Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 13/22] net/ena: terminate devargs allowed keys with NULL Michal Krawczyk
2021-05-07 16:47 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 14/22] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-07 16:47 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-05-09 14:20 ` Michał Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 15/22] net/ena: remove endian swap functions Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 16/22] net/ena: handle spurious wakeups in ENA_WAIT_EVENT Michal Krawczyk
2021-05-07 16:55 ` Ferruh Yigit [this message]
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 17/22] net/ena: support SMP for mz alloc counter Michal Krawczyk
2021-05-07 16:48 ` Ferruh Yigit
2021-05-07 17:18 ` Stanislaw Kardach
2021-05-09 13:41 ` Ferruh Yigit
2021-05-10 8:18 ` Stanislaw Kardach
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 18/22] net/ena: move default RSS key to shared mem Michal Krawczyk
2021-05-10 8:27 ` Stanislaw Kardach
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 19/22] net/ena: make ethdev references smp safe Michal Krawczyk
2021-05-07 16:49 ` Ferruh Yigit
2021-05-09 14:40 ` Michał Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 20/22] net/ena: disable dev_ops not supported in SMP Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 21/22] net/ena: report default ring size Michal Krawczyk
2021-05-06 14:25 ` [dpdk-dev] [PATCH v3 22/22] net/ena: update version to v2.3.0 Michal Krawczyk
2021-05-07 16:50 ` Ferruh Yigit
2021-05-09 14:33 ` Michał Krawczyk
2021-05-07 14:59 ` [dpdk-dev] [PATCH v3 00/22] net/ena: update ENA PMD " Ferruh Yigit
2021-05-07 15:07 ` Ferruh Yigit
2021-05-10 12:02 ` Michał Krawczyk
2021-05-10 12:27 ` Ferruh Yigit
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 00/19] " Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 01/19] net/ena: switch memcpy to dpdk-optimized version Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 02/19] net/ena/base: unify arg names for the functions Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 03/19] net/ena/base: add dev arg to the logging macros Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 04/19] net/ena/base: style and comments improvements Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 05/19] net/ena/base: fix issues from the static code scan Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 06/19] net/ena/base: destroy multiple "wait events" Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 07/19] net/ena/base: remove indir table from ENA feat ctx Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 08/19] net/ena/base: remove mutable RSS from the host info Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 09/19] net/ena/base: use rte prefetch0 write Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 10/19] net/ena/base: adjust changes to lastest ena-com Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 11/19] net/ena: fix parsing of large LLQ header devarg Michal Krawczyk
2021-05-12 17:48 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 12/19] net/ena: terminate devargs allowed keys with null Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 13/19] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-11 12:16 ` Ferruh Yigit
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 14/19] net/ena: remove endian swap functions Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 15/19] net/ena: handle spurious wakeups in ENA wait event Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 16/19] net/ena: make ethdev references SMP safe Michal Krawczyk
2021-05-11 12:22 ` Ferruh Yigit
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 17/19] net/ena: disable dev ops not supported in SMP Michal Krawczyk
2021-05-11 12:29 ` Ferruh Yigit
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 18/19] net/ena: report default ring size Michal Krawczyk
2021-05-11 6:45 ` [dpdk-dev] [PATCH v4 19/19] net/ena: update version to v2.3.0 Michal Krawczyk
2021-05-11 13:07 ` [dpdk-dev] [PATCH v4 00/19] net/ena: update ENA PMD " Ferruh Yigit
2021-05-11 13:34 ` Michał Krawczyk
2021-05-12 10:13 ` [dpdk-dev] [PATCH v5 0/3] " Michal Krawczyk
2021-05-12 10:13 ` [dpdk-dev] [PATCH v5 1/3] net/ena: indicate Rx RSS hash presence Michal Krawczyk
2021-05-12 10:13 ` [dpdk-dev] [PATCH v5 2/3] net/ena: make ethdev references multiprocess safe Michal Krawczyk
2021-05-12 10:13 ` [dpdk-dev] [PATCH v5 3/3] net/ena: disable dev ops not supported by secondary process Michal Krawczyk
2021-05-12 12:20 ` [dpdk-dev] [PATCH v5 0/3] net/ena: update ENA PMD to v2.3.0 Ferruh Yigit
2021-05-07 15:52 ` [dpdk-dev] [PATCH v3 00/22] " Ferruh Yigit
2021-05-09 14:15 ` Michał Krawczyk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e8b97226-90e1-2f73-40eb-ca26c507a90d@intel.com \
--to=ferruh.yigit@intel.com \
--cc=dev@dpdk.org \
--cc=gtzalik@amazon.com \
--cc=igorch@amazon.com \
--cc=kda@semihalf.com \
--cc=mk@semihalf.com \
--cc=ndagan@amazon.com \
--cc=shayagr@amazon.com \
--cc=upstream@semihalf.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).