[dpdk-dev] [PATCH v4 5/5] app/testpmd: extend event printing

[Thomas Monjalon]

+Cc Wenzhuo and Jingjing for review, thanks

04/01/2018 17:01, Thomas Monjalon:
> From: Matan Azrad <matan at mellanox.com>
> 
> There are new Ethernet device events - NEW and DESTROY, and new option
> to register all ports by one call.
> 
> Adjust application to aforementioned changes.
> 
> Signed-off-by: Matan Azrad <matan at mellanox.com>
> ---
> v3: no change
> v4: no change
> ---
>  app/test-pmd/parameters.c             |  4 ++++
>  app/test-pmd/testpmd.c                | 30 ++++++++++++++++--------------
>  doc/guides/testpmd_app_ug/run_app.rst |  4 ++--
>  3 files changed, 22 insertions(+), 16 deletions(-)
> 
> diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
> index 84e7a63ef..796d1a5b6 100644
> --- a/app/test-pmd/parameters.c
> +++ b/app/test-pmd/parameters.c
> @@ -546,6 +546,10 @@ parse_event_printing_config(const char *optarg, int enable)
>  		mask = UINT32_C(1) << RTE_ETH_EVENT_MACSEC;
>  	else if (!strcmp(optarg, "intr_rmv"))
>  		mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RMV;
> +	else if (!strcmp(optarg, "dev_probed"))
> +		mask = UINT32_C(1) << RTE_ETH_EVENT_NEW;
> +	else if (!strcmp(optarg, "dev_released"))
> +		mask = UINT32_C(1) << RTE_ETH_EVENT_DESTROY;
>  	else if (!strcmp(optarg, "all"))
>  		mask = ~UINT32_C(0);
>  	else {
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index c3ab44849..26576eb76 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -1568,20 +1568,6 @@ start_port(portid_t pid)
>  			}
>  		}
>  
> -		for (event_type = RTE_ETH_EVENT_UNKNOWN;
> -		     event_type < RTE_ETH_EVENT_MAX;
> -		     event_type++) {
> -			diag = rte_eth_dev_callback_register(pi,
> -							event_type,
> -							eth_event_callback,
> -							NULL);
> -			if (diag) {
> -				printf("Failed to setup even callback for event %d\n",
> -					event_type);
> -				return -1;
> -			}
> -		}
> -
>  		/* start port */
>  		if (rte_eth_dev_start(pi) < 0) {
>  			printf("Fail to start port %d\n", pi);
> @@ -1608,6 +1594,20 @@ start_port(portid_t pid)
>  		need_check_link_status = 1;
>  	}
>  
> +	for (event_type = RTE_ETH_EVENT_UNKNOWN;
> +	     event_type < RTE_ETH_EVENT_MAX;
> +	     event_type++) {
> +		diag = rte_eth_dev_callback_register(RTE_ETH_ALL,
> +						event_type,
> +						eth_event_callback,
> +						NULL);
> +		if (diag) {
> +			printf("Failed to setup even callback for event %d\n",
> +				event_type);
> +			return -1;
> +		}
> +	}
> +
>  	if (need_check_link_status == 1 && !no_link_check)
>  		check_all_ports_link_status(RTE_PORT_ALL);
>  	else if (need_check_link_status == 0)
> @@ -1930,6 +1930,8 @@ eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
>  		[RTE_ETH_EVENT_VF_MBOX] = "VF Mbox",
>  		[RTE_ETH_EVENT_MACSEC] = "MACsec",
>  		[RTE_ETH_EVENT_INTR_RMV] = "device removal",
> +		[RTE_ETH_EVENT_NEW] = "device probed",
> +		[RTE_ETH_EVENT_DESTROY] = "device released",
>  		[RTE_ETH_EVENT_MAX] = NULL,
>  	};
>  
> diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
> index 4c0d2cede..377b07651 100644
> --- a/doc/guides/testpmd_app_ug/run_app.rst
> +++ b/doc/guides/testpmd_app_ug/run_app.rst
> @@ -492,12 +492,12 @@ The commandline options are:
>  
>      Set the logical core N to perform bitrate calculation.
>  
> -*   ``--print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|all>``
> +*   ``--print-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|dev_probed|dev_released|all>``
>  
>      Enable printing the occurrence of the designated event. Using all will
>      enable all of them.
>  
> -*   ``--mask-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|all>``
> +*   ``--mask-event <unknown|intr_lsc|queue_state|intr_reset|vf_mbox|macsec|intr_rmv|dev_probed|dev_released|all>``
>  
>      Disable printing the occurrence of the designated event. Using all will
>      disable all of them.
>