examples/bond: fix invalid use of trylock

The conditional rte_spinlock_trylock() was used as if it is an
unconditional lock operation in a number of places.

Fixes: cc7e8ae84faa ("examples/bond: add example application for link bonding mode 6")
Cc: stable@dpdk.org
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>

diff --git a/examples/bond/main.c b/examples/bond/main.c
index 335bde5c8d866e037b602ff57d27535f805760c8..4efebb3902e7eebd2381134ad87ef4999466a0d4 100644 (file)
--- a/examples/bond/main.c
+++ b/examples/bond/main.c
@@ -373,7 +373,7 @@ static int lcore_main(__rte_unused void *arg1)
        bond_ip = BOND_IP_1 | (BOND_IP_2 << 8) |
                                (BOND_IP_3 << 16) | (BOND_IP_4 << 24);
 
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
 
        while (global_flag_stru_p->LcoreMainIsRunning) {
                rte_spinlock_unlock(&global_flag_stru_p->lock);
@@ -456,7 +456,7 @@ static int lcore_main(__rte_unused void *arg1)
                        if (is_free == 0)
                                rte_pktmbuf_free(pkts[i]);
                }
-               rte_spinlock_trylock(&global_flag_stru_p->lock);
+               rte_spinlock_lock(&global_flag_stru_p->lock);
        }
        rte_spinlock_unlock(&global_flag_stru_p->lock);
        printf("BYE lcore_main\n");
@@ -571,7 +571,7 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,
 {
        int worker_core_id = rte_lcore_id();
 
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
        if (global_flag_stru_p->LcoreMainIsRunning == 0) {
                if (rte_eal_get_lcore_state(global_flag_stru_p->LcoreMainCore)
                    != WAIT) {
@@ -591,7 +591,7 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,
        if ((worker_core_id >= RTE_MAX_LCORE) || (worker_core_id == 0))
                return;
 
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
        global_flag_stru_p->LcoreMainIsRunning = 1;
        rte_spinlock_unlock(&global_flag_stru_p->lock);
        cmdline_printf(cl,
@@ -659,7 +659,7 @@ static void cmd_stop_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
                            __rte_unused void *data)
 {
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
        if (global_flag_stru_p->LcoreMainIsRunning == 0)        {
                cmdline_printf(cl,
                                        "lcore_main not running on core:%d\n",
@@ -700,7 +700,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
                            struct cmdline *cl,
                            __rte_unused void *data)
 {
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
        if (global_flag_stru_p->LcoreMainIsRunning == 0)        {
                cmdline_printf(cl,
                                        "lcore_main not running on core:%d\n",
@@ -762,7 +762,7 @@ static void cmd_show_parsed(__rte_unused void *parsed_result,
                printf("\n");
        }
 
-       rte_spinlock_trylock(&global_flag_stru_p->lock);
+       rte_spinlock_lock(&global_flag_stru_p->lock);
        cmdline_printf(cl,
                        "Active_slaves:%d "
                        "packets received:Tot:%d Arp:%d IPv4:%d\n",