Add RTDM APIs for interrupt affinity configuration
cover Add RTDM APIs for interrupt affinity configuration
Requested by users who were already calling lower-level APIs instead.
Jan
Jan Kiszka (4):
cobalt/intr: Fix cpumask argument type of xnintr_affinity cobalt/intr: Add error handling to xnintr_affinity cobalt/intr: Enhance xnintr_attach with an initial cpumask cobalt/rtdm: Introduce IRQ affinity services
include/cobalt/kernel/intr.h | 5 ++- include/cobalt/kernel/rtdm/driver.h | 12 +++++++ kernel/cobalt/dovetail/intr.c | 24 +++++++++---- kernel/cobalt/ipipe/intr.c | 36 +++++++++++++++++--- kernel/cobalt/rtdm/drvlib.c | 52 +++++++++++++++++++++++++++-- 5 files changed, 113 insertions(+), 16 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/4 cobalt/intr: Fix cpumask argument type of xnintr_affinity
From: Jan Kiszka <[email protected]>
Passing a potentially large mask by value was a bad idea of I-pipe. Dovetail uses the kernel API, and that does it right. So adjust our internal abstraction - which is unused so far anyway.
--- include/cobalt/kernel/intr.h | 2 +- kernel/cobalt/dovetail/intr.c | 4 ++-- kernel/cobalt/ipipe/intr.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
include/cobalt/kernel/intr.h +1 -1
@@ -125,7 +125,7 @@ void xnintr_enable(struct xnintr *intr);void xnintr_disable (struct xnintr *intr);void xnintr_affinity (struct xnintr *intr, -cpumask_t cpumask); +const cpumask_t *cpumask);#ifdef CONFIG_XENO_OPT_STATS_IRQS
kernel/cobalt/dovetail/intr.c +2 -2
@@ -118,12 +118,12 @@ void xnintr_disable(struct xnintr *intr) }EXPORT_SYMBOL_GPL (xnintr_disable); -void xnintr_affinity (struct xnintr *intr,cpumask_t cpumask) +void xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) {int ret;secondary_mode_only (); - ret =irq_set_affinity_hint (intr->irq, &cpumask); + ret =irq_set_affinity_hint (intr->irq, cpumask);WARN_ON_ONCE (ret); }
kernel/cobalt/ipipe/intr.c +2 -2
@@ -992,11 +992,11 @@ EXPORT_SYMBOL_GPL(xnintr_disable);* * @coretags{secondary-only} */ -void xnintr_affinity (struct xnintr *intr,cpumask_t cpumask) +void xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) {secondary_mode_only ();#ifdef CONFIG_SMP -ipipe_set_irq_affinity (intr->irq, cpumask); +ipipe_set_irq_affinity (intr->irq, *cpumask);#endif }EXPORT_SYMBOL_GPL (xnintr_affinity);
Signature · 1 line
2.26.2
PATCH 2/4 cobalt/intr: Add error handling to xnintr_affinity
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This function should respect the supported cpu set and report an error if the specified set has no intersection with it. It should also return potential errors for the underlying pipeline code.
--- include/cobalt/kernel/intr.h | 3 +-- kernel/cobalt/dovetail/intr.c | 11 +++++++---- kernel/cobalt/ipipe/intr.c | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 9 deletions(-)
include/cobalt/kernel/intr.h +1 -2
@@ -124,8 +124,7 @@ void xnintr_enable(struct xnintr *intr);void xnintr_disable (struct xnintr *intr); -void xnintr_affinity (struct xnintr *intr, -const cpumask_t *cpumask); +int xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask);#ifdef CONFIG_XENO_OPT_STATS_IRQS
kernel/cobalt/dovetail/intr.c +7 -4
@@ -118,13 +118,16 @@ void xnintr_disable(struct xnintr *intr) }EXPORT_SYMBOL_GPL (xnintr_disable); -void xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) +int xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) { -int ret; +cpumask_t effective_mask;secondary_mode_only (); - ret =irq_set_affinity_hint (intr->irq, cpumask); -WARN_ON_ONCE (ret); +cpumask_and (&effective_mask, &xnsched_realtime_cpus, cpumask); +if (cpumask_empty (&effective_mask)) +return -EINVAL ; + +return irq_set_affinity_hint (intr->irq, &effective_mask); }EXPORT_SYMBOL_GPL (xnintr_affinity);
kernel/cobalt/ipipe/intr.c +13 -3
@@ -992,11 +992,21 @@ EXPORT_SYMBOL_GPL(xnintr_disable);* * @coretags{secondary-only} */ -void xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) +int xnintr_affinity (struct xnintr *intr,const cpumask_t *cpumask) { -secondary_mode_only ();#ifdef CONFIG_SMP -ipipe_set_irq_affinity (intr->irq, *cpumask); +cpumask_t effective_mask; + +secondary_mode_only (); + +cpumask_and (&effective_mask, &xnsched_realtime_cpus, cpumask); +if (cpumask_empty (&effective_mask)) +return -EINVAL ; + +return ipipe_set_irq_affinity (intr->irq, effective_mask); +#else +secondary_mode_only (); +return 0 ;#endif }EXPORT_SYMBOL_GPL (xnintr_affinity);
Signature · 1 line
2.26.2
PATCH 3/4 cobalt/intr: Enhance xnintr_attach with an initial cpumask
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This allows to start up interrupts with a specific affinity already set. Will be used by a new RTDM service.
--- include/cobalt/kernel/intr.h | 2 +- kernel/cobalt/dovetail/intr.c | 13 +++++++++++-- kernel/cobalt/ipipe/intr.c | 20 ++++++++++++++++++-- kernel/cobalt/rtdm/drvlib.c | 2 +- 4 files changed, 31 insertions(+), 6 deletions(-)
include/cobalt/kernel/intr.h +1 -1
@@ -116,7 +116,7 @@ int xnintr_init(struct xnintr *intr,void xnintr_destroy (struct xnintr *intr);int xnintr_attach (struct xnintr *intr, -void *cookie); +void *cookie,const cpumask_t *cpumask);void xnintr_detach (struct xnintr *intr);
kernel/cobalt/dovetail/intr.c +11 -2
@@ -83,15 +83,24 @@ void xnintr_destroy(struct xnintr *intr) }EXPORT_SYMBOL_GPL (xnintr_destroy); -int xnintr_attach (struct xnintr *intr,void *cookie) +int xnintr_attach (struct xnintr *intr,void *cookie,const cpumask_t *cpumask) { +cpumask_t tmp_mask, *effective_mask;int ret;secondary_mode_only (); intr->cookie = cookie; - ret =irq_set_affinity_hint (intr->irq, &xnsched_realtime_cpus); +if (!cpumask) { + effective_mask = &xnsched_realtime_cpus; + }else { + effective_mask = &tmp_mask; +cpumask_and (effective_mask, &xnsched_realtime_cpus, cpumask); +if (cpumask_empty (effective_mask)) +return -EINVAL ; + } + ret =irq_set_affinity_hint (intr->irq, effective_mask);if (ret)return ret;
kernel/cobalt/ipipe/intr.c +18 -2
@@ -828,6 +828,9 @@ EXPORT_SYMBOL_GPL(xnintr_destroy);* @param cookie A user-defined opaque value which is stored into the * descriptor for further retrieval by the interrupt handler. * +* @param cpumask Initial CPU affinity of the interrupt. If NULL, affinity is +* set to all real-time CPUs. +* * @return 0 is returned on success. Otherwise: * * - -EINVAL is returned if an error occurred while attaching the
@@ -843,8 +846,11 @@ EXPORT_SYMBOL_GPL(xnintr_destroy);* @note Attaching an interrupt descriptor resets the tracked number * of IRQ receipts to zero. */ -int xnintr_attach (struct xnintr *intr,void *cookie) +int xnintr_attach (struct xnintr *intr,void *cookie,const cpumask_t *cpumask) { +#ifdef CONFIG_SMP +cpumask_t tmp_mask, *effective_mask; +#endif int ret;secondary_mode_only ();
@@ -854,7 +860,17 @@ int xnintr_attach(struct xnintr *intr, void *cookie)clear_irqstats (intr);#ifdef CONFIG_SMP -ipipe_set_irq_affinity (intr->irq, xnsched_realtime_cpus); +if (!cpumask) { + effective_mask = &xnsched_realtime_cpus; + }else { + effective_mask = &tmp_mask; +cpumask_and (effective_mask, &xnsched_realtime_cpus, cpumask); +if (cpumask_empty (effective_mask)) +return -EINVAL ; + } + ret =ipipe_set_irq_affinity (intr->irq, *effective_mask); +if (ret) +return ret;#endif /* CONFIG_SMP */ raw_spin_lock (&intr->lock);
kernel/cobalt/rtdm/drvlib.c +1 -1
@@ -1455,7 +1455,7 @@ int rtdm_irq_request(rtdm_irq_t *irq_handle, unsigned int irq_no,if (err)return err; - err =xnintr_attach (irq_handle, arg); + err =xnintr_attach (irq_handle, arg,NULL );if (err) {xnintr_destroy (irq_handle);return err;
Signature · 1 line
2.26.2
PATCH 4/4 cobalt/rtdm: Introduce IRQ affinity services
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Add rtdm_irq_request_affine and rtdm_irq_set_affinity to start IRQs or specific CPUs or move them around. So far, this was unsupported and made users bypass layer to configure the desired affinity. Starting with the right affinity also avoids hitting the wrong CPU at least once before the IRQ can be live-migrated.
--- include/cobalt/kernel/rtdm/driver.h | 12 +++++++ kernel/cobalt/rtdm/drvlib.c | 52 +++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-)
include/cobalt/kernel/rtdm/driver.h +12 -0
@@ -27,6 +27,7 @@#define _COBALT_RTDM_DRIVER_H#include <asm/atomic.h> +#include <linux/cpumask.h> #include <linux/list.h> #include <linux/module.h> #include <linux/cdev.h>
@@ -854,6 +855,11 @@ int rtdm_irq_request(rtdm_irq_t *irq_handle, unsigned int irq_no, rtdm_irq_handler_t handler, unsigned long flags, const char *device_name, void *arg); +int rtdm_irq_request_affine (rtdm_irq_t *irq_handle,unsigned int irq_no, +rtdm_irq_handler_t handler,unsigned long flags, +const char *device_name,void *arg, +const cpumask_t *cpumask); +#ifndef DOXYGEN_CPP /* Avoid static inline tags for RTDM in doxygen */ static inline int rtdm_irq_free (rtdm_irq_t *irq_handle) {
@@ -874,6 +880,12 @@ static inline int rtdm_irq_disable(rtdm_irq_t *irq_handle)xnintr_disable (irq_handle); return 0; } + +static inline int rtdm_irq_set_affinity (rtdm_irq_t *irq_handle, +const cpumask_t *cpumask) +{ +return xnintr_affinity (irq_handle, cpumask); +}#endif /* !DOXYGEN_CPP */ /* --- non-real-time signalling services --- */
kernel/cobalt/rtdm/drvlib.c +50 -2
76 lines not on this page · raw message
Signature · 1 line
2.26.2