diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2019-08-21 13:12:29 -0400 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-08-21 19:58:18 -0400 |
commit | daa138a58c802e7b4c2fb73f9b85bb082616ef43 (patch) | |
tree | be913e8e3745bb367d2ba371598f447649102cfc /kernel/irq/affinity.c | |
parent | 6869b7b206595ae0e326f59719090351eb8f4f5d (diff) | |
parent | fba0e448a2c5b297a4ddc1ec4e48f4aa6600a1c9 (diff) |
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>
Diffstat (limited to 'kernel/irq/affinity.c')
-rw-r--r-- | kernel/irq/affinity.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c index 4352b08ae48d..6fef48033f96 100644 --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c | |||
@@ -251,11 +251,9 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd) | |||
251 | * Determine the number of vectors which need interrupt affinities | 251 | * Determine the number of vectors which need interrupt affinities |
252 | * assigned. If the pre/post request exhausts the available vectors | 252 | * assigned. If the pre/post request exhausts the available vectors |
253 | * then nothing to do here except for invoking the calc_sets() | 253 | * then nothing to do here except for invoking the calc_sets() |
254 | * callback so the device driver can adjust to the situation. If there | 254 | * callback so the device driver can adjust to the situation. |
255 | * is only a single vector, then managing the queue is pointless as | ||
256 | * well. | ||
257 | */ | 255 | */ |
258 | if (nvecs > 1 && nvecs > affd->pre_vectors + affd->post_vectors) | 256 | if (nvecs > affd->pre_vectors + affd->post_vectors) |
259 | affvecs = nvecs - affd->pre_vectors - affd->post_vectors; | 257 | affvecs = nvecs - affd->pre_vectors - affd->post_vectors; |
260 | else | 258 | else |
261 | affvecs = 0; | 259 | affvecs = 0; |