History

Merge 5.17-rc6 into usb-next

We need the USB fixes in here, and it resolves a merge conflict in: drivers/usb/dwc3/dwc3-pci.c

Greg Kroah-Hartman committed 4 years ago

Commit ca9400e2 parents f6a9a2d 7e57714509 files · +4152 −2585Browse files

Showing the changes to include (22 of 509 files). Show all

Unified · Split

22 files
  1. include/linux/blkdev.h +2 −1
  2. include/linux/bpf.h +4 −5
  3. include/linux/cpufreq.h +3 −0
  4. include/linux/dma-mapping.h +8 −0
  5. include/linux/hyperv.h +1 −0
  6. include/linux/netdevice.h +1 −1
  7. include/linux/nvme-tcp.h +1 −0
  8. include/linux/nvmem-provider.h +3 −1
  9. include/linux/sched/task.h +2 −2
  10. include/linux/slab.h +1 −2
  11. include/linux/trace_events.h +12 −10
  12. include/net/addrconf.h +0 −2
  13. include/net/bond_3ad.h +1 −1
  14. include/net/checksum.h +29 −23
  15. include/net/dsa.h +1 −0
  16. include/net/ip6_fib.h +6 −4
  17. include/net/ipv6.h +4 −1
  18. include/net/netfilter/nf_tables.h +1 −1
  19. include/net/netfilter/nf_tables_offload.h +0 −2
  20. include/net/netns/ipv6.h +2 −1
  21. include/net/sock.h +2 −2
  22. include/uapi/linux/kvm.h +1 −0
include/linux/blkdev.h+2−1
@@ -748,7 +748,8 @@ extern bool blk_queue_can_use_dma_map_merging(struct request_queue *q, · 747 unmodified lines
748 748
749bool __must_check blk_get_queue(struct request_queue *);749bool __must_check blk_get_queue(struct request_queue *);
750extern void blk_put_queue(struct request_queue *);750extern void blk_put_queue(struct request_queue *);
751extern void blk_set_queue_dying(struct request_queue *);751
752void blk_mark_disk_dead(struct gendisk *disk);
752 753
753#ifdef CONFIG_BLOCK754#ifdef CONFIG_BLOCK
754/*755/*
include/linux/bpf.h+4−5
@@ -209,11 +209,9 @@ static inline bool map_value_has_timer(const struct bpf_map *map) · 208 unmodified lines
209static inline void check_and_init_map_value(struct bpf_map *map, void *dst)209static inline void check_and_init_map_value(struct bpf_map *map, void *dst)
210{210{
211 if (unlikely(map_value_has_spin_lock(map)))211 if (unlikely(map_value_has_spin_lock(map)))
212 *(struct bpf_spin_lock *)(dst + map->spin_lock_off) =212 memset(dst + map->spin_lock_off, 0, sizeof(struct bpf_spin_lock));
213 (struct bpf_spin_lock){};
214 if (unlikely(map_value_has_timer(map)))213 if (unlikely(map_value_has_timer(map)))
215 *(struct bpf_timer *)(dst + map->timer_off) =214 memset(dst + map->timer_off, 0, sizeof(struct bpf_timer));
216 (struct bpf_timer){};
217}215}
218 216
219/* copy everything but bpf_spin_lock and bpf_timer. There could be one of each. */217/* copy everything but bpf_spin_lock and bpf_timer. There could be one of each. */
@@ -224,7 +222,8 @@ static inline void copy_map_value(struct bpf_map *map, void *dst, void *src) · 4 unmodified lines
224 if (unlikely(map_value_has_spin_lock(map))) {222 if (unlikely(map_value_has_spin_lock(map))) {
225 s_off = map->spin_lock_off;223 s_off = map->spin_lock_off;
226 s_sz = sizeof(struct bpf_spin_lock);224 s_sz = sizeof(struct bpf_spin_lock);
227 } else if (unlikely(map_value_has_timer(map))) {225 }
226 if (unlikely(map_value_has_timer(map))) {
228 t_off = map->timer_off;227 t_off = map->timer_off;
229 t_sz = sizeof(struct bpf_timer);228 t_sz = sizeof(struct bpf_timer);
230 }229 }
include/linux/cpufreq.h+3−0
@@ -382,6 +382,9 @@ struct cpufreq_driver { · 381 unmodified lines
382 int (*suspend)(struct cpufreq_policy *policy);382 int (*suspend)(struct cpufreq_policy *policy);
383 int (*resume)(struct cpufreq_policy *policy);383 int (*resume)(struct cpufreq_policy *policy);
384 384
385 /* Will be called after the driver is fully initialized */
386 void (*ready)(struct cpufreq_policy *policy);
387
385 struct freq_attr **attr;388 struct freq_attr **attr;
386 389
387 /* platform specific boost support code */390 /* platform specific boost support code */
include/linux/dma-mapping.h+8−0
@@ -61,6 +61,14 @@ · 60 unmodified lines
61 */61 */
62#define DMA_ATTR_PRIVILEGED (1UL << 9)62#define DMA_ATTR_PRIVILEGED (1UL << 9)
63 63
64/*
65 * This is a hint to the DMA-mapping subsystem that the device is expected
66 * to overwrite the entire mapped size, thus the caller does not require any
67 * of the previous buffer contents to be preserved. This allows
68 * bounce-buffering implementations to optimise DMA_FROM_DEVICE transfers.
69 */
70#define DMA_ATTR_OVERWRITE (1UL << 10)
71
64/*72/*
65 * A dma_addr_t can hold any valid DMA or bus address for the platform. It can73 * A dma_addr_t can hold any valid DMA or bus address for the platform. It can
66 * be given to a device to use as a DMA source or target. It is specific to a74 * be given to a device to use as a DMA source or target. It is specific to a
include/linux/hyperv.h+1−0
@@ -1262,6 +1262,7 @@ struct hv_device { · 1261 unmodified lines
1262 struct vmbus_channel *channel;1262 struct vmbus_channel *channel;
1263 struct kset *channels_kset;1263 struct kset *channels_kset;
1264 struct device_dma_parameters dma_parms;1264 struct device_dma_parameters dma_parms;
1265 u64 dma_mask;
1265 1266
1266 /* place holder to keep track of the dir for hv device in debugfs */1267 /* place holder to keep track of the dir for hv device in debugfs */
1267 struct dentry *debug_dir;1268 struct dentry *debug_dir;
include/linux/netdevice.h+1−1
@@ -2158,7 +2158,7 @@ struct net_device { · 2157 unmodified lines
2158 struct netdev_queue *_tx ____cacheline_aligned_in_smp;2158 struct netdev_queue *_tx ____cacheline_aligned_in_smp;
2159 unsigned int num_tx_queues;2159 unsigned int num_tx_queues;
2160 unsigned int real_num_tx_queues;2160 unsigned int real_num_tx_queues;
2161 struct Qdisc *qdisc;2161 struct Qdisc __rcu *qdisc;
2162 unsigned int tx_queue_len;2162 unsigned int tx_queue_len;
2163 spinlock_t tx_global_lock;2163 spinlock_t tx_global_lock;
2164 2164
include/linux/nvme-tcp.h+1−0
@@ -12,6 +12,7 @@ · 11 unmodified lines
12#define NVME_TCP_DISC_PORT 800912#define NVME_TCP_DISC_PORT 8009
13#define NVME_TCP_ADMIN_CCSZ SZ_8K13#define NVME_TCP_ADMIN_CCSZ SZ_8K
14#define NVME_TCP_DIGEST_LENGTH 414#define NVME_TCP_DIGEST_LENGTH 4
15#define NVME_TCP_MIN_MAXH2CDATA 4096
15 16
16enum nvme_tcp_pfv {17enum nvme_tcp_pfv {
17 NVME_TCP_PFV_1_0 = 0x0,18 NVME_TCP_PFV_1_0 = 0x0,
include/linux/nvmem-provider.h+3−1
@@ -70,7 +70,8 @@ struct nvmem_keepout { · 69 unmodified lines
70 * @word_size: Minimum read/write access granularity.70 * @word_size: Minimum read/write access granularity.
71 * @stride: Minimum read/write access stride.71 * @stride: Minimum read/write access stride.
72 * @priv: User context passed to read/write callbacks.72 * @priv: User context passed to read/write callbacks.
73 * @wp-gpio: Write protect pin73 * @wp-gpio: Write protect pin
74 * @ignore_wp: Write Protect pin is managed by the provider.
74 *75 *
75 * Note: A default "nvmem<id>" name will be assigned to the device if76 * Note: A default "nvmem<id>" name will be assigned to the device if
76 * no name is specified in its configuration. In such case "<id>" is77 * no name is specified in its configuration. In such case "<id>" is
@@ -92,6 +93,7 @@ struct nvmem_config { · 15 unmodified lines
92 enum nvmem_type type;93 enum nvmem_type type;
93 bool read_only;94 bool read_only;
94 bool root_only;95 bool root_only;
96 bool ignore_wp;
95 struct device_node *of_node;97 struct device_node *of_node;
96 bool no_of_node;98 bool no_of_node;
97 nvmem_reg_read_t reg_read;99 nvmem_reg_read_t reg_read;
include/linux/sched/task.h+2−2
@@ -54,8 +54,8 @@ extern asmlinkage void schedule_tail(struct task_struct *prev); · 53 unmodified lines
54extern void init_idle(struct task_struct *idle, int cpu);54extern void init_idle(struct task_struct *idle, int cpu);
55 55
56extern int sched_fork(unsigned long clone_flags, struct task_struct *p);56extern int sched_fork(unsigned long clone_flags, struct task_struct *p);
57extern void sched_post_fork(struct task_struct *p,57extern void sched_cgroup_fork(struct task_struct *p, struct kernel_clone_args *kargs);
58 struct kernel_clone_args *kargs);58extern void sched_post_fork(struct task_struct *p);
59extern void sched_dead(struct task_struct *p);59extern void sched_dead(struct task_struct *p);
60 60
61void __noreturn do_task_dead(void);61void __noreturn do_task_dead(void);
include/linux/slab.h+1−2
@@ -660,8 +660,7 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag · 659 unmodified lines
660 * allocator where we care about the real place the memory allocation660 * allocator where we care about the real place the memory allocation
661 * request comes from.661 * request comes from.
662 */662 */
663extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller)663extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller);
664 __alloc_size(1);
665#define kmalloc_track_caller(size, flags) \664#define kmalloc_track_caller(size, flags) \
666 __kmalloc_track_caller(size, flags, _RET_IP_)665 __kmalloc_track_caller(size, flags, _RET_IP_)
667 666
include/linux/trace_events.h+12−10
@@ -699,6 +699,8 @@ event_triggers_post_call(struct trace_event_file *file, · 698 unmodified lines
699 699
700bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);700bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
701 701
702bool __trace_trigger_soft_disabled(struct trace_event_file *file);
703
702/**704/**
703 * trace_trigger_soft_disabled - do triggers and test if soft disabled705 * trace_trigger_soft_disabled - do triggers and test if soft disabled
704 * @file: The file pointer of the event to test706 * @file: The file pointer of the event to test
@@ -708,20 +710,20 @@ bool trace_event_ignore_this_pid(struct trace_event_file *trace_file); · 3 unmodified lines
708 * triggers that require testing the fields, it will return true,710 * triggers that require testing the fields, it will return true,
709 * otherwise false.711 * otherwise false.
710 */712 */
711static inline bool713static __always_inline bool
712trace_trigger_soft_disabled(struct trace_event_file *file)714trace_trigger_soft_disabled(struct trace_event_file *file)
713{715{
714 unsigned long eflags = file->flags;716 unsigned long eflags = file->flags;
715 717
716 if (!(eflags & EVENT_FILE_FL_TRIGGER_COND)) {718 if (likely(!(eflags & (EVENT_FILE_FL_TRIGGER_MODE |
717 if (eflags & EVENT_FILE_FL_TRIGGER_MODE)719 EVENT_FILE_FL_SOFT_DISABLED |
718 event_triggers_call(file, NULL, NULL, NULL);720 EVENT_FILE_FL_PID_FILTER))))
719 if (eflags & EVENT_FILE_FL_SOFT_DISABLED)721 return false;
720 return true;722
721 if (eflags & EVENT_FILE_FL_PID_FILTER)723 if (likely(eflags & EVENT_FILE_FL_TRIGGER_COND))
722 return trace_event_ignore_this_pid(file);724 return false;
723 }725
724 return false;726 return __trace_trigger_soft_disabled(file);
725}727}
726 728
727#ifdef CONFIG_BPF_EVENTS729#ifdef CONFIG_BPF_EVENTS
include/net/addrconf.h+0−2
@@ -109,8 +109,6 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, · 108 unmodified lines
109int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,109int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
110 const struct in6_addr *daddr, unsigned int srcprefs,110 const struct in6_addr *daddr, unsigned int srcprefs,
111 struct in6_addr *saddr);111 struct in6_addr *saddr);
112int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
113 u32 banned_flags);
114int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,112int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
115 u32 banned_flags);113 u32 banned_flags);
116bool inet_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,114bool inet_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2,
include/net/bond_3ad.h+1−1
@@ -262,7 +262,7 @@ struct ad_system { · 261 unmodified lines
262struct ad_bond_info {262struct ad_bond_info {
263 struct ad_system system; /* 802.3ad system structure */263 struct ad_system system; /* 802.3ad system structure */
264 struct bond_3ad_stats stats;264 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 */
266 u16 aggregator_identifier;266 u16 aggregator_identifier;
267};267};
268 268
include/net/checksum.h+29−23
@@ -22,7 +22,7 @@ · 21 unmodified lines
22#include <asm/checksum.h>22#include <asm/checksum.h>
23 23
24#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER24#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
25static inline25static __always_inline
26__wsum csum_and_copy_from_user (const void __user *src, void *dst,26__wsum csum_and_copy_from_user (const void __user *src, void *dst,
27 int len)27 int len)
28{28{
@@ -33,7 +33,7 @@ __wsum csum_and_copy_from_user (const void __user *src, void *dst, · 4 unmodified lines
33#endif33#endif
34 34
35#ifndef HAVE_CSUM_COPY_USER35#ifndef HAVE_CSUM_COPY_USER
36static __inline__ __wsum csum_and_copy_to_user36static __always_inline __wsum csum_and_copy_to_user
37(const void *src, void __user *dst, int len)37(const void *src, void __user *dst, int len)
38{38{
39 __wsum sum = csum_partial(src, len, ~0U);39 __wsum sum = csum_partial(src, len, ~0U);
@@ -45,7 +45,7 @@ static __inline__ __wsum csum_and_copy_to_user · 5 unmodified lines
45#endif45#endif
46 46
47#ifndef _HAVE_ARCH_CSUM_AND_COPY47#ifndef _HAVE_ARCH_CSUM_AND_COPY
48static inline __wsum48static __always_inline __wsum
49csum_partial_copy_nocheck(const void *src, void *dst, int len)49csum_partial_copy_nocheck(const void *src, void *dst, int len)
50{50{
51 memcpy(dst, src, len);51 memcpy(dst, src, len);
@@ -54,7 +54,7 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len) · 2 unmodified lines
54#endif54#endif
55 55
56#ifndef HAVE_ARCH_CSUM_ADD56#ifndef HAVE_ARCH_CSUM_ADD
57static inline __wsum csum_add(__wsum csum, __wsum addend)57static __always_inline __wsum csum_add(__wsum csum, __wsum addend)
58{58{
59 u32 res = (__force u32)csum;59 u32 res = (__force u32)csum;
60 res += (__force u32)addend;60 res += (__force u32)addend;
@@ -62,12 +62,12 @@ static inline __wsum csum_add(__wsum csum, __wsum addend) · 1 unmodified line
62}62}
63#endif63#endif
64 64
65static inline __wsum csum_sub(__wsum csum, __wsum addend)65static __always_inline __wsum csum_sub(__wsum csum, __wsum addend)
66{66{
67 return csum_add(csum, ~addend);67 return csum_add(csum, ~addend);
68}68}
69 69
70static inline __sum16 csum16_add(__sum16 csum, __be16 addend)70static __always_inline __sum16 csum16_add(__sum16 csum, __be16 addend)
71{71{
72 u16 res = (__force u16)csum;72 u16 res = (__force u16)csum;
73 73
@@ -75,12 +75,12 @@ static inline __sum16 csum16_add(__sum16 csum, __be16 addend) · 1 unmodified line
75 return (__force __sum16)(res + (res < (__force u16)addend));75 return (__force __sum16)(res + (res < (__force u16)addend));
76}76}
77 77
78static inline __sum16 csum16_sub(__sum16 csum, __be16 addend)78static __always_inline __sum16 csum16_sub(__sum16 csum, __be16 addend)
79{79{
80 return csum16_add(csum, ~addend);80 return csum16_add(csum, ~addend);
81}81}
82 82
83static inline __wsum csum_shift(__wsum sum, int offset)83static __always_inline __wsum csum_shift(__wsum sum, int offset)
84{84{
85 /* rotate sum to align it with a 16b boundary */85 /* rotate sum to align it with a 16b boundary */
86 if (offset & 1)86 if (offset & 1)
@@ -88,42 +88,43 @@ static inline __wsum csum_shift(__wsum sum, int offset) · 1 unmodified line
88 return sum;88 return sum;
89}89}
90 90
91static inline __wsum91static __always_inline __wsum
92csum_block_add(__wsum csum, __wsum csum2, int offset)92csum_block_add(__wsum csum, __wsum csum2, int offset)
93{93{
94 return csum_add(csum, csum_shift(csum2, offset));94 return csum_add(csum, csum_shift(csum2, offset));
95}95}
96 96
97static inline __wsum97static __always_inline __wsum
98csum_block_add_ext(__wsum csum, __wsum csum2, int offset, int len)98csum_block_add_ext(__wsum csum, __wsum csum2, int offset, int len)
99{99{
100 return csum_block_add(csum, csum2, offset);100 return csum_block_add(csum, csum2, offset);
101}101}
102 102
103static inline __wsum103static __always_inline __wsum
104csum_block_sub(__wsum csum, __wsum csum2, int offset)104csum_block_sub(__wsum csum, __wsum csum2, int offset)
105{105{
106 return csum_block_add(csum, ~csum2, offset);106 return csum_block_add(csum, ~csum2, offset);
107}107}
108 108
109static inline __wsum csum_unfold(__sum16 n)109static __always_inline __wsum csum_unfold(__sum16 n)
110{110{
111 return (__force __wsum)n;111 return (__force __wsum)n;
112}112}
113 113
114static inline __wsum csum_partial_ext(const void *buff, int len, __wsum sum)114static __always_inline
115__wsum csum_partial_ext(const void *buff, int len, __wsum sum)
115{116{
116 return csum_partial(buff, len, sum);117 return csum_partial(buff, len, sum);
117}118}
118 119
119#define CSUM_MANGLED_0 ((__force __sum16)0xffff)120#define CSUM_MANGLED_0 ((__force __sum16)0xffff)
120 121
121static inline void csum_replace_by_diff(__sum16 *sum, __wsum diff)122static __always_inline void csum_replace_by_diff(__sum16 *sum, __wsum diff)
122{123{
123 *sum = csum_fold(csum_add(diff, ~csum_unfold(*sum)));124 *sum = csum_fold(csum_add(diff, ~csum_unfold(*sum)));
124}125}
125 126
126static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)127static __always_inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)
127{128{
128 __wsum tmp = csum_sub(~csum_unfold(*sum), (__force __wsum)from);129 __wsum tmp = csum_sub(~csum_unfold(*sum), (__force __wsum)from);
129 130
@@ -136,11 +137,16 @@ static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to) · 6 unmodified lines
136 * m : old value of a 16bit field137 * m : old value of a 16bit field
137 * m' : new value of a 16bit field138 * m' : new value of a 16bit field
138 */139 */
139static inline void csum_replace2(__sum16 *sum, __be16 old, __be16 new)140static __always_inline void csum_replace2(__sum16 *sum, __be16 old, __be16 new)
140{141{
141 *sum = ~csum16_add(csum16_sub(~(*sum), old), new);142 *sum = ~csum16_add(csum16_sub(~(*sum), old), new);
142}143}
143 144
145static inline void csum_replace(__wsum *csum, __wsum old, __wsum new)
146{
147 *csum = csum_add(csum_sub(*csum, old), new);
148}
149
144struct sk_buff;150struct sk_buff;
145void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,151void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
146 __be32 from, __be32 to, bool pseudohdr);152 __be32 from, __be32 to, bool pseudohdr);
@@ -150,16 +156,16 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, · 3 unmodified lines
150void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb,156void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb,
151 __wsum diff, bool pseudohdr);157 __wsum diff, bool pseudohdr);
152 158
153static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,159static __always_inline
154 __be16 from, __be16 to,160void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
155 bool pseudohdr)161 __be16 from, __be16 to, bool pseudohdr)
156{162{
157 inet_proto_csum_replace4(sum, skb, (__force __be32)from,163 inet_proto_csum_replace4(sum, skb, (__force __be32)from,
158 (__force __be32)to, pseudohdr);164 (__force __be32)to, pseudohdr);
159}165}
160 166
161static inline __wsum remcsum_adjust(void *ptr, __wsum csum,167static __always_inline __wsum remcsum_adjust(void *ptr, __wsum csum,
162 int start, int offset)168 int start, int offset)
163{169{
164 __sum16 *psum = (__sum16 *)(ptr + offset);170 __sum16 *psum = (__sum16 *)(ptr + offset);
165 __wsum delta;171 __wsum delta;
@@ -175,12 +181,12 @@ static inline __wsum remcsum_adjust(void *ptr, __wsum csum, · 9 unmodified lines
175 return delta;181 return delta;
176}182}
177 183
178static inline void remcsum_unadjust(__sum16 *psum, __wsum delta)184static __always_inline void remcsum_unadjust(__sum16 *psum, __wsum delta)
179{185{
180 *psum = csum_fold(csum_sub(delta, (__force __wsum)*psum));186 *psum = csum_fold(csum_sub(delta, (__force __wsum)*psum));
181}187}
182 188
183static inline __wsum wsum_negate(__wsum val)189static __always_inline __wsum wsum_negate(__wsum val)
184{190{
185 return (__force __wsum)-((__force u32)val);191 return (__force __wsum)-((__force u32)val);
186}192}
include/net/dsa.h+1−0
@@ -1187,6 +1187,7 @@ void dsa_unregister_switch(struct dsa_switch *ds); · 1186 unmodified lines
1187int dsa_register_switch(struct dsa_switch *ds);1187int dsa_register_switch(struct dsa_switch *ds);
1188void dsa_switch_shutdown(struct dsa_switch *ds);1188void dsa_switch_shutdown(struct dsa_switch *ds);
1189struct dsa_switch *dsa_switch_find(int tree_index, int sw_index);1189struct dsa_switch *dsa_switch_find(int tree_index, int sw_index);
1190void dsa_flush_workqueue(void);
1190#ifdef CONFIG_PM_SLEEP1191#ifdef CONFIG_PM_SLEEP
1191int dsa_switch_suspend(struct dsa_switch *ds);1192int dsa_switch_suspend(struct dsa_switch *ds);
1192int dsa_switch_resume(struct dsa_switch *ds);1193int dsa_switch_resume(struct dsa_switch *ds);
include/net/ip6_fib.h+6−4
@@ -190,14 +190,16 @@ struct fib6_info { · 189 unmodified lines
190 u32 fib6_metric;190 u32 fib6_metric;
191 u8 fib6_protocol;191 u8 fib6_protocol;
192 u8 fib6_type;192 u8 fib6_type;
193
194 u8 offload;
195 u8 trap;
196 u8 offload_failed;
197
193 u8 should_flush:1,198 u8 should_flush:1,
194 dst_nocount:1,199 dst_nocount:1,
195 dst_nopolicy:1,200 dst_nopolicy:1,
196 fib6_destroying:1,201 fib6_destroying:1,
197 offload:1,202 unused:4;
198 trap:1,
199 offload_failed:1,
200 unused:1;
201 203
202 struct rcu_head rcu;204 struct rcu_head rcu;
203 struct nexthop *nh;205 struct nexthop *nh;
include/net/ipv6.h+4−1
@@ -393,17 +393,20 @@ static inline void txopt_put(struct ipv6_txoptions *opt) · 392 unmodified lines
393 kfree_rcu(opt, rcu);393 kfree_rcu(opt, rcu);
394}394}
395 395
396#if IS_ENABLED(CONFIG_IPV6)
396struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label);397struct ip6_flowlabel *__fl6_sock_lookup(struct sock *sk, __be32 label);
397 398
398extern struct static_key_false_deferred ipv6_flowlabel_exclusive;399extern struct static_key_false_deferred ipv6_flowlabel_exclusive;
399static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk,400static inline struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk,
400 __be32 label)401 __be32 label)
401{402{
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))
403 return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT);405 return __fl6_sock_lookup(sk, label) ? : ERR_PTR(-ENOENT);
404 406
405 return NULL;407 return NULL;
406}408}
409#endif
407 410
408struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,411struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,
409 struct ip6_flowlabel *fl,412 struct ip6_flowlabel *fl,
include/net/netfilter/nf_tables.h+1−1
@@ -905,9 +905,9 @@ struct nft_expr_ops { · 904 unmodified lines
905 int (*offload)(struct nft_offload_ctx *ctx,905 int (*offload)(struct nft_offload_ctx *ctx,
906 struct nft_flow_rule *flow,906 struct nft_flow_rule *flow,
907 const struct nft_expr *expr);907 const struct nft_expr *expr);
908 bool (*offload_action)(const struct nft_expr *expr);
908 void (*offload_stats)(struct nft_expr *expr,909 void (*offload_stats)(struct nft_expr *expr,
909 const struct flow_stats *stats);910 const struct flow_stats *stats);
910 u32 offload_flags;
911 const struct nft_expr_type *type;911 const struct nft_expr_type *type;
912 void *data;912 void *data;
913};913};
include/net/netfilter/nf_tables_offload.h+0−2
@@ -67,8 +67,6 @@ struct nft_flow_rule { · 66 unmodified lines
67 struct flow_rule *rule;67 struct flow_rule *rule;
68};68};
69 69
70#define NFT_OFFLOAD_F_ACTION (1 << 0)
71
72void nft_flow_rule_set_addr_type(struct nft_flow_rule *flow,70void nft_flow_rule_set_addr_type(struct nft_flow_rule *flow,
73 enum flow_dissector_key_id addr_type);71 enum flow_dissector_key_id addr_type);
74 72
include/net/netns/ipv6.h+2−1
@@ -77,9 +77,10 @@ struct netns_ipv6 { · 76 unmodified lines
77 spinlock_t fib6_gc_lock;77 spinlock_t fib6_gc_lock;
78 unsigned int ip6_rt_gc_expire;78 unsigned int ip6_rt_gc_expire;
79 unsigned long ip6_rt_last_gc;79 unsigned long ip6_rt_last_gc;
80 unsigned char flowlabel_has_excl;
80#ifdef CONFIG_IPV6_MULTIPLE_TABLES81#ifdef CONFIG_IPV6_MULTIPLE_TABLES
81 unsigned int fib6_rules_require_fldissect;
82 bool fib6_has_custom_rules;82 bool fib6_has_custom_rules;
83 unsigned int fib6_rules_require_fldissect;
83#ifdef CONFIG_IPV6_SUBTREES84#ifdef CONFIG_IPV6_SUBTREES
84 unsigned int fib6_routes_require_src;85 unsigned int fib6_routes_require_src;
85#endif86#endif
include/net/sock.h+2−2
@@ -507,7 +507,7 @@ struct sock { · 506 unmodified lines
507#endif507#endif
508 u16 sk_tsflags;508 u16 sk_tsflags;
509 u8 sk_shutdown;509 u8 sk_shutdown;
510 u32 sk_tskey;510 atomic_t sk_tskey;
511 atomic_t sk_zckey;511 atomic_t sk_zckey;
512 512
513 u8 sk_clockid;513 u8 sk_clockid;
@@ -2667,7 +2667,7 @@ static inline void _sock_tx_timestamp(struct sock *sk, __u16 tsflags, · 2153 unmodified lines
2667 __sock_tx_timestamp(tsflags, tx_flags);2667 __sock_tx_timestamp(tsflags, tx_flags);
2668 if (tsflags & SOF_TIMESTAMPING_OPT_ID && tskey &&2668 if (tsflags & SOF_TIMESTAMPING_OPT_ID && tskey &&
2669 tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK)2669 tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK)
2670 *tskey = sk->sk_tskey++;2670 *tskey = atomic_inc_return(&sk->sk_tskey) - 1;
2671 }2671 }
2672 if (unlikely(sock_flag(sk, SOCK_WIFI_STATUS)))2672 if (unlikely(sock_flag(sk, SOCK_WIFI_STATUS)))
2673 *tx_flags |= SKBTX_WIFI_STATUS;2673 *tx_flags |= SKBTX_WIFI_STATUS;
include/uapi/linux/kvm.h+1−0
@@ -1134,6 +1134,7 @@ struct kvm_ppc_resize_hpt { · 1133 unmodified lines
1134#define KVM_CAP_VM_GPA_BITS 2071134#define KVM_CAP_VM_GPA_BITS 207
1135#define KVM_CAP_XSAVE2 2081135#define KVM_CAP_XSAVE2 208
1136#define KVM_CAP_SYS_ATTRIBUTES 2091136#define KVM_CAP_SYS_ATTRIBUTES 209
1137#define KVM_CAP_PPC_AIL_MODE_3 210
1137 1138
1138#ifdef KVM_CAP_IRQ_ROUTING1139#ifdef KVM_CAP_IRQ_ROUTING
1139 1140

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