[Qemu-devel] [PATCH v11 0/5] migration/ppc: migrating DRC and ccs_list

Daniel Henrique Barboza posted 5 patches 6 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20170522193551.826-1-danielhb@linux.vnet.ibm.com
Test checkpatch passed
Test docker passed
Test s390x passed
hw/ppc/spapr.c              | 175 +++++++++++++++++++++++++++++++++++---------
hw/ppc/spapr_drc.c          |  92 +++++++++++++++++++----
hw/ppc/spapr_pci.c          |   5 +-
include/hw/pci-host/spapr.h |   3 +
include/hw/ppc/spapr.h      |  10 +++
include/hw/ppc/spapr_drc.h  |   8 +-
6 files changed, 233 insertions(+), 60 deletions(-)
[Qemu-devel] [PATCH v11 0/5] migration/ppc: migrating DRC and ccs_list
Posted by Daniel Henrique Barboza 6 years, 10 months ago
v11:
- rebased with dgibson/ppc-for-2.10 branch
- patch 1:
    * use PCDIMMDevice* as index of pending_dimm_unplugs list instead of
using its uint64_t address;
    * spapr_del_lmbs() function was merged with spapr_memory_unplug_request();
    * wherever applicable, retrieve the machine by using HotplugHandler;
    * added more info about the sPAPRDIMMState cache in the comment of
spapr.h.

v10:
- removed 'migrating pending_events' patch this series
- patch 1:
    * removed extra line between definitions;
    * removed spapr_pending_dimms functions definitons from spapr.h
    * turned spapr_pending_dimms functions into static
- patch 2:
    * fixed the switch() statement - PHB and VIO cases goes to default,
default now executes assert()
- patch 3:
    * minor style changes/fixes
    * changed switch default to execute assert() and now uses the same
logic for both CPU and LMB DRCs 
- patch 4 (*new*):
    * this new patch implements a new function to recover the pending DIMM
unplug LMB state inside the spapr_lmb_release callback

v9:
- patch 1 (*new*): added a qtail in sPAPRMachineState called pending_dimm_unplugs
that stores the DIMM LMB state during the unplug process.
- patch 2 (*new*): merged v8-patch1 and v8-patch2: removing detach_cb and
detach_cb_opaque.
- patch 3:
    * removed dk->vmsd entry. We're using vmstate_register instead
    * added 'awaiting_allocation' flag in the DRC migration
- patch 4 (*new*): migrating spapr->pending_dimm_unplugs qtailq to allow
for an ongoing PCDIMM unplug to continue after a migration.

v8:
- new patch added: 'removing spapr_drc_detach_cb opaques'. This new patch removes
the need for the detach_cb_opaques inside the removal callback functions. See
the commit message of the patch for more info.

v7:
- removed the first patch. DRC registration is now done by vmstate_register
in patch 2.
- added a new patch that changes spapr_dr_connector_new to receive as argument
the detach_cb.
- removed the callback logic of patch 2 since there is no need to restore the
detach_cb on post-load due to the detach_cb on spapr_dr_connector_new change.
- added word separators in the VMSD names of patch 3 and 4.

v6: - Rebased with QEMU master after 6+ months.
    - Simplified the logic in patch 1.
    - Reworked patch 2: added CPU DRC migration, removed a function pointer from DRC
class and minor improvements.
    - Added clarifications from the previous v5 discussions in the commit messages.

v5: - Rebased to David's ppc-for-2.8.

v4: - Introduce a way to set customized instance_id in SaveStateEntry. Use it
      to set instance_id for DRC using its unique index to address David 
      Gibson's concern.
    - Rename VMS_CSTM to VMS_LINKED based on Paolo Bonzini's suggestions.
    - Clean up qjson stuff in put_qtailq. 
    - Add trace for put_qtailq and get_qtailq based on David Gilbert's 
      suggestion.

    - Based on David's ppc-for-2.7. 

v3: - Simplify overall design followng discussion with Paolo. No longer need
      metadata to migrate QTAILQ.
    - Extend VMStateInfo instead of adding similar fields to VMStateField.
    - Clean up macros in qemu/queue.h.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg05695.html)

v2: - Introduce a general approach to migrate QTAILQ in qemu/queue.h.
    - Migrate signalled field in the DRC state.
    - Put the newly added migrating fields in subsections so that backward 
      migration is not broken.  
    - Set detach_cb field right after migration so that a migrated hot-unplug
      event could finish its course.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg04188.html)

v1: - Inital version.
(link: https://lists.nongnu.org/archive/html/qemu-devel/2016-04/msg02601.html)


To make guest devices (PCI, CPU and memory) hotplug work together 
with guest migration, spapr drc state needs be transmitted in
migration. This patch defines the VMStateDescription struct for
spapr drc state to enable it.

To fix the potential racing between hotplug events on guest and 
guest migration and ccs_list of spapr state need be transmitted in
migration. This patch set also takes care of it.


Daniel Henrique Barboza (4):
  hw/ppc/spapr.c: adding pending_dimm_unplugs to sPAPRMachineState
  hw/ppc: removing drc->detach_cb and drc->detach_cb_opaque
  hw/ppc: migrating the DRC state of hotplugged devices
  hw/ppc/spapr.c: recover pending LMB unplug info in spapr_lmb_release

Jianjun Duan (1):
  migration: spapr: migrate ccs_list in spapr state

 hw/ppc/spapr.c              | 175 +++++++++++++++++++++++++++++++++++---------
 hw/ppc/spapr_drc.c          |  92 +++++++++++++++++++----
 hw/ppc/spapr_pci.c          |   5 +-
 include/hw/pci-host/spapr.h |   3 +
 include/hw/ppc/spapr.h      |  10 +++
 include/hw/ppc/spapr_drc.h  |   8 +-
 6 files changed, 233 insertions(+), 60 deletions(-)

-- 
2.9.4


Re: [Qemu-devel] [PATCH v11 0/5] migration/ppc: migrating DRC and ccs_list
Posted by David Gibson 6 years, 10 months ago
I've merged 1..4 with some minor changes for style and error
handling.  5/5 I still need to review in a bit more detail.

On Mon, May 22, 2017 at 04:35:46PM -0300, Daniel Henrique Barboza wrote:
> v11:
> - rebased with dgibson/ppc-for-2.10 branch
> - patch 1:
>     * use PCDIMMDevice* as index of pending_dimm_unplugs list instead of
> using its uint64_t address;
>     * spapr_del_lmbs() function was merged with spapr_memory_unplug_request();
>     * wherever applicable, retrieve the machine by using HotplugHandler;
>     * added more info about the sPAPRDIMMState cache in the comment of
> spapr.h.
> 
> v10:
> - removed 'migrating pending_events' patch this series
> - patch 1:
>     * removed extra line between definitions;
>     * removed spapr_pending_dimms functions definitons from spapr.h
>     * turned spapr_pending_dimms functions into static
> - patch 2:
>     * fixed the switch() statement - PHB and VIO cases goes to default,
> default now executes assert()
> - patch 3:
>     * minor style changes/fixes
>     * changed switch default to execute assert() and now uses the same
> logic for both CPU and LMB DRCs 
> - patch 4 (*new*):
>     * this new patch implements a new function to recover the pending DIMM
> unplug LMB state inside the spapr_lmb_release callback
> 
> v9:
> - patch 1 (*new*): added a qtail in sPAPRMachineState called pending_dimm_unplugs
> that stores the DIMM LMB state during the unplug process.
> - patch 2 (*new*): merged v8-patch1 and v8-patch2: removing detach_cb and
> detach_cb_opaque.
> - patch 3:
>     * removed dk->vmsd entry. We're using vmstate_register instead
>     * added 'awaiting_allocation' flag in the DRC migration
> - patch 4 (*new*): migrating spapr->pending_dimm_unplugs qtailq to allow
> for an ongoing PCDIMM unplug to continue after a migration.
> 
> v8:
> - new patch added: 'removing spapr_drc_detach_cb opaques'. This new patch removes
> the need for the detach_cb_opaques inside the removal callback functions. See
> the commit message of the patch for more info.
> 
> v7:
> - removed the first patch. DRC registration is now done by vmstate_register
> in patch 2.
> - added a new patch that changes spapr_dr_connector_new to receive as argument
> the detach_cb.
> - removed the callback logic of patch 2 since there is no need to restore the
> detach_cb on post-load due to the detach_cb on spapr_dr_connector_new change.
> - added word separators in the VMSD names of patch 3 and 4.
> 
> v6: - Rebased with QEMU master after 6+ months.
>     - Simplified the logic in patch 1.
>     - Reworked patch 2: added CPU DRC migration, removed a function pointer from DRC
> class and minor improvements.
>     - Added clarifications from the previous v5 discussions in the commit messages.
> 
> v5: - Rebased to David's ppc-for-2.8.
> 
> v4: - Introduce a way to set customized instance_id in SaveStateEntry. Use it
>       to set instance_id for DRC using its unique index to address David 
>       Gibson's concern.
>     - Rename VMS_CSTM to VMS_LINKED based on Paolo Bonzini's suggestions.
>     - Clean up qjson stuff in put_qtailq. 
>     - Add trace for put_qtailq and get_qtailq based on David Gilbert's 
>       suggestion.
> 
>     - Based on David's ppc-for-2.7. 
> 
> v3: - Simplify overall design followng discussion with Paolo. No longer need
>       metadata to migrate QTAILQ.
>     - Extend VMStateInfo instead of adding similar fields to VMStateField.
>     - Clean up macros in qemu/queue.h.
> (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg05695.html)
> 
> v2: - Introduce a general approach to migrate QTAILQ in qemu/queue.h.
>     - Migrate signalled field in the DRC state.
>     - Put the newly added migrating fields in subsections so that backward 
>       migration is not broken.  
>     - Set detach_cb field right after migration so that a migrated hot-unplug
>       event could finish its course.
> (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-05/msg04188.html)
> 
> v1: - Inital version.
> (link: https://lists.nongnu.org/archive/html/qemu-devel/2016-04/msg02601.html)
> 
> 
> To make guest devices (PCI, CPU and memory) hotplug work together 
> with guest migration, spapr drc state needs be transmitted in
> migration. This patch defines the VMStateDescription struct for
> spapr drc state to enable it.
> 
> To fix the potential racing between hotplug events on guest and 
> guest migration and ccs_list of spapr state need be transmitted in
> migration. This patch set also takes care of it.
> 
> 
> Daniel Henrique Barboza (4):
>   hw/ppc/spapr.c: adding pending_dimm_unplugs to sPAPRMachineState
>   hw/ppc: removing drc->detach_cb and drc->detach_cb_opaque
>   hw/ppc: migrating the DRC state of hotplugged devices
>   hw/ppc/spapr.c: recover pending LMB unplug info in spapr_lmb_release
> 
> Jianjun Duan (1):
>   migration: spapr: migrate ccs_list in spapr state
> 
>  hw/ppc/spapr.c              | 175 +++++++++++++++++++++++++++++++++++---------
>  hw/ppc/spapr_drc.c          |  92 +++++++++++++++++++----
>  hw/ppc/spapr_pci.c          |   5 +-
>  include/hw/pci-host/spapr.h |   3 +
>  include/hw/ppc/spapr.h      |  10 +++
>  include/hw/ppc/spapr_drc.h  |   8 +-
>  6 files changed, 233 insertions(+), 60 deletions(-)
> 

-- 
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