July 2021 - Linux-stable-mirror

FAILED: patch "[PATCH] Bluetooth: btqca: Don't modify firmware contents in-place" 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 b43ca511178ed0ab6fd2405df28cf9e100273020 Mon Sep 17 00:00:00 2001 From: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri, 7 May 2021 14:27:33 +0200 Subject: [PATCH] Bluetooth: btqca: Don't modify firmware contents in-place struct firmware::data is marked const, and when the firmware is compressed with xz (default at least with Fedora) it's mapped read-only which results in a crash: BUG: unable to handle page fault for address: ffffae57c0ca5047 PGD 100000067 P4D 100000067 PUD 1001ce067 PMD 10165a067 PTE 8000000112bba161 Oops: 0003 [#1] SMP NOPTI CPU: 3 PID: 204 Comm: kworker/u17:0 Not tainted 5.12.1-test+ #1 Hardware name: Dell Inc. XPS 13 9310/0F7M4C, BIOS 1.2.5 12/10/2020 Workqueue: hci0 hci_power_on [bluetooth] RIP: 0010:qca_download_firmware+0x27c/0x4e0 [btqca] Code: 1b 75 04 80 48 0c 01 0f b7 c6 8d 54 02 0c 41 39 d7 0f 8e 62 fe ff ff 48 63 c2 4c 01 e8 0f b7 38 0f b7 70 02 66 83 ff 11 75 d3 <80> 48 0c 80 41 83 fc 03 7e 6e 88 58 0d eb ce 41 0f b6 45 0e 48 8b RSP: 0018:ffffae57c08dfc68 EFLAGS: 00010246 RAX: ffffae57c0ca503b RBX: 000000000000000e RCX: 0000000000000000 RDX: 0000000000000037 RSI: 0000000000000006 RDI: 0000000000000011 RBP: ffff978d9949e000 R08: ffff978d84ed7540 R09: ffffae57c0ca5000 R10: 000000000010cd00 R11: 0000000000000001 R12: 0000000000000005 R13: ffffae57c0ca5004 R14: ffff978d98ca8680 R15: 00000000000016a9 FS: 0000000000000000(0000) GS:ffff9794ef6c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffae57c0ca5047 CR3: 0000000113d5a004 CR4: 0000000000770ee0 PKRU: 55555554 Call Trace: qca_uart_setup+0x2cb/0x1390 [btqca] ? qca_read_soc_version+0x136/0x220 [btqca] qca_setup+0x288/0xab0 [hci_uart] hci_dev_do_open+0x1f3/0x780 [bluetooth] ? try_to_wake_up+0x1c1/0x4f0 hci_power_on+0x3f/0x200 [bluetooth] process_one_work+0x1ec/0x380 worker_thread+0x53/0x3e0 ? process_one_work+0x380/0x380 kthread+0x11b/0x140 ? kthread_associate_blkcg+0xa0/0xa0 ret_from_fork+0x1f/0x30 Modules linked in: llc ip_set nf_tables nfnetlink snd_soc_skl_hda_dsp(+) ip6table_filter snd_soc_hdac_hdmi ip6_tables qrtr_mhi iptable_filter snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic s> dell_wmi_sysman(+) dell_smbios snd dcdbas mhi vfat videobuf2_vmalloc i2c_i801 videobuf2_memops videobuf2_v4l2 dell_wmi_descriptor fat wmi_bmof soundcore i2c_smbus videobuf2_common libarc4 mei_me mei hid_se> i2c_hid_acpi i2c_hid video pinctrl_tigerlake fuse CR2: ffffae57c0ca5047 This also seems to fix a failure to suspend due to the firmware download on bootup getting interrupted by the crash: Bluetooth: hci0: SSR or FW download time out PM: dpm_run_callback(): acpi_subsys_suspend+0x0/0x60 returns -110 PM: Device serial0-0 failed to suspend: error -110 PM: Some devices failed to suspend, or early wake event detected Fixes: 83e8196 ("Bluetooth: btqca: Introduce generic QCA ROME support") Cc: Venkata Lakshmi Narayana Gubba <gubbaven(a)codeaurora.org> Cc: stable(a)vger.kernel.org Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Marcel Holtmann <marcel(a)holtmann.org> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 25114f0d1319..bd71dfc9c974 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -183,7 +183,7 @@ int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) EXPORT_SYMBOL_GPL(qca_send_pre_shutdown_cmd); static void qca_tlv_check_data(struct qca_fw_config *config, - const struct firmware *fw, enum qca_btsoc_type soc_type) + u8 *fw_data, enum qca_btsoc_type soc_type) { const u8 *data; u32 type_len; @@ -194,7 +194,7 @@ static void qca_tlv_check_data(struct qca_fw_config *config, struct tlv_type_nvm *tlv_nvm; uint8_t nvm_baud_rate = config->user_baud_rate; - tlv = (struct tlv_type_hdr *)fw->data; + tlv = (struct tlv_type_hdr *)fw_data; type_len = le32_to_cpu(tlv->type_len); length = (type_len >> 8) & 0x00ffffff; @@ -390,8 +390,9 @@ static int qca_download_firmware(struct hci_dev *hdev, enum qca_btsoc_type soc_type) { const struct firmware *fw; + u8 *data; const u8 *segment; - int ret, remain, i = 0; + int ret, size, remain, i = 0; bt_dev_info(hdev, "QCA Downloading %s", config->fwname); @@ -402,10 +403,22 @@ static int qca_download_firmware(struct hci_dev *hdev, return ret; } - qca_tlv_check_data(config, fw, soc_type); + size = fw->size; + data = vmalloc(fw->size); + if (!data) { + bt_dev_err(hdev, "QCA Failed to allocate memory for file: %s", + config->fwname); + release_firmware(fw); + return -ENOMEM; + } + + memcpy(data, fw->data, size); + release_firmware(fw); + + qca_tlv_check_data(config, data, soc_type); - segment = fw->data; - remain = fw->size; + segment = data; + remain = size; while (remain > 0) { int segsize = min(MAX_SIZE_PER_TLV_SEGMENT, remain); @@ -435,7 +448,7 @@ static int qca_download_firmware(struct hci_dev *hdev, ret = qca_inject_cmd_complete_event(hdev); out: - release_firmware(fw); + vfree(data); return ret; }

3 years, 2 months

1
0
0 0

Linux 5.12.16

by Greg Kroah-Hartman

I'm announcing the release of the 5.12.16 kernel. All users of the 5.12 kernel series must upgrade. The updated 5.12.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.12.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/hexagon/Makefile | 6 arch/hexagon/include/asm/futex.h | 4 arch/hexagon/include/asm/timex.h | 3 arch/hexagon/kernel/hexagon_ksyms.c | 8 arch/hexagon/kernel/ptrace.c | 4 arch/hexagon/lib/Makefile | 3 arch/hexagon/lib/divsi3.S | 67 ++++++ arch/hexagon/lib/memcpy_likely_aligned.S | 56 +++++ arch/hexagon/lib/modsi3.S | 46 ++++ arch/hexagon/lib/udivsi3.S | 38 +++ arch/hexagon/lib/umodsi3.S | 36 +++ drivers/net/wireless/mediatek/mt76/dma.c | 47 ++-- drivers/net/wireless/mediatek/mt76/mt76.h | 8 drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 209 +++++++++++++++------ drivers/net/wireless/mediatek/mt76/mt7921/main.c | 38 ++- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 36 ++- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 6 drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 4 20 files changed, 507 insertions(+), 117 deletions(-) Greg Kroah-Hartman (1): Linux 5.12.16 Lorenzo Bianconi (7): mt76: mt7921: check mcu returned values in mt7921_start mt76: mt7921: introduce mt7921_run_firmware utility routine. mt76: mt7921: introduce __mt7921_start utility routine mt76: dma: introduce mt76_dma_queue_reset routine mt76: dma: export mt76_dma_rx_cleanup routine mt76: mt7921: add wifi reset support mt76: mt7921: get rid of mcu_reset function pointer Sean Wang (1): mt76: mt7921: abort uncompleted scan by wifi reset Sid Manning (3): Hexagon: fix build errors Hexagon: add target builtins to kernel Hexagon: change jumps to must-extend in futex_atomic_*

3 years, 2 months

1
1
0 0

Linux 5.10.49

by Greg Kroah-Hartman

I'm announcing the release of the 5.10.49 kernel. All users of the 5.10 kernel series must upgrade. The updated 5.10.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/hexagon/Makefile | 6 +- arch/hexagon/include/asm/futex.h | 4 - arch/hexagon/include/asm/timex.h | 3 - arch/hexagon/kernel/hexagon_ksyms.c | 8 +-- arch/hexagon/kernel/ptrace.c | 4 - arch/hexagon/lib/Makefile | 3 - arch/hexagon/lib/divsi3.S | 67 +++++++++++++++++++++++++++++++ arch/hexagon/lib/memcpy_likely_aligned.S | 56 +++++++++++++++++++++++++ arch/hexagon/lib/modsi3.S | 46 +++++++++++++++++++++ arch/hexagon/lib/udivsi3.S | 38 +++++++++++++++++ arch/hexagon/lib/umodsi3.S | 36 ++++++++++++++++ arch/powerpc/kvm/book3s_hv.c | 4 + drivers/media/usb/uvc/uvc_driver.c | 32 ++++++++++++++ drivers/xen/events/events_base.c | 23 ++++++++-- 15 files changed, 314 insertions(+), 18 deletions(-) Fabiano Rosas (1): KVM: PPC: Book3S HV: Save and restore FSCR in the P9 path Greg Kroah-Hartman (1): Linux 5.10.49 Juergen Gross (1): xen/events: reset active flag for lateeoi events later Laurent Pinchart (1): media: uvcvideo: Support devices that report an OT as an entity source Sid Manning (3): Hexagon: fix build errors Hexagon: add target builtins to kernel Hexagon: change jumps to must-extend in futex_atomic_*

3 years, 2 months

1
1
0 0

Linux 4.19.197

by Greg Kroah-Hartman

I'm announcing the release of the 4.19.197 kernel. All users of the 4.19 kernel series must upgrade. The updated 4.19.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/arm/boot/dts/dra7.dtsi | 11 ++ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 arch/arm/mach-omap1/pm.c | 13 +- arch/arm/mach-omap1/time.c | 10 - arch/arm/mach-omap1/timer32k.c | 10 - arch/arm/mach-omap2/board-generic.c | 4 arch/arm/mach-omap2/timer.c | 181 ++++++++++++++++++++++----------- arch/x86/kvm/svm.c | 33 ++++-- drivers/clk/ti/clk-7xx.c | 1 drivers/gpu/drm/nouveau/nouveau_bo.c | 4 drivers/scsi/sr.c | 2 drivers/xen/events/events_base.c | 23 +++- fs/ext4/block_validity.c | 4 include/linux/cpuhotplug.h | 1 include/linux/huge_mm.h | 8 + include/linux/hugetlb.h | 16 -- include/linux/mm.h | 3 include/linux/mmdebug.h | 13 ++ include/linux/pagemap.h | 13 +- include/linux/rmap.h | 3 kernel/futex.c | 2 kernel/kthread.c | 77 +++++++++----- mm/huge_memory.c | 56 +++++----- mm/hugetlb.c | 5 mm/internal.h | 53 +++++++-- mm/memory.c | 41 +++++++ mm/page_vma_mapped.c | 160 ++++++++++++++++++----------- mm/pgtable-generic.c | 4 mm/rmap.c | 48 +++++--- mm/truncate.c | 43 +++---- 31 files changed, 545 insertions(+), 303 deletions(-) Alex Shi (1): mm: add VM_WARN_ON_ONCE_PAGE() macro Alper Gun (1): KVM: SVM: Call SEV Guest Decommission if ASID binding fails Anson Huang (1): ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment Christian König (1): drm/nouveau: fix dma_address check for CPU/GPU sync David Rientjes (1): KVM: SVM: Periodically schedule when unregistering regions on destroy Greg Kroah-Hartman (1): Linux 4.19.197 Hugh Dickins (16): mm/thp: fix __split_huge_pmd_locked() on shmem migration entry mm/thp: make is_huge_zero_pmd() safe and quicker mm/thp: try_to_unmap() use TTU_SYNC for safe splitting mm/thp: fix vma_address() if virtual address below file offset mm/thp: unmap_mapping_page() to fix THP truncate_cleanup_page() mm: page_vma_mapped_walk(): use page for pvmw->page mm: page_vma_mapped_walk(): settle PageHuge on entry mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block mm: page_vma_mapped_walk(): crossing page table boundary mm: page_vma_mapped_walk(): add a level of indentation mm: page_vma_mapped_walk(): use goto instead of while (1) mm: page_vma_mapped_walk(): get vma_address_end() earlier mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk() mm, futex: fix shared futex pgoff on shmem huge page Jue Wang (1): mm/thp: fix page_address_in_vma() on file THP tails Juergen Gross (1): xen/events: reset active flag for lateeoi events later ManYi Li (1): scsi: sr: Return appropriate error code when disk is ejected Miaohe Lin (2): mm/rmap: remove unneeded semicolon in page_not_mapped() mm/rmap: use page_not_mapped in try_to_unmap() Petr Mladek (2): kthread_worker: split code for canceling the delayed work timer kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Tahsin Erdogan (1): ext4: eliminate bogus error in ext4_data_block_valid_rcu() Tony Lindgren (3): clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940 Yang Shi (1): mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split afzal mohammed (1): ARM: OMAP: replace setup_irq() by request_irq()

3 years, 2 months

1
1
0 0

Linux 4.14.239

by Greg Kroah-Hartman

I'm announcing the release of the 4.14.239 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 drivers/gpu/drm/nouveau/nouveau_bo.c | 4 drivers/scsi/sr.c | 2 drivers/xen/events/events_base.c | 23 ++++- include/linux/hugetlb.h | 16 --- include/linux/kfifo.h | 3 include/linux/mmdebug.h | 21 +++- include/linux/pagemap.h | 13 +- include/linux/rmap.h | 3 kernel/futex.c | 2 kernel/kthread.c | 77 +++++++++++----- mm/huge_memory.c | 26 +---- mm/hugetlb.c | 5 - mm/internal.h | 53 ++++++++--- mm/page_vma_mapped.c | 160 +++++++++++++++++++++-------------- mm/rmap.c | 48 ++++++---- 16 files changed, 280 insertions(+), 178 deletions(-) Alex Shi (1): mm: add VM_WARN_ON_ONCE_PAGE() macro Christian König (1): drm/nouveau: fix dma_address check for CPU/GPU sync Greg Kroah-Hartman (1): Linux 4.14.239 Hugh Dickins (13): mm/thp: try_to_unmap() use TTU_SYNC for safe splitting mm/thp: fix vma_address() if virtual address below file offset mm: page_vma_mapped_walk(): use page for pvmw->page mm: page_vma_mapped_walk(): settle PageHuge on entry mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block mm: page_vma_mapped_walk(): crossing page table boundary mm: page_vma_mapped_walk(): add a level of indentation mm: page_vma_mapped_walk(): use goto instead of while (1) mm: page_vma_mapped_walk(): get vma_address_end() earlier mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk() mm, futex: fix shared futex pgoff on shmem huge page Jue Wang (1): mm/thp: fix page_address_in_vma() on file THP tails Juergen Gross (1): xen/events: reset active flag for lateeoi events later ManYi Li (1): scsi: sr: Return appropriate error code when disk is ejected Miaohe Lin (2): mm/rmap: remove unneeded semicolon in page_not_mapped() mm/rmap: use page_not_mapped in try_to_unmap() Michal Hocko (1): include/linux/mmdebug.h: make VM_WARN* non-rvals Petr Mladek (2): kthread_worker: split code for canceling the delayed work timer kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Sean Young (1): kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bit Yang Shi (1): mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split

3 years, 2 months

1
1
0 0

Linux 4.9.275

by Greg Kroah-Hartman

I'm announcing the release of the 4.9.275 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 drivers/gpu/drm/nouveau/nouveau_bo.c | 4 - drivers/scsi/sr.c | 2 drivers/xen/events/events_base.c | 23 ++++++++-- include/linux/hugetlb.h | 15 ------ include/linux/mmdebug.h | 21 +++++++-- include/linux/pagemap.h | 13 +++-- kernel/futex.c | 2 kernel/kthread.c | 77 +++++++++++++++++++++++------------ mm/huge_memory.c | 29 ++++--------- mm/hugetlb.c | 5 -- 11 files changed, 111 insertions(+), 82 deletions(-) Alex Shi (1): mm: add VM_WARN_ON_ONCE_PAGE() macro Christian König (1): drm/nouveau: fix dma_address check for CPU/GPU sync Greg Kroah-Hartman (1): Linux 4.9.275 Hugh Dickins (1): mm, futex: fix shared futex pgoff on shmem huge page Juergen Gross (1): xen/events: reset active flag for lateeoi events later ManYi Li (1): scsi: sr: Return appropriate error code when disk is ejected Michal Hocko (1): include/linux/mmdebug.h: make VM_WARN* non-rvals Petr Mladek (2): kthread_worker: split code for canceling the delayed work timer kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Yang Shi (1): mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split

3 years, 2 months

1
1
0 0

Linux 4.4.275

by Greg Kroah-Hartman

I'm announcing the release of the 4.4.275 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 +- arch/arm/probes/kprobes/core.c | 6 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/scsi/sr.c | 2 ++ drivers/xen/events/events_base.c | 23 +++++++++++++++++++---- 5 files changed, 30 insertions(+), 7 deletions(-) Christian König (1): drm/nouveau: fix dma_address check for CPU/GPU sync Greg Kroah-Hartman (1): Linux 4.4.275 Juergen Gross (1): xen/events: reset active flag for lateeoi events later ManYi Li (1): scsi: sr: Return appropriate error code when disk is ejected Masami Hiramatsu (1): arm: kprobes: Allow to handle reentered kprobe on single-stepping

3 years, 2 months

1
1
0 0

[PATCH AUTOSEL 5.4 01/28] power: supply: sc27xx: Add missing MODULE_DEVICE_TABLE

by Sasha Levin

From: Zou Wei <zou_wei(a)huawei.com> [ Upstream commit 603fcfb9d4ec1cad8d66d3bb37f3613afa8a661a ] This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Zou Wei <zou_wei(a)huawei.com> Signed-off-by: Sebastian Reichel <sebastian.reichel(a)collabora.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/power/supply/sc27xx_fuel_gauge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c index bc8f5bda5762..5e5bcdbf2e69 100644 --- a/drivers/power/supply/sc27xx_fuel_gauge.c +++ b/drivers/power/supply/sc27xx_fuel_gauge.c @@ -1215,6 +1215,7 @@ static const struct of_device_id sc27xx_fgu_of_match[] = { { .compatible = "sprd,sc2731-fgu", }, { } }; +MODULE_DEVICE_TABLE(of, sc27xx_fgu_of_match); static struct platform_driver sc27xx_fgu_driver = { .probe = sc27xx_fgu_probe, -- 2.30.2

3 years, 2 months

2
28
0 0

[PATCH 5.4 0/4] 5.4.131-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.131 release. There are 4 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun, 11 Jul 2021 13:14:09 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.131-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.131-rc1 Juergen Gross <jgross(a)suse.com> xen/events: reset active flag for lateeoi events later Alper Gun <alpergun(a)google.com> KVM: SVM: Call SEV Guest Decommission if ASID binding fails Heiko Carstens <hca(a)linux.ibm.com> s390/stack: fix possible register corruption with stack switch helper David Rientjes <rientjes(a)google.com> KVM: SVM: Periodically schedule when unregistering regions on destroy ------------- Diffstat: Makefile | 4 ++-- arch/s390/include/asm/stacktrace.h | 18 +++++++++++------- arch/x86/kvm/svm.c | 33 ++++++++++++++++++++++----------- drivers/xen/events/events_base.c | 23 +++++++++++++++++++---- 4 files changed, 54 insertions(+), 24 deletions(-)

3 years, 2 months

8
11
0 0

[PATCH 2/5] Revert "drm/i915: Propagate errors on awaiting already signaled fences"

by Jason Ekstrand

This reverts commit 9e31c1fe45d555a948ff66f1f0e3fe1f83ca63f7. Ever since that commit, we've been having issues where a hang in one client can propagate to another. In particular, a hang in an app can propagate to the X server which causes the whole desktop to lock up. Error propagation along fences sound like a good idea, but as your bug shows, surprising consequences, since propagating errors across security boundaries is not a good thing. What we do have is track the hangs on the ctx, and report information to userspace using RESET_STATS. That's how arb_robustness works. Also, if my understanding is still correct, the EIO from execbuf is when your context is banned (because not recoverable or too many hangs). And in all these cases it's up to userspace to figure out what is all impacted and should be reported to the application, that's not on the kernel to guess and automatically propagate. What's more, we're also building more features on top of ctx error reporting with RESET_STATS ioctl: Encrypted buffers use the same, and the userspace fence wait also relies on that mechanism. So it is the path going forward for reporting gpu hangs and resets to userspace. So all together that's why I think we should just bury this idea again as not quite the direction we want to go to, hence why I think the revert is the right option here. For backporters: Please note that you _must_ have a backport of https://lore.kernel.org/dri-devel/20210602164149.391653-2-jason@jlekstrand.… for otherwise backporting just this patch opens up a security bug. v2: Augment commit message. Also restore Jason's sob that I accidentally lost. v3: Add a note for backporters Signed-off-by: Jason Ekstrand <jason(a)jlekstrand.net> Reported-by: Marcin Slusarz <marcin.slusarz(a)intel.com> Cc: <stable(a)vger.kernel.org> # v5.6+ Cc: Jason Ekstrand <jason.ekstrand(a)intel.com> Cc: Marcin Slusarz <marcin.slusarz(a)intel.com> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3080 Fixes: 9e31c1fe45d5 ("drm/i915: Propagate errors on awaiting already signaled fences") Acked-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> Reviewed-by: Jon Bloomfield <jon.bloomfield(a)intel.com> --- drivers/gpu/drm/i915/i915_request.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 86b4c9f2613d5..09ebea9a0090a 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -1399,10 +1399,8 @@ i915_request_await_execution(struct i915_request *rq, do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } if (fence->context == rq->fence.context) continue; @@ -1499,10 +1497,8 @@ i915_request_await_dma_fence(struct i915_request *rq, struct dma_fence *fence) do { fence = *child++; - if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) { - i915_sw_fence_set_error_once(&rq->submit, fence->error); + if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) continue; - } /* * Requests on the same timeline are explicitly ordered, along -- 2.31.1

3 years, 2 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2021