From: Kevin Wolf <kwolf@redhat.com>
To: Alexander Popov <alex.popov@linux.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Darren Kenny <darren.kenny@oracle.com>,
sstabellini@kernel.org, pmatouse@redhat.com,
mdroth@linux.vnet.ibm.com, qemu-block@nongnu.org,
"Michael S . Tsirkin" <mst@redhat.com>,
qemu-stable@nongnu.org, qemu-devel@nongnu.org,
Kashyap Chamarthy <kashyap.cv@gmail.com>,
Thomas Huth <thuth@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>,
pjp@redhat.com
Subject: Re: [PATCH v3 2/2] tests/ide-test: Create a single unit-test covering more PRDT cases
Date: Tue, 7 Jan 2020 08:44:44 +0100 [thread overview]
Message-ID: <20200107074444.GE4076@linux.fritz.box> (raw)
In-Reply-To: <20191223175117.508990-3-alex.popov@linux.com>
Am 23.12.2019 um 18:51 hat Alexander Popov geschrieben:
> Fuzzing the Linux kernel with syzkaller allowed to find how to crash qemu
> using a special SCSI_IOCTL_SEND_COMMAND. It hits the assertion in
> ide_dma_cb() introduced in the commit a718978ed58a in July 2015.
> Currently this bug is not reproduced by the unit tests.
>
> Let's improve the ide-test to cover more PRDT cases including one
> that causes this particular qemu crash.
>
> The test is developed according to the Programming Interface for
> Bus Master IDE Controller (Revision 1.0 5/16/94).
>
> Signed-off-by: Alexander Popov <alex.popov@linux.com>
The time this test takes is much better now (~5s for me).
> +/*
> + * This test is developed according to the Programming Interface for
> + * Bus Master IDE Controller (Revision 1.0 5/16/94)
> + */
> +static void test_bmdma_various_prdts(void)
> {
> - QTestState *qts;
> - QPCIDevice *dev;
> - QPCIBar bmdma_bar, ide_bar;
> - uint8_t status;
> -
> - PrdtEntry prdt[] = {
> - {
> - .addr = 0,
> - .size = cpu_to_le32(0x1000 | PRDT_EOT),
> - },
> - };
> -
> - qts = test_bmdma_setup();
> -
> - dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
> -
> - /* Normal request */
> - status = send_dma_request(qts, CMD_READ_DMA, 0, 1,
> - prdt, ARRAY_SIZE(prdt), NULL);
> - g_assert_cmphex(status, ==, BM_STS_ACTIVE | BM_STS_INTR);
> - assert_bit_clear(qpci_io_readb(dev, ide_bar, reg_status), DF | ERR);
> + int sectors = 0;
> + uint32_t size = 0;
> +
> + for (sectors = 1; sectors <= 256; sectors *= 2) {
> + QTestState *qts = NULL;
> + QPCIDevice *dev = NULL;
> + QPCIBar bmdma_bar, ide_bar;
> +
> + qts = test_bmdma_setup();
> + dev = get_pci_device(qts, &bmdma_bar, &ide_bar);
I'm wondering why the initialisation has to be inside the outer for
loop. I expected that moving it outside would further improve the speed.
But sure enough, doing that makes the test fail.
Did you have a look why this happens? I suppose we might be running out
of some resources in the qtest framework becasue each send_dma_request()
calls get_pci_device() again?
5 seconds isn't that bad, so this shouldn't block this series, but it's
still by far the slowest test in ide-test, so any improvement certainly
wouldn't hurt.
> + for (size = 0; size < 65536; size += 256) {
> + uint32_t req_size = sectors * 512;
> + uint32_t prd_size = size & 0xfffe; /* bit 0 is always set to 0 */
> + uint8_t ret = 0;
> + uint8_t req_status = 0;
If you end up sending another version for some reason, I would also
consider renaming req_status, because reg_status already exists, which
looks almost the same. This confused me for a moment when reading the
code below.
Kevin
next prev parent reply other threads:[~2020-01-07 8:18 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 17:51 [PATCH v3 0/2] ide: Fix incorrect handling of some PRDTs and add the corresponding unit-test Alexander Popov
2019-12-23 17:51 ` [PATCH v3 1/2] ide: Fix incorrect handling of some PRDTs in ide_dma_cb() Alexander Popov
2020-01-07 7:34 ` Kevin Wolf
2019-12-23 17:51 ` [PATCH v3 2/2] tests/ide-test: Create a single unit-test covering more PRDT cases Alexander Popov
2020-01-07 7:44 ` Kevin Wolf [this message]
2020-01-07 22:39 ` Alexander Popov
2020-01-08 9:23 ` Kevin Wolf
2019-12-28 12:28 ` [PATCH v3 0/2] ide: Fix incorrect handling of some PRDTs and add the corresponding unit-test Alexander Popov
2020-01-22 11:53 ` Alexander Popov
2020-01-22 12:23 ` Kevin Wolf
2020-01-22 21:06 ` John Snow
2020-01-22 23:14 ` John Snow
2020-01-23 10:52 ` Alexander Popov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107074444.GE4076@linux.fritz.box \
--to=kwolf@redhat.com \
--cc=aarcange@redhat.com \
--cc=alex.popov@linux.com \
--cc=darren.kenny@oracle.com \
--cc=jsnow@redhat.com \
--cc=kashyap.cv@gmail.com \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pjp@redhat.com \
--cc=pmatouse@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.