Commit 91d0374a authored by John Snow's avatar John Snow
Browse files

libqos/ahci: Swap memread/write with bufread/write 



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 (before migration tests):
With this patch:
real    0m3.675s
user    0m2.582s
sys     0m1.718s

Without any qtest protocol improvements:
real    0m14.171s
user    0m12.072s
sys     0m12.527s

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1430864578-22072-6-git-send-email-jsnow@redhat.com
parent 4d007963

tests/ahci-test.c

+4 −4
Original line number Diff line number Diff line
@@ -874,7 +874,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);
@@ -882,7 +882,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);
@@ -1018,7 +1018,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);
@@ -1035,7 +1035,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);

tests/libqos/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -653,13 +653,13 @@ void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd, 
    qmemset(ptr, 0x00, bufsize);



    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);