lightnvm: pblk: expose max sec per write on sysfs

Allow to configure the number of maximum sectors per write command
through sysfs. This makes it easier to tune write command sizes for
different controller configurations.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 4e0de995cd902ba95daa08640de25c61504e0f05..567ed5aa5a0f1514699cac817552508681485772 100644 (file)
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -397,6 +397,11 @@ void pblk_log_read_err(struct pblk *pblk, struct nvm_rq *rqd)
 #endif
 }
 
+void pblk_set_sec_per_write(struct pblk *pblk, int sec_per_write)
+{
+       pblk->sec_per_write = sec_per_write;
+}
+
 int pblk_submit_io(struct pblk *pblk, struct nvm_rq *rqd)
 {
        struct nvm_tgt_dev *dev = pblk->dev;
@@ -478,7 +483,7 @@ out:
 int pblk_calc_secs(struct pblk *pblk, unsigned long secs_avail,
                   unsigned long secs_to_flush)
 {
-       int max = pblk->max_write_pgs;
+       int max = pblk->sec_per_write;
        int min = pblk->min_write_pgs;
        int secs_to_sync = 0;
 

diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 2d79336748eea65949b814a9d7a996f105e56731..0389068c60cb3a4e64b4d172a727610b77aa2cb0 100644 (file)
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -250,6 +250,8 @@ static int pblk_core_init(struct pblk *pblk)
        pblk->pgs_in_buffer = NVM_MEM_PAGE_WRITE * geo->sec_per_pg *
                                                geo->nr_planes * geo->nr_luns;
 
+       pblk_set_sec_per_write(pblk, pblk->min_write_pgs);
+
        if (pblk->max_write_pgs > PBLK_MAX_REQ_ADDRS) {
                pr_err("pblk: cannot support device max_phys_sect\n");
                return -EINVAL;

diff --git a/drivers/lightnvm/pblk-sysfs.c b/drivers/lightnvm/pblk-sysfs.c
index 3c1a586c09a2ad5d9b236e3ad2dd184b9162cd60..bf8fc669929985f9dd611021c2aaa2b4beb2f3d0 100644 (file)
--- a/drivers/lightnvm/pblk-sysfs.c
+++ b/drivers/lightnvm/pblk-sysfs.c
@@ -290,6 +290,11 @@ static ssize_t pblk_sysfs_lines_info(struct pblk *pblk, char *page)
        return sz;
 }
 
+static ssize_t pblk_sysfs_get_sec_per_write(struct pblk *pblk, char *page)
+{
+       return snprintf(page, PAGE_SIZE, "%d\n", pblk->sec_per_write);
+}
+
 #ifdef CONFIG_NVM_DEBUG
 static ssize_t pblk_sysfs_stats_debug(struct pblk *pblk, char *page)
 {
@@ -354,6 +359,29 @@ static ssize_t pblk_sysfs_gc_force(struct pblk *pblk, const char *page,
        return len;
 }
 
+static ssize_t pblk_sysfs_set_sec_per_write(struct pblk *pblk,
+                                            const char *page, size_t len)
+{
+       size_t c_len;
+       int sec_per_write;
+
+       c_len = strcspn(page, "\n");
+       if (c_len >= len)
+               return -EINVAL;
+
+       if (kstrtouint(page, 0, &sec_per_write))
+               return -EINVAL;
+
+       if (sec_per_write < pblk->min_write_pgs
+                               || sec_per_write > pblk->max_write_pgs
+                               || sec_per_write % pblk->min_write_pgs != 0)
+               return -EINVAL;
+
+       pblk_set_sec_per_write(pblk, sec_per_write);
+
+       return len;
+}
+
 static struct attribute sys_write_luns = {
        .name = "write_luns",
        .mode = 0444,
@@ -399,6 +427,11 @@ static struct attribute sys_gc_force = {
        .mode = 0200,
 };
 
+static struct attribute sys_max_sec_per_write = {
+       .name = "max_sec_per_write",
+       .mode = 0644,
+};
+
 static struct attribute sys_gc_rl_max = {
        .name = "gc_rl_max",
        .mode = 0200,
@@ -417,6 +450,7 @@ static struct attribute *pblk_attrs[] = {
        &sys_errors_attr,
        &sys_gc_state,
        &sys_gc_force,
+       &sys_max_sec_per_write,
        &sys_gc_rl_max,
        &sys_rb_attr,
        &sys_stats_ppaf_attr,
@@ -449,6 +483,8 @@ static ssize_t pblk_sysfs_show(struct kobject *kobj, struct attribute *attr,
                return pblk_sysfs_lines(pblk, buf);
        else if (strcmp(attr->name, "lines_info") == 0)
                return pblk_sysfs_lines_info(pblk, buf);
+       else if (strcmp(attr->name, "max_sec_per_write") == 0)
+               return pblk_sysfs_get_sec_per_write(pblk, buf);
 #ifdef CONFIG_NVM_DEBUG
        else if (strcmp(attr->name, "stats") == 0)
                return pblk_sysfs_stats_debug(pblk, buf);
@@ -465,6 +501,8 @@ static ssize_t pblk_sysfs_store(struct kobject *kobj, struct attribute *attr,
                return pblk_sysfs_rate_store(pblk, buf, len);
        else if (strcmp(attr->name, "gc_force") == 0)
                return pblk_sysfs_gc_force(pblk, buf, len);
+       else if (strcmp(attr->name, "max_sec_per_write") == 0)
+               return pblk_sysfs_set_sec_per_write(pblk, buf, len);
 
        return 0;
 }

diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 77ee42a3f5141b0f2c58f44b08d603189f9f9388..edff59aae7415ce76ed09777cb87e62c99e3ab1d 100644 (file)
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -499,6 +499,7 @@ struct pblk {
        /* pblk provisioning values. Used by rate limiter */
        struct pblk_rl rl;
 
+       int sec_per_write;
        struct semaphore erase_sem;
 
        unsigned char instance_uuid[16];
@@ -613,6 +614,7 @@ ssize_t pblk_rb_sysfs(struct pblk_rb *rb, char *buf);
  * pblk core
  */
 struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw);
+void pblk_set_sec_per_write(struct pblk *pblk, int sec_per_write);
 int pblk_setup_w_rec_rq(struct pblk *pblk, struct nvm_rq *rqd,
                        struct pblk_c_ctx *c_ctx);
 void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int rw);