From: Christoph Hellwig <hch@lst.de>
To: axboe@kernel.dk, martin.petersen@oracle.com, agk@redhat.com,
snitzer@redhat.com, shli@kernel.org, philipp.reisner@linbit.com,
lars.ellenberg@linbit.com
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
drbd-dev@lists.linbit.com, dm-devel@redhat.com,
linux-raid@vger.kernel.org
Subject: [PATCH 15/25] nvme: implement REQ_OP_WRITE_ZEROES
Date: Fri, 31 Mar 2017 18:33:03 +0200 [thread overview]
Message-ID: <20170331163313.31821-16-hch@lst.de> (raw)
In-Reply-To: <20170331163313.31821-1-hch@lst.de>
But now for the real NVMe Write Zeroes yet, just to get rid of the
discard abuse for zeroing. Also rename the quirk flag to be a bit
more self-explanatory.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvme/host/core.c | 10 +++++-----
drivers/nvme/host/nvme.h | 6 +++---
drivers/nvme/host/pci.c | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 4a6d7f408769..94b41d847b01 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -335,6 +335,8 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req,
case REQ_OP_FLUSH:
nvme_setup_flush(ns, cmd);
break;
+ case REQ_OP_WRITE_ZEROES:
+ /* currently only aliased to deallocate for a few ctrls: */
case REQ_OP_DISCARD:
ret = nvme_setup_discard(ns, req, cmd);
break;
@@ -900,16 +902,14 @@ static void nvme_config_discard(struct nvme_ns *ns)
BUILD_BUG_ON(PAGE_SIZE / sizeof(struct nvme_dsm_range) <
NVME_DSM_MAX_RANGES);
- if (ctrl->quirks & NVME_QUIRK_DISCARD_ZEROES)
- ns->queue->limits.discard_zeroes_data = 1;
- else
- ns->queue->limits.discard_zeroes_data = 0;
-
ns->queue->limits.discard_alignment = logical_block_size;
ns->queue->limits.discard_granularity = logical_block_size;
blk_queue_max_discard_sectors(ns->queue, UINT_MAX);
blk_queue_max_discard_segments(ns->queue, NVME_DSM_MAX_RANGES);
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, ns->queue);
+
+ if (ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES)
+ blk_queue_max_write_zeroes_sectors(ns->queue, UINT_MAX);
}
static int nvme_revalidate_ns(struct nvme_ns *ns, struct nvme_id_ns **id)
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 2aa20e3e5675..07ebc4a1c8fc 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -68,10 +68,10 @@ enum nvme_quirks {
NVME_QUIRK_IDENTIFY_CNS = (1 << 1),
/*
- * The controller deterministically returns O's on reads to discarded
- * logical blocks.
+ * The controller deterministically returns O's on reads to
+ * logical blocks that deallocate was called on.
*/
- NVME_QUIRK_DISCARD_ZEROES = (1 << 2),
+ NVME_QUIRK_DEALLOCATE_ZEROES = (1 << 2),
/*
* The controller needs a delay before starts checking the device
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 26a5fd05fe88..0a28787267f0 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2135,13 +2135,13 @@ static const struct pci_error_handlers nvme_err_handler = {
static const struct pci_device_id nvme_id_table[] = {
{ PCI_VDEVICE(INTEL, 0x0953),
.driver_data = NVME_QUIRK_STRIPE_SIZE |
- NVME_QUIRK_DISCARD_ZEROES, },
+ NVME_QUIRK_DEALLOCATE_ZEROES, },
{ PCI_VDEVICE(INTEL, 0x0a53),
.driver_data = NVME_QUIRK_STRIPE_SIZE |
- NVME_QUIRK_DISCARD_ZEROES, },
+ NVME_QUIRK_DEALLOCATE_ZEROES, },
{ PCI_VDEVICE(INTEL, 0x0a54),
.driver_data = NVME_QUIRK_STRIPE_SIZE |
- NVME_QUIRK_DISCARD_ZEROES, },
+ NVME_QUIRK_DEALLOCATE_ZEROES, },
{ PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */
.driver_data = NVME_QUIRK_IDENTIFY_CNS, },
{ PCI_DEVICE(0x1c58, 0x0003), /* HGST adapter */
--
2.11.0
next prev parent reply other threads:[~2017-03-31 16:33 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 16:32 always use REQ_OP_WRITE_ZEROES for zeroing offload Christoph Hellwig
2017-03-31 16:32 ` [PATCH 01/25] ѕd: split sd_setup_discard_cmnd Christoph Hellwig
2017-04-05 11:42 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 02/25] block: renumber REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-04-05 11:43 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 03/25] block: implement splitting of REQ_OP_WRITE_ZEROES bios Christoph Hellwig
2017-04-05 11:43 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 04/25] sd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-04-05 11:44 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 05/25] md: support REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-31 16:32 ` [PATCH 06/25] dm io: discards don't take a payload Christoph Hellwig
2017-03-31 16:32 ` [PATCH 07/25] dm: support REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-31 16:32 ` [PATCH 08/25] dm kcopyd: switch to use REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-31 16:32 ` [PATCH 09/25] block: stop using blkdev_issue_write_same for zeroing Christoph Hellwig
2017-04-05 11:45 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 10/25] block: add a flags argument to (__)blkdev_issue_zeroout Christoph Hellwig
2017-04-05 11:46 ` Martin K. Petersen
2017-03-31 16:32 ` [PATCH 11/25] block: add a REQ_UNMAP flag for REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-04-05 11:46 ` Martin K. Petersen
2017-03-31 16:33 ` [PATCH 12/25] block: add a new BLKDEV_ZERO_NOFALLBACK flag Christoph Hellwig
2017-04-05 11:47 ` Martin K. Petersen
2017-03-31 16:33 ` [PATCH 13/25] block_dev: use blkdev_issue_zerout for hole punches Christoph Hellwig
2017-04-05 11:48 ` Martin K. Petersen
2017-03-31 16:33 ` [PATCH 14/25] sd: implement unmapping Write Zeroes Christoph Hellwig
2017-04-05 11:48 ` Martin K. Petersen
2017-03-31 16:33 ` Christoph Hellwig [this message]
2017-04-05 11:49 ` [PATCH 15/25] nvme: implement REQ_OP_WRITE_ZEROES Martin K. Petersen
2017-03-31 16:33 ` [PATCH 16/25] zram: " Christoph Hellwig
2017-03-31 16:33 ` [PATCH 17/25] loop: " Christoph Hellwig
2017-03-31 16:33 ` [PATCH 18/25] brd: remove discard support Christoph Hellwig
2017-03-31 16:33 ` [PATCH 19/25] rbd: remove the discard_zeroes_data flag Christoph Hellwig
2017-03-31 16:33 ` [PATCH 20/25] rsxx: " Christoph Hellwig
2017-03-31 16:33 ` [PATCH 21/25] mmc: " Christoph Hellwig
2017-03-31 16:33 ` [PATCH 22/25] block: stop using discards for zeroing Christoph Hellwig
2017-04-05 11:55 ` Martin K. Petersen
2017-03-31 16:33 ` [PATCH 23/25] drbd: make intelligent use of blkdev_issue_zeroout Christoph Hellwig
2017-03-31 16:33 ` [PATCH 24/25] drbd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-31 16:33 ` [PATCH 25/25] block: remove the discard_zeroes_data flag Christoph Hellwig
2017-04-05 11:56 ` Martin K. Petersen
2017-04-03 6:06 ` always use REQ_OP_WRITE_ZEROES for zeroing offload Hannes Reinecke
2017-04-05 11:40 ` Martin K. Petersen
2017-04-05 12:08 ` Christoph Hellwig
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=20170331163313.31821-16-hch@lst.de \
--to=hch@lst.de \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=philipp.reisner@linbit.com \
--cc=shli@kernel.org \
--cc=snitzer@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).