On Thu, Oct 7, 2021 at 1:22 AM Vishal Verma <[email protected]> wrote:
>
> Add the following cxl-cli commands: read-labels, write-labels,
> zero-labels. They operate on a CXL memdev, or a set of memdevs, and
> allow interacting with the label storage area (LSA) on the device.
>
> Add man pages for the above cxl-cli commands.
>
> Cc: Dan Williams <[email protected]>
> Signed-off-by: Vishal Verma <[email protected]>
[..]
> diff --git a/Documentation/cxl/cxl-write-labels.txt
> b/Documentation/cxl/cxl-write-labels.txt
> new file mode 100644
> index 0000000..c4592b3
> --- /dev/null
> +++ b/Documentation/cxl/cxl-write-labels.txt
> @@ -0,0 +1,32 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +cxl-write-labels(1)
> +===================
> +
> +NAME
> +----
> +cxl-write-labels - write data to the label area on a memdev
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'cxl write-labels <mem> [-i <filename>]'
> +
> +include::labels-description.txt[]
> +Read data from the input filename, or stdin, and write it to the given
> +<mem> device. Note that the device must not be active in any region,
...just add:
"or actively registered with the nvdimm subsystem,"
> +otherwise the kernel will not allow write access to the device's label
> +data area.
> +
> +OPTIONS
> +-------
> +include::labels-options.txt[]
> +-i::
> +--input::
> + input file
> +
> +SEE ALSO
> +--------
> +linkcxl:cxl-read-labels[1],
> +linkcxl:cxl-zero-labels[1],
> +CXL-2.0 9.13.2
> diff --git a/Documentation/cxl/cxl-zero-labels.txt
> b/Documentation/cxl/cxl-zero-labels.txt
> new file mode 100644
> index 0000000..bf95b24
> --- /dev/null
> +++ b/Documentation/cxl/cxl-zero-labels.txt
> @@ -0,0 +1,29 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +cxl-zero-labels(1)
> +==================
> +
> +NAME
> +----
> +cxl-zero-labels - zero out the label area on a set of memdevs
> +
> +SYNOPSIS
> +--------
> +[verse]
> +'cxl zero-labels' <mem0> [<mem1>..<memN>] [<options>]
> +
> +include::labels-description.txt[]
> +This command resets the device to its default state by
> +deleting all labels.
> +
> +OPTIONS
> +-------
> +include::labels-options.txt[]
> +
> +include::../copyright.txt[]
> +
> +SEE ALSO
> +--------
> +linkcxl:cxl-read-labels[1],
> +linkcxl:cxl-write-labels[1],
> +CXL-2.0 9.13.2
> diff --git a/Documentation/cxl/labels-description.txt
> b/Documentation/cxl/labels-description.txt
> new file mode 100644
> index 0000000..f60bd5d
> --- /dev/null
> +++ b/Documentation/cxl/labels-description.txt
> @@ -0,0 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +DESCRIPTION
> +-----------
> +The region label area is a small persistent partition of capacity
> +available on some CXL memory devices. The label area is used to
> +and configure or determine the set of memory devices participating
> +in different interleave sets.
> diff --git a/Documentation/cxl/labels-options.txt
> b/Documentation/cxl/labels-options.txt
> new file mode 100644
> index 0000000..06fbac3
> --- /dev/null
> +++ b/Documentation/cxl/labels-options.txt
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +<memory device(s)>::
> +include::memdev-option.txt[]
> +
> +-s::
> +--size=::
> + Limit the operation to the given number of bytes. A size of 0
> + indicates to operate over the entire label capacity.
> +
> +-O::
> +--offset=::
> + Begin the operation at the given offset into the label area.
> +
> +-v::
> + Turn on verbose debug messages in the library (if libcxl was built
> with
> + logging and debug enabled).
> diff --git a/Documentation/cxl/memdev-option.txt
> b/Documentation/cxl/memdev-option.txt
> new file mode 100644
> index 0000000..e778582
> --- /dev/null
> +++ b/Documentation/cxl/memdev-option.txt
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> +A 'memX' device name, or a memdev id number. Restrict the operation to
> +the specified memdev(s). The keyword 'all' can be specified to indicate
> +the lack of any restriction.
> diff --git a/cxl/builtin.h b/cxl/builtin.h
> index 3797f98..78eca6e 100644
> --- a/cxl/builtin.h
> +++ b/cxl/builtin.h
> @@ -5,4 +5,9 @@
>
> struct cxl_ctx;
> int cmd_list(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_write_labels(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_read_labels(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_zero_labels(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_init_labels(int argc, const char **argv, struct cxl_ctx *ctx);
> +int cmd_check_labels(int argc, const char **argv, struct cxl_ctx *ctx);
> #endif /* _CXL_BUILTIN_H_ */
> diff --git a/cxl/cxl.c b/cxl/cxl.c
> index a7725f8..4b1661d 100644
> --- a/cxl/cxl.c
> +++ b/cxl/cxl.c
> @@ -61,6 +61,9 @@ static struct cmd_struct commands[] = {
> { "version", .c_fn = cmd_version },
> { "list", .c_fn = cmd_list },
> { "help", .c_fn = cmd_help },
> + { "zero-labels", .c_fn = cmd_zero_labels },
> + { "read-labels", .c_fn = cmd_read_labels },
> + { "write-labels", .c_fn = cmd_write_labels },
> };
>
> int main(int argc, const char **argv)
> diff --git a/cxl/memdev.c b/cxl/memdev.c
> new file mode 100644
> index 0000000..ffc66df
> --- /dev/null
> +++ b/cxl/memdev.c
> @@ -0,0 +1,314 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (C) 2020-2021 Intel Corporation. All rights reserved. */
> +#include <stdio.h>
> +#include <errno.h>
> +#include <stdlib.h>
> +#include <unistd.h>
> +#include <limits.h>
> +#include <util/log.h>
> +#include <util/filter.h>
> +#include <cxl/libcxl.h>
> +#include <util/parse-options.h>
> +#include <ccan/minmax/minmax.h>
> +#include <ccan/array_size/array_size.h>
> +
> +struct action_context {
> + FILE *f_out;
> + FILE *f_in;
> +};
> +
> +static struct parameters {
> + const char *outfile;
> + const char *infile;
> + unsigned len;
> + unsigned offset;
> + bool verbose;
> +} param;
> +
> +#define fail(fmt, ...) \
> +do { \
> + fprintf(stderr, "cxl-%s:%s:%d: " fmt, \
> + VERSION, __func__, __LINE__, ##__VA_ARGS__); \
> +} while (0)
> +
> +#define BASE_OPTIONS() \
> +OPT_BOOLEAN('v',"verbose", ¶m.verbose, "turn on debug")
> +
> +#define READ_OPTIONS() \
> +OPT_STRING('o', "output", ¶m.outfile, "output-file", \
> + "filename to write label area contents")
> +
> +#define WRITE_OPTIONS() \
> +OPT_STRING('i', "input", ¶m.infile, "input-file", \
> + "filename to read label area data")
> +
> +#define LABEL_OPTIONS() \
> +OPT_UINTEGER('s', "size", ¶m.len, "number of label bytes to operate"), \
> +OPT_UINTEGER('O', "offset", ¶m.offset, \
> + "offset into the label area to start operation")
> +
> +static const struct option read_options[] = {
> + BASE_OPTIONS(),
> + LABEL_OPTIONS(),
> + READ_OPTIONS(),
> + OPT_END(),
> +};
> +
> +static const struct option write_options[] = {
> + BASE_OPTIONS(),
> + LABEL_OPTIONS(),
> + WRITE_OPTIONS(),
> + OPT_END(),
> +};
> +
> +static const struct option zero_options[] = {
> + BASE_OPTIONS(),
> + LABEL_OPTIONS(),
> + OPT_END(),
> +};
> +
> +static int action_zero(struct cxl_memdev *memdev, struct action_context
> *actx)
> +{
> + int rc;
> +
> + if (cxl_memdev_is_active(memdev)) {
> + fprintf(stderr, "%s: memdev active, abort label write\n",
> + cxl_memdev_get_devname(memdev));
> + return -EBUSY;
> + }
> +
> + rc = cxl_memdev_zero_label(memdev);
> + if (rc < 0)
> + fprintf(stderr, "%s: label zeroing failed: %s\n",
> + cxl_memdev_get_devname(memdev), strerror(-rc));
> +
> + return rc;
> +}
> +
> +static int action_write(struct cxl_memdev *memdev, struct action_context
> *actx)
> +{
> + size_t size = param.len, read_len;
> + unsigned char *buf;
> + int rc;
> +
> + if (cxl_memdev_is_active(memdev)) {
Similar cxl_memdev_nvdimm_bridge_active() comment as before...
...but other than that nothing else jumps out:
Reviewed-by: Dan Williams <[email protected]>
