devlink: implement dry run support for flash update
Subsystems (6)
Jacob Keller
maintainerv2 cover devlink: implement dry run support for flash update
This is a re-send of the dry run support I submitted nearly a year ago at
https://lore.kernel.org/netdev/CO1PR11MB50898047B9C0FAA520505AFDD6B59@CO1PR11MB5089.namprd11.prod.outlook.com/
I had delayed sending this because of conflicting work in the ice driver at the time, but then forgot about it and never got around to resubmitting it.
This adds a DEVLINK_ATTR_DRY_RUN which is used to indicate a request to validate a potentially destructive operation without performing the actions yet. In theory it could be used for other devlink operations in the future.
For flash update, it allows the user to validate a flash image, including ensuring the driver for the device is willing to program it, without actually committing an update yet.
There is an accompanying series for iproute2 which allows adding the dry-run attribute. It does as Jakub suggested and checks the maximum attribute before allowing the dry run in order to avoid accidentally performing a real update on older kernels.
Changes since v1:
* Added maintainers to Cc (thanks for pointing out the script, Jiri!)
* Replaced bool in struct with u8 : 1
* Added kernel doc to devlink_flash_update_params
* Renamed PLDMFW parameter from dry_run to validate
* Reduced indentation in devlink.c by using nla_get_flag
Jacob Keller (2):
devlink: add dry run attribute to flash update
ice: support dry run of a flash update to validate firmware file
Documentation/driver-api/pldmfw/index.rst | 10 ++++++++ .../networking/devlink/devlink-flash.rst | 23 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_devlink.c | 3 ++- .../net/ethernet/intel/ice/ice_fw_update.c | 14 +++++++---- include/linux/pldmfw.h | 5 ++++ include/net/devlink.h | 4 ++++ include/uapi/linux/devlink.h | 8 +++++++ lib/pldmfw/pldmfw.c | 12 ++++++++++ net/core/devlink.c | 17 +++++++++++++- 9 files changed, 90 insertions(+), 6 deletions(-)
base-commit: 5588d628027092e66195097bdf6835ddf64418b3
Signature · 6 lines
2.35.1.456.ga9c7032d4631 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Jacob Keller
maintainerPATCH v2 1/2 devlink: add dry run attribute to flash update
Users use the devlink flash interface to request a device driver program or update the device flash chip. In some cases, a user (or script) may want to verify that a given flash update command is supported without actually committing to immediately updating the device. For example, a system administrator may want to validate that a particular flash binary image will be accepted by the device, or simply validate a command before finally committing to it.
The current flash update interface lacks a method to support such a dry run. Add a new DEVLINK_ATTR_DRY_RUN attribute which shall be used by a devlink command to indicate that a request is a dry run which should not perform device configuration. Instead, the command should report whether the command or configuration request is valid.
While we can validate the initial arguments of the devlink command, a proper dry run must be processed by the device driver. This is required because only the driver can perform validation of the flash binary file.
Add a new dry_run parameter to the devlink_flash_update_params struct, along with the associated bit to indicate if a driver supports verifying a dry run.
We always check the dry run attribute last in order to allow as much verification of other parameters as possible. For example, even if a driver does not support the dry_run option, we can still validate the other optional parameters such as the overwrite_mask and per-component update name.
Document that userspace should take care when issuing a dry run to older kernels, as the flash update command is not strictly verified. Thus, unknown attributes will be ignored and this could cause a request for a dry run to perform an actual update. We can't fix old kernels to verify unknown attributes, but userspace can check the maximum attribute and reject the dry run request if it is not supported by the kernel.
---
Changes since v1:
* Add kernel doc comments to devlink_flash_update_params
* Reduce indentation by using nla_get_flag
.../networking/devlink/devlink-flash.rst | 23 +++++++++++++++++++ include/net/devlink.h | 4 ++++ include/uapi/linux/devlink.h | 8 +++++++ net/core/devlink.c | 17 +++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-)
Documentation/networking/devlink/devlink-flash.rst +23 -0
@@ -44,6 +44,29 @@ preserved across the update. A device may not support every combination and the driver for such a device must reject any combination which cannot be faithfully implemented. +Dry run +======= + +Users can request a "dry run" of a flash update by adding the +``DEVLINK_ATTR_DRY_RUN`` attribute to the ``DEVLINK_CMD_FLASH_UPDATE`` +command. If the attribute is present, the kernel will only verify that the +provided command is valid. During a dry run, an update is not performed. + +If supported by the driver, the flash image contents are also validated and +the driver may indicate whether the file is a valid flash image for the +device. + +.. code:: shell + + $ devlink dev flash pci/0000:af:00.0 file image.bin dry-run + Validating flash binary + +Note that user space should take care when adding this attribute. Older +kernels which do not recognize the attribute may accept the command with an +unknown attribute. This could lead to a request for a dry run which performs +an unexpected update. To avoid this, user space should check the policy dump +and verify that the attribute is recognized before adding it to the command. + Firmware Loading ================
include/net/devlink.h +4 -0
@@ -613,6 +613,8 @@ enum devlink_param_generic_id {* struct devlink_flash_update_params - Flash Update parameters * @fw: pointer to the firmware data to update from * @component: the flash component to update +* @overwrite_mask: what sections of flash can be overwritten +* @dry_run: if true, do not actually update the flash * * With the exception of fw, drivers must opt-in to parameters by * setting the appropriate bit in the supported_flash_update_params field in
@@ -622,10 +624,12 @@ struct devlink_flash_update_params {const struct firmware *fw;const char *component;u32 overwrite_mask; +bool dry_run; };#define DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT BIT(0)#define DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK BIT(1) +#define DEVLINK_SUPPORT_FLASH_UPDATE_DRY_RUN BIT(2)struct devlink_region ;struct devlink_info_req ;
include/uapi/linux/devlink.h +8 -0
@@ -576,6 +576,14 @@ enum devlink_attr {DEVLINK_ATTR_LINECARD_TYPE ,/* string */ DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES ,/* nested */ +/* Before adding this attribute to a command, user space should check +* the policy dump and verify the kernel recognizes the attribute. +* Otherwise older kernels which do not recognize the attribute may +* silently accept the unknown attribute while not actually performing +* a dry run. +*/ +DEVLINK_ATTR_DRY_RUN ,/* flag */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,
net/core/devlink.c +16 -1
@@ -4743,7 +4743,8 @@ EXPORT_SYMBOL_GPL(devlink_flash_update_timeout_notify);static int devlink_nl_cmd_flash_update (struct sk_buff *skb,struct genl_info *info) { -struct nlattr *nla_component, *nla_overwrite_mask, *nla_file_name; +struct nlattr *nla_component, *nla_overwrite_mask, *nla_file_name, + *nla_dry_run;struct devlink_flash_update_params params = {};struct devlink *devlink = info->user_ptr[0 ];const char *file_name;
@@ -4789,6 +4790,19 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb,return ret; } +/* Always check dry run last, in order to allow verification of other +* parameter support even if the particular driver does not yet +* support a full dry-run +*/ + params.dry_run =nla_get_flag (info->attrs[DEVLINK_ATTR_DRY_RUN ]); +if (params.dry_run && + !(supported_params &DEVLINK_SUPPORT_FLASH_UPDATE_DRY_RUN )) { +NL_SET_ERR_MSG_ATTR (info->extack, nla_dry_run, +"flash update is supported, but dry run is not supported for this device" ); +release_firmware (params.fw); +return -EOPNOTSUPP ; + } +devlink_flash_update_begin_notify (devlink); ret = devlink->ops->flash_update (devlink, ¶ms, info->extack);devlink_flash_update_end_notify (devlink);
@@ -9004,6 +9018,7 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 }, [DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING }, + [DEVLINK_ATTR_DRY_RUN] = { .type = NLA_FLAG }, };static const struct genl_small_ops devlink_nl_ops[] = {
Signature · 1 line
2.35.1.456.ga9c7032d4631
Re: [net-next v2 1/2] devlink: add dry run attribute to flash update
Quoted 87 lines · Thu, Jul 21, 2022 at 11:14:46PM CEST, [email protected] wrote:
Users use the devlink flash interface to request a device driver program or update the device flash chip. In some cases, a user (or script) may want to verify that a given flash update command is supported without actually committing to immediately updating the device. For example, a system administrator may want to validate that a particular flash binary image will be accepted by the device, or simply validate a command before finally committing to it.
The current flash update interface lacks a method to support such a dry run. Add a new
DEVLINK_ATTR_DRY_RUNattribute which shall be used by a devlink command to indicate that a request is a dry run which should not perform device configuration. Instead, the command should report whether the command or configuration request is valid.While we can validate the initial arguments of the devlink command, a proper dry run must be processed by the device driver. This is required because only the driver can perform validation of the flash binary file.
Add a new
dry_runparameter to thedevlink_flash_update_paramsstruct, along with the associated bit to indicate if a driver supports verifying a dry run.We always check the dry run attribute last in order to allow as much verification of other parameters as possible. For example, even if a driver does not support the
dry_runoption, we can still validate the other optional parameters such as theoverwrite_maskand per-component update name.Document that userspace should take care when issuing a dry run to older kernels, as the flash update command is not strictly verified. Thus, unknown attributes will be ignored and this could cause a request for a dry run to perform an actual update. We can't fix old kernels to verify unknown attributes, but userspace can check the maximum attribute and reject the dry run request if it is not supported by the kernel.
Signed-off-by Jacob Keller <[email protected]>---
Changes since v1:
* Add kernel doc comments todevlink_flash_update_params
* Reduce indentation by usingnla_get_flag.../networking/devlink/devlink-flash.rst | 23 +++++++++++++++++++ include/net/devlink.h | 4 ++++ include/uapi/linux/devlink.h | 8 +++++++ net/core/devlink.c | 17 +++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-)Documentation/networking/devlink/devlink-flash.rst +0
-0@@ -44,6 +44,29 @@ preserved across the update. A device may not support every combination andthe driver for such a device must reject any combination which cannot be faithfully implemented.
Documentation/networking/devlink/devlink-flash.rst +23
-0+Dry run +======= + +Users can request a "dry run" of a flash update by adding the +``DEVLINK_ATTR_DRY_RUN`` attribute to the ``DEVLINK_CMD_FLASH_UPDATE`` +command. If the attribute is present, the kernel will only verify that the +provided command is valid. During a dry run, an update is not performed. + +If supported by the driver, the flash image contents are also validated and +the driver may indicate whether the file is a valid flash image for the +device. + +.. code:: shell + + $ devlink dev flash pci/0000:af:00.0 file image.bin dry-run + Validating flash binary + +Note that user space should take care when adding this attribute. Older +kernels which do not recognize the attribute may accept the command with an +unknown attribute. This could lead to a request for a dry run which performs +an unexpected update. To avoid this, user space should check the policy dump +and verify that the attribute is recognized before adding it to the command. +Firmware Loading
================include/net/devlink.h +0
-0
include/net/devlink.h enum devlink_param_generic_id { · line 616
Quoted 4 lines
include/net/devlink.h +1
-0@@ -613,6 +613,8 @@ enum devlink_param_generic_id {* struct devlink_flash_update_params - Flash Update parameters * @fw: pointer to the firmware data to update from * @component: the flash component to update +* @overwrite_mask: what sections of flash can be overwritten
Well, strictly speaking, this is not related to this patch and should be done in a separate one. But hey, it's a comment, so I guess noone really cares.
Quoted 81 lines
include/net/devlink.h +3
-0+* @dry_run: if true, do not actually update the flash * * With the exception of fw, drivers must opt-in to parameters by * setting the appropriate bit in the supported_flash_update_params field in @@ -622,10 +624,12 @@ struct devlink_flash_update_params {const struct firmware *fw;const char *component;u32 overwrite_mask; +bool dry_run; };#define DEVLINK_SUPPORT_FLASH_UPDATE_COMPONENT BIT(0)#define DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK BIT(1) +#define DEVLINK_SUPPORT_FLASH_UPDATE_DRY_RUN BIT(2)struct devlink_region ;struct devlink_info_req ;include/uapi/linux/devlink.h +8
-0@@ -576,6 +576,14 @@ enum devlink_attr {DEVLINK_ATTR_LINECARD_TYPE ,/* string */ DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES ,/* nested */ +/* Before adding this attribute to a command, user space should check +* the policy dump and verify the kernel recognizes the attribute. +* Otherwise older kernels which do not recognize the attribute may +* silently accept the unknown attribute while not actually performing +* a dry run. +*/ +DEVLINK_ATTR_DRY_RUN ,/* flag */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,net/core/devlink.c +16
-1@@ -4743,7 +4743,8 @@ EXPORT_SYMBOL_GPL(devlink_flash_update_timeout_notify);static int devlink_nl_cmd_flash_update (struct sk_buff *skb,struct genl_info *info) { -struct nlattr *nla_component, *nla_overwrite_mask, *nla_file_name; +struct nlattr *nla_component, *nla_overwrite_mask, *nla_file_name, + *nla_dry_run;struct devlink_flash_update_params params = {};struct devlink *devlink = info->user_ptr[0 ];const char *file_name;@@ -4789,6 +4790,19 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb,return ret; } +/* Always check dry run last, in order to allow verification of other +* parameter support even if the particular driver does not yet +* support a full dry-run +*/ + params.dry_run =nla_get_flag (info->attrs[DEVLINK_ATTR_DRY_RUN ]); +if (params.dry_run && + !(supported_params &DEVLINK_SUPPORT_FLASH_UPDATE_DRY_RUN )) { +NL_SET_ERR_MSG_ATTR (info->extack, nla_dry_run, +"flash update is supported, but dry run is not supported for this device" ); +release_firmware (params.fw); +return -EOPNOTSUPP ; + } +devlink_flash_update_begin_notify (devlink); ret = devlink->ops->flash_update (devlink, ¶ms, info->extack);devlink_flash_update_end_notify (devlink);@@ -9004,6 +9018,7 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 }, [DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING }, + [DEVLINK_ATTR_DRY_RUN] = { .type = NLA_FLAG }, };static const struct genl_small_ops devlink_nl_ops[] = {Signature · 1 line
2.35.1.456.ga9c7032d4631
Keller, Jacob E
maintainerRE: [net-next v2 1/2] devlink: add dry run attribute to flash update
Quoted 100 lines
-----Original Message-----
From: Jiri Pirko <[email protected]>
Sent: Thursday, July 21, 2022 11:26 PM
To: Keller, Jacob E <[email protected]>
Cc: [email protected]; Jonathan Corbet <[email protected]>; Jiri Pirko <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; Nguyen, Anthony L <[email protected]>; David Ahern <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; intel-wired- [email protected]
Subject: Re: [net-next v2 1/2] devlink: add dry run attribute to flash updateQuoted 42 lines · Thu, Jul 21, 2022 at 11:14:46PM CEST, [email protected] wrote:
Users use the devlink flash interface to request a device driver program or update the device flash chip. In some cases, a user (or script) may want to verify that a given flash update command is supported without actually committing to immediately updating the device. For example, a system administrator may want to validate that a particular flash binary image will be accepted by the device, or simply validate a command before finally committing to it.
The current flash update interface lacks a method to support such a dry run. Add a new
DEVLINK_ATTR_DRY_RUNattribute which shall be used by a devlink command to indicate that a request is a dry run which should not perform device configuration. Instead, the command should report whether the command or configuration request is valid.While we can validate the initial arguments of the devlink command, a proper dry run must be processed by the device driver. This is required because only the driver can perform validation of the flash binary file.
Add a new
dry_runparameter to thedevlink_flash_update_paramsstruct, along with the associated bit to indicate if a driver supports verifying a dry run.We always check the dry run attribute last in order to allow as much verification of other parameters as possible. For example, even if a driver does not support the
dry_runoption, we can still validate the other optional parameters such as theoverwrite_maskand per-component update name.Document that userspace should take care when issuing a dry run to older kernels, as the flash update command is not strictly verified. Thus, unknown attributes will be ignored and this could cause a request for a dry run to perform an actual update. We can't fix old kernels to verify unknown attributes, but userspace can check the maximum attribute and reject the dry run request if it is not supported by the kernel.
Signed-off-by Jacob Keller <[email protected]>---
Changes since v1:
* Add kernel doc comments todevlink_flash_update_params
* Reduce indentation by usingnla_get_flagReview
Quoted 7 lines
.../networking/devlink/devlink-flash.rst | 23 +++++++++++++++++++ include/net/devlink.h | 4 ++++ include/uapi/linux/devlink.h | 8 +++++++ net/core/devlink.c | 17 +++++++++++++- 4 files changed, 51 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/Documentation/networking/devlink/devlink-flash.rstDocumentation/networking/devlink/devlink-flash.rst preserved across the update. A device may not support
Quoted 4 lines
index
603e732f00cc..1dc373229a54100644Documentation/networking/devlink/devlink-flash.rst +0
-0@@ -44,6 +44,29 @@ preserved across the update. A device may not supportevery combination and
Quoted 29 lines
the driver for such a device must reject any combination which cannot be faithfully implemented.
Documentation/networking/devlink/devlink-flash.rst +23
-0+Dry run +======= + +Users can request a "dry run" of a flash update by adding the +``DEVLINK_ATTR_DRY_RUN`` attribute to the ``DEVLINK_CMD_FLASH_UPDATE`` +command. If the attribute is present, the kernel will only verify that the +provided command is valid. During a dry run, an update is not performed. + +If supported by the driver, the flash image contents are also validated and +the driver may indicate whether the file is a valid flash image for the +device. + +.. code:: shell + + $ devlink dev flash pci/0000:af:00.0 file image.bin dry-run + Validating flash binary + +Note that user space should take care when adding this attribute. Older +kernels which do not recognize the attribute may accept the command with an +unknown attribute. This could lead to a request for a dry run which performs +an unexpected update. To avoid this, user space should check the policy dump +and verify that the attribute is recognized before adding it to the command. +Firmware Loading
================
Quoted 14 lines
include/net/devlink.h enum devlink_param_generic_id { · line 616
Quoted 9 lines
include/net/devlink.h +1
-0@@ -613,6 +613,8 @@ enum devlink_param_generic_id {* struct devlink_flash_update_params - Flash Update parameters * @fw: pointer to the firmware data to update from * @component: the flash component to update +* @overwrite_mask: what sections of flash can be overwritten Well, strictly speaking, this is not related to this patch and should be done in a separate one. But hey, it's a comment, so I guess noone really cares.
Ah yep. I'll split this out since I need to send a new version to split the iproute stuff into its own thread anyways.
Jacob Keller
maintainerPATCH v2 2/2 ice: support dry run of a flash update to validate firmware file
In reply to Jacob KellerNow that devlink core flash update can handle dry run requests, update the ice driver to allow validating a PLDM file in dry_run mode.
First, add a new dry_run field to the pldmfw context structure. This indicates that the PLDM firmware file library should only validate the file and verify that it has a matching record. Update the pldmfw documentation to indicate this "dry run" mode.
In the ice driver, let the stack know that we support the dry run attribute for flash update by setting the appropriate bit in the .supported_flash_update_params field.
If the dry run is requested, notify the PLDM firmware library by setting the context bit appropriately. Don't cancel a pending update during a dry run.
---
Changes since v1:
* Use u8 : 1 instead of bool in structure
* Name the PLDMFW parameter validate
Documentation/driver-api/pldmfw/index.rst | 10 ++++++++++ drivers/net/ethernet/intel/ice/ice_devlink.c | 3 ++- drivers/net/ethernet/intel/ice/ice_fw_update.c | 14 ++++++++++---- include/linux/pldmfw.h | 5 +++++ lib/pldmfw/pldmfw.c | 12 ++++++++++++ 5 files changed, 39 insertions(+), 5 deletions(-)
Documentation/driver-api/pldmfw/index.rst +10 -0
@@ -51,6 +51,16 @@ unaligned access of multi-byte fields, and to properly convert from Little Endian to CPU host format. Additionally the records, descriptors, and components are stored in linked lists. +Validating a PLDM firmware file +=============================== + +To simply validate a PLDM firmware file, and verify whether it applies to +the device, set the ``dry_run`` flag in the ``pldmfw`` context structure. +If this flag is set, the library will parse the file, validating its UUID +and checking if any record matches the device. Note that in a dry run, the +library will *not* issue any ops besides ``match_record``. It will not +attempt to send the component table or package data to the device firmware. + Performing a flash update =========================
drivers/net/ethernet/intel/ice/ice_devlink.c +2 -1
@@ -467,7 +467,8 @@ ice_devlink_reload_empr_finish(struct devlink *devlink, }static const struct devlink_ops ice_devlink_ops = { - .supported_flash_update_params =DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK , + .supported_flash_update_params =DEVLINK_SUPPORT_FLASH_UPDATE_OVERWRITE_MASK | +DEVLINK_SUPPORT_FLASH_UPDATE_DRY_RUN , .reload_actions =BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ),/* The ice driver currently does not support driver reinit */ .reload_down = ice_devlink_reload_empr_start,
drivers/net/ethernet/intel/ice/ice_fw_update.c +10 -4
@@ -1015,15 +1015,21 @@ int ice_devlink_flash_update(struct devlink *devlink,else priv.context.ops = &ice_fwu_ops_e810; priv.context.dev = dev; + priv.context.validate = params->dry_run; priv.extack = extack; priv.pf = pf; priv.activate_flags = preservation; -devlink_flash_update_status_notify (devlink,"Preparing to flash" ,NULL ,0 ,0 ); +if (params->dry_run) +devlink_flash_update_status_notify (devlink,"Validating flash binary" ,NULL ,0 ,0 ); +else +devlink_flash_update_status_notify (devlink,"Preparing to flash" ,NULL ,0 ,0 ); - err =ice_cancel_pending_update (pf,NULL , extack); -if (err) -return err; +if (!params->dry_run) { + err =ice_cancel_pending_update (pf,NULL , extack); +if (err) +return err; + } err =ice_acquire_nvm (hw,ICE_RES_WRITE );if (err) {
include/linux/pldmfw.h +5 -0
@@ -124,10 +124,15 @@ struct pldmfw_ops;* should embed this in a private structure and use container_of to obtain * a pointer to their own data, used to implement the device specific * operations. +* +* @ops: function pointers used as callbacks from the PLDMFW library +* @dev: pointer to the device being updated +* @validate: if true, only validate the file, do not perform an update. */ struct pldmfw {const struct pldmfw_ops *ops;struct device *dev; +u8 validate :1 ; };bool pldmfw_op_pci_match_record (struct pldmfw *context,struct pldmfw_record *record);
lib/pldmfw/pldmfw.c +12 -0
@@ -827,6 +827,10 @@ static int pldm_finalize_update(struct pldmfw_priv *data)* to the device firmware. Extract and write the flash data for each of the * components indicated in the firmware file. * +* If the context->dry_run is set, this is a request for a dry run, i.e. to +* only validate the PLDM firmware file. In this case, stop and exit after we +* find a valid matching record. +* * Returns: zero on success, or a negative error code on failure. */ int pldmfw_flash_image (struct pldmfw *context,const struct firmware *fw)
@@ -844,14 +848,22 @@ int pldmfw_flash_image(struct pldmfw *context, const struct firmware *fw) data->fw = fw; data->context = context; +/* Parse the image and make sure it is a valid PLDM firmware binary */ err =pldm_parse_image (data);if (err) goto out_release_data; +/* Search for a record matching the device */ err =pldm_find_matching_record (data);if (err) goto out_release_data; +/* If this is a dry run, do not perform an update */ +if (context->dry_run) + goto out_release_data; + +/* Perform the device update */ + err =pldm_send_package_data (data);if (err) goto out_release_data;
Signature · 1 line
2.35.1.456.ga9c7032d4631
Jacob Keller
maintainerv2 cover devlink: support dry run attribute for flash update
In reply to Jacob KellerAllow users to request a dry run of a flash update by adding the DEVLINK_ATTR_DRY_RUN.
Because many devlink commands do not validate and reject unknown attributes, this could have unexpected side effects on older kernels which lack the attribute. To handle this, check the socket and determine the maximum attribute the kernel supports. Only allow passing the DEVLINK_ATTR_DRY_RUN for kernels which have the attribute.
This allows a user to validate that a flash update will be accepted by the driver and device without being forced to commit to updating.
Changes since v1
* Add Cc for maintainers
* Make dl_kernel_supports_dry_run more generic
Jacob Keller (3):
update <linux/devlink.h> UAPI header
mnlg: add function to get CTRL_ATTR_MAXATTR value
devlink: add dry run attribute support to devlink flash
devlink/devlink.c | 45 +++++++++++++++++++++++++++-- devlink/mnlg.c | 56 ++++++++++++++++++++++++++++++++++++ devlink/mnlg.h | 1 + include/uapi/linux/devlink.h | 8 ++++++ 4 files changed, 108 insertions(+), 2 deletions(-)
base-commit: 4cb0bec3744ac4f8d21de0e769f170e4059c6b9e
Signature · 1 line
2.36.1
Jacob Keller
maintainerPATCH v2 1/3 update <linux/devlink.h> UAPI header
In reply to Jacob Keller--- include/uapi/linux/devlink.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/uapi/linux/devlink.h +8 -0
@@ -576,6 +576,14 @@ enum devlink_attr {DEVLINK_ATTR_LINECARD_TYPE ,/* string */ DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES ,/* nested */ +/* Before adding this attribute to a command, user space should check +* the policy dump and verify the kernel recognizes the attribute. +* Otherwise older kernels which do not recognize the attribute may +* silently accept the unknown attribute while not actually performing +* a dry run. +*/ +DEVLINK_ATTR_DRY_RUN ,/* flag */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,
Signature · 1 line
2.36.1
Jacob Keller
maintainerPATCH v2 2/3 mnlg: add function to get CTRL_ATTR_MAXATTR value
In reply to Jacob KellerAdd a new function to extract the CTRL_ATTR_MAXATTR attribute of the CTRL_CMD_GETFAMILY request. This will be used to allow reading the maximum supported devlink attribute of the running kernel in an upcoming change.
--- devlink/mnlg.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ devlink/mnlg.h | 1 + 2 files changed, 57 insertions(+)
devlink/mnlg.c +56 -0
@@ -41,6 +41,10 @@ struct group_info {const char *name; }; +struct family_info { +uint32_t max_attr; +}; +static int parse_mc_grps_cb (const struct nlattr *attr,void *data) {const struct nlattr **tb = data;
@@ -149,6 +153,58 @@ int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name)return 0 ; } +static int get_family_attr_cb (const struct nlattr *attr,void *data) +{ +const struct nlattr **tb = data; +int type =mnl_attr_get_type (attr); + +if (mnl_attr_type_valid (attr,CTRL_ATTR_MAX ) <0 ) +return MNL_CB_ERROR ; + + tb[type] = attr; +return MNL_CB_OK ; +} + +static int get_family_cb (const struct nlmsghdr *nlh,void *data) +{ +struct family_info *family = data; +struct nlattr *tb[CTRL_ATTR_MAX +1 ] = {}; +struct genlmsghdr *genl =mnl_nlmsg_get_payload (nlh); + +mnl_attr_parse (nlh,sizeof (*genl), get_family_attr_cb, tb); +if (!tb[CTRL_ATTR_MAXATTR ]) +return MNL_CB_ERROR ; + + family->max_attr =mnl_attr_get_u32 (tb[CTRL_ATTR_MAXATTR ]); + +return MNL_CB_OK ; +} + +int mnlg_socket_get_max_attr (struct mnlu_gen_socket *nlg,uint32_t *max_attr) +{ +struct nlmsghdr *nlh; +struct family_info family; +int err; + + nlh =_mnlu_gen_socket_cmd_prepare (nlg,CTRL_CMD_GETFAMILY , +NLM_F_REQUEST |NLM_F_ACK , +GENL_ID_CTRL ,1 ); + +mnl_attr_put_u16 (nlh,CTRL_ATTR_FAMILY_ID , nlg->family); + + err =mnlg_socket_send (nlg, nlh); +if (err <0 ) +return err; + + err =mnlu_gen_socket_recv_run (nlg, get_family_cb, &family); +if (err <0 ) +return err; + + *max_attr = family.max_attr; + +return 0 ; +} +int mnlg_socket_get_fd (struct mnlu_gen_socket *nlg) {return mnl_socket_get_fd (nlg->nl);
devlink/mnlg.h +1 -0
@@ -18,6 +18,7 @@ struct mnlu_gen_socket;int mnlg_socket_send (struct mnlu_gen_socket *nlg,const struct nlmsghdr *nlh);int mnlg_socket_group_add (struct mnlu_gen_socket *nlg,const char *group_name); +int mnlg_socket_get_max_attr (struct mnlu_gen_socket *nlg,uint32_t *max_attr);int mnlg_socket_get_fd (struct mnlu_gen_socket *nlg);#endif /* _MNLG_H_ */
Signature · 6 lines
2.36.1 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Jacob Keller
maintainerPATCH v2 3/3 devlink: add dry run attribute support to devlink flash
In reply to Jacob KellerRecent versions of the kernel support the DEVLINK_ATTR_DRY_RUN attribute which allows requesting a dry run of a command. A dry run is simply a request to validate that a command would work, without performing any destructive changes.
The attribute is supported by the devlink flash update as a way to validate an update, including potentially the binary image, without modifying the device.
Add a "dry_run" option to the command line parsing which will enable this attribute when requested.
To avoid potential issues, only allow the attribute to be added to commands when the kernel recognizes it. This is important because some commands do not perform strict validation. If we were to add the attribute without this check, an old kernel may silently accept the command and perform an update even when dry_run was requested.
Before adding the attribute, check the maximum attribute from the CTRL_CMD_GETFAMILY and make sure that the kernel recognizes the DEVLINK_ATTR_DRY_RUN attribute.
---
Changes since v1
* Make dl_kernel_supports_dry_run more generic by passing attribute
devlink/devlink.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)
devlink/devlink.c +43 -2
@@ -296,6 +296,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)#define DL_OPT_PORT_FN_RATE_PARENT BIT(51)#define DL_OPT_LINECARD BIT(52)#define DL_OPT_LINECARD_TYPE BIT(53) +#define DL_OPT_DRY_RUN BIT(54)struct dl_opts {uint64_t present;/* flags of present items */
@@ -372,6 +373,8 @@ struct dl {bool verbose;bool stats;bool hex; +bool max_attr_valid; +uint32_t max_attr;struct {bool present;char *bus_name;
@@ -701,6 +704,7 @@ static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_LINECARD_STATE] = MNL_TYPE_U8, [DEVLINK_ATTR_LINECARD_TYPE] = MNL_TYPE_STRING, [DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES] = MNL_TYPE_NESTED, + [DEVLINK_ATTR_DRY_RUN] = MNL_TYPE_FLAG, }; static const enum mnl_attr_data_type
@@ -1522,6 +1526,30 @@ static int dl_args_finding_required_validate(uint64_t o_required,return 0 ; } +static void dl_get_max_attr (struct dl *dl) +{ +if (!dl->max_attr_valid) { +uint32_t max_attr; +int err; + + err =mnlg_socket_get_max_attr (&dl->nlg, &max_attr); +if (err) { +pr_err ("Unable to determine maximum supported devlink attribute\n" ); +return ; + } + + dl->max_attr = max_attr; + dl->max_attr_valid = true; + } +} + +static bool dl_kernel_supports_attr (struct dl *dl,enum devlink_attr attr) +{ +dl_get_max_attr (dl); + +return (dl->max_attr_valid && dl->max_attr >= attr); +} +static int dl_argv_parse (struct dl *dl,uint64_t o_required,uint64_t o_optional) {
@@ -2037,6 +2065,16 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,dl_arg_inc (dl); opts->linecard_type ="" ; o_found |=DL_OPT_LINECARD_TYPE ; + }else if (dl_argv_match (dl,"dry_run" ) && + (o_all &DL_OPT_DRY_RUN )) { + +if (!dl_kernel_supports_attr (dl,DEVLINK_ATTR_DRY_RUN )) { +pr_err ("Kernel does not support dry_run attribute\n" ); +return -EOPNOTSUPP ; + } + +dl_arg_inc (dl); + o_found |=DL_OPT_DRY_RUN ; }else {pr_err ("Unknown option \"%s\"\n" ,dl_argv (dl));return -EINVAL ;
@@ -2115,6 +2153,8 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)mnl_attr_put_strz (nlh,DEVLINK_ATTR_RATE_NODE_NAME , opts->rate_node_name); } +if (opts->present &DL_OPT_DRY_RUN ) +mnl_attr_put (nlh,DEVLINK_ATTR_DRY_RUN ,0 ,NULL );if (opts->present &DL_OPT_PORT_TYPE )mnl_attr_put_u16 (nlh,DEVLINK_ATTR_PORT_TYPE , opts->port_type);
@@ -2326,7 +2366,7 @@ static void cmd_dev_help(void)pr_err (" devlink dev reload DEV [ netns { PID | NAME | ID } ]\n" );pr_err (" [ action { driver_reinit | fw_activate } ] [ limit no_reset ]\n" );pr_err (" devlink dev info [ DEV ]\n" ); -pr_err (" devlink dev flash DEV file PATH [ component NAME ] [ overwrite SECTION ]\n" ); +pr_err (" devlink dev flash DEV file PATH [ component NAME ] [ overwrite SECTION ] [ dry_run ]\n" ); } static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,
@@ -3886,7 +3926,8 @@ static int cmd_dev_flash(struct dl *dl) NLM_F_REQUEST | NLM_F_ACK); err =dl_argv_parse_put (nlh, dl,DL_OPT_HANDLE |DL_OPT_FLASH_FILE_NAME , -DL_OPT_FLASH_COMPONENT |DL_OPT_FLASH_OVERWRITE ); +DL_OPT_FLASH_COMPONENT |DL_OPT_FLASH_OVERWRITE | +DL_OPT_DRY_RUN );if (err)return err;
Signature · 1 line
2.36.1
Jiri Pirko
maintainerRe: [iproute2-next v2 3/3] devlink: add dry run attribute support to devlink flash
Quoted 60 lines · Thu, Jul 21, 2022 at 11:14:51PM CEST, [email protected] wrote:
Recent versions of the kernel support the
DEVLINK_ATTR_DRY_RUNattribute which allows requesting a dry run of a command. A dry run is simply a request to validate that a command would work, without performing any destructive changes.The attribute is supported by the devlink flash update as a way to validate an update, including potentially the binary image, without modifying the device.
Add a "
dry_run" option to the command line parsing which will enable this attribute when requested.To avoid potential issues, only allow the attribute to be added to commands when the kernel recognizes it. This is important because some commands do not perform strict validation. If we were to add the attribute without this check, an old kernel may silently accept the command and perform an update even when
dry_runwas requested.Before adding the attribute, check the maximum attribute from the
CTRL_CMD_GETFAMILYand make sure that the kernel recognizes theDEVLINK_ATTR_DRY_RUNattribute.Signed-off-by Jacob Keller <[email protected]>---
Changes since v1
* Makedl_kernel_supports_dry_runmore generic by passing attribute
devlink/devlink.c| 45 +++++++++++++++++++++++++++++++++++++++++++--1 file changed, 43 insertions(+), 2 deletions(-)devlink/devlink.c +4
-0@@ -296,6 +296,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)#define DL_OPT_PORT_FN_RATE_PARENT BIT(51)#define DL_OPT_LINECARD BIT(52)#define DL_OPT_LINECARD_TYPE BIT(53) +#define DL_OPT_DRY_RUN BIT(54)struct dl_opts {uint64_t present;/* flags of present items */ @@ -372,6 +373,8 @@ struct dl {bool verbose;bool stats;bool hex; +bool max_attr_valid; +uint32_t max_attr;struct {bool present;char *bus_name;@@ -701,6 +704,7 @@ static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_LINECARD_STATE] = MNL_TYPE_U8, [DEVLINK_ATTR_LINECARD_TYPE] = MNL_TYPE_STRING, [DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES] = MNL_TYPE_NESTED, + [DEVLINK_ATTR_DRY_RUN] = MNL_TYPE_FLAG, };static const enum
mnl_attr_data_type
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t o_required, · line 1531
Quoted 6 lines
devlink/devlink.c +3
-0@@ -1522,6 +1526,30 @@ static int dl_args_finding_required_validate(uint64_t o_required,return 0 ; } +static void dl_get_max_attr (struct dl *dl) +{ +if (!dl->max_attr_valid) {
if (dl->max_attr_valid)
return;
and then you can drop the indent.
Quoted 9 lines
devlink/devlink.c +9
-0+uint32_t max_attr; +int err; + + err =mnlg_socket_get_max_attr (&dl->nlg, &max_attr); +if (err) { +pr_err ("Unable to determine maximum supported devlink attribute\n" ); +return ; + } +
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t o_required, · line 1550
Quoted 10 lines
devlink/devlink.c +10
-0+ dl->max_attr = max_attr; + dl->max_attr_valid = true; + } +} + +static bool dl_kernel_supports_attr (struct dl *dl,enum devlink_attr attr) +{ +dl_get_max_attr (dl); + +return (dl->max_attr_valid && dl->max_attr >= attr);
Return is not a function. Drop the "()" here.
Quoted 53 lines
devlink/devlink.c +17
-2+} +static int dl_argv_parse (struct dl *dl,uint64_t o_required,uint64_t o_optional) {@@ -2037,6 +2065,16 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,dl_arg_inc (dl); opts->linecard_type ="" ; o_found |=DL_OPT_LINECARD_TYPE ; + }else if (dl_argv_match (dl,"dry_run" ) && + (o_all &DL_OPT_DRY_RUN )) { + +if (!dl_kernel_supports_attr (dl,DEVLINK_ATTR_DRY_RUN )) { +pr_err ("Kernel does not support dry_run attribute\n" ); +return -EOPNOTSUPP ; + } + +dl_arg_inc (dl); + o_found |=DL_OPT_DRY_RUN ; }else {pr_err ("Unknown option \"%s\"\n" ,dl_argv (dl));return -EINVAL ;@@ -2115,6 +2153,8 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)mnl_attr_put_strz (nlh,DEVLINK_ATTR_RATE_NODE_NAME , opts->rate_node_name); } +if (opts->present &DL_OPT_DRY_RUN ) +mnl_attr_put (nlh,DEVLINK_ATTR_DRY_RUN ,0 ,NULL );if (opts->present &DL_OPT_PORT_TYPE )mnl_attr_put_u16 (nlh,DEVLINK_ATTR_PORT_TYPE , opts->port_type);@@ -2326,7 +2366,7 @@ static void cmd_dev_help(void)pr_err (" devlink dev reload DEV [ netns { PID | NAME | ID } ]\n" );pr_err (" [ action { driver_reinit | fw_activate } ] [ limit no_reset ]\n" );pr_err (" devlink dev info [ DEV ]\n" ); -pr_err (" devlink dev flash DEV file PATH [ component NAME ] [ overwrite SECTION ]\n" ); +pr_err (" devlink dev flash DEV file PATH [ component NAME ] [ overwrite SECTION ] [ dry_run ]\n" ); } static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,@@ -3886,7 +3926,8 @@ static int cmd_dev_flash(struct dl *dl) NLM_F_REQUEST | NLM_F_ACK); err =dl_argv_parse_put (nlh, dl,DL_OPT_HANDLE |DL_OPT_FLASH_FILE_NAME , -DL_OPT_FLASH_COMPONENT |DL_OPT_FLASH_OVERWRITE ); +DL_OPT_FLASH_COMPONENT |DL_OPT_FLASH_OVERWRITE | +DL_OPT_DRY_RUN );if (err)return err;Signature · 1 line
2.36.1
Keller, Jacob E
maintainerRE: [iproute2-next v2 3/3] devlink: add dry run attribute support to devlink flash
Quoted 83 lines
-----Original Message-----
From: Jiri Pirko <[email protected]>
Sent: Thursday, July 21, 2022 11:22 PM
To: Keller, Jacob E <[email protected]>
Cc: [email protected]; Jonathan Corbet <[email protected]>; Jiri Pirko <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; Nguyen, Anthony L <[email protected]>; David Ahern <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; intel-wired- [email protected]
Subject: Re: [iproute2-next v2 3/3] devlink: add dry run attribute support to devlink flashdevlink/devlink.c static void ifname_map_free(struct ifname_map
Quoted 35 lines · Thu, Jul 21, 2022 at 11:14:51PM CEST, [email protected] wrote:
Recent versions of the kernel support the
DEVLINK_ATTR_DRY_RUNattribute which allows requesting a dry run of a command. A dry run is simply a request to validate that a command would work, without performing any destructive changes.The attribute is supported by the devlink flash update as a way to validate an update, including potentially the binary image, without modifying the device.
Add a "
dry_run" option to the command line parsing which will enable this attribute when requested.To avoid potential issues, only allow the attribute to be added to commands when the kernel recognizes it. This is important because some commands do not perform strict validation. If we were to add the attribute without this check, an old kernel may silently accept the command and perform an update even when
dry_runwas requested.Before adding the attribute, check the maximum attribute from the
CTRL_CMD_GETFAMILYand make sure that the kernel recognizes theDEVLINK_ATTR_DRY_RUNattribute.Signed-off-by Jacob Keller <[email protected]>---
Changes since v1
* Makedl_kernel_supports_dry_runmore generic by passing attribute
devlink/devlink.c| 45 +++++++++++++++++++++++++++++++++++++++++++--1 file changed, 43 insertions(+), 2 deletions(-)devlink/devlink.c +0
-0@@ -296,6 +296,7 @@ static void ifname_map_free(struct ifname_map
*ifname_map)devlink/devlink.c static const enum mnl_attr_data_type
Quoted 17 lines
devlink/devlink.c +3
-0#define DL_OPT_PORT_FN_RATE_PARENT BIT(51)#define DL_OPT_LINECARD BIT(52)#define DL_OPT_LINECARD_TYPE BIT(53) +#define DL_OPT_DRY_RUN BIT(54)struct dl_opts {uint64_t present;/* flags of present items */ @@ -372,6 +373,8 @@ struct dl {bool verbose;bool stats;bool hex; +bool max_attr_valid; +uint32_t max_attr;struct {bool present;char *bus_name;@@ -701,6 +704,7 @@ static const enum mnl_attr_data_typedevlink_policy[DEVLINK_ATTR_MAX + 1] = {
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t
Quoted 8 lines
devlink/devlink.c +1
-0[DEVLINK_ATTR_LINECARD_STATE] = MNL_TYPE_U8, [DEVLINK_ATTR_LINECARD_TYPE] = MNL_TYPE_STRING, [DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES] = MNL_TYPE_NESTED, + [DEVLINK_ATTR_DRY_RUN] = MNL_TYPE_FLAG, };static const enum
mnl_attr_data_typedevlink/devlink.c +0
-0@@ -1522,6 +1526,30 @@ static int dl_args_finding_required_validate(uint64_t
o_required,Quoted 3 lines
devlink/devlink.c +0
-0return 0 ; }
Quoted 9 lines
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t o_required, · line 1531
Quoted 3 lines
devlink/devlink.c +3
-0+static void dl_get_max_attr (struct dl *dl) +{ +if (!dl->max_attr_valid) {if (
dl->max_attr_valid)return;and then you can drop the indent.
Yep, makes sense.
Quoted 8 lines
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t o_required,
Quoted 7 lines
devlink/devlink.c +6
-0+uint32_t max_attr; +int err; + + err =mnlg_socket_get_max_attr (&dl->nlg, &max_attr); +if (err) { + pr_err("Unable to determine maximum supporteddevlink attribute\n");
Quoted 16 lines
devlink/devlink.c static int dl_args_finding_required_validate(uint64_t o_required, · line 1550
Quoted 13 lines
devlink/devlink.c +13
-0+return ; + } + + dl->max_attr = max_attr; + dl->max_attr_valid = true; + } +} + +static bool dl_kernel_supports_attr (struct dl *dl,enum devlink_attr attr) +{ +dl_get_max_attr (dl); + +return (dl->max_attr_valid && dl->max_attr >= attr);Return is not a function. Drop the "()" here.
Will fix.
Quoted 64 lines
devlink/devlink.c static int dl_argv_parse(struct dl *dl, uint64_t
Quoted 7 lines
devlink/devlink.c +2
-0+} +static int dl_argv_parse (struct dl *dl,uint64_t o_required,uint64_t o_optional) {@@ -2037,6 +2065,16 @@ static int dl_argv_parse(struct dl *dl, uint64_t
o_required,devlink/devlink.c static int dl_argv_parse(struct dl *dl, uint64_t o_required,
Quoted 7 lines
devlink/devlink.c +4
-0dl_arg_inc (dl); opts->linecard_type ="" ; o_found |=DL_OPT_LINECARD_TYPE ; + } else if (dl_argv_match(dl, "dry_run") && + (o_all & DL_OPT_DRY_RUN)) { + + if (!dl_kernel_supports_attr(dl,
DEVLINK_ATTR_DRY_RUN)) {devlink/devlink.c static int dl_argv_parse(struct dl *dl, uint64_t · line 2072
Quoted 1 line
devlink/devlink.c +1
-0+ pr_err("Kernel does not support dry_runattribute\n");
devlink/devlink.c static void dl_opts_put(struct nlmsghdr *nlh, struct dl
Quoted 9 lines
devlink/devlink.c +5
-0+return -EOPNOTSUPP ; + } + +dl_arg_inc (dl); + o_found |=DL_OPT_DRY_RUN ; }else {pr_err ("Unknown option \"%s\"\n" ,dl_argv (dl));return -EINVAL ;@@ -2115,6 +2153,8 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl*dl)
devlink/devlink.c static void cmd_dev_help(void) · line 2367
Quoted 11 lines
devlink/devlink.c +2
-0mnl_attr_put_strz (nlh,DEVLINK_ATTR_RATE_NODE_NAME , opts->rate_node_name); } +if (opts->present &DL_OPT_DRY_RUN ) +mnl_attr_put (nlh,DEVLINK_ATTR_DRY_RUN ,0 ,NULL );if (opts->present &DL_OPT_PORT_TYPE )mnl_attr_put_u16 (nlh,DEVLINK_ATTR_PORT_TYPE , opts->port_type);@@ -2326,7 +2366,7 @@ static void cmd_dev_help(void)pr_err (" devlink dev reload DEV [ netns { PID | NAME | ID } ]\n" ); pr_err(" [ action { driver_reinit | fw_activate } ] [ limit
no_reset]\n");devlink/devlink.c static void cmd_dev_help(void) · line 2329
Quoted 2 lines
devlink/devlink.c +0
-1pr_err (" devlink dev info [ DEV ]\n" ); - pr_err(" devlink dev flash DEV file PATH [ component NAME ] [overwrite SECTION ]\n");
devlink/devlink.c static void cmd_dev_help(void) · line 2369
Quoted 1 line
devlink/devlink.c +1
-0+ pr_err(" devlink dev flash DEV file PATH [ component NAME ] [overwrite SECTION ] [
dry_run]\n");devlink/devlink.c static int cmd_dev_flash(struct dl *dl) · line 3928
Quoted 7 lines
devlink/devlink.c +0
-0} static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,@@ -3886,7 +3926,8 @@ static int cmd_dev_flash(struct dl *dl) NLM_F_REQUEST | NLM_F_ACK); err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE |
DL_OPT_FLASH_FILE_NAME,devlink/devlink.c static int cmd_dev_flash(struct dl *dl) · line 3889
Quoted 1 line
devlink/devlink.c +0
-1- DL_OPT_FLASH_COMPONENT |
DL_OPT_FLASH_OVERWRITE);devlink/devlink.c static int cmd_dev_flash(struct dl *dl) · line 3929
Quoted 1 line
devlink/devlink.c +1
-0+ DL_OPT_FLASH_COMPONENT |
DL_OPT_FLASH_OVERWRITE|Quoted 7 lines
devlink/devlink.c +1
-1+ DL_OPT_DRY_RUN);if (err)return err; --2.36.1
Jakub Kicinski
maintainerQuoted 2 lines · On Thu, 21 Jul 2022 14:14:45 -0700 Jacob Keller wrote:
This is a re-send of the dry run support I submitted nearly a year ago at
https://lore.kernel.org/netdev/CO1PR11MB50898047B9C0FAA520505AFDD6B59@CO1PR11MB5089.namprd11.prod.outlook.com/
You confused patchwork, please post user space in separate thread:
Tomorrow: