From patchwork Wed Dec 4 02:33:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Redhairer" X-Patchwork-Id: 11272075 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58278921 for ; Wed, 4 Dec 2019 02:33:24 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DE232073F for ; Wed, 4 Dec 2019 02:33:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DE232073F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5BDA7100DC2D9; Tue, 3 Dec 2019 18:36:46 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=redhairer.li@intel.com; receiver= Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 AA3A2100DC2B8 for ; Tue, 3 Dec 2019 18:36:43 -0800 (PST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 18:33:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,275,1571727600"; d="dat'59?scan'59,208,59";a="205220555" Received: from pgsmsx104.gar.corp.intel.com ([10.221.44.91]) by orsmga008.jf.intel.com with ESMTP; 03 Dec 2019 18:33:19 -0800 Received: from pgsmsx114.gar.corp.intel.com ([169.254.4.197]) by PGSMSX104.gar.corp.intel.com ([10.221.44.91]) with mapi id 14.03.0439.000; Wed, 4 Dec 2019 10:33:18 +0800 From: "Li, Redhairer" To: "linux-nvdimm@lists.01.org" CC: "Williams, Dan J" Subject: [PATCH] daxctl: Change region input type from INTEGER to STRING. Thread-Topic: [PATCH] daxctl: Change region input type from INTEGER to STRING. Thread-Index: AdWqSy7tSheIw9IbRFeymChi7Sx2XA== Date: Wed, 4 Dec 2019 02:33:18 +0000 Message-ID: <2369E669066F8E42A79A3DF0E43B9E643AC9EB31@pgsmsx114.gar.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <2369E669066F8E42A79A3DF0E43B9E643AC9EB31@pgsmsx114.gar.corp.intel.com> x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjFkMWE5NTctZDg2OS00ZDVmLWEwMzUtMmIzY2E5NzU4ZGQ1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNUJTUU54VVQzdTB2QUNNcU9tQmFKTHJvUWl3cWlcLzczcVVkWmxYeFNMQTgzTFhTNUxPWXVnVHFFNnR5dnN4cFoifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [172.30.20.205] MIME-Version: 1.0 Message-ID-Hash: SJ7OUSXVH2UCBQ2D3HJSYTXQKMJSEKUX X-Message-ID-Hash: SJ7OUSXVH2UCBQ2D3HJSYTXQKMJSEKUX X-MailFrom: redhairer.li@intel.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation X-Content-Filtered-By: Mailman/MimeDel 3.1.1 X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Allow daxctl to accept both , and region name as region parameter. For example: daxctl list -r region5 daxctl list -r 5 Link: https://github.com/pmem/ndctl/issues/109 Signed-off-by: Redhairer Li --- daxctl/device.c | 11 ++++------- daxctl/list.c | 14 ++++++-------- util/filter.c | 16 ++++++++++++++++ util/filter.h | 2 ++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/daxctl/device.c b/daxctl/device.c index 72e506e..d9db2f9 100644 --- a/daxctl/device.c +++ b/daxctl/device.c @@ -19,15 +19,13 @@ static struct { const char *dev; const char *mode; - int region_id; + const char *region; bool no_online; bool no_movable; bool force; bool human; bool verbose; -} param = { - .region_id = -1, -}; +} param; enum dev_mode { DAXCTL_DEV_MODE_UNKNOWN, @@ -51,7 +49,7 @@ enum device_action { }; #define BASE_OPTIONS() \ -OPT_INTEGER('r', "region", ¶m.region_id, "restrict to the given region"), \ +OPT_STRING('r', "region", ¶m.region, "region-id", "filter by region"), \ OPT_BOOLEAN('u', "human", ¶m.human, "use human friendly number formats"), \ OPT_BOOLEAN('v', "verbose", ¶m.verbose, "emit more debug messages") @@ -484,8 +482,7 @@ static int do_xaction_device(const char *device, enum device_action action, *processed = 0; daxctl_region_foreach(ctx, region) { - if (param.region_id >= 0 && param.region_id - != daxctl_region_get_id(region)) + if (!util_daxctl_region_filter(region, device)) continue; daxctl_dev_foreach(region, dev) { diff --git a/daxctl/list.c b/daxctl/list.c index e56300d..6c6251b 100644 --- a/daxctl/list.c +++ b/daxctl/list.c @@ -44,10 +44,8 @@ static unsigned long listopts_to_flags(void) static struct { const char *dev; - int region_id; -} param = { - .region_id = -1, -}; + const char *region; +} param; static int did_fail; @@ -66,7 +64,8 @@ static int num_list_flags(void) int cmd_list(int argc, const char **argv, struct daxctl_ctx *ctx) { const struct option options[] = { - OPT_INTEGER('r', "region", ¶m.region_id, "filter by region"), + OPT_STRING('r', "region", ¶m.region, "region-id", + "filter by region"), OPT_STRING('d', "dev", ¶m.dev, "dev-id", "filter by dax device instance name"), OPT_BOOLEAN('D', "devices", &list.devs, "include dax device info"), @@ -94,7 +93,7 @@ int cmd_list(int argc, const char **argv, struct daxctl_ctx *ctx) usage_with_options(u, options); if (num_list_flags() == 0) { - list.regions = param.region_id >= 0; + list.regions = !!param.region; list.devs = !!param.dev; } @@ -106,8 +105,7 @@ int cmd_list(int argc, const char **argv, struct daxctl_ctx *ctx) daxctl_region_foreach(ctx, region) { struct json_object *jregion = NULL; - if (param.region_id >= 0 && param.region_id - != daxctl_region_get_id(region)) + if (!util_daxctl_region_filter(region, param.region)) continue; if (list.regions) { diff --git a/util/filter.c b/util/filter.c index 1734bce..877d6c7 100644 --- a/util/filter.c +++ b/util/filter.c @@ -335,6 +335,22 @@ struct daxctl_dev *util_daxctl_dev_filter(struct daxctl_dev *dev, return NULL; } +struct daxctl_region *util_daxctl_region_filter(struct daxctl_region *region, + const char *ident) +{ + int region_id; + + if (!ident || strcmp(ident, "all") == 0) + return region; + + if ((sscanf(ident, "%d", ®ion_id) == 1 + || sscanf(ident, "region%d", ®ion_id) == 1) + && daxctl_region_get_id(region) == region_id) + return region; + + return NULL; +} + static enum ndctl_namespace_mode mode_to_type(const char *mode) { if (!mode) diff --git a/util/filter.h b/util/filter.h index c2cdddf..0c12b94 100644 --- a/util/filter.h +++ b/util/filter.h @@ -37,6 +37,8 @@ struct ndctl_region *util_region_filter_by_namespace(struct ndctl_region *region const char *ident); struct daxctl_dev *util_daxctl_dev_filter(struct daxctl_dev *dev, const char *ident); +struct daxctl_region *util_daxctl_region_filter(struct daxctl_region *region, + const char *ident); struct json_object;