From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YoH22-0003Z8-DV for qemu-devel@nongnu.org; Fri, 01 May 2015 15:55:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YoH21-0001VQ-5i for qemu-devel@nongnu.org; Fri, 01 May 2015 15:55:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YoH20-0001V0-TL for qemu-devel@nongnu.org; Fri, 01 May 2015 15:55:29 -0400 From: John Snow Date: Fri, 1 May 2015 15:55:12 -0400 Message-Id: <1430510112-30474-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1430510112-30474-1-git-send-email-jsnow@redhat.com> References: <1430510112-30474-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] libqos/ahci: Swap memread/write with bufread/write List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marc.mari.barcelo@gmail.com, pbonzini@redhat.com, John Snow , afaerber@suse.de, stefanha@redhat.com Where it makes sense, use the new faster primitives. For generally small reads/writes such as for the PRDT and FIS packets, stick with the more wasteful but easier to debug memread/memwrite. For ahci-test; With this patch: real 0m4.802s user 0m3.506s sys 0m2.393s Without this series: real 0m14.171s user 0m12.072s sys 0m12.527s Signed-off-by: John Snow --- tests/ahci-test.c | 8 ++++---- tests/libqos/ahci.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 7c23bb2..bbcb52a 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -806,7 +806,7 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize, /* Write some indicative pattern to our buffer. */ generate_pattern(tx, bufsize, AHCI_SECTOR_SIZE); - memwrite(ptr, tx, bufsize); + bufwrite(ptr, tx, bufsize); /* Write this buffer to disk, then read it back to the DMA buffer. */ ahci_guest_io(ahci, port, write_cmd, ptr, bufsize, sector); @@ -814,7 +814,7 @@ static void ahci_test_io_rw_simple(AHCIQState *ahci, unsigned bufsize, ahci_guest_io(ahci, port, read_cmd, ptr, bufsize, sector); /*** Read back the Data ***/ - memread(ptr, rx, bufsize); + bufread(ptr, rx, bufsize); g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0); ahci_free(ahci, ptr); @@ -950,7 +950,7 @@ static void test_dma_fragmented(void) /* Create a DMA buffer in guest memory, and write our pattern to it. */ ptr = guest_alloc(ahci->parent->alloc, bufsize); g_assert(ptr); - memwrite(ptr, tx, bufsize); + bufwrite(ptr, tx, bufsize); cmd = ahci_command_create(CMD_WRITE_DMA); ahci_command_adjust(cmd, 0, ptr, bufsize, 32); @@ -967,7 +967,7 @@ static void test_dma_fragmented(void) g_free(cmd); /* Read back the guest's receive buffer into local memory */ - memread(ptr, rx, bufsize); + bufread(ptr, rx, bufsize); guest_free(ahci->parent->alloc, ptr); g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 843cf72..e9b8bde 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -625,13 +625,13 @@ void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, g_assert(ptr); if (props->write) { - memwrite(ptr, buffer, bufsize); + bufwrite(ptr, buffer, bufsize); } ahci_guest_io(ahci, port, ide_cmd, ptr, bufsize, sector); if (props->read) { - memread(ptr, buffer, bufsize); + bufread(ptr, buffer, bufsize); } ahci_free(ahci, ptr); -- 2.1.0