[v2,5/7] app/testpmd: add error recovery usage demo
Checks
Commit Message
This patch adds error recovery usage demo which will:
1. stop packet forwarding when the RTE_ETH_EVENT_ERR_RECOVERING event
is received.
2. restart packet forwarding when the RTE_ETH_EVENT_RECOVERY_SUCCESS
event is received.
3. prompt the ports that fail to recovery and need to be removed when
the RTE_ETH_EVENT_RECOVERY_FAILED event is received.
In addition, a message is added to the printed information, requiring
no command to be executed during the error recovery.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
---
app/test-pmd/testpmd.c | 80 ++++++++++++++++++++++++++++++++++++++++++
app/test-pmd/testpmd.h | 4 ++-
2 files changed, 83 insertions(+), 1 deletion(-)
Comments
在 2023/10/20 18:07, Chengwen Feng 写道:
> This patch adds error recovery usage demo which will:
> 1. stop packet forwarding when the RTE_ETH_EVENT_ERR_RECOVERING event
> is received.
> 2. restart packet forwarding when the RTE_ETH_EVENT_RECOVERY_SUCCESS
> event is received.
> 3. prompt the ports that fail to recovery and need to be removed when
> the RTE_ETH_EVENT_RECOVERY_FAILED event is received.
Why not suggest that try to call dev_reset() or other way to recovery?
>
> In addition, a message is added to the printed information, requiring
> no command to be executed during the error recovery.
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
> ---
> app/test-pmd/testpmd.c | 80 ++++++++++++++++++++++++++++++++++++++++++
> app/test-pmd/testpmd.h | 4 ++-
> 2 files changed, 83 insertions(+), 1 deletion(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index 595b77748c..39a25238e5 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -3942,6 +3942,77 @@ rmv_port_callback(void *arg)
> start_packet_forwarding(0);
> }
>
> +static int need_start_when_recovery_over;
> +
> +static bool
> +has_port_in_err_recovering(void)
> +{
> + struct rte_port *port;
> + portid_t pid;
> +
> + RTE_ETH_FOREACH_DEV(pid) {
> + port = &ports[pid];
> + if (port->err_recovering)
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static void
> +err_recovering_callback(portid_t port_id)
> +{
> + if (!has_port_in_err_recovering())
> + printf("Please stop executing any commands until recovery result events are received!\n");
> +
> + ports[port_id].err_recovering = 1;
> + ports[port_id].recover_failed = 0;
> +
> + /* To simplify implementation, stop forwarding regardless of whether the port is used. */
> + if (!test_done) {
> + printf("Stop packet forwarding because some ports are in error recovering!\n");
> + stop_packet_forwarding();
> + need_start_when_recovery_over = 1;
> + }
> +}
> +
> +static void
> +recover_success_callback(portid_t port_id)
> +{
> + ports[port_id].err_recovering = 0;
> + if (has_port_in_err_recovering())
> + return;
> +
> + if (need_start_when_recovery_over) {
> + printf("Recovery success! Restart packet forwarding!\n");
> + start_packet_forwarding(0);
s/start_packet_forwarding(0)/start_packet_forwarding() ?
> + need_start_when_recovery_over = 0;
> + } else {
> + printf("Recovery success!\n");
> + }
> +}
> +
> +static void
> +recover_failed_callback(portid_t port_id)
> +{
> + struct rte_port *port;
> + portid_t pid;
> +
> + ports[port_id].err_recovering = 0;
> + ports[port_id].recover_failed = 1;
> + if (has_port_in_err_recovering())
> + return;
> +
> + need_start_when_recovery_over = 0;
> + printf("The ports:");
> + RTE_ETH_FOREACH_DEV(pid) {
> + port = &ports[pid];
> + if (port->recover_failed)
> + printf(" %u", pid);
> + }
> + printf(" recovery failed! Please remove them!\n");
> +}
> +
> /* This function is used by the interrupt thread */
> static int
> eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
> @@ -3997,6 +4068,15 @@ eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
> }
> break;
> }
> + case RTE_ETH_EVENT_ERR_RECOVERING:
> + err_recovering_callback(port_id);
> + break;
> + case RTE_ETH_EVENT_RECOVERY_SUCCESS:
> + recover_success_callback(port_id);
> + break;
> + case RTE_ETH_EVENT_RECOVERY_FAILED:
> + recover_failed_callback(port_id);
> + break;
> default:
> break;
> }
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> index 09a36b90b8..42782d5a05 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -342,7 +342,9 @@ struct rte_port {
> uint8_t member_flag : 1, /**< bonding member port */
> bond_flag : 1, /**< port is bond device */
> fwd_mac_swap : 1, /**< swap packet MAC before forward */
> - update_conf : 1; /**< need to update bonding device configuration */
> + update_conf : 1, /**< need to update bonding device configuration */
> + err_recovering : 1, /**< port is in error recovering */
> + recover_failed : 1; /**< port recover failed */
> struct port_template *pattern_templ_list; /**< Pattern templates. */
> struct port_template *actions_templ_list; /**< Actions templates. */
> struct port_table *table_list; /**< Flow tables. */
Hi Huisong,
On 2023/11/1 12:08, lihuisong (C) wrote:
>
> 在 2023/10/20 18:07, Chengwen Feng 写道:
>> This patch adds error recovery usage demo which will:
>> 1. stop packet forwarding when the RTE_ETH_EVENT_ERR_RECOVERING event
>> is received.
>> 2. restart packet forwarding when the RTE_ETH_EVENT_RECOVERY_SUCCESS
>> event is received.
>> 3. prompt the ports that fail to recovery and need to be removed when
>> the RTE_ETH_EVENT_RECOVERY_FAILED event is received.
> Why not suggest that try to call dev_reset() or other way to recovery?
It was already discussed many times, which is the reason why introduced the
RTE_ETH_EVENT_RECOVERY_XXX event, please refer previous thread.
>>
>> In addition, a message is added to the printed information, requiring
>> no command to be executed during the error recovery.
>>
>> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
>> Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
>> ---
>> app/test-pmd/testpmd.c | 80 ++++++++++++++++++++++++++++++++++++++++++
>> app/test-pmd/testpmd.h | 4 ++-
>> 2 files changed, 83 insertions(+), 1 deletion(-)
>>
>> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
>> index 595b77748c..39a25238e5 100644
>> --- a/app/test-pmd/testpmd.c
>> +++ b/app/test-pmd/testpmd.c
>> @@ -3942,6 +3942,77 @@ rmv_port_callback(void *arg)
>> start_packet_forwarding(0);
>> }
>> +static int need_start_when_recovery_over;
>> +
>> +static bool
>> +has_port_in_err_recovering(void)
>> +{
>> + struct rte_port *port;
>> + portid_t pid;
>> +
>> + RTE_ETH_FOREACH_DEV(pid) {
>> + port = &ports[pid];
>> + if (port->err_recovering)
>> + return true;
>> + }
>> +
>> + return false;
>> +}
>> +
>> +static void
>> +err_recovering_callback(portid_t port_id)
>> +{
>> + if (!has_port_in_err_recovering())
>> + printf("Please stop executing any commands until recovery result events are received!\n");
>> +
>> + ports[port_id].err_recovering = 1;
>> + ports[port_id].recover_failed = 0;
>> +
>> + /* To simplify implementation, stop forwarding regardless of whether the port is used. */
>> + if (!test_done) {
>> + printf("Stop packet forwarding because some ports are in error recovering!\n");
>> + stop_packet_forwarding();
>> + need_start_when_recovery_over = 1;
>> + }
>> +}
>> +
>> +static void
>> +recover_success_callback(portid_t port_id)
>> +{
>> + ports[port_id].err_recovering = 0;
>> + if (has_port_in_err_recovering())
>> + return;
>> +
>> + if (need_start_when_recovery_over) {
>> + printf("Recovery success! Restart packet forwarding!\n");
>> + start_packet_forwarding(0);
> s/start_packet_forwarding(0)/start_packet_forwarding() ?
start_packet_forwarding must have one parameter, 0 is proper use for here.
Thanks
Chengwen
>> + need_start_when_recovery_over = 0;
>> + } else {
>> + printf("Recovery success!\n");
>> + }
>> +}
>> +
>> +static void
>> +recover_failed_callback(portid_t port_id)
>> +{
>> + struct rte_port *port;
>> + portid_t pid;
>> +
>> + ports[port_id].err_recovering = 0;
>> + ports[port_id].recover_failed = 1;
>> + if (has_port_in_err_recovering())
>> + return;
>> +
>> + need_start_when_recovery_over = 0;
>> + printf("The ports:");
>> + RTE_ETH_FOREACH_DEV(pid) {
>> + port = &ports[pid];
>> + if (port->recover_failed)
>> + printf(" %u", pid);
>> + }
>> + printf(" recovery failed! Please remove them!\n");
>> +}
>> +
>> /* This function is used by the interrupt thread */
>> static int
>> eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
>> @@ -3997,6 +4068,15 @@ eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
>> }
>> break;
>> }
>> + case RTE_ETH_EVENT_ERR_RECOVERING:
>> + err_recovering_callback(port_id);
>> + break;
>> + case RTE_ETH_EVENT_RECOVERY_SUCCESS:
>> + recover_success_callback(port_id);
>> + break;
>> + case RTE_ETH_EVENT_RECOVERY_FAILED:
>> + recover_failed_callback(port_id);
>> + break;
>> default:
>> break;
>> }
>> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
>> index 09a36b90b8..42782d5a05 100644
>> --- a/app/test-pmd/testpmd.h
>> +++ b/app/test-pmd/testpmd.h
>> @@ -342,7 +342,9 @@ struct rte_port {
>> uint8_t member_flag : 1, /**< bonding member port */
>> bond_flag : 1, /**< port is bond device */
>> fwd_mac_swap : 1, /**< swap packet MAC before forward */
>> - update_conf : 1; /**< need to update bonding device configuration */
>> + update_conf : 1, /**< need to update bonding device configuration */
>> + err_recovering : 1, /**< port is in error recovering */
>> + recover_failed : 1; /**< port recover failed */
>> struct port_template *pattern_templ_list; /**< Pattern templates. */
>> struct port_template *actions_templ_list; /**< Actions templates. */
>> struct port_table *table_list; /**< Flow tables. */
> .
@@ -3942,6 +3942,77 @@ rmv_port_callback(void *arg)
start_packet_forwarding(0);
}
+static int need_start_when_recovery_over;
+
+static bool
+has_port_in_err_recovering(void)
+{
+ struct rte_port *port;
+ portid_t pid;
+
+ RTE_ETH_FOREACH_DEV(pid) {
+ port = &ports[pid];
+ if (port->err_recovering)
+ return true;
+ }
+
+ return false;
+}
+
+static void
+err_recovering_callback(portid_t port_id)
+{
+ if (!has_port_in_err_recovering())
+ printf("Please stop executing any commands until recovery result events are received!\n");
+
+ ports[port_id].err_recovering = 1;
+ ports[port_id].recover_failed = 0;
+
+ /* To simplify implementation, stop forwarding regardless of whether the port is used. */
+ if (!test_done) {
+ printf("Stop packet forwarding because some ports are in error recovering!\n");
+ stop_packet_forwarding();
+ need_start_when_recovery_over = 1;
+ }
+}
+
+static void
+recover_success_callback(portid_t port_id)
+{
+ ports[port_id].err_recovering = 0;
+ if (has_port_in_err_recovering())
+ return;
+
+ if (need_start_when_recovery_over) {
+ printf("Recovery success! Restart packet forwarding!\n");
+ start_packet_forwarding(0);
+ need_start_when_recovery_over = 0;
+ } else {
+ printf("Recovery success!\n");
+ }
+}
+
+static void
+recover_failed_callback(portid_t port_id)
+{
+ struct rte_port *port;
+ portid_t pid;
+
+ ports[port_id].err_recovering = 0;
+ ports[port_id].recover_failed = 1;
+ if (has_port_in_err_recovering())
+ return;
+
+ need_start_when_recovery_over = 0;
+ printf("The ports:");
+ RTE_ETH_FOREACH_DEV(pid) {
+ port = &ports[pid];
+ if (port->recover_failed)
+ printf(" %u", pid);
+ }
+ printf(" recovery failed! Please remove them!\n");
+}
+
/* This function is used by the interrupt thread */
static int
eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
@@ -3997,6 +4068,15 @@ eth_event_callback(portid_t port_id, enum rte_eth_event_type type, void *param,
}
break;
}
+ case RTE_ETH_EVENT_ERR_RECOVERING:
+ err_recovering_callback(port_id);
+ break;
+ case RTE_ETH_EVENT_RECOVERY_SUCCESS:
+ recover_success_callback(port_id);
+ break;
+ case RTE_ETH_EVENT_RECOVERY_FAILED:
+ recover_failed_callback(port_id);
+ break;
default:
break;
}
@@ -342,7 +342,9 @@ struct rte_port {
uint8_t member_flag : 1, /**< bonding member port */
bond_flag : 1, /**< port is bond device */
fwd_mac_swap : 1, /**< swap packet MAC before forward */
- update_conf : 1; /**< need to update bonding device configuration */
+ update_conf : 1, /**< need to update bonding device configuration */
+ err_recovering : 1, /**< port is in error recovering */
+ recover_failed : 1; /**< port recover failed */
struct port_template *pattern_templ_list; /**< Pattern templates. */
struct port_template *actions_templ_list; /**< Actions templates. */
struct port_table *table_list; /**< Flow tables. */