From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwioL-0003ya-1y for qemu-devel@nongnu.org; Wed, 19 Oct 2016 00:49:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwioF-0001Za-4b for qemu-devel@nongnu.org; Wed, 19 Oct 2016 00:49:05 -0400 Date: Wed, 19 Oct 2016 15:13:06 +1100 From: David Gibson Message-ID: <20161019041306.GK11140@umbus.fritz.box> References: <1476787933-7180-1-git-send-email-david@gibson.dropbear.id.au> <1476787933-7180-8-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Rex5+51txc1ort/q" Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH 7/8] tests: Use qpci_mem{read, write} in ivshmem-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, agraf@suse.de, stefanha@redhat.com, mst@redhat.com, aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, groug@kaod.org, thuth@redhat.com --Rex5+51txc1ort/q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 18, 2016 at 06:14:09PM +0200, Laurent Vivier wrote: >=20 >=20 > On 18/10/2016 12:52, David Gibson wrote: > > ivshmem implements a block of shared memory in a PCI BAR. Currently our > > test case accesses this using qtest_mem{read,write}. However, deducing > > the correct addresses for these requires making assumptions about the > > internel format returned by qpci_iomap(), along with some ugly casts. > >=20 > > This patch changes the test to use the new qpci_mem{read,write} interfa= ces > > which is neater. > >=20 > > Signed-off-by: David Gibson >=20 > I think your changes break this test. >=20 > There is two guest, so we need to access them through two sockets, > defined in s1->qtest and s2->qtest. >=20 > But qpci_memXXX() always use memread(...) and thus > qtest_memread(global_qtest, ...) , so always test the last guest started. >=20 > You must swap global_qtest as it is done in in_reg()/out_reg() before > your qpci_memXXX() in test_ivshmem_pair(). Ah.. good point. I'll fix that in the next spin. >=20 > Laurent >=20 > > --- > > tests/ivshmem-test.c | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > >=20 > > diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c > > index f36bfe7..97a887e 100644 > > --- a/tests/ivshmem-test.c > > +++ b/tests/ivshmem-test.c > > @@ -169,7 +169,7 @@ static void test_ivshmem_single(void) > > for (i =3D 0; i < G_N_ELEMENTS(data); i++) { > > data[i] =3D i; > > } > > - qtest_memwrite(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data= )); > > + qpci_memwrite(s->dev, s->mem_base, data, sizeof(data)); > > =20 > > /* verify write */ > > for (i =3D 0; i < G_N_ELEMENTS(data); i++) { > > @@ -178,7 +178,7 @@ static void test_ivshmem_single(void) > > =20 > > /* read it back and verify read */ > > memset(data, 0, sizeof(data)); > > - qtest_memread(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)= ); > > + qpci_memread(s->dev, s->mem_base, data, sizeof(data)); > > for (i =3D 0; i < G_N_ELEMENTS(data); i++) { > > g_assert_cmpuint(data[i], =3D=3D, i); > > } > > @@ -201,29 +201,29 @@ static void test_ivshmem_pair(void) > > =20 > > /* host write, guest 1 & 2 read */ > > memset(tmpshmem, 0x42, TMPSHMSIZE); > > - qtest_memread(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE= ); > > + qpci_memread(s1->dev, s1->mem_base, data, TMPSHMSIZE); > > for (i =3D 0; i < TMPSHMSIZE; i++) { > > g_assert_cmpuint(data[i], =3D=3D, 0x42); > > } > > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE= ); > > + qpci_memread(s2->dev, s2->mem_base, data, TMPSHMSIZE); > > for (i =3D 0; i < TMPSHMSIZE; i++) { > > g_assert_cmpuint(data[i], =3D=3D, 0x42); > > } > > =20 > > /* guest 1 write, guest 2 read */ > > memset(data, 0x43, TMPSHMSIZE); > > - qtest_memwrite(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZ= E); > > + qpci_memwrite(s1->dev, s1->mem_base, data, TMPSHMSIZE); > > memset(data, 0, TMPSHMSIZE); > > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE= ); > > + qpci_memread(s2->dev, s2->mem_base, data, TMPSHMSIZE); > > for (i =3D 0; i < TMPSHMSIZE; i++) { > > g_assert_cmpuint(data[i], =3D=3D, 0x43); > > } > > =20 > > /* guest 2 write, guest 1 read */ > > memset(data, 0x44, TMPSHMSIZE); > > - qtest_memwrite(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZ= E); > > + qpci_memwrite(s2->dev, s2->mem_base, data, TMPSHMSIZE); > > memset(data, 0, TMPSHMSIZE); > > - qtest_memread(s1->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE= ); > > + qpci_memread(s1->dev, s2->mem_base, data, TMPSHMSIZE); > > for (i =3D 0; i < TMPSHMSIZE; i++) { > > g_assert_cmpuint(data[i], =3D=3D, 0x44); > > } > >=20 >=20 --=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 --Rex5+51txc1ort/q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYBvLSAAoJEGw4ysog2bOSfxoP/j6HxA7fx6s+Nk4KOhQyqjyt lGt9yL591lqXqWlQrseYlFhjXHpJ8NI+t8VKO7X6F5vR328Wnuia/lQoyxDdM0nV Q6n0HYy6v2IlIbYewFeLw5mk87lrEK/T4Y+qoCmHuQvSbL2pd18PWHqAMIAgOAHr 7/FsTE+IvqjzJEgi+GyvQxAd03ccwIa7onT+4QSUmebMf0w8yN+HHXAPV7fj1O/V TvMbfKBSXAavNLXVnnRCgGD7WHhoutP660DBr3m42EFZBOjpH2z3VmoSjLiT+chl B8iLKGyC7Ta+gcvwg8HWKJFTIBj2mWCFi9LMs+9PvPoG+mN5S/NigxrXUlwMhL0G RQN1TIfGgT1BMmJGbYYftnKnWu5Il0VJJ6NLPuTOMVfWWiD5aDbM8Q+ACKEngtB/ cr7DkS20kG01DJaJgWGsFBiEhM67n7OpfoOenIKfnUjHnLu+8mVMxJ76FKUdYbgr +Ue4WgXEwf7oE76P3WY9Dor+7uD8LmJbIjHhkSXXua3sTS/JXoq4Mykm8u4XTPPJ qeTWQKYD8j7k7tT5nA7Gx6/B7I13vsG7Jyupun1GWadvpX26+EYgidTfMvl0ob/v LVK2oQlDHDAYmVs+iErB3GdluruyrXdmu8aO+dKeZXXeGHp98g3bgNkn4Tff6RtT IJvUZ5n1UpC3boudxp8x =E1Jo -----END PGP SIGNATURE----- --Rex5+51txc1ort/q--