kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/include/linux/sunrpc/cache.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * include/linux/sunrpc/cache.h
3
4
  *
..
..
@@ -5,9 +6,6 @@
5
6
  * used by sunrpc clients and servers.
6
7
  *
7
8
  * Copyright (C) 2002 Neil Brown <neilb@cse.unsw.edu.au>
8
- *
9
- * Released under terms in GPL version 2.  See COPYING.
10
- *
11
9
  */
12
10
 
13
11
 #ifndef _LINUX_SUNRPC_CACHE_H_
..
..
@@ -47,8 +45,9 @@
47
45
  */
48
46
 struct cache_head {
49
47
 	struct hlist_node	cache_list;
50
-	time_t		expiry_time;	/* After time time, don't use the data */
51
-	time_t		last_refresh;   /* If CACHE_PENDING, this is when upcall was
48
+	time64_t	expiry_time;	/* After time expiry_time, don't use
49
+					 * the data */
50
+	time64_t	last_refresh;   /* If CACHE_PENDING, this is when upcall was
52
51
 					 * sent, else this is when update was
53
52
 					 * received, though it is alway set to
54
53
 					 * be *after* ->flush_time.
..
..
@@ -67,7 +66,7 @@
67
66
 	struct module *		owner;
68
67
 	int			hash_size;
69
68
 	struct hlist_head *	hash_table;
70
-	rwlock_t		hash_lock;
69
+	spinlock_t		hash_lock;
71
70
 
72
71
 	char			*name;
73
72
 	void			(*cache_put)(struct kref *);
..
..
@@ -89,6 +88,7 @@
89
88
 					      int has_died);
90
89
 
91
90
 	struct cache_head *	(*alloc)(void);
91
+	void			(*flush)(void);
92
92
 	int			(*match)(struct cache_head *orig, struct cache_head *new);
93
93
 	void			(*init)(struct cache_head *orig, struct cache_head *new);
94
94
 	void			(*update)(struct cache_head *orig, struct cache_head *new);
..
..
@@ -96,22 +96,22 @@
96
96
 	/* fields below this comment are for internal use
97
97
 	 * and should not be touched by cache owners
98
98
 	 */
99
-	time_t			flush_time;		/* flush all cache items with
99
+	time64_t		flush_time;		/* flush all cache items with
100
100
 							 * last_refresh at or earlier
101
101
 							 * than this.  last_refresh
102
102
 							 * is never set at or earlier
103
103
 							 * than this.
104
104
 							 */
105
105
 	struct list_head	others;
106
-	time_t			nextcheck;
106
+	time64_t		nextcheck;
107
107
 	int			entries;
108
108
 
109
109
 	/* fields for communication over channel */
110
110
 	struct list_head	queue;
111
111
 
112
-	atomic_t		readers;		/* how many time is /chennel open */
113
-	time_t			last_close;		/* if no readers, when did last close */
114
-	time_t			last_warn;		/* when we last warned about no readers */
112
+	atomic_t		writers;		/* how many time is /channel open */
113
+	time64_t		last_close;		/* if no writers, when did last close */
114
+	time64_t		last_warn;		/* when we last warned about no writers */
115
115
 
116
116
 	union {
117
117
 		struct proc_dir_entry	*procfs;
..
..
@@ -148,18 +148,22 @@
148
148
  * timestamps kept in the cache are expressed in seconds
149
149
  * since boot.  This is the best for measuring differences in
150
150
  * real time.
151
+ * This reimplemnts ktime_get_boottime_seconds() in a slightly
152
+ * faster but less accurate way. When we end up converting
153
+ * back to wallclock (CLOCK_REALTIME), that error often
154
+ * cancels out during the reverse operation.
151
155
  */
152
-static inline time_t seconds_since_boot(void)
156
+static inline time64_t seconds_since_boot(void)
153
157
 {
154
-	struct timespec boot;
155
-	getboottime(&boot);
156
-	return get_seconds() - boot.tv_sec;
158
+	struct timespec64 boot;
159
+	getboottime64(&boot);
160
+	return ktime_get_real_seconds() - boot.tv_sec;
157
161
 }
158
162
 
159
-static inline time_t convert_to_wallclock(time_t sinceboot)
163
+static inline time64_t convert_to_wallclock(time64_t sinceboot)
160
164
 {
161
-	struct timespec boot;
162
-	getboottime(&boot);
165
+	struct timespec64 boot;
166
+	getboottime64(&boot);
163
167
 	return boot.tv_sec + sinceboot;
164
168
 }
165
169
 
..
..
@@ -168,14 +172,17 @@
168
172
 extern const struct file_operations cache_flush_operations_pipefs;
169
173
 
170
174
 extern struct cache_head *
171
-sunrpc_cache_lookup(struct cache_detail *detail,
172
-		    struct cache_head *key, int hash);
175
+sunrpc_cache_lookup_rcu(struct cache_detail *detail,
176
+			struct cache_head *key, int hash);
173
177
 extern struct cache_head *
174
178
 sunrpc_cache_update(struct cache_detail *detail,
175
179
 		    struct cache_head *new, struct cache_head *old, int hash);
176
180
 
177
181
 extern int
178
182
 sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h);
183
+extern int
184
+sunrpc_cache_pipe_upcall_timeout(struct cache_detail *detail,
185
+				 struct cache_head *h);
179
186
 
180
187
 
181
188
 extern void cache_clean_deferred(void *owner);
..
..
@@ -186,6 +193,12 @@
186
193
 	return h;
187
194
 }
188
195
 
196
+static inline struct cache_head  *cache_get_rcu(struct cache_head *h)
197
+{
198
+	if (kref_get_unless_zero(&h->ref))
199
+		return h;
200
+	return NULL;
201
+}
189
202
 
190
203
 static inline void cache_put(struct cache_head *h, struct cache_detail *cd)
191
204
 {
..
..
@@ -197,11 +210,11 @@
197
210
 
198
211
 static inline bool cache_is_expired(struct cache_detail *detail, struct cache_head *h)
199
212
 {
213
+	if (h->expiry_time < seconds_since_boot())
214
+		return true;
200
215
 	if (!test_bit(CACHE_VALID, &h->flags))
201
216
 		return false;
202
-
203
-	return  (h->expiry_time < seconds_since_boot()) ||
204
-		(detail->flush_time >= h->last_refresh);
217
+	return detail->flush_time >= h->last_refresh;
205
218
 }
206
219
 
207
220
 extern int cache_check(struct cache_detail *detail,
..
..
@@ -224,9 +237,9 @@
224
237
 extern void sunrpc_cache_unhash(struct cache_detail *, struct cache_head *);
225
238
 
226
239
 /* Must store cache_detail in seq_file->private if using next three functions */
227
-extern void *cache_seq_start(struct seq_file *file, loff_t *pos);
228
-extern void *cache_seq_next(struct seq_file *file, void *p, loff_t *pos);
229
-extern void cache_seq_stop(struct seq_file *file, void *p);
240
+extern void *cache_seq_start_rcu(struct seq_file *file, loff_t *pos);
241
+extern void *cache_seq_next_rcu(struct seq_file *file, void *p, loff_t *pos);
242
+extern void cache_seq_stop_rcu(struct seq_file *file, void *p);
230
243
 
231
244
 extern void qword_add(char **bpp, int *lp, char *str);
232
245
 extern void qword_addhex(char **bpp, int *lp, char *buf, int blen);
..
..
@@ -268,7 +281,7 @@
268
281
 	return 0;
269
282
 }
270
283
 
271
-static inline int get_time(char **bpp, time_t *time)
284
+static inline int get_time(char **bpp, time64_t *time)
272
285
 {
273
286
 	char buf[50];
274
287
 	long long ll;
..
..
@@ -282,20 +295,20 @@
282
295
 	if (kstrtoll(buf, 0, &ll))
283
296
 		return -EINVAL;
284
297
 
285
-	*time = (time_t)ll;
298
+	*time = ll;
286
299
 	return 0;
287
300
 }
288
301
 
289
-static inline time_t get_expiry(char **bpp)
302
+static inline time64_t get_expiry(char **bpp)
290
303
 {
291
-	time_t rv;
292
-	struct timespec boot;
304
+	time64_t rv;
305
+	struct timespec64 boot;
293
306
 
294
307
 	if (get_time(bpp, &rv))
295
308
 		return 0;
296
309
 	if (rv < 0)
297
310
 		return 0;
298
-	getboottime(&boot);
311
+	getboottime64(&boot);
299
312
 	return rv - boot.tv_sec;
300
313
 }
301
314