Message-ID: <3180c80b-5d53-abd3-4929-3282cae526b4@pensando.io>
Date:   Wed, 30 Sep 2020 19:18:55 -0700
From:   Shannon Nelson <snelson@...sando.io>
To:     Jacob Keller <jacob.e.keller@...el.com>, netdev@...r.kernel.org,
        Jakub Kicinski <kuba@...nel.org>
Subject: Re: [iproute2-next v2 1/1] devlink: display elapsed time during flash
 update

On 9/30/20 4:40 PM, Jacob Keller wrote:
> For some devices, updating the flash can take significant time during
> operations where no status can meaningfully be reported. This can be
> somewhat confusing to a user who sees devlink appear to hang on the
> terminal waiting for the device to update.
>
> Recent changes to the kernel interface allow such long running commands
> to provide a timeout value indicating some upper bound on how long the
> relevant action could take.
>
> Provide a ticking counter of the time elapsed since the previous status
> message in order to make it clear that the program is not simply stuck.
>
> Display this message whenever the status message from the kernel
> indicates a timeout value. Additionally also display the message if
> we've received no status for more than couple of seconds. If we elapse
> more than the timeout provided by the status message, replace the
> timeout display with "timeout reached".
>
> Signed-off-by: Jacob Keller <jacob.e.keller@...el.com>

Works for me - thanks!

Tested-by: Shannon Nelson <snelson@...sando.io>


> ---
>
> Changes since v1
> * update last status time only when the message changes, allowing an elapsed
>    time to represent the full operation of downloading or programming the
>    image.
> * Use "\b \b" to erase the elapsed time message properly even when we will
>    not be printing new text over it. This ensures that the messages disappear
>    as intended when we move to a new line.
>
> Because this is a bit confusing to understand the behavior when looking
> purely at text logs, I captured video of an update with this patch set and
> have posted it at [1] in case reviewers would like to actually see behavior
> in action
>
> [1] https://youtu.be/aeVuQzK0Lo8
>
>   devlink/devlink.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++-
>   1 file changed, 98 insertions(+), 1 deletion(-)
>
> diff --git a/devlink/devlink.c b/devlink/devlink.c
> index 0374175eda3d..aae5055e2c71 100644
> --- a/devlink/devlink.c
> +++ b/devlink/devlink.c
> @@ -33,6 +33,7 @@
>   #include <sys/select.h>
>   #include <sys/socket.h>
>   #include <sys/types.h>
> +#include <sys/time.h>
>   #include <rt_names.h>
>   
>   #include "version.h"
> @@ -3066,6 +3067,9 @@ static int cmd_dev_info(struct dl *dl)
>   
>   struct cmd_dev_flash_status_ctx {
>   	struct dl *dl;
> +	struct timeval time_of_last_status;
> +	uint64_t status_msg_timeout;
> +	size_t elapsed_time_msg_len;
>   	char *last_msg;
>   	char *last_component;
>   	uint8_t not_first:1,
> @@ -3083,6 +3087,16 @@ static int nullstrcmp(const char *str1, const char *str2)
>   	return str1 ? 1 : -1;
>   }
>   
> +static void cmd_dev_flash_clear_elapsed_time(struct cmd_dev_flash_status_ctx *ctx)
> +{
> +	int i;
> +
> +	for (i = 0; i < ctx->elapsed_time_msg_len; i++)
> +		pr_out_tty("\b \b");
> +
> +	ctx->elapsed_time_msg_len = 0;
> +}
> +
>   static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
>   {
>   	struct cmd_dev_flash_status_ctx *ctx = data;
> @@ -3095,6 +3109,8 @@ static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
>   	const char *bus_name;
>   	const char *dev_name;
>   
> +	cmd_dev_flash_clear_elapsed_time(ctx);
> +
>   	if (genl->cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS &&
>   	    genl->cmd != DEVLINK_CMD_FLASH_UPDATE_END)
>   		return MNL_CB_STOP;
> @@ -3124,12 +3140,19 @@ static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
>   		done = mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE]);
>   	if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL])
>   		total = mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL]);
> +	if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT])
> +		ctx->status_msg_timeout = mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT]);
> +	else
> +		ctx->status_msg_timeout = 0;
>   
>   	if (!nullstrcmp(msg, ctx->last_msg) &&
>   	    !nullstrcmp(component, ctx->last_component) &&
>   	    ctx->last_pc && ctx->not_first) {
>   		pr_out_tty("\b\b\b\b\b"); /* clean percentage */
>   	} else {
> +		/* only update the last status timestamp if the message changed */
> +		gettimeofday(&ctx->time_of_last_status, NULL);
> +
>   		if (ctx->not_first)
>   			pr_out("\n");
>   		if (component) {
> @@ -3155,11 +3178,72 @@ static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
>   	return MNL_CB_STOP;
>   }
>   
> +static void cmd_dev_flash_time_elapsed(struct cmd_dev_flash_status_ctx *ctx)
> +{
> +	struct timeval now, res;
> +
> +	gettimeofday(&now, NULL);
> +	timersub(&now, &ctx->time_of_last_status, &res);
> +
> +	/* Only begin displaying an elapsed time message if we've waited a few
> +	 * seconds with no response, or the status message included a timeout
> +	 * value.
> +	 */
> +	if (res.tv_sec > 2 || ctx->status_msg_timeout) {
> +		uint64_t elapsed_m, elapsed_s;
> +		char msg[128];
> +		size_t len;
> +
> +		/* clear the last elapsed time message, if we have one */
> +		cmd_dev_flash_clear_elapsed_time(ctx);
> +
> +		elapsed_m = res.tv_sec / 60;
> +		elapsed_s = res.tv_sec % 60;
> +
> +		/**
> +		 * If we've elapsed a few seconds without receiving any status
> +		 * notification from the device, we display a time elapsed
> +		 * message. This has a few possible formats:
> +		 *
> +		 * 1) just time elapsed, when no timeout was provided
> +		 *    " ( Xm Ys )"
> +		 * 2) time elapsed out of a timeout that came from the device
> +		 *    driver via DEVLINK_CMD_FLASH_UPDATE_STATUS_TIMEOUT
> +		 *    " ( Xm Ys : Am Ys)"
> +		 * 3) time elapsed if we still receive no status after
> +		 *    reaching the provided timeout.
> +		 *    " ( Xm Ys : timeout reached )"
> +		 */
> +		if (!ctx->status_msg_timeout) {
> +			len = snprintf(msg, sizeof(msg),
> +				       " ( %lum %lus )", elapsed_m, elapsed_s);
> +		} else if (res.tv_sec <= ctx->status_msg_timeout) {
> +			uint64_t timeout_m, timeout_s;
> +
> +			timeout_m = ctx->status_msg_timeout / 60;
> +			timeout_s = ctx->status_msg_timeout % 60;
> +
> +			len = snprintf(msg, sizeof(msg),
> +				       " ( %lum %lus : %lum %lus )",
> +				       elapsed_m, elapsed_s, timeout_m, timeout_s);
> +		} else {
> +			len = snprintf(msg, sizeof(msg),
> +				       " ( %lum %lus : timeout reached )", elapsed_m, elapsed_s);
> +		}
> +
> +		ctx->elapsed_time_msg_len = len;
> +
> +		pr_out_tty("%s", msg);
> +		fflush(stdout);
> +	}
> +}
> +
>   static int cmd_dev_flash_fds_process(struct cmd_dev_flash_status_ctx *ctx,
>   				     struct mnlg_socket *nlg_ntf,
>   				     int pipe_r)
>   {
>   	int nlfd = mnlg_socket_get_fd(nlg_ntf);
> +	struct timeval timeout;
>   	fd_set fds[3];
>   	int fdmax;
>   	int i;
> @@ -3174,7 +3258,14 @@ static int cmd_dev_flash_fds_process(struct cmd_dev_flash_status_ctx *ctx,
>   	if (nlfd >= fdmax)
>   		fdmax = nlfd + 1;
>   
> -	while (select(fdmax, &fds[0], &fds[1], &fds[2], NULL) < 0) {
> +	/* select only for a short while (1/10th of a second) in order to
> +	 * allow periodically updating the screen with an elapsed time
> +	 * indicator.
> +	 */
> +	timeout.tv_sec = 0;
> +	timeout.tv_usec = 100000;
> +
> +	while (select(fdmax, &fds[0], &fds[1], &fds[2], &timeout) < 0) {
>   		if (errno == EINTR)
>   			continue;
>   		pr_err("select() failed\n");
> @@ -3196,6 +3287,7 @@ static int cmd_dev_flash_fds_process(struct cmd_dev_flash_status_ctx *ctx,
>   			return err2;
>   		ctx->flash_done = 1;
>   	}
> +	cmd_dev_flash_time_elapsed(ctx);
>   	return 0;
>   }
>   
> @@ -3256,6 +3348,11 @@ static int cmd_dev_flash(struct dl *dl)
>   	}
>   	close(pipe_w);
>   
> +	/* initialize starting time to allow comparison for when to begin
> +	 * displaying a time elapsed message.
> +	 */
> +	gettimeofday(&ctx.time_of_last_status, NULL);
> +
>   	do {
>   		err = cmd_dev_flash_fds_process(&ctx, nlg_ntf, pipe_r);
>   		if (err)

Powered by blists - more mailing lists