5.12.10-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 147/161 btrfs: fix deadlock when cloning inline extents and low on available space
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 76a6d5cd74479e7ec8a7f9a29bce63d5549b6b2e upstream.
There are a few cases where cloning an inline extent requires copying data into a page of the destination inode. For these cases we are allocating the required data and metadata space while holding a leaf locked. This can result in a deadlock when we are low on available space because allocating the space may flush delalloc and two deadlock scenarios can happen:
1) When starting writeback for an inode with a very small dirty range that fits in an inline extent, we deadlock during the writeback when trying to insert the inline extent, at cow_file_range_inline(), if the extent is going to be located in the leaf for which we are already holding a read lock;
2) After successfully starting writeback, for non-inline extent cases, the async reclaim thread will hang waiting for an ordered extent to complete if the ordered extent completion needs to modify the leaf for which the clone task is holding a read lock (for adding or replacing file extent items). So the cloning task will wait forever on the async reclaim thread to make progress, which in turn is waiting for the ordered extent completion which in turn is waiting to acquire a write lock on the same leaf.
So fix this by making sure we release the path (and therefore the leaf) every time we need to copy the inline extent's data into a page of the destination inode, as by that time we do not need to have the leaf locked.
--- fs/btrfs/reflink.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
fs/btrfs/reflink.c +22 -16
@@ -207,10 +207,7 @@ static int clone_copy_inline_extent(stru* inline extent's data to the page. */ ASSERT (key.offset >0 ); - ret =copy_inline_to_page (BTRFS_I (dst), new_key->offset, - inline_data, size, datal, - comp_type); - goto out; + goto copy_to_page; } }else if (i_size_read (dst) <= datal) {struct btrfs_file_extent_item *ei;
@@ -226,13 +223,10 @@ static int clone_copy_inline_extent(stru BTRFS_FILE_EXTENT_INLINE) goto copy_inline_extent; - ret =copy_inline_to_page (BTRFS_I (dst), new_key->offset, - inline_data, size, datal, comp_type); - goto out; + goto copy_to_page; } copy_inline_extent: - ret =0 ;/* * We have no extent items, or we have an extent at offset 0 which may * or may not be inlined. All these cases are dealt the same way.
@@ -244,11 +238,13 @@ copy_inline_extent:* clone. Deal with all these cases by copying the inline extent * data into the respective page at the destination inode. */ - ret =copy_inline_to_page (BTRFS_I (dst), new_key->offset, - inline_data, size, datal, comp_type); - goto out; + goto copy_to_page; } +/* +* Release path before starting a new transaction so we don't hold locks +* that would confuse lockdep. +*/ btrfs_release_path (path);/* * If we end up here it means were copy the inline extent into a leaf
@@ -286,11 +282,6 @@ copy_inline_extent: out:if (!ret && !trans) {/* -* Release path before starting a new transaction so we don't -* hold locks that would confuse lockdep. -*/ -btrfs_release_path (path); -/* * No transaction here means we copied the inline extent into a * page of the destination inode. *
@@ -310,6 +301,21 @@ out: *trans_out = trans;return ret; + +copy_to_page: +/* +* Release our path because we don't need it anymore and also because +* copy_inline_to_page() needs to reserve data and metadata, which may +* need to flush delalloc when we are low on available space and +* therefore cause a deadlock if writeback of an inline extent needs to +* write to the same leaf or an ordered extent completion needs to write +* to the same leaf. +*/ +btrfs_release_path (path); + + ret =copy_inline_to_page (BTRFS_I (dst), new_key->offset, + inline_data, size, datal, comp_type); + goto out; }/**
Greg Kroah-Hartman
maintainerPATCH 148/161 mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY
In reply to Greg Kroah-HartmanFrom: Mina Almasry <[email protected]>
[ Upstream commit d84cf06e3dd8c5c5b547b5d8931015fc536678e5 ]
The userfaultfd hugetlb tests cause a resv_huge_pages underflow. This happens when hugetlb_mcopy_atomic_pte() is called with !is_continue on an index for which we already have a page in the cache. When this happens, we allocate a second page, double consuming the reservation, and then fail to insert the page into the cache and return -EEXIST.
To fix this, we first check if there is a page in the cache which already consumed the reservation, and return -EEXIST immediately if so.
There is still a rare condition where we fail to copy the page contents AND race with a call for hugetlb_no_page() for this index and again we will underflow resv_huge_pages. That is fixed in a more complicated patch not targeted for -stable.
Test:
Hacked the code locally such that resv_huge_pages underflows produce a warning, then:
./tools/testing/selftests/vm/userfaultfd hugetlb_shared 10
2 /tmp/kokonut_test/huge/userfaultfd_test && echo test success ./tools/testing/selftests/vm/userfaultfd hugetlb 10 2 /tmp/kokonut_test/huge/userfaultfd_test && echo test success
Both tests succeed and produce no warnings. After the test runs number of free/resv hugepages is correct.
[[email protected]: changelog fixes]
--- mm/hugetlb.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
mm/hugetlb.c +12 -2
@@ -4705,10 +4705,20 @@ int hugetlb_mcopy_atomic_pte(struct mm_sstruct page *page;if (!*pagep) { - ret = -ENOMEM ; +/* If a page already exists, then it's UFFDIO_COPY for +* a non-missing case. Return -EEXIST. +*/ +if (vm_shared && +hugetlbfs_pagecache_present (h, dst_vma, dst_addr)) { + ret = -EEXIST ; + goto out; + } + page =alloc_huge_page (dst_vma, dst_addr,0 ); -if (IS_ERR (page)) +if (IS_ERR (page)) { + ret = -ENOMEM ; goto out; + } ret = copy_huge_page_from_user(page, (const void __user *) src_addr,
Greg Kroah-Hartman
maintainerPATCH 149/161 drm/msm/dpu: always use mdp device to scale bandwidth
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
commit a670ff578f1fb855fedc7931fa5bbc06b567af22 upstream.
Currently DPU driver scales bandwidth and core clock for sc7180 only, while the rest of chips get static bandwidth votes. Make all chipsets scale bandwidth and clock per composition requirements like sc7180 does. Drop old voting path completely.
Tested on RB3 (SDM845) and RB5 (SM8250).
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 51 ------------------------------- 2 files changed, 2 insertions(+), 52 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -2
@@ -933,8 +933,7 @@ static int dpu_kms_hw_init(struct msm_kmDPU_DEBUG ("REG_DMA is not defined" ); } -if (of_device_is_compatible (dev->dev->of_node,"qcom,sc7180-mdss" )) -dpu_kms_parse_data_bus_icc_path (dpu_kms); +dpu_kms_parse_data_bus_icc_path (dpu_kms);pm_runtime_get_sync (&dpu_kms->pdev->dev);
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +1 -50
100 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 150/161 KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 0884335a2e653b8a045083aa1d57ce74269ac81d upstream.
Drop bits 63:32 on loads/stores to/from DRs and CRs when the vCPU is not in 64-bit mode. The APM states bits 63:32 are dropped for both DRs and CRs:
In 64-bit mode, the operand size is fixed at 64 bits without the need for a REX prefix. In non-64-bit mode, the operand size is fixed at 32 bits and the upper 32 bits of the destination are forced to 0.
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/svm/svm.c +4 -4
@@ -2532,7 +2532,7 @@ static int cr_interception(struct vcpu_s err =0 ;if (cr >=16 ) {/* mov to cr */ cr -=16 ; - val =kvm_register_read (&svm->vcpu, reg); + val =kvm_register_readl (&svm->vcpu, reg);trace_kvm_cr_write (cr, val);switch (cr) {case 0 :
@@ -2578,7 +2578,7 @@ static int cr_interception(struct vcpu_skvm_queue_exception (&svm->vcpu,UD_VECTOR );return 1 ; } -kvm_register_write (&svm->vcpu, reg, val); +kvm_register_writel (&svm->vcpu, reg, val);trace_kvm_cr_read (cr, val); }return kvm_complete_insn_gp (&svm->vcpu, err);
@@ -2643,11 +2643,11 @@ static int dr_interception(struct vcpu_s dr = svm->vmcb->control.exit_code -SVM_EXIT_READ_DR0 ;if (dr >=16 ) {/* mov to DRn */ dr -=16 ; - val =kvm_register_read (&svm->vcpu, reg); + val =kvm_register_readl (&svm->vcpu, reg); err =kvm_set_dr (&svm->vcpu, dr, val); }else {kvm_get_dr (&svm->vcpu, dr, &val); -kvm_register_write (&svm->vcpu, reg, val); +kvm_register_writel (&svm->vcpu, reg, val); }return kvm_complete_insn_gp (&svm->vcpu, err);
Greg Kroah-Hartman
maintainerPATCH 151/161 x86/kvm: Teardown PV features on boot CPU as well
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit 8b79feffeca28c5459458fe78676b081e87c93a4 upstream.
Various PV features (Async PF, PV EOI, steal time) work through memory shared with hypervisor and when we restore from hibernation we must properly teardown all these features to make sure hypervisor doesn't write to stale locations after we jump to the previously hibernated kernel (which can try to place anything there). For secondary CPUs the job is already done by kvm_cpu_down_prepare(), register syscore ops to do the same for boot CPU.
Krzysztof:
This fixes memory corruption visible after second resume from hibernation:
BUG: Bad page state in process dbus-daemon pfn:18b01 page:ffffea000062c040 refcount:0 mapcount:0 mapping:0000000000000000 index:0x1 compound_mapcount: -30591 flags: 0xfffffc0078141(locked|error|workingset|writeback|head|mappedtodisk|reclaim) raw: 000fffffc0078141 dead0000000002d0 dead000000000100 0000000000000000 raw: 0000000000000001 0000000000000000 00000000ffffffff 0000000000000000 page dumped because: PAGE_FLAGS_CHECK_AT_PREP flag set bad because of flags: 0x78141(locked|error|workingset|writeback|head|mappedtodisk|reclaim)
Message-Id: <[email protected]>
--- arch/x86/kernel/kvm.c | 57 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-)
arch/x86/kernel/kvm.c +41 -16
@@ -26,6 +26,7 @@#include <linux/kprobes.h> #include <linux/nmi.h> #include <linux/swait.h> +#include <linux/syscore_ops.h> #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h>
@@ -460,6 +461,25 @@ static bool pv_tlb_flush_supported(void) static DEFINE_PER_CPU(cpumask_var_t, __pv_cpu_mask); +static void kvm_guest_cpu_offline (void ) +{ +kvm_disable_steal_time (); +if (kvm_para_has_feature (KVM_FEATURE_PV_EOI )) +wrmsrl (MSR_KVM_PV_EOI_EN ,0 ); +kvm_pv_disable_apf (); +apf_task_wake_all (); +} + +static int kvm_cpu_online (unsigned int cpu) +{ +unsigned long flags; + +local_irq_save (flags); +kvm_guest_cpu_init (); +local_irq_restore (flags); +return 0 ; +} +#ifdef CONFIG_SMP static bool pv_ipi_supported (void )
@@ -587,31 +607,34 @@ static void __init kvm_smp_prepare_boot_ kvm_spinlock_init(); } -static void kvm_guest_cpu_offline (void ) +static int kvm_cpu_down_prepare (unsigned int cpu) { -kvm_disable_steal_time (); -if (kvm_para_has_feature (KVM_FEATURE_PV_EOI )) -wrmsrl (MSR_KVM_PV_EOI_EN ,0 ); -kvm_pv_disable_apf (); -apf_task_wake_all (); -} +unsigned long flags; -static int kvm_cpu_online (unsigned int cpu) -{ -local_irq_disable (); -kvm_guest_cpu_init (); -local_irq_enable (); +local_irq_save (flags); +kvm_guest_cpu_offline (); +local_irq_restore (flags);return 0 ; } -static int kvm_cpu_down_prepare (unsigned int cpu) +#endif + +static int kvm_suspend (void ) { -local_irq_disable ();kvm_guest_cpu_offline (); -local_irq_enable (); +return 0 ; } -#endif + +static void kvm_resume (void ) +{ +kvm_cpu_online (raw_smp_processor_id ()); +} + +static struct syscore_ops kvm_syscore_ops = { + .suspend = kvm_suspend, + .resume = kvm_resume, +};static void kvm_flush_tlb_others (const struct cpumask *cpumask,const struct flush_tlb_info *info)
@@ -681,6 +704,8 @@ static void __init kvm_guest_init(void)kvm_guest_cpu_init ();#endif +register_syscore_ops (&kvm_syscore_ops); +/* * Hard lockup detection is enabled by default. Disable it, as guests * can get false positives too easily, for example if the host is
Greg Kroah-Hartman
maintainerPATCH 152/161 x86/kvm: Disable kvmclock on all CPUs on shutdown
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit c02027b5742b5aa804ef08a4a9db433295533046 upstream.
Currenly, we disable kvmclock from machine_shutdown() hook and this only happens for boot CPU. We need to disable it for all CPUs to guard against memory corruption e.g. on restore from hibernate.
Note, writing '0' to kvmclock MSR doesn't clear memory location, it just prevents hypervisor from updating the location so for the short while after write and while CPU is still alive, the clock remains usable and correct so we don't need to switch to some other clocksource.
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_para.h | 4 ++-- arch/x86/kernel/kvm.c | 1 + arch/x86/kernel/kvmclock.c | 5 +---- 3 files changed, 4 insertions(+), 6 deletions(-)
arch/x86/include/asm/kvm_para.h +2 -2
@@ -7,8 +7,6 @@#include <linux/interrupt.h> #include <uapi/asm/kvm_para.h> -extern void kvmclock_init (void ); -#ifdef CONFIG_KVM_GUEST bool kvm_check_and_clear_guest_paused (void );#else
@@ -86,6 +84,8 @@ static inline long kvm_hypercall4(unsign }#ifdef CONFIG_KVM_GUEST +void kvmclock_init (void ); +void kvmclock_disable (void );bool kvm_para_available (void );unsigned int kvm_arch_para_features (void );unsigned int kvm_arch_para_hints (void );
arch/x86/kernel/kvm.c +1 -0
@@ -468,6 +468,7 @@ static void kvm_guest_cpu_offline(void)wrmsrl (MSR_KVM_PV_EOI_EN ,0 );kvm_pv_disable_apf ();apf_task_wake_all (); +kvmclock_disable (); }static int kvm_cpu_online (unsigned int cpu)
arch/x86/kernel/kvmclock.c +1 -4
@@ -220,11 +220,9 @@ static void kvm_crash_shutdown(struct pt }#endif -static void kvm_shutdown (void ) +void kvmclock_disable (void ) {native_write_msr (msr_kvm_system_time,0 ,0 ); -kvm_disable_steal_time (); -native_machine_shutdown (); }static void __init kvmclock_init_mem (void )
@@ -351,7 +349,6 @@ void __init kvmclock_init(void)#endif x86_platform.save_sched_clock_state = kvm_save_sched_clock_state; x86_platform.restore_sched_clock_state = kvm_restore_sched_clock_state; - machine_ops.shutdown = kvm_shutdown;#ifdef CONFIG_KEXEC_CORE machine_ops.crash_shutdown = kvm_crash_shutdown;#endif
Greg Kroah-Hartman
maintainerPATCH 153/161 x86/kvm: Disable all PV features on crash
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit 3d6b84132d2a57b5a74100f6923a8feb679ac2ce upstream.
Crash shutdown handler only disables kvmclock and steal time, other PV features remain active so we risk corrupting memory or getting some side-effects in kdump kernel. Move crash handler to kvm.c and unify with CPU offline.
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_para.h | 6 ----- arch/x86/kernel/kvm.c | 44 +++++++++++++++++++++++++++++----------- arch/x86/kernel/kvmclock.c | 21 ------------------- 3 files changed, 32 insertions(+), 39 deletions(-)
arch/x86/include/asm/kvm_para.h +0 -6
@@ -92,7 +92,6 @@ unsigned int kvm_arch_para_hints(void);void kvm_async_pf_task_wait_schedule (u32 token);void kvm_async_pf_task_wake (u32 token);u32 kvm_read_and_reset_apf_flags (void ); -void kvm_disable_steal_time (void );bool __kvm_handle_async_pf (struct pt_regs *regs,u32 token);DECLARE_STATIC_KEY_FALSE (kvm_async_pf_enabled);
@@ -137,11 +136,6 @@ static inline u32 kvm_read_and_reset_apfreturn 0 ; } -static inline void kvm_disable_steal_time (void ) -{ -return ; -} - static __always_inline bool kvm_handle_async_pf(struct pt_regs *regs, u32 token) {return false;
arch/x86/kernel/kvm.c +32 -12
97 lines not on this page · raw message
arch/x86/kernel/kvmclock.c +0 -21
@@ -20,7 +20,6 @@#include <asm/hypervisor.h> #include <asm/mem_encrypt.h> #include <asm/x86_init.h> -#include <asm/reboot.h> #include <asm/kvmclock.h> static int kvmclock__initdata =1 ;
@@ -203,23 +202,6 @@ static void kvm_setup_secondary_clock(vo }#endif -/* -* After the clock is registered, the host will keep writing to the -* registered memory location. If the guest happens to shutdown, this memory -* won't be valid. In cases like kexec, in which you install a new kernel, this -* means a random memory location will be kept being written. So before any -* kind of shutdown from our side, we unregister the clock by writing anything -* that does not have the 'enable' bit set in the msr -*/ -#ifdef CONFIG_KEXEC_CORE -static void kvm_crash_shutdown (struct pt_regs *regs) -{ -native_write_msr (msr_kvm_system_time,0 ,0 ); -kvm_disable_steal_time (); -native_machine_crash_shutdown (regs); -} -#endif -void kvmclock_disable (void ) {native_write_msr (msr_kvm_system_time,0 ,0 );
@@ -349,9 +331,6 @@ void __init kvmclock_init(void)#endif x86_platform.save_sched_clock_state = kvm_save_sched_clock_state; x86_platform.restore_sched_clock_state = kvm_restore_sched_clock_state; -#ifdef CONFIG_KEXEC_CORE - machine_ops.crash_shutdown = kvm_crash_shutdown; -#endif kvm_get_preset_lpj ();/*
Greg Kroah-Hartman
maintainerPATCH 154/161 KVM: arm64: Commit pending PC adjustemnts before returning to userspace
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 26778aaa134a9aefdf5dbaad904054d7be9d656d upstream.
KVM currently updates PC (and the corresponding exception state) using a two phase approach: first by setting a set of flags, then by converting these flags into a state update when the vcpu is about to enter the guest.
However, this creates a disconnect with userspace if the vcpu thread returns there with any exception/PC flag set. In this case, the exposed context is wrong, as userspace doesn't have access to these flags (they aren't architectural). It also means that these flags are preserved across a reset, which isn't expected.
To solve this problem, force an explicit synchronisation of the exception state on vcpu exit to userspace. As an optimisation for nVHE systems, only perform this when there is something pending.
[yuz: stable-5.12.y backport: allocate a new number (15) for
__KVM_HOST_SMCCC_FUNC___kvm_adjust_pc to keep the host_hcall array tightly packed]
--- arch/arm64/include/asm/kvm_asm.h | 1 + arch/arm64/kvm/arm.c | 11 +++++++++++ arch/arm64/kvm/hyp/exception.c | 4 ++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 ++++++++ 4 files changed, 22 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -57,6 +57,7 @@#define __KVM_HOST_SMCCC_FUNC___kvm_get_mdcr_el2 12#define __KVM_HOST_SMCCC_FUNC___vgic_v3_save_aprs 13#define __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_aprs 14 +#define __KVM_HOST_SMCCC_FUNC___kvm_adjust_pc 15#ifndef __ASSEMBLY__
arch/arm64/kvm/arm.c +11 -0
@@ -892,6 +892,17 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vkvm_sigset_deactivate (vcpu); +/* +* In the unlikely event that we are returning to userspace +* with pending exceptions or PC adjustment, commit these +* adjustments in order to give userspace a consistent view of +* the vcpu state. Note that this relies on __kvm_adjust_pc() +* being preempt-safe on VHE. +*/ +if (unlikely (vcpu->arch.flags & (KVM_ARM64_PENDING_EXCEPTION | +KVM_ARM64_INCREMENT_PC ))) +kvm_call_hyp (__kvm_adjust_pc, vcpu); +vcpu_put (vcpu);return ret; }
arch/arm64/kvm/hyp/exception.c +2 -2
@@ -331,8 +331,8 @@ static void kvm_inject_exception(struct }/* -* Adjust the guest PC on entry, depending on flags provided by EL1 -* for the purpose of emulation (MMIO, sysreg) or exception injection. +* Adjust the guest PC (and potentially exception state) depending on +* flags provided by the emulation code. */ void __kvm_adjust_pc (struct kvm_vcpu *vcpu) {
arch/arm64/kvm/hyp/nvhe/hyp-main.c +8 -0
@@ -25,6 +25,13 @@ static void handle___kvm_vcpu_run(structcpu_reg (host_ctxt,1 ) =__kvm_vcpu_run (kern_hyp_va (vcpu)); } +static void handle___kvm_adjust_pc (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1); + +__kvm_adjust_pc (kern_hyp_va (vcpu)); +} +static void handle___kvm_flush_vm_context (struct kvm_cpu_context *host_ctxt) {__kvm_flush_vm_context ();
@@ -112,6 +119,7 @@ typedef void (*hcall_t)(struct kvm_cpu_cstatic const hcall_t host_hcall[] = {HANDLE_FUNC (__kvm_vcpu_run), +HANDLE_FUNC (__kvm_adjust_pc),HANDLE_FUNC (__kvm_flush_vm_context),HANDLE_FUNC (__kvm_tlb_flush_vmid_ipa),HANDLE_FUNC (__kvm_tlb_flush_vmid),
Greg Kroah-Hartman
maintainerPATCH 155/161 KVM: arm64: Resolve all pending PC updates before immediate exit
In reply to Greg Kroah-HartmanFrom: Zenghui Yu <[email protected]>
commit e3e880bb1518eb10a4b4bb4344ed614d6856f190 upstream.
Commit 26778aaa134a ("KVM: arm64: Commit pending PC adjustemnts before returning to userspace") fixed the PC updating issue by forcing an explicit synchronisation of the exception state on vcpu exit to userspace.
However, we forgot to take into account the case where immediate_exit is set by userspace and KVM_RUN will exit immediately. Fix it by resolving all pending PC updates before returning to userspace.
Since __kvm_adjust_pc() relies on a loaded vcpu context, I moved the immediate_exit checking right after vcpu_load(). We will get some overhead if immediate_exit is true (which should hopefully be rare).
--- arch/arm64/kvm/arm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm64/kvm/arm.c +6 -3
@@ -715,11 +715,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vreturn ret; } -if (run->immediate_exit) -return -EINTR ; -vcpu_load (vcpu); +if (run->immediate_exit) { + ret = -EINTR ; + goto out; + } +kvm_sigset_activate (vcpu); ret =1 ;
@@ -892,6 +894,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vkvm_sigset_deactivate (vcpu); +out:/* * In the unlikely event that we are returning to userspace * with pending exceptions or PC adjustment, commit these
Greg Kroah-Hartman
maintainerPATCH 156/161 ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function
In reply to Greg Kroah-HartmanFrom: Maciej Falkowski <[email protected]>
commit 7c302314f37b44595f180198fca5ca646bce4a5f upstream.
The gpiod table was added without any usage making it unused as reported by Clang compilation from omap1_defconfig on linux-next:
arch/arm/mach-omap1/board-h2.c:347:34: warning: unused variable 'isp1301_gpiod_table' [-Wunused-variable]
static struct gpiod_lookup_table isp1301_gpiod_table = {
^1 warning generated.
The patch adds the missing gpiod_add_lookup_table() function.
--- arch/arm/mach-omap1/board-h2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-omap1/board-h2.c +3 -1
@@ -320,7 +320,7 @@ static int tps_setup(struct i2c_client * {if (!IS_BUILTIN (CONFIG_TPS65010 ))return -ENOSYS ; - +tps65010_config_vregs1 (TPS_LDO2_ENABLE |TPS_VLDO2_3_0V |TPS_LDO1_ENABLE |TPS_VLDO1_3_0V );
@@ -394,6 +394,8 @@ static void __init h2_init(void)BUG_ON (gpio_request (H2_NAND_RB_GPIO_PIN ,"NAND ready" ) <0 );gpio_direction_input (H2_NAND_RB_GPIO_PIN ); +gpiod_add_lookup_table (&isp1301_gpiod_table); +omap_cfg_reg (L3_1610_FLASH_CS2B_OE );omap_cfg_reg (M8_1610_FLASH_CS2B_WE );
Greg Kroah-Hartman
maintainerPATCH 157/161 i2c: qcom-geni: Suspend and resume the bus during SYSTEM_SLEEP_PM ops
In reply to Greg Kroah-HartmanFrom: Roja Rani Yarubandi <[email protected]>
commit 57648e860485de39c800a89f849fdd03c2d31d15 upstream.
Mark bus as suspended during system suspend to block the future transfers. Implement geni_i2c_resume_noirq() to resume the bus.
--- drivers/i2c/busses/i2c-qcom-geni.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-qcom-geni.c +11 -1
@@ -698,6 +698,8 @@ static int __maybe_unused geni_i2c_suspe {struct geni_i2c_dev *gi2c =dev_get_drvdata (dev); +i2c_mark_adapter_suspended (&gi2c->adap); +if (!gi2c->suspended) {geni_i2c_runtime_suspend (dev);pm_runtime_disable (dev);
@@ -707,8 +709,16 @@ static int __maybe_unused geni_i2c_suspereturn 0 ; } +static int __maybe_unused geni_i2c_resume_noirq (struct device *dev) +{ +struct geni_i2c_dev *gi2c =dev_get_drvdata (dev); + +i2c_mark_adapter_resumed (&gi2c->adap); +return 0 ; +} +static const struct dev_pm_ops geni_i2c_pm_ops = { - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, NULL) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(geni_i2c_suspend_noirq, geni_i2c_resume_noirq)SET_RUNTIME_PM_OPS (geni_i2c_runtime_suspend, geni_i2c_runtime_resume,NULL ) };
Greg Kroah-Hartman
maintainerPATCH 158/161 x86/fault: Dont send SIGSEGV twice on SEGV_PKUERR
In reply to Greg Kroah-HartmanFrom: Jiashuo Liang <[email protected]>
commit 5405b42c2f08efe67b531799ba2fdb35bac93e70 upstream.
__bad_area_nosemaphore() calls both force_sig_pkuerr() and force_sig_fault() when handling SEGV_PKUERR. This does not cause problems because the second signal is filtered by the legacy_queue() check in __send_signal() because in both cases, the signal is SIGSEGV, the second one seeing that the first one is already pending.
This causes the kernel to do unnecessary work so send the signal only once for SEGV_PKUERR.
[ bp: Massage commit message. ]
--- arch/x86/mm/fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/fault.c +2 -2
@@ -836,8 +836,8 @@ __bad_area_nosemaphore(struct pt_regs *rif (si_code ==SEGV_PKUERR )force_sig_pkuerr ((void __user *)address, pkey); - -force_sig_fault (SIGSEGV , si_code, (void __user *)address); +else +force_sig_fault (SIGSEGV , si_code, (void __user *)address);local_irq_disable (); }
Greg Kroah-Hartman
maintainerPATCH 159/161 netfilter: nf_tables: missing error reporting for not selected expressions
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit c781471d67a56d7d4c113669a11ede0463b5c719 upstream.
Sometimes users forget to turn on nftables extensions from Kconfig that they need. In such case, the error reporting from userspace is misleading:
$ sudo nft add rule x y counter Error: Could not process rule: No such file or directory add rule x y counter ^^^^^^^^^^^^^^^^^^^^
Add missing NL_SET_BAD_ATTR() to provide a hint:
$ nft add rule x y counter
Error: Could not process rule: No such file or directory
add rule x y counter
^^^^^^^--- net/netfilter/nf_tables_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +3 -1
@@ -3288,8 +3288,10 @@ static int nf_tables_newrule(struct netif (n ==NFT_RULE_MAXEXPRS ) goto err1; err =nf_tables_expr_parse (&ctx, tmp, &info[n]); -if (err <0 ) +if (err <0 ) { +NL_SET_BAD_ATTR (extack, tmp); goto err1; + } size += info[n].ops->size; n++; }
Greg Kroah-Hartman
maintainerPATCH 160/161 xen-netback: take a reference to the RX task thread
In reply to Greg Kroah-HartmanFrom: Roger Pau Monne <[email protected]>
commit 107866a8eb0b664675a260f1ba0655010fac1e08 upstream.
Do this in order to prevent the task from being freed if the thread returns (which can be triggered by the frontend) before the call to kthread_stop done as part of the backend tear down. Not taking the reference will lead to a use-after-free in that scenario. Such reference was taken before but dropped as part of the rework done in 2ac061ce97f4.
Reintroduce the reference taking and add a comment this time explaining why it's needed.
This is XSA-374 / CVE-2021-28691.
--- drivers/net/xen-netback/interface.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/xen-netback/interface.c +6 -0
@@ -684,6 +684,7 @@ static void xenvif_disconnect_queue(stru {if (queue->task) {kthread_stop (queue->task); +put_task_struct (queue->task); queue->task =NULL ; }
@@ -745,6 +746,11 @@ int xenvif_connect_data(struct xenvif_quif (IS_ERR (task)) goto kthread_err; queue->task = task; +/* +* Take a reference to the task in order to prevent it from being freed +* if the thread function returns before kthread_stop is called. +*/ +get_task_struct (task); task =kthread_run (xenvif_dealloc_kthread, queue,"%s-dealloc" , queue->name);
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
5.12.10-rc1 Successfully Compiled and booted on my Raspberry PI 4b (8g) (bcm2711)
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerPATCH 161/161 neighbour: allow NUD_NOARP entries to be forced GCed
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
commit 7a6b1ab7475fd6478eeaf5c9d1163e7a18125c8f upstream.
IFF_POINTOPOINT interfaces use NUD_NOARP entries for IPv6. It's possible to fill up the neighbour table with enough entries that it will overflow for valid connections after that.
This behaviour is more prevalent after commit 58956317c8de ("neighbor:
Improve garbage collection") is applied, as it prevents removal from entries that are not NUD_FAILED, unless they are more than 5s old.
--- net/core/neighbour.c | 1 + 1 file changed, 1 insertion(+)
net/core/neighbour.c +1 -0
@@ -238,6 +238,7 @@ static int neigh_forced_gc(struct neigh_write_lock (&n->lock);if ((n->nud_state ==NUD_FAILED ) || + (n->nud_state ==NUD_NOARP ) || (tbl->is_multicast && tbl->is_multicast (n->primary_key)) ||time_after (tref, n->updated))
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.12.10-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.12.y
* git commit: 5a0a66f4d8172bcb8ac3bf155bc524dc467c0071
* git describe: v5.12.9-162-g5a0a66f4d817
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.12.y/build/v5.12.9-162-g5a0a66f4d817
## No regressions (compared to v5.12.9)
## No fixes (compared to v5.12.9)
## Test result summary
total: 76414, pass: 64280, fail: 496, skip: 10934, xfail: 704,
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 193 total, 193 passed, 0 failed
* arm64: 27 total, 27 passed, 0 failed
* i386: 25 total, 25 passed, 0 failed
* mips: 42 total, 42 passed, 0 failed
* parisc: 9 total, 9 passed, 0 failed
* powerpc: 27 total, 27 passed, 0 failed
* riscv: 18 total, 18 passed, 0 failed
* s390: 18 total, 18 passed, 0 failed
* sh: 18 total, 18 passed, 0 failed
* sparc: 9 total, 9 passed, 0 failed
* x86_64: 27 total, 27 passed, 0 failed
## Test suites summary
* fwts
* igt-gpu-tools
* ks[
* kselftest-android
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-lkdtm
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* rcutorture
* ssuite
* v4l2-compliance
--
Linaro LKFT
https://lkft.linaro.org
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.12:
12 builds: 12 pass, 0 fail
28 boots: 28 pass, 0 fail
104 tests: 104 pass, 0 failLinux version: 5.12.10-rc1-g5a0a66f4d817
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
Build results:
total: 151 pass: 151 fail: 0 Qemu test results: total: 462 pass: 462 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB, using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.12.10 release. There are 161 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 Thu, 10 Jun 2021 17:59:18 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.12.y
and the diffstat can be found below.thanks,
greg k-h
Tested rc1 against the Fedora build system (aarch64, armv7, ppc64le, s390x, x86_64), and boot tested x86_64. No regressions noted.