From: Dan Williams <dan.j.williams@intel.com>
To: Vishal Verma <vishal.l.verma@intel.com>, <linux-cxl@vger.kernel.org>
Cc: <nvdimm@lists.linux.dev>, Dan Williams <dan.j.williams@intel.com>,
"Alison Schofield" <alison.schofield@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
"Dave Jiang" <dave.jiang@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>
Subject: RE: [ndctl PATCH 7/8] cxl: add commands to {enable,disable,destroy}-region
Date: Tue, 19 Jul 2022 19:06:12 -0700 [thread overview]
Message-ID: <62d763149080a_11a166294ab@dwillia2-xfh.jf.intel.com.notmuch> (raw)
In-Reply-To: <20220715062550.789736-8-vishal.l.verma@intel.com>
Vishal Verma wrote:
> With a template from cxl-create-region in place, add its friends:
>
> cxl enable-region
> cxl disable-region
> cxl destroy-region
>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
> ---
> Documentation/cxl/cxl-destroy-region.txt | 39 +++++
> Documentation/cxl/cxl-disable-region.txt | 34 +++++
> Documentation/cxl/cxl-enable-region.txt | 34 +++++
> Documentation/cxl/decoder-option.txt | 6 +
> cxl/builtin.h | 3 +
> cxl/cxl.c | 3 +
> cxl/region.c | 172 +++++++++++++++++++++++
> Documentation/cxl/meson.build | 4 +
> 8 files changed, 295 insertions(+)
> create mode 100644 Documentation/cxl/cxl-destroy-region.txt
> create mode 100644 Documentation/cxl/cxl-disable-region.txt
> create mode 100644 Documentation/cxl/cxl-enable-region.txt
> create mode 100644 Documentation/cxl/decoder-option.txt
>
> diff --git a/Documentation/cxl/cxl-destroy-region.txt b/Documentation/cxl/cxl-destroy-region.txt
> new file mode 100644
> index 0000000..cf1a6fe
> --- /dev/null
> +++ b/Documentation/cxl/cxl-destroy-region.txt
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +cxl-destroy-region(1)
> +=====================
> +
> +NAME
> +----
> +cxl-destroy-region - destroy specified region(s).
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'cxl destroy-region <region> [<options>]'
> +
> +include::region-description.txt[]
> +
> +EXAMPLE
> +-------
> +----
> +# cxl destroy-region all
> +destroyed 2 regions
> +----
> +
> +OPTIONS
> +-------
> +-f::
> +--force::
> + Force a destroy operation even if the region is active.
> + This will attempt to disable the region first.
> +
> +include::decoder-option.txt[]
> +
> +include::debug-option.txt[]
> +
> +include::../copyright.txt[]
> +
> +SEE ALSO
> +--------
> +linkcxl:cxl-list[1], linkcxl:cxl-create-region[1]
> diff --git a/Documentation/cxl/cxl-disable-region.txt b/Documentation/cxl/cxl-disable-region.txt
> new file mode 100644
> index 0000000..2b13a1a
> --- /dev/null
> +++ b/Documentation/cxl/cxl-disable-region.txt
> @@ -0,0 +1,34 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +cxl-disable-region(1)
> +=====================
> +
> +NAME
> +----
> +cxl-disable-region - disable specified region(s).
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'cxl disable-region <region> [<options>]'
> +
> +include::region-description.txt[]
> +
> +EXAMPLE
> +-------
> +----
> +# cxl disable-region all
> +disabled 2 regions
> +----
> +
> +OPTIONS
> +-------
> +include::decoder-option.txt[]
> +
> +include::debug-option.txt[]
> +
> +include::../copyright.txt[]
> +
> +SEE ALSO
> +--------
> +linkcxl:cxl-list[1], linkcxl:cxl-enable-region[1]
> diff --git a/Documentation/cxl/cxl-enable-region.txt b/Documentation/cxl/cxl-enable-region.txt
> new file mode 100644
> index 0000000..86e9aec
> --- /dev/null
> +++ b/Documentation/cxl/cxl-enable-region.txt
> @@ -0,0 +1,34 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +cxl-enable-region(1)
> +=====================
> +
> +NAME
> +----
> +cxl-enable-region - enable specified region(s).
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'cxl enable-region <region> [<options>]'
> +
> +include::region-description.txt[]
> +
> +EXAMPLE
> +-------
> +----
> +# cxl enable-region all
> +enabled 2 regions
> +----
> +
> +OPTIONS
> +-------
> +include::decoder-option.txt[]
> +
> +include::debug-option.txt[]
> +
> +include::../copyright.txt[]
> +
> +SEE ALSO
> +--------
> +linkcxl:cxl-list[1], linkcxl:cxl-disable-region[1]
> diff --git a/Documentation/cxl/decoder-option.txt b/Documentation/cxl/decoder-option.txt
> new file mode 100644
> index 0000000..e638d6e
> --- /dev/null
> +++ b/Documentation/cxl/decoder-option.txt
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +-d::
> +--decoder=::
> + The root decoder to limit the operation to. Only regions that are
> + children of the specified decoder will be acted upon.
> diff --git a/cxl/builtin.h b/cxl/builtin.h
> index 843bada..b28c221 100644
> --- a/cxl/builtin.h
> +++ b/cxl/builtin.h
> @@ -19,4 +19,7 @@ int cmd_enable_port(int argc, const char **argv, struct cxl_ctx *ctx);
> int cmd_set_partition(int argc, const char **argv, struct cxl_ctx *ctx);
> int cmd_disable_bus(int argc, const char **argv, struct cxl_ctx *ctx);
> int cmd_create_region(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_enable_region(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_disable_region(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_destroy_region(int argc, const char **argv, struct cxl_ctx *ctx);
> #endif /* _CXL_BUILTIN_H_ */
> diff --git a/cxl/cxl.c b/cxl/cxl.c
> index f0afcfe..dd1be7a 100644
> --- a/cxl/cxl.c
> +++ b/cxl/cxl.c
> @@ -73,6 +73,9 @@ static struct cmd_struct commands[] = {
> { "set-partition", .c_fn = cmd_set_partition },
> { "disable-bus", .c_fn = cmd_disable_bus },
> { "create-region", .c_fn = cmd_create_region },
> + { "enable-region", .c_fn = cmd_enable_region },
> + { "disable-region", .c_fn = cmd_disable_region },
> + { "destroy-region", .c_fn = cmd_destroy_region },
> };
>
> int main(int argc, const char **argv)
> diff --git a/cxl/region.c b/cxl/region.c
> index 9fe99b2..cb50558 100644
> --- a/cxl/region.c
> +++ b/cxl/region.c
> @@ -45,6 +45,9 @@ struct parsed_params {
>
> enum region_actions {
> ACTION_CREATE,
> + ACTION_ENABLE,
> + ACTION_DISABLE,
> + ACTION_DESTROY,
> };
>
> static struct log_ctx rl;
> @@ -78,7 +81,22 @@ static const struct option create_options[] = {
> OPT_END(),
> };
>
> +static const struct option enable_options[] = {
> + BASE_OPTIONS(),
> + OPT_END(),
> +};
>
> +static const struct option disable_options[] = {
> + BASE_OPTIONS(),
> + OPT_END(),
> +};
> +
> +static const struct option destroy_options[] = {
> + BASE_OPTIONS(),
> + OPT_BOOLEAN('f', "force", ¶m.force,
> + "destroy region even if currently active"),
> + OPT_END(),
> +};
>
> static int parse_create_options(int argc, const char **argv,
> struct parsed_params *p)
> @@ -495,11 +513,90 @@ err_delete:
> return rc;
> }
>
> +static int destroy_region(struct cxl_region *region)
> +{
> + const char *devname = cxl_region_get_devname(region);
> + unsigned int ways, i;
> + int rc;
> +
> + /* First, unbind/disable the region if needed */
> + if (cxl_region_is_enabled(region)) {
> + if (param.force) {
> + rc = cxl_region_disable(region);
> + if (rc) {
> + log_err(&rl, "%s: error disabling region: %s\n",
> + devname, strerror(-rc));
> + return rc;
> + }
> + } else {
> + log_err(&rl, "%s active. Disable it or use --force\n",
> + devname);
> + return -EBUSY;
> + }
> + }
> +
> + /* De-commit the region in preparation for removal */
> + rc = cxl_region_decommit(region);
> + if (rc) {
> + log_err(&rl, "%s: failed to decommit: %s\n", devname,
> + strerror(-rc));
> + return rc;
> + }
> +
> + /* Reset all endpoint decoders and region targets */
> + ways = cxl_region_get_interleave_ways(region);
> + if (ways == 0 || ways == UINT_MAX) {
> + log_err(&rl, "%s: error getting interleave ways\n", devname);
> + return -ENXIO;
> + }
> +
> + for (i = 0; i < ways; i++) {
> + struct cxl_decoder *ep_decoder;
> +
> + ep_decoder = cxl_region_get_target_decoder(region, i);
> + if (!ep_decoder)
> + return -ENXIO;
> +
> + rc = cxl_region_clear_target(region, i);
> + if (rc) {
> + log_err(&rl, "%s: clearing target%d failed: %s\n",
> + devname, i, strerror(abs(rc)));
> + return rc;
> + }
> +
> + rc = cxl_decoder_set_dpa_size(ep_decoder, 0);
> + if (rc) {
> + log_err(&rl, "%s: set_dpa_size failed: %s\n",
> + cxl_decoder_get_devname(ep_decoder),
> + strerror(abs(rc)));
> + return rc;
> + }
> + }
> +
> + /* Finally, delete the region */
> + return cxl_region_delete(region);
> +}
> +
> +static int do_region_xable(struct cxl_region *region, enum region_actions action)
> +{
> + switch (action) {
> + case ACTION_ENABLE:
> + return cxl_region_enable(region);
> + case ACTION_DISABLE:
> + return cxl_region_disable(region);
> + case ACTION_DESTROY:
> + return destroy_region(region);
> + default:
> + return -EINVAL;
> + }
> +}
> +
> static int region_action(int argc, const char **argv, struct cxl_ctx *ctx,
> enum region_actions action,
> const struct option *options, struct parsed_params *p,
> int *count, const char *u)
> {
> + struct cxl_bus *bus;
> int rc = -ENXIO;
>
> log_init(&rl, "cxl region", "CXL_REGION_LOG");
> @@ -509,6 +606,45 @@ static int region_action(int argc, const char **argv, struct cxl_ctx *ctx,
>
> if (action == ACTION_CREATE)
> return create_region(ctx, count, p);
> +
> + cxl_bus_foreach(ctx, bus) {
> + struct cxl_decoder *decoder;
> + struct cxl_port *port;
> +
> + port = cxl_bus_get_port(bus);
> + if (!cxl_port_is_root(port))
> + continue;
> +
> + cxl_decoder_foreach (port, decoder) {
> + struct cxl_region *region, *_r;
> +
> + decoder = util_cxl_decoder_filter(decoder,
> + param.root_decoder);
> + if (!decoder)
> + continue;
I think the stuff after this point wants to be in its own helper because
it's getting pretty smooshed from the indentation levels.
> + cxl_region_foreach_safe(decoder, region, _r)
> + {
Missing 'cxl_region_foreach_safe' in .clang-format?
Other than those minor comments:
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
next prev parent reply other threads:[~2022-07-20 2:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 6:25 [ndctl PATCH 0/8] cxl: add region management Vishal Verma
2022-07-15 6:25 ` [ndctl PATCH 1/8] libcxl: add a depth attribute to cxl_port Vishal Verma
2022-07-20 0:53 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 2/8] cxl/port: Consolidate the debug option in cxl-port man pages Vishal Verma
2022-07-20 0:54 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 3/8] libcxl: Introduce libcxl region and mapping objects Vishal Verma
2022-07-20 1:04 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 4/8] cxl-cli: add region listing support Vishal Verma
2022-07-15 18:35 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 5/8] libcxl: add low level APIs for region creation Vishal Verma
2022-07-20 1:25 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 6/8] cxl: add a 'create-region' command Vishal Verma
2022-07-15 23:22 ` Dan Williams
2022-07-20 2:00 ` Dan Williams
2022-07-15 6:25 ` [ndctl PATCH 7/8] cxl: add commands to {enable,disable,destroy}-region Vishal Verma
2022-07-20 2:06 ` Dan Williams [this message]
2022-07-15 6:25 ` [ndctl PATCH 8/8] cxl/list: make memdevs and regions the default listing Vishal Verma
2022-07-20 2:15 ` Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62d763149080a_11a166294ab@dwillia2-xfh.jf.intel.com.notmuch \
--to=dan.j.williams@intel.com \
--cc=alison.schofield@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.