Message ID | 1476879941-14360-11-git-send-email-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show |
On 19/10/2016 14:25, 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. > > This patch changes the test to use the new qpci_mem{read,write} interfaces > which is neater. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Laurent Vivier <lvivier@redhat.com> > --- > tests/ivshmem-test.c | 35 +++++++++++++++++++++++++++-------- > 1 file changed, 27 insertions(+), 8 deletions(-) > > diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c > index f36bfe7..fbd8258 100644 > --- a/tests/ivshmem-test.c > +++ b/tests/ivshmem-test.c > @@ -93,6 +93,25 @@ static inline void out_reg(IVState *s, enum Reg reg, unsigned v) > global_qtest = qtest; > } > > +static inline void read_mem(IVState *s, uint64_t off, void *buf, size_t len) > +{ > + QTestState *qtest = global_qtest; > + > + global_qtest = s->qtest; > + qpci_memread(s->dev, s->mem_base + off, buf, len); > + global_qtest = qtest; > +} > + > +static inline void write_mem(IVState *s, uint64_t off, > + const void *buf, size_t len) > +{ > + QTestState *qtest = global_qtest; > + > + global_qtest = s->qtest; > + qpci_memwrite(s->dev, s->mem_base + off, buf, len); > + global_qtest = qtest; > +} > + > static void cleanup_vm(IVState *s) > { > g_free(s->dev); > @@ -169,7 +188,7 @@ static void test_ivshmem_single(void) > for (i = 0; i < G_N_ELEMENTS(data); i++) { > data[i] = i; > } > - qtest_memwrite(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); > + write_mem(s, 0, data, sizeof(data)); > > /* verify write */ > for (i = 0; i < G_N_ELEMENTS(data); i++) { > @@ -178,7 +197,7 @@ static void test_ivshmem_single(void) > > /* read it back and verify read */ > memset(data, 0, sizeof(data)); > - qtest_memread(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); > + read_mem(s, 0, data, sizeof(data)); > for (i = 0; i < G_N_ELEMENTS(data); i++) { > g_assert_cmpuint(data[i], ==, i); > } > @@ -201,29 +220,29 @@ static void test_ivshmem_pair(void) > > /* host write, guest 1 & 2 read */ > memset(tmpshmem, 0x42, TMPSHMSIZE); > - qtest_memread(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); > + read_mem(s1, 0, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x42); > } > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + read_mem(s2, 0, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x42); > } > > /* guest 1 write, guest 2 read */ > memset(data, 0x43, TMPSHMSIZE); > - qtest_memwrite(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); > + write_mem(s1, 0, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + read_mem(s2, 0, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x43); > } > > /* guest 2 write, guest 1 read */ > memset(data, 0x44, TMPSHMSIZE); > - qtest_memwrite(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + write_mem(s2, 0, data, TMPSHMSIZE); > memset(data, 0, TMPSHMSIZE); > - qtest_memread(s1->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); > + read_mem(s1, 0, data, TMPSHMSIZE); > for (i = 0; i < TMPSHMSIZE; i++) { > g_assert_cmpuint(data[i], ==, 0x44); > } >
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c index f36bfe7..fbd8258 100644 --- a/tests/ivshmem-test.c +++ b/tests/ivshmem-test.c @@ -93,6 +93,25 @@ static inline void out_reg(IVState *s, enum Reg reg, unsigned v) global_qtest = qtest; } +static inline void read_mem(IVState *s, uint64_t off, void *buf, size_t len) +{ + QTestState *qtest = global_qtest; + + global_qtest = s->qtest; + qpci_memread(s->dev, s->mem_base + off, buf, len); + global_qtest = qtest; +} + +static inline void write_mem(IVState *s, uint64_t off, + const void *buf, size_t len) +{ + QTestState *qtest = global_qtest; + + global_qtest = s->qtest; + qpci_memwrite(s->dev, s->mem_base + off, buf, len); + global_qtest = qtest; +} + static void cleanup_vm(IVState *s) { g_free(s->dev); @@ -169,7 +188,7 @@ static void test_ivshmem_single(void) for (i = 0; i < G_N_ELEMENTS(data); i++) { data[i] = i; } - qtest_memwrite(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); + write_mem(s, 0, data, sizeof(data)); /* verify write */ for (i = 0; i < G_N_ELEMENTS(data); i++) { @@ -178,7 +197,7 @@ static void test_ivshmem_single(void) /* read it back and verify read */ memset(data, 0, sizeof(data)); - qtest_memread(s->qtest, (uintptr_t)s->mem_base, data, sizeof(data)); + read_mem(s, 0, data, sizeof(data)); for (i = 0; i < G_N_ELEMENTS(data); i++) { g_assert_cmpuint(data[i], ==, i); } @@ -201,29 +220,29 @@ static void test_ivshmem_pair(void) /* host write, guest 1 & 2 read */ memset(tmpshmem, 0x42, TMPSHMSIZE); - qtest_memread(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); + read_mem(s1, 0, data, TMPSHMSIZE); for (i = 0; i < TMPSHMSIZE; i++) { g_assert_cmpuint(data[i], ==, 0x42); } - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); + read_mem(s2, 0, data, TMPSHMSIZE); for (i = 0; i < TMPSHMSIZE; i++) { g_assert_cmpuint(data[i], ==, 0x42); } /* guest 1 write, guest 2 read */ memset(data, 0x43, TMPSHMSIZE); - qtest_memwrite(s1->qtest, (uintptr_t)s1->mem_base, data, TMPSHMSIZE); + write_mem(s1, 0, data, TMPSHMSIZE); memset(data, 0, TMPSHMSIZE); - qtest_memread(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); + read_mem(s2, 0, data, TMPSHMSIZE); for (i = 0; i < TMPSHMSIZE; i++) { g_assert_cmpuint(data[i], ==, 0x43); } /* guest 2 write, guest 1 read */ memset(data, 0x44, TMPSHMSIZE); - qtest_memwrite(s2->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); + write_mem(s2, 0, data, TMPSHMSIZE); memset(data, 0, TMPSHMSIZE); - qtest_memread(s1->qtest, (uintptr_t)s2->mem_base, data, TMPSHMSIZE); + read_mem(s1, 0, data, TMPSHMSIZE); for (i = 0; i < TMPSHMSIZE; i++) { g_assert_cmpuint(data[i], ==, 0x44); }
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. This patch changes the test to use the new qpci_mem{read,write} interfaces which is neater. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- tests/ivshmem-test.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)