From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uwb1z-0006xN-Fg for qemu-devel@nongnu.org; Tue, 09 Jul 2013 12:44:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uwavi-0004QC-P4 for qemu-devel@nongnu.org; Tue, 09 Jul 2013 12:39:16 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:60549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uwavi-0004Q4-HM for qemu-devel@nongnu.org; Tue, 09 Jul 2013 12:38:18 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Jul 2013 16:27:59 -0000 From: Anthony Liguori In-Reply-To: <20130709072035.GH2696@voom.redhat.com> References: <1372315560-5478-1-git-send-email-aik@ozlabs.ru> <1372315560-5478-9-git-send-email-aik@ozlabs.ru> <87sizozyjl.fsf@codemonkey.ws> <20130709072035.GH2696@voom.redhat.com> Date: Tue, 09 Jul 2013 11:26:26 -0500 Message-ID: <87d2qrr971.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 08/17] pseries: savevm support for PAPR TCE tables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Alexey Kardashevskiy , qemu-devel@nongnu.org, Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras David Gibson writes: > On Mon, Jul 08, 2013 at 01:39:26PM -0500, Anthony Liguori wrote: >> Alexey Kardashevskiy writes: >> >> > From: David Gibson >> > >> > This patch adds the necessary VMStateDescription information to save the >> > state of PAPR TCE tables (that is, the PAPR specified IOMMU). >> > >> > Signed-off-by: David Gibson >> > Signed-off-by: Alexey Kardashevskiy >> > --- >> > hw/ppc/spapr_iommu.c | 25 +++++++++++++++++++++++++ >> > 1 file changed, 25 insertions(+) >> > >> > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c >> > index 91bc8e4..ba1f7b6 100644 >> > --- a/hw/ppc/spapr_iommu.c >> > +++ b/hw/ppc/spapr_iommu.c >> > @@ -112,6 +112,25 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) >> > }; >> > } >> > >> > +static const VMStateDescription vmstate_spapr_tce_table = { >> > + .name = "spapr_iommu", >> > + .version_id = 1, >> > + .minimum_version_id = 1, >> > + .minimum_version_id_old = 1, >> > + .fields = (VMStateField []) { >> > + /* Sanity check */ >> > + VMSTATE_UINT32_EQUAL(liobn, sPAPRTCETable), >> > + VMSTATE_UINT32_EQUAL(window_size, sPAPRTCETable), >> > + >> > + /* IOMMU state */ >> > + VMSTATE_BOOL(bypass, sPAPRTCETable), >> > + VMSTATE_VBUFFER_DIVIDE(table, sPAPRTCETable, 0, NULL, 0, window_size, >> > + SPAPR_TCE_PAGE_SIZE / >> > sizeof(sPAPRTCE)), >> >> Not endian safe. I really don't get the divide bit at all either. > > So, the actual bug is that we're currently storing the TCE table > native endian, whereas it should be stored big endan always. > >> > + >> > + VMSTATE_END_OF_LIST() >> > + }, >> > +}; >> > + >> > static MemoryRegionIOMMUOps spapr_iommu_ops = { >> > .translate = spapr_tce_translate_iommu, >> > }; >> > @@ -156,6 +175,8 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) >> > >> > QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); >> > >> > + vmstate_register(NULL, tcet->liobn, &vmstate_spapr_tce_table, tcet); >> > + >> >> If you need to add these, then you need to do more QOM conversion. > > Again, it's not clear how this should be QOMed. Child of the device > constructing the TCE table? But since that can often be a bus bridge, > wouldn't the TCE table instances get confused with the real bus > devices. Only build tested. https://github.com/aliguori/qemu/commit/a47a391c875a69f203110811c730877da12f5b14 I'll put together a patch series once I have a chance to test properly. Regards, Anthony Liguori > > -- > 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