From patchwork Thu Dec 8 21:29:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 13068947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAADAC4332F for ; Thu, 8 Dec 2022 21:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229798AbiLHV3G (ORCPT ); Thu, 8 Dec 2022 16:29:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229589AbiLHV3F (ORCPT ); Thu, 8 Dec 2022 16:29:05 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E1FE8426B for ; Thu, 8 Dec 2022 13:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670534944; x=1702070944; h=subject:from:to:cc:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NJHZn6/cXtZFPw8koUObH+vbAw1TMznWvoJVYXV7BeE=; b=X0JFWsNWET5hvSkI6j3UFCnza8IB6HHCrbAOArU/oS8q5qPtX2lnoQsw ehZBS5ba6jVK4J4AFn60SM71RG+IIutnrp7tzPQHUlaAP6mczYOgjz4BP GGKKMhVByRAhTlfiwh1ubCCZjuIN3Mvh8b2sDeh9USd6c4fnVjZeyeoio hzKkuClTGMzNmSK26UShyz2g2VdmVGHoFFFAMGPJyP2net+0asaf1i53G O1+TLNroGwYTP695candNNsF2FdNgrQ+2l4WIAel8WrV/piIOO6/CFKA+ a3HYGIOq8WlYyWqq46aL1p7oS7STgiDhtgSriwdPSOoC3hFsBOUGQsBc8 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="304950712" X-IronPort-AV: E=Sophos;i="5.96,228,1665471600"; d="scan'208";a="304950712" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2022 13:29:04 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10555"; a="649323076" X-IronPort-AV: E=Sophos;i="5.96,228,1665471600"; d="scan'208";a="649323076" Received: from kputnam-mobl1.amr.corp.intel.com (HELO dwillia2-xfh.jf.intel.com) ([10.251.25.149]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2022 13:29:03 -0800 Subject: [ndctl PATCH v2 11/18] cxl/region: Make ways an integer argument From: Dan Williams To: linux-cxl@vger.kernel.org Cc: vishal.l.verma@intel.com, alison.schofield@intel.com, nvdimm@lists.linux.dev, vishal.l.verma@intel.com Date: Thu, 08 Dec 2022 13:29:03 -0800 Message-ID: <167053494297.582963.8195034137436682440.stgit@dwillia2-xfh.jf.intel.com> In-Reply-To: <167053487710.582963.17616889985000817682.stgit@dwillia2-xfh.jf.intel.com> References: <167053487710.582963.17616889985000817682.stgit@dwillia2-xfh.jf.intel.com> User-Agent: StGit/0.18-3-g996c MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Since --ways does not take a unit value like --size, just make it an integer argument directly and skip the hand coded conversion. Signed-off-by: Dan Williams Reviewed-by: Alison Schofield --- cxl/region.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/cxl/region.c b/cxl/region.c index 334fcc291de7..494da5139c05 100644 --- a/cxl/region.c +++ b/cxl/region.c @@ -21,21 +21,23 @@ static struct region_params { const char *bus; const char *size; - const char *ways; const char *granularity; const char *type; const char *root_decoder; const char *region; + int ways; bool memdevs; bool force; bool human; bool debug; -} param; +} param = { + .ways = INT_MAX, +}; struct parsed_params { u64 size; u64 ep_min_size; - unsigned int ways; + int ways; unsigned int granularity; const char **targets; int num_targets; @@ -63,9 +65,8 @@ OPT_BOOLEAN(0, "debug", ¶m.debug, "turn on debug") OPT_STRING('s', "size", ¶m.size, \ "size in bytes or with a K/M/G etc. suffix", \ "total size desired for the resulting region."), \ -OPT_STRING('w', "ways", ¶m.ways, \ - "number of interleave ways", \ - "number of memdevs participating in the regions interleave set"), \ +OPT_INTEGER('w', "ways", ¶m.ways, \ + "number of memdevs participating in the regions interleave set"), \ OPT_STRING('g', "granularity", \ ¶m.granularity, "interleave granularity", \ "granularity of the interleave set"), \ @@ -126,15 +127,11 @@ static int parse_create_options(int argc, const char **argv, } } - if (param.ways) { - unsigned long ways = strtoul(param.ways, NULL, 0); - - if (ways == ULONG_MAX || (int)ways <= 0) { - log_err(&rl, "Invalid interleave ways: %s\n", - param.ways); - return -EINVAL; - } - p->ways = ways; + if (param.ways <= 0) { + log_err(&rl, "Invalid interleave ways: %d\n", param.ways); + return -EINVAL; + } else if (param.ways < INT_MAX) { + p->ways = param.ways; } else if (argc) { p->ways = argc; } else { @@ -155,13 +152,13 @@ static int parse_create_options(int argc, const char **argv, } - if (argc > (int)p->ways) { + if (argc > p->ways) { for (i = p->ways; i < argc; i++) log_err(&rl, "extra argument: %s\n", p->targets[i]); return -EINVAL; } - if (argc < (int)p->ways) { + if (argc < p->ways) { log_err(&rl, "too few target arguments (%d) for interleave ways (%u)\n", argc, p->ways); @@ -253,7 +250,7 @@ static bool validate_memdev(struct cxl_memdev *memdev, const char *target, static int validate_config_memdevs(struct cxl_ctx *ctx, struct parsed_params *p) { - unsigned int i, matched = 0; + int i, matched = 0; for (i = 0; i < p->ways; i++) { struct cxl_memdev *memdev; @@ -393,7 +390,8 @@ static int cxl_region_determine_granularity(struct cxl_region *region, struct parsed_params *p) { const char *devname = cxl_region_get_devname(region); - unsigned int granularity, ways; + unsigned int granularity; + int ways; /* Default granularity will be the root decoder's granularity */ granularity = cxl_decoder_get_interleave_granularity(p->root_decoder); @@ -408,7 +406,7 @@ static int cxl_region_determine_granularity(struct cxl_region *region, return granularity; ways = cxl_decoder_get_interleave_ways(p->root_decoder); - if (ways == 0 || ways == UINT_MAX) { + if (ways == 0 || ways == -1) { log_err(&rl, "%s: unable to determine root decoder ways\n", devname); return -ENXIO; @@ -436,12 +434,11 @@ static int create_region(struct cxl_ctx *ctx, int *count, { unsigned long flags = UTIL_JSON_TARGETS; struct json_object *jregion; - unsigned int i, granularity; struct cxl_region *region; + int i, rc, granularity; u64 size, max_extent; const char *devname; uuid_t uuid; - int rc; rc = create_region_validate_config(ctx, p); if (rc)