@@ -6399,24 +6399,16 @@ static int devlink_nl_cmd_region_read_chunk_fill(struct sk_buff *msg,
static int devlink_nl_region_read_snapshot_fill(struct sk_buff *skb,
struct devlink *devlink,
- struct devlink_region *region,
- struct nlattr **attrs,
+ struct devlink_snapshot *snapshot,
u64 start_offset,
u64 end_offset,
u64 *new_offset)
{
- struct devlink_snapshot *snapshot;
u64 curr_offset = start_offset;
- u32 snapshot_id;
int err = 0;
*new_offset = start_offset;
- snapshot_id = nla_get_u32(attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);
- snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);
- if (!snapshot)
- return -EINVAL;
-
while (curr_offset < end_offset) {
u32 data_size;
u8 *data;
@@ -6447,11 +6439,13 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
u64 ret_offset, start_offset, end_offset = U64_MAX;
struct nlattr **attrs = info->attrs;
struct devlink_port *port = NULL;
+ struct devlink_snapshot *snapshot;
struct devlink_region *region;
struct nlattr *chunks_attr;
const char *region_name;
struct devlink *devlink;
unsigned int index;
+ u32 snapshot_id;
void *hdr;
int err;
@@ -6491,6 +6485,13 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
goto out_unlock;
}
+ snapshot_id = nla_get_u32(attrs[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);
+ snapshot = devlink_region_snapshot_get_by_id(region, snapshot_id);
+ if (!snapshot) {
+ err = -EINVAL;
+ goto out_unlock;
+ }
+
if (attrs[DEVLINK_ATTR_REGION_CHUNK_ADDR] &&
attrs[DEVLINK_ATTR_REGION_CHUNK_LEN]) {
if (!start_offset)
@@ -6540,7 +6541,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
}
err = devlink_nl_region_read_snapshot_fill(skb, devlink,
- region, attrs,
+ snapshot,
start_offset,
end_offset, &ret_offset);
The snapshot pointer is obtained inside of the function devlink_nl_region_read_snapshot_fill. Simplify this function by locating the snapshot upfront in devlink_nl_cmd_region_read_dumpit instead. This aligns with how other netlink attributes are handled, and allows us to exit slightly earlier if an invalid snapshot ID is provided. It also allows us to pass the snapshot pointer directly to the devlink_nl_region_read_snapshot_fill, and remove the now unused attrs parameter. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> --- net/core/devlink.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)