Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e850fd16 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: implement REQ_OP_WRITE_ZEROES 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e4b87837

drivers/nvme/host/core.c

+5 −5
Original line number Diff line number Diff line
@@ -368,6 +368,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;
@@ -933,16 +935,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)

drivers/nvme/host/nvme.h

+3 −3
Original line number Diff line number Diff line
@@ -66,10 +66,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

drivers/nvme/host/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -2109,13 +2109,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 */