]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
IPoIB: Fix hang in ipoib_flush_paths()
authorYossi Etigin <yosefe@Voltaire.COM>
Wed, 12 Nov 2008 18:24:38 +0000 (10:24 -0800)
committerRoland Dreier <rolandd@cisco.com>
Wed, 12 Nov 2008 18:24:38 +0000 (10:24 -0800)
ipoib_flush_paths() can hang during an SM up/down loop: if
path_rec_start() fails (for instance, because there is no sm_ah), the
path is still added to the path list by neigh_add_path().  Then,
ipoib_flush_paths() will wait for path->done, but it will never
complete because the request was not issued at all.  Fix this by
completing path->done if issuing the query fails.

This fixes <https://bugs.openfabrics.org/show_bug.cgi?id=1329>.

Signed-off-by: Yossi Etigin <yosefe@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/ulp/ipoib/ipoib_main.c

index b1eeb5a427cab9e999d3e6439c3656db1a8d5bd3..0b2f601e8cafa594e79d82334e080497f56cb65b 100644 (file)
@@ -547,6 +547,7 @@ static int path_rec_start(struct net_device *dev,
        if (path->query_id < 0) {
                ipoib_warn(priv, "ib_sa_path_rec_get failed: %d\n", path->query_id);
                path->query = NULL;
+               complete(&path->done);
                return path->query_id;
        }