aboutsummaryrefslogtreecommitdiffstats
path: root/include/rdma
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2007-03-04 19:15:11 -0500
committerRoland Dreier <rolandd@cisco.com>2007-05-08 21:00:37 -0400
commitf7c6a7b5d59980b076abbf2ceeb8735591290285 (patch)
tree29c35b47052bba87f031a4744d8ad12ff5187149 /include/rdma
parent36f021b579d195cdc5fa6f3e2bab198b4bf70643 (diff)
IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules
Export ib_umem_get()/ib_umem_release() and put low-level drivers in control of when to call ib_umem_get() to pin and DMA map userspace, rather than always calling it in ib_uverbs_reg_mr() before calling the low-level driver's reg_user_mr method. Also move these functions to be in the ib_core module instead of ib_uverbs, so that driver modules using them do not depend on ib_uverbs. This has a number of advantages: - It is better design from the standpoint of making generic code a library that can be used or overridden by device-specific code as the details of specific devices dictate. - Drivers that do not need to pin userspace memory regions do not need to take the performance hit of calling ib_mem_get(). For example, although I have not tried to implement it in this patch, the ipath driver should be able to avoid pinning memory and just use copy_{to,from}_user() to access userspace memory regions. - Buffers that need special mapping treatment can be identified by the low-level driver. For example, it may be possible to solve some Altix-specific memory ordering issues with mthca CQs in userspace by mapping CQ buffers with extra flags. - Drivers that need to pin and DMA map userspace memory for things other than memory regions can use ib_umem_get() directly, instead of hacks using extra parameters to their reg_phys_mr method. For example, the mlx4 driver that is pending being merged needs to pin and DMA map QP and CQ buffers, but it does not need to create a memory key for these buffers. So the cleanest solution is for mlx4 to call ib_umem_get() in the create_qp and create_cq methods. Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'include/rdma')
-rw-r--r--include/rdma/ib_umem.h78
-rw-r--r--include/rdma/ib_verbs.h28
2 files changed, 82 insertions, 24 deletions
diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h
new file mode 100644
index 000000000000..06307f7e43e0
--- /dev/null
+++ b/include/rdma/ib_umem.h
@@ -0,0 +1,78 @@
1/*
2 * Copyright (c) 2007 Cisco Systems. All rights reserved.
3 *
4 * This software is available to you under a choice of one of two
5 * licenses. You may choose to be licensed under the terms of the GNU
6 * General Public License (GPL) Version 2, available from the file
7 * COPYING in the main directory of this source tree, or the
8 * OpenIB.org BSD license below:
9 *
10 * Redistribution and use in source and binary forms, with or
11 * without modification, are permitted provided that the following
12 * conditions are met:
13 *
14 * - Redistributions of source code must retain the above
15 * copyright notice, this list of conditions and the following
16 * disclaimer.
17 *
18 * - Redistributions in binary form must reproduce the above
19 * copyright notice, this list of conditions and the following
20 * disclaimer in the documentation and/or other materials
21 * provided with the distribution.
22 *
23 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
26 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
27 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
28 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
29 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30 * SOFTWARE.
31 */
32
33#ifndef IB_UMEM_H
34#define IB_UMEM_H
35
36#include <linux/list.h>
37#include <linux/scatterlist.h>
38
39struct ib_ucontext;
40
41struct ib_umem {
42 struct ib_ucontext *context;
43 size_t length;
44 int offset;
45 int page_size;
46 int writable;
47 struct list_head chunk_list;
48};
49
50struct ib_umem_chunk {
51 struct list_head list;
52 int nents;
53 int nmap;
54 struct scatterlist page_list[0];
55};
56
57#ifdef CONFIG_INFINIBAND_USER_MEM
58
59struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
60 size_t size, int access);
61void ib_umem_release(struct ib_umem *umem);
62int ib_umem_page_count(struct ib_umem *umem);
63
64#else /* CONFIG_INFINIBAND_USER_MEM */
65
66#include <linux/err.h>
67
68static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context,
69 unsigned long addr, size_t size,
70 int access) {
71 return ERR_PTR(-EINVAL);
72}
73static inline void ib_umem_release(struct ib_umem *umem) { }
74static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; }
75
76#endif /* CONFIG_INFINIBAND_USER_MEM */
77
78#endif /* IB_UMEM_H */
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 5342ac64ed1a..47cefca59c89 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -5,7 +5,7 @@
5 * Copyright (c) 2004 Topspin Corporation. All rights reserved. 5 * Copyright (c) 2004 Topspin Corporation. All rights reserved.
6 * Copyright (c) 2004 Voltaire Corporation. All rights reserved. 6 * Copyright (c) 2004 Voltaire Corporation. All rights reserved.
7 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. 7 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
8 * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved. 8 * Copyright (c) 2005, 2006, 2007 Cisco Systems. All rights reserved.
9 * 9 *
10 * This software is available to you under a choice of one of two 10 * This software is available to you under a choice of one of two
11 * licenses. You may choose to be licensed under the terms of the GNU 11 * licenses. You may choose to be licensed under the terms of the GNU
@@ -710,6 +710,7 @@ struct ib_ucontext {
710 struct list_head qp_list; 710 struct list_head qp_list;
711 struct list_head srq_list; 711 struct list_head srq_list;
712 struct list_head ah_list; 712 struct list_head ah_list;
713 int closing;
713}; 714};
714 715
715struct ib_uobject { 716struct ib_uobject {
@@ -723,23 +724,6 @@ struct ib_uobject {
723 int live; 724 int live;
724}; 725};
725 726
726struct ib_umem {
727 unsigned long user_base;
728 unsigned long virt_base;
729 size_t length;
730 int offset;
731 int page_size;
732 int writable;
733 struct list_head chunk_list;
734};
735
736struct ib_umem_chunk {
737 struct list_head list;
738 int nents;
739 int nmap;
740 struct scatterlist page_list[0];
741};
742
743struct ib_udata { 727struct ib_udata {
744 void __user *inbuf; 728 void __user *inbuf;
745 void __user *outbuf; 729 void __user *outbuf;
@@ -752,11 +736,6 @@ struct ib_udata {
752 ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] - \ 736 ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] - \
753 (void *) &((struct ib_umem_chunk *) 0)->page_list[0])) 737 (void *) &((struct ib_umem_chunk *) 0)->page_list[0]))
754 738
755struct ib_umem_object {
756 struct ib_uobject uobject;
757 struct ib_umem umem;
758};
759
760struct ib_pd { 739struct ib_pd {
761 struct ib_device *device; 740 struct ib_device *device;
762 struct ib_uobject *uobject; 741 struct ib_uobject *uobject;
@@ -1003,7 +982,8 @@ struct ib_device {
1003 int mr_access_flags, 982 int mr_access_flags,
1004 u64 *iova_start); 983 u64 *iova_start);
1005 struct ib_mr * (*reg_user_mr)(struct ib_pd *pd, 984 struct ib_mr * (*reg_user_mr)(struct ib_pd *pd,
1006 struct ib_umem *region, 985 u64 start, u64 length,
986 u64 virt_addr,
1007 int mr_access_flags, 987 int mr_access_flags,
1008 struct ib_udata *udata); 988 struct ib_udata *udata);
1009 int (*query_mr)(struct ib_mr *mr, 989 int (*query_mr)(struct ib_mr *mr,