September 2020 - Linux-stable-mirror

[PATCH] reiserfs: Initialize inode keys properly

by Jan Kara

reiserfs_read_locked_inode() didn't initialize key length properly. Use _make_cpu_key() macro for key initialization so that all key member are properly initialized. CC: stable(a)vger.kernel.org Reported-by: syzbot+d94d02749498bb7bab4b(a)syzkaller.appspotmail.com Signed-off-by: Jan Kara <jack(a)suse.cz> --- fs/reiserfs/inode.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 1509775da040..e43fed96704d 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1551,11 +1551,7 @@ void reiserfs_read_locked_inode(struct inode *inode, * set version 1, version 2 could be used too, because stat data * key is the same in both versions */ - key.version = KEY_FORMAT_3_5; - key.on_disk_key.k_dir_id = dirino; - key.on_disk_key.k_objectid = inode->i_ino; - key.on_disk_key.k_offset = 0; - key.on_disk_key.k_type = 0; + _make_cpu_key(&key, KEY_FORMAT_3_5, dirino, inode->i_ino, 0, 0, 3); /* look for the object's stat data */ retval = search_item(inode->i_sb, &key, &path_to_sd); -- 2.16.4

4 years

1
0
0 0

[PATCH 1/2] KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch

by Marc Zyngier

KVM currently assumes that an instruction abort can never be a write. This is in general true, except when the abort is triggered by a S1PTW on instruction fetch that tries to update the S1 page tables (to set AF, for example). This can happen if the page tables have been paged out and brought back in without seeing a direct write to them (they are thus marked read only), and the fault handling code will make the PT executable(!) instead of writable. The guest gets stuck forever. In these conditions, the permission fault must be considered as a write so that the Stage-1 update can take place. This is essentially the I-side equivalent of the problem fixed by 60e21a0ef54c ("arm64: KVM: Take S1 walks into account when determining S2 write faults"). Update kvm_is_write_fault() to return true on IABT+S1PTW, and introduce kvm_vcpu_trap_is_exec_fault() that only return true when no faulting on a S1 fault. Additionally, kvm_vcpu_dabt_iss1tw() is renamed to kvm_vcpu_abt_iss1tw(), as the above makes it plain that it isn't specific to data abort. Signed-off-by: Marc Zyngier <maz(a)kernel.org> Reviewed-by: Will Deacon <will(a)kernel.org> Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/r/20200915104218.1284701-2-maz@kernel.org --- arch/arm64/include/asm/kvm_emulate.h | 12 ++++++++++-- arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- arch/arm64/kvm/mmu.c | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 49a55be2b9a2..4f618af660ba 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -298,7 +298,7 @@ static __always_inline int kvm_vcpu_dabt_get_rd(const struct kvm_vcpu *vcpu) return (kvm_vcpu_get_esr(vcpu) & ESR_ELx_SRT_MASK) >> ESR_ELx_SRT_SHIFT; } -static __always_inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu) +static __always_inline bool kvm_vcpu_abt_iss1tw(const struct kvm_vcpu *vcpu) { return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_S1PTW); } @@ -306,7 +306,7 @@ static __always_inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu) static __always_inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu) { return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR) || - kvm_vcpu_dabt_iss1tw(vcpu); /* AF/DBM update */ + kvm_vcpu_abt_iss1tw(vcpu); /* AF/DBM update */ } static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu) @@ -335,6 +335,11 @@ static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu) return kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_IABT_LOW; } +static inline bool kvm_vcpu_trap_is_exec_fault(const struct kvm_vcpu *vcpu) +{ + return kvm_vcpu_trap_is_iabt(vcpu) && !kvm_vcpu_abt_iss1tw(vcpu); +} + static __always_inline u8 kvm_vcpu_trap_get_fault(const struct kvm_vcpu *vcpu) { return kvm_vcpu_get_esr(vcpu) & ESR_ELx_FSC; @@ -372,6 +377,9 @@ static __always_inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu) { + if (kvm_vcpu_abt_iss1tw(vcpu)) + return true; + if (kvm_vcpu_trap_is_iabt(vcpu)) return false; diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index 426ef65601dd..d64c5d56c860 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -445,7 +445,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) kvm_vcpu_trap_get_fault_type(vcpu) == FSC_FAULT && kvm_vcpu_dabt_isvalid(vcpu) && !kvm_vcpu_abt_issea(vcpu) && - !kvm_vcpu_dabt_iss1tw(vcpu); + !kvm_vcpu_abt_iss1tw(vcpu); if (valid) { int ret = __vgic_v2_perform_cpuif_access(vcpu); diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index f58d657a898d..9aec1ce491d2 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1843,7 +1843,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, struct kvm_s2_mmu *mmu = vcpu->arch.hw_mmu; write_fault = kvm_is_write_fault(vcpu); - exec_fault = kvm_vcpu_trap_is_iabt(vcpu); + exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu); VM_BUG_ON(write_fault && exec_fault); if (fault_status == FSC_PERM && !write_fault && !exec_fault) { @@ -2125,7 +2125,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) goto out; } - if (kvm_vcpu_dabt_iss1tw(vcpu)) { + if (kvm_vcpu_abt_iss1tw(vcpu)) { kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu)); ret = 1; goto out_unlock; -- 2.28.0

4 years

2
1
0 0

[PATCH v2] Revert "drm/radeon: handle PCIe root ports with addressing limitations"

by Alex Deucher

This causes screen corruption when using the GPU which makes the system unusable. It was noticed by several people closer to when the change went in as well. We looked into it a bit at the time but couldn't determine the problem. It only seems to affect really old chips (like 15-20 years old) which makes it hard to reproduce if you don't have an old system. There were a couple of threads at the time, but nothing was resolved. I was able to find one of them: https://lkml.org/lkml/2019/12/14/263 This reverts commit 33b3ad3788ab ("drm/radeon: handle PCIe root ports with addressing limitations"). Bug: https://bugzilla.kernel.org/show_bug.cgi?id=206973 Bug: https://bugzilla.kernel.org/show_bug.cgi?id=206697 Bug: https://bugzilla.kernel.org/show_bug.cgi?id=207763 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1140 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1287 Fixes: 33b3ad3788ab ("drm/radeon: handle PCIe root ports with addressing limitations") Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Cc: Christoph Hellwig <hch(a)lst.de> Cc: christian.koenig(a)amd.com --- v2: provide a better commit message. The issue seems to be related to himem. Any ideas? drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_device.c | 13 ++++++++----- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index cc4f58d16589..019f756b3f80 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2391,6 +2391,7 @@ struct radeon_device { struct radeon_wb wb; struct radeon_dummy_page dummy_page; bool shutdown; + bool need_dma32; bool need_swiotlb; bool accel_working; bool fastfb_working; /* IGP feature*/ diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 266e3cbbd09b..f74c74ad8b5d 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1363,25 +1363,28 @@ int radeon_device_init(struct radeon_device *rdev, else rdev->mc.mc_mask = 0xffffffffULL; /* 32 bit MC */ - /* set DMA mask. + /* set DMA mask + need_dma32 flags. * PCIE - can handle 40-bits. * IGP - can handle 40-bits * AGP - generally dma32 is safest * PCI - dma32 for legacy pci gart, 40 bits on newer asics */ - dma_bits = 40; + rdev->need_dma32 = false; if (rdev->flags & RADEON_IS_AGP) - dma_bits = 32; + rdev->need_dma32 = true; if ((rdev->flags & RADEON_IS_PCI) && (rdev->family <= CHIP_RS740)) - dma_bits = 32; + rdev->need_dma32 = true; #ifdef CONFIG_PPC64 if (rdev->family == CHIP_CEDAR) - dma_bits = 32; + rdev->need_dma32 = true; #endif + dma_bits = rdev->need_dma32 ? 32 : 40; r = dma_set_mask_and_coherent(&rdev->pdev->dev, DMA_BIT_MASK(dma_bits)); if (r) { + rdev->need_dma32 = true; + dma_bits = 32; pr_warn("radeon: No suitable DMA available\n"); return r; } diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 74ad50c7491c..7e5c2fb8eab0 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -738,7 +738,7 @@ int radeon_ttm_init(struct radeon_device *rdev) &radeon_bo_driver, rdev->ddev->anon_inode->i_mapping, rdev->ddev->vma_offset_manager, - dma_addressing_limited(&rdev->pdev->dev)); + rdev->need_dma32); if (r) { DRM_ERROR("failed initializing buffer object driver(%d).\n", r); return r; -- 2.25.4

4 years

3
2
0 0

Re: [v2 1/2] mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged

by Sasha Levin

Hi [This is an automated email] This commit has been processed because it contains a "Fixes:" tag fixing commit: f000565adb77 ("thp: set recommended min free kbytes"). The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236. v5.8.10: Build OK! v5.4.66: Build OK! v4.19.146: Failed to apply! Possible dependencies: 013de2d6671d ("csky: MMU and page table management") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 426dcd4b600f ("hexagon: switch to NO_BOOTMEM") 6471f52af786 ("alpha: switch to NO_BOOTMEM") 9143a9359d05 ("csky: Kernel booting") aca52c398389 ("mm: remove CONFIG_HAVE_MEMBLOCK") bc3ec75de545 ("dma-mapping: merge direct and noncoherent ops") c32e64e852f3 ("csky: Build infrastructure") ca9a46f8a4f0 ("mm/memory_hotplug: online_pages cannot be 0 in online_pages()") de1193f0be66 ("mm, memory_hotplug: update pcp lists everytime onlining a memory block") e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops") e900a918b098 ("mm: shuffle initial free memory to improve memory-side-cache utilization") f3ecc0ff0457 ("dma-mapping: move the dma_coherent flag to struct device") f406f222d4b2 ("hexagon: implement the sync_sg_for_device DMA operation") v4.14.198: Failed to apply! Possible dependencies: 008ef0969dd9 ("btrfs: drop lock parameter from update_ioctl_balance_args and rename") 17ef445f9bef ("Documentation/filesystems: update documentation of file_operations") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED") 45cd0faae371 ("vfs: add the fadvise() file operation") 5740c99e9d30 ("vfs: dedupe: return int") 6e8b704df584 ("fs: update documentation to mention __poll_t and match the code") 87eb5eb24232 ("vfs: dedupe: rationalize args") b4e98d9ac775 ("mm: account pud page tables") c4812909f5d5 ("mm: introduce wrappers to access mm->nr_ptes") ca9a46f8a4f0 ("mm/memory_hotplug: online_pages cannot be 0 in online_pages()") de1193f0be66 ("mm, memory_hotplug: update pcp lists everytime onlining a memory block") e900a918b098 ("mm: shuffle initial free memory to improve memory-side-cache utilization") f51d2b59120f ("btrfs: allow to set compression level for zlib") f5c29bd9dbd3 ("Btrfs: add __init macro to btrfs init functions") v4.9.236: Failed to apply! Possible dependencies: 0b89ede62963 ("s390/mm: fork vs. 5 level page tabel") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 505a60e22560 ("asm-generic: introduce 5level-fixup.h") a00cc7d9dd93 ("mm, x86: add support for PUD-sized transparent hugepages") b4e98d9ac775 ("mm: account pud page tables") c2febafc6773 ("mm: convert generic code to 5-level paging") c4812909f5d5 ("mm: introduce wrappers to access mm->nr_ptes") c763ea2650df ("x86/kconfig: Sort the 'config X86' selects alphabetically") d94e068573f2 ("x86/kconfig: Move 64-bit only arch Kconfig selects to 'config X86_64'") v4.4.236: Failed to apply! Possible dependencies: 0b57d6ba0bd1 ("mm/mmap.c: remove redundant local variables for may_expand_vm()") 1170532bb49f ("mm: convert printk(KERN_<LEVEL> to pr_<level>") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 5a6e75f8110c ("shmem: prepare huge= mount option and sysfs knob") 756a025f0009 ("mm: coalesce split strings") 84638335900f ("mm: rework virtual memory accounting") 8cee852ec53f ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status") b46e756f5e47 ("thp: extract khugepaged from mm/huge_memory.c") d07e22597d1d ("mm: mmap: add new /proc tunable for mmap_base ASLR") d977d56ce5b3 ("mm: warn about VmData over RLIMIT_DATA") d9fe4fab1197 ("x86/mm/pat: Add untrack_pfn_moved for mremap") eca56ff906bd ("mm, shmem: add internal shmem resident memory accounting") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha

4 years

1
0
0 0

Re: [v3 1/2] mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged

by Sasha Levin

Hi [This is an automated email] This commit has been processed because it contains a "Fixes:" tag fixing commit: f000565adb77 ("thp: set recommended min free kbytes"). The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236. v5.8.10: Build OK! v5.4.66: Build OK! v4.19.146: Failed to apply! Possible dependencies: 013de2d6671d ("csky: MMU and page table management") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 426dcd4b600f ("hexagon: switch to NO_BOOTMEM") 6471f52af786 ("alpha: switch to NO_BOOTMEM") 9143a9359d05 ("csky: Kernel booting") aca52c398389 ("mm: remove CONFIG_HAVE_MEMBLOCK") bc3ec75de545 ("dma-mapping: merge direct and noncoherent ops") c32e64e852f3 ("csky: Build infrastructure") ca9a46f8a4f0 ("mm/memory_hotplug: online_pages cannot be 0 in online_pages()") de1193f0be66 ("mm, memory_hotplug: update pcp lists everytime onlining a memory block") e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops") e900a918b098 ("mm: shuffle initial free memory to improve memory-side-cache utilization") f3ecc0ff0457 ("dma-mapping: move the dma_coherent flag to struct device") f406f222d4b2 ("hexagon: implement the sync_sg_for_device DMA operation") v4.14.198: Failed to apply! Possible dependencies: 008ef0969dd9 ("btrfs: drop lock parameter from update_ioctl_balance_args and rename") 17ef445f9bef ("Documentation/filesystems: update documentation of file_operations") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 3d8f7615319b ("vfs: implement readahead(2) using POSIX_FADV_WILLNEED") 45cd0faae371 ("vfs: add the fadvise() file operation") 5740c99e9d30 ("vfs: dedupe: return int") 6e8b704df584 ("fs: update documentation to mention __poll_t and match the code") 87eb5eb24232 ("vfs: dedupe: rationalize args") b4e98d9ac775 ("mm: account pud page tables") c4812909f5d5 ("mm: introduce wrappers to access mm->nr_ptes") ca9a46f8a4f0 ("mm/memory_hotplug: online_pages cannot be 0 in online_pages()") de1193f0be66 ("mm, memory_hotplug: update pcp lists everytime onlining a memory block") e900a918b098 ("mm: shuffle initial free memory to improve memory-side-cache utilization") f51d2b59120f ("btrfs: allow to set compression level for zlib") f5c29bd9dbd3 ("Btrfs: add __init macro to btrfs init functions") v4.9.236: Failed to apply! Possible dependencies: 0b89ede62963 ("s390/mm: fork vs. 5 level page tabel") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 505a60e22560 ("asm-generic: introduce 5level-fixup.h") a00cc7d9dd93 ("mm, x86: add support for PUD-sized transparent hugepages") b4e98d9ac775 ("mm: account pud page tables") c2febafc6773 ("mm: convert generic code to 5-level paging") c4812909f5d5 ("mm: introduce wrappers to access mm->nr_ptes") c763ea2650df ("x86/kconfig: Sort the 'config X86' selects alphabetically") d94e068573f2 ("x86/kconfig: Move 64-bit only arch Kconfig selects to 'config X86_64'") v4.4.236: Failed to apply! Possible dependencies: 0b57d6ba0bd1 ("mm/mmap.c: remove redundant local variables for may_expand_vm()") 1170532bb49f ("mm: convert printk(KERN_<LEVEL> to pr_<level>") 27e1f8273113 ("khugepaged: enable collapse pmd for pte-mapped THP") 5a6e75f8110c ("shmem: prepare huge= mount option and sysfs knob") 756a025f0009 ("mm: coalesce split strings") 84638335900f ("mm: rework virtual memory accounting") 8cee852ec53f ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status") b46e756f5e47 ("thp: extract khugepaged from mm/huge_memory.c") d07e22597d1d ("mm: mmap: add new /proc tunable for mmap_base ASLR") d977d56ce5b3 ("mm: warn about VmData over RLIMIT_DATA") d9fe4fab1197 ("x86/mm/pat: Add untrack_pfn_moved for mremap") eca56ff906bd ("mm, shmem: add internal shmem resident memory accounting") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha

4 years

1
0
0 0

[PATCH 02/19] arm64: Run ARCH_WORKAROUND_1 enabling code on all CPUs

by Will Deacon

From: Marc Zyngier <maz(a)kernel.org> Commit 73f381660959 ("arm64: Advertise mitigation of Spectre-v2, or lack thereof") changed the way we deal with ARCH_WORKAROUND_1, by moving most of the enabling code to the .matches() callback. This has the unfortunate effect that the workaround gets only enabled on the first affected CPU, and no other. In order to address this, forcefully call the .matches() callback from a .cpu_enable() callback, which brings us back to the original behaviour. Fixes: 73f381660959 ("arm64: Advertise mitigation of Spectre-v2, or lack thereof") Cc: <stable(a)vger.kernel.org> Reviewed-by: Suzuki K Poulose <suzuki.poulose(a)arm.com> Signed-off-by: Marc Zyngier <maz(a)kernel.org> Signed-off-by: Will Deacon <will(a)kernel.org> --- arch/arm64/kernel/cpu_errata.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 88966496806a..3fe64bf5a58d 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -599,6 +599,12 @@ check_branch_predictor(const struct arm64_cpu_capabilities *entry, int scope) return (need_wa > 0); } +static void +cpu_enable_branch_predictor_hardening(const struct arm64_cpu_capabilities *cap) +{ + cap->matches(cap, SCOPE_LOCAL_CPU); +} + static const __maybe_unused struct midr_range tx2_family_cpus[] = { MIDR_ALL_VERSIONS(MIDR_BRCM_VULCAN), MIDR_ALL_VERSIONS(MIDR_CAVIUM_THUNDERX2), @@ -890,9 +896,11 @@ const struct arm64_cpu_capabilities arm64_errata[] = { }, #endif { + .desc = "Branch predictor hardening", .capability = ARM64_HARDEN_BRANCH_PREDICTOR, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = check_branch_predictor, + .cpu_enable = cpu_enable_branch_predictor_hardening, }, #ifdef CONFIG_RANDOMIZE_BASE { -- 2.28.0.681.g6f77f65b4e-goog

4 years

2
1
0 0

Re: [v2 2/2] mm: khugepaged: avoid overriding min_free_kbytes set by user

by Sasha Levin

Hi [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236. v5.8.10: Build OK! v5.4.66: Build OK! v4.19.146: Build OK! v4.14.198: Build OK! v4.9.236: Build OK! v4.4.236: Failed to apply! Possible dependencies: 0b57d6ba0bd1 ("mm/mmap.c: remove redundant local variables for may_expand_vm()") 1170532bb49f ("mm: convert printk(KERN_<LEVEL> to pr_<level>") 5a6e75f8110c ("shmem: prepare huge= mount option and sysfs knob") 756a025f0009 ("mm: coalesce split strings") 84638335900f ("mm: rework virtual memory accounting") 8cee852ec53f ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status") b46e756f5e47 ("thp: extract khugepaged from mm/huge_memory.c") d07e22597d1d ("mm: mmap: add new /proc tunable for mmap_base ASLR") d977d56ce5b3 ("mm: warn about VmData over RLIMIT_DATA") d9fe4fab1197 ("x86/mm/pat: Add untrack_pfn_moved for mremap") eca56ff906bd ("mm, shmem: add internal shmem resident memory accounting") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha

4 years

1
0
0 0

[PATCH 09/10] xhci: don't create endpoint debugfs entry before ring buffer is set.

by Mathias Nyman

Make sure xHC completes the configure endpoint command and xhci driver sets the ring pointers correctly before we create the user readable debugfs file. In theory there was a small gap where a user could have read the debugfs file and cause a NULL pointer dereference error as ring pointer was not yet set, in practise we want this change to simplify the upcoming streams debugfs support. Fixes: 02b6fdc2a153 ("usb: xhci: Add debugfs interface for xHCI driver") Cc: stable(a)vger.kernel.org #v4.19+ Signed-off-by: Mathias Nyman <mathias.nyman(a)linux.intel.com> --- drivers/usb/host/xhci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 4cfb95104c26..e88f4f953995 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1918,8 +1918,6 @@ static int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index); trace_xhci_add_endpoint(ep_ctx); - xhci_debugfs_create_endpoint(xhci, virt_dev, ep_index); - xhci_dbg(xhci, "add ep 0x%x, slot id %d, new drop flags = %#x, new add flags = %#x\n", (unsigned int) ep->desc.bEndpointAddress, udev->slot_id, @@ -2952,6 +2950,7 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) xhci_check_bw_drop_ep_streams(xhci, virt_dev, i); virt_dev->eps[i].ring = virt_dev->eps[i].new_ring; virt_dev->eps[i].new_ring = NULL; + xhci_debugfs_create_endpoint(xhci, virt_dev, i); } command_cleanup: kfree(command->completion); -- 2.17.1

4 years

2
1
0 0

[PATCH 07/15] drm/amd/display: Fix ODM policy implementation

by Qingqing Zhuo

From: Wesley Chalmers <Wesley.Chalmers(a)amd.com> [WHY] Only the leftmost ODM pipe should be offset when scaling. A previous code change was intended to implement this policy, but a section of code was overlooked. Signed-off-by: Wesley Chalmers <Wesley.Chalmers(a)amd.com> Reviewed-by: Aric Cyr <Aric.Cyr(a)amd.com> Acked-by: Qingqing Zhuo <qingqing.zhuo(a)amd.com> Cc: <stable(a)vger.kernel.org> --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 4cea9344d8aa..e430148e47cf 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -785,14 +785,15 @@ static void calculate_recout(struct pipe_ctx *pipe_ctx) /* * Only the leftmost ODM pipe should be offset by a nonzero distance */ - if (!pipe_ctx->prev_odm_pipe) + if (!pipe_ctx->prev_odm_pipe) { data->recout.x = stream->dst.x; - else - data->recout.x = 0; - if (stream->src.x < surf_clip.x) - data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width + if (stream->src.x < surf_clip.x) + data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width / stream->src.width; + } else + data->recout.x = 0; + data->recout.width = surf_clip.width * stream->dst.width / stream->src.width; if (data->recout.width + data->recout.x > stream->dst.x + stream->dst.width) data->recout.width = stream->dst.x + stream->dst.width - data->recout.x; -- 2.17.1

4 years

2
1
0 0

Re: [v3 2/2] mm: khugepaged: avoid overriding min_free_kbytes set by user

by Sasha Levin

Hi [This is an automated email] This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all The bot has tested the following trees: v5.8.10, v5.4.66, v4.19.146, v4.14.198, v4.9.236, v4.4.236. v5.8.10: Build OK! v5.4.66: Build OK! v4.19.146: Failed to apply! Possible dependencies: 1c30844d2dfe ("mm: reclaim small amounts of memory when an external fragmentation event occurs") 24512228b7a3 ("mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model") 426dcd4b600f ("hexagon: switch to NO_BOOTMEM") 6471f52af786 ("alpha: switch to NO_BOOTMEM") 6bb154504f8b ("mm, page_alloc: spread allocations across zones before introducing fragmentation") 9705bea5f833 ("mm: convert zone->managed_pages to atomic variable") a921444382b4 ("mm: move zone watermark accesses behind an accessor") b4a991ec584b ("mm: remove CONFIG_NO_BOOTMEM") bc3ec75de545 ("dma-mapping: merge direct and noncoherent ops") bda49a81164a ("mm: remove nobootmem") c32e64e852f3 ("csky: Build infrastructure") e0a9317d9004 ("hexagon: use generic dma_noncoherent_ops") f406f222d4b2 ("hexagon: implement the sync_sg_for_device DMA operation") v4.14.198: Failed to apply! Possible dependencies: 1c30844d2dfe ("mm: reclaim small amounts of memory when an external fragmentation event occurs") 1d47a3ec09b5 ("mm/cma: remove ALLOC_CMA") 24512228b7a3 ("mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model") 3d2054ad8c2d ("ARM: CMA: avoid double mapping to the CMA area if CONFIG_HIGHMEM=y") 453f85d43fa9 ("mm: remove __GFP_COLD") 6bb154504f8b ("mm, page_alloc: spread allocations across zones before introducing fragmentation") 85ccc8fa81af ("mm/page_alloc: make sure __rmqueue() etc are always inline") a921444382b4 ("mm: move zone watermark accesses behind an accessor") bad8c6c0b114 ("mm/cma: manage the memory of the CMA area by using the ZONE_MOVABLE") v4.9.236: Failed to apply! Possible dependencies: 14b468791fa9 ("mm: workingset: move shadow entry tracking to radix tree exceptional tracking") 1c30844d2dfe ("mm: reclaim small amounts of memory when an external fragmentation event occurs") 24512228b7a3 ("mm: do not boost watermarks to avoid fragmentation for the DISCONTIG memory model") 2a2e48854d70 ("mm: vmscan: fix IO/refault regression in cache workingset transition") 31176c781508 ("mm: memcontrol: clean up memory.events counting function") 6bb154504f8b ("mm, page_alloc: spread allocations across zones before introducing fragmentation") 8e675f7af507 ("mm/oom_kill: count global and memory cgroup oom kills") 9d998b4f1e39 ("mm, vmscan: add active list aging tracepoint") a921444382b4 ("mm: move zone watermark accesses behind an accessor") cd04ae1e2dc8 ("mm, oom: do not rely on TIF_MEMDIE for memory reserves access") d6622f6365db ("mm/vmscan: more restrictive condition for retry in do_try_to_free_pages") dcec0b60a821 ("mm, vmscan: add mm_vmscan_inactive_list_is_low tracepoint") df0e53d0619e ("mm: memcontrol: re-use global VM event enum") f7942430e40f ("lib: radix-tree: native accounting of exceptional entries") v4.4.236: Failed to apply! Possible dependencies: 0b57d6ba0bd1 ("mm/mmap.c: remove redundant local variables for may_expand_vm()") 1170532bb49f ("mm: convert printk(KERN_<LEVEL> to pr_<level>") 5a6e75f8110c ("shmem: prepare huge= mount option and sysfs knob") 756a025f0009 ("mm: coalesce split strings") 84638335900f ("mm: rework virtual memory accounting") 8cee852ec53f ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status") b46e756f5e47 ("thp: extract khugepaged from mm/huge_memory.c") d07e22597d1d ("mm: mmap: add new /proc tunable for mmap_base ASLR") d977d56ce5b3 ("mm: warn about VmData over RLIMIT_DATA") d9fe4fab1197 ("x86/mm/pat: Add untrack_pfn_moved for mremap") eca56ff906bd ("mm, shmem: add internal shmem resident memory accounting") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks Sasha

4 years

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror September 2020