| Message ID | 20180920103243.28474-15-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | memory-device: complete refactoring + virtio-pmem | expand |
On Thu, Sep 20, 2018 at 12:32:35PM +0200, David Hildenbrand wrote: > Let's trace the address when pre_pluggin/plugging/unplugging a memory device. > > Trace it when pre_plugging as well as when plugging, so we really know > when a specific address is actually used. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/mem/memory-device.c | 6 ++++++ > hw/mem/pc-dimm.c | 8 -------- > hw/mem/trace-events | 5 ++++- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c > index 3e5a3a7951..534bd38313 100644 > --- a/hw/mem/memory-device.c > +++ b/hw/mem/memory-device.c > @@ -17,6 +17,7 @@ > #include "qemu/range.h" > #include "hw/virtio/vhost.h" > #include "sysemu/kvm.h" > +#include "trace.h" > > static gint memory_device_addr_sort(gconstpointer a, gconstpointer b) > { > @@ -271,6 +272,9 @@ void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, > goto out; > } > mdc->set_addr(md, addr, &local_err); > + if (!local_err) { > + trace_memory_device_pre_assign_address(addr); > + } > out: > error_propagate(errp, local_err); > } > @@ -287,6 +291,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms) > > memory_region_add_subregion(&ms->device_memory->mr, > addr - ms->device_memory->base, mr); > + trace_memory_device_assign_address(addr); > } > > void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) > @@ -299,6 +304,7 @@ void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) > g_assert(ms->device_memory); > > memory_region_del_subregion(&ms->device_memory->mr, mr); > + trace_memory_device_unassign_address(mdc->get_addr(md)); > } > > uint64_t memory_device_get_region_size(const MemoryDeviceState *md, > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 915908b104..6c560304a1 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -33,7 +33,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, > const uint64_t *legacy_align, Error **errp) > { > Error *local_err = NULL; > - uint64_t addr; > int slot; > > slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, > @@ -48,13 +47,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, > > memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align, > &local_err); > - if (local_err) { > - goto out; > - } > - > - addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, > - &error_abort); > - trace_mhp_pc_dimm_assigned_address(addr); > out: > error_propagate(errp, local_err); > } > diff --git a/hw/mem/trace-events b/hw/mem/trace-events > index e150dcc497..b40482077e 100644 > --- a/hw/mem/trace-events > +++ b/hw/mem/trace-events > @@ -2,4 +2,7 @@ > > # hw/mem/pc-dimm.c > mhp_pc_dimm_assigned_slot(int slot) "%d" > -mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 > +# hw/mem/memory-device.c > +memory_device_pre_assign_address(uint64_t addr) "0x%"PRIx64 > +memory_device_assign_address(uint64_t addr) "0x%"PRIx64 > +memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
On Thu, 20 Sep 2018 12:32:35 +0200 David Hildenbrand <david@redhat.com> wrote: > Let's trace the address when pre_pluggin/plugging/unplugging a memory device. > > Trace it when pre_plugging as well as when plugging, so we really know > when a specific address is actually used. > > Signed-off-by: David Hildenbrand <david@redhat.com> aha, it's here after all. I'd squash it into 11/22 > --- > hw/mem/memory-device.c | 6 ++++++ > hw/mem/pc-dimm.c | 8 -------- > hw/mem/trace-events | 5 ++++- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c > index 3e5a3a7951..534bd38313 100644 > --- a/hw/mem/memory-device.c > +++ b/hw/mem/memory-device.c > @@ -17,6 +17,7 @@ > #include "qemu/range.h" > #include "hw/virtio/vhost.h" > #include "sysemu/kvm.h" > +#include "trace.h" > > static gint memory_device_addr_sort(gconstpointer a, gconstpointer b) > { > @@ -271,6 +272,9 @@ void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, > goto out; > } > mdc->set_addr(md, addr, &local_err); > + if (!local_err) { > + trace_memory_device_pre_assign_address(addr); > + } > out: > error_propagate(errp, local_err); > } > @@ -287,6 +291,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms) > > memory_region_add_subregion(&ms->device_memory->mr, > addr - ms->device_memory->base, mr); > + trace_memory_device_assign_address(addr); > } > > void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) > @@ -299,6 +304,7 @@ void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) > g_assert(ms->device_memory); > > memory_region_del_subregion(&ms->device_memory->mr, mr); > + trace_memory_device_unassign_address(mdc->get_addr(md)); > } > > uint64_t memory_device_get_region_size(const MemoryDeviceState *md, > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 915908b104..6c560304a1 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -33,7 +33,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, > const uint64_t *legacy_align, Error **errp) > { > Error *local_err = NULL; > - uint64_t addr; > int slot; > > slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, > @@ -48,13 +47,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, > > memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align, > &local_err); > - if (local_err) { > - goto out; > - } > - > - addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, > - &error_abort); > - trace_mhp_pc_dimm_assigned_address(addr); > out: > error_propagate(errp, local_err); > } > diff --git a/hw/mem/trace-events b/hw/mem/trace-events > index e150dcc497..b40482077e 100644 > --- a/hw/mem/trace-events > +++ b/hw/mem/trace-events > @@ -2,4 +2,7 @@ > > # hw/mem/pc-dimm.c > mhp_pc_dimm_assigned_slot(int slot) "%d" > -mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 > +# hw/mem/memory-device.c > +memory_device_pre_assign_address(uint64_t addr) "0x%"PRIx64 > +memory_device_assign_address(uint64_t addr) "0x%"PRIx64 > +memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
On 24/09/2018 15:54, Igor Mammedov wrote: > On Thu, 20 Sep 2018 12:32:35 +0200 > David Hildenbrand <david@redhat.com> wrote: > >> Let's trace the address when pre_pluggin/plugging/unplugging a memory device. >> >> Trace it when pre_plugging as well as when plugging, so we really know >> when a specific address is actually used. >> >> Signed-off-by: David Hildenbrand <david@redhat.com> > aha, it's here after all. > I'd squash it into 11/22 I'll leave it here, before "memory-device: complete factoring out ..." we don't have access to the memory device from memory_device_plug / memory_device_unplug. (that's the reason why I put this last)
On Tue, 25 Sep 2018 22:03:06 +0200 David Hildenbrand <david@redhat.com> wrote: > On 24/09/2018 15:54, Igor Mammedov wrote: > > On Thu, 20 Sep 2018 12:32:35 +0200 > > David Hildenbrand <david@redhat.com> wrote: > > > >> Let's trace the address when pre_pluggin/plugging/unplugging a memory device. > >> > >> Trace it when pre_plugging as well as when plugging, so we really know > >> when a specific address is actually used. > >> > >> Signed-off-by: David Hildenbrand <david@redhat.com> > > aha, it's here after all. > > I'd squash it into 11/22 > > I'll leave it here, before "memory-device: complete factoring out ..." > we don't have access to the memory device from memory_device_plug / > memory_device_unplug. > > (that's the reason why I put this last) it's a but confusing but not worth arguing over it, hence: Reviewed-by: Igor Mammedov <imammedo@redhat.com>
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 3e5a3a7951..534bd38313 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -17,6 +17,7 @@ #include "qemu/range.h" #include "hw/virtio/vhost.h" #include "sysemu/kvm.h" +#include "trace.h" static gint memory_device_addr_sort(gconstpointer a, gconstpointer b) { @@ -271,6 +272,9 @@ void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, goto out; } mdc->set_addr(md, addr, &local_err); + if (!local_err) { + trace_memory_device_pre_assign_address(addr); + } out: error_propagate(errp, local_err); } @@ -287,6 +291,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms) memory_region_add_subregion(&ms->device_memory->mr, addr - ms->device_memory->base, mr); + trace_memory_device_assign_address(addr); } void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) @@ -299,6 +304,7 @@ void memory_device_unplug(MemoryDeviceState *md, MachineState *ms) g_assert(ms->device_memory); memory_region_del_subregion(&ms->device_memory->mr, mr); + trace_memory_device_unassign_address(mdc->get_addr(md)); } uint64_t memory_device_get_region_size(const MemoryDeviceState *md, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 915908b104..6c560304a1 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -33,7 +33,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, const uint64_t *legacy_align, Error **errp) { Error *local_err = NULL; - uint64_t addr; int slot; slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, @@ -48,13 +47,6 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align, &local_err); - if (local_err) { - goto out; - } - - addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, - &error_abort); - trace_mhp_pc_dimm_assigned_address(addr); out: error_propagate(errp, local_err); } diff --git a/hw/mem/trace-events b/hw/mem/trace-events index e150dcc497..b40482077e 100644 --- a/hw/mem/trace-events +++ b/hw/mem/trace-events @@ -2,4 +2,7 @@ # hw/mem/pc-dimm.c mhp_pc_dimm_assigned_slot(int slot) "%d" -mhp_pc_dimm_assigned_address(uint64_t addr) "0x%"PRIx64 +# hw/mem/memory-device.c +memory_device_pre_assign_address(uint64_t addr) "0x%"PRIx64 +memory_device_assign_address(uint64_t addr) "0x%"PRIx64 +memory_device_unassign_address(uint64_t addr) "0x%"PRIx64
Let's trace the address when pre_pluggin/plugging/unplugging a memory device. Trace it when pre_plugging as well as when plugging, so we really know when a specific address is actually used. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/mem/memory-device.c | 6 ++++++ hw/mem/pc-dimm.c | 8 -------- hw/mem/trace-events | 5 ++++- 3 files changed, 10 insertions(+), 9 deletions(-)