IB/hfi1: Notify remove MMU/RB callback of calling context
Tell the remove MMU/RB callback if it's being called as part of a memory invalidation or not. This can be important in preventing a deadlock if the remove callback attempts to take the map_sem semaphore because the kernel's MMU invalidation functions have already taken it. Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Reviewed-by: Dean Luick <dean.luick@intel.com> Signed-off-by: Mitko Haralanov <mitko.haralanov@intel.com> Signed-off-by: Jubin John <jubin.john@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>hifive-unleashed-5.1
parent
368f2b59d0
commit
909e2cd004
|
@ -122,7 +122,7 @@ void hfi1_mmu_rb_unregister(struct rb_root *root)
|
||||||
rbnode = rb_entry(node, struct mmu_rb_node, node);
|
rbnode = rb_entry(node, struct mmu_rb_node, node);
|
||||||
rb_erase(node, root);
|
rb_erase(node, root);
|
||||||
if (handler->ops->remove)
|
if (handler->ops->remove)
|
||||||
handler->ops->remove(root, rbnode);
|
handler->ops->remove(root, rbnode, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,12 +196,12 @@ static struct mmu_rb_node *__mmu_rb_search(struct mmu_rb_handler *handler,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __mmu_rb_remove(struct mmu_rb_handler *handler,
|
static void __mmu_rb_remove(struct mmu_rb_handler *handler,
|
||||||
struct mmu_rb_node *node)
|
struct mmu_rb_node *node, bool arg)
|
||||||
{
|
{
|
||||||
/* Validity of handler and node pointers has been checked by caller. */
|
/* Validity of handler and node pointers has been checked by caller. */
|
||||||
rb_erase(&node->node, handler->root);
|
rb_erase(&node->node, handler->root);
|
||||||
if (handler->ops->remove)
|
if (handler->ops->remove)
|
||||||
handler->ops->remove(handler->root, node);
|
handler->ops->remove(handler->root, node, arg);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct mmu_rb_node *hfi1_mmu_rb_search(struct rb_root *root, unsigned long addr,
|
struct mmu_rb_node *hfi1_mmu_rb_search(struct rb_root *root, unsigned long addr,
|
||||||
|
@ -230,7 +230,7 @@ void hfi1_mmu_rb_remove(struct rb_root *root, struct mmu_rb_node *node)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
spin_lock_irqsave(&handler->lock, flags);
|
spin_lock_irqsave(&handler->lock, flags);
|
||||||
__mmu_rb_remove(handler, node);
|
__mmu_rb_remove(handler, node, false);
|
||||||
spin_unlock_irqrestore(&handler->lock, flags);
|
spin_unlock_irqrestore(&handler->lock, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -299,7 +299,7 @@ static void mmu_notifier_mem_invalidate(struct mmu_notifier *mn,
|
||||||
naddr = node->addr;
|
naddr = node->addr;
|
||||||
nlen = node->len;
|
nlen = node->len;
|
||||||
if (handler->ops->invalidate(root, node))
|
if (handler->ops->invalidate(root, node))
|
||||||
__mmu_rb_remove(handler, node);
|
__mmu_rb_remove(handler, node, true);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The next address to be looked up is computed based
|
* The next address to be looked up is computed based
|
||||||
|
|
|
@ -59,7 +59,7 @@ struct mmu_rb_ops {
|
||||||
int (*compare)(struct mmu_rb_node *, unsigned long,
|
int (*compare)(struct mmu_rb_node *, unsigned long,
|
||||||
unsigned long);
|
unsigned long);
|
||||||
int (*insert)(struct rb_root *, struct mmu_rb_node *);
|
int (*insert)(struct rb_root *, struct mmu_rb_node *);
|
||||||
void (*remove)(struct rb_root *, struct mmu_rb_node *);
|
void (*remove)(struct rb_root *, struct mmu_rb_node *, bool);
|
||||||
int (*invalidate)(struct rb_root *, struct mmu_rb_node *);
|
int (*invalidate)(struct rb_root *, struct mmu_rb_node *);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ static int set_rcvarray_entry(struct file *, unsigned long, u32,
|
||||||
static inline int mmu_addr_cmp(struct mmu_rb_node *, unsigned long,
|
static inline int mmu_addr_cmp(struct mmu_rb_node *, unsigned long,
|
||||||
unsigned long);
|
unsigned long);
|
||||||
static int mmu_rb_insert(struct rb_root *, struct mmu_rb_node *);
|
static int mmu_rb_insert(struct rb_root *, struct mmu_rb_node *);
|
||||||
static void mmu_rb_remove(struct rb_root *, struct mmu_rb_node *);
|
static void mmu_rb_remove(struct rb_root *, struct mmu_rb_node *, bool);
|
||||||
static int mmu_rb_invalidate(struct rb_root *, struct mmu_rb_node *);
|
static int mmu_rb_invalidate(struct rb_root *, struct mmu_rb_node *);
|
||||||
static int program_rcvarray(struct file *, unsigned long, struct tid_group *,
|
static int program_rcvarray(struct file *, unsigned long, struct tid_group *,
|
||||||
struct tid_pageset *, unsigned, u16, struct page **,
|
struct tid_pageset *, unsigned, u16, struct page **,
|
||||||
|
@ -897,7 +897,7 @@ static int unprogram_rcvarray(struct file *fp, u32 tidinfo,
|
||||||
if (!node || node->rcventry != (uctxt->expected_base + rcventry))
|
if (!node || node->rcventry != (uctxt->expected_base + rcventry))
|
||||||
return -EBADF;
|
return -EBADF;
|
||||||
if (HFI1_CAP_IS_USET(TID_UNMAP))
|
if (HFI1_CAP_IS_USET(TID_UNMAP))
|
||||||
mmu_rb_remove(&fd->tid_rb_root, &node->mmu);
|
mmu_rb_remove(&fd->tid_rb_root, &node->mmu, false);
|
||||||
else
|
else
|
||||||
hfi1_mmu_rb_remove(&fd->tid_rb_root, &node->mmu);
|
hfi1_mmu_rb_remove(&fd->tid_rb_root, &node->mmu);
|
||||||
|
|
||||||
|
@ -962,7 +962,7 @@ static void unlock_exp_tids(struct hfi1_ctxtdata *uctxt,
|
||||||
continue;
|
continue;
|
||||||
if (HFI1_CAP_IS_USET(TID_UNMAP))
|
if (HFI1_CAP_IS_USET(TID_UNMAP))
|
||||||
mmu_rb_remove(&fd->tid_rb_root,
|
mmu_rb_remove(&fd->tid_rb_root,
|
||||||
&node->mmu);
|
&node->mmu, false);
|
||||||
else
|
else
|
||||||
hfi1_mmu_rb_remove(&fd->tid_rb_root,
|
hfi1_mmu_rb_remove(&fd->tid_rb_root,
|
||||||
&node->mmu);
|
&node->mmu);
|
||||||
|
@ -1039,7 +1039,8 @@ static int mmu_rb_insert(struct rb_root *root, struct mmu_rb_node *node)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mmu_rb_remove(struct rb_root *root, struct mmu_rb_node *node)
|
static void mmu_rb_remove(struct rb_root *root, struct mmu_rb_node *node,
|
||||||
|
bool notifier)
|
||||||
{
|
{
|
||||||
struct hfi1_filedata *fdata =
|
struct hfi1_filedata *fdata =
|
||||||
container_of(root, struct hfi1_filedata, tid_rb_root);
|
container_of(root, struct hfi1_filedata, tid_rb_root);
|
||||||
|
|
Loading…
Reference in New Issue