From patchwork Mon Jun 26 09:57:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9809035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 13BC960209 for ; Mon, 26 Jun 2017 10:00:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A47A274D2 for ; Mon, 26 Jun 2017 10:00:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F2F92847C; Mon, 26 Jun 2017 10:00:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9935E274D2 for ; Mon, 26 Jun 2017 10:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751982AbdFZJ6s (ORCPT ); Mon, 26 Jun 2017 05:58:48 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35664 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbdFZJ6V (ORCPT ); Mon, 26 Jun 2017 05:58:21 -0400 Received: by mail-wm0-f50.google.com with SMTP id w126so2844510wme.0 for ; Mon, 26 Jun 2017 02:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yn8adupxSntbykHYaPheCznoWY3sG0MX8lRv9/u4GJY=; b=qXlCSHgqF0YL5+81Ju6PpRFaegJAm20I7+iuNnitsLmtkhY1HfhO7QC9HUJSICXjDC TdNMdpy+Q87sxFlkBZdEKtkBftv8EVUGie4HB+PD9BRE70FuwzBpQi0V10KmCqrV9umO eU3F/M37Q1kk5t1CdqrC/FSvrI5wCbQzeXHTS5JXWrxliwczVHexcBFmSDj8BqzrC0Ws 4qlVdpIBZjKv3Yk3d/xB2xCKHLemYdAFO13OmWBK8GzSLn2TVTIxxspYChBEo4QmZqPq eUw4MOtYZWFrrfXbN5FWP8NKNz03D6vqSkyLLfO9rd3F9ydiPRHCmghS1EBZcDjvxNcP BLUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yn8adupxSntbykHYaPheCznoWY3sG0MX8lRv9/u4GJY=; b=E2j+Cwf+IBFOarLgx9wqC2ZrDw1pGatbzBY5oZirWI5g0bKtRx60g0kKIw5v+u6ePm bVQv0oduSpj7/PaYuLxEKGUMpng72xkceeX0HCLWpAd+ZlHhqjPhVfabkIEQKwL3jEm1 3ztbu2jEqQHN7HKEqj11Mr92cLTbiC+oN/HBVVd92dAgyys4ZfgSIzJvQEJSFgpLH0Va qtaEw42Gb6PC6SvMKaCVgV/pv6y2x0LePRjIEbMkY4K8H6hAq/vCEx5Ga3TQzA6hmLN3 f7eM8bR/dPhlAKFCIB5AAfNspygaoz3XW+Ax0tbUpS1lHgN9wsP7GS3nnVDBWwmfvYnr coCg== X-Gm-Message-State: AKS2vOy4xegvUiJWea4iiRcge+a0iNqAP/Rzsp9nr21TO9iBcsmqAeNV COgAKj8MWKH6Fcso X-Received: by 10.80.169.193 with SMTP id n59mr15996606edc.181.1498471094567; Mon, 26 Jun 2017 02:58:14 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id n26sm5212537edd.51.2017.06.26.02.58.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Jun 2017 02:58:14 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 05/20] lightnvm: pblk: expose max sec per write on sysfs Date: Mon, 26 Jun 2017 11:57:14 +0200 Message-Id: <1498471049-25505-6-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> References: <1498471049-25505-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-core.c | 7 ++++++- drivers/lightnvm/pblk-init.c | 2 ++ drivers/lightnvm/pblk-sysfs.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/lightnvm/pblk.h | 2 ++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 4e0de995cd90..567ed5aa5a0f 100644 --- 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 @@ struct bio *pblk_bio_map_addr(struct pblk *pblk, void *data, 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 3ec3deff709f..6dd85860e419 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -249,6 +249,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 3c1a586c09a2..bf8fc6699299 100644 --- 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 70b65d308dea..c18fda522b34 100644 --- 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);