5.19.7-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 12/72 USB: gadget: Fix use-after-free Read in usb_udc_uevent()
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 2191c00855b03aa59c20e698be713d952d51fc18 upstream.
The syzbot fuzzer found a race between uevent callbacks and gadget driver unregistration that can cause a use-after-free bug:
---------------------------------------------------------------
BUG: KASAN: use-after-free in usb_udc_uevent+0x11f/0x130 drivers/usb/gadget/udc/core.c:1732 Read of size 8 at addr ffff888078ce2050 by task udevd/2968 CPU: 1 PID: 2968 Comm: udevd Not tainted 5.19.0-rc4-next-20220628-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/29/2022 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:317 [inline] print_report.cold+0x2ba/0x719 mm/kasan/report.c:433 kasan_report+0xbe/0x1f0 mm/kasan/report.c:495 usb_udc_uevent+0x11f/0x130 drivers/usb/gadget/udc/core.c:1732 dev_uevent+0x290/0x770 drivers/base/core.c:2424 ---------------------------------------------------------------
The bug occurs because usb_udc_uevent() dereferences udc->driver but does so without acquiring the udc_lock mutex, which protects this field. If the gadget driver is unbound from the udc concurrently with uevent processing, the driver structure may be accessed after it has been deallocated.
To prevent the race, we make sure that the routine holds the mutex around the racing accesses.
--- drivers/usb/gadget/udc/core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/usb/gadget/udc/core.c +6 -5
@@ -1728,13 +1728,14 @@ static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env)return ret; } -if (udc->driver) { +mutex_lock (&udc_lock); +if (udc->driver) ret =add_uevent_var (env,"USB_UDC_DRIVER=%s" , udc->driver->function); -if (ret) { -dev_err (dev,"failed to add uevent USB_UDC_DRIVER\n" ); -return ret; - } +mutex_unlock (&udc_lock); +if (ret) { +dev_err (dev,"failed to add uevent USB_UDC_DRIVER\n" ); +return ret; }return 0 ;
Signature · 1 line
2.37.2
Greg Kroah-Hartman
maintainerPATCH 35/72 rtla: Fix tracer name
In reply to Greg Kroah-HartmanFrom: Alexandre Vicenzi <[email protected]>
[ Upstream commit f1432cd24c240cedf78c0d026631e3b10052c8e1 ]
The correct tracer name is timerlat and not timelat.
--- Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 +- tools/tracing/rtla/src/timerlat_hist.c | 2 +- tools/tracing/rtla/src/timerlat_top.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Documentation/tools/rtla/rtla-timerlat-hist.rst +1 -1
@@ -33,7 +33,7 @@ EXAMPLE ======= In the example below, **rtla timerlat hist** is set to run for *10* minutes, in the cpus *0-4*, *skipping zero* only lines. Moreover, **rtla timerlat -hist** will change the priority of the *timelat* threads to run under +hist** will change the priority of the *timerlat* threads to run under *SCHED_DEADLINE* priority, with a *10us* runtime every *1ms* period. The *1ms* period is also passed to the *timerlat* tracer::
tools/tracing/rtla/src/timerlat_hist.c +1 -1
@@ -892,7 +892,7 @@ int timerlat_hist_main(int argc, char *argv[]) return_value =0 ;if (trace_is_off (&tool->trace, &record->trace)) { -printf ("rtla timelat hit stop tracing\n" ); +printf ("rtla timerlat hit stop tracing\n" );if (params->trace_output) {printf (" Saving trace to %s\n" , params->trace_output);save_trace_to_file (record->trace.inst, params->trace_output);
tools/tracing/rtla/src/timerlat_top.c +1 -1
@@ -687,7 +687,7 @@ int timerlat_top_main(int argc, char *argv[]) return_value =0 ;if (trace_is_off (&top->trace, &record->trace)) { -printf ("rtla timelat hit stop tracing\n" ); +printf ("rtla timerlat hit stop tracing\n" );if (params->trace_output) {printf (" Saving trace to %s\n" , params->trace_output);save_trace_to_file (record->trace.inst, params->trace_output);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 10/72 udmabuf: Set the DMA mask for the udmabuf device (v2)
In reply to Greg Kroah-HartmanFrom: Vivek Kasireddy <[email protected]>
commit 9e9fa6a9198b767b00f48160800128e83a038f9f upstream.
If the DMA mask is not set explicitly, the following warning occurs when the userspace tries to access the dma-buf via the CPU as reported by syzbot here:
WARNING: CPU: 1 PID: 3595 at kernel/dma/mapping.c:188 __dma_map_sg_attrs+0x181/0x1f0 kernel/dma/mapping.c:188 Modules linked in: CPU: 0 PID: 3595 Comm: syz-executor249 Not tainted 5.17.0-rc2-syzkaller-00316-g0457e5153e0e #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__dma_map_sg_attrs+0x181/0x1f0 kernel/dma/mapping.c:188 Code: 00 00 00 00 00 fc ff df 48 c1 e8 03 80 3c 10 00 75 71 4c 8b 3d c0 83 b5 0d e9 db fe ff ff e8 b6 0f 13 00 0f 0b e8 af 0f 13 00 <0f> 0b 45 31 e4 e9 54 ff ff ff e8 a0 0f 13 00 49 8d 7f 50 48 b8 00 RSP: 0018:ffffc90002a07d68 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff88807e25e2c0 RSI: ffffffff81649e91 RDI: ffff88801b848408 RBP: ffff88801b848000 R08: 0000000000000002 R09: ffff88801d86c74f R10: ffffffff81649d72 R11: 0000000000000001 R12: 0000000000000002 R13: ffff88801d86c680 R14: 0000000000000001 R15: 0000000000000000 FS: 0000555556e30300(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000200000cc CR3: 000000001d74a000 CR4: 00000000003506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> dma_map_sgtable+0x70/0xf0 kernel/dma/mapping.c:264 get_sg_table.isra.0+0xe0/0x160 drivers/dma-buf/udmabuf.c:72 begin_cpu_udmabuf+0x130/0x1d0 drivers/dma-buf/udmabuf.c:126 dma_buf_begin_cpu_access+0xfd/0x1d0 drivers/dma-buf/dma-buf.c:1164 dma_buf_ioctl+0x259/0x2b0 drivers/dma-buf/dma-buf.c:363 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:874 [inline] __se_sys_ioctl fs/ioctl.c:860 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:860 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f62fcf530f9 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89
f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007ffe3edab9b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f62fcf530f9
RDX: 0000000020000200 RSI: 0000000040086200 RDI: 0000000000000006
RBP: 00007f62fcf170e0 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f62fcf17170
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
</TASK>
v2: Dont't forget to deregister if DMA mask setup fails.
--- drivers/dma-buf/udmabuf.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/dma-buf/udmabuf.c +17 -1
@@ -368,7 +368,23 @@ static struct miscdevice udmabuf_misc =static int __init udmabuf_dev_init (void ) { -return misc_register (&udmabuf_misc); +int ret; + + ret =misc_register (&udmabuf_misc); +if (ret <0 ) { +pr_err ("Could not initialize udmabuf device\n" ); +return ret; + } + + ret =dma_coerce_mask_and_coherent (udmabuf_misc.this_device, +DMA_BIT_MASK (64 )); +if (ret <0 ) { +pr_err ("Could not setup DMA mask for udmabuf device\n" ); +misc_deregister (&udmabuf_misc); +return ret; + } + +return 0 ; } static void __exit udmabuf_dev_exit(void)
Greg Kroah-Hartman
maintainerPATCH 24/72 HID: asus: ROG NKey: Ignore portion of 0x5a report
In reply to Greg Kroah-HartmanFrom: Josh Kilmer <[email protected]>
commit 1c0cc9d11c665020cbeb80e660fb8929164407f4 upstream.
On an Asus G513QY, of the 5 bytes in a 0x5a report, only the first byte is a meaningful keycode. The other bytes are zeroed out or hold garbage from the last packet sent to the keyboard.
This patch fixes up the report descriptor for this event so that the general hid code will only process 1 byte for keycodes, avoiding spurious key events and unmapped Asus vendor usagepage code warnings.
--- drivers/hid/hid-asus.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hid/hid-asus.c +7 -0
@@ -1212,6 +1212,13 @@ static __u8 *asus_report_fixup(struct hi rdesc = new_rdesc; } +if (drvdata->quirks &QUIRK_ROG_NKEY_KEYBOARD && + *rsize ==331 && rdesc[190 ] ==0x85 && rdesc[191 ] ==0x5a && + rdesc[204 ] ==0x95 && rdesc[205 ] ==0x05 ) { +hid_info (hdev,"Fixing up Asus N-KEY keyb report descriptor\n" ); + rdesc[205 ] =0x01 ; + } +return rdesc; }
Greg Kroah-Hartman
maintainerPATCH 15/72 fbdev: fb_pm2fb: Avoid potential divide by zero error
In reply to Greg Kroah-HartmanFrom: Letu Ren <[email protected]>
commit 19f953e7435644b81332dd632ba1b2d80b1e37af upstream.
In do_fb_ioctl() of fbmem.c, if cmd is FBIOPUT_VSCREENINFO, var will be copied from user, then go through fb_set_var() and info->fbops->fb_check_var() which could may be pm2fb_check_var(). Along the path, var->pixclock won't be modified. This function checks whether reciprocal of var->pixclock is too high. If var->pixclock is zero, there will be a divide by zero error. So, it is necessary to check whether denominator is zero to avoid crash. As this bug is found by Syzkaller, logs are listed below.
divide error in pm2fb_check_var
Call Trace: <TASK> fb_set_var+0x367/0xeb0 drivers/video/fbdev/core/fbmem.c:1015 do_fb_ioctl+0x234/0x670 drivers/video/fbdev/core/fbmem.c:1110 fb_ioctl+0xdd/0x130 drivers/video/fbdev/core/fbmem.c:1189
--- drivers/video/fbdev/pm2fb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/video/fbdev/pm2fb.c +5 -0
@@ -617,6 +617,11 @@ static int pm2fb_check_var(struct fb_varreturn -EINVAL ; } +if (!var->pixclock) { +DPRINTK ("pixclock is zero\n" ); +return -EINVAL ; + } +if (PICOS2KHZ (var->pixclock) >PM2_MAX_PIXCLOCK ) {DPRINTK ("pixclock too high (%ldKHz)\n" ,PICOS2KHZ (var->pixclock));
Greg Kroah-Hartman
maintainerPATCH 18/72 mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit 2555283eb40df89945557273121e9393ef9b542b upstream.
anon_vma->degree tracks the combined number of child anon_vmas and VMAs that use the anon_vma as their ->anon_vma.
anon_vma_clone() then assumes that for any anon_vma attached to src->anon_vma_chain other than src->anon_vma, it is impossible for it to be a leaf node of the VMA tree, meaning that for such VMAs ->degree is elevated by 1 because of a child anon_vma, meaning that if ->degree equals 1 there are no VMAs that use the anon_vma as their ->anon_vma.
This assumption is wrong because the ->degree optimization leads to leaf nodes being abandoned on anon_vma_clone() - an existing anon_vma is reused and no new parent-child relationship is created. So it is possible to reuse an anon_vma for one VMA while it is still tied to another VMA.
This is an issue because is_mergeable_anon_vma() and its callers assume that if two VMAs have the same ->anon_vma, the list of anon_vmas attached to the VMAs is guaranteed to be the same. When this assumption is violated, vma_merge() can merge pages into a VMA that is not attached to the corresponding anon_vma, leading to dangling page->mapping pointers that will be dereferenced during rmap walks.
Fix it by separately tracking the number of child anon_vmas and the number of VMAs using the anon_vma as their ->anon_vma.
--- include/linux/rmap.h | 7 +++++-- mm/rmap.c | 29 ++++++++++++++++------------- 2 files changed, 21 insertions(+), 15 deletions(-)
include/linux/rmap.h +5 -2
@@ -41,12 +41,15 @@ struct anon_vma {atomic_t refcount;/* -* Count of child anon_vmas and VMAs which points to this anon_vma. +* Count of child anon_vmas. Equals to the count of all anon_vmas that +* have ->parent pointing to this one, including itself. * * This counter is used for making decision about reusing anon_vma * instead of forking new one. See comments in function anon_vma_clone. */ -unsigned degree; +unsigned long num_children; +/* Count of VMAs whose ->anon_vma pointer points to this object. */ +unsigned long num_active_vmas;struct anon_vma *parent;/* Parent of this anon_vma */
mm/rmap.c +16 -13
@@ -93,7 +93,8 @@ static inline struct anon_vma *anon_vma_ anon_vma =kmem_cache_alloc (anon_vma_cachep,GFP_KERNEL );if (anon_vma) {atomic_set (&anon_vma->refcount,1 ); - anon_vma->degree =1 ;/* Reference for first vma */ + anon_vma->num_children =0 ; + anon_vma->num_active_vmas =0 ; anon_vma->parent = anon_vma;/* * Initialise the anon_vma root to point to itself. If called
@@ -201,6 +202,7 @@ int __anon_vma_prepare(struct vm_area_st anon_vma =anon_vma_alloc ();if (unlikely (!anon_vma)) goto out_enomem_free_avc; + anon_vma->num_children++;/* self-parent link for new root */ allocated = anon_vma; }
@@ -210,8 +212,7 @@ int __anon_vma_prepare(struct vm_area_stif (likely (!vma->anon_vma)) { vma->anon_vma = anon_vma;anon_vma_chain_link (vma, avc, anon_vma); -/* vma reference or self-parent link for new root */ - anon_vma->degree++; + anon_vma->num_active_vmas++; allocated =NULL ; avc =NULL ; }
@@ -296,19 +297,19 @@ int anon_vma_clone(struct vm_area_structanon_vma_chain_link (dst, avc, anon_vma);/* -* Reuse existing anon_vma if its degree lower than two, -* that means it has no vma and only one anon_vma child. +* Reuse existing anon_vma if it has no vma and only one +* anon_vma child. * -* Do not choose parent anon_vma, otherwise first child -* will always reuse it. Root anon_vma is never reused: +* Root anon_vma is never reused: * it has self-parent reference and at least one child. */ if (!dst->anon_vma && src->anon_vma && - anon_vma != src->anon_vma && anon_vma->degree <2 ) + anon_vma->num_children <2 && + anon_vma->num_active_vmas ==0 ) dst->anon_vma = anon_vma; }if (dst->anon_vma) - dst->anon_vma->degree++; + dst->anon_vma->num_active_vmas++;unlock_anon_vma_root (root);return 0 ;
@@ -358,6 +359,7 @@ int anon_vma_fork(struct vm_area_struct anon_vma =anon_vma_alloc ();if (!anon_vma) goto out_error; + anon_vma->num_active_vmas++; avc =anon_vma_chain_alloc (GFP_KERNEL );if (!avc) goto out_error_free_anon_vma;
@@ -378,7 +380,7 @@ int anon_vma_fork(struct vm_area_struct vma->anon_vma = anon_vma;anon_vma_lock_write (anon_vma);anon_vma_chain_link (vma, avc, anon_vma); - anon_vma->parent->degree++; + anon_vma->parent->num_children++;anon_vma_unlock_write (anon_vma);return 0 ;
@@ -410,7 +412,7 @@ void unlink_anon_vmas(struct vm_area_str* to free them outside the lock. */ if (RB_EMPTY_ROOT (&anon_vma->rb_root.rb_root)) { - anon_vma->parent->degree--; + anon_vma->parent->num_children--;continue ; }
@@ -418,7 +420,7 @@ void unlink_anon_vmas(struct vm_area_stranon_vma_chain_free (avc); }if (vma->anon_vma) { - vma->anon_vma->degree--; + vma->anon_vma->num_active_vmas--;/* * vma would still be needed after unlink, and anon_vma will be prepared
@@ -436,7 +438,8 @@ void unlink_anon_vmas(struct vm_area_strlist_for_each_entry_safe (avc, next, &vma->anon_vma_chain, same_vma) {struct anon_vma *anon_vma = avc->anon_vma; -VM_WARN_ON (anon_vma->degree); +VM_WARN_ON (anon_vma->num_children); +VM_WARN_ON (anon_vma->num_active_vmas);put_anon_vma (anon_vma);list_del (&avc->same_vma);
Greg Kroah-Hartman
maintainerPATCH 19/72 ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 5f3d9e8161bb8cb23ab3b4678cd13f6e90a06186 upstream.
The USB DAC from LH Labs (2522:0007) seems requiring the same quirk as Sony Walkman to set up the interface like UAC1; otherwise it gets the constant errors "usb_set_interface failed (-71)". This patch adds a quirk entry for addressing the buggy behavior.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -1903,6 +1903,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x21b4 ,0x0081 ,/* AudioQuest DragonFly */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x2522 ,0x0007 ,/* LH Labs Geek Out HD Audio 1V5 */ +QUIRK_FLAG_SET_IFACE_FIRST ),DEVICE_FLG (0x2708 ,0x0002 ,/* Audient iD14 */ QUIRK_FLAG_IGNORE_CTL_ERROR ), DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
Greg Kroah-Hartman
maintainerPATCH 9/72 HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
commit cd11d1a6114bd4bc6450ae59f6e110ec47362126 upstream.
It is possible for a malicious device to forgo submitting a Feature Report. The HID Steam driver presently makes no prevision for this and de-references the 'struct hid_report' pointer obtained from the HID devices without first checking its validity. Let's change that.
--- drivers/hid/hid-steam.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/hid-steam.c +10 -0
@@ -134,6 +134,11 @@ static int steam_recv_report(struct steaint ret; r = steam->hdev->report_enum[HID_FEATURE_REPORT ].report_id_hash[0 ]; +if (!r) { +hid_err (steam->hdev,"No HID_FEATURE_REPORT submitted - nothing to read\n" ); +return -EINVAL ; + } +if (hid_report_len (r) <64 )return -EINVAL ;
@@ -165,6 +170,11 @@ static int steam_send_report(struct steaint ret; r = steam->hdev->report_enum[HID_FEATURE_REPORT ].report_id_hash[0 ]; +if (!r) { +hid_err (steam->hdev,"No HID_FEATURE_REPORT submitted - nothing to read\n" ); +return -EINVAL ; + } +if (hid_report_len (r) <64 )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 3/72 firmware: tegra: bpmp: Do only aligned access to IPC memory area
In reply to Greg Kroah-HartmanFrom: Timo Alho <[email protected]>
commit a4740b148a04dc60e14fe6a1dfe216d3bae214fd upstream.
Use memcpy_toio and memcpy_fromio variants of memcpy to guarantee no unaligned access to IPC memory area. This is to allow the IPC memory to be mapped as Device memory to further suppress speculative reads from happening within the 64 kB memory area above the IPC memory when 64 kB memory pages are used.
--- drivers/firmware/tegra/bpmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/tegra/bpmp.c +3 -3
@@ -201,7 +201,7 @@ static ssize_t __tegra_bpmp_channel_readint err;if (data && size >0 ) -memcpy (data, channel->ib->data, size); +memcpy_fromio (data, channel->ib->data, size); err =tegra_bpmp_ack_response (channel);if (err <0 )
@@ -245,7 +245,7 @@ static ssize_t __tegra_bpmp_channel_writ channel->ob->flags = flags;if (data && size >0 ) -memcpy (channel->ob->data, data, size); +memcpy_toio (channel->ob->data, data, size);return tegra_bpmp_post_request (channel); }
@@ -420,7 +420,7 @@ void tegra_bpmp_mrq_return(struct tegra_ channel->ob->code = code;if (data && size >0 ) -memcpy (channel->ob->data, data, size); +memcpy_toio (channel->ob->data, data, size); err =tegra_bpmp_post_response (channel);if (WARN_ON (err <0 ))
Greg Kroah-Hartman
maintainerPATCH 23/72 HID: Add Apple Touchbar on T2 Macs in hid_have_special_driver list
In reply to Greg Kroah-HartmanFrom: Aditya Garg <[email protected]>
commit 750ec977288d96e9a11424e3507ede097af732c4 upstream.
The touchbar on Apple T2 Macs has 2 modes, one that shows the function keys and other that shows the media controls. The user can use the fn key on his keyboard to switch between the 2 modes.
On Linux, if people were using an external keyboard or mouse, the touchbar failed to change modes on pressing the fn key with the following in dmesg :-
[ 10.661445] apple-ib-als 0003:05AC:8262.0001: : USB HID v1.01 Device [Apple Inc. Ambient Light Sensor] on usb-bce-vhci-3/input0 [ 11.830992] apple-ib-touchbar 0003:05AC:8302.0007: input: USB HID v1.01 Keyboard [Apple Inc. Touch Bar Display] on usb-bce-vhci-6/input0 [ 12.139407] apple-ib-touchbar 0003:05AC:8102.0008: : USB HID v1.01 Device [Apple Inc. Touch Bar Backlight] on usb-bce-vhci-7/input0 [ 12.211824] apple-ib-touchbar 0003:05AC:8102.0009: : USB HID v1.01 Device [Apple Inc. Touch Bar Backlight] on usb-bce-vhci-7/input1 [ 14.219759] apple-ib-touchbar 0003:05AC:8302.0007: tb: Failed to set touch bar mode to 2 (-110) [ 24.395670] apple-ib-touchbar 0003:05AC:8302.0007: tb: Failed to set touch bar mode to 2 (-110) [ 34.635791] apple-ib-touchbar 0003:05AC:8302.0007: tb: Failed to set touch bar mode to 2 (-110) [ 269.579233] apple-ib-touchbar 0003:05AC:8302.0007: tb: Failed to set touch bar mode to 1 (-110)
Add the USB IDs of the touchbar found in T2 Macs to HID have special driver list to fix the issue.
--- drivers/hid/hid-ids.h | 2 ++ drivers/hid/hid-quirks.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/hid/hid-ids.h +2 -0
@@ -185,6 +185,8 @@#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 0x029c#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 0x029a#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f +#define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102 +#define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302#define USB_VENDOR_ID_ASUS 0x0486#define USB_DEVICE_ID_ASUS_T91MT 0x0185
drivers/hid/hid-quirks.c +2 -0
@@ -314,6 +314,8 @@ static const struct hid_device_id hid_ha { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, #endif #if IS_ENABLED(CONFIG_HID_APPLEIR) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
Greg Kroah-Hartman
maintainerPATCH 37/72 drm/amd/display: Device flash garbage before get in OS
In reply to Greg Kroah-HartmanFrom: Chiawen Huang <[email protected]>
[ Upstream commit 9c580e8f6cd6524d4e2c3490c440110526f7ddd6 ]
[Why]
Enabling stream with tg lock makes config settings pending causing the garbage until tg unlock.
[How]
Keep the original lock mechanism
The driver doesn't lock tg if plane_state is null.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -0
@@ -108,6 +108,7 @@ void dcn10_lock_all_pipes(struct dc *dc,*/ if (pipe_ctx->top_pipe || !pipe_ctx->stream || + !pipe_ctx->plane_state || !tg->funcs->is_tg_enabled (tg))continue ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/72 drm/amd/display: For stereo keep "FLIP_ANY_FRAME"
In reply to Greg Kroah-HartmanFrom: Alvin Lee <[email protected]>
[ Upstream commit 84ef99c728079dfd21d6bc70b4c3e4af20602b3c ]
[Description]
Observed in stereomode that programming FLIP_LEFT_EYE can cause hangs. Keep FLIP_ANY_FRAME in stereo mode so the surface flip can take place before left or right eye
--- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c +1 -1
@@ -86,7 +86,7 @@ bool hubp3_program_surface_flip_and_addr( VMID, address->vmid);if (address->type ==PLN_ADDR_TYPE_GRPH_STEREO ) { -REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_MODE_FOR_STEREOSYNC ,0x1 ); +REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_MODE_FOR_STEREOSYNC ,0 );REG_UPDATE (DCSURF_FLIP_CONTROL ,SURFACE_FLIP_IN_STEREOSYNC ,0x1 ); }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/72 drm/amd/display: Avoid MPC infinite loop
In reply to Greg Kroah-HartmanFrom: Josip Pavic <[email protected]>
[ Upstream commit 8de297dc046c180651c0500f8611663ae1c3828a ]
[why]
In some cases MPC tree bottom pipe ends up point to itself. This causes iterating from top to bottom to hang the system in an infinite loop.
[how]
When looping to next MPC bottom pipe, check that the pointer is not same as current to avoid infinite loop.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 ++++++ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 ++++++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +6 -0
@@ -126,6 +126,12 @@ struct mpcc *mpc1_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id)while (tmp_mpcc !=NULL ) {if (tmp_mpcc->dpp_id == dpp_id)return tmp_mpcc; + +/* avoid circular linked list */ +ASSERT (tmp_mpcc != tmp_mpcc->mpcc_bot); +if (tmp_mpcc == tmp_mpcc->mpcc_bot) +break ; + tmp_mpcc = tmp_mpcc->mpcc_bot; }return NULL ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +6 -0
@@ -531,6 +531,12 @@ static struct mpcc *mpc2_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id)while (tmp_mpcc !=NULL ) {if (tmp_mpcc->dpp_id ==0xf || tmp_mpcc->dpp_id == dpp_id)return tmp_mpcc; + +/* avoid circular linked list */ +ASSERT (tmp_mpcc != tmp_mpcc->mpcc_bot); +if (tmp_mpcc == tmp_mpcc->mpcc_bot) +break ; + tmp_mpcc = tmp_mpcc->mpcc_bot; }return NULL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/72 drm/amd/display: Fix HDMI VSIF V3 incorrect issue
In reply to Greg Kroah-HartmanFrom: Leo Ma <[email protected]>
[ Upstream commit 0591183699fceeafb4c4141072d47775de83ecfb ]
[Why]
Reported from customer the checksum in AMD VSIF V3 is incorrect and causing blank screen issue.
[How]
Fix the packet length issue on AMD HDMI VSIF V3.
--- .../drm/amd/display/modules/freesync/freesync.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +3 -12
@@ -615,10 +615,6 @@ static void build_vrr_infopacket_data_v1(const struct mod_vrr_params *vrr,* Note: We should never go above the field rate of the mode timing set. */ infopacket->sb[8 ] = (unsigned char )((vrr->max_refresh_in_uhz +500000 ) /1000000 ); - -/* FreeSync HDR */ - infopacket->sb[9 ] =0 ; - infopacket->sb[10 ] =0 ; } static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr,
@@ -686,10 +682,6 @@ static void build_vrr_infopacket_data_v3(const struct mod_vrr_params *vrr,/* PB16 : Reserved bits 7:1, FixedRate bit 0 */ infopacket->sb[16 ] = (vrr->state ==VRR_STATE_ACTIVE_FIXED ) ?1 :0 ; - -//FreeSync HDR - infopacket->sb[9 ] =0 ; - infopacket->sb[10 ] =0 ; } static void build_vrr_infopacket_fs2_data(enum color_transfer_func app_tf,
@@ -774,8 +766,7 @@ static void build_vrr_infopacket_header_v2(enum signal_type signal,/* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length = 0x09] */ infopacket->hb2 =0x09 ; - *payload_size =0x0A ; - + *payload_size =0x09 ; }else if (dc_is_dp_signal (signal)) {/* HEADER */
@@ -824,9 +815,9 @@ static void build_vrr_infopacket_header_v3(enum signal_type signal, infopacket->hb1 = version;/* HB2 = [Bits 7:5 = 0] [Bits 4:0 = Length] */ - *payload_size =0x10 ; - infopacket->hb2 = *payload_size -1 ;//-1 for checksum + infopacket->hb2 =0x10 ; + *payload_size =0x10 ; }else if (dc_is_dp_signal (signal)) {/* HEADER */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/72 drm/amd/display: Fix TDR eDP and USB4 display light up issue
In reply to Greg Kroah-HartmanFrom: Meenakshikumar Somasundaram <[email protected]>
[ Upstream commit 30456ffa65469d1d2e5e1da05017e6728d24c11c ]
[Why]
After TDR recovery, eDP and USB4 display does not light up. Because dmub outbox notifications are not enabled after dmub reload and link encoder assignments for the streams are not cleared before dc state reset.
[How]
- Dmub outbox notification is enabled after tdr recovery by issuing inbox command to dmub.
- Link encoders for the streams are unassigned before dc state reset.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 1 + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -0
@@ -3783,6 +3783,7 @@ void dc_enable_dmub_outbox(struct dc *dc)struct dc_context *dc_ctx = dc->ctx;dmub_enable_outbox_notification (dc_ctx->dmub_srv); +DC_LOG_DC ("%s: dmub outbox notifications enabled\n" , __func__); }/**
drivers/gpu/drm/amd/display/dc/dc_link.h +1 -0
@@ -337,6 +337,7 @@ enum dc_detect_reason {DETECT_REASON_HPDRX ,DETECT_REASON_FALLBACK ,DETECT_REASON_RETRAIN , + DETECT_REASON_TDR, };bool dc_link_detect (struct dc_link *dc_link,enum dc_detect_reason reason);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/72 mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC
In reply to Greg Kroah-HartmanFrom: Liming Sun <[email protected]>
[ Upstream commit a0753ef66c34c1739580219dca664eda648164b7 ]
The commit 08f3dff799d4 (mmc: sdhci-of-dwcmshc: add rockchip platform support") introduces the use of_device_get_match_data() to check for some chips. Unfortunately, it also breaks the BlueField-3 FW, which uses ACPI.
To fix the problem, let's add the ACPI match data and the corresponding quirks to re-enable the support for the BlueField-3 SoC.
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +14 -2
@@ -296,6 +296,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, }; +#ifdef CONFIG_ACPI +static const struct sdhci_pltfm_data sdhci_dwcmshc_bf3_pdata = { + .ops = &sdhci_dwcmshc_ops, + .quirks =SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN , + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | +SDHCI_QUIRK2_ACMD23_BROKEN , +}; +#endif +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { .ops = &sdhci_dwcmshc_rk35xx_ops, .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
@@ -360,7 +369,10 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids);#ifdef CONFIG_ACPI static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = { - { .id ="MLNXBF30" }, + { + .id ="MLNXBF30" , + .driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata, + }, {} };#endif
@@ -376,7 +388,7 @@ static int dwcmshc_probe(struct platform_device *pdev)int err;u32 extra; - pltfm_data =of_device_get_match_data (&pdev->dev); + pltfm_data =device_get_match_data (&pdev->dev);if (!pltfm_data) {dev_err (&pdev->dev,"Error: No device match data found\n" );return -ENODEV ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 6/72 arm64: errata: Add Cortex-A510 to the repeat tlbi list
In reply to Greg Kroah-HartmanFrom: James Morse <[email protected]>
commit 39fdb65f52e9a53d32a6ba719f96669fd300ae78 upstream.
Cortex-A510 is affected by an erratum where in rare circumstances the CPUs may not handle a race between a break-before-make sequence on one CPU, and another CPU accessing the same page. This could allow a store to a page that has been unmapped.
Work around this by adding the affected CPUs to the list that needs TLB sequences to be done twice.
--- Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 17 +++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 8 +++++++- 3 files changed, 26 insertions(+), 1 deletion(-)
Documentation/arm64/silicon-errata.rst +2 -0
@@ -106,6 +106,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A510 | #2441009 | ARM64_ERRATUM_2441009 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
arch/arm64/Kconfig +17 -0
@@ -838,6 +838,23 @@ config ARM64_ERRATUM_2224489 If unsure, say Y. +config ARM64_ERRATUM_2441009 + bool "Cortex-A510: Completion of affected memory accesses might not be guaranteed by completion of a TLBI" + default y + select ARM64_WORKAROUND_REPEAT_TLBI + help + This option adds a workaround for ARM Cortex-A510 erratum #2441009. + + Under very rare circumstances, affected Cortex-A510 CPUs + may not handle a race between a break-before-make sequence on one + CPU, and another CPU accessing the same page. This could allow a + store to a page that has been unmapped. + + Work around this by adding the affected CPUs to the list that needs + TLB sequences to be done twice. + + If unsure, say Y. + config ARM64_ERRATUM_2064142 bool "Cortex-A510: 2064142: workaround TRBE register writes while disabled" depends on CORESIGHT_TRBE
arch/arm64/kernel/cpu_errata.c +7 -1
@@ -214,6 +214,12 @@ static const struct arm64_cpu_capabiliti ERRATA_MIDR_RANGE(MIDR_QCOM_KRYO_4XX_GOLD, 0xc, 0xe, 0xf, 0xe), },#endif +#ifdef CONFIG_ARM64_ERRATUM_2441009 + { +/* Cortex-A510 r0p0 -> r1p1. Fixed in r1p2 */ + ERRATA_MIDR_RANGE(MIDR_CORTEX_A510, 0, 0, 1, 1), + }, +#endif {}, };#endif
@@ -490,7 +496,7 @@ const struct arm64_cpu_capabilities arm6#endif #ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI { - .desc = "Qualcomm erratum 1009, or ARM erratum 1286807", + .desc = "Qualcomm erratum 1009, or ARM erratum 1286807, 2441009", .capability = ARM64_WORKAROUND_REPEAT_TLBI, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = cpucap_multi_entry_cap_matches,
Greg Kroah-Hartman
maintainerPATCH 48/72 neigh: fix possible DoS due to net iface start/stop loop
In reply to Greg Kroah-HartmanFrom: Denis V. Lunev <[email protected]>
[ Upstream commit 66ba215cb51323e4e55e38fd5f250e0fae0cbc94 ]
Normal processing of ARP request (usually this is Ethernet broadcast packet) coming to the host is looking like the following:
* the packet comes to arp_process() call and is passed through routing procedure
* the request is put into the queue using pneigh_enqueue() if corresponding ARP record is not local (common case for container records on the host)
* the request is processed by timer (within 80 jiffies by default) and ARP reply is sent from the same arp_process() using NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED condition (flag is set inside pneigh_enqueue())
And here the problem comes. Linux kernel calls pneigh_queue_purge() which destroys the whole queue of ARP requests on ANY network interface start/stop event through __neigh_ifdown().
This is actually not a problem within the original world as network interface start/stop was accessible to the host 'root' only, which could do more destructive things. But the world is changed and there are Linux containers available. Here container 'root' has an access to this API and could be considered as untrusted user in the hosting (container's) world.
Thus there is an attack vector to other containers on node when container's root will endlessly start/stop interfaces. We have observed similar situation on a real production node when docker container was doing such activity and thus other containers on the node become not accessible.
The patch proposed doing very simple thing. It drops only packets from the same namespace in the pneigh_queue_purge() where network interface state change is detected. This is enough to prevent the problem for the whole node preserving original semantics of the code.
v2:
- do del_timer_sync() if queue is empty after pneigh_queue_purge()
v3:
- rebase to net tree
--- net/core/neighbour.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
net/core/neighbour.c +17 -8
@@ -307,14 +307,23 @@ static int neigh_del_timer(struct neighbour *n)return 0 ; } -static void pneigh_queue_purge (struct sk_buff_head *list) +static void pneigh_queue_purge (struct sk_buff_head *list,struct net *net) { +unsigned long flags;struct sk_buff *skb; -while ((skb =skb_dequeue (list)) !=NULL ) { -dev_put (skb->dev); -kfree_skb (skb); +spin_lock_irqsave (&list->lock, flags); + skb =skb_peek (list); +while (skb !=NULL ) { +struct sk_buff *skb_next =skb_peek_next (skb, list); +if (net ==NULL ||net_eq (dev_net (skb->dev), net)) { +__skb_unlink (skb, list); +dev_put (skb->dev); +kfree_skb (skb); + } + skb = skb_next; } +spin_unlock_irqrestore (&list->lock, flags); } static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev,
@@ -385,9 +394,9 @@ static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev,write_lock_bh (&tbl->lock);neigh_flush_dev (tbl, dev, skip_perm);pneigh_ifdown_and_unlock (tbl, dev); - -del_timer_sync (&tbl->proxy_timer); -pneigh_queue_purge (&tbl->proxy_queue); +pneigh_queue_purge (&tbl->proxy_queue,dev_net (dev)); +if (skb_queue_empty_lockless (&tbl->proxy_queue)) +del_timer_sync (&tbl->proxy_timer);return 0 ; }
@@ -1787,7 +1796,7 @@ int neigh_table_clear(int index, struct neigh_table *tbl)cancel_delayed_work_sync (&tbl->managed_work);cancel_delayed_work_sync (&tbl->gc_work);del_timer_sync (&tbl->proxy_timer); -pneigh_queue_purge (&tbl->proxy_queue); +pneigh_queue_purge (&tbl->proxy_queue,NULL );neigh_ifdown (tbl,NULL );if (atomic_read (&tbl->entries))pr_crit ("neighbour leakage\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/72 drm/amd/pm: skip pptable override for smu_v13_0_7
In reply to Greg Kroah-HartmanFrom: Kenneth Feng <[email protected]>
[ Upstream commit 4e64b529c5b04e7944b41de554ee686ecab00744 ]
skip pptable override for smu_v13_0_7 secure boards only.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +3 -7
@@ -203,6 +203,9 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)if (!adev->scpm_enabled)return 0 ; +if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 )) +return 0 ; +/* override pptable_id from driver parameter */ if (amdgpu_smu_pptable_id >=0 ) { pptable_id = amdgpu_smu_pptable_id;
@@ -210,13 +213,6 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu) }else { pptable_id = smu->smu_table.boot_values.pp_table_id; -if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 ) && - pptable_id ==3667 ) - pptable_id =36671 ; - -if (adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (13 ,0 ,7 ) && - pptable_id ==3688 ) - pptable_id =36881 ;/* * Temporary solution for SMU V13.0.0 with SCPM enabled: * - use 36831 signed pptable when pp_table_id is 3683
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/72 HID: intel-ish-hid: ipc: Add Meteor Lake PCI device ID
In reply to Greg Kroah-HartmanFrom: Even Xu <[email protected]>
commit 467249a7dff68451868ca79696aef69764193a8a upstream.
Add device ID of Meteor Lake P into ishtp support list.
--- drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/intel-ish-hid/ipc/hw-ish.h +1 -0
@@ -32,6 +32,7 @@#define ADL_P_DEVICE_ID 0x51FC#define ADL_N_DEVICE_ID 0x54FC#define RPL_S_DEVICE_ID 0x7A78 +#define MTL_P_DEVICE_ID 0x7E45#define REVISION_ID_CHT_A0 0x6#define REVISION_ID_CHT_Ax_SI 0x0
drivers/hid/intel-ish-hid/ipc/pci-ish.c +1 -0
@@ -43,6 +43,7 @@ static const struct pci_device_id ish_pc {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_P_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ADL_N_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, RPL_S_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MTL_P_DEVICE_ID)}, {0, } };MODULE_DEVICE_TABLE (pci, ish_pci_tbl);
Greg Kroah-Hartman
maintainerPATCH 47/72 net: lan966x: fix checking for return value of platform_get_irq_byname()
In reply to Greg Kroah-HartmanFrom: Li Qiong <[email protected]>
[ Upstream commit 40b4ac880e21d917da7f3752332fa57564a4c202 ]
The platform_get_irq_byname() returns non-zero IRQ number or negative error number. "if (irq)" always true, chang it to "if (irq > 0)"
--- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +4 -4
@@ -710,7 +710,7 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)disable_irq (lan966x->xtr_irq); lan966x->xtr_irq = -ENXIO ; -if (lan966x->ana_irq) { +if (lan966x->ana_irq >0 ) {disable_irq (lan966x->ana_irq); lan966x->ana_irq = -ENXIO ; }
@@ -718,10 +718,10 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)if (lan966x->fdma)devm_free_irq (lan966x->dev, lan966x->fdma_irq, lan966x); -if (lan966x->ptp_irq) +if (lan966x->ptp_irq >0 )devm_free_irq (lan966x->dev, lan966x->ptp_irq, lan966x); -if (lan966x->ptp_ext_irq) +if (lan966x->ptp_ext_irq >0 )devm_free_irq (lan966x->dev, lan966x->ptp_ext_irq, lan966x); }
@@ -1049,7 +1049,7 @@ static int lan966x_probe(struct platform_device *pdev) } lan966x->ana_irq =platform_get_irq_byname (pdev,"ana" ); -if (lan966x->ana_irq) { +if (lan966x->ana_irq >0 ) { err =devm_request_threaded_irq (&pdev->dev, lan966x->ana_irq,NULL , lan966x_ana_irq_handler,IRQF_ONESHOT ,"ana irq" , lan966x);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/72 drm/amdgpu: Add decode_iv_ts helper for ih_v6 block
In reply to Greg Kroah-HartmanFrom: Harish Kasiviswanathan <[email protected]>
[ Upstream commit 1af9add1f1512b10d9ce44ec7137612bc81ff069 ]
Was missing. Add it.
--- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +1 -0
@@ -727,6 +727,7 @@ static const struct amd_ip_funcs ih_v6_0_ip_funcs = {static const struct amdgpu_ih_funcs ih_v6_0_funcs = { .get_wptr = ih_v6_0_get_wptr, .decode_iv = amdgpu_ih_decode_iv_helper, + .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper, .set_rptr = ih_v6_0_set_rptr };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/72 drm/amd/pm: add missing ->fini_microcode interface for Sienna Cichlid
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 0a2d922a5618377cdf8fa476351362733ef55342 ]
To avoid any potential memory leak.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -0
@@ -4281,6 +4281,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .dump_pptable = sienna_cichlid_dump_pptable, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, + .fini_microcode = smu_v11_0_fini_microcode, .init_smc_tables = sienna_cichlid_init_smc_tables, .fini_smc_tables = smu_v11_0_fini_smc_tables, .init_power = smu_v11_0_init_power,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/72 mmc: sdhci-of-dwcmshc: add reset call back for rockchip Socs
In reply to Greg Kroah-HartmanFrom: Yifeng Zhao <[email protected]>
[ Upstream commit 70f832206fe72e9998b46363e8e59e89b0b757bc ]
The reset function build in the SDHCI will not reset the logic circuit related to the tuning function, which may cause data reading errors. Resetting the complete SDHCI controller through the reset controller fixes the issue.
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +25 -1
@@ -15,6 +15,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/reset.h> #include <linux/sizes.h> #include "sdhci-pltfm.h"
@@ -63,6 +64,7 @@struct rk3568_priv {/* Rockchip specified optional clocks */ struct clk_bulk_data rockchip_clks[RK3568_MAX_CLKS ]; +struct reset_control *reset;u8 txclk_tapnum; };
@@ -255,6 +257,21 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clocksdhci_writel (host, extra,DWCMSHC_EMMC_DLL_STRBIN ); } +static void rk35xx_sdhci_reset (struct sdhci_host *host,u8 mask) +{ +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct dwcmshc_priv *dwc_priv =sdhci_pltfm_priv (pltfm_host); +struct rk35xx_priv *priv = dwc_priv->priv; + +if (mask &SDHCI_RESET_ALL && priv->reset) { +reset_control_assert (priv->reset); +udelay (1 ); +reset_control_deassert (priv->reset); + } + +sdhci_reset (host, mask); +} +static const struct sdhci_ops sdhci_dwcmshc_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width,
@@ -269,7 +286,7 @@ static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = dwcmshc_set_uhs_signaling, .get_max_clock = sdhci_pltfm_clk_get_max_clock, - .reset = sdhci_reset, + .reset = rk35xx_sdhci_reset, .adma_write_desc = dwcmshc_adma_write_desc, };
@@ -292,6 +309,13 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwcint err;struct rk3568_priv *priv = dwc_priv->priv; + priv->reset =devm_reset_control_array_get_optional_exclusive (mmc_dev (host->mmc)); +if (IS_ERR (priv->reset)) { + err =PTR_ERR (priv->reset); +dev_err (mmc_dev (host->mmc),"failed to get reset control %d\n" , err); +return err; + } + priv->rockchip_clks[0 ].id ="axi" ; priv->rockchip_clks[1 ].id ="block" ; priv->rockchip_clks[2 ].id ="timer" ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/72 drm/amd/pm: Fix a potential gpu_metrics_table memory leak
In reply to Greg Kroah-HartmanFrom: Zhen Ni <[email protected]>
[ Upstream commit 5afb76522a0af0513b6dc01f84128a73206b051b ]
Memory is allocated for gpu_metrics_table in smu_v13_0_4_init_smc_tables(), but not freed in smu_v13_0_4_fini_smc_tables(). This may cause memory leaks, fix it.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +3 -0
@@ -190,6 +190,9 @@ static int smu_v13_0_4_fini_smc_tables(struct smu_context *smu)kfree (smu_table->watermarks_table); smu_table->watermarks_table =NULL ; +kfree (smu_table->gpu_metrics_table); + smu_table->gpu_metrics_table =NULL ; +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/72 drm/amd/display: avoid doing vm_init multiple time
In reply to Greg Kroah-HartmanFrom: Charlene Liu <[email protected]>
[ Upstream commit 5544a7b5a07480192eb5fd3536462faed2c21528 ]
[why]
this is to ensure that driver will not reprogram hvm_prefetch_req again if it is done.
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c +7 -1
@@ -67,9 +67,15 @@ static uint32_t convert_and_clamp(void dcn21_dchvm_init (struct hubbub *hubbub) {struct dcn20_hubbub *hubbub1 =TO_DCN20_HUBBUB (hubbub); -uint32_t riommu_active; +uint32_t riommu_active, prefetch_done;int i; +REG_GET (DCHVM_RIOMMU_STAT0 ,HOSTVM_PREFETCH_DONE , &prefetch_done); + +if (prefetch_done) { + hubbub->riommu_active = true; +return ; + }//Init DCHVM block REG_UPDATE (DCHVM_CTRL0 ,HOSTVM_INIT_REQ ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/72 drm/amd/display: Fix plug/unplug external monitor will hang while playback MPO video
In reply to Greg Kroah-HartmanFrom: Tom Chung <[email protected]>
[ Upstream commit e98459c06e3d45c2229b097f7b8cdd412357fa2f ]
[Why]
Pipes for MPO primary and overlay will be power down and power up during plug/unplug external monitor while MPO video playback.
But the pipes were the same after plug/unplug and should not need to be power down and power up or it will make page flip interrupt disabled and cause hang issue.
[How]
Add pipe split change condition that not only check the top pipe pointer but also check the index of top pipe if both top pipes are available.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +9 -2
@@ -1067,8 +1067,15 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context)struct dc_stream_state *old_stream = dc->current_state->res_ctx.pipe_ctx[i].stream;bool should_disable = true; -bool pipe_split_change = - context->res_ctx.pipe_ctx[i].top_pipe != dc->current_state->res_ctx.pipe_ctx[i].top_pipe; +bool pipe_split_change = false; + +if ((context->res_ctx.pipe_ctx[i].top_pipe) && + (dc->current_state->res_ctx.pipe_ctx[i].top_pipe)) + pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe->pipe_idx != + dc->current_state->res_ctx.pipe_ctx[i].top_pipe->pipe_idx; +else + pipe_split_change = context->res_ctx.pipe_ctx[i].top_pipe != + dc->current_state->res_ctx.pipe_ctx[i].top_pipe;for (j =0 ; j < context->stream_count; j++) {if (old_stream == context->streams[j]) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/72 arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
commit e75d18cecbb3805895d8ed64da4f78575ec96043 upstream.
Though acpi_find_last_cache_level() always returned signed value and the document states it will return any errors caused by lack of a PPTT table, it never returned negative values before.
Commit 0c80f9e165f8 ("ACPI: PPTT: Leave the table mapped for the runtime usage") however changed it by returning -ENOENT if no PPTT was found. The value returned from acpi_find_last_cache_level() is then assigned to unsigned fw_level.
It will result in the number of cache leaves calculated incorrectly as a huge value which will then cause the following warning from __alloc_pages as the order would be great than MAX_ORDER because of incorrect and huge cache leaves value.
| WARNING: CPU: 0 PID: 1 at mm/page_alloc.c:5407 __alloc_pages+0x74/0x314 | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.19.0-10393-g7c2a8d3ac4c0 #73 | pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __alloc_pages+0x74/0x314 | lr : alloc_pages+0xe8/0x318 | Call trace: | __alloc_pages+0x74/0x314 | alloc_pages+0xe8/0x318 | kmalloc_order_trace+0x68/0x1dc | __kmalloc+0x240/0x338 | detect_cache_attributes+0xe0/0x56c | update_siblings_masks+0x38/0x284 | store_cpu_topology+0x78/0x84 | smp_prepare_cpus+0x48/0x134 | kernel_init_freeable+0xc4/0x14c | kernel_init+0x2c/0x1b4 | ret_from_fork+0x10/0x20
Fix the same by changing fw_level to be signed integer and return the error from init_cache_level() early in case of error.
--- arch/arm64/kernel/cacheinfo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kernel/cacheinfo.c +5 -1
@@ -45,7 +45,8 @@ static void ci_leaf_init(struct cacheinfint init_cache_level (unsigned int cpu) { -unsigned int ctype, level, leaves, fw_level; +unsigned int ctype, level, leaves; +int fw_level;struct cpu_cacheinfo *this_cpu_ci =get_cpu_cacheinfo (cpu);for (level =1 , leaves =0 ; level <=MAX_CACHE_LEVEL ; level++) {
@@ -63,6 +64,9 @@ int init_cache_level(unsigned int cpu)else fw_level =acpi_find_last_cache_level (cpu); +if (fw_level <0 ) +return fw_level; +if (level < fw_level) {/* * some external caches not specified in CLIDR_EL1
Greg Kroah-Hartman
maintainerPATCH 28/72 mmc: mtk-sd: Clear interrupts when cqe off/disable
In reply to Greg Kroah-HartmanFrom: Wenbin Mei <[email protected]>
[ Upstream commit cc5d1692600613e72f32af60e27330fe0c79f4fe ]
Currently we don't clear MSDC interrupts when cqe off/disable, which led to the data complete interrupt will be reserved for the next command. If the next command with data transfer after cqe off/disable, we process the CMD ready interrupt and trigger DMA start for data, but the data complete interrupt is already exists, then SW assume that the data transfer is complete, SW will trigger DMA stop, but the data may not be transmitted yet or is transmitting, so we may encounter the following error:
mtk-msdc 11230000.mmc: CMD bus busy detected.
--- drivers/mmc/host/mtk-sd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/host/mtk-sd.c +6 -0
@@ -2414,6 +2414,9 @@ static void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)/* disable busy check */ sdr_clr_bits (host->base +MSDC_PATCH_BIT1 ,MSDC_PB1_BUSY_CHECK_SEL ); + val =readl (host->base +MSDC_INT ); +writel (val, host->base +MSDC_INT ); +if (recovery) {sdr_set_field (host->base +MSDC_DMA_CTRL ,MSDC_DMA_CTRL_STOP ,1 );
@@ -2871,11 +2874,14 @@ static int __maybe_unused msdc_suspend(struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev);int ret; +u32 val;if (mmc->caps2 &MMC_CAP2_CQE ) { ret =cqhci_suspend (mmc);if (ret)return ret; + val =readl (((struct msdc_host *)mmc_priv (mmc))->base +MSDC_INT ); +writel (val, ((struct msdc_host *)mmc_priv (mmc))->base +MSDC_INT ); }return pm_runtime_force_suspend (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/72 ALSA: hda/cs8409: Support new Dolphin Variants
In reply to Greg Kroah-HartmanFrom: Stefan Binding <[email protected]>
[ Upstream commit 1ff954f9ab054675b9eb02dd14add8f7aa376d71 ]
Add 4 new Dolphin Systems, same configuration as older systems.
--- sound/pci/hda/patch_cs8409-tables.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/pci/hda/patch_cs8409-tables.c +4 -0
@@ -546,6 +546,10 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x0BD6 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0BD7 ,"Dolphin" ,CS8409_DOLPHIN ),SND_PCI_QUIRK (0x1028 ,0x0BD8 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C43 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C50 ,"Dolphin" ,CS8409_DOLPHIN ), +SND_PCI_QUIRK (0x1028 ,0x0C51 ,"Dolphin" ,CS8409_DOLPHIN ), + SND_PCI_QUIRK(0x1028, 0x0C52, "Dolphin", CS8409_DOLPHIN), {} /* terminator */ };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/72 netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit aa5762c34213aba7a72dc58e70601370805fa794 ]
NF_CONNTRACK_PROCFS was marked obsolete in commit 54b07dca68557b09 ("netfilter: provide config option to disable ancient procfs parts") in v3.3.
--- net/netfilter/Kconfig | 1 - 1 file changed, 1 deletion(-)
net/netfilter/Kconfig +0 -1
@@ -144,7 +144,6 @@ config NF_CONNTRACK_ZONES config NF_CONNTRACK_PROCFS bool "Supply CT list in procfs (OBSOLETE)" - default y depends on PROC_FS help This option enables for the list of known conntrack entries
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/72 HID: nintendo: fix rumble worker null pointer deref
In reply to Greg Kroah-HartmanFrom: Daniel J. Ogorchock <[email protected]>
commit 1ff89e06c2e5fab30274e4b02360d4241d6e605e upstream.
We can dereference a null pointer trying to queue work to a destroyed workqueue.
If the device is disconnected, nintendo_hid_remove is called, in which the rumble_queue is destroyed. Avoid using that queue to defer rumble work once the controller state is set to JOYCON_CTLR_STATE_REMOVED.
This eliminates the null pointer dereference.
--- drivers/hid/hid-nintendo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hid/hid-nintendo.c +4 -2
@@ -1222,6 +1222,7 @@ static void joycon_parse_report(struct jspin_lock_irqsave (&ctlr->lock, flags);if (IS_ENABLED (CONFIG_NINTENDO_FF ) && rep->vibrator_report && + ctlr->ctlr_state !=JOYCON_CTLR_STATE_REMOVED && (msecs - ctlr->rumble_msecs) >=JC_RUMBLE_PERIOD_MS && (ctlr->rumble_queue_head != ctlr->rumble_queue_tail || ctlr->rumble_zero_countdown >0 )) {
@@ -1546,12 +1547,13 @@ static int joycon_set_rumble(struct joyc ctlr->rumble_queue_head =0 ;memcpy (ctlr->rumble_data[ctlr->rumble_queue_head], data,JC_RUMBLE_DATA_SIZE ); -spin_unlock_irqrestore (&ctlr->lock, flags);/* don't wait for the periodic send (reduces latency) */ -if (schedule_now) +if (schedule_now && ctlr->ctlr_state !=JOYCON_CTLR_STATE_REMOVED )queue_work (ctlr->rumble_queue, &ctlr->rumble_worker); +spin_unlock_irqrestore (&ctlr->lock, flags); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 5/72 docs: kerneldoc-preamble: Test xeCJK.sty before loading
In reply to Greg Kroah-HartmanFrom: Akira Yokosawa <[email protected]>
commit cee7db1b0239468b22c295cf04a8c40c34ecd35a upstream.
On distros whose texlive packaging is fine-grained, texlive-xecjk can be installed/removed independently of other texlive packages. Conditionally loading xeCJK depending only on the existence of the "Noto Sans CJK SC" font might end up in xelatex error of "xeCJK.sty not found!".
Improve the situation by testing existence of xeCJK.sty before loading it.
This is useful on RHEL 9 and its clone distros where texlive-xecjk doesn't work at the moment due to a missing dependency [1]. "make pdfdocs" for non-CJK contents should work after removing texlive-xecjk.
--- Documentation/sphinx/kerneldoc-preamble.sty | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
Documentation/sphinx/kerneldoc-preamble.sty +16 -6
@@ -70,8 +70,16 @@ % Translations have Asian (CJK) characters which are only displayed if % xeCJK is used +\usepackage{ifthen} +\newboolean{enablecjk} +\setboolean{enablecjk}{false} \IfFontExistsTF{Noto Sans CJK SC}{ - % Load xeCJK when CJK font is available + \IfFileExists{xeCJK.sty}{ + \setboolean{enablecjk}{true} + }{} +}{} +\ifthenelse{\boolean{enablecjk}}{ + % Load xeCJK when both the Noto Sans CJK font and xeCJK.sty are available. \usepackage{xeCJK} % Noto CJK fonts don't provide slant shape. [AutoFakeSlant] permits % its emulation.
@@ -196,7 +204,7 @@ % Inactivate CJK after tableofcontents \apptocmd{\sphinxtableofcontents}{\kerneldocCJKoff}{}{} \xeCJKsetup{CJKspace = true}% For inter-phrase space of Korean TOC -}{ % No CJK font found +}{ % Don't enable CJK % Custom macros to on/off CJK and switch CJK fonts (Dummy) \newcommand{\kerneldocCJKon}{} \newcommand{\kerneldocCJKoff}{}
@@ -204,14 +212,16 @@ %% and ignore the argument (#1) in their definitions, whole contents of %% CJK chapters can be ignored. \newcommand{\kerneldocBeginSC}[1]{% - %% Put a note on missing CJK fonts in place of zh_CN translation. - \begin{sphinxadmonition}{note}{Note on missing fonts:} + %% Put a note on missing CJK fonts or the xecjk package in place of + %% zh_CN translation. + \begin{sphinxadmonition}{note}{Note on missing fonts and a package:} Translations of Simplified Chinese (zh\_CN), Traditional Chinese (zh\_TW), Korean (ko\_KR), and Japanese (ja\_JP) were skipped - due to the lack of suitable font families. + due to the lack of suitable font families and/or the texlive-xecjk + package. If you want them, please install ``Noto Sans CJK'' font families - by following instructions from + along with the texlive-xecjk package by following instructions from \sphinxcode{./scripts/sphinx-pre-install}. Having optional ``Noto Serif CJK'' font families will improve the looks of those translations.
Signature · 1 line
2.37.2
Greg Kroah-Hartman
maintainerPATCH 46/72 ksmbd: return STATUS_BAD_NETWORK_NAME error status if share is not configured
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit fe54833dc8d97ef387e86f7c80537d51c503ca75 ]
If share is not configured in smb.conf, smb2 tree connect should return STATUS_BAD_NETWORK_NAME instead of STATUS_BAD_NETWORK_PATH.
--- fs/ksmbd/mgmt/tree_connect.c | 2 +- fs/ksmbd/smb2pdu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
fs/ksmbd/mgmt/tree_connect.c +1 -1
@@ -18,7 +18,7 @@struct ksmbd_tree_conn_status ksmbd_tree_conn_connect (struct ksmbd_session *sess,char *share_name) { -struct ksmbd_tree_conn_status status = {-EINVAL ,NULL }; +struct ksmbd_tree_conn_status status = {-ENOENT ,NULL };struct ksmbd_tree_connect_response *resp =NULL ;struct ksmbd_share_config *sc;struct ksmbd_tree_connect *tree_conn =NULL ;
fs/ksmbd/smb2pdu.c +2 -1
@@ -1930,8 +1930,9 @@ int smb2_tree_connect(struct ksmbd_work *work) rsp->hdr.Status =STATUS_SUCCESS ; rc =0 ;break ; +case -ENOENT :case KSMBD_TREE_CONN_STATUS_NO_SHARE : - rsp->hdr.Status =STATUS_BAD_NETWORK_PATH ; + rsp->hdr.Status =STATUS_BAD_NETWORK_NAME ;break ;case -ENOMEM :case KSMBD_TREE_CONN_STATUS_NOMEM :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/72 HID: AMD_SFH: Add a DMI quirk entry for Chromebooks
In reply to Greg Kroah-HartmanFrom: Akihiko Odaki <[email protected]>
commit adada3f4930ac084740ea340bd8e94028eba4f22 upstream.
Google Chromebooks use Chrome OS Embedded Controller Sensor Hub instead of Sensor Hub Fusion and leaves MP2 uninitialized, which disables all functionalities, even including the registers necessary for feature detections.
The behavior was observed with Lenovo ThinkPad C13 Yoga.
--- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/hid/amd-sfh-hid/amd_sfh_pcie.c +18 -0
@@ -285,11 +285,29 @@ static int amd_sfh_irq_init(struct amd_mreturn 0 ; } +static const struct dmi_system_id dmi_nodevs[] = { + { +/* +* Google Chromebooks use Chrome OS Embedded Controller Sensor +* Hub instead of Sensor Hub Fusion and leaves MP2 +* uninitialized, which disables all functionalities, even +* including the registers necessary for feature detections. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Google" ), + }, + }, + { } +}; +static int amd_mp2_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct amd_mp2_dev *privdata;int rc; +if (dmi_first_match (dmi_nodevs)) +return -ENODEV ; + privdata =devm_kzalloc (&pdev->dev,sizeof (*privdata),GFP_KERNEL );if (!privdata)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 52/72 drm/amdgpu: disable 3DCGCG/CGLS temporarily due to stability issue
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 1b586595df6d04c27088ef348b8202204ce26d45 ]
Some stability issues were reported with these features.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -530,8 +530,10 @@ static int soc21_common_early_init(void *handle)case IP_VERSION (11 ,0 ,0 ): adev->cg_flags = AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_CGLS | +#if 0 AMD_CG_SUPPORT_GFX_3D_CGCG | AMD_CG_SUPPORT_GFX_3D_CGLS | +#endif AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_REPEATER_FGCG | AMD_CG_SUPPORT_GFX_FGCG |
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/72 drm/amdgpu: Increase tlb flush timeout for sriov
In reply to Greg Kroah-HartmanFrom: Dusica Milinkovic <[email protected]>
[ Upstream commit 373008bfc9cdb0f050258947fa5a095f0657e1bc ]
[Why]
During multi-vf executing benchmark (Luxmark) observed kiq error timeout. It happenes because all of VFs do the tlb invalidation at the same time. Although each VF has the invalidate register set, from hardware side the invalidate requests are queue to execute.
[How]
In case of 12 VF increase timeout on 12*100ms
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 ++- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -313,7 +313,7 @@ enum amdgpu_kiq_irq {AMDGPU_CP_KIQ_IRQ_DRIVER0 =0 , AMDGPU_CP_KIQ_IRQ_LAST }; - +#define SRIOV_USEC_TIMEOUT 1200000/* wait 12 * 100ms for SRIOV */ #define MAX_KIQ_REG_WAIT 5000/* in usecs, 5ms */ #define MAX_KIQ_REG_BAILOUT_INTERVAL 5/* in msecs, 5ms */ #define MAX_KIQ_REG_TRY 1000
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +2 -1
@@ -416,6 +416,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,uint32_t seq;uint16_t queried_pasid;bool ret; +u32 usec_timeout =amdgpu_sriov_vf (adev) ?SRIOV_USEC_TIMEOUT : adev->usec_timeout;struct amdgpu_ring *ring = &adev->gfx.kiq.ring;struct amdgpu_kiq *kiq = &adev->gfx.kiq;
@@ -434,7 +435,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,amdgpu_ring_commit (ring);spin_unlock (&adev->gfx.kiq.ring_lock); - r =amdgpu_fence_wait_polling (ring, seq, adev->usec_timeout); + r =amdgpu_fence_wait_polling (ring, seq, usec_timeout);if (r <1 ) {dev_err (adev->dev,"wait for kiq fence error: %ld.\n" , r);return -ETIME ;
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +2 -1
@@ -896,6 +896,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,uint32_t seq;uint16_t queried_pasid;bool ret; +u32 usec_timeout =amdgpu_sriov_vf (adev) ?SRIOV_USEC_TIMEOUT : adev->usec_timeout;struct amdgpu_ring *ring = &adev->gfx.kiq.ring;struct amdgpu_kiq *kiq = &adev->gfx.kiq;
@@ -935,7 +936,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,amdgpu_ring_commit (ring);spin_unlock (&adev->gfx.kiq.ring_lock); - r =amdgpu_fence_wait_polling (ring, seq, adev->usec_timeout); + r =amdgpu_fence_wait_polling (ring, seq, usec_timeout);if (r <1 ) {dev_err (adev->dev,"wait for kiq fence error: %ld.\n" , r);up_read (&adev->reset_domain->sem);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/72 net: neigh: dont call kfree_skb() under spin_lock_irqsave()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
commit d5485d9dd24e1d04e5509916515260186eb1455c upstream.
It is not allowed to call kfree_skb() from hardware interrupt context or with interrupts being disabled. So add all skb to a tmp list, then free them after spin_unlock_irqrestore() at once.
--- net/core/neighbour.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/core/neighbour.c +8 -2
@@ -309,21 +309,27 @@ static int neigh_del_timer(struct neighbstatic void pneigh_queue_purge (struct sk_buff_head *list,struct net *net) { +struct sk_buff_head tmp;unsigned long flags;struct sk_buff *skb; +skb_queue_head_init (&tmp);spin_lock_irqsave (&list->lock, flags); skb =skb_peek (list);while (skb !=NULL ) {struct sk_buff *skb_next =skb_peek_next (skb, list);if (net ==NULL ||net_eq (dev_net (skb->dev), net)) {__skb_unlink (skb, list); -dev_put (skb->dev); -kfree_skb (skb); +__skb_queue_tail (&tmp, skb); } skb = skb_next; }spin_unlock_irqrestore (&list->lock, flags); + +while ((skb =__skb_dequeue (&tmp))) { +dev_put (skb->dev); +kfree_skb (skb); + } } static void neigh_flush_dev(struct neigh_table *tbl, struct net_device *dev,
Greg Kroah-Hartman
maintainerPATCH 26/72 HID: thrustmaster: Add sparco wheel and fix array length
In reply to Greg Kroah-HartmanFrom: Michael Hübner <[email protected]>
commit d9a17651f3749e69890db57ca66e677dfee70829 upstream.
Add device id for the Sparco R383 Mod wheel.
Fix wheel info array length to match actual wheel count present in the array.
--- drivers/hid/hid-thrustmaster.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hid/hid-thrustmaster.c +2 -1
@@ -67,12 +67,13 @@ static const struct tm_wheel_info tm_whe {0x0200, 0x0005, "Thrustmaster T300RS (Missing Attachment)"}, {0x0206, 0x0005, "Thrustmaster T300RS"}, {0x0209, 0x0005, "Thrustmaster T300RS (Open Wheel Attachment)"}, + {0x020a, 0x0005, "Thrustmaster T300RS (Sparco R383 Mod)"}, {0x0204, 0x0005, "Thrustmaster T300 Ferrari Alcantara Edition"}, {0x0002, 0x0002, "Thrustmaster T500RS"} //{0x0407, 0x0001, "Thrustmaster TMX"} }; -static const uint8_t tm_wheels_infos_length =4 ; +static const uint8_t tm_wheels_infos_length =7 ;/* * This structs contains (in little endian) the response data
Greg Kroah-Hartman
maintainerPATCH 66/72 btrfs: move lockdep class helpers to locking.c
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 0a27a0474d146eb79e09ec88bf0d4229f4cfc1b8 ]
These definitions exist in disk-io.c, which is not related to the locking. Move this over to locking.h/c where it makes more sense.
--- fs/btrfs/disk-io.c | 82 ---------------------------------------------- fs/btrfs/disk-io.h | 10 ------ fs/btrfs/locking.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/locking.h | 9 +++++ 4 files changed, 89 insertions(+), 92 deletions(-)
fs/btrfs/disk-io.c +0 -82
@@ -121,88 +121,6 @@ struct async_submit_bio {blk_status_t status; }; -/* -* Lockdep class keys for extent_buffer->lock's in this root. For a given -* eb, the lockdep key is determined by the btrfs_root it belongs to and -* the level the eb occupies in the tree. -* -* Different roots are used for different purposes and may nest inside each -* other and they require separate keysets. As lockdep keys should be -* static, assign keysets according to the purpose of the root as indicated -* by btrfs_root->root_key.objectid. This ensures that all special purpose -* roots have separate keysets. -* -* Lock-nesting across peer nodes is always done with the immediate parent -* node locked thus preventing deadlock. As lockdep doesn't know this, use -* subclass to avoid triggering lockdep warning in such cases. -* -* The key is set by the readpage_end_io_hook after the buffer has passed -* csum validation but before the pages are unlocked. It is also set by -* btrfs_init_new_buffer on freshly allocated blocks. -* -* We also add a check to make sure the highest level of the tree is the -* same as our lockdep setup here. If BTRFS_MAX_LEVEL changes, this code -* needs update as well. -*/ -#ifdef CONFIG_DEBUG_LOCK_ALLOC -# if BTRFS_MAX_LEVEL !=8 -# error -# endif - -#define DEFINE_LEVEL (stem, level) \ - .names[level] = "btrfs-" stem "-0" #level, - -#define DEFINE_NAME (stem) \ - DEFINE_LEVEL(stem, 0) \ - DEFINE_LEVEL(stem, 1) \ - DEFINE_LEVEL(stem, 2) \ - DEFINE_LEVEL(stem, 3) \ - DEFINE_LEVEL(stem, 4) \ - DEFINE_LEVEL(stem, 5) \ - DEFINE_LEVEL(stem, 6) \ - DEFINE_LEVEL(stem, 7) - -static struct btrfs_lockdep_keyset { -u64 id;/* root objectid */ -/* Longest entry: btrfs-free-space-00 */ -char names[BTRFS_MAX_LEVEL ][20 ]; -struct lock_class_key keys[BTRFS_MAX_LEVEL ]; -} btrfs_lockdep_keysets[] = { - { .id =BTRFS_ROOT_TREE_OBJECTID ,DEFINE_NAME ("root" ) }, - { .id =BTRFS_EXTENT_TREE_OBJECTID ,DEFINE_NAME ("extent" ) }, - { .id =BTRFS_CHUNK_TREE_OBJECTID ,DEFINE_NAME ("chunk" ) }, - { .id =BTRFS_DEV_TREE_OBJECTID ,DEFINE_NAME ("dev" ) }, - { .id =BTRFS_CSUM_TREE_OBJECTID ,DEFINE_NAME ("csum" ) }, - { .id =BTRFS_QUOTA_TREE_OBJECTID ,DEFINE_NAME ("quota" ) }, - { .id =BTRFS_TREE_LOG_OBJECTID ,DEFINE_NAME ("log" ) }, - { .id =BTRFS_TREE_RELOC_OBJECTID ,DEFINE_NAME ("treloc" ) }, - { .id =BTRFS_DATA_RELOC_TREE_OBJECTID ,DEFINE_NAME ("dreloc" ) }, - { .id =BTRFS_UUID_TREE_OBJECTID ,DEFINE_NAME ("uuid" ) }, - { .id =BTRFS_FREE_SPACE_TREE_OBJECTID ,DEFINE_NAME ("free-space" ) }, - { .id =0 ,DEFINE_NAME ("tree" ) }, -}; - -#undef DEFINE_LEVEL -#undef DEFINE_NAME - -void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb, -int level) -{ -struct btrfs_lockdep_keyset *ks; - -BUG_ON (level >=ARRAY_SIZE (ks->keys)); - -/* find the matching keyset, id 0 is the default entry */ -for (ks = btrfs_lockdep_keysets; ks->id; ks++) -if (ks->id == objectid) -break ; - -lockdep_set_class_and_name (&eb->lock, - &ks->keys[level], ks->names[level]); -} - -#endif -/* * Compute the csum of a btree block and store the result to provided buffer. */
fs/btrfs/disk-io.h +0 -10
@@ -148,14 +148,4 @@ int btrfs_init_root_free_objectid(struct btrfs_root *root);int __init btrfs_end_io_wq_init (void );void __cold btrfs_end_io_wq_exit (void ); -#ifdef CONFIG_DEBUG_LOCK_ALLOC -void btrfs_set_buffer_lockdep_class (u64 objectid, -struct extent_buffer *eb,int level); -#else -static inline void btrfs_set_buffer_lockdep_class (u64 objectid, -struct extent_buffer *eb,int level) -{ -} -#endif -#endif
fs/btrfs/locking.c +80 -0
86 lines not on this page · raw message
fs/btrfs/locking.h +9 -0
@@ -131,4 +131,13 @@ void btrfs_drew_write_unlock(struct btrfs_drew_lock *lock);void btrfs_drew_read_lock (struct btrfs_drew_lock *lock);void btrfs_drew_read_unlock (struct btrfs_drew_lock *lock); +#ifdef CONFIG_DEBUG_LOCK_ALLOC +void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level); +#else +static inline void btrfs_set_buffer_lockdep_class (u64 objectid, +struct extent_buffer *eb,int level) +{ +} +#endif +#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/72 btrfs: tree-checker: check for overlapping extent items
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 899b7f69f244e539ea5df1b4d756046337de44a5 ]
We're seeing a weird problem in production where we have overlapping extent items in the extent tree. It's unclear where these are coming from, and in debugging we realized there's no check in the tree checker for this sort of problem. Add a check to the tree-checker to make sure that the extents do not overlap each other.
--- fs/btrfs/tree-checker.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
fs/btrfs/tree-checker.c +23 -2
@@ -1233,7 +1233,8 @@ static void extent_err(const struct exte }static int check_extent_item (struct extent_buffer *leaf, -struct btrfs_key *key,int slot) +struct btrfs_key *key,int slot, +struct btrfs_key *prev_key) {struct btrfs_fs_info *fs_info = leaf->fs_info;struct btrfs_extent_item *ei;
@@ -1453,6 +1454,26 @@ static int check_extent_item(struct exte total_refs, inline_refs);return -EUCLEAN ; } + +if ((prev_key->type ==BTRFS_EXTENT_ITEM_KEY ) || + (prev_key->type ==BTRFS_METADATA_ITEM_KEY )) { +u64 prev_end = prev_key->objectid; + +if (prev_key->type ==BTRFS_METADATA_ITEM_KEY ) + prev_end += fs_info->nodesize; +else + prev_end += prev_key->offset; + +if (unlikely (prev_end > key->objectid)) { +extent_err (leaf, slot, +"previous extent [%llu %u %llu] overlaps current extent [%llu %u %llu]" , + prev_key->objectid, prev_key->type, + prev_key->offset, key->objectid, key->type, + key->offset); +return -EUCLEAN ; + } + } +return 0 ; }
@@ -1621,7 +1642,7 @@ static int check_leaf_item(struct extentbreak ;case BTRFS_EXTENT_ITEM_KEY :case BTRFS_METADATA_ITEM_KEY : - ret =check_extent_item (leaf, key, slot); + ret =check_extent_item (leaf, key, slot, prev_key);break ;case BTRFS_TREE_BLOCK_REF_KEY :case BTRFS_SHARED_DATA_REF_KEY :
Greg Kroah-Hartman
maintainerPATCH 63/72 testing: selftests: nft_flowtable.sh: use random netns names
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit b71b7bfeac38c7a21c423ddafb29aa6258949df8 ]
"ns1" is a too generic name, use a random suffix to avoid errors when such a netns exists. Also allows to run multiple instances of the script in parallel.
--- .../selftests/netfilter/nft_flowtable.sh | 246 +++++++++--------- 1 file changed, 128 insertions(+), 118 deletions(-)
tools/testing/selftests/netfilter/nft_flowtable.sh +128 -118
@@ -14,6 +14,11 @@ # nft_flowtable.sh -o8000 -l1500 -r2000 # +sfx=$(mktemp -u "XXXXXXXX") +ns1="ns1-$sfx" +ns2="ns2-$sfx" +nsr1="nsr1-$sfx" +nsr2="nsr2-$sfx" # Kselftest framework requirement - SKIP code is 4. ksft_skip=4
@@ -36,18 +41,17 @@ checktool (){ checktool "nft --version" "run test without nft tool" checktool "ip -Version" "run test without ip tool" checktool "which nc" "run test without nc (netcat)" -checktool "ip netns add nsr1" "create net namespace" +checktool "ip netns add $nsr1" "create net namespace $nsr1" -ip netns add ns1 -ip netns add ns2 - -ip netns add nsr2 +ip netns add $ns1 +ip netns add $ns2 +ip netns add $nsr2 cleanup() { - for i in 1 2; do - ip netns del ns$i - ip netns del nsr$i - done + ip netns del $ns1 + ip netns del $ns2 + ip netns del $nsr1 + ip netns del $nsr2 rm -f "$ns1in" "$ns1out" rm -f "$ns2in" "$ns2out"
@@ -59,22 +63,21 @@ trap cleanup EXIT sysctl -q net.netfilter.nf_log_all_netns=1 -ip link add veth0 netns nsr1 type veth peer name eth0 netns ns1 -ip link add veth1 netns nsr1 type veth peer name veth0 netns nsr2 +ip link add veth0 netns $nsr1 type veth peer name eth0 netns $ns1 +ip link add veth1 netns $nsr1 type veth peer name veth0 netns $nsr2 -ip link add veth1 netns nsr2 type veth peer name eth0 netns ns2 +ip link add veth1 netns $nsr2 type veth peer name eth0 netns $ns2 for dev in lo veth0 veth1; do - for i in 1 2; do - ip -net nsr$i link set $dev up - done + ip -net $nsr1 link set $dev up + ip -net $nsr2 link set $dev up done -ip -net nsr1 addr add 10.0.1.1/24 dev veth0 -ip -net nsr1 addr add dead:1::1/64 dev veth0 +ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 +ip -net $nsr1 addr add dead:1::1/64 dev veth0 -ip -net nsr2 addr add 10.0.2.1/24 dev veth1 -ip -net nsr2 addr add dead:2::1/64 dev veth1 +ip -net $nsr2 addr add 10.0.2.1/24 dev veth1 +ip -net $nsr2 addr add dead:2::1/64 dev veth1 # set different MTUs so we need to push packets coming from ns1 (large MTU) # to ns2 (smaller MTU) to stack either to perform fragmentation (ip_no_pmtu_disc=1),
@@ -106,49 +109,56 @@ do esac done -if ! ip -net nsr1 link set veth0 mtu $omtu; then +if ! ip -net $nsr1 link set veth0 mtu $omtu; then exit 1 fi -ip -net ns1 link set eth0 mtu $omtu +ip -net $ns1 link set eth0 mtu $omtu -if ! ip -net nsr2 link set veth1 mtu $rmtu; then +if ! ip -net $nsr2 link set veth1 mtu $rmtu; then exit 1 fi -ip -net ns2 link set eth0 mtu $rmtu +ip -net $ns2 link set eth0 mtu $rmtu # transfer-net between nsr1 and nsr2. # these addresses are not used for connections. -ip -net nsr1 addr add 192.168.10.1/24 dev veth1 -ip -net nsr1 addr add fee1:2::1/64 dev veth1 - -ip -net nsr2 addr add 192.168.10.2/24 dev veth0 -ip -net nsr2 addr add fee1:2::2/64 dev veth0 - -for i in 1 2; do - ip netns exec nsr$i sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null - ip netns exec nsr$i sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null - - ip -net ns$i link set lo up - ip -net ns$i link set eth0 up - ip -net ns$i addr add 10.0.$i.99/24 dev eth0 - ip -net ns$i route add default via 10.0.$i.1 - ip -net ns$i addr add dead:$i::99/64 dev eth0 - ip -net ns$i route add default via dead:$i::1 - if ! ip netns exec ns$i sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then +ip -net $nsr1 addr add 192.168.10.1/24 dev veth1 +ip -net $nsr1 addr add fee1:2::1/64 dev veth1 + +ip -net $nsr2 addr add 192.168.10.2/24 dev veth0 +ip -net $nsr2 addr add fee1:2::2/64 dev veth0 + +for i in 0 1; do + ip netns exec $nsr1 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null + ip netns exec $nsr2 sysctl net.ipv4.conf.veth$i.forwarding=1 > /dev/null +done + +for ns in $ns1 $ns2;do + ip -net $ns link set lo up + ip -net $ns link set eth0 up + + if ! ip netns exec $ns sysctl net.ipv4.tcp_no_metrics_save=1 > /dev/null; then echo "ERROR: Check Originator/Responder values (problem during address addition)" exit 1 fi - # don't set ip DF bit for first two tests - ip netns exec ns$i sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null + ip netns exec $ns sysctl net.ipv4.ip_no_pmtu_disc=1 > /dev/null done -ip -net nsr1 route add default via 192.168.10.2 -ip -net nsr2 route add default via 192.168.10.1 +ip -net $ns1 addr add 10.0.1.99/24 dev eth0 +ip -net $ns2 addr add 10.0.2.99/24 dev eth0 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns2 route add default via 10.0.2.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0 +ip -net $ns2 addr add dead:2::99/64 dev eth0 +ip -net $ns1 route add default via dead:1::1 +ip -net $ns2 route add default via dead:2::1 + +ip -net $nsr1 route add default via 192.168.10.2 +ip -net $nsr2 route add default via 192.168.10.1 -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF table inet filter { flowtable f1 { hook ingress priority 0
@@ -197,18 +207,18 @@ if [ $? -ne 0 ]; then fi # test basic connectivity -if ! ip netns exec ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then - echo "ERROR: ns1 cannot reach ns2" 1>&2 +if ! ip netns exec $ns1 ping -c 1 -q 10.0.2.99 > /dev/null; then + echo "ERROR: $ns1 cannot reach ns2" 1>&2 exit 1 fi -if ! ip netns exec ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then - echo "ERROR: ns2 cannot reach ns1" 1>&2 +if ! ip netns exec $ns2 ping -c 1 -q 10.0.1.99 > /dev/null; then + echo "ERROR: $ns2 cannot reach $ns1" 1>&2 exit 1 fi if [ $ret -eq 0 ];then - echo "PASS: netns routing/connectivity: ns1 can reach ns2" + echo "PASS: netns routing/connectivity: $ns1 can reach $ns2" fi ns1in=$(mktemp)
@@ -312,24 +322,24 @@ make_file "$ns2in" # First test: # No PMTU discovery, nsr1 is expected to fragment packets from ns1 to ns2 as needed. -if test_tcp_forwarding ns1 ns2; then +if test_tcp_forwarding $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2" else echo "FAIL: flow offload for ns1/ns2:" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # delete default route, i.e. ns2 won't be able to reach ns1 and # will depend on ns1 being masqueraded in nsr1. # expect ns1 has nsr1 address. -ip -net ns2 route del default via 10.0.2.1 -ip -net ns2 route del default via dead:2::1 -ip -net ns2 route add 192.168.10.1 via 10.0.2.1 +ip -net $ns2 route del default via 10.0.2.1 +ip -net $ns2 route del default via dead:2::1 +ip -net $ns2 route add 192.168.10.1 via 10.0.2.1 # Second test: # Same, but with NAT enabled. -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF table ip nat { chain prerouting { type nat hook prerouting priority 0; policy accept;
@@ -343,47 +353,47 @@ table ip nat { } EOF -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with NAT" else echo "FAIL: flow offload for ns1/ns2 with NAT" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # Third test: # Same as second test, but with PMTU discovery enabled. -handle=$(ip netns exec nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) +handle=$(ip netns exec $nsr1 nft -a list table inet filter | grep something-to-grep-for | cut -d \# -f 2) -if ! ip netns exec nsr1 nft delete rule inet filter forward $handle; then +if ! ip netns exec $nsr1 nft delete rule inet filter forward $handle; then echo "FAIL: Could not delete large-packet accept rule" exit 1 fi -ip netns exec ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null -ip netns exec ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null +ip netns exec $ns1 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null +ip netns exec $ns2 sysctl net.ipv4.ip_no_pmtu_disc=0 > /dev/null -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with NAT and pmtu discovery" else echo "FAIL: flow offload for ns1/ns2 with NAT and pmtu discovery" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset fi # Another test: # Add bridge interface br0 to Router1, with NAT enabled. -ip -net nsr1 link add name br0 type bridge -ip -net nsr1 addr flush dev veth0 -ip -net nsr1 link set up dev veth0 -ip -net nsr1 link set veth0 master br0 -ip -net nsr1 addr add 10.0.1.1/24 dev br0 -ip -net nsr1 addr add dead:1::1/64 dev br0 -ip -net nsr1 link set up dev br0 +ip -net $nsr1 link add name br0 type bridge +ip -net $nsr1 addr flush dev veth0 +ip -net $nsr1 link set up dev veth0 +ip -net $nsr1 link set veth0 master br0 +ip -net $nsr1 addr add 10.0.1.1/24 dev br0 +ip -net $nsr1 addr add dead:1::1/64 dev br0 +ip -net $nsr1 link set up dev br0 -ip netns exec nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null +ip netns exec $nsr1 sysctl net.ipv4.conf.br0.forwarding=1 > /dev/null # br0 with NAT enabled. -ip netns exec nsr1 nft -f - <<EOF +ip netns exec $nsr1 nft -f - <<EOF flush table ip nat table ip nat { chain prerouting {
@@ -398,59 +408,59 @@ table ip nat { } EOF -if test_tcp_forwarding_nat ns1 ns2; then +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with bridge NAT" else echo "FAIL: flow offload for ns1/ns2 with bridge NAT" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # Another test: # Add bridge interface br0 to Router1, with NAT and VLAN. -ip -net nsr1 link set veth0 nomaster -ip -net nsr1 link set down dev veth0 -ip -net nsr1 link add link veth0 name veth0.10 type vlan id 10 -ip -net nsr1 link set up dev veth0 -ip -net nsr1 link set up dev veth0.10 -ip -net nsr1 link set veth0.10 master br0 - -ip -net ns1 addr flush dev eth0 -ip -net ns1 link add link eth0 name eth0.10 type vlan id 10 -ip -net ns1 link set eth0 up -ip -net ns1 link set eth0.10 up -ip -net ns1 addr add 10.0.1.99/24 dev eth0.10 -ip -net ns1 route add default via 10.0.1.1 -ip -net ns1 addr add dead:1::99/64 dev eth0.10 - -if test_tcp_forwarding_nat ns1 ns2; then +ip -net $nsr1 link set veth0 nomaster +ip -net $nsr1 link set down dev veth0 +ip -net $nsr1 link add link veth0 name veth0.10 type vlan id 10 +ip -net $nsr1 link set up dev veth0 +ip -net $nsr1 link set up dev veth0.10 +ip -net $nsr1 link set veth0.10 master br0 + +ip -net $ns1 addr flush dev eth0 +ip -net $ns1 link add link eth0 name eth0.10 type vlan id 10 +ip -net $ns1 link set eth0 up +ip -net $ns1 link set eth0.10 up +ip -net $ns1 addr add 10.0.1.99/24 dev eth0.10 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0.10 + +if test_tcp_forwarding_nat $ns1 $ns2; then echo "PASS: flow offloaded for ns1/ns2 with bridge NAT and VLAN" else echo "FAIL: flow offload for ns1/ns2 with bridge NAT and VLAN" 1>&2 - ip netns exec nsr1 nft list ruleset + ip netns exec $nsr1 nft list ruleset ret=1 fi # restore test topology (remove bridge and VLAN) -ip -net nsr1 link set veth0 nomaster -ip -net nsr1 link set veth0 down -ip -net nsr1 link set veth0.10 down -ip -net nsr1 link delete veth0.10 type vlan -ip -net nsr1 link delete br0 type bridge -ip -net ns1 addr flush dev eth0.10 -ip -net ns1 link set eth0.10 down -ip -net ns1 link set eth0 down -ip -net ns1 link delete eth0.10 type vlan +ip -net $nsr1 link set veth0 nomaster +ip -net $nsr1 link set veth0 down +ip -net $nsr1 link set veth0.10 down +ip -net $nsr1 link delete veth0.10 type vlan +ip -net $nsr1 link delete br0 type bridge +ip -net $ns1 addr flush dev eth0.10 +ip -net $ns1 link set eth0.10 down +ip -net $ns1 link set eth0 down +ip -net $ns1 link delete eth0.10 type vlan # restore address in ns1 and nsr1 -ip -net ns1 link set eth0 up -ip -net ns1 addr add 10.0.1.99/24 dev eth0 -ip -net ns1 route add default via 10.0.1.1 -ip -net ns1 addr add dead:1::99/64 dev eth0 -ip -net ns1 route add default via dead:1::1 -ip -net nsr1 addr add 10.0.1.1/24 dev veth0 -ip -net nsr1 addr add dead:1::1/64 dev veth0 -ip -net nsr1 link set up dev veth0 +ip -net $ns1 link set eth0 up +ip -net $ns1 addr add 10.0.1.99/24 dev eth0 +ip -net $ns1 route add default via 10.0.1.1 +ip -net $ns1 addr add dead:1::99/64 dev eth0 +ip -net $ns1 route add default via dead:1::1 +ip -net $nsr1 addr add 10.0.1.1/24 dev veth0 +ip -net $nsr1 addr add dead:1::1/64 dev veth0 +ip -net $nsr1 link set up dev veth0 KEY_SHA="0x"$(ps -xaf | sha1sum | cut -d " " -f 1) KEY_AES="0x"$(ps -xaf | md5sum | cut -d " " -f 1)
@@ -480,23 +490,23 @@ do_esp() { } -do_esp nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 +do_esp $nsr1 192.168.10.1 192.168.10.2 10.0.1.0/24 10.0.2.0/24 $SPI1 $SPI2 -do_esp nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 +do_esp $nsr2 192.168.10.2 192.168.10.1 10.0.2.0/24 10.0.1.0/24 $SPI2 $SPI1 -ip netns exec nsr1 nft delete table ip nat +ip netns exec $nsr1 nft delete table ip nat # restore default routes -ip -net ns2 route del 192.168.10.1 via 10.0.2.1 -ip -net ns2 route add default via 10.0.2.1 -ip -net ns2 route add default via dead:2::1 +ip -net $ns2 route del 192.168.10.1 via 10.0.2.1 +ip -net $ns2 route add default via 10.0.2.1 +ip -net $ns2 route add default via dead:2::1 -if test_tcp_forwarding ns1 ns2; then +if test_tcp_forwarding $ns1 $ns2; then echo "PASS: ipsec tunnel mode for ns1/ns2" else echo "FAIL: ipsec tunnel mode for ns1/ns2" - ip netns exec nsr1 nft list ruleset 1>&2 - ip netns exec nsr1 cat /proc/net/xfrm_stat 1>&2 + ip netns exec $nsr1 nft list ruleset 1>&2 + ip netns exec $nsr1 cat /proc/net/xfrm_stat 1>&2 fi exit $ret
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/72 drm/amdgpu: Add secure display TA load for Renoir
In reply to Greg Kroah-HartmanFrom: Shane Xiao <[email protected]>
[ Upstream commit e42dfa66d59240afbdd8d4b47b87486db39504aa ]
Add secure display TA load for Renoir
--- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +10 -0
@@ -101,6 +101,16 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) adev->psp.dtm_context.context.bin_desc.start_addr = (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +le32_to_cpu (ta_hdr->dtm.offset_bytes); + +if (adev->apu_flags &AMD_APU_IS_RENOIR ) { + adev->psp.securedisplay_context.context.bin_desc.fw_version = +le32_to_cpu (ta_hdr->securedisplay.fw_version); + adev->psp.securedisplay_context.context.bin_desc.size_bytes = +le32_to_cpu (ta_hdr->securedisplay.size_bytes); + adev->psp.securedisplay_context.context.bin_desc.start_addr = + (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr + +le32_to_cpu (ta_hdr->securedisplay.offset_bytes); + } }return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/72 drm/amdgpu: Fix interrupt handling on ih_soft ring
In reply to Greg Kroah-HartmanFrom: Mukul Joshi <[email protected]>
[ Upstream commit de8341ee3ce7316883e836a2c4e9bf01ab651e0f ]
There are no backing hardware registers for ih_soft ring. As a result, don't try to access hardware registers for read and write pointers when processing interrupts on the IH soft ring.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +6 -1
@@ -409,9 +409,11 @@ static u32 navi10_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -483,6 +485,9 @@ static void navi10_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +6 -1
@@ -334,9 +334,11 @@ static u32 vega10_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -409,6 +411,9 @@ static void vega10_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +6 -1
@@ -385,9 +385,11 @@ static u32 vega20_ih_get_wptr(struct amdgpu_device *adev,u32 wptr, tmp;struct amdgpu_ih_regs *ih_regs; -if (ih == &adev->irq.ih) { +if (ih == &adev->irq.ih || ih == &adev->irq.ih_soft) {/* Only ring0 supports writeback. On other rings fall back * to register-based code with overflow checking below. +* ih_soft ring doesn't have any backing hardware registers, +* update wptr and return. */ wptr =le32_to_cpu (*ih->wptr_cpu);
@@ -461,6 +463,9 @@ static void vega20_ih_set_rptr(struct amdgpu_device *adev, {struct amdgpu_ih_regs *ih_regs; +if (ih == &adev->irq.ih_soft) +return ; +if (ih->use_doorbell) {/* XXX check if swapping is necessary on BE */ *ih->rptr_cpu = ih->rptr;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/72 android: binder: fix lockdep check on clearing vma
In reply to Greg Kroah-HartmanFrom: Liam Howlett <[email protected]>
commit b0cab80ecd54ae3b2356bb081af0bffd538c8265 upstream.
When munmapping a vma, the mmap_lock can be degraded to a write before calling close() on the file handle. The binder close() function calls binder_alloc_set_vma() to clear the vma address, which now has a lock dep check for writing on the mmap_lock. Change the lockdep check to ensure the reading lock is held while clearing and keep the write check while writing.
--- drivers/android/binder_alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/android/binder_alloc.c +8 -1
@@ -315,12 +315,19 @@ static inline void binder_alloc_set_vma( {unsigned long vm_start =0 ; +/* +* Allow clearing the vma with holding just the read lock to allow +* munmapping downgrade of the write lock before freeing and closing the +* file using binder_alloc_vma_close(). +*/ if (vma) { vm_start = vma->vm_start; alloc->vma_vm_mm = vma->vm_mm; +mmap_assert_write_locked (alloc->vma_vm_mm); + }else { +mmap_assert_locked (alloc->vma_vm_mm); } -mmap_assert_write_locked (alloc->vma_vm_mm); alloc->vma_addr = vm_start; }
Greg Kroah-Hartman
maintainerPATCH 51/72 ksmbd: dont remove dos attribute xattr on O_TRUNC open
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
[ Upstream commit 17661ecf6a64eb11ae7f1108fe88686388b2acd5 ]
When smb client open file in ksmbd share with O_TRUNC, dos attribute xattr is removed as well as data in file. This cause the FSCTL_SET_SPARSE request from the client fails because ksmbd can't update the dos attribute after setting ATTR_SPARSE_FILE. And this patch fix xfstests generic/469 test also.
--- fs/ksmbd/smb2pdu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/ksmbd/smb2pdu.c +9 -9
@@ -2315,15 +2315,15 @@ static int smb2_remove_smb_xattrs(struct path *path) name += strlen(name) + 1) {ksmbd_debug (SMB ,"%s, len %zd\n" , name,strlen (name)); -if (strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ) && -strncmp (&name[XATTR_USER_PREFIX_LEN ],DOS_ATTRIBUTE_PREFIX , -DOS_ATTRIBUTE_PREFIX_LEN ) && -strncmp (&name[XATTR_USER_PREFIX_LEN ],STREAM_PREFIX ,STREAM_PREFIX_LEN )) -continue ; - - err =ksmbd_vfs_remove_xattr (user_ns, path->dentry, name); -if (err) -ksmbd_debug (SMB ,"remove xattr failed : %s\n" , name); +if (!strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ) && + !strncmp (&name[XATTR_USER_PREFIX_LEN ],STREAM_PREFIX , +STREAM_PREFIX_LEN )) { + err =ksmbd_vfs_remove_xattr (user_ns, path->dentry, + name); +if (err) +ksmbd_debug (SMB ,"remove xattr failed : %s\n" , + name); + } } out:kvfree (xattr_list);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainercover 5.19.7-rc1 review
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.19.7-rc1
Sudeep Holla <[email protected]>
arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level
Yang Yingliang <[email protected]>
net: neigh: don't call kfree_skb() under spin_lock_irqsave()
Zhengchao Shao <[email protected]>
net/af_packet: check len when min_header_len equals to 0
Liam Howlett <[email protected]>
android: binder: fix lockdep check on clearing vma
Josef Bacik <[email protected]>
btrfs: tree-checker: check for overlapping extent items
Josef Bacik <[email protected]>
btrfs: fix lockdep splat with reloc root extent buffers
Josef Bacik <[email protected]>
btrfs: move lockdep class helpers to locking.c
Stefan Binding <[email protected]>
ALSA: hda/cs8409: Support new Dolphin Variants
Lucas Tanure <[email protected]>
platform/x86: serial-multi-instantiate: Add CLSA0101 Laptop
Florian Westphal <[email protected]>
testing: selftests: nft_flowtable.sh: use random netns names
Geert Uytterhoeven <[email protected]>
netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y
Mukul Joshi <[email protected]>
drm/amdgpu: Fix interrupt handling on ih_soft ring
Shane Xiao <[email protected]>
drm/amdgpu: Add secure display TA load for Renoir
Harish Kasiviswanathan <[email protected]>
drm/amdgpu: Add decode_iv_ts helper for ih_v6 block
Charlene Liu <[email protected]>
drm/amd/display: avoid doing vm_init multiple time
Tom Chung <[email protected]>
drm/amd/display: Fix plug/unplug external monitor will hang while playback MPO video
Dusica Milinkovic <[email protected]>
drm/amdgpu: Increase tlb flush timeout for sriov
Ilya Bakoulin <[email protected]>
drm/amd/display: Fix pixel clock programming
Evan Quan <[email protected]>
drm/amd/pm: add missing ->fini_xxxx interfaces for some SMU13 asics
Evan Quan <[email protected]>
drm/amd/pm: add missing ->fini_microcode interface for Sienna Cichlid
Evan Quan <[email protected]>
drm/amdgpu: disable 3DCGCG/CGLS temporarily due to stability issue
Namjae Jeon <[email protected]>
ksmbd: don't remove dos attribute xattr on O_TRUNC open
Juergen Gross <[email protected]>
s390/hypfs: avoid error message under KVM
Stefan Binding <[email protected]>
ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41
Denis V. Lunev <[email protected]>
neigh: fix possible DoS due to net iface start/stop loop
Li Qiong <[email protected]>
net: lan966x: fix checking for return value of platform_get_irq_byname()
Namjae Jeon <[email protected]>
ksmbd: return STATUS_BAD_NETWORK_NAME error status if share is not configured
Zhen Ni <[email protected]>
drm/amd/pm: Fix a potential gpu_metrics_table memory leak
Felix Kuehling <[email protected]>
drm/amdkfd: Handle restart of kfd_ioctl_wait_events
Kenneth Feng <[email protected]>
drm/amd/pm: skip pptable override for smu_v13_0_7
Meenakshikumar Somasundaram <[email protected]>
drm/amd/display: Fix TDR eDP and USB4 display light up issue
Fudong Wang <[email protected]>
drm/amd/display: clear optc underflow before turn off odm clock
Alvin Lee <[email protected]>
drm/amd/display: For stereo keep "FLIP_ANY_FRAME"
Leo Ma <[email protected]>
drm/amd/display: Fix HDMI VSIF V3 incorrect issue
Josip Pavic <[email protected]>
drm/amd/display: Avoid MPC infinite loop
Chiawen Huang <[email protected]>
drm/amd/display: Device flash garbage before get in OS
Aurabindo Pillai <[email protected]>
drm/amd/display: Add a missing register field for HPO DP stream encoder
Alexandre Vicenzi <[email protected]>
rtla: Fix tracer name
Oder Chiou <[email protected]>
ASoC: rt5640: Fix the JD voltage dropping issue
Biju Das <[email protected]>
ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() error path
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix work with fragmented xattr
Liming Sun <[email protected]>
mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC
Sebastian Reichel <[email protected]>
mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx
Yifeng Zhao <[email protected]>
mmc: sdhci-of-dwcmshc: add reset call back for rockchip Socs
Wenbin Mei <[email protected]>
mmc: mtk-sd: Clear interrupts when cqe off/disable
Even Xu <[email protected]>
HID: intel-ish-hid: ipc: Add Meteor Lake PCI device ID
Michael Hübner <[email protected]>
HID: thrustmaster: Add sparco wheel and fix array length
Daniel J. Ogorchock <[email protected]>
HID: nintendo: fix rumble worker null pointer deref
Josh Kilmer <[email protected]>
HID: asus: ROG NKey: Ignore portion of 0x5a report
Aditya Garg <[email protected]>
HID: Add Apple Touchbar on T2 Macs in hid_have_special_driver list
Akihiko Odaki <[email protected]>
HID: AMD_SFH: Add a DMI quirk entry for Chromebooks
Steev Klimaszewski <[email protected]>
HID: add Lenovo Yoga C630 battery quirk
Benjamin Tissoires <[email protected]>
HID: input: fix uclogic tablets
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5
Jann Horn <[email protected]>
mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse
Zhengchao Shao <[email protected]>
bpf: Don't redirect packets with invalid pkt_len
Yang Jihong <[email protected]>
ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead
Letu Ren <[email protected]>
fbdev: fb_pm2fb: Avoid potential divide by zero error
Hawkins Jiawei <[email protected]>
net: fix refcount bug in sk_psock_get (2)
Karthik Alapati <[email protected]>
HID: hidraw: fix memory leak in hidraw_release()
Alan Stern <[email protected]>
USB: gadget: Fix use-after-free Read in usb_udc_uevent()
Dongliang Mu <[email protected]>
media: pvrusb2: fix memory leak in pvr_probe
Vivek Kasireddy <[email protected]>
udmabuf: Set the DMA mask for the udmabuf device (v2)
Lee Jones <[email protected]>
HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
Greg Kroah-Hartman <[email protected]>
Revert "PCI/portdrv: Don't disable AER reporting in get_port_device_capability()"
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix build errors in some archs
James Morse <[email protected]>
arm64: errata: Add Cortex-A510 to the repeat tlbi list
Akira Yokosawa <[email protected]>
docs: kerneldoc-preamble: Test xeCJK.sty before loading
Eric Biggers <[email protected]>
crypto: lib - remove unneeded selection of XOR_BLOCKS
Timo Alho <[email protected]>
firmware: tegra: bpmp: Do only aligned access to IPC memory area
Maxime Ripard <[email protected]>
drm/vc4: hdmi: Depends on CONFIG_PM
Maxime Ripard <[email protected]>
drm/vc4: hdmi: Rework power up
-------------
Diffstat:
Documentation/arm64/silicon-errata.rst | 2 + Documentation/sphinx/kerneldoc-preamble.sty | 22 +- Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 +- Makefile | 4 +- arch/arm64/Kconfig | 17 ++ arch/arm64/kernel/cacheinfo.c | 6 +- arch/arm64/kernel/cpu_errata.c | 8 +- arch/s390/hypfs/hypfs_diag.c | 2 +- arch/s390/hypfs/inode.c | 2 +- drivers/android/binder_alloc.c | 9 +- drivers/dma-buf/udmabuf.c | 18 +- drivers/firmware/tegra/bpmp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 7 +- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 10 + drivers/gpu/drm/amd/amdgpu/soc21.c | 2 + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 7 +- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +- drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 6 + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 6 + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 3 +- .../drm/amd/display/modules/freesync/freesync.c | 15 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 1 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 10 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 3 + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 + drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +- drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 18 ++ drivers/hid/hid-asus.c | 7 + drivers/hid/hid-ids.h | 3 + drivers/hid/hid-input.c | 7 +- drivers/hid/hid-nintendo.c | 6 +- drivers/hid/hid-quirks.c | 2 + drivers/hid/hid-steam.c | 10 + drivers/hid/hid-thrustmaster.c | 3 +- drivers/hid/hidraw.c | 2 + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 1 + drivers/mmc/host/mtk-sd.c | 6 + drivers/mmc/host/sdhci-of-dwcmshc.c | 88 +++++--- .../net/ethernet/microchip/lan966x/lan966x_main.c | 8 +- drivers/pci/pcie/portdrv_core.c | 9 +- drivers/platform/x86/serial-multi-instantiate.c | 1 + drivers/usb/gadget/udc/core.c | 11 +- drivers/video/fbdev/pm2fb.c | 5 + fs/btrfs/ctree.c | 3 + fs/btrfs/ctree.h | 2 + fs/btrfs/disk-io.c | 82 ------- fs/btrfs/disk-io.h | 10 - fs/btrfs/extent-tree.c | 18 +- fs/btrfs/extent_io.c | 11 +- fs/btrfs/locking.c | 91 ++++++++ fs/btrfs/locking.h | 14 ++ fs/btrfs/relocation.c | 2 + fs/btrfs/tree-checker.c | 25 ++- fs/ksmbd/mgmt/tree_connect.c | 2 +- fs/ksmbd/smb2pdu.c | 21 +- fs/ntfs3/xattr.c | 7 +- include/linux/rmap.h | 7 +- include/linux/skbuff.h | 8 + include/linux/skmsg.h | 3 +- include/net/sock.h | 68 ++++-- kernel/trace/ftrace.c | 10 + lib/crypto/Kconfig | 1 - mm/rmap.c | 29 +-- net/bluetooth/l2cap_core.c | 10 +- net/bpf/test_run.c | 3 + net/core/dev.c | 1 + net/core/neighbour.c | 27 ++- net/core/skmsg.c | 4 +- net/netfilter/Kconfig | 1 - net/packet/af_packet.c | 4 +- sound/pci/hda/patch_cs8409-tables.c | 4 + sound/pci/hda/patch_realtek.c | 2 + sound/soc/codecs/rt5640.c | 5 +- sound/soc/sh/rz-ssi.c | 26 ++- sound/usb/quirks.c | 2 + tools/testing/selftests/netfilter/nft_flowtable.sh | 246 +++++++++++---------- tools/tracing/rtla/src/timerlat_hist.c | 2 +- tools/tracing/rtla/src/timerlat_top.c | 2 +- 96 files changed, 803 insertions(+), 404 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 34/72 ASoC: rt5640: Fix the JD voltage dropping issue
From: Oder Chiou <[email protected]>
[ Upstream commit afb176d45870048eea540991b082208270824037 ]
The patch fixes the JD voltage dropping issue in the HDA JD using.
--- sound/soc/codecs/rt5640.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5640.c +3 -2
@@ -1986,7 +1986,7 @@ static int rt5640_set_bias_level(struct snd_soc_component *component,snd_soc_component_write (component,RT5640_PWR_MIXER ,0x0000 );if (rt5640->jd_src ==RT5640_JD_SRC_HDA_HEADER )snd_soc_component_write (component,RT5640_PWR_ANLG1 , -0x0018 ); +0x2818 );else snd_soc_component_write (component,RT5640_PWR_ANLG1 ,0x0000 );
@@ -2592,7 +2592,8 @@ static void rt5640_enable_hda_jack_detect(snd_soc_component_update_bits (component,RT5640_DUMMY1 ,0x400 ,0x0 );snd_soc_component_update_bits (component,RT5640_PWR_ANLG1 , -RT5640_PWR_VREF2 ,RT5640_PWR_VREF2 ); +RT5640_PWR_VREF2 |RT5640_PWR_MB |RT5640_PWR_BG , +RT5640_PWR_VREF2 |RT5640_PWR_MB |RT5640_PWR_BG );usleep_range (10000 ,15000 );snd_soc_component_update_bits (component,RT5640_PWR_ANLG1 ,RT5640_PWR_FV2 ,RT5640_PWR_FV2 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/72 platform/x86: serial-multi-instantiate: Add CLSA0101 Laptop
In reply to Greg Kroah-HartmanFrom: Lucas Tanure <[email protected]>
[ Upstream commit 88392a0dd0ab263edb4ca416ebdecabd8289158a ]
The device CLSA0101 has two instances of CS35L41
connected by I2C.
--- drivers/platform/x86/serial-multi-instantiate.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/serial-multi-instantiate.c +1 -0
@@ -329,6 +329,7 @@ static const struct acpi_device_id smi_acpi_ids[] = { { "CSC3551", (unsigned long)&cs35l41_hda },/* Non-conforming _HID for Cirrus Logic already released */ { "CLSA0100", (unsigned long)&cs35l41_hda }, + { "CLSA0101", (unsigned long)&cs35l41_hda }, { } };MODULE_DEVICE_TABLE (acpi, smi_acpi_ids);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/72 s390/hypfs: avoid error message under KVM
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit 7b6670b03641ac308aaa6fa2e6f964ac993b5ea3 ]
When booting under KVM the following error messages are issued:
hypfs.7f5705: The hardware system does not support hypfs hypfs.7a79f0: Initialization of hypfs failed with rc=-61
Demote the severity of first message from "error" to "info" and issue the second message only in other error cases.
--- arch/s390/hypfs/hypfs_diag.c | 2 +- arch/s390/hypfs/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/hypfs/hypfs_diag.c +1 -1
@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void)int rc;if (diag204_probe ()) { -pr_err ("The hardware system does not support hypfs\n" ); +pr_info ("The hardware system does not support hypfs\n" );return -ENODATA ; }
arch/s390/hypfs/inode.c +1 -1
@@ -496,9 +496,9 @@ static int __init hypfs_init(void)hypfs_vm_exit (); fail_hypfs_diag_exit:hypfs_diag_exit (); +pr_err ("Initialization of hypfs failed with rc=%i\n" , rc); fail_dbfs_exit:hypfs_dbfs_exit (); -pr_err ("Initialization of hypfs failed with rc=%i\n" , rc);return rc; }device_initcall (hypfs_init)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 16/72 ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
commit c3b0f72e805f0801f05fa2aa52011c4bfc694c44 upstream.
ftrace_startup does not remove ops from ftrace_ops_list when ftrace_startup_enable fails:
register_ftrace_function
ftrace_startup
__register_ftrace_function
...
add_ftrace_ops(&ftrace_ops_list, ops)
...
...
ftrace_startup_enable // if ftrace failed to modify, ftrace_disabled is set to 1
... return 0 // ops is in the ftrace_ops_list.
When ftrace_disabled = 1, unregister_ftrace_function simply returns without doing anything:unregister_ftrace_function
ftrace_shutdown
if (unlikely(ftrace_disabled))
return -ENODEV; // return here, __unregister_ftrace_function is not executed,
// as a result, ops is still in the ftrace_ops_list
__unregister_ftrace_function
...If ops is dynamically allocated, it will be free later, in this case, is_ftrace_trampoline accesses NULL pointer:
is_ftrace_trampoline
ftrace_ops_trampoline
do_for_each_ftrace_op(op, ftrace_ops_list) // OOPS! op may be NULL!
Syzkaller reports as follows:
[ 1203.506103] BUG: kernel NULL pointer dereference, address: 000000000000010b [ 1203.508039] #PF: supervisor read access in kernel mode [ 1203.508798] #PF: error_code(0x0000) - not-present page [ 1203.509558] PGD 800000011660b067 P4D 800000011660b067 PUD 130fb8067 PMD 0 [ 1203.510560] Oops: 0000 [#1] SMP KASAN PTI [ 1203.511189] CPU: 6 PID: 29532 Comm: syz-executor.2 Tainted: G B W 5.10.0 #8 [ 1203.512324] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [ 1203.513895] RIP: 0010:is_ftrace_trampoline+0x26/0xb0 [ 1203.514644] Code: ff eb d3 90 41 55 41 54 49 89 fc 55 53 e8 f2 00 fd ff 48 8b 1d 3b 35 5d 03 e8 e6 00 fd ff 48 8d bb 90 00 00 00 e8 2a 81 26 00 <48> 8b ab 90 00 00 00 48 85 ed 74 1d e8 c9 00 fd ff 48 8d bb 98 00 [ 1203.518838] RSP: 0018:ffffc900012cf960 EFLAGS: 00010246 [ 1203.520092] RAX: 0000000000000000 RBX: 000000000000007b RCX: ffffffff8a331866 [ 1203.521469] RDX: 0000000000000000 RSI: 0000000000000008 RDI: 000000000000010b [ 1203.522583] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffff8df18b07 [ 1203.523550] R10: fffffbfff1be3160 R11: 0000000000000001 R12: 0000000000478399 [ 1203.524596] R13: 0000000000000000 R14: ffff888145088000 R15: 0000000000000008 [ 1203.525634] FS: 00007f429f5f4700(0000) GS:ffff8881daf00000(0000) knlGS:0000000000000000 [ 1203.526801] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1203.527626] CR2: 000000000000010b CR3: 0000000170e1e001 CR4: 00000000003706e0 [ 1203.528611] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1203.529605] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Therefore, when ftrace_startup_enable fails, we need to rollback registration process and remove ops from ftrace_ops_list.
--- kernel/trace/ftrace.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
kernel/trace/ftrace.c +10 -0
@@ -2937,6 +2937,16 @@ int ftrace_startup(struct ftrace_ops *opftrace_startup_enable (command); +/* +* If ftrace is in an undefined state, we just remove ops from list +* to prevent the NULL pointer, instead of totally rolling it back and +* free trampoline, because those actions could cause further damage. +*/ +if (unlikely (ftrace_disabled)) { +__unregister_ftrace_function (ops); +return -ENODEV ; + } + ops->flags &= ~FTRACE_OPS_FL_ADDING ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 21/72 HID: add Lenovo Yoga C630 battery quirk
In reply to Greg Kroah-HartmanFrom: Steev Klimaszewski <[email protected]>
commit 3a47fa7b14c7d9613909a844aba27f99d3c58634 upstream.
Similar to the Surface Go devices, the Elantech touchscreen/digitizer in the Lenovo Yoga C630 mistakenly reports the battery of the stylus, and always reports an empty battery.
Apply the HID_BATTERY_QUIRK_IGNORE quirk to ignore this battery and prevent the erroneous low battery warnings.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-input.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -414,6 +414,7 @@#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN 0x261A#define I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN 0x2A1C +#define I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN 0x279F#define USB_VENDOR_ID_ELECOM 0x056e#define USB_DEVICE_ID_ELECOM_BM084 0x0061
drivers/hid/hid-input.c +2 -0
@@ -383,6 +383,8 @@ static const struct hid_device_id hid_ba HID_BATTERY_QUIRK_IGNORE }, {HID_I2C_DEVICE (USB_VENDOR_ID_ELAN ,I2C_DEVICE_ID_SURFACE_GO2_TOUCHSCREEN ), HID_BATTERY_QUIRK_IGNORE }, + { HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_LENOVO_YOGA_C630_TOUCHSCREEN), + HID_BATTERY_QUIRK_IGNORE }, {} };
Greg Kroah-Hartman
maintainerPATCH 8/72 Revert "PCI/portdrv: Dont disable AER reporting in get_port_device_capability()"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
This reverts commit 65e393fddc5379b2c41ca7e73cd4bb9572c4d90e which is commit 8795e182b02dc87e343c79e73af6b8b7f9c5e635 upstream.
It is reported to cause problems, so drop it from the stable trees for now until it gets sorted out.
--- drivers/pci/pcie/portdrv_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/pci/pcie/portdrv_core.c +8 -1
@@ -222,8 +222,15 @@ static int get_port_device_capability(st#ifdef CONFIG_PCIEAER if (dev->aer_cap &&pci_aer_available () && - (pcie_ports_native || host->native_aer)) + (pcie_ports_native || host->native_aer)) { services |=PCIE_PORT_SERVICE_AER ; + +/* +* Disable AER on this port in case it's been enabled by the +* BIOS (the AER service driver will enable it when necessary). +*/ +pci_disable_pcie_error_reporting (dev); + }#endif /* Root Ports and Root Complex Event Collectors may generate PMEs */
Greg Kroah-Hartman
maintainerPATCH 20/72 HID: input: fix uclogic tablets
In reply to Greg Kroah-HartmanFrom: Benjamin Tissoires <[email protected]>
commit 8db8be9cfc89935c97d791c7e6264e710a7e8a56 upstream.
commit 87562fcd1342 ("HID: input: remove the need for HID_QUIRK_INVERT") made the assumption that it was the only one handling tablets and thus kept an internal state regarding the tool.
Turns out that the uclogic driver has a timer to release the in range bit, effectively making hid-input ignoring all in range information after the very first one.
Fix that by having a more rationale approach which consists in forwarding every event and let the input stack filter out the duplicates.
--- drivers/hid/hid-input.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/hid-input.c +4 -1
@@ -1532,7 +1532,10 @@ void hidinput_hid_event(struct hid_devic* assume ours */ if (!report->tool) -hid_report_set_tool (report, input, usage->code); + report->tool = usage->code; + +/* drivers may have changed the value behind our back, resend it */ +hid_report_set_tool (report, input, report->tool); }else {hid_report_release_tool (report, input, usage->code); }
Greg Kroah-Hartman
maintainerPATCH 17/72 bpf: Dont redirect packets with invalid pkt_len
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
commit fd1894224407c484f652ad456e1ce423e89bb3eb upstream.
Syzbot found an issue [1]: fq_codel_drop() try to drop a flow whitout any skbs, that is, the flow->head is null.
The root cause, as the [2] says, is because that bpf_prog_test_run_skb() run a bpf prog which redirects empty skbs.
So we should determine whether the length of the packet modified by bpf prog or others like bpf_prog_test is valid before forwarding it directly.
--- include/linux/skbuff.h | 8 ++++++++ net/bpf/test_run.c | 3 +++ net/core/dev.c | 1 + 3 files changed, 12 insertions(+)
include/linux/skbuff.h +8 -0
@@ -2624,6 +2624,14 @@ static inline void skb_set_tail_pointer(#endif /* NET_SKBUFF_DATA_USES_OFFSET */ +static inline void skb_assert_len (struct sk_buff *skb) +{ +#ifdef CONFIG_DEBUG_NET +if (WARN_ONCE (!skb->len,"%s\n" , __func__)) +DO_ONCE_LITE (skb_dump,KERN_ERR , skb, false); +#endif /* CONFIG_DEBUG_NET */ +} +/* * Add data to an sk_buff */
net/bpf/test_run.c +3 -0
@@ -955,6 +955,9 @@ static int convert___skb_to_skb(struct s {struct qdisc_skb_cb *cb = (struct qdisc_skb_cb *)skb->cb; +if (!skb->len) +return -EINVAL ; +if (!__skb)return 0 ;
net/core/dev.c +1 -0
@@ -4168,6 +4168,7 @@ int __dev_queue_xmit(struct sk_buff *skbbool again = false;skb_reset_mac_header (skb); +skb_assert_len (skb);if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_SCHED_TSTAMP ))__skb_tstamp_tx (skb,NULL ,NULL , skb->sk,SCM_TSTAMP_SCHED );
Greg Kroah-Hartman
maintainerPATCH 14/72 net: fix refcount bug in sk_psock_get (2)
In reply to Greg Kroah-HartmanFrom: Hawkins Jiawei <[email protected]>
commit 2a0133723f9ebeb751cfce19f74ec07e108bef1f upstream.
Syzkaller reports refcount bug as follows:
------------[ cut here ]------------ refcount_t: saturated; leaking memory. WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 Modules linked in: CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 <TASK> __refcount_add_not_zero include/linux/refcount.h:163 [inline] __refcount_inc_not_zero include/linux/refcount.h:227 [inline] refcount_inc_not_zero include/linux/refcount.h:245 [inline] sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 sk_backlog_rcv include/net/sock.h:1061 [inline] __release_sock+0x134/0x3b0 net/core/sock.c:2849 release_sock+0x54/0x1b0 net/core/sock.c:3404 inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 __sys_shutdown_sock net/socket.c:2331 [inline] __sys_shutdown_sock net/socket.c:2325 [inline] __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 __do_sys_shutdown net/socket.c:2351 [inline] __se_sys_shutdown net/socket.c:2349 [inline] __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 </TASK>
During SMC fallback process in connect syscall, kernel will replaces TCP with SMC. In order to forward wakeup smc socket waitqueue after fallback, kernel will sets clcsk->sk_user_data to origin smc socket in smc_fback_replace_callbacks().
Later, in shutdown syscall, kernel will calls sk_psock_get(), which treats the clcsk->sk_user_data as psock type, triggering the refcnt warning.
So, the root cause is that smc and psock, both will use sk_user_data field. So they will mismatch this field easily.
This patch solves it by using another bit(defined as SK_USER_DATA_PSOCK) in PTRMASK, to mark whether sk_user_data points to a psock object or not.
This patch depends on a PTRMASK introduced in commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").
For there will possibly be more flags in the sk_user_data field, this patch also refactor sk_user_data flags code to be more generic to improve its maintainability.
--- include/linux/skmsg.h | 3 +- include/net/sock.h | 68 +++++++++++++++++++++++++++++++++++--------------- net/core/skmsg.c | 4 ++ 3 files changed, 53 insertions(+), 22 deletions(-)
include/linux/skmsg.h +2 -1
@@ -277,7 +277,8 @@ static inline void sk_msg_sg_copy_clear(static inline struct sk_psock *sk_psock (const struct sock *sk) { -return rcu_dereference_sk_user_data (sk); +return __rcu_dereference_sk_user_data_with_flags (sk, +SK_USER_DATA_PSOCK ); } static inline void sk_psock_set_state(struct sk_psock *psock,
include/net/sock.h +48 -20
86 lines not on this page · raw message
net/core/skmsg.c +3 -1
@@ -735,7 +735,9 @@ struct sk_psock *sk_psock_init(struct sosk_psock_set_state (psock,SK_PSOCK_TX_ENABLED );refcount_set (&psock->refcnt,1 ); -rcu_assign_sk_user_data_nocopy (sk, psock); +__rcu_assign_sk_user_data_with_flags (sk, psock, +SK_USER_DATA_NOCOPY | +SK_USER_DATA_PSOCK );sock_hold (sk); out:
Greg Kroah-Hartman
maintainerPATCH 1/72 drm/vc4: hdmi: Rework power up
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
commit 258e483a4d5e97a6a8caa74381ddc1f395ac1c71 upstream.
The current code tries to handle the case where CONFIG_PM isn't selected by first calling our runtime_resume implementation and then properly report the power state to the runtime_pm core.
This allows to have a functionning device even if pm_runtime_get_* functions are nops.
However, the device power state if CONFIG_PM is enabled is RPM_SUSPENDED, and thus our vc4_hdmi_write() and vc4_hdmi_read() calls in the runtime_pm hooks will now report a warning since the device might not be properly powered.
Even more so, we need CONFIG_PM enabled since the previous RaspberryPi have a power domain that needs to be powered up for the HDMI controller to be usable.
The previous patch has created a dependency on CONFIG_PM, now we can just assume it's there and only call pm_runtime_resume_and_get() to make sure our device is powered in bind.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +7 -8
@@ -2992,17 +2992,15 @@ static int vc4_hdmi_bind(struct device * vc4_hdmi->disable_4kp60 = true; } +pm_runtime_enable (dev); +/* -* We need to have the device powered up at this point to call -* our reset hook and for the CEC init. +* We need to have the device powered up at this point to call +* our reset hook and for the CEC init. */ - ret =vc4_hdmi_runtime_resume (dev); + ret =pm_runtime_resume_and_get (dev);if (ret) - goto err_put_ddc; - -pm_runtime_get_noresume (dev); -pm_runtime_set_active (dev); -pm_runtime_enable (dev); + goto err_disable_runtime_pm; if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) &&
@@ -3048,6 +3046,7 @@ err_destroy_conn: err_destroy_encoder:drm_encoder_cleanup (encoder);pm_runtime_put_sync (dev); +err_disable_runtime_pm:pm_runtime_disable (dev); err_put_ddc:put_device (&vc4_hdmi->ddc->dev);
Greg Kroah-Hartman
maintainerPATCH 7/72 Bluetooth: L2CAP: Fix build errors in some archs
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
commit b840304fb46cdf7012722f456bce06f151b3e81b upstream.
This attempts to fix the follow errors:
In function 'memcmp',
inlined from 'bacmp' at ./include/net/bluetooth/bluetooth.h:347:9, inlined from 'l2cap_global_chan_by_psm' at net/bluetooth/l2cap_core.c:2003:15:./include/linux/fortify-string.h:44:33: error: '__builtin_memcmp' specified bound 6 exceeds source size 0 [-Werror=stringop-overread]
44 | #define __underlying_memcmp __builtin_memcmp
| ^
./include/linux/fortify-string.h:420:16: note: in expansion of macro
'__underlying_memcmp'
420 | return __underlying_memcmp(p, q, size);
| ^~~~~~~~~~~~~~~~~~~In function 'memcmp',
inlined from 'bacmp' at ./include/net/bluetooth/bluetooth.h:347:9, inlined from 'l2cap_global_chan_by_psm' at net/bluetooth/l2cap_core.c:2004:15:./include/linux/fortify-string.h:44:33: error: '__builtin_memcmp' specified bound 6 exceeds source size 0 [-Werror=stringop-overread]
44 | #define __underlying_memcmp __builtin_memcmp
| ^
./include/linux/fortify-string.h:420:16: note: in expansion of macro
'__underlying_memcmp'
420 | return __underlying_memcmp(p, q, size);
| ^~~~~~~~~~~~~~~~~~~--- net/bluetooth/l2cap_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +5 -5
@@ -1991,11 +1991,11 @@ static struct l2cap_chan *l2cap_global_c src_match = !bacmp (&c->src, src); dst_match = !bacmp (&c->dst, dst);if (src_match && dst_match) { - c =l2cap_chan_hold_unless_zero (c); -if (c) { -read_unlock (&chan_list_lock); -return c; - } +if (!l2cap_chan_hold_unless_zero (c)) +continue ; + +read_unlock (&chan_list_lock); +return c; }/* Closest match */
Greg Kroah-Hartman
maintainerPATCH 44/72 drm/amdkfd: Handle restart of kfd_ioctl_wait_events
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
[ Upstream commit bea9a56afbc4b5a41ea579b8b0dc5e189b439504 ]
When kfd_ioctl_wait_events needs to restart due to a signal, we need to update the timeout to account for the time already elapsed. We also need to undo auto_reset of events that have signaled already, so that the restarted ioctl will be able to count those signals again.
This fixes infinite hangs when kfd_ioctl_wait_events is interrupted by a signal.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 24 ++++++++++++------------ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +1 -1
@@ -814,7 +814,7 @@ static int kfd_ioctl_wait_events(struct file *filp, struct kfd_process *p, err =kfd_wait_on_events (p, args->num_events, (void __user *)args->events_ptr, (args->wait_for_all !=0 ), - args->timeout, &args->wait_result); + &args->timeout, &args->wait_result);return err; }
drivers/gpu/drm/amd/amdkfd/kfd_events.c +12 -12
@@ -895,7 +895,8 @@ static long user_timeout_to_jiffies(uint32_t user_timeout_ms)return msecs_to_jiffies (user_timeout_ms) +1 ; } -static void free_waiters (uint32_t num_events,struct kfd_event_waiter *waiters) +static void free_waiters (uint32_t num_events,struct kfd_event_waiter *waiters, +bool undo_auto_reset) {uint32_t i;
@@ -904,6 +905,9 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters)spin_lock (&waiters[i].event->lock);remove_wait_queue (&waiters[i].event->wq, &waiters[i].wait); +if (undo_auto_reset && waiters[i].activated && + waiters[i].event && waiters[i].event->auto_reset) +set_event (waiters[i].event);spin_unlock (&waiters[i].event->lock); }
@@ -912,7 +916,7 @@ static void free_waiters(uint32_t num_events, struct kfd_event_waiter *waiters)int kfd_wait_on_events (struct kfd_process *p,uint32_t num_events,void __user *data, -bool all,uint32_t user_timeout_ms, +bool all,uint32_t *user_timeout_ms,uint32_t *wait_result) { struct kfd_event_data __user *events =
@@ -921,7 +925,7 @@ int kfd_wait_on_events(struct kfd_process *p,int ret =0 ;struct kfd_event_waiter *event_waiters =NULL ; -long timeout =user_timeout_to_jiffies (user_timeout_ms); +long timeout =user_timeout_to_jiffies (*user_timeout_ms); event_waiters =alloc_event_waiters (num_events);if (!event_waiters) {
@@ -971,15 +975,11 @@ int kfd_wait_on_events(struct kfd_process *p, }if (signal_pending (current)) { -/* -* This is wrong when a nonzero, non-infinite timeout -* is specified. We need to use -* ERESTARTSYS_RESTARTBLOCK, but struct restart_block -* contains a union with data for each user and it's -* in generic kernel code that I don't want to -* touch yet. -*/ ret = -ERESTARTSYS ; +if (*user_timeout_ms !=KFD_EVENT_TIMEOUT_IMMEDIATE && + *user_timeout_ms !=KFD_EVENT_TIMEOUT_INFINITE ) + *user_timeout_ms =jiffies_to_msecs ( +max (0l , timeout-1 ));break ; }
@@ -1020,7 +1020,7 @@ int kfd_wait_on_events(struct kfd_process *p, event_waiters, events); out_unlock: -free_waiters (num_events, event_waiters); +free_waiters (num_events, event_waiters, ret == -ERESTARTSYS );mutex_unlock (&p->event_mutex); out:if (ret)
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -1
@@ -1314,7 +1314,7 @@ void kfd_event_free_process(struct kfd_process *p);int kfd_event_mmap (struct kfd_process *process,struct vm_area_struct *vma);int kfd_wait_on_events (struct kfd_process *p,uint32_t num_events,void __user *data, -bool all,uint32_t user_timeout_ms, +bool all,uint32_t *user_timeout_ms,uint32_t *wait_result);void kfd_signal_event_interrupt (u32 pasid,uint32_t partial_id,uint32_t valid_id_bits);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/72 media: pvrusb2: fix memory leak in pvr_probe
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
commit 945a9a8e448b65bec055d37eba58f711b39f66f0 upstream.
The error handling code in pvr2_hdw_create forgets to unregister the v4l2 device. When pvr2_hdw_create returns back to pvr2_context_create, it calls pvr2_context_destroy to destroy context, but mp->hdw is NULL, which leads to that pvr2_hdw_destroy directly returns.
Fix this by adding v4l2_device_unregister to decrease the refcount of usb interface.
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1 -0
@@ -2610,6 +2610,7 @@ struct pvr2_hdw *pvr2_hdw_create(structdel_timer_sync (&hdw->encoder_run_timer);del_timer_sync (&hdw->encoder_wait_timer);flush_work (&hdw->workpoll); +v4l2_device_unregister (&hdw->v4l2_dev);usb_free_urb (hdw->ctl_read_urb);usb_free_urb (hdw->ctl_write_urb);kfree (hdw->ctl_read_buffer);
Greg Kroah-Hartman
maintainerPATCH 67/72 btrfs: fix lockdep splat with reloc root extent buffers
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit b40130b23ca4a08c5785d5a3559805916bddba3c ]
We have been hitting the following lockdep splat with btrfs/187 recently
WARNING: possible circular locking dependency detected
5.19.0-rc8+ #775 Not tainted
------------------------------------------------------
btrfs/752500 is trying to acquire lock:
ffff97e1875a97b8 (btrfs-treloc-02#2){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
but task is already holding lock:
ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (btrfs-tree-01/1){+.+.}-{3:3}:
down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_init_new_buffer+0x7d/0x2c0 btrfs_alloc_tree_block+0x120/0x3b0 __btrfs_cow_block+0x136/0x600 btrfs_cow_block+0x10b/0x230 btrfs_search_slot+0x53b/0xb70 btrfs_lookup_inode+0x2a/0xa0 __btrfs_update_delayed_inode+0x5f/0x280 btrfs_async_run_delayed_root+0x24c/0x290 btrfs_work_helper+0xf2/0x3e0 process_one_work+0x271/0x590 worker_thread+0x52/0x3b0 kthread+0xf0/0x120 ret_from_fork+0x1f/0x30
-> #1 (btrfs-tree-01){++++}-{3:3}:
down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_search_slot+0x3c3/0xb70 do_relocation+0x10c/0x6b0 relocate_tree_blocks+0x317/0x6d0 relocate_block_group+0x1f1/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
-> #0 (btrfs-treloc-02#2){+.+.}-{3:3}:
__lock_acquire+0x1122/0x1e10 lock_acquire+0xc2/0x2d0 down_write_nested+0x41/0x80 __btrfs_tree_lock+0x24/0x110 btrfs_lock_root_node+0x31/0x50 btrfs_search_slot+0x1cb/0xb70 replace_path+0x541/0x9f0 merge_reloc_root+0x1d6/0x610 merge_reloc_roots+0xe2/0x260 relocate_block_group+0x2c8/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
other info that might help us debug this:
Chain exists of:
btrfs-treloc-02#2 --> btrfs-tree-01 --> btrfs-tree-01/1
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(btrfs-tree-01/1);
lock(btrfs-tree-01);
lock(btrfs-tree-01/1);
lock(btrfs-treloc-02#2);*** DEADLOCK ***
7 locks held by btrfs/752500:
#0: ffff97e292fdf460 (sb_writers#12){.+.+}-{0:0}, at: btrfs_ioctl+0x208/0x2c90
#1: ffff97e284c02050 (&fs_info->reclaim_bgs_lock){+.+.}-{3:3}, at: btrfs_balance+0x55f/0xe40 #2: ffff97e284c00878 (&fs_info->cleaner_mutex){+.+.}-{3:3}, at: btrfs_relocate_block_group+0x236/0x400 #3: ffff97e292fdf650 (sb_internal#2){.+.+}-{0:0}, at: merge_reloc_root+0xef/0x610
#4: ffff97e284c02378 (btrfs_trans_num_writers){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 #5: ffff97e284c023a0 (btrfs_trans_num_extwriters){++++}-{0:0}, at: join_transaction+0x1a8/0x5a0 #6: ffff97e1875a9278 (btrfs-tree-01/1){+.+.}-{3:3}, at: __btrfs_tree_lock+0x24/0x110
stack backtrace: CPU: 1 PID: 752500 Comm: btrfs Not tainted 5.19.0-rc8+ #775 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-2.fc32 04/01/2014 Call Trace: dump_stack_lvl+0x56/0x73 check_noncircular+0xd6/0x100 ? lock_is_held_type+0xe2/0x140 __lock_acquire+0x1122/0x1e10 lock_acquire+0xc2/0x2d0 ? __btrfs_tree_lock+0x24/0x110 down_write_nested+0x41/0x80 ? __btrfs_tree_lock+0x24/0x110 __btrfs_tree_lock+0x24/0x110 btrfs_lock_root_node+0x31/0x50 btrfs_search_slot+0x1cb/0xb70 ? lock_release+0x137/0x2d0 ? _raw_spin_unlock+0x29/0x50 ? release_extent_buffer+0x128/0x180 replace_path+0x541/0x9f0 merge_reloc_root+0x1d6/0x610 merge_reloc_roots+0xe2/0x260 relocate_block_group+0x2c8/0x560 btrfs_relocate_block_group+0x23e/0x400 btrfs_relocate_chunk+0x4c/0x140 btrfs_balance+0x755/0xe40 btrfs_ioctl+0x1ea2/0x2c90 ? lock_is_held_type+0xe2/0x140 ? lock_is_held_type+0xe2/0x140 ? __x64_sys_ioctl+0x88/0xc0 __x64_sys_ioctl+0x88/0xc0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
This isn't necessarily new, it's just tricky to hit in practice. There are two competing things going on here. With relocation we create a snapshot of every fs tree with a reloc tree. Any extent buffers that get initialized here are initialized with the reloc root lockdep key. However since it is a snapshot, any blocks that are currently in cache that originally belonged to the fs tree will have the normal tree lockdep key set. This creates the lock dependency of
reloc tree -> normal tree
for the extent buffer locking during the first phase of the relocation as we walk down the reloc root to relocate blocks.
However this is problematic because the final phase of the relocation is merging the reloc root into the original fs root. This involves searching down to any keys that exist in the original fs root and then swapping the relocated block and the original fs root block. We have to search down to the fs root first, and then go search the reloc root for the block we need to replace. This creates the dependency of
normal tree -> reloc tree
which is why lockdep complains.
Additionally even if we were to fix this particular mismatch with a different nesting for the merge case, we're still slotting in a block that has a owner of the reloc root objectid into a normal tree, so that block will have its lockdep key set to the tree reloc root, and create a lockdep splat later on when we wander into that block from the fs root.
Unfortunately the only solution here is to make sure we do not set the lockdep key to the reloc tree lockdep key normally, and then reset any blocks we wander into from the reloc root when we're doing the merged.
This solves the problem of having mixed tree reloc keys intermixed with normal tree keys, and then allows us to make sure in the merge case we maintain the lock order of
normal tree -> reloc tree
We handle this by setting a bit on the reloc root when we do the search for the block we want to relocate, and any block we search into or COW at that point gets set to the reloc tree key. This works correctly because we only ever COW down to the parent node, so we aren't resetting the key for the block we're linking into the fs root.
With this patch we no longer have the lockdep splat in btrfs/187.
--- fs/btrfs/ctree.c | 3 +++ fs/btrfs/ctree.h | 2 ++ fs/btrfs/extent-tree.c | 18 +++++++++++++++++- fs/btrfs/extent_io.c | 11 ++++++++++- fs/btrfs/locking.c | 11 +++++++++++ fs/btrfs/locking.h | 5 +++++ fs/btrfs/relocation.c | 2 ++ 7 files changed, 50 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +3 -0
@@ -2075,6 +2075,9 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,if (!p->skip_locking) { level =btrfs_header_level (b); + +btrfs_maybe_reset_lockdep_class (root, b); +if (level <= write_lock_level) {btrfs_tree_lock (b); p->locks[level] =BTRFS_WRITE_LOCK ;
fs/btrfs/ctree.h +2 -0
@@ -1146,6 +1146,8 @@ enum {BTRFS_ROOT_ORPHAN_CLEANUP ,/* This root has a drop operation that was started previously. */ BTRFS_ROOT_UNFINISHED_DROP , +/* This reloc root needs to have its buffers lockdep class reset. */ + BTRFS_ROOT_RESET_LOCKDEP_CLASS, };static inline void btrfs_wake_unfinished_drop (struct btrfs_fs_info *fs_info)
fs/btrfs/extent-tree.c +17 -1
@@ -4871,6 +4871,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, {struct btrfs_fs_info *fs_info = root->fs_info;struct extent_buffer *buf; +u64 lockdep_owner = owner; buf =btrfs_find_create_tree_block (fs_info, bytenr, owner, level);if (IS_ERR (buf))
@@ -4889,12 +4890,27 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,return ERR_PTR (-EUCLEAN ); } +/* +* The reloc trees are just snapshots, so we need them to appear to be +* just like any other fs tree WRT lockdep. +* +* The exception however is in replace_path() in relocation, where we +* hold the lock on the original fs root and then search for the reloc +* root. At that point we need to make sure any reloc root buffers are +* set to the BTRFS_TREE_RELOC_OBJECTID lockdep class in order to make +* lockdep happy. +*/ +if (lockdep_owner ==BTRFS_TREE_RELOC_OBJECTID && + !test_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &root->state)) + lockdep_owner =BTRFS_FS_TREE_OBJECTID ; +/* * This needs to stay, because we could allocate a freed block from an * old tree into a new tree, so we need to make sure this new block is * set to the appropriate level and owner. */ -btrfs_set_buffer_lockdep_class (owner, buf, level); +btrfs_set_buffer_lockdep_class (lockdep_owner, buf, level); +__btrfs_tree_lock (buf, nest);btrfs_clean_tree_block (buf);clear_bit (EXTENT_BUFFER_STALE , &buf->bflags);
fs/btrfs/extent_io.c +10 -1
@@ -6228,6 +6228,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,struct extent_buffer *exists =NULL ;struct page *p;struct address_space *mapping = fs_info->btree_inode->i_mapping; +u64 lockdep_owner = owner_root;int uptodate =1 ;int ret;
@@ -6252,7 +6253,15 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, eb =__alloc_extent_buffer (fs_info, start, len);if (!eb)return ERR_PTR (-ENOMEM ); -btrfs_set_buffer_lockdep_class (owner_root, eb, level); + +/* +* The reloc trees are just snapshots, so we need them to appear to be +* just like any other fs tree WRT lockdep. +*/ +if (lockdep_owner ==BTRFS_TREE_RELOC_OBJECTID ) + lockdep_owner =BTRFS_FS_TREE_OBJECTID ; + +btrfs_set_buffer_lockdep_class (lockdep_owner, eb, level); num_pages =num_extent_pages (eb);for (i =0 ; i < num_pages; i++, index++) {
fs/btrfs/locking.c +11 -0
@@ -91,6 +91,13 @@ void btrfs_set_buffer_lockdep_class(u64 objectid, struct extent_buffer *eb, int lockdep_set_class_and_name(&eb->lock, &ks->keys[level], ks->names[level]); } +void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root,struct extent_buffer *eb) +{ +if (test_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &root->state)) +btrfs_set_buffer_lockdep_class (root->root_key.objectid, + eb,btrfs_header_level (eb)); +} +#endif /*
@@ -244,6 +251,8 @@ struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root)while (1 ) { eb =btrfs_root_node (root); + +btrfs_maybe_reset_lockdep_class (root, eb);btrfs_tree_lock (eb);if (eb == root->node)break ;
@@ -265,6 +274,8 @@ struct extent_buffer *btrfs_read_lock_root_node(struct btrfs_root *root)while (1 ) { eb =btrfs_root_node (root); + +btrfs_maybe_reset_lockdep_class (root, eb);btrfs_tree_read_lock (eb);if (eb == root->node)break ;
fs/btrfs/locking.h +5 -0
@@ -133,11 +133,16 @@ void btrfs_drew_read_unlock(struct btrfs_drew_lock *lock);#ifdef CONFIG_DEBUG_LOCK_ALLOC void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level); +void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root,struct extent_buffer *eb);#else static inline void btrfs_set_buffer_lockdep_class (u64 objectid,struct extent_buffer *eb,int level) { } +static inline void btrfs_maybe_reset_lockdep_class (struct btrfs_root *root, +struct extent_buffer *eb) +{ +}#endif #endif
fs/btrfs/relocation.c +2 -0
@@ -1326,7 +1326,9 @@ int replace_path(struct btrfs_trans_handle *trans, struct reloc_control *rc,btrfs_release_path (path); path->lowest_level = level; +set_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &src->state); ret =btrfs_search_slot (trans, src, &key, path,0 ,1 ); +clear_bit (BTRFS_ROOT_RESET_LOCKDEP_CLASS , &src->state); path->lowest_level =0 ;if (ret) {if (ret >0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/72 HID: hidraw: fix memory leak in hidraw_release()
In reply to Greg Kroah-HartmanFrom: Karthik Alapati <[email protected]>
commit a5623a203cffe2d2b84d2f6c989d9017db1856af upstream.
Free the buffered reports before deleting the list entry.
BUG: memory leak
unreferenced object 0xffff88810e72f180 (size 32):
comm "softirq", pid 0, jiffies 4294945143 (age 16.080s)
hex dump (first 32 bytes):
64 f3 c6 6a d1 88 07 04 00 00 00 00 00 00 00 00 d..j............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff814ac6c3>] kmemdup+0x23/0x50 mm/util.c:128
[<ffffffff8357c1d2>] kmemdup include/linux/fortify-string.h:440 [inline]
[<ffffffff8357c1d2>] hidraw_report_event+0xa2/0x150 drivers/hid/hidraw.c:521
[<ffffffff8356ddad>] hid_report_raw_event+0x27d/0x740 drivers/hid/hid-core.c:1992
[<ffffffff8356e41e>] hid_input_report+0x1ae/0x270 drivers/hid/hid-core.c:2065
[<ffffffff835f0d3f>] hid_irq_in+0x1ff/0x250 drivers/hid/usbhid/hid-core.c:284
[<ffffffff82d3c7f9>] __usb_hcd_giveback_urb+0xf9/0x230 drivers/usb/core/hcd.c:1670
[<ffffffff82d3cc26>] usb_hcd_giveback_urb+0x1b6/0x1d0 drivers/usb/core/hcd.c:1747
[<ffffffff82ef1e14>] dummy_timer+0x8e4/0x14c0 drivers/usb/gadget/udc/dummy_hcd.c:1988
[<ffffffff812f50a8>] call_timer_fn+0x38/0x200 kernel/time/timer.c:1474
[<ffffffff812f5586>] expire_timers kernel/time/timer.c:1519 [inline]
[<ffffffff812f5586>] __run_timers.part.0+0x316/0x430 kernel/time/timer.c:1790
[<ffffffff812f56e4>] __run_timers kernel/time/timer.c:1768 [inline]
[<ffffffff812f56e4>] run_timer_softirq+0x44/0x90 kernel/time/timer.c:1803
[<ffffffff848000e6>] __do_softirq+0xe6/0x2ea kernel/softirq.c:571
[<ffffffff81246db0>] invoke_softirq kernel/softirq.c:445 [inline]
[<ffffffff81246db0>] __irq_exit_rcu kernel/softirq.c:650 [inline]
[<ffffffff81246db0>] irq_exit_rcu+0xc0/0x110 kernel/softirq.c:662
[<ffffffff84574f02>] sysvec_apic_timer_interrupt+0xa2/0xd0 arch/x86/kernel/apic/apic.c:1106
[<ffffffff84600c8b>] asm_sysvec_apic_timer_interrupt+0x1b/0x20 arch/x86/include/asm/idtentry.h:649
[<ffffffff8458a070>] native_safe_halt arch/x86/include/asm/irqflags.h:51 [inline]
[<ffffffff8458a070>] arch_safe_halt arch/x86/include/asm/irqflags.h:89 [inline]
[<ffffffff8458a070>] acpi_safe_halt drivers/acpi/processor_idle.c:111 [inline]
[<ffffffff8458a070>] acpi_idle_do_entry+0xc0/0xd0 drivers/acpi/processor_idle.c:554--- drivers/hid/hidraw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hid/hidraw.c +2 -0
@@ -350,6 +350,8 @@ static int hidraw_release(struct inode *down_write (&minors_rwsem);spin_lock_irqsave (&hidraw_table[minor]->list_lock, flags); +for (int i = list->tail; i < list->head; i++) +kfree (list->buffer[i].value);list_del (&list->node);spin_unlock_irqrestore (&hidraw_table[minor]->list_lock, flags);kfree (list);
Greg Kroah-Hartman
maintainerPATCH 33/72 ASoC: sh: rz-ssi: Improve error handling in rz_ssi_probe() error path
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit c75ed9f54ce8d349fee557f2b471a4d637ed2a6b ]
We usually do cleanup in reverse order of init. Currently in case of error rz_ssi_release_dma_channels() done in the reverse order. This patch improves error handling in rz_ssi_probe() error path.
While at it, use "goto cleanup" style to reduce code duplication.
--- sound/soc/sh/rz-ssi.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
sound/soc/sh/rz-ssi.c +15 -11
@@ -1016,32 +1016,36 @@ static int rz_ssi_probe(struct platform_device *pdev) ssi->rstc =devm_reset_control_get_exclusive (&pdev->dev,NULL );if (IS_ERR (ssi->rstc)) { -rz_ssi_release_dma_channels (ssi); -return PTR_ERR (ssi->rstc); + ret =PTR_ERR (ssi->rstc); + goto err_reset; }reset_control_deassert (ssi->rstc);pm_runtime_enable (&pdev->dev); ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 ) { -rz_ssi_release_dma_channels (ssi); -pm_runtime_disable (ssi->dev); -reset_control_assert (ssi->rstc); -return dev_err_probe (ssi->dev, ret,"pm_runtime_resume_and_get failed\n" ); +dev_err (&pdev->dev,"pm_runtime_resume_and_get failed\n" ); + goto err_pm; } ret =devm_snd_soc_register_component (&pdev->dev, &rz_ssi_soc_component, rz_ssi_soc_dai,ARRAY_SIZE (rz_ssi_soc_dai));if (ret <0 ) { -rz_ssi_release_dma_channels (ssi); - -pm_runtime_put (ssi->dev); -pm_runtime_disable (ssi->dev); -reset_control_assert (ssi->rstc);dev_err (&pdev->dev,"failed to register snd component\n" ); + goto err_snd_soc; } +return 0 ; + +err_snd_soc: +pm_runtime_put (ssi->dev); +err_pm: +pm_runtime_disable (ssi->dev); +reset_control_assert (ssi->rstc); +err_reset: +rz_ssi_release_dma_channels (ssi); +return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/72 drm/amd/display: clear optc underflow before turn off odm clock
In reply to Greg Kroah-HartmanFrom: Fudong Wang <[email protected]>
[ Upstream commit b2a93490201300a749ad261b5c5d05cb50179c44 ]
[Why]
After ODM clock off, optc underflow bit will be kept there always and clear not work. We need to clear that before clock off.
[How]
Clear that if have when clock off.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +5 -0
@@ -464,6 +464,11 @@ void optc1_enable_optc_clock(struct timing_generator *optc, bool enable)OTG_CLOCK_ON ,1 , 1, 1000); }else { + +//last chance to clear underflow, otherwise, it will always there due to clock is off. +if (optc->funcs->is_optc_underflow_occurred (optc) == true) + optc->funcs->clear_optc_underflow (optc); +REG_UPDATE_2 (OTG_CLOCK_CONTROL ,OTG_CLOCK_GATE_DIS ,0 ,OTG_CLOCK_EN ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/72 drm/amd/display: Fix pixel clock programming
In reply to Greg Kroah-HartmanFrom: Ilya Bakoulin <[email protected]>
[ Upstream commit 04fb918bf421b299feaee1006e82921d7d381f18 ]
[Why]
Some pixel clock values could cause HDMI TMDS SSCPs to be misaligned between different HDMI lanes when using YCbCr420 10-bit pixel format.
BIOS functions for transmitter/encoder control take pixel clock in kHz increments, whereas the function for setting the pixel clock is in 100Hz increments. Setting pixel clock to a value that is not on a kHz boundary will cause the issue.
[How]
Round pixel clock down to nearest kHz in 10/12-bpc cases.
--- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +2 -0
@@ -545,9 +545,11 @@ static void dce112_get_pix_clk_dividers_helper (switch (pix_clk_params->color_depth) {case COLOR_DEPTH_101010 : actual_pixel_clock_100hz = (actual_pixel_clock_100hz *5 ) >>2 ; + actual_pixel_clock_100hz -= actual_pixel_clock_100hz %10 ;break ;case COLOR_DEPTH_121212 : actual_pixel_clock_100hz = (actual_pixel_clock_100hz *6 ) >>2 ; + actual_pixel_clock_100hz -= actual_pixel_clock_100hz %10 ;break ;case COLOR_DEPTH_161616 : actual_pixel_clock_100hz = actual_pixel_clock_100hz *2 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/72 drm/amd/display: Add a missing register field for HPO DP stream encoder
In reply to Greg Kroah-HartmanFrom: Aurabindo Pillai <[email protected]>
[ Upstream commit 37bc31f0e7da4fbad4664e64d906ae7b9009e550 ]
[Why&How]
Add the missing definition to set the register field HBLANK_MINIMUM_SYMBOL_WIDTH
--- .../gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.h +2 -1
@@ -162,7 +162,8 @@SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0 ,AIP_ENABLE , mask_sh),\SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_SDP_AUDIO_CONTROL0 ,ACM_ENABLE , mask_sh),\SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL ,CRC_ENABLE , mask_sh),\ - SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL, CRC_CONT_MODE_ENABLE, mask_sh) +SE_SF (DP_SYM32_ENC0_DP_SYM32_ENC_VID_CRC_CONTROL ,CRC_CONT_MODE_ENABLE , mask_sh),\ + SE_SF(DP_SYM32_ENC0_DP_SYM32_ENC_HBLANK_CONTROL, HBLANK_MINIMUM_SYMBOL_WIDTH, mask_sh)#define DCN3_1_HPO_DP_STREAM_ENC_REG_FIELD_LIST (type) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/72 drm/amd/pm: add missing ->fini_xxxx interfaces for some SMU13 asics
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
[ Upstream commit 4bac1c846eff8042dd59ddecd0a43f3b9de5fd23 ]
Without these, potential memory leak may be induced.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +2 -0
@@ -1583,7 +1583,9 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { .dump_pptable = smu_v13_0_0_dump_pptable, .init_microcode = smu_v13_0_init_microcode, .load_microcode = smu_v13_0_load_microcode, + .fini_microcode = smu_v13_0_fini_microcode, .init_smc_tables = smu_v13_0_0_init_smc_tables, + .fini_smc_tables = smu_v13_0_fini_smc_tables, .init_power = smu_v13_0_init_power, .fini_power = smu_v13_0_fini_power, .check_fw_status = smu_v13_0_check_fw_status,
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +2 -0
@@ -1539,7 +1539,9 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { .dump_pptable = smu_v13_0_7_dump_pptable, .init_microcode = smu_v13_0_init_microcode, .load_microcode = smu_v13_0_load_microcode, + .fini_microcode = smu_v13_0_fini_microcode, .init_smc_tables = smu_v13_0_7_init_smc_tables, + .fini_smc_tables = smu_v13_0_fini_smc_tables, .init_power = smu_v13_0_init_power, .check_fw_status = smu_v13_0_7_check_fw_status, .setup_pptable = smu_v13_0_7_setup_pptable,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 2/72 drm/vc4: hdmi: Depends on CONFIG_PM
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
commit 72e2329e7c9bbe15e7a813670497ec9c6f919af3 upstream.
We already depend on runtime PM to get the power domains and clocks for most of the devices supported by the vc4 driver, so let's just select it to make sure it's there.
--- drivers/gpu/drm/vc4/Kconfig | 1 + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/Kconfig +1 -0
@@ -8,6 +8,7 @@ config DRM_VC4 depends on DRM depends on SND && SND_SOC depends on COMMON_CLK + depends on PM select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HELPER select DRM_KMS_HELPER
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -2875,7 +2875,7 @@ static int vc5_hdmi_init_resources(strucreturn 0 ; } -static int __maybe_unused vc4_hdmi_runtime_suspend (struct device *dev) +static int vc4_hdmi_runtime_suspend (struct device *dev) {struct vc4_hdmi *vc4_hdmi =dev_get_drvdata (dev);
Greg Kroah-Hartman
maintainerPATCH 30/72 mmc: sdhci-of-dwcmshc: rename rk3568 to rk35xx
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 86e1a8e1f9b555af342c53ae06284eeeab9a4263 ]
Prepare driver for rk3588 support by renaming the internal data structures.
--- drivers/mmc/host/sdhci-of-dwcmshc.c | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/mmc/host/sdhci-of-dwcmshc.c +23 -23
@@ -56,14 +56,14 @@#define DLL_LOCK_WO_TMOUT (x) \ ((((x) & DWCMSHC_EMMC_DLL_LOCKED) == DWCMSHC_EMMC_DLL_LOCKED) && \ (((x) & DWCMSHC_EMMC_DLL_TIMEOUT) == 0)) -#define RK3568_MAX_CLKS 3 +#define RK35xx_MAX_CLKS 3#define BOUNDARY_OK (addr, len) \ ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) -struct rk3568_priv { +struct rk35xx_priv {/* Rockchip specified optional clocks */ -struct clk_bulk_data rockchip_clks[RK3568_MAX_CLKS ]; +struct clk_bulk_data rockchip_clks[RK35xx_MAX_CLKS];struct reset_control *reset;u8 txclk_tapnum; };
@@ -178,7 +178,7 @@ static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct dwcmshc_priv *dwc_priv =sdhci_pltfm_priv (pltfm_host); -struct rk3568_priv *priv = dwc_priv->priv; +struct rk35xx_priv *priv = dwc_priv->priv;u8 txclk_tapnum =DLL_TXCLK_TAPNUM_DEFAULT ;u32 extra, reg;int err;
@@ -281,7 +281,7 @@ static const struct sdhci_ops sdhci_dwcmshc_ops = { .adma_write_desc = dwcmshc_adma_write_desc, }; -static const struct sdhci_ops sdhci_dwcmshc_rk3568_ops = { +static const struct sdhci_ops sdhci_dwcmshc_rk35xx_ops = { .set_clock = dwcmshc_rk3568_set_clock, .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = dwcmshc_set_uhs_signaling,
@@ -296,18 +296,18 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, }; -static const struct sdhci_pltfm_data sdhci_dwcmshc_rk3568_pdata = { - .ops = &sdhci_dwcmshc_rk3568_ops, +static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = { + .ops = &sdhci_dwcmshc_rk35xx_ops, .quirks =SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |SDHCI_QUIRK_BROKEN_TIMEOUT_VAL , .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN |SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN , }; -static int dwcmshc_rk3568_init (struct sdhci_host *host,struct dwcmshc_priv *dwc_priv) +static int dwcmshc_rk35xx_init (struct sdhci_host *host,struct dwcmshc_priv *dwc_priv) {int err; -struct rk3568_priv *priv = dwc_priv->priv; +struct rk35xx_priv *priv = dwc_priv->priv; priv->reset =devm_reset_control_array_get_optional_exclusive (mmc_dev (host->mmc));if (IS_ERR (priv->reset)) {
@@ -319,14 +319,14 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwc priv->rockchip_clks[0 ].id ="axi" ; priv->rockchip_clks[1 ].id ="block" ; priv->rockchip_clks[2 ].id ="timer" ; - err =devm_clk_bulk_get_optional (mmc_dev (host->mmc),RK3568_MAX_CLKS , + err =devm_clk_bulk_get_optional (mmc_dev (host->mmc), RK35xx_MAX_CLKS, priv->rockchip_clks);if (err) {dev_err (mmc_dev (host->mmc),"failed to get clocks %d\n" , err);return err; } - err =clk_bulk_prepare_enable (RK3568_MAX_CLKS , priv->rockchip_clks); + err =clk_bulk_prepare_enable (RK35xx_MAX_CLKS, priv->rockchip_clks);if (err) {dev_err (mmc_dev (host->mmc),"failed to enable clocks %d\n" , err);return err;
@@ -348,7 +348,7 @@ static int dwcmshc_rk3568_init(struct sdhci_host *host, struct dwcmshc_priv *dwcstatic const struct of_device_id sdhci_dwcmshc_dt_ids[] = { { .compatible ="rockchip,rk3568-dwcmshc" , - .data = &sdhci_dwcmshc_rk3568_pdata, + .data = &sdhci_dwcmshc_rk35xx_pdata, }, { .compatible ="snps,dwcmshc-sdhci" ,
@@ -371,7 +371,7 @@ static int dwcmshc_probe(struct platform_device *pdev)struct sdhci_pltfm_host *pltfm_host;struct sdhci_host *host;struct dwcmshc_priv *priv; -struct rk3568_priv *rk_priv =NULL ; +struct rk35xx_priv *rk_priv =NULL ;const struct sdhci_pltfm_data *pltfm_data;int err;u32 extra;
@@ -426,8 +426,8 @@ static int dwcmshc_probe(struct platform_device *pdev) host->mmc_host_ops.request = dwcmshc_request; host->mmc_host_ops.hs400_enhanced_strobe = dwcmshc_hs400_enhanced_strobe; -if (pltfm_data == &sdhci_dwcmshc_rk3568_pdata) { - rk_priv =devm_kzalloc (&pdev->dev,sizeof (struct rk3568_priv ),GFP_KERNEL ); +if (pltfm_data == &sdhci_dwcmshc_rk35xx_pdata) { + rk_priv =devm_kzalloc (&pdev->dev,sizeof (struct rk35xx_priv ),GFP_KERNEL );if (!rk_priv) { err = -ENOMEM ; goto err_clk;
@@ -435,7 +435,7 @@ static int dwcmshc_probe(struct platform_device *pdev) priv->priv = rk_priv; - err =dwcmshc_rk3568_init (host, priv); + err =dwcmshc_rk35xx_init (host, priv);if (err) goto err_clk; }
@@ -452,7 +452,7 @@ static int dwcmshc_probe(struct platform_device *pdev)clk_disable_unprepare (pltfm_host->clk);clk_disable_unprepare (priv->bus_clk);if (rk_priv) -clk_bulk_disable_unprepare (RK3568_MAX_CLKS , +clk_bulk_disable_unprepare (RK35xx_MAX_CLKS, rk_priv->rockchip_clks); free_pltfm:sdhci_pltfm_free (pdev);
@@ -464,14 +464,14 @@ static int dwcmshc_remove(struct platform_device *pdev)struct sdhci_host *host =platform_get_drvdata (pdev);struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct dwcmshc_priv *priv =sdhci_pltfm_priv (pltfm_host); -struct rk3568_priv *rk_priv = priv->priv; +struct rk35xx_priv *rk_priv = priv->priv;sdhci_remove_host (host,0 );clk_disable_unprepare (pltfm_host->clk);clk_disable_unprepare (priv->bus_clk);if (rk_priv) -clk_bulk_disable_unprepare (RK3568_MAX_CLKS , +clk_bulk_disable_unprepare (RK35xx_MAX_CLKS, rk_priv->rockchip_clks);sdhci_pltfm_free (pdev);
@@ -484,7 +484,7 @@ static int dwcmshc_suspend(struct device *dev)struct sdhci_host *host =dev_get_drvdata (dev);struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct dwcmshc_priv *priv =sdhci_pltfm_priv (pltfm_host); -struct rk3568_priv *rk_priv = priv->priv; +struct rk35xx_priv *rk_priv = priv->priv;int ret; ret =sdhci_suspend_host (host);
@@ -496,7 +496,7 @@ static int dwcmshc_suspend(struct device *dev)clk_disable_unprepare (priv->bus_clk);if (rk_priv) -clk_bulk_disable_unprepare (RK3568_MAX_CLKS , +clk_bulk_disable_unprepare (RK35xx_MAX_CLKS, rk_priv->rockchip_clks);return ret;
@@ -507,7 +507,7 @@ static int dwcmshc_resume(struct device *dev)struct sdhci_host *host =dev_get_drvdata (dev);struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct dwcmshc_priv *priv =sdhci_pltfm_priv (pltfm_host); -struct rk3568_priv *rk_priv = priv->priv; +struct rk35xx_priv *rk_priv = priv->priv;int ret; ret =clk_prepare_enable (pltfm_host->clk);
@@ -521,7 +521,7 @@ static int dwcmshc_resume(struct device *dev) }if (rk_priv) { - ret =clk_bulk_prepare_enable (RK3568_MAX_CLKS , + ret =clk_bulk_prepare_enable (RK35xx_MAX_CLKS, rk_priv->rockchip_clks);if (ret)return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/72 net/af_packet: check len when min_header_len equals to 0
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
commit dc633700f00f726e027846a318c5ffeb8deaaeda upstream.
User can use AF_PACKET socket to send packets with the length of 0. When min_header_len equals to 0, packet_snd will call __dev_queue_xmit to send packets, and sock->type can be any type.
--- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/packet/af_packet.c +2 -2
@@ -3037,8 +3037,8 @@ static int packet_snd(struct socket *socif (err) goto out_free; -if (sock->type ==SOCK_RAW && - !dev_validate_header (dev, skb->data, len)) { +if ((sock->type ==SOCK_RAW && + !dev_validate_header (dev, skb->data, len)) || !skb->len) { err = -EINVAL ; goto out_free; }
Greg Kroah-Hartman
maintainerPATCH 4/72 crypto: lib - remove unneeded selection of XOR_BLOCKS
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit 874b301985ef2f89b8b592ad255e03fb6fbfe605 upstream.
CRYPTO_LIB_CHACHA_GENERIC doesn't need to select XOR_BLOCKS. It perhaps was thought that it's needed for __crypto_xor, but that's not the case.
Enabling XOR_BLOCKS is problematic because the XOR_BLOCKS code runs a benchmark when it is initialized. That causes a boot time regression on systems that didn't have it enabled before.
Therefore, remove this unnecessary and problematic selection.
--- lib/crypto/Kconfig | 1 - 1 file changed, 1 deletion(-)
lib/crypto/Kconfig +0 -1
@@ -33,7 +33,6 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_LIB_CHACHA_GENERIC tristate - select XOR_BLOCKS help This symbol can be depended upon by arch implementations of the ChaCha library interface that require the generic code as a
Greg Kroah-Hartman
maintainerPATCH 49/72 ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41
In reply to Greg Kroah-HartmanFrom: Stefan Binding <[email protected]>
[ Upstream commit 461122b999bda2ebef2086a35d8990f9ccac5ab8 ]
These Asus Zenbook laptop use Realtek HDA codec combined with 2xCS35L41 Amplifiers using SPI.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9248,6 +9248,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x1271 ,"ASUS X430UN" ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1290 ,"ASUS X441SA" ,ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x12a0 ,"ASUS X441UV" ,ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1043 ,0x12af ,"ASUS UX582ZS" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x12e0 ,"ASUS X541SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x12f0 ,"ASUS X541UV" ,ALC256_FIXUP_ASUS_MIC ), SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -9268,6 +9269,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x19e1 ,"ASUS UX581LV" ,ALC295_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1a13 ,"Asus G73Jw" ,ALC269_FIXUP_ASUS_G73JW ),SND_PCI_QUIRK (0x1043 ,0x1a30 ,"ASUS X705UD" ,ALC256_FIXUP_ASUS_MIC ), +SND_PCI_QUIRK (0x1043 ,0x1a8f ,"ASUS UX582ZS" ,ALC245_FIXUP_CS35L41_SPI_2 ),SND_PCI_QUIRK (0x1043 ,0x1b11 ,"ASUS UX431DA" ,ALC294_FIXUP_ASUS_COEF_1B ),SND_PCI_QUIRK (0x1043 ,0x1b13 ,"Asus U41SV" ,ALC269_FIXUP_INV_DMIC ), SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/72 fs/ntfs3: Fix work with fragmented xattr
In reply to Greg Kroah-HartmanFrom: Konstantin Komarov <[email protected]>
[ Upstream commit 42f86b1226a42bfc79a7125af435432ad4680a32 ]
In some cases xattr is too fragmented,
so we need to load it before writing.
--- fs/ntfs3/xattr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/ntfs3/xattr.c +6 -1
@@ -118,7 +118,7 @@ static int ntfs_read_ea(struct ntfs_inode *ni, struct EA_FULL **ea,run_init (&run); - err =attr_load_runs (attr_ea, ni, &run,NULL ); + err =attr_load_runs_range (ni,ATTR_EA ,NULL ,0 , &run,0 , size);if (!err) err =ntfs_read_run_nb (sbi, &run,0 , ea_p, size,NULL );run_close (&run);
@@ -444,6 +444,11 @@ static noinline int ntfs_set_ea(struct inode *inode, const char *name,/* Delete xattr, ATTR_EA */ ni_remove_attr_le (ni, attr, mi, le); }else if (attr->non_res) { + err =attr_load_runs_range (ni,ATTR_EA ,NULL ,0 , &ea_run,0 , + size); +if (err) + goto out; + err =ntfs_sb_write_run (sbi, &ea_run,0 , ea_all, size,0 );if (err) goto out;
Signature · 1 line
2.35.1
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
We have a couple issues for v5.19 that are still working through and so I don't have a clean report for v5.19 yet. However, I don't see any thing of concern that has changed in this update so looks fine. Hence, I have not been sending reports for v5.19 so far. We are working to resolve this.
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
Build results:
total: 150 pass: 150 fail: 0 Qemu test results: total: 489 pass: 489 fail: 0
Guenter
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro's test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.19.7-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.19.y
* git commit: dd6b2254d7a728898c6d445789248f8a57f7bd97
* git describe: v5.19.4-234-gdd6b2254d7a7
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.19.y/build/v5.19.4-234-gdd6b2254d7a7
## No test Regressions (compared to v5.19.4)
## No metric Regressions (compared to v5.19.4)
## No test Fixes (compared to v5.19.4)
## No metric Fixes (compared to v5.19.4)
## Test result summary
total: 115414, pass: 103359, fail: 845, skip: 10906, xfail: 304
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 306 total, 303 passed, 3 failed
* arm64: 68 total, 65 passed, 3 failed
* i386: 57 total, 51 passed, 6 failed
* mips: 50 total, 47 passed, 3 failed
* parisc: 14 total, 14 passed, 0 failed
* powerpc: 65 total, 56 passed, 9 failed
* riscv: 32 total, 26 passed, 6 failed
* s390: 22 total, 20 passed, 2 failed
* sh: 26 total, 24 passed, 2 failed
* sparc: 14 total, 14 passed, 0 failed
* x86_64: 61 total, 58 passed, 3 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
Hi Greg,
5.19.7-rc1 tested.
Run tested on:
- Intel Tiger Lake x86_64 (nuc11 i7-1165G7)
- Samsung Exynos5422 (Odroid XU4)
In addition - build tested for:
- Allwinner A64
- Allwinner H3
- Allwinner H5
- Allwinner H6
- NXP iMX6
- NXP iMX8
- Qualcomm Dragonboard
- Rockchip RK3288
- Rockchip RK3328
- Rockchip RK3399pro
--
Rudi
Quoted 4 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.1.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
Build test (gcc version 12.2.1 20220819):
mips: 59 configs -> no failure
arm: 99 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
csky allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
mips: Booted on ci20 board. No regression. [3]
[1]. https://openqa.qa.codethink.co.uk/tests/1758
[2]. https://openqa.qa.codethink.co.uk/tests/1761
[3]. https://openqa.qa.codethink.co.uk/tests/1763
--
Regards
Sudip
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.19.7 release. There are 72 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 04 Sep 2022 12:13:47 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.19.7-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.19.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, armv7, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.