History

Merge branch 'linus' into locking/kcsan, to pick up fixes

Ingo Molnar committed 6 years ago

Commit df108462 parents a4654e9 5ad0ec0906 files · +8764 −4406Browse files

Showing the changes to include/linux (24 of 906 files). Show all

Unified · Split

24 files
  1. include/linux/blkdev.h +1 −2
  2. include/linux/blktrace_api.h +13 −5
  3. include/linux/bootconfig.h +3 −0
  4. include/linux/cgroup.h +1 −0
  5. include/linux/debugfs.h +6 −7
  6. include/linux/device.h +11 −0
  7. include/linux/dmar.h +9 −5
  8. include/linux/fs.h +1 −0
  9. include/linux/futex.h +10 −7
  10. include/linux/genhd.h +1 −12
  11. include/linux/hid.h +1 −1
  12. include/linux/icmpv6.h +10 −6
  13. include/linux/inet_diag.h +12 −6
  14. include/linux/intel-iommu.h +2 −0
  15. include/linux/kvm_host.h +3 −1
  16. include/linux/mm.h +4 −0
  17. include/linux/mmc/host.h +1 −0
  18. include/linux/netfilter/ipset/ip_set.h +10 −1
  19. include/linux/of_clk.h +4 −4
  20. include/linux/phy.h +3 −0
  21. include/linux/platform_data/spi-omap2-mcspi.h +1 −0
  22. include/linux/platform_device.h +1 −1
  23. include/linux/rhashtable.h +1 −1
  24. include/linux/workqueue.h +16 −0
include/linux/blkdev.h+1−2
@@ -524,7 +524,7 @@ struct request_queue { · 523 unmodified lines
524524 unsigned int sg_reserved_size;
525525 int node;
526526 #ifdef CONFIG_BLK_DEV_IO_TRACE
527− struct blk_trace *blk_trace;
527+ struct blk_trace __rcu *blk_trace;
528528 struct mutex blk_trace_mutex;
529529 #endif
530530 /*
@@ -1494,7 +1494,6 @@ static inline void put_dev_sector(Sector p) · 963 unmodified lines
14941494 }
14951495
14961496 int kblockd_schedule_work(struct work_struct *work);
1497−int kblockd_schedule_work_on(int cpu, struct work_struct *work);
14981497 int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);
14991498
15001499 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
include/linux/blktrace_api.h+13−5
@@ -51,9 +51,13 @@ void __trace_note_message(struct blk_trace *, struct blkcg *blkcg, const char *f · 50 unmodified lines
5151 **/
5252 #define blk_add_cgroup_trace_msg(q, cg, fmt, ...) \
5353 do { \
54− struct blk_trace *bt = (q)->blk_trace; \
54+ struct blk_trace *bt; \
55+ \
56+ rcu_read_lock(); \
57+ bt = rcu_dereference((q)->blk_trace); \
5558 if (unlikely(bt)) \
5659 __trace_note_message(bt, cg, fmt, ##__VA_ARGS__);\
60+ rcu_read_unlock(); \
5761 } while (0)
5862 #define blk_add_trace_msg(q, fmt, ...) \
5963 blk_add_cgroup_trace_msg(q, NULL, fmt, ##__VA_ARGS__)
@@ -61,10 +65,14 @@ void __trace_note_message(struct blk_trace *, struct blkcg *blkcg, const char *f · 1 unmodified line
6165
6266 static inline bool blk_trace_note_message_enabled(struct request_queue *q)
6367 {
64− struct blk_trace *bt = q->blk_trace;
65− if (likely(!bt))
66− return false;
67− return bt->act_mask & BLK_TC_NOTIFY;
68+ struct blk_trace *bt;
69+ bool ret;
70+
71+ rcu_read_lock();
72+ bt = rcu_dereference(q->blk_trace);
73+ ret = bt && (bt->act_mask & BLK_TC_NOTIFY);
74+ rcu_read_unlock();
75+ return ret;
6876 }
6977
7078 extern void blk_add_driver_data(struct request_queue *q, struct request *rq,
include/linux/bootconfig.h+3−0
@@ -10,6 +10,9 @@ · 9 unmodified lines
1010 #include <linux/kernel.h>
1111 #include <linux/types.h>
1212
13+#define BOOTCONFIG_MAGIC "#BOOTCONFIG\n"
14+#define BOOTCONFIG_MAGIC_LEN 12
15+
1316 /* XBC tree node */
1417 struct xbc_node {
1518 u16 next;
include/linux/cgroup.h+1−0
@@ -62,6 +62,7 @@ struct css_task_iter { · 61 unmodified lines
6262 struct list_head *mg_tasks_head;
6363 struct list_head *dying_tasks_head;
6464
65+ struct list_head *cur_tasks_head;
6566 struct css_set *cur_cset;
6667 struct css_set *cur_dcset;
6768 struct task_struct *cur_task;
include/linux/debugfs.h+6−7
@@ -127,9 +127,9 @@ struct dentry *debugfs_create_blob(const char *name, umode_t mode, · 126 unmodified lines
127127 struct dentry *parent,
128128 struct debugfs_blob_wrapper *blob);
129129
130−struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
131− struct dentry *parent,
132− struct debugfs_regset32 *regset);
130+void debugfs_create_regset32(const char *name, umode_t mode,
131+ struct dentry *parent,
132+ struct debugfs_regset32 *regset);
133133
134134 void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
135135 int nregs, void __iomem *base, char *prefix);
@@ -304,11 +304,10 @@ static inline struct dentry *debugfs_create_blob(const char *name, umode_t mode, · 168 unmodified lines
304304 return ERR_PTR(-ENODEV);
305305 }
306306
307−static inline struct dentry *debugfs_create_regset32(const char *name,
308− umode_t mode, struct dentry *parent,
309− struct debugfs_regset32 *regset)
307+static inline void debugfs_create_regset32(const char *name, umode_t mode,
308+ struct dentry *parent,
309+ struct debugfs_regset32 *regset)
310310 {
311− return ERR_PTR(-ENODEV);
312311 }
313312
314313 static inline void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
include/linux/device.h+11−0
@@ -798,6 +798,17 @@ static inline struct device_node *dev_of_node(struct device *dev) · 797 unmodified lines
798798 return dev->of_node;
799799 }
800800
801+static inline bool dev_has_sync_state(struct device *dev)
802+{
803+ if (!dev)
804+ return false;
805+ if (dev->driver && dev->driver->sync_state)
806+ return true;
807+ if (dev->bus && dev->bus->sync_state)
808+ return true;
809+ return false;
810+}
811+
801812 /*
802813 * High level routines for use by the bus drivers
803814 */
include/linux/dmar.h+9−5
@@ -69,19 +69,23 @@ struct dmar_pci_notify_info { · 68 unmodified lines
6969 extern struct rw_semaphore dmar_global_lock;
7070 extern struct list_head dmar_drhd_units;
7171
72−#define for_each_drhd_unit(drhd) \
73− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list)
72+#define for_each_drhd_unit(drhd) \
73+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
74+ dmar_rcu_check())
7475
7576 #define for_each_active_drhd_unit(drhd) \
76− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
77+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
78+ dmar_rcu_check()) \
7779 if (drhd->ignored) {} else
7880
7981 #define for_each_active_iommu(i, drhd) \
80− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
82+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
83+ dmar_rcu_check()) \
8184 if (i=drhd->iommu, drhd->ignored) {} else
8285
8386 #define for_each_iommu(i, drhd) \
84− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
87+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
88+ dmar_rcu_check()) \
8589 if (i=drhd->iommu, 0) {} else
8690
8791 static inline bool dmar_rcu_check(void)
include/linux/fs.h+1−0
@@ -698,6 +698,7 @@ struct inode { · 697 unmodified lines
698698 struct rcu_head i_rcu;
699699 };
700700 atomic64_t i_version;
701+ atomic64_t i_sequence; /* see futex */
701702 atomic_t i_count;
702703 atomic_t i_dio_count;
703704 atomic_t i_writecount;
include/linux/futex.h+10−7
@@ -31,23 +31,26 @@ struct task_struct; · 30 unmodified lines
3131
3232 union futex_key {
3333 struct {
34+ u64 i_seq;
3435 unsigned long pgoff;
35− struct inode *inode;
36− int offset;
36+ unsigned int offset;
3737 } shared;
3838 struct {
39+ union {
40+ struct mm_struct *mm;
41+ u64 __tmp;
42+ };
3943 unsigned long address;
40− struct mm_struct *mm;
41− int offset;
44+ unsigned int offset;
4245 } private;
4346 struct {
47+ u64 ptr;
4448 unsigned long word;
45− void *ptr;
46− int offset;
49+ unsigned int offset;
4750 } both;
4851 };
4952
50−#define FUTEX_KEY_INIT (union futex_key) { .both = { .ptr = NULL } }
53+#define FUTEX_KEY_INIT (union futex_key) { .both = { .ptr = 0ULL } }
5154
5255 #ifdef CONFIG_FUTEX
5356 enum {
include/linux/genhd.h+1−12
@@ -245,18 +245,6 @@ static inline bool disk_part_scan_enabled(struct gendisk *disk) · 244 unmodified lines
245245 !(disk->flags & GENHD_FL_NO_PART_SCAN);
246246 }
247247
248−static inline bool disk_has_partitions(struct gendisk *disk)
249−{
250− bool ret = false;
251−
252− rcu_read_lock();
253− if (rcu_dereference(disk->part_tbl)->len > 1)
254− ret = true;
255− rcu_read_unlock();
256−
257− return ret;
258−}
259−
260248 static inline dev_t disk_devt(struct gendisk *disk)
261249 {
262250 return MKDEV(disk->major, disk->first_minor);
@@ -298,6 +286,7 @@ extern void disk_part_iter_exit(struct disk_part_iter *piter); · 35 unmodified lines
298286
299287 extern struct hd_struct *disk_map_sector_rcu(struct gendisk *disk,
300288 sector_t sector);
289+bool disk_has_partitions(struct gendisk *disk);
301290
302291 /*
303292 * Macros to operate on percpu disk statistics:
include/linux/hid.h+1−1
@@ -492,7 +492,7 @@ struct hid_report_enum { · 491 unmodified lines
492492 };
493493
494494 #define HID_MIN_BUFFER_SIZE 64 /* make sure there is at least a packet size of space */
495−#define HID_MAX_BUFFER_SIZE 4096 /* 4kb */
495+#define HID_MAX_BUFFER_SIZE 8192 /* 8kb */
496496 #define HID_CONTROL_FIFO_SIZE 256 /* to init devices with >100 reports */
497497 #define HID_OUTPUT_FIFO_SIZE 64
498498
include/linux/icmpv6.h+10−6
@@ -22,19 +22,23 @@ extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn); · 21 unmodified lines
2222 int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,
2323 unsigned int data_len);
2424
25+#if IS_ENABLED(CONFIG_NF_NAT)
26+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
27+#else
28+#define icmpv6_ndo_send icmpv6_send
29+#endif
30+
2531 #else
2632
2733 static inline void icmpv6_send(struct sk_buff *skb,
2834 u8 type, u8 code, __u32 info)
2935 {
30−
3136 }
32−#endif
3337
34−#if IS_ENABLED(CONFIG_NF_NAT)
35−void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
36−#else
37−#define icmpv6_ndo_send icmpv6_send
38+static inline void icmpv6_ndo_send(struct sk_buff *skb,
39+ u8 type, u8 code, __u32 info)
40+{
41+}
3842 #endif
3943
4044 extern int icmpv6_init(void);
include/linux/inet_diag.h+12−6
@@ -2,15 +2,10 @@ · 1 unmodified line
22 #ifndef _INET_DIAG_H_
33 #define _INET_DIAG_H_ 1
44
5+#include <net/netlink.h>
56 #include <uapi/linux/inet_diag.h>
67
7−struct net;
8−struct sock;
98 struct inet_hashinfo;
10−struct nlattr;
11−struct nlmsghdr;
12−struct sk_buff;
13−struct netlink_callback;
149
1510 struct inet_diag_handler {
1611 void (*dump)(struct sk_buff *skb,
@@ -62,6 +57,17 @@ int inet_diag_bc_sk(const struct nlattr *_bc, struct sock *sk); · 45 unmodified lines
6257
6358 void inet_diag_msg_common_fill(struct inet_diag_msg *r, struct sock *sk);
6459
60+static inline size_t inet_diag_msg_attrs_size(void)
61+{
62+ return nla_total_size(1) /* INET_DIAG_SHUTDOWN */
63+ + nla_total_size(1) /* INET_DIAG_TOS */
64+#if IS_ENABLED(CONFIG_IPV6)
65+ + nla_total_size(1) /* INET_DIAG_TCLASS */
66+ + nla_total_size(1) /* INET_DIAG_SKV6ONLY */
67+#endif
68+ + nla_total_size(4) /* INET_DIAG_MARK */
69+ + nla_total_size(4); /* INET_DIAG_CLASS_ID */
70+}
6571 int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
6672 struct inet_diag_msg *r, int ext,
6773 struct user_namespace *user_ns, bool net_admin);
include/linux/intel-iommu.h+2−0
@@ -123,6 +123,8 @@ · 122 unmodified lines
123123
124124 #define dmar_readq(a) readq(a)
125125 #define dmar_writeq(a,v) writeq(v,a)
126+#define dmar_readl(a) readl(a)
127+#define dmar_writel(a, v) writel(v, a)
126128
127129 #define DMAR_VER_MAJOR(v) (((v) & 0xf0) >> 4)
128130 #define DMAR_VER_MINOR(v) ((v) & 0x0f)
include/linux/kvm_host.h+3−1
@@ -889,6 +889,8 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu); · 888 unmodified lines
889889 bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
890890 int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
891891 bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);
892+int kvm_arch_post_init_vm(struct kvm *kvm);
893+void kvm_arch_pre_destroy_vm(struct kvm *kvm);
892894
893895 #ifndef __KVM_HAVE_ARCH_VM_ALLOC
894896 /*
@@ -1342,7 +1344,7 @@ static inline void kvm_vcpu_set_dy_eligible(struct kvm_vcpu *vcpu, bool val) · 447 unmodified lines
13421344 #endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */
13431345
13441346 struct kvm_vcpu *kvm_get_running_vcpu(void);
1345−struct kvm_vcpu __percpu **kvm_get_running_vcpus(void);
1347+struct kvm_vcpu * __percpu *kvm_get_running_vcpus(void);
13461348
13471349 #ifdef CONFIG_HAVE_KVM_IRQ_BYPASS
13481350 bool kvm_arch_has_irq_bypass(void);
include/linux/mm.h+4−0
@@ -2715,6 +2715,10 @@ static inline bool debug_pagealloc_enabled_static(void) · 2714 unmodified lines
27152715 #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP)
27162716 extern void __kernel_map_pages(struct page *page, int numpages, int enable);
27172717
2718+/*
2719+ * When called in DEBUG_PAGEALLOC context, the call should most likely be
2720+ * guarded by debug_pagealloc_enabled() or debug_pagealloc_enabled_static()
2721+ */
27182722 static inline void
27192723 kernel_map_pages(struct page *page, int numpages, int enable)
27202724 {
include/linux/mmc/host.h+1−0
@@ -333,6 +333,7 @@ struct mmc_host { · 332 unmodified lines
333333 MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | \
334334 MMC_CAP_UHS_DDR50)
335335 #define MMC_CAP_SYNC_RUNTIME_PM (1 << 21) /* Synced runtime PM suspends. */
336+#define MMC_CAP_NEED_RSP_BUSY (1 << 22) /* Commands with R1B can't use R1. */
336337 #define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */
337338 #define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */
338339 #define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */
include/linux/netfilter/ipset/ip_set.h+10−1
@@ -121,6 +121,7 @@ struct ip_set_ext { · 120 unmodified lines
121121 u32 timeout;
122122 u8 packets_op;
123123 u8 bytes_op;
124+ bool target;
124125 };
125126
126127 struct ip_set;
@@ -187,6 +188,14 @@ struct ip_set_type_variant { · 60 unmodified lines
187188 /* Return true if "b" set is the same as "a"
188189 * according to the create set parameters */
189190 bool (*same_set)(const struct ip_set *a, const struct ip_set *b);
191+ /* Region-locking is used */
192+ bool region_lock;
193+};
194+
195+struct ip_set_region {
196+ spinlock_t lock; /* Region lock */
197+ size_t ext_size; /* Size of the dynamic extensions */
198+ u32 elements; /* Number of elements vs timeout */
190199 };
191200
192201 /* The core set type structure */
@@ -501,7 +510,7 @@ ip_set_init_skbinfo(struct ip_set_skbinfo *skbinfo, · 308 unmodified lines
501510 }
502511
503512 #define IP_SET_INIT_KEXT(skb, opt, set) \
504− { .bytes = (skb)->len, .packets = 1, \
513+ { .bytes = (skb)->len, .packets = 1, .target = true,\
505514 .timeout = ip_set_adt_opt_timeout(opt, set) }
506515
507516 #define IP_SET_INIT_UEXT(set) \
include/linux/of_clk.h+4−4
@@ -11,17 +11,17 @@ struct of_device_id; · 10 unmodified lines
1111
1212 #if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF)
1313
14−unsigned int of_clk_get_parent_count(struct device_node *np);
15−const char *of_clk_get_parent_name(struct device_node *np, int index);
14+unsigned int of_clk_get_parent_count(const struct device_node *np);
15+const char *of_clk_get_parent_name(const struct device_node *np, int index);
1616 void of_clk_init(const struct of_device_id *matches);
1717
1818 #else /* !CONFIG_COMMON_CLK || !CONFIG_OF */
1919
20−static inline unsigned int of_clk_get_parent_count(struct device_node *np)
20+static inline unsigned int of_clk_get_parent_count(const struct device_node *np)
2121 {
2222 return 0;
2323 }
24−static inline const char *of_clk_get_parent_name(struct device_node *np,
24+static inline const char *of_clk_get_parent_name(const struct device_node *np,
2525 int index)
2626 {
2727 return NULL;
include/linux/phy.h+3−0
@@ -357,6 +357,7 @@ struct macsec_ops; · 356 unmodified lines
357357 * is_gigabit_capable: Set to true if PHY supports 1000Mbps
358358 * has_fixups: Set to true if this phy has fixups/quirks.
359359 * suspended: Set to true if this phy has been suspended successfully.
360+ * suspended_by_mdio_bus: Set to true if this phy was suspended by MDIO bus.
360361 * sysfs_links: Internal boolean tracking sysfs symbolic links setup/removal.
361362 * loopback_enabled: Set true if this phy has been loopbacked successfully.
362363 * state: state of the PHY for management purposes
@@ -396,6 +397,7 @@ struct phy_device { · 33 unmodified lines
396397 unsigned is_gigabit_capable:1;
397398 unsigned has_fixups:1;
398399 unsigned suspended:1;
400+ unsigned suspended_by_mdio_bus:1;
399401 unsigned sysfs_links:1;
400402 unsigned loopback_enabled:1;
401403
@@ -557,6 +559,7 @@ struct phy_driver { · 155 unmodified lines
557559 /*
558560 * Checks if the PHY generated an interrupt.
559561 * For multi-PHY devices with shared PHY interrupt pin
562+ * Set interrupt bits have to be cleared.
560563 */
561564 int (*did_interrupt)(struct phy_device *phydev);
562565
include/linux/platform_data/spi-omap2-mcspi.h+1−0
@@ -11,6 +11,7 @@ struct omap2_mcspi_platform_config { · 10 unmodified lines
1111 unsigned short num_cs;
1212 unsigned int regs_offset;
1313 unsigned int pin_dir:1;
14+ size_t max_xfer_len;
1415 };
1516
1617 struct omap2_mcspi_device_config {
include/linux/platform_device.h+1−1
@@ -24,7 +24,7 @@ struct platform_device { · 23 unmodified lines
2424 int id;
2525 bool id_auto;
2626 struct device dev;
27− u64 dma_mask;
27+ u64 platform_dma_mask;
2828 u32 num_resources;
2929 struct resource *resource;
3030
include/linux/rhashtable.h+1−1
@@ -972,9 +972,9 @@ static inline int rhashtable_lookup_insert_key( · 971 unmodified lines
972972 /**
973973 * rhashtable_lookup_get_insert_key - lookup and insert object into hash table
974974 * @ht: hash table
975+ * @key: key
975976 * @obj: pointer to hash head inside object
976977 * @params: hash table parameters
977− * @data: pointer to element data already in hashes
978978 *
979979 * Just like rhashtable_lookup_insert_key(), but this function returns the
980980 * object if it exists, NULL if it does not and the insertion was successful,
include/linux/workqueue.h+16−0
@@ -487,6 +487,19 @@ extern void wq_worker_comm(char *buf, size_t size, struct task_struct *task); · 486 unmodified lines
487487 *
488488 * We queue the work to the CPU on which it was submitted, but if the CPU dies
489489 * it can be processed by another CPU.
490+ *
491+ * Memory-ordering properties: If it returns %true, guarantees that all stores
492+ * preceding the call to queue_work() in the program order will be visible from
493+ * the CPU which will execute @work by the time such work executes, e.g.,
494+ *
495+ * { x is initially 0 }
496+ *
497+ * CPU0 CPU1
498+ *
499+ * WRITE_ONCE(x, 1); [ @work is being executed ]
500+ * r0 = queue_work(wq, work); r1 = READ_ONCE(x);
501+ *
502+ * Forbids: r0 == true && r1 == 0
490503 */
491504 static inline bool queue_work(struct workqueue_struct *wq,
492505 struct work_struct *work)
@@ -546,6 +559,9 @@ static inline bool schedule_work_on(int cpu, struct work_struct *work) · 53 unmodified lines
546559 * This puts a job in the kernel-global workqueue if it was not already
547560 * queued and leaves it in the same position on the kernel-global
548561 * workqueue otherwise.
562+ *
563+ * Shares the same memory-ordering properties of queue_work(), cf. the
564+ * DocBook header of queue_work().
549565 */
550566 static inline bool schedule_work(struct work_struct *work)
551567 {