.. | .. |
---|
| 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 | #include <linux/vmalloc.h> |
---|
34 | 7 | #include "rxe.h" |
---|
.. | .. |
---|
66 | 39 | return -EINVAL; |
---|
67 | 40 | } |
---|
68 | 41 | |
---|
69 | | -static void rxe_send_complete(unsigned long data) |
---|
| 42 | +static void rxe_send_complete(struct tasklet_struct *t) |
---|
70 | 43 | { |
---|
71 | | - struct rxe_cq *cq = (struct rxe_cq *)data; |
---|
| 44 | + struct rxe_cq *cq = from_tasklet(cq, t, comp_task); |
---|
72 | 45 | unsigned long flags; |
---|
73 | 46 | |
---|
74 | 47 | spin_lock_irqsave(&cq->cq_lock, flags); |
---|
.. | .. |
---|
82 | 55 | } |
---|
83 | 56 | |
---|
84 | 57 | int rxe_cq_from_init(struct rxe_dev *rxe, struct rxe_cq *cq, int cqe, |
---|
85 | | - int comp_vector, struct ib_ucontext *context, |
---|
| 58 | + int comp_vector, struct ib_udata *udata, |
---|
86 | 59 | struct rxe_create_cq_resp __user *uresp) |
---|
87 | 60 | { |
---|
88 | 61 | int err; |
---|
.. | .. |
---|
94 | 67 | return -ENOMEM; |
---|
95 | 68 | } |
---|
96 | 69 | |
---|
97 | | - err = do_mmap_info(rxe, uresp ? &uresp->mi : NULL, context, |
---|
| 70 | + err = do_mmap_info(rxe, uresp ? &uresp->mi : NULL, udata, |
---|
98 | 71 | cq->queue->buf, cq->queue->buf_size, &cq->queue->ip); |
---|
99 | 72 | if (err) { |
---|
100 | 73 | vfree(cq->queue->buf); |
---|
.. | .. |
---|
107 | 80 | |
---|
108 | 81 | cq->is_dying = false; |
---|
109 | 82 | |
---|
110 | | - tasklet_init(&cq->comp_task, rxe_send_complete, (unsigned long)cq); |
---|
| 83 | + tasklet_setup(&cq->comp_task, rxe_send_complete); |
---|
111 | 84 | |
---|
112 | 85 | spin_lock_init(&cq->cq_lock); |
---|
113 | 86 | cq->ibcq.cqe = cqe; |
---|
.. | .. |
---|
115 | 88 | } |
---|
116 | 89 | |
---|
117 | 90 | int rxe_cq_resize_queue(struct rxe_cq *cq, int cqe, |
---|
118 | | - struct rxe_resize_cq_resp __user *uresp) |
---|
| 91 | + struct rxe_resize_cq_resp __user *uresp, |
---|
| 92 | + struct ib_udata *udata) |
---|
119 | 93 | { |
---|
120 | 94 | int err; |
---|
121 | 95 | |
---|
122 | 96 | err = rxe_queue_resize(cq->queue, (unsigned int *)&cqe, |
---|
123 | | - sizeof(struct rxe_cqe), |
---|
124 | | - cq->queue->ip ? cq->queue->ip->context : NULL, |
---|
| 97 | + sizeof(struct rxe_cqe), udata, |
---|
125 | 98 | uresp ? &uresp->mi : NULL, NULL, &cq->cq_lock); |
---|
126 | 99 | if (!err) |
---|
127 | 100 | cq->ibcq.cqe = cqe; |
---|