Merge tag 'v5.2-rc6' into rdma.git for-next

For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client

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

75 files changed, 324 insertions, 154 deletions

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 0fe6f76e8fdc..42af4cd40ba2 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 menuconfig INFINIBAND
         tristate "InfiniBand support"
         depends on HAS_IOMEM && HAS_DMA
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile
index fad0b44c356f..8603cdfcfdcb 100644
--- a/drivers/infiniband/Makefile
+++ b/drivers/infiniband/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND)                += core/
 obj-$(CONFIG_INFINIBAND)                += hw/
 obj-$(CONFIG_INFINIBAND)                += ulp/
diff --git a/drivers/infiniband/core/cgroup.c b/drivers/infiniband/core/cgroup.c
index 388fd04e5f63..1f037fe01450 100644
--- a/drivers/infiniband/core/cgroup.c
+++ b/drivers/infiniband/core/cgroup.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2016 Parav Pandit <pandit.parav@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
  */
 
 #include "core_priv.h"
diff --git a/drivers/infiniband/core/cq.c b/drivers/infiniband/core/cq.c
index 3b9412c69565..00d70f166209 100644
--- a/drivers/infiniband/core/cq.c
+++ b/drivers/infiniband/core/cq.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2015 HGST, a Western Digital Company.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
  */
 #include <linux/module.h>
 #include <linux/err.h>
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 669c2d58e695..8a6ccb936dfe 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -407,27 +407,44 @@ static int rename_compat_devs(struct ib_device *device)
 
 int ib_device_rename(struct ib_device *ibdev, const char *name)
 {
+        unsigned long index;
+        void *client_data;
         int ret;
 
         down_write(&devices_rwsem);
         if (!strcmp(name, dev_name(&ibdev->dev))) {
-                ret = 0;
-                goto out;
+                up_write(&devices_rwsem);
+                return 0;
         }
 
         if (__ib_device_get_by_name(name)) {
-                ret = -EEXIST;
-                goto out;
+                up_write(&devices_rwsem);
+                return -EEXIST;
         }
 
         ret = device_rename(&ibdev->dev, name);
-        if (ret)
-                goto out;
+        if (ret) {
+                up_write(&devices_rwsem);
+                return ret;
+        }
+
         strlcpy(ibdev->name, name, IB_DEVICE_NAME_MAX);
         ret = rename_compat_devs(ibdev);
-out:
-        up_write(&devices_rwsem);
-        return ret;
+
+        downgrade_write(&devices_rwsem);
+        down_read(&ibdev->client_data_rwsem);
+        xan_for_each_marked(&ibdev->client_data, index, client_data,
+                            CLIENT_DATA_REGISTERED) {
+                struct ib_client *client = xa_load(&clients, index);
+
+                if (!client || !client->rename)
+                        continue;
+
+                client->rename(ibdev, client_data);
+        }
+        up_read(&ibdev->client_data_rwsem);
+        up_read(&devices_rwsem);
+        return 0;
 }
 
 static int alloc_name(struct ib_device *ibdev, const char *name)
@@ -472,14 +489,15 @@ static void ib_device_release(struct device *device)
 
         free_netdevs(dev);
         WARN_ON(refcount_read(&dev->refcount));
-        ib_cache_release_one(dev);
-        ib_security_release_port_pkey_list(dev);
-        xa_destroy(&dev->compat_devs);
-        xa_destroy(&dev->client_data);
-        if (dev->port_data)
+        if (dev->port_data) {
+                ib_cache_release_one(dev);
+                ib_security_release_port_pkey_list(dev);
                 kfree_rcu(container_of(dev->port_data, struct ib_port_data_rcu,
                                        pdata[0]),
                           rcu_head);
+        }
+        xa_destroy(&dev->compat_devs);
+        xa_destroy(&dev->client_data);
         kfree_rcu(dev, rcu_head);
 }
 
@@ -2028,6 +2046,9 @@ static void free_netdevs(struct ib_device *ib_dev)
         unsigned long flags;
         unsigned int port;
 
+        if (!ib_dev->port_data)
+                return;
+
         rdma_for_each_port (ib_dev, port) {
                 struct ib_port_data *pdata = &ib_dev->port_data[port];
                 struct net_device *ndev;
diff --git a/drivers/infiniband/core/mr_pool.c b/drivers/infiniband/core/mr_pool.c
index 132ff92626e1..c0e2df128b34 100644
--- a/drivers/infiniband/core/mr_pool.c
+++ b/drivers/infiniband/core/mr_pool.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016 HGST, a Western Digital Company.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
  */
 #include <rdma/ib_verbs.h>
 #include <rdma/mr_pool.h>
diff --git a/drivers/infiniband/core/rdma_core.h b/drivers/infiniband/core/rdma_core.h
index 5445323629b5..e63fbda25e1d 100644
--- a/drivers/infiniband/core/rdma_core.h
+++ b/drivers/infiniband/core/rdma_core.h
@@ -110,6 +110,8 @@ int uverbs_output_written(const struct uverbs_attr_bundle *bundle, size_t idx);
 void setup_ufile_idr_uobject(struct ib_uverbs_file *ufile);
 void release_ufile_idr_uobject(struct ib_uverbs_file *ufile);
 
+struct ib_udata *uverbs_get_cleared_udata(struct uverbs_attr_bundle *attrs);
+
 /*
  * This is the runtime description of the uverbs API, used by the syscall
  * machinery to validate and dispatch calls.
diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c
index cc5feb301c05..dce06108c8c3 100644
--- a/drivers/infiniband/core/rw.c
+++ b/drivers/infiniband/core/rw.c
@@ -1,14 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016 HGST, a Western Digital Company.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
  */
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 911533081db5..750c4d484329 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -174,6 +174,17 @@ static int uverbs_request_finish(struct uverbs_req_iter *iter)
         return 0;
 }
 
+/*
+ * When calling a destroy function during an error unwind we need to pass in
+ * the udata that is sanitized of all user arguments. Ie from the driver
+ * perspective it looks like no udata was passed.
+ */
+struct ib_udata *uverbs_get_cleared_udata(struct uverbs_attr_bundle *attrs)
+{
+        attrs->driver_udata = (struct ib_udata){};
+        return &attrs->driver_udata;
+}
+
 static struct ib_uverbs_completion_event_file *
 _ib_uverbs_lookup_comp_file(s32 fd, struct uverbs_attr_bundle *attrs)
 {
@@ -441,7 +452,7 @@ static int ib_uverbs_alloc_pd(struct uverbs_attr_bundle *attrs)
         return uobj_alloc_commit(uobj, attrs);
 
 err_copy:
-        ib_dealloc_pd_user(pd, &attrs->driver_udata);
+        ib_dealloc_pd_user(pd, uverbs_get_cleared_udata(attrs));
         pd = NULL;
 err_alloc:
         kfree(pd);
@@ -644,7 +655,7 @@ err_copy:
         }
 
 err_dealloc_xrcd:
-        ib_dealloc_xrcd(xrcd, &attrs->driver_udata);
+        ib_dealloc_xrcd(xrcd, uverbs_get_cleared_udata(attrs));
 
 err:
         uobj_alloc_abort(&obj->uobject, attrs);
@@ -769,7 +780,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs)
         return uobj_alloc_commit(uobj, attrs);
 
 err_copy:
-        ib_dereg_mr_user(mr, &attrs->driver_udata);
+        ib_dereg_mr_user(mr, uverbs_get_cleared_udata(attrs));
 
 err_put:
         uobj_put_obj_read(pd);
@@ -1047,7 +1058,7 @@ static struct ib_ucq_object *create_cq(struct uverbs_attr_bundle *attrs,
         return obj;
 
 err_cb:
-        ib_destroy_cq(cq);
+        ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
         cq = NULL;
 err_free:
         kfree(cq);
@@ -1485,7 +1496,7 @@ static int create_qp(struct uverbs_attr_bundle *attrs,
 
         return uobj_alloc_commit(&obj->uevent.uobject, attrs);
 err_cb:
-        ib_destroy_qp(qp);
+        ib_destroy_qp_user(qp, uverbs_get_cleared_udata(attrs));
 
 err_put:
         if (!IS_ERR(xrcd_uobj))
@@ -1618,7 +1629,7 @@ static int ib_uverbs_open_qp(struct uverbs_attr_bundle *attrs)
         return uobj_alloc_commit(&obj->uevent.uobject, attrs);
 
 err_destroy:
-        ib_destroy_qp(qp);
+        ib_destroy_qp_user(qp, uverbs_get_cleared_udata(attrs));
 err_xrcd:
         uobj_put_read(xrcd_uobj);
 err_put:
@@ -2460,7 +2471,8 @@ static int ib_uverbs_create_ah(struct uverbs_attr_bundle *attrs)
         return uobj_alloc_commit(uobj, attrs);
 
 err_copy:
-        rdma_destroy_ah(ah, RDMA_DESTROY_AH_SLEEPABLE);
+        rdma_destroy_ah_user(ah, RDMA_DESTROY_AH_SLEEPABLE,
+                             uverbs_get_cleared_udata(attrs));
 
 err_put:
         uobj_put_obj_read(pd);
@@ -2971,7 +2983,7 @@ static int ib_uverbs_ex_create_wq(struct uverbs_attr_bundle *attrs)
         return uobj_alloc_commit(&obj->uevent.uobject, attrs);
 
 err_copy:
-        ib_destroy_wq(wq, &attrs->driver_udata);
+        ib_destroy_wq(wq, uverbs_get_cleared_udata(attrs));
 err_put_cq:
         uobj_put_obj_read(cq);
 err_put_pd:
@@ -3471,7 +3483,7 @@ static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs,
         return uobj_alloc_commit(&obj->uevent.uobject, attrs);
 
 err_copy:
-        ib_destroy_srq_user(srq, &attrs->driver_udata);
+        ib_destroy_srq_user(srq, uverbs_get_cleared_udata(attrs));
 
 err_free:
         kfree(srq);
diff --git a/drivers/infiniband/core/uverbs_std_types_cq.c b/drivers/infiniband/core/uverbs_std_types_cq.c
index 06b8c7d017b7..e39fe6a8aac4 100644
--- a/drivers/infiniband/core/uverbs_std_types_cq.c
+++ b/drivers/infiniband/core/uverbs_std_types_cq.c
@@ -140,7 +140,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_CQ_CREATE)(
 
         return 0;
 err_cq:
-        ib_destroy_cq(cq);
+        ib_destroy_cq_user(cq, uverbs_get_cleared_udata(attrs));
         cq = NULL;
 err_free:
         kfree(cq);
diff --git a/drivers/infiniband/core/uverbs_std_types_mr.c b/drivers/infiniband/core/uverbs_std_types_mr.c
index 7ca79bfa3487..c1286a52dc84 100644
--- a/drivers/infiniband/core/uverbs_std_types_mr.c
+++ b/drivers/infiniband/core/uverbs_std_types_mr.c
@@ -149,7 +149,7 @@ static int UVERBS_HANDLER(UVERBS_METHOD_DM_MR_REG)(
         return 0;
 
 err_dereg:
-        ib_dereg_mr_user(mr, &attrs->driver_udata);
+        ib_dereg_mr_user(mr, uverbs_get_cleared_udata(attrs));
 
         return ret;
 }
diff --git a/drivers/infiniband/hw/bnxt_re/Kconfig b/drivers/infiniband/hw/bnxt_re/Kconfig
index 51e8234520a9..ab8779d23382 100644
--- a/drivers/infiniband/hw/bnxt_re/Kconfig
+++ b/drivers/infiniband/hw/bnxt_re/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_BNXT_RE
         tristate "Broadcom Netxtreme HCA support"
         depends on 64BIT
diff --git a/drivers/infiniband/hw/cxgb3/Kconfig b/drivers/infiniband/hw/cxgb3/Kconfig
index a7b77cb3d5d5..8c1a72bff447 100644
--- a/drivers/infiniband/hw/cxgb3/Kconfig
+++ b/drivers/infiniband/hw/cxgb3/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_CXGB3
         tristate "Chelsio RDMA Driver"
         depends on CHELSIO_T3
diff --git a/drivers/infiniband/hw/cxgb4/Kconfig b/drivers/infiniband/hw/cxgb4/Kconfig
index e0522a5d5a06..b49e8d4c3854 100644
--- a/drivers/infiniband/hw/cxgb4/Kconfig
+++ b/drivers/infiniband/hw/cxgb4/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_CXGB4
         tristate "Chelsio T4/T5 RDMA Driver"
         depends on CHELSIO_T4 && INET
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
index 31a87d90a40b..291d259d2319 100644
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4
 ccflags-y += -I $(srctree)/drivers/net/ethernet/chelsio/libcxgb
 
diff --git a/drivers/infiniband/hw/efa/efa_com_cmd.c b/drivers/infiniband/hw/efa/efa_com_cmd.c
index fad5c2ee7bb1..62345d8abf3c 100644
--- a/drivers/infiniband/hw/efa/efa_com_cmd.c
+++ b/drivers/infiniband/hw/efa/efa_com_cmd.c
@@ -138,9 +138,11 @@ int efa_com_destroy_qp(struct efa_com_dev *edev,
                                sizeof(qp_cmd),
                                (struct efa_admin_acq_entry *)&cmd_completion,
                                sizeof(cmd_completion));
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev, "Failed to destroy qp-%u [%d]\n",
                           qp_cmd.qp_handle, err);
+                return err;
+        }
 
         return 0;
 }
@@ -198,9 +200,11 @@ int efa_com_destroy_cq(struct efa_com_dev *edev,
                                (struct efa_admin_acq_entry *)&destroy_resp,
                                sizeof(destroy_resp));
 
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev, "Failed to destroy CQ-%u [%d]\n",
                           params->cq_idx, err);
+                return err;
+        }
 
         return 0;
 }
@@ -272,10 +276,12 @@ int efa_com_dereg_mr(struct efa_com_dev *edev,
                                sizeof(mr_cmd),
                                (struct efa_admin_acq_entry *)&cmd_completion,
                                sizeof(cmd_completion));
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev,
                           "Failed to de-register mr(lkey-%u) [%d]\n",
                           mr_cmd.l_key, err);
+                return err;
+        }
 
         return 0;
 }
@@ -327,9 +333,11 @@ int efa_com_destroy_ah(struct efa_com_dev *edev,
                                sizeof(ah_cmd),
                                (struct efa_admin_acq_entry *)&cmd_completion,
                                sizeof(cmd_completion));
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev, "Failed to destroy ah-%d pd-%d [%d]\n",
                           ah_cmd.ah, ah_cmd.pd, err);
+                return err;
+        }
 
         return 0;
 }
@@ -387,10 +395,12 @@ static int efa_com_get_feature_ex(struct efa_com_dev *edev,
                                get_resp,
                                sizeof(*get_resp));
 
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev,
                           "Failed to submit get_feature command %d [%d]\n",
                           feature_id, err);
+                return err;
+        }
 
         return 0;
 }
@@ -534,10 +544,12 @@ static int efa_com_set_feature_ex(struct efa_com_dev *edev,
                                (struct efa_admin_acq_entry *)set_resp,
                                sizeof(*set_resp));
 
-        if (err)
+        if (err) {
                 ibdev_err(edev->efa_dev,
                           "Failed to submit set_feature command %d error: %d\n",
                           feature_id, err);
+                return err;
+        }
 
         return 0;
 }
diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index 7b4e0fa99817..df77bc312a25 100644
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -204,6 +204,7 @@ static u64 mmap_entry_insert(struct efa_dev *dev, struct efa_ucontext *ucontext,
                              void *obj, u64 address, u64 length, u8 mmap_flag)
 {
         struct efa_mmap_entry *entry;
+        u32 next_mmap_page;
         int err;
 
         entry = kmalloc(sizeof(*entry), GFP_KERNEL);
@@ -216,15 +217,19 @@ static u64 mmap_entry_insert(struct efa_dev *dev, struct efa_ucontext *ucontext,
         entry->mmap_flag = mmap_flag;
 
         xa_lock(&ucontext->mmap_xa);
+        if (check_add_overflow(ucontext->mmap_xa_page,
+                               (u32)(length >> PAGE_SHIFT),
+                               &next_mmap_page))
+                goto err_unlock;
+
         entry->mmap_page = ucontext->mmap_xa_page;
-        ucontext->mmap_xa_page += DIV_ROUND_UP(length, PAGE_SIZE);
+        ucontext->mmap_xa_page = next_mmap_page;
         err = __xa_insert(&ucontext->mmap_xa, entry->mmap_page, entry,
                           GFP_KERNEL);
+        if (err)
+                goto err_unlock;
+
         xa_unlock(&ucontext->mmap_xa);
-        if (err){
-                kfree(entry);
-                return EFA_MMAP_INVALID;
-        }
 
         ibdev_dbg(
                 &dev->ibdev,
@@ -232,6 +237,12 @@ static u64 mmap_entry_insert(struct efa_dev *dev, struct efa_ucontext *ucontext,
                 entry->obj, entry->address, entry->length, get_mmap_key(entry));
 
         return get_mmap_key(entry);
+
+err_unlock:
+        xa_unlock(&ucontext->mmap_xa);
+        kfree(entry);
+        return EFA_MMAP_INVALID;
+
 }
 
 int efa_query_device(struct ib_device *ibdev,
@@ -1628,7 +1639,6 @@ int efa_mmap(struct ib_ucontext *ibucontext,
                 ibdev_dbg(&dev->ibdev, "Mapping executable pages is not permitted\n");
                 return -EPERM;
         }
-        vma->vm_flags &= ~VM_MAYEXEC;
 
         return __efa_mmap(dev, ucontext, vma, key, length);
 }
diff --git a/drivers/infiniband/hw/hfi1/Kconfig b/drivers/infiniband/hw/hfi1/Kconfig
index 7b146b67a80f..0653f4f7b26c 100644
--- a/drivers/infiniband/hw/hfi1/Kconfig
+++ b/drivers/infiniband/hw/hfi1/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_HFI1
         tristate "Intel OPA Gen1 support"
         depends on X86_64 && INFINIBAND_RDMAVT && I2C
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 310105d4e3de..d5b643a1d9fd 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -9850,6 +9850,7 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd)
 
         /* disable the port */
         clear_rcvctrl(dd, RCV_CTRL_RCV_PORT_ENABLE_SMASK);
+        cancel_work_sync(&ppd->freeze_work);
 }
 
 static inline int init_cpu_counters(struct hfi1_devdata *dd)
@@ -14031,6 +14032,19 @@ static void init_kdeth_qp(struct hfi1_devdata *dd)
 }
 
 /**
+ * hfi1_get_qp_map
+ * @dd: device data
+ * @idx: index to read
+ */
+u8 hfi1_get_qp_map(struct hfi1_devdata *dd, u8 idx)
+{
+        u64 reg = read_csr(dd, RCV_QP_MAP_TABLE + (idx / 8) * 8);
+
+        reg >>= (idx % 8) * 8;
+        return reg;
+}
+
+/**
  * init_qpmap_table
  * @dd - device data
  * @first_ctxt - first context
diff --git a/drivers/infiniband/hw/hfi1/chip.h b/drivers/infiniband/hw/hfi1/chip.h
index 4e6c3556ec48..b76cf81f927f 100644
--- a/drivers/infiniband/hw/hfi1/chip.h
+++ b/drivers/infiniband/hw/hfi1/chip.h
@@ -1445,6 +1445,7 @@ void clear_all_interrupts(struct hfi1_devdata *dd);
 void remap_intr(struct hfi1_devdata *dd, int isrc, int msix_intr);
 void remap_sdma_interrupts(struct hfi1_devdata *dd, int engine, int msix_intr);
 void reset_interrupts(struct hfi1_devdata *dd);
+u8 hfi1_get_qp_map(struct hfi1_devdata *dd, u8 idx);
 
 /*
  * Interrupt source table.
diff --git a/drivers/infiniband/hw/hfi1/fault.c b/drivers/infiniband/hw/hfi1/fault.c
index 3fd3315d0fb0..93613e5def9b 100644
--- a/drivers/infiniband/hw/hfi1/fault.c
+++ b/drivers/infiniband/hw/hfi1/fault.c
@@ -153,6 +153,7 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf,
                 char *dash;
                 unsigned long range_start, range_end, i;
                 bool remove = false;
+                unsigned long bound = 1U << BITS_PER_BYTE;
 
                 end = strchr(ptr, ',');
                 if (end)
@@ -178,6 +179,10 @@ static ssize_t fault_opcodes_write(struct file *file, const char __user *buf,
                                     BITS_PER_BYTE);
                         break;
                 }
+                /* Check the inputs */
+                if (range_start >= bound || range_end >= bound)
+                        break;
+
                 for (i = range_start; i <= range_end; i++) {
                         if (remove)
                                 clear_bit(i, fault->opcodes);
diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index b458c218842b..fa45350a9a1d 100644
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -539,6 +539,37 @@ static inline void hfi1_16B_set_qpn(struct opa_16b_mgmt *mgmt,
         mgmt->src_qpn = cpu_to_be32(src_qp & OPA_16B_MGMT_QPN_MASK);
 }
 
+/**
+ * hfi1_get_rc_ohdr - get extended header
+ * @opah - the opaheader
+ */
+static inline struct ib_other_headers *
+hfi1_get_rc_ohdr(struct hfi1_opa_header *opah)
+{
+        struct ib_other_headers *ohdr;
+        struct ib_header *hdr = NULL;
+        struct hfi1_16b_header *hdr_16b = NULL;
+
+        /* Find out where the BTH is */
+        if (opah->hdr_type == HFI1_PKT_TYPE_9B) {
+                hdr = &opah->ibh;
+                if (ib_get_lnh(hdr) == HFI1_LRH_BTH)
+                        ohdr = &hdr->u.oth;
+                else
+                        ohdr = &hdr->u.l.oth;
+        } else {
+                u8 l4;
+
+                hdr_16b = &opah->opah;
+                l4  = hfi1_16B_get_l4(hdr_16b);
+                if (l4 == OPA_16B_L4_IB_LOCAL)
+                        ohdr = &hdr_16b->u.oth;
+                else
+                        ohdr = &hdr_16b->u.l.oth;
+        }
+        return ohdr;
+}
+
 struct rvt_sge_state;
 
 /*
diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c
index 919008620dd3..79126b2b14ab 100644
--- a/drivers/infiniband/hw/hfi1/pio.c
+++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -952,6 +952,22 @@ void sc_disable(struct send_context *sc)
                 }
         }
         spin_unlock(&sc->release_lock);
+
+        write_seqlock(&sc->waitlock);
+        while (!list_empty(&sc->piowait)) {
+                struct iowait *wait;
+                struct rvt_qp *qp;
+                struct hfi1_qp_priv *priv;
+
+                wait = list_first_entry(&sc->piowait, struct iowait, list);
+                qp = iowait_to_qp(wait);
+                priv = qp->priv;
+                list_del_init(&priv->s_iowait.list);
+                priv->s_iowait.lock = NULL;
+                hfi1_qp_wakeup(qp, RVT_S_WAIT_PIO | HFI1_S_WAIT_PIO_DRAIN);
+        }
+        write_sequnlock(&sc->waitlock);
+
         spin_unlock_irq(&sc->alloc_lock);
 }
 
@@ -1427,7 +1443,8 @@ void sc_stop(struct send_context *sc, int flag)
  * @cb: optional callback to call when the buffer is finished sending
  * @arg: argument for cb
  *
- * Return a pointer to a PIO buffer if successful, NULL if not enough room.
+ * Return a pointer to a PIO buffer, NULL if not enough room, -ECOMM
+ * when link is down.
  */
 struct pio_buf *sc_buffer_alloc(struct send_context *sc, u32 dw_len,
                                 pio_release_cb cb, void *arg)
@@ -1443,7 +1460,7 @@ struct pio_buf *sc_buffer_alloc(struct send_context *sc, u32 dw_len,
         spin_lock_irqsave(&sc->alloc_lock, flags);
         if (!(sc->flags & SCF_ENABLED)) {
                 spin_unlock_irqrestore(&sc->alloc_lock, flags);
-                goto done;
+                return ERR_PTR(-ECOMM);
         }
 
 retry:
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
index 84b51cc36dbd..235bdbc706ac 100644
--- a/drivers/infiniband/hw/hfi1/rc.c
+++ b/drivers/infiniband/hw/hfi1/rc.c
@@ -1432,7 +1432,7 @@ void hfi1_send_rc_ack(struct hfi1_packet *packet, bool is_fecn)
         pbc = create_pbc(ppd, pbc_flags, qp->srate_mbps,
                          sc_to_vlt(ppd->dd, sc5), plen);
         pbuf = sc_buffer_alloc(rcd->sc, plen, NULL, NULL);
-        if (!pbuf) {
+        if (IS_ERR_OR_NULL(pbuf)) {
                 /*
                  * We have no room to send at the moment.  Pass
                  * responsibility for sending the ACK to the send engine
@@ -1701,6 +1701,36 @@ static void reset_sending_psn(struct rvt_qp *qp, u32 psn)
         }
 }
 
+/**
+ * hfi1_rc_verbs_aborted - handle abort status
+ * @qp: the QP
+ * @opah: the opa header
+ *
+ * This code modifies both ACK bit in BTH[2]
+ * and the s_flags to go into send one mode.
+ *
+ * This serves to throttle the send engine to only
+ * send a single packet in the likely case the
+ * a link has gone down.
+ */
+void hfi1_rc_verbs_aborted(struct rvt_qp *qp, struct hfi1_opa_header *opah)
+{
+        struct ib_other_headers *ohdr = hfi1_get_rc_ohdr(opah);
+        u8 opcode = ib_bth_get_opcode(ohdr);
+        u32 psn;
+
+        /* ignore responses */
+        if ((opcode >= OP(RDMA_READ_RESPONSE_FIRST) &&
+             opcode <= OP(ATOMIC_ACKNOWLEDGE)) ||
+            opcode == TID_OP(READ_RESP) ||
+            opcode == TID_OP(WRITE_RESP))
+                return;
+
+        psn = ib_bth_get_psn(ohdr) | IB_BTH_REQ_ACK;
+        ohdr->bth[2] = cpu_to_be32(psn);
+        qp->s_flags |= RVT_S_SEND_ONE;
+}
+
 /*
  * This should be called with the QP s_lock held and interrupts disabled.
  */
@@ -1709,8 +1739,6 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)
         struct ib_other_headers *ohdr;
         struct hfi1_qp_priv *priv = qp->priv;
         struct rvt_swqe *wqe;
-        struct ib_header *hdr = NULL;
-        struct hfi1_16b_header *hdr_16b = NULL;
         u32 opcode, head, tail;
         u32 psn;
         struct tid_rdma_request *req;
@@ -1719,24 +1747,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)
         if (!(ib_rvt_state_ops[qp->state] & RVT_SEND_OR_FLUSH_OR_RECV_OK))
                 return;
 
-        /* Find out where the BTH is */
-        if (priv->hdr_type == HFI1_PKT_TYPE_9B) {
-                hdr = &opah->ibh;
-                if (ib_get_lnh(hdr) == HFI1_LRH_BTH)
-                        ohdr = &hdr->u.oth;
-                else
-                        ohdr = &hdr->u.l.oth;
-        } else {
-                u8 l4;
-
-                hdr_16b = &opah->opah;
-                l4  = hfi1_16B_get_l4(hdr_16b);
-                if (l4 == OPA_16B_L4_IB_LOCAL)
-                        ohdr = &hdr_16b->u.oth;
-                else
-                        ohdr = &hdr_16b->u.l.oth;
-        }
-
+        ohdr = hfi1_get_rc_ohdr(opah);
         opcode = ib_bth_get_opcode(ohdr);
         if ((opcode >= OP(RDMA_READ_RESPONSE_FIRST) &&
              opcode <= OP(ATOMIC_ACKNOWLEDGE)) ||
diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index b0110728f541..28b66bd70b74 100644
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -405,19 +405,33 @@ static void sdma_flush(struct sdma_engine *sde)
         struct sdma_txreq *txp, *txp_next;
         LIST_HEAD(flushlist);
         unsigned long flags;
+        uint seq;
 
         /* flush from head to tail */
         sdma_flush_descq(sde);
         spin_lock_irqsave(&sde->flushlist_lock, flags);
         /* copy flush list */
-        list_for_each_entry_safe(txp, txp_next, &sde->flushlist, list) {
-                list_del_init(&txp->list);
-                list_add_tail(&txp->list, &flushlist);
-        }
+        list_splice_init(&sde->flushlist, &flushlist);
         spin_unlock_irqrestore(&sde->flushlist_lock, flags);
         /* flush from flush list */
         list_for_each_entry_safe(txp, txp_next, &flushlist, list)
                 complete_tx(sde, txp, SDMA_TXREQ_S_ABORTED);
+        /* wakeup QPs orphaned on the dmawait list */
+        do {
+                struct iowait *w, *nw;
+
+                seq = read_seqbegin(&sde->waitlock);
+                if (!list_empty(&sde->dmawait)) {
+                        write_seqlock(&sde->waitlock);
+                        list_for_each_entry_safe(w, nw, &sde->dmawait, list) {
+                                if (w->wakeup) {
+                                        w->wakeup(w, SDMA_AVAIL_REASON);
+                                        list_del_init(&w->list);
+                                }
+                        }
+                        write_sequnlock(&sde->waitlock);
+                }
+        } while (read_seqretry(&sde->waitlock, seq));
 }
 
 /*
@@ -2413,7 +2427,7 @@ unlock_noconn:
         list_add_tail(&tx->list, &sde->flushlist);
         spin_unlock(&sde->flushlist_lock);
         iowait_inc_wait_count(wait, tx->num_desc);
-        schedule_work(&sde->flush_worker);
+        queue_work_on(sde->cpu, system_highpri_wq, &sde->flush_worker);
         ret = -ECOMM;
         goto unlock;
 nodesc:
@@ -2511,7 +2525,7 @@ unlock_noconn:
                 iowait_inc_wait_count(wait, tx->num_desc);
         }
         spin_unlock(&sde->flushlist_lock);
-        schedule_work(&sde->flush_worker);
+        queue_work_on(sde->cpu, system_highpri_wq, &sde->flush_worker);
         ret = -ECOMM;
         goto update_tail;
 nodesc:
diff --git a/drivers/infiniband/hw/hfi1/tid_rdma.c b/drivers/infiniband/hw/hfi1/tid_rdma.c
index 8f564b0a3333..92acccaaaa86 100644
--- a/drivers/infiniband/hw/hfi1/tid_rdma.c
+++ b/drivers/infiniband/hw/hfi1/tid_rdma.c
@@ -312,9 +312,7 @@ static struct hfi1_ctxtdata *qp_to_rcd(struct rvt_dev_info *rdi,
         if (qp->ibqp.qp_num == 0)
                 ctxt = 0;
         else
-                ctxt = ((qp->ibqp.qp_num >> dd->qos_shift) %
-                        (dd->n_krcv_queues - 1)) + 1;
-
+                ctxt = hfi1_get_qp_map(dd, qp->ibqp.qp_num >> dd->qos_shift);
         return dd->rcd[ctxt];
 }
 
diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index f88ad425664a..4cb0fce5c096 100644
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -683,7 +683,7 @@ void return_cnp_16B(struct hfi1_ibport *ibp, struct rvt_qp *qp,
         pbc = create_pbc(ppd, pbc_flags, qp->srate_mbps, vl, plen);
         if (ctxt) {
                 pbuf = sc_buffer_alloc(ctxt, plen, NULL, NULL);
-                if (pbuf) {
+                if (!IS_ERR_OR_NULL(pbuf)) {
                         trace_pio_output_ibhdr(ppd->dd, &hdr, sc5);
                         ppd->dd->pio_inline_send(ppd->dd, pbuf, pbc,
                                                  &hdr, hwords);
@@ -738,7 +738,7 @@ void return_cnp(struct hfi1_ibport *ibp, struct rvt_qp *qp, u32 remote_qpn,
         pbc = create_pbc(ppd, pbc_flags, qp->srate_mbps, vl, plen);
         if (ctxt) {
                 pbuf = sc_buffer_alloc(ctxt, plen, NULL, NULL);
-                if (pbuf) {
+                if (!IS_ERR_OR_NULL(pbuf)) {
                         trace_pio_output_ibhdr(ppd->dd, &hdr, sc5);
                         ppd->dd->pio_inline_send(ppd->dd, pbuf, pbc,
                                                  &hdr, hwords);
diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.c b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
index 0cd71ce7cc71..3592a9ec155e 100644
--- a/drivers/infiniband/hw/hfi1/user_exp_rcv.c
+++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
@@ -324,6 +324,9 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd,
         u32 *tidlist = NULL;
         struct tid_user_buf *tidbuf;
 
+        if (!PAGE_ALIGNED(tinfo->vaddr))
+                return -EINVAL;
+
         tidbuf = kzalloc(sizeof(*tidbuf), GFP_KERNEL);
         if (!tidbuf)
                 return -ENOMEM;
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
index 8bfbc6d7ea34..fd754a16475a 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.c
+++ b/drivers/infiniband/hw/hfi1/user_sdma.c
@@ -130,20 +130,16 @@ static int defer_packet_queue(
 {
         struct hfi1_user_sdma_pkt_q *pq =
                 container_of(wait->iow, struct hfi1_user_sdma_pkt_q, busy);
-        struct user_sdma_txreq *tx =
-                container_of(txreq, struct user_sdma_txreq, txreq);
 
-        if (sdma_progress(sde, seq, txreq)) {
-                if (tx->busycount++ < MAX_DEFER_RETRY_COUNT)
-                        goto eagain;
-        }
+        write_seqlock(&sde->waitlock);
+        if (sdma_progress(sde, seq, txreq))
+                goto eagain;
         /*
          * We are assuming that if the list is enqueued somewhere, it
          * is to the dmawait list since that is the only place where
          * it is supposed to be enqueued.
          */
         xchg(&pq->state, SDMA_PKT_Q_DEFERRED);
-        write_seqlock(&sde->waitlock);
         if (list_empty(&pq->busy.list)) {
                 iowait_get_priority(&pq->busy);
                 iowait_queue(pkts_sent, &pq->busy, &sde->dmawait);
@@ -151,6 +147,7 @@ static int defer_packet_queue(
         write_sequnlock(&sde->waitlock);
         return -EBUSY;
 eagain:
+        write_sequnlock(&sde->waitlock);
         return -EAGAIN;
 }
 
@@ -804,7 +801,6 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, u16 maxpkts)
 
                 tx->flags = 0;
                 tx->req = req;
-                tx->busycount = 0;
                 INIT_LIST_HEAD(&tx->list);
 
                 /*
diff --git a/drivers/infiniband/hw/hfi1/user_sdma.h b/drivers/infiniband/hw/hfi1/user_sdma.h
index 14dfd757dafd..4d8510b0fc38 100644
--- a/drivers/infiniband/hw/hfi1/user_sdma.h
+++ b/drivers/infiniband/hw/hfi1/user_sdma.h
@@ -245,7 +245,6 @@ struct user_sdma_txreq {
         struct list_head list;
         struct user_sdma_request *req;
         u16 flags;
-        unsigned int busycount;
         u16 seqnum;
 };
 
diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 1f36db98240f..c4b243f50c76 100644
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -638,6 +638,8 @@ static void verbs_sdma_complete(
                 struct hfi1_opa_header *hdr;
 
                 hdr = &tx->phdr.hdr;
+                if (unlikely(status == SDMA_TXREQ_S_ABORTED))
+                        hfi1_rc_verbs_aborted(qp, hdr);
                 hfi1_rc_send_complete(qp, hdr);
         }
         spin_unlock(&qp->s_lock);
@@ -1037,10 +1039,10 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
         if (cb)
                 iowait_pio_inc(&priv->s_iowait);
         pbuf = sc_buffer_alloc(sc, plen, cb, qp);
-        if (unlikely(!pbuf)) {
+        if (unlikely(IS_ERR_OR_NULL(pbuf))) {
                 if (cb)
                         verbs_pio_complete(qp, 0);
-                if (ppd->host_link_state != HLS_UP_ACTIVE) {
+                if (IS_ERR(pbuf)) {
                         /*
                          * If we have filled the PIO buffers to capacity and are
                          * not in an active state this request is not going to
@@ -1095,15 +1097,15 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps,
                                &ps->s_txreq->phdr.hdr, ib_is_sc5(sc5));
 
 pio_bail:
+        spin_lock_irqsave(&qp->s_lock, flags);
         if (qp->s_wqe) {
-                spin_lock_irqsave(&qp->s_lock, flags);
                 rvt_send_complete(qp, qp->s_wqe, wc_status);
-                spin_unlock_irqrestore(&qp->s_lock, flags);
         } else if (qp->ibqp.qp_type == IB_QPT_RC) {
-                spin_lock_irqsave(&qp->s_lock, flags);
+                if (unlikely(wc_status == IB_WC_GENERAL_ERR))
+                        hfi1_rc_verbs_aborted(qp, &ps->s_txreq->phdr.hdr);
                 hfi1_rc_send_complete(qp, &ps->s_txreq->phdr.hdr);
-                spin_unlock_irqrestore(&qp->s_lock, flags);
         }
+        spin_unlock_irqrestore(&qp->s_lock, flags);
 
         ret = 0;
 
@@ -1356,8 +1358,6 @@ static void hfi1_fill_device_attr(struct hfi1_devdata *dd)
         rdi->dparms.props.max_cq = hfi1_max_cqs;
         rdi->dparms.props.max_ah = hfi1_max_ahs;
         rdi->dparms.props.max_cqe = hfi1_max_cqes;
-        rdi->dparms.props.max_mr = rdi->lkey_table.max;
-        rdi->dparms.props.max_fmr = rdi->lkey_table.max;
         rdi->dparms.props.max_map_per_fmr = 32767;
         rdi->dparms.props.max_pd = hfi1_max_pds;
         rdi->dparms.props.max_qp_rd_atom = HFI1_MAX_RDMA_ATOMIC;
diff --git a/drivers/infiniband/hw/hfi1/verbs.h b/drivers/infiniband/hw/hfi1/verbs.h
index 7ecb8ed4a1d9..ae9582ddbc8f 100644
--- a/drivers/infiniband/hw/hfi1/verbs.h
+++ b/drivers/infiniband/hw/hfi1/verbs.h
@@ -416,6 +416,7 @@ void hfi1_rc_hdrerr(
 
 u8 ah_to_sc(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr);
 
+void hfi1_rc_verbs_aborted(struct rvt_qp *qp, struct hfi1_opa_header *opah);
 void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah);
 
 void hfi1_ud_rcv(struct hfi1_packet *packet);
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.c b/drivers/infiniband/hw/hfi1/verbs_txreq.c
index c4ab2d5b4502..8f766dd3f61c 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.c
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.c
@@ -100,7 +100,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
         if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {
                 struct hfi1_qp_priv *priv;
 
-                tx = kmem_cache_alloc(dev->verbs_txreq_cache, GFP_ATOMIC);
+                tx = kmem_cache_alloc(dev->verbs_txreq_cache, VERBS_TXREQ_GFP);
                 if (tx)
                         goto out;
                 priv = qp->priv;
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.h b/drivers/infiniband/hw/hfi1/verbs_txreq.h
index b002e96eb335..bfa6e081cb56 100644
--- a/drivers/infiniband/hw/hfi1/verbs_txreq.h
+++ b/drivers/infiniband/hw/hfi1/verbs_txreq.h
@@ -72,6 +72,7 @@ struct hfi1_ibdev;
 struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
                                 struct rvt_qp *qp);
 
+#define VERBS_TXREQ_GFP (GFP_ATOMIC | __GFP_NOWARN)
 static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
                                             struct rvt_qp *qp)
         __must_hold(&qp->slock)
@@ -79,7 +80,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
         struct verbs_txreq *tx;
         struct hfi1_qp_priv *priv = qp->priv;
 
-        tx = kmem_cache_alloc(dev->verbs_txreq_cache, GFP_ATOMIC);
+        tx = kmem_cache_alloc(dev->verbs_txreq_cache, VERBS_TXREQ_GFP);
         if (unlikely(!tx)) {
                 /* call slow path to get the lock */
                 tx = __get_txreq(dev, qp);
diff --git a/drivers/infiniband/hw/hns/Kconfig b/drivers/infiniband/hw/hns/Kconfig
index b548c003009b..8bf847bcd8d3 100644
--- a/drivers/infiniband/hw/hns/Kconfig
+++ b/drivers/infiniband/hw/hns/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_HNS
         tristate "HNS RoCE Driver"
         depends on NET_VENDOR_HISILICON
diff --git a/drivers/infiniband/hw/hns/Makefile b/drivers/infiniband/hw/hns/Makefile
index b956cf430bdb..1c5a20af6992 100644
--- a/drivers/infiniband/hw/hns/Makefile
+++ b/drivers/infiniband/hw/hns/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Makefile for the Hisilicon RoCE drivers.
 #
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
index 2c0bc2536fda..056a6873df7a 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
@@ -902,6 +902,7 @@ static void hns_roce_v1_release_lp_qp(struct hns_roce_dev *hr_dev)
         hns_roce_ib_destroy_cq(&free_mr->mr_free_cq->ib_cq, NULL);
         kfree(&free_mr->mr_free_cq->ib_cq);
         hns_roce_dealloc_pd(&free_mr->mr_free_pd->ibpd, NULL);
+        kfree(&free_mr->mr_free_pd->ibpd);
 }
 
 static int hns_roce_db_init(struct hns_roce_dev *hr_dev)
diff --git a/drivers/infiniband/hw/i40iw/Kconfig b/drivers/infiniband/hw/i40iw/Kconfig
index d867ef1ac72a..e4b45f4cd8f8 100644
--- a/drivers/infiniband/hw/i40iw/Kconfig
+++ b/drivers/infiniband/hw/i40iw/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_I40IW
         tristate "Intel(R) Ethernet X722 iWARP Driver"
         depends on INET && I40E
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
index fc01deac1d3c..cc7c42fe6499 100644
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config MLX4_INFINIBAND
         tristate "Mellanox ConnectX HCA support"
         depends on NETDEVICES && ETHERNET && PCI && INET
diff --git a/drivers/infiniband/hw/mlx4/Makefile b/drivers/infiniband/hw/mlx4/Makefile
index f4213b3a8fe1..7b6757b02857 100644
--- a/drivers/infiniband/hw/mlx4/Makefile
+++ b/drivers/infiniband/hw/mlx4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MLX4_INFINIBAND)   += mlx4_ib.o
 
 mlx4_ib-y :=    ah.o cq.o doorbell.o mad.o main.o mr.o qp.o srq.o mcg.o cm.o alias_GUID.o sysfs.o
diff --git a/drivers/infiniband/hw/mlx5/Kconfig b/drivers/infiniband/hw/mlx5/Kconfig
index 8d651c05de62..ea248def4556 100644
--- a/drivers/infiniband/hw/mlx5/Kconfig
+++ b/drivers/infiniband/hw/mlx5/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config MLX5_INFINIBAND
         tristate "Mellanox 5th generation network adapters (ConnectX series) support"
         depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
diff --git a/drivers/infiniband/hw/mlx5/Makefile b/drivers/infiniband/hw/mlx5/Makefile
index 33f5adb14e4e..9924be8384d8 100644
--- a/drivers/infiniband/hw/mlx5/Makefile
+++ b/drivers/infiniband/hw/mlx5/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_MLX5_INFINIBAND)   += mlx5_ib.o
 
 mlx5_ib-y :=    main.o cq.o doorbell.o qp.o mem.o srq_cmd.o \
diff --git a/drivers/infiniband/hw/mlx5/cmd.c b/drivers/infiniband/hw/mlx5/cmd.c
index e3ec79b8f7f5..6c8645033102 100644
--- a/drivers/infiniband/hw/mlx5/cmd.c
+++ b/drivers/infiniband/hw/mlx5/cmd.c
@@ -190,12 +190,12 @@ int mlx5_cmd_alloc_sw_icm(struct mlx5_dm *dm, int type, u64 length,
                           u16 uid, phys_addr_t *addr, u32 *obj_id)
 {
         struct mlx5_core_dev *dev = dm->dev;
-        u32 num_blocks = DIV_ROUND_UP(length, MLX5_SW_ICM_BLOCK_SIZE(dev));
         u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {};
         u32 in[MLX5_ST_SZ_DW(create_sw_icm_in)] = {};
         unsigned long *block_map;
         u64 icm_start_addr;
         u32 log_icm_size;
+        u32 num_blocks;
         u32 max_blocks;
         u64 block_idx;
         void *sw_icm;
@@ -224,6 +224,8 @@ int mlx5_cmd_alloc_sw_icm(struct mlx5_dm *dm, int type, u64 length,
                 return -EINVAL;
         }
 
+        num_blocks = (length + MLX5_SW_ICM_BLOCK_SIZE(dev) - 1) >>
+                     MLX5_LOG_SW_ICM_BLOCK_SIZE(dev);
         max_blocks = BIT(log_icm_size - MLX5_LOG_SW_ICM_BLOCK_SIZE(dev));
         spin_lock(&dm->lock);
         block_idx = bitmap_find_next_zero_area(block_map,
@@ -266,13 +268,16 @@ int mlx5_cmd_dealloc_sw_icm(struct mlx5_dm *dm, int type, u64 length,
                             u16 uid, phys_addr_t addr, u32 obj_id)
 {
         struct mlx5_core_dev *dev = dm->dev;
-        u32 num_blocks = DIV_ROUND_UP(length, MLX5_SW_ICM_BLOCK_SIZE(dev));
         u32 out[MLX5_ST_SZ_DW(general_obj_out_cmd_hdr)] = {};
         u32 in[MLX5_ST_SZ_DW(general_obj_in_cmd_hdr)] = {};
         unsigned long *block_map;
+        u32 num_blocks;
         u64 start_idx;
         int err;
 
+        num_blocks = (length + MLX5_SW_ICM_BLOCK_SIZE(dev) - 1) >>
+                     MLX5_LOG_SW_ICM_BLOCK_SIZE(dev);
+
         switch (type) {
         case MLX5_IB_UAPI_DM_TYPE_STEERING_SW_ICM:
                 start_idx =
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index 22e651cb5534..aa9acebfcc23 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -110,15 +110,15 @@ u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)
 }
 
 struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,
-                                          int vport_index)
+                                          u16 vport_num)
 {
-        return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_IB);
+        return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_IB);
 }
 
 struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
-                                          int vport_index)
+                                          u16 vport_num)
 {
-        return mlx5_eswitch_get_proto_dev(esw, vport_index, REP_ETH);
+        return mlx5_eswitch_get_proto_dev(esw, vport_num, REP_ETH);
 }
 
 struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
@@ -126,9 +126,10 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
         return mlx5_eswitch_uplink_get_proto_dev(esw, REP_IB);
 }
 
-struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, int vport)
+struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,
+                                           u16 vport_num)
 {
-        return mlx5_eswitch_vport_rep(esw, vport);
+        return mlx5_eswitch_vport_rep(esw, vport_num);
 }
 
 struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
diff --git a/drivers/infiniband/hw/mlx5/ib_rep.h b/drivers/infiniband/hw/mlx5/ib_rep.h
index 22adce2d6795..7a917e6d5c09 100644
--- a/drivers/infiniband/hw/mlx5/ib_rep.h
+++ b/drivers/infiniband/hw/mlx5/ib_rep.h
@@ -14,17 +14,17 @@ extern const struct mlx5_ib_profile uplink_rep_profile;
 
 u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);
 struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,
-                                          int vport_index);
+                                          u16 vport_num);
 struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);
 struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,
-                                           int vport_index);
+                                           u16 vport_num);
 void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev);
 void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev);
 struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
                                                    struct mlx5_ib_sq *sq,
                                                    u16 port);
 struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
-                                          int vport_index);
+                                          u16 vport_num);
 #else /* CONFIG_MLX5_ESWITCH */
 static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)
 {
@@ -33,7 +33,7 @@ static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)
 
 static inline
 struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,
-                                          int vport_index)
+                                          u16 vport_num)
 {
         return NULL;
 }
@@ -46,7 +46,7 @@ struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw)
 
 static inline
 struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,
-                                           int vport_index)
+                                           u16 vport_num)
 {
         return NULL;
 }
@@ -63,7 +63,7 @@ struct mlx5_flow_handle *create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,
 
 static inline
 struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
-                                          int vport_index)
+                                          u16 vport_num)
 {
         return NULL;
 }
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 9aa10cfbc064..05d2bfcb3d60 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2347,7 +2347,7 @@ static int handle_alloc_dm_sw_icm(struct ib_ucontext *ctx,
         /* Allocation size must a multiple of the basic block size
          * and a power of 2.
          */
-        act_size = roundup(attr->length, MLX5_SW_ICM_BLOCK_SIZE(dm_db->dev));
+        act_size = round_up(attr->length, MLX5_SW_ICM_BLOCK_SIZE(dm_db->dev));
         act_size = roundup_pow_of_two(act_size);
 
         dm->size = act_size;
diff --git a/drivers/infiniband/hw/mthca/Kconfig b/drivers/infiniband/hw/mthca/Kconfig
index da314c3fec23..66ff527f5928 100644
--- a/drivers/infiniband/hw/mthca/Kconfig
+++ b/drivers/infiniband/hw/mthca/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_MTHCA
         tristate "Mellanox HCA support"
         depends on PCI
diff --git a/drivers/infiniband/hw/ocrdma/Kconfig b/drivers/infiniband/hw/ocrdma/Kconfig
index c0cddc0192d1..dd4ec388208c 100644
--- a/drivers/infiniband/hw/ocrdma/Kconfig
+++ b/drivers/infiniband/hw/ocrdma/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_OCRDMA
         tristate "Emulex One Connect HCA support"
         depends on ETHERNET && NETDEVICES && PCI && INET && (IPV6 || IPV6=n)
diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile
index e3f20ca15462..14fba95021d8 100644
--- a/drivers/infiniband/hw/ocrdma/Makefile
+++ b/drivers/infiniband/hw/ocrdma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 ccflags-y := -I $(srctree)/drivers/net/ethernet/emulex/benet
 
 obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o
diff --git a/drivers/infiniband/hw/qedr/Kconfig b/drivers/infiniband/hw/qedr/Kconfig
index 9b9e3b1d2705..9c30325e1414 100644
--- a/drivers/infiniband/hw/qedr/Kconfig
+++ b/drivers/infiniband/hw/qedr/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_QEDR
         tristate "QLogic RoCE driver"
         depends on 64BIT && QEDE
diff --git a/drivers/infiniband/hw/qedr/Makefile b/drivers/infiniband/hw/qedr/Makefile
index 1c0bc4f78550..c75679837a85 100644
--- a/drivers/infiniband/hw/qedr/Makefile
+++ b/drivers/infiniband/hw/qedr/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_QEDR) := qedr.o
 
 qedr-y := main.o verbs.o qedr_roce_cm.o qedr_iw_cm.o
diff --git a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig
index cb06314a2ae2..376d19f29346 100644
--- a/drivers/infiniband/hw/qib/Kconfig
+++ b/drivers/infiniband/hw/qib/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_QIB
         tristate "Intel PCIe HCA support"
         depends on 64BIT && INFINIBAND_RDMAVT
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 54310fd6c7b6..33778d451b82 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1459,8 +1459,6 @@ static void qib_fill_device_attr(struct qib_devdata *dd)
         rdi->dparms.props.max_cq = ib_qib_max_cqs;
         rdi->dparms.props.max_cqe = ib_qib_max_cqes;
         rdi->dparms.props.max_ah = ib_qib_max_ahs;
-        rdi->dparms.props.max_mr = rdi->lkey_table.max;
-        rdi->dparms.props.max_fmr = rdi->lkey_table.max;
         rdi->dparms.props.max_map_per_fmr = 32767;
         rdi->dparms.props.max_qp_rd_atom = QIB_MAX_RDMA_ATOMIC;
         rdi->dparms.props.max_qp_init_rd_atom = 255;
diff --git a/drivers/infiniband/hw/usnic/Kconfig b/drivers/infiniband/hw/usnic/Kconfig
index d1dae2af4ca9..c0847d9e2539 100644
--- a/drivers/infiniband/hw/usnic/Kconfig
+++ b/drivers/infiniband/hw/usnic/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_USNIC
         tristate "Verbs support for Cisco VIC"
         depends on NETDEVICES && ETHERNET && INET && PCI && INTEL_IOMMU
diff --git a/drivers/infiniband/hw/vmw_pvrdma/Kconfig b/drivers/infiniband/hw/vmw_pvrdma/Kconfig
index 5a9790ac0ede..b99c9f0fc06a 100644
--- a/drivers/infiniband/hw/vmw_pvrdma/Kconfig
+++ b/drivers/infiniband/hw/vmw_pvrdma/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_VMWARE_PVRDMA
         tristate "VMware Paravirtualized RDMA Driver"
         depends on NETDEVICES && ETHERNET && PCI && INET && VMXNET3
diff --git a/drivers/infiniband/hw/vmw_pvrdma/Makefile b/drivers/infiniband/hw/vmw_pvrdma/Makefile
index 2f52e0a044a0..0f5fa4e8cfd0 100644
--- a/drivers/infiniband/hw/vmw_pvrdma/Makefile
+++ b/drivers/infiniband/hw/vmw_pvrdma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_VMWARE_PVRDMA) += vmw_pvrdma.o
 
 vmw_pvrdma-y := pvrdma_cmd.o pvrdma_cq.o pvrdma_doorbell.o pvrdma_main.o pvrdma_misc.o pvrdma_mr.o pvrdma_qp.o pvrdma_srq.o pvrdma_verbs.o
diff --git a/drivers/infiniband/sw/Makefile b/drivers/infiniband/sw/Makefile
index 8b095b27db87..ab48a9b60844 100644
--- a/drivers/infiniband/sw/Makefile
+++ b/drivers/infiniband/sw/Makefile
@@ -1,2 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_RDMAVT)         += rdmavt/
 obj-$(CONFIG_RDMA_RXE)                  += rxe/
diff --git a/drivers/infiniband/sw/rdmavt/Kconfig b/drivers/infiniband/sw/rdmavt/Kconfig
index 7df896a18d38..1f2759c72108 100644
--- a/drivers/infiniband/sw/rdmavt/Kconfig
+++ b/drivers/infiniband/sw/rdmavt/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_RDMAVT
         tristate "RDMA verbs transport library"
         depends on X86_64 && ARCH_DMA_ADDR_T_64BIT
diff --git a/drivers/infiniband/sw/rdmavt/Makefile b/drivers/infiniband/sw/rdmavt/Makefile
index 78b276a90401..b21962dafcc9 100644
--- a/drivers/infiniband/sw/rdmavt/Makefile
+++ b/drivers/infiniband/sw/rdmavt/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # rdmavt driver
 #
diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c
index db800eb2b1f5..0867a11d074e 100644
--- a/drivers/infiniband/sw/rdmavt/mr.c
+++ b/drivers/infiniband/sw/rdmavt/mr.c
@@ -96,6 +96,8 @@ int rvt_driver_mr_init(struct rvt_dev_info *rdi)
         for (i = 0; i < rdi->lkey_table.max; i++)
                 RCU_INIT_POINTER(rdi->lkey_table.table[i], NULL);
 
+        rdi->dparms.props.max_mr = rdi->lkey_table.max;
+        rdi->dparms.props.max_fmr = rdi->lkey_table.max;
         return 0;
 }
 
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index dfbc7d8640fb..0d804a58f954 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -594,7 +594,8 @@ static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
                         offset = qpt->incr | ((offset & 1) ^ 1);
                 }
                 /* there can be no set bits in low-order QoS bits */
-                WARN_ON(offset & (BIT(rdi->dparms.qos_shift) - 1));
+                WARN_ON(rdi->dparms.qos_shift > 1 &&
+                        offset & ((BIT(rdi->dparms.qos_shift - 1) - 1) << 1));
                 qpn = mk_qpn(qpt, map, offset);
         }
 
diff --git a/drivers/infiniband/sw/rxe/Kconfig b/drivers/infiniband/sw/rxe/Kconfig
index 67ae960ab523..d9bcfe740588 100644
--- a/drivers/infiniband/sw/rxe/Kconfig
+++ b/drivers/infiniband/sw/rxe/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config RDMA_RXE
         tristate "Software RDMA over Ethernet (RoCE) driver"
         depends on INET && PCI && INFINIBAND
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index 569d614d0c41..7af68604af77 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_IPOIB
         tristate "IP-over-InfiniBand"
         depends on NETDEVICES && INET && (IPV6 || IPV6=n)
diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig
index 299268f261ee..1d29dffeaff9 100644
--- a/drivers/infiniband/ulp/iser/Kconfig
+++ b/drivers/infiniband/ulp/iser/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_ISER
         tristate "iSCSI Extensions for RDMA (iSER)"
         depends on SCSI && INET && INFINIBAND_ADDR_TRANS
diff --git a/drivers/infiniband/ulp/iser/Makefile b/drivers/infiniband/ulp/iser/Makefile
index fe6cd15f2317..2f3e788638d4 100644
--- a/drivers/infiniband/ulp/iser/Makefile
+++ b/drivers/infiniband/ulp/iser/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_ISER)   += ib_iser.o
 
 ib_iser-y                       := iser_verbs.o iser_initiator.o iser_memory.o \
diff --git a/drivers/infiniband/ulp/isert/Kconfig b/drivers/infiniband/ulp/isert/Kconfig
index 02f9759ebb1a..1a3f5ca8354c 100644
--- a/drivers/infiniband/ulp/isert/Kconfig
+++ b/drivers/infiniband/ulp/isert/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_ISERT
         tristate "iSCSI Extensions for RDMA (iSER) target support"
         depends on INET && INFINIBAND_ADDR_TRANS && TARGET_CORE && ISCSI_TARGET
diff --git a/drivers/infiniband/ulp/isert/Makefile b/drivers/infiniband/ulp/isert/Makefile
index a4a4766e3e18..e19b16cafda7 100644
--- a/drivers/infiniband/ulp/isert/Makefile
+++ b/drivers/infiniband/ulp/isert/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_ISERT)  += ib_isert.o
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 4b4998e888b9..a1a035270cab 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*******************************************************************************
  * This file contains iSCSI extentions for RDMA (iSER) Verbs
  *
@@ -5,15 +6,6 @@
  *
  * Nicholas A. Bellinger <nab@linux-iscsi.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  ****************************************************************************/
 
 #include <linux/string.h>
diff --git a/drivers/infiniband/ulp/opa_vnic/Kconfig b/drivers/infiniband/ulp/opa_vnic/Kconfig
index 48132ab5e6b9..a1f266b9c0b2 100644
--- a/drivers/infiniband/ulp/opa_vnic/Kconfig
+++ b/drivers/infiniband/ulp/opa_vnic/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_OPA_VNIC
         tristate "Intel OPA VNIC support"
         depends on X86_64 && INFINIBAND
diff --git a/drivers/infiniband/ulp/opa_vnic/Makefile b/drivers/infiniband/ulp/opa_vnic/Makefile
index 8061b287cfe4..a8c21d140ccb 100644
--- a/drivers/infiniband/ulp/opa_vnic/Makefile
+++ b/drivers/infiniband/ulp/opa_vnic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 # Makefile - Intel Omni-Path Virtual Network Controller driver
 # Copyright(c) 2017, Intel Corporation.
 #
diff --git a/drivers/infiniband/ulp/srp/Kbuild b/drivers/infiniband/ulp/srp/Kbuild
index a16c73c667cb..d1f4e513b6a9 100644
--- a/drivers/infiniband/ulp/srp/Kbuild
+++ b/drivers/infiniband/ulp/srp/Kbuild
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_SRP)                    += ib_srp.o
diff --git a/drivers/infiniband/ulp/srp/Kconfig b/drivers/infiniband/ulp/srp/Kconfig
index 99db8fe5173a..6f5e7b3a3864 100644
--- a/drivers/infiniband/ulp/srp/Kconfig
+++ b/drivers/infiniband/ulp/srp/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_SRP
         tristate "InfiniBand SCSI RDMA Protocol"
         depends on SCSI && INFINIBAND_ADDR_TRANS
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 87848faa7502..0b09d0cd9b3c 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -148,6 +148,7 @@ MODULE_PARM_DESC(ch_count,
 
 static void srp_add_one(struct ib_device *device);
 static void srp_remove_one(struct ib_device *device, void *client_data);
+static void srp_rename_dev(struct ib_device *device, void *client_data);
 static void srp_recv_done(struct ib_cq *cq, struct ib_wc *wc);
 static void srp_handle_qp_err(struct ib_cq *cq, struct ib_wc *wc,
                 const char *opname);
@@ -162,7 +163,8 @@ static struct workqueue_struct *srp_remove_wq;
 static struct ib_client srp_client = {
         .name   = "srp",
         .add    = srp_add_one,
-        .remove = srp_remove_one
+        .remove = srp_remove_one,
+        .rename = srp_rename_dev
 };
 
 static struct ib_sa_client srp_sa_client;
@@ -4121,6 +4123,20 @@ free_host:
         return NULL;
 }
 
+static void srp_rename_dev(struct ib_device *device, void *client_data)
+{
+        struct srp_device *srp_dev = client_data;
+        struct srp_host *host, *tmp_host;
+
+        list_for_each_entry_safe(host, tmp_host, &srp_dev->dev_list, list) {
+                char name[IB_DEVICE_NAME_MAX + 8];
+
+                snprintf(name, sizeof(name), "srp-%s-%d",
+                         dev_name(&device->dev), host->port);
+                device_rename(&host->dev, name);
+        }
+}
+
 static void srp_add_one(struct ib_device *device)
 {
         struct srp_device *srp_dev;
diff --git a/drivers/infiniband/ulp/srpt/Kconfig b/drivers/infiniband/ulp/srpt/Kconfig
index fb8b7182f05e..ce7567cea9f6 100644
--- a/drivers/infiniband/ulp/srpt/Kconfig
+++ b/drivers/infiniband/ulp/srpt/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 config INFINIBAND_SRPT
         tristate "InfiniBand SCSI RDMA Protocol target support"
         depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE
diff --git a/drivers/infiniband/ulp/srpt/Makefile b/drivers/infiniband/ulp/srpt/Makefile
index 43fbde42c58b..2d137928a4c2 100644
--- a/drivers/infiniband/ulp/srpt/Makefile
+++ b/drivers/infiniband/ulp/srpt/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_INFINIBAND_SRPT)   += ib_srpt.o