History

Merge branch 'sched/urgent'

Peter Zijlstra committed 6 years ago

Commit faa2fd72 parents 01e377c ce3614d1250 files · +11132 −6391Browse files

Showing the changes to include/linux (50 of 1250 files). Show all

Unified · Split

50 files
  1. include/linux/atomic-fallback.h +235 −1
  2. include/linux/blkdev.h +1 −0
  3. include/linux/can/skb.h +1 −1
  4. include/linux/cb710.h +1 −1
  5. include/linux/ceph/libceph.h +2 −2
  6. include/linux/compiler-clang.h +8 −0
  7. include/linux/compiler-gcc.h +6 −0
  8. include/linux/compiler.h +1 −1
  9. include/linux/compiler_attributes.h +1 −0
  10. include/linux/compiler_types.h +10 −12
  11. include/linux/dma-direct.h +0 −2
  12. include/linux/dmaengine.h +2 −2
  13. include/linux/efi.h +3 −5
  14. include/linux/fs.h +0 −2
  15. include/linux/fscache-cache.h +1 −1
  16. include/linux/host1x.h +3 −0
  17. include/linux/i2c.h +3 −5
  18. include/linux/intel-iommu.h +1 −0
  19. include/linux/irq_work.h +8 −18
  20. include/linux/jbd2.h +5 −1
  21. include/linux/kexec.h +1 −1
  22. include/linux/kgdb.h +2 −3
  23. include/linux/kprobes.h +5 −1
  24. include/linux/kvm_host.h +1 −1
  25. include/linux/libata.h +8 −1
  26. include/linux/lsm_hook_defs.h +2 −2
  27. include/linux/mlx5/mlx5_ifc.h +6 −4
  28. include/linux/mmzone.h +2 −2
  29. include/linux/netdevice.h +1 −1
  30. include/linux/netfilter_ipv4/ip_tables.h +6 −0
  31. include/linux/netfilter_ipv6/ip6_tables.h +3 −0
  32. include/linux/overflow.h +21 −4
  33. include/linux/pci.h +5 −6
  34. include/linux/pgtable.h +7 −0
  35. include/linux/phy.h +1 −0
  36. include/linux/psp-sev.h +1 −1
  37. include/linux/qed/qed_chain.h +16 −10
  38. include/linux/sched.h +1 −6
  39. include/linux/sched/jobctl.h +3 −1
  40. include/linux/sctp.h +18 −18
  41. include/linux/smp.h +8 −15
  42. include/linux/smp_types.h +66 −0
  43. include/linux/swap.h +1 −0
  44. include/linux/syscalls.h +1 −1
  45. include/linux/task_work.h +4 −1
  46. include/linux/tifm.h +1 −1
  47. include/linux/timekeeping.h +7 −7
  48. include/linux/tpm_eventlog.h +13 −1
  49. include/linux/uaccess.h +13 −10
  50. include/linux/vmalloc.h +0 −1
include/linux/atomic-fallback.h+235−1
@@ -77,6 +77,9 @@ · 76 unmodified lines
7777
7878 #endif /* cmpxchg64_relaxed */
7979
80+#define arch_atomic_read atomic_read
81+#define arch_atomic_read_acquire atomic_read_acquire
82+
8083 #ifndef atomic_read_acquire
8184 static __always_inline int
8285 atomic_read_acquire(const atomic_t *v)
@@ -86,6 +89,9 @@ atomic_read_acquire(const atomic_t *v) · 3 unmodified lines
8689 #define atomic_read_acquire atomic_read_acquire
8790 #endif
8891
92+#define arch_atomic_set atomic_set
93+#define arch_atomic_set_release atomic_set_release
94+
8995 #ifndef atomic_set_release
9096 static __always_inline void
9197 atomic_set_release(atomic_t *v, int i)
@@ -95,6 +101,13 @@ atomic_set_release(atomic_t *v, int i) · 3 unmodified lines
95101 #define atomic_set_release atomic_set_release
96102 #endif
97103
104+#define arch_atomic_add atomic_add
105+
106+#define arch_atomic_add_return atomic_add_return
107+#define arch_atomic_add_return_acquire atomic_add_return_acquire
108+#define arch_atomic_add_return_release atomic_add_return_release
109+#define arch_atomic_add_return_relaxed atomic_add_return_relaxed
110+
98111 #ifndef atomic_add_return_relaxed
99112 #define atomic_add_return_acquire atomic_add_return
100113 #define atomic_add_return_release atomic_add_return
@@ -137,6 +150,11 @@ atomic_add_return(int i, atomic_t *v) · 36 unmodified lines
137150
138151 #endif /* atomic_add_return_relaxed */
139152
153+#define arch_atomic_fetch_add atomic_fetch_add
154+#define arch_atomic_fetch_add_acquire atomic_fetch_add_acquire
155+#define arch_atomic_fetch_add_release atomic_fetch_add_release
156+#define arch_atomic_fetch_add_relaxed atomic_fetch_add_relaxed
157+
140158 #ifndef atomic_fetch_add_relaxed
141159 #define atomic_fetch_add_acquire atomic_fetch_add
142160 #define atomic_fetch_add_release atomic_fetch_add
@@ -179,6 +197,13 @@ atomic_fetch_add(int i, atomic_t *v) · 36 unmodified lines
179197
180198 #endif /* atomic_fetch_add_relaxed */
181199
200+#define arch_atomic_sub atomic_sub
201+
202+#define arch_atomic_sub_return atomic_sub_return
203+#define arch_atomic_sub_return_acquire atomic_sub_return_acquire
204+#define arch_atomic_sub_return_release atomic_sub_return_release
205+#define arch_atomic_sub_return_relaxed atomic_sub_return_relaxed
206+
182207 #ifndef atomic_sub_return_relaxed
183208 #define atomic_sub_return_acquire atomic_sub_return
184209 #define atomic_sub_return_release atomic_sub_return
@@ -221,6 +246,11 @@ atomic_sub_return(int i, atomic_t *v) · 36 unmodified lines
221246
222247 #endif /* atomic_sub_return_relaxed */
223248
249+#define arch_atomic_fetch_sub atomic_fetch_sub
250+#define arch_atomic_fetch_sub_acquire atomic_fetch_sub_acquire
251+#define arch_atomic_fetch_sub_release atomic_fetch_sub_release
252+#define arch_atomic_fetch_sub_relaxed atomic_fetch_sub_relaxed
253+
224254 #ifndef atomic_fetch_sub_relaxed
225255 #define atomic_fetch_sub_acquire atomic_fetch_sub
226256 #define atomic_fetch_sub_release atomic_fetch_sub
@@ -263,6 +293,8 @@ atomic_fetch_sub(int i, atomic_t *v) · 36 unmodified lines
263293
264294 #endif /* atomic_fetch_sub_relaxed */
265295
296+#define arch_atomic_inc atomic_inc
297+
266298 #ifndef atomic_inc
267299 static __always_inline void
268300 atomic_inc(atomic_t *v)
@@ -272,6 +304,11 @@ atomic_inc(atomic_t *v) · 3 unmodified lines
272304 #define atomic_inc atomic_inc
273305 #endif
274306
307+#define arch_atomic_inc_return atomic_inc_return
308+#define arch_atomic_inc_return_acquire atomic_inc_return_acquire
309+#define arch_atomic_inc_return_release atomic_inc_return_release
310+#define arch_atomic_inc_return_relaxed atomic_inc_return_relaxed
311+
275312 #ifndef atomic_inc_return_relaxed
276313 #ifdef atomic_inc_return
277314 #define atomic_inc_return_acquire atomic_inc_return
@@ -353,6 +390,11 @@ atomic_inc_return(atomic_t *v) · 75 unmodified lines
353390
354391 #endif /* atomic_inc_return_relaxed */
355392
393+#define arch_atomic_fetch_inc atomic_fetch_inc
394+#define arch_atomic_fetch_inc_acquire atomic_fetch_inc_acquire
395+#define arch_atomic_fetch_inc_release atomic_fetch_inc_release
396+#define arch_atomic_fetch_inc_relaxed atomic_fetch_inc_relaxed
397+
356398 #ifndef atomic_fetch_inc_relaxed
357399 #ifdef atomic_fetch_inc
358400 #define atomic_fetch_inc_acquire atomic_fetch_inc
@@ -434,6 +476,8 @@ atomic_fetch_inc(atomic_t *v) · 75 unmodified lines
434476
435477 #endif /* atomic_fetch_inc_relaxed */
436478
479+#define arch_atomic_dec atomic_dec
480+
437481 #ifndef atomic_dec
438482 static __always_inline void
439483 atomic_dec(atomic_t *v)
@@ -443,6 +487,11 @@ atomic_dec(atomic_t *v) · 3 unmodified lines
443487 #define atomic_dec atomic_dec
444488 #endif
445489
490+#define arch_atomic_dec_return atomic_dec_return
491+#define arch_atomic_dec_return_acquire atomic_dec_return_acquire
492+#define arch_atomic_dec_return_release atomic_dec_return_release
493+#define arch_atomic_dec_return_relaxed atomic_dec_return_relaxed
494+
446495 #ifndef atomic_dec_return_relaxed
447496 #ifdef atomic_dec_return
448497 #define atomic_dec_return_acquire atomic_dec_return
@@ -524,6 +573,11 @@ atomic_dec_return(atomic_t *v) · 75 unmodified lines
524573
525574 #endif /* atomic_dec_return_relaxed */
526575
576+#define arch_atomic_fetch_dec atomic_fetch_dec
577+#define arch_atomic_fetch_dec_acquire atomic_fetch_dec_acquire
578+#define arch_atomic_fetch_dec_release atomic_fetch_dec_release
579+#define arch_atomic_fetch_dec_relaxed atomic_fetch_dec_relaxed
580+
527581 #ifndef atomic_fetch_dec_relaxed
528582 #ifdef atomic_fetch_dec
529583 #define atomic_fetch_dec_acquire atomic_fetch_dec
@@ -605,6 +659,13 @@ atomic_fetch_dec(atomic_t *v) · 75 unmodified lines
605659
606660 #endif /* atomic_fetch_dec_relaxed */
607661
662+#define arch_atomic_and atomic_and
663+
664+#define arch_atomic_fetch_and atomic_fetch_and
665+#define arch_atomic_fetch_and_acquire atomic_fetch_and_acquire
666+#define arch_atomic_fetch_and_release atomic_fetch_and_release
667+#define arch_atomic_fetch_and_relaxed atomic_fetch_and_relaxed
668+
608669 #ifndef atomic_fetch_and_relaxed
609670 #define atomic_fetch_and_acquire atomic_fetch_and
610671 #define atomic_fetch_and_release atomic_fetch_and
@@ -647,6 +708,8 @@ atomic_fetch_and(int i, atomic_t *v) · 36 unmodified lines
647708
648709 #endif /* atomic_fetch_and_relaxed */
649710
711+#define arch_atomic_andnot atomic_andnot
712+
650713 #ifndef atomic_andnot
651714 static __always_inline void
652715 atomic_andnot(int i, atomic_t *v)
@@ -656,6 +719,11 @@ atomic_andnot(int i, atomic_t *v) · 3 unmodified lines
656719 #define atomic_andnot atomic_andnot
657720 #endif
658721
722+#define arch_atomic_fetch_andnot atomic_fetch_andnot
723+#define arch_atomic_fetch_andnot_acquire atomic_fetch_andnot_acquire
724+#define arch_atomic_fetch_andnot_release atomic_fetch_andnot_release
725+#define arch_atomic_fetch_andnot_relaxed atomic_fetch_andnot_relaxed
726+
659727 #ifndef atomic_fetch_andnot_relaxed
660728 #ifdef atomic_fetch_andnot
661729 #define atomic_fetch_andnot_acquire atomic_fetch_andnot
@@ -737,6 +805,13 @@ atomic_fetch_andnot(int i, atomic_t *v) · 75 unmodified lines
737805
738806 #endif /* atomic_fetch_andnot_relaxed */
739807
808+#define arch_atomic_or atomic_or
809+
810+#define arch_atomic_fetch_or atomic_fetch_or
811+#define arch_atomic_fetch_or_acquire atomic_fetch_or_acquire
812+#define arch_atomic_fetch_or_release atomic_fetch_or_release
813+#define arch_atomic_fetch_or_relaxed atomic_fetch_or_relaxed
814+
740815 #ifndef atomic_fetch_or_relaxed
741816 #define atomic_fetch_or_acquire atomic_fetch_or
742817 #define atomic_fetch_or_release atomic_fetch_or
@@ -779,6 +854,13 @@ atomic_fetch_or(int i, atomic_t *v) · 36 unmodified lines
779854
780855 #endif /* atomic_fetch_or_relaxed */
781856
857+#define arch_atomic_xor atomic_xor
858+
859+#define arch_atomic_fetch_xor atomic_fetch_xor
860+#define arch_atomic_fetch_xor_acquire atomic_fetch_xor_acquire
861+#define arch_atomic_fetch_xor_release atomic_fetch_xor_release
862+#define arch_atomic_fetch_xor_relaxed atomic_fetch_xor_relaxed
863+
782864 #ifndef atomic_fetch_xor_relaxed
783865 #define atomic_fetch_xor_acquire atomic_fetch_xor
784866 #define atomic_fetch_xor_release atomic_fetch_xor
@@ -821,6 +903,11 @@ atomic_fetch_xor(int i, atomic_t *v) · 36 unmodified lines
821903
822904 #endif /* atomic_fetch_xor_relaxed */
823905
906+#define arch_atomic_xchg atomic_xchg
907+#define arch_atomic_xchg_acquire atomic_xchg_acquire
908+#define arch_atomic_xchg_release atomic_xchg_release
909+#define arch_atomic_xchg_relaxed atomic_xchg_relaxed
910+
824911 #ifndef atomic_xchg_relaxed
825912 #define atomic_xchg_acquire atomic_xchg
826913 #define atomic_xchg_release atomic_xchg
@@ -863,6 +950,11 @@ atomic_xchg(atomic_t *v, int i) · 36 unmodified lines
863950
864951 #endif /* atomic_xchg_relaxed */
865952
953+#define arch_atomic_cmpxchg atomic_cmpxchg
954+#define arch_atomic_cmpxchg_acquire atomic_cmpxchg_acquire
955+#define arch_atomic_cmpxchg_release atomic_cmpxchg_release
956+#define arch_atomic_cmpxchg_relaxed atomic_cmpxchg_relaxed
957+
866958 #ifndef atomic_cmpxchg_relaxed
867959 #define atomic_cmpxchg_acquire atomic_cmpxchg
868960 #define atomic_cmpxchg_release atomic_cmpxchg
@@ -905,6 +997,11 @@ atomic_cmpxchg(atomic_t *v, int old, int new) · 36 unmodified lines
905997
906998 #endif /* atomic_cmpxchg_relaxed */
907999
1000+#define arch_atomic_try_cmpxchg atomic_try_cmpxchg
1001+#define arch_atomic_try_cmpxchg_acquire atomic_try_cmpxchg_acquire
1002+#define arch_atomic_try_cmpxchg_release atomic_try_cmpxchg_release
1003+#define arch_atomic_try_cmpxchg_relaxed atomic_try_cmpxchg_relaxed
1004+
9081005 #ifndef atomic_try_cmpxchg_relaxed
9091006 #ifdef atomic_try_cmpxchg
9101007 #define atomic_try_cmpxchg_acquire atomic_try_cmpxchg
@@ -1002,6 +1099,8 @@ atomic_try_cmpxchg(atomic_t *v, int *old, int new) · 91 unmodified lines
10021099
10031100 #endif /* atomic_try_cmpxchg_relaxed */
10041101
1102+#define arch_atomic_sub_and_test atomic_sub_and_test
1103+
10051104 #ifndef atomic_sub_and_test
10061105 /**
10071106 * atomic_sub_and_test - subtract value from variable and test result
@@ -1020,6 +1119,8 @@ atomic_sub_and_test(int i, atomic_t *v) · 12 unmodified lines
10201119 #define atomic_sub_and_test atomic_sub_and_test
10211120 #endif
10221121
1122+#define arch_atomic_dec_and_test atomic_dec_and_test
1123+
10231124 #ifndef atomic_dec_and_test
10241125 /**
10251126 * atomic_dec_and_test - decrement and test
@@ -1037,6 +1138,8 @@ atomic_dec_and_test(atomic_t *v) · 11 unmodified lines
10371138 #define atomic_dec_and_test atomic_dec_and_test
10381139 #endif
10391140
1141+#define arch_atomic_inc_and_test atomic_inc_and_test
1142+
10401143 #ifndef atomic_inc_and_test
10411144 /**
10421145 * atomic_inc_and_test - increment and test
@@ -1054,6 +1157,8 @@ atomic_inc_and_test(atomic_t *v) · 11 unmodified lines
10541157 #define atomic_inc_and_test atomic_inc_and_test
10551158 #endif
10561159
1160+#define arch_atomic_add_negative atomic_add_negative
1161+
10571162 #ifndef atomic_add_negative
10581163 /**
10591164 * atomic_add_negative - add and test if negative
@@ -1072,6 +1177,8 @@ atomic_add_negative(int i, atomic_t *v) · 12 unmodified lines
10721177 #define atomic_add_negative atomic_add_negative
10731178 #endif
10741179
1180+#define arch_atomic_fetch_add_unless atomic_fetch_add_unless
1181+
10751182 #ifndef atomic_fetch_add_unless
10761183 /**
10771184 * atomic_fetch_add_unless - add unless the number is already a given value
@@ -1097,6 +1204,8 @@ atomic_fetch_add_unless(atomic_t *v, int a, int u) · 19 unmodified lines
10971204 #define atomic_fetch_add_unless atomic_fetch_add_unless
10981205 #endif
10991206
1207+#define arch_atomic_add_unless atomic_add_unless
1208+
11001209 #ifndef atomic_add_unless
11011210 /**
11021211 * atomic_add_unless - add unless the number is already a given value
@@ -1115,6 +1224,8 @@ atomic_add_unless(atomic_t *v, int a, int u) · 12 unmodified lines
11151224 #define atomic_add_unless atomic_add_unless
11161225 #endif
11171226
1227+#define arch_atomic_inc_not_zero atomic_inc_not_zero
1228+
11181229 #ifndef atomic_inc_not_zero
11191230 /**
11201231 * atomic_inc_not_zero - increment unless the number is zero
@@ -1131,6 +1242,8 @@ atomic_inc_not_zero(atomic_t *v) · 10 unmodified lines
11311242 #define atomic_inc_not_zero atomic_inc_not_zero
11321243 #endif
11331244
1245+#define arch_atomic_inc_unless_negative atomic_inc_unless_negative
1246+
11341247 #ifndef atomic_inc_unless_negative
11351248 static __always_inline bool
11361249 atomic_inc_unless_negative(atomic_t *v)
@@ -1147,6 +1260,8 @@ atomic_inc_unless_negative(atomic_t *v) · 10 unmodified lines
11471260 #define atomic_inc_unless_negative atomic_inc_unless_negative
11481261 #endif
11491262
1263+#define arch_atomic_dec_unless_positive atomic_dec_unless_positive
1264+
11501265 #ifndef atomic_dec_unless_positive
11511266 static __always_inline bool
11521267 atomic_dec_unless_positive(atomic_t *v)
@@ -1163,6 +1278,8 @@ atomic_dec_unless_positive(atomic_t *v) · 10 unmodified lines
11631278 #define atomic_dec_unless_positive atomic_dec_unless_positive
11641279 #endif
11651280
1281+#define arch_atomic_dec_if_positive atomic_dec_if_positive
1282+
11661283 #ifndef atomic_dec_if_positive
11671284 static __always_inline int
11681285 atomic_dec_if_positive(atomic_t *v)
@@ -1184,6 +1301,9 @@ atomic_dec_if_positive(atomic_t *v) · 15 unmodified lines
11841301 #include <asm-generic/atomic64.h>
11851302 #endif
11861303
1304+#define arch_atomic64_read atomic64_read
1305+#define arch_atomic64_read_acquire atomic64_read_acquire
1306+
11871307 #ifndef atomic64_read_acquire
11881308 static __always_inline s64
11891309 atomic64_read_acquire(const atomic64_t *v)
@@ -1193,6 +1313,9 @@ atomic64_read_acquire(const atomic64_t *v) · 3 unmodified lines
11931313 #define atomic64_read_acquire atomic64_read_acquire
11941314 #endif
11951315
1316+#define arch_atomic64_set atomic64_set
1317+#define arch_atomic64_set_release atomic64_set_release
1318+
11961319 #ifndef atomic64_set_release
11971320 static __always_inline void
11981321 atomic64_set_release(atomic64_t *v, s64 i)
@@ -1202,6 +1325,13 @@ atomic64_set_release(atomic64_t *v, s64 i) · 3 unmodified lines
12021325 #define atomic64_set_release atomic64_set_release
12031326 #endif
12041327
1328+#define arch_atomic64_add atomic64_add
1329+
1330+#define arch_atomic64_add_return atomic64_add_return
1331+#define arch_atomic64_add_return_acquire atomic64_add_return_acquire
1332+#define arch_atomic64_add_return_release atomic64_add_return_release
1333+#define arch_atomic64_add_return_relaxed atomic64_add_return_relaxed
1334+
12051335 #ifndef atomic64_add_return_relaxed
12061336 #define atomic64_add_return_acquire atomic64_add_return
12071337 #define atomic64_add_return_release atomic64_add_return
@@ -1244,6 +1374,11 @@ atomic64_add_return(s64 i, atomic64_t *v) · 36 unmodified lines
12441374
12451375 #endif /* atomic64_add_return_relaxed */
12461376
1377+#define arch_atomic64_fetch_add atomic64_fetch_add
1378+#define arch_atomic64_fetch_add_acquire atomic64_fetch_add_acquire
1379+#define arch_atomic64_fetch_add_release atomic64_fetch_add_release
1380+#define arch_atomic64_fetch_add_relaxed atomic64_fetch_add_relaxed
1381+
12471382 #ifndef atomic64_fetch_add_relaxed
12481383 #define atomic64_fetch_add_acquire atomic64_fetch_add
12491384 #define atomic64_fetch_add_release atomic64_fetch_add
@@ -1286,6 +1421,13 @@ atomic64_fetch_add(s64 i, atomic64_t *v) · 36 unmodified lines
12861421
12871422 #endif /* atomic64_fetch_add_relaxed */
12881423
1424+#define arch_atomic64_sub atomic64_sub
1425+
1426+#define arch_atomic64_sub_return atomic64_sub_return
1427+#define arch_atomic64_sub_return_acquire atomic64_sub_return_acquire
1428+#define arch_atomic64_sub_return_release atomic64_sub_return_release
1429+#define arch_atomic64_sub_return_relaxed atomic64_sub_return_relaxed
1430+
12891431 #ifndef atomic64_sub_return_relaxed
12901432 #define atomic64_sub_return_acquire atomic64_sub_return
12911433 #define atomic64_sub_return_release atomic64_sub_return
@@ -1328,6 +1470,11 @@ atomic64_sub_return(s64 i, atomic64_t *v) · 36 unmodified lines
13281470
13291471 #endif /* atomic64_sub_return_relaxed */
13301472
1473+#define arch_atomic64_fetch_sub atomic64_fetch_sub
1474+#define arch_atomic64_fetch_sub_acquire atomic64_fetch_sub_acquire
1475+#define arch_atomic64_fetch_sub_release atomic64_fetch_sub_release
1476+#define arch_atomic64_fetch_sub_relaxed atomic64_fetch_sub_relaxed
1477+
13311478 #ifndef atomic64_fetch_sub_relaxed
13321479 #define atomic64_fetch_sub_acquire atomic64_fetch_sub
13331480 #define atomic64_fetch_sub_release atomic64_fetch_sub
@@ -1370,6 +1517,8 @@ atomic64_fetch_sub(s64 i, atomic64_t *v) · 36 unmodified lines
13701517
13711518 #endif /* atomic64_fetch_sub_relaxed */
13721519
1520+#define arch_atomic64_inc atomic64_inc
1521+
13731522 #ifndef atomic64_inc
13741523 static __always_inline void
13751524 atomic64_inc(atomic64_t *v)
@@ -1379,6 +1528,11 @@ atomic64_inc(atomic64_t *v) · 3 unmodified lines
13791528 #define atomic64_inc atomic64_inc
13801529 #endif
13811530
1531+#define arch_atomic64_inc_return atomic64_inc_return
1532+#define arch_atomic64_inc_return_acquire atomic64_inc_return_acquire
1533+#define arch_atomic64_inc_return_release atomic64_inc_return_release
1534+#define arch_atomic64_inc_return_relaxed atomic64_inc_return_relaxed
1535+
13821536 #ifndef atomic64_inc_return_relaxed
13831537 #ifdef atomic64_inc_return
13841538 #define atomic64_inc_return_acquire atomic64_inc_return
@@ -1460,6 +1614,11 @@ atomic64_inc_return(atomic64_t *v) · 75 unmodified lines
14601614
14611615 #endif /* atomic64_inc_return_relaxed */
14621616
1617+#define arch_atomic64_fetch_inc atomic64_fetch_inc
1618+#define arch_atomic64_fetch_inc_acquire atomic64_fetch_inc_acquire
1619+#define arch_atomic64_fetch_inc_release atomic64_fetch_inc_release
1620+#define arch_atomic64_fetch_inc_relaxed atomic64_fetch_inc_relaxed
1621+
14631622 #ifndef atomic64_fetch_inc_relaxed
14641623 #ifdef atomic64_fetch_inc
14651624 #define atomic64_fetch_inc_acquire atomic64_fetch_inc
@@ -1541,6 +1700,8 @@ atomic64_fetch_inc(atomic64_t *v) · 75 unmodified lines
15411700
15421701 #endif /* atomic64_fetch_inc_relaxed */
15431702
1703+#define arch_atomic64_dec atomic64_dec
1704+
15441705 #ifndef atomic64_dec
15451706 static __always_inline void
15461707 atomic64_dec(atomic64_t *v)
@@ -1550,6 +1711,11 @@ atomic64_dec(atomic64_t *v) · 3 unmodified lines
15501711 #define atomic64_dec atomic64_dec
15511712 #endif
15521713
1714+#define arch_atomic64_dec_return atomic64_dec_return
1715+#define arch_atomic64_dec_return_acquire atomic64_dec_return_acquire
1716+#define arch_atomic64_dec_return_release atomic64_dec_return_release
1717+#define arch_atomic64_dec_return_relaxed atomic64_dec_return_relaxed
1718+
15531719 #ifndef atomic64_dec_return_relaxed
15541720 #ifdef atomic64_dec_return
15551721 #define atomic64_dec_return_acquire atomic64_dec_return
@@ -1631,6 +1797,11 @@ atomic64_dec_return(atomic64_t *v) · 75 unmodified lines
16311797
16321798 #endif /* atomic64_dec_return_relaxed */
16331799
1800+#define arch_atomic64_fetch_dec atomic64_fetch_dec
1801+#define arch_atomic64_fetch_dec_acquire atomic64_fetch_dec_acquire
1802+#define arch_atomic64_fetch_dec_release atomic64_fetch_dec_release
1803+#define arch_atomic64_fetch_dec_relaxed atomic64_fetch_dec_relaxed
1804+
16341805 #ifndef atomic64_fetch_dec_relaxed
16351806 #ifdef atomic64_fetch_dec
16361807 #define atomic64_fetch_dec_acquire atomic64_fetch_dec
@@ -1712,6 +1883,13 @@ atomic64_fetch_dec(atomic64_t *v) · 75 unmodified lines
17121883
17131884 #endif /* atomic64_fetch_dec_relaxed */
17141885
1886+#define arch_atomic64_and atomic64_and
1887+
1888+#define arch_atomic64_fetch_and atomic64_fetch_and
1889+#define arch_atomic64_fetch_and_acquire atomic64_fetch_and_acquire
1890+#define arch_atomic64_fetch_and_release atomic64_fetch_and_release
1891+#define arch_atomic64_fetch_and_relaxed atomic64_fetch_and_relaxed
1892+
17151893 #ifndef atomic64_fetch_and_relaxed
17161894 #define atomic64_fetch_and_acquire atomic64_fetch_and
17171895 #define atomic64_fetch_and_release atomic64_fetch_and
@@ -1754,6 +1932,8 @@ atomic64_fetch_and(s64 i, atomic64_t *v) · 36 unmodified lines
17541932
17551933 #endif /* atomic64_fetch_and_relaxed */
17561934
1935+#define arch_atomic64_andnot atomic64_andnot
1936+
17571937 #ifndef atomic64_andnot
17581938 static __always_inline void
17591939 atomic64_andnot(s64 i, atomic64_t *v)
@@ -1763,6 +1943,11 @@ atomic64_andnot(s64 i, atomic64_t *v) · 3 unmodified lines
17631943 #define atomic64_andnot atomic64_andnot
17641944 #endif
17651945
1946+#define arch_atomic64_fetch_andnot atomic64_fetch_andnot
1947+#define arch_atomic64_fetch_andnot_acquire atomic64_fetch_andnot_acquire
1948+#define arch_atomic64_fetch_andnot_release atomic64_fetch_andnot_release
1949+#define arch_atomic64_fetch_andnot_relaxed atomic64_fetch_andnot_relaxed
1950+
17661951 #ifndef atomic64_fetch_andnot_relaxed
17671952 #ifdef atomic64_fetch_andnot
17681953 #define atomic64_fetch_andnot_acquire atomic64_fetch_andnot
@@ -1844,6 +2029,13 @@ atomic64_fetch_andnot(s64 i, atomic64_t *v) · 75 unmodified lines
18442029
18452030 #endif /* atomic64_fetch_andnot_relaxed */
18462031
2032+#define arch_atomic64_or atomic64_or
2033+
2034+#define arch_atomic64_fetch_or atomic64_fetch_or
2035+#define arch_atomic64_fetch_or_acquire atomic64_fetch_or_acquire
2036+#define arch_atomic64_fetch_or_release atomic64_fetch_or_release
2037+#define arch_atomic64_fetch_or_relaxed atomic64_fetch_or_relaxed
2038+
18472039 #ifndef atomic64_fetch_or_relaxed
18482040 #define atomic64_fetch_or_acquire atomic64_fetch_or
18492041 #define atomic64_fetch_or_release atomic64_fetch_or
@@ -1886,6 +2078,13 @@ atomic64_fetch_or(s64 i, atomic64_t *v) · 36 unmodified lines
18862078
18872079 #endif /* atomic64_fetch_or_relaxed */
18882080
2081+#define arch_atomic64_xor atomic64_xor
2082+
2083+#define arch_atomic64_fetch_xor atomic64_fetch_xor
2084+#define arch_atomic64_fetch_xor_acquire atomic64_fetch_xor_acquire
2085+#define arch_atomic64_fetch_xor_release atomic64_fetch_xor_release
2086+#define arch_atomic64_fetch_xor_relaxed atomic64_fetch_xor_relaxed
2087+
18892088 #ifndef atomic64_fetch_xor_relaxed
18902089 #define atomic64_fetch_xor_acquire atomic64_fetch_xor
18912090 #define atomic64_fetch_xor_release atomic64_fetch_xor
@@ -1928,6 +2127,11 @@ atomic64_fetch_xor(s64 i, atomic64_t *v) · 36 unmodified lines
19282127
19292128 #endif /* atomic64_fetch_xor_relaxed */
19302129
2130+#define arch_atomic64_xchg atomic64_xchg
2131+#define arch_atomic64_xchg_acquire atomic64_xchg_acquire
2132+#define arch_atomic64_xchg_release atomic64_xchg_release
2133+#define arch_atomic64_xchg_relaxed atomic64_xchg_relaxed
2134+
19312135 #ifndef atomic64_xchg_relaxed
19322136 #define atomic64_xchg_acquire atomic64_xchg
19332137 #define atomic64_xchg_release atomic64_xchg
@@ -1970,6 +2174,11 @@ atomic64_xchg(atomic64_t *v, s64 i) · 36 unmodified lines
19702174
19712175 #endif /* atomic64_xchg_relaxed */
19722176
2177+#define arch_atomic64_cmpxchg atomic64_cmpxchg
2178+#define arch_atomic64_cmpxchg_acquire atomic64_cmpxchg_acquire
2179+#define arch_atomic64_cmpxchg_release atomic64_cmpxchg_release
2180+#define arch_atomic64_cmpxchg_relaxed atomic64_cmpxchg_relaxed
2181+
19732182 #ifndef atomic64_cmpxchg_relaxed
19742183 #define atomic64_cmpxchg_acquire atomic64_cmpxchg
19752184 #define atomic64_cmpxchg_release atomic64_cmpxchg
@@ -2012,6 +2221,11 @@ atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new) · 36 unmodified lines
20122221
20132222 #endif /* atomic64_cmpxchg_relaxed */
20142223
2224+#define arch_atomic64_try_cmpxchg atomic64_try_cmpxchg
2225+#define arch_atomic64_try_cmpxchg_acquire atomic64_try_cmpxchg_acquire
2226+#define arch_atomic64_try_cmpxchg_release atomic64_try_cmpxchg_release
2227+#define arch_atomic64_try_cmpxchg_relaxed atomic64_try_cmpxchg_relaxed
2228+
20152229 #ifndef atomic64_try_cmpxchg_relaxed
20162230 #ifdef atomic64_try_cmpxchg
20172231 #define atomic64_try_cmpxchg_acquire atomic64_try_cmpxchg
@@ -2109,6 +2323,8 @@ atomic64_try_cmpxchg(atomic64_t *v, s64 *old, s64 new) · 91 unmodified lines
21092323
21102324 #endif /* atomic64_try_cmpxchg_relaxed */
21112325
2326+#define arch_atomic64_sub_and_test atomic64_sub_and_test
2327+
21122328 #ifndef atomic64_sub_and_test
21132329 /**
21142330 * atomic64_sub_and_test - subtract value from variable and test result
@@ -2127,6 +2343,8 @@ atomic64_sub_and_test(s64 i, atomic64_t *v) · 12 unmodified lines
21272343 #define atomic64_sub_and_test atomic64_sub_and_test
21282344 #endif
21292345
2346+#define arch_atomic64_dec_and_test atomic64_dec_and_test
2347+
21302348 #ifndef atomic64_dec_and_test
21312349 /**
21322350 * atomic64_dec_and_test - decrement and test
@@ -2144,6 +2362,8 @@ atomic64_dec_and_test(atomic64_t *v) · 11 unmodified lines
21442362 #define atomic64_dec_and_test atomic64_dec_and_test
21452363 #endif
21462364
2365+#define arch_atomic64_inc_and_test atomic64_inc_and_test
2366+
21472367 #ifndef atomic64_inc_and_test
21482368 /**
21492369 * atomic64_inc_and_test - increment and test
@@ -2161,6 +2381,8 @@ atomic64_inc_and_test(atomic64_t *v) · 11 unmodified lines
21612381 #define atomic64_inc_and_test atomic64_inc_and_test
21622382 #endif
21632383
2384+#define arch_atomic64_add_negative atomic64_add_negative
2385+
21642386 #ifndef atomic64_add_negative
21652387 /**
21662388 * atomic64_add_negative - add and test if negative
@@ -2179,6 +2401,8 @@ atomic64_add_negative(s64 i, atomic64_t *v) · 12 unmodified lines
21792401 #define atomic64_add_negative atomic64_add_negative
21802402 #endif
21812403
2404+#define arch_atomic64_fetch_add_unless atomic64_fetch_add_unless
2405+
21822406 #ifndef atomic64_fetch_add_unless
21832407 /**
21842408 * atomic64_fetch_add_unless - add unless the number is already a given value
@@ -2204,6 +2428,8 @@ atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u) · 19 unmodified lines
22042428 #define atomic64_fetch_add_unless atomic64_fetch_add_unless
22052429 #endif
22062430
2431+#define arch_atomic64_add_unless atomic64_add_unless
2432+
22072433 #ifndef atomic64_add_unless
22082434 /**
22092435 * atomic64_add_unless - add unless the number is already a given value
@@ -2222,6 +2448,8 @@ atomic64_add_unless(atomic64_t *v, s64 a, s64 u) · 12 unmodified lines
22222448 #define atomic64_add_unless atomic64_add_unless
22232449 #endif
22242450
2451+#define arch_atomic64_inc_not_zero atomic64_inc_not_zero
2452+
22252453 #ifndef atomic64_inc_not_zero
22262454 /**
22272455 * atomic64_inc_not_zero - increment unless the number is zero
@@ -2238,6 +2466,8 @@ atomic64_inc_not_zero(atomic64_t *v) · 10 unmodified lines
22382466 #define atomic64_inc_not_zero atomic64_inc_not_zero
22392467 #endif
22402468
2469+#define arch_atomic64_inc_unless_negative atomic64_inc_unless_negative
2470+
22412471 #ifndef atomic64_inc_unless_negative
22422472 static __always_inline bool
22432473 atomic64_inc_unless_negative(atomic64_t *v)
@@ -2254,6 +2484,8 @@ atomic64_inc_unless_negative(atomic64_t *v) · 10 unmodified lines
22542484 #define atomic64_inc_unless_negative atomic64_inc_unless_negative
22552485 #endif
22562486
2487+#define arch_atomic64_dec_unless_positive atomic64_dec_unless_positive
2488+
22572489 #ifndef atomic64_dec_unless_positive
22582490 static __always_inline bool
22592491 atomic64_dec_unless_positive(atomic64_t *v)
@@ -2270,6 +2502,8 @@ atomic64_dec_unless_positive(atomic64_t *v) · 10 unmodified lines
22702502 #define atomic64_dec_unless_positive atomic64_dec_unless_positive
22712503 #endif
22722504
2505+#define arch_atomic64_dec_if_positive atomic64_dec_if_positive
2506+
22732507 #ifndef atomic64_dec_if_positive
22742508 static __always_inline s64
22752509 atomic64_dec_if_positive(atomic64_t *v)
@@ -2288,4 +2522,4 @@ atomic64_dec_if_positive(atomic64_t *v) · 12 unmodified lines
22882522 #endif
22892523
22902524 #endif /* _LINUX_ATOMIC_FALLBACK_H */
2291−// 1fac0941c79bf0ae100723cc2ac9b94061f0b67a
2525+// 9d95b56f98d82a2a26c7b79ccdd0c47572d50a6f
include/linux/blkdev.h+1−0
@@ -590,6 +590,7 @@ struct request_queue { · 589 unmodified lines
590590 u64 write_hints[BLK_MAX_WRITE_HINTS];
591591 };
592592
593+/* Keep blk_queue_flag_name[] in sync with the definitions below */
593594 #define QUEUE_FLAG_STOPPED 0 /* queue is stopped */
594595 #define QUEUE_FLAG_DYING 1 /* queue being torn down */
595596 #define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */
include/linux/can/skb.h+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 struct can_skb_priv {
3535 int ifindex;
3636 int skbcnt;
37− struct can_frame cf[0];
37+ struct can_frame cf[];
3838 };
3939
4040 static inline struct can_skb_priv *can_skb_prv(struct sk_buff *skb)
include/linux/cb710.h+1−1
@@ -36,7 +36,7 @@ struct cb710_chip { · 35 unmodified lines
3636 unsigned slot_mask;
3737 unsigned slots;
3838 spinlock_t irq_lock;
39− struct cb710_slot slot[0];
39+ struct cb710_slot slot[];
4040 };
4141
4242 /* NOTE: cb710_chip.slots is modified only during device init/exit and
include/linux/ceph/libceph.h+2−2
@@ -52,8 +52,7 @@ struct ceph_options { · 51 unmodified lines
5252 unsigned long osd_idle_ttl; /* jiffies */
5353 unsigned long osd_keepalive_timeout; /* jiffies */
5454 unsigned long osd_request_timeout; /* jiffies */
55−
56− u32 osd_req_flags; /* CEPH_OSD_FLAG_*, applied to each OSD request */
55+ u32 read_from_replica; /* CEPH_OSD_FLAG_BALANCE/LOCALIZE_READS */
5756
5857 /*
5958 * any type that can't be simply compared or doesn't need
@@ -76,6 +75,7 @@ struct ceph_options { · 16 unmodified lines
7675 #define CEPH_OSD_KEEPALIVE_DEFAULT msecs_to_jiffies(5 * 1000)
7776 #define CEPH_OSD_IDLE_TTL_DEFAULT msecs_to_jiffies(60 * 1000)
7877 #define CEPH_OSD_REQUEST_TIMEOUT_DEFAULT 0 /* no timeout */
78+#define CEPH_READ_FROM_REPLICA_DEFAULT 0 /* read from primary */
7979
8080 #define CEPH_MONC_HUNT_INTERVAL msecs_to_jiffies(3 * 1000)
8181 #define CEPH_MONC_PING_INTERVAL msecs_to_jiffies(10 * 1000)
include/linux/compiler-clang.h+8−0
@@ -33,6 +33,14 @@ · 32 unmodified lines
3333 #define __no_sanitize_thread
3434 #endif
3535
36+#if __has_feature(undefined_behavior_sanitizer)
37+/* GCC does not have __SANITIZE_UNDEFINED__ */
38+#define __no_sanitize_undefined \
39+ __attribute__((no_sanitize("undefined")))
40+#else
41+#define __no_sanitize_undefined
42+#endif
43+
3644 /*
3745 * Not all versions of clang implement the the type-generic versions
3846 * of the builtin overflow checkers. Fortunately, clang implements
include/linux/compiler-gcc.h+6−0
@@ -150,6 +150,12 @@ · 149 unmodified lines
150150 #define __no_sanitize_thread
151151 #endif
152152
153+#if __has_attribute(__no_sanitize_undefined__)
154+#define __no_sanitize_undefined __attribute__((no_sanitize_undefined))
155+#else
156+#define __no_sanitize_undefined
157+#endif
158+
153159 #if GCC_VERSION >= 50100
154160 #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
155161 #endif
include/linux/compiler.h+1−1
@@ -123,7 +123,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, · 122 unmodified lines
123123 #ifdef CONFIG_DEBUG_ENTRY
124124 /* Begin/end of an instrumentation safe region */
125125 #define instrumentation_begin() ({ \
126− asm volatile("%c0:\n\t" \
126+ asm volatile("%c0: nop\n\t" \
127127 ".pushsection .discard.instr_begin\n\t" \
128128 ".long %c0b - .\n\t" \
129129 ".popsection\n\t" : : "i" (__COUNTER__)); \
include/linux/compiler_attributes.h+1−0
@@ -40,6 +40,7 @@ · 39 unmodified lines
4040 # define __GCC4_has_attribute___noclone__ 1
4141 # define __GCC4_has_attribute___nonstring__ 0
4242 # define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
43+# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
4344 # define __GCC4_has_attribute___fallthrough__ 0
4445 #endif
4546
include/linux/compiler_types.h+10−12
@@ -5,20 +5,20 @@ · 4 unmodified lines
55 #ifndef __ASSEMBLY__
66
77 #ifdef __CHECKER__
8−# define __user __attribute__((noderef, address_space(1)))
98 # define __kernel __attribute__((address_space(0)))
9+# define __user __attribute__((noderef, address_space(__user)))
1010 # define __safe __attribute__((safe))
1111 # define __force __attribute__((force))
1212 # define __nocast __attribute__((nocast))
13−# define __iomem __attribute__((noderef, address_space(2)))
13+# define __iomem __attribute__((noderef, address_space(__iomem)))
1414 # define __must_hold(x) __attribute__((context(x,1,1)))
1515 # define __acquires(x) __attribute__((context(x,0,1)))
1616 # define __releases(x) __attribute__((context(x,1,0)))
1717 # define __acquire(x) __context__(x,1)
1818 # define __release(x) __context__(x,-1)
1919 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
20−# define __percpu __attribute__((noderef, address_space(3)))
21−# define __rcu __attribute__((noderef, address_space(4)))
20+# define __percpu __attribute__((noderef, address_space(__percpu)))
21+# define __rcu __attribute__((noderef, address_space(__rcu)))
2222 # define __private __attribute__((noderef))
2323 extern void __chk_user_ptr(const volatile void __user *);
2424 extern void __chk_io_ptr(const volatile void __iomem *);
@@ -118,10 +118,6 @@ struct ftrace_likely_data { · 93 unmodified lines
118118 #define notrace __attribute__((__no_instrument_function__))
119119 #endif
120120
121−/* Section for code which can't be instrumented at all */
122−#define noinstr \
123− noinline notrace __attribute((__section__(".noinstr.text")))
124−
125121 /*
126122 * it doesn't make sense on ARM (currently the only user of __naked)
127123 * to trace naked functions because then mcount is called without
@@ -193,16 +189,18 @@ struct ftrace_likely_data { · 65 unmodified lines
193189
194190 #define __no_kcsan __no_sanitize_thread
195191 #ifdef __SANITIZE_THREAD__
196−# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused
197−# define __no_sanitize_or_inline __no_kcsan_or_inline
198−#else
199−# define __no_kcsan_or_inline __always_inline
192+# define __no_sanitize_or_inline __no_kcsan notrace __maybe_unused
200193 #endif
201194
202195 #ifndef __no_sanitize_or_inline
203196 #define __no_sanitize_or_inline __always_inline
204197 #endif
205198
199+/* Section for code which can't be instrumented at all */
200+#define noinstr \
201+ noinline notrace __attribute((__section__(".noinstr.text"))) \
202+ __no_kcsan __no_sanitize_address
203+
206204 #endif /* __KERNEL__ */
207205
208206 #endif /* __ASSEMBLY__ */
include/linux/dma-direct.h+0−2
@@ -77,8 +77,6 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, · 76 unmodified lines
7777 dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs);
7878 void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,
7979 dma_addr_t dma_addr, unsigned long attrs);
80−struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
81− gfp_t gfp, unsigned long attrs);
8280 int dma_direct_get_sgtable(struct device *dev, struct sg_table *sgt,
8381 void *cpu_addr, dma_addr_t dma_addr, size_t size,
8482 unsigned long attrs);
include/linux/dmaengine.h+2−2
@@ -153,7 +153,7 @@ struct dma_interleaved_template { · 152 unmodified lines
153153 bool dst_sgl;
154154 size_t numf;
155155 size_t frame_size;
156− struct data_chunk sgl[0];
156+ struct data_chunk sgl[];
157157 };
158158
159159 /**
@@ -535,7 +535,7 @@ struct dmaengine_unmap_data { · 375 unmodified lines
535535 struct device *dev;
536536 struct kref kref;
537537 size_t len;
538− dma_addr_t addr[0];
538+ dma_addr_t addr[];
539539 };
540540
541541 struct dma_async_tx_descriptor;
include/linux/efi.h+3−5
@@ -350,6 +350,7 @@ void efi_native_runtime_setup(void); · 349 unmodified lines
350350 * associated with ConOut
351351 */
352352 #define LINUX_EFI_ARM_SCREEN_INFO_TABLE_GUID EFI_GUID(0xe03fc20a, 0x85dc, 0x406e, 0xb9, 0x0e, 0x4a, 0xb5, 0x02, 0x37, 0x1d, 0x95)
353+#define LINUX_EFI_ARM_CPU_STATE_TABLE_GUID EFI_GUID(0xef79e4aa, 0x3c3d, 0x4989, 0xb9, 0x02, 0x07, 0xa9, 0x43, 0xe5, 0x50, 0xd2)
353354 #define LINUX_EFI_LOADER_ENTRY_GUID EFI_GUID(0x4a67b082, 0x0a4c, 0x41cf, 0xb6, 0xc7, 0x44, 0x0b, 0x29, 0xbb, 0x8c, 0x4f)
354355 #define LINUX_EFI_RANDOM_SEED_TABLE_GUID EFI_GUID(0x1ce1e5bc, 0x7ceb, 0x42f2, 0x81, 0xe5, 0x8a, 0xad, 0xf1, 0x80, 0xf5, 0x7b)
355356 #define LINUX_EFI_TPM_EVENT_LOG_GUID EFI_GUID(0xb7799cb0, 0xeca2, 0x4943, 0x96, 0x67, 0x1f, 0xae, 0x07, 0xb7, 0x47, 0xfa)
@@ -1236,14 +1237,11 @@ struct linux_efi_memreserve { · 880 unmodified lines
12361237 struct {
12371238 phys_addr_t base;
12381239 phys_addr_t size;
1239− } entry[0];
1240+ } entry[];
12401241 };
12411242
1242−#define EFI_MEMRESERVE_SIZE(count) (sizeof(struct linux_efi_memreserve) + \
1243− (count) * sizeof(((struct linux_efi_memreserve *)0)->entry[0]))
1244−
12451243 #define EFI_MEMRESERVE_COUNT(size) (((size) - sizeof(struct linux_efi_memreserve)) \
1246− / sizeof(((struct linux_efi_memreserve *)0)->entry[0]))
1244+ / sizeof_field(struct linux_efi_memreserve, entry[0]))
12471245
12481246 void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
12491247
include/linux/fs.h+0−2
@@ -2592,7 +2592,6 @@ extern void bdput(struct block_device *); · 2591 unmodified lines
25922592 extern void invalidate_bdev(struct block_device *);
25932593 extern void iterate_bdevs(void (*)(struct block_device *, void *), void *);
25942594 extern int sync_blockdev(struct block_device *bdev);
2595−extern void kill_bdev(struct block_device *);
25962595 extern struct super_block *freeze_bdev(struct block_device *);
25972596 extern void emergency_thaw_all(void);
25982597 extern void emergency_thaw_bdev(struct super_block *sb);
@@ -2608,7 +2607,6 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) · 9 unmodified lines
26082607 #else
26092608 static inline void bd_forget(struct inode *inode) {}
26102609 static inline int sync_blockdev(struct block_device *bdev) { return 0; }
2611−static inline void kill_bdev(struct block_device *bdev) {}
26122610 static inline void invalidate_bdev(struct block_device *bdev) {}
26132611
26142612 static inline struct super_block *freeze_bdev(struct block_device *sb)
include/linux/fscache-cache.h+1−1
@@ -46,7 +46,7 @@ struct fscache_cache_tag { · 45 unmodified lines
4646 unsigned long flags;
4747 #define FSCACHE_TAG_RESERVED 0 /* T if tag is reserved for a cache */
4848 atomic_t usage;
49− char name[0]; /* tag name */
49+ char name[]; /* tag name */
5050 };
5151
5252 /*
include/linux/host1x.h+3−0
@@ -48,6 +48,9 @@ struct host1x_client_ops { · 47 unmodified lines
4848 * @channel: host1x channel associated with this client
4949 * @syncpts: array of syncpoints requested for this client
5050 * @num_syncpts: number of syncpoints requested for this client
51+ * @parent: pointer to parent structure
52+ * @usecount: reference count for this structure
53+ * @lock: mutex for mutually exclusive concurrency
5154 */
5255 struct host1x_client {
5356 struct list_head list;
include/linux/i2c.h+3−5
@@ -408,7 +408,7 @@ static inline bool i2c_detect_slave_mode(struct device *dev) { return false; } · 407 unmodified lines
408408 * that are present. This information is used to grow the driver model tree.
409409 * For mainboards this is done statically using i2c_register_board_info();
410410 * bus numbers identify adapters that aren't yet available. For add-on boards,
411− * i2c_new_device() does this dynamically with the adapter already known.
411+ * i2c_new_client_device() does this dynamically with the adapter already known.
412412 */
413413 struct i2c_board_info {
414414 char type[I2C_NAME_SIZE];
@@ -439,13 +439,11 @@ struct i2c_board_info { · 24 unmodified lines
439439
440440
441441 #if IS_ENABLED(CONFIG_I2C)
442−/* Add-on boards should register/unregister their devices; e.g. a board
442+/*
443+ * Add-on boards should register/unregister their devices; e.g. a board
443444 * with integrated I2C, a config eeprom, sensors, and a codec that's
444445 * used in conjunction with the primary hardware.
445446 */
446−struct i2c_client *
447−i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info);
448−
449447 struct i2c_client *
450448 i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *info);
451449
include/linux/intel-iommu.h+1−0
@@ -41,6 +41,7 @@ · 40 unmodified lines
4141 #define DMA_PTE_SNP BIT_ULL(11)
4242
4343 #define DMA_FL_PTE_PRESENT BIT_ULL(0)
44+#define DMA_FL_PTE_US BIT_ULL(2)
4445 #define DMA_FL_PTE_XD BIT_ULL(63)
4546
4647 #define ADDR_WIDTH_5LEVEL (57)
include/linux/irq_work.h+8−18
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #ifndef _LINUX_IRQ_WORK_H
33 #define _LINUX_IRQ_WORK_H
44
5−#include <linux/llist.h>
5+#include <linux/smp_types.h>
66
77 /*
88 * An entry can be in one of four states:
@@ -13,24 +13,14 @@ · 4 unmodified lines
1313 * busy NULL, 2 -> {free, claimed} : callback in progress, can be claimed
1414 */
1515
16−/* flags share CSD_FLAG_ space */
17−
18−#define IRQ_WORK_PENDING BIT(0)
19−#define IRQ_WORK_BUSY BIT(1)
20−
21−/* Doesn't want IPI, wait for tick: */
22−#define IRQ_WORK_LAZY BIT(2)
23−/* Run hard IRQ context, even on RT */
24−#define IRQ_WORK_HARD_IRQ BIT(3)
25−
26−#define IRQ_WORK_CLAIMED (IRQ_WORK_PENDING | IRQ_WORK_BUSY)
27−
28−/*
29− * structure shares layout with single_call_data_t.
30− */
3116 struct irq_work {
32− struct llist_node llnode;
33− atomic_t flags;
17+ union {
18+ struct __call_single_node node;
19+ struct {
20+ struct llist_node llnode;
21+ atomic_t flags;
22+ };
23+ };
3424 void (*func)(struct irq_work *);
3525 };
3626
include/linux/jbd2.h+5−1
@@ -765,6 +765,11 @@ struct journal_s · 764 unmodified lines
765765 */
766766 int j_errno;
767767
768+ /**
769+ * @j_abort_mutex: Lock the whole aborting procedure.
770+ */
771+ struct mutex j_abort_mutex;
772+
768773 /**
769774 * @j_sb_buffer: The first part of the superblock buffer.
770775 */
@@ -1247,7 +1252,6 @@ JBD2_FEATURE_INCOMPAT_FUNCS(csum3, CSUM_V3) · 476 unmodified lines
12471252 #define JBD2_ABORT_ON_SYNCDATA_ERR 0x040 /* Abort the journal on file
12481253 * data write error in ordered
12491254 * mode */
1250−#define JBD2_REC_ERR 0x080 /* The errno in the sb has been recorded */
12511255
12521256 /*
12531257 * Function declarations for the journaling transaction and buffer
include/linux/kexec.h+1−1
@@ -208,7 +208,7 @@ struct crash_mem_range { · 207 unmodified lines
208208 struct crash_mem {
209209 unsigned int max_nr_ranges;
210210 unsigned int nr_ranges;
211− struct crash_mem_range ranges[0];
211+ struct crash_mem_range ranges[];
212212 };
213213
214214 extern int crash_exclude_mem_range(struct crash_mem *mem,
include/linux/kgdb.h+2−3
@@ -276,8 +276,7 @@ struct kgdb_arch { · 275 unmodified lines
276276 * the I/O driver.
277277 * @post_exception: Pointer to a function that will do any cleanup work
278278 * for the I/O driver.
279− * @is_console: 1 if the end device is a console 0 if the I/O device is
280− * not a console
279+ * @cons: valid if the I/O device is a console; else NULL.
281280 */
282281 struct kgdb_io {
283282 const char *name;
@@ -288,7 +287,7 @@ struct kgdb_io { · 4 unmodified lines
288287 void (*deinit) (void);
289288 void (*pre_exception) (void);
290289 void (*post_exception) (void);
291− int is_console;
290+ struct console *cons;
292291 };
293292
294293 extern const struct kgdb_arch arch_kgdb_ops;
include/linux/kprobes.h+5−1
@@ -161,7 +161,7 @@ struct kretprobe_instance { · 160 unmodified lines
161161 kprobe_opcode_t *ret_addr;
162162 struct task_struct *task;
163163 void *fp;
164− char data[0];
164+ char data[];
165165 };
166166
167167 struct kretprobe_blackpoint {
@@ -350,6 +350,10 @@ static inline struct kprobe_ctlblk *get_kprobe_ctlblk(void) · 182 unmodified lines
350350 return this_cpu_ptr(&kprobe_ctlblk);
351351 }
352352
353+extern struct kprobe kprobe_busy;
354+void kprobe_busy_begin(void);
355+void kprobe_busy_end(void);
356+
353357 kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset);
354358 int register_kprobe(struct kprobe *p);
355359 void unregister_kprobe(struct kprobe *p);
include/linux/kvm_host.h+1−1
@@ -409,7 +409,7 @@ struct kvm_irq_routing_table { · 408 unmodified lines
409409 * Array indexed by gsi. Each entry contains list of irq chips
410410 * the gsi is connected to.
411411 */
412− struct hlist_head map[0];
412+ struct hlist_head map[];
413413 };
414414 #endif
415415
include/linux/libata.h+8−1
@@ -22,6 +22,7 @@ · 21 unmodified lines
2222 #include <linux/acpi.h>
2323 #include <linux/cdrom.h>
2424 #include <linux/sched.h>
25+#include <linux/async.h>
2526
2627 /*
2728 * Define if arch has non-standard setup. This is a _PCI_ standard
@@ -609,7 +610,7 @@ struct ata_host { · 581 unmodified lines
609610 struct task_struct *eh_owner;
610611
611612 struct ata_port *simplex_claimed; /* channel owning the DMA */
612− struct ata_port *ports[0];
613+ struct ata_port *ports[];
613614 };
614615
615616 struct ata_queued_cmd {
@@ -872,6 +873,8 @@ struct ata_port { · 256 unmodified lines
872873 struct timer_list fastdrain_timer;
873874 unsigned long fastdrain_cnt;
874875
876+ async_cookie_t cookie;
877+
875878 int em_message_type;
876879 void *private_data;
877880
@@ -1092,7 +1095,11 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, · 214 unmodified lines
10921095 #define ATA_SCSI_COMPAT_IOCTL /* empty */
10931096 #endif
10941097 extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
1098+#if IS_REACHABLE(CONFIG_ATA)
10951099 bool ata_scsi_dma_need_drain(struct request *rq);
1100+#else
1101+#define ata_scsi_dma_need_drain NULL
1102+#endif
10961103 extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev,
10971104 unsigned int cmd, void __user *arg);
10981105 extern bool ata_link_online(struct ata_link *link);
include/linux/lsm_hook_defs.h+2−2
@@ -150,7 +150,7 @@ LSM_HOOK(int, 0, inode_listsecurity, struct inode *inode, char *buffer, · 149 unmodified lines
150150 size_t buffer_size)
151151 LSM_HOOK(void, LSM_RET_VOID, inode_getsecid, struct inode *inode, u32 *secid)
152152 LSM_HOOK(int, 0, inode_copy_up, struct dentry *src, struct cred **new)
153−LSM_HOOK(int, 0, inode_copy_up_xattr, const char *name)
153+LSM_HOOK(int, -EOPNOTSUPP, inode_copy_up_xattr, const char *name)
154154 LSM_HOOK(int, 0, kernfs_init_security, struct kernfs_node *kn_dir,
155155 struct kernfs_node *kn)
156156 LSM_HOOK(int, 0, file_permission, struct file *file, int mask)
@@ -360,7 +360,7 @@ LSM_HOOK(int, 0, key_alloc, struct key *key, const struct cred *cred, · 203 unmodified lines
360360 unsigned long flags)
361361 LSM_HOOK(void, LSM_RET_VOID, key_free, struct key *key)
362362 LSM_HOOK(int, 0, key_permission, key_ref_t key_ref, const struct cred *cred,
363− unsigned perm)
363+ enum key_need_perm need_perm)
364364 LSM_HOOK(int, 0, key_getsecurity, struct key *key, char **_buffer)
365365 #endif /* CONFIG_KEYS */
366366
include/linux/mlx5/mlx5_ifc.h+6−4
@@ -4283,7 +4283,8 @@ struct mlx5_ifc_rst2init_qp_out_bits { · 4282 unmodified lines
42834283
42844284 u8 syndrome[0x20];
42854285
4286− u8 reserved_at_40[0x40];
4286+ u8 reserved_at_40[0x20];
4287+ u8 ece[0x20];
42874288 };
42884289
42894290 struct mlx5_ifc_rst2init_qp_in_bits {
@@ -4300,7 +4301,7 @@ struct mlx5_ifc_rst2init_qp_in_bits { · 10 unmodified lines
43004301
43014302 u8 opt_param_mask[0x20];
43024303
4303− u8 reserved_at_a0[0x20];
4304+ u8 ece[0x20];
43044305
43054306 struct mlx5_ifc_qpc_bits qpc;
43064307
@@ -6619,7 +6620,8 @@ struct mlx5_ifc_init2init_qp_out_bits { · 2312 unmodified lines
66196620
66206621 u8 syndrome[0x20];
66216622
6622− u8 reserved_at_40[0x40];
6623+ u8 reserved_at_40[0x20];
6624+ u8 ece[0x20];
66236625 };
66246626
66256627 struct mlx5_ifc_init2init_qp_in_bits {
@@ -6636,7 +6638,7 @@ struct mlx5_ifc_init2init_qp_in_bits { · 10 unmodified lines
66366638
66376639 u8 opt_param_mask[0x20];
66386640
6639− u8 reserved_at_a0[0x20];
6641+ u8 ece[0x20];
66406642
66416643 struct mlx5_ifc_qpc_bits qpc;
66426644
include/linux/mmzone.h+2−2
@@ -257,8 +257,8 @@ struct lruvec { · 256 unmodified lines
257257 */
258258 unsigned long anon_cost;
259259 unsigned long file_cost;
260− /* Evictions & activations on the inactive file list */
261− atomic_long_t inactive_age;
260+ /* Non-resident age, driven by LRU movement */
261+ atomic_long_t nonresident_age;
262262 /* Refaults at the time of last reclaim cycle */
263263 unsigned long refaults;
264264 /* Various lruvec state flags (enum lruvec_flags) */
include/linux/netdevice.h+1−1
@@ -3157,7 +3157,7 @@ static inline int dev_recursion_level(void) · 3156 unmodified lines
31573157 return this_cpu_read(softnet_data.xmit.recursion);
31583158 }
31593159
3160−#define XMIT_RECURSION_LIMIT 10
3160+#define XMIT_RECURSION_LIMIT 8
31613161 static inline bool dev_xmit_recursion(void)
31623162 {
31633163 return unlikely(__this_cpu_read(softnet_data.xmit.recursion) >
include/linux/netfilter_ipv4/ip_tables.h+6−0
@@ -25,6 +25,12 @@ · 24 unmodified lines
2525 int ipt_register_table(struct net *net, const struct xt_table *table,
2626 const struct ipt_replace *repl,
2727 const struct nf_hook_ops *ops, struct xt_table **res);
28+
29+void ipt_unregister_table_pre_exit(struct net *net, struct xt_table *table,
30+ const struct nf_hook_ops *ops);
31+
32+void ipt_unregister_table_exit(struct net *net, struct xt_table *table);
33+
2834 void ipt_unregister_table(struct net *net, struct xt_table *table,
2935 const struct nf_hook_ops *ops);
3036
include/linux/netfilter_ipv6/ip6_tables.h+3−0
@@ -29,6 +29,9 @@ int ip6t_register_table(struct net *net, const struct xt_table *table, · 28 unmodified lines
2929 const struct nf_hook_ops *ops, struct xt_table **res);
3030 void ip6t_unregister_table(struct net *net, struct xt_table *table,
3131 const struct nf_hook_ops *ops);
32+void ip6t_unregister_table_pre_exit(struct net *net, struct xt_table *table,
33+ const struct nf_hook_ops *ops);
34+void ip6t_unregister_table_exit(struct net *net, struct xt_table *table);
3235 extern unsigned int ip6t_do_table(struct sk_buff *skb,
3336 const struct nf_hook_state *state,
3437 struct xt_table *table);
include/linux/overflow.h+21−4
@@ -304,16 +304,33 @@ static inline __must_check size_t __ab_c_size(size_t a, size_t b, size_t c) · 303 unmodified lines
304304 * struct_size() - Calculate size of structure with trailing array.
305305 * @p: Pointer to the structure.
306306 * @member: Name of the array member.
307− * @n: Number of elements in the array.
307+ * @count: Number of elements in the array.
308308 *
309309 * Calculates size of memory needed for structure @p followed by an
310− * array of @n @member elements.
310+ * array of @count number of @member elements.
311311 *
312312 * Return: number of bytes needed or SIZE_MAX on overflow.
313313 */
314−#define struct_size(p, member, n) \
315− __ab_c_size(n, \
314+#define struct_size(p, member, count) \
315+ __ab_c_size(count, \
316316 sizeof(*(p)->member) + __must_be_array((p)->member),\
317317 sizeof(*(p)))
318318
319+/**
320+ * flex_array_size() - Calculate size of a flexible array member
321+ * within an enclosing structure.
322+ *
323+ * @p: Pointer to the structure.
324+ * @member: Name of the flexible array member.
325+ * @count: Number of elements in the array.
326+ *
327+ * Calculates size of a flexible array of @count number of @member
328+ * elements, at the end of structure @p.
329+ *
330+ * Return: number of bytes needed or SIZE_MAX on overflow.
331+ */
332+#define flex_array_size(p, member, count) \
333+ array_size(count, \
334+ sizeof(*(p)->member) + __must_be_array((p)->member))
335+
319336 #endif /* __LINUX_OVERFLOW_H */
include/linux/pci.h+5−6
@@ -2169,12 +2169,11 @@ static inline int pci_pcie_type(const struct pci_dev *dev) · 2168 unmodified lines
21692169 */
21702170 static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
21712171 {
2172− struct pci_dev *bridge = pci_upstream_bridge(dev);
2173−
2174− while (bridge) {
2175− if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT)
2176− return bridge;
2177− bridge = pci_upstream_bridge(bridge);
2172+ while (dev) {
2173+ if (pci_is_pcie(dev) &&
2174+ pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
2175+ return dev;
2176+ dev = pci_upstream_bridge(dev);
21782177 }
21792178
21802179 return NULL;
include/linux/pgtable.h+7−0
@@ -249,6 +249,13 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, · 248 unmodified lines
249249 }
250250 #endif
251251
252+#ifndef __HAVE_ARCH_PTEP_GET
253+static inline pte_t ptep_get(pte_t *ptep)
254+{
255+ return READ_ONCE(*ptep);
256+}
257+#endif
258+
252259 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
253260 #ifndef __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
254261 static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
include/linux/phy.h+1−0
@@ -1416,6 +1416,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, · 1415 unmodified lines
14161416 int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd);
14171417 int phy_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
14181418 int phy_do_ioctl_running(struct net_device *dev, struct ifreq *ifr, int cmd);
1419+int phy_disable_interrupts(struct phy_device *phydev);
14191420 void phy_request_interrupt(struct phy_device *phydev);
14201421 void phy_free_interrupt(struct phy_device *phydev);
14211422 void phy_print_status(struct phy_device *phydev);
include/linux/psp-sev.h+1−1
@@ -597,7 +597,7 @@ int sev_guest_df_flush(int *error); · 596 unmodified lines
597597 */
598598 int sev_guest_decommission(struct sev_data_decommission *data, int *error);
599599
600−void *psp_copy_user_blob(u64 __user uaddr, u32 len);
600+void *psp_copy_user_blob(u64 uaddr, u32 len);
601601
602602 #else /* !CONFIG_CRYPTO_DEV_SP_PSP */
603603
include/linux/qed/qed_chain.h+16−10
@@ -207,28 +207,34 @@ static inline u32 qed_chain_get_cons_idx_u32(struct qed_chain *p_chain) · 206 unmodified lines
207207
208208 static inline u16 qed_chain_get_elem_left(struct qed_chain *p_chain)
209209 {
210+ u16 elem_per_page = p_chain->elem_per_page;
211+ u32 prod = p_chain->u.chain16.prod_idx;
212+ u32 cons = p_chain->u.chain16.cons_idx;
210213 u16 used;
211214
212− used = (u16) (((u32)0x10000 +
213− (u32)p_chain->u.chain16.prod_idx) -
214− (u32)p_chain->u.chain16.cons_idx);
215+ if (prod < cons)
216+ prod += (u32)U16_MAX + 1;
217+
218+ used = (u16)(prod - cons);
215219 if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR)
216− used -= p_chain->u.chain16.prod_idx / p_chain->elem_per_page -
217− p_chain->u.chain16.cons_idx / p_chain->elem_per_page;
220+ used -= prod / elem_per_page - cons / elem_per_page;
218221
219222 return (u16)(p_chain->capacity - used);
220223 }
221224
222225 static inline u32 qed_chain_get_elem_left_u32(struct qed_chain *p_chain)
223226 {
227+ u16 elem_per_page = p_chain->elem_per_page;
228+ u64 prod = p_chain->u.chain32.prod_idx;
229+ u64 cons = p_chain->u.chain32.cons_idx;
224230 u32 used;
225231
226− used = (u32) (((u64)0x100000000ULL +
227− (u64)p_chain->u.chain32.prod_idx) -
228− (u64)p_chain->u.chain32.cons_idx);
232+ if (prod < cons)
233+ prod += (u64)U32_MAX + 1;
234+
235+ used = (u32)(prod - cons);
229236 if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR)
230− used -= p_chain->u.chain32.prod_idx / p_chain->elem_per_page -
231− p_chain->u.chain32.cons_idx / p_chain->elem_per_page;
237+ used -= (u32)(prod / elem_per_page - cons / elem_per_page);
232238
233239 return p_chain->capacity - used;
234240 }
include/linux/sched.h+1−6
@@ -114,10 +114,6 @@ struct task_group; · 113 unmodified lines
114114
115115 #define task_is_stopped_or_traced(task) ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
116116
117−#define task_contributes_to_load(task) ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
118− (task->flags & PF_FROZEN) == 0 && \
119− (task->state & TASK_NOLOAD) == 0)
120−
121117 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
122118
123119 /*
@@ -654,9 +650,8 @@ struct task_struct { · 530 unmodified lines
654650 unsigned int ptrace;
655651
656652 #ifdef CONFIG_SMP
657− struct llist_node wake_entry;
658− unsigned int wake_entry_type;
659653 int on_cpu;
654+ struct __call_single_node wake_entry;
660655 #ifdef CONFIG_THREAD_INFO_IN_TASK
661656 /* Current CPU: */
662657 unsigned int cpu;
include/linux/sched/jobctl.h+3−1
@@ -19,6 +19,7 @@ struct task_struct; · 18 unmodified lines
1919 #define JOBCTL_TRAPPING_BIT 21 /* switching to TRACED */
2020 #define JOBCTL_LISTENING_BIT 22 /* ptracer is listening for events */
2121 #define JOBCTL_TRAP_FREEZE_BIT 23 /* trap for cgroup freezer */
22+#define JOBCTL_TASK_WORK_BIT 24 /* set by TWA_SIGNAL */
2223
2324 #define JOBCTL_STOP_DEQUEUED (1UL << JOBCTL_STOP_DEQUEUED_BIT)
2425 #define JOBCTL_STOP_PENDING (1UL << JOBCTL_STOP_PENDING_BIT)
@@ -28,9 +29,10 @@ struct task_struct; · 3 unmodified lines
2829 #define JOBCTL_TRAPPING (1UL << JOBCTL_TRAPPING_BIT)
2930 #define JOBCTL_LISTENING (1UL << JOBCTL_LISTENING_BIT)
3031 #define JOBCTL_TRAP_FREEZE (1UL << JOBCTL_TRAP_FREEZE_BIT)
32+#define JOBCTL_TASK_WORK (1UL << JOBCTL_TASK_WORK_BIT)
3133
3234 #define JOBCTL_TRAP_MASK (JOBCTL_TRAP_STOP | JOBCTL_TRAP_NOTIFY)
33−#define JOBCTL_PENDING_MASK (JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK)
35+#define JOBCTL_PENDING_MASK (JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK | JOBCTL_TASK_WORK)
3436
3537 extern bool task_set_jobctl_pending(struct task_struct *task, unsigned long mask);
3638 extern void task_clear_jobctl_trapping(struct task_struct *task);
include/linux/sctp.h+18−18
@@ -221,7 +221,7 @@ struct sctp_datahdr { · 220 unmodified lines
221221 __be16 stream;
222222 __be16 ssn;
223223 __u32 ppid;
224− __u8 payload[0];
224+ __u8 payload[];
225225 };
226226
227227 struct sctp_data_chunk {
@@ -269,7 +269,7 @@ struct sctp_inithdr { · 41 unmodified lines
269269 __be16 num_outbound_streams;
270270 __be16 num_inbound_streams;
271271 __be32 initial_tsn;
272− __u8 params[0];
272+ __u8 params[];
273273 };
274274
275275 struct sctp_init_chunk {
@@ -299,13 +299,13 @@ struct sctp_cookie_preserve_param { · 23 unmodified lines
299299 /* Section 3.3.2.1 Host Name Address (11) */
300300 struct sctp_hostname_param {
301301 struct sctp_paramhdr param_hdr;
302− uint8_t hostname[0];
302+ uint8_t hostname[];
303303 };
304304
305305 /* Section 3.3.2.1 Supported Address Types (12) */
306306 struct sctp_supported_addrs_param {
307307 struct sctp_paramhdr param_hdr;
308− __be16 types[0];
308+ __be16 types[];
309309 };
310310
311311 /* ADDIP Section 3.2.6 Adaptation Layer Indication */
@@ -317,25 +317,25 @@ struct sctp_adaptation_ind_param { · 5 unmodified lines
317317 /* ADDIP Section 4.2.7 Supported Extensions Parameter */
318318 struct sctp_supported_ext_param {
319319 struct sctp_paramhdr param_hdr;
320− __u8 chunks[0];
320+ __u8 chunks[];
321321 };
322322
323323 /* AUTH Section 3.1 Random */
324324 struct sctp_random_param {
325325 struct sctp_paramhdr param_hdr;
326− __u8 random_val[0];
326+ __u8 random_val[];
327327 };
328328
329329 /* AUTH Section 3.2 Chunk List */
330330 struct sctp_chunks_param {
331331 struct sctp_paramhdr param_hdr;
332− __u8 chunks[0];
332+ __u8 chunks[];
333333 };
334334
335335 /* AUTH Section 3.3 HMAC Algorithm */
336336 struct sctp_hmac_algo_param {
337337 struct sctp_paramhdr param_hdr;
338− __be16 hmac_ids[0];
338+ __be16 hmac_ids[];
339339 };
340340
341341 /* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
@@ -350,7 +350,7 @@ struct sctp_initack_chunk { · 8 unmodified lines
350350 /* Section 3.3.3.1 State Cookie (7) */
351351 struct sctp_cookie_param {
352352 struct sctp_paramhdr p;
353− __u8 body[0];
353+ __u8 body[];
354354 };
355355
356356 /* Section 3.3.3.1 Unrecognized Parameters (8) */
@@ -384,7 +384,7 @@ struct sctp_sackhdr { · 27 unmodified lines
384384 __be32 a_rwnd;
385385 __be16 num_gap_ack_blocks;
386386 __be16 num_dup_tsns;
387− union sctp_sack_variable variable[0];
387+ union sctp_sack_variable variable[];
388388 };
389389
390390 struct sctp_sack_chunk {
@@ -436,7 +436,7 @@ struct sctp_shutdown_chunk { · 45 unmodified lines
436436 struct sctp_errhdr {
437437 __be16 cause;
438438 __be16 length;
439− __u8 variable[0];
439+ __u8 variable[];
440440 };
441441
442442 struct sctp_operr_chunk {
@@ -594,7 +594,7 @@ struct sctp_fwdtsn_skip { · 151 unmodified lines
594594
595595 struct sctp_fwdtsn_hdr {
596596 __be32 new_cum_tsn;
597− struct sctp_fwdtsn_skip skip[0];
597+ struct sctp_fwdtsn_skip skip[];
598598 };
599599
600600 struct sctp_fwdtsn_chunk {
@@ -611,7 +611,7 @@ struct sctp_ifwdtsn_skip { · 10 unmodified lines
611611
612612 struct sctp_ifwdtsn_hdr {
613613 __be32 new_cum_tsn;
614− struct sctp_ifwdtsn_skip skip[0];
614+ struct sctp_ifwdtsn_skip skip[];
615615 };
616616
617617 struct sctp_ifwdtsn_chunk {
@@ -658,7 +658,7 @@ struct sctp_addip_param { · 40 unmodified lines
658658
659659 struct sctp_addiphdr {
660660 __be32 serial;
661− __u8 params[0];
661+ __u8 params[];
662662 };
663663
664664 struct sctp_addip_chunk {
@@ -718,7 +718,7 @@ struct sctp_addip_chunk { · 53 unmodified lines
718718 struct sctp_authhdr {
719719 __be16 shkey_id;
720720 __be16 hmac_id;
721− __u8 hmac[0];
721+ __u8 hmac[];
722722 };
723723
724724 struct sctp_auth_chunk {
@@ -733,7 +733,7 @@ struct sctp_infox { · 8 unmodified lines
733733
734734 struct sctp_reconf_chunk {
735735 struct sctp_chunkhdr chunk_hdr;
736− __u8 params[0];
736+ __u8 params[];
737737 };
738738
739739 struct sctp_strreset_outreq {
@@ -741,13 +741,13 @@ struct sctp_strreset_outreq { · 1 unmodified line
741741 __be32 request_seq;
742742 __be32 response_seq;
743743 __be32 send_reset_at_tsn;
744− __be16 list_of_streams[0];
744+ __be16 list_of_streams[];
745745 };
746746
747747 struct sctp_strreset_inreq {
748748 struct sctp_paramhdr param_hdr;
749749 __be32 request_seq;
750− __be16 list_of_streams[0];
750+ __be16 list_of_streams[];
751751 };
752752
753753 struct sctp_strreset_tsnreq {
include/linux/smp.h+8−15
@@ -12,29 +12,22 @@ · 11 unmodified lines
1212 #include <linux/list.h>
1313 #include <linux/cpumask.h>
1414 #include <linux/init.h>
15−#include <linux/llist.h>
15+#include <linux/smp_types.h>
1616
1717 typedef void (*smp_call_func_t)(void *info);
1818 typedef bool (*smp_cond_func_t)(int cpu, void *info);
1919
20−enum {
21− CSD_FLAG_LOCK = 0x01,
22−
23− /* IRQ_WORK_flags */
24−
25− CSD_TYPE_ASYNC = 0x00,
26− CSD_TYPE_SYNC = 0x10,
27− CSD_TYPE_IRQ_WORK = 0x20,
28− CSD_TYPE_TTWU = 0x30,
29− CSD_FLAG_TYPE_MASK = 0xF0,
30−};
31−
3220 /*
3321 * structure shares (partial) layout with struct irq_work
3422 */
3523 struct __call_single_data {
36− struct llist_node llist;
37− unsigned int flags;
24+ union {
25+ struct __call_single_node node;
26+ struct {
27+ struct llist_node llist;
28+ unsigned int flags;
29+ };
30+ };
3831 smp_call_func_t func;
3932 void *info;
4033 };
include/linux/smp_types.h+66−0
@@ -0,0 +1,66 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+#ifndef __LINUX_SMP_TYPES_H
3+#define __LINUX_SMP_TYPES_H
4+
5+#include <linux/llist.h>
6+
7+enum {
8+ CSD_FLAG_LOCK = 0x01,
9+
10+ IRQ_WORK_PENDING = 0x01,
11+ IRQ_WORK_BUSY = 0x02,
12+ IRQ_WORK_LAZY = 0x04, /* No IPI, wait for tick */
13+ IRQ_WORK_HARD_IRQ = 0x08, /* IRQ context on PREEMPT_RT */
14+
15+ IRQ_WORK_CLAIMED = (IRQ_WORK_PENDING | IRQ_WORK_BUSY),
16+
17+ CSD_TYPE_ASYNC = 0x00,
18+ CSD_TYPE_SYNC = 0x10,
19+ CSD_TYPE_IRQ_WORK = 0x20,
20+ CSD_TYPE_TTWU = 0x30,
21+
22+ CSD_FLAG_TYPE_MASK = 0xF0,
23+};
24+
25+/*
26+ * struct __call_single_node is the primary type on
27+ * smp.c:call_single_queue.
28+ *
29+ * flush_smp_call_function_queue() only reads the type from
30+ * __call_single_node::u_flags as a regular load, the above
31+ * (anonymous) enum defines all the bits of this word.
32+ *
33+ * Other bits are not modified until the type is known.
34+ *
35+ * CSD_TYPE_SYNC/ASYNC:
36+ * struct {
37+ * struct llist_node node;
38+ * unsigned int flags;
39+ * smp_call_func_t func;
40+ * void *info;
41+ * };
42+ *
43+ * CSD_TYPE_IRQ_WORK:
44+ * struct {
45+ * struct llist_node node;
46+ * atomic_t flags;
47+ * void (*func)(struct irq_work *);
48+ * };
49+ *
50+ * CSD_TYPE_TTWU:
51+ * struct {
52+ * struct llist_node node;
53+ * unsigned int flags;
54+ * };
55+ *
56+ */
57+
58+struct __call_single_node {
59+ struct llist_node llist;
60+ union {
61+ unsigned int u_flags;
62+ atomic_t a_flags;
63+ };
64+};
65+
66+#endif /* __LINUX_SMP_TYPES_H */
include/linux/swap.h+1−0
@@ -313,6 +313,7 @@ struct vma_swap_readahead { · 312 unmodified lines
313313 };
314314
315315 /* linux/mm/workingset.c */
316+void workingset_age_nonresident(struct lruvec *lruvec, unsigned long nr_pages);
316317 void *workingset_eviction(struct page *page, struct mem_cgroup *target_memcg);
317318 void workingset_refault(struct page *page, void *shadow);
318319 void workingset_activation(struct page *page);
include/linux/syscalls.h+1−1
@@ -1360,7 +1360,7 @@ static inline long ksys_lchown(const char __user *filename, uid_t user, · 1359 unmodified lines
13601360
13611361 extern long do_sys_ftruncate(unsigned int fd, loff_t length, int small);
13621362
1363−static inline long ksys_ftruncate(unsigned int fd, unsigned long length)
1363+static inline long ksys_ftruncate(unsigned int fd, loff_t length)
13641364 {
13651365 return do_sys_ftruncate(fd, length, 1);
13661366 }
include/linux/task_work.h+4−1
@@ -13,7 +13,10 @@ init_task_work(struct callback_head *twork, task_work_func_t func) · 12 unmodified lines
1313 twork->func = func;
1414 }
1515
16−int task_work_add(struct task_struct *task, struct callback_head *twork, bool);
16+#define TWA_RESUME 1
17+#define TWA_SIGNAL 2
18+int task_work_add(struct task_struct *task, struct callback_head *twork, int);
19+
1720 struct callback_head *task_work_cancel(struct task_struct *, task_work_func_t);
1821 void task_work_run(void);
1922
include/linux/tifm.h+1−1
@@ -124,7 +124,7 @@ struct tifm_adapter { · 123 unmodified lines
124124 int (*has_ms_pif)(struct tifm_adapter *fm,
125125 struct tifm_dev *sock);
126126
127− struct tifm_dev *sockets[0];
127+ struct tifm_dev *sockets[];
128128 };
129129
130130 struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
include/linux/timekeeping.h+7−7
@@ -222,9 +222,9 @@ extern bool timekeeping_rtc_skipresume(void); · 221 unmodified lines
222222
223223 extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);
224224
225−/*
225+/**
226226 * struct system_time_snapshot - simultaneous raw/real time capture with
227− * counter value
227+ * counter value
228228 * @cycles: Clocksource counter value to produce the system times
229229 * @real: Realtime system time
230230 * @raw: Monotonic raw system time
@@ -239,9 +239,9 @@ struct system_time_snapshot { · 8 unmodified lines
239239 u8 cs_was_changed_seq;
240240 };
241241
242−/*
242+/**
243243 * struct system_device_crosststamp - system/device cross-timestamp
244− * (syncronized capture)
244+ * (synchronized capture)
245245 * @device: Device time
246246 * @sys_realtime: Realtime simultaneous with device time
247247 * @sys_monoraw: Monotonic raw simultaneous with device time
@@ -252,12 +252,12 @@ struct system_device_crosststamp { · 4 unmodified lines
252252 ktime_t sys_monoraw;
253253 };
254254
255−/*
255+/**
256256 * struct system_counterval_t - system counter value with the pointer to the
257− * corresponding clocksource
257+ * corresponding clocksource
258258 * @cycles: System counter value
259259 * @cs: Clocksource corresponding to system counter value. Used by
260− * timekeeping code to verify comparibility of two cycle values
260+ * timekeeping code to verify comparibility of two cycle values
261261 */
262262 struct system_counterval_t {
263263 u64 cycles;
include/linux/tpm_eventlog.h+13−1
@@ -81,6 +81,8 @@ struct tcg_efi_specid_event_algs { · 80 unmodified lines
8181 u16 digest_size;
8282 } __packed;
8383
84+#define TCG_SPECID_SIG "Spec ID Event03"
85+
8486 struct tcg_efi_specid_event_head {
8587 u8 signature[16];
8688 u32 platform_class;
@@ -171,6 +173,7 @@ static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, · 84 unmodified lines
171173 int i;
172174 int j;
173175 u32 count, event_type;
176+ const u8 zero_digest[sizeof(event_header->digest)] = {0};
174177
175178 marker = event;
176179 marker_start = marker;
@@ -198,10 +201,19 @@ static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, · 21 unmodified lines
198201 count = READ_ONCE(event->count);
199202 event_type = READ_ONCE(event->event_type);
200203
204+ /* Verify that it's the log header */
205+ if (event_header->pcr_idx != 0 ||
206+ event_header->event_type != NO_ACTION ||
207+ memcmp(event_header->digest, zero_digest, sizeof(zero_digest))) {
208+ size = 0;
209+ goto out;
210+ }
211+
201212 efispecid = (struct tcg_efi_specid_event_head *)event_header->event;
202213
203214 /* Check if event is malformed. */
204− if (count > efispecid->num_algs) {
215+ if (memcmp(efispecid->signature, TCG_SPECID_SIG,
216+ sizeof(TCG_SPECID_SIG)) || count > efispecid->num_algs) {
205217 size = 0;
206218 goto out;
207219 }
include/linux/uaccess.h+13−10
@@ -301,13 +301,14 @@ copy_struct_from_user(void *dst, size_t ksize, const void __user *src, · 300 unmodified lines
301301 return 0;
302302 }
303303
304−bool probe_kernel_read_allowed(const void *unsafe_src, size_t size);
304+bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size);
305305
306−extern long probe_kernel_read(void *dst, const void *src, size_t size);
307−extern long probe_user_read(void *dst, const void __user *src, size_t size);
306+long copy_from_kernel_nofault(void *dst, const void *src, size_t size);
307+long notrace copy_to_kernel_nofault(void *dst, const void *src, size_t size);
308308
309−extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
310−extern long notrace probe_user_write(void __user *dst, const void *src, size_t size);
309+long copy_from_user_nofault(void *dst, const void __user *src, size_t size);
310+long notrace copy_to_user_nofault(void __user *dst, const void *src,
311+ size_t size);
311312
312313 long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr,
313314 long count);
@@ -317,14 +318,16 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, · 3 unmodified lines
317318 long strnlen_user_nofault(const void __user *unsafe_addr, long count);
318319
319320 /**
320− * probe_kernel_address(): safely attempt to read from a location
321− * @addr: address to read from
322− * @retval: read into this variable
321+ * get_kernel_nofault(): safely attempt to read from a location
322+ * @val: read into this variable
323+ * @ptr: address to read from
323324 *
324325 * Returns 0 on success, or -EFAULT.
325326 */
326−#define probe_kernel_address(addr, retval) \
327− probe_kernel_read(&retval, addr, sizeof(retval))
327+#define get_kernel_nofault(val, ptr) ({ \
328+ const typeof(val) *__gk_ptr = (ptr); \
329+ copy_from_kernel_nofault(&(val), __gk_ptr, sizeof(val));\
330+})
328331
329332 #ifndef user_access_begin
330333 #define user_access_begin(ptr,len) access_ok(ptr, len)
include/linux/vmalloc.h+0−1
@@ -106,7 +106,6 @@ extern void *vzalloc(unsigned long size); · 105 unmodified lines
106106 extern void *vmalloc_user(unsigned long size);
107107 extern void *vmalloc_node(unsigned long size, int node);
108108 extern void *vzalloc_node(unsigned long size, int node);
109−extern void *vmalloc_exec(unsigned long size);
110109 extern void *vmalloc_32(unsigned long size);
111110 extern void *vmalloc_32_user(unsigned long size);
112111 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask);