History

Merge branch 'linus' into perf/core, to pick up fixes

Ingo Molnar committed 7 years ago

Commit 496156e2 parents cabf5eb 618d919500 files · +5217 −2822Browse files

Showing the changes to include/linux (18 of 500 files). Show all

Unified · Split

18 files
  1. include/linux/bio.h +12 −8
  2. include/linux/bitrev.h +23 −23
  3. include/linux/blk-mq.h +1 −0
  4. include/linux/bvec.h +10 −4
  5. include/linux/fs.h +4 −0
  6. include/linux/kernel.h +2 −2
  7. include/linux/memcontrol.h +4 −1
  8. include/linux/mii.h +1 −1
  9. include/linux/mlx5/driver.h +2 −0
  10. include/linux/mm.h +14 −1
  11. include/linux/mm_types.h +1 −1
  12. include/linux/nvme.h +7 −2
  13. include/linux/pipe_fs_i.h +6 −4
  14. include/linux/platform_data/x86/clk-pmc-atom.h +3 −0
  15. include/linux/ptrace.h +8 −3
  16. include/linux/string.h +3 −0
  17. include/linux/sunrpc/sched.h +0 −8
  18. include/linux/virtio_ring.h +1 −1
include/linux/bio.h+12−8
@@ -120,19 +120,23 @@ static inline bool bio_full(struct bio *bio) · 119 unmodified lines
120120 return bio->bi_vcnt >= bio->bi_max_vecs;
121121 }
122122
123−#define mp_bvec_for_each_segment(bv, bvl, i, iter_all) \
124− for (bv = bvec_init_iter_all(&iter_all); \
125− (iter_all.done < (bvl)->bv_len) && \
126− (mp_bvec_next_segment((bvl), &iter_all), 1); \
127− iter_all.done += bv->bv_len, i += 1)
123+static inline bool bio_next_segment(const struct bio *bio,
124+ struct bvec_iter_all *iter)
125+{
126+ if (iter->idx >= bio->bi_vcnt)
127+ return false;
128+
129+ bvec_advance(&bio->bi_io_vec[iter->idx], iter);
130+ return true;
131+}
128132
129133 /*
130134 * drivers should _never_ use the all version - the bio may have been split
131135 * before it got to the driver and the driver won't own all of it
132136 */
133−#define bio_for_each_segment_all(bvl, bio, i, iter_all) \
134− for (i = 0, iter_all.idx = 0; iter_all.idx < (bio)->bi_vcnt; iter_all.idx++) \
135− mp_bvec_for_each_segment(bvl, &((bio)->bi_io_vec[iter_all.idx]), i, iter_all)
137+#define bio_for_each_segment_all(bvl, bio, i, iter) \
138+ for (i = 0, bvl = bvec_init_iter_all(&iter); \
139+ bio_next_segment((bio), &iter); i++)
136140
137141 static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter,
138142 unsigned bytes)
include/linux/bitrev.h+23−23
@@ -34,41 +34,41 @@ static inline u32 __bitrev32(u32 x) · 33 unmodified lines
3434
3535 #define __constant_bitrev32(x) \
3636 ({ \
37− u32 __x = x; \
38− __x = (__x >> 16) | (__x << 16); \
39− __x = ((__x & (u32)0xFF00FF00UL) >> 8) | ((__x & (u32)0x00FF00FFUL) << 8); \
40− __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \
41− __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \
42− __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \
43− __x; \
37+ u32 ___x = x; \
38+ ___x = (___x >> 16) | (___x << 16); \
39+ ___x = ((___x & (u32)0xFF00FF00UL) >> 8) | ((___x & (u32)0x00FF00FFUL) << 8); \
40+ ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \
41+ ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \
42+ ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \
43+ ___x; \
4444 })
4545
4646 #define __constant_bitrev16(x) \
4747 ({ \
48− u16 __x = x; \
49− __x = (__x >> 8) | (__x << 8); \
50− __x = ((__x & (u16)0xF0F0U) >> 4) | ((__x & (u16)0x0F0FU) << 4); \
51− __x = ((__x & (u16)0xCCCCU) >> 2) | ((__x & (u16)0x3333U) << 2); \
52− __x = ((__x & (u16)0xAAAAU) >> 1) | ((__x & (u16)0x5555U) << 1); \
53− __x; \
48+ u16 ___x = x; \
49+ ___x = (___x >> 8) | (___x << 8); \
50+ ___x = ((___x & (u16)0xF0F0U) >> 4) | ((___x & (u16)0x0F0FU) << 4); \
51+ ___x = ((___x & (u16)0xCCCCU) >> 2) | ((___x & (u16)0x3333U) << 2); \
52+ ___x = ((___x & (u16)0xAAAAU) >> 1) | ((___x & (u16)0x5555U) << 1); \
53+ ___x; \
5454 })
5555
5656 #define __constant_bitrev8x4(x) \
5757 ({ \
58− u32 __x = x; \
59− __x = ((__x & (u32)0xF0F0F0F0UL) >> 4) | ((__x & (u32)0x0F0F0F0FUL) << 4); \
60− __x = ((__x & (u32)0xCCCCCCCCUL) >> 2) | ((__x & (u32)0x33333333UL) << 2); \
61− __x = ((__x & (u32)0xAAAAAAAAUL) >> 1) | ((__x & (u32)0x55555555UL) << 1); \
62− __x; \
58+ u32 ___x = x; \
59+ ___x = ((___x & (u32)0xF0F0F0F0UL) >> 4) | ((___x & (u32)0x0F0F0F0FUL) << 4); \
60+ ___x = ((___x & (u32)0xCCCCCCCCUL) >> 2) | ((___x & (u32)0x33333333UL) << 2); \
61+ ___x = ((___x & (u32)0xAAAAAAAAUL) >> 1) | ((___x & (u32)0x55555555UL) << 1); \
62+ ___x; \
6363 })
6464
6565 #define __constant_bitrev8(x) \
6666 ({ \
67− u8 __x = x; \
68− __x = (__x >> 4) | (__x << 4); \
69− __x = ((__x & (u8)0xCCU) >> 2) | ((__x & (u8)0x33U) << 2); \
70− __x = ((__x & (u8)0xAAU) >> 1) | ((__x & (u8)0x55U) << 1); \
71− __x; \
67+ u8 ___x = x; \
68+ ___x = (___x >> 4) | (___x << 4); \
69+ ___x = ((___x & (u8)0xCCU) >> 2) | ((___x & (u8)0x33U) << 2); \
70+ ___x = ((___x & (u8)0xAAU) >> 1) | ((___x & (u8)0x55U) << 1); \
71+ ___x; \
7272 })
7373
7474 #define bitrev32(x) \
include/linux/blk-mq.h+1−0
@@ -302,6 +302,7 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list); · 301 unmodified lines
302302 void blk_mq_kick_requeue_list(struct request_queue *q);
303303 void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);
304304 bool blk_mq_complete_request(struct request *rq);
305+void blk_mq_complete_request_sync(struct request *rq);
305306 bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,
306307 struct bio *bio);
307308 bool blk_mq_queue_stopped(struct request_queue *q);
include/linux/bvec.h+10−4
@@ -145,18 +145,18 @@ static inline bool bvec_iter_advance(const struct bio_vec *bv, · 144 unmodified lines
145145
146146 static inline struct bio_vec *bvec_init_iter_all(struct bvec_iter_all *iter_all)
147147 {
148− iter_all->bv.bv_page = NULL;
149148 iter_all->done = 0;
149+ iter_all->idx = 0;
150150
151151 return &iter_all->bv;
152152 }
153153
154−static inline void mp_bvec_next_segment(const struct bio_vec *bvec,
155− struct bvec_iter_all *iter_all)
154+static inline void bvec_advance(const struct bio_vec *bvec,
155+ struct bvec_iter_all *iter_all)
156156 {
157157 struct bio_vec *bv = &iter_all->bv;
158158
159− if (bv->bv_page) {
159+ if (iter_all->done) {
160160 bv->bv_page = nth_page(bv->bv_page, 1);
161161 bv->bv_offset = 0;
162162 } else {
@@ -165,6 +165,12 @@ static inline void mp_bvec_next_segment(const struct bio_vec *bvec, · 2 unmodified lines
165165 }
166166 bv->bv_len = min_t(unsigned int, PAGE_SIZE - bv->bv_offset,
167167 bvec->bv_len - iter_all->done);
168+ iter_all->done += bv->bv_len;
169+
170+ if (iter_all->done == bvec->bv_len) {
171+ iter_all->idx++;
172+ iter_all->done = 0;
173+ }
168174 }
169175
170176 /*
include/linux/fs.h+4−0
@@ -158,6 +158,9 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset, · 157 unmodified lines
158158 #define FMODE_OPENED ((__force fmode_t)0x80000)
159159 #define FMODE_CREATED ((__force fmode_t)0x100000)
160160
161+/* File is stream-like */
162+#define FMODE_STREAM ((__force fmode_t)0x200000)
163+
161164 /* File was opened by fanotify and shouldn't generate fanotify events */
162165 #define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
163166
@@ -3074,6 +3077,7 @@ extern loff_t no_seek_end_llseek_size(struct file *, loff_t, int, loff_t); · 2910 unmodified lines
30743077 extern loff_t no_seek_end_llseek(struct file *, loff_t, int);
30753078 extern int generic_file_open(struct inode * inode, struct file * filp);
30763079 extern int nonseekable_open(struct inode * inode, struct file * filp);
3080+extern int stream_open(struct inode * inode, struct file * filp);
30773081
30783082 #ifdef CONFIG_BLOCK
30793083 typedef void (dio_submit_t)(struct bio *bio, struct inode *inode,
include/linux/kernel.h+2−2
@@ -47,8 +47,8 @@ · 46 unmodified lines
4747
4848 #define u64_to_user_ptr(x) ( \
4949 { \
50− typecheck(u64, x); \
51− (void __user *)(uintptr_t)x; \
50+ typecheck(u64, (x)); \
51+ (void __user *)(uintptr_t)(x); \
5252 } \
5353 )
5454
include/linux/memcontrol.h+4−1
@@ -566,7 +566,10 @@ struct mem_cgroup *lock_page_memcg(struct page *page); · 565 unmodified lines
566566 void __unlock_page_memcg(struct mem_cgroup *memcg);
567567 void unlock_page_memcg(struct page *page);
568568
569−/* idx can be of type enum memcg_stat_item or node_stat_item */
569+/*
570+ * idx can be of type enum memcg_stat_item or node_stat_item.
571+ * Keep in sync with memcg_exact_page_state().
572+ */
570573 static inline unsigned long memcg_page_state(struct mem_cgroup *memcg,
571574 int idx)
572575 {
include/linux/mii.h+1−1
@@ -469,7 +469,7 @@ static inline u32 linkmode_adv_to_lcl_adv_t(unsigned long *advertising) · 468 unmodified lines
469469 if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
470470 advertising))
471471 lcl_adv |= ADVERTISE_PAUSE_CAP;
472− if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
472+ if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
473473 advertising))
474474 lcl_adv |= ADVERTISE_PAUSE_ASYM;
475475
include/linux/mlx5/driver.h+2−0
@@ -594,6 +594,8 @@ enum mlx5_pagefault_type_flags { · 593 unmodified lines
594594 };
595595
596596 struct mlx5_td {
597+ /* protects tirs list changes while tirs refresh */
598+ struct mutex list_lock;
597599 struct list_head tirs_list;
598600 u32 tdn;
599601 };
include/linux/mm.h+14−1
@@ -966,6 +966,10 @@ static inline bool is_pci_p2pdma_page(const struct page *page) · 965 unmodified lines
966966 }
967967 #endif /* CONFIG_DEV_PAGEMAP_OPS */
968968
969+/* 127: arbitrary random number, small enough to assemble well */
970+#define page_ref_zero_or_close_to_overflow(page) \
971+ ((unsigned int) page_ref_count(page) + 127u <= 127u)
972+
969973 static inline void get_page(struct page *page)
970974 {
971975 page = compound_head(page);
@@ -973,8 +977,17 @@ static inline void get_page(struct page *page) · 1 unmodified line
973977 * Getting a normal page or the head of a compound page
974978 * requires to already have an elevated page->_refcount.
975979 */
976− VM_BUG_ON_PAGE(page_ref_count(page) <= 0, page);
980+ VM_BUG_ON_PAGE(page_ref_zero_or_close_to_overflow(page), page);
981+ page_ref_inc(page);
982+}
983+
984+static inline __must_check bool try_get_page(struct page *page)
985+{
986+ page = compound_head(page);
987+ if (WARN_ON_ONCE(page_ref_count(page) <= 0))
988+ return false;
977989 page_ref_inc(page);
990+ return true;
978991 }
979992
980993 static inline void put_page(struct page *page)
include/linux/mm_types.h+1−1
@@ -671,7 +671,7 @@ enum vm_fault_reason { · 670 unmodified lines
671671
672672 /* Encode hstate index for a hwpoisoned large page */
673673 #define VM_FAULT_SET_HINDEX(x) ((__force vm_fault_t)((x) << 16))
674−#define VM_FAULT_GET_HINDEX(x) (((x) >> 16) & 0xf)
674+#define VM_FAULT_GET_HINDEX(x) (((__force unsigned int)(x) >> 16) & 0xf)
675675
676676 #define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | \
677677 VM_FAULT_SIGSEGV | VM_FAULT_HWPOISON | \
include/linux/nvme.h+7−2
@@ -967,8 +967,13 @@ struct nvme_get_log_page_command { · 966 unmodified lines
967967 __le16 numdl;
968968 __le16 numdu;
969969 __u16 rsvd11;
970− __le32 lpol;
971− __le32 lpou;
970+ union {
971+ struct {
972+ __le32 lpol;
973+ __le32 lpou;
974+ };
975+ __le64 lpo;
976+ };
972977 __u32 rsvd14[2];
973978 };
974979
include/linux/pipe_fs_i.h+6−4
@@ -101,18 +101,20 @@ struct pipe_buf_operations { · 100 unmodified lines
101101 /*
102102 * Get a reference to the pipe buffer.
103103 */
104− void (*get)(struct pipe_inode_info *, struct pipe_buffer *);
104+ bool (*get)(struct pipe_inode_info *, struct pipe_buffer *);
105105 };
106106
107107 /**
108108 * pipe_buf_get - get a reference to a pipe_buffer
109109 * @pipe: the pipe that the buffer belongs to
110110 * @buf: the buffer to get a reference to
111+ *
112+ * Return: %true if the reference was successfully obtained.
111113 */
112−static inline void pipe_buf_get(struct pipe_inode_info *pipe,
114+static inline __must_check bool pipe_buf_get(struct pipe_inode_info *pipe,
113115 struct pipe_buffer *buf)
114116 {
115− buf->ops->get(pipe, buf);
117+ return buf->ops->get(pipe, buf);
116118 }
117119
118120 /**
@@ -171,7 +173,7 @@ struct pipe_inode_info *alloc_pipe_info(void); · 52 unmodified lines
171173 void free_pipe_info(struct pipe_inode_info *);
172174
173175 /* Generic pipe buffer ops functions */
174−void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
176+bool generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *);
175177 int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *);
176178 int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *);
177179 void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
include/linux/platform_data/x86/clk-pmc-atom.h+3−0
@@ -35,10 +35,13 @@ struct pmc_clk { · 34 unmodified lines
3535 *
3636 * @base: PMC clock register base offset
3737 * @clks: pointer to set of registered clocks, typically 0..5
38+ * @critical: flag to indicate if firmware enabled pmc_plt_clks
39+ * should be marked as critial or not
3840 */
3941 struct pmc_clk_data {
4042 void __iomem *base;
4143 const struct pmc_clk *clks;
44+ bool critical;
4245 };
4346
4447 #endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */
include/linux/ptrace.h+8−3
@@ -9,6 +9,13 @@ · 8 unmodified lines
99 #include <linux/bug.h> /* For BUG_ON. */
1010 #include <linux/pid_namespace.h> /* For task_active_pid_ns. */
1111 #include <uapi/linux/ptrace.h>
12+#include <linux/seccomp.h>
13+
14+/* Add sp to seccomp_data, as seccomp is user API, we don't want to modify it */
15+struct syscall_info {
16+ __u64 sp;
17+ struct seccomp_data data;
18+};
1219
1320 extern int ptrace_access_vm(struct task_struct *tsk, unsigned long addr,
1421 void *buf, int len, unsigned int gup_flags);
@@ -407,9 +414,7 @@ static inline void user_single_step_report(struct pt_regs *regs) · 392 unmodified lines
407414 #define current_user_stack_pointer() user_stack_pointer(current_pt_regs())
408415 #endif
409416
410−extern int task_current_syscall(struct task_struct *target, long *callno,
411− unsigned long args[6], unsigned int maxargs,
412− unsigned long *sp, unsigned long *pc);
417+extern int task_current_syscall(struct task_struct *target, struct syscall_info *info);
413418
414419 extern void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact);
415420 #endif
include/linux/string.h+3−0
@@ -150,6 +150,9 @@ extern void * memscan(void *,int,__kernel_size_t); · 149 unmodified lines
150150 #ifndef __HAVE_ARCH_MEMCMP
151151 extern int memcmp(const void *,const void *,__kernel_size_t);
152152 #endif
153+#ifndef __HAVE_ARCH_BCMP
154+extern int bcmp(const void *,const void *,__kernel_size_t);
155+#endif
153156 #ifndef __HAVE_ARCH_MEMCHR
154157 extern void * memchr(const void *,int,__kernel_size_t);
155158 #endif
include/linux/sunrpc/sched.h+0−8
@@ -304,12 +304,4 @@ rpc_clnt_swap_deactivate(struct rpc_clnt *clnt) · 303 unmodified lines
304304 }
305305 #endif /* CONFIG_SUNRPC_SWAP */
306306
307−static inline bool
308−rpc_task_need_resched(const struct rpc_task *task)
309−{
310− if (RPC_IS_QUEUED(task) || task->tk_callback)
311− return true;
312− return false;
313−}
314−
315307 #endif /* _LINUX_SUNRPC_SCHED_H_ */
include/linux/virtio_ring.h+1−1
@@ -63,7 +63,7 @@ struct virtqueue; · 62 unmodified lines
6363 /*
6464 * Creates a virtqueue and allocates the descriptor ring. If
6565 * may_reduce_num is set, then this may allocate a smaller ring than
66− * expected. The caller should query virtqueue_get_ring_size to learn
66+ * expected. The caller should query virtqueue_get_vring_size to learn
6767 * the actual size of the ring.
6868 */
6969 struct virtqueue *vring_create_virtqueue(unsigned int index,

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