rdma-core-providers-update.patch

   1 --- rdma-core-28.0/providers/cxgb3/iwch.c.orig  2020-02-12 21:21:08.971189494 +0100
   2 +++ rdma-core-28.0/providers/cxgb3/iwch.c       2020-02-12 21:28:50.972019955 +0100
   3 @@ -75,6 +75,14 @@
   4         {},
   5  };
   6
   7 +static void iwch_free_context(struct ibv_context *ibctx)
   8 +{
   9 +       struct iwch_context *context = to_iwch_ctx(ibctx);
  10 +
  11 +       verbs_uninit_context(&context->ibv_ctx);
  12 +       free(context);
  13 +}
  14 +
  15  static const struct verbs_context_ops iwch_ctx_common_ops = {
  16         .query_device = iwch_query_device,
  17         .query_port = iwch_query_port,
  18 @@ -98,6 +106,7 @@
  19         .detach_mcast = iwch_detach_mcast,
  20         .post_srq_recv = iwch_post_srq_recv,
  21         .req_notify_cq = iwch_arm_cq,
  22 +       .free_context = iwch_free_context,
  23  };
  24
  25  static const struct verbs_context_ops iwch_ctx_t3a_ops = {
  26 @@ -160,14 +169,6 @@
  27         return NULL;
  28  }
  29
  30 -static void iwch_free_context(struct ibv_context *ibctx)
  31 -{
  32 -       struct iwch_context *context = to_iwch_ctx(ibctx);
  33 -
  34 -       verbs_uninit_context(&context->ibv_ctx);
  35 -       free(context);
  36 -}
  37 -
  38  static void iwch_uninit_device(struct verbs_device *verbs_device)
  39  {
  40         struct iwch_device *dev = to_iwch_dev(&verbs_device->device);
  41 @@ -264,6 +265,5 @@
  42         .alloc_device = iwch_device_alloc,
  43         .uninit_device = iwch_uninit_device,
  44         .alloc_context = iwch_alloc_context,
  45 -       .free_context = iwch_free_context,
  46  };
  47  PROVIDER_DRIVER(cxgb3, iwch_dev_ops);
  48 --- rdma-core-28.0/providers/nes/nes_umain.c.orig       2020-02-12 22:09:28.778813223 +0100
  49 +++ rdma-core-28.0/providers/nes/nes_umain.c    2020-02-13 16:19:10.874608034 +0100
  50 @@ -63,6 +63,18 @@
  51         {},
  52  };
  53
  54 +/**
  55 + * nes_ufree_context
  56 + */
  57 +static void nes_ufree_context(struct ibv_context *ibctx)
  58 +{
  59 +       struct nes_uvcontext *nesvctx = to_nes_uctx(ibctx);
  60 +       nes_ufree_pd(&nesvctx->nesupd->ibv_pd);
  61 +
  62 +       verbs_uninit_context(&nesvctx->ibv_ctx);
  63 +       free(nesvctx);
  64 +}
  65 +
  66  static const struct verbs_context_ops nes_uctx_ops = {
  67         .query_device = nes_uquery_device,
  68         .query_port = nes_uquery_port,
  69 @@ -87,6 +99,7 @@
  70         .attach_mcast = nes_uattach_mcast,
  71         .detach_mcast = nes_udetach_mcast,
  72 -       .async_event = nes_async_event
  73 +       .async_event = nes_async_event,
  74 +       .free_context = nes_ufree_context,
  75  };
  76
  77  static const struct verbs_context_ops nes_uctx_no_db_ops = {
  78 @@ -163,18 +176,6 @@
  79  }
  80
  81
  82 -/**
  83 - * nes_ufree_context
  84 - */
  85 -static void nes_ufree_context(struct ibv_context *ibctx)
  86 -{
  87 -       struct nes_uvcontext *nesvctx = to_nes_uctx(ibctx);
  88 -       nes_ufree_pd(&nesvctx->nesupd->ibv_pd);
  89 -
  90 -       verbs_uninit_context(&nesvctx->ibv_ctx);
  91 -       free(nesvctx);
  92 -}
  93 -
  94  static void nes_uninit_device(struct verbs_device *verbs_device)
  95  {
  96         struct nes_udevice *dev = to_nes_udev(&verbs_device->device);
  97 @@ -215,6 +216,5 @@
  98         .alloc_device = nes_device_alloc,
  99         .uninit_device = nes_uninit_device,
 100         .alloc_context = nes_ualloc_context,
 101 -       .free_context = nes_ufree_context,
 102  };
 103  PROVIDER_DRIVER(nes, nes_udev_ops);