From patchwork Fri Jun 10 12:22:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 9169607 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 E9567604DB for ; Fri, 10 Jun 2016 12:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D94232766D for ; Fri, 10 Jun 2016 12:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDDD22835E; Fri, 10 Jun 2016 12:23:21 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 329772835A for ; Fri, 10 Jun 2016 12:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933024AbcFJMXD (ORCPT ); Fri, 10 Jun 2016 08:23:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35804 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932602AbcFJMXB (ORCPT ); Fri, 10 Jun 2016 08:23:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id k184so17508096wme.2 for ; Fri, 10 Jun 2016 05:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uZtcRuRJTEL2uRqGqEBe1FDfTVvfwLDOM9tkpNIkNXo=; b=s7DmnMEkbci4CujRP87Ed7H5bMub0QnF440/IlnDC2kDCYw0VJZxV3D6Sztv67SyaJ yhsXb3bCMcW++Gq2ZcI+Hp82Xxf5GGxfi7tFJ2s112vXSLPRuEQ5yXhVYE9FfN3MnLe8 rbrEe5hsGWA4Dwl/PUbybtMr79Q9bVFdLjNcg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uZtcRuRJTEL2uRqGqEBe1FDfTVvfwLDOM9tkpNIkNXo=; b=hm1ERoV3bos3u6Qc36sNNY+ZddkNoetj29FMn4n/jvLl6ajEw2Un91PL+wqPbtVFM3 WNYMuaCx/joXo/42Wy5dzRSVwgdPuUlB7xUb4OaEZgbXKli81d4RglYY2xBjRckn5UQ6 q5w/uIB3f13ir1dVJzFoAPaWL3IX7ud8m0M4RAaxGnQ6B6+pUUkSMjvn1Pn3qmmUdo6A DLx/qcb1FcOiaKwbwslbOJg4mgqtNYmFMBKFSHbW87cA4M96lUH9HnQIwtAoID667zOV ODq1DelT5qRDjq/QDAtmjHN80E9SevbuqCdY5N+gxnowIMiJ6qdvzq3RKVJAR8VG3fYG 7IJg== X-Gm-Message-State: ALyK8tLKMgfZZjhOLM6dF36C6BU0dqI04DoxRp/tz9NhRKTYzPtYhpwrikG30G3zedfBmw== X-Received: by 10.28.144.203 with SMTP id s194mr2646025wmd.12.1465561379309; Fri, 10 Jun 2016 05:22:59 -0700 (PDT) Received: from Macroninja.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id c4sm12083369wjb.38.2016.06.10.05.22.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Jun 2016 05:22:58 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com, keith.busch@intel.com, linux-nvme@lists.infradead.org Cc: "Simon A. F. Lund" , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 6/6] lightnvm: expose gennvm target type through sysfs Date: Fri, 10 Jun 2016 14:22:52 +0200 Message-Id: <1465561372-19748-1-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 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 From: "Simon A. F. Lund" Create a sysfs directory for targets to expose their internal statistics and knobs. The entries is exposed through the /sys/block//lightnvm/* directory. It currently holds a single sysfs entry "type", which exports the target type name. Signed-off-by: Simon A. F. Lund Signed-off-by: Matias Bjørling --- drivers/lightnvm/gennvm.c | 112 ++++++++++++++++++++++++++++++++++++++-------- include/linux/lightnvm.h | 10 +++++ 2 files changed, 104 insertions(+), 18 deletions(-) diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c index b74174c..bfdad3c 100644 --- a/drivers/lightnvm/gennvm.c +++ b/drivers/lightnvm/gennvm.c @@ -20,6 +20,87 @@ #include "gennvm.h" +static struct attribute gen_type_attr = { + .name = "type", + .mode = S_IRUGO +}; + +static struct attribute *gen_target_attrs[] = { + &gen_type_attr, + NULL, +}; + +static ssize_t gen_target_attr_show(struct kobject *kobj, + struct attribute *attr, + char *page) +{ + struct nvm_target *t = container_of(kobj, struct nvm_target, kobj); + + if (strcmp(attr->name, "type") == 0) + return scnprintf(page, PAGE_SIZE, "%s\n", t->type->name); + + if (t->type->sysfs_show) + return t->type->sysfs_show(t, attr, page); + + return scnprintf(page, PAGE_SIZE, + "Unhandled attr(%s) in `nvm_target_attr_show`\n", + attr->name); +} + +static const struct sysfs_ops target_sysfs_ops = { + .show = gen_target_attr_show, +}; + +static void gen_target_release(struct kobject *kobj) +{ + struct nvm_target *t = container_of(kobj, struct nvm_target, kobj); + struct nvm_tgt_type *tt = t->type; + struct gendisk *tdisk = t->disk; + struct request_queue *q = tdisk->queue; + + pr_debug("gen: `gen_target_release`\n"); + + del_gendisk(tdisk); + blk_cleanup_queue(q); + put_disk(tdisk); + + if (tt->exit) + tt->exit(tdisk->private_data); + + kfree(t); +} + +static struct kobj_type nvm_target_type = { + .sysfs_ops = &target_sysfs_ops, + .default_attrs = gen_target_attrs, + .release = gen_target_release +}; + +void gen_unregister_target(struct nvm_target *t) +{ + kobject_uevent(&t->kobj, KOBJ_REMOVE); + kobject_del(&t->kobj); + kobject_put(&t->kobj); +} + +int gen_register_target(struct nvm_target *t) +{ + struct gendisk *disk = t->disk; + struct device *dev = disk_to_dev(disk); + int ret; + + ret = kobject_init_and_add(&t->kobj, &nvm_target_type, + kobject_get(&dev->kobj), "%s", "lightnvm"); + if (ret < 0) { + pr_err("gen: `_register_target` failed.\n"); + kobject_put(&t->kobj); + return ret; + } + + kobject_uevent(&t->kobj, KOBJ_ADD); + return 0; +} + static struct nvm_target *gen_find_target(struct gen_dev *gn, const char *name) { struct nvm_target *tgt; @@ -60,7 +141,7 @@ static int gen_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) } mutex_unlock(&gn->lock); - t = kmalloc(sizeof(struct nvm_target), GFP_KERNEL); + t = kzalloc(sizeof(struct nvm_target), GFP_KERNEL); if (!t) return -ENOMEM; @@ -89,13 +170,19 @@ static int gen_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create) blk_queue_max_hw_sectors(tqueue, 8 * dev->ops->max_phys_sect); - set_capacity(tdisk, tt->capacity(targetdata)); - add_disk(tdisk); - t->type = tt; t->disk = tdisk; t->dev = dev; + set_capacity(tdisk, tt->capacity(targetdata)); + add_disk(tdisk); + + if (gen_register_target(t)) + goto err_init; + + if (tt->sysfs_init) + tt->sysfs_init(t); + mutex_lock(&gn->lock); list_add_tail(&t->list, &gn->targets); mutex_unlock(&gn->lock); @@ -112,20 +199,10 @@ err_t: static void __gen_remove_target(struct nvm_target *t) { - struct nvm_tgt_type *tt = t->type; - struct gendisk *tdisk = t->disk; - struct request_queue *q = tdisk->queue; - - del_gendisk(tdisk); - blk_cleanup_queue(q); - - if (tt->exit) - tt->exit(tdisk->private_data); - - put_disk(tdisk); - list_del(&t->list); - kfree(t); + if (t->type->sysfs_exit) + t->type->sysfs_exit(t); + gen_unregister_target(t); } /** @@ -627,7 +704,6 @@ static void gen_lun_info_print(struct nvm_dev *dev) struct gen_lun *lun; unsigned int i; - gen_for_each_lun(gn, lun, i) { spin_lock(&lun->vlun.lock); diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index d190786..3823891 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -211,6 +211,8 @@ struct nvm_target { struct nvm_dev *dev; struct nvm_tgt_type *type; struct gendisk *disk; + + struct kobject kobj; }; struct nvm_tgt_instance { @@ -434,6 +436,10 @@ 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_dev *, struct gendisk *, int, int); typedef void (nvm_tgt_exit_fn)(void *); +typedef void (nvm_tgt_sysfs_init_fn)(struct nvm_target *); +typedef void (nvm_tgt_sysfs_exit_fn)(struct nvm_target *); +typedef ssize_t(nvm_tgt_sysfs_show_fn)(struct nvm_target *, + struct attribute *, char *); struct nvm_tgt_type { const char *name; @@ -448,6 +454,10 @@ struct nvm_tgt_type { nvm_tgt_init_fn *init; nvm_tgt_exit_fn *exit; + nvm_tgt_sysfs_init_fn *sysfs_init; + nvm_tgt_sysfs_exit_fn *sysfs_exit; + nvm_tgt_sysfs_show_fn *sysfs_show; + /* For internal use */ struct list_head list; };