1 |
commit: ec31621f64416a0fd7a9d9db43542b98820cd285 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 3 11:35:36 2019 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 3 11:35:36 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ec31621f |
7 |
|
8 |
Linux patch 5.1.16 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 4 + |
13 |
1015_linux-5.1.16.patch | 2889 +++++++++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 2893 insertions(+) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index db80d60..941f7f1 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -103,6 +103,10 @@ Patch: 1014_linux-5.1.15.patch |
21 |
From: https://www.kernel.org |
22 |
Desc: Linux 5.1.15 |
23 |
|
24 |
+Patch: 1015_linux-5.1.16.patch |
25 |
+From: https://www.kernel.org |
26 |
+Desc: Linux 5.1.16 |
27 |
+ |
28 |
Patch: 1500_XATTR_USER_PREFIX.patch |
29 |
From: https://bugs.gentoo.org/show_bug.cgi?id=470644 |
30 |
Desc: Support for namespace user.pax.* on tmpfs. |
31 |
|
32 |
diff --git a/1015_linux-5.1.16.patch b/1015_linux-5.1.16.patch |
33 |
new file mode 100644 |
34 |
index 0000000..23d3be5 |
35 |
--- /dev/null |
36 |
+++ b/1015_linux-5.1.16.patch |
37 |
@@ -0,0 +1,2889 @@ |
38 |
+diff --git a/Documentation/robust-futexes.txt b/Documentation/robust-futexes.txt |
39 |
+index 6c42c75103eb..6361fb01c9c1 100644 |
40 |
+--- a/Documentation/robust-futexes.txt |
41 |
++++ b/Documentation/robust-futexes.txt |
42 |
+@@ -218,5 +218,4 @@ All other architectures should build just fine too - but they won't have |
43 |
+ the new syscalls yet. |
44 |
+ |
45 |
+ Architectures need to implement the new futex_atomic_cmpxchg_inatomic() |
46 |
+-inline function before writing up the syscalls (that function returns |
47 |
+--ENOSYS right now). |
48 |
++inline function before writing up the syscalls. |
49 |
+diff --git a/Makefile b/Makefile |
50 |
+index d7b3c8e3ff3e..46a0ae537182 100644 |
51 |
+--- a/Makefile |
52 |
++++ b/Makefile |
53 |
+@@ -1,7 +1,7 @@ |
54 |
+ # SPDX-License-Identifier: GPL-2.0 |
55 |
+ VERSION = 5 |
56 |
+ PATCHLEVEL = 1 |
57 |
+-SUBLEVEL = 15 |
58 |
++SUBLEVEL = 16 |
59 |
+ EXTRAVERSION = |
60 |
+ NAME = Shy Crocodile |
61 |
+ |
62 |
+diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile |
63 |
+index 8fbd583b18e1..e9d2e578cbe6 100644 |
64 |
+--- a/arch/arm64/Makefile |
65 |
++++ b/arch/arm64/Makefile |
66 |
+@@ -51,7 +51,7 @@ endif |
67 |
+ |
68 |
+ KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) |
69 |
+ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables |
70 |
+-KBUILD_CFLAGS += -Wno-psabi |
71 |
++KBUILD_CFLAGS += $(call cc-disable-warning, psabi) |
72 |
+ KBUILD_AFLAGS += $(lseinstr) $(brokengasinst) |
73 |
+ |
74 |
+ KBUILD_CFLAGS += $(call cc-option,-mabi=lp64) |
75 |
+diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h |
76 |
+index 2d78ea6932b7..bdb3c05070a2 100644 |
77 |
+--- a/arch/arm64/include/asm/futex.h |
78 |
++++ b/arch/arm64/include/asm/futex.h |
79 |
+@@ -134,7 +134,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, |
80 |
+ : "memory"); |
81 |
+ uaccess_disable(); |
82 |
+ |
83 |
+- *uval = val; |
84 |
++ if (!ret) |
85 |
++ *uval = val; |
86 |
++ |
87 |
+ return ret; |
88 |
+ } |
89 |
+ |
90 |
+diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h |
91 |
+index 9c01f04db64d..f71b84d9f294 100644 |
92 |
+--- a/arch/arm64/include/asm/insn.h |
93 |
++++ b/arch/arm64/include/asm/insn.h |
94 |
+@@ -277,6 +277,7 @@ __AARCH64_INSN_FUNCS(adrp, 0x9F000000, 0x90000000) |
95 |
+ __AARCH64_INSN_FUNCS(prfm, 0x3FC00000, 0x39800000) |
96 |
+ __AARCH64_INSN_FUNCS(prfm_lit, 0xFF000000, 0xD8000000) |
97 |
+ __AARCH64_INSN_FUNCS(str_reg, 0x3FE0EC00, 0x38206800) |
98 |
++__AARCH64_INSN_FUNCS(ldadd, 0x3F20FC00, 0x38200000) |
99 |
+ __AARCH64_INSN_FUNCS(ldr_reg, 0x3FE0EC00, 0x38606800) |
100 |
+ __AARCH64_INSN_FUNCS(ldr_lit, 0xBF000000, 0x18000000) |
101 |
+ __AARCH64_INSN_FUNCS(ldrsw_lit, 0xFF000000, 0x98000000) |
102 |
+@@ -394,6 +395,13 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg, |
103 |
+ enum aarch64_insn_register state, |
104 |
+ enum aarch64_insn_size_type size, |
105 |
+ enum aarch64_insn_ldst_type type); |
106 |
++u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result, |
107 |
++ enum aarch64_insn_register address, |
108 |
++ enum aarch64_insn_register value, |
109 |
++ enum aarch64_insn_size_type size); |
110 |
++u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address, |
111 |
++ enum aarch64_insn_register value, |
112 |
++ enum aarch64_insn_size_type size); |
113 |
+ u32 aarch64_insn_gen_add_sub_imm(enum aarch64_insn_register dst, |
114 |
+ enum aarch64_insn_register src, |
115 |
+ int imm, enum aarch64_insn_variant variant, |
116 |
+diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c |
117 |
+index 7820a4a688fa..9e2b5882cdeb 100644 |
118 |
+--- a/arch/arm64/kernel/insn.c |
119 |
++++ b/arch/arm64/kernel/insn.c |
120 |
+@@ -734,6 +734,46 @@ u32 aarch64_insn_gen_load_store_ex(enum aarch64_insn_register reg, |
121 |
+ state); |
122 |
+ } |
123 |
+ |
124 |
++u32 aarch64_insn_gen_ldadd(enum aarch64_insn_register result, |
125 |
++ enum aarch64_insn_register address, |
126 |
++ enum aarch64_insn_register value, |
127 |
++ enum aarch64_insn_size_type size) |
128 |
++{ |
129 |
++ u32 insn = aarch64_insn_get_ldadd_value(); |
130 |
++ |
131 |
++ switch (size) { |
132 |
++ case AARCH64_INSN_SIZE_32: |
133 |
++ case AARCH64_INSN_SIZE_64: |
134 |
++ break; |
135 |
++ default: |
136 |
++ pr_err("%s: unimplemented size encoding %d\n", __func__, size); |
137 |
++ return AARCH64_BREAK_FAULT; |
138 |
++ } |
139 |
++ |
140 |
++ insn = aarch64_insn_encode_ldst_size(size, insn); |
141 |
++ |
142 |
++ insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RT, insn, |
143 |
++ result); |
144 |
++ |
145 |
++ insn = aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RN, insn, |
146 |
++ address); |
147 |
++ |
148 |
++ return aarch64_insn_encode_register(AARCH64_INSN_REGTYPE_RS, insn, |
149 |
++ value); |
150 |
++} |
151 |
++ |
152 |
++u32 aarch64_insn_gen_stadd(enum aarch64_insn_register address, |
153 |
++ enum aarch64_insn_register value, |
154 |
++ enum aarch64_insn_size_type size) |
155 |
++{ |
156 |
++ /* |
157 |
++ * STADD is simply encoded as an alias for LDADD with XZR as |
158 |
++ * the destination register. |
159 |
++ */ |
160 |
++ return aarch64_insn_gen_ldadd(AARCH64_INSN_REG_ZR, address, |
161 |
++ value, size); |
162 |
++} |
163 |
++ |
164 |
+ static u32 aarch64_insn_encode_prfm_imm(enum aarch64_insn_prfm_type type, |
165 |
+ enum aarch64_insn_prfm_target target, |
166 |
+ enum aarch64_insn_prfm_policy policy, |
167 |
+diff --git a/arch/arm64/net/bpf_jit.h b/arch/arm64/net/bpf_jit.h |
168 |
+index 6c881659ee8a..76606e87233f 100644 |
169 |
+--- a/arch/arm64/net/bpf_jit.h |
170 |
++++ b/arch/arm64/net/bpf_jit.h |
171 |
+@@ -100,6 +100,10 @@ |
172 |
+ #define A64_STXR(sf, Rt, Rn, Rs) \ |
173 |
+ A64_LSX(sf, Rt, Rn, Rs, STORE_EX) |
174 |
+ |
175 |
++/* LSE atomics */ |
176 |
++#define A64_STADD(sf, Rn, Rs) \ |
177 |
++ aarch64_insn_gen_stadd(Rn, Rs, A64_SIZE(sf)) |
178 |
++ |
179 |
+ /* Add/subtract (immediate) */ |
180 |
+ #define A64_ADDSUB_IMM(sf, Rd, Rn, imm12, type) \ |
181 |
+ aarch64_insn_gen_add_sub_imm(Rd, Rn, imm12, \ |
182 |
+diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c |
183 |
+index a1420626fca2..df845cee438e 100644 |
184 |
+--- a/arch/arm64/net/bpf_jit_comp.c |
185 |
++++ b/arch/arm64/net/bpf_jit_comp.c |
186 |
+@@ -365,7 +365,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, |
187 |
+ const bool is64 = BPF_CLASS(code) == BPF_ALU64 || |
188 |
+ BPF_CLASS(code) == BPF_JMP; |
189 |
+ const bool isdw = BPF_SIZE(code) == BPF_DW; |
190 |
+- u8 jmp_cond; |
191 |
++ u8 jmp_cond, reg; |
192 |
+ s32 jmp_offset; |
193 |
+ |
194 |
+ #define check_imm(bits, imm) do { \ |
195 |
+@@ -756,18 +756,28 @@ emit_cond_jmp: |
196 |
+ break; |
197 |
+ } |
198 |
+ break; |
199 |
++ |
200 |
+ /* STX XADD: lock *(u32 *)(dst + off) += src */ |
201 |
+ case BPF_STX | BPF_XADD | BPF_W: |
202 |
+ /* STX XADD: lock *(u64 *)(dst + off) += src */ |
203 |
+ case BPF_STX | BPF_XADD | BPF_DW: |
204 |
+- emit_a64_mov_i(1, tmp, off, ctx); |
205 |
+- emit(A64_ADD(1, tmp, tmp, dst), ctx); |
206 |
+- emit(A64_LDXR(isdw, tmp2, tmp), ctx); |
207 |
+- emit(A64_ADD(isdw, tmp2, tmp2, src), ctx); |
208 |
+- emit(A64_STXR(isdw, tmp2, tmp, tmp3), ctx); |
209 |
+- jmp_offset = -3; |
210 |
+- check_imm19(jmp_offset); |
211 |
+- emit(A64_CBNZ(0, tmp3, jmp_offset), ctx); |
212 |
++ if (!off) { |
213 |
++ reg = dst; |
214 |
++ } else { |
215 |
++ emit_a64_mov_i(1, tmp, off, ctx); |
216 |
++ emit(A64_ADD(1, tmp, tmp, dst), ctx); |
217 |
++ reg = tmp; |
218 |
++ } |
219 |
++ if (cpus_have_cap(ARM64_HAS_LSE_ATOMICS)) { |
220 |
++ emit(A64_STADD(isdw, reg, src), ctx); |
221 |
++ } else { |
222 |
++ emit(A64_LDXR(isdw, tmp2, reg), ctx); |
223 |
++ emit(A64_ADD(isdw, tmp2, tmp2, src), ctx); |
224 |
++ emit(A64_STXR(isdw, tmp2, reg, tmp3), ctx); |
225 |
++ jmp_offset = -3; |
226 |
++ check_imm19(jmp_offset); |
227 |
++ emit(A64_CBNZ(0, tmp3, jmp_offset), ctx); |
228 |
++ } |
229 |
+ break; |
230 |
+ |
231 |
+ default: |
232 |
+diff --git a/arch/mips/include/asm/mips-gic.h b/arch/mips/include/asm/mips-gic.h |
233 |
+index 558059a8f218..0277b56157af 100644 |
234 |
+--- a/arch/mips/include/asm/mips-gic.h |
235 |
++++ b/arch/mips/include/asm/mips-gic.h |
236 |
+@@ -314,6 +314,36 @@ static inline bool mips_gic_present(void) |
237 |
+ return IS_ENABLED(CONFIG_MIPS_GIC) && mips_gic_base; |
238 |
+ } |
239 |
+ |
240 |
++/** |
241 |
++ * mips_gic_vx_map_reg() - Return GIC_Vx_<intr>_MAP register offset |
242 |
++ * @intr: A GIC local interrupt |
243 |
++ * |
244 |
++ * Determine the index of the GIC_VL_<intr>_MAP or GIC_VO_<intr>_MAP register |
245 |
++ * within the block of GIC map registers. This is almost the same as the order |
246 |
++ * of interrupts in the pending & mask registers, as used by enum |
247 |
++ * mips_gic_local_interrupt, but moves the FDC interrupt & thus offsets the |
248 |
++ * interrupts after it... |
249 |
++ * |
250 |
++ * Return: The map register index corresponding to @intr. |
251 |
++ * |
252 |
++ * The return value is suitable for use with the (read|write)_gic_v[lo]_map |
253 |
++ * accessor functions. |
254 |
++ */ |
255 |
++static inline unsigned int |
256 |
++mips_gic_vx_map_reg(enum mips_gic_local_interrupt intr) |
257 |
++{ |
258 |
++ /* WD, Compare & Timer are 1:1 */ |
259 |
++ if (intr <= GIC_LOCAL_INT_TIMER) |
260 |
++ return intr; |
261 |
++ |
262 |
++ /* FDC moves to after Timer... */ |
263 |
++ if (intr == GIC_LOCAL_INT_FDC) |
264 |
++ return GIC_LOCAL_INT_TIMER + 1; |
265 |
++ |
266 |
++ /* As a result everything else is offset by 1 */ |
267 |
++ return intr + 1; |
268 |
++} |
269 |
++ |
270 |
+ /** |
271 |
+ * gic_get_c0_compare_int() - Return cp0 count/compare interrupt virq |
272 |
+ * |
273 |
+diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c |
274 |
+index 03b4cc0ec3a7..66ca906aa790 100644 |
275 |
+--- a/arch/x86/kernel/cpu/bugs.c |
276 |
++++ b/arch/x86/kernel/cpu/bugs.c |
277 |
+@@ -835,6 +835,16 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) |
278 |
+ break; |
279 |
+ } |
280 |
+ |
281 |
++ /* |
282 |
++ * If SSBD is controlled by the SPEC_CTRL MSR, then set the proper |
283 |
++ * bit in the mask to allow guests to use the mitigation even in the |
284 |
++ * case where the host does not enable it. |
285 |
++ */ |
286 |
++ if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD) || |
287 |
++ static_cpu_has(X86_FEATURE_AMD_SSBD)) { |
288 |
++ x86_spec_ctrl_mask |= SPEC_CTRL_SSBD; |
289 |
++ } |
290 |
++ |
291 |
+ /* |
292 |
+ * We have three CPU feature flags that are in play here: |
293 |
+ * - X86_BUG_SPEC_STORE_BYPASS - CPU is susceptible. |
294 |
+@@ -852,7 +862,6 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) |
295 |
+ x86_amd_ssb_disable(); |
296 |
+ } else { |
297 |
+ x86_spec_ctrl_base |= SPEC_CTRL_SSBD; |
298 |
+- x86_spec_ctrl_mask |= SPEC_CTRL_SSBD; |
299 |
+ wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); |
300 |
+ } |
301 |
+ } |
302 |
+diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c |
303 |
+index f53658dde639..dfc36cd56676 100644 |
304 |
+--- a/arch/x86/kernel/cpu/microcode/core.c |
305 |
++++ b/arch/x86/kernel/cpu/microcode/core.c |
306 |
+@@ -793,13 +793,16 @@ static struct syscore_ops mc_syscore_ops = { |
307 |
+ .resume = mc_bp_resume, |
308 |
+ }; |
309 |
+ |
310 |
+-static int mc_cpu_online(unsigned int cpu) |
311 |
++static int mc_cpu_starting(unsigned int cpu) |
312 |
+ { |
313 |
+- struct device *dev; |
314 |
+- |
315 |
+- dev = get_cpu_device(cpu); |
316 |
+ microcode_update_cpu(cpu); |
317 |
+ pr_debug("CPU%d added\n", cpu); |
318 |
++ return 0; |
319 |
++} |
320 |
++ |
321 |
++static int mc_cpu_online(unsigned int cpu) |
322 |
++{ |
323 |
++ struct device *dev = get_cpu_device(cpu); |
324 |
+ |
325 |
+ if (sysfs_create_group(&dev->kobj, &mc_attr_group)) |
326 |
+ pr_err("Failed to create group for CPU%d\n", cpu); |
327 |
+@@ -876,7 +879,9 @@ int __init microcode_init(void) |
328 |
+ goto out_ucode_group; |
329 |
+ |
330 |
+ register_syscore_ops(&mc_syscore_ops); |
331 |
+- cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:online", |
332 |
++ cpuhp_setup_state_nocalls(CPUHP_AP_MICROCODE_LOADER, "x86/microcode:starting", |
333 |
++ mc_cpu_starting, NULL); |
334 |
++ cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/microcode:online", |
335 |
+ mc_cpu_online, mc_cpu_down_prep); |
336 |
+ |
337 |
+ pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION); |
338 |
+diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c |
339 |
+index c51b56e29948..f70a617b31b0 100644 |
340 |
+--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c |
341 |
++++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c |
342 |
+@@ -804,8 +804,12 @@ static int rdt_bit_usage_show(struct kernfs_open_file *of, |
343 |
+ struct seq_file *seq, void *v) |
344 |
+ { |
345 |
+ struct rdt_resource *r = of->kn->parent->priv; |
346 |
+- u32 sw_shareable = 0, hw_shareable = 0; |
347 |
+- u32 exclusive = 0, pseudo_locked = 0; |
348 |
++ /* |
349 |
++ * Use unsigned long even though only 32 bits are used to ensure |
350 |
++ * test_bit() is used safely. |
351 |
++ */ |
352 |
++ unsigned long sw_shareable = 0, hw_shareable = 0; |
353 |
++ unsigned long exclusive = 0, pseudo_locked = 0; |
354 |
+ struct rdt_domain *dom; |
355 |
+ int i, hwb, swb, excl, psl; |
356 |
+ enum rdtgrp_mode mode; |
357 |
+@@ -850,10 +854,10 @@ static int rdt_bit_usage_show(struct kernfs_open_file *of, |
358 |
+ } |
359 |
+ for (i = r->cache.cbm_len - 1; i >= 0; i--) { |
360 |
+ pseudo_locked = dom->plr ? dom->plr->cbm : 0; |
361 |
+- hwb = test_bit(i, (unsigned long *)&hw_shareable); |
362 |
+- swb = test_bit(i, (unsigned long *)&sw_shareable); |
363 |
+- excl = test_bit(i, (unsigned long *)&exclusive); |
364 |
+- psl = test_bit(i, (unsigned long *)&pseudo_locked); |
365 |
++ hwb = test_bit(i, &hw_shareable); |
366 |
++ swb = test_bit(i, &sw_shareable); |
367 |
++ excl = test_bit(i, &exclusive); |
368 |
++ psl = test_bit(i, &pseudo_locked); |
369 |
+ if (hwb && swb) |
370 |
+ seq_putc(seq, 'X'); |
371 |
+ else if (hwb && !swb) |
372 |
+@@ -2494,26 +2498,19 @@ out_destroy: |
373 |
+ */ |
374 |
+ static void cbm_ensure_valid(u32 *_val, struct rdt_resource *r) |
375 |
+ { |
376 |
+- /* |
377 |
+- * Convert the u32 _val to an unsigned long required by all the bit |
378 |
+- * operations within this function. No more than 32 bits of this |
379 |
+- * converted value can be accessed because all bit operations are |
380 |
+- * additionally provided with cbm_len that is initialized during |
381 |
+- * hardware enumeration using five bits from the EAX register and |
382 |
+- * thus never can exceed 32 bits. |
383 |
+- */ |
384 |
+- unsigned long *val = (unsigned long *)_val; |
385 |
++ unsigned long val = *_val; |
386 |
+ unsigned int cbm_len = r->cache.cbm_len; |
387 |
+ unsigned long first_bit, zero_bit; |
388 |
+ |
389 |
+- if (*val == 0) |
390 |
++ if (val == 0) |
391 |
+ return; |
392 |
+ |
393 |
+- first_bit = find_first_bit(val, cbm_len); |
394 |
+- zero_bit = find_next_zero_bit(val, cbm_len, first_bit); |
395 |
++ first_bit = find_first_bit(&val, cbm_len); |
396 |
++ zero_bit = find_next_zero_bit(&val, cbm_len, first_bit); |
397 |
+ |
398 |
+ /* Clear any remaining bits to ensure contiguous region */ |
399 |
+- bitmap_clear(val, zero_bit, cbm_len - zero_bit); |
400 |
++ bitmap_clear(&val, zero_bit, cbm_len - zero_bit); |
401 |
++ *_val = (u32)val; |
402 |
+ } |
403 |
+ |
404 |
+ /** |
405 |
+diff --git a/drivers/clk/socfpga/clk-s10.c b/drivers/clk/socfpga/clk-s10.c |
406 |
+index 8281dfbf38c2..5bed36e12951 100644 |
407 |
+--- a/drivers/clk/socfpga/clk-s10.c |
408 |
++++ b/drivers/clk/socfpga/clk-s10.c |
409 |
+@@ -103,9 +103,9 @@ static const struct stratix10_perip_cnt_clock s10_main_perip_cnt_clks[] = { |
410 |
+ { STRATIX10_NOC_CLK, "noc_clk", NULL, noc_mux, ARRAY_SIZE(noc_mux), |
411 |
+ 0, 0, 0, 0x3C, 1}, |
412 |
+ { STRATIX10_EMAC_A_FREE_CLK, "emaca_free_clk", NULL, emaca_free_mux, ARRAY_SIZE(emaca_free_mux), |
413 |
+- 0, 0, 4, 0xB0, 0}, |
414 |
++ 0, 0, 2, 0xB0, 0}, |
415 |
+ { STRATIX10_EMAC_B_FREE_CLK, "emacb_free_clk", NULL, emacb_free_mux, ARRAY_SIZE(emacb_free_mux), |
416 |
+- 0, 0, 4, 0xB0, 1}, |
417 |
++ 0, 0, 2, 0xB0, 1}, |
418 |
+ { STRATIX10_EMAC_PTP_FREE_CLK, "emac_ptp_free_clk", NULL, emac_ptp_free_mux, |
419 |
+ ARRAY_SIZE(emac_ptp_free_mux), 0, 0, 4, 0xB0, 2}, |
420 |
+ { STRATIX10_GPIO_DB_FREE_CLK, "gpio_db_free_clk", NULL, gpio_db_free_mux, |
421 |
+diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c |
422 |
+index 7545af763d7a..af4ace8f7369 100644 |
423 |
+--- a/drivers/clk/tegra/clk-tegra210.c |
424 |
++++ b/drivers/clk/tegra/clk-tegra210.c |
425 |
+@@ -3377,6 +3377,8 @@ static struct tegra_clk_init_table init_table[] __initdata = { |
426 |
+ { TEGRA210_CLK_I2S3_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, |
427 |
+ { TEGRA210_CLK_I2S4_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, |
428 |
+ { TEGRA210_CLK_VIMCLK_SYNC, TEGRA210_CLK_CLK_MAX, 24576000, 0 }, |
429 |
++ { TEGRA210_CLK_HDA, TEGRA210_CLK_PLL_P, 51000000, 0 }, |
430 |
++ { TEGRA210_CLK_HDA2CODEC_2X, TEGRA210_CLK_PLL_P, 48000000, 0 }, |
431 |
+ /* This MUST be the last entry. */ |
432 |
+ { TEGRA210_CLK_CLK_MAX, TEGRA210_CLK_CLK_MAX, 0, 0 }, |
433 |
+ }; |
434 |
+diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c |
435 |
+index 55b77c576c42..6d9995cbf651 100644 |
436 |
+--- a/drivers/firmware/efi/efi.c |
437 |
++++ b/drivers/firmware/efi/efi.c |
438 |
+@@ -1007,14 +1007,16 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size) |
439 |
+ |
440 |
+ /* first try to find a slot in an existing linked list entry */ |
441 |
+ for (prsv = efi_memreserve_root->next; prsv; prsv = rsv->next) { |
442 |
+- rsv = __va(prsv); |
443 |
++ rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB); |
444 |
+ index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size); |
445 |
+ if (index < rsv->size) { |
446 |
+ rsv->entry[index].base = addr; |
447 |
+ rsv->entry[index].size = size; |
448 |
+ |
449 |
++ memunmap(rsv); |
450 |
+ return 0; |
451 |
+ } |
452 |
++ memunmap(rsv); |
453 |
+ } |
454 |
+ |
455 |
+ /* no slot found - allocate a new linked list entry */ |
456 |
+@@ -1022,7 +1024,13 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size) |
457 |
+ if (!rsv) |
458 |
+ return -ENOMEM; |
459 |
+ |
460 |
+- rsv->size = EFI_MEMRESERVE_COUNT(PAGE_SIZE); |
461 |
++ /* |
462 |
++ * The memremap() call above assumes that a linux_efi_memreserve entry |
463 |
++ * never crosses a page boundary, so let's ensure that this remains true |
464 |
++ * even when kexec'ing a 4k pages kernel from a >4k pages kernel, by |
465 |
++ * using SZ_4K explicitly in the size calculation below. |
466 |
++ */ |
467 |
++ rsv->size = EFI_MEMRESERVE_COUNT(SZ_4K); |
468 |
+ atomic_set(&rsv->count, 1); |
469 |
+ rsv->entry[0].base = addr; |
470 |
+ rsv->entry[0].size = size; |
471 |
+diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h |
472 |
+index a67a63b5aa84..0c4a76bca5c6 100644 |
473 |
+--- a/drivers/gpu/drm/i915/i915_drv.h |
474 |
++++ b/drivers/gpu/drm/i915/i915_drv.h |
475 |
+@@ -280,7 +280,8 @@ struct drm_i915_display_funcs { |
476 |
+ void (*get_cdclk)(struct drm_i915_private *dev_priv, |
477 |
+ struct intel_cdclk_state *cdclk_state); |
478 |
+ void (*set_cdclk)(struct drm_i915_private *dev_priv, |
479 |
+- const struct intel_cdclk_state *cdclk_state); |
480 |
++ const struct intel_cdclk_state *cdclk_state, |
481 |
++ enum pipe pipe); |
482 |
+ int (*get_fifo_size)(struct drm_i915_private *dev_priv, |
483 |
+ enum i9xx_plane_id i9xx_plane); |
484 |
+ int (*compute_pipe_wm)(struct intel_crtc_state *cstate); |
485 |
+@@ -1622,6 +1623,8 @@ struct drm_i915_private { |
486 |
+ struct intel_cdclk_state actual; |
487 |
+ /* The current hardware cdclk state */ |
488 |
+ struct intel_cdclk_state hw; |
489 |
++ |
490 |
++ int force_min_cdclk; |
491 |
+ } cdclk; |
492 |
+ |
493 |
+ /** |
494 |
+@@ -1741,6 +1744,7 @@ struct drm_i915_private { |
495 |
+ * |
496 |
+ */ |
497 |
+ struct mutex av_mutex; |
498 |
++ int audio_power_refcount; |
499 |
+ |
500 |
+ struct { |
501 |
+ struct mutex mutex; |
502 |
+diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c |
503 |
+index 5104c6bbd66f..2f3fd5bf0f11 100644 |
504 |
+--- a/drivers/gpu/drm/i915/intel_audio.c |
505 |
++++ b/drivers/gpu/drm/i915/intel_audio.c |
506 |
+@@ -741,15 +741,71 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv) |
507 |
+ } |
508 |
+ } |
509 |
+ |
510 |
++static void glk_force_audio_cdclk(struct drm_i915_private *dev_priv, |
511 |
++ bool enable) |
512 |
++{ |
513 |
++ struct drm_modeset_acquire_ctx ctx; |
514 |
++ struct drm_atomic_state *state; |
515 |
++ int ret; |
516 |
++ |
517 |
++ drm_modeset_acquire_init(&ctx, 0); |
518 |
++ state = drm_atomic_state_alloc(&dev_priv->drm); |
519 |
++ if (WARN_ON(!state)) |
520 |
++ return; |
521 |
++ |
522 |
++ state->acquire_ctx = &ctx; |
523 |
++ |
524 |
++retry: |
525 |
++ to_intel_atomic_state(state)->cdclk.force_min_cdclk_changed = true; |
526 |
++ to_intel_atomic_state(state)->cdclk.force_min_cdclk = |
527 |
++ enable ? 2 * 96000 : 0; |
528 |
++ |
529 |
++ /* |
530 |
++ * Protects dev_priv->cdclk.force_min_cdclk |
531 |
++ * Need to lock this here in case we have no active pipes |
532 |
++ * and thus wouldn't lock it during the commit otherwise. |
533 |
++ */ |
534 |
++ ret = drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex, |
535 |
++ &ctx); |
536 |
++ if (!ret) |
537 |
++ ret = drm_atomic_commit(state); |
538 |
++ |
539 |
++ if (ret == -EDEADLK) { |
540 |
++ drm_atomic_state_clear(state); |
541 |
++ drm_modeset_backoff(&ctx); |
542 |
++ goto retry; |
543 |
++ } |
544 |
++ |
545 |
++ WARN_ON(ret); |
546 |
++ |
547 |
++ drm_atomic_state_put(state); |
548 |
++ |
549 |
++ drm_modeset_drop_locks(&ctx); |
550 |
++ drm_modeset_acquire_fini(&ctx); |
551 |
++} |
552 |
++ |
553 |
+ static void i915_audio_component_get_power(struct device *kdev) |
554 |
+ { |
555 |
+- intel_display_power_get(kdev_to_i915(kdev), POWER_DOMAIN_AUDIO); |
556 |
++ struct drm_i915_private *dev_priv = kdev_to_i915(kdev); |
557 |
++ |
558 |
++ intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO); |
559 |
++ |
560 |
++ /* Force CDCLK to 2*BCLK as long as we need audio to be powered. */ |
561 |
++ if (dev_priv->audio_power_refcount++ == 0) |
562 |
++ if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) |
563 |
++ glk_force_audio_cdclk(dev_priv, true); |
564 |
+ } |
565 |
+ |
566 |
+ static void i915_audio_component_put_power(struct device *kdev) |
567 |
+ { |
568 |
+- intel_display_power_put_unchecked(kdev_to_i915(kdev), |
569 |
+- POWER_DOMAIN_AUDIO); |
570 |
++ struct drm_i915_private *dev_priv = kdev_to_i915(kdev); |
571 |
++ |
572 |
++ /* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */ |
573 |
++ if (--dev_priv->audio_power_refcount == 0) |
574 |
++ if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) |
575 |
++ glk_force_audio_cdclk(dev_priv, false); |
576 |
++ |
577 |
++ intel_display_power_put_unchecked(dev_priv, POWER_DOMAIN_AUDIO); |
578 |
+ } |
579 |
+ |
580 |
+ static void i915_audio_component_codec_wake_override(struct device *kdev, |
581 |
+diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c |
582 |
+index 15ba950dee00..00f76261924c 100644 |
583 |
+--- a/drivers/gpu/drm/i915/intel_cdclk.c |
584 |
++++ b/drivers/gpu/drm/i915/intel_cdclk.c |
585 |
+@@ -516,7 +516,8 @@ static void vlv_program_pfi_credits(struct drm_i915_private *dev_priv) |
586 |
+ } |
587 |
+ |
588 |
+ static void vlv_set_cdclk(struct drm_i915_private *dev_priv, |
589 |
+- const struct intel_cdclk_state *cdclk_state) |
590 |
++ const struct intel_cdclk_state *cdclk_state, |
591 |
++ enum pipe pipe) |
592 |
+ { |
593 |
+ int cdclk = cdclk_state->cdclk; |
594 |
+ u32 val, cmd = cdclk_state->voltage_level; |
595 |
+@@ -598,7 +599,8 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv, |
596 |
+ } |
597 |
+ |
598 |
+ static void chv_set_cdclk(struct drm_i915_private *dev_priv, |
599 |
+- const struct intel_cdclk_state *cdclk_state) |
600 |
++ const struct intel_cdclk_state *cdclk_state, |
601 |
++ enum pipe pipe) |
602 |
+ { |
603 |
+ int cdclk = cdclk_state->cdclk; |
604 |
+ u32 val, cmd = cdclk_state->voltage_level; |
605 |
+@@ -697,7 +699,8 @@ static void bdw_get_cdclk(struct drm_i915_private *dev_priv, |
606 |
+ } |
607 |
+ |
608 |
+ static void bdw_set_cdclk(struct drm_i915_private *dev_priv, |
609 |
+- const struct intel_cdclk_state *cdclk_state) |
610 |
++ const struct intel_cdclk_state *cdclk_state, |
611 |
++ enum pipe pipe) |
612 |
+ { |
613 |
+ int cdclk = cdclk_state->cdclk; |
614 |
+ u32 val; |
615 |
+@@ -987,7 +990,8 @@ static void skl_dpll0_disable(struct drm_i915_private *dev_priv) |
616 |
+ } |
617 |
+ |
618 |
+ static void skl_set_cdclk(struct drm_i915_private *dev_priv, |
619 |
+- const struct intel_cdclk_state *cdclk_state) |
620 |
++ const struct intel_cdclk_state *cdclk_state, |
621 |
++ enum pipe pipe) |
622 |
+ { |
623 |
+ int cdclk = cdclk_state->cdclk; |
624 |
+ int vco = cdclk_state->vco; |
625 |
+@@ -1158,7 +1162,7 @@ void skl_init_cdclk(struct drm_i915_private *dev_priv) |
626 |
+ cdclk_state.cdclk = skl_calc_cdclk(0, cdclk_state.vco); |
627 |
+ cdclk_state.voltage_level = skl_calc_voltage_level(cdclk_state.cdclk); |
628 |
+ |
629 |
+- skl_set_cdclk(dev_priv, &cdclk_state); |
630 |
++ skl_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
631 |
+ } |
632 |
+ |
633 |
+ /** |
634 |
+@@ -1176,7 +1180,7 @@ void skl_uninit_cdclk(struct drm_i915_private *dev_priv) |
635 |
+ cdclk_state.vco = 0; |
636 |
+ cdclk_state.voltage_level = skl_calc_voltage_level(cdclk_state.cdclk); |
637 |
+ |
638 |
+- skl_set_cdclk(dev_priv, &cdclk_state); |
639 |
++ skl_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
640 |
+ } |
641 |
+ |
642 |
+ static int bxt_calc_cdclk(int min_cdclk) |
643 |
+@@ -1355,7 +1359,8 @@ static void bxt_de_pll_enable(struct drm_i915_private *dev_priv, int vco) |
644 |
+ } |
645 |
+ |
646 |
+ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, |
647 |
+- const struct intel_cdclk_state *cdclk_state) |
648 |
++ const struct intel_cdclk_state *cdclk_state, |
649 |
++ enum pipe pipe) |
650 |
+ { |
651 |
+ int cdclk = cdclk_state->cdclk; |
652 |
+ int vco = cdclk_state->vco; |
653 |
+@@ -1408,11 +1413,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, |
654 |
+ bxt_de_pll_enable(dev_priv, vco); |
655 |
+ |
656 |
+ val = divider | skl_cdclk_decimal(cdclk); |
657 |
+- /* |
658 |
+- * FIXME if only the cd2x divider needs changing, it could be done |
659 |
+- * without shutting off the pipe (if only one pipe is active). |
660 |
+- */ |
661 |
+- val |= BXT_CDCLK_CD2X_PIPE_NONE; |
662 |
++ if (pipe == INVALID_PIPE) |
663 |
++ val |= BXT_CDCLK_CD2X_PIPE_NONE; |
664 |
++ else |
665 |
++ val |= BXT_CDCLK_CD2X_PIPE(pipe); |
666 |
+ /* |
667 |
+ * Disable SSA Precharge when CD clock frequency < 500 MHz, |
668 |
+ * enable otherwise. |
669 |
+@@ -1421,6 +1425,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, |
670 |
+ val |= BXT_CDCLK_SSA_PRECHARGE_ENABLE; |
671 |
+ I915_WRITE(CDCLK_CTL, val); |
672 |
+ |
673 |
++ if (pipe != INVALID_PIPE) |
674 |
++ intel_wait_for_vblank(dev_priv, pipe); |
675 |
++ |
676 |
+ mutex_lock(&dev_priv->pcu_lock); |
677 |
+ /* |
678 |
+ * The timeout isn't specified, the 2ms used here is based on |
679 |
+@@ -1525,7 +1532,7 @@ void bxt_init_cdclk(struct drm_i915_private *dev_priv) |
680 |
+ } |
681 |
+ cdclk_state.voltage_level = bxt_calc_voltage_level(cdclk_state.cdclk); |
682 |
+ |
683 |
+- bxt_set_cdclk(dev_priv, &cdclk_state); |
684 |
++ bxt_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
685 |
+ } |
686 |
+ |
687 |
+ /** |
688 |
+@@ -1543,7 +1550,7 @@ void bxt_uninit_cdclk(struct drm_i915_private *dev_priv) |
689 |
+ cdclk_state.vco = 0; |
690 |
+ cdclk_state.voltage_level = bxt_calc_voltage_level(cdclk_state.cdclk); |
691 |
+ |
692 |
+- bxt_set_cdclk(dev_priv, &cdclk_state); |
693 |
++ bxt_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
694 |
+ } |
695 |
+ |
696 |
+ static int cnl_calc_cdclk(int min_cdclk) |
697 |
+@@ -1663,7 +1670,8 @@ static void cnl_cdclk_pll_enable(struct drm_i915_private *dev_priv, int vco) |
698 |
+ } |
699 |
+ |
700 |
+ static void cnl_set_cdclk(struct drm_i915_private *dev_priv, |
701 |
+- const struct intel_cdclk_state *cdclk_state) |
702 |
++ const struct intel_cdclk_state *cdclk_state, |
703 |
++ enum pipe pipe) |
704 |
+ { |
705 |
+ int cdclk = cdclk_state->cdclk; |
706 |
+ int vco = cdclk_state->vco; |
707 |
+@@ -1704,13 +1712,15 @@ static void cnl_set_cdclk(struct drm_i915_private *dev_priv, |
708 |
+ cnl_cdclk_pll_enable(dev_priv, vco); |
709 |
+ |
710 |
+ val = divider | skl_cdclk_decimal(cdclk); |
711 |
+- /* |
712 |
+- * FIXME if only the cd2x divider needs changing, it could be done |
713 |
+- * without shutting off the pipe (if only one pipe is active). |
714 |
+- */ |
715 |
+- val |= BXT_CDCLK_CD2X_PIPE_NONE; |
716 |
++ if (pipe == INVALID_PIPE) |
717 |
++ val |= BXT_CDCLK_CD2X_PIPE_NONE; |
718 |
++ else |
719 |
++ val |= BXT_CDCLK_CD2X_PIPE(pipe); |
720 |
+ I915_WRITE(CDCLK_CTL, val); |
721 |
+ |
722 |
++ if (pipe != INVALID_PIPE) |
723 |
++ intel_wait_for_vblank(dev_priv, pipe); |
724 |
++ |
725 |
+ /* inform PCU of the change */ |
726 |
+ mutex_lock(&dev_priv->pcu_lock); |
727 |
+ sandybridge_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL, |
728 |
+@@ -1847,7 +1857,8 @@ static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk) |
729 |
+ } |
730 |
+ |
731 |
+ static void icl_set_cdclk(struct drm_i915_private *dev_priv, |
732 |
+- const struct intel_cdclk_state *cdclk_state) |
733 |
++ const struct intel_cdclk_state *cdclk_state, |
734 |
++ enum pipe pipe) |
735 |
+ { |
736 |
+ unsigned int cdclk = cdclk_state->cdclk; |
737 |
+ unsigned int vco = cdclk_state->vco; |
738 |
+@@ -1872,6 +1883,11 @@ static void icl_set_cdclk(struct drm_i915_private *dev_priv, |
739 |
+ if (dev_priv->cdclk.hw.vco != vco) |
740 |
+ cnl_cdclk_pll_enable(dev_priv, vco); |
741 |
+ |
742 |
++ /* |
743 |
++ * On ICL CD2X_DIV can only be 1, so we'll never end up changing the |
744 |
++ * divider here synchronized to a pipe while CDCLK is on, nor will we |
745 |
++ * need the corresponding vblank wait. |
746 |
++ */ |
747 |
+ I915_WRITE(CDCLK_CTL, ICL_CDCLK_CD2X_PIPE_NONE | |
748 |
+ skl_cdclk_decimal(cdclk)); |
749 |
+ |
750 |
+@@ -2002,7 +2018,7 @@ sanitize: |
751 |
+ sanitized_state.voltage_level = |
752 |
+ icl_calc_voltage_level(sanitized_state.cdclk); |
753 |
+ |
754 |
+- icl_set_cdclk(dev_priv, &sanitized_state); |
755 |
++ icl_set_cdclk(dev_priv, &sanitized_state, INVALID_PIPE); |
756 |
+ } |
757 |
+ |
758 |
+ /** |
759 |
+@@ -2020,7 +2036,7 @@ void icl_uninit_cdclk(struct drm_i915_private *dev_priv) |
760 |
+ cdclk_state.vco = 0; |
761 |
+ cdclk_state.voltage_level = icl_calc_voltage_level(cdclk_state.cdclk); |
762 |
+ |
763 |
+- icl_set_cdclk(dev_priv, &cdclk_state); |
764 |
++ icl_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
765 |
+ } |
766 |
+ |
767 |
+ /** |
768 |
+@@ -2048,7 +2064,7 @@ void cnl_init_cdclk(struct drm_i915_private *dev_priv) |
769 |
+ cdclk_state.vco = cnl_cdclk_pll_vco(dev_priv, cdclk_state.cdclk); |
770 |
+ cdclk_state.voltage_level = cnl_calc_voltage_level(cdclk_state.cdclk); |
771 |
+ |
772 |
+- cnl_set_cdclk(dev_priv, &cdclk_state); |
773 |
++ cnl_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
774 |
+ } |
775 |
+ |
776 |
+ /** |
777 |
+@@ -2066,7 +2082,7 @@ void cnl_uninit_cdclk(struct drm_i915_private *dev_priv) |
778 |
+ cdclk_state.vco = 0; |
779 |
+ cdclk_state.voltage_level = cnl_calc_voltage_level(cdclk_state.cdclk); |
780 |
+ |
781 |
+- cnl_set_cdclk(dev_priv, &cdclk_state); |
782 |
++ cnl_set_cdclk(dev_priv, &cdclk_state, INVALID_PIPE); |
783 |
+ } |
784 |
+ |
785 |
+ /** |
786 |
+@@ -2085,6 +2101,27 @@ bool intel_cdclk_needs_modeset(const struct intel_cdclk_state *a, |
787 |
+ a->ref != b->ref; |
788 |
+ } |
789 |
+ |
790 |
++/** |
791 |
++ * intel_cdclk_needs_cd2x_update - Determine if two CDCLK states require a cd2x divider update |
792 |
++ * @a: first CDCLK state |
793 |
++ * @b: second CDCLK state |
794 |
++ * |
795 |
++ * Returns: |
796 |
++ * True if the CDCLK states require just a cd2x divider update, false if not. |
797 |
++ */ |
798 |
++bool intel_cdclk_needs_cd2x_update(struct drm_i915_private *dev_priv, |
799 |
++ const struct intel_cdclk_state *a, |
800 |
++ const struct intel_cdclk_state *b) |
801 |
++{ |
802 |
++ /* Older hw doesn't have the capability */ |
803 |
++ if (INTEL_GEN(dev_priv) < 10 && !IS_GEN9_LP(dev_priv)) |
804 |
++ return false; |
805 |
++ |
806 |
++ return a->cdclk != b->cdclk && |
807 |
++ a->vco == b->vco && |
808 |
++ a->ref == b->ref; |
809 |
++} |
810 |
++ |
811 |
+ /** |
812 |
+ * intel_cdclk_changed - Determine if two CDCLK states are different |
813 |
+ * @a: first CDCLK state |
814 |
+@@ -2100,6 +2137,26 @@ bool intel_cdclk_changed(const struct intel_cdclk_state *a, |
815 |
+ a->voltage_level != b->voltage_level; |
816 |
+ } |
817 |
+ |
818 |
++/** |
819 |
++ * intel_cdclk_swap_state - make atomic CDCLK configuration effective |
820 |
++ * @state: atomic state |
821 |
++ * |
822 |
++ * This is the CDCLK version of drm_atomic_helper_swap_state() since the |
823 |
++ * helper does not handle driver-specific global state. |
824 |
++ * |
825 |
++ * Similarly to the atomic helpers this function does a complete swap, |
826 |
++ * i.e. it also puts the old state into @state. This is used by the commit |
827 |
++ * code to determine how CDCLK has changed (for instance did it increase or |
828 |
++ * decrease). |
829 |
++ */ |
830 |
++void intel_cdclk_swap_state(struct intel_atomic_state *state) |
831 |
++{ |
832 |
++ struct drm_i915_private *dev_priv = to_i915(state->base.dev); |
833 |
++ |
834 |
++ swap(state->cdclk.logical, dev_priv->cdclk.logical); |
835 |
++ swap(state->cdclk.actual, dev_priv->cdclk.actual); |
836 |
++} |
837 |
++ |
838 |
+ void intel_dump_cdclk_state(const struct intel_cdclk_state *cdclk_state, |
839 |
+ const char *context) |
840 |
+ { |
841 |
+@@ -2113,12 +2170,14 @@ void intel_dump_cdclk_state(const struct intel_cdclk_state *cdclk_state, |
842 |
+ * intel_set_cdclk - Push the CDCLK state to the hardware |
843 |
+ * @dev_priv: i915 device |
844 |
+ * @cdclk_state: new CDCLK state |
845 |
++ * @pipe: pipe with which to synchronize the update |
846 |
+ * |
847 |
+ * Program the hardware based on the passed in CDCLK state, |
848 |
+ * if necessary. |
849 |
+ */ |
850 |
+-void intel_set_cdclk(struct drm_i915_private *dev_priv, |
851 |
+- const struct intel_cdclk_state *cdclk_state) |
852 |
++static void intel_set_cdclk(struct drm_i915_private *dev_priv, |
853 |
++ const struct intel_cdclk_state *cdclk_state, |
854 |
++ enum pipe pipe) |
855 |
+ { |
856 |
+ if (!intel_cdclk_changed(&dev_priv->cdclk.hw, cdclk_state)) |
857 |
+ return; |
858 |
+@@ -2128,7 +2187,7 @@ void intel_set_cdclk(struct drm_i915_private *dev_priv, |
859 |
+ |
860 |
+ intel_dump_cdclk_state(cdclk_state, "Changing CDCLK to"); |
861 |
+ |
862 |
+- dev_priv->display.set_cdclk(dev_priv, cdclk_state); |
863 |
++ dev_priv->display.set_cdclk(dev_priv, cdclk_state, pipe); |
864 |
+ |
865 |
+ if (WARN(intel_cdclk_changed(&dev_priv->cdclk.hw, cdclk_state), |
866 |
+ "cdclk state doesn't match!\n")) { |
867 |
+@@ -2137,6 +2196,46 @@ void intel_set_cdclk(struct drm_i915_private *dev_priv, |
868 |
+ } |
869 |
+ } |
870 |
+ |
871 |
++/** |
872 |
++ * intel_set_cdclk_pre_plane_update - Push the CDCLK state to the hardware |
873 |
++ * @dev_priv: i915 device |
874 |
++ * @old_state: old CDCLK state |
875 |
++ * @new_state: new CDCLK state |
876 |
++ * @pipe: pipe with which to synchronize the update |
877 |
++ * |
878 |
++ * Program the hardware before updating the HW plane state based on the passed |
879 |
++ * in CDCLK state, if necessary. |
880 |
++ */ |
881 |
++void |
882 |
++intel_set_cdclk_pre_plane_update(struct drm_i915_private *dev_priv, |
883 |
++ const struct intel_cdclk_state *old_state, |
884 |
++ const struct intel_cdclk_state *new_state, |
885 |
++ enum pipe pipe) |
886 |
++{ |
887 |
++ if (pipe == INVALID_PIPE || old_state->cdclk <= new_state->cdclk) |
888 |
++ intel_set_cdclk(dev_priv, new_state, pipe); |
889 |
++} |
890 |
++ |
891 |
++/** |
892 |
++ * intel_set_cdclk_post_plane_update - Push the CDCLK state to the hardware |
893 |
++ * @dev_priv: i915 device |
894 |
++ * @old_state: old CDCLK state |
895 |
++ * @new_state: new CDCLK state |
896 |
++ * @pipe: pipe with which to synchronize the update |
897 |
++ * |
898 |
++ * Program the hardware after updating the HW plane state based on the passed |
899 |
++ * in CDCLK state, if necessary. |
900 |
++ */ |
901 |
++void |
902 |
++intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv, |
903 |
++ const struct intel_cdclk_state *old_state, |
904 |
++ const struct intel_cdclk_state *new_state, |
905 |
++ enum pipe pipe) |
906 |
++{ |
907 |
++ if (pipe != INVALID_PIPE && old_state->cdclk > new_state->cdclk) |
908 |
++ intel_set_cdclk(dev_priv, new_state, pipe); |
909 |
++} |
910 |
++ |
911 |
+ static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv, |
912 |
+ int pixel_rate) |
913 |
+ { |
914 |
+@@ -2187,19 +2286,8 @@ int intel_crtc_compute_min_cdclk(const struct intel_crtc_state *crtc_state) |
915 |
+ /* |
916 |
+ * According to BSpec, "The CD clock frequency must be at least twice |
917 |
+ * the frequency of the Azalia BCLK." and BCLK is 96 MHz by default. |
918 |
+- * |
919 |
+- * FIXME: Check the actual, not default, BCLK being used. |
920 |
+- * |
921 |
+- * FIXME: This does not depend on ->has_audio because the higher CDCLK |
922 |
+- * is required for audio probe, also when there are no audio capable |
923 |
+- * displays connected at probe time. This leads to unnecessarily high |
924 |
+- * CDCLK when audio is not required. |
925 |
+- * |
926 |
+- * FIXME: This limit is only applied when there are displays connected |
927 |
+- * at probe time. If we probe without displays, we'll still end up using |
928 |
+- * the platform minimum CDCLK, failing audio probe. |
929 |
+ */ |
930 |
+- if (INTEL_GEN(dev_priv) >= 9) |
931 |
++ if (crtc_state->has_audio && INTEL_GEN(dev_priv) >= 9) |
932 |
+ min_cdclk = max(2 * 96000, min_cdclk); |
933 |
+ |
934 |
+ /* |
935 |
+@@ -2239,7 +2327,7 @@ static int intel_compute_min_cdclk(struct drm_atomic_state *state) |
936 |
+ intel_state->min_cdclk[i] = min_cdclk; |
937 |
+ } |
938 |
+ |
939 |
+- min_cdclk = 0; |
940 |
++ min_cdclk = intel_state->cdclk.force_min_cdclk; |
941 |
+ for_each_pipe(dev_priv, pipe) |
942 |
+ min_cdclk = max(intel_state->min_cdclk[pipe], min_cdclk); |
943 |
+ |
944 |
+@@ -2300,7 +2388,8 @@ static int vlv_modeset_calc_cdclk(struct drm_atomic_state *state) |
945 |
+ vlv_calc_voltage_level(dev_priv, cdclk); |
946 |
+ |
947 |
+ if (!intel_state->active_crtcs) { |
948 |
+- cdclk = vlv_calc_cdclk(dev_priv, 0); |
949 |
++ cdclk = vlv_calc_cdclk(dev_priv, |
950 |
++ intel_state->cdclk.force_min_cdclk); |
951 |
+ |
952 |
+ intel_state->cdclk.actual.cdclk = cdclk; |
953 |
+ intel_state->cdclk.actual.voltage_level = |
954 |
+@@ -2333,7 +2422,7 @@ static int bdw_modeset_calc_cdclk(struct drm_atomic_state *state) |
955 |
+ bdw_calc_voltage_level(cdclk); |
956 |
+ |
957 |
+ if (!intel_state->active_crtcs) { |
958 |
+- cdclk = bdw_calc_cdclk(0); |
959 |
++ cdclk = bdw_calc_cdclk(intel_state->cdclk.force_min_cdclk); |
960 |
+ |
961 |
+ intel_state->cdclk.actual.cdclk = cdclk; |
962 |
+ intel_state->cdclk.actual.voltage_level = |
963 |
+@@ -2405,7 +2494,7 @@ static int skl_modeset_calc_cdclk(struct drm_atomic_state *state) |
964 |
+ skl_calc_voltage_level(cdclk); |
965 |
+ |
966 |
+ if (!intel_state->active_crtcs) { |
967 |
+- cdclk = skl_calc_cdclk(0, vco); |
968 |
++ cdclk = skl_calc_cdclk(intel_state->cdclk.force_min_cdclk, vco); |
969 |
+ |
970 |
+ intel_state->cdclk.actual.vco = vco; |
971 |
+ intel_state->cdclk.actual.cdclk = cdclk; |
972 |
+@@ -2444,10 +2533,10 @@ static int bxt_modeset_calc_cdclk(struct drm_atomic_state *state) |
973 |
+ |
974 |
+ if (!intel_state->active_crtcs) { |
975 |
+ if (IS_GEMINILAKE(dev_priv)) { |
976 |
+- cdclk = glk_calc_cdclk(0); |
977 |
++ cdclk = glk_calc_cdclk(intel_state->cdclk.force_min_cdclk); |
978 |
+ vco = glk_de_pll_vco(dev_priv, cdclk); |
979 |
+ } else { |
980 |
+- cdclk = bxt_calc_cdclk(0); |
981 |
++ cdclk = bxt_calc_cdclk(intel_state->cdclk.force_min_cdclk); |
982 |
+ vco = bxt_de_pll_vco(dev_priv, cdclk); |
983 |
+ } |
984 |
+ |
985 |
+@@ -2483,7 +2572,7 @@ static int cnl_modeset_calc_cdclk(struct drm_atomic_state *state) |
986 |
+ cnl_compute_min_voltage_level(intel_state)); |
987 |
+ |
988 |
+ if (!intel_state->active_crtcs) { |
989 |
+- cdclk = cnl_calc_cdclk(0); |
990 |
++ cdclk = cnl_calc_cdclk(intel_state->cdclk.force_min_cdclk); |
991 |
+ vco = cnl_cdclk_pll_vco(dev_priv, cdclk); |
992 |
+ |
993 |
+ intel_state->cdclk.actual.vco = vco; |
994 |
+@@ -2519,7 +2608,7 @@ static int icl_modeset_calc_cdclk(struct drm_atomic_state *state) |
995 |
+ cnl_compute_min_voltage_level(intel_state)); |
996 |
+ |
997 |
+ if (!intel_state->active_crtcs) { |
998 |
+- cdclk = icl_calc_cdclk(0, ref); |
999 |
++ cdclk = icl_calc_cdclk(intel_state->cdclk.force_min_cdclk, ref); |
1000 |
+ vco = icl_calc_cdclk_pll_vco(dev_priv, cdclk); |
1001 |
+ |
1002 |
+ intel_state->cdclk.actual.vco = vco; |
1003 |
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
1004 |
+index be4024f0e3a8..9803d713f746 100644 |
1005 |
+--- a/drivers/gpu/drm/i915/intel_display.c |
1006 |
++++ b/drivers/gpu/drm/i915/intel_display.c |
1007 |
+@@ -12770,10 +12770,16 @@ static int intel_modeset_checks(struct drm_atomic_state *state) |
1008 |
+ return -EINVAL; |
1009 |
+ } |
1010 |
+ |
1011 |
++ /* keep the current setting */ |
1012 |
++ if (!intel_state->cdclk.force_min_cdclk_changed) |
1013 |
++ intel_state->cdclk.force_min_cdclk = |
1014 |
++ dev_priv->cdclk.force_min_cdclk; |
1015 |
++ |
1016 |
+ intel_state->modeset = true; |
1017 |
+ intel_state->active_crtcs = dev_priv->active_crtcs; |
1018 |
+ intel_state->cdclk.logical = dev_priv->cdclk.logical; |
1019 |
+ intel_state->cdclk.actual = dev_priv->cdclk.actual; |
1020 |
++ intel_state->cdclk.pipe = INVALID_PIPE; |
1021 |
+ |
1022 |
+ for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { |
1023 |
+ if (new_crtc_state->active) |
1024 |
+@@ -12793,6 +12799,8 @@ static int intel_modeset_checks(struct drm_atomic_state *state) |
1025 |
+ * adjusted_mode bits in the crtc directly. |
1026 |
+ */ |
1027 |
+ if (dev_priv->display.modeset_calc_cdclk) { |
1028 |
++ enum pipe pipe; |
1029 |
++ |
1030 |
+ ret = dev_priv->display.modeset_calc_cdclk(state); |
1031 |
+ if (ret < 0) |
1032 |
+ return ret; |
1033 |
+@@ -12809,12 +12817,36 @@ static int intel_modeset_checks(struct drm_atomic_state *state) |
1034 |
+ return ret; |
1035 |
+ } |
1036 |
+ |
1037 |
++ if (is_power_of_2(intel_state->active_crtcs)) { |
1038 |
++ struct drm_crtc *crtc; |
1039 |
++ struct drm_crtc_state *crtc_state; |
1040 |
++ |
1041 |
++ pipe = ilog2(intel_state->active_crtcs); |
1042 |
++ crtc = &intel_get_crtc_for_pipe(dev_priv, pipe)->base; |
1043 |
++ crtc_state = drm_atomic_get_new_crtc_state(state, crtc); |
1044 |
++ if (crtc_state && needs_modeset(crtc_state)) |
1045 |
++ pipe = INVALID_PIPE; |
1046 |
++ } else { |
1047 |
++ pipe = INVALID_PIPE; |
1048 |
++ } |
1049 |
++ |
1050 |
+ /* All pipes must be switched off while we change the cdclk. */ |
1051 |
+- if (intel_cdclk_needs_modeset(&dev_priv->cdclk.actual, |
1052 |
+- &intel_state->cdclk.actual)) { |
1053 |
++ if (pipe != INVALID_PIPE && |
1054 |
++ intel_cdclk_needs_cd2x_update(dev_priv, |
1055 |
++ &dev_priv->cdclk.actual, |
1056 |
++ &intel_state->cdclk.actual)) { |
1057 |
++ ret = intel_lock_all_pipes(state); |
1058 |
++ if (ret < 0) |
1059 |
++ return ret; |
1060 |
++ |
1061 |
++ intel_state->cdclk.pipe = pipe; |
1062 |
++ } else if (intel_cdclk_needs_modeset(&dev_priv->cdclk.actual, |
1063 |
++ &intel_state->cdclk.actual)) { |
1064 |
+ ret = intel_modeset_all_pipes(state); |
1065 |
+ if (ret < 0) |
1066 |
+ return ret; |
1067 |
++ |
1068 |
++ intel_state->cdclk.pipe = INVALID_PIPE; |
1069 |
+ } |
1070 |
+ |
1071 |
+ DRM_DEBUG_KMS("New cdclk calculated to be logical %u kHz, actual %u kHz\n", |
1072 |
+@@ -12823,8 +12855,6 @@ static int intel_modeset_checks(struct drm_atomic_state *state) |
1073 |
+ DRM_DEBUG_KMS("New voltage level calculated to be logical %u, actual %u\n", |
1074 |
+ intel_state->cdclk.logical.voltage_level, |
1075 |
+ intel_state->cdclk.actual.voltage_level); |
1076 |
+- } else { |
1077 |
+- to_intel_atomic_state(state)->cdclk.logical = dev_priv->cdclk.logical; |
1078 |
+ } |
1079 |
+ |
1080 |
+ intel_modeset_clear_plls(state); |
1081 |
+@@ -12892,7 +12922,7 @@ static int intel_atomic_check(struct drm_device *dev, |
1082 |
+ struct drm_crtc *crtc; |
1083 |
+ struct drm_crtc_state *old_crtc_state, *crtc_state; |
1084 |
+ int ret, i; |
1085 |
+- bool any_ms = false; |
1086 |
++ bool any_ms = intel_state->cdclk.force_min_cdclk_changed; |
1087 |
+ |
1088 |
+ /* Catch I915_MODE_FLAG_INHERITED */ |
1089 |
+ for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, |
1090 |
+@@ -13248,7 +13278,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) |
1091 |
+ if (intel_state->modeset) { |
1092 |
+ drm_atomic_helper_update_legacy_modeset_state(state->dev, state); |
1093 |
+ |
1094 |
+- intel_set_cdclk(dev_priv, &dev_priv->cdclk.actual); |
1095 |
++ intel_set_cdclk_pre_plane_update(dev_priv, |
1096 |
++ &intel_state->cdclk.actual, |
1097 |
++ &dev_priv->cdclk.actual, |
1098 |
++ intel_state->cdclk.pipe); |
1099 |
+ |
1100 |
+ /* |
1101 |
+ * SKL workaround: bspec recommends we disable the SAGV when we |
1102 |
+@@ -13277,6 +13310,12 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state) |
1103 |
+ /* Now enable the clocks, plane, pipe, and connectors that we set up. */ |
1104 |
+ dev_priv->display.update_crtcs(state); |
1105 |
+ |
1106 |
++ if (intel_state->modeset) |
1107 |
++ intel_set_cdclk_post_plane_update(dev_priv, |
1108 |
++ &intel_state->cdclk.actual, |
1109 |
++ &dev_priv->cdclk.actual, |
1110 |
++ intel_state->cdclk.pipe); |
1111 |
++ |
1112 |
+ /* FIXME: We should call drm_atomic_helper_commit_hw_done() here |
1113 |
+ * already, but still need the state for the delayed optimization. To |
1114 |
+ * fix this: |
1115 |
+@@ -13478,8 +13517,10 @@ static int intel_atomic_commit(struct drm_device *dev, |
1116 |
+ intel_state->min_voltage_level, |
1117 |
+ sizeof(intel_state->min_voltage_level)); |
1118 |
+ dev_priv->active_crtcs = intel_state->active_crtcs; |
1119 |
+- dev_priv->cdclk.logical = intel_state->cdclk.logical; |
1120 |
+- dev_priv->cdclk.actual = intel_state->cdclk.actual; |
1121 |
++ dev_priv->cdclk.force_min_cdclk = |
1122 |
++ intel_state->cdclk.force_min_cdclk; |
1123 |
++ |
1124 |
++ intel_cdclk_swap_state(intel_state); |
1125 |
+ } |
1126 |
+ |
1127 |
+ drm_atomic_state_get(state); |
1128 |
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h |
1129 |
+index 18e17b422701..ceaa05dfa0d0 100644 |
1130 |
+--- a/drivers/gpu/drm/i915/intel_drv.h |
1131 |
++++ b/drivers/gpu/drm/i915/intel_drv.h |
1132 |
+@@ -480,6 +480,11 @@ struct intel_atomic_state { |
1133 |
+ * state only when all crtc's are DPMS off. |
1134 |
+ */ |
1135 |
+ struct intel_cdclk_state actual; |
1136 |
++ |
1137 |
++ int force_min_cdclk; |
1138 |
++ bool force_min_cdclk_changed; |
1139 |
++ /* pipe to which cd2x update is synchronized */ |
1140 |
++ enum pipe pipe; |
1141 |
+ } cdclk; |
1142 |
+ |
1143 |
+ bool dpll_set, modeset; |
1144 |
+@@ -1590,12 +1595,24 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv); |
1145 |
+ void intel_update_max_cdclk(struct drm_i915_private *dev_priv); |
1146 |
+ void intel_update_cdclk(struct drm_i915_private *dev_priv); |
1147 |
+ void intel_update_rawclk(struct drm_i915_private *dev_priv); |
1148 |
++bool intel_cdclk_needs_cd2x_update(struct drm_i915_private *dev_priv, |
1149 |
++ const struct intel_cdclk_state *a, |
1150 |
++ const struct intel_cdclk_state *b); |
1151 |
+ bool intel_cdclk_needs_modeset(const struct intel_cdclk_state *a, |
1152 |
+ const struct intel_cdclk_state *b); |
1153 |
+ bool intel_cdclk_changed(const struct intel_cdclk_state *a, |
1154 |
+ const struct intel_cdclk_state *b); |
1155 |
+-void intel_set_cdclk(struct drm_i915_private *dev_priv, |
1156 |
+- const struct intel_cdclk_state *cdclk_state); |
1157 |
++void intel_cdclk_swap_state(struct intel_atomic_state *state); |
1158 |
++void |
1159 |
++intel_set_cdclk_pre_plane_update(struct drm_i915_private *dev_priv, |
1160 |
++ const struct intel_cdclk_state *old_state, |
1161 |
++ const struct intel_cdclk_state *new_state, |
1162 |
++ enum pipe pipe); |
1163 |
++void |
1164 |
++intel_set_cdclk_post_plane_update(struct drm_i915_private *dev_priv, |
1165 |
++ const struct intel_cdclk_state *old_state, |
1166 |
++ const struct intel_cdclk_state *new_state, |
1167 |
++ enum pipe pipe); |
1168 |
+ void intel_dump_cdclk_state(const struct intel_cdclk_state *cdclk_state, |
1169 |
+ const char *context); |
1170 |
+ |
1171 |
+diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c |
1172 |
+index 0dce94e3c495..d0b04b0d309f 100644 |
1173 |
+--- a/drivers/infiniband/core/addr.c |
1174 |
++++ b/drivers/infiniband/core/addr.c |
1175 |
+@@ -730,8 +730,8 @@ int roce_resolve_route_from_path(struct sa_path_rec *rec, |
1176 |
+ if (rec->roce.route_resolved) |
1177 |
+ return 0; |
1178 |
+ |
1179 |
+- rdma_gid2ip(&sgid._sockaddr, &rec->sgid); |
1180 |
+- rdma_gid2ip(&dgid._sockaddr, &rec->dgid); |
1181 |
++ rdma_gid2ip((struct sockaddr *)&sgid, &rec->sgid); |
1182 |
++ rdma_gid2ip((struct sockaddr *)&dgid, &rec->dgid); |
1183 |
+ |
1184 |
+ if (sgid._sockaddr.sa_family != dgid._sockaddr.sa_family) |
1185 |
+ return -EINVAL; |
1186 |
+@@ -742,7 +742,7 @@ int roce_resolve_route_from_path(struct sa_path_rec *rec, |
1187 |
+ dev_addr.net = &init_net; |
1188 |
+ dev_addr.sgid_attr = attr; |
1189 |
+ |
1190 |
+- ret = addr_resolve(&sgid._sockaddr, &dgid._sockaddr, |
1191 |
++ ret = addr_resolve((struct sockaddr *)&sgid, (struct sockaddr *)&dgid, |
1192 |
+ &dev_addr, false, true, 0); |
1193 |
+ if (ret) |
1194 |
+ return ret; |
1195 |
+@@ -814,22 +814,22 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid, |
1196 |
+ struct rdma_dev_addr dev_addr; |
1197 |
+ struct resolve_cb_context ctx; |
1198 |
+ union { |
1199 |
+- struct sockaddr _sockaddr; |
1200 |
+ struct sockaddr_in _sockaddr_in; |
1201 |
+ struct sockaddr_in6 _sockaddr_in6; |
1202 |
+ } sgid_addr, dgid_addr; |
1203 |
+ int ret; |
1204 |
+ |
1205 |
+- rdma_gid2ip(&sgid_addr._sockaddr, sgid); |
1206 |
+- rdma_gid2ip(&dgid_addr._sockaddr, dgid); |
1207 |
++ rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid); |
1208 |
++ rdma_gid2ip((struct sockaddr *)&dgid_addr, dgid); |
1209 |
+ |
1210 |
+ memset(&dev_addr, 0, sizeof(dev_addr)); |
1211 |
+ dev_addr.net = &init_net; |
1212 |
+ dev_addr.sgid_attr = sgid_attr; |
1213 |
+ |
1214 |
+ init_completion(&ctx.comp); |
1215 |
+- ret = rdma_resolve_ip(&sgid_addr._sockaddr, &dgid_addr._sockaddr, |
1216 |
+- &dev_addr, 1000, resolve_cb, true, &ctx); |
1217 |
++ ret = rdma_resolve_ip((struct sockaddr *)&sgid_addr, |
1218 |
++ (struct sockaddr *)&dgid_addr, &dev_addr, 1000, |
1219 |
++ resolve_cb, true, &ctx); |
1220 |
+ if (ret) |
1221 |
+ return ret; |
1222 |
+ |
1223 |
+diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c |
1224 |
+index a7295322efbc..f4500d77f314 100644 |
1225 |
+--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c |
1226 |
++++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c |
1227 |
+@@ -83,7 +83,6 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, |
1228 |
+ struct iphdr ipv4; |
1229 |
+ const struct ib_global_route *ib_grh; |
1230 |
+ union { |
1231 |
+- struct sockaddr _sockaddr; |
1232 |
+ struct sockaddr_in _sockaddr_in; |
1233 |
+ struct sockaddr_in6 _sockaddr_in6; |
1234 |
+ } sgid_addr, dgid_addr; |
1235 |
+@@ -133,9 +132,9 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah, |
1236 |
+ ipv4.tot_len = htons(0); |
1237 |
+ ipv4.ttl = ib_grh->hop_limit; |
1238 |
+ ipv4.protocol = nxthdr; |
1239 |
+- rdma_gid2ip(&sgid_addr._sockaddr, sgid); |
1240 |
++ rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid); |
1241 |
+ ipv4.saddr = sgid_addr._sockaddr_in.sin_addr.s_addr; |
1242 |
+- rdma_gid2ip(&dgid_addr._sockaddr, &ib_grh->dgid); |
1243 |
++ rdma_gid2ip((struct sockaddr*)&dgid_addr, &ib_grh->dgid); |
1244 |
+ ipv4.daddr = dgid_addr._sockaddr_in.sin_addr.s_addr; |
1245 |
+ memcpy((u8 *)ah->av + eth_sz, &ipv4, sizeof(struct iphdr)); |
1246 |
+ } else { |
1247 |
+diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c |
1248 |
+index 097e5ab2a19f..94ca0f4a4073 100644 |
1249 |
+--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c |
1250 |
++++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c |
1251 |
+@@ -2499,7 +2499,6 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, |
1252 |
+ u32 vlan_id = 0xFFFF; |
1253 |
+ u8 mac_addr[6], hdr_type; |
1254 |
+ union { |
1255 |
+- struct sockaddr _sockaddr; |
1256 |
+ struct sockaddr_in _sockaddr_in; |
1257 |
+ struct sockaddr_in6 _sockaddr_in6; |
1258 |
+ } sgid_addr, dgid_addr; |
1259 |
+@@ -2541,8 +2540,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, |
1260 |
+ |
1261 |
+ hdr_type = rdma_gid_attr_network_type(sgid_attr); |
1262 |
+ if (hdr_type == RDMA_NETWORK_IPV4) { |
1263 |
+- rdma_gid2ip(&sgid_addr._sockaddr, &sgid_attr->gid); |
1264 |
+- rdma_gid2ip(&dgid_addr._sockaddr, &grh->dgid); |
1265 |
++ rdma_gid2ip((struct sockaddr *)&sgid_addr, &sgid_attr->gid); |
1266 |
++ rdma_gid2ip((struct sockaddr *)&dgid_addr, &grh->dgid); |
1267 |
+ memcpy(&cmd->params.dgid[0], |
1268 |
+ &dgid_addr._sockaddr_in.sin_addr.s_addr, 4); |
1269 |
+ memcpy(&cmd->params.sgid[0], |
1270 |
+diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c |
1271 |
+index d32268cc1174..f3985469c221 100644 |
1272 |
+--- a/drivers/irqchip/irq-mips-gic.c |
1273 |
++++ b/drivers/irqchip/irq-mips-gic.c |
1274 |
+@@ -388,7 +388,7 @@ static void gic_all_vpes_irq_cpu_online(struct irq_data *d) |
1275 |
+ intr = GIC_HWIRQ_TO_LOCAL(d->hwirq); |
1276 |
+ cd = irq_data_get_irq_chip_data(d); |
1277 |
+ |
1278 |
+- write_gic_vl_map(intr, cd->map); |
1279 |
++ write_gic_vl_map(mips_gic_vx_map_reg(intr), cd->map); |
1280 |
+ if (cd->mask) |
1281 |
+ write_gic_vl_smask(BIT(intr)); |
1282 |
+ } |
1283 |
+@@ -517,7 +517,7 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq, |
1284 |
+ spin_lock_irqsave(&gic_lock, flags); |
1285 |
+ for_each_online_cpu(cpu) { |
1286 |
+ write_gic_vl_other(mips_cm_vp_id(cpu)); |
1287 |
+- write_gic_vo_map(intr, map); |
1288 |
++ write_gic_vo_map(mips_gic_vx_map_reg(intr), map); |
1289 |
+ } |
1290 |
+ spin_unlock_irqrestore(&gic_lock, flags); |
1291 |
+ |
1292 |
+diff --git a/drivers/md/dm-init.c b/drivers/md/dm-init.c |
1293 |
+index 352e803f566e..64611633e77c 100644 |
1294 |
+--- a/drivers/md/dm-init.c |
1295 |
++++ b/drivers/md/dm-init.c |
1296 |
+@@ -140,8 +140,8 @@ static char __init *dm_parse_table_entry(struct dm_device *dev, char *str) |
1297 |
+ return ERR_PTR(-EINVAL); |
1298 |
+ } |
1299 |
+ /* target_args */ |
1300 |
+- dev->target_args_array[n] = kstrndup(field[3], GFP_KERNEL, |
1301 |
+- DM_MAX_STR_SIZE); |
1302 |
++ dev->target_args_array[n] = kstrndup(field[3], DM_MAX_STR_SIZE, |
1303 |
++ GFP_KERNEL); |
1304 |
+ if (!dev->target_args_array[n]) |
1305 |
+ return ERR_PTR(-ENOMEM); |
1306 |
+ |
1307 |
+@@ -275,7 +275,7 @@ static int __init dm_init_init(void) |
1308 |
+ DMERR("Argument is too big. Limit is %d\n", DM_MAX_STR_SIZE); |
1309 |
+ return -EINVAL; |
1310 |
+ } |
1311 |
+- str = kstrndup(create, GFP_KERNEL, DM_MAX_STR_SIZE); |
1312 |
++ str = kstrndup(create, DM_MAX_STR_SIZE, GFP_KERNEL); |
1313 |
+ if (!str) |
1314 |
+ return -ENOMEM; |
1315 |
+ |
1316 |
+diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c |
1317 |
+index 9ea2b0291f20..e549392e0ea5 100644 |
1318 |
+--- a/drivers/md/dm-log-writes.c |
1319 |
++++ b/drivers/md/dm-log-writes.c |
1320 |
+@@ -60,6 +60,7 @@ |
1321 |
+ |
1322 |
+ #define WRITE_LOG_VERSION 1ULL |
1323 |
+ #define WRITE_LOG_MAGIC 0x6a736677736872ULL |
1324 |
++#define WRITE_LOG_SUPER_SECTOR 0 |
1325 |
+ |
1326 |
+ /* |
1327 |
+ * The disk format for this is braindead simple. |
1328 |
+@@ -115,6 +116,7 @@ struct log_writes_c { |
1329 |
+ struct list_head logging_blocks; |
1330 |
+ wait_queue_head_t wait; |
1331 |
+ struct task_struct *log_kthread; |
1332 |
++ struct completion super_done; |
1333 |
+ }; |
1334 |
+ |
1335 |
+ struct pending_block { |
1336 |
+@@ -180,6 +182,14 @@ static void log_end_io(struct bio *bio) |
1337 |
+ bio_put(bio); |
1338 |
+ } |
1339 |
+ |
1340 |
++static void log_end_super(struct bio *bio) |
1341 |
++{ |
1342 |
++ struct log_writes_c *lc = bio->bi_private; |
1343 |
++ |
1344 |
++ complete(&lc->super_done); |
1345 |
++ log_end_io(bio); |
1346 |
++} |
1347 |
++ |
1348 |
+ /* |
1349 |
+ * Meant to be called if there is an error, it will free all the pages |
1350 |
+ * associated with the block. |
1351 |
+@@ -215,7 +225,8 @@ static int write_metadata(struct log_writes_c *lc, void *entry, |
1352 |
+ bio->bi_iter.bi_size = 0; |
1353 |
+ bio->bi_iter.bi_sector = sector; |
1354 |
+ bio_set_dev(bio, lc->logdev->bdev); |
1355 |
+- bio->bi_end_io = log_end_io; |
1356 |
++ bio->bi_end_io = (sector == WRITE_LOG_SUPER_SECTOR) ? |
1357 |
++ log_end_super : log_end_io; |
1358 |
+ bio->bi_private = lc; |
1359 |
+ bio_set_op_attrs(bio, REQ_OP_WRITE, 0); |
1360 |
+ |
1361 |
+@@ -418,11 +429,18 @@ static int log_super(struct log_writes_c *lc) |
1362 |
+ super.nr_entries = cpu_to_le64(lc->logged_entries); |
1363 |
+ super.sectorsize = cpu_to_le32(lc->sectorsize); |
1364 |
+ |
1365 |
+- if (write_metadata(lc, &super, sizeof(super), NULL, 0, 0)) { |
1366 |
++ if (write_metadata(lc, &super, sizeof(super), NULL, 0, |
1367 |
++ WRITE_LOG_SUPER_SECTOR)) { |
1368 |
+ DMERR("Couldn't write super"); |
1369 |
+ return -1; |
1370 |
+ } |
1371 |
+ |
1372 |
++ /* |
1373 |
++ * Super sector should be writen in-order, otherwise the |
1374 |
++ * nr_entries could be rewritten incorrectly by an old bio. |
1375 |
++ */ |
1376 |
++ wait_for_completion_io(&lc->super_done); |
1377 |
++ |
1378 |
+ return 0; |
1379 |
+ } |
1380 |
+ |
1381 |
+@@ -531,6 +549,7 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv) |
1382 |
+ INIT_LIST_HEAD(&lc->unflushed_blocks); |
1383 |
+ INIT_LIST_HEAD(&lc->logging_blocks); |
1384 |
+ init_waitqueue_head(&lc->wait); |
1385 |
++ init_completion(&lc->super_done); |
1386 |
+ atomic_set(&lc->io_blocks, 0); |
1387 |
+ atomic_set(&lc->pending_blocks, 0); |
1388 |
+ |
1389 |
+diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c |
1390 |
+index f96efa363d34..59e919b92873 100644 |
1391 |
+--- a/drivers/net/bonding/bond_main.c |
1392 |
++++ b/drivers/net/bonding/bond_main.c |
1393 |
+@@ -4321,12 +4321,12 @@ void bond_setup(struct net_device *bond_dev) |
1394 |
+ bond_dev->features |= NETIF_F_NETNS_LOCAL; |
1395 |
+ |
1396 |
+ bond_dev->hw_features = BOND_VLAN_FEATURES | |
1397 |
+- NETIF_F_HW_VLAN_CTAG_TX | |
1398 |
+ NETIF_F_HW_VLAN_CTAG_RX | |
1399 |
+ NETIF_F_HW_VLAN_CTAG_FILTER; |
1400 |
+ |
1401 |
+ bond_dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4; |
1402 |
+ bond_dev->features |= bond_dev->hw_features; |
1403 |
++ bond_dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; |
1404 |
+ } |
1405 |
+ |
1406 |
+ /* Destroy a bonding device. |
1407 |
+diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c |
1408 |
+index 18bc035da850..1fff462a4175 100644 |
1409 |
+--- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c |
1410 |
++++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c |
1411 |
+@@ -843,9 +843,14 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic) |
1412 |
+ return err; |
1413 |
+ |
1414 |
+ if (aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) { |
1415 |
+- if (hweight < AQ_VLAN_MAX_FILTERS) |
1416 |
+- err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, true); |
1417 |
++ if (hweight < AQ_VLAN_MAX_FILTERS && hweight > 0) { |
1418 |
++ err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, |
1419 |
++ !(aq_nic->packet_filter & IFF_PROMISC)); |
1420 |
++ aq_nic->aq_nic_cfg.is_vlan_force_promisc = false; |
1421 |
++ } else { |
1422 |
+ /* otherwise left in promiscue mode */ |
1423 |
++ aq_nic->aq_nic_cfg.is_vlan_force_promisc = true; |
1424 |
++ } |
1425 |
+ } |
1426 |
+ |
1427 |
+ return err; |
1428 |
+@@ -866,6 +871,7 @@ int aq_filters_vlan_offload_off(struct aq_nic_s *aq_nic) |
1429 |
+ if (unlikely(!aq_hw_ops->hw_filter_vlan_ctrl)) |
1430 |
+ return -EOPNOTSUPP; |
1431 |
+ |
1432 |
++ aq_nic->aq_nic_cfg.is_vlan_force_promisc = true; |
1433 |
+ err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, false); |
1434 |
+ if (err) |
1435 |
+ return err; |
1436 |
+diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c |
1437 |
+index ff83667410bd..550abfe6973d 100644 |
1438 |
+--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c |
1439 |
++++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c |
1440 |
+@@ -117,6 +117,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) |
1441 |
+ |
1442 |
+ cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk; |
1443 |
+ cfg->features = cfg->aq_hw_caps->hw_features; |
1444 |
++ cfg->is_vlan_force_promisc = true; |
1445 |
+ } |
1446 |
+ |
1447 |
+ static int aq_nic_update_link_status(struct aq_nic_s *self) |
1448 |
+diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h |
1449 |
+index 8e34c1e49bf2..65e681be9b5d 100644 |
1450 |
+--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h |
1451 |
++++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h |
1452 |
+@@ -36,6 +36,7 @@ struct aq_nic_cfg_s { |
1453 |
+ u32 flow_control; |
1454 |
+ u32 link_speed_msk; |
1455 |
+ u32 wol; |
1456 |
++ bool is_vlan_force_promisc; |
1457 |
+ u16 is_mc_list_enabled; |
1458 |
+ u16 mc_list_count; |
1459 |
+ bool is_autoneg; |
1460 |
+diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
1461 |
+index ec302fdfec63..a4cc04741115 100644 |
1462 |
+--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
1463 |
++++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c |
1464 |
+@@ -771,8 +771,15 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, |
1465 |
+ unsigned int packet_filter) |
1466 |
+ { |
1467 |
+ unsigned int i = 0U; |
1468 |
++ struct aq_nic_cfg_s *cfg = self->aq_nic_cfg; |
1469 |
++ |
1470 |
++ hw_atl_rpfl2promiscuous_mode_en_set(self, |
1471 |
++ IS_FILTER_ENABLED(IFF_PROMISC)); |
1472 |
++ |
1473 |
++ hw_atl_rpf_vlan_prom_mode_en_set(self, |
1474 |
++ IS_FILTER_ENABLED(IFF_PROMISC) || |
1475 |
++ cfg->is_vlan_force_promisc); |
1476 |
+ |
1477 |
+- hw_atl_rpfl2promiscuous_mode_en_set(self, IS_FILTER_ENABLED(IFF_PROMISC)); |
1478 |
+ hw_atl_rpfl2multicast_flr_en_set(self, |
1479 |
+ IS_FILTER_ENABLED(IFF_ALLMULTI), 0); |
1480 |
+ |
1481 |
+@@ -781,13 +788,13 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, |
1482 |
+ |
1483 |
+ hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST)); |
1484 |
+ |
1485 |
+- self->aq_nic_cfg->is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST); |
1486 |
++ cfg->is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST); |
1487 |
+ |
1488 |
+ for (i = HW_ATL_B0_MAC_MIN; i < HW_ATL_B0_MAC_MAX; ++i) |
1489 |
+ hw_atl_rpfl2_uc_flr_en_set(self, |
1490 |
+- (self->aq_nic_cfg->is_mc_list_enabled && |
1491 |
+- (i <= self->aq_nic_cfg->mc_list_count)) ? |
1492 |
+- 1U : 0U, i); |
1493 |
++ (cfg->is_mc_list_enabled && |
1494 |
++ (i <= cfg->mc_list_count)) ? |
1495 |
++ 1U : 0U, i); |
1496 |
+ |
1497 |
+ return aq_hw_err_from_flags(self); |
1498 |
+ } |
1499 |
+@@ -1079,7 +1086,7 @@ static int hw_atl_b0_hw_vlan_set(struct aq_hw_s *self, |
1500 |
+ static int hw_atl_b0_hw_vlan_ctrl(struct aq_hw_s *self, bool enable) |
1501 |
+ { |
1502 |
+ /* set promisc in case of disabing the vland filter */ |
1503 |
+- hw_atl_rpf_vlan_prom_mode_en_set(self, !!!enable); |
1504 |
++ hw_atl_rpf_vlan_prom_mode_en_set(self, !enable); |
1505 |
+ |
1506 |
+ return aq_hw_err_from_flags(self); |
1507 |
+ } |
1508 |
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
1509 |
+index 8d9cc2157afd..7423262ce590 100644 |
1510 |
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
1511 |
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c |
1512 |
+@@ -122,7 +122,7 @@ static int adjust_systime(void __iomem *ioaddr, u32 sec, u32 nsec, |
1513 |
+ * programmed with (2^32 – <new_sec_value>) |
1514 |
+ */ |
1515 |
+ if (gmac4) |
1516 |
+- sec = (100000000ULL - sec); |
1517 |
++ sec = -sec; |
1518 |
+ |
1519 |
+ value = readl(ioaddr + PTP_TCR); |
1520 |
+ if (value & PTP_TCR_TSCTRLSSR) |
1521 |
+diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
1522 |
+index 635d88d82610..a634054dcb11 100644 |
1523 |
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
1524 |
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
1525 |
+@@ -2957,12 +2957,15 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) |
1526 |
+ |
1527 |
+ /* Manage tx mitigation */ |
1528 |
+ tx_q->tx_count_frames += nfrags + 1; |
1529 |
+- if (priv->tx_coal_frames <= tx_q->tx_count_frames) { |
1530 |
++ if (likely(priv->tx_coal_frames > tx_q->tx_count_frames) && |
1531 |
++ !(priv->synopsys_id >= DWMAC_CORE_4_00 && |
1532 |
++ (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && |
1533 |
++ priv->hwts_tx_en)) { |
1534 |
++ stmmac_tx_timer_arm(priv, queue); |
1535 |
++ } else { |
1536 |
++ tx_q->tx_count_frames = 0; |
1537 |
+ stmmac_set_tx_ic(priv, desc); |
1538 |
+ priv->xstats.tx_set_ic_bit++; |
1539 |
+- tx_q->tx_count_frames = 0; |
1540 |
+- } else { |
1541 |
+- stmmac_tx_timer_arm(priv, queue); |
1542 |
+ } |
1543 |
+ |
1544 |
+ skb_tx_timestamp(skb); |
1545 |
+@@ -3176,12 +3179,15 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) |
1546 |
+ * element in case of no SG. |
1547 |
+ */ |
1548 |
+ tx_q->tx_count_frames += nfrags + 1; |
1549 |
+- if (priv->tx_coal_frames <= tx_q->tx_count_frames) { |
1550 |
++ if (likely(priv->tx_coal_frames > tx_q->tx_count_frames) && |
1551 |
++ !(priv->synopsys_id >= DWMAC_CORE_4_00 && |
1552 |
++ (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && |
1553 |
++ priv->hwts_tx_en)) { |
1554 |
++ stmmac_tx_timer_arm(priv, queue); |
1555 |
++ } else { |
1556 |
++ tx_q->tx_count_frames = 0; |
1557 |
+ stmmac_set_tx_ic(priv, desc); |
1558 |
+ priv->xstats.tx_set_ic_bit++; |
1559 |
+- tx_q->tx_count_frames = 0; |
1560 |
+- } else { |
1561 |
+- stmmac_tx_timer_arm(priv, queue); |
1562 |
+ } |
1563 |
+ |
1564 |
+ skb_tx_timestamp(skb); |
1565 |
+diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c |
1566 |
+index 16963f7a88f7..351f25e1fc48 100644 |
1567 |
+--- a/drivers/net/team/team.c |
1568 |
++++ b/drivers/net/team/team.c |
1569 |
+@@ -2135,12 +2135,12 @@ static void team_setup(struct net_device *dev) |
1570 |
+ dev->features |= NETIF_F_NETNS_LOCAL; |
1571 |
+ |
1572 |
+ dev->hw_features = TEAM_VLAN_FEATURES | |
1573 |
+- NETIF_F_HW_VLAN_CTAG_TX | |
1574 |
+ NETIF_F_HW_VLAN_CTAG_RX | |
1575 |
+ NETIF_F_HW_VLAN_CTAG_FILTER; |
1576 |
+ |
1577 |
+ dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4; |
1578 |
+ dev->features |= dev->hw_features; |
1579 |
++ dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; |
1580 |
+ } |
1581 |
+ |
1582 |
+ static int team_newlink(struct net *src_net, struct net_device *dev, |
1583 |
+diff --git a/drivers/net/tun.c b/drivers/net/tun.c |
1584 |
+index f4c933ac6edf..d1cafb29eca9 100644 |
1585 |
+--- a/drivers/net/tun.c |
1586 |
++++ b/drivers/net/tun.c |
1587 |
+@@ -1024,18 +1024,8 @@ static void tun_net_uninit(struct net_device *dev) |
1588 |
+ /* Net device open. */ |
1589 |
+ static int tun_net_open(struct net_device *dev) |
1590 |
+ { |
1591 |
+- struct tun_struct *tun = netdev_priv(dev); |
1592 |
+- int i; |
1593 |
+- |
1594 |
+ netif_tx_start_all_queues(dev); |
1595 |
+ |
1596 |
+- for (i = 0; i < tun->numqueues; i++) { |
1597 |
+- struct tun_file *tfile; |
1598 |
+- |
1599 |
+- tfile = rtnl_dereference(tun->tfiles[i]); |
1600 |
+- tfile->socket.sk->sk_write_space(tfile->socket.sk); |
1601 |
+- } |
1602 |
+- |
1603 |
+ return 0; |
1604 |
+ } |
1605 |
+ |
1606 |
+@@ -3636,6 +3626,7 @@ static int tun_device_event(struct notifier_block *unused, |
1607 |
+ { |
1608 |
+ struct net_device *dev = netdev_notifier_info_to_dev(ptr); |
1609 |
+ struct tun_struct *tun = netdev_priv(dev); |
1610 |
++ int i; |
1611 |
+ |
1612 |
+ if (dev->rtnl_link_ops != &tun_link_ops) |
1613 |
+ return NOTIFY_DONE; |
1614 |
+@@ -3645,6 +3636,14 @@ static int tun_device_event(struct notifier_block *unused, |
1615 |
+ if (tun_queue_resize(tun)) |
1616 |
+ return NOTIFY_BAD; |
1617 |
+ break; |
1618 |
++ case NETDEV_UP: |
1619 |
++ for (i = 0; i < tun->numqueues; i++) { |
1620 |
++ struct tun_file *tfile; |
1621 |
++ |
1622 |
++ tfile = rtnl_dereference(tun->tfiles[i]); |
1623 |
++ tfile->socket.sk->sk_write_space(tfile->socket.sk); |
1624 |
++ } |
1625 |
++ break; |
1626 |
+ default: |
1627 |
+ break; |
1628 |
+ } |
1629 |
+diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c |
1630 |
+index d9a6699abe59..e657d8947125 100644 |
1631 |
+--- a/drivers/net/usb/qmi_wwan.c |
1632 |
++++ b/drivers/net/usb/qmi_wwan.c |
1633 |
+@@ -1412,7 +1412,7 @@ static int qmi_wwan_probe(struct usb_interface *intf, |
1634 |
+ * different. Ignore the current interface if the number of endpoints |
1635 |
+ * equals the number for the diag interface (two). |
1636 |
+ */ |
1637 |
+- info = (void *)&id->driver_info; |
1638 |
++ info = (void *)id->driver_info; |
1639 |
+ |
1640 |
+ if (info->data & QMI_WWAN_QUIRK_QUECTEL_DYNCFG) { |
1641 |
+ if (desc->bNumEndpoints == 2) |
1642 |
+diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c |
1643 |
+index ecee4b3ff073..377b07b2feeb 100644 |
1644 |
+--- a/drivers/scsi/vmw_pvscsi.c |
1645 |
++++ b/drivers/scsi/vmw_pvscsi.c |
1646 |
+@@ -763,6 +763,7 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd |
1647 |
+ struct pvscsi_adapter *adapter = shost_priv(host); |
1648 |
+ struct pvscsi_ctx *ctx; |
1649 |
+ unsigned long flags; |
1650 |
++ unsigned char op; |
1651 |
+ |
1652 |
+ spin_lock_irqsave(&adapter->hw_lock, flags); |
1653 |
+ |
1654 |
+@@ -775,13 +776,14 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd |
1655 |
+ } |
1656 |
+ |
1657 |
+ cmd->scsi_done = done; |
1658 |
++ op = cmd->cmnd[0]; |
1659 |
+ |
1660 |
+ dev_dbg(&cmd->device->sdev_gendev, |
1661 |
+- "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, cmd->cmnd[0]); |
1662 |
++ "queued cmd %p, ctx %p, op=%x\n", cmd, ctx, op); |
1663 |
+ |
1664 |
+ spin_unlock_irqrestore(&adapter->hw_lock, flags); |
1665 |
+ |
1666 |
+- pvscsi_kick_io(adapter, cmd->cmnd[0]); |
1667 |
++ pvscsi_kick_io(adapter, op); |
1668 |
+ |
1669 |
+ return 0; |
1670 |
+ } |
1671 |
+diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c |
1672 |
+index 82a48e830018..e4b59e76afb0 100644 |
1673 |
+--- a/fs/binfmt_flat.c |
1674 |
++++ b/fs/binfmt_flat.c |
1675 |
+@@ -856,9 +856,14 @@ err: |
1676 |
+ |
1677 |
+ static int load_flat_shared_library(int id, struct lib_info *libs) |
1678 |
+ { |
1679 |
++ /* |
1680 |
++ * This is a fake bprm struct; only the members "buf", "file" and |
1681 |
++ * "filename" are actually used. |
1682 |
++ */ |
1683 |
+ struct linux_binprm bprm; |
1684 |
+ int res; |
1685 |
+ char buf[16]; |
1686 |
++ loff_t pos = 0; |
1687 |
+ |
1688 |
+ memset(&bprm, 0, sizeof(bprm)); |
1689 |
+ |
1690 |
+@@ -872,25 +877,11 @@ static int load_flat_shared_library(int id, struct lib_info *libs) |
1691 |
+ if (IS_ERR(bprm.file)) |
1692 |
+ return res; |
1693 |
+ |
1694 |
+- bprm.cred = prepare_exec_creds(); |
1695 |
+- res = -ENOMEM; |
1696 |
+- if (!bprm.cred) |
1697 |
+- goto out; |
1698 |
+- |
1699 |
+- /* We don't really care about recalculating credentials at this point |
1700 |
+- * as we're past the point of no return and are dealing with shared |
1701 |
+- * libraries. |
1702 |
+- */ |
1703 |
+- bprm.called_set_creds = 1; |
1704 |
++ res = kernel_read(bprm.file, bprm.buf, BINPRM_BUF_SIZE, &pos); |
1705 |
+ |
1706 |
+- res = prepare_binprm(&bprm); |
1707 |
+- |
1708 |
+- if (!res) |
1709 |
++ if (res >= 0) |
1710 |
+ res = load_flat_file(&bprm, libs, id, NULL); |
1711 |
+ |
1712 |
+- abort_creds(bprm.cred); |
1713 |
+- |
1714 |
+-out: |
1715 |
+ allow_write_access(bprm.file); |
1716 |
+ fput(bprm.file); |
1717 |
+ |
1718 |
+diff --git a/fs/inode.c b/fs/inode.c |
1719 |
+index 9a453f3637f8..5bd1dd2e942f 100644 |
1720 |
+--- a/fs/inode.c |
1721 |
++++ b/fs/inode.c |
1722 |
+@@ -349,7 +349,7 @@ EXPORT_SYMBOL(inc_nlink); |
1723 |
+ |
1724 |
+ static void __address_space_init_once(struct address_space *mapping) |
1725 |
+ { |
1726 |
+- xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ); |
1727 |
++ xa_init_flags(&mapping->i_pages, XA_FLAGS_LOCK_IRQ | XA_FLAGS_ACCOUNT); |
1728 |
+ init_rwsem(&mapping->i_mmap_rwsem); |
1729 |
+ INIT_LIST_HEAD(&mapping->private_list); |
1730 |
+ spin_lock_init(&mapping->private_lock); |
1731 |
+diff --git a/fs/io_uring.c b/fs/io_uring.c |
1732 |
+index e82adbf8adc1..b897695c91c0 100644 |
1733 |
+--- a/fs/io_uring.c |
1734 |
++++ b/fs/io_uring.c |
1735 |
+@@ -533,6 +533,7 @@ static struct io_kiocb *io_get_req(struct io_ring_ctx *ctx, |
1736 |
+ state->cur_req++; |
1737 |
+ } |
1738 |
+ |
1739 |
++ req->file = NULL; |
1740 |
+ req->ctx = ctx; |
1741 |
+ req->flags = 0; |
1742 |
+ /* one is dropped after submission, the other at completion */ |
1743 |
+@@ -1684,10 +1685,8 @@ static int io_req_set_file(struct io_ring_ctx *ctx, const struct sqe_submit *s, |
1744 |
+ flags = READ_ONCE(s->sqe->flags); |
1745 |
+ fd = READ_ONCE(s->sqe->fd); |
1746 |
+ |
1747 |
+- if (!io_op_needs_file(s->sqe)) { |
1748 |
+- req->file = NULL; |
1749 |
++ if (!io_op_needs_file(s->sqe)) |
1750 |
+ return 0; |
1751 |
+- } |
1752 |
+ |
1753 |
+ if (flags & IOSQE_FIXED_FILE) { |
1754 |
+ if (unlikely(!ctx->user_files || |
1755 |
+diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c |
1756 |
+index a809989807d6..19f856f45689 100644 |
1757 |
+--- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c |
1758 |
++++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c |
1759 |
+@@ -18,7 +18,7 @@ |
1760 |
+ |
1761 |
+ #define NFSDBG_FACILITY NFSDBG_PNFS_LD |
1762 |
+ |
1763 |
+-static unsigned int dataserver_timeo = NFS_DEF_TCP_RETRANS; |
1764 |
++static unsigned int dataserver_timeo = NFS_DEF_TCP_TIMEO; |
1765 |
+ static unsigned int dataserver_retrans; |
1766 |
+ |
1767 |
+ static bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg); |
1768 |
+diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c |
1769 |
+index 63c6bb1f8c4d..8c286f8228e5 100644 |
1770 |
+--- a/fs/notify/fanotify/fanotify.c |
1771 |
++++ b/fs/notify/fanotify/fanotify.c |
1772 |
+@@ -355,6 +355,10 @@ static __kernel_fsid_t fanotify_get_fsid(struct fsnotify_iter_info *iter_info) |
1773 |
+ /* Mark is just getting destroyed or created? */ |
1774 |
+ if (!conn) |
1775 |
+ continue; |
1776 |
++ if (!(conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID)) |
1777 |
++ continue; |
1778 |
++ /* Pairs with smp_wmb() in fsnotify_add_mark_list() */ |
1779 |
++ smp_rmb(); |
1780 |
+ fsid = conn->fsid; |
1781 |
+ if (WARN_ON_ONCE(!fsid.val[0] && !fsid.val[1])) |
1782 |
+ continue; |
1783 |
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c |
1784 |
+index 22acb0a79b53..e9d49191d39e 100644 |
1785 |
+--- a/fs/notify/mark.c |
1786 |
++++ b/fs/notify/mark.c |
1787 |
+@@ -495,10 +495,13 @@ static int fsnotify_attach_connector_to_object(fsnotify_connp_t *connp, |
1788 |
+ conn->type = type; |
1789 |
+ conn->obj = connp; |
1790 |
+ /* Cache fsid of filesystem containing the object */ |
1791 |
+- if (fsid) |
1792 |
++ if (fsid) { |
1793 |
+ conn->fsid = *fsid; |
1794 |
+- else |
1795 |
++ conn->flags = FSNOTIFY_CONN_FLAG_HAS_FSID; |
1796 |
++ } else { |
1797 |
+ conn->fsid.val[0] = conn->fsid.val[1] = 0; |
1798 |
++ conn->flags = 0; |
1799 |
++ } |
1800 |
+ if (conn->type == FSNOTIFY_OBJ_TYPE_INODE) |
1801 |
+ inode = igrab(fsnotify_conn_inode(conn)); |
1802 |
+ /* |
1803 |
+@@ -573,7 +576,12 @@ restart: |
1804 |
+ if (err) |
1805 |
+ return err; |
1806 |
+ goto restart; |
1807 |
+- } else if (fsid && (conn->fsid.val[0] || conn->fsid.val[1]) && |
1808 |
++ } else if (fsid && !(conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID)) { |
1809 |
++ conn->fsid = *fsid; |
1810 |
++ /* Pairs with smp_rmb() in fanotify_get_fsid() */ |
1811 |
++ smp_wmb(); |
1812 |
++ conn->flags |= FSNOTIFY_CONN_FLAG_HAS_FSID; |
1813 |
++ } else if (fsid && (conn->flags & FSNOTIFY_CONN_FLAG_HAS_FSID) && |
1814 |
+ (fsid->val[0] != conn->fsid.val[0] || |
1815 |
+ fsid->val[1] != conn->fsid.val[1])) { |
1816 |
+ /* |
1817 |
+diff --git a/fs/proc/array.c b/fs/proc/array.c |
1818 |
+index 2edbb657f859..55180501b915 100644 |
1819 |
+--- a/fs/proc/array.c |
1820 |
++++ b/fs/proc/array.c |
1821 |
+@@ -462,7 +462,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, |
1822 |
+ * a program is not able to use ptrace(2) in that case. It is |
1823 |
+ * safe because the task has stopped executing permanently. |
1824 |
+ */ |
1825 |
+- if (permitted && (task->flags & PF_DUMPCORE)) { |
1826 |
++ if (permitted && (task->flags & (PF_EXITING|PF_DUMPCORE))) { |
1827 |
+ if (try_get_task_stack(task)) { |
1828 |
+ eip = KSTK_EIP(task); |
1829 |
+ esp = KSTK_ESP(task); |
1830 |
+diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h |
1831 |
+index fcb61b4659b3..8666fe7f35d7 100644 |
1832 |
+--- a/include/asm-generic/futex.h |
1833 |
++++ b/include/asm-generic/futex.h |
1834 |
+@@ -23,7 +23,9 @@ |
1835 |
+ * |
1836 |
+ * Return: |
1837 |
+ * 0 - On success |
1838 |
+- * <0 - On error |
1839 |
++ * -EFAULT - User access resulted in a page fault |
1840 |
++ * -EAGAIN - Atomic operation was unable to complete due to contention |
1841 |
++ * -ENOSYS - Operation not supported |
1842 |
+ */ |
1843 |
+ static inline int |
1844 |
+ arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) |
1845 |
+@@ -85,7 +87,9 @@ out_pagefault_enable: |
1846 |
+ * |
1847 |
+ * Return: |
1848 |
+ * 0 - On success |
1849 |
+- * <0 - On error |
1850 |
++ * -EFAULT - User access resulted in a page fault |
1851 |
++ * -EAGAIN - Atomic operation was unable to complete due to contention |
1852 |
++ * -ENOSYS - Function not implemented (only if !HAVE_FUTEX_CMPXCHG) |
1853 |
+ */ |
1854 |
+ static inline int |
1855 |
+ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, |
1856 |
+diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h |
1857 |
+index a4c644c1c091..ada0246d43ab 100644 |
1858 |
+--- a/include/linux/bpf-cgroup.h |
1859 |
++++ b/include/linux/bpf-cgroup.h |
1860 |
+@@ -230,6 +230,12 @@ int bpf_percpu_cgroup_storage_update(struct bpf_map *map, void *key, |
1861 |
+ #define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK(sk, uaddr, t_ctx) \ |
1862 |
+ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_UDP6_SENDMSG, t_ctx) |
1863 |
+ |
1864 |
++#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK(sk, uaddr) \ |
1865 |
++ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_UDP4_RECVMSG, NULL) |
1866 |
++ |
1867 |
++#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK(sk, uaddr) \ |
1868 |
++ BPF_CGROUP_RUN_SA_PROG_LOCK(sk, uaddr, BPF_CGROUP_UDP6_RECVMSG, NULL) |
1869 |
++ |
1870 |
+ #define BPF_CGROUP_RUN_PROG_SOCK_OPS(sock_ops) \ |
1871 |
+ ({ \ |
1872 |
+ int __ret = 0; \ |
1873 |
+@@ -319,6 +325,8 @@ static inline int bpf_percpu_cgroup_storage_update(struct bpf_map *map, |
1874 |
+ #define BPF_CGROUP_RUN_PROG_INET6_CONNECT_LOCK(sk, uaddr) ({ 0; }) |
1875 |
+ #define BPF_CGROUP_RUN_PROG_UDP4_SENDMSG_LOCK(sk, uaddr, t_ctx) ({ 0; }) |
1876 |
+ #define BPF_CGROUP_RUN_PROG_UDP6_SENDMSG_LOCK(sk, uaddr, t_ctx) ({ 0; }) |
1877 |
++#define BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK(sk, uaddr) ({ 0; }) |
1878 |
++#define BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK(sk, uaddr) ({ 0; }) |
1879 |
+ #define BPF_CGROUP_RUN_PROG_SOCK_OPS(sock_ops) ({ 0; }) |
1880 |
+ #define BPF_CGROUP_RUN_PROG_DEVICE_CGROUP(type,major,minor,access) ({ 0; }) |
1881 |
+ |
1882 |
+diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h |
1883 |
+index 094b38f2d9a1..0f67cabbbec8 100644 |
1884 |
+--- a/include/linux/fsnotify_backend.h |
1885 |
++++ b/include/linux/fsnotify_backend.h |
1886 |
+@@ -292,7 +292,9 @@ typedef struct fsnotify_mark_connector __rcu *fsnotify_connp_t; |
1887 |
+ */ |
1888 |
+ struct fsnotify_mark_connector { |
1889 |
+ spinlock_t lock; |
1890 |
+- unsigned int type; /* Type of object [lock] */ |
1891 |
++ unsigned short type; /* Type of object [lock] */ |
1892 |
++#define FSNOTIFY_CONN_FLAG_HAS_FSID 0x01 |
1893 |
++ unsigned short flags; /* flags [lock] */ |
1894 |
+ __kernel_fsid_t fsid; /* fsid of filesystem containing object */ |
1895 |
+ union { |
1896 |
+ /* Object pointer [lock] */ |
1897 |
+diff --git a/include/linux/xarray.h b/include/linux/xarray.h |
1898 |
+index 0e01e6129145..5921599b6dc4 100644 |
1899 |
+--- a/include/linux/xarray.h |
1900 |
++++ b/include/linux/xarray.h |
1901 |
+@@ -265,6 +265,7 @@ enum xa_lock_type { |
1902 |
+ #define XA_FLAGS_TRACK_FREE ((__force gfp_t)4U) |
1903 |
+ #define XA_FLAGS_ZERO_BUSY ((__force gfp_t)8U) |
1904 |
+ #define XA_FLAGS_ALLOC_WRAPPED ((__force gfp_t)16U) |
1905 |
++#define XA_FLAGS_ACCOUNT ((__force gfp_t)32U) |
1906 |
+ #define XA_FLAGS_MARK(mark) ((__force gfp_t)((1U << __GFP_BITS_SHIFT) << \ |
1907 |
+ (__force unsigned)(mark))) |
1908 |
+ |
1909 |
+diff --git a/include/net/tls.h b/include/net/tls.h |
1910 |
+index 053082d98906..a67ad7d56ff2 100644 |
1911 |
+--- a/include/net/tls.h |
1912 |
++++ b/include/net/tls.h |
1913 |
+@@ -347,21 +347,6 @@ static inline bool tls_is_partially_sent_record(struct tls_context *ctx) |
1914 |
+ return !!ctx->partially_sent_record; |
1915 |
+ } |
1916 |
+ |
1917 |
+-static inline int tls_complete_pending_work(struct sock *sk, |
1918 |
+- struct tls_context *ctx, |
1919 |
+- int flags, long *timeo) |
1920 |
+-{ |
1921 |
+- int rc = 0; |
1922 |
+- |
1923 |
+- if (unlikely(sk->sk_write_pending)) |
1924 |
+- rc = wait_on_pending_writer(sk, timeo); |
1925 |
+- |
1926 |
+- if (!rc && tls_is_partially_sent_record(ctx)) |
1927 |
+- rc = tls_push_partial_record(sk, ctx, flags); |
1928 |
+- |
1929 |
+- return rc; |
1930 |
+-} |
1931 |
+- |
1932 |
+ static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx) |
1933 |
+ { |
1934 |
+ return tls_ctx->pending_open_record_frags; |
1935 |
+diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h |
1936 |
+index 929c8e537a14..9d01f4788d3e 100644 |
1937 |
+--- a/include/uapi/linux/bpf.h |
1938 |
++++ b/include/uapi/linux/bpf.h |
1939 |
+@@ -187,6 +187,8 @@ enum bpf_attach_type { |
1940 |
+ BPF_CGROUP_UDP6_SENDMSG, |
1941 |
+ BPF_LIRC_MODE2, |
1942 |
+ BPF_FLOW_DISSECTOR, |
1943 |
++ BPF_CGROUP_UDP4_RECVMSG = 19, |
1944 |
++ BPF_CGROUP_UDP6_RECVMSG, |
1945 |
+ __MAX_BPF_ATTACH_TYPE |
1946 |
+ }; |
1947 |
+ |
1948 |
+@@ -3104,8 +3106,8 @@ struct bpf_raw_tracepoint_args { |
1949 |
+ /* DIRECT: Skip the FIB rules and go to FIB table associated with device |
1950 |
+ * OUTPUT: Do lookup from egress perspective; default is ingress |
1951 |
+ */ |
1952 |
+-#define BPF_FIB_LOOKUP_DIRECT BIT(0) |
1953 |
+-#define BPF_FIB_LOOKUP_OUTPUT BIT(1) |
1954 |
++#define BPF_FIB_LOOKUP_DIRECT (1U << 0) |
1955 |
++#define BPF_FIB_LOOKUP_OUTPUT (1U << 1) |
1956 |
+ |
1957 |
+ enum { |
1958 |
+ BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */ |
1959 |
+diff --git a/kernel/bpf/lpm_trie.c b/kernel/bpf/lpm_trie.c |
1960 |
+index 93a5cbbde421..3b03a7342f3c 100644 |
1961 |
+--- a/kernel/bpf/lpm_trie.c |
1962 |
++++ b/kernel/bpf/lpm_trie.c |
1963 |
+@@ -715,9 +715,14 @@ find_leftmost: |
1964 |
+ * have exact two children, so this function will never return NULL. |
1965 |
+ */ |
1966 |
+ for (node = search_root; node;) { |
1967 |
+- if (!(node->flags & LPM_TREE_NODE_FLAG_IM)) |
1968 |
++ if (node->flags & LPM_TREE_NODE_FLAG_IM) { |
1969 |
++ node = rcu_dereference(node->child[0]); |
1970 |
++ } else { |
1971 |
+ next_node = node; |
1972 |
+- node = rcu_dereference(node->child[0]); |
1973 |
++ node = rcu_dereference(node->child[0]); |
1974 |
++ if (!node) |
1975 |
++ node = rcu_dereference(next_node->child[1]); |
1976 |
++ } |
1977 |
+ } |
1978 |
+ do_copy: |
1979 |
+ next_key->prefixlen = next_node->prefixlen; |
1980 |
+diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c |
1981 |
+index db6e825e2958..29b8f20d500c 100644 |
1982 |
+--- a/kernel/bpf/syscall.c |
1983 |
++++ b/kernel/bpf/syscall.c |
1984 |
+@@ -1520,6 +1520,8 @@ bpf_prog_load_check_attach_type(enum bpf_prog_type prog_type, |
1985 |
+ case BPF_CGROUP_INET6_CONNECT: |
1986 |
+ case BPF_CGROUP_UDP4_SENDMSG: |
1987 |
+ case BPF_CGROUP_UDP6_SENDMSG: |
1988 |
++ case BPF_CGROUP_UDP4_RECVMSG: |
1989 |
++ case BPF_CGROUP_UDP6_RECVMSG: |
1990 |
+ return 0; |
1991 |
+ default: |
1992 |
+ return -EINVAL; |
1993 |
+@@ -1809,6 +1811,8 @@ static int bpf_prog_attach(const union bpf_attr *attr) |
1994 |
+ case BPF_CGROUP_INET6_CONNECT: |
1995 |
+ case BPF_CGROUP_UDP4_SENDMSG: |
1996 |
+ case BPF_CGROUP_UDP6_SENDMSG: |
1997 |
++ case BPF_CGROUP_UDP4_RECVMSG: |
1998 |
++ case BPF_CGROUP_UDP6_RECVMSG: |
1999 |
+ ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR; |
2000 |
+ break; |
2001 |
+ case BPF_CGROUP_SOCK_OPS: |
2002 |
+@@ -1891,6 +1895,8 @@ static int bpf_prog_detach(const union bpf_attr *attr) |
2003 |
+ case BPF_CGROUP_INET6_CONNECT: |
2004 |
+ case BPF_CGROUP_UDP4_SENDMSG: |
2005 |
+ case BPF_CGROUP_UDP6_SENDMSG: |
2006 |
++ case BPF_CGROUP_UDP4_RECVMSG: |
2007 |
++ case BPF_CGROUP_UDP6_RECVMSG: |
2008 |
+ ptype = BPF_PROG_TYPE_CGROUP_SOCK_ADDR; |
2009 |
+ break; |
2010 |
+ case BPF_CGROUP_SOCK_OPS: |
2011 |
+@@ -1939,6 +1945,8 @@ static int bpf_prog_query(const union bpf_attr *attr, |
2012 |
+ case BPF_CGROUP_INET6_CONNECT: |
2013 |
+ case BPF_CGROUP_UDP4_SENDMSG: |
2014 |
+ case BPF_CGROUP_UDP6_SENDMSG: |
2015 |
++ case BPF_CGROUP_UDP4_RECVMSG: |
2016 |
++ case BPF_CGROUP_UDP6_RECVMSG: |
2017 |
+ case BPF_CGROUP_SOCK_OPS: |
2018 |
+ case BPF_CGROUP_DEVICE: |
2019 |
+ break; |
2020 |
+diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c |
2021 |
+index 950fac024fbb..4ff130ddfbf6 100644 |
2022 |
+--- a/kernel/bpf/verifier.c |
2023 |
++++ b/kernel/bpf/verifier.c |
2024 |
+@@ -5145,9 +5145,12 @@ static int check_return_code(struct bpf_verifier_env *env) |
2025 |
+ struct tnum range = tnum_range(0, 1); |
2026 |
+ |
2027 |
+ switch (env->prog->type) { |
2028 |
++ case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: |
2029 |
++ if (env->prog->expected_attach_type == BPF_CGROUP_UDP4_RECVMSG || |
2030 |
++ env->prog->expected_attach_type == BPF_CGROUP_UDP6_RECVMSG) |
2031 |
++ range = tnum_range(1, 1); |
2032 |
+ case BPF_PROG_TYPE_CGROUP_SKB: |
2033 |
+ case BPF_PROG_TYPE_CGROUP_SOCK: |
2034 |
+- case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: |
2035 |
+ case BPF_PROG_TYPE_SOCK_OPS: |
2036 |
+ case BPF_PROG_TYPE_CGROUP_DEVICE: |
2037 |
+ break; |
2038 |
+@@ -5163,16 +5166,17 @@ static int check_return_code(struct bpf_verifier_env *env) |
2039 |
+ } |
2040 |
+ |
2041 |
+ if (!tnum_in(range, reg->var_off)) { |
2042 |
++ char tn_buf[48]; |
2043 |
++ |
2044 |
+ verbose(env, "At program exit the register R0 "); |
2045 |
+ if (!tnum_is_unknown(reg->var_off)) { |
2046 |
+- char tn_buf[48]; |
2047 |
+- |
2048 |
+ tnum_strn(tn_buf, sizeof(tn_buf), reg->var_off); |
2049 |
+ verbose(env, "has value %s", tn_buf); |
2050 |
+ } else { |
2051 |
+ verbose(env, "has unknown scalar value"); |
2052 |
+ } |
2053 |
+- verbose(env, " should have been 0 or 1\n"); |
2054 |
++ tnum_strn(tn_buf, sizeof(tn_buf), range); |
2055 |
++ verbose(env, " should have been in %s\n", tn_buf); |
2056 |
+ return -EINVAL; |
2057 |
+ } |
2058 |
+ return 0; |
2059 |
+diff --git a/kernel/cpu.c b/kernel/cpu.c |
2060 |
+index 9cc8b6fdb2dc..6170034f4118 100644 |
2061 |
+--- a/kernel/cpu.c |
2062 |
++++ b/kernel/cpu.c |
2063 |
+@@ -2315,6 +2315,9 @@ static int __init mitigations_parse_cmdline(char *arg) |
2064 |
+ cpu_mitigations = CPU_MITIGATIONS_AUTO; |
2065 |
+ else if (!strcmp(arg, "auto,nosmt")) |
2066 |
+ cpu_mitigations = CPU_MITIGATIONS_AUTO_NOSMT; |
2067 |
++ else |
2068 |
++ pr_crit("Unsupported mitigations=%s, system may still be vulnerable\n", |
2069 |
++ arg); |
2070 |
+ |
2071 |
+ return 0; |
2072 |
+ } |
2073 |
+diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c |
2074 |
+index d64c00afceb5..568a0e839903 100644 |
2075 |
+--- a/kernel/trace/bpf_trace.c |
2076 |
++++ b/kernel/trace/bpf_trace.c |
2077 |
+@@ -402,8 +402,6 @@ static const struct bpf_func_proto bpf_perf_event_read_value_proto = { |
2078 |
+ .arg4_type = ARG_CONST_SIZE, |
2079 |
+ }; |
2080 |
+ |
2081 |
+-static DEFINE_PER_CPU(struct perf_sample_data, bpf_trace_sd); |
2082 |
+- |
2083 |
+ static __always_inline u64 |
2084 |
+ __bpf_perf_event_output(struct pt_regs *regs, struct bpf_map *map, |
2085 |
+ u64 flags, struct perf_sample_data *sd) |
2086 |
+@@ -434,24 +432,50 @@ __bpf_perf_event_output(struct pt_regs *regs, struct bpf_map *map, |
2087 |
+ return perf_event_output(event, sd, regs); |
2088 |
+ } |
2089 |
+ |
2090 |
++/* |
2091 |
++ * Support executing tracepoints in normal, irq, and nmi context that each call |
2092 |
++ * bpf_perf_event_output |
2093 |
++ */ |
2094 |
++struct bpf_trace_sample_data { |
2095 |
++ struct perf_sample_data sds[3]; |
2096 |
++}; |
2097 |
++ |
2098 |
++static DEFINE_PER_CPU(struct bpf_trace_sample_data, bpf_trace_sds); |
2099 |
++static DEFINE_PER_CPU(int, bpf_trace_nest_level); |
2100 |
+ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map, |
2101 |
+ u64, flags, void *, data, u64, size) |
2102 |
+ { |
2103 |
+- struct perf_sample_data *sd = this_cpu_ptr(&bpf_trace_sd); |
2104 |
++ struct bpf_trace_sample_data *sds = this_cpu_ptr(&bpf_trace_sds); |
2105 |
++ int nest_level = this_cpu_inc_return(bpf_trace_nest_level); |
2106 |
+ struct perf_raw_record raw = { |
2107 |
+ .frag = { |
2108 |
+ .size = size, |
2109 |
+ .data = data, |
2110 |
+ }, |
2111 |
+ }; |
2112 |
++ struct perf_sample_data *sd; |
2113 |
++ int err; |
2114 |
+ |
2115 |
+- if (unlikely(flags & ~(BPF_F_INDEX_MASK))) |
2116 |
+- return -EINVAL; |
2117 |
++ if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(sds->sds))) { |
2118 |
++ err = -EBUSY; |
2119 |
++ goto out; |
2120 |
++ } |
2121 |
++ |
2122 |
++ sd = &sds->sds[nest_level - 1]; |
2123 |
++ |
2124 |
++ if (unlikely(flags & ~(BPF_F_INDEX_MASK))) { |
2125 |
++ err = -EINVAL; |
2126 |
++ goto out; |
2127 |
++ } |
2128 |
+ |
2129 |
+ perf_sample_data_init(sd, 0, 0); |
2130 |
+ sd->raw = &raw; |
2131 |
+ |
2132 |
+- return __bpf_perf_event_output(regs, map, flags, sd); |
2133 |
++ err = __bpf_perf_event_output(regs, map, flags, sd); |
2134 |
++ |
2135 |
++out: |
2136 |
++ this_cpu_dec(bpf_trace_nest_level); |
2137 |
++ return err; |
2138 |
+ } |
2139 |
+ |
2140 |
+ static const struct bpf_func_proto bpf_perf_event_output_proto = { |
2141 |
+@@ -808,16 +832,48 @@ pe_prog_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) |
2142 |
+ /* |
2143 |
+ * bpf_raw_tp_regs are separate from bpf_pt_regs used from skb/xdp |
2144 |
+ * to avoid potential recursive reuse issue when/if tracepoints are added |
2145 |
+- * inside bpf_*_event_output, bpf_get_stackid and/or bpf_get_stack |
2146 |
++ * inside bpf_*_event_output, bpf_get_stackid and/or bpf_get_stack. |
2147 |
++ * |
2148 |
++ * Since raw tracepoints run despite bpf_prog_active, support concurrent usage |
2149 |
++ * in normal, irq, and nmi context. |
2150 |
+ */ |
2151 |
+-static DEFINE_PER_CPU(struct pt_regs, bpf_raw_tp_regs); |
2152 |
++struct bpf_raw_tp_regs { |
2153 |
++ struct pt_regs regs[3]; |
2154 |
++}; |
2155 |
++static DEFINE_PER_CPU(struct bpf_raw_tp_regs, bpf_raw_tp_regs); |
2156 |
++static DEFINE_PER_CPU(int, bpf_raw_tp_nest_level); |
2157 |
++static struct pt_regs *get_bpf_raw_tp_regs(void) |
2158 |
++{ |
2159 |
++ struct bpf_raw_tp_regs *tp_regs = this_cpu_ptr(&bpf_raw_tp_regs); |
2160 |
++ int nest_level = this_cpu_inc_return(bpf_raw_tp_nest_level); |
2161 |
++ |
2162 |
++ if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(tp_regs->regs))) { |
2163 |
++ this_cpu_dec(bpf_raw_tp_nest_level); |
2164 |
++ return ERR_PTR(-EBUSY); |
2165 |
++ } |
2166 |
++ |
2167 |
++ return &tp_regs->regs[nest_level - 1]; |
2168 |
++} |
2169 |
++ |
2170 |
++static void put_bpf_raw_tp_regs(void) |
2171 |
++{ |
2172 |
++ this_cpu_dec(bpf_raw_tp_nest_level); |
2173 |
++} |
2174 |
++ |
2175 |
+ BPF_CALL_5(bpf_perf_event_output_raw_tp, struct bpf_raw_tracepoint_args *, args, |
2176 |
+ struct bpf_map *, map, u64, flags, void *, data, u64, size) |
2177 |
+ { |
2178 |
+- struct pt_regs *regs = this_cpu_ptr(&bpf_raw_tp_regs); |
2179 |
++ struct pt_regs *regs = get_bpf_raw_tp_regs(); |
2180 |
++ int ret; |
2181 |
++ |
2182 |
++ if (IS_ERR(regs)) |
2183 |
++ return PTR_ERR(regs); |
2184 |
+ |
2185 |
+ perf_fetch_caller_regs(regs); |
2186 |
+- return ____bpf_perf_event_output(regs, map, flags, data, size); |
2187 |
++ ret = ____bpf_perf_event_output(regs, map, flags, data, size); |
2188 |
++ |
2189 |
++ put_bpf_raw_tp_regs(); |
2190 |
++ return ret; |
2191 |
+ } |
2192 |
+ |
2193 |
+ static const struct bpf_func_proto bpf_perf_event_output_proto_raw_tp = { |
2194 |
+@@ -834,12 +890,18 @@ static const struct bpf_func_proto bpf_perf_event_output_proto_raw_tp = { |
2195 |
+ BPF_CALL_3(bpf_get_stackid_raw_tp, struct bpf_raw_tracepoint_args *, args, |
2196 |
+ struct bpf_map *, map, u64, flags) |
2197 |
+ { |
2198 |
+- struct pt_regs *regs = this_cpu_ptr(&bpf_raw_tp_regs); |
2199 |
++ struct pt_regs *regs = get_bpf_raw_tp_regs(); |
2200 |
++ int ret; |
2201 |
++ |
2202 |
++ if (IS_ERR(regs)) |
2203 |
++ return PTR_ERR(regs); |
2204 |
+ |
2205 |
+ perf_fetch_caller_regs(regs); |
2206 |
+ /* similar to bpf_perf_event_output_tp, but pt_regs fetched differently */ |
2207 |
+- return bpf_get_stackid((unsigned long) regs, (unsigned long) map, |
2208 |
+- flags, 0, 0); |
2209 |
++ ret = bpf_get_stackid((unsigned long) regs, (unsigned long) map, |
2210 |
++ flags, 0, 0); |
2211 |
++ put_bpf_raw_tp_regs(); |
2212 |
++ return ret; |
2213 |
+ } |
2214 |
+ |
2215 |
+ static const struct bpf_func_proto bpf_get_stackid_proto_raw_tp = { |
2216 |
+@@ -854,11 +916,17 @@ static const struct bpf_func_proto bpf_get_stackid_proto_raw_tp = { |
2217 |
+ BPF_CALL_4(bpf_get_stack_raw_tp, struct bpf_raw_tracepoint_args *, args, |
2218 |
+ void *, buf, u32, size, u64, flags) |
2219 |
+ { |
2220 |
+- struct pt_regs *regs = this_cpu_ptr(&bpf_raw_tp_regs); |
2221 |
++ struct pt_regs *regs = get_bpf_raw_tp_regs(); |
2222 |
++ int ret; |
2223 |
++ |
2224 |
++ if (IS_ERR(regs)) |
2225 |
++ return PTR_ERR(regs); |
2226 |
+ |
2227 |
+ perf_fetch_caller_regs(regs); |
2228 |
+- return bpf_get_stack((unsigned long) regs, (unsigned long) buf, |
2229 |
+- (unsigned long) size, flags, 0); |
2230 |
++ ret = bpf_get_stack((unsigned long) regs, (unsigned long) buf, |
2231 |
++ (unsigned long) size, flags, 0); |
2232 |
++ put_bpf_raw_tp_regs(); |
2233 |
++ return ret; |
2234 |
+ } |
2235 |
+ |
2236 |
+ static const struct bpf_func_proto bpf_get_stack_proto_raw_tp = { |
2237 |
+diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c |
2238 |
+index 3ea65cdff30d..4ad967453b6f 100644 |
2239 |
+--- a/kernel/trace/trace_branch.c |
2240 |
++++ b/kernel/trace/trace_branch.c |
2241 |
+@@ -205,8 +205,6 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect) |
2242 |
+ void ftrace_likely_update(struct ftrace_likely_data *f, int val, |
2243 |
+ int expect, int is_constant) |
2244 |
+ { |
2245 |
+- unsigned long flags = user_access_save(); |
2246 |
+- |
2247 |
+ /* A constant is always correct */ |
2248 |
+ if (is_constant) { |
2249 |
+ f->constant++; |
2250 |
+@@ -225,8 +223,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, |
2251 |
+ f->data.correct++; |
2252 |
+ else |
2253 |
+ f->data.incorrect++; |
2254 |
+- |
2255 |
+- user_access_restore(flags); |
2256 |
+ } |
2257 |
+ EXPORT_SYMBOL(ftrace_likely_update); |
2258 |
+ |
2259 |
+diff --git a/lib/xarray.c b/lib/xarray.c |
2260 |
+index 6be3acbb861f..446b956c9188 100644 |
2261 |
+--- a/lib/xarray.c |
2262 |
++++ b/lib/xarray.c |
2263 |
+@@ -298,6 +298,8 @@ bool xas_nomem(struct xa_state *xas, gfp_t gfp) |
2264 |
+ xas_destroy(xas); |
2265 |
+ return false; |
2266 |
+ } |
2267 |
++ if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT) |
2268 |
++ gfp |= __GFP_ACCOUNT; |
2269 |
+ xas->xa_alloc = kmem_cache_alloc(radix_tree_node_cachep, gfp); |
2270 |
+ if (!xas->xa_alloc) |
2271 |
+ return false; |
2272 |
+@@ -325,6 +327,8 @@ static bool __xas_nomem(struct xa_state *xas, gfp_t gfp) |
2273 |
+ xas_destroy(xas); |
2274 |
+ return false; |
2275 |
+ } |
2276 |
++ if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT) |
2277 |
++ gfp |= __GFP_ACCOUNT; |
2278 |
+ if (gfpflags_allow_blocking(gfp)) { |
2279 |
+ xas_unlock_type(xas, lock_type); |
2280 |
+ xas->xa_alloc = kmem_cache_alloc(radix_tree_node_cachep, gfp); |
2281 |
+@@ -358,8 +362,12 @@ static void *xas_alloc(struct xa_state *xas, unsigned int shift) |
2282 |
+ if (node) { |
2283 |
+ xas->xa_alloc = NULL; |
2284 |
+ } else { |
2285 |
+- node = kmem_cache_alloc(radix_tree_node_cachep, |
2286 |
+- GFP_NOWAIT | __GFP_NOWARN); |
2287 |
++ gfp_t gfp = GFP_NOWAIT | __GFP_NOWARN; |
2288 |
++ |
2289 |
++ if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT) |
2290 |
++ gfp |= __GFP_ACCOUNT; |
2291 |
++ |
2292 |
++ node = kmem_cache_alloc(radix_tree_node_cachep, gfp); |
2293 |
+ if (!node) { |
2294 |
+ xas_set_err(xas, -ENOMEM); |
2295 |
+ return NULL; |
2296 |
+diff --git a/mm/hugetlb.c b/mm/hugetlb.c |
2297 |
+index 5b4f00be325d..ec81808830ae 100644 |
2298 |
+--- a/mm/hugetlb.c |
2299 |
++++ b/mm/hugetlb.c |
2300 |
+@@ -1491,16 +1491,29 @@ static int free_pool_huge_page(struct hstate *h, nodemask_t *nodes_allowed, |
2301 |
+ |
2302 |
+ /* |
2303 |
+ * Dissolve a given free hugepage into free buddy pages. This function does |
2304 |
+- * nothing for in-use (including surplus) hugepages. Returns -EBUSY if the |
2305 |
+- * dissolution fails because a give page is not a free hugepage, or because |
2306 |
+- * free hugepages are fully reserved. |
2307 |
++ * nothing for in-use hugepages and non-hugepages. |
2308 |
++ * This function returns values like below: |
2309 |
++ * |
2310 |
++ * -EBUSY: failed to dissolved free hugepages or the hugepage is in-use |
2311 |
++ * (allocated or reserved.) |
2312 |
++ * 0: successfully dissolved free hugepages or the page is not a |
2313 |
++ * hugepage (considered as already dissolved) |
2314 |
+ */ |
2315 |
+ int dissolve_free_huge_page(struct page *page) |
2316 |
+ { |
2317 |
+ int rc = -EBUSY; |
2318 |
+ |
2319 |
++ /* Not to disrupt normal path by vainly holding hugetlb_lock */ |
2320 |
++ if (!PageHuge(page)) |
2321 |
++ return 0; |
2322 |
++ |
2323 |
+ spin_lock(&hugetlb_lock); |
2324 |
+- if (PageHuge(page) && !page_count(page)) { |
2325 |
++ if (!PageHuge(page)) { |
2326 |
++ rc = 0; |
2327 |
++ goto out; |
2328 |
++ } |
2329 |
++ |
2330 |
++ if (!page_count(page)) { |
2331 |
+ struct page *head = compound_head(page); |
2332 |
+ struct hstate *h = page_hstate(head); |
2333 |
+ int nid = page_to_nid(head); |
2334 |
+@@ -1545,11 +1558,9 @@ int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) |
2335 |
+ |
2336 |
+ for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order) { |
2337 |
+ page = pfn_to_page(pfn); |
2338 |
+- if (PageHuge(page) && !page_count(page)) { |
2339 |
+- rc = dissolve_free_huge_page(page); |
2340 |
+- if (rc) |
2341 |
+- break; |
2342 |
+- } |
2343 |
++ rc = dissolve_free_huge_page(page); |
2344 |
++ if (rc) |
2345 |
++ break; |
2346 |
+ } |
2347 |
+ |
2348 |
+ return rc; |
2349 |
+diff --git a/mm/memory-failure.c b/mm/memory-failure.c |
2350 |
+index fc8b51744579..3a83e279cc98 100644 |
2351 |
+--- a/mm/memory-failure.c |
2352 |
++++ b/mm/memory-failure.c |
2353 |
+@@ -1733,6 +1733,8 @@ static int soft_offline_huge_page(struct page *page, int flags) |
2354 |
+ if (!ret) { |
2355 |
+ if (set_hwpoison_free_buddy_page(page)) |
2356 |
+ num_poisoned_pages_inc(); |
2357 |
++ else |
2358 |
++ ret = -EBUSY; |
2359 |
+ } |
2360 |
+ } |
2361 |
+ return ret; |
2362 |
+@@ -1857,11 +1859,8 @@ static int soft_offline_in_use_page(struct page *page, int flags) |
2363 |
+ |
2364 |
+ static int soft_offline_free_page(struct page *page) |
2365 |
+ { |
2366 |
+- int rc = 0; |
2367 |
+- struct page *head = compound_head(page); |
2368 |
++ int rc = dissolve_free_huge_page(page); |
2369 |
+ |
2370 |
+- if (PageHuge(head)) |
2371 |
+- rc = dissolve_free_huge_page(page); |
2372 |
+ if (!rc) { |
2373 |
+ if (set_hwpoison_free_buddy_page(page)) |
2374 |
+ num_poisoned_pages_inc(); |
2375 |
+diff --git a/mm/mempolicy.c b/mm/mempolicy.c |
2376 |
+index 2219e747df49..5b3bf1747c19 100644 |
2377 |
+--- a/mm/mempolicy.c |
2378 |
++++ b/mm/mempolicy.c |
2379 |
+@@ -306,7 +306,7 @@ static void mpol_rebind_nodemask(struct mempolicy *pol, const nodemask_t *nodes) |
2380 |
+ else { |
2381 |
+ nodes_remap(tmp, pol->v.nodes,pol->w.cpuset_mems_allowed, |
2382 |
+ *nodes); |
2383 |
+- pol->w.cpuset_mems_allowed = tmp; |
2384 |
++ pol->w.cpuset_mems_allowed = *nodes; |
2385 |
+ } |
2386 |
+ |
2387 |
+ if (nodes_empty(tmp)) |
2388 |
+diff --git a/mm/page_idle.c b/mm/page_idle.c |
2389 |
+index 0b39ec0c945c..295512465065 100644 |
2390 |
+--- a/mm/page_idle.c |
2391 |
++++ b/mm/page_idle.c |
2392 |
+@@ -136,7 +136,7 @@ static ssize_t page_idle_bitmap_read(struct file *file, struct kobject *kobj, |
2393 |
+ |
2394 |
+ end_pfn = pfn + count * BITS_PER_BYTE; |
2395 |
+ if (end_pfn > max_pfn) |
2396 |
+- end_pfn = ALIGN(max_pfn, BITMAP_CHUNK_BITS); |
2397 |
++ end_pfn = max_pfn; |
2398 |
+ |
2399 |
+ for (; pfn < end_pfn; pfn++) { |
2400 |
+ bit = pfn % BITMAP_CHUNK_BITS; |
2401 |
+@@ -181,7 +181,7 @@ static ssize_t page_idle_bitmap_write(struct file *file, struct kobject *kobj, |
2402 |
+ |
2403 |
+ end_pfn = pfn + count * BITS_PER_BYTE; |
2404 |
+ if (end_pfn > max_pfn) |
2405 |
+- end_pfn = ALIGN(max_pfn, BITMAP_CHUNK_BITS); |
2406 |
++ end_pfn = max_pfn; |
2407 |
+ |
2408 |
+ for (; pfn < end_pfn; pfn++) { |
2409 |
+ bit = pfn % BITMAP_CHUNK_BITS; |
2410 |
+diff --git a/mm/page_io.c b/mm/page_io.c |
2411 |
+index 2e8019d0e048..189415852077 100644 |
2412 |
+--- a/mm/page_io.c |
2413 |
++++ b/mm/page_io.c |
2414 |
+@@ -29,10 +29,9 @@ |
2415 |
+ static struct bio *get_swap_bio(gfp_t gfp_flags, |
2416 |
+ struct page *page, bio_end_io_t end_io) |
2417 |
+ { |
2418 |
+- int i, nr = hpage_nr_pages(page); |
2419 |
+ struct bio *bio; |
2420 |
+ |
2421 |
+- bio = bio_alloc(gfp_flags, nr); |
2422 |
++ bio = bio_alloc(gfp_flags, 1); |
2423 |
+ if (bio) { |
2424 |
+ struct block_device *bdev; |
2425 |
+ |
2426 |
+@@ -41,9 +40,7 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, |
2427 |
+ bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9; |
2428 |
+ bio->bi_end_io = end_io; |
2429 |
+ |
2430 |
+- for (i = 0; i < nr; i++) |
2431 |
+- bio_add_page(bio, page + i, PAGE_SIZE, 0); |
2432 |
+- VM_BUG_ON(bio->bi_iter.bi_size != PAGE_SIZE * nr); |
2433 |
++ bio_add_page(bio, page, PAGE_SIZE * hpage_nr_pages(page), 0); |
2434 |
+ } |
2435 |
+ return bio; |
2436 |
+ } |
2437 |
+diff --git a/net/core/filter.c b/net/core/filter.c |
2438 |
+index 27e61ffd9039..b76f14197128 100644 |
2439 |
+--- a/net/core/filter.c |
2440 |
++++ b/net/core/filter.c |
2441 |
+@@ -6420,6 +6420,7 @@ static bool sock_addr_is_valid_access(int off, int size, |
2442 |
+ case BPF_CGROUP_INET4_BIND: |
2443 |
+ case BPF_CGROUP_INET4_CONNECT: |
2444 |
+ case BPF_CGROUP_UDP4_SENDMSG: |
2445 |
++ case BPF_CGROUP_UDP4_RECVMSG: |
2446 |
+ break; |
2447 |
+ default: |
2448 |
+ return false; |
2449 |
+@@ -6430,6 +6431,7 @@ static bool sock_addr_is_valid_access(int off, int size, |
2450 |
+ case BPF_CGROUP_INET6_BIND: |
2451 |
+ case BPF_CGROUP_INET6_CONNECT: |
2452 |
+ case BPF_CGROUP_UDP6_SENDMSG: |
2453 |
++ case BPF_CGROUP_UDP6_RECVMSG: |
2454 |
+ break; |
2455 |
+ default: |
2456 |
+ return false; |
2457 |
+diff --git a/net/core/sock.c b/net/core/sock.c |
2458 |
+index 067878a1e4c5..30afb072eecf 100644 |
2459 |
+--- a/net/core/sock.c |
2460 |
++++ b/net/core/sock.c |
2461 |
+@@ -1482,9 +1482,6 @@ int sock_getsockopt(struct socket *sock, int level, int optname, |
2462 |
+ { |
2463 |
+ u32 meminfo[SK_MEMINFO_VARS]; |
2464 |
+ |
2465 |
+- if (get_user(len, optlen)) |
2466 |
+- return -EFAULT; |
2467 |
+- |
2468 |
+ sk_get_meminfo(sk, meminfo); |
2469 |
+ |
2470 |
+ len = min_t(unsigned int, len, sizeof(meminfo)); |
2471 |
+diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c |
2472 |
+index dc91c27bb788..3f6e95cb21b0 100644 |
2473 |
+--- a/net/ipv4/raw.c |
2474 |
++++ b/net/ipv4/raw.c |
2475 |
+@@ -201,7 +201,7 @@ static int raw_v4_input(struct sk_buff *skb, const struct iphdr *iph, int hash) |
2476 |
+ } |
2477 |
+ sk = __raw_v4_lookup(net, sk_next(sk), iph->protocol, |
2478 |
+ iph->saddr, iph->daddr, |
2479 |
+- skb->dev->ifindex, sdif); |
2480 |
++ dif, sdif); |
2481 |
+ } |
2482 |
+ out: |
2483 |
+ read_unlock(&raw_v4_hashinfo.lock); |
2484 |
+diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c |
2485 |
+index 3b179ce6170f..ee999cb5e670 100644 |
2486 |
+--- a/net/ipv4/udp.c |
2487 |
++++ b/net/ipv4/udp.c |
2488 |
+@@ -503,7 +503,11 @@ static inline struct sock *__udp4_lib_lookup_skb(struct sk_buff *skb, |
2489 |
+ struct sock *udp4_lib_lookup_skb(struct sk_buff *skb, |
2490 |
+ __be16 sport, __be16 dport) |
2491 |
+ { |
2492 |
+- return __udp4_lib_lookup_skb(skb, sport, dport, &udp_table); |
2493 |
++ const struct iphdr *iph = ip_hdr(skb); |
2494 |
++ |
2495 |
++ return __udp4_lib_lookup(dev_net(skb->dev), iph->saddr, sport, |
2496 |
++ iph->daddr, dport, inet_iif(skb), |
2497 |
++ inet_sdif(skb), &udp_table, NULL); |
2498 |
+ } |
2499 |
+ EXPORT_SYMBOL_GPL(udp4_lib_lookup_skb); |
2500 |
+ |
2501 |
+@@ -1783,6 +1787,10 @@ try_again: |
2502 |
+ sin->sin_addr.s_addr = ip_hdr(skb)->saddr; |
2503 |
+ memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); |
2504 |
+ *addr_len = sizeof(*sin); |
2505 |
++ |
2506 |
++ if (cgroup_bpf_enabled) |
2507 |
++ BPF_CGROUP_RUN_PROG_UDP4_RECVMSG_LOCK(sk, |
2508 |
++ (struct sockaddr *)sin); |
2509 |
+ } |
2510 |
+ |
2511 |
+ if (udp_sk(sk)->gro_enabled) |
2512 |
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c |
2513 |
+index 622eeaf5732b..3a01d3d2f105 100644 |
2514 |
+--- a/net/ipv6/udp.c |
2515 |
++++ b/net/ipv6/udp.c |
2516 |
+@@ -242,7 +242,7 @@ struct sock *udp6_lib_lookup_skb(struct sk_buff *skb, |
2517 |
+ |
2518 |
+ return __udp6_lib_lookup(dev_net(skb->dev), &iph->saddr, sport, |
2519 |
+ &iph->daddr, dport, inet6_iif(skb), |
2520 |
+- inet6_sdif(skb), &udp_table, skb); |
2521 |
++ inet6_sdif(skb), &udp_table, NULL); |
2522 |
+ } |
2523 |
+ EXPORT_SYMBOL_GPL(udp6_lib_lookup_skb); |
2524 |
+ |
2525 |
+@@ -370,6 +370,10 @@ try_again: |
2526 |
+ inet6_iif(skb)); |
2527 |
+ } |
2528 |
+ *addr_len = sizeof(*sin6); |
2529 |
++ |
2530 |
++ if (cgroup_bpf_enabled) |
2531 |
++ BPF_CGROUP_RUN_PROG_UDP6_RECVMSG_LOCK(sk, |
2532 |
++ (struct sockaddr *)sin6); |
2533 |
+ } |
2534 |
+ |
2535 |
+ if (udp_sk(sk)->gro_enabled) |
2536 |
+@@ -516,7 +520,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
2537 |
+ struct net *net = dev_net(skb->dev); |
2538 |
+ |
2539 |
+ sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source, |
2540 |
+- inet6_iif(skb), inet6_sdif(skb), udptable, skb); |
2541 |
++ inet6_iif(skb), inet6_sdif(skb), udptable, NULL); |
2542 |
+ if (!sk) { |
2543 |
+ /* No socket for error: try tunnels before discarding */ |
2544 |
+ sk = ERR_PTR(-ENOENT); |
2545 |
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c |
2546 |
+index 71d5544243d2..21814acb862d 100644 |
2547 |
+--- a/net/packet/af_packet.c |
2548 |
++++ b/net/packet/af_packet.c |
2549 |
+@@ -2409,6 +2409,9 @@ static void tpacket_destruct_skb(struct sk_buff *skb) |
2550 |
+ |
2551 |
+ ts = __packet_set_timestamp(po, ph, skb); |
2552 |
+ __packet_set_status(po, ph, TP_STATUS_AVAILABLE | ts); |
2553 |
++ |
2554 |
++ if (!packet_read_pending(&po->tx_ring)) |
2555 |
++ complete(&po->skb_completion); |
2556 |
+ } |
2557 |
+ |
2558 |
+ sock_wfree(skb); |
2559 |
+@@ -2593,7 +2596,7 @@ static int tpacket_parse_header(struct packet_sock *po, void *frame, |
2560 |
+ |
2561 |
+ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) |
2562 |
+ { |
2563 |
+- struct sk_buff *skb; |
2564 |
++ struct sk_buff *skb = NULL; |
2565 |
+ struct net_device *dev; |
2566 |
+ struct virtio_net_hdr *vnet_hdr = NULL; |
2567 |
+ struct sockcm_cookie sockc; |
2568 |
+@@ -2608,6 +2611,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) |
2569 |
+ int len_sum = 0; |
2570 |
+ int status = TP_STATUS_AVAILABLE; |
2571 |
+ int hlen, tlen, copylen = 0; |
2572 |
++ long timeo = 0; |
2573 |
+ |
2574 |
+ mutex_lock(&po->pg_vec_lock); |
2575 |
+ |
2576 |
+@@ -2654,12 +2658,21 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) |
2577 |
+ if ((size_max > dev->mtu + reserve + VLAN_HLEN) && !po->has_vnet_hdr) |
2578 |
+ size_max = dev->mtu + reserve + VLAN_HLEN; |
2579 |
+ |
2580 |
++ reinit_completion(&po->skb_completion); |
2581 |
++ |
2582 |
+ do { |
2583 |
+ ph = packet_current_frame(po, &po->tx_ring, |
2584 |
+ TP_STATUS_SEND_REQUEST); |
2585 |
+ if (unlikely(ph == NULL)) { |
2586 |
+- if (need_wait && need_resched()) |
2587 |
+- schedule(); |
2588 |
++ if (need_wait && skb) { |
2589 |
++ timeo = sock_sndtimeo(&po->sk, msg->msg_flags & MSG_DONTWAIT); |
2590 |
++ timeo = wait_for_completion_interruptible_timeout(&po->skb_completion, timeo); |
2591 |
++ if (timeo <= 0) { |
2592 |
++ err = !timeo ? -ETIMEDOUT : -ERESTARTSYS; |
2593 |
++ goto out_put; |
2594 |
++ } |
2595 |
++ } |
2596 |
++ /* check for additional frames */ |
2597 |
+ continue; |
2598 |
+ } |
2599 |
+ |
2600 |
+@@ -3215,6 +3228,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol, |
2601 |
+ sock_init_data(sock, sk); |
2602 |
+ |
2603 |
+ po = pkt_sk(sk); |
2604 |
++ init_completion(&po->skb_completion); |
2605 |
+ sk->sk_family = PF_PACKET; |
2606 |
+ po->num = proto; |
2607 |
+ po->xmit = dev_queue_xmit; |
2608 |
+@@ -4327,7 +4341,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, |
2609 |
+ req3->tp_sizeof_priv || |
2610 |
+ req3->tp_feature_req_word) { |
2611 |
+ err = -EINVAL; |
2612 |
+- goto out; |
2613 |
++ goto out_free_pg_vec; |
2614 |
+ } |
2615 |
+ } |
2616 |
+ break; |
2617 |
+@@ -4391,6 +4405,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, |
2618 |
+ prb_shutdown_retire_blk_timer(po, rb_queue); |
2619 |
+ } |
2620 |
+ |
2621 |
++out_free_pg_vec: |
2622 |
+ if (pg_vec) |
2623 |
+ free_pg_vec(pg_vec, order, req->tp_block_nr); |
2624 |
+ out: |
2625 |
+diff --git a/net/packet/internal.h b/net/packet/internal.h |
2626 |
+index 3bb7c5fb3bff..c70a2794456f 100644 |
2627 |
+--- a/net/packet/internal.h |
2628 |
++++ b/net/packet/internal.h |
2629 |
+@@ -128,6 +128,7 @@ struct packet_sock { |
2630 |
+ unsigned int tp_hdrlen; |
2631 |
+ unsigned int tp_reserve; |
2632 |
+ unsigned int tp_tstamp; |
2633 |
++ struct completion skb_completion; |
2634 |
+ struct net_device __rcu *cached_dev; |
2635 |
+ int (*xmit)(struct sk_buff *skb); |
2636 |
+ struct packet_type prot_hook ____cacheline_aligned_in_smp; |
2637 |
+diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c |
2638 |
+index 0448b68fce74..bcfc81ee153d 100644 |
2639 |
+--- a/net/sctp/endpointola.c |
2640 |
++++ b/net/sctp/endpointola.c |
2641 |
+@@ -133,10 +133,6 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, |
2642 |
+ /* Initialize the bind addr area */ |
2643 |
+ sctp_bind_addr_init(&ep->base.bind_addr, 0); |
2644 |
+ |
2645 |
+- /* Remember who we are attached to. */ |
2646 |
+- ep->base.sk = sk; |
2647 |
+- sock_hold(ep->base.sk); |
2648 |
+- |
2649 |
+ /* Create the lists of associations. */ |
2650 |
+ INIT_LIST_HEAD(&ep->asocs); |
2651 |
+ |
2652 |
+@@ -169,6 +165,10 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, |
2653 |
+ ep->prsctp_enable = net->sctp.prsctp_enable; |
2654 |
+ ep->reconf_enable = net->sctp.reconf_enable; |
2655 |
+ |
2656 |
++ /* Remember who we are attached to. */ |
2657 |
++ ep->base.sk = sk; |
2658 |
++ sock_hold(ep->base.sk); |
2659 |
++ |
2660 |
+ return ep; |
2661 |
+ |
2662 |
+ nomem_shkey: |
2663 |
+diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c |
2664 |
+index 732d4b57411a..a437ee8ae482 100644 |
2665 |
+--- a/net/sunrpc/xprtsock.c |
2666 |
++++ b/net/sunrpc/xprtsock.c |
2667 |
+@@ -950,6 +950,8 @@ static int xs_local_send_request(struct rpc_rqst *req) |
2668 |
+ struct sock_xprt *transport = |
2669 |
+ container_of(xprt, struct sock_xprt, xprt); |
2670 |
+ struct xdr_buf *xdr = &req->rq_snd_buf; |
2671 |
++ rpc_fraghdr rm = xs_stream_record_marker(xdr); |
2672 |
++ unsigned int msglen = rm ? req->rq_slen + sizeof(rm) : req->rq_slen; |
2673 |
+ int status; |
2674 |
+ int sent = 0; |
2675 |
+ |
2676 |
+@@ -964,9 +966,7 @@ static int xs_local_send_request(struct rpc_rqst *req) |
2677 |
+ |
2678 |
+ req->rq_xtime = ktime_get(); |
2679 |
+ status = xs_sendpages(transport->sock, NULL, 0, xdr, |
2680 |
+- transport->xmit.offset, |
2681 |
+- xs_stream_record_marker(xdr), |
2682 |
+- &sent); |
2683 |
++ transport->xmit.offset, rm, &sent); |
2684 |
+ dprintk("RPC: %s(%u) = %d\n", |
2685 |
+ __func__, xdr->len - transport->xmit.offset, status); |
2686 |
+ |
2687 |
+@@ -976,7 +976,7 @@ static int xs_local_send_request(struct rpc_rqst *req) |
2688 |
+ if (likely(sent > 0) || status == 0) { |
2689 |
+ transport->xmit.offset += sent; |
2690 |
+ req->rq_bytes_sent = transport->xmit.offset; |
2691 |
+- if (likely(req->rq_bytes_sent >= req->rq_slen)) { |
2692 |
++ if (likely(req->rq_bytes_sent >= msglen)) { |
2693 |
+ req->rq_xmit_bytes_sent += transport->xmit.offset; |
2694 |
+ transport->xmit.offset = 0; |
2695 |
+ return 0; |
2696 |
+@@ -1097,6 +1097,8 @@ static int xs_tcp_send_request(struct rpc_rqst *req) |
2697 |
+ struct rpc_xprt *xprt = req->rq_xprt; |
2698 |
+ struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); |
2699 |
+ struct xdr_buf *xdr = &req->rq_snd_buf; |
2700 |
++ rpc_fraghdr rm = xs_stream_record_marker(xdr); |
2701 |
++ unsigned int msglen = rm ? req->rq_slen + sizeof(rm) : req->rq_slen; |
2702 |
+ bool vm_wait = false; |
2703 |
+ int status; |
2704 |
+ int sent; |
2705 |
+@@ -1122,9 +1124,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) |
2706 |
+ while (1) { |
2707 |
+ sent = 0; |
2708 |
+ status = xs_sendpages(transport->sock, NULL, 0, xdr, |
2709 |
+- transport->xmit.offset, |
2710 |
+- xs_stream_record_marker(xdr), |
2711 |
+- &sent); |
2712 |
++ transport->xmit.offset, rm, &sent); |
2713 |
+ |
2714 |
+ dprintk("RPC: xs_tcp_send_request(%u) = %d\n", |
2715 |
+ xdr->len - transport->xmit.offset, status); |
2716 |
+@@ -1133,7 +1133,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) |
2717 |
+ * reset the count of bytes sent. */ |
2718 |
+ transport->xmit.offset += sent; |
2719 |
+ req->rq_bytes_sent = transport->xmit.offset; |
2720 |
+- if (likely(req->rq_bytes_sent >= req->rq_slen)) { |
2721 |
++ if (likely(req->rq_bytes_sent >= msglen)) { |
2722 |
+ req->rq_xmit_bytes_sent += transport->xmit.offset; |
2723 |
+ transport->xmit.offset = 0; |
2724 |
+ return 0; |
2725 |
+diff --git a/net/tipc/core.c b/net/tipc/core.c |
2726 |
+index 3ecca3b88bf8..eb0f701f9bf1 100644 |
2727 |
+--- a/net/tipc/core.c |
2728 |
++++ b/net/tipc/core.c |
2729 |
+@@ -132,7 +132,7 @@ static int __init tipc_init(void) |
2730 |
+ if (err) |
2731 |
+ goto out_sysctl; |
2732 |
+ |
2733 |
+- err = register_pernet_subsys(&tipc_net_ops); |
2734 |
++ err = register_pernet_device(&tipc_net_ops); |
2735 |
+ if (err) |
2736 |
+ goto out_pernet; |
2737 |
+ |
2738 |
+@@ -140,7 +140,7 @@ static int __init tipc_init(void) |
2739 |
+ if (err) |
2740 |
+ goto out_socket; |
2741 |
+ |
2742 |
+- err = register_pernet_subsys(&tipc_topsrv_net_ops); |
2743 |
++ err = register_pernet_device(&tipc_topsrv_net_ops); |
2744 |
+ if (err) |
2745 |
+ goto out_pernet_topsrv; |
2746 |
+ |
2747 |
+@@ -151,11 +151,11 @@ static int __init tipc_init(void) |
2748 |
+ pr_info("Started in single node mode\n"); |
2749 |
+ return 0; |
2750 |
+ out_bearer: |
2751 |
+- unregister_pernet_subsys(&tipc_topsrv_net_ops); |
2752 |
++ unregister_pernet_device(&tipc_topsrv_net_ops); |
2753 |
+ out_pernet_topsrv: |
2754 |
+ tipc_socket_stop(); |
2755 |
+ out_socket: |
2756 |
+- unregister_pernet_subsys(&tipc_net_ops); |
2757 |
++ unregister_pernet_device(&tipc_net_ops); |
2758 |
+ out_pernet: |
2759 |
+ tipc_unregister_sysctl(); |
2760 |
+ out_sysctl: |
2761 |
+@@ -170,9 +170,9 @@ out_netlink: |
2762 |
+ static void __exit tipc_exit(void) |
2763 |
+ { |
2764 |
+ tipc_bearer_cleanup(); |
2765 |
+- unregister_pernet_subsys(&tipc_topsrv_net_ops); |
2766 |
++ unregister_pernet_device(&tipc_topsrv_net_ops); |
2767 |
+ tipc_socket_stop(); |
2768 |
+- unregister_pernet_subsys(&tipc_net_ops); |
2769 |
++ unregister_pernet_device(&tipc_net_ops); |
2770 |
+ tipc_netlink_stop(); |
2771 |
+ tipc_netlink_compat_stop(); |
2772 |
+ tipc_unregister_sysctl(); |
2773 |
+diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c |
2774 |
+index 340a6e7c43a7..8836aebd6180 100644 |
2775 |
+--- a/net/tipc/netlink_compat.c |
2776 |
++++ b/net/tipc/netlink_compat.c |
2777 |
+@@ -445,7 +445,11 @@ static int tipc_nl_compat_bearer_disable(struct tipc_nl_compat_cmd_doit *cmd, |
2778 |
+ if (!bearer) |
2779 |
+ return -EMSGSIZE; |
2780 |
+ |
2781 |
+- len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_BEARER_NAME); |
2782 |
++ len = TLV_GET_DATA_LEN(msg->req); |
2783 |
++ if (len <= 0) |
2784 |
++ return -EINVAL; |
2785 |
++ |
2786 |
++ len = min_t(int, len, TIPC_MAX_BEARER_NAME); |
2787 |
+ if (!string_is_valid(name, len)) |
2788 |
+ return -EINVAL; |
2789 |
+ |
2790 |
+@@ -537,7 +541,11 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg, |
2791 |
+ |
2792 |
+ name = (char *)TLV_DATA(msg->req); |
2793 |
+ |
2794 |
+- len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_LINK_NAME); |
2795 |
++ len = TLV_GET_DATA_LEN(msg->req); |
2796 |
++ if (len <= 0) |
2797 |
++ return -EINVAL; |
2798 |
++ |
2799 |
++ len = min_t(int, len, TIPC_MAX_BEARER_NAME); |
2800 |
+ if (!string_is_valid(name, len)) |
2801 |
+ return -EINVAL; |
2802 |
+ |
2803 |
+@@ -815,7 +823,11 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit *cmd, |
2804 |
+ if (!link) |
2805 |
+ return -EMSGSIZE; |
2806 |
+ |
2807 |
+- len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_LINK_NAME); |
2808 |
++ len = TLV_GET_DATA_LEN(msg->req); |
2809 |
++ if (len <= 0) |
2810 |
++ return -EINVAL; |
2811 |
++ |
2812 |
++ len = min_t(int, len, TIPC_MAX_BEARER_NAME); |
2813 |
+ if (!string_is_valid(name, len)) |
2814 |
+ return -EINVAL; |
2815 |
+ |
2816 |
+diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c |
2817 |
+index 4d85d71f16e2..c86f136e5962 100644 |
2818 |
+--- a/net/tipc/udp_media.c |
2819 |
++++ b/net/tipc/udp_media.c |
2820 |
+@@ -176,7 +176,6 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, |
2821 |
+ goto tx_error; |
2822 |
+ } |
2823 |
+ |
2824 |
+- skb->dev = rt->dst.dev; |
2825 |
+ ttl = ip4_dst_hoplimit(&rt->dst); |
2826 |
+ udp_tunnel_xmit_skb(rt, ub->ubsock->sk, skb, src->ipv4.s_addr, |
2827 |
+ dst->ipv4.s_addr, 0, ttl, 0, src->port, |
2828 |
+@@ -195,10 +194,9 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb, |
2829 |
+ if (err) |
2830 |
+ goto tx_error; |
2831 |
+ ttl = ip6_dst_hoplimit(ndst); |
2832 |
+- err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, |
2833 |
+- ndst->dev, &src->ipv6, |
2834 |
+- &dst->ipv6, 0, ttl, 0, src->port, |
2835 |
+- dst->port, false); |
2836 |
++ err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, NULL, |
2837 |
++ &src->ipv6, &dst->ipv6, 0, ttl, 0, |
2838 |
++ src->port, dst->port, false); |
2839 |
+ #endif |
2840 |
+ } |
2841 |
+ return err; |
2842 |
+diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c |
2843 |
+index 478603f43964..f4f632824247 100644 |
2844 |
+--- a/net/tls/tls_main.c |
2845 |
++++ b/net/tls/tls_main.c |
2846 |
+@@ -279,7 +279,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) |
2847 |
+ goto skip_tx_cleanup; |
2848 |
+ } |
2849 |
+ |
2850 |
+- if (!tls_complete_pending_work(sk, ctx, 0, &timeo)) |
2851 |
++ if (unlikely(sk->sk_write_pending) && |
2852 |
++ !wait_on_pending_writer(sk, &timeo)) |
2853 |
+ tls_handle_open_record(sk, 0); |
2854 |
+ |
2855 |
+ /* We need these for tls_sw_fallback handling of other packets */ |
2856 |
+diff --git a/tools/testing/selftests/bpf/test_lpm_map.c b/tools/testing/selftests/bpf/test_lpm_map.c |
2857 |
+index 02d7c871862a..006be3963977 100644 |
2858 |
+--- a/tools/testing/selftests/bpf/test_lpm_map.c |
2859 |
++++ b/tools/testing/selftests/bpf/test_lpm_map.c |
2860 |
+@@ -573,13 +573,13 @@ static void test_lpm_get_next_key(void) |
2861 |
+ |
2862 |
+ /* add one more element (total two) */ |
2863 |
+ key_p->prefixlen = 24; |
2864 |
+- inet_pton(AF_INET, "192.168.0.0", key_p->data); |
2865 |
++ inet_pton(AF_INET, "192.168.128.0", key_p->data); |
2866 |
+ assert(bpf_map_update_elem(map_fd, key_p, &value, 0) == 0); |
2867 |
+ |
2868 |
+ memset(key_p, 0, key_size); |
2869 |
+ assert(bpf_map_get_next_key(map_fd, NULL, key_p) == 0); |
2870 |
+ assert(key_p->prefixlen == 24 && key_p->data[0] == 192 && |
2871 |
+- key_p->data[1] == 168 && key_p->data[2] == 0); |
2872 |
++ key_p->data[1] == 168 && key_p->data[2] == 128); |
2873 |
+ |
2874 |
+ memset(next_key_p, 0, key_size); |
2875 |
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == 0); |
2876 |
+@@ -592,7 +592,7 @@ static void test_lpm_get_next_key(void) |
2877 |
+ |
2878 |
+ /* Add one more element (total three) */ |
2879 |
+ key_p->prefixlen = 24; |
2880 |
+- inet_pton(AF_INET, "192.168.128.0", key_p->data); |
2881 |
++ inet_pton(AF_INET, "192.168.0.0", key_p->data); |
2882 |
+ assert(bpf_map_update_elem(map_fd, key_p, &value, 0) == 0); |
2883 |
+ |
2884 |
+ memset(key_p, 0, key_size); |
2885 |
+@@ -643,6 +643,41 @@ static void test_lpm_get_next_key(void) |
2886 |
+ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 && |
2887 |
+ errno == ENOENT); |
2888 |
+ |
2889 |
++ /* Add one more element (total five) */ |
2890 |
++ key_p->prefixlen = 28; |
2891 |
++ inet_pton(AF_INET, "192.168.1.128", key_p->data); |
2892 |
++ assert(bpf_map_update_elem(map_fd, key_p, &value, 0) == 0); |
2893 |
++ |
2894 |
++ memset(key_p, 0, key_size); |
2895 |
++ assert(bpf_map_get_next_key(map_fd, NULL, key_p) == 0); |
2896 |
++ assert(key_p->prefixlen == 24 && key_p->data[0] == 192 && |
2897 |
++ key_p->data[1] == 168 && key_p->data[2] == 0); |
2898 |
++ |
2899 |
++ memset(next_key_p, 0, key_size); |
2900 |
++ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == 0); |
2901 |
++ assert(next_key_p->prefixlen == 28 && next_key_p->data[0] == 192 && |
2902 |
++ next_key_p->data[1] == 168 && next_key_p->data[2] == 1 && |
2903 |
++ next_key_p->data[3] == 128); |
2904 |
++ |
2905 |
++ memcpy(key_p, next_key_p, key_size); |
2906 |
++ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == 0); |
2907 |
++ assert(next_key_p->prefixlen == 24 && next_key_p->data[0] == 192 && |
2908 |
++ next_key_p->data[1] == 168 && next_key_p->data[2] == 1); |
2909 |
++ |
2910 |
++ memcpy(key_p, next_key_p, key_size); |
2911 |
++ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == 0); |
2912 |
++ assert(next_key_p->prefixlen == 24 && next_key_p->data[0] == 192 && |
2913 |
++ next_key_p->data[1] == 168 && next_key_p->data[2] == 128); |
2914 |
++ |
2915 |
++ memcpy(key_p, next_key_p, key_size); |
2916 |
++ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == 0); |
2917 |
++ assert(next_key_p->prefixlen == 16 && next_key_p->data[0] == 192 && |
2918 |
++ next_key_p->data[1] == 168); |
2919 |
++ |
2920 |
++ memcpy(key_p, next_key_p, key_size); |
2921 |
++ assert(bpf_map_get_next_key(map_fd, key_p, next_key_p) == -1 && |
2922 |
++ errno == ENOENT); |
2923 |
++ |
2924 |
+ /* no exact matching key should return the first one in post order */ |
2925 |
+ key_p->prefixlen = 22; |
2926 |
+ inet_pton(AF_INET, "192.168.1.0", key_p->data); |