Commit Message

At the moment vgic_vcpu_inject_irq() is the interface for Xen internal
code and virtual devices to inject IRQs into a guest. This interface has
two shortcomings:
1) It requires a VCPU pointer, which we may not know (and don't need!)
for shared interrupts. A second function (vgic_vcpu_inject_spi()), was
there to work around this issue.
2) This interface only really supports edge triggered IRQs, which is
what the Xen VGIC emulates only anyway. However this needs to and will
change, so we need to add the desired level (high or low) to the
interface.
This replaces the existing injection call (taking a VCPU and and IRQ
parameter) with a new one, taking domain, VCPU, IRQ and level parameters.
The VCPU can be NULL in case we don't know and don't care.
We change all call sites to use this new interface. This still doesn't
give us the missing level IRQ handling, but at least prepares the callers
to do the right thing later automatically.
Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
---
xen/arch/arm/domain.c | 4 ++--
xen/arch/arm/gic-v3-lpi.c | 2 +-
xen/arch/arm/irq.c | 2 +-
xen/arch/arm/time.c | 2 +-
xen/arch/arm/vgic.c | 43 +++++++++++++++++++++++++------------------
xen/arch/arm/vpl011.c | 2 +-
xen/arch/arm/vtimer.c | 4 ++--
xen/include/asm-arm/vgic.h | 4 ++--
8 files changed, 35 insertions(+), 28 deletions(-)

On 12/02/18 11:59, Andre Przywara wrote:
> Hi,
Hi Andre,
> On 12/02/18 11:15, Julien Grall wrote:>> Hi Andre,>>>> On 09/02/18 14:38, Andre Przywara wrote:>>> diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c>>> index 5f47aa84a9..2fc6e19625 100644>>> --- a/xen/arch/arm/vgic.c>>> +++ b/xen/arch/arm/vgic.c>>> @@ -285,7 +285,7 @@ bool vgic_migrate_irq(struct vcpu *old, struct>>> vcpu *new, unsigned int irq)>>> vgic_remove_irq_from_queues(old, p);>>> irq_set_affinity(p->desc, cpumask_of(new->processor));>>> spin_unlock_irqrestore(&old->arch.vgic.lock, flags);>>> - vgic_vcpu_inject_irq(new, irq);>>> + vgic_inject_irq(new->domain, new, irq, true);>>> return true;>>> }>>> /* if the IRQ is in a GICH_LR register, set GIC_IRQ_GUEST_MIGRATING>>> @@ -444,7 +444,7 @@ bool vgic_to_sgi(struct vcpu *v, register_t sgir,>>> enum gic_sgi_mode irqmode,>>> sgir, target->list);>>> continue;>>> }>>> - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virq);>>> + vgic_inject_irq(d, d->vcpu[vcpuid], virq, true);>>> }>>> break;>>> case SGI_TARGET_OTHERS:>>> @@ -453,12 +453,12 @@ bool vgic_to_sgi(struct vcpu *v, register_t>>> sgir, enum gic_sgi_mode irqmode,>>> {>>> if ( i != current->vcpu_id && d->vcpu[i] != NULL &&>>> is_vcpu_online(d->vcpu[i]) )>>> - vgic_vcpu_inject_irq(d->vcpu[i], virq);>>> + vgic_inject_irq(d, d->vcpu[i], virq, true);>>> }>>> break;>>> case SGI_TARGET_SELF:>>> perfc_incr(vgic_sgi_self);>>> - vgic_vcpu_inject_irq(d->vcpu[current->vcpu_id], virq);>>> + vgic_inject_irq(d, current, virq, true);>>> break;>>> default:>>> gprintk(XENLOG_WARNING,>>> @@ -518,13 +518,29 @@ void vgic_remove_irq_from_queues(struct vcpu *v,>>> struct pending_irq *p)>>> gic_remove_from_lr_pending(v, p);>>> }>>> -void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq)>>> +int vgic_inject_irq(struct domain *d, struct vcpu *v, unsigned int virq,>>> + bool level)>>>> Looking at the code after the series has been applied, no one is caring>> about the return value of vgic_inject_irq. So what is the rationale>> behind changing the return type from void to int?> > The KVM version returns an error value, in particular when:> - the VGIC has not been initialized yet> - we can't determine the VCPU for a private interrupt> - the interrupt ID is invalid (SPI beyond limit, not mapped LPI)> In the moment it's not very useful for Xen: the first two conditions> don't really happen, consequently I removed those checks. But the third> check may become interesting once we get LPIs. Also since Xen currently> uses a void prototype for injection, *this* patch *now* doesn't exploit> the newly gained possibility of properly handling errors. From briefly> checking all the users, all of them seem to be in void functions, so> indeed an error return is not very useful.> The reasons I kept it in was to allow introduction of checks later. I> think having a function returning an error where some users ignore this> is better than the other way round.
I don't think it is much better. This is a way to expose yet another
security issue because the return is not correctly checked (see XSA-246
for instance). Any return value should be checked or have a comment
explaining why it is fine.
> > So of course I can easily make this void, but I wonder what we do in> those cases where the SPI is not valid, for instance? Shall we print> some (rate-limited) warning?
I can understand why KVM needs such interface as the interrupt
controller may be emulated QEMU. But I can't see why a SPI would not be
valid in Xen context (except programming error). So could give an example?
What would you expect the caller to do on error? Except printing an
error message?
Cheers,

Hi,
On 12/02/18 12:19, Julien Grall wrote:
> > > On 12/02/18 11:59, Andre Przywara wrote:>> Hi,> > Hi Andre,> >> On 12/02/18 11:15, Julien Grall wrote:>>> Hi Andre,>>>>>> On 09/02/18 14:38, Andre Przywara wrote:>>>> diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c>>>> index 5f47aa84a9..2fc6e19625 100644>>>> --- a/xen/arch/arm/vgic.c>>>> +++ b/xen/arch/arm/vgic.c>>>> @@ -285,7 +285,7 @@ bool vgic_migrate_irq(struct vcpu *old, struct>>>> vcpu *new, unsigned int irq)>>>> vgic_remove_irq_from_queues(old, p);>>>> irq_set_affinity(p->desc, cpumask_of(new->processor));>>>> spin_unlock_irqrestore(&old->arch.vgic.lock, flags);>>>> - vgic_vcpu_inject_irq(new, irq);>>>> + vgic_inject_irq(new->domain, new, irq, true);>>>> return true;>>>> }>>>> /* if the IRQ is in a GICH_LR register, set>>>> GIC_IRQ_GUEST_MIGRATING>>>> @@ -444,7 +444,7 @@ bool vgic_to_sgi(struct vcpu *v, register_t sgir,>>>> enum gic_sgi_mode irqmode,>>>> sgir, target->list);>>>> continue;>>>> }>>>> - vgic_vcpu_inject_irq(d->vcpu[vcpuid], virq);>>>> + vgic_inject_irq(d, d->vcpu[vcpuid], virq, true);>>>> }>>>> break;>>>> case SGI_TARGET_OTHERS:>>>> @@ -453,12 +453,12 @@ bool vgic_to_sgi(struct vcpu *v, register_t>>>> sgir, enum gic_sgi_mode irqmode,>>>> {>>>> if ( i != current->vcpu_id && d->vcpu[i] != NULL &&>>>> is_vcpu_online(d->vcpu[i]) )>>>> - vgic_vcpu_inject_irq(d->vcpu[i], virq);>>>> + vgic_inject_irq(d, d->vcpu[i], virq, true);>>>> }>>>> break;>>>> case SGI_TARGET_SELF:>>>> perfc_incr(vgic_sgi_self);>>>> - vgic_vcpu_inject_irq(d->vcpu[current->vcpu_id], virq);>>>> + vgic_inject_irq(d, current, virq, true);>>>> break;>>>> default:>>>> gprintk(XENLOG_WARNING,>>>> @@ -518,13 +518,29 @@ void vgic_remove_irq_from_queues(struct vcpu *v,>>>> struct pending_irq *p)>>>> gic_remove_from_lr_pending(v, p);>>>> }>>>> -void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int virq)>>>> +int vgic_inject_irq(struct domain *d, struct vcpu *v, unsigned int>>>> virq,>>>> + bool level)>>>>>> Looking at the code after the series has been applied, no one is caring>>> about the return value of vgic_inject_irq. So what is the rationale>>> behind changing the return type from void to int?>>>> The KVM version returns an error value, in particular when:>> - the VGIC has not been initialized yet>> - we can't determine the VCPU for a private interrupt>> - the interrupt ID is invalid (SPI beyond limit, not mapped LPI)>> In the moment it's not very useful for Xen: the first two conditions>> don't really happen, consequently I removed those checks. But the third>> check may become interesting once we get LPIs. Also since Xen currently>> uses a void prototype for injection, *this* patch *now* doesn't exploit>> the newly gained possibility of properly handling errors. From briefly>> checking all the users, all of them seem to be in void functions, so>> indeed an error return is not very useful.>> The reasons I kept it in was to allow introduction of checks later. I>> think having a function returning an error where some users ignore this>> is better than the other way round.> > I don't think it is much better. This is a way to expose yet another> security issue because the return is not correctly checked (see XSA-246> for instance). Any return value should be checked or have a comment> explaining why it is fine.> >>>> So of course I can easily make this void, but I wonder what we do in>> those cases where the SPI is not valid, for instance? Shall we print>> some (rate-limited) warning?> > I can understand why KVM needs such interface as the interrupt> controller may be emulated QEMU.
It is also that interrupts from emulated devices are injected from QEMU
in userland, and the ioctl used for that can and will return an error.
So we can propagate this condition to the device. If and what the
devices does with that information, is another question, though, but out
of scope for KVM.
> But I can't see why a SPI would not be> valid in Xen context (except programming error). So could give an example?
In KVM the KVM_IRQ_LINE ioctl allows to inject an arbitrary number, so
checking this and returning an error is natural and mandatory.
> What would you expect the caller to do on error? Except printing an> error message?
I don't know either. Comparing this to hardware, an IRQ is usually
fire-and-forget (separating the interrupt line from the interrupt state
here), so a device doesn't really handle the case when an IRQ does not
make it through (it can't know easily anyway). However the whole state
machine might get busted in the process (if no one lowers the line, for
instance).
So looking at this printing a message looks like the best choice.
I checked all users of vgic_inject_irq(), at the moment all IRQ numbers
passed in look safe: they are either hardcoded (timer, evtchn) or
validated before (hardware IRQs, when they are tied to a virtual IRQ).
So indeed we *should* never see an invalid IRQ number, at the moment.
I need to check how this changes with the ITS, though.
So we could change the prototype (back) to void, but print some error
message if the vgic_get_irq() call fails within vgic_inject_irq().
Cheers,
Andre.

Hi,
On 12/02/18 14:24, Andre Przywara wrote:
>> What would you expect the caller to do on error? Except printing an>> error message?> > I don't know either. Comparing this to hardware, an IRQ is usually> fire-and-forget (separating the interrupt line from the interrupt state> here), so a device doesn't really handle the case when an IRQ does not> make it through (it can't know easily anyway). However the whole state> machine might get busted in the process (if no one lowers the line, for> instance).> So looking at this printing a message looks like the best choice.> > I checked all users of vgic_inject_irq(), at the moment all IRQ numbers> passed in look safe: they are either hardcoded (timer, evtchn) or> validated before (hardware IRQs, when they are tied to a virtual IRQ).> So indeed we *should* never see an invalid IRQ number, at the moment.> I need to check how this changes with the ITS, though.> > So we could change the prototype (back) to void, but print some error> message if the vgic_get_irq() call fails within vgic_inject_irq().
Sounds good to me. Make sure to have those message using the log level
guest debug message. I might even be tempt to use dgprintk(...) here so
they get dropped in non-debug build.
Cheers,