From patchwork Fri Apr 6 21:24:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10327607 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 4CB3A6053F for ; Fri, 6 Apr 2018 21:24:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C5D629697 for ; Fri, 6 Apr 2018 21:24:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 308B229699; Fri, 6 Apr 2018 21:24:31 +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=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA9F929697 for ; Fri, 6 Apr 2018 21:24:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 93E2F226FAA61; Fri, 6 Apr 2018 14:24:29 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4E83422620E7A for ; Fri, 6 Apr 2018 14:24:27 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Apr 2018 14:24:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,416,1517904000"; d="scan'208";a="31652159" Received: from vverma7-mobl4.lm.intel.com ([10.252.140.48]) by orsmga008.jf.intel.com with ESMTP; 06 Apr 2018 14:24:26 -0700 From: Vishal Verma To: Subject: [ndctl PATCH 1/2] libndctl: Add APIs for query and control of write_cache Date: Fri, 6 Apr 2018 15:24:16 -0600 Message-Id: <20180406212417.16227-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Add APIs to get the state of write_cache for pmem namespaces, and also to enable or disable the write_cache. Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Dan Wiiliams --- ndctl/lib/libndctl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ ndctl/lib/libndctl.sym | 3 ++ ndctl/libndctl.h | 3 ++ 3 files changed, 82 insertions(+) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 580a450..1f59e2a 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -3918,6 +3918,82 @@ NDCTL_EXPORT int ndctl_namespace_get_numa_node(struct ndctl_namespace *ndns) return ndns->numa_node; } +static int __ndctl_namespace_set_write_cache(struct ndctl_namespace *ndns, + int state) +{ + struct ndctl_ctx *ctx = ndctl_namespace_get_ctx(ndns); + struct ndctl_pfn *pfn = ndctl_namespace_get_pfn(ndns); + char buf[SYSFS_ATTR_SIZE]; + int len = ndns->buf_len; + const char *bdev; + char path[50]; + + if (state != 1 && state != 0) + return -ENXIO; + if (pfn) + bdev = ndctl_pfn_get_block_device(pfn); + else + bdev = ndctl_namespace_get_block_device(ndns); + + if (!bdev) + return -ENXIO; + + if (snprintf(path, len, "/sys/block/%s/dax/write_cache", bdev) >= len) { + err(ctx, "%s: buffer too small!\n", + ndctl_namespace_get_devname(ndns)); + return -ENXIO; + } + + sprintf(buf, "%d\n", state); + return sysfs_write_attr(ctx, path, buf); +} + +NDCTL_EXPORT int ndctl_namespace_enable_write_cache( + struct ndctl_namespace *ndns) +{ + return __ndctl_namespace_set_write_cache(ndns, 1); +} + +NDCTL_EXPORT int ndctl_namespace_disable_write_cache( + struct ndctl_namespace *ndns) +{ + return __ndctl_namespace_set_write_cache(ndns, 0); +} + +NDCTL_EXPORT int ndctl_namespace_write_cache_is_enabled( + struct ndctl_namespace *ndns) +{ + struct ndctl_ctx *ctx = ndctl_namespace_get_ctx(ndns); + struct ndctl_pfn *pfn = ndctl_namespace_get_pfn(ndns); + int len = ndns->buf_len, wc; + char buf[SYSFS_ATTR_SIZE]; + const char *bdev; + char path[50]; + + if (pfn) + bdev = ndctl_pfn_get_block_device(pfn); + else + bdev = ndctl_namespace_get_block_device(ndns); + + if (!bdev) + return -ENXIO; + + if (snprintf(path, len, "/sys/block/%s/dax/write_cache", bdev) >= len) { + err(ctx, "%s: buffer too small!\n", + ndctl_namespace_get_devname(ndns)); + return -ENXIO; + } + + if (sysfs_read_attr(ctx, path, buf) < 0) + return -ENXIO; + + if (sscanf(buf, "%d", &wc) == 1) + if (wc) + return 1; + + return 0; +} + NDCTL_EXPORT int ndctl_namespace_delete(struct ndctl_namespace *ndns) { struct ndctl_region *region = ndctl_namespace_get_region(ndns); diff --git a/ndctl/lib/libndctl.sym b/ndctl/lib/libndctl.sym index 3209aef..4709c47 100644 --- a/ndctl/lib/libndctl.sym +++ b/ndctl/lib/libndctl.sym @@ -352,4 +352,7 @@ global: ndctl_dimm_fw_update_supported; ndctl_region_get_persistence_domain; ndctl_bus_get_persistence_domain; + ndctl_namespace_write_cache_is_enabled; + ndctl_namespace_enable_write_cache; + ndctl_namespace_disable_write_cache; } LIBNDCTL_14; diff --git a/ndctl/libndctl.h b/ndctl/libndctl.h index 684fcd4..1ecbabb 100644 --- a/ndctl/libndctl.h +++ b/ndctl/libndctl.h @@ -490,6 +490,9 @@ struct ndctl_bb *ndctl_namespace_injection_get_next_bb( for (bb = ndctl_namespace_injection_get_first_bb(ndns); \ bb != NULL; \ bb = ndctl_namespace_injection_get_next_bb(ndns, bb)) +int ndctl_namespace_write_cache_is_enabled(struct ndctl_namespace *ndns); +int ndctl_namespace_enable_write_cache(struct ndctl_namespace *ndns); +int ndctl_namespace_disable_write_cache(struct ndctl_namespace *ndns); struct ndctl_btt; struct ndctl_btt *ndctl_btt_get_first(struct ndctl_region *region);