From patchwork Mon Oct 24 23:21:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Jiang X-Patchwork-Id: 9393541 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 EB01D60231 for ; Mon, 24 Oct 2016 23:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC5EB29167 for ; Mon, 24 Oct 2016 23:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0BCC29187; Mon, 24 Oct 2016 23:21:17 +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=-1.9 required=2.0 tests=BAYES_00, 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 5553F29167 for ; Mon, 24 Oct 2016 23:21:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EB6021A1E46; Mon, 24 Oct 2016 16:21:16 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AAA5F1A1E46 for ; Mon, 24 Oct 2016 16:21:15 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP; 24 Oct 2016 16:21:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,543,1473145200"; d="scan'208";a="23156353" Received: from djiang5-desk3.ch.intel.com ([143.182.137.38]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2016 16:21:15 -0700 Subject: [PATCH] ndctl: introduce 4k allocation support for creating namespace From: Dave Jiang To: dan.j.williams@intel.com Date: Mon, 24 Oct 2016 16:21:15 -0700 Message-ID: <147735127505.62863.2379314615045728159.stgit@djiang5-desk3.ch.intel.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Existing implementation defaults all pages allocated as 2M superpages. For nfit_test dax device we need 4k pages allocated to work properly. Adding an --align,-a option to provide the alignment. Will accept 4k and 2M at the moment as proper parameter. No -a option still defaults to 2M. Signed-off-by: Dave Jiang --- ndctl/builtin-xaction-namespace.c | 22 ++++++++++++++++++++-- util/size.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ndctl/builtin-xaction-namespace.c b/ndctl/builtin-xaction-namespace.c index 9b1702d..89ce6ce 100644 --- a/ndctl/builtin-xaction-namespace.c +++ b/ndctl/builtin-xaction-namespace.c @@ -49,6 +49,7 @@ static struct parameters { const char *region; const char *reconfig; const char *sector_size; + const char *align; } param; void builtin_xaction_namespace_reset(void) @@ -71,6 +72,7 @@ struct parsed_parameters { enum ndctl_namespace_mode mode; unsigned long long size; unsigned long sector_size; + unsigned long align; }; #define debug(fmt, ...) \ @@ -104,6 +106,8 @@ OPT_STRING('l', "sector-size", ¶m.sector_size, "lba-size", \ "specify the logical sector size in bytes"), \ OPT_STRING('t', "type", ¶m.type, "type", \ "specify the type of namespace to create 'pmem' or 'blk'"), \ +OPT_STRING('a', "align", ¶m.align, "align", \ + "specify the namespace alignment in bytes (default: 0x200000 (2M))"), \ OPT_BOOLEAN('f', "force", &force, "reconfigure namespace even if currently active") static const struct option base_options[] = { @@ -319,7 +323,7 @@ static int setup_namespace(struct ndctl_region *region, try(ndctl_pfn, set_uuid, pfn, uuid); try(ndctl_pfn, set_location, pfn, p->loc); - try(ndctl_pfn, set_align, pfn, SZ_2M); + try(ndctl_pfn, set_align, pfn, p->align); try(ndctl_pfn, set_namespace, pfn, ndns); rc = ndctl_pfn_enable(pfn); } else if (p->mode == NDCTL_NS_MODE_DAX) { @@ -327,7 +331,7 @@ static int setup_namespace(struct ndctl_region *region, try(ndctl_dax, set_uuid, dax, uuid); try(ndctl_dax, set_location, dax, p->loc); - try(ndctl_dax, set_align, dax, SZ_2M); + try(ndctl_dax, set_align, dax, p->align); try(ndctl_dax, set_namespace, dax, ndns); rc = ndctl_dax_enable(dax); } else if (p->mode == NDCTL_NS_MODE_SAFE) { @@ -383,6 +387,20 @@ static int validate_namespace_options(struct ndctl_region *region, memset(p, 0, sizeof(*p)); + if (param.align) { + p->align = parse_size64(param.align); + switch (p->align) { + case SZ_4K: + case SZ_2M: + break; + case SZ_1G: /* unsupported yet... */ + default: + debug("%s: invalid align\n", __func__); + return -EINVAL; + } + } else + p->align = SZ_2M; + if (param.size) p->size = parse_size64(param.size); else if (ndns) diff --git a/util/size.h b/util/size.h index 50917a5..634c926 100644 --- a/util/size.h +++ b/util/size.h @@ -2,6 +2,7 @@ #define _NDCTL_SIZE_H_ #define SZ_1K 0x00000400 +#define SZ_4K 0x00001000 #define SZ_1M 0x00100000 #define SZ_2M 0x00200000 #define SZ_4M 0x00400000