[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH v10 08/11] x86/hvm: Add handler for save_one funcs



On Jo, 2018-07-05 at 08:33 +0000, Paul Durrant wrote:
> > 
> > -----Original Message-----
> > From: Alexandru Isaila [mailto:aisaila@xxxxxxxxxxxxxxx]
> > Sent: 04 July 2018 14:32
> > To: xen-devel@xxxxxxxxxxxxx
> > Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxx>; Wei Liu <wei.liu2@citrix.
> > com>;
> > jbeulich@xxxxxxxx; Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>; Paul
> > Durrant <Paul.Durrant@xxxxxxxxxx>; Alexandru Isaila
> > <aisaila@xxxxxxxxxxxxxxx>
> > Subject: [PATCH v10 08/11] x86/hvm: Add handler for save_one funcs
> > 
> > Signed-off-by: Alexandru Isaila <aisaila@xxxxxxxxxxxxxxx>
> Patch looks ok so...
> 
> Reviewed-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
> 
> but...
> 
> > 
> > 
> > ---
> > Changes since V8:
> >     - Add comment for the handler return values.
> ...I don't see any comment. Am I missing something?

I've removed the comment and added a return enum that has the members
defined explicit. The change is done in patch 10.
> > ---
> >  xen/arch/x86/cpu/mcheck/vmce.c | 1 +
> >  xen/arch/x86/hvm/hpet.c        | 2 +-
> >  xen/arch/x86/hvm/hvm.c         | 6 +++++-
> >  xen/arch/x86/hvm/i8254.c       | 2 +-
> >  xen/arch/x86/hvm/irq.c         | 6 +++---
> >  xen/arch/x86/hvm/mtrr.c        | 4 ++--
> >  xen/arch/x86/hvm/pmtimer.c     | 2 +-
> >  xen/arch/x86/hvm/rtc.c         | 2 +-
> >  xen/arch/x86/hvm/save.c        | 5 ++++-
> >  xen/arch/x86/hvm/vioapic.c     | 2 +-
> >  xen/arch/x86/hvm/viridian.c    | 3 ++-
> >  xen/arch/x86/hvm/vlapic.c      | 4 ++--
> >  xen/arch/x86/hvm/vpic.c        | 2 +-
> >  xen/include/asm-x86/hvm/save.h | 6 +++++-
> >  14 files changed, 30 insertions(+), 17 deletions(-)
> > 
> > diff --git a/xen/arch/x86/cpu/mcheck/vmce.c
> > b/xen/arch/x86/cpu/mcheck/vmce.c
> > index 8a1fbfc..29898a6 100644
> > --- a/xen/arch/x86/cpu/mcheck/vmce.c
> > +++ b/xen/arch/x86/cpu/mcheck/vmce.c
> > @@ -396,6 +396,7 @@ static int vmce_load_vcpu_ctxt(struct domain
> > *d,
> > hvm_domain_context_t *h)
> >  }
> > 
> >  HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt,
> > +                          vmce_save_vcpu_ctxt_one,
> >                            vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU);
> > 
> >  /*
> > diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c
> > index 2837709..aff8613 100644
> > --- a/xen/arch/x86/hvm/hpet.c
> > +++ b/xen/arch/x86/hvm/hpet.c
> > @@ -640,7 +640,7 @@ static int hpet_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1,
> > HVMSR_PER_DOM);
> > +HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, NULL, hpet_load, 1,
> > HVMSR_PER_DOM);
> > 
> >  static void hpet_set(HPETState *h)
> >  {
> > diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
> > index 9ff9954..7d2a12d 100644
> > --- a/xen/arch/x86/hvm/hvm.c
> > +++ b/xen/arch/x86/hvm/hvm.c
> > @@ -784,6 +784,7 @@ static int hvm_load_tsc_adjust(struct domain
> > *d,
> > hvm_domain_context_t *h)
> >  }
> > 
> >  HVM_REGISTER_SAVE_RESTORE(TSC_ADJUST, hvm_save_tsc_adjust,
> > +                          hvm_save_tsc_adjust_one,
> >                            hvm_load_tsc_adjust, 1, HVMSR_PER_VCPU);
> > 
> >  static int hvm_save_cpu_ctxt_one(struct vcpu *v,
> > hvm_domain_context_t
> > *h)
> > @@ -1181,7 +1182,8 @@ static int hvm_load_cpu_ctxt(struct domain
> > *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt,
> > hvm_load_cpu_ctxt,
> > +HVM_REGISTER_SAVE_RESTORE(CPU, hvm_save_cpu_ctxt,
> > hvm_save_cpu_ctxt_one,
> > +                          hvm_load_cpu_ctxt,
> >                            1, HVMSR_PER_VCPU);
> > 
> >  #define HVM_CPU_XSAVE_SIZE(xcr0) (offsetof(struct
> > hvm_hw_cpu_xsave,
> > \
> > @@ -1528,6 +1530,7 @@ static int __init
> > hvm_register_CPU_save_and_restore(void)
> >      hvm_register_savevm(CPU_XSAVE_CODE,
> >                          "CPU_XSAVE",
> >                          hvm_save_cpu_xsave_states,
> > +                        hvm_save_cpu_xsave_states_one,
> >                          hvm_load_cpu_xsave_states,
> >                          HVM_CPU_XSAVE_SIZE(xfeature_mask) +
> >                              sizeof(struct hvm_save_descriptor),
> > @@ -1540,6 +1543,7 @@ static int __init
> > hvm_register_CPU_save_and_restore(void)
> >          hvm_register_savevm(CPU_MSR_CODE,
> >                              "CPU_MSR",
> >                              hvm_save_cpu_msrs,
> > +                            hvm_save_cpu_msrs_one,
> >                              hvm_load_cpu_msrs,
> >                              HVM_CPU_MSR_SIZE(msr_count_max) +
> >                                  sizeof(struct
> > hvm_save_descriptor),
> > diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
> > index 992f08d..ec77b23 100644
> > --- a/xen/arch/x86/hvm/i8254.c
> > +++ b/xen/arch/x86/hvm/i8254.c
> > @@ -437,7 +437,7 @@ static int pit_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, pit_load, 1,
> > HVMSR_PER_DOM);
> > +HVM_REGISTER_SAVE_RESTORE(PIT, pit_save, NULL, pit_load, 1,
> > HVMSR_PER_DOM);
> > 
> >  void pit_reset(struct domain *d)
> >  {
> > diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
> > index c85d004..770eab7 100644
> > --- a/xen/arch/x86/hvm/irq.c
> > +++ b/xen/arch/x86/hvm/irq.c
> > @@ -764,9 +764,9 @@ static int irq_load_link(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(PCI_IRQ, irq_save_pci, irq_load_pci,
> > +HVM_REGISTER_SAVE_RESTORE(PCI_IRQ, irq_save_pci, NULL,
> > irq_load_pci,
> >                            1, HVMSR_PER_DOM);
> > -HVM_REGISTER_SAVE_RESTORE(ISA_IRQ, irq_save_isa, irq_load_isa,
> > +HVM_REGISTER_SAVE_RESTORE(ISA_IRQ, irq_save_isa, NULL,
> > irq_load_isa,
> >                            1, HVMSR_PER_DOM);
> > -HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, irq_load_link,
> > +HVM_REGISTER_SAVE_RESTORE(PCI_LINK, irq_save_link, NULL,
> > irq_load_link,
> >                            1, HVMSR_PER_DOM);
> > diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c
> > index 9bbff59..ff9ff69 100644
> > --- a/xen/arch/x86/hvm/mtrr.c
> > +++ b/xen/arch/x86/hvm/mtrr.c
> > @@ -819,8 +819,8 @@ static int hvm_load_mtrr_msr(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr,
> > hvm_load_mtrr_msr,
> > -                          1, HVMSR_PER_VCPU);
> > +HVM_REGISTER_SAVE_RESTORE(MTRR, hvm_save_mtrr_msr,
> > hvm_save_mtrr_msr_one,
> > +                          hvm_load_mtrr_msr, 1, HVMSR_PER_VCPU);
> > 
> >  void memory_type_changed(struct domain *d)
> >  {
> > diff --git a/xen/arch/x86/hvm/pmtimer.c
> > b/xen/arch/x86/hvm/pmtimer.c
> > index 435647f..0a5e8ce 100644
> > --- a/xen/arch/x86/hvm/pmtimer.c
> > +++ b/xen/arch/x86/hvm/pmtimer.c
> > @@ -309,7 +309,7 @@ static int acpi_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(PMTIMER, acpi_save, acpi_load,
> > +HVM_REGISTER_SAVE_RESTORE(PMTIMER, acpi_save, NULL, acpi_load,
> >                            1, HVMSR_PER_DOM);
> > 
> >  int pmtimer_change_ioport(struct domain *d, unsigned int version)
> > diff --git a/xen/arch/x86/hvm/rtc.c b/xen/arch/x86/hvm/rtc.c
> > index cb75b99..ce7e71b 100644
> > --- a/xen/arch/x86/hvm/rtc.c
> > +++ b/xen/arch/x86/hvm/rtc.c
> > @@ -783,7 +783,7 @@ static int rtc_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, rtc_load, 1,
> > HVMSR_PER_DOM);
> > +HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, NULL, rtc_load, 1,
> > HVMSR_PER_DOM);
> > 
> >  void rtc_reset(struct domain *d)
> >  {
> > diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c
> > index 8984a23..b674937 100644
> > --- a/xen/arch/x86/hvm/save.c
> > +++ b/xen/arch/x86/hvm/save.c
> > @@ -85,16 +85,18 @@ int arch_hvm_load(struct domain *d, struct
> > hvm_save_header *hdr)
> >  /* List of handlers for various HVM save and restore types */
> >  static struct {
> >      hvm_save_handler save;
> > +    hvm_save_one_handler save_one;
> >      hvm_load_handler load;
> >      const char *name;
> >      size_t size;
> >      int kind;
> > -} hvm_sr_handlers[HVM_SAVE_CODE_MAX + 1] = { {NULL, NULL, "<?>"},
> > };
> > +} hvm_sr_handlers[HVM_SAVE_CODE_MAX + 1] = { {NULL, NULL, NULL,
> > "<?>"}, };
> > 
> >  /* Init-time function to add entries to that list */
> >  void __init hvm_register_savevm(uint16_t typecode,
> >                                  const char *name,
> >                                  hvm_save_handler save_state,
> > +                                hvm_save_one_handler save_one,
> >                                  hvm_load_handler load_state,
> >                                  size_t size, int kind)
> >  {
> > @@ -102,6 +104,7 @@ void __init hvm_register_savevm(uint16_t
> > typecode,
> >      ASSERT(hvm_sr_handlers[typecode].save == NULL);
> >      ASSERT(hvm_sr_handlers[typecode].load == NULL);
> >      hvm_sr_handlers[typecode].save = save_state;
> > +    hvm_sr_handlers[typecode].save_one = save_one;
> >      hvm_sr_handlers[typecode].load = load_state;
> >      hvm_sr_handlers[typecode].name = name;
> >      hvm_sr_handlers[typecode].size = size;
> > diff --git a/xen/arch/x86/hvm/vioapic.c
> > b/xen/arch/x86/hvm/vioapic.c
> > index 97b419f..66f54e4 100644
> > --- a/xen/arch/x86/hvm/vioapic.c
> > +++ b/xen/arch/x86/hvm/vioapic.c
> > @@ -601,7 +601,7 @@ static int ioapic_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return hvm_load_entry(IOAPIC, h, &s->domU);
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(IOAPIC, ioapic_save, ioapic_load, 1,
> > HVMSR_PER_DOM);
> > +HVM_REGISTER_SAVE_RESTORE(IOAPIC, ioapic_save, NULL, ioapic_load,
> > 1,
> > HVMSR_PER_DOM);
> > 
> >  void vioapic_reset(struct domain *d)
> >  {
> > diff --git a/xen/arch/x86/hvm/viridian.c
> > b/xen/arch/x86/hvm/viridian.c
> > index 1e87cd6..466e015 100644
> > --- a/xen/arch/x86/hvm/viridian.c
> > +++ b/xen/arch/x86/hvm/viridian.c
> > @@ -1023,7 +1023,7 @@ static int viridian_load_domain_ctxt(struct
> > domain
> > *d, hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_DOMAIN,
> > viridian_save_domain_ctxt,
> > +HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_DOMAIN,
> > viridian_save_domain_ctxt, NULL,
> >                            viridian_load_domain_ctxt, 1,
> > HVMSR_PER_DOM);
> > 
> >  static int viridian_save_vcpu_ctxt_one(struct vcpu *v,
> > hvm_domain_context_t *h)
> > @@ -1083,6 +1083,7 @@ static int viridian_load_vcpu_ctxt(struct
> > domain *d,
> > hvm_domain_context_t *h)
> >  }
> > 
> >  HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_VCPU, viridian_save_vcpu_ctxt,
> > +                          viridian_save_vcpu_ctxt_one,
> >                            viridian_load_vcpu_ctxt, 1,
> > HVMSR_PER_VCPU);
> > 
> >  static int __init parse_viridian_version(const char *arg)
> > diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
> > index 1b9f00a..eff6070 100644
> > --- a/xen/arch/x86/hvm/vlapic.c
> > +++ b/xen/arch/x86/hvm/vlapic.c
> > @@ -1576,9 +1576,9 @@ static int lapic_load_regs(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(LAPIC, lapic_save_hidden,
> > lapic_load_hidden,
> > +HVM_REGISTER_SAVE_RESTORE(LAPIC, lapic_save_hidden, NULL,
> > lapic_load_hidden,
> >                            1, HVMSR_PER_VCPU);
> > -HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs,
> > lapic_load_regs,
> > +HVM_REGISTER_SAVE_RESTORE(LAPIC_REGS, lapic_save_regs, NULL,
> > lapic_load_regs,
> >                            1, HVMSR_PER_VCPU);
> > 
> >  int vlapic_init(struct vcpu *v)
> > diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c
> > index e160bbd..ca9b4cb 100644
> > --- a/xen/arch/x86/hvm/vpic.c
> > +++ b/xen/arch/x86/hvm/vpic.c
> > @@ -411,7 +411,7 @@ static int vpic_load(struct domain *d,
> > hvm_domain_context_t *h)
> >      return 0;
> >  }
> > 
> > -HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, vpic_load, 2,
> > HVMSR_PER_DOM);
> > +HVM_REGISTER_SAVE_RESTORE(PIC, vpic_save, NULL, vpic_load, 2,
> > HVMSR_PER_DOM);
> > 
> >  void vpic_reset(struct domain *d)
> >  {
> > diff --git a/xen/include/asm-x86/hvm/save.h b/xen/include/asm-
> > x86/hvm/save.h
> > index f889e8f..2538628 100644
> > --- a/xen/include/asm-x86/hvm/save.h
> > +++ b/xen/include/asm-x86/hvm/save.h
> > @@ -97,6 +97,8 @@ static inline uint16_t hvm_load_instance(struct
> > hvm_domain_context *h)
> >   * restoring.  Both return non-zero on error. */
> >  typedef int (*hvm_save_handler) (struct domain *d,
> >                                   hvm_domain_context_t *h);
> > +typedef int (*hvm_save_one_handler)(struct  vcpu *v,
> > +                                    hvm_domain_context_t *h);
> >  typedef int (*hvm_load_handler) (struct domain *d,
> >                                   hvm_domain_context_t *h);
> > 
> > @@ -105,6 +107,7 @@ typedef int (*hvm_load_handler) (struct domain
> > *d,
> >  void hvm_register_savevm(uint16_t typecode,
> >                           const char *name,
> >                           hvm_save_handler save_state,
> > +                         hvm_save_one_handler save_one,
> >                           hvm_load_handler load_state,
> >                           size_t size, int kind);
> > 
> > @@ -114,12 +117,13 @@ void hvm_register_savevm(uint16_t typecode,
> > 
> >  /* Syntactic sugar around that function: specify the max number of
> >   * saves, and this calculates the size of buffer needed */
> > -#define HVM_REGISTER_SAVE_RESTORE(_x, _save, _load, _num, _k)
> > \
> > +#define HVM_REGISTER_SAVE_RESTORE(_x, _save, _save_one, _load,
> > _num, _k)  \
> >  static int __init
> > __hvm_register_##_x##_save_and_restore(void)            \
> >  {                                                                 
> >         \
> >      hvm_register_savevm(HVM_SAVE_CODE(_x),                        
> >         \
> >                          #_x,                                      
> >         \
> >                          &_save,                                   
> >         \
> > +                        _save_one,                                
> >         \
> >                          &_load,                                   
> >         \
> >                          (_num) *
> > (HVM_SAVE_LENGTH(_x)                     \
> >                                    + sizeof (struct
> > hvm_save_descriptor)), \
> > --
> > 2.7.4
> 
> ________________________
> This email was scanned by Bitdefender
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.