From: Sasha Levin Date: Tue, 3 Oct 2023 00:58:37 +0000 (-0400) Subject: Fixes for 4.19 X-Git-Tag: v6.5.6~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b321e84719cf3bb9d850288b8d546fea6f83854;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch b/queue-4.19/ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch new file mode 100644 index 00000000000..e8af8f9a394 --- /dev/null +++ b/queue-4.19/ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch @@ -0,0 +1,123 @@ +From f8f6be95b747509428e9a733d22dc0012149e230 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Sep 2023 00:19:16 +0200 +Subject: ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() + +From: Niklas Cassel + +[ Upstream commit 80cc944eca4f0baa9c381d0706f3160e491437f2 ] + +ata_scsi_port_error_handler() starts off by clearing ATA_PFLAG_EH_PENDING, +before calling ap->ops->error_handler() (without holding the ap->lock). + +If an error IRQ is received while ap->ops->error_handler() is running, +the irq handler will set ATA_PFLAG_EH_PENDING. + +Once ap->ops->error_handler() returns, ata_scsi_port_error_handler() +checks if ATA_PFLAG_EH_PENDING is set, and if it is, another iteration +of ATA EH is performed. + +The problem is that ATA_PFLAG_EH_PENDING is not only cleared by +ata_scsi_port_error_handler(), it is also cleared by ata_eh_reset(). + +ata_eh_reset() is called by ap->ops->error_handler(). This additional +clearing done by ata_eh_reset() breaks the whole retry logic in +ata_scsi_port_error_handler(). Thus, if an error IRQ is received while +ap->ops->error_handler() is running, the port will currently remain +frozen and will never get re-enabled. + +The additional clearing in ata_eh_reset() was introduced in commit +1e641060c4b5 ("libata: clear eh_info on reset completion"). + +Looking at the original error report: +https://marc.info/?l=linux-ide&m=124765325828495&w=2 + +We can see the following happening: +[ 1.074659] ata3: XXX port freeze +[ 1.074700] ata3: XXX hardresetting link, stopping engine +[ 1.074746] ata3: XXX flipping SControl + +[ 1.411471] ata3: XXX irq_stat=400040 CONN|PHY +[ 1.411475] ata3: XXX port freeze + +[ 1.420049] ata3: XXX starting engine +[ 1.420096] ata3: XXX rc=0, class=1 +[ 1.420142] ata3: XXX clearing IRQs for thawing +[ 1.420188] ata3: XXX port thawed +[ 1.420234] ata3: SATA link up 3.0 Gbps (SStatus 123 SControl 300) + +We are not supposed to be able to receive an error IRQ while the port is +frozen (PxIE is set to 0, i.e. all IRQs for the port are disabled). + +AHCI 1.3.1 section 10.7.1.1 First Tier (IS Register) states: +"Each bit location can be thought of as reporting a '1' if the virtual +"interrupt line" for that port is indicating it wishes to generate an +interrupt. That is, if a port has one or more interrupt status bit set, +and the enables for those status bits are set, then this bit shall be set." + +Additionally, AHCI state P:ComInit clearly shows that the state machine +will only jump to P:ComInitSetIS (which sets IS.IPS(x) to '1'), if PxIE.PCE +is set to '1'. In our case, PxIE is set to 0, so IS.IPS(x) won't get set. + +So IS.IPS(x) only gets set if PxIS and PxIE is set. + +AHCI 1.3.1 section 10.7.1.1 First Tier (IS Register) also states: +"The bits in this register are read/write clear. It is set by the level of +the virtual interrupt line being a set, and cleared by a write of '1' from +the software." + +So if IS.IPS(x) is set, you need to explicitly clear it by writing a 1 to +IS.IPS(x) for that port. + +Since PxIE is cleared, the only way to get an interrupt while the port is +frozen, is if IS.IPS(x) is set, and the only way IS.IPS(x) can be set when +the port is frozen, is if it was set before the port was frozen. + +However, since commit 737dd811a3db ("ata: libahci: clear pending interrupt +status"), we clear both PxIS and IS.IPS(x) after freezing the port, but +before the COMRESET, so the problem that commit 1e641060c4b5 ("libata: +clear eh_info on reset completion") fixed can no longer happen. + +Thus, revert commit 1e641060c4b5 ("libata: clear eh_info on reset +completion"), so that the retry logic in ata_scsi_port_error_handler() +works once again. (The retry logic is still needed, since we can still +get an error IRQ _after_ the port has been thawed, but before +ata_scsi_port_error_handler() takes the ap->lock in order to check +if ATA_PFLAG_EH_PENDING is set.) + +Signed-off-by: Niklas Cassel +Signed-off-by: Damien Le Moal +Signed-off-by: Sasha Levin +--- + drivers/ata/libata-eh.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c +index fcc3d7985762a..73a4dd37d04ae 100644 +--- a/drivers/ata/libata-eh.c ++++ b/drivers/ata/libata-eh.c +@@ -2922,18 +2922,11 @@ int ata_eh_reset(struct ata_link *link, int classify, + postreset(slave, classes); + } + +- /* +- * Some controllers can't be frozen very well and may set spurious +- * error conditions during reset. Clear accumulated error +- * information and re-thaw the port if frozen. As reset is the +- * final recovery action and we cross check link onlineness against +- * device classification later, no hotplug event is lost by this. +- */ ++ /* clear cached SError */ + spin_lock_irqsave(link->ap->lock, flags); +- memset(&link->eh_info, 0, sizeof(link->eh_info)); ++ link->eh_info.serror = 0; + if (slave) +- memset(&slave->eh_info, 0, sizeof(link->eh_info)); +- ap->pflags &= ~ATA_PFLAG_EH_PENDING; ++ slave->eh_info.serror = 0; + spin_unlock_irqrestore(link->ap->lock, flags); + + if (ap->pflags & ATA_PFLAG_FROZEN) +-- +2.40.1 + diff --git a/queue-4.19/bpf-clarify-error-expectations-from-bpf_clone_redire.patch b/queue-4.19/bpf-clarify-error-expectations-from-bpf_clone_redire.patch new file mode 100644 index 00000000000..b606f7bb930 --- /dev/null +++ b/queue-4.19/bpf-clarify-error-expectations-from-bpf_clone_redire.patch @@ -0,0 +1,63 @@ +From 0668e6082eff2a8c141ab8c12c8cea0201def25e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 11 Sep 2023 12:47:30 -0700 +Subject: bpf: Clarify error expectations from bpf_clone_redirect + +From: Stanislav Fomichev + +[ Upstream commit 7cb779a6867fea00b4209bcf6de2f178a743247d ] + +Commit 151e887d8ff9 ("veth: Fixing transmit return status for dropped +packets") exposed the fact that bpf_clone_redirect is capable of +returning raw NET_XMIT_XXX return codes. + +This is in the conflict with its UAPI doc which says the following: +"0 on success, or a negative error in case of failure." + +Update the UAPI to reflect the fact that bpf_clone_redirect can +return positive error numbers, but don't explicitly define +their meaning. + +Reported-by: Daniel Borkmann +Signed-off-by: Stanislav Fomichev +Signed-off-by: Daniel Borkmann +Link: https://lore.kernel.org/bpf/20230911194731.286342-1-sdf@google.com +Signed-off-by: Sasha Levin +--- + include/uapi/linux/bpf.h | 4 +++- + tools/include/uapi/linux/bpf.h | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h +index 6334aede67fc2..91c43f3756123 100644 +--- a/include/uapi/linux/bpf.h ++++ b/include/uapi/linux/bpf.h +@@ -693,7 +693,9 @@ union bpf_attr { + * performed again, if the helper is used in combination with + * direct packet access. + * Return +- * 0 on success, or a negative error in case of failure. ++ * 0 on success, or a negative error in case of failure. Positive ++ * error indicates a potential drop or congestion in the target ++ * device. The particular positive error codes are not defined. + * + * u64 bpf_get_current_pid_tgid(void) + * Return +diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h +index 0c30ab898e2a5..37259bae15010 100644 +--- a/tools/include/uapi/linux/bpf.h ++++ b/tools/include/uapi/linux/bpf.h +@@ -691,7 +691,9 @@ union bpf_attr { + * performed again, if the helper is used in combination with + * direct packet access. + * Return +- * 0 on success, or a negative error in case of failure. ++ * 0 on success, or a negative error in case of failure. Positive ++ * error indicates a potential drop or congestion in the target ++ * device. The particular positive error codes are not defined. + * + * u64 bpf_get_current_pid_tgid(void) + * Return +-- +2.40.1 + diff --git a/queue-4.19/fbdev-sh7760fb-depend-on-fb-y.patch b/queue-4.19/fbdev-sh7760fb-depend-on-fb-y.patch new file mode 100644 index 00000000000..329f0a5061c --- /dev/null +++ b/queue-4.19/fbdev-sh7760fb-depend-on-fb-y.patch @@ -0,0 +1,60 @@ +From 9d897a020b31252d40b4d44b2575fa901cb34825 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Sep 2023 11:03:49 +0200 +Subject: fbdev/sh7760fb: Depend on FB=y + +From: Thomas Zimmermann + +[ Upstream commit f75f71b2c418a27a7c05139bb27a0c83adf88d19 ] + +Fix linker error if FB=m about missing fb_io_read and fb_io_write. The +linker's error message suggests that this config setting has already +been broken for other symbols. + + All errors (new ones prefixed by >>): + + sh4-linux-ld: drivers/video/fbdev/sh7760fb.o: in function `sh7760fb_probe': + sh7760fb.c:(.text+0x374): undefined reference to `framebuffer_alloc' + sh4-linux-ld: sh7760fb.c:(.text+0x394): undefined reference to `fb_videomode_to_var' + sh4-linux-ld: sh7760fb.c:(.text+0x39c): undefined reference to `fb_alloc_cmap' + sh4-linux-ld: sh7760fb.c:(.text+0x3a4): undefined reference to `register_framebuffer' + sh4-linux-ld: sh7760fb.c:(.text+0x3ac): undefined reference to `fb_dealloc_cmap' + sh4-linux-ld: sh7760fb.c:(.text+0x434): undefined reference to `framebuffer_release' + sh4-linux-ld: drivers/video/fbdev/sh7760fb.o: in function `sh7760fb_remove': + sh7760fb.c:(.text+0x800): undefined reference to `unregister_framebuffer' + sh4-linux-ld: sh7760fb.c:(.text+0x804): undefined reference to `fb_dealloc_cmap' + sh4-linux-ld: sh7760fb.c:(.text+0x814): undefined reference to `framebuffer_release' + >> sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0xc): undefined reference to `fb_io_read' + >> sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x10): undefined reference to `fb_io_write' + sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x2c): undefined reference to `cfb_fillrect' + sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x30): undefined reference to `cfb_copyarea' + sh4-linux-ld: drivers/video/fbdev/sh7760fb.o:(.rodata+0x34): undefined reference to `cfb_imageblit' + +Suggested-by: Randy Dunlap +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202309130632.LS04CPWu-lkp@intel.com/ +Signed-off-by: Thomas Zimmermann +Reviewed-by: Javier Martinez Canillas +Acked-by: John Paul Adrian Glaubitz +Link: https://patchwork.freedesktop.org/patch/msgid/20230918090400.13264-1-tzimmermann@suse.de +Signed-off-by: Sasha Levin +--- + drivers/video/fbdev/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig +index afb0c9e4d7382..8e224ee27ade9 100644 +--- a/drivers/video/fbdev/Kconfig ++++ b/drivers/video/fbdev/Kconfig +@@ -2085,7 +2085,7 @@ config FB_COBALT + + config FB_SH7760 + bool "SH7760/SH7763/SH7720/SH7721 LCDC support" +- depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ ++ depends on FB=y && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763 \ + || CPU_SUBTYPE_SH7720 || CPU_SUBTYPE_SH7721) + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA +-- +2.40.1 + diff --git a/queue-4.19/parisc-drivers-fix-sparse-warning.patch b/queue-4.19/parisc-drivers-fix-sparse-warning.patch new file mode 100644 index 00000000000..0bb289f3fe0 --- /dev/null +++ b/queue-4.19/parisc-drivers-fix-sparse-warning.patch @@ -0,0 +1,35 @@ +From f70487e1e5983f0c8966ad8db1c9b18502e4fb85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 31 Aug 2023 22:08:32 +0200 +Subject: parisc: drivers: Fix sparse warning + +From: Helge Deller + +[ Upstream commit b137b9d60b8add5620a06c687a71ce18776730b0 ] + +Fix "warning: directive in macro's argument list" warning. + +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + arch/parisc/kernel/drivers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c +index 01a2ed59d2f2a..94037c8512f78 100644 +--- a/arch/parisc/kernel/drivers.c ++++ b/arch/parisc/kernel/drivers.c +@@ -903,9 +903,9 @@ static __init void qemu_header(void) + pr_info("#define PARISC_MODEL \"%s\"\n\n", + boot_cpu_data.pdc.sys_model_name); + ++ #define p ((unsigned long *)&boot_cpu_data.pdc.model) + pr_info("#define PARISC_PDC_MODEL 0x%lx, 0x%lx, 0x%lx, " + "0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx\n\n", +- #define p ((unsigned long *)&boot_cpu_data.pdc.model) + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8]); + #undef p + +-- +2.40.1 + diff --git a/queue-4.19/parisc-iosapic.c-fix-sparse-warnings.patch b/queue-4.19/parisc-iosapic.c-fix-sparse-warnings.patch new file mode 100644 index 00000000000..0e63bc251dd --- /dev/null +++ b/queue-4.19/parisc-iosapic.c-fix-sparse-warnings.patch @@ -0,0 +1,50 @@ +From b642bf91869ab4ca0e1765882d2ce6d5220cd209 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Aug 2023 11:59:55 +0200 +Subject: parisc: iosapic.c: Fix sparse warnings + +From: Helge Deller + +[ Upstream commit 927c6c8aa27c284a799b8c18784e37d3373af908 ] + +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + drivers/parisc/iosapic.c | 4 ++-- + drivers/parisc/iosapic_private.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c +index eb9137faccf74..4cc08d13b82fa 100644 +--- a/drivers/parisc/iosapic.c ++++ b/drivers/parisc/iosapic.c +@@ -216,9 +216,9 @@ static inline void iosapic_write(void __iomem *iosapic, unsigned int reg, u32 va + + static DEFINE_SPINLOCK(iosapic_lock); + +-static inline void iosapic_eoi(void __iomem *addr, unsigned int data) ++static inline void iosapic_eoi(__le32 __iomem *addr, __le32 data) + { +- __raw_writel(data, addr); ++ __raw_writel((__force u32)data, addr); + } + + /* +diff --git a/drivers/parisc/iosapic_private.h b/drivers/parisc/iosapic_private.h +index 6e05e30a2450a..7a928c03d5201 100644 +--- a/drivers/parisc/iosapic_private.h ++++ b/drivers/parisc/iosapic_private.h +@@ -132,8 +132,8 @@ struct iosapic_irt { + struct vector_info { + struct iosapic_info *iosapic; /* I/O SAPIC this vector is on */ + struct irt_entry *irte; /* IRT entry */ +- u32 __iomem *eoi_addr; /* precalculate EOI reg address */ +- u32 eoi_data; /* IA64: ? PA: swapped txn_data */ ++ __le32 __iomem *eoi_addr; /* precalculate EOI reg address */ ++ __le32 eoi_data; /* IA64: ? PA: swapped txn_data */ + int txn_irq; /* virtual IRQ number for processor */ + ulong txn_addr; /* IA64: id_eid PA: partial HPA */ + u32 txn_data; /* CPU interrupt bit */ +-- +2.40.1 + diff --git a/queue-4.19/parisc-irq-make-irq_stack_union-static-to-avoid-spar.patch b/queue-4.19/parisc-irq-make-irq_stack_union-static-to-avoid-spar.patch new file mode 100644 index 00000000000..a82f6617288 --- /dev/null +++ b/queue-4.19/parisc-irq-make-irq_stack_union-static-to-avoid-spar.patch @@ -0,0 +1,31 @@ +From ac2484aac05f62b46e7fc422713cbc71dc386efb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 31 Aug 2023 22:36:12 +0200 +Subject: parisc: irq: Make irq_stack_union static to avoid sparse warning + +From: Helge Deller + +[ Upstream commit b1bef1388c427cdad7331a9c8eb4ebbbe5b954b0 ] + +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + arch/parisc/kernel/irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c +index c152c30c2d06d..11c1505775f87 100644 +--- a/arch/parisc/kernel/irq.c ++++ b/arch/parisc/kernel/irq.c +@@ -392,7 +392,7 @@ union irq_stack_union { + volatile unsigned int lock[1]; + }; + +-DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { ++static DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { + .slock = { 1,1,1,1 }, + }; + #endif +-- +2.40.1 + diff --git a/queue-4.19/parisc-sba-fix-compile-warning-wrt-list-of-sba-devic.patch b/queue-4.19/parisc-sba-fix-compile-warning-wrt-list-of-sba-devic.patch new file mode 100644 index 00000000000..8987835e3a8 --- /dev/null +++ b/queue-4.19/parisc-sba-fix-compile-warning-wrt-list-of-sba-devic.patch @@ -0,0 +1,50 @@ +From 5fd81d7d01bce1cbbb908672a28fc91968934486 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 30 Aug 2023 08:10:01 +0200 +Subject: parisc: sba: Fix compile warning wrt list of SBA devices + +From: Helge Deller + +[ Upstream commit eb3255ee8f6f4691471a28fbf22db5e8901116cd ] + +Fix this makecheck warning: +drivers/parisc/sba_iommu.c:98:19: warning: symbol 'sba_list' + was not declared. Should it be static? + +Signed-off-by: Helge Deller +Signed-off-by: Sasha Levin +--- + arch/parisc/include/asm/ropes.h | 3 +++ + drivers/char/agp/parisc-agp.c | 2 -- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/arch/parisc/include/asm/ropes.h b/arch/parisc/include/asm/ropes.h +index 8e51c775c80a6..62399c7ea94a1 100644 +--- a/arch/parisc/include/asm/ropes.h ++++ b/arch/parisc/include/asm/ropes.h +@@ -86,6 +86,9 @@ struct sba_device { + struct ioc ioc[MAX_IOC]; + }; + ++/* list of SBA's in system, see drivers/parisc/sba_iommu.c */ ++extern struct sba_device *sba_list; ++ + #define ASTRO_RUNWAY_PORT 0x582 + #define IKE_MERCED_PORT 0x803 + #define REO_MERCED_PORT 0x804 +diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c +index 1d5510cb6db4e..1962ff624b7c5 100644 +--- a/drivers/char/agp/parisc-agp.c ++++ b/drivers/char/agp/parisc-agp.c +@@ -385,8 +385,6 @@ find_quicksilver(struct device *dev, void *data) + static int __init + parisc_agp_init(void) + { +- extern struct sba_device *sba_list; +- + int err = -1; + struct parisc_device *sba = NULL, *lba = NULL; + struct lba_device *lbadev = NULL; +-- +2.40.1 + diff --git a/queue-4.19/ring-buffer-avoid-softlockup-in-ring_buffer_resize.patch b/queue-4.19/ring-buffer-avoid-softlockup-in-ring_buffer_resize.patch new file mode 100644 index 00000000000..36383d1fa95 --- /dev/null +++ b/queue-4.19/ring-buffer-avoid-softlockup-in-ring_buffer_resize.patch @@ -0,0 +1,45 @@ +From 67a9d49deb99aeffe1e29a94e9934ea205afe9b5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Sep 2023 16:19:30 +0800 +Subject: ring-buffer: Avoid softlockup in ring_buffer_resize() + +From: Zheng Yejian + +[ Upstream commit f6bd2c92488c30ef53b5bd80c52f0a7eee9d545a ] + +When user resize all trace ring buffer through file 'buffer_size_kb', +then in ring_buffer_resize(), kernel allocates buffer pages for each +cpu in a loop. + +If the kernel preemption model is PREEMPT_NONE and there are many cpus +and there are many buffer pages to be allocated, it may not give up cpu +for a long time and finally cause a softlockup. + +To avoid it, call cond_resched() after each cpu buffer allocation. + +Link: https://lore.kernel.org/linux-trace-kernel/20230906081930.3939106-1-zhengyejian1@huawei.com + +Cc: +Signed-off-by: Zheng Yejian +Signed-off-by: Steven Rostedt (Google) +Signed-off-by: Sasha Levin +--- + kernel/trace/ring_buffer.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c +index c8a7de7a1d635..320aa60664dc9 100644 +--- a/kernel/trace/ring_buffer.c ++++ b/kernel/trace/ring_buffer.c +@@ -1753,6 +1753,8 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size, + err = -ENOMEM; + goto out_err; + } ++ ++ cond_resched(); + } + + get_online_cpus(); +-- +2.40.1 + diff --git a/queue-4.19/selftests-ftrace-correctly-enable-event-in-instance-.patch b/queue-4.19/selftests-ftrace-correctly-enable-event-in-instance-.patch new file mode 100644 index 00000000000..14b1f960c1a --- /dev/null +++ b/queue-4.19/selftests-ftrace-correctly-enable-event-in-instance-.patch @@ -0,0 +1,51 @@ +From fd97843af3ae2be15fb2c99a22eff67bb89fe562 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Jun 2023 08:11:44 +0800 +Subject: selftests/ftrace: Correctly enable event in instance-event.tc + +From: Zheng Yejian + +[ Upstream commit f4e4ada586995b17f828c6d147d1800eb1471450 ] + +Function instance_set() expects to enable event 'sched_switch', so we +should set 1 to its 'enable' file. + +Testcase passed after this patch: + # ./ftracetest test.d/instances/instance-event.tc + === Ftrace unit tests === + [1] Test creation and deletion of trace instances while setting an event + [PASS] + + # of passed: 1 + # of failed: 0 + # of unresolved: 0 + # of untested: 0 + # of unsupported: 0 + # of xfailed: 0 + # of undefined(test bug): 0 + +Signed-off-by: Zheng Yejian +Acked-by: Masami Hiramatsu (Google) +Acked-by: Steven Rostedt (Google) +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + .../testing/selftests/ftrace/test.d/instances/instance-event.tc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc b/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +index 4fa0f79144f4a..9473934a573a1 100644 +--- a/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc ++++ b/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +@@ -43,7 +43,7 @@ instance_read() { + + instance_set() { + while :; do +- echo 1 > foo/events/sched/sched_switch ++ echo 1 > foo/events/sched/sched_switch/enable + done 2> /dev/null + } + +-- +2.40.1 + diff --git a/queue-4.19/series b/queue-4.19/series index ed1f7a8d4d2..b9628140d43 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -33,3 +33,12 @@ mips-alchemy-only-build-mmc-support-helpers-if-au1xm.patch clk-tegra-fix-error-return-case-for-recalc_rate.patch arm-dts-ti-omap-motorola-mapphone-fix-abe_clkctrl-wa.patch gpio-pmic-eic-sprd-add-can_sleep-flag-for-pmic-eic-c.patch +parisc-sba-fix-compile-warning-wrt-list-of-sba-devic.patch +parisc-iosapic.c-fix-sparse-warnings.patch +parisc-drivers-fix-sparse-warning.patch +parisc-irq-make-irq_stack_union-static-to-avoid-spar.patch +selftests-ftrace-correctly-enable-event-in-instance-.patch +ring-buffer-avoid-softlockup-in-ring_buffer_resize.patch +ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch +bpf-clarify-error-expectations-from-bpf_clone_redire.patch +fbdev-sh7760fb-depend-on-fb-y.patch