releases/4.14.60/staging-lustre-o2iblnd-fix-race-at-kiblnd_connect_peer.patch

   1 From foo@baz Sat Jul 28 10:25:26 CEST 2018
   2 From: Doug Oucahrek <dougso@me.com>
   3 Date: Tue, 1 May 2018 22:22:19 -0700
   4 Subject: staging: lustre: o2iblnd: fix race at kiblnd_connect_peer
   5
   6 From: Doug Oucahrek <dougso@me.com>
   7
   8 [ Upstream commit cf04968efe341b9b1c30a527e5dd61b2af9c43d2 ]
   9
  10 cmid will be destroyed at OFED if kiblnd_cm_callback return error.
  11 if error happen before the end of kiblnd_connect_peer, it will touch
  12 destroyed cmid and fail as
  13 (o2iblnd_cb.c:1315:kiblnd_connect_peer())
  14             ASSERTION( cmid->device != ((void *)0) ) failed:
  15
  16 Signed-off-by: Alexander Boyko <alexander.boyko@seagate.com>
  17 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-10015
  18 Reviewed-by: Alexey Lyashkov <c17817@cray.com>
  19 Reviewed-by: Doug Oucharek <dougso@me.com>
  20 Reviewed-by: John L. Hammond <john.hammond@intel.com>
  21 Signed-off-by: Doug Oucharek <dougso@me.com>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25 ---
  26  drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   18 +++++++++++------
  27  1 file changed, 12 insertions(+), 6 deletions(-)
  28
  29 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
  30 +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
  31 @@ -1289,11 +1289,6 @@ kiblnd_connect_peer(struct kib_peer *pee
  32                 goto failed2;
  33         }
  34
  35 -       LASSERT(cmid->device);
  36 -       CDEBUG(D_NET, "%s: connection bound to %s:%pI4h:%s\n",
  37 -              libcfs_nid2str(peer->ibp_nid), dev->ibd_ifname,
  38 -              &dev->ibd_ifip, cmid->device->name);
  39 -
  40         return;
  41
  42   failed2:
  43 @@ -2995,8 +2990,19 @@ kiblnd_cm_callback(struct rdma_cm_id *cm
  44                 } else {
  45                         rc = rdma_resolve_route(
  46                                 cmid, *kiblnd_tunables.kib_timeout * 1000);
  47 -                       if (!rc)
  48 +                       if (!rc) {
  49 +                               struct kib_net *net = peer->ibp_ni->ni_data;
  50 +                               struct kib_dev *dev = net->ibn_dev;
  51 +
  52 +                               CDEBUG(D_NET, "%s: connection bound to "\
  53 +                                      "%s:%pI4h:%s\n",
  54 +                                      libcfs_nid2str(peer->ibp_nid),
  55 +                                      dev->ibd_ifname,
  56 +                                      &dev->ibd_ifip, cmid->device->name);
  57 +
  58                                 return 0;
  59 +                       }
  60 +
  61                         /* Can't initiate route resolution */
  62                         CERROR("Can't resolve route for %s: %d\n",
  63                                libcfs_nid2str(peer->ibp_nid), rc);