November 2019 - Linux-stable-mirror

FAILED: patch "[PATCH] KVM: X86: Fix initialization of MSR lists" 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 7a5ee6edb42e0bb487954806d34877995b6b8d59 Mon Sep 17 00:00:00 2001 From: Chenyi Qiang <chenyi.qiang(a)intel.com> Date: Wed, 6 Nov 2019 14:35:20 +0800 Subject: [PATCH] KVM: X86: Fix initialization of MSR lists The three MSR lists(msrs_to_save[], emulated_msrs[] and msr_based_features[]) are global arrays of kvm.ko, which are adjusted (copy supported MSRs forward to override the unsupported MSRs) when insmod kvm-{intel,amd}.ko, but it doesn't reset these three arrays to their initial value when rmmod kvm-{intel,amd}.ko. Thus, at the next installation, kvm-{intel,amd}.ko will do operations on the modified arrays with some MSRs lost and some MSRs duplicated. So define three constant arrays to hold the initial MSR lists and initialize msrs_to_save[], emulated_msrs[] and msr_based_features[] based on the constant arrays. Cc: stable(a)vger.kernel.org Reviewed-by: Xiaoyao Li <xiaoyao.li(a)intel.com> Signed-off-by: Chenyi Qiang <chenyi.qiang(a)intel.com> [Remove now useless conditionals. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ff395f812719..8c8a5e20ea06 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1132,13 +1132,15 @@ EXPORT_SYMBOL_GPL(kvm_rdpmc); * List of msr numbers which we expose to userspace through KVM_GET_MSRS * and KVM_SET_MSRS, and KVM_GET_MSR_INDEX_LIST. * - * This list is modified at module load time to reflect the + * The three MSR lists(msrs_to_save, emulated_msrs, msr_based_features) + * extract the supported MSRs from the related const lists. + * msrs_to_save is selected from the msrs_to_save_all to reflect the * capabilities of the host cpu. This capabilities test skips MSRs that are - * kvm-specific. Those are put in emulated_msrs; filtering of emulated_msrs + * kvm-specific. Those are put in emulated_msrs_all; filtering of emulated_msrs * may depend on host virtualization features rather than host cpu features. */ -static u32 msrs_to_save[] = { +static const u32 msrs_to_save_all[] = { MSR_IA32_SYSENTER_CS, MSR_IA32_SYSENTER_ESP, MSR_IA32_SYSENTER_EIP, MSR_STAR, #ifdef CONFIG_X86_64 @@ -1179,9 +1181,10 @@ static u32 msrs_to_save[] = { MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17, }; +static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; static unsigned num_msrs_to_save; -static u32 emulated_msrs[] = { +static const u32 emulated_msrs_all[] = { MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, MSR_KVM_SYSTEM_TIME_NEW, MSR_KVM_WALL_CLOCK_NEW, HV_X64_MSR_GUEST_OS_ID, HV_X64_MSR_HYPERCALL, @@ -1220,7 +1223,7 @@ static u32 emulated_msrs[] = { * by arch/x86/kvm/vmx/nested.c based on CPUID or other MSRs. * We always support the "true" VMX control MSRs, even if the host * processor does not, so I am putting these registers here rather - * than in msrs_to_save. + * than in msrs_to_save_all. */ MSR_IA32_VMX_BASIC, MSR_IA32_VMX_TRUE_PINBASED_CTLS, @@ -1239,13 +1242,14 @@ static u32 emulated_msrs[] = { MSR_KVM_POLL_CONTROL, }; +static u32 emulated_msrs[ARRAY_SIZE(emulated_msrs_all)]; static unsigned num_emulated_msrs; /* * List of msr numbers which are used to expose MSR-based features that * can be used by a hypervisor to validate requested CPU features. */ -static u32 msr_based_features[] = { +static const u32 msr_based_features_all[] = { MSR_IA32_VMX_BASIC, MSR_IA32_VMX_TRUE_PINBASED_CTLS, MSR_IA32_VMX_PINBASED_CTLS, @@ -1270,6 +1274,7 @@ static u32 msr_based_features[] = { MSR_IA32_ARCH_CAPABILITIES, }; +static u32 msr_based_features[ARRAY_SIZE(msr_based_features_all)]; static unsigned int num_msr_based_features; static u64 kvm_get_arch_capabilities(void) @@ -5090,22 +5095,22 @@ static void kvm_init_msr_list(void) { struct x86_pmu_capability x86_pmu; u32 dummy[2]; - unsigned i, j; + unsigned i; BUILD_BUG_ON_MSG(INTEL_PMC_MAX_FIXED != 4, - "Please update the fixed PMCs in msrs_to_save[]"); + "Please update the fixed PMCs in msrs_to_saved_all[]"); perf_get_x86_pmu_capability(&x86_pmu); - for (i = j = 0; i < ARRAY_SIZE(msrs_to_save); i++) { - if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0) + for (i = 0; i < ARRAY_SIZE(msrs_to_save_all); i++) { + if (rdmsr_safe(msrs_to_save_all[i], &dummy[0], &dummy[1]) < 0) continue; /* * Even MSRs that are valid in the host may not be exposed * to the guests in some cases. */ - switch (msrs_to_save[i]) { + switch (msrs_to_save_all[i]) { case MSR_IA32_BNDCFGS: if (!kvm_mpx_supported()) continue; @@ -5133,17 +5138,17 @@ static void kvm_init_msr_list(void) break; case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B: { if (!kvm_x86_ops->pt_supported() || - msrs_to_save[i] - MSR_IA32_RTIT_ADDR0_A >= + msrs_to_save_all[i] - MSR_IA32_RTIT_ADDR0_A >= intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2) continue; break; case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17: - if (msrs_to_save[i] - MSR_ARCH_PERFMON_PERFCTR0 >= + if (msrs_to_save_all[i] - MSR_ARCH_PERFMON_PERFCTR0 >= min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp)) continue; break; case MSR_ARCH_PERFMON_EVENTSEL0 ... MSR_ARCH_PERFMON_EVENTSEL0 + 17: - if (msrs_to_save[i] - MSR_ARCH_PERFMON_EVENTSEL0 >= + if (msrs_to_save_all[i] - MSR_ARCH_PERFMON_EVENTSEL0 >= min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp)) continue; } @@ -5151,34 +5156,25 @@ static void kvm_init_msr_list(void) break; } - if (j < i) - msrs_to_save[j] = msrs_to_save[i]; - j++; + msrs_to_save[num_msrs_to_save++] = msrs_to_save_all[i]; } - num_msrs_to_save = j; - for (i = j = 0; i < ARRAY_SIZE(emulated_msrs); i++) { - if (!kvm_x86_ops->has_emulated_msr(emulated_msrs[i])) + for (i = 0; i < ARRAY_SIZE(emulated_msrs_all); i++) { + if (!kvm_x86_ops->has_emulated_msr(emulated_msrs_all[i])) continue; - if (j < i) - emulated_msrs[j] = emulated_msrs[i]; - j++; + emulated_msrs[num_emulated_msrs++] = emulated_msrs_all[i]; } - num_emulated_msrs = j; - for (i = j = 0; i < ARRAY_SIZE(msr_based_features); i++) { + for (i = 0; i < ARRAY_SIZE(msr_based_features_all); i++) { struct kvm_msr_entry msr; - msr.index = msr_based_features[i]; + msr.index = msr_based_features_all[i]; if (kvm_get_msr_feature(&msr)) continue; - if (j < i) - msr_based_features[j] = msr_based_features[i]; - j++; + msr_based_features[num_msr_based_features++] = msr_based_features_all[i]; } - num_msr_based_features = j; } static int vcpu_mmio_write(struct kvm_vcpu *vcpu, gpa_t addr, int len,

5 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] KVM: X86: Fix initialization of MSR lists" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-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 7a5ee6edb42e0bb487954806d34877995b6b8d59 Mon Sep 17 00:00:00 2001 From: Chenyi Qiang <chenyi.qiang(a)intel.com> Date: Wed, 6 Nov 2019 14:35:20 +0800 Subject: [PATCH] KVM: X86: Fix initialization of MSR lists The three MSR lists(msrs_to_save[], emulated_msrs[] and msr_based_features[]) are global arrays of kvm.ko, which are adjusted (copy supported MSRs forward to override the unsupported MSRs) when insmod kvm-{intel,amd}.ko, but it doesn't reset these three arrays to their initial value when rmmod kvm-{intel,amd}.ko. Thus, at the next installation, kvm-{intel,amd}.ko will do operations on the modified arrays with some MSRs lost and some MSRs duplicated. So define three constant arrays to hold the initial MSR lists and initialize msrs_to_save[], emulated_msrs[] and msr_based_features[] based on the constant arrays. Cc: stable(a)vger.kernel.org Reviewed-by: Xiaoyao Li <xiaoyao.li(a)intel.com> Signed-off-by: Chenyi Qiang <chenyi.qiang(a)intel.com> [Remove now useless conditionals. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ff395f812719..8c8a5e20ea06 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1132,13 +1132,15 @@ EXPORT_SYMBOL_GPL(kvm_rdpmc); * List of msr numbers which we expose to userspace through KVM_GET_MSRS * and KVM_SET_MSRS, and KVM_GET_MSR_INDEX_LIST. * - * This list is modified at module load time to reflect the + * The three MSR lists(msrs_to_save, emulated_msrs, msr_based_features) + * extract the supported MSRs from the related const lists. + * msrs_to_save is selected from the msrs_to_save_all to reflect the * capabilities of the host cpu. This capabilities test skips MSRs that are - * kvm-specific. Those are put in emulated_msrs; filtering of emulated_msrs + * kvm-specific. Those are put in emulated_msrs_all; filtering of emulated_msrs * may depend on host virtualization features rather than host cpu features. */ -static u32 msrs_to_save[] = { +static const u32 msrs_to_save_all[] = { MSR_IA32_SYSENTER_CS, MSR_IA32_SYSENTER_ESP, MSR_IA32_SYSENTER_EIP, MSR_STAR, #ifdef CONFIG_X86_64 @@ -1179,9 +1181,10 @@ static u32 msrs_to_save[] = { MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17, }; +static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)]; static unsigned num_msrs_to_save; -static u32 emulated_msrs[] = { +static const u32 emulated_msrs_all[] = { MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK, MSR_KVM_SYSTEM_TIME_NEW, MSR_KVM_WALL_CLOCK_NEW, HV_X64_MSR_GUEST_OS_ID, HV_X64_MSR_HYPERCALL, @@ -1220,7 +1223,7 @@ static u32 emulated_msrs[] = { * by arch/x86/kvm/vmx/nested.c based on CPUID or other MSRs. * We always support the "true" VMX control MSRs, even if the host * processor does not, so I am putting these registers here rather - * than in msrs_to_save. + * than in msrs_to_save_all. */ MSR_IA32_VMX_BASIC, MSR_IA32_VMX_TRUE_PINBASED_CTLS, @@ -1239,13 +1242,14 @@ static u32 emulated_msrs[] = { MSR_KVM_POLL_CONTROL, }; +static u32 emulated_msrs[ARRAY_SIZE(emulated_msrs_all)]; static unsigned num_emulated_msrs; /* * List of msr numbers which are used to expose MSR-based features that * can be used by a hypervisor to validate requested CPU features. */ -static u32 msr_based_features[] = { +static const u32 msr_based_features_all[] = { MSR_IA32_VMX_BASIC, MSR_IA32_VMX_TRUE_PINBASED_CTLS, MSR_IA32_VMX_PINBASED_CTLS, @@ -1270,6 +1274,7 @@ static u32 msr_based_features[] = { MSR_IA32_ARCH_CAPABILITIES, }; +static u32 msr_based_features[ARRAY_SIZE(msr_based_features_all)]; static unsigned int num_msr_based_features; static u64 kvm_get_arch_capabilities(void) @@ -5090,22 +5095,22 @@ static void kvm_init_msr_list(void) { struct x86_pmu_capability x86_pmu; u32 dummy[2]; - unsigned i, j; + unsigned i; BUILD_BUG_ON_MSG(INTEL_PMC_MAX_FIXED != 4, - "Please update the fixed PMCs in msrs_to_save[]"); + "Please update the fixed PMCs in msrs_to_saved_all[]"); perf_get_x86_pmu_capability(&x86_pmu); - for (i = j = 0; i < ARRAY_SIZE(msrs_to_save); i++) { - if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0) + for (i = 0; i < ARRAY_SIZE(msrs_to_save_all); i++) { + if (rdmsr_safe(msrs_to_save_all[i], &dummy[0], &dummy[1]) < 0) continue; /* * Even MSRs that are valid in the host may not be exposed * to the guests in some cases. */ - switch (msrs_to_save[i]) { + switch (msrs_to_save_all[i]) { case MSR_IA32_BNDCFGS: if (!kvm_mpx_supported()) continue; @@ -5133,17 +5138,17 @@ static void kvm_init_msr_list(void) break; case MSR_IA32_RTIT_ADDR0_A ... MSR_IA32_RTIT_ADDR3_B: { if (!kvm_x86_ops->pt_supported() || - msrs_to_save[i] - MSR_IA32_RTIT_ADDR0_A >= + msrs_to_save_all[i] - MSR_IA32_RTIT_ADDR0_A >= intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2) continue; break; case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17: - if (msrs_to_save[i] - MSR_ARCH_PERFMON_PERFCTR0 >= + if (msrs_to_save_all[i] - MSR_ARCH_PERFMON_PERFCTR0 >= min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp)) continue; break; case MSR_ARCH_PERFMON_EVENTSEL0 ... MSR_ARCH_PERFMON_EVENTSEL0 + 17: - if (msrs_to_save[i] - MSR_ARCH_PERFMON_EVENTSEL0 >= + if (msrs_to_save_all[i] - MSR_ARCH_PERFMON_EVENTSEL0 >= min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp)) continue; } @@ -5151,34 +5156,25 @@ static void kvm_init_msr_list(void) break; } - if (j < i) - msrs_to_save[j] = msrs_to_save[i]; - j++; + msrs_to_save[num_msrs_to_save++] = msrs_to_save_all[i]; } - num_msrs_to_save = j; - for (i = j = 0; i < ARRAY_SIZE(emulated_msrs); i++) { - if (!kvm_x86_ops->has_emulated_msr(emulated_msrs[i])) + for (i = 0; i < ARRAY_SIZE(emulated_msrs_all); i++) { + if (!kvm_x86_ops->has_emulated_msr(emulated_msrs_all[i])) continue; - if (j < i) - emulated_msrs[j] = emulated_msrs[i]; - j++; + emulated_msrs[num_emulated_msrs++] = emulated_msrs_all[i]; } - num_emulated_msrs = j; - for (i = j = 0; i < ARRAY_SIZE(msr_based_features); i++) { + for (i = 0; i < ARRAY_SIZE(msr_based_features_all); i++) { struct kvm_msr_entry msr; - msr.index = msr_based_features[i]; + msr.index = msr_based_features_all[i]; if (kvm_get_msr_feature(&msr)) continue; - if (j < i) - msr_based_features[j] = msr_based_features[i]; - j++; + msr_based_features[num_msr_based_features++] = msr_based_features_all[i]; } - num_msr_based_features = j; } static int vcpu_mmio_write(struct kvm_vcpu *vcpu, gpa_t addr, int len,

5 years, 1 month

1
0
0 0

FAILED: patch "[PATCH] Btrfs: fix log context list corruption after rename exchange" 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 e6c617102c7e4ac1398cb0b98ff1f0727755b520 Mon Sep 17 00:00:00 2001 From: Filipe Manana <fdmanana(a)suse.com> Date: Fri, 8 Nov 2019 16:11:56 +0000 Subject: [PATCH] Btrfs: fix log context list corruption after rename exchange operation During rename exchange we might have successfully log the new name in the source root's log tree, in which case we leave our log context (allocated on stack) in the root's list of log contextes. However we might fail to log the new name in the destination root, in which case we fallback to a transaction commit later and never sync the log of the source root, which causes the source root log context to remain in the list of log contextes. This later causes invalid memory accesses because the context was allocated on stack and after rename exchange finishes the stack gets reused and overwritten for other purposes. The kernel's linked list corruption detector (CONFIG_DEBUG_LIST=y) can detect this and report something like the following: [ 691.489929] ------------[ cut here ]------------ [ 691.489947] list_add corruption. prev->next should be next (ffff88819c944530), but was ffff8881c23f7be4. (prev=ffff8881c23f7a38). [ 691.489967] WARNING: CPU: 2 PID: 28933 at lib/list_debug.c:28 __list_add_valid+0x95/0xe0 (...) [ 691.489998] CPU: 2 PID: 28933 Comm: fsstress Not tainted 5.4.0-rc6-btrfs-next-62 #1 [ 691.490001] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 691.490003] RIP: 0010:__list_add_valid+0x95/0xe0 (...) [ 691.490007] RSP: 0018:ffff8881f0b3faf8 EFLAGS: 00010282 [ 691.490010] RAX: 0000000000000000 RBX: ffff88819c944530 RCX: 0000000000000000 [ 691.490011] RDX: 0000000000000001 RSI: 0000000000000008 RDI: ffffffffa2c497e0 [ 691.490013] RBP: ffff8881f0b3fe68 R08: ffffed103eaa4115 R09: ffffed103eaa4114 [ 691.490015] R10: ffff88819c944000 R11: ffffed103eaa4115 R12: 7fffffffffffffff [ 691.490016] R13: ffff8881b4035610 R14: ffff8881e7b84728 R15: 1ffff1103e167f7b [ 691.490019] FS: 00007f4b25ea2e80(0000) GS:ffff8881f5500000(0000) knlGS:0000000000000000 [ 691.490021] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 691.490022] CR2: 00007fffbb2d4eec CR3: 00000001f2a4a004 CR4: 00000000003606e0 [ 691.490025] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 691.490027] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 691.490029] Call Trace: [ 691.490058] btrfs_log_inode_parent+0x667/0x2730 [btrfs] [ 691.490083] ? join_transaction+0x24a/0xce0 [btrfs] [ 691.490107] ? btrfs_end_log_trans+0x80/0x80 [btrfs] [ 691.490111] ? dget_parent+0xb8/0x460 [ 691.490116] ? lock_downgrade+0x6b0/0x6b0 [ 691.490121] ? rwlock_bug.part.0+0x90/0x90 [ 691.490127] ? do_raw_spin_unlock+0x142/0x220 [ 691.490151] btrfs_log_dentry_safe+0x65/0x90 [btrfs] [ 691.490172] btrfs_sync_file+0x9f1/0xc00 [btrfs] [ 691.490195] ? btrfs_file_write_iter+0x1800/0x1800 [btrfs] [ 691.490198] ? rcu_read_lock_any_held.part.11+0x20/0x20 [ 691.490204] ? __do_sys_newstat+0x88/0xd0 [ 691.490207] ? cp_new_stat+0x5d0/0x5d0 [ 691.490218] ? do_fsync+0x38/0x60 [ 691.490220] do_fsync+0x38/0x60 [ 691.490224] __x64_sys_fdatasync+0x32/0x40 [ 691.490228] do_syscall_64+0x9f/0x540 [ 691.490233] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 691.490235] RIP: 0033:0x7f4b253ad5f0 (...) [ 691.490239] RSP: 002b:00007fffbb2d6078 EFLAGS: 00000246 ORIG_RAX: 000000000000004b [ 691.490242] RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007f4b253ad5f0 [ 691.490244] RDX: 00007fffbb2d5fe0 RSI: 00007fffbb2d5fe0 RDI: 0000000000000003 [ 691.490245] RBP: 000000000000000d R08: 0000000000000001 R09: 00007fffbb2d608c [ 691.490247] R10: 00000000000002e8 R11: 0000000000000246 R12: 00000000000001f4 [ 691.490248] R13: 0000000051eb851f R14: 00007fffbb2d6120 R15: 00005635a498bda0 This started happening recently when running some test cases from fstests like btrfs/004 for example, because support for rename exchange was added last week to fsstress from fstests. So fix this by deleting the log context for the source root from the list if we have logged the new name in the source root. Reported-by: Su Yue <Damenly_Su(a)gmx.com> Fixes: d4682ba03ef618 ("Btrfs: sync log after logging new name") CC: stable(a)vger.kernel.org # 4.19+ Tested-by: Su Yue <Damenly_Su(a)gmx.com> Signed-off-by: Filipe Manana <fdmanana(a)suse.com> Signed-off-by: David Sterba <dsterba(a)suse.com> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c6dc4dd16cf7..015910079e73 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9744,6 +9744,18 @@ static int btrfs_rename_exchange(struct inode *old_dir, commit_transaction = true; } if (commit_transaction) { + /* + * We may have set commit_transaction when logging the new name + * in the destination root, in which case we left the source + * root context in the list of log contextes. So make sure we + * remove it to avoid invalid memory accesses, since the context + * was allocated in our stack frame. + */ + if (sync_log_root) { + mutex_lock(&root->log_mutex); + list_del_init(&ctx_root.list); + mutex_unlock(&root->log_mutex); + } ret = btrfs_commit_transaction(trans); } else { int ret2; @@ -9757,6 +9769,9 @@ static int btrfs_rename_exchange(struct inode *old_dir, if (old_ino == BTRFS_FIRST_FREE_OBJECTID) up_read(&fs_info->subvol_sem); + ASSERT(list_empty(&ctx_root.list)); + ASSERT(list_empty(&ctx_dest.list)); + return ret; }

5 years, 1 month

1
0
0 0

❌ FAIL: Stable queue: queue-5.3

by CKI Project

Hello, We ran automated tests on a patchset that was proposed for merging into this kernel tree. The patches were applied to: Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 116a395b7061 - Linux 5.3.11 The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: OK Tests: FAILED All kernel binaries, config files, and logs are available for download here: https://artifacts.cki-project.org/pipelines/293063 One or more kernel tests failed: aarch64: ❌ LTP lite We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Merge testing ------------- We cloned this repository and checked out the following commit: Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git Commit: 116a395b7061 - Linux 5.3.11 We grabbed the c4a7b00e0626 commit of the stable queue repository. We then merged the patchset with `git am`: scsi-core-handle-drivers-which-set-sg_tablesize-to-zero.patch ax88172a-fix-information-leak-on-short-answers.patch devlink-disallow-reload-operation-during-device-cleanup.patch ipmr-fix-skb-headroom-in-ipmr_get_route.patch mlxsw-core-enable-devlink-reload-only-on-probe.patch net-gemini-add-missed-free_netdev.patch net-smc-fix-fastopen-for-non-blocking-connect.patch net-usb-qmi_wwan-add-support-for-foxconn-t77w968-lte-modules.patch slip-fix-memory-leak-in-slip_open-error-path.patch tcp-remove-redundant-new-line-from-tcp_event_sk_skb.patch dpaa2-eth-free-already-allocated-channels-on-probe-defer.patch devlink-add-method-for-time-stamp-on-reporter-s-dump.patch net-smc-fix-refcount-non-blocking-connect-part-2.patch Compile testing --------------- We compiled the kernel for 3 architectures: aarch64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test 🚧 ✅ selinux-policy: serge-testsuite Host 2: ✅ Boot test ✅ Podman system integration test (as root) ✅ Podman system integration test (as user) ❌ LTP lite ⚡⚡⚡ jvm test suite ⚡⚡⚡ AMTU (Abstract Machine Test Utility) ⚡⚡⚡ LTP: openposix test suite ⚡⚡⚡ Ethernet drivers sanity ⚡⚡⚡ Networking socket: fuzz ⚡⚡⚡ audit: audit testsuite test ⚡⚡⚡ httpd: mod_ssl smoke sanity ⚡⚡⚡ iotop: sanity ⚡⚡⚡ tuned: tune-processes-through-perf ⚡⚡⚡ storage: SCSI VPD ⚡⚡⚡ stress: stress-ng ppc64le: ⚡ Internal infrastructure issues prevented one or more tests (marked with ⚡⚡⚡) from running on this architecture. This is not the fault of the kernel that was tested. x86_64: Host 1: ✅ Boot test 🚧 ✅ selinux-policy: serge-testsuite Host 2: ✅ Boot test ✅ Podman system integration test (as root) ✅ Podman system integration test (as user) ✅ LTP lite ✅ jvm test suite ✅ AMTU (Abstract Machine Test Utility) ✅ LTP: openposix test suite ✅ Ethernet drivers sanity ✅ Networking socket: fuzz ✅ audit: audit testsuite test ✅ httpd: mod_ssl smoke sanity ✅ iotop: sanity ✅ tuned: tune-processes-through-perf ✅ pciutils: sanity smoke test ✅ storage: SCSI VPD ✅ stress: stress-ng Test sources: https://github.com/CKI-project/tests-beaker 💚 Pull requests are welcome for new tests or improvements to existing tests! Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running are marked with ⏱. Reports for non-upstream kernels have a Beaker recipe linked to next to each host.

5 years, 1 month

1
0
0 0

❌ FAIL: Test report for kernel 5.4.0-rc7-e1918f0.cki (stable-next)

by CKI Project

Hello, We ran automated tests on a recent commit from this kernel tree: Kernel repo: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git Commit: e1918f0cc92b - kcov: remote coverage support The results of these automated tests are provided below. Overall result: FAILED (see details below) Merge: OK Compile: OK Tests: FAILED All kernel binaries, config files, and logs are available for download here: https://artifacts.cki-project.org/pipelines/288750 One or more kernel tests failed: x86_64: ❌ LTP lite We hope that these logs can help you find the problem quickly. For the full detail on our testing procedures, please scroll to the bottom of this message. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________ Compile testing --------------- We compiled the kernel for 3 architectures: aarch64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg ppc64le: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg x86_64: make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg Hardware testing ---------------- We booted each kernel and ran the following tests: aarch64: Host 1: ✅ Boot test ✅ xfstests: ext4 ✅ xfstests: xfs ✅ lvm thinp sanity ✅ storage: software RAID testing 🚧 ✅ selinux-policy: serge-testsuite 🚧 ✅ Storage blktests Host 2: ✅ Boot test ✅ Podman system integration test (as root) ✅ Podman system integration test (as user) ✅ LTP lite ✅ Loopdev Sanity ✅ jvm test suite ✅ Memory function: memfd_create ✅ Memory function: kaslr ✅ AMTU (Abstract Machine Test Utility) ✅ LTP: openposix test suite ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking MACsec: sanity ✅ Networking socket: fuzz ✅ Networking sctp-auth: sockopts test ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func: local ✅ Networking route_func: forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns transport ✅ Networking ipsec: basic netns tunnel ✅ audit: audit testsuite test ✅ httpd: mod_ssl smoke sanity ✅ iotop: sanity ✅ tuned: tune-processes-through-perf ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ Usex - version 1.9-29 ✅ storage: SCSI VPD ✅ stress: stress-ng ✅ trace: ftrace/tracer 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ Networking vnic: ipvlan/basic 🚧 ✅ storage: dm/common ppc64le: Host 1: ✅ Boot test ✅ xfstests: ext4 ✅ xfstests: xfs ✅ lvm thinp sanity ✅ storage: software RAID testing 🚧 ✅ selinux-policy: serge-testsuite 🚧 ✅ Storage blktests Host 2: ✅ Boot test ✅ Podman system integration test (as root) ✅ Podman system integration test (as user) ✅ LTP lite ✅ Loopdev Sanity ✅ jvm test suite ✅ Memory function: memfd_create ✅ Memory function: kaslr ✅ AMTU (Abstract Machine Test Utility) ✅ LTP: openposix test suite ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking MACsec: sanity ✅ Networking socket: fuzz ✅ Networking sctp-auth: sockopts test ✅ Networking route: pmtu ✅ Networking route_func: local ✅ Networking route_func: forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns tunnel ✅ audit: audit testsuite test ✅ httpd: mod_ssl smoke sanity ✅ iotop: sanity ✅ tuned: tune-processes-through-perf ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ Usex - version 1.9-29 ✅ trace: ftrace/tracer 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ Networking vnic: ipvlan/basic 🚧 ✅ storage: dm/common x86_64: Host 1: ✅ Boot test ✅ Podman system integration test (as root) ✅ Podman system integration test (as user) ❌ LTP lite ✅ Loopdev Sanity ✅ jvm test suite ✅ Memory function: memfd_create ✅ Memory function: kaslr ✅ AMTU (Abstract Machine Test Utility) ✅ LTP: openposix test suite ✅ Networking bridge: sanity ✅ Ethernet drivers sanity ✅ Networking MACsec: sanity ✅ Networking socket: fuzz ✅ Networking sctp-auth: sockopts test ✅ Networking: igmp conformance test ✅ Networking route: pmtu ✅ Networking route_func: local ✅ Networking route_func: forward ✅ Networking TCP: keepalive test ✅ Networking UDP: socket ✅ Networking tunnel: geneve basic test ✅ Networking tunnel: gre basic ✅ L2TP basic test ✅ Networking tunnel: vxlan basic ✅ Networking ipsec: basic netns transport ✅ Networking ipsec: basic netns tunnel ✅ audit: audit testsuite test ✅ httpd: mod_ssl smoke sanity ✅ iotop: sanity ✅ tuned: tune-processes-through-perf ✅ pciutils: sanity smoke test ✅ ALSA PCM loopback test ✅ ALSA Control (mixer) Userspace Element test ✅ Usex - version 1.9-29 ✅ storage: SCSI VPD ✅ stress: stress-ng ✅ trace: ftrace/tracer 🚧 ✅ CIFS Connectathon 🚧 ✅ POSIX pjd-fstest suites 🚧 ✅ Networking vnic: ipvlan/basic 🚧 ✅ storage: dm/common Host 2: ✅ Boot test ✅ Storage SAN device stress - megaraid_sas Host 3: ✅ Boot test 🚧 ✅ IPMI driver test 🚧 ❌ IPMItool loop stress test Host 4: ✅ Boot test ✅ xfstests: ext4 ✅ xfstests: xfs ✅ lvm thinp sanity ✅ storage: software RAID testing 🚧 ✅ IOMMU boot test 🚧 ✅ selinux-policy: serge-testsuite 🚧 ✅ Storage blktests Host 5: ✅ Boot test ✅ Storage SAN device stress - mpt3sas driver Test sources: https://github.com/CKI-project/tests-beaker 💚 Pull requests are welcome for new tests or improvements to existing tests! Waived tests ------------ If the test run included waived tests, they are marked with 🚧. Such tests are executed but their results are not taken into account. Tests are waived when their results are not reliable enough, e.g. when they're just introduced or are being fixed. Testing timeout --------------- We aim to provide a report within reasonable timeframe. Tests that haven't finished running are marked with ⏱. Reports for non-upstream kernels have a Beaker recipe linked to next to each host.

5 years, 1 month

3
2
0 0

[PATCH] perf/x86/uncore: Remove unnecessary check for uncore_pmu

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> The uncore_pmu pointer in uncore_pmu_enable/disable() is from container_of, which never be NULL. Remove the unnecessary check for uncore_pmu. Fixes: 75be6f703a14 ("perf/x86/uncore: Fix event group support") Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/x86/events/intel/uncore.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 86467f8..81eed07 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -780,9 +780,6 @@ static void uncore_pmu_enable(struct pmu *pmu) struct intel_uncore_box *box; uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu); - if (!uncore_pmu) - return; - box = uncore_pmu_to_box(uncore_pmu, smp_processor_id()); if (!box) return; @@ -797,9 +794,6 @@ static void uncore_pmu_disable(struct pmu *pmu) struct intel_uncore_box *box; uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu); - if (!uncore_pmu) - return; - box = uncore_pmu_to_box(uncore_pmu, smp_processor_id()); if (!box) return; -- 2.7.4

5 years, 1 month

2
2
0 0

[PATCH 4.19 000/125] 4.19.84-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.84 release. There are 125 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, 13 Nov 2019 18:08:44 +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/v4.x/stable-review/patch-4.19.84-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.19.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.19.84-rc1 Tejun Heo <tj(a)kernel.org> cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> mm/filemap.c: don't initiate writeback if mapping has no dirty pages Jean-Baptiste Maneyrol <JManeyrol(a)invensense.com> iio: imu: inv_mpu6050: fix no data on MPU6050 Randolph Maaßen <gaireg(a)gaireg.de> iio: imu: mpu6050: Add support for the ICM 20602 IMU Tejun Heo <tj(a)kernel.org> blkcg: make blkcg_print_stat() print stats only for online blkgs Hans de Goede <hdegoede(a)redhat.com> pinctrl: cherryview: Fix irq_valid_mask calculation Shuning Zhang <sunny.s.zhang(a)oracle.com> ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: intel: Avoid potential glitches if pin is in GPIO mode Wenwen Wang <wenwen(a)cs.uga.edu> e1000: fix memory leaks Manfred Rudigier <manfred.rudigier(a)omicronenergy.com> igb: Fix constant media auto sense switching when no cable is connected Chuhong Yuan <hslester96(a)gmail.com> net: ethernet: arc: add the missed clk_disable_unprepare Trond Myklebust <trondmy(a)gmail.com> NFSv4: Don't allow a cached open with a revoked delegation Felipe Balbi <felipe.balbi(a)linux.intel.com> usb: dwc3: gadget: fix race when disabling ep with cancelled xfers Haiyang Zhang <haiyangz(a)microsoft.com> hv_netvsc: Fix error handling in netvsc_attach() Michael Strauss <michael.strauss(a)amd.com> drm/amd/display: Passive DP->HDMI dongle detection fix Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/amdgpu: If amdgpu_ib_schedule fails return back the error. Takashi Iwai <tiwai(a)suse.de> iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 Vladimir Oltean <olteanv(a)gmail.com> net: mscc: ocelot: refuse to overwrite the port's native vlan Vladimir Oltean <olteanv(a)gmail.com> net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up Jiangfeng Xiao <xiaojiangfeng(a)huawei.com> net: hisilicon: Fix "Trying to free already-free IRQ" Will Deacon <will(a)kernel.org> fjes: Handle workqueue allocation failure Anton Eidelman <anton(a)lightbitslabs.com> nvme-multipath: fix possible io hang after ctrl reconnect Nicholas Piggin <npiggin(a)gmail.com> scsi: qla2xxx: stop timer in shutdown path Lijun Ou <oulijun(a)huawei.com> RDMA/hns: Prevent memory leaks of eq->buf_list Potnuri Bharat Teja <bharat(a)chelsio.com> RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case GwanYeong Kim <gy741.kim(a)gmail.com> usbip: tools: Fix read_usb_vudc_device() error path handling Johan Hovold <johan(a)kernel.org> USB: ldusb: use unsigned size format specifiers Alan Stern <stern(a)rowland.harvard.edu> USB: Skip endpoints with 0 maxpacket length Kan Liang <kan.liang(a)linux.intel.com> perf/x86/uncore: Fix event group support Kim Phillips <kim.phillips(a)amd.com> perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) Kim Phillips <kim.phillips(a)amd.com> perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity Yinbo Zhu <yinbo.zhu(a)nxp.com> usb: dwc3: remove the call trace of USBx_GFLADJ Peter Chen <peter.chen(a)nxp.com> usb: gadget: configfs: fix concurrent issue between composite APIs Navid Emamdoost <navid.emamdoost(a)gmail.com> usb: dwc3: pci: prevent memory leak in dwc3_pci_probe Chandana Kishori Chiluveru <cchiluve(a)codeaurora.org> usb: gadget: composite: Fix possible double free memory bug Cristian Birsan <cristian.birsan(a)microchip.com> usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. Nikhil Badola <nikhil.badola(a)freescale.com> usb: fsl: Check memory resource before releasing it Taehee Yoo <ap420073(a)gmail.com> macsec: fix refcnt leak in module exit routine Taehee Yoo <ap420073(a)gmail.com> bonding: fix unexpected IFF_BONDING bit unset Eric Dumazet <edumazet(a)google.com> ipvs: move old_secure_tcp into struct netns_ipvs Davide Caratti <dcaratti(a)redhat.com> ipvs: don't ignore errors in case refcounting ip_vs module fails Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_flow_table: set timeout before insertion into hashes Himanshu Madhani <hmadhani(a)marvell.com> scsi: qla2xxx: Initialized mailbox to prevent driver load failure Daniel Wagner <dwagner(a)suse.de> scsi: lpfc: Honor module parameter lpfc_use_adisc Hillf Danton <hdanton(a)sina.com> net: openvswitch: free vport unless register_netdevice() succeeds Dan Carpenter <dan.carpenter(a)oracle.com> RDMA/uverbs: Prevent potential underflow Hannes Reinecke <hare(a)suse.com> scsi: qla2xxx: fixup incorrect usage of host_byte Navid Emamdoost <navid.emamdoost(a)gmail.com> net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq Tariq Toukan <tariqt(a)mellanox.com> net/mlx5e: TX, Fix consumer index of error cqe dump Kamal Heib <kamalheib1(a)gmail.com> RDMA/qedr: Fix reported firmware version Potnuri Bharat Teja <bharat(a)chelsio.com> iw_cxgb4: fix ECN check on the passive accept Rafi Wiener <rafiw(a)mellanox.com> RDMA/mlx5: Clear old rate limit when closing QP Zhang Lixu <lixu.zhang(a)intel.com> HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() Baolin Wang <baolin.wang(a)linaro.org> dmaengine: sprd: Fix the possible memory leak issue Radhey Shyam Pandey <radhey.shyam.pandey(a)xilinx.com> dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config Nicolas Boichat <drinkcat(a)chromium.org> HID: google: add magnemite/masterball USB ids Vidya Sagar <vidyas(a)nvidia.com> PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 Suwan Kim <suwan.kim027(a)gmail.com> usbip: Implement SG support to vhci-hcd and stub driver Shuah Khan <shuah(a)kernel.org> usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path Qian Cai <cai(a)lca.pw> sched/fair: Fix -Wunused-but-set-variable warnings Dave Chiluk <chiluk+linux(a)indeed.com> sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix copy&paste error in the validator Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: usb-audio: remove some dead code Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Clean up check_input_term() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Remove superfluous bLength checks Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Simplify parse_audio_unit() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: More validations of descriptor units Al Viro <viro(a)zeniv.linux.org.uk> configfs: fix a deadlock in configfs_symlink() Al Viro <viro(a)zeniv.linux.org.uk> configfs: provide exclusion between IO and removals Al Viro <viro(a)zeniv.linux.org.uk> configfs: new object reprsenting tree fragments Al Viro <viro(a)zeniv.linux.org.uk> configfs_register_group() shouldn't be (and isn't) called in rmdirable parts Al Viro <viro(a)zeniv.linux.org.uk> configfs: stash the data we need into configfs_buffer at open time Johan Hovold <johan(a)kernel.org> can: peak_usb: fix slab info leak Johan Hovold <johan(a)kernel.org> can: mcba_usb: fix use-after-free on disconnect Wen Yang <wenyang(a)linux.alibaba.com> can: dev: add missing of_node_put() after calling of_get_child_by_name() Navid Emamdoost <navid.emamdoost(a)gmail.com> can: gs_usb: gs_can_open(): prevent memory leak Marc Kleine-Budde <mkl(a)pengutronix.de> can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak Stephane Grosjean <s.grosjean(a)peak-system.com> can: peak_usb: fix a potential out-of-sync while decoding packets Kurt Van Dijck <dev.kurt(a)vandijck-laurijssen.be> can: c_can: c_can_poll(): only read status register after status IRQ Joakim Zhang <qiangqing.zhang(a)nxp.com> can: flexcan: disable completely the ECC mechanism Johan Hovold <johan(a)kernel.org> can: usb_8dev: fix use-after-free on disconnect Pavel Shilovsky <pshilov(a)microsoft.com> SMB3: Fix persistent handles reconnect Jan Beulich <jbeulich(a)suse.com> x86/apic/32: Avoid bogus LDR warnings Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: pci: Add Jasper Lake PCH support Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: pci: Add Comet Lake PCH support Dan Carpenter <dan.carpenter(a)oracle.com> netfilter: ipset: Fix an error code in ip_set_sockfn_get() Lukas Wunner <lukas(a)wunner.de> netfilter: nf_tables: Align nft_expr private data to 64-bit Ondrej Jirman <megous(a)megous.com> ARM: sunxi: Fix CPU powerdown on A83T Andreas Klinger <ak(a)it-klinger.de> iio: srf04: fix wrong limitation in distance measuring Alexandru Ardelean <alexandru.ardelean(a)analog.com> iio: imu: adis16480: make sure provided frequency is positive Fabrice Gasnier <fabrice.gasnier(a)st.com> iio: adc: stm32-adc: fix stopping dma Al Viro <viro(a)zeniv.linux.org.uk> ceph: add missing check in d_revalidate snapdir handling Luis Henriques <lhenriques(a)suse.com> ceph: fix use-after-free in __ceph_remove_cap() Catalin Marinas <catalin.marinas(a)arm.com> arm64: Do not mask out PTE_RDONLY in pte_same() Bard Liao <yung-chuan.liao(a)linux.intel.com> soundwire: bus: set initial value to port_status Michal Suchanek <msuchanek(a)suse.de> soundwire: depend on ACPI Jason Gerecke <killertofu(a)gmail.com> HID: wacom: generic: Treat serial number and related fields as unsigned Alex Deucher <alexander.deucher(a)amd.com> drm/radeon: fix si_enable_smc_cac() failed issue Jiri Olsa <jolsa(a)kernel.org> perf tools: Fix time sorting Shuah Khan <skhan(a)linuxfoundation.org> tools: gpio: Use !building_out_of_srctree to determine srctree Kevin Hao <haokexin(a)gmail.com> dump_stack: avoid the livelock of the dump_lock Michal Hocko <mhocko(a)suse.com> mm, vmstat: hide /proc/pagetypeinfo from normal users Yang Shi <yang.shi(a)linux.alibaba.com> mm: thp: handle page cache THP correctly in PageTransCompoundMap Mel Gorman <mgorman(a)techsingularity.net> mm, meminit: recalculate pcpu batch and high limits after init completes Johannes Weiner <hannes(a)cmpxchg.org> mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges Takashi Iwai <tiwai(a)suse.de> ALSA: hda/ca0132 - Fix possible workqueue stall Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix incorrectly assigned timer instance Salil Mehta <salil.mehta(a)huawei.com> net: hns: Fix the stray netpoll locks causing deadlock in NAPI path Eric Dumazet <edumazet(a)google.com> ipv6: fixes rt6_probe() and fib6_nh->last_probe init Claudiu Manoil <claudiu.manoil(a)nxp.com> net: mscc: ocelot: fix NULL pointer on LAG slave removal Claudiu Manoil <claudiu.manoil(a)nxp.com> net: mscc: ocelot: don't handle netdev events for other netdevs Manish Chopra <manishc(a)marvell.com> qede: fix NULL pointer deref in __qede_remove() Pan Bian <bianpan2016(a)163.com> NFC: st21nfca: fix double free Pan Bian <bianpan2016(a)163.com> nfc: netlink: fix double device reference drop Pan Bian <bianpan2016(a)163.com> NFC: fdp: fix incorrect free object Aleksander Morgado <aleksander(a)aleksander.es> net: usb: qmi_wwan: add support for DW5821e with eSIM support Sean Tranchetti <stranche(a)codeaurora.org> net: qualcomm: rmnet: Fix potential UAF when unregistering Eric Dumazet <edumazet(a)google.com> net: fix data-race in neigh_event_send() Alexander Sverdlin <alexander.sverdlin(a)nokia.com> net: ethernet: octeon_mgmt: Account for second possible VLAN header David Ahern <dsahern(a)kernel.org> ipv4: Fix table id reference in fib_sync_down_addr Oliver Neukum <oneukum(a)suse.com> CDC-NCM: handle incomplete transfer of MTU Jay Vosburgh <jay.vosburgh(a)canonical.com> bonding: fix state transition issue in link monitoring ------------- Diffstat: Documentation/scheduler/sched-bwc.txt | 45 ++ Makefile | 4 +- arch/arm/mach-sunxi/mc_smp.c | 6 +- arch/arm64/include/asm/pgtable.h | 17 - arch/x86/events/amd/ibs.c | 8 +- arch/x86/events/intel/uncore.c | 44 +- arch/x86/events/intel/uncore.h | 12 - arch/x86/kernel/apic/apic.c | 28 +- block/blk-cgroup.c | 13 +- drivers/dma/sprd-dma.c | 15 + drivers/dma/xilinx/xilinx_dma.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 24 +- drivers/gpu/drm/radeon/si_dpm.c | 1 + drivers/hid/hid-google-hammer.c | 4 + drivers/hid/hid-ids.h | 2 + drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 2 +- drivers/hid/wacom.h | 15 + drivers/hid/wacom_wac.c | 10 +- drivers/hwtracing/intel_th/pci.c | 10 + drivers/iio/adc/stm32-adc.c | 4 +- drivers/iio/imu/adis16480.c | 5 +- drivers/iio/imu/inv_mpu6050/Kconfig | 8 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 40 ++ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 10 + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 15 +- drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 12 +- drivers/iio/proximity/srf04.c | 29 +- drivers/infiniband/core/uverbs.h | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 30 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- drivers/infiniband/hw/mlx5/qp.c | 8 +- drivers/infiniband/hw/qedr/main.c | 2 +- drivers/iommu/amd_iommu_quirks.c | 13 + drivers/net/bonding/bond_main.c | 47 +- drivers/net/can/c_can/c_can.c | 25 +- drivers/net/can/c_can/c_can.h | 1 + drivers/net/can/dev.c | 1 + drivers/net/can/flexcan.c | 1 + drivers/net/can/rx-offload.c | 6 +- drivers/net/can/usb/gs_usb.c | 1 + drivers/net/can/usb/mcba_usb.c | 3 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 17 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/usb_8dev.c | 3 +- drivers/net/ethernet/arc/emac_rockchip.c | 3 + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 1 - drivers/net/ethernet/hisilicon/hns/hnae.c | 1 - drivers/net/ethernet/hisilicon/hns/hnae.h | 3 - drivers/net/ethernet/hisilicon/hns/hns_enet.c | 22 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 +- drivers/net/ethernet/intel/igb/igb_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 5 +- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- drivers/net/ethernet/mscc/ocelot.c | 20 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 4 +- drivers/net/fjes/fjes_main.c | 15 +- drivers/net/hyperv/netvsc_drv.c | 9 +- drivers/net/macsec.c | 4 - drivers/net/usb/cdc_ncm.c | 6 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/nfc/fdp/i2c.c | 2 +- drivers/nfc/st21nfca/core.c | 1 + drivers/nvme/host/multipath.c | 2 +- drivers/pci/controller/pci-tegra.c | 7 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- drivers/pinctrl/intel/pinctrl-intel.c | 21 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- drivers/scsi/qla2xxx/qla_bsg.c | 6 +- drivers/scsi/qla2xxx/qla_mbx.c | 3 +- drivers/scsi/qla2xxx/qla_os.c | 4 + drivers/soundwire/Kconfig | 1 + drivers/soundwire/bus.c | 2 +- drivers/usb/core/config.c | 5 + drivers/usb/dwc3/core.c | 3 +- drivers/usb/dwc3/dwc3-pci.c | 2 +- drivers/usb/dwc3/gadget.c | 6 + drivers/usb/gadget/composite.c | 4 + drivers/usb/gadget/configfs.c | 110 +++- drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- drivers/usb/misc/ldusb.c | 7 +- drivers/usb/usbip/stub.h | 7 +- drivers/usb/usbip/stub_main.c | 57 +- drivers/usb/usbip/stub_rx.c | 204 +++++-- drivers/usb/usbip/stub_tx.c | 99 +++- drivers/usb/usbip/usbip_common.c | 59 +- drivers/usb/usbip/vhci_hcd.c | 16 +- drivers/usb/usbip/vhci_rx.c | 3 + drivers/usb/usbip/vhci_tx.c | 66 ++- fs/ceph/caps.c | 10 +- fs/ceph/inode.c | 1 + fs/cifs/smb2pdu.h | 1 + fs/configfs/configfs_internal.h | 15 +- fs/configfs/dir.c | 137 +++-- fs/configfs/file.c | 280 ++++----- fs/configfs/symlink.c | 33 +- fs/fs-writeback.c | 9 +- fs/nfs/delegation.c | 10 + fs/nfs/delegation.h | 1 + fs/nfs/nfs4proc.c | 7 +- fs/ocfs2/file.c | 134 +++-- include/linux/mm.h | 5 - include/linux/mm_types.h | 5 + include/linux/page-flags.h | 20 +- include/net/bonding.h | 3 +- include/net/ip_vs.h | 1 + include/net/neighbour.h | 4 +- include/net/netfilter/nf_tables.h | 3 +- include/rdma/ib_verbs.h | 2 +- kernel/sched/fair.c | 91 +-- kernel/sched/sched.h | 4 - lib/dump_stack.c | 7 +- mm/filemap.c | 3 +- mm/memcontrol.c | 9 + mm/page_alloc.c | 10 +- mm/vmstat.c | 2 +- net/ipv4/fib_semantics.c | 2 +- net/ipv6/route.c | 13 +- net/netfilter/ipset/ip_set_core.c | 8 +- net/netfilter/ipvs/ip_vs_app.c | 12 +- net/netfilter/ipvs/ip_vs_ctl.c | 29 +- net/netfilter/ipvs/ip_vs_pe.c | 3 +- net/netfilter/ipvs/ip_vs_sched.c | 3 +- net/netfilter/ipvs/ip_vs_sync.c | 13 +- net/netfilter/nf_flow_table_core.c | 3 +- net/nfc/netlink.c | 2 - net/openvswitch/vport-internal_dev.c | 11 +- sound/core/timer.c | 6 +- sound/firewire/bebob/bebob_focusrite.c | 3 + sound/pci/hda/patch_ca0132.c | 2 +- sound/usb/Makefile | 3 +- sound/usb/clock.c | 14 +- sound/usb/helper.h | 4 + sound/usb/mixer.c | 633 +++++++++------------ sound/usb/power.c | 2 + sound/usb/quirks.c | 3 + sound/usb/stream.c | 25 +- sound/usb/validate.c | 332 +++++++++++ tools/gpio/Makefile | 6 +- tools/perf/util/hist.c | 2 +- tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- 145 files changed, 2224 insertions(+), 1124 deletions(-)

5 years, 1 month

12
141
0 0

[PATCH 1/3] drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN

by Lyude Paul

Since nv50_outp_atomic_check_view() can set crtc_state->mode_changed, we probably should be calling it before handling any PBN changes. Just a precaution. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 44 ++++++++++++++----------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 549486f1d937..6327aaf37c08 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -770,32 +770,36 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, struct nv50_mstm *mstm = mstc->mstm; struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); int slots; + int ret; - if (crtc_state->mode_changed || crtc_state->connectors_changed) { - /* - * When restoring duplicated states, we need to make sure that - * the bw remains the same and avoid recalculating it, as the - * connector's bpc may have changed after the state was - * duplicated - */ - if (!state->duplicated) { - const int bpp = connector->display_info.bpc * 3; - const int clock = crtc_state->adjusted_mode.clock; + ret = nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, + mstc->native); + if (ret) + return ret; - asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); - } + if (!crtc_state->mode_changed && !crtc_state->connectors_changed) + return 0; - slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, - mstc->port, - asyh->dp.pbn); - if (slots < 0) - return slots; + /* + * When restoring duplicated states, we need to make sure that the bw + * remains the same and avoid recalculating it, as the connector's bpc + * may have changed after the state was duplicated + */ + if (!state->duplicated) { + const int bpp = connector->display_info.bpc * 3; + const int clock = crtc_state->adjusted_mode.clock; - asyh->dp.tu = slots; + asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); } - return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, - mstc->native); + slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, + asyh->dp.pbn); + if (slots < 0) + return slots; + + asyh->dp.tu = slots; + + return 0; } static void -- 2.21.0

5 years, 1 month

2
1
0 0

[PATCH 3/3] drm/nouveau/kms/nv50-: Limit MST BPC to 8

by Lyude Paul

Noticed this while working on some unrelated CRC stuff. Currently, userspace has very little support for BPCs higher than 8. While this doesn't matter for most things, on MST topologies we need to be careful about ensuring that we do our best to make any given display configuration fit within the bandwidth restraints of the topology, since otherwise less people's monitor configurations will work. Allowing for BPC settings higher than 8 dramatically increases the required bandwidth for displays in most configurations, and consequently makes it a lot less likely that said display configurations will pass the atomic check. In the future we want to fix this correctly by making it so that we adjust the bpp for each display in a topology to be as high as possible, while making sure to lower the bpp of each display in the event that we run out of bandwidth and need to rerun our atomic check. But for now, follow the behavior that both i915 and amdgpu are sticking to. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 93665aecce57..9ac47fe519f8 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -798,7 +798,14 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, if (!state->duplicated) { const int clock = crtc_state->adjusted_mode.clock; - asyh->or.bpc = connector->display_info.bpc; + /* + * XXX: Since we don't use HDR in userspace quite yet, limit + * the bpc to 8 to save bandwidth on the topology. In the + * future, we'll want to properly fix this by dynamically + * selecting the highest possible bpc that would fit in the + * topology + */ + asyh->or.bpc = min(connector->display_info.bpc, 8U); asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3); } -- 2.21.0

5 years, 1 month

2
1
0 0

[PATCH 2/3] drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom

by Lyude Paul

In order to be able to use bpc values that are different from what the connector reports, we want to be able to store the bpc value we decide on using for an atomic state in nv50_head_atom and refer to that instead of simply using the value that the connector reports throughout the whole atomic check phase and commit phase. This will let us (eventually) implement the max bpc connector property, and will also be needed for limiting the bpc we use on MST displays to 8 in the next commit. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/atom.h | 1 + drivers/gpu/drm/nouveau/dispnv50/disp.c | 57 ++++++++++++++----------- drivers/gpu/drm/nouveau/dispnv50/head.c | 5 +-- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/atom.h b/drivers/gpu/drm/nouveau/dispnv50/atom.h index 43df86c38f58..24f7700768da 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/atom.h +++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h @@ -114,6 +114,7 @@ struct nv50_head_atom { u8 nhsync:1; u8 nvsync:1; u8 depth:4; + u8 bpc; } or; /* Currently only used for MST */ diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 6327aaf37c08..93665aecce57 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -353,10 +353,20 @@ nv50_outp_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { - struct nouveau_connector *nv_connector = - nouveau_connector(conn_state->connector); - return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, - nv_connector->native_mode); + struct drm_connector *connector = conn_state->connector; + struct nouveau_connector *nv_connector = nouveau_connector(connector); + struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); + int ret; + + ret = nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, + nv_connector->native_mode); + if (ret) + return ret; + + if (crtc_state->mode_changed || crtc_state->connectors_changed) + asyh->or.bpc = connector->display_info.bpc; + + return 0; } /****************************************************************************** @@ -786,10 +796,10 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, * may have changed after the state was duplicated */ if (!state->duplicated) { - const int bpp = connector->display_info.bpc * 3; const int clock = crtc_state->adjusted_mode.clock; - asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); + asyh->or.bpc = connector->display_info.bpc; + asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3); } slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, @@ -802,6 +812,17 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, return 0; } +static u8 +nv50_dp_bpc_to_depth(unsigned int bpc) +{ + switch (bpc) { + case 6: return 0x2; + case 8: return 0x5; + case 10: /* fall-through */ + default: return 0x6; + } +} + static void nv50_msto_enable(struct drm_encoder *encoder) { @@ -812,7 +833,7 @@ nv50_msto_enable(struct drm_encoder *encoder) struct nv50_mstm *mstm = NULL; struct drm_connector *connector; struct drm_connector_list_iter conn_iter; - u8 proto, depth; + u8 proto; bool r; drm_connector_list_iter_begin(encoder->dev, &conn_iter); @@ -841,14 +862,8 @@ nv50_msto_enable(struct drm_encoder *encoder) else proto = 0x9; - switch (mstc->connector.display_info.bpc) { - case 6: depth = 0x2; break; - case 8: depth = 0x5; break; - case 10: - default: depth = 0x6; break; - } - - mstm->outp->update(mstm->outp, head->base.index, armh, proto, depth); + mstm->outp->update(mstm->outp, head->base.index, armh, proto, + nv50_dp_bpc_to_depth(armh->or.bpc)); msto->head = head; msto->mstc = mstc; @@ -1502,20 +1517,14 @@ nv50_sor_enable(struct drm_encoder *encoder) lvds.lvds.script |= 0x0200; } - if (nv_connector->base.display_info.bpc == 8) + if (asyh->or.bpc == 8) lvds.lvds.script |= 0x0200; } nvif_mthd(&disp->disp->object, 0, &lvds, sizeof(lvds)); break; case DCB_OUTPUT_DP: - if (nv_connector->base.display_info.bpc == 6) - depth = 0x2; - else - if (nv_connector->base.display_info.bpc == 8) - depth = 0x5; - else - depth = 0x6; + depth = nv50_dp_bpc_to_depth(asyh->or.bpc); if (nv_encoder->link & 1) proto = 0x8; @@ -1666,7 +1675,7 @@ nv50_pior_enable(struct drm_encoder *encoder) nv50_outp_acquire(nv_encoder); nv_connector = nouveau_encoder_connector_get(nv_encoder); - switch (nv_connector->base.display_info.bpc) { + switch (asyh->or.bpc) { case 10: asyh->or.depth = 0x6; break; case 8: asyh->or.depth = 0x5; break; case 6: asyh->or.depth = 0x2; break; diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c index 71c23bf1fe25..c9692df2b76c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -81,18 +81,17 @@ nv50_head_atomic_check_dither(struct nv50_head_atom *armh, struct nv50_head_atom *asyh, struct nouveau_conn_atom *asyc) { - struct drm_connector *connector = asyc->state.connector; u32 mode = 0x00; if (asyc->dither.mode == DITHERING_MODE_AUTO) { - if (asyh->base.depth > connector->display_info.bpc * 3) + if (asyh->base.depth > asyh->or.bpc * 3) mode = DITHERING_MODE_DYNAMIC2X2; } else { mode = asyc->dither.mode; } if (asyc->dither.depth == DITHERING_DEPTH_AUTO) { - if (connector->display_info.bpc >= 8) + if (asyh->or.bpc >= 8) mode |= DITHERING_DEPTH_8BPC; } else { mode |= asyc->dither.depth; -- 2.21.0

5 years, 1 month

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2019