From: ming.lei@redhat.com (Ming Lei)
Subject: [PATCH] nvme: disable Write Zeroes for qemu controllers
Date: Wed, 13 Mar 2019 09:46:47 +0800 [thread overview]
Message-ID: <20190313014646.GB10726@ming.t460p> (raw)
In-Reply-To: <20190312151256.22986-1-hch@lst.de>
On Tue, Mar 12, 2019@04:12:56PM +0100, Christoph Hellwig wrote:
> Qemu started out with a broken implementation of Write Zeroes written
> by yours truly. Disable Write Zeroes on qemu for now, eventually
> we need to go back and make all the qemu quirks version specific,
> but that is left for another time.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/core.c | 3 ++-
> drivers/nvme/host/nvme.h | 5 +++++
> drivers/nvme/host/pci.c | 3 ++-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 17ebc4055ac8..15ab73e5c9fc 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -1531,7 +1531,8 @@ static void nvme_config_write_zeroes(struct gendisk *disk, struct nvme_ns *ns)
> u32 max_sectors;
> unsigned short bs = 1 << ns->lba_shift;
>
> - if (!(ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES))
> + if (!(ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES) ||
> + (ns->ctrl->quirks & NVME_QUIRK_DISABLE_WRITE_ZEROES))
> return;
> /*
> * Even though NVMe spec explicitly states that MDTS is not
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index b91f1838bbd5..527d64545023 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -87,6 +87,11 @@ enum nvme_quirks {
> * Ignore device provided subnqn.
> */
> NVME_QUIRK_IGNORE_DEV_SUBNQN = (1 << 8),
> +
> + /*
> + * Broken Write Zeroes.
> + */
> + NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9),
> };
>
> /*
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index f54718b63637..3a2377888a46 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2975,7 +2975,8 @@ static const struct pci_device_id nvme_id_table[] = {
> { PCI_VDEVICE(INTEL, 0xf1a6), /* Intel 760p/Pro 7600p */
> .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
> { PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */
> - .driver_data = NVME_QUIRK_IDENTIFY_CNS, },
> + .driver_data = NVME_QUIRK_IDENTIFY_CNS |
> + NVME_QUIRK_DISABLE_WRITE_ZEROES, },
> { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */
> .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY, },
> { PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */
> --
> 2.20.1
>
Tested-by: Ming Lei <ming.lei at redhat.com>
--
Ming
prev parent reply other threads:[~2019-03-13 1:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-12 15:12 [PATCH] nvme: disable Write Zeroes for qemu controllers Christoph Hellwig
2019-03-12 15:43 ` Keith Busch
2019-03-13 1:46 ` Ming Lei [this message]
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=20190313014646.GB10726@ming.t460p \
--to=ming.lei@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).