update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/include/linux/u64_stats_sync.h
..
..
@@ -3,33 +3,36 @@
3
3
 #define _LINUX_U64_STATS_SYNC_H
4
4
 
5
5
 /*
6
- * To properly implement 64bits network statistics on 32bit and 64bit hosts,
7
- * we provide a synchronization point, that is a noop on 64bit or UP kernels.
6
+ * Protect against 64-bit values tearing on 32-bit architectures. This is
7
+ * typically used for statistics read/update in different subsystems.
8
8
  *
9
9
  * Key points :
10
- * 1) Use a seqcount on SMP 32bits, with low overhead.
11
- * 2) Whole thing is a noop on 64bit arches or UP kernels.
12
- * 3) Write side must ensure mutual exclusion or one seqcount update could
10
+ *
11
+ * -  Use a seqcount on 32-bit SMP, only disable preemption for 32-bit UP.
12
+ * -  The whole thing is a no-op on 64-bit architectures.
13
+ *
14
+ * Usage constraints:
15
+ *
16
+ * 1) Write side must ensure mutual exclusion, or one seqcount update could
13
17
  *    be lost, thus blocking readers forever.
14
- *    If this synchronization point is not a mutex, but a spinlock or
15
- *    spinlock_bh() or disable_bh() :
16
- * 3.1) Write side should not sleep.
17
- * 3.2) Write side should not allow preemption.
18
- * 3.3) If applicable, interrupts should be disabled.
18
+ *
19
+ * 2) Write side must disable preemption, or a seqcount reader can preempt the
20
+ *    writer and also spin forever.
21
+ *
22
+ * 3) Write side must use the _irqsave() variant if other writers, or a reader,
23
+ *    can be invoked from an IRQ context.
19
24
  *
20
25
  * 4) If reader fetches several counters, there is no guarantee the whole values
21
- *    are consistent (remember point 1) : this is a noop on 64bit arches anyway)
26
+ *    are consistent w.r.t. each other (remember point #2: seqcounts are not
27
+ *    used for 64bit architectures).
22
28
  *
23
- * 5) readers are allowed to sleep or be preempted/interrupted : They perform
24
- *    pure reads. But if they have to fetch many values, it's better to not allow
25
- *    preemptions/interruptions to avoid many retries.
29
+ * 5) Readers are allowed to sleep or be preempted/interrupted: they perform
30
+ *    pure reads.
26
31
  *
27
- * 6) If counter might be written by an interrupt, readers should block interrupts.
28
- *    (On UP, there is no seqcount_t protection, a reader allowing interrupts could
29
- *     read partial values)
30
- *
31
- * 7) For irq and softirq uses, readers can use u64_stats_fetch_begin_irq() and
32
- *    u64_stats_fetch_retry_irq() helpers
32
+ * 6) Readers must use both u64_stats_fetch_{begin,retry}_irq() if the stats
33
+ *    might be updated from a hardirq or softirq context (remember point #1:
34
+ *    seqcounts are not used for UP kernels). 32-bit UP stat readers could read
35
+ *    corrupted 64-bit values otherwise.
33
36
  *
34
37
  * Usage :
35
38
  *
..
..
@@ -40,8 +43,8 @@
40
43
  *   spin_lock_bh(...) or other synchronization to get exclusive access
41
44
  *   ...
42
45
  *   u64_stats_update_begin(&stats->syncp);
43
- *   stats->bytes64 += len; // non atomic operation
44
- *   stats->packets64++;    // non atomic operation
46
+ *   u64_stats_add(&stats->bytes64, len); // non atomic operation
47
+ *   u64_stats_inc(&stats->packets64);    // non atomic operation
45
48
  *   u64_stats_update_end(&stats->syncp);
46
49
  *
47
50
  * While a consumer (reader) should use following template to get consistent
..
..
@@ -52,8 +55,8 @@
52
55
  *
53
56
  * do {
54
57
  *         start = u64_stats_fetch_begin(&stats->syncp);
55
- *         tbytes = stats->bytes64; // non atomic operation
56
- *         tpackets = stats->packets64; // non atomic operation
58
+ *         tbytes = u64_stats_read(&stats->bytes64); // non atomic operation
59
+ *         tpackets = u64_stats_read(&stats->packets64); // non atomic operation
57
60
  * } while (u64_stats_fetch_retry(&stats->syncp, start));
58
61
  *
59
62
  *
..
..
@@ -68,6 +71,49 @@
68
71
 #endif
69
72
 };
70
73
 
74
+#if BITS_PER_LONG == 64
75
+#include <asm/local64.h>
76
+
77
+typedef struct {
78
+	local64_t	v;
79
+} u64_stats_t ;
80
+
81
+static inline u64 u64_stats_read(const u64_stats_t *p)
82
+{
83
+	return local64_read(&p->v);
84
+}
85
+
86
+static inline void u64_stats_add(u64_stats_t *p, unsigned long val)
87
+{
88
+	local64_add(val, &p->v);
89
+}
90
+
91
+static inline void u64_stats_inc(u64_stats_t *p)
92
+{
93
+	local64_inc(&p->v);
94
+}
95
+
96
+#else
97
+
98
+typedef struct {
99
+	u64		v;
100
+} u64_stats_t;
101
+
102
+static inline u64 u64_stats_read(const u64_stats_t *p)
103
+{
104
+	return p->v;
105
+}
106
+
107
+static inline void u64_stats_add(u64_stats_t *p, unsigned long val)
108
+{
109
+	p->v += val;
110
+}
111
+
112
+static inline void u64_stats_inc(u64_stats_t *p)
113
+{
114
+	p->v++;
115
+}
116
+#endif
71
117
 
72
118
 #if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
73
119
 #define u64_stats_init(syncp)	seqcount_init(&(syncp)->seq)