All of lore.kernel.org
 help / color / mirror / Atom feed
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 13/23] nvme: implement REQ_OP_WRITE_ZEROES
Date: Thu, 23 Mar 2017 10:33:31 -0400	[thread overview]
Message-ID: <20170323143341.31549-14-hch@lst.de> (raw)
In-Reply-To: <20170323143341.31549-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 9b3b57fef446..bfa0595dc767 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


  parent reply	other threads:[~2017-03-23 14:33 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-23 14:33 RFC: always use REQ_OP_WRITE_ZEROES for zeroing offload Christoph Hellwig
2017-03-23 14:33 ` [PATCH 01/23] block: renumber REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-28 16:12   ` Bart Van Assche
2017-03-28 16:12     ` Bart Van Assche
     [not found]     ` <1490717553.2573.4.camel-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2017-03-30  8:53       ` hch-jcswGhMUV9g
2017-03-30  8:53         ` hch
2017-03-23 14:33 ` [PATCH 02/23] block: implement splitting of REQ_OP_WRITE_ZEROES bios Christoph Hellwig
2017-03-23 14:33 ` [PATCH 03/23] sd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-28 18:50   ` Bart Van Assche
2017-03-28 18:50     ` Bart Van Assche
     [not found]     ` <1490726988.2573.16.camel-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2017-03-28 19:33       ` Mike Snitzer
2017-03-28 19:33         ` Mike Snitzer
2017-03-30  2:25       ` Martin K. Petersen
2017-03-30  2:25         ` Martin K. Petersen
2017-03-29 14:51     ` Paolo Bonzini
2017-03-29 16:28       ` Bart Van Assche
2017-03-29 16:28         ` Bart Van Assche
2017-03-29 16:53         ` Paolo Bonzini
2017-03-29 16:53           ` Paolo Bonzini
2017-03-23 14:33 ` [PATCH 04/23] md: support REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-23 14:33 ` [PATCH 05/23] dm: " Christoph Hellwig
2017-03-23 14:33 ` [PATCH 06/23] dm-kcopyd: switch to use REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-23 14:55   ` Mike Snitzer
2017-03-23 14:56     ` Christoph Hellwig
2017-03-23 15:10       ` Mike Snitzer
2017-03-27  9:12         ` Christoph Hellwig
2017-03-27  9:12           ` Christoph Hellwig
2017-03-23 14:33 ` [PATCH 07/23] block: stop using blkdev_issue_write_same for zeroing Christoph Hellwig
2017-03-23 14:33 ` [PATCH 08/23] block: add a flags argument to (__)blkdev_issue_zeroout Christoph Hellwig
2017-03-23 14:33 ` [PATCH 09/23] block: add a REQ_UNMAP flag for REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-23 14:33 ` [PATCH 10/23] block: add a new BLKDEV_ZERO_NOFALLBACK flag Christoph Hellwig
2017-03-23 14:33 ` [PATCH 11/23] block_dev: use blkdev_issue_zerout for hole punches Christoph Hellwig
2017-03-28 16:50   ` Bart Van Assche
2017-03-28 16:50     ` Bart Van Assche
     [not found]     ` <1490719834.2573.9.camel-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2017-03-30  8:59       ` hch-jcswGhMUV9g
2017-03-30  8:59         ` hch
2017-03-23 14:33 ` [PATCH 12/23] sd: handle REQ_UNMAP Christoph Hellwig
     [not found]   ` <20170323143341.31549-13-hch-jcswGhMUV9g@public.gmane.org>
2017-03-28 16:48     ` Bart Van Assche
2017-03-28 16:48       ` Bart Van Assche
2017-03-29 14:57       ` Paolo Bonzini
     [not found]       ` <1490719722.2573.8.camel-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2017-03-30  9:02         ` hch-jcswGhMUV9g
2017-03-30  9:02           ` hch
     [not found]           ` <20170330090201.GD12015-jcswGhMUV9g@public.gmane.org>
2017-03-30 15:28             ` Martin K. Petersen
2017-03-30 15:28               ` Martin K. Petersen
2017-03-30 17:30               ` hch
2017-03-30 17:30                 ` hch
     [not found]                 ` <20170330173020.GB24229-jcswGhMUV9g@public.gmane.org>
2017-03-31  2:19                   ` Martin K. Petersen
2017-03-31  2:19                     ` Martin K. Petersen
     [not found]                     ` <yq17f36yypg.fsf-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2017-03-31  7:18                       ` hch-jcswGhMUV9g
2017-03-31  7:18                         ` hch
2017-03-23 14:33 ` Christoph Hellwig [this message]
2017-03-23 14:33 ` [PATCH 14/23] zram: implement REQ_OP_WRITE_ZEROES Christoph Hellwig
2017-03-23 14:33 ` [PATCH 15/23] loop: " Christoph Hellwig
2017-03-23 14:33 ` [PATCH 16/23] brd: remove discard support Christoph Hellwig
2017-03-23 14:33 ` [PATCH 17/23] rbd: remove the discard_zeroes_data flag Christoph Hellwig
2017-03-23 14:33 ` [PATCH 18/23] rsxx: " Christoph Hellwig
2017-03-23 14:33 ` [PATCH 19/23] mmc: " Christoph Hellwig
2017-03-23 14:33 ` [PATCH 20/23] block: stop using discards for zeroing Christoph Hellwig
2017-03-23 14:33 ` [PATCH 21/23] drbd: make intelligent use of blkdev_issue_zeroout Christoph Hellwig
2017-03-23 14:33 ` [PATCH 22/23] drbd: implement REQ_OP_WRITE_ZEROES Christoph Hellwig
     [not found]   ` <20170323143341.31549-23-hch-jcswGhMUV9g@public.gmane.org>
2017-03-30 10:06     ` Lars Ellenberg
2017-03-30 10:06       ` Lars Ellenberg
2017-03-30 11:44       ` Christoph Hellwig
2017-03-30 12:50         ` [Drbd-dev] " Lars Ellenberg
     [not found]         ` <20170330114408.GA15777-jcswGhMUV9g@public.gmane.org>
2017-03-30 13:49           ` Mike Snitzer
2017-03-30 13:49             ` Mike Snitzer
     [not found]             ` <20170330134957.GA508-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-30 15:20               ` Martin K. Petersen
2017-03-30 15:20                 ` Martin K. Petersen
2017-03-30 23:15                 ` Mike Snitzer
     [not found]                   ` <20170330231550.GA3102-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-31  2:34                     ` Martin K. Petersen
2017-03-31  2:34                       ` Martin K. Petersen
2017-03-31  7:17                   ` Christoph Hellwig
2017-03-23 14:33 ` [PATCH 23/23] block: remove the discard_zeroes_data flag Christoph Hellwig
2017-03-28 17:00   ` Bart Van Assche
2017-03-28 17:00     ` Bart Van Assche
2017-03-29 14:52     ` Paolo Bonzini
2017-03-30  9:06     ` hch
     [not found]       ` <20170330090655.GF12015-jcswGhMUV9g@public.gmane.org>
2017-03-30 15:29         ` Martin K. Petersen
2017-03-30 15:29           ` Martin K. Petersen
2017-03-30 17:29           ` hch
     [not found] ` <20170323143341.31549-1-hch-jcswGhMUV9g@public.gmane.org>
2017-03-23 15:54   ` RFC: always use REQ_OP_WRITE_ZEROES for zeroing offload Lars Ellenberg
2017-03-23 15:54     ` Lars Ellenberg
2017-03-23 17:02     ` Mike Snitzer
2017-03-23 17:02       ` Mike Snitzer
     [not found]       ` <20170323170221.GA20854-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-23 22:53         ` Lars Ellenberg
2017-03-23 22:53           ` Lars Ellenberg
2017-03-29 14:57           ` Paolo Bonzini
     [not found]     ` <20170323155410.GD1138-w1SgEEioFePxa46PmUWvFg@public.gmane.org>
2017-03-27  9:10       ` Christoph Hellwig
2017-03-27  9:10         ` Christoph Hellwig
     [not found]         ` <20170327091056.GB6879-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2017-03-27 14:03           ` Mike Snitzer
2017-03-27 14:03             ` Mike Snitzer
     [not found]             ` <20170327140307.GA13020-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-03-27 14:57               ` Christoph Hellwig
2017-03-27 14:57                 ` Christoph Hellwig
2017-03-27 15:08             ` [Drbd-dev] " Bart Van Assche
2017-03-27 15:08               ` Bart Van Assche
2017-03-30  9:04       ` Christoph Hellwig
2017-03-30  9:04         ` Christoph Hellwig
2017-03-30 15:12 ` Mike Snitzer
2017-03-30 15:22   ` Martin K. Petersen
     [not found]     ` <yq1lgrm3i36.fsf-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
2017-03-30 15:38       ` Mike Snitzer
2017-03-30 15:38         ` Mike Snitzer

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=20170323143341.31549-14-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 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.