Commit ffc89b1d authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Christoph Hellwig
Browse files

nvme: introduce namespace features flag 



Replace the specific ext boolean (that implies on extended LBA format)
with a feature in the new namespace features flag. This is a preparation
for adding more namespace features (such as metadata specific features).

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent c295ee47

drivers/nvme/host/core.c

+5 −3
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) 
	meta_len = (io.nblocks + 1) * ns->ms;

	metadata = nvme_to_user_ptr(io.metadata);



	if (ns->ext) {

	if (ns->features & NVME_NS_EXT_LBAS) {

		length += meta_len;

		meta_len = 0;

	} else if (meta_len) {
@@ -1885,7 +1885,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 
	blk_queue_io_min(disk->queue, phys_bs);

	blk_queue_io_opt(disk->queue, io_opt);



	if (ns->ms && !ns->ext &&

	if (ns->ms && !(ns->features & NVME_NS_EXT_LBAS) &&

	    (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))

		nvme_init_integrity(disk, ns->ms, ns->pi_type);

	if ((ns->ms && !nvme_ns_has_pi(ns) && !blk_get_integrity(disk)) ||
@@ -1924,8 +1924,10 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) 
	else

		iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob));



	ns->features = 0;

	ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);

	ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);

	if (ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT))

		ns->features |= NVME_NS_EXT_LBAS;

	/* the PI implementation requires metadata equal t10 pi tuple size */

	if (ns->ms == sizeof(struct t10_pi_tuple))

		ns->pi_type = id->dps & NVME_NS_DPS_PI_MASK;

drivers/nvme/host/lightnvm.c

+4 −1
Original line number Diff line number Diff line
@@ -961,7 +961,10 @@ int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node) 
	geo = &dev->geo;

	geo->csecs = 1 << ns->lba_shift;

	geo->sos = ns->ms;

	geo->ext = ns->ext;

	if (ns->features & NVME_NS_EXT_LBAS)

		geo->ext = true;

	else

		geo->ext = false;

	geo->mdts = ns->ctrl->max_hw_sectors;



	dev->q = q;

drivers/nvme/host/nvme.h

+5 −1
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ struct nvme_ns_head { 
#endif

};



enum nvme_ns_features {

	NVME_NS_EXT_LBAS = 1 << 0, /* support extended LBA format */

};



struct nvme_ns {

	struct list_head list;
@@ -383,8 +387,8 @@ struct nvme_ns { 
	u16 ms;

	u16 sgs;

	u32 sws;

	bool ext;

	u8 pi_type;

	unsigned long features;

	unsigned long flags;

#define NVME_NS_REMOVING	0

#define NVME_NS_DEAD     	1

CRA Git | Maintained and supported by SUSTech CRA and CCSE