History

Merge tag 'spi-nor/for-5.18' into mtd/next

SPI NOR core changes: - move vendor specific code out of the core into vendor drivers. - unify all function and object names in the vendor modules. - make setup() callback optional to improve readability. - skip erase logic when the SPI_NOR_NO_ERASE flag is set at flash declaration.

Miquel Raynal committed 4 years ago

Commit 4e371d92 parents 8f877b7 151c6b41231 files · +13914 −7446Browse files

Showing the changes to include (68 of 1231 files). Show all

Unified · Split

68 files
  1. include/crypto/internal/blake2s.h +25 −15
  2. include/dt-bindings/clock/dra7.h +7 −7
  3. include/linux/ata.h +1 −1
  4. include/linux/blkdev.h +3 −1
  5. include/linux/ceph/libceph.h +1 −0
  6. include/linux/ceph/messenger.h +5 −0
  7. include/linux/compiler.h +5 −16
  8. include/linux/ethtool.h +1 −1
  9. include/linux/fb.h +1 −1
  10. include/linux/fs.h +1 −1
  11. include/linux/fsnotify.h +43 −6
  12. include/linux/hyperv.h +1 −0
  13. include/linux/if_vlan.h +4 −2
  14. include/linux/iomap.h +2 −0
  15. include/linux/jbd2.h +4 −9
  16. include/linux/kfence.h +2 −0
  17. include/linux/kvm_host.h +109 −3
  18. include/linux/libata.h +1 −0
  19. include/linux/lsm_hook_defs.h +1 −1
  20. include/linux/memcontrol.h +3 −2
  21. include/linux/mm.h +12 −5
  22. include/linux/mm_types.h +1 −0
  23. include/linux/mtd/spi-nor.h +0 −18
  24. include/linux/netdevice.h +2 −1
  25. include/linux/netfs.h +7 −0
  26. include/linux/nfs.h +0 −8
  27. include/linux/nfs_fs.h +7 −4
  28. include/linux/nfs_fs_sb.h +3 −1
  29. include/linux/nfs_xdr.h +4 −1
  30. include/linux/page_table_check.h +19 −0
  31. include/linux/perf_event.h +3 −12
  32. include/linux/pgtable.h +1 −0
  33. include/linux/pid_namespace.h +5 −0
  34. include/linux/psi.h +6 −7
  35. include/linux/psi_types.h +0 −3
  36. include/linux/quota.h +1 −1
  37. include/linux/sched.h +0 −5
  38. include/linux/sched/task.h +2 −2
  39. include/linux/skbuff.h +1 −1
  40. include/linux/suspend.h +3 −12
  41. include/linux/sysctl.h +1 −1
  42. include/linux/usb/role.h +6 −0
  43. include/net/addrconf.h +2 −2
  44. include/net/ax25.h +12 −0
  45. include/net/bond_3ad.h +1 −1
  46. include/net/bonding.h +1 −1
  47. include/net/dsa.h +1 −0
  48. include/net/dst_metadata.h +13 −1
  49. include/net/ip.h +10 −11
  50. include/net/ip6_fib.h +7 −5
  51. include/net/ipv6.h +4 −1
  52. include/net/neighbour.h +13 −5
  53. include/net/netns/ipv6.h +2 −1
  54. include/net/route.h +1 −1
  55. include/net/tcp.h +4 −0
  56. include/sound/pcm.h +15 −0
  57. include/trace/events/skb.h +1 −1
  58. include/trace/events/sunrpc.h +45 −25
  59. include/trace/perf.h +3 −2
  60. include/trace/trace_events.h +5 −4
  61. include/uapi/linux/cyclades.h +35 −0
  62. include/uapi/linux/kvm.h +4 −3
  63. include/uapi/linux/netfilter/nf_conntrack_common.h +1 −1
  64. include/uapi/linux/perf_event.h +2 −0
  65. include/uapi/linux/smc_diag.h +5 −6
  66. include/uapi/sound/asound.h +3 −1
  67. include/uapi/xen/gntdev.h +7 −1
  68. include/xen/xenbus_dev.h +0 −2
include/crypto/internal/blake2s.h+25−15
@@ -24,14 +24,11 @@ static inline void blake2s_set_lastblock(struct blake2s_state *state) · 23 unmodified lines
2424 state->f[0] = -1;
2525 }
2626
27−typedef void (*blake2s_compress_t)(struct blake2s_state *state,
28− const u8 *block, size_t nblocks, u32 inc);
29−
3027 /* Helper functions for BLAKE2s shared by the library and shash APIs */
3128
32−static inline void __blake2s_update(struct blake2s_state *state,
33− const u8 *in, size_t inlen,
34− blake2s_compress_t compress)
29+static __always_inline void
30+__blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen,
31+ bool force_generic)
3532 {
3633 const size_t fill = BLAKE2S_BLOCK_SIZE - state->buflen;
3734
@@ -39,7 +36,12 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
3936 return;
4037 if (inlen > fill) {
4138 memcpy(state->buf + state->buflen, in, fill);
42− (*compress)(state, state->buf, 1, BLAKE2S_BLOCK_SIZE);
39+ if (force_generic)
40+ blake2s_compress_generic(state, state->buf, 1,
41+ BLAKE2S_BLOCK_SIZE);
42+ else
43+ blake2s_compress(state, state->buf, 1,
44+ BLAKE2S_BLOCK_SIZE);
4345 state->buflen = 0;
4446 in += fill;
4547 inlen -= fill;
@@ -47,7 +49,12 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
4749 if (inlen > BLAKE2S_BLOCK_SIZE) {
4850 const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_SIZE);
4951 /* Hash one less (full) block than strictly possible */
50− (*compress)(state, in, nblocks - 1, BLAKE2S_BLOCK_SIZE);
52+ if (force_generic)
53+ blake2s_compress_generic(state, in, nblocks - 1,
54+ BLAKE2S_BLOCK_SIZE);
55+ else
56+ blake2s_compress(state, in, nblocks - 1,
57+ BLAKE2S_BLOCK_SIZE);
5158 in += BLAKE2S_BLOCK_SIZE * (nblocks - 1);
5259 inlen -= BLAKE2S_BLOCK_SIZE * (nblocks - 1);
5360 }
@@ -55,13 +62,16 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
5562 state->buflen += inlen;
5663 }
5764
58−static inline void __blake2s_final(struct blake2s_state *state, u8 *out,
59− blake2s_compress_t compress)
65+static __always_inline void
66+__blake2s_final(struct blake2s_state *state, u8 *out, bool force_generic)
6067 {
6168 blake2s_set_lastblock(state);
6269 memset(state->buf + state->buflen, 0,
6370 BLAKE2S_BLOCK_SIZE - state->buflen); /* Padding */
64− (*compress)(state, state->buf, 1, state->buflen);
71+ if (force_generic)
72+ blake2s_compress_generic(state, state->buf, 1, state->buflen);
73+ else
74+ blake2s_compress(state, state->buf, 1, state->buflen);
6575 cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
6676 memcpy(out, state->h, state->outlen);
6777 }
@@ -99,20 +109,20 @@ static inline int crypto_blake2s_init(struct shash_desc *desc) · 31 unmodified lines
99109
100110 static inline int crypto_blake2s_update(struct shash_desc *desc,
101111 const u8 *in, unsigned int inlen,
102− blake2s_compress_t compress)
112+ bool force_generic)
103113 {
104114 struct blake2s_state *state = shash_desc_ctx(desc);
105115
106− __blake2s_update(state, in, inlen, compress);
116+ __blake2s_update(state, in, inlen, force_generic);
107117 return 0;
108118 }
109119
110120 static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out,
111− blake2s_compress_t compress)
121+ bool force_generic)
112122 {
113123 struct blake2s_state *state = shash_desc_ctx(desc);
114124
115− __blake2s_final(state, out, compress);
125+ __blake2s_final(state, out, force_generic);
116126 return 0;
117127 }
118128
include/dt-bindings/clock/dra7.h+7−7
@@ -84,17 +84,10 @@ · 83 unmodified lines
8484 #define DRA7_L3_MAIN_2_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
8585 #define DRA7_L3_INSTR_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
8686
87−/* iva clocks */
88−#define DRA7_IVA_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
89−#define DRA7_SL2IF_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
90−
9187 /* dss clocks */
9288 #define DRA7_DSS_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
9389 #define DRA7_BB2D_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
9490
95−/* gpu clocks */
96−#define DRA7_GPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
97−
9891 /* l3init clocks */
9992 #define DRA7_MMC1_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
10093 #define DRA7_MMC2_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
@@ -267,10 +260,17 @@ · 166 unmodified lines
267260 #define DRA7_L3INSTR_L3_MAIN_2_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
268261 #define DRA7_L3INSTR_L3_INSTR_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
269262
263+/* iva clocks */
264+#define DRA7_IVA_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
265+#define DRA7_SL2IF_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
266+
270267 /* dss clocks */
271268 #define DRA7_DSS_DSS_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
272269 #define DRA7_DSS_BB2D_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
273270
271+/* gpu clocks */
272+#define DRA7_GPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x20)
273+
274274 /* l3init clocks */
275275 #define DRA7_L3INIT_MMC1_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
276276 #define DRA7_L3INIT_MMC2_CLKCTRL DRA7_CLKCTRL_INDEX(0x30)
include/linux/ata.h+1−1
@@ -324,12 +324,12 @@ enum { · 323 unmodified lines
324324 ATA_LOG_NCQ_NON_DATA = 0x12,
325325 ATA_LOG_NCQ_SEND_RECV = 0x13,
326326 ATA_LOG_IDENTIFY_DEVICE = 0x30,
327+ ATA_LOG_CONCURRENT_POSITIONING_RANGES = 0x47,
327328
328329 /* Identify device log pages: */
329330 ATA_LOG_SECURITY = 0x06,
330331 ATA_LOG_SATA_SETTINGS = 0x08,
331332 ATA_LOG_ZONED_INFORMATION = 0x09,
332− ATA_LOG_CONCURRENT_POSITIONING_RANGES = 0x47,
333333
334334 /* Identify device SATA settings log:*/
335335 ATA_LOG_DEVSLP_OFFSET = 0x30,
include/linux/blkdev.h+3−1
@@ -748,7 +748,8 @@ extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q, · 747 unmodified lines
748748
749749 bool __must_check blk_get_queue(struct request_queue *);
750750 extern void blk_put_queue(struct request_queue *);
751−extern void blk_set_queue_dying(struct request_queue *);
751+
752+void blk_mark_disk_dead(struct gendisk *disk);
752753
753754 #ifdef CONFIG_BLOCK
754755 /*
@@ -1258,6 +1259,7 @@ unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors, · 503 unmodified lines
12581259 void disk_end_io_acct(struct gendisk *disk, unsigned int op,
12591260 unsigned long start_time);
12601261
1262+void bio_start_io_acct_time(struct bio *bio, unsigned long start_time);
12611263 unsigned long bio_start_io_acct(struct bio *bio);
12621264 void bio_end_io_acct_remapped(struct bio *bio, unsigned long start_time,
12631265 struct block_device *orig_bdev);
include/linux/ceph/libceph.h+1−0
@@ -35,6 +35,7 @@ · 34 unmodified lines
3535 #define CEPH_OPT_TCP_NODELAY (1<<4) /* TCP_NODELAY on TCP sockets */
3636 #define CEPH_OPT_NOMSGSIGN (1<<5) /* don't sign msgs (msgr1) */
3737 #define CEPH_OPT_ABORT_ON_FULL (1<<6) /* abort w/ ENOSPC when full */
38+#define CEPH_OPT_RXBOUNCE (1<<7) /* double-buffer read data */
3839
3940 #define CEPH_OPT_DEFAULT (CEPH_OPT_TCP_NODELAY)
4041
include/linux/ceph/messenger.h+5−0
@@ -383,6 +383,10 @@ struct ceph_connection_v2_info { · 382 unmodified lines
383383 struct ceph_gcm_nonce in_gcm_nonce;
384384 struct ceph_gcm_nonce out_gcm_nonce;
385385
386+ struct page **in_enc_pages;
387+ int in_enc_page_cnt;
388+ int in_enc_resid;
389+ int in_enc_i;
386390 struct page **out_enc_pages;
387391 int out_enc_page_cnt;
388392 int out_enc_resid;
@@ -457,6 +461,7 @@ struct ceph_connection { · 68 unmodified lines
457461 struct ceph_msg *out_msg; /* sending message (== tail of
458462 out_sent) */
459463
464+ struct page *bounce_page;
460465 u32 in_front_crc, in_middle_crc, in_data_crc; /* calculated crc */
461466
462467 struct timespec64 last_keepalive_ack; /* keepalive2 ack stamp */
include/linux/compiler.h+5−16
@@ -117,14 +117,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, · 116 unmodified lines
117117 */
118118 #define __stringify_label(n) #n
119119
120−#define __annotate_reachable(c) ({ \
121− asm volatile(__stringify_label(c) ":\n\t" \
122− ".pushsection .discard.reachable\n\t" \
123− ".long " __stringify_label(c) "b - .\n\t" \
124− ".popsection\n\t" : : "i" (c)); \
125−})
126−#define annotate_reachable() __annotate_reachable(__COUNTER__)
127−
128120 #define __annotate_unreachable(c) ({ \
129121 asm volatile(__stringify_label(c) ":\n\t" \
130122 ".pushsection .discard.unreachable\n\t" \
@@ -133,24 +125,21 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, · 2 unmodified lines
133125 })
134126 #define annotate_unreachable() __annotate_unreachable(__COUNTER__)
135127
136−#define ASM_UNREACHABLE \
137− "999:\n\t" \
138− ".pushsection .discard.unreachable\n\t" \
139− ".long 999b - .\n\t" \
128+#define ASM_REACHABLE \
129+ "998:\n\t" \
130+ ".pushsection .discard.reachable\n\t" \
131+ ".long 998b - .\n\t" \
140132 ".popsection\n\t"
141133
142134 /* Annotate a C jump table to allow objtool to follow the code flow */
143135 #define __annotate_jump_table __section(".rodata..c_jump_table")
144136
145137 #else
146−#define annotate_reachable()
147138 #define annotate_unreachable()
139+# define ASM_REACHABLE
148140 #define __annotate_jump_table
149141 #endif
150142
151−#ifndef ASM_UNREACHABLE
152−# define ASM_UNREACHABLE
153−#endif
154143 #ifndef unreachable
155144 # define unreachable() do { \
156145 annotate_unreachable(); \
include/linux/ethtool.h+1−1
@@ -111,7 +111,7 @@ struct ethtool_link_ext_state_info { · 110 unmodified lines
111111 enum ethtool_link_ext_substate_bad_signal_integrity bad_signal_integrity;
112112 enum ethtool_link_ext_substate_cable_issue cable_issue;
113113 enum ethtool_link_ext_substate_module module;
114− u8 __link_ext_substate;
114+ u32 __link_ext_substate;
115115 };
116116 };
117117
include/linux/fb.h+1−1
@@ -262,7 +262,7 @@ struct fb_ops { · 261 unmodified lines
262262
263263 /* Draws a rectangle */
264264 void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect);
265− /* Copy data from area to another. Obsolete. */
265+ /* Copy data from area to another */
266266 void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region);
267267 /* Draws a image to the display */
268268 void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image);
include/linux/fs.h+1−1
@@ -1483,7 +1483,7 @@ struct super_block { · 1482 unmodified lines
14831483 #ifdef CONFIG_FS_VERITY
14841484 const struct fsverity_operations *s_vop;
14851485 #endif
1486−#ifdef CONFIG_UNICODE
1486+#if IS_ENABLED(CONFIG_UNICODE)
14871487 struct unicode_map *s_encoding;
14881488 __u16 s_encoding_flags;
14891489 #endif
include/linux/fsnotify.h+43−6
@@ -224,6 +224,43 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, · 223 unmodified lines
224224 dir, &new_dentry->d_name, 0);
225225 }
226226
227+/*
228+ * fsnotify_delete - @dentry was unlinked and unhashed
229+ *
230+ * Caller must make sure that dentry->d_name is stable.
231+ *
232+ * Note: unlike fsnotify_unlink(), we have to pass also the unlinked inode
233+ * as this may be called after d_delete() and old_dentry may be negative.
234+ */
235+static inline void fsnotify_delete(struct inode *dir, struct inode *inode,
236+ struct dentry *dentry)
237+{
238+ __u32 mask = FS_DELETE;
239+
240+ if (S_ISDIR(inode->i_mode))
241+ mask |= FS_ISDIR;
242+
243+ fsnotify_name(mask, inode, FSNOTIFY_EVENT_INODE, dir, &dentry->d_name,
244+ 0);
245+}
246+
247+/**
248+ * d_delete_notify - delete a dentry and call fsnotify_delete()
249+ * @dentry: The dentry to delete
250+ *
251+ * This helper is used to guaranty that the unlinked inode cannot be found
252+ * by lookup of this name after fsnotify_delete() event has been delivered.
253+ */
254+static inline void d_delete_notify(struct inode *dir, struct dentry *dentry)
255+{
256+ struct inode *inode = d_inode(dentry);
257+
258+ ihold(inode);
259+ d_delete(dentry);
260+ fsnotify_delete(dir, inode, dentry);
261+ iput(inode);
262+}
263+
227264 /*
228265 * fsnotify_unlink - 'name' was unlinked
229266 *
@@ -231,10 +268,10 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, · 1 unmodified line
231268 */
232269 static inline void fsnotify_unlink(struct inode *dir, struct dentry *dentry)
233270 {
234− /* Expected to be called before d_delete() */
235− WARN_ON_ONCE(d_is_negative(dentry));
271+ if (WARN_ON_ONCE(d_is_negative(dentry)))
272+ return;
236273
237− fsnotify_dirent(dir, dentry, FS_DELETE);
274+ fsnotify_delete(dir, d_inode(dentry), dentry);
238275 }
239276
240277 /*
@@ -258,10 +295,10 @@ static inline void fsnotify_mkdir(struct inode *dir, struct dentry *dentry) · 17 unmodified lines
258295 */
259296 static inline void fsnotify_rmdir(struct inode *dir, struct dentry *dentry)
260297 {
261− /* Expected to be called before d_delete() */
262− WARN_ON_ONCE(d_is_negative(dentry));
298+ if (WARN_ON_ONCE(d_is_negative(dentry)))
299+ return;
263300
264− fsnotify_dirent(dir, dentry, FS_DELETE | FS_ISDIR);
301+ fsnotify_delete(dir, d_inode(dentry), dentry);
265302 }
266303
267304 /*
include/linux/hyperv.h+1−0
@@ -1262,6 +1262,7 @@ struct hv_device { · 1261 unmodified lines
12621262 struct vmbus_channel *channel;
12631263 struct kset *channels_kset;
12641264 struct device_dma_parameters dma_parms;
1265+ u64 dma_mask;
12651266
12661267 /* place holder to keep track of the dir for hv device in debugfs */
12671268 struct dentry *debug_dir;
include/linux/if_vlan.h+4−2
@@ -46,8 +46,10 @@ struct vlan_hdr { · 45 unmodified lines
4646 * @h_vlan_encapsulated_proto: packet type ID or len
4747 */
4848 struct vlan_ethhdr {
49− unsigned char h_dest[ETH_ALEN];
50− unsigned char h_source[ETH_ALEN];
49+ struct_group(addrs,
50+ unsigned char h_dest[ETH_ALEN];
51+ unsigned char h_source[ETH_ALEN];
52+ );
5153 __be16 h_vlan_proto;
5254 __be16 h_vlan_TCI;
5355 __be16 h_vlan_encapsulated_proto;
include/linux/iomap.h+2−0
@@ -263,9 +263,11 @@ struct iomap_ioend { · 262 unmodified lines
263263 struct list_head io_list; /* next ioend in chain */
264264 u16 io_type;
265265 u16 io_flags; /* IOMAP_F_* */
266+ u32 io_folios; /* folios added to ioend */
266267 struct inode *io_inode; /* file being written to */
267268 size_t io_size; /* size of the extent */
268269 loff_t io_offset; /* offset in the file */
270+ sector_t io_sector; /* start sector of ioend */
269271 struct bio *io_bio; /* bio being built */
270272 struct bio io_inline_bio; /* MUST BE LAST! */
271273 };
include/linux/jbd2.h+4−9
@@ -594,7 +594,7 @@ struct transaction_s · 593 unmodified lines
594594 */
595595 unsigned long t_log_start;
596596
597− /*
597+ /*
598598 * Number of buffers on the t_buffers list [j_list_lock, no locks
599599 * needed for jbd2 thread]
600600 */
@@ -1295,7 +1295,7 @@ struct journal_s · 694 unmodified lines
12951295 * Clean-up after fast commit or full commit. JBD2 calls this function
12961296 * after every commit operation.
12971297 */
1298− void (*j_fc_cleanup_callback)(struct journal_s *journal, int);
1298+ void (*j_fc_cleanup_callback)(struct journal_s *journal, int full, tid_t tid);
12991299
13001300 /**
13011301 * @j_fc_replay_callback:
@@ -1419,9 +1419,7 @@ extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *); · 117 unmodified lines
14191419 extern bool __jbd2_journal_refile_buffer(struct journal_head *);
14201420 extern void jbd2_journal_refile_buffer(journal_t *, struct journal_head *);
14211421 extern void __jbd2_journal_file_buffer(struct journal_head *, transaction_t *, int);
1422−extern void __journal_free_buffer(struct journal_head *bh);
14231422 extern void jbd2_journal_file_buffer(struct journal_head *, transaction_t *, int);
1424−extern void __journal_clean_data_list(transaction_t *transaction);
14251423 static inline void jbd2_file_log_bh(struct list_head *head, struct buffer_head *bh)
14261424 {
14271425 list_add_tail(&bh->b_assoc_buffers, head);
@@ -1486,9 +1484,6 @@ extern int jbd2_journal_write_metadata_buffer(transaction_t *transaction, · 58 unmodified lines
14861484 struct buffer_head **bh_out,
14871485 sector_t blocknr);
14881486
1489−/* Transaction locking */
1490−extern void __wait_on_journal (journal_t *);
1491−
14921487 /* Transaction cache support */
14931488 extern void jbd2_journal_destroy_transaction_cache(void);
14941489 extern int __init jbd2_journal_init_transaction_cache(void);
@@ -1543,6 +1538,8 @@ extern int jbd2_journal_flush(journal_t *journal, unsigned int flags); · 48 unmodified lines
15431538 extern void jbd2_journal_lock_updates (journal_t *);
15441539 extern void jbd2_journal_unlock_updates (journal_t *);
15451540
1541+void jbd2_journal_wait_updates(journal_t *);
1542+
15461543 extern journal_t * jbd2_journal_init_dev(struct block_device *bdev,
15471544 struct block_device *fs_dev,
15481545 unsigned long long start, int len, int bsize);
@@ -1774,8 +1771,6 @@ static inline unsigned long jbd2_log_space_left(journal_t *journal) · 225 unmodified lines
17741771 #define BJ_Reserved 4 /* Buffer is reserved for access by journal */
17751772 #define BJ_Types 5
17761773
1777−extern int jbd_blocks_per_page(struct inode *inode);
1778−
17791774 /* JBD uses a CRC32 checksum */
17801775 #define JBD_MAX_CHECKSUM_SIZE 4
17811776
include/linux/kfence.h+2−0
@@ -17,6 +17,8 @@ · 16 unmodified lines
1717 #include <linux/atomic.h>
1818 #include <linux/static_key.h>
1919
20+extern unsigned long kfence_sample_interval;
21+
2022 /*
2123 * We allocate an even number of pages, as it simplifies calculations to map
2224 * address to metadata indices; effectively, the very first page serves as an
include/linux/kvm_host.h+109−3
@@ -29,7 +29,9 @@ · 28 unmodified lines
2929 #include <linux/refcount.h>
3030 #include <linux/nospec.h>
3131 #include <linux/notifier.h>
32+#include <linux/ftrace.h>
3233 #include <linux/hashtable.h>
34+#include <linux/instrumentation.h>
3335 #include <linux/interval_tree.h>
3436 #include <linux/rbtree.h>
3537 #include <linux/xarray.h>
@@ -368,8 +370,11 @@ struct kvm_vcpu { · 332 unmodified lines
368370 u64 last_used_slot_gen;
369371 };
370372
371−/* must be called with irqs disabled */
372−static __always_inline void guest_enter_irqoff(void)
373+/*
374+ * Start accounting time towards a guest.
375+ * Must be called before entering guest context.
376+ */
377+static __always_inline void guest_timing_enter_irqoff(void)
373378 {
374379 /*
375380 * This is running in ioctl context so its safe to assume that it's the
@@ -378,7 +383,18 @@ static __always_inline void guest_enter_irqoff(void) · 2 unmodified lines
378383 instrumentation_begin();
379384 vtime_account_guest_enter();
380385 instrumentation_end();
386+}
381387
388+/*
389+ * Enter guest context and enter an RCU extended quiescent state.
390+ *
391+ * Between guest_context_enter_irqoff() and guest_context_exit_irqoff() it is
392+ * unsafe to use any code which may directly or indirectly use RCU, tracing
393+ * (including IRQ flag tracing), or lockdep. All code in this period must be
394+ * non-instrumentable.
395+ */
396+static __always_inline void guest_context_enter_irqoff(void)
397+{
382398 /*
383399 * KVM does not hold any references to rcu protected data when it
384400 * switches CPU into a guest mode. In fact switching to a guest mode
@@ -394,16 +410,79 @@ static __always_inline void guest_enter_irqoff(void) · 9 unmodified lines
394410 }
395411 }
396412
397−static __always_inline void guest_exit_irqoff(void)
413+/*
414+ * Deprecated. Architectures should move to guest_timing_enter_irqoff() and
415+ * guest_state_enter_irqoff().
416+ */
417+static __always_inline void guest_enter_irqoff(void)
418+{
419+ guest_timing_enter_irqoff();
420+ guest_context_enter_irqoff();
421+}
422+
423+/**
424+ * guest_state_enter_irqoff - Fixup state when entering a guest
425+ *
426+ * Entry to a guest will enable interrupts, but the kernel state is interrupts
427+ * disabled when this is invoked. Also tell RCU about it.
428+ *
429+ * 1) Trace interrupts on state
430+ * 2) Invoke context tracking if enabled to adjust RCU state
431+ * 3) Tell lockdep that interrupts are enabled
432+ *
433+ * Invoked from architecture specific code before entering a guest.
434+ * Must be called with interrupts disabled and the caller must be
435+ * non-instrumentable.
436+ * The caller has to invoke guest_timing_enter_irqoff() before this.
437+ *
438+ * Note: this is analogous to exit_to_user_mode().
439+ */
440+static __always_inline void guest_state_enter_irqoff(void)
441+{
442+ instrumentation_begin();
443+ trace_hardirqs_on_prepare();
444+ lockdep_hardirqs_on_prepare(CALLER_ADDR0);
445+ instrumentation_end();
446+
447+ guest_context_enter_irqoff();
448+ lockdep_hardirqs_on(CALLER_ADDR0);
449+}
450+
451+/*
452+ * Exit guest context and exit an RCU extended quiescent state.
453+ *
454+ * Between guest_context_enter_irqoff() and guest_context_exit_irqoff() it is
455+ * unsafe to use any code which may directly or indirectly use RCU, tracing
456+ * (including IRQ flag tracing), or lockdep. All code in this period must be
457+ * non-instrumentable.
458+ */
459+static __always_inline void guest_context_exit_irqoff(void)
398460 {
399461 context_tracking_guest_exit();
462+}
400463
464+/*
465+ * Stop accounting time towards a guest.
466+ * Must be called after exiting guest context.
467+ */
468+static __always_inline void guest_timing_exit_irqoff(void)
469+{
401470 instrumentation_begin();
402471 /* Flush the guest cputime we spent on the guest */
403472 vtime_account_guest_exit();
404473 instrumentation_end();
405474 }
406475
476+/*
477+ * Deprecated. Architectures should move to guest_state_exit_irqoff() and
478+ * guest_timing_exit_irqoff().
479+ */
480+static __always_inline void guest_exit_irqoff(void)
481+{
482+ guest_context_exit_irqoff();
483+ guest_timing_exit_irqoff();
484+}
485+
407486 static inline void guest_exit(void)
408487 {
409488 unsigned long flags;
@@ -413,6 +492,33 @@ static inline void guest_exit(void) · 3 unmodified lines
413492 local_irq_restore(flags);
414493 }
415494
495+/**
496+ * guest_state_exit_irqoff - Establish state when returning from guest mode
497+ *
498+ * Entry from a guest disables interrupts, but guest mode is traced as
499+ * interrupts enabled. Also with NO_HZ_FULL RCU might be idle.
500+ *
501+ * 1) Tell lockdep that interrupts are disabled
502+ * 2) Invoke context tracking if enabled to reactivate RCU
503+ * 3) Trace interrupts off state
504+ *
505+ * Invoked from architecture specific code after exiting a guest.
506+ * Must be invoked with interrupts disabled and the caller must be
507+ * non-instrumentable.
508+ * The caller has to invoke guest_timing_exit_irqoff() after this.
509+ *
510+ * Note: this is analogous to enter_from_user_mode().
511+ */
512+static __always_inline void guest_state_exit_irqoff(void)
513+{
514+ lockdep_hardirqs_off(CALLER_ADDR0);
515+ guest_context_exit_irqoff();
516+
517+ instrumentation_begin();
518+ trace_hardirqs_off_finish();
519+ instrumentation_end();
520+}
521+
416522 static inline int kvm_vcpu_exiting_guest_mode(struct kvm_vcpu *vcpu)
417523 {
418524 /*
include/linux/libata.h+1−0
@@ -380,6 +380,7 @@ enum { · 379 unmodified lines
380380 ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */
381381 ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */
382382 ATA_HORKAGE_NO_ID_DEV_LOG = (1 << 28), /* Identify device log missing */
383+ ATA_HORKAGE_NO_LOG_DIR = (1 << 29), /* Do not read log directory */
383384
384385 /* DMA mask for user DMA control: User visible values; DO NOT
385386 renumber */
include/linux/lsm_hook_defs.h+1−1
@@ -80,7 +80,7 @@ LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb, · 79 unmodified lines
8080 unsigned long *set_kern_flags)
8181 LSM_HOOK(int, 0, move_mount, const struct path *from_path,
8282 const struct path *to_path)
83−LSM_HOOK(int, 0, dentry_init_security, struct dentry *dentry,
83+LSM_HOOK(int, -EOPNOTSUPP, dentry_init_security, struct dentry *dentry,
8484 int mode, const struct qstr *name, const char **xattr_name,
8585 void **ctx, u32 *ctxlen)
8686 LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode,
include/linux/memcontrol.h+3−2
@@ -219,7 +219,7 @@ struct obj_cgroup { · 218 unmodified lines
219219 struct mem_cgroup *memcg;
220220 atomic_t nr_charged_bytes;
221221 union {
222− struct list_head list;
222+ struct list_head list; /* protected by objcg_lock */
223223 struct rcu_head rcu;
224224 };
225225 };
@@ -315,7 +315,8 @@ struct mem_cgroup { · 89 unmodified lines
315315 #ifdef CONFIG_MEMCG_KMEM
316316 int kmemcg_id;
317317 struct obj_cgroup __rcu *objcg;
318− struct list_head objcg_list; /* list of inherited objcgs */
318+ /* list of inherited objcgs, protected by objcg_lock */
319+ struct list_head objcg_list;
319320 #endif
320321
321322 MEMCG_PADDING(_pad2_);
include/linux/mm.h+12−5
@@ -1506,11 +1506,18 @@ static inline u8 page_kasan_tag(const struct page *page) · 1505 unmodified lines
15061506
15071507 static inline void page_kasan_tag_set(struct page *page, u8 tag)
15081508 {
1509− if (kasan_enabled()) {
1510− tag ^= 0xff;
1511− page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);
1512− page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;
1513− }
1509+ unsigned long old_flags, flags;
1510+
1511+ if (!kasan_enabled())
1512+ return;
1513+
1514+ tag ^= 0xff;
1515+ old_flags = READ_ONCE(page->flags);
1516+ do {
1517+ flags = old_flags;
1518+ flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);
1519+ flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;
1520+ } while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags)));
15141521 }
15151522
15161523 static inline void page_kasan_tag_reset(struct page *page)
include/linux/mm_types.h+1−0
@@ -261,6 +261,7 @@ static_assert(sizeof(struct page) == sizeof(struct folio)); · 260 unmodified lines
261261 static_assert(offsetof(struct page, pg) == offsetof(struct folio, fl))
262262 FOLIO_MATCH(flags, flags);
263263 FOLIO_MATCH(lru, lru);
264+FOLIO_MATCH(mapping, mapping);
264265 FOLIO_MATCH(compound_head, lru);
265266 FOLIO_MATCH(index, index);
266267 FOLIO_MATCH(private, private);
include/linux/mtd/spi-nor.h+0−18
@@ -47,8 +47,6 @@ · 46 unmodified lines
4747 #define SPINOR_OP_RDID 0x9f /* Read JEDEC ID */
4848 #define SPINOR_OP_RDSFDP 0x5a /* Read SFDP */
4949 #define SPINOR_OP_RDCR 0x35 /* Read configuration register */
50−#define SPINOR_OP_RDFSR 0x70 /* Read flag status register */
51−#define SPINOR_OP_CLFSR 0x50 /* Clear flag status register */
5250 #define SPINOR_OP_RDEAR 0xc8 /* Read Extended Address Register */
5351 #define SPINOR_OP_WREAR 0xc5 /* Write Extended Address Register */
5452 #define SPINOR_OP_SRSTEN 0x66 /* Software Reset Enable */
@@ -86,22 +84,12 @@ · 31 unmodified lines
8684 #define SPINOR_OP_BP 0x02 /* Byte program */
8785 #define SPINOR_OP_AAI_WP 0xad /* Auto address increment word program */
8886
89−/* Used for S3AN flashes only */
90−#define SPINOR_OP_XSE 0x50 /* Sector erase */
91−#define SPINOR_OP_XPP 0x82 /* Page program */
92−#define SPINOR_OP_XRDSR 0xd7 /* Read status register */
93−
94−#define XSR_PAGESIZE BIT(0) /* Page size in Po2 or Linear */
95−#define XSR_RDY BIT(7) /* Ready */
96−
97−
9887 /* Used for Macronix and Winbond flashes. */
9988 #define SPINOR_OP_EN4B 0xb7 /* Enter 4-byte mode */
10089 #define SPINOR_OP_EX4B 0xe9 /* Exit 4-byte mode */
10190
10291 /* Used for Spansion flashes only. */
10392 #define SPINOR_OP_BRWR 0x17 /* Bank register write */
104−#define SPINOR_OP_CLSR 0x30 /* Clear status register 1 */
10593
10694 /* Used for Micron flashes only. */
10795 #define SPINOR_OP_RD_EVCR 0x65 /* Read EVCR register */
@@ -135,12 +123,6 @@ · 27 unmodified lines
135123 /* Enhanced Volatile Configuration Register bits */
136124 #define EVCR_QUAD_EN_MICRON BIT(7) /* Micron Quad I/O */
137125
138−/* Flag Status Register bits */
139−#define FSR_READY BIT(7) /* Device status, 0 = Busy, 1 = Ready */
140−#define FSR_E_ERR BIT(5) /* Erase operation status */
141−#define FSR_P_ERR BIT(4) /* Program operation status */
142−#define FSR_PT_ERR BIT(1) /* Protection error bit */
143−
144126 /* Status Register 2 bits. */
145127 #define SR2_QUAD_EN_BIT1 BIT(1)
146128 #define SR2_LB1 BIT(3) /* Security Register Lock Bit 1 */
include/linux/netdevice.h+2−1
@@ -2158,7 +2158,7 @@ struct net_device { · 2157 unmodified lines
21582158 struct netdev_queue *_tx ____cacheline_aligned_in_smp;
21592159 unsigned int num_tx_queues;
21602160 unsigned int real_num_tx_queues;
2161− struct Qdisc *qdisc;
2161+ struct Qdisc __rcu *qdisc;
21622162 unsigned int tx_queue_len;
21632163 spinlock_t tx_global_lock;
21642164
@@ -2548,6 +2548,7 @@ struct packet_type { · 383 unmodified lines
25482548 struct net_device *);
25492549 bool (*id_match)(struct packet_type *ptype,
25502550 struct sock *sk);
2551+ struct net *af_packet_net;
25512552 void *af_packet_priv;
25522553 struct list_head list;
25532554 };
include/linux/netfs.h+7−0
@@ -244,6 +244,13 @@ struct netfs_cache_ops { · 243 unmodified lines
244244 int (*prepare_write)(struct netfs_cache_resources *cres,
245245 loff_t *_start, size_t *_len, loff_t i_size,
246246 bool no_space_allocated_yet);
247+
248+ /* Query the occupancy of the cache in a region, returning where the
249+ * next chunk of data starts and how long it is.
250+ */
251+ int (*query_occupancy)(struct netfs_cache_resources *cres,
252+ loff_t start, size_t len, size_t granularity,
253+ loff_t *_data_start, size_t *_data_len);
247254 };
248255
249256 struct readahead_control;
include/linux/nfs.h+0−8
@@ -36,14 +36,6 @@ static inline void nfs_copy_fh(struct nfs_fh *target, const struct nfs_fh *sourc · 35 unmodified lines
3636 memcpy(target->data, source->data, source->size);
3737 }
3838
39−
40−/*
41− * This is really a general kernel constant, but since nothing like
42− * this is defined in the kernel headers, I have to do it here.
43− */
44−#define NFS_OFFSET_MAX ((__s64)((~(__u64)0) >> 1))
45−
46−
4739 enum nfs3_stable_how {
4840 NFS_UNSTABLE = 0,
4941 NFS_DATA_SYNC = 1,
include/linux/nfs_fs.h+7−4
@@ -61,7 +61,9 @@ · 60 unmodified lines
6161 struct nfs_access_entry {
6262 struct rb_node rb_node;
6363 struct list_head lru;
64− const struct cred * cred;
64+ kuid_t fsuid;
65+ kgid_t fsgid;
66+ struct group_info *group_info;
6567 __u32 mask;
6668 struct rcu_head rcu_head;
6769 };
@@ -105,6 +107,7 @@ struct nfs_open_dir_context { · 37 unmodified lines
105107 __u64 dup_cookie;
106108 pgoff_t page_index;
107109 signed char duped;
110+ bool eof;
108111 };
109112
110113 /*
@@ -395,7 +398,7 @@ extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fa · 284 unmodified lines
395398 extern int nfs_post_op_update_inode_force_wcc_locked(struct inode *inode, struct nfs_fattr *fattr);
396399 extern int nfs_getattr(struct user_namespace *, const struct path *,
397400 struct kstat *, u32, unsigned int);
398−extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
401+extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *, const struct cred *);
399402 extern void nfs_access_set_mask(struct nfs_access_entry *, u32);
400403 extern int nfs_permission(struct user_namespace *, struct inode *, int);
401404 extern int nfs_open(struct inode *, struct file *);
@@ -532,8 +535,8 @@ extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, · 130 unmodified lines
532535 struct nfs_fattr *fattr);
533536 extern int nfs_may_open(struct inode *inode, const struct cred *cred, int openflags);
534537 extern void nfs_access_zap_cache(struct inode *inode);
535−extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res,
536− bool may_block);
538+extern int nfs_access_get_cached(struct inode *inode, const struct cred *cred,
539+ u32 *mask, bool may_block);
537540
538541 /*
539542 * linux/fs/nfs/symlink.c
include/linux/nfs_fs_sb.h+3−1
@@ -266,6 +266,8 @@ struct nfs_server { · 265 unmodified lines
266266 #define NFS_CAP_ACLS (1U << 3)
267267 #define NFS_CAP_ATOMIC_OPEN (1U << 4)
268268 #define NFS_CAP_LGOPEN (1U << 5)
269+#define NFS_CAP_CASE_INSENSITIVE (1U << 6)
270+#define NFS_CAP_CASE_PRESERVING (1U << 7)
269271 #define NFS_CAP_POSIX_LOCK (1U << 14)
270272 #define NFS_CAP_UIDGID_NOMAP (1U << 15)
271273 #define NFS_CAP_STATEID_NFSV41 (1U << 16)
@@ -282,5 +284,5 @@ struct nfs_server { · 10 unmodified lines
282284 #define NFS_CAP_COPY_NOTIFY (1U << 27)
283285 #define NFS_CAP_XATTR (1U << 28)
284286 #define NFS_CAP_READ_PLUS (1U << 29)
285−
287+#define NFS_CAP_FS_LOCATIONS (1U << 30)
286288 #endif
include/linux/nfs_xdr.h+4−1
@@ -1194,6 +1194,8 @@ struct nfs4_server_caps_res { · 1193 unmodified lines
11941194 u32 has_links;
11951195 u32 has_symlinks;
11961196 u32 fh_expire_type;
1197+ u32 case_insensitive;
1198+ u32 case_preserving;
11971199 };
11981200
11991201 #define NFS4_PATHNAME_MAXCOMPONENTS 512
@@ -1737,7 +1739,7 @@ struct nfs_rpc_ops { · 537 unmodified lines
17371739 struct nfs_fh *, struct nfs_fattr *);
17381740 int (*lookupp) (struct inode *, struct nfs_fh *,
17391741 struct nfs_fattr *);
1740− int (*access) (struct inode *, struct nfs_access_entry *);
1742+ int (*access) (struct inode *, struct nfs_access_entry *, const struct cred *);
17411743 int (*readlink)(struct inode *, struct page *, unsigned int,
17421744 unsigned int);
17431745 int (*create) (struct inode *, struct dentry *,
@@ -1795,6 +1797,7 @@ struct nfs_rpc_ops { · 51 unmodified lines
17951797 struct nfs_server *(*create_server)(struct fs_context *);
17961798 struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,
17971799 struct nfs_fattr *, rpc_authflavor_t);
1800+ int (*discover_trunking)(struct nfs_server *, struct nfs_fh *);
17981801 };
17991802
18001803 /*
include/linux/page_table_check.h+19−0
@@ -26,6 +26,9 @@ void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr, · 25 unmodified lines
2626 pmd_t *pmdp, pmd_t pmd);
2727 void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
2828 pud_t *pudp, pud_t pud);
29+void __page_table_check_pte_clear_range(struct mm_struct *mm,
30+ unsigned long addr,
31+ pmd_t pmd);
2932
3033 static inline void page_table_check_alloc(struct page *page, unsigned int order)
3134 {
@@ -100,6 +103,16 @@ static inline void page_table_check_pud_set(struct mm_struct *mm, · 68 unmodified lines
100103 __page_table_check_pud_set(mm, addr, pudp, pud);
101104 }
102105
106+static inline void page_table_check_pte_clear_range(struct mm_struct *mm,
107+ unsigned long addr,
108+ pmd_t pmd)
109+{
110+ if (static_branch_likely(&page_table_check_disabled))
111+ return;
112+
113+ __page_table_check_pte_clear_range(mm, addr, pmd);
114+}
115+
103116 #else
104117
105118 static inline void page_table_check_alloc(struct page *page, unsigned int order)
@@ -143,5 +156,11 @@ static inline void page_table_check_pud_set(struct mm_struct *mm, · 37 unmodified lines
143156 {
144157 }
145158
159+static inline void page_table_check_pte_clear_range(struct mm_struct *mm,
160+ unsigned long addr,
161+ pmd_t pmd)
162+{
163+}
164+
146165 #endif /* CONFIG_PAGE_TABLE_CHECK */
147166 #endif /* __LINUX_PAGE_TABLE_CHECK_H */
include/linux/perf_event.h+3−12
@@ -693,18 +693,6 @@ struct perf_event { · 692 unmodified lines
693693 u64 total_time_running;
694694 u64 tstamp;
695695
696− /*
697− * timestamp shadows the actual context timing but it can
698− * be safely used in NMI interrupt context. It reflects the
699− * context time as it was when the event was last scheduled in,
700− * or when ctx_sched_in failed to schedule the event because we
701− * run out of PMC.
702− *
703− * ctx_time already accounts for ctx->timestamp. Therefore to
704− * compute ctx_time for a sample, simply add perf_clock().
705− */
706− u64 shadow_ctx_time;
707−
708696 struct perf_event_attr attr;
709697 u16 header_size;
710698 u16 id_header_size;
@@ -852,6 +840,7 @@ struct perf_event_context { · 141 unmodified lines
852840 */
853841 u64 time;
854842 u64 timestamp;
843+ u64 timeoffset;
855844
856845 /*
857846 * These fields let us detect when two contexts have both
@@ -934,6 +923,8 @@ struct bpf_perf_event_data_kern { · 76 unmodified lines
934923 struct perf_cgroup_info {
935924 u64 time;
936925 u64 timestamp;
926+ u64 timeoffset;
927+ int active;
937928 };
938929
939930 struct perf_cgroup {
include/linux/pgtable.h+1−0
@@ -62,6 +62,7 @@ static inline unsigned long pte_index(unsigned long address) · 61 unmodified lines
6262 {
6363 return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
6464 }
65+#define pte_index pte_index
6566
6667 #ifndef pmd_index
6768 static inline unsigned long pmd_index(unsigned long address)
include/linux/pid_namespace.h+5−0
@@ -86,4 +86,9 @@ extern struct pid_namespace *task_active_pid_ns(struct task_struct *tsk); · 85 unmodified lines
8686 void pidhash_init(void);
8787 void pid_idr_init(void);
8888
89+static inline bool task_is_in_init_pid_ns(struct task_struct *tsk)
90+{
91+ return task_active_pid_ns(tsk) == &init_pid_ns;
92+}
93+
8994 #endif /* _LINUX_PID_NS_H */
include/linux/psi.h+6−7
@@ -25,18 +25,17 @@ void psi_memstall_enter(unsigned long *flags); · 24 unmodified lines
2525 void psi_memstall_leave(unsigned long *flags);
2626
2727 int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res);
28−
29−#ifdef CONFIG_CGROUPS
30−int psi_cgroup_alloc(struct cgroup *cgrp);
31−void psi_cgroup_free(struct cgroup *cgrp);
32−void cgroup_move_task(struct task_struct *p, struct css_set *to);
33−
3428 struct psi_trigger *psi_trigger_create(struct psi_group *group,
3529 char *buf, size_t nbytes, enum psi_res res);
36−void psi_trigger_replace(void **trigger_ptr, struct psi_trigger *t);
30+void psi_trigger_destroy(struct psi_trigger *t);
3731
3832 __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,
3933 poll_table *wait);
34+
35+#ifdef CONFIG_CGROUPS
36+int psi_cgroup_alloc(struct cgroup *cgrp);
37+void psi_cgroup_free(struct cgroup *cgrp);
38+void cgroup_move_task(struct task_struct *p, struct css_set *to);
4039 #endif
4140
4241 #else /* CONFIG_PSI */
include/linux/psi_types.h+0−3
@@ -141,9 +141,6 @@ struct psi_trigger { · 140 unmodified lines
141141 * events to one per window
142142 */
143143 u64 last_event_time;
144−
145− /* Refcounting to prevent premature destruction */
146− struct kref refcount;
147144 };
148145
149146 struct psi_group {
include/linux/quota.h+1−1
@@ -91,7 +91,7 @@ extern bool qid_valid(struct kqid qid); · 90 unmodified lines
9191 *
9292 * When there is no mapping defined for the user-namespace, type,
9393 * qid tuple an invalid kqid is returned. Callers are expected to
94− * test for and handle handle invalid kqids being returned.
94+ * test for and handle invalid kqids being returned.
9595 * Invalid kqids may be tested for using qid_valid().
9696 */
9797 static inline struct kqid make_kqid(struct user_namespace *from,
include/linux/sched.h+0−5
@@ -619,10 +619,6 @@ struct sched_dl_entity { · 618 unmodified lines
619619 * task has to wait for a replenishment to be performed at the
620620 * next firing of dl_timer.
621621 *
622− * @dl_boosted tells if we are boosted due to DI. If so we are
623− * outside bandwidth enforcement mechanism (but only until we
624− * exit the critical section);
625− *
626622 * @dl_yielded tells if task gave up the CPU before consuming
627623 * all its available runtime during the last job.
628624 *
@@ -1684,7 +1680,6 @@ extern struct pid *cad_pid; · 1055 unmodified lines
16841680 #define PF_MEMALLOC 0x00000800 /* Allocating memory */
16851681 #define PF_NPROC_EXCEEDED 0x00001000 /* set_user() noticed that RLIMIT_NPROC was exceeded */
16861682 #define PF_USED_MATH 0x00002000 /* If unset the fpu must be initialized before use */
1687−#define PF_USED_ASYNC 0x00004000 /* Used async_schedule*(), used by module init */
16881683 #define PF_NOFREEZE 0x00008000 /* This thread should not be frozen */
16891684 #define PF_FROZEN 0x00010000 /* Frozen for system suspend */
16901685 #define PF_KSWAPD 0x00020000 /* I am kswapd */
include/linux/sched/task.h+2−2
@@ -54,8 +54,8 @@ extern asmlinkage void schedule_tail(struct task_struct *prev); · 53 unmodified lines
5454 extern void init_idle(struct task_struct *idle, int cpu);
5555
5656 extern int sched_fork(unsigned long clone_flags, struct task_struct *p);
57−extern void sched_post_fork(struct task_struct *p,
58− struct kernel_clone_args *kargs);
57+extern void sched_cgroup_fork(struct task_struct *p, struct kernel_clone_args *kargs);
58+extern void sched_post_fork(struct task_struct *p);
5959 extern void sched_dead(struct task_struct *p);
6060
6161 void __noreturn do_task_dead(void);
include/linux/skbuff.h+1−1
@@ -318,7 +318,7 @@ enum skb_drop_reason { · 317 unmodified lines
318318 SKB_DROP_REASON_NO_SOCKET,
319319 SKB_DROP_REASON_PKT_TOO_SMALL,
320320 SKB_DROP_REASON_TCP_CSUM,
321− SKB_DROP_REASON_TCP_FILTER,
321+ SKB_DROP_REASON_SOCKET_FILTER,
322322 SKB_DROP_REASON_UDP_CSUM,
323323 SKB_DROP_REASON_MAX,
324324 };
include/linux/suspend.h+3−12
@@ -430,15 +430,7 @@ struct platform_hibernation_ops { · 429 unmodified lines
430430
431431 #ifdef CONFIG_HIBERNATION
432432 /* kernel/power/snapshot.c */
433−extern void __register_nosave_region(unsigned long b, unsigned long e, int km);
434−static inline void __init register_nosave_region(unsigned long b, unsigned long e)
435−{
436− __register_nosave_region(b, e, 0);
437−}
438−static inline void __init register_nosave_region_late(unsigned long b, unsigned long e)
439−{
440− __register_nosave_region(b, e, 1);
441−}
433+extern void register_nosave_region(unsigned long b, unsigned long e);
442434 extern int swsusp_page_is_forbidden(struct page *);
443435 extern void swsusp_set_page_free(struct page *);
444436 extern void swsusp_unset_page_free(struct page *);
@@ -458,7 +450,6 @@ int pfn_is_nosave(unsigned long pfn); · 13 unmodified lines
458450 int hibernate_quiet_exec(int (*func)(void *data), void *data);
459451 #else /* CONFIG_HIBERNATION */
460452 static inline void register_nosave_region(unsigned long b, unsigned long e) {}
461−static inline void register_nosave_region_late(unsigned long b, unsigned long e) {}
462453 static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
463454 static inline void swsusp_set_page_free(struct page *p) {}
464455 static inline void swsusp_unset_page_free(struct page *p) {}
@@ -506,14 +497,14 @@ extern void ksys_sync_helper(void); · 41 unmodified lines
506497
507498 /* drivers/base/power/wakeup.c */
508499 extern bool events_check_enabled;
509−extern unsigned int pm_wakeup_irq;
510500 extern suspend_state_t pm_suspend_target_state;
511501
512502 extern bool pm_wakeup_pending(void);
513503 extern void pm_system_wakeup(void);
514504 extern void pm_system_cancel_wakeup(void);
515−extern void pm_wakeup_clear(bool reset);
505+extern void pm_wakeup_clear(unsigned int irq_number);
516506 extern void pm_system_irq_wakeup(unsigned int irq_number);
507+extern unsigned int pm_wakeup_irq(void);
517508 extern bool pm_get_wakeup_count(unsigned int *count, bool block);
518509 extern bool pm_save_wakeup_count(unsigned int count);
519510 extern void pm_wakep_autosleep_enabled(bool set);
include/linux/sysctl.h+1−1
@@ -265,7 +265,7 @@ static inline struct ctl_table_header *register_sysctl_table(struct ctl_table * · 264 unmodified lines
265265 return NULL;
266266 }
267267
268−static inline struct sysctl_header *register_sysctl_mount_point(const char *path)
268+static inline struct ctl_table_header *register_sysctl_mount_point(const char *path)
269269 {
270270 return NULL;
271271 }
include/linux/usb/role.h+6−0
@@ -91,6 +91,12 @@ fwnode_usb_role_switch_get(struct fwnode_handle *node) · 90 unmodified lines
9191
9292 static inline void usb_role_switch_put(struct usb_role_switch *sw) { }
9393
94+static inline struct usb_role_switch *
95+usb_role_switch_find_by_fwnode(const struct fwnode_handle *fwnode)
96+{
97+ return NULL;
98+}
99+
94100 static inline struct usb_role_switch *
95101 usb_role_switch_register(struct device *parent,
96102 const struct usb_role_switch_desc *desc)
include/net/addrconf.h+2−2
@@ -6,6 +6,8 @@ · 5 unmodified lines
66 #define RTR_SOLICITATION_INTERVAL (4*HZ)
77 #define RTR_SOLICITATION_MAX_INTERVAL (3600*HZ) /* 1 hour */
88
9+#define MIN_VALID_LIFETIME (2*3600) /* 2 hours */
10+
911 #define TEMP_VALID_LIFETIME (7*86400)
1012 #define TEMP_PREFERRED_LIFETIME (86400)
1113 #define REGEN_MAX_RETRY (3)
@@ -107,8 +109,6 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, · 95 unmodified lines
107109 int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
108110 const struct in6_addr *daddr, unsigned int srcprefs,
109111 struct in6_addr *saddr);
110−int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
111− u32 banned_flags);
112112 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
113113 u32 banned_flags);
114114 bool inet_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
include/net/ax25.h+12−0
@@ -239,6 +239,7 @@ typedef struct ax25_dev { · 238 unmodified lines
239239 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
240240 ax25_dama_info dama;
241241 #endif
242+ refcount_t refcount;
242243 } ax25_dev;
243244
244245 typedef struct ax25_cb {
@@ -293,6 +294,17 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25) · 48 unmodified lines
293294 }
294295 }
295296
297+static inline void ax25_dev_hold(ax25_dev *ax25_dev)
298+{
299+ refcount_inc(&ax25_dev->refcount);
300+}
301+
302+static inline void ax25_dev_put(ax25_dev *ax25_dev)
303+{
304+ if (refcount_dec_and_test(&ax25_dev->refcount)) {
305+ kfree(ax25_dev);
306+ }
307+}
296308 static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
297309 {
298310 skb->dev = dev;
include/net/bond_3ad.h+1−1
@@ -262,7 +262,7 @@ struct ad_system { · 261 unmodified lines
262262 struct ad_bond_info {
263263 struct ad_system system; /* 802.3ad system structure */
264264 struct bond_3ad_stats stats;
265− u32 agg_select_timer; /* Timer to select aggregator after all adapter's hand shakes */
265+ atomic_t agg_select_timer; /* Timer to select aggregator after all adapter's hand shakes */
266266 u16 aggregator_identifier;
267267 };
268268
include/net/bonding.h+1−1
@@ -346,7 +346,7 @@ static inline bool bond_uses_primary(struct bonding *bond) · 345 unmodified lines
346346
347347 static inline struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond)
348348 {
349− struct slave *slave = rcu_dereference(bond->curr_active_slave);
349+ struct slave *slave = rcu_dereference_rtnl(bond->curr_active_slave);
350350
351351 return bond_uses_primary(bond) && slave ? slave->dev : NULL;
352352 }
include/net/dsa.h+1−0
@@ -1187,6 +1187,7 @@ void dsa_unregister_switch(struct dsa_switch *ds); · 1186 unmodified lines
11871187 int dsa_register_switch(struct dsa_switch *ds);
11881188 void dsa_switch_shutdown(struct dsa_switch *ds);
11891189 struct dsa_switch *dsa_switch_find(int tree_index, int sw_index);
1190+void dsa_flush_workqueue(void);
11901191 #ifdef CONFIG_PM_SLEEP
11911192 int dsa_switch_suspend(struct dsa_switch *ds);
11921193 int dsa_switch_resume(struct dsa_switch *ds);
include/net/dst_metadata.h+13−1
@@ -123,8 +123,20 @@ static inline struct metadata_dst *tun_dst_unclone(struct sk_buff *skb) · 122 unmodified lines
123123
124124 memcpy(&new_md->u.tun_info, &md_dst->u.tun_info,
125125 sizeof(struct ip_tunnel_info) + md_size);
126+#ifdef CONFIG_DST_CACHE
127+ /* Unclone the dst cache if there is one */
128+ if (new_md->u.tun_info.dst_cache.cache) {
129+ int ret;
130+
131+ ret = dst_cache_init(&new_md->u.tun_info.dst_cache, GFP_ATOMIC);
132+ if (ret) {
133+ metadata_dst_free(new_md);
134+ return ERR_PTR(ret);
135+ }
136+ }
137+#endif
138+
126139 skb_dst_drop(skb);
127− dst_hold(&new_md->dst);
128140 skb_dst_set(skb, &new_md->dst);
129141 return new_md;
130142 }
include/net/ip.h+10−11
@@ -525,19 +525,18 @@ static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb, · 524 unmodified lines
525525 {
526526 struct iphdr *iph = ip_hdr(skb);
527527
528+ /* We had many attacks based on IPID, use the private
529+ * generator as much as we can.
530+ */
531+ if (sk && inet_sk(sk)->inet_daddr) {
532+ iph->id = htons(inet_sk(sk)->inet_id);
533+ inet_sk(sk)->inet_id += segs;
534+ return;
535+ }
528536 if ((iph->frag_off & htons(IP_DF)) && !skb->ignore_df) {
529− /* This is only to work around buggy Windows95/2000
530− * VJ compression implementations. If the ID field
531− * does not change, they drop every other packet in
532− * a TCP stream using header compression.
533− */
534− if (sk && inet_sk(sk)->inet_daddr) {
535− iph->id = htons(inet_sk(sk)->inet_id);
536− inet_sk(sk)->inet_id += segs;
537− } else {
538− iph->id = 0;
539− }
537+ iph->id = 0;
540538 } else {
539+ /* Unfortunately we need the big hammer to get a suitable IPID */
541540 __ip_select_ident(net, iph, segs);
542541 }
543542 }
include/net/ip6_fib.h+7−5
@@ -190,14 +190,16 @@ struct fib6_info { · 189 unmodified lines
190190 u32 fib6_metric;
191191 u8 fib6_protocol;
192192 u8 fib6_type;
193+
194+ u8 offload;
195+ u8 trap;
196+ u8 offload_failed;
197+
193198 u8 should_flush:1,
194199 dst_nocount:1,
195200 dst_nopolicy:1,
196201 fib6_destroying:1,
197− offload:1,
198− trap:1,
199− offload_failed:1,
200− unused:1;
202+ unused:4;
201203
202204 struct rcu_head rcu;
203205 struct nexthop *nh;
@@ -282,7 +284,7 @@ static inline bool fib6_get_cookie_safe(const struct fib6_info *f6i, · 78 unmodified lines
282284 fn = rcu_dereference(f6i->fib6_node);
283285
284286 if (fn) {
285− *cookie = fn->fn_sernum;
287+ *cookie = READ_ONCE(fn->fn_sernum);
286288 /* pairs with smp_wmb() in __fib6_update_sernum_upto_root() */
287289 smp_rmb();
288290 status = true;
include/net/ipv6.h+4−1
@@ -393,17 +393,20 @@ static inline void txopt_put(struct ipv6_txoptions *opt) · 392 unmodified lines
393393 kfree_rcu(opt, rcu);
394394 }
395395
396+#if IS_ENABLED(CONFIG_IPV6)
396397 struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label);
397398
398399 extern struct static_key_false_deferred ipv6_flowlabel_exclusive;
399400 static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk,
400401 __be32 label)
401402 {
402− if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key))
403+ if (static_branch_unlikely(&ipv6_flowlabel_exclusive.key) &&
404+ READ_ONCE(sock_net(sk)->ipv6.flowlabel_has_excl))
403405 return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT);
404406
405407 return NULL;
406408 }
409+#endif
407410
408411 struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,
409412 struct ip6_flowlabel *fl,
include/net/neighbour.h+13−5
@@ -350,7 +350,8 @@ static inline struct neighbour *neigh_create(struct neigh_table *tbl, · 349 unmodified lines
350350 return __neigh_create(tbl, pkey, dev, true);
351351 }
352352 void neigh_destroy(struct neighbour *neigh);
353−int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
353+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,
354+ const bool immediate_ok);
354355 int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, u32 flags,
355356 u32 nlmsg_pid);
356357 void __neigh_set_probe_once(struct neighbour *neigh);
@@ -460,17 +461,24 @@ static inline struct neighbour * neigh_clone(struct neighbour *neigh) · 103 unmodified lines
460461
461462 #define neigh_hold(n) refcount_inc(&(n)->refcnt)
462463
463−static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
464+static __always_inline int neigh_event_send_probe(struct neighbour *neigh,
465+ struct sk_buff *skb,
466+ const bool immediate_ok)
464467 {
465468 unsigned long now = jiffies;
466−
469+
467470 if (READ_ONCE(neigh->used) != now)
468471 WRITE_ONCE(neigh->used, now);
469− if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE)))
470− return __neigh_event_send(neigh, skb);
472+ if (!(neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE)))
473+ return __neigh_event_send(neigh, skb, immediate_ok);
471474 return 0;
472475 }
473476
477+static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
478+{
479+ return neigh_event_send_probe(neigh, skb, true);
480+}
481+
474482 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
475483 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
476484 {
include/net/netns/ipv6.h+2−1
@@ -77,9 +77,10 @@ struct netns_ipv6 { · 76 unmodified lines
7777 spinlock_t fib6_gc_lock;
7878 unsigned int ip6_rt_gc_expire;
7979 unsigned long ip6_rt_last_gc;
80+ unsigned char flowlabel_has_excl;
8081 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
81− unsigned int fib6_rules_require_fldissect;
8282 bool fib6_has_custom_rules;
83+ unsigned int fib6_rules_require_fldissect;
8384 #ifdef CONFIG_IPV6_SUBTREES
8485 unsigned int fib6_routes_require_src;
8586 #endif
include/net/route.h+1−1
@@ -370,7 +370,7 @@ static inline struct neighbour *ip_neigh_gw4(struct net_device *dev, · 369 unmodified lines
370370 {
371371 struct neighbour *neigh;
372372
373− neigh = __ipv4_neigh_lookup_noref(dev, daddr);
373+ neigh = __ipv4_neigh_lookup_noref(dev, (__force u32)daddr);
374374 if (unlikely(!neigh))
375375 neigh = __neigh_create(&arp_tbl, &daddr, dev, false);
376376
include/net/tcp.h+4−0
@@ -1369,6 +1369,7 @@ static inline bool tcp_checksum_complete(struct sk_buff *skb) · 1368 unmodified lines
13691369
13701370 bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb);
13711371
1372+#ifdef CONFIG_INET
13721373 void __sk_defer_free_flush(struct sock *sk);
13731374
13741375 static inline void sk_defer_free_flush(struct sock *sk)
@@ -1377,6 +1378,9 @@ static inline void sk_defer_free_flush(struct sock *sk) · 2 unmodified lines
13771378 return;
13781379 __sk_defer_free_flush(sk);
13791380 }
1381+#else
1382+static inline void sk_defer_free_flush(struct sock *sk) {}
1383+#endif
13801384
13811385 int tcp_filter(struct sock *sk, struct sk_buff *skb);
13821386 void tcp_set_state(struct sock *sk, int state);
include/sound/pcm.h+15−0
@@ -617,6 +617,7 @@ void snd_pcm_stream_unlock(struct snd_pcm_substream *substream); · 616 unmodified lines
617617 void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream);
618618 void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream);
619619 unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream);
620+unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream);
620621
621622 /**
622623 * snd_pcm_stream_lock_irqsave - Lock the PCM stream
@@ -635,6 +636,20 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); · 12 unmodified lines
635636 void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
636637 unsigned long flags);
637638
639+/**
640+ * snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking
641+ * @substream: PCM substream
642+ * @flags: irq flags
643+ *
644+ * This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with
645+ * the single-depth lockdep subclass.
646+ */
647+#define snd_pcm_stream_lock_irqsave_nested(substream, flags) \
648+ do { \
649+ typecheck(unsigned long, flags); \
650+ flags = _snd_pcm_stream_lock_irqsave_nested(substream); \
651+ } while (0)
652+
638653 /**
639654 * snd_pcm_group_for_each_entry - iterate over the linked substreams
640655 * @s: the iterator
include/trace/events/skb.h+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 EM(SKB_DROP_REASON_NO_SOCKET, NO_SOCKET) \
1515 EM(SKB_DROP_REASON_PKT_TOO_SMALL, PKT_TOO_SMALL) \
1616 EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM) \
17− EM(SKB_DROP_REASON_TCP_FILTER, TCP_FILTER) \
17+ EM(SKB_DROP_REASON_SOCKET_FILTER, SOCKET_FILTER) \
1818 EM(SKB_DROP_REASON_UDP_CSUM, UDP_CSUM) \
1919 EMe(SKB_DROP_REASON_MAX, MAX)
2020
include/trace/events/sunrpc.h+45−25
@@ -794,6 +794,9 @@ RPC_SHOW_SOCKET · 793 unmodified lines
794794
795795 RPC_SHOW_SOCK
796796
797+
798+#include <trace/events/net_probe_common.h>
799+
797800 /*
798801 * Now redefine the EM() and EMe() macros to map the enums to the strings
799802 * that will be printed in the output.
@@ -816,27 +819,32 @@ DECLARE_EVENT_CLASS(xs_socket_event, · 16 unmodified lines
816819 __field(unsigned int, socket_state)
817820 __field(unsigned int, sock_state)
818821 __field(unsigned long long, ino)
819− __string(dstaddr,
820− xprt->address_strings[RPC_DISPLAY_ADDR])
821− __string(dstport,
822− xprt->address_strings[RPC_DISPLAY_PORT])
822+ __array(__u8, saddr, sizeof(struct sockaddr_in6))
823+ __array(__u8, daddr, sizeof(struct sockaddr_in6))
823824 ),
824825
825826 TP_fast_assign(
826827 struct inode *inode = SOCK_INODE(socket);
828+ const struct sock *sk = socket->sk;
829+ const struct inet_sock *inet = inet_sk(sk);
830+
831+ memset(__entry->saddr, 0, sizeof(struct sockaddr_in6));
832+ memset(__entry->daddr, 0, sizeof(struct sockaddr_in6));
833+
834+ TP_STORE_ADDR_PORTS(__entry, inet, sk);
835+
827836 __entry->socket_state = socket->state;
828837 __entry->sock_state = socket->sk->sk_state;
829838 __entry->ino = (unsigned long long)inode->i_ino;
830− __assign_str(dstaddr,
831− xprt->address_strings[RPC_DISPLAY_ADDR]);
832− __assign_str(dstport,
833− xprt->address_strings[RPC_DISPLAY_PORT]);
839+
834840 ),
835841
836842 TP_printk(
837− "socket:[%llu] dstaddr=%s/%s "
843+ "socket:[%llu] srcaddr=%pISpc dstaddr=%pISpc "
838844 "state=%u (%s) sk_state=%u (%s)",
839− __entry->ino, __get_str(dstaddr), __get_str(dstport),
845+ __entry->ino,
846+ __entry->saddr,
847+ __entry->daddr,
840848 __entry->socket_state,
841849 rpc_show_socket_state(__entry->socket_state),
842850 __entry->sock_state,
@@ -866,29 +874,33 @@ DECLARE_EVENT_CLASS(xs_socket_event_done, · 23 unmodified lines
866874 __field(unsigned int, socket_state)
867875 __field(unsigned int, sock_state)
868876 __field(unsigned long long, ino)
869− __string(dstaddr,
870− xprt->address_strings[RPC_DISPLAY_ADDR])
871− __string(dstport,
872− xprt->address_strings[RPC_DISPLAY_PORT])
877+ __array(__u8, saddr, sizeof(struct sockaddr_in6))
878+ __array(__u8, daddr, sizeof(struct sockaddr_in6))
873879 ),
874880
875881 TP_fast_assign(
876882 struct inode *inode = SOCK_INODE(socket);
883+ const struct sock *sk = socket->sk;
884+ const struct inet_sock *inet = inet_sk(sk);
885+
886+ memset(__entry->saddr, 0, sizeof(struct sockaddr_in6));
887+ memset(__entry->daddr, 0, sizeof(struct sockaddr_in6));
888+
889+ TP_STORE_ADDR_PORTS(__entry, inet, sk);
890+
877891 __entry->socket_state = socket->state;
878892 __entry->sock_state = socket->sk->sk_state;
879893 __entry->ino = (unsigned long long)inode->i_ino;
880894 __entry->error = error;
881− __assign_str(dstaddr,
882− xprt->address_strings[RPC_DISPLAY_ADDR]);
883− __assign_str(dstport,
884− xprt->address_strings[RPC_DISPLAY_PORT]);
885895 ),
886896
887897 TP_printk(
888− "error=%d socket:[%llu] dstaddr=%s/%s "
898+ "error=%d socket:[%llu] srcaddr=%pISpc dstaddr=%pISpc "
889899 "state=%u (%s) sk_state=%u (%s)",
890900 __entry->error,
891− __entry->ino, __get_str(dstaddr), __get_str(dstport),
901+ __entry->ino,
902+ __entry->saddr,
903+ __entry->daddr,
892904 __entry->socket_state,
893905 rpc_show_socket_state(__entry->socket_state),
894906 __entry->sock_state,
@@ -953,7 +965,8 @@ TRACE_EVENT(rpc_socket_nospace, · 58 unmodified lines
953965 { BIT(XPRT_REMOVE), "REMOVE" }, \
954966 { BIT(XPRT_CONGESTED), "CONGESTED" }, \
955967 { BIT(XPRT_CWND_WAIT), "CWND_WAIT" }, \
956− { BIT(XPRT_WRITE_SPACE), "WRITE_SPACE" })
968+ { BIT(XPRT_WRITE_SPACE), "WRITE_SPACE" }, \
969+ { BIT(XPRT_SND_IS_COOKIE), "SND_IS_COOKIE" })
957970
958971 DECLARE_EVENT_CLASS(rpc_xprt_lifetime_class,
959972 TP_PROTO(
@@ -1150,8 +1163,11 @@ DECLARE_EVENT_CLASS(xprt_writelock_event, · 190 unmodified lines
11501163 __entry->task_id = -1;
11511164 __entry->client_id = -1;
11521165 }
1153− __entry->snd_task_id = xprt->snd_task ?
1154− xprt->snd_task->tk_pid : -1;
1166+ if (xprt->snd_task &&
1167+ !test_bit(XPRT_SND_IS_COOKIE, &xprt->state))
1168+ __entry->snd_task_id = xprt->snd_task->tk_pid;
1169+ else
1170+ __entry->snd_task_id = -1;
11551171 ),
11561172
11571173 TP_printk(SUNRPC_TRACE_TASK_SPECIFIER
@@ -1196,8 +1212,12 @@ DECLARE_EVENT_CLASS(xprt_cong_event, · 38 unmodified lines
11961212 __entry->task_id = -1;
11971213 __entry->client_id = -1;
11981214 }
1199− __entry->snd_task_id = xprt->snd_task ?
1200− xprt->snd_task->tk_pid : -1;
1215+ if (xprt->snd_task &&
1216+ !test_bit(XPRT_SND_IS_COOKIE, &xprt->state))
1217+ __entry->snd_task_id = xprt->snd_task->tk_pid;
1218+ else
1219+ __entry->snd_task_id = -1;
1220+
12011221 __entry->cong = xprt->cong;
12021222 __entry->cwnd = xprt->cwnd;
12031223 __entry->wait = test_bit(XPRT_CWND_WAIT, &xprt->state);
include/trace/perf.h+3−2
@@ -23,8 +23,9 @@ · 22 unmodified lines
2323
2424 #undef __get_rel_dynamic_array
2525 #define __get_rel_dynamic_array(field) \
26− ((void *)(&__entry->__rel_loc_##field) + \
27− sizeof(__entry->__rel_loc_##field) + \
26+ ((void *)__entry + \
27+ offsetof(typeof(*__entry), __rel_loc_##field) + \
28+ sizeof(__entry->__rel_loc_##field) + \
2829 (__entry->__rel_loc_##field & 0xffff))
2930
3031 #undef __get_rel_dynamic_array_len
include/trace/trace_events.h+5−4
@@ -128,7 +128,7 @@ TRACE_MAKE_SYSTEM_STR(); · 127 unmodified lines
128128 struct trace_event_raw_##name { \
129129 struct trace_entry ent; \
130130 tstruct \
131− char __data[0]; \
131+ char __data[]; \
132132 }; \
133133 \
134134 static struct trace_event_class event_class_##name;
@@ -318,9 +318,10 @@ TRACE_MAKE_SYSTEM_STR(); · 183 unmodified lines
318318 #define __get_str(field) ((char *)__get_dynamic_array(field))
319319
320320 #undef __get_rel_dynamic_array
321−#define __get_rel_dynamic_array(field) \
322− ((void *)(&__entry->__rel_loc_##field) + \
323− sizeof(__entry->__rel_loc_##field) + \
321+#define __get_rel_dynamic_array(field) \
322+ ((void *)__entry + \
323+ offsetof(typeof(*__entry), __rel_loc_##field) + \
324+ sizeof(__entry->__rel_loc_##field) + \
324325 (__entry->__rel_loc_##field & 0xffff))
325326
326327 #undef __get_rel_dynamic_array_len
include/uapi/linux/cyclades.h+35−0
@@ -0,0 +1,35 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
3+#ifndef _UAPI_LINUX_CYCLADES_H
4+#define _UAPI_LINUX_CYCLADES_H
5+
6+#warning "Support for features provided by this header has been removed"
7+#warning "Please consider updating your code"
8+
9+struct cyclades_monitor {
10+ unsigned long int_count;
11+ unsigned long char_count;
12+ unsigned long char_max;
13+ unsigned long char_last;
14+};
15+
16+#define CYGETMON 0x435901
17+#define CYGETTHRESH 0x435902
18+#define CYSETTHRESH 0x435903
19+#define CYGETDEFTHRESH 0x435904
20+#define CYSETDEFTHRESH 0x435905
21+#define CYGETTIMEOUT 0x435906
22+#define CYSETTIMEOUT 0x435907
23+#define CYGETDEFTIMEOUT 0x435908
24+#define CYSETDEFTIMEOUT 0x435909
25+#define CYSETRFLOW 0x43590a
26+#define CYGETRFLOW 0x43590b
27+#define CYSETRTSDTR_INV 0x43590c
28+#define CYGETRTSDTR_INV 0x43590d
29+#define CYZSETPOLLCYCLE 0x43590e
30+#define CYZGETPOLLCYCLE 0x43590f
31+#define CYGETCD1400VER 0x435910
32+#define CYSETWAIT 0x435912
33+#define CYGETWAIT 0x435913
34+
35+#endif /* _UAPI_LINUX_CYCLADES_H */
include/uapi/linux/kvm.h+4−3
@@ -1133,6 +1133,7 @@ struct kvm_ppc_resize_hpt { · 1132 unmodified lines
11331133 #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
11341134 #define KVM_CAP_VM_GPA_BITS 207
11351135 #define KVM_CAP_XSAVE2 208
1136+#define KVM_CAP_SYS_ATTRIBUTES 209
11361137
11371138 #ifdef KVM_CAP_IRQ_ROUTING
11381139
@@ -1623,9 +1624,6 @@ struct kvm_enc_region { · 484 unmodified lines
16231624 #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
16241625 #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
16251626
1626−/* Available with KVM_CAP_XSAVE2 */
1627−#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1628−
16291627 struct kvm_s390_pv_sec_parm {
16301628 __u64 origin;
16311629 __u64 length;
@@ -2047,4 +2045,7 @@ struct kvm_stats_desc { · 415 unmodified lines
20472045
20482046 #define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
20492047
2048+/* Available with KVM_CAP_XSAVE2 */
2049+#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
2050+
20502051 #endif /* __LINUX_KVM_H */
include/uapi/linux/netfilter/nf_conntrack_common.h+1−1
@@ -106,7 +106,7 @@ enum ip_conntrack_status { · 105 unmodified lines
106106 IPS_NAT_CLASH = IPS_UNTRACKED,
107107 #endif
108108
109− /* Conntrack got a helper explicitly attached via CT target. */
109+ /* Conntrack got a helper explicitly attached (ruleset, ctnetlink). */
110110 IPS_HELPER_BIT = 13,
111111 IPS_HELPER = (1 << IPS_HELPER_BIT),
112112
include/uapi/linux/perf_event.h+2−0
@@ -465,6 +465,8 @@ struct perf_event_attr { · 464 unmodified lines
465465 /*
466466 * User provided data if sigtrap=1, passed back to user via
467467 * siginfo_t::si_perf_data, e.g. to permit user to identify the event.
468+ * Note, siginfo_t::si_perf_data is long-sized, and sig_data will be
469+ * truncated accordingly on 32 bit architectures.
468470 */
469471 __u64 sig_data;
470472 };
include/uapi/linux/smc_diag.h+5−6
@@ -84,12 +84,11 @@ struct smc_diag_conninfo { · 83 unmodified lines
8484 /* SMC_DIAG_LINKINFO */
8585
8686 struct smc_diag_linkinfo {
87− __u8 link_id; /* link identifier */
88− __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89− __u8 ibport; /* RDMA device port number */
90− __u8 gid[40]; /* local GID */
91− __u8 peer_gid[40]; /* peer GID */
92− __aligned_u64 net_cookie; /* RDMA device net namespace */
87+ __u8 link_id; /* link identifier */
88+ __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89+ __u8 ibport; /* RDMA device port number */
90+ __u8 gid[40]; /* local GID */
91+ __u8 peer_gid[40]; /* peer GID */
9392 };
9493
9594 struct smc_diag_lgrinfo {
include/uapi/sound/asound.h+3−1
@@ -56,8 +56,10 @@ · 55 unmodified lines
5656 * *
5757 ****************************************************************************/
5858
59+#define AES_IEC958_STATUS_SIZE 24
60+
5961 struct snd_aes_iec958 {
60− unsigned char status[24]; /* AES/IEC958 channel status bits */
62+ unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */
6163 unsigned char subcode[147]; /* AES/IEC958 subcode bits */
6264 unsigned char pad; /* nothing */
6365 unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */
include/uapi/xen/gntdev.h+7−1
@@ -47,7 +47,13 @@ struct ioctl_gntdev_grant_ref { · 46 unmodified lines
4747 /*
4848 * Inserts the grant references into the mapping table of an instance
4949 * of gntdev. N.B. This does not perform the mapping, which is deferred
50− * until mmap() is called with @index as the offset.
50+ * until mmap() is called with @index as the offset. @index should be
51+ * considered opaque to userspace, with one exception: if no grant
52+ * references have ever been inserted into the mapping table of this
53+ * instance, @index will be set to 0. This is necessary to use gntdev
54+ * with userspace APIs that expect a file descriptor that can be
55+ * mmap()'d at offset 0, such as Wayland. If @count is set to 0, this
56+ * ioctl will fail.
5157 */
5258 #define IOCTL_GNTDEV_MAP_GRANT_REF \
5359 _IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
include/xen/xenbus_dev.h+0−2
@@ -1,6 +1,4 @@
11 /******************************************************************************
2− * evtchn.h
3− *
42 * Interface to /dev/xen/xenbus_backend.
53 *
64 * Copyright (c) 2011 Bastian Blank <waldi@debian.org>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t