Merge branch 'odp_fixes' into hmm.git

From rdma.git

Jason Gunthorpe says:

====================
This is a collection of general cleanups for ODP to clarify some of the
flows around umem creation and use of the interval tree.
====================

The branch is based on v5.3-rc5 due to dependencies, and is being taken
into hmm.git due to dependencies in the next patches.

* odp_fixes:
  RDMA/mlx5: Use odp instead of mr->umem in pagefault_mr
  RDMA/mlx5: Use ib_umem_start instead of umem.address
  RDMA/core: Make invalidate_range a device operation
  RDMA/odp: Use kvcalloc for the dma_list and page_list
  RDMA/odp: Check for overflow when computing the umem_odp end
  RDMA/odp: Provide ib_umem_odp_release() to undo the allocs
  RDMA/odp: Split creating a umem_odp from ib_umem_get
  RDMA/odp: Make the three ways to create a umem_odp clear
  RMDA/odp: Consolidate umem_odp initialization
  RDMA/odp: Make it clearer when a umem is an implicit ODP umem
  RDMA/odp: Iterate over the whole rbtree directly
  RDMA/odp: Use the common interval tree library instead of generic
  RDMA/mlx5: Fix MR npages calculation for IB_ACCESS_HUGETLB

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 33 insertions, 15 deletions

diff --git a/net/can/gw.c b/net/can/gw.c
index 5275ddf580bc..72711053ebe6 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -1046,32 +1046,50 @@ static __init int cgw_module_init(void)
         pr_info("can: netlink gateway (rev " CAN_GW_VERSION ") max_hops=%d\n",
                 max_hops);
 
-        register_pernet_subsys(&cangw_pernet_ops);
+        ret = register_pernet_subsys(&cangw_pernet_ops);
+        if (ret)
+                return ret;
+
+        ret = -ENOMEM;
         cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),
                                       0, 0, NULL);
-
         if (!cgw_cache)
-                return -ENOMEM;
+                goto out_cache_create;
 
         /* set notifier */
         notifier.notifier_call = cgw_notifier;
-        register_netdevice_notifier(&notifier);
+        ret = register_netdevice_notifier(&notifier);
+        if (ret)
+                goto out_register_notifier;
 
         ret = rtnl_register_module(THIS_MODULE, PF_CAN, RTM_GETROUTE,
                                    NULL, cgw_dump_jobs, 0);
-        if (ret) {
-                unregister_netdevice_notifier(&notifier);
-                kmem_cache_destroy(cgw_cache);
-                return -ENOBUFS;
-        }
-
-        /* Only the first call to rtnl_register_module can fail */
-        rtnl_register_module(THIS_MODULE, PF_CAN, RTM_NEWROUTE,
-                             cgw_create_job, NULL, 0);
-        rtnl_register_module(THIS_MODULE, PF_CAN, RTM_DELROUTE,
-                             cgw_remove_job, NULL, 0);
+        if (ret)
+                goto out_rtnl_register1;
+
+        ret = rtnl_register_module(THIS_MODULE, PF_CAN, RTM_NEWROUTE,
+                                   cgw_create_job, NULL, 0);
+        if (ret)
+                goto out_rtnl_register2;
+        ret = rtnl_register_module(THIS_MODULE, PF_CAN, RTM_DELROUTE,
+                                   cgw_remove_job, NULL, 0);
+        if (ret)
+                goto out_rtnl_register3;
 
         return 0;
+
+out_rtnl_register3:
+        rtnl_unregister(PF_CAN, RTM_NEWROUTE);
+out_rtnl_register2:
+        rtnl_unregister(PF_CAN, RTM_GETROUTE);
+out_rtnl_register1:
+        unregister_netdevice_notifier(&notifier);
+out_register_notifier:
+        kmem_cache_destroy(cgw_cache);
+out_cache_create:
+        unregister_pernet_subsys(&cangw_pernet_ops);
+
+        return ret;
 }
 
 static __exit void cgw_module_exit(void)