- Linux-stable-mirror - lists.linaro.org

[PATCH] kprobes/x86: Do not modify singlestep buffer while resuming

by Alexey Makhalov

From: Masami Hiramatsu <mhiramat(a)kernel.org> commit 804dec5bda9b4fcdab5f67fe61db4a0498af5221 upstream. Do not modify singlestep execution buffer (kprobe.ainsn.insn) while resuming from single-stepping, instead, modifies the buffer to add a jump back instruction at preparing buffer. Commit 176bee4cfcec ("kprobes/x86: Set kprobes pages read-only") introduced a bug in stable 4.4.y by making singlestep buffer page read-only. Attempts to modify singlestep buffer, to insert a jump instruction, at resume_execution() lead to kernel panic. BUG: unable to handle kernel paging request at ffffffffa0011001 IP: [<ffffffff8105711c>] resume_execution+0x14c/0x1a0 PGD 1c0f067 PUD 1c10063 PMD 42ac74067 PTE 41cc35061 Oops: 0003 [#1] SMP Modules linked in: stap_6eaf26e7bd7018624e4c19b7486f4bb8_1857(OE) ipt_MASQUERADE(E) nf_nat_masquerade_ipv4(E) <...> CPU: 5 PID: 1857 Comm: stapio Tainted: G OE 4.4.136+ #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 01/24/2017 task: ffff880425044940 ti: ffff88042d160000 task.ti: ffff88042d160000 RIP: 0010:[<ffffffff8105711c>] [<ffffffff8105711c>] resume_execution+0x14c/0x1a0 RSP: 0018:ffff88043fd4aeb0 EFLAGS: 00010086 RAX: ffffffffa0011001 RBX: ffff88043fd4af58 RCX: 0000000000000006 RDX: ffffffff811b9f71 RSI: ffff88043fd4af58 RDI: 0000000000000055 RBP: ffff88043fd4aee8 R08: 0000000000000001 R09: ffff88041cce8100 R10: 0000000000000004 R11: ffff8804252d9238 R12: ffff88042c6051c0 R13: ffffffff811b9f70 R14: ffff88042d163f08 R15: ffffffffa0011000 FS: 00007f05f6439740(0000) GS:ffff88043fd40000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffa0011001 CR3: 000000042944a000 CR4: 0000000000160670 Stack: ffff88043fd4fee0 0000000000000000 ffff88043fd4fee0 ffff88043fd4af58 ffff88042c6051c0 0000000000000000 00007ffd23764640 ffff88043fd4af10 ffffffff810571a8 ffff88043fd4af58 ffff880425044940 0000000000000000 Call Trace: <#DB> [<ffffffff810571a8>] kprobe_debug_handler+0x38/0xd0 [<ffffffff81016de2>] do_debug+0x82/0x1b0 [<ffffffff817e6aa5>] debug+0x35/0x70 <<EOE>> [<ffffffff811bac51>] ? SyS_read+0x41/0xa0 [<ffffffff817e48a1>] entry_SYSCALL_64_fastpath+0x1e/0x95 Issue was found and fix was verified by running systemtap: stap -v -e 'probe vfs.read {printf("read performed\n"); exit()}' Fixes: 176bee4cfcec ("kprobes/x86: Set kprobes pages read-only") Cc: <stable(a)vger.kernel.org> # 4.4.x Signed-off-by: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Ananth N Mavinakayanahalli <ananth(a)linux.vnet.ibm.com> Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy(a)intel.com> Cc: Borislav Petkov <bp(a)alien8.de> Cc: Brian Gerst <brgerst(a)gmail.com> Cc: David S . Miller <davem(a)davemloft.net> Cc: Denys Vlasenko <dvlasenk(a)redhat.com> Cc: H. Peter Anvin <hpa(a)zytor.com> Cc: Josh Poimboeuf <jpoimboe(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ye Xiaolong <xiaolong.ye(a)intel.com> Link: http://lkml.kernel.org/r/149076361560.22469.1610155860343077495.stgit@devbox Signed-off-by: Ingo Molnar <mingo(a)kernel.org> Reviewed-by: "Steven Rostedt (VMware)" <rostedt(a)goodmis.org> Signed-off-by: Alexey Makhalov <amakhalov(a)vmware.com> --- arch/x86/kernel/kprobes/core.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index df9be5b91270..1f5c47a49e35 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -411,25 +411,38 @@ void free_insn_page(void *page) module_memfree(page); } +/* Prepare reljump right after instruction to boost */ +static void prepare_boost(struct kprobe *p, int length) +{ + if (can_boost(p->ainsn.insn, p->addr) && + MAX_INSN_SIZE - length >= RELATIVEJUMP_SIZE) { + /* + * These instructions can be executed directly if it + * jumps back to correct address. + */ + synthesize_reljump(p->ainsn.insn + length, p->addr + length); + p->ainsn.boostable = 1; + } else { + p->ainsn.boostable = -1; + } +} + static int arch_copy_kprobe(struct kprobe *p) { - int ret; + int len; set_memory_rw((unsigned long)p->ainsn.insn & PAGE_MASK, 1); /* Copy an instruction with recovering if other optprobe modifies it.*/ - ret = __copy_instruction(p->ainsn.insn, p->addr); - if (!ret) + len = __copy_instruction(p->ainsn.insn, p->addr); + if (!len) return -EINVAL; /* * __copy_instruction can modify the displacement of the instruction, * but it doesn't affect boostable check. */ - if (can_boost(p->ainsn.insn, p->addr)) - p->ainsn.boostable = 0; - else - p->ainsn.boostable = -1; + prepare_boost(p, len); set_memory_ro((unsigned long)p->ainsn.insn & PAGE_MASK, 1); @@ -894,21 +907,6 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs, break; } - if (p->ainsn.boostable == 0) { - if ((regs->ip > copy_ip) && - (regs->ip - copy_ip) + 5 < MAX_INSN_SIZE) { - /* - * These instructions can be executed directly if it - * jumps back to correct address. - */ - synthesize_reljump((void *)regs->ip, - (void *)orig_ip + (regs->ip - copy_ip)); - p->ainsn.boostable = 1; - } else { - p->ainsn.boostable = -1; - } - } - regs->ip += orig_ip - copy_ip; no_change: -- 2.14.2

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference" failed to apply to 4.17-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.17-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 06b8b00b33a145ef5d708ff971cfdb83c8e480c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita(a)gmail.com> Date: Thu, 19 Apr 2018 07:04:34 -0700 Subject: [PATCH] platform/x86: asus-wireless: Fix NULL pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the module is removed the led workqueue is destroyed in the remove callback, before the led device is unregistered from the led subsystem. This leads to a NULL pointer derefence when the led device is unregistered automatically later as part of the module removal cleanup. Bellow is the backtrace showing the problem. BUG: unable to handle kernel NULL pointer dereference at (null) IP: __queue_work+0x8c/0x410 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI Modules linked in: ccm edac_mce_amd kvm_amd kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc aesni_intel aes_x86_64 joydev crypto_simd asus_nb_wmi glue_helper uvcvideo snd_hda_codec_conexant snd_hda_codec_generic snd_hda_codec_hdmi snd_hda_intel asus_wmi snd_hda_codec cryptd snd_hda_core sparse_keymap videobuf2_vmalloc arc4 videobuf2_memops snd_hwdep input_leds videobuf2_v4l2 ath9k psmouse videobuf2_core videodev ath9k_common snd_pcm ath9k_hw media fam15h_power ath k10temp snd_timer mac80211 i2c_piix4 r8169 mii mac_hid cfg80211 asus_wireless(-) snd soundcore wmi shpchp 8250_dw ip_tables x_tables amdkfd amd_iommu_v2 amdgpu radeon chash i2c_algo_bit drm_kms_helper syscopyarea serio_raw sysfillrect sysimgblt fb_sys_fops ahci ttm libahci drm video CPU: 3 PID: 2177 Comm: rmmod Not tainted 4.15.0-5-generic #6+dev94.b4287e5bem1-Endless Hardware name: ASUSTeK COMPUTER INC. X555DG/X555DG, BIOS 5.011 05/05/2015 RIP: 0010:__queue_work+0x8c/0x410 RSP: 0018:ffffbe8cc249fcd8 EFLAGS: 00010086 RAX: ffff992ac6810800 RBX: 0000000000000000 RCX: 0000000000000008 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff992ac6400e18 RBP: ffffbe8cc249fd18 R08: ffff992ac6400db0 R09: 0000000000000000 R10: 0000000000000040 R11: ffff992ac6400dd8 R12: 0000000000002000 R13: ffff992abd762e00 R14: ffff992abd763e38 R15: 000000000001ebe0 FS: 00007f318203e700(0000) GS:ffff992aced80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000001c720e000 CR4: 00000000001406e0 Call Trace: queue_work_on+0x38/0x40 led_state_set+0x2c/0x40 [asus_wireless] led_set_brightness_nopm+0x14/0x40 led_set_brightness+0x37/0x60 led_trigger_set+0xfc/0x1d0 led_classdev_unregister+0x32/0xd0 devm_led_classdev_release+0x11/0x20 release_nodes+0x109/0x1f0 devres_release_all+0x3c/0x50 device_release_driver_internal+0x16d/0x220 driver_detach+0x3f/0x80 bus_remove_driver+0x55/0xd0 driver_unregister+0x2c/0x40 acpi_bus_unregister_driver+0x15/0x20 asus_wireless_driver_exit+0x10/0xb7c [asus_wireless] SyS_delete_module+0x1da/0x2b0 entry_SYSCALL_64_fastpath+0x24/0x87 RIP: 0033:0x7f3181b65fd7 RSP: 002b:00007ffe74bcbe18 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f3181b65fd7 RDX: 000000000000000a RSI: 0000000000000800 RDI: 0000555ea2559258 RBP: 0000555ea25591f0 R08: 00007ffe74bcad91 R09: 000000000000000a R10: 0000000000000000 R11: 0000000000000206 R12: 0000000000000003 R13: 00007ffe74bcae00 R14: 0000000000000000 R15: 0000555ea25591f0 Code: 01 00 00 02 0f 85 7d 01 00 00 48 63 45 d4 48 c7 c6 00 f4 fa 87 49 8b 9d 08 01 00 00 48 03 1c c6 4c 89 f7 e8 87 fb ff ff 48 85 c0 <48> 8b 3b 0f 84 c5 01 00 00 48 39 f8 0f 84 bc 01 00 00 48 89 c7 RIP: __queue_work+0x8c/0x410 RSP: ffffbe8cc249fcd8 CR2: 0000000000000000 ---[ end trace 7aa4f4a232e9c39c ]--- Unregistering the led device on the remove callback before destroying the workqueue avoids this problem. https://bugzilla.kernel.org/show_bug.cgi?id=196097 Reported-by: Dun Hum <bitter.taste(a)gmx.com> Cc: stable(a)vger.kernel.org Signed-off-by: João Paulo Rechi Vita <jprvita(a)endlessm.com> Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index d4aeac3477f5..f086469ea740 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -178,8 +178,10 @@ static int asus_wireless_remove(struct acpi_device *adev) { struct asus_wireless_data *data = acpi_driver_data(adev); - if (data->wq) + if (data->wq) { + devm_led_classdev_unregister(&adev->dev, &data->led); destroy_workqueue(data->wq); + } return 0; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain." failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ed66c3ce095ae65bbc976b5817c318653745736 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)dell.com> Date: Fri, 20 Apr 2018 12:42:11 -0500 Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. As reported by Randy Dunlap: >> WARNING: unmet direct dependencies detected for DELL_SMBIOS >> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && (DCDBAS [=m] || >> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) >> Selected by [y]: >> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && DMI [=y] >> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || >> ACPI_VIDEO [=n]=n) >> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] >> Right now it's possible to set dell laptop to compile in but this causes dell-smbios to compile in which breaks if dcdbas is a module. Dell laptop shouldn't select dell-smbios anymore, but depend on it. Fixes: 32d7b19bad96 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS) Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> Cc: stable(a)vger.kernel.org Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 39d06dd1f63a..bc309c5327ff 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -154,7 +154,7 @@ config DELL_LAPTOP depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n depends on SERIO_I8042 - select DELL_SMBIOS + depends on DELL_SMBIOS select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain." failed to apply to 4.17-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.17-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ed66c3ce095ae65bbc976b5817c318653745736 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)dell.com> Date: Fri, 20 Apr 2018 12:42:11 -0500 Subject: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. As reported by Randy Dunlap: >> WARNING: unmet direct dependencies detected for DELL_SMBIOS >> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && (DCDBAS [=m] || >> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) >> Selected by [y]: >> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] >> && DMI [=y] >> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || >> ACPI_VIDEO [=n]=n) >> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] >> Right now it's possible to set dell laptop to compile in but this causes dell-smbios to compile in which breaks if dcdbas is a module. Dell laptop shouldn't select dell-smbios anymore, but depend on it. Fixes: 32d7b19bad96 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS) Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Mario Limonciello <mario.limonciello(a)dell.com> Cc: stable(a)vger.kernel.org Signed-off-by: Darren Hart (VMware) <dvhart(a)infradead.org> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 39d06dd1f63a..bc309c5327ff 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -154,7 +154,7 @@ config DELL_LAPTOP depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n depends on SERIO_I8042 - select DELL_SMBIOS + depends on DELL_SMBIOS select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 986376b68dcc95bb7df60ad30c2353c1f7578fa5 Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang(a)canonical.com> Date: Wed, 30 May 2018 12:33:07 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs We have several Lenovo AIOs like M810z, M820z and M920z, they have the same design for mic-mute hotkey and led and they use the same codec with the same pin configuration, so use the pin conf table to apply fix to all of them. Fixes: 29693efcea0f ("ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 240a1a43e048..d64dcb9a4c99 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6603,7 +6603,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), @@ -6775,6 +6774,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1b, 0x01111010}, {0x1e, 0x01451130}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + {0x12, 0x90a60140}, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110},

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 986376b68dcc95bb7df60ad30c2353c1f7578fa5 Mon Sep 17 00:00:00 2001 From: Hui Wang <hui.wang(a)canonical.com> Date: Wed, 30 May 2018 12:33:07 +0800 Subject: [PATCH] ALSA: hda/realtek - Enable mic-mute hotkey for several Lenovo AIOs We have several Lenovo AIOs like M810z, M820z and M920z, they have the same design for mic-mute hotkey and led and they use the same codec with the same pin configuration, so use the pin conf table to apply fix to all of them. Fixes: 29693efcea0f ("ALSA: hda - Fix micmute hotkey problem for a lenovo AIO machine") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 240a1a43e048..d64dcb9a4c99 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6603,7 +6603,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x312f, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x3138, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), - SND_PCI_QUIRK(0x17aa, 0x3112, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI), SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), @@ -6775,6 +6774,11 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1b, 0x01111010}, {0x1e, 0x01451130}, {0x21, 0x02211020}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, + {0x12, 0x90a60140}, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x21, 0x02211020}), SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, {0x12, 0x90a60140}, {0x14, 0x90170110},

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.9-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.9-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 4 months

1
0
0 0

FAILED: patch "[PATCH] ext4: do not update s_last_mounted of a frozen fs" failed to apply to 4.16-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.16-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From db6516a5e7ddb6dc72d167b920f2f272596ea22d Mon Sep 17 00:00:00 2001 From: Amir Goldstein <amir73il(a)gmail.com> Date: Sun, 13 May 2018 22:54:44 -0400 Subject: [PATCH] ext4: do not update s_last_mounted of a frozen fs If fs is frozen after mount and before the first file open, the update of s_last_mounted bypasses freeze protection and prints out a WARNING splat: $ mount /vdf $ fsfreeze -f /vdf $ cat /vdf/foo [ 31.578555] WARNING: CPU: 1 PID: 1415 at fs/ext4/ext4_jbd2.c:53 ext4_journal_check_start+0x48/0x82 [ 31.614016] Call Trace: [ 31.614997] __ext4_journal_start_sb+0xe4/0x1a4 [ 31.616771] ? ext4_file_open+0xb6/0x189 [ 31.618094] ext4_file_open+0xb6/0x189 If fs is frozen, skip s_last_mounted update. [backport hint: to apply to stable tree, need to apply also patches vfs: add the sb_start_intwrite_trylock() helper ext4: factor out helper ext4_sample_last_mounted()] Cc: stable(a)vger.kernel.org Fixes: bc0b0d6d69ee ("ext4: update the s_last_mounted field in the superblock") Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Theodore Ts'o <tytso(a)mit.edu> Reviewed-by: Jan Kara <jack(a)suse.cz> diff --git a/fs/ext4/file.c b/fs/ext4/file.c index c48ea76b63e4..7f8023340eb8 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -393,7 +393,7 @@ static int ext4_sample_last_mounted(struct super_block *sb, if (likely(sbi->s_mount_flags & EXT4_MF_MNTDIR_SAMPLED)) return 0; - if (sb_rdonly(sb)) + if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb)) return 0; sbi->s_mount_flags |= EXT4_MF_MNTDIR_SAMPLED; @@ -407,21 +407,25 @@ static int ext4_sample_last_mounted(struct super_block *sb, path.mnt = mnt; path.dentry = mnt->mnt_root; cp = d_path(&path, buf, sizeof(buf)); + err = 0; if (IS_ERR(cp)) - return 0; + goto out; handle = ext4_journal_start_sb(sb, EXT4_HT_MISC, 1); + err = PTR_ERR(handle); if (IS_ERR(handle)) - return PTR_ERR(handle); + goto out; BUFFER_TRACE(sbi->s_sbh, "get_write_access"); err = ext4_journal_get_write_access(handle, sbi->s_sbh); if (err) - goto out; + goto out_journal; strlcpy(sbi->s_es->s_last_mounted, cp, sizeof(sbi->s_es->s_last_mounted)); ext4_handle_dirty_super(handle, sb); -out: +out_journal: ext4_journal_stop(handle); +out: + sb_end_intwrite(sb); return err; }

7 years, 4 months

1
0
0 0

Please consider 3be0f80b5f for stable (v4.11+)

by Anna Schumaker

Hi Stable folks, Please consider adding: commit 3be0f80b5fe9c16eca2d538f799b94ca8aa59433 Author: Trond Myklebust <trond.myklebust(a)primarydata.com> Date: Thu Oct 19 15:46:45 2017 -0400 NFSv4.1: Fix up replays of interrupted requests This patch fixes a data corruption issue that happens if the interrupted slot is reused by the same type of NFS operation (such as two different WRITE requests). I should apply cleanly to v4.11+ Thanks, Anna

7 years, 4 months

2
1
0 0

[PATCH] ALSA: hda/realtek - New codec support for ALC257

by Pali Rohár

From: Kailang Yang <kailang(a)realtek.com> commit f429e7e494afaded76e62c6f98211a635aa03098 Add new support for ALC257 codec. [ It's supposed to be almost equivalent with other ALC25x variants, just adding another type and id -- tiwai ] Signed-off-by: Kailang Yang <kailang(a)realtek.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Cc: <stable(a)vger.kernel.org> # 4.9.y Tested-by: Pali Rohár <pali.rohar(a)gmail.com> --- This patch is for 4.9 stable tree and needed small modification to be cleanly applied for linux-4.9.y git tree. I tested it on Debian's 4.9 Stretch kernel. After applying this patch mute and micmute leds on ThinkPad T480s started working. Leds are managed by snd-hda-codec-realtek. --- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 39cd35f6a6df..183436e4a8c1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -333,6 +333,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) case 0x10ec0236: case 0x10ec0255: case 0x10ec0256: + case 0x10ec0257: case 0x10ec0282: case 0x10ec0283: case 0x10ec0286: @@ -2663,6 +2664,7 @@ enum { ALC269_TYPE_ALC298, ALC269_TYPE_ALC255, ALC269_TYPE_ALC256, + ALC269_TYPE_ALC257, ALC269_TYPE_ALC225, ALC269_TYPE_ALC294, ALC269_TYPE_ALC700, @@ -2695,6 +2697,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec) case ALC269_TYPE_ALC298: case ALC269_TYPE_ALC255: case ALC269_TYPE_ALC256: + case ALC269_TYPE_ALC257: case ALC269_TYPE_ALC225: case ALC269_TYPE_ALC294: case ALC269_TYPE_ALC700: @@ -6375,6 +6378,10 @@ static int patch_alc269(struct hda_codec *codec) spec->gen.mixer_nid = 0; /* ALC256 does not have any loopback mixer path */ alc_update_coef_idx(codec, 0x36, 1 << 13, 1 << 5); /* Switch pcbeep path to Line in path*/ break; + case 0x10ec0257: + spec->codec_variant = ALC269_TYPE_ALC257; + spec->gen.mixer_nid = 0; + break; case 0x10ec0225: case 0x10ec0295: case 0x10ec0299: @@ -7361,6 +7368,7 @@ static const struct hda_device_id snd_hda_id_realtek[] = { HDA_CODEC_ENTRY(0x10ec0236, "ALC236", patch_alc269), HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269), HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269), + HDA_CODEC_ENTRY(0x10ec0257, "ALC257", patch_alc269), HDA_CODEC_ENTRY(0x10ec0260, "ALC260", patch_alc260), HDA_CODEC_ENTRY(0x10ec0262, "ALC262", patch_alc262), HDA_CODEC_ENTRY(0x10ec0267, "ALC267", patch_alc268), -- 2.11.0

7 years, 4 months

2
1
0 0

Please include mainline commit 5088814a6e93 into 4.17.y

by Rafael J. Wysocki

Hi Greg, As per the subject, please add the following mainline commit: 5088814a6e93 ACPICA: AML parser: attempt to continue loading table after error to the 4.17.y series as it is reported to fix a regression introduced in 4.17. Thanks, Rafael

7 years, 4 months

2
1
0 0

perf/x86/intel: Fix large period handling on Broadwell CPUs

by Jim Mattson

I'd like to nominate commit f605cfca8c39 ("perf/x86/intel: Fix large period handling on Broadwell CPUs") for backport to the affected stable Linux releases. (The bug was introduced in 4.1.) Because of this bug, the NMI watchdog timer may fire spuriously on Broadwell systems, resulting in a hard lockup panic when there is, in fact, no lockup.

7 years, 4 months

2
1
0 0

[PATCH 4.16 000/279] 4.16.17-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.16.17 release. There are 279 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Jun 20 08:05:28 UTC 2018. 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/v4.x/stable-review/patch-4.16.17-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.16.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.16.17-rc1 Russell King <rmk+kernel(a)armlinux.org.uk> ARM: fix kill( ,SIGFPE) breakage Russell King <rmk+kernel(a)armlinux.org.uk> ARM: replace unnecessary perl with sed and the shell $(( )) operator Russell King <rmk+kernel(a)armlinux.org.uk> ARM: kexec: fix kdump register saving on panic() Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8753/1: decompressor: add a missing parameter to the addruart macro Mark Rutland <mark.rutland(a)arm.com> efi/libstub/arm64: Handle randomized TEXT_OFFSET Darren Hart <dvhart(a)infradead.org> platform/x86: DELL_WMI use depends on instead of select for DELL_SMBIOS Helge Deller <deller(a)gmx.de> parisc: Move setup_profiling_timer() out of init section Mathieu Malaterre <malat(a)debian.org> sched/deadline: Make the grub_reclaim() function static Mathieu Malaterre <malat(a)debian.org> sched/debug: Move the print_rt_rq() and print_dl_rq() declarations to kernel/sched/sched.h Dan Carpenter <dan.carpenter(a)oracle.com> drm/dumb-buffers: Integer overflow in drm_mode_create_ioctl() Waiman Long <longman(a)redhat.com> locking/percpu-rwsem: Annotate rwsem ownership transfer by setting RWSEM_OWNER_UNKNOWN Waiman Long <longman(a)redhat.com> locking/rwsem: Add a new RWSEM_ANONYMOUSLY_OWNED flag Stefan Agner <stefan(a)agner.ch> clk: imx6ull: use OSC clock during AXI rate change Geert Uytterhoeven <geert(a)linux-m68k.org> mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit Wanpeng Li <wanpengli(a)tencent.com> KVM: X86: Lower the default timer frequency limit to 200us Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: set VPIF capture card name Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: dm646x: fix timer interrupt generation Peter Rosin <peda(a)axentia.se> i2c: viperboard: return message count on master_xfer success Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: fix error return from master_xfer Peter Rosin <peda(a)axentia.se> i2c: pmcmsp: return message count on master_xfer success Russell King <rmk+kernel(a)armlinux.org.uk> ARM: keystone: fix platform_domain_notifier array overrun Daniel Glöckner <dg(a)emlix.com> usb: musb: fix remote wakeup racing with suspend David Howells <dhowells(a)redhat.com> afs: Fix the non-encryption of calls Marc Dionne <marc.dionne(a)auristor.com> afs: Fix afs_find_server search loop David Howells <dhowells(a)redhat.com> afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID David Howells <dhowells(a)redhat.com> afs: Fix VNOVOL handling in address rotation Ben Hutchings <ben(a)decadent.org.uk> mtd: Fix comparison in map_word_andequal() David Howells <dhowells(a)redhat.com> afs: Fix server rotation's handling of fileserver probe failure David Howells <dhowells(a)redhat.com> afs: Fix refcounting in callback registration David Howells <dhowells(a)redhat.com> afs: Fix address list parsing Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add a test for pkey 0 Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Save off 'prot' for allocations Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pointer math Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Fix pkey exhaustion test off-by-one Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Add PROT_EXEC test Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Factor out "instruction page" Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Allow faults on unknown keys Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Avoid printf-in-signal deadlocks Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Stop using assert() Dave Hansen <dave.hansen(a)linux.intel.com> x86/pkeys/selftests: Give better unexpected fault error messages Andy Lutomirski <luto(a)kernel.org> x86/selftests: Add mov_to_ss test Ingo Molnar <mingo(a)kernel.org> x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI Ingo Molnar <mingo(a)kernel.org> x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI Ingo Molnar <mingo(a)kernel.org> objtool, kprobes/x86: Sync the latest <asm/insn.h> header with tools/objtool/arch/x86/include/asm/insn.h Masami Hiramatsu <mhiramat(a)kernel.org> uprobes/x86: Prohibit probing on MOV SS instruction Masami Hiramatsu <mhiramat(a)kernel.org> kprobes/x86: Prohibit probing on exception masking instructions Ashish Samant <ashish.samant(a)oracle.com> ocfs2: take inode cluster lock before moving reflinked inode from orphan dir Laura Abbott <labbott(a)redhat.com> proc/kcore: don't bounds check against address 0 Jeffrey Hugo <jhugo(a)codeaurora.org> init: fix false positives in W+X checking Yury Norov <ynorov(a)caviumnetworks.com> lib/find_bit_benchmark.c: avoid soft lockup in test_find_first_bit() Roman Mashak <mrv(a)mojatatu.com> net sched actions: fix invalid pointer dereferencing if skbedit flags missing Colin Ian King <colin.king(a)canonical.com> ixgbe: fix memory leak on ipsec allocation Emil Tantilov <emil.s.tantilov(a)intel.com> ixgbe: return error on unsupported SFP module when resetting Rob Herring <robh(a)kernel.org> sh: switch to NO_BOOTMEM Leo Yan <leo.yan(a)linaro.org> perf cs-etm: Support unknown_thread in cs_etm_auxtrace Marian Rotariu <mrotariu(a)bitdefender.com> x86: Delay skip of emulated hypercall instruction Wanpeng Li <wanpengli(a)tencent.com> KVM: Extend MAX_IRQ_ROUTES to 4096 for all archs Nikita Yushchenko <nikita.yoush(a)cogentembedded.com> ARM: dts: imx51-zii-rdu1: fix touchscreen bindings David Howells <dhowells(a)redhat.com> rxrpc: Fix the min security level for kernel calls David Howells <dhowells(a)redhat.com> rxrpc: Fix error reception on AF_INET6 sockets David Howells <dhowells(a)redhat.com> rxrpc: Fix missing start of call timeout Ganesh Goudar <ganeshgr(a)chelsio.com> cxgb4: copy mbox log size to PF0-3 adap instances Michal Kalderon <Michal.Kalderon(a)cavium.com> qede: Fix gfp flags sent to rdma event node allocation Michal Kalderon <Michal.Kalderon(a)cavium.com> qed: Fix l2 initializations over iWARP personality Ying Xue <ying.xue(a)windriver.com> tipc: eliminate KMSAN uninit-value in strcmp complaint Mathieu Malaterre <malat(a)debian.org> agp: uninorth: make two functions static Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/amdgpu: Switch to interruptable wait to recover from ring hang. Paulo Alcantara <palcantara(a)suse.de> cifs: smb2ops: Fix listxattr() when there are no EAs Long Li <longli(a)microsoft.com> cifs: Allocate validate negotiation request through kmalloc David Gilhooley <dgilhooley(a)nvidia.com> arm64: Add MIDR encoding for NVIDIA CPUs Hans de Goede <hdegoede(a)redhat.com> HID: i2c-hid: Add RESEND_REPORT_DESCR quirk for Toshiba Click Mini L9W-B Jakob Unterwurzacher <jakob.unterwurzacher(a)theobroma-systems.com> can: dev: increase bus-off message severity Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Fix CONFIG_NUMA=n build Igor Russkikh <igor.russkikh(a)aquantia.com> net: aquantia: Limit number of vectors to actually allocated irqs Igor Russkikh <igor.russkikh(a)aquantia.com> net: aquantia: driver should correctly declare vlan_features bits van der Linden, Frank <fllinden(a)amazon.com> x86/xen: Reset VCPU0 info pointer after shared_info remap Sara Sharon <sara.sharon(a)intel.com> mac80211: use timeout from the AddBA response instead of the request Clément Péron <peron.clem(a)gmail.com> ARM: dts: cygnus: fix irq type for arm global timer Mathieu Malaterre <malat(a)debian.org> driver core: add __printf verification to __ata_ehi_pushv_desc Jianchao Wang <jianchao.w.wang(a)oracle.com> nvme: fix use-after-free in nvme_free_ns_head Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: handle alloc failures in omap_connector Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: check return value from soc_device_match Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix possible NULL ref issue in tiler_reserve_2d Tomi Valkeinen <tomi.valkeinen(a)ti.com> drm/omap: fix uninitialized ret variable Dan Carpenter <dan.carpenter(a)oracle.com> drm/omap: silence unititialized variable warning Eric Anholt <eric(a)anholt.net> drm/vc4: Fix oops dereferencing DPI's connector since panel_bridge. Ilan Peer <ilan.peer(a)intel.com> mac80211: Adjust SAE authentication timeout Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic to account for ppc_ prefix Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/trace/syscalls: Update syscall name matching logic Etienne Carriere <etienne.carriere(a)linaro.org> tee: check shm references are consistent in offset/size Rich Felker <dalias(a)libc.org> sh: fix build failure for J2 cpu with SMP disabled Masahiro Yamada <yamada.masahiro(a)socionext.com> gcc-plugins: fix build condition of SANCOV plugin Bhadram Varka <vbhadram(a)nvidia.com> net: phy: broadcom: add support for BCM89610 PHY Peter Zijlstra <peterz(a)infradead.org> sched/core: Introduce set_special_state() Daniel Borkmann <daniel(a)iogearbox.net> bpf: use array_index_nospec in find_prog_type Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> drm/exynos: mixer: avoid Oops in vp_video_buffer() Andrzej Hajda <a.hajda(a)samsung.com> drm/exynos/mixer: fix synchronization check in interlaced mode Mark Rutland <mark.rutland(a)arm.com> bpf: fix possible spectre-v1 in find_and_alloc_map() Rob Herring <robh(a)kernel.org> spi: bcm2835aux: ensure interrupts are enabled for shared handler Parav Pandit <parav(a)mellanox.com> RDMA/cma: Do not query GID during QP state transition to RTR Jack Morgenstein <jackm(a)dev.mellanox.co.il> IB/mlx4: Fix integer overflow when calculating optimal MTT size Sebastian Sanchez <sebastian.sanchez(a)intel.com> IB/hfi1: Fix memory leak in exception path in get_irq_affinity() Sebastian Sanchez <sebastian.sanchez(a)intel.com> IB/{hfi1, rdmavt}: Fix memory leak in hfi1_alloc_devdata() upon failure Michael J. Ruhl <michael.j.ruhl(a)intel.com> IB/hfi1 Use correct type for num_user_context Stefan Raspl <stefan.raspl(a)linux.ibm.com> smc: fix sendpage() call Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: typec: tps6598x: handle block reads separately with plain-I2C adapters Graeme Smecher <gsmecher(a)threespeedlogic.com> ARM: dts: correct missing "compatible" entry for ti81xx SoCs Janusz Krzysztofik <jmkrzyszt(a)gmail.com> ARM: OMAP1: ams-delta: fix deferred_fiq handler Keith Busch <keith.busch(a)intel.com> nvme/multipath: Fix multipath disabled naming collisions Keith Busch <keith.busch(a)intel.com> nvme/multipath: Disable runtime writable enabling parameter Keith Busch <keith.busch(a)intel.com> nvme: Set integrity flag for user passthrough commands Chengguang Xu <cgxu519(a)gmx.com> nvme: fix potential memory leak in option parsing Changbin Du <changbin.du(a)intel.com> iommu/vt-d: fix shift-out-of-bounds in bug checking Jagannathan Raman <jag.raman(a)oracle.com> iommu/vt-d: Fix usage of force parameter in intel_ir_reconfigure_irte() Bhadram Varka <vbhadram(a)nvidia.com> arm64: tegra: Make BCM89610 PHY interrupt as active low Peter Zijlstra <peterz(a)infradead.org> kthread, sched/wait: Fix kthread_parkme() completion issue Peter Zijlstra <peterz(a)infradead.org> kthread, sched/wait: Fix kthread_parkme() wait-loop Peter Zijlstra <peterz(a)infradead.org> stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock Helge Deller <deller(a)gmx.de> parisc: drivers.c: Fix section mismatches Daniel Borkmann <daniel(a)iogearbox.net> bpf, x64: fix memleak when not converging on calls Daniel Borkmann <daniel(a)iogearbox.net> bpf, x64: fix memleak when not converging after image Ladislav Michl <ladis(a)linux-mips.org> mtd: onenand: omap2: Disable DMA for HIGHMEM buffers Mika Westerberg <mika.westerberg(a)linux.intel.com> pinctrl: cherryview: Associate IRQ descriptors to irqdomain Yixun Lan <yixun.lan(a)amlogic.com> pinctrl: meson-axg: fix the range of aobus bank Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: fix GPIO lookup for I2C Jim Gill <jgill(a)vmware.com> scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Arnd Bergmann <arnd(a)arndb.de> hexagon: export csum_partial_copy_nocheck Arnd Bergmann <arnd(a)arndb.de> hexagon: add memset_io() helper Nick Dyer <nick(a)shmanahar.org> Input: atmel_mxt_ts - fix the firmware update Chuck Lever <chuck.lever(a)oracle.com> xprtrdma: Fix list corruption / DMAR errors during MR recovery Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix Audio Mute Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix WL127x Startup Issues Tero Kristo <t-kristo(a)ti.com> ARM: OMAP2+: powerdomain: use raw_smp_processor_id() for trace Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: panel: lvds: Fix path to display timing bindings Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-dm355-evm: fix broken networking Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-omapl138-hawk: fix GPIO numbers for MMC/SD lookup Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da850-evm: fix GPIO lookup for MMC/SD Sekhar Nori <nsekhar(a)ti.com> ARM: davinci: board-da830-evm: fix GPIO lookup for MMC/SD Håkon Bugge <haakon.bugge(a)oracle.com> IB/core: Make ib_mad_client_id atomic Amir Goldstein <amir73il(a)gmail.com> <linux/stringhash.h>: fix end_name_hash() for 64bit long oulijun <oulijun(a)huawei.com> RDMA/hns: Submit bad wr oulijun <oulijun(a)huawei.com> RDMA/hns: Fix the qp context state diagram oulijun <oulijun(a)huawei.com> RDMA/hns: Intercept illegal RDMA operation when use inline data oulijun <oulijun(a)huawei.com> RDMA/hns: Bugfix for init hem table Zhu Yanjun <yanjun.zhu(a)oracle.com> IB/rxe: avoid double kfree_skb Jianchao Wang <jianchao.w.wang(a)oracle.com> IB/rxe: add RXE_START_MASK for rxe_opcode IB_OPCODE_RC_SEND_ONLY_INV Colin Ian King <colin.king(a)canonical.com> RDMA/iwpm: fix memory leak on map_info Parav Pandit <parav(a)mellanox.com> RDMA/cma: Fix use after destroy access to net namespace for IPoIB Matan Barak <matanb(a)mellanox.com> IB/uverbs: Fix validating mandatory attributes Junaid Shahid <junaids(a)google.com> kvm: apic: Flush TLB after APIC mode/address change if VPIDs are in use Maxime Chevallier <maxime.chevallier(a)bootlin.com> net: mvpp2: Fix clk error path in mvpp2_probe Greg Thelen <gthelen(a)google.com> IB: make INFINIBAND_ADDR_TRANS configurable Greg Thelen <gthelen(a)google.com> ib_srp: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> cifs: smbd: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> ib_srpt: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvmet-rdma: depend on INFINIBAND_ADDR_TRANS Greg Thelen <gthelen(a)google.com> nvme: depend on INFINIBAND_ADDR_TRANS Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: don't depend on eth_tbl being available Jon Maloy <jon.maloy(a)ericsson.com> tipc: fix bug in function tipc_nl_node_dump_monitor Leon Romanovsky <leonro(a)mellanox.com> RDMA/mlx5: Properly check return value of mlx5_get_uars_page Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Fix the i2c count issue Baolin Wang <baolin.wang(a)linaro.org> i2c: sprd: Prevent i2c accesses after suspend is called Masahiro Yamada <yamada.masahiro(a)socionext.com> reset: uniphier: fix USB clock line for LD20 Laurentiu Tudor <laurentiu.tudor(a)nxp.com> powerpc/kvm/booke: Fix altivec related build break Stefano Brivio <sbrivio(a)redhat.com> vti6: Change minimum MTU to IPV4_MIN_MTU, vti6 can carry IPv4 too John Fastabend <john.fastabend(a)gmail.com> bpf: fix uninitialized variable in bpf tools jacek.tomaka(a)poczta.fm <jacek.tomaka(a)poczta.fm> x86/cpu/intel: Add missing TLB cpuid values Evan Wang <xswang(a)marvell.com> ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI Evan Wang <xswang(a)marvell.com> libahci: Allow drivers to override stop_engine Mark Rutland <mark.rutland(a)arm.com> KVM: arm/arm64: vgic: fix possible spectre-v1 in vgic_mmio_read_apr() Mark Rutland <mark.rutland(a)arm.com> arm64: fix possible spectre-v1 in ptrace_hbp_get_event() Omar Sandoval <osandov(a)fb.com> blk-mq: fix sysfs inflight counter Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: intel-ish-hid: use put_device() instead of kfree() Ramon Fried <rfried(a)codeaurora.org> rpmsg: added MODULE_ALIAS for rpmsg_char Tobias Jordan <Tobias.Jordan(a)elektrobit.com> remoteproc: qcom: Fix potential device node leaks Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Don't enable freeze-on-smi for PerfMon V1 Dag Moxnes <dag.moxnes(a)oracle.com> rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Gianluca Borello <g.borello(a)gmail.com> bpf, x64: fix JIT emission for dead code Masami Hiramatsu <mhiramat(a)kernel.org> selftests: ftrace: Add a testcase for multiple actions on trigger Arvind Yadav <arvind.yadav.cs(a)gmail.com> HID: wacom: Release device resource data obtained by devres_alloc() pgzh <peter.ganzhorn(a)gmail.com> HID: lenovo: Add support for IBM/Lenovo Scrollpoint mice Kan Liang <kan.liang(a)linux.intel.com> perf pmu: Fix core PMU alias list for X86 platform Mark Rutland <mark.rutland(a)arm.com> arm64: only advance singlestep for user instruction traps Mark Rutland <mark.rutland(a)arm.com> arm64: ptrace: remove addr_limit manipulation Aurelien Jarno <aurelien(a)aurel32.net> RISC-V: build vdso-dummy.o with -no-pie Christoph Hellwig <hch(a)lst.de> riscv: select DMA_DIRECT_OPS instead of redefining it Florian Fainelli <f.fainelli(a)gmail.com> net: ethtool: Add missing kernel doc for FEC parameters Vinicius Costa Gomes <vinicius.gomes(a)intel.com> igb: Fix the transmission mode of queue 0 for Qav mode Masahiro Yamada <yamada.masahiro(a)socionext.com> arm64: dts: uniphier: fix input delay value for legacy mode of eMMC Steve French <smfrench(a)gmail.com> CIFS: set *resp_buf_type to NO_BUFFER on error Hans de Goede <hdegoede(a)redhat.com> thermal: int3403_thermal: Fix NULL pointer deref on module load / probe Markus Mayer <mmayer(a)broadcom.com> cpufreq: brcmstb-avs-cpufreq: remove development debug support Andres Rodriguez <andres.rodriguez(a)amd.com> drm/amdkfd: fix clock counter retrieval for node without GPU Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70 Sekhar Nori <nsekhar(a)ti.com> ARM: dts: da850: fix W=1 warnings with pinmux node Jingju Hou <Jingju.Hou(a)synaptics.com> net: phy: marvell: clear wol event before setting it Balbir Singh <bsingharora(a)gmail.com> powerpc/powernv/memtrace: Let the arch hotunplug code flush cache Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: mvebu-uart: DT fix s/interrupts-names/interrupt-names/ Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: meson-uart: DT fix s/clocks-names/clock-names/ Mika Westerberg <mika.westerberg(a)linux.intel.com> ACPI / scan: Initialize watchdog before PNP Chen Yu <yu.c.chen(a)intel.com> ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016) Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: use Read device to query hypervisor for MAC Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: fix request-side race during cmd IO timeout Julian Wiedmann <jwi(a)linux.vnet.ibm.com> s390/qeth: fix MAC address update sequence Tobias Regnery <tobias.regnery(a)gmail.com> usb: typec: ucsi: fix tracepoint related build error Minchan Kim <minchan(a)kernel.org> mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create() Dave Young <dyoung(a)redhat.com> kexec_file: do not add extra alignment to efi memmap Alexey Dobriyan <adobriyan(a)gmail.com> proc: fix /proc/loadavg regression Alexey Dobriyan <adobriyan(a)gmail.com> proc: revalidate kernel thread inodes to root:root Huang Ying <ying.huang(a)intel.com> mm, pagemap: fix swap offset value for PMD migration entry Colin Ian King <colin.king(a)canonical.com> scsi: isci: Fix infinite loop in while loop Long Li <longli(a)microsoft.com> scsi: storvsc: Set up correct queue depth values for IDE devices Baolin Wang <baolin.wang(a)linaro.org> parisc: time: Convert read_persistent_clock() to read_persistent_clock64() David Howells <dhowells(a)redhat.com> vfs: Undo an overly zealous MS_RDONLY -> SB_RDONLY conversion David Howells <dhowells(a)redhat.com> afs: Fix server record deletion dann frazier <dann.frazier(a)canonical.com> net: hns: Avoid action name truncation Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: init root blkcg_gq under lock Emil Velikov <emil.velikov(a)collabora.com> drm/msm: don't deref error pointer in the msm_fbdev_create error path Stefan Agner <stefan(a)agner.ch> drm/msm/dsi: use correct enum in dsi_get_cmd_fmt Ben Hutchings <ben.hutchings(a)codethink.co.uk> drm/msm: Fix possible null dereference on failure of get_pages() Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> ASoC: msm8916-wcd-analog: use threaded context for mbhc events Taehee Yoo <ap420073(a)gmail.com> netfilter: nf_tables: fix out-of-bounds in nft_chain_commit_update Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: NAT chain and extensions require NF_TABLES Ming Lei <ming.lei(a)redhat.com> scsi: target: fix crash with iscsi target and dvd Vinson Lee <vlee(a)freedesktop.org> scsi: megaraid_sas: Do not log an error if FW successfully initializes. Chris Leech <cleech(a)redhat.com> scsi: iscsi: respond to netlink with unicast when appropriate Srinath Mannam <srinath.mannam(a)broadcom.com> arm64: dts: correct SATA addresses for Stingray Tung Nguyen <tung.q.nguyen(a)dektech.com.au> tipc: fix infinite loop when dumping link monitor summary Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxm-khadas-vim2: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-nexbox-a95x: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-s905x-libretech-cc: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gx-p23x-q20x: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl-s905x-p212: enable the USB controller Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxm: add GXM specific USB host configuration Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> ARM64: dts: meson-gxl: add USB host support Jiang Biao <jiang.biao2(a)zte.com.cn> blkcg: don't hold blkcg lock when deactivating policy sxauwsk <sxauwsk(a)163.com> spi: cadence: Add usleep_range() for cdns_spi_fill_tx_fifo() Liam Girdwood <liam.r.girdwood(a)linux.intel.com> ASoC: topology: Check widget kcontrols before deref. Mark Rutland <mark.rutland(a)arm.com> arm64: kasan: avoid pfn_to_nid() before page array is initialized Simon Gaiser <simon(a)invisiblethingslab.com> xen: xenbus_dev_frontend: Really return response string Andre Przywara <andre.przywara(a)arm.com> KVM: arm/arm64: vgic: Kick new VCPU on interrupt migration Petr Mladek <pmladek(a)suse.com> livepatch: Allow to call a custom callback when freeing shadow variables Petr Mladek <pmladek(a)suse.com> livepatch: Initialize shadow variables safely by a custom callback Yan Wang <yan.wang(a)linux.intel.com> ASoC: topology: Fix bugs of freeing soc topology Loic Poulain <loic.poulain(a)linaro.org> PCI: kirin: Fix reset gpio name Madhavan Srinivasan <maddy(a)linux.vnet.ibm.com> powerpc/64s: Default l1d_size to 64K in RFI fallback flush Geert Uytterhoeven <geert(a)linux-m68k.org> soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure Florian Fainelli <f.fainelli(a)gmail.com> soc: bcm: raspberrypi-power: Fix use of __packed Tyler Hicks <tyhicks(a)canonical.com> eCryptfs: don't pass up plaintext names when using filename encryption Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix cm2 and prm sizes for omap4 oder_chiou(a)realtek.com <oder_chiou(a)realtek.com> ASoC: rt5514: Add the missing register in the readable table Jerome Brunet <jbrunet(a)baylibre.com> clk: honor CLK_MUX_ROUND_CLOSEST in generic clk mux Paolo Bonzini <pbonzini(a)redhat.com> kvm: x86: move MSR_IA32_TSC handling to x86.c KarimAllah Ahmed <karahmed(a)amazon.de> X86/KVM: Properly update 'tsc_offset' to represent the running guest Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: dmaengine: rcar-dmac: document R8A77965 support Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: serial: sh-sci: Add support for r8a77965 (H)SCIF Jacopo Mondi <jacopo+renesas(a)jmondi.org> dt-bindings: net: ravb: Add support for r8a77965 SoC Matheus Castello <matheus(a)castello.eng.br> dt-bindings: pinctrl: sunxi: Fix reference to driver Lukasz Majewski <lukma(a)denx.de> doc: Add vendor prefix for Kieback & Peter GmbH Vladimir Zapolskiy <vladimir_zapolskiy(a)mentor.com> spi: sh-msiof: Fix bit field overflow writes to TSCR/RSCR Matt Redfearn <matt.redfearn(a)mips.com> MIPS: dts: Boston: Fix PCI bus dtc warnings: Chengguang Xu <cgxu519(a)gmx.com> isofs: fix potential memory leak in mount option parsing Martin Schwidefsky <schwidefsky(a)de.ibm.com> s390/smsgiucv: disable SMSG on module unload Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Add barrier after register read in readX() Amir Goldstein <amir73il(a)gmail.com> fsnotify: fix ignore mask logic in send_to_group() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf report: Fix switching to another perf.data file Pieter Jansen van Vuuren <pieter.jansenvanvuuren(a)netronome.com> nfp: flower: split and limit cmsg skb lists Jakub Kicinski <jakub.kicinski(a)netronome.com> nfp: ignore signals when communicating with management FW Nathan Fontenot <nfont(a)linux.vnet.ibm.com> ibmvnic: Do not notify peers on parameter change resets Raghuram Chary J <raghuramchary.jallipalli(a)microchip.com> lan78xx: PHY DSP registers initialization to address EEE link drop issues with long cables Sinan Kaya <okaya(a)codeaurora.org> MIPS: io: Prevent compiler reordering writeX() Krish Sadhukhan <krish.sadhukhan(a)oracle.com> x86: Add check for APIC access address for vmentry of L2 guests Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: Intel: atom: fix ACPI/PCI Kconfig hu huajun <huhuajun(a)linux.alibaba.com> KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Input: synaptics-rmi4 - fix an unchecked out of memory error path Anson Huang <Anson.Huang(a)nxp.com> clocksource/drivers/imx-tpm: Correct some registers operation flow ------------- Diffstat: .../bindings/display/panel/panel-common.txt | 2 +- .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + .../devicetree/bindings/net/renesas,ravb.txt | 1 + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 6 +- .../bindings/serial/amlogic,meson-uart.txt | 2 +- .../devicetree/bindings/serial/mvebu-uart.txt | 2 +- .../bindings/serial/renesas,sci-serial.txt | 2 + .../devicetree/bindings/vendor-prefixes.txt | 1 + Documentation/livepatch/shadow-vars.txt | 41 ++- Makefile | 4 +- arch/arm/boot/compressed/Makefile | 8 +- arch/arm/boot/compressed/head.S | 20 +- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/da850.dtsi | 2 - arch/arm/boot/dts/dm8148-evm.dts | 2 +- arch/arm/boot/dts/dm8148-t410.dts | 2 +- arch/arm/boot/dts/dm8168-evm.dts | 2 +- arch/arm/boot/dts/dra62x-j5eco-evm.dts | 2 +- arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 11 +- arch/arm/boot/dts/omap4.dtsi | 8 +- arch/arm/include/uapi/asm/siginfo.h | 13 - arch/arm/kernel/machine_kexec.c | 34 ++- arch/arm/mach-davinci/board-da830-evm.c | 9 +- arch/arm/mach-davinci/board-da850-evm.c | 9 +- arch/arm/mach-davinci/board-dm355-evm.c | 15 +- arch/arm/mach-davinci/board-dm644x-evm.c | 10 +- arch/arm/mach-davinci/board-dm646x-evm.c | 5 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 10 +- arch/arm/mach-davinci/dm646x.c | 3 +- arch/arm/mach-keystone/pm_domain.c | 1 + arch/arm/mach-omap1/ams-delta-fiq.c | 28 +- arch/arm/mach-omap2/powerdomain.c | 4 +- arch/arm/vfp/vfpmodule.c | 2 +- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 4 + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 61 ++++ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 17 ++ .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 80 ++--- arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 2 +- arch/arm64/include/asm/cputype.h | 6 + arch/arm64/kernel/ptrace.c | 20 +- arch/arm64/kernel/traps.c | 3 +- arch/arm64/mm/kasan_init.c | 4 +- arch/hexagon/include/asm/io.h | 6 + arch/hexagon/lib/checksum.c | 1 + arch/mips/boot/dts/img/boston.dts | 6 + arch/mips/include/asm/io.h | 4 +- arch/parisc/kernel/drivers.c | 7 +- arch/parisc/kernel/smp.c | 3 +- arch/parisc/kernel/time.c | 2 +- arch/powerpc/include/asm/ftrace.h | 29 +- arch/powerpc/include/asm/topology.h | 13 +- arch/powerpc/kernel/setup_64.c | 11 + arch/powerpc/kvm/booke.c | 7 + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- arch/powerpc/platforms/powernv/memtrace.c | 17 -- arch/riscv/Kconfig | 4 +- arch/riscv/kernel/vdso/Makefile | 2 +- arch/sh/Kconfig | 1 + arch/sh/kernel/cpu/sh2/probe.c | 4 + arch/sh/kernel/setup.c | 1 - arch/sh/mm/init.c | 68 +---- arch/sh/mm/numa.c | 19 -- arch/x86/events/intel/core.c | 9 +- arch/x86/include/asm/insn.h | 18 ++ arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kernel/cpu/intel.c | 3 + arch/x86/kernel/kexec-bzimage64.c | 5 +- arch/x86/kernel/kprobes/core.c | 4 + arch/x86/kernel/uprobes.c | 4 + arch/x86/kvm/hyperv.c | 2 +- arch/x86/kvm/svm.c | 31 +- arch/x86/kvm/vmx.c | 95 +++--- arch/x86/kvm/x86.c | 33 ++- arch/x86/net/bpf_jit_comp.c | 18 +- arch/x86/xen/enlighten_hvm.c | 13 + block/blk-cgroup.c | 22 +- block/blk-mq.c | 19 ++ block/blk-mq.h | 4 +- block/genhd.c | 12 + block/partition-generic.c | 10 +- drivers/acpi/acpi_watchdog.c | 59 +++- drivers/acpi/scan.c | 2 +- drivers/acpi/sleep.c | 13 + drivers/ata/ahci.c | 6 +- drivers/ata/ahci.h | 7 + drivers/ata/ahci_mvebu.c | 56 ++++ drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_xgene.c | 4 +- drivers/ata/libahci.c | 20 +- drivers/ata/libata-eh.c | 4 +- drivers/ata/sata_highbank.c | 2 +- drivers/char/agp/uninorth-agp.c | 4 +- drivers/clk/clk-mux.c | 10 +- drivers/clk/clk.c | 7 +- drivers/clk/imx/clk-imx6ul.c | 2 +- drivers/clocksource/timer-imx-tpm.c | 8 +- drivers/cpufreq/Kconfig.arm | 10 - drivers/cpufreq/brcmstb-avs-cpufreq.c | 323 +-------------------- drivers/firmware/efi/libstub/arm64-stub.c | 10 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +- drivers/gpu/drm/drm_dumb_buffers.c | 7 +- drivers/gpu/drm/exynos/exynos_mixer.c | 22 +- drivers/gpu/drm/exynos/regs-mixer.h | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 11 +- drivers/gpu/drm/msm/msm_gem.c | 20 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 10 + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 2 +- drivers/gpu/drm/vc4/vc4_dpi.c | 25 +- drivers/hid/Kconfig | 7 +- drivers/hid/hid-ids.h | 9 + drivers/hid/hid-lenovo.c | 36 +++ drivers/hid/i2c-hid/i2c-hid.c | 2 + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +- drivers/hid/wacom_sys.c | 4 +- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-sprd.c | 22 +- drivers/i2c/busses/i2c-viperboard.c | 2 +- drivers/infiniband/Kconfig | 5 +- drivers/infiniband/core/cma.c | 60 ++-- drivers/infiniband/core/iwpm_util.c | 5 +- drivers/infiniband/core/mad.c | 4 +- drivers/infiniband/core/uverbs_ioctl.c | 9 + drivers/infiniband/hw/hfi1/affinity.c | 11 +- drivers/infiniband/hw/hfi1/init.c | 41 ++- drivers/infiniband/hw/hfi1/platform.c | 1 + drivers/infiniband/hw/hfi1/qsfp.c | 2 + drivers/infiniband/hw/hns/hns_roce_hem.c | 8 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 11 +- drivers/infiniband/hw/mlx4/mr.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 4 +- drivers/infiniband/sw/rxe/rxe_opcode.c | 2 +- drivers/infiniband/sw/rxe/rxe_req.c | 1 - drivers/infiniband/sw/rxe/rxe_resp.c | 6 +- drivers/infiniband/ulp/srp/Kconfig | 2 +- drivers/infiniband/ulp/srpt/Kconfig | 2 +- drivers/input/rmi4/rmi_spi.c | 7 +- drivers/input/touchscreen/atmel_mxt_ts.c | 186 +++++++----- drivers/iommu/dmar.c | 2 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/mtd/onenand/omap2.c | 105 +++---- drivers/net/can/dev.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 20 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +- drivers/net/ethernet/hisilicon/hns/hnae.h | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 3 +- drivers/net/ethernet/intel/igb/igb_main.c | 17 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 3 + drivers/net/ethernet/marvell/mvpp2.c | 15 +- drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 38 ++- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 2 + drivers/net/ethernet/netronome/nfp/flower/main.c | 8 +- drivers/net/ethernet/netronome/nfp/flower/main.h | 8 +- drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 2 +- drivers/net/ethernet/netronome/nfp/nfp_main.h | 4 +- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 31 +- .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_l2.c | 6 +- drivers/net/ethernet/qlogic/qede/qede_rdma.c | 2 +- drivers/net/phy/broadcom.c | 10 + drivers/net/phy/marvell.c | 9 + drivers/net/phy/microchip.c | 178 +++++++++++- drivers/nvme/host/Kconfig | 2 +- drivers/nvme/host/core.c | 32 +- drivers/nvme/host/fabrics.c | 6 + drivers/nvme/host/multipath.c | 24 +- drivers/nvme/host/nvme.h | 12 + drivers/nvme/target/Kconfig | 2 +- drivers/pci/dwc/pcie-kirin.c | 2 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 16 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 +- drivers/platform/x86/Kconfig | 2 +- drivers/remoteproc/qcom_q6v5_pil.c | 2 + drivers/reset/reset-uniphier.c | 6 +- drivers/rpmsg/rpmsg_char.c | 2 + drivers/s390/net/qeth_core_main.c | 53 ++-- drivers/s390/net/qeth_core_mpc.h | 12 + drivers/s390/net/qeth_l2_main.c | 59 ++-- drivers/s390/net/smsgiucv.c | 2 +- drivers/scsi/isci/port_config.c | 3 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +- drivers/scsi/scsi_transport_iscsi.c | 29 +- drivers/scsi/storvsc_drv.c | 7 +- drivers/scsi/vmw_pvscsi.c | 2 +- drivers/soc/bcm/raspberrypi-power.c | 2 +- drivers/spi/spi-bcm2835aux.c | 5 + drivers/spi/spi-cadence.c | 8 + drivers/spi/spi-sh-msiof.c | 1 + drivers/target/target_core_pscsi.c | 2 + drivers/tee/tee_core.c | 11 + drivers/thermal/int340x_thermal/int3403_thermal.c | 3 +- drivers/usb/musb/musb_host.c | 5 +- drivers/usb/musb/musb_host.h | 7 +- drivers/usb/musb/musb_virthub.c | 25 +- drivers/usb/typec/tps6598x.c | 47 ++- drivers/usb/typec/ucsi/Makefile | 2 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 3 +- fs/afs/addr_list.c | 25 +- fs/afs/callback.c | 56 +++- fs/afs/cmservice.c | 6 +- fs/afs/internal.h | 7 +- fs/afs/rotate.c | 20 +- fs/afs/rxrpc.c | 7 + fs/afs/server.c | 22 +- fs/afs/server_list.c | 7 +- fs/cifs/Kconfig | 2 +- fs/cifs/smb2ops.c | 6 + fs/cifs/smb2pdu.c | 68 +++-- fs/cifs/transport.c | 5 +- fs/ecryptfs/crypto.c | 41 ++- fs/ecryptfs/file.c | 21 +- fs/isofs/inode.c | 3 + fs/namespace.c | 2 +- fs/notify/fsnotify.c | 25 +- fs/ocfs2/refcounttree.c | 14 +- fs/proc/base.c | 6 + fs/proc/kcore.c | 23 +- fs/proc/loadavg.c | 2 +- fs/proc/task_mmu.c | 6 +- include/linux/brcmphy.h | 1 + include/linux/clk-provider.h | 3 + include/linux/ethtool.h | 2 + include/linux/genhd.h | 4 +- include/linux/kthread.h | 1 + include/linux/kvm_host.h | 8 +- include/linux/livepatch.h | 19 +- include/linux/microchipphy.h | 8 + include/linux/mtd/map.h | 2 +- include/linux/mtd/rawnand.h | 16 +- include/linux/percpu-rwsem.h | 6 +- include/linux/rwsem.h | 6 + include/linux/sched.h | 50 +++- include/linux/sched/signal.h | 2 +- include/linux/stringhash.h | 4 +- include/soc/bcm2835/raspberrypi-firmware.h | 4 +- init/main.c | 7 + kernel/bpf/syscall.c | 19 +- kernel/kthread.c | 50 ++-- kernel/livepatch/shadow.c | 108 ++++--- kernel/locking/rwsem-xadd.c | 19 +- kernel/locking/rwsem.c | 2 - kernel/locking/rwsem.h | 30 +- kernel/module.c | 5 + kernel/sched/core.c | 49 ++-- kernel/sched/deadline.c | 4 +- kernel/sched/rt.c | 2 - kernel/sched/sched.h | 5 +- kernel/signal.c | 17 +- kernel/stop_machine.c | 19 +- lib/find_bit_benchmark.c | 7 +- mm/memcontrol.c | 2 +- net/ipv6/ip6_vti.c | 4 +- net/ipv6/netfilter/Kconfig | 55 ++-- net/mac80211/agg-tx.c | 4 + net/mac80211/mlme.c | 25 +- net/mac80211/tx.c | 3 +- net/netfilter/nf_tables_api.c | 2 +- net/rds/ib_cm.c | 3 +- net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/ar-internal.h | 1 + net/rxrpc/input.c | 2 +- net/rxrpc/local_object.c | 57 +++- net/rxrpc/output.c | 11 + net/rxrpc/sendmsg.c | 10 + net/sched/act_skbedit.c | 3 +- net/smc/af_smc.c | 6 +- net/sunrpc/xprtrdma/fmr_ops.c | 5 +- net/sunrpc/xprtrdma/frwr_ops.c | 9 +- net/sunrpc/xprtrdma/verbs.c | 5 + net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- net/tipc/monitor.c | 2 +- net/tipc/node.c | 28 +- samples/livepatch/livepatch-shadow-fix1.c | 43 ++- samples/livepatch/livepatch-shadow-fix2.c | 33 ++- scripts/Makefile.gcc-plugins | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 9 +- sound/soc/codecs/rt5514.c | 3 + sound/soc/intel/Kconfig | 22 +- sound/soc/soc-topology.c | 6 +- tools/bpf/bpf_dbg.c | 7 +- tools/objtool/arch/x86/include/asm/insn.h | 18 ++ tools/perf/util/cs-etm.c | 24 +- tools/perf/util/pmu.c | 20 +- tools/perf/util/symbol.c | 8 +- .../inter-event/trigger-multi-actions-accept.tc | 44 +++ tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/mov_ss_trap.c | 285 ++++++++++++++++++ tools/testing/selftests/x86/mpx-mini-test.c | 7 +- tools/testing/selftests/x86/pkey-helpers.h | 20 +- tools/testing/selftests/x86/protection_keys.c | 254 +++++++++++----- virt/kvm/arm/vgic/vgic-mmio-v2.c | 5 + virt/kvm/arm/vgic/vgic.c | 8 + 308 files changed, 3213 insertions(+), 1735 deletions(-)

7 years, 4 months

8
273
0 0

[PATCH 1/6] ext4: sysfs: print ext4_super_block fields as little-endian

by Arnd Bergmann

While working on extended rand for last_error/first_error timestamps, I noticed that the endianess is wrong, we access the little-endian fields in struct ext4_super_block as native-endian when we print them. This adds a special case in ext4_attr_show() and ext4_attr_store() to byteswap the superblock fields if needed. In older kernels, this code was part of super.c, it got moved to sysfs.c in linux-4.4. Cc: stable(a)vger.kernel.org Fixes: 52c198c6820f ("ext4: add sysfs entry showing whether the fs contains errors") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- fs/ext4/sysfs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c index f34da0bb8f17..b970a200f20c 100644 --- a/fs/ext4/sysfs.c +++ b/fs/ext4/sysfs.c @@ -274,8 +274,12 @@ static ssize_t ext4_attr_show(struct kobject *kobj, case attr_pointer_ui: if (!ptr) return 0; - return snprintf(buf, PAGE_SIZE, "%u\n", - *((unsigned int *) ptr)); + if (a->attr_ptr == ptr_ext4_super_block_offset) + return snprintf(buf, PAGE_SIZE, "%u\n", + le32_to_cpup(ptr)); + else + return snprintf(buf, PAGE_SIZE, "%u\n", + *((unsigned int *) ptr)); case attr_pointer_atomic: if (!ptr) return 0; @@ -308,7 +312,10 @@ static ssize_t ext4_attr_store(struct kobject *kobj, ret = kstrtoul(skip_spaces(buf), 0, &t); if (ret) return ret; - *((unsigned int *) ptr) = t; + if (a->attr_ptr == ptr_ext4_super_block_offset) + *((__le32 *) ptr) = cpu_to_le32(t); + else + *((unsigned int *) ptr) = t; return len; case attr_inode_readahead: return inode_readahead_blks_store(sbi, buf, len); -- 2.9.0

7 years, 4 months

2
2
0 0

[tip:x86/pti] x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec()

by tip-bot for Dan Williams

Commit-ID: eab6870fee877258122a042bfd99ee7908c40280 Gitweb: https://git.kernel.org/tip/eab6870fee877258122a042bfd99ee7908c40280 Author: Dan Williams <dan.j.williams(a)intel.com> AuthorDate: Thu, 7 Jun 2018 09:13:48 -0700 Committer: Ingo Molnar <mingo(a)kernel.org> CommitDate: Thu, 21 Jun 2018 16:00:21 +0200 x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec() Mark Rutland noticed that GCC optimization passes have the potential to elide necessary invocations of the array_index_mask_nospec() instruction sequence, so mark the asm() volatile. Mark explains: "The volatile will inhibit *some* cases where the compiler could lift the array_index_nospec() call out of a branch, e.g. where there are multiple invocations of array_index_nospec() with the same arguments: if (idx < foo) { idx1 = array_idx_nospec(idx, foo) do_something(idx1); } < some other code > if (idx < foo) { idx2 = array_idx_nospec(idx, foo); do_something_else(idx2); } ... since the compiler can determine that the two invocations yield the same result, and reuse the first result (likely the same register as idx was in originally) for the second branch, effectively re-writing the above as: if (idx < foo) { idx = array_idx_nospec(idx, foo); do_something(idx); } < some other code > if (idx < foo) { do_something_else(idx); } ... if we don't take the first branch, then speculatively take the second, we lose the nospec protection. There's more info on volatile asm in the GCC docs: https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#Volatile " Reported-by: Mark Rutland <mark.rutland(a)arm.com> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Acked-by: Mark Rutland <mark.rutland(a)arm.com> Acked-by: Thomas Gleixner <tglx(a)linutronix.de> Acked-by: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: <stable(a)vger.kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Fixes: babdde2698d4 ("x86: Implement array_index_mask_nospec") Link: https://lkml.kernel.org/lkml/152838798950.14521.4893346294059739135.stgit@d… Signed-off-by: Ingo Molnar <mingo(a)kernel.org> --- arch/x86/include/asm/barrier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 042b5e892ed1..14de0432d288 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -38,7 +38,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, { unsigned long mask; - asm ("cmp %1,%2; sbb %0,%0;" + asm volatile ("cmp %1,%2; sbb %0,%0;" :"=r" (mask) :"g"(size),"r" (index) :"cc");

7 years, 4 months

1
0
0 0

[PATCH 2/3] usb: typec: ucsi: acpi: Workaround for cache mode issue

by Heikki Krogerus

This fixes an issue where the driver fails with an error: ioremap error for 0x3f799000-0x3f79a000, requested 0x2, got 0x0 On some platforms the UCSI ACPI mailbox SystemMemory Operation Region may be setup before the driver has been loaded. That will lead into the driver failing to map the mailbox region, as it has been already marked as write-back memory. acpi_os_ioremap() for x86 uses ioremap_cache() unconditionally. When the issue happens, the embedded controller has a pending query event for the UCSI notification right after boot-up which causes the operation region to be setup before UCSI driver has been loaded. The fix is to notify acpi core that the driver is about to access memory region which potentially overlaps with an operation region right before mapping it. acpi_release_memory() will check if the memory has already been setup (mapped) by acpi core, and deactivate it (unmap) if it has. The driver is then able to map the memory with ioremap_nocache() and set the memtype to uncached for the region. Reported-by: Paul Menzel <pmenzel(a)molgen.mpg.de> Fixes: 8243edf44152 ("usb: typec: ucsi: Add ACPI driver") Cc: stable(a)vger.kernel.org Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c index 44eb4e1ea817..a18112a83fae 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -79,6 +79,11 @@ static int ucsi_acpi_probe(struct platform_device *pdev) return -ENODEV; } + /* This will make sure we can use ioremap_nocache() */ + status = acpi_release_memory(ACPI_HANDLE(&pdev->dev), res, 1); + if (ACPI_FAILURE(status)) + return -ENOMEM; + /* * NOTE: The memory region for the data structures is used also in an * operation region, which means ACPI has already reserved it. Therefore -- 2.17.1

7 years, 4 months

1
0
0 0

[PATCH 1/3] acpi: Add helper for deactivating memory region

by Heikki Krogerus

Sometimes memory resource may be overlapping with SystemMemory Operation Region by design, for example if the memory region is used as a mailbox for communication with a firmware in the system. One occasion of such mailboxes is USB Type-C Connector System Software Interface (UCSI). With regions like that, it is important that the driver is able to map the memory with the requirements it has. For example, the driver should be allowed to map the memory as non-cached memory. However, if the operation region has been accessed before the driver has mapped the memory, the memory has been marked as write-back by the time the driver is loaded. That means the driver will fail to map the memory if it expects non-cached memory. To work around the problem, introducing helper that the drivers can use to temporarily deactivate (unmap) SystemMemory Operation Regions that overlap with their IO memory. Fixes: 8243edf44152 ("usb: typec: ucsi: Add ACPI driver") Cc: stable(a)vger.kernel.org Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Signed-off-by: Heikki Krogerus <heikki.krogerus(a)linux.intel.com> --- drivers/acpi/osl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 3 ++ 2 files changed, 75 insertions(+) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7ca41bf023c9..8df9abfa947b 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -45,6 +45,8 @@ #include <linux/uaccess.h> #include <linux/io-64-nonatomic-lo-hi.h> +#include "acpica/accommon.h" +#include "acpica/acnamesp.h" #include "internal.h" #define _COMPONENT ACPI_OS_SERVICES @@ -1490,6 +1492,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n, } EXPORT_SYMBOL(acpi_check_region); +static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level, + void *_res, void **return_value) +{ + struct acpi_mem_space_context **mem_ctx; + union acpi_operand_object *handler_obj; + union acpi_operand_object *region_obj2; + union acpi_operand_object *region_obj; + struct resource *res = _res; + acpi_status status; + + region_obj = acpi_ns_get_attached_object(handle); + if (!region_obj) + return AE_OK; + + handler_obj = region_obj->region.handler; + if (!handler_obj) + return AE_OK; + + if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) + return AE_OK; + + if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) + return AE_OK; + + region_obj2 = acpi_ns_get_secondary_object(region_obj); + if (!region_obj2) + return AE_OK; + + mem_ctx = (void *)&region_obj2->extra.region_context; + + if (!(mem_ctx[0]->address >= res->start && + mem_ctx[0]->address < res->end)) + return AE_OK; + + status = handler_obj->address_space.setup(region_obj, + ACPI_REGION_DEACTIVATE, + NULL, (void **)mem_ctx); + if (ACPI_SUCCESS(status)) + region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE); + + return status; +} + +/** + * acpi_release_memory - Release any mappings done to a memory region + * @handle: Handle to namespace node + * @res: Memory resource + * @level: A level that terminates the search + * + * Walks through @handle and unmaps all SystemMemory Operation Regions that + * overlap with @res and that have already been activated (mapped). + * + * This is a helper that allows drivers to place special requirements on memory + * region that may overlap with operation regions, primarily allowing them to + * safely map the region as non-cached memory. + * + * The unmapped Operation Regions will be automatically remapped next time they + * are called, so the drivers do not need to do anything else. + */ +acpi_status acpi_release_memory(acpi_handle handle, struct resource *res, + u32 level) +{ + if (!(res->flags & IORESOURCE_MEM)) + return AE_TYPE; + + return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level, + acpi_deactivate_mem_region, NULL, res, NULL); +} +EXPORT_SYMBOL_GPL(acpi_release_memory); + /* * Let drivers know whether the resource checks are effective */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4b35a66383f9..e54f40974eb0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -443,6 +443,9 @@ int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name); +acpi_status acpi_release_memory(acpi_handle handle, struct resource *res, + u32 level); + int acpi_resources_are_enforced(void); #ifdef CONFIG_HIBERNATION -- 2.17.1

7 years, 4 months

1
0
0 0

[PATCH RESEND] softirq: reorder trace_softirqs_on to prevent lockdep splat

by Joel Fernandes

From: "Joel Fernandes (Google)" <joel(a)joelfernandes.org> I'm able to reproduce a lockdep splat with config options: CONFIG_PROVE_LOCKING=y, CONFIG_DEBUG_LOCK_ALLOC=y and CONFIG_PREEMPTIRQ_EVENTS=y $ echo 1 > /d/tracing/events/preemptirq/preempt_enable/enable [ 26.112609] DEBUG_LOCKS_WARN_ON(current->softirqs_enabled) [ 26.112636] WARNING: CPU: 0 PID: 118 at kernel/locking/lockdep.c:3854 [...] [ 26.144229] Call Trace: [ 26.144926] <IRQ> [ 26.145506] lock_acquire+0x55/0x1b0 [ 26.146499] ? __do_softirq+0x46f/0x4d9 [ 26.147571] ? __do_softirq+0x46f/0x4d9 [ 26.148646] trace_preempt_on+0x8f/0x240 [ 26.149744] ? trace_preempt_on+0x4d/0x240 [ 26.150862] ? __do_softirq+0x46f/0x4d9 [ 26.151930] preempt_count_sub+0x18a/0x1a0 [ 26.152985] __do_softirq+0x46f/0x4d9 [ 26.153937] irq_exit+0x68/0xe0 [ 26.154755] smp_apic_timer_interrupt+0x271/0x280 [ 26.156056] apic_timer_interrupt+0xf/0x20 [ 26.157105] </IRQ> The issue was this: preempt_count = 1 << SOFTIRQ_SHIFT __local_bh_enable(cnt = 1 << SOFTIRQ_SHIFT) { if (softirq_count() == (cnt && SOFTIRQ_MASK)) { trace_softirqs_on() { current->softirqs_enabled = 1; } } preempt_count_sub(cnt) { trace_preempt_on() { tracepoint() { rcu_read_lock_sched() { // jumps into lockdep Where preempt_count still has softirqs disabled, but current->softirqs_enabled is true, and we get a splat. Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Tom Zanussi <tom.zanussi(a)linux.intel.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Thomas Glexiner <tglx(a)linutronix.de> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: Paul McKenney <paulmck(a)linux.vnet.ibm.com> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Todd Kjos <tkjos(a)google.com> Cc: Erick Reyes <erickreyes(a)google.com> Cc: Julia Cartwright <julia(a)ni.com> Cc: Byungchul Park <byungchul.park(a)lge.com> Cc: stable(a)vger.kernel.org Reviewed-by: Steven Rostedt (VMware) <rostedt(a)goodmis.org> Fixes: d59158162e032 ("tracing: Add support for preempt and irq enable/disable events") Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- kernel/softirq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 177de3640c78..8a040bcaa033 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt) { lockdep_assert_irqs_disabled(); + if (preempt_count() == cnt) + trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip()); + if (softirq_count() == (cnt & SOFTIRQ_MASK)) trace_softirqs_on(_RET_IP_); - preempt_count_sub(cnt); + + __preempt_count_sub(cnt); } /* -- 2.17.1.1185.g55be947832-goog

7 years, 4 months

3
2
0 0

[PATCH 2/5] xhci: Fix kernel oops in trace_xhci_free_virt_device

by Mathias Nyman

From: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") set dev->udev pointer to NULL in xhci_free_dev(), it will cause kernel panic in trace_xhci_free_virt_device. This patch reimplement the trace function trace_xhci_free_virt_device, remove dev->udev dereference and added more useful parameters to show in the trace function,it also makes sure dev->udev is not NULL before calling trace_xhci_free_virt_device. This issue happened when xhci-hcd trace is enabled and USB devices hot plug test. Original use-after-free patch went to stable so this needs so be applied there as well. [ 1092.022457] usb 2-4: USB disconnect, device number 6 [ 1092.092772] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 [ 1092.101694] PGD 0 P4D 0 [ 1092.104601] Oops: 0000 [#1] SMP [ 1092.207734] Workqueue: usb_hub_wq hub_event [ 1092.212507] RIP: 0010:trace_event_raw_event_xhci_log_virt_dev+0x6c/0xf0 [ 1092.220050] RSP: 0018:ffff8c252e883d28 EFLAGS: 00010086 [ 1092.226024] RAX: ffff8c24af86fa84 RBX: 0000000000000003 RCX: ffff8c25255c2a01 [ 1092.234130] RDX: 0000000000000000 RSI: 00000000aef55009 RDI: ffff8c252e883d28 [ 1092.242242] RBP: ffff8c252550e2c0 R08: ffff8c24af86fa84 R09: 0000000000000a70 [ 1092.250364] R10: 0000000000000a70 R11: 0000000000000000 R12: ffff8c251f21a000 [ 1092.258468] R13: 000000000000000c R14: ffff8c251f21a000 R15: ffff8c251f432f60 [ 1092.266572] FS: 0000000000000000(0000) GS:ffff8c252e880000(0000) knlGS:0000000000000000 [ 1092.275757] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1092.282281] CR2: 0000000000000000 CR3: 0000000154209001 CR4: 00000000003606e0 [ 1092.290384] Call Trace: [ 1092.293156] <IRQ> [ 1092.295439] xhci_free_virt_device.part.34+0x182/0x1a0 [ 1092.301288] handle_cmd_completion+0x7ac/0xfa0 [ 1092.306336] ? trace_event_raw_event_xhci_log_trb+0x6e/0xa0 [ 1092.312661] xhci_irq+0x3e8/0x1f60 [ 1092.316524] __handle_irq_event_percpu+0x75/0x180 [ 1092.321876] handle_irq_event_percpu+0x20/0x50 [ 1092.326922] handle_irq_event+0x36/0x60 [ 1092.331273] handle_edge_irq+0x6d/0x180 [ 1092.335644] handle_irq+0x16/0x20 [ 1092.339417] do_IRQ+0x41/0xc0 [ 1092.342782] common_interrupt+0xf/0xf [ 1092.346955] </IRQ> Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device") Cc: <stable(a)vger.kernel.org> Signed-off-by: Zhengjun Xing <zhengjun.xing(a)linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci-trace.h | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index acbd3d7..8a62eee 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -886,12 +886,12 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) dev = xhci->devs[slot_id]; - trace_xhci_free_virt_device(dev); - xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; + trace_xhci_free_virt_device(dev); + if (dev->tt_info) old_active_eps = dev->tt_info->active_eps; diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h index 410544f..88b4274 100644 --- a/drivers/usb/host/xhci-trace.h +++ b/drivers/usb/host/xhci-trace.h @@ -171,6 +171,37 @@ DEFINE_EVENT(xhci_log_trb, xhci_dbc_gadget_ep_queue, TP_ARGS(ring, trb) ); +DECLARE_EVENT_CLASS(xhci_log_free_virt_dev, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev), + TP_STRUCT__entry( + __field(void *, vdev) + __field(unsigned long long, out_ctx) + __field(unsigned long long, in_ctx) + __field(u8, fake_port) + __field(u8, real_port) + __field(u16, current_mel) + + ), + TP_fast_assign( + __entry->vdev = vdev; + __entry->in_ctx = (unsigned long long) vdev->in_ctx->dma; + __entry->out_ctx = (unsigned long long) vdev->out_ctx->dma; + __entry->fake_port = (u8) vdev->fake_port; + __entry->real_port = (u8) vdev->real_port; + __entry->current_mel = (u16) vdev->current_mel; + ), + TP_printk("vdev %p ctx %llx | %llx fake_port %d real_port %d current_mel %d", + __entry->vdev, __entry->in_ctx, __entry->out_ctx, + __entry->fake_port, __entry->real_port, __entry->current_mel + ) +); + +DEFINE_EVENT(xhci_log_free_virt_dev, xhci_free_virt_device, + TP_PROTO(struct xhci_virt_device *vdev), + TP_ARGS(vdev) +); + DECLARE_EVENT_CLASS(xhci_log_virt_dev, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev), @@ -208,11 +239,6 @@ DEFINE_EVENT(xhci_log_virt_dev, xhci_alloc_virt_device, TP_ARGS(vdev) ); -DEFINE_EVENT(xhci_log_virt_dev, xhci_free_virt_device, - TP_PROTO(struct xhci_virt_device *vdev), - TP_ARGS(vdev) -); - DEFINE_EVENT(xhci_log_virt_dev, xhci_setup_device, TP_PROTO(struct xhci_virt_device *vdev), TP_ARGS(vdev) -- 2.7.4

7 years, 4 months

1
0
0 0

Re: BUG: jumbo frames broken after commit xen-netfront: Fix race between device setup and open

by Javier Martinez Canillas

Hi Andrew, On Wed, Jun 6, 2018 at 6:29 PM, Andrew Jeddeloh <andrew.jeddeloh(a)redhat.com> wrote: > Hi all, > > The patch "xen-netfront: Fix race between device setup and open" seems > to have introduced a regression preventing setting MTU's larger than > 1500. We experienced this downstream with Container Linux and > confirmed with Fedora 28 as well. > > It's commit f599c64fdf7d9c108e8717fb04bc41c680120da4 in the linux-stable tree. > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/com… > > Downstream bugs: > https://github.com/coreos/bugs/issues/2443 > https://bugzilla.redhat.com/show_bug.cgi?id=1584216 > > We've confirmed that reverting that commit fixes the bug. It be > reliably can be reproduced on AWS with t2.micro instances (and > presumably other systems using the same driver). Both using > systemd-networkd to set the mtu and manual ip link commands cause the > link to repsond with "Invalid argument" when trying to set the MTU > > 1500. > > I'm not sure why that commit introduced the regression. > > Please let me know if there's any more information that would be helpful. > > - Andrew I'm adding some relevant people to the CC list to bring more attention on this regression. The get_maintainer.pl script is very useful to get some hints on who should be copied, i.e: $ ./scripts/get_maintainer.pl -f drivers/net/xen-netfront.c Best regards, Javier

7 years, 4 months

3
2
0 0

[PATCH] x86/xen: add call of speculative_store_bypass_ht_init() to pv paths

by Juergen Gross

Commit 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") added speculative_store_bypass_ht_init() to the per-cpu initialization sequence. speculative_store_bypass_ht_init() needs to be called on each cpu for pv guests, too. Reported-by: Brian Woods <brian.woods(a)amd.com> Fixes: 1f50ddb4f4189243c05926b842dc1a0332195f31 ("x86/speculation: Handle HT correctly on AMD") Cc: <stable(a)vger.kernel.org> Signed-off-by: Juergen Gross <jgross(a)suse.com> Tested-by: Brian Woods <brian.woods(a)amd.com> --- arch/x86/xen/smp_pv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 2e20ae2fa2d6..e3b18ad49889 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -32,6 +32,7 @@ #include <xen/interface/vcpu.h> #include <xen/interface/xenpmu.h> +#include <asm/spec-ctrl.h> #include <asm/xen/interface.h> #include <asm/xen/hypercall.h> @@ -70,6 +71,8 @@ static void cpu_bringup(void) cpu_data(cpu).x86_max_cores = 1; set_cpu_sibling_map(cpu); + speculative_store_bypass_ht_init(); + xen_setup_cpu_clockevents(); notify_cpu_starting(cpu); @@ -250,6 +253,8 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) } set_cpu_sibling_map(0); + speculative_store_bypass_ht_init(); + xen_pmu_init(0); if (xen_smp_intr_init(0) || xen_smp_intr_init_pv(0)) -- 2.13.7

7 years, 4 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror