xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/qib: Change lkey table allocation to support more MRs

Browse Source 
The lkey table is allocated with with a get_user_pages() with an
order based on a number of index bits from a module parameter.

The underlying kernel code cannot allocate that many contiguous pages.

There is no reason the underlying memory needs to be physically
contiguous.

This patch:
- switches the allocation/deallocation to vmalloc/vfree
- caps the number of bits to 23 to insure at least 1 generation bit
  o this matches the module parameter description

Cc: stable@vger.kernel.org
Reviewed-by: Vinit Agnihotri <vinit.abhay.agnihotri@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Mike Marciniszyn
2015-07-21 08:36:07 -04:00
committed by Doug Ledford
parent e0238a6a36
commit d6f1c17e16
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/hw/qib/qib_keys.c
View File

@@ -86,6 +86,10 @@ int qib_alloc_lkey(struct qib_mregion *mr, int dma_region)
* unrestricted LKEY. * unrestricted LKEY.
*/ */
rkt->gen++; rkt->gen++;
/*
* bits are capped in qib_verbs.c to insure enough bits
* for generation number
*/
mr->lkey = (r << (32 - ib_qib_lkey_table_size)) | mr->lkey = (r << (32 - ib_qib_lkey_table_size)) |
((((1 << (24 - ib_qib_lkey_table_size)) - 1) & rkt->gen) ((((1 << (24 - ib_qib_lkey_table_size)) - 1) & rkt->gen)
<< 8); << 8);

14
drivers/infiniband/hw/qib/qib_verbs.c
View File

@@ -40,6 +40,7 @@
#include <linux/rculist.h> #include <linux/rculist.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/vmalloc.h>
#include "qib.h" #include "qib.h"
#include "qib_common.h" #include "qib_common.h"
@@ -2109,10 +2110,16 @@ int qib_register_ib_device(struct qib_devdata *dd)
* the LKEY). The remaining bits act as a generation number or tag. * the LKEY). The remaining bits act as a generation number or tag.
*/ */
spin_lock_init(&dev->lk_table.lock); spin_lock_init(&dev->lk_table.lock);
/* insure generation is at least 4 bits see keys.c */
if (ib_qib_lkey_table_size > MAX_LKEY_TABLE_BITS) {
qib_dev_warn(dd, "lkey bits %u too large, reduced to %u\n",
ib_qib_lkey_table_size, MAX_LKEY_TABLE_BITS);
ib_qib_lkey_table_size = MAX_LKEY_TABLE_BITS;
}
dev->lk_table.max = 1 << ib_qib_lkey_table_size; dev->lk_table.max = 1 << ib_qib_lkey_table_size;
lk_tab_size = dev->lk_table.max * sizeof(*dev->lk_table.table); lk_tab_size = dev->lk_table.max * sizeof(*dev->lk_table.table);
dev->lk_table.table = (struct qib_mregion __rcu **) dev->lk_table.table = (struct qib_mregion __rcu **)
__get_free_pages(GFP_KERNEL, get_order(lk_tab_size)); vmalloc(lk_tab_size);
if (dev->lk_table.table == NULL) { if (dev->lk_table.table == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_lk; goto err_lk;
@@ -2286,7 +2293,7 @@ err_tx:
sizeof(struct qib_pio_header), sizeof(struct qib_pio_header),
dev->pio_hdrs, dev->pio_hdrs_phys); dev->pio_hdrs, dev->pio_hdrs_phys);
err_hdrs: err_hdrs:
free_pages((unsigned long) dev->lk_table.table, get_order(lk_tab_size)); vfree(dev->lk_table.table);
err_lk: err_lk:
kfree(dev->qp_table); kfree(dev->qp_table);
err_qpt: err_qpt:
@@ -2340,8 +2347,7 @@ void qib_unregister_ib_device(struct qib_devdata *dd)
sizeof(struct qib_pio_header), sizeof(struct qib_pio_header),
dev->pio_hdrs, dev->pio_hdrs_phys); dev->pio_hdrs, dev->pio_hdrs_phys);
lk_tab_size = dev->lk_table.max * sizeof(*dev->lk_table.table); lk_tab_size = dev->lk_table.max * sizeof(*dev->lk_table.table);
free_pages((unsigned long) dev->lk_table.table, vfree(dev->lk_table.table);
get_order(lk_tab_size));
kfree(dev->qp_table); kfree(dev->qp_table);
} }

2
drivers/infiniband/hw/qib/qib_verbs.h
View File

@@ -647,6 +647,8 @@ struct qib_qpn_table {
struct qpn_map map[QPNMAP_ENTRIES]; struct qpn_map map[QPNMAP_ENTRIES];
}; };
#define MAX_LKEY_TABLE_BITS 23
struct qib_lkey_table { struct qib_lkey_table {
spinlock_t lock; /* protect changes in this struct */ spinlock_t lock; /* protect changes in this struct */
u32 next; /* next unused index (speeds search) */ u32 next; /* next unused index (speeds search) */