From: Dan Williams <dan.j.williams@intel.com>
To: linux-nvdimm@lists.01.org
Cc: vishal.l.verma@intel.com
Subject: [ndctl PATCH 25/36] ndctl/dimm: Rework iteration to drop unaligned pointers
Date: Sat, 29 Feb 2020 12:22:17 -0800 [thread overview]
Message-ID: <158300773732.2141307.720285708132556948.stgit@dwillia2-desk3.amr.corp.intel.com> (raw)
In-Reply-To: <158300760415.2141307.14060353322051900501.stgit@dwillia2-desk3.amr.corp.intel.com>
Similar to ->get_firmware_status() introduce ->{get,set}_xfer() and
->{get,set}_offset() so that the iteration core can consult/update the
command data in place.
Link: https://github.com/pmem/ndctl/issues/131
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
ndctl/lib/libndctl.c | 60 ++++++++++++++++++++++++++++++++++++++++----------
ndctl/lib/private.h | 6 +++--
2 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
index 97fd98545440..a996bff66fb2 100644
--- a/ndctl/lib/libndctl.c
+++ b/ndctl/lib/libndctl.c
@@ -2523,6 +2523,36 @@ static u32 cmd_get_firmware_status(struct ndctl_cmd *cmd)
return -1U;
}
+static void cmd_set_xfer(struct ndctl_cmd *cmd, u32 xfer)
+{
+ if (cmd->type == ND_CMD_GET_CONFIG_DATA)
+ cmd->get_data->in_length = xfer;
+ else
+ cmd->set_data->in_length = xfer;
+}
+
+static u32 cmd_get_xfer(struct ndctl_cmd *cmd)
+{
+ if (cmd->type == ND_CMD_GET_CONFIG_DATA)
+ return cmd->get_data->in_length;
+ return cmd->set_data->in_length;
+}
+
+static void cmd_set_offset(struct ndctl_cmd *cmd, u32 offset)
+{
+ if (cmd->type == ND_CMD_GET_CONFIG_DATA)
+ cmd->get_data->in_offset = offset;
+ else
+ cmd->set_data->in_offset = offset;
+}
+
+static u32 cmd_get_offset(struct ndctl_cmd *cmd)
+{
+ if (cmd->type == ND_CMD_GET_CONFIG_DATA)
+ return cmd->get_data->in_offset;
+ return cmd->set_data->in_offset;
+}
+
NDCTL_EXPORT struct ndctl_cmd *ndctl_dimm_cmd_new_vendor_specific(
struct ndctl_dimm *dimm, unsigned int opcode, size_t input_size,
size_t output_size)
@@ -2659,9 +2689,11 @@ NDCTL_EXPORT struct ndctl_cmd *ndctl_dimm_cmd_new_cfg_read(struct ndctl_cmd *cfg
cmd->get_data->in_offset = 0;
cmd->get_data->in_length = cfg_size->get_size->max_xfer;
cmd->get_firmware_status = cmd_get_firmware_status;
+ cmd->get_xfer = cmd_get_xfer;
+ cmd->set_xfer = cmd_set_xfer;
+ cmd->get_offset = cmd_get_offset;
+ cmd->set_offset = cmd_set_offset;
cmd->iter.init_offset = 0;
- cmd->iter.offset = &cmd->get_data->in_offset;
- cmd->iter.xfer = &cmd->get_data->in_length;
cmd->iter.max_xfer = cfg_size->get_size->max_xfer;
cmd->iter.data = cmd->get_data->out_buf;
cmd->iter.total_xfer = cfg_size->get_size->config_size;
@@ -2680,9 +2712,11 @@ NDCTL_EXPORT struct ndctl_cmd *ndctl_dimm_cmd_new_cfg_read(struct ndctl_cmd *cfg
static void iter_set_extent(struct ndctl_cmd_iter *iter, unsigned int len,
unsigned int offset)
{
+ struct ndctl_cmd *cmd = container_of(iter, typeof(*cmd), iter);
+
iter->init_offset = offset;
- *iter->offset = offset;
- *iter->xfer = min(iter->max_xfer, len);
+ cmd->set_offset(cmd, offset);
+ cmd->set_xfer(cmd, min(cmd->get_xfer(cmd), len));
iter->total_xfer = len;
}
@@ -2746,9 +2780,11 @@ NDCTL_EXPORT struct ndctl_cmd *ndctl_dimm_cmd_new_cfg_write(struct ndctl_cmd *cf
cmd->set_data->in_offset = cfg_read->iter.init_offset;
cmd->set_data->in_length = cfg_read->iter.max_xfer;
cmd->get_firmware_status = cmd_get_firmware_status;
+ cmd->get_xfer = cmd_get_xfer;
+ cmd->set_xfer = cmd_set_xfer;
+ cmd->get_offset = cmd_get_offset;
+ cmd->set_offset = cmd_set_offset;
cmd->iter.init_offset = cfg_read->iter.init_offset;
- cmd->iter.offset = &cmd->set_data->in_offset;
- cmd->iter.xfer = &cmd->set_data->in_length;
cmd->iter.max_xfer = cfg_read->iter.max_xfer;
cmd->iter.data = cmd->set_data->in_buf;
cmd->iter.total_xfer = cfg_read->iter.total_xfer;
@@ -2961,12 +2997,12 @@ static int do_cmd(int fd, int ioctl_cmd, struct ndctl_cmd *cmd)
}
for (offset = 0; offset < iter->total_xfer; offset += iter->max_xfer) {
- *(cmd->iter.xfer) = min(iter->total_xfer - offset,
- iter->max_xfer);
- *(cmd->iter.offset) = offset;
+ cmd->set_xfer(cmd, min(iter->total_xfer - offset,
+ iter->max_xfer));
+ cmd->set_offset(cmd, offset);
if (iter->dir == WRITE)
memcpy(iter->data, iter->total_buf + offset,
- *(cmd->iter.xfer));
+ cmd->get_xfer(cmd));
rc = ioctl(fd, ioctl_cmd, cmd->cmd_buf);
if (rc < 0) {
rc = -errno;
@@ -2975,9 +3011,9 @@ static int do_cmd(int fd, int ioctl_cmd, struct ndctl_cmd *cmd)
if (iter->dir == READ)
memcpy(iter->total_buf + offset, iter->data,
- *(cmd->iter.xfer) - rc);
+ cmd->get_xfer(cmd) - rc);
if (cmd->get_firmware_status(cmd) || rc) {
- rc = offset + *(cmd->iter.xfer) - rc;
+ rc = offset + cmd->get_xfer(cmd) - rc;
break;
}
}
diff --git a/ndctl/lib/private.h b/ndctl/lib/private.h
index 3c121bd00437..2e537f0a8649 100644
--- a/ndctl/lib/private.h
+++ b/ndctl/lib/private.h
@@ -252,10 +252,12 @@ struct ndctl_cmd {
int size;
int status;
u32 (*get_firmware_status)(struct ndctl_cmd *cmd);
+ u32 (*get_xfer)(struct ndctl_cmd *cmd);
+ u32 (*get_offset)(struct ndctl_cmd *cmd);
+ void (*set_xfer)(struct ndctl_cmd *cmd, u32 xfer);
+ void (*set_offset)(struct ndctl_cmd *cmd, u32 offset);
struct ndctl_cmd_iter {
u32 init_offset;
- u32 *offset;
- u32 *xfer; /* pointer to xfer length in cmd */
u8 *data; /* pointer to the data buffer location in cmd */
u32 max_xfer;
char *total_buf;
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-02-29 20:38 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 20:20 [ndctl PATCH 00/36] Multiple topics / backlog for v68 Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 01/36] ndctl/list: Add 'target_node' to region and namespace verbose listings Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 02/36] ndctl/docs: Fix mailing list sign-up link Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 03/36] ndctl/list: Drop named list objects from verbose listing Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 04/36] daxctl/list: Avoid memory operations without resource data Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 05/36] ndctl/build: Fix distcheck Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 06/36] ndctl/namespace: Fix destroy-namespace accounting relative to seed devices Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 07/36] ndctl/region: Support ndctl_region_{get, set}_align() Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 08/36] ndctl/namespace: Emit better errors on failure Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 09/36] ndctl/namespace: Check for region alignment violations Dan Williams
2020-02-29 20:20 ` [ndctl PATCH 10/36] ndctl/util: Up-level is_power_of_2() and introduce IS_ALIGNED Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 11/36] ndctl/namespace: Validate resource alignment for dax-mode namespaces Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 12/36] ndctl/namespace: Add read-infoblock command Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 13/36] ndctl/test: Update dax-dev to handle multiple e820 ranges Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 14/36] ndctl/namespace: Always zero info-blocks Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 15/36] ndctl/namespace: Disable autorecovery of create-namespace failures Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 16/36] ndctl/build: Fix EXTRA_DIST already defined errors Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 17/36] ndctl/test: Checkout device-mapper + dax operation Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 18/36] ndctl/test: Exercise sub-section sized namespace creation/deletion Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 19/36] ndctl/namespace: Kill off the legacy mode names Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 20/36] ndctl/namespace: Introduce mode-to-name and name-to-mode helpers Dan Williams
2020-02-29 20:21 ` [ndctl PATCH 21/36] ndctl/namespace: Validate namespace size within validate_namespace_options() Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 22/36] ndctl/namespace: Clarify 16M minimum size requirement Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 23/36] ndctl/test: Regression test 'failed to track' Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 24/36] ndctl/dimm: Rework dimm command status reporting Dan Williams
2020-02-29 20:22 ` Dan Williams [this message]
2020-02-29 20:22 ` [ndctl PATCH 26/36] ndctl/test: Fix typos / loss of tpm.handle in security test Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 27/36] ndctl/test: Relax dax_pmem_compat requirement Dan Williams
2020-03-03 13:28 ` Jan Kara
2020-03-03 21:05 ` Dan Williams
2020-03-03 22:58 ` [ndctl PATCH v2 1/2] ndctl/test: Cleanup test-vs-production nvdimm module detection Dan Williams
2020-03-04 12:44 ` Jan Kara
2020-03-03 22:58 ` [ndctl PATCH v2 2/2] ndctl/test: Relax dax_pmem_compat requirement Dan Williams
2020-03-04 12:44 ` Jan Kara
2020-02-29 20:22 ` [ndctl PATCH 28/36] ndctl/namespace: Fix namespace-action vs namespace-mode confusion Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 29/36] ndctl/namespace: Update 'pfn' infoblock definition Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 30/36] ndctl/util: Return 0 for NULL arguments to parse_size64() Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 31/36] ndctl/namespace: Fix read-info-block vs read-infoblock Dan Williams
2020-02-29 20:22 ` [ndctl PATCH 32/36] ndctl/namespace: Parse infoblocks from stdin Dan Williams
2020-02-29 20:23 ` [ndctl PATCH 33/36] ndctl/namespace: Add write-infoblock command Dan Williams
2020-02-29 20:23 ` [ndctl PATCH 34/36] ndctl/list: Add option to list configured + disabled namespaces Dan Williams
2020-02-29 20:23 ` [ndctl PATCH 35/36] ndctl/lib/namespace: Fix resource retrieval after size change Dan Williams
2020-02-29 20:23 ` [ndctl PATCH 36/36] ndctl/test: Regression test misaligned namespaces Dan Williams
2020-03-19 4:13 ` [ndctl PATCH 00/36] Multiple topics / backlog for v68 Verma, Vishal L
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=158300773732.2141307.720285708132556948.stgit@dwillia2-desk3.amr.corp.intel.com \
--to=dan.j.williams@intel.com \
--cc=linux-nvdimm@lists.01.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).