Commit 4af3f75d authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: allow to init targets on factory mode 



Target initialization has two responsibilities: creating the target
partition and instantiating the target. This patch enables to create a
factory partition (e.g., do not trigger recovery on the given target).
This is useful for target development and for being able to restore the
device state at any moment in time without requiring a full-device
erase.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e85292fe

drivers/lightnvm/core.c

+11 −3
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) 
	tdisk->fops = &nvm_fops;

	tdisk->queue = tqueue;



	targetdata = tt->init(tgt_dev, tdisk);

	targetdata = tt->init(tgt_dev, tdisk, create->flags);

	if (IS_ERR(targetdata))

		goto err_init;
@@ -1244,9 +1244,17 @@ static long nvm_ioctl_dev_create(struct file *file, void __user *arg) 
	create.tgtname[DISK_NAME_LEN - 1] = '\0';



	if (create.flags != 0) {

		pr_err("nvm: no flags supported\n");

		__u32 flags = create.flags;



		/* Check for valid flags */

		if (flags & NVM_TARGET_FACTORY)

			flags &= ~NVM_TARGET_FACTORY;



		if (flags) {

			pr_err("nvm: flag not supported\n");

			return -EINVAL;

		}

	}



	return __nvm_configure_create(&create);

}

drivers/lightnvm/rrpc.c

+2 −1
Original line number Diff line number Diff line
@@ -1506,7 +1506,8 @@ err: 


static struct nvm_tgt_type tt_rrpc;



static void *rrpc_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk)

static void *rrpc_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,

		       int flags)

{

	struct request_queue *bqueue = dev->q;

	struct request_queue *tqueue = tdisk->queue;

include/linux/lightnvm.h

+2 −1
Original line number Diff line number Diff line
@@ -436,7 +436,8 @@ static inline int ppa_cmp_blk(struct ppa_addr ppa1, struct ppa_addr ppa2) 


typedef blk_qc_t (nvm_tgt_make_rq_fn)(struct request_queue *, struct bio *);

typedef sector_t (nvm_tgt_capacity_fn)(void *);

typedef void *(nvm_tgt_init_fn)(struct nvm_tgt_dev *, struct gendisk *);

typedef void *(nvm_tgt_init_fn)(struct nvm_tgt_dev *, struct gendisk *,

				int flags);

typedef void (nvm_tgt_exit_fn)(void *);

typedef int (nvm_tgt_sysfs_init_fn)(struct gendisk *);

typedef void (nvm_tgt_sysfs_exit_fn)(struct gendisk *);

include/uapi/linux/lightnvm.h

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ struct nvm_ioctl_create_conf { 
	};

};



enum {

	NVM_TARGET_FACTORY = 1 << 0,	/* Init target in factory mode */

};



struct nvm_ioctl_create {

	char dev[DISK_NAME_LEN];		/* open-channel SSD device */

	char tgttype[NVM_TTYPE_NAME_MAX];	/* target type name */

CRA Git | Maintained and supported by SUSTech CRA and CCSE