forked from luck/tmp_suning_uos_patched
f25a546e65
Replace the internal interval tree based mmu notifier with the new common
mmu_interval_notifier_insert() API. This removes a lot of code and fixes a
deadlock that can be triggered in ODP:
zap_page_range()
mmu_notifier_invalidate_range_start()
[..]
ib_umem_notifier_invalidate_range_start()
down_read(&per_mm->umem_rwsem)
unmap_single_vma()
[..]
__split_huge_page_pmd()
mmu_notifier_invalidate_range_start()
[..]
ib_umem_notifier_invalidate_range_start()
down_read(&per_mm->umem_rwsem) // DEADLOCK
mmu_notifier_invalidate_range_end()
up_read(&per_mm->umem_rwsem)
mmu_notifier_invalidate_range_end()
up_read(&per_mm->umem_rwsem)
The umem_rwsem is held across the range_start/end as the ODP algorithm for
invalidate_range_end cannot tolerate changes to the interval
tree. However, due to the nested invalidation regions the second
down_read() can deadlock if there are competing writers. The new core code
provides an alternative scheme to solve this problem.
Fixes: ca748c39ea
("RDMA/umem: Get rid of per_mm->notifier_count")
Link: https://lore.kernel.org/r/20191112202231.3856-6-jgg@ziepe.ca
Tested-by: Artemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
148 lines
4.8 KiB
C
148 lines
4.8 KiB
C
/*
|
|
* Copyright (c) 2014 Mellanox Technologies. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef IB_UMEM_ODP_H
|
|
#define IB_UMEM_ODP_H
|
|
|
|
#include <rdma/ib_umem.h>
|
|
#include <rdma/ib_verbs.h>
|
|
|
|
struct ib_umem_odp {
|
|
struct ib_umem umem;
|
|
struct mmu_interval_notifier notifier;
|
|
struct pid *tgid;
|
|
|
|
/*
|
|
* An array of the pages included in the on-demand paging umem.
|
|
* Indices of pages that are currently not mapped into the device will
|
|
* contain NULL.
|
|
*/
|
|
struct page **page_list;
|
|
/*
|
|
* An array of the same size as page_list, with DMA addresses mapped
|
|
* for pages the pages in page_list. The lower two bits designate
|
|
* access permissions. See ODP_READ_ALLOWED_BIT and
|
|
* ODP_WRITE_ALLOWED_BIT.
|
|
*/
|
|
dma_addr_t *dma_list;
|
|
/*
|
|
* The umem_mutex protects the page_list and dma_list fields of an ODP
|
|
* umem, allowing only a single thread to map/unmap pages. The mutex
|
|
* also protects access to the mmu notifier counters.
|
|
*/
|
|
struct mutex umem_mutex;
|
|
void *private; /* for the HW driver to use. */
|
|
|
|
int npages;
|
|
|
|
/*
|
|
* An implicit odp umem cannot be DMA mapped, has 0 length, and serves
|
|
* only as an anchor for the driver to hold onto the per_mm. FIXME:
|
|
* This should be removed and drivers should work with the per_mm
|
|
* directly.
|
|
*/
|
|
bool is_implicit_odp;
|
|
|
|
unsigned int page_shift;
|
|
};
|
|
|
|
static inline struct ib_umem_odp *to_ib_umem_odp(struct ib_umem *umem)
|
|
{
|
|
return container_of(umem, struct ib_umem_odp, umem);
|
|
}
|
|
|
|
/* Returns the first page of an ODP umem. */
|
|
static inline unsigned long ib_umem_start(struct ib_umem_odp *umem_odp)
|
|
{
|
|
return umem_odp->notifier.interval_tree.start;
|
|
}
|
|
|
|
/* Returns the address of the page after the last one of an ODP umem. */
|
|
static inline unsigned long ib_umem_end(struct ib_umem_odp *umem_odp)
|
|
{
|
|
return umem_odp->notifier.interval_tree.last + 1;
|
|
}
|
|
|
|
static inline size_t ib_umem_odp_num_pages(struct ib_umem_odp *umem_odp)
|
|
{
|
|
return (ib_umem_end(umem_odp) - ib_umem_start(umem_odp)) >>
|
|
umem_odp->page_shift;
|
|
}
|
|
|
|
/*
|
|
* The lower 2 bits of the DMA address signal the R/W permissions for
|
|
* the entry. To upgrade the permissions, provide the appropriate
|
|
* bitmask to the map_dma_pages function.
|
|
*
|
|
* Be aware that upgrading a mapped address might result in change of
|
|
* the DMA address for the page.
|
|
*/
|
|
#define ODP_READ_ALLOWED_BIT (1<<0ULL)
|
|
#define ODP_WRITE_ALLOWED_BIT (1<<1ULL)
|
|
|
|
#define ODP_DMA_ADDR_MASK (~(ODP_READ_ALLOWED_BIT | ODP_WRITE_ALLOWED_BIT))
|
|
|
|
#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
|
|
|
|
struct ib_umem_odp *
|
|
ib_umem_odp_get(struct ib_udata *udata, unsigned long addr, size_t size,
|
|
int access, const struct mmu_interval_notifier_ops *ops);
|
|
struct ib_umem_odp *ib_umem_odp_alloc_implicit(struct ib_udata *udata,
|
|
int access);
|
|
struct ib_umem_odp *
|
|
ib_umem_odp_alloc_child(struct ib_umem_odp *root_umem, unsigned long addr,
|
|
size_t size,
|
|
const struct mmu_interval_notifier_ops *ops);
|
|
void ib_umem_odp_release(struct ib_umem_odp *umem_odp);
|
|
|
|
int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 start_offset,
|
|
u64 bcnt, u64 access_mask,
|
|
unsigned long current_seq);
|
|
|
|
void ib_umem_odp_unmap_dma_pages(struct ib_umem_odp *umem_odp, u64 start_offset,
|
|
u64 bound);
|
|
|
|
#else /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
|
|
|
|
static inline struct ib_umem_odp *
|
|
ib_umem_odp_get(struct ib_udata *udata, unsigned long addr, size_t size,
|
|
int access, const struct mmu_interval_notifier_ops *ops)
|
|
{
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
static inline void ib_umem_odp_release(struct ib_umem_odp *umem_odp) {}
|
|
|
|
#endif /* CONFIG_INFINIBAND_ON_DEMAND_PAGING */
|
|
|
|
#endif /* IB_UMEM_ODP_H */
|