Add RTE_INTR_EVENT_* defines and a new API rte_intr_active_events() in order to retrieve them.
As the events are in the context of the current interrupt, rte_intr_active_events() must be called from the context of an interrupt callback. Signed-off-by: Kevin Traynor <[email protected]> --- lib/eal/freebsd/eal_interrupts.c | 7 +++++++ lib/eal/include/rte_interrupts.h | 23 +++++++++++++++++++++++ lib/eal/linux/eal_interrupts.c | 31 ++++++++++++++++++++++++++++++- lib/eal/windows/eal_interrupts.c | 7 +++++++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/lib/eal/freebsd/eal_interrupts.c b/lib/eal/freebsd/eal_interrupts.c index 5c3ab6699e..aa0bd50009 100644 --- a/lib/eal/freebsd/eal_interrupts.c +++ b/lib/eal/freebsd/eal_interrupts.c @@ -769,2 +769,9 @@ int rte_thread_is_intr(void) return rte_thread_equal(intr_thread, rte_thread_self()); } + +RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_intr_active_events, 26.03) +uint32_t +rte_intr_active_events(void) +{ + return 0; +} diff --git a/lib/eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h index 1b9a0b2a78..bff4f98f85 100644 --- a/lib/eal/include/rte_interrupts.h +++ b/lib/eal/include/rte_interrupts.h @@ -40,4 +40,10 @@ struct rte_intr_handle; #define RTE_INTR_VEC_RXTX_OFFSET 1 +/** Interrupt event flags returned by rte_intr_active_events() */ +#define RTE_INTR_EVENT_IN (1 << 0) /**< Data available to read */ +#define RTE_INTR_EVENT_ERR (1 << 1) /**< Error condition on fd */ +#define RTE_INTR_EVENT_HUP (1 << 2) /**< Hang up / disconnect */ +#define RTE_INTR_EVENT_RDHUP (1 << 3) /**< Read Hang up / disconnect */ + /** * The interrupt source type, e.g. UIO, VFIO, ALARM etc. @@ -197,4 +203,21 @@ int rte_intr_ack(const struct rte_intr_handle *intr_handle); int rte_thread_is_intr(void); +/** + * Return the event flags for the interrupt currently being processed. + * + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Must be called from an interrupt callback running on the EAL + * interrupt thread. The returned value is a bitmask of + * RTE_INTR_EVENT_* flags. + * + * @return + * Active event flags, or 0 if not in interrupt context or + * on platforms that do not support this feature. + */ +__rte_experimental +uint32_t rte_intr_active_events(void); + /** * It allocates memory for interrupt instance. API takes flag as an argument diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index f3f6bdd01d..43493aa299 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -41,4 +41,6 @@ static RTE_DEFINE_PER_LCORE(int, _epfd) = -1; /**< epoll fd per thread */ +static uint32_t active_events; /**< events for active interrupt */ + /** * union for pipe fds. @@ -887,4 +889,20 @@ rte_intr_disable(const struct rte_intr_handle *intr_handle) } +static uint32_t +epoll_to_intr_events(uint32_t epoll_events) +{ + uint32_t ev = 0; + + if (epoll_events & EPOLLIN) + ev |= RTE_INTR_EVENT_IN; + if (epoll_events & EPOLLERR) + ev |= RTE_INTR_EVENT_ERR; + if (epoll_events & EPOLLHUP) + ev |= RTE_INTR_EVENT_HUP; + if (epoll_events & EPOLLRDHUP) + ev |= RTE_INTR_EVENT_RDHUP; + return ev; +} + static void eal_intr_source_remove_and_free(struct rte_intr_source *src) @@ -1014,5 +1032,5 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds) if (call) { - + active_events = epoll_to_intr_events(events[n].events); /* Finally, call all callbacks. */ TAILQ_FOREACH(cb, &src->callbacks, next) { @@ -1028,4 +1046,5 @@ eal_intr_process_interrupts(struct epoll_event *events, int nfds) rte_spinlock_lock(&intr_lock); } + active_events = 0; } /* we done with that interrupt source, release it. */ @@ -1642,2 +1661,12 @@ int rte_thread_is_intr(void) return rte_thread_equal(intr_thread, rte_thread_self()); } + +RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_intr_active_events, 26.03) +uint32_t +rte_intr_active_events(void) +{ + if (rte_thread_is_intr()) + return active_events; + + return 0; +} diff --git a/lib/eal/windows/eal_interrupts.c b/lib/eal/windows/eal_interrupts.c index 5ff30c7631..1c7700eca2 100644 --- a/lib/eal/windows/eal_interrupts.c +++ b/lib/eal/windows/eal_interrupts.c @@ -117,4 +117,11 @@ rte_thread_is_intr(void) } +RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_intr_active_events, 26.03) +uint32_t +rte_intr_active_events(void) +{ + return 0; +} + RTE_EXPORT_INTERNAL_SYMBOL(rte_intr_rx_ctl) int -- 2.53.0
