Re: [Qemu-ppc] [PATCH v2 11/13] spapr: check for the activation of the KVM IRQ device

[David Gibson]

On Fri, Feb 22, 2019 at 02:13:20PM +0100, Cédric Le Goater wrote:
> The activation of the KVM IRQ device depends on the interrupt mode
> chosen at CAS time by the machine and some methods used at reset or by
> the migration need to be protected.
> 
> Signed-off-by: Cédric Le Goater <address@hidden>

Reviewed-by: David Gibson <address@hidden>

> ---
>  hw/intc/spapr_xive_kvm.c | 28 ++++++++++++++++++++++++++++
>  hw/intc/xics_kvm.c       | 26 +++++++++++++++++++++++++-
>  2 files changed, 53 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
> index e31035c90260..cd81cdb23a5e 100644
> --- a/hw/intc/spapr_xive_kvm.c
> +++ b/hw/intc/spapr_xive_kvm.c
> @@ -96,9 +96,15 @@ static void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, 
> Error **errp)
>  
>  void kvmppc_xive_cpu_get_state(XiveTCTX *tctx, Error **errp)
>  {
> +    sPAPRXive *xive = SPAPR_MACHINE(qdev_get_machine())->xive;
>      uint64_t state[4] = { 0 };
>      int ret;
>  
> +    /* The KVM XIVE device is not in use */
> +    if (xive->fd == -1) {
> +        return;
> +    }
> +
>      ret = kvm_get_one_reg(tctx->cs, KVM_REG_PPC_NVT_STATE, state);
>      if (ret != 0) {
>          error_setg_errno(errp, errno,
> @@ -152,6 +158,11 @@ void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error 
> **errp)
>      unsigned long vcpu_id;
>      int ret;
>  
> +    /* The KVM XIVE device is not in use */
> +    if (xive->fd == -1) {
> +        return;
> +    }
> +
>      /* Check if CPU was hot unplugged and replugged. */
>      if (kvm_cpu_is_enabled(tctx->cs)) {
>          return;
> @@ -330,9 +341,13 @@ static void kvmppc_xive_source_get_state(XiveSource 
> *xsrc)
>  void kvmppc_xive_source_set_irq(void *opaque, int srcno, int val)
>  {
>      XiveSource *xsrc = opaque;
> +    sPAPRXive *xive = SPAPR_XIVE(xsrc->xive);
>      struct kvm_irq_level args;
>      int rc;
>  
> +    /* The KVM XIVE device should be in use */
> +    assert(xive->fd != -1);
> +
>      args.irq = srcno;
>      if (!xive_source_irq_is_lsi(xsrc, srcno)) {
>          if (!val) {
> @@ -519,6 +534,11 @@ static void kvmppc_xive_change_state_handler(void 
> *opaque, int running,
>  
>  void kvmppc_xive_synchronize_state(sPAPRXive *xive, Error **errp)
>  {
> +    /* The KVM XIVE device is not in use */
> +    if (xive->fd == -1) {
> +        return;
> +    }
> +
>      /*
>       * When the VM is stopped, the sources are masked and the previous
>       * state is saved in anticipation of a migration. We should not
> @@ -544,6 +564,11 @@ int kvmppc_xive_pre_save(sPAPRXive *xive)
>  {
>      Error *local_err = NULL;
>  
> +    /* The KVM XIVE device is not in use */
> +    if (xive->fd == -1) {
> +        return 0;
> +    }
> +
>      /* EAT: there is no extra state to query from KVM */
>  
>      /* ENDT */
> @@ -568,6 +593,9 @@ int kvmppc_xive_post_load(sPAPRXive *xive, int version_id)
>      CPUState *cs;
>      int i;
>  
> +    /* The KVM XIVE device should be in use */
> +    assert(xive->fd != -1);
> +
>      /* Restore the ENDT first. The targetting depends on it. */
>      for (i = 0; i < xive->nr_ends; i++) {
>          kvmppc_xive_set_queue_config(xive, SPAPR_XIVE_BLOCK_ID, i,
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index 373de3155f6b..9855316e4831 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -69,6 +69,11 @@ void icp_get_kvm_state(ICPState *icp)
>      uint64_t state;
>      int ret;
>  
> +    /* The KVM XICS device is not in use */
> +    if (kernel_xics_fd == -1) {
> +        return;
> +    }
> +
>      /* ICP for this CPU thread is not in use, exiting */
>      if (!icp->cs) {
>          return;
> @@ -105,6 +110,11 @@ int icp_set_kvm_state(ICPState *icp)
>      uint64_t state;
>      int ret;
>  
> +    /* The KVM XICS device is not in use */
> +    if (kernel_xics_fd == -1) {
> +        return 0;
> +    }
> +
>      /* ICP for this CPU thread is not in use, exiting */
>      if (!icp->cs) {
>          return 0;
> @@ -133,8 +143,9 @@ void icp_kvm_realize(DeviceState *dev, Error **errp)
>      unsigned long vcpu_id;
>      int ret;
>  
> +    /* The KVM XICS device is not in use */
>      if (kernel_xics_fd == -1) {
> -        abort();
> +        return;
>      }
>  
>      cs = icp->cs;
> @@ -170,6 +181,11 @@ void ics_get_kvm_state(ICSState *ics)
>      uint64_t state;
>      int i;
>  
> +    /* The KVM XICS device is not in use */
> +    if (kernel_xics_fd == -1) {
> +        return;
> +    }
> +
>      for (i = 0; i < ics->nr_irqs; i++) {
>          ICSIRQState *irq = &ics->irqs[i];
>  
> @@ -269,6 +285,11 @@ int ics_set_kvm_state(ICSState *ics)
>  {
>      int i;
>  
> +    /* The KVM XICS device is not in use */
> +    if (kernel_xics_fd == -1) {
> +        return 0;
> +    }
> +
>      for (i = 0; i < ics->nr_irqs; i++) {
>          int ret;
>  
> @@ -286,6 +307,9 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)
>      struct kvm_irq_level args;
>      int rc;
>  
> +    /* The KVM XICS device should be in use */
> +    assert(kernel_xics_fd != -1);
> +
>      args.irq = srcno + ics->offset;
>      if (ics->irqs[srcno].flags & XICS_FLAGS_IRQ_MSI) {
>          if (!val) {

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature