diff options
| -rw-r--r-- | drivers/staging/rdma/hfi1/mmu_rb.c | 19 | ||||
| -rw-r--r-- | drivers/staging/rdma/hfi1/mmu_rb.h | 1 |
2 files changed, 15 insertions, 5 deletions
diff --git a/drivers/staging/rdma/hfi1/mmu_rb.c b/drivers/staging/rdma/hfi1/mmu_rb.c index 5d27fee577b9..6edd5f022057 100644 --- a/drivers/staging/rdma/hfi1/mmu_rb.c +++ b/drivers/staging/rdma/hfi1/mmu_rb.c @@ -181,13 +181,22 @@ static struct mmu_rb_node *__mmu_rb_search(struct mmu_rb_handler *handler, unsigned long addr, unsigned long len) { - struct mmu_rb_node *node; + struct mmu_rb_node *node = NULL; hfi1_cdbg(MMU, "Searching for addr 0x%llx, len %u", addr, len); - node = __mmu_int_rb_iter_first(handler->root, addr, len); - if (node) - hfi1_cdbg(MMU, "Found node addr 0x%llx, len %u", node->addr, - node->len); + if (!handler->ops->filter) { + node = __mmu_int_rb_iter_first(handler->root, addr, + (addr + len) - 1); + } else { + for (node = __mmu_int_rb_iter_first(handler->root, addr, + (addr + len) - 1); + node; + node = __mmu_int_rb_iter_next(node, addr, + (addr + len) - 1)) { + if (handler->ops->filter(node, addr, len)) + return node; + } + } return node; } diff --git a/drivers/staging/rdma/hfi1/mmu_rb.h b/drivers/staging/rdma/hfi1/mmu_rb.h index 9c2600981e88..f8523fdb8a18 100644 --- a/drivers/staging/rdma/hfi1/mmu_rb.h +++ b/drivers/staging/rdma/hfi1/mmu_rb.h @@ -57,6 +57,7 @@ struct mmu_rb_node { }; struct mmu_rb_ops { + bool (*filter)(struct mmu_rb_node *, unsigned long, unsigned long); int (*insert)(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 *); |