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