From: Jacob Keller <jacob.e.keller@intel.com>
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, valex@mellanox.com, linyunsheng@huawei.com,
lihong.yang@intel.com, Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH 14/15] ice: support direct read of the shadow ram region
Date: Thu, 30 Jan 2020 14:59:09 -0800 [thread overview]
Message-ID: <20200130225913.1671982-15-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20200130225913.1671982-1-jacob.e.keller@intel.com>
Using the new .read region operation, implement support for directly
reading from the Shadow RAM region without a snapshot. This is useful
when the atomic guarantees provided by a snapshot aren't necessary and
userspace only wants to read a small portion of the region.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
drivers/net/ethernet/intel/ice/ice_devlink.c | 48 ++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c
index 9f6a0281fd6e..7bad237177a0 100644
--- a/drivers/net/ethernet/intel/ice/ice_devlink.c
+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
@@ -224,6 +224,53 @@ void ice_devlink_destroy_port(struct ice_pf *pf)
devlink_port_unregister(&pf->devlink_port);
}
+/**
+ * ice_devlink_sr_read - Read a portion of the shadow RAM
+ * @devlink: the devlink instance
+ * @curr_offset: offset to start at
+ * @data_size: portion of the region to read
+ * @data: buffer to store region contents
+ *
+ * This function is called to directly read from the shadow-ram region in
+ * response to a DEVLINK_CMD_REGION_READ without a snapshot id.
+ *
+ * @returns zero on success and updates the contents of the data region,
+ * otherwise returns a non-zero error code on failure.
+ */
+static int ice_devlink_sr_read(struct devlink *devlink, u64 curr_offset,
+ u32 data_size, u8 *data)
+{
+ struct ice_pf *pf = devlink_priv(devlink);
+ struct device *dev = ice_pf_to_dev(pf);
+ struct ice_hw *hw = &pf->hw;
+ enum ice_status status;
+
+ if (!ice_is_primary_function(pf))
+ return -EACCES;
+
+ if (curr_offset + data_size > hw->nvm.sr_words * sizeof(u16))
+ return -ERANGE;
+
+ status = ice_acquire_nvm(hw, ICE_RES_READ);
+ if (status) {
+ dev_err(dev, "ice_acquire_nvm failed, err %d aq_err %d\n",
+ status, hw->adminq.sq_last_status);
+ return -EIO;
+ }
+
+ status = ice_read_flat_nvm(hw, curr_offset, &data_size, data, true);
+ if (status) {
+ dev_err(dev, "ice_read_flat_nvm failed, err %d aq_err %d\n",
+ status, hw->adminq.sq_last_status);
+ ice_release_nvm(hw);
+ return -EIO;
+ }
+
+ ice_release_nvm(hw);
+
+ return 0;
+}
+
/**
* ice_devlink_sr_snapshot - Capture a snapshot of the Shadow RAM contents
* @devlink: the devlink instance
@@ -290,6 +337,7 @@ static int ice_devlink_sr_snapshot(struct devlink *devlink,
static const struct devlink_region_ops ice_sr_region_ops = {
.name = "shadow-ram",
.snapshot = ice_devlink_sr_snapshot,
+ .read = ice_devlink_sr_read,
};
/**
--
2.25.0.rc1
next prev parent reply other threads:[~2020-01-30 22:59 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 22:58 [RFC PATCH 00/13] devlink direct region reading Jacob Keller
2020-01-30 22:58 ` [PATCH 01/15] devlink: prepare to support region operations Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-02-03 11:35 ` Jiri Pirko
2020-02-03 16:48 ` Jacob Keller
2020-02-03 17:07 ` Jacob Keller
2020-02-03 17:10 ` Jacob Keller
2020-02-03 17:14 ` Jacob Keller
2020-02-03 17:17 ` Jacob Keller
2020-01-30 22:58 ` [PATCH 02/15] devlink: add functions to take snapshot while locked Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:09 ` Jacob Keller
2020-02-03 11:39 ` Jiri Pirko
2020-02-03 16:45 ` Jacob Keller
2020-01-30 22:58 ` [PATCH 03/15] devlink: add operation to take an immediate snapshot Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-02-03 8:19 ` Yunsheng Lin
2020-02-03 11:50 ` Jiri Pirko
2020-02-03 11:50 ` Jiri Pirko
2020-02-03 16:33 ` Jacob Keller
2020-02-03 19:32 ` Jacob Keller
2020-02-03 21:30 ` Jiri Pirko
2020-02-04 19:20 ` Jacob Keller
2020-01-30 22:58 ` [PATCH 04/15] netdevsim: support taking immediate snapshot via devlink Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:12 ` Jacob Keller
2020-01-30 22:59 ` [PATCH 05/15] ice: use __le16 types for explicitly Little Endian values Jacob Keller
2020-01-30 22:59 ` [PATCH 06/15] ice: create function to read a section of the NVM and Shadow RAM Jacob Keller
2020-01-30 22:59 ` [PATCH 07/15] ice: implement full NVM read from ETHTOOL_GEEPROM Jacob Keller
2020-01-30 22:59 ` [PATCH 08/15] devlink: add devres managed devlinkm_alloc and devlinkm_free Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:16 ` Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-02-01 0:51 ` Jacob Keller
2020-02-01 17:43 ` Jakub Kicinski
2020-02-03 16:35 ` Jacob Keller
2020-02-03 11:29 ` Jiri Pirko
2020-02-03 16:56 ` Jacob Keller
2020-01-30 22:59 ` [PATCH 09/15] ice: enable initial devlink support Jacob Keller
2020-01-30 22:59 ` [PATCH 10/15] ice: add basic handler for devlink .info_get Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:25 ` Jacob Keller
2020-01-30 22:59 ` [PATCH 11/15] ice: add board identifier info to " Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:26 ` Jacob Keller
2020-01-30 22:59 ` [PATCH 12/15] ice: add a devlink region to dump shadow RAM contents Jacob Keller
2020-01-30 22:59 ` [PATCH 13/15] devlink: support directly reading from region memory Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:27 ` Jacob Keller
2020-01-31 19:15 ` Jacob Keller
2020-02-03 13:44 ` Jiri Pirko
2020-02-03 16:40 ` Jacob Keller
2020-01-30 22:59 ` Jacob Keller [this message]
2020-01-30 22:59 ` [PATCH 15/15] ice: add ice.rst devlink documentation file Jacob Keller
2020-01-31 18:07 ` Jakub Kicinski
2020-01-31 18:28 ` Jacob Keller
2020-01-30 22:59 ` [RFC PATCH 1/3] Update kernel headers Jacob Keller
2020-01-30 22:59 ` [RFC PATCH 2/3] devlink: add support for DEVLINK_CMD_REGION_TAKE_SNAPSHOT Jacob Keller
2020-01-30 22:59 ` [RFC PATCH 3/3] devlink: stop requiring snapshot for regions Jacob Keller
2020-01-30 23:03 ` [RFC PATCH 00/13] devlink direct region reading Jacob Keller
2020-01-31 18:06 ` Jakub Kicinski
2020-01-31 18:09 ` Jacob Keller
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=20200130225913.1671982-15-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=jiri@resnulli.us \
--cc=lihong.yang@intel.com \
--cc=linyunsheng@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=valex@mellanox.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).