From: Jacob Keller <jacob.e.keller@intel.com>
To: netdev@vger.kernel.org
Cc: Jacob Keller <jacob.e.keller@intel.com>,
Jiri Pirko <jiri@nvidia.com>, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v3 2/9] devlink: report extended error message in region_read_dumpit()
Date: Mon, 28 Nov 2022 12:36:40 -0800 [thread overview]
Message-ID: <20221128203647.1198669-3-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20221128203647.1198669-1-jacob.e.keller@intel.com>
Report extended error details in the devlink_nl_cmd_region_read_dumpit()
function, by using the extack structure from the netlink_callback.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
---
Changes since v2:
* Fixed capitalization of NL_SET_ERR_MSG_ATTR
net/core/devlink.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index ff802788ee05..8d44ef3c1ea8 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6507,10 +6507,10 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
{
const struct genl_dumpit_info *info = genl_dumpit_info(cb);
u64 ret_offset, start_offset, end_offset = U64_MAX;
+ struct nlattr *chunks_attr, *region_attr;
struct nlattr **attrs = info->attrs;
struct devlink_port *port = NULL;
struct devlink_region *region;
- struct nlattr *chunks_attr;
const char *region_name;
struct devlink *devlink;
unsigned int index;
@@ -6525,8 +6525,14 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
devl_lock(devlink);
- if (!attrs[DEVLINK_ATTR_REGION_NAME] ||
- !attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]) {
+ if (!attrs[DEVLINK_ATTR_REGION_NAME]) {
+ NL_SET_ERR_MSG(cb->extack, "No region name provided");
+ err = -EINVAL;
+ goto out_unlock;
+ }
+
+ if (!attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]) {
+ NL_SET_ERR_MSG(cb->extack, "No snapshot id provided");
err = -EINVAL;
goto out_unlock;
}
@@ -6541,7 +6547,8 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
}
}
- region_name = nla_data(attrs[DEVLINK_ATTR_REGION_NAME]);
+ region_attr = attrs[DEVLINK_ATTR_REGION_NAME];
+ region_name = nla_data(region_attr);
if (port)
region = devlink_port_region_get_by_name(port, region_name);
@@ -6549,6 +6556,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
region = devlink_region_get_by_name(devlink, region_name);
if (!region) {
+ NL_SET_ERR_MSG_ATTR(cb->extack, region_attr, "Requested region does not exist");
err = -EINVAL;
goto out_unlock;
}
--
2.38.1.420.g319605f8f00e
next prev parent reply other threads:[~2022-11-28 20:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 20:36 [PATCH net-next v3 0/9] support direct read from region Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 1/9] devlink: use min_t to calculate data_size Jacob Keller
2022-11-28 20:36 ` Jacob Keller [this message]
2022-11-28 20:36 ` [PATCH net-next v3 3/9] devlink: find snapshot in devlink_nl_cmd_region_read_dumpit Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 4/9] devlink: remove unnecessary parameter from chunk_fill function Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 5/9] devlink: refactor region_read_snapshot_fill to use a callback function Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 6/9] devlink: support directly reading from region memory Jacob Keller
2022-11-29 8:17 ` Jiri Pirko
2022-11-28 20:36 ` [PATCH net-next v3 7/9] ice: use same function to snapshot both NVM and Shadow RAM Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 8/9] ice: document 'shadow-ram' devlink region Jacob Keller
2022-11-28 20:36 ` [PATCH net-next v3 9/9] ice: implement direct read for NVM and Shadow RAM regions Jacob Keller
2022-12-01 5:50 ` [PATCH net-next v3 0/9] support direct read from region patchwork-bot+netdevbpf
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=20221128203647.1198669-3-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/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).