5.4.153-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/52 Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
In reply to Greg Kroah-HartmanFrom: Ben Hutchings <[email protected]>
commit 4d1aa9112c8e6995ef2c8a76972c9671332ccfea upstream.
This reverts commit cb9c1cfc86926d0e86d19c8e34f6c23458cd3478 for USB_LED_TRIG. This config symbol has bool type and enables extra code in usb_common itself, not a separate driver. Enabling it should not force usb_common to be built-in!
--- drivers/usb/common/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/common/Kconfig +1 -2
@@ -6,8 +6,7 @@ config USB_COMMON config USB_LED_TRIG bool "USB LED Triggers" - depends on LEDS_CLASS && LEDS_TRIGGERS - select USB_COMMON + depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS help This option adds LED triggers for USB host and/or gadget activity.
Greg Kroah-Hartman
maintainerPATCH 10/52 xen/balloon: fix cancelled balloon action
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 319933a80fd4f07122466a77f93e5019d71be74c upstream.
In case a ballooning action is cancelled the new kernel thread handling the ballooning might end up in a busy loop.
Fix that by handling the cancelled action gracefully.
While at it introduce a short wait for the BP_WAIT case.
--- drivers/xen/balloon.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/xen/balloon.c +15 -6
@@ -508,12 +508,12 @@ static enum bp_state decrease_reservatio }/* -* Stop waiting if either state is not BP_EAGAIN and ballooning action is -* needed, or if the credit has changed while state is BP_EAGAIN. +* Stop waiting if either state is BP_DONE and ballooning action is +* needed, or if the credit has changed while state is not BP_DONE. */ static bool balloon_thread_cond (enum bp_state state,long credit) { -if (state !=BP_EAGAIN ) +if (state ==BP_DONE ) credit =0 ;return current_credit () != credit ||kthread_should_stop ();
@@ -533,10 +533,19 @@ static int balloon_thread(void *unused)set_freezable ();for (;;) { -if (state ==BP_EAGAIN ) - timeout = balloon_stats.schedule_delay *HZ ; -else +switch (state) { +case BP_DONE : +case BP_ECANCELED : timeout =3600 *HZ ; +break ; +case BP_EAGAIN : + timeout = balloon_stats.schedule_delay *HZ ; +break ; +case BP_WAIT : + timeout =HZ ; +break ; + } + credit =current_credit (); wait_event_freezable_timeout(balloon_thread_wq,
Greg Kroah-Hartman
maintainerPATCH 12/52 ARM: dts: qcom: apq8064: use compatible which contains chipid
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
commit f5c03f131dae3f06d08464e6157dd461200f78d9 upstream.
Also resolves these kernel warnings for APQ8064:
adreno 4300000.adreno-3xx: Using legacy qcom,chipid binding! adreno 4300000.adreno-3xx: Use compatible qcom,adreno-320.2 instead.
Tested on Nexus 7 2013, no functional changes.
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +1 -2
@@ -1147,7 +1147,7 @@ }; gpu: adreno-3xx@4300000 { - compatible = "qcom,adreno-3xx"; + compatible = "qcom,adreno-320.2", "qcom,adreno"; reg = <0x04300000 0x20000>; reg-names = "kgsl_3d0_reg_memory"; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
@@ -1162,7 +1162,6 @@ <&mmcc GFX3D_AHB_CLK>, <&mmcc GFX3D_AXI_CLK>, <&mmcc MMSS_IMEM_AHB_CLK>; - qcom,chipid = <0x03020002>; iommus = <&gfx3d 0 &gfx3d 1
Greg Kroah-Hartman
maintainerPATCH 11/52 ARM: dts: omap3430-sdp: Fix NAND device node
In reply to Greg Kroah-HartmanFrom: Roger Quadros <[email protected]>
commit 80d680fdccba214e8106dc1aa33de5207ad75394 upstream.
Nand is on CS1 so reg properties first field should be 1 not 0.
--- arch/arm/boot/dts/omap3430-sdp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3430-sdp.dts +1 -1
@@ -101,7 +101,7 @@ nand@1,0 { compatible = "ti,omap2-nand"; - reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + reg = <1 0 4>; /* CS1, offset 0, IO size 4 */ interrupt-parent = <&gpmc>; interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */ <1 IRQ_TYPE_NONE>; /* termcount */
Greg Kroah-Hartman
maintainerPATCH 15/52 soc: qcom: socinfo: Fixed argument passed to platform_set_data()
In reply to Greg Kroah-HartmanFrom: Antonio Martorana <[email protected]>
[ Upstream commit 9c5a4ec69bbf5951f84ada9e0db9c6c50de61808 ]
Set qcom_socinfo pointer as data being stored instead of pointer to soc_device structure. Aligns with future calls to platform_get_data() which expects qcom_socinfo pointer.
--- drivers/soc/qcom/socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/socinfo.c +1 -1
@@ -447,7 +447,7 @@ static int qcom_socinfo_probe(struct platform_device *pdev)/* Feed the soc specific unique data into entropy pool */ add_device_randomness (info, item_size); -platform_set_drvdata (pdev, qs->soc_dev); +platform_set_drvdata (pdev, qs);return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 14/52 bpf, mips: Validate conditional branch offsets
In reply to Greg Kroah-HartmanFrom: Piotr Krysiuk <[email protected]>
commit 37cb28ec7d3a36a5bace7063a3dba633ab110f8b upstream.
The conditional branch instructions on MIPS use 18-bit signed offsets allowing for a branch range of 128 KBytes (backward and forward). However, this limit is not observed by the cBPF JIT compiler, and so the JIT compiler emits out-of-range branches when translating certain cBPF programs. A specific example of such a cBPF program is included in the "BPF_MAXINSNS: exec all MSH" test from lib/test_bpf.c that executes anomalous machine code containing incorrect branch offsets under JIT.
Furthermore, this issue can be abused to craft undesirable machine code, where the control flow is hijacked to execute arbitrary Kernel code.
The following steps can be used to reproduce the issue:
# echo 1 > /proc/sys/net/core/bpf_jit_enable # modprobe test_bpf test_name="BPF_MAXINSNS: exec all MSH"
This should produce multiple warnings from build_bimm() similar to:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 209 at arch/mips/mm/uasm-mips.c:210 build_insn+0x558/0x590
Micro-assembler field overflow
Modules linked in: test_bpf(+)
CPU: 0 PID: 209 Comm: modprobe Not tainted 5.14.3 #1
Stack : 00000000 807bb824 82b33c9c 801843c0 00000000 00000004 00000000 63c9b5ee
82b33af4 80999898 80910000 80900000 82fd6030 00000001 82b33a98 82087180
00000000 00000000 80873b28 00000000 000000fc 82b3394c 00000000 2e34312e
6d6d6f43 809a180f 809a1836 6f6d203a 80900000 00000001 82b33bac 80900000
00027f80 00000000 00000000 807bb824 00000000 804ed790 001cc317 00000001
[...]
Call Trace:
[<80108f44>] show_stack+0x38/0x118
[<807a7aac>] dump_stack_lvl+0x5c/0x7c
[<807a4b3c>] __warn+0xcc/0x140
[<807a4c3c>] warn_slowpath_fmt+0x8c/0xb8
[<8011e198>] build_insn+0x558/0x590
[<8011e358>] uasm_i_bne+0x20/0x2c
[<80127b48>] build_body+0xa58/0x2a94
[<80129c98>] bpf_jit_compile+0x114/0x1e4
[<80613fc4>] bpf_prepare_filter+0x2ec/0x4e4
[<8061423c>] bpf_prog_create+0x80/0xc4
[<c0a006e4>] test_bpf_init+0x300/0xba8 [test_bpf]
[<8010051c>] do_one_initcall+0x50/0x1d4
[<801c5e54>] do_init_module+0x60/0x220
[<801c8b20>] sys_finit_module+0xc4/0xfc
[<801144d0>] syscall_common+0x34/0x58
[...]
---[ end trace a287d9742503c645 ]---Then the anomalous machine code executes:
=> 0xc0a18000: addiu sp,sp,-16 0xc0a18004: sw s3,0(sp) 0xc0a18008: sw s4,4(sp) 0xc0a1800c: sw s5,8(sp) 0xc0a18010: sw ra,12(sp) 0xc0a18014: move s5,a0 0xc0a18018: move s4,zero 0xc0a1801c: move s3,zero
# __BPF_STMT(BPF_LDX | BPF_B | BPF_MSH, 0) 0xc0a18020: lui t6,0x8012 0xc0a18024: ori t4,t6,0x9e14 0xc0a18028: li a1,0 0xc0a1802c: jalr t4 0xc0a18030: move a0,s5 0xc0a18034: bnez v0,0xc0a1ffb8 # incorrect branch offset 0xc0a18038: move v0,zero 0xc0a1803c: andi s4,s3,0xf 0xc0a18040: b 0xc0a18048 0xc0a18044: sll s4,s4,0x2
[...]
# __BPF_STMT(BPF_LDX | BPF_B | BPF_MSH, 0) 0xc0a1ffa0: lui t6,0x8012 0xc0a1ffa4: ori t4,t6,0x9e14 0xc0a1ffa8: li a1,0 0xc0a1ffac: jalr t4 0xc0a1ffb0: move a0,s5 0xc0a1ffb4: bnez v0,0xc0a1ffb8 # incorrect branch offset 0xc0a1ffb8: move v0,zero 0xc0a1ffbc: andi s4,s3,0xf 0xc0a1ffc0: b 0xc0a1ffc8 0xc0a1ffc4: sll s4,s4,0x2
# __BPF_STMT(BPF_LDX | BPF_B | BPF_MSH, 0) 0xc0a1ffc8: lui t6,0x8012 0xc0a1ffcc: ori t4,t6,0x9e14 0xc0a1ffd0: li a1,0 0xc0a1ffd4: jalr t4 0xc0a1ffd8: move a0,s5 0xc0a1ffdc: bnez v0,0xc0a3ffb8 # correct branch offset 0xc0a1ffe0: move v0,zero 0xc0a1ffe4: andi s4,s3,0xf 0xc0a1ffe8: b 0xc0a1fff0 0xc0a1ffec: sll s4,s4,0x2
[...]
# epilogue 0xc0a3ffb8: lw s3,0(sp) 0xc0a3ffbc: lw s4,4(sp) 0xc0a3ffc0: lw s5,8(sp) 0xc0a3ffc4: lw ra,12(sp) 0xc0a3ffc8: addiu sp,sp,16 0xc0a3ffcc: jr ra 0xc0a3ffd0: nop
To mitigate this issue, we assert the branch ranges for each emit call that could generate an out-of-range branch.
--- arch/mips/net/bpf_jit.c | 57 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-)
arch/mips/net/bpf_jit.c +43 -14
@@ -662,6 +662,11 @@ static void build_epilogue(struct jit_ct ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative : func) : \ func##_positive) +static bool is_bad_offset (int b_off) +{ +return b_off >0x1ffff || b_off <-0x20000 ; +} +static int build_body (struct jit_ctx *ctx) {const struct bpf_prog *prog = ctx->skf;
@@ -728,7 +733,10 @@ load_common:/* Load return register on DS for failures */ emit_reg_move (r_ret, r_zero, ctx);/* Return with error */ -emit_b (b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_b (b_off, ctx);emit_nop (ctx);break ;case BPF_LD |BPF_W |BPF_IND :
@@ -775,8 +783,10 @@ load_ind:emit_jalr (MIPS_R_RA , r_s0, ctx);emit_reg_move (MIPS_R_A0 , r_skb, ctx);/* delay slot */ /* Check the error value */ -emit_bcond (MIPS_COND_NE , r_ret,0 , -b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_bcond (MIPS_COND_NE , r_ret,0 , b_off, ctx);emit_reg_move (r_ret, r_zero, ctx);/* We are good */ /* X <- P[1:K] & 0xf */
@@ -855,8 +865,10 @@ load_ind:/* A /= X */ ctx->flags |=SEEN_X |SEEN_A ;/* Check if r_X is zero */ -emit_bcond (MIPS_COND_EQ , r_X, r_zero, -b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_bcond (MIPS_COND_EQ , r_X, r_zero, b_off, ctx);emit_load_imm (r_ret,0 , ctx);/* delay slot */ emit_div (r_A, r_X, ctx);break ;
@@ -864,8 +876,10 @@ load_ind:/* A %= X */ ctx->flags |=SEEN_X |SEEN_A ;/* Check if r_X is zero */ -emit_bcond (MIPS_COND_EQ , r_X, r_zero, -b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_bcond (MIPS_COND_EQ , r_X, r_zero, b_off, ctx);emit_load_imm (r_ret,0 , ctx);/* delay slot */ emit_mod (r_A, r_X, ctx);break ;
@@ -926,7 +940,10 @@ load_ind:break ;case BPF_JMP |BPF_JA :/* pc += K */ -emit_b (b_imm (i + k +1 , ctx), ctx); + b_off =b_imm (i + k +1 , ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_b (b_off, ctx);emit_nop (ctx);break ;case BPF_JMP |BPF_JEQ |BPF_K :
@@ -1056,12 +1073,16 @@ jmp_cmp:break ;case BPF_RET |BPF_A : ctx->flags |=SEEN_A ; -if (i != prog->len -1 ) +if (i != prog->len -1 ) {/* * If this is not the last instruction * then jump to the epilogue */ -emit_b (b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_b (b_off, ctx); + }emit_reg_move (r_ret, r_A, ctx);/* delay slot */ break ;case BPF_RET |BPF_K :
@@ -1075,7 +1096,10 @@ jmp_cmp:* If this is not the last instruction * then jump to the epilogue */ -emit_b (b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_b (b_off, ctx);emit_nop (ctx); }break ;
@@ -1133,8 +1157,10 @@ jmp_cmp:/* Load *dev pointer */ emit_load_ptr (r_s0, r_skb, off, ctx);/* error (0) in the delay slot */ -emit_bcond (MIPS_COND_EQ , r_s0, r_zero, -b_imm (prog->len, ctx), ctx); + b_off =b_imm (prog->len, ctx); +if (is_bad_offset (b_off)) +return -E2BIG ; +emit_bcond (MIPS_COND_EQ , r_s0, r_zero, b_off, ctx);emit_reg_move (r_ret, r_zero, ctx);if (code == (BPF_ANC |SKF_AD_IFINDEX )) { BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4);
@@ -1244,7 +1270,10 @@ void bpf_jit_compile(struct bpf_prog *fp/* Generate the actual JIT code */ build_prologue (&ctx); -build_body (&ctx); +if (build_body (&ctx)) { +module_memfree (ctx.target); + goto out; + }build_epilogue (&ctx);/* Update the icache */
Greg Kroah-Hartman
maintainerPATCH 13/52 MIPS: BPF: Restore MIPS32 cBPF JIT
In reply to Greg Kroah-HartmanFrom: Paul Burton <[email protected]>
commit 36366e367ee93ced84fddb8fae6675e12985f5a4 upstream.
Commit 716850ab104d ("MIPS: eBPF: Initial eBPF support for MIPS32 architecture.") enabled our eBPF JIT for MIPS32 kernels, whereas it has previously only been availailable for MIPS64. It was my understanding at the time that the BPF test suite was passing & JITing a comparable number of tests to our cBPF JIT [1], but it turns out that was not the case.
The eBPF JIT has a number of problems on MIPS32:
- Most notably various code paths still result in emission of MIPS64 instructions which will cause reserved instruction exceptions & kernel panics when run on MIPS32 CPUs.
- The eBPF JIT doesn't account for differences between the O32 ABI used by MIPS32 kernels versus the N64 ABI used by MIPS64 kernels. Notably arguments beyond the first 4 are passed on the stack in O32, and this is entirely unhandled when JITing a BPF_CALL instruction. Stack space must be reserved for arguments even if they all fit in registers, and the callee is free to assume that stack space has been reserved for its use - with the eBPF JIT this is not the case, so calling any function can result in clobbering values on the stack & unpredictable behaviour. Function arguments in eBPF are always 64-bit values which is also entirely unhandled - the JIT still uses a single (32-bit) register per argument. As a result all function arguments are always passed incorrectly when JITing a BPF_CALL instruction, leading to kernel crashes or strange behavior.
- The JIT attempts to bail our on use of ALU64 instructions or 64-bit memory access instructions. The code doing this at the start of build_one_insn() incorrectly checks whether BPF_OP() equals BPF_DW, when it should really be checking BPF_SIZE() & only doing so when BPF_CLASS() is one of BPF_{LD,LDX,ST,STX}. This results in false positives that cause more bailouts than intended, and that in turns hides some of the problems described above.
- The kernel's cBPF->eBPF translation makes heavy use of 64-bit eBPF instructions that the MIPS32 eBPF JIT bails out on, leading to most cBPF programs not being JITed at all.
Until these problems are resolved, revert the removal of the cBPF JIT performed by commit 716850ab104d ("MIPS: eBPF: Initial eBPF support for MIPS32 architecture."). Together with commit f8fffebdea75 ("MIPS: BPF:
Disable MIPS32 eBPF JIT") this restores MIPS32 BPF JIT behavior back to the same state it was prior to the introduction of the broken eBPF JIT support.
--- arch/mips/Kconfig | 1 arch/mips/net/Makefile | 1 arch/mips/net/bpf_jit.c | 1270 ++++++++++++++++++++++++++++++++++++++++++++ arch/mips/net/bpf_jit_asm.S | 285 +++++++++ 4 files changed, 1557 insertions(+) create mode 100644 arch/mips/net/bpf_jit.c create mode 100644 arch/mips/net/bpf_jit_asm.S
arch/mips/Kconfig +1 -0
@@ -46,6 +46,7 @@ config MIPS select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES select HAVE_ASM_MODVERSIONS + select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS select HAVE_EBPF_JIT if 64BIT && !CPU_MICROMIPS && TARGET_ISA_REV >= 2 select HAVE_CONTEXT_TRACKING select HAVE_COPY_THREAD_TLS
arch/mips/net/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only # MIPS networking code +obj-$(CONFIG_MIPS_CBPF_JIT) += bpf_jit.o bpf_jit_asm.o obj-$(CONFIG_MIPS_EBPF_JIT) += ebpf_jit.o
arch/mips/net/bpf_jit.c new file +1270 -0
1,270 lines not on this page · raw message
arch/mips/net/bpf_jit_asm.S new file +285 -0
285 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 16/52 ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit f1db21c315f4b4f8c3fbea56aac500673132d317 ]
The 28NM DSI PLL driver for msm8960 calculates with a 27MHz reference clock and should hence use PXO, not CXO which runs at 19.2MHz.
Note that none of the DSI PHY/PLL drivers currently use this "ref" clock; they all rely on (sometimes inexistant) global clock names and usually function normally without a parent clock. This discrepancy will be corrected in a future patch, for which this change needs to be in place first.
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +2 -2
@@ -198,7 +198,7 @@ clock-frequency = <19200000>; }; - pxo_board { + pxo_board: pxo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>;
@@ -1304,7 +1304,7 @@ reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator"; clock-names = "iface_clk", "ref"; clocks = <&mmcc DSI_M_AHB_CLK>, - <&cxo_board>; + <&pxo_board>; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 19/52 ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 5c187e2eb3f92daa38cb3d4ab45e1107ea34108e ]
The MIC2025 switch input signal nEN is active low, describe it as such in the DT. The previous change to this regulator polarity was incorrectly influenced by broken quirks in gpiolib-of.c, which is now long fixed. So fix this regulator polarity setting here once and for all.
--- arch/arm/boot/dts/imx53-m53menlo.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/imx53-m53menlo.dts +1 -2
@@ -77,8 +77,7 @@ regulator-name = "vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>; - enable-active-high; + gpio = <&gpio1 2 0>; }; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 18/52 ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit c8c1efe14a4aadcfe93a158b1272e48298d2de15 ]
The panel already contains pinctrl-0 phandle, but it is missing the default pinctrl-names property, so the pin configuration is ignored. Fill in the missing pinctrl-names property, so the pin configuration is applied.
--- arch/arm/boot/dts/imx53-m53menlo.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx53-m53menlo.dts +1 -0
@@ -56,6 +56,7 @@ panel { compatible = "edt,etm0700g0dh6"; pinctrl-0 = <&pinctrl_display_gpio>; + pinctrl-names = "default"; enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; port {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 2/52 USB: cdc-acm: fix racy tty buffer accesses
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 65a205e6113506e69a503b61d97efec43fc10fd7 upstream.
A recent change that started reporting break events to the line discipline caused the tty-buffer insertions to no longer be serialised by inserting events also from the completion handler for the interrupt endpoint.
Completion calls for distinct endpoints are not guaranteed to be serialised. For example, in case a host-controller driver uses bottom-half completion, the interrupt and bulk-in completion handlers can end up running in parallel on two CPUs (high-and low-prio tasklets, respectively) thereby breaking the tty layer's single producer assumption.
Fix this by holding the read lock also when inserting characters from the bulk endpoint.
--- drivers/usb/class/cdc-acm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/class/cdc-acm.c +5 -0
@@ -474,11 +474,16 @@ static int acm_submit_read_urbs(struct astatic void acm_process_read_urb (struct acm *acm,struct urb *urb) { +unsigned long flags; +if (!urb->actual_length)return ; +spin_lock_irqsave (&acm->read_lock, flags);tty_insert_flip_string (&acm->port, urb->transfer_buffer, urb->actual_length); +spin_unlock_irqrestore (&acm->read_lock, flags); +tty_flip_buffer_push (&acm->port); }
Greg Kroah-Hartman
maintainerPATCH 20/52 arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit a153d317168aa3d61a204fadc85bac3995381d33 ]
Change pm8150 to use the qcom,pm8998-pon compatible string for the pon in order to pass reboot mode properly.
--- arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/pm8150.dtsi +1 -1
@@ -17,7 +17,7 @@ #size-cells = <0>; pon: power-on@800 { - compatible = "qcom,pm8916-pon"; + compatible = "qcom,pm8998-pon"; reg = <0x0800>; pwrkey { compatible = "qcom,pm8941-pwrkey";
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 21/52 xtensa: move XCHAL_KIO_* definitions to kmem_layout.h
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit 6591685d50043f615a1ad7ddd5bb263ef54808fc ]
These address and size definitions define xtensa kernel memory layout, move them from vectors.h to the kmem_layout.h
--- arch/xtensa/include/asm/kmem_layout.h | 29 ++++++++++++++++++ arch/xtensa/include/asm/vectors.h | 42 ++------------------------- 2 files changed, 32 insertions(+), 39 deletions(-)
arch/xtensa/include/asm/kmem_layout.h +29 -0
@@ -11,6 +11,7 @@#ifndef _XTENSA_KMEM_LAYOUT_H#define _XTENSA_KMEM_LAYOUT_H +#include <asm/core.h> #include <asm/types.h> #ifdef CONFIG_MMU
@@ -65,6 +66,34 @@#endif +/* KIO definition */ + +#if XCHAL_HAVE_PTP_MMU +#define XCHAL_KIO_CACHED_VADDR 0xe0000000 +#define XCHAL_KIO_BYPASS_VADDR 0xf0000000 +#define XCHAL_KIO_DEFAULT_PADDR 0xf0000000 +#else +#define XCHAL_KIO_BYPASS_VADDR XCHAL_KIO_PADDR +#define XCHAL_KIO_DEFAULT_PADDR 0x90000000 +#endif +#define XCHAL_KIO_SIZE 0x10000000 + +#if (!XCHAL_HAVE_PTP_MMU ||XCHAL_HAVE_SPANNING_WAY ) && defined(CONFIG_OF ) +#define XCHAL_KIO_PADDR xtensa_get_kio_paddr() +#ifndef __ASSEMBLY__ +extern unsigned long xtensa_kio_paddr; + +static inline unsigned long xtensa_get_kio_paddr (void ) +{ +return xtensa_kio_paddr; +} +#endif +#else +#define XCHAL_KIO_PADDR XCHAL_KIO_DEFAULT_PADDR +#endif + +/* KERNEL_STACK definition */ +#ifndef CONFIG_KASAN #define KERNEL_STACK_SHIFT 13#else
arch/xtensa/include/asm/vectors.h +3 -39
53 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 22/52 xtensa: use CONFIG_USE_OF instead of CONFIG_OF
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit d67ed2510d28a1eb33171010d35cf52178cfcbdd ]
CONFIG_OF can be set by a randconfig or by a user -- without setting the early flattree option (OF_EARLY_FLATTREE). This causes build errors. However, if randconfig or a user sets USE_OF in the Xtensa config, the right kconfig symbols are set to fix the build.
Fixes these build errors:
../arch/xtensa/kernel/setup.c:67:19: error: ‘__dtb_start’ undeclared here (not in a function); did you mean ‘dtb_start’?
67 | void *dtb_start = __dtb_start;
| ^~~~~~~~~~~../arch/xtensa/kernel/setup.c: In function 'xtensa_dt_io_area':../arch/xtensa/kernel/setup.c:201:14: error: implicit declaration of function 'of_flat_dt_is_compatible'; did you mean 'of_machine_is_compatible'? [-Werror=implicit-function-declaration]
201 | if (!of_flat_dt_is_compatible(node, "simple-bus"))../arch/xtensa/kernel/setup.c:204:18: error: implicit declaration of function 'of_get_flat_dt_prop' [-Werror=implicit-function-declaration]
204 | ranges = of_get_flat_dt_prop(node, "ranges", &len);../arch/xtensa/kernel/setup.c:204:16: error: assignment to 'const __be32 *' {aka 'const unsigned int *'} from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
204 | ranges = of_get_flat_dt_prop(node, "ranges", &len);
| ^../arch/xtensa/kernel/setup.c: In function 'early_init_devtree':../arch/xtensa/kernel/setup.c:228:9: error: implicit declaration of function 'early_init_dt_scan'; did you mean 'early_init_devtree'? [-Werror=implicit-function-declaration]
228 | early_init_dt_scan(params);../arch/xtensa/kernel/setup.c:229:9: error: implicit declaration of function 'of_scan_flat_dt' [-Werror=implicit-function-declaration]
229 | of_scan_flat_dt(xtensa_dt_io_area, NULL);
xtensa-elf-ld: arch/xtensa/mm/mmu.o:(.text+0x0): undefined reference to `xtensa_kio_paddr'
--- arch/xtensa/include/asm/kmem_layout.h | 2 +- arch/xtensa/kernel/setup.c | 12 ++++++------ arch/xtensa/mm/mmu.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
arch/xtensa/include/asm/kmem_layout.h +1 -1
@@ -78,7 +78,7 @@#endif #define XCHAL_KIO_SIZE 0x10000000 -#if (!XCHAL_HAVE_PTP_MMU ||XCHAL_HAVE_SPANNING_WAY ) && defined(CONFIG_OF ) +#if (!XCHAL_HAVE_PTP_MMU ||XCHAL_HAVE_SPANNING_WAY ) && defined(CONFIG_USE_OF )#define XCHAL_KIO_PADDR xtensa_get_kio_paddr()#ifndef __ASSEMBLY__extern unsigned long xtensa_kio_paddr;
arch/xtensa/kernel/setup.c +6 -6
@@ -64,7 +64,7 @@ extern unsigned long initrd_end;extern int initrd_below_start_ok;#endif -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF void *dtb_start = __dtb_start;#endif
@@ -126,7 +126,7 @@ __tagtable(BP_TAG_INITRD, parse_tag_initrd);#endif /* CONFIG_BLK_DEV_INITRD */ -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF static int __init parse_tag_fdt (const bp_tag_t *tag) {
@@ -136,7 +136,7 @@ static int __init parse_tag_fdt(const bp_tag_t *tag)__tagtable (BP_TAG_FDT , parse_tag_fdt); -#endif /* CONFIG_OF */ +#endif /* CONFIG_USE_OF */ static int __init parse_tag_cmdline (const bp_tag_t * tag) {
@@ -184,7 +184,7 @@ static int __init parse_bootparam(const bp_tag_t *tag) }#endif -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF #if !XCHAL_HAVE_PTP_MMU ||XCHAL_HAVE_SPANNING_WAY unsigned long xtensa_kio_paddr =XCHAL_KIO_DEFAULT_PADDR ;
@@ -233,7 +233,7 @@ void __init early_init_devtree(void *params) strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); } -#endif /* CONFIG_OF */ +#endif /* CONFIG_USE_OF */ /* * Initialize architecture. (Early stage)
@@ -254,7 +254,7 @@ void __init init_arch(bp_tag_t *bp_start)if (bp_start)parse_bootparam (bp_start); -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF early_init_devtree (dtb_start);#endif
arch/xtensa/mm/mmu.c +1 -1
@@ -101,7 +101,7 @@ void init_mmu(void)void init_kio (void ) { -#if XCHAL_HAVE_PTP_MMU &&XCHAL_HAVE_SPANNING_WAY && defined(CONFIG_OF ) +#if XCHAL_HAVE_PTP_MMU &&XCHAL_HAVE_SPANNING_WAY && defined(CONFIG_USE_OF )/* * Update the IO area mapping in case xtensa_kio_paddr has changed */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 25/52 bpf: Fix integer overflow in prealloc_elems_and_freelist()
In reply to Greg Kroah-HartmanFrom: Tatsuhiko Yasumatsu <[email protected]>
[ Upstream commit 30e29a9a2bc6a4888335a6ede968b75cd329657a ]
In prealloc_elems_and_freelist(), the multiplication to calculate the size passed to bpf_map_area_alloc() could lead to an integer overflow. As a result, out-of-bounds write could occur in pcpu_freelist_populate() as reported by KASAN:
[...]
[ 16.968613] BUG: KASAN: slab-out-of-bounds in pcpu_freelist_populate+0xd9/0x100 [ 16.969408] Write of size 8 at addr ffff888104fc6ea0 by task crash/78 [ 16.970038] [ 16.970195] CPU: 0 PID: 78 Comm: crash Not tainted 5.15.0-rc2+ #1 [ 16.970878] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 [ 16.972026] Call Trace: [ 16.972306] dump_stack_lvl+0x34/0x44 [ 16.972687] print_address_description.constprop.0+0x21/0x140 [ 16.973297] ? pcpu_freelist_populate+0xd9/0x100 [ 16.973777] ? pcpu_freelist_populate+0xd9/0x100 [ 16.974257] kasan_report.cold+0x7f/0x11b [ 16.974681] ? pcpu_freelist_populate+0xd9/0x100 [ 16.975190] pcpu_freelist_populate+0xd9/0x100 [ 16.975669] stack_map_alloc+0x209/0x2a0 [ 16.976106] __sys_bpf+0xd83/0x2ce0
[...]
The possibility of this overflow was originally discussed in [0], but was overlooked.
Fix the integer overflow by changing elem_size to u64 from u32.
[0] https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/stackmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/stackmap.c +2 -1
@@ -60,7 +60,8 @@ static inline int stack_map_data_size(struct bpf_map *map)static int prealloc_elems_and_freelist (struct bpf_stack_map *smap) { -u32 elem_size =sizeof (struct stack_map_bucket ) + smap->map.value_size; +u64 elem_size =sizeof (struct stack_map_bucket ) + + (u64 )smap->map.value_size;int err; smap->elems = bpf_map_area_alloc(elem_size * smap->map.max_entries,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 17/52 soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment
In reply to Greg Kroah-HartmanFrom: Shawn Guo <[email protected]>
[ Upstream commit 833d51d7c66d6708abbc02398892b96b950167b9 ]
PT_LOAD type denotes that the segment should be loaded into the final firmware memory region. Hash segment is not one such, because it's only needed for PAS init and shouldn't be in the final firmware memory region. That's why mdt_phdr_valid() explicitly reject non PT_LOAD segment and hash segment. This actually makes the hash segment type check in qcom_mdt_read_metadata() unnecessary and redundant. For a hash segment, it won't be loaded into firmware memory region anyway, due to the QCOM_MDT_TYPE_HASH check in mdt_phdr_valid(), even if it has a PT_LOAD type for some reason (misusing or abusing?).
Some firmware files on Sony phones are such examples, e.g WCNSS firmware of Sony Xperia M4 Aqua phone. The type of hash segment is just PT_LOAD. Drop the unnecessary hash segment type check in qcom_mdt_read_metadata() to fix firmware loading failure on these phones, while hash segment is still kept away from the final firmware memory region.
--- drivers/soc/qcom/mdt_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/mdt_loader.c +1 -1
@@ -98,7 +98,7 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len)if (ehdr->e_phnum <2 )return ERR_PTR (-EINVAL ); -if (phdrs[0 ].p_type ==PT_LOAD || phdrs[1 ].p_type ==PT_LOAD ) +if (phdrs[0 ].p_type ==PT_LOAD )return ERR_PTR (-EINVAL );if ((phdrs[1 ].p_flags &QCOM_MDT_TYPE_MASK ) !=QCOM_MDT_TYPE_HASH )
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 23/52 xtensa: call irqchip_init only when CONFIG_USE_OF is selected
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
[ Upstream commit 6489f8d0e1d93a3603d8dad8125797559e4cf2a2 ]
During boot time kernel configured with OF=y but USE_OF=n displays the following warnings and hangs shortly after starting userspace:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at kernel/irq/irqdomain.c:695 irq_create_mapping_affinity+0x29/0xc0 irq_create_mapping_affinity(, 6) called with NULL domain CPU: 0 PID: 0 Comm: swapper Not tainted 5.15.0-rc3-00001-gd67ed2510d28 #30 Call Trace: __warn+0x69/0xc4 warn_slowpath_fmt+0x6c/0x94 irq_create_mapping_affinity+0x29/0xc0 local_timer_setup+0x40/0x88 time_init+0xb1/0xe8 start_kernel+0x31d/0x3f4 _startup+0x13b/0x13b ---[ end trace 1e6630e1c5eda35b ]--- ------------[ cut here ]------------ WARNING: CPU: 0 PID: 0 at arch/xtensa/kernel/time.c:141 local_timer_setup+0x58/0x88 error: can't map timer irq CPU: 0 PID: 0 Comm: swapper Tainted: G W 5.15.0-rc3-00001-gd67ed2510d28 #30 Call Trace: __warn+0x69/0xc4 warn_slowpath_fmt+0x6c/0x94 local_timer_setup+0x58/0x88 time_init+0xb1/0xe8 start_kernel+0x31d/0x3f4 _startup+0x13b/0x13b ---[ end trace 1e6630e1c5eda35c ]---
Failed to request irq 0 (timer)
Fix that by calling irqchip_init only when CONFIG_USE_OF is selected and calling legacy interrupt controller init otherwise.
--- arch/xtensa/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/irq.c +1 -1
@@ -145,7 +145,7 @@ unsigned xtensa_get_ext_irq_no(unsigned irq)void __init init_IRQ (void ) { -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF irqchip_init ();#else #ifdef CONFIG_HAVE_SMP
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 24/52 bpf, arm: Fix register clobbering in div/mod implementation
In reply to Greg Kroah-HartmanFrom: Johan Almbladh <[email protected]>
[ Upstream commit 79e3445b38e0cab94264a3894c0c3d57c930b97e ]
On ARM CPUs that lack div/mod instructions, ALU32 BPF_DIV and BPF_MOD are implemented using a call to a helper function. Before, the emitted code for those function calls failed to preserve caller-saved ARM registers. Since some of those registers happen to be mapped to BPF registers, it resulted in eBPF register values being overwritten.
This patch emits code to push and pop the remaining caller-saved ARM registers r2-r3 into the stack during the div/mod function call. ARM registers r0-r1 are used as arguments and return value, and those were already saved and restored correctly.
--- arch/arm/net/bpf_jit_32.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm/net/bpf_jit_32.c +19 -0
@@ -36,6 +36,10 @@* +-----+ * |RSVD | JIT scratchpad * current ARM_SP => +-----+ <= (BPF_FP - STACK_SIZE + SCRATCH_SIZE) +* | ... | caller-saved registers +* +-----+ +* | ... | arguments passed on stack +* ARM_SP during call => +-----| * | | * | ... | Function call stack * | |
@@ -63,6 +67,12 @@* * When popping registers off the stack at the end of a BPF function, we * reference them via the current ARM_FP register. +* +* Some eBPF operations are implemented via a call to a helper function. +* Such calls are "invisible" in the eBPF code, so it is up to the calling +* program to preserve any caller-saved ARM registers during the call. The +* JIT emits code to push and pop those registers onto the stack, immediately +* above the callee stack frame. */ #define CALLEE_MASK (1 << ARM_R4 | 1 << ARM_R5 | 1 << ARM_R6 | \ 1 << ARM_R7 | 1 << ARM_R8 | 1 << ARM_R9 | \
@@ -70,6 +80,8 @@#define CALLEE_PUSH_MASK (CALLEE_MASK | 1 << ARM_LR)#define CALLEE_POP_MASK (CALLEE_MASK | 1 << ARM_PC) +#define CALLER_MASK (1 << ARM_R0 | 1 << ARM_R1 | 1 << ARM_R2 | 1 << ARM_R3) +enum {/* Stack layout - these are offsets from (top of stack - 4) */ BPF_R2_HI ,
@@ -464,6 +476,7 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)static inline void emit_udivmod (u8 rd,u8 rm,u8 rn,struct jit_ctx *ctx,u8 op) { +const int exclude_mask =BIT (ARM_R0 ) |BIT (ARM_R1 );const s8 *tmp = bpf2a32[TMP_REG_1 ];#if __LINUX_ARM_ARCH__ ==7
@@ -495,11 +508,17 @@ static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)emit (ARM_MOV_R (ARM_R0 , rm), ctx); } +/* Push caller-saved registers on stack */ +emit (ARM_PUSH (CALLER_MASK & ~exclude_mask), ctx); +/* Call appropriate function */ emit_mov_i (ARM_IP , op ==BPF_DIV ? (u32 )jit_udiv32 : (u32 )jit_mod32, ctx);emit_blx_r (ARM_IP , ctx); +/* Restore caller-saved registers from stack */ +emit (ARM_POP (CALLER_MASK & ~exclude_mask), ctx); +/* Save return value */ if (rd !=ARM_R0 )emit (ARM_MOV_R (rd,ARM_R0 ), ctx);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 3/52 USB: cdc-acm: fix break reporting
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 58fc1daa4d2e9789b9ffc880907c961ea7c062cc upstream.
A recent change that started reporting break events forgot to push the event to the line discipline, which meant that a detected break would not be reported until further characters had been receive (the port could even have been closed and reopened in between).
--- drivers/usb/class/cdc-acm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/class/cdc-acm.c +3 -0
@@ -339,6 +339,9 @@ static void acm_process_notification(str acm->iocount.overrun++;spin_unlock_irqrestore (&acm->read_lock, flags); +if (newctrl &ACM_CTRL_BRK ) +tty_flip_buffer_push (&acm->port); +if (difference)wake_up_all (&acm->wioctl);
Greg Kroah-Hartman
maintainerPATCH 5/52 xen/privcmd: fix error handling in mmap-resource processing
In reply to Greg Kroah-HartmanFrom: Jan Beulich <[email protected]>
commit e11423d6721dd63b23fb41ade5e8d0b448b17780 upstream.
xen_pfn_t is the same size as int only on 32-bit builds (and not even on Arm32). Hence pfns[] can't be used directly to read individual error values returned from xen_remap_domain_mfn_array(); every other error indicator would be skipped/ignored on 64-bit.
--- drivers/xen/privcmd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/xen/privcmd.c +4 -3
@@ -810,11 +810,12 @@ static long privcmd_ioctl_mmap_resource(unsigned int domid = (xdata.flags & XENMEM_rsrc_acq_caller_owned) ?DOMID_SELF : kdata.dom; -int num; +int num, *errs = (int *)pfns; +BUILD_BUG_ON (sizeof (*errs) >sizeof (*pfns)); num =xen_remap_domain_mfn_array (vma, kdata.addr &PAGE_MASK , - pfns, kdata.num, (int *)pfns, + pfns, kdata.num, errs, vma->vm_page_prot, domid, vma->vm_private_data);
@@ -824,7 +825,7 @@ static long privcmd_ioctl_mmap_resource(unsigned int i;for (i =0 ; i < num; i++) { - rc = pfns[i]; + rc = errs[i];if (rc <0 )break ; }
Greg Kroah-Hartman
maintainerPATCH 6/52 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
commit 8a38a4d51c5055d0201542e5ea3c0cb287f6e223 upstream.
The memory at the end of the controller only accepts 32bit read/write accesses, but the arm64 memcpy_to/fromio implementation only uses 64bit (which will be split into two 32bit access) and 8bit leading to incomplete copies to/from this memory when the buffer is not multiple of 8bytes.
Add a local copy using writel/readl accesses to make sure we use the right memory access width.
The switch to memcpy_to/fromio was done because of 285133040e6c ("arm64: Import latest memcpy()/memmove() implementation"), but using memcpy worked before since it mainly used 32bit memory acceses.
--- drivers/mmc/host/meson-gx-mmc.c | 73 ++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 14 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +59 -14
@@ -738,7 +738,7 @@ static void meson_mmc_desc_chain_transfewritel (start, host->regs +SD_EMMC_START ); } -/* local sg copy to buffer version with _to/fromio usage for dram_access_quirk */ +/* local sg copy for dram_access_quirk */ static void meson_mmc_copy_buffer (struct meson_host *host,struct mmc_data *data,size_t buflen,bool to_buffer) {
@@ -756,21 +756,27 @@ static void meson_mmc_copy_buffer(structsg_miter_start (&miter, sgl, nents, sg_flags);while ((offset < buflen) &&sg_miter_next (&miter)) { -unsigned int len; +unsigned int buf_offset =0 ; +unsigned int len, left; +u32 *buf = miter.addr; len =min (miter.length, buflen - offset); + left = len; -/* When dram_access_quirk, the bounce buffer is a iomem mapping */ -if (host->dram_access_quirk) { -if (to_buffer) -memcpy_toio (host->bounce_iomem_buf + offset, miter.addr, len); -else -memcpy_fromio (miter.addr, host->bounce_iomem_buf + offset, len); +if (to_buffer) { +do { +writel (*buf++, host->bounce_iomem_buf + offset + buf_offset); + + buf_offset +=4 ; + left -=4 ; + }while (left); }else { -if (to_buffer) -memcpy (host->bounce_buf + offset, miter.addr, len); -else -memcpy (miter.addr, host->bounce_buf + offset, len); +do { + *buf++ =readl (host->bounce_iomem_buf + offset + buf_offset); + + buf_offset +=4 ; + left -=4 ; + }while (left); } offset += len;
@@ -822,7 +828,11 @@ static void meson_mmc_start_cmd(struct mif (data->flags &MMC_DATA_WRITE ) { cmd_cfg |=CMD_CFG_DATA_WR ;WARN_ON (xfer_bytes > host->bounce_buf_size); -meson_mmc_copy_buffer (host, data, xfer_bytes, true); +if (host->dram_access_quirk) +meson_mmc_copy_buffer (host, data, xfer_bytes, true); +else +sg_copy_to_buffer (data->sg, data->sg_len, + host->bounce_buf, xfer_bytes);dma_wmb (); }
@@ -841,12 +851,43 @@ static void meson_mmc_start_cmd(struct mwritel (cmd->arg, host->regs +SD_EMMC_CMD_ARG ); } +static int meson_mmc_validate_dram_access (struct mmc_host *mmc,struct mmc_data *data) +{ +struct scatterlist *sg; +int i; + +/* Reject request if any element offset or size is not 32bit aligned */ +for_each_sg (data->sg, sg, data->sg_len, i) { +if (!IS_ALIGNED (sg->offset,sizeof (u32)) || + !IS_ALIGNED (sg->length,sizeof (u32))) { +dev_err (mmc_dev (mmc),"unaligned sg offset %u len %u\n" , + data->sg->offset, data->sg->length); +return -EINVAL ; + } + } + +return 0 ; +} +static void meson_mmc_request (struct mmc_host *mmc,struct mmc_request *mrq) {struct meson_host *host =mmc_priv (mmc);bool needs_pre_post_req = mrq->data && !(mrq->data->host_cookie &SD_EMMC_PRE_REQ_DONE ); +/* +* The memory at the end of the controller used as bounce buffer for +* the dram_access_quirk only accepts 32bit read/write access, +* check the aligment and length of the data before starting the request. +*/ +if (host->dram_access_quirk && mrq->data) { + mrq->cmd->error =meson_mmc_validate_dram_access (mmc, mrq->data); +if (mrq->cmd->error) { +mmc_request_done (mmc, mrq); +return ; + } + } +if (needs_pre_post_req) {meson_mmc_get_transfer_mode (mmc, mrq);if (!meson_mmc_desc_chain_mode (mrq->data))
@@ -991,7 +1032,11 @@ static irqreturn_t meson_mmc_irq_thread(if (meson_mmc_bounce_buf_read (data)) { xfer_bytes = data->blksz * data->blocks;WARN_ON (xfer_bytes > host->bounce_buf_size); -meson_mmc_copy_buffer (host, data, xfer_bytes, false); +if (host->dram_access_quirk) +meson_mmc_copy_buffer (host, data, xfer_bytes, false); +else +sg_copy_from_buffer (data->sg, data->sg_len, + host->bounce_buf, xfer_bytes); } next_cmd =meson_mmc_get_next_command (cmd);
Greg Kroah-Hartman
maintainerPATCH 4/52 usb: typec: tcpm: handle SRC_STARTUP state if cc changes
In reply to Greg Kroah-HartmanFrom: Xu Yang <[email protected]>
commit 6d91017a295e9790eec02c4e43f020cdb55f5d98 upstream.
TCPM for DRP should do the same action as SRC_ATTACHED when cc changes in SRC_STARTUP state. Otherwise, TCPM will transition to SRC_UNATTACHED state which is not satisfied with the Type-C spec.
Per Type-C spec:
DRP port should move to Unattached.SNK instead of Unattached.SRC if sink removed.
--- drivers/usb/typec/tcpm/tcpm.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/typec/tcpm/tcpm.c +1 -0
@@ -3679,6 +3679,7 @@ static void _tcpm_cc_change(struct tcpm_tcpm_set_state (port,SRC_ATTACH_WAIT ,0 );break ;case SRC_ATTACHED : +case SRC_STARTUP :case SRC_SEND_CAPABILITIES :case SRC_READY : if (tcpm_port_is_disconnected(port) ||
Greg Kroah-Hartman
maintainerPATCH 8/52 nfsd: fix error handling of register_pernet_subsys() in init_nfsd()
In reply to Greg Kroah-HartmanFrom: Patrick Ho <[email protected]>
commit 1d625050c7c2dd877e108e382b8aaf1ae3cfe1f4 upstream.
init_nfsd() should not unregister pernet subsys if the register fails but should instead unwind from the last successful operation which is register_filesystem().
Unregistering a failed register_pernet_subsys() call can result in a kernel GPF as revealed by programmatically injecting an error in register_pernet_subsys().
Verified the fix handled failure gracefully with no lingering nfsd entry in /proc/filesystems. This change was introduced by the commit bd5ae9288d64 ("nfsd: register pernet ops last, unregister first"), the original error handling logic was correct.
--- fs/nfsd/nfsctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfsctl.c +1 -1
@@ -1549,7 +1549,7 @@ static int __init init_nfsd(void) goto out_free_all;return 0 ; out_free_all: -unregister_pernet_subsys (&nfsd_net_ops); +unregister_filesystem (&nfsd_fs_type); out_free_exports:remove_proc_entry ("fs/nfs/exports" ,NULL );remove_proc_entry ("fs/nfs" ,NULL );
Greg Kroah-Hartman
maintainerPATCH 9/52 nfsd4: Handle the NFSv4 READDIR dircount hint being zero
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit f2e717d655040d632c9015f19aa4275f8b16e7f2 upstream.
RFC3530 notes that the 'dircount' field may be zero, in which case the recommendation is to ignore it, and only enforce the 'maxcount' field. In RFC5661, this recommendation to ignore a zero valued field becomes a requirement.
--- fs/nfsd/nfs4xdr.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/nfsd/nfs4xdr.c +11 -8
@@ -3131,15 +3131,18 @@ nfsd4_encode_dirent(void *ccdv, const ch goto fail; cd->rd_maxcount -= entry_bytes;/* -* RFC 3530 14.2.24 describes rd_dircount as only a "hint", so -* let's always let through the first entry, at least: +* RFC 3530 14.2.24 describes rd_dircount as only a "hint", and +* notes that it could be zero. If it is zero, then the server +* should enforce only the rd_maxcount value. */ -if (!cd->rd_dircount) - goto fail; - name_and_cookie =4 +4 *XDR_QUADLEN (namlen) +8 ; -if (name_and_cookie > cd->rd_dircount && cd->cookie_offset) - goto fail; - cd->rd_dircount -=min (cd->rd_dircount, name_and_cookie); +if (cd->rd_dircount) { + name_and_cookie =4 +4 *XDR_QUADLEN (namlen) +8 ; +if (name_and_cookie > cd->rd_dircount && cd->cookie_offset) + goto fail; + cd->rd_dircount -=min (cd->rd_dircount, name_and_cookie); +if (!cd->rd_dircount) + cd->rd_maxcount =0 ; + } cd->cookie_offset = cookie_offset; skip_entry:
Greg Kroah-Hartman
maintainerPATCH 27/52 net_sched: fix NULL deref in fifo_set_limit()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 560ee196fe9e5037e5015e2cdb14b3aecb1cd7dc ]
syzbot reported another NULL deref in fifo_set_limit() [1]
I could repro the issue with :
unshare -n
tc qd add dev lo root handle 1:0 tbf limit 200000 burst 70000 rate 100Mbit tc qd replace dev lo parent 1:0 pfifo_fast
tc qd change dev lo root handle 1:0 tbf limit 300000 burst 70000 rate 100Mbit
pfifo_fast does not have a change() operation.
Make fifo_set_limit() more robust about this.
[1]
BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD 1cf99067 P4D 1cf99067 PUD 7ca49067 PMD 0 Oops: 0010 [#1] PREEMPT SMP KASAN CPU: 1 PID: 14443 Comm: syz-executor959 Not tainted 5.15.0-rc3-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:0x0 Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. RSP: 0018:ffffc9000e2f7310 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: ffffffff8d6ecc00 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffff888024c27910 RDI: ffff888071e34000 RBP: ffff888071e34000 R08: 0000000000000001 R09: ffffffff8fcfb947 R10: 0000000000000001 R11: 0000000000000000 R12: ffff888024c27910 R13: ffff888071e34018 R14: 0000000000000000 R15: ffff88801ef74800 FS: 00007f321d897700(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 00000000722c3000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: fifo_set_limit net/sched/sch_fifo.c:242 [inline] fifo_set_limit+0x198/0x210 net/sched/sch_fifo.c:227 tbf_change+0x6ec/0x16d0 net/sched/sch_tbf.c:418 qdisc_change net/sched/sch_api.c:1332 [inline] tc_modify_qdisc+0xd9a/0x1a60 net/sched/sch_api.c:1634 rtnetlink_rcv_msg+0x413/0xb80 net/core/rtnetlink.c:5572 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340 netlink_sendmsg+0x86d/0xdb0 net/netlink/af_netlink.c:1929 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:724 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2409 ___sys_sendmsg+0xf3/0x170 net/socket.c:2463 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2492 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- net/sched/sch_fifo.c | 3 +++ 1 file changed, 3 insertions(+)
net/sched/sch_fifo.c +3 -0
@@ -148,6 +148,9 @@ int fifo_set_limit(struct Qdisc *q, unsigned int limit)if (strncmp (q->ops->id +1 ,"fifo" ,4 ) !=0 )return 0 ; +if (!q->ops->change) +return 0 ; + nla =kmalloc (nla_attr_size (sizeof (struct tc_fifo_qopt )),GFP_KERNEL );if (nla) { nla->nla_type =RTM_NEWQDISC ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainercover 5.4.153-rc1 review
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.153-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.153-rc1
Lukas Bulwahn <[email protected]>
x86/Kconfig: Correct reference to MWINCHIP3D
Thomas Gleixner <[email protected]>
x86/hpet: Use another crystalball to evaluate HPET usability
Lukas Bulwahn <[email protected]>
x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
Naveen N. Rao <[email protected]>
powerpc/bpf: Fix BPF_MOD when imm == 1
Palmer Dabbelt <[email protected]>
RISC-V: Include clone3() on rv32
Tiezhu Yang <[email protected]>
bpf, s390: Fix potential memory leak about jit_data
Jamie Iles <[email protected]>
i2c: acpi: fix resource leak in reconfiguration device addition
Mike Manning <[email protected]>
net: prefer socket bound to interface when not in VRF
Sylwester Dziedziuch <[email protected]>
i40e: Fix freeing of uninitialized misc IRQ vector
Jiri Benc <[email protected]>
i40e: fix endless loop under rtnl
Eric Dumazet <[email protected]>
gve: fix gve_get_stats()
Eric Dumazet <[email protected]>
rtnetlink: fix if_nlmsg_stats_size() under estimation
Catherine Sullivan <[email protected]>
gve: Correct available tx qpl check
Yang Yingliang <[email protected]>
drm/nouveau/debugfs: fix file release memory leak
Mark Brown <[email protected]>
video: fbdev: gbefb: Only instantiate device when built for IP32
Tony Lindgren <[email protected]>
bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
Eric Dumazet <[email protected]>
netlink: annotate data races around nlk->bound
Sean Anderson <[email protected]>
net: sfp: Fix typo in state machine debug string
Eric Dumazet <[email protected]>
net/sched: sch_taprio: properly cancel timer from taprio_destroy()
Eric Dumazet <[email protected]>
net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
Oleksij Rempel <[email protected]>
ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
Michael Walle <[email protected]>
arm64: dts: ls1028a: add missing CAN nodes
Andre Przywara <[email protected]>
arm64: dts: freescale: Fix SP805 clock-names
Andy Shevchenko <[email protected]>
ptp_pch: Load module automatically if ID matches
Pali Rohár <[email protected]>
powerpc/fsl/dts: Fix phy-connection-type for fm1mac3
Eric Dumazet <[email protected]>
net_sched: fix NULL deref in fifo_set_limit()
Pavel Skripkin <[email protected]>
phy: mdio: fix memory leak
Tatsuhiko Yasumatsu <[email protected]>
bpf: Fix integer overflow in prealloc_elems_and_freelist()
Johan Almbladh <[email protected]>
bpf, arm: Fix register clobbering in div/mod implementation
Max Filippov <[email protected]>
xtensa: call irqchip_init only when CONFIG_USE_OF is selected
Randy Dunlap <[email protected]>
xtensa: use CONFIG_USE_OF instead of CONFIG_OF
Max Filippov <[email protected]>
xtensa: move XCHAL_KIO_* definitions to kmem_layout.h
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding
Marek Vasut <[email protected]>
ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo
Marek Vasut <[email protected]>
ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo
Shawn Guo <[email protected]>
soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment
Marijn Suijten <[email protected]>
ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference
Antonio Martorana <[email protected]>
soc: qcom: socinfo: Fixed argument passed to platform_set_data()
Piotr Krysiuk <[email protected]>
bpf, mips: Validate conditional branch offsets
Paul Burton <[email protected]>
MIPS: BPF: Restore MIPS32 cBPF JIT
David Heidelberg <[email protected]>
ARM: dts: qcom: apq8064: use compatible which contains chipid
Roger Quadros <[email protected]>
ARM: dts: omap3430-sdp: Fix NAND device node
Juergen Gross <[email protected]>
xen/balloon: fix cancelled balloon action
Trond Myklebust <[email protected]>
nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero
Patrick Ho <[email protected]>
nfsd: fix error handling of register_pernet_subsys() in init_nfsd()
Zheng Liang <[email protected]>
ovl: fix missing negative dentry check in ovl_rename()
Neil Armstrong <[email protected]>
mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk
Jan Beulich <[email protected]>
xen/privcmd: fix error handling in mmap-resource processing
Xu Yang <[email protected]>
usb: typec: tcpm: handle SRC_STARTUP state if cc changes
Johan Hovold <[email protected]>
USB: cdc-acm: fix break reporting
Johan Hovold <[email protected]>
USB: cdc-acm: fix racy tty buffer accesses
Ben Hutchings <[email protected]>
Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/imx53-m53menlo.dts | 4 +- arch/arm/boot/dts/omap3430-sdp.dts | 2 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 7 +- arch/arm/mach-imx/pm-imx6.c | 2 + arch/arm/mach-omap2/omap_hwmod.c | 2 + arch/arm/net/bpf_jit_32.c | 19 + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 22 +- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 16 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 +- arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- arch/mips/Kconfig | 1 + arch/mips/net/Makefile | 1 + arch/mips/net/bpf_jit.c | 1299 ++++++++++++++++++++++++ arch/mips/net/bpf_jit_asm.S | 285 ++++++ arch/powerpc/boot/dts/fsl/t1023rdb.dts | 2 +- arch/powerpc/net/bpf_jit_comp64.c | 10 +- arch/riscv/include/uapi/asm/unistd.h | 3 +- arch/s390/net/bpf_jit_comp.c | 2 +- arch/x86/Kconfig | 2 +- arch/x86/kernel/early-quirks.c | 6 - arch/x86/kernel/hpet.c | 81 ++ arch/x86/platform/olpc/olpc.c | 2 +- arch/xtensa/include/asm/kmem_layout.h | 29 + arch/xtensa/include/asm/vectors.h | 42 +- arch/xtensa/kernel/irq.c | 2 +- arch/xtensa/kernel/setup.c | 12 +- arch/xtensa/mm/mmu.c | 2 +- drivers/bus/ti-sysc.c | 3 + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 1 + drivers/i2c/i2c-core-acpi.c | 1 + drivers/mmc/host/meson-gx-mmc.c | 73 +- drivers/net/ethernet/google/gve/gve.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 13 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +- drivers/net/phy/mdio_bus.c | 7 + drivers/net/phy/sfp.c | 2 +- drivers/ptp/ptp_pch.c | 1 + drivers/soc/qcom/mdt_loader.c | 2 +- drivers/soc/qcom/socinfo.c | 2 +- drivers/usb/class/cdc-acm.c | 8 + drivers/usb/common/Kconfig | 3 +- drivers/usb/typec/tcpm/tcpm.c | 1 + drivers/video/fbdev/gbefb.c | 2 +- drivers/xen/balloon.c | 21 +- drivers/xen/privcmd.c | 7 +- fs/nfsd/nfs4xdr.c | 19 +- fs/nfsd/nfsctl.c | 2 +- fs/overlayfs/dir.c | 10 +- kernel/bpf/stackmap.c | 3 +- net/bridge/br_netlink.c | 2 +- net/core/rtnetlink.c | 2 +- net/ipv4/inet_hashtables.c | 4 +- net/ipv4/udp.c | 3 +- net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/udp.c | 3 +- net/netlink/af_netlink.c | 14 +- net/sched/sch_fifo.c | 3 + net/sched/sch_taprio.c | 4 + 59 files changed, 1955 insertions(+), 147 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 7/52 ovl: fix missing negative dentry check in ovl_rename()
From: Zheng Liang <[email protected]>
commit a295aef603e109a47af355477326bd41151765b6 upstream.
The following reproducer
mkdir lower upper work merge
touch lower/old
touch lower/new
mount -t overlay overlay -olowerdir=lower,upperdir=upper,workdir=work merge rm merge/new
mv merge/old merge/new & unlink upper/new
may result in this race:
PROCESS A:
rename("merge/old", "merge/new"); overwrite=true,ovl_lower_positive(old)=true, ovl_dentry_is_whiteout(new)=true -> flags |= RENAME_EXCHANGE
PROCESS B:
unlink("upper/new");
PROCESS A:
lookup newdentry in new_upperdir
call vfs_rename() with negative newdentry and RENAME_EXCHANGE
Fix by adding the missing check for negative newdentry.
--- fs/overlayfs/dir.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/overlayfs/dir.c +7 -3
@@ -1162,9 +1162,13 @@ static int ovl_rename(struct inode *oldd goto out_dput; } }else { -if (!d_is_negative (newdentry) && - (!new_opaque || !ovl_is_whiteout (newdentry))) - goto out_dput; +if (!d_is_negative (newdentry)) { +if (!new_opaque || !ovl_is_whiteout (newdentry)) + goto out_dput; + }else { +if (flags &RENAME_EXCHANGE ) + goto out_dput; + } }if (olddentry == trap)
Greg Kroah-Hartman
maintainerPATCH 36/52 netlink: annotate data races around nlk->bound
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 7707a4d01a648e4c655101a469c956cb11273655 ]
While existing code is correct, KCSAN is reporting a data-race in netlink_insert / netlink_sendmsg [1]
It is correct to read nlk->bound without a lock, as netlink_autobind() will acquire all needed locks.
[1]
BUG: KCSAN: data-race in netlink_insert / netlink_sendmsg
write to 0xffff8881031c8b30 of 1 bytes by task 18752 on cpu 0:
netlink_insert+0x5cc/0x7f0 net/netlink/af_netlink.c:597 netlink_autobind+0xa9/0x150 net/netlink/af_netlink.c:842 netlink_sendmsg+0x479/0x7c0 net/netlink/af_netlink.c:1892 sock_sendmsg_nosec net/socket.c:703 [inline] sock_sendmsg net/socket.c:723 [inline] ____sys_sendmsg+0x360/0x4d0 net/socket.c:2392 ___sys_sendmsg net/socket.c:2446 [inline] __sys_sendmsg+0x1ed/0x270 net/socket.c:2475 __do_sys_sendmsg net/socket.c:2484 [inline] __se_sys_sendmsg net/socket.c:2482 [inline] __x64_sys_sendmsg+0x42/0x50 net/socket.c:2482 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
read to 0xffff8881031c8b30 of 1 bytes by task 18751 on cpu 1:
netlink_sendmsg+0x270/0x7c0 net/netlink/af_netlink.c:1891 sock_sendmsg_nosec net/socket.c:703 [inline] sock_sendmsg net/socket.c:723 [inline] __sys_sendto+0x2a8/0x370 net/socket.c:2019 __do_sys_sendto net/socket.c:2031 [inline] __se_sys_sendto net/socket.c:2027 [inline] __x64_sys_sendto+0x74/0x90 net/socket.c:2027 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
value changed: 0x00 -> 0x01
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 18751 Comm: syz-executor.0 Not tainted 5.14.0-rc1-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/netlink/af_netlink.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/netlink/af_netlink.c +10 -4
@@ -585,7 +585,10 @@ static int netlink_insert(struct sock *sk, u32 portid)/* We need to ensure that the socket is hashed and visible. */ smp_wmb (); -nlk_sk (sk)->bound = portid; +/* Paired with lockless reads from netlink_bind(), +* netlink_connect() and netlink_sendmsg(). +*/ +WRITE_ONCE (nlk_sk (sk)->bound, portid); err:release_sock (sk);
@@ -1003,7 +1006,8 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,if (nlk->ngroups <BITS_PER_LONG ) groups &= (1UL << nlk->ngroups) -1 ; - bound = nlk->bound; +/* Paired with WRITE_ONCE() in netlink_insert() */ + bound =READ_ONCE (nlk->bound);if (bound) {/* Ensure nlk->portid is up-to-date. */ smp_rmb ();
@@ -1089,8 +1093,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,/* No need for barriers here as we return to user-space without * using any of the bound attributes. +* Paired with WRITE_ONCE() in netlink_insert(). */ -if (!nlk->bound) +if (!READ_ONCE (nlk->bound)) err =netlink_autobind (sock);if (err ==0 ) {
@@ -1879,7 +1884,8 @@ static int netlink_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) dst_group = nlk->dst_group; } -if (!nlk->bound) { +/* Paired with WRITE_ONCE() in netlink_insert() */ +if (!READ_ONCE (nlk->bound)) { err =netlink_autobind (sock);if (err) goto out;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 37/52 bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit b13a270ace2e4c70653aa1d1d0394c553905802f ]
Commit 94f6345712b3 ("bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO") should have also added the quirk for dra7 dcan1 in addition to dcan2 for errata i893 handling.
Let's also pass the quirk flag for legacy mode booting for if "ti,hwmods" dts property is used with related dcan hwmod data. This should be only needed if anybody needs to git bisect earlier stable trees though.
--- arch/arm/mach-omap2/omap_hwmod.c | 2 ++ drivers/bus/ti-sysc.c | 3 +++ 2 files changed, 5 insertions(+)
arch/arm/mach-omap2/omap_hwmod.c +2 -0
@@ -3656,6 +3656,8 @@ int omap_hwmod_init_module(struct device *dev, oh->flags |=HWMOD_SWSUP_SIDLE_ACT ;if (data->cfg->quirks &SYSC_QUIRK_SWSUP_MSTANDBY ) oh->flags |=HWMOD_SWSUP_MSTANDBY ; +if (data->cfg->quirks &SYSC_QUIRK_CLKDM_NOAUTO ) + oh->flags |=HWMOD_CLKDM_NOAUTO ; error = omap_hwmod_check_module(dev, oh, data, sysc_fields, rev_offs, sysc_offs, syss_offs,
drivers/bus/ti-sysc.c +3 -0
@@ -1388,6 +1388,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {/* Quirks that need to be set based on detected module */ SYSC_QUIRK ("aess" ,0 ,0 ,0x10 , -ENODEV ,0x40000000 ,0xffffffff ,SYSC_MODULE_QUIRK_AESS ), +/* Errata i893 handling for dra7 dcan1 and 2 */ +SYSC_QUIRK ("dcan" ,0x4ae3c000 ,0x20 , -ENODEV , -ENODEV ,0xa3170504 ,0xffffffff , +SYSC_QUIRK_CLKDM_NOAUTO ),SYSC_QUIRK ("dcan" ,0x48480000 ,0x20 , -ENODEV , -ENODEV ,0xa3170504 ,0xffffffff ,SYSC_QUIRK_CLKDM_NOAUTO ), SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 38/52 video: fbdev: gbefb: Only instantiate device when built for IP32
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit 11b8e2bb986d23157e82e267fb8cc6b281dfdee9 ]
The gbefb driver not only registers a driver but also the device for that driver. This is all well and good when run on the IP32 machines that are supported by the driver but since the driver supports building with COMPILE_TEST we might also be building on other platforms which do not have this hardware and will crash instantiating the driver. Add an IS_ENABLED() check so we compile out the device registration if we don't have the Kconfig option for the machine enabled.
--- drivers/video/fbdev/gbefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/gbefb.c +1 -1
@@ -1269,7 +1269,7 @@ static struct platform_device *gbefb_device;static int __init gbefb_init (void ) {int ret =platform_driver_register (&gbefb_driver); -if (!ret) { +if (IS_ENABLED (CONFIG_SGI_IP32 ) && !ret) { gbefb_device =platform_device_alloc ("gbefb" ,0 );if (gbefb_device) { ret =platform_device_add (gbefb_device);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 39/52 drm/nouveau/debugfs: fix file release memory leak
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f5a8703a9c418c6fc54eb772712dfe7641e3991c ]
When using single_open() for opening, single_release() should be called, otherwise the 'op' allocated in single_open() will be leaked.
--- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nouveau_debugfs.c +1 -0
@@ -207,6 +207,7 @@ static const struct file_operations nouveau_pstate_fops = { .open = nouveau_debugfs_pstate_open, .read = seq_read, .write = nouveau_debugfs_pstate_set, + .release = single_release, };static struct drm_info_list nouveau_debugfs_list[] = {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 40/52 gve: Correct available tx qpl check
In reply to Greg Kroah-HartmanFrom: Catherine Sullivan <[email protected]>
[ Upstream commit d03477ee10f4bc35d3573cf1823814378ef2dca2 ]
The qpl_map_size is rounded up to a multiple of sizeof(long), but the number of qpls doesn't have to be.
--- drivers/net/ethernet/google/gve/gve.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/google/gve/gve.h +1 -1
@@ -391,7 +391,7 @@ struct gve_queue_page_list *gve_assign_rx_qpl(struct gve_priv *priv) gve_num_tx_qpls(priv));/* we are out of rx qpls */ -if (id == priv->qpl_cfg.qpl_map_size) +if (id ==gve_num_tx_qpls (priv) +gve_num_rx_qpls (priv))return NULL ;set_bit (id, priv->qpl_cfg.qpl_id_map);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 41/52 rtnetlink: fix if_nlmsg_stats_size() under estimation
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit d34367991933d28bd7331f67a759be9a8c474014 ]
rtnl_fill_statsinfo() is filling skb with one mandatory if_stats_msg structure.
nlmsg_put(skb, pid, seq, type, sizeof(struct if_stats_msg), flags);
But if_nlmsg_stats_size() never considered the needed storage.
This bug did not show up because alloc_skb(X) allocates skb with extra tailroom, because of added alignments. This could very well be changed in the future to have deterministic behavior.
--- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/rtnetlink.c +1 -1
@@ -4950,7 +4950,7 @@ nla_put_failure:static size_t if_nlmsg_stats_size (const struct net_device *dev,u32 filter_mask) { -size_t size =0 ; +size_t size =NLMSG_ALIGN (sizeof (struct if_stats_msg ));if (stats_attr_valid (filter_mask,IFLA_STATS_LINK_64 ,0 )) size +=nla_total_size_64bit (sizeof (struct rtnl_link_stats64 ));
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 42/52 gve: fix gve_get_stats()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 2f57d4975fa027eabd35fdf23a49f8222ef3abf2 ]
gve_get_stats() can report wrong numbers if/when u64_stats_fetch_retry() returns true.
What is needed here is to sample values in temporary variables, and only use them after each loop is ended.
--- drivers/net/ethernet/google/gve/gve_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/google/gve/gve_main.c +9 -4
@@ -30,6 +30,7 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s) {struct gve_priv *priv =netdev_priv (dev);unsigned int start; +u64 packets, bytes;int ring;if (priv->rx) {
@@ -37,10 +38,12 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)do { start =u64_stats_fetch_begin (&priv->rx[ring].statss); - s->rx_packets += priv->rx[ring].rpackets; - s->rx_bytes += priv->rx[ring].rbytes; + packets = priv->rx[ring].rpackets; + bytes = priv->rx[ring].rbytes; }while (u64_stats_fetch_retry (&priv->rx[ring].statss, start)); + s->rx_packets += packets; + s->rx_bytes += bytes; } }if (priv->tx) {
@@ -48,10 +51,12 @@ static void gve_get_stats(struct net_device *dev, struct rtnl_link_stats64 *s)do { start =u64_stats_fetch_begin (&priv->tx[ring].statss); - s->tx_packets += priv->tx[ring].pkt_done; - s->tx_bytes += priv->tx[ring].bytes_done; + packets = priv->tx[ring].pkt_done; + bytes = priv->tx[ring].bytes_done; }while (u64_stats_fetch_retry (&priv->tx[ring].statss, start)); + s->tx_packets += packets; + s->tx_bytes += bytes; } } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 43/52 i40e: fix endless loop under rtnl
In reply to Greg Kroah-HartmanFrom: Jiri Benc <[email protected]>
[ Upstream commit 857b6c6f665cca9828396d9743faf37fd09e9ac3 ]
The loop in i40e_get_capabilities can never end. The problem is that although i40e_aq_discover_capabilities returns with an error if there's a firmware problem, the returned error is not checked. There is a check for pf->hw.aq.asq_last_status but that value is set to I40E_AQ_RC_OK on most firmware problems.
When i40e_aq_discover_capabilities encounters a firmware problem, it will encounter the same problem on its next invocation. As the result, the loop becomes endless. We hit this with I40E_ERR_ADMIN_QUEUE_TIMEOUT but looking at the code, it can happen with a range of other firmware errors.
I don't know what the correct behavior should be: whether the firmware should be retried a few times, or whether pf->hw.aq.asq_last_status should be always set to the encountered firmware error (but then it would be pointless and can be just replaced by the i40e_aq_discover_capabilities return value). However, the current behavior with an endless loop under the rtnl mutex(!) is unacceptable and Intel has not submitted a fix, although we explained the bug to them 7 months ago.
This may not be the best possible fix but it's better than hanging the whole system on a firmware bug.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -9616,7 +9616,7 @@ static int i40e_get_capabilities(struct i40e_pf *pf,if (pf->hw.aq.asq_last_status ==I40E_AQ_RC_ENOMEM ) {/* retry with a larger buffer */ buf_len = data_size; - }else if (pf->hw.aq.asq_last_status !=I40E_AQ_RC_OK ) { + }else if (pf->hw.aq.asq_last_status !=I40E_AQ_RC_OK || err) { dev_info(&pf->pdev->dev, "capability discovery failed, err %s aq_err %s\n", i40e_stat_str(&pf->hw, err),
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 44/52 i40e: Fix freeing of uninitialized misc IRQ vector
In reply to Greg Kroah-HartmanFrom: Sylwester Dziedziuch <[email protected]>
[ Upstream commit 2e5a20573a926302b233b0c2e1077f5debc7ab2e ]
When VSI set up failed in i40e_probe() as part of PF switch set up driver was trying to free misc IRQ vectors in i40e_clear_interrupt_scheme and produced a kernel Oops:
Trying to free already-free IRQ 266
WARNING: CPU: 0 PID: 5 at kernel/irq/manage.c:1731 __free_irq+0x9a/0x300 Workqueue: events work_for_cpu_fn RIP: 0010:__free_irq+0x9a/0x300 Call Trace: ? synchronize_irq+0x3a/0xa0 free_irq+0x2e/0x60 i40e_clear_interrupt_scheme+0x53/0x190 [i40e] i40e_probe.part.108+0x134b/0x1a40 [i40e] ? kmem_cache_alloc+0x158/0x1c0 ? acpi_ut_update_ref_count.part.1+0x8e/0x345 ? acpi_ut_update_object_reference+0x15e/0x1e2 ? strstr+0x21/0x70 ? irq_get_irq_data+0xa/0x20 ? mp_check_pin_attr+0x13/0xc0 ? irq_get_irq_data+0xa/0x20 ? mp_map_pin_to_irq+0xd3/0x2f0 ? acpi_register_gsi_ioapic+0x93/0x170 ? pci_conf1_read+0xa4/0x100 ? pci_bus_read_config_word+0x49/0x70 ? do_pci_enable_device+0xcc/0x100 local_pci_probe+0x41/0x90 work_for_cpu_fn+0x16/0x20 process_one_work+0x1a7/0x360 worker_thread+0x1cf/0x390 ? create_worker+0x1a0/0x1a0 kthread+0x112/0x130 ? kthread_flush_work_fn+0x10/0x10 ret_from_fork+0x1f/0x40
The problem is that at that point misc IRQ vectors were not allocated yet and we get a call trace that driver is trying to free already free IRQ vectors.
Add a check in i40e_clear_interrupt_scheme for __I40E_MISC_IRQ_REQUESTED PF state before calling i40e_free_misc_vector. This state is set only if misc IRQ vectors were properly initialized.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -1
@@ -4817,7 +4817,8 @@ static void i40e_clear_interrupt_scheme(struct i40e_pf *pf) {int i; -i40e_free_misc_vector (pf); +if (test_bit (__I40E_MISC_IRQ_REQUESTED, pf->state)) +i40e_free_misc_vector (pf);i40e_put_lump (pf->irq_pile, pf->iwarp_base_vector,I40E_IWARP_IRQ_PILE_ID );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 45/52 net: prefer socket bound to interface when not in VRF
In reply to Greg Kroah-HartmanFrom: Mike Manning <[email protected]>
[ Upstream commit 8d6c414cd2fb74aa6812e9bfec6178f8246c4f3a ]
The commit 6da5b0f027a8 ("net: ensure unbound datagram socket to be chosen when not in a VRF") modified compute_score() so that a device match is always made, not just in the case of an l3mdev skb, then increments the score also for unbound sockets. This ensures that sockets bound to an l3mdev are never selected when not in a VRF. But as unbound and bound sockets are now scored equally, this results in the last opened socket being selected if there are matches in the default VRF for an unbound socket and a socket bound to a dev that is not an l3mdev. However, handling prior to this commit was to always select the bound socket in this case. Reinstate this handling by incrementing the score only for bound sockets. The required isolation due to choosing between an unbound socket and a socket bound to an l3mdev remains in place due to the device match always being made. The same approach is taken for compute_score() for stream sockets.
--- net/ipv4/inet_hashtables.c | 4 +++- net/ipv4/udp.c | 3 ++- net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/udp.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
net/ipv4/inet_hashtables.c +3 -1
@@ -239,8 +239,10 @@ static inline int compute_score(struct sock *sk, struct net *net,if (!inet_sk_bound_dev_eq (net, sk->sk_bound_dev_if, dif, sdif))return -1 ; + score = sk->sk_bound_dev_if ?2 :1 ; - score = sk->sk_family ==PF_INET ?2 :1 ; +if (sk->sk_family ==PF_INET ) + score++;if (READ_ONCE (sk->sk_incoming_cpu) ==raw_smp_processor_id ()) score++; }
net/ipv4/udp.c +2 -1
@@ -386,7 +386,8 @@ static int compute_score(struct sock *sk, struct net *net, dif, sdif);if (!dev_match)return -1 ; - score +=4 ; +if (sk->sk_bound_dev_if) + score +=4 ;if (READ_ONCE (sk->sk_incoming_cpu) ==raw_smp_processor_id ()) score++;
net/ipv6/inet6_hashtables.c +1 -1
@@ -104,7 +104,7 @@ static inline int compute_score(struct sock *sk, struct net *net,if (!inet_sk_bound_dev_eq (net, sk->sk_bound_dev_if, dif, sdif))return -1 ; - score =1 ; + score = sk->sk_bound_dev_if ?2 :1 ;if (READ_ONCE (sk->sk_incoming_cpu) ==raw_smp_processor_id ()) score++; }
net/ipv6/udp.c +2 -1
@@ -133,7 +133,8 @@ static int compute_score(struct sock *sk, struct net *net, dev_match =udp_sk_bound_dev_eq (net, sk->sk_bound_dev_if, dif, sdif);if (!dev_match)return -1 ; - score++; +if (sk->sk_bound_dev_if) + score++;if (READ_ONCE (sk->sk_incoming_cpu) ==raw_smp_processor_id ()) score++;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 28/52 powerpc/fsl/dts: Fix phy-connection-type for fm1mac3
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit eed183abc0d3b8adb64fd1363b7cea7986cd58d6 ]
Property phy-connection-type contains invalid value "sgmii-2500" per scheme defined in file ethernet-controller.yaml.
Correct phy-connection-type value should be "2500base-x".
--- arch/powerpc/boot/dts/fsl/t1023rdb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/boot/dts/fsl/t1023rdb.dts +1 -1
@@ -154,7 +154,7 @@ fm1mac3: ethernet@e4000 { phy-handle = <&sgmii_aqr_phy3>; - phy-connection-type = "sgmii-2500"; + phy-connection-type = "2500base-x"; sleep = <&rcpm 0x20000000>; };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 46/52 i2c: acpi: fix resource leak in reconfiguration device addition
In reply to Greg Kroah-HartmanFrom: Jamie Iles <[email protected]>
[ Upstream commit 6558b646ce1c2a872fe1c2c7cb116f05a2c1950f ]
acpi_i2c_find_adapter_by_handle() calls bus_find_device() which takes a reference on the adapter which is never released which will result in a reference count leak and render the adapter unremovable. Make sure to put the adapter after creating the client in the same manner that we do for OF.
--- drivers/i2c/i2c-core-acpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/i2c-core-acpi.c +1 -0
@@ -436,6 +436,7 @@ static int i2c_acpi_notify(struct notifier_block *nb, unsigned long value,break ;i2c_acpi_register_device (adapter, adev, &info); +put_device (&adapter->dev);break ;case ACPI_RECONFIG_DEVICE_REMOVE :if (!acpi_device_enumerated (adev))
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 47/52 bpf, s390: Fix potential memory leak about jit_data
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 686cb8b9f6b46787f035afe8fbd132a74e6b1bdd ]
Make sure to free jit_data through kfree() in the error path.
--- arch/s390/net/bpf_jit_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/net/bpf_jit_comp.c +1 -1
@@ -1385,7 +1385,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) jit.addrs =kvcalloc (fp->len +1 ,sizeof (*jit.addrs),GFP_KERNEL );if (jit.addrs ==NULL ) { fp = orig_fp; - goto out; + goto free_addrs; }/* * Three initial passes:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 48/52 RISC-V: Include clone3() on rv32
In reply to Greg Kroah-HartmanFrom: Palmer Dabbelt <[email protected]>
[ Upstream commit 59a4e0d5511ba61353ea9a4efdb1b86c23ecf134 ]
As far as I can tell this should be enabled on rv32 as well, I'm not sure why it's rv64-only. checksyscalls is complaining about our lack of clone3() on rv32.
--- arch/riscv/include/uapi/asm/unistd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/riscv/include/uapi/asm/unistd.h +2 -1
@@ -18,9 +18,10 @@#ifdef __LP64__#define __ARCH_WANT_NEW_STAT#define __ARCH_WANT_SET_GET_RLIMIT -#define __ARCH_WANT_SYS_CLONE3#endif /* __LP64__ */ +#define __ARCH_WANT_SYS_CLONE3 +#include <asm-generic/unistd.h> /*
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 51/52 x86/hpet: Use another crystalball to evaluate HPET usability
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 6e3cd95234dc1eda488f4f487c281bac8fef4d9b upstream.
On recent Intel systems the HPET stops working when the system reaches PC10 idle state.
The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense.
Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI, intel_idle enablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "hpet=force" on the kernel command line.
Remove the related early PCI quirks for affected Ice Cake and Coffin Lake systems as they are not longer required. That should also cover all other systems, i.e. Tiger Rag and newer generations, which are most likely affected by this as well.
--- arch/x86/kernel/early-quirks.c | 6 --- arch/x86/kernel/hpet.c | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 6 deletions(-)
arch/x86/kernel/early-quirks.c +0 -6
@@ -710,12 +710,6 @@ static struct chipset early_qrk[] __init*/ {PCI_VENDOR_ID_INTEL ,0x0f00 , PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, - { PCI_VENDOR_ID_INTEL, 0x3e20, - PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, - { PCI_VENDOR_ID_INTEL, 0x3ec4, - PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, - { PCI_VENDOR_ID_INTEL, 0x8a12, - PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, { PCI_VENDOR_ID_BROADCOM, 0x4331, PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset}, {}
arch/x86/kernel/hpet.c +81 -0
99 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 29/52 ptp_pch: Load module automatically if ID matches
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7cd8b1542a7ba0720c5a0a85ed414a122015228b ]
The driver can't be loaded automatically because it misses module alias to be provided. Add corresponding MODULE_DEVICE_TABLE() call to the driver.
--- drivers/ptp/ptp_pch.c | 1 + 1 file changed, 1 insertion(+)
drivers/ptp/ptp_pch.c +1 -0
@@ -683,6 +683,7 @@ static const struct pci_device_id pch_ieee1588_pcidev_id[] = { }, {0} }; +MODULE_DEVICE_TABLE (pci, pch_ieee1588_pcidev_id);static struct pci_driver pch_driver = { .name =KBUILD_MODNAME ,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 50/52 x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
commit 4758fd801f919b8b9acad78d2e49a195ec2be46b upstream.
The refactoring in the commit in Fixes introduced an ifdef CONFIG_OLPC_XO1_5_SCI, however the config symbol is actually called "CONFIG_OLPC_XO15_SCI".
Fortunately, ./scripts/checkkconfigsymbols.py warns:
OLPC_XO1_5_SCI
Referencing files: arch/x86/platform/olpc/olpc.c
Correct this ifdef condition to the intended config symbol.
--- arch/x86/platform/olpc/olpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/olpc/olpc.c +1 -1
@@ -274,7 +274,7 @@ static struct olpc_ec_driver ec_xo1_drivstatic struct olpc_ec_driver ec_xo1_5_driver = { .ec_cmd = olpc_xo1_ec_cmd, -#ifdef CONFIG_OLPC_XO1_5_SCI +#ifdef CONFIG_OLPC_XO15_SCI/* * XO-1.5 EC wakeups are available when olpc-xo15-sci driver is * compiled in
Greg Kroah-Hartman
maintainerPATCH 52/52 x86/Kconfig: Correct reference to MWINCHIP3D
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
commit 225bac2dc5d192e55f2c50123ee539b1edf8a411 upstream.
Commit in Fixes intended to exclude the Winchip series and referred to CONFIG_WINCHIP3D, but the config symbol is called CONFIG_MWINCHIP3D.
Hence, scripts/checkkconfigsymbols.py warns:
WINCHIP3D
Referencing files: arch/x86/Kconfig
Correct the reference to the intended config symbol.
--- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
@@ -1425,7 +1425,7 @@ config HIGHMEM4G config HIGHMEM64G bool "64GB" - depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6 + depends on !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6 select X86_PAE ---help--- Select this if you have a 32-bit processor and more than 4
Greg Kroah-Hartman
maintainerPATCH 31/52 arm64: dts: ls1028a: add missing CAN nodes
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit 04fa4f03e3533f51b4db19cb487435f5862a0514 ]
The LS1028A has two FlexCAN controller. These are compatible with the ones from the LX2160A. Add the nodes.
The first controller was tested on the Kontron sl28 board.
--- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +18 -0
@@ -287,6 +287,24 @@ status = "disabled"; }; + can0: can@2180000 { + compatible = "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan"; + reg = <0x0 0x2180000 0x0 0x10000>; + interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sysclk>, <&clockgen 4 1>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + + can1: can@2190000 { + compatible = "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan"; + reg = <0x0 0x2190000 0x0 0x10000>; + interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sysclk>, <&clockgen 4 1>; + clock-names = "ipg", "per"; + status = "disabled"; + }; + duart0: serial@21c0500 { compatible = "fsl,ns16550", "ns16550a"; reg = <0x00 0x21c0500 0x0 0x100>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 32/52 ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
In reply to Greg Kroah-HartmanFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 783f3db030563f7bcdfe2d26428af98ea1699a8e ]
Any pending interrupt can prevent entering standby based power off state. To avoid it, disable the GIC CPU interface.
--- arch/arm/mach-imx/pm-imx6.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-imx/pm-imx6.c +2 -0
@@ -9,6 +9,7 @@#include <linux/io.h> #include <linux/irq.h> #include <linux/genalloc.h> +#include <linux/irqchip/arm-gic.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> #include <linux/of.h>
@@ -618,6 +619,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdatastatic void imx6_pm_stby_poweroff (void ) { +gic_cpu_if_down (0 );imx6_set_lpm (STOP_POWER_OFF );imx6q_suspend_finish (0 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 33/52 net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit dbe0b88064494b7bb6a9b2aa7e085b14a3112d44 ]
bridge_fill_linkxstats() is using nla_reserve_64bit().
We must use nla_total_size_64bit() instead of nla_total_size() for corresponding data structure.
--- net/bridge/br_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bridge/br_netlink.c +1 -1
@@ -1536,7 +1536,7 @@ static size_t br_get_linkxstats_size(const struct net_device *dev, int attr) }return numvls *nla_total_size (sizeof (struct bridge_vlan_xstats )) + -nla_total_size (sizeof (struct br_mcast_stats )) + +nla_total_size_64bit (sizeof (struct br_mcast_stats )) +nla_total_size (0 ); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 34/52 net/sched: sch_taprio: properly cancel timer from taprio_destroy()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit a56d447f196fa9973c568f54c0d76d5391c3b0c0 ]
There is a comment in qdisc_create() about us not calling ops->reset() in some cases.
err_out4:
/* * Any broken qdiscs that would require a ops->reset() here? * The qdisc was never in action so it shouldn't be necessary. */
As taprio sets a timer before actually receiving a packet, we need to cancel it from ops->destroy, just in case ops->reset has not been called.
syzbot reported:
ODEBUG: free active (active state 0) object type: hrtimer hint: advance_sched+0x0/0x9a0 arch/x86/include/asm/atomic64_64.h:22
WARNING: CPU: 0 PID: 8441 at lib/debugobjects.c:505 debug_print_object+0x16e/0x250 lib/debugobjects.c:505 Modules linked in: CPU: 0 PID: 8441 Comm: syz-executor813 Not tainted 5.14.0-rc6-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:debug_print_object+0x16e/0x250 lib/debugobjects.c:505 Code: ff df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 af 00 00 00 48 8b 14 dd e0 d3 e3 89 4c 89 ee 48 c7 c7 e0 c7 e3 89 e8 5b 86 11 05 <0f> 0b 83 05 85 03 92 09 01 48 83 c4 18 5b 5d 41 5c 41 5d 41 5e c3 RSP: 0018:ffffc9000130f330 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000000 RDX: ffff88802baeb880 RSI: ffffffff815d87b5 RDI: fffff52000261e58 RBP: 0000000000000001 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff815d25ee R11: 0000000000000000 R12: ffffffff898dd020 R13: ffffffff89e3ce20 R14: ffffffff81653630 R15: dffffc0000000000 FS: 0000000000f0d300(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffb64b3e000 CR3: 0000000036557000 CR4: 00000000001506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __debug_check_no_obj_freed lib/debugobjects.c:987 [inline] debug_check_no_obj_freed+0x301/0x420 lib/debugobjects.c:1018 slab_free_hook mm/slub.c:1603 [inline] slab_free_freelist_hook+0x171/0x240 mm/slub.c:1653 slab_free mm/slub.c:3213 [inline] kfree+0xe4/0x540 mm/slub.c:4267 qdisc_create+0xbcf/0x1320 net/sched/sch_api.c:1299 tc_modify_qdisc+0x4c8/0x1a60 net/sched/sch_api.c:1663 rtnetlink_rcv_msg+0x413/0xb80 net/core/rtnetlink.c:5571 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340 netlink_sendmsg+0x86d/0xdb0 net/netlink/af_netlink.c:1929 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:724 ____sys_sendmsg+0x6e8/0x810 net/socket.c:2403 ___sys_sendmsg+0xf3/0x170 net/socket.c:2457 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2486 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
--- net/sched/sch_taprio.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sched/sch_taprio.c +4 -0
@@ -1630,6 +1630,10 @@ static void taprio_destroy(struct Qdisc *sch)list_del (&q->taprio_list);spin_unlock (&taprio_list_lock); +/* Note that taprio_reset() might not be called if an error +* happens in qdisc_create(), after taprio_init() has been called. +*/ +hrtimer_cancel (&q->advance_timer);taprio_disable_offload (dev, q,NULL );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 35/52 net: sfp: Fix typo in state machine debug string
In reply to Greg Kroah-HartmanFrom: Sean Anderson <[email protected]>
[ Upstream commit 25a9da6641f1f66006e93ddbefee13a437efa8c0 ]
The string should be "tx_disable" to match the state enum.
--- drivers/net/phy/sfp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/sfp.c +1 -1
@@ -115,7 +115,7 @@ static const char * const sm_state_strings[] = { [SFP_S_LINK_UP] = "link_up", [SFP_S_TX_FAULT] = "tx_fault", [SFP_S_REINIT] = "reinit", - [SFP_S_TX_DISABLE] = "rx_disable", + [SFP_S_TX_DISABLE] = "tx_disable", };static const char *sm_state_to_str (unsigned short sm_state)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 26/52 phy: mdio: fix memory leak
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit ca6e11c337daf7925ff8a2aac8e84490a8691905 ]
Syzbot reported memory leak in MDIO bus interface, the problem was in wrong state logic.
MDIOBUS_ALLOCATED indicates 2 states:
1. Bus is only allocated
2. Bus allocated and __mdiobus_register() fails, but device_register() was called
In case of device_register() has been called we should call put_device() to correctly free the memory allocated for this device, but mdiobus_free() calls just kfree(dev) in case of MDIOBUS_ALLOCATED state
To avoid this behaviour we need to set bus->state to MDIOBUS_UNREGISTERED _before_ calling device_register(), because put_device() should be called even in case of device_register() failure.
--- drivers/net/phy/mdio_bus.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/phy/mdio_bus.c +7 -0
@@ -385,6 +385,13 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) bus->dev.groups =NULL ;dev_set_name (&bus->dev,"%s" , bus->id); +/* We need to set state to MDIOBUS_UNREGISTERED to correctly release +* the device in mdiobus_free() +* +* State will be updated later in this function in case of success +*/ + bus->state =MDIOBUS_UNREGISTERED ; + err =device_register (&bus->dev);if (err) {pr_err ("mii_bus %s failed to register\n" , bus->id);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 30/52 arm64: dts: freescale: Fix SP805 clock-names
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit f2dc2359b75e1fd345fd710862f73db20dc55864 ]
The SP805 binding sets the order of the clock-names to be: "wdog_clk", "apb_pclk" (in exactly that order).
Change the order in the DTs for Freescale platforms to match that. The two clocks given in all nodes are actually the same, so that does not change any behaviour.
--- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 4 ++-- arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 16 ++++++++-------- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +2 -2
@@ -496,14 +496,14 @@ compatible = "arm,sp805", "arm,primecell"; reg = <0x0 0xc000000 0x0 0x1000>; clocks = <&clockgen 4 15>, <&clockgen 4 15>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster1_core1_watchdog: watchdog@c010000 { compatible = "arm,sp805", "arm,primecell"; reg = <0x0 0xc010000 0x0 0x1000>; clocks = <&clockgen 4 15>, <&clockgen 4 15>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; sai1: audio-controller@f100000 {
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +8 -8
@@ -640,56 +640,56 @@ compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc000000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster1_core1_watchdog: wdt@c010000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc010000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster1_core2_watchdog: wdt@c020000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc020000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster1_core3_watchdog: wdt@c030000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc030000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core0_watchdog: wdt@c100000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc100000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core1_watchdog: wdt@c110000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc110000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core2_watchdog: wdt@c120000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc120000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core3_watchdog: wdt@c130000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc130000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; fsl_mc: fsl-mc@80c000000 {
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +8 -8
@@ -230,56 +230,56 @@ compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc000000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster1_core1_watchdog: wdt@c010000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc010000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core0_watchdog: wdt@c100000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc100000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster2_core1_watchdog: wdt@c110000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc110000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster3_core0_watchdog: wdt@c200000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc200000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster3_core1_watchdog: wdt@c210000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc210000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster4_core0_watchdog: wdt@c300000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc300000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; cluster4_core1_watchdog: wdt@c310000 { compatible = "arm,sp805-wdt", "arm,primecell"; reg = <0x0 0xc310000 0x0 0x1000>; clocks = <&clockgen 4 3>, <&clockgen 4 3>; - clock-names = "apb_pclk", "wdog_clk"; + clock-names = "wdog_clk", "apb_pclk"; }; crypto: crypto@8000000 {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 49/52 powerpc/bpf: Fix BPF_MOD when imm == 1
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ]
Only ignore the operation if dividing by 1.
--- arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/powerpc/net/bpf_jit_comp64.c +8 -2
@@ -408,8 +408,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,case BPF_ALU64 |BPF_DIV |BPF_K :/* dst /= imm */ if (imm ==0 )return -EINVAL ; -else if (imm ==1 ) - goto bpf_alu32_trunc; +if (imm ==1 ) { +if (BPF_OP (code) ==BPF_DIV ) { + goto bpf_alu32_trunc; + }else { +EMIT (PPC_RAW_LI (dst_reg,0 )); +break ; + } + }PPC_LI32 (b2p[TMP_REG_1 ], imm);switch (BPF_CLASS (code)) {
Signature · 1 line
2.33.0
Jakub Kicinski
maintainerRe: [PATCH 5.4 51/52] x86/hpet: Use another crystalball to evaluate HPET usability
In reply to Greg Kroah-HartmanQuoted 21 lines · On Mon, 11 Oct 2021 15:46:20 +0200 Greg Kroah-Hartman wrote:
From: Thomas Gleixner <[email protected]>
commit
6e3cd95234dc1eda488f4f487c281bac8fef4d9bupstream.On recent Intel systems the HPET stops working when the system reaches PC10 idle state.
The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense.
Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI,
intel_idleenablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "hpet=force" on the kernel command line.Remove the related early PCI quirks for affected Ice Cake and Coffin Lake systems as they are not longer required. That should also cover all other systems, i.e. Tiger Rag and newer generations, which are most likely affected by this as well.
Quoted 9 lines
Fixes Yet another hardware trainwreckReported-by Jakub Kicinski <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Tested-by Jakub Kicinski <[email protected]>Reviewed-by Rafael J. Wysocki <[email protected]>Cc Kai-Heng Feng <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
FWIW I've never seen any problems prior to Paul's rework of bad clock detection in 5.13. Backports to 5.4 and 5.10 are not necessary.
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 51/52] x86/hpet: Use another crystalball to evaluate HPET usability
Quoted 32 lines · Jakub Kicinski
Quoted 21 lines · On Mon, 11 Oct 2021 15:46:20 +0200 Greg Kroah-Hartman wrote:
From: Thomas Gleixner <[email protected]>
commit
6e3cd95234dc1eda488f4f487c281bac8fef4d9bupstream.On recent Intel systems the HPET stops working when the system reaches PC10 idle state.
The approach of adding PCI ids to the early quirks to disable HPET on these systems is a whack a mole game which makes no sense.
Check for PC10 instead and force disable HPET if supported. The check is overbroad as it does not take ACPI,
intel_idleenablement and command line parameters into account. That's fine as long as there is at least PMTIMER available to calibrate the TSC frequency. The decision can be overruled by adding "hpet=force" on the kernel command line.Remove the related early PCI quirks for affected Ice Cake and Coffin Lake systems as they are not longer required. That should also cover all other systems, i.e. Tiger Rag and newer generations, which are most likely affected by this as well.
Quoted 9 lines
Fixes Yet another hardware trainwreckReported-by Jakub Kicinski <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>Tested-by Jakub Kicinski <[email protected]>Reviewed-by Rafael J. Wysocki <[email protected]>Cc Kai-Heng Feng <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 2 lines
FWIW I've never seen any problems prior to Paul's rework of bad clock detection in 5.13. Backports to 5.4 and 5.10 are not necessary.
Given that the hardware is still just as broken in those older kernels, why not?
thanks,
greg k-h
Jakub Kicinski
maintainerRe: [PATCH 5.4 51/52] x86/hpet: Use another crystalball to evaluate HPET usability
Quoted 5 lines · On Mon, 11 Oct 2021 16:05:50 +0200 Greg Kroah-Hartman wrote:
Quoted 2 lines
FWIW I've never seen any problems prior to Paul's rework of bad clock detection in 5.13. Backports to 5.4 and 5.10 are not necessary.
Given that the hardware is still just as broken in those older kernels, why not?
Just filling in with extra context, I did say "FWIW" ;)
I don't use 5.4 nor do I understand the consequences of bad hpet well enough to comment on risk vs reward here. By consequences of bad hpet I mean whether its going to impact anything beyond the tsc -> hpet fallback (which doesn't impact <5.13).
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.153-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.153-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Following patch caused build failures on stable rc 5.4.
Quoted 2 lines
Naveen N. Rao <[email protected]>
powerpc/bpf: Fix BPF_MOD when imm == 1
In file included from arch/powerpc/net/bpf_jit64.h:11,
from arch/powerpc/net/bpf_jit_comp64.c:19:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:415:46: error: implicit declaration of function 'PPC_RAW_LI'; did you mean 'PPC_RLWIMI'? [-Werror=implicit-function-declaration]
415 | EMIT(PPC_RAW_LI(dst_reg, 0));
| ^~~~~~~~~~arch/powerpc/net/bpf_jit.h:32:34: note: in definition of macro 'PLANT_INSTR'
32 | do { if (d) { (d)[idx] = instr; } idx++; } while (0)
| ^~~~~arch/powerpc/net/bpf_jit_comp64.c:415:41: note: in expansion of macro 'EMIT'
415 | EMIT(PPC_RAW_LI(dst_reg, 0));
| ^~~~cc1: all warnings being treated as errors
build url:
https://builds.tuxbuild.com/1zMdjlqarsON688BoMBlpCN2O3m/
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Re: [PATCH 5.4 49/52] powerpc/bpf: Fix BPF_MOD when imm == 1
In reply to Greg Kroah-Hartmanstable-rc 5.4 build failed due this patch.
- powerpc gcc-10-defconfig - FAILED
- powerpc gcc-11-defconfig - FAILED
- powerpc gcc-8-defconfig - FAILED
- powerpc gcc-9-defconfig - FAILED
Quoted 6 lines · Greg Kroah-Hartman
From: Naveen N. Rao <[email protected]>
[ Upstream commit
8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8]Only ignore the operation if dividing by 1.
<trim>
In file included from arch/powerpc/net/bpf_jit64.h:11,
from arch/powerpc/net/bpf_jit_comp64.c:19:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:415:46: error: implicit declaration of function 'PPC_RAW_LI'; did you mean 'PPC_RLWIMI'? [-Werror=implicit-function-declaration]
415 | EMIT(PPC_RAW_LI(dst_reg, 0));
| ^~~~~~~~~~arch/powerpc/net/bpf_jit.h:32:34: note: in definition of macro 'PLANT_INSTR'
32 | do { if (d) { (d)[idx] = instr; } idx++; } while (0)
| ^~~~~arch/powerpc/net/bpf_jit_comp64.c:415:41: note: in expansion of macro 'EMIT'
415 | EMIT(PPC_RAW_LI(dst_reg, 0));
| ^~~~cc1: all warnings being treated as errors
--
Linaro LKFT
https://lkft.linaro.org
ReplyReply to allForward
Re: [PATCH 5.4 49/52] powerpc/bpf: Fix BPF_MOD when imm == 1
Le 11/10/2021 à 19:33, Naresh Kamboju a écrit :
Quoted 16 lines
stable-rc 5.4 build failed due this patch.
- powerpc gcc-10-defconfig - FAILED
- powerpc gcc-11-defconfig - FAILED
- powerpc gcc-8-defconfig - FAILED
- powerpc gcc-9-defconfig - FAILEDQuoted 6 lines · Greg Kroah-Hartman
From: Naveen N. Rao <[email protected]>
[ Upstream commit
8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8]Only ignore the operation if dividing by 1.
Quoted 7 lines
<trim>
In file included from
arch/powerpc/net/bpf_jit64.h:11,from arch/powerpc/net/bpf_jit_comp64.c:19:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:415:46: error: implicit declaration of function 'PPC_RAW_LI'; did you mean 'PPC_RLWIMI'?
PPC_RAW_LI() was added by commit 3a1812379163 ("powerpc/ppc-opcode: Consolidate powerpc instructions from bpf_jit.h")
Priori to that you have to use PPC_LI() instead, with the same arguments.
Christophe
Quoted 18 lines
[-Werror=implicit-function-declaration]
415 |EMIT(PPC_RAW_LI(dst_reg, 0));
| ^~~~~~~~~~arch/powerpc/net/bpf_jit.h:32:34: note: in definition of macro 'PLANT_INSTR'32 | do { if (d) { (d)[idx] = instr; } idx++; } while (0) | ^~~~~ arch/powerpc/net/bpf_jit_comp64.c:415:41: note: in expansion of macro 'EMIT' 415 | EMIT(PPC_RAW_LI(dst_reg, 0)); | ^~~~cc1: all warnings being treated as errors
--
Linaro LKFT
https://lkft.linaro.org
ReplyReply to allForward
Sasha Levin
maintainerRe: [PATCH 5.4 49/52] powerpc/bpf: Fix BPF_MOD when imm == 1
Quoted 27 lines · Christophe Leroy
Le 11/10/2021 à 19:33, Naresh Kamboju a écrit :
Quoted 16 lines
stable-rc 5.4 build failed due this patch.
- powerpc gcc-10-defconfig - FAILED
- powerpc gcc-11-defconfig - FAILED
- powerpc gcc-8-defconfig - FAILED
- powerpc gcc-9-defconfig - FAILEDQuoted 6 lines · Greg Kroah-Hartman
From: Naveen N. Rao <[email protected]>
[ Upstream commit
8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8]Only ignore the operation if dividing by 1.
Quoted 7 lines
<trim>
In file included from
arch/powerpc/net/bpf_jit64.h:11,from arch/powerpc/net/bpf_jit_comp64.c:19:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:415:46: error: implicit declaration of function 'PPC_RAW_LI'; did you mean 'PPC_RLWIMI'?
Quoted 3 lines
PPC_RAW_LI()was added by commit3a1812379163("powerpc/ppc-opcode: Consolidate powerpc instructions frombpf_jit.h")Priori to that you have to use
PPC_LI()instead, with the same arguments.
I think that I forgot to reply: I've pushed a fixed patch resolved as proposed above.
Signature · 2 lines
Thanks, Sasha
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.153-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
Build results:
total: 157 pass: 155 fail: 2
Failed builds:
powerpc:defconfig
powerpc:allmodconfig
Qemu test results:
total: 444 pass: 423 fail: 21
Failed tests:
All pseries, powernv
Failures as already reported.
Guenter
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 49/52] powerpc/bpf: Fix BPF_MOD when imm == 1
In reply to Sasha LevinQuoted 28 lines · Sasha Levin
Quoted 27 lines · Christophe Leroy
Le 11/10/2021 à 19:33, Naresh Kamboju a écrit :
Quoted 23 lines
stable-rc 5.4 build failed due this patch.
- powerpc gcc-10-defconfig - FAILED
- powerpc gcc-11-defconfig - FAILED
- powerpc gcc-8-defconfig - FAILED
- powerpc gcc-9-defconfig - FAILEDQuoted 6 lines · Greg Kroah-Hartman
From: Naveen N. Rao <[email protected]>
[ Upstream commit
8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8]Only ignore the operation if dividing by 1.
<trim>
In file included from
arch/powerpc/net/bpf_jit64.h:11,from arch/powerpc/net/bpf_jit_comp64.c:19:
arch/powerpc/net/bpf_jit_comp64.c: In function 'bpf_jit_build_body':arch/powerpc/net/bpf_jit_comp64.c:415:46: error: implicit declaration of function 'PPC_RAW_LI'; did you mean 'PPC_RLWIMI'?
Quoted 7 lines
Quoted 4 lines
PPC_RAW_LI()was added by commit3a1812379163("powerpc/ppc-opcode:
Consolidate powerpc instructions frombpf_jit.h")Priori to that you have to use
PPC_LI()instead, with the same arguments.I think that I forgot to reply: I've pushed a fixed patch resolved as proposed above.
Thanks, I'll go push out new -rc for 4.19 and 5.4 now.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.153 release. There are 52 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 13 Oct 2021 13:44:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.153-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Tested on arm64 and x86 for 5.4.153-rc1,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-5.4.y
Version: 5.4.153-rc1
Commit: 2a225aa681c5c16b5283fb381b5326b94179fe6d
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8906
passed: 8906
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8906
passed: 8906
failed: 0
timeout: 0
--------------------------------------------------------------------