change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/include/rdma/rdmavt_cq.h
..
..
@@ -1,58 +1,14 @@
1
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
2
+/*
3
+ * Copyright(c) 2016 - 2018 Intel Corporation.
4
+ */
5
+
1
6
 #ifndef DEF_RDMAVT_INCCQ_H
2
7
 #define DEF_RDMAVT_INCCQ_H
3
8
 
4
-/*
5
- *
6
- * This file is provided under a dual BSD/GPLv2 license.  When using or
7
- * redistributing this file, you may do so under either license.
8
- *
9
- * GPL LICENSE SUMMARY
10
- *
11
- * Copyright(c) 2016 - 2018 Intel Corporation.
12
- *
13
- * This program is free software; you can redistribute it and/or modify
14
- * it under the terms of version 2 of the GNU General Public License as
15
- * published by the Free Software Foundation.
16
- *
17
- * This program is distributed in the hope that it will be useful, but
18
- * WITHOUT ANY WARRANTY; without even the implied warranty of
19
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
20
- * General Public License for more details.
21
- *
22
- * BSD LICENSE
23
- *
24
- * Copyright(c) 2015 Intel Corporation.
25
- *
26
- * Redistribution and use in source and binary forms, with or without
27
- * modification, are permitted provided that the following conditions
28
- * are met:
29
- *
30
- *  - Redistributions of source code must retain the above copyright
31
- *    notice, this list of conditions and the following disclaimer.
32
- *  - Redistributions in binary form must reproduce the above copyright
33
- *    notice, this list of conditions and the following disclaimer in
34
- *    the documentation and/or other materials provided with the
35
- *    distribution.
36
- *  - Neither the name of Intel Corporation nor the names of its
37
- *    contributors may be used to endorse or promote products derived
38
- *    from this software without specific prior written permission.
39
- *
40
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
41
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
42
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
43
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
44
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
45
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
46
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
47
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
48
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
49
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
50
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
51
- *
52
- */
53
-
54
9
 #include <linux/kthread.h>
55
10
 #include <rdma/ib_user_verbs.h>
11
+#include <rdma/ib_verbs.h>
56
12
 
57
13
 /*
58
14
  * Define an ib_cq_notify value that is not valid so we know when CQ
..
..
@@ -61,18 +17,27 @@
61
17
 #define RVT_CQ_NONE      (IB_CQ_NEXT_COMP + 1)
62
18
 
63
19
 /*
20
+ * Define read macro that apply smp_load_acquire memory barrier
21
+ * when reading indice of circular buffer that mmaped to user space.
22
+ */
23
+#define RDMA_READ_UAPI_ATOMIC(member) smp_load_acquire(&(member).val)
24
+
25
+/*
26
+ * Define write macro that uses smp_store_release memory barrier
27
+ * when writing indice of circular buffer that mmaped to user space.
28
+ */
29
+#define RDMA_WRITE_UAPI_ATOMIC(member, x) smp_store_release(&(member).val, x)
30
+#include <rdma/rvt-abi.h>
31
+
32
+/*
64
33
  * This structure is used to contain the head pointer, tail pointer,
65
34
  * and completion queue entries as a single memory allocation so
66
35
  * it can be mmap'ed into user space.
67
36
  */
68
-struct rvt_cq_wc {
37
+struct rvt_k_cq_wc {
69
38
 	u32 head;               /* index of next entry to fill */
70
39
 	u32 tail;               /* index of next ib_poll_cq() entry */
71
-	union {
72
-		/* these are actually size ibcq.cqe + 1 */
73
-		struct ib_uverbs_wc uqueue[0];
74
-		struct ib_wc kqueue[0];
75
-	};
40
+	struct ib_wc kqueue[];
76
41
 };
77
42
 
78
43
 /*
..
..
@@ -84,10 +49,12 @@
84
49
 	spinlock_t lock; /* protect changes in this struct */
85
50
 	u8 notify;
86
51
 	u8 triggered;
52
+	u8 cq_full;
87
53
 	int comp_vector_cpu;
88
54
 	struct rvt_dev_info *rdi;
89
55
 	struct rvt_cq_wc *queue;
90
56
 	struct rvt_mmap_info *ip;
57
+	struct rvt_k_cq_wc *kqueue;
91
58
 };
92
59
 
93
60
 static inline struct rvt_cq *ibcq_to_rvtcq(struct ib_cq *ibcq)
..
..
@@ -95,6 +62,6 @@
95
62
 	return container_of(ibcq, struct rvt_cq, ibcq);
96
63
 }
97
64
 
98
-void rvt_cq_enter(struct rvt_cq *cq, struct ib_wc *entry, bool solicited);
65
+bool rvt_cq_enter(struct rvt_cq *cq, struct ib_wc *entry, bool solicited);
99
66
 
100
67
 #endif          /* DEF_RDMAVT_INCCQH */