NTB: perf: Fix race condition when run with ntb_test

When running ntb_test, the script tries to run the ntb_perf test
immediately after probing the modules. Since adding multi-port support,
this fails seeing the new initialization procedure in ntb_perf
can not complete instantly.

To fix this we add a completion which is waited on when a test is
started. In this way, run can be written any time after the module is
loaded and it will wait for the initialization to complete instead of
sending an error.

Fixes: 5648e56d03fa ("NTB: ntb_perf: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Allen Hubbe <allenbh@gmail.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c
index e38dc69..89df135 100644 (file)
--- a/drivers/ntb/test/ntb_perf.c
+++ b/drivers/ntb/test/ntb_perf.c
@@ -159,6 +159,8 @@ struct perf_peer {
        /* NTB connection setup service */
        struct work_struct      service;
        unsigned long           sts;
+
+       struct completion init_comp;
 };
 #define to_peer_service(__work) \
        container_of(__work, struct perf_peer, service)
@@ -547,6 +549,7 @@ static int perf_setup_outbuf(struct perf_peer *peer)
 
        /* Initialization is finally done */
        set_bit(PERF_STS_DONE, &peer->sts);
+       complete_all(&peer->init_comp);
 
        return 0;
 }
@@ -638,6 +641,7 @@ static void perf_service_work(struct work_struct *work)
                perf_setup_outbuf(peer);
 
        if (test_and_clear_bit(PERF_CMD_CLEAR, &peer->sts)) {
+               init_completion(&peer->init_comp);
                clear_bit(PERF_STS_DONE, &peer->sts);
                if (test_bit(0, &peer->perf->busy_flag) &&
                    peer == peer->perf->test_peer) {
@@ -1077,8 +1081,9 @@ static int perf_submit_test(struct perf_peer *peer)
        struct perf_thread *pthr;
        int tidx, ret;
 
-       if (!test_bit(PERF_STS_DONE, &peer->sts))
-               return -ENOLINK;
+       ret = wait_for_completion_interruptible(&peer->init_comp);
+       if (ret < 0)
+               return ret;
 
        if (test_and_set_bit_lock(0, &perf->busy_flag))
                return -EBUSY;
@@ -1449,6 +1454,7 @@ static int perf_init_peers(struct perf_ctx *perf)
                        peer->gidx = pidx;
                }
                INIT_WORK(&peer->service, perf_service_work);
+               init_completion(&peer->init_comp);
        }
        if (perf->gidx == -1)
                perf->gidx = pidx;