Commit 4fb56e3e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-finish-conversion-to-generated-split_ops' 

Jiri Pirko says:

====================
devlink: finish conversion to generated split_ops

This patchset converts the remaining genetlink commands to generated
split_ops and removes the existing small_ops arrays entirely
alongside with shared netlink attribute policy.

Patches #1-#6 are just small preparations and small fixes on multiple
              places. Note that couple of patches contain the "Fixes"
              tag but no need to put them into -net tree.
Patch #7 is a simple rename preparation
Patch #8 is the main one in this set and adds actual definitions of cmds
         in to yaml file.
Patches #9-#10 finalize the change removing bits that are no longer in
               use.
====================

Link: https://lore.kernel.org/r/20231021112711.660606-1-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 70b1aca3 cebe7306

Documentation/netlink/genetlink-legacy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ properties: 
                type: string

              type: &attr-type

                description: The netlink attribute type

                enum: [ unused, pad, flag, binary,

                enum: [ unused, pad, flag, binary, bitfield32,

                        uint, sint, u8, u16, u32, u64, s32, s64,

                        string, nest, array-nest, nest-type-value ]

              doc:

Documentation/netlink/specs/devlink.yaml

+1497 −107

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/userspace-api/netlink/genetlink-legacy.rst

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ members 


 - ``name`` - The attribute name of the struct member

 - ``type`` - One of the scalar types ``u8``, ``u16``, ``u32``, ``u64``, ``s8``,

   ``s16``, ``s32``, ``s64``, ``string`` or ``binary``.

   ``s16``, ``s32``, ``s64``, ``string``, ``binary`` or ``bitfield32``.

 - ``byte-order`` - ``big-endian`` or ``little-endian``

 - ``doc``, ``enum``, ``enum-as-flags``, ``display-hint`` - Same as for

   :ref:`attribute definitions <attribute_properties>`

include/uapi/linux/devlink.h

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ enum { 
 * Documentation/networking/devlink/devlink-flash.rst

 *

 */

enum {

enum devlink_flash_overwrite {

	DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT,

	DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT,

net/devlink/dev.c

+5 −5
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ devlink_nl_reload_actions_performed_snd(struct devlink *devlink, u32 actions_per 
	return -EMSGSIZE;

}



int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info)

int devlink_nl_reload_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	enum devlink_reload_action action;
@@ -658,7 +658,7 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink, 
	return err;

}



int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)

int devlink_nl_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	struct sk_buff *msg;
@@ -679,7 +679,7 @@ int devlink_nl_cmd_eswitch_get_doit(struct sk_buff *skb, struct genl_info *info) 
	return genlmsg_reply(msg, info);

}



int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)

int devlink_nl_eswitch_set_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct devlink *devlink = info->user_ptr[0];

	const struct devlink_ops *ops = devlink->ops;
@@ -1108,7 +1108,7 @@ static int devlink_flash_component_get(struct devlink *devlink, 
	return 0;

}



int devlink_nl_cmd_flash_update(struct sk_buff *skb, struct genl_info *info)

int devlink_nl_flash_update_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *nla_overwrite_mask, *nla_file_name;

	struct devlink_flash_update_params params = {};
@@ -1351,7 +1351,7 @@ static const struct nla_policy devlink_selftest_nl_policy[DEVLINK_ATTR_SELFTEST_ 
	[DEVLINK_ATTR_SELFTEST_ID_FLASH] = { .type = NLA_FLAG },

};



int devlink_nl_cmd_selftests_run(struct sk_buff *skb, struct genl_info *info)

int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct nlattr *tb[DEVLINK_ATTR_SELFTEST_ID_MAX + 1];

	struct devlink *devlink = info->user_ptr[0];