Messages in this thread Patch in this message | | | From | Thomas Gleixner <> | Subject | Re: [PATCH V2] sched/isolation: isolate from handling managed interrupt | Date | Fri, 17 Jan 2020 16:46:09 +0100 |
| |
Ming Lei <ming.lei@redhat.com> writes: > #ifdef CONFIG_CPU_ISOLATION > diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c > index 6c7ca2e983a5..20c7704ce019 100644 > --- a/kernel/irq/cpuhotplug.c > +++ b/kernel/irq/cpuhotplug.c > @@ -77,7 +77,8 @@ static bool migrate_one_irq(struct irq_desc *desc) > * Note: Do not check desc->action as this might be a chained > * interrupt. > */ > - if (irqd_is_per_cpu(d) || !irqd_is_started(d) || !irq_needs_fixup(d)) { > + if ((irqd_is_per_cpu(d) || !irqd_is_started(d) || !irq_needs_fixup(d)) > + && !irqd_managed_force_migrate(d)) {
That's broken. Assume the bit is set and then the remaining CPU goes offline and shuts down the interupt. As a consequence the interrupt is in shutdown state when the first CPU of the affinity set comes online again. It will see the force migrate bit which prevents starting it up again. FAIL!
> /* > * If an irq move is pending, abort it if the dying CPU is > * the sole target. > @@ -192,6 +193,9 @@ static void irq_restore_affinity_of_irq(struct irq_desc *desc, unsigned int cpu) > */ > if (!irqd_is_single_target(data)) > irq_set_affinity_locked(data, affinity, false); > + > + if (irqd_managed_force_migrate(data)) > + migrate_one_irq(desc);
That's not a good idea, really. This is forceful migration which we only should do when there is no other option especially on X86 for the interrupts which cannot be safely migrated outside of an actual interrupt service routine of that interrupt line. When a CPU is unplugged then we have to do this, no matter what. This isolation thing is best effort and does not justify this at all.
I really do not like this force migrate wording either. We force stuff when there is no other way out, but this is not the case here.
We know that there is an isolation mask set, right? So we can simply do:
- if (!irqd_is_single_target(data)) + if (!irqd_is_single_target(data) || hk_should_isolate(data, affinity)) irq_set_affinity_locked(data, affinity, false);
and have
static bool hk_should_isolate(data, affinity) { if (!hk_isolation) return false;
if (!irqd_is_managed(data)) return false;
if (!cpumask_intersects(affinity, hk_isolmask)) return false;
e = irq_data_get_effective_affinity_mask(data); return !cpumask_subset(e, hk_isolmask); }
and let irq_set_affinity_locked() -> irq_do_set_affinity() do the right thing, i.e. migrate it directly or mark it pending for migration.
> @@ -213,11 +214,45 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, > struct irq_desc *desc = irq_data_to_desc(data); > struct irq_chip *chip = irq_data_get_irq_chip(data); > int ret; > + const struct cpumask *mask_to_set = mask; > > if (!chip || !chip->irq_set_affinity) > return -EINVAL; > > - ret = chip->irq_set_affinity(data, mask, force); > > + if (irqd_affinity_is_managed(data)) { > + static struct cpumask tmp_mask;
What protects this mask? Assume there are two concurrent callers on different CPUs for different interrupts. -> FAIL!
The place I pointed you to does TheRightThing.
Aside of that this mask is only needed when ISOLATION is enabled in Kconfig.
> + const struct cpumask *housekeeping = > + housekeeping_cpumask(HK_FLAG_MANAGED_IRQ);
Can you please code in a way which makes these horrible line breaks go away?
> + > + if (cpumask_intersects(mask, housekeeping)) { > + cpumask_and(&tmp_mask, mask, housekeeping); > + if (cpumask_intersects(&tmp_mask, cpu_online_mask)) { > + mask_to_set = &tmp_mask; > + irqd_clear(data, IRQD_MANAGED_FORCE_MIGRATE); > + } else { > + irqd_set(data, IRQD_MANAGED_FORCE_MIGRATE);
And with the above this flag dance is not required at all.
Please take your time and analyze the code you are changing properly before you send out the next half baken version.
I'm happy to review and help, but this frenzy mode sucks.
Thanks,
tglx
| |