From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJE56-0002zW-QY for qemu-devel@nongnu.org; Wed, 04 Feb 2015 23:30:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJE52-0008TX-So for qemu-devel@nongnu.org; Wed, 04 Feb 2015 23:30:20 -0500 Date: Thu, 5 Feb 2015 15:30:42 +1100 From: David Gibson Message-ID: <20150205043042.GP25675@voom.fritz.box> References: <1422523650-2888-1-git-send-email-aik@ozlabs.ru> <1422523650-2888-18-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="X78YbkCBd9ye7Cvs" Content-Disposition: inline In-Reply-To: <1422523650-2888-18-git-send-email-aik@ozlabs.ru> Subject: Re: [Qemu-devel] [PATCH v4 17/18] target-ppc: kvm: make use of KVM_CREATE_SPAPR_TCE_64 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: Alex Williamson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf --X78YbkCBd9ye7Cvs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 29, 2015 at 08:27:29PM +1100, Alexey Kardashevskiy wrote: > Signed-off-by: Alexey Kardashevskiy Needs a commit message, in particular explaining what KVM_CREATE_SPAPR_TCE_64 is and why we want it. I mean, I can guess, but I wrote the original KVM_CREATE_SPAPR_TCE, so I'm hardly typical. > --- > hw/ppc/spapr_iommu.c | 7 ++++--- > target-ppc/kvm.c | 48 +++++++++++++++++++++++++++++++++++++---------= -- > target-ppc/kvm_ppc.h | 10 +++++++--- > 3 files changed, 48 insertions(+), 17 deletions(-) >=20 > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index 1adf568..258f837 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -129,11 +129,12 @@ static MemoryRegionIOMMUOps spapr_iommu_ops =3D { > static int spapr_tce_table_realize(DeviceState *dev) > { > sPAPRTCETable *tcet =3D SPAPR_TCE_TABLE(dev); > - uint64_t window_size =3D (uint64_t)tcet->nb_table << tcet->page_shif= t; > =20 > - if (kvm_enabled() && !(window_size >> 32)) { > + if (kvm_enabled()) { > tcet->table =3D kvmppc_create_spapr_tce(tcet->liobn, > - window_size, > + tcet->nb_table, You're passing "nb_table" to the "window_shift" parameter of the modified function. They don't sound like the same quantity.. > + tcet->bus_offset, > + tcet->page_shift, > &tcet->fd, > tcet->vfio_accel); > } > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c > index 1edf2b5..5e0e2e8 100644 > --- a/target-ppc/kvm.c > +++ b/target-ppc/kvm.c > @@ -63,6 +63,7 @@ static int cap_booke_sregs; > static int cap_ppc_smt; > static int cap_ppc_rma; > static int cap_spapr_tce; > +static int cap_spapr_tce_64; > static int cap_spapr_multitce; > static int cap_spapr_vfio; > static int cap_hior; > @@ -104,6 +105,7 @@ int kvm_arch_init(KVMState *s) > cap_ppc_smt =3D kvm_check_extension(s, KVM_CAP_PPC_SMT); > cap_ppc_rma =3D kvm_check_extension(s, KVM_CAP_PPC_RMA); > cap_spapr_tce =3D kvm_check_extension(s, KVM_CAP_SPAPR_TCE); > + cap_spapr_tce_64 =3D kvm_check_extension(s, KVM_CAP_SPAPR_TCE_64); > cap_spapr_multitce =3D kvm_check_extension(s, KVM_CAP_SPAPR_MULTITCE= ); > cap_spapr_vfio =3D false; > cap_one_reg =3D kvm_check_extension(s, KVM_CAP_ONE_REG); > @@ -1994,13 +1996,10 @@ bool kvmppc_spapr_use_multitce(void) > return cap_spapr_multitce; > } > =20 > -void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int = *pfd, > - bool vfio_accel) > +void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_shift, > + uint64_t bus_offset, uint32_t page_shift, > + int *pfd, bool vfio_accel) > { > - struct kvm_create_spapr_tce args =3D { > - .liobn =3D liobn, > - .window_size =3D window_size, > - }; > long len; > int fd; > void *table; > @@ -2013,14 +2012,41 @@ void *kvmppc_create_spapr_tce(uint32_t liobn, uin= t32_t window_size, int *pfd, > return NULL; > } > =20 > - fd =3D kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE, &args); > - if (fd < 0) { > - fprintf(stderr, "KVM: Failed to create TCE table for liobn 0x%x\= n", > - liobn); > + if (cap_spapr_tce_64) { > + struct kvm_create_spapr_tce_64 args =3D { > + .liobn =3D liobn, > + .page_shift =3D page_shift, > + .offset =3D bus_offset >> page_shift, > + .size =3D window_shift, > + .flags =3D 0 > + }; > + fd =3D kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE_64, &args); > + if (fd < 0) { > + fprintf(stderr, > + "KVM: Failed to create TCE64 table for liobn 0x%x\n", > + liobn); > + return NULL; > + } > + } else if (cap_spapr_tce) { > + uint64_t window_size =3D (uint64_t) window_shift << page_shift; > + struct kvm_create_spapr_tce args =3D { > + .liobn =3D liobn, > + .window_size =3D window_size, > + }; > + if ((window_size !=3D args.window_size) || bus_offset) { > + return NULL; > + } > + fd =3D kvm_vm_ioctl(kvm_state, KVM_CREATE_SPAPR_TCE, &args); > + if (fd < 0) { > + fprintf(stderr, "KVM: Failed to create TCE table for liobn 0= x%x\n", > + liobn); > + return NULL; > + } > + } else { > return NULL; > } > =20 > - len =3D (window_size / SPAPR_TCE_PAGE_SIZE) * sizeof(uint64_t); > + len =3D window_shift * sizeof(uint64_t); =2E. which is probably because it appears window_shift is not a shift at al= l. > /* FIXME: round this up to page size */ > =20 > table =3D mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); > diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h > index 2e0224c..ec36777 100644 > --- a/target-ppc/kvm_ppc.h > +++ b/target-ppc/kvm_ppc.h > @@ -35,8 +35,9 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu); > #ifndef CONFIG_USER_ONLY > off_t kvmppc_alloc_rma(void **rma); > bool kvmppc_spapr_use_multitce(void); > -void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int = *pfd, > - bool vfio_accel); > +void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_shift, > + uint64_t bus_offset, uint32_t page_shift, > + int *pfd, bool vfio_accel); > int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t window_size); > int kvmppc_reset_htab(int shift_hint); > uint64_t kvmppc_rma_size(uint64_t current_size, unsigned int hash_shift); > @@ -157,7 +158,10 @@ static inline bool kvmppc_spapr_use_multitce(void) > } > =20 > static inline void *kvmppc_create_spapr_tce(uint32_t liobn, > - uint32_t window_size, int *f= d, > + uint32_t window_shift, > + uint64_t bus_offset, > + uint32_t page_shift, > + int *fd, > bool vfio_accel) > { > return NULL; --=20 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 --X78YbkCBd9ye7Cvs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJU0vHyAAoJEGw4ysog2bOSMzAQALyrAlxOXNyiS28zCYfwcnyN WWvHhl8lazxJAhqG594hj6LFfuAln6/rGvisKwTqniqqTnBB0bdLVYZ2yDXc/WjU JlLnBQTEGR+zjpo937PmRAGVMehiKtfcTmu+1zPARUNmxKmHljQkDVOuhYXbnnfu kWdNL/RwVmRkrEmyO4QQe4Xb/MWyK3eposi7sqVg35ZRN9lywQuaST+xlQ8ghGKF 640LSiBK9LLtNAEoZngCfX8Zc9CfHcTnnT41CBbOysBk9L031O3KpYYXt4145ZDG f2F8bTuw3oeD6K4jn0OnRKlsYWnb7M2NDqdtv2ojmJ//65TSt9IUtzisURSu7BcM clN8oPvG2nvS0fmyXK9NhHqYy2bKbCvcLIBJc9MyKPcVJsijitFDXqGOaBGbZLSZ CQZ8UtmLIjm3ebsl8Y0TnG0B+5Aax22sKGJCShwqVQM2oMt6cOt1QMvXG5igCfjX /zx+8E8ZEOTfgxQ/gpSCLtJ9n41mREo35Kp5/fMJBSku0vCkgYV+ex14W8grngMB hA1AENauF/GLuESMxZzwe8/onDKaFvIHW3HNnntNX2iZeyyuqGODdSmxH3xHttWD F34niWYeC3MTri4SiHgwYgyUX6E9R1txFnUnRHuuz5ZcU1MH8LyKPeoGAsERhlMG NOpr/9MfMxqac4Ev1gdO =AQi+ -----END PGP SIGNATURE----- --X78YbkCBd9ye7Cvs--