Commit a0aaca7e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191126' into staging 



ppc patch queue for 2019-11-26

Here's the first 4.2 hard freeze pull request from me.  This has:

  * A fix for some testcases that cause errors on older host kernels
    (e.g. RHEL7), with our new default configuration of VSMT mode
  * Changes to make VFIO devices interact properly with change of irq
    chip caused by PAPR feature negotiation.  This is more involved
    than I would like, but it's a problem in real use cases and I
    can't see an easier way to handle it.
  * Fix an error with ms6522 counters for the g3beige machine
  * Fix a coverity warning

# gpg: Signature made Tue 26 Nov 2019 05:52:16 GMT
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-4.2-20191126:
  ppc/spapr_events: fix potential NULL pointer dereference in rtas_event_log_dequeue
  mos6522: update counters when timer interrupts are off
  spapr: Work around spurious warnings from vfio INTx initialization
  spapr: Handle irq backend changes with VFIO PCI devices
  vfio/pci: Respond to KVM irqchip change notifier
  vfio/pci: Split vfio_intx_update()
  kvm: Introduce KVM irqchip change notifier
  pseries: fix migration-test and pxe-test

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3c48f6da 59d0533b

accel/kvm/kvm-all.c

+18 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ static const KVMCapabilityInfo kvm_required_capabilites[] = { 
    KVM_CAP_LAST_INFO

};



static NotifierList kvm_irqchip_change_notifiers =

    NOTIFIER_LIST_INITIALIZER(kvm_irqchip_change_notifiers);



#define kvm_slots_lock(kml)      qemu_mutex_lock(&(kml)->slots_lock)

#define kvm_slots_unlock(kml)    qemu_mutex_unlock(&(kml)->slots_lock)
@@ -1396,6 +1399,21 @@ void kvm_irqchip_release_virq(KVMState *s, int virq) 
    trace_kvm_irqchip_release_virq(virq);

}



void kvm_irqchip_add_change_notifier(Notifier *n)

{

    notifier_list_add(&kvm_irqchip_change_notifiers, n);

}



void kvm_irqchip_remove_change_notifier(Notifier *n)

{

    notifier_remove(n);

}



void kvm_irqchip_change_notify(void)

{

    notifier_list_notify(&kvm_irqchip_change_notifiers, NULL);

}



static unsigned int kvm_hash_msi(uint32_t data)

{

    /* This is optimized for IA32 MSI layout. However, no other arch shall

accel/stubs/kvm-stub.c

+12 −0
Original line number Diff line number Diff line
@@ -138,6 +138,18 @@ void kvm_irqchip_commit_routes(KVMState *s) 
{

}



void kvm_irqchip_add_change_notifier(Notifier *n)

{

}



void kvm_irqchip_remove_change_notifier(Notifier *n)

{

}



void kvm_irqchip_change_notify(void)

{

}



int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter)

{

    return -ENOSYS;

hw/misc/mos6522.c

+6 −2
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ static int64_t get_next_irq_time(MOS6522State *s, MOS6522Timer *ti, 
    int64_t d, next_time;

    unsigned int counter;



    if (ti->frequency == 0) {

        return INT64_MAX;

    }



    /* current counter value */

    d = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ti->load_time,

                 ti->frequency, NANOSECONDS_PER_SECOND);
@@ -149,10 +153,10 @@ static void mos6522_timer1_update(MOS6522State *s, MOS6522Timer *ti, 
    if (!ti->timer) {

        return;

    }

    ti->next_irq_time = get_next_irq_time(s, ti, current_time);

    if ((s->ier & T1_INT) == 0 || (s->acr & T1MODE) != T1MODE_CONT) {

        timer_del(ti->timer);

    } else {

        ti->next_irq_time = get_next_irq_time(s, ti, current_time);

        timer_mod(ti->timer, ti->next_irq_time);

    }

}
@@ -163,10 +167,10 @@ static void mos6522_timer2_update(MOS6522State *s, MOS6522Timer *ti, 
    if (!ti->timer) {

        return;

    }

    ti->next_irq_time = get_next_irq_time(s, ti, current_time);

    if ((s->ier & T2_INT) == 0) {

        timer_del(ti->timer);

    } else {

        ti->next_irq_time = get_next_irq_time(s, ti, current_time);

        timer_mod(ti->timer, ti->next_irq_time);

    }

}

hw/ppc/spapr_events.c

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static SpaprEventLogEntry *rtas_event_log_dequeue(SpaprMachineState *spapr, 
            rtas_event_log_to_source(spapr,

                                     spapr_event_log_entry_type(entry));



        g_assert(source);

        if (source->mask & event_mask) {

            break;

        }

hw/ppc/spapr_irq.c

+16 −1
Original line number Diff line number Diff line
@@ -373,6 +373,14 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp) 


    spapr->qirqs = qemu_allocate_irqs(spapr_set_irq, spapr,

                                      smc->nr_xirqs + SPAPR_XIRQ_BASE);



    /*

     * Mostly we don't actually need this until reset, except that not

     * having this set up can cause VFIO devices to issue a

     * false-positive warning during realize(), because they don't yet

     * have an in-kernel irq chip.

     */

    spapr_irq_update_active_intc(spapr);

}



int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **errp)
@@ -508,6 +516,12 @@ static void set_active_intc(SpaprMachineState *spapr, 
    }



    spapr->active_intc = new_intc;



    /*

     * We've changed the kernel irqchip, let VFIO devices know they

     * need to readjust.

     */

    kvm_irqchip_change_notify();

}



void spapr_irq_update_active_intc(SpaprMachineState *spapr)
@@ -522,7 +536,8 @@ void spapr_irq_update_active_intc(SpaprMachineState *spapr) 
         * this.

         */

        new_intc = SPAPR_INTC(spapr->xive);

    } else if (spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) {

    } else if (spapr->ov5_cas

               && spapr_ovec_test(spapr->ov5_cas, OV5_XIVE_EXPLOIT)) {

        new_intc = SPAPR_INTC(spapr->xive);

    } else {

        new_intc = SPAPR_INTC(spapr->ics);