移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/infiniband/sw/rxe/rxe_srq.c
..
..
@@ -1,34 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
1
2
 /*
2
3
  * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
3
4
  * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved.
4
- *
5
- * This software is available to you under a choice of one of two
6
- * licenses.  You may choose to be licensed under the terms of the GNU
7
- * General Public License (GPL) Version 2, available from the file
8
- * COPYING in the main directory of this source tree, or the
9
- * OpenIB.org BSD license below:
10
- *
11
- *     Redistribution and use in source and binary forms, with or
12
- *     without modification, are permitted provided that the following
13
- *     conditions are met:
14
- *
15
- *	- Redistributions of source code must retain the above
16
- *	  copyright notice, this list of conditions and the following
17
- *	  disclaimer.
18
- *
19
- *	- Redistributions in binary form must reproduce the above
20
- *	  copyright notice, this list of conditions and the following
21
- *	  disclaimer in the documentation and/or other materials
22
- *	  provided with the distribution.
23
- *
24
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
27
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
28
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
29
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
30
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31
- * SOFTWARE.
32
5
  */
33
6
 
34
7
 #include <linux/vmalloc.h>
..
..
@@ -99,8 +72,7 @@
99
72
 }
100
73
 
101
74
 int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq,
102
-		      struct ib_srq_init_attr *init,
103
-		      struct ib_ucontext *context,
75
+		      struct ib_srq_init_attr *init, struct ib_udata *udata,
104
76
 		      struct rxe_create_srq_resp __user *uresp)
105
77
 {
106
78
 	int err;
..
..
@@ -128,7 +100,7 @@
128
100
 
129
101
 	srq->rq.queue = q;
130
102
 
131
-	err = do_mmap_info(rxe, uresp ? &uresp->mi : NULL, context, q->buf,
103
+	err = do_mmap_info(rxe, uresp ? &uresp->mi : NULL, udata, q->buf,
132
104
 			   q->buf_size, &q->ip);
133
105
 	if (err) {
134
106
 		vfree(q->buf);
..
..
@@ -149,7 +121,7 @@
149
121
 
150
122
 int rxe_srq_from_attr(struct rxe_dev *rxe, struct rxe_srq *srq,
151
123
 		      struct ib_srq_attr *attr, enum ib_srq_attr_mask mask,
152
-		      struct rxe_modify_srq_cmd *ucmd)
124
+		      struct rxe_modify_srq_cmd *ucmd, struct ib_udata *udata)
153
125
 {
154
126
 	int err;
155
127
 	struct rxe_queue *q = srq->rq.queue;
..
..
@@ -163,11 +135,8 @@
163
135
 		mi = u64_to_user_ptr(ucmd->mmap_info_addr);
164
136
 
165
137
 		err = rxe_queue_resize(q, &attr->max_wr,
166
-				       rcv_wqe_size(srq->rq.max_sge),
167
-				       srq->rq.queue->ip ?
168
-						srq->rq.queue->ip->context :
169
-						NULL,
170
-				       mi, &srq->rq.producer_lock,
138
+				       rcv_wqe_size(srq->rq.max_sge), udata, mi,
139
+				       &srq->rq.producer_lock,
171
140
 				       &srq->rq.consumer_lock);
172
141
 		if (err)
173
142
 			goto err2;