13f8cf1536
The VirtualBox emulated NVMe device will intermittently hang on the first read/write command after an I/O qpair has been allocated. The frequency of the hang diminishes if a delay is added after allocating the I/O qpair - until it disappears completely with a 100us delay. So add a quirk to insert this delay. Note - the 100us delay was tested by running the hello_world example app 50000 times. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: I237e31b1b8a1a1e28262851ae0a21cd7345f0f1a
88 lines
3.1 KiB
C
88 lines
3.1 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "nvme_internal.h"
|
|
|
|
struct nvme_quirk {
|
|
struct spdk_pci_id id;
|
|
uint64_t flags;
|
|
};
|
|
|
|
static const struct nvme_quirk nvme_quirks[] = {
|
|
{ {SPDK_PCI_VID_INTEL, 0x0953, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID},
|
|
NVME_INTEL_QUIRK_READ_LATENCY |
|
|
NVME_INTEL_QUIRK_WRITE_LATENCY |
|
|
NVME_INTEL_QUIRK_STRIPING
|
|
},
|
|
{ {SPDK_PCI_VID_INTEL, 0x0A53, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID},
|
|
NVME_INTEL_QUIRK_STRIPING
|
|
},
|
|
{ {SPDK_PCI_VID_INTEL, 0x0A54, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID},
|
|
NVME_INTEL_QUIRK_STRIPING
|
|
},
|
|
{ {SPDK_PCI_VID_MEMBLAZE, 0x0540, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID},
|
|
NVME_QUIRK_DELAY_BEFORE_CHK_RDY
|
|
},
|
|
{ {SPDK_PCI_VID_VIRTUALBOX, 0x4e56, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID},
|
|
NVME_QUIRK_DELAY_AFTER_QUEUE_ALLOC
|
|
},
|
|
{ {0x0000, 0x0000, 0x0000, 0x0000}, 0}
|
|
};
|
|
|
|
/* Compare each field. SPDK_PCI_ANY_ID in s1 matches everything */
|
|
static bool
|
|
pci_id_match(const struct spdk_pci_id *s1, const struct spdk_pci_id *s2)
|
|
{
|
|
if ((s1->vendor_id == SPDK_PCI_ANY_ID || s1->vendor_id == s2->vendor_id) &&
|
|
(s1->device_id == SPDK_PCI_ANY_ID || s1->device_id == s2->device_id) &&
|
|
(s1->subvendor_id == SPDK_PCI_ANY_ID || s1->subvendor_id == s2->subvendor_id) &&
|
|
(s1->subdevice_id == SPDK_PCI_ANY_ID || s1->subdevice_id == s2->subdevice_id)) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
uint64_t
|
|
nvme_get_quirks(const struct spdk_pci_id *id)
|
|
{
|
|
const struct nvme_quirk *quirk = nvme_quirks;
|
|
|
|
while (quirk->id.vendor_id) {
|
|
if (pci_id_match(&quirk->id, id)) {
|
|
return quirk->flags;
|
|
}
|
|
quirk++;
|
|
}
|
|
return false;
|
|
}
|