From: Sasha Levin Date: Tue, 22 Oct 2024 17:39:27 +0000 (-0400) Subject: Fixes for 6.1 X-Git-Tag: v5.15.170~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b0518454b9b7415b8768dc1eb1d40f513ae2d2d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/alsa-hda-cs8409-fix-possible-null-dereference.patch b/queue-6.1/alsa-hda-cs8409-fix-possible-null-dereference.patch new file mode 100644 index 00000000000..e9025644f17 --- /dev/null +++ b/queue-6.1/alsa-hda-cs8409-fix-possible-null-dereference.patch @@ -0,0 +1,45 @@ +From cda9a3e50eea6f953c37ae397b151133d37e5e58 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 01:16:45 +0300 +Subject: ALSA: hda/cs8409: Fix possible NULL dereference + +From: Murad Masimov + +[ Upstream commit c9bd4a82b4ed32c6d1c90500a52063e6e341517f ] + +If snd_hda_gen_add_kctl fails to allocate memory and returns NULL, then +NULL pointer dereference will occur in the next line. + +Since dolphin_fixups function is a hda_fixup function which is not supposed +to return any errors, add simple check before dereference, ignore the fail. + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: 20e507724113 ("ALSA: hda/cs8409: Add support for dolphin") +Signed-off-by: Murad Masimov +Link: https://patch.msgid.link/20241010221649.1305-1-m.masimov@maxima.ru +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_cs8409.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c +index e41316e2e9833..892223d9e64ab 100644 +--- a/sound/pci/hda/patch_cs8409.c ++++ b/sound/pci/hda/patch_cs8409.c +@@ -1411,8 +1411,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac + kctrl = snd_hda_gen_add_kctl(&spec->gen, "Line Out Playback Volume", + &cs42l42_dac_volume_mixer); + /* Update Line Out kcontrol template */ +- kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1, +- HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE; ++ if (kctrl) ++ kctrl->private_value = HDA_COMPOSE_AMP_VAL_OFS(DOLPHIN_HP_PIN_NID, 3, CS8409_CODEC1, ++ HDA_OUTPUT, CS42L42_VOL_DAC) | HDA_AMP_VAL_MIN_MUTE; + cs8409_enable_ur(codec, 0); + snd_hda_codec_set_name(codec, "CS8409/CS42L42"); + break; +-- +2.43.0 + diff --git a/queue-6.1/arm-dts-bcm2837-rpi-cm3-io3-fix-hdmi-hpd-gpio-pin.patch b/queue-6.1/arm-dts-bcm2837-rpi-cm3-io3-fix-hdmi-hpd-gpio-pin.patch new file mode 100644 index 00000000000..66f4bc24be7 --- /dev/null +++ b/queue-6.1/arm-dts-bcm2837-rpi-cm3-io3-fix-hdmi-hpd-gpio-pin.patch @@ -0,0 +1,42 @@ +From 79e2fd8ccf8c487ac731359fced135a1021a5f6f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 16 Jul 2024 02:03:11 +0300 +Subject: ARM: dts: bcm2837-rpi-cm3-io3: Fix HDMI hpd-gpio pin + +From: Florian Klink + +[ Upstream commit dc7785e4723510616d776862ddb4c08857a1bdb2 ] + +HDMI_HPD_N_1V8 is connected to GPIO pin 0, not 1. + +This fixes HDMI hotplug/output detection. + +See https://datasheets.raspberrypi.com/cm/cm3-schematics.pdf + +Signed-off-by: Florian Klink +Reviewed-by: Stefan Wahren +Link: https://lore.kernel.org/r/20240715230311.685641-1-flokli@flokli.de +Reviewed-by: Stefan Wahren +Fixes: a54fe8a6cf66 ("ARM: dts: add Raspberry Pi Compute Module 3 and IO board") +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +index cf84e69fced83..4b2f63e0ae7c0 100644 +--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts ++++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +@@ -76,7 +76,7 @@ + }; + + &hdmi { +- hpd-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>; ++ hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>; + power-domains = <&power RPI_POWER_DOMAIN_HDMI>; + status = "okay"; + }; +-- +2.43.0 + diff --git a/queue-6.1/arm64-probes-fix-uprobes-for-big-endian-kernels.patch b/queue-6.1/arm64-probes-fix-uprobes-for-big-endian-kernels.patch new file mode 100644 index 00000000000..1bd1698780e --- /dev/null +++ b/queue-6.1/arm64-probes-fix-uprobes-for-big-endian-kernels.patch @@ -0,0 +1,176 @@ +From 9165475548a67decdee9e67a6171dbd4e5dfc86e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 16:58:48 +0100 +Subject: arm64: probes: Fix uprobes for big-endian kernels + +From: Mark Rutland + +[ Upstream commit 13f8f1e05f1dc36dbba6cba0ae03354c0dafcde7 ] + +The arm64 uprobes code is broken for big-endian kernels as it doesn't +convert the in-memory instruction encoding (which is always +little-endian) into the kernel's native endianness before analyzing and +simulating instructions. This may result in a few distinct problems: + +* The kernel may may erroneously reject probing an instruction which can + safely be probed. + +* The kernel may erroneously erroneously permit stepping an + instruction out-of-line when that instruction cannot be stepped + out-of-line safely. + +* The kernel may erroneously simulate instruction incorrectly dur to + interpretting the byte-swapped encoding. + +The endianness mismatch isn't caught by the compiler or sparse because: + +* The arch_uprobe::{insn,ixol} fields are encoded as arrays of u8, so + the compiler and sparse have no idea these contain a little-endian + 32-bit value. The core uprobes code populates these with a memcpy() + which similarly does not handle endianness. + +* While the uprobe_opcode_t type is an alias for __le32, both + arch_uprobe_analyze_insn() and arch_uprobe_skip_sstep() cast from u8[] + to the similarly-named probe_opcode_t, which is an alias for u32. + Hence there is no endianness conversion warning. + +Fix this by changing the arch_uprobe::{insn,ixol} fields to __le32 and +adding the appropriate __le32_to_cpu() conversions prior to consuming +the instruction encoding. The core uprobes copies these fields as opaque +ranges of bytes, and so is unaffected by this change. + +At the same time, remove MAX_UINSN_BYTES and consistently use +AARCH64_INSN_SIZE for clarity. + +Tested with the following: + +| #include +| #include +| +| #define noinline __attribute__((noinline)) +| +| static noinline void *adrp_self(void) +| { +| void *addr; +| +| asm volatile( +| " adrp %x0, adrp_self\n" +| " add %x0, %x0, :lo12:adrp_self\n" +| : "=r" (addr)); +| } +| +| +| int main(int argc, char *argv) +| { +| void *ptr = adrp_self(); +| bool equal = (ptr == adrp_self); +| +| printf("adrp_self => %p\n" +| "adrp_self() => %p\n" +| "%s\n", +| adrp_self, ptr, equal ? "EQUAL" : "NOT EQUAL"); +| +| return 0; +| } + +.... where the adrp_self() function was compiled to: + +| 00000000004007e0 : +| 4007e0: 90000000 adrp x0, 400000 <__ehdr_start> +| 4007e4: 911f8000 add x0, x0, #0x7e0 +| 4007e8: d65f03c0 ret + +Before this patch, the ADRP is not recognized, and is assumed to be +steppable, resulting in corruption of the result: + +| # ./adrp-self +| adrp_self => 0x4007e0 +| adrp_self() => 0x4007e0 +| EQUAL +| # echo 'p /root/adrp-self:0x007e0' > /sys/kernel/tracing/uprobe_events +| # echo 1 > /sys/kernel/tracing/events/uprobes/enable +| # ./adrp-self +| adrp_self => 0x4007e0 +| adrp_self() => 0xffffffffff7e0 +| NOT EQUAL + +After this patch, the ADRP is correctly recognized and simulated: + +| # ./adrp-self +| adrp_self => 0x4007e0 +| adrp_self() => 0x4007e0 +| EQUAL +| # +| # echo 'p /root/adrp-self:0x007e0' > /sys/kernel/tracing/uprobe_events +| # echo 1 > /sys/kernel/tracing/events/uprobes/enable +| # ./adrp-self +| adrp_self => 0x4007e0 +| adrp_self() => 0x4007e0 +| EQUAL + +Fixes: 9842ceae9fa8 ("arm64: Add uprobe support") +Cc: stable@vger.kernel.org +Signed-off-by: Mark Rutland +Cc: Catalin Marinas +Cc: Will Deacon +Link: https://lore.kernel.org/r/20241008155851.801546-4-mark.rutland@arm.com +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/include/asm/uprobes.h | 8 +++----- + arch/arm64/kernel/probes/uprobes.c | 4 ++-- + 2 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/arch/arm64/include/asm/uprobes.h b/arch/arm64/include/asm/uprobes.h +index ba4bff5ca6749..98f29a43bfe89 100644 +--- a/arch/arm64/include/asm/uprobes.h ++++ b/arch/arm64/include/asm/uprobes.h +@@ -10,11 +10,9 @@ + #include + #include + +-#define MAX_UINSN_BYTES AARCH64_INSN_SIZE +- + #define UPROBE_SWBP_INSN cpu_to_le32(BRK64_OPCODE_UPROBES) + #define UPROBE_SWBP_INSN_SIZE AARCH64_INSN_SIZE +-#define UPROBE_XOL_SLOT_BYTES MAX_UINSN_BYTES ++#define UPROBE_XOL_SLOT_BYTES AARCH64_INSN_SIZE + + typedef u32 uprobe_opcode_t; + +@@ -23,8 +21,8 @@ struct arch_uprobe_task { + + struct arch_uprobe { + union { +- u8 insn[MAX_UINSN_BYTES]; +- u8 ixol[MAX_UINSN_BYTES]; ++ __le32 insn; ++ __le32 ixol; + }; + struct arch_probe_insn api; + bool simulate; +diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c +index d49aef2657cdf..a2f137a595fc1 100644 +--- a/arch/arm64/kernel/probes/uprobes.c ++++ b/arch/arm64/kernel/probes/uprobes.c +@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, + else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE)) + return -EINVAL; + +- insn = *(probe_opcode_t *)(&auprobe->insn[0]); ++ insn = le32_to_cpu(auprobe->insn); + + switch (arm_probe_decode_insn(insn, &auprobe->api)) { + case INSN_REJECTED: +@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs) + if (!auprobe->simulate) + return false; + +- insn = *(probe_opcode_t *)(&auprobe->insn[0]); ++ insn = le32_to_cpu(auprobe->insn); + addr = instruction_pointer(regs); + + if (auprobe->api.handler) +-- +2.43.0 + diff --git a/queue-6.1/arm64-uprobe-fix-the-uprobe-swbp_insn-in-big-endian.patch b/queue-6.1/arm64-uprobe-fix-the-uprobe-swbp_insn-in-big-endian.patch new file mode 100644 index 00000000000..3643d370f0c --- /dev/null +++ b/queue-6.1/arm64-uprobe-fix-the-uprobe-swbp_insn-in-big-endian.patch @@ -0,0 +1,96 @@ +From 24650ca091fa1a853b9251808fbeb2db25afa4ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 2 Dec 2022 15:11:10 +0800 +Subject: arm64:uprobe fix the uprobe SWBP_INSN in big-endian +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: junhua huang + +[ Upstream commit 60f07e22a73d318cddaafa5ef41a10476807cc07 ] + +We use uprobe in aarch64_be, which we found the tracee task would exit +due to SIGILL when we enable the uprobe trace. +We can see the replace inst from uprobe is not correct in aarch big-endian. +As in Armv8-A, instruction fetches are always treated as little-endian, +we should treat the UPROBE_SWBP_INSN as little-endian。 + +The test case is as following。 +bash-4.4# ./mqueue_test_aarchbe 1 1 2 1 10 > /dev/null & +bash-4.4# cd /sys/kernel/debug/tracing/ +bash-4.4# echo 'p:test /mqueue_test_aarchbe:0xc30 %x0 %x1' > uprobe_events +bash-4.4# echo 1 > events/uprobes/enable +bash-4.4# +bash-4.4# ps + PID TTY TIME CMD + 140 ? 00:00:01 bash + 237 ? 00:00:00 ps +[1]+ Illegal instruction ./mqueue_test_aarchbe 1 1 2 1 100 > /dev/null + +which we debug use gdb as following: + +bash-4.4# gdb attach 155 +(gdb) disassemble send +Dump of assembler code for function send: + 0x0000000000400c30 <+0>: .inst 0xa00020d4 ; undefined + 0x0000000000400c34 <+4>: mov x29, sp + 0x0000000000400c38 <+8>: str w0, [sp, #28] + 0x0000000000400c3c <+12>: strb w1, [sp, #27] + 0x0000000000400c40 <+16>: str xzr, [sp, #40] + 0x0000000000400c44 <+20>: str xzr, [sp, #48] + 0x0000000000400c48 <+24>: add x0, sp, #0x1b + 0x0000000000400c4c <+28>: mov w3, #0x0 // #0 + 0x0000000000400c50 <+32>: mov x2, #0x1 // #1 + 0x0000000000400c54 <+36>: mov x1, x0 + 0x0000000000400c58 <+40>: ldr w0, [sp, #28] + 0x0000000000400c5c <+44>: bl 0x405e10 + 0x0000000000400c60 <+48>: str w0, [sp, #60] + 0x0000000000400c64 <+52>: ldr w0, [sp, #60] + 0x0000000000400c68 <+56>: ldp x29, x30, [sp], #64 + 0x0000000000400c6c <+60>: ret +End of assembler dump. +(gdb) info b +No breakpoints or watchpoints. +(gdb) c +Continuing. + +Program received signal SIGILL, Illegal instruction. +0x0000000000400c30 in send () +(gdb) x/10x 0x400c30 +0x400c30 : 0xd42000a0 0xfd030091 0xe01f00b9 0xe16f0039 +0x400c40 : 0xff1700f9 0xff1b00f9 0xe06f0091 0x03008052 +0x400c50 : 0x220080d2 0xe10300aa +(gdb) disassemble 0x400c30 +Dump of assembler code for function send: +=> 0x0000000000400c30 <+0>: .inst 0xa00020d4 ; undefined + 0x0000000000400c34 <+4>: mov x29, sp + 0x0000000000400c38 <+8>: str w0, [sp, #28] + 0x0000000000400c3c <+12>: strb w1, [sp, #27] + 0x0000000000400c40 <+16>: str xzr, [sp, #40] + +Signed-off-by: junhua huang +Link: https://lore.kernel.org/r/202212021511106844809@zte.com.cn +Signed-off-by: Will Deacon +Stable-dep-of: 13f8f1e05f1d ("arm64: probes: Fix uprobes for big-endian kernels") +Signed-off-by: Sasha Levin +--- + arch/arm64/include/asm/uprobes.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/include/asm/uprobes.h b/arch/arm64/include/asm/uprobes.h +index 315eef654e39a..ba4bff5ca6749 100644 +--- a/arch/arm64/include/asm/uprobes.h ++++ b/arch/arm64/include/asm/uprobes.h +@@ -12,7 +12,7 @@ + + #define MAX_UINSN_BYTES AARCH64_INSN_SIZE + +-#define UPROBE_SWBP_INSN BRK64_OPCODE_UPROBES ++#define UPROBE_SWBP_INSN cpu_to_le32(BRK64_OPCODE_UPROBES) + #define UPROBE_SWBP_INSN_SIZE AARCH64_INSN_SIZE + #define UPROBE_XOL_SLOT_BYTES MAX_UINSN_BYTES + +-- +2.43.0 + diff --git a/queue-6.1/bluetooth-bnep-fix-wild-memory-access-in-proto_unreg.patch b/queue-6.1/bluetooth-bnep-fix-wild-memory-access-in-proto_unreg.patch new file mode 100644 index 00000000000..43d5664b8df --- /dev/null +++ b/queue-6.1/bluetooth-bnep-fix-wild-memory-access-in-proto_unreg.patch @@ -0,0 +1,50 @@ +From 887fce8b7edb0a7aed0393c3b4f32afea7d0fdc2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 17:07:08 +0800 +Subject: Bluetooth: bnep: fix wild-memory-access in proto_unregister + +From: Ye Bin + +[ Upstream commit 64a90991ba8d4e32e3173ddd83d0b24167a5668c ] + +There's issue as follows: + KASAN: maybe wild-memory-access in range [0xdead...108-0xdead...10f] + CPU: 3 UID: 0 PID: 2805 Comm: rmmod Tainted: G W + RIP: 0010:proto_unregister+0xee/0x400 + Call Trace: + + __do_sys_delete_module+0x318/0x580 + do_syscall_64+0xc1/0x1d0 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + +As bnep_init() ignore bnep_sock_init()'s return value, and bnep_sock_init() +will cleanup all resource. Then when remove bnep module will call +bnep_sock_cleanup() to cleanup sock's resource. +To solve above issue just return bnep_sock_init()'s return value in +bnep_exit(). + +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Signed-off-by: Ye Bin +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Sasha Levin +--- + net/bluetooth/bnep/core.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c +index a660c428e2207..38f542665f196 100644 +--- a/net/bluetooth/bnep/core.c ++++ b/net/bluetooth/bnep/core.c +@@ -745,8 +745,7 @@ static int __init bnep_init(void) + if (flt[0]) + BT_INFO("BNEP filters: %s", flt); + +- bnep_sock_init(); +- return 0; ++ return bnep_sock_init(); + } + + static void __exit bnep_exit(void) +-- +2.43.0 + diff --git a/queue-6.1/bpf-devmap-provide-rxq-after-redirect.patch b/queue-6.1/bpf-devmap-provide-rxq-after-redirect.patch new file mode 100644 index 00000000000..e551876cdb7 --- /dev/null +++ b/queue-6.1/bpf-devmap-provide-rxq-after-redirect.patch @@ -0,0 +1,156 @@ +From 1af3bb0c47e3818e6cec3482af631bbe746fdd0e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 11 Sep 2024 10:41:18 +0200 +Subject: bpf: devmap: provide rxq after redirect +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Florian Kauer + +[ Upstream commit ca9984c5f0ab3690d98b13937b2485a978c8dd73 ] + +rxq contains a pointer to the device from where +the redirect happened. Currently, the BPF program +that was executed after a redirect via BPF_MAP_TYPE_DEVMAP* +does not have it set. + +This is particularly bad since accessing ingress_ifindex, e.g. + +SEC("xdp") +int prog(struct xdp_md *pkt) +{ + return bpf_redirect_map(&dev_redirect_map, 0, 0); +} + +SEC("xdp/devmap") +int prog_after_redirect(struct xdp_md *pkt) +{ + bpf_printk("ifindex %i", pkt->ingress_ifindex); + return XDP_PASS; +} + +depends on access to rxq, so a NULL pointer gets dereferenced: + +<1>[ 574.475170] BUG: kernel NULL pointer dereference, address: 0000000000000000 +<1>[ 574.475188] #PF: supervisor read access in kernel mode +<1>[ 574.475194] #PF: error_code(0x0000) - not-present page +<6>[ 574.475199] PGD 0 P4D 0 +<4>[ 574.475207] Oops: Oops: 0000 [#1] PREEMPT SMP NOPTI +<4>[ 574.475217] CPU: 4 UID: 0 PID: 217 Comm: kworker/4:1 Not tainted 6.11.0-rc5-reduced-00859-g780801200300 #23 +<4>[ 574.475226] Hardware name: Intel(R) Client Systems NUC13ANHi7/NUC13ANBi7, BIOS ANRPL357.0026.2023.0314.1458 03/14/2023 +<4>[ 574.475231] Workqueue: mld mld_ifc_work +<4>[ 574.475247] RIP: 0010:bpf_prog_5e13354d9cf5018a_prog_after_redirect+0x17/0x3c +<4>[ 574.475257] Code: cc cc cc cc cc cc cc 80 00 00 00 cc cc cc cc cc cc cc cc f3 0f 1e fa 0f 1f 44 00 00 66 90 55 48 89 e5 f3 0f 1e fa 48 8b 57 20 <48> 8b 52 00 8b 92 e0 00 00 00 48 bf f8 a6 d5 c4 5d a0 ff ff be 0b +<4>[ 574.475263] RSP: 0018:ffffa62440280c98 EFLAGS: 00010206 +<4>[ 574.475269] RAX: ffffa62440280cd8 RBX: 0000000000000001 RCX: 0000000000000000 +<4>[ 574.475274] RDX: 0000000000000000 RSI: ffffa62440549048 RDI: ffffa62440280ce0 +<4>[ 574.475278] RBP: ffffa62440280c98 R08: 0000000000000002 R09: 0000000000000001 +<4>[ 574.475281] R10: ffffa05dc8b98000 R11: ffffa05f577fca40 R12: ffffa05dcab24000 +<4>[ 574.475285] R13: ffffa62440280ce0 R14: ffffa62440549048 R15: ffffa62440549000 +<4>[ 574.475289] FS: 0000000000000000(0000) GS:ffffa05f4f700000(0000) knlGS:0000000000000000 +<4>[ 574.475294] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +<4>[ 574.475298] CR2: 0000000000000000 CR3: 000000025522e000 CR4: 0000000000f50ef0 +<4>[ 574.475303] PKRU: 55555554 +<4>[ 574.475306] Call Trace: +<4>[ 574.475313] +<4>[ 574.475318] ? __die+0x23/0x70 +<4>[ 574.475329] ? page_fault_oops+0x180/0x4c0 +<4>[ 574.475339] ? skb_pp_cow_data+0x34c/0x490 +<4>[ 574.475346] ? kmem_cache_free+0x257/0x280 +<4>[ 574.475357] ? exc_page_fault+0x67/0x150 +<4>[ 574.475368] ? asm_exc_page_fault+0x26/0x30 +<4>[ 574.475381] ? bpf_prog_5e13354d9cf5018a_prog_after_redirect+0x17/0x3c +<4>[ 574.475386] bq_xmit_all+0x158/0x420 +<4>[ 574.475397] __dev_flush+0x30/0x90 +<4>[ 574.475407] veth_poll+0x216/0x250 [veth] +<4>[ 574.475421] __napi_poll+0x28/0x1c0 +<4>[ 574.475430] net_rx_action+0x32d/0x3a0 +<4>[ 574.475441] handle_softirqs+0xcb/0x2c0 +<4>[ 574.475451] do_softirq+0x40/0x60 +<4>[ 574.475458] +<4>[ 574.475461] +<4>[ 574.475464] __local_bh_enable_ip+0x66/0x70 +<4>[ 574.475471] __dev_queue_xmit+0x268/0xe40 +<4>[ 574.475480] ? selinux_ip_postroute+0x213/0x420 +<4>[ 574.475491] ? alloc_skb_with_frags+0x4a/0x1d0 +<4>[ 574.475502] ip6_finish_output2+0x2be/0x640 +<4>[ 574.475512] ? nf_hook_slow+0x42/0xf0 +<4>[ 574.475521] ip6_finish_output+0x194/0x300 +<4>[ 574.475529] ? __pfx_ip6_finish_output+0x10/0x10 +<4>[ 574.475538] mld_sendpack+0x17c/0x240 +<4>[ 574.475548] mld_ifc_work+0x192/0x410 +<4>[ 574.475557] process_one_work+0x15d/0x380 +<4>[ 574.475566] worker_thread+0x29d/0x3a0 +<4>[ 574.475573] ? __pfx_worker_thread+0x10/0x10 +<4>[ 574.475580] ? __pfx_worker_thread+0x10/0x10 +<4>[ 574.475587] kthread+0xcd/0x100 +<4>[ 574.475597] ? __pfx_kthread+0x10/0x10 +<4>[ 574.475606] ret_from_fork+0x31/0x50 +<4>[ 574.475615] ? __pfx_kthread+0x10/0x10 +<4>[ 574.475623] ret_from_fork_asm+0x1a/0x30 +<4>[ 574.475635] +<4>[ 574.475637] Modules linked in: veth br_netfilter bridge stp llc iwlmvm x86_pkg_temp_thermal iwlwifi efivarfs nvme nvme_core +<4>[ 574.475662] CR2: 0000000000000000 +<4>[ 574.475668] ---[ end trace 0000000000000000 ]--- + +Therefore, provide it to the program by setting rxq properly. + +Fixes: cb261b594b41 ("bpf: Run devmap xdp_prog on flush instead of bulk enqueue") +Reviewed-by: Toke Høiland-Jørgensen +Signed-off-by: Florian Kauer +Acked-by: Jakub Kicinski +Link: https://lore.kernel.org/r/20240911-devel-koalo-fix-ingress-ifindex-v4-1-5c643ae10258@linutronix.de +Signed-off-by: Martin KaFai Lau +Signed-off-by: Sasha Levin +--- + kernel/bpf/devmap.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c +index e051cbb07dac0..9699c30c3dc43 100644 +--- a/kernel/bpf/devmap.c ++++ b/kernel/bpf/devmap.c +@@ -326,9 +326,11 @@ static int dev_map_hash_get_next_key(struct bpf_map *map, void *key, + + static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, + struct xdp_frame **frames, int n, +- struct net_device *dev) ++ struct net_device *tx_dev, ++ struct net_device *rx_dev) + { +- struct xdp_txq_info txq = { .dev = dev }; ++ struct xdp_txq_info txq = { .dev = tx_dev }; ++ struct xdp_rxq_info rxq = { .dev = rx_dev }; + struct xdp_buff xdp; + int i, nframes = 0; + +@@ -339,6 +341,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, + + xdp_convert_frame_to_buff(xdpf, &xdp); + xdp.txq = &txq; ++ xdp.rxq = &rxq; + + act = bpf_prog_run_xdp(xdp_prog, &xdp); + switch (act) { +@@ -353,7 +356,7 @@ static int dev_map_bpf_prog_run(struct bpf_prog *xdp_prog, + bpf_warn_invalid_xdp_action(NULL, xdp_prog, act); + fallthrough; + case XDP_ABORTED: +- trace_xdp_exception(dev, xdp_prog, act); ++ trace_xdp_exception(tx_dev, xdp_prog, act); + fallthrough; + case XDP_DROP: + xdp_return_frame_rx_napi(xdpf); +@@ -381,7 +384,7 @@ static void bq_xmit_all(struct xdp_dev_bulk_queue *bq, u32 flags) + } + + if (bq->xdp_prog) { +- to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev); ++ to_send = dev_map_bpf_prog_run(bq->xdp_prog, bq->q, cnt, dev, bq->dev_rx); + if (!to_send) + goto out; + } +-- +2.43.0 + diff --git a/queue-6.1/bpf-fix-iter-task-tid-filtering.patch b/queue-6.1/bpf-fix-iter-task-tid-filtering.patch new file mode 100644 index 00000000000..a08cca37485 --- /dev/null +++ b/queue-6.1/bpf-fix-iter-task-tid-filtering.patch @@ -0,0 +1,40 @@ +From fbb5474a7d9a36463f087e7d157f1a40369a7f82 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2024 14:00:47 -0700 +Subject: bpf: Fix iter/task tid filtering + +From: Jordan Rome + +[ Upstream commit 9495a5b731fcaf580448a3438d63601c88367661 ] + +In userspace, you can add a tid filter by setting +the "task.tid" field for "bpf_iter_link_info". +However, `get_pid_task` when called for the +`BPF_TASK_ITER_TID` type should have been using +`PIDTYPE_PID` (tid) instead of `PIDTYPE_TGID` (pid). + +Fixes: f0d74c4da1f0 ("bpf: Parameterize task iterators.") +Signed-off-by: Jordan Rome +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20241016210048.1213935-1-linux@jordanrome.com +Signed-off-by: Sasha Levin +--- + kernel/bpf/task_iter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/bpf/task_iter.c b/kernel/bpf/task_iter.c +index c4ab9d6cdbe9c..f7ef58090c7d0 100644 +--- a/kernel/bpf/task_iter.c ++++ b/kernel/bpf/task_iter.c +@@ -119,7 +119,7 @@ static struct task_struct *task_seq_get_next(struct bpf_iter_seq_task_common *co + rcu_read_lock(); + pid = find_pid_ns(common->pid, common->ns); + if (pid) { +- task = get_pid_task(pid, PIDTYPE_TGID); ++ task = get_pid_task(pid, PIDTYPE_PID); + *tid = common->pid; + } + rcu_read_unlock(); +-- +2.43.0 + diff --git a/queue-6.1/bpf-fix-kfunc-btf-caching-for-modules.patch b/queue-6.1/bpf-fix-kfunc-btf-caching-for-modules.patch new file mode 100644 index 00000000000..d165028cf7d --- /dev/null +++ b/queue-6.1/bpf-fix-kfunc-btf-caching-for-modules.patch @@ -0,0 +1,82 @@ +From fec83660674b9ff2cfc8a310cedb41e8ca1ae7c9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Oct 2024 15:27:07 +0200 +Subject: bpf: fix kfunc btf caching for modules +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Toke Høiland-Jørgensen + +[ Upstream commit 6cb86a0fdece87e126323ec1bb19deb16a52aedf ] + +The verifier contains a cache for looking up module BTF objects when +calling kfuncs defined in modules. This cache uses a 'struct +bpf_kfunc_btf_tab', which contains a sorted list of BTF objects that +were already seen in the current verifier run, and the BTF objects are +looked up by the offset stored in the relocated call instruction using +bsearch(). + +The first time a given offset is seen, the module BTF is loaded from the +file descriptor passed in by libbpf, and stored into the cache. However, +there's a bug in the code storing the new entry: it stores a pointer to +the new cache entry, then calls sort() to keep the cache sorted for the +next lookup using bsearch(), and then returns the entry that was just +stored through the stored pointer. However, because sort() modifies the +list of entries in place *by value*, the stored pointer may no longer +point to the right entry, in which case the wrong BTF object will be +returned. + +The end result of this is an intermittent bug where, if a BPF program +calls two functions with the same signature in two different modules, +the function from the wrong module may sometimes end up being called. +Whether this happens depends on the order of the calls in the BPF +program (as that affects whether sort() reorders the array of BTF +objects), making it especially hard to track down. Simon, credited as +reporter below, spent significant effort analysing and creating a +reproducer for this issue. The reproducer is added as a selftest in a +subsequent patch. + +The fix is straight forward: simply don't use the stored pointer after +calling sort(). Since we already have an on-stack pointer to the BTF +object itself at the point where the function return, just use that, and +populate it from the cache entry in the branch where the lookup +succeeds. + +Fixes: 2357672c54c3 ("bpf: Introduce BPF support for kernel module function calls") +Reported-by: Simon Sundberg +Acked-by: Jiri Olsa +Acked-by: Kumar Kartikeya Dwivedi +Signed-off-by: Toke Høiland-Jørgensen +Link: https://lore.kernel.org/r/20241010-fix-kfunc-btf-caching-for-modules-v2-1-745af6c1af98@redhat.com +Signed-off-by: Alexei Starovoitov +Signed-off-by: Sasha Levin +--- + kernel/bpf/verifier.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c +index eb4073781a3c7..bb54f1f4fafba 100644 +--- a/kernel/bpf/verifier.c ++++ b/kernel/bpf/verifier.c +@@ -1924,10 +1924,16 @@ static struct btf *__find_kfunc_desc_btf(struct bpf_verifier_env *env, + b->module = mod; + b->offset = offset; + ++ /* sort() reorders entries by value, so b may no longer point ++ * to the right entry after this ++ */ + sort(tab->descs, tab->nr_descs, sizeof(tab->descs[0]), + kfunc_btf_cmp_by_off, NULL); ++ } else { ++ btf = b->btf; + } +- return b->btf; ++ ++ return btf; + } + + void bpf_free_kfunc_btf_tab(struct bpf_kfunc_btf_tab *tab) +-- +2.43.0 + diff --git a/queue-6.1/bpf-fix-memory-leak-in-bpf_core_apply.patch b/queue-6.1/bpf-fix-memory-leak-in-bpf_core_apply.patch new file mode 100644 index 00000000000..20b3386effe --- /dev/null +++ b/queue-6.1/bpf-fix-memory-leak-in-bpf_core_apply.patch @@ -0,0 +1,36 @@ +From 22a1733edcb51f4ba6f50bf59b72b51913a0aa7c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Oct 2024 18:09:58 +0200 +Subject: bpf: Fix memory leak in bpf_core_apply + +From: Jiri Olsa + +[ Upstream commit 45126b155e3b5201179cdc038504bf93a8ccd921 ] + +We need to free specs properly. + +Fixes: 3d2786d65aaa ("bpf: correctly handle malformed BPF_CORE_TYPE_ID_LOCAL relos") +Signed-off-by: Jiri Olsa +Signed-off-by: Andrii Nakryiko +Acked-by: Eduard Zingerman +Link: https://lore.kernel.org/bpf/20241007160958.607434-1-jolsa@kernel.org +Signed-off-by: Sasha Levin +--- + kernel/bpf/btf.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c +index 8c684a0e1c4bc..9f9996cdb6e2f 100644 +--- a/kernel/bpf/btf.c ++++ b/kernel/bpf/btf.c +@@ -7987,6 +7987,7 @@ int bpf_core_apply(struct bpf_core_ctx *ctx, const struct bpf_core_relo *relo, + if (!type) { + bpf_log(ctx->log, "relo #%u: bad type id %u\n", + relo_idx, relo->type_id); ++ kfree(specs); + return -EINVAL; + } + +-- +2.43.0 + diff --git a/queue-6.1/bpf-make-sure-internal-and-uapi-bpf_redirect-flags-d.patch b/queue-6.1/bpf-make-sure-internal-and-uapi-bpf_redirect-flags-d.patch new file mode 100644 index 00000000000..040e5670c15 --- /dev/null +++ b/queue-6.1/bpf-make-sure-internal-and-uapi-bpf_redirect-flags-d.patch @@ -0,0 +1,103 @@ +From dbb143032a2c976d62295ad9ab48c49107670922 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Sep 2024 14:56:24 +0200 +Subject: bpf: Make sure internal and UAPI bpf_redirect flags don't overlap +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Toke Høiland-Jørgensen + +[ Upstream commit 09d88791c7cd888d5195c84733caf9183dcfbd16 ] + +The bpf_redirect_info is shared between the SKB and XDP redirect paths, +and the two paths use the same numeric flag values in the ri->flags +field (specifically, BPF_F_BROADCAST == BPF_F_NEXTHOP). This means that +if skb bpf_redirect_neigh() is used with a non-NULL params argument and, +subsequently, an XDP redirect is performed using the same +bpf_redirect_info struct, the XDP path will get confused and end up +crashing, which syzbot managed to trigger. + +With the stack-allocated bpf_redirect_info, the structure is no longer +shared between the SKB and XDP paths, so the crash doesn't happen +anymore. However, different code paths using identically-numbered flag +values in the same struct field still seems like a bit of a mess, so +this patch cleans that up by moving the flag definitions together and +redefining the three flags in BPF_F_REDIRECT_INTERNAL to not overlap +with the flags used for XDP. It also adds a BUILD_BUG_ON() check to make +sure the overlap is not re-introduced by mistake. + +Fixes: e624d4ed4aa8 ("xdp: Extend xdp_redirect_map with broadcast support") +Reported-by: syzbot+cca39e6e84a367a7e6f6@syzkaller.appspotmail.com +Signed-off-by: Toke Høiland-Jørgensen +Signed-off-by: Daniel Borkmann +Acked-by: Daniel Borkmann +Closes: https://syzkaller.appspot.com/bug?extid=cca39e6e84a367a7e6f6 +Link: https://lore.kernel.org/bpf/20240920125625.59465-1-toke@redhat.com +Signed-off-by: Sasha Levin +--- + include/uapi/linux/bpf.h | 13 +++++-------- + net/core/filter.c | 8 +++++--- + 2 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index 58c7fc75da752..667f49a64a50b 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -5717,11 +5717,6 @@ enum { + BPF_F_MARK_ENFORCE = (1ULL << 6), + }; + +-/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */ +-enum { +- BPF_F_INGRESS = (1ULL << 0), +-}; +- + /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */ + enum { + BPF_F_TUNINFO_IPV6 = (1ULL << 0), +@@ -5865,10 +5860,12 @@ enum { + BPF_F_BPRM_SECUREEXEC = (1ULL << 0), + }; + +-/* Flags for bpf_redirect_map helper */ ++/* Flags for bpf_redirect and bpf_redirect_map helpers */ + enum { +- BPF_F_BROADCAST = (1ULL << 3), +- BPF_F_EXCLUDE_INGRESS = (1ULL << 4), ++ BPF_F_INGRESS = (1ULL << 0), /* used for skb path */ ++ BPF_F_BROADCAST = (1ULL << 3), /* used for XDP path */ ++ BPF_F_EXCLUDE_INGRESS = (1ULL << 4), /* used for XDP path */ ++#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS) + }; + + #define __bpf_md_ptr(type, name) \ +diff --git a/net/core/filter.c b/net/core/filter.c +index 6f65c6eb0d90d..3f3286cf438e7 100644 +--- a/net/core/filter.c ++++ b/net/core/filter.c +@@ -2416,9 +2416,9 @@ static int __bpf_redirect_neigh(struct sk_buff *skb, struct net_device *dev, + + /* Internal, non-exposed redirect flags. */ + enum { +- BPF_F_NEIGH = (1ULL << 1), +- BPF_F_PEER = (1ULL << 2), +- BPF_F_NEXTHOP = (1ULL << 3), ++ BPF_F_NEIGH = (1ULL << 16), ++ BPF_F_PEER = (1ULL << 17), ++ BPF_F_NEXTHOP = (1ULL << 18), + #define BPF_F_REDIRECT_INTERNAL (BPF_F_NEIGH | BPF_F_PEER | BPF_F_NEXTHOP) + }; + +@@ -2428,6 +2428,8 @@ BPF_CALL_3(bpf_clone_redirect, struct sk_buff *, skb, u32, ifindex, u64, flags) + struct sk_buff *clone; + int ret; + ++ BUILD_BUG_ON(BPF_F_REDIRECT_INTERNAL & BPF_F_REDIRECT_FLAGS); ++ + if (unlikely(flags & (~(BPF_F_INGRESS) | BPF_F_REDIRECT_INTERNAL))) + return -EINVAL; + +-- +2.43.0 + diff --git a/queue-6.1/bpf-use-raw_spinlock_t-in-ringbuf.patch b/queue-6.1/bpf-use-raw_spinlock_t-in-ringbuf.patch new file mode 100644 index 00000000000..029c40e60b1 --- /dev/null +++ b/queue-6.1/bpf-use-raw_spinlock_t-in-ringbuf.patch @@ -0,0 +1,113 @@ +From 534a1b93e52f4627e7090812dffb54be7783c51c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 20 Sep 2024 16:06:59 -0300 +Subject: bpf: Use raw_spinlock_t in ringbuf + +From: Wander Lairson Costa + +[ Upstream commit 8b62645b09f870d70c7910e7550289d444239a46 ] + +The function __bpf_ringbuf_reserve is invoked from a tracepoint, which +disables preemption. Using spinlock_t in this context can lead to a +"sleep in atomic" warning in the RT variant. This issue is illustrated +in the example below: + +BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 +in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 556208, name: test_progs +preempt_count: 1, expected: 0 +RCU nest depth: 1, expected: 1 +INFO: lockdep is turned off. +Preemption disabled at: +[] migrate_enable+0xc0/0x39c +CPU: 7 PID: 556208 Comm: test_progs Tainted: G +Hardware name: Qualcomm SA8775P Ride (DT) +Call trace: + dump_backtrace+0xac/0x130 + show_stack+0x1c/0x30 + dump_stack_lvl+0xac/0xe8 + dump_stack+0x18/0x30 + __might_resched+0x3bc/0x4fc + rt_spin_lock+0x8c/0x1a4 + __bpf_ringbuf_reserve+0xc4/0x254 + bpf_ringbuf_reserve_dynptr+0x5c/0xdc + bpf_prog_ac3d15160d62622a_test_read_write+0x104/0x238 + trace_call_bpf+0x238/0x774 + perf_call_bpf_enter.isra.0+0x104/0x194 + perf_syscall_enter+0x2f8/0x510 + trace_sys_enter+0x39c/0x564 + syscall_trace_enter+0x220/0x3c0 + do_el0_svc+0x138/0x1dc + el0_svc+0x54/0x130 + el0t_64_sync_handler+0x134/0x150 + el0t_64_sync+0x17c/0x180 + +Switch the spinlock to raw_spinlock_t to avoid this error. + +Fixes: 457f44363a88 ("bpf: Implement BPF ring buffer and verifier support for it") +Reported-by: Brian Grech +Signed-off-by: Wander Lairson Costa +Signed-off-by: Wander Lairson Costa +Signed-off-by: Daniel Borkmann +Acked-by: Daniel Borkmann +Link: https://lore.kernel.org/r/20240920190700.617253-1-wander@redhat.com +Signed-off-by: Sasha Levin +--- + kernel/bpf/ringbuf.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c +index a1911391a864c..af75c54eb84fb 100644 +--- a/kernel/bpf/ringbuf.c ++++ b/kernel/bpf/ringbuf.c +@@ -37,7 +37,7 @@ struct bpf_ringbuf { + u64 mask; + struct page **pages; + int nr_pages; +- spinlock_t spinlock ____cacheline_aligned_in_smp; ++ raw_spinlock_t spinlock ____cacheline_aligned_in_smp; + /* For user-space producer ring buffers, an atomic_t busy bit is used + * to synchronize access to the ring buffers in the kernel, rather than + * the spinlock that is used for kernel-producer ring buffers. This is +@@ -170,7 +170,7 @@ static struct bpf_ringbuf *bpf_ringbuf_alloc(size_t data_sz, int numa_node) + if (!rb) + return NULL; + +- spin_lock_init(&rb->spinlock); ++ raw_spin_lock_init(&rb->spinlock); + atomic_set(&rb->busy, 0); + init_waitqueue_head(&rb->waitq); + init_irq_work(&rb->work, bpf_ringbuf_notify); +@@ -407,10 +407,10 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) + cons_pos = smp_load_acquire(&rb->consumer_pos); + + if (in_nmi()) { +- if (!spin_trylock_irqsave(&rb->spinlock, flags)) ++ if (!raw_spin_trylock_irqsave(&rb->spinlock, flags)) + return NULL; + } else { +- spin_lock_irqsave(&rb->spinlock, flags); ++ raw_spin_lock_irqsave(&rb->spinlock, flags); + } + + pend_pos = rb->pending_pos; +@@ -436,7 +436,7 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) + */ + if (new_prod_pos - cons_pos > rb->mask || + new_prod_pos - pend_pos > rb->mask) { +- spin_unlock_irqrestore(&rb->spinlock, flags); ++ raw_spin_unlock_irqrestore(&rb->spinlock, flags); + return NULL; + } + +@@ -448,7 +448,7 @@ static void *__bpf_ringbuf_reserve(struct bpf_ringbuf *rb, u64 size) + /* pairs with consumer's smp_load_acquire() */ + smp_store_release(&rb->producer_pos, new_prod_pos); + +- spin_unlock_irqrestore(&rb->spinlock, flags); ++ raw_spin_unlock_irqrestore(&rb->spinlock, flags); + + return (void *)hdr + BPF_RINGBUF_HDR_SZ; + } +-- +2.43.0 + diff --git a/queue-6.1/drm-amd-amdgpu-fix-double-unlock-in-amdgpu_mes_add_r.patch b/queue-6.1/drm-amd-amdgpu-fix-double-unlock-in-amdgpu_mes_add_r.patch new file mode 100644 index 00000000000..8b6105c47d6 --- /dev/null +++ b/queue-6.1/drm-amd-amdgpu-fix-double-unlock-in-amdgpu_mes_add_r.patch @@ -0,0 +1,183 @@ +From 02842dd0ee84cd95a066c3458cbf6937cacc2b3e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 19:01:48 +0530 +Subject: drm/amd/amdgpu: Fix double unlock in amdgpu_mes_add_ring +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Srinivasan Shanmugam + +[ Upstream commit e7457532cb7167516263150ceae86f36d6ef9683 ] + +This patch addresses a double unlock issue in the amdgpu_mes_add_ring +function. The mutex was being unlocked twice under certain error +conditions, which could lead to undefined behavior. + +The fix ensures that the mutex is unlocked only once before jumping to +the clean_up_memory label. The unlock operation is moved to just before +the goto statement within the conditional block that checks the return +value of amdgpu_ring_init. This prevents the second unlock attempt after +the clean_up_memory label, which is no longer necessary as the mutex is +already unlocked by this point in the code flow. + +This change resolves the potential double unlock and maintains the +correct mutex handling throughout the function. + +Fixes below: +Commit d0c423b64765 ("drm/amdgpu/mes: use ring for kernel queue +submission"), leads to the following Smatch static checker warning: + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c:1240 amdgpu_mes_add_ring() + warn: double unlock '&adev->mes.mutex_hidden' (orig line 1213) + +drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c + 1143 int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, + 1144 int queue_type, int idx, + 1145 struct amdgpu_mes_ctx_data *ctx_data, + 1146 struct amdgpu_ring **out) + 1147 { + 1148 struct amdgpu_ring *ring; + 1149 struct amdgpu_mes_gang *gang; + 1150 struct amdgpu_mes_queue_properties qprops = {0}; + 1151 int r, queue_id, pasid; + 1152 + 1153 /* + 1154 * Avoid taking any other locks under MES lock to avoid circular + 1155 * lock dependencies. + 1156 */ + 1157 amdgpu_mes_lock(&adev->mes); + 1158 gang = idr_find(&adev->mes.gang_id_idr, gang_id); + 1159 if (!gang) { + 1160 DRM_ERROR("gang id %d doesn't exist\n", gang_id); + 1161 amdgpu_mes_unlock(&adev->mes); + 1162 return -EINVAL; + 1163 } + 1164 pasid = gang->process->pasid; + 1165 + 1166 ring = kzalloc(sizeof(struct amdgpu_ring), GFP_KERNEL); + 1167 if (!ring) { + 1168 amdgpu_mes_unlock(&adev->mes); + 1169 return -ENOMEM; + 1170 } + 1171 + 1172 ring->ring_obj = NULL; + 1173 ring->use_doorbell = true; + 1174 ring->is_mes_queue = true; + 1175 ring->mes_ctx = ctx_data; + 1176 ring->idx = idx; + 1177 ring->no_scheduler = true; + 1178 + 1179 if (queue_type == AMDGPU_RING_TYPE_COMPUTE) { + 1180 int offset = offsetof(struct amdgpu_mes_ctx_meta_data, + 1181 compute[ring->idx].mec_hpd); + 1182 ring->eop_gpu_addr = + 1183 amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset); + 1184 } + 1185 + 1186 switch (queue_type) { + 1187 case AMDGPU_RING_TYPE_GFX: + 1188 ring->funcs = adev->gfx.gfx_ring[0].funcs; + 1189 ring->me = adev->gfx.gfx_ring[0].me; + 1190 ring->pipe = adev->gfx.gfx_ring[0].pipe; + 1191 break; + 1192 case AMDGPU_RING_TYPE_COMPUTE: + 1193 ring->funcs = adev->gfx.compute_ring[0].funcs; + 1194 ring->me = adev->gfx.compute_ring[0].me; + 1195 ring->pipe = adev->gfx.compute_ring[0].pipe; + 1196 break; + 1197 case AMDGPU_RING_TYPE_SDMA: + 1198 ring->funcs = adev->sdma.instance[0].ring.funcs; + 1199 break; + 1200 default: + 1201 BUG(); + 1202 } + 1203 + 1204 r = amdgpu_ring_init(adev, ring, 1024, NULL, 0, + 1205 AMDGPU_RING_PRIO_DEFAULT, NULL); + 1206 if (r) + 1207 goto clean_up_memory; + 1208 + 1209 amdgpu_mes_ring_to_queue_props(adev, ring, &qprops); + 1210 + 1211 dma_fence_wait(gang->process->vm->last_update, false); + 1212 dma_fence_wait(ctx_data->meta_data_va->last_pt_update, false); + 1213 amdgpu_mes_unlock(&adev->mes); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + 1214 + 1215 r = amdgpu_mes_add_hw_queue(adev, gang_id, &qprops, &queue_id); + 1216 if (r) + 1217 goto clean_up_ring; + ^^^^^^^^^^^^^^^^^^ + + 1218 + 1219 ring->hw_queue_id = queue_id; + 1220 ring->doorbell_index = qprops.doorbell_off; + 1221 + 1222 if (queue_type == AMDGPU_RING_TYPE_GFX) + 1223 sprintf(ring->name, "gfx_%d.%d.%d", pasid, gang_id, queue_id); + 1224 else if (queue_type == AMDGPU_RING_TYPE_COMPUTE) + 1225 sprintf(ring->name, "compute_%d.%d.%d", pasid, gang_id, + 1226 queue_id); + 1227 else if (queue_type == AMDGPU_RING_TYPE_SDMA) + 1228 sprintf(ring->name, "sdma_%d.%d.%d", pasid, gang_id, + 1229 queue_id); + 1230 else + 1231 BUG(); + 1232 + 1233 *out = ring; + 1234 return 0; + 1235 + 1236 clean_up_ring: + 1237 amdgpu_ring_fini(ring); + 1238 clean_up_memory: + 1239 kfree(ring); +--> 1240 amdgpu_mes_unlock(&adev->mes); + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + 1241 return r; + 1242 } + +Fixes: d0c423b64765 ("drm/amdgpu/mes: use ring for kernel queue submission") +Cc: Christian König +Cc: Alex Deucher +Cc: Hawking Zhang +Suggested-by: Jack Xiao +Reported by: Dan Carpenter +Signed-off-by: Srinivasan Shanmugam +Reviewed-by: Jack Xiao +Signed-off-by: Alex Deucher +(cherry picked from commit bfaf1883605fd0c0dbabacd67ed49708470d5ea4) +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +index 9a4cbfbd5d9e5..3feb792c210d7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +@@ -1038,8 +1038,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, + + r = amdgpu_ring_init(adev, ring, 1024, NULL, 0, + AMDGPU_RING_PRIO_DEFAULT, NULL); +- if (r) ++ if (r) { ++ amdgpu_mes_unlock(&adev->mes); + goto clean_up_memory; ++ } + + amdgpu_mes_ring_to_queue_props(adev, ring, &qprops); + +@@ -1072,7 +1074,6 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, + amdgpu_ring_fini(ring); + clean_up_memory: + kfree(ring); +- amdgpu_mes_unlock(&adev->mes); + return r; + } + +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-allocate-memory-for-disp-snapshot-with-kvzal.patch b/queue-6.1/drm-msm-allocate-memory-for-disp-snapshot-with-kvzal.patch new file mode 100644 index 00000000000..52a5acb228e --- /dev/null +++ b/queue-6.1/drm-msm-allocate-memory-for-disp-snapshot-with-kvzal.patch @@ -0,0 +1,57 @@ +From 369e56061da347c0907eee237f6ad7c4c44e9e19 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 09:36:09 -0700 +Subject: drm/msm: Allocate memory for disp snapshot with kvzalloc() + +From: Douglas Anderson + +[ Upstream commit e4a45582db1b792c57bdb52c45958264f7fcfbdc ] + +With the "drm/msm: add a display mmu fault handler" series [1] we saw +issues in the field where memory allocation was failing when +allocating space for registers in msm_disp_state_dump_regs(). +Specifically we were seeing an order 5 allocation fail. It's not +surprising that order 5 allocations will sometimes fail after the +system has been up and running for a while. + +There's no need here for contiguous memory. Change the allocation to +kvzalloc() which should make it much less likely to fail. + +[1] https://lore.kernel.org/r/20240628214848.4075651-1-quic_abhinavk@quicinc.com/ + +Fixes: 98659487b845 ("drm/msm: add support to take dpu snapshot") +Signed-off-by: Douglas Anderson +Reviewed-by: Abhinav Kumar +Patchwork: https://patchwork.freedesktop.org/patch/619658/ +Link: https://lore.kernel.org/r/20241014093605.2.I72441365ffe91f3dceb17db0a8ec976af8139590@changeid +Signed-off-by: Abhinav Kumar +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +index bb149281d31fa..4d55e3cf570f0 100644 +--- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c ++++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +@@ -26,7 +26,7 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b + end_addr = base_addr + aligned_len; + + if (!(*reg)) +- *reg = kzalloc(len_padded, GFP_KERNEL); ++ *reg = kvzalloc(len_padded, GFP_KERNEL); + + if (*reg) + dump_addr = *reg; +@@ -162,7 +162,7 @@ void msm_disp_state_free(void *data) + + list_for_each_entry_safe(block, tmp, &disp_state->blocks, node) { + list_del(&block->node); +- kfree(block->state); ++ kvfree(block->state); + kfree(block); + } + +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-avoid-null-dereference-in-msm_disp_state_pri.patch b/queue-6.1/drm-msm-avoid-null-dereference-in-msm_disp_state_pri.patch new file mode 100644 index 00000000000..27f7390e041 --- /dev/null +++ b/queue-6.1/drm-msm-avoid-null-dereference-in-msm_disp_state_pri.patch @@ -0,0 +1,79 @@ +From 2156d5806cc81ff7f4e713ebe5e34d8987f42dc0 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 09:36:08 -0700 +Subject: drm/msm: Avoid NULL dereference in msm_disp_state_print_regs() + +From: Douglas Anderson + +[ Upstream commit 293f53263266bc4340d777268ab4328a97f041fa ] + +If the allocation in msm_disp_state_dump_regs() failed then +`block->state` can be NULL. The msm_disp_state_print_regs() function +_does_ have code to try to handle it with: + + if (*reg) + dump_addr = *reg; + +...but since "dump_addr" is initialized to NULL the above is actually +a noop. The code then goes on to dereference `dump_addr`. + +Make the function print "Registers not stored" when it sees a NULL to +solve this. Since we're touching the code, fix +msm_disp_state_print_regs() not to pointlessly take a double-pointer +and properly mark the pointer as `const`. + +Fixes: 98659487b845 ("drm/msm: add support to take dpu snapshot") +Signed-off-by: Douglas Anderson +Reviewed-by: Abhinav Kumar +Patchwork: https://patchwork.freedesktop.org/patch/619657/ +Link: https://lore.kernel.org/r/20241014093605.1.Ia1217cecec9ef09eb3c6d125360cc6c8574b0e73@changeid +Signed-off-by: Abhinav Kumar +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +index add72bbc28b17..bb149281d31fa 100644 +--- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c ++++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +@@ -48,20 +48,21 @@ static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *b + } + } + +-static void msm_disp_state_print_regs(u32 **reg, u32 len, void __iomem *base_addr, +- struct drm_printer *p) ++static void msm_disp_state_print_regs(const u32 *dump_addr, u32 len, ++ void __iomem *base_addr, struct drm_printer *p) + { + int i; +- u32 *dump_addr = NULL; + void __iomem *addr; + u32 num_rows; + ++ if (!dump_addr) { ++ drm_printf(p, "Registers not stored\n"); ++ return; ++ } ++ + addr = base_addr; + num_rows = len / REG_DUMP_ALIGN; + +- if (*reg) +- dump_addr = *reg; +- + for (i = 0; i < num_rows; i++) { + drm_printf(p, "0x%lx : %08x %08x %08x %08x\n", + (unsigned long)(addr - base_addr), +@@ -89,7 +90,7 @@ void msm_disp_state_print(struct msm_disp_state *state, struct drm_printer *p) + + list_for_each_entry_safe(block, tmp, &state->blocks, node) { + drm_printf(p, "====================%s================\n", block->name); +- msm_disp_state_print_regs(&block->state, block->size, block->base_addr, p); ++ msm_disp_state_print_regs(block->state, block->size, block->base_addr, p); + } + + drm_printf(p, "===================dpu drm state================\n"); +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-dpu-don-t-always-program-merge_3d-block.patch b/queue-6.1/drm-msm-dpu-don-t-always-program-merge_3d-block.patch new file mode 100644 index 00000000000..c97386871da --- /dev/null +++ b/queue-6.1/drm-msm-dpu-don-t-always-program-merge_3d-block.patch @@ -0,0 +1,39 @@ +From 9907acecab41d5554f688f70beb9b569e65da235 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Oct 2024 20:46:19 -0700 +Subject: drm/msm/dpu: don't always program merge_3d block + +From: Jessica Zhang + +[ Upstream commit f87f3b80abaf7949e638dd17dfdc267066eb52d5 ] + +Only program the merge_3d block for the video phys encoder when the 3d +blend mode is not NONE + +Fixes: 3e79527a33a8 ("drm/msm/dpu: enable merge_3d support on sm8150/sm8250") +Suggested-by: Abhinav Kumar +Signed-off-by: Jessica Zhang +Patchwork: https://patchwork.freedesktop.org/patch/619095/ +Link: https://lore.kernel.org/r/20241009-merge3d-fix-v1-1-0d0b6f5c244e@quicinc.com +Signed-off-by: Abhinav Kumar +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +index 9232c646747dc..aba2488c32fa1 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +@@ -277,7 +277,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( + intf_cfg.stream_sel = 0; /* Don't care value for video mode */ + intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); + intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); +- if (phys_enc->hw_pp->merge_3d) ++ if (intf_cfg.mode_3d && phys_enc->hw_pp->merge_3d) + intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; + + spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags); +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-dpu-make-sure-phys-resources-are-properly-in.patch b/queue-6.1/drm-msm-dpu-make-sure-phys-resources-are-properly-in.patch new file mode 100644 index 00000000000..b863047aee2 --- /dev/null +++ b/queue-6.1/drm-msm-dpu-make-sure-phys-resources-are-properly-in.patch @@ -0,0 +1,62 @@ +From af9818195d065048ee083dfe6e9cda41b715f470 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 3 Sep 2024 06:22:44 +0300 +Subject: drm/msm/dpu: make sure phys resources are properly initialized + +From: Dmitry Baryshkov + +[ Upstream commit bfecbc2cfba9b06d67d9d249c33d92e570e2fa70 ] + +The commit b954fa6baaca ("drm/msm/dpu: Refactor rm iterator") removed +zero-init of the hw_ctl array, but didn't change the error condition, +that checked for hw_ctl[i] being NULL. At the same time because of the +early returns in case of an error dpu_encoder_phys might be left with +the resources assigned in the previous state. Rework assigning of hw_pp +/ hw_ctl to the dpu_encoder_phys in order to make sure they are always +set correctly. + +Fixes: b954fa6baaca ("drm/msm/dpu: Refactor rm iterator") +Suggested-by: Abhinav Kumar +Signed-off-by: Dmitry Baryshkov +Reviewed-by: Abhinav Kumar +Patchwork: https://patchwork.freedesktop.org/patch/612233/ +Link: https://lore.kernel.org/r/20240903-dpu-mode-config-width-v6-1-617e1ecc4b7a@linaro.org +Signed-off-by: Abhinav Kumar +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +index 1bf41a82cd0f9..ba8f2ba046298 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +@@ -1106,21 +1106,20 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, + for (i = 0; i < dpu_enc->num_phys_encs; i++) { + struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; + +- if (!dpu_enc->hw_pp[i]) { ++ phys->hw_pp = dpu_enc->hw_pp[i]; ++ if (!phys->hw_pp) { + DPU_ERROR_ENC(dpu_enc, + "no pp block assigned at idx: %d\n", i); + return; + } + +- if (!hw_ctl[i]) { ++ phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; ++ if (!phys->hw_ctl) { + DPU_ERROR_ENC(dpu_enc, + "no ctl block assigned at idx: %d\n", i); + return; + } + +- phys->hw_pp = dpu_enc->hw_pp[i]; +- phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[i]); +- + phys->cached_mode = crtc_state->adjusted_mode; + if (phys->ops.atomic_mode_set) + phys->ops.atomic_mode_set(phys, crtc_state, conn_state); +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-dpu-wire-up-dsc-mask-for-active-ctl-configur.patch b/queue-6.1/drm-msm-dpu-wire-up-dsc-mask-for-active-ctl-configur.patch new file mode 100644 index 00000000000..709a5e705fb --- /dev/null +++ b/queue-6.1/drm-msm-dpu-wire-up-dsc-mask-for-active-ctl-configur.patch @@ -0,0 +1,55 @@ +From b23493eaf8ea8c9170feba526a4c03f382864691 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Dec 2022 00:19:36 +0100 +Subject: drm/msm/dpu: Wire up DSC mask for active CTL configuration + +From: Marijn Suijten + +[ Upstream commit cda3774c242e156cdcc279bd36b404af89f744c6 ] + +Active CTLs have to configure what DSC block(s) have to be enabled, and +what DSC block(s) have to be flushed; this value was initialized to zero +resulting in the necessary register writes to never happen (or would +write zero otherwise). This seems to have gotten lost in the DSC v4->v5 +series while refactoring how the combination with merge_3d was handled. + +Fixes: 58dca9810749 ("drm/msm/disp/dpu1: Add support for DSC in encoder") +Signed-off-by: Marijn Suijten +Reviewed-by: Dmitry Baryshkov +Patchwork: https://patchwork.freedesktop.org/patch/515693/ +Link: https://lore.kernel.org/r/20221221231943.1961117-2-marijn.suijten@somainline.org +Signed-off-by: Dmitry Baryshkov +Stable-dep-of: f87f3b80abaf ("drm/msm/dpu: don't always program merge_3d block") +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +index ce58d97818bcd..e05c3ccf07f8e 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +@@ -61,6 +61,7 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( + intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_CMD; + intf_cfg.stream_sel = cmd_enc->stream_sel; + intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); ++ intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); + ctl->ops.setup_intf_cfg(ctl, &intf_cfg); + + /* setup which pp blk will connect to this intf */ +diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +index 2baade1cd4876..9232c646747dc 100644 +--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c ++++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +@@ -276,6 +276,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( + intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_VID; + intf_cfg.stream_sel = 0; /* Don't care value for video mode */ + intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); ++ intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); + if (phys_enc->hw_pp->merge_3d) + intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; + +-- +2.43.0 + diff --git a/queue-6.1/drm-msm-dsi-fix-32-bit-signed-integer-extension-in-p.patch b/queue-6.1/drm-msm-dsi-fix-32-bit-signed-integer-extension-in-p.patch new file mode 100644 index 00000000000..04717c1a2f3 --- /dev/null +++ b/queue-6.1/drm-msm-dsi-fix-32-bit-signed-integer-extension-in-p.patch @@ -0,0 +1,47 @@ +From 6900c0e332969f8e85c3dfa54547cb5d90d2c20a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Oct 2024 01:01:49 -0400 +Subject: drm/msm/dsi: fix 32-bit signed integer extension in pclk_rate + calculation + +From: Jonathan Marek + +[ Upstream commit 358b762400bd94db2a14a72dfcef74c7da6bd845 ] + +When (mode->clock * 1000) is larger than (1<<31), int to unsigned long +conversion will sign extend the int to 64 bits and the pclk_rate value +will be incorrect. + +Fix this by making the result of the multiplication unsigned. + +Note that above (1<<32) would still be broken and require more changes, but +its unlikely anyone will need that anytime soon. + +Fixes: c4d8cfe516dc ("drm/msm/dsi: add implementation for helper functions") +Signed-off-by: Jonathan Marek +Reviewed-by: Dmitry Baryshkov +Reviewed-by: Abhinav Kumar +Patchwork: https://patchwork.freedesktop.org/patch/618434/ +Link: https://lore.kernel.org/r/20241007050157.26855-2-jonathan@marek.ca +Signed-off-by: Abhinav Kumar +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c +index 034ad810fd653..88843505d89c9 100644 +--- a/drivers/gpu/drm/msm/dsi/dsi_host.c ++++ b/drivers/gpu/drm/msm/dsi/dsi_host.c +@@ -576,7 +576,7 @@ static unsigned long dsi_get_pclk_rate(struct msm_dsi_host *msm_host, bool is_bo + struct drm_display_mode *mode = msm_host->mode; + unsigned long pclk_rate; + +- pclk_rate = mode->clock * 1000; ++ pclk_rate = mode->clock * 1000u; + + /* + * For bonded DSI mode, the current DRM mode has the complete width of the +-- +2.43.0 + diff --git a/queue-6.1/drm-vmwgfx-handle-possible-enomem-in-vmw_stdu_connec.patch b/queue-6.1/drm-vmwgfx-handle-possible-enomem-in-vmw_stdu_connec.patch new file mode 100644 index 00000000000..6ab52393d01 --- /dev/null +++ b/queue-6.1/drm-vmwgfx-handle-possible-enomem-in-vmw_stdu_connec.patch @@ -0,0 +1,42 @@ +From 9248b60c657a61109dac6f4c727c4e99794278a2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 9 Aug 2024 13:37:56 -0500 +Subject: drm/vmwgfx: Handle possible ENOMEM in vmw_stdu_connector_atomic_check + +From: Ian Forbes + +[ Upstream commit 4809a017a2bc42ff239d53ade4b2e70f2fe81348 ] + +Handle unlikely ENOMEN condition and other errors in +vmw_stdu_connector_atomic_check. + +Signed-off-by: Ian Forbes +Reported-by: Dan Carpenter +Fixes: 75c3e8a26a35 ("drm/vmwgfx: Trigger a modeset when the screen moves") +Reviewed-by: Zack Rusin +Reviewed-by: Martin Krastev +Signed-off-by: Zack Rusin +Link: https://patchwork.freedesktop.org/patch/msgid/20240809183756.27283-1-ian.forbes@broadcom.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +index e98fde90f4e0c..2f775679a5076 100644 +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +@@ -1028,6 +1028,10 @@ static int vmw_stdu_connector_atomic_check(struct drm_connector *conn, + struct drm_crtc_state *new_crtc_state; + + conn_state = drm_atomic_get_connector_state(state, conn); ++ ++ if (IS_ERR(conn_state)) ++ return PTR_ERR(conn_state); ++ + du = vmw_connector_to_stdu(conn); + + if (!conn_state->crtc) +-- +2.43.0 + diff --git a/queue-6.1/genetlink-hold-rcu-in-genlmsg_mcast.patch b/queue-6.1/genetlink-hold-rcu-in-genlmsg_mcast.patch new file mode 100644 index 00000000000..84c9d845b68 --- /dev/null +++ b/queue-6.1/genetlink-hold-rcu-in-genlmsg_mcast.patch @@ -0,0 +1,242 @@ +From 6e20f1a103e230615c9337d1fe2dc967edc616be Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 17:12:17 +0000 +Subject: genetlink: hold RCU in genlmsg_mcast() + +From: Eric Dumazet + +[ Upstream commit 56440d7ec28d60f8da3bfa09062b3368ff9b16db ] + +While running net selftests with CONFIG_PROVE_RCU_LIST=y I saw +one lockdep splat [1]. + +genlmsg_mcast() uses for_each_net_rcu(), and must therefore hold RCU. + +Instead of letting all callers guard genlmsg_multicast_allns() +with a rcu_read_lock()/rcu_read_unlock() pair, do it in genlmsg_mcast(). + +This also means the @flags parameter is useless, we need to always use +GFP_ATOMIC. + +[1] +[10882.424136] ============================= +[10882.424166] WARNING: suspicious RCU usage +[10882.424309] 6.12.0-rc2-virtme #1156 Not tainted +[10882.424400] ----------------------------- +[10882.424423] net/netlink/genetlink.c:1940 RCU-list traversed in non-reader section!! +[10882.424469] +other info that might help us debug this: + +[10882.424500] +rcu_scheduler_active = 2, debug_locks = 1 +[10882.424744] 2 locks held by ip/15677: +[10882.424791] #0: ffffffffb6b491b0 (cb_lock){++++}-{3:3}, at: genl_rcv (net/netlink/genetlink.c:1219) +[10882.426334] #1: ffffffffb6b49248 (genl_mutex){+.+.}-{3:3}, at: genl_rcv_msg (net/netlink/genetlink.c:61 net/netlink/genetlink.c:57 net/netlink/genetlink.c:1209) +[10882.426465] +stack backtrace: +[10882.426805] CPU: 14 UID: 0 PID: 15677 Comm: ip Not tainted 6.12.0-rc2-virtme #1156 +[10882.426919] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 +[10882.427046] Call Trace: +[10882.427131] +[10882.427244] dump_stack_lvl (lib/dump_stack.c:123) +[10882.427335] lockdep_rcu_suspicious (kernel/locking/lockdep.c:6822) +[10882.427387] genlmsg_multicast_allns (net/netlink/genetlink.c:1940 (discriminator 7) net/netlink/genetlink.c:1977 (discriminator 7)) +[10882.427436] l2tp_tunnel_notify.constprop.0 (net/l2tp/l2tp_netlink.c:119) l2tp_netlink +[10882.427683] l2tp_nl_cmd_tunnel_create (net/l2tp/l2tp_netlink.c:253) l2tp_netlink +[10882.427748] genl_family_rcv_msg_doit (net/netlink/genetlink.c:1115) +[10882.427834] genl_rcv_msg (net/netlink/genetlink.c:1195 net/netlink/genetlink.c:1210) +[10882.427877] ? __pfx_l2tp_nl_cmd_tunnel_create (net/l2tp/l2tp_netlink.c:186) l2tp_netlink +[10882.427927] ? __pfx_genl_rcv_msg (net/netlink/genetlink.c:1201) +[10882.427959] netlink_rcv_skb (net/netlink/af_netlink.c:2551) +[10882.428069] genl_rcv (net/netlink/genetlink.c:1220) +[10882.428095] netlink_unicast (net/netlink/af_netlink.c:1332 net/netlink/af_netlink.c:1357) +[10882.428140] netlink_sendmsg (net/netlink/af_netlink.c:1901) +[10882.428210] ____sys_sendmsg (net/socket.c:729 (discriminator 1) net/socket.c:744 (discriminator 1) net/socket.c:2607 (discriminator 1)) + +Fixes: 33f72e6f0c67 ("l2tp : multicast notification to the registered listeners") +Signed-off-by: Eric Dumazet +Cc: James Chapman +Cc: Tom Parkin +Cc: Johannes Berg +Link: https://patch.msgid.link/20241011171217.3166614-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_user.c | 2 +- + include/net/genetlink.h | 3 +-- + net/l2tp/l2tp_netlink.c | 4 ++-- + net/netlink/genetlink.c | 28 ++++++++++++++-------------- + net/wireless/nl80211.c | 8 ++------ + 5 files changed, 20 insertions(+), 25 deletions(-) + +diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c +index 2940559c30860..adf68323d0d68 100644 +--- a/drivers/target/target_core_user.c ++++ b/drivers/target/target_core_user.c +@@ -2130,7 +2130,7 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev, + } + + ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0, +- TCMU_MCGRP_CONFIG, GFP_KERNEL); ++ TCMU_MCGRP_CONFIG); + + /* Wait during an add as the listener may not be up yet */ + if (ret == 0 || +diff --git a/include/net/genetlink.h b/include/net/genetlink.h +index b9e5a22ae3ff9..b39d06bbb8390 100644 +--- a/include/net/genetlink.h ++++ b/include/net/genetlink.h +@@ -355,13 +355,12 @@ static inline int genlmsg_multicast(const struct genl_family *family, + * @skb: netlink message as socket buffer + * @portid: own netlink portid to avoid sending to yourself + * @group: offset of multicast group in groups array +- * @flags: allocation flags + * + * This function must hold the RTNL or rcu_read_lock(). + */ + int genlmsg_multicast_allns(const struct genl_family *family, + struct sk_buff *skb, u32 portid, +- unsigned int group, gfp_t flags); ++ unsigned int group); + + /** + * genlmsg_unicast - unicast a netlink message +diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c +index a901fd14fe3bf..e27e00cb16c6b 100644 +--- a/net/l2tp/l2tp_netlink.c ++++ b/net/l2tp/l2tp_netlink.c +@@ -115,7 +115,7 @@ static int l2tp_tunnel_notify(struct genl_family *family, + NLM_F_ACK, tunnel, cmd); + + if (ret >= 0) { +- ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC); ++ ret = genlmsg_multicast_allns(family, msg, 0, 0); + /* We don't care if no one is listening */ + if (ret == -ESRCH) + ret = 0; +@@ -143,7 +143,7 @@ static int l2tp_session_notify(struct genl_family *family, + NLM_F_ACK, session, cmd); + + if (ret >= 0) { +- ret = genlmsg_multicast_allns(family, msg, 0, 0, GFP_ATOMIC); ++ ret = genlmsg_multicast_allns(family, msg, 0, 0); + /* We don't care if no one is listening */ + if (ret == -ESRCH) + ret = 0; +diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c +index 505d3b910cc29..fd3c1f1ca6ea6 100644 +--- a/net/netlink/genetlink.c ++++ b/net/netlink/genetlink.c +@@ -1147,15 +1147,11 @@ static int genl_ctrl_event(int event, const struct genl_family *family, + if (IS_ERR(msg)) + return PTR_ERR(msg); + +- if (!family->netnsok) { ++ if (!family->netnsok) + genlmsg_multicast_netns(&genl_ctrl, &init_net, msg, 0, + 0, GFP_KERNEL); +- } else { +- rcu_read_lock(); +- genlmsg_multicast_allns(&genl_ctrl, msg, 0, +- 0, GFP_ATOMIC); +- rcu_read_unlock(); +- } ++ else ++ genlmsg_multicast_allns(&genl_ctrl, msg, 0, 0); + + return 0; + } +@@ -1500,23 +1496,23 @@ static int __init genl_init(void) + + core_initcall(genl_init); + +-static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group, +- gfp_t flags) ++static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group) + { + struct sk_buff *tmp; + struct net *net, *prev = NULL; + bool delivered = false; + int err; + ++ rcu_read_lock(); + for_each_net_rcu(net) { + if (prev) { +- tmp = skb_clone(skb, flags); ++ tmp = skb_clone(skb, GFP_ATOMIC); + if (!tmp) { + err = -ENOMEM; + goto error; + } + err = nlmsg_multicast(prev->genl_sock, tmp, +- portid, group, flags); ++ portid, group, GFP_ATOMIC); + if (!err) + delivered = true; + else if (err != -ESRCH) +@@ -1525,27 +1521,31 @@ static int genlmsg_mcast(struct sk_buff *skb, u32 portid, unsigned long group, + + prev = net; + } ++ err = nlmsg_multicast(prev->genl_sock, skb, portid, group, GFP_ATOMIC); ++ ++ rcu_read_unlock(); + +- err = nlmsg_multicast(prev->genl_sock, skb, portid, group, flags); + if (!err) + delivered = true; + else if (err != -ESRCH) + return err; + return delivered ? 0 : -ESRCH; + error: ++ rcu_read_unlock(); ++ + kfree_skb(skb); + return err; + } + + int genlmsg_multicast_allns(const struct genl_family *family, + struct sk_buff *skb, u32 portid, +- unsigned int group, gfp_t flags) ++ unsigned int group) + { + if (WARN_ON_ONCE(group >= family->n_mcgrps)) + return -EINVAL; + + group = family->mcgrp_offset + group; +- return genlmsg_mcast(skb, portid, group, flags); ++ return genlmsg_mcast(skb, portid, group); + } + EXPORT_SYMBOL(genlmsg_multicast_allns); + +diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c +index 4df7a285a7de3..3e1c4e23484dc 100644 +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -17616,10 +17616,8 @@ void nl80211_common_reg_change_event(enum nl80211_commands cmd_id, + + genlmsg_end(msg, hdr); + +- rcu_read_lock(); + genlmsg_multicast_allns(&nl80211_fam, msg, 0, +- NL80211_MCGRP_REGULATORY, GFP_ATOMIC); +- rcu_read_unlock(); ++ NL80211_MCGRP_REGULATORY); + + return; + +@@ -18237,10 +18235,8 @@ void nl80211_send_beacon_hint_event(struct wiphy *wiphy, + + genlmsg_end(msg, hdr); + +- rcu_read_lock(); + genlmsg_multicast_allns(&nl80211_fam, msg, 0, +- NL80211_MCGRP_REGULATORY, GFP_ATOMIC); +- rcu_read_unlock(); ++ NL80211_MCGRP_REGULATORY); + + return; + +-- +2.43.0 + diff --git a/queue-6.1/iio-accel-bma400-fix-uninitialized-variable-field_va.patch b/queue-6.1/iio-accel-bma400-fix-uninitialized-variable-field_va.patch new file mode 100644 index 00000000000..6d764acf2bb --- /dev/null +++ b/queue-6.1/iio-accel-bma400-fix-uninitialized-variable-field_va.patch @@ -0,0 +1,46 @@ +From 6094f132cfc0056f5411cd15a7aea324c0bbd5a7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Sep 2024 04:36:20 -0400 +Subject: iio: accel: bma400: Fix uninitialized variable field_value in tap + event handling. + +From: Mikhail Lobanov + +[ Upstream commit db9795a43dc944f048a37b65e06707f60f713e34 ] + +In the current implementation, the local variable field_value is used +without prior initialization, which may lead to reading uninitialized +memory. Specifically, in the macro set_mask_bits, the initial +(potentially uninitialized) value of the buffer is copied into old__, +and a mask is applied to calculate new__. A similar issue was resolved in +commit 6ee2a7058fea ("iio: accel: bma400: Fix smatch warning based on use +of unintialized value."). + +Found by Linux Verification Center (linuxtesting.org) with SVACE. + +Fixes: 961db2da159d ("iio: accel: bma400: Add support for single and double tap events") +Signed-off-by: Mikhail Lobanov +Link: https://patch.msgid.link/20240910083624.27224-1-m.lobanov@rosalinux.ru +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/accel/bma400_core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c +index 6e4d10a7cd322..4d91747b20270 100644 +--- a/drivers/iio/accel/bma400_core.c ++++ b/drivers/iio/accel/bma400_core.c +@@ -1245,7 +1245,8 @@ static int bma400_activity_event_en(struct bma400_data *data, + static int bma400_tap_event_en(struct bma400_data *data, + enum iio_event_direction dir, int state) + { +- unsigned int mask, field_value; ++ unsigned int mask; ++ unsigned int field_value = 0; + int ret; + + /* +-- +2.43.0 + diff --git a/queue-6.1/iio-frequency-admv4420-adrf6780-format-kconfig-entri.patch b/queue-6.1/iio-frequency-admv4420-adrf6780-format-kconfig-entri.patch new file mode 100644 index 00000000000..093be49e19c --- /dev/null +++ b/queue-6.1/iio-frequency-admv4420-adrf6780-format-kconfig-entri.patch @@ -0,0 +1,70 @@ +From 62158643b873491e4fb65e514844d24a7b22dbad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Oct 2024 22:06:38 +0200 +Subject: iio: frequency: {admv4420,adrf6780}: format Kconfig entries + +From: Javier Carrasco + +[ Upstream commit 5c9644a683e1690387a476a4f5f6bd5cf9a1d695 ] + +Format the entries of these drivers in the Kconfig, where spaces +instead of tabs were used. + +Signed-off-by: Javier Carrasco +Link: https://patch.msgid.link/20241007-ad2s1210-select-v2-1-7345d228040f@gmail.com +Signed-off-by: Jonathan Cameron +Stable-dep-of: 6b8e9dbfaed4 ("iio: frequency: admv4420: fix missing select REMAP_SPI in Kconfig") +Signed-off-by: Sasha Levin +--- + drivers/iio/frequency/Kconfig | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig +index f3702f36436cb..599a5f67fe11a 100644 +--- a/drivers/iio/frequency/Kconfig ++++ b/drivers/iio/frequency/Kconfig +@@ -71,25 +71,25 @@ config ADMV1014 + module will be called admv1014. + + config ADMV4420 +- tristate "Analog Devices ADMV4420 K Band Downconverter" +- depends on SPI +- help +- Say yes here to build support for Analog Devices K Band +- Downconverter with integrated Fractional-N PLL and VCO. ++ tristate "Analog Devices ADMV4420 K Band Downconverter" ++ depends on SPI ++ help ++ Say yes here to build support for Analog Devices K Band ++ Downconverter with integrated Fractional-N PLL and VCO. + +- To compile this driver as a module, choose M here: the +- module will be called admv4420. ++ To compile this driver as a module, choose M here: the ++ module will be called admv4420. + + config ADRF6780 +- tristate "Analog Devices ADRF6780 Microwave Upconverter" +- depends on SPI +- depends on COMMON_CLK +- help +- Say yes here to build support for Analog Devices ADRF6780 +- 5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter. +- +- To compile this driver as a module, choose M here: the +- module will be called adrf6780. ++ tristate "Analog Devices ADRF6780 Microwave Upconverter" ++ depends on SPI ++ depends on COMMON_CLK ++ help ++ Say yes here to build support for Analog Devices ADRF6780 ++ 5.9 GHz to 23.6 GHz, Wideband, Microwave Upconverter. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called adrf6780. + + endmenu + endmenu +-- +2.43.0 + diff --git a/queue-6.1/iio-frequency-admv4420-fix-missing-select-remap_spi-.patch b/queue-6.1/iio-frequency-admv4420-fix-missing-select-remap_spi-.patch new file mode 100644 index 00000000000..bea3e54ec6e --- /dev/null +++ b/queue-6.1/iio-frequency-admv4420-fix-missing-select-remap_spi-.patch @@ -0,0 +1,37 @@ +From dc1818221a78086e07280b7e84a5c8a6d66d09ad Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Oct 2024 22:06:39 +0200 +Subject: iio: frequency: admv4420: fix missing select REMAP_SPI in Kconfig + +From: Javier Carrasco + +[ Upstream commit 6b8e9dbfaed471627f7b863633b9937717df1d4d ] + +This driver makes use of regmap_spi, but does not select the required +module. +Add the missing 'select REGMAP_SPI'. + +Fixes: b59c04155901 ("iio: frequency: admv4420.c: Add support for ADMV4420") +Signed-off-by: Javier Carrasco +Link: https://patch.msgid.link/20241007-ad2s1210-select-v2-2-7345d228040f@gmail.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Sasha Levin +--- + drivers/iio/frequency/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig +index 599a5f67fe11a..023997786ce0a 100644 +--- a/drivers/iio/frequency/Kconfig ++++ b/drivers/iio/frequency/Kconfig +@@ -73,6 +73,7 @@ config ADMV1014 + config ADMV4420 + tristate "Analog Devices ADMV4420 K Band Downconverter" + depends on SPI ++ select REGMAP_SPI + help + Say yes here to build support for Analog Devices K Band + Downconverter with integrated Fractional-N PLL and VCO. +-- +2.43.0 + diff --git a/queue-6.1/ipv4-give-an-ipv4-dev-to-blackhole_netdev.patch b/queue-6.1/ipv4-give-an-ipv4-dev-to-blackhole_netdev.patch new file mode 100644 index 00000000000..dae5b5e236c --- /dev/null +++ b/queue-6.1/ipv4-give-an-ipv4-dev-to-blackhole_netdev.patch @@ -0,0 +1,112 @@ +From ca14823174a7925337f9bc4f25d4d05f476ca729 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Oct 2024 14:47:13 -0400 +Subject: ipv4: give an IPv4 dev to blackhole_netdev + +From: Xin Long + +[ Upstream commit 22600596b6756b166fd052d5facb66287e6f0bad ] + +After commit 8d7017fd621d ("blackhole_netdev: use blackhole_netdev to +invalidate dst entries"), blackhole_netdev was introduced to invalidate +dst cache entries on the TX path whenever the cache times out or is +flushed. + +When two UDP sockets (sk1 and sk2) send messages to the same destination +simultaneously, they are using the same dst cache. If the dst cache is +invalidated on one path (sk2) while the other (sk1) is still transmitting, +sk1 may try to use the invalid dst entry. + + CPU1 CPU2 + + udp_sendmsg(sk1) udp_sendmsg(sk2) + udp_send_skb() + ip_output() + <--- dst timeout or flushed + dst_dev_put() + ip_finish_output2() + ip_neigh_for_gw() + +This results in a scenario where ip_neigh_for_gw() returns -EINVAL because +blackhole_dev lacks an in_dev, which is needed to initialize the neigh in +arp_constructor(). This error is then propagated back to userspace, +breaking the UDP application. + +The patch fixes this issue by assigning an in_dev to blackhole_dev for +IPv4, similar to what was done for IPv6 in commit e5f80fcf869a ("ipv6: +give an IPv6 dev to blackhole_netdev"). This ensures that even when the +dst entry is invalidated with blackhole_dev, it will not fail to create +the neigh entry. + +As devinet_init() is called ealier than blackhole_netdev_init() in system +booting, it can not assign the in_dev to blackhole_dev in devinet_init(). +As Paolo suggested, add a separate late_initcall() in devinet.c to ensure +inet_blackhole_dev_init() is called after blackhole_netdev_init(). + +Fixes: 8d7017fd621d ("blackhole_netdev: use blackhole_netdev to invalidate dst entries") +Signed-off-by: Xin Long +Reviewed-by: Eric Dumazet +Link: https://patch.msgid.link/3000792d45ca44e16c785ebe2b092e610e5b3df1.1728499633.git.lucien.xin@gmail.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/devinet.c | 35 +++++++++++++++++++++++++---------- + 1 file changed, 25 insertions(+), 10 deletions(-) + +diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c +index f07778c340984..430ca93ba939d 100644 +--- a/net/ipv4/devinet.c ++++ b/net/ipv4/devinet.c +@@ -276,17 +276,19 @@ static struct in_device *inetdev_init(struct net_device *dev) + /* Account for reference dev->ip_ptr (below) */ + refcount_set(&in_dev->refcnt, 1); + +- err = devinet_sysctl_register(in_dev); +- if (err) { +- in_dev->dead = 1; +- neigh_parms_release(&arp_tbl, in_dev->arp_parms); +- in_dev_put(in_dev); +- in_dev = NULL; +- goto out; ++ if (dev != blackhole_netdev) { ++ err = devinet_sysctl_register(in_dev); ++ if (err) { ++ in_dev->dead = 1; ++ neigh_parms_release(&arp_tbl, in_dev->arp_parms); ++ in_dev_put(in_dev); ++ in_dev = NULL; ++ goto out; ++ } ++ ip_mc_init_dev(in_dev); ++ if (dev->flags & IFF_UP) ++ ip_mc_up(in_dev); + } +- ip_mc_init_dev(in_dev); +- if (dev->flags & IFF_UP) +- ip_mc_up(in_dev); + + /* we can receive as soon as ip_ptr is set -- do this last */ + rcu_assign_pointer(dev->ip_ptr, in_dev); +@@ -331,6 +333,19 @@ static void inetdev_destroy(struct in_device *in_dev) + call_rcu(&in_dev->rcu_head, in_dev_rcu_put); + } + ++static int __init inet_blackhole_dev_init(void) ++{ ++ int err = 0; ++ ++ rtnl_lock(); ++ if (!inetdev_init(blackhole_netdev)) ++ err = -ENOMEM; ++ rtnl_unlock(); ++ ++ return err; ++} ++late_initcall(inet_blackhole_dev_init); ++ + int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b) + { + const struct in_ifaddr *ifa; +-- +2.43.0 + diff --git a/queue-6.1/irqchip-renesas-rzg2l-add-support-for-suspend-to-ram.patch b/queue-6.1/irqchip-renesas-rzg2l-add-support-for-suspend-to-ram.patch new file mode 100644 index 00000000000..cbfe70c78e0 --- /dev/null +++ b/queue-6.1/irqchip-renesas-rzg2l-add-support-for-suspend-to-ram.patch @@ -0,0 +1,208 @@ +From 33e07e44e90daabf84f4a1ef1164b6a54dd20237 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Nov 2023 13:18:18 +0200 +Subject: irqchip/renesas-rzg2l: Add support for suspend to RAM +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Claudiu Beznea + +[ Upstream commit 74d2ef5f6f4b2437e6292ab2502400e8048db4aa ] + +The irqchip-renesas-rzg2l driver is used on RZ/G3S SoC. RZ/G3S can go into +deep sleep states where power to different SoC's parts is cut off and RAM +is switched to self-refresh. The resume from these states is done with the +help of the bootloader. + +The IA55 IRQ controller needs to be reconfigured when resuming from deep +sleep state. For this the IA55 registers are cached in suspend and restored +in resume. + +The IA55 IRQ controller is connected to GPIO controller and GIC as follows: + + ┌──────────┐ ┌──────────┐ + │ │ SPIX │ │ + │ ├─────────►│ │ + │ │ │ │ + │ │ │ │ + ┌────────┐IRQ0-7 │ IA55 │ │ GIC │ + Pin0 ───────►│ ├─────────────►│ │ │ │ + │ │ │ │ PPIY │ │ + ... │ GPIO │ │ ├─────────►│ │ + │ │GPIOINT0-127 │ │ │ │ + PinN ───────►│ ├─────────────►│ │ │ │ + └────────┘ └──────────┘ └──────────┘ + +where: + - Pin0 is the first GPIO controller pin + - PinN is the last GPIO controller pin + + - SPIX is the SPI interrupt with identifier X + - PPIY is the PPI interrupt with identifier Y + +Implement suspend/resume functionality with syscore_ops to be able to +cache/restore the registers after/before the GPIO controller suspend/resume +functions are invoked. + +As the syscore_ops suspend/resume functions do not take any argument make +the driver private data static so it can be accessed from the +suspend/resume functions. + +The IA55 interrupt controller is resumed before the GPIO controller. As +GPIO pins could be in an a state which causes spurious interrupts, the +reconfiguration of the interrupt controller is restricted to restore the +interrupt type and leave them disabled. + +An eventually required interrupt enable operation will be done as part of +the GPIO controller resume function after restoring the GPIO state. + +[ tglx: Massaged changelog ] + +Signed-off-by: Claudiu Beznea +Signed-off-by: Thomas Gleixner +Link: https://lore.kernel.org/r/20231120111820.87398-8-claudiu.beznea.uj@bp.renesas.com +Stable-dep-of: d038109ac1c6 ("irqchip/renesas-rzg2l: Fix missing put_device") +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-renesas-rzg2l.c | 68 ++++++++++++++++++++++++----- + 1 file changed, 57 insertions(+), 11 deletions(-) + +diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c +index 61502a81dbb54..6905f78855ffa 100644 +--- a/drivers/irqchip/irq-renesas-rzg2l.c ++++ b/drivers/irqchip/irq-renesas-rzg2l.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #define IRQC_IRQ_START 1 + #define IRQC_IRQ_COUNT 8 +@@ -55,17 +56,29 @@ + #define TINT_EXTRACT_HWIRQ(x) FIELD_GET(GENMASK(15, 0), (x)) + #define TINT_EXTRACT_GPIOINT(x) FIELD_GET(GENMASK(31, 16), (x)) + ++/** ++ * struct rzg2l_irqc_reg_cache - registers cache (necessary for suspend/resume) ++ * @iitsr: IITSR register ++ * @titsr: TITSR registers ++ */ ++struct rzg2l_irqc_reg_cache { ++ u32 iitsr; ++ u32 titsr[2]; ++}; ++ + /** + * struct rzg2l_irqc_priv - IRQ controller private data structure + * @base: Controller's base address + * @fwspec: IRQ firmware specific data + * @lock: Lock to serialize access to hardware registers ++ * @cache: Registers cache for suspend/resume + */ +-struct rzg2l_irqc_priv { ++static struct rzg2l_irqc_priv { + void __iomem *base; + struct irq_fwspec fwspec[IRQC_NUM_IRQ]; + raw_spinlock_t lock; +-}; ++ struct rzg2l_irqc_reg_cache cache; ++} *rzg2l_irqc_data; + + static struct rzg2l_irqc_priv *irq_data_to_priv(struct irq_data *data) + { +@@ -282,6 +295,38 @@ static int rzg2l_irqc_set_type(struct irq_data *d, unsigned int type) + return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH); + } + ++static int rzg2l_irqc_irq_suspend(void) ++{ ++ struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache; ++ void __iomem *base = rzg2l_irqc_data->base; ++ ++ cache->iitsr = readl_relaxed(base + IITSR); ++ for (u8 i = 0; i < 2; i++) ++ cache->titsr[i] = readl_relaxed(base + TITSR(i)); ++ ++ return 0; ++} ++ ++static void rzg2l_irqc_irq_resume(void) ++{ ++ struct rzg2l_irqc_reg_cache *cache = &rzg2l_irqc_data->cache; ++ void __iomem *base = rzg2l_irqc_data->base; ++ ++ /* ++ * Restore only interrupt type. TSSRx will be restored at the ++ * request of pin controller to avoid spurious interrupts due ++ * to invalid PIN states. ++ */ ++ for (u8 i = 0; i < 2; i++) ++ writel_relaxed(cache->titsr[i], base + TITSR(i)); ++ writel_relaxed(cache->iitsr, base + IITSR); ++} ++ ++static struct syscore_ops rzg2l_irqc_syscore_ops = { ++ .suspend = rzg2l_irqc_irq_suspend, ++ .resume = rzg2l_irqc_irq_resume, ++}; ++ + static const struct irq_chip irqc_chip = { + .name = "rzg2l-irqc", + .irq_eoi = rzg2l_irqc_eoi, +@@ -366,7 +411,6 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent) + struct irq_domain *irq_domain, *parent_domain; + struct platform_device *pdev; + struct reset_control *resetn; +- struct rzg2l_irqc_priv *priv; + int ret; + + pdev = of_find_device_by_node(node); +@@ -379,15 +423,15 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent) + return -ENODEV; + } + +- priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); +- if (!priv) ++ rzg2l_irqc_data = devm_kzalloc(&pdev->dev, sizeof(*rzg2l_irqc_data), GFP_KERNEL); ++ if (!rzg2l_irqc_data) + return -ENOMEM; + +- priv->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL); +- if (IS_ERR(priv->base)) +- return PTR_ERR(priv->base); ++ rzg2l_irqc_data->base = devm_of_iomap(&pdev->dev, pdev->dev.of_node, 0, NULL); ++ if (IS_ERR(rzg2l_irqc_data->base)) ++ return PTR_ERR(rzg2l_irqc_data->base); + +- ret = rzg2l_irqc_parse_interrupts(priv, node); ++ ret = rzg2l_irqc_parse_interrupts(rzg2l_irqc_data, node); + if (ret) { + dev_err(&pdev->dev, "cannot parse interrupts: %d\n", ret); + return ret; +@@ -410,17 +454,19 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent) + goto pm_disable; + } + +- raw_spin_lock_init(&priv->lock); ++ raw_spin_lock_init(&rzg2l_irqc_data->lock); + + irq_domain = irq_domain_add_hierarchy(parent_domain, 0, IRQC_NUM_IRQ, + node, &rzg2l_irqc_domain_ops, +- priv); ++ rzg2l_irqc_data); + if (!irq_domain) { + dev_err(&pdev->dev, "failed to add irq domain\n"); + ret = -ENOMEM; + goto pm_put; + } + ++ register_syscore_ops(&rzg2l_irqc_syscore_ops); ++ + return 0; + + pm_put: +-- +2.43.0 + diff --git a/queue-6.1/irqchip-renesas-rzg2l-align-struct-member-names-to-t.patch b/queue-6.1/irqchip-renesas-rzg2l-align-struct-member-names-to-t.patch new file mode 100644 index 00000000000..27efbbab88c --- /dev/null +++ b/queue-6.1/irqchip-renesas-rzg2l-align-struct-member-names-to-t.patch @@ -0,0 +1,43 @@ +From f6a12e9e870e45837c3b6afe63b606ff28789c13 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Nov 2023 13:18:14 +0200 +Subject: irqchip/renesas-rzg2l: Align struct member names to tabs + +From: Claudiu Beznea + +[ Upstream commit 02f6507640173addeeb3af035d2c6f0b3cff1567 ] + +Align struct member names to tabs to follow the requirements from +maintainer-tip file. 3 tabs were used at the moment as the next commits +will add a new member which requires 3 tabs for a better view. + +Signed-off-by: Claudiu Beznea +Signed-off-by: Thomas Gleixner +Reviewed-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20231120111820.87398-4-claudiu.beznea.uj@bp.renesas.com +Stable-dep-of: d038109ac1c6 ("irqchip/renesas-rzg2l: Fix missing put_device") +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-renesas-rzg2l.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c +index 70279ca7e6278..884379f207d50 100644 +--- a/drivers/irqchip/irq-renesas-rzg2l.c ++++ b/drivers/irqchip/irq-renesas-rzg2l.c +@@ -56,9 +56,9 @@ + #define TINT_EXTRACT_GPIOINT(x) FIELD_GET(GENMASK(31, 16), (x)) + + struct rzg2l_irqc_priv { +- void __iomem *base; +- struct irq_fwspec fwspec[IRQC_NUM_IRQ]; +- raw_spinlock_t lock; ++ void __iomem *base; ++ struct irq_fwspec fwspec[IRQC_NUM_IRQ]; ++ raw_spinlock_t lock; + }; + + static struct rzg2l_irqc_priv *irq_data_to_priv(struct irq_data *data) +-- +2.43.0 + diff --git a/queue-6.1/irqchip-renesas-rzg2l-document-structure-members.patch b/queue-6.1/irqchip-renesas-rzg2l-document-structure-members.patch new file mode 100644 index 00000000000..b3811c54fe6 --- /dev/null +++ b/queue-6.1/irqchip-renesas-rzg2l-document-structure-members.patch @@ -0,0 +1,42 @@ +From 08598228d798ce4f3bc86f9f550288f5193a1657 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 Nov 2023 13:18:15 +0200 +Subject: irqchip/renesas-rzg2l: Document structure members + +From: Claudiu Beznea + +[ Upstream commit b94f455372ad6e6b4da8e8ed9864d9c7daaf54b8 ] + +Document structure members to follow the requirements specified in +maintainer-tip, section 4.3.7. Struct declarations and initializers. + +Signed-off-by: Claudiu Beznea +Signed-off-by: Thomas Gleixner +Reviewed-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20231120111820.87398-5-claudiu.beznea.uj@bp.renesas.com +Stable-dep-of: d038109ac1c6 ("irqchip/renesas-rzg2l: Fix missing put_device") +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-renesas-rzg2l.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c +index 884379f207d50..61502a81dbb54 100644 +--- a/drivers/irqchip/irq-renesas-rzg2l.c ++++ b/drivers/irqchip/irq-renesas-rzg2l.c +@@ -55,6 +55,12 @@ + #define TINT_EXTRACT_HWIRQ(x) FIELD_GET(GENMASK(15, 0), (x)) + #define TINT_EXTRACT_GPIOINT(x) FIELD_GET(GENMASK(31, 16), (x)) + ++/** ++ * struct rzg2l_irqc_priv - IRQ controller private data structure ++ * @base: Controller's base address ++ * @fwspec: IRQ firmware specific data ++ * @lock: Lock to serialize access to hardware registers ++ */ + struct rzg2l_irqc_priv { + void __iomem *base; + struct irq_fwspec fwspec[IRQC_NUM_IRQ]; +-- +2.43.0 + diff --git a/queue-6.1/irqchip-renesas-rzg2l-fix-missing-put_device.patch b/queue-6.1/irqchip-renesas-rzg2l-fix-missing-put_device.patch new file mode 100644 index 00000000000..43a73cad5e6 --- /dev/null +++ b/queue-6.1/irqchip-renesas-rzg2l-fix-missing-put_device.patch @@ -0,0 +1,81 @@ +From af421c96448953f55d60878a47f643885c21825a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 18:20:03 +0100 +Subject: irqchip/renesas-rzg2l: Fix missing put_device + +From: Fabrizio Castro + +[ Upstream commit d038109ac1c6bf619473dda03a16a6de58170f7f ] + +rzg2l_irqc_common_init() calls of_find_device_by_node(), but the +corresponding put_device() call is missing. This also gets reported by +make coccicheck. + +Make use of the cleanup interfaces from cleanup.h to call into +__free_put_device(), which in turn calls into put_device when leaving +function rzg2l_irqc_common_init() and variable "dev" goes out of scope. + +To prevent that the device is put on successful completion, assign NULL to +"dev" to prevent __free_put_device() from calling into put_device() within +the successful path. + +"make coccicheck" will still complain about missing put_device() calls, +but those are false positives now. + +Fixes: 3fed09559cd8 ("irqchip: Add RZ/G2L IA55 Interrupt Controller driver") +Signed-off-by: Fabrizio Castro +Signed-off-by: Thomas Gleixner +Link: https://lore.kernel.org/all/20241011172003.1242841-1-fabrizio.castro.jz@renesas.com +Signed-off-by: Sasha Levin +--- + drivers/irqchip/irq-renesas-rzg2l.c | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c +index 6905f78855ffa..5df559252c6ef 100644 +--- a/drivers/irqchip/irq-renesas-rzg2l.c ++++ b/drivers/irqchip/irq-renesas-rzg2l.c +@@ -8,6 +8,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -408,12 +409,12 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irqc_priv *priv, + + static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent) + { ++ struct platform_device *pdev = of_find_device_by_node(node); ++ struct device *dev __free(put_device) = pdev ? &pdev->dev : NULL; + struct irq_domain *irq_domain, *parent_domain; +- struct platform_device *pdev; + struct reset_control *resetn; + int ret; + +- pdev = of_find_device_by_node(node); + if (!pdev) + return -ENODEV; + +@@ -467,6 +468,17 @@ static int rzg2l_irqc_init(struct device_node *node, struct device_node *parent) + + register_syscore_ops(&rzg2l_irqc_syscore_ops); + ++ /* ++ * Prevent the cleanup function from invoking put_device by assigning ++ * NULL to dev. ++ * ++ * make coccicheck will complain about missing put_device calls, but ++ * those are false positives, as dev will be automatically "put" via ++ * __free_put_device on the failing path. ++ * On the successful path we don't actually want to "put" dev. ++ */ ++ dev = NULL; ++ + return 0; + + pm_put: +-- +2.43.0 + diff --git a/queue-6.1/macsec-don-t-increment-counters-for-an-unrelated-sa.patch b/queue-6.1/macsec-don-t-increment-counters-for-an-unrelated-sa.patch new file mode 100644 index 00000000000..1ba5a6244f8 --- /dev/null +++ b/queue-6.1/macsec-don-t-increment-counters-for-an-unrelated-sa.patch @@ -0,0 +1,83 @@ +From b6c003c32bc1fcb9710f4a9e96730426e639e375 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 17:16:37 +0200 +Subject: macsec: don't increment counters for an unrelated SA + +From: Sabrina Dubroca + +[ Upstream commit cf58aefb1332db322060cad4a330d5f9292b0f41 ] + +On RX, we shouldn't be incrementing the stats for an arbitrary SA in +case the actual SA hasn't been set up. Those counters are intended to +track packets for their respective AN when the SA isn't currently +configured. Due to the way MACsec is implemented, we don't keep +counters unless the SA is configured, so we can't track those packets, +and those counters will remain at 0. + +The RXSC's stats keeps track of those packets without telling us which +AN they belonged to. We could add counters for non-existent SAs, and +then find a way to integrate them in the dump to userspace, but I +don't think it's worth the effort. + +Fixes: 91ec9bd57f35 ("macsec: Fix traffic counters/statistics") +Reported-by: Paolo Abeni +Signed-off-by: Sabrina Dubroca +Link: https://patch.msgid.link/f5ac92aaa5b89343232615f4c03f9f95042c6aa0.1728657709.git.sd@queasysnail.net +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/macsec.c | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c +index 8a8fd74110e2c..3a19d6f0e0dd8 100644 +--- a/drivers/net/macsec.c ++++ b/drivers/net/macsec.c +@@ -151,19 +151,6 @@ static struct macsec_rx_sa *macsec_rxsa_get(struct macsec_rx_sa __rcu *ptr) + return sa; + } + +-static struct macsec_rx_sa *macsec_active_rxsa_get(struct macsec_rx_sc *rx_sc) +-{ +- struct macsec_rx_sa *sa = NULL; +- int an; +- +- for (an = 0; an < MACSEC_NUM_AN; an++) { +- sa = macsec_rxsa_get(rx_sc->sa[an]); +- if (sa) +- break; +- } +- return sa; +-} +- + static void free_rx_sc_rcu(struct rcu_head *head) + { + struct macsec_rx_sc *rx_sc = container_of(head, struct macsec_rx_sc, rcu_head); +@@ -1210,15 +1197,12 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) + /* If validateFrames is Strict or the C bit in the + * SecTAG is set, discard + */ +- struct macsec_rx_sa *active_rx_sa = macsec_active_rxsa_get(rx_sc); + if (hdr->tci_an & MACSEC_TCI_C || + secy->validate_frames == MACSEC_VALIDATE_STRICT) { + u64_stats_update_begin(&rxsc_stats->syncp); + rxsc_stats->stats.InPktsNotUsingSA++; + u64_stats_update_end(&rxsc_stats->syncp); + DEV_STATS_INC(secy->netdev, rx_errors); +- if (active_rx_sa) +- this_cpu_inc(active_rx_sa->stats->InPktsNotUsingSA); + goto drop_nosa; + } + +@@ -1228,8 +1212,6 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) + u64_stats_update_begin(&rxsc_stats->syncp); + rxsc_stats->stats.InPktsUnusedSA++; + u64_stats_update_end(&rxsc_stats->syncp); +- if (active_rx_sa) +- this_cpu_inc(active_rx_sa->stats->InPktsUnusedSA); + goto deliver; + } + +-- +2.43.0 + diff --git a/queue-6.1/net-ethernet-aeroflex-fix-potential-memory-leak-in-g.patch b/queue-6.1/net-ethernet-aeroflex-fix-potential-memory-leak-in-g.patch new file mode 100644 index 00000000000..c7f5b835190 --- /dev/null +++ b/queue-6.1/net-ethernet-aeroflex-fix-potential-memory-leak-in-g.patch @@ -0,0 +1,47 @@ +From 3a056466afe9f15ef4cecd37c9b7bd93ccc8a24d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 12 Oct 2024 19:04:34 +0800 +Subject: net: ethernet: aeroflex: fix potential memory leak in + greth_start_xmit_gbit() + +From: Wang Hai + +[ Upstream commit cf57b5d7a2aad456719152ecd12007fe031628a3 ] + +The greth_start_xmit_gbit() returns NETDEV_TX_OK without freeing skb +in case of skb->len being too long, add dev_kfree_skb() to fix it. + +Fixes: d4c41139df6e ("net: Add Aeroflex Gaisler 10/100/1G Ethernet MAC driver") +Signed-off-by: Wang Hai +Reviewed-by: Gerhard Engleder +Link: https://patch.msgid.link/20241012110434.49265-1-wanghai38@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/aeroflex/greth.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c +index aa0d2f3aaeaaa..f7a44d8541a02 100644 +--- a/drivers/net/ethernet/aeroflex/greth.c ++++ b/drivers/net/ethernet/aeroflex/greth.c +@@ -484,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) + + if (unlikely(skb->len > MAX_FRAME_SIZE)) { + dev->stats.tx_errors++; +- goto out; ++ goto len_error; + } + + /* Save skb pointer. */ +@@ -575,6 +575,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) + map_error: + if (net_ratelimit()) + dev_warn(greth->dev, "Could not create TX DMA mapping\n"); ++len_error: + dev_kfree_skb(skb); + out: + return err; +-- +2.43.0 + diff --git a/queue-6.1/net-mlx5-fix-command-bitmask-initialization.patch b/queue-6.1/net-mlx5-fix-command-bitmask-initialization.patch new file mode 100644 index 00000000000..fe3c3bad080 --- /dev/null +++ b/queue-6.1/net-mlx5-fix-command-bitmask-initialization.patch @@ -0,0 +1,100 @@ +From 945ed666033031641c9d59bc263ea0b4b9c369ec Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Oct 2024 12:32:06 +0300 +Subject: net/mlx5: Fix command bitmask initialization + +From: Shay Drory + +[ Upstream commit d62b14045c6511a7b2d4948d1a83a4e592deeb05 ] + +Command bitmask have a dedicated bit for MANAGE_PAGES command, this bit +isn't Initialize during command bitmask Initialization, only during +MANAGE_PAGES. + +In addition, mlx5_cmd_trigger_completions() is trying to trigger +completion for MANAGE_PAGES command as well. + +Hence, in case health error occurred before any MANAGE_PAGES command +have been invoke (for example, during mlx5_enable_hca()), +mlx5_cmd_trigger_completions() will try to trigger completion for +MANAGE_PAGES command, which will result in null-ptr-deref error.[1] + +Fix it by Initialize command bitmask correctly. + +While at it, re-write the code for better understanding. + +[1] +BUG: KASAN: null-ptr-deref in mlx5_cmd_trigger_completions+0x1db/0x600 [mlx5_core] +Write of size 4 at addr 0000000000000214 by task kworker/u96:2/12078 +CPU: 10 PID: 12078 Comm: kworker/u96:2 Not tainted 6.9.0-rc2_for_upstream_debug_2024_04_07_19_01 #1 +Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 +Workqueue: mlx5_health0000:08:00.0 mlx5_fw_fatal_reporter_err_work [mlx5_core] +Call Trace: + + dump_stack_lvl+0x7e/0xc0 + kasan_report+0xb9/0xf0 + kasan_check_range+0xec/0x190 + mlx5_cmd_trigger_completions+0x1db/0x600 [mlx5_core] + mlx5_cmd_flush+0x94/0x240 [mlx5_core] + enter_error_state+0x6c/0xd0 [mlx5_core] + mlx5_fw_fatal_reporter_err_work+0xf3/0x480 [mlx5_core] + process_one_work+0x787/0x1490 + ? lockdep_hardirqs_on_prepare+0x400/0x400 + ? pwq_dec_nr_in_flight+0xda0/0xda0 + ? assign_work+0x168/0x240 + worker_thread+0x586/0xd30 + ? rescuer_thread+0xae0/0xae0 + kthread+0x2df/0x3b0 + ? kthread_complete_and_exit+0x20/0x20 + ret_from_fork+0x2d/0x70 + ? kthread_complete_and_exit+0x20/0x20 + ret_from_fork_asm+0x11/0x20 + + +Fixes: 9b98d395b85d ("net/mlx5: Start health poll at earlier stage of driver load") +Signed-off-by: Shay Drory +Reviewed-by: Moshe Shemesh +Reviewed-by: Saeed Mahameed +Signed-off-by: Tariq Toukan +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +index c6ddf51818efe..4a1eb6cd699cb 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +@@ -1755,6 +1755,10 @@ static void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool force + } + } + ++#define MLX5_MAX_MANAGE_PAGES_CMD_ENT 1 ++#define MLX5_CMD_MASK ((1UL << (cmd->vars.max_reg_cmds + \ ++ MLX5_MAX_MANAGE_PAGES_CMD_ENT)) - 1) ++ + static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev) + { + struct mlx5_cmd *cmd = &dev->cmd; +@@ -1766,7 +1770,7 @@ static void mlx5_cmd_trigger_completions(struct mlx5_core_dev *dev) + /* wait for pending handlers to complete */ + mlx5_eq_synchronize_cmd_irq(dev); + spin_lock_irqsave(&dev->cmd.alloc_lock, flags); +- vector = ~dev->cmd.vars.bitmask & ((1ul << (1 << dev->cmd.vars.log_sz)) - 1); ++ vector = ~dev->cmd.vars.bitmask & MLX5_CMD_MASK; + if (!vector) + goto no_trig; + +@@ -2301,7 +2305,7 @@ int mlx5_cmd_enable(struct mlx5_core_dev *dev) + + cmd->state = MLX5_CMDIF_STATE_DOWN; + cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1; +- cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1; ++ cmd->vars.bitmask = MLX5_CMD_MASK; + + sema_init(&cmd->vars.sem, cmd->vars.max_reg_cmds); + sema_init(&cmd->vars.pages_sem, 1); +-- +2.43.0 + diff --git a/queue-6.1/net-mlx5-remove-redundant-cmdif-revision-check.patch b/queue-6.1/net-mlx5-remove-redundant-cmdif-revision-check.patch new file mode 100644 index 00000000000..a8dcc4bffe4 --- /dev/null +++ b/queue-6.1/net-mlx5-remove-redundant-cmdif-revision-check.patch @@ -0,0 +1,63 @@ +From 4d4c58a520e05135ae8bfa53fd8cc2816960ce53 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 29 Jan 2023 12:08:30 +0200 +Subject: net/mlx5: Remove redundant cmdif revision check + +From: Shay Drory + +[ Upstream commit 0714ec9ea1f291447a925657e0808f34b8fbce2b ] + +mlx5 is checking the cmdif revision twice, for no reason. +Remove the latter check. + +Signed-off-by: Shay Drory +Reviewed-by: Moshe Shemesh +Signed-off-by: Saeed Mahameed +Stable-dep-of: d62b14045c65 ("net/mlx5: Fix command bitmask initialization") +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +index 465d2adbf3c00..2269f5e0e3c75 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +@@ -2216,16 +2216,15 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) + int align = roundup_pow_of_two(size); + struct mlx5_cmd *cmd = &dev->cmd; + u32 cmd_h, cmd_l; +- u16 cmd_if_rev; + int err; + int i; + + memset(cmd, 0, sizeof(*cmd)); +- cmd_if_rev = cmdif_rev(dev); +- if (cmd_if_rev != CMD_IF_REV) { ++ cmd->vars.cmdif_rev = cmdif_rev(dev); ++ if (cmd->vars.cmdif_rev != CMD_IF_REV) { + mlx5_core_err(dev, + "Driver cmdif rev(%d) differs from firmware's(%d)\n", +- CMD_IF_REV, cmd_if_rev); ++ CMD_IF_REV, cmd->vars.cmdif_rev); + return -EINVAL; + } + +@@ -2258,14 +2257,6 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) + cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1; + cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1; + +- cmd->vars.cmdif_rev = ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16; +- if (cmd->vars.cmdif_rev > CMD_IF_REV) { +- mlx5_core_err(dev, "driver does not support command interface version. driver %d, firmware %d\n", +- CMD_IF_REV, cmd->vars.cmdif_rev); +- err = -EOPNOTSUPP; +- goto err_free_page; +- } +- + spin_lock_init(&cmd->alloc_lock); + spin_lock_init(&cmd->token_lock); + for (i = 0; i < MLX5_CMD_OP_MAX; i++) +-- +2.43.0 + diff --git a/queue-6.1/net-mlx5-split-mlx5_cmd_init-to-probe-and-reload-rou.patch b/queue-6.1/net-mlx5-split-mlx5_cmd_init-to-probe-and-reload-rou.patch new file mode 100644 index 00000000000..96dfd520f84 --- /dev/null +++ b/queue-6.1/net-mlx5-split-mlx5_cmd_init-to-probe-and-reload-rou.patch @@ -0,0 +1,295 @@ +From e698adf712fb34f71932838518ed31a5b40cbc7a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Jan 2023 20:55:54 +0200 +Subject: net/mlx5: split mlx5_cmd_init() to probe and reload routines + +From: Shay Drory + +[ Upstream commit 06cd555f73caec515a14d42ef052221fa2587ff9 ] + +There is no need to destroy and allocate cmd SW structs during reload, +this is time consuming for no reason. +Hence, split mlx5_cmd_init() to probe and reload routines. + +Signed-off-by: Shay Drory +Reviewed-by: Moshe Shemesh +Signed-off-by: Saeed Mahameed +Stable-dep-of: d62b14045c65 ("net/mlx5: Fix command bitmask initialization") +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 121 ++++++++++-------- + .../net/ethernet/mellanox/mlx5/core/main.c | 15 ++- + .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + 3 files changed, 82 insertions(+), 56 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +index 2269f5e0e3c75..c6ddf51818efe 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +@@ -1570,7 +1570,6 @@ static void clean_debug_files(struct mlx5_core_dev *dev) + if (!mlx5_debugfs_root) + return; + +- mlx5_cmdif_debugfs_cleanup(dev); + debugfs_remove_recursive(dbg->dbg_root); + } + +@@ -1585,8 +1584,6 @@ static void create_debugfs_files(struct mlx5_core_dev *dev) + debugfs_create_file("out_len", 0600, dbg->dbg_root, dev, &olfops); + debugfs_create_u8("status", 0600, dbg->dbg_root, &dbg->status); + debugfs_create_file("run", 0200, dbg->dbg_root, dev, &fops); +- +- mlx5_cmdif_debugfs_init(dev); + } + + void mlx5_cmd_allowed_opcode(struct mlx5_core_dev *dev, u16 opcode) +@@ -2215,19 +2212,10 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) + int size = sizeof(struct mlx5_cmd_prot_block); + int align = roundup_pow_of_two(size); + struct mlx5_cmd *cmd = &dev->cmd; +- u32 cmd_h, cmd_l; ++ u32 cmd_l; + int err; + int i; + +- memset(cmd, 0, sizeof(*cmd)); +- cmd->vars.cmdif_rev = cmdif_rev(dev); +- if (cmd->vars.cmdif_rev != CMD_IF_REV) { +- mlx5_core_err(dev, +- "Driver cmdif rev(%d) differs from firmware's(%d)\n", +- CMD_IF_REV, cmd->vars.cmdif_rev); +- return -EINVAL; +- } +- + cmd->pool = dma_pool_create("mlx5_cmd", mlx5_core_dma_dev(dev), size, align, 0); + if (!cmd->pool) + return -ENOMEM; +@@ -2236,43 +2224,93 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) + if (err) + goto err_free_pool; + ++ cmd_l = (u32)(cmd->dma); ++ if (cmd_l & 0xfff) { ++ mlx5_core_err(dev, "invalid command queue address\n"); ++ err = -ENOMEM; ++ goto err_cmd_page; ++ } ++ cmd->checksum_disabled = 1; ++ ++ spin_lock_init(&cmd->alloc_lock); ++ spin_lock_init(&cmd->token_lock); ++ for (i = 0; i < MLX5_CMD_OP_MAX; i++) ++ spin_lock_init(&cmd->stats[i].lock); ++ ++ create_msg_cache(dev); ++ ++ set_wqname(dev); ++ cmd->wq = create_singlethread_workqueue(cmd->wq_name); ++ if (!cmd->wq) { ++ mlx5_core_err(dev, "failed to create command workqueue\n"); ++ err = -ENOMEM; ++ goto err_cache; ++ } ++ ++ mlx5_cmdif_debugfs_init(dev); ++ ++ return 0; ++ ++err_cache: ++ destroy_msg_cache(dev); ++err_cmd_page: ++ free_cmd_page(dev, cmd); ++err_free_pool: ++ dma_pool_destroy(cmd->pool); ++ return err; ++} ++ ++void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) ++{ ++ struct mlx5_cmd *cmd = &dev->cmd; ++ ++ mlx5_cmdif_debugfs_cleanup(dev); ++ destroy_workqueue(cmd->wq); ++ destroy_msg_cache(dev); ++ free_cmd_page(dev, cmd); ++ dma_pool_destroy(cmd->pool); ++} ++ ++int mlx5_cmd_enable(struct mlx5_core_dev *dev) ++{ ++ struct mlx5_cmd *cmd = &dev->cmd; ++ u32 cmd_h, cmd_l; ++ ++ memset(&cmd->vars, 0, sizeof(cmd->vars)); ++ cmd->vars.cmdif_rev = cmdif_rev(dev); ++ if (cmd->vars.cmdif_rev != CMD_IF_REV) { ++ mlx5_core_err(dev, ++ "Driver cmdif rev(%d) differs from firmware's(%d)\n", ++ CMD_IF_REV, cmd->vars.cmdif_rev); ++ return -EINVAL; ++ } ++ + cmd_l = ioread32be(&dev->iseg->cmdq_addr_l_sz) & 0xff; + cmd->vars.log_sz = cmd_l >> 4 & 0xf; + cmd->vars.log_stride = cmd_l & 0xf; + if (1 << cmd->vars.log_sz > MLX5_MAX_COMMANDS) { + mlx5_core_err(dev, "firmware reports too many outstanding commands %d\n", + 1 << cmd->vars.log_sz); +- err = -EINVAL; +- goto err_free_page; ++ return -EINVAL; + } + + if (cmd->vars.log_sz + cmd->vars.log_stride > MLX5_ADAPTER_PAGE_SHIFT) { + mlx5_core_err(dev, "command queue size overflow\n"); +- err = -EINVAL; +- goto err_free_page; ++ return -EINVAL; + } + + cmd->state = MLX5_CMDIF_STATE_DOWN; +- cmd->checksum_disabled = 1; + cmd->vars.max_reg_cmds = (1 << cmd->vars.log_sz) - 1; + cmd->vars.bitmask = (1UL << cmd->vars.max_reg_cmds) - 1; + +- spin_lock_init(&cmd->alloc_lock); +- spin_lock_init(&cmd->token_lock); +- for (i = 0; i < MLX5_CMD_OP_MAX; i++) +- spin_lock_init(&cmd->stats[i].lock); +- + sema_init(&cmd->vars.sem, cmd->vars.max_reg_cmds); + sema_init(&cmd->vars.pages_sem, 1); + sema_init(&cmd->vars.throttle_sem, DIV_ROUND_UP(cmd->vars.max_reg_cmds, 2)); + + cmd_h = (u32)((u64)(cmd->dma) >> 32); + cmd_l = (u32)(cmd->dma); +- if (cmd_l & 0xfff) { +- mlx5_core_err(dev, "invalid command queue address\n"); +- err = -ENOMEM; +- goto err_free_page; +- } ++ if (WARN_ON(cmd_l & 0xfff)) ++ return -EINVAL; + + iowrite32be(cmd_h, &dev->iseg->cmdq_addr_h); + iowrite32be(cmd_l, &dev->iseg->cmdq_addr_l_sz); +@@ -2285,40 +2323,17 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) + cmd->mode = CMD_MODE_POLLING; + cmd->allowed_opcode = CMD_ALLOWED_OPCODE_ALL; + +- create_msg_cache(dev); +- +- set_wqname(dev); +- cmd->wq = create_singlethread_workqueue(cmd->wq_name); +- if (!cmd->wq) { +- mlx5_core_err(dev, "failed to create command workqueue\n"); +- err = -ENOMEM; +- goto err_cache; +- } +- + create_debugfs_files(dev); + + return 0; +- +-err_cache: +- destroy_msg_cache(dev); +- +-err_free_page: +- free_cmd_page(dev, cmd); +- +-err_free_pool: +- dma_pool_destroy(cmd->pool); +- return err; + } + +-void mlx5_cmd_cleanup(struct mlx5_core_dev *dev) ++void mlx5_cmd_disable(struct mlx5_core_dev *dev) + { + struct mlx5_cmd *cmd = &dev->cmd; + + clean_debug_files(dev); +- destroy_workqueue(cmd->wq); +- destroy_msg_cache(dev); +- free_cmd_page(dev, cmd); +- dma_pool_destroy(cmd->pool); ++ flush_workqueue(cmd->wq); + } + + void mlx5_cmd_set_state(struct mlx5_core_dev *dev, +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c +index 825ad7663fa45..de7baa1a1e163 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c +@@ -1114,7 +1114,7 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou + return err; + } + +- err = mlx5_cmd_init(dev); ++ err = mlx5_cmd_enable(dev); + if (err) { + mlx5_core_err(dev, "Failed initializing command interface, aborting\n"); + return err; +@@ -1168,7 +1168,7 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou + mlx5_stop_health_poll(dev, boot); + err_cmd_cleanup: + mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN); +- mlx5_cmd_cleanup(dev); ++ mlx5_cmd_disable(dev); + + return err; + } +@@ -1179,7 +1179,7 @@ static void mlx5_function_disable(struct mlx5_core_dev *dev, bool boot) + mlx5_core_disable_hca(dev, 0); + mlx5_stop_health_poll(dev, boot); + mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN); +- mlx5_cmd_cleanup(dev); ++ mlx5_cmd_disable(dev); + } + + static int mlx5_function_open(struct mlx5_core_dev *dev) +@@ -1644,6 +1644,12 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx) + mlx5_debugfs_root); + INIT_LIST_HEAD(&priv->traps); + ++ err = mlx5_cmd_init(dev); ++ if (err) { ++ mlx5_core_err(dev, "Failed initializing cmdif SW structs, aborting\n"); ++ goto err_cmd_init; ++ } ++ + err = mlx5_tout_init(dev); + if (err) { + mlx5_core_err(dev, "Failed initializing timeouts, aborting\n"); +@@ -1689,6 +1695,8 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx) + err_health_init: + mlx5_tout_cleanup(dev); + err_timeout_init: ++ mlx5_cmd_cleanup(dev); ++err_cmd_init: + debugfs_remove(dev->priv.dbg.dbg_root); + mutex_destroy(&priv->pgdir_mutex); + mutex_destroy(&priv->alloc_mutex); +@@ -1711,6 +1719,7 @@ void mlx5_mdev_uninit(struct mlx5_core_dev *dev) + mlx5_pagealloc_cleanup(dev); + mlx5_health_cleanup(dev); + mlx5_tout_cleanup(dev); ++ mlx5_cmd_cleanup(dev); + debugfs_remove_recursive(dev->priv.dbg.dbg_root); + mutex_destroy(&priv->pgdir_mutex); + mutex_destroy(&priv->alloc_mutex); +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +index 0b560e97a3563..7d90f311b8560 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h ++++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +@@ -177,6 +177,8 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev); + int mlx5_query_board_id(struct mlx5_core_dev *dev); + int mlx5_cmd_init(struct mlx5_core_dev *dev); + void mlx5_cmd_cleanup(struct mlx5_core_dev *dev); ++int mlx5_cmd_enable(struct mlx5_core_dev *dev); ++void mlx5_cmd_disable(struct mlx5_core_dev *dev); + void mlx5_cmd_set_state(struct mlx5_core_dev *dev, + enum mlx5_cmdif_state cmdif_state); + int mlx5_cmd_init_hca(struct mlx5_core_dev *dev, uint32_t *sw_owner_id); +-- +2.43.0 + diff --git a/queue-6.1/net-mlx5-unregister-notifier-on-eswitch-init-failure.patch b/queue-6.1/net-mlx5-unregister-notifier-on-eswitch-init-failure.patch new file mode 100644 index 00000000000..0e3208fd611 --- /dev/null +++ b/queue-6.1/net-mlx5-unregister-notifier-on-eswitch-init-failure.patch @@ -0,0 +1,72 @@ +From 220b862a27bf1de3d91516710e9a8f1ac5ff1ea7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Oct 2024 12:32:07 +0300 +Subject: net/mlx5: Unregister notifier on eswitch init failure + +From: Cosmin Ratiu + +[ Upstream commit 1da9cfd6c41c2e6bbe624d0568644e1521c33e12 ] + +It otherwise remains registered and a subsequent attempt at eswitch +enabling might trigger warnings of the sort: + +[ 682.589148] ------------[ cut here ]------------ +[ 682.590204] notifier callback eswitch_vport_event [mlx5_core] already registered +[ 682.590256] WARNING: CPU: 13 PID: 2660 at kernel/notifier.c:31 notifier_chain_register+0x3e/0x90 +[...snipped] +[ 682.610052] Call Trace: +[ 682.610369] +[ 682.610663] ? __warn+0x7c/0x110 +[ 682.611050] ? notifier_chain_register+0x3e/0x90 +[ 682.611556] ? report_bug+0x148/0x170 +[ 682.611977] ? handle_bug+0x36/0x70 +[ 682.612384] ? exc_invalid_op+0x13/0x60 +[ 682.612817] ? asm_exc_invalid_op+0x16/0x20 +[ 682.613284] ? notifier_chain_register+0x3e/0x90 +[ 682.613789] atomic_notifier_chain_register+0x25/0x40 +[ 682.614322] mlx5_eswitch_enable_locked+0x1d4/0x3b0 [mlx5_core] +[ 682.614965] mlx5_eswitch_enable+0xc9/0x100 [mlx5_core] +[ 682.615551] mlx5_device_enable_sriov+0x25/0x340 [mlx5_core] +[ 682.616170] mlx5_core_sriov_configure+0x50/0x170 [mlx5_core] +[ 682.616789] sriov_numvfs_store+0xb0/0x1b0 +[ 682.617248] kernfs_fop_write_iter+0x117/0x1a0 +[ 682.617734] vfs_write+0x231/0x3f0 +[ 682.618138] ksys_write+0x63/0xe0 +[ 682.618536] do_syscall_64+0x4c/0x100 +[ 682.618958] entry_SYSCALL_64_after_hwframe+0x4b/0x53 + +Fixes: 7624e58a8b3a ("net/mlx5: E-switch, register event handler before arming the event") +Signed-off-by: Cosmin Ratiu +Signed-off-by: Tariq Toukan +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +index 48939c72b5925..9ba825df9be0e 100644 +--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c ++++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +@@ -1279,7 +1279,7 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs) + } + + if (err) +- goto abort; ++ goto err_esw_enable; + + esw->fdb_table.flags |= MLX5_ESW_FDB_CREATED; + +@@ -1293,7 +1293,8 @@ int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int num_vfs) + + return 0; + +-abort: ++err_esw_enable: ++ mlx5_eq_notifier_unregister(esw->dev, &esw->nb); + mlx5_esw_acls_ns_cleanup(esw); + return err; + } +-- +2.43.0 + diff --git a/queue-6.1/net-ravb-only-advertise-rx-tx-timestamps-if-hardware.patch b/queue-6.1/net-ravb-only-advertise-rx-tx-timestamps-if-hardware.patch new file mode 100644 index 00000000000..08275fb9fd0 --- /dev/null +++ b/queue-6.1/net-ravb-only-advertise-rx-tx-timestamps-if-hardware.patch @@ -0,0 +1,76 @@ +From 7eb0829ff509c28a5cd3d8688f753cd2a9249beb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 14:43:43 +0200 +Subject: net: ravb: Only advertise Rx/Tx timestamps if hardware supports it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Niklas Söderlund + +[ Upstream commit 126e799602f45e9ce1ded03ee9eadda68bf470e0 ] + +Recent work moving the reporting of Rx software timestamps to the core +[1] highlighted an issue where hardware time stamping was advertised +for the platforms where it is not supported. + +Fix this by covering advertising support for hardware timestamps only if +the hardware supports it. Due to the Tx implementation in RAVB software +Tx timestamping is also only considered if the hardware supports +hardware timestamps. This should be addressed in future, but this fix +only reflects what the driver currently implements. + +1. Commit 277901ee3a26 ("ravb: Remove setting of RX software timestamp") + +Fixes: 7e09a052dc4e ("ravb: Exclude gPTP feature support for RZ/G2L") +Signed-off-by: Niklas Söderlund +Reviewed-by: Paul Barker +Tested-by: Paul Barker +Reviewed-by: Sergey Shtylyov +Link: https://patch.msgid.link/20241014124343.3875285-1-niklas.soderlund+renesas@ragnatech.se +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/renesas/ravb_main.c | 25 ++++++++++++------------ + 1 file changed, 12 insertions(+), 13 deletions(-) + +diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c +index 96467b8d48b00..705010ea1d568 100644 +--- a/drivers/net/ethernet/renesas/ravb_main.c ++++ b/drivers/net/ethernet/renesas/ravb_main.c +@@ -1689,20 +1689,19 @@ static int ravb_get_ts_info(struct net_device *ndev, + struct ravb_private *priv = netdev_priv(ndev); + const struct ravb_hw_info *hw_info = priv->info; + +- info->so_timestamping = +- SOF_TIMESTAMPING_TX_SOFTWARE | +- SOF_TIMESTAMPING_TX_HARDWARE | +- SOF_TIMESTAMPING_RX_HARDWARE | +- SOF_TIMESTAMPING_RAW_HARDWARE; +- info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON); +- info->rx_filters = +- (1 << HWTSTAMP_FILTER_NONE) | +- (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | +- (1 << HWTSTAMP_FILTER_ALL); +- if (hw_info->gptp || hw_info->ccc_gac) ++ if (hw_info->gptp || hw_info->ccc_gac) { ++ info->so_timestamping = ++ SOF_TIMESTAMPING_TX_SOFTWARE | ++ SOF_TIMESTAMPING_TX_HARDWARE | ++ SOF_TIMESTAMPING_RX_HARDWARE | ++ SOF_TIMESTAMPING_RAW_HARDWARE; ++ info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON); ++ info->rx_filters = ++ (1 << HWTSTAMP_FILTER_NONE) | ++ (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | ++ (1 << HWTSTAMP_FILTER_ALL); + info->phc_index = ptp_clock_index(priv->ptp.clock); +- else +- info->phc_index = 0; ++ } + + return 0; + } +-- +2.43.0 + diff --git a/queue-6.1/net-smc-fix-searching-in-list-of-known-pnetids-in-sm.patch b/queue-6.1/net-smc-fix-searching-in-list-of-known-pnetids-in-sm.patch new file mode 100644 index 00000000000..c907d83492c --- /dev/null +++ b/queue-6.1/net-smc-fix-searching-in-list-of-known-pnetids-in-sm.patch @@ -0,0 +1,41 @@ +From 4ca686543499ca23c81780b0f8b17a524e832ea9 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 19:53:21 +0800 +Subject: net/smc: Fix searching in list of known pnetids in + smc_pnet_add_pnetid + +From: Li RongQing + +[ Upstream commit 82ac39ebd6db0c9f7a97a934bda1e3e101a9d201 ] + +pnetid of pi (not newly allocated pe) should be compared + +Fixes: e888a2e8337c ("net/smc: introduce list of pnetids for Ethernet devices") +Reviewed-by: D. Wythe +Reviewed-by: Wen Gu +Signed-off-by: Li RongQing +Reviewed-by: Simon Horman +Reviewed-by: Gerd Bayer +Link: https://patch.msgid.link/20241014115321.33234-1-lirongqing@baidu.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/smc/smc_pnet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c +index 21b8bf23e4ee6..399314cfab90a 100644 +--- a/net/smc/smc_pnet.c ++++ b/net/smc/smc_pnet.c +@@ -749,7 +749,7 @@ static int smc_pnet_add_pnetid(struct net *net, u8 *pnetid) + + write_lock(&sn->pnetids_ndev.lock); + list_for_each_entry(pi, &sn->pnetids_ndev.list, list) { +- if (smc_pnet_match(pnetid, pe->pnetid)) { ++ if (smc_pnet_match(pnetid, pi->pnetid)) { + refcount_inc(&pi->refcnt); + kfree(pe); + goto unlock; +-- +2.43.0 + diff --git a/queue-6.1/net-systemport-fix-potential-memory-leak-in-bcm_sysp.patch b/queue-6.1/net-systemport-fix-potential-memory-leak-in-bcm_sysp.patch new file mode 100644 index 00000000000..6d1e1508db5 --- /dev/null +++ b/queue-6.1/net-systemport-fix-potential-memory-leak-in-bcm_sysp.patch @@ -0,0 +1,36 @@ +From e2b2b6e1fd626c1c0ff8c39452f9d2cbfa9f7f62 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 22:51:15 +0800 +Subject: net: systemport: fix potential memory leak in bcm_sysport_xmit() + +From: Wang Hai + +[ Upstream commit c401ed1c709948e57945485088413e1bb5e94bd1 ] + +The bcm_sysport_xmit() returns NETDEV_TX_OK without freeing skb +in case of dma_map_single() fails, add dev_kfree_skb() to fix it. + +Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver") +Signed-off-by: Wang Hai +Link: https://patch.msgid.link/20241014145115.44977-1-wanghai38@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/broadcom/bcmsysport.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c +index 425d6ccd5413a..1693f6c60efc7 100644 +--- a/drivers/net/ethernet/broadcom/bcmsysport.c ++++ b/drivers/net/ethernet/broadcom/bcmsysport.c +@@ -1348,6 +1348,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, + netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n", + skb->data, skb_len); + ret = NETDEV_TX_OK; ++ dev_kfree_skb_any(skb); + goto out; + } + +-- +2.43.0 + diff --git a/queue-6.1/net-usb-usbnet-fix-race-in-probe-failure.patch b/queue-6.1/net-usb-usbnet-fix-race-in-probe-failure.patch new file mode 100644 index 00000000000..c16bcf8dc47 --- /dev/null +++ b/queue-6.1/net-usb-usbnet-fix-race-in-probe-failure.patch @@ -0,0 +1,37 @@ +From 6a534328018f2f8a9657bcce4b65fa2ad34cf98f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Oct 2024 15:19:14 +0200 +Subject: net: usb: usbnet: fix race in probe failure + +From: Oliver Neukum + +[ Upstream commit b62f4c186c70aa235fef2da68d07325d85ca3ade ] + +The same bug as in the disconnect code path also exists +in the case of a failure late during the probe process. +The flag must also be set. + +Signed-off-by: Oliver Neukum +Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") +Link: https://patch.msgid.link/20241010131934.1499695-1-oneukum@suse.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/usb/usbnet.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c +index bd0b807db751d..ce587a12b894c 100644 +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1869,6 +1869,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) + * may trigger an error resubmitting itself and, worse, + * schedule a timer. So we kill it all just in case. + */ ++ usbnet_mark_going_away(dev); + cancel_work_sync(&dev->kevent); + del_timer_sync(&dev->delay); + free_percpu(net->tstats); +-- +2.43.0 + diff --git a/queue-6.1/net-xilinx-axienet-fix-potential-memory-leak-in-axie.patch b/queue-6.1/net-xilinx-axienet-fix-potential-memory-leak-in-axie.patch new file mode 100644 index 00000000000..4e7e44d0c2e --- /dev/null +++ b/queue-6.1/net-xilinx-axienet-fix-potential-memory-leak-in-axie.patch @@ -0,0 +1,46 @@ +From 4375f40e4bde03e3bccb8ef08fde5ebc043fe590 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 22:37:04 +0800 +Subject: net: xilinx: axienet: fix potential memory leak in + axienet_start_xmit() + +From: Wang Hai + +[ Upstream commit 99714e37e8333bbc22496fe80f241d5b35380e83 ] + +The axienet_start_xmit() returns NETDEV_TX_OK without freeing skb +in case of dma_map_single() fails, add dev_kfree_skb_any() to fix it. + +Fixes: 71791dc8bdea ("net: axienet: Check for DMA mapping errors") +Signed-off-by: Wang Hai +Reviewed-by: Radhey Shyam Pandey +Link: https://patch.msgid.link/20241014143704.31938-1-wanghai38@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +index 0b6f0908f3e1c..ce0dd78826af0 100644 +--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c ++++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +@@ -844,6 +844,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) + if (net_ratelimit()) + netdev_err(ndev, "TX DMA mapping error\n"); + ndev->stats.tx_dropped++; ++ dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + desc_set_phys_addr(lp, phys, cur_p); +@@ -864,6 +865,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) + ndev->stats.tx_dropped++; + axienet_free_tx_chain(lp, orig_tail_ptr, ii + 1, + true, NULL, 0); ++ dev_kfree_skb_any(skb); + return NETDEV_TX_OK; + } + desc_set_phys_addr(lp, phys, cur_p); +-- +2.43.0 + diff --git a/queue-6.1/netdevsim-use-cond_resched-in-nsim_dev_trap_report_w.patch b/queue-6.1/netdevsim-use-cond_resched-in-nsim_dev_trap_report_w.patch new file mode 100644 index 00000000000..7249171d367 --- /dev/null +++ b/queue-6.1/netdevsim-use-cond_resched-in-nsim_dev_trap_report_w.patch @@ -0,0 +1,111 @@ +From a34e434121e435072f25ec8c69349a79abbd5ac4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 12 Oct 2024 09:42:30 +0000 +Subject: netdevsim: use cond_resched() in nsim_dev_trap_report_work() + +From: Eric Dumazet + +[ Upstream commit a1494d532e28598bde7a5544892ef9c7dbfafa93 ] + +I am still seeing many syzbot reports hinting that syzbot +might fool nsim_dev_trap_report_work() with hundreds of ports [1] + +Lets use cond_resched(), and system_unbound_wq +instead of implicit system_wq. + +[1] +INFO: task syz-executor:20633 blocked for more than 143 seconds. + Not tainted 6.12.0-rc2-syzkaller-00205-g1d227fcc7222 #0 +"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. +task:syz-executor state:D stack:25856 pid:20633 tgid:20633 ppid:1 flags:0x00004006 +... +NMI backtrace for cpu 1 +CPU: 1 UID: 0 PID: 16760 Comm: kworker/1:0 Not tainted 6.12.0-rc2-syzkaller-00205-g1d227fcc7222 #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 +Workqueue: events nsim_dev_trap_report_work + RIP: 0010:__sanitizer_cov_trace_pc+0x0/0x70 kernel/kcov.c:210 +Code: 89 fb e8 23 00 00 00 48 8b 3d 04 fb 9c 0c 48 89 de 5b e9 c3 c7 5d 00 0f 1f 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1e fa 48 8b 04 24 65 48 8b 0c 25 c0 d7 03 00 65 8b 15 60 f0 +RSP: 0018:ffffc90000a187e8 EFLAGS: 00000246 +RAX: 0000000000000100 RBX: ffffc90000a188e0 RCX: ffff888027d3bc00 +RDX: ffff888027d3bc00 RSI: 0000000000000000 RDI: 0000000000000000 +RBP: ffff88804a2e6000 R08: ffffffff8a4bc495 R09: ffffffff89da3577 +R10: 0000000000000004 R11: ffffffff8a4bc2b0 R12: dffffc0000000000 +R13: ffff88806573b503 R14: dffffc0000000000 R15: ffff8880663cca00 +FS: 0000000000000000(0000) GS:ffff8880b8700000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00007fc90a747f98 CR3: 000000000e734000 CR4: 00000000003526f0 +DR0: 0000000000000000 DR1: 000000000000002b DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 +Call Trace: + + + + __local_bh_enable_ip+0x1bb/0x200 kernel/softirq.c:382 + spin_unlock_bh include/linux/spinlock.h:396 [inline] + nsim_dev_trap_report drivers/net/netdevsim/dev.c:820 [inline] + nsim_dev_trap_report_work+0x75d/0xaa0 drivers/net/netdevsim/dev.c:850 + process_one_work kernel/workqueue.c:3229 [inline] + process_scheduled_works+0xa63/0x1850 kernel/workqueue.c:3310 + worker_thread+0x870/0xd30 kernel/workqueue.c:3391 + kthread+0x2f0/0x390 kernel/kthread.c:389 + ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 + ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 + + +Fixes: ba5e1272142d ("netdevsim: avoid potential loop in nsim_dev_trap_report_work()") +Reported-by: syzbot+d383dc9579a76f56c251@syzkaller.appspotmail.com +Reported-by: syzbot+c596faae21a68bf7afd0@syzkaller.appspotmail.com +Signed-off-by: Eric Dumazet +Cc: Jiri Pirko +Link: https://patch.msgid.link/20241012094230.3893510-1-edumazet@google.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/netdevsim/dev.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c +index f3fa4bd121169..cdf7a70d66591 100644 +--- a/drivers/net/netdevsim/dev.c ++++ b/drivers/net/netdevsim/dev.c +@@ -836,7 +836,8 @@ static void nsim_dev_trap_report_work(struct work_struct *work) + nsim_dev = nsim_trap_data->nsim_dev; + + if (!devl_trylock(priv_to_devlink(nsim_dev))) { +- schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, 1); ++ queue_delayed_work(system_unbound_wq, ++ &nsim_dev->trap_data->trap_report_dw, 1); + return; + } + +@@ -848,11 +849,12 @@ static void nsim_dev_trap_report_work(struct work_struct *work) + continue; + + nsim_dev_trap_report(nsim_dev_port); ++ cond_resched(); + } + devl_unlock(priv_to_devlink(nsim_dev)); +- +- schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, +- msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS)); ++ queue_delayed_work(system_unbound_wq, ++ &nsim_dev->trap_data->trap_report_dw, ++ msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS)); + } + + static int nsim_dev_traps_init(struct devlink *devlink) +@@ -907,8 +909,9 @@ static int nsim_dev_traps_init(struct devlink *devlink) + + INIT_DELAYED_WORK(&nsim_dev->trap_data->trap_report_dw, + nsim_dev_trap_report_work); +- schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, +- msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS)); ++ queue_delayed_work(system_unbound_wq, ++ &nsim_dev->trap_data->trap_report_dw, ++ msecs_to_jiffies(NSIM_TRAP_REPORT_INTERVAL_MS)); + + return 0; + +-- +2.43.0 + diff --git a/queue-6.1/octeontx2-af-fix-potential-integer-overflows-on-inte.patch b/queue-6.1/octeontx2-af-fix-potential-integer-overflows-on-inte.patch new file mode 100644 index 00000000000..3d0bb85c0de --- /dev/null +++ b/queue-6.1/octeontx2-af-fix-potential-integer-overflows-on-inte.patch @@ -0,0 +1,49 @@ +From 5ebb2dd07a2b5d66c7f67188697fb522b5c96cc8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Oct 2024 16:45:19 +0100 +Subject: octeontx2-af: Fix potential integer overflows on integer shifts + +From: Colin Ian King + +[ Upstream commit 637c4f6fe40befa04f19c38b5d15429cbb9191d9 ] + +The left shift int 32 bit integer constants 1 is evaluated using 32 bit +arithmetic and then assigned to a 64 bit unsigned integer. In the case +where the shift is 32 or more this can lead to an overflow. Avoid this +by shifting using the BIT_ULL macro instead. + +Fixes: 019aba04f08c ("octeontx2-af: Modify SMQ flush sequence to drop packets") +Signed-off-by: Colin Ian King +Reviewed-by: Dan Carpenter +Link: https://patch.msgid.link/20241010154519.768785-1-colin.i.king@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +index 7ed0eb9bd4ed2..95a8ccd18a4f7 100644 +--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c ++++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +@@ -2279,7 +2279,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr, + NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link)); + if (!(cfg & BIT_ULL(12))) + continue; +- bmap |= (1 << i); ++ bmap |= BIT_ULL(i); + cfg &= ~BIT_ULL(12); + rvu_write64(rvu, blkaddr, + NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link), cfg); +@@ -2300,7 +2300,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr, + + /* Set NIX_AF_TL3_TL2_LINKX_CFG[ENA] for the TL3/TL2 queue */ + for (i = 0; i < (rvu->hw->cgx_links + rvu->hw->lbk_links); i++) { +- if (!(bmap & (1 << i))) ++ if (!(bmap & BIT_ULL(i))) + continue; + cfg = rvu_read64(rvu, blkaddr, + NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link)); +-- +2.43.0 + diff --git a/queue-6.1/ravb-remove-setting-of-rx-software-timestamp.patch b/queue-6.1/ravb-remove-setting-of-rx-software-timestamp.patch new file mode 100644 index 00000000000..56bf3a3e346 --- /dev/null +++ b/queue-6.1/ravb-remove-setting-of-rx-software-timestamp.patch @@ -0,0 +1,54 @@ +From 9bc8bb84e87509fa455a7afe9078e7a10568b16a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 1 Sep 2024 14:27:55 +0300 +Subject: ravb: Remove setting of RX software timestamp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gal Pressman + +[ Upstream commit 277901ee3a2620679e2c8797377d2a72f4358068 ] + +The responsibility for reporting of RX software timestamp has moved to +the core layer (see __ethtool_get_ts_info()), remove usage from the +device drivers. + +Reviewed-by: Carolina Jubran +Reviewed-by: Rahul Rameshbabu +Signed-off-by: Gal Pressman +Reviewed-by: Niklas Söderlund +Reviewed-by: Sergey Shtylyov +Link: https://patch.msgid.link/20240901112803.212753-8-gal@nvidia.com +Signed-off-by: Jakub Kicinski +Stable-dep-of: 126e799602f4 ("net: ravb: Only advertise Rx/Tx timestamps if hardware supports it") +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/renesas/ravb_main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c +index 756ac4a07f60b..96467b8d48b00 100644 +--- a/drivers/net/ethernet/renesas/ravb_main.c ++++ b/drivers/net/ethernet/renesas/ravb_main.c +@@ -1691,8 +1691,6 @@ static int ravb_get_ts_info(struct net_device *ndev, + + info->so_timestamping = + SOF_TIMESTAMPING_TX_SOFTWARE | +- SOF_TIMESTAMPING_RX_SOFTWARE | +- SOF_TIMESTAMPING_SOFTWARE | + SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RAW_HARDWARE; +@@ -1703,6 +1701,8 @@ static int ravb_get_ts_info(struct net_device *ndev, + (1 << HWTSTAMP_FILTER_ALL); + if (hw_info->gptp || hw_info->ccc_gac) + info->phc_index = ptp_clock_index(priv->ptp.clock); ++ else ++ info->phc_index = 0; + + return 0; + } +-- +2.43.0 + diff --git a/queue-6.1/rdma-bnxt_re-add-a-check-for-memory-allocation.patch b/queue-6.1/rdma-bnxt_re-add-a-check-for-memory-allocation.patch new file mode 100644 index 00000000000..7d1f80d27bf --- /dev/null +++ b/queue-6.1/rdma-bnxt_re-add-a-check-for-memory-allocation.patch @@ -0,0 +1,40 @@ +From f8ba2cc865de4d62e239f6cbb798e553294124d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Sep 2024 20:05:58 -0700 +Subject: RDMA/bnxt_re: Add a check for memory allocation + +From: Kalesh AP + +[ Upstream commit c5c1ae73b7741fa3b58e6e001b407825bb971225 ] + +__alloc_pbl() can return error when memory allocation fails. +Driver is not checking the status on one of the instances. + +Fixes: 0c4dcd602817 ("RDMA/bnxt_re: Refactor hardware queue memory allocation") +Link: https://patch.msgid.link/r/1726715161-18941-4-git-send-email-selvin.xavier@broadcom.com +Reviewed-by: Selvin Xavier +Signed-off-by: Kalesh AP +Signed-off-by: Selvin Xavier +Signed-off-by: Jason Gunthorpe +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c +index 81b0c5e879f9e..1dd36af9e68f2 100644 +--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c ++++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c +@@ -244,6 +244,8 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq, + sginfo.pgsize = npde * pg_size; + sginfo.npages = 1; + rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_0], &sginfo); ++ if (rc) ++ goto fail; + + /* Alloc PBL pages */ + sginfo.npages = npbl; +-- +2.43.0 + diff --git a/queue-6.1/rdma-bnxt_re-fix-a-bug-while-setting-up-level-2-pbl-.patch b/queue-6.1/rdma-bnxt_re-fix-a-bug-while-setting-up-level-2-pbl-.patch new file mode 100644 index 00000000000..f8228f04c8b --- /dev/null +++ b/queue-6.1/rdma-bnxt_re-fix-a-bug-while-setting-up-level-2-pbl-.patch @@ -0,0 +1,59 @@ +From 3fae0b9864fb2cbd27dcf8355f76d0f2ecc3b54b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 00:41:41 -0700 +Subject: RDMA/bnxt_re: Fix a bug while setting up Level-2 PBL pages + +From: Bhargava Chenna Marreddy + +[ Upstream commit 7988bdbbb85ac85a847baf09879edcd0f70521dc ] + +Avoid memory corruption while setting up Level-2 PBL pages for the non MR +resources when num_pages > 256K. + +There will be a single PDE page address (contiguous pages in the case of > +PAGE_SIZE), but, current logic assumes multiple pages, leading to invalid +memory access after 256K PBL entries in the PDE. + +Fixes: 0c4dcd602817 ("RDMA/bnxt_re: Refactor hardware queue memory allocation") +Link: https://patch.msgid.link/r/1728373302-19530-10-git-send-email-selvin.xavier@broadcom.com +Signed-off-by: Bhargava Chenna Marreddy +Signed-off-by: Selvin Xavier +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 19 +++---------------- + 1 file changed, 3 insertions(+), 16 deletions(-) + +diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c +index 1dd36af9e68f2..203350c6e00f5 100644 +--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c ++++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c +@@ -257,22 +257,9 @@ int bnxt_qplib_alloc_init_hwq(struct bnxt_qplib_hwq *hwq, + dst_virt_ptr = + (dma_addr_t **)hwq->pbl[PBL_LVL_0].pg_arr; + src_phys_ptr = hwq->pbl[PBL_LVL_1].pg_map_arr; +- if (hwq_attr->type == HWQ_TYPE_MR) { +- /* For MR it is expected that we supply only 1 contigous +- * page i.e only 1 entry in the PDL that will contain +- * all the PBLs for the user supplied memory region +- */ +- for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count; +- i++) +- dst_virt_ptr[0][i] = src_phys_ptr[i] | +- flag; +- } else { +- for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count; +- i++) +- dst_virt_ptr[PTR_PG(i)][PTR_IDX(i)] = +- src_phys_ptr[i] | +- PTU_PDE_VALID; +- } ++ for (i = 0; i < hwq->pbl[PBL_LVL_1].pg_count; i++) ++ dst_virt_ptr[0][i] = src_phys_ptr[i] | flag; ++ + /* Alloc or init PTEs */ + rc = __alloc_pbl(res, &hwq->pbl[PBL_LVL_2], + hwq_attr->sginfo); +-- +2.43.0 + diff --git a/queue-6.1/rdma-bnxt_re-fix-incorrect-avid-type-in-wqe-structur.patch b/queue-6.1/rdma-bnxt_re-fix-incorrect-avid-type-in-wqe-structur.patch new file mode 100644 index 00000000000..8a4dd06d07e --- /dev/null +++ b/queue-6.1/rdma-bnxt_re-fix-incorrect-avid-type-in-wqe-structur.patch @@ -0,0 +1,47 @@ +From 8db05dcfec5e764a3e599c8e25391d3229f785a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Sep 2024 20:05:57 -0700 +Subject: RDMA/bnxt_re: Fix incorrect AVID type in WQE structure + +From: Saravanan Vajravel + +[ Upstream commit 9ab20f76ae9fad55ebaf36bdff04aea1c2552374 ] + +Driver uses internal data structure to construct WQE frame. +It used avid type as u16 which can accommodate up to 64K AVs. +When outstanding AVID crosses 64K, driver truncates AVID and +hence it uses incorrect AVID to WR. This leads to WR failure +due to invalid AV ID and QP is moved to error state with reason +set to 19 (INVALID AVID). When RDMA CM path is used, this issue +hits QP1 and it is moved to error state + +Fixes: 1ac5a4047975 ("RDMA/bnxt_re: Add bnxt_re RoCE driver") +Link: https://patch.msgid.link/r/1726715161-18941-3-git-send-email-selvin.xavier@broadcom.com +Reviewed-by: Selvin Xavier +Reviewed-by: Chandramohan Akula +Signed-off-by: Saravanan Vajravel +Signed-off-by: Kalesh AP +Signed-off-by: Selvin Xavier +Signed-off-by: Jason Gunthorpe +Signed-off-by: Leon Romanovsky +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/bnxt_re/qplib_fp.h b/drivers/infiniband/hw/bnxt_re/qplib_fp.h +index 4f1a845f9be6c..57a3dae87f659 100644 +--- a/drivers/infiniband/hw/bnxt_re/qplib_fp.h ++++ b/drivers/infiniband/hw/bnxt_re/qplib_fp.h +@@ -169,7 +169,7 @@ struct bnxt_qplib_swqe { + }; + u32 q_key; + u32 dst_qp; +- u16 avid; ++ u32 avid; + } send; + + /* Send Raw Ethernet and QP1 */ +-- +2.43.0 + diff --git a/queue-6.1/rdma-bnxt_re-return-more-meaningful-error.patch b/queue-6.1/rdma-bnxt_re-return-more-meaningful-error.patch new file mode 100644 index 00000000000..9a693907734 --- /dev/null +++ b/queue-6.1/rdma-bnxt_re-return-more-meaningful-error.patch @@ -0,0 +1,41 @@ +From 160efa59bebdb4e87cb5a23cbca0fa429a87c003 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 00:41:36 -0700 +Subject: RDMA/bnxt_re: Return more meaningful error + +From: Kalesh AP + +[ Upstream commit 98647df0178df215b8239c5c365537283b2852a6 ] + +When the HWRM command fails, driver currently returns -EFAULT(Bad +address). This does not look correct. + +Modified to return -EIO(I/O error). + +Fixes: cc1ec769b87c ("RDMA/bnxt_re: Fixing the Control path command and response handling") +Fixes: 65288a22ddd8 ("RDMA/bnxt_re: use shadow qd while posting non blocking rcfw command") +Link: https://patch.msgid.link/r/1728373302-19530-5-git-send-email-selvin.xavier@broadcom.com +Signed-off-by: Kalesh AP +Signed-off-by: Selvin Xavier +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +index 75e0c42f6f424..14c9af41faa67 100644 +--- a/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c ++++ b/drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +@@ -249,7 +249,7 @@ int bnxt_qplib_rcfw_send_message(struct bnxt_qplib_rcfw *rcfw, + /* failed with status */ + dev_err(&rcfw->pdev->dev, "cmdq[%#x]=%#x status %#x\n", + cookie, opcode, evnt->status); +- rc = -EFAULT; ++ rc = -EIO; + } + + return rc; +-- +2.43.0 + diff --git a/queue-6.1/rdma-cxgb4-fix-rdma_cm_event_unreachable-error-for-i.patch b/queue-6.1/rdma-cxgb4-fix-rdma_cm_event_unreachable-error-for-i.patch new file mode 100644 index 00000000000..3e5db593dc5 --- /dev/null +++ b/queue-6.1/rdma-cxgb4-fix-rdma_cm_event_unreachable-error-for-i.patch @@ -0,0 +1,65 @@ +From d9c5cfe1c668d4c3f52081a16959f5832730a8f8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 7 Oct 2024 18:53:11 +0530 +Subject: RDMA/cxgb4: Fix RDMA_CM_EVENT_UNREACHABLE error for iWARP + +From: Anumula Murali Mohan Reddy + +[ Upstream commit c659b405b82ead335bee6eb33f9691bf718e21e8 ] + +ip_dev_find() always returns real net_device address, whether traffic is +running on a vlan or real device, if traffic is over vlan, filling +endpoint struture with real ndev and an attempt to send a connect request +will results in RDMA_CM_EVENT_UNREACHABLE error. This patch fixes the +issue by using vlan_dev_real_dev(). + +Fixes: 830662f6f032 ("RDMA/cxgb4: Add support for active and passive open connection with IPv6 address") +Link: https://patch.msgid.link/r/20241007132311.70593-1-anumula@chelsio.com +Signed-off-by: Anumula Murali Mohan Reddy +Signed-off-by: Potnuri Bharat Teja +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/cxgb4/cm.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c +index b3757c6a0457a..8d753e6e0c719 100644 +--- a/drivers/infiniband/hw/cxgb4/cm.c ++++ b/drivers/infiniband/hw/cxgb4/cm.c +@@ -2086,7 +2086,7 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, + err = -ENOMEM; + if (n->dev->flags & IFF_LOOPBACK) { + if (iptype == 4) +- pdev = ip_dev_find(&init_net, *(__be32 *)peer_ip); ++ pdev = __ip_dev_find(&init_net, *(__be32 *)peer_ip, false); + else if (IS_ENABLED(CONFIG_IPV6)) + for_each_netdev(&init_net, pdev) { + if (ipv6_chk_addr(&init_net, +@@ -2101,12 +2101,12 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, + err = -ENODEV; + goto out; + } ++ if (is_vlan_dev(pdev)) ++ pdev = vlan_dev_real_dev(pdev); + ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t, + n, pdev, rt_tos2priority(tos)); +- if (!ep->l2t) { +- dev_put(pdev); ++ if (!ep->l2t) + goto out; +- } + ep->mtu = pdev->mtu; + ep->tx_chan = cxgb4_port_chan(pdev); + ep->smac_idx = ((struct port_info *)netdev_priv(pdev))->smt_idx; +@@ -2119,7 +2119,6 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, + ep->rss_qid = cdev->rdev.lldi.rxq_ids[ + cxgb4_port_idx(pdev) * step]; + set_tcp_window(ep, (struct port_info *)netdev_priv(pdev)); +- dev_put(pdev); + } else { + pdev = get_real_dev(n->dev); + ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t, +-- +2.43.0 + diff --git a/queue-6.1/rdma-irdma-fix-misspelling-of-accept.patch b/queue-6.1/rdma-irdma-fix-misspelling-of-accept.patch new file mode 100644 index 00000000000..2772515704d --- /dev/null +++ b/queue-6.1/rdma-irdma-fix-misspelling-of-accept.patch @@ -0,0 +1,37 @@ +From 915a2d97396c3138580ccea2fbacf657148a1b23 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 18:19:13 +0200 +Subject: RDMA/irdma: Fix misspelling of "accept*" + +From: Alexander Zubkov + +[ Upstream commit 8cddfa535c931b8d8110c73bfed7354a94cbf891 ] + +There is "accept*" misspelled as "accpet*" in the comments. Fix the +spelling. + +Fixes: 146b9756f14c ("RDMA/irdma: Add connection manager") +Link: https://patch.msgid.link/r/20241008161913.19965-1-green@qrator.net +Signed-off-by: Alexander Zubkov +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/hw/irdma/cm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma/cm.c +index 8817864154af1..691b9ed7f759d 100644 +--- a/drivers/infiniband/hw/irdma/cm.c ++++ b/drivers/infiniband/hw/irdma/cm.c +@@ -3584,7 +3584,7 @@ void irdma_free_lsmm_rsrc(struct irdma_qp *iwqp) + /** + * irdma_accept - registered call for connection to be accepted + * @cm_id: cm information for passive connection +- * @conn_param: accpet parameters ++ * @conn_param: accept parameters + */ + int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) + { +-- +2.43.0 + diff --git a/queue-6.1/rdma-srpt-make-slab-cache-names-unique.patch b/queue-6.1/rdma-srpt-make-slab-cache-names-unique.patch new file mode 100644 index 00000000000..a885d1d95dd --- /dev/null +++ b/queue-6.1/rdma-srpt-make-slab-cache-names-unique.patch @@ -0,0 +1,195 @@ +From d59c21e495c9ba3d1042b0f20a72b8a309754c6e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Oct 2024 14:00:48 -0700 +Subject: RDMA/srpt: Make slab cache names unique + +From: Bart Van Assche + +[ Upstream commit 4d784c042d164f10fc809e2338457036cd7c653d ] + +Since commit 4c39529663b9 ("slab: Warn on duplicate cache names when +DEBUG_VM=y"), slab complains about duplicate cache names. Hence this +patch. The approach is as follows: +- Maintain an xarray with the slab size as index and a reference count + and a kmem_cache pointer as contents. Use srpt-${slab_size} as kmem + cache name. +- Use 512-byte alignment for all slabs instead of only for some of the + slabs. +- Increment the reference count instead of calling kmem_cache_create(). +- Decrement the reference count instead of calling kmem_cache_destroy(). + +Fixes: 5dabcd0456d7 ("RDMA/srpt: Add support for immediate data") +Link: https://patch.msgid.link/r/20241009210048.4122518-1-bvanassche@acm.org +Reported-by: Shinichiro Kawasaki +Closes: https://lore.kernel.org/linux-block/xpe6bea7rakpyoyfvspvin2dsozjmjtjktpph7rep3h25tv7fb@ooz4cu5z6bq6/ +Suggested-by: Jason Gunthorpe +Signed-off-by: Bart Van Assche +Tested-by: Shin'ichiro Kawasaki +Signed-off-by: Jason Gunthorpe +Signed-off-by: Sasha Levin +--- + drivers/infiniband/ulp/srpt/ib_srpt.c | 80 +++++++++++++++++++++++---- + 1 file changed, 68 insertions(+), 12 deletions(-) + +diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c +index fd6c260d5857d..33c099e5efc5e 100644 +--- a/drivers/infiniband/ulp/srpt/ib_srpt.c ++++ b/drivers/infiniband/ulp/srpt/ib_srpt.c +@@ -68,6 +68,8 @@ MODULE_LICENSE("Dual BSD/GPL"); + static u64 srpt_service_guid; + static DEFINE_SPINLOCK(srpt_dev_lock); /* Protects srpt_dev_list. */ + static LIST_HEAD(srpt_dev_list); /* List of srpt_device structures. */ ++static DEFINE_MUTEX(srpt_mc_mutex); /* Protects srpt_memory_caches. */ ++static DEFINE_XARRAY(srpt_memory_caches); /* See also srpt_memory_cache_entry */ + + static unsigned srp_max_req_size = DEFAULT_MAX_REQ_SIZE; + module_param(srp_max_req_size, int, 0444); +@@ -105,6 +107,63 @@ static void srpt_recv_done(struct ib_cq *cq, struct ib_wc *wc); + static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc); + static void srpt_process_wait_list(struct srpt_rdma_ch *ch); + ++/* Type of the entries in srpt_memory_caches. */ ++struct srpt_memory_cache_entry { ++ refcount_t ref; ++ struct kmem_cache *c; ++}; ++ ++static struct kmem_cache *srpt_cache_get(unsigned int object_size) ++{ ++ struct srpt_memory_cache_entry *e; ++ char name[32]; ++ void *res; ++ ++ guard(mutex)(&srpt_mc_mutex); ++ e = xa_load(&srpt_memory_caches, object_size); ++ if (e) { ++ refcount_inc(&e->ref); ++ return e->c; ++ } ++ snprintf(name, sizeof(name), "srpt-%u", object_size); ++ e = kmalloc(sizeof(*e), GFP_KERNEL); ++ if (!e) ++ return NULL; ++ refcount_set(&e->ref, 1); ++ e->c = kmem_cache_create(name, object_size, /*align=*/512, 0, NULL); ++ if (!e->c) ++ goto free_entry; ++ res = xa_store(&srpt_memory_caches, object_size, e, GFP_KERNEL); ++ if (xa_is_err(res)) ++ goto destroy_cache; ++ return e->c; ++ ++destroy_cache: ++ kmem_cache_destroy(e->c); ++ ++free_entry: ++ kfree(e); ++ return NULL; ++} ++ ++static void srpt_cache_put(struct kmem_cache *c) ++{ ++ struct srpt_memory_cache_entry *e = NULL; ++ unsigned long object_size; ++ ++ guard(mutex)(&srpt_mc_mutex); ++ xa_for_each(&srpt_memory_caches, object_size, e) ++ if (e->c == c) ++ break; ++ if (WARN_ON_ONCE(!e)) ++ return; ++ if (!refcount_dec_and_test(&e->ref)) ++ return; ++ WARN_ON_ONCE(xa_erase(&srpt_memory_caches, object_size) != e); ++ kmem_cache_destroy(e->c); ++ kfree(e); ++} ++ + /* + * The only allowed channel state changes are those that change the channel + * state into a state with a higher numerical value. Hence the new > prev test. +@@ -2119,13 +2178,13 @@ static void srpt_release_channel_work(struct work_struct *w) + ch->sport->sdev, ch->rq_size, + ch->rsp_buf_cache, DMA_TO_DEVICE); + +- kmem_cache_destroy(ch->rsp_buf_cache); ++ srpt_cache_put(ch->rsp_buf_cache); + + srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_recv_ring, + sdev, ch->rq_size, + ch->req_buf_cache, DMA_FROM_DEVICE); + +- kmem_cache_destroy(ch->req_buf_cache); ++ srpt_cache_put(ch->req_buf_cache); + + kref_put(&ch->kref, srpt_free_ch); + } +@@ -2245,8 +2304,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, + INIT_LIST_HEAD(&ch->cmd_wait_list); + ch->max_rsp_size = ch->sport->port_attrib.srp_max_rsp_size; + +- ch->rsp_buf_cache = kmem_cache_create("srpt-rsp-buf", ch->max_rsp_size, +- 512, 0, NULL); ++ ch->rsp_buf_cache = srpt_cache_get(ch->max_rsp_size); + if (!ch->rsp_buf_cache) + goto free_ch; + +@@ -2280,8 +2338,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, + alignment_offset = round_up(imm_data_offset, 512) - + imm_data_offset; + req_sz = alignment_offset + imm_data_offset + srp_max_req_size; +- ch->req_buf_cache = kmem_cache_create("srpt-req-buf", req_sz, +- 512, 0, NULL); ++ ch->req_buf_cache = srpt_cache_get(req_sz); + if (!ch->req_buf_cache) + goto free_rsp_ring; + +@@ -2478,7 +2535,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, + ch->req_buf_cache, DMA_FROM_DEVICE); + + free_recv_cache: +- kmem_cache_destroy(ch->req_buf_cache); ++ srpt_cache_put(ch->req_buf_cache); + + free_rsp_ring: + srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring, +@@ -2486,7 +2543,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, + ch->rsp_buf_cache, DMA_TO_DEVICE); + + free_rsp_cache: +- kmem_cache_destroy(ch->rsp_buf_cache); ++ srpt_cache_put(ch->rsp_buf_cache); + + free_ch: + if (rdma_cm_id) +@@ -3055,7 +3112,7 @@ static void srpt_free_srq(struct srpt_device *sdev) + srpt_free_ioctx_ring((struct srpt_ioctx **)sdev->ioctx_ring, sdev, + sdev->srq_size, sdev->req_buf_cache, + DMA_FROM_DEVICE); +- kmem_cache_destroy(sdev->req_buf_cache); ++ srpt_cache_put(sdev->req_buf_cache); + sdev->srq = NULL; + } + +@@ -3082,8 +3139,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev) + pr_debug("create SRQ #wr= %d max_allow=%d dev= %s\n", sdev->srq_size, + sdev->device->attrs.max_srq_wr, dev_name(&device->dev)); + +- sdev->req_buf_cache = kmem_cache_create("srpt-srq-req-buf", +- srp_max_req_size, 0, 0, NULL); ++ sdev->req_buf_cache = srpt_cache_get(srp_max_req_size); + if (!sdev->req_buf_cache) + goto free_srq; + +@@ -3105,7 +3161,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev) + return 0; + + free_cache: +- kmem_cache_destroy(sdev->req_buf_cache); ++ srpt_cache_put(sdev->req_buf_cache); + + free_srq: + ib_destroy_srq(srq); +-- +2.43.0 + diff --git a/queue-6.1/riscv-bpf-make-bpf_cmpxchg-fully-ordered.patch b/queue-6.1/riscv-bpf-make-bpf_cmpxchg-fully-ordered.patch new file mode 100644 index 00000000000..d00d3871db1 --- /dev/null +++ b/queue-6.1/riscv-bpf-make-bpf_cmpxchg-fully-ordered.patch @@ -0,0 +1,89 @@ +From 178ae7450ed46a32e5a8e1d5ae94e51551c5f8b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Oct 2024 17:36:28 +0300 +Subject: riscv, bpf: Make BPF_CMPXCHG fully ordered +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Andrea Parri + +[ Upstream commit e59db0623f6955986d1be0880b351a1f56e7fd6d ] + +According to the prototype formal BPF memory consistency model +discussed e.g. in [1] and following the ordering properties of +the C/in-kernel macro atomic_cmpxchg(), a BPF atomic operation +with the BPF_CMPXCHG modifier is fully ordered. However, the +current RISC-V JIT lowerings fail to meet such memory ordering +property. This is illustrated by the following litmus test: + +BPF BPF__MP+success_cmpxchg+fence +{ + 0:r1=x; 0:r3=y; 0:r5=1; + 1:r2=y; 1:r4=f; 1:r7=x; +} + P0 | P1 ; + *(u64 *)(r1 + 0) = 1 | r1 = *(u64 *)(r2 + 0) ; + r2 = cmpxchg_64 (r3 + 0, r4, r5) | r3 = atomic_fetch_add((u64 *)(r4 + 0), r5) ; + | r6 = *(u64 *)(r7 + 0) ; +exists (1:r1=1 /\ 1:r6=0) + +whose "exists" clause is not satisfiable according to the BPF +memory model. Using the current RISC-V JIT lowerings, the test +can be mapped to the following RISC-V litmus test: + +RISCV RISCV__MP+success_cmpxchg+fence +{ + 0:x1=x; 0:x3=y; 0:x5=1; + 1:x2=y; 1:x4=f; 1:x7=x; +} + P0 | P1 ; + sd x5, 0(x1) | ld x1, 0(x2) ; + L00: | amoadd.d.aqrl x3, x5, 0(x4) ; + lr.d x2, 0(x3) | ld x6, 0(x7) ; + bne x2, x4, L01 | ; + sc.d x6, x5, 0(x3) | ; + bne x6, x4, L00 | ; + fence rw, rw | ; + L01: | ; +exists (1:x1=1 /\ 1:x6=0) + +where the two stores in P0 can be reordered. Update the RISC-V +JIT lowerings/implementation of BPF_CMPXCHG to emit an SC with +RELEASE ("rl") annotation in order to meet the expected memory +ordering guarantees. The resulting RISC-V JIT lowerings of +BPF_CMPXCHG match the RISC-V lowerings of the C atomic_cmpxchg(). + +Other lowerings were fixed via 20a759df3bba ("riscv, bpf: make +some atomic operations fully ordered"). + +Fixes: dd642ccb45ec ("riscv, bpf: Implement more atomic operations for RV64") +Signed-off-by: Andrea Parri +Signed-off-by: Daniel Borkmann +Reviewed-by: Puranjay Mohan +Acked-by: Björn Töpel +Link: https://lpc.events/event/18/contributions/1949/attachments/1665/3441/bpfmemmodel.2024.09.19p.pdf [1] +Link: https://lore.kernel.org/bpf/20241017143628.2673894-1-parri.andrea@gmail.com +Signed-off-by: Sasha Levin +--- + arch/riscv/net/bpf_jit_comp64.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c +index 4c4ac563326b5..66ee5f00ec54a 100644 +--- a/arch/riscv/net/bpf_jit_comp64.c ++++ b/arch/riscv/net/bpf_jit_comp64.c +@@ -542,8 +542,8 @@ static void emit_atomic(u8 rd, u8 rs, s16 off, s32 imm, bool is64, + rv_lr_w(r0, 0, rd, 0, 0), ctx); + jmp_offset = ninsns_rvoff(8); + emit(rv_bne(RV_REG_T2, r0, jmp_offset >> 1), ctx); +- emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 0) : +- rv_sc_w(RV_REG_T3, rs, rd, 0, 0), ctx); ++ emit(is64 ? rv_sc_d(RV_REG_T3, rs, rd, 0, 1) : ++ rv_sc_w(RV_REG_T3, rs, rd, 0, 1), ctx); + jmp_offset = ninsns_rvoff(-6); + emit(rv_bne(RV_REG_T3, 0, jmp_offset >> 1), ctx); + emit(rv_fence(0x3, 0x3), ctx); +-- +2.43.0 + diff --git a/queue-6.1/s390-initialize-psw-mask-in-perf_arch_fetch_caller_r.patch b/queue-6.1/s390-initialize-psw-mask-in-perf_arch_fetch_caller_r.patch new file mode 100644 index 00000000000..c6c62c81fd2 --- /dev/null +++ b/queue-6.1/s390-initialize-psw-mask-in-perf_arch_fetch_caller_r.patch @@ -0,0 +1,38 @@ +From 373d1b6c9e3e8f5a7a63615d1c4939f0302b7bfd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Oct 2024 17:52:39 +0200 +Subject: s390: Initialize psw mask in perf_arch_fetch_caller_regs() + +From: Heiko Carstens + +[ Upstream commit 223e7fb979fa06934f1595b6ad0ae1d4ead1147f ] + +Also initialize regs->psw.mask in perf_arch_fetch_caller_regs(). +This way user_mode(regs) will return false, like it should. + +It looks like all current users initialize regs to zero, so that this +doesn't fix a bug currently. However it is better to not rely on callers +to do this. + +Fixes: 914d52e46490 ("s390: implement perf_arch_fetch_caller_regs") +Signed-off-by: Heiko Carstens +Signed-off-by: Sasha Levin +--- + arch/s390/include/asm/perf_event.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h +index b9da71632827f..ea340b9018398 100644 +--- a/arch/s390/include/asm/perf_event.h ++++ b/arch/s390/include/asm/perf_event.h +@@ -75,6 +75,7 @@ struct perf_sf_sde_regs { + #define SAMPLE_FREQ_MODE(hwc) (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE) + + #define perf_arch_fetch_caller_regs(regs, __ip) do { \ ++ (regs)->psw.mask = 0; \ + (regs)->psw.addr = (__ip); \ + (regs)->gprs[15] = (unsigned long)__builtin_frame_address(0) - \ + offsetof(struct stack_frame, back_chain); \ +-- +2.43.0 + diff --git a/queue-6.1/s390-pci-handle-pci-error-codes-other-than-0x3a.patch b/queue-6.1/s390-pci-handle-pci-error-codes-other-than-0x3a.patch new file mode 100644 index 00000000000..89345c3fbdc --- /dev/null +++ b/queue-6.1/s390-pci-handle-pci-error-codes-other-than-0x3a.patch @@ -0,0 +1,65 @@ +From ac4d0b9c1c8647af984c2616cf39615159eead91 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 11 Apr 2024 14:01:39 +0200 +Subject: s390/pci: Handle PCI error codes other than 0x3a + +From: Niklas Schnelle + +[ Upstream commit 3cd03ea57e8e16cc78cc357d5e9f26078426f236 ] + +The Linux implementation of PCI error recovery for s390 was based on the +understanding that firmware error recovery is a two step process with an +optional initial error event to indicate the cause of the error if known +followed by either error event 0x3A (Success) or 0x3B (Failure) to +indicate whether firmware was able to recover. While this has been the +case in testing and the error cases seen in the wild it turns out this +is not correct. Instead firmware only generates 0x3A for some error and +service scenarios and expects the OS to perform recovery for all PCI +events codes except for those indicating permanent error (0x3B, 0x40) +and those indicating errors on the function measurement block (0x2A, +0x2B, 0x2C). Align Linux behavior with these expectations. + +Fixes: 4cdf2f4e24ff ("s390/pci: implement minimal PCI error recovery") +Reviewed-by: Gerd Bayer +Signed-off-by: Niklas Schnelle +Signed-off-by: Heiko Carstens +Signed-off-by: Sasha Levin +--- + arch/s390/pci/pci_event.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c +index b9324ca2eb940..b3961f1016ea0 100644 +--- a/arch/s390/pci/pci_event.c ++++ b/arch/s390/pci/pci_event.c +@@ -272,18 +272,19 @@ static void __zpci_event_error(struct zpci_ccdf_err *ccdf) + goto no_pdev; + + switch (ccdf->pec) { +- case 0x003a: /* Service Action or Error Recovery Successful */ ++ case 0x002a: /* Error event concerns FMB */ ++ case 0x002b: ++ case 0x002c: ++ break; ++ case 0x0040: /* Service Action or Error Recovery Failed */ ++ case 0x003b: ++ zpci_event_io_failure(pdev, pci_channel_io_perm_failure); ++ break; ++ default: /* PCI function left in the error state attempt to recover */ + ers_res = zpci_event_attempt_error_recovery(pdev); + if (ers_res != PCI_ERS_RESULT_RECOVERED) + zpci_event_io_failure(pdev, pci_channel_io_perm_failure); + break; +- default: +- /* +- * Mark as frozen not permanently failed because the device +- * could be subsequently recovered by the platform. +- */ +- zpci_event_io_failure(pdev, pci_channel_io_frozen); +- break; + } + pci_dev_put(pdev); + no_pdev: +-- +2.43.0 + diff --git a/queue-6.1/scsi-target-core-fix-null-ptr-deref-in-target_alloc_.patch b/queue-6.1/scsi-target-core-fix-null-ptr-deref-in-target_alloc_.patch new file mode 100644 index 00000000000..0c010a663ea --- /dev/null +++ b/queue-6.1/scsi-target-core-fix-null-ptr-deref-in-target_alloc_.patch @@ -0,0 +1,54 @@ +From 1b4be9460f3b5c4d0dcc871315fc87b5cfb5833c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 19:34:44 +0800 +Subject: scsi: target: core: Fix null-ptr-deref in target_alloc_device() + +From: Wang Hai + +[ Upstream commit fca6caeb4a61d240f031914413fcc69534f6dc03 ] + +There is a null-ptr-deref issue reported by KASAN: + +BUG: KASAN: null-ptr-deref in target_alloc_device+0xbc4/0xbe0 [target_core_mod] +... + kasan_report+0xb9/0xf0 + target_alloc_device+0xbc4/0xbe0 [target_core_mod] + core_dev_setup_virtual_lun0+0xef/0x1f0 [target_core_mod] + target_core_init_configfs+0x205/0x420 [target_core_mod] + do_one_initcall+0xdd/0x4e0 +... + entry_SYSCALL_64_after_hwframe+0x76/0x7e + +In target_alloc_device(), if allocing memory for dev queues fails, then +dev will be freed by dev->transport->free_device(), but dev->transport +is not initialized at that time, which will lead to a null pointer +reference problem. + +Fixing this bug by freeing dev with hba->backend->ops->free_device(). + +Fixes: 1526d9f10c61 ("scsi: target: Make state_list per CPU") +Signed-off-by: Wang Hai +Link: https://lore.kernel.org/r/20241011113444.40749-1-wanghai38@huawei.com +Reviewed-by: Mike Christie +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/target/target_core_device.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c +index 13558cbd9b82e..7be48bfbd42e4 100644 +--- a/drivers/target/target_core_device.c ++++ b/drivers/target/target_core_device.c +@@ -733,7 +733,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) + + dev->queues = kcalloc(nr_cpu_ids, sizeof(*dev->queues), GFP_KERNEL); + if (!dev->queues) { +- dev->transport->free_device(dev); ++ hba->backend->ops->free_device(dev); + return NULL; + } + +-- +2.43.0 + diff --git a/queue-6.1/selftests-bpf-fix-cross-compiling-urandom_read.patch b/queue-6.1/selftests-bpf-fix-cross-compiling-urandom_read.patch new file mode 100644 index 00000000000..2d3c594397e --- /dev/null +++ b/queue-6.1/selftests-bpf-fix-cross-compiling-urandom_read.patch @@ -0,0 +1,41 @@ +From 43c4669825511a3a3b1397ca0d4ae79f3f789759 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Oct 2024 21:07:20 -0700 +Subject: selftests/bpf: Fix cross-compiling urandom_read + +From: Tony Ambardar + +[ Upstream commit fd526e121c4d6f71aed82d21a8b8277b03e60b43 ] + +Linking of urandom_read and liburandom_read.so prefers LLVM's 'ld.lld' but +falls back to using 'ld' if unsupported. However, this fallback discards +any existing makefile macro for LD and can break cross-compilation. + +Fix by changing the fallback to use the target linker $(LD), passed via +'-fuse-ld=' using an absolute path rather than a linker "flavour". + +Fixes: 08c79c9cd67f ("selftests/bpf: Don't force lld on non-x86 architectures") +Signed-off-by: Tony Ambardar +Signed-off-by: Andrii Nakryiko +Link: https://lore.kernel.org/bpf/20241009040720.635260-1-tony.ambardar@gmail.com +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/bpf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile +index 3b57fbf8fff4a..b09205d925114 100644 +--- a/tools/testing/selftests/bpf/Makefile ++++ b/tools/testing/selftests/bpf/Makefile +@@ -171,7 +171,7 @@ $(OUTPUT)/%:%.c + ifeq ($(SRCARCH),x86) + LLD := lld + else +-LLD := ld ++LLD := $(shell command -v $(LD)) + endif + + # Filter out -static for liburandom_read.so and its dependent targets so that static builds +-- +2.43.0 + diff --git a/queue-6.1/serial-imx-update-mctrl-old_status-on-rtsd-interrupt.patch b/queue-6.1/serial-imx-update-mctrl-old_status-on-rtsd-interrupt.patch new file mode 100644 index 00000000000..8c88b7aeb1e --- /dev/null +++ b/queue-6.1/serial-imx-update-mctrl-old_status-on-rtsd-interrupt.patch @@ -0,0 +1,89 @@ +From cb4dc88e25f6a2cb2daccea6a792d87dab828482 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 2 Oct 2024 20:40:38 +0200 +Subject: serial: imx: Update mctrl old_status on RTSD interrupt + +From: Marek Vasut + +[ Upstream commit 40d7903386df4d18f04d90510ba90eedee260085 ] + +When sending data using DMA at high baudrate (4 Mbdps in local test case) to +a device with small RX buffer which keeps asserting RTS after every received +byte, it is possible that the iMX UART driver would not recognize the falling +edge of RTS input signal and get stuck, unable to transmit any more data. + +This condition happens when the following sequence of events occur: +- imx_uart_mctrl_check() is called at some point and takes a snapshot of UART + control signal status into sport->old_status using imx_uart_get_hwmctrl(). + The RTSS/TIOCM_CTS bit is of interest here (*). +- DMA transfer occurs, the remote device asserts RTS signal after each byte. + The i.MX UART driver recognizes each such RTS signal change, raises an + interrupt with USR1 register RTSD bit set, which leads to invocation of + __imx_uart_rtsint(), which calls uart_handle_cts_change(). + - If the RTS signal is deasserted, uart_handle_cts_change() clears + port->hw_stopped and unblocks the port for further data transfers. + - If the RTS is asserted, uart_handle_cts_change() sets port->hw_stopped + and blocks the port for further data transfers. This may occur as the + last interrupt of a transfer, which means port->hw_stopped remains set + and the port remains blocked (**). +- Any further data transfer attempts will trigger imx_uart_mctrl_check(), + which will read current status of UART control signals by calling + imx_uart_get_hwmctrl() (***) and compare it with sport->old_status . + - If current status differs from sport->old_status for RTS signal, + uart_handle_cts_change() is called and possibly unblocks the port + by clearing port->hw_stopped . + - If current status does not differ from sport->old_status for RTS + signal, no action occurs. This may occur in case prior snapshot (*) + was taken before any transfer so the RTS is deasserted, current + snapshot (***) was taken after a transfer and therefore RTS is + deasserted again, which means current status and sport->old_status + are identical. In case (**) triggered when RTS got asserted, and + made port->hw_stopped set, the port->hw_stopped will remain set + because no change on RTS line is recognized by this driver and + uart_handle_cts_change() is not called from here to unblock the + port->hw_stopped. + +Update sport->old_status in __imx_uart_rtsint() accordingly to make +imx_uart_mctrl_check() detect such RTS change. Note that TIOCM_CAR +and TIOCM_RI bits in sport->old_status do not suffer from this problem. + +Fixes: ceca629e0b48 ("[ARM] 2971/1: i.MX uart handle rts irq") +Cc: stable +Reviewed-by: Esben Haabendal +Signed-off-by: Marek Vasut +Link: https://lore.kernel.org/r/20241002184133.19427-1-marex@denx.de +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/imx.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c +index bba54ad0d434d..94e0781e00e80 100644 +--- a/drivers/tty/serial/imx.c ++++ b/drivers/tty/serial/imx.c +@@ -801,6 +801,21 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id) + + imx_uart_writel(sport, USR1_RTSD, USR1); + usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS; ++ /* ++ * Update sport->old_status here, so any follow-up calls to ++ * imx_uart_mctrl_check() will be able to recognize that RTS ++ * state changed since last imx_uart_mctrl_check() call. ++ * ++ * In case RTS has been detected as asserted here and later on ++ * deasserted by the time imx_uart_mctrl_check() was called, ++ * imx_uart_mctrl_check() can detect the RTS state change and ++ * trigger uart_handle_cts_change() to unblock the port for ++ * further TX transfers. ++ */ ++ if (usr1 & USR1_RTSS) ++ sport->old_status |= TIOCM_CTS; ++ else ++ sport->old_status &= ~TIOCM_CTS; + uart_handle_cts_change(&sport->port, usr1); + wake_up_interruptible(&sport->port.state->port.delta_msr_wait); + +-- +2.43.0 + diff --git a/queue-6.1/serial-make-uart_handle_cts_change-status-param-bool.patch b/queue-6.1/serial-make-uart_handle_cts_change-status-param-bool.patch new file mode 100644 index 00000000000..0facb44142d --- /dev/null +++ b/queue-6.1/serial-make-uart_handle_cts_change-status-param-bool.patch @@ -0,0 +1,126 @@ +From ad9704eb5afa22e3a8518960aaa7e7503ded4547 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jan 2023 11:03:55 +0200 +Subject: serial: Make uart_handle_cts_change() status param bool active +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit 968d64578ec92968e8c79d766eb966efd1f68d7e ] + +Convert uart_handle_cts_change() to bool which is more appropriate +than unsigned int. + +Rename status to active to better describe what the parameter means. +While at it, make the comment about the active parameter easier to +parse. + +Cleanup callsites from operations that are not necessary with bool. + +Reviewed-by: Jiri Slaby +Signed-off-by: Ilpo Järvinen +Link: https://lore.kernel.org/r/20230117090358.4796-10-ilpo.jarvinen@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 40d7903386df ("serial: imx: Update mctrl old_status on RTSD interrupt") +Signed-off-by: Sasha Levin +--- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 3 +-- + drivers/tty/serial/serial_core.c | 8 ++++---- + include/linux/serial_core.h | 3 +-- + 5 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c +index 5acbab0512b82..bba54ad0d434d 100644 +--- a/drivers/tty/serial/imx.c ++++ b/drivers/tty/serial/imx.c +@@ -801,7 +801,7 @@ static irqreturn_t __imx_uart_rtsint(int irq, void *dev_id) + + imx_uart_writel(sport, USR1_RTSD, USR1); + usr1 = imx_uart_readl(sport, USR1) & USR1_RTSS; +- uart_handle_cts_change(&sport->port, !!usr1); ++ uart_handle_cts_change(&sport->port, usr1); + wake_up_interruptible(&sport->port.state->port.delta_msr_wait); + + return IRQ_HANDLED; +diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c +index 5d8660fed081e..67803242a70c2 100644 +--- a/drivers/tty/serial/max3100.c ++++ b/drivers/tty/serial/max3100.c +@@ -250,7 +250,7 @@ static int max3100_handlerx_unlocked(struct max3100_port *s, u16 rx) + cts = (rx & MAX3100_CTS) > 0; + if (s->cts != cts) { + s->cts = cts; +- uart_handle_cts_change(&s->port, cts ? TIOCM_CTS : 0); ++ uart_handle_cts_change(&s->port, cts); + } + + return ret; +diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c +index d409ef3887212..4eb8d372f619f 100644 +--- a/drivers/tty/serial/max310x.c ++++ b/drivers/tty/serial/max310x.c +@@ -843,8 +843,7 @@ static irqreturn_t max310x_port_irq(struct max310x_port *s, int portno) + + if (ists & MAX310X_IRQ_CTS_BIT) { + lsr = max310x_port_read(port, MAX310X_LSR_IRQSTS_REG); +- uart_handle_cts_change(port, +- !!(lsr & MAX310X_LSR_CTS_BIT)); ++ uart_handle_cts_change(port, lsr & MAX310X_LSR_CTS_BIT); + } + if (rxlen) + max310x_handle_rx(port, rxlen); +diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c +index e6994f40974ed..c91e3195dc207 100644 +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -3325,11 +3325,11 @@ EXPORT_SYMBOL_GPL(uart_handle_dcd_change); + /** + * uart_handle_cts_change - handle a change of clear-to-send state + * @uport: uart_port structure for the open port +- * @status: new clear to send status, nonzero if active ++ * @active: new clear-to-send status + * + * Caller must hold uport->lock. + */ +-void uart_handle_cts_change(struct uart_port *uport, unsigned int status) ++void uart_handle_cts_change(struct uart_port *uport, bool active) + { + lockdep_assert_held_once(&uport->lock); + +@@ -3337,13 +3337,13 @@ void uart_handle_cts_change(struct uart_port *uport, unsigned int status) + + if (uart_softcts_mode(uport)) { + if (uport->hw_stopped) { +- if (status) { ++ if (active) { + uport->hw_stopped = 0; + uport->ops->start_tx(uport); + uart_write_wakeup(uport); + } + } else { +- if (!status) { ++ if (!active) { + uport->hw_stopped = 1; + uport->ops->stop_tx(uport); + } +diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h +index 9b6d91430d3b3..5a83db0ac7639 100644 +--- a/include/linux/serial_core.h ++++ b/include/linux/serial_core.h +@@ -891,8 +891,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport) + */ + + extern void uart_handle_dcd_change(struct uart_port *uport, bool active); +-extern void uart_handle_cts_change(struct uart_port *uport, +- unsigned int status); ++extern void uart_handle_cts_change(struct uart_port *uport, bool active); + + extern void uart_insert_char(struct uart_port *port, unsigned int status, + unsigned int overrun, unsigned int ch, unsigned int flag); +-- +2.43.0 + diff --git a/queue-6.1/series b/queue-6.1/series index e69de29bb2d..55439245db6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -0,0 +1,70 @@ +bpf-use-raw_spinlock_t-in-ringbuf.patch +iio-accel-bma400-fix-uninitialized-variable-field_va.patch +bpf-make-sure-internal-and-uapi-bpf_redirect-flags-d.patch +bpf-devmap-provide-rxq-after-redirect.patch +bpf-fix-memory-leak-in-bpf_core_apply.patch +rdma-bnxt_re-fix-incorrect-avid-type-in-wqe-structur.patch +rdma-bnxt_re-add-a-check-for-memory-allocation.patch +x86-resctrl-avoid-overflow-in-mb-settings-in-bw_vali.patch +arm-dts-bcm2837-rpi-cm3-io3-fix-hdmi-hpd-gpio-pin.patch +s390-pci-handle-pci-error-codes-other-than-0x3a.patch +bpf-fix-kfunc-btf-caching-for-modules.patch +iio-frequency-admv4420-adrf6780-format-kconfig-entri.patch +iio-frequency-admv4420-fix-missing-select-remap_spi-.patch +drm-vmwgfx-handle-possible-enomem-in-vmw_stdu_connec.patch +selftests-bpf-fix-cross-compiling-urandom_read.patch +alsa-hda-cs8409-fix-possible-null-dereference.patch +rdma-cxgb4-fix-rdma_cm_event_unreachable-error-for-i.patch +rdma-irdma-fix-misspelling-of-accept.patch +rdma-srpt-make-slab-cache-names-unique.patch +ipv4-give-an-ipv4-dev-to-blackhole_netdev.patch +rdma-bnxt_re-return-more-meaningful-error.patch +rdma-bnxt_re-fix-a-bug-while-setting-up-level-2-pbl-.patch +drm-msm-dpu-make-sure-phys-resources-are-properly-in.patch +drm-msm-dsi-fix-32-bit-signed-integer-extension-in-p.patch +drm-msm-avoid-null-dereference-in-msm_disp_state_pri.patch +drm-msm-allocate-memory-for-disp-snapshot-with-kvzal.patch +net-usb-usbnet-fix-race-in-probe-failure.patch +octeontx2-af-fix-potential-integer-overflows-on-inte.patch +drm-amd-amdgpu-fix-double-unlock-in-amdgpu_mes_add_r.patch +macsec-don-t-increment-counters-for-an-unrelated-sa.patch +netdevsim-use-cond_resched-in-nsim_dev_trap_report_w.patch +net-ethernet-aeroflex-fix-potential-memory-leak-in-g.patch +net-smc-fix-searching-in-list-of-known-pnetids-in-sm.patch +net-xilinx-axienet-fix-potential-memory-leak-in-axie.patch +net-systemport-fix-potential-memory-leak-in-bcm_sysp.patch +irqchip-renesas-rzg2l-align-struct-member-names-to-t.patch +irqchip-renesas-rzg2l-document-structure-members.patch +irqchip-renesas-rzg2l-add-support-for-suspend-to-ram.patch +irqchip-renesas-rzg2l-fix-missing-put_device.patch +drm-msm-dpu-wire-up-dsc-mask-for-active-ctl-configur.patch +drm-msm-dpu-don-t-always-program-merge_3d-block.patch +tcp-dccp-don-t-use-timer_pending-in-reqsk_queue_unli.patch +genetlink-hold-rcu-in-genlmsg_mcast.patch +ravb-remove-setting-of-rx-software-timestamp.patch +net-ravb-only-advertise-rx-tx-timestamps-if-hardware.patch +scsi-target-core-fix-null-ptr-deref-in-target_alloc_.patch +smb-client-fix-oobs-when-building-smb2_ioctl-request.patch +usb-typec-altmode-should-keep-reference-to-parent.patch +s390-initialize-psw-mask-in-perf_arch_fetch_caller_r.patch +bluetooth-bnep-fix-wild-memory-access-in-proto_unreg.patch +net-mlx5-remove-redundant-cmdif-revision-check.patch +net-mlx5-split-mlx5_cmd_init-to-probe-and-reload-rou.patch +net-mlx5-fix-command-bitmask-initialization.patch +net-mlx5-unregister-notifier-on-eswitch-init-failure.patch +riscv-bpf-make-bpf_cmpxchg-fully-ordered.patch +bpf-fix-iter-task-tid-filtering.patch +arm64-uprobe-fix-the-uprobe-swbp_insn-in-big-endian.patch +arm64-probes-fix-uprobes-for-big-endian-kernels.patch +xhci-dbgtty-remove-kfifo_out-wrapper.patch +xhci-dbgtty-use-kfifo-from-tty_port-struct.patch +xhci-dbc-honor-usb-transfer-size-boundaries.patch +usb-gadget-f_uac2-replace-snprintf-with-the-safer-sc.patch +usb-gadget-f_uac2-fix-non-newline-terminated-functio.patch +usb-gadget-f_uac2-fix-return-value-for-uac2_attribut.patch +usb-gadget-add-function-wakeup-support.patch +xhci-separate-port-and-caps-macros-into-dedicated-fi.patch +usb-dwc3-core-fix-system-suspend-on-ti-am62-platform.patch +tty-serial-make-dcd_change-uart_handle_dcd_change-st.patch +serial-make-uart_handle_cts_change-status-param-bool.patch +serial-imx-update-mctrl-old_status-on-rtsd-interrupt.patch diff --git a/queue-6.1/smb-client-fix-oobs-when-building-smb2_ioctl-request.patch b/queue-6.1/smb-client-fix-oobs-when-building-smb2_ioctl-request.patch new file mode 100644 index 00000000000..317591476bf --- /dev/null +++ b/queue-6.1/smb-client-fix-oobs-when-building-smb2_ioctl-request.patch @@ -0,0 +1,107 @@ +From fe4ba953aa5ba7c2dbdabe5f67d60e60beb16a22 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Oct 2024 19:04:04 -0300 +Subject: smb: client: fix OOBs when building SMB2_IOCTL request + +From: Paulo Alcantara + +[ Upstream commit 1ab60323c5201bef25f2a3dc0ccc404d9aca77f1 ] + +When using encryption, either enforced by the server or when using +'seal' mount option, the client will squash all compound request buffers +down for encryption into a single iov in smb2_set_next_command(). + +SMB2_ioctl_init() allocates a small buffer (448 bytes) to hold the +SMB2_IOCTL request in the first iov, and if the user passes an input +buffer that is greater than 328 bytes, smb2_set_next_command() will +end up writing off the end of @rqst->iov[0].iov_base as shown below: + + mount.cifs //srv/share /mnt -o ...,seal + ln -s $(perl -e "print('a')for 1..1024") /mnt/link + + BUG: KASAN: slab-out-of-bounds in + smb2_set_next_command.cold+0x1d6/0x24c [cifs] + Write of size 4116 at addr ffff8881148fcab8 by task ln/859 + + CPU: 1 UID: 0 PID: 859 Comm: ln Not tainted 6.12.0-rc3 #1 + Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS + 1.16.3-2.fc40 04/01/2014 + Call Trace: + + dump_stack_lvl+0x5d/0x80 + ? smb2_set_next_command.cold+0x1d6/0x24c [cifs] + print_report+0x156/0x4d9 + ? smb2_set_next_command.cold+0x1d6/0x24c [cifs] + ? __virt_addr_valid+0x145/0x310 + ? __phys_addr+0x46/0x90 + ? smb2_set_next_command.cold+0x1d6/0x24c [cifs] + kasan_report+0xda/0x110 + ? smb2_set_next_command.cold+0x1d6/0x24c [cifs] + kasan_check_range+0x10f/0x1f0 + __asan_memcpy+0x3c/0x60 + smb2_set_next_command.cold+0x1d6/0x24c [cifs] + smb2_compound_op+0x238c/0x3840 [cifs] + ? kasan_save_track+0x14/0x30 + ? kasan_save_free_info+0x3b/0x70 + ? vfs_symlink+0x1a1/0x2c0 + ? do_symlinkat+0x108/0x1c0 + ? __pfx_smb2_compound_op+0x10/0x10 [cifs] + ? kmem_cache_free+0x118/0x3e0 + ? cifs_get_writable_path+0xeb/0x1a0 [cifs] + smb2_get_reparse_inode+0x423/0x540 [cifs] + ? __pfx_smb2_get_reparse_inode+0x10/0x10 [cifs] + ? rcu_is_watching+0x20/0x50 + ? __kmalloc_noprof+0x37c/0x480 + ? smb2_create_reparse_symlink+0x257/0x490 [cifs] + ? smb2_create_reparse_symlink+0x38f/0x490 [cifs] + smb2_create_reparse_symlink+0x38f/0x490 [cifs] + ? __pfx_smb2_create_reparse_symlink+0x10/0x10 [cifs] + ? find_held_lock+0x8a/0xa0 + ? hlock_class+0x32/0xb0 + ? __build_path_from_dentry_optional_prefix+0x19d/0x2e0 [cifs] + cifs_symlink+0x24f/0x960 [cifs] + ? __pfx_make_vfsuid+0x10/0x10 + ? __pfx_cifs_symlink+0x10/0x10 [cifs] + ? make_vfsgid+0x6b/0xc0 + ? generic_permission+0x96/0x2d0 + vfs_symlink+0x1a1/0x2c0 + do_symlinkat+0x108/0x1c0 + ? __pfx_do_symlinkat+0x10/0x10 + ? strncpy_from_user+0xaa/0x160 + __x64_sys_symlinkat+0xb9/0xf0 + do_syscall_64+0xbb/0x1d0 + entry_SYSCALL_64_after_hwframe+0x77/0x7f + RIP: 0033:0x7f08d75c13bb + +Reported-by: David Howells +Fixes: e77fe73c7e38 ("cifs: we can not use small padding iovs together with encryption") +Signed-off-by: Paulo Alcantara (Red Hat) +Signed-off-by: Steve French +Signed-off-by: Sasha Levin +--- + fs/smb/client/smb2pdu.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c +index 992ac7d20e5eb..9975711236b26 100644 +--- a/fs/smb/client/smb2pdu.c ++++ b/fs/smb/client/smb2pdu.c +@@ -3131,6 +3131,15 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct TCP_Server_Info *server, + return rc; + + if (indatalen) { ++ unsigned int len; ++ ++ if (WARN_ON_ONCE(smb3_encryption_required(tcon) && ++ (check_add_overflow(total_len - 1, ++ ALIGN(indatalen, 8), &len) || ++ len > MAX_CIFS_SMALL_BUFFER_SIZE))) { ++ cifs_small_buf_release(req); ++ return -EIO; ++ } + /* + * indatalen is usually small at a couple of bytes max, so + * just allocate through generic pool +-- +2.43.0 + diff --git a/queue-6.1/tcp-dccp-don-t-use-timer_pending-in-reqsk_queue_unli.patch b/queue-6.1/tcp-dccp-don-t-use-timer_pending-in-reqsk_queue_unli.patch new file mode 100644 index 00000000000..508b70a1852 --- /dev/null +++ b/queue-6.1/tcp-dccp-don-t-use-timer_pending-in-reqsk_queue_unli.patch @@ -0,0 +1,180 @@ +From b48dd513f88923f2555866d77f08997eaf291618 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2024 15:33:12 -0700 +Subject: tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). + +From: Kuniyuki Iwashima + +[ Upstream commit e8c526f2bdf1845bedaf6a478816a3d06fa78b8f ] + +Martin KaFai Lau reported use-after-free [0] in reqsk_timer_handler(). + + """ + We are seeing a use-after-free from a bpf prog attached to + trace_tcp_retransmit_synack. The program passes the req->sk to the + bpf_sk_storage_get_tracing kernel helper which does check for null + before using it. + """ + +The commit 83fccfc3940c ("inet: fix potential deadlock in +reqsk_queue_unlink()") added timer_pending() in reqsk_queue_unlink() not +to call del_timer_sync() from reqsk_timer_handler(), but it introduced a +small race window. + +Before the timer is called, expire_timers() calls detach_timer(timer, true) +to clear timer->entry.pprev and marks it as not pending. + +If reqsk_queue_unlink() checks timer_pending() just after expire_timers() +calls detach_timer(), TCP will miss del_timer_sync(); the reqsk timer will +continue running and send multiple SYN+ACKs until it expires. + +The reported UAF could happen if req->sk is close()d earlier than the timer +expiration, which is 63s by default. + +The scenario would be + + 1. inet_csk_complete_hashdance() calls inet_csk_reqsk_queue_drop(), + but del_timer_sync() is missed + + 2. reqsk timer is executed and scheduled again + + 3. req->sk is accept()ed and reqsk_put() decrements rsk_refcnt, but + reqsk timer still has another one, and inet_csk_accept() does not + clear req->sk for non-TFO sockets + + 4. sk is close()d + + 5. reqsk timer is executed again, and BPF touches req->sk + +Let's not use timer_pending() by passing the caller context to +__inet_csk_reqsk_queue_drop(). + +Note that reqsk timer is pinned, so the issue does not happen in most +use cases. [1] + +[0] +BUG: KFENCE: use-after-free read in bpf_sk_storage_get_tracing+0x2e/0x1b0 + +Use-after-free read at 0x00000000a891fb3a (in kfence-#1): +bpf_sk_storage_get_tracing+0x2e/0x1b0 +bpf_prog_5ea3e95db6da0438_tcp_retransmit_synack+0x1d20/0x1dda +bpf_trace_run2+0x4c/0xc0 +tcp_rtx_synack+0xf9/0x100 +reqsk_timer_handler+0xda/0x3d0 +run_timer_softirq+0x292/0x8a0 +irq_exit_rcu+0xf5/0x320 +sysvec_apic_timer_interrupt+0x6d/0x80 +asm_sysvec_apic_timer_interrupt+0x16/0x20 +intel_idle_irq+0x5a/0xa0 +cpuidle_enter_state+0x94/0x273 +cpu_startup_entry+0x15e/0x260 +start_secondary+0x8a/0x90 +secondary_startup_64_no_verify+0xfa/0xfb + +kfence-#1: 0x00000000a72cc7b6-0x00000000d97616d9, size=2376, cache=TCPv6 + +allocated by task 0 on cpu 9 at 260507.901592s: +sk_prot_alloc+0x35/0x140 +sk_clone_lock+0x1f/0x3f0 +inet_csk_clone_lock+0x15/0x160 +tcp_create_openreq_child+0x1f/0x410 +tcp_v6_syn_recv_sock+0x1da/0x700 +tcp_check_req+0x1fb/0x510 +tcp_v6_rcv+0x98b/0x1420 +ipv6_list_rcv+0x2258/0x26e0 +napi_complete_done+0x5b1/0x2990 +mlx5e_napi_poll+0x2ae/0x8d0 +net_rx_action+0x13e/0x590 +irq_exit_rcu+0xf5/0x320 +common_interrupt+0x80/0x90 +asm_common_interrupt+0x22/0x40 +cpuidle_enter_state+0xfb/0x273 +cpu_startup_entry+0x15e/0x260 +start_secondary+0x8a/0x90 +secondary_startup_64_no_verify+0xfa/0xfb + +freed by task 0 on cpu 9 at 260507.927527s: +rcu_core_si+0x4ff/0xf10 +irq_exit_rcu+0xf5/0x320 +sysvec_apic_timer_interrupt+0x6d/0x80 +asm_sysvec_apic_timer_interrupt+0x16/0x20 +cpuidle_enter_state+0xfb/0x273 +cpu_startup_entry+0x15e/0x260 +start_secondary+0x8a/0x90 +secondary_startup_64_no_verify+0xfa/0xfb + +Fixes: 83fccfc3940c ("inet: fix potential deadlock in reqsk_queue_unlink()") +Reported-by: Martin KaFai Lau +Closes: https://lore.kernel.org/netdev/eb6684d0-ffd9-4bdc-9196-33f690c25824@linux.dev/ +Link: https://lore.kernel.org/netdev/b55e2ca0-42f2-4b7c-b445-6ffd87ca74a0@linux.dev/ [1] +Signed-off-by: Kuniyuki Iwashima +Reviewed-by: Eric Dumazet +Reviewed-by: Martin KaFai Lau +Link: https://patch.msgid.link/20241014223312.4254-1-kuniyu@amazon.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/inet_connection_sock.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c +index c267c5e066e94..569186f741fb2 100644 +--- a/net/ipv4/inet_connection_sock.c ++++ b/net/ipv4/inet_connection_sock.c +@@ -977,21 +977,31 @@ static bool reqsk_queue_unlink(struct request_sock *req) + found = __sk_nulls_del_node_init_rcu(sk); + spin_unlock(lock); + } +- if (timer_pending(&req->rsk_timer) && del_timer_sync(&req->rsk_timer)) +- reqsk_put(req); ++ + return found; + } + +-bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req) ++static bool __inet_csk_reqsk_queue_drop(struct sock *sk, ++ struct request_sock *req, ++ bool from_timer) + { + bool unlinked = reqsk_queue_unlink(req); + ++ if (!from_timer && timer_delete_sync(&req->rsk_timer)) ++ reqsk_put(req); ++ + if (unlinked) { + reqsk_queue_removed(&inet_csk(sk)->icsk_accept_queue, req); + reqsk_put(req); + } ++ + return unlinked; + } ++ ++bool inet_csk_reqsk_queue_drop(struct sock *sk, struct request_sock *req) ++{ ++ return __inet_csk_reqsk_queue_drop(sk, req, false); ++} + EXPORT_SYMBOL(inet_csk_reqsk_queue_drop); + + void inet_csk_reqsk_queue_drop_and_put(struct sock *sk, struct request_sock *req) +@@ -1084,7 +1094,7 @@ static void reqsk_timer_handler(struct timer_list *t) + + if (!inet_ehash_insert(req_to_sk(nreq), req_to_sk(oreq), NULL)) { + /* delete timer */ +- inet_csk_reqsk_queue_drop(sk_listener, nreq); ++ __inet_csk_reqsk_queue_drop(sk_listener, nreq, true); + goto no_ownership; + } + +@@ -1110,7 +1120,8 @@ static void reqsk_timer_handler(struct timer_list *t) + } + + drop: +- inet_csk_reqsk_queue_drop_and_put(oreq->rsk_listener, oreq); ++ __inet_csk_reqsk_queue_drop(sk_listener, oreq, true); ++ reqsk_put(req); + } + + static bool reqsk_queue_hash_req(struct request_sock *req, +-- +2.43.0 + diff --git a/queue-6.1/tty-serial-make-dcd_change-uart_handle_dcd_change-st.patch b/queue-6.1/tty-serial-make-dcd_change-uart_handle_dcd_change-st.patch new file mode 100644 index 00000000000..952c9c4a23c --- /dev/null +++ b/queue-6.1/tty-serial-make-dcd_change-uart_handle_dcd_change-st.patch @@ -0,0 +1,171 @@ +From 3eab7f5c990bbe3dbea59e0d9eb5ed0dc1072041 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Jan 2023 11:03:54 +0200 +Subject: tty/serial: Make ->dcd_change()+uart_handle_dcd_change() status bool + active +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Ilpo Järvinen + +[ Upstream commit 0388a152fc5544be82e736343496f99c4eef8d62 ] + +Convert status parameter for ->dcd_change() and +uart_handle_dcd_change() to bool which matches to how the parameter is +used. + +Rename status to active to better describe what the parameter means. + +Acked-by: Rodolfo Giometti +Reviewed-by: Jiri Slaby +Signed-off-by: Ilpo Järvinen +Link: https://lore.kernel.org/r/20230117090358.4796-9-ilpo.jarvinen@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 40d7903386df ("serial: imx: Update mctrl old_status on RTSD interrupt") +Signed-off-by: Sasha Levin +--- + drivers/pps/clients/pps-ldisc.c | 6 +++--- + drivers/tty/serial/serial_core.c | 8 ++++---- + drivers/tty/serial/sunhv.c | 8 ++++---- + include/linux/serial_core.h | 3 +-- + include/linux/tty_ldisc.h | 4 ++-- + 5 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c +index d73c4c2ed4e13..443d6bae19d14 100644 +--- a/drivers/pps/clients/pps-ldisc.c ++++ b/drivers/pps/clients/pps-ldisc.c +@@ -13,7 +13,7 @@ + #include + #include + +-static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status) ++static void pps_tty_dcd_change(struct tty_struct *tty, bool active) + { + struct pps_device *pps; + struct pps_event_time ts; +@@ -29,11 +29,11 @@ static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status) + return; + + /* Now do the PPS event report */ +- pps_event(pps, &ts, status ? PPS_CAPTUREASSERT : ++ pps_event(pps, &ts, active ? PPS_CAPTUREASSERT : + PPS_CAPTURECLEAR, NULL); + + dev_dbg(pps->dev, "PPS %s at %lu\n", +- status ? "assert" : "clear", jiffies); ++ active ? "assert" : "clear", jiffies); + } + + static int (*alias_n_tty_open)(struct tty_struct *tty); +diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c +index 58e857fb8deeb..e6994f40974ed 100644 +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -3290,11 +3290,11 @@ EXPORT_SYMBOL(uart_match_port); + /** + * uart_handle_dcd_change - handle a change of carrier detect state + * @uport: uart_port structure for the open port +- * @status: new carrier detect status, nonzero if active ++ * @active: new carrier detect status + * + * Caller must hold uport->lock. + */ +-void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) ++void uart_handle_dcd_change(struct uart_port *uport, bool active) + { + struct tty_port *port = &uport->state->port; + struct tty_struct *tty = port->tty; +@@ -3306,7 +3306,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) + ld = tty_ldisc_ref(tty); + if (ld) { + if (ld->ops->dcd_change) +- ld->ops->dcd_change(tty, status); ++ ld->ops->dcd_change(tty, active); + tty_ldisc_deref(ld); + } + } +@@ -3314,7 +3314,7 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status) + uport->icount.dcd++; + + if (uart_dcd_enabled(uport)) { +- if (status) ++ if (active) + wake_up_interruptible(&port->open_wait); + else if (tty) + tty_hangup(tty); +diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c +index 1938ba5e98c0e..f0408a4d91ecf 100644 +--- a/drivers/tty/serial/sunhv.c ++++ b/drivers/tty/serial/sunhv.c +@@ -89,10 +89,10 @@ static int receive_chars_getchar(struct uart_port *port) + + if (c == CON_HUP) { + hung_up = 1; +- uart_handle_dcd_change(port, 0); ++ uart_handle_dcd_change(port, false); + } else if (hung_up) { + hung_up = 0; +- uart_handle_dcd_change(port, 1); ++ uart_handle_dcd_change(port, true); + } + + if (port->state == NULL) { +@@ -135,7 +135,7 @@ static int receive_chars_read(struct uart_port *port) + bytes_read = 1; + } else if (stat == CON_HUP) { + hung_up = 1; +- uart_handle_dcd_change(port, 0); ++ uart_handle_dcd_change(port, false); + continue; + } else { + /* HV_EWOULDBLOCK, etc. */ +@@ -145,7 +145,7 @@ static int receive_chars_read(struct uart_port *port) + + if (hung_up) { + hung_up = 0; +- uart_handle_dcd_change(port, 1); ++ uart_handle_dcd_change(port, true); + } + + if (port->sysrq != 0 && *con_read_page) { +diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h +index 1c9b3f27f2d36..9b6d91430d3b3 100644 +--- a/include/linux/serial_core.h ++++ b/include/linux/serial_core.h +@@ -890,8 +890,7 @@ static inline bool uart_softcts_mode(struct uart_port *uport) + * The following are helper functions for the low level drivers. + */ + +-extern void uart_handle_dcd_change(struct uart_port *uport, +- unsigned int status); ++extern void uart_handle_dcd_change(struct uart_port *uport, bool active); + extern void uart_handle_cts_change(struct uart_port *uport, + unsigned int status); + +diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h +index dcb61ec11424a..49dc172dedc7f 100644 +--- a/include/linux/tty_ldisc.h ++++ b/include/linux/tty_ldisc.h +@@ -170,7 +170,7 @@ int ldsem_down_write_nested(struct ld_semaphore *sem, int subclass, + * send, please arise a tasklet or workqueue to do the real data transfer. + * Do not send data in this hook, it may lead to a deadlock. + * +- * @dcd_change: [DRV] ``void ()(struct tty_struct *tty, unsigned int status)`` ++ * @dcd_change: [DRV] ``void ()(struct tty_struct *tty, bool active)`` + * + * Tells the discipline that the DCD pin has changed its status. Used + * exclusively by the %N_PPS (Pulse-Per-Second) line discipline. +@@ -238,7 +238,7 @@ struct tty_ldisc_ops { + void (*receive_buf)(struct tty_struct *tty, const unsigned char *cp, + const char *fp, int count); + void (*write_wakeup)(struct tty_struct *tty); +- void (*dcd_change)(struct tty_struct *tty, unsigned int status); ++ void (*dcd_change)(struct tty_struct *tty, bool active); + int (*receive_buf2)(struct tty_struct *tty, const unsigned char *cp, + const char *fp, int count); + void (*lookahead_buf)(struct tty_struct *tty, const unsigned char *cp, +-- +2.43.0 + diff --git a/queue-6.1/usb-dwc3-core-fix-system-suspend-on-ti-am62-platform.patch b/queue-6.1/usb-dwc3-core-fix-system-suspend-on-ti-am62-platform.patch new file mode 100644 index 00000000000..e3c3fd3b552 --- /dev/null +++ b/queue-6.1/usb-dwc3-core-fix-system-suspend-on-ti-am62-platform.patch @@ -0,0 +1,111 @@ +From 6303033acdb374e3ebe6a3baaf5da1a136ebbeef Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 11 Oct 2024 13:53:24 +0300 +Subject: usb: dwc3: core: Fix system suspend on TI AM62 platforms + +From: Roger Quadros + +[ Upstream commit 705e3ce37bccdf2ed6f848356ff355f480d51a91 ] + +Since commit 6d735722063a ("usb: dwc3: core: Prevent phy suspend during init"), +system suspend is broken on AM62 TI platforms. + +Before that commit, both DWC3_GUSB3PIPECTL_SUSPHY and DWC3_GUSB2PHYCFG_SUSPHY +bits (hence forth called 2 SUSPHY bits) were being set during core +initialization and even during core re-initialization after a system +suspend/resume. + +These bits are required to be set for system suspend/resume to work correctly +on AM62 platforms. + +Since that commit, the 2 SUSPHY bits are not set for DEVICE/OTG mode if gadget +driver is not loaded and started. +For Host mode, the 2 SUSPHY bits are set before the first system suspend but +get cleared at system resume during core re-init and are never set again. + +This patch resovles these two issues by ensuring the 2 SUSPHY bits are set +before system suspend and restored to the original state during system resume. + +Cc: stable@vger.kernel.org # v6.9+ +Fixes: 6d735722063a ("usb: dwc3: core: Prevent phy suspend during init") +Link: https://lore.kernel.org/all/1519dbe7-73b6-4afc-bfe3-23f4f75d772f@kernel.org/ +Signed-off-by: Roger Quadros +Acked-by: Thinh Nguyen +Tested-by: Markus Schneider-Pargmann +Reviewed-by: Dhruva Gole +Link: https://lore.kernel.org/r/20241011-am62-lpm-usb-v3-1-562d445625b5@kernel.org +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/dwc3/core.c | 19 +++++++++++++++++++ + drivers/usb/dwc3/core.h | 3 +++ + 2 files changed, 22 insertions(+) + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index c191716896fc4..22edd8d451da0 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -2131,6 +2131,11 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) + { + u32 reg; + ++ dwc->susphy_state = (dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)) & ++ DWC3_GUSB2PHYCFG_SUSPHY) || ++ (dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0)) & ++ DWC3_GUSB3PIPECTL_SUSPHY); ++ + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: + if (pm_runtime_suspended(dwc->dev)) +@@ -2178,6 +2183,15 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) + break; + } + ++ if (!PMSG_IS_AUTO(msg)) { ++ /* ++ * TI AM62 platform requires SUSPHY to be ++ * enabled for system suspend to work. ++ */ ++ if (!dwc->susphy_state) ++ dwc3_enable_susphy(dwc, true); ++ } ++ + return 0; + } + +@@ -2240,6 +2254,11 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) + break; + } + ++ if (!PMSG_IS_AUTO(msg)) { ++ /* restore SUSPHY state to that before system suspend. */ ++ dwc3_enable_susphy(dwc, dwc->susphy_state); ++ } ++ + return 0; + } + +diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h +index e733835c41222..1b496c8e7b809 100644 +--- a/drivers/usb/dwc3/core.h ++++ b/drivers/usb/dwc3/core.h +@@ -1118,6 +1118,8 @@ struct dwc3_scratchpad_array { + * @dis_metastability_quirk: set to disable metastability quirk. + * @dis_split_quirk: set to disable split boundary. + * @suspended: set to track suspend event due to U3/L2. ++ * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY ++ * before PM suspend. + * @imod_interval: set the interrupt moderation interval in 250ns + * increments or 0 to disable. + * @max_cfg_eps: current max number of IN eps used across all USB configs. +@@ -1341,6 +1343,7 @@ struct dwc3 { + unsigned dis_split_quirk:1; + unsigned async_callbacks:1; + unsigned suspended:1; ++ unsigned susphy_state:1; + + u16 imod_interval; + +-- +2.43.0 + diff --git a/queue-6.1/usb-gadget-add-function-wakeup-support.patch b/queue-6.1/usb-gadget-add-function-wakeup-support.patch new file mode 100644 index 00000000000..cf67d8e785f --- /dev/null +++ b/queue-6.1/usb-gadget-add-function-wakeup-support.patch @@ -0,0 +1,126 @@ +From 70b044a5706c5e8890fc8637fee289edddcf6a49 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 24 Mar 2023 14:47:59 -0700 +Subject: usb: gadget: Add function wakeup support + +From: Elson Roy Serrao + +[ Upstream commit f0db885fb05d35befa81896db6b19eb3ee9ccdfe ] + +USB3.2 spec section 9.2.5.4 quotes that a function may signal that +it wants to exit from Function Suspend by sending a Function +Wake Notification to the host if it is enabled for function +remote wakeup. Add an api in composite layer that can be used +by the function drivers to support this feature. Also expose +a gadget op so that composite layer can trigger a wakeup request +to the UDC driver. + +Reviewed-by: Thinh Nguyen +Signed-off-by: Elson Roy Serrao +Link: https://lore.kernel.org/r/1679694482-16430-4-git-send-email-quic_eserrao@quicinc.com +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 705e3ce37bcc ("usb: dwc3: core: Fix system suspend on TI AM62 platforms") +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/composite.c | 40 ++++++++++++++++++++++++++++++++++ + include/linux/usb/composite.h | 6 +++++ + include/linux/usb/gadget.h | 1 + + 3 files changed, 47 insertions(+) + +diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c +index f10e43a948fd8..db66242b2918a 100644 +--- a/drivers/usb/gadget/composite.c ++++ b/drivers/usb/gadget/composite.c +@@ -490,6 +490,46 @@ int usb_interface_id(struct usb_configuration *config, + } + EXPORT_SYMBOL_GPL(usb_interface_id); + ++/** ++ * usb_func_wakeup - sends function wake notification to the host. ++ * @func: function that sends the remote wakeup notification. ++ * ++ * Applicable to devices operating at enhanced superspeed when usb ++ * functions are put in function suspend state and armed for function ++ * remote wakeup. On completion, function wake notification is sent. If ++ * the device is in low power state it tries to bring the device to active ++ * state before sending the wake notification. Since it is a synchronous ++ * call, caller must take care of not calling it in interrupt context. ++ * For devices operating at lower speeds returns negative errno. ++ * ++ * Returns zero on success, else negative errno. ++ */ ++int usb_func_wakeup(struct usb_function *func) ++{ ++ struct usb_gadget *gadget = func->config->cdev->gadget; ++ int id; ++ ++ if (!gadget->ops->func_wakeup) ++ return -EOPNOTSUPP; ++ ++ if (!func->func_wakeup_armed) { ++ ERROR(func->config->cdev, "not armed for func remote wakeup\n"); ++ return -EINVAL; ++ } ++ ++ for (id = 0; id < MAX_CONFIG_INTERFACES; id++) ++ if (func->config->interface[id] == func) ++ break; ++ ++ if (id == MAX_CONFIG_INTERFACES) { ++ ERROR(func->config->cdev, "Invalid function\n"); ++ return -EINVAL; ++ } ++ ++ return gadget->ops->func_wakeup(gadget, id); ++} ++EXPORT_SYMBOL_GPL(usb_func_wakeup); ++ + static u8 encode_bMaxPower(enum usb_device_speed speed, + struct usb_configuration *c) + { +diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h +index 9783b9107d76b..d759208e0a6ce 100644 +--- a/include/linux/usb/composite.h ++++ b/include/linux/usb/composite.h +@@ -149,6 +149,9 @@ struct usb_os_desc_table { + * GetStatus() request when the recipient is Interface. + * @func_suspend: callback to be called when + * SetFeature(FUNCTION_SUSPEND) is reseived ++ * @func_suspended: Indicates whether the function is in function suspend state. ++ * @func_wakeup_armed: Indicates whether the function is armed by the host for ++ * wakeup signaling. + * + * A single USB function uses one or more interfaces, and should in most + * cases support operation at both full and high speeds. Each function is +@@ -219,6 +222,8 @@ struct usb_function { + int (*get_status)(struct usb_function *); + int (*func_suspend)(struct usb_function *, + u8 suspend_opt); ++ bool func_suspended; ++ bool func_wakeup_armed; + /* private: */ + /* internals */ + struct list_head list; +@@ -240,6 +245,7 @@ int config_ep_by_speed_and_alt(struct usb_gadget *g, struct usb_function *f, + + int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f, + struct usb_ep *_ep); ++int usb_func_wakeup(struct usb_function *func); + + #define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */ + +diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h +index 5bec668b41dcd..705b76f8dddb2 100644 +--- a/include/linux/usb/gadget.h ++++ b/include/linux/usb/gadget.h +@@ -309,6 +309,7 @@ struct usb_udc; + struct usb_gadget_ops { + int (*get_frame)(struct usb_gadget *); + int (*wakeup)(struct usb_gadget *); ++ int (*func_wakeup)(struct usb_gadget *gadget, int intf_id); + int (*set_remote_wakeup)(struct usb_gadget *, int set); + int (*set_selfpowered) (struct usb_gadget *, int is_selfpowered); + int (*vbus_session) (struct usb_gadget *, int is_active); +-- +2.43.0 + diff --git a/queue-6.1/usb-gadget-f_uac2-fix-non-newline-terminated-functio.patch b/queue-6.1/usb-gadget-f_uac2-fix-non-newline-terminated-functio.patch new file mode 100644 index 00000000000..e2d0ae9b711 --- /dev/null +++ b/queue-6.1/usb-gadget-f_uac2-fix-non-newline-terminated-functio.patch @@ -0,0 +1,48 @@ +From 530739d91251d63c2bd40a0aa65ef1dd1a948f05 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 8 Jul 2024 15:25:53 +0100 +Subject: usb: gadget: f_uac2: fix non-newline-terminated function name + +From: John Keeping + +[ Upstream commit e60284b63245b84c3ae352427ed5ff8b79266b91 ] + +Most writes to configfs handle an optional newline, but do not require +it. By using the number of bytes written as the limit for scnprintf() +it is guaranteed that the final character in the buffer will be +overwritten. + +This is expected if it is a newline but is undesirable when a string is +written "as-is" (as libusbgx does, for example). + +Update the store function to strip an optional newline, matching the +behaviour of usb_string_copy(). + +Signed-off-by: John Keeping +Link: https://lore.kernel.org/r/20240708142553.3995022-1-jkeeping@inmusicbrands.com +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 9499327714de ("usb: gadget: f_uac2: fix return value for UAC2_ATTRIBUTE_STRING store") +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_uac2.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c +index 55a4f07bc9cc1..79d1f87c6cc59 100644 +--- a/drivers/usb/gadget/function/f_uac2.c ++++ b/drivers/usb/gadget/function/f_uac2.c +@@ -2060,7 +2060,10 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \ + goto end; \ + } \ + \ +- ret = scnprintf(opts->name, min(sizeof(opts->name), len), \ ++ if (len && page[len - 1] == '\n') \ ++ len--; \ ++ \ ++ ret = scnprintf(opts->name, min(sizeof(opts->name), len + 1), \ + "%s", page); \ + \ + end: \ +-- +2.43.0 + diff --git a/queue-6.1/usb-gadget-f_uac2-fix-return-value-for-uac2_attribut.patch b/queue-6.1/usb-gadget-f_uac2-fix-return-value-for-uac2_attribut.patch new file mode 100644 index 00000000000..441903d1787 --- /dev/null +++ b/queue-6.1/usb-gadget-f_uac2-fix-return-value-for-uac2_attribut.patch @@ -0,0 +1,58 @@ +From 02577a2a4a3fd9d0bbb6f5472afa96d62287965f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 6 Oct 2024 19:26:31 -0400 +Subject: usb: gadget: f_uac2: fix return value for UAC2_ATTRIBUTE_STRING store + +From: Kevin Groeneveld + +[ Upstream commit 9499327714de7bc5cf6c792112c1474932d8ad31 ] + +The configfs store callback should return the number of bytes consumed +not the total number of bytes we actually stored. These could differ if +for example the passed in string had a newline we did not store. + +If the returned value does not match the number of bytes written the +writer might assume a failure or keep trying to write the remaining bytes. + +For example the following command will hang trying to write the final +newline over and over again (tested on bash 2.05b): + + echo foo > function_name + +Fixes: 993a44fa85c1 ("usb: gadget: f_uac2: allow changing interface name via configfs") +Cc: stable +Signed-off-by: Kevin Groeneveld +Link: https://lore.kernel.org/r/20241006232637.4267-1-kgroeneveld@lenbrook.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_uac2.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c +index 79d1f87c6cc59..b3dc5f5164f42 100644 +--- a/drivers/usb/gadget/function/f_uac2.c ++++ b/drivers/usb/gadget/function/f_uac2.c +@@ -2052,7 +2052,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \ + const char *page, size_t len) \ + { \ + struct f_uac2_opts *opts = to_f_uac2_opts(item); \ +- int ret = 0; \ ++ int ret = len; \ + \ + mutex_lock(&opts->lock); \ + if (opts->refcnt) { \ +@@ -2063,8 +2063,8 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \ + if (len && page[len - 1] == '\n') \ + len--; \ + \ +- ret = scnprintf(opts->name, min(sizeof(opts->name), len + 1), \ +- "%s", page); \ ++ scnprintf(opts->name, min(sizeof(opts->name), len + 1), \ ++ "%s", page); \ + \ + end: \ + mutex_unlock(&opts->lock); \ +-- +2.43.0 + diff --git a/queue-6.1/usb-gadget-f_uac2-replace-snprintf-with-the-safer-sc.patch b/queue-6.1/usb-gadget-f_uac2-replace-snprintf-with-the-safer-sc.patch new file mode 100644 index 00000000000..b01a4955e78 --- /dev/null +++ b/queue-6.1/usb-gadget-f_uac2-replace-snprintf-with-the-safer-sc.patch @@ -0,0 +1,68 @@ +From 2e84f0e9e1e837b81d926d13929a631bff7df6fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 13 Dec 2023 16:42:32 +0000 +Subject: usb: gadget: f_uac2: Replace snprintf() with the safer scnprintf() + variant + +From: Lee Jones + +[ Upstream commit 60034e0aedf507888c4a880f57011bb7f5d7700c ] + +There is a general misunderstanding amongst engineers that {v}snprintf() +returns the length of the data *actually* encoded into the destination +array. However, as per the C99 standard {v}snprintf() really returns +the length of the data that *would have been* written if there were +enough space for it. This misunderstanding has led to buffer-overruns +in the past. It's generally considered safer to use the {v}scnprintf() +variants in their place (or even sprintf() in simple cases). So let's +do that. + +Link: https://lwn.net/Articles/69419/ +Link: https://github.com/KSPP/linux/issues/105 +Cc: James Gruber +Cc: Yadwinder Singh +Cc: Jaswinder Singh +Cc: Ruslan Bilovol +Signed-off-by: Lee Jones +Link: https://lore.kernel.org/r/20231213164246.1021885-4-lee@kernel.org +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 9499327714de ("usb: gadget: f_uac2: fix return value for UAC2_ATTRIBUTE_STRING store") +Signed-off-by: Sasha Levin +--- + drivers/usb/gadget/function/f_uac2.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/usb/gadget/function/f_uac2.c b/drivers/usb/gadget/function/f_uac2.c +index 0219cd79493a7..55a4f07bc9cc1 100644 +--- a/drivers/usb/gadget/function/f_uac2.c ++++ b/drivers/usb/gadget/function/f_uac2.c +@@ -2042,7 +2042,7 @@ static ssize_t f_uac2_opts_##name##_show(struct config_item *item, \ + int result; \ + \ + mutex_lock(&opts->lock); \ +- result = snprintf(page, sizeof(opts->name), "%s", opts->name); \ ++ result = scnprintf(page, sizeof(opts->name), "%s", opts->name); \ + mutex_unlock(&opts->lock); \ + \ + return result; \ +@@ -2060,7 +2060,7 @@ static ssize_t f_uac2_opts_##name##_store(struct config_item *item, \ + goto end; \ + } \ + \ +- ret = snprintf(opts->name, min(sizeof(opts->name), len), \ ++ ret = scnprintf(opts->name, min(sizeof(opts->name), len), \ + "%s", page); \ + \ + end: \ +@@ -2178,7 +2178,7 @@ static struct usb_function_instance *afunc_alloc_inst(void) + opts->req_number = UAC2_DEF_REQ_NUM; + opts->fb_max = FBACK_FAST_MAX; + +- snprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink"); ++ scnprintf(opts->function_name, sizeof(opts->function_name), "Source/Sink"); + + return &opts->func_inst; + } +-- +2.43.0 + diff --git a/queue-6.1/usb-typec-altmode-should-keep-reference-to-parent.patch b/queue-6.1/usb-typec-altmode-should-keep-reference-to-parent.patch new file mode 100644 index 00000000000..0aea97c6b58 --- /dev/null +++ b/queue-6.1/usb-typec-altmode-should-keep-reference-to-parent.patch @@ -0,0 +1,130 @@ +From ff04855e8c4c91c1d64d8605e328044ad70f64dc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 4 Oct 2024 09:37:38 -0300 +Subject: usb: typec: altmode should keep reference to parent + +From: Thadeu Lima de Souza Cascardo + +[ Upstream commit befab3a278c59db0cc88c8799638064f6d3fd6f8 ] + +The altmode device release refers to its parent device, but without keeping +a reference to it. + +When registering the altmode, get a reference to the parent and put it in +the release function. + +Before this fix, when using CONFIG_DEBUG_KOBJECT_RELEASE, we see issues +like this: + +[ 43.572860] kobject: 'port0.0' (ffff8880057ba008): kobject_release, parent 0000000000000000 (delayed 3000) +[ 43.573532] kobject: 'port0.1' (ffff8880057bd008): kobject_release, parent 0000000000000000 (delayed 1000) +[ 43.574407] kobject: 'port0' (ffff8880057b9008): kobject_release, parent 0000000000000000 (delayed 3000) +[ 43.575059] kobject: 'port1.0' (ffff8880057ca008): kobject_release, parent 0000000000000000 (delayed 4000) +[ 43.575908] kobject: 'port1.1' (ffff8880057c9008): kobject_release, parent 0000000000000000 (delayed 4000) +[ 43.576908] kobject: 'typec' (ffff8880062dbc00): kobject_release, parent 0000000000000000 (delayed 4000) +[ 43.577769] kobject: 'port1' (ffff8880057bf008): kobject_release, parent 0000000000000000 (delayed 3000) +[ 46.612867] ================================================================== +[ 46.613402] BUG: KASAN: slab-use-after-free in typec_altmode_release+0x38/0x129 +[ 46.614003] Read of size 8 at addr ffff8880057b9118 by task kworker/2:1/48 +[ 46.614538] +[ 46.614668] CPU: 2 UID: 0 PID: 48 Comm: kworker/2:1 Not tainted 6.12.0-rc1-00138-gedbae730ad31 #535 +[ 46.615391] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014 +[ 46.616042] Workqueue: events kobject_delayed_cleanup +[ 46.616446] Call Trace: +[ 46.616648] +[ 46.616820] dump_stack_lvl+0x5b/0x7c +[ 46.617112] ? typec_altmode_release+0x38/0x129 +[ 46.617470] print_report+0x14c/0x49e +[ 46.617769] ? rcu_read_unlock_sched+0x56/0x69 +[ 46.618117] ? __virt_addr_valid+0x19a/0x1ab +[ 46.618456] ? kmem_cache_debug_flags+0xc/0x1d +[ 46.618807] ? typec_altmode_release+0x38/0x129 +[ 46.619161] kasan_report+0x8d/0xb4 +[ 46.619447] ? typec_altmode_release+0x38/0x129 +[ 46.619809] ? process_scheduled_works+0x3cb/0x85f +[ 46.620185] typec_altmode_release+0x38/0x129 +[ 46.620537] ? process_scheduled_works+0x3cb/0x85f +[ 46.620907] device_release+0xaf/0xf2 +[ 46.621206] kobject_delayed_cleanup+0x13b/0x17a +[ 46.621584] process_scheduled_works+0x4f6/0x85f +[ 46.621955] ? __pfx_process_scheduled_works+0x10/0x10 +[ 46.622353] ? hlock_class+0x31/0x9a +[ 46.622647] ? lock_acquired+0x361/0x3c3 +[ 46.622956] ? move_linked_works+0x46/0x7d +[ 46.623277] worker_thread+0x1ce/0x291 +[ 46.623582] ? __kthread_parkme+0xc8/0xdf +[ 46.623900] ? __pfx_worker_thread+0x10/0x10 +[ 46.624236] kthread+0x17e/0x190 +[ 46.624501] ? kthread+0xfb/0x190 +[ 46.624756] ? __pfx_kthread+0x10/0x10 +[ 46.625015] ret_from_fork+0x20/0x40 +[ 46.625268] ? __pfx_kthread+0x10/0x10 +[ 46.625532] ret_from_fork_asm+0x1a/0x30 +[ 46.625805] +[ 46.625953] +[ 46.626056] Allocated by task 678: +[ 46.626287] kasan_save_stack+0x24/0x44 +[ 46.626555] kasan_save_track+0x14/0x2d +[ 46.626811] __kasan_kmalloc+0x3f/0x4d +[ 46.627049] __kmalloc_noprof+0x1bf/0x1f0 +[ 46.627362] typec_register_port+0x23/0x491 +[ 46.627698] cros_typec_probe+0x634/0xbb6 +[ 46.628026] platform_probe+0x47/0x8c +[ 46.628311] really_probe+0x20a/0x47d +[ 46.628605] device_driver_attach+0x39/0x72 +[ 46.628940] bind_store+0x87/0xd7 +[ 46.629213] kernfs_fop_write_iter+0x1aa/0x218 +[ 46.629574] vfs_write+0x1d6/0x29b +[ 46.629856] ksys_write+0xcd/0x13b +[ 46.630128] do_syscall_64+0xd4/0x139 +[ 46.630420] entry_SYSCALL_64_after_hwframe+0x76/0x7e +[ 46.630820] +[ 46.630946] Freed by task 48: +[ 46.631182] kasan_save_stack+0x24/0x44 +[ 46.631493] kasan_save_track+0x14/0x2d +[ 46.631799] kasan_save_free_info+0x3f/0x4d +[ 46.632144] __kasan_slab_free+0x37/0x45 +[ 46.632474] kfree+0x1d4/0x252 +[ 46.632725] device_release+0xaf/0xf2 +[ 46.633017] kobject_delayed_cleanup+0x13b/0x17a +[ 46.633388] process_scheduled_works+0x4f6/0x85f +[ 46.633764] worker_thread+0x1ce/0x291 +[ 46.634065] kthread+0x17e/0x190 +[ 46.634324] ret_from_fork+0x20/0x40 +[ 46.634621] ret_from_fork_asm+0x1a/0x30 + +Fixes: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes") +Signed-off-by: Thadeu Lima de Souza Cascardo +Reviewed-by: Heikki Krogerus +Reviewed-by: Dmitry Baryshkov +Link: https://lore.kernel.org/r/20241004123738.2964524-1-cascardo@igalia.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/typec/class.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c +index ce83f558fe447..3d44e181dbb50 100644 +--- a/drivers/usb/typec/class.c ++++ b/drivers/usb/typec/class.c +@@ -503,6 +503,7 @@ static void typec_altmode_release(struct device *dev) + typec_altmode_put_partner(alt); + + altmode_id_remove(alt->adev.dev.parent, alt->id); ++ put_device(alt->adev.dev.parent); + kfree(alt); + } + +@@ -552,6 +553,8 @@ typec_register_altmode(struct device *parent, + alt->adev.dev.type = &typec_altmode_dev_type; + dev_set_name(&alt->adev.dev, "%s.%u", dev_name(parent), id); + ++ get_device(alt->adev.dev.parent); ++ + /* Link partners and plugs with the ports */ + if (!is_port) + typec_altmode_set_partner(alt); +-- +2.43.0 + diff --git a/queue-6.1/x86-resctrl-avoid-overflow-in-mb-settings-in-bw_vali.patch b/queue-6.1/x86-resctrl-avoid-overflow-in-mb-settings-in-bw_vali.patch new file mode 100644 index 00000000000..11ce90e4680 --- /dev/null +++ b/queue-6.1/x86-resctrl-avoid-overflow-in-mb-settings-in-bw_vali.patch @@ -0,0 +1,102 @@ +From f6f64cf344e975054818debfd07eb707fa3b1113 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 1 Oct 2024 13:43:56 +0200 +Subject: x86/resctrl: Avoid overflow in MB settings in bw_validate() + +From: Martin Kletzander + +[ Upstream commit 2b5648416e47933939dc310c4ea1e29404f35630 ] + +The resctrl schemata file supports specifying memory bandwidth associated with +the Memory Bandwidth Allocation (MBA) feature via a percentage (this is the +default) or bandwidth in MiBps (when resctrl is mounted with the "mba_MBps" +option). + +The allowed range for the bandwidth percentage is from +/sys/fs/resctrl/info/MB/min_bandwidth to 100, using a granularity of +/sys/fs/resctrl/info/MB/bandwidth_gran. The supported range for the MiBps +bandwidth is 0 to U32_MAX. + +There are two issues with parsing of MiBps memory bandwidth: + +* The user provided MiBps is mistakenly rounded up to the granularity + that is unique to percentage input. + +* The user provided MiBps is parsed using unsigned long (thus accepting + values up to ULONG_MAX), and then assigned to u32 that could result in + overflow. + +Do not round up the MiBps value and parse user provided bandwidth as the u32 +it is intended to be. Use the appropriate kstrtou32() that can detect out of +range values. + +Fixes: 8205a078ba78 ("x86/intel_rdt/mba_sc: Add schemata support") +Fixes: 6ce1560d35f6 ("x86/resctrl: Switch over to the resctrl mbps_val list") +Co-developed-by: Reinette Chatre +Signed-off-by: Reinette Chatre +Signed-off-by: Martin Kletzander +Signed-off-by: Borislav Petkov (AMD) +Reviewed-by: Reinette Chatre +Reviewed-by: Tony Luck +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +index 84f23327caed4..d2cb96738ff6b 100644 +--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c ++++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c +@@ -27,10 +27,10 @@ + * hardware. The allocated bandwidth percentage is rounded to the next + * control step available on the hardware. + */ +-static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r) ++static bool bw_validate(char *buf, u32 *data, struct rdt_resource *r) + { +- unsigned long bw; + int ret; ++ u32 bw; + + /* + * Only linear delay values is supported for current Intel SKUs. +@@ -40,16 +40,21 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r) + return false; + } + +- ret = kstrtoul(buf, 10, &bw); ++ ret = kstrtou32(buf, 10, &bw); + if (ret) { +- rdt_last_cmd_printf("Non-decimal digit in MB value %s\n", buf); ++ rdt_last_cmd_printf("Invalid MB value %s\n", buf); + return false; + } + +- if ((bw < r->membw.min_bw || bw > r->default_ctrl) && +- !is_mba_sc(r)) { +- rdt_last_cmd_printf("MB value %ld out of range [%d,%d]\n", bw, +- r->membw.min_bw, r->default_ctrl); ++ /* Nothing else to do if software controller is enabled. */ ++ if (is_mba_sc(r)) { ++ *data = bw; ++ return true; ++ } ++ ++ if (bw < r->membw.min_bw || bw > r->default_ctrl) { ++ rdt_last_cmd_printf("MB value %u out of range [%d,%d]\n", ++ bw, r->membw.min_bw, r->default_ctrl); + return false; + } + +@@ -63,7 +68,7 @@ int parse_bw(struct rdt_parse_data *data, struct resctrl_schema *s, + struct resctrl_staged_config *cfg; + u32 closid = data->rdtgrp->closid; + struct rdt_resource *r = s->res; +- unsigned long bw_val; ++ u32 bw_val; + + cfg = &d->staged_config[s->conf_type]; + if (cfg->have_new_ctrl) { +-- +2.43.0 + diff --git a/queue-6.1/xhci-dbc-honor-usb-transfer-size-boundaries.patch b/queue-6.1/xhci-dbc-honor-usb-transfer-size-boundaries.patch new file mode 100644 index 00000000000..b4111541f55 --- /dev/null +++ b/queue-6.1/xhci-dbc-honor-usb-transfer-size-boundaries.patch @@ -0,0 +1,149 @@ +From a75076e8b117346a719243d23be2d4fabfd493fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 16 Oct 2024 17:00:00 +0300 +Subject: xhci: dbc: honor usb transfer size boundaries. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mathias Nyman + +[ Upstream commit 30c9ae5ece8ecd69d36e6912c2c0896418f2468c ] + +Treat each completed full size write to /dev/ttyDBC0 as a separate usb +transfer. Make sure the size of the TRBs matches the size of the tty +write by first queuing as many max packet size TRBs as possible up to +the last TRB which will be cut short to match the size of the tty write. + +This solves an issue where userspace writes several transfers back to +back via /dev/ttyDBC0 into a kfifo before dbgtty can find available +request to turn that kfifo data into TRBs on the transfer ring. + +The boundary between transfer was lost as xhci-dbgtty then turned +everyting in the kfifo into as many 'max packet size' TRBs as possible. + +DbC would then send more data to the host than intended for that +transfer, causing host to issue a babble error. + +Refuse to write more data to kfifo until previous tty write data is +turned into properly sized TRBs with data size boundaries matching tty +write size + +Tested-by: Uday M Bhat +Tested-by: Łukasz Bartosik +Cc: stable@vger.kernel.org +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20241016140000.783905-5-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-dbgcap.h | 1 + + drivers/usb/host/xhci-dbgtty.c | 55 ++++++++++++++++++++++++++++++---- + 2 files changed, 51 insertions(+), 5 deletions(-) + +diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h +index 0d4d60758af97..caeadfb8760b6 100644 +--- a/drivers/usb/host/xhci-dbgcap.h ++++ b/drivers/usb/host/xhci-dbgcap.h +@@ -108,6 +108,7 @@ struct dbc_port { + struct tasklet_struct push; + + struct list_head write_pool; ++ unsigned int tx_boundary; + + bool registered; + }; +diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c +index f6e25a1cec115..6dd7e8c8eed08 100644 +--- a/drivers/usb/host/xhci-dbgtty.c ++++ b/drivers/usb/host/xhci-dbgtty.c +@@ -24,6 +24,29 @@ static inline struct dbc_port *dbc_to_port(struct xhci_dbc *dbc) + return dbc->priv; + } + ++static unsigned int ++dbc_kfifo_to_req(struct dbc_port *port, char *packet) ++{ ++ unsigned int len; ++ ++ len = kfifo_len(&port->port.xmit_fifo); ++ ++ if (len == 0) ++ return 0; ++ ++ len = min(len, DBC_MAX_PACKET); ++ ++ if (port->tx_boundary) ++ len = min(port->tx_boundary, len); ++ ++ len = kfifo_out(&port->port.xmit_fifo, packet, len); ++ ++ if (port->tx_boundary) ++ port->tx_boundary -= len; ++ ++ return len; ++} ++ + static int dbc_start_tx(struct dbc_port *port) + __releases(&port->port_lock) + __acquires(&port->port_lock) +@@ -36,7 +59,7 @@ static int dbc_start_tx(struct dbc_port *port) + + while (!list_empty(pool)) { + req = list_entry(pool->next, struct dbc_request, list_pool); +- len = kfifo_out(&port->port.xmit_fifo, req->buf, DBC_MAX_PACKET); ++ len = dbc_kfifo_to_req(port, req->buf); + if (len == 0) + break; + do_tty_wake = true; +@@ -201,14 +224,32 @@ static int dbc_tty_write(struct tty_struct *tty, + { + struct dbc_port *port = tty->driver_data; + unsigned long flags; ++ unsigned int written = 0; + + spin_lock_irqsave(&port->port_lock, flags); +- if (count) +- count = kfifo_in(&port->port.xmit_fifo, buf, count); +- dbc_start_tx(port); ++ ++ /* ++ * Treat tty write as one usb transfer. Make sure the writes are turned ++ * into TRB request having the same size boundaries as the tty writes. ++ * Don't add data to kfifo before previous write is turned into TRBs ++ */ ++ if (port->tx_boundary) { ++ spin_unlock_irqrestore(&port->port_lock, flags); ++ return 0; ++ } ++ ++ if (count) { ++ written = kfifo_in(&port->port.xmit_fifo, buf, count); ++ ++ if (written == count) ++ port->tx_boundary = kfifo_len(&port->port.xmit_fifo); ++ ++ dbc_start_tx(port); ++ } ++ + spin_unlock_irqrestore(&port->port_lock, flags); + +- return count; ++ return written; + } + + static int dbc_tty_put_char(struct tty_struct *tty, unsigned char ch) +@@ -242,6 +283,10 @@ static unsigned int dbc_tty_write_room(struct tty_struct *tty) + + spin_lock_irqsave(&port->port_lock, flags); + room = kfifo_avail(&port->port.xmit_fifo); ++ ++ if (port->tx_boundary) ++ room = 0; ++ + spin_unlock_irqrestore(&port->port_lock, flags); + + return room; +-- +2.43.0 + diff --git a/queue-6.1/xhci-dbgtty-remove-kfifo_out-wrapper.patch b/queue-6.1/xhci-dbgtty-remove-kfifo_out-wrapper.patch new file mode 100644 index 00000000000..a17b04fe727 --- /dev/null +++ b/queue-6.1/xhci-dbgtty-remove-kfifo_out-wrapper.patch @@ -0,0 +1,61 @@ +From 345b4ac56b6d03aab1fbc7bc3875fa2ce45cda28 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 Aug 2024 12:35:40 +0200 +Subject: xhci: dbgtty: remove kfifo_out() wrapper + +From: Jiri Slaby (SUSE) + +[ Upstream commit 2b217514436744dd98c4d9fa48d60610f9f67d61 ] + +There is no need to check against kfifo_len() before kfifo_out(). Just +ask the latter for data and it tells how much it retrieved. Or returns 0 +in case there are no more. + +Signed-off-by: Jiri Slaby (SUSE) +Cc: Mathias Nyman +Cc: Greg Kroah-Hartman +Cc: linux-usb@vger.kernel.org +Link: https://lore.kernel.org/r/20240808103549.429349-5-jirislaby@kernel.org +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 30c9ae5ece8e ("xhci: dbc: honor usb transfer size boundaries.") +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-dbgtty.c | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c +index d3acc0829ee5a..43d3c95eb8ddb 100644 +--- a/drivers/usb/host/xhci-dbgtty.c ++++ b/drivers/usb/host/xhci-dbgtty.c +@@ -24,19 +24,6 @@ static inline struct dbc_port *dbc_to_port(struct xhci_dbc *dbc) + return dbc->priv; + } + +-static unsigned int +-dbc_send_packet(struct dbc_port *port, char *packet, unsigned int size) +-{ +- unsigned int len; +- +- len = kfifo_len(&port->write_fifo); +- if (len < size) +- size = len; +- if (size != 0) +- size = kfifo_out(&port->write_fifo, packet, size); +- return size; +-} +- + static int dbc_start_tx(struct dbc_port *port) + __releases(&port->port_lock) + __acquires(&port->port_lock) +@@ -49,7 +36,7 @@ static int dbc_start_tx(struct dbc_port *port) + + while (!list_empty(pool)) { + req = list_entry(pool->next, struct dbc_request, list_pool); +- len = dbc_send_packet(port, req->buf, DBC_MAX_PACKET); ++ len = kfifo_out(&port->write_fifo, req->buf, DBC_MAX_PACKET); + if (len == 0) + break; + do_tty_wake = true; +-- +2.43.0 + diff --git a/queue-6.1/xhci-dbgtty-use-kfifo-from-tty_port-struct.patch b/queue-6.1/xhci-dbgtty-use-kfifo-from-tty_port-struct.patch new file mode 100644 index 00000000000..e519a31b643 --- /dev/null +++ b/queue-6.1/xhci-dbgtty-use-kfifo-from-tty_port-struct.patch @@ -0,0 +1,117 @@ +From db687a68f9176d894c62283b4b4e24282c57ba1f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 8 Aug 2024 12:35:41 +0200 +Subject: xhci: dbgtty: use kfifo from tty_port struct + +From: Jiri Slaby (SUSE) + +[ Upstream commit 866025f0237609532bc8e4af5ef4d7252d3b55b6 ] + +There is no need to define one in a custom structure. The tty_port one +is free to use. + +Signed-off-by: Jiri Slaby (SUSE) +Cc: Mathias Nyman +Cc: Greg Kroah-Hartman +Cc: linux-usb@vger.kernel.org +Link: https://lore.kernel.org/r/20240808103549.429349-6-jirislaby@kernel.org +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 30c9ae5ece8e ("xhci: dbc: honor usb transfer size boundaries.") +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-dbgcap.h | 1 - + drivers/usb/host/xhci-dbgtty.c | 17 +++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/drivers/usb/host/xhci-dbgcap.h b/drivers/usb/host/xhci-dbgcap.h +index ca04192fdab1d..0d4d60758af97 100644 +--- a/drivers/usb/host/xhci-dbgcap.h ++++ b/drivers/usb/host/xhci-dbgcap.h +@@ -108,7 +108,6 @@ struct dbc_port { + struct tasklet_struct push; + + struct list_head write_pool; +- struct kfifo write_fifo; + + bool registered; + }; +diff --git a/drivers/usb/host/xhci-dbgtty.c b/drivers/usb/host/xhci-dbgtty.c +index 43d3c95eb8ddb..f6e25a1cec115 100644 +--- a/drivers/usb/host/xhci-dbgtty.c ++++ b/drivers/usb/host/xhci-dbgtty.c +@@ -36,7 +36,7 @@ static int dbc_start_tx(struct dbc_port *port) + + while (!list_empty(pool)) { + req = list_entry(pool->next, struct dbc_request, list_pool); +- len = kfifo_out(&port->write_fifo, req->buf, DBC_MAX_PACKET); ++ len = kfifo_out(&port->port.xmit_fifo, req->buf, DBC_MAX_PACKET); + if (len == 0) + break; + do_tty_wake = true; +@@ -204,7 +204,7 @@ static int dbc_tty_write(struct tty_struct *tty, + + spin_lock_irqsave(&port->port_lock, flags); + if (count) +- count = kfifo_in(&port->write_fifo, buf, count); ++ count = kfifo_in(&port->port.xmit_fifo, buf, count); + dbc_start_tx(port); + spin_unlock_irqrestore(&port->port_lock, flags); + +@@ -218,7 +218,7 @@ static int dbc_tty_put_char(struct tty_struct *tty, unsigned char ch) + int status; + + spin_lock_irqsave(&port->port_lock, flags); +- status = kfifo_put(&port->write_fifo, ch); ++ status = kfifo_put(&port->port.xmit_fifo, ch); + spin_unlock_irqrestore(&port->port_lock, flags); + + return status; +@@ -241,7 +241,7 @@ static unsigned int dbc_tty_write_room(struct tty_struct *tty) + unsigned int room; + + spin_lock_irqsave(&port->port_lock, flags); +- room = kfifo_avail(&port->write_fifo); ++ room = kfifo_avail(&port->port.xmit_fifo); + spin_unlock_irqrestore(&port->port_lock, flags); + + return room; +@@ -254,7 +254,7 @@ static unsigned int dbc_tty_chars_in_buffer(struct tty_struct *tty) + unsigned int chars; + + spin_lock_irqsave(&port->port_lock, flags); +- chars = kfifo_len(&port->write_fifo); ++ chars = kfifo_len(&port->port.xmit_fifo); + spin_unlock_irqrestore(&port->port_lock, flags); + + return chars; +@@ -412,7 +412,8 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc) + goto err_idr; + } + +- ret = kfifo_alloc(&port->write_fifo, DBC_WRITE_BUF_SIZE, GFP_KERNEL); ++ ret = kfifo_alloc(&port->port.xmit_fifo, DBC_WRITE_BUF_SIZE, ++ GFP_KERNEL); + if (ret) + goto err_exit_port; + +@@ -441,7 +442,7 @@ static int xhci_dbc_tty_register_device(struct xhci_dbc *dbc) + xhci_dbc_free_requests(&port->read_pool); + xhci_dbc_free_requests(&port->write_pool); + err_free_fifo: +- kfifo_free(&port->write_fifo); ++ kfifo_free(&port->port.xmit_fifo); + err_exit_port: + idr_remove(&dbc_tty_minors, port->minor); + err_idr: +@@ -466,7 +467,7 @@ static void xhci_dbc_tty_unregister_device(struct xhci_dbc *dbc) + idr_remove(&dbc_tty_minors, port->minor); + mutex_unlock(&dbc_tty_minors_lock); + +- kfifo_free(&port->write_fifo); ++ kfifo_free(&port->port.xmit_fifo); + xhci_dbc_free_requests(&port->read_pool); + xhci_dbc_free_requests(&port->read_queue); + xhci_dbc_free_requests(&port->write_pool); +-- +2.43.0 + diff --git a/queue-6.1/xhci-separate-port-and-caps-macros-into-dedicated-fi.patch b/queue-6.1/xhci-separate-port-and-caps-macros-into-dedicated-fi.patch new file mode 100644 index 00000000000..13597670b23 --- /dev/null +++ b/queue-6.1/xhci-separate-port-and-caps-macros-into-dedicated-fi.patch @@ -0,0 +1,589 @@ +From 38e8a8877be4facb9a6b7ad7633c3257bd6f9aa7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 24 Jan 2024 10:25:23 -0500 +Subject: XHCI: Separate PORT and CAPs macros into dedicated file + +From: Frank Li + +[ Upstream commit c35ba0ac48355df1d11fcce85945f76c42d250ac ] + +Split the PORT and CAPs macro definitions into a separate file to +facilitate sharing with other files without the need to include the entire +xhci.h. + +Signed-off-by: Frank Li +Link: https://lore.kernel.org/r/20240124152525.3910311-2-Frank.Li@nxp.com +Signed-off-by: Greg Kroah-Hartman +Stable-dep-of: 705e3ce37bcc ("usb: dwc3: core: Fix system suspend on TI AM62 platforms") +Signed-off-by: Sasha Levin +--- + drivers/usb/host/xhci-caps.h | 85 ++++++++++++ + drivers/usb/host/xhci-port.h | 176 +++++++++++++++++++++++ + drivers/usb/host/xhci.h | 262 +---------------------------------- + 3 files changed, 264 insertions(+), 259 deletions(-) + create mode 100644 drivers/usb/host/xhci-caps.h + create mode 100644 drivers/usb/host/xhci-port.h + +diff --git a/drivers/usb/host/xhci-caps.h b/drivers/usb/host/xhci-caps.h +new file mode 100644 +index 0000000000000..9e94cebf4a56d +--- /dev/null ++++ b/drivers/usb/host/xhci-caps.h +@@ -0,0 +1,85 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++ ++/* hc_capbase bitmasks */ ++/* bits 7:0 - how long is the Capabilities register */ ++#define HC_LENGTH(p) XHCI_HC_LENGTH(p) ++/* bits 31:16 */ ++#define HC_VERSION(p) (((p) >> 16) & 0xffff) ++ ++/* HCSPARAMS1 - hcs_params1 - bitmasks */ ++/* bits 0:7, Max Device Slots */ ++#define HCS_MAX_SLOTS(p) (((p) >> 0) & 0xff) ++#define HCS_SLOTS_MASK 0xff ++/* bits 8:18, Max Interrupters */ ++#define HCS_MAX_INTRS(p) (((p) >> 8) & 0x7ff) ++/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */ ++#define HCS_MAX_PORTS(p) (((p) >> 24) & 0x7f) ++ ++/* HCSPARAMS2 - hcs_params2 - bitmasks */ ++/* bits 0:3, frames or uframes that SW needs to queue transactions ++ * ahead of the HW to meet periodic deadlines */ ++#define HCS_IST(p) (((p) >> 0) & 0xf) ++/* bits 4:7, max number of Event Ring segments */ ++#define HCS_ERST_MAX(p) (((p) >> 4) & 0xf) ++/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */ ++/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */ ++/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */ ++#define HCS_MAX_SCRATCHPAD(p) ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f)) ++ ++/* HCSPARAMS3 - hcs_params3 - bitmasks */ ++/* bits 0:7, Max U1 to U0 latency for the roothub ports */ ++#define HCS_U1_LATENCY(p) (((p) >> 0) & 0xff) ++/* bits 16:31, Max U2 to U0 latency for the roothub ports */ ++#define HCS_U2_LATENCY(p) (((p) >> 16) & 0xffff) ++ ++/* HCCPARAMS - hcc_params - bitmasks */ ++/* true: HC can use 64-bit address pointers */ ++#define HCC_64BIT_ADDR(p) ((p) & (1 << 0)) ++/* true: HC can do bandwidth negotiation */ ++#define HCC_BANDWIDTH_NEG(p) ((p) & (1 << 1)) ++/* true: HC uses 64-byte Device Context structures ++ * FIXME 64-byte context structures aren't supported yet. ++ */ ++#define HCC_64BYTE_CONTEXT(p) ((p) & (1 << 2)) ++/* true: HC has port power switches */ ++#define HCC_PPC(p) ((p) & (1 << 3)) ++/* true: HC has port indicators */ ++#define HCS_INDICATOR(p) ((p) & (1 << 4)) ++/* true: HC has Light HC Reset Capability */ ++#define HCC_LIGHT_RESET(p) ((p) & (1 << 5)) ++/* true: HC supports latency tolerance messaging */ ++#define HCC_LTC(p) ((p) & (1 << 6)) ++/* true: no secondary Stream ID Support */ ++#define HCC_NSS(p) ((p) & (1 << 7)) ++/* true: HC supports Stopped - Short Packet */ ++#define HCC_SPC(p) ((p) & (1 << 9)) ++/* true: HC has Contiguous Frame ID Capability */ ++#define HCC_CFC(p) ((p) & (1 << 11)) ++/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */ ++#define HCC_MAX_PSA(p) (1 << ((((p) >> 12) & 0xf) + 1)) ++/* Extended Capabilities pointer from PCI base - section 5.3.6 */ ++#define HCC_EXT_CAPS(p) XHCI_HCC_EXT_CAPS(p) ++ ++#define CTX_SIZE(_hcc) (HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32) ++ ++/* db_off bitmask - bits 0:1 reserved */ ++#define DBOFF_MASK (~0x3) ++ ++/* run_regs_off bitmask - bits 0:4 reserved */ ++#define RTSOFF_MASK (~0x1f) ++ ++/* HCCPARAMS2 - hcc_params2 - bitmasks */ ++/* true: HC supports U3 entry Capability */ ++#define HCC2_U3C(p) ((p) & (1 << 0)) ++/* true: HC supports Configure endpoint command Max exit latency too large */ ++#define HCC2_CMC(p) ((p) & (1 << 1)) ++/* true: HC supports Force Save context Capability */ ++#define HCC2_FSC(p) ((p) & (1 << 2)) ++/* true: HC supports Compliance Transition Capability */ ++#define HCC2_CTC(p) ((p) & (1 << 3)) ++/* true: HC support Large ESIT payload Capability > 48k */ ++#define HCC2_LEC(p) ((p) & (1 << 4)) ++/* true: HC support Configuration Information Capability */ ++#define HCC2_CIC(p) ((p) & (1 << 5)) ++/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */ ++#define HCC2_ETC(p) ((p) & (1 << 6)) +diff --git a/drivers/usb/host/xhci-port.h b/drivers/usb/host/xhci-port.h +new file mode 100644 +index 0000000000000..f19efb966d180 +--- /dev/null ++++ b/drivers/usb/host/xhci-port.h +@@ -0,0 +1,176 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++ ++/* PORTSC - Port Status and Control Register - port_status_base bitmasks */ ++/* true: device connected */ ++#define PORT_CONNECT (1 << 0) ++/* true: port enabled */ ++#define PORT_PE (1 << 1) ++/* bit 2 reserved and zeroed */ ++/* true: port has an over-current condition */ ++#define PORT_OC (1 << 3) ++/* true: port reset signaling asserted */ ++#define PORT_RESET (1 << 4) ++/* Port Link State - bits 5:8 ++ * A read gives the current link PM state of the port, ++ * a write with Link State Write Strobe set sets the link state. ++ */ ++#define PORT_PLS_MASK (0xf << 5) ++#define XDEV_U0 (0x0 << 5) ++#define XDEV_U1 (0x1 << 5) ++#define XDEV_U2 (0x2 << 5) ++#define XDEV_U3 (0x3 << 5) ++#define XDEV_DISABLED (0x4 << 5) ++#define XDEV_RXDETECT (0x5 << 5) ++#define XDEV_INACTIVE (0x6 << 5) ++#define XDEV_POLLING (0x7 << 5) ++#define XDEV_RECOVERY (0x8 << 5) ++#define XDEV_HOT_RESET (0x9 << 5) ++#define XDEV_COMP_MODE (0xa << 5) ++#define XDEV_TEST_MODE (0xb << 5) ++#define XDEV_RESUME (0xf << 5) ++ ++/* true: port has power (see HCC_PPC) */ ++#define PORT_POWER (1 << 9) ++/* bits 10:13 indicate device speed: ++ * 0 - undefined speed - port hasn't be initialized by a reset yet ++ * 1 - full speed ++ * 2 - low speed ++ * 3 - high speed ++ * 4 - super speed ++ * 5-15 reserved ++ */ ++#define DEV_SPEED_MASK (0xf << 10) ++#define XDEV_FS (0x1 << 10) ++#define XDEV_LS (0x2 << 10) ++#define XDEV_HS (0x3 << 10) ++#define XDEV_SS (0x4 << 10) ++#define XDEV_SSP (0x5 << 10) ++#define DEV_UNDEFSPEED(p) (((p) & DEV_SPEED_MASK) == (0x0<<10)) ++#define DEV_FULLSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_FS) ++#define DEV_LOWSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_LS) ++#define DEV_HIGHSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_HS) ++#define DEV_SUPERSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_SS) ++#define DEV_SUPERSPEEDPLUS(p) (((p) & DEV_SPEED_MASK) == XDEV_SSP) ++#define DEV_SUPERSPEED_ANY(p) (((p) & DEV_SPEED_MASK) >= XDEV_SS) ++#define DEV_PORT_SPEED(p) (((p) >> 10) & 0x0f) ++ ++/* Bits 20:23 in the Slot Context are the speed for the device */ ++#define SLOT_SPEED_FS (XDEV_FS << 10) ++#define SLOT_SPEED_LS (XDEV_LS << 10) ++#define SLOT_SPEED_HS (XDEV_HS << 10) ++#define SLOT_SPEED_SS (XDEV_SS << 10) ++#define SLOT_SPEED_SSP (XDEV_SSP << 10) ++/* Port Indicator Control */ ++#define PORT_LED_OFF (0 << 14) ++#define PORT_LED_AMBER (1 << 14) ++#define PORT_LED_GREEN (2 << 14) ++#define PORT_LED_MASK (3 << 14) ++/* Port Link State Write Strobe - set this when changing link state */ ++#define PORT_LINK_STROBE (1 << 16) ++/* true: connect status change */ ++#define PORT_CSC (1 << 17) ++/* true: port enable change */ ++#define PORT_PEC (1 << 18) ++/* true: warm reset for a USB 3.0 device is done. A "hot" reset puts the port ++ * into an enabled state, and the device into the default state. A "warm" reset ++ * also resets the link, forcing the device through the link training sequence. ++ * SW can also look at the Port Reset register to see when warm reset is done. ++ */ ++#define PORT_WRC (1 << 19) ++/* true: over-current change */ ++#define PORT_OCC (1 << 20) ++/* true: reset change - 1 to 0 transition of PORT_RESET */ ++#define PORT_RC (1 << 21) ++/* port link status change - set on some port link state transitions: ++ * Transition Reason ++ * ------------------------------------------------------------------------------ ++ * - U3 to Resume Wakeup signaling from a device ++ * - Resume to Recovery to U0 USB 3.0 device resume ++ * - Resume to U0 USB 2.0 device resume ++ * - U3 to Recovery to U0 Software resume of USB 3.0 device complete ++ * - U3 to U0 Software resume of USB 2.0 device complete ++ * - U2 to U0 L1 resume of USB 2.1 device complete ++ * - U0 to U0 (???) L1 entry rejection by USB 2.1 device ++ * - U0 to disabled L1 entry error with USB 2.1 device ++ * - Any state to inactive Error on USB 3.0 port ++ */ ++#define PORT_PLC (1 << 22) ++/* port configure error change - port failed to configure its link partner */ ++#define PORT_CEC (1 << 23) ++#define PORT_CHANGE_MASK (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \ ++ PORT_RC | PORT_PLC | PORT_CEC) ++ ++ ++/* Cold Attach Status - xHC can set this bit to report device attached during ++ * Sx state. Warm port reset should be perfomed to clear this bit and move port ++ * to connected state. ++ */ ++#define PORT_CAS (1 << 24) ++/* wake on connect (enable) */ ++#define PORT_WKCONN_E (1 << 25) ++/* wake on disconnect (enable) */ ++#define PORT_WKDISC_E (1 << 26) ++/* wake on over-current (enable) */ ++#define PORT_WKOC_E (1 << 27) ++/* bits 28:29 reserved */ ++/* true: device is non-removable - for USB 3.0 roothub emulation */ ++#define PORT_DEV_REMOVE (1 << 30) ++/* Initiate a warm port reset - complete when PORT_WRC is '1' */ ++#define PORT_WR (1 << 31) ++ ++/* We mark duplicate entries with -1 */ ++#define DUPLICATE_ENTRY ((u8)(-1)) ++ ++/* Port Power Management Status and Control - port_power_base bitmasks */ ++/* Inactivity timer value for transitions into U1, in microseconds. ++ * Timeout can be up to 127us. 0xFF means an infinite timeout. ++ */ ++#define PORT_U1_TIMEOUT(p) ((p) & 0xff) ++#define PORT_U1_TIMEOUT_MASK 0xff ++/* Inactivity timer value for transitions into U2 */ ++#define PORT_U2_TIMEOUT(p) (((p) & 0xff) << 8) ++#define PORT_U2_TIMEOUT_MASK (0xff << 8) ++/* Bits 24:31 for port testing */ ++ ++/* USB2 Protocol PORTSPMSC */ ++#define PORT_L1S_MASK 7 ++#define PORT_L1S_SUCCESS 1 ++#define PORT_RWE (1 << 3) ++#define PORT_HIRD(p) (((p) & 0xf) << 4) ++#define PORT_HIRD_MASK (0xf << 4) ++#define PORT_L1DS_MASK (0xff << 8) ++#define PORT_L1DS(p) (((p) & 0xff) << 8) ++#define PORT_HLE (1 << 16) ++#define PORT_TEST_MODE_SHIFT 28 ++ ++/* USB3 Protocol PORTLI Port Link Information */ ++#define PORT_RX_LANES(p) (((p) >> 16) & 0xf) ++#define PORT_TX_LANES(p) (((p) >> 20) & 0xf) ++ ++/* USB2 Protocol PORTHLPMC */ ++#define PORT_HIRDM(p)((p) & 3) ++#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2) ++#define PORT_BESLD(p)(((p) & 0xf) << 10) ++ ++/* use 512 microseconds as USB2 LPM L1 default timeout. */ ++#define XHCI_L1_TIMEOUT 512 ++ ++/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency. ++ * Safe to use with mixed HIRD and BESL systems (host and device) and is used ++ * by other operating systems. ++ * ++ * XHCI 1.0 errata 8/14/12 Table 13 notes: ++ * "Software should choose xHC BESL/BESLD field values that do not violate a ++ * device's resume latency requirements, ++ * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached, ++ * or not program values < '4' if BLC = '0' and a BESL device is attached. ++ */ ++#define XHCI_DEFAULT_BESL 4 ++ ++/* ++ * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports ++ * to complete link training. usually link trainig completes much faster ++ * so check status 10 times with 36ms sleep in places we need to wait for ++ * polling to complete. ++ */ ++#define XHCI_PORT_POLLING_LFPS_TIME 36 +diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h +index bd725a4adbc82..0b526edf636fe 100644 +--- a/drivers/usb/host/xhci.h ++++ b/drivers/usb/host/xhci.h +@@ -23,6 +23,9 @@ + #include "xhci-ext-caps.h" + #include "pci-quirks.h" + ++#include "xhci-port.h" ++#include "xhci-caps.h" ++ + /* max buffer size for trace and debug messages */ + #define XHCI_MSG_MAX 500 + +@@ -63,90 +66,6 @@ struct xhci_cap_regs { + /* Reserved up to (CAPLENGTH - 0x1C) */ + }; + +-/* hc_capbase bitmasks */ +-/* bits 7:0 - how long is the Capabilities register */ +-#define HC_LENGTH(p) XHCI_HC_LENGTH(p) +-/* bits 31:16 */ +-#define HC_VERSION(p) (((p) >> 16) & 0xffff) +- +-/* HCSPARAMS1 - hcs_params1 - bitmasks */ +-/* bits 0:7, Max Device Slots */ +-#define HCS_MAX_SLOTS(p) (((p) >> 0) & 0xff) +-#define HCS_SLOTS_MASK 0xff +-/* bits 8:18, Max Interrupters */ +-#define HCS_MAX_INTRS(p) (((p) >> 8) & 0x7ff) +-/* bits 24:31, Max Ports - max value is 0x7F = 127 ports */ +-#define HCS_MAX_PORTS(p) (((p) >> 24) & 0x7f) +- +-/* HCSPARAMS2 - hcs_params2 - bitmasks */ +-/* bits 0:3, frames or uframes that SW needs to queue transactions +- * ahead of the HW to meet periodic deadlines */ +-#define HCS_IST(p) (((p) >> 0) & 0xf) +-/* bits 4:7, max number of Event Ring segments */ +-#define HCS_ERST_MAX(p) (((p) >> 4) & 0xf) +-/* bits 21:25 Hi 5 bits of Scratchpad buffers SW must allocate for the HW */ +-/* bit 26 Scratchpad restore - for save/restore HW state - not used yet */ +-/* bits 27:31 Lo 5 bits of Scratchpad buffers SW must allocate for the HW */ +-#define HCS_MAX_SCRATCHPAD(p) ((((p) >> 16) & 0x3e0) | (((p) >> 27) & 0x1f)) +- +-/* HCSPARAMS3 - hcs_params3 - bitmasks */ +-/* bits 0:7, Max U1 to U0 latency for the roothub ports */ +-#define HCS_U1_LATENCY(p) (((p) >> 0) & 0xff) +-/* bits 16:31, Max U2 to U0 latency for the roothub ports */ +-#define HCS_U2_LATENCY(p) (((p) >> 16) & 0xffff) +- +-/* HCCPARAMS - hcc_params - bitmasks */ +-/* true: HC can use 64-bit address pointers */ +-#define HCC_64BIT_ADDR(p) ((p) & (1 << 0)) +-/* true: HC can do bandwidth negotiation */ +-#define HCC_BANDWIDTH_NEG(p) ((p) & (1 << 1)) +-/* true: HC uses 64-byte Device Context structures +- * FIXME 64-byte context structures aren't supported yet. +- */ +-#define HCC_64BYTE_CONTEXT(p) ((p) & (1 << 2)) +-/* true: HC has port power switches */ +-#define HCC_PPC(p) ((p) & (1 << 3)) +-/* true: HC has port indicators */ +-#define HCS_INDICATOR(p) ((p) & (1 << 4)) +-/* true: HC has Light HC Reset Capability */ +-#define HCC_LIGHT_RESET(p) ((p) & (1 << 5)) +-/* true: HC supports latency tolerance messaging */ +-#define HCC_LTC(p) ((p) & (1 << 6)) +-/* true: no secondary Stream ID Support */ +-#define HCC_NSS(p) ((p) & (1 << 7)) +-/* true: HC supports Stopped - Short Packet */ +-#define HCC_SPC(p) ((p) & (1 << 9)) +-/* true: HC has Contiguous Frame ID Capability */ +-#define HCC_CFC(p) ((p) & (1 << 11)) +-/* Max size for Primary Stream Arrays - 2^(n+1), where n is bits 12:15 */ +-#define HCC_MAX_PSA(p) (1 << ((((p) >> 12) & 0xf) + 1)) +-/* Extended Capabilities pointer from PCI base - section 5.3.6 */ +-#define HCC_EXT_CAPS(p) XHCI_HCC_EXT_CAPS(p) +- +-#define CTX_SIZE(_hcc) (HCC_64BYTE_CONTEXT(_hcc) ? 64 : 32) +- +-/* db_off bitmask - bits 0:1 reserved */ +-#define DBOFF_MASK (~0x3) +- +-/* run_regs_off bitmask - bits 0:4 reserved */ +-#define RTSOFF_MASK (~0x1f) +- +-/* HCCPARAMS2 - hcc_params2 - bitmasks */ +-/* true: HC supports U3 entry Capability */ +-#define HCC2_U3C(p) ((p) & (1 << 0)) +-/* true: HC supports Configure endpoint command Max exit latency too large */ +-#define HCC2_CMC(p) ((p) & (1 << 1)) +-/* true: HC supports Force Save context Capability */ +-#define HCC2_FSC(p) ((p) & (1 << 2)) +-/* true: HC supports Compliance Transition Capability */ +-#define HCC2_CTC(p) ((p) & (1 << 3)) +-/* true: HC support Large ESIT payload Capability > 48k */ +-#define HCC2_LEC(p) ((p) & (1 << 4)) +-/* true: HC support Configuration Information Capability */ +-#define HCC2_CIC(p) ((p) & (1 << 5)) +-/* true: HC support Extended TBC Capability, Isoc burst count > 65535 */ +-#define HCC2_ETC(p) ((p) & (1 << 6)) +- + /* Number of registers per port */ + #define NUM_PORT_REGS 4 + +@@ -292,181 +211,6 @@ struct xhci_op_regs { + #define CONFIG_CIE (1 << 9) + /* bits 10:31 - reserved and should be preserved */ + +-/* PORTSC - Port Status and Control Register - port_status_base bitmasks */ +-/* true: device connected */ +-#define PORT_CONNECT (1 << 0) +-/* true: port enabled */ +-#define PORT_PE (1 << 1) +-/* bit 2 reserved and zeroed */ +-/* true: port has an over-current condition */ +-#define PORT_OC (1 << 3) +-/* true: port reset signaling asserted */ +-#define PORT_RESET (1 << 4) +-/* Port Link State - bits 5:8 +- * A read gives the current link PM state of the port, +- * a write with Link State Write Strobe set sets the link state. +- */ +-#define PORT_PLS_MASK (0xf << 5) +-#define XDEV_U0 (0x0 << 5) +-#define XDEV_U1 (0x1 << 5) +-#define XDEV_U2 (0x2 << 5) +-#define XDEV_U3 (0x3 << 5) +-#define XDEV_DISABLED (0x4 << 5) +-#define XDEV_RXDETECT (0x5 << 5) +-#define XDEV_INACTIVE (0x6 << 5) +-#define XDEV_POLLING (0x7 << 5) +-#define XDEV_RECOVERY (0x8 << 5) +-#define XDEV_HOT_RESET (0x9 << 5) +-#define XDEV_COMP_MODE (0xa << 5) +-#define XDEV_TEST_MODE (0xb << 5) +-#define XDEV_RESUME (0xf << 5) +- +-/* true: port has power (see HCC_PPC) */ +-#define PORT_POWER (1 << 9) +-/* bits 10:13 indicate device speed: +- * 0 - undefined speed - port hasn't be initialized by a reset yet +- * 1 - full speed +- * 2 - low speed +- * 3 - high speed +- * 4 - super speed +- * 5-15 reserved +- */ +-#define DEV_SPEED_MASK (0xf << 10) +-#define XDEV_FS (0x1 << 10) +-#define XDEV_LS (0x2 << 10) +-#define XDEV_HS (0x3 << 10) +-#define XDEV_SS (0x4 << 10) +-#define XDEV_SSP (0x5 << 10) +-#define DEV_UNDEFSPEED(p) (((p) & DEV_SPEED_MASK) == (0x0<<10)) +-#define DEV_FULLSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_FS) +-#define DEV_LOWSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_LS) +-#define DEV_HIGHSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_HS) +-#define DEV_SUPERSPEED(p) (((p) & DEV_SPEED_MASK) == XDEV_SS) +-#define DEV_SUPERSPEEDPLUS(p) (((p) & DEV_SPEED_MASK) == XDEV_SSP) +-#define DEV_SUPERSPEED_ANY(p) (((p) & DEV_SPEED_MASK) >= XDEV_SS) +-#define DEV_PORT_SPEED(p) (((p) >> 10) & 0x0f) +- +-/* Bits 20:23 in the Slot Context are the speed for the device */ +-#define SLOT_SPEED_FS (XDEV_FS << 10) +-#define SLOT_SPEED_LS (XDEV_LS << 10) +-#define SLOT_SPEED_HS (XDEV_HS << 10) +-#define SLOT_SPEED_SS (XDEV_SS << 10) +-#define SLOT_SPEED_SSP (XDEV_SSP << 10) +-/* Port Indicator Control */ +-#define PORT_LED_OFF (0 << 14) +-#define PORT_LED_AMBER (1 << 14) +-#define PORT_LED_GREEN (2 << 14) +-#define PORT_LED_MASK (3 << 14) +-/* Port Link State Write Strobe - set this when changing link state */ +-#define PORT_LINK_STROBE (1 << 16) +-/* true: connect status change */ +-#define PORT_CSC (1 << 17) +-/* true: port enable change */ +-#define PORT_PEC (1 << 18) +-/* true: warm reset for a USB 3.0 device is done. A "hot" reset puts the port +- * into an enabled state, and the device into the default state. A "warm" reset +- * also resets the link, forcing the device through the link training sequence. +- * SW can also look at the Port Reset register to see when warm reset is done. +- */ +-#define PORT_WRC (1 << 19) +-/* true: over-current change */ +-#define PORT_OCC (1 << 20) +-/* true: reset change - 1 to 0 transition of PORT_RESET */ +-#define PORT_RC (1 << 21) +-/* port link status change - set on some port link state transitions: +- * Transition Reason +- * ------------------------------------------------------------------------------ +- * - U3 to Resume Wakeup signaling from a device +- * - Resume to Recovery to U0 USB 3.0 device resume +- * - Resume to U0 USB 2.0 device resume +- * - U3 to Recovery to U0 Software resume of USB 3.0 device complete +- * - U3 to U0 Software resume of USB 2.0 device complete +- * - U2 to U0 L1 resume of USB 2.1 device complete +- * - U0 to U0 (???) L1 entry rejection by USB 2.1 device +- * - U0 to disabled L1 entry error with USB 2.1 device +- * - Any state to inactive Error on USB 3.0 port +- */ +-#define PORT_PLC (1 << 22) +-/* port configure error change - port failed to configure its link partner */ +-#define PORT_CEC (1 << 23) +-#define PORT_CHANGE_MASK (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \ +- PORT_RC | PORT_PLC | PORT_CEC) +- +- +-/* Cold Attach Status - xHC can set this bit to report device attached during +- * Sx state. Warm port reset should be perfomed to clear this bit and move port +- * to connected state. +- */ +-#define PORT_CAS (1 << 24) +-/* wake on connect (enable) */ +-#define PORT_WKCONN_E (1 << 25) +-/* wake on disconnect (enable) */ +-#define PORT_WKDISC_E (1 << 26) +-/* wake on over-current (enable) */ +-#define PORT_WKOC_E (1 << 27) +-/* bits 28:29 reserved */ +-/* true: device is non-removable - for USB 3.0 roothub emulation */ +-#define PORT_DEV_REMOVE (1 << 30) +-/* Initiate a warm port reset - complete when PORT_WRC is '1' */ +-#define PORT_WR (1 << 31) +- +-/* We mark duplicate entries with -1 */ +-#define DUPLICATE_ENTRY ((u8)(-1)) +- +-/* Port Power Management Status and Control - port_power_base bitmasks */ +-/* Inactivity timer value for transitions into U1, in microseconds. +- * Timeout can be up to 127us. 0xFF means an infinite timeout. +- */ +-#define PORT_U1_TIMEOUT(p) ((p) & 0xff) +-#define PORT_U1_TIMEOUT_MASK 0xff +-/* Inactivity timer value for transitions into U2 */ +-#define PORT_U2_TIMEOUT(p) (((p) & 0xff) << 8) +-#define PORT_U2_TIMEOUT_MASK (0xff << 8) +-/* Bits 24:31 for port testing */ +- +-/* USB2 Protocol PORTSPMSC */ +-#define PORT_L1S_MASK 7 +-#define PORT_L1S_SUCCESS 1 +-#define PORT_RWE (1 << 3) +-#define PORT_HIRD(p) (((p) & 0xf) << 4) +-#define PORT_HIRD_MASK (0xf << 4) +-#define PORT_L1DS_MASK (0xff << 8) +-#define PORT_L1DS(p) (((p) & 0xff) << 8) +-#define PORT_HLE (1 << 16) +-#define PORT_TEST_MODE_SHIFT 28 +- +-/* USB3 Protocol PORTLI Port Link Information */ +-#define PORT_RX_LANES(p) (((p) >> 16) & 0xf) +-#define PORT_TX_LANES(p) (((p) >> 20) & 0xf) +- +-/* USB2 Protocol PORTHLPMC */ +-#define PORT_HIRDM(p)((p) & 3) +-#define PORT_L1_TIMEOUT(p)(((p) & 0xff) << 2) +-#define PORT_BESLD(p)(((p) & 0xf) << 10) +- +-/* use 512 microseconds as USB2 LPM L1 default timeout. */ +-#define XHCI_L1_TIMEOUT 512 +- +-/* Set default HIRD/BESL value to 4 (350/400us) for USB2 L1 LPM resume latency. +- * Safe to use with mixed HIRD and BESL systems (host and device) and is used +- * by other operating systems. +- * +- * XHCI 1.0 errata 8/14/12 Table 13 notes: +- * "Software should choose xHC BESL/BESLD field values that do not violate a +- * device's resume latency requirements, +- * e.g. not program values > '4' if BLC = '1' and a HIRD device is attached, +- * or not program values < '4' if BLC = '0' and a BESL device is attached. +- */ +-#define XHCI_DEFAULT_BESL 4 +- +-/* +- * USB3 specification define a 360ms tPollingLFPSTiemout for USB3 ports +- * to complete link training. usually link trainig completes much faster +- * so check status 10 times with 36ms sleep in places we need to wait for +- * polling to complete. +- */ +-#define XHCI_PORT_POLLING_LFPS_TIME 36 +- + /** + * struct xhci_intr_reg - Interrupt Register Set + * @irq_pending: IMAN - Interrupt Management Register. Used to enable +-- +2.43.0 +